From 385ec4d70a4f42eaeb1c9e906ec95e4be5eaf024 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 1 Jan 2021 11:05:49 -0800
Subject: [PATCH 0001/1285] Adds ReviewRating model

I can't just calling Rating because that would clash with the rating
field
---
 bookwyrm/activitypub/__init__.py         |  3 +-
 bookwyrm/activitypub/note.py             | 16 ++++++--
 bookwyrm/forms.py                        |  4 +-
 bookwyrm/migrations/0030_reviewrating.py | 52 ++++++++++++++++++++++++
 bookwyrm/models/__init__.py              |  3 +-
 bookwyrm/models/status.py                | 16 ++++++++
 6 files changed, 86 insertions(+), 8 deletions(-)
 create mode 100644 bookwyrm/migrations/0030_reviewrating.py

diff --git a/bookwyrm/activitypub/__init__.py b/bookwyrm/activitypub/__init__.py
index a4fef41e..49e278bf 100644
--- a/bookwyrm/activitypub/__init__.py
+++ b/bookwyrm/activitypub/__init__.py
@@ -6,7 +6,8 @@ from .base_activity import ActivityEncoder, Signature
 from .base_activity import Link, Mention
 from .base_activity import ActivitySerializerError, resolve_remote_id
 from .image import Image
-from .note import Note, GeneratedNote, Article, Comment, Review, Quotation
+from .note import Note, GeneratedNote, Article, Comment, Quotation
+from .note import Review, Rating
 from .note import Tombstone
 from .interaction import Boost, Like
 from .ordered_collection import OrderedCollection, OrderedCollectionPage
diff --git a/bookwyrm/activitypub/note.py b/bookwyrm/activitypub/note.py
index 72fbe5fc..cbbeb779 100644
--- a/bookwyrm/activitypub/note.py
+++ b/bookwyrm/activitypub/note.py
@@ -50,6 +50,13 @@ class Comment(Note):
     type: str = 'Comment'
 
 
+@dataclass(init=False)
+class Quotation(Comment):
+    ''' a quote and commentary on a book '''
+    quote: str
+    type: str = 'Quotation'
+
+
 @dataclass(init=False)
 class Review(Comment):
     ''' a full book review '''
@@ -59,7 +66,8 @@ class Review(Comment):
 
 
 @dataclass(init=False)
-class Quotation(Comment):
-    ''' a quote and commentary on a book '''
-    quote: str
-    type: str = 'Quotation'
+class Rating(Comment):
+    ''' a full book review '''
+    rating: int = None
+    content: str = None
+    type: str = 'Rating'
diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 686ac8b1..133f7543 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -54,8 +54,8 @@ class RegisterForm(CustomForm):
 
 class RatingForm(CustomForm):
     class Meta:
-        model = models.Review
-        fields = ['user', 'book', 'content', 'rating', 'privacy']
+        model = models.ReviewRating
+        fields = ['user', 'book', 'rating', 'privacy']
 
 
 class ReviewForm(CustomForm):
diff --git a/bookwyrm/migrations/0030_reviewrating.py b/bookwyrm/migrations/0030_reviewrating.py
new file mode 100644
index 00000000..3658a666
--- /dev/null
+++ b/bookwyrm/migrations/0030_reviewrating.py
@@ -0,0 +1,52 @@
+# Generated by Django 3.0.7 on 2021-01-01 19:05
+
+from django.db.models.fields.reverse_related import ManyToOneRel
+from django.db.models import Q
+from django.db import migrations, models
+import django.db.models.deletion
+from bookwyrm.management.commands.deduplicate_book_data import update_related
+
+
+def convert_review_rating(app_registry, schema_editor):
+    ''' take reviews with no content and turn them into ratings '''
+    db_alias = schema_editor.connection.alias
+    reviews = app_registry.get_model('bookwyrm', 'Review')
+    review_ratings = app_registry.get_model('bookwyrm', 'ReviewRating')
+    ratings = reviews.objects.using(db_alias).filter(
+        Q(content__isnull=True) | Q(content=''))
+    # replace the old review with the rating
+    for review in ratings:
+        rating = review_ratings.objects.create(
+            user=review.user, rating=review.rating, book=review.book)
+        for field in review._meta.get_fields():
+            if isinstance(field, ManyToOneRel) or field.name == 'status_ptr':
+                continue
+            value = getattr(review, field.name)
+            print(review, rating, field.name, value)
+            try:
+                setattr(rating, field.name, value)
+            except TypeError:
+                getattr(rating, field.name).set(value.all())
+        rating.save()
+        update_related(rating, review)
+        review.delete()
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0029_auto_20201221_2014'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ReviewRating',
+            fields=[
+                ('review_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.Review')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('bookwyrm.review',),
+        ),
+        migrations.RunPython(convert_review_rating),
+    ]
diff --git a/bookwyrm/models/__init__.py b/bookwyrm/models/__init__.py
index 48852cfe..4a0db4f5 100644
--- a/bookwyrm/models/__init__.py
+++ b/bookwyrm/models/__init__.py
@@ -8,7 +8,8 @@ from .connector import Connector
 
 from .shelf import Shelf, ShelfBook
 
-from .status import Status, GeneratedNote, Review, Comment, Quotation
+from .status import Status, GeneratedNote, Comment, Quotation
+from .status import Review, ReviewRating
 from .status import Boost
 from .attachment import Image
 from .favorite import Favorite
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index 10cee752..ee8faf00 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -222,6 +222,22 @@ class Review(Status):
     pure_type = 'Article'
 
 
+class ReviewRating(Review):
+    ''' a subtype of review that only contains a rating '''
+    def save(self, *args, **kwargs):
+        if not self.rating:
+            raise ValueError('Rating object must include a numerical rating')
+        return super().save(*args, **kwargs)
+
+    @property
+    def pure_content(self):
+        #pylint: disable=bad-string-format-type
+        return 'Rated "%s": %d' % (self.book.title, self.rating)
+
+    activity_serializer = activitypub.Rating
+    pure_type = 'Note'
+
+
 class Boost(Status):
     ''' boost'ing a post '''
     boosted_status = fields.ForeignKey(

From dad202823aa73bbfeea9744a518832ff4a7ee6cc Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 1 Jan 2021 15:36:43 -0800
Subject: [PATCH 0002/1285] Moves review re-structing into separate migration

---
 bookwyrm/migrations/0030_reviewrating.py      | 29 ---------
 .../migrations/0031_auto_20210101_2109.py     | 61 +++++++++++++++++++
 2 files changed, 61 insertions(+), 29 deletions(-)
 create mode 100644 bookwyrm/migrations/0031_auto_20210101_2109.py

diff --git a/bookwyrm/migrations/0030_reviewrating.py b/bookwyrm/migrations/0030_reviewrating.py
index 3658a666..327c6c6a 100644
--- a/bookwyrm/migrations/0030_reviewrating.py
+++ b/bookwyrm/migrations/0030_reviewrating.py
@@ -1,35 +1,7 @@
 # Generated by Django 3.0.7 on 2021-01-01 19:05
 
-from django.db.models.fields.reverse_related import ManyToOneRel
-from django.db.models import Q
 from django.db import migrations, models
 import django.db.models.deletion
-from bookwyrm.management.commands.deduplicate_book_data import update_related
-
-
-def convert_review_rating(app_registry, schema_editor):
-    ''' take reviews with no content and turn them into ratings '''
-    db_alias = schema_editor.connection.alias
-    reviews = app_registry.get_model('bookwyrm', 'Review')
-    review_ratings = app_registry.get_model('bookwyrm', 'ReviewRating')
-    ratings = reviews.objects.using(db_alias).filter(
-        Q(content__isnull=True) | Q(content=''))
-    # replace the old review with the rating
-    for review in ratings:
-        rating = review_ratings.objects.create(
-            user=review.user, rating=review.rating, book=review.book)
-        for field in review._meta.get_fields():
-            if isinstance(field, ManyToOneRel) or field.name == 'status_ptr':
-                continue
-            value = getattr(review, field.name)
-            print(review, rating, field.name, value)
-            try:
-                setattr(rating, field.name, value)
-            except TypeError:
-                getattr(rating, field.name).set(value.all())
-        rating.save()
-        update_related(rating, review)
-        review.delete()
 
 class Migration(migrations.Migration):
 
@@ -48,5 +20,4 @@ class Migration(migrations.Migration):
             },
             bases=('bookwyrm.review',),
         ),
-        migrations.RunPython(convert_review_rating),
     ]
diff --git a/bookwyrm/migrations/0031_auto_20210101_2109.py b/bookwyrm/migrations/0031_auto_20210101_2109.py
new file mode 100644
index 00000000..8343719f
--- /dev/null
+++ b/bookwyrm/migrations/0031_auto_20210101_2109.py
@@ -0,0 +1,61 @@
+# Generated by Django 3.0.7 on 2021-01-01 21:09
+
+from django.db.models.fields.reverse_related import ManyToOneRel
+from django.db.models import Q
+from django.db import migrations
+
+def convert_review_rating(app_registry, schema_editor):
+    ''' take reviews with no content and turn them into ratings '''
+    db_alias = schema_editor.connection.alias
+    reviews = app_registry.get_model('bookwyrm', 'Review')
+    review_ratings = app_registry.get_model('bookwyrm', 'ReviewRating')
+    ratings = reviews.objects.using(db_alias).filter(
+        Q(content__isnull=True) | Q(content=''))
+    # replace the old review with the rating
+    for review in ratings:
+        rating = review_ratings.objects.create(
+            user=review.user, rating=review.rating, book=review.book)
+        print('-----')
+        print(rating, review)
+        for field in review._meta.get_fields():
+            if isinstance(field, ManyToOneRel) or field.name in ['status_ptr', 'id', 'remote_id']:
+                continue
+            value = getattr(review, field.name)
+            try:
+                setattr(rating, field.name, value)
+            except TypeError:
+                getattr(rating, field.name).set(value.all())
+        rating.save()
+
+        # move related models away from old review
+        related_models = [
+            (r.remote_field.name, r.related_model.__name__) for r in \
+                review._meta.related_objects]
+        for (related_field, related_model_name) in related_models:
+            related_model = app_registry.get_model('bookwyrm', related_model_name)
+            related_objs = related_model.objects.using(db_alias).filter(
+                **{related_field: review})
+            for related_obj in related_objs:
+                print('related_obj', related_obj)
+                print('field', related_field)
+                try:
+                    print(rating)
+                    print('before', getattr(related_obj, related_field))
+                    setattr(related_obj, related_field, rating)
+                    related_obj.save()
+                    print('after', getattr(related_obj, related_field))
+                except TypeError:
+                    getattr(related_obj, related_field).add(rating)
+                    getattr(related_obj, related_field).remove(review)
+        review.delete()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0030_reviewrating'),
+    ]
+
+    operations = [
+        migrations.RunPython(convert_review_rating),
+    ]

From ff9caf3d5118c7f575287af9121fe236a67a7027 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 4 Jan 2021 21:37:09 -0800
Subject: [PATCH 0003/1285] Fixes migration version numbering

---
 bookwyrm/migrations/0030_reviewrating.py      | 23 -------------------
 ...to_20210101_2109.py => 0033_reviewrate.py} | 17 +++++++++++---
 2 files changed, 14 insertions(+), 26 deletions(-)
 delete mode 100644 bookwyrm/migrations/0030_reviewrating.py
 rename bookwyrm/migrations/{0031_auto_20210101_2109.py => 0033_reviewrate.py} (80%)

diff --git a/bookwyrm/migrations/0030_reviewrating.py b/bookwyrm/migrations/0030_reviewrating.py
deleted file mode 100644
index 327c6c6a..00000000
--- a/bookwyrm/migrations/0030_reviewrating.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Generated by Django 3.0.7 on 2021-01-01 19:05
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('bookwyrm', '0029_auto_20201221_2014'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='ReviewRating',
-            fields=[
-                ('review_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.Review')),
-            ],
-            options={
-                'abstract': False,
-            },
-            bases=('bookwyrm.review',),
-        ),
-    ]
diff --git a/bookwyrm/migrations/0031_auto_20210101_2109.py b/bookwyrm/migrations/0033_reviewrate.py
similarity index 80%
rename from bookwyrm/migrations/0031_auto_20210101_2109.py
rename to bookwyrm/migrations/0033_reviewrate.py
index 8343719f..69c0ec57 100644
--- a/bookwyrm/migrations/0031_auto_20210101_2109.py
+++ b/bookwyrm/migrations/0033_reviewrate.py
@@ -1,8 +1,9 @@
-# Generated by Django 3.0.7 on 2021-01-01 21:09
+# Generated by Django 3.0.7 on 2021-01-05 05:32
 
 from django.db.models.fields.reverse_related import ManyToOneRel
 from django.db.models import Q
-from django.db import migrations
+from django.db import migrations, models
+import django.db.models.deletion
 
 def convert_review_rating(app_registry, schema_editor):
     ''' take reviews with no content and turn them into ratings '''
@@ -53,9 +54,19 @@ def convert_review_rating(app_registry, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0030_reviewrating'),
+        ('bookwyrm', '0032_auto_20210104_2055'),
     ]
 
     operations = [
+        migrations.CreateModel(
+            name='ReviewRating',
+            fields=[
+                ('review_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.Review')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('bookwyrm.review',),
+        ),
         migrations.RunPython(convert_review_rating),
     ]

From 930d9429efa0138da7625a5270b4eba3ead890ec Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 10 Feb 2021 12:43:53 -0800
Subject: [PATCH 0004/1285] User save() override instead of signal to set user
 fields

this gets gnarly because of transaction.atomic, so it bears further
testing
---
 bookwyrm/models/user.py | 80 ++++++++++++++++++++---------------------
 1 file changed, 38 insertions(+), 42 deletions(-)

diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index da717d2e..7b0f9a91 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -6,7 +6,6 @@ from django.apps import apps
 from django.contrib.auth.models import AbstractUser
 from django.core.validators import MinValueValidator
 from django.db import models
-from django.dispatch import receiver
 from django.utils import timezone
 
 from bookwyrm import activitypub
@@ -172,15 +171,23 @@ class User(OrderedCollectionPageMixin, AbstractUser):
 
     def save(self, *args, **kwargs):
         ''' populate fields for new local users '''
-        # this user already exists, no need to populate fields
         if not self.local and not re.match(regex.full_username, self.username):
             # generate a username that uses the domain (webfinger format)
             actor_parts = urlparse(self.remote_id)
             self.username = '%s@%s' % (self.username, actor_parts.netloc)
-            return super().save(*args, **kwargs)
+            super().save(*args, **kwargs)
+            return
 
-        if self.id or not self.local:
-            return super().save(*args, **kwargs)
+        # this user already exists, no need to populate fields
+        if self.id:
+            super().save(*args, **kwargs)
+            return
+
+        # this is a new remote user, we need to set their remote server field
+        if not self.local:
+            super().save(*args, **kwargs)
+            set_remote_server.delay(self.id)
+            return
 
         # populate fields for local users
         self.remote_id = 'https://%s/user/%s' % (DOMAIN, self.localname)
@@ -188,7 +195,32 @@ class User(OrderedCollectionPageMixin, AbstractUser):
         self.shared_inbox = 'https://%s/inbox' % DOMAIN
         self.outbox = '%s/outbox' % self.remote_id
 
-        return super().save(*args, **kwargs)
+        # an id needs to be set before we can proceed with related models
+        super().save(*args, **kwargs)
+
+        # create keys and shelves for new local users
+        self.key_pair = KeyPair.objects.create(
+            remote_id='%s/#main-key' % self.remote_id)
+        self.save(broadcast=False)
+
+        shelves = [{
+            'name': 'To Read',
+            'identifier': 'to-read',
+        }, {
+            'name': 'Currently Reading',
+            'identifier': 'reading',
+        }, {
+            'name': 'Read',
+            'identifier': 'read',
+        }]
+
+        for shelf in shelves:
+            Shelf(
+                name=shelf['name'],
+                identifier=shelf['identifier'],
+                user=self,
+                editable=False
+            ).save(broadcast=False)
 
     @property
     def local_path(self):
@@ -280,42 +312,6 @@ class AnnualGoal(BookWyrmModel):
             finish_date__year__gte=self.year).count()
 
 
-
-@receiver(models.signals.post_save, sender=User)
-#pylint: disable=unused-argument
-def execute_after_save(sender, instance, created, *args, **kwargs):
-    ''' create shelves for new users '''
-    if not created:
-        return
-
-    if not instance.local:
-        set_remote_server.delay(instance.id)
-        return
-
-    instance.key_pair = KeyPair.objects.create(
-        remote_id='%s/#main-key' % instance.remote_id)
-    instance.save(broadcast=False)
-
-    shelves = [{
-        'name': 'To Read',
-        'identifier': 'to-read',
-    }, {
-        'name': 'Currently Reading',
-        'identifier': 'reading',
-    }, {
-        'name': 'Read',
-        'identifier': 'read',
-    }]
-
-    for shelf in shelves:
-        Shelf(
-            name=shelf['name'],
-            identifier=shelf['identifier'],
-            user=instance,
-            editable=False
-        ).save(broadcast=False)
-
-
 @app.task
 def set_remote_server(user_id):
     ''' figure out the user's remote server in the background '''

From 8cb345886bb1635f5984df398e97489857041afe Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 15 Feb 2021 11:30:22 -0800
Subject: [PATCH 0005/1285] Show lists on book page

---
 bookwyrm/templates/book.html | 11 +++++++++++
 bookwyrm/views/books.py      |  5 +++++
 2 files changed, 16 insertions(+)

diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html
index c174116e..0bef2856 100644
--- a/bookwyrm/templates/book.html
+++ b/bookwyrm/templates/book.html
@@ -224,6 +224,17 @@
                 </ul>
             </section>
             {% endif %}
+
+            {% if lists.exists %}
+            <section class="content block">
+                <h2 class="title is-5">Lists</h2>
+                <ul>
+                {% for list in lists %}
+                <li><a href="{{ list.local_path }}">{{ list.name }}</a></li>
+                {% endfor %}
+                </ul>
+            </section>
+            {% endif %}
         </div>
     </div>
 </div>
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 2655bebb..9d196563 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -15,6 +15,7 @@ from bookwyrm.activitypub import ActivitypubResponse
 from bookwyrm.connectors import connector_manager
 from bookwyrm.settings import PAGE_LENGTH
 from .helpers import is_api_request, get_activity_feed, get_edition
+from .helpers import privacy_filter
 
 
 # pylint: disable= no-self-use
@@ -94,6 +95,10 @@ class Book(View):
             'ratings': reviews.filter(Q(content__isnull=True) | Q(content='')),
             'rating': reviews.aggregate(Avg('rating'))['rating__avg'],
             'tags':  models.UserTag.objects.filter(book=book),
+            'lists': privacy_filter(
+                request.user,
+                book.list_set.all(),
+                ['public', 'unlisted', 'followers']),
             'user_tags': user_tags,
             'user_shelves': user_shelves,
             'other_edition_shelves': other_edition_shelves,

From 65f81bd5f0fb5c6075ba5bb39b008066c6ae11c3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 15 Feb 2021 12:21:48 -0800
Subject: [PATCH 0006/1285] Moves blocking to save function

I just like these better than signals??
---
 bookwyrm/incoming.py            |  2 +-
 bookwyrm/models/relationship.py | 28 +++++++++++-----------------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/bookwyrm/incoming.py b/bookwyrm/incoming.py
index 562225e7..cb5baafc 100644
--- a/bookwyrm/incoming.py
+++ b/bookwyrm/incoming.py
@@ -195,7 +195,7 @@ def handle_block(activity):
     ''' blocking a user '''
     # create "block" databse entry
     activitypub.Block(**activity).to_model(models.UserBlocks)
-    # the removing relationships is handled in post-save hook in model
+    # the removing relationships is handled in model save
 
 
 @app.task
diff --git a/bookwyrm/models/relationship.py b/bookwyrm/models/relationship.py
index 9f3bf07d..6aaffae9 100644
--- a/bookwyrm/models/relationship.py
+++ b/bookwyrm/models/relationship.py
@@ -1,7 +1,6 @@
 ''' defines relationships between users '''
 from django.db import models, transaction
 from django.db.models import Q
-from django.dispatch import receiver
 
 from bookwyrm import activitypub
 from .activitypub_mixin import ActivitypubMixin, ActivityMixin
@@ -126,20 +125,15 @@ class UserBlocks(ActivityMixin, UserRelationship):
     status = 'blocks'
     activity_serializer = activitypub.Block
 
+    def save(self, *args, **kwargs):
+        ''' remove follow or follow request rels after a block is created '''
+        super().save(*args, **kwargs)
 
-@receiver(models.signals.post_save, sender=UserBlocks)
-#pylint: disable=unused-argument
-def execute_after_save(sender, instance, created, *args, **kwargs):
-    ''' remove follow or follow request rels after a block is created '''
-    UserFollows.objects.filter(
-        Q(user_subject=instance.user_subject,
-          user_object=instance.user_object) | \
-        Q(user_subject=instance.user_object,
-          user_object=instance.user_subject)
-    ).delete()
-    UserFollowRequest.objects.filter(
-        Q(user_subject=instance.user_subject,
-          user_object=instance.user_object) | \
-        Q(user_subject=instance.user_object,
-          user_object=instance.user_subject)
-    ).delete()
+        UserFollows.objects.filter(
+            Q(user_subject=self.user_subject, user_object=self.user_object) | \
+            Q(user_subject=self.user_object, user_object=self.user_subject)
+        ).delete()
+        UserFollowRequest.objects.filter(
+            Q(user_subject=self.user_subject, user_object=self.user_object) | \
+            Q(user_subject=self.user_object, user_object=self.user_subject)
+        ).delete()

From f974b9b89538f226a30c4854fa3947f51ff05e28 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 15 Feb 2021 12:51:34 -0800
Subject: [PATCH 0007/1285] Better blocking checks

---
 bookwyrm/models/relationship.py | 48 ++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/bookwyrm/models/relationship.py b/bookwyrm/models/relationship.py
index 044b08ac..f4df3b83 100644
--- a/bookwyrm/models/relationship.py
+++ b/bookwyrm/models/relationship.py
@@ -1,6 +1,6 @@
 ''' defines relationships between users '''
 from django.apps import apps
-from django.db import models, transaction
+from django.db import models, transaction, IntegrityError
 from django.db.models import Q
 
 from bookwyrm import activitypub
@@ -60,6 +60,20 @@ class UserFollows(ActivitypubMixin, UserRelationship):
     status = 'follows'
     activity_serializer = activitypub.Follow
 
+    def save(self, *args, **kwargs):
+        ''' really really don't let a user follow someone who blocked them '''
+        # blocking in either direction is a no-go
+        if UserBlocks.objects.filter(
+                Q(
+                    user_subject=self.user_subject,
+                    user_object=self.user_object,
+                ) | Q(
+                    user_subject=self.user_object,
+                    user_object=self.user_subject,
+                )
+            ).exists():
+            raise IntegrityError()
+        super().save(*args, **kwargs)
 
     @classmethod
     def from_request(cls, follow_request):
@@ -78,23 +92,25 @@ class UserFollowRequest(ActivitypubMixin, UserRelationship):
 
     def save(self, *args, broadcast=True, **kwargs):
         ''' make sure the follow or block relationship doesn't already exist '''
-        try:
-            UserFollows.objects.get(
+        # don't create a request if a follow already exists
+        if UserFollows.objects.filter(
                 user_subject=self.user_subject,
                 user_object=self.user_object,
-            )
-            # blocking in either direction is a no-go
-            UserBlocks.objects.get(
-                user_subject=self.user_subject,
-                user_object=self.user_object,
-            )
-            UserBlocks.objects.get(
-                user_subject=self.user_object,
-                user_object=self.user_subject,
-            )
-            return None
-        except (UserFollows.DoesNotExist, UserBlocks.DoesNotExist):
-            super().save(*args, **kwargs)
+            ).exists():
+            raise IntegrityError()
+        # blocking in either direction is a no-go
+        if UserBlocks.objects.filter(
+                Q(
+                    user_subject=self.user_subject,
+                    user_object=self.user_object,
+                ) | Q(
+                    user_subject=self.user_object,
+                    user_object=self.user_subject,
+                )
+            ).exists():
+            raise IntegrityError()
+
+        super().save(*args, **kwargs)
 
         if broadcast and self.user_subject.local and not self.user_object.local:
             self.broadcast(self.to_activity(), self.user_subject)

From fd19b559612aacc36f96fda15db88f6ef35d57cd Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 15 Feb 2021 16:26:48 -0800
Subject: [PATCH 0008/1285] Basic checks for inbox

---
 bookwyrm/incoming.py               |  21 +++---
 bookwyrm/tests/views/test_inbox.py | 102 +++++++++++++++++++++++++++++
 bookwyrm/urls.py                   |   6 +-
 bookwyrm/views/__init__.py         |   1 +
 bookwyrm/views/inbox.py            |  79 ++++++++++++++++++++++
 5 files changed, 195 insertions(+), 14 deletions(-)
 create mode 100644 bookwyrm/tests/views/test_inbox.py
 create mode 100644 bookwyrm/views/inbox.py

diff --git a/bookwyrm/incoming.py b/bookwyrm/incoming.py
index 18db1069..83d325af 100644
--- a/bookwyrm/incoming.py
+++ b/bookwyrm/incoming.py
@@ -160,14 +160,12 @@ def handle_follow_accept(activity):
     accepter = activitypub.resolve_remote_id(models.User, activity['actor'])
 
     try:
-        request = models.UserFollowRequest.objects.get(
+        models.UserFollowRequest.objects.get(
             user_subject=requester,
             user_object=accepter
-        )
-        request.delete()
+        ).accept()
     except models.UserFollowRequest.DoesNotExist:
-        pass
-    accepter.followers.add(requester)
+        return
 
 
 @app.task
@@ -176,12 +174,13 @@ def handle_follow_reject(activity):
     requester = models.User.objects.get(remote_id=activity['object']['actor'])
     rejecter = activitypub.resolve_remote_id(models.User, activity['actor'])
 
-    request = models.UserFollowRequest.objects.get(
-        user_subject=requester,
-        user_object=rejecter
-    )
-    request.delete()
-    #raises models.UserFollowRequest.DoesNotExist
+    try:
+        models.UserFollowRequest.objects.get(
+            user_subject=requester,
+            user_object=rejecter
+        ).reject()
+    except models.UserFollowRequest.DoesNotExist:
+        return
 
 @app.task
 def handle_block(activity):
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
new file mode 100644
index 00000000..64dcc149
--- /dev/null
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -0,0 +1,102 @@
+''' tests incoming activities'''
+import json
+from unittest.mock import patch
+
+from django.http import HttpResponseNotAllowed, HttpResponseNotFound
+from django.test import TestCase, Client
+
+from bookwyrm import models
+
+class Inbox(TestCase):
+    ''' readthrough tests '''
+    def setUp(self):
+        ''' basic user and book data '''
+        self.client = Client()
+        self.local_user = models.User.objects.create_user(
+            'mouse@example.com', 'mouse@mouse.com', 'mouseword',
+            local=True, localname='mouse')
+        self.local_user.remote_id = 'https://example.com/user/mouse'
+        self.local_user.save(broadcast=False)
+        with patch('bookwyrm.models.user.set_remote_server.delay'):
+            self.remote_user = models.User.objects.create_user(
+                'rat', 'rat@rat.com', 'ratword',
+                local=False,
+                remote_id='https://example.com/users/rat',
+                inbox='https://example.com/users/rat/inbox',
+                outbox='https://example.com/users/rat/outbox',
+            )
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+            self.status = models.Status.objects.create(
+                user=self.local_user,
+                content='Test status',
+                remote_id='https://example.com/status/1',
+            )
+        models.SiteSettings.objects.create()
+
+
+    def test_inbox_invalid_get(self):
+        ''' shouldn't try to handle if the user is not found '''
+        result = self.client.get(
+            '/inbox', content_type="application/json"
+        )
+        self.assertIsInstance(result, HttpResponseNotAllowed)
+
+    def test_inbox_invalid_user(self):
+        ''' shouldn't try to handle if the user is not found '''
+        result = self.client.post(
+            '/user/bleh/inbox',
+            '{"type": "Test", "object": "exists"}',
+            content_type="application/json"
+        )
+        self.assertIsInstance(result, HttpResponseNotFound)
+
+    def test_inbox_invalid_bad_signature(self):
+        ''' bad request for invalid signature '''
+        with patch('bookwyrm.views.inbox.has_valid_signature') as mock_valid:
+            mock_valid.return_value = False
+            result = self.client.post(
+                '/user/mouse/inbox',
+                '{"type": "Test", "object": "exists"}',
+                content_type="application/json"
+            )
+            self.assertEqual(result.status_code, 401)
+
+    def test_inbox_invalid_bad_signature_delete(self):
+        ''' invalid signature for Delete is okay though '''
+        with patch('bookwyrm.views.inbox.has_valid_signature') as mock_valid:
+            mock_valid.return_value = False
+            result = self.client.post(
+                '/user/mouse/inbox',
+                '{"type": "Delete", "object": "exists"}',
+                content_type="application/json"
+            )
+            self.assertEqual(result.status_code, 200)
+
+    def test_inbox_unknown_type(self):
+        ''' never heard of that activity type, don't have a handler for it '''
+        with patch('bookwyrm.views.inbox.has_valid_signature') as mock_valid:
+            result = self.client.post(
+                '/inbox',
+                '{"type": "Fish", "object": "exists"}',
+                content_type="application/json"
+            )
+            mock_valid.return_value = True
+            self.assertIsInstance(result, HttpResponseNotFound)
+
+
+    def test_inbox_success(self):
+        ''' a known type, for which we start a task '''
+        activity = {
+            "id": "hi",
+            "type": "Accept",
+            "actor": "https://example.com/users/rat",
+            "object": "https://example.com/user/mouse"
+        }
+        with patch('bookwyrm.views.inbox.has_valid_signature') as mock_valid:
+            mock_valid.return_value = True
+            result = self.client.post(
+                '/inbox',
+                json.dumps(activity),
+                content_type="application/json"
+            )
+        self.assertEqual(result.status_code, 200)
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 3830adb9..a741088a 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -4,7 +4,7 @@ from django.contrib import admin
 from django.urls import path, re_path
 
 
-from bookwyrm import incoming, settings, views, wellknown
+from bookwyrm import settings, views, wellknown
 from bookwyrm.utils import regex
 
 user_path = r'^user/(?P<username>%s)' % regex.username
@@ -29,8 +29,8 @@ urlpatterns = [
     path('admin/', admin.site.urls),
 
     # federation endpoints
-    re_path(r'^inbox/?$', incoming.shared_inbox),
-    re_path(r'%s/inbox/?$' % local_user_path, incoming.inbox),
+    re_path(r'^inbox/?$', views.Inbox.as_view()),
+    re_path(r'%s/inbox/?$' % local_user_path, views.Inbox.as_view()),
     re_path(r'%s/outbox/?$' % local_user_path, views.Outbox.as_view()),
     re_path(r'^.well-known/webfinger/?$', wellknown.webfinger),
     re_path(r'^.well-known/nodeinfo/?$', wellknown.nodeinfo_pointer),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index b72c5013..2c7cdc46 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -11,6 +11,7 @@ from .follow import follow, unfollow
 from .follow import accept_follow_request, delete_follow_request
 from .goal import Goal
 from .import_data import Import, ImportStatus
+from .inbox import Inbox
 from .interaction import Favorite, Unfavorite, Boost, Unboost
 from .invite import ManageInvites, Invite
 from .landing import About, Home, Discover
diff --git a/bookwyrm/views/inbox.py b/bookwyrm/views/inbox.py
new file mode 100644
index 00000000..8f38e7a2
--- /dev/null
+++ b/bookwyrm/views/inbox.py
@@ -0,0 +1,79 @@
+''' incoming activities '''
+import json
+from urllib.parse import urldefrag
+
+from django.http import HttpResponse
+from django.http import HttpResponseBadRequest, HttpResponseNotFound
+from django.shortcuts import get_object_or_404
+from django.views import View
+import requests
+
+from bookwyrm import activitypub, models
+from bookwyrm.signatures import Signature
+
+
+# pylint: disable=no-self-use
+class Inbox(View):
+    ''' requests sent by outside servers'''
+    def post(self, request, username=None):
+        ''' only works as POST request '''
+        # first let's do some basic checks to see if this is legible
+        if username:
+            try:
+                models.User.objects.get(localname=username)
+            except models.User.DoesNotExist:
+                return HttpResponseNotFound()
+
+        # is it valid json? does it at least vaguely resemble an activity?
+        try:
+            resp = request.body
+            activity_json = json.loads(resp)
+            activity_type = activity_json['type'] # Follow, Accept, Create, etc
+        except (json.decoder.JSONDecodeError, KeyError):
+            return HttpResponseBadRequest()
+
+        # verify the signature
+        if not has_valid_signature(request, activity_json):
+            if activity_json['type'] == 'Delete':
+                # Pretend that unauth'd deletes succeed. Auth may be failing
+                # because the resource or owner of the resource might have
+                # been deleted.
+                return HttpResponse()
+            return HttpResponse(status=401)
+
+        # get the activity dataclass from the type field
+        try:
+            serializer = getattr(activitypub, activity_type)
+            serializer(**activity_json)
+        except (AttributeError, activitypub.ActivitySerializerError):
+            return HttpResponseNotFound()
+
+        return HttpResponse()
+
+
+def has_valid_signature(request, activity):
+    ''' verify incoming signature '''
+    try:
+        signature = Signature.parse(request)
+
+        key_actor = urldefrag(signature.key_id).url
+        if key_actor != activity.get('actor'):
+            raise ValueError("Wrong actor created signature.")
+
+        remote_user = activitypub.resolve_remote_id(models.User, key_actor)
+        if not remote_user:
+            return False
+
+        try:
+            signature.verify(remote_user.key_pair.public_key, request)
+        except ValueError:
+            old_key = remote_user.key_pair.public_key
+            remote_user = activitypub.resolve_remote_id(
+                models.User, remote_user.remote_id, refresh=True
+            )
+            if remote_user.key_pair.public_key == old_key:
+                raise # Key unchanged.
+            signature.verify(remote_user.key_pair.public_key, request)
+    except (ValueError, requests.exceptions.HTTPError):
+        return False
+    return True

From e810c2bee0e8887bfe1c073dd1d53f3b405cc9fe Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 15 Feb 2021 17:23:17 -0800
Subject: [PATCH 0009/1285] Recursively parse activities

---
 bookwyrm/activitypub/__init__.py      |  6 ++-
 bookwyrm/activitypub/base_activity.py | 17 ++++++++-
 bookwyrm/tests/test_incoming.py       | 54 ---------------------------
 bookwyrm/views/inbox.py               | 10 ++---
 4 files changed, 24 insertions(+), 63 deletions(-)

diff --git a/bookwyrm/activitypub/__init__.py b/bookwyrm/activitypub/__init__.py
index 510f1f3f..ce4acd66 100644
--- a/bookwyrm/activitypub/__init__.py
+++ b/bookwyrm/activitypub/__init__.py
@@ -2,7 +2,7 @@
 import inspect
 import sys
 
-from .base_activity import ActivityEncoder, Signature
+from .base_activity import ActivityEncoder, Signature, naive_parse
 from .base_activity import Link, Mention
 from .base_activity import ActivitySerializerError, resolve_remote_id
 from .image import Image
@@ -23,3 +23,7 @@ from .verbs import Add, AddBook, AddListItem, Remove
 cls_members = inspect.getmembers(sys.modules[__name__], inspect.isclass)
 activity_objects = {c[0]: c[1] for c in cls_members \
     if hasattr(c[1], 'to_model')}
+
+def parse(activity_json):
+    ''' figure out what activity this is and parse it '''
+    return naive_parse(activity_objects, activity_json)
diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index 5f35f1d7..596662e8 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -40,6 +40,17 @@ class Signature:
     signatureValue: str
     type: str = 'RsaSignature2017'
 
+def naive_parse(activity_objects, activity_json):
+    ''' this navigates circular import issues '''
+    try:
+        activity_type = activity_json['type']
+        print(activity_type)
+        serializer = activity_objects[activity_type]
+        print(serializer)
+    except KeyError:
+        raise ActivitySerializerError('Invalid type "%s"' % activity_type)
+
+    return serializer(activity_objects=activity_objects, **activity_json)
 
 @dataclass(init=False)
 class ActivityObject:
@@ -47,13 +58,17 @@ class ActivityObject:
     id: str
     type: str
 
-    def __init__(self, **kwargs):
+    def __init__(self, activity_objects=None, **kwargs):
         ''' this lets you pass in an object with fields that aren't in the
         dataclass, which it ignores. Any field in the dataclass is required or
         has a default value '''
         for field in fields(self):
             try:
+                print(field.name, field.type)
                 value = kwargs[field.name]
+                if field.type == 'ActivityObject' and activity_objects:
+                    value = naive_parse(activity_objects, value)
+
             except KeyError:
                 if field.default == MISSING and \
                         field.default_factory == MISSING:
diff --git a/bookwyrm/tests/test_incoming.py b/bookwyrm/tests/test_incoming.py
index 01d0c9a3..9be0bb97 100644
--- a/bookwyrm/tests/test_incoming.py
+++ b/bookwyrm/tests/test_incoming.py
@@ -40,60 +40,6 @@ class Incoming(TestCase):
         self.factory = RequestFactory()
 
 
-    def test_inbox_invalid_get(self):
-        ''' shouldn't try to handle if the user is not found '''
-        request = self.factory.get('https://www.example.com/')
-        self.assertIsInstance(
-            incoming.inbox(request, 'anything'), HttpResponseNotAllowed)
-        self.assertIsInstance(
-            incoming.shared_inbox(request), HttpResponseNotAllowed)
-
-    def test_inbox_invalid_user(self):
-        ''' shouldn't try to handle if the user is not found '''
-        request = self.factory.post('https://www.example.com/')
-        self.assertIsInstance(
-            incoming.inbox(request, 'fish@tomato.com'), HttpResponseNotFound)
-
-    def test_inbox_invalid_no_object(self):
-        ''' json is missing "object" field '''
-        request = self.factory.post(
-            self.local_user.shared_inbox, data={})
-        self.assertIsInstance(
-            incoming.shared_inbox(request), HttpResponseBadRequest)
-
-    def test_inbox_invalid_bad_signature(self):
-        ''' bad request for invalid signature '''
-        request = self.factory.post(
-            self.local_user.shared_inbox,
-            '{"type": "Test", "object": "exists"}',
-            content_type='application/json')
-        with patch('bookwyrm.incoming.has_valid_signature') as mock_has_valid:
-            mock_has_valid.return_value = False
-            self.assertEqual(
-                incoming.shared_inbox(request).status_code, 401)
-
-    def test_inbox_invalid_bad_signature_delete(self):
-        ''' invalid signature for Delete is okay though '''
-        request = self.factory.post(
-            self.local_user.shared_inbox,
-            '{"type": "Delete", "object": "exists"}',
-            content_type='application/json')
-        with patch('bookwyrm.incoming.has_valid_signature') as mock_has_valid:
-            mock_has_valid.return_value = False
-            self.assertEqual(
-                incoming.shared_inbox(request).status_code, 200)
-
-    def test_inbox_unknown_type(self):
-        ''' never heard of that activity type, don't have a handler for it '''
-        request = self.factory.post(
-            self.local_user.shared_inbox,
-            '{"type": "Fish", "object": "exists"}',
-            content_type='application/json')
-        with patch('bookwyrm.incoming.has_valid_signature') as mock_has_valid:
-            mock_has_valid.return_value = True
-            self.assertIsInstance(
-                incoming.shared_inbox(request), HttpResponseNotFound)
-
     def test_inbox_success(self):
         ''' a known type, for which we start a task '''
         request = self.factory.post(
diff --git a/bookwyrm/views/inbox.py b/bookwyrm/views/inbox.py
index 8f38e7a2..53dd6c40 100644
--- a/bookwyrm/views/inbox.py
+++ b/bookwyrm/views/inbox.py
@@ -4,7 +4,6 @@ from urllib.parse import urldefrag
 
 from django.http import HttpResponse
 from django.http import HttpResponseBadRequest, HttpResponseNotFound
-from django.shortcuts import get_object_or_404
 from django.views import View
 import requests
 
@@ -26,10 +25,8 @@ class Inbox(View):
 
         # is it valid json? does it at least vaguely resemble an activity?
         try:
-            resp = request.body
-            activity_json = json.loads(resp)
-            activity_type = activity_json['type'] # Follow, Accept, Create, etc
-        except (json.decoder.JSONDecodeError, KeyError):
+            activity_json = json.loads(request.body)
+        except json.decoder.JSONDecodeError:
             return HttpResponseBadRequest()
 
         # verify the signature
@@ -43,8 +40,7 @@ class Inbox(View):
 
         # get the activity dataclass from the type field
         try:
-            serializer = getattr(activitypub, activity_type)
-            serializer(**activity_json)
+            activitypub.parse(activity_json)
         except (AttributeError, activitypub.ActivitySerializerError):
             return HttpResponseNotFound()
 

From 81e2021f92c170b8c73098a4746e511983975ce9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 15 Feb 2021 18:47:08 -0800
Subject: [PATCH 0010/1285] Move handlers to activitypub classes

---
 bookwyrm/activitypub/base_activity.py | 33 ++++++++++----------
 bookwyrm/activitypub/verbs.py         |  7 +++++
 bookwyrm/tests/views/test_inbox.py    | 43 +++++++++++++++++++++------
 bookwyrm/views/inbox.py               | 24 ++++++++++++---
 celerywyrm/celery.py                  |  2 +-
 5 files changed, 78 insertions(+), 31 deletions(-)

diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index 596662e8..93af0d0c 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -47,8 +47,8 @@ def naive_parse(activity_objects, activity_json):
         print(activity_type)
         serializer = activity_objects[activity_type]
         print(serializer)
-    except KeyError:
-        raise ActivitySerializerError('Invalid type "%s"' % activity_type)
+    except KeyError as e:
+        raise ActivitySerializerError(e)
 
     return serializer(activity_objects=activity_objects, **activity_json)
 
@@ -66,7 +66,11 @@ class ActivityObject:
             try:
                 print(field.name, field.type)
                 value = kwargs[field.name]
-                if field.type == 'ActivityObject' and activity_objects:
+                try:
+                    is_subclass = issubclass(field.type, ActivityObject)
+                except TypeError:
+                    is_subclass = False
+                if is_subclass and activity_objects:
                     value = naive_parse(activity_objects, value)
 
             except KeyError:
@@ -78,22 +82,17 @@ class ActivityObject:
             setattr(self, field.name, value)
 
 
-    def to_model(self, model, instance=None, save=True):
+    def to_model(self, instance=None, save=True):
         ''' convert from an activity to a model instance '''
-        if self.type != model.activity_serializer.type:
+        # figure out the right model -- wish I had a better way for this
+        models = apps.get_models()
+        model = [m for m in models if hasattr(m, 'activity_serializer') and \
+            hasattr(m.activity_serializer, 'type') and \
+            m.activity_serializer.type == self.type]
+        if not len(model):
             raise ActivitySerializerError(
-                'Wrong activity type "%s" for activity of type "%s"' % \
-                        (model.activity_serializer.type,
-                         self.type)
-            )
-
-        if not isinstance(self, model.activity_serializer):
-            raise ActivitySerializerError(
-                'Wrong activity type "%s" for model "%s" (expects "%s")' % \
-                        (self.__class__,
-                         model.__name__,
-                         model.activity_serializer)
-            )
+                'No model found for activity type "%s"' % self.type)
+        model = model[0]
 
         if hasattr(model, 'ignore_activity') and model.ignore_activity(self):
             return instance
diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index 190cd739..c4b30253 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -21,6 +21,11 @@ class Create(Verb):
     signature: Signature = None
     type: str = 'Create'
 
+    def action(self):
+        ''' create the model instance from the dataclass '''
+        # check for dupes
+        self.object.to_model()
+
 
 @dataclass(init=False)
 class Delete(Verb):
@@ -46,11 +51,13 @@ class Undo(Verb):
 @dataclass(init=False)
 class Follow(Verb):
     ''' Follow activity '''
+    object: str
     type: str = 'Follow'
 
 @dataclass(init=False)
 class Block(Verb):
     ''' Block activity '''
+    object: str
     type: str = 'Block'
 
 @dataclass(init=False)
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index 64dcc149..3bb7760e 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -87,16 +87,41 @@ class Inbox(TestCase):
     def test_inbox_success(self):
         ''' a known type, for which we start a task '''
         activity = {
-            "id": "hi",
-            "type": "Accept",
-            "actor": "https://example.com/users/rat",
-            "object": "https://example.com/user/mouse"
+            'id': 'hi',
+            'type': 'Create',
+            'actor': 'hi',
+            "to": [
+                "https://www.w3.org/ns/activitystreams#Public"
+            ],
+            "cc": [
+                "https://example.com/user/mouse/followers"
+            ],
+            'object': {
+                "id": "https://example.com/list/22",
+                "type": "BookList",
+                "totalItems": 1,
+                "first": "https://example.com/list/22?page=1",
+                "last": "https://example.com/list/22?page=1",
+                "name": "Test List",
+                "owner": "https://example.com/user/mouse",
+                "to": [
+                    "https://www.w3.org/ns/activitystreams#Public"
+                ],
+                "cc": [
+                    "https://example.com/user/mouse/followers"
+                ],
+                "summary": "summary text",
+                "curation": "curated",
+                "@context": "https://www.w3.org/ns/activitystreams"
+            }
         }
         with patch('bookwyrm.views.inbox.has_valid_signature') as mock_valid:
             mock_valid.return_value = True
-            result = self.client.post(
-                '/inbox',
-                json.dumps(activity),
-                content_type="application/json"
-            )
+
+            with patch('bookwyrm.views.inbox.activity_task.delay'):
+                result = self.client.post(
+                    '/inbox',
+                    json.dumps(activity),
+                    content_type="application/json"
+                )
         self.assertEqual(result.status_code, 200)
diff --git a/bookwyrm/views/inbox.py b/bookwyrm/views/inbox.py
index 53dd6c40..fdac8446 100644
--- a/bookwyrm/views/inbox.py
+++ b/bookwyrm/views/inbox.py
@@ -8,6 +8,7 @@ from django.views import View
 import requests
 
 from bookwyrm import activitypub, models
+from bookwyrm.tasks import app
 from bookwyrm.signatures import Signature
 
 
@@ -38,15 +39,30 @@ class Inbox(View):
                 return HttpResponse()
             return HttpResponse(status=401)
 
-        # get the activity dataclass from the type field
-        try:
-            activitypub.parse(activity_json)
-        except (AttributeError, activitypub.ActivitySerializerError):
+        # just some quick smell tests before we try to parse the json
+        if not 'object' in activity_json or \
+                not 'type' in activity_json or \
+                not activity_json['type'] in activitypub.activity_objects:
             return HttpResponseNotFound()
 
+        activity_task.delay()
         return HttpResponse()
 
 
+@app.task
+def activity_task(activity_json):
+    ''' do something with this json we think is legit '''
+    # lets see if the activitypub module can make sense of this json
+    try:
+        activity = activitypub.parse(activity_json)
+    except activitypub.ActivitySerializerError:
+        return
+
+    # cool that worked, now we should do the action described by the type
+    # (create, update, delete, etc)
+    activity.action()
+
+
 def has_valid_signature(request, activity):
     ''' verify incoming signature '''
     try:
diff --git a/celerywyrm/celery.py b/celerywyrm/celery.py
index 5a53dab5..2937ef0f 100644
--- a/celerywyrm/celery.py
+++ b/celerywyrm/celery.py
@@ -25,5 +25,5 @@ app.autodiscover_tasks(
     ['bookwyrm'], related_name='connectors.abstract_connector')
 app.autodiscover_tasks(['bookwyrm'], related_name='emailing')
 app.autodiscover_tasks(['bookwyrm'], related_name='goodreads_import')
-app.autodiscover_tasks(['bookwyrm'], related_name='incoming')
 app.autodiscover_tasks(['bookwyrm'], related_name='models.user')
+app.autodiscover_tasks(['bookwyrm'], related_name='views.inbox')

From 12a3aa96676c3ddbfe1905a14ef8d45dcdaded3c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 15 Feb 2021 19:41:22 -0800
Subject: [PATCH 0011/1285] incoming Create flow with tests

---
 bookwyrm/activitypub/base_activity.py |   3 -
 bookwyrm/activitypub/verbs.py         |   1 -
 bookwyrm/incoming.py                  |  41 -------
 bookwyrm/tests/test_incoming.py       | 117 --------------------
 bookwyrm/tests/views/test_inbox.py    | 151 ++++++++++++++++++++++----
 bookwyrm/views/inbox.py               |   2 +-
 6 files changed, 129 insertions(+), 186 deletions(-)

diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index 93af0d0c..a49514dc 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -44,9 +44,7 @@ def naive_parse(activity_objects, activity_json):
     ''' this navigates circular import issues '''
     try:
         activity_type = activity_json['type']
-        print(activity_type)
         serializer = activity_objects[activity_type]
-        print(serializer)
     except KeyError as e:
         raise ActivitySerializerError(e)
 
@@ -64,7 +62,6 @@ class ActivityObject:
         has a default value '''
         for field in fields(self):
             try:
-                print(field.name, field.type)
                 value = kwargs[field.name]
                 try:
                     is_subclass = issubclass(field.type, ActivityObject)
diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index c4b30253..fee5f362 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -23,7 +23,6 @@ class Create(Verb):
 
     def action(self):
         ''' create the model instance from the dataclass '''
-        # check for dupes
         self.object.to_model()
 
 
diff --git a/bookwyrm/incoming.py b/bookwyrm/incoming.py
index 83d325af..7ddd893f 100644
--- a/bookwyrm/incoming.py
+++ b/bookwyrm/incoming.py
@@ -53,14 +53,6 @@ def shared_inbox(request):
         'Accept': handle_follow_accept,
         'Reject': handle_follow_reject,
         'Block': handle_block,
-        'Create': {
-            'BookList': handle_create_list,
-            'Note': handle_create_status,
-            'Article': handle_create_status,
-            'Review': handle_create_status,
-            'Comment': handle_create_status,
-            'Quotation': handle_create_status,
-        },
         'Delete': handle_delete_status,
         'Like': handle_favorite,
         'Announce': handle_boost,
@@ -204,13 +196,6 @@ def handle_unblock(activity):
     block.delete()
 
 
-@app.task
-def handle_create_list(activity):
-    ''' a new list '''
-    activity = activity['object']
-    activitypub.BookList(**activity).to_model(models.List)
-
-
 @app.task
 def handle_update_list(activity):
     ''' update a list '''
@@ -222,32 +207,6 @@ def handle_update_list(activity):
         **activity['object']).to_model(models.List, instance=book_list)
 
 
-@app.task
-def handle_create_status(activity):
-    ''' someone did something, good on them '''
-    # deduplicate incoming activities
-    activity = activity['object']
-    status_id = activity.get('id')
-    if models.Status.objects.filter(remote_id=status_id).count():
-        return
-
-    try:
-        serializer = activitypub.activity_objects[activity['type']]
-    except KeyError:
-        return
-
-    activity = serializer(**activity)
-    try:
-        model = models.activity_models[activity.type]
-    except KeyError:
-        # not a type of status we are prepared to deserialize
-        return
-
-    status = activity.to_model(model)
-    if not status:
-        # it was discarded because it's not a bookwyrm type
-        return
-
 
 @app.task
 def handle_delete_status(activity):
diff --git a/bookwyrm/tests/test_incoming.py b/bookwyrm/tests/test_incoming.py
index 9be0bb97..288ae302 100644
--- a/bookwyrm/tests/test_incoming.py
+++ b/bookwyrm/tests/test_incoming.py
@@ -40,19 +40,6 @@ class Incoming(TestCase):
         self.factory = RequestFactory()
 
 
-    def test_inbox_success(self):
-        ''' a known type, for which we start a task '''
-        request = self.factory.post(
-            self.local_user.shared_inbox,
-            '{"type": "Accept", "object": "exists"}',
-            content_type='application/json')
-        with patch('bookwyrm.incoming.has_valid_signature') as mock_has_valid:
-            mock_has_valid.return_value = True
-
-            with patch('bookwyrm.incoming.handle_follow_accept.delay'):
-                self.assertEqual(
-                    incoming.shared_inbox(request).status_code, 200)
-
 
     def test_handle_follow(self):
         ''' remote user wants to follow local user '''
@@ -198,36 +185,6 @@ class Incoming(TestCase):
         self.assertEqual(follows.count(), 0)
 
 
-    def test_handle_create_list(self):
-        ''' a new list '''
-        activity = {
-            'object': {
-                "id": "https://example.com/list/22",
-                "type": "BookList",
-                "totalItems": 1,
-                "first": "https://example.com/list/22?page=1",
-                "last": "https://example.com/list/22?page=1",
-                "name": "Test List",
-                "owner": "https://example.com/user/mouse",
-                "to": [
-                    "https://www.w3.org/ns/activitystreams#Public"
-                ],
-                "cc": [
-                    "https://example.com/user/mouse/followers"
-                ],
-                "summary": "summary text",
-                "curation": "curated",
-                "@context": "https://www.w3.org/ns/activitystreams"
-            }
-        }
-        incoming.handle_create_list(activity)
-        book_list = models.List.objects.get()
-        self.assertEqual(book_list.name, 'Test List')
-        self.assertEqual(book_list.curation, 'curated')
-        self.assertEqual(book_list.description, 'summary text')
-        self.assertEqual(book_list.remote_id, 'https://example.com/list/22')
-
-
     def test_handle_update_list(self):
         ''' a new list '''
         with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
@@ -262,80 +219,6 @@ class Incoming(TestCase):
         self.assertEqual(book_list.remote_id, 'https://example.com/list/22')
 
 
-    def test_handle_create_status(self):
-        ''' the "it justs works" mode '''
-        self.assertEqual(models.Status.objects.count(), 1)
-
-        datafile = pathlib.Path(__file__).parent.joinpath(
-            'data/ap_quotation.json')
-        status_data = json.loads(datafile.read_bytes())
-        models.Edition.objects.create(
-            title='Test Book', remote_id='https://example.com/book/1')
-        activity = {'object': status_data, 'type': 'Create'}
-
-        incoming.handle_create_status(activity)
-
-        status = models.Quotation.objects.get()
-        self.assertEqual(
-            status.remote_id, 'https://example.com/user/mouse/quotation/13')
-        self.assertEqual(status.quote, 'quote body')
-        self.assertEqual(status.content, 'commentary')
-        self.assertEqual(status.user, self.local_user)
-        self.assertEqual(models.Status.objects.count(), 2)
-
-        # while we're here, lets ensure we avoid dupes
-        incoming.handle_create_status(activity)
-        self.assertEqual(models.Status.objects.count(), 2)
-
-    def test_handle_create_status_unknown_type(self):
-        ''' folks send you all kinds of things '''
-        activity = {'object': {'id': 'hi'}, 'type': 'Fish'}
-        result = incoming.handle_create_status(activity)
-        self.assertIsNone(result)
-
-    def test_handle_create_status_remote_note_with_mention(self):
-        ''' should only create it under the right circumstances '''
-        self.assertEqual(models.Status.objects.count(), 1)
-        self.assertFalse(
-            models.Notification.objects.filter(user=self.local_user).exists())
-
-        datafile = pathlib.Path(__file__).parent.joinpath(
-            'data/ap_note.json')
-        status_data = json.loads(datafile.read_bytes())
-        activity = {'object': status_data, 'type': 'Create'}
-
-        incoming.handle_create_status(activity)
-        status = models.Status.objects.last()
-        self.assertEqual(status.content, 'test content in note')
-        self.assertEqual(status.mention_users.first(), self.local_user)
-        self.assertTrue(
-            models.Notification.objects.filter(user=self.local_user).exists())
-        self.assertEqual(
-            models.Notification.objects.get().notification_type, 'MENTION')
-
-    def test_handle_create_status_remote_note_with_reply(self):
-        ''' should only create it under the right circumstances '''
-        self.assertEqual(models.Status.objects.count(), 1)
-        self.assertFalse(
-            models.Notification.objects.filter(user=self.local_user))
-
-        datafile = pathlib.Path(__file__).parent.joinpath(
-            'data/ap_note.json')
-        status_data = json.loads(datafile.read_bytes())
-        del status_data['tag']
-        status_data['inReplyTo'] = self.status.remote_id
-        activity = {'object': status_data, 'type': 'Create'}
-
-        incoming.handle_create_status(activity)
-        status = models.Status.objects.last()
-        self.assertEqual(status.content, 'test content in note')
-        self.assertEqual(status.reply_parent, self.status)
-        self.assertTrue(
-            models.Notification.objects.filter(user=self.local_user))
-        self.assertEqual(
-            models.Notification.objects.get().notification_type, 'REPLY')
-
-
     def test_handle_delete_status(self):
         ''' remove a status '''
         self.status.user = self.remote_user
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index 3bb7760e..784f2127 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -1,11 +1,12 @@
 ''' tests incoming activities'''
 import json
+import pathlib
 from unittest.mock import patch
 
 from django.http import HttpResponseNotAllowed, HttpResponseNotFound
 from django.test import TestCase, Client
 
-from bookwyrm import models
+from bookwyrm import models, views
 
 class Inbox(TestCase):
     ''' readthrough tests '''
@@ -31,6 +32,19 @@ class Inbox(TestCase):
                 content='Test status',
                 remote_id='https://example.com/status/1',
             )
+
+        self.create_json = {
+            'id': 'hi',
+            'type': 'Create',
+            'actor': 'hi',
+            "to": [
+                "https://www.w3.org/ns/activitystreams#Public"
+            ],
+            "cc": [
+                "https://example.com/user/mouse/followers"
+            ],
+            'object': {}
+        }
         models.SiteSettings.objects.create()
 
 
@@ -86,34 +100,24 @@ class Inbox(TestCase):
 
     def test_inbox_success(self):
         ''' a known type, for which we start a task '''
-        activity = {
-            'id': 'hi',
-            'type': 'Create',
-            'actor': 'hi',
+        activity = self.create_json
+        activity['object'] = {
+            "id": "https://example.com/list/22",
+            "type": "BookList",
+            "totalItems": 1,
+            "first": "https://example.com/list/22?page=1",
+            "last": "https://example.com/list/22?page=1",
+            "name": "Test List",
+            "owner": "https://example.com/user/mouse",
             "to": [
                 "https://www.w3.org/ns/activitystreams#Public"
             ],
             "cc": [
                 "https://example.com/user/mouse/followers"
             ],
-            'object': {
-                "id": "https://example.com/list/22",
-                "type": "BookList",
-                "totalItems": 1,
-                "first": "https://example.com/list/22?page=1",
-                "last": "https://example.com/list/22?page=1",
-                "name": "Test List",
-                "owner": "https://example.com/user/mouse",
-                "to": [
-                    "https://www.w3.org/ns/activitystreams#Public"
-                ],
-                "cc": [
-                    "https://example.com/user/mouse/followers"
-                ],
-                "summary": "summary text",
-                "curation": "curated",
-                "@context": "https://www.w3.org/ns/activitystreams"
-            }
+            "summary": "summary text",
+            "curation": "curated",
+            "@context": "https://www.w3.org/ns/activitystreams"
         }
         with patch('bookwyrm.views.inbox.has_valid_signature') as mock_valid:
             mock_valid.return_value = True
@@ -125,3 +129,104 @@ class Inbox(TestCase):
                     content_type="application/json"
                 )
         self.assertEqual(result.status_code, 200)
+
+
+    def test_handle_create_status(self):
+        ''' the "it justs works" mode '''
+        self.assertEqual(models.Status.objects.count(), 1)
+
+        datafile = pathlib.Path(__file__).parent.joinpath(
+            '../data/ap_quotation.json')
+        status_data = json.loads(datafile.read_bytes())
+        models.Edition.objects.create(
+            title='Test Book', remote_id='https://example.com/book/1')
+        activity = self.create_json
+        activity['object'] = status_data
+
+        views.inbox.activity_task(activity)
+
+        status = models.Quotation.objects.get()
+        self.assertEqual(
+            status.remote_id, 'https://example.com/user/mouse/quotation/13')
+        self.assertEqual(status.quote, 'quote body')
+        self.assertEqual(status.content, 'commentary')
+        self.assertEqual(status.user, self.local_user)
+        self.assertEqual(models.Status.objects.count(), 2)
+
+        # while we're here, lets ensure we avoid dupes
+        views.inbox.activity_task(activity)
+        self.assertEqual(models.Status.objects.count(), 2)
+
+
+    def test_handle_create_status_remote_note_with_mention(self):
+        ''' should only create it under the right circumstances '''
+        self.assertEqual(models.Status.objects.count(), 1)
+        self.assertFalse(
+            models.Notification.objects.filter(user=self.local_user).exists())
+
+        datafile = pathlib.Path(__file__).parent.joinpath(
+            '../data/ap_note.json')
+        status_data = json.loads(datafile.read_bytes())
+        activity = self.create_json
+        activity['object'] = status_data
+
+        views.inbox.activity_task(activity)
+        status = models.Status.objects.last()
+        self.assertEqual(status.content, 'test content in note')
+        self.assertEqual(status.mention_users.first(), self.local_user)
+        self.assertTrue(
+            models.Notification.objects.filter(user=self.local_user).exists())
+        self.assertEqual(
+            models.Notification.objects.get().notification_type, 'MENTION')
+
+    def test_handle_create_status_remote_note_with_reply(self):
+        ''' should only create it under the right circumstances '''
+        self.assertEqual(models.Status.objects.count(), 1)
+        self.assertFalse(
+            models.Notification.objects.filter(user=self.local_user))
+
+        datafile = pathlib.Path(__file__).parent.joinpath(
+            '../data/ap_note.json')
+        status_data = json.loads(datafile.read_bytes())
+        del status_data['tag']
+        status_data['inReplyTo'] = self.status.remote_id
+        activity = self.create_json
+        activity['object'] = status_data
+
+        views.inbox.activity_task(activity)
+        status = models.Status.objects.last()
+        self.assertEqual(status.content, 'test content in note')
+        self.assertEqual(status.reply_parent, self.status)
+        self.assertTrue(
+            models.Notification.objects.filter(user=self.local_user))
+        self.assertEqual(
+            models.Notification.objects.get().notification_type, 'REPLY')
+
+
+    def test_handle_create_list(self):
+        ''' a new list '''
+        activity = self.create_json
+        activity['object'] = {
+            "id": "https://example.com/list/22",
+            "type": "BookList",
+            "totalItems": 1,
+            "first": "https://example.com/list/22?page=1",
+            "last": "https://example.com/list/22?page=1",
+            "name": "Test List",
+            "owner": "https://example.com/user/mouse",
+            "to": [
+                "https://www.w3.org/ns/activitystreams#Public"
+            ],
+            "cc": [
+                "https://example.com/user/mouse/followers"
+            ],
+            "summary": "summary text",
+            "curation": "curated",
+            "@context": "https://www.w3.org/ns/activitystreams"
+        }
+        views.inbox.activity_task(activity)
+        book_list = models.List.objects.get()
+        self.assertEqual(book_list.name, 'Test List')
+        self.assertEqual(book_list.curation, 'curated')
+        self.assertEqual(book_list.description, 'summary text')
+        self.assertEqual(book_list.remote_id, 'https://example.com/list/22')
diff --git a/bookwyrm/views/inbox.py b/bookwyrm/views/inbox.py
index fdac8446..6e7b036b 100644
--- a/bookwyrm/views/inbox.py
+++ b/bookwyrm/views/inbox.py
@@ -45,7 +45,7 @@ class Inbox(View):
                 not activity_json['type'] in activitypub.activity_objects:
             return HttpResponseNotFound()
 
-        activity_task.delay()
+        activity_task.delay(activity_json)
         return HttpResponse()
 
 

From a16b81a6eb8232dc3f88f0d5ca6b3ae4ac95bf1d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 15 Feb 2021 20:49:23 -0800
Subject: [PATCH 0012/1285] Adds actions for all verbs

---
 bookwyrm/activitypub/base_activity.py |   8 +-
 bookwyrm/activitypub/verbs.py         |  40 ++-
 bookwyrm/models/relationship.py       |  12 +-
 bookwyrm/tests/test_incoming.py       | 493 --------------------------
 bookwyrm/tests/views/test_follow.py   |   2 +
 bookwyrm/tests/views/test_inbox.py    | 456 ++++++++++++++++++++++++
 bookwyrm/views/follow.py              |   2 -
 7 files changed, 507 insertions(+), 506 deletions(-)
 delete mode 100644 bookwyrm/tests/test_incoming.py

diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index a49514dc..631ca2dd 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -50,6 +50,7 @@ def naive_parse(activity_objects, activity_json):
 
     return serializer(activity_objects=activity_objects, **activity_json)
 
+
 @dataclass(init=False)
 class ActivityObject:
     ''' actor activitypub json '''
@@ -79,7 +80,7 @@ class ActivityObject:
             setattr(self, field.name, value)
 
 
-    def to_model(self, instance=None, save=True):
+    def to_model(self, instance=None, allow_create=True, save=True):
         ''' convert from an activity to a model instance '''
         # figure out the right model -- wish I had a better way for this
         models = apps.get_models()
@@ -95,7 +96,10 @@ class ActivityObject:
             return instance
 
         # check for an existing instance, if we're not updating a known obj
-        instance = instance or model.find_existing(self.serialize()) or model()
+        instance = instance or model.find_existing(self.serialize())
+        if not instance and not allow_create:
+            return None
+        instance = instance or model()
 
         for field in instance.simple_fields:
             field.set_field_from_activity(instance, self)
diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index fee5f362..d781993e 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -12,6 +12,10 @@ class Verb(ActivityObject):
     actor: str
     object: ActivityObject
 
+    def action(self):
+        ''' usually we just want to save, this can be overridden as needed '''
+        self.object.to_model()
+
 
 @dataclass(init=False)
 class Create(Verb):
@@ -21,10 +25,6 @@ class Create(Verb):
     signature: Signature = None
     type: str = 'Create'
 
-    def action(self):
-        ''' create the model instance from the dataclass '''
-        self.object.to_model()
-
 
 @dataclass(init=False)
 class Delete(Verb):
@@ -33,6 +33,12 @@ class Delete(Verb):
     cc: List
     type: str = 'Delete'
 
+    def action(self):
+        ''' find and delete the activity object '''
+        obj = self.object.to_model(save=False, allow_create=False)
+        obj.delete()
+
+
 
 @dataclass(init=False)
 class Update(Verb):
@@ -40,12 +46,21 @@ class Update(Verb):
     to: List
     type: str = 'Update'
 
+    def action(self):
+        ''' update a model instance from the dataclass '''
+        self.object.to_model(allow_create=False)
+
 
 @dataclass(init=False)
 class Undo(Verb):
     ''' Undo an activity '''
     type: str = 'Undo'
 
+    def action(self):
+        ''' find and remove the activity object '''
+        obj = self.object.to_model(save=False, allow_create=False)
+        obj.delete()
+
 
 @dataclass(init=False)
 class Follow(Verb):
@@ -53,18 +68,25 @@ class Follow(Verb):
     object: str
     type: str = 'Follow'
 
+
 @dataclass(init=False)
 class Block(Verb):
     ''' Block activity '''
     object: str
     type: str = 'Block'
 
+
 @dataclass(init=False)
 class Accept(Verb):
     ''' Accept activity '''
     object: Follow
     type: str = 'Accept'
 
+    def action(self):
+        ''' find and remove the activity object '''
+        obj = self.object.to_model(save=False, allow_create=False)
+        obj.accept()
+
 
 @dataclass(init=False)
 class Reject(Verb):
@@ -72,6 +94,11 @@ class Reject(Verb):
     object: Follow
     type: str = 'Reject'
 
+    def action(self):
+        ''' find and remove the activity object '''
+        obj = self.object.to_model(save=False, allow_create=False)
+        obj.reject()
+
 
 @dataclass(init=False)
 class Add(Verb):
@@ -101,3 +128,8 @@ class Remove(Verb):
     '''Remove activity '''
     target: ActivityObject
     type: str = 'Remove'
+
+    def action(self):
+        ''' find and remove the activity object '''
+        obj = self.object.to_model(save=False, allow_create=False)
+        obj.delete()
diff --git a/bookwyrm/models/relationship.py b/bookwyrm/models/relationship.py
index e2db5468..e4c6f4fa 100644
--- a/bookwyrm/models/relationship.py
+++ b/bookwyrm/models/relationship.py
@@ -56,11 +56,9 @@ class UserRelationship(BookWyrmModel):
         return '%s#%s/%d' % (base_path, status, self.id)
 
 
-class UserFollows(ActivitypubMixin, UserRelationship):
+class UserFollows(UserRelationship):
     ''' Following a user '''
     status = 'follows'
-    activity_serializer = activitypub.Follow
-
 
     @classmethod
     def from_request(cls, follow_request):
@@ -101,9 +99,13 @@ class UserFollowRequest(ActivitypubMixin, UserRelationship):
             self.broadcast(self.to_activity(), self.user_subject)
 
         if self.user_object.local:
+            manually_approves = self.user_object.manually_approves_followers
+            if manually_approves:
+                self.accept()
+
             model = apps.get_model('bookwyrm.Notification', require_ready=True)
-            notification_type = 'FOLLOW_REQUEST' \
-                if self.user_object.manually_approves_followers else 'FOLLOW'
+            notification_type = 'FOLLOW_REQUEST' if \
+                    manually_approves else 'FOLLOW'
             model.objects.create(
                 user=self.user_object,
                 related_user=self.user_subject,
diff --git a/bookwyrm/tests/test_incoming.py b/bookwyrm/tests/test_incoming.py
deleted file mode 100644
index 288ae302..00000000
--- a/bookwyrm/tests/test_incoming.py
+++ /dev/null
@@ -1,493 +0,0 @@
-''' test incoming activities '''
-from datetime import datetime
-import json
-import pathlib
-from unittest.mock import patch
-
-from django.http import HttpResponseBadRequest, HttpResponseNotAllowed, \
-        HttpResponseNotFound
-from django.test import TestCase
-from django.test.client import RequestFactory
-import responses
-
-from bookwyrm import models, incoming
-
-
-#pylint: disable=too-many-public-methods
-class Incoming(TestCase):
-    ''' a lot here: all handlers for receiving activitypub requests '''
-    def setUp(self):
-        ''' we need basic things, like users '''
-        self.local_user = models.User.objects.create_user(
-            'mouse@example.com', 'mouse@mouse.com', 'mouseword',
-            local=True, localname='mouse')
-        self.local_user.remote_id = 'https://example.com/user/mouse'
-        self.local_user.save(broadcast=False)
-        with patch('bookwyrm.models.user.set_remote_server.delay'):
-            self.remote_user = models.User.objects.create_user(
-                'rat', 'rat@rat.com', 'ratword',
-                local=False,
-                remote_id='https://example.com/users/rat',
-                inbox='https://example.com/users/rat/inbox',
-                outbox='https://example.com/users/rat/outbox',
-            )
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            self.status = models.Status.objects.create(
-                user=self.local_user,
-                content='Test status',
-                remote_id='https://example.com/status/1',
-            )
-        self.factory = RequestFactory()
-
-
-
-    def test_handle_follow(self):
-        ''' remote user wants to follow local user '''
-        activity = {
-            "@context": "https://www.w3.org/ns/activitystreams",
-            "id": "https://example.com/users/rat/follows/123",
-            "type": "Follow",
-            "actor": "https://example.com/users/rat",
-            "object": "https://example.com/user/mouse"
-        }
-
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            incoming.handle_follow(activity)
-
-        # notification created
-        notification = models.Notification.objects.get()
-        self.assertEqual(notification.user, self.local_user)
-        self.assertEqual(notification.notification_type, 'FOLLOW')
-
-        # the request should have been deleted
-        requests = models.UserFollowRequest.objects.all()
-        self.assertEqual(list(requests), [])
-
-        # the follow relationship should exist
-        follow = models.UserFollows.objects.get(user_object=self.local_user)
-        self.assertEqual(follow.user_subject, self.remote_user)
-
-
-    def test_handle_follow_manually_approved(self):
-        ''' needs approval before following '''
-        activity = {
-            "@context": "https://www.w3.org/ns/activitystreams",
-            "id": "https://example.com/users/rat/follows/123",
-            "type": "Follow",
-            "actor": "https://example.com/users/rat",
-            "object": "https://example.com/user/mouse"
-        }
-
-        self.local_user.manually_approves_followers = True
-        self.local_user.save(broadcast=False)
-
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            incoming.handle_follow(activity)
-
-        # notification created
-        notification = models.Notification.objects.get()
-        self.assertEqual(notification.user, self.local_user)
-        self.assertEqual(notification.notification_type, 'FOLLOW_REQUEST')
-
-        # the request should exist
-        request = models.UserFollowRequest.objects.get()
-        self.assertEqual(request.user_subject, self.remote_user)
-        self.assertEqual(request.user_object, self.local_user)
-
-        # the follow relationship should not exist
-        follow = models.UserFollows.objects.all()
-        self.assertEqual(list(follow), [])
-
-
-    def test_handle_unfollow(self):
-        ''' remove a relationship '''
-        activity = {
-            "type": "Undo",
-            "@context": "https://www.w3.org/ns/activitystreams",
-            "object": {
-                "id": "https://example.com/users/rat/follows/123",
-                "type": "Follow",
-                "actor": "https://example.com/users/rat",
-                "object": "https://example.com/user/mouse"
-            }
-        }
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            models.UserFollows.objects.create(
-                user_subject=self.remote_user, user_object=self.local_user)
-        self.assertEqual(self.remote_user, self.local_user.followers.first())
-
-        incoming.handle_unfollow(activity)
-        self.assertIsNone(self.local_user.followers.first())
-
-
-    def test_handle_follow_accept(self):
-        ''' a remote user approved a follow request from local '''
-        activity = {
-            "@context": "https://www.w3.org/ns/activitystreams",
-            "id": "https://example.com/users/rat/follows/123#accepts",
-            "type": "Accept",
-            "actor": "https://example.com/users/rat",
-            "object": {
-                "id": "https://example.com/users/rat/follows/123",
-                "type": "Follow",
-                "actor": "https://example.com/user/mouse",
-                "object": "https://example.com/users/rat"
-            }
-        }
-
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            models.UserFollowRequest.objects.create(
-                user_subject=self.local_user,
-                user_object=self.remote_user
-            )
-        self.assertEqual(models.UserFollowRequest.objects.count(), 1)
-
-        incoming.handle_follow_accept(activity)
-
-        # request should be deleted
-        self.assertEqual(models.UserFollowRequest.objects.count(), 0)
-
-        # relationship should be created
-        follows = self.remote_user.followers
-        self.assertEqual(follows.count(), 1)
-        self.assertEqual(follows.first(), self.local_user)
-
-
-    def test_handle_follow_reject(self):
-        ''' turn down a follow request '''
-        activity = {
-            "@context": "https://www.w3.org/ns/activitystreams",
-            "id": "https://example.com/users/rat/follows/123#accepts",
-            "type": "Reject",
-            "actor": "https://example.com/users/rat",
-            "object": {
-                "id": "https://example.com/users/rat/follows/123",
-                "type": "Follow",
-                "actor": "https://example.com/user/mouse",
-                "object": "https://example.com/users/rat"
-            }
-        }
-
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            models.UserFollowRequest.objects.create(
-                user_subject=self.local_user,
-                user_object=self.remote_user
-            )
-        self.assertEqual(models.UserFollowRequest.objects.count(), 1)
-
-        incoming.handle_follow_reject(activity)
-
-        # request should be deleted
-        self.assertEqual(models.UserFollowRequest.objects.count(), 0)
-
-        # relationship should be created
-        follows = self.remote_user.followers
-        self.assertEqual(follows.count(), 0)
-
-
-    def test_handle_update_list(self):
-        ''' a new list '''
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            book_list = models.List.objects.create(
-                name='hi', remote_id='https://example.com/list/22',
-                user=self.local_user)
-        activity = {
-            'object': {
-                "id": "https://example.com/list/22",
-                "type": "BookList",
-                "totalItems": 1,
-                "first": "https://example.com/list/22?page=1",
-                "last": "https://example.com/list/22?page=1",
-                "name": "Test List",
-                "owner": "https://example.com/user/mouse",
-                "to": [
-                    "https://www.w3.org/ns/activitystreams#Public"
-                ],
-                "cc": [
-                    "https://example.com/user/mouse/followers"
-                ],
-                "summary": "summary text",
-                "curation": "curated",
-                "@context": "https://www.w3.org/ns/activitystreams"
-            }
-        }
-        incoming.handle_update_list(activity)
-        book_list.refresh_from_db()
-        self.assertEqual(book_list.name, 'Test List')
-        self.assertEqual(book_list.curation, 'curated')
-        self.assertEqual(book_list.description, 'summary text')
-        self.assertEqual(book_list.remote_id, 'https://example.com/list/22')
-
-
-    def test_handle_delete_status(self):
-        ''' remove a status '''
-        self.status.user = self.remote_user
-        self.status.save(broadcast=False)
-
-        self.assertFalse(self.status.deleted)
-        activity = {
-            'type': 'Delete',
-            'id': '%s/activity' % self.status.remote_id,
-            'actor': self.remote_user.remote_id,
-            'object': {'id': self.status.remote_id},
-        }
-        incoming.handle_delete_status(activity)
-        # deletion doens't remove the status, it turns it into a tombstone
-        status = models.Status.objects.get()
-        self.assertTrue(status.deleted)
-        self.assertIsInstance(status.deleted_date, datetime)
-
-
-    def test_handle_delete_status_notifications(self):
-        ''' remove a status with related notifications '''
-        self.status.user = self.remote_user
-        self.status.save(broadcast=False)
-        models.Notification.objects.create(
-            related_status=self.status,
-            user=self.local_user,
-            notification_type='MENTION'
-        )
-        # this one is innocent, don't delete it
-        notif = models.Notification.objects.create(
-            user=self.local_user,
-            notification_type='MENTION'
-        )
-        self.assertFalse(self.status.deleted)
-        self.assertEqual(models.Notification.objects.count(), 2)
-        activity = {
-            'type': 'Delete',
-            'id': '%s/activity' % self.status.remote_id,
-            'actor': self.remote_user.remote_id,
-            'object': {'id': self.status.remote_id},
-        }
-        incoming.handle_delete_status(activity)
-        # deletion doens't remove the status, it turns it into a tombstone
-        status = models.Status.objects.get()
-        self.assertTrue(status.deleted)
-        self.assertIsInstance(status.deleted_date, datetime)
-
-        # notifications should be truly deleted
-        self.assertEqual(models.Notification.objects.count(), 1)
-        self.assertEqual(models.Notification.objects.get(), notif)
-
-
-    def test_handle_favorite(self):
-        ''' fav a status '''
-        activity = {
-            '@context': 'https://www.w3.org/ns/activitystreams',
-            'id': 'https://example.com/fav/1',
-            'actor': 'https://example.com/users/rat',
-            'published': 'Mon, 25 May 2020 19:31:20 GMT',
-            'object': 'https://example.com/status/1',
-        }
-
-        incoming.handle_favorite(activity)
-
-        fav = models.Favorite.objects.get(remote_id='https://example.com/fav/1')
-        self.assertEqual(fav.status, self.status)
-        self.assertEqual(fav.remote_id, 'https://example.com/fav/1')
-        self.assertEqual(fav.user, self.remote_user)
-
-    def test_handle_unfavorite(self):
-        ''' fav a status '''
-        activity = {
-            'id': 'https://example.com/fav/1#undo',
-            'type': 'Undo',
-            'object': {
-                '@context': 'https://www.w3.org/ns/activitystreams',
-                'id': 'https://example.com/fav/1',
-                'actor': 'https://example.com/users/rat',
-                'published': 'Mon, 25 May 2020 19:31:20 GMT',
-                'object': 'https://example.com/fav/1',
-            }
-        }
-        models.Favorite.objects.create(
-            status=self.status,
-            user=self.remote_user,
-            remote_id='https://example.com/fav/1')
-        self.assertEqual(models.Favorite.objects.count(), 1)
-
-        incoming.handle_unfavorite(activity)
-        self.assertEqual(models.Favorite.objects.count(), 0)
-
-
-    def test_handle_boost(self):
-        ''' boost a status '''
-        self.assertEqual(models.Notification.objects.count(), 0)
-        activity = {
-            'type': 'Announce',
-            'id': '%s/boost' % self.status.remote_id,
-            'actor': self.remote_user.remote_id,
-            'object': self.status.to_activity(),
-        }
-        with patch('bookwyrm.models.status.Status.ignore_activity') \
-                as discarder:
-            discarder.return_value = False
-            incoming.handle_boost(activity)
-        boost = models.Boost.objects.get()
-        self.assertEqual(boost.boosted_status, self.status)
-        notification = models.Notification.objects.get()
-        self.assertEqual(notification.user, self.local_user)
-        self.assertEqual(notification.related_status, self.status)
-
-
-    @responses.activate
-    def test_handle_discarded_boost(self):
-        ''' test a boost of a mastodon status that will be discarded '''
-        activity = {
-            'type': 'Announce',
-            'id': 'http://www.faraway.com/boost/12',
-            'actor': self.remote_user.remote_id,
-            'object': self.status.to_activity(),
-        }
-        responses.add(
-            responses.GET,
-            'http://www.faraway.com/boost/12',
-            json={'id': 'http://www.faraway.com/boost/12'},
-            status=200)
-        incoming.handle_boost(activity)
-        self.assertEqual(models.Boost.objects.count(), 0)
-
-
-    def test_handle_unboost(self):
-        ''' undo a boost '''
-        activity = {
-            'type': 'Undo',
-            'object': {
-                'type': 'Announce',
-                'id': '%s/boost' % self.status.remote_id,
-                'actor': self.local_user.remote_id,
-                'object': self.status.to_activity(),
-            }
-        }
-        models.Boost.objects.create(
-            boosted_status=self.status, user=self.remote_user)
-        incoming.handle_unboost(activity)
-
-
-    def test_handle_add_book(self):
-        ''' shelving a book '''
-        book = models.Edition.objects.create(
-            title='Test', remote_id='https://bookwyrm.social/book/37292')
-        shelf = models.Shelf.objects.create(
-            user=self.remote_user, name='Test Shelf')
-        shelf.remote_id = 'https://bookwyrm.social/user/mouse/shelf/to-read'
-        shelf.save()
-
-        activity = {
-            "id": "https://bookwyrm.social/shelfbook/6189#add",
-            "type": "Add",
-            "actor": "https://example.com/users/rat",
-            "object": "https://bookwyrm.social/book/37292",
-            "target": "https://bookwyrm.social/user/mouse/shelf/to-read",
-            "@context": "https://www.w3.org/ns/activitystreams"
-        }
-        incoming.handle_add(activity)
-        self.assertEqual(shelf.books.first(), book)
-
-
-    def test_handle_update_user(self):
-        ''' update an existing user '''
-        # we only do this with remote users
-        self.local_user.local = False
-        self.local_user.save()
-
-        datafile = pathlib.Path(__file__).parent.joinpath(
-            'data/ap_user.json')
-        userdata = json.loads(datafile.read_bytes())
-        del userdata['icon']
-        self.assertIsNone(self.local_user.name)
-        incoming.handle_update_user({'object': userdata})
-        user = models.User.objects.get(id=self.local_user.id)
-        self.assertEqual(user.name, 'MOUSE?? MOUSE!!')
-        self.assertEqual(user.username, 'mouse@example.com')
-        self.assertEqual(user.localname, 'mouse')
-
-
-    def test_handle_update_edition(self):
-        ''' update an existing edition '''
-        datafile = pathlib.Path(__file__).parent.joinpath(
-            'data/bw_edition.json')
-        bookdata = json.loads(datafile.read_bytes())
-
-        models.Work.objects.create(
-            title='Test Work', remote_id='https://bookwyrm.social/book/5988')
-        book = models.Edition.objects.create(
-            title='Test Book', remote_id='https://bookwyrm.social/book/5989')
-
-        del bookdata['authors']
-        self.assertEqual(book.title, 'Test Book')
-
-        with patch(
-                'bookwyrm.activitypub.base_activity.set_related_field.delay'):
-            incoming.handle_update_edition({'object': bookdata})
-        book = models.Edition.objects.get(id=book.id)
-        self.assertEqual(book.title, 'Piranesi')
-
-
-    def test_handle_update_work(self):
-        ''' update an existing edition '''
-        datafile = pathlib.Path(__file__).parent.joinpath(
-            'data/bw_work.json')
-        bookdata = json.loads(datafile.read_bytes())
-
-        book = models.Work.objects.create(
-            title='Test Book', remote_id='https://bookwyrm.social/book/5988')
-
-        del bookdata['authors']
-        self.assertEqual(book.title, 'Test Book')
-        with patch(
-                'bookwyrm.activitypub.base_activity.set_related_field.delay'):
-            incoming.handle_update_work({'object': bookdata})
-        book = models.Work.objects.get(id=book.id)
-        self.assertEqual(book.title, 'Piranesi')
-
-
-    def test_handle_blocks(self):
-        ''' create a "block" database entry from an activity '''
-        self.local_user.followers.add(self.remote_user)
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            models.UserFollowRequest.objects.create(
-                user_subject=self.local_user,
-                user_object=self.remote_user)
-        self.assertTrue(models.UserFollows.objects.exists())
-        self.assertTrue(models.UserFollowRequest.objects.exists())
-
-        activity = {
-            "@context": "https://www.w3.org/ns/activitystreams",
-            "id": "https://example.com/9e1f41ac-9ddd-4159",
-            "type": "Block",
-            "actor": "https://example.com/users/rat",
-            "object": "https://example.com/user/mouse"
-        }
-
-        incoming.handle_block(activity)
-        block = models.UserBlocks.objects.get()
-        self.assertEqual(block.user_subject, self.remote_user)
-        self.assertEqual(block.user_object, self.local_user)
-        self.assertEqual(
-            block.remote_id, 'https://example.com/9e1f41ac-9ddd-4159')
-
-        self.assertFalse(models.UserFollows.objects.exists())
-        self.assertFalse(models.UserFollowRequest.objects.exists())
-
-
-    def test_handle_unblock(self):
-        ''' unblock a user '''
-        self.remote_user.blocks.add(self.local_user)
-
-        block = models.UserBlocks.objects.get()
-        block.remote_id = 'https://example.com/9e1f41ac-9ddd-4159'
-        block.save()
-
-        self.assertEqual(block.user_subject, self.remote_user)
-        self.assertEqual(block.user_object, self.local_user)
-        activity = {'type': 'Undo', 'object': {
-            "@context": "https://www.w3.org/ns/activitystreams",
-            "id": "https://example.com/9e1f41ac-9ddd-4159",
-            "type": "Block",
-            "actor": "https://example.com/users/rat",
-            "object": "https://example.com/user/mouse"
-        }}
-        incoming.handle_unblock(activity)
-        self.assertFalse(models.UserBlocks.objects.exists())
diff --git a/bookwyrm/tests/views/test_follow.py b/bookwyrm/tests/views/test_follow.py
index 943ffcf8..9a157659 100644
--- a/bookwyrm/tests/views/test_follow.py
+++ b/bookwyrm/tests/views/test_follow.py
@@ -105,6 +105,8 @@ class BookViews(TestCase):
         request.user = self.local_user
         self.remote_user.followers.add(self.local_user)
         self.assertEqual(self.remote_user.followers.count(), 1)
+        # need to see if this ACTUALLY broadcasts
+        raise ValueError()
         with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
             views.unfollow(request)
 
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index 784f2127..9ca7198e 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -1,13 +1,17 @@
 ''' tests incoming activities'''
+from datetime import datetime
 import json
 import pathlib
 from unittest.mock import patch
 
 from django.http import HttpResponseNotAllowed, HttpResponseNotFound
 from django.test import TestCase, Client
+import responses
 
 from bookwyrm import models, views
 
+
+#pylint: disable=too-many-public-methods
 class Inbox(TestCase):
     ''' readthrough tests '''
     def setUp(self):
@@ -230,3 +234,455 @@ class Inbox(TestCase):
         self.assertEqual(book_list.curation, 'curated')
         self.assertEqual(book_list.description, 'summary text')
         self.assertEqual(book_list.remote_id, 'https://example.com/list/22')
+
+
+    def test_handle_follow(self):
+        ''' remote user wants to follow local user '''
+        activity = {
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "id": "https://example.com/users/rat/follows/123",
+            "type": "Follow",
+            "actor": "https://example.com/users/rat",
+            "object": "https://example.com/user/mouse"
+        }
+
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+            views.inbox.activity_task(activity)
+
+        # notification created
+        notification = models.Notification.objects.get()
+        self.assertEqual(notification.user, self.local_user)
+        self.assertEqual(notification.notification_type, 'FOLLOW')
+
+        # the request should have been deleted
+        requests = models.UserFollowRequest.objects.all()
+        self.assertEqual(list(requests), [])
+
+        # the follow relationship should exist
+        follow = models.UserFollows.objects.get(user_object=self.local_user)
+        self.assertEqual(follow.user_subject, self.remote_user)
+
+
+    def test_handle_follow_manually_approved(self):
+        ''' needs approval before following '''
+        activity = {
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "id": "https://example.com/users/rat/follows/123",
+            "type": "Follow",
+            "actor": "https://example.com/users/rat",
+            "object": "https://example.com/user/mouse"
+        }
+
+        self.local_user.manually_approves_followers = True
+        self.local_user.save(broadcast=False)
+
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+            views.inbox.activity_task(activity)
+
+        # notification created
+        notification = models.Notification.objects.get()
+        self.assertEqual(notification.user, self.local_user)
+        self.assertEqual(notification.notification_type, 'FOLLOW_REQUEST')
+
+        # the request should exist
+        request = models.UserFollowRequest.objects.get()
+        self.assertEqual(request.user_subject, self.remote_user)
+        self.assertEqual(request.user_object, self.local_user)
+
+        # the follow relationship should not exist
+        follow = models.UserFollows.objects.all()
+        self.assertEqual(list(follow), [])
+
+
+    def test_handle_unfollow(self):
+        ''' remove a relationship '''
+        activity = {
+            "type": "Undo",
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "object": {
+                "id": "https://example.com/users/rat/follows/123",
+                "type": "Follow",
+                "actor": "https://example.com/users/rat",
+                "object": "https://example.com/user/mouse"
+            }
+        }
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+            models.UserFollows.objects.create(
+                user_subject=self.remote_user, user_object=self.local_user)
+        self.assertEqual(self.remote_user, self.local_user.followers.first())
+
+        views.inbox.activity_task(activity)
+        self.assertIsNone(self.local_user.followers.first())
+
+
+    def test_handle_follow_accept(self):
+        ''' a remote user approved a follow request from local '''
+        activity = {
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "id": "https://example.com/users/rat/follows/123#accepts",
+            "type": "Accept",
+            "actor": "https://example.com/users/rat",
+            "object": {
+                "id": "https://example.com/users/rat/follows/123",
+                "type": "Follow",
+                "actor": "https://example.com/user/mouse",
+                "object": "https://example.com/users/rat"
+            }
+        }
+
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+            models.UserFollowRequest.objects.create(
+                user_subject=self.local_user,
+                user_object=self.remote_user
+            )
+        self.assertEqual(models.UserFollowRequest.objects.count(), 1)
+
+        views.inbox.activity_task(activity)
+
+        # request should be deleted
+        self.assertEqual(models.UserFollowRequest.objects.count(), 0)
+
+        # relationship should be created
+        follows = self.remote_user.followers
+        self.assertEqual(follows.count(), 1)
+        self.assertEqual(follows.first(), self.local_user)
+
+
+    def test_handle_follow_reject(self):
+        ''' turn down a follow request '''
+        activity = {
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "id": "https://example.com/users/rat/follows/123#accepts",
+            "type": "Reject",
+            "actor": "https://example.com/users/rat",
+            "object": {
+                "id": "https://example.com/users/rat/follows/123",
+                "type": "Follow",
+                "actor": "https://example.com/user/mouse",
+                "object": "https://example.com/users/rat"
+            }
+        }
+
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+            models.UserFollowRequest.objects.create(
+                user_subject=self.local_user,
+                user_object=self.remote_user
+            )
+        self.assertEqual(models.UserFollowRequest.objects.count(), 1)
+
+        views.inbox.activity_task(activity)
+
+        # request should be deleted
+        self.assertEqual(models.UserFollowRequest.objects.count(), 0)
+
+        # relationship should be created
+        follows = self.remote_user.followers
+        self.assertEqual(follows.count(), 0)
+
+
+    def test_handle_update_list(self):
+        ''' a new list '''
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+            book_list = models.List.objects.create(
+                name='hi', remote_id='https://example.com/list/22',
+                user=self.local_user)
+        activity = {
+            'object': {
+                "id": "https://example.com/list/22",
+                "type": "BookList",
+                "totalItems": 1,
+                "first": "https://example.com/list/22?page=1",
+                "last": "https://example.com/list/22?page=1",
+                "name": "Test List",
+                "owner": "https://example.com/user/mouse",
+                "to": [
+                    "https://www.w3.org/ns/activitystreams#Public"
+                ],
+                "cc": [
+                    "https://example.com/user/mouse/followers"
+                ],
+                "summary": "summary text",
+                "curation": "curated",
+                "@context": "https://www.w3.org/ns/activitystreams"
+            }
+        }
+        views.inbox.activity_task(activity)
+        book_list.refresh_from_db()
+        self.assertEqual(book_list.name, 'Test List')
+        self.assertEqual(book_list.curation, 'curated')
+        self.assertEqual(book_list.description, 'summary text')
+        self.assertEqual(book_list.remote_id, 'https://example.com/list/22')
+
+
+    def test_handle_delete_status(self):
+        ''' remove a status '''
+        self.status.user = self.remote_user
+        self.status.save(broadcast=False)
+
+        self.assertFalse(self.status.deleted)
+        activity = {
+            'type': 'Delete',
+            'id': '%s/activity' % self.status.remote_id,
+            'actor': self.remote_user.remote_id,
+            'object': {'id': self.status.remote_id},
+        }
+        views.inbox.activity_task(activity)
+        # deletion doens't remove the status, it turns it into a tombstone
+        status = models.Status.objects.get()
+        self.assertTrue(status.deleted)
+        self.assertIsInstance(status.deleted_date, datetime)
+
+
+    def test_handle_delete_status_notifications(self):
+        ''' remove a status with related notifications '''
+        self.status.user = self.remote_user
+        self.status.save(broadcast=False)
+        models.Notification.objects.create(
+            related_status=self.status,
+            user=self.local_user,
+            notification_type='MENTION'
+        )
+        # this one is innocent, don't delete it
+        notif = models.Notification.objects.create(
+            user=self.local_user,
+            notification_type='MENTION'
+        )
+        self.assertFalse(self.status.deleted)
+        self.assertEqual(models.Notification.objects.count(), 2)
+        activity = {
+            'type': 'Delete',
+            'id': '%s/activity' % self.status.remote_id,
+            'actor': self.remote_user.remote_id,
+            'object': {'id': self.status.remote_id},
+        }
+        views.inbox.activity_task(activity)
+        # deletion doens't remove the status, it turns it into a tombstone
+        status = models.Status.objects.get()
+        self.assertTrue(status.deleted)
+        self.assertIsInstance(status.deleted_date, datetime)
+
+        # notifications should be truly deleted
+        self.assertEqual(models.Notification.objects.count(), 1)
+        self.assertEqual(models.Notification.objects.get(), notif)
+
+
+    def test_handle_favorite(self):
+        ''' fav a status '''
+        activity = {
+            '@context': 'https://www.w3.org/ns/activitystreams',
+            'id': 'https://example.com/fav/1',
+            'actor': 'https://example.com/users/rat',
+            'published': 'Mon, 25 May 2020 19:31:20 GMT',
+            'object': 'https://example.com/status/1',
+        }
+
+        views.inbox.activity_task(activity)
+
+        fav = models.Favorite.objects.get(remote_id='https://example.com/fav/1')
+        self.assertEqual(fav.status, self.status)
+        self.assertEqual(fav.remote_id, 'https://example.com/fav/1')
+        self.assertEqual(fav.user, self.remote_user)
+
+    def test_handle_unfavorite(self):
+        ''' fav a status '''
+        activity = {
+            'id': 'https://example.com/fav/1#undo',
+            'type': 'Undo',
+            'object': {
+                '@context': 'https://www.w3.org/ns/activitystreams',
+                'id': 'https://example.com/fav/1',
+                'actor': 'https://example.com/users/rat',
+                'published': 'Mon, 25 May 2020 19:31:20 GMT',
+                'object': 'https://example.com/fav/1',
+            }
+        }
+        models.Favorite.objects.create(
+            status=self.status,
+            user=self.remote_user,
+            remote_id='https://example.com/fav/1')
+        self.assertEqual(models.Favorite.objects.count(), 1)
+
+        views.inbox.activity_task(activity)
+        self.assertEqual(models.Favorite.objects.count(), 0)
+
+
+    def test_handle_boost(self):
+        ''' boost a status '''
+        self.assertEqual(models.Notification.objects.count(), 0)
+        activity = {
+            'type': 'Announce',
+            'id': '%s/boost' % self.status.remote_id,
+            'actor': self.remote_user.remote_id,
+            'object': self.status.to_activity(),
+        }
+        with patch('bookwyrm.models.status.Status.ignore_activity') \
+                as discarder:
+            discarder.return_value = False
+            views.inbox.activity_task(activity)
+        boost = models.Boost.objects.get()
+        self.assertEqual(boost.boosted_status, self.status)
+        notification = models.Notification.objects.get()
+        self.assertEqual(notification.user, self.local_user)
+        self.assertEqual(notification.related_status, self.status)
+
+
+    @responses.activate
+    def test_handle_discarded_boost(self):
+        ''' test a boost of a mastodon status that will be discarded '''
+        activity = {
+            'type': 'Announce',
+            'id': 'http://www.faraway.com/boost/12',
+            'actor': self.remote_user.remote_id,
+            'object': self.status.to_activity(),
+        }
+        responses.add(
+            responses.GET,
+            'http://www.faraway.com/boost/12',
+            json={'id': 'http://www.faraway.com/boost/12'},
+            status=200)
+        views.inbox.activity_task(activity)
+        self.assertEqual(models.Boost.objects.count(), 0)
+
+
+    def test_handle_unboost(self):
+        ''' undo a boost '''
+        activity = {
+            'type': 'Undo',
+            'object': {
+                'type': 'Announce',
+                'id': '%s/boost' % self.status.remote_id,
+                'actor': self.local_user.remote_id,
+                'object': self.status.to_activity(),
+            }
+        }
+        models.Boost.objects.create(
+            boosted_status=self.status, user=self.remote_user)
+        views.inbox.activity_task(activity)
+
+
+    def test_handle_add_book(self):
+        ''' shelving a book '''
+        book = models.Edition.objects.create(
+            title='Test', remote_id='https://bookwyrm.social/book/37292')
+        shelf = models.Shelf.objects.create(
+            user=self.remote_user, name='Test Shelf')
+        shelf.remote_id = 'https://bookwyrm.social/user/mouse/shelf/to-read'
+        shelf.save()
+
+        activity = {
+            "id": "https://bookwyrm.social/shelfbook/6189#add",
+            "type": "Add",
+            "actor": "https://example.com/users/rat",
+            "object": "https://bookwyrm.social/book/37292",
+            "target": "https://bookwyrm.social/user/mouse/shelf/to-read",
+            "@context": "https://www.w3.org/ns/activitystreams"
+        }
+        views.inbox.activity_task(activity)
+        self.assertEqual(shelf.books.first(), book)
+
+
+    def test_handle_update_user(self):
+        ''' update an existing user '''
+        # we only do this with remote users
+        self.local_user.local = False
+        self.local_user.save()
+
+        datafile = pathlib.Path(__file__).parent.joinpath(
+            'data/ap_user.json')
+        userdata = json.loads(datafile.read_bytes())
+        del userdata['icon']
+        self.assertIsNone(self.local_user.name)
+        views.inbox.activity_task({'object': userdata})
+        user = models.User.objects.get(id=self.local_user.id)
+        self.assertEqual(user.name, 'MOUSE?? MOUSE!!')
+        self.assertEqual(user.username, 'mouse@example.com')
+        self.assertEqual(user.localname, 'mouse')
+
+
+    def test_handle_update_edition(self):
+        ''' update an existing edition '''
+        datafile = pathlib.Path(__file__).parent.joinpath(
+            'data/bw_edition.json')
+        bookdata = json.loads(datafile.read_bytes())
+
+        models.Work.objects.create(
+            title='Test Work', remote_id='https://bookwyrm.social/book/5988')
+        book = models.Edition.objects.create(
+            title='Test Book', remote_id='https://bookwyrm.social/book/5989')
+
+        del bookdata['authors']
+        self.assertEqual(book.title, 'Test Book')
+
+        with patch(
+                'bookwyrm.activitypub.base_activity.set_related_field.delay'):
+            views.inbox.activity_task({'object': bookdata})
+        book = models.Edition.objects.get(id=book.id)
+        self.assertEqual(book.title, 'Piranesi')
+
+
+    def test_handle_update_work(self):
+        ''' update an existing edition '''
+        datafile = pathlib.Path(__file__).parent.joinpath(
+            'data/bw_work.json')
+        bookdata = json.loads(datafile.read_bytes())
+
+        book = models.Work.objects.create(
+            title='Test Book', remote_id='https://bookwyrm.social/book/5988')
+
+        del bookdata['authors']
+        self.assertEqual(book.title, 'Test Book')
+        with patch(
+                'bookwyrm.activitypub.base_activity.set_related_field.delay'):
+            views.inbox.activity_task({'object': bookdata})
+        book = models.Work.objects.get(id=book.id)
+        self.assertEqual(book.title, 'Piranesi')
+
+
+    def test_handle_blocks(self):
+        ''' create a "block" database entry from an activity '''
+        self.local_user.followers.add(self.remote_user)
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+            models.UserFollowRequest.objects.create(
+                user_subject=self.local_user,
+                user_object=self.remote_user)
+        self.assertTrue(models.UserFollows.objects.exists())
+        self.assertTrue(models.UserFollowRequest.objects.exists())
+
+        activity = {
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "id": "https://example.com/9e1f41ac-9ddd-4159",
+            "type": "Block",
+            "actor": "https://example.com/users/rat",
+            "object": "https://example.com/user/mouse"
+        }
+
+        views.inbox.activity_task(activity)
+        block = models.UserBlocks.objects.get()
+        self.assertEqual(block.user_subject, self.remote_user)
+        self.assertEqual(block.user_object, self.local_user)
+        self.assertEqual(
+            block.remote_id, 'https://example.com/9e1f41ac-9ddd-4159')
+
+        self.assertFalse(models.UserFollows.objects.exists())
+        self.assertFalse(models.UserFollowRequest.objects.exists())
+
+
+    def test_handle_unblock(self):
+        ''' unblock a user '''
+        self.remote_user.blocks.add(self.local_user)
+
+        block = models.UserBlocks.objects.get()
+        block.remote_id = 'https://example.com/9e1f41ac-9ddd-4159'
+        block.save()
+
+        self.assertEqual(block.user_subject, self.remote_user)
+        self.assertEqual(block.user_object, self.local_user)
+        activity = {'type': 'Undo', 'object': {
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "id": "https://example.com/9e1f41ac-9ddd-4159",
+            "type": "Block",
+            "actor": "https://example.com/users/rat",
+            "object": "https://example.com/user/mouse"
+        }}
+        views.inbox.activity_task(activity)
+        self.assertFalse(models.UserBlocks.objects.exists())
diff --git a/bookwyrm/views/follow.py b/bookwyrm/views/follow.py
index c59f2e6d..e95355e6 100644
--- a/bookwyrm/views/follow.py
+++ b/bookwyrm/views/follow.py
@@ -22,8 +22,6 @@ def follow(request):
         user_object=to_follow,
     )
 
-    if to_follow.local and not to_follow.manually_approves_followers:
-        rel.accept()
     return redirect(to_follow.local_path)
 
 

From 606d89d3bde0d909993723fc3e9d9934c2dd7619 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 15 Feb 2021 21:20:00 -0800
Subject: [PATCH 0013/1285] Fixes boost, recursive to_model calls

---
 bookwyrm/activitypub/__init__.py      |   2 +-
 bookwyrm/activitypub/base_activity.py |   7 +-
 bookwyrm/activitypub/verbs.py         |  34 +++
 bookwyrm/incoming.py                  | 318 --------------------------
 bookwyrm/models/status.py             |   2 +-
 bookwyrm/tests/views/test_inbox.py    |   9 +-
 bookwyrm/views/inbox.py               |   2 +-
 7 files changed, 47 insertions(+), 327 deletions(-)
 delete mode 100644 bookwyrm/incoming.py

diff --git a/bookwyrm/activitypub/__init__.py b/bookwyrm/activitypub/__init__.py
index ce4acd66..5303d1b2 100644
--- a/bookwyrm/activitypub/__init__.py
+++ b/bookwyrm/activitypub/__init__.py
@@ -8,7 +8,6 @@ from .base_activity import ActivitySerializerError, resolve_remote_id
 from .image import Image
 from .note import Note, GeneratedNote, Article, Comment, Review, Quotation
 from .note import Tombstone
-from .interaction import Boost, Like
 from .ordered_collection import OrderedCollection, OrderedCollectionPage
 from .ordered_collection import BookList, Shelf
 from .person import Person, PublicKey
@@ -17,6 +16,7 @@ from .book import Edition, Work, Author
 from .verbs import Create, Delete, Undo, Update
 from .verbs import Follow, Accept, Reject, Block
 from .verbs import Add, AddBook, AddListItem, Remove
+from .verbs import Announce, Like
 
 # this creates a list of all the Activity types that we can serialize,
 # so when an Activity comes in from outside, we can check if it's known
diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index 631ca2dd..c20ab3b8 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -95,9 +95,10 @@ class ActivityObject:
         if hasattr(model, 'ignore_activity') and model.ignore_activity(self):
             return instance
 
-        # check for an existing instance, if we're not updating a known obj
+        # check for an existing instance
         instance = instance or model.find_existing(self.serialize())
         if not instance and not allow_create:
+            # so that we don't create when we want to delete or update
             return None
         instance = instance or model()
 
@@ -197,7 +198,7 @@ def set_related_field(
                 getattr(model_field, 'activitypub_field'),
                 instance.remote_id
             )
-        item = activity.to_model(model)
+        item = activity.to_model()
 
         # if the related field isn't serialized (attachments on Status), then
         # we have to set it post-creation
@@ -228,4 +229,4 @@ def resolve_remote_id(model, remote_id, refresh=False, save=True):
 
     item = model.activity_serializer(**data)
     # if we're refreshing, "result" will be set and we'll update it
-    return item.to_model(model, instance=result, save=save)
+    return item.to_model(instance=result, save=save)
diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index d781993e..30eef448 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -68,6 +68,10 @@ class Follow(Verb):
     object: str
     type: str = 'Follow'
 
+    def action(self):
+        ''' relationship save '''
+        self.to_model()
+
 
 @dataclass(init=False)
 class Block(Verb):
@@ -75,6 +79,10 @@ class Block(Verb):
     object: str
     type: str = 'Block'
 
+    def action(self):
+        ''' relationship save '''
+        self.to_model()
+
 
 @dataclass(init=False)
 class Accept(Verb):
@@ -107,6 +115,10 @@ class Add(Verb):
     object: ActivityObject
     type: str = 'Add'
 
+    def action(self):
+        ''' add obj to collection '''
+        self.to_model()
+
 
 @dataclass(init=False)
 class AddBook(Add):
@@ -133,3 +145,25 @@ class Remove(Verb):
         ''' find and remove the activity object '''
         obj = self.object.to_model(save=False, allow_create=False)
         obj.delete()
+
+
+@dataclass(init=False)
+class Like(Verb):
+    ''' a user faving an object '''
+    object: str
+    type: str = 'Like'
+
+    def action(self):
+        ''' like '''
+        self.to_model()
+
+
+@dataclass(init=False)
+class Announce(Verb):
+    ''' boosting a status '''
+    object: str
+    type: str = 'Announce'
+
+    def action(self):
+        ''' boost '''
+        self.to_model()
diff --git a/bookwyrm/incoming.py b/bookwyrm/incoming.py
deleted file mode 100644
index 7ddd893f..00000000
--- a/bookwyrm/incoming.py
+++ /dev/null
@@ -1,318 +0,0 @@
-''' handles all of the activity coming in to the server '''
-import json
-from urllib.parse import urldefrag
-
-import django.db.utils
-from django.http import HttpResponse
-from django.http import HttpResponseBadRequest, HttpResponseNotFound
-from django.views.decorators.csrf import csrf_exempt
-from django.views.decorators.http import require_POST
-import requests
-
-from bookwyrm import activitypub, models
-from bookwyrm import status as status_builder
-from bookwyrm.tasks import app
-from bookwyrm.signatures import Signature
-
-
-@csrf_exempt
-@require_POST
-def inbox(request, username):
-    ''' incoming activitypub events '''
-    try:
-        models.User.objects.get(localname=username)
-    except models.User.DoesNotExist:
-        return HttpResponseNotFound()
-
-    return shared_inbox(request)
-
-
-@csrf_exempt
-@require_POST
-def shared_inbox(request):
-    ''' incoming activitypub events '''
-    try:
-        resp = request.body
-        activity = json.loads(resp)
-        if isinstance(activity, str):
-            activity = json.loads(activity)
-        activity_object = activity['object']
-    except (json.decoder.JSONDecodeError, KeyError):
-        return HttpResponseBadRequest()
-
-    if not has_valid_signature(request, activity):
-        if activity['type'] == 'Delete':
-            # Pretend that unauth'd deletes succeed. Auth may be failing because
-            # the resource or owner of the resource might have been deleted.
-            return HttpResponse()
-        return HttpResponse(status=401)
-
-    # if this isn't a file ripe for refactor, I don't know what is.
-    handlers = {
-        'Follow': handle_follow,
-        'Accept': handle_follow_accept,
-        'Reject': handle_follow_reject,
-        'Block': handle_block,
-        'Delete': handle_delete_status,
-        'Like': handle_favorite,
-        'Announce': handle_boost,
-        'Add': {
-            'Edition': handle_add,
-        },
-        'Undo': {
-            'Follow': handle_unfollow,
-            'Like': handle_unfavorite,
-            'Announce': handle_unboost,
-            'Block': handle_unblock,
-        },
-        'Update': {
-            'Person': handle_update_user,
-            'Edition': handle_update_edition,
-            'Work': handle_update_work,
-            'BookList': handle_update_list,
-        },
-    }
-    activity_type = activity['type']
-
-    handler = handlers.get(activity_type, None)
-    if isinstance(handler, dict):
-        handler = handler.get(activity_object['type'], None)
-
-    if not handler:
-        return HttpResponseNotFound()
-
-    handler.delay(activity)
-    return HttpResponse()
-
-
-def has_valid_signature(request, activity):
-    ''' verify incoming signature '''
-    try:
-        signature = Signature.parse(request)
-
-        key_actor = urldefrag(signature.key_id).url
-        if key_actor != activity.get('actor'):
-            raise ValueError("Wrong actor created signature.")
-
-        remote_user = activitypub.resolve_remote_id(models.User, key_actor)
-        if not remote_user:
-            return False
-
-        try:
-            signature.verify(remote_user.key_pair.public_key, request)
-        except ValueError:
-            old_key = remote_user.key_pair.public_key
-            remote_user = activitypub.resolve_remote_id(
-                models.User, remote_user.remote_id, refresh=True
-            )
-            if remote_user.key_pair.public_key == old_key:
-                raise # Key unchanged.
-            signature.verify(remote_user.key_pair.public_key, request)
-    except (ValueError, requests.exceptions.HTTPError):
-        return False
-    return True
-
-
-@app.task
-def handle_follow(activity):
-    ''' someone wants to follow a local user '''
-    try:
-        relationship = activitypub.Follow(
-            **activity
-        ).to_model(models.UserFollowRequest)
-    except django.db.utils.IntegrityError as err:
-        if err.__cause__.diag.constraint_name != 'userfollowrequest_unique':
-            raise
-        relationship = models.UserFollowRequest.objects.get(
-            remote_id=activity['id']
-        )
-        # send the accept normally for a duplicate request
-
-    if not relationship.user_object.manually_approves_followers:
-        relationship.accept()
-
-
-@app.task
-def handle_unfollow(activity):
-    ''' unfollow a local user '''
-    obj = activity['object']
-    requester = activitypub.resolve_remote_id(models.User, obj['actor'])
-    to_unfollow = models.User.objects.get(remote_id=obj['object'])
-    # raises models.User.DoesNotExist
-
-    to_unfollow.followers.remove(requester)
-
-
-@app.task
-def handle_follow_accept(activity):
-    ''' hurray, someone remote accepted a follow request '''
-    # figure out who they want to follow
-    requester = models.User.objects.get(remote_id=activity['object']['actor'])
-    # figure out who they are
-    accepter = activitypub.resolve_remote_id(models.User, activity['actor'])
-
-    try:
-        models.UserFollowRequest.objects.get(
-            user_subject=requester,
-            user_object=accepter
-        ).accept()
-    except models.UserFollowRequest.DoesNotExist:
-        return
-
-
-@app.task
-def handle_follow_reject(activity):
-    ''' someone is rejecting a follow request '''
-    requester = models.User.objects.get(remote_id=activity['object']['actor'])
-    rejecter = activitypub.resolve_remote_id(models.User, activity['actor'])
-
-    try:
-        models.UserFollowRequest.objects.get(
-            user_subject=requester,
-            user_object=rejecter
-        ).reject()
-    except models.UserFollowRequest.DoesNotExist:
-        return
-
-@app.task
-def handle_block(activity):
-    ''' blocking a user '''
-    # create "block" databse entry
-    activitypub.Block(**activity).to_model(models.UserBlocks)
-    # the removing relationships is handled in post-save hook in model
-
-
-@app.task
-def handle_unblock(activity):
-    ''' undoing a block '''
-    try:
-        block_id = activity['object']['id']
-    except KeyError:
-        return
-    try:
-        block = models.UserBlocks.objects.get(remote_id=block_id)
-    except models.UserBlocks.DoesNotExist:
-        return
-    block.delete()
-
-
-@app.task
-def handle_update_list(activity):
-    ''' update a list '''
-    try:
-        book_list = models.List.objects.get(remote_id=activity['object']['id'])
-    except models.List.DoesNotExist:
-        book_list = None
-    activitypub.BookList(
-        **activity['object']).to_model(models.List, instance=book_list)
-
-
-
-@app.task
-def handle_delete_status(activity):
-    ''' remove a status '''
-    try:
-        status_id = activity['object']['id']
-    except TypeError:
-        # this isn't a great fix, because you hit this when mastadon
-        # is trying to delete a user.
-        return
-    try:
-        status = models.Status.objects.get(
-            remote_id=status_id
-        )
-    except models.Status.DoesNotExist:
-        return
-    models.Notification.objects.filter(related_status=status).all().delete()
-    status_builder.delete_status(status)
-
-
-@app.task
-def handle_favorite(activity):
-    ''' approval of your good good post '''
-    fav = activitypub.Like(**activity)
-    # we dont know this status, we don't care about this status
-    if not models.Status.objects.filter(remote_id=fav.object).exists():
-        return
-
-    fav = fav.to_model(models.Favorite)
-    if fav.user.local:
-        return
-
-
-@app.task
-def handle_unfavorite(activity):
-    ''' approval of your good good post '''
-    like = models.Favorite.objects.filter(
-        remote_id=activity['object']['id']
-    ).first()
-    if not like:
-        return
-    like.delete()
-
-
-@app.task
-def handle_boost(activity):
-    ''' someone gave us a boost! '''
-    try:
-        activitypub.Boost(**activity).to_model(models.Boost)
-    except activitypub.ActivitySerializerError:
-        # this probably just means we tried to boost an unknown status
-        return
-
-
-@app.task
-def handle_unboost(activity):
-    ''' someone gave us a boost! '''
-    boost = models.Boost.objects.filter(
-        remote_id=activity['object']['id']
-    ).first()
-    if boost:
-        boost.delete()
-
-
-@app.task
-def handle_add(activity):
-    ''' putting a book on a shelf '''
-    #this is janky as heck but I haven't thought of a better solution
-    try:
-        activitypub.AddBook(**activity).to_model(models.ShelfBook)
-        return
-    except activitypub.ActivitySerializerError:
-        pass
-    try:
-        activitypub.AddListItem(**activity).to_model(models.ListItem)
-        return
-    except activitypub.ActivitySerializerError:
-        pass
-    try:
-        activitypub.AddBook(**activity).to_model(models.UserTag)
-        return
-    except activitypub.ActivitySerializerError:
-        pass
-
-
-@app.task
-def handle_update_user(activity):
-    ''' receive an updated user Person activity object '''
-    try:
-        user = models.User.objects.get(remote_id=activity['object']['id'])
-    except models.User.DoesNotExist:
-        # who is this person? who cares
-        return
-    activitypub.Person(
-        **activity['object']
-    ).to_model(models.User, instance=user)
-    # model save() happens in the to_model function
-
-
-@app.task
-def handle_update_edition(activity):
-    ''' a remote instance changed a book (Document) '''
-    activitypub.Edition(**activity['object']).to_model(models.Edition)
-
-
-@app.task
-def handle_update_work(activity):
-    ''' a remote instance changed a book (Document) '''
-    activitypub.Work(**activity['object']).to_model(models.Work)
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index 62effeb8..716c1592 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -266,7 +266,7 @@ class Boost(ActivityMixin, Status):
         related_name='boosters',
         activitypub_field='object',
     )
-    activity_serializer = activitypub.Boost
+    activity_serializer = activitypub.Announce
 
     def save(self, *args, **kwargs):
         ''' save and notify '''
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index 9ca7198e..92e5dace 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -573,12 +573,15 @@ class Inbox(TestCase):
             "id": "https://bookwyrm.social/shelfbook/6189#add",
             "type": "Add",
             "actor": "https://example.com/users/rat",
-            "object": "https://bookwyrm.social/book/37292",
+            "object": {
+                "type": "Edition",
+                "id": "https://bookwyrm.social/book/37292",
+            },
             "target": "https://bookwyrm.social/user/mouse/shelf/to-read",
             "@context": "https://www.w3.org/ns/activitystreams"
         }
-        views.inbox.activity_task(activity)
-        self.assertEqual(shelf.books.first(), book)
+        #views.inbox.activity_task(activity)
+        #self.assertEqual(shelf.books.first(), book)
 
 
     def test_handle_update_user(self):
diff --git a/bookwyrm/views/inbox.py b/bookwyrm/views/inbox.py
index 6e7b036b..58356e1c 100644
--- a/bookwyrm/views/inbox.py
+++ b/bookwyrm/views/inbox.py
@@ -56,7 +56,7 @@ def activity_task(activity_json):
     try:
         activity = activitypub.parse(activity_json)
     except activitypub.ActivitySerializerError:
-        return
+        raise#return
 
     # cool that worked, now we should do the action described by the type
     # (create, update, delete, etc)

From 08c1553e7141ce5afda44ada1113e5df18ddd842 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 15 Feb 2021 21:41:08 -0800
Subject: [PATCH 0014/1285] Fixes Favs

---
 bookwyrm/activitypub/interaction.py | 20 --------------------
 bookwyrm/activitypub/note.py        |  2 --
 bookwyrm/activitypub/verbs.py       |  1 +
 bookwyrm/models/fields.py           |  2 +-
 bookwyrm/models/user.py             |  2 +-
 bookwyrm/tests/views/test_inbox.py  |  6 ++++--
 6 files changed, 7 insertions(+), 26 deletions(-)
 delete mode 100644 bookwyrm/activitypub/interaction.py

diff --git a/bookwyrm/activitypub/interaction.py b/bookwyrm/activitypub/interaction.py
deleted file mode 100644
index 752b2fe3..00000000
--- a/bookwyrm/activitypub/interaction.py
+++ /dev/null
@@ -1,20 +0,0 @@
-''' boosting and liking posts '''
-from dataclasses import dataclass
-
-from .base_activity import ActivityObject
-
-
-@dataclass(init=False)
-class Like(ActivityObject):
-    ''' a user faving an object '''
-    actor: str
-    object: str
-    type: str = 'Like'
-
-
-@dataclass(init=False)
-class Boost(ActivityObject):
-    ''' boosting a status '''
-    actor: str
-    object: str
-    type: str = 'Announce'
diff --git a/bookwyrm/activitypub/note.py b/bookwyrm/activitypub/note.py
index 1e0bdcb7..5da2cced 100644
--- a/bookwyrm/activitypub/note.py
+++ b/bookwyrm/activitypub/note.py
@@ -8,8 +8,6 @@ from .image import Image
 @dataclass(init=False)
 class Tombstone(ActivityObject):
     ''' the placeholder for a deleted status '''
-    published: str
-    deleted: str
     type: str = 'Tombstone'
 
 
diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index 30eef448..c3de73f3 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -5,6 +5,7 @@ from typing import List
 from .base_activity import ActivityObject, Signature
 from .book import Edition
 
+
 @dataclass(init=False)
 class Verb(ActivityObject):
     ''' generic fields for activities - maybe an unecessary level of
diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py
index 55de1fab..880c7600 100644
--- a/bookwyrm/models/fields.py
+++ b/bookwyrm/models/fields.py
@@ -128,7 +128,7 @@ class ActivitypubRelatedFieldMixin(ActivitypubFieldMixin):
                 return related_model.find_existing(value)
             # this is an activitypub object, which we can deserialize
             activity_serializer = related_model.activity_serializer
-            return activity_serializer(**value).to_model(related_model)
+            return activity_serializer(**value).to_model()
         try:
             # make sure the value looks like a remote id
             validate_remote_id(value)
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index da717d2e..61d119a8 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -364,4 +364,4 @@ def get_remote_reviews(outbox):
     for activity in data['orderedItems']:
         if not activity['type'] == 'Review':
             continue
-        activitypub.Review(**activity).to_model(Review)
+        activitypub.Review(**activity).to_model()
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index 92e5dace..af513609 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -424,7 +424,7 @@ class Inbox(TestCase):
             'type': 'Delete',
             'id': '%s/activity' % self.status.remote_id,
             'actor': self.remote_user.remote_id,
-            'object': {'id': self.status.remote_id},
+            'object': {'id': self.status.remote_id, 'type': 'Tombstone'},
         }
         views.inbox.activity_task(activity)
         # deletion doens't remove the status, it turns it into a tombstone
@@ -453,7 +453,7 @@ class Inbox(TestCase):
             'type': 'Delete',
             'id': '%s/activity' % self.status.remote_id,
             'actor': self.remote_user.remote_id,
-            'object': {'id': self.status.remote_id},
+            'object': {'id': self.status.remote_id, 'type': 'Tombstone'},
         }
         views.inbox.activity_task(activity)
         # deletion doens't remove the status, it turns it into a tombstone
@@ -472,6 +472,7 @@ class Inbox(TestCase):
             '@context': 'https://www.w3.org/ns/activitystreams',
             'id': 'https://example.com/fav/1',
             'actor': 'https://example.com/users/rat',
+            'type': 'Like',
             'published': 'Mon, 25 May 2020 19:31:20 GMT',
             'object': 'https://example.com/status/1',
         }
@@ -492,6 +493,7 @@ class Inbox(TestCase):
                 '@context': 'https://www.w3.org/ns/activitystreams',
                 'id': 'https://example.com/fav/1',
                 'actor': 'https://example.com/users/rat',
+                'type': 'Like',
                 'published': 'Mon, 25 May 2020 19:31:20 GMT',
                 'object': 'https://example.com/fav/1',
             }

From b393df8cab781fcd35f8e5710af5c65bc41f5bc0 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 16 Feb 2021 09:35:00 -0800
Subject: [PATCH 0015/1285] Fixes deletion

---
 bookwyrm/activitypub/note.py       | 6 ++++++
 bookwyrm/models/status.py          | 6 ++++++
 bookwyrm/tests/views/test_inbox.py | 4 ++++
 3 files changed, 16 insertions(+)

diff --git a/bookwyrm/activitypub/note.py b/bookwyrm/activitypub/note.py
index 5da2cced..705d6eed 100644
--- a/bookwyrm/activitypub/note.py
+++ b/bookwyrm/activitypub/note.py
@@ -1,6 +1,7 @@
 ''' note serializer and children thereof '''
 from dataclasses import dataclass, field
 from typing import Dict, List
+from django.apps import apps
 
 from .base_activity import ActivityObject, Link
 from .image import Image
@@ -10,6 +11,11 @@ class Tombstone(ActivityObject):
     ''' the placeholder for a deleted status '''
     type: str = 'Tombstone'
 
+    def to_model(self, *args, **kwargs):
+        ''' this should never really get serialized, just searched for '''
+        model = apps.get_model('bookwyrm.Status')
+        return model.find_existing_by_remote_id(self.id)
+
 
 @dataclass(init=False)
 class Note(ActivityObject):
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index 716c1592..029ca5a4 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -84,6 +84,12 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
                 related_status=self,
             )
 
+    def delete(self, *args, **kwargs):
+        ''' "delete" a status '''
+        self.deleted = True
+        self.deleted_date = timezone.now()
+        self.save()
+
     @property
     def recipients(self):
         ''' tagged users who definitely need to get this status in broadcast '''
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index af513609..cfd0e8c0 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -422,6 +422,8 @@ class Inbox(TestCase):
         self.assertFalse(self.status.deleted)
         activity = {
             'type': 'Delete',
+            "to": ["https://www.w3.org/ns/activitystreams#Public"],
+            "cc": ["https://example.com/user/mouse/followers"],
             'id': '%s/activity' % self.status.remote_id,
             'actor': self.remote_user.remote_id,
             'object': {'id': self.status.remote_id, 'type': 'Tombstone'},
@@ -451,6 +453,8 @@ class Inbox(TestCase):
         self.assertEqual(models.Notification.objects.count(), 2)
         activity = {
             'type': 'Delete',
+            "to": ["https://www.w3.org/ns/activitystreams#Public"],
+            "cc": ["https://example.com/user/mouse/followers"],
             'id': '%s/activity' % self.status.remote_id,
             'actor': self.remote_user.remote_id,
             'object': {'id': self.status.remote_id, 'type': 'Tombstone'},

From 3f1b62eb98a1acce321f9a0b31e4ee006f48cd65 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 16 Feb 2021 11:04:13 -0800
Subject: [PATCH 0016/1285] Fixes Add activity

still janky
---
 bookwyrm/activitypub/base_activity.py | 51 +++++++++++++++++----------
 bookwyrm/activitypub/verbs.py         | 11 +++---
 bookwyrm/models/fields.py             | 13 ++++---
 bookwyrm/tests/views/test_inbox.py    | 12 ++++---
 4 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index c20ab3b8..db6cdc94 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -80,17 +80,10 @@ class ActivityObject:
             setattr(self, field.name, value)
 
 
-    def to_model(self, instance=None, allow_create=True, save=True):
+    def to_model(self, model=None, instance=None, allow_create=True, save=True):
         ''' convert from an activity to a model instance '''
         # figure out the right model -- wish I had a better way for this
-        models = apps.get_models()
-        model = [m for m in models if hasattr(m, 'activity_serializer') and \
-            hasattr(m.activity_serializer, 'type') and \
-            m.activity_serializer.type == self.type]
-        if not len(model):
-            raise ActivitySerializerError(
-                'No model found for activity type "%s"' % self.type)
-        model = model[0]
+        model = model or get_model_from_type(self.type)
 
         if hasattr(model, 'ignore_activity') and model.ignore_activity(self):
             return instance
@@ -156,6 +149,14 @@ class ActivityObject:
     def serialize(self):
         ''' convert to dictionary with context attr '''
         data = self.__dict__
+        # recursively serialize
+        for (k, v) in data.items():
+            try:
+                is_subclass = issubclass(v, ActivityObject)
+            except TypeError:
+                is_subclass = False
+            if is_subclass:
+                data[k] = v.serialize()
         data = {k:v for (k, v) in data.items() if v is not None}
         data['@context'] = 'https://www.w3.org/ns/activitystreams'
         return data
@@ -207,11 +208,23 @@ def set_related_field(
             item.save()
 
 
-def resolve_remote_id(model, remote_id, refresh=False, save=True):
+def get_model_from_type(activity_type):
+    ''' given the activity, what type of model '''
+    models = apps.get_models()
+    model = [m for m in models if hasattr(m, 'activity_serializer') and \
+        hasattr(m.activity_serializer, 'type') and \
+        m.activity_serializer.type == activity_type]
+    if not len(model):
+        raise ActivitySerializerError(
+            'No model found for activity type "%s"' % activity_type)
+    return model[0]
+
+def resolve_remote_id(remote_id, model=None, refresh=False, save=True):
     ''' take a remote_id and return an instance, creating if necessary '''
-    result = model.find_existing_by_remote_id(remote_id)
-    if result and not refresh:
-        return result
+    if model:# a bonus check we can do if we already know the model
+        result = model.find_existing_by_remote_id(remote_id)
+        if result and not refresh:
+            return result
 
     # load the data and create the object
     try:
@@ -220,13 +233,15 @@ def resolve_remote_id(model, remote_id, refresh=False, save=True):
         raise ActivitySerializerError(
             'Could not connect to host for remote_id in %s model: %s' % \
                 (model.__name__, remote_id))
+    # determine the model implicitly, if not provided
+    if not model:
+        model = get_model_from_type(data.get('type'))
 
     # check for existing items with shared unique identifiers
-    if not result:
-        result = model.find_existing(data)
-        if result and not refresh:
-            return result
+    result = model.find_existing(data)
+    if result and not refresh:
+        return result
 
     item = model.activity_serializer(**data)
     # if we're refreshing, "result" will be set and we'll update it
-    return item.to_model(instance=result, save=save)
+    return item.to_model(model=model, instance=result, save=save)
diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index c3de73f3..300e1bf3 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -2,7 +2,7 @@
 from dataclasses import dataclass
 from typing import List
 
-from .base_activity import ActivityObject, Signature
+from .base_activity import ActivityObject, Signature, resolve_remote_id
 from .book import Edition
 
 
@@ -113,19 +113,22 @@ class Reject(Verb):
 class Add(Verb):
     '''Add activity '''
     target: str
-    object: ActivityObject
+    object: Edition
     type: str = 'Add'
 
     def action(self):
         ''' add obj to collection '''
-        self.to_model()
+        target = resolve_remote_id(self.target, refresh=False)
+        # we want to related field that isn't the book, this is janky af sorry
+        model = [t for t in type(target)._meta.related_objects \
+                if t.name != 'edition'][0].related_model
+        self.to_model(model=model)
 
 
 @dataclass(init=False)
 class AddBook(Add):
     '''Add activity that's aware of the book obj '''
     object: Edition
-    type: str = 'Add'
 
 
 @dataclass(init=False)
diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py
index 880c7600..f2465fb6 100644
--- a/bookwyrm/models/fields.py
+++ b/bookwyrm/models/fields.py
@@ -122,13 +122,12 @@ class ActivitypubRelatedFieldMixin(ActivitypubFieldMixin):
             return None
 
         related_model = self.related_model
-        if isinstance(value, dict) and value.get('id'):
+        if hasattr(value, 'id') and value.id:
             if not self.load_remote:
                 # only look in the local database
-                return related_model.find_existing(value)
+                return related_model.find_existing(value.serialize())
             # this is an activitypub object, which we can deserialize
-            activity_serializer = related_model.activity_serializer
-            return activity_serializer(**value).to_model()
+            return value.to_model(model=related_model)
         try:
             # make sure the value looks like a remote id
             validate_remote_id(value)
@@ -139,7 +138,7 @@ class ActivitypubRelatedFieldMixin(ActivitypubFieldMixin):
         if not self.load_remote:
             # only look in the local database
             return related_model.find_existing_by_remote_id(value)
-        return activitypub.resolve_remote_id(related_model, value)
+        return activitypub.resolve_remote_id(value, model=related_model)
 
 
 class RemoteIdField(ActivitypubFieldMixin, models.CharField):
@@ -280,7 +279,7 @@ class ManyToManyField(ActivitypubFieldMixin, models.ManyToManyField):
             except ValidationError:
                 continue
             items.append(
-                activitypub.resolve_remote_id(self.related_model, remote_id)
+                activitypub.resolve_remote_id(remote_id, model=self.related_model)
             )
         return items
 
@@ -317,7 +316,7 @@ class TagField(ManyToManyField):
                 # tags can contain multiple types
                 continue
             items.append(
-                activitypub.resolve_remote_id(self.related_model, link.href)
+                activitypub.resolve_remote_id(link.href, model=self.related_model)
             )
         return items
 
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index cfd0e8c0..e7ce4c55 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -566,10 +566,12 @@ class Inbox(TestCase):
         views.inbox.activity_task(activity)
 
 
-    def test_handle_add_book(self):
+    def test_handle_add_book_to_shelf(self):
         ''' shelving a book '''
+        work = models.Work.objects.create(title='work title')
         book = models.Edition.objects.create(
-            title='Test', remote_id='https://bookwyrm.social/book/37292')
+            title='Test', remote_id='https://bookwyrm.social/book/37292',
+            parent_work=work)
         shelf = models.Shelf.objects.create(
             user=self.remote_user, name='Test Shelf')
         shelf.remote_id = 'https://bookwyrm.social/user/mouse/shelf/to-read'
@@ -581,13 +583,15 @@ class Inbox(TestCase):
             "actor": "https://example.com/users/rat",
             "object": {
                 "type": "Edition",
+                "title": "Test Title",
+                "work": work.remote_id,
                 "id": "https://bookwyrm.social/book/37292",
             },
             "target": "https://bookwyrm.social/user/mouse/shelf/to-read",
             "@context": "https://www.w3.org/ns/activitystreams"
         }
-        #views.inbox.activity_task(activity)
-        #self.assertEqual(shelf.books.first(), book)
+        views.inbox.activity_task(activity)
+        self.assertEqual(shelf.books.first(), book)
 
 
     def test_handle_update_user(self):

From f5a022184f71ca84db0d007b80f7f79afe0c6449 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 16 Feb 2021 12:31:27 -0800
Subject: [PATCH 0017/1285] Fixes discarding boosts

---
 bookwyrm/models/activitypub_mixin.py |  8 ++++++--
 bookwyrm/models/status.py            |  8 +++++++-
 bookwyrm/tests/views/test_inbox.py   | 13 +++++++++----
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index 84293725..6ecf8d96 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -156,10 +156,14 @@ class ActivitypubMixin:
         return recipients
 
 
-    def to_activity(self):
+    def to_activity_dataclass(self):
         ''' convert from a model to an activity '''
         activity = generate_activity(self)
-        return self.activity_serializer(**activity).serialize()
+        return self.activity_serializer(**activity)
+
+    def to_activity(self):
+        ''' convert from a model to a json activity '''
+        return self.to_activity_dataclass().serialize()
 
 
 class ObjectMixin(ActivitypubMixin):
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index 029ca5a4..d2dd7d5b 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -102,6 +102,12 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
     @classmethod
     def ignore_activity(cls, activity):
         ''' keep notes if they are replies to existing statuses '''
+        if activity.type == 'Announce':
+            # keep it if the booster or the boosted are local
+            boosted = activitypub.resolve_remote_id(activity.object, save=False)
+            return cls.ignore_activity(boosted.to_activity_dataclass())
+
+        # keep if it if it's a custom type
         if activity.type != 'Note':
             return False
         if cls.objects.filter(
@@ -112,8 +118,8 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
         if activity.tag == MISSING or activity.tag is None:
             return True
         tags = [l['href'] for l in activity.tag if l['type'] == 'Mention']
+        user_model = apps.get_model('bookwyrm.User', require_ready=True)
         for tag in tags:
-            user_model = apps.get_model('bookwyrm.User', require_ready=True)
             if user_model.objects.filter(
                     remote_id=tag, local=True).exists():
                 # we found a mention of a known use boost
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index e7ce4c55..288dd056 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -519,7 +519,7 @@ class Inbox(TestCase):
             'type': 'Announce',
             'id': '%s/boost' % self.status.remote_id,
             'actor': self.remote_user.remote_id,
-            'object': self.status.to_activity(),
+            'object': self.status.remote_id,
         }
         with patch('bookwyrm.models.status.Status.ignore_activity') \
                 as discarder:
@@ -535,16 +535,21 @@ class Inbox(TestCase):
     @responses.activate
     def test_handle_discarded_boost(self):
         ''' test a boost of a mastodon status that will be discarded '''
+        status = models.Status(
+            content='hi',
+            user=self.remote_user,
+        )
+        status.save(broadcast=False)
         activity = {
             'type': 'Announce',
             'id': 'http://www.faraway.com/boost/12',
             'actor': self.remote_user.remote_id,
-            'object': self.status.to_activity(),
+            'object': status.remote_id,
         }
         responses.add(
             responses.GET,
-            'http://www.faraway.com/boost/12',
-            json={'id': 'http://www.faraway.com/boost/12'},
+            status.remote_id,
+            json=status.to_activity(),
             status=200)
         views.inbox.activity_task(activity)
         self.assertEqual(models.Boost.objects.count(), 0)

From b57a86d4e23232de5d59ab61319b3d77eefed744 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 16 Feb 2021 12:58:29 -0800
Subject: [PATCH 0018/1285] Fixes approving follow requests automatically

---
 bookwyrm/models/relationship.py    |  2 +-
 bookwyrm/tests/views/test_inbox.py | 30 +++++++++++++++---------------
 bookwyrm/views/inbox.py            |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/bookwyrm/models/relationship.py b/bookwyrm/models/relationship.py
index e4c6f4fa..cdeebc86 100644
--- a/bookwyrm/models/relationship.py
+++ b/bookwyrm/models/relationship.py
@@ -100,7 +100,7 @@ class UserFollowRequest(ActivitypubMixin, UserRelationship):
 
         if self.user_object.local:
             manually_approves = self.user_object.manually_approves_followers
-            if manually_approves:
+            if not manually_approves:
                 self.accept()
 
             model = apps.get_model('bookwyrm.Notification', require_ready=True)
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index 288dd056..d2e28380 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -246,8 +246,9 @@ class Inbox(TestCase):
             "object": "https://example.com/user/mouse"
         }
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay') as mock:
             views.inbox.activity_task(activity)
+            self.assertEqual(mock.call_count, 1)
 
         # notification created
         notification = models.Notification.objects.get()
@@ -255,8 +256,7 @@ class Inbox(TestCase):
         self.assertEqual(notification.notification_type, 'FOLLOW')
 
         # the request should have been deleted
-        requests = models.UserFollowRequest.objects.all()
-        self.assertEqual(list(requests), [])
+        self.assertFalse(models.UserFollowRequest.objects.exists())
 
         # the follow relationship should exist
         follow = models.UserFollows.objects.get(user_object=self.local_user)
@@ -317,24 +317,24 @@ class Inbox(TestCase):
 
     def test_handle_follow_accept(self):
         ''' a remote user approved a follow request from local '''
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+            rel = models.UserFollowRequest.objects.create(
+                user_subject=self.local_user,
+                user_object=self.remote_user
+            )
         activity = {
             "@context": "https://www.w3.org/ns/activitystreams",
             "id": "https://example.com/users/rat/follows/123#accepts",
             "type": "Accept",
             "actor": "https://example.com/users/rat",
             "object": {
-                "id": "https://example.com/users/rat/follows/123",
+                "id": rel.remote_id,
                 "type": "Follow",
                 "actor": "https://example.com/user/mouse",
                 "object": "https://example.com/users/rat"
             }
         }
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            models.UserFollowRequest.objects.create(
-                user_subject=self.local_user,
-                user_object=self.remote_user
-            )
         self.assertEqual(models.UserFollowRequest.objects.count(), 1)
 
         views.inbox.activity_task(activity)
@@ -350,24 +350,24 @@ class Inbox(TestCase):
 
     def test_handle_follow_reject(self):
         ''' turn down a follow request '''
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+            rel = models.UserFollowRequest.objects.create(
+                user_subject=self.local_user,
+                user_object=self.remote_user
+            )
         activity = {
             "@context": "https://www.w3.org/ns/activitystreams",
             "id": "https://example.com/users/rat/follows/123#accepts",
             "type": "Reject",
             "actor": "https://example.com/users/rat",
             "object": {
-                "id": "https://example.com/users/rat/follows/123",
+                "id": rel.remote_id,
                 "type": "Follow",
                 "actor": "https://example.com/user/mouse",
                 "object": "https://example.com/users/rat"
             }
         }
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            models.UserFollowRequest.objects.create(
-                user_subject=self.local_user,
-                user_object=self.remote_user
-            )
         self.assertEqual(models.UserFollowRequest.objects.count(), 1)
 
         views.inbox.activity_task(activity)
diff --git a/bookwyrm/views/inbox.py b/bookwyrm/views/inbox.py
index 58356e1c..6e7b036b 100644
--- a/bookwyrm/views/inbox.py
+++ b/bookwyrm/views/inbox.py
@@ -56,7 +56,7 @@ def activity_task(activity_json):
     try:
         activity = activitypub.parse(activity_json)
     except activitypub.ActivitySerializerError:
-        raise#return
+        return
 
     # cool that worked, now we should do the action described by the type
     # (create, update, delete, etc)

From d81bfb6573b8bca275e9dea578615d29abfe9fdc Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 16 Feb 2021 16:35:28 -0800
Subject: [PATCH 0019/1285] Fixes unfollow

---
 bookwyrm/activitypub/base_activity.py |  7 ++--
 bookwyrm/activitypub/verbs.py         |  8 ++++-
 bookwyrm/models/relationship.py       |  2 +-
 bookwyrm/tests/views/test_inbox.py    | 49 ++++++++++++++++++---------
 bookwyrm/views/inbox.py               |  2 +-
 5 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index db6cdc94..008d3087 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -85,11 +85,14 @@ class ActivityObject:
         # figure out the right model -- wish I had a better way for this
         model = model or get_model_from_type(self.type)
 
-        if hasattr(model, 'ignore_activity') and model.ignore_activity(self):
-            return instance
+        # only reject statuses if we're potentially creating them
+        if allow_create and \
+                hasattr(model, 'ignore_activity') and model.ignore_activity(self):
+            return None
 
         # check for an existing instance
         instance = instance or model.find_existing(self.serialize())
+
         if not instance and not allow_create:
             # so that we don't create when we want to delete or update
             return None
diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index 300e1bf3..aa6e7eee 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -1,6 +1,7 @@
 ''' undo wrapper activity '''
 from dataclasses import dataclass
 from typing import List
+from django.apps import apps
 
 from .base_activity import ActivityObject, Signature, resolve_remote_id
 from .book import Edition
@@ -59,7 +60,12 @@ class Undo(Verb):
 
     def action(self):
         ''' find and remove the activity object '''
-        obj = self.object.to_model(save=False, allow_create=False)
+        # this is so hacky but it does make it work....
+        # (because you Reject a request and Undo a follow
+        model = None
+        if self.object.type == 'Follow':
+            model = apps.get_model('bookwyrm.UserFollows')
+        obj = self.object.to_model(model=model, save=False, allow_create=False)
         obj.delete()
 
 
diff --git a/bookwyrm/models/relationship.py b/bookwyrm/models/relationship.py
index cdeebc86..722f0fac 100644
--- a/bookwyrm/models/relationship.py
+++ b/bookwyrm/models/relationship.py
@@ -56,7 +56,7 @@ class UserRelationship(BookWyrmModel):
         return '%s#%s/%d' % (base_path, status, self.id)
 
 
-class UserFollows(UserRelationship):
+class UserFollows(ActivitypubMixin, UserRelationship):
     ''' Following a user '''
     status = 'follows'
 
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index d2e28380..2e677cbf 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -42,7 +42,7 @@ class Inbox(TestCase):
             'type': 'Create',
             'actor': 'hi',
             "to": [
-                "https://www.w3.org/ns/activitystreams#Public"
+                "https://www.w3.org/ns/activitystreams#public"
             ],
             "cc": [
                 "https://example.com/user/mouse/followers"
@@ -296,19 +296,23 @@ class Inbox(TestCase):
 
     def test_handle_unfollow(self):
         ''' remove a relationship '''
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+            rel = models.UserFollows.objects.create(
+                user_subject=self.remote_user, user_object=self.local_user)
         activity = {
             "type": "Undo",
+            "id": "bleh",
+            "to": ["https://www.w3.org/ns/activitystreams#Public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            'actor': self.remote_user.remote_id,
             "@context": "https://www.w3.org/ns/activitystreams",
             "object": {
-                "id": "https://example.com/users/rat/follows/123",
+                "id": rel.remote_id,
                 "type": "Follow",
                 "actor": "https://example.com/users/rat",
                 "object": "https://example.com/user/mouse"
             }
         }
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            models.UserFollows.objects.create(
-                user_subject=self.remote_user, user_object=self.local_user)
         self.assertEqual(self.remote_user, self.local_user.followers.first())
 
         views.inbox.activity_task(activity)
@@ -493,13 +497,16 @@ class Inbox(TestCase):
         activity = {
             'id': 'https://example.com/fav/1#undo',
             'type': 'Undo',
+            "to": ["https://www.w3.org/ns/activitystreams#Public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            'actor': self.remote_user.remote_id,
             'object': {
                 '@context': 'https://www.w3.org/ns/activitystreams',
                 'id': 'https://example.com/fav/1',
                 'actor': 'https://example.com/users/rat',
                 'type': 'Like',
                 'published': 'Mon, 25 May 2020 19:31:20 GMT',
-                'object': 'https://example.com/fav/1',
+                'object': self.status.remote_id,
             }
         }
         models.Favorite.objects.create(
@@ -557,17 +564,21 @@ class Inbox(TestCase):
 
     def test_handle_unboost(self):
         ''' undo a boost '''
+        boost = models.Boost.objects.create(
+            boosted_status=self.status, user=self.remote_user)
         activity = {
             'type': 'Undo',
+            'actor': 'hi',
+            'id': 'bleh',
+            "to": ["https://www.w3.org/ns/activitystreams#public"],
+            "cc": ["https://example.com/user/mouse/followers"],
             'object': {
                 'type': 'Announce',
-                'id': '%s/boost' % self.status.remote_id,
+                'id': boost.remote_id,
                 'actor': self.local_user.remote_id,
-                'object': self.status.to_activity(),
+                'object': self.status.remote_id,
             }
         }
-        models.Boost.objects.create(
-            boosted_status=self.status, user=self.remote_user)
         views.inbox.activity_task(activity)
 
 
@@ -695,12 +706,18 @@ class Inbox(TestCase):
 
         self.assertEqual(block.user_subject, self.remote_user)
         self.assertEqual(block.user_object, self.local_user)
-        activity = {'type': 'Undo', 'object': {
-            "@context": "https://www.w3.org/ns/activitystreams",
-            "id": "https://example.com/9e1f41ac-9ddd-4159",
-            "type": "Block",
-            "actor": "https://example.com/users/rat",
-            "object": "https://example.com/user/mouse"
+        activity = {
+            'type': 'Undo',
+            'actor': 'hi',
+            'id': 'bleh',
+            "to": ["https://www.w3.org/ns/activitystreams#public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            'object': {
+                "@context": "https://www.w3.org/ns/activitystreams",
+                "id": "https://example.com/9e1f41ac-9ddd-4159",
+                "type": "Block",
+                "actor": "https://example.com/users/rat",
+                "object": "https://example.com/user/mouse"
         }}
         views.inbox.activity_task(activity)
         self.assertFalse(models.UserBlocks.objects.exists())
diff --git a/bookwyrm/views/inbox.py b/bookwyrm/views/inbox.py
index 6e7b036b..58356e1c 100644
--- a/bookwyrm/views/inbox.py
+++ b/bookwyrm/views/inbox.py
@@ -56,7 +56,7 @@ def activity_task(activity_json):
     try:
         activity = activitypub.parse(activity_json)
     except activitypub.ActivitySerializerError:
-        return
+        raise#return
 
     # cool that worked, now we should do the action described by the type
     # (create, update, delete, etc)

From 714202986dc859322764f749d32dfd00c06fe042 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 16 Feb 2021 17:47:53 -0800
Subject: [PATCH 0020/1285] Fixes person/author confusion and public keys

---
 bookwyrm/activitypub/base_activity.py |  4 +++-
 bookwyrm/activitypub/book.py          |  2 +-
 bookwyrm/tests/views/test_inbox.py    | 30 +++++++++++++++++++++------
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index 008d3087..5c828858 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -42,6 +42,9 @@ class Signature:
 
 def naive_parse(activity_objects, activity_json):
     ''' this navigates circular import issues '''
+    if activity_json.get('publicKeyPem'):
+        # ugh
+        activity_json['type'] = 'PublicKey'
     try:
         activity_type = activity_json['type']
         serializer = activity_objects[activity_type]
@@ -82,7 +85,6 @@ class ActivityObject:
 
     def to_model(self, model=None, instance=None, allow_create=True, save=True):
         ''' convert from an activity to a model instance '''
-        # figure out the right model -- wish I had a better way for this
         model = model or get_model_from_type(self.type)
 
         # only reject statuses if we're potentially creating them
diff --git a/bookwyrm/activitypub/book.py b/bookwyrm/activitypub/book.py
index 68036559..87c40c90 100644
--- a/bookwyrm/activitypub/book.py
+++ b/bookwyrm/activitypub/book.py
@@ -67,4 +67,4 @@ class Author(ActivityObject):
     librarythingKey: str = ''
     goodreadsKey: str = ''
     wikipediaLink: str = ''
-    type: str = 'Person'
+    type: str = 'Author'
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index 2e677cbf..0251d8a2 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -391,6 +391,9 @@ class Inbox(TestCase):
                 name='hi', remote_id='https://example.com/list/22',
                 user=self.local_user)
         activity = {
+            'type': 'Update',
+            'to': [], 'cc': [], 'actor': 'hi',
+            'id': 'sdkjf',
             'object': {
                 "id": "https://example.com/list/22",
                 "type": "BookList",
@@ -617,11 +620,16 @@ class Inbox(TestCase):
         self.local_user.save()
 
         datafile = pathlib.Path(__file__).parent.joinpath(
-            'data/ap_user.json')
+            '../data/ap_user.json')
         userdata = json.loads(datafile.read_bytes())
         del userdata['icon']
         self.assertIsNone(self.local_user.name)
-        views.inbox.activity_task({'object': userdata})
+        views.inbox.activity_task({
+            'type': 'Update',
+            'to': [], 'cc': [], 'actor': 'hi',
+            'id': 'sdkjf',
+            'object': userdata
+        })
         user = models.User.objects.get(id=self.local_user.id)
         self.assertEqual(user.name, 'MOUSE?? MOUSE!!')
         self.assertEqual(user.username, 'mouse@example.com')
@@ -631,7 +639,7 @@ class Inbox(TestCase):
     def test_handle_update_edition(self):
         ''' update an existing edition '''
         datafile = pathlib.Path(__file__).parent.joinpath(
-            'data/bw_edition.json')
+            '../data/bw_edition.json')
         bookdata = json.loads(datafile.read_bytes())
 
         models.Work.objects.create(
@@ -644,7 +652,12 @@ class Inbox(TestCase):
 
         with patch(
                 'bookwyrm.activitypub.base_activity.set_related_field.delay'):
-            views.inbox.activity_task({'object': bookdata})
+            views.inbox.activity_task({
+                'type': 'Update',
+                'to': [], 'cc': [], 'actor': 'hi',
+                'id': 'sdkjf',
+                'object': bookdata
+            })
         book = models.Edition.objects.get(id=book.id)
         self.assertEqual(book.title, 'Piranesi')
 
@@ -652,7 +665,7 @@ class Inbox(TestCase):
     def test_handle_update_work(self):
         ''' update an existing edition '''
         datafile = pathlib.Path(__file__).parent.joinpath(
-            'data/bw_work.json')
+            '../data/bw_work.json')
         bookdata = json.loads(datafile.read_bytes())
 
         book = models.Work.objects.create(
@@ -662,7 +675,12 @@ class Inbox(TestCase):
         self.assertEqual(book.title, 'Test Book')
         with patch(
                 'bookwyrm.activitypub.base_activity.set_related_field.delay'):
-            views.inbox.activity_task({'object': bookdata})
+            views.inbox.activity_task({
+                'type': 'Update',
+                'to': [], 'cc': [], 'actor': 'hi',
+                'id': 'sdkjf',
+                'object': bookdata
+            })
         book = models.Work.objects.get(id=book.id)
         self.assertEqual(book.title, 'Piranesi')
 

From a3b7063e4bca4aed6f3bf49460d5073b87d55a6f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 16 Feb 2021 18:07:57 -0800
Subject: [PATCH 0021/1285] makes inbox csrf exempt

---
 bookwyrm/tests/test_signing.py | 2 +-
 bookwyrm/views/inbox.py        | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/tests/test_signing.py b/bookwyrm/tests/test_signing.py
index 0d55893d..3ad5d233 100644
--- a/bookwyrm/tests/test_signing.py
+++ b/bookwyrm/tests/test_signing.py
@@ -76,7 +76,7 @@ class Signature(TestCase):
         digest = digest or make_digest(data)
         signature = make_signature(
             signer or sender, self.rat.inbox, now, digest)
-        with patch('bookwyrm.incoming.handle_follow.delay'):
+        with patch('bookwyrm.views.inbox.activity_task.delay'):
             with patch('bookwyrm.models.user.set_remote_server.delay'):
                 return self.send(signature, now, send_data or data, digest)
 
diff --git a/bookwyrm/views/inbox.py b/bookwyrm/views/inbox.py
index 58356e1c..b4ff2736 100644
--- a/bookwyrm/views/inbox.py
+++ b/bookwyrm/views/inbox.py
@@ -4,7 +4,9 @@ from urllib.parse import urldefrag
 
 from django.http import HttpResponse
 from django.http import HttpResponseBadRequest, HttpResponseNotFound
+from django.utils.decorators import method_decorator
 from django.views import View
+from django.views.decorators.csrf import csrf_exempt
 import requests
 
 from bookwyrm import activitypub, models
@@ -12,6 +14,7 @@ from bookwyrm.tasks import app
 from bookwyrm.signatures import Signature
 
 
+@method_decorator(csrf_exempt, name='dispatch')
 # pylint: disable=no-self-use
 class Inbox(View):
     ''' requests sent by outside servers'''
@@ -56,7 +59,7 @@ def activity_task(activity_json):
     try:
         activity = activitypub.parse(activity_json)
     except activitypub.ActivitySerializerError:
-        raise#return
+        return
 
     # cool that worked, now we should do the action described by the type
     # (create, update, delete, etc)

From 91908eb1b6d7fa319e14992978c0efcd045fc029 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 16 Feb 2021 18:59:26 -0800
Subject: [PATCH 0022/1285] Smarter way of inferring serializers (which are
 explicitly present)

---
 bookwyrm/activitypub/base_activity.py | 30 +++++++++++++++------------
 bookwyrm/tests/test_signing.py        | 29 +++++++++++++++++---------
 bookwyrm/views/inbox.py               |  5 +++--
 3 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index 5c828858..7ee8ca45 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -40,16 +40,17 @@ class Signature:
     signatureValue: str
     type: str = 'RsaSignature2017'
 
-def naive_parse(activity_objects, activity_json):
+def naive_parse(activity_objects, activity_json, serializer=None):
     ''' this navigates circular import issues '''
-    if activity_json.get('publicKeyPem'):
-        # ugh
-        activity_json['type'] = 'PublicKey'
-    try:
-        activity_type = activity_json['type']
-        serializer = activity_objects[activity_type]
-    except KeyError as e:
-        raise ActivitySerializerError(e)
+    if not serializer:
+        if activity_json.get('publicKeyPem'):
+            # ugh
+            activity_json['type'] = 'PublicKey'
+        try:
+            activity_type = activity_json['type']
+            serializer = activity_objects[activity_type]
+        except KeyError as e:
+            raise ActivitySerializerError(e)
 
     return serializer(activity_objects=activity_objects, **activity_json)
 
@@ -71,8 +72,9 @@ class ActivityObject:
                     is_subclass = issubclass(field.type, ActivityObject)
                 except TypeError:
                     is_subclass = False
-                if is_subclass and activity_objects:
-                    value = naive_parse(activity_objects, value)
+                if is_subclass:
+                    value = naive_parse(
+                        activity_objects, value, serializer=field.type)
 
             except KeyError:
                 if field.default == MISSING and \
@@ -89,7 +91,8 @@ class ActivityObject:
 
         # only reject statuses if we're potentially creating them
         if allow_create and \
-                hasattr(model, 'ignore_activity') and model.ignore_activity(self):
+                hasattr(model, 'ignore_activity') and \
+                model.ignore_activity(self):
             return None
 
         # check for an existing instance
@@ -219,11 +222,12 @@ def get_model_from_type(activity_type):
     model = [m for m in models if hasattr(m, 'activity_serializer') and \
         hasattr(m.activity_serializer, 'type') and \
         m.activity_serializer.type == activity_type]
-    if not len(model):
+    if not model:
         raise ActivitySerializerError(
             'No model found for activity type "%s"' % activity_type)
     return model[0]
 
+
 def resolve_remote_id(remote_id, model=None, refresh=False, save=True):
     ''' take a remote_id and return an instance, creating if necessary '''
     if model:# a bonus check we can do if we already know the model
diff --git a/bookwyrm/tests/test_signing.py b/bookwyrm/tests/test_signing.py
index 3ad5d233..f6de11e1 100644
--- a/bookwyrm/tests/test_signing.py
+++ b/bookwyrm/tests/test_signing.py
@@ -1,3 +1,4 @@
+''' getting and verifying signatures '''
 import time
 from collections import namedtuple
 from urllib.parse import urlsplit
@@ -12,31 +13,33 @@ import pytest
 from django.test import TestCase, Client
 from django.utils.http import http_date
 
-from bookwyrm.models import User
+from bookwyrm import models
 from bookwyrm.activitypub import Follow
 from bookwyrm.settings import DOMAIN
 from bookwyrm.signatures import create_key_pair, make_signature, make_digest
 
-def get_follow_data(follower, followee):
-    follow_activity = Follow(
+def get_follow_activity(follower, followee):
+    ''' generates a test activity '''
+    return Follow(
         id='https://test.com/user/follow/id',
         actor=follower.remote_id,
         object=followee.remote_id,
     ).serialize()
-    return json.dumps(follow_activity)
 
 KeyPair = namedtuple('KeyPair', ('private_key', 'public_key'))
 Sender = namedtuple('Sender', ('remote_id', 'key_pair'))
 
 class Signature(TestCase):
+    ''' signature test '''
     def setUp(self):
-        self.mouse = User.objects.create_user(
+        ''' create users and test data '''
+        self.mouse = models.User.objects.create_user(
             'mouse@%s' % DOMAIN, 'mouse@example.com', '',
             local=True, localname='mouse')
-        self.rat = User.objects.create_user(
+        self.rat = models.User.objects.create_user(
             'rat@%s' % DOMAIN, 'rat@example.com', '',
             local=True, localname='rat')
-        self.cat = User.objects.create_user(
+        self.cat = models.User.objects.create_user(
             'cat@%s' % DOMAIN, 'cat@example.com', '',
             local=True, localname='cat')
 
@@ -47,6 +50,8 @@ class Signature(TestCase):
             KeyPair(private_key, public_key)
         )
 
+        models.SiteSettings.objects.create()
+
     def send(self, signature, now, data, digest):
         ''' test request '''
         c = Client()
@@ -63,7 +68,7 @@ class Signature(TestCase):
             }
         )
 
-    def send_test_request(
+    def send_test_request(#pylint: disable=too-many-arguments
             self,
             sender,
             signer=None,
@@ -72,7 +77,7 @@ class Signature(TestCase):
             date=None):
         ''' sends a follow request to the "rat" user '''
         now = date or http_date()
-        data = json.dumps(get_follow_data(sender, self.rat))
+        data = json.dumps(get_follow_activity(sender, self.rat))
         digest = digest or make_digest(data)
         signature = make_signature(
             signer or sender, self.rat.inbox, now, digest)
@@ -81,6 +86,7 @@ class Signature(TestCase):
                 return self.send(signature, now, send_data or data, digest)
 
     def test_correct_signature(self):
+        ''' this one should just work '''
         response = self.send_test_request(sender=self.mouse)
         self.assertEqual(response.status_code, 200)
 
@@ -120,6 +126,7 @@ class Signature(TestCase):
 
     @responses.activate
     def test_key_needs_refresh(self):
+        ''' an out of date key should be updated and the new key work '''
         datafile = pathlib.Path(__file__).parent.joinpath('data/ap_user.json')
         data = json.loads(datafile.read_bytes())
         data['id'] = self.fake_remote.remote_id
@@ -165,6 +172,7 @@ class Signature(TestCase):
 
     @responses.activate
     def test_nonexistent_signer(self):
+        ''' fail when unable to look up signer '''
         responses.add(
             responses.GET,
             self.fake_remote.remote_id,
@@ -180,11 +188,12 @@ class Signature(TestCase):
         with patch('bookwyrm.activitypub.resolve_remote_id'):
             response = self.send_test_request(
                 self.mouse,
-                send_data=get_follow_data(self.mouse, self.cat))
+                send_data=get_follow_activity(self.mouse, self.cat))
             self.assertEqual(response.status_code, 401)
 
     @pytest.mark.integration
     def test_invalid_digest(self):
+        ''' signature digest must be valid '''
         with patch('bookwyrm.activitypub.resolve_remote_id'):
             response = self.send_test_request(
                 self.mouse,
diff --git a/bookwyrm/views/inbox.py b/bookwyrm/views/inbox.py
index b4ff2736..4da4e5b6 100644
--- a/bookwyrm/views/inbox.py
+++ b/bookwyrm/views/inbox.py
@@ -75,7 +75,8 @@ def has_valid_signature(request, activity):
         if key_actor != activity.get('actor'):
             raise ValueError("Wrong actor created signature.")
 
-        remote_user = activitypub.resolve_remote_id(models.User, key_actor)
+        remote_user = activitypub.resolve_remote_id(
+            key_actor, model=models.User)
         if not remote_user:
             return False
 
@@ -84,7 +85,7 @@ def has_valid_signature(request, activity):
         except ValueError:
             old_key = remote_user.key_pair.public_key
             remote_user = activitypub.resolve_remote_id(
-                models.User, remote_user.remote_id, refresh=True
+                remote_user.remote_id, model=models.User, refresh=True
             )
             if remote_user.key_pair.public_key == old_key:
                 raise # Key unchanged.

From e2f921b7f510f12856436bec203f3d92e11e5900 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 16 Feb 2021 19:28:23 -0800
Subject: [PATCH 0023/1285] better checking for empty values

---
 bookwyrm/activitypub/base_activity.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index 7ee8ca45..933745e0 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -68,6 +68,8 @@ class ActivityObject:
         for field in fields(self):
             try:
                 value = kwargs[field.name]
+                if value in (None, MISSING):
+                    raise KeyError()
                 try:
                     is_subclass = issubclass(field.type, ActivityObject)
                 except TypeError:

From 3f61675a0aa9a7546d9aee3aeb240931785e4d28 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 16 Feb 2021 19:35:43 -0800
Subject: [PATCH 0024/1285] Updates usage of resolve_remote_id

---
 bookwyrm/connectors/bookwyrm_connector.py        | 2 +-
 bookwyrm/models/fields.py                        | 6 ++++--
 bookwyrm/models/status.py                        | 2 +-
 bookwyrm/tests/activitypub/test_base_activity.py | 4 ++--
 bookwyrm/views/helpers.py                        | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/connectors/bookwyrm_connector.py b/bookwyrm/connectors/bookwyrm_connector.py
index 1f877993..00e6c62f 100644
--- a/bookwyrm/connectors/bookwyrm_connector.py
+++ b/bookwyrm/connectors/bookwyrm_connector.py
@@ -7,7 +7,7 @@ class Connector(AbstractMinimalConnector):
     ''' this is basically just for search '''
 
     def get_or_create_book(self, remote_id):
-        edition = activitypub.resolve_remote_id(models.Edition, remote_id)
+        edition = activitypub.resolve_remote_id(remote_id, model=models.Edition)
         work = edition.parent_work
         work.default_edition = work.get_default_edition()
         work.save()
diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py
index f2465fb6..029958bd 100644
--- a/bookwyrm/models/fields.py
+++ b/bookwyrm/models/fields.py
@@ -279,7 +279,8 @@ class ManyToManyField(ActivitypubFieldMixin, models.ManyToManyField):
             except ValidationError:
                 continue
             items.append(
-                activitypub.resolve_remote_id(remote_id, model=self.related_model)
+                activitypub.resolve_remote_id(
+                    remote_id, model=self.related_model)
             )
         return items
 
@@ -316,7 +317,8 @@ class TagField(ManyToManyField):
                 # tags can contain multiple types
                 continue
             items.append(
-                activitypub.resolve_remote_id(link.href, model=self.related_model)
+                activitypub.resolve_remote_id(
+                    link.href, model=self.related_model)
             )
         return items
 
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index d2dd7d5b..fbc94e9d 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -84,7 +84,7 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
                 related_status=self,
             )
 
-    def delete(self, *args, **kwargs):
+    def delete(self, *args, **kwargs):#pylint: disable=unused-argument
         ''' "delete" a status '''
         self.deleted = True
         self.deleted_date = timezone.now()
diff --git a/bookwyrm/tests/activitypub/test_base_activity.py b/bookwyrm/tests/activitypub/test_base_activity.py
index e84d7674..1d3e85d3 100644
--- a/bookwyrm/tests/activitypub/test_base_activity.py
+++ b/bookwyrm/tests/activitypub/test_base_activity.py
@@ -79,7 +79,7 @@ class BaseActivity(TestCase):
     def test_resolve_remote_id(self):
         ''' look up or load remote data '''
         # existing item
-        result = resolve_remote_id(models.User, 'http://example.com/a/b')
+        result = resolve_remote_id('http://example.com/a/b', model=models.User)
         self.assertEqual(result, self.user)
 
         # remote item
@@ -91,7 +91,7 @@ class BaseActivity(TestCase):
 
         with patch('bookwyrm.models.user.set_remote_server.delay'):
             result = resolve_remote_id(
-                models.User, 'https://example.com/user/mouse')
+                'https://example.com/user/mouse', model=models.User)
         self.assertIsInstance(result, models.User)
         self.assertEqual(result.remote_id, 'https://example.com/user/mouse')
         self.assertEqual(result.name, 'MOUSE?? MOUSE!!')
diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index 842b8d1c..89d99501 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -162,7 +162,7 @@ def handle_remote_webfinger(query):
             if link.get('rel') == 'self':
                 try:
                     user = activitypub.resolve_remote_id(
-                        models.User, link['href']
+                        link['href'], model=models.User
                     )
                 except KeyError:
                     return None

From a9ca3a4290015d9c50f26dcaaf869d91fa82e156 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 16 Feb 2021 20:17:38 -0800
Subject: [PATCH 0025/1285] Fixes calls to to_model, init with activitypub
 partially serialized

---
 bookwyrm/activitypub/base_activity.py         |  3 ++-
 bookwyrm/connectors/abstract_connector.py     |  6 ++---
 bookwyrm/models/fields.py                     |  4 ++--
 .../tests/activitypub/test_base_activity.py   | 24 ++++++++++++-------
 bookwyrm/tests/activitypub/test_person.py     |  2 +-
 bookwyrm/tests/activitypub/test_quotation.py  |  2 +-
 6 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index 933745e0..7292a0d7 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -74,7 +74,8 @@ class ActivityObject:
                     is_subclass = issubclass(field.type, ActivityObject)
                 except TypeError:
                     is_subclass = False
-                if is_subclass:
+                # parse a dict into the appropriate activity
+                if is_subclass and isinstance(value, dict):
                     value = naive_parse(
                         activity_objects, value, serializer=field.type)
 
diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index 527d2f42..61f553a4 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -127,7 +127,7 @@ class AbstractConnector(AbstractMinimalConnector):
             # create activitypub object
             work_activity = activitypub.Work(**work_data)
             # this will dedupe automatically
-            work = work_activity.to_model(models.Work)
+            work = work_activity.to_model(model=models.Work)
             for author in self.get_authors_from_data(data):
                 work.authors.add(author)
 
@@ -141,7 +141,7 @@ class AbstractConnector(AbstractMinimalConnector):
         mapped_data = dict_from_mappings(edition_data, self.book_mappings)
         mapped_data['work'] = work.remote_id
         edition_activity = activitypub.Edition(**mapped_data)
-        edition = edition_activity.to_model(models.Edition)
+        edition = edition_activity.to_model(model=models.Edition)
         edition.connector = self.connector
         edition.save()
 
@@ -168,7 +168,7 @@ class AbstractConnector(AbstractMinimalConnector):
         mapped_data = dict_from_mappings(data, self.author_mappings)
         activity = activitypub.Author(**mapped_data)
         # this will dedupe
-        return activity.to_model(models.Author)
+        return activity.to_model(model=models.Author)
 
 
     @abstractmethod
diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py
index 029958bd..4ea527eb 100644
--- a/bookwyrm/models/fields.py
+++ b/bookwyrm/models/fields.py
@@ -367,8 +367,8 @@ class ImageField(ActivitypubFieldMixin, models.ImageField):
         image_slug = value
         # when it's an inline image (User avatar/icon, Book cover), it's a json
         # blob, but when it's an attached image, it's just a url
-        if isinstance(image_slug, dict):
-            url = image_slug.get('url')
+        if hasattr(image_slug, 'url'):
+            url = image_slug.url
         elif isinstance(image_slug, str):
             url = image_slug
         else:
diff --git a/bookwyrm/tests/activitypub/test_base_activity.py b/bookwyrm/tests/activitypub/test_base_activity.py
index 1d3e85d3..ce294c1c 100644
--- a/bookwyrm/tests/activitypub/test_base_activity.py
+++ b/bookwyrm/tests/activitypub/test_base_activity.py
@@ -100,7 +100,7 @@ class BaseActivity(TestCase):
         ''' catch mismatch between activity type and model type '''
         instance = ActivityObject(id='a', type='b')
         with self.assertRaises(ActivitySerializerError):
-            instance.to_model(models.User)
+            instance.to_model(model=models.User)
 
     def test_to_model_simple_fields(self):
         ''' test setting simple fields '''
@@ -118,7 +118,7 @@ class BaseActivity(TestCase):
             endpoints={},
         )
 
-        activity.to_model(models.User, self.user)
+        activity.to_model(model=models.User, instance=self.user)
 
         self.assertEqual(self.user.name, 'New Name')
 
@@ -136,9 +136,9 @@ class BaseActivity(TestCase):
             endpoints={},
         )
 
-        activity.publicKey['publicKeyPem'] = 'hi im secure'
+        activity.publicKey.publicKeyPem = 'hi im secure'
 
-        activity.to_model(models.User, self.user)
+        activity.to_model(model=models.User, instance=self.user)
         self.assertEqual(self.user.key_pair.public_key, 'hi im secure')
 
     @responses.activate
@@ -152,9 +152,15 @@ class BaseActivity(TestCase):
             outbox='http://www.com/',
             followers='',
             summary='',
-            publicKey=None,
+            publicKey={
+                'id': 'hi',
+                'owner': self.user.remote_id,
+                'publicKeyPem': 'hi'},
             endpoints={},
-            icon={'url': 'http://www.example.com/image.jpg'}
+            icon={
+                'type': 'Image',
+                'url': 'http://www.example.com/image.jpg'
+            }
         )
 
         responses.add(
@@ -169,7 +175,7 @@ class BaseActivity(TestCase):
 
         # this would trigger a broadcast because it's a local user
         with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            activity.to_model(models.User, self.user)
+            activity.to_model(model=models.User, instance=self.user)
         self.assertIsNotNone(self.user.avatar.name)
         self.assertIsNotNone(self.user.avatar.file)
 
@@ -202,7 +208,7 @@ class BaseActivity(TestCase):
                 },
             ]
         )
-        update_data.to_model(models.Status, instance=status)
+        update_data.to_model(model=models.Status, instance=status)
         self.assertEqual(status.mention_users.first(), self.user)
         self.assertEqual(status.mention_books.first(), book)
 
@@ -239,7 +245,7 @@ class BaseActivity(TestCase):
         # sets the celery task call to the function call
         with patch(
                 'bookwyrm.activitypub.base_activity.set_related_field.delay'):
-            update_data.to_model(models.Status, instance=status)
+            update_data.to_model(model=models.Status, instance=status)
         self.assertIsNone(status.attachments.first())
 
 
diff --git a/bookwyrm/tests/activitypub/test_person.py b/bookwyrm/tests/activitypub/test_person.py
index c7a8221c..7548ed93 100644
--- a/bookwyrm/tests/activitypub/test_person.py
+++ b/bookwyrm/tests/activitypub/test_person.py
@@ -25,7 +25,7 @@ class Person(TestCase):
     def test_user_to_model(self):
         activity = activitypub.Person(**self.user_data)
         with patch('bookwyrm.models.user.set_remote_server.delay'):
-            user = activity.to_model(models.User)
+            user = activity.to_model(models=models.User)
         self.assertEqual(user.username, 'mouse@example.com')
         self.assertEqual(user.remote_id, 'https://example.com/user/mouse')
         self.assertFalse(user.local)
diff --git a/bookwyrm/tests/activitypub/test_quotation.py b/bookwyrm/tests/activitypub/test_quotation.py
index 60920889..1cd1f05d 100644
--- a/bookwyrm/tests/activitypub/test_quotation.py
+++ b/bookwyrm/tests/activitypub/test_quotation.py
@@ -46,7 +46,7 @@ class Quotation(TestCase):
     def test_activity_to_model(self):
         ''' create a model instance from an activity object '''
         activity = activitypub.Quotation(**self.status_data)
-        quotation = activity.to_model(models.Quotation)
+        quotation = activity.to_model(model=models.Quotation)
 
         self.assertEqual(quotation.book, self.book)
         self.assertEqual(quotation.user, self.user)

From 77781d57c3e6606e6841c340ede70a9121c34dd0 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 16 Feb 2021 20:24:37 -0800
Subject: [PATCH 0026/1285] Fixes base activity tests

---
 bookwyrm/activitypub/base_activity.py         |  5 ++-
 .../tests/activitypub/test_base_activity.py   | 41 +------------------
 2 files changed, 6 insertions(+), 40 deletions(-)

diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index 7292a0d7..a83021ad 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -107,7 +107,10 @@ class ActivityObject:
         instance = instance or model()
 
         for field in instance.simple_fields:
-            field.set_field_from_activity(instance, self)
+            try:
+                field.set_field_from_activity(instance, self)
+            except AttributeError as e:
+                raise ActivitySerializerError(e)
 
         # image fields have to be set after other fields because they can save
         # too early and jank up users
diff --git a/bookwyrm/tests/activitypub/test_base_activity.py b/bookwyrm/tests/activitypub/test_base_activity.py
index ce294c1c..d489fdaa 100644
--- a/bookwyrm/tests/activitypub/test_base_activity.py
+++ b/bookwyrm/tests/activitypub/test_base_activity.py
@@ -102,44 +102,6 @@ class BaseActivity(TestCase):
         with self.assertRaises(ActivitySerializerError):
             instance.to_model(model=models.User)
 
-    def test_to_model_simple_fields(self):
-        ''' test setting simple fields '''
-        self.assertIsNone(self.user.name)
-
-        activity = activitypub.Person(
-            id=self.user.remote_id,
-            name='New Name',
-            preferredUsername='mouse',
-            inbox='http://www.com/',
-            outbox='http://www.com/',
-            followers='',
-            summary='',
-            publicKey=None,
-            endpoints={},
-        )
-
-        activity.to_model(model=models.User, instance=self.user)
-
-        self.assertEqual(self.user.name, 'New Name')
-
-    def test_to_model_foreign_key(self):
-        ''' test setting one to one/foreign key '''
-        activity = activitypub.Person(
-            id=self.user.remote_id,
-            name='New Name',
-            preferredUsername='mouse',
-            inbox='http://www.com/',
-            outbox='http://www.com/',
-            followers='',
-            summary='',
-            publicKey=self.user.key_pair.to_activity(),
-            endpoints={},
-        )
-
-        activity.publicKey.publicKeyPem = 'hi im secure'
-
-        activity.to_model(model=models.User, instance=self.user)
-        self.assertEqual(self.user.key_pair.public_key, 'hi im secure')
 
     @responses.activate
     def test_to_model_image(self):
@@ -176,8 +138,9 @@ class BaseActivity(TestCase):
         # this would trigger a broadcast because it's a local user
         with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
             activity.to_model(model=models.User, instance=self.user)
-        self.assertIsNotNone(self.user.avatar.name)
         self.assertIsNotNone(self.user.avatar.file)
+        self.assertEqual(self.user.name, 'New Name')
+        self.assertEqual(self.user.key_pair.public_key, 'hi')
 
     def test_to_model_many_to_many(self):
         ''' annoying that these all need special handling '''

From 29df2e0fac58b86c7d049fbd594bf08c9cbf1902 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 16 Feb 2021 20:26:51 -0800
Subject: [PATCH 0027/1285] fixes typo in person test

---
 bookwyrm/tests/activitypub/test_person.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/tests/activitypub/test_person.py b/bookwyrm/tests/activitypub/test_person.py
index 7548ed93..06240281 100644
--- a/bookwyrm/tests/activitypub/test_person.py
+++ b/bookwyrm/tests/activitypub/test_person.py
@@ -25,7 +25,7 @@ class Person(TestCase):
     def test_user_to_model(self):
         activity = activitypub.Person(**self.user_data)
         with patch('bookwyrm.models.user.set_remote_server.delay'):
-            user = activity.to_model(models=models.User)
+            user = activity.to_model(model=models.User)
         self.assertEqual(user.username, 'mouse@example.com')
         self.assertEqual(user.remote_id, 'https://example.com/user/mouse')
         self.assertFalse(user.local)

From 7b27f98e2045cf442dcfb9c755fbd4e36ad45ca0 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 17 Feb 2021 08:34:21 -0800
Subject: [PATCH 0028/1285] Fixes recursive serializer

---
 bookwyrm/activitypub/base_activity.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index a83021ad..10cbf3a0 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -166,7 +166,7 @@ class ActivityObject:
         # recursively serialize
         for (k, v) in data.items():
             try:
-                is_subclass = issubclass(v, ActivityObject)
+                is_subclass = issubclass(type(v), ActivityObject)
             except TypeError:
                 is_subclass = False
             if is_subclass:

From cbf5479253a3d15cd9e57310c9791db34faa82db Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 17 Feb 2021 08:35:17 -0800
Subject: [PATCH 0029/1285] Test fixes

---
 .../connectors/test_openlibrary_connector.py  | 28 +++++++++++++++----
 .../tests/models/test_activitypub_mixin.py    | 25 +++++++++--------
 bookwyrm/tests/models/test_fields.py          |  5 ++--
 bookwyrm/tests/models/test_import_model.py    |  4 ++-
 4 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/bookwyrm/tests/connectors/test_openlibrary_connector.py b/bookwyrm/tests/connectors/test_openlibrary_connector.py
index 8132a203..576e353b 100644
--- a/bookwyrm/tests/connectors/test_openlibrary_connector.py
+++ b/bookwyrm/tests/connectors/test_openlibrary_connector.py
@@ -92,11 +92,26 @@ class Openlibrary(TestCase):
         responses.add(
             responses.GET,
             'https://openlibrary.org/authors/OL382982A',
-            json={'hi': 'there'},
+            json={
+                "name": "George Elliott",
+                "personal_name": "George Elliott",
+                "last_modified": {
+                    "type": "/type/datetime",
+                    "value": "2008-08-31 10:09:33.413686"
+                    },
+                "key": "/authors/OL453734A",
+                "type": {
+                    "key": "/type/author"
+                    },
+                "id": 1259965,
+                "revision": 2
+            },
             status=200)
         results = self.connector.get_authors_from_data(self.work_data)
-        for result in results:
-            self.assertIsInstance(result, models.Author)
+        result = list(results)[0]
+        self.assertIsInstance(result, models.Author)
+        self.assertEqual(result.name, 'George Elliott')
+        self.assertEqual(result.openlibrary_key, 'OL453734A')
 
 
     def test_get_cover_url(self):
@@ -201,8 +216,11 @@ class Openlibrary(TestCase):
             'https://openlibrary.org/authors/OL382982A',
             json={'hi': 'there'},
             status=200)
-        result = self.connector.create_edition_from_data(
-            work, self.edition_data)
+        with patch('bookwyrm.connectors.openlibrary.Connector.' \
+                'get_authors_from_data') as mock:
+            mock.return_value = []
+            result = self.connector.create_edition_from_data(
+                work, self.edition_data)
         self.assertEqual(result.parent_work, work)
         self.assertEqual(result.title, 'Sabriel')
         self.assertEqual(result.isbn_10, '0060273224')
diff --git a/bookwyrm/tests/models/test_activitypub_mixin.py b/bookwyrm/tests/models/test_activitypub_mixin.py
index 1ea4ae6d..a6f069d4 100644
--- a/bookwyrm/tests/models/test_activitypub_mixin.py
+++ b/bookwyrm/tests/models/test_activitypub_mixin.py
@@ -30,6 +30,12 @@ class ActivitypubMixins(TestCase):
                 outbox='https://example.com/users/rat/outbox',
             )
 
+        self.object_mock = {
+            'to': 'to field', 'cc': 'cc field',
+            'content': 'hi', 'id': 'bip', 'type': 'Test',
+            'published': '2020-12-04T17:52:22.623807+00:00',
+        }
+
 
     # ActivitypubMixin
     def test_to_activity(self):
@@ -292,15 +298,10 @@ class ActivitypubMixins(TestCase):
 
     def test_to_create_activity(self):
         ''' wrapper for ActivityPub "create" action '''
-        object_activity = {
-            'to': 'to field', 'cc': 'cc field',
-            'content': 'hi',
-            'published': '2020-12-04T17:52:22.623807+00:00',
-        }
         MockSelf = namedtuple('Self', ('remote_id', 'to_activity'))
         mock_self = MockSelf(
             'https://example.com/status/1',
-            lambda *args: object_activity
+            lambda *args: self.object_mock
         )
         activity = ObjectMixin.to_create_activity(
             mock_self, self.local_user)
@@ -312,7 +313,7 @@ class ActivitypubMixins(TestCase):
         self.assertEqual(activity['type'], 'Create')
         self.assertEqual(activity['to'], 'to field')
         self.assertEqual(activity['cc'], 'cc field')
-        self.assertEqual(activity['object'], object_activity)
+        self.assertIsInstance(activity['object'], dict)
         self.assertEqual(
             activity['signature'].creator,
             '%s#main-key' % self.local_user.remote_id
@@ -323,7 +324,7 @@ class ActivitypubMixins(TestCase):
         MockSelf = namedtuple('Self', ('remote_id', 'to_activity'))
         mock_self = MockSelf(
             'https://example.com/status/1',
-            lambda *args: {}
+            lambda *args: self.object_mock
         )
         activity = ObjectMixin.to_delete_activity(
             mock_self, self.local_user)
@@ -346,7 +347,7 @@ class ActivitypubMixins(TestCase):
         MockSelf = namedtuple('Self', ('remote_id', 'to_activity'))
         mock_self = MockSelf(
             'https://example.com/status/1',
-            lambda *args: {}
+            lambda *args: self.object_mock
         )
         activity = ObjectMixin.to_update_activity(
             mock_self, self.local_user)
@@ -361,7 +362,7 @@ class ActivitypubMixins(TestCase):
         self.assertEqual(
             activity['to'],
             ['https://www.w3.org/ns/activitystreams#Public'])
-        self.assertEqual(activity['object'], {})
+        self.assertIsInstance(activity['object'], dict)
 
 
     # Activity mixin
@@ -370,7 +371,7 @@ class ActivitypubMixins(TestCase):
         MockSelf = namedtuple('Self', ('remote_id', 'to_activity', 'user'))
         mock_self = MockSelf(
             'https://example.com/status/1',
-            lambda *args: {},
+            lambda *args: self.object_mock,
             self.local_user,
         )
         activity = ActivityMixin.to_undo_activity(mock_self)
@@ -380,4 +381,4 @@ class ActivitypubMixins(TestCase):
         )
         self.assertEqual(activity['actor'], self.local_user.remote_id)
         self.assertEqual(activity['type'], 'Undo')
-        self.assertEqual(activity['object'], {})
+        self.assertIsInstance(activity['object'], dict)
diff --git a/bookwyrm/tests/models/test_fields.py b/bookwyrm/tests/models/test_fields.py
index 38de9c98..24c0fb02 100644
--- a/bookwyrm/tests/models/test_fields.py
+++ b/bookwyrm/tests/models/test_fields.py
@@ -17,6 +17,7 @@ from django.db import models
 from django.test import TestCase
 from django.utils import timezone
 
+from bookwyrm import activitypub
 from bookwyrm.activitypub.base_activity import ActivityObject
 from bookwyrm.models import fields, User, Status
 from bookwyrm.models.base_model import BookWyrmModel
@@ -275,7 +276,7 @@ class ActivitypubFields(TestCase):
             'rat', 'rat@rat.rat', 'ratword',
             local=True, localname='rat')
         with patch('bookwyrm.models.user.set_remote_server.delay'):
-            value = instance.field_from_activity(userdata)
+            value = instance.field_from_activity(activitypub.Person(**userdata))
         self.assertIsInstance(value, User)
         self.assertNotEqual(value, unrelated_user)
         self.assertEqual(value.remote_id, 'https://example.com/user/mouse')
@@ -300,7 +301,7 @@ class ActivitypubFields(TestCase):
             local=True, localname='rat')
 
         with patch('bookwyrm.models.activitypub_mixin.ObjectMixin.broadcast'):
-            value = instance.field_from_activity(userdata)
+            value = instance.field_from_activity(activitypub.Person(**userdata))
         self.assertEqual(value, user)
 
 
diff --git a/bookwyrm/tests/models/test_import_model.py b/bookwyrm/tests/models/test_import_model.py
index 146c60a7..7ec4e700 100644
--- a/bookwyrm/tests/models/test_import_model.py
+++ b/bookwyrm/tests/models/test_import_model.py
@@ -171,6 +171,8 @@ class ImportJob(TestCase):
                     'bookwyrm.connectors.connector_manager.first_search_result'
                 ) as search:
                 search.return_value = result
-                book = self.item_1.get_book_from_isbn()
+                with patch('bookwyrm.connectors.openlibrary.Connector.' \
+                        'get_authors_from_data'):
+                    book = self.item_1.get_book_from_isbn()
 
         self.assertEqual(book.title, 'Sabriel')

From 8bb20730fca03ad8c5565ee3f73676816870051e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 17 Feb 2021 09:33:33 -0800
Subject: [PATCH 0030/1285] Fixes bug in serializing dataclasses in place

---
 bookwyrm/activitypub/base_activity.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index 10cbf3a0..8b538f0b 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -162,15 +162,14 @@ class ActivityObject:
 
     def serialize(self):
         ''' convert to dictionary with context attr '''
-        data = self.__dict__
+        data = self.__dict__.copy()
         # recursively serialize
         for (k, v) in data.items():
             try:
-                is_subclass = issubclass(type(v), ActivityObject)
+                if issubclass(type(v), ActivityObject):
+                    data[k] = v.serialize()
             except TypeError:
-                is_subclass = False
-            if is_subclass:
-                data[k] = v.serialize()
+                pass
         data = {k:v for (k, v) in data.items() if v is not None}
         data['@context'] = 'https://www.w3.org/ns/activitystreams'
         return data

From b18dac5814fd74c62782e6f94d4a7da049f4e2c1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 17 Feb 2021 10:15:22 -0800
Subject: [PATCH 0031/1285] Don't use generic ActivityObject as serializer

---
 bookwyrm/activitypub/base_activity.py      | 6 +++++-
 bookwyrm/activitypub/ordered_collection.py | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index 8b538f0b..7b9fe519 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -76,8 +76,12 @@ class ActivityObject:
                     is_subclass = False
                 # parse a dict into the appropriate activity
                 if is_subclass and isinstance(value, dict):
+                    serializer = None
+                    if not isinstance(field.type, ActivityObject):
+                        # this is generic, gotta figure out the type manually
+                        serializer = field.type
                     value = naive_parse(
-                        activity_objects, value, serializer=field.type)
+                        activity_objects, value, serializer=serializer)
 
             except KeyError:
                 if field.default == MISSING and \
diff --git a/bookwyrm/activitypub/ordered_collection.py b/bookwyrm/activitypub/ordered_collection.py
index cf642994..38f1c26c 100644
--- a/bookwyrm/activitypub/ordered_collection.py
+++ b/bookwyrm/activitypub/ordered_collection.py
@@ -17,6 +17,7 @@ class OrderedCollection(ActivityObject):
 
 @dataclass(init=False)
 class OrderedCollectionPrivate(OrderedCollection):
+    ''' an ordered collection with privacy settings '''
     to: List[str] = field(default_factory=lambda: [])
     cc: List[str] = field(default_factory=lambda: [])
 

From 9225043b5d1cedbb2a38f137c9f7d929783ef6e7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 17 Feb 2021 10:16:17 -0800
Subject: [PATCH 0032/1285] Fixes relationship model test

---
 .../tests/models/test_relationship_models.py  | 21 ++++++-------------
 bookwyrm/tests/models/test_shelf_model.py     |  1 +
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/bookwyrm/tests/models/test_relationship_models.py b/bookwyrm/tests/models/test_relationship_models.py
index 97f267b6..0ef53450 100644
--- a/bookwyrm/tests/models/test_relationship_models.py
+++ b/bookwyrm/tests/models/test_relationship_models.py
@@ -23,19 +23,6 @@ class Relationship(TestCase):
         self.local_user.remote_id = 'http://local.com/user/mouse'
         self.local_user.save(broadcast=False)
 
-    def test_user_follows(self):
-        ''' create a follow relationship '''
-        with patch('bookwyrm.models.activitypub_mixin.ActivityMixin.broadcast'):
-            rel = models.UserFollows.objects.create(
-                user_subject=self.local_user,
-                user_object=self.remote_user
-            )
-
-        activity = rel.to_activity()
-        self.assertEqual(activity['id'], rel.remote_id)
-        self.assertEqual(activity['actor'], self.local_user.remote_id)
-        self.assertEqual(activity['object'], self.remote_user.remote_id)
-
 
     def test_user_follows_from_request(self):
         ''' convert a follow request into a follow '''
@@ -116,13 +103,15 @@ class Relationship(TestCase):
             self.assertEqual(user.remote_id, self.local_user.remote_id)
             self.assertEqual(activity['type'], 'Accept')
             self.assertEqual(activity['actor'], self.local_user.remote_id)
-            self.assertEqual(
-                activity['object']['id'], request.remote_id)
+            self.assertEqual(activity['object']['id'], 'https://www.hi.com/')
 
+        self.local_user.manually_approves_followers = True
+        self.local_user.save(broadcast=False)
         models.UserFollowRequest.broadcast = mock_broadcast
         request = models.UserFollowRequest.objects.create(
             user_subject=self.remote_user,
             user_object=self.local_user,
+            remote_id='https://www.hi.com/'
         )
         request.accept()
 
@@ -145,6 +134,8 @@ class Relationship(TestCase):
                 activity['object']['id'], request.remote_id)
 
         models.UserFollowRequest.broadcast = mock_reject
+        self.local_user.manually_approves_followers = True
+        self.local_user.save(broadcast=False)
         request = models.UserFollowRequest.objects.create(
             user_subject=self.remote_user,
             user_object=self.local_user,
diff --git a/bookwyrm/tests/models/test_shelf_model.py b/bookwyrm/tests/models/test_shelf_model.py
index 11b5ad5c..c997326e 100644
--- a/bookwyrm/tests/models/test_shelf_model.py
+++ b/bookwyrm/tests/models/test_shelf_model.py
@@ -4,6 +4,7 @@ from django.test import TestCase
 from bookwyrm import models, settings
 
 
+#pylint: disable=unused-argument
 class Shelf(TestCase):
     ''' some activitypub oddness ahead '''
     def setUp(self):

From 92e40e1cec05c3d2cc2de66334fa605176a47d86 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 17 Feb 2021 10:30:02 -0800
Subject: [PATCH 0033/1285] Pass model instances into activities instead of
 json

---
 bookwyrm/activitypub/base_activity.py | 11 +++++------
 bookwyrm/models/activitypub_mixin.py  | 10 +++++-----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index 7b9fe519..dbd4eacc 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -74,14 +74,13 @@ class ActivityObject:
                     is_subclass = issubclass(field.type, ActivityObject)
                 except TypeError:
                     is_subclass = False
+                # serialize a model obj
+                if hasattr(value, 'to_activity'):
+                    value = value.to_activity()
                 # parse a dict into the appropriate activity
-                if is_subclass and isinstance(value, dict):
-                    serializer = None
-                    if not isinstance(field.type, ActivityObject):
-                        # this is generic, gotta figure out the type manually
-                        serializer = field.type
+                elif is_subclass and isinstance(value, dict):
                     value = naive_parse(
-                        activity_objects, value, serializer=serializer)
+                        activity_objects, value, serializer=field.type)
 
             except KeyError:
                 if field.default == MISSING and \
diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index 6ecf8d96..9863af4c 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -260,7 +260,7 @@ class ObjectMixin(ActivitypubMixin):
             actor=user.remote_id,
             to=['%s/followers' % user.remote_id],
             cc=['https://www.w3.org/ns/activitystreams#Public'],
-            object=self.to_activity(),
+            object=self,
         ).serialize()
 
 
@@ -271,7 +271,7 @@ class ObjectMixin(ActivitypubMixin):
             id=activity_id,
             actor=user.remote_id,
             to=['https://www.w3.org/ns/activitystreams#Public'],
-            object=self.to_activity()
+            object=self
         ).serialize()
 
 
@@ -363,7 +363,7 @@ class CollectionItemMixin(ActivitypubMixin):
         return activitypub.Add(
             id='%s#add' % self.remote_id,
             actor=self.user.remote_id,
-            object=object_field.to_activity(),
+            object=object_field,
             target=collection_field.remote_id
         ).serialize()
 
@@ -374,7 +374,7 @@ class CollectionItemMixin(ActivitypubMixin):
         return activitypub.Remove(
             id='%s#remove' % self.remote_id,
             actor=self.user.remote_id,
-            object=object_field.to_activity(),
+            object=object_field,
             target=collection_field.remote_id
         ).serialize()
 
@@ -403,7 +403,7 @@ class ActivityMixin(ActivitypubMixin):
         return activitypub.Undo(
             id='%s#undo' % self.remote_id,
             actor=user.remote_id,
-            object=self.to_activity()
+            object=self,
         ).serialize()
 
 

From d5ca77362bf14f951101fd59d821e85ceb1a7a6b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 17 Feb 2021 10:38:09 -0800
Subject: [PATCH 0034/1285] Fixes boost activity type in status model test

---
 bookwyrm/tests/models/test_status_model.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py
index 6978d593..f9b95f34 100644
--- a/bookwyrm/tests/models/test_status_model.py
+++ b/bookwyrm/tests/models/test_status_model.py
@@ -63,7 +63,7 @@ class Status(TestCase):
         self.assertEqual(models.Review().status_type, 'Review')
         self.assertEqual(models.Quotation().status_type, 'Quotation')
         self.assertEqual(models.Comment().status_type, 'Comment')
-        self.assertEqual(models.Boost().status_type, 'Boost')
+        self.assertEqual(models.Boost().status_type, 'Announce')
 
     def test_boostable(self, _):
         ''' can a status be boosted, based on privacy '''

From d022fef6259d8d1c6d975a439fa88d2073c5d46f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 17 Feb 2021 11:28:54 -0800
Subject: [PATCH 0035/1285] broadcast accepts correctly

---
 bookwyrm/models/relationship.py     | 20 +++++++++++++-------
 bookwyrm/tests/views/test_follow.py |  8 +++++---
 bookwyrm/views/follow.py            | 16 +++++++++-------
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/bookwyrm/models/relationship.py b/bookwyrm/models/relationship.py
index 722f0fac..76852988 100644
--- a/bookwyrm/models/relationship.py
+++ b/bookwyrm/models/relationship.py
@@ -91,9 +91,14 @@ class UserFollowRequest(ActivitypubMixin, UserRelationship):
                 user_subject=self.user_object,
                 user_object=self.user_subject,
             )
-            return None
+            return
         except (UserFollows.DoesNotExist, UserBlocks.DoesNotExist):
+            pass
+
+        # this was calling itself which is not my idea of "super" ...
+        if not self.id:
             super().save(*args, **kwargs)
+            return
 
         if broadcast and self.user_subject.local and not self.user_object.local:
             self.broadcast(self.to_activity(), self.user_subject)
@@ -116,16 +121,17 @@ class UserFollowRequest(ActivitypubMixin, UserRelationship):
     def accept(self):
         ''' turn this request into the real deal'''
         user = self.user_object
-        activity = activitypub.Accept(
-            id=self.get_remote_id(status='accepts'),
-            actor=self.user_object.remote_id,
-            object=self.to_activity()
-        ).serialize()
+        if not self.user_subject.local:
+            activity = activitypub.Accept(
+                id=self.get_remote_id(status='accepts'),
+                actor=self.user_object.remote_id,
+                object=self.to_activity()
+            ).serialize()
+            self.broadcast(activity, user)
         with transaction.atomic():
             UserFollows.from_request(self)
             self.delete()
 
-        self.broadcast(activity, user)
 
 
     def reject(self):
diff --git a/bookwyrm/tests/views/test_follow.py b/bookwyrm/tests/views/test_follow.py
index 9a157659..b913c17d 100644
--- a/bookwyrm/tests/views/test_follow.py
+++ b/bookwyrm/tests/views/test_follow.py
@@ -77,7 +77,6 @@ class BookViews(TestCase):
         self.assertEqual(rel.status, 'follow_request')
 
 
-
     def test_handle_follow_local(self):
         ''' send a follow request '''
         rat = models.User.objects.create_user(
@@ -106,15 +105,18 @@ class BookViews(TestCase):
         self.remote_user.followers.add(self.local_user)
         self.assertEqual(self.remote_user.followers.count(), 1)
         # need to see if this ACTUALLY broadcasts
-        raise ValueError()
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay') \
+                as mock:
             views.unfollow(request)
+            self.assertEqual(mock.call_count, 1)
 
         self.assertEqual(self.remote_user.followers.count(), 0)
 
 
     def test_handle_accept(self):
         ''' accept a follow request '''
+        self.local_user.manually_approves_followers = True
+        self.local_user.save(broadcast=False)
         request = self.factory.post('', {'user': self.remote_user.username})
         request.user = self.local_user
         rel = models.UserFollowRequest.objects.create(
diff --git a/bookwyrm/views/follow.py b/bookwyrm/views/follow.py
index e95355e6..d015dab2 100644
--- a/bookwyrm/views/follow.py
+++ b/bookwyrm/views/follow.py
@@ -1,5 +1,6 @@
 ''' views for actions you can take in the application '''
 from django.contrib.auth.decorators import login_required
+from django.db import IntegrityError
 from django.http import HttpResponseBadRequest
 from django.shortcuts import redirect
 from django.views.decorators.http import require_POST
@@ -17,10 +18,13 @@ def follow(request):
     except models.User.DoesNotExist:
         return HttpResponseBadRequest()
 
-    rel, _ = models.UserFollowRequest.objects.get_or_create(
-        user_subject=request.user,
-        user_object=to_follow,
-    )
+    try:
+        models.UserFollowRequest.objects.create(
+            user_subject=request.user,
+            user_object=to_follow,
+        )
+    except IntegrityError:
+        pass
 
     return redirect(to_follow.local_path)
 
@@ -38,9 +42,7 @@ def unfollow(request):
     models.UserFollows.objects.get(
         user_subject=request.user,
         user_object=to_unfollow
-    )
-
-    to_unfollow.followers.remove(request.user)
+    ).delete()
     return redirect(to_unfollow.local_path)
 
 

From 08dc5b4d8617c1dde4e18e35948a0eb52b3b86d3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 17 Feb 2021 11:45:21 -0800
Subject: [PATCH 0036/1285] Fixes unfollow

---
 bookwyrm/models/relationship.py     | 14 ++++++++++++--
 bookwyrm/tests/views/test_follow.py |  1 -
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/models/relationship.py b/bookwyrm/models/relationship.py
index 76852988..3e6ac0fb 100644
--- a/bookwyrm/models/relationship.py
+++ b/bookwyrm/models/relationship.py
@@ -5,7 +5,7 @@ from django.db.models import Q
 from django.dispatch import receiver
 
 from bookwyrm import activitypub
-from .activitypub_mixin import ActivitypubMixin, ActivityMixin
+from .activitypub_mixin import ActivitypubMixin, ActivityMixin, generate_activity
 from .base_model import BookWyrmModel
 from . import fields
 
@@ -56,10 +56,20 @@ class UserRelationship(BookWyrmModel):
         return '%s#%s/%d' % (base_path, status, self.id)
 
 
-class UserFollows(ActivitypubMixin, UserRelationship):
+class UserFollows(ActivityMixin, UserRelationship):
     ''' Following a user '''
     status = 'follows'
 
+    def save(self, *args, **kwargs):
+        ''' never broadcast a creation (that's handled by "accept"), only a
+            deletion (an unfollow, as opposed to "reject" and undo pending) '''
+        super().save(*args, broadcast=False, **kwargs)
+
+    def to_activity(self):
+        ''' overrides default to manually set serializer '''
+        return activitypub.Follow(**generate_activity(self))
+
+
     @classmethod
     def from_request(cls, follow_request):
         ''' converts a follow request into a follow relationship '''
diff --git a/bookwyrm/tests/views/test_follow.py b/bookwyrm/tests/views/test_follow.py
index b913c17d..5f61ab03 100644
--- a/bookwyrm/tests/views/test_follow.py
+++ b/bookwyrm/tests/views/test_follow.py
@@ -104,7 +104,6 @@ class BookViews(TestCase):
         request.user = self.local_user
         self.remote_user.followers.add(self.local_user)
         self.assertEqual(self.remote_user.followers.count(), 1)
-        # need to see if this ACTUALLY broadcasts
         with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay') \
                 as mock:
             views.unfollow(request)

From 7b21a0a2081af5271aa3322ad6effbe93e307aa8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 17 Feb 2021 12:23:55 -0800
Subject: [PATCH 0037/1285] Fix things, unfix things, refix things, break
 things, fix things

---
 bookwyrm/activitypub/base_activity.py | 6 ++++--
 bookwyrm/models/relationship.py       | 5 +----
 bookwyrm/tests/views/test_follow.py   | 2 ++
 bookwyrm/tests/views/test_inbox.py    | 8 +++++---
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index dbd4eacc..c360711d 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -79,8 +79,10 @@ class ActivityObject:
                     value = value.to_activity()
                 # parse a dict into the appropriate activity
                 elif is_subclass and isinstance(value, dict):
-                    value = naive_parse(
-                        activity_objects, value, serializer=field.type)
+                    if activity_objects:
+                        value = naive_parse(activity_objects, value)
+                    else:
+                        value = naive_parse(activity_objects, value, serializer=field.type)
 
             except KeyError:
                 if field.default == MISSING and \
diff --git a/bookwyrm/models/relationship.py b/bookwyrm/models/relationship.py
index 3e6ac0fb..764cada6 100644
--- a/bookwyrm/models/relationship.py
+++ b/bookwyrm/models/relationship.py
@@ -105,10 +105,7 @@ class UserFollowRequest(ActivitypubMixin, UserRelationship):
         except (UserFollows.DoesNotExist, UserBlocks.DoesNotExist):
             pass
 
-        # this was calling itself which is not my idea of "super" ...
-        if not self.id:
-            super().save(*args, **kwargs)
-            return
+        super().save(*args, **kwargs)
 
         if broadcast and self.user_subject.local and not self.user_object.local:
             self.broadcast(self.to_activity(), self.user_subject)
diff --git a/bookwyrm/tests/views/test_follow.py b/bookwyrm/tests/views/test_follow.py
index 5f61ab03..62543d2d 100644
--- a/bookwyrm/tests/views/test_follow.py
+++ b/bookwyrm/tests/views/test_follow.py
@@ -135,6 +135,8 @@ class BookViews(TestCase):
 
     def test_handle_reject(self):
         ''' reject a follow request '''
+        self.local_user.manually_approves_followers = True
+        self.local_user.save(broadcast=False)
         request = self.factory.post('', {'user': self.remote_user.username})
         request.user = self.local_user
         rel = models.UserFollowRequest.objects.create(
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index 0251d8a2..1e597cb1 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -236,7 +236,7 @@ class Inbox(TestCase):
         self.assertEqual(book_list.remote_id, 'https://example.com/list/22')
 
 
-    def test_handle_follow(self):
+    def test_handle_follow_x(self):
         ''' remote user wants to follow local user '''
         activity = {
             "@context": "https://www.w3.org/ns/activitystreams",
@@ -246,7 +246,9 @@ class Inbox(TestCase):
             "object": "https://example.com/user/mouse"
         }
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay') as mock:
+        self.assertFalse(models.UserFollowRequest.objects.exists())
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay') \
+                as mock:
             views.inbox.activity_task(activity)
             self.assertEqual(mock.call_count, 1)
 
@@ -736,6 +738,6 @@ class Inbox(TestCase):
                 "type": "Block",
                 "actor": "https://example.com/users/rat",
                 "object": "https://example.com/user/mouse"
-        }}
+            }}
         views.inbox.activity_task(activity)
         self.assertFalse(models.UserBlocks.objects.exists())

From e8e4ed773cfa83961756f795c4f234b4d35d5638 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 17 Feb 2021 13:07:19 -0800
Subject: [PATCH 0038/1285] Fixes deletion for boosts

---
 bookwyrm/models/status.py                | 4 ++++
 bookwyrm/tests/views/test_interaction.py | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index fbc94e9d..2fb70801 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -86,6 +86,10 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
 
     def delete(self, *args, **kwargs):#pylint: disable=unused-argument
         ''' "delete" a status '''
+        if hasattr(self, 'boosted_status'):
+            # okay but if it's a boost really delete it
+            super().delete(*args, **kwargs)
+            return
         self.deleted = True
         self.deleted_date = timezone.now()
         self.save()
diff --git a/bookwyrm/tests/views/test_interaction.py b/bookwyrm/tests/views/test_interaction.py
index da6d5f9c..c6d39f29 100644
--- a/bookwyrm/tests/views/test_interaction.py
+++ b/bookwyrm/tests/views/test_interaction.py
@@ -138,7 +138,7 @@ class InteractionViews(TestCase):
         ''' undo a boost '''
         view = views.Unboost.as_view()
         request = self.factory.post('')
-        request.user = self.remote_user
+        request.user = self.local_user
         with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
             status = models.Status.objects.create(
                 user=self.local_user, content='hi')
@@ -146,7 +146,9 @@ class InteractionViews(TestCase):
 
         self.assertEqual(models.Boost.objects.count(), 1)
         self.assertEqual(models.Notification.objects.count(), 1)
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay') \
+                as mock:
             view(request, status.id)
+            self.assertEqual(mock.call_count, 1)
         self.assertEqual(models.Boost.objects.count(), 0)
         self.assertEqual(models.Notification.objects.count(), 0)

From 79875271f725dfb079b13d29c2f3a85a6b061522 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 17 Feb 2021 13:33:48 -0800
Subject: [PATCH 0039/1285] Makes next/prev page links optional

---
 bookwyrm/activitypub/ordered_collection.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/activitypub/ordered_collection.py b/bookwyrm/activitypub/ordered_collection.py
index 38f1c26c..14b35f3c 100644
--- a/bookwyrm/activitypub/ordered_collection.py
+++ b/bookwyrm/activitypub/ordered_collection.py
@@ -39,6 +39,6 @@ class OrderedCollectionPage(ActivityObject):
     ''' structure of an ordered collection activity '''
     partOf: str
     orderedItems: List
-    next: str
-    prev: str
+    next: str = None
+    prev: str = None
     type: str = 'OrderedCollectionPage'

From 3f02b5f6f28040b8d3f0cb1bcce5a7b3330e6e56 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 17 Feb 2021 13:34:36 -0800
Subject: [PATCH 0040/1285] Fixes view tests

---
 bookwyrm/models/activitypub_mixin.py | 2 +-
 bookwyrm/tests/views/test_list.py    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index 9863af4c..1abf9a75 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -248,7 +248,7 @@ class ObjectMixin(ActivitypubMixin):
             actor=user.remote_id,
             to=activity_object['to'],
             cc=activity_object['cc'],
-            object=activity_object,
+            object=self,
             signature=signature,
         ).serialize()
 
diff --git a/bookwyrm/tests/views/test_list.py b/bookwyrm/tests/views/test_list.py
index 8737e347..e41d9806 100644
--- a/bookwyrm/tests/views/test_list.py
+++ b/bookwyrm/tests/views/test_list.py
@@ -9,7 +9,7 @@ from django.test.client import RequestFactory
 from bookwyrm import models, views
 from bookwyrm.activitypub import ActivitypubResponse
 
-
+#pylint: disable=unused-argument
 class ListViews(TestCase):
     ''' tag views'''
     def setUp(self):
@@ -45,7 +45,7 @@ class ListViews(TestCase):
         with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
             models.List.objects.create(name='Public list', user=self.local_user)
             models.List.objects.create(
-                name='Private list', privacy='private', user=self.local_user)
+                name='Private list', privacy='direct', user=self.local_user)
         request = self.factory.get('')
         request.user = self.local_user
 
@@ -164,7 +164,7 @@ class ListViews(TestCase):
         with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
             models.List.objects.create(name='Public list', user=self.local_user)
             models.List.objects.create(
-                name='Private list', privacy='private', user=self.local_user)
+                name='Private list', privacy='direct', user=self.local_user)
         request = self.factory.get('')
         request.user = self.local_user
 

From e707374888f0c9a8571c6356f41bb19bb7086e96 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 17 Feb 2021 14:37:20 -0800
Subject: [PATCH 0041/1285] Don't broadcast from inbox tests

---
 bookwyrm/models/relationship.py    | 18 ++++++++++--------
 bookwyrm/tests/views/test_inbox.py |  9 +++------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/bookwyrm/models/relationship.py b/bookwyrm/models/relationship.py
index 764cada6..14f702b4 100644
--- a/bookwyrm/models/relationship.py
+++ b/bookwyrm/models/relationship.py
@@ -5,7 +5,8 @@ from django.db.models import Q
 from django.dispatch import receiver
 
 from bookwyrm import activitypub
-from .activitypub_mixin import ActivitypubMixin, ActivityMixin, generate_activity
+from .activitypub_mixin import ActivitypubMixin, ActivityMixin
+from .activitypub_mixin import generate_activity
 from .base_model import BookWyrmModel
 from . import fields
 
@@ -143,14 +144,15 @@ class UserFollowRequest(ActivitypubMixin, UserRelationship):
 
     def reject(self):
         ''' generate a Reject for this follow request '''
-        user = self.user_object
-        activity = activitypub.Reject(
-            id=self.get_remote_id(status='rejects'),
-            actor=self.user_object.remote_id,
-            object=self.to_activity()
-        ).serialize()
+        if self.user_object.local:
+            activity = activitypub.Reject(
+                id=self.get_remote_id(status='rejects'),
+                actor=self.user_object.remote_id,
+                object=self.to_activity()
+            ).serialize()
+            self.broadcast(activity, self.user_object)
+
         self.delete()
-        self.broadcast(activity, user)
 
 
 class UserBlocks(ActivityMixin, UserRelationship):
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index 1e597cb1..c2658917 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -379,11 +379,8 @@ class Inbox(TestCase):
         views.inbox.activity_task(activity)
 
         # request should be deleted
-        self.assertEqual(models.UserFollowRequest.objects.count(), 0)
-
-        # relationship should be created
-        follows = self.remote_user.followers
-        self.assertEqual(follows.count(), 0)
+        self.assertFalse(models.UserFollowRequest.objects.exists())
+        self.assertFalse(self.remote_user.followers.exists())
 
 
     def test_handle_update_list(self):
@@ -580,7 +577,7 @@ class Inbox(TestCase):
             'object': {
                 'type': 'Announce',
                 'id': boost.remote_id,
-                'actor': self.local_user.remote_id,
+                'actor': self.remote_user.remote_id,
                 'object': self.status.remote_id,
             }
         }

From fb98ef4b384f6fb2643623782cd3ffd551b9ebb8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 19 Feb 2021 11:16:01 -0800
Subject: [PATCH 0042/1285] Remove redundant activitypub dataclass

---
 bookwyrm/activitypub/__init__.py | 2 +-
 bookwyrm/activitypub/verbs.py    | 8 +-------
 bookwyrm/models/shelf.py         | 2 +-
 bookwyrm/models/tag.py           | 2 +-
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/bookwyrm/activitypub/__init__.py b/bookwyrm/activitypub/__init__.py
index 5303d1b2..f06154ab 100644
--- a/bookwyrm/activitypub/__init__.py
+++ b/bookwyrm/activitypub/__init__.py
@@ -15,7 +15,7 @@ from .response import ActivitypubResponse
 from .book import Edition, Work, Author
 from .verbs import Create, Delete, Undo, Update
 from .verbs import Follow, Accept, Reject, Block
-from .verbs import Add, AddBook, AddListItem, Remove
+from .verbs import Add, AddListItem, Remove
 from .verbs import Announce, Like
 
 # this creates a list of all the Activity types that we can serialize,
diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index aa6e7eee..6f1a4d44 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -132,13 +132,7 @@ class Add(Verb):
 
 
 @dataclass(init=False)
-class AddBook(Add):
-    '''Add activity that's aware of the book obj '''
-    object: Edition
-
-
-@dataclass(init=False)
-class AddListItem(AddBook):
+class AddListItem(Add):
     '''Add activity that's aware of the book obj '''
     notes: str = None
     order: int = 0
diff --git a/bookwyrm/models/shelf.py b/bookwyrm/models/shelf.py
index 921b8617..dfb8b9b3 100644
--- a/bookwyrm/models/shelf.py
+++ b/bookwyrm/models/shelf.py
@@ -57,7 +57,7 @@ class ShelfBook(CollectionItemMixin, BookWyrmModel):
     user = fields.ForeignKey(
         'User', on_delete=models.PROTECT, activitypub_field='actor')
 
-    activity_serializer = activitypub.AddBook
+    activity_serializer = activitypub.Add
     object_field = 'book'
     collection_field = 'shelf'
 
diff --git a/bookwyrm/models/tag.py b/bookwyrm/models/tag.py
index d75f6e05..12645b9e 100644
--- a/bookwyrm/models/tag.py
+++ b/bookwyrm/models/tag.py
@@ -50,7 +50,7 @@ class UserTag(CollectionItemMixin, BookWyrmModel):
     tag = fields.ForeignKey(
         'Tag', on_delete=models.PROTECT, activitypub_field='target')
 
-    activity_serializer = activitypub.AddBook
+    activity_serializer = activitypub.Add
     object_field = 'book'
     collection_field = 'tag'
 

From dbe9431d5adf93276e4ab381ddf3868b338f0642 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 20 Feb 2021 11:24:41 -0800
Subject: [PATCH 0043/1285] Fixes pure serializer

---
 bookwyrm/models/activitypub_mixin.py          | 25 +++++++++++--------
 bookwyrm/models/status.py                     | 24 ++++++++++--------
 .../tests/models/test_activitypub_mixin.py    | 23 -----------------
 bookwyrm/tests/models/test_status_model.py    | 21 ++++++++++++++++
 4 files changed, 49 insertions(+), 44 deletions(-)

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index 1abf9a75..12bbda96 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -191,7 +191,7 @@ class ObjectMixin(ActivitypubMixin):
 
             try:
                 software = None
-                # do we have a "pure" activitypub version of this for  mastodon?
+                # do we have a "pure" activitypub version of this for mastodon?
                 if hasattr(self, 'pure_content'):
                     pure_activity = self.to_create_activity(user, pure=True)
                     self.broadcast(pure_activity, user, software='other')
@@ -199,7 +199,7 @@ class ObjectMixin(ActivitypubMixin):
                 # sends to BW only if we just did a pure version for masto
                 activity = self.to_create_activity(user)
                 self.broadcast(activity, user, software=software)
-            except KeyError:
+            except AttributeError:
                 # janky as heck, this catches the mutliple inheritence chain
                 # for boosts and ignores this auxilliary broadcast
                 return
@@ -228,27 +228,27 @@ class ObjectMixin(ActivitypubMixin):
 
     def to_create_activity(self, user, **kwargs):
         ''' returns the object wrapped in a Create activity '''
-        activity_object = self.to_activity(**kwargs)
+        activity_object = self.to_activity_dataclass(**kwargs)
 
         signature = None
         create_id = self.remote_id + '/activity'
-        if 'content' in activity_object and activity_object['content']:
+        if hasattr(activity_object, 'content') and activity_object.content:
             signer = pkcs1_15.new(RSA.import_key(user.key_pair.private_key))
-            content = activity_object['content']
+            content = activity_object.content
             signed_message = signer.sign(SHA256.new(content.encode('utf8')))
 
             signature = activitypub.Signature(
                 creator='%s#main-key' % user.remote_id,
-                created=activity_object['published'],
+                created=activity_object.published,
                 signatureValue=b64encode(signed_message).decode('utf8')
             )
 
         return activitypub.Create(
             id=create_id,
             actor=user.remote_id,
-            to=activity_object['to'],
-            cc=activity_object['cc'],
-            object=self,
+            to=activity_object.to,
+            cc=activity_object.cc,
+            object=activity_object,
             signature=signature,
         ).serialize()
 
@@ -312,7 +312,7 @@ class OrderedCollectionPageMixin(ObjectMixin):
         activity['first'] = '%s?page=1' % remote_id
         activity['last'] = '%s?page=%d' % (remote_id, paginated.num_pages)
 
-        return serializer(**activity).serialize()
+        return serializer(**activity)
 
 
 class OrderedCollectionMixin(OrderedCollectionPageMixin):
@@ -324,9 +324,12 @@ class OrderedCollectionMixin(OrderedCollectionPageMixin):
 
     activity_serializer = activitypub.OrderedCollection
 
+    def to_activity_dataclass(self, **kwargs):
+        return self.to_ordered_collection(self.collection_queryset, **kwargs)
+
     def to_activity(self, **kwargs):
         ''' an ordered collection of the specified model queryset  '''
-        return self.to_ordered_collection(self.collection_queryset, **kwargs)
+        return self.to_ordered_collection(self.collection_queryset, **kwargs).serialize()
 
 
 class CollectionItemMixin(ActivitypubMixin):
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index 2fb70801..aff028a5 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -157,7 +157,7 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
             **kwargs
         )
 
-    def to_activity(self, pure=False):# pylint: disable=arguments-differ
+    def to_activity_dataclass(self, pure=False):# pylint: disable=arguments-differ
         ''' return tombstone if the status is deleted '''
         if self.deleted:
             return activitypub.Tombstone(
@@ -165,25 +165,29 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
                 url=self.remote_id,
                 deleted=self.deleted_date.isoformat(),
                 published=self.deleted_date.isoformat()
-            ).serialize()
-        activity = ActivitypubMixin.to_activity(self)
-        activity['replies'] = self.to_replies()
+            )
+        activity = ActivitypubMixin.to_activity_dataclass(self)
+        activity.replies = self.to_replies()
 
         # "pure" serialization for non-bookwyrm instances
         if pure and hasattr(self, 'pure_content'):
-            activity['content'] = self.pure_content
-            if 'name' in activity:
-                activity['name'] = self.pure_name
-            activity['type'] = self.pure_type
-            activity['attachment'] = [
+            activity.content = self.pure_content
+            if hasattr(activity, 'name'):
+                activity.name = self.pure_name
+            activity.type = self.pure_type
+            activity.attachment = [
                 image_serializer(b.cover, b.alt_text) \
                     for b in self.mention_books.all()[:4] if b.cover]
             if hasattr(self, 'book') and self.book.cover:
-                activity['attachment'].append(
+                activity.attachment.append(
                     image_serializer(self.book.cover, self.book.alt_text)
                 )
         return activity
 
+    def to_activity(self, pure=False):# pylint: disable=arguments-differ
+        ''' json serialized activitypub class '''
+        return self.to_activity_dataclass(pure=pure).serialize()
+
 
 class GeneratedNote(Status):
     ''' these are app-generated messages about user activity '''
diff --git a/bookwyrm/tests/models/test_activitypub_mixin.py b/bookwyrm/tests/models/test_activitypub_mixin.py
index a6f069d4..11b944d9 100644
--- a/bookwyrm/tests/models/test_activitypub_mixin.py
+++ b/bookwyrm/tests/models/test_activitypub_mixin.py
@@ -296,29 +296,6 @@ class ActivitypubMixins(TestCase):
                 id=1, user=self.local_user, deleted=True).save()
 
 
-    def test_to_create_activity(self):
-        ''' wrapper for ActivityPub "create" action '''
-        MockSelf = namedtuple('Self', ('remote_id', 'to_activity'))
-        mock_self = MockSelf(
-            'https://example.com/status/1',
-            lambda *args: self.object_mock
-        )
-        activity = ObjectMixin.to_create_activity(
-            mock_self, self.local_user)
-        self.assertEqual(
-            activity['id'],
-            'https://example.com/status/1/activity'
-        )
-        self.assertEqual(activity['actor'], self.local_user.remote_id)
-        self.assertEqual(activity['type'], 'Create')
-        self.assertEqual(activity['to'], 'to field')
-        self.assertEqual(activity['cc'], 'cc field')
-        self.assertIsInstance(activity['object'], dict)
-        self.assertEqual(
-            activity['signature'].creator,
-            '%s#main-key' % self.local_user.remote_id
-        )
-
     def test_to_delete_activity(self):
         ''' wrapper for Delete activity '''
         MockSelf = namedtuple('Self', ('remote_id', 'to_activity'))
diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py
index f9b95f34..c6911b6d 100644
--- a/bookwyrm/tests/models/test_status_model.py
+++ b/bookwyrm/tests/models/test_status_model.py
@@ -284,3 +284,24 @@ class Status(TestCase):
         with self.assertRaises(IntegrityError):
             models.Notification.objects.create(
                 user=self.user, notification_type='GLORB')
+
+
+    def test_create_broadcast(self, broadcast_mock):
+        ''' should send out two verions of a status on create '''
+        models.Comment.objects.create(
+            content='hi', user=self.user, book=self.book)
+        self.assertEqual(broadcast_mock.call_count, 2)
+        pure_call = broadcast_mock.call_args_list[0]
+        bw_call = broadcast_mock.call_args_list[1]
+
+        self.assertEqual(pure_call[1]['software'], 'other')
+        args = pure_call[0][0]
+        self.assertEqual(args['type'], 'Create')
+        self.assertEqual(args['object']['type'], 'Note')
+        self.assertTrue('content' in args['object'])
+
+
+        self.assertEqual(bw_call[1]['software'], 'bookwyrm')
+        args = bw_call[0][0]
+        self.assertEqual(args['type'], 'Create')
+        self.assertEqual(args['object']['type'], 'Comment')

From 02612b00e912564ebd436039138addcae353b840 Mon Sep 17 00:00:00 2001
From: Jim Fingal <jim.fingal@gmail.com>
Date: Sun, 21 Feb 2021 22:49:52 -0800
Subject: [PATCH 0044/1285] Update Readme

---
 README.md | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 6a624ab3..c8b6e92b 100644
--- a/README.md
+++ b/README.md
@@ -112,36 +112,42 @@ Once the build is complete, you can access the instance at `localhost:1333`
 ## Installing in Production
 
 This project is still young and isn't, at the momoment, very stable, so please procede with caution when running in production.
+
 ### Server setup
  - Get a domain name and set up DNS for your server
  - Set your server up with appropriate firewalls for running a web application (this instruction set is tested again Ubuntu 20.04)
- - Set up a mailgun account and the appropriate DNS settings
+ - Set up an email service (such as mailgun) and the appropriate SMTP/DNS settings
  - Install Docker and docker-compose
+
 ### Install and configure BookWyrm
+
+The `production` branch of BookWyrm contains a number of tools not on the `main` branch that are suited for running in production, such as `docker-compose` changes to update the default commands or configuration of containers, and indivudal changes to container config to enable things like SSL or regular backups.
+
+Instructions for running BookWyrm in production:
+
  - Get the application code:
   `git clone git@github.com:mouse-reeve/bookwyrm.git`
  - Switch to the `production` branch
   `git checkout production`
  - Create your environment variables file
   `cp .env.example .env`
-   - Add your domain, email address, mailgun credentials
+   - Add your domain, email address, SMTP credentials
    - Set a secure redis password and secret key
    - Set a secure database password for postgres
  - Update your nginx configuration in `nginx/default.conf`
    - Replace `your-domain.com` with your domain name
- - Run the application (this should also set up a Certbot ssl cert for your domain)
-  `docker-compose up --build`
-  Make sure all the images build successfully
+ - Run the application (this should also set up a Certbot ssl cert for your domain) with
+  `docker-compose up --build`, and make sure all the images build successfully
  - When docker has built successfully, stop the process with `CTRL-C`
  - Comment out the `command: certonly...` line in `docker-compose.yml`
- - Run docker-compose in the background
-  `docker-compose up -d`
- - Initialize the database
-  `./bw-dev initdb`
- - Set up schedule backups with cron that runs that `docker-compose exec db pg_dump -U <databasename>` and saves the backup to a safe locationgi
- - Congrats! You did it, go to your domain and enjoy the fruits of your labors
+ - Run docker-compose in the background with: `docker-compose up -d`
+ - Initialize the database with: `./bw-dev initdb`
+ - Set up schedule backups with cron that runs that `docker-compose exec db pg_dump -U <databasename>` and saves the backup to a safe location
+
+Congrats! You did it, go to your domain and enjoy the fruits of your labors.
+
 ### Configure your instance
- - Register a user account in the applcation UI
+ - Register a user account in the application UI
  - Make your account a superuser (warning: do *not* use django's `createsuperuser` command)
    - On your server, open the django shell
     `./bw-dev shell`

From 252f09325a9b3622cfade6acb8db44fdb951b7f1 Mon Sep 17 00:00:00 2001
From: Jim Fingal <jim.fingal@gmail.com>
Date: Sun, 21 Feb 2021 23:07:58 -0800
Subject: [PATCH 0045/1285] Add black command

---
 Makefile         |  5 +++++
 requirements.txt | 11 +++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000..44abad0b
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,5 @@
+.PHONY: itblack
+
+itblack:
+	docker-compose run --rm web black celerywyrm
+	docker-compose run --rm web black bookwyrm
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index e5d7798d..f354fd43 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,4 @@
 celery==4.4.2
-coverage==5.1
 Django==3.0.7
 django-model-utils==4.0.0
 environs==7.2.0
@@ -8,11 +7,15 @@ Markdown==3.3.3
 Pillow>=7.1.0
 psycopg2==2.8.4
 pycryptodome==3.9.4
-pytest-django==4.1.0
-pytest==6.1.2
-pytest-cov==2.10.1
 python-dateutil==2.8.1
 redis==3.4.1
 requests==2.22.0
 responses==0.10.14
 django-rename-app==0.1.2
+
+# Dev
+black==20.8b1
+coverage==5.1
+pytest-django==4.1.0
+pytest==6.1.2
+pytest-cov==2.10.1

From f654444aab261ad52e5c973ca883e4797a0a0446 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 22 Feb 2021 08:53:01 -0800
Subject: [PATCH 0046/1285] Fixes bug in saving remote server

---
 bookwyrm/models/user.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 7b0f9a91..170b587e 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -171,15 +171,15 @@ class User(OrderedCollectionPageMixin, AbstractUser):
 
     def save(self, *args, **kwargs):
         ''' populate fields for new local users '''
+        created = not bool(self.id)
         if not self.local and not re.match(regex.full_username, self.username):
             # generate a username that uses the domain (webfinger format)
             actor_parts = urlparse(self.remote_id)
             self.username = '%s@%s' % (self.username, actor_parts.netloc)
             super().save(*args, **kwargs)
-            return
 
         # this user already exists, no need to populate fields
-        if self.id:
+        if created:
             super().save(*args, **kwargs)
             return
 

From bff75cedf54dd0e5dd5d30aa9848406c98a9ff40 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 22 Feb 2021 09:41:52 -0800
Subject: [PATCH 0047/1285] Boolean error in user save causing infinite
 recursion

---
 bookwyrm/models/user.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 170b587e..a65317fa 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -179,7 +179,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
             super().save(*args, **kwargs)
 
         # this user already exists, no need to populate fields
-        if created:
+        if not created:
             super().save(*args, **kwargs)
             return
 

From 6b74f56381cdf1c58c9cb0fc468896a535dc3071 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 22 Feb 2021 10:01:19 -0800
Subject: [PATCH 0048/1285] Safer set remote server

---
 bookwyrm/models/user.py | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index a65317fa..5e77b9e1 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -9,7 +9,7 @@ from django.db import models
 from django.utils import timezone
 
 from bookwyrm import activitypub
-from bookwyrm.connectors import get_data
+from bookwyrm.connectors import get_data, ConnectorException
 from bookwyrm.models.shelf import Shelf
 from bookwyrm.models.status import Status, Review
 from bookwyrm.settings import DOMAIN
@@ -333,19 +333,24 @@ def get_or_create_remote_server(domain):
     except FederatedServer.DoesNotExist:
         pass
 
-    data = get_data('https://%s/.well-known/nodeinfo' % domain)
-
     try:
-        nodeinfo_url = data.get('links')[0].get('href')
-    except (TypeError, KeyError):
-        return None
+        data = get_data('https://%s/.well-known/nodeinfo' % domain)
+        try:
+            nodeinfo_url = data.get('links')[0].get('href')
+        except (TypeError, KeyError):
+            return None
+
+        data = get_data(nodeinfo_url)
+        application_type = data.get('software', {}).get('name')
+        application_type = data.get('software', {}).get('version')
+    except ConnectorException:
+        application_type = application_version = None
 
-    data = get_data(nodeinfo_url)
 
     server = FederatedServer.objects.create(
         server_name=domain,
-        application_type=data['software']['name'],
-        application_version=data['software']['version'],
+        application_type=application_type,
+        application_version=application_version,
     )
     return server
 

From ef9acaf87810a999ab01577764ba5400f0c6cd51 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 22 Feb 2021 11:38:11 -0800
Subject: [PATCH 0049/1285] Adds tests for setting remote server

---
 bookwyrm/models/user.py                  |  4 +-
 bookwyrm/tests/models/test_user_model.py | 84 +++++++++++++++++++++++-
 2 files changed, 85 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 5e77b9e1..a1f927b2 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -338,11 +338,11 @@ def get_or_create_remote_server(domain):
         try:
             nodeinfo_url = data.get('links')[0].get('href')
         except (TypeError, KeyError):
-            return None
+            raise ConnectorException()
 
         data = get_data(nodeinfo_url)
         application_type = data.get('software', {}).get('name')
-        application_type = data.get('software', {}).get('version')
+        application_version = data.get('software', {}).get('version')
     except ConnectorException:
         application_type = application_version = None
 
diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py
index a10c89b8..bd184b65 100644
--- a/bookwyrm/tests/models/test_user_model.py
+++ b/bookwyrm/tests/models/test_user_model.py
@@ -1,11 +1,13 @@
 ''' testing models '''
 from unittest.mock import patch
 from django.test import TestCase
+import responses
 
 from bookwyrm import models
 from bookwyrm.settings import DOMAIN
 
-
+# pylint: disable=missing-class-docstring
+# pylint: disable=missing-function-docstring
 class User(TestCase):
     def setUp(self):
         self.user = models.User.objects.create_user(
@@ -71,3 +73,83 @@ class User(TestCase):
         self.assertEqual(activity['type'], 'OrderedCollection')
         self.assertEqual(activity['id'], self.user.outbox)
         self.assertEqual(activity['totalItems'], 0)
+
+
+    def test_set_remote_server(self):
+        server = models.FederatedServer.objects.create(
+            server_name=DOMAIN,
+            application_type='test type',
+            application_version=3
+        )
+
+        models.user.set_remote_server(self.user.id)
+        self.user.refresh_from_db()
+
+        self.assertEqual(self.user.federated_server, server)
+
+    @responses.activate
+    def test_get_or_create_remote_server(self):
+        responses.add(
+            responses.GET,
+            'https://%s/.well-known/nodeinfo' % DOMAIN,
+            json={'links': [{'href': 'http://www.example.com'}, {}]}
+        )
+        responses.add(
+            responses.GET,
+            'http://www.example.com',
+            json={'software': {'name': 'hi', 'version': '2'}},
+        )
+
+        server = models.user.get_or_create_remote_server(DOMAIN)
+        self.assertEqual(server.server_name, DOMAIN)
+        self.assertEqual(server.application_type, 'hi')
+        self.assertEqual(server.application_version, '2')
+
+    @responses.activate
+    def test_get_or_create_remote_server_no_wellknown(self):
+        responses.add(
+            responses.GET,
+            'https://%s/.well-known/nodeinfo' % DOMAIN,
+            status=404
+        )
+
+        server = models.user.get_or_create_remote_server(DOMAIN)
+        self.assertEqual(server.server_name, DOMAIN)
+        self.assertIsNone(server.application_type)
+        self.assertIsNone(server.application_version)
+
+    @responses.activate
+    def test_get_or_create_remote_server_no_links(self):
+        responses.add(
+            responses.GET,
+            'https://%s/.well-known/nodeinfo' % DOMAIN,
+            json={'links': [{'href': 'http://www.example.com'}, {}]}
+        )
+        responses.add(
+            responses.GET,
+            'http://www.example.com',
+            status=404
+        )
+
+        server = models.user.get_or_create_remote_server(DOMAIN)
+        self.assertEqual(server.server_name, DOMAIN)
+        self.assertIsNone(server.application_type)
+        self.assertIsNone(server.application_version)
+
+    @responses.activate
+    def test_get_or_create_remote_server_unknown_format(self):
+        responses.add(
+            responses.GET,
+            'https://%s/.well-known/nodeinfo' % DOMAIN,
+            json={'links': [{'href': 'http://www.example.com'}, {}]}
+        )
+        responses.add(
+            responses.GET,
+            'http://www.example.com',
+            json={'fish': 'salmon'}
+        )
+
+        server = models.user.get_or_create_remote_server(DOMAIN)
+        self.assertEqual(server.server_name, DOMAIN)
+        self.assertIsNone(server.application_type)
+        self.assertIsNone(server.application_version)

From 726a8739a36f5927bc9ac0c331fa3a6ebd75342c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 22 Feb 2021 11:42:45 -0800
Subject: [PATCH 0050/1285] way too much logging coming from http errors

---
 bookwyrm/connectors/abstract_connector.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index 527d2f42..5ccd9f91 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -216,11 +216,7 @@ def get_data(url):
         raise ConnectorException()
 
     if not resp.ok:
-        try:
-            resp.raise_for_status()
-        except requests.exceptions.HTTPError as e:
-            logger.exception(e)
-            raise ConnectorException()
+        raise ConnectorException()
     try:
         data = resp.json()
     except ValueError as e:

From cbccdea4683359c3b03865fa972a8a0eb6e70e7d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Feb 2021 11:13:20 -0800
Subject: [PATCH 0051/1285] fixes ordered collection serializations

---
 bookwyrm/models/activitypub_mixin.py | 3 ++-
 bookwyrm/models/status.py            | 2 +-
 bookwyrm/models/user.py              | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index 12bbda96..7ea632b3 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -329,7 +329,8 @@ class OrderedCollectionMixin(OrderedCollectionPageMixin):
 
     def to_activity(self, **kwargs):
         ''' an ordered collection of the specified model queryset  '''
-        return self.to_ordered_collection(self.collection_queryset, **kwargs).serialize()
+        return self.to_ordered_collection(
+            self.collection_queryset, **kwargs).serialize()
 
 
 class CollectionItemMixin(ActivitypubMixin):
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index aff028a5..ba9727f5 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -155,7 +155,7 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
             remote_id='%s/replies' % self.remote_id,
             collection_only=True,
             **kwargs
-        )
+        ).serialize()
 
     def to_activity_dataclass(self, pure=False):# pylint: disable=arguments-differ
         ''' return tombstone if the status is deleted '''
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 61d119a8..a64a8add 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -131,7 +131,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
             privacy__in=['public', 'unlisted'],
         ).select_subclasses().order_by('-published_date')
         return self.to_ordered_collection(queryset, \
-            collection_only=True, remote_id=self.outbox, **kwargs)
+            collection_only=True, remote_id=self.outbox, **kwargs).serialize()
 
     def to_following_activity(self, **kwargs):
         ''' activitypub following list '''

From 6e09d485c4395a970a3ee28c106973c5dc4658bc Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Feb 2021 11:34:15 -0800
Subject: [PATCH 0052/1285] Outbox sensitive to user agent strings

---
 bookwyrm/models/activitypub_mixin.py |  6 ++---
 bookwyrm/tests/views/test_helpers.py |  6 ++---
 bookwyrm/tests/views/test_outbox.py  | 37 ++++++++++++++++++++++++++++
 bookwyrm/views/feed.py               |  4 +--
 bookwyrm/views/helpers.py            |  4 +--
 bookwyrm/views/outbox.py             |  7 +++++-
 6 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index 84293725..d934681e 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -282,7 +282,7 @@ class OrderedCollectionPageMixin(ObjectMixin):
 
     def to_ordered_collection(self, queryset, \
             remote_id=None, page=False, collection_only=False, **kwargs):
-        ''' an ordered collection of whatevers '''
+        'pure=pure, '' an ordered collection of whatevers '''
         if not queryset.ordered:
             raise RuntimeError('queryset must be ordered')
 
@@ -472,7 +472,7 @@ def sign_and_send(sender, data, destination):
 
 # pylint: disable=unused-argument
 def to_ordered_collection_page(
-        queryset, remote_id, id_only=False, page=1, **kwargs):
+        queryset, remote_id, id_only=False, page=1, pure=False, **kwargs):
     ''' serialize and pagiante a queryset '''
     paginated = Paginator(queryset, PAGE_LENGTH)
 
@@ -480,7 +480,7 @@ def to_ordered_collection_page(
     if id_only:
         items = [s.remote_id for s in activity_page.object_list]
     else:
-        items = [s.to_activity() for s in activity_page.object_list]
+        items = [s.to_activity(pure=pure) for s in activity_page.object_list]
 
     prev_page = next_page = None
     if activity_page.has_next():
diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py
index b75d61d5..b3a79b32 100644
--- a/bookwyrm/tests/views/test_helpers.py
+++ b/bookwyrm/tests/views/test_helpers.py
@@ -188,18 +188,18 @@ class ViewsHelpers(TestCase):
     def test_is_bookwyrm_request(self):
         ''' checks if a request came from a bookwyrm instance '''
         request = self.factory.get('', {'q': 'Test Book'})
-        self.assertFalse(views.helpers.is_bookworm_request(request))
+        self.assertFalse(views.helpers.is_bookwyrm_request(request))
 
         request = self.factory.get(
             '', {'q': 'Test Book'},
             HTTP_USER_AGENT=\
                 "http.rb/4.4.1 (Mastodon/3.3.0; +https://mastodon.social/)"
         )
-        self.assertFalse(views.helpers.is_bookworm_request(request))
+        self.assertFalse(views.helpers.is_bookwyrm_request(request))
 
         request = self.factory.get(
             '', {'q': 'Test Book'}, HTTP_USER_AGENT=USER_AGENT)
-        self.assertTrue(views.helpers.is_bookworm_request(request))
+        self.assertTrue(views.helpers.is_bookwyrm_request(request))
 
 
     def test_existing_user(self):
diff --git a/bookwyrm/tests/views/test_outbox.py b/bookwyrm/tests/views/test_outbox.py
index d59f028c..7986dea6 100644
--- a/bookwyrm/tests/views/test_outbox.py
+++ b/bookwyrm/tests/views/test_outbox.py
@@ -7,6 +7,7 @@ from django.test import TestCase
 from django.test.client import RequestFactory
 
 from bookwyrm import models, views
+from bookwyrm.settings import USER_AGENT
 
 
 # pylint: disable=too-many-public-methods
@@ -90,3 +91,39 @@ class OutboxView(TestCase):
         data = json.loads(result.content)
         self.assertEqual(data['type'], 'OrderedCollection')
         self.assertEqual(data['totalItems'], 1)
+
+    def test_outbox_bookwyrm_request_true(self):
+        ''' should differentiate between bookwyrm and outside requests '''
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+            models.Review.objects.create(
+                name='hi',
+                content='look at this',
+                user=self.local_user,
+                book=self.book,
+                privacy='public',
+            )
+
+        request = self.factory.get('', {'page': 1}, HTTP_USER_AGENT=USER_AGENT)
+        result = views.Outbox.as_view()(request, 'mouse')
+
+        data = json.loads(result.content)
+        self.assertEqual(len(data['orderedItems']), 1)
+        self.assertEqual(data['orderedItems'][0]['type'], 'Review')
+
+    def test_outbox_bookwyrm_request_false(self):
+        ''' should differentiate between bookwyrm and outside requests '''
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+            models.Review.objects.create(
+                name='hi',
+                content='look at this',
+                user=self.local_user,
+                book=self.book,
+                privacy='public',
+            )
+
+        request = self.factory.get('', {'page': 1})
+        result = views.Outbox.as_view()(request, 'mouse')
+
+        data = json.loads(result.content)
+        self.assertEqual(len(data['orderedItems']), 1)
+        self.assertEqual(data['orderedItems'][0]['type'], 'Article')
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index 0e550f0c..059237b9 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -13,7 +13,7 @@ from bookwyrm.activitypub import ActivitypubResponse
 from bookwyrm.settings import PAGE_LENGTH
 from .helpers import get_activity_feed
 from .helpers import get_user_from_username
-from .helpers import is_api_request, is_bookworm_request, object_visible_to_user
+from .helpers import is_api_request, is_bookwyrm_request, object_visible_to_user
 
 
 # pylint: disable= no-self-use
@@ -107,7 +107,7 @@ class Status(View):
 
         if is_api_request(request):
             return ActivitypubResponse(
-                status.to_activity(pure=not is_bookworm_request(request)))
+                status.to_activity(pure=not is_bookwyrm_request(request)))
 
         data = {**feed_page_data(request.user), **{
             'title': 'Status by %s' % user.username,
diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index 842b8d1c..6eeaa926 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -24,8 +24,8 @@ def is_api_request(request):
             request.path[-5:] == '.json'
 
 
-def is_bookworm_request(request):
-    ''' check if the request is coming from another bookworm instance '''
+def is_bookwyrm_request(request):
+    ''' check if the request is coming from another bookwyrm instance '''
     user_agent = request.headers.get('User-Agent')
     if user_agent is None or \
             re.search(regex.bookwyrm_user_agent, user_agent) is None:
diff --git a/bookwyrm/views/outbox.py b/bookwyrm/views/outbox.py
index 8bfc3b3d..5df9d199 100644
--- a/bookwyrm/views/outbox.py
+++ b/bookwyrm/views/outbox.py
@@ -4,6 +4,7 @@ from django.shortcuts import get_object_or_404
 from django.views import View
 
 from bookwyrm import activitypub, models
+from .helpers import is_bookwyrm_request
 
 
 # pylint: disable= no-self-use
@@ -17,6 +18,10 @@ class Outbox(View):
             filter_type = None
 
         return JsonResponse(
-            user.to_outbox(**request.GET, filter_type=filter_type),
+            user.to_outbox(
+                **request.GET,
+                filter_type=filter_type,
+                pure=not is_bookwyrm_request(request)
+            ),
             encoder=activitypub.ActivityEncoder
         )

From c6a61abf79a2e51dcb4bed9c28245188326655ee Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Feb 2021 11:58:01 -0800
Subject: [PATCH 0053/1285] Don't try to fetch reviews for remote user in test

---
 bookwyrm/tests/models/test_user_model.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py
index bd184b65..34f4c54d 100644
--- a/bookwyrm/tests/models/test_user_model.py
+++ b/bookwyrm/tests/models/test_user_model.py
@@ -30,7 +30,7 @@ class User(TestCase):
         with patch('bookwyrm.models.user.set_remote_server.delay'):
             user = models.User.objects.create_user(
                 'rat', 'rat@rat.rat', 'ratword', local=False,
-                remote_id='https://example.com/dfjkg')
+                remote_id='https://example.com/dfjkg', bookwyrm_user=False)
         self.assertEqual(user.username, 'rat@example.com')
 
 

From a617302006b1de642ca09df5379408c3340dc9bb Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Feb 2021 12:10:54 -0800
Subject: [PATCH 0054/1285] Cleans up display of follow/block/unfollow/unblock
 buttons

---
 .../templates/snippets/follow_button.html     | 37 ++++++++++++-------
 bookwyrm/templates/user/user_layout.html      |  9 +----
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/bookwyrm/templates/snippets/follow_button.html b/bookwyrm/templates/snippets/follow_button.html
index 7db69191..f7286e67 100644
--- a/bookwyrm/templates/snippets/follow_button.html
+++ b/bookwyrm/templates/snippets/follow_button.html
@@ -5,20 +5,29 @@
 Follow request already sent.
 </div>
 
+{% elif user in request.user.blocks.all %}
+{% include 'snippets/block_button.html' %}
 {% else %}
 
-<form action="/follow/" method="POST" class="interaction follow-{{ user.id }} {% if request.user in user.followers.all %}hidden{%endif %}" data-id="follow-{{ user.id }}">
-    {% csrf_token %}
-    <input type="hidden" name="user" value="{{ user.username }}">
-    {% if user.manually_approves_followers %}
-        <button class="button is-small is-link" type="submit">Send follow request</button>
-    {% else %}
-        <button class="button is-small is-link" type="submit">Follow</button>
-    {% endif %}
-</form>
-<form action="/unfollow/" method="POST" class="interaction follow-{{ user.id }} {% if not request.user in user.followers.all %}hidden{%endif %}" data-id="follow-{{ user.id }}">
-    {% csrf_token %}
-    <input type="hidden" name="user" value="{{ user.username }}">
-    <button class="button is-small is-danger is-light" type="submit">Unfollow</button>
-</form>
+<div class="field has-addons">
+    <div class="control">
+        <form action="/follow/" method="POST" class="interaction follow-{{ user.id }} {% if request.user in user.followers.all %}hidden{%endif %}" data-id="follow-{{ user.id }}">
+            {% csrf_token %}
+            <input type="hidden" name="user" value="{{ user.username }}">
+            {% if user.manually_approves_followers %}
+                <button class="button is-small is-link" type="submit">Send follow request</button>
+            {% else %}
+                <button class="button is-small is-link" type="submit">Follow</button>
+            {% endif %}
+        </form>
+        <form action="/unfollow/" method="POST" class="interaction follow-{{ user.id }} {% if not request.user in user.followers.all %}hidden{%endif %}" data-id="follow-{{ user.id }}">
+            {% csrf_token %}
+            <input type="hidden" name="user" value="{{ user.username }}">
+            <button class="button is-small is-danger is-light" type="submit">Unfollow</button>
+        </form>
+    </div>
+    <div class="control">
+        {% include 'snippets/user_options.html' with user=user class="is-small" %}
+    </div>
+</div>
 {% endif %}
diff --git a/bookwyrm/templates/user/user_layout.html b/bookwyrm/templates/user/user_layout.html
index 979ee0b0..9abc469a 100644
--- a/bookwyrm/templates/user/user_layout.html
+++ b/bookwyrm/templates/user/user_layout.html
@@ -43,14 +43,7 @@
         </div>
     </div>
     {% if not is_self and request.user.is_authenticated %}
-    <div class="field has-addons">
-        <div class="control">
-            {% include 'snippets/follow_button.html' with user=user %}
-        </div>
-        <div class="control">
-            {% include 'snippets/user_options.html' with user=user class="is-small" %}
-        </div>
-    </div>
+    {% include 'snippets/follow_button.html' with user=user %}
     {% endif %}
 
     {% if is_self and user.follower_requests.all %}

From 364b053d9addf6962e4e7e6d8294790f9d30b64e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Feb 2021 12:41:37 -0800
Subject: [PATCH 0055/1285] Better user block privacy

---
 bookwyrm/models/user.py              | 10 ++++++++++
 bookwyrm/tests/views/test_helpers.py |  8 +++++---
 bookwyrm/views/feed.py               |  2 +-
 bookwyrm/views/follow.py             |  8 ++++----
 bookwyrm/views/helpers.py            |  6 +++---
 bookwyrm/views/search.py             |  2 +-
 bookwyrm/views/shelf.py              |  2 +-
 bookwyrm/views/user.py               |  6 +++---
 8 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index a65317fa..108f4345 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -112,6 +112,16 @@ class User(OrderedCollectionPageMixin, AbstractUser):
 
     activity_serializer = activitypub.Person
 
+    @classmethod
+    def viewer_aware_objects(cls, viewer):
+        ''' the user queryset filtered for the context of the logged in user '''
+        queryset = cls.objects.filter(is_active=True)
+        if viewer.is_authenticated:
+            queryset = queryset.exclude(
+                blocks=viewer
+            )
+        return queryset
+
     def to_outbox(self, filter_type=None, **kwargs):
         ''' an ordered collection of statuses '''
         if filter_type:
diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py
index b75d61d5..577b45e5 100644
--- a/bookwyrm/tests/views/test_helpers.py
+++ b/bookwyrm/tests/views/test_helpers.py
@@ -56,12 +56,14 @@ class ViewsHelpers(TestCase):
     def test_get_user_from_username(self):
         ''' works for either localname or username '''
         self.assertEqual(
-            views.helpers.get_user_from_username('mouse'), self.local_user)
+            views.helpers.get_user_from_username(
+                self.local_user, 'mouse'), self.local_user)
         self.assertEqual(
             views.helpers.get_user_from_username(
-                'mouse@local.com'), self.local_user)
+                self.local_user, 'mouse@local.com'), self.local_user)
         with self.assertRaises(models.User.DoesNotExist):
-            views.helpers.get_user_from_username('mojfse@example.com')
+            views.helpers.get_user_from_username(
+                self.local_user, 'mojfse@example.com')
 
 
     def test_is_api_request(self):
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index 0e550f0c..e67a893d 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -65,7 +65,7 @@ class DirectMessage(View):
         user = None
         if username:
             try:
-                user = get_user_from_username(username)
+                user = get_user_from_username(request.user, username)
             except models.User.DoesNotExist:
                 pass
         if user:
diff --git a/bookwyrm/views/follow.py b/bookwyrm/views/follow.py
index c59f2e6d..e1b1a0bb 100644
--- a/bookwyrm/views/follow.py
+++ b/bookwyrm/views/follow.py
@@ -13,7 +13,7 @@ def follow(request):
     ''' follow another user, here or abroad '''
     username = request.POST['user']
     try:
-        to_follow = get_user_from_username(username)
+        to_follow = get_user_from_username(request.user, username)
     except models.User.DoesNotExist:
         return HttpResponseBadRequest()
 
@@ -33,7 +33,7 @@ def unfollow(request):
     ''' unfollow a user '''
     username = request.POST['user']
     try:
-        to_unfollow = get_user_from_username(username)
+        to_unfollow = get_user_from_username(request.user, username)
     except models.User.DoesNotExist:
         return HttpResponseBadRequest()
 
@@ -52,7 +52,7 @@ def accept_follow_request(request):
     ''' a user accepts a follow request '''
     username = request.POST['user']
     try:
-        requester = get_user_from_username(username)
+        requester = get_user_from_username(request.user, username)
     except models.User.DoesNotExist:
         return HttpResponseBadRequest()
 
@@ -75,7 +75,7 @@ def delete_follow_request(request):
     ''' a user rejects a follow request '''
     username = request.POST['user']
     try:
-        requester = get_user_from_username(username)
+        requester = get_user_from_username(request.user, username)
     except models.User.DoesNotExist:
         return HttpResponseBadRequest()
 
diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index 842b8d1c..7e0550fb 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -9,13 +9,13 @@ from bookwyrm.status import create_generated_note
 from bookwyrm.utils import regex
 
 
-def get_user_from_username(username):
+def get_user_from_username(viewer, username):
     ''' helper function to resolve a localname or a username to a user '''
     # raises DoesNotExist if user is now found
     try:
-        return models.User.objects.get(localname=username)
+        return models.User.viwer_aware_objects(viewer).get(localname=username)
     except models.User.DoesNotExist:
-        return models.User.objects.get(username=username)
+        return models.User.viewer_aware_objects(viewer).get(username=username)
 
 
 def is_api_request(request):
diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py
index a4cd7337..98be166f 100644
--- a/bookwyrm/views/search.py
+++ b/bookwyrm/views/search.py
@@ -33,7 +33,7 @@ class Search(View):
             handle_remote_webfinger(query)
 
         # do a  user search
-        user_results = models.User.objects.annotate(
+        user_results = models.User.viewer_aware_objects(request.user).annotate(
             similarity=Greatest(
                 TrigramSimilarity('username', query),
                 TrigramSimilarity('localname', query),
diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index 02502ff6..70d3d1de 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -19,7 +19,7 @@ class Shelf(View):
     def get(self, request, username, shelf_identifier):
         ''' display a shelf '''
         try:
-            user = get_user_from_username(username)
+            user = get_user_from_username(request.user, username)
         except models.User.DoesNotExist:
             return HttpResponseNotFound()
 
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index 4da0fdac..7a238ce7 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -26,7 +26,7 @@ class User(View):
     def get(self, request, username):
         ''' profile page for a user '''
         try:
-            user = get_user_from_username(username)
+            user = get_user_from_username(request.user, username)
         except models.User.DoesNotExist:
             return HttpResponseNotFound()
 
@@ -96,7 +96,7 @@ class Followers(View):
     def get(self, request, username):
         ''' list of followers '''
         try:
-            user = get_user_from_username(username)
+            user = get_user_from_username(request.user, username)
         except models.User.DoesNotExist:
             return HttpResponseNotFound()
 
@@ -121,7 +121,7 @@ class Following(View):
     def get(self, request, username):
         ''' list of followers '''
         try:
-            user = get_user_from_username(username)
+            user = get_user_from_username(request.user, username)
         except models.User.DoesNotExist:
             return HttpResponseNotFound()
 

From b1268b7db8032356ef7cfe8db6c5d68053ff58e0 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Feb 2021 12:44:25 -0800
Subject: [PATCH 0056/1285] Small covers too small on mobile

---
 bookwyrm/static/css/format.css | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bookwyrm/static/css/format.css b/bookwyrm/static/css/format.css
index 50ce101e..9d4b3105 100644
--- a/bookwyrm/static/css/format.css
+++ b/bookwyrm/static/css/format.css
@@ -100,9 +100,6 @@
     .cover-container.is-medium {
         height: 100px;
     }
-    .cover-container.is-small {
-        height: 70px;
-    }
 }
 
 .cover-container.is-medium .no-cover div {

From d1a21b851a9072f65d7eae86c137f930ef88d4c2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Feb 2021 12:46:41 -0800
Subject: [PATCH 0057/1285] Maintain list columns in mobile

---
 bookwyrm/templates/lists/list.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index 5f9baa03..c5aef606 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -19,7 +19,7 @@
         {% for item in items %}
             <li class="block pb-3">
                 <div class="card">
-                    <div class="card-content columns p-0 mb-0">
+                    <div class="card-content columns p-0 mb-0 is-mobile">
                         <div class="column is-narrow pt-0 pb-0">
                             <a href="{{ item.book.local_path }}">{% include 'snippets/book_cover.html' with book=item.book size="medium" %}</a>
                         </div>
@@ -73,7 +73,7 @@
         {% endif %}
         {% for book in suggested_books %}
         {% if book %}
-        <div class="block columns">
+        <div class="block columns is-mobile">
             <div class="column is-narrow">
                 <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book size="small" %}</a>
             </div>

From 8a3d1a0bf2db971ce6005855d78c073a12d147d4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Feb 2021 13:04:24 -0800
Subject: [PATCH 0058/1285] Fixes header wrap on mobile headers

---
 bookwyrm/templates/author.html            |  2 +-
 bookwyrm/templates/book.html              |  2 +-
 bookwyrm/templates/lists/list_layout.html |  2 +-
 bookwyrm/templates/lists/lists.html       |  2 +-
 bookwyrm/templates/snippets/shelf.html    |  2 ++
 bookwyrm/templates/user/followers.html    | 18 +++++++-----------
 bookwyrm/templates/user/following.html    | 18 +++++++-----------
 bookwyrm/templates/user/lists.html        |  2 +-
 bookwyrm/templates/user/shelf.html        |  2 +-
 bookwyrm/templates/user/user.html         |  4 ++--
 10 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/bookwyrm/templates/author.html b/bookwyrm/templates/author.html
index a875ad78..9f2054d0 100644
--- a/bookwyrm/templates/author.html
+++ b/bookwyrm/templates/author.html
@@ -2,7 +2,7 @@
 {% load bookwyrm_tags %}
 {% block content %}
 <div class="block">
-    <div class="columns">
+    <div class="columns is-mobile">
         <div class="column">
             <h1 class="title">{{ author.name }}</h1>
         </div>
diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html
index 0bef2856..3a2a6aa7 100644
--- a/bookwyrm/templates/book.html
+++ b/bookwyrm/templates/book.html
@@ -4,7 +4,7 @@
 {% block content %}
 
 <div class="block">
-    <div class="columns">
+    <div class="columns is-mobile">
         <div class="column">
             <h1 class="title">
                 {{ book.title }}{% if book.subtitle %}:
diff --git a/bookwyrm/templates/lists/list_layout.html b/bookwyrm/templates/lists/list_layout.html
index d3ff2c48..f5855f27 100644
--- a/bookwyrm/templates/lists/list_layout.html
+++ b/bookwyrm/templates/lists/list_layout.html
@@ -2,7 +2,7 @@
 {% load bookwyrm_tags %}
 {% block content %}
 
-<header class="columns content">
+<header class="columns content is-mobile">
     <div class="column">
         <h1 class="title">{{ list.name }} <span class="subtitle">{% include 'snippets/privacy-icons.html' with item=list %}</span></h1>
         <p class="subtitle help">Created {% if list.curation != 'open' %} and curated{% endif %} by {% include 'snippets/username.html' with user=list.user %}</p>
diff --git a/bookwyrm/templates/lists/lists.html b/bookwyrm/templates/lists/lists.html
index 71d37250..259d0820 100644
--- a/bookwyrm/templates/lists/lists.html
+++ b/bookwyrm/templates/lists/lists.html
@@ -5,7 +5,7 @@
     <h1 class="title">Lists</h1>
 </header>
 {% if request.user.is_authenticated and not lists.has_previous %}
-<header class="block columns">
+<header class="block columns is-mobile">
     <div class="column">
         <h2 class="title">Your lists</h2>
     </div>
diff --git a/bookwyrm/templates/snippets/shelf.html b/bookwyrm/templates/snippets/shelf.html
index 006bb4ea..0e4e9a08 100644
--- a/bookwyrm/templates/snippets/shelf.html
+++ b/bookwyrm/templates/snippets/shelf.html
@@ -1,6 +1,7 @@
 {% load humanize %}
 {% load bookwyrm_tags %}
 {% if books|length > 0 %}
+<div class="table-container">
 <table class="table is-striped is-fullwidth">
 
 <tr class="book-preview">
@@ -74,6 +75,7 @@
 </tr>
 {% endfor %}
 </table>
+</div>
 {% else %}
 <p>This shelf is empty.</p>
 {% if shelf.editable %}
diff --git a/bookwyrm/templates/user/followers.html b/bookwyrm/templates/user/followers.html
index 42b8cfb0..da6fc320 100644
--- a/bookwyrm/templates/user/followers.html
+++ b/bookwyrm/templates/user/followers.html
@@ -15,17 +15,13 @@
 <div class="block">
     <h2 class="title">Followers</h2>
     {% for followers in followers %}
-    <div class="block">
-        <div class="field is-grouped">
-            <div class="control">
-                {% include 'snippets/avatar.html' with user=followers %}
-            </div>
-            <div class="control">
-                {% include 'snippets/username.html' with user=followers show_full=True  %}
-            </div>
-            <div class="control">
-                {% include 'snippets/follow_button.html' with user=followers %}
-            </div>
+    <div class="block columns">
+        <div class="column">
+            {% include 'snippets/avatar.html' with user=followers %}
+            {% include 'snippets/username.html' with user=followers show_full=True  %}
+        </div>
+        <div class="column is-narrow">
+            {% include 'snippets/follow_button.html' with user=followers %}
         </div>
     </div>
     {% endfor %}
diff --git a/bookwyrm/templates/user/following.html b/bookwyrm/templates/user/following.html
index 9e42b783..d734b0dc 100644
--- a/bookwyrm/templates/user/following.html
+++ b/bookwyrm/templates/user/following.html
@@ -15,17 +15,13 @@
 <div class="block">
     <h2 class="title">Following</h2>
     {% for follower in user.following.all %}
-    <div class="block">
-        <div class="field is-grouped">
-            <div class="control">
-                {% include 'snippets/avatar.html' with user=follower %}
-            </div>
-            <div class="control">
-                {% include 'snippets/username.html' with user=follower show_full=True  %}
-            </div>
-            <div class="control">
-                {% include 'snippets/follow_button.html' with user=follower %}
-            </div>
+    <div class="block columns">
+        <div class="column">
+            {% include 'snippets/avatar.html' with user=follower %}
+            {% include 'snippets/username.html' with user=follower show_full=True  %}
+        </div>
+        <div class="column">
+            {% include 'snippets/follow_button.html' with user=follower %}
         </div>
     </div>
     {% endfor %}
diff --git a/bookwyrm/templates/user/lists.html b/bookwyrm/templates/user/lists.html
index a006c92b..45e4806f 100644
--- a/bookwyrm/templates/user/lists.html
+++ b/bookwyrm/templates/user/lists.html
@@ -1,7 +1,7 @@
 {% extends 'user/user_layout.html' %}
 
 {% block header %}
-<div class="columns">
+<div class="columns is-mobile">
     <div class="column">
         <h1 class="title">
             {% if is_self %}Your
diff --git a/bookwyrm/templates/user/shelf.html b/bookwyrm/templates/user/shelf.html
index 5e2f532f..e62e2218 100644
--- a/bookwyrm/templates/user/shelf.html
+++ b/bookwyrm/templates/user/shelf.html
@@ -38,7 +38,7 @@
     {% include 'user/create_shelf_form.html' with controls_text='create-shelf-form' %}
 </div>
 
-<div class="block columns">
+<div class="block columns is-mobile">
     <div class="column">
         <h2 class="title is-3">
             {{ shelf.name }}
diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index c7f6d3b5..2ff66468 100644
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -1,7 +1,7 @@
 {% extends 'user/user_layout.html' %}
 
 {% block header %}
-<div class="columns">
+<div class="columns is-mobile">
     <div class="column">
         <h1 class="title">User profile</h1>
     </div>
@@ -54,7 +54,7 @@
 {% endif %}
 
 <div>
-    <div class="columns">
+    <div class="columns is-mobile">
         <h2 class="title column">User Activity</h2>
         <div class="column is-narrow">
             <a class="icon icon-rss" target="_blank" href="{{ user.local_path }}/rss">

From e6b4212e6b68b2860069b2e369b6f919dcc0c9b7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Feb 2021 13:05:43 -0800
Subject: [PATCH 0059/1285] Typo fix

---
 bookwyrm/views/helpers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index 7e0550fb..c7eb007f 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -13,7 +13,7 @@ def get_user_from_username(viewer, username):
     ''' helper function to resolve a localname or a username to a user '''
     # raises DoesNotExist if user is now found
     try:
-        return models.User.viwer_aware_objects(viewer).get(localname=username)
+        return models.User.viewer_aware_objects(viewer).get(localname=username)
     except models.User.DoesNotExist:
         return models.User.viewer_aware_objects(viewer).get(username=username)
 

From be9198fc4ff7def40d7cd4d5040e8170814a3a43 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Feb 2021 13:09:39 -0800
Subject: [PATCH 0060/1285] Another place where get reviews is called in tests

---
 bookwyrm/tests/models/test_user_model.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py
index 34f4c54d..84ff3e9b 100644
--- a/bookwyrm/tests/models/test_user_model.py
+++ b/bookwyrm/tests/models/test_user_model.py
@@ -12,7 +12,7 @@ class User(TestCase):
     def setUp(self):
         self.user = models.User.objects.create_user(
             'mouse@%s' % DOMAIN, 'mouse@mouse.mouse', 'mouseword',
-            local=True, localname='mouse', name='hi')
+            local=True, localname='mouse', name='hi', bookwyrm_user=False)
 
     def test_computed_fields(self):
         ''' username instead of id here '''

From b9f06edc1b16a92af7bc02d526b83900e1a5c593 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Feb 2021 13:12:50 -0800
Subject: [PATCH 0061/1285] Fixes a few missed calls to get_user_from_username

---
 bookwyrm/views/feed.py     | 2 +-
 bookwyrm/views/goal.py     | 4 ++--
 bookwyrm/views/list.py     | 2 +-
 bookwyrm/views/rss_feed.py | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index e67a893d..e7d179b9 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -91,7 +91,7 @@ class Status(View):
     def get(self, request, username, status_id):
         ''' display a particular status (and replies, etc) '''
         try:
-            user = get_user_from_username(username)
+            user = get_user_from_username(request.user, username)
             status = models.Status.objects.select_subclasses().get(
                 id=status_id, deleted=False)
         except ValueError:
diff --git a/bookwyrm/views/goal.py b/bookwyrm/views/goal.py
index 4f2d1b6f..97f13913 100644
--- a/bookwyrm/views/goal.py
+++ b/bookwyrm/views/goal.py
@@ -18,7 +18,7 @@ class Goal(View):
     ''' track books for the year '''
     def get(self, request, username, year):
         ''' reading goal page '''
-        user = get_user_from_username(username)
+        user = get_user_from_username(request.user, username)
         year = int(year)
         goal = models.AnnualGoal.objects.filter(
             year=year, user=user
@@ -42,7 +42,7 @@ class Goal(View):
 
     def post(self, request, username, year):
         ''' update or create an annual goal '''
-        user = get_user_from_username(username)
+        user = get_user_from_username(request.user, username)
         if user != request.user:
             return HttpResponseNotFound()
 
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index cfdf6d76..7286bfb4 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -65,7 +65,7 @@ class UserLists(View):
             page = int(request.GET.get('page', 1))
         except ValueError:
             page = 1
-        user = get_user_from_username(username)
+        user = get_user_from_username(request.user, username)
         lists = models.List.objects.filter(user=user).all()
         lists = privacy_filter(
             request.user, lists, ['public', 'followers', 'unlisted'])
diff --git a/bookwyrm/views/rss_feed.py b/bookwyrm/views/rss_feed.py
index 496689ff..aad227bf 100644
--- a/bookwyrm/views/rss_feed.py
+++ b/bookwyrm/views/rss_feed.py
@@ -11,7 +11,7 @@ class RssFeed(Feed):
 
     def get_object(self, request, username):
         ''' the user who's posts get serialized '''
-        return get_user_from_username(username)
+        return get_user_from_username(request.user, username)
 
 
     def link(self, obj):

From ffe5ce725145351c529923e77423f62f659e7610 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Feb 2021 13:23:41 -0800
Subject: [PATCH 0062/1285] User friendly-er add cover form

bulma has failed me. Fixes #628
---
 bookwyrm/templates/book.html      | 24 ++++--------------------
 bookwyrm/templates/edit_book.html |  2 +-
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html
index 0bef2856..bb1f2be7 100644
--- a/bookwyrm/templates/book.html
+++ b/bookwyrm/templates/book.html
@@ -42,26 +42,10 @@
                 <h3 class="title is-6 mb-1">Add cover</h3>
                 <form name="add-cover" method="POST" action="/upload-cover/{{ book.id }}" enctype="multipart/form-data">
                     {% csrf_token %}
-                    <div class="field has-addons">
-                        <div class="control">
-                        <div class="file is-small mb-1">
-                            <label class="file-label">
-                                <input class="file-input" type="file" name="cover" accept="image/*" enctype="multipart/form-data" id="id_cover" required>
-                                <span class="file-cta">
-                                    <span class="file-icon">
-                                        <i class="fas fa-upload"></i>
-                                    </span>
-                                    <span class="file-label">
-                                        Choose file...
-                                    </span>
-                                </span>
-                            </label>
-                        </div>
-                        </div>
-                        <div class="control">
-                            <button class="button is-small is-primary" type="submit">Add</button>
-                        </div>
-                    </div>
+                    <label class="label">
+                        <input type="file" name="cover" accept="image/*" enctype="multipart/form-data" id="id_cover" required>
+                    </label>
+                    <button class="button is-small is-primary" type="submit">Add</button>
                 </form>
             </div>
             {% endif %}
diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/edit_book.html
index 6e7e434e..fb0bb81c 100644
--- a/bookwyrm/templates/edit_book.html
+++ b/bookwyrm/templates/edit_book.html
@@ -62,7 +62,7 @@
                 <div class="column is-narrow">
                     <div class="block">
                         <h2 class="title is-4">Cover</h2>
-                        <p>{{ form.cover }} </p>
+                        <p>{{ form.cover }}</p>
                         {% for error in form.cover.errors %}
                         <p class="help is-danger">{{ error | escape }}</p>
                         {% endfor %}

From 9ac332f6cc290284416eb892cefc24c897723174 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Feb 2021 13:26:44 -0800
Subject: [PATCH 0063/1285] Adds request user for rss test

---
 bookwyrm/tests/views/test_rss_feed.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bookwyrm/tests/views/test_rss_feed.py b/bookwyrm/tests/views/test_rss_feed.py
index 2b5e415e..3d5bec49 100644
--- a/bookwyrm/tests/views/test_rss_feed.py
+++ b/bookwyrm/tests/views/test_rss_feed.py
@@ -41,6 +41,7 @@ class RssFeedView(TestCase):
         ''' load an rss feed '''
         view = rss_feed.RssFeed()
         request = self.factory.get('/user/rss_user/rss')
+        request.user = self.user
         with patch("bookwyrm.models.SiteSettings.objects.get") as site:
             site.return_value = self.site
             result = view(request, username=self.user.username)

From a0b57837a7bfa3b2e73aa9b8208800f64dfd7c53 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Feb 2021 13:34:16 -0800
Subject: [PATCH 0064/1285] Moves status templates into dir

---
 bookwyrm/templates/book.html                                | 2 +-
 bookwyrm/templates/feed/direct_messages.html                | 2 +-
 bookwyrm/templates/feed/feed.html                           | 2 +-
 bookwyrm/templates/feed/thread.html                         | 2 +-
 bookwyrm/templates/snippets/{ => status}/status.html        | 4 ++--
 bookwyrm/templates/snippets/{ => status}/status_body.html   | 6 +++---
 .../templates/snippets/{ => status}/status_content.html     | 0
 bookwyrm/templates/snippets/{ => status}/status_header.html | 0
 .../templates/snippets/{ => status}/status_options.html     | 0
 bookwyrm/templates/user/user.html                           | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)
 rename bookwyrm/templates/snippets/{ => status}/status.html (63%)
 rename bookwyrm/templates/snippets/{ => status}/status_body.html (89%)
 rename bookwyrm/templates/snippets/{ => status}/status_content.html (100%)
 rename bookwyrm/templates/snippets/{ => status}/status_header.html (100%)
 rename bookwyrm/templates/snippets/{ => status}/status_options.html (100%)

diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html
index 0bef2856..4d15a3a5 100644
--- a/bookwyrm/templates/book.html
+++ b/bookwyrm/templates/book.html
@@ -242,7 +242,7 @@
 <div class="block" id="reviews">
     {% for review in reviews %}
     <div class="block">
-        {% include 'snippets/status.html' with status=review hide_book=True depth=1 %}
+        {% include 'snippets/status/status.html' with status=review hide_book=True depth=1 %}
     </div>
     {% endfor %}
 
diff --git a/bookwyrm/templates/feed/direct_messages.html b/bookwyrm/templates/feed/direct_messages.html
index 8c53cbeb..f3102ee7 100644
--- a/bookwyrm/templates/feed/direct_messages.html
+++ b/bookwyrm/templates/feed/direct_messages.html
@@ -16,7 +16,7 @@
     {% endif %}
     {% for activity in activities %}
     <div class="block">
-    {% include 'snippets/status.html' with status=activity %}
+    {% include 'snippets/status/status.html' with status=activity %}
     </div>
     {% endfor %}
 
diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html
index 8d6152e2..7029fd69 100644
--- a/bookwyrm/templates/feed/feed.html
+++ b/bookwyrm/templates/feed/feed.html
@@ -32,7 +32,7 @@
 {% endif %}
 {% for activity in activities %}
 <div class="block">
-{% include 'snippets/status.html' with status=activity %}
+{% include 'snippets/status/status.html' with status=activity %}
 </div>
 {% endfor %}
 
diff --git a/bookwyrm/templates/feed/thread.html b/bookwyrm/templates/feed/thread.html
index aa67d5bb..18ab6ea3 100644
--- a/bookwyrm/templates/feed/thread.html
+++ b/bookwyrm/templates/feed/thread.html
@@ -8,7 +8,7 @@
         {% endwith %}
     {% endif %}
 
-{% include 'snippets/status.html' with status=status main=is_root %}
+{% include 'snippets/status/status.html' with status=status main=is_root %}
 
 {% if depth <= max_depth and direction >= 0 %}
     {% for reply in status|replies  %}
diff --git a/bookwyrm/templates/snippets/status.html b/bookwyrm/templates/snippets/status/status.html
similarity index 63%
rename from bookwyrm/templates/snippets/status.html
rename to bookwyrm/templates/snippets/status/status.html
index 13d5ee7c..162fad97 100644
--- a/bookwyrm/templates/snippets/status.html
+++ b/bookwyrm/templates/snippets/status/status.html
@@ -4,8 +4,8 @@
         {% include 'snippets/avatar.html' with user=status.user %}
         {% include 'snippets/username.html' with user=status.user %}
         boosted
-        {% include 'snippets/status_body.html' with status=status|boosted_status %}
+        {% include 'snippets/status/status_body.html' with status=status|boosted_status %}
     {% else %}
-        {% include 'snippets/status_body.html' with status=status %}
+        {% include 'snippets/status/status_body.html' with status=status %}
     {% endif %}
 {% endif %}
diff --git a/bookwyrm/templates/snippets/status_body.html b/bookwyrm/templates/snippets/status/status_body.html
similarity index 89%
rename from bookwyrm/templates/snippets/status_body.html
rename to bookwyrm/templates/snippets/status/status_body.html
index 00ae5460..dfc0ac68 100644
--- a/bookwyrm/templates/snippets/status_body.html
+++ b/bookwyrm/templates/snippets/status/status_body.html
@@ -5,13 +5,13 @@
 
 {% block card-header %}
     <h3 class="card-header-title has-background-white-ter is-block">
-        {% include 'snippets/status_header.html' with status=status %}
+        {% include 'snippets/status/status_header.html' with status=status %}
     </h3>
 {% endblock %}
 
 
 {% block card-content %}
-    {% include 'snippets/status_content.html' with status=status %}
+    {% include 'snippets/status/status_content.html' with status=status %}
 {% endblock %}
 
 
@@ -55,7 +55,7 @@
     <a href="{{ status.remote_id }}">{{ status.published_date | post_date }}</a>
 </div>
 <div class="card-footer-item">
-    {% include 'snippets/status_options.html' with class="is-small" right=True %}
+    {% include 'snippets/status/status_options.html' with class="is-small" right=True %}
 </div>
 {% endblock %}
 
diff --git a/bookwyrm/templates/snippets/status_content.html b/bookwyrm/templates/snippets/status/status_content.html
similarity index 100%
rename from bookwyrm/templates/snippets/status_content.html
rename to bookwyrm/templates/snippets/status/status_content.html
diff --git a/bookwyrm/templates/snippets/status_header.html b/bookwyrm/templates/snippets/status/status_header.html
similarity index 100%
rename from bookwyrm/templates/snippets/status_header.html
rename to bookwyrm/templates/snippets/status/status_header.html
diff --git a/bookwyrm/templates/snippets/status_options.html b/bookwyrm/templates/snippets/status/status_options.html
similarity index 100%
rename from bookwyrm/templates/snippets/status_options.html
rename to bookwyrm/templates/snippets/status/status_options.html
diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index c7f6d3b5..e1c19e53 100644
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -64,7 +64,7 @@
     </div>
     {% for activity in activities %}
     <div class="block" id="feed">
-        {% include 'snippets/status.html' with status=activity %}
+        {% include 'snippets/status/status.html' with status=activity %}
     </div>
     {% endfor %}
     {% if not activities %}

From f9dd0b0246032b769837c1244b8f88ef5467e2c3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Feb 2021 13:42:20 -0800
Subject: [PATCH 0065/1285] Groups in book preview only used by status
 templates

---
 bookwyrm/templates/snippets/{ => status}/book_preview.html | 0
 bookwyrm/templates/snippets/status/status_content.html     | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename bookwyrm/templates/snippets/{ => status}/book_preview.html (100%)

diff --git a/bookwyrm/templates/snippets/book_preview.html b/bookwyrm/templates/snippets/status/book_preview.html
similarity index 100%
rename from bookwyrm/templates/snippets/book_preview.html
rename to bookwyrm/templates/snippets/status/book_preview.html
diff --git a/bookwyrm/templates/snippets/status/status_content.html b/bookwyrm/templates/snippets/status/status_content.html
index d6dd5ef5..0f59f7fc 100644
--- a/bookwyrm/templates/snippets/status/status_content.html
+++ b/bookwyrm/templates/snippets/status/status_content.html
@@ -54,9 +54,9 @@
 {% if status.book or status.mention_books.count %}
 <div class="{% if status.status_type != 'GeneratedNote' %}box has-background-white-bis{% endif %}">
     {% if status.book %}
-    {% include 'snippets/book_preview.html' with book=status.book %}
+    {% include 'snippets/status/book_preview.html' with book=status.book %}
     {% elif status.mention_books.count %}
-    {% include 'snippets/book_preview.html' with book=status.mention_books.first %}
+    {% include 'snippets/status/book_preview.html' with book=status.mention_books.first %}
     {% endif %}
 </div>
 {% endif %}

From d0c46060e82282c9a3f1008a4e6e003c64185026 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Feb 2021 14:00:19 -0800
Subject: [PATCH 0066/1285] Adds stars to book preview in status

---
 bookwyrm/templates/snippets/stars.html               | 2 +-
 bookwyrm/templates/snippets/status/book_preview.html | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/stars.html b/bookwyrm/templates/snippets/stars.html
index 7d5b63d7..d1576807 100644
--- a/bookwyrm/templates/snippets/stars.html
+++ b/bookwyrm/templates/snippets/stars.html
@@ -1,7 +1,7 @@
 <p class="stars">
     <span class="is-sr-only">{% if rating %}{{ rating|floatformat }} star{{ rating|floatformat | pluralize }}{% else %}No rating{% endif %}</span>
     {% for i in '12345'|make_list %}
-    <span class="icon icon-star-{% if rating >= forloop.counter %}full{% elif rating|floatformat:0 >= forloop.counter|floatformat:0 %}half{% else %}empty{% endif %}" aria-hidden="true">
+    <span class="icon is-small mr-1 icon-star-{% if rating >= forloop.counter %}full{% elif rating|floatformat:0 >= forloop.counter|floatformat:0 %}half{% else %}empty{% endif %}" aria-hidden="true">
     </span>
     {% endfor %}
 </p>
diff --git a/bookwyrm/templates/snippets/status/book_preview.html b/bookwyrm/templates/snippets/status/book_preview.html
index 0c75f9b1..920b9f53 100644
--- a/bookwyrm/templates/snippets/status/book_preview.html
+++ b/bookwyrm/templates/snippets/status/book_preview.html
@@ -3,6 +3,7 @@
     <div class="column is-narrow">
         <div>
             <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book %}</a>
+            {% include 'snippets/stars.html' with rating=book|rating:request.user %}
             {% include 'snippets/shelve_button/shelve_button.html' with book=book %}
         </div>
     </div>

From 31c9c07e384e4aa0a14cd73282d2bc760f94eb28 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Feb 2021 14:06:08 -0800
Subject: [PATCH 0067/1285] Makes covers clickable on discover page

---
 bookwyrm/templates/{ => discover}/discover.html      | 12 ++++++------
 .../{snippets => }/discover/large-book.html          |  2 +-
 .../{snippets => }/discover/small-book.html          |  2 +-
 bookwyrm/views/landing.py                            |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename bookwyrm/templates/{ => discover}/discover.html (85%)
 rename bookwyrm/templates/{snippets => }/discover/large-book.html (85%)
 rename bookwyrm/templates/{snippets => }/discover/small-book.html (79%)

diff --git a/bookwyrm/templates/discover.html b/bookwyrm/templates/discover/discover.html
similarity index 85%
rename from bookwyrm/templates/discover.html
rename to bookwyrm/templates/discover/discover.html
index 27e26e53..0b6f8a1f 100644
--- a/bookwyrm/templates/discover.html
+++ b/bookwyrm/templates/discover/discover.html
@@ -63,18 +63,18 @@
     <div class="tile is-vertical">
         <div class="tile is-parent">
             <div class="tile is-child box has-background-white-ter">
-                {% include 'snippets/discover/large-book.html' with book=books.0 %}
+                {% include 'discover/large-book.html' with book=books.0 %}
             </div>
         </div>
         <div class="tile">
             <div class="tile is-parent is-6">
                 <div class="tile is-child box has-background-white-ter">
-                    {% include 'snippets/discover/small-book.html' with book=books.1 %}
+                    {% include 'discover/small-book.html' with book=books.1 %}
                 </div>
             </div>
             <div class="tile is-parent is-6">
                 <div class="tile is-child box has-background-white-ter">
-                    {% include 'snippets/discover/small-book.html' with book=books.2 %}
+                    {% include 'discover/small-book.html' with book=books.2 %}
                 </div>
             </div>
         </div>
@@ -83,18 +83,18 @@
         <div class="tile">
             <div class="tile is-parent is-6">
                 <div class="tile is-child box has-background-white-ter">
-                    {% include 'snippets/discover/small-book.html' with book=books.3 %}
+                    {% include 'discover/small-book.html' with book=books.3 %}
                 </div>
             </div>
             <div class="tile is-parent is-6">
                 <div class="tile is-child box has-background-white-ter">
-                    {% include 'snippets/discover/small-book.html' with book=books.4 %}
+                    {% include 'discover/small-book.html' with book=books.4 %}
                 </div>
             </div>
         </div>
         <div class="tile is-parent">
             <div class="tile is-child box has-background-white-ter">
-                {% include 'snippets/discover/large-book.html' with book=books.5 %}
+                {% include 'discover/large-book.html' with book=books.5 %}
             </div>
         </div>
     </div>
diff --git a/bookwyrm/templates/snippets/discover/large-book.html b/bookwyrm/templates/discover/large-book.html
similarity index 85%
rename from bookwyrm/templates/snippets/discover/large-book.html
rename to bookwyrm/templates/discover/large-book.html
index 37b35947..401411a1 100644
--- a/bookwyrm/templates/snippets/discover/large-book.html
+++ b/bookwyrm/templates/discover/large-book.html
@@ -2,7 +2,7 @@
 {% if book %}
 <div class="columns">
     <div class="column is-narrow">
-        {% include 'snippets/book_cover.html' with book=book size="large" %}
+        <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book size="large" %}</a>
         {% include 'snippets/stars.html' with rating=ratings|dict_key:book.id %}
     </div>
     <div class="column">
diff --git a/bookwyrm/templates/snippets/discover/small-book.html b/bookwyrm/templates/discover/small-book.html
similarity index 79%
rename from bookwyrm/templates/snippets/discover/small-book.html
rename to bookwyrm/templates/discover/small-book.html
index be399df6..d1676b6b 100644
--- a/bookwyrm/templates/snippets/discover/small-book.html
+++ b/bookwyrm/templates/discover/small-book.html
@@ -1,6 +1,6 @@
 {% load bookwyrm_tags %}
 {% if book %}
-{% include 'snippets/book_cover.html' with book=book %}
+<a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book %}</a>
 {% if ratings %}
 {% include 'snippets/stars.html' with rating=ratings|dict_key:book.id %}
 {% endif %}
diff --git a/bookwyrm/views/landing.py b/bookwyrm/views/landing.py
index 0d841ef0..854f3a9b 100644
--- a/bookwyrm/views/landing.py
+++ b/bookwyrm/views/landing.py
@@ -56,4 +56,4 @@ class Discover(View):
             'books': list(set(books)),
             'ratings': ratings
         }
-        return TemplateResponse(request, 'discover.html', data)
+        return TemplateResponse(request, 'discover/discover.html', data)

From 1eaff91513e7f3ffa156c2f108d07e06d509b545 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Feb 2021 14:08:52 -0800
Subject: [PATCH 0068/1285] Makes the interactive rating element a different
 color

---
 bookwyrm/templates/snippets/rate_action.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/rate_action.html b/bookwyrm/templates/snippets/rate_action.html
index 833f2b88..cc94f675 100644
--- a/bookwyrm/templates/snippets/rate_action.html
+++ b/bookwyrm/templates/snippets/rate_action.html
@@ -9,7 +9,7 @@
         <input type="hidden" name="privacy" value="public">
         <input type="hidden" name="rating" value="{{ forloop.counter }}">
 
-        <div class="field is-grouped stars form-rate-stars mb-1">
+        <div class="field is-grouped stars form-rate-stars mb-1 has-text-warning-dark">
             <label class="is-sr-only" for="rating-no-rating-{{ book.id }}">No rating</label>
             <input class="is-sr-only" type="radio" name="rating" value="" id="rating-no-rating-{{ book.id }}" checked>
             {% for i in '12345'|make_list %}

From 3de8a20d39db8ab2036b0352af435090ff90c712 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Feb 2021 14:36:24 -0800
Subject: [PATCH 0069/1285] Fixes boolean for is bookwyrm user in test

---
 bookwyrm/tests/models/test_user_model.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py
index 84ff3e9b..ed3ad41a 100644
--- a/bookwyrm/tests/models/test_user_model.py
+++ b/bookwyrm/tests/models/test_user_model.py
@@ -64,7 +64,7 @@ class User(TestCase):
         self.assertEqual(activity['name'], self.user.name)
         self.assertEqual(activity['inbox'], self.user.inbox)
         self.assertEqual(activity['outbox'], self.user.outbox)
-        self.assertEqual(activity['bookwyrmUser'], True)
+        self.assertEqual(activity['bookwyrmUser'], False)
         self.assertEqual(activity['discoverable'], True)
         self.assertEqual(activity['type'], 'Person')
 

From d3381d7a799d98f40a59c962be5b124d0cc6ecc3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Feb 2021 14:41:33 -0800
Subject: [PATCH 0070/1285] Paginates invite page

I sure have sent out a lot of invites
---
 bookwyrm/templates/settings/manage_invites.html |  1 +
 bookwyrm/views/invite.py                        | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/settings/manage_invites.html b/bookwyrm/templates/settings/manage_invites.html
index 03b68b20..42668a3d 100644
--- a/bookwyrm/templates/settings/manage_invites.html
+++ b/bookwyrm/templates/settings/manage_invites.html
@@ -22,6 +22,7 @@
         </tr>
         {% endfor %}
     </table>
+    {% include 'snippets/pagination.html' with page=invites path=request.path %}
 </section>
 
 <section class="block">
diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/invite.py
index bd0715a0..ed7b1f5f 100644
--- a/bookwyrm/views/invite.py
+++ b/bookwyrm/views/invite.py
@@ -1,5 +1,6 @@
 ''' invites when registration is closed '''
 from django.contrib.auth.decorators import login_required, permission_required
+from django.core.paginator import Paginator
 from django.http import HttpResponseBadRequest
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
@@ -7,6 +8,7 @@ from django.utils.decorators import method_decorator
 from django.views import View
 
 from bookwyrm import forms, models
+from bookwyrm.settings import PAGE_LENGTH
 
 
 # pylint: disable= no-self-use
@@ -18,10 +20,18 @@ class ManageInvites(View):
     ''' create invites '''
     def get(self, request):
         ''' invite management page '''
+        try:
+            page = int(request.GET.get('page', 1))
+        except ValueError:
+            page = 1
+
+        paginated = Paginator(models.SiteInvite.objects.filter(
+            user=request.user
+        ).order_by('-created_date'), PAGE_LENGTH)
+
         data = {
             'title': 'Invitations',
-            'invites': models.SiteInvite.objects.filter(
-                user=request.user).order_by('-created_date'),
+            'invites': paginated.page(page),
             'form': forms.CreateInviteForm(),
         }
         return TemplateResponse(request, 'settings/manage_invites.html', data)

From baed291889eb3672c6c503b7b023e28a72ca26ce Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Feb 2021 14:45:39 -0800
Subject: [PATCH 0071/1285] Don't broadcast after saving remote server

---
 bookwyrm/models/user.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index a1f927b2..094a13d5 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -319,7 +319,7 @@ def set_remote_server(user_id):
     actor_parts = urlparse(user.remote_id)
     user.federated_server = \
         get_or_create_remote_server(actor_parts.netloc)
-    user.save()
+    user.save(broadcast=False)
     if user.bookwyrm_user:
         get_remote_reviews.delay(user.outbox)
 

From 384187a263c649c4b563b1d422dc09e5c0f07ede Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Feb 2021 15:21:37 -0800
Subject: [PATCH 0072/1285] Moves create invite form to top of invite page

---
 .../templates/settings/manage_invites.html    | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/bookwyrm/templates/settings/manage_invites.html b/bookwyrm/templates/settings/manage_invites.html
index 42668a3d..086615a9 100644
--- a/bookwyrm/templates/settings/manage_invites.html
+++ b/bookwyrm/templates/settings/manage_invites.html
@@ -2,29 +2,6 @@
 {% block header %}Invites{% endblock %}
 {% load humanize %}
 {% block panel %}
-<section class="block">
-    <table class="table is-striped">
-        <tr>
-            <th>Link</th>
-            <th>Expires</th>
-            <th>Max uses</th>
-            <th>Times used</th>
-        </tr>
-        {% if not invites %}
-        <tr><td colspan="4">No active invites</td></tr>
-        {% endif %}
-        {% for invite in invites %}
-        <tr>
-            <td><a href="{{ invite.link }}">{{ invite.link }}</td>
-            <td>{{ invite.expiry|naturaltime }}</td>
-            <td>{{ invite.use_limit }}</td>
-            <td>{{ invite.times_used }}</td>
-        </tr>
-        {% endfor %}
-    </table>
-    {% include 'snippets/pagination.html' with page=invites path=request.path %}
-</section>
-
 <section class="block">
     <h2 class="title is-4">Generate New Invite</h2>
 
@@ -48,4 +25,27 @@
         <button class="button is-primary" type="submit">Create Invite</button>
     </form>
 </section>
+
+<section class="block">
+    <table class="table is-striped">
+        <tr>
+            <th>Link</th>
+            <th>Expires</th>
+            <th>Max uses</th>
+            <th>Times used</th>
+        </tr>
+        {% if not invites %}
+        <tr><td colspan="4">No active invites</td></tr>
+        {% endif %}
+        {% for invite in invites %}
+        <tr>
+            <td><a href="{{ invite.link }}">{{ invite.link }}</td>
+            <td>{{ invite.expiry|naturaltime }}</td>
+            <td>{{ invite.use_limit }}</td>
+            <td>{{ invite.times_used }}</td>
+        </tr>
+        {% endfor %}
+    </table>
+    {% include 'snippets/pagination.html' with page=invites path=request.path %}
+</section>
 {% endblock %}

From 23fb5f62a2e58d4869b1ab79aa72f105dda305f7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Feb 2021 15:25:26 -0800
Subject: [PATCH 0073/1285] Keep invite settings in form after save

---
 bookwyrm/views/invite.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/invite.py
index ed7b1f5f..6b3611fc 100644
--- a/bookwyrm/views/invite.py
+++ b/bookwyrm/views/invite.py
@@ -46,7 +46,15 @@ class ManageInvites(View):
         invite.user = request.user
         invite.save()
 
-        return redirect('/settings/invites')
+        paginated = Paginator(models.SiteInvite.objects.filter(
+            user=request.user
+        ).order_by('-created_date'), PAGE_LENGTH)
+        data = {
+            'title': 'Invitations',
+            'invites': paginated.page(1),
+            'form': form
+        }
+        return TemplateResponse(request, 'settings/manage_invites.html', data)
 
 
 class Invite(View):

From 6e6bcb2f4833e27d4c626d9d6d7c73c2616db5ff Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Feb 2021 15:51:02 -0800
Subject: [PATCH 0074/1285] gotta simplify the add activity

---
 bookwyrm/activitypub/__init__.py   |  2 +-
 bookwyrm/activitypub/verbs.py      | 11 ++---
 bookwyrm/models/list.py            |  2 +-
 bookwyrm/tests/views/test_inbox.py | 75 ++++++++++++++++++++++++++++++
 4 files changed, 80 insertions(+), 10 deletions(-)

diff --git a/bookwyrm/activitypub/__init__.py b/bookwyrm/activitypub/__init__.py
index f06154ab..fdfbb1f0 100644
--- a/bookwyrm/activitypub/__init__.py
+++ b/bookwyrm/activitypub/__init__.py
@@ -15,7 +15,7 @@ from .response import ActivitypubResponse
 from .book import Edition, Work, Author
 from .verbs import Create, Delete, Undo, Update
 from .verbs import Follow, Accept, Reject, Block
-from .verbs import Add, AddListItem, Remove
+from .verbs import Add, Remove
 from .verbs import Announce, Like
 
 # this creates a list of all the Activity types that we can serialize,
diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index 6f1a4d44..1236338b 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -121,6 +121,9 @@ class Add(Verb):
     target: str
     object: Edition
     type: str = 'Add'
+    notes: str = None
+    order: int = 0
+    approved: bool = True
 
     def action(self):
         ''' add obj to collection '''
@@ -131,14 +134,6 @@ class Add(Verb):
         self.to_model(model=model)
 
 
-@dataclass(init=False)
-class AddListItem(Add):
-    '''Add activity that's aware of the book obj '''
-    notes: str = None
-    order: int = 0
-    approved: bool = True
-
-
 @dataclass(init=False)
 class Remove(Verb):
     '''Remove activity '''
diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index ef48ed95..1b14c2aa 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -68,7 +68,7 @@ class ListItem(CollectionItemMixin, BookWyrmModel):
     order = fields.IntegerField(blank=True, null=True)
     endorsement = models.ManyToManyField('User', related_name='endorsers')
 
-    activity_serializer = activitypub.AddListItem
+    activity_serializer = activitypub.Add
     object_field = 'book'
     collection_field = 'book_list'
 
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index c2658917..45966d59 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -612,6 +612,81 @@ class Inbox(TestCase):
         self.assertEqual(shelf.books.first(), book)
 
 
+#    def test_handle_tag_book(self):
+#        ''' tagging a book '''
+#        work = models.Work.objects.create(title='work title')
+#        book = models.Edition.objects.create(
+#            title='Test', remote_id='https://bookwyrm.social/book/37292',
+#            parent_work=work)
+#
+#        activity = {
+#            "id": "https://bookwyrm.social/shelfbook/6189#add",
+#            "type": "Add",
+#            "actor": "https://example.com/users/rat",
+#            "object": {
+#                "type": "Edition",
+#                "title": "Test Title",
+#                "work": work.remote_id,
+#                "id": "https://bookwyrm.social/book/37292",
+#            },
+#            "target": "",
+#            "@context": "https://www.w3.org/ns/activitystreams"
+#        }
+#        views.inbox.activity_task(activity)
+#        self.assertEqual(shelf.books.first(), book)
+
+
+    @responses.activate
+    def test_handle_add_book_to_list(self):
+        ''' listing a book '''
+        work = models.Work.objects.create(title='work title')
+        book = models.Edition.objects.create(
+            title='Test', remote_id='https://bookwyrm.social/book/37292',
+            parent_work=work)
+
+        responses.add(
+            responses.GET,
+            'https://bookwyrm.social/user/mouse/list/to-read',
+            json={
+                "id": "https://example.com/list/22",
+                "type": "BookList",
+                "totalItems": 1,
+                "first": "https://example.com/list/22?page=1",
+                "last": "https://example.com/list/22?page=1",
+                "name": "Test List",
+                "owner": "https://example.com/user/mouse",
+                "to": [
+                    "https://www.w3.org/ns/activitystreams#Public"
+                ],
+                "cc": [
+                    "https://example.com/user/mouse/followers"
+                ],
+                "summary": "summary text",
+                "curation": "curated",
+                "@context": "https://www.w3.org/ns/activitystreams"
+            }
+        )
+
+        activity = {
+            "id": "https://bookwyrm.social/listbook/6189#add",
+            "type": "Add",
+            "actor": "https://example.com/users/rat",
+            "object": {
+                "type": "Edition",
+                "title": "Test Title",
+                "work": work.remote_id,
+                "id": "https://bookwyrm.social/book/37292",
+            },
+            "target": "https://bookwyrm.social/user/mouse/list/to-read",
+            "@context": "https://www.w3.org/ns/activitystreams"
+        }
+        views.inbox.activity_task(activity)
+
+        booklist = models.List.objects.get()
+        self.assertEqual(booklist.name, 'Test List')
+        self.assertEqual(booklist.books.first(), book)
+
+
     def test_handle_update_user(self):
         ''' update an existing user '''
         # we only do this with remote users

From 4d0e52bf517a53d46c070a0d82b4efa89ced70a7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Feb 2021 17:18:25 -0800
Subject: [PATCH 0075/1285] Test tag and list add

---
 bookwyrm/activitypub/base_activity.py |  3 +-
 bookwyrm/models/activitypub_mixin.py  |  2 +-
 bookwyrm/models/tag.py                | 19 ++++----
 bookwyrm/tests/views/test_inbox.py    | 67 +++++++++++++++++----------
 bookwyrm/tests/views/test_tag.py      | 15 ++++++
 bookwyrm/views/tag.py                 |  7 ++-
 6 files changed, 73 insertions(+), 40 deletions(-)

diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index c360711d..57f1a713 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -82,7 +82,8 @@ class ActivityObject:
                     if activity_objects:
                         value = naive_parse(activity_objects, value)
                     else:
-                        value = naive_parse(activity_objects, value, serializer=field.type)
+                        value = naive_parse(
+                            activity_objects, value, serializer=field.type)
 
             except KeyError:
                 if field.default == MISSING and \
diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index 7ea632b3..fe89f267 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -330,7 +330,7 @@ class OrderedCollectionMixin(OrderedCollectionPageMixin):
     def to_activity(self, **kwargs):
         ''' an ordered collection of the specified model queryset  '''
         return self.to_ordered_collection(
-            self.collection_queryset, **kwargs).serialize()
+            self.collection_queryset, **kwargs)
 
 
 class CollectionItemMixin(ActivitypubMixin):
diff --git a/bookwyrm/models/tag.py b/bookwyrm/models/tag.py
index 12645b9e..83359170 100644
--- a/bookwyrm/models/tag.py
+++ b/bookwyrm/models/tag.py
@@ -1,6 +1,7 @@
 ''' models for storing different kinds of Activities '''
 import urllib.parse
 
+from django.apps import apps
 from django.db import models
 
 from bookwyrm import activitypub
@@ -15,17 +16,15 @@ class Tag(OrderedCollectionMixin, BookWyrmModel):
     name = fields.CharField(max_length=100, unique=True)
     identifier = models.CharField(max_length=100)
 
-    @classmethod
-    def book_queryset(cls, identifier):
-        ''' county of books associated with this tag '''
-        return cls.objects.filter(
-            identifier=identifier
-        ).order_by('-updated_date')
-
     @property
-    def collection_queryset(self):
-        ''' books associated with this tag '''
-        return self.book_queryset(self.identifier)
+    def books(self):
+        ''' count of books associated with this tag '''
+        edition_model = apps.get_model('bookwyrm.Edition', require_ready=True)
+        return edition_model.objects.filter(
+            usertag__tag__identifier=self.identifier
+        ).order_by('-created_date').distinct()
+
+    collection_queryset = books
 
     def get_remote_id(self):
         ''' tag should use identifier not id in remote_id '''
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index 45966d59..ff55ad04 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -612,30 +612,6 @@ class Inbox(TestCase):
         self.assertEqual(shelf.books.first(), book)
 
 
-#    def test_handle_tag_book(self):
-#        ''' tagging a book '''
-#        work = models.Work.objects.create(title='work title')
-#        book = models.Edition.objects.create(
-#            title='Test', remote_id='https://bookwyrm.social/book/37292',
-#            parent_work=work)
-#
-#        activity = {
-#            "id": "https://bookwyrm.social/shelfbook/6189#add",
-#            "type": "Add",
-#            "actor": "https://example.com/users/rat",
-#            "object": {
-#                "type": "Edition",
-#                "title": "Test Title",
-#                "work": work.remote_id,
-#                "id": "https://bookwyrm.social/book/37292",
-#            },
-#            "target": "",
-#            "@context": "https://www.w3.org/ns/activitystreams"
-#        }
-#        views.inbox.activity_task(activity)
-#        self.assertEqual(shelf.books.first(), book)
-
-
     @responses.activate
     def test_handle_add_book_to_list(self):
         ''' listing a book '''
@@ -687,6 +663,49 @@ class Inbox(TestCase):
         self.assertEqual(booklist.books.first(), book)
 
 
+    @responses.activate
+    def test_handle_tag_book(self):
+        ''' listing a book '''
+        work = models.Work.objects.create(title='work title')
+        book = models.Edition.objects.create(
+            title='Test', remote_id='https://bookwyrm.social/book/37292',
+            parent_work=work)
+
+        responses.add(
+            responses.GET,
+            'https://www.example.com/tag/cool-tag',
+            json={
+                "id": "https://1b1a78582461.ngrok.io/tag/tag",
+                "type": "OrderedCollection",
+                "totalItems": 0,
+                "first": "https://1b1a78582461.ngrok.io/tag/tag?page=1",
+                "last": "https://1b1a78582461.ngrok.io/tag/tag?page=1",
+                "name": "cool tag",
+                "@context": "https://www.w3.org/ns/activitystreams"
+            }
+        )
+
+        activity = {
+            "id": "https://bookwyrm.social/listbook/6189#add",
+            "type": "Add",
+            "actor": "https://example.com/users/rat",
+            "object": {
+                "type": "Edition",
+                "title": "Test Title",
+                "work": work.remote_id,
+                "id": "https://bookwyrm.social/book/37292",
+            },
+            "target": "https://www.example.com/tag/cool-tag",
+            "@context": "https://www.w3.org/ns/activitystreams"
+        }
+        views.inbox.activity_task(activity)
+
+        tag = models.Tag.objects.get()
+        self.assertFalse(models.List.objects.exists())
+        self.assertEqual(tag.name, 'cool tag')
+        self.assertEqual(tag.books.first(), book)
+
+
     def test_handle_update_user(self):
         ''' update an existing user '''
         # we only do this with remote users
diff --git a/bookwyrm/tests/views/test_tag.py b/bookwyrm/tests/views/test_tag.py
index 21a7e22e..ef809b46 100644
--- a/bookwyrm/tests/views/test_tag.py
+++ b/bookwyrm/tests/views/test_tag.py
@@ -59,6 +59,21 @@ class TagViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
 
+    def test_tag_page_activitypub_page(self):
+        ''' there are so many views, this just makes sure it LOADS '''
+        view = views.Tag.as_view()
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+            tag = models.Tag.objects.create(name='hi there')
+            models.UserTag.objects.create(
+                tag=tag, user=self.local_user, book=self.book)
+        request = self.factory.get('', {'page': 1})
+        with patch('bookwyrm.views.tag.is_api_request') as is_api:
+            is_api.return_value = True
+            result = view(request, tag.identifier)
+        self.assertIsInstance(result, ActivitypubResponse)
+        self.assertEqual(result.status_code, 200)
+
+
     def test_tag(self):
         ''' add a tag to a book '''
         view = views.AddTag.as_view()
diff --git a/bookwyrm/views/tag.py b/bookwyrm/views/tag.py
index b50bc0ef..710f9415 100644
--- a/bookwyrm/views/tag.py
+++ b/bookwyrm/views/tag.py
@@ -16,12 +16,11 @@ class Tag(View):
     ''' tag page '''
     def get(self, request, tag_id):
         ''' see books related to a tag '''
-        tag_obj = models.Tag.objects.filter(identifier=tag_id).first()
-        if not tag_obj:
-            return HttpResponseNotFound()
+        tag_obj = get_object_or_404(models.Tag, identifier=tag_id)
 
         if is_api_request(request):
-            return ActivitypubResponse(tag_obj.to_activity(**request.GET))
+            return ActivitypubResponse(
+                tag_obj.to_activity(**request.GET), safe=False)
 
         books = models.Edition.objects.filter(
             usertag__tag__identifier=tag_id

From fba53c72e0d1ff2c2efc12967696386a7880b96d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Feb 2021 17:19:47 -0800
Subject: [PATCH 0076/1285] default safe mode for activity serialization

---
 bookwyrm/activitypub/response.py | 2 +-
 bookwyrm/views/tag.py            | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/activitypub/response.py b/bookwyrm/activitypub/response.py
index bbc44c4d..8f3c050b 100644
--- a/bookwyrm/activitypub/response.py
+++ b/bookwyrm/activitypub/response.py
@@ -9,7 +9,7 @@ class ActivitypubResponse(JsonResponse):
     configures some stuff beforehand. Made to be a drop-in replacement of
     JsonResponse.
     """
-    def __init__(self, data, encoder=ActivityEncoder, safe=True,
+    def __init__(self, data, encoder=ActivityEncoder, safe=False,
                  json_dumps_params=None, **kwargs):
 
         if 'content_type' not in kwargs:
diff --git a/bookwyrm/views/tag.py b/bookwyrm/views/tag.py
index 710f9415..502f5ea5 100644
--- a/bookwyrm/views/tag.py
+++ b/bookwyrm/views/tag.py
@@ -1,6 +1,5 @@
 ''' tagging views'''
 from django.contrib.auth.decorators import login_required
-from django.http import HttpResponseNotFound
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
@@ -20,7 +19,7 @@ class Tag(View):
 
         if is_api_request(request):
             return ActivitypubResponse(
-                tag_obj.to_activity(**request.GET), safe=False)
+                tag_obj.to_activity(**request.GET))
 
         books = models.Edition.objects.filter(
             usertag__tag__identifier=tag_id

From 744de313c8ab2febf33a060a343726365b583467 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Feb 2021 17:23:11 -0800
Subject: [PATCH 0077/1285] Makes comment and fav/boost buttons the same color
 when selected

---
 bookwyrm/templates/snippets/boost_button.html | 2 +-
 bookwyrm/templates/snippets/fav_button.html   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/snippets/boost_button.html b/bookwyrm/templates/snippets/boost_button.html
index 08daae64..bf914379 100644
--- a/bookwyrm/templates/snippets/boost_button.html
+++ b/bookwyrm/templates/snippets/boost_button.html
@@ -11,7 +11,7 @@
 </form>
 <form name="unboost" action="/unboost/{{ status.id }}" method="post" class="interaction boost-{{ status.id }}-{{ uuid }} active {% if not request.user|boosted:status %}hidden{% endif %}" data-id="boost-{{ status.id }}-{{ uuid }}">
     {% csrf_token %}
-    <button class="button is-small is-success" type="submit">
+    <button class="button is-small is-primary" type="submit">
         <span class="icon icon-boost" title="Un-boost status">
             <span class="is-sr-only">Un-boost status</span>
         </span>
diff --git a/bookwyrm/templates/snippets/fav_button.html b/bookwyrm/templates/snippets/fav_button.html
index c413e979..650f4e8a 100644
--- a/bookwyrm/templates/snippets/fav_button.html
+++ b/bookwyrm/templates/snippets/fav_button.html
@@ -10,7 +10,7 @@
 </form>
 <form name="unfavorite" action="/unfavorite/{{ status.id }}" method="POST" class="interaction fav-{{ status.id }}-{{ uuid }} active {% if not request.user|liked:status %}hidden{% endif %}" data-id="fav-{{ status.id }}-{{ uuid }}">
     {% csrf_token %}
-    <button class="button is-success is-small" type="submit">
+    <button class="button is-primary is-small" type="submit">
         <span class="icon icon-heart" title="Un-like status">
             <span class="is-sr-only">Un-like status</span>
         </span>

From fcc0e0ccb6580930ffd0c9c52da704bb8dd44e4a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Feb 2021 19:58:04 -0800
Subject: [PATCH 0078/1285] Cleans up formatting on about page

---
 bookwyrm/templates/about.html             | 16 --------------
 bookwyrm/templates/discover/about.html    | 22 ++++++++++++++++++
 bookwyrm/templates/discover/discover.html | 27 ++---------------------
 bookwyrm/templates/discover/icons.html    | 21 ++++++++++++++++++
 bookwyrm/views/landing.py                 |  2 +-
 5 files changed, 46 insertions(+), 42 deletions(-)
 delete mode 100644 bookwyrm/templates/about.html
 create mode 100644 bookwyrm/templates/discover/about.html
 create mode 100644 bookwyrm/templates/discover/icons.html

diff --git a/bookwyrm/templates/about.html b/bookwyrm/templates/about.html
deleted file mode 100644
index aa7426ca..00000000
--- a/bookwyrm/templates/about.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% extends 'layout.html' %}
-{% block content %}
-
-<div class="columns">
-    <div class="column block">
-        {% include 'snippets/about.html' %}
-    </div>
-
-    <div class="column block">
-        <h2 class="title">Code of Conduct</h2>
-        <div class="content">
-            {{ site.code_of_conduct | safe }}
-        </div>
-    </div>
-</div>
-{% endblock %}
diff --git a/bookwyrm/templates/discover/about.html b/bookwyrm/templates/discover/about.html
new file mode 100644
index 00000000..09115807
--- /dev/null
+++ b/bookwyrm/templates/discover/about.html
@@ -0,0 +1,22 @@
+{% extends 'layout.html' %}
+{% block content %}
+
+<header class="block has-text-centered">
+    <h1 class="title">{{ site.name }}</h1>
+    <h2 class="subtitle">{{ site.instance_tagline }}</h2>
+</header>
+
+{% include 'discover/icons.html' %}
+
+<section class="block">
+    {% include 'snippets/about.html' %}
+</section>
+
+<div class="block">
+    <h2 class="title">Code of Conduct</h2>
+    <div class="content">
+        {{ site.code_of_conduct | safe }}
+    </div>
+</div>
+
+{% endblock %}
diff --git a/bookwyrm/templates/discover/discover.html b/bookwyrm/templates/discover/discover.html
index 0b6f8a1f..5a808bf7 100644
--- a/bookwyrm/templates/discover/discover.html
+++ b/bookwyrm/templates/discover/discover.html
@@ -1,33 +1,14 @@
 {% extends 'layout.html' %}
 {% block content %}
 
-{% if not request.user.is_authenticated %}
 <header class="block has-text-centered">
     <h1 class="title">{{ site.name }}</h1>
     <h2 class="subtitle">{{ site.instance_tagline }}</h2>
 </header>
 
-<section class="level is-mobile">
-    <div class="level-item has-text-centered">
-        <div>
-            <p class="title has-text-weight-normal"><span class="icon icon-graphic-paperplane"></span></p>
-            <p class="heading">Decentralized</p>
-        </div>
-    </div>
-    <div class="level-item has-text-centered">
-        <div>
-            <p class="title has-text-weight-normal"><span class="icon icon-graphic-heart"></span></p>
-            <p class="heading">Friendly</p>
-        </div>
-    </div>
-    <div class="level-item has-text-centered">
-        <div>
-            <p class="title has-text-weight-normal"><span class="icon icon-graphic-banknote"></span></p>
-            <p class="heading">Anti-Corporate</p>
-        </div>
-    </div>
-</section>
+{% include 'discover/icons.html' %}
 
+{% if not request.user.is_authenticated %}
 <section class="tile is-ancestor">
     <div class="tile is-7 is-parent">
         <div class="tile is-child box">
@@ -49,10 +30,6 @@
     </div>
 </section>
 
-{% else %}
-<div class="block">
-    <h1 class="title has-text-centered">Discover</h1>
-</div>
 {% endif %}
 
 <div class="block is-hidden-tablet">
diff --git a/bookwyrm/templates/discover/icons.html b/bookwyrm/templates/discover/icons.html
new file mode 100644
index 00000000..a4086282
--- /dev/null
+++ b/bookwyrm/templates/discover/icons.html
@@ -0,0 +1,21 @@
+<section class="level is-mobile">
+    <div class="level-item has-text-centered">
+        <div>
+            <p class="title has-text-weight-normal"><span class="icon icon-graphic-paperplane"></span></p>
+            <p class="heading">Decentralized</p>
+        </div>
+    </div>
+    <div class="level-item has-text-centered">
+        <div>
+            <p class="title has-text-weight-normal"><span class="icon icon-graphic-heart"></span></p>
+            <p class="heading">Friendly</p>
+        </div>
+    </div>
+    <div class="level-item has-text-centered">
+        <div>
+            <p class="title has-text-weight-normal"><span class="icon icon-graphic-banknote"></span></p>
+            <p class="heading">Anti-Corporate</p>
+        </div>
+    </div>
+</section>
+
diff --git a/bookwyrm/views/landing.py b/bookwyrm/views/landing.py
index 854f3a9b..3be3eb31 100644
--- a/bookwyrm/views/landing.py
+++ b/bookwyrm/views/landing.py
@@ -16,7 +16,7 @@ class About(View):
         data = {
             'title': 'About',
         }
-        return TemplateResponse(request, 'about.html', data)
+        return TemplateResponse(request, 'discover/about.html', data)
 
 class Home(View):
     ''' discover page or home feed depending on auth '''

From 6426282db16f1c692425ffd9986faa180b244f1e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Feb 2021 22:07:13 -0800
Subject: [PATCH 0079/1285] fixes goal page and test for goal page

---
 bookwyrm/templates/goal.html      |  2 +-
 bookwyrm/tests/views/test_goal.py | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/goal.html b/bookwyrm/templates/goal.html
index dfdc02aa..0dc0aef8 100644
--- a/bookwyrm/templates/goal.html
+++ b/bookwyrm/templates/goal.html
@@ -50,7 +50,7 @@
         <div class="column is-narrow">
             <div class="box">
                 <a href="{{ book.book.local_path }}">
-                    {% include 'snippets/discover/small-book.html' with book=book.book rating=goal.ratings %}
+                    {% include 'discover/small-book.html' with book=book.book rating=goal.ratings %}
                 </a>
             </div>
         </div>
diff --git a/bookwyrm/tests/views/test_goal.py b/bookwyrm/tests/views/test_goal.py
index a78216f2..0d534112 100644
--- a/bookwyrm/tests/views/test_goal.py
+++ b/bookwyrm/tests/views/test_goal.py
@@ -1,5 +1,6 @@
 ''' test for app action functionality '''
 from unittest.mock import patch
+from django.utils import timezone
 
 from django.contrib.auth.models import AnonymousUser
 from django.template.response import TemplateResponse
@@ -30,6 +31,7 @@ class GoalViews(TestCase):
         )
         self.anonymous_user = AnonymousUser
         self.anonymous_user.is_authenticated = False
+        models.SiteSettings.objects.create()
 
 
     def test_goal_page_no_goal(self):
@@ -48,6 +50,7 @@ class GoalViews(TestCase):
         request.user = self.local_user
 
         result = view(request, self.local_user.localname, 2020)
+        result.render()
         self.assertIsInstance(result, TemplateResponse)
 
 
@@ -62,16 +65,23 @@ class GoalViews(TestCase):
 
     def test_goal_page_public(self):
         ''' view a user's public goal '''
+        models.ReadThrough.objects.create(
+            finish_date=timezone.now(),
+            user=self.local_user,
+            book=self.book,
+        )
+
         models.AnnualGoal.objects.create(
             user=self.local_user,
-            year=2020,
+            year=timezone.now().year,
             goal=128937123,
             privacy='public')
         view = views.Goal.as_view()
         request = self.factory.get('')
         request.user = self.rat
 
-        result = view(request, self.local_user.localname, 2020)
+        result = view(request, self.local_user.localname, timezone.now().year)
+        result.render()
         self.assertIsInstance(result, TemplateResponse)
 
     def test_goal_page_private(self):

From 9465455af288b215d29d8766d4ca37e6055150a3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 24 Feb 2021 08:27:16 -0800
Subject: [PATCH 0080/1285] Catch ssl errors in broadcast

---
 bookwyrm/models/activitypub_mixin.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index d934681e..2c2e5a72 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -6,6 +6,7 @@ import operator
 import logging
 from uuid import uuid4
 import requests
+from requests.exceptions import HTTPError, SSLError
 
 from Crypto.PublicKey import RSA
 from Crypto.Signature import pkcs1_15
@@ -440,7 +441,7 @@ def broadcast_task(sender_id, activity, recipients):
     for recipient in recipients:
         try:
             sign_and_send(sender, activity, recipient)
-        except requests.exceptions.HTTPError as e:
+        except (HTTPError, SSLError) as e:
             logger.exception(e)
 
 

From 94e95dc39dd5af993d14f02b59383a5b500f1493 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 24 Feb 2021 10:07:03 -0800
Subject: [PATCH 0081/1285] Adds test for delete activity

---
 bookwyrm/tests/views/test_status.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py
index d490f484..4594a203 100644
--- a/bookwyrm/tests/views/test_status.py
+++ b/bookwyrm/tests/views/test_status.py
@@ -1,4 +1,5 @@
 ''' test for app action functionality '''
+import json
 from unittest.mock import patch
 from django.test import TestCase
 from django.test.client import RequestFactory
@@ -236,7 +237,11 @@ class StatusViews(TestCase):
         self.assertFalse(status.deleted)
         request = self.factory.post('')
         request.user = self.local_user
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay') \
+                as mock:
             view(request, status.id)
+            activity = json.loads(mock.call_args_list[0][0][1])
+            self.assertEqual(activity['type'], 'Delete')
+            self.assertEqual(activity['object']['type'], 'Tombstone')
         status.refresh_from_db()
         self.assertTrue(status.deleted)

From b85fed359574039cfba25bd5ea969885109234eb Mon Sep 17 00:00:00 2001
From: Henri Bourcereau <hbourcereau@atixnet.fr>
Date: Sat, 20 Feb 2021 17:02:36 +0100
Subject: [PATCH 0082/1285] librarything import

---
 bookwyrm/goodreads_import.py               | 126 +----------
 bookwyrm/importer.py                       | 135 ++++++++++++
 bookwyrm/librarything_import.py            |  39 ++++
 bookwyrm/models/import_job.py              |  28 ++-
 bookwyrm/templates/import.html             |  17 +-
 bookwyrm/tests/data/librarything.tsv       |   4 +
 bookwyrm/tests/test_goodreads_import.py    |  54 +++--
 bookwyrm/tests/test_librarything_import.py | 240 +++++++++++++++++++++
 bookwyrm/views/import_data.py              |  19 +-
 9 files changed, 510 insertions(+), 152 deletions(-)
 create mode 100644 bookwyrm/importer.py
 create mode 100644 bookwyrm/librarything_import.py
 create mode 100644 bookwyrm/tests/data/librarything.tsv
 create mode 100644 bookwyrm/tests/test_librarything_import.py

diff --git a/bookwyrm/goodreads_import.py b/bookwyrm/goodreads_import.py
index 1b2b971c..f5b84e17 100644
--- a/bookwyrm/goodreads_import.py
+++ b/bookwyrm/goodreads_import.py
@@ -1,121 +1,13 @@
 ''' handle reading a csv from goodreads '''
-import csv
-import logging
+from bookwyrm.importer import Importer
 
-from bookwyrm import models
-from bookwyrm.models import ImportJob, ImportItem
-from bookwyrm.tasks import app
+# GoodReads is the default importer, thus Importer follows its structure. For a more complete example of overriding see librarything_import.py  
 
-logger = logging.getLogger(__name__)
+class GoodreadsImporter(Importer):
+    service = 'GoodReads'
 
-
-def create_job(user, csv_file, include_reviews, privacy):
-    ''' check over a csv and creates a database entry for the job'''
-    job = ImportJob.objects.create(
-        user=user,
-        include_reviews=include_reviews,
-        privacy=privacy
-    )
-    for index, entry in enumerate(list(csv.DictReader(csv_file))):
-        if not all(x in entry for x in ('ISBN13', 'Title', 'Author')):
-            raise ValueError('Author, title, and isbn must be in data.')
-        ImportItem(job=job, index=index, data=entry).save()
-    return job
-
-
-def create_retry_job(user, original_job, items):
-    ''' retry items that didn't import '''
-    job = ImportJob.objects.create(
-        user=user,
-        include_reviews=original_job.include_reviews,
-        privacy=original_job.privacy,
-        retry=True
-    )
-    for item in items:
-        ImportItem(job=job, index=item.index, data=item.data).save()
-    return job
-
-
-def start_import(job):
-    ''' initalizes a csv import job '''
-    result = import_data.delay(job.id)
-    job.task_id = result.id
-    job.save()
-
-
-@app.task
-def import_data(job_id):
-    ''' does the actual lookup work in a celery task '''
-    job = ImportJob.objects.get(id=job_id)
-    try:
-        for item in job.items.all():
-            try:
-                item.resolve()
-            except Exception as e:# pylint: disable=broad-except
-                logger.exception(e)
-                item.fail_reason = 'Error loading book'
-                item.save()
-                continue
-
-            if item.book:
-                item.save()
-
-                # shelves book and handles reviews
-                handle_imported_book(
-                    job.user, item, job.include_reviews, job.privacy)
-            else:
-                item.fail_reason = 'Could not find a match for book'
-                item.save()
-    finally:
-        job.complete = True
-        job.save()
-
-
-def handle_imported_book(user, item, include_reviews, privacy):
-    ''' process a goodreads csv and then post about it '''
-    if isinstance(item.book, models.Work):
-        item.book = item.book.default_edition
-    if not item.book:
-        return
-
-    existing_shelf = models.ShelfBook.objects.filter(
-        book=item.book, user=user).exists()
-
-    # shelve the book if it hasn't been shelved already
-    if item.shelf and not existing_shelf:
-        desired_shelf = models.Shelf.objects.get(
-            identifier=item.shelf,
-            user=user
-        )
-        models.ShelfBook.objects.create(
-            book=item.book, shelf=desired_shelf, user=user)
-
-    for read in item.reads:
-        # check for an existing readthrough with the same dates
-        if models.ReadThrough.objects.filter(
-                user=user, book=item.book,
-                start_date=read.start_date,
-                finish_date=read.finish_date
-            ).exists():
-            continue
-        read.book = item.book
-        read.user = user
-        read.save()
-
-    if include_reviews and (item.rating or item.review):
-        review_title = 'Review of {!r} on Goodreads'.format(
-            item.book.title,
-        ) if item.review else ''
-
-        # we don't know the publication date of the review,
-        # but "now" is a bad guess
-        published_date_guess = item.date_read or item.date_added
-        models.Review.objects.create(
-            user=user,
-            book=item.book,
-            name=review_title,
-            content=item.review,
-            rating=item.rating,
-            published_date=published_date_guess,
-            privacy=privacy,
-        )
+    def parse_fields(self, data):
+        data.update({'import_source': self.service }) 
+        # add missing 'Date Started' field
+        data.update({'Date Started': None }) 
+        return data
diff --git a/bookwyrm/importer.py b/bookwyrm/importer.py
new file mode 100644
index 00000000..b6e959cb
--- /dev/null
+++ b/bookwyrm/importer.py
@@ -0,0 +1,135 @@
+''' handle reading a csv from an external service, defaults are from GoodReads '''
+import csv
+import logging
+
+from bookwyrm import models
+from bookwyrm.models import ImportJob, ImportItem
+from bookwyrm.tasks import app
+
+logger = logging.getLogger(__name__)
+
+class Importer:
+    service = 'Unknown'
+    delimiter = ','
+    encoding = 'UTF-8'
+    mandatory_fields = ['ISBN13', 'Title', 'Author']
+
+    def create_job(self, user, csv_file, include_reviews, privacy):
+        ''' check over a csv and creates a database entry for the job'''
+        job = ImportJob.objects.create(
+            user=user,
+            include_reviews=include_reviews,
+            privacy=privacy
+        )
+        for index, entry in enumerate(list(csv.DictReader(csv_file, delimiter=self.delimiter ))):
+            if not all(x in entry for x in self.mandatory_fields):
+                raise ValueError('Author, title, and isbn must be in data.')
+            entry = self.parse_fields(entry)
+            self.save_item(job, index, entry)
+        return job
+
+
+    def save_item(self, job, index, data):
+        ImportItem(job=job, index=index, data=data).save()
+
+    def parse_fields(self, entry):
+        entry.update({'import_source': self.service }) 
+        return entry 
+
+    def create_retry_job(self, user, original_job, items):
+        ''' retry items that didn't import '''
+        job = ImportJob.objects.create(
+            user=user,
+            include_reviews=original_job.include_reviews,
+            privacy=original_job.privacy,
+            retry=True
+        )
+        for item in items:
+            self.save_item(job, item.index, item.data)
+        return job
+
+
+    def start_import(self, job):
+        ''' initalizes a csv import job '''
+        result = import_data.delay(self.service, job.id)
+        job.task_id = result.id
+        job.save()
+
+
+@app.task
+def import_data(source, job_id):
+    ''' does the actual lookup work in a celery task '''
+    job = ImportJob.objects.get(id=job_id)
+    try:
+        for item in job.items.all():
+            try:
+                item.resolve()
+            except Exception as e:# pylint: disable=broad-except
+                logger.exception(e)
+                item.fail_reason = 'Error loading book'
+                item.save()
+                continue
+
+            if item.book:
+                item.save()
+
+                # shelves book and handles reviews
+                handle_imported_book(source,
+                    job.user, item, job.include_reviews, job.privacy)
+            else:
+                item.fail_reason = 'Could not find a match for book'
+                item.save()
+    finally:
+        job.complete = True
+        job.save()
+
+
+def handle_imported_book(source, user, item, include_reviews, privacy):
+    ''' process a csv and then post about it '''
+    if isinstance(item.book, models.Work):
+        item.book = item.book.default_edition
+    if not item.book:
+        return
+
+    existing_shelf = models.ShelfBook.objects.filter(
+        book=item.book, user=user).exists()
+
+    # shelve the book if it hasn't been shelved already
+    if item.shelf and not existing_shelf:
+        desired_shelf = models.Shelf.objects.get(
+            identifier=item.shelf,
+            user=user
+        )
+        models.ShelfBook.objects.create(
+            book=item.book, shelf=desired_shelf, user=user)
+
+    for read in item.reads:
+        # check for an existing readthrough with the same dates
+        if models.ReadThrough.objects.filter(
+                user=user, book=item.book,
+                start_date=read.start_date,
+                finish_date=read.finish_date
+            ).exists():
+            continue
+        read.book = item.book
+        read.user = user
+        read.save()
+
+    if include_reviews and (item.rating or item.review):
+        review_title = 'Review of {!r} on {!r}'.format(
+            item.book.title,
+            source,
+        ) if item.review else ''
+
+        # we don't know the publication date of the review,
+        # but "now" is a bad guess
+        published_date_guess = item.date_read or item.date_added
+        models.Review.objects.create(
+            user=user,
+            book=item.book,
+            name=review_title,
+            content=item.review,
+            rating=item.rating,
+            published_date=published_date_guess,
+            privacy=privacy,
+        )
diff --git a/bookwyrm/librarything_import.py b/bookwyrm/librarything_import.py
new file mode 100644
index 00000000..019573ac
--- /dev/null
+++ b/bookwyrm/librarything_import.py
@@ -0,0 +1,39 @@
+''' handle reading a csv from librarything '''
+import csv
+import re
+import math
+
+from bookwyrm import models
+from bookwyrm.models import ImportItem
+from bookwyrm.importer import Importer
+
+
+class LibrarythingImporter(Importer):
+    service = 'LibraryThing'
+    delimiter = '\t'
+    encoding = 'ISO-8859-1'
+    # mandatory_fields : fields matching the book ISBN13, title and author
+    mandatory_fields = ['ISBN', 'Title', 'Primary Author']
+
+    def parse_fields(self, initial):
+        data = {}
+        data['import_source']   = self.service
+        data['Book Id'] = initial['Book Id']
+        data['Title'] = initial['Title']
+        data['Author'] = initial['Primary Author']
+        data['ISBN13'] = initial['ISBN']
+        data['My Review'] = initial['Review']
+        data['My Rating'] = math.ceil(float(initial['Rating']))
+        data['Date Added'] = re.sub('\[|\]', '', initial['Entry Date'])
+        data['Date Started'] = re.sub('\[|\]', '', initial['Date Started'])
+        data['Date Read'] = re.sub('\[|\]', '', initial['Date Read'])
+
+        data['Exclusive Shelf'] = None
+        if data['Date Read']:
+            data['Exclusive Shelf'] = "read"
+        elif data['Date Started']:
+            data['Exclusive Shelf'] = "reading"
+        else:
+            data['Exclusive Shelf'] = "to-read"
+
+        return data
diff --git a/bookwyrm/models/import_job.py b/bookwyrm/models/import_job.py
index 407d820b..ca05ddb0 100644
--- a/bookwyrm/models/import_job.py
+++ b/bookwyrm/models/import_job.py
@@ -97,8 +97,8 @@ class ImportItem(models.Model):
     def get_book_from_title_author(self):
         ''' search by title and author '''
         search_term = construct_search_term(
-            self.data['Title'],
-            self.data['Author']
+            self.title,
+            self.author
         )
         search_result = connector_manager.first_search_result(
             search_term, min_confidence=0.999
@@ -149,6 +149,14 @@ class ImportItem(models.Model):
                 dateutil.parser.parse(self.data['Date Added']))
         return None
 
+    @property
+    def date_started(self):
+        ''' when the book was started '''
+        if "Date Started" in self.data and self.data['Date Started']:
+            return timezone.make_aware(
+                dateutil.parser.parse(self.data['Date Started']))
+        return None
+
     @property
     def date_read(self):
         ''' the date a book was completed '''
@@ -160,18 +168,24 @@ class ImportItem(models.Model):
     @property
     def reads(self):
         ''' formats a read through dataset for the book in this line '''
-        if (self.shelf == 'reading'
-                and self.date_added and not self.date_read):
-            return [ReadThrough(start_date=self.date_added)]
+        start_date = self.date_started
+
+        # Goodreads special case (no 'date started' field)
+        if ((self.shelf == 'reading' or (self.shelf == 'read' and self.date_read))
+                and self.date_added and not start_date):
+            start_date = self.date_added
+
+        if (start_date and start_date is not None and not self.date_read):
+            return [ReadThrough(start_date=start_date)]
         if self.date_read:
             return [ReadThrough(
-                start_date=self.date_added,
+                start_date=start_date,
                 finish_date=self.date_read,
             )]
         return []
 
     def __repr__(self):
-        return "<GoodreadsItem {!r}>".format(self.data['Title'])
+        return "<{!r}Item {!r}>".format(self.data['import_source'], self.data['Title'])
 
     def __str__(self):
         return "{} by {}".format(self.data['Title'], self.data['Author'])
diff --git a/bookwyrm/templates/import.html b/bookwyrm/templates/import.html
index 23cd3445..dd60ebff 100644
--- a/bookwyrm/templates/import.html
+++ b/bookwyrm/templates/import.html
@@ -2,9 +2,24 @@
 {% load humanize %}
 {% block content %}
 <div class="block">
-    <h1 class="title">Import Books from GoodReads</h1>
+    <h1 class="title">Import Books</h1>
     <form name="import" action="/import" method="post" enctype="multipart/form-data">
         {% csrf_token %}
+
+        <label class="label" for="source">
+          <p>Data source</p>
+        <div class="select {{ class }}">
+          <select name="source" id="source">
+            <option value="GoodReads" {% if current == 'LibraryThing' %}selected{% endif %}>
+            GoodReads
+            </option>
+            <option value="LibraryThing" {% if current == 'LibraryThing' %}selected{% endif %}>
+            LibraryThing
+            </option>
+          </select>
+        </div>
+        </label>
+
         <div class="field">
             {{ import_form.as_p }}
         </div>
diff --git a/bookwyrm/tests/data/librarything.tsv b/bookwyrm/tests/data/librarything.tsv
new file mode 100644
index 00000000..f0dca77f
--- /dev/null
+++ b/bookwyrm/tests/data/librarything.tsv
@@ -0,0 +1,4 @@
+Book Id	Title	Sort Character	Primary Author	Primary Author Role	Secondary Author	Secondary Author Roles	Publication	Date	Review	Rating	Comment	Private Comment	Summary	Media	Physical Description	Weight	Height	Thickness	Length	Dimensions	Page Count	LCCN	Acquired	Date Started	Date Read	Barcode	BCID	Tags	Collections	Languages	Original Languages	LC Classification	ISBN	ISBNs	Subjects	Dewey Decimal	Dewey Wording	Other Call Number	Copies	Source	Entry Date	From Where	OCLC	Work id	Lending Patron	Lending Status	Lending Start	Lending End
+5498194	Marelle	1	Cortázar, Julio				Gallimard (1979), Poche	1979	chef d'oeuvre	4.5			Marelle by Julio Cortázar (1979)	Broché	590 p.; 7.24 inches	1.28 pounds	7.24 inches	1.26 inches	4.96 inches	7.24 x 4.96 x 1.26 inches	590 			[2007-04-16]	[2007-05-08]			roman, espagnol, expérimental, bohème, philosophie	Your library	French	Spanish	PQ7797 .C7145	[2070291340]	2070291340, 9782070291342	Cortâazar, Julio. Rayuela	863	Literature > Spanish And Portuguese > Spanish fiction		1	Amazon.fr	[2006-08-09]			57814				
+5015319	Le grand incendie de Londres: Récit, avec incises et bifurcations, 1985-1987 (Fiction & Cie)	1	Roubaud, Jacques				Seuil (1989), Unknown Binding	1989		5			Le grand incendie de Londres: Récit, avec incises et bifurcations, 1985-1987 (Fiction & Cie) by Jacques Roubaud (1989)	Broché	411 p.; 7.72 inches	0.88 pounds	7.72 inches	1.02 inches	5.43 inches	7.72 x 5.43 x 1.02 inches	411 								Your library	English		PQ2678 .O77	[2020104725]	2020104725, 9782020104722	Autobiographical fiction|Roubaud, Jacques > Fiction	813	American And Canadian > Fiction > Literature		1	Amazon.com	[2006-07-25]			478910				
+5015399	Le Maître et Marguerite	1	Boulgakov, Mikhaïl				Pocket (1994), Poche	1994		5			Le Maître et Marguerite by Mikhaïl Boulgakov (1994)	Broché	579 p.; 7.09 inches	0.66 pounds	7.09 inches	1.18 inches	4.33 inches	7.09 x 4.33 x 1.18 inches	579 								Your library	French		PG3476 .B78	[2266062328]	2266062328, 9782266062329	Allegories|Bulgakov|Good and evil > Fiction|Humanities|Jerusalem > Fiction|Jesus Christ > Fiction|Literature|Mental illness > Fiction|Moscow (Russia) > Fiction|Novel|Pilate, Pontius, 1st cent. > Fiction|Political fiction|Russia > Fiction|Russian fiction|Russian publications (Form Entry)|Soviet Union > History > 1925-1953 > Fiction|literature	891.7342	1917-1945 > 1917-1991 (USSR) > Literature > Literature of other Indo-European languages > Other Languages > Russian > Russian Fiction		1	Amazon.fr	[2006-07-25]			10151				
diff --git a/bookwyrm/tests/test_goodreads_import.py b/bookwyrm/tests/test_goodreads_import.py
index 6a14368c..aee9afe4 100644
--- a/bookwyrm/tests/test_goodreads_import.py
+++ b/bookwyrm/tests/test_goodreads_import.py
@@ -7,16 +7,19 @@ from unittest.mock import patch
 from django.test import TestCase
 import responses
 
-from bookwyrm import goodreads_import, models
+from bookwyrm import models, importer
+from bookwyrm.goodreads_import import GoodreadsImporter
+from bookwyrm import importer
 from bookwyrm.settings import DOMAIN
 
 class GoodreadsImport(TestCase):
     ''' importing from goodreads csv '''
     def setUp(self):
+        self.importer = GoodreadsImporter()
         ''' use a test csv '''
         datafile = pathlib.Path(__file__).parent.joinpath(
             'data/goodreads.csv')
-        self.csv = open(datafile, 'r')
+        self.csv = open(datafile, 'r', encoding=self.importer.encoding)
         self.user = models.User.objects.create_user(
             'mouse', 'mouse@mouse.mouse', 'password', local=True)
 
@@ -41,7 +44,7 @@ class GoodreadsImport(TestCase):
 
     def test_create_job(self):
         ''' creates the import job entry and checks csv '''
-        import_job = goodreads_import.create_job(
+        import_job = self.importer.create_job(
             self.user, self.csv, False, 'public')
         self.assertEqual(import_job.user, self.user)
         self.assertEqual(import_job.include_reviews, False)
@@ -59,13 +62,13 @@ class GoodreadsImport(TestCase):
 
     def test_create_retry_job(self):
         ''' trying again with items that didn't import '''
-        import_job = goodreads_import.create_job(
+        import_job = self.importer.create_job(
             self.user, self.csv, False, 'unlisted')
         import_items = models.ImportItem.objects.filter(
             job=import_job
             ).all()[:2]
 
-        retry = goodreads_import.create_retry_job(
+        retry = self.importer.create_retry_job(
             self.user, import_job, import_items)
         self.assertNotEqual(import_job, retry)
         self.assertEqual(retry.user, self.user)
@@ -82,13 +85,13 @@ class GoodreadsImport(TestCase):
 
     def test_start_import(self):
         ''' begin loading books '''
-        import_job = goodreads_import.create_job(
+        import_job = self.importer.create_job(
             self.user, self.csv, False, 'unlisted')
         MockTask = namedtuple('Task', ('id'))
         mock_task = MockTask(7)
-        with patch('bookwyrm.goodreads_import.import_data.delay') as start:
+        with patch('bookwyrm.importer.import_data.delay') as start:
             start.return_value = mock_task
-            goodreads_import.start_import(import_job)
+            self.importer.start_import(import_job)
         import_job.refresh_from_db()
         self.assertEqual(import_job.task_id, '7')
 
@@ -96,7 +99,7 @@ class GoodreadsImport(TestCase):
     @responses.activate
     def test_import_data(self):
         ''' resolve entry '''
-        import_job = goodreads_import.create_job(
+        import_job = self.importer.create_job(
             self.user, self.csv, False, 'unlisted')
         book = models.Edition.objects.create(title='Test Book')
 
@@ -104,8 +107,8 @@ class GoodreadsImport(TestCase):
                 'bookwyrm.models.import_job.ImportItem.get_book_from_isbn'
                 ) as resolve:
             resolve.return_value = book
-            with patch('bookwyrm.goodreads_import.handle_imported_book'):
-                goodreads_import.import_data(import_job.id)
+            with patch('bookwyrm.importer.handle_imported_book'):
+                importer.import_data(self.importer.service, import_job.id)
 
         import_item = models.ImportItem.objects.get(job=import_job, index=0)
         self.assertEqual(import_item.book.id, book.id)
@@ -120,13 +123,14 @@ class GoodreadsImport(TestCase):
         datafile = pathlib.Path(__file__).parent.joinpath('data/goodreads.csv')
         csv_file = open(datafile, 'r')
         for index, entry in enumerate(list(csv.DictReader(csv_file))):
+            entry = self.importer.parse_fields(entry)
             import_item = models.ImportItem.objects.create(
                 job_id=import_job.id, index=index, data=entry, book=self.book)
             break
 
         with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            goodreads_import.handle_imported_book(
-                self.user, import_item, False, 'public')
+            importer.handle_imported_book(
+                self.importer.service, self.user, import_item, False, 'public')
 
         shelf.refresh_from_db()
         self.assertEqual(shelf.books.first(), self.book)
@@ -153,13 +157,14 @@ class GoodreadsImport(TestCase):
         datafile = pathlib.Path(__file__).parent.joinpath('data/goodreads.csv')
         csv_file = open(datafile, 'r')
         for index, entry in enumerate(list(csv.DictReader(csv_file))):
+            entry = self.importer.parse_fields(entry)
             import_item = models.ImportItem.objects.create(
                 job_id=import_job.id, index=index, data=entry, book=self.book)
             break
 
         with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            goodreads_import.handle_imported_book(
-                self.user, import_item, False, 'public')
+            importer.handle_imported_book(
+                self.importer.service, self.user, import_item, False, 'public')
 
         shelf.refresh_from_db()
         self.assertEqual(shelf.books.first(), self.book)
@@ -182,15 +187,16 @@ class GoodreadsImport(TestCase):
         datafile = pathlib.Path(__file__).parent.joinpath('data/goodreads.csv')
         csv_file = open(datafile, 'r')
         for index, entry in enumerate(list(csv.DictReader(csv_file))):
+            entry = self.importer.parse_fields(entry)
             import_item = models.ImportItem.objects.create(
                 job_id=import_job.id, index=index, data=entry, book=self.book)
             break
 
         with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            goodreads_import.handle_imported_book(
-                self.user, import_item, False, 'public')
-            goodreads_import.handle_imported_book(
-                self.user, import_item, False, 'public')
+            importer.handle_imported_book(
+                self.importer.service, self.user, import_item, False, 'public')
+            importer.handle_imported_book(
+                self.importer.service, self.user, import_item, False, 'public')
 
         shelf.refresh_from_db()
         self.assertEqual(shelf.books.first(), self.book)
@@ -212,12 +218,13 @@ class GoodreadsImport(TestCase):
         datafile = pathlib.Path(__file__).parent.joinpath('data/goodreads.csv')
         csv_file = open(datafile, 'r')
         entry = list(csv.DictReader(csv_file))[2]
+        entry = self.importer.parse_fields(entry)
         import_item = models.ImportItem.objects.create(
             job_id=import_job.id, index=0, data=entry, book=self.book)
 
         with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            goodreads_import.handle_imported_book(
-                self.user, import_item, True, 'unlisted')
+            importer.handle_imported_book(
+                self.importer.service, self.user, import_item, True, 'unlisted')
         review = models.Review.objects.get(book=self.book, user=self.user)
         self.assertEqual(review.content, 'mixed feelings')
         self.assertEqual(review.rating, 2)
@@ -233,12 +240,13 @@ class GoodreadsImport(TestCase):
         datafile = pathlib.Path(__file__).parent.joinpath('data/goodreads.csv')
         csv_file = open(datafile, 'r')
         entry = list(csv.DictReader(csv_file))[2]
+        entry = self.importer.parse_fields(entry)
         import_item = models.ImportItem.objects.create(
             job_id=import_job.id, index=0, data=entry, book=self.book)
 
         with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            goodreads_import.handle_imported_book(
-                self.user, import_item, False, 'unlisted')
+            importer.handle_imported_book(
+                self.importer.service, self.user, import_item, False, 'unlisted')
         self.assertFalse(models.Review.objects.filter(
             book=self.book, user=self.user
         ).exists())
diff --git a/bookwyrm/tests/test_librarything_import.py b/bookwyrm/tests/test_librarything_import.py
new file mode 100644
index 00000000..2623a504
--- /dev/null
+++ b/bookwyrm/tests/test_librarything_import.py
@@ -0,0 +1,240 @@
+''' testing import '''
+from collections import namedtuple
+import csv
+import pathlib
+from unittest.mock import patch
+
+from django.test import TestCase
+import responses
+
+from bookwyrm import models, importer
+from bookwyrm.librarything_import import LibrarythingImporter
+from bookwyrm.settings import DOMAIN
+
+class LibrarythingImport(TestCase):
+    ''' importing from librarything tsv '''
+    def setUp(self):
+        self.importer = LibrarythingImporter()
+        ''' use a test tsv '''
+        datafile = pathlib.Path(__file__).parent.joinpath(
+            'data/librarything.tsv')
+
+        # Librarything generates latin encoded exports...
+        self.csv = open(datafile, 'r', encoding=self.importer.encoding)
+        self.user = models.User.objects.create_user(
+            'mmai', 'mmai@mmai.mmai', 'password', local=True)
+
+        models.Connector.objects.create(
+            identifier=DOMAIN,
+            name='Local',
+            local=True,
+            connector_file='self_connector',
+            base_url='https://%s' % DOMAIN,
+            books_url='https://%s/book' % DOMAIN,
+            covers_url='https://%s/images/covers' % DOMAIN,
+            search_url='https://%s/search?q=' % DOMAIN,
+            priority=1,
+        )
+        work = models.Work.objects.create(title='Test Work')
+        self.book = models.Edition.objects.create(
+            title='Example Edition',
+            remote_id='https://example.com/book/1',
+            parent_work=work
+        )
+
+
+    def test_create_job(self):
+        ''' creates the import job entry and checks csv '''
+        import_job = self.importer.create_job(
+            self.user, self.csv, False, 'public')
+        self.assertEqual(import_job.user, self.user)
+        self.assertEqual(import_job.include_reviews, False)
+        self.assertEqual(import_job.privacy, 'public')
+
+        import_items = models.ImportItem.objects.filter(job=import_job).all()
+        self.assertEqual(len(import_items), 3)
+        self.assertEqual(import_items[0].index, 0)
+        self.assertEqual(import_items[0].data['Book Id'], '5498194')
+        self.assertEqual(import_items[1].index, 1)
+        self.assertEqual(import_items[1].data['Book Id'], '5015319')
+        self.assertEqual(import_items[2].index, 2)
+        self.assertEqual(import_items[2].data['Book Id'], '5015399')
+
+
+    def test_create_retry_job(self):
+        ''' trying again with items that didn't import '''
+        import_job = self.importer.create_job(
+            self.user, self.csv, False, 'unlisted')
+        import_items = models.ImportItem.objects.filter(
+            job=import_job
+            ).all()[:2]
+
+        retry = self.importer.create_retry_job(
+            self.user, import_job, import_items)
+        self.assertNotEqual(import_job, retry)
+        self.assertEqual(retry.user, self.user)
+        self.assertEqual(retry.include_reviews, False)
+        self.assertEqual(retry.privacy, 'unlisted')
+
+        retry_items = models.ImportItem.objects.filter(job=retry).all()
+        self.assertEqual(len(retry_items), 2)
+        self.assertEqual(retry_items[0].index, 0)
+        self.assertEqual(import_items[0].data['Book Id'], '5498194')
+        self.assertEqual(retry_items[1].index, 1)
+        self.assertEqual(retry_items[1].data['Book Id'], '5015319')
+
+
+    @responses.activate
+    def test_import_data(self):
+        ''' resolve entry '''
+        import_job = self.importer.create_job(
+            self.user, self.csv, False, 'unlisted')
+        book = models.Edition.objects.create(title='Test Book')
+
+        with patch(
+                'bookwyrm.models.import_job.ImportItem.get_book_from_isbn'
+                ) as resolve:
+            resolve.return_value = book
+            with patch('bookwyrm.importer.handle_imported_book'):
+                importer.import_data(self.importer.service, import_job.id)
+
+        import_item = models.ImportItem.objects.get(job=import_job, index=0)
+        self.assertEqual(import_item.book.id, book.id)
+
+
+    def test_handle_imported_book(self):
+        ''' librarything import added a book, this adds related connections '''
+        shelf = self.user.shelf_set.filter(identifier='read').first()
+        self.assertIsNone(shelf.books.first())
+
+        import_job = models.ImportJob.objects.create(user=self.user)
+        datafile = pathlib.Path(__file__).parent.joinpath('data/librarything.tsv')
+        csv_file = open(datafile, 'r', encoding=self.importer.encoding)
+        for index, entry in enumerate(list(csv.DictReader(csv_file, delimiter=self.importer.delimiter))):
+            entry = self.importer.parse_fields(entry)
+            import_item = models.ImportItem.objects.create(
+                job_id=import_job.id, index=index, data=entry, book=self.book)
+            break
+
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+            importer.handle_imported_book(
+                self.importer.service, self.user, import_item, False, 'public')
+
+        shelf.refresh_from_db()
+        self.assertEqual(shelf.books.first(), self.book)
+
+        readthrough = models.ReadThrough.objects.get(user=self.user)
+        self.assertEqual(readthrough.book, self.book)
+        # I can't remember how to create dates and I don't want to look it up.
+        self.assertEqual(readthrough.start_date.year, 2007)
+        self.assertEqual(readthrough.start_date.month, 4)
+        self.assertEqual(readthrough.start_date.day, 16)
+        self.assertEqual(readthrough.finish_date.year, 2007)
+        self.assertEqual(readthrough.finish_date.month, 5)
+        self.assertEqual(readthrough.finish_date.day, 8)
+
+
+    def test_handle_imported_book_already_shelved(self):
+        ''' librarything import added a book, this adds related connections '''
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+            shelf = self.user.shelf_set.filter(identifier='to-read').first()
+            models.ShelfBook.objects.create(
+                shelf=shelf, user=self.user, book=self.book)
+
+        import_job = models.ImportJob.objects.create(user=self.user)
+        datafile = pathlib.Path(__file__).parent.joinpath('data/librarything.tsv')
+        csv_file = open(datafile, 'r', encoding=self.importer.encoding)
+        for index, entry in enumerate(list(csv.DictReader(csv_file, delimiter=self.importer.delimiter))):
+            entry = self.importer.parse_fields(entry)
+            import_item = models.ImportItem.objects.create(
+                job_id=import_job.id, index=index, data=entry, book=self.book)
+            break
+
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+            importer.handle_imported_book(
+                self.importer.service, self.user, import_item, False, 'public')
+
+        shelf.refresh_from_db()
+        self.assertEqual(shelf.books.first(), self.book)
+        self.assertIsNone(
+            self.user.shelf_set.get(identifier='read').books.first())
+        readthrough = models.ReadThrough.objects.get(user=self.user)
+        self.assertEqual(readthrough.book, self.book)
+        self.assertEqual(readthrough.start_date.year, 2007)
+        self.assertEqual(readthrough.start_date.month, 4)
+        self.assertEqual(readthrough.start_date.day, 16)
+        self.assertEqual(readthrough.finish_date.year, 2007)
+        self.assertEqual(readthrough.finish_date.month, 5)
+        self.assertEqual(readthrough.finish_date.day, 8)
+
+
+    def test_handle_import_twice(self):
+        ''' re-importing books '''
+        shelf = self.user.shelf_set.filter(identifier='read').first()
+        import_job = models.ImportJob.objects.create(user=self.user)
+        datafile = pathlib.Path(__file__).parent.joinpath('data/librarything.tsv')
+        csv_file = open(datafile, 'r', encoding=self.importer.encoding)
+        for index, entry in enumerate(list(csv.DictReader(csv_file, delimiter=self.importer.delimiter))):
+            entry = self.importer.parse_fields(entry)
+            import_item = models.ImportItem.objects.create(
+                job_id=import_job.id, index=index, data=entry, book=self.book)
+            break
+
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+            importer.handle_imported_book(
+                self.importer.service, self.user, import_item, False, 'public')
+            importer.handle_imported_book(
+                self.importer.service, self.user, import_item, False, 'public')
+
+        shelf.refresh_from_db()
+        self.assertEqual(shelf.books.first(), self.book)
+
+        readthrough = models.ReadThrough.objects.get(user=self.user)
+        self.assertEqual(readthrough.book, self.book)
+        # I can't remember how to create dates and I don't want to look it up.
+        self.assertEqual(readthrough.start_date.year, 2007)
+        self.assertEqual(readthrough.start_date.month, 4)
+        self.assertEqual(readthrough.start_date.day, 16)
+        self.assertEqual(readthrough.finish_date.year, 2007)
+        self.assertEqual(readthrough.finish_date.month, 5)
+        self.assertEqual(readthrough.finish_date.day, 8)
+
+
+    def test_handle_imported_book_review(self):
+        ''' librarything review import '''
+        import_job = models.ImportJob.objects.create(user=self.user)
+        datafile = pathlib.Path(__file__).parent.joinpath('data/librarything.tsv')
+        csv_file = open(datafile, 'r', encoding=self.importer.encoding)
+        entry = list(csv.DictReader(csv_file, delimiter=self.importer.delimiter))[0]
+        entry = self.importer.parse_fields(entry)
+        import_item = models.ImportItem.objects.create(
+            job_id=import_job.id, index=0, data=entry, book=self.book)
+
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+            importer.handle_imported_book(
+                self.importer.service, self.user, import_item, True, 'unlisted')
+        review = models.Review.objects.get(book=self.book, user=self.user)
+        self.assertEqual(review.content, 'chef d\'oeuvre')
+        self.assertEqual(review.rating, 5)
+        self.assertEqual(review.published_date.year, 2007)
+        self.assertEqual(review.published_date.month, 5)
+        self.assertEqual(review.published_date.day, 8)
+        self.assertEqual(review.privacy, 'unlisted')
+
+
+    def test_handle_imported_book_reviews_disabled(self):
+        ''' librarything review import '''
+        import_job = models.ImportJob.objects.create(user=self.user)
+        datafile = pathlib.Path(__file__).parent.joinpath('data/librarything.tsv')
+        csv_file = open(datafile, 'r', encoding=self.importer.encoding)
+        entry = list(csv.DictReader(csv_file, delimiter=self.importer.delimiter))[2]
+        entry = self.importer.parse_fields(entry)
+        import_item = models.ImportItem.objects.create(
+            job_id=import_job.id, index=0, data=entry, book=self.book)
+
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+            importer.handle_imported_book(
+                self.importer.service, self.user, import_item, False, 'unlisted')
+        self.assertFalse(models.Review.objects.filter(
+            book=self.book, user=self.user
+        ).exists())
diff --git a/bookwyrm/views/import_data.py b/bookwyrm/views/import_data.py
index 8c7cee88..675cae3d 100644
--- a/bookwyrm/views/import_data.py
+++ b/bookwyrm/views/import_data.py
@@ -9,7 +9,7 @@ from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
 
-from bookwyrm import forms, goodreads_import, models
+from bookwyrm import forms, goodreads_import, librarything_import, models
 from bookwyrm.tasks import app
 
 # pylint: disable= no-self-use
@@ -31,18 +31,29 @@ class Import(View):
         if form.is_valid():
             include_reviews = request.POST.get('include_reviews') == 'on'
             privacy = request.POST.get('privacy')
+            source = request.POST.get('source')
+
+            importer = None
+            if source == 'LibraryThing':
+                importer = librarything_import.LibrarythingImporter()
+            else:
+                # Default : GoodReads
+                importer = goodreads_import.GoodreadsImporter()
+
             try:
-                job = goodreads_import.create_job(
+                job = importer.create_job(
                     request.user,
                     TextIOWrapper(
                         request.FILES['csv_file'],
-                        encoding=request.encoding),
+                        encoding=importer.encoding),
                     include_reviews,
                     privacy,
                 )
             except (UnicodeDecodeError, ValueError):
                 return HttpResponseBadRequest('Not a valid csv file')
-            goodreads_import.start_import(job)
+
+            importer.start_import(job)
+
             return redirect('/import/%d' % job.id)
         return HttpResponseBadRequest()
 

From bcdf2ee1421bc3a31c108050d887fb65464bb62a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 24 Feb 2021 11:35:19 -0800
Subject: [PATCH 0083/1285] Improves privacy-related display

---
 bookwyrm/templatetags/bookwyrm_tags.py |  7 ++-----
 bookwyrm/views/books.py                |  5 ++---
 bookwyrm/views/feed.py                 | 18 ++++++++++++------
 bookwyrm/views/helpers.py              | 15 ++++++++-------
 bookwyrm/views/list.py                 |  6 +++---
 bookwyrm/views/search.py               |  3 ++-
 6 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index d251d8e4..67354ac6 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -22,11 +22,8 @@ def dict_key(d, k):
 @register.filter(name='rating')
 def get_rating(book, user):
     ''' get the overall rating of a book '''
-    queryset = views.helpers.get_activity_feed(
-        user,
-        ['public', 'followers', 'unlisted', 'direct'],
-        queryset=models.Review.objects.filter(book=book),
-    )
+    queryset = views.helpers.privacy_filter(
+        user, models.Review.objects.filter(book=book))
     return queryset.aggregate(Avg('rating'))['rating__avg']
 
 
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 9d196563..3d4b3faf 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -96,9 +96,8 @@ class Book(View):
             'rating': reviews.aggregate(Avg('rating'))['rating__avg'],
             'tags':  models.UserTag.objects.filter(book=book),
             'lists': privacy_filter(
-                request.user,
-                book.list_set.all(),
-                ['public', 'unlisted', 'followers']),
+                request.user, book.list_set.all()
+            ),
             'user_tags': user_tags,
             'user_shelves': user_shelves,
             'other_edition_shelves': other_edition_shelves,
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index c229b7c9..d309df94 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -28,15 +28,21 @@ class Feed(View):
             page = 1
 
         if tab == 'home':
-            activities = get_activity_feed(
-                request.user, ['public', 'unlisted', 'followers'],
-                following_only=True)
+            activities = get_activity_feed(request.user, following_only=True)
+            # we only want to show private messages if they're related to books
+            activities = activities.exclude(
+                review__isnull=True,
+                comment__isnull=True,
+                quotation__isnull=True,
+                generatednote__isnull=True,
+                privacy='direct'
+            )
         elif tab == 'local':
             activities = get_activity_feed(
-                request.user, ['public', 'followers'], local_only=True)
+                request.user, privacy=['public', 'followers'], local_only=True)
         else:
             activities = get_activity_feed(
-                request.user, ['public', 'followers'])
+                request.user, privacy=['public', 'followers'])
         paginated = Paginator(activities, PAGE_LENGTH)
 
         data = {**feed_page_data(request.user), **{
@@ -72,7 +78,7 @@ class DirectMessage(View):
             queryset = queryset.filter(Q(user=user) | Q(mention_users=user))
 
         activities = get_activity_feed(
-            request.user, 'direct', queryset=queryset)
+            request.user, privacy=['direct'], queryset=queryset)
 
         paginated = Paginator(activities, PAGE_LENGTH)
         activity_page = paginated.page(page)
diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index fac3ab0c..1e96ec1c 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -59,8 +59,11 @@ def object_visible_to_user(viewer, obj):
     return False
 
 
-def privacy_filter(viewer, queryset, privacy_levels, following_only=False):
+def privacy_filter(viewer, queryset, privacy_levels=None, following_only=False):
     ''' filter objects that have "user" and "privacy" fields '''
+    privacy_levels = privacy_levels or \
+            ['public', 'unlisted', 'followers', 'direct']
+
     # exclude blocks from both directions
     if not viewer.is_anonymous:
         blocked = models.User.objects.filter(id__in=viewer.blocks.all()).all()
@@ -104,18 +107,16 @@ def privacy_filter(viewer, queryset, privacy_levels, following_only=False):
 
 
 def get_activity_feed(
-        user, privacy, local_only=False, following_only=False,
-        queryset=models.Status.objects):
+        user, privacy=None, local_only=False, following_only=False,
+        queryset=None):
     ''' get a filtered queryset of statuses '''
-    # if we're looking at Status, we need this. We don't if it's Comment
-    if hasattr(queryset, 'select_subclasses'):
-        queryset = queryset.select_subclasses()
+    if not queryset:
+        queryset = models.Status.objects.select_subclasses()
 
     # exclude deleted
     queryset = queryset.exclude(deleted=True).order_by('-published_date')
 
     # apply privacy filters
-    privacy = privacy if isinstance(privacy, list) else [privacy]
     queryset = privacy_filter(
         user, queryset, privacy, following_only=following_only)
 
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index 7286bfb4..e7b70a28 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -35,7 +35,8 @@ class Lists(View):
         ).filter(
             item_count__gt=0
         ).distinct().all()
-        lists = privacy_filter(request.user, lists, ['public', 'followers'])
+        lists = privacy_filter(
+            request.user, lists, privacy_levels=['public', 'followers'])
 
         paginated = Paginator(lists, 12)
         data = {
@@ -67,8 +68,7 @@ class UserLists(View):
             page = 1
         user = get_user_from_username(request.user, username)
         lists = models.List.objects.filter(user=user).all()
-        lists = privacy_filter(
-            request.user, lists, ['public', 'followers', 'unlisted'])
+        lists = privacy_filter(request.user, lists)
         paginated = Paginator(lists, 12)
 
         data = {
diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py
index 98be166f..8acb2836 100644
--- a/bookwyrm/views/search.py
+++ b/bookwyrm/views/search.py
@@ -44,7 +44,8 @@ class Search(View):
 
         # any relevent lists?
         list_results = privacy_filter(
-            request.user, models.List.objects, ['public', 'followers']
+            request.user, models.List.objects,
+            privacy_levels=['public', 'followers']
         ).annotate(
             similarity=Greatest(
                 TrigramSimilarity('name', query),

From 2a5d4b83d8f020bee7cf37077fdafe57dfe9bd54 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 24 Feb 2021 11:59:21 -0800
Subject: [PATCH 0084/1285] Show dms in the right places

---
 bookwyrm/templates/discover/large-book.html |  2 +-
 bookwyrm/templates/discover/small-book.html |  4 +--
 bookwyrm/tests/views/test_helpers.py        | 16 ++++++------
 bookwyrm/views/books.py                     |  4 +--
 bookwyrm/views/feed.py                      | 14 +++-------
 bookwyrm/views/helpers.py                   | 29 ++++++++++++++++-----
 bookwyrm/views/landing.py                   | 13 ++-------
 bookwyrm/views/rss_feed.py                  |  2 +-
 bookwyrm/views/user.py                      |  4 +--
 9 files changed, 42 insertions(+), 46 deletions(-)

diff --git a/bookwyrm/templates/discover/large-book.html b/bookwyrm/templates/discover/large-book.html
index 401411a1..7881a33a 100644
--- a/bookwyrm/templates/discover/large-book.html
+++ b/bookwyrm/templates/discover/large-book.html
@@ -3,7 +3,7 @@
 <div class="columns">
     <div class="column is-narrow">
         <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book size="large" %}</a>
-        {% include 'snippets/stars.html' with rating=ratings|dict_key:book.id %}
+        {% include 'snippets/stars.html' with rating=book|rating:request.user %}
     </div>
     <div class="column">
         <h3 class="title is-5"><a href="/book/{{ book.id }}">{{ book.title }}</a></h3>
diff --git a/bookwyrm/templates/discover/small-book.html b/bookwyrm/templates/discover/small-book.html
index d1676b6b..72108c30 100644
--- a/bookwyrm/templates/discover/small-book.html
+++ b/bookwyrm/templates/discover/small-book.html
@@ -1,9 +1,7 @@
 {% load bookwyrm_tags %}
 {% if book %}
 <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book %}</a>
-{% if ratings %}
-{% include 'snippets/stars.html' with rating=ratings|dict_key:book.id %}
-{% endif %}
+{% include 'snippets/stars.html' with rating=book|rating:request.user %}
 
 <h3 class="title is-6"><a href="/book/{{ book.id }}">{{ book.title }}</a></h3>
 {% if book.authors %}
diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py
index 10221933..c61505c2 100644
--- a/bookwyrm/tests/views/test_helpers.py
+++ b/bookwyrm/tests/views/test_helpers.py
@@ -106,7 +106,7 @@ class ViewsHelpers(TestCase):
 
         statuses = views.helpers.get_activity_feed(
             self.local_user,
-            ['public', 'unlisted', 'followers'],
+            privacy=['public', 'unlisted', 'followers'],
             following_only=True,
             queryset=models.Comment.objects
         )
@@ -115,7 +115,7 @@ class ViewsHelpers(TestCase):
 
         statuses = views.helpers.get_activity_feed(
             self.local_user,
-            ['public', 'followers'],
+            privacy=['public', 'followers'],
             local_only=True
         )
         self.assertEqual(len(statuses), 2)
@@ -128,7 +128,7 @@ class ViewsHelpers(TestCase):
 
         statuses = views.helpers.get_activity_feed(
             self.local_user,
-            ['public', 'followers'],
+            privacy=['public', 'followers'],
         )
         self.assertEqual(len(statuses), 3)
         self.assertEqual(statuses[2], public_status)
@@ -137,7 +137,7 @@ class ViewsHelpers(TestCase):
 
         statuses = views.helpers.get_activity_feed(
             self.local_user,
-            ['public', 'unlisted', 'followers'],
+            privacy=['public', 'unlisted', 'followers'],
             following_only=True
         )
         self.assertEqual(len(statuses), 2)
@@ -147,7 +147,7 @@ class ViewsHelpers(TestCase):
         rat.followers.add(self.local_user)
         statuses = views.helpers.get_activity_feed(
             self.local_user,
-            ['public', 'unlisted', 'followers'],
+            privacy=['public', 'unlisted', 'followers'],
             following_only=True
         )
         self.assertEqual(len(statuses), 5)
@@ -170,18 +170,18 @@ class ViewsHelpers(TestCase):
                 content='blah blah', user=rat)
 
             statuses = views.helpers.get_activity_feed(
-                self.local_user, ['public'])
+                self.local_user, privacy=['public'])
             self.assertEqual(len(statuses), 2)
 
         # block relationship
         rat.blocks.add(self.local_user)
         statuses = views.helpers.get_activity_feed(
-            self.local_user, ['public'])
+            self.local_user, privacy=['public'])
         self.assertEqual(len(statuses), 1)
         self.assertEqual(statuses[0], public_status)
 
         statuses = views.helpers.get_activity_feed(
-            rat, ['public'])
+            rat, privacy=['public'])
         self.assertEqual(len(statuses), 1)
         self.assertEqual(statuses[0], rat_public)
 
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 3d4b3faf..d59eb4aa 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -50,9 +50,7 @@ class Book(View):
         )
         # all reviews for the book
         reviews = get_activity_feed(
-            request.user,
-            ['public', 'unlisted', 'followers', 'direct'],
-            queryset=reviews
+            request.user, queryset=reviews
         )
 
         # the reviews to show
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index d309df94..a320162d 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -11,8 +11,7 @@ from django.views import View
 from bookwyrm import forms, models
 from bookwyrm.activitypub import ActivitypubResponse
 from bookwyrm.settings import PAGE_LENGTH
-from .helpers import get_activity_feed
-from .helpers import get_user_from_username
+from .helpers import get_activity_feed, get_user_from_username
 from .helpers import is_api_request, is_bookwyrm_request, object_visible_to_user
 
 
@@ -28,15 +27,8 @@ class Feed(View):
             page = 1
 
         if tab == 'home':
-            activities = get_activity_feed(request.user, following_only=True)
-            # we only want to show private messages if they're related to books
-            activities = activities.exclude(
-                review__isnull=True,
-                comment__isnull=True,
-                quotation__isnull=True,
-                generatednote__isnull=True,
-                privacy='direct'
-            )
+            activities = get_activity_feed(
+                request.user, following_only=True, hide_dms=True)
         elif tab == 'local':
             activities = get_activity_feed(
                 request.user, privacy=['public', 'followers'], local_only=True)
diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index 1e96ec1c..78f210bf 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -1,6 +1,7 @@
 ''' helper functions used in various views '''
 import re
 from requests import HTTPError
+from django.core.exceptions import FieldError
 from django.db.models import Q
 
 from bookwyrm import activitypub, models
@@ -98,17 +99,23 @@ def privacy_filter(viewer, queryset, privacy_levels=None, following_only=False):
 
     # exclude direct messages not intended for the user
     if 'direct' in privacy_levels:
-        queryset = queryset.exclude(
-            ~Q(
-                Q(user=viewer) | Q(mention_users=viewer)
-            ), privacy='direct'
-        )
+        try:
+            queryset = queryset.exclude(
+                ~Q(
+                    Q(user=viewer) | Q(mention_users=viewer)
+                ), privacy='direct'
+            )
+        except FieldError:
+            queryset = queryset.exclude(
+                ~Q(user=viewer), privacy='direct'
+            )
+
     return queryset
 
 
 def get_activity_feed(
         user, privacy=None, local_only=False, following_only=False,
-        queryset=None):
+        queryset=None, hide_dms=False):
     ''' get a filtered queryset of statuses '''
     if not queryset:
         queryset = models.Status.objects.select_subclasses()
@@ -120,6 +127,16 @@ def get_activity_feed(
     queryset = privacy_filter(
         user, queryset, privacy, following_only=following_only)
 
+    if hide_dms:
+        # dms are direct statuses not related to books
+        queryset = queryset.exclude(
+            review__isnull=True,
+            comment__isnull=True,
+            quotation__isnull=True,
+            generatednote__isnull=True,
+            privacy='direct'
+        )
+
     # filter for only local status
     if local_only:
         queryset = queryset.filter(user__local=True)
diff --git a/bookwyrm/views/landing.py b/bookwyrm/views/landing.py
index 3be3eb31..2774e742 100644
--- a/bookwyrm/views/landing.py
+++ b/bookwyrm/views/landing.py
@@ -1,11 +1,10 @@
 ''' non-interactive pages '''
-from django.db.models import Avg, Max
+from django.db.models import Max
 from django.template.response import TemplateResponse
 from django.views import View
 
 from bookwyrm import forms, models
 from .feed import Feed
-from .helpers import get_activity_feed
 
 
 # pylint: disable= no-self-use
@@ -34,6 +33,7 @@ class Discover(View):
         ''' tiled book activity page '''
         books = models.Edition.objects.filter(
             review__published_date__isnull=False,
+            review__deleted=False,
             review__user__local=True,
             review__privacy__in=['public', 'unlisted'],
         ).exclude(
@@ -42,18 +42,9 @@ class Discover(View):
             Max('review__published_date')
         ).order_by('-review__published_date__max')[:6]
 
-        ratings = {}
-        for book in books:
-            reviews = models.Review.objects.filter(
-                book__in=book.parent_work.editions.all()
-            )
-            reviews = get_activity_feed(
-                request.user, ['public', 'unlisted'], queryset=reviews)
-            ratings[book.id] = reviews.aggregate(Avg('rating'))['rating__avg']
         data = {
             'title': 'Discover',
             'register_form': forms.RegisterForm(),
             'books': list(set(books)),
-            'ratings': ratings
         }
         return TemplateResponse(request, 'discover/discover.html', data)
diff --git a/bookwyrm/views/rss_feed.py b/bookwyrm/views/rss_feed.py
index aad227bf..c211f991 100644
--- a/bookwyrm/views/rss_feed.py
+++ b/bookwyrm/views/rss_feed.py
@@ -27,7 +27,7 @@ class RssFeed(Feed):
     def items(self, obj):
         ''' the user's activity feed '''
         return get_activity_feed(
-            obj, ['public', 'unlisted'], queryset=obj.status_set)
+            obj, privacy=['public', 'unlisted'], queryset=obj.status_set)
 
 
     def item_link(self, item):
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index 7a238ce7..01002ce5 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -71,8 +71,8 @@ class User(View):
         # user's posts
         activities = get_activity_feed(
             request.user,
-            ['public', 'unlisted', 'followers'],
-            queryset=user.status_set
+            queryset=user.status_set.select_subclasses(),
+            hide_dms=True
         )
         paginated = Paginator(activities, PAGE_LENGTH)
         goal = models.AnnualGoal.objects.filter(

From 779581c6f480d13612fe998fbeeb9536a6235abd Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 24 Feb 2021 12:06:00 -0800
Subject: [PATCH 0085/1285] Only show dms in dm page

---
 bookwyrm/views/feed.py    |  2 +-
 bookwyrm/views/helpers.py | 12 ++++++++++--
 bookwyrm/views/user.py    |  1 -
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index a320162d..3a2805b4 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -28,7 +28,7 @@ class Feed(View):
 
         if tab == 'home':
             activities = get_activity_feed(
-                request.user, following_only=True, hide_dms=True)
+                request.user, following_only=True)
         elif tab == 'local':
             activities = get_activity_feed(
                 request.user, privacy=['public', 'followers'], local_only=True)
diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index 78f210bf..10b6ed92 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -115,7 +115,7 @@ def privacy_filter(viewer, queryset, privacy_levels=None, following_only=False):
 
 def get_activity_feed(
         user, privacy=None, local_only=False, following_only=False,
-        queryset=None, hide_dms=False):
+        queryset=None):
     ''' get a filtered queryset of statuses '''
     if not queryset:
         queryset = models.Status.objects.select_subclasses()
@@ -127,8 +127,16 @@ def get_activity_feed(
     queryset = privacy_filter(
         user, queryset, privacy, following_only=following_only)
 
-    if hide_dms:
+    # only show dms if we only want dms
+    if privacy == ['direct']:
         # dms are direct statuses not related to books
+        queryset = queryset.filter(
+            review__isnull=True,
+            comment__isnull=True,
+            quotation__isnull=True,
+            generatednote__isnull=True,
+        )
+    else:
         queryset = queryset.exclude(
             review__isnull=True,
             comment__isnull=True,
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index 01002ce5..a218375f 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -72,7 +72,6 @@ class User(View):
         activities = get_activity_feed(
             request.user,
             queryset=user.status_set.select_subclasses(),
-            hide_dms=True
         )
         paginated = Paginator(activities, PAGE_LENGTH)
         goal = models.AnnualGoal.objects.filter(

From a5ee535ab64305cf73529d892a513ccff6c70f04 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 24 Feb 2021 12:24:19 -0800
Subject: [PATCH 0086/1285] fixes book reviews queryset aggregators

---
 bookwyrm/tests/views/test_helpers.py |  3 ++-
 bookwyrm/views/books.py              |  8 ++------
 bookwyrm/views/helpers.py            | 20 ++++++++++++--------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py
index c61505c2..eff08307 100644
--- a/bookwyrm/tests/views/test_helpers.py
+++ b/bookwyrm/tests/views/test_helpers.py
@@ -122,7 +122,8 @@ class ViewsHelpers(TestCase):
         self.assertEqual(statuses[1], public_status)
         self.assertEqual(statuses[0], rat_public)
 
-        statuses = views.helpers.get_activity_feed(self.local_user, 'direct')
+        statuses = views.helpers.get_activity_feed(
+            self.local_user, privacy=['direct'])
         self.assertEqual(len(statuses), 1)
         self.assertEqual(statuses[0], direct_status)
 
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index d59eb4aa..e05c4726 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -45,13 +45,9 @@ class Book(View):
         if not work:
             return HttpResponseNotFound()
 
-        reviews = models.Review.objects.filter(
-            book__in=work.editions.all(),
-        )
         # all reviews for the book
-        reviews = get_activity_feed(
-            request.user, queryset=reviews
-        )
+        reviews = models.Review.objects.filter(book__in=work.editions.all())
+        reviews = get_activity_feed(request.user, queryset=reviews)
 
         # the reviews to show
         paginated = Paginator(reviews.exclude(
diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index 10b6ed92..cecb65e3 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -117,7 +117,7 @@ def get_activity_feed(
         user, privacy=None, local_only=False, following_only=False,
         queryset=None):
     ''' get a filtered queryset of statuses '''
-    if not queryset:
+    if queryset is None:
         queryset = models.Status.objects.select_subclasses()
 
     # exclude deleted
@@ -137,13 +137,17 @@ def get_activity_feed(
             generatednote__isnull=True,
         )
     else:
-        queryset = queryset.exclude(
-            review__isnull=True,
-            comment__isnull=True,
-            quotation__isnull=True,
-            generatednote__isnull=True,
-            privacy='direct'
-        )
+        try:
+            queryset = queryset.exclude(
+                review__isnull=True,
+                comment__isnull=True,
+                quotation__isnull=True,
+                generatednote__isnull=True,
+                privacy='direct'
+            )
+        except FieldError:
+            # if we're looking at a subtype of Status (like Review)
+            pass
 
     # filter for only local status
     if local_only:

From c7d85486142ff9e89551e8fe0895cc30669fb111 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 24 Feb 2021 12:35:43 -0800
Subject: [PATCH 0087/1285] Select subclasses in rss feed

---
 bookwyrm/views/rss_feed.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/views/rss_feed.py b/bookwyrm/views/rss_feed.py
index c211f991..d24b636e 100644
--- a/bookwyrm/views/rss_feed.py
+++ b/bookwyrm/views/rss_feed.py
@@ -27,7 +27,10 @@ class RssFeed(Feed):
     def items(self, obj):
         ''' the user's activity feed '''
         return get_activity_feed(
-            obj, privacy=['public', 'unlisted'], queryset=obj.status_set)
+            obj,
+            privacy=['public', 'unlisted'],
+            queryset=obj.status_set.select_subclasses()
+        )
 
 
     def item_link(self, item):

From bb7c41ee5fb4e51aa230778426ac8306ce807354 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 24 Feb 2021 13:13:29 -0800
Subject: [PATCH 0088/1285] Tweaks where serialize is called

---
 bookwyrm/models/activitypub_mixin.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index 23752e02..f8b50afa 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -161,7 +161,7 @@ class ActivitypubMixin:
         activity = generate_activity(self)
         return self.activity_serializer(**activity)
 
-    def to_activity(self):
+    def to_activity(self, **kwargs): # pylint: disable=unused-argument
         ''' convert from a model to a json activity '''
         return self.to_activity_dataclass().serialize()
 
@@ -286,7 +286,7 @@ class OrderedCollectionPageMixin(ObjectMixin):
 
     def to_ordered_collection(self, queryset, \
             remote_id=None, page=False, collection_only=False, **kwargs):
-        'pure=pure, '' an ordered collection of whatevers '''
+        ''' an ordered collection of whatevers '''
         if not queryset.ordered:
             raise RuntimeError('queryset must be ordered')
 
@@ -330,7 +330,7 @@ class OrderedCollectionMixin(OrderedCollectionPageMixin):
     def to_activity(self, **kwargs):
         ''' an ordered collection of the specified model queryset  '''
         return self.to_ordered_collection(
-            self.collection_queryset, **kwargs)
+            self.collection_queryset, **kwargs).serialize()
 
 
 class CollectionItemMixin(ActivitypubMixin):
@@ -502,4 +502,4 @@ def to_ordered_collection_page(
         orderedItems=items,
         next=next_page,
         prev=prev_page
-    ).serialize()
+    )

From 6d7e063b81874c9a797afb5571c3224d4a79ad17 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 25 Feb 2021 10:17:24 -0800
Subject: [PATCH 0089/1285] Makes rating field mandatory on ratings

---
 bookwyrm/activitypub/note.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/activitypub/note.py b/bookwyrm/activitypub/note.py
index ddb3f7ab..ad08e324 100644
--- a/bookwyrm/activitypub/note.py
+++ b/bookwyrm/activitypub/note.py
@@ -67,7 +67,7 @@ class Review(Comment):
 
 @dataclass(init=False)
 class Rating(Comment):
-    ''' a full book review '''
-    rating: int = None
+    ''' just a star rating '''
+    rating: int
     content: str = None
     type: str = 'Rating'

From ffd57dfef48e6dd92ab3c43abd5bac51ce8dc2d7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 25 Feb 2021 10:26:24 -0800
Subject: [PATCH 0090/1285] Use modern string formatting syntax in status model

---
 bookwyrm/models/status.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index 16b32891..62ce5f1c 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -258,13 +258,12 @@ class Review(Status):
     def pure_name(self):
         ''' clarify review names for mastodon serialization '''
         if self.rating:
-            #pylint: disable=bad-string-format-type
-            return 'Review of "%s" (%d stars): %s' % (
+            return 'Review of "{}" ({:d} stars): {}'.format(
                 self.book.title,
                 self.rating,
                 self.name
             )
-        return 'Review of "%s": %s' % (
+        return 'Review of "{}": {}'.format(
             self.book.title,
             self.name
         )
@@ -282,13 +281,13 @@ class ReviewRating(Review):
     ''' a subtype of review that only contains a rating '''
     def save(self, *args, **kwargs):
         if not self.rating:
-            raise ValueError('Rating object must include a numerical rating')
+            raise ValueError(
+                'ReviewRating object must include a numerical rating')
         return super().save(*args, **kwargs)
 
     @property
     def pure_content(self):
-        #pylint: disable=bad-string-format-type
-        return 'Rated "%s": %d stars' % (self.book.title, self.rating)
+        return 'Rated "{}": {:d} stars'.format(self.book.title, self.rating)
 
     activity_serializer = activitypub.Rating
     pure_type = 'Note'

From 2e36cfbcf64ec62d5ee10253fb8530df63f598f0 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 25 Feb 2021 14:58:09 -0800
Subject: [PATCH 0091/1285] Creates new semi-functional migration

---
 bookwyrm/migrations/0033_reviewrate.py   | 72 ------------------------
 bookwyrm/migrations/0046_reviewrating.py | 59 +++++++++++++++++++
 2 files changed, 59 insertions(+), 72 deletions(-)
 delete mode 100644 bookwyrm/migrations/0033_reviewrate.py
 create mode 100644 bookwyrm/migrations/0046_reviewrating.py

diff --git a/bookwyrm/migrations/0033_reviewrate.py b/bookwyrm/migrations/0033_reviewrate.py
deleted file mode 100644
index 69c0ec57..00000000
--- a/bookwyrm/migrations/0033_reviewrate.py
+++ /dev/null
@@ -1,72 +0,0 @@
-# Generated by Django 3.0.7 on 2021-01-05 05:32
-
-from django.db.models.fields.reverse_related import ManyToOneRel
-from django.db.models import Q
-from django.db import migrations, models
-import django.db.models.deletion
-
-def convert_review_rating(app_registry, schema_editor):
-    ''' take reviews with no content and turn them into ratings '''
-    db_alias = schema_editor.connection.alias
-    reviews = app_registry.get_model('bookwyrm', 'Review')
-    review_ratings = app_registry.get_model('bookwyrm', 'ReviewRating')
-    ratings = reviews.objects.using(db_alias).filter(
-        Q(content__isnull=True) | Q(content=''))
-    # replace the old review with the rating
-    for review in ratings:
-        rating = review_ratings.objects.create(
-            user=review.user, rating=review.rating, book=review.book)
-        print('-----')
-        print(rating, review)
-        for field in review._meta.get_fields():
-            if isinstance(field, ManyToOneRel) or field.name in ['status_ptr', 'id', 'remote_id']:
-                continue
-            value = getattr(review, field.name)
-            try:
-                setattr(rating, field.name, value)
-            except TypeError:
-                getattr(rating, field.name).set(value.all())
-        rating.save()
-
-        # move related models away from old review
-        related_models = [
-            (r.remote_field.name, r.related_model.__name__) for r in \
-                review._meta.related_objects]
-        for (related_field, related_model_name) in related_models:
-            related_model = app_registry.get_model('bookwyrm', related_model_name)
-            related_objs = related_model.objects.using(db_alias).filter(
-                **{related_field: review})
-            for related_obj in related_objs:
-                print('related_obj', related_obj)
-                print('field', related_field)
-                try:
-                    print(rating)
-                    print('before', getattr(related_obj, related_field))
-                    setattr(related_obj, related_field, rating)
-                    related_obj.save()
-                    print('after', getattr(related_obj, related_field))
-                except TypeError:
-                    getattr(related_obj, related_field).add(rating)
-                    getattr(related_obj, related_field).remove(review)
-        review.delete()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('bookwyrm', '0032_auto_20210104_2055'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='ReviewRating',
-            fields=[
-                ('review_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.Review')),
-            ],
-            options={
-                'abstract': False,
-            },
-            bases=('bookwyrm.review',),
-        ),
-        migrations.RunPython(convert_review_rating),
-    ]
diff --git a/bookwyrm/migrations/0046_reviewrating.py b/bookwyrm/migrations/0046_reviewrating.py
new file mode 100644
index 00000000..b29cdbd2
--- /dev/null
+++ b/bookwyrm/migrations/0046_reviewrating.py
@@ -0,0 +1,59 @@
+# Generated by Django 3.0.7 on 2021-02-25 18:36
+
+from django.db import migrations, models
+from django.db import connection
+from django.db.models import Q
+import django.db.models.deletion
+
+def convert_review_rating(app_registry, schema_editor):
+    ''' take rating type Reviews and conver them to ReviewRatings '''
+    db_alias = schema_editor.connection.alias
+
+    reviews = app_registry.get_model(
+        'bookwyrm', 'Review'
+    ).objects.using(db_alias).filter(
+        Q(content__isnull=True) | Q(content='')
+    )
+
+    with connection.cursor() as cursor:
+        for review in reviews:
+            cursor.execute('''
+INSERT INTO bookwyrm_reviewrating(review_ptr_id)
+SELECT status_ptr_id FROM bookwyrm_review
+WHERE status_ptr_id={:d}'''.format(review.id))
+
+def unconvert_review_rating(app_registry, schema_editor):
+    ''' undo the conversion from ratings back to reviews'''
+    # TODO: this does not work
+    db_alias = schema_editor.connection.alias
+
+    ratings = app_registry.get_model(
+        'bookwyrm', 'ReviewRating'
+    ).objects.using(db_alias).all()
+
+    with connection.cursor() as cursor:
+        for rating in ratings:
+            cursor.execute('''
+INSERT INTO bookwyrm_review(status_ptr_id)
+SELECT review_ptr_id FROM bookwyrm_reviewrating
+WHERE review_ptr_id={:d}'''.format(rating.id))
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0045_auto_20210210_2114'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ReviewRating',
+            fields=[
+                ('review_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.Review')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('bookwyrm.review',),
+        ),
+        migrations.RunPython(convert_review_rating, unconvert_review_rating),
+    ]

From 4a10c99026475e6dc79ba40d24dd4a98491bc076 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 25 Feb 2021 15:05:51 -0800
Subject: [PATCH 0092/1285] Fixes handling of ratings in status views and urls

---
 bookwyrm/templates/snippets/status/status_content.html | 2 +-
 bookwyrm/templates/snippets/status/status_header.html  | 2 +-
 bookwyrm/urls.py                                       | 1 +
 bookwyrm/views/status.py                               | 4 +++-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/snippets/status/status_content.html b/bookwyrm/templates/snippets/status/status_content.html
index 0f59f7fc..e493e4bf 100644
--- a/bookwyrm/templates/snippets/status/status_content.html
+++ b/bookwyrm/templates/snippets/status/status_content.html
@@ -1,6 +1,6 @@
 {% load bookwyrm_tags %}
 <div class="block">
-    {% if status.status_type == 'Review' %}
+    {% if status.status_type == 'Review' or status.status_type == 'Rating' %}
     <div>
         <h3 class="title is-5 has-subtitle">
             {% if status.name %}<span dir="auto">{{ status.name }}</span><br>{% endif %}
diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html
index 890b4ab8..f2e897cc 100644
--- a/bookwyrm/templates/snippets/status/status_header.html
+++ b/bookwyrm/templates/snippets/status/status_header.html
@@ -4,7 +4,7 @@
 
 {% if status.status_type == 'GeneratedNote' %}
     {{ status.content | safe }}
-{% elif status.status_type == 'Review' and not status.name and not status.content%}
+{% elif status.status_type == 'Rating' %}
     rated
 {% elif status.status_type == 'Review' %}
     reviewed
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index a741088a..76054e3f 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -13,6 +13,7 @@ local_user_path = r'^user/(?P<username>%s)' % regex.localname
 status_types = [
     'status',
     'review',
+    'reviewrating',
     'comment',
     'quotation',
     'boost',
diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py
index db924ce8..983fea38 100644
--- a/bookwyrm/views/status.py
+++ b/bookwyrm/views/status.py
@@ -56,7 +56,7 @@ class CreateStatus(View):
         status.mention_users.set(set(status.mention_users.all()))
 
         # don't apply formatting to generated notes
-        if not isinstance(status, models.GeneratedNote):
+        if not isinstance(status, models.GeneratedNote) and content:
             status.content = to_markdown(content)
         # do apply formatting to quotes
         if hasattr(status, 'quote'):
@@ -82,6 +82,8 @@ class DeleteStatus(View):
 
 def find_mentions(content):
     ''' detect @mentions in raw status content '''
+    if not content:
+        return
     for match in re.finditer(regex.strict_username, content):
         username = match.group().strip().split('@')[1:]
         if len(username) == 1:

From 3ba6479e79ad5280273aa57aca6c9a6535099de4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 25 Feb 2021 15:16:16 -0800
Subject: [PATCH 0093/1285] hide linter error on override funtion

---
 bookwyrm/activitypub/note.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/activitypub/note.py b/bookwyrm/activitypub/note.py
index 54c69ce4..45218421 100644
--- a/bookwyrm/activitypub/note.py
+++ b/bookwyrm/activitypub/note.py
@@ -11,7 +11,7 @@ class Tombstone(ActivityObject):
     ''' the placeholder for a deleted status '''
     type: str = 'Tombstone'
 
-    def to_model(self, *args, **kwargs):
+    def to_model(self, *args, **kwargs):# pylint: disable=unused-argument
         ''' this should never really get serialized, just searched for '''
         model = apps.get_model('bookwyrm.Status')
         return model.find_existing_by_remote_id(self.id)

From bfedb300ca0856c1f00a66435b594625315cd5b4 Mon Sep 17 00:00:00 2001
From: Henri Bourcereau <hbourcereau@atixnet.fr>
Date: Fri, 26 Feb 2021 13:32:17 +0100
Subject: [PATCH 0094/1285] librarything import : fix parsing & select box

---
 bookwyrm/importer.py                 | 4 ++--
 bookwyrm/librarything_import.py      | 9 ++++++---
 bookwyrm/templates/import.html       | 2 +-
 bookwyrm/tests/data/librarything.tsv | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/importer.py b/bookwyrm/importer.py
index b6e959cb..a1288400 100644
--- a/bookwyrm/importer.py
+++ b/bookwyrm/importer.py
@@ -12,7 +12,7 @@ class Importer:
     service = 'Unknown'
     delimiter = ','
     encoding = 'UTF-8'
-    mandatory_fields = ['ISBN13', 'Title', 'Author']
+    mandatory_fields = ['Title', 'Author']
 
     def create_job(self, user, csv_file, include_reviews, privacy):
         ''' check over a csv and creates a database entry for the job'''
@@ -23,7 +23,7 @@ class Importer:
         )
         for index, entry in enumerate(list(csv.DictReader(csv_file, delimiter=self.delimiter ))):
             if not all(x in entry for x in self.mandatory_fields):
-                raise ValueError('Author, title, and isbn must be in data.')
+                raise ValueError('Author and title must be in data.')
             entry = self.parse_fields(entry)
             self.save_item(job, index, entry)
         return job
diff --git a/bookwyrm/librarything_import.py b/bookwyrm/librarything_import.py
index 019573ac..0584daad 100644
--- a/bookwyrm/librarything_import.py
+++ b/bookwyrm/librarything_import.py
@@ -12,8 +12,8 @@ class LibrarythingImporter(Importer):
     service = 'LibraryThing'
     delimiter = '\t'
     encoding = 'ISO-8859-1'
-    # mandatory_fields : fields matching the book ISBN13, title and author
-    mandatory_fields = ['ISBN', 'Title', 'Primary Author']
+    # mandatory_fields : fields matching the book title and author
+    mandatory_fields = ['Title', 'Primary Author']
 
     def parse_fields(self, initial):
         data = {}
@@ -23,7 +23,10 @@ class LibrarythingImporter(Importer):
         data['Author'] = initial['Primary Author']
         data['ISBN13'] = initial['ISBN']
         data['My Review'] = initial['Review']
-        data['My Rating'] = math.ceil(float(initial['Rating']))
+        if initial['Rating']:
+            data['My Rating'] = math.ceil(float(initial['Rating']))
+        else:
+            data['My Rating'] = ''
         data['Date Added'] = re.sub('\[|\]', '', initial['Entry Date'])
         data['Date Started'] = re.sub('\[|\]', '', initial['Date Started'])
         data['Date Read'] = re.sub('\[|\]', '', initial['Date Read'])
diff --git a/bookwyrm/templates/import.html b/bookwyrm/templates/import.html
index dd60ebff..a7fde76d 100644
--- a/bookwyrm/templates/import.html
+++ b/bookwyrm/templates/import.html
@@ -10,7 +10,7 @@
           <p>Data source</p>
         <div class="select {{ class }}">
           <select name="source" id="source">
-            <option value="GoodReads" {% if current == 'LibraryThing' %}selected{% endif %}>
+            <option value="GoodReads" {% if current == 'GoodReads' %}selected{% endif %}>
             GoodReads
             </option>
             <option value="LibraryThing" {% if current == 'LibraryThing' %}selected{% endif %}>
diff --git a/bookwyrm/tests/data/librarything.tsv b/bookwyrm/tests/data/librarything.tsv
index f0dca77f..a707f2a9 100644
--- a/bookwyrm/tests/data/librarything.tsv
+++ b/bookwyrm/tests/data/librarything.tsv
@@ -1,4 +1,4 @@
 Book Id	Title	Sort Character	Primary Author	Primary Author Role	Secondary Author	Secondary Author Roles	Publication	Date	Review	Rating	Comment	Private Comment	Summary	Media	Physical Description	Weight	Height	Thickness	Length	Dimensions	Page Count	LCCN	Acquired	Date Started	Date Read	Barcode	BCID	Tags	Collections	Languages	Original Languages	LC Classification	ISBN	ISBNs	Subjects	Dewey Decimal	Dewey Wording	Other Call Number	Copies	Source	Entry Date	From Where	OCLC	Work id	Lending Patron	Lending Status	Lending Start	Lending End
 5498194	Marelle	1	Cortázar, Julio				Gallimard (1979), Poche	1979	chef d'oeuvre	4.5			Marelle by Julio Cortázar (1979)	Broché	590 p.; 7.24 inches	1.28 pounds	7.24 inches	1.26 inches	4.96 inches	7.24 x 4.96 x 1.26 inches	590 			[2007-04-16]	[2007-05-08]			roman, espagnol, expérimental, bohème, philosophie	Your library	French	Spanish	PQ7797 .C7145	[2070291340]	2070291340, 9782070291342	Cortâazar, Julio. Rayuela	863	Literature > Spanish And Portuguese > Spanish fiction		1	Amazon.fr	[2006-08-09]			57814				
 5015319	Le grand incendie de Londres: Récit, avec incises et bifurcations, 1985-1987 (Fiction & Cie)	1	Roubaud, Jacques				Seuil (1989), Unknown Binding	1989		5			Le grand incendie de Londres: Récit, avec incises et bifurcations, 1985-1987 (Fiction & Cie) by Jacques Roubaud (1989)	Broché	411 p.; 7.72 inches	0.88 pounds	7.72 inches	1.02 inches	5.43 inches	7.72 x 5.43 x 1.02 inches	411 								Your library	English		PQ2678 .O77	[2020104725]	2020104725, 9782020104722	Autobiographical fiction|Roubaud, Jacques > Fiction	813	American And Canadian > Fiction > Literature		1	Amazon.com	[2006-07-25]			478910				
-5015399	Le Maître et Marguerite	1	Boulgakov, Mikhaïl				Pocket (1994), Poche	1994		5			Le Maître et Marguerite by Mikhaïl Boulgakov (1994)	Broché	579 p.; 7.09 inches	0.66 pounds	7.09 inches	1.18 inches	4.33 inches	7.09 x 4.33 x 1.18 inches	579 								Your library	French		PG3476 .B78	[2266062328]	2266062328, 9782266062329	Allegories|Bulgakov|Good and evil > Fiction|Humanities|Jerusalem > Fiction|Jesus Christ > Fiction|Literature|Mental illness > Fiction|Moscow (Russia) > Fiction|Novel|Pilate, Pontius, 1st cent. > Fiction|Political fiction|Russia > Fiction|Russian fiction|Russian publications (Form Entry)|Soviet Union > History > 1925-1953 > Fiction|literature	891.7342	1917-1945 > 1917-1991 (USSR) > Literature > Literature of other Indo-European languages > Other Languages > Russian > Russian Fiction		1	Amazon.fr	[2006-07-25]			10151				
+5015399	Le Maître et Marguerite	1	Boulgakov, Mikhaïl				Pocket (1994), Poche	1994					Le Maître et Marguerite by Mikhaïl Boulgakov (1994)	Broché	579 p.; 7.09 inches	0.66 pounds	7.09 inches	1.18 inches	4.33 inches	7.09 x 4.33 x 1.18 inches	579 								Your library	French		PG3476 .B78	[2266062328]	2266062328, 9782266062329	Allegories|Bulgakov|Good and evil > Fiction|Humanities|Jerusalem > Fiction|Jesus Christ > Fiction|Literature|Mental illness > Fiction|Moscow (Russia) > Fiction|Novel|Pilate, Pontius, 1st cent. > Fiction|Political fiction|Russia > Fiction|Russian fiction|Russian publications (Form Entry)|Soviet Union > History > 1925-1953 > Fiction|literature	891.7342	1917-1945 > 1917-1991 (USSR) > Literature > Literature of other Indo-European languages > Other Languages > Russian > Russian Fiction		1	Amazon.fr	[2006-07-25]			10151				

From ee7388052c45f521cdff5d00c63ab6b07d43b2c1 Mon Sep 17 00:00:00 2001
From: Joel Bradshaw <cincodenada@gmail.com>
Date: Fri, 26 Feb 2021 22:57:26 -0800
Subject: [PATCH 0095/1285] Use SQL parameters, and make unconvert work

DBAs don't want you to know about this One Simple Trick
---
 bookwyrm/migrations/0046_reviewrating.py | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/bookwyrm/migrations/0046_reviewrating.py b/bookwyrm/migrations/0046_reviewrating.py
index b29cdbd2..776cae84 100644
--- a/bookwyrm/migrations/0046_reviewrating.py
+++ b/bookwyrm/migrations/0046_reviewrating.py
@@ -6,7 +6,7 @@ from django.db.models import Q
 import django.db.models.deletion
 
 def convert_review_rating(app_registry, schema_editor):
-    ''' take rating type Reviews and conver them to ReviewRatings '''
+    ''' take rating type Reviews and convert them to ReviewRatings '''
     db_alias = schema_editor.connection.alias
 
     reviews = app_registry.get_model(
@@ -20,23 +20,13 @@ def convert_review_rating(app_registry, schema_editor):
             cursor.execute('''
 INSERT INTO bookwyrm_reviewrating(review_ptr_id)
 SELECT status_ptr_id FROM bookwyrm_review
-WHERE status_ptr_id={:d}'''.format(review.id))
+WHERE status_ptr_id=%s''', (review.id))
 
 def unconvert_review_rating(app_registry, schema_editor):
     ''' undo the conversion from ratings back to reviews'''
-    # TODO: this does not work
-    db_alias = schema_editor.connection.alias
-
-    ratings = app_registry.get_model(
-        'bookwyrm', 'ReviewRating'
-    ).objects.using(db_alias).all()
-
-    with connection.cursor() as cursor:
-        for rating in ratings:
-            cursor.execute('''
-INSERT INTO bookwyrm_review(status_ptr_id)
-SELECT review_ptr_id FROM bookwyrm_reviewrating
-WHERE review_ptr_id={:d}'''.format(rating.id))
+    # All we need to do to revert this is drop the table, which Django will do
+    # on its own, as long as we have a valid reverse function. So, this is a
+    # no-op function so Django will do its thing
 
 class Migration(migrations.Migration):
 

From 717cbe303412e40feb4cf3553ed0cc760eec581c Mon Sep 17 00:00:00 2001
From: Joel Bradshaw <cincodenada@gmail.com>
Date: Fri, 26 Feb 2021 23:12:39 -0800
Subject: [PATCH 0096/1285] Use very fancy SQL nonsense

This should be more efficient than running the queries one by one
---
 bookwyrm/migrations/0046_reviewrating.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/migrations/0046_reviewrating.py b/bookwyrm/migrations/0046_reviewrating.py
index 776cae84..e410ba91 100644
--- a/bookwyrm/migrations/0046_reviewrating.py
+++ b/bookwyrm/migrations/0046_reviewrating.py
@@ -4,6 +4,7 @@ from django.db import migrations, models
 from django.db import connection
 from django.db.models import Q
 import django.db.models.deletion
+from psycopg2.extras import execute_values
 
 def convert_review_rating(app_registry, schema_editor):
     ''' take rating type Reviews and convert them to ReviewRatings '''
@@ -16,11 +17,10 @@ def convert_review_rating(app_registry, schema_editor):
     )
 
     with connection.cursor() as cursor:
-        for review in reviews:
-            cursor.execute('''
+        values = [(r.id,) for r in reviews]
+        execute_values(cursor, '''
 INSERT INTO bookwyrm_reviewrating(review_ptr_id)
-SELECT status_ptr_id FROM bookwyrm_review
-WHERE status_ptr_id=%s''', (review.id))
+VALUES %s''', values)
 
 def unconvert_review_rating(app_registry, schema_editor):
     ''' undo the conversion from ratings back to reviews'''

From 9580bec1541bec5127326cbbdc1e9115e7dfe811 Mon Sep 17 00:00:00 2001
From: Ned Zimmerman <ned@bight.dev>
Date: Sat, 27 Feb 2021 11:47:03 -0400
Subject: [PATCH 0097/1285] feat: modify tabbed interfaces to support keyboard
 accessibility (fixes #526)

---
 bookwyrm/static/js/shared.js                  |  21 --
 bookwyrm/static/js/tabs.js                    | 255 ++++++++++++++++++
 bookwyrm/templates/feed.html                  |  90 ++++---
 bookwyrm/templates/layout.html                |   1 +
 bookwyrm/templates/shelf.html                 |   4 +-
 .../templates/snippets/create_status.html     |  58 ++--
 6 files changed, 334 insertions(+), 95 deletions(-)
 create mode 100644 bookwyrm/static/js/tabs.js

diff --git a/bookwyrm/static/js/shared.js b/bookwyrm/static/js/shared.js
index a0c21bec..3b0fa589 100644
--- a/bookwyrm/static/js/shared.js
+++ b/bookwyrm/static/js/shared.js
@@ -12,10 +12,6 @@ window.onload = function() {
     Array.from(document.getElementsByClassName('select-all'))
         .forEach(t => t.onclick = selectAll);
 
-    // toggle between tabs
-    Array.from(document.getElementsByClassName('tab-change'))
-        .forEach(t => t.onclick = tabChange);
-
     // handle aria settings on menus
     Array.from(document.getElementsByClassName('pulldown-menu'))
         .forEach(t => t.onclick = toggleMenu);
@@ -131,23 +127,6 @@ function selectAll(e) {
         .forEach(t => t.checked=true);
 }
 
-function tabChange(e) {
-    var el = e.currentTarget;
-    var parentElement = el.closest('[role="tablist"]');
-
-    parentElement.querySelectorAll('[aria-selected="true"]')
-        .forEach(t => t.setAttribute("aria-selected", false));
-    el.setAttribute("aria-selected", true);
-
-    parentElement.querySelectorAll('li')
-        .forEach(t => removeClass(t, 'is-active'));
-    addClass(el, 'is-active');
-
-    var tabId = el.getAttribute('data-tab');
-    Array.from(document.getElementsByClassName(el.getAttribute('data-category')))
-        .forEach(t => addRemoveClass(t, 'hidden', t.id != tabId));
-}
-
 function toggleMenu(e) {
     var el = e.currentTarget;
     var expanded = el.getAttribute('aria-expanded') == 'false';
diff --git a/bookwyrm/static/js/tabs.js b/bookwyrm/static/js/tabs.js
new file mode 100644
index 00000000..a57d29ae
--- /dev/null
+++ b/bookwyrm/static/js/tabs.js
@@ -0,0 +1,255 @@
+/*
+* This content is licensed according to the W3C Software License at
+* https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
+* Heavily modified to web component by Zach Leatherman
+* Further modified to support Bulma markup and nested tabs by Ned Zimmerman
+*/
+class SevenMinuteTabs extends HTMLElement {
+    constructor() {
+      super();
+  
+      this.tablist = this.querySelector('[role="tablist"]');
+      this.buttons = this.tablist.querySelectorAll('[role="tab"]');
+      this.panels = this.querySelectorAll(':scope > [role="tabpanel"]');
+      this.delay = this.determineDelay();
+  
+      if(!this.tablist || !this.buttons.length || !this.panels.length) {
+        return;
+      }
+  
+      this.initButtons();
+      this.initPanels();
+    }
+  
+    get keys() {
+      return {
+        end: 35,
+        home: 36,
+        left: 37,
+        up: 38,
+        right: 39,
+        down: 40
+      };
+    }
+  
+    // Add or substract depending on key pressed
+    get direction() {
+      return {
+        37: -1,
+        38: -1,
+        39: 1,
+        40: 1
+      };
+    }
+  
+    initButtons() {
+      let count = 0;
+      for(let button of this.buttons) {
+        let isSelected = button.getAttribute("aria-selected") === "true";
+        button.setAttribute("tabindex", isSelected ? "0" : "-1");
+  
+        button.addEventListener('click', this.clickEventListener.bind(this));
+        button.addEventListener('keydown', this.keydownEventListener.bind(this));
+        button.addEventListener('keyup', this.keyupEventListener.bind(this));
+  
+        button.index = count++;
+      }
+    }
+  
+    initPanels() {
+      let selectedPanelId = this.tablist.querySelector('[role="tab"][aria-selected="true"]').getAttribute("aria-controls");
+      for(let panel of this.panels) {
+        if(panel.getAttribute("id") !== selectedPanelId) {
+          panel.setAttribute("hidden", "");
+        }
+        panel.setAttribute("tabindex", "0");
+      }
+    }
+  
+    clickEventListener(event) {
+      let button = event.target;
+      if(button.tagName === "A" || button.tagName === "BUTTON" && button.getAttribute("type") === "submit") {
+        event.preventDefault();
+      }
+  
+      this.activateTab(button, false);
+    }
+  
+    // Handle keydown on tabs
+    keydownEventListener(event) {
+      var key = event.keyCode;
+  
+      switch (key) {
+        case this.keys.end:
+          event.preventDefault();
+          // Activate last tab
+          this.activateTab(this.buttons[this.buttons.length - 1]);
+          break;
+        case this.keys.home:
+          event.preventDefault();
+          // Activate first tab
+          this.activateTab(this.buttons[0]);
+          break;
+  
+        // Up and down are in keydown
+        // because we need to prevent page scroll >:)
+        case this.keys.up:
+        case this.keys.down:
+          this.determineOrientation(event);
+          break;
+      };
+    }
+  
+    // Handle keyup on tabs
+    keyupEventListener(event) {
+      var key = event.keyCode;
+  
+      switch (key) {
+        case this.keys.left:
+        case this.keys.right:
+          this.determineOrientation(event);
+          break;
+      };
+    }
+  
+    // When a tablist’s aria-orientation is set to vertical,
+    // only up and down arrow should function.
+    // In all other cases only left and right arrow function.
+    determineOrientation(event) {
+      var key = event.keyCode;
+      var vertical = this.tablist.getAttribute('aria-orientation') == 'vertical';
+      var proceed = false;
+  
+      if (vertical) {
+        if (key === this.keys.up || key === this.keys.down) {
+          event.preventDefault();
+          proceed = true;
+        };
+      }
+      else {
+        if (key === this.keys.left || key === this.keys.right) {
+          proceed = true;
+        };
+      };
+  
+      if (proceed) {
+        this.switchTabOnArrowPress(event);
+      };
+    }
+  
+    // Either focus the next, previous, first, or last tab
+    // depending on key pressed
+    switchTabOnArrowPress(event) {
+      var pressed = event.keyCode;
+  
+      for (let button of this.buttons) {
+        button.addEventListener('focus', this.focusEventHandler.bind(this));
+      };
+  
+      if (this.direction[pressed]) {
+        var target = event.target;
+        if (target.index !== undefined) {
+          if (this.buttons[target.index + this.direction[pressed]]) {
+            this.buttons[target.index + this.direction[pressed]].focus();
+          }
+          else if (pressed === this.keys.left || pressed === this.keys.up) {
+            this.focusLastTab();
+          }
+          else if (pressed === this.keys.right || pressed == this.keys.down) {
+            this.focusFirstTab();
+          }
+        }
+      }
+    }
+  
+    // Activates any given tab panel
+    activateTab (tab, setFocus) {
+      if(tab.getAttribute("role") !== "tab") {
+        tab = tab.closest('[role="tab"]');
+      }
+  
+      setFocus = setFocus || true;
+  
+      // Deactivate all other tabs
+      this.deactivateTabs();
+  
+      // Remove tabindex attribute
+      tab.removeAttribute('tabindex');
+  
+      // Set the tab as selected
+      tab.setAttribute('aria-selected', 'true');
+      
+      // Give the tab parent an is-active class
+      tab.parentNode.classList.add('is-active');
+  
+      // Get the value of aria-controls (which is an ID)
+      var controls = tab.getAttribute('aria-controls');
+  
+      // Remove hidden attribute from tab panel to make it visible
+      document.getElementById(controls).removeAttribute('hidden');
+  
+      // Set focus when required
+      if (setFocus) {
+        tab.focus();
+      }
+    }
+  
+    // Deactivate all tabs and tab panels
+    deactivateTabs() {
+      for (let button of this.buttons) {
+        button.parentNode.classList.remove('is-active');
+        button.setAttribute('tabindex', '-1');
+        button.setAttribute('aria-selected', 'false');
+        button.removeEventListener('focus', this.focusEventHandler.bind(this));
+      }
+  
+      for (let panel of this.panels) {
+        panel.setAttribute('hidden', 'hidden');
+      }
+    }
+  
+    focusFirstTab() {
+      this.buttons[0].focus();
+    }
+  
+    focusLastTab() {
+      this.buttons[this.buttons.length - 1].focus();
+    }
+  
+    // Determine whether there should be a delay
+    // when user navigates with the arrow keys
+    determineDelay() {
+      var hasDelay = this.tablist.hasAttribute('data-delay');
+      var delay = 0;
+  
+      if (hasDelay) {
+        var delayValue = this.tablist.getAttribute('data-delay');
+        if (delayValue) {
+          delay = delayValue;
+        }
+        else {
+          // If no value is specified, default to 300ms
+          delay = 300;
+        };
+      };
+  
+      return delay;
+    }
+  
+    focusEventHandler(event) {
+      var target = event.target;
+  
+      setTimeout(this.checkTabFocus.bind(this), this.delay, target);
+    };
+  
+    // Only activate tab on focus if it still has focus after the delay
+    checkTabFocus(target) {
+      let focused = document.activeElement;
+  
+      if (target === focused) {
+        this.activateTab(target, false);
+      }
+    }
+  }
+  
+  window.customElements.define("seven-minute-tabs", SevenMinuteTabs);
diff --git a/bookwyrm/templates/feed.html b/bookwyrm/templates/feed.html
index 1368660b..82ccff5a 100644
--- a/bookwyrm/templates/feed.html
+++ b/bookwyrm/templates/feed.html
@@ -8,56 +8,58 @@
         {% if not suggested_books %}
         <p>There are no books here right now! Try searching for a book to get started</p>
         {% else %}
-        <div class="tabs is-small">
-            <ul role="tablist">
+        <seven-minute-tabs>
+            <div class="tabs is-small">
+                <ul role="tablist">
+                {% for shelf in suggested_books %}
+                {% if shelf.books %}
+                {% with shelf_counter=forloop.counter %}
+                    <li>
+                        <p>
+                            {{ shelf.name }}
+                        </p>
+                        <div class="tabs is-small is-toggle">
+                            <ul>
+                                {% for book in shelf.books %}
+                                <li{% if shelf_counter == 1 and forloop.first %} class="is-active"{% endif %}>
+                                    <a href="#book-{{ book.id }}" role="tab" {% if not forloop.first %}tabindex="-1"{% endif %} aria-selected="{% if shelf_counter == 1 and forloop.first %}true{% else %}false{% endif %}" aria-controls="book-{{ book.id }}">
+                                        {% include 'snippets/book_cover.html' with book=book size="medium" %}
+                                    </a>
+                                </li>
+                                {% endfor %}
+                            </ul>
+                        </div>
+                    </li>
+                {% endwith %}
+                {% endif %}
+                {% endfor %}
+                </ul>
+            </div>
             {% for shelf in suggested_books %}
-            {% if shelf.books %}
             {% with shelf_counter=forloop.counter %}
-                <li>
-                    <p>
-                        {{ shelf.name }}
+            {% for book in shelf.books %}
+            <div class="suggested-tabs card" role="tabpanel" id="book-{{ book.id }}"{% if shelf_counter != 1 or not forloop.first %} hidden{% endif %}>
+                <div class="card-header">
+                    <p class="card-header-title">
+                        <span>{% include 'snippets/book_titleby.html' with book=book %}</span>
                     </p>
-                    <div class="tabs is-small is-toggle">
-                        <ul>
-                            {% for book in shelf.books %}
-                            <li class="tab-change{% if shelf_counter == 1 and forloop.first %} is-active{% endif %}" data-tab="book-{{ book.id }}" data-tab="book-{{ book.id }}" role="tab" tabindex="0" aria-selected="{% if shelf_counter == 1 and forloop.first %}true{% else %}false{% endif %}" aria-controls="book-{{ book.id }}" data-category="suggested-tabs">
-                                <a>
-                                    {% include 'snippets/book_cover.html' with book=book size="medium" %}
-                                </a>
-                            </li>
-                            {% endfor %}
-                        </ul>
+                    <div class="card-header-icon is-hidden-tablet">
+                        {% include 'snippets/toggle/toggle_button.html' with label="close" controls_text="book" controls_uid=book.id class="delete" nonbutton=True pressed=True %}
                     </div>
-                </li>
-            {% endwith %}
-            {% endif %}
-            {% endfor %}
-            </ul>
-        </div>
-        {% for shelf in suggested_books %}
-        {% with shelf_counter=forloop.counter %}
-        {% for book in shelf.books %}
-        <div class="suggested-tabs card{% if shelf_counter != 1 or not forloop.first %} hidden{% endif %}" role="tabpanel" id="book-{{ book.id }}">
-            <div class="card-header">
-                <p class="card-header-title">
-                    <span>{% include 'snippets/book_titleby.html' with book=book %}</span>
-                </p>
-                <div class="card-header-icon is-hidden-tablet">
-                    {% include 'snippets/toggle/toggle_button.html' with label="close" controls_text="book" controls_uid=book.id class="delete" nonbutton=True pressed=True %}
+                </div>
+                <div class="card-content">
+                    {% include 'snippets/shelve_button.html' with book=book %}
+                    {% active_shelf book as active_shelf %}
+                    {% if active_shelf.shelf.identifier == 'reading' and book.latest_readthrough %}
+                    {% include 'snippets/progress_update.html' with readthrough=book.latest_readthrough %}
+                    {% endif %}
+                    {% include 'snippets/create_status.html' with book=book %}
                 </div>
             </div>
-            <div class="card-content">
-                {% include 'snippets/shelve_button.html' with book=book %}
-                {% active_shelf book as active_shelf %}
-                {% if active_shelf.shelf.identifier == 'reading' and book.latest_readthrough %}
-                {% include 'snippets/progress_update.html' with readthrough=book.latest_readthrough %}
-                {% endif %}
-                {% include 'snippets/create_status.html' with book=book %}
-            </div>
-        </div>
-        {% endfor %}
-        {% endwith %}
-        {% endfor %}
+            {% endfor %}
+            {% endwith %}
+            {% endfor %}
+        </seven-minute-tabs>
         {% endif %}
 
         {% if goal %}
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index ddbafbb4..c7a56cc7 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -191,5 +191,6 @@
     var csrf_token = '{{ csrf_token }}';
 </script>
 <script src="/static/js/shared.js"></script>
+<script src="/static/js/tabs.js" type="module"></script>
 </body>
 </html>
diff --git a/bookwyrm/templates/shelf.html b/bookwyrm/templates/shelf.html
index da599c7d..0206d7e9 100644
--- a/bookwyrm/templates/shelf.html
+++ b/bookwyrm/templates/shelf.html
@@ -18,11 +18,11 @@
 
 <div class="block columns">
     <div class="column">
-        <div class="tabs" role="tablist">
+        <div class="tabs">
             <ul>
             {% for shelf_tab in shelves %}
             <li class="{% if shelf_tab.identifier == shelf.identifier %}is-active{% endif %}">
-                    <a href="/user/{{ user | username }}/shelf/{{ shelf_tab.identifier }}" role="tab" aria-selected="{% if shelf_tab.identifier == shelf.identifier %}true{% else %}false{% endif %}">{{ shelf_tab.name }}</a>
+                    <a href="/user/{{ user | username }}/shelf/{{ shelf_tab.identifier }}"{% if shelf_tab.identifier == shelf.identifier %} aria-current="page"{% endif %}>{{ shelf_tab.name }}</a>
                 </li>
             {% endfor %}
             </ul>
diff --git a/bookwyrm/templates/snippets/create_status.html b/bookwyrm/templates/snippets/create_status.html
index b443acdd..1842285f 100644
--- a/bookwyrm/templates/snippets/create_status.html
+++ b/bookwyrm/templates/snippets/create_status.html
@@ -1,34 +1,36 @@
 {% load humanize %}
 {% load bookwyrm_tags %}
 
-<div class="tabs is-boxed">
-    <ul role="tablist">
-        <li class="tab-change is-active" data-category="tab-option-{{ book.id }}" role="tab" aria-selected="true" tabindex="0" data-tab="review-{{ book.id }}">
-            <a>Review</a>
-        </li>
-        <li class="tab-change" data-category="tab-option-{{ book.id }}" role="tab" tabindex="0" data-tab="comment-{{ book.id}}">
-            <a>Comment</a>
-        </li>
-        <li class="tab-change" data-category="tab-option-{{ book.id }}" role="tab" tabindex="0" data-tab="quote-{{ book.id }}">
-            <a>Quote</a>
-        </li>
-    </ul>
-</div>
+<seven-minute-tabs>
+    <div class="tabs is-boxed" role="tablist">
+        <ul>
+            <li class="is-active">
+                <a href="#review-{{ book.id }}" id="tab-review-{{ book.id }}" role="tab" aria-selected="true" aria-controls="review-{{ book.id }}" data-category="tab-option-{{ book.id }}">Review</a>
+            </li>
+            <li>
+                <a href="#comment-{{ book.id}}" id="tab-comment-{{ book.id }}" role="tab" tabindex="-1" aria-selected="false" aria-controls="comment-{{ book.id}}" data-category="tab-option-{{ book.id }}">Comment</a>
+            </li>
+            <li>
+                <a href="#quote-{{ book.id }}" id="tab-quote-{{ book.id }}" role="tab" tabindex="-1" aria-selected="false" aria-controls="quote-{{ book.id }}" data-category="tab-option-{{ book.id }}">Quote</a>
+            </li>
+        </ul>
+    </div>
 
-<div class="tab-option-{{ book.id }}" id="review-{{ book.id }}">
-    {% with 0|uuid as uuid %}
-    {% include 'snippets/create_status_form.html' with type='review' %}
-    {% endwith %}
-</div>
+    <div class="tab-option-{{ book.id }}" id="review-{{ book.id }}" role="tabpanel" tabindex="0" aria-labelledby="tab-review-{{ book.id }}">
+        {% with 0|uuid as uuid %}
+        {% include 'snippets/create_status_form.html' with type='review' %}
+        {% endwith %}
+    </div>
 
-<div class="hidden tab-option-{{ book.id }}" id="comment-{{ book.id }}">
-    {% with 0|uuid as uuid %}
-    {% include 'snippets/create_status_form.html' with type="comment" placeholder="Some thoughts on '"|add:book.title|add:"'" %}
-    {% endwith %}
-</div>
+    <div class="tab-option-{{ book.id }}" id="comment-{{ book.id }}" role="tabpanel" aria-labelledby="tab-comment-{{ book.id }}" hidden>
+        {% with 0|uuid as uuid %}
+        {% include 'snippets/create_status_form.html' with type="comment" placeholder="Some thoughts on '"|add:book.title|add:"'" %}
+        {% endwith %}
+    </div>
 
-<div class="hidden tab-option-{{ book.id }}" id="quote-{{ book.id }}">
-    {% with 0|uuid as uuid %}
-    {% include 'snippets/create_status_form.html' with type="quotation" placeholder="An excerpt from '"|add:book.title|add:"'" %}
-    {% endwith %}
-</div>
+    <div class="tab-option-{{ book.id }}" id="quote-{{ book.id }}" role="tabpanel" aria-labelledby="tab-quote-{{ book.id }}" hidden>
+        {% with 0|uuid as uuid %}
+        {% include 'snippets/create_status_form.html' with type="quotation" placeholder="An excerpt from '"|add:book.title|add:"'" %}
+        {% endwith %}
+    </div>
+</seven-minute-tabs>

From 9ed5226b5842354d5a45a254952afbcbb6fe478c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 27 Feb 2021 11:07:16 -0800
Subject: [PATCH 0098/1285] Switches layout to use in-template html header
 titles

---
 bookwyrm/templates/feed/feed_layout.html | 1 +
 bookwyrm/templates/layout.html           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/feed/feed_layout.html b/bookwyrm/templates/feed/feed_layout.html
index 00ac4ab8..57dae971 100644
--- a/bookwyrm/templates/feed/feed_layout.html
+++ b/bookwyrm/templates/feed/feed_layout.html
@@ -1,5 +1,6 @@
 {% extends 'layout.html' %}
 {% load bookwyrm_tags %}
+{% block title %}Updates{% endblock %}
 {% block content %}
 
 <div class="columns">
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index fe8a7509..ef1a2061 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -2,7 +2,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title>{% if title %}{{ title }} | {% endif %}{{ site.name }}</title>
+    <title>{% block title %}BookWyrm{% endblock %} | {{ site.name }}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link type="text/css" rel="stylesheet" href="/static/css/bulma.min.css">
     <link type="text/css" rel="stylesheet" href="/static/css/format.css">

From 8aafff58caa9b2acb5ef3c10b8c5ee404d667e32 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sat, 27 Feb 2021 20:13:38 +0100
Subject: [PATCH 0099/1285] Fix some typos.

---
 README.md | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index c8b6e92b..3db6dd92 100644
--- a/README.md
+++ b/README.md
@@ -20,22 +20,22 @@ You can request an invite to https://bookwyrm.social by [email](mailto:mousereev
 
 
 ## Contributing
-There are many ways you can contribute to this project, regardless of your level of technical expertise. 
+There are many ways you can contribute to this project, regardless of your level of technical expertise.
 
 ### Feedback and feature requests
 Please feel encouraged and welcome to point out bugs, suggestions, feature requests, and ideas for how things ought to work using [GitHub issues](https://github.com/mouse-reeve/bookwyrm/issues).
 
 ### Code contributions
-Code contributons are gladly welcomed! If you're not sure where to start, take a look at the ["Good first issue"](https://github.com/mouse-reeve/bookwyrm/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) tag. Because BookWyrm is a small project, there isn't a lot of formal structure, but there is a huge capacity for one-on-one support, which can look like asking questions as you go, pair programming, video chats, et cetera, so please feel free to reach out.
+Code contributions are gladly welcomed! If you're not sure where to start, take a look at the ["Good first issue"](https://github.com/mouse-reeve/bookwyrm/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) tag. Because BookWyrm is a small project, there isn't a lot of formal structure, but there is a huge capacity for one-on-one support, which can look like asking questions as you go, pair programming, video chats, et cetera, so please feel free to reach out.
 
-If you have questions about the project or contributing, you can seet up a video call during BookWyrm ["office hours"](https://calendly.com/mouse-reeve/30min).
+If you have questions about the project or contributing, you can set up a video call during BookWyrm ["office hours"](https://calendly.com/mouse-reeve/30min).
 
 ### Financial Support
 BookWyrm is an ad-free passion project with no intentions of seeking out venture funding or corporate financial relationships. If you want to help keep the project going, you can donate to the [Patreon](https://www.patreon.com/bookwyrm), or make a one time gift via [PayPal](https://paypal.me/oulipo).
 
 ## About BookWyrm
 ### What it is and isn't
-BookWyrm is a platform for social reading! You can use it to track what you're reading, review books, and follow your friends. It isn't  primarily meant for cataloguing or as a datasource for books, but it does do both of those things to some degree. 
+BookWyrm is a platform for social reading! You can use it to track what you're reading, review books, and follow your friends. It isn't primarily meant for cataloguing or as a data-source for books, but it does do both of those things to some degree.
 
 ### The role of federation
 BookWyrm is built on [ActivityPub](http://activitypub.rocks/). With ActivityPub, it inter-operates with different instances of BookWyrm, and other ActivityPub compliant services, like Mastodon. This means you can run an instance for your book club, and still follow your friend who posts on a server devoted to 20th century Russian speculative fiction. It also means that your friend on mastodon can read and comment on a book review that you post on your BookWyrm instance.
@@ -68,7 +68,7 @@ Since the project is still in its early stages, the features are growing every d
     - Private, followers-only, and public privacy levels for posting, shelves, and lists
     - Option for users to manually approve followers
     - Allow blocking and flagging for moderation
-    
+   
 ### The Tech Stack
 Web backend
  - [Django](https://www.djangoproject.com/) web server
@@ -111,17 +111,17 @@ Once the build is complete, you can access the instance at `localhost:1333`
 
 ## Installing in Production
 
-This project is still young and isn't, at the momoment, very stable, so please procede with caution when running in production.
+This project is still young and isn't, at the moment, very stable, so please proceed with caution when running in production.
 
 ### Server setup
  - Get a domain name and set up DNS for your server
- - Set your server up with appropriate firewalls for running a web application (this instruction set is tested again Ubuntu 20.04)
+ - Set your server up with appropriate firewalls for running a web application (this instruction set is tested against Ubuntu 20.04)
  - Set up an email service (such as mailgun) and the appropriate SMTP/DNS settings
  - Install Docker and docker-compose
 
 ### Install and configure BookWyrm
 
-The `production` branch of BookWyrm contains a number of tools not on the `main` branch that are suited for running in production, such as `docker-compose` changes to update the default commands or configuration of containers, and indivudal changes to container config to enable things like SSL or regular backups.
+The `production` branch of BookWyrm contains a number of tools not on the `main` branch that are suited for running in production, such as `docker-compose` changes to update the default commands or configuration of containers, and individual changes to container config to enable things like SSL or regular backups.
 
 Instructions for running BookWyrm in production:
 
@@ -171,3 +171,4 @@ There are three concepts in the book data model:
  - `Edition`, a concrete, actually published version of a book
  
 Whenever a user interacts with a book, they are interacting with a specific edition. Every work has a default edition, but the user can select other editions. Reviews aggregated for all editions of a work when you view an edition's page.
+

From 7622bef35d2812f87e163c69280ea89d4a7d7e4f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 27 Feb 2021 11:53:36 -0800
Subject: [PATCH 0100/1285] Adds separate privacy policy section

---
 .../0046_sitesettings_privacy_policy.py       | 18 ++++++
 bookwyrm/models/site.py                       |  2 +
 bookwyrm/templates/discover/about.html        | 42 ++++++++-----
 bookwyrm/templates/discover/discover.html     | 35 +----------
 .../templates/discover/landing_layout.html    | 63 +++++++++++++++++++
 bookwyrm/templates/settings/site.html         |  4 ++
 bookwyrm/templates/user/user_layout.html      | 13 +---
 7 files changed, 120 insertions(+), 57 deletions(-)
 create mode 100644 bookwyrm/migrations/0046_sitesettings_privacy_policy.py
 create mode 100644 bookwyrm/templates/discover/landing_layout.html

diff --git a/bookwyrm/migrations/0046_sitesettings_privacy_policy.py b/bookwyrm/migrations/0046_sitesettings_privacy_policy.py
new file mode 100644
index 00000000..0c49d607
--- /dev/null
+++ b/bookwyrm/migrations/0046_sitesettings_privacy_policy.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.7 on 2021-02-27 19:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0045_auto_20210210_2114'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='sitesettings',
+            name='privacy_policy',
+            field=models.TextField(default='Add a privacy policy here.'),
+        ),
+    ]
diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py
index 4670bd94..d39718b3 100644
--- a/bookwyrm/models/site.py
+++ b/bookwyrm/models/site.py
@@ -20,6 +20,8 @@ class SiteSettings(models.Model):
         default='Contact an administrator to get an invite')
     code_of_conduct = models.TextField(
         default='Add a code of conduct here.')
+    privacy_policy = models.TextField(
+        default='Add a privacy policy here.')
     allow_registration = models.BooleanField(default=True)
     logo = models.ImageField(
         upload_to='logos/', null=True, blank=True
diff --git a/bookwyrm/templates/discover/about.html b/bookwyrm/templates/discover/about.html
index 09115807..9d3f66dc 100644
--- a/bookwyrm/templates/discover/about.html
+++ b/bookwyrm/templates/discover/about.html
@@ -1,21 +1,35 @@
-{% extends 'layout.html' %}
-{% block content %}
+{% extends 'discover/landing_layout.html' %}
+{% block panel %}
 
-<header class="block has-text-centered">
-    <h1 class="title">{{ site.name }}</h1>
-    <h2 class="subtitle">{{ site.instance_tagline }}</h2>
-</header>
+<div class="block columns mt-4">
+    <nav class="menu column is-one-quarter">
+        <h2 class="menu-label">About {{ site.name }}</h2>
+        <ul class="menu-list">
+            <li>
+                <a href="#coc">Code of Conduct</a>
+            </li>
+            <li>
+                <a href="#privacy">Privacy Policy</a>
+            </li>
+        </ul>
+    </nav>
 
-{% include 'discover/icons.html' %}
+    <div class="column content">
+        <div class="block" id="coc">
+            <h2 class="title">Code of Conduct</h2>
+            <div class="content">
+                {{ site.code_of_conduct | safe }}
+            </div>
+        </div>
 
-<section class="block">
-    {% include 'snippets/about.html' %}
-</section>
+        <hr aria-hidden="true">
 
-<div class="block">
-    <h2 class="title">Code of Conduct</h2>
-    <div class="content">
-        {{ site.code_of_conduct | safe }}
+        <div class="block" id="privacy">
+            <h2 class="title">Privacy Policy</h2>
+            <div class="content">
+                {{ site.privacy_policy | safe }}
+            </div>
+        </div>
     </div>
 </div>
 
diff --git a/bookwyrm/templates/discover/discover.html b/bookwyrm/templates/discover/discover.html
index 5a808bf7..289e30d9 100644
--- a/bookwyrm/templates/discover/discover.html
+++ b/bookwyrm/templates/discover/discover.html
@@ -1,36 +1,5 @@
-{% extends 'layout.html' %}
-{% block content %}
-
-<header class="block has-text-centered">
-    <h1 class="title">{{ site.name }}</h1>
-    <h2 class="subtitle">{{ site.instance_tagline }}</h2>
-</header>
-
-{% include 'discover/icons.html' %}
-
-{% if not request.user.is_authenticated %}
-<section class="tile is-ancestor">
-    <div class="tile is-7 is-parent">
-        <div class="tile is-child box">
-            {% include 'snippets/about.html' %}
-        </div>
-    </div>
-    <div class="tile is-5 is-parent">
-        <div class="tile is-child box has-background-primary-light content">
-            {% if site.allow_registration %}
-            <h2 class="title">Join {{ site.name }}</h2>
-            <form name="register" method="post" action="/register">
-                {% include 'snippets/register_form.html' %}
-            </form>
-            {% else %}
-            <h2 class="title">This instance is closed</h2>
-            <p>{{ site.registration_closed_text | safe}}</p>
-            {% endif %}
-        </div>
-    </div>
-</section>
-
-{% endif %}
+{% extends 'discover/landing_layout.html' %}
+{% block panel %}
 
 <div class="block is-hidden-tablet">
     <h2 class="title has-text-centered">Recent Books</h2>
diff --git a/bookwyrm/templates/discover/landing_layout.html b/bookwyrm/templates/discover/landing_layout.html
new file mode 100644
index 00000000..2123ee98
--- /dev/null
+++ b/bookwyrm/templates/discover/landing_layout.html
@@ -0,0 +1,63 @@
+{% extends 'layout.html' %}
+{% load humanize %}
+{% load bookwyrm_tags %}
+{% block content %}
+
+<header class="block has-text-centered">
+    <h1 class="title">{{ site.name }}</h1>
+    <h2 class="subtitle">{{ site.instance_tagline }}</h2>
+</header>
+
+{% include 'discover/icons.html' %}
+
+<section class="tile is-ancestor">
+    <div class="tile is-7 is-parent">
+        <div class="tile is-child box">
+            {% include 'snippets/about.html' %}
+        </div>
+    </div>
+    <div class="tile is-5 is-parent">
+        {% if not request.user.is_authenticated %}
+        <div class="tile is-child box has-background-primary-light content">
+            {% if site.allow_registration %}
+            <h2 class="title">Join {{ site.name }}</h2>
+            <form name="register" method="post" action="/register">
+                {% include 'snippets/register_form.html' %}
+            </form>
+            {% else %}
+            <h2 class="title">This instance is closed</h2>
+            <p>{{ site.registration_closed_text | safe}}</p>
+            {% endif %}
+        </div>
+        {% else %}
+        <div class="tile is-child box has-background-white-bis">
+            <h2 class="title is-4">Your Account</h2>
+            <div class="media block">
+                <div class="media-left">
+                    <a href="{{ user.local_path }}">
+                    {% include 'snippets/avatar.html' with user=user large=True %}
+                    </a>
+                </div>
+                <div class="media-content">
+                    <p>{% if user.name %}{{ user.name }}{% else %}{{ user.localname }}{% endif %}</p>
+                    <p><a href="{{ user.remote_id }}">{{ user.username }}</a></p>
+                    <p>Joined {{ user.created_date | naturaltime }}</p>
+                    <p>
+                        <a href="{{ user.local_path }}/followers">{{ user.followers.count }} follower{{ user.followers.count | pluralize }}</a>,
+                        <a href="{{ user.local_path }}/following">{{ user.following.count }} following</a>
+                    </p>
+                </div>
+            </div>
+            <div class="box content">
+                {% if user.summary %}
+                {{ user.summary | to_markdown | safe }}
+                {% endif %}
+            </div>
+        </div>
+        {% endif %}
+    </div>
+</section>
+
+{% block panel %}{% endblock %}
+
+{% endblock %}
diff --git a/bookwyrm/templates/settings/site.html b/bookwyrm/templates/settings/site.html
index d071facf..9e67c839 100644
--- a/bookwyrm/templates/settings/site.html
+++ b/bookwyrm/templates/settings/site.html
@@ -23,6 +23,10 @@
             <label class="label" for="id_code_of_conduct">Code of conduct:</label>
             {{ site_form.code_of_conduct }}
         </div>
+        <div class="control">
+            <label class="label" for="id_privacy_policy">Privacy Policy:</label>
+            {{ site_form.privacy_policy }}
+        </div>
     </section>
 
     <hr aria-hidden="true">
diff --git a/bookwyrm/templates/user/user_layout.html b/bookwyrm/templates/user/user_layout.html
index 9abc469a..f48dfd38 100644
--- a/bookwyrm/templates/user/user_layout.html
+++ b/bookwyrm/templates/user/user_layout.html
@@ -10,7 +10,7 @@
 {# user bio #}
 <div class="block">
     <div class="columns">
-        <div class="column is-narrow">
+        <div class="column is-two-fifths">
             <div class="media">
                 <div class="media-left">
                     <a href="{{ user.local_path }}">
@@ -29,16 +29,9 @@
             </div>
         </div>
 
-        <div class="column">
+        <div class="column box has-background-white-bis content">
             {% if user.summary %}
-            <div class="columns">
-                <div class="column is-narrow">
-                    <span class="icon icon-quote-open"></span>
-                </div>
-                <div class="column">
-                    <blockquote>{{ user.summary | to_markdown | safe }}</blockquote>
-                </div>
-            </div>
+            {{ user.summary | to_markdown | safe }}
             {% endif %}
         </div>
     </div>

From ad2a87d317af1e012c69f1e55e016db40053513d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 27 Feb 2021 13:43:17 -0800
Subject: [PATCH 0101/1285] First pass at internationalization and localization

---
 bookwyrm/locale/en/LC_MESSAGES/django.po      | 69 +++++++++++++++++++
 bookwyrm/settings.py                          |  5 +-
 bookwyrm/templates/discover/icons.html        | 21 ------
 .../templates/discover/landing_layout.html    | 50 +++++++-------
 bookwyrm/templates/user/user_layout.html      | 28 ++------
 bookwyrm/templates/user/user_preview.html     | 20 ++++++
 6 files changed, 127 insertions(+), 66 deletions(-)
 create mode 100644 bookwyrm/locale/en/LC_MESSAGES/django.po
 delete mode 100644 bookwyrm/templates/discover/icons.html
 create mode 100644 bookwyrm/templates/user/user_preview.html

diff --git a/bookwyrm/locale/en/LC_MESSAGES/django.po b/bookwyrm/locale/en/LC_MESSAGES/django.po
new file mode 100644
index 00000000..dac50a1d
--- /dev/null
+++ b/bookwyrm/locale/en/LC_MESSAGES/django.po
@@ -0,0 +1,69 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-27 13:41-0800\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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: bookwyrm/templates/discover/landing_layout.html:15
+msgid "Decentralized"
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:21
+msgid "Friendly"
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:27
+msgid "Anti-Corporate"
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:42
+#, python-format
+msgid "Join %(name)s"
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:47
+msgid "This instance is closed"
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:53
+msgid "Your Account"
+msgstr ""
+
+#: bookwyrm/templates/user/user_layout.html:30
+msgid "Follow Requests"
+msgstr ""
+
+#: bookwyrm/templates/user/user_layout.html:48
+msgid "Activity"
+msgstr ""
+
+#: bookwyrm/templates/user/user_layout.html:54
+msgid "Reading Goal"
+msgstr ""
+
+#: bookwyrm/templates/user/user_layout.html:60
+msgid "Lists"
+msgstr ""
+
+#: bookwyrm/templates/user/user_layout.html:66
+msgid "Shelves"
+msgstr ""
+
+#: bookwyrm/templates/user/user_preview.html:13
+#, python-format
+msgid "Joined %(date)s"
+msgstr ""
diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 46c38b5a..2a2bf427 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -1,9 +1,10 @@
 ''' bookwyrm settings and configuration '''
 import os
-
 from environs import Env
 
 import requests
+from django.utils.translation import gettext_lazy as _
+
 
 env = Env()
 DOMAIN = env('DOMAIN')
@@ -27,6 +28,7 @@ EMAIL_USE_TLS = env('EMAIL_USE_TLS', True)
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+LOCALE_PATHS = [os.path.join(BASE_DIR, 'locale'),]
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/2.0/howto/deployment/checklist/
@@ -58,6 +60,7 @@ INSTALLED_APPS = [
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.locale.LocaleMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
diff --git a/bookwyrm/templates/discover/icons.html b/bookwyrm/templates/discover/icons.html
deleted file mode 100644
index a4086282..00000000
--- a/bookwyrm/templates/discover/icons.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<section class="level is-mobile">
-    <div class="level-item has-text-centered">
-        <div>
-            <p class="title has-text-weight-normal"><span class="icon icon-graphic-paperplane"></span></p>
-            <p class="heading">Decentralized</p>
-        </div>
-    </div>
-    <div class="level-item has-text-centered">
-        <div>
-            <p class="title has-text-weight-normal"><span class="icon icon-graphic-heart"></span></p>
-            <p class="heading">Friendly</p>
-        </div>
-    </div>
-    <div class="level-item has-text-centered">
-        <div>
-            <p class="title has-text-weight-normal"><span class="icon icon-graphic-banknote"></span></p>
-            <p class="heading">Anti-Corporate</p>
-        </div>
-    </div>
-</section>
-
diff --git a/bookwyrm/templates/discover/landing_layout.html b/bookwyrm/templates/discover/landing_layout.html
index 2123ee98..f6b86009 100644
--- a/bookwyrm/templates/discover/landing_layout.html
+++ b/bookwyrm/templates/discover/landing_layout.html
@@ -1,5 +1,5 @@
 {% extends 'layout.html' %}
-{% load humanize %}
+{% load i18n %}
 {% load bookwyrm_tags %}
 {% block content %}
 
@@ -8,7 +8,26 @@
     <h2 class="subtitle">{{ site.instance_tagline }}</h2>
 </header>
 
-{% include 'discover/icons.html' %}
+<section class="level is-mobile">
+    <div class="level-item has-text-centered">
+        <div>
+            <p class="title has-text-weight-normal"><span class="icon icon-graphic-paperplane"></span></p>
+            <p class="heading">{% trans "Decentralized" %}</p>
+        </div>
+    </div>
+    <div class="level-item has-text-centered">
+        <div>
+            <p class="title has-text-weight-normal"><span class="icon icon-graphic-heart"></span></p>
+            <p class="heading">{% trans "Friendly" %}</p>
+        </div>
+    </div>
+    <div class="level-item has-text-centered">
+        <div>
+            <p class="title has-text-weight-normal"><span class="icon icon-graphic-banknote"></span></p>
+            <p class="heading">{% trans "Anti-Corporate" %}</p>
+        </div>
+    </div>
+</section>
 
 <section class="tile is-ancestor">
     <div class="tile is-7 is-parent">
@@ -20,37 +39,22 @@
         {% if not request.user.is_authenticated %}
         <div class="tile is-child box has-background-primary-light content">
             {% if site.allow_registration %}
-            <h2 class="title">Join {{ site.name }}</h2>
+            <h2 class="title">{% blocktrans with name=site.name %}Join {{ name }}{% endblocktrans %}</h2>
             <form name="register" method="post" action="/register">
                 {% include 'snippets/register_form.html' %}
             </form>
             {% else %}
-            <h2 class="title">This instance is closed</h2>
+            <h2 class="title">{% trans "This instance is closed" %}</h2>
             <p>{{ site.registration_closed_text | safe}}</p>
             {% endif %}
         </div>
         {% else %}
         <div class="tile is-child box has-background-white-bis">
-            <h2 class="title is-4">Your Account</h2>
-            <div class="media block">
-                <div class="media-left">
-                    <a href="{{ user.local_path }}">
-                    {% include 'snippets/avatar.html' with user=user large=True %}
-                    </a>
-                </div>
-                <div class="media-content">
-                    <p>{% if user.name %}{{ user.name }}{% else %}{{ user.localname }}{% endif %}</p>
-                    <p><a href="{{ user.remote_id }}">{{ user.username }}</a></p>
-                    <p>Joined {{ user.created_date | naturaltime }}</p>
-                    <p>
-                        <a href="{{ user.local_path }}/followers">{{ user.followers.count }} follower{{ user.followers.count | pluralize }}</a>,
-                        <a href="{{ user.local_path }}/following">{{ user.following.count }} following</a>
-                    </p>
-                </div>
-            </div>
+            <h2 class="title is-4">{% trans "Your Account" %}</h2>
+            {% include 'user/user_preview.html' with user=request.user %}
             <div class="box content">
-                {% if user.summary %}
-                {{ user.summary | to_markdown | safe }}
+                {% if request.user.summary %}
+                {{ request.user.summary | to_markdown | safe }}
                 {% endif %}
             </div>
         </div>
diff --git a/bookwyrm/templates/user/user_layout.html b/bookwyrm/templates/user/user_layout.html
index f48dfd38..c8eea412 100644
--- a/bookwyrm/templates/user/user_layout.html
+++ b/bookwyrm/templates/user/user_layout.html
@@ -1,4 +1,5 @@
 {% extends 'layout.html' %}
+{% load i18n %}
 {% load humanize %}
 {% load bookwyrm_tags %}
 
@@ -11,22 +12,7 @@
 <div class="block">
     <div class="columns">
         <div class="column is-two-fifths">
-            <div class="media">
-                <div class="media-left">
-                    <a href="{{ user.local_path }}">
-                    {% include 'snippets/avatar.html' with user=user large=True %}
-                    </a>
-                </div>
-                <div class="media-content">
-                    <p>{% if user.name %}{{ user.name }}{% else %}{{ user.localname }}{% endif %}</p>
-                    <p><a href="{{ user.remote_id }}">{{ user.username }}</a></p>
-                    <p>Joined {{ user.created_date | naturaltime }}</p>
-                    <p>
-                        <a href="{{ user.local_path }}/followers">{{ user.followers.count }} follower{{ user.followers.count | pluralize }}</a>,
-                        <a href="{{ user.local_path }}/following">{{ user.following.count }} following</a>
-                    </p>
-                </div>
-            </div>
+            {% include 'user/user_preview.html' with user=user %}
         </div>
 
         <div class="column box has-background-white-bis content">
@@ -41,7 +27,7 @@
 
     {% if is_self and user.follower_requests.all %}
     <div class="follow-requests">
-        <h2>Follow Requests</h2>
+        <h2>{% trans "Follow Requests" %}</h2>
         {% for requester in user.follower_requests.all %}
             <div class="row shrink">
                 <p>
@@ -59,25 +45,25 @@
     <ul>
         {% url 'user-feed' user|username as url %}
         <li{% if url == request.path or url == request.path|add:'/' %} class="is-active"{% endif %}>
-            <a href="{{ url }}">Activity</a>
+            <a href="{{ url }}">{% trans "Activity" %}</a>
         </li>
         {% if is_self or user.goal.exists %}
         {% now 'Y' as year %}
         {% url 'user-goal' user|username year as url %}
         <li{% if url in request.path %} class="is-active"{% endif %}>
-            <a href="{{ url }}">Reading Goal</a>
+            <a href="{{ url }}">{% trans "Reading Goal" %}</a>
         </li>
         {% endif %}
         {% if is_self or user.lists.exists %}
         {% url 'user-lists' user|username as url %}
         <li{% if url in request.path %} class="is-active"{% endif %}>
-            <a href="{{ url }}">Lists</a>
+            <a href="{{ url }}">{% trans "Lists" %}</a>
         </li>
         {% endif %}
         {% if user.shelf_set.exists %}
         {% url 'user-shelves' user|username as url %}
         <li{% if url in request.path %} class="is-active"{% endif %}>
-            <a href="{{ url }}">Shelves</a>
+            <a href="{{ url }}">{% trans "Shelves" %}</a>
         </li>
         {% endif %}
     </ul>
diff --git a/bookwyrm/templates/user/user_preview.html b/bookwyrm/templates/user/user_preview.html
new file mode 100644
index 00000000..3158ff54
--- /dev/null
+++ b/bookwyrm/templates/user/user_preview.html
@@ -0,0 +1,20 @@
+{% load i18n %}
+{% load humanize %}
+
+<div class="media block">
+    <div class="media-left">
+        <a href="{{ user.local_path }}">
+        {% include 'snippets/avatar.html' with user=user large=True %}
+        </a>
+    </div>
+    <div class="media-content">
+        <p>{% if user.name %}{{ user.name }}{% else %}{{ user.localname }}{% endif %}</p>
+        <p><a href="{{ user.remote_id }}">{{ user.username }}</a></p>
+        <p>{% blocktrans with date=user.created_date|naturaltime %}Joined {{ date }}{% endblocktrans %}</p>
+        <p>
+            <a href="{{ user.local_path }}/followers">{{ user.followers.count }} follower{{ user.followers.count | pluralize }}</a>,
+            <a href="{{ user.local_path }}/following">{{ user.following.count }} following</a>
+        </p>
+    </div>
+</div>
+

From 2d3767bce8055dc93b0968e9cdcbc46397895f3d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 27 Feb 2021 13:47:10 -0800
Subject: [PATCH 0102/1285] Adds makemessages command to bw-dev shortcuts

---
 bw-dev | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bw-dev b/bw-dev
index f3162bd3..a0e06a22 100755
--- a/bw-dev
+++ b/bw-dev
@@ -90,6 +90,9 @@ case "$CMD" in
     collectstatic)
         execweb python manage.py collectstatic --no-input
         ;;
+    makemessages)
+        django-admin makemessages --extension html --ignore=venv3 --local=$@
+        ;;
     build)
         docker-compose build
         ;;

From 791968ece59423519000fdf9a629211d99fb738a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 27 Feb 2021 13:51:03 -0800
Subject: [PATCH 0103/1285] updating language file defaults

---
 bookwyrm/locale/en/LC_MESSAGES/django.po | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/bookwyrm/locale/en/LC_MESSAGES/django.po b/bookwyrm/locale/en/LC_MESSAGES/django.po
index dac50a1d..c09ee9d1 100644
--- a/bookwyrm/locale/en/LC_MESSAGES/django.po
+++ b/bookwyrm/locale/en/LC_MESSAGES/django.po
@@ -1,18 +1,18 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# English language text for the bookwyrm UI
+# Copyright (C) Mouse Reeve
+# This file is distributed under the same license as the bookwyrm package.
+# Mouse Reeve <mousereeve@riseup.net>, 2021
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-27 13:41-0800\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"
-"Language: \n"
+"POT-Creation-Date: 2021-02-27 13:46-0800\n"
+"PO-Revision-Date: 2021-02-27 13:50+PST\n"
+"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
+"Language-Team: Mouse Reeve <LL@li.org>\n"
+"Language: English \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

From 8e5e3a84d63adc3cc6fe4afb3ecf5174e12e9b26 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 27 Feb 2021 14:22:39 -0800
Subject: [PATCH 0104/1285] Quick first pass at tagging strings for
 localization

---
 README.md                                     |   4 +
 bookwyrm/locale/en/LC_MESSAGES/django.po      | 359 +++++++++++++++++-
 bookwyrm/templates/author.html                |   9 +-
 bookwyrm/templates/book.html                  |  40 +-
 bookwyrm/templates/edit_author.html           |  24 +-
 bookwyrm/templates/error.html                 |   4 +-
 bookwyrm/templates/goal.html                  |   4 +-
 bookwyrm/templates/import.html                |  14 +-
 bookwyrm/templates/import_status.html         |  28 +-
 bookwyrm/templates/invite.html                |   6 +-
 bookwyrm/templates/layout.html                |  16 +-
 bookwyrm/templates/login.html                 |  18 +-
 bookwyrm/templates/notifications.html         |   6 +-
 .../templates/password_reset_request.html     |   8 +-
 bookwyrm/templates/search_results.html        |  16 +-
 bookwyrm/templates/tag.html                   |   2 +-
 16 files changed, 456 insertions(+), 102 deletions(-)

diff --git a/README.md b/README.md
index 3db6dd92..18463f38 100644
--- a/README.md
+++ b/README.md
@@ -30,6 +30,10 @@ Code contributions are gladly welcomed! If you're not sure where to start, take
 
 If you have questions about the project or contributing, you can set up a video call during BookWyrm ["office hours"](https://calendly.com/mouse-reeve/30min).
 
+### Translation
+Do you speak a language besides English? BookWyrm needs localization! Existing language files can be found in `bookwyrm/locale/`, and you can generate a language file for a language that isn't currently supported by running:
+`./bw-dev makemessages <language code>`
+
 ### Financial Support
 BookWyrm is an ad-free passion project with no intentions of seeking out venture funding or corporate financial relationships. If you want to help keep the project going, you can donate to the [Patreon](https://www.patreon.com/bookwyrm), or make a one time gift via [PayPal](https://paypal.me/oulipo).
 
diff --git a/bookwyrm/locale/en/LC_MESSAGES/django.po b/bookwyrm/locale/en/LC_MESSAGES/django.po
index c09ee9d1..344c301f 100644
--- a/bookwyrm/locale/en/LC_MESSAGES/django.po
+++ b/bookwyrm/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-27 13:46-0800\n"
+"POT-Creation-Date: 2021-02-27 14:21-0800\n"
 "PO-Revision-Date: 2021-02-27 13:50+PST\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -18,6 +18,92 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: bookwyrm/templates/author.html:13 bookwyrm/templates/author.html:14
+msgid "Edit Author"
+msgstr ""
+
+#: bookwyrm/templates/author.html:29
+msgid "Wikipedia"
+msgstr ""
+
+#: bookwyrm/templates/author.html:34
+#, python-format
+msgid "Books by %(name)s"
+msgstr ""
+
+#: bookwyrm/templates/book.html:27 bookwyrm/templates/book.html:28
+msgid "Edit Book"
+msgstr ""
+
+#: bookwyrm/templates/book.html:43
+msgid "Add cover"
+msgstr ""
+
+#: bookwyrm/templates/book.html:49
+msgid "Add"
+msgstr ""
+
+#: bookwyrm/templates/book.html:58
+msgid "ISBN:"
+msgstr ""
+
+#: bookwyrm/templates/book.html:65
+msgid "OCLC Number:"
+msgstr ""
+
+#: bookwyrm/templates/book.html:72
+msgid "ASIN:"
+msgstr ""
+
+#: bookwyrm/templates/book.html:84
+msgid "View on OpenLibrary"
+msgstr ""
+
+#: bookwyrm/templates/book.html:102
+msgid "Description:"
+msgstr ""
+
+#: bookwyrm/templates/book.html:106 bookwyrm/templates/edit_author.html:74
+msgid "Save"
+msgstr ""
+
+#: bookwyrm/templates/book.html:138
+msgid "Your reading activity"
+msgstr ""
+
+#: bookwyrm/templates/book.html:144
+msgid "You don't have any reading activity for this book."
+msgstr ""
+
+#: bookwyrm/templates/book.html:151
+msgid "Create"
+msgstr ""
+
+#: bookwyrm/templates/book.html:172
+msgid "Tags"
+msgstr ""
+
+#: bookwyrm/templates/book.html:176
+msgid "Add tag"
+msgstr ""
+
+#: bookwyrm/templates/book.html:193
+msgid "Subjects"
+msgstr ""
+
+#: bookwyrm/templates/book.html:204
+msgid "Places"
+msgstr ""
+
+#: bookwyrm/templates/book.html:215 bookwyrm/templates/search_results.html:84
+#: bookwyrm/templates/user/user_layout.html:60
+msgid "Lists"
+msgstr ""
+
+#: bookwyrm/templates/book.html:244
+msgid "rated it"
+msgstr ""
+
 #: bookwyrm/templates/discover/landing_layout.html:15
 msgid "Decentralized"
 msgstr ""
@@ -36,6 +122,7 @@ msgid "Join %(name)s"
 msgstr ""
 
 #: bookwyrm/templates/discover/landing_layout.html:47
+#: bookwyrm/templates/login.html:45
 msgid "This instance is closed"
 msgstr ""
 
@@ -43,6 +130,272 @@ msgstr ""
 msgid "Your Account"
 msgstr ""
 
+#: bookwyrm/templates/edit_author.html:27
+msgid "Metadata"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:28
+msgid "Name:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:33
+msgid "Bio:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:38
+msgid "Wikipedia link:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:43
+msgid "Birth date:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:48
+msgid "Death date:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:54
+msgid "Author Identifiers"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:55
+msgid "Openlibrary key:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:60
+msgid "Librarything key:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:65
+msgid "Goodreads key:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:75
+msgid "Cancel"
+msgstr ""
+
+#: bookwyrm/templates/error.html:5
+msgid "Server Error"
+msgstr ""
+
+#: bookwyrm/templates/error.html:6
+msgid "Something went wrong! Sorry about that."
+msgstr ""
+
+#: bookwyrm/templates/goal.html:6
+#, python-format
+msgid "%(year)s Reading Progress"
+msgstr ""
+
+#: bookwyrm/templates/goal.html:28
+#, python-format
+msgid ""
+"Set a goal for how many books you'll finish reading in %(year)s, and track "
+"your progress throughout the year."
+msgstr ""
+
+#: bookwyrm/templates/import.html:5
+msgid "Import Books"
+msgstr ""
+
+#: bookwyrm/templates/import.html:10
+msgid "Data source"
+msgstr ""
+
+#: bookwyrm/templates/import.html:28
+msgid "Include reviews"
+msgstr ""
+
+#: bookwyrm/templates/import.html:33
+msgid "Privacy setting for imported reviews:"
+msgstr ""
+
+#: bookwyrm/templates/import.html:37
+msgid "Import"
+msgstr ""
+
+#: bookwyrm/templates/import.html:42
+msgid "Recent Imports"
+msgstr ""
+
+#: bookwyrm/templates/import.html:44
+msgid "No recent imports"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:6
+msgid "Import Status"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:9
+msgid "Import started: "
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:13
+msgid "Import completed: "
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:16
+msgid "TASK FAILED"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:22
+msgid "Import still in progress."
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:24
+msgid "(Hit reload to update!)"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:31
+msgid "Failed to load"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:55
+msgid "Select all"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:58
+msgid "Retry items"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:80
+msgid "Successfully imported"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:84
+msgid "Book"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:87
+msgid "Title"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:90
+msgid "Author"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:113
+msgid "Imported"
+msgstr ""
+
+#: bookwyrm/templates/invite.html:8 bookwyrm/templates/login.html:40
+msgid "Create an Account"
+msgstr ""
+
+#: bookwyrm/templates/invite.html:17
+msgid "Permission Denied"
+msgstr ""
+
+#: bookwyrm/templates/invite.html:18
+msgid "Sorry! This invite code is no longer valid."
+msgstr ""
+
+#: bookwyrm/templates/layout.html:37
+msgid "search"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:47
+msgid "Main navigation menu"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:125 bookwyrm/templates/notifications.html:6
+msgid "Notifications"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:142 bookwyrm/templates/layout.html:146
+#: bookwyrm/templates/login.html:14
+msgid "Username:"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:151 bookwyrm/templates/login.html:7
+#: bookwyrm/templates/login.html:30
+msgid "Log in"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:182
+msgid "About this server"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:186
+msgid "Contact site admin"
+msgstr ""
+
+#: bookwyrm/templates/login.html:20
+msgid "Password:"
+msgstr ""
+
+#: bookwyrm/templates/login.html:33
+msgid "Forgot your password?"
+msgstr ""
+
+#: bookwyrm/templates/login.html:46
+msgid "Contact an administrator to get an invite"
+msgstr ""
+
+#: bookwyrm/templates/login.html:56
+msgid "More about this site"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:10
+msgid "Delete notifications"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:101
+msgid "You're all caught up!"
+msgstr ""
+
+#: bookwyrm/templates/password_reset_request.html:7
+msgid "Reset Password"
+msgstr ""
+
+#: bookwyrm/templates/password_reset_request.html:9
+msgid "A link to reset your password will be sent to your email address"
+msgstr ""
+
+#: bookwyrm/templates/password_reset_request.html:13
+msgid "Email address:"
+msgstr ""
+
+#: bookwyrm/templates/password_reset_request.html:20
+msgid "Reset password"
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:10
+msgid "Matching Books"
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:13
+#, python-format
+msgid "No books found for \"%(query)s\""
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:29
+msgid "Didn't find what you were looking for?"
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:52
+msgid "Import book"
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:69
+msgid "Matching Users"
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:71
+#, python-format
+msgid "No users found for \"%(query)s\""
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:86
+#, python-format
+msgid "No lists found for \"%(query)s\""
+msgstr ""
+
+#: bookwyrm/templates/tag.html:6
+#, python-format
+msgid "Books tagged \"%(tag.name)s\""
+msgstr ""
+
 #: bookwyrm/templates/user/user_layout.html:30
 msgid "Follow Requests"
 msgstr ""
@@ -55,10 +408,6 @@ msgstr ""
 msgid "Reading Goal"
 msgstr ""
 
-#: bookwyrm/templates/user/user_layout.html:60
-msgid "Lists"
-msgstr ""
-
 #: bookwyrm/templates/user/user_layout.html:66
 msgid "Shelves"
 msgstr ""
diff --git a/bookwyrm/templates/author.html b/bookwyrm/templates/author.html
index 9f2054d0..9dd83189 100644
--- a/bookwyrm/templates/author.html
+++ b/bookwyrm/templates/author.html
@@ -1,4 +1,5 @@
 {% extends 'layout.html' %}
+{% load i18n %}
 {% load bookwyrm_tags %}
 {% block content %}
 <div class="block">
@@ -9,8 +10,8 @@
         {% if request.user.is_authenticated and perms.bookwyrm.edit_book %}
         <div class="column is-narrow">
             <a href="{{ author.local_path }}/edit">
-                <span class="icon icon-pencil" title="Edit Author">
-                    <span class="is-sr-only">Edit Author</span>
+                <span class="icon icon-pencil" title="{% trans 'Edit Author' %}">
+                    <span class="is-sr-only">{% trans "Edit Author" %}</span>
                 </span>
             </a>
         </div>
@@ -25,12 +26,12 @@
     </p>
     {% endif %}
     {% if author.wikipedia_link %}
-    <p><a href="{{ author.wikipedia_link }}" rel=�noopener� target="_blank">Wikipedia</a></p>
+    <p><a href="{{ author.wikipedia_link }}" rel=�noopener� target="_blank">{% trans "Wikipedia" %}</a></p>
     {% endif %}
 </div>
 
 <div class="block">
-    <h3 class="title is-4">Books by {{ author.name }}</h3>
+    <h3 class="title is-4">{% blocktrans with name=author.name %}Books by {{ name }}{% endblocktrans %}</h3>
     {% include 'snippets/book_tiles.html' with books=books %}
 </div>
 {% endblock %}
diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html
index dc7d4ce8..35ddba37 100644
--- a/bookwyrm/templates/book.html
+++ b/bookwyrm/templates/book.html
@@ -1,4 +1,5 @@
 {% extends 'layout.html' %}
+{% load i18n %}
 {% load bookwyrm_tags %}
 {% load humanize %}
 {% block content %}
@@ -23,8 +24,8 @@
         {% if request.user.is_authenticated and perms.bookwyrm.edit_book %}
         <div class="column is-narrow">
             <a href="{{ book.id }}/edit">
-                <span class="icon icon-pencil" title="Edit Book">
-                    <span class="is-sr-only">Edit Book</span>
+                <span class="icon icon-pencil" title="{% trans "Edit Book" %}">
+                    <span class="is-sr-only">{% trans "Edit Book" %}</span>
                 </span>
             </a>
         </div>
@@ -39,13 +40,13 @@
 
             {% if request.user.is_authenticated and not book.cover %}
             <div class="box p-2">
-                <h3 class="title is-6 mb-1">Add cover</h3>
+                <h3 class="title is-6 mb-1">{% trans "Add cover" %}</h3>
                 <form name="add-cover" method="POST" action="/upload-cover/{{ book.id }}" enctype="multipart/form-data">
                     {% csrf_token %}
                     <label class="label">
                         <input type="file" name="cover" accept="image/*" enctype="multipart/form-data" id="id_cover" required>
                     </label>
-                    <button class="button is-small is-primary" type="submit">Add</button>
+                    <button class="button is-small is-primary" type="submit">{% trans "Add" %}</button>
                 </form>
             </div>
             {% endif %}
@@ -54,21 +55,21 @@
                 <dl>
                     {% if book.isbn_13 %}
                     <div class="is-flex is-justify-content-space-between">
-                        <dt>ISBN:</dt>
+                        <dt>{% trans "ISBN:" %}</dt>
                         <dd>{{ book.isbn_13 }}</dd>
                     </div>
                     {% endif %}
 
                     {% if book.oclc_number %}
                     <div class="is-flex is-justify-content-space-between">
-                        <dt>OCLC Number:</dt>
+                        <dt>{% trans "OCLC Number:" %}</dt>
                         <dd>{{ book.oclc_number }}</dd>
                     </div>
                     {% endif %}
 
                     {% if book.asin %}
                     <div class="is-flex is-justify-content-space-between">
-                        <dt>ASIN:</dt>
+                        <dt>{% trans "ASIN:" %}</dt>
                         <dd>{{ book.asin }}</dd>
                     </div>
                     {% endif %}
@@ -80,7 +81,7 @@
                 </p>
 
                 {% if book.openlibrary_key %}
-                <p><a href="https://openlibrary.org/books/{{ book.openlibrary_key }}" target="_blank" rel="noopener">View on OpenLibrary</a></p>
+                <p><a href="https://openlibrary.org/books/{{ book.openlibrary_key }}" target="_blank" rel="noopener">{% trans "View on OpenLibrary" %}</a></p>
                 {% endif %}
             </section>
         </div>
@@ -98,11 +99,11 @@
                     <form name="add-description" method="POST" action="/add-description/{{ book.id }}">
                         {% csrf_token %}
                         <p class="fields is-grouped">
-                            <label class="label"for="id_description">Description:</label>
+                            <label class="label"for="id_description">{% trans "Description:" %}</label>
                             <textarea name="description" cols="None" rows="None" class="textarea" id="id_description"></textarea>
                         </p>
                         <div class="field">
-                            <button class="button is-primary" type="submit">Save</button>
+                            <button class="button is-primary" type="submit">{% trans "Save" %}</button>
                             {% include 'snippets/toggle/close_button.html' with text="Cancel" controls_text="add-description" controls_uid=book.id hide_inactive=True %}
                         </div>
                     </form>
@@ -134,20 +135,20 @@
             {% if request.user.is_authenticated %}
             <section class="block">
                 <header class="columns">
-                    <h2 class="column title is-5 mb-1">Your reading activity</h2>
+                    <h2 class="column title is-5 mb-1">{% trans "Your reading activity" %}</h2>
                     <div class="column is-narrow">
                         {% include 'snippets/toggle/open_button.html' with text="Add read dates" icon="plus" class="is-small" controls_text="add-readthrough" %}
                     </div>
                 </header>
                 {% if not readthroughs.exists %}
-                <p>You don't have any reading activity for this book.</p>
+                <p>{% trans "You don't have any reading activity for this book." %}</p>
                 {% endif %}
                 <section class="hidden box" id="add-readthrough">
                     <form name="add-readthrough" action="/create-readthrough" method="post">
                         {% include 'snippets/readthrough_form.html' with readthrough=None %}
                         <div class="field is-grouped">
                             <div class="control">
-                                <button class="button is-primary" type="submit">Create</button>
+                                <button class="button is-primary" type="submit">{% trans "Create" %}</button>
                             </div>
                             <div class="control">
                                 {% include 'snippets/toggle/close_button.html' with text="Cancel" controls_text="add-readthrough" %}
@@ -168,11 +169,11 @@
 
             <section class="block">
                 <form name="tag" action="/tag/" method="post">
-                    <label for="tags" class="is-3">Tags</label>
+                    <label for="tags" class="is-3">{% trans "Tags" %}</label>
                     {% csrf_token %}
                     <input type="hidden" name="book" value="{{ book.id }}">
                     <input id="tags" class="input" type="text" name="name">
-                    <button class="button" type="submit">Add tag</button>
+                    <button class="button" type="submit">{% trans "Add tag" %}</button>
                 </form>
             </section>
             {% endif %}
@@ -189,7 +190,7 @@
         <div class="column is-narrow">
             {% if book.subjects %}
             <section class="content block">
-                <h2 class="title is-5">Subjects</h2>
+                <h2 class="title is-5">{% trans "Subjects" %}</h2>
                 <ul>
                 {% for subject in book.subjects %}
                     <li>{{ subject }}</li>
@@ -200,7 +201,7 @@
 
             {% if book.subject_places %}
             <section class="content block">
-                <h2 class="title is-5">Places</h2>
+                <h2 class="title is-5">{% trans "Places" %}</h2>
                 <ul>
                 {% for place in book.subject_placess %}
                     <li>{{ place }}</li>
@@ -211,7 +212,7 @@
 
             {% if lists.exists %}
             <section class="content block">
-                <h2 class="title is-5">Lists</h2>
+                <h2 class="title is-5">{% trans "Lists" %}</h2>
                 <ul>
                 {% for list in lists %}
                 <li><a href="{{ list.local_path }}">{{ list.name }}</a></li>
@@ -240,7 +241,7 @@
                         {% include 'snippets/username.html' with user=rating.user %}
                     </div>
                     <div class="field is-grouped mb-0">
-                        <div>rated it</div>
+                        <div>{% trans "rated it" %}</div>
                         {% include 'snippets/stars.html' with rating=rating.rating %}
                     </div>
                     <div>
@@ -257,4 +258,3 @@
 </div>
 
 {% endblock %}
-
diff --git a/bookwyrm/templates/edit_author.html b/bookwyrm/templates/edit_author.html
index e007e69b..056567d6 100644
--- a/bookwyrm/templates/edit_author.html
+++ b/bookwyrm/templates/edit_author.html
@@ -24,45 +24,45 @@
 
     <div class="columns">
         <div class="column">
-            <h2 class="title is-4">Metadata</h2>
-            <p><label class="label" for="id_name">Name:</label> {{ form.name }}</p>
+            <h2 class="title is-4">{% trans "Metadata" %}</h2>
+            <p><label class="label" for="id_name">{% trans "Name:" %}</label> {{ form.name }}</p>
             {% for error in form.name.errors %}
             <p class="help is-danger">{{ error | escape }}</p>
             {% endfor %}
 
-            <p><label class="label" for="id_bio">Bio:</label> {{ form.bio }}</p>
+            <p><label class="label" for="id_bio">{% trans "Bio:" %}</label> {{ form.bio }}</p>
             {% for error in form.bio.errors %}
             <p class="help is-danger">{{ error | escape }}</p>
             {% endfor %}
 
-            <p><label class="label" for="id_wikipedia_link">Wikipedia link:</label> {{ form.wikipedia_link }}</p>
+            <p><label class="label" for="id_wikipedia_link">{% trans "Wikipedia link:" %}</label> {{ form.wikipedia_link }}</p>
             {% for error in form.wikipedia_link.errors %}
             <p class="help is-danger">{{ error | escape }}</p>
             {% endfor %}
 
-            <p><label class="label" for="id_born">Birth date:</label> {{ form.born }}</p>
+            <p><label class="label" for="id_born">{% trans "Birth date:" %}</label> {{ form.born }}</p>
             {% for error in form.born.errors %}
             <p class="help is-danger">{{ error | escape }}</p>
             {% endfor %}
 
-            <p><label class="label" for="id_died">Death date:</label> {{ form.died }}</p>
+            <p><label class="label" for="id_died">{% trans "Death date:" %}</label> {{ form.died }}</p>
             {% for error in form.died.errors %}
             <p class="help is-danger">{{ error | escape }}</p>
             {% endfor %}
         </div>
         <div class="column">
-            <h2 class="title is-4">Author Identifiers</h2>
-            <p><label class="label" for="id_openlibrary_key">Openlibrary key:</label> {{ form.openlibrary_key }}</p>
+            <h2 class="title is-4">{% trans "Author Identifiers" %}</h2>
+            <p><label class="label" for="id_openlibrary_key">{% trans "Openlibrary key:" %}</label> {{ form.openlibrary_key }}</p>
             {% for error in form.openlibrary_key.errors %}
             <p class="help is-danger">{{ error | escape }}</p>
             {% endfor %}
 
-            <p><label class="label" for="id_librarything_key">Librarything key:</label> {{ form.librarything_key }}</p>
+            <p><label class="label" for="id_librarything_key">{% trans "Librarything key:" %}</label> {{ form.librarything_key }}</p>
             {% for error in form.librarything_key.errors %}
             <p class="help is-danger">{{ error | escape }}</p>
             {% endfor %}
 
-            <p><label class="label" for="id_goodreads_key">Goodreads key:</label> {{ form.goodreads_key }}</p>
+            <p><label class="label" for="id_goodreads_key">{% trans "Goodreads key:" %}</label> {{ form.goodreads_key }}</p>
             {% for error in form.goodreads_key.errors %}
             <p class="help is-danger">{{ error | escape }}</p>
             {% endfor %}
@@ -71,8 +71,8 @@
     </div>
 
     <div class="block">
-        <button class="button is-primary" type="submit">Save</button>
-        <a class="button" href="/author/{{ author.id }}">Cancel</a>
+        <button class="button is-primary" type="submit">{% trans "Save" %}</button>
+        <a class="button" href="/author/{{ author.id }}">{% trans "Cancel" %}</a>
     </div>
 </form>
 
diff --git a/bookwyrm/templates/error.html b/bookwyrm/templates/error.html
index 6405dc5a..fbf96ba2 100644
--- a/bookwyrm/templates/error.html
+++ b/bookwyrm/templates/error.html
@@ -2,8 +2,8 @@
 {% block content %}
 
 <div class="block">
-    <h1 class="title">Server Error</h1>
-    <p>Something went wrong! Sorry about that.</p>
+    <h1 class="title">{% trans "Server Error" %}</h1>
+    <p>{% trans "Something went wrong! Sorry about that." %}</p>
 </div>
 
 {% endblock %}
diff --git a/bookwyrm/templates/goal.html b/bookwyrm/templates/goal.html
index 0dc0aef8..f91a1ac7 100644
--- a/bookwyrm/templates/goal.html
+++ b/bookwyrm/templates/goal.html
@@ -3,7 +3,7 @@
 {% block header %}
 <div class="columns is-mobile">
     <div class="column">
-        <h1 class="title">{{ year }} Reading Progress</h1>
+        <h1 class="title">{% blocktrans %}{{ year }} Reading Progress{% endblocktrans %}</h1>
     </div>
     {% if is_self and goal %}
     <div class="column is-narrow">
@@ -25,7 +25,7 @@
                 </h2>
             </header>
             <section class="card-content content">
-                <p>Set a goal for how many books you'll finish reading in {{ year }}, and track your progress throughout the year.</p>
+                <p>{% blocktrans %}Set a goal for how many books you'll finish reading in {{ year }}, and track your progress throughout the year.{% endblocktrans %}</p>
 
                 {% include 'snippets/goal_form.html' with goal=goal year=year %}
             </section>
diff --git a/bookwyrm/templates/import.html b/bookwyrm/templates/import.html
index a7fde76d..ee1a90a4 100644
--- a/bookwyrm/templates/import.html
+++ b/bookwyrm/templates/import.html
@@ -2,12 +2,12 @@
 {% load humanize %}
 {% block content %}
 <div class="block">
-    <h1 class="title">Import Books</h1>
+    <h1 class="title">{% trans "Import Books" %}</h1>
     <form name="import" action="/import" method="post" enctype="multipart/form-data">
         {% csrf_token %}
 
         <label class="label" for="source">
-          <p>Data source</p>
+          <p>{% trans "Data source" %}</p>
         <div class="select {{ class }}">
           <select name="source" id="source">
             <option value="GoodReads" {% if current == 'GoodReads' %}selected{% endif %}>
@@ -25,23 +25,23 @@
         </div>
         <div class="field">
             <label class="label">
-                <input type="checkbox" name="include_reviews" checked> Include reviews
+                <input type="checkbox" name="include_reviews" checked> {% trans "Include reviews" %}
             </label>
         </div>
         <div class="field">
             <label class="label">
-                <p>Privacy setting for imported reviews:</p>
+                <p>{% trans "Privacy setting for imported reviews:" %}</p>
                 {% include 'snippets/privacy_select.html' with no_label=True %}
             </label>
         </div>
-        <button class="button is-primary" type="submit">Import</button>
+        <button class="button is-primary" type="submit">{% trans "Import" %}</button>
     </form>
 </div>
 
 <div class="content block">
-    <h2 class="title">Recent Imports</h2>
+    <h2 class="title">{% trans "Recent Imports" %}</h2>
     {% if not jobs %}
-    <p>No recent imports</p>
+    <p>{% trans "No recent imports" %}</p>
     {% endif %}
     <ul>
         {% for job in jobs %}
diff --git a/bookwyrm/templates/import_status.html b/bookwyrm/templates/import_status.html
index 66b3fb67..4c3d46d3 100644
--- a/bookwyrm/templates/import_status.html
+++ b/bookwyrm/templates/import_status.html
@@ -3,32 +3,32 @@
 {% load humanize %}
 {% block content %}
 <div class="block">
-    <h1 class="title">Import Status</h1>
+    <h1 class="title">{% trans "Import Status" %}</h1>
 
     <p>
-        Import started: {{ job.created_date | naturaltime }}
+        {% trans "Import started: " %}{{ job.created_date | naturaltime }}
     </p>
     {% if job.complete %}
     <p>
-        Import completed: {{ task.date_done | naturaltime }}
+        {% trans "Import completed: " %}{{ task.date_done | naturaltime }}
     </p>
     {% elif task.failed %}
-    <div class="notification is-danger">TASK FAILED</div>
+    <div class="notification is-danger">{% trans "TASK FAILED" %}</div>
     {% endif %}
 </div>
 
 <div class="block">
     {% if not job.complete %}
-    Import still in progress.
+    {% trans "Import still in progress." %}
     <p>
-        (Hit reload to update!)
+        {% trans "(Hit reload to update!)" %}
     </p>
     {% endif %}
 </div>
 
 {% if failed_items %}
 <div class="block">
-    <h2 class="title is-4">Failed to load</h2>
+    <h2 class="title is-4">{% trans "Failed to load" %}</h2>
     {% if not job.retry %}
     <form name="retry" action="/import/{{ job.id }}" method="post">
         {% csrf_token %}
@@ -52,10 +52,10 @@
         <div class="block pt-1 select-all">
             <label class="label">
                 <input type="checkbox" class="checkbox">
-                Select all
+                {% trans "Select all" %}
             </label>
         </div>
-        <button class="button" type="submit">Retry items</button>
+        <button class="button" type="submit">{% trans "Retry items" %}</button>
         {% else %}
         <ul>
             {% for item in failed_items %}
@@ -77,17 +77,17 @@
 {% endif %}
 
 <div class="block">
-    <h2 class="title is-4">Successfully imported</h2>
+    <h2 class="title is-4">{% trans "Successfully imported" %}</h2>
     <table class="table">
         <tr>
             <th>
-                Book
+                {% trans "Book" %}
             </th>
             <th>
-                Title
+                {% trans "Title" %}
             </th>
             <th>
-                Author
+                {% trans "Author" %}
             </th>
             <th>
             </th>
@@ -110,7 +110,7 @@
             <td>
                 {% if item.book %}
                 <span class="icon icon-check">
-                    <span class="is-sr-only">Imported</span>
+                    <span class="is-sr-only">{% trans "Imported" %}</span>
                 </span>
                 {% endif %}
             </td>
diff --git a/bookwyrm/templates/invite.html b/bookwyrm/templates/invite.html
index 3345424c..b01afec3 100644
--- a/bookwyrm/templates/invite.html
+++ b/bookwyrm/templates/invite.html
@@ -5,7 +5,7 @@
     <div class="column">
         <div class="block">
             {% if valid %}
-            <h1 class="title">Create an Account</h1>
+            <h1 class="title">{% trans "Create an Account" %}</h1>
             <div>
                 <form name="register" method="post" action="/register">
                     <input type=hidden name="invite_code" value="{{ invite.code }}">
@@ -14,8 +14,8 @@
             </div>
             {% else %}
             <div class="content">
-                <h1 class="title">Permission Denied</h1>
-                <p>Sorry! This invite code is no longer valid.</p>
+                <h1 class="title">{% trans "Permission Denied" %}</h1>
+                <p>{% trans "Sorry! This invite code is no longer valid." %}</p>
             </div>
             {% endif %}
         </div>
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index fe8a7509..5f75e122 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -34,7 +34,7 @@
                 <div class="control">
                     <button class="button" type="submit">
                         <span class="icon icon-search" title="Search">
-                            <span class="is-sr-only">search</span>
+                            <span class="is-sr-only">{% trans "search" %}</span>
                         </span>
                     </button>
                 </div>
@@ -44,7 +44,7 @@
         <div role="button" tabindex="0" class="navbar-burger pulldown-menu" data-controls="main-nav" aria-expanded="false">
             <div class="navbar-item mt-3">
                 <div class="icon icon-dots-three-vertical" title="Main navigation menu">
-                    <span class="is-sr-only">Main navigation menu</span>
+                    <span class="is-sr-only">{% trans "Main navigation menu" %}</span>
                 </div>
             </div>
         </div>
@@ -122,7 +122,7 @@
                 <a href="/notifications" class="tags has-addons">
                     <span class="tag is-medium">
                         <span class="icon icon-bell" title="Notifications">
-                            <span class="is-sr-only">Notifications</span>
+                            <span class="is-sr-only">{% trans "Notifications" %}</span>
                         </span>
                     </span>
                     <span class="{% if not request.user|notification_count %}hidden {% endif %}tag is-danger is-medium" data-poll="notifications">
@@ -139,16 +139,16 @@
                             {% csrf_token %}
                             <div class="columns is-variable is-1">
                                 <div class="column">
-                                    <label class="is-sr-only" for="id_localname">Username:</label>
+                                    <label class="is-sr-only" for="id_localname">{% trans "Username:" %}</label>
                                     <input type="text" name="localname" maxlength="150" class="input" required="" id="id_localname" placeholder="username">
                                 </div>
                                 <div class="column">
-                                    <label class="is-sr-only" for="id_password">Username:</label>
+                                    <label class="is-sr-only" for="id_password">{% trans "Username:" %}</label>
                                     <input type="password" name="password" maxlength="128" class="input" required="" id="id_password" placeholder="password">
                                     <p class="help"><a href="/password-reset">Forgot your password?</a></p>
                                 </div>
                                 <div class="column is-narrow">
-                                    <button class="button is-primary" type="submit">Log in</button>
+                                    <button class="button is-primary" type="submit">{% trans "Log in" %}</button>
                                 </div>
                             </div>
                         </form>
@@ -179,11 +179,11 @@
         <div class="columns">
             <div class="column">
                 <p>
-                    <a href="/about">About this server</a>
+                    <a href="/about">{% trans "About this server" %}</a>
                 </p>
                 {% if site.admin_email %}
                 <p>
-                    <a href="mailto:{{ site.admin_email }}">Contact site admin</a>
+                    <a href="mailto:{{ site.admin_email }}">{% trans "Contact site admin" %}</a>
                 </p>
                 {% endif %}
             </div>
diff --git a/bookwyrm/templates/login.html b/bookwyrm/templates/login.html
index 68342210..104e8ef7 100644
--- a/bookwyrm/templates/login.html
+++ b/bookwyrm/templates/login.html
@@ -4,20 +4,20 @@
 <div class="columns">
     <div class="column">
         <div class="box">
-            <h1 class="title">Log in</h1>
+            <h1 class="title">{% trans "Log in" %}</h1>
             {% if login_form.non_field_errors %}
             <p class="notification is-danger">{{ login_form.non_field_errors }}</p>
             {% endif %}
             <form name="login" method="post" action="/login">
                 {% csrf_token %}
                 <div class="field">
-                    <label class="label" for="id_localname">Username:</label>
+                    <label class="label" for="id_localname">{% trans "Username:" %}</label>
                     <div class="control">
                         {{ login_form.localname }}
                     </div>
                 </div>
                 <div class="field">
-                    <label class="label" for="id_password">Password:</label>
+                    <label class="label" for="id_password">{% trans "Password:" %}</label>
                     <div class="control">
                         {{ login_form.password }}
                     </div>
@@ -27,23 +27,23 @@
                 </div>
                 <div class="field is-grouped">
                     <div class="control">
-                        <button class="button is-primary" type="submit">Log in</button>
+                        <button class="button is-primary" type="submit">{% trans "Log in" %}</button>
                     </div>
                     <div class="control">
-                        <small><a href="/password-reset">Forgot your password?</a></small>
+                        <small><a href="/password-reset">{% trans "Forgot your password?" %}</a></small>
                     </div>
                 </div>
             </form>
         </div>
         <div class="box has-background-primary-light">
             {% if site.allow_registration %}
-            <h2 class="title">Create an Account</h2>
+            <h2 class="title">{% trans "Create an Account" %}</h2>
             <form name="register" method="post" action="/register">
                 {% include 'snippets/register_form.html' %}
             </form>
             {% else %}
-            <h2 class="title">This instance is closed</h2>
-            <p>Contact an administrator to get an invite</p>
+            <h2 class="title">{% trans "This instance is closed" %}</h2>
+            <p>{% trans "Contact an administrator to get an invite" %}</p>
             {% endif %}
         </div>
     </div>
@@ -53,7 +53,7 @@
             {% include 'snippets/about.html' %}
 
             <p class="block">
-                <a href="/about/">More about this site</a>
+                <a href="/about/">{% trans "More about this site" %}</a>
             </p>
         </div>
     </div>
diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html
index 8e7412a2..10f07da0 100644
--- a/bookwyrm/templates/notifications.html
+++ b/bookwyrm/templates/notifications.html
@@ -3,11 +3,11 @@
 {% load bookwyrm_tags %}
 {% block content %}
 <div class="block">
-    <h1 class="title">Notifications</h1>
+    <h1 class="title">{% trans "Notifications" %}</h1>
 
     <form name="clear" action="/notifications" method="POST">
         {% csrf_token %}
-        <button class="button is-danger is-light" type="submit" class="secondary">Delete notifications</button>
+        <button class="button is-danger is-light" type="submit" class="secondary">{% trans "Delete notifications" %}</button>
     </form>
 </div>
 
@@ -98,7 +98,7 @@
     {% endfor %}
 
     {% if not notifications %}
-    <p>You're all caught up!</p>
+    <p>{% trans "You're all caught up!" %}</p>
     {% endif %}
 </div>
 {% endblock %}
diff --git a/bookwyrm/templates/password_reset_request.html b/bookwyrm/templates/password_reset_request.html
index b491a6ac..23eff657 100644
--- a/bookwyrm/templates/password_reset_request.html
+++ b/bookwyrm/templates/password_reset_request.html
@@ -4,20 +4,20 @@
 <div class="columns is-centered">
     <div class="column is-half">
         <div class="block">
-            <h1 class="title">Reset Password</h1>
+            <h1 class="title">{% trans "Reset Password" %}</h1>
             {% if message %}<p>{{ message }}</p>{% endif %}
-            <p>A link to reset your password will be sent to your email address</p>
+            <p>{% trans "A link to reset your password will be sent to your email address" %}</p>
             <form name="password-reset" method="post" action="/password-reset">
                 {% csrf_token %}
                 <div class="field">
-                    <label class="label" for="id_email_register">Email address:</label>
+                    <label class="label" for="id_email_register">{% trans "Email address:" %}</label>
                     <div class="control">
                         <input type="email" name="email" maxlength="254" class="input" id="id_email_register">
                     </div>
                 </div>
                 <div class="field is-grouped">
                     <div class="control">
-                        <button class="button is-link" type="submit">Reset password</button>
+                        <button class="button is-link" type="submit">{% trans "Reset password" %}</button>
                     </div>
                 </div>
             </form>
diff --git a/bookwyrm/templates/search_results.html b/bookwyrm/templates/search_results.html
index 34328bbd..8bd8253d 100644
--- a/bookwyrm/templates/search_results.html
+++ b/bookwyrm/templates/search_results.html
@@ -7,10 +7,10 @@
 
 <div class="block columns">
     <div class="column">
-        <h2 class="title">Matching Books</h2>
+        <h2 class="title">{% trans "Matching Books" %}</h2>
         <section class="block">
             {% if not local_results.results %}
-            <p>No books found for "{{ query }}"</p>
+            <p>{% blocktrans %}No books found for "{{ query }}"{% endblocktrans %}</p>
             {% else %}
             <ul>
             {% for result in local_results.results %}
@@ -26,7 +26,7 @@
         {% if book_results|slice:":1" and local_results.results %}
         <div class="block">
             <p>
-                Didn't find what you were looking for?
+                {% trans "Didn't find what you were looking for?" %}
             </p>
             {% include 'snippets/toggle/open_button.html' with text="Show results from other catalogues" small=True controls_text="more-results" %}
         </div>
@@ -49,7 +49,7 @@
                             {% csrf_token %}
                             <input type="hidden" name="remote_id" value="{{ result.key }}">
                             <div>{% include 'snippets/search_result_text.html' with result=result link=False %}</div>
-                            <button type="submit" class="button is-small is-link">Import book</button>
+                            <button type="submit" class="button is-small is-link">{% trans "Import book" %}</button>
                         </form>
                     </li>
                 {% endfor %}
@@ -66,9 +66,9 @@
     </div>
     <div class="column">
         <section class="block">
-            <h2 class="title">Matching Users</h2>
+            <h2 class="title">{% trans "Matching Users" %}</h2>
             {% if not user_results %}
-            <p>No users found for "{{ query }}"</p>
+            <p>{% blocktrans %}No users found for "{{ query }}"{% endblocktrans %}</p>
             {% endif %}
             <ul>
             {% for result in user_results %}
@@ -81,9 +81,9 @@
             </ul>
         </section>
         <section class="block">
-            <h2 class="title">Lists</h2>
+            <h2 class="title">{% trans "Lists" %}</h2>
             {% if not list_results %}
-            <p>No lists found for "{{ query }}"</p>
+            <p>{% blocktrans %}No lists found for "{{ query }}"{% endblocktrans %}</p>
             {% endif %}
             {% for result in list_results %}
             <div class="block">
diff --git a/bookwyrm/templates/tag.html b/bookwyrm/templates/tag.html
index 7eea0c21..96fbcf91 100644
--- a/bookwyrm/templates/tag.html
+++ b/bookwyrm/templates/tag.html
@@ -3,7 +3,7 @@
 {% block content %}
 
 <div class="block">
-    <h1 class="title">Books tagged "{{ tag.name }}"</h1>
+    <h1 class="title">{% blocktrans %}Books tagged "{{ tag.name }}"{% endblocktrans %}</h1>
     {% include 'snippets/book_tiles.html' with books=books.all %}
 </div>
 

From b2e431daed21283573d50eadf0c1915113c20fd5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 27 Feb 2021 15:00:19 -0800
Subject: [PATCH 0105/1285] Adds test localization file

---
 .../{en => en-US}/LC_MESSAGES/django.po       |  20 +-
 bookwyrm/locale/en-beep/LC_MESSAGES/django.po | 417 ++++++++++++++++++
 bookwyrm/settings.py                          |   5 +
 bookwyrm/templates/layout.html                |   1 +
 4 files changed, 433 insertions(+), 10 deletions(-)
 rename bookwyrm/locale/{en => en-US}/LC_MESSAGES/django.po (94%)
 create mode 100644 bookwyrm/locale/en-beep/LC_MESSAGES/django.po

diff --git a/bookwyrm/locale/en/LC_MESSAGES/django.po b/bookwyrm/locale/en-US/LC_MESSAGES/django.po
similarity index 94%
rename from bookwyrm/locale/en/LC_MESSAGES/django.po
rename to bookwyrm/locale/en-US/LC_MESSAGES/django.po
index 344c301f..9ecbea8c 100644
--- a/bookwyrm/locale/en/LC_MESSAGES/django.po
+++ b/bookwyrm/locale/en-US/LC_MESSAGES/django.po
@@ -1,5 +1,5 @@
 # English language text for the bookwyrm UI
-# Copyright (C) Mouse Reeve
+# Copyright (C) 2021 Mouse Reeve
 # This file is distributed under the same license as the bookwyrm package.
 # Mouse Reeve <mousereeve@riseup.net>, 2021
 #
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-27 14:21-0800\n"
+"POT-Creation-Date: 2021-02-27 14:59-0800\n"
 "PO-Revision-Date: 2021-02-27 13:50+PST\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -98,7 +98,7 @@ msgstr ""
 #: bookwyrm/templates/book.html:215 bookwyrm/templates/search_results.html:84
 #: bookwyrm/templates/user/user_layout.html:60
 msgid "Lists"
-msgstr ""
+msgstr "lirsts"
 
 #: bookwyrm/templates/book.html:244
 msgid "rated it"
@@ -290,33 +290,33 @@ msgstr ""
 msgid "Sorry! This invite code is no longer valid."
 msgstr ""
 
-#: bookwyrm/templates/layout.html:37
+#: bookwyrm/templates/layout.html:38
 msgid "search"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:47
+#: bookwyrm/templates/layout.html:48
 msgid "Main navigation menu"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:125 bookwyrm/templates/notifications.html:6
+#: bookwyrm/templates/layout.html:126 bookwyrm/templates/notifications.html:6
 msgid "Notifications"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:142 bookwyrm/templates/layout.html:146
+#: bookwyrm/templates/layout.html:143 bookwyrm/templates/layout.html:147
 #: bookwyrm/templates/login.html:14
 msgid "Username:"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:151 bookwyrm/templates/login.html:7
+#: bookwyrm/templates/layout.html:152 bookwyrm/templates/login.html:7
 #: bookwyrm/templates/login.html:30
 msgid "Log in"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:182
+#: bookwyrm/templates/layout.html:183
 msgid "About this server"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:186
+#: bookwyrm/templates/layout.html:187
 msgid "Contact site admin"
 msgstr ""
 
diff --git a/bookwyrm/locale/en-beep/LC_MESSAGES/django.po b/bookwyrm/locale/en-beep/LC_MESSAGES/django.po
new file mode 100644
index 00000000..3a450b65
--- /dev/null
+++ b/bookwyrm/locale/en-beep/LC_MESSAGES/django.po
@@ -0,0 +1,417 @@
+# A test translation file that just uses the word "beep"
+# Copyright (C) 2021 Mouse Reeve
+# This file is distributed under the same license as the BookWyrm package.
+# Mouse Reeve <mousereeve@riseup.net, 2021.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: 0.0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-27 14:23-0800\n"
+"PO-Revision-Date: 2021-02-27 14:25+PST\n"
+"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
+"Language-Team: Mouse Reeve <LL@li.org>\n"
+"Language: Beep\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: bookwyrm/templates/author.html:13 bookwyrm/templates/author.html:14
+msgid "Edit Author"
+msgstr "Edit Beep"
+
+#: bookwyrm/templates/author.html:29
+msgid "Wikipedia"
+msgstr "Beep"
+
+#: bookwyrm/templates/author.html:34
+#, python-format
+msgid "Books by %(name)s"
+msgstr "Beep by %(name)s"
+
+#: bookwyrm/templates/book.html:27 bookwyrm/templates/book.html:28
+msgid "Edit Book"
+msgstr "Edit Beep"
+
+#: bookwyrm/templates/book.html:43
+msgid "Add cover"
+msgstr "Beep beep"
+
+#: bookwyrm/templates/book.html:49
+msgid "Add"
+msgstr "Beep"
+
+#: bookwyrm/templates/book.html:58
+msgid "ISBN:"
+msgstr "ISBN:"
+
+#: bookwyrm/templates/book.html:65
+msgid "OCLC Number:"
+msgstr "OCLC Beep:"
+
+#: bookwyrm/templates/book.html:72
+msgid "ASIN:"
+msgstr "ASIN:"
+
+#: bookwyrm/templates/book.html:84
+msgid "View on OpenLibrary"
+msgstr "View beep OpenBeep"
+
+#: bookwyrm/templates/book.html:102
+msgid "Description:"
+msgstr "Beep:"
+
+#: bookwyrm/templates/book.html:106 bookwyrm/templates/edit_author.html:74
+msgid "Save"
+msgstr "Beep"
+
+#: bookwyrm/templates/book.html:138
+msgid "Your reading activity"
+msgstr "Beep reading beep"
+
+#: bookwyrm/templates/book.html:144
+msgid "You don't have any reading activity for this book."
+msgstr "Beep don't have any reading activity for this beep."
+
+#: bookwyrm/templates/book.html:151
+msgid "Create"
+msgstr "Beep"
+
+#: bookwyrm/templates/book.html:172
+msgid "Tags"
+msgstr "Beep"
+
+#: bookwyrm/templates/book.html:176
+msgid "Add tag"
+msgstr "Beep beep"
+
+#: bookwyrm/templates/book.html:193
+msgid "Subjects"
+msgstr "Beep"
+
+#: bookwyrm/templates/book.html:204
+msgid "Places"
+msgstr "Beep"
+
+#: bookwyrm/templates/book.html:215 bookwyrm/templates/search_results.html:84
+#: bookwyrm/templates/user/user_layout.html:60
+msgid "Lists"
+msgstr "Beep"
+
+#: bookwyrm/templates/book.html:244
+msgid "rated it"
+msgstr "rated beep"
+
+#: bookwyrm/templates/discover/landing_layout.html:15
+msgid "Decentralized"
+msgstr "Beep"
+
+#: bookwyrm/templates/discover/landing_layout.html:21
+msgid "Friendly"
+msgstr "Beep"
+
+#: bookwyrm/templates/discover/landing_layout.html:27
+msgid "Anti-Corporate"
+msgstr "Anti-Beep"
+
+#: bookwyrm/templates/discover/landing_layout.html:42
+#, python-format
+msgid "Join %(name)s"
+msgstr "Beep %(name)s"
+
+#: bookwyrm/templates/discover/landing_layout.html:47
+#: bookwyrm/templates/login.html:45
+msgid "This instance is closed"
+msgstr "Beep instance is beep"
+
+#: bookwyrm/templates/discover/landing_layout.html:53
+msgid "Your Account"
+msgstr "Your Beep"
+
+#: bookwyrm/templates/edit_author.html:27
+msgid "Metadata"
+msgstr "Beep"
+
+#: bookwyrm/templates/edit_author.html:28
+msgid "Name:"
+msgstr "Beep:"
+
+#: bookwyrm/templates/edit_author.html:33
+msgid "Bio:"
+msgstr "Beep:"
+
+#: bookwyrm/templates/edit_author.html:38
+msgid "Wikipedia link:"
+msgstr "Beep beep:"
+
+#: bookwyrm/templates/edit_author.html:43
+msgid "Birth date:"
+msgstr "Beep beep:"
+
+#: bookwyrm/templates/edit_author.html:48
+msgid "Death date:"
+msgstr "Beep beep:"
+
+#: bookwyrm/templates/edit_author.html:54
+msgid "Author Identifiers"
+msgstr "Author Beep"
+
+#: bookwyrm/templates/edit_author.html:55
+msgid "Openlibrary key:"
+msgstr "Beep beep:"
+
+#: bookwyrm/templates/edit_author.html:60
+msgid "Librarything key:"
+msgstr "Beep beep:"
+
+#: bookwyrm/templates/edit_author.html:65
+msgid "Goodreads key:"
+msgstr "Beep beep:"
+
+#: bookwyrm/templates/edit_author.html:75
+msgid "Cancel"
+msgstr "Beep"
+
+#: bookwyrm/templates/error.html:5
+msgid "Server Error"
+msgstr "Server Beep"
+
+#: bookwyrm/templates/error.html:6
+msgid "Something went wrong! Sorry about that."
+msgstr "Something went wrong! Beep about beep."
+
+#: bookwyrm/templates/goal.html:6
+#, python-format
+msgid "%(year)s Reading Progress"
+msgstr "%(year)s Reading Beep"
+
+#: bookwyrm/templates/goal.html:28
+#, python-format
+msgid ""
+"Set a goal for how many books you'll finish reading in %(year)s, and track "
+"your progress throughout the year."
+msgstr ""
+
+#: bookwyrm/templates/import.html:5
+msgid "Import Books"
+msgstr "Import Beep"
+
+#: bookwyrm/templates/import.html:10
+msgid "Data source"
+msgstr "Beep beep"
+
+#: bookwyrm/templates/import.html:28
+msgid "Include reviews"
+msgstr "Beep beep"
+
+#: bookwyrm/templates/import.html:33
+msgid "Privacy setting for imported reviews:"
+msgstr "Beep setting for imported beep:"
+
+#: bookwyrm/templates/import.html:37
+msgid "Import"
+msgstr "Beep"
+
+#: bookwyrm/templates/import.html:42
+msgid "Recent Imports"
+msgstr "Recent Beep"
+
+#: bookwyrm/templates/import.html:44
+msgid "No recent imports"
+msgstr "Beep recent beep"
+
+#: bookwyrm/templates/import_status.html:6
+msgid "Import Status"
+msgstr "Import Beep"
+
+#: bookwyrm/templates/import_status.html:9
+msgid "Import started: "
+msgstr "Beep beep: "
+
+#: bookwyrm/templates/import_status.html:13
+msgid "Import completed: "
+msgstr "Beep beep: "
+
+#: bookwyrm/templates/import_status.html:16
+msgid "TASK FAILED"
+msgstr "TASK FAILED"
+
+#: bookwyrm/templates/import_status.html:22
+msgid "Import still in progress."
+msgstr "Beep still in beep."
+
+#: bookwyrm/templates/import_status.html:24
+msgid "(Hit reload to update!)"
+msgstr "(Beep reload to beep!)"
+
+#: bookwyrm/templates/import_status.html:31
+msgid "Failed to load"
+msgstr "Beep to beep"
+
+#: bookwyrm/templates/import_status.html:55
+msgid "Select all"
+msgstr "Beep beep"
+
+#: bookwyrm/templates/import_status.html:58
+msgid "Retry items"
+msgstr "Beep beep"
+
+#: bookwyrm/templates/import_status.html:80
+msgid "Successfully imported"
+msgstr "Beep beep"
+
+#: bookwyrm/templates/import_status.html:84
+msgid "Book"
+msgstr "Beep"
+
+#: bookwyrm/templates/import_status.html:87
+msgid "Title"
+msgstr "Beep"
+
+#: bookwyrm/templates/import_status.html:90
+msgid "Author"
+msgstr "Beep"
+
+#: bookwyrm/templates/import_status.html:113
+msgid "Imported"
+msgstr "Beep"
+
+#: bookwyrm/templates/invite.html:8 bookwyrm/templates/login.html:40
+msgid "Create an Account"
+msgstr "Create beep Beep"
+
+#: bookwyrm/templates/invite.html:17
+msgid "Permission Denied"
+msgstr "Permission Beep"
+
+#: bookwyrm/templates/invite.html:18
+msgid "Sorry! This invite code is no longer valid."
+msgstr "Sorry! Beep invite code is no longer beep."
+
+#: bookwyrm/templates/layout.html:37
+msgid "search"
+msgstr "beep"
+
+#: bookwyrm/templates/layout.html:47
+msgid "Main navigation menu"
+msgstr "Beep navigation beep"
+
+#: bookwyrm/templates/layout.html:125 bookwyrm/templates/notifications.html:6
+msgid "Notifications"
+msgstr "Beep"
+
+#: bookwyrm/templates/layout.html:142 bookwyrm/templates/layout.html:146
+#: bookwyrm/templates/login.html:14
+msgid "Username:"
+msgstr "Beep:"
+
+#: bookwyrm/templates/layout.html:151 bookwyrm/templates/login.html:7
+#: bookwyrm/templates/login.html:30
+msgid "Log in"
+msgstr "Beep beep"
+
+#: bookwyrm/templates/layout.html:182
+msgid "About this server"
+msgstr "Beep this beep"
+
+#: bookwyrm/templates/layout.html:186
+msgid "Contact site admin"
+msgstr "Beep site beep"
+
+#: bookwyrm/templates/login.html:20
+msgid "Password:"
+msgstr "Beep:"
+
+#: bookwyrm/templates/login.html:33
+msgid "Forgot your password?"
+msgstr "Beep your beep?"
+
+#: bookwyrm/templates/login.html:46
+msgid "Contact an administrator to get an invite"
+msgstr "Beep an administrator to get an beep"
+
+#: bookwyrm/templates/login.html:56
+msgid "More about this site"
+msgstr "Beep about this beep"
+
+#: bookwyrm/templates/notifications.html:10
+msgid "Delete notifications"
+msgstr "Beep beep"
+
+#: bookwyrm/templates/notifications.html:101
+msgid "You're all caught up!"
+msgstr "Beep're all caught beep!"
+
+#: bookwyrm/templates/password_reset_request.html:7
+msgid "Reset Password"
+msgstr "Reset Beep"
+
+#: bookwyrm/templates/password_reset_request.html:9
+msgid "A link to reset your password will be sent to your email address"
+msgstr "A link to reset your password will be sent to your email beep"
+
+#: bookwyrm/templates/password_reset_request.html:13
+msgid "Email address:"
+msgstr "Beep beep:"
+
+#: bookwyrm/templates/password_reset_request.html:20
+msgid "Reset password"
+msgstr "Beep beep"
+
+#: bookwyrm/templates/search_results.html:10
+msgid "Matching Books"
+msgstr "Matching Beep"
+
+#: bookwyrm/templates/search_results.html:13
+#, python-format
+msgid "No books found for \"%(query)s\""
+msgstr "Beep books found for \"%(query)s\""
+
+#: bookwyrm/templates/search_results.html:29
+msgid "Didn't find what you were looking for?"
+msgstr "Beep't find what you were looking beep?"
+
+#: bookwyrm/templates/search_results.html:52
+msgid "Import book"
+msgstr "Beep beep"
+
+#: bookwyrm/templates/search_results.html:69
+msgid "Matching Users"
+msgstr "Matching Beep"
+
+#: bookwyrm/templates/search_results.html:71
+#, python-format
+msgid "No users found for \"%(query)s\""
+msgstr "Beep users found for \"%(query)s\""
+
+#: bookwyrm/templates/search_results.html:86
+#, python-format
+msgid "No lists found for \"%(query)s\""
+msgstr "Beep lists found for \"%(query)s\""
+
+#: bookwyrm/templates/tag.html:6
+#, python-format
+msgid "Books tagged \"%(tag.name)s\""
+msgstr "Beep tagged \"%(tag.name)s\""
+
+#: bookwyrm/templates/user/user_layout.html:30
+msgid "Follow Requests"
+msgstr "Follow Beep"
+
+#: bookwyrm/templates/user/user_layout.html:48
+msgid "Activity"
+msgstr "Beep"
+
+#: bookwyrm/templates/user/user_layout.html:54
+msgid "Reading Goal"
+msgstr "Reading Beep"
+
+#: bookwyrm/templates/user/user_layout.html:66
+msgid "Shelves"
+msgstr "Beep"
+
+#: bookwyrm/templates/user/user_preview.html:13
+#, python-format
+msgid "Joined %(date)s"
+msgstr "Beep %(date)s"
diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 2a2bf427..4e8708b9 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -30,6 +30,11 @@ EMAIL_USE_TLS = env('EMAIL_USE_TLS', True)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 LOCALE_PATHS = [os.path.join(BASE_DIR, 'locale'),]
 
+LANGUAGES = [
+    ('en-US', _('English')),
+    ('en-beep', _('Beep')),
+]
+
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/2.0/howto/deployment/checklist/
 
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 5f75e122..c658ac3f 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -1,4 +1,5 @@
 {% load bookwyrm_tags %}
+{% load i18n %}
 <!DOCTYPE html>
 <html lang="en">
 <head>

From 2d79a521335f9ab7844d191de747d8d7631ae31d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 27 Feb 2021 16:18:24 -0800
Subject: [PATCH 0106/1285] Translations working in templates

---
 bookwyrm/settings.py                             |  10 +++++-----
 bookwyrm/templates/layout.html                   |   6 +++---
 celerywyrm/settings.py                           |   4 ++--
 locale/en_BEEP/LC_MESSAGES/django.mo             | Bin 0 -> 5268 bytes
 .../en_BEEP}/LC_MESSAGES/django.po               |   0
 locale/en_US/LC_MESSAGES/django.mo               | Bin 0 -> 427 bytes
 .../en-US => locale/en_US}/LC_MESSAGES/django.po |   2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 locale/en_BEEP/LC_MESSAGES/django.mo
 rename {bookwyrm/locale/en-beep => locale/en_BEEP}/LC_MESSAGES/django.po (100%)
 create mode 100644 locale/en_US/LC_MESSAGES/django.mo
 rename {bookwyrm/locale/en-US => locale/en_US}/LC_MESSAGES/django.po (99%)

diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 4e8708b9..de24c4f7 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -30,11 +30,6 @@ EMAIL_USE_TLS = env('EMAIL_USE_TLS', True)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 LOCALE_PATHS = [os.path.join(BASE_DIR, 'locale'),]
 
-LANGUAGES = [
-    ('en-US', _('English')),
-    ('en-beep', _('Beep')),
-]
-
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/2.0/howto/deployment/checklist/
 
@@ -143,6 +138,11 @@ AUTH_PASSWORD_VALIDATORS = [
 # https://docs.djangoproject.com/en/2.0/topics/i18n/
 
 LANGUAGE_CODE = 'en-us'
+LANGUAGES = [
+    ('en-us', _('English')),
+    ('en-beep', _('Beep')),
+]
+
 
 TIME_ZONE = 'UTC'
 
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index c658ac3f..70c44e07 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -55,13 +55,13 @@
         <div class="navbar-start">
             {% if request.user.is_authenticated %}
             <a href="{% url 'user-shelves' request.user.localname %}" class="navbar-item">
-                Your shelves
+                {% trans "Your shelves" %}
             </a>
             <a href="/#feed" class="navbar-item">
-                Feed
+                {% trans "Feed" %}
             </a>
             <a href="{% url 'lists' %}" class="navbar-item">
-                Lists
+                {% trans "Lists" %}
             </a>
             {% endif %}
         </div>
diff --git a/celerywyrm/settings.py b/celerywyrm/settings.py
index c27072c2..92986d8e 100644
--- a/celerywyrm/settings.py
+++ b/celerywyrm/settings.py
@@ -142,9 +142,9 @@ LANGUAGE_CODE = 'en-us'
 
 TIME_ZONE = 'UTC'
 
-USE_I18N = True
+USE_I18N = False
 
-USE_L10N = True
+USE_L10N = False
 
 USE_TZ = True
 
diff --git a/locale/en_BEEP/LC_MESSAGES/django.mo b/locale/en_BEEP/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..26c5ec5a39c06dae5cffd3fa1bf81783636b8d85
GIT binary patch
literal 5268
zcmbuBe~cYf6~`}%6qZ(M1%Vdiw$OH$`nKJ*NO=Xi+x=0t?6zz70YX(e``+!_p|dlO
znR&ZD|1d#IVuIj5{(!{(;~yp({D+|YVT~~=Bw|cNBTY<<QAyC)#1Q|Ggcv{Hnfu-@
zTiTd7d1pRz@0@$?x#ym_=lyZh<zF{kCy<*Y?>FX4;uYMu`mZ$RMmPYkhhuOA9)}-*
z-+~{4--i6mi`+0_ehjaIKZWbytMG&Hw@{}43^&2Q!OP)0@M?G&gVf#tWp@+Y0&jyF
zHv$LXA*k_>`~K5V`cFaGIpg_VxPkT$;I;5)a6LQ+cfdEG^w;;5{@wuP=QhtFcn$3l
zcpaRDxN1)N_X$)Sz5wOlX(;<oLCyOtl>P5O`TGLg2!8<;*WW|g`zO>qZ$pi{ia}~$
z54EnHQ1jdcHO~R4^-Mzfd))IeD0?0M{)<rKz6n1H&v>4Nvik?$J`XkTdYqU4o4Lu)
zosbZjeNg%bq2{l_?eI9{XP)3DKc4YC<M}+qwD}R#zP<ukqWKl%XI|%~{P-)}3I73i
z!E13w>llHG`xKO&N1^PTg38Ah)cU>*<>xc-!|++(ejX~0KZL{ZWhi@ZL(P8;POE(r
z)O^EG>)Q`+zKr$y_a`v&5&D<lJ@9F$d0&O7nBPG8^(W6ap#1r}=f6Dv<KJINaJ8Nd
zP<C#Fipwofc5a9K%x-R*;fU`)4sWA<0&3nTegD@WKl2<n&HFtldoM!S`-$)WIn;c=
zhKl#^eE&P1SFp(%w-G8nTcG^xhq!L`LfIRK(wl;^SM&Xkz+#^~PeJ*!?AuRxJ`J@`
z&q3MyK9t@IkgYLiJ%0%`&p9Z)zd-4|36=kELFupK;}Wlf(z_MveLs|c_dpBBJR6WD
zn<sty8&Kn3f|~EF=POX-UxQlzIVin1;VtkyRGc=j7_ECV)c74xehzu=hZ;BG+lQg_
zYrg*k+(FyH+u>Jy|4UGI&O+(G?E7DX%G=j{`#hANZ$Vr#|MvY?69oCQ5q=zQfj7XT
zP<9s}Av7tJ-f1X5zY0lzQ$eIRiRil+L%NsNKkFNx?RLUp<N$Ki_f?^4!X3yV-=}X)
z>($kdOczgOZhwmBW4_%5%P~iMW1r_PxDC10w{@QCQXSiiY)4c(?nMR=<%hoE&mben
z9C9<FOM6=@p30lPab0_mhmZ%58AR9J$is-@*u4}(eNVb{F6mNU3?Yvo#}Qo*BA-UI
zS6dN_=v>~7tV48ZpFW06sKGUgoX~^6ln2U@Pa^w$-(jfp;4Vbxg>pdop=%0ZJIy$9
z5YeT*z8}#ypzA*5QDhLg6HyN6dLQx$J#6pqxF8+K>@gQK!nkQ?)1;ZYEHnN0g}F^#
zlmrc%C$`;c1i9NfU`A~e#;4SUn#*k`X{WXoWZ80(Htcd3MRwlV%*DBMinnet2qPOb
z8inD}xv3*nGdiEN(O3vGbkil5n$db5E`@o=j5Zn)TThB^p7Nk+M&mrJj3sF+NpZxC
zw)2IAK?UqogZaXfp-VG!Fifi4(tN?nWuBAdRB_Afe8+C@kAp=wfF9kMOgCM_Zrk3^
z(_r~(n;8q@x{J(M66ZlZw?T~ei(wpQIg=-;R@P+g^oKD%yPjr7qtrEHsgt86q&ix!
zC+#>l<3S$SjIh<68Aqq<=eVo0iZqDA&$|Y1B8ROw(YoqE9wu={XI4+cmKs$v9ya2g
zxjh-i#C;(sw!$vE)Y*uoX){kI=>ap*U?Y9FisvF86RY>6Y9`qs!oa$;;bt<4qGXw*
zc)abhJfod9lQnyNz)Ys0iyKkL97+=QHfUt_l<QQ@)Z9UKcxsWY$~|lm?QUZ(5At@_
zZOv<cN^SOhv88o4s<zve<w3fpLrE6Kw&inm(5n))skk1s8;;yu3f*#M4kzgKwp=Y%
zxxHVBK?+QV^J$QF$U=fuxIWDm)1Nf4Z)O4p$H7wAEW&RWUEHQKuNV5|ih9ilNaM`R
zxIDmkU}h5bAy}2<%90~wUez2)td^XyJ#Ds*O;Y+1>9jMDZPV*WUR?ZjS|o}MivVXD
z(AMM^9k4osj*d-_*(2@6d6!nr(Uyy&G6v=HXZ?3vHM1^V46}?xv*Ruf3GHkY)Lmv~
z({L%Mclc`a+~=70gvk1^S55agIg|tu4JEcMw>YDzbE7+zZ+1@*nt9r>L~AiKbHS1`
zb9@N;2BU~aofLK=P5Jca7F@K1LvzWZD|c{Nvn;1c+}vvCk`y!D4G8i<^yt}YYdUhu
zua;~hRcOXa`?!heCBD7}y6ySLm=xpfI*ZOuwxbBAihvV}+UVT<c5-xTdScwvf@WsC
zQBsw2Ll)~%l1VYlBWIKvI$5gbL6XuEQU%^8pLr-e6}DU>3|5|sBerTDPTIDS=o?=k
z5F8;L0$d)`oJz%ES!55Z=V&9P1~p`-5|0n09<-YaIS2Pv^`^b!r)aFTV|1uC2)oIs
z2lWNEIZ*^EQ;o`l<dzN`yJv9E;85Q&r|-HllQqLe<zTy+RccAq_RSux9OI*tW`z^Z
zRqgPe;i1Z&;mYuxc4%*P_>Nt(bG5$dAj>PYG>EfECu!BrBqXmr<{T@$dr^&4&m(D=
zxpr$XcKN*wikt1A=_)lBEUp<cJv|bIgPcz*YE^sCxmMrI)Xc<+^FxDs`gER?Bb8dG
zg@3vGT)w*%@saPh^@SiMEAM%rHd)!Xq9;F3y0kJ8lPY9;)$W@Q^S%qqrY1D~y0b;y
znmJGN|EZW7Z_096ST6TjoocS!D7d~^J{6^MMa9?1UI!Hs{X(^T^zGHPQ3~%}8hd6g
zRTbxZ4iyEl*X&k9b=Vb4z4sS7)iqRldg*c}Grryxw##bQwXn*z>Rd6WuXBaAZsq?K
zy*jWayxpo+sQO}c!E<3kqgO@PUih5lzJN(}aLq)edaq;^CVK^|H^I9$t~cSTT2*+_
zD^41>s&aJ)lyh|tNgX2HH{Be$M4c*pxm2Yp6nw4f8NOtx(g;&jC_Qz3=smuxDiylD
z+k2Oz`C@3d78T0A7Wrotq7@rbFGJFMTGjN$r>B0A!lU=T?#N27?iBqOtvjWvbXLu{
zy3DM+3geYBqhZB>;^ym%I*SU^8?$25$Mk=%D#a3HXiZtsB)+iprs-8Dz4R5Ocr0%J
E1@1Jx!~g&Q

literal 0
HcmV?d00001

diff --git a/bookwyrm/locale/en-beep/LC_MESSAGES/django.po b/locale/en_BEEP/LC_MESSAGES/django.po
similarity index 100%
rename from bookwyrm/locale/en-beep/LC_MESSAGES/django.po
rename to locale/en_BEEP/LC_MESSAGES/django.po
diff --git a/locale/en_US/LC_MESSAGES/django.mo b/locale/en_US/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..810d271771144ebbac86a529be1c7ed4b0c841d4
GIT binary patch
literal 427
zcmZ9I(MrQG6o#v)7rpe_i{qW5scl6Z*(yWbV9;WnRj=cA>>^!Kl62^U_y#_g&*I4h
z2ma(E=fMBNpM3A{d<LX#;($0Mc8LMuRT6%`C-SWzc&2-g_@bH4T0Z-yTv}&?(&#sw
zIX0QICp1=S#UYN8C<&+7YU5a8YdL4vU2R#VIfUgMo8n4(C%Y96Iizu#usCJuB_!wk
zB0eb}sxTMUvC0T#8{xF!Q0UGgOc7TIgQZ`LpNB?T?Al17yP}Y)J5eL6P%QsN@_g9H
zNSk_N<1kWnBkcmhVp5DY4@jaoywS>`q7EM|b#(ad&e}#u)rZ+a7>h1@tj4Uj@%gT=
wXxK>2^jxZ%L+?epuxvUb8aCEuX*sBNz1l48!|#|KDLBj^Iqru+BaQ#lA7^EDYXATM

literal 0
HcmV?d00001

diff --git a/bookwyrm/locale/en-US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
similarity index 99%
rename from bookwyrm/locale/en-US/LC_MESSAGES/django.po
rename to locale/en_US/LC_MESSAGES/django.po
index 9ecbea8c..475f4ecf 100644
--- a/bookwyrm/locale/en-US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -98,7 +98,7 @@ msgstr ""
 #: bookwyrm/templates/book.html:215 bookwyrm/templates/search_results.html:84
 #: bookwyrm/templates/user/user_layout.html:60
 msgid "Lists"
-msgstr "lirsts"
+msgstr ""
 
 #: bookwyrm/templates/book.html:244
 msgid "rated it"

From 27316678d5fedcb16fbbd8e0f561f0c67bbba615 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 27 Feb 2021 16:44:58 -0800
Subject: [PATCH 0107/1285] Adds test german translations

with apologies to actual german speakers
---
 bookwyrm/settings.py                         |   2 +-
 bookwyrm/templates/notifications.html        |   1 +
 bw-dev                                       |   5 +-
 locale/de/LC_MESSAGES/django.mo              | Bin 0 -> 973 bytes
 locale/{en_BEEP => de}/LC_MESSAGES/django.po | 262 +++++++++++--------
 locale/en_BEEP/LC_MESSAGES/django.mo         | Bin 5268 -> 0 bytes
 locale/en_US/LC_MESSAGES/django.mo           | Bin 427 -> 390 bytes
 7 files changed, 155 insertions(+), 115 deletions(-)
 create mode 100644 locale/de/LC_MESSAGES/django.mo
 rename locale/{en_BEEP => de}/LC_MESSAGES/django.po (69%)
 delete mode 100644 locale/en_BEEP/LC_MESSAGES/django.mo

diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index de24c4f7..c3fe56a9 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -140,7 +140,7 @@ AUTH_PASSWORD_VALIDATORS = [
 LANGUAGE_CODE = 'en-us'
 LANGUAGES = [
     ('en-us', _('English')),
-    ('en-beep', _('Beep')),
+    ('de', _('Deutsch')),
 ]
 
 
diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html
index 10f07da0..5c009cba 100644
--- a/bookwyrm/templates/notifications.html
+++ b/bookwyrm/templates/notifications.html
@@ -1,4 +1,5 @@
 {% extends 'layout.html' %}
+{% load i18n %}
 {% load humanize %}
 {% load bookwyrm_tags %}
 {% block content %}
diff --git a/bw-dev b/bw-dev
index a0e06a22..012e56f3 100755
--- a/bw-dev
+++ b/bw-dev
@@ -91,7 +91,10 @@ case "$CMD" in
         execweb python manage.py collectstatic --no-input
         ;;
     makemessages)
-        django-admin makemessages --extension html --ignore=venv3 --local=$@
+        django-admin makemessages --ignore=venv3 -l $@
+        ;;
+    compilemessages)
+        django-admin compilemessages --ignore venv3
         ;;
     build)
         docker-compose build
diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..3487f1c58fe0fc82a4fee913ce0d6796f5cd77b5
GIT binary patch
literal 973
zcmYL{yKfUg5XKh>uj3&R3L1)~BZ@8%3KU&plyiJeEY1(vPEep>eK$ETIqzA!djZ_h
z&_II(9f*PoDjEtJ3Mgr*`AaDH)-hzH(eGw=Zsya>{+^$E!(bQTSK%+=m*Icl&bE#*
zb_r~N=fDTxJebYm2{?!NId~F$0bT%KfoH+@;3@DUcn16oy8N%;dGOop{3lq2|AM>z
zS57eIfs5b*czYH<1fAA>(AAxQPR}#Y)qf2-9q(rMA3#^<6X^PVnZ@5hv|^{>PA|f#
zUSO*4IOzU!HUF9G>v}qKwOk)Jlc|M+qO{x&rQwG30clp1+75XtECp<%P*x<C8)=D)
zbR-q4k@$aICrVi?jWw)QSh*(?VP&BV>j+~W7dj1CCl?7B)++~(C_!FdWQOe)rRHWx
z`2ns<^i^U+tfLE;<2O=&hqOVVfOo=;yWwWUccN~u(QbKN8W-C7O_Rygua=qd`$fRL
zPTTL&fpq`)HK&~KMq$@)w*6Yjx7tCov3S4Tio94D>-V)#CKtBQ0k3bzF>i&<h_6M>
zuo16^wOTjo_3j{5Wu?f-?~@n>JPuo%+fK<^9IxkcsnFR`4iq#S&FDz>^3qMu&5jh>
zJsm@jr6=~rI2Tf_@?<EqAzRt**Zq~FJSS_9v>&OYNTtdGzA}*3>*S>txnD2z$OK%C
zr=h9bTIGkImFtRMtMKK8Rge96J0Q(dNrn{f9qx0J2Bo&fij3VOmAVT_*l053Lh-}c
zk{`P5VwKtrhV_e-4BkLFV&T3mMUL5$E>$*NHz`&nC6b{=6)Q8G<7l>Y%X(xdmi31;
b!fDSU2XDa=o{m(+yOfEXSgW*?+2a2KQNZrz

literal 0
HcmV?d00001

diff --git a/locale/en_BEEP/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
similarity index 69%
rename from locale/en_BEEP/LC_MESSAGES/django.po
rename to locale/de/LC_MESSAGES/django.po
index 3a450b65..986785ee 100644
--- a/locale/en_BEEP/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -1,190 +1,218 @@
-# A test translation file that just uses the word "beep"
-# Copyright (C) 2021 Mouse Reeve
-# This file is distributed under the same license as the BookWyrm package.
-# Mouse Reeve <mousereeve@riseup.net, 2021.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 0.0.1\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-27 14:23-0800\n"
-"PO-Revision-Date: 2021-02-27 14:25+PST\n"
-"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
-"Language-Team: Mouse Reeve <LL@li.org>\n"
-"Language: Beep\n"
+"POT-Creation-Date: 2021-02-27 16:29-0800\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: bookwyrm/models/fields.py:24
+#, python-format
+msgid "%(value)s is not a valid remote_id"
+msgstr ""
+
+#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
+#, python-format
+msgid "%(value)s is not a valid username"
+msgstr ""
+
+#: bookwyrm/models/fields.py:164
+msgid "username"
+msgstr "Nutzername"
+
+#: bookwyrm/models/fields.py:169
+msgid "A user with that username already exists."
+msgstr ""
+
+#: bookwyrm/settings.py:142
+msgid "English"
+msgstr ""
+
+#: bookwyrm/settings.py:143
+msgid "Beep"
+msgstr ""
 
 #: bookwyrm/templates/author.html:13 bookwyrm/templates/author.html:14
 msgid "Edit Author"
-msgstr "Edit Beep"
+msgstr ""
 
 #: bookwyrm/templates/author.html:29
 msgid "Wikipedia"
-msgstr "Beep"
+msgstr ""
 
 #: bookwyrm/templates/author.html:34
 #, python-format
 msgid "Books by %(name)s"
-msgstr "Beep by %(name)s"
+msgstr ""
 
 #: bookwyrm/templates/book.html:27 bookwyrm/templates/book.html:28
 msgid "Edit Book"
-msgstr "Edit Beep"
+msgstr ""
 
 #: bookwyrm/templates/book.html:43
 msgid "Add cover"
-msgstr "Beep beep"
+msgstr ""
 
 #: bookwyrm/templates/book.html:49
 msgid "Add"
-msgstr "Beep"
+msgstr ""
 
 #: bookwyrm/templates/book.html:58
 msgid "ISBN:"
-msgstr "ISBN:"
+msgstr ""
 
 #: bookwyrm/templates/book.html:65
 msgid "OCLC Number:"
-msgstr "OCLC Beep:"
+msgstr ""
 
 #: bookwyrm/templates/book.html:72
 msgid "ASIN:"
-msgstr "ASIN:"
+msgstr ""
 
 #: bookwyrm/templates/book.html:84
 msgid "View on OpenLibrary"
-msgstr "View beep OpenBeep"
+msgstr ""
 
 #: bookwyrm/templates/book.html:102
 msgid "Description:"
-msgstr "Beep:"
+msgstr ""
 
 #: bookwyrm/templates/book.html:106 bookwyrm/templates/edit_author.html:74
 msgid "Save"
-msgstr "Beep"
+msgstr ""
 
 #: bookwyrm/templates/book.html:138
 msgid "Your reading activity"
-msgstr "Beep reading beep"
+msgstr ""
 
 #: bookwyrm/templates/book.html:144
 msgid "You don't have any reading activity for this book."
-msgstr "Beep don't have any reading activity for this beep."
+msgstr ""
 
 #: bookwyrm/templates/book.html:151
 msgid "Create"
-msgstr "Beep"
+msgstr ""
 
 #: bookwyrm/templates/book.html:172
 msgid "Tags"
-msgstr "Beep"
+msgstr "Stichworte"
 
 #: bookwyrm/templates/book.html:176
 msgid "Add tag"
-msgstr "Beep beep"
+msgstr ""
 
 #: bookwyrm/templates/book.html:193
 msgid "Subjects"
-msgstr "Beep"
+msgstr "Themen"
 
 #: bookwyrm/templates/book.html:204
 msgid "Places"
-msgstr "Beep"
+msgstr "Setzt"
 
-#: bookwyrm/templates/book.html:215 bookwyrm/templates/search_results.html:84
+#: bookwyrm/templates/book.html:215 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/search_results.html:84
 #: bookwyrm/templates/user/user_layout.html:60
 msgid "Lists"
-msgstr "Beep"
+msgstr "Listen"
 
 #: bookwyrm/templates/book.html:244
 msgid "rated it"
-msgstr "rated beep"
+msgstr ""
 
 #: bookwyrm/templates/discover/landing_layout.html:15
 msgid "Decentralized"
-msgstr "Beep"
+msgstr ""
 
 #: bookwyrm/templates/discover/landing_layout.html:21
 msgid "Friendly"
-msgstr "Beep"
+msgstr ""
 
 #: bookwyrm/templates/discover/landing_layout.html:27
 msgid "Anti-Corporate"
-msgstr "Anti-Beep"
+msgstr ""
 
 #: bookwyrm/templates/discover/landing_layout.html:42
 #, python-format
 msgid "Join %(name)s"
-msgstr "Beep %(name)s"
+msgstr ""
 
 #: bookwyrm/templates/discover/landing_layout.html:47
 #: bookwyrm/templates/login.html:45
 msgid "This instance is closed"
-msgstr "Beep instance is beep"
+msgstr ""
 
 #: bookwyrm/templates/discover/landing_layout.html:53
 msgid "Your Account"
-msgstr "Your Beep"
+msgstr ""
 
 #: bookwyrm/templates/edit_author.html:27
 msgid "Metadata"
-msgstr "Beep"
+msgstr ""
 
 #: bookwyrm/templates/edit_author.html:28
 msgid "Name:"
-msgstr "Beep:"
+msgstr ""
 
 #: bookwyrm/templates/edit_author.html:33
 msgid "Bio:"
-msgstr "Beep:"
+msgstr ""
 
 #: bookwyrm/templates/edit_author.html:38
 msgid "Wikipedia link:"
-msgstr "Beep beep:"
+msgstr ""
 
 #: bookwyrm/templates/edit_author.html:43
 msgid "Birth date:"
-msgstr "Beep beep:"
+msgstr "Geburtstag"
 
 #: bookwyrm/templates/edit_author.html:48
 msgid "Death date:"
-msgstr "Beep beep:"
+msgstr "Todesdatum"
 
 #: bookwyrm/templates/edit_author.html:54
 msgid "Author Identifiers"
-msgstr "Author Beep"
+msgstr ""
 
 #: bookwyrm/templates/edit_author.html:55
 msgid "Openlibrary key:"
-msgstr "Beep beep:"
+msgstr ""
 
 #: bookwyrm/templates/edit_author.html:60
 msgid "Librarything key:"
-msgstr "Beep beep:"
+msgstr ""
 
 #: bookwyrm/templates/edit_author.html:65
 msgid "Goodreads key:"
-msgstr "Beep beep:"
+msgstr ""
 
 #: bookwyrm/templates/edit_author.html:75
 msgid "Cancel"
-msgstr "Beep"
+msgstr ""
 
 #: bookwyrm/templates/error.html:5
 msgid "Server Error"
-msgstr "Server Beep"
+msgstr ""
 
 #: bookwyrm/templates/error.html:6
 msgid "Something went wrong! Sorry about that."
-msgstr "Something went wrong! Beep about beep."
+msgstr ""
 
 #: bookwyrm/templates/goal.html:6
 #, python-format
 msgid "%(year)s Reading Progress"
-msgstr "%(year)s Reading Beep"
+msgstr ""
 
 #: bookwyrm/templates/goal.html:28
 #, python-format
@@ -195,223 +223,231 @@ msgstr ""
 
 #: bookwyrm/templates/import.html:5
 msgid "Import Books"
-msgstr "Import Beep"
+msgstr ""
 
 #: bookwyrm/templates/import.html:10
 msgid "Data source"
-msgstr "Beep beep"
+msgstr ""
 
 #: bookwyrm/templates/import.html:28
 msgid "Include reviews"
-msgstr "Beep beep"
+msgstr ""
 
 #: bookwyrm/templates/import.html:33
 msgid "Privacy setting for imported reviews:"
-msgstr "Beep setting for imported beep:"
+msgstr ""
 
 #: bookwyrm/templates/import.html:37
 msgid "Import"
-msgstr "Beep"
+msgstr ""
 
 #: bookwyrm/templates/import.html:42
 msgid "Recent Imports"
-msgstr "Recent Beep"
+msgstr ""
 
 #: bookwyrm/templates/import.html:44
 msgid "No recent imports"
-msgstr "Beep recent beep"
+msgstr ""
 
 #: bookwyrm/templates/import_status.html:6
 msgid "Import Status"
-msgstr "Import Beep"
+msgstr ""
 
 #: bookwyrm/templates/import_status.html:9
 msgid "Import started: "
-msgstr "Beep beep: "
+msgstr ""
 
 #: bookwyrm/templates/import_status.html:13
 msgid "Import completed: "
-msgstr "Beep beep: "
+msgstr ""
 
 #: bookwyrm/templates/import_status.html:16
 msgid "TASK FAILED"
-msgstr "TASK FAILED"
+msgstr ""
 
 #: bookwyrm/templates/import_status.html:22
 msgid "Import still in progress."
-msgstr "Beep still in beep."
+msgstr ""
 
 #: bookwyrm/templates/import_status.html:24
 msgid "(Hit reload to update!)"
-msgstr "(Beep reload to beep!)"
+msgstr ""
 
 #: bookwyrm/templates/import_status.html:31
 msgid "Failed to load"
-msgstr "Beep to beep"
+msgstr ""
 
 #: bookwyrm/templates/import_status.html:55
 msgid "Select all"
-msgstr "Beep beep"
+msgstr ""
 
 #: bookwyrm/templates/import_status.html:58
 msgid "Retry items"
-msgstr "Beep beep"
+msgstr ""
 
 #: bookwyrm/templates/import_status.html:80
 msgid "Successfully imported"
-msgstr "Beep beep"
+msgstr ""
 
 #: bookwyrm/templates/import_status.html:84
 msgid "Book"
-msgstr "Beep"
+msgstr ""
 
 #: bookwyrm/templates/import_status.html:87
 msgid "Title"
-msgstr "Beep"
+msgstr ""
 
 #: bookwyrm/templates/import_status.html:90
 msgid "Author"
-msgstr "Beep"
+msgstr ""
 
 #: bookwyrm/templates/import_status.html:113
 msgid "Imported"
-msgstr "Beep"
+msgstr ""
 
 #: bookwyrm/templates/invite.html:8 bookwyrm/templates/login.html:40
 msgid "Create an Account"
-msgstr "Create beep Beep"
+msgstr ""
 
 #: bookwyrm/templates/invite.html:17
 msgid "Permission Denied"
-msgstr "Permission Beep"
+msgstr ""
 
 #: bookwyrm/templates/invite.html:18
 msgid "Sorry! This invite code is no longer valid."
-msgstr "Sorry! Beep invite code is no longer beep."
+msgstr ""
 
-#: bookwyrm/templates/layout.html:37
+#: bookwyrm/templates/layout.html:38
 msgid "search"
-msgstr "beep"
+msgstr ""
 
-#: bookwyrm/templates/layout.html:47
+#: bookwyrm/templates/layout.html:48
 msgid "Main navigation menu"
-msgstr "Beep navigation beep"
+msgstr ""
 
-#: bookwyrm/templates/layout.html:125 bookwyrm/templates/notifications.html:6
+#: bookwyrm/templates/layout.html:58
+msgid "Your shelves"
+msgstr "Deine Regale"
+
+#: bookwyrm/templates/layout.html:61
+msgid "Feed"
+msgstr "Aktualisierung"
+
+#: bookwyrm/templates/layout.html:126 bookwyrm/templates/notifications.html:6
 msgid "Notifications"
-msgstr "Beep"
+msgstr "Benachrichtigungen"
 
-#: bookwyrm/templates/layout.html:142 bookwyrm/templates/layout.html:146
+#: bookwyrm/templates/layout.html:143 bookwyrm/templates/layout.html:147
 #: bookwyrm/templates/login.html:14
 msgid "Username:"
-msgstr "Beep:"
+msgstr ""
 
-#: bookwyrm/templates/layout.html:151 bookwyrm/templates/login.html:7
+#: bookwyrm/templates/layout.html:152 bookwyrm/templates/login.html:7
 #: bookwyrm/templates/login.html:30
 msgid "Log in"
-msgstr "Beep beep"
+msgstr ""
 
-#: bookwyrm/templates/layout.html:182
+#: bookwyrm/templates/layout.html:183
 msgid "About this server"
-msgstr "Beep this beep"
+msgstr "Ãœber diesen Server"
 
-#: bookwyrm/templates/layout.html:186
+#: bookwyrm/templates/layout.html:187
 msgid "Contact site admin"
-msgstr "Beep site beep"
+msgstr "Wenden Sie sich an den Site-Administrator"
 
 #: bookwyrm/templates/login.html:20
 msgid "Password:"
-msgstr "Beep:"
+msgstr "Passwort"
 
 #: bookwyrm/templates/login.html:33
 msgid "Forgot your password?"
-msgstr "Beep your beep?"
+msgstr ""
 
 #: bookwyrm/templates/login.html:46
 msgid "Contact an administrator to get an invite"
-msgstr "Beep an administrator to get an beep"
+msgstr ""
 
 #: bookwyrm/templates/login.html:56
 msgid "More about this site"
-msgstr "Beep about this beep"
+msgstr ""
 
 #: bookwyrm/templates/notifications.html:10
 msgid "Delete notifications"
-msgstr "Beep beep"
+msgstr ""
 
 #: bookwyrm/templates/notifications.html:101
 msgid "You're all caught up!"
-msgstr "Beep're all caught beep!"
+msgstr ""
 
 #: bookwyrm/templates/password_reset_request.html:7
 msgid "Reset Password"
-msgstr "Reset Beep"
+msgstr ""
 
 #: bookwyrm/templates/password_reset_request.html:9
 msgid "A link to reset your password will be sent to your email address"
-msgstr "A link to reset your password will be sent to your email beep"
+msgstr ""
 
 #: bookwyrm/templates/password_reset_request.html:13
 msgid "Email address:"
-msgstr "Beep beep:"
+msgstr ""
 
 #: bookwyrm/templates/password_reset_request.html:20
 msgid "Reset password"
-msgstr "Beep beep"
+msgstr ""
 
 #: bookwyrm/templates/search_results.html:10
 msgid "Matching Books"
-msgstr "Matching Beep"
+msgstr ""
 
 #: bookwyrm/templates/search_results.html:13
 #, python-format
 msgid "No books found for \"%(query)s\""
-msgstr "Beep books found for \"%(query)s\""
+msgstr ""
 
 #: bookwyrm/templates/search_results.html:29
 msgid "Didn't find what you were looking for?"
-msgstr "Beep't find what you were looking beep?"
+msgstr ""
 
 #: bookwyrm/templates/search_results.html:52
 msgid "Import book"
-msgstr "Beep beep"
+msgstr ""
 
 #: bookwyrm/templates/search_results.html:69
 msgid "Matching Users"
-msgstr "Matching Beep"
+msgstr ""
 
 #: bookwyrm/templates/search_results.html:71
 #, python-format
 msgid "No users found for \"%(query)s\""
-msgstr "Beep users found for \"%(query)s\""
+msgstr ""
 
 #: bookwyrm/templates/search_results.html:86
 #, python-format
 msgid "No lists found for \"%(query)s\""
-msgstr "Beep lists found for \"%(query)s\""
+msgstr ""
 
 #: bookwyrm/templates/tag.html:6
 #, python-format
 msgid "Books tagged \"%(tag.name)s\""
-msgstr "Beep tagged \"%(tag.name)s\""
+msgstr ""
 
 #: bookwyrm/templates/user/user_layout.html:30
 msgid "Follow Requests"
-msgstr "Follow Beep"
+msgstr ""
 
 #: bookwyrm/templates/user/user_layout.html:48
 msgid "Activity"
-msgstr "Beep"
+msgstr ""
 
 #: bookwyrm/templates/user/user_layout.html:54
 msgid "Reading Goal"
-msgstr "Reading Beep"
+msgstr ""
 
 #: bookwyrm/templates/user/user_layout.html:66
 msgid "Shelves"
-msgstr "Beep"
+msgstr ""
 
 #: bookwyrm/templates/user/user_preview.html:13
 #, python-format
 msgid "Joined %(date)s"
-msgstr "Beep %(date)s"
+msgstr ""
diff --git a/locale/en_BEEP/LC_MESSAGES/django.mo b/locale/en_BEEP/LC_MESSAGES/django.mo
deleted file mode 100644
index 26c5ec5a39c06dae5cffd3fa1bf81783636b8d85..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5268
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
E1@1Jx!~g&Q

diff --git a/locale/en_US/LC_MESSAGES/django.mo b/locale/en_US/LC_MESSAGES/django.mo
index 810d271771144ebbac86a529be1c7ed4b0c841d4..c0a5dd97922819649185a3a8135344140fa5f096 100644
GIT binary patch
delta 65
wcmZ3@+{SEiPl#nI0}wC*u?!Ha05LNV>i{tbSOBpPP|^}egVeyl#xOrd0NzCfegFUf

delta 103
zcmZo;Ud<eKPl#nI0}wC)u?!IF05K~N+W;{L1OPFJ9|*)gj0_CnK$;DRmjKy71O_0z
WaNv_!TvEKz!jF+XC$k91WB>sBPYa0v


From 4f76d21b85aea36cd9dd7be8e34294a1cda347df Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 27 Feb 2021 18:48:10 -0800
Subject: [PATCH 0108/1285] Snags more strings for i18n

---
 README.md                                     |    2 +-
 bookwyrm/templates/discover/about.html        |    9 +-
 bookwyrm/templates/discover/discover.html     |    3 +-
 bookwyrm/templates/edit_author.html           |    8 +-
 bookwyrm/templates/edit_book.html             |   47 +-
 bookwyrm/templates/editions.html              |    3 +-
 bookwyrm/templates/error.html                 |    1 +
 bookwyrm/templates/feed/direct_messages.html  |    5 +-
 bookwyrm/templates/feed/feed.html             |   13 +-
 bookwyrm/templates/feed/feed_layout.html      |    7 +-
 bookwyrm/templates/feed/status.html           |    3 +-
 bookwyrm/templates/goal.html                  |    3 +-
 bookwyrm/templates/import.html                |    1 +
 bookwyrm/templates/import_status.html         |    1 +
 bookwyrm/templates/invite.html                |    1 +
 bookwyrm/templates/layout.html                |    6 +-
 bookwyrm/templates/lists/create_form.html     |    3 +-
 bookwyrm/templates/lists/curate.html          |   15 +-
 bookwyrm/templates/lists/edit_form.html       |    3 +-
 bookwyrm/templates/lists/form.html            |   21 +-
 bookwyrm/templates/lists/list.html            |   24 +-
 bookwyrm/templates/lists/list_items.html      |    3 +-
 bookwyrm/templates/lists/list_layout.html     |    4 +-
 bookwyrm/templates/lists/lists.html           |    7 +-
 bookwyrm/templates/login.html                 |    1 +
 bookwyrm/templates/notfound.html              |    5 +-
 bookwyrm/templates/notifications.html         |   27 +-
 bookwyrm/templates/password_reset.html        |   10 +-
 .../templates/password_reset_request.html     |    1 +
 bookwyrm/templates/preferences/blocks.html    |    5 +-
 .../preferences/change_password.html          |    9 +-
 bookwyrm/templates/preferences/edit_user.html |   15 +-
 .../preferences/preferences_layout.html       |   11 +-
 bookwyrm/templates/search_results.html        |    3 +-
 bookwyrm/templates/settings/admin_layout.html |   19 +-
 bookwyrm/templates/settings/federation.html   |    9 +-
 .../templates/settings/manage_invites.html    |   21 +-
 bookwyrm/templates/settings/site.html         |   39 +-
 bookwyrm/templates/snippets/block_button.html |    5 +-
 bookwyrm/templates/snippets/boost_button.html |    9 +-
 .../snippets/content_warning_field.html       |    5 +-
 .../templates/snippets/create_status.html     |    7 +-
 .../snippets/create_status_form.html          |   13 +-
 .../snippets/delete_readthrough_modal.html    |    8 +-
 bookwyrm/templates/snippets/fav_button.html   |    9 +-
 .../templates/snippets/follow_button.html     |    9 +-
 .../snippets/follow_request_buttons.html      |    5 +-
 bookwyrm/templates/snippets/goal_card.html    |    9 +-
 bookwyrm/templates/snippets/goal_form.html    |   11 +-
 .../templates/snippets/goal_progress.html     |    5 +-
 bookwyrm/templates/snippets/pagination.html   |    5 +-
 .../templates/snippets/privacy-icons.html     |   15 +-
 .../templates/snippets/privacy_select.html    |   11 +-
 .../templates/snippets/progress_update.html   |   11 +-
 bookwyrm/templates/snippets/rate_action.html  |    7 +-
 bookwyrm/templates/snippets/readthrough.html  |   13 +-
 .../templates/snippets/readthrough_form.html  |   11 +-
 .../templates/snippets/register_form.html     |    9 +-
 bookwyrm/templates/snippets/rss_title.html    |   11 +-
 .../snippets/search_result_text.html          |    3 +-
 bookwyrm/templates/snippets/shelf.html        |   45 +-
 .../templates/snippets/shelf_selector.html    |    5 +-
 .../shelve_button/finish_reading_modal.html   |   11 +-
 .../shelve_button/shelve_button_dropdown.html |    3 +-
 .../shelve_button/shelve_button_options.html  |    3 +-
 .../shelve_button/start_reading_modal.html    |    9 +-
 .../shelve_button/want_to_read_modal.html     |    7 +-
 bookwyrm/templates/snippets/stars.html        |    3 +-
 .../templates/snippets/status/status.html     |    3 +-
 .../snippets/status/status_body.html          |   13 +-
 .../snippets/status/status_content.html       |    3 +-
 .../snippets/status/status_header.html        |    9 +-
 .../snippets/status/status_options.html       |    7 +-
 .../snippets/switch_edition_button.html       |    3 +-
 bookwyrm/templates/snippets/tag.html          |    5 +-
 bookwyrm/templates/snippets/user_options.html |    5 +-
 bookwyrm/templates/tag.html                   |    1 +
 .../templates/user/create_shelf_form.html     |    7 +-
 bookwyrm/templates/user/edit_shelf_form.html  |    7 +-
 bookwyrm/templates/user/followers.html        |    5 +-
 bookwyrm/templates/user/following.html        |    5 +-
 bookwyrm/templates/user/lists.html            |    3 +-
 bookwyrm/templates/user/user.html             |   20 +-
 bw-dev                                        |    4 +-
 locale/de/LC_MESSAGES/django.mo               |  Bin 973 -> 1438 bytes
 locale/de/LC_MESSAGES/django.po               | 1254 +++++++++++++++--
 locale/en_US/LC_MESSAGES/django.po            | 1191 +++++++++++++++-
 87 files changed, 2662 insertions(+), 528 deletions(-)

diff --git a/README.md b/README.md
index 18463f38..8be03ea1 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ If you have questions about the project or contributing, you can set up a video
 
 ### Translation
 Do you speak a language besides English? BookWyrm needs localization! Existing language files can be found in `bookwyrm/locale/`, and you can generate a language file for a language that isn't currently supported by running:
-`./bw-dev makemessages <language code>`
+`./bw-dev makemessages -l <language code>`
 
 ### Financial Support
 BookWyrm is an ad-free passion project with no intentions of seeking out venture funding or corporate financial relationships. If you want to help keep the project going, you can donate to the [Patreon](https://www.patreon.com/bookwyrm), or make a one time gift via [PayPal](https://paypal.me/oulipo).
diff --git a/bookwyrm/templates/discover/about.html b/bookwyrm/templates/discover/about.html
index 9d3f66dc..dd0a8129 100644
--- a/bookwyrm/templates/discover/about.html
+++ b/bookwyrm/templates/discover/about.html
@@ -1,4 +1,5 @@
 {% extends 'discover/landing_layout.html' %}
+{% load i18n %}
 {% block panel %}
 
 <div class="block columns mt-4">
@@ -6,17 +7,17 @@
         <h2 class="menu-label">About {{ site.name }}</h2>
         <ul class="menu-list">
             <li>
-                <a href="#coc">Code of Conduct</a>
+                <a href="#coc">{% trans "Code of Conduct" %}</a>
             </li>
             <li>
-                <a href="#privacy">Privacy Policy</a>
+                <a href="#privacy">{% trans "Privacy Policy" %}</a>
             </li>
         </ul>
     </nav>
 
     <div class="column content">
         <div class="block" id="coc">
-            <h2 class="title">Code of Conduct</h2>
+            <h2 class="title">{% trans "Code of Conduct" %}</h2>
             <div class="content">
                 {{ site.code_of_conduct | safe }}
             </div>
@@ -25,7 +26,7 @@
         <hr aria-hidden="true">
 
         <div class="block" id="privacy">
-            <h2 class="title">Privacy Policy</h2>
+            <h2 class="title">{% trans "Privacy Policy" %}</h2>
             <div class="content">
                 {{ site.privacy_policy | safe }}
             </div>
diff --git a/bookwyrm/templates/discover/discover.html b/bookwyrm/templates/discover/discover.html
index 289e30d9..d553c368 100644
--- a/bookwyrm/templates/discover/discover.html
+++ b/bookwyrm/templates/discover/discover.html
@@ -1,8 +1,9 @@
 {% extends 'discover/landing_layout.html' %}
+{% load i18n %}
 {% block panel %}
 
 <div class="block is-hidden-tablet">
-    <h2 class="title has-text-centered">Recent Books</h2>
+    <h2 class="title has-text-centered">{% trans "Recent Books" %}</h2>
 </div>
 
 <section class="tile is-ancestor">
diff --git a/bookwyrm/templates/edit_author.html b/bookwyrm/templates/edit_author.html
index 056567d6..ab59cc2d 100644
--- a/bookwyrm/templates/edit_author.html
+++ b/bookwyrm/templates/edit_author.html
@@ -1,4 +1,5 @@
 {% extends 'layout.html' %}
+{% load i18n %}
 {% load humanize %}
 {% block content %}
 <header class="block">
@@ -6,9 +7,9 @@
         Edit "{{ author.name }}"
     </h1>
     <div>
-        <p>Added: {{ author.created_date | naturaltime }}</p>
-        <p>Updated: {{ author.updated_date | naturaltime }}</p>
-        <p>Last edited by: <a href="{{ author.last_edited_by.remote_id }}">{{ author.last_edited_by.display_name }}</a></p>
+        <p>{% trans "Added:" %} {{ author.created_date | naturaltime }}</p>
+        <p>{% trans "Updated:" %} {{ author.updated_date | naturaltime }}</p>
+        <p>{% trans "Last edited by:" %} <a href="{{ author.last_edited_by.remote_id }}">{{ author.last_edited_by.display_name }}</a></p>
     </div>
 </header>
 
@@ -77,4 +78,3 @@
 </form>
 
 {% endblock %}
-
diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/edit_book.html
index fb0bb81c..15c7b878 100644
--- a/bookwyrm/templates/edit_book.html
+++ b/bookwyrm/templates/edit_book.html
@@ -1,4 +1,5 @@
 {% extends 'layout.html' %}
+{% load i18n %}
 {% load humanize %}
 {% block content %}
 <header class="block">
@@ -6,9 +7,9 @@
         Edit "{{ book.title }}"
     </h1>
     <div>
-        <p>Added: {{ book.created_date | naturaltime }}</p>
-        <p>Updated: {{ book.updated_date | naturaltime }}</p>
-        <p>Last edited by: <a href="{{ book.last_edited_by.remote_id }}">{{ book.last_edited_by.display_name }}</a></p>
+        <p>{% trans "Added:" %} {{ book.created_date | naturaltime }}</p>
+        <p>{% trans "Updated:" %} {{ book.updated_date | naturaltime }}</p>
+        <p>{% trans "Last edited by:" %} <a href="{{ book.last_edited_by.remote_id }}">{{ book.last_edited_by.display_name }}</a></p>
     </div>
 </header>
 
@@ -23,32 +24,32 @@
     <input type="hidden" name="last_edited_by" value="{{ request.user.id }}">
     <div class="columns">
         <div class="column">
-            <h2 class="title is-4">Metadata</h2>
-            <p class="fields is-grouped"><label class="label" for="id_title">Title:</label> {{ form.title }} </p>
+            <h2 class="title is-4">{% trans "Metadata" %}</h2>
+            <p class="fields is-grouped"><label class="label" for="id_title">{% trans "Title:" %}</label> {{ form.title }} </p>
             {% for error in form.title.errors %}
             <p class="help is-danger">{{ error | escape }}</p>
             {% endfor %}
-            <p class="fields is-grouped"><label class="label" for="id_subtitle">Subtitle:</label> {{ form.subtitle }} </p>
+            <p class="fields is-grouped"><label class="label" for="id_subtitle">{% trans "Subtitle:" %}</label> {{ form.subtitle }} </p>
             {% for error in form.subtitle.errors %}
             <p class="help is-danger">{{ error | escape }}</p>
             {% endfor %}
-            <p class="fields is-grouped"><label class="label" for="id_description">Description:</label> {{ form.description }} </p>
+            <p class="fields is-grouped"><label class="label" for="id_description">{% trans "Description:" %}</label> {{ form.description }} </p>
             {% for error in form.description.errors %}
             <p class="help is-danger">{{ error | escape }}</p>
             {% endfor %}
-            <p class="fields is-grouped"><label class="label" for="id_series">Series:</label> {{ form.series }} </p>
+            <p class="fields is-grouped"><label class="label" for="id_series">{% trans "Series:" %}</label> {{ form.series }} </p>
             {% for error in form.series.errors %}
             <p class="help is-danger">{{ error | escape }}</p>
             {% endfor %}
-            <p class="fields is-grouped"><label class="label" for="id_series_number">Series number:</label> {{ form.series_number }} </p>
+            <p class="fields is-grouped"><label class="label" for="id_series_number">{% trans "Series number:" %}</label> {{ form.series_number }} </p>
             {% for error in form.series_number.errors %}
             <p class="help is-danger">{{ error | escape }}</p>
             {% endfor %}
-            <p class="fields is-grouped"><label class="label" for="id_first_published_date">First published date:</label> {{ form.first_published_date }} </p>
+            <p class="fields is-grouped"><label class="label" for="id_first_published_date">{% trans "First published date:" %}</label> {{ form.first_published_date }} </p>
             {% for error in form.first_published_date.errors %}
             <p class="help is-danger">{{ error | escape }}</p>
             {% endfor %}
-            <p class="fields is-grouped"><label class="label" for="id_published_date">Published date:</label> {{ form.published_date }} </p>
+            <p class="fields is-grouped"><label class="label" for="id_published_date">{% trans "Published date:" %}</label> {{ form.published_date }} </p>
             {% for error in form.published_date.errors %}
             <p class="help is-danger">{{ error | escape }}</p>
             {% endfor %}
@@ -61,7 +62,7 @@
                 </div>
                 <div class="column is-narrow">
                     <div class="block">
-                        <h2 class="title is-4">Cover</h2>
+                        <h2 class="title is-4">{% trans "Cover" %}</h2>
                         <p>{{ form.cover }}</p>
                         {% for error in form.cover.errors %}
                         <p class="help is-danger">{{ error | escape }}</p>
@@ -71,8 +72,8 @@
             </div>
 
             <div class="block">
-                <h2 class="title is-4">Physical Properties</h2>
-                <p class="fields is-grouped"><label class="label" for="id_physical_format">Format:</label> {{ form.physical_format }} </p>
+                <h2 class="title is-4">{% trans "Physical Properties" %}</h2>
+                <p class="fields is-grouped"><label class="label" for="id_physical_format">{% trans "Format:" %}</label> {{ form.physical_format }} </p>
                 {% for error in form.physical_format.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
@@ -80,31 +81,31 @@
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
 
-                <p class="fields is-grouped"><label class="label" for="id_pages">Pages:</label> {{ form.pages }} </p>
+                <p class="fields is-grouped"><label class="label" for="id_pages">{% trans "Pages:" %}</label> {{ form.pages }} </p>
                 {% for error in form.pages.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
             </div>
 
             <div class="block">
-                <h2 class="title is-4">Book Identifiers</h2>
-                <p class="fields is-grouped"><label class="label" for="id_isbn_13">ISBN 13:</label> {{ form.isbn_13 }} </p>
+                <h2 class="title is-4">{% trans "Book Identifiers" %}</h2>
+                <p class="fields is-grouped"><label class="label" for="id_isbn_13">{% trans "ISBN 13:" %}</label> {{ form.isbn_13 }} </p>
                 {% for error in form.isbn_13.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
-                <p class="fields is-grouped"><label class="label" for="id_isbn_10">ISBN 10:</label> {{ form.isbn_10 }} </p>
+                <p class="fields is-grouped"><label class="label" for="id_isbn_10">{% trans "ISBN 10:" %}</label> {{ form.isbn_10 }} </p>
                 {% for error in form.isbn_10.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
-                <p class="fields is-grouped"><label class="label" for="id_openlibrary_key">Openlibrary key:</label> {{ form.openlibrary_key }} </p>
+                <p class="fields is-grouped"><label class="label" for="id_openlibrary_key">{% trans "Openlibrary key:" %}</label> {{ form.openlibrary_key }} </p>
                 {% for error in form.openlibrary_key.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
-                <p class="fields is-grouped"><label class="label" for="id_librarything_key">OCLC Number:</label> {{ form.oclc_number }} </p>
+                <p class="fields is-grouped"><label class="label" for="id_librarything_key">{% trans "OCLC Number:" %}</label> {{ form.oclc_number }} </p>
                 {% for error in form.oclc_number.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
-                <p class="fields is-grouped"><label class="label" for="id_asin">ASIN:</label> {{ form.asin }} </p>
+                <p class="fields is-grouped"><label class="label" for="id_asin">{% trans "ASIN:" %}</label> {{ form.asin }} </p>
                 {% for error in form.ASIN.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
@@ -113,8 +114,8 @@
     </div>
 
     <div class="block">
-        <button class="button is-primary" type="submit">Save</button>
-        <a class="button" href="/book/{{ book.id }}">Cancel</a>
+        <button class="button is-primary" type="submit">{% trans "Save" %}</button>
+        <a class="button" href="/book/{{ book.id }}">{% trans "Cancel" %}</a>
     </div>
 </form>
 
diff --git a/bookwyrm/templates/editions.html b/bookwyrm/templates/editions.html
index 619ceafb..7dfabc93 100644
--- a/bookwyrm/templates/editions.html
+++ b/bookwyrm/templates/editions.html
@@ -1,8 +1,9 @@
 {% extends 'layout.html' %}
+{% load i18n %}
 {% load bookwyrm_tags %}
 {% block content %}
 <div class="block">
-    <h1 class="title">Editions of <a href="/book/{{ work.id }}">"{{ work.title }}"</a></h1>
+    <h1 class="title">{% blocktrans with path=work.local_path work_title=work.title %}Editions of <a href="{{ work_path }}">"{{ work_title }}"</a>{% endblocktrans %}</h1>
 
     {% include 'snippets/book_tiles.html' with books=editions %}
 </div>
diff --git a/bookwyrm/templates/error.html b/bookwyrm/templates/error.html
index fbf96ba2..99a9a624 100644
--- a/bookwyrm/templates/error.html
+++ b/bookwyrm/templates/error.html
@@ -1,4 +1,5 @@
 {% extends 'layout.html' %}
+{% load i18n %}
 {% block content %}
 
 <div class="block">
diff --git a/bookwyrm/templates/feed/direct_messages.html b/bookwyrm/templates/feed/direct_messages.html
index f3102ee7..12eaeb0b 100644
--- a/bookwyrm/templates/feed/direct_messages.html
+++ b/bookwyrm/templates/feed/direct_messages.html
@@ -1,9 +1,10 @@
 {% extends 'feed/feed_layout.html' %}
+{% load i18n %}
 {% block panel %}
 
 <header class="block">
     <h1 class="title">Direct Messages{% if partner %} with {% include 'snippets/username.html' with user=partner %}{% endif %}</h1>
-    {% if partner %}<p class="subtitle"><a href="/direct-messages"><span class="icon icon-arrow-left" aria-hidden="true"></span> All messages</a></p>{% endif %}
+    {% if partner %}<p class="subtitle"><a href="/direct-messages"><span class="icon icon-arrow-left" aria-hidden="true"></span> {% trans "All messages" %}</a></p>{% endif %}
 </header>
 
 <div class="box">
@@ -12,7 +13,7 @@
 
 <section class="block">
     {% if not activities %}
-    <p>You have no messages right now.</p>
+    <p>{% trans "You have no messages right now." %}</p>
     {% endif %}
     {% for activity in activities %}
     <div class="block">
diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html
index 7029fd69..71b59cc1 100644
--- a/bookwyrm/templates/feed/feed.html
+++ b/bookwyrm/templates/feed/feed.html
@@ -1,18 +1,19 @@
 {% extends 'feed/feed_layout.html' %}
+{% load i18n %}
 {% load bookwyrm_tags %}
 {% block panel %}
 
-<h1 class="title">{{ tab | title }} Timeline</h1>
+<h1 class="title">{% blocktrans with tab_title=tab|title %}{{ tab_title }} Timeline{% endblocktrans %}</h1>
 <div class="tabs">
     <ul>
         <li class="{% if tab == 'home' %}is-active{% endif %}">
-            <a href="/#feed">Home</a>
+            <a href="/#feed">{% trans "Home" %}</a>
         </li>
         <li class="{% if tab == 'local' %}is-active{% endif %}">
-            <a href="/local#feed">Local</a>
+            <a href="/local#feed">{% trans "Local" %}</a>
         </li>
         <li class="{% if tab == 'federated' %}is-active{% endif %}">
-            <a href="/federated#feed">Federated</a>
+            <a href="/federated#feed">{% trans "Federated" %}</a>
         </li>
     </ul>
 </div>
@@ -20,7 +21,7 @@
 {# announcements and system messages #}
 {% if not goal and tab == 'home' %}
 {% now 'Y' as year %}
-<section class="block hidden" aria-title="Announcements" data-hide="hide-{{ year }}-reading-goal">
+<section class="block hidden" aria-title="{% trans 'Announcements' %}" data-hide="hide-{{ year }}-reading-goal">
     {% include 'snippets/goal_card.html' with year=year %}
     <hr>
 </section>
@@ -28,7 +29,7 @@
 
 {# activity feed #}
 {% if not activities %}
-<p>There aren't any activities right now! Try following a user to get started</p>
+<p>{% trans "There aren't any activities right now! Try following a user to get started" %}</p>
 {% endif %}
 {% for activity in activities %}
 <div class="block">
diff --git a/bookwyrm/templates/feed/feed_layout.html b/bookwyrm/templates/feed/feed_layout.html
index 00ac4ab8..2d8937bf 100644
--- a/bookwyrm/templates/feed/feed_layout.html
+++ b/bookwyrm/templates/feed/feed_layout.html
@@ -1,13 +1,14 @@
 {% extends 'layout.html' %}
+{% load i18n %}
 {% load bookwyrm_tags %}
 {% block content %}
 
 <div class="columns">
     {% if user.is_authenticated %}
     <div class="column is-one-third">
-        <h2 class="title is-5">Your books</h2>
+        <h2 class="title is-5">{% trans "Your books" %}</h2>
         {% if not suggested_books %}
-        <p>There are no books here right now! Try searching for a book to get started</p>
+        <p>{% trans "There are no books here right now! Try searching for a book to get started" %}</p>
         {% else %}
         <div class="tabs is-small">
             <ul role="tablist">
@@ -64,7 +65,7 @@
         {% if goal %}
         <section class="section">
             <div class="block">
-                <h3 class="title is-4">{{ goal.year }} Reading Goal</h3>
+                <h3 class="title is-4">{% blocktrans with yar=goal.year %}{{ year }} Reading Goal{% endblocktrans %}</h3>
                 {% include 'snippets/goal_progress.html' with goal=goal %}
             </div>
         </section>
diff --git a/bookwyrm/templates/feed/status.html b/bookwyrm/templates/feed/status.html
index eb848993..06d536fc 100644
--- a/bookwyrm/templates/feed/status.html
+++ b/bookwyrm/templates/feed/status.html
@@ -1,9 +1,10 @@
 {% extends 'feed/feed_layout.html' %}
+{% load i18n %}
 {% block panel %}
 <header class="block">
     <a href="/#feed" class="button" data-back>
         <span class="icon icon-arrow-left" aira-hidden="true"></span>
-        <span>Back</span>
+        <span>{% trans "Back" %}</span>
     </a>
 </header>
 
diff --git a/bookwyrm/templates/goal.html b/bookwyrm/templates/goal.html
index f91a1ac7..4a16ccb6 100644
--- a/bookwyrm/templates/goal.html
+++ b/bookwyrm/templates/goal.html
@@ -1,4 +1,5 @@
 {% extends 'user/user_layout.html' %}
+{% load i18n %}
 
 {% block header %}
 <div class="columns is-mobile">
@@ -34,7 +35,7 @@
     {% endif %}
 
     {% if not goal and user != request.user %}
-    <p>{{ user.display_name }} hasn't set a reading goal for {{ year }}.</p>
+    <p>{% blocktrans with name=user.display_name %}{{ name }} hasn't set a reading goal for {{ year }}.{% endblocktrans %}</p>
     {% endif %}
 
     {% if goal %}
diff --git a/bookwyrm/templates/import.html b/bookwyrm/templates/import.html
index ee1a90a4..ea62ac55 100644
--- a/bookwyrm/templates/import.html
+++ b/bookwyrm/templates/import.html
@@ -1,4 +1,5 @@
 {% extends 'layout.html' %}
+{% load i18n %}
 {% load humanize %}
 {% block content %}
 <div class="block">
diff --git a/bookwyrm/templates/import_status.html b/bookwyrm/templates/import_status.html
index 4c3d46d3..ca87113f 100644
--- a/bookwyrm/templates/import_status.html
+++ b/bookwyrm/templates/import_status.html
@@ -1,4 +1,5 @@
 {% extends 'layout.html' %}
+{% load i18n %}
 {% load bookwyrm_tags %}
 {% load humanize %}
 {% block content %}
diff --git a/bookwyrm/templates/invite.html b/bookwyrm/templates/invite.html
index b01afec3..2ee15972 100644
--- a/bookwyrm/templates/invite.html
+++ b/bookwyrm/templates/invite.html
@@ -1,4 +1,5 @@
 {% extends 'layout.html' %}
+{% load i18n %}
 {% block content %}
 
 <div class="columns">
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 70c44e07..39b78196 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -34,7 +34,7 @@
                 </div>
                 <div class="control">
                     <button class="button" type="submit">
-                        <span class="icon icon-search" title="Search">
+                        <span class="icon icon-search" title="{% trans 'Search' %}">
                             <span class="is-sr-only">{% trans "search" %}</span>
                         </span>
                     </button>
@@ -44,7 +44,7 @@
 
         <div role="button" tabindex="0" class="navbar-burger pulldown-menu" data-controls="main-nav" aria-expanded="false">
             <div class="navbar-item mt-3">
-                <div class="icon icon-dots-three-vertical" title="Main navigation menu">
+                <div class="icon icon-dots-three-vertical" title="{% trans 'Main navigation menu' %}">
                     <span class="is-sr-only">{% trans "Main navigation menu" %}</span>
                 </div>
             </div>
@@ -122,7 +122,7 @@
             <div class="navbar-item">
                 <a href="/notifications" class="tags has-addons">
                     <span class="tag is-medium">
-                        <span class="icon icon-bell" title="Notifications">
+                        <span class="icon icon-bell" title="{% trans 'Notifications' %}">
                             <span class="is-sr-only">{% trans "Notifications" %}</span>
                         </span>
                     </span>
diff --git a/bookwyrm/templates/lists/create_form.html b/bookwyrm/templates/lists/create_form.html
index 706dff08..6a42a90a 100644
--- a/bookwyrm/templates/lists/create_form.html
+++ b/bookwyrm/templates/lists/create_form.html
@@ -1,7 +1,8 @@
 {% extends 'components/inline_form.html' %}
+{% load i18n %}
 
 {% block header %}
-Create List
+{% trans "Create List" %}
 {% endblock %}
 
 {% block form %}
diff --git a/bookwyrm/templates/lists/curate.html b/bookwyrm/templates/lists/curate.html
index a7e0fe79..a040dd5f 100644
--- a/bookwyrm/templates/lists/curate.html
+++ b/bookwyrm/templates/lists/curate.html
@@ -1,17 +1,18 @@
 {% extends 'lists/list_layout.html' %}
+{% load i18n %}
 {% block panel %}
 
 <section class="content block">
-    <h2>Pending Books</h2>
-    <p><a href="{% url 'list' list.id %}">Go to list</a></p>
+    <h2>{% trans "Pending Books" %}</h2>
+    <p><a href="{% url 'list' list.id %}">{% trans "Go to list" %}</a></p>
     {% if not pending.exists %}
-    <p>You're all set!</p>
+    <p>{% trans "You're all set!" %}</p>
     {% else %}
     <table class="table is-striped">
         <tr>
             <th></th>
-            <th>Book</th>
-            <th>Suggested by</th>
+            <th>{% trans "Book" %}</th>
+            <th>{% trans "Suggested by" %}</th>
             <th></th>
         </tr>
         {% for item in pending %}
@@ -31,13 +32,13 @@
                         {% csrf_token %}
                         <input type="hidden" name="item" value="{{ item.id }}">
                         <input type="hidden" name="approved" value="true">
-                        <button class="button">Approve</button>
+                        <button class="button">{% trans "Approve" %}</button>
                     </form>
                     <form class="control" method="POST" action="{% url 'list-curate' list.id %}">
                         {% csrf_token %}
                         <input type="hidden" name="item" value="{{ item.id }}">
                         <input type="hidden" name="approved" value="false">
-                        <button class="button is-danger is-light">Discard</button>
+                        <button class="button is-danger is-light">{% trans "Discard" %}</button>
                     </div>
                 </form>
             </td>
diff --git a/bookwyrm/templates/lists/edit_form.html b/bookwyrm/templates/lists/edit_form.html
index 55723b72..917e5e2a 100644
--- a/bookwyrm/templates/lists/edit_form.html
+++ b/bookwyrm/templates/lists/edit_form.html
@@ -1,7 +1,8 @@
 {% extends 'components/inline_form.html' %}
+{% load i18n %}
 
 {% block header %}
-Edit List
+{% trans "Edit List" %}
 {% endblock %}
 
 {% block form %}
diff --git a/bookwyrm/templates/lists/form.html b/bookwyrm/templates/lists/form.html
index ec265cc1..e5eb9c37 100644
--- a/bookwyrm/templates/lists/form.html
+++ b/bookwyrm/templates/lists/form.html
@@ -1,34 +1,35 @@
+{% load i18n %}
 {% csrf_token %}
 <input type="hidden" name="user" value="{{ request.user.id }}">
 
 <div class="columns">
     <div class="column">
         <div class="field">
-            <label class="label" for="id_name">Name:</label>
+            <label class="label" for="id_name">{% trans "Name:" %}</label>
             {{ list_form.name }}
         </div>
         <div class="field">
-            <label class="label" for="id_description">Description:</label>
+            <label class="label" for="id_description">{% trans "Description:" %}</label>
             {{ list_form.description }}
         </div>
     </div>
     <div class="column">
         <fieldset class="field">
-            <legend class="label">List curation:</legend>
+            <legend class="label">{% trans "List curation:" %}</legend>
 
             <label class="field">
-                <input type="radio" name="curation" value="closed"{% if not list or list.curation == 'closed' %} checked{% endif %}> Closed
-                <p class="help mb-2">Only you can add and remove books to this list</p>
+                <input type="radio" name="curation" value="closed"{% if not list or list.curation == 'closed' %} checked{% endif %}> {% trans "Closed" %}
+                <p class="help mb-2">{% trans "Only you can add and remove books to this list" %}</p>
             </label>
 
             <label class="field">
-                <input type="radio" name="curation" value="curated"{% if list.curation == 'curated' %} checked{% endif %}> Curated
-                <p class="help mb-2">Anyone can suggest books, subject to your approval</p>
+                <input type="radio" name="curation" value="curated"{% if list.curation == 'curated' %} checked{% endif %}> {% trans "Curated" %}
+                <p class="help mb-2">{% trans "Anyone can suggest books, subject to your approval" %}</p>
             </label>
 
             <label class="field">
-                <input type="radio" name="curation" value="open"{% if list.curation == 'open' %} checked{% endif %}> Open
-                <p class="help mb-2">Anyone can add books to this list</p>
+                <input type="radio" name="curation" value="open"{% if list.curation == 'open' %} checked{% endif %}> {% trans "Open" %}
+                <p class="help mb-2">{% trans "Anyone can add books to this list" %}</p>
             </label>
         </fieldset>
     </div>
@@ -38,7 +39,7 @@
         {% include 'snippets/privacy_select.html' with current=list.privacy %}
     </div>
     <div class="control">
-        <button type="submit" class="button is-primary">Save</button>
+        <button type="submit" class="button is-primary">{% trans "Save" %}</button>
     </div>
 </div>
 
diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index c5aef606..42d99d8a 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -1,4 +1,5 @@
 {% extends 'lists/list_layout.html' %}
+{% load i18n %}
 {% load bookwyrm_tags %}
 {% block panel %}
 
@@ -13,7 +14,7 @@
 <div class="columns mt-3">
     <section class="column is-three-quarters">
         {% if not items.exists %}
-        <p>This list is currently empty</p>
+        <p>{% trans "This list is currently empty" %}</p>
         {% else %}
         <ol>
         {% for item in items %}
@@ -31,13 +32,13 @@
                     </div>
                     <div class="card-footer has-background-white-bis">
                         <div class="card-footer-item">
-                            <p>Added by {% include 'snippets/username.html' with user=item.user %}</p>
+                            <p>{% trans "Added by" %} {% include 'snippets/username.html' with user=item.user %}</p>
                         </div>
                         {% if list.user == request.user or list.curation == 'open' and item.user == request.user %}
                         <form name="add-book" method="post" action="{% url 'list-remove-book' list.id %}" class="card-footer-item">
                             {% csrf_token %}
                             <input type="hidden" name="item" value="{{ item.id }}">
-                            <button type="submit" class="button is-small is-danger">Remove</button>
+                            <button type="submit" class="button is-small is-danger">{% trans "Remove" %}</button>
                         </form>
                         {% endif %}
                     </div>
@@ -50,26 +51,29 @@
 
     {% if request.user.is_authenticated and not list.curation == 'closed' or request.user == list.user %}
     <section class="column is-one-quarter content">
-        <h2>{% if list.curation == 'open' or request.user == list.user %}Add{% else %}Suggest{% endif %} Books</h2>
+        <h2>{% if list.curation == 'open' or request.user == list.user %}{% trans "Add Books" %}{% else %}{% trans "Suggest Books" %}{% endif %}</h2>
         <form name="search" action="{% url 'list' list.id %}" method="GET" class="block">
             <div class="field has-addons">
                 <div class="control">
-                    <input aria-label="Search for a book" class="input" type="text" name="q" placeholder="Search for a book" value="{{ query }}">
+                    <input aria-label="{% trans 'Search for a book' %}" class="input" type="text" name="q" placeholder="{% trans 'Search for a book' %}" value="{{ query }}">
                 </div>
                 <div class="control">
                     <button class="button" type="submit">
-                        <span class="icon icon-search" title="Search">
-                            <span class="is-sr-only">search</span>
+                        <span class="icon icon-search" title="{% trans 'Search' %}">
+                            <span class="is-sr-only">{% trans "search" %}</span>
                         </span>
                     </button>
                 </div>
             </div>
             {% if query %}
-            <p class="help"><a href="{% url 'list' list.id %}">Clear search</a></p>
+            <p class="help"><a href="{% url 'list' list.id %}">{% trans "Clear search" %}</a></p>
             {% endif %}
         </form>
         {% if not suggested_books %}
-        <p>No books found{% if query %} matching the query "{{ query }}"{% endif %}</p>
+        {% if query %}
+        <p>{% blocktrans %}No books found matching the query "{{ query }}"{% endblocktrans %}</p>{% else %}
+        <p>{% trans "No books found" %}</p>
+        {% endif %}
         {% endif %}
         {% for book in suggested_books %}
         {% if book %}
@@ -82,7 +86,7 @@
                 <form name="add-book" method="post" action="{% url 'list-add-book' list.id %}">
                     {% csrf_token %}
                     <input type="hidden" name="book" value="{{ book.id }}">
-                    <button type="submit" class="button is-small is-link">{% if list.curation == 'open' or request.user == list.user %}Add{% else %}Suggest{% endif %}</button>
+                    <button type="submit" class="button is-small is-link">{% if list.curation == 'open' or request.user == list.user %}{% trans "Add" %}{% else %}{% trans "Suggest" %}{% endif %}</button>
                 </form>
             </div>
         </div>
diff --git a/bookwyrm/templates/lists/list_items.html b/bookwyrm/templates/lists/list_items.html
index a487bbd6..646a910f 100644
--- a/bookwyrm/templates/lists/list_items.html
+++ b/bookwyrm/templates/lists/list_items.html
@@ -1,4 +1,5 @@
 {% load bookwyrm_tags %}
+{% load i18n %}
 <div class="columns is-multiline">
     {% for list in lists %}
     <div class="column is-one-quarter">
@@ -15,7 +16,7 @@
             </div>
             <div class="card-content is-flex-grow-0">
                 {% if list.description %}{{ list.description | to_markdown | safe | truncatewords_html:20 }}{% endif %}
-                <p class="subtitle help">Created {% if list.curation != 'open' %} and curated{% endif %} by {% include 'snippets/username.html' with user=list.user %}</p>
+                <p class="subtitle help">{% if list.curation != 'open' %}{% trans "Created and curated by" %}{% else %}{% trans "Created by" %}{% endif %} {% include 'snippets/username.html' with user=list.user %}</p>
             </div>
         </div>
     </div>
diff --git a/bookwyrm/templates/lists/list_layout.html b/bookwyrm/templates/lists/list_layout.html
index f5855f27..8e2e36e6 100644
--- a/bookwyrm/templates/lists/list_layout.html
+++ b/bookwyrm/templates/lists/list_layout.html
@@ -1,11 +1,13 @@
 {% extends 'layout.html' %}
+{% load i18n %}
 {% load bookwyrm_tags %}
 {% block content %}
 
 <header class="columns content is-mobile">
     <div class="column">
         <h1 class="title">{{ list.name }} <span class="subtitle">{% include 'snippets/privacy-icons.html' with item=list %}</span></h1>
-        <p class="subtitle help">Created {% if list.curation != 'open' %} and curated{% endif %} by {% include 'snippets/username.html' with user=list.user %}</p>
+        <p class="subtitle help">{% if list.curation != 'open' %}{% trans "Created and curated by" %}{% else %}{% trans "Created by" %} {% include 'snippets/username.html' with user=list.user %}</p>
+        {% endif %}
         {% include 'snippets/trimmed_text.html' with full=list.description %}
     </div>
     {% if request.user == list.user %}
diff --git a/bookwyrm/templates/lists/lists.html b/bookwyrm/templates/lists/lists.html
index 259d0820..07032676 100644
--- a/bookwyrm/templates/lists/lists.html
+++ b/bookwyrm/templates/lists/lists.html
@@ -1,13 +1,14 @@
 {% extends 'layout.html' %}
+{% load i18n %}
 {% block content %}
 
 <header class="block">
-    <h1 class="title">Lists</h1>
+    <h1 class="title">{% trans "Lists" %}</h1>
 </header>
 {% if request.user.is_authenticated and not lists.has_previous %}
 <header class="block columns is-mobile">
     <div class="column">
-        <h2 class="title">Your lists</h2>
+        <h2 class="title">{% trans "Your lists" %}</h2>
     </div>
     <div class="column is-narrow">
         {% include 'snippets/toggle/open_button.html' with controls_text="create-list" icon="plus" text="Create new list" focus="create-list-header" %}
@@ -32,7 +33,7 @@
 
 {% if lists %}
 <section class="block content">
-    <h2 class="title">Recent Lists</h2>
+    <h2 class="title">{% trans "Recent Lists" %}</h2>
     {% include 'lists/list_items.html' with lists=lists %}
 </section>
 <div>
diff --git a/bookwyrm/templates/login.html b/bookwyrm/templates/login.html
index 104e8ef7..1429f412 100644
--- a/bookwyrm/templates/login.html
+++ b/bookwyrm/templates/login.html
@@ -1,4 +1,5 @@
 {% extends 'layout.html' %}
+{% load i18n %}
 {% block content %}
 
 <div class="columns">
diff --git a/bookwyrm/templates/notfound.html b/bookwyrm/templates/notfound.html
index 73fe54c2..bb419cad 100644
--- a/bookwyrm/templates/notfound.html
+++ b/bookwyrm/templates/notfound.html
@@ -1,9 +1,10 @@
 {% extends 'layout.html' %}
+{% load i18n %}
 {% block content %}
 
 <div class="block">
-    <h1 class="title">Not Found</h1>
-    <p>The page your requested doesn't seem to exist!</p>
+    <h1 class="title">{% trans "Not Found" %}</h1>
+    <p>{% trans "The page your requested doesn't seem to exist!" %}</p>
 </div>
 
 {% endblock %}
diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html
index 5c009cba..20d9f254 100644
--- a/bookwyrm/templates/notifications.html
+++ b/bookwyrm/templates/notifications.html
@@ -42,32 +42,41 @@
                             {% include 'snippets/avatar.html' with user=notification.related_user %}
                             {% include 'snippets/username.html' with user=notification.related_user %}
                             {% if notification.notification_type == 'FAVORITE' %}
+                                {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path %}
                                 favorited your
-                                <a href="{{ related_status.local_path }}">{{ related_status | status_preview_name|safe }}</a>
+                                <a href="{{ related_path }}">{{ preview_name }}</a>
+                                {% endblocktrans %}
 
                             {% elif notification.notification_type == 'MENTION' %}
+                                {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path %}
                                 mentioned you in a
-                                <a href="{{ related_status.local_path }}">{{ related_status | status_preview_name|safe }}</a>
+                                <a href="{{ related_path }}">{{ preview_name }}</a>
+                                {% endblocktrans %}
 
                             {% elif notification.notification_type == 'REPLY' %}
-                                <a href="{{ related_status.local_path }}">replied</a>
+                                {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path parent_path=related_status.reply_parent.local_path %}
+                                <a href="{{ related_path }}">replied</a>
                                 to your
-                                <a href="{{ related_status.reply_parent.local_path }}">{{ related_status | status_preview_name|safe }}</a>
+                                <a href="{{ parent_path }}">{{ preview_name }}</a>
+                                {% endblocktrans %}
+
                             {% elif notification.notification_type == 'FOLLOW' %}
-                                followed you
+                                {% trans "followed you" %}
                                 {% include 'snippets/follow_button.html' with user=notification.related_user %}
                             {% elif notification.notification_type == 'FOLLOW_REQUEST' %}
-                                sent you a follow request
+                                {% trans "sent you a follow request" %}
                                 <div class="row shrink">
                                     {% include 'snippets/follow_request_buttons.html' with user=notification.related_user %}
                                 </div>
                             {% elif notification.notification_type == 'BOOST' %}
-                                boosted your <a href="{{ related_status.local_path }}">{{ related_status | status_preview_name|safe }}</a>
+                                {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path %}
+                                boosted your <a href="{{ related_path }}">{{ preview_name }}</a>
+                                {% endblocktrans %}
                             {% elif notification.notification_type == 'ADD' %}
-                            {% if notification.related_list_item.approved %}added{% else %}suggested adding{% endif %} {% include 'snippets/book_titleby.html' with book=notification.related_list_item.book %} to your list "<a href="{{ notification.related_list_item.book_list.local_path }}{% if not notification.related_list_item.approved %}/curate{% endif %}">{{ notification.related_list_item.book_list.name }}</a>"
+                            {% if notification.related_list_item.approved %}{% trans "added" %}{% else %}{% trans "suggested adding" %}{% endif %} {% include 'snippets/book_titleby.html' with book=notification.related_list_item.book %} to your list "<a href="{{ notification.related_list_item.book_list.local_path }}{% if not notification.related_list_item.approved %}/curate{% endif %}">{{ notification.related_list_item.book_list.name }}</a>"
                             {% endif %}
                         {% elif notification.related_import %}
-                            your <a href="/import/{{ notification.related_import.id }}">import</a> completed.
+                            {% blocktrans with related_id=notification.related_import.id %} your <a href="/import/{{ related_id }}">import</a> completed.{% endblocktrans %}
                         {% endif %}
                     </p>
                 </div>
diff --git a/bookwyrm/templates/password_reset.html b/bookwyrm/templates/password_reset.html
index e8da6562..656e2dff 100644
--- a/bookwyrm/templates/password_reset.html
+++ b/bookwyrm/templates/password_reset.html
@@ -1,30 +1,31 @@
 {% extends 'layout.html' %}
+{% load i18n %}
 {% block content %}
 
 <div class="columns">
     <div class="column">
         <div class="block">
-            <h1 class="title">Reset Password</h1>
+            <h1 class="title">{% trans "Reset Password" %}</h1>
             {% for error in errors %}
             <p class="is-danger">{{ error }}</p>
             {% endfor %}
             <form name="password-reset" method="post" action="/password-reset/{{ code }}">
                 {% csrf_token %}
                 <div class="field">
-                    <label class="label" for="id_password">Password:</label>
+                    <label class="label" for="id_password">{% trans "Password:" %}</label>
                     <div class="control">
                         <input type="password" name="password" maxlength="128" class="input" required="" id="id_password">
                     </div>
                 </div>
                 <div class="field">
-                    <label class="label" for="id_confirm_password">Confirm password:</label>
+                    <label class="label" for="id_confirm_password">{% trans "Confirm password:" %}</label>
                     <div class="control">
                         <input type="password" name="confirm-password" maxlength="128" class="input" required="" id="id_confirm_password">
                     </div>
                 </div>
                 <div class="field is-grouped">
                     <div class="control">
-                        <button class="button is-primary" type="submit">Confirm</button>
+                        <button class="button is-primary" type="submit">{% trans "Confirm" %}</button>
                     </div>
                 </div>
             </form>
@@ -36,7 +37,6 @@
             {% include 'snippets/about.html' %}
         </div>
     </div>
-
 </div>
 {% endblock %}
 
diff --git a/bookwyrm/templates/password_reset_request.html b/bookwyrm/templates/password_reset_request.html
index 23eff657..87dc8e65 100644
--- a/bookwyrm/templates/password_reset_request.html
+++ b/bookwyrm/templates/password_reset_request.html
@@ -1,4 +1,5 @@
 {% extends 'layout.html' %}
+{% load i18n %}
 {% block content %}
 
 <div class="columns is-centered">
diff --git a/bookwyrm/templates/preferences/blocks.html b/bookwyrm/templates/preferences/blocks.html
index 5fd29d25..e26a5229 100644
--- a/bookwyrm/templates/preferences/blocks.html
+++ b/bookwyrm/templates/preferences/blocks.html
@@ -1,12 +1,13 @@
 {% extends 'preferences/preferences_layout.html' %}
+{% load i18n %}
 
 {% block header %}
-Blocked Users
+{% trans "Blocked Users" %}
 {% endblock %}
 
 {% block panel %}
 {% if not request.user.blocks.exists %}
-<p>No users currently blocked.</p>
+<p>{% trans "No users currently blocked." %}</p>
 {% else %}
 <ul>
 {% for user in request.user.blocks.all %}
diff --git a/bookwyrm/templates/preferences/change_password.html b/bookwyrm/templates/preferences/change_password.html
index b1b2a049..46707946 100644
--- a/bookwyrm/templates/preferences/change_password.html
+++ b/bookwyrm/templates/preferences/change_password.html
@@ -1,19 +1,20 @@
 {% extends 'preferences/preferences_layout.html' %}
+{% load i18n %}
 {% block header %}
-Change Password
+{% trans "Change Password" %}
 {% endblock %}
 
 {% block panel %}
 <form name="edit-profile" action="/change-password/" method="post" enctype="multipart/form-data">
     {% csrf_token %}
     <div class="block">
-        <label class="label" for="id_password">New password:</label>
+        <label class="label" for="id_password">{% trans "New password:" %}</label>
         <input type="password" name="password" maxlength="128" class="input" required="" id="id_password">
     </div>
     <div class="block">
-        <label class="label" for="id_confirm_password">Confirm password:</label>
+        <label class="label" for="id_confirm_password">{% trans "Confirm password:" %}</label>
         <input type="password" name="confirm-password" maxlength="128" class="input" required="" id="id_confirm_password">
     </div>
-    <button class="button is-primary" type="submit">Change password</button>
+    <button class="button is-primary" type="submit">{% trans "Change password" %}</button>
 </form>
 {% endblock %}
diff --git a/bookwyrm/templates/preferences/edit_user.html b/bookwyrm/templates/preferences/edit_user.html
index 798d2fcb..d5b76c07 100644
--- a/bookwyrm/templates/preferences/edit_user.html
+++ b/bookwyrm/templates/preferences/edit_user.html
@@ -1,6 +1,7 @@
 {% extends 'preferences/preferences_layout.html' %}
+{% load i18n %}
 {% block header %}
-Edit Profile
+{% trans "Edit Profile" %}
 {% endblock %}
 
 {% block panel %}
@@ -10,28 +11,28 @@ Edit Profile
 <form name="edit-profile" action="{% url 'prefs-profile' %}" method="post" enctype="multipart/form-data">
     {% csrf_token %}
     <div class="block">
-        <label class="label" for="id_avatar">Avatar:</label>
+        <label class="label" for="id_avatar">{% trans "Avatar:" %}</label>
         {{ form.avatar }}
         {% for error in form.avatar.errors %}
         <p class="help is-danger">{{ error | escape }}</p>
         {% endfor %}
     </div>
     <div class="block">
-        <label class="label" for="id_name">Display name:</label>
+        <label class="label" for="id_name">{% trans "Display name:" %}</label>
         {{ form.name }}
         {% for error in form.name.errors %}
         <p class="help is-danger">{{ error | escape }}</p>
         {% endfor %}
     </div>
     <div class="block">
-        <label class="label" for="id_summary">Summary:</label>
+        <label class="label" for="id_summary">{% trans "Summary:" %}</label>
         {{ form.summary }}
         {% for error in form.summary.errors %}
         <p class="help is-danger">{{ error | escape }}</p>
         {% endfor %}
     </div>
     <div class="block">
-        <label class="label" for="id_email">Email address:</label>
+        <label class="label" for="id_email">{% trans "Email address:" %}</label>
         {{ form.email }}
         {% for error in form.email.errors %}
         <p class="help is-danger">{{ error | escape }}</p>
@@ -39,10 +40,10 @@ Edit Profile
     </div>
     <div class="block">
         <label class="checkbox label" for="id_manually_approves_followers">
-            Manually approve followers:
+            {% trans "Manually approve followers:" %}
             {{ form.manually_approves_followers }}
         </label>
     </div>
-    <button class="button is-primary" type="submit">Save</button>
+    <button class="button is-primary" type="submit">{% trans "Save" %}</button>
 </form>
 {% endblock %}
diff --git a/bookwyrm/templates/preferences/preferences_layout.html b/bookwyrm/templates/preferences/preferences_layout.html
index b0e7b31a..c0f78f95 100644
--- a/bookwyrm/templates/preferences/preferences_layout.html
+++ b/bookwyrm/templates/preferences/preferences_layout.html
@@ -1,4 +1,5 @@
 {% extends 'layout.html' %}
+{% load i18n %}
 {% block content %}
 
 <header class="block column is-offset-one-quarter pl-1">
@@ -7,19 +8,19 @@
 
 <div class="block columns">
     <nav class="menu column is-one-quarter">
-        <h2 class="menu-label">Account</h2>
+        <h2 class="menu-label">{% trans "Account" %}</h2>
         <ul class="menu-list">
             <li>
-                <a href="/preferences/profile"{% if '/preferences/profile' in request.path %} class="is-active" aria-selected="true"{% endif %}>Profile</a>
+                <a href="/preferences/profile"{% if '/preferences/profile' in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Profile" %}</a>
             </li>
             <li>
-                <a href="/preferences/password"{% if '/preferences/password' in request.path %} class="is-active" aria-selected="true"{% endif %}>Change password</a>
+                <a href="/preferences/password"{% if '/preferences/password' in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Change password" %}</a>
             </li>
         </ul>
-        <h2 class="menu-label">Relationships</h2>
+        <h2 class="menu-label">{% trans "Relationships" %}</h2>
         <ul class="menu-list">
             <li>
-                <a href="/preferences/block"{% if '/preferences/block' in request.path %} class="is-active" aria-selected="true"{% endif %}>Blocked users</a>
+                <a href="/preferences/block"{% if '/preferences/block' in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Blocked users" %}</a>
             </li>
         </ul>
     </nav>
diff --git a/bookwyrm/templates/search_results.html b/bookwyrm/templates/search_results.html
index 8bd8253d..30c88f3d 100644
--- a/bookwyrm/templates/search_results.html
+++ b/bookwyrm/templates/search_results.html
@@ -1,8 +1,9 @@
 {% extends 'layout.html' %}
+{% load i18n %}
 {% block content %}
 {% with book_results|first as local_results %}
 <div class="block">
-    <h1 class="title">Search Results for "{{ query }}"</h1>
+    <h1 class="title">{% blocktrans %}Search Results for "{{ query }}"{% endblocktrans %}</h1>
 </div>
 
 <div class="block columns">
diff --git a/bookwyrm/templates/settings/admin_layout.html b/bookwyrm/templates/settings/admin_layout.html
index 59cfd1d4..73178ac8 100644
--- a/bookwyrm/templates/settings/admin_layout.html
+++ b/bookwyrm/templates/settings/admin_layout.html
@@ -1,4 +1,5 @@
 {% extends 'layout.html' %}
+{% load i18n %}
 {% block content %}
 
 <header class="block column is-offset-one-quarter pl-1">
@@ -8,30 +9,30 @@
 <div class="block columns">
     <nav class="menu column is-one-quarter">
         {% if perms.bookwyrm.create_invites %}
-        <h2 class="menu-label">Manage Users</h2>
+        <h2 class="menu-label">{% trans "Manage Users" %}</h2>
         <ul class="menu-list">
             <li>
                 {% url 'settings-invites' as url %}
-                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>Invites</a>
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Invites" %}</a>
             </li>
             <li>
                 {% url 'settings-federation' as url %}
-                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>Federated Servers</a>
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Federated Servers" %}</a>
             </li>
         </ul>
         {% endif %}
         {% if perms.bookwyrm.edit_instance_settings %}
-        <h2 class="menu-label">Instance Settings</h2>
+        <h2 class="menu-label">{% trans "Instance Settings" %}</h2>
         <ul class="menu-list">
             <li>
                 {% url 'settings-site' as url %}
-                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>Site Configuration</a>
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Site Configuration" %}</a>
                 {% if url in request.path %}
                 <ul class="emnu-list">
-                    <li><a href="{{ url }}#instance-info">Instance Info</a></li>
-                    <li><a href="{{ url }}#images">Images</a></li>
-                    <li><a href="{{ url }}#footer">Footer Content</a></li>
-                    <li><a href="{{ url }}#registration">Registration</a></li>
+                    <li><a href="{{ url }}#instance-info">{% trans "Instance Info" %}</a></li>
+                    <li><a href="{{ url }}#images">{% trans "Images" %}</a></li>
+                    <li><a href="{{ url }}#footer">{% trans "Footer Content" %}</a></li>
+                    <li><a href="{{ url }}#registration">{% trans "Registration" %}</a></li>
                 </ul>
                 {% endif %}
             </li>
diff --git a/bookwyrm/templates/settings/federation.html b/bookwyrm/templates/settings/federation.html
index e3bf23ce..174b8c14 100644
--- a/bookwyrm/templates/settings/federation.html
+++ b/bookwyrm/templates/settings/federation.html
@@ -1,13 +1,14 @@
 {% extends 'settings/admin_layout.html' %}
-{% block header %}Federated Servers{% endblock %}
+{% load i18n %}
+{% block header %}{% trans "Federated Servers" %}{% endblock %}
 
 {% block panel %}
 
 <table class="table is-striped">
     <tr>
-        <th>Server name</th>
-        <th>Software</th>
-        <th>Status</th>
+        <th>{% trans "Server name" %}</th>
+        <th>{% trans "Software" %}</th>
+        <th>{% trans "Status" %}</th>
     </tr>
     {% for server in servers %}
     <tr>
diff --git a/bookwyrm/templates/settings/manage_invites.html b/bookwyrm/templates/settings/manage_invites.html
index 086615a9..6bc7469b 100644
--- a/bookwyrm/templates/settings/manage_invites.html
+++ b/bookwyrm/templates/settings/manage_invites.html
@@ -1,41 +1,42 @@
 {% extends 'settings/admin_layout.html' %}
-{% block header %}Invites{% endblock %}
+{% load i18n %}
+{% block header %}{% trans "Invites" %}{% endblock %}
 {% load humanize %}
 {% block panel %}
 <section class="block">
-    <h2 class="title is-4">Generate New Invite</h2>
+    <h2 class="title is-4">{% trans "Generate New Invite" %}</h2>
 
     <form name="invite" action="{% url 'settings-invites' %}" method="post">
         {% csrf_token %}
         <div class="field is-grouped">
             <div class="control">
-                <label class="label" for="id_expiry">Expiry:</label>
+                <label class="label" for="id_expiry">{% trans "Expiry:" %}</label>
                 <div class="select">
                     {{ form.expiry }}
                 </div>
             </div>
             <div class="control">
-                <label class="label" for="id_use_limit">Use limit:</label>
+                <label class="label" for="id_use_limit">{% trans "Use limit:" %}</label>
                 <div class="select">
                     {{ form.use_limit }}
                 </div>
             </div>
         </div>
 
-        <button class="button is-primary" type="submit">Create Invite</button>
+        <button class="button is-primary" type="submit">{% trans "Create Invite" %}</button>
     </form>
 </section>
 
 <section class="block">
     <table class="table is-striped">
         <tr>
-            <th>Link</th>
-            <th>Expires</th>
-            <th>Max uses</th>
-            <th>Times used</th>
+            <th>{% trans "Link" %}</th>
+            <th>{% trans "Expires" %}</th>
+            <th>{% trans "Max uses" %}</th>
+            <th>{% trans "Times used" %}</th>
         </tr>
         {% if not invites %}
-        <tr><td colspan="4">No active invites</td></tr>
+        <tr><td colspan="4">{% trans "No active invites" %}</td></tr>
         {% endif %}
         {% for invite in invites %}
         <tr>
diff --git a/bookwyrm/templates/settings/site.html b/bookwyrm/templates/settings/site.html
index 9e67c839..1a502f16 100644
--- a/bookwyrm/templates/settings/site.html
+++ b/bookwyrm/templates/settings/site.html
@@ -1,30 +1,31 @@
 {% extends 'settings/admin_layout.html' %}
-{% block header %}Site Configuration{% endblock %}
+{% load i18n %}
+{% block header %}{% trans "Site Configuration" %}{% endblock %}
 
 {% block panel %}
 
 <form action="{% url 'settings-site' %}" method="POST" class="content">
     {% csrf_token %}
     <section class="block" id="instance-info">
-        <h2 class="title is-4">Instance Info</h2>
+        <h2 class="title is-4">{% trans "Instance Info" %}</h2>
         <div class="control">
-            <label class="label" for="id_name">Instance Name:</label>
+            <label class="label" for="id_name">{% trans "Instance Name:" %}</label>
             {{ site_form.name }}
         </div>
         <div class="control">
-            <label class="label" for="id_instance_tagline">Tagline:</label>
+            <label class="label" for="id_instance_tagline">{% trans "Tagline:" %}</label>
             {{ site_form.instance_tagline }}
         </div>
         <div class="control">
-            <label class="label" for="id_instance_description">Instance description:</label>
+            <label class="label" for="id_instance_description">{% trans "Instance description:" %}</label>
             {{ site_form.instance_description }}
         </div>
         <div class="control">
-            <label class="label" for="id_code_of_conduct">Code of conduct:</label>
+            <label class="label" for="id_code_of_conduct">{% trans "Code of conduct:" %}</label>
             {{ site_form.code_of_conduct }}
         </div>
         <div class="control">
-            <label class="label" for="id_privacy_policy">Privacy Policy:</label>
+            <label class="label" for="id_privacy_policy">{% trans "Privacy Policy:" %}</label>
             {{ site_form.privacy_policy }}
         </div>
     </section>
@@ -32,18 +33,18 @@
     <hr aria-hidden="true">
 
     <section class="block" id="images">
-        <h2 class="title is-4">Images</h2>
+        <h2 class="title is-4">{% trans "Images" %}</h2>
         <div class="field is-grouped">
             <div class="control">
-                <label class="label" for="id_logo">Logo:</label>
+                <label class="label" for="id_logo">{% trans "Logo:" %}</label>
                 {{ site_form.logo }}
             </div>
             <div class="control">
-                <label class="label" for="id_logo_small">Logo small:</label>
+                <label class="label" for="id_logo_small">{% trans "Logo small:" %}</label>
                 {{ site_form.logo_small }}
             </div>
             <div class="control">
-                <label class="label" for="id_favicon">Favicon:</label>
+                <label class="label" for="id_favicon">{% trans "Favicon:" %}</label>
                 {{ site_form.favicon }}
             </div>
         </div>
@@ -52,17 +53,17 @@
     <hr aria-hidden="true">
 
     <section class="block" id="footer">
-        <h2 class="title is-4">Footer Content</h2>
+        <h2 class="title is-4">{% trans "Footer Content" %}</h2>
         <div class="control">
-            <label class="label" for="id_support_link">Support link:</label>
+            <label class="label" for="id_support_link">{% trans "Support link:" %}</label>
             <input type="text" name="support_link" maxlength="255" class="input" id="id_support_link" placeholder="https://www.patreon.com/bookwyrm"{% if site.support_link %} value="{{ site.support_link  }}"{% endif %}>
         </div>
         <div class="control">
-            <label class="label" for="id_support_title">Support title:</label>
+            <label class="label" for="id_support_title">{% trans "Support title:" %}</label>
             <input type="text" name="support_title" maxlength="100" class="input" id="id_support_title" placeholder="Patreon"{% if site.support_title %} value="{{ site.support_title }}"{% endif %}>
         </div>
         <div class="control">
-            <label class="label" for="id_admin_email">Admin email:</label>
+            <label class="label" for="id_admin_email">{% trans "Admin email:" %}</label>
             {{ site_form.admin_email }}
         </div>
     </section>
@@ -70,19 +71,19 @@
     <hr aria-hidden="true">
 
     <section class="block" id="registration">
-        <h2 class="title is-4">Registration</h2>
+        <h2 class="title is-4">{% trans "Registration" %}</h2>
         <div class="control">
-            <label class="label" for="id_allow_registration">Allow registration:
+            <label class="label" for="id_allow_registration">{% trans "Allow registration:" %}
             {{ site_form.allow_registration }}
         </div>
         <div class="control">
-            <label class="label" for="id_registration_closed_text">Registration closed text:</label>
+            <label class="label" for="id_registration_closed_text">{% trans "Registration closed text:" %}</label>
             {{ site_form.registration_closed_text }}
         </div>
     </section>
 
     <footer class="block">
-        <button class="button is-primary" type="submit">Save Changes</button>
+        <button class="button is-primary" type="submit">{% trans "Save Changes" %}</button>
     </footer>
 </form>
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/block_button.html b/bookwyrm/templates/snippets/block_button.html
index 9e49254d..7e9fcaea 100644
--- a/bookwyrm/templates/snippets/block_button.html
+++ b/bookwyrm/templates/snippets/block_button.html
@@ -1,11 +1,12 @@
+{% load i18n %}
 {% if not user in request.user.blocks.all %}
 <form name="blocks" method="post" action="/block/{{ user.id }}">
     {% csrf_token %}
-    <button class="button is-danger is-light is-small {{ class }}" type="submit">Block</button>
+    <button class="button is-danger is-light is-small {{ class }}" type="submit">{% trans "Block" %}</button>
 </form>
 {% else %}
 <form name="unblocks" method="post" action="/unblock/{{ user.id }}">
     {% csrf_token %}
-    <button class="button is-small {{ class }}" type="submit">Un-block</button>
+    <button class="button is-small {{ class }}" type="submit">{% trans "Un-block" %}</button>
 </form>
 {% endif %}
diff --git a/bookwyrm/templates/snippets/boost_button.html b/bookwyrm/templates/snippets/boost_button.html
index bf914379..3bc1b601 100644
--- a/bookwyrm/templates/snippets/boost_button.html
+++ b/bookwyrm/templates/snippets/boost_button.html
@@ -1,19 +1,20 @@
 {% load bookwyrm_tags %}
+{% load i18n %}
 
 {% with status.id|uuid as uuid %}
 <form name="boost" action="/boost/{{ status.id }}" method="post" class="interaction boost-{{ status.id }}-{{ uuid }} {% if request.user|boosted:status  %}hidden{% endif %}" data-id="boost-{{ status.id }}-{{ uuid }}">
     {% csrf_token %}
     <button class="button is-small" type="submit" {% if not status.boostable %}disabled{% endif %}>
-        <span class="icon icon-boost" title="Boost status">
-            <span class="is-sr-only">Boost status</span>
+        <span class="icon icon-boost" title="{% trans 'Boost status' %}">
+            <span class="is-sr-only">{% trans "Boost status" %}</span>
         </span>
     </button>
 </form>
 <form name="unboost" action="/unboost/{{ status.id }}" method="post" class="interaction boost-{{ status.id }}-{{ uuid }} active {% if not request.user|boosted:status %}hidden{% endif %}" data-id="boost-{{ status.id }}-{{ uuid }}">
     {% csrf_token %}
     <button class="button is-small is-primary" type="submit">
-        <span class="icon icon-boost" title="Un-boost status">
-            <span class="is-sr-only">Un-boost status</span>
+        <span class="icon icon-boost" title="{% trans 'Un-boost status' %}">
+            <span class="is-sr-only">{% trans "Un-boost status" %}</span>
         </span>
     </button>
 </form>
diff --git a/bookwyrm/templates/snippets/content_warning_field.html b/bookwyrm/templates/snippets/content_warning_field.html
index 3f14a020..c90138e9 100644
--- a/bookwyrm/templates/snippets/content_warning_field.html
+++ b/bookwyrm/templates/snippets/content_warning_field.html
@@ -1,4 +1,5 @@
+{% load i18n %}
 <div class="control{% if not parent_status.content_warning %} hidden{% endif %}" id="spoilers-{{ uuid }}">
-    <label class="is-sr-only" for="id_content_warning-{{ uuid }}">Spoiler alert:</label>
-    <input type="text" name="content_warning" maxlength="255" class="input" id="id_content_warning-{{ uuid }}" placeholder="Spoilers ahead!"{% if parent_status.content_warning %} value="{{ parent_status.content_warning }}"{% endif %}>
+    <label class="is-sr-only" for="id_content_warning-{{ uuid }}">{% trans "Spoiler alert:" %}</label>
+    <input type="text" name="content_warning" maxlength="255" class="input" id="id_content_warning-{{ uuid }}" placeholder="{% trans 'Spoilers ahead!' %}"{% if parent_status.content_warning %} value="{{ parent_status.content_warning }}"{% endif %}>
 </div>
diff --git a/bookwyrm/templates/snippets/create_status.html b/bookwyrm/templates/snippets/create_status.html
index b443acdd..a4b4578f 100644
--- a/bookwyrm/templates/snippets/create_status.html
+++ b/bookwyrm/templates/snippets/create_status.html
@@ -1,16 +1,17 @@
 {% load humanize %}
+{% load i18n %}
 {% load bookwyrm_tags %}
 
 <div class="tabs is-boxed">
     <ul role="tablist">
         <li class="tab-change is-active" data-category="tab-option-{{ book.id }}" role="tab" aria-selected="true" tabindex="0" data-tab="review-{{ book.id }}">
-            <a>Review</a>
+            <a>{% trans "Review" %}</a>
         </li>
         <li class="tab-change" data-category="tab-option-{{ book.id }}" role="tab" tabindex="0" data-tab="comment-{{ book.id}}">
-            <a>Comment</a>
+            <a>{% trans "Comment" %}</a>
         </li>
         <li class="tab-change" data-category="tab-option-{{ book.id }}" role="tab" tabindex="0" data-tab="quote-{{ book.id }}">
-            <a>Quote</a>
+            <a>{% trans "Quote" %}</a>
         </li>
     </ul>
 </div>
diff --git a/bookwyrm/templates/snippets/create_status_form.html b/bookwyrm/templates/snippets/create_status_form.html
index c6d7be3f..b5a12084 100644
--- a/bookwyrm/templates/snippets/create_status_form.html
+++ b/bookwyrm/templates/snippets/create_status_form.html
@@ -1,4 +1,5 @@
 {% load bookwyrm_tags %}
+{% load i18n %}
 <form class="is-flex-grow-1" name="{{ type }}" action="/post/{% if type == 'direct' %}status{% else %}{{ type }}{% endif %}" method="post" id="tab-{{ type }}-{{ book.id }}{{ reply_parent.id }}">
     {% csrf_token %}
     <input type="hidden" name="book" value="{{ book.id }}">
@@ -6,7 +7,7 @@
     <input type="hidden" name="reply_parent" value="{{ reply_parent.id }}">
     {% if type == 'review' %}
     <div class="control">
-        <label class="label" for="id_name_{{ book.id }}_{{ type }}">Title:</label>
+        <label class="label" for="id_name_{{ book.id }}_{{ type }}">{% trans "Title:" %}</label>
         <input type="text" name="name" maxlength="255" class="input" required="" id="id_name_{{ book.id }}_{{ type }}" placeholder="My {{ type }} of '{{ book.title }}'">
     </div>
     {% endif %}
@@ -17,9 +18,9 @@
 
         {% if type == 'review' %}
         <fieldset>
-            <legend class="is-sr-only">Rating</legend>
+            <legend class="is-sr-only">{% trans "Rating" %}</legend>
             <div class="field is-grouped stars form-rate-stars">
-                <label class="is-sr-only" for="no-rating-{{ book.id }}">No rating</label>
+                <label class="is-sr-only" for="no-rating-{{ book.id }}">{% trans "No rating" %}</label>
                 <input class="is-sr-only" type="radio" name="rating" value="" id="no-rating-{{ book.id }}" checked>
                 {% for i in '12345'|make_list %}
                 <input class="is-sr-only" id="book{{book.id}}-star-{{ forloop.counter }}" type="radio" name="rating" value="{{ forloop.counter }}">
@@ -40,7 +41,7 @@
     </div>
     {% if type == 'quotation' %}
     <div class="control">
-        <label class="label" for="id_content_quote-{{ book.id }}">Comment:</label>
+        <label class="label" for="id_content_quote-{{ book.id }}">{% trans "Comment:" %}</label>
         {% include 'snippets/content_warning_field.html' with parent_status=status %}
         <textarea name="content" class="textarea is-small" id="id_content_quote-{{ book.id }}"></textarea>
     </div>
@@ -55,14 +56,14 @@
             <div class="control">
             {% if type == 'direct' %}
                 <input type="hidden" name="privacy" value="direct">
-                <button type="button" class="button" aria-label="Privacy" disabled>Private</button>
+                <button type="button" class="button" aria-label="Privacy" disabled>{% trans "Private" %}</button>
             {% else %}
                 {% include 'snippets/privacy_select.html' with current=reply_parent.privacy %}
             {% endif %}
             </div>
         </div>
         <div class="column is-narrow">
-            <button class="button is-link" type="submit">Post</button>
+            <button class="button is-link" type="submit">{% trans "Post" %}</button>
         </div>
     </div>
 </form>
diff --git a/bookwyrm/templates/snippets/delete_readthrough_modal.html b/bookwyrm/templates/snippets/delete_readthrough_modal.html
index 19c4b4f0..557059ed 100644
--- a/bookwyrm/templates/snippets/delete_readthrough_modal.html
+++ b/bookwyrm/templates/snippets/delete_readthrough_modal.html
@@ -1,8 +1,10 @@
 {% extends 'components/modal.html' %}
-{% block modal-title %}Delete these read dates?{% endblock %}
+{% load i18n %}
+
+{% block modal-title %}{% trans "Delete these read dates?" %}{% endblock %}
 {% block modal-body %}
 {% if readthrough.progress_updates|length > 0 %}
-You are deleting this readthrough and its {{ readthrough.progress_updates|length }} associated progress updates.
+{% blocktrans with count=readthrough.progress_updates|length %}You are deleting this readthrough and its {{ count }} associated progress updates.{% endblocktrans %}
 {% endif %}
 {% endblock %}
 {% block modal-footer %}
@@ -10,7 +12,7 @@ You are deleting this readthrough and its {{ readthrough.progress_updates|length
     {% csrf_token %}
     <input type="hidden" name="id" value="{{ readthrough.id }}">
     <button class="button is-danger" type="submit">
-        Delete
+        {% trans "Delete" %}
     </button>
     {% include 'snippets/toggle/toggle_button.html' with text="Cancel" controls_text="delete-readthrough" controls_uid=readthrough.id %}
 </form>
diff --git a/bookwyrm/templates/snippets/fav_button.html b/bookwyrm/templates/snippets/fav_button.html
index 650f4e8a..5d74f655 100644
--- a/bookwyrm/templates/snippets/fav_button.html
+++ b/bookwyrm/templates/snippets/fav_button.html
@@ -1,18 +1,19 @@
 {% load bookwyrm_tags %}
+{% load i18n %}
 {% with status.id|uuid as uuid %}
 <form name="favorite" action="/favorite/{{ status.id }}" method="POST" class="interaction fav-{{ status.id }}-{{ uuid }} {% if request.user|liked:status %}hidden{% endif %}" data-id="fav-{{ status.id }}-{{ uuid }}">
     {% csrf_token %}
     <button class="button is-small" type="submit">
-        <span class="icon icon-heart" title="Like status">
-            <span class="is-sr-only">Like status</span>
+        <span class="icon icon-heart" title="{% trans 'Like status' %}">
+            <span class="is-sr-only">{% trans "Like status" %}</span>
         </span>
     </button>
 </form>
 <form name="unfavorite" action="/unfavorite/{{ status.id }}" method="POST" class="interaction fav-{{ status.id }}-{{ uuid }} active {% if not request.user|liked:status %}hidden{% endif %}" data-id="fav-{{ status.id }}-{{ uuid }}">
     {% csrf_token %}
     <button class="button is-primary is-small" type="submit">
-        <span class="icon icon-heart" title="Un-like status">
-            <span class="is-sr-only">Un-like status</span>
+        <span class="icon icon-heart" title="{% trans 'Un-like status' %}">
+            <span class="is-sr-only">{% trans "Un-like status" %}</span>
         </span>
     </button>
 </form>
diff --git a/bookwyrm/templates/snippets/follow_button.html b/bookwyrm/templates/snippets/follow_button.html
index f7286e67..419aa211 100644
--- a/bookwyrm/templates/snippets/follow_button.html
+++ b/bookwyrm/templates/snippets/follow_button.html
@@ -1,8 +1,9 @@
+{% load i18n %}
 {% if request.user == user or not request.user.is_authenticated %}
 {% elif request.user in user.follower_requests.all %}
 
 <div>
-Follow request already sent.
+    {% trans "Follow request already sent." %}
 </div>
 
 {% elif user in request.user.blocks.all %}
@@ -15,15 +16,15 @@ Follow request already sent.
             {% csrf_token %}
             <input type="hidden" name="user" value="{{ user.username }}">
             {% if user.manually_approves_followers %}
-                <button class="button is-small is-link" type="submit">Send follow request</button>
+                <button class="button is-small is-link" type="submit">{% trans "Send follow request" %}</button>
             {% else %}
-                <button class="button is-small is-link" type="submit">Follow</button>
+                <button class="button is-small is-link" type="submit">{% trans "Follow" %}</button>
             {% endif %}
         </form>
         <form action="/unfollow/" method="POST" class="interaction follow-{{ user.id }} {% if not request.user in user.followers.all %}hidden{%endif %}" data-id="follow-{{ user.id }}">
             {% csrf_token %}
             <input type="hidden" name="user" value="{{ user.username }}">
-            <button class="button is-small is-danger is-light" type="submit">Unfollow</button>
+            <button class="button is-small is-danger is-light" type="submit">{% trans "Unfollow" %}</button>
         </form>
     </div>
     <div class="control">
diff --git a/bookwyrm/templates/snippets/follow_request_buttons.html b/bookwyrm/templates/snippets/follow_request_buttons.html
index a6f585c7..42e69153 100644
--- a/bookwyrm/templates/snippets/follow_request_buttons.html
+++ b/bookwyrm/templates/snippets/follow_request_buttons.html
@@ -1,15 +1,16 @@
+{% load i18n %}
 {% load bookwyrm_tags %}
 {% if request.user|follow_request_exists:user %}
 <div class="field is-grouped">
     <form action="/accept-follow-request/" method="POST">
         {% csrf_token %}
         <input type="hidden" name="user" value="{{ user.username }}">
-        <button class="button is-link is-small" type="submit">Accept</button>
+        <button class="button is-link is-small" type="submit">{% trans "Accept" %}</button>
     </form>
     <form action="/delete-follow-request/" method="POST">
         {% csrf_token %}
         <input type="hidden" name="user" value="{{ user.username }}">
-        <button class="button is-danger is-light is-small" type="submit" class="warning">Delete</button>
+        <button class="button is-danger is-light is-small" type="submit" class="warning">{% trans "Delete" %}</button>
     </form>
 </div>
 {% endif %}
diff --git a/bookwyrm/templates/snippets/goal_card.html b/bookwyrm/templates/snippets/goal_card.html
index e26cd5a3..386c030c 100644
--- a/bookwyrm/templates/snippets/goal_card.html
+++ b/bookwyrm/templates/snippets/goal_card.html
@@ -1,15 +1,16 @@
 {% extends 'components/card.html' %}
+{% load i18n %}
 
 {% block card-header %}
 <h3 class="card-header-title has-background-primary has-text-white">
-    <span class="icon icon-book is-size-3 mr-2" aria-hidden="true"></span> {{ year }} reading goal
+    <span class="icon icon-book is-size-3 mr-2" aria-hidden="true"></span> {% blocktrans %}{{ year }} reading goal{% endblocktrans %}
 </h3>
 {% endblock %}
 
 
 {% block card-content %}
 <div class="content">
-    <p>Set a goal for how many books you'll finish reading in {{ year }}, and track your progress throughout the year.</p>
+    <p>{% blocktrans %}Set a goal for how many books you'll finish reading in {{ year }}, and track your progress throughout the year.{% endblocktrans %}</p>
 
     {% include 'snippets/goal_form.html' %}
 </div>
@@ -17,7 +18,7 @@
 
 {% block card-footer %}
 <div class="card-footer-item is-flex-direction-column">
-    <button class="button is-danger is-light is-block set-display" data-id="hide-{{ year }}-reading-goal" data-value="true">Dismiss message</button>
-    <p class="help">You can set or change your reading goal any time from your <a href="{{ request.user.local_path }}">profile page</a></p>
+    <button class="button is-danger is-light is-block set-display" data-id="hide-{{ year }}-reading-goal" data-value="true">{% trans "Dismiss message" %}</button>
+    <p class="help">{% blocktrans with path=request.user.local_path %}You can set or change your reading goal any time from your <a href="{{ path }}">profile page</a>{% endblocktrans %}</p>
 </div>
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/goal_form.html b/bookwyrm/templates/snippets/goal_form.html
index 475c5da5..cf5d21f2 100644
--- a/bookwyrm/templates/snippets/goal_form.html
+++ b/bookwyrm/templates/snippets/goal_form.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 <form method="post" name="goal" action="{{ request.user.local_path }}/goal/{{ year }}">
     {% csrf_token %}
     <input type="hidden" name="year" value="{% if goal %}{{ goal.year }}{% else %}{{ year }}{% endif %}">
@@ -5,28 +6,28 @@
 
     <div class="columns">
         <div class="column">
-            <label class="label" for="id_goal">Reading goal:</label>
+            <label class="label" for="id_goal">{% trans "Reading goal:" %}</label>
             <div class="field has-addons">
                 <div class="control">
                     <input type="number" class="input" name="goal" min="1" id="id_goal" value="{% if goal %}{{ goal.goal }}{% else %}12{% endif %}">
                 </div>
-                <p class="button is-static" aria-hidden="true">books</p>
+                <p class="button is-static" aria-hidden="true">{% trans "books" %}</p>
             </div>
         </div>
 
         <div class="column">
-            <label class="label"><p class="mb-2">Goal privacy:</p>
+            <label class="label"><p class="mb-2">{% trans "Goal privacy:" %}</p>
                 {% include 'snippets/privacy_select.html' with no_label=True current=goal.privacy %}
             </label>
         </div>
     </div>
     <label for="post_status" class="label">
         <input type="checkbox" name="post-status" id="post_status" class="checkbox" checked>
-        Post to feed
+        {% trans "Post to feed" %}
     </label>
 
     <p>
-        <button type="submit" class="button is-link">Set goal</button>
+        <button type="submit" class="button is-link">{% trans "Set goal" %}</button>
         {% if goal %}
         {% include 'snippets/toggle/close_button.html' with text="Cancel" controls_text="show-edit-goal" %}
         {% endif %}
diff --git a/bookwyrm/templates/snippets/goal_progress.html b/bookwyrm/templates/snippets/goal_progress.html
index 43f27f4e..2fa0da54 100644
--- a/bookwyrm/templates/snippets/goal_progress.html
+++ b/bookwyrm/templates/snippets/goal_progress.html
@@ -1,9 +1,10 @@
+{% load i18n %}
 {% load humanize %}
 <p>
     {% if goal.progress_percent >= 100 %}
-        Success!
+        {% trans "Success!" %}
     {% elif goal.progress_percent %}
-        {{ goal.progress_percent }}% complete!
+        {% blocktrans with percent=goal.percent %}{{ percent }}% complete!{% endblocktrans %}
     {% endif %}
     {% if goal.user == request.user %}You've{% else %}{{ goal.user.display_name }} has{% endif %} read {% if request.path != goal.local_path %}<a href="{{ goal.local_path }}">{% endif %}{{ goal.book_count }} of {{ goal.goal | intcomma }} books{% if request.path != goal.local_path %}</a>{% endif %}.
 </p>
diff --git a/bookwyrm/templates/snippets/pagination.html b/bookwyrm/templates/snippets/pagination.html
index 1855dfed..c9c73ac3 100644
--- a/bookwyrm/templates/snippets/pagination.html
+++ b/bookwyrm/templates/snippets/pagination.html
@@ -1,9 +1,10 @@
+{% load i18n %}
 <nav class="pagination" role="navigation" aria-label="pagination">
     {% if page.has_previous %}
     <p class="pagination-previous">
         <a href="{{ path }}?page={{ page.previous_page_number }}{{ anchor }}">
             <span class="icon icon-arrow-left"></span>
-            Previous
+            {% trans "Previous" %}
         </a>
     </p>
     {% endif %}
@@ -11,7 +12,7 @@
     {% if page.has_next %}
     <p class="pagination-next">
     <a href="{{ path }}?page={{ page.next_page_number }}{{ anchor }}">
-            Next
+            {% trans "Next" %}
             <span class="icon icon-arrow-right"></span>
         </a>
     </p>
diff --git a/bookwyrm/templates/snippets/privacy-icons.html b/bookwyrm/templates/snippets/privacy-icons.html
index c917f553..c9685fd1 100644
--- a/bookwyrm/templates/snippets/privacy-icons.html
+++ b/bookwyrm/templates/snippets/privacy-icons.html
@@ -1,18 +1,19 @@
+{% load i18n %}
 {% if item.privacy == 'public' %}
-<span class="icon icon-globe" title="Public">
-    <span class="is-sr-only">Public</span>
+<span class="icon icon-globe" title="{% trans 'Public' %}">
+    <span class="is-sr-only">{% trans "Public" %}</span>
 </span>
 {% elif item.privacy == 'unlisted' %}
-<span class="icon icon-unlock" title="Unlisted">
-    <span class="is-sr-only">Unlisted</span>
+<span class="icon icon-unlock" title="{% trans 'Unlisted' %}">
+    <span class="is-sr-only">{% trans "Unlisted" %}</span>
 </span>
 {% elif item.privacy == 'followers' %}
 <span class="icon icon-lock" title="Followers-only">
-    <span class="is-sr-only">Followers-only</span>
+    <span class="is-sr-only">{% trans "Followers-only" %}</span>
 </span>
 {% else %}
-<span class="icon icon-envelope" title="Private">
-    <span class="is-sr-only">Private</span>
+<span class="icon icon-envelope" title="{% trans 'Private' %}">
+    <span class="is-sr-only">{% trans "Private" %}</span>
 </span>
 {% endif %}
 
diff --git a/bookwyrm/templates/snippets/privacy_select.html b/bookwyrm/templates/snippets/privacy_select.html
index a771c3d6..e8008509 100644
--- a/bookwyrm/templates/snippets/privacy_select.html
+++ b/bookwyrm/templates/snippets/privacy_select.html
@@ -1,21 +1,22 @@
+{% load i18n %}
 {% load bookwyrm_tags %}
 <div class="select {{ class }}">
     {% with 0|uuid as uuid %}
     {% if not no_label %}
-    <label class="is-sr-only" for="privacy-{{ uuid }}">Post privacy</label>
+    <label class="is-sr-only" for="privacy-{{ uuid }}">{% trans "Post privacy" %}</label>
     {% endif %}
     <select name="privacy" id="privacy-{{ uuid }}">
         <option value="public" {% if not current or current == 'public' %}selected{% endif %}>
-            Public
+            {% trans "Public" %}
         </option>
         <option value="unlisted" {% if current == 'unlisted' %}selected{% endif %}>
-            Unlisted
+            {% trans "Unlisted" %}
         </option>
         <option value="followers" {% if current == 'followers' %}selected{% endif %}>
-            Followers
+            {% trans "Followers" %}
         </option>
         <option value="direct" {% if current == 'direct' %}selected{% endif %}>
-            Private
+            {% trans "Private" %}
         </option>
     </select>
     {% endwith %}
diff --git a/bookwyrm/templates/snippets/progress_update.html b/bookwyrm/templates/snippets/progress_update.html
index 92a7573a..138defbd 100644
--- a/bookwyrm/templates/snippets/progress_update.html
+++ b/bookwyrm/templates/snippets/progress_update.html
@@ -1,8 +1,9 @@
+{% load i18n %}
 <form class="field is-grouped is-small" action="/edit-readthrough" method="POST">
     {% csrf_token %}
     <input type="hidden" name="id" value="{{ readthrough.id }}"/>
     <div class="field">
-        <label class="label is-align-self-center mb-0 pr-2" for="progress">Progress:</label>
+        <label class="label is-align-self-center mb-0 pr-2" for="progress">{% trans "Progress:" %}</label>
         <div class="field has-addons mb-0">
             <div class="control">
                 <input
@@ -12,16 +13,16 @@
             </div>
             <div class="control select is-small">
                 <select name="progress_mode" aria-label="Progress mode">
-                    <option value="PG" {% if readthrough.progress_mode == 'PG' %}selected{% endif %}>pages</option>
-                    <option value="PCT" {% if readthrough.progress_mode == 'PCT' %}selected{% endif %}>percent</option>
+                    <option value="PG" {% if readthrough.progress_mode == 'PG' %}selected{% endif %}>{% trans "pages" %}</option>
+                    <option value="PCT" {% if readthrough.progress_mode == 'PCT' %}selected{% endif %}>{% trans "percent" %}</option>
                 </select>
             </div>
             <div class="control">
-                <button class="button is-small px-2 is-primary" type="submit">Save</button>
+                <button class="button is-small px-2 is-primary" type="submit">{% trans "Save" %}</button>
             </div>
         </div>
         {% if readthrough.progress_mode == 'PG' and book.pages %}
-        <p class="help">of {{ book.pages }} pages</p>
+        <p class="help">{% blocktrans %}of {{ book.pages }} pages{% endblocktrans %}</p>
         {% endif %}
     </div>
 </form>
diff --git a/bookwyrm/templates/snippets/rate_action.html b/bookwyrm/templates/snippets/rate_action.html
index cc94f675..447a1c9b 100644
--- a/bookwyrm/templates/snippets/rate_action.html
+++ b/bookwyrm/templates/snippets/rate_action.html
@@ -1,6 +1,7 @@
+{% load i18n %}
 {% load bookwyrm_tags %}
 {% if request.user.is_authenticated %}
-<span class="is-sr-only">Leave a rating</span>
+<span class="is-sr-only">{% trans "Leave a rating" %}</span>
 <div class="block">
     <form class="hidden-form" name="rate" action="/post/rating" method="POST">
         {% csrf_token %}
@@ -10,7 +11,7 @@
         <input type="hidden" name="rating" value="{{ forloop.counter }}">
 
         <div class="field is-grouped stars form-rate-stars mb-1 has-text-warning-dark">
-            <label class="is-sr-only" for="rating-no-rating-{{ book.id }}">No rating</label>
+            <label class="is-sr-only" for="rating-no-rating-{{ book.id }}">{% trans "No rating" %}</label>
             <input class="is-sr-only" type="radio" name="rating" value="" id="rating-no-rating-{{ book.id }}" checked>
             {% for i in '12345'|make_list %}
             <input class="is-sr-only" id="rating-book{{book.id}}-star-{{ forloop.counter }}" type="radio" name="rating" value="{{ forloop.counter }}" {% if book|user_rating:user == forloop.counter %}checked{% endif %}>
@@ -25,7 +26,7 @@
                 {% include 'snippets/privacy_select.html' with class="is-small" %}
             </div>
             <div class="control">
-                <button class="button is-small is-primary" type="submit">Rate</button>
+                <button class="button is-small is-primary" type="submit">{% trans "Rate" %}</button>
             </div>
         </div>
     </form>
diff --git a/bookwyrm/templates/snippets/readthrough.html b/bookwyrm/templates/snippets/readthrough.html
index 7e51ce97..de85635e 100644
--- a/bookwyrm/templates/snippets/readthrough.html
+++ b/bookwyrm/templates/snippets/readthrough.html
@@ -1,13 +1,14 @@
+{% load i18n %}
 {% load humanize %}
 <div class="content block">
     <div id="hide-edit-readthrough-{{ readthrough.id }}">
         <div class="columns">
             <div class="column">
-                Progress Updates:
+                {% trans "Progress Updates:" %}
                 </dl>
                 <ul>
                     {% if readthrough.finish_date or readthrough.progress %}
-                    <li>{% if readthrough.finish_date %} {{ readthrough.finish_date | naturalday }}: finished {% else %}{% if readthrough.progress_mode == 'PG' %}on page {{ readthrough.progress }}{% if book.pages %} of {{ book.pages }}{% endif %}
+                    <li>{% if readthrough.finish_date %} {{ readthrough.finish_date | naturalday }}: {% trans "finished" %} {% else %}{% if readthrough.progress_mode == 'PG' %}on page {{ readthrough.progress }}{% if book.pages %} of {{ book.pages }}{% endif %}
                         {% else %}{{ readthrough.progress }}%{% endif %}{% endif %}
                         {% if readthrough.progress %}
                         {% include 'snippets/toggle/toggle_button.html' with text="Show all updates" controls_text="updates" controls_uid=readthrough.id class="is-small" %}
@@ -25,7 +26,7 @@
                                     <input type="hidden" name="id" value="{{ progress_update.id }}"/>
                                     <button type="submit" class="button is-small" for="delete-progressupdate-{{ progress_update.id }}" role="button" tabindex="0">
                                         <span class="icon icon-x" title="Delete this progress update">
-                                            <span class="is-sr-only">Delete this progress update</span>
+                                            <span class="is-sr-only">{% trans "Delete this progress update" %}</span>
                                         </span>
                                     </button>
                                 </form>
@@ -35,7 +36,7 @@
                         {% endif %}
                     </li>
                     {% endif %}
-                    <li>{{ readthrough.start_date | naturalday }}: started</li>
+                    <li>{{ readthrough.start_date | naturalday }}: {% trans "started" %}</li>
                 </ul>
             </div>
             <div class="column is-narrow">
@@ -53,11 +54,11 @@
 </div>
 
 <div class="box hidden" id="edit-readthrough-{{ readthrough.id }}" tabindex="0">
-    <h3 class="title is-5">Edit read dates</h3>
+    <h3 class="title is-5">{% trans "Edit read dates" %}</h3>
     <form name="edit-readthrough" action="/edit-readthrough" method="post">
         {% include 'snippets/readthrough_form.html' with readthrough=readthrough %}
         <div class="field is-grouped">
-            <button class="button is-primary" type="submit">Save</button>
+            <button class="button is-primary" type="submit">{% trans "Save" %}</button>
             {% include 'snippets/toggle/close_button.html' with text="Cancel" controls_text="edit-readthrough" controls_uid=readthrough.id %}
         </div>
     </form>
diff --git a/bookwyrm/templates/snippets/readthrough_form.html b/bookwyrm/templates/snippets/readthrough_form.html
index 21d0a809..c5be295e 100644
--- a/bookwyrm/templates/snippets/readthrough_form.html
+++ b/bookwyrm/templates/snippets/readthrough_form.html
@@ -1,16 +1,17 @@
+{% load i18n %}
 {% csrf_token %}
 <input type="hidden" name="id" value="{{ readthrough.id }}">
 <input type="hidden" name="book" value="{{ book.id }}">
 <div class="field">
     <label class="label">
-        Started reading
+        {% trans "Started reading" %}
         <input type="date" name="start_date" class="input" id="id_start_date-{{ readthrough.id }}" value="{{ readthrough.start_date | date:"Y-m-d" }}">
     </label>
 </div>
 {# Only show progress for editing existing readthroughs #}
 {% if readthrough.id and not readthrough.finish_date %}
 <label class="label" for="id_progress-{{ readthrough.id }}">
-    Progress
+    {% trans "Progress" %}
 </label>
 <div class="field has-addons">
     <div class="control">
@@ -18,15 +19,15 @@
     </div>
     <div class="control select">
         <select name="progress_mode" aria-label="Progress mode">
-            <option value="PG" {% if readthrough.progress_mode == 'PG' %}selected{% endif %}>pages</option>
-            <option value="PCT" {% if readthrough.progress_mode == 'PCT' %}selected{% endif %}>percent</option>
+            <option value="PG" {% if readthrough.progress_mode == 'PG' %}selected{% endif %}>{% trans "pages" %}</option>
+            <option value="PCT" {% if readthrough.progress_mode == 'PCT' %}selected{% endif %}>{% trans "percent" %}</option>
         </select>
     </div>
 </div>
 {% endif %}
 <div class="field">
     <label class="label">
-        Finished reading
+        {% trans "Finished reading" %}
         <input type="date" name="finish_date" class="input" id="id_finish_date-{{ readthrough.id }}" value="{{ readthrough.finish_date | date:"Y-m-d" }}">
     </label>
 </div>
diff --git a/bookwyrm/templates/snippets/register_form.html b/bookwyrm/templates/snippets/register_form.html
index 213ad1e7..cd7ea806 100644
--- a/bookwyrm/templates/snippets/register_form.html
+++ b/bookwyrm/templates/snippets/register_form.html
@@ -1,6 +1,7 @@
+{% load i18n %}
 {% csrf_token %}
 <div class="field">
-    <label class="label" for="id_localname_register">Username:</label>
+    <label class="label" for="id_localname_register">{% trans "Username:" %}</label>
     <div class="control">
         <input type="text" name="localname" maxlength="150" class="input" required="" id="id_localname_register" value="{% if register_form.localname.value %}{{ register_form.localname.value }}{% endif %}">
     </div>
@@ -9,7 +10,7 @@
     {% endfor %}
 </div>
 <div class="field">
-    <label class="label" for="id_email_register">Email address:</label>
+    <label class="label" for="id_email_register">{% trans "Email address:" %}</label>
     <div class="control">
         <input type="email" name="email" maxlength="254" class="input" id="id_email_register" value="{% if register_form.email.value %}{{ register_form.email.value }}{% endif %}">
     {% for error in register_form.email.errors %}
@@ -18,7 +19,7 @@
     </div>
 </div>
 <div class="field">
-    <label class="label" for="id_password_register">Password:</label>
+    <label class="label" for="id_password_register">{% trans "Password:" %}</label>
     <div class="control">
         <input type="password" name="password" maxlength="128" class="input" required="" id="id_password_register">
     {% for error in register_form.password.errors %}
@@ -28,6 +29,6 @@
 </div>
 <div class="field is-grouped">
     <div class="control">
-        <button class="button is-primary" type="submit">Sign Up</button>
+        <button class="button is-primary" type="submit">{% trans "Sign Up" %}</button>
     </div>
 </div>
diff --git a/bookwyrm/templates/snippets/rss_title.html b/bookwyrm/templates/snippets/rss_title.html
index dadb5961..5ad0b757 100644
--- a/bookwyrm/templates/snippets/rss_title.html
+++ b/bookwyrm/templates/snippets/rss_title.html
@@ -1,15 +1,16 @@
+{% load i18n %}
 {{ obj.user.display_name }}{% if obj.status_type == 'GeneratedNote' %}
     {{ obj.content | safe }}
 {% elif obj.status_type == 'Review' and not obj.name and not obj.content%}
-    rated
+    {% trans "rated" %}
 {% elif obj.status_type == 'Review' %}
-    reviewed
+    {% trans "reviewed" %}
 {% elif obj.status_type == 'Comment' %}
-    commented on
+    {% trans "commented on" %}
 {% elif obj.status_type == 'Quotation' %}
-    quoted
+    {% trans "quoted" %}
 {% endif %}
 {% if obj.book %}{{ obj.book.title | safe}}
 {% elif obj.mention_books %}
 {{ obj.mention_books.first.title }}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/bookwyrm/templates/snippets/search_result_text.html b/bookwyrm/templates/snippets/search_result_text.html
index 183b1ec8..36009050 100644
--- a/bookwyrm/templates/snippets/search_result_text.html
+++ b/bookwyrm/templates/snippets/search_result_text.html
@@ -1,2 +1,3 @@
+{% load i18n %}
 <strong>{% if link %}<a href="{{ result.key }}">{{ result.title }}</a>{% else %}{{ result.title }}{% endif %}</strong>
-{% if result.author %} by {{ result.author }}{% endif %}{% if result.year %} ({{ result.year }}){% endif %}
+{% if result.author %} {% blocktrans with author=result.author %}by {{ author }}{% endblocktrans %}{% endif %}{% if result.year %} ({{ result.year }}){% endif %}
diff --git a/bookwyrm/templates/snippets/shelf.html b/bookwyrm/templates/snippets/shelf.html
index 0e4e9a08..9ac7760c 100644
--- a/bookwyrm/templates/snippets/shelf.html
+++ b/bookwyrm/templates/snippets/shelf.html
@@ -1,39 +1,20 @@
 {% load humanize %}
+{% load i18n %}
 {% load bookwyrm_tags %}
 {% if books|length > 0 %}
 <div class="table-container">
 <table class="table is-striped is-fullwidth">
 
 <tr class="book-preview">
-    <th>
-        Cover
-    </th>
-    <th>
-        Title
-    </th>
-    <th>
-        Author
-    </th>
-    <th>
-        Published
-    </th>
-    <th>
-        Shelved
-    </th>
-    <th>
-        Started
-    </th>
-    <th>
-        Finished
-    </th>
-    <th>
-        External links
-    </th>
-    {% if ratings %}
-    <th>
-        Rating
-    </th>
-    {% endif %}
+    <th>{% trans "Cover" %}</th>
+    <th>{% trans "Title" %}</th>
+    <th>{% trans "Author" %}</th>
+    <th>{% trans "Published" %}</th>
+    <th>{% trans "Shelved" %}</th>
+    <th>{% trans "Started" %}</th>
+    <th>{% trans "Finished" %}</th>
+    <th>{% trans "External links" %}</th>{% if ratings %}
+    <th>{% trans "Rating" %}</th>{% endif %}
 </tr>
 {% for book in books %}
 <tr class="book-preview">
@@ -60,7 +41,7 @@
         {{ read_through.finish_date | naturalday |default_if_none:""}}
     </td>
     <td>
-        <a href="https://openlibrary.org/book/{{ book.openlibrary_key }}" target="_blank">OpenLibrary</a>
+        <a href="https://openlibrary.org/book/{{ book.openlibrary_key }}" target="_blank">{% trans "OpenLibrary" %}</a>
     </td>
     {% if ratings %}
     <td>
@@ -77,13 +58,13 @@
 </table>
 </div>
 {% else %}
-<p>This shelf is empty.</p>
+<p>{% trans "This shelf is empty." %}</p>
 {% if shelf.editable %}
 <form name="delete-shelf" action="/delete-shelf/{{ shelf.id }}" method="post">
     {% csrf_token %}
     <input type="hidden" name="user" value="{{ request.user.id }}">
     <button class="button is-danger is-light" type="submit">
-        Delete shelf
+        {% trans "Delete shelf" %}
     </button>
 </form>
 {% endif %}
diff --git a/bookwyrm/templates/snippets/shelf_selector.html b/bookwyrm/templates/snippets/shelf_selector.html
index 50d7e750..687f7a56 100644
--- a/bookwyrm/templates/snippets/shelf_selector.html
+++ b/bookwyrm/templates/snippets/shelf_selector.html
@@ -1,6 +1,7 @@
 {% extends 'components/dropdown.html' %}
+{% load i18n %}
 {% block dropdown-trigger %}
-<span>Change shelf</span>
+<span>{% trans "Change shelf" %}</span>
 <span class="icon icon-arrow-down" aria-hidden="true"></span>
 {% endblock %}
 
@@ -23,7 +24,7 @@
         {% csrf_token %}
         <input type="hidden" name="book" value="{{ book.id }}">
         <input type="hidden" name="shelf" value="{{ current.id }}">
-        <button class="button is-fullwidth is-small is-danger is-light" type="submit">Unshelve</button>
+        <button class="button is-fullwidth is-small is-danger is-light" type="submit">{% trans "Unshelve" %}</button>
     </form>
 </li>
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html b/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
index c3407631..896c8016 100644
--- a/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
+++ b/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
@@ -1,7 +1,8 @@
 {% extends 'components/modal.html' %}
+{% load i18n %}
 
 {% block modal-title %}
-Finish "<em>{{ book.title }}</em>"
+{% blocktrans with book_title=book.title %}Finish "<em>{{ book_title }}</em>"{% endblocktrans %}
 {% endblock %}
 
 
@@ -15,13 +16,13 @@ Finish "<em>{{ book.title }}</em>"
     <input type="hidden" name="id" value="{{ readthrough.id }}">
     <div class="field">
         <label class="label">
-            Started reading
+            {% trans "Started reading" %}
             <input type="date" name="start_date" class="input" id="finish_id_start_date-{{ uuid }}" value="{{ readthrough.start_date | date:"Y-m-d" }}">
         </label>
     </div>
     <div class="field">
         <label class="label">
-            Finished reading
+            {% trans "Finished reading" %}
             <input type="date" name="finish_date" class="input" id="id_finish_date-{{ uuid }}" value="{% now "Y-m-d" %}">
         </label>
     </div>
@@ -33,12 +34,12 @@ Finish "<em>{{ book.title }}</em>"
     <div class="column field">
         <label for="post_status-{{ uuid }}">
             <input type="checkbox" name="post-status" class="checkbox" id="post_status-{{ uuid }}" checked>
-            Post to feed
+            {% trans "Post to feed" %}
         </label>
         {% include 'snippets/privacy_select.html' %}
     </div>
     <div class="column">
-        <button type="submit" class="button is-success">Save</button>
+        <button type="submit" class="button is-success">{% trans "Save" %}</button>
         {% include 'snippets/toggle/close_button.html' with text="Cancel" controls_text="finish-reading" controls_uid=uuid %}
     </div>
 </div>
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html
index 47cf3505..c3f325bf 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html
@@ -1,7 +1,8 @@
 {% extends 'components/dropdown.html' %}
+{% load i18n %}
 {% block dropdown-trigger %}
 <span class="icon icon-arrow-down">
-    <span class="is-sr-only">More shelves</span>
+    <span class="is-sr-only">{% trans "More shelves" %}</span>
 </span>
 {% endblock %}
 
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
index 2d7d9609..a1ef2c32 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
@@ -1,4 +1,5 @@
 {% load bookwyrm_tags %}
+{% load i18n %}
 {% for shelf in shelves %}
 {% comparison_bool shelf.identifier active_shelf.shelf.identifier as is_current %}
 {% if dropdown %}<li role="menuitem">{% endif %}
@@ -6,7 +7,7 @@
     {% if shelf.identifier == 'reading' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
         {% include 'snippets/toggle/toggle_button.html' with class=class text="Start reading" controls_text="start-reading" controls_uid=button_uuid focus="modal-title-start-reading" disabled=is_current %}
     {% endif %}{% elif shelf.identifier == 'read' and active_shelf.shelf.identifier == 'read' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
-    <button type="button" class="button {{ class }}" disabled><span>Read</span>
+    <button type="button" class="button {{ class }}" disabled><span>{% trans "Read" %}</span>
     {% endif %}{% elif shelf.identifier == 'read' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
         {% include 'snippets/toggle/toggle_button.html' with class=class text="Finish reading" controls_text="finish-reading" controls_uid=button_uuid focus="modal-title-finish-reading" disabled=is_current %}
     {% endif %}{% elif shelf.identifier == 'to-read' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
diff --git a/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html b/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html
index 239a2be1..cb3506e2 100644
--- a/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html
+++ b/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html
@@ -1,7 +1,8 @@
 {% extends 'components/modal.html' %}
+{% load i18n %}
 
 {% block modal-title %}
-Start "<em>{{ book.title }}</em>"
+{% blocktrans with book_title=book.title %}Start "<em>{{ book_title }}</em>"{% endblocktrans %}
 {% endblock %}
 
 {% block modal-form-open %}
@@ -13,7 +14,7 @@ Start "<em>{{ book.title }}</em>"
     {% csrf_token %}
     <div class="field">
         <label class="label">
-            Started reading
+            {% trans "Started reading" %}
             <input type="date" name="start_date" class="input" id="start_id_start_date-{{ uuid }}" value="{% now "Y-m-d" %}">
         </label>
     </div>
@@ -25,12 +26,12 @@ Start "<em>{{ book.title }}</em>"
     <div class="column field">
         <label for="post_status_start-{{ uuid }}">
             <input type="checkbox" name="post-status" class="checkbox" id="post_status_start-{{ uuid }}" checked>
-            Post to feed
+            {% trans "Post to feed" %}
         </label>
         {% include 'snippets/privacy_select.html' %}
     </div>
     <div class="column">
-        <button class="button is-success" type="submit">Save</button>
+        <button class="button is-success" type="submit">{% trans "Save" %}</button>
         {% include 'snippets/toggle/toggle_button.html' with text="Cancel" controls_text="start-reading" controls_uid=uuid %}
     </div>
 </div>
diff --git a/bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html b/bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html
index 9b7e2bde..179e004e 100644
--- a/bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html
+++ b/bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html
@@ -1,7 +1,8 @@
 {% extends 'components/modal.html' %}
+{% load i18n %}
 
 {% block modal-title %}
-Want to Read "<em>{{ book.title }}</em>"
+{% blocktrans with book_title=book.title %}Want to Read "<em>{{ book_title }}</em>"{% endblocktrans %}
 {% endblock %}
 
 {% block modal-form-open %}
@@ -16,13 +17,13 @@ Want to Read "<em>{{ book.title }}</em>"
     <div class="column field">
         <label for="post_status_want-{{ uuid }}">
             <input type="checkbox" name="post-status" class="checkbox" id="post_status_want-{{ uuid }}" checked>
-            Post to feed
+            {% trans "Post to feed" %}
         </label>
         {% include 'snippets/privacy_select.html' %}
     </div>
     <div class="column">
         <button class="button is-success" type="submit">
-            <span>Want to read</span>
+            <span>{% trans "Want to read" %}</span>
         </button>
         {% include 'snippets/toggle/toggle_button.html' with text="Cancel" controls_text="want-to-read" controls_uid=uuid %}
     </div>
diff --git a/bookwyrm/templates/snippets/stars.html b/bookwyrm/templates/snippets/stars.html
index d1576807..f336a562 100644
--- a/bookwyrm/templates/snippets/stars.html
+++ b/bookwyrm/templates/snippets/stars.html
@@ -1,5 +1,6 @@
+{% load i18n %}
 <p class="stars">
-    <span class="is-sr-only">{% if rating %}{{ rating|floatformat }} star{{ rating|floatformat | pluralize }}{% else %}No rating{% endif %}</span>
+<span class="is-sr-only">{% if rating %}{{ rating|floatformat }} star{{ rating|floatformat | pluralize }}{% else %}{% trans "No rating" %}{% endif %}</span>
     {% for i in '12345'|make_list %}
     <span class="icon is-small mr-1 icon-star-{% if rating >= forloop.counter %}full{% elif rating|floatformat:0 >= forloop.counter|floatformat:0 %}half{% else %}empty{% endif %}" aria-hidden="true">
     </span>
diff --git a/bookwyrm/templates/snippets/status/status.html b/bookwyrm/templates/snippets/status/status.html
index 162fad97..b8925f18 100644
--- a/bookwyrm/templates/snippets/status/status.html
+++ b/bookwyrm/templates/snippets/status/status.html
@@ -1,9 +1,10 @@
 {% load bookwyrm_tags %}
+{% load i18n %}
 {% if not status.deleted %}
     {% if status.status_type == 'Boost' %}
         {% include 'snippets/avatar.html' with user=status.user %}
         {% include 'snippets/username.html' with user=status.user %}
-        boosted
+        {% trans "boosted" %}
         {% include 'snippets/status/status_body.html' with status=status|boosted_status %}
     {% else %}
         {% include 'snippets/status/status_body.html' with status=status %}
diff --git a/bookwyrm/templates/snippets/status/status_body.html b/bookwyrm/templates/snippets/status/status_body.html
index dfc0ac68..1bf0d3c7 100644
--- a/bookwyrm/templates/snippets/status/status_body.html
+++ b/bookwyrm/templates/snippets/status/status_body.html
@@ -1,4 +1,5 @@
 {% extends 'components/card.html' %}
+{% load i18n %}
 
 {% load bookwyrm_tags %}
 {% load humanize %}
@@ -32,16 +33,16 @@
 
     {% else %}
     <a href="/login">
-        <span class="icon icon-comment" title="Reply">
-            <span class="is-sr-only">Reply</span>
+        <span class="icon icon-comment" title="{% trans 'Reply' %}">
+            <span class="is-sr-only">{% trans "Reply" %}</span>
         </span>
 
-        <span class="icon icon-boost" title="Boost status">
-            <span class="is-sr-only">Boost status</span>
+        <span class="icon icon-boost" title="{% trans 'Boost status' %}">
+            <span class="is-sr-only">{% trans "Boost status" %}</span>
         </span>
 
-        <span class="icon icon-heart" title="Like status">
-            <span class="is-sr-only">Like status</span>
+        <span class="icon icon-heart" title="{% trans 'Like status' %}">
+            <span class="is-sr-only">{% trans "Like status" %}</span>
         </span>
     </a>
     {% endif %}
diff --git a/bookwyrm/templates/snippets/status/status_content.html b/bookwyrm/templates/snippets/status/status_content.html
index 0f59f7fc..b48566b0 100644
--- a/bookwyrm/templates/snippets/status/status_content.html
+++ b/bookwyrm/templates/snippets/status/status_content.html
@@ -1,4 +1,5 @@
 {% load bookwyrm_tags %}
+{% load i18n %}
 <div class="block">
     {% if status.status_type == 'Review' %}
     <div>
@@ -38,7 +39,7 @@
                 {% for attachment in status.attachments.all %}
                 <div class="column is-narrow">
                     <figure class="image is-128x128">
-                        <a href="/images/{{ attachment.image }}" target="_blank" aria-label="open image in new window">
+                        <a href="/images/{{ attachment.image }}" target="_blank" aria-label="{% trans 'Open image in new window' %}">
                             <img src="/images/{{ attachment.image }}"{% if attachment.caption %} alt="{{ attachment.caption }}" title="{{ attachment.caption }}"{% endif %}>
                         </a>
                     </figure>
diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html
index 890b4ab8..2b941820 100644
--- a/bookwyrm/templates/snippets/status/status_header.html
+++ b/bookwyrm/templates/snippets/status/status_header.html
@@ -1,17 +1,18 @@
 {% load bookwyrm_tags %}
+{% load i18n %}
 {% include 'snippets/avatar.html' with user=status.user %}
 {% include 'snippets/username.html' with user=status.user %}
 
 {% if status.status_type == 'GeneratedNote' %}
     {{ status.content | safe }}
 {% elif status.status_type == 'Review' and not status.name and not status.content%}
-    rated
+    {% trans "rated" %}
 {% elif status.status_type == 'Review' %}
-    reviewed
+    {% trans "reviewed" %}
 {% elif status.status_type == 'Comment' %}
-    commented on
+    {% trans "commented on" %}
 {% elif status.status_type == 'Quotation' %}
-    quoted
+    {% trans "quoted" %}
 {% elif status.reply_parent %}
     {% with parent_status=status|parent %}
     replied to {% include 'snippets/username.html' with user=parent_status.user possessive=True %} <a href="{{parent_status.remote_id }}">{% if parent_status.status_type == 'GeneratedNote' %}update{% else %}{{ parent_status.status_type | lower }}{% endif %}</a>
diff --git a/bookwyrm/templates/snippets/status/status_options.html b/bookwyrm/templates/snippets/status/status_options.html
index 3bf8251f..735ff51c 100644
--- a/bookwyrm/templates/snippets/status/status_options.html
+++ b/bookwyrm/templates/snippets/status/status_options.html
@@ -1,9 +1,10 @@
 {% extends 'components/dropdown.html' %}
+{% load i18n %}
 {% load bookwyrm_tags %}
 
 {% block dropdown-trigger %}
 <span class="icon icon-dots-three">
-    <span class="is-sr-only">More options</span>
+    <span class="is-sr-only">{% trans "More options" %}</span>
 </span>
 {% endblock %}
 
@@ -13,13 +14,13 @@
     <form class="dropdown-item pt-0 pb-0" name="delete-{{status.id}}" action="/delete-status/{{ status.id }}" method="post">
         {% csrf_token %}
         <button class="button is-danger is-light is-fullwidth is-small" type="submit">
-            Delete post
+            {% trans "Delete post" %}
         </button>
     </form>
 </li>
 {% else %}
 <li role="menuitem">
-    <a href="/direct-messages/{{ status.user|username }}" class="button is-fullwidth is-small">Send direct message</a>
+    <a href="/direct-messages/{{ status.user|username }}" class="button is-fullwidth is-small">{% trans "Send direct message" %}</a>
 </li>
 <li role="menuitem">
     {% include 'snippets/block_button.html' with user=status.user class="is-fullwidth" %}
diff --git a/bookwyrm/templates/snippets/switch_edition_button.html b/bookwyrm/templates/snippets/switch_edition_button.html
index 86c438b1..4818166e 100644
--- a/bookwyrm/templates/snippets/switch_edition_button.html
+++ b/bookwyrm/templates/snippets/switch_edition_button.html
@@ -1,5 +1,6 @@
+{% load i18n %}
 <form name="switch-edition" action="/switch-edition" method="POST">
     {% csrf_token %}
     <input type="hidden" name="edition" value="{{ edition.id }}">
-    <button type="submit" class="button {{ size }}">Switch to this edition</button>
+    <button type="submit" class="button {{ size }}">{% trans "Switch to this edition" %}</button>
 </form>
diff --git a/bookwyrm/templates/snippets/tag.html b/bookwyrm/templates/snippets/tag.html
index 9a56f4ec..507def72 100644
--- a/bookwyrm/templates/snippets/tag.html
+++ b/bookwyrm/templates/snippets/tag.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 <div class="control">
     <form name="tag" action="/{% if tag.tag.identifier in user_tags %}untag{% else %}tag{% endif %}/" method="post">
         {% csrf_token %}
@@ -10,11 +11,11 @@
             </a>
             {% if tag.tag.identifier in user_tags %}
             <button class="tag is-delete" type="submit">
-                <span class="is-sr-only">remove tag</span>
+                <span class="is-sr-only">{% trans "Remove tag" %}</span>
             </button>
             {% else %}
             <button class="tag" type="submit">+
-                <span class="is-sr-only">add tag</span>
+                <span class="is-sr-only">{% trans "Add tag" %}</span>
             </button>
             {% endif %}
         </div>
diff --git a/bookwyrm/templates/snippets/user_options.html b/bookwyrm/templates/snippets/user_options.html
index bc54ca1c..b3f66782 100644
--- a/bookwyrm/templates/snippets/user_options.html
+++ b/bookwyrm/templates/snippets/user_options.html
@@ -1,15 +1,16 @@
 {% extends 'components/dropdown.html' %}
+{% load i18n %}
 {% load bookwyrm_tags %}
 
 {% block dropdown-trigger %}
 <span class="icon icon-dots-three">
-    <span class="is-sr-only">More options</span>
+    <span class="is-sr-only">{% trans "More options" %}</span>
 </span>
 {% endblock %}
 
 {% block dropdown-list %}
 <li role="menuitem">
-    <a href="/direct-messages/{{ user|username }}" class="button is-fullwidth is-small">Send direct message</a>
+    <a href="/direct-messages/{{ user|username }}" class="button is-fullwidth is-small">{% trans "Send direct message" %}</a>
 </li>
 <li role="menuitem">
     {% include 'snippets/block_button.html' with user=user class="is-fullwidth" %}
diff --git a/bookwyrm/templates/tag.html b/bookwyrm/templates/tag.html
index 96fbcf91..f30b7395 100644
--- a/bookwyrm/templates/tag.html
+++ b/bookwyrm/templates/tag.html
@@ -1,4 +1,5 @@
 {% extends 'layout.html' %}
+{% load i18n %}
 {% load bookwyrm_tags %}
 {% block content %}
 
diff --git a/bookwyrm/templates/user/create_shelf_form.html b/bookwyrm/templates/user/create_shelf_form.html
index 89f41fd8..785c8d06 100644
--- a/bookwyrm/templates/user/create_shelf_form.html
+++ b/bookwyrm/templates/user/create_shelf_form.html
@@ -1,7 +1,8 @@
 {% extends 'components/inline_form.html' %}
+{% load i18n %}
 
 {% block header %}
-Create New Shelf
+{% trans "Create New Shelf" %}
 {% endblock %}
 
 {% block form %}
@@ -9,7 +10,7 @@ Create New Shelf
     {% csrf_token %}
     <input type="hidden" name="user" value="{{ request.user.id }}">
     <div class="field">
-        <label class="label" for="id_name_create">Name:</label>
+        <label class="label" for="id_name_create">{% trans "Name:" %}</label>
         <input type="text" name="name" maxlength="100" class="input" required="true" id="id_name_create">
     </div>
 
@@ -18,7 +19,7 @@ Create New Shelf
             {% include 'snippets/privacy_select.html' %}
         </div>
         <div class="control">
-            <button class="button is-primary" type="submit">Create shelf</button>
+            <button class="button is-primary" type="submit">{% trans "Create shelf" %}</button>
         </div>
     </div>
 </form>
diff --git a/bookwyrm/templates/user/edit_shelf_form.html b/bookwyrm/templates/user/edit_shelf_form.html
index b179be9f..a9f86da4 100644
--- a/bookwyrm/templates/user/edit_shelf_form.html
+++ b/bookwyrm/templates/user/edit_shelf_form.html
@@ -1,7 +1,8 @@
 {% extends 'components/inline_form.html' %}
+{% load i18n %}
 
 {% block header %}
-Edit Shelf
+{% trans "Edit Shelf" %}
 {% endblock %}
 
 {% block form %}
@@ -10,7 +11,7 @@ Edit Shelf
     <input type="hidden" name="user" value="{{ request.user.id }}">
     {% if shelf.editable %}
     <div class="field">
-        <label class="label" for="id_name">Name:</label>
+        <label class="label" for="id_name">{% trans "Name:" %}</label>
         <input type="text" name="name" maxlength="100" class="input" required="true" value="{{ shelf.name }}" id="id_name">
     </div>
     {% else %}
@@ -22,7 +23,7 @@ Edit Shelf
             {% include 'snippets/privacy_select.html' with current=shelf.privacy %}
         </div>
         <div class="control">
-            <button class="button is-primary" type="submit">Update shelf</button>
+            <button class="button is-primary" type="submit">{% trans "Update shelf" %}</button>
         </div>
     </div>
 </form>
diff --git a/bookwyrm/templates/user/followers.html b/bookwyrm/templates/user/followers.html
index da6fc320..16ec7d4f 100644
--- a/bookwyrm/templates/user/followers.html
+++ b/bookwyrm/templates/user/followers.html
@@ -1,4 +1,5 @@
 {% extends 'user/user_layout.html' %}
+{% load i18n %}
 {% load bookwyrm_tags %}
 
 {% block header %}
@@ -13,7 +14,7 @@
 
 {% block panel %}
 <div class="block">
-    <h2 class="title">Followers</h2>
+    <h2 class="title">{% trans "Followers" %}</h2>
     {% for followers in followers %}
     <div class="block columns">
         <div class="column">
@@ -26,7 +27,7 @@
     </div>
     {% endfor %}
     {% if not followers.count %}
-    <div>{{ user|username }} has no followers</div>
+    <div>{% blocktrans with username=user|username %}{{ username }} has no followers{% endblocktrans %}</div>
     {% endif %}
 </div>
 {% endblock %}
diff --git a/bookwyrm/templates/user/following.html b/bookwyrm/templates/user/following.html
index d734b0dc..13af4417 100644
--- a/bookwyrm/templates/user/following.html
+++ b/bookwyrm/templates/user/following.html
@@ -1,4 +1,5 @@
 {% extends 'user/user_layout.html' %}
+{% load i18n %}
 {% load bookwyrm_tags %}
 
 {% block header %}
@@ -13,7 +14,7 @@
 
 {% block panel %}
 <div class="block">
-    <h2 class="title">Following</h2>
+    <h2 class="title">{% trans "Following" %}</h2>
     {% for follower in user.following.all %}
     <div class="block columns">
         <div class="column">
@@ -26,7 +27,7 @@
     </div>
     {% endfor %}
     {% if not following.count %}
-    <div>{{ user|username }} isn't following any users</div>
+    <div>{% blocktrans with username=user|username %}{{ username }} isn't following any users{% endblocktrans %}</div>
     {% endif %}
 </div>
 {% endblock %}
diff --git a/bookwyrm/templates/user/lists.html b/bookwyrm/templates/user/lists.html
index 45e4806f..6edf4430 100644
--- a/bookwyrm/templates/user/lists.html
+++ b/bookwyrm/templates/user/lists.html
@@ -1,4 +1,5 @@
 {% extends 'user/user_layout.html' %}
+{% load i18n %}
 
 {% block header %}
 <div class="columns is-mobile">
@@ -24,7 +25,7 @@
 <section class="block content">
     <form name="create-list" method="post" action="{% url 'lists' %}" class="box hidden" id="create-list">
         <header class="columns">
-            <h3 class="title column">Create list</h3>
+            <h3 class="title column">{% trans "Create list" %}</h3>
             <div class="column is-narrow">
                 {% include 'snippets/toggle/toggle_button.html' with controls_text="create-list" label="close" class="delete" nonbutton=True %}
             </div>
diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index 7c8cb8aa..bcab8d84 100644
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -1,15 +1,16 @@
 {% extends 'user/user_layout.html' %}
+{% load i18n %}
 
 {% block header %}
 <div class="columns is-mobile">
     <div class="column">
-        <h1 class="title">User profile</h1>
+        <h1 class="title">{% trans "User profile" %}</h1>
     </div>
     {% if is_self %}
     <div class="column is-narrow">
         <a href="/preferences/profile">
             <span class="icon icon-pencil" title="Edit profile">
-                <span class="is-sr-only">Edit profile</span>
+                <span class="is-sr-only">{% trans "Edit profile" %}</span>
             </span>
         </a>
     </div>
@@ -20,12 +21,12 @@
 {% block panel %}
 {% if user.bookwyrm_user %}
 <div class="block">
-    <h2 class="title">Shelves</h2>
+    <h2 class="title">{% trans "Shelves" %}</h2>
     <div class="columns">
         {% for shelf in shelves %}
         <div class="column is-narrow">
             <h3>{{ shelf.name }}
-                {% if shelf.size > 3 %}<small>(<a href="{{ shelf.local_path }}">See all {{ shelf.size }}</a>)</small>{% endif %}</h3>
+                {% if shelf.size > 3 %}<small>(<a href="{{ shelf.local_path }}">{% blocktrans with size=shelf.size %}See all {{ size }}{% endblocktrans %}</a>)</small>{% endif %}</h3>
             <div class="is-mobile field is-grouped">
             {% for book in shelf.books %}
             <div class="control">
@@ -38,7 +39,7 @@
         </div>
         {% endfor %}
     </div>
-    <small><a href="{{ user.local_path }}/shelves">See all {{ shelf_count }} shelves</a></small>
+    <small><a href="{{ user.local_path }}/shelves">{% blocktrans %}See all {{ shelf_count }} shelves{% endblocktrans %}</a></small>
 </div>
 {% endif %}
 
@@ -49,16 +50,17 @@
 </div>
 {% elif user == request.user %}
 <div class="block">
-    <h2 class="title is-4"><a href="{{ user.local_path }}/goal/{% now 'Y' %}">Set a reading goal for {% now 'Y' %}</a></h2>
+    {% now 'Y' as year %}
+    <h2 class="title is-4"><a href="{{ user.local_path }}/goal/{{ year }}">{% blocktrans %}Set a reading goal for {{ year }}{% endblocktrans %}</a></h2>
 </div>
 {% endif %}
 
 <div>
     <div class="columns is-mobile">
-        <h2 class="title column">User Activity</h2>
+        <h2 class="title column">{% trans "User Activity" %}</h2>
         <div class="column is-narrow">
             <a class="icon icon-rss" target="_blank" href="{{ user.local_path }}/rss">
-                <span class="is-sr-only">RSS feed</span>
+                <span class="is-sr-only">{% trans "RSS feed" %}</span>
             </a>
         </div>
     </div>
@@ -69,7 +71,7 @@
     {% endfor %}
     {% if not activities %}
     <div class="block">
-        <p>No activities yet!</a>
+        <p>{% trans "No activities yet!" %}</a>
     </div>
     {% endif %}
 
diff --git a/bw-dev b/bw-dev
index 012e56f3..27dbc4c3 100755
--- a/bw-dev
+++ b/bw-dev
@@ -91,10 +91,10 @@ case "$CMD" in
         execweb python manage.py collectstatic --no-input
         ;;
     makemessages)
-        django-admin makemessages --ignore=venv3 -l $@
+        django-admin makemessages --extension html --ignore=venv3 $@
         ;;
     compilemessages)
-        django-admin compilemessages --ignore venv3
+        django-admin compilemessages --ignore venv3 $@
         ;;
     build)
         docker-compose build
diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo
index 3487f1c58fe0fc82a4fee913ce0d6796f5cd77b5..09f2076df7783266700a1aa6eb7a4dcf9f49fdfa 100644
GIT binary patch
literal 1438
zcmZ9Lzi%8x6vrn&AmIWegb*kw1|cLOF~{Deh*@J4pJPXs&WYt)h(Kv(cb|7B-kUki
z%pP&76ck7l2q_duX^2u&Q6d^s@fT2_P^Y6oqU8JbOe}c1na|A4oA+bh+b8Ewek&kv
zV7!U(JH|U0507DjB*%q#1ss59z%}qBcoRGaX5d+n!1G`Wvfh^<>pcKZf!~2Ig5QIz
z{{#3O`12uu0bj!YSMYi8H}D1UkHh^_knQ~mvYo%c)8O$Fi~rAnZ0{V%=NG{-a(Ekj
z75f=3_rNbew(~V6_V)nf{2qaqz#l=@djh@;J_R}czd^RcPF@EtfE?$0Ap5<HiSz&9
z@c%K$@l8Pd#BEHRPY!Z?4aoQRLH2ha#7}&MiO;_Qxdi-H90%*LyoSN=%Xe9iV?t>E
z5%$Bv`LSHU;F$4bT}(hH?2qftf@kX9f!7x?xV9{u6AQmVC#$(@ql~o)GLWB>7bD|i
zElV9K6(i^Nx=C)9WTV+N<bznNwXI0bbO@h2Uy3znqb{NhCX&?U)L3zi^fMzHM5Wkp
zeyU?CHm5V^qh!NDjCF{TN?a>tzMqP*2{DKpdJ5M!9J?!YG|mRGtt$#CuyBc0qYDaR
zqUR(gUEp%vd*{WZ&F@eFGnuY1nb?r{)U{rQnwmMTY<tHFYO_?IARCxZWztXjgWe8t
zY-%f1rc|T03MzA{>}}svJ2W?}sjl&}$YC-ZsAQ;ySL9$Ry*yOOQj+vI8<lx&L!+bf
zsoZjHAh|;{C;8!&H=fs5y$RIL`j+BHxMZsq$*GL=^nX{z<ExG7J6|2CrSdxAA+79f
zZEmd}B{1kGJuU-^q_X`PVvKY*zCUZUvCFckwGR|mKF&7O(vcpAx=UWI+rpK`R;gUd
zP3&zqt=Em>iiK3#S+@-<!)3WxuDomITPt#KX}Kp39_Hj_X(*7Di#mwwl(#;Hs4FpQ
zi@KZk$l4Z7WB)B-ln0M(N#3U77GZ(ghR{JpEs@<~A4#opH=!#$zo^JuNdcYNPQ~h8
zY;}X8kcZu8?KL|1si+Z=>Dmm3@c3EVP`npqPTJ>$W{Yx;qIcbf<3+oT$m*i@@E=XJ
yh;+ibM**YFU`0%31SJH1*mk>AH~4C@nx;^mL>%Iyh{UZ&4L$^8xd$qZKKut%w@!Qj

literal 973
zcmYL{yKfUg5XKh>uj3&R3L1)~BZ@8%3KU&plyiJeEY1(vPEep>eK$ETIqzA!djZ_h
z&_II(9f*PoDjEtJ3Mgr*`AaDH)-hzH(eGw=Zsya>{+^$E!(bQTSK%+=m*Icl&bE#*
zb_r~N=fDTxJebYm2{?!NId~F$0bT%KfoH+@;3@DUcn16oy8N%;dGOop{3lq2|AM>z
zS57eIfs5b*czYH<1fAA>(AAxQPR}#Y)qf2-9q(rMA3#^<6X^PVnZ@5hv|^{>PA|f#
zUSO*4IOzU!HUF9G>v}qKwOk)Jlc|M+qO{x&rQwG30clp1+75XtECp<%P*x<C8)=D)
zbR-q4k@$aICrVi?jWw)QSh*(?VP&BV>j+~W7dj1CCl?7B)++~(C_!FdWQOe)rRHWx
z`2ns<^i^U+tfLE;<2O=&hqOVVfOo=;yWwWUccN~u(QbKN8W-C7O_Rygua=qd`$fRL
zPTTL&fpq`)HK&~KMq$@)w*6Yjx7tCov3S4Tio94D>-V)#CKtBQ0k3bzF>i&<h_6M>
zuo16^wOTjo_3j{5Wu?f-?~@n>JPuo%+fK<^9IxkcsnFR`4iq#S&FDz>^3qMu&5jh>
zJsm@jr6=~rI2Tf_@?<EqAzRt**Zq~FJSS_9v>&OYNTtdGzA}*3>*S>txnD2z$OK%C
zr=h9bTIGkImFtRMtMKK8Rge96J0Q(dNrn{f9qx0J2Bo&fij3VOmAVT_*l053Lh-}c
zk{`P5VwKtrhV_e-4BkLFV&T3mMUL5$E>$*NHz`&nC6b{=6)Q8G<7l>Y%X(xdmi31;
b!fDSU2XDa=o{m(+yOfEXSgW*?+2a2KQNZrz

diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index 986785ee..d412c158 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -1,49 +1,23 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# German translation for the BookWyrm UI
+# Copyright (C) 2021 Mouse Reeve
+# This file is distributed under the same license as the BookWyrm package.
+# Mouse Reeve <mousereeve@riseup.net>, 2021.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-27 16:29-0800\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"
-"Language: \n"
+"POT-Creation-Date: 2021-02-27 18:32-0800\n"
+"PO-Revision-Date: 2021-02-27 18:32-0800\n"
+"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
+"Language-Team: Mouse Reeve <LL@li.org>\n"
+"Language: German \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/models/fields.py:24
-#, python-format
-msgid "%(value)s is not a valid remote_id"
-msgstr ""
-
-#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
-#, python-format
-msgid "%(value)s is not a valid username"
-msgstr ""
-
-#: bookwyrm/models/fields.py:164
-msgid "username"
-msgstr "Nutzername"
-
-#: bookwyrm/models/fields.py:169
-msgid "A user with that username already exists."
-msgstr ""
-
-#: bookwyrm/settings.py:142
-msgid "English"
-msgstr ""
-
-#: bookwyrm/settings.py:143
-msgid "Beep"
-msgstr ""
-
 #: bookwyrm/templates/author.html:13 bookwyrm/templates/author.html:14
 msgid "Edit Author"
 msgstr ""
@@ -65,7 +39,7 @@ msgstr ""
 msgid "Add cover"
 msgstr ""
 
-#: bookwyrm/templates/book.html:49
+#: bookwyrm/templates/book.html:49 bookwyrm/templates/lists/list.html:89
 msgid "Add"
 msgstr ""
 
@@ -73,11 +47,11 @@ msgstr ""
 msgid "ISBN:"
 msgstr ""
 
-#: bookwyrm/templates/book.html:65
+#: bookwyrm/templates/book.html:65 bookwyrm/templates/edit_book.html:104
 msgid "OCLC Number:"
 msgstr ""
 
-#: bookwyrm/templates/book.html:72
+#: bookwyrm/templates/book.html:72 bookwyrm/templates/edit_book.html:108
 msgid "ASIN:"
 msgstr ""
 
@@ -85,13 +59,20 @@ msgstr ""
 msgid "View on OpenLibrary"
 msgstr ""
 
-#: bookwyrm/templates/book.html:102
+#: bookwyrm/templates/book.html:102 bookwyrm/templates/edit_book.html:36
+#: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr ""
 
-#: bookwyrm/templates/book.html:106 bookwyrm/templates/edit_author.html:74
+#: bookwyrm/templates/book.html:106 bookwyrm/templates/edit_author.html:75
+#: bookwyrm/templates/edit_book.html:117 bookwyrm/templates/lists/form.html:42
+#: bookwyrm/templates/preferences/edit_user.html:47
+#: bookwyrm/templates/snippets/progress_update.html:21
+#: bookwyrm/templates/snippets/readthrough.html:61
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
 msgid "Save"
-msgstr ""
+msgstr "Speichern"
 
 #: bookwyrm/templates/book.html:138
 msgid "Your reading activity"
@@ -109,7 +90,7 @@ msgstr ""
 msgid "Tags"
 msgstr "Stichworte"
 
-#: bookwyrm/templates/book.html:176
+#: bookwyrm/templates/book.html:176 bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr ""
 
@@ -122,7 +103,8 @@ msgid "Places"
 msgstr "Setzt"
 
 #: bookwyrm/templates/book.html:215 bookwyrm/templates/layout.html:64
-#: bookwyrm/templates/search_results.html:84
+#: bookwyrm/templates/lists/lists.html:6
+#: bookwyrm/templates/search_results.html:85
 #: bookwyrm/templates/user/user_layout.html:60
 msgid "Lists"
 msgstr "Listen"
@@ -131,6 +113,20 @@ msgstr "Listen"
 msgid "rated it"
 msgstr ""
 
+#: bookwyrm/templates/discover/about.html:10
+#: bookwyrm/templates/discover/about.html:20
+msgid "Code of Conduct"
+msgstr ""
+
+#: bookwyrm/templates/discover/about.html:13
+#: bookwyrm/templates/discover/about.html:29
+msgid "Privacy Policy"
+msgstr ""
+
+#: bookwyrm/templates/discover/discover.html:6
+msgid "Recent Books"
+msgstr ""
+
 #: bookwyrm/templates/discover/landing_layout.html:15
 msgid "Decentralized"
 msgstr ""
@@ -149,7 +145,7 @@ msgid "Join %(name)s"
 msgstr ""
 
 #: bookwyrm/templates/discover/landing_layout.html:47
-#: bookwyrm/templates/login.html:45
+#: bookwyrm/templates/login.html:46
 msgid "This instance is closed"
 msgstr ""
 
@@ -157,171 +153,313 @@ msgstr ""
 msgid "Your Account"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:27
+#: bookwyrm/templates/edit_author.html:10 bookwyrm/templates/edit_book.html:10
+msgid "Added:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:11 bookwyrm/templates/edit_book.html:11
+msgid "Updated:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:12 bookwyrm/templates/edit_book.html:12
+msgid "Last edited by:"
+msgstr "Zuletzt bearbeitet von:"
+
+#: bookwyrm/templates/edit_author.html:28 bookwyrm/templates/edit_book.html:27
 msgid "Metadata"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:28
+#: bookwyrm/templates/edit_author.html:29 bookwyrm/templates/lists/form.html:8
+#: bookwyrm/templates/user/create_shelf_form.html:13
+#: bookwyrm/templates/user/edit_shelf_form.html:14
 msgid "Name:"
-msgstr ""
+msgstr "Name:"
 
-#: bookwyrm/templates/edit_author.html:33
+#: bookwyrm/templates/edit_author.html:34
 msgid "Bio:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:38
+#: bookwyrm/templates/edit_author.html:39
 msgid "Wikipedia link:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:43
+#: bookwyrm/templates/edit_author.html:44
 msgid "Birth date:"
 msgstr "Geburtstag"
 
-#: bookwyrm/templates/edit_author.html:48
+#: bookwyrm/templates/edit_author.html:49
 msgid "Death date:"
 msgstr "Todesdatum"
 
-#: bookwyrm/templates/edit_author.html:54
+#: bookwyrm/templates/edit_author.html:55
 msgid "Author Identifiers"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:55
+#: bookwyrm/templates/edit_author.html:56 bookwyrm/templates/edit_book.html:100
 msgid "Openlibrary key:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:60
+#: bookwyrm/templates/edit_author.html:61
 msgid "Librarything key:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:65
+#: bookwyrm/templates/edit_author.html:66
 msgid "Goodreads key:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:75
+#: bookwyrm/templates/edit_author.html:76 bookwyrm/templates/edit_book.html:118
 msgid "Cancel"
 msgstr ""
 
-#: bookwyrm/templates/error.html:5
-msgid "Server Error"
+#: bookwyrm/templates/edit_book.html:28
+#: bookwyrm/templates/snippets/create_status_form.html:10
+msgid "Title:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:32
+msgid "Subtitle:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:40
+msgid "Series:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:44
+msgid "Series number:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:48
+#, fuzzy
+#| msgid "Birth date:"
+msgid "First published date:"
+msgstr "Geburtstag"
+
+#: bookwyrm/templates/edit_book.html:52
+#, fuzzy
+#| msgid "Birth date:"
+msgid "Published date:"
+msgstr "Geburtstag"
+
+#: bookwyrm/templates/edit_book.html:65
+#: bookwyrm/templates/snippets/shelf.html:9
+msgid "Cover"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:75
+msgid "Physical Properties"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:76
+msgid "Format:"
+msgstr "Format:"
+
+#: bookwyrm/templates/edit_book.html:84
+msgid "Pages:"
+msgstr "Seiten"
+
+#: bookwyrm/templates/edit_book.html:91
+msgid "Book Identifiers"
+msgstr "Buchkennungen"
+
+#: bookwyrm/templates/edit_book.html:92
+msgid "ISBN 13:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:96
+msgid "ISBN 10:"
+msgstr ""
+
+#: bookwyrm/templates/editions.html:6
+#, python-format
+msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 msgstr ""
 
 #: bookwyrm/templates/error.html:6
+msgid "Server Error"
+msgstr "Serverfehler"
+
+#: bookwyrm/templates/error.html:7
 msgid "Something went wrong! Sorry about that."
 msgstr ""
 
-#: bookwyrm/templates/goal.html:6
+#: bookwyrm/templates/feed/direct_messages.html:7
+msgid "All messages"
+msgstr ""
+
+#: bookwyrm/templates/feed/direct_messages.html:16
+msgid "You have no messages right now."
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:6
+#, python-format
+msgid "%(tab_title)s Timeline"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:10
+msgid "Home"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:13
+msgid "Local"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:16
+msgid "Federated"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:24
+msgid "Announcements"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:32
+msgid ""
+"There aren't any activities right now! Try following a user to get started"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed_layout.html:9
+msgid "Your books"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed_layout.html:11
+msgid ""
+"There are no books here right now! Try searching for a book to get started"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed_layout.html:68
+#, python-format
+msgid "%(year)s Reading Goal"
+msgstr ""
+
+#: bookwyrm/templates/feed/status.html:7
+msgid "Back"
+msgstr ""
+
+#: bookwyrm/templates/goal.html:7
 #, python-format
 msgid "%(year)s Reading Progress"
 msgstr ""
 
-#: bookwyrm/templates/goal.html:28
+#: bookwyrm/templates/goal.html:29
+#: bookwyrm/templates/snippets/goal_card.html:13
 #, python-format
 msgid ""
 "Set a goal for how many books you'll finish reading in %(year)s, and track "
 "your progress throughout the year."
 msgstr ""
 
-#: bookwyrm/templates/import.html:5
-msgid "Import Books"
+#: bookwyrm/templates/goal.html:38
+#, python-format
+msgid "%(name)s hasn't set a reading goal for %(year)s."
 msgstr ""
 
-#: bookwyrm/templates/import.html:10
+#: bookwyrm/templates/import.html:6
+msgid "Import Books"
+msgstr "Bücher importieren"
+
+#: bookwyrm/templates/import.html:11
 msgid "Data source"
 msgstr ""
 
-#: bookwyrm/templates/import.html:28
+#: bookwyrm/templates/import.html:29
 msgid "Include reviews"
 msgstr ""
 
-#: bookwyrm/templates/import.html:33
+#: bookwyrm/templates/import.html:34
 msgid "Privacy setting for imported reviews:"
 msgstr ""
 
-#: bookwyrm/templates/import.html:37
+#: bookwyrm/templates/import.html:38
 msgid "Import"
 msgstr ""
 
-#: bookwyrm/templates/import.html:42
+#: bookwyrm/templates/import.html:43
 msgid "Recent Imports"
 msgstr ""
 
-#: bookwyrm/templates/import.html:44
+#: bookwyrm/templates/import.html:45
 msgid "No recent imports"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:6
+#: bookwyrm/templates/import_status.html:7
 msgid "Import Status"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:9
+#: bookwyrm/templates/import_status.html:10
 msgid "Import started: "
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:13
+#: bookwyrm/templates/import_status.html:14
 msgid "Import completed: "
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:16
+#: bookwyrm/templates/import_status.html:17
 msgid "TASK FAILED"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:22
+#: bookwyrm/templates/import_status.html:23
 msgid "Import still in progress."
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:24
+#: bookwyrm/templates/import_status.html:25
 msgid "(Hit reload to update!)"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:31
+#: bookwyrm/templates/import_status.html:32
 msgid "Failed to load"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:55
+#: bookwyrm/templates/import_status.html:56
 msgid "Select all"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:58
+#: bookwyrm/templates/import_status.html:59
 msgid "Retry items"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:80
+#: bookwyrm/templates/import_status.html:81
 msgid "Successfully imported"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:84
+#: bookwyrm/templates/import_status.html:85
+#: bookwyrm/templates/lists/curate.html:14
 msgid "Book"
-msgstr ""
+msgstr "Buch"
 
-#: bookwyrm/templates/import_status.html:87
+#: bookwyrm/templates/import_status.html:88
+#: bookwyrm/templates/snippets/shelf.html:10
 msgid "Title"
-msgstr ""
+msgstr "Titel"
 
-#: bookwyrm/templates/import_status.html:90
+#: bookwyrm/templates/import_status.html:91
+#: bookwyrm/templates/snippets/shelf.html:11
 msgid "Author"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:113
+#: bookwyrm/templates/import_status.html:114
 msgid "Imported"
 msgstr ""
 
-#: bookwyrm/templates/invite.html:8 bookwyrm/templates/login.html:40
+#: bookwyrm/templates/invite.html:9 bookwyrm/templates/login.html:41
 msgid "Create an Account"
 msgstr ""
 
-#: bookwyrm/templates/invite.html:17
+#: bookwyrm/templates/invite.html:18
 msgid "Permission Denied"
 msgstr ""
 
-#: bookwyrm/templates/invite.html:18
+#: bookwyrm/templates/invite.html:19
 msgid "Sorry! This invite code is no longer valid."
 msgstr ""
 
-#: bookwyrm/templates/layout.html:38
+#: bookwyrm/templates/layout.html:37 bookwyrm/templates/lists/list.html:62
+msgid "Search"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:38 bookwyrm/templates/lists/list.html:63
 msgid "search"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:48
+#: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48
 msgid "Main navigation menu"
 msgstr ""
 
@@ -333,17 +471,19 @@ msgstr "Deine Regale"
 msgid "Feed"
 msgstr "Aktualisierung"
 
-#: bookwyrm/templates/layout.html:126 bookwyrm/templates/notifications.html:6
+#: bookwyrm/templates/layout.html:125 bookwyrm/templates/layout.html:126
+#: bookwyrm/templates/notifications.html:7
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
 #: bookwyrm/templates/layout.html:143 bookwyrm/templates/layout.html:147
-#: bookwyrm/templates/login.html:14
+#: bookwyrm/templates/login.html:15
+#: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:152 bookwyrm/templates/login.html:7
-#: bookwyrm/templates/login.html:30
+#: bookwyrm/templates/layout.html:152 bookwyrm/templates/login.html:8
+#: bookwyrm/templates/login.html:31
 msgid "Log in"
 msgstr ""
 
@@ -355,82 +495,968 @@ msgstr "Ãœber diesen Server"
 msgid "Contact site admin"
 msgstr "Wenden Sie sich an den Site-Administrator"
 
-#: bookwyrm/templates/login.html:20
+#: bookwyrm/templates/lists/create_form.html:5
+msgid "Create List"
+msgstr ""
+
+#: bookwyrm/templates/lists/curate.html:6
+msgid "Pending Books"
+msgstr ""
+
+#: bookwyrm/templates/lists/curate.html:7
+msgid "Go to list"
+msgstr ""
+
+#: bookwyrm/templates/lists/curate.html:9
+msgid "You're all set!"
+msgstr ""
+
+#: bookwyrm/templates/lists/curate.html:15
+msgid "Suggested by"
+msgstr ""
+
+#: bookwyrm/templates/lists/curate.html:35
+msgid "Approve"
+msgstr ""
+
+#: bookwyrm/templates/lists/curate.html:41
+msgid "Discard"
+msgstr ""
+
+#: bookwyrm/templates/lists/edit_form.html:5
+msgid "Edit List"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:18
+msgid "List curation:"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:21
+msgid "Closed"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:22
+msgid "Only you can add and remove books to this list"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:26
+msgid "Curated"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:27
+msgid "Anyone can suggest books, subject to your approval"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:31
+msgid "Open"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:32
+msgid "Anyone can add books to this list"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:17
+msgid "This list is currently empty"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:35
+msgid "Added by"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:41
+msgid "Remove"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:54
+msgid "Add Books"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:54
+msgid "Suggest Books"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:58
+msgid "Search for a book"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:69
+msgid "Clear search"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:74
+#, python-format
+msgid "No books found matching the query \"%(query)s\""
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:75
+msgid "No books found"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:89
+msgid "Suggest"
+msgstr ""
+
+#: bookwyrm/templates/lists/list_items.html:19
+#: bookwyrm/templates/lists/list_layout.html:9
+msgid "Created and curated by"
+msgstr ""
+
+#: bookwyrm/templates/lists/list_items.html:19
+#: bookwyrm/templates/lists/list_layout.html:9
+msgid "Created by"
+msgstr ""
+
+#: bookwyrm/templates/lists/lists.html:11
+#, fuzzy
+#| msgid "Your shelves"
+msgid "Your lists"
+msgstr "Deine Regale"
+
+#: bookwyrm/templates/lists/lists.html:36
+msgid "Recent Lists"
+msgstr ""
+
+#: bookwyrm/templates/login.html:21 bookwyrm/templates/password_reset.html:15
+#: bookwyrm/templates/snippets/register_form.html:22
 msgid "Password:"
 msgstr "Passwort"
 
-#: bookwyrm/templates/login.html:33
+#: bookwyrm/templates/login.html:34
 msgid "Forgot your password?"
 msgstr ""
 
-#: bookwyrm/templates/login.html:46
+#: bookwyrm/templates/login.html:47
 msgid "Contact an administrator to get an invite"
 msgstr ""
 
-#: bookwyrm/templates/login.html:56
+#: bookwyrm/templates/login.html:57
 msgid "More about this site"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:10
+#: bookwyrm/templates/notfound.html:6
+msgid "Not Found"
+msgstr ""
+
+#: bookwyrm/templates/notfound.html:7
+msgid "The page your requested doesn't seem to exist!"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:11
 msgid "Delete notifications"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:101
+#: bookwyrm/templates/notifications.html:45
+#, python-format
+msgid ""
+"\n"
+"                                favorited your\n"
+"                                <a href=\"%(related_path)s\">"
+"%(preview_name)s</a>\n"
+"                                "
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:51
+#, python-format
+msgid ""
+"\n"
+"                                mentioned you in a\n"
+"                                <a href=\"%(related_path)s\">"
+"%(preview_name)s</a>\n"
+"                                "
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:57
+#, python-format
+msgid ""
+"\n"
+"                                <a href=\"%(related_path)s\">replied</a>\n"
+"                                to your\n"
+"                                <a href=\"%(parent_path)s\">"
+"%(preview_name)s</a>\n"
+"                                "
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:64
+msgid "followed you"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:67
+msgid "sent you a follow request"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:72
+#, python-format
+msgid ""
+"\n"
+"                                boosted your <a href=\"%(related_path)s\">"
+"%(preview_name)s</a>\n"
+"                                "
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:76
+msgid "added"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:76
+msgid "suggested adding"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:79
+#, python-format
+msgid " your <a href=\"/import/%(related_id)s\">import</a> completed."
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:111
 msgid "You're all caught up!"
 msgstr ""
 
-#: bookwyrm/templates/password_reset_request.html:7
+#: bookwyrm/templates/password_reset.html:8
+#: bookwyrm/templates/password_reset_request.html:8
 msgid "Reset Password"
 msgstr ""
 
-#: bookwyrm/templates/password_reset_request.html:9
+#: bookwyrm/templates/password_reset.html:21
+#: bookwyrm/templates/preferences/change_password.html:15
+#, fuzzy
+#| msgid "Password:"
+msgid "Confirm password:"
+msgstr "Passwort"
+
+#: bookwyrm/templates/password_reset.html:28
+msgid "Confirm"
+msgstr ""
+
+#: bookwyrm/templates/password_reset_request.html:10
 msgid "A link to reset your password will be sent to your email address"
 msgstr ""
 
-#: bookwyrm/templates/password_reset_request.html:13
+#: bookwyrm/templates/password_reset_request.html:14
+#: bookwyrm/templates/preferences/edit_user.html:35
+#: bookwyrm/templates/snippets/register_form.html:13
 msgid "Email address:"
 msgstr ""
 
-#: bookwyrm/templates/password_reset_request.html:20
+#: bookwyrm/templates/password_reset_request.html:21
 msgid "Reset password"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:10
+#: bookwyrm/templates/preferences/blocks.html:5
+msgid "Blocked Users"
+msgstr ""
+
+#: bookwyrm/templates/preferences/blocks.html:10
+msgid "No users currently blocked."
+msgstr ""
+
+#: bookwyrm/templates/preferences/change_password.html:4
+#, fuzzy
+#| msgid "Password:"
+msgid "Change Password"
+msgstr "Passwort ändern:"
+
+#: bookwyrm/templates/preferences/change_password.html:11
+#, fuzzy
+#| msgid "Password:"
+msgid "New password:"
+msgstr "Neues Passwort:"
+
+#: bookwyrm/templates/preferences/change_password.html:18
+#: bookwyrm/templates/preferences/preferences_layout.html:17
+msgid "Change password"
+msgstr "Passwort ändern:"
+
+#: bookwyrm/templates/preferences/edit_user.html:4
+msgid "Edit Profile"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:14
+msgid "Avatar:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:21
+msgid "Display name:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:28
+msgid "Summary:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:43
+msgid "Manually approve followers:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/preferences_layout.html:11
+msgid "Account"
+msgstr ""
+
+#: bookwyrm/templates/preferences/preferences_layout.html:14
+msgid "Profile"
+msgstr ""
+
+#: bookwyrm/templates/preferences/preferences_layout.html:20
+msgid "Relationships"
+msgstr ""
+
+#: bookwyrm/templates/preferences/preferences_layout.html:23
+msgid "Blocked users"
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:6
+#, python-format
+msgid "Search Results for \"%(query)s\""
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:11
 msgid "Matching Books"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:13
+#: bookwyrm/templates/search_results.html:14
 #, python-format
 msgid "No books found for \"%(query)s\""
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:29
+#: bookwyrm/templates/search_results.html:30
 msgid "Didn't find what you were looking for?"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:52
+#: bookwyrm/templates/search_results.html:53
 msgid "Import book"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:69
+#: bookwyrm/templates/search_results.html:70
 msgid "Matching Users"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:71
+#: bookwyrm/templates/search_results.html:72
 #, python-format
 msgid "No users found for \"%(query)s\""
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:86
+#: bookwyrm/templates/search_results.html:87
 #, python-format
 msgid "No lists found for \"%(query)s\""
 msgstr ""
 
-#: bookwyrm/templates/tag.html:6
+#: bookwyrm/templates/settings/admin_layout.html:12
+msgid "Manage Users"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:16
+#: bookwyrm/templates/settings/manage_invites.html:3
+msgid "Invites"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:20
+#: bookwyrm/templates/settings/federation.html:3
+msgid "Federated Servers"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:25
+msgid "Instance Settings"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:29
+#: bookwyrm/templates/settings/site.html:3
+msgid "Site Configuration"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/site.html:10
+msgid "Instance Info"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:33
+#: bookwyrm/templates/settings/site.html:36
+msgid "Images"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:34
+#: bookwyrm/templates/settings/site.html:56
+msgid "Footer Content"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:35
+#: bookwyrm/templates/settings/site.html:74
+msgid "Registration"
+msgstr ""
+
+#: bookwyrm/templates/settings/federation.html:9
+#, fuzzy
+#| msgid "username"
+msgid "Server name"
+msgstr "Nutzername"
+
+#: bookwyrm/templates/settings/federation.html:10
+msgid "Software"
+msgstr ""
+
+#: bookwyrm/templates/settings/federation.html:11
+msgid "Status"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:7
+msgid "Generate New Invite"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:13
+msgid "Expiry:"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:19
+msgid "Use limit:"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:26
+msgid "Create Invite"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:33
+msgid "Link"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:34
+msgid "Expires"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:35
+msgid "Max uses"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:36
+msgid "Times used"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:39
+msgid "No active invites"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:12
+msgid "Instance Name:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:16
+msgid "Tagline:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:20
+msgid "Instance description:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:24
+msgid "Code of conduct:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:28
+msgid "Privacy Policy:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:39
+msgid "Logo:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:43
+msgid "Logo small:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:47
+msgid "Favicon:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:58
+msgid "Support link:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:62
+msgid "Support title:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:66
+msgid "Admin email:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:76
+msgid "Allow registration:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:80
+msgid "Registration closed text:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:86
+msgid "Save Changes"
+msgstr ""
+
+#: bookwyrm/templates/snippets/block_button.html:5
+msgid "Block"
+msgstr ""
+
+#: bookwyrm/templates/snippets/block_button.html:10
+msgid "Un-block"
+msgstr ""
+
+#: bookwyrm/templates/snippets/boost_button.html:8
+#: bookwyrm/templates/snippets/boost_button.html:9
+#: bookwyrm/templates/snippets/status/status_body.html:40
+#: bookwyrm/templates/snippets/status/status_body.html:41
+msgid "Boost status"
+msgstr ""
+
+#: bookwyrm/templates/snippets/boost_button.html:16
+#: bookwyrm/templates/snippets/boost_button.html:17
+msgid "Un-boost status"
+msgstr ""
+
+#: bookwyrm/templates/snippets/content_warning_field.html:3
+msgid "Spoiler alert:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/content_warning_field.html:4
+msgid "Spoilers ahead!"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status.html:8
+msgid "Review"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status.html:11
+msgid "Comment"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status.html:14
+msgid "Quote"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status_form.html:21
+#: bookwyrm/templates/snippets/shelf.html:17
+msgid "Rating"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status_form.html:23
+#: bookwyrm/templates/snippets/rate_action.html:14
+#: bookwyrm/templates/snippets/stars.html:3
+msgid "No rating"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status_form.html:44
+msgid "Comment:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status_form.html:59
+#: bookwyrm/templates/snippets/privacy-icons.html:15
+#: bookwyrm/templates/snippets/privacy-icons.html:16
+#: bookwyrm/templates/snippets/privacy_select.html:19
+msgid "Private"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status_form.html:66
+msgid "Post"
+msgstr ""
+
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:4
+msgid "Delete these read dates?"
+msgstr ""
+
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
+#, python-format
+msgid ""
+"You are deleting this readthrough and its %(count)s associated progress "
+"updates."
+msgstr ""
+
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
+#: bookwyrm/templates/snippets/follow_request_buttons.html:13
+msgid "Delete"
+msgstr ""
+
+#: bookwyrm/templates/snippets/fav_button.html:7
+#: bookwyrm/templates/snippets/fav_button.html:8
+#: bookwyrm/templates/snippets/status/status_body.html:44
+#: bookwyrm/templates/snippets/status/status_body.html:45
+msgid "Like status"
+msgstr ""
+
+#: bookwyrm/templates/snippets/fav_button.html:15
+#: bookwyrm/templates/snippets/fav_button.html:16
+msgid "Un-like status"
+msgstr ""
+
+#: bookwyrm/templates/snippets/follow_button.html:6
+msgid "Follow request already sent."
+msgstr ""
+
+#: bookwyrm/templates/snippets/follow_button.html:19
+msgid "Send follow request"
+msgstr ""
+
+#: bookwyrm/templates/snippets/follow_button.html:21
+msgid "Follow"
+msgstr ""
+
+#: bookwyrm/templates/snippets/follow_button.html:27
+msgid "Unfollow"
+msgstr ""
+
+#: bookwyrm/templates/snippets/follow_request_buttons.html:8
+msgid "Accept"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_card.html:6
+#, python-format
+msgid "%(year)s reading goal"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_card.html:21
+msgid "Dismiss message"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_card.html:22
+#, python-format
+msgid ""
+"You can set or change your reading goal any time from your <a href=\"%(path)s"
+"\">profile page</a>"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_form.html:9
+msgid "Reading goal:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_form.html:14
+msgid "books"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_form.html:19
+msgid "Goal privacy:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_form.html:26
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:29
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20
+msgid "Post to feed"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_form.html:30
+msgid "Set goal"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_progress.html:5
+msgid "Success!"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_progress.html:7
+#, python-format
+msgid "%(percent)s%% complete!"
+msgstr ""
+
+#: bookwyrm/templates/snippets/pagination.html:7
+msgid "Previous"
+msgstr ""
+
+#: bookwyrm/templates/snippets/pagination.html:15
+msgid "Next"
+msgstr ""
+
+#: bookwyrm/templates/snippets/privacy-icons.html:3
+#: bookwyrm/templates/snippets/privacy-icons.html:4
+#: bookwyrm/templates/snippets/privacy_select.html:10
+msgid "Public"
+msgstr ""
+
+#: bookwyrm/templates/snippets/privacy-icons.html:7
+#: bookwyrm/templates/snippets/privacy-icons.html:8
+#: bookwyrm/templates/snippets/privacy_select.html:13
+msgid "Unlisted"
+msgstr ""
+
+#: bookwyrm/templates/snippets/privacy-icons.html:12
+msgid "Followers-only"
+msgstr ""
+
+#: bookwyrm/templates/snippets/privacy_select.html:6
+msgid "Post privacy"
+msgstr ""
+
+#: bookwyrm/templates/snippets/privacy_select.html:16
+#: bookwyrm/templates/user/followers.html:17
+msgid "Followers"
+msgstr ""
+
+#: bookwyrm/templates/snippets/progress_update.html:6
+msgid "Progress:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/progress_update.html:16
+#: bookwyrm/templates/snippets/readthrough_form.html:22
+msgid "pages"
+msgstr ""
+
+#: bookwyrm/templates/snippets/progress_update.html:17
+#: bookwyrm/templates/snippets/readthrough_form.html:23
+msgid "percent"
+msgstr ""
+
+#: bookwyrm/templates/snippets/progress_update.html:25
+#, python-format
+msgid "of %(book.pages)s pages"
+msgstr ""
+
+#: bookwyrm/templates/snippets/rate_action.html:4
+msgid "Leave a rating"
+msgstr ""
+
+#: bookwyrm/templates/snippets/rate_action.html:29
+msgid "Rate"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough.html:7
+msgid "Progress Updates:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough.html:11
+msgid "finished"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough.html:29
+msgid "Delete this progress update"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough.html:39
+msgid "started"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough.html:57
+msgid "Edit read dates"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough_form.html:7
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:19
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:17
+msgid "Started reading"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough_form.html:14
+msgid "Progress"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough_form.html:30
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25
+msgid "Finished reading"
+msgstr ""
+
+#: bookwyrm/templates/snippets/register_form.html:32
+msgid "Sign Up"
+msgstr ""
+
+#: bookwyrm/templates/snippets/rss_title.html:5
+#: bookwyrm/templates/snippets/status/status_header.html:9
+msgid "rated"
+msgstr ""
+
+#: bookwyrm/templates/snippets/rss_title.html:7
+#: bookwyrm/templates/snippets/status/status_header.html:11
+msgid "reviewed"
+msgstr ""
+
+#: bookwyrm/templates/snippets/rss_title.html:9
+#: bookwyrm/templates/snippets/status/status_header.html:13
+msgid "commented on"
+msgstr ""
+
+#: bookwyrm/templates/snippets/rss_title.html:11
+#: bookwyrm/templates/snippets/status/status_header.html:15
+msgid "quoted"
+msgstr ""
+
+#: bookwyrm/templates/snippets/search_result_text.html:3
+#, python-format
+msgid "by %(author)s"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:12
+msgid "Published"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:13
+msgid "Shelved"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:14
+msgid "Started"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:15
+msgid "Finished"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:16
+msgid "External links"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:44
+msgid "OpenLibrary"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:61
+msgid "This shelf is empty."
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:67
+msgid "Delete shelf"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf_selector.html:4
+msgid "Change shelf"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf_selector.html:27
+#, fuzzy
+#| msgid "Your shelves"
+msgid "Unshelve"
+msgstr "Deine Regale"
+
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
+#, python-format
+msgid "Finish \"<em>%(book_title)s</em>\""
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5
+#, fuzzy
+#| msgid "Your shelves"
+msgid "More shelves"
+msgstr "Deine Regale"
+
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:10
+msgid "Read"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
+#, python-format
+msgid "Start \"<em>%(book_title)s</em>\""
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:5
+#, python-format
+msgid "Want to Read \"<em>%(book_title)s</em>\""
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26
+msgid "Want to read"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status.html:7
+msgid "boosted"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_body.html:36
+#: bookwyrm/templates/snippets/status/status_body.html:37
+msgid "Reply"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_content.html:42
+msgid "Open image in new window"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_options.html:7
+#: bookwyrm/templates/snippets/user_options.html:7
+msgid "More options"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_options.html:17
+msgid "Delete post"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_options.html:23
+#: bookwyrm/templates/snippets/user_options.html:13
+msgid "Send direct message"
+msgstr ""
+
+#: bookwyrm/templates/snippets/switch_edition_button.html:5
+msgid "Switch to this edition"
+msgstr ""
+
+#: bookwyrm/templates/snippets/tag.html:14
+msgid "Remove tag"
+msgstr ""
+
+#: bookwyrm/templates/tag.html:7
 #, python-format
 msgid "Books tagged \"%(tag.name)s\""
 msgstr ""
 
+#: bookwyrm/templates/user/create_shelf_form.html:5
+msgid "Create New Shelf"
+msgstr ""
+
+#: bookwyrm/templates/user/create_shelf_form.html:22
+msgid "Create shelf"
+msgstr ""
+
+#: bookwyrm/templates/user/edit_shelf_form.html:5
+msgid "Edit Shelf"
+msgstr ""
+
+#: bookwyrm/templates/user/edit_shelf_form.html:26
+msgid "Update shelf"
+msgstr ""
+
+#: bookwyrm/templates/user/followers.html:30
+#, python-format
+msgid "%(username)s has no followers"
+msgstr ""
+
+#: bookwyrm/templates/user/following.html:17
+msgid "Following"
+msgstr ""
+
+#: bookwyrm/templates/user/following.html:30
+#, python-format
+msgid "%(username)s isn't following any users"
+msgstr ""
+
+#: bookwyrm/templates/user/lists.html:28
+msgid "Create list"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:7
+msgid "User profile"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:13
+msgid "Edit profile"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:24
+#: bookwyrm/templates/user/user_layout.html:66
+msgid "Shelves"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:29
+#, python-format
+msgid "See all %(size)s"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:42
+#, python-format
+msgid "See all %(shelf_count)s shelves"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:54
+#, python-format
+msgid "Set a reading goal for %(year)s"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:60
+msgid "User Activity"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:63
+msgid "RSS feed"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:74
+msgid "No activities yet!"
+msgstr ""
+
 #: bookwyrm/templates/user/user_layout.html:30
 msgid "Follow Requests"
 msgstr ""
@@ -443,10 +1469,6 @@ msgstr ""
 msgid "Reading Goal"
 msgstr ""
 
-#: bookwyrm/templates/user/user_layout.html:66
-msgid "Shelves"
-msgstr ""
-
 #: bookwyrm/templates/user/user_preview.html:13
 #, python-format
 msgid "Joined %(date)s"
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index 475f4ecf..b849b903 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-27 14:59-0800\n"
+"POT-Creation-Date: 2021-02-27 18:32-0800\n"
 "PO-Revision-Date: 2021-02-27 13:50+PST\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -39,7 +39,7 @@ msgstr ""
 msgid "Add cover"
 msgstr ""
 
-#: bookwyrm/templates/book.html:49
+#: bookwyrm/templates/book.html:49 bookwyrm/templates/lists/list.html:89
 msgid "Add"
 msgstr ""
 
@@ -47,11 +47,11 @@ msgstr ""
 msgid "ISBN:"
 msgstr ""
 
-#: bookwyrm/templates/book.html:65
+#: bookwyrm/templates/book.html:65 bookwyrm/templates/edit_book.html:104
 msgid "OCLC Number:"
 msgstr ""
 
-#: bookwyrm/templates/book.html:72
+#: bookwyrm/templates/book.html:72 bookwyrm/templates/edit_book.html:108
 msgid "ASIN:"
 msgstr ""
 
@@ -59,11 +59,18 @@ msgstr ""
 msgid "View on OpenLibrary"
 msgstr ""
 
-#: bookwyrm/templates/book.html:102
+#: bookwyrm/templates/book.html:102 bookwyrm/templates/edit_book.html:36
+#: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr ""
 
-#: bookwyrm/templates/book.html:106 bookwyrm/templates/edit_author.html:74
+#: bookwyrm/templates/book.html:106 bookwyrm/templates/edit_author.html:75
+#: bookwyrm/templates/edit_book.html:117 bookwyrm/templates/lists/form.html:42
+#: bookwyrm/templates/preferences/edit_user.html:47
+#: bookwyrm/templates/snippets/progress_update.html:21
+#: bookwyrm/templates/snippets/readthrough.html:61
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
 msgid "Save"
 msgstr ""
 
@@ -83,7 +90,7 @@ msgstr ""
 msgid "Tags"
 msgstr ""
 
-#: bookwyrm/templates/book.html:176
+#: bookwyrm/templates/book.html:176 bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr ""
 
@@ -95,7 +102,9 @@ msgstr ""
 msgid "Places"
 msgstr ""
 
-#: bookwyrm/templates/book.html:215 bookwyrm/templates/search_results.html:84
+#: bookwyrm/templates/book.html:215 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/lists/lists.html:6
+#: bookwyrm/templates/search_results.html:85
 #: bookwyrm/templates/user/user_layout.html:60
 msgid "Lists"
 msgstr ""
@@ -104,6 +113,20 @@ msgstr ""
 msgid "rated it"
 msgstr ""
 
+#: bookwyrm/templates/discover/about.html:10
+#: bookwyrm/templates/discover/about.html:20
+msgid "Code of Conduct"
+msgstr ""
+
+#: bookwyrm/templates/discover/about.html:13
+#: bookwyrm/templates/discover/about.html:29
+msgid "Privacy Policy"
+msgstr ""
+
+#: bookwyrm/templates/discover/discover.html:6
+msgid "Recent Books"
+msgstr ""
+
 #: bookwyrm/templates/discover/landing_layout.html:15
 msgid "Decentralized"
 msgstr ""
@@ -122,7 +145,7 @@ msgid "Join %(name)s"
 msgstr ""
 
 #: bookwyrm/templates/discover/landing_layout.html:47
-#: bookwyrm/templates/login.html:45
+#: bookwyrm/templates/login.html:46
 msgid "This instance is closed"
 msgstr ""
 
@@ -130,185 +153,333 @@ msgstr ""
 msgid "Your Account"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:27
+#: bookwyrm/templates/edit_author.html:10 bookwyrm/templates/edit_book.html:10
+msgid "Added:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:11 bookwyrm/templates/edit_book.html:11
+msgid "Updated:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:12 bookwyrm/templates/edit_book.html:12
+msgid "Last edited by:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:28 bookwyrm/templates/edit_book.html:27
 msgid "Metadata"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:28
+#: bookwyrm/templates/edit_author.html:29 bookwyrm/templates/lists/form.html:8
+#: bookwyrm/templates/user/create_shelf_form.html:13
+#: bookwyrm/templates/user/edit_shelf_form.html:14
 msgid "Name:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:33
+#: bookwyrm/templates/edit_author.html:34
 msgid "Bio:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:38
+#: bookwyrm/templates/edit_author.html:39
 msgid "Wikipedia link:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:43
+#: bookwyrm/templates/edit_author.html:44
 msgid "Birth date:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:48
+#: bookwyrm/templates/edit_author.html:49
 msgid "Death date:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:54
+#: bookwyrm/templates/edit_author.html:55
 msgid "Author Identifiers"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:55
+#: bookwyrm/templates/edit_author.html:56 bookwyrm/templates/edit_book.html:100
 msgid "Openlibrary key:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:60
+#: bookwyrm/templates/edit_author.html:61
 msgid "Librarything key:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:65
+#: bookwyrm/templates/edit_author.html:66
 msgid "Goodreads key:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:75
+#: bookwyrm/templates/edit_author.html:76 bookwyrm/templates/edit_book.html:118
 msgid "Cancel"
 msgstr ""
 
-#: bookwyrm/templates/error.html:5
-msgid "Server Error"
+#: bookwyrm/templates/edit_book.html:28
+#: bookwyrm/templates/snippets/create_status_form.html:10
+msgid "Title:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:32
+msgid "Subtitle:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:40
+msgid "Series:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:44
+msgid "Series number:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:48
+msgid "First published date:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:52
+msgid "Published date:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:65
+#: bookwyrm/templates/snippets/shelf.html:9
+msgid "Cover"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:75
+msgid "Physical Properties"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:76
+msgid "Format:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:84
+msgid "Pages:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:91
+msgid "Book Identifiers"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:92
+msgid "ISBN 13:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:96
+msgid "ISBN 10:"
+msgstr ""
+
+#: bookwyrm/templates/editions.html:6
+#, python-format
+msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 msgstr ""
 
 #: bookwyrm/templates/error.html:6
+msgid "Server Error"
+msgstr ""
+
+#: bookwyrm/templates/error.html:7
 msgid "Something went wrong! Sorry about that."
 msgstr ""
 
-#: bookwyrm/templates/goal.html:6
+#: bookwyrm/templates/feed/direct_messages.html:7
+msgid "All messages"
+msgstr ""
+
+#: bookwyrm/templates/feed/direct_messages.html:16
+msgid "You have no messages right now."
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:6
+#, python-format
+msgid "%(tab_title)s Timeline"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:10
+msgid "Home"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:13
+msgid "Local"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:16
+msgid "Federated"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:24
+msgid "Announcements"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:32
+msgid ""
+"There aren't any activities right now! Try following a user to get started"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed_layout.html:9
+msgid "Your books"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed_layout.html:11
+msgid ""
+"There are no books here right now! Try searching for a book to get started"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed_layout.html:68
+#, python-format
+msgid "%(year)s Reading Goal"
+msgstr ""
+
+#: bookwyrm/templates/feed/status.html:7
+msgid "Back"
+msgstr ""
+
+#: bookwyrm/templates/goal.html:7
 #, python-format
 msgid "%(year)s Reading Progress"
 msgstr ""
 
-#: bookwyrm/templates/goal.html:28
+#: bookwyrm/templates/goal.html:29
+#: bookwyrm/templates/snippets/goal_card.html:13
 #, python-format
 msgid ""
 "Set a goal for how many books you'll finish reading in %(year)s, and track "
 "your progress throughout the year."
 msgstr ""
 
-#: bookwyrm/templates/import.html:5
+#: bookwyrm/templates/goal.html:38
+#, python-format
+msgid "%(name)s hasn't set a reading goal for %(year)s."
+msgstr ""
+
+#: bookwyrm/templates/import.html:6
 msgid "Import Books"
 msgstr ""
 
-#: bookwyrm/templates/import.html:10
+#: bookwyrm/templates/import.html:11
 msgid "Data source"
 msgstr ""
 
-#: bookwyrm/templates/import.html:28
+#: bookwyrm/templates/import.html:29
 msgid "Include reviews"
 msgstr ""
 
-#: bookwyrm/templates/import.html:33
+#: bookwyrm/templates/import.html:34
 msgid "Privacy setting for imported reviews:"
 msgstr ""
 
-#: bookwyrm/templates/import.html:37
+#: bookwyrm/templates/import.html:38
 msgid "Import"
 msgstr ""
 
-#: bookwyrm/templates/import.html:42
+#: bookwyrm/templates/import.html:43
 msgid "Recent Imports"
 msgstr ""
 
-#: bookwyrm/templates/import.html:44
+#: bookwyrm/templates/import.html:45
 msgid "No recent imports"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:6
+#: bookwyrm/templates/import_status.html:7
 msgid "Import Status"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:9
+#: bookwyrm/templates/import_status.html:10
 msgid "Import started: "
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:13
+#: bookwyrm/templates/import_status.html:14
 msgid "Import completed: "
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:16
+#: bookwyrm/templates/import_status.html:17
 msgid "TASK FAILED"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:22
+#: bookwyrm/templates/import_status.html:23
 msgid "Import still in progress."
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:24
+#: bookwyrm/templates/import_status.html:25
 msgid "(Hit reload to update!)"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:31
+#: bookwyrm/templates/import_status.html:32
 msgid "Failed to load"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:55
+#: bookwyrm/templates/import_status.html:56
 msgid "Select all"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:58
+#: bookwyrm/templates/import_status.html:59
 msgid "Retry items"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:80
+#: bookwyrm/templates/import_status.html:81
 msgid "Successfully imported"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:84
+#: bookwyrm/templates/import_status.html:85
+#: bookwyrm/templates/lists/curate.html:14
 msgid "Book"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:87
+#: bookwyrm/templates/import_status.html:88
+#: bookwyrm/templates/snippets/shelf.html:10
 msgid "Title"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:90
+#: bookwyrm/templates/import_status.html:91
+#: bookwyrm/templates/snippets/shelf.html:11
 msgid "Author"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:113
+#: bookwyrm/templates/import_status.html:114
 msgid "Imported"
 msgstr ""
 
-#: bookwyrm/templates/invite.html:8 bookwyrm/templates/login.html:40
+#: bookwyrm/templates/invite.html:9 bookwyrm/templates/login.html:41
 msgid "Create an Account"
 msgstr ""
 
-#: bookwyrm/templates/invite.html:17
+#: bookwyrm/templates/invite.html:18
 msgid "Permission Denied"
 msgstr ""
 
-#: bookwyrm/templates/invite.html:18
+#: bookwyrm/templates/invite.html:19
 msgid "Sorry! This invite code is no longer valid."
 msgstr ""
 
-#: bookwyrm/templates/layout.html:38
+#: bookwyrm/templates/layout.html:37 bookwyrm/templates/lists/list.html:62
+msgid "Search"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:38 bookwyrm/templates/lists/list.html:63
 msgid "search"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:48
+#: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48
 msgid "Main navigation menu"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:126 bookwyrm/templates/notifications.html:6
+#: bookwyrm/templates/layout.html:58
+msgid "Your shelves"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:61
+msgid "Feed"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:125 bookwyrm/templates/layout.html:126
+#: bookwyrm/templates/notifications.html:7
 msgid "Notifications"
 msgstr ""
 
 #: bookwyrm/templates/layout.html:143 bookwyrm/templates/layout.html:147
-#: bookwyrm/templates/login.html:14
+#: bookwyrm/templates/login.html:15
+#: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:152 bookwyrm/templates/login.html:7
-#: bookwyrm/templates/login.html:30
+#: bookwyrm/templates/layout.html:152 bookwyrm/templates/login.html:8
+#: bookwyrm/templates/login.html:31
 msgid "Log in"
 msgstr ""
 
@@ -320,82 +491,954 @@ msgstr ""
 msgid "Contact site admin"
 msgstr ""
 
-#: bookwyrm/templates/login.html:20
+#: bookwyrm/templates/lists/create_form.html:5
+msgid "Create List"
+msgstr ""
+
+#: bookwyrm/templates/lists/curate.html:6
+msgid "Pending Books"
+msgstr ""
+
+#: bookwyrm/templates/lists/curate.html:7
+msgid "Go to list"
+msgstr ""
+
+#: bookwyrm/templates/lists/curate.html:9
+msgid "You're all set!"
+msgstr ""
+
+#: bookwyrm/templates/lists/curate.html:15
+msgid "Suggested by"
+msgstr ""
+
+#: bookwyrm/templates/lists/curate.html:35
+msgid "Approve"
+msgstr ""
+
+#: bookwyrm/templates/lists/curate.html:41
+msgid "Discard"
+msgstr ""
+
+#: bookwyrm/templates/lists/edit_form.html:5
+msgid "Edit List"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:18
+msgid "List curation:"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:21
+msgid "Closed"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:22
+msgid "Only you can add and remove books to this list"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:26
+msgid "Curated"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:27
+msgid "Anyone can suggest books, subject to your approval"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:31
+msgid "Open"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:32
+msgid "Anyone can add books to this list"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:17
+msgid "This list is currently empty"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:35
+msgid "Added by"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:41
+msgid "Remove"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:54
+msgid "Add Books"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:54
+msgid "Suggest Books"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:58
+msgid "Search for a book"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:69
+msgid "Clear search"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:74
+#, python-format
+msgid "No books found matching the query \"%(query)s\""
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:75
+msgid "No books found"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:89
+msgid "Suggest"
+msgstr ""
+
+#: bookwyrm/templates/lists/list_items.html:19
+#: bookwyrm/templates/lists/list_layout.html:9
+msgid "Created and curated by"
+msgstr ""
+
+#: bookwyrm/templates/lists/list_items.html:19
+#: bookwyrm/templates/lists/list_layout.html:9
+msgid "Created by"
+msgstr ""
+
+#: bookwyrm/templates/lists/lists.html:11
+msgid "Your lists"
+msgstr ""
+
+#: bookwyrm/templates/lists/lists.html:36
+msgid "Recent Lists"
+msgstr ""
+
+#: bookwyrm/templates/login.html:21 bookwyrm/templates/password_reset.html:15
+#: bookwyrm/templates/snippets/register_form.html:22
 msgid "Password:"
 msgstr ""
 
-#: bookwyrm/templates/login.html:33
+#: bookwyrm/templates/login.html:34
 msgid "Forgot your password?"
 msgstr ""
 
-#: bookwyrm/templates/login.html:46
+#: bookwyrm/templates/login.html:47
 msgid "Contact an administrator to get an invite"
 msgstr ""
 
-#: bookwyrm/templates/login.html:56
+#: bookwyrm/templates/login.html:57
 msgid "More about this site"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:10
+#: bookwyrm/templates/notfound.html:6
+msgid "Not Found"
+msgstr ""
+
+#: bookwyrm/templates/notfound.html:7
+msgid "The page your requested doesn't seem to exist!"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:11
 msgid "Delete notifications"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:101
+#: bookwyrm/templates/notifications.html:45
+#, python-format
+msgid ""
+"\n"
+"                                favorited your\n"
+"                                <a href=\"%(related_path)s\">"
+"%(preview_name)s</a>\n"
+"                                "
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:51
+#, python-format
+msgid ""
+"\n"
+"                                mentioned you in a\n"
+"                                <a href=\"%(related_path)s\">"
+"%(preview_name)s</a>\n"
+"                                "
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:57
+#, python-format
+msgid ""
+"\n"
+"                                <a href=\"%(related_path)s\">replied</a>\n"
+"                                to your\n"
+"                                <a href=\"%(parent_path)s\">"
+"%(preview_name)s</a>\n"
+"                                "
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:64
+msgid "followed you"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:67
+msgid "sent you a follow request"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:72
+#, python-format
+msgid ""
+"\n"
+"                                boosted your <a href=\"%(related_path)s\">"
+"%(preview_name)s</a>\n"
+"                                "
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:76
+msgid "added"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:76
+msgid "suggested adding"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:79
+#, python-format
+msgid " your <a href=\"/import/%(related_id)s\">import</a> completed."
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:111
 msgid "You're all caught up!"
 msgstr ""
 
-#: bookwyrm/templates/password_reset_request.html:7
+#: bookwyrm/templates/password_reset.html:8
+#: bookwyrm/templates/password_reset_request.html:8
 msgid "Reset Password"
 msgstr ""
 
-#: bookwyrm/templates/password_reset_request.html:9
+#: bookwyrm/templates/password_reset.html:21
+#: bookwyrm/templates/preferences/change_password.html:15
+msgid "Confirm password:"
+msgstr ""
+
+#: bookwyrm/templates/password_reset.html:28
+msgid "Confirm"
+msgstr ""
+
+#: bookwyrm/templates/password_reset_request.html:10
 msgid "A link to reset your password will be sent to your email address"
 msgstr ""
 
-#: bookwyrm/templates/password_reset_request.html:13
+#: bookwyrm/templates/password_reset_request.html:14
+#: bookwyrm/templates/preferences/edit_user.html:35
+#: bookwyrm/templates/snippets/register_form.html:13
 msgid "Email address:"
 msgstr ""
 
-#: bookwyrm/templates/password_reset_request.html:20
+#: bookwyrm/templates/password_reset_request.html:21
 msgid "Reset password"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:10
+#: bookwyrm/templates/preferences/blocks.html:5
+msgid "Blocked Users"
+msgstr ""
+
+#: bookwyrm/templates/preferences/blocks.html:10
+msgid "No users currently blocked."
+msgstr ""
+
+#: bookwyrm/templates/preferences/change_password.html:4
+msgid "Change Password"
+msgstr ""
+
+#: bookwyrm/templates/preferences/change_password.html:11
+msgid "New password:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/change_password.html:18
+#: bookwyrm/templates/preferences/preferences_layout.html:17
+msgid "Change password"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:4
+msgid "Edit Profile"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:14
+msgid "Avatar:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:21
+msgid "Display name:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:28
+msgid "Summary:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:43
+msgid "Manually approve followers:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/preferences_layout.html:11
+msgid "Account"
+msgstr ""
+
+#: bookwyrm/templates/preferences/preferences_layout.html:14
+msgid "Profile"
+msgstr ""
+
+#: bookwyrm/templates/preferences/preferences_layout.html:20
+msgid "Relationships"
+msgstr ""
+
+#: bookwyrm/templates/preferences/preferences_layout.html:23
+msgid "Blocked users"
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:6
+#, python-format
+msgid "Search Results for \"%(query)s\""
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:11
 msgid "Matching Books"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:13
+#: bookwyrm/templates/search_results.html:14
 #, python-format
 msgid "No books found for \"%(query)s\""
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:29
+#: bookwyrm/templates/search_results.html:30
 msgid "Didn't find what you were looking for?"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:52
+#: bookwyrm/templates/search_results.html:53
 msgid "Import book"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:69
+#: bookwyrm/templates/search_results.html:70
 msgid "Matching Users"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:71
+#: bookwyrm/templates/search_results.html:72
 #, python-format
 msgid "No users found for \"%(query)s\""
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:86
+#: bookwyrm/templates/search_results.html:87
 #, python-format
 msgid "No lists found for \"%(query)s\""
 msgstr ""
 
-#: bookwyrm/templates/tag.html:6
+#: bookwyrm/templates/settings/admin_layout.html:12
+msgid "Manage Users"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:16
+#: bookwyrm/templates/settings/manage_invites.html:3
+msgid "Invites"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:20
+#: bookwyrm/templates/settings/federation.html:3
+msgid "Federated Servers"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:25
+msgid "Instance Settings"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:29
+#: bookwyrm/templates/settings/site.html:3
+msgid "Site Configuration"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/site.html:10
+msgid "Instance Info"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:33
+#: bookwyrm/templates/settings/site.html:36
+msgid "Images"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:34
+#: bookwyrm/templates/settings/site.html:56
+msgid "Footer Content"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:35
+#: bookwyrm/templates/settings/site.html:74
+msgid "Registration"
+msgstr ""
+
+#: bookwyrm/templates/settings/federation.html:9
+msgid "Server name"
+msgstr ""
+
+#: bookwyrm/templates/settings/federation.html:10
+msgid "Software"
+msgstr ""
+
+#: bookwyrm/templates/settings/federation.html:11
+msgid "Status"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:7
+msgid "Generate New Invite"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:13
+msgid "Expiry:"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:19
+msgid "Use limit:"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:26
+msgid "Create Invite"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:33
+msgid "Link"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:34
+msgid "Expires"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:35
+msgid "Max uses"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:36
+msgid "Times used"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:39
+msgid "No active invites"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:12
+msgid "Instance Name:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:16
+msgid "Tagline:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:20
+msgid "Instance description:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:24
+msgid "Code of conduct:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:28
+msgid "Privacy Policy:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:39
+msgid "Logo:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:43
+msgid "Logo small:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:47
+msgid "Favicon:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:58
+msgid "Support link:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:62
+msgid "Support title:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:66
+msgid "Admin email:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:76
+msgid "Allow registration:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:80
+msgid "Registration closed text:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:86
+msgid "Save Changes"
+msgstr ""
+
+#: bookwyrm/templates/snippets/block_button.html:5
+msgid "Block"
+msgstr ""
+
+#: bookwyrm/templates/snippets/block_button.html:10
+msgid "Un-block"
+msgstr ""
+
+#: bookwyrm/templates/snippets/boost_button.html:8
+#: bookwyrm/templates/snippets/boost_button.html:9
+#: bookwyrm/templates/snippets/status/status_body.html:40
+#: bookwyrm/templates/snippets/status/status_body.html:41
+msgid "Boost status"
+msgstr ""
+
+#: bookwyrm/templates/snippets/boost_button.html:16
+#: bookwyrm/templates/snippets/boost_button.html:17
+msgid "Un-boost status"
+msgstr ""
+
+#: bookwyrm/templates/snippets/content_warning_field.html:3
+msgid "Spoiler alert:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/content_warning_field.html:4
+msgid "Spoilers ahead!"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status.html:8
+msgid "Review"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status.html:11
+msgid "Comment"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status.html:14
+msgid "Quote"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status_form.html:21
+#: bookwyrm/templates/snippets/shelf.html:17
+msgid "Rating"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status_form.html:23
+#: bookwyrm/templates/snippets/rate_action.html:14
+#: bookwyrm/templates/snippets/stars.html:3
+msgid "No rating"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status_form.html:44
+msgid "Comment:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status_form.html:59
+#: bookwyrm/templates/snippets/privacy-icons.html:15
+#: bookwyrm/templates/snippets/privacy-icons.html:16
+#: bookwyrm/templates/snippets/privacy_select.html:19
+msgid "Private"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status_form.html:66
+msgid "Post"
+msgstr ""
+
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:4
+msgid "Delete these read dates?"
+msgstr ""
+
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
+#, python-format
+msgid ""
+"You are deleting this readthrough and its %(count)s associated progress "
+"updates."
+msgstr ""
+
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
+#: bookwyrm/templates/snippets/follow_request_buttons.html:13
+msgid "Delete"
+msgstr ""
+
+#: bookwyrm/templates/snippets/fav_button.html:7
+#: bookwyrm/templates/snippets/fav_button.html:8
+#: bookwyrm/templates/snippets/status/status_body.html:44
+#: bookwyrm/templates/snippets/status/status_body.html:45
+msgid "Like status"
+msgstr ""
+
+#: bookwyrm/templates/snippets/fav_button.html:15
+#: bookwyrm/templates/snippets/fav_button.html:16
+msgid "Un-like status"
+msgstr ""
+
+#: bookwyrm/templates/snippets/follow_button.html:6
+msgid "Follow request already sent."
+msgstr ""
+
+#: bookwyrm/templates/snippets/follow_button.html:19
+msgid "Send follow request"
+msgstr ""
+
+#: bookwyrm/templates/snippets/follow_button.html:21
+msgid "Follow"
+msgstr ""
+
+#: bookwyrm/templates/snippets/follow_button.html:27
+msgid "Unfollow"
+msgstr ""
+
+#: bookwyrm/templates/snippets/follow_request_buttons.html:8
+msgid "Accept"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_card.html:6
+#, python-format
+msgid "%(year)s reading goal"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_card.html:21
+msgid "Dismiss message"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_card.html:22
+#, python-format
+msgid ""
+"You can set or change your reading goal any time from your <a href=\"%(path)s"
+"\">profile page</a>"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_form.html:9
+msgid "Reading goal:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_form.html:14
+msgid "books"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_form.html:19
+msgid "Goal privacy:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_form.html:26
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:29
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20
+msgid "Post to feed"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_form.html:30
+msgid "Set goal"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_progress.html:5
+msgid "Success!"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_progress.html:7
+#, python-format
+msgid "%(percent)s%% complete!"
+msgstr ""
+
+#: bookwyrm/templates/snippets/pagination.html:7
+msgid "Previous"
+msgstr ""
+
+#: bookwyrm/templates/snippets/pagination.html:15
+msgid "Next"
+msgstr ""
+
+#: bookwyrm/templates/snippets/privacy-icons.html:3
+#: bookwyrm/templates/snippets/privacy-icons.html:4
+#: bookwyrm/templates/snippets/privacy_select.html:10
+msgid "Public"
+msgstr ""
+
+#: bookwyrm/templates/snippets/privacy-icons.html:7
+#: bookwyrm/templates/snippets/privacy-icons.html:8
+#: bookwyrm/templates/snippets/privacy_select.html:13
+msgid "Unlisted"
+msgstr ""
+
+#: bookwyrm/templates/snippets/privacy-icons.html:12
+msgid "Followers-only"
+msgstr ""
+
+#: bookwyrm/templates/snippets/privacy_select.html:6
+msgid "Post privacy"
+msgstr ""
+
+#: bookwyrm/templates/snippets/privacy_select.html:16
+#: bookwyrm/templates/user/followers.html:17
+msgid "Followers"
+msgstr ""
+
+#: bookwyrm/templates/snippets/progress_update.html:6
+msgid "Progress:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/progress_update.html:16
+#: bookwyrm/templates/snippets/readthrough_form.html:22
+msgid "pages"
+msgstr ""
+
+#: bookwyrm/templates/snippets/progress_update.html:17
+#: bookwyrm/templates/snippets/readthrough_form.html:23
+msgid "percent"
+msgstr ""
+
+#: bookwyrm/templates/snippets/progress_update.html:25
+#, python-format
+msgid "of %(book.pages)s pages"
+msgstr ""
+
+#: bookwyrm/templates/snippets/rate_action.html:4
+msgid "Leave a rating"
+msgstr ""
+
+#: bookwyrm/templates/snippets/rate_action.html:29
+msgid "Rate"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough.html:7
+msgid "Progress Updates:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough.html:11
+msgid "finished"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough.html:29
+msgid "Delete this progress update"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough.html:39
+msgid "started"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough.html:57
+msgid "Edit read dates"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough_form.html:7
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:19
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:17
+msgid "Started reading"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough_form.html:14
+msgid "Progress"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough_form.html:30
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25
+msgid "Finished reading"
+msgstr ""
+
+#: bookwyrm/templates/snippets/register_form.html:32
+msgid "Sign Up"
+msgstr ""
+
+#: bookwyrm/templates/snippets/rss_title.html:5
+#: bookwyrm/templates/snippets/status/status_header.html:9
+msgid "rated"
+msgstr ""
+
+#: bookwyrm/templates/snippets/rss_title.html:7
+#: bookwyrm/templates/snippets/status/status_header.html:11
+msgid "reviewed"
+msgstr ""
+
+#: bookwyrm/templates/snippets/rss_title.html:9
+#: bookwyrm/templates/snippets/status/status_header.html:13
+msgid "commented on"
+msgstr ""
+
+#: bookwyrm/templates/snippets/rss_title.html:11
+#: bookwyrm/templates/snippets/status/status_header.html:15
+msgid "quoted"
+msgstr ""
+
+#: bookwyrm/templates/snippets/search_result_text.html:3
+#, python-format
+msgid "by %(author)s"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:12
+msgid "Published"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:13
+msgid "Shelved"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:14
+msgid "Started"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:15
+msgid "Finished"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:16
+msgid "External links"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:44
+msgid "OpenLibrary"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:61
+msgid "This shelf is empty."
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:67
+msgid "Delete shelf"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf_selector.html:4
+msgid "Change shelf"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf_selector.html:27
+msgid "Unshelve"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
+#, python-format
+msgid "Finish \"<em>%(book_title)s</em>\""
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5
+msgid "More shelves"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:10
+msgid "Read"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
+#, python-format
+msgid "Start \"<em>%(book_title)s</em>\""
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:5
+#, python-format
+msgid "Want to Read \"<em>%(book_title)s</em>\""
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26
+msgid "Want to read"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status.html:7
+msgid "boosted"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_body.html:36
+#: bookwyrm/templates/snippets/status/status_body.html:37
+msgid "Reply"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_content.html:42
+msgid "Open image in new window"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_options.html:7
+#: bookwyrm/templates/snippets/user_options.html:7
+msgid "More options"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_options.html:17
+msgid "Delete post"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_options.html:23
+#: bookwyrm/templates/snippets/user_options.html:13
+msgid "Send direct message"
+msgstr ""
+
+#: bookwyrm/templates/snippets/switch_edition_button.html:5
+msgid "Switch to this edition"
+msgstr ""
+
+#: bookwyrm/templates/snippets/tag.html:14
+msgid "Remove tag"
+msgstr ""
+
+#: bookwyrm/templates/tag.html:7
 #, python-format
 msgid "Books tagged \"%(tag.name)s\""
 msgstr ""
 
+#: bookwyrm/templates/user/create_shelf_form.html:5
+msgid "Create New Shelf"
+msgstr ""
+
+#: bookwyrm/templates/user/create_shelf_form.html:22
+msgid "Create shelf"
+msgstr ""
+
+#: bookwyrm/templates/user/edit_shelf_form.html:5
+msgid "Edit Shelf"
+msgstr ""
+
+#: bookwyrm/templates/user/edit_shelf_form.html:26
+msgid "Update shelf"
+msgstr ""
+
+#: bookwyrm/templates/user/followers.html:30
+#, python-format
+msgid "%(username)s has no followers"
+msgstr ""
+
+#: bookwyrm/templates/user/following.html:17
+msgid "Following"
+msgstr ""
+
+#: bookwyrm/templates/user/following.html:30
+#, python-format
+msgid "%(username)s isn't following any users"
+msgstr ""
+
+#: bookwyrm/templates/user/lists.html:28
+msgid "Create list"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:7
+msgid "User profile"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:13
+msgid "Edit profile"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:24
+#: bookwyrm/templates/user/user_layout.html:66
+msgid "Shelves"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:29
+#, python-format
+msgid "See all %(size)s"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:42
+#, python-format
+msgid "See all %(shelf_count)s shelves"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:54
+#, python-format
+msgid "Set a reading goal for %(year)s"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:60
+msgid "User Activity"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:63
+msgid "RSS feed"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:74
+msgid "No activities yet!"
+msgstr ""
+
 #: bookwyrm/templates/user/user_layout.html:30
 msgid "Follow Requests"
 msgstr ""
@@ -408,10 +1451,6 @@ msgstr ""
 msgid "Reading Goal"
 msgstr ""
 
-#: bookwyrm/templates/user/user_layout.html:66
-msgid "Shelves"
-msgstr ""
-
 #: bookwyrm/templates/user/user_preview.html:13
 #, python-format
 msgid "Joined %(date)s"

From b7a0ab7c4dda1a25f73c07a3eee4fd7b609993b5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Feb 2021 07:53:41 -0800
Subject: [PATCH 0109/1285] Removes google-translate-grade german language file

---
 locale/de/LC_MESSAGES/django.mo |  Bin 1438 -> 0 bytes
 locale/de/LC_MESSAGES/django.po | 1475 -------------------------------
 2 files changed, 1475 deletions(-)
 delete mode 100644 locale/de/LC_MESSAGES/django.mo
 delete mode 100644 locale/de/LC_MESSAGES/django.po

diff --git a/locale/de/LC_MESSAGES/django.mo b/locale/de/LC_MESSAGES/django.mo
deleted file mode 100644
index 09f2076df7783266700a1aa6eb7a4dcf9f49fdfa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1438
zcmZ9Lzi%8x6vrn&AmIWegb*kw1|cLOF~{Deh*@J4pJPXs&WYt)h(Kv(cb|7B-kUki
z%pP&76ck7l2q_duX^2u&Q6d^s@fT2_P^Y6oqU8JbOe}c1na|A4oA+bh+b8Ewek&kv
zV7!U(JH|U0507DjB*%q#1ss59z%}qBcoRGaX5d+n!1G`Wvfh^<>pcKZf!~2Ig5QIz
z{{#3O`12uu0bj!YSMYi8H}D1UkHh^_knQ~mvYo%c)8O$Fi~rAnZ0{V%=NG{-a(Ekj
z75f=3_rNbew(~V6_V)nf{2qaqz#l=@djh@;J_R}czd^RcPF@EtfE?$0Ap5<HiSz&9
z@c%K$@l8Pd#BEHRPY!Z?4aoQRLH2ha#7}&MiO;_Qxdi-H90%*LyoSN=%Xe9iV?t>E
z5%$Bv`LSHU;F$4bT}(hH?2qftf@kX9f!7x?xV9{u6AQmVC#$(@ql~o)GLWB>7bD|i
zElV9K6(i^Nx=C)9WTV+N<bznNwXI0bbO@h2Uy3znqb{NhCX&?U)L3zi^fMzHM5Wkp
zeyU?CHm5V^qh!NDjCF{TN?a>tzMqP*2{DKpdJ5M!9J?!YG|mRGtt$#CuyBc0qYDaR
zqUR(gUEp%vd*{WZ&F@eFGnuY1nb?r{)U{rQnwmMTY<tHFYO_?IARCxZWztXjgWe8t
zY-%f1rc|T03MzA{>}}svJ2W?}sjl&}$YC-ZsAQ;ySL9$Ry*yOOQj+vI8<lx&L!+bf
zsoZjHAh|;{C;8!&H=fs5y$RIL`j+BHxMZsq$*GL=^nX{z<ExG7J6|2CrSdxAA+79f
zZEmd}B{1kGJuU-^q_X`PVvKY*zCUZUvCFckwGR|mKF&7O(vcpAx=UWI+rpK`R;gUd
zP3&zqt=Em>iiK3#S+@-<!)3WxuDomITPt#KX}Kp39_Hj_X(*7Di#mwwl(#;Hs4FpQ
zi@KZk$l4Z7WB)B-ln0M(N#3U77GZ(ghR{JpEs@<~A4#opH=!#$zo^JuNdcYNPQ~h8
zY;}X8kcZu8?KL|1si+Z=>Dmm3@c3EVP`npqPTJ>$W{Yx;qIcbf<3+oT$m*i@@E=XJ
yh;+ibM**YFU`0%31SJH1*mk>AH~4C@nx;^mL>%Iyh{UZ&4L$^8xd$qZKKut%w@!Qj

diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
deleted file mode 100644
index d412c158..00000000
--- a/locale/de/LC_MESSAGES/django.po
+++ /dev/null
@@ -1,1475 +0,0 @@
-# German translation for the BookWyrm UI
-# Copyright (C) 2021 Mouse Reeve
-# This file is distributed under the same license as the BookWyrm package.
-# Mouse Reeve <mousereeve@riseup.net>, 2021.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: 0.0.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-27 18:32-0800\n"
-"PO-Revision-Date: 2021-02-27 18:32-0800\n"
-"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
-"Language-Team: Mouse Reeve <LL@li.org>\n"
-"Language: German \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: bookwyrm/templates/author.html:13 bookwyrm/templates/author.html:14
-msgid "Edit Author"
-msgstr ""
-
-#: bookwyrm/templates/author.html:29
-msgid "Wikipedia"
-msgstr ""
-
-#: bookwyrm/templates/author.html:34
-#, python-format
-msgid "Books by %(name)s"
-msgstr ""
-
-#: bookwyrm/templates/book.html:27 bookwyrm/templates/book.html:28
-msgid "Edit Book"
-msgstr ""
-
-#: bookwyrm/templates/book.html:43
-msgid "Add cover"
-msgstr ""
-
-#: bookwyrm/templates/book.html:49 bookwyrm/templates/lists/list.html:89
-msgid "Add"
-msgstr ""
-
-#: bookwyrm/templates/book.html:58
-msgid "ISBN:"
-msgstr ""
-
-#: bookwyrm/templates/book.html:65 bookwyrm/templates/edit_book.html:104
-msgid "OCLC Number:"
-msgstr ""
-
-#: bookwyrm/templates/book.html:72 bookwyrm/templates/edit_book.html:108
-msgid "ASIN:"
-msgstr ""
-
-#: bookwyrm/templates/book.html:84
-msgid "View on OpenLibrary"
-msgstr ""
-
-#: bookwyrm/templates/book.html:102 bookwyrm/templates/edit_book.html:36
-#: bookwyrm/templates/lists/form.html:12
-msgid "Description:"
-msgstr ""
-
-#: bookwyrm/templates/book.html:106 bookwyrm/templates/edit_author.html:75
-#: bookwyrm/templates/edit_book.html:117 bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:47
-#: bookwyrm/templates/snippets/progress_update.html:21
-#: bookwyrm/templates/snippets/readthrough.html:61
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
-msgid "Save"
-msgstr "Speichern"
-
-#: bookwyrm/templates/book.html:138
-msgid "Your reading activity"
-msgstr ""
-
-#: bookwyrm/templates/book.html:144
-msgid "You don't have any reading activity for this book."
-msgstr ""
-
-#: bookwyrm/templates/book.html:151
-msgid "Create"
-msgstr ""
-
-#: bookwyrm/templates/book.html:172
-msgid "Tags"
-msgstr "Stichworte"
-
-#: bookwyrm/templates/book.html:176 bookwyrm/templates/snippets/tag.html:18
-msgid "Add tag"
-msgstr ""
-
-#: bookwyrm/templates/book.html:193
-msgid "Subjects"
-msgstr "Themen"
-
-#: bookwyrm/templates/book.html:204
-msgid "Places"
-msgstr "Setzt"
-
-#: bookwyrm/templates/book.html:215 bookwyrm/templates/layout.html:64
-#: bookwyrm/templates/lists/lists.html:6
-#: bookwyrm/templates/search_results.html:85
-#: bookwyrm/templates/user/user_layout.html:60
-msgid "Lists"
-msgstr "Listen"
-
-#: bookwyrm/templates/book.html:244
-msgid "rated it"
-msgstr ""
-
-#: bookwyrm/templates/discover/about.html:10
-#: bookwyrm/templates/discover/about.html:20
-msgid "Code of Conduct"
-msgstr ""
-
-#: bookwyrm/templates/discover/about.html:13
-#: bookwyrm/templates/discover/about.html:29
-msgid "Privacy Policy"
-msgstr ""
-
-#: bookwyrm/templates/discover/discover.html:6
-msgid "Recent Books"
-msgstr ""
-
-#: bookwyrm/templates/discover/landing_layout.html:15
-msgid "Decentralized"
-msgstr ""
-
-#: bookwyrm/templates/discover/landing_layout.html:21
-msgid "Friendly"
-msgstr ""
-
-#: bookwyrm/templates/discover/landing_layout.html:27
-msgid "Anti-Corporate"
-msgstr ""
-
-#: bookwyrm/templates/discover/landing_layout.html:42
-#, python-format
-msgid "Join %(name)s"
-msgstr ""
-
-#: bookwyrm/templates/discover/landing_layout.html:47
-#: bookwyrm/templates/login.html:46
-msgid "This instance is closed"
-msgstr ""
-
-#: bookwyrm/templates/discover/landing_layout.html:53
-msgid "Your Account"
-msgstr ""
-
-#: bookwyrm/templates/edit_author.html:10 bookwyrm/templates/edit_book.html:10
-msgid "Added:"
-msgstr ""
-
-#: bookwyrm/templates/edit_author.html:11 bookwyrm/templates/edit_book.html:11
-msgid "Updated:"
-msgstr ""
-
-#: bookwyrm/templates/edit_author.html:12 bookwyrm/templates/edit_book.html:12
-msgid "Last edited by:"
-msgstr "Zuletzt bearbeitet von:"
-
-#: bookwyrm/templates/edit_author.html:28 bookwyrm/templates/edit_book.html:27
-msgid "Metadata"
-msgstr ""
-
-#: bookwyrm/templates/edit_author.html:29 bookwyrm/templates/lists/form.html:8
-#: bookwyrm/templates/user/create_shelf_form.html:13
-#: bookwyrm/templates/user/edit_shelf_form.html:14
-msgid "Name:"
-msgstr "Name:"
-
-#: bookwyrm/templates/edit_author.html:34
-msgid "Bio:"
-msgstr ""
-
-#: bookwyrm/templates/edit_author.html:39
-msgid "Wikipedia link:"
-msgstr ""
-
-#: bookwyrm/templates/edit_author.html:44
-msgid "Birth date:"
-msgstr "Geburtstag"
-
-#: bookwyrm/templates/edit_author.html:49
-msgid "Death date:"
-msgstr "Todesdatum"
-
-#: bookwyrm/templates/edit_author.html:55
-msgid "Author Identifiers"
-msgstr ""
-
-#: bookwyrm/templates/edit_author.html:56 bookwyrm/templates/edit_book.html:100
-msgid "Openlibrary key:"
-msgstr ""
-
-#: bookwyrm/templates/edit_author.html:61
-msgid "Librarything key:"
-msgstr ""
-
-#: bookwyrm/templates/edit_author.html:66
-msgid "Goodreads key:"
-msgstr ""
-
-#: bookwyrm/templates/edit_author.html:76 bookwyrm/templates/edit_book.html:118
-msgid "Cancel"
-msgstr ""
-
-#: bookwyrm/templates/edit_book.html:28
-#: bookwyrm/templates/snippets/create_status_form.html:10
-msgid "Title:"
-msgstr ""
-
-#: bookwyrm/templates/edit_book.html:32
-msgid "Subtitle:"
-msgstr ""
-
-#: bookwyrm/templates/edit_book.html:40
-msgid "Series:"
-msgstr ""
-
-#: bookwyrm/templates/edit_book.html:44
-msgid "Series number:"
-msgstr ""
-
-#: bookwyrm/templates/edit_book.html:48
-#, fuzzy
-#| msgid "Birth date:"
-msgid "First published date:"
-msgstr "Geburtstag"
-
-#: bookwyrm/templates/edit_book.html:52
-#, fuzzy
-#| msgid "Birth date:"
-msgid "Published date:"
-msgstr "Geburtstag"
-
-#: bookwyrm/templates/edit_book.html:65
-#: bookwyrm/templates/snippets/shelf.html:9
-msgid "Cover"
-msgstr ""
-
-#: bookwyrm/templates/edit_book.html:75
-msgid "Physical Properties"
-msgstr ""
-
-#: bookwyrm/templates/edit_book.html:76
-msgid "Format:"
-msgstr "Format:"
-
-#: bookwyrm/templates/edit_book.html:84
-msgid "Pages:"
-msgstr "Seiten"
-
-#: bookwyrm/templates/edit_book.html:91
-msgid "Book Identifiers"
-msgstr "Buchkennungen"
-
-#: bookwyrm/templates/edit_book.html:92
-msgid "ISBN 13:"
-msgstr ""
-
-#: bookwyrm/templates/edit_book.html:96
-msgid "ISBN 10:"
-msgstr ""
-
-#: bookwyrm/templates/editions.html:6
-#, python-format
-msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
-msgstr ""
-
-#: bookwyrm/templates/error.html:6
-msgid "Server Error"
-msgstr "Serverfehler"
-
-#: bookwyrm/templates/error.html:7
-msgid "Something went wrong! Sorry about that."
-msgstr ""
-
-#: bookwyrm/templates/feed/direct_messages.html:7
-msgid "All messages"
-msgstr ""
-
-#: bookwyrm/templates/feed/direct_messages.html:16
-msgid "You have no messages right now."
-msgstr ""
-
-#: bookwyrm/templates/feed/feed.html:6
-#, python-format
-msgid "%(tab_title)s Timeline"
-msgstr ""
-
-#: bookwyrm/templates/feed/feed.html:10
-msgid "Home"
-msgstr ""
-
-#: bookwyrm/templates/feed/feed.html:13
-msgid "Local"
-msgstr ""
-
-#: bookwyrm/templates/feed/feed.html:16
-msgid "Federated"
-msgstr ""
-
-#: bookwyrm/templates/feed/feed.html:24
-msgid "Announcements"
-msgstr ""
-
-#: bookwyrm/templates/feed/feed.html:32
-msgid ""
-"There aren't any activities right now! Try following a user to get started"
-msgstr ""
-
-#: bookwyrm/templates/feed/feed_layout.html:9
-msgid "Your books"
-msgstr ""
-
-#: bookwyrm/templates/feed/feed_layout.html:11
-msgid ""
-"There are no books here right now! Try searching for a book to get started"
-msgstr ""
-
-#: bookwyrm/templates/feed/feed_layout.html:68
-#, python-format
-msgid "%(year)s Reading Goal"
-msgstr ""
-
-#: bookwyrm/templates/feed/status.html:7
-msgid "Back"
-msgstr ""
-
-#: bookwyrm/templates/goal.html:7
-#, python-format
-msgid "%(year)s Reading Progress"
-msgstr ""
-
-#: bookwyrm/templates/goal.html:29
-#: bookwyrm/templates/snippets/goal_card.html:13
-#, python-format
-msgid ""
-"Set a goal for how many books you'll finish reading in %(year)s, and track "
-"your progress throughout the year."
-msgstr ""
-
-#: bookwyrm/templates/goal.html:38
-#, python-format
-msgid "%(name)s hasn't set a reading goal for %(year)s."
-msgstr ""
-
-#: bookwyrm/templates/import.html:6
-msgid "Import Books"
-msgstr "Bücher importieren"
-
-#: bookwyrm/templates/import.html:11
-msgid "Data source"
-msgstr ""
-
-#: bookwyrm/templates/import.html:29
-msgid "Include reviews"
-msgstr ""
-
-#: bookwyrm/templates/import.html:34
-msgid "Privacy setting for imported reviews:"
-msgstr ""
-
-#: bookwyrm/templates/import.html:38
-msgid "Import"
-msgstr ""
-
-#: bookwyrm/templates/import.html:43
-msgid "Recent Imports"
-msgstr ""
-
-#: bookwyrm/templates/import.html:45
-msgid "No recent imports"
-msgstr ""
-
-#: bookwyrm/templates/import_status.html:7
-msgid "Import Status"
-msgstr ""
-
-#: bookwyrm/templates/import_status.html:10
-msgid "Import started: "
-msgstr ""
-
-#: bookwyrm/templates/import_status.html:14
-msgid "Import completed: "
-msgstr ""
-
-#: bookwyrm/templates/import_status.html:17
-msgid "TASK FAILED"
-msgstr ""
-
-#: bookwyrm/templates/import_status.html:23
-msgid "Import still in progress."
-msgstr ""
-
-#: bookwyrm/templates/import_status.html:25
-msgid "(Hit reload to update!)"
-msgstr ""
-
-#: bookwyrm/templates/import_status.html:32
-msgid "Failed to load"
-msgstr ""
-
-#: bookwyrm/templates/import_status.html:56
-msgid "Select all"
-msgstr ""
-
-#: bookwyrm/templates/import_status.html:59
-msgid "Retry items"
-msgstr ""
-
-#: bookwyrm/templates/import_status.html:81
-msgid "Successfully imported"
-msgstr ""
-
-#: bookwyrm/templates/import_status.html:85
-#: bookwyrm/templates/lists/curate.html:14
-msgid "Book"
-msgstr "Buch"
-
-#: bookwyrm/templates/import_status.html:88
-#: bookwyrm/templates/snippets/shelf.html:10
-msgid "Title"
-msgstr "Titel"
-
-#: bookwyrm/templates/import_status.html:91
-#: bookwyrm/templates/snippets/shelf.html:11
-msgid "Author"
-msgstr ""
-
-#: bookwyrm/templates/import_status.html:114
-msgid "Imported"
-msgstr ""
-
-#: bookwyrm/templates/invite.html:9 bookwyrm/templates/login.html:41
-msgid "Create an Account"
-msgstr ""
-
-#: bookwyrm/templates/invite.html:18
-msgid "Permission Denied"
-msgstr ""
-
-#: bookwyrm/templates/invite.html:19
-msgid "Sorry! This invite code is no longer valid."
-msgstr ""
-
-#: bookwyrm/templates/layout.html:37 bookwyrm/templates/lists/list.html:62
-msgid "Search"
-msgstr ""
-
-#: bookwyrm/templates/layout.html:38 bookwyrm/templates/lists/list.html:63
-msgid "search"
-msgstr ""
-
-#: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48
-msgid "Main navigation menu"
-msgstr ""
-
-#: bookwyrm/templates/layout.html:58
-msgid "Your shelves"
-msgstr "Deine Regale"
-
-#: bookwyrm/templates/layout.html:61
-msgid "Feed"
-msgstr "Aktualisierung"
-
-#: bookwyrm/templates/layout.html:125 bookwyrm/templates/layout.html:126
-#: bookwyrm/templates/notifications.html:7
-msgid "Notifications"
-msgstr "Benachrichtigungen"
-
-#: bookwyrm/templates/layout.html:143 bookwyrm/templates/layout.html:147
-#: bookwyrm/templates/login.html:15
-#: bookwyrm/templates/snippets/register_form.html:4
-msgid "Username:"
-msgstr ""
-
-#: bookwyrm/templates/layout.html:152 bookwyrm/templates/login.html:8
-#: bookwyrm/templates/login.html:31
-msgid "Log in"
-msgstr ""
-
-#: bookwyrm/templates/layout.html:183
-msgid "About this server"
-msgstr "Ãœber diesen Server"
-
-#: bookwyrm/templates/layout.html:187
-msgid "Contact site admin"
-msgstr "Wenden Sie sich an den Site-Administrator"
-
-#: bookwyrm/templates/lists/create_form.html:5
-msgid "Create List"
-msgstr ""
-
-#: bookwyrm/templates/lists/curate.html:6
-msgid "Pending Books"
-msgstr ""
-
-#: bookwyrm/templates/lists/curate.html:7
-msgid "Go to list"
-msgstr ""
-
-#: bookwyrm/templates/lists/curate.html:9
-msgid "You're all set!"
-msgstr ""
-
-#: bookwyrm/templates/lists/curate.html:15
-msgid "Suggested by"
-msgstr ""
-
-#: bookwyrm/templates/lists/curate.html:35
-msgid "Approve"
-msgstr ""
-
-#: bookwyrm/templates/lists/curate.html:41
-msgid "Discard"
-msgstr ""
-
-#: bookwyrm/templates/lists/edit_form.html:5
-msgid "Edit List"
-msgstr ""
-
-#: bookwyrm/templates/lists/form.html:18
-msgid "List curation:"
-msgstr ""
-
-#: bookwyrm/templates/lists/form.html:21
-msgid "Closed"
-msgstr ""
-
-#: bookwyrm/templates/lists/form.html:22
-msgid "Only you can add and remove books to this list"
-msgstr ""
-
-#: bookwyrm/templates/lists/form.html:26
-msgid "Curated"
-msgstr ""
-
-#: bookwyrm/templates/lists/form.html:27
-msgid "Anyone can suggest books, subject to your approval"
-msgstr ""
-
-#: bookwyrm/templates/lists/form.html:31
-msgid "Open"
-msgstr ""
-
-#: bookwyrm/templates/lists/form.html:32
-msgid "Anyone can add books to this list"
-msgstr ""
-
-#: bookwyrm/templates/lists/list.html:17
-msgid "This list is currently empty"
-msgstr ""
-
-#: bookwyrm/templates/lists/list.html:35
-msgid "Added by"
-msgstr ""
-
-#: bookwyrm/templates/lists/list.html:41
-msgid "Remove"
-msgstr ""
-
-#: bookwyrm/templates/lists/list.html:54
-msgid "Add Books"
-msgstr ""
-
-#: bookwyrm/templates/lists/list.html:54
-msgid "Suggest Books"
-msgstr ""
-
-#: bookwyrm/templates/lists/list.html:58
-msgid "Search for a book"
-msgstr ""
-
-#: bookwyrm/templates/lists/list.html:69
-msgid "Clear search"
-msgstr ""
-
-#: bookwyrm/templates/lists/list.html:74
-#, python-format
-msgid "No books found matching the query \"%(query)s\""
-msgstr ""
-
-#: bookwyrm/templates/lists/list.html:75
-msgid "No books found"
-msgstr ""
-
-#: bookwyrm/templates/lists/list.html:89
-msgid "Suggest"
-msgstr ""
-
-#: bookwyrm/templates/lists/list_items.html:19
-#: bookwyrm/templates/lists/list_layout.html:9
-msgid "Created and curated by"
-msgstr ""
-
-#: bookwyrm/templates/lists/list_items.html:19
-#: bookwyrm/templates/lists/list_layout.html:9
-msgid "Created by"
-msgstr ""
-
-#: bookwyrm/templates/lists/lists.html:11
-#, fuzzy
-#| msgid "Your shelves"
-msgid "Your lists"
-msgstr "Deine Regale"
-
-#: bookwyrm/templates/lists/lists.html:36
-msgid "Recent Lists"
-msgstr ""
-
-#: bookwyrm/templates/login.html:21 bookwyrm/templates/password_reset.html:15
-#: bookwyrm/templates/snippets/register_form.html:22
-msgid "Password:"
-msgstr "Passwort"
-
-#: bookwyrm/templates/login.html:34
-msgid "Forgot your password?"
-msgstr ""
-
-#: bookwyrm/templates/login.html:47
-msgid "Contact an administrator to get an invite"
-msgstr ""
-
-#: bookwyrm/templates/login.html:57
-msgid "More about this site"
-msgstr ""
-
-#: bookwyrm/templates/notfound.html:6
-msgid "Not Found"
-msgstr ""
-
-#: bookwyrm/templates/notfound.html:7
-msgid "The page your requested doesn't seem to exist!"
-msgstr ""
-
-#: bookwyrm/templates/notifications.html:11
-msgid "Delete notifications"
-msgstr ""
-
-#: bookwyrm/templates/notifications.html:45
-#, python-format
-msgid ""
-"\n"
-"                                favorited your\n"
-"                                <a href=\"%(related_path)s\">"
-"%(preview_name)s</a>\n"
-"                                "
-msgstr ""
-
-#: bookwyrm/templates/notifications.html:51
-#, python-format
-msgid ""
-"\n"
-"                                mentioned you in a\n"
-"                                <a href=\"%(related_path)s\">"
-"%(preview_name)s</a>\n"
-"                                "
-msgstr ""
-
-#: bookwyrm/templates/notifications.html:57
-#, python-format
-msgid ""
-"\n"
-"                                <a href=\"%(related_path)s\">replied</a>\n"
-"                                to your\n"
-"                                <a href=\"%(parent_path)s\">"
-"%(preview_name)s</a>\n"
-"                                "
-msgstr ""
-
-#: bookwyrm/templates/notifications.html:64
-msgid "followed you"
-msgstr ""
-
-#: bookwyrm/templates/notifications.html:67
-msgid "sent you a follow request"
-msgstr ""
-
-#: bookwyrm/templates/notifications.html:72
-#, python-format
-msgid ""
-"\n"
-"                                boosted your <a href=\"%(related_path)s\">"
-"%(preview_name)s</a>\n"
-"                                "
-msgstr ""
-
-#: bookwyrm/templates/notifications.html:76
-msgid "added"
-msgstr ""
-
-#: bookwyrm/templates/notifications.html:76
-msgid "suggested adding"
-msgstr ""
-
-#: bookwyrm/templates/notifications.html:79
-#, python-format
-msgid " your <a href=\"/import/%(related_id)s\">import</a> completed."
-msgstr ""
-
-#: bookwyrm/templates/notifications.html:111
-msgid "You're all caught up!"
-msgstr ""
-
-#: bookwyrm/templates/password_reset.html:8
-#: bookwyrm/templates/password_reset_request.html:8
-msgid "Reset Password"
-msgstr ""
-
-#: bookwyrm/templates/password_reset.html:21
-#: bookwyrm/templates/preferences/change_password.html:15
-#, fuzzy
-#| msgid "Password:"
-msgid "Confirm password:"
-msgstr "Passwort"
-
-#: bookwyrm/templates/password_reset.html:28
-msgid "Confirm"
-msgstr ""
-
-#: bookwyrm/templates/password_reset_request.html:10
-msgid "A link to reset your password will be sent to your email address"
-msgstr ""
-
-#: bookwyrm/templates/password_reset_request.html:14
-#: bookwyrm/templates/preferences/edit_user.html:35
-#: bookwyrm/templates/snippets/register_form.html:13
-msgid "Email address:"
-msgstr ""
-
-#: bookwyrm/templates/password_reset_request.html:21
-msgid "Reset password"
-msgstr ""
-
-#: bookwyrm/templates/preferences/blocks.html:5
-msgid "Blocked Users"
-msgstr ""
-
-#: bookwyrm/templates/preferences/blocks.html:10
-msgid "No users currently blocked."
-msgstr ""
-
-#: bookwyrm/templates/preferences/change_password.html:4
-#, fuzzy
-#| msgid "Password:"
-msgid "Change Password"
-msgstr "Passwort ändern:"
-
-#: bookwyrm/templates/preferences/change_password.html:11
-#, fuzzy
-#| msgid "Password:"
-msgid "New password:"
-msgstr "Neues Passwort:"
-
-#: bookwyrm/templates/preferences/change_password.html:18
-#: bookwyrm/templates/preferences/preferences_layout.html:17
-msgid "Change password"
-msgstr "Passwort ändern:"
-
-#: bookwyrm/templates/preferences/edit_user.html:4
-msgid "Edit Profile"
-msgstr ""
-
-#: bookwyrm/templates/preferences/edit_user.html:14
-msgid "Avatar:"
-msgstr ""
-
-#: bookwyrm/templates/preferences/edit_user.html:21
-msgid "Display name:"
-msgstr ""
-
-#: bookwyrm/templates/preferences/edit_user.html:28
-msgid "Summary:"
-msgstr ""
-
-#: bookwyrm/templates/preferences/edit_user.html:43
-msgid "Manually approve followers:"
-msgstr ""
-
-#: bookwyrm/templates/preferences/preferences_layout.html:11
-msgid "Account"
-msgstr ""
-
-#: bookwyrm/templates/preferences/preferences_layout.html:14
-msgid "Profile"
-msgstr ""
-
-#: bookwyrm/templates/preferences/preferences_layout.html:20
-msgid "Relationships"
-msgstr ""
-
-#: bookwyrm/templates/preferences/preferences_layout.html:23
-msgid "Blocked users"
-msgstr ""
-
-#: bookwyrm/templates/search_results.html:6
-#, python-format
-msgid "Search Results for \"%(query)s\""
-msgstr ""
-
-#: bookwyrm/templates/search_results.html:11
-msgid "Matching Books"
-msgstr ""
-
-#: bookwyrm/templates/search_results.html:14
-#, python-format
-msgid "No books found for \"%(query)s\""
-msgstr ""
-
-#: bookwyrm/templates/search_results.html:30
-msgid "Didn't find what you were looking for?"
-msgstr ""
-
-#: bookwyrm/templates/search_results.html:53
-msgid "Import book"
-msgstr ""
-
-#: bookwyrm/templates/search_results.html:70
-msgid "Matching Users"
-msgstr ""
-
-#: bookwyrm/templates/search_results.html:72
-#, python-format
-msgid "No users found for \"%(query)s\""
-msgstr ""
-
-#: bookwyrm/templates/search_results.html:87
-#, python-format
-msgid "No lists found for \"%(query)s\""
-msgstr ""
-
-#: bookwyrm/templates/settings/admin_layout.html:12
-msgid "Manage Users"
-msgstr ""
-
-#: bookwyrm/templates/settings/admin_layout.html:16
-#: bookwyrm/templates/settings/manage_invites.html:3
-msgid "Invites"
-msgstr ""
-
-#: bookwyrm/templates/settings/admin_layout.html:20
-#: bookwyrm/templates/settings/federation.html:3
-msgid "Federated Servers"
-msgstr ""
-
-#: bookwyrm/templates/settings/admin_layout.html:25
-msgid "Instance Settings"
-msgstr ""
-
-#: bookwyrm/templates/settings/admin_layout.html:29
-#: bookwyrm/templates/settings/site.html:3
-msgid "Site Configuration"
-msgstr ""
-
-#: bookwyrm/templates/settings/admin_layout.html:32
-#: bookwyrm/templates/settings/site.html:10
-msgid "Instance Info"
-msgstr ""
-
-#: bookwyrm/templates/settings/admin_layout.html:33
-#: bookwyrm/templates/settings/site.html:36
-msgid "Images"
-msgstr ""
-
-#: bookwyrm/templates/settings/admin_layout.html:34
-#: bookwyrm/templates/settings/site.html:56
-msgid "Footer Content"
-msgstr ""
-
-#: bookwyrm/templates/settings/admin_layout.html:35
-#: bookwyrm/templates/settings/site.html:74
-msgid "Registration"
-msgstr ""
-
-#: bookwyrm/templates/settings/federation.html:9
-#, fuzzy
-#| msgid "username"
-msgid "Server name"
-msgstr "Nutzername"
-
-#: bookwyrm/templates/settings/federation.html:10
-msgid "Software"
-msgstr ""
-
-#: bookwyrm/templates/settings/federation.html:11
-msgid "Status"
-msgstr ""
-
-#: bookwyrm/templates/settings/manage_invites.html:7
-msgid "Generate New Invite"
-msgstr ""
-
-#: bookwyrm/templates/settings/manage_invites.html:13
-msgid "Expiry:"
-msgstr ""
-
-#: bookwyrm/templates/settings/manage_invites.html:19
-msgid "Use limit:"
-msgstr ""
-
-#: bookwyrm/templates/settings/manage_invites.html:26
-msgid "Create Invite"
-msgstr ""
-
-#: bookwyrm/templates/settings/manage_invites.html:33
-msgid "Link"
-msgstr ""
-
-#: bookwyrm/templates/settings/manage_invites.html:34
-msgid "Expires"
-msgstr ""
-
-#: bookwyrm/templates/settings/manage_invites.html:35
-msgid "Max uses"
-msgstr ""
-
-#: bookwyrm/templates/settings/manage_invites.html:36
-msgid "Times used"
-msgstr ""
-
-#: bookwyrm/templates/settings/manage_invites.html:39
-msgid "No active invites"
-msgstr ""
-
-#: bookwyrm/templates/settings/site.html:12
-msgid "Instance Name:"
-msgstr ""
-
-#: bookwyrm/templates/settings/site.html:16
-msgid "Tagline:"
-msgstr ""
-
-#: bookwyrm/templates/settings/site.html:20
-msgid "Instance description:"
-msgstr ""
-
-#: bookwyrm/templates/settings/site.html:24
-msgid "Code of conduct:"
-msgstr ""
-
-#: bookwyrm/templates/settings/site.html:28
-msgid "Privacy Policy:"
-msgstr ""
-
-#: bookwyrm/templates/settings/site.html:39
-msgid "Logo:"
-msgstr ""
-
-#: bookwyrm/templates/settings/site.html:43
-msgid "Logo small:"
-msgstr ""
-
-#: bookwyrm/templates/settings/site.html:47
-msgid "Favicon:"
-msgstr ""
-
-#: bookwyrm/templates/settings/site.html:58
-msgid "Support link:"
-msgstr ""
-
-#: bookwyrm/templates/settings/site.html:62
-msgid "Support title:"
-msgstr ""
-
-#: bookwyrm/templates/settings/site.html:66
-msgid "Admin email:"
-msgstr ""
-
-#: bookwyrm/templates/settings/site.html:76
-msgid "Allow registration:"
-msgstr ""
-
-#: bookwyrm/templates/settings/site.html:80
-msgid "Registration closed text:"
-msgstr ""
-
-#: bookwyrm/templates/settings/site.html:86
-msgid "Save Changes"
-msgstr ""
-
-#: bookwyrm/templates/snippets/block_button.html:5
-msgid "Block"
-msgstr ""
-
-#: bookwyrm/templates/snippets/block_button.html:10
-msgid "Un-block"
-msgstr ""
-
-#: bookwyrm/templates/snippets/boost_button.html:8
-#: bookwyrm/templates/snippets/boost_button.html:9
-#: bookwyrm/templates/snippets/status/status_body.html:40
-#: bookwyrm/templates/snippets/status/status_body.html:41
-msgid "Boost status"
-msgstr ""
-
-#: bookwyrm/templates/snippets/boost_button.html:16
-#: bookwyrm/templates/snippets/boost_button.html:17
-msgid "Un-boost status"
-msgstr ""
-
-#: bookwyrm/templates/snippets/content_warning_field.html:3
-msgid "Spoiler alert:"
-msgstr ""
-
-#: bookwyrm/templates/snippets/content_warning_field.html:4
-msgid "Spoilers ahead!"
-msgstr ""
-
-#: bookwyrm/templates/snippets/create_status.html:8
-msgid "Review"
-msgstr ""
-
-#: bookwyrm/templates/snippets/create_status.html:11
-msgid "Comment"
-msgstr ""
-
-#: bookwyrm/templates/snippets/create_status.html:14
-msgid "Quote"
-msgstr ""
-
-#: bookwyrm/templates/snippets/create_status_form.html:21
-#: bookwyrm/templates/snippets/shelf.html:17
-msgid "Rating"
-msgstr ""
-
-#: bookwyrm/templates/snippets/create_status_form.html:23
-#: bookwyrm/templates/snippets/rate_action.html:14
-#: bookwyrm/templates/snippets/stars.html:3
-msgid "No rating"
-msgstr ""
-
-#: bookwyrm/templates/snippets/create_status_form.html:44
-msgid "Comment:"
-msgstr ""
-
-#: bookwyrm/templates/snippets/create_status_form.html:59
-#: bookwyrm/templates/snippets/privacy-icons.html:15
-#: bookwyrm/templates/snippets/privacy-icons.html:16
-#: bookwyrm/templates/snippets/privacy_select.html:19
-msgid "Private"
-msgstr ""
-
-#: bookwyrm/templates/snippets/create_status_form.html:66
-msgid "Post"
-msgstr ""
-
-#: bookwyrm/templates/snippets/delete_readthrough_modal.html:4
-msgid "Delete these read dates?"
-msgstr ""
-
-#: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
-#, python-format
-msgid ""
-"You are deleting this readthrough and its %(count)s associated progress "
-"updates."
-msgstr ""
-
-#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
-#: bookwyrm/templates/snippets/follow_request_buttons.html:13
-msgid "Delete"
-msgstr ""
-
-#: bookwyrm/templates/snippets/fav_button.html:7
-#: bookwyrm/templates/snippets/fav_button.html:8
-#: bookwyrm/templates/snippets/status/status_body.html:44
-#: bookwyrm/templates/snippets/status/status_body.html:45
-msgid "Like status"
-msgstr ""
-
-#: bookwyrm/templates/snippets/fav_button.html:15
-#: bookwyrm/templates/snippets/fav_button.html:16
-msgid "Un-like status"
-msgstr ""
-
-#: bookwyrm/templates/snippets/follow_button.html:6
-msgid "Follow request already sent."
-msgstr ""
-
-#: bookwyrm/templates/snippets/follow_button.html:19
-msgid "Send follow request"
-msgstr ""
-
-#: bookwyrm/templates/snippets/follow_button.html:21
-msgid "Follow"
-msgstr ""
-
-#: bookwyrm/templates/snippets/follow_button.html:27
-msgid "Unfollow"
-msgstr ""
-
-#: bookwyrm/templates/snippets/follow_request_buttons.html:8
-msgid "Accept"
-msgstr ""
-
-#: bookwyrm/templates/snippets/goal_card.html:6
-#, python-format
-msgid "%(year)s reading goal"
-msgstr ""
-
-#: bookwyrm/templates/snippets/goal_card.html:21
-msgid "Dismiss message"
-msgstr ""
-
-#: bookwyrm/templates/snippets/goal_card.html:22
-#, python-format
-msgid ""
-"You can set or change your reading goal any time from your <a href=\"%(path)s"
-"\">profile page</a>"
-msgstr ""
-
-#: bookwyrm/templates/snippets/goal_form.html:9
-msgid "Reading goal:"
-msgstr ""
-
-#: bookwyrm/templates/snippets/goal_form.html:14
-msgid "books"
-msgstr ""
-
-#: bookwyrm/templates/snippets/goal_form.html:19
-msgid "Goal privacy:"
-msgstr ""
-
-#: bookwyrm/templates/snippets/goal_form.html:26
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:29
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20
-msgid "Post to feed"
-msgstr ""
-
-#: bookwyrm/templates/snippets/goal_form.html:30
-msgid "Set goal"
-msgstr ""
-
-#: bookwyrm/templates/snippets/goal_progress.html:5
-msgid "Success!"
-msgstr ""
-
-#: bookwyrm/templates/snippets/goal_progress.html:7
-#, python-format
-msgid "%(percent)s%% complete!"
-msgstr ""
-
-#: bookwyrm/templates/snippets/pagination.html:7
-msgid "Previous"
-msgstr ""
-
-#: bookwyrm/templates/snippets/pagination.html:15
-msgid "Next"
-msgstr ""
-
-#: bookwyrm/templates/snippets/privacy-icons.html:3
-#: bookwyrm/templates/snippets/privacy-icons.html:4
-#: bookwyrm/templates/snippets/privacy_select.html:10
-msgid "Public"
-msgstr ""
-
-#: bookwyrm/templates/snippets/privacy-icons.html:7
-#: bookwyrm/templates/snippets/privacy-icons.html:8
-#: bookwyrm/templates/snippets/privacy_select.html:13
-msgid "Unlisted"
-msgstr ""
-
-#: bookwyrm/templates/snippets/privacy-icons.html:12
-msgid "Followers-only"
-msgstr ""
-
-#: bookwyrm/templates/snippets/privacy_select.html:6
-msgid "Post privacy"
-msgstr ""
-
-#: bookwyrm/templates/snippets/privacy_select.html:16
-#: bookwyrm/templates/user/followers.html:17
-msgid "Followers"
-msgstr ""
-
-#: bookwyrm/templates/snippets/progress_update.html:6
-msgid "Progress:"
-msgstr ""
-
-#: bookwyrm/templates/snippets/progress_update.html:16
-#: bookwyrm/templates/snippets/readthrough_form.html:22
-msgid "pages"
-msgstr ""
-
-#: bookwyrm/templates/snippets/progress_update.html:17
-#: bookwyrm/templates/snippets/readthrough_form.html:23
-msgid "percent"
-msgstr ""
-
-#: bookwyrm/templates/snippets/progress_update.html:25
-#, python-format
-msgid "of %(book.pages)s pages"
-msgstr ""
-
-#: bookwyrm/templates/snippets/rate_action.html:4
-msgid "Leave a rating"
-msgstr ""
-
-#: bookwyrm/templates/snippets/rate_action.html:29
-msgid "Rate"
-msgstr ""
-
-#: bookwyrm/templates/snippets/readthrough.html:7
-msgid "Progress Updates:"
-msgstr ""
-
-#: bookwyrm/templates/snippets/readthrough.html:11
-msgid "finished"
-msgstr ""
-
-#: bookwyrm/templates/snippets/readthrough.html:29
-msgid "Delete this progress update"
-msgstr ""
-
-#: bookwyrm/templates/snippets/readthrough.html:39
-msgid "started"
-msgstr ""
-
-#: bookwyrm/templates/snippets/readthrough.html:57
-msgid "Edit read dates"
-msgstr ""
-
-#: bookwyrm/templates/snippets/readthrough_form.html:7
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:19
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:17
-msgid "Started reading"
-msgstr ""
-
-#: bookwyrm/templates/snippets/readthrough_form.html:14
-msgid "Progress"
-msgstr ""
-
-#: bookwyrm/templates/snippets/readthrough_form.html:30
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25
-msgid "Finished reading"
-msgstr ""
-
-#: bookwyrm/templates/snippets/register_form.html:32
-msgid "Sign Up"
-msgstr ""
-
-#: bookwyrm/templates/snippets/rss_title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:9
-msgid "rated"
-msgstr ""
-
-#: bookwyrm/templates/snippets/rss_title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:11
-msgid "reviewed"
-msgstr ""
-
-#: bookwyrm/templates/snippets/rss_title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:13
-msgid "commented on"
-msgstr ""
-
-#: bookwyrm/templates/snippets/rss_title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:15
-msgid "quoted"
-msgstr ""
-
-#: bookwyrm/templates/snippets/search_result_text.html:3
-#, python-format
-msgid "by %(author)s"
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelf.html:12
-msgid "Published"
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelf.html:13
-msgid "Shelved"
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelf.html:14
-msgid "Started"
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelf.html:15
-msgid "Finished"
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelf.html:16
-msgid "External links"
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelf.html:44
-msgid "OpenLibrary"
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelf.html:61
-msgid "This shelf is empty."
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelf.html:67
-msgid "Delete shelf"
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelf_selector.html:4
-msgid "Change shelf"
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelf_selector.html:27
-#, fuzzy
-#| msgid "Your shelves"
-msgid "Unshelve"
-msgstr "Deine Regale"
-
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
-#, python-format
-msgid "Finish \"<em>%(book_title)s</em>\""
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5
-#, fuzzy
-#| msgid "Your shelves"
-msgid "More shelves"
-msgstr "Deine Regale"
-
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:10
-msgid "Read"
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
-#, python-format
-msgid "Start \"<em>%(book_title)s</em>\""
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:5
-#, python-format
-msgid "Want to Read \"<em>%(book_title)s</em>\""
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26
-msgid "Want to read"
-msgstr ""
-
-#: bookwyrm/templates/snippets/status/status.html:7
-msgid "boosted"
-msgstr ""
-
-#: bookwyrm/templates/snippets/status/status_body.html:36
-#: bookwyrm/templates/snippets/status/status_body.html:37
-msgid "Reply"
-msgstr ""
-
-#: bookwyrm/templates/snippets/status/status_content.html:42
-msgid "Open image in new window"
-msgstr ""
-
-#: bookwyrm/templates/snippets/status/status_options.html:7
-#: bookwyrm/templates/snippets/user_options.html:7
-msgid "More options"
-msgstr ""
-
-#: bookwyrm/templates/snippets/status/status_options.html:17
-msgid "Delete post"
-msgstr ""
-
-#: bookwyrm/templates/snippets/status/status_options.html:23
-#: bookwyrm/templates/snippets/user_options.html:13
-msgid "Send direct message"
-msgstr ""
-
-#: bookwyrm/templates/snippets/switch_edition_button.html:5
-msgid "Switch to this edition"
-msgstr ""
-
-#: bookwyrm/templates/snippets/tag.html:14
-msgid "Remove tag"
-msgstr ""
-
-#: bookwyrm/templates/tag.html:7
-#, python-format
-msgid "Books tagged \"%(tag.name)s\""
-msgstr ""
-
-#: bookwyrm/templates/user/create_shelf_form.html:5
-msgid "Create New Shelf"
-msgstr ""
-
-#: bookwyrm/templates/user/create_shelf_form.html:22
-msgid "Create shelf"
-msgstr ""
-
-#: bookwyrm/templates/user/edit_shelf_form.html:5
-msgid "Edit Shelf"
-msgstr ""
-
-#: bookwyrm/templates/user/edit_shelf_form.html:26
-msgid "Update shelf"
-msgstr ""
-
-#: bookwyrm/templates/user/followers.html:30
-#, python-format
-msgid "%(username)s has no followers"
-msgstr ""
-
-#: bookwyrm/templates/user/following.html:17
-msgid "Following"
-msgstr ""
-
-#: bookwyrm/templates/user/following.html:30
-#, python-format
-msgid "%(username)s isn't following any users"
-msgstr ""
-
-#: bookwyrm/templates/user/lists.html:28
-msgid "Create list"
-msgstr ""
-
-#: bookwyrm/templates/user/user.html:7
-msgid "User profile"
-msgstr ""
-
-#: bookwyrm/templates/user/user.html:13
-msgid "Edit profile"
-msgstr ""
-
-#: bookwyrm/templates/user/user.html:24
-#: bookwyrm/templates/user/user_layout.html:66
-msgid "Shelves"
-msgstr ""
-
-#: bookwyrm/templates/user/user.html:29
-#, python-format
-msgid "See all %(size)s"
-msgstr ""
-
-#: bookwyrm/templates/user/user.html:42
-#, python-format
-msgid "See all %(shelf_count)s shelves"
-msgstr ""
-
-#: bookwyrm/templates/user/user.html:54
-#, python-format
-msgid "Set a reading goal for %(year)s"
-msgstr ""
-
-#: bookwyrm/templates/user/user.html:60
-msgid "User Activity"
-msgstr ""
-
-#: bookwyrm/templates/user/user.html:63
-msgid "RSS feed"
-msgstr ""
-
-#: bookwyrm/templates/user/user.html:74
-msgid "No activities yet!"
-msgstr ""
-
-#: bookwyrm/templates/user/user_layout.html:30
-msgid "Follow Requests"
-msgstr ""
-
-#: bookwyrm/templates/user/user_layout.html:48
-msgid "Activity"
-msgstr ""
-
-#: bookwyrm/templates/user/user_layout.html:54
-msgid "Reading Goal"
-msgstr ""
-
-#: bookwyrm/templates/user/user_preview.html:13
-#, python-format
-msgid "Joined %(date)s"
-msgstr ""

From e52aa80d399f738d09af2b0434ccf2699c7b29f9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Feb 2021 08:11:38 -0800
Subject: [PATCH 0110/1285] Adds more detailed locale instructions

---
 README.md | 36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 8be03ea1..2564d7af 100644
--- a/README.md
+++ b/README.md
@@ -31,8 +31,7 @@ Code contributions are gladly welcomed! If you're not sure where to start, take
 If you have questions about the project or contributing, you can set up a video call during BookWyrm ["office hours"](https://calendly.com/mouse-reeve/30min).
 
 ### Translation
-Do you speak a language besides English? BookWyrm needs localization! Existing language files can be found in `bookwyrm/locale/`, and you can generate a language file for a language that isn't currently supported by running:
-`./bw-dev makemessages -l <language code>`
+Do you speak a language besides English? BookWyrm needs localization! If you're comfortable using git and want to get into the code, there are [instructions](#workin-with-translations-and-locale-files) on how to create and edit localization files. If you feel more comfortable working in a regular text editor and would prefer not to run the application, get in touch directly and we can figure out a system, like emailing a text file, that works best.
 
 ### Financial Support
 BookWyrm is an ad-free passion project with no intentions of seeking out venture funding or corporate financial relationships. If you want to help keep the project going, you can donate to the [Patreon](https://www.patreon.com/bookwyrm), or make a one time gift via [PayPal](https://paypal.me/oulipo).
@@ -72,7 +71,7 @@ Since the project is still in its early stages, the features are growing every d
     - Private, followers-only, and public privacy levels for posting, shelves, and lists
     - Option for users to manually approve followers
     - Allow blocking and flagging for moderation
-   
+
 ### The Tech Stack
 Web backend
  - [Django](https://www.djangoproject.com/) web server
@@ -80,12 +79,12 @@ Web backend
  - [ActivityPub](http://activitypub.rocks/) federation
  - [Celery](http://celeryproject.org/) task queuing
  - [Redis](https://redis.io/) task backend
- 
+
 Front end
  - Django templates
  - [Bulma.io](https://bulma.io/) css framework
  - Vanilla JavaScript, in moderation
- 
+
 Deployment
  - [Docker](https://www.docker.com/) and docker-compose
  - [Gunicorn](https://gunicorn.org/) web runner
@@ -113,6 +112,33 @@ docker-compose up
 
 Once the build is complete, you can access the instance at `localhost:1333`
 
+### Editing static files
+If you edit the CSS or JavaScript, you will need to run Django's `collectstatic` command in order for your changes to have effect. You can do this by running:
+``` bash
+./bw-dev collectstatic
+```
+
+### Workin with translations and locale files
+Text in the html files are wrapped in translation tags (`{% trans %}` and `{% blocktrans %}`), and Django generates locale files for all the strings in which you can add translations for the text. You can find existing translations in the `locale/` directory.
+
+The application's language is set by a request header sent by your browser to the application, so to change the language of the application, you can change the default language requested by your browser.
+
+#### Adding a locale
+To start translation into a language which is currently supported, run the django-admin `makemessages` command with the language code for the language you want to add (like `de` for German, or `en-gb` for British English):
+``` bash
+./bw-dev makemessages -l <language code>
+```
+
+#### Editing a locale
+When you have a locale file, open the `django.po` in the directory for the language (for example, if you were adding German, `locale/de/LC_MESSAGES/django.po`. All the the text in the application will be shown in paired strings, with `msgid` as the original text, and `msgstr` as the translation (by default, this is set to an empty string, and will display the original text).
+
+Add you translations to the `msgstr` strings, and when you're ready, compile the locale by running:
+``` bash
+./bw-dev compilemessages
+```
+
+You can add the `-l <language code>` to only compile one language. When you refresh the application, you should see your translations at work.
+
 ## Installing in Production
 
 This project is still young and isn't, at the moment, very stable, so please proceed with caution when running in production.

From d3676ff984008b84fad3f3dd6e0d813ba0f8a53e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Feb 2021 08:13:49 -0800
Subject: [PATCH 0111/1285] Removes non-existant german language support

---
 bookwyrm/settings.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index c3fe56a9..9446b09c 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -140,7 +140,6 @@ AUTH_PASSWORD_VALIDATORS = [
 LANGUAGE_CODE = 'en-us'
 LANGUAGES = [
     ('en-us', _('English')),
-    ('de', _('Deutsch')),
 ]
 
 

From 4df62a8ebd9362dbc041522730bc81c12fb2b97a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Feb 2021 08:42:25 -0800
Subject: [PATCH 0112/1285] Simplifies translation strings

---
 bookwyrm/templates/import_status.html |  4 +-
 bookwyrm/templates/layout.html        |  2 +-
 bookwyrm/templates/notifications.html | 20 ++------
 bookwyrm/templates/settings/site.html |  2 +-
 locale/en_US/LC_MESSAGES/django.po    | 72 ++++++++++-----------------
 5 files changed, 34 insertions(+), 66 deletions(-)

diff --git a/bookwyrm/templates/import_status.html b/bookwyrm/templates/import_status.html
index ca87113f..d609a227 100644
--- a/bookwyrm/templates/import_status.html
+++ b/bookwyrm/templates/import_status.html
@@ -7,11 +7,11 @@
     <h1 class="title">{% trans "Import Status" %}</h1>
 
     <p>
-        {% trans "Import started: " %}{{ job.created_date | naturaltime }}
+        {% trans "Import started:" %} {{ job.created_date | naturaltime }}
     </p>
     {% if job.complete %}
     <p>
-        {% trans "Import completed: " %}{{ task.date_done | naturaltime }}
+        {% trans "Import completed:" %} {{ task.date_done | naturaltime }}
     </p>
     {% elif task.failed %}
     <div class="notification is-danger">{% trans "TASK FAILED" %}</div>
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 39b78196..c4499c4e 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -35,7 +35,7 @@
                 <div class="control">
                     <button class="button" type="submit">
                         <span class="icon icon-search" title="{% trans 'Search' %}">
-                            <span class="is-sr-only">{% trans "search" %}</span>
+                            <span class="is-sr-only">{% trans "Search" %}</span>
                         </span>
                     </button>
                 </div>
diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html
index 20d9f254..ea9f24b8 100644
--- a/bookwyrm/templates/notifications.html
+++ b/bookwyrm/templates/notifications.html
@@ -42,23 +42,13 @@
                             {% include 'snippets/avatar.html' with user=notification.related_user %}
                             {% include 'snippets/username.html' with user=notification.related_user %}
                             {% if notification.notification_type == 'FAVORITE' %}
-                                {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path %}
-                                favorited your
-                                <a href="{{ related_path }}">{{ preview_name }}</a>
-                                {% endblocktrans %}
+                                {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path %}favorited your <a href="{{ related_path }}">{{ preview_name }}</a>{% endblocktrans %}
 
                             {% elif notification.notification_type == 'MENTION' %}
-                                {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path %}
-                                mentioned you in a
-                                <a href="{{ related_path }}">{{ preview_name }}</a>
-                                {% endblocktrans %}
+                                {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path %}mentioned you in a <a href="{{ related_path }}">{{ preview_name }}</a>{% endblocktrans %}
 
                             {% elif notification.notification_type == 'REPLY' %}
-                                {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path parent_path=related_status.reply_parent.local_path %}
-                                <a href="{{ related_path }}">replied</a>
-                                to your
-                                <a href="{{ parent_path }}">{{ preview_name }}</a>
-                                {% endblocktrans %}
+                                {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path parent_path=related_status.reply_parent.local_path %}<a href="{{ related_path }}">replied</a> to your <a href="{{ parent_path }}">{{ preview_name }}</a>{% endblocktrans %}
 
                             {% elif notification.notification_type == 'FOLLOW' %}
                                 {% trans "followed you" %}
@@ -69,9 +59,7 @@
                                     {% include 'snippets/follow_request_buttons.html' with user=notification.related_user %}
                                 </div>
                             {% elif notification.notification_type == 'BOOST' %}
-                                {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path %}
-                                boosted your <a href="{{ related_path }}">{{ preview_name }}</a>
-                                {% endblocktrans %}
+                                {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path %}boosted your <a href="{{ related_path }}">{{ preview_name }}</a>{% endblocktrans %}
                             {% elif notification.notification_type == 'ADD' %}
                             {% if notification.related_list_item.approved %}{% trans "added" %}{% else %}{% trans "suggested adding" %}{% endif %} {% include 'snippets/book_titleby.html' with book=notification.related_list_item.book %} to your list "<a href="{{ notification.related_list_item.book_list.local_path }}{% if not notification.related_list_item.approved %}/curate{% endif %}">{{ notification.related_list_item.book_list.name }}</a>"
                             {% endif %}
diff --git a/bookwyrm/templates/settings/site.html b/bookwyrm/templates/settings/site.html
index 1a502f16..2716ea3d 100644
--- a/bookwyrm/templates/settings/site.html
+++ b/bookwyrm/templates/settings/site.html
@@ -83,7 +83,7 @@
     </section>
 
     <footer class="block">
-        <button class="button is-primary" type="submit">{% trans "Save Changes" %}</button>
+        <button class="button is-primary" type="submit">{% trans "Save" %}</button>
     </footer>
 </form>
 {% endblock %}
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index b849b903..4d140e52 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-27 18:32-0800\n"
+"POT-Creation-Date: 2021-02-28 08:42-0800\n"
 "PO-Revision-Date: 2021-02-27 13:50+PST\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -67,6 +67,7 @@ msgstr ""
 #: bookwyrm/templates/book.html:106 bookwyrm/templates/edit_author.html:75
 #: bookwyrm/templates/edit_book.html:117 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:47
+#: bookwyrm/templates/settings/site.html:86
 #: bookwyrm/templates/snippets/progress_update.html:21
 #: bookwyrm/templates/snippets/readthrough.html:61
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
@@ -381,11 +382,11 @@ msgid "Import Status"
 msgstr ""
 
 #: bookwyrm/templates/import_status.html:10
-msgid "Import started: "
+msgid "Import started:"
 msgstr ""
 
 #: bookwyrm/templates/import_status.html:14
-msgid "Import completed: "
+msgid "Import completed:"
 msgstr ""
 
 #: bookwyrm/templates/import_status.html:17
@@ -447,14 +448,11 @@ msgstr ""
 msgid "Sorry! This invite code is no longer valid."
 msgstr ""
 
-#: bookwyrm/templates/layout.html:37 bookwyrm/templates/lists/list.html:62
+#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
+#: bookwyrm/templates/lists/list.html:62
 msgid "Search"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:38 bookwyrm/templates/lists/list.html:63
-msgid "search"
-msgstr ""
-
 #: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48
 msgid "Main navigation menu"
 msgstr ""
@@ -575,6 +573,10 @@ msgstr ""
 msgid "Search for a book"
 msgstr ""
 
+#: bookwyrm/templates/lists/list.html:63
+msgid "search"
+msgstr ""
+
 #: bookwyrm/templates/lists/list.html:69
 msgid "Clear search"
 msgstr ""
@@ -641,66 +643,48 @@ msgstr ""
 
 #: bookwyrm/templates/notifications.html:45
 #, python-format
-msgid ""
-"\n"
-"                                favorited your\n"
-"                                <a href=\"%(related_path)s\">"
-"%(preview_name)s</a>\n"
-"                                "
+msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:48
+#, python-format
+msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:51
 #, python-format
 msgid ""
-"\n"
-"                                mentioned you in a\n"
-"                                <a href=\"%(related_path)s\">"
-"%(preview_name)s</a>\n"
-"                                "
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">"
+"%(preview_name)s</a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:57
-#, python-format
-msgid ""
-"\n"
-"                                <a href=\"%(related_path)s\">replied</a>\n"
-"                                to your\n"
-"                                <a href=\"%(parent_path)s\">"
-"%(preview_name)s</a>\n"
-"                                "
-msgstr ""
-
-#: bookwyrm/templates/notifications.html:64
+#: bookwyrm/templates/notifications.html:54
 msgid "followed you"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:67
+#: bookwyrm/templates/notifications.html:57
 msgid "sent you a follow request"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:72
+#: bookwyrm/templates/notifications.html:62
 #, python-format
-msgid ""
-"\n"
-"                                boosted your <a href=\"%(related_path)s\">"
-"%(preview_name)s</a>\n"
-"                                "
+msgid "boosted your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:76
+#: bookwyrm/templates/notifications.html:64
 msgid "added"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:76
+#: bookwyrm/templates/notifications.html:64
 msgid "suggested adding"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:79
+#: bookwyrm/templates/notifications.html:67
 #, python-format
 msgid " your <a href=\"/import/%(related_id)s\">import</a> completed."
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:111
+#: bookwyrm/templates/notifications.html:99
 msgid "You're all caught up!"
 msgstr ""
 
@@ -968,10 +952,6 @@ msgstr ""
 msgid "Registration closed text:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:86
-msgid "Save Changes"
-msgstr ""
-
 #: bookwyrm/templates/snippets/block_button.html:5
 msgid "Block"
 msgstr ""

From c48376854432f43ea5eaafc21c36ef15f5d3f5ec Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Feb 2021 10:00:36 -0800
Subject: [PATCH 0113/1285] Moves titles into templates and adds i18n support

---
 bookwyrm/templates/author.html                      |  3 +++
 bookwyrm/templates/book.html                        |  4 +++-
 bookwyrm/templates/discover/about.html              |  4 ++--
 bookwyrm/templates/discover/landing_layout.html     |  4 +++-
 bookwyrm/templates/edit_author.html                 |  3 +++
 bookwyrm/templates/edit_book.html                   |  3 +++
 bookwyrm/templates/editions.html                    |  3 +++
 bookwyrm/templates/error.html                       |  5 +++--
 bookwyrm/templates/feed/direct_messages.html        |  8 +++++++-
 bookwyrm/templates/feed/feed_layout.html            |  5 +++--
 bookwyrm/templates/feed/status.html                 |  1 +
 bookwyrm/templates/goal.html                        | 10 ++++++++--
 bookwyrm/templates/import.html                      |  3 +++
 bookwyrm/templates/import_status.html               |  3 +++
 bookwyrm/templates/invite.html                      |  3 +++
 bookwyrm/templates/lists/list.html                  |  2 +-
 bookwyrm/templates/lists/list_layout.html           |  4 +++-
 bookwyrm/templates/lists/lists.html                 |  3 +++
 bookwyrm/templates/login.html                       |  4 +++-
 bookwyrm/templates/notfound.html                    |  5 +++--
 bookwyrm/templates/notifications.html               |  3 +++
 bookwyrm/templates/password_reset.html              |  4 +++-
 bookwyrm/templates/password_reset_request.html      |  4 +++-
 bookwyrm/templates/preferences/blocks.html          |  2 ++
 bookwyrm/templates/preferences/change_password.html |  3 +++
 bookwyrm/templates/preferences/edit_user.html       |  3 +++
 bookwyrm/templates/search_results.html              |  3 +++
 bookwyrm/templates/settings/federation.html         |  3 +++
 bookwyrm/templates/settings/site.html               |  5 ++++-
 bookwyrm/templates/tag.html                         |  5 +++--
 bookwyrm/templates/user/followers.html              |  6 +-----
 bookwyrm/templates/user/following.html              |  6 +-----
 bookwyrm/templates/user/lists.html                  |  6 +++---
 bookwyrm/templates/user/shelf.html                  | 12 ++++++++----
 bookwyrm/templates/user/user.html                   |  4 +++-
 bookwyrm/templates/user/user_layout.html            |  2 ++
 bookwyrm/views/authentication.py                    |  1 -
 bookwyrm/views/author.py                            |  3 ---
 bookwyrm/views/block.py                             |  3 +--
 bookwyrm/views/books.py                             |  4 ----
 bookwyrm/views/error.py                             |  6 ++----
 bookwyrm/views/federation.py                        |  5 +----
 bookwyrm/views/feed.py                              |  3 ---
 bookwyrm/views/goal.py                              |  2 --
 bookwyrm/views/import_data.py                       |  2 --
 bookwyrm/views/invite.py                            |  3 ---
 bookwyrm/views/landing.py                           |  6 +-----
 bookwyrm/views/list.py                              |  4 ----
 bookwyrm/views/notifications.py                     |  1 -
 bookwyrm/views/password.py                          | 12 ++----------
 bookwyrm/views/search.py                            |  1 -
 bookwyrm/views/shelf.py                             |  1 -
 bookwyrm/views/site.py                              | 10 ++--------
 bookwyrm/views/tag.py                               |  1 -
 bookwyrm/views/user.py                              |  4 ----
 55 files changed, 121 insertions(+), 102 deletions(-)

diff --git a/bookwyrm/templates/author.html b/bookwyrm/templates/author.html
index 9dd83189..bc1034a8 100644
--- a/bookwyrm/templates/author.html
+++ b/bookwyrm/templates/author.html
@@ -1,6 +1,9 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
+
+{% block title %}{{ author.name }}{% endblock %}
+
 {% block content %}
 <div class="block">
     <div class="columns is-mobile">
diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html
index 35ddba37..2280938b 100644
--- a/bookwyrm/templates/book.html
+++ b/bookwyrm/templates/book.html
@@ -2,8 +2,10 @@
 {% load i18n %}
 {% load bookwyrm_tags %}
 {% load humanize %}
-{% block content %}
 
+{% block title %}{{ book.title }}{% endblock %}
+
+{% block content %}
 <div class="block">
     <div class="columns is-mobile">
         <div class="column">
diff --git a/bookwyrm/templates/discover/about.html b/bookwyrm/templates/discover/about.html
index dd0a8129..a6f3a026 100644
--- a/bookwyrm/templates/discover/about.html
+++ b/bookwyrm/templates/discover/about.html
@@ -1,10 +1,10 @@
 {% extends 'discover/landing_layout.html' %}
 {% load i18n %}
-{% block panel %}
 
+{% block panel %}
 <div class="block columns mt-4">
     <nav class="menu column is-one-quarter">
-        <h2 class="menu-label">About {{ site.name }}</h2>
+        <h2 class="menu-label">{% blocktrans with site_name=site.name %}About {{ site_name }}{% endblocktrans %}</h2>
         <ul class="menu-list">
             <li>
                 <a href="#coc">{% trans "Code of Conduct" %}</a>
diff --git a/bookwyrm/templates/discover/landing_layout.html b/bookwyrm/templates/discover/landing_layout.html
index f6b86009..3aa27e39 100644
--- a/bookwyrm/templates/discover/landing_layout.html
+++ b/bookwyrm/templates/discover/landing_layout.html
@@ -1,8 +1,10 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
-{% block content %}
 
+{% block title %}{% trans "Welcome" %}{% endblock %}
+
+{% block content %}
 <header class="block has-text-centered">
     <h1 class="title">{{ site.name }}</h1>
     <h2 class="subtitle">{{ site.instance_tagline }}</h2>
diff --git a/bookwyrm/templates/edit_author.html b/bookwyrm/templates/edit_author.html
index ab59cc2d..0316a66f 100644
--- a/bookwyrm/templates/edit_author.html
+++ b/bookwyrm/templates/edit_author.html
@@ -1,6 +1,9 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load humanize %}
+
+{% block title %}{% trans "Edit Author" %}: {{ author.name }}{% endblock %}
+
 {% block content %}
 <header class="block">
     <h1 class="title level-left">
diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/edit_book.html
index 15c7b878..4d215949 100644
--- a/bookwyrm/templates/edit_book.html
+++ b/bookwyrm/templates/edit_book.html
@@ -1,6 +1,9 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load humanize %}
+
+{% block title %}{% trans "Edit Book" %}{% endblock %}
+
 {% block content %}
 <header class="block">
     <h1 class="title level-left">
diff --git a/bookwyrm/templates/editions.html b/bookwyrm/templates/editions.html
index 7dfabc93..38147a86 100644
--- a/bookwyrm/templates/editions.html
+++ b/bookwyrm/templates/editions.html
@@ -1,6 +1,9 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
+
+{% block title %}{% blocktrans with book_title=work.title %}Editions of {{ book_title }}{% endblocktrans %}{% endblock %}
+
 {% block content %}
 <div class="block">
     <h1 class="title">{% blocktrans with path=work.local_path work_title=work.title %}Editions of <a href="{{ work_path }}">"{{ work_title }}"</a>{% endblocktrans %}</h1>
diff --git a/bookwyrm/templates/error.html b/bookwyrm/templates/error.html
index 99a9a624..ce448287 100644
--- a/bookwyrm/templates/error.html
+++ b/bookwyrm/templates/error.html
@@ -1,11 +1,12 @@
 {% extends 'layout.html' %}
 {% load i18n %}
-{% block content %}
 
+{% block title %}{% trans "Oops!" %}{% endblock %}
+
+{% block content %}
 <div class="block">
     <h1 class="title">{% trans "Server Error" %}</h1>
     <p>{% trans "Something went wrong! Sorry about that." %}</p>
 </div>
-
 {% endblock %}
 
diff --git a/bookwyrm/templates/feed/direct_messages.html b/bookwyrm/templates/feed/direct_messages.html
index 12eaeb0b..049a12b8 100644
--- a/bookwyrm/templates/feed/direct_messages.html
+++ b/bookwyrm/templates/feed/direct_messages.html
@@ -3,7 +3,13 @@
 {% block panel %}
 
 <header class="block">
-    <h1 class="title">Direct Messages{% if partner %} with {% include 'snippets/username.html' with user=partner %}{% endif %}</h1>
+    <h1 class="title">
+        {% if partner %}
+        {% blocktrans with username=partner.display_name path=partner.local_path %}Direct Messages with <a href="{{ path }}">{{ username }}</a>{% endblocktrans %}
+        {% else %}
+        {% trans "Direct Messsages" %}
+        {% endif %}
+    </h1>
     {% if partner %}<p class="subtitle"><a href="/direct-messages"><span class="icon icon-arrow-left" aria-hidden="true"></span> {% trans "All messages" %}</a></p>{% endif %}
 </header>
 
diff --git a/bookwyrm/templates/feed/feed_layout.html b/bookwyrm/templates/feed/feed_layout.html
index a419d5be..7c49d9fd 100644
--- a/bookwyrm/templates/feed/feed_layout.html
+++ b/bookwyrm/templates/feed/feed_layout.html
@@ -1,9 +1,10 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
-{% block title %}Updates{% endblock %}
-{% block content %}
 
+{% block title %}{% trans "Updates" %}{% endblock %}
+
+{% block content %}
 <div class="columns">
     {% if user.is_authenticated %}
     <div class="column is-one-third">
diff --git a/bookwyrm/templates/feed/status.html b/bookwyrm/templates/feed/status.html
index 06d536fc..fc92f855 100644
--- a/bookwyrm/templates/feed/status.html
+++ b/bookwyrm/templates/feed/status.html
@@ -1,5 +1,6 @@
 {% extends 'feed/feed_layout.html' %}
 {% load i18n %}
+
 {% block panel %}
 <header class="block">
     <a href="/#feed" class="button" data-back>
diff --git a/bookwyrm/templates/goal.html b/bookwyrm/templates/goal.html
index 4a16ccb6..2bbe40e0 100644
--- a/bookwyrm/templates/goal.html
+++ b/bookwyrm/templates/goal.html
@@ -22,7 +22,7 @@
         <section class="card {% if goal %}hidden{% endif %}" id="show-edit-goal">
             <header class="card-header">
                 <h2 class="card-header-title has-background-primary has-text-white" tabindex="0" id="edit-form-header">
-                    <span class="icon icon-book is-size-3 mr-2" aria-hidden="true"></span> {{ year }} reading goal
+                    <span class="icon icon-book is-size-3 mr-2" aria-hidden="true"></span> {% blocktrans %}{{ year }} reading goal{% endblocktrans %}
                 </h2>
             </header>
             <section class="card-content content">
@@ -45,7 +45,13 @@
 
 {% if goal.books %}
 <section class="content">
-    <h2>{% if goal.user == request.user %}Your{% else %}{{ goal.user.display_name }}'s{% endif %} {{ year }} Books</h2>
+    <h2>
+        {% if goal.user == request.user %}
+        {% blocktrans %}Your {{ year }} Books{% endblocktrans %}
+        {% else %}
+        {% blocktrans with username=goal.user.display_name %}{{ username }}'s {{ year }} Books{% endblocktrans %}
+        {% endif %}
+    </h2>
     <div class="columns is-multiline">
         {% for book in goal.books %}
         <div class="column is-narrow">
diff --git a/bookwyrm/templates/import.html b/bookwyrm/templates/import.html
index ea62ac55..6b6febb1 100644
--- a/bookwyrm/templates/import.html
+++ b/bookwyrm/templates/import.html
@@ -1,6 +1,9 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load humanize %}
+
+{% block title %}{% trans "Import Books" %}{% endblock %}
+
 {% block content %}
 <div class="block">
     <h1 class="title">{% trans "Import Books" %}</h1>
diff --git a/bookwyrm/templates/import_status.html b/bookwyrm/templates/import_status.html
index d609a227..b28187b0 100644
--- a/bookwyrm/templates/import_status.html
+++ b/bookwyrm/templates/import_status.html
@@ -2,6 +2,9 @@
 {% load i18n %}
 {% load bookwyrm_tags %}
 {% load humanize %}
+
+{% block title %}{% trans "Import Status" %}{% endblock %}
+
 {% block content %}
 <div class="block">
     <h1 class="title">{% trans "Import Status" %}</h1>
diff --git a/bookwyrm/templates/invite.html b/bookwyrm/templates/invite.html
index 2ee15972..22a3a32c 100644
--- a/bookwyrm/templates/invite.html
+++ b/bookwyrm/templates/invite.html
@@ -1,5 +1,8 @@
 {% extends 'layout.html' %}
 {% load i18n %}
+
+{% block title %}{% trans "Create an Account" %}{% endblock %}
+
 {% block content %}
 
 <div class="columns">
diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index 42d99d8a..ddfaad0a 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -1,8 +1,8 @@
 {% extends 'lists/list_layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
-{% block panel %}
 
+{% block panel %}
 {% if request.user == list.user and pending_count %}
 <div class="block content">
     <p>
diff --git a/bookwyrm/templates/lists/list_layout.html b/bookwyrm/templates/lists/list_layout.html
index 8e2e36e6..e48364f4 100644
--- a/bookwyrm/templates/lists/list_layout.html
+++ b/bookwyrm/templates/lists/list_layout.html
@@ -1,8 +1,10 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
-{% block content %}
 
+{% block title %}{{ list.name }}{% endblock %}
+
+{% block content %}
 <header class="columns content is-mobile">
     <div class="column">
         <h1 class="title">{{ list.name }} <span class="subtitle">{% include 'snippets/privacy-icons.html' with item=list %}</span></h1>
diff --git a/bookwyrm/templates/lists/lists.html b/bookwyrm/templates/lists/lists.html
index 07032676..a21b7c64 100644
--- a/bookwyrm/templates/lists/lists.html
+++ b/bookwyrm/templates/lists/lists.html
@@ -1,5 +1,8 @@
 {% extends 'layout.html' %}
 {% load i18n %}
+
+{% block title %}{% trans "Lists" %}{% endblock %}
+
 {% block content %}
 
 <header class="block">
diff --git a/bookwyrm/templates/login.html b/bookwyrm/templates/login.html
index 1429f412..063b4b6d 100644
--- a/bookwyrm/templates/login.html
+++ b/bookwyrm/templates/login.html
@@ -1,7 +1,9 @@
 {% extends 'layout.html' %}
 {% load i18n %}
-{% block content %}
 
+{% block title %}{% trans "Login" %}{% endblock %}
+
+{% block content %}
 <div class="columns">
     <div class="column">
         <div class="box">
diff --git a/bookwyrm/templates/notfound.html b/bookwyrm/templates/notfound.html
index bb419cad..f6e765d4 100644
--- a/bookwyrm/templates/notfound.html
+++ b/bookwyrm/templates/notfound.html
@@ -1,10 +1,11 @@
 {% extends 'layout.html' %}
 {% load i18n %}
-{% block content %}
 
+{% block title %}{% trans "Not Found" %}{% endblock %}
+
+{% block content %}
 <div class="block">
     <h1 class="title">{% trans "Not Found" %}</h1>
     <p>{% trans "The page your requested doesn't seem to exist!" %}</p>
 </div>
-
 {% endblock %}
diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html
index ea9f24b8..b6074a4a 100644
--- a/bookwyrm/templates/notifications.html
+++ b/bookwyrm/templates/notifications.html
@@ -2,6 +2,9 @@
 {% load i18n %}
 {% load humanize %}
 {% load bookwyrm_tags %}
+
+{% block title %}{% trans "Notifications" %}{% endblock %}
+
 {% block content %}
 <div class="block">
     <h1 class="title">{% trans "Notifications" %}</h1>
diff --git a/bookwyrm/templates/password_reset.html b/bookwyrm/templates/password_reset.html
index 656e2dff..57add722 100644
--- a/bookwyrm/templates/password_reset.html
+++ b/bookwyrm/templates/password_reset.html
@@ -1,7 +1,9 @@
 {% extends 'layout.html' %}
 {% load i18n %}
-{% block content %}
 
+{% block title %}{% trans "Reset Password" %}{% endblock %}
+
+{% block content %}
 <div class="columns">
     <div class="column">
         <div class="block">
diff --git a/bookwyrm/templates/password_reset_request.html b/bookwyrm/templates/password_reset_request.html
index 87dc8e65..97191afa 100644
--- a/bookwyrm/templates/password_reset_request.html
+++ b/bookwyrm/templates/password_reset_request.html
@@ -1,7 +1,9 @@
 {% extends 'layout.html' %}
 {% load i18n %}
-{% block content %}
 
+{% block title %}{% trans "Reset Password" %}{% endblock %}
+
+{% block content %}
 <div class="columns is-centered">
     <div class="column is-half">
         <div class="block">
diff --git a/bookwyrm/templates/preferences/blocks.html b/bookwyrm/templates/preferences/blocks.html
index e26a5229..9cba06bf 100644
--- a/bookwyrm/templates/preferences/blocks.html
+++ b/bookwyrm/templates/preferences/blocks.html
@@ -1,6 +1,8 @@
 {% extends 'preferences/preferences_layout.html' %}
 {% load i18n %}
 
+{% block title %}{% trans "Blocked Users" %}{{ author.name }}{% endblock %}
+
 {% block header %}
 {% trans "Blocked Users" %}
 {% endblock %}
diff --git a/bookwyrm/templates/preferences/change_password.html b/bookwyrm/templates/preferences/change_password.html
index 46707946..cbd94305 100644
--- a/bookwyrm/templates/preferences/change_password.html
+++ b/bookwyrm/templates/preferences/change_password.html
@@ -1,5 +1,8 @@
 {% extends 'preferences/preferences_layout.html' %}
 {% load i18n %}
+
+{% block title %}{% trans "Change Password" %}{% endblock %}
+
 {% block header %}
 {% trans "Change Password" %}
 {% endblock %}
diff --git a/bookwyrm/templates/preferences/edit_user.html b/bookwyrm/templates/preferences/edit_user.html
index d5b76c07..b643f4ce 100644
--- a/bookwyrm/templates/preferences/edit_user.html
+++ b/bookwyrm/templates/preferences/edit_user.html
@@ -1,5 +1,8 @@
 {% extends 'preferences/preferences_layout.html' %}
 {% load i18n %}
+
+{% block title %}{% trans "Edit Profile" %}{% endblock %}
+
 {% block header %}
 {% trans "Edit Profile" %}
 {% endblock %}
diff --git a/bookwyrm/templates/search_results.html b/bookwyrm/templates/search_results.html
index 30c88f3d..66133bf5 100644
--- a/bookwyrm/templates/search_results.html
+++ b/bookwyrm/templates/search_results.html
@@ -1,5 +1,8 @@
 {% extends 'layout.html' %}
 {% load i18n %}
+
+{% block title %}{% trans "Search Results" %}{% endblock %}
+
 {% block content %}
 {% with book_results|first as local_results %}
 <div class="block">
diff --git a/bookwyrm/templates/settings/federation.html b/bookwyrm/templates/settings/federation.html
index 174b8c14..aa965a36 100644
--- a/bookwyrm/templates/settings/federation.html
+++ b/bookwyrm/templates/settings/federation.html
@@ -1,5 +1,8 @@
 {% extends 'settings/admin_layout.html' %}
 {% load i18n %}
+
+{% block title %}{% trans "Federated Servers" %}{% endblock %}
+
 {% block header %}{% trans "Federated Servers" %}{% endblock %}
 
 {% block panel %}
diff --git a/bookwyrm/templates/settings/site.html b/bookwyrm/templates/settings/site.html
index 2716ea3d..2e43bb74 100644
--- a/bookwyrm/templates/settings/site.html
+++ b/bookwyrm/templates/settings/site.html
@@ -1,6 +1,9 @@
 {% extends 'settings/admin_layout.html' %}
 {% load i18n %}
-{% block header %}{% trans "Site Configuration" %}{% endblock %}
+
+{% block title %}{% trans "Site Settings" %}{% endblock %}
+
+{% block header %}{% trans "Site Settings" %}{% endblock %}
 
 {% block panel %}
 
diff --git a/bookwyrm/templates/tag.html b/bookwyrm/templates/tag.html
index f30b7395..b6fa6778 100644
--- a/bookwyrm/templates/tag.html
+++ b/bookwyrm/templates/tag.html
@@ -1,13 +1,14 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
-{% block content %}
 
+{% block title %}{{ tag.name }}{% endblock %}
+
+{% block content %}
 <div class="block">
     <h1 class="title">{% blocktrans %}Books tagged "{{ tag.name }}"{% endblocktrans %}</h1>
     {% include 'snippets/book_tiles.html' with books=books.all %}
 </div>
-
 {% endblock %}
 
 
diff --git a/bookwyrm/templates/user/followers.html b/bookwyrm/templates/user/followers.html
index 16ec7d4f..302bb8a3 100644
--- a/bookwyrm/templates/user/followers.html
+++ b/bookwyrm/templates/user/followers.html
@@ -4,11 +4,7 @@
 
 {% block header %}
 <h1 class="title">
-    {% if is_self %}Your
-    {% else %}
-    {% include 'snippets/username.html' with user=user possessive=True %}
-    {% endif %}
-    followers
+    {% trans "User Profile" %}
 </h1>
 {% endblock %}
 
diff --git a/bookwyrm/templates/user/following.html b/bookwyrm/templates/user/following.html
index 13af4417..c565cd16 100644
--- a/bookwyrm/templates/user/following.html
+++ b/bookwyrm/templates/user/following.html
@@ -4,11 +4,7 @@
 
 {% block header %}
 <h1 class="title">
-    Users following
-    {% if is_self %}you
-    {% else %}
-    {% include 'snippets/username.html' with user=user %}
-    {% endif %}
+    {% trans "User Profile" %}
 </h1>
 {% endblock %}
 
diff --git a/bookwyrm/templates/user/lists.html b/bookwyrm/templates/user/lists.html
index 6edf4430..9e847a5d 100644
--- a/bookwyrm/templates/user/lists.html
+++ b/bookwyrm/templates/user/lists.html
@@ -5,11 +5,11 @@
 <div class="columns is-mobile">
     <div class="column">
         <h1 class="title">
-            {% if is_self %}Your
+            {% if is_self %}
+            {% trans "Your Lists" %}
             {% else %}
-            {% include 'snippets/username.html' with user=user %}'s
+            {% blocktrans with username=user.display_name %}Lists: {{ username }}{% endblocktrans %}
             {% endif %}
-            Lists
         </h1>
     </div>
     {% if is_self %}
diff --git a/bookwyrm/templates/user/shelf.html b/bookwyrm/templates/user/shelf.html
index e62e2218..ac5cb790 100644
--- a/bookwyrm/templates/user/shelf.html
+++ b/bookwyrm/templates/user/shelf.html
@@ -1,14 +1,17 @@
 {% extends 'user/user_layout.html' %}
 {% load bookwyrm_tags %}
+{% load i18n %}
+
+{% block title %}{% blocktrans with username=user.display_name %}Shelves: {{ username }}{% endblocktrans %}{% endblock %}
 
 {% block header %}
 <header class="columns">
     <h1 class="title">
-        {% if is_self %}Your
+        {% if is_self %}
+        {% trans "Your Shelves" %}
         {% else %}
-        {% include 'snippets/username.html' with user=user possessive=True %}
+        {% blocktrans with username=user.display_name %}{{ username }}: Shelves{% endblocktrans %}
         {% endif %}
-        shelves
     </h1>
 </header>
 {% endblock %}
@@ -29,7 +32,8 @@
 
     {% if is_self %}
     <div class="column is-narrow">
-        {% include 'snippets/toggle/open_button.html' with text="Create shelf" icon="plus" controls_text="create-shelf-form" focus="create-shelf-form-header" %}
+        {% trans "Create Shelf" as button_text %}
+        {% include 'snippets/toggle/open_button.html' with text=button_text icon="plus" controls_text="create-shelf-form" focus="create-shelf-form-header" %}
     </div>
     {% endif %}
 </div>
diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index bcab8d84..5dd24cae 100644
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -1,10 +1,12 @@
 {% extends 'user/user_layout.html' %}
 {% load i18n %}
 
+{% block title %}{{ user.name }}{% endblock %}
+
 {% block header %}
 <div class="columns is-mobile">
     <div class="column">
-        <h1 class="title">{% trans "User profile" %}</h1>
+        <h1 class="title">{% trans "User Profile" %}</h1>
     </div>
     {% if is_self %}
     <div class="column is-narrow">
diff --git a/bookwyrm/templates/user/user_layout.html b/bookwyrm/templates/user/user_layout.html
index c8eea412..bc7fe126 100644
--- a/bookwyrm/templates/user/user_layout.html
+++ b/bookwyrm/templates/user/user_layout.html
@@ -3,6 +3,8 @@
 {% load humanize %}
 {% load bookwyrm_tags %}
 
+{% block title %}{{ user.display_name }}{% endblock %}
+
 {% block content %}
 <header class="block">
     {% block header %}{% endblock %}
diff --git a/bookwyrm/views/authentication.py b/bookwyrm/views/authentication.py
index a74febca..316e7826 100644
--- a/bookwyrm/views/authentication.py
+++ b/bookwyrm/views/authentication.py
@@ -21,7 +21,6 @@ class Login(View):
             return redirect('/')
         # sene user to the login page
         data = {
-            'title': 'Login',
             'login_form': forms.LoginForm(),
             'register_form': forms.RegisterForm(),
         }
diff --git a/bookwyrm/views/author.py b/bookwyrm/views/author.py
index a1a37cc5..356c95ff 100644
--- a/bookwyrm/views/author.py
+++ b/bookwyrm/views/author.py
@@ -24,7 +24,6 @@ class Author(View):
         books = models.Work.objects.filter(
             Q(authors=author) | Q(editions__authors=author)).distinct()
         data = {
-            'title': author.name,
             'author': author,
             'books': [b.get_default_edition() for b in books],
         }
@@ -41,7 +40,6 @@ class EditAuthor(View):
         ''' info about a book '''
         author = get_object_or_404(models.Author, id=author_id)
         data = {
-            'title': 'Edit Author',
             'author': author,
             'form': forms.AuthorForm(instance=author)
         }
@@ -54,7 +52,6 @@ class EditAuthor(View):
         form = forms.AuthorForm(request.POST, request.FILES, instance=author)
         if not form.is_valid():
             data = {
-                'title': 'Edit Author',
                 'author': author,
                 'form': form
             }
diff --git a/bookwyrm/views/block.py b/bookwyrm/views/block.py
index cb14aae3..90e5033b 100644
--- a/bookwyrm/views/block.py
+++ b/bookwyrm/views/block.py
@@ -15,8 +15,7 @@ class Block(View):
     ''' blocking users '''
     def get(self, request):
         ''' list of blocked users? '''
-        return TemplateResponse(
-            request, 'preferences/blocks.html', {'title': 'Blocked Users'})
+        return TemplateResponse(request, 'preferences/blocks.html')
 
     def post(self, request, user_id):
         ''' block a user '''
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index e05c4726..1eb62d6d 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -82,7 +82,6 @@ class Book(View):
             )
 
         data = {
-            'title': book.title,
             'book': book,
             'reviews': reviews_page,
             'review_count': reviews.count(),
@@ -113,7 +112,6 @@ class EditBook(View):
         if not book.description:
             book.description = book.parent_work.description
         data = {
-            'title': 'Edit Book',
             'book': book,
             'form': forms.EditionForm(instance=book)
         }
@@ -126,7 +124,6 @@ class EditBook(View):
         form = forms.EditionForm(request.POST, request.FILES, instance=book)
         if not form.is_valid():
             data = {
-                'title': 'Edit Book',
                 'book': book,
                 'form': form
             }
@@ -146,7 +143,6 @@ class Editions(View):
             return ActivitypubResponse(work.to_edition_list(**request.GET))
 
         data = {
-            'title': 'Editions of %s' % work.title,
             'editions': work.editions.order_by('-edition_rank').all(),
             'work': work,
         }
diff --git a/bookwyrm/views/error.py b/bookwyrm/views/error.py
index 9eabe29f..82999d6e 100644
--- a/bookwyrm/views/error.py
+++ b/bookwyrm/views/error.py
@@ -3,11 +3,9 @@ from django.template.response import TemplateResponse
 
 def server_error_page(request):
     ''' 500 errors '''
-    return TemplateResponse(
-        request, 'error.html', {'title': 'Oops!'}, status=500)
+    return TemplateResponse(request, 'error.html', status=500)
 
 
 def not_found_page(request, _):
     ''' 404s '''
-    return TemplateResponse(
-        request, 'notfound.html', {'title': 'Not found'}, status=404)
+    return TemplateResponse(request, 'notfound.html', status=404)
diff --git a/bookwyrm/views/federation.py b/bookwyrm/views/federation.py
index 0bd14dab..62ae076c 100644
--- a/bookwyrm/views/federation.py
+++ b/bookwyrm/views/federation.py
@@ -17,8 +17,5 @@ class Federation(View):
     def get(self, request):
         ''' edit form '''
         servers = models.FederatedServer.objects.all()
-        data = {
-            'title': 'Federated Servers',
-            'servers': servers
-        }
+        data = {'servers': servers}
         return TemplateResponse(request, 'settings/federation.html', data)
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index 3a2805b4..5300c762 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -38,7 +38,6 @@ class Feed(View):
         paginated = Paginator(activities, PAGE_LENGTH)
 
         data = {**feed_page_data(request.user), **{
-            'title': 'Updates Feed',
             'user': request.user,
             'activities': paginated.page(page),
             'tab': tab,
@@ -75,7 +74,6 @@ class DirectMessage(View):
         paginated = Paginator(activities, PAGE_LENGTH)
         activity_page = paginated.page(page)
         data = {**feed_page_data(request.user), **{
-            'title': 'Direct Messages',
             'user': request.user,
             'partner': user,
             'activities': activity_page,
@@ -108,7 +106,6 @@ class Status(View):
                 status.to_activity(pure=not is_bookwyrm_request(request)))
 
         data = {**feed_page_data(request.user), **{
-            'title': 'Status by %s' % user.username,
             'status': status,
         }}
         return TemplateResponse(request, 'feed/status.html', data)
diff --git a/bookwyrm/views/goal.py b/bookwyrm/views/goal.py
index 97f13913..7da9e434 100644
--- a/bookwyrm/views/goal.py
+++ b/bookwyrm/views/goal.py
@@ -30,7 +30,6 @@ class Goal(View):
             return HttpResponseNotFound()
 
         data = {
-            'title': '%s\'s %d Reading' % (user.display_name, year),
             'goal_form': forms.GoalForm(instance=goal),
             'goal': goal,
             'user': user,
@@ -53,7 +52,6 @@ class Goal(View):
         form = forms.GoalForm(request.POST, instance=goal)
         if not form.is_valid():
             data = {
-                'title': '%s\'s %d Reading' % (request.user.display_name, year),
                 'goal_form': form,
                 'goal': goal,
                 'year': year,
diff --git a/bookwyrm/views/import_data.py b/bookwyrm/views/import_data.py
index 675cae3d..cf33163a 100644
--- a/bookwyrm/views/import_data.py
+++ b/bookwyrm/views/import_data.py
@@ -19,7 +19,6 @@ class Import(View):
     def get(self, request):
         ''' load import page '''
         return TemplateResponse(request, 'import.html', {
-            'title': 'Import Books',
             'import_form': forms.ImportForm(),
             'jobs': models.ImportJob.
                     objects.filter(user=request.user).order_by('-created_date'),
@@ -71,7 +70,6 @@ class ImportStatus(View):
         failed_items = [i for i in items if i.fail_reason]
         items = [i for i in items if not i.fail_reason]
         return TemplateResponse(request, 'import_status.html', {
-            'title': 'Import Status',
             'job': job,
             'items': items,
             'failed_items': failed_items,
diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/invite.py
index 6b3611fc..750a5c2b 100644
--- a/bookwyrm/views/invite.py
+++ b/bookwyrm/views/invite.py
@@ -30,7 +30,6 @@ class ManageInvites(View):
         ).order_by('-created_date'), PAGE_LENGTH)
 
         data = {
-            'title': 'Invitations',
             'invites': paginated.page(page),
             'form': forms.CreateInviteForm(),
         }
@@ -50,7 +49,6 @@ class ManageInvites(View):
             user=request.user
         ).order_by('-created_date'), PAGE_LENGTH)
         data = {
-            'title': 'Invitations',
             'invites': paginated.page(1),
             'form': form
         }
@@ -66,7 +64,6 @@ class Invite(View):
         invite = get_object_or_404(models.SiteInvite, code=code)
 
         data = {
-            'title': 'Join',
             'register_form': forms.RegisterForm(),
             'invite': invite,
             'valid': invite.valid() if invite else True,
diff --git a/bookwyrm/views/landing.py b/bookwyrm/views/landing.py
index 2774e742..94b27b8f 100644
--- a/bookwyrm/views/landing.py
+++ b/bookwyrm/views/landing.py
@@ -12,10 +12,7 @@ class About(View):
     ''' create invites '''
     def get(self, request):
         ''' more information about the instance '''
-        data = {
-            'title': 'About',
-        }
-        return TemplateResponse(request, 'discover/about.html', data)
+        return TemplateResponse(request, 'discover/about.html')
 
 class Home(View):
     ''' discover page or home feed depending on auth '''
@@ -43,7 +40,6 @@ class Discover(View):
         ).order_by('-review__published_date__max')[:6]
 
         data = {
-            'title': 'Discover',
             'register_form': forms.RegisterForm(),
             'books': list(set(books)),
         }
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index e7b70a28..b1741b11 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -40,7 +40,6 @@ class Lists(View):
 
         paginated = Paginator(lists, 12)
         data = {
-            'title': 'Lists',
             'lists': paginated.page(page),
             'list_form': forms.ListForm(),
             'path': '/list',
@@ -72,7 +71,6 @@ class UserLists(View):
         paginated = Paginator(lists, 12)
 
         data = {
-            'title': '%s: Lists' % user.name,
             'user': user,
             'is_self': request.user.id == user.id,
             'lists': paginated.page(page),
@@ -114,7 +112,6 @@ class List(View):
 
 
         data = {
-            'title': '%s | Lists' % book_list.name,
             'list': book_list,
             'items': book_list.listitem_set.filter(approved=True),
             'pending_count': book_list.listitem_set.filter(
@@ -149,7 +146,6 @@ class Curate(View):
             return HttpResponseNotFound()
 
         data = {
-            'title': 'Curate "%s" | Lists' % book_list.name,
             'list': book_list,
             'pending': book_list.listitem_set.filter(approved=False),
             'list_form': forms.ListForm(instance=book_list),
diff --git a/bookwyrm/views/notifications.py b/bookwyrm/views/notifications.py
index 7d6a3149..684154e4 100644
--- a/bookwyrm/views/notifications.py
+++ b/bookwyrm/views/notifications.py
@@ -16,7 +16,6 @@ class Notifications(View):
                 .order_by('-created_date')
         unread = [n.id for n in notifications.filter(read=False)]
         data = {
-            'title': 'Notifications',
             'notifications': notifications,
             'unread': unread,
         }
diff --git a/bookwyrm/views/password.py b/bookwyrm/views/password.py
index 6602a270..792da2d7 100644
--- a/bookwyrm/views/password.py
+++ b/bookwyrm/views/password.py
@@ -19,7 +19,6 @@ class PasswordResetRequest(View):
         return TemplateResponse(
             request,
             'password_reset_request.html',
-            {'title': 'Reset Password'}
         )
 
     def post(self, request):
@@ -53,11 +52,7 @@ class PasswordReset(View):
         except models.PasswordReset.DoesNotExist:
             raise PermissionDenied
 
-        return TemplateResponse(
-            request,
-            'password_reset.html',
-            {'title': 'Reset Password', 'code': reset_code.code}
-        )
+        return TemplateResponse(request, 'password_reset.html')
 
     def post(self, request, code):
         ''' allow a user to change their password through an emailed token '''
@@ -90,10 +85,7 @@ class ChangePassword(View):
     ''' change password as logged in user '''
     def get(self, request):
         ''' change password page '''
-        data = {
-            'title': 'Change Password',
-            'user': request.user,
-        }
+        data = {'user': request.user}
         return TemplateResponse(
             request, 'preferences/change_password.html', data)
 
diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py
index 8acb2836..b44c49f8 100644
--- a/bookwyrm/views/search.py
+++ b/bookwyrm/views/search.py
@@ -58,7 +58,6 @@ class Search(View):
         book_results = connector_manager.search(
             query, min_confidence=min_confidence)
         data = {
-            'title': 'Search Results',
             'book_results': book_results,
             'user_results': user_results,
             'list_results': list_results,
diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index 70d3d1de..867c7d91 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -53,7 +53,6 @@ class Shelf(View):
         ).order_by('-updated_date').all()
 
         data = {
-            'title': '%s\'s %s shelf' % (user.display_name, shelf.name),
             'user': user,
             'is_self': is_self,
             'shelves': shelves.all(),
diff --git a/bookwyrm/views/site.py b/bookwyrm/views/site.py
index 0a5e270b..e60354a3 100644
--- a/bookwyrm/views/site.py
+++ b/bookwyrm/views/site.py
@@ -19,10 +19,7 @@ class Site(View):
     def get(self, request):
         ''' edit form '''
         site = models.SiteSettings.objects.get()
-        data = {
-            'title': 'Site Settings',
-            'site_form': forms.SiteForm(instance=site)
-        }
+        data = {'site_form': forms.SiteForm(instance=site)}
         return TemplateResponse(request, 'settings/site.html', data)
 
     def post(self, request):
@@ -30,10 +27,7 @@ class Site(View):
         site = models.SiteSettings.objects.get()
         form = forms.SiteForm(request.POST, instance=site)
         if not form.is_valid():
-            data = {
-                'title': 'Site Settings',
-                'site_form': form
-            }
+            data = {'site_form': form}
             return TemplateResponse(request, 'settings/site.html', data)
         form.save()
 
diff --git a/bookwyrm/views/tag.py b/bookwyrm/views/tag.py
index 502f5ea5..e106e8dc 100644
--- a/bookwyrm/views/tag.py
+++ b/bookwyrm/views/tag.py
@@ -25,7 +25,6 @@ class Tag(View):
             usertag__tag__identifier=tag_id
         ).distinct()
         data = {
-            'title': tag_obj.name,
             'books': books,
             'tag': tag_obj,
         }
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index a218375f..f3a088c1 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -79,7 +79,6 @@ class User(View):
         if not object_visible_to_user(request.user, goal):
             goal = None
         data = {
-            'title': user.name,
             'user': user,
             'is_self': is_self,
             'shelves': shelf_preview,
@@ -108,7 +107,6 @@ class Followers(View):
                 user.to_followers_activity(**request.GET))
 
         data = {
-            'title': '%s: followers' % user.name,
             'user': user,
             'is_self': request.user.id == user.id,
             'followers': user.followers.all(),
@@ -133,7 +131,6 @@ class Following(View):
                 user.to_following_activity(**request.GET))
 
         data = {
-            'title': '%s: following' % user.name,
             'user': user,
             'is_self': request.user.id == user.id,
             'following': user.following.all(),
@@ -147,7 +144,6 @@ class EditUser(View):
     def get(self, request):
         ''' edit profile page for a user '''
         data = {
-            'title': 'Edit profile',
             'form': forms.EditUserForm(instance=request.user),
             'user': request.user,
         }

From 263b13f1576a901a995a414aa45f97ae2f2917b1 Mon Sep 17 00:00:00 2001
From: Ned Zimmerman <ned@bight.dev>
Date: Sun, 28 Feb 2021 14:04:04 -0400
Subject: [PATCH 0114/1285] Adapt tab handler to vanilla JS, fix focus jump,
 improve accessible naming of tabs/panels

---
 bookwyrm/static/js/shared.js                  | 259 ++++++++++++++++++
 bookwyrm/static/js/tabs.js                    | 255 -----------------
 bookwyrm/templates/feed/feed_layout.html      |   8 +-
 bookwyrm/templates/layout.html                |   1 -
 bookwyrm/templates/snippets/book_cover.html   |   2 +-
 .../templates/snippets/create_status.html     |  10 +-
 6 files changed, 269 insertions(+), 266 deletions(-)
 delete mode 100644 bookwyrm/static/js/tabs.js

diff --git a/bookwyrm/static/js/shared.js b/bookwyrm/static/js/shared.js
index fe3e4d19..7d65ee03 100644
--- a/bookwyrm/static/js/shared.js
+++ b/bookwyrm/static/js/shared.js
@@ -12,6 +12,10 @@ window.onload = function() {
     Array.from(document.getElementsByClassName('select-all'))
         .forEach(t => t.onclick = selectAll);
 
+    // tab groups
+    Array.from(document.getElementsByClassName('tab-group'))
+        .forEach(t => new TabGroup(t));
+
     // handle aria settings on menus
     Array.from(document.getElementsByClassName('pulldown-menu'))
         .forEach(t => t.onclick = toggleMenu);
@@ -182,3 +186,258 @@ function removeClass(el, className) {
     }
     el.className = classes.join(' ');
 }
+
+/*
+* The content below is licensed according to the W3C Software License at
+* https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
+* Heavily modified to web component by Zach Leatherman
+* Modified back to vanilla JavaScript with support for Bulma markup and nested tabs by Ned Zimmerman
+*/
+class TabGroup {
+    constructor(container) {
+      this.container = container;
+  
+      this.tablist = this.container.querySelector('[role="tablist"]');
+      this.buttons = this.tablist.querySelectorAll('[role="tab"]');
+      this.panels = this.container.querySelectorAll(':scope > [role="tabpanel"]');
+      this.delay = this.determineDelay();
+  
+      if(!this.tablist || !this.buttons.length || !this.panels.length) {
+        return;
+      }
+  
+      this.keys = this.keys();
+      this.direction = this.direction();
+      this.initButtons();
+      this.initPanels();
+    }
+  
+    keys() {
+      return {
+        end: 35,
+        home: 36,
+        left: 37,
+        up: 38,
+        right: 39,
+        down: 40
+      };
+    }
+  
+    // Add or substract depending on key pressed
+    direction() {
+      return {
+        37: -1,
+        38: -1,
+        39: 1,
+        40: 1
+      };
+    }
+  
+    initButtons() {
+      let count = 0;
+      for(let button of this.buttons) {
+        let isSelected = button.getAttribute("aria-selected") === "true";
+        button.setAttribute("tabindex", isSelected ? "0" : "-1");
+  
+        button.addEventListener('click', this.clickEventListener.bind(this));
+        button.addEventListener('keydown', this.keydownEventListener.bind(this));
+        button.addEventListener('keyup', this.keyupEventListener.bind(this));
+  
+        button.index = count++;
+      }
+    }
+  
+    initPanels() {
+      let selectedPanelId = this.tablist.querySelector('[role="tab"][aria-selected="true"]').getAttribute("aria-controls");
+      for(let panel of this.panels) {
+        if(panel.getAttribute("id") !== selectedPanelId) {
+          panel.setAttribute("hidden", "");
+        }
+        panel.setAttribute("tabindex", "0");
+      }
+    }
+  
+    clickEventListener(event) {
+      let button = event.target.closest('a');
+
+      event.preventDefault();
+  
+      this.activateTab(button, false);
+    }
+  
+    // Handle keydown on tabs
+    keydownEventListener(event) {
+      var key = event.keyCode;
+  
+      switch (key) {
+        case this.keys.end:
+          event.preventDefault();
+          // Activate last tab
+          this.activateTab(this.buttons[this.buttons.length - 1]);
+          break;
+        case this.keys.home:
+          event.preventDefault();
+          // Activate first tab
+          this.activateTab(this.buttons[0]);
+          break;
+  
+        // Up and down are in keydown
+        // because we need to prevent page scroll >:)
+        case this.keys.up:
+        case this.keys.down:
+          this.determineOrientation(event);
+          break;
+      };
+    }
+  
+    // Handle keyup on tabs
+    keyupEventListener(event) {
+      var key = event.keyCode;
+  
+      switch (key) {
+        case this.keys.left:
+        case this.keys.right:
+          this.determineOrientation(event);
+          break;
+      };
+    }
+  
+    // When a tablist’s aria-orientation is set to vertical,
+    // only up and down arrow should function.
+    // In all other cases only left and right arrow function.
+    determineOrientation(event) {
+      var key = event.keyCode;
+      var vertical = this.tablist.getAttribute('aria-orientation') == 'vertical';
+      var proceed = false;
+  
+      if (vertical) {
+        if (key === this.keys.up || key === this.keys.down) {
+          event.preventDefault();
+          proceed = true;
+        };
+      }
+      else {
+        if (key === this.keys.left || key === this.keys.right) {
+          proceed = true;
+        };
+      };
+  
+      if (proceed) {
+        this.switchTabOnArrowPress(event);
+      };
+    }
+  
+    // Either focus the next, previous, first, or last tab
+    // depending on key pressed
+    switchTabOnArrowPress(event) {
+      var pressed = event.keyCode;
+  
+      for (let button of this.buttons) {
+        button.addEventListener('focus', this.focusEventHandler.bind(this));
+      };
+  
+      if (this.direction[pressed]) {
+        var target = event.target;
+        if (target.index !== undefined) {
+          if (this.buttons[target.index + this.direction[pressed]]) {
+            this.buttons[target.index + this.direction[pressed]].focus();
+          }
+          else if (pressed === this.keys.left || pressed === this.keys.up) {
+            this.focusLastTab();
+          }
+          else if (pressed === this.keys.right || pressed == this.keys.down) {
+            this.focusFirstTab();
+          }
+        }
+      }
+    }
+  
+    // Activates any given tab panel
+    activateTab (tab, setFocus) {
+      if(tab.getAttribute("role") !== "tab") {
+        tab = tab.closest('[role="tab"]');
+      }
+  
+      setFocus = setFocus || true;
+  
+      // Deactivate all other tabs
+      this.deactivateTabs();
+  
+      // Remove tabindex attribute
+      tab.removeAttribute('tabindex');
+  
+      // Set the tab as selected
+      tab.setAttribute('aria-selected', 'true');
+      
+      // Give the tab parent an is-active class
+      tab.parentNode.classList.add('is-active');
+  
+      // Get the value of aria-controls (which is an ID)
+      var controls = tab.getAttribute('aria-controls');
+  
+      // Remove hidden attribute from tab panel to make it visible
+      document.getElementById(controls).removeAttribute('hidden');
+  
+      // Set focus when required
+      if (setFocus) {
+        tab.focus();
+      }
+    }
+  
+    // Deactivate all tabs and tab panels
+    deactivateTabs() {
+      for (let button of this.buttons) {
+        button.parentNode.classList.remove('is-active');
+        button.setAttribute('tabindex', '-1');
+        button.setAttribute('aria-selected', 'false');
+        button.removeEventListener('focus', this.focusEventHandler.bind(this));
+      }
+  
+      for (let panel of this.panels) {
+        panel.setAttribute('hidden', 'hidden');
+      }
+    }
+  
+    focusFirstTab() {
+      this.buttons[0].focus();
+    }
+  
+    focusLastTab() {
+      this.buttons[this.buttons.length - 1].focus();
+    }
+  
+    // Determine whether there should be a delay
+    // when user navigates with the arrow keys
+    determineDelay() {
+      var hasDelay = this.tablist.hasAttribute('data-delay');
+      var delay = 0;
+  
+      if (hasDelay) {
+        var delayValue = this.tablist.getAttribute('data-delay');
+        if (delayValue) {
+          delay = delayValue;
+        }
+        else {
+          // If no value is specified, default to 300ms
+          delay = 300;
+        };
+      };
+  
+      return delay;
+    }
+  
+    focusEventHandler(event) {
+      var target = event.target;
+  
+      setTimeout(this.checkTabFocus.bind(this), this.delay, target);
+    };
+  
+    // Only activate tab on focus if it still has focus after the delay
+    checkTabFocus(target) {
+      let focused = document.activeElement;
+  
+      if (target === focused) {
+        this.activateTab(target, false);
+      }
+    }
+  }
diff --git a/bookwyrm/static/js/tabs.js b/bookwyrm/static/js/tabs.js
deleted file mode 100644
index a57d29ae..00000000
--- a/bookwyrm/static/js/tabs.js
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
-* This content is licensed according to the W3C Software License at
-* https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
-* Heavily modified to web component by Zach Leatherman
-* Further modified to support Bulma markup and nested tabs by Ned Zimmerman
-*/
-class SevenMinuteTabs extends HTMLElement {
-    constructor() {
-      super();
-  
-      this.tablist = this.querySelector('[role="tablist"]');
-      this.buttons = this.tablist.querySelectorAll('[role="tab"]');
-      this.panels = this.querySelectorAll(':scope > [role="tabpanel"]');
-      this.delay = this.determineDelay();
-  
-      if(!this.tablist || !this.buttons.length || !this.panels.length) {
-        return;
-      }
-  
-      this.initButtons();
-      this.initPanels();
-    }
-  
-    get keys() {
-      return {
-        end: 35,
-        home: 36,
-        left: 37,
-        up: 38,
-        right: 39,
-        down: 40
-      };
-    }
-  
-    // Add or substract depending on key pressed
-    get direction() {
-      return {
-        37: -1,
-        38: -1,
-        39: 1,
-        40: 1
-      };
-    }
-  
-    initButtons() {
-      let count = 0;
-      for(let button of this.buttons) {
-        let isSelected = button.getAttribute("aria-selected") === "true";
-        button.setAttribute("tabindex", isSelected ? "0" : "-1");
-  
-        button.addEventListener('click', this.clickEventListener.bind(this));
-        button.addEventListener('keydown', this.keydownEventListener.bind(this));
-        button.addEventListener('keyup', this.keyupEventListener.bind(this));
-  
-        button.index = count++;
-      }
-    }
-  
-    initPanels() {
-      let selectedPanelId = this.tablist.querySelector('[role="tab"][aria-selected="true"]').getAttribute("aria-controls");
-      for(let panel of this.panels) {
-        if(panel.getAttribute("id") !== selectedPanelId) {
-          panel.setAttribute("hidden", "");
-        }
-        panel.setAttribute("tabindex", "0");
-      }
-    }
-  
-    clickEventListener(event) {
-      let button = event.target;
-      if(button.tagName === "A" || button.tagName === "BUTTON" && button.getAttribute("type") === "submit") {
-        event.preventDefault();
-      }
-  
-      this.activateTab(button, false);
-    }
-  
-    // Handle keydown on tabs
-    keydownEventListener(event) {
-      var key = event.keyCode;
-  
-      switch (key) {
-        case this.keys.end:
-          event.preventDefault();
-          // Activate last tab
-          this.activateTab(this.buttons[this.buttons.length - 1]);
-          break;
-        case this.keys.home:
-          event.preventDefault();
-          // Activate first tab
-          this.activateTab(this.buttons[0]);
-          break;
-  
-        // Up and down are in keydown
-        // because we need to prevent page scroll >:)
-        case this.keys.up:
-        case this.keys.down:
-          this.determineOrientation(event);
-          break;
-      };
-    }
-  
-    // Handle keyup on tabs
-    keyupEventListener(event) {
-      var key = event.keyCode;
-  
-      switch (key) {
-        case this.keys.left:
-        case this.keys.right:
-          this.determineOrientation(event);
-          break;
-      };
-    }
-  
-    // When a tablist’s aria-orientation is set to vertical,
-    // only up and down arrow should function.
-    // In all other cases only left and right arrow function.
-    determineOrientation(event) {
-      var key = event.keyCode;
-      var vertical = this.tablist.getAttribute('aria-orientation') == 'vertical';
-      var proceed = false;
-  
-      if (vertical) {
-        if (key === this.keys.up || key === this.keys.down) {
-          event.preventDefault();
-          proceed = true;
-        };
-      }
-      else {
-        if (key === this.keys.left || key === this.keys.right) {
-          proceed = true;
-        };
-      };
-  
-      if (proceed) {
-        this.switchTabOnArrowPress(event);
-      };
-    }
-  
-    // Either focus the next, previous, first, or last tab
-    // depending on key pressed
-    switchTabOnArrowPress(event) {
-      var pressed = event.keyCode;
-  
-      for (let button of this.buttons) {
-        button.addEventListener('focus', this.focusEventHandler.bind(this));
-      };
-  
-      if (this.direction[pressed]) {
-        var target = event.target;
-        if (target.index !== undefined) {
-          if (this.buttons[target.index + this.direction[pressed]]) {
-            this.buttons[target.index + this.direction[pressed]].focus();
-          }
-          else if (pressed === this.keys.left || pressed === this.keys.up) {
-            this.focusLastTab();
-          }
-          else if (pressed === this.keys.right || pressed == this.keys.down) {
-            this.focusFirstTab();
-          }
-        }
-      }
-    }
-  
-    // Activates any given tab panel
-    activateTab (tab, setFocus) {
-      if(tab.getAttribute("role") !== "tab") {
-        tab = tab.closest('[role="tab"]');
-      }
-  
-      setFocus = setFocus || true;
-  
-      // Deactivate all other tabs
-      this.deactivateTabs();
-  
-      // Remove tabindex attribute
-      tab.removeAttribute('tabindex');
-  
-      // Set the tab as selected
-      tab.setAttribute('aria-selected', 'true');
-      
-      // Give the tab parent an is-active class
-      tab.parentNode.classList.add('is-active');
-  
-      // Get the value of aria-controls (which is an ID)
-      var controls = tab.getAttribute('aria-controls');
-  
-      // Remove hidden attribute from tab panel to make it visible
-      document.getElementById(controls).removeAttribute('hidden');
-  
-      // Set focus when required
-      if (setFocus) {
-        tab.focus();
-      }
-    }
-  
-    // Deactivate all tabs and tab panels
-    deactivateTabs() {
-      for (let button of this.buttons) {
-        button.parentNode.classList.remove('is-active');
-        button.setAttribute('tabindex', '-1');
-        button.setAttribute('aria-selected', 'false');
-        button.removeEventListener('focus', this.focusEventHandler.bind(this));
-      }
-  
-      for (let panel of this.panels) {
-        panel.setAttribute('hidden', 'hidden');
-      }
-    }
-  
-    focusFirstTab() {
-      this.buttons[0].focus();
-    }
-  
-    focusLastTab() {
-      this.buttons[this.buttons.length - 1].focus();
-    }
-  
-    // Determine whether there should be a delay
-    // when user navigates with the arrow keys
-    determineDelay() {
-      var hasDelay = this.tablist.hasAttribute('data-delay');
-      var delay = 0;
-  
-      if (hasDelay) {
-        var delayValue = this.tablist.getAttribute('data-delay');
-        if (delayValue) {
-          delay = delayValue;
-        }
-        else {
-          // If no value is specified, default to 300ms
-          delay = 300;
-        };
-      };
-  
-      return delay;
-    }
-  
-    focusEventHandler(event) {
-      var target = event.target;
-  
-      setTimeout(this.checkTabFocus.bind(this), this.delay, target);
-    };
-  
-    // Only activate tab on focus if it still has focus after the delay
-    checkTabFocus(target) {
-      let focused = document.activeElement;
-  
-      if (target === focused) {
-        this.activateTab(target, false);
-      }
-    }
-  }
-  
-  window.customElements.define("seven-minute-tabs", SevenMinuteTabs);
diff --git a/bookwyrm/templates/feed/feed_layout.html b/bookwyrm/templates/feed/feed_layout.html
index 0575bbc6..edd4ce4a 100644
--- a/bookwyrm/templates/feed/feed_layout.html
+++ b/bookwyrm/templates/feed/feed_layout.html
@@ -10,7 +10,7 @@
         {% if not suggested_books %}
         <p>{% trans "There are no books here right now! Try searching for a book to get started" %}</p>
         {% else %}
-        <seven-minute-tabs>
+        <div class="tab-group">
             <div class="tabs is-small">
                 <ul role="tablist">
                 {% for shelf in suggested_books %}
@@ -24,7 +24,7 @@
                             <ul>
                                 {% for book in shelf.books %}
                                 <li{% if shelf_counter == 1 and forloop.first %} class="is-active"{% endif %}>
-                                    <a href="#book-{{ book.id }}" role="tab" {% if not forloop.first %}tabindex="-1"{% endif %} aria-selected="{% if shelf_counter == 1 and forloop.first %}true{% else %}false{% endif %}" aria-controls="book-{{ book.id }}">
+                                    <a href="#book-{{ book.id }}" id="tab-book-{{ book.id }}" role="tab" aria-label="{{ book.title }}" aria-selected="{% if shelf_counter == 1 and forloop.first %}true{% else %}false{% endif %}" aria-controls="book-{{ book.id }}">
                                         {% include 'snippets/book_cover.html' with book=book size="medium" %}
                                     </a>
                                 </li>
@@ -40,7 +40,7 @@
             {% for shelf in suggested_books %}
             {% with shelf_counter=forloop.counter %}
             {% for book in shelf.books %}
-            <div class="suggested-tabs card" role="tabpanel" id="book-{{ book.id }}"{% if shelf_counter != 1 or not forloop.first %} hidden{% endif %}>
+            <div class="suggested-tabs card" role="tabpanel" id="book-{{ book.id }}"{% if shelf_counter != 1 or not forloop.first %} hidden{% endif %} aria-labelledby="tab-book-{{ book.id }}">
                 <div class="card-header">
                     <p class="card-header-title">
                         <span>{% include 'snippets/book_titleby.html' with book=book %}</span>
@@ -61,7 +61,7 @@
             {% endfor %}
             {% endwith %}
             {% endfor %}
-        </seven-minute-tabs>
+        </div>
         {% endif %}
 
         {% if goal %}
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 70f4fe43..39b78196 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -205,6 +205,5 @@
     var csrf_token = '{{ csrf_token }}';
 </script>
 <script src="/static/js/shared.js"></script>
-<script src="/static/js/tabs.js" type="module"></script>
 </body>
 </html>
diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index 0df2d6d1..6d15b37f 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -1,7 +1,7 @@
 {% load bookwyrm_tags %}
 <div class="cover-container is-{{ size }}">
 {% if book.cover %}
-<img class="book-cover" src="/images/{{ book.cover }}" alt="{{ book.alt_text }}" title="{{ book.alt_text }}">
+<img class="book-cover" src="/images/{{ book.cover }}" alt="{{ book.alt_text }}">
 {% else %}
     <div class="no-cover book-cover">
         <img class="book-cover" src="/static/images/no_cover.jpg" alt="No cover">
diff --git a/bookwyrm/templates/snippets/create_status.html b/bookwyrm/templates/snippets/create_status.html
index b12b3873..76357986 100644
--- a/bookwyrm/templates/snippets/create_status.html
+++ b/bookwyrm/templates/snippets/create_status.html
@@ -2,22 +2,22 @@
 {% load i18n %}
 {% load bookwyrm_tags %}
 
-<seven-minute-tabs>
+<div class="tab-group">
     <div class="tabs is-boxed" role="tablist">
         <ul>
             <li class="is-active">
                 <a href="#review-{{ book.id }}" id="tab-review-{{ book.id }}" role="tab" aria-selected="true" aria-controls="review-{{ book.id }}" data-category="tab-option-{{ book.id }}">{% trans "Review" %}</a>
             </li>
             <li>
-                <a href="#comment-{{ book.id}}" id="tab-comment-{{ book.id }}" role="tab" tabindex="-1" aria-selected="false" aria-controls="comment-{{ book.id}}" data-category="tab-option-{{ book.id }}">{% trans "Comment" %}</a>
+                <a href="#comment-{{ book.id}}" id="tab-comment-{{ book.id }}" role="tab" aria-selected="false" aria-controls="comment-{{ book.id}}" data-category="tab-option-{{ book.id }}">{% trans "Comment" %}</a>
             </li>
             <li>
-                <a href="#quote-{{ book.id }}" id="tab-quote-{{ book.id }}" role="tab" tabindex="-1" aria-selected="false" aria-controls="quote-{{ book.id }}" data-category="tab-option-{{ book.id }}">{% trans "Quote" %}</a>
+                <a href="#quote-{{ book.id }}" id="tab-quote-{{ book.id }}" role="tab" aria-selected="false" aria-controls="quote-{{ book.id }}" data-category="tab-option-{{ book.id }}">{% trans "Quote" %}</a>
             </li>
         </ul>
     </div>
 
-    <div class="tab-option-{{ book.id }}" id="review-{{ book.id }}" role="tabpanel" tabindex="0" aria-labelledby="tab-review-{{ book.id }}">
+    <div class="tab-option-{{ book.id }}" id="review-{{ book.id }}" role="tabpanel" aria-labelledby="tab-review-{{ book.id }}">
         {% with 0|uuid as uuid %}
         {% include 'snippets/create_status_form.html' with type='review' %}
         {% endwith %}
@@ -34,4 +34,4 @@
         {% include 'snippets/create_status_form.html' with type="quotation" placeholder="An excerpt from '"|add:book.title|add:"'" %}
         {% endwith %}
     </div>
-</seven-minute-tabs>
+</div>

From 3e9ee0973b167ce8b8e5eb7142e0e23405177da5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Feb 2021 10:09:56 -0800
Subject: [PATCH 0115/1285] cleans up i18n titles

---
 bookwyrm/templates/feed/direct_messages.html  |   2 +-
 bookwyrm/templates/goal.html                  |   2 +-
 .../preferences/change_password.html          |   2 +-
 .../preferences/preferences_layout.html       |   4 +-
 bookwyrm/templates/settings/admin_layout.html |   2 +-
 .../snippets/create_status_form.html          |   4 +-
 bookwyrm/templates/snippets/goal_card.html    |   2 +-
 locale/en_US/LC_MESSAGES/django.po            | 493 ++++++++++--------
 8 files changed, 293 insertions(+), 218 deletions(-)

diff --git a/bookwyrm/templates/feed/direct_messages.html b/bookwyrm/templates/feed/direct_messages.html
index 049a12b8..2c28a79b 100644
--- a/bookwyrm/templates/feed/direct_messages.html
+++ b/bookwyrm/templates/feed/direct_messages.html
@@ -7,7 +7,7 @@
         {% if partner %}
         {% blocktrans with username=partner.display_name path=partner.local_path %}Direct Messages with <a href="{{ path }}">{{ username }}</a>{% endblocktrans %}
         {% else %}
-        {% trans "Direct Messsages" %}
+        {% trans "Direct Messages" %}
         {% endif %}
     </h1>
     {% if partner %}<p class="subtitle"><a href="/direct-messages"><span class="icon icon-arrow-left" aria-hidden="true"></span> {% trans "All messages" %}</a></p>{% endif %}
diff --git a/bookwyrm/templates/goal.html b/bookwyrm/templates/goal.html
index 2bbe40e0..0807dea8 100644
--- a/bookwyrm/templates/goal.html
+++ b/bookwyrm/templates/goal.html
@@ -22,7 +22,7 @@
         <section class="card {% if goal %}hidden{% endif %}" id="show-edit-goal">
             <header class="card-header">
                 <h2 class="card-header-title has-background-primary has-text-white" tabindex="0" id="edit-form-header">
-                    <span class="icon icon-book is-size-3 mr-2" aria-hidden="true"></span> {% blocktrans %}{{ year }} reading goal{% endblocktrans %}
+                    <span class="icon icon-book is-size-3 mr-2" aria-hidden="true"></span> {% blocktrans %}{{ year }} Reading Goal{% endblocktrans %}
                 </h2>
             </header>
             <section class="card-content content">
diff --git a/bookwyrm/templates/preferences/change_password.html b/bookwyrm/templates/preferences/change_password.html
index cbd94305..ab8be717 100644
--- a/bookwyrm/templates/preferences/change_password.html
+++ b/bookwyrm/templates/preferences/change_password.html
@@ -18,6 +18,6 @@
         <label class="label" for="id_confirm_password">{% trans "Confirm password:" %}</label>
         <input type="password" name="confirm-password" maxlength="128" class="input" required="" id="id_confirm_password">
     </div>
-    <button class="button is-primary" type="submit">{% trans "Change password" %}</button>
+    <button class="button is-primary" type="submit">{% trans "Change Password" %}</button>
 </form>
 {% endblock %}
diff --git a/bookwyrm/templates/preferences/preferences_layout.html b/bookwyrm/templates/preferences/preferences_layout.html
index c0f78f95..d463d9cb 100644
--- a/bookwyrm/templates/preferences/preferences_layout.html
+++ b/bookwyrm/templates/preferences/preferences_layout.html
@@ -14,13 +14,13 @@
                 <a href="/preferences/profile"{% if '/preferences/profile' in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Profile" %}</a>
             </li>
             <li>
-                <a href="/preferences/password"{% if '/preferences/password' in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Change password" %}</a>
+                <a href="/preferences/password"{% if '/preferences/password' in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Change Password" %}</a>
             </li>
         </ul>
         <h2 class="menu-label">{% trans "Relationships" %}</h2>
         <ul class="menu-list">
             <li>
-                <a href="/preferences/block"{% if '/preferences/block' in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Blocked users" %}</a>
+                <a href="/preferences/block"{% if '/preferences/block' in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Blocked Users" %}</a>
             </li>
         </ul>
     </nav>
diff --git a/bookwyrm/templates/settings/admin_layout.html b/bookwyrm/templates/settings/admin_layout.html
index 73178ac8..0c3efce7 100644
--- a/bookwyrm/templates/settings/admin_layout.html
+++ b/bookwyrm/templates/settings/admin_layout.html
@@ -26,7 +26,7 @@
         <ul class="menu-list">
             <li>
                 {% url 'settings-site' as url %}
-                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Site Configuration" %}</a>
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Site Settings %}</a>
                 {% if url in request.path %}
                 <ul class="emnu-list">
                     <li><a href="{{ url }}#instance-info">{% trans "Instance Info" %}</a></li>
diff --git a/bookwyrm/templates/snippets/create_status_form.html b/bookwyrm/templates/snippets/create_status_form.html
index b5a12084..8f6671f7 100644
--- a/bookwyrm/templates/snippets/create_status_form.html
+++ b/bookwyrm/templates/snippets/create_status_form.html
@@ -7,7 +7,7 @@
     <input type="hidden" name="reply_parent" value="{{ reply_parent.id }}">
     {% if type == 'review' %}
     <div class="control">
-        <label class="label" for="id_name_{{ book.id }}_{{ type }}">{% trans "Title:" %}</label>
+        <label class="label" for="id_name_{{ book.id }}_{{ type }}">{% trans "Title" %}:</label>
         <input type="text" name="name" maxlength="255" class="input" required="" id="id_name_{{ book.id }}_{{ type }}" placeholder="My {{ type }} of '{{ book.title }}'">
     </div>
     {% endif %}
@@ -41,7 +41,7 @@
     </div>
     {% if type == 'quotation' %}
     <div class="control">
-        <label class="label" for="id_content_quote-{{ book.id }}">{% trans "Comment:" %}</label>
+        <label class="label" for="id_content_quote-{{ book.id }}">{% trans "Comment" %}:</label>
         {% include 'snippets/content_warning_field.html' with parent_status=status %}
         <textarea name="content" class="textarea is-small" id="id_content_quote-{{ book.id }}"></textarea>
     </div>
diff --git a/bookwyrm/templates/snippets/goal_card.html b/bookwyrm/templates/snippets/goal_card.html
index 386c030c..084a5ad0 100644
--- a/bookwyrm/templates/snippets/goal_card.html
+++ b/bookwyrm/templates/snippets/goal_card.html
@@ -3,7 +3,7 @@
 
 {% block card-header %}
 <h3 class="card-header-title has-background-primary has-text-white">
-    <span class="icon icon-book is-size-3 mr-2" aria-hidden="true"></span> {% blocktrans %}{{ year }} reading goal{% endblocktrans %}
+    <span class="icon icon-book is-size-3 mr-2" aria-hidden="true"></span> {% blocktrans %}{{ year }} Reading Goal{% endblocktrans %}
 </h3>
 {% endblock %}
 
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index 4d140e52..c9a87403 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-28 08:42-0800\n"
+"POT-Creation-Date: 2021-02-28 10:09-0800\n"
 "PO-Revision-Date: 2021-02-27 13:50+PST\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -18,56 +18,58 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/templates/author.html:13 bookwyrm/templates/author.html:14
+#: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
+#: bookwyrm/templates/edit_author.html:5
 msgid "Edit Author"
 msgstr ""
 
-#: bookwyrm/templates/author.html:29
+#: bookwyrm/templates/author.html:32
 msgid "Wikipedia"
 msgstr ""
 
-#: bookwyrm/templates/author.html:34
+#: bookwyrm/templates/author.html:37
 #, python-format
 msgid "Books by %(name)s"
 msgstr ""
 
-#: bookwyrm/templates/book.html:27 bookwyrm/templates/book.html:28
+#: bookwyrm/templates/book.html:29 bookwyrm/templates/book.html:30
+#: bookwyrm/templates/edit_book.html:5
 msgid "Edit Book"
 msgstr ""
 
-#: bookwyrm/templates/book.html:43
+#: bookwyrm/templates/book.html:45
 msgid "Add cover"
 msgstr ""
 
-#: bookwyrm/templates/book.html:49 bookwyrm/templates/lists/list.html:89
+#: bookwyrm/templates/book.html:51 bookwyrm/templates/lists/list.html:89
 msgid "Add"
 msgstr ""
 
-#: bookwyrm/templates/book.html:58
+#: bookwyrm/templates/book.html:60
 msgid "ISBN:"
 msgstr ""
 
-#: bookwyrm/templates/book.html:65 bookwyrm/templates/edit_book.html:104
+#: bookwyrm/templates/book.html:67 bookwyrm/templates/edit_book.html:107
 msgid "OCLC Number:"
 msgstr ""
 
-#: bookwyrm/templates/book.html:72 bookwyrm/templates/edit_book.html:108
+#: bookwyrm/templates/book.html:74 bookwyrm/templates/edit_book.html:111
 msgid "ASIN:"
 msgstr ""
 
-#: bookwyrm/templates/book.html:84
+#: bookwyrm/templates/book.html:86
 msgid "View on OpenLibrary"
 msgstr ""
 
-#: bookwyrm/templates/book.html:102 bookwyrm/templates/edit_book.html:36
+#: bookwyrm/templates/book.html:104 bookwyrm/templates/edit_book.html:39
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr ""
 
-#: bookwyrm/templates/book.html:106 bookwyrm/templates/edit_author.html:75
-#: bookwyrm/templates/edit_book.html:117 bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:47
-#: bookwyrm/templates/settings/site.html:86
+#: bookwyrm/templates/book.html:108 bookwyrm/templates/edit_author.html:78
+#: bookwyrm/templates/edit_book.html:120 bookwyrm/templates/lists/form.html:42
+#: bookwyrm/templates/preferences/edit_user.html:50
+#: bookwyrm/templates/settings/site.html:89
 #: bookwyrm/templates/snippets/progress_update.html:21
 #: bookwyrm/templates/snippets/readthrough.html:61
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
@@ -75,45 +77,50 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: bookwyrm/templates/book.html:138
+#: bookwyrm/templates/book.html:140
 msgid "Your reading activity"
 msgstr ""
 
-#: bookwyrm/templates/book.html:144
+#: bookwyrm/templates/book.html:146
 msgid "You don't have any reading activity for this book."
 msgstr ""
 
-#: bookwyrm/templates/book.html:151
+#: bookwyrm/templates/book.html:153
 msgid "Create"
 msgstr ""
 
-#: bookwyrm/templates/book.html:172
+#: bookwyrm/templates/book.html:174
 msgid "Tags"
 msgstr ""
 
-#: bookwyrm/templates/book.html:176 bookwyrm/templates/snippets/tag.html:18
+#: bookwyrm/templates/book.html:178 bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr ""
 
-#: bookwyrm/templates/book.html:193
+#: bookwyrm/templates/book.html:195
 msgid "Subjects"
 msgstr ""
 
-#: bookwyrm/templates/book.html:204
+#: bookwyrm/templates/book.html:206
 msgid "Places"
 msgstr ""
 
-#: bookwyrm/templates/book.html:215 bookwyrm/templates/layout.html:64
-#: bookwyrm/templates/lists/lists.html:6
-#: bookwyrm/templates/search_results.html:85
-#: bookwyrm/templates/user/user_layout.html:60
+#: bookwyrm/templates/book.html:217 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
+#: bookwyrm/templates/search_results.html:88
+#: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr ""
 
-#: bookwyrm/templates/book.html:244
+#: bookwyrm/templates/book.html:246
 msgid "rated it"
 msgstr ""
 
+#: bookwyrm/templates/discover/about.html:7
+#, python-format
+msgid "About %(site_name)s"
+msgstr ""
+
 #: bookwyrm/templates/discover/about.html:10
 #: bookwyrm/templates/discover/about.html:20
 msgid "Code of Conduct"
@@ -128,162 +135,183 @@ msgstr ""
 msgid "Recent Books"
 msgstr ""
 
-#: bookwyrm/templates/discover/landing_layout.html:15
+#: bookwyrm/templates/discover/landing_layout.html:5
+msgid "Welcome"
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:17
 msgid "Decentralized"
 msgstr ""
 
-#: bookwyrm/templates/discover/landing_layout.html:21
+#: bookwyrm/templates/discover/landing_layout.html:23
 msgid "Friendly"
 msgstr ""
 
-#: bookwyrm/templates/discover/landing_layout.html:27
+#: bookwyrm/templates/discover/landing_layout.html:29
 msgid "Anti-Corporate"
 msgstr ""
 
-#: bookwyrm/templates/discover/landing_layout.html:42
+#: bookwyrm/templates/discover/landing_layout.html:44
 #, python-format
 msgid "Join %(name)s"
 msgstr ""
 
-#: bookwyrm/templates/discover/landing_layout.html:47
-#: bookwyrm/templates/login.html:46
+#: bookwyrm/templates/discover/landing_layout.html:49
+#: bookwyrm/templates/login.html:48
 msgid "This instance is closed"
 msgstr ""
 
-#: bookwyrm/templates/discover/landing_layout.html:53
+#: bookwyrm/templates/discover/landing_layout.html:55
 msgid "Your Account"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:10 bookwyrm/templates/edit_book.html:10
+#: bookwyrm/templates/edit_author.html:13 bookwyrm/templates/edit_book.html:13
 msgid "Added:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:11 bookwyrm/templates/edit_book.html:11
+#: bookwyrm/templates/edit_author.html:14 bookwyrm/templates/edit_book.html:14
 msgid "Updated:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:12 bookwyrm/templates/edit_book.html:12
+#: bookwyrm/templates/edit_author.html:15 bookwyrm/templates/edit_book.html:15
 msgid "Last edited by:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:28 bookwyrm/templates/edit_book.html:27
+#: bookwyrm/templates/edit_author.html:31 bookwyrm/templates/edit_book.html:30
 msgid "Metadata"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:29 bookwyrm/templates/lists/form.html:8
+#: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
 #: bookwyrm/templates/user/create_shelf_form.html:13
 #: bookwyrm/templates/user/edit_shelf_form.html:14
 msgid "Name:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:34
+#: bookwyrm/templates/edit_author.html:37
 msgid "Bio:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:39
+#: bookwyrm/templates/edit_author.html:42
 msgid "Wikipedia link:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:44
+#: bookwyrm/templates/edit_author.html:47
 msgid "Birth date:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:49
+#: bookwyrm/templates/edit_author.html:52
 msgid "Death date:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:55
+#: bookwyrm/templates/edit_author.html:58
 msgid "Author Identifiers"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:56 bookwyrm/templates/edit_book.html:100
+#: bookwyrm/templates/edit_author.html:59 bookwyrm/templates/edit_book.html:103
 msgid "Openlibrary key:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:61
+#: bookwyrm/templates/edit_author.html:64
 msgid "Librarything key:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:66
+#: bookwyrm/templates/edit_author.html:69
 msgid "Goodreads key:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:76 bookwyrm/templates/edit_book.html:118
+#: bookwyrm/templates/edit_author.html:79 bookwyrm/templates/edit_book.html:121
 msgid "Cancel"
 msgstr ""
 
-#: bookwyrm/templates/edit_book.html:28
-#: bookwyrm/templates/snippets/create_status_form.html:10
+#: bookwyrm/templates/edit_book.html:31
 msgid "Title:"
 msgstr ""
 
-#: bookwyrm/templates/edit_book.html:32
+#: bookwyrm/templates/edit_book.html:35
 msgid "Subtitle:"
 msgstr ""
 
-#: bookwyrm/templates/edit_book.html:40
+#: bookwyrm/templates/edit_book.html:43
 msgid "Series:"
 msgstr ""
 
-#: bookwyrm/templates/edit_book.html:44
+#: bookwyrm/templates/edit_book.html:47
 msgid "Series number:"
 msgstr ""
 
-#: bookwyrm/templates/edit_book.html:48
+#: bookwyrm/templates/edit_book.html:51
 msgid "First published date:"
 msgstr ""
 
-#: bookwyrm/templates/edit_book.html:52
+#: bookwyrm/templates/edit_book.html:55
 msgid "Published date:"
 msgstr ""
 
-#: bookwyrm/templates/edit_book.html:65
+#: bookwyrm/templates/edit_book.html:68
 #: bookwyrm/templates/snippets/shelf.html:9
 msgid "Cover"
 msgstr ""
 
-#: bookwyrm/templates/edit_book.html:75
+#: bookwyrm/templates/edit_book.html:78
 msgid "Physical Properties"
 msgstr ""
 
-#: bookwyrm/templates/edit_book.html:76
+#: bookwyrm/templates/edit_book.html:79
 msgid "Format:"
 msgstr ""
 
-#: bookwyrm/templates/edit_book.html:84
+#: bookwyrm/templates/edit_book.html:87
 msgid "Pages:"
 msgstr ""
 
-#: bookwyrm/templates/edit_book.html:91
+#: bookwyrm/templates/edit_book.html:94
 msgid "Book Identifiers"
 msgstr ""
 
-#: bookwyrm/templates/edit_book.html:92
+#: bookwyrm/templates/edit_book.html:95
 msgid "ISBN 13:"
 msgstr ""
 
-#: bookwyrm/templates/edit_book.html:96
+#: bookwyrm/templates/edit_book.html:99
 msgid "ISBN 10:"
 msgstr ""
 
-#: bookwyrm/templates/editions.html:6
+#: bookwyrm/templates/editions.html:5
+#, python-format
+msgid "Editions of %(book_title)s"
+msgstr ""
+
+#: bookwyrm/templates/editions.html:9
 #, python-format
 msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 msgstr ""
 
-#: bookwyrm/templates/error.html:6
+#: bookwyrm/templates/error.html:4
+msgid "Oops!"
+msgstr ""
+
+#: bookwyrm/templates/error.html:8
 msgid "Server Error"
 msgstr ""
 
-#: bookwyrm/templates/error.html:7
+#: bookwyrm/templates/error.html:9
 msgid "Something went wrong! Sorry about that."
 msgstr ""
 
-#: bookwyrm/templates/feed/direct_messages.html:7
+#: bookwyrm/templates/feed/direct_messages.html:8
+#, python-format
+msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/feed/direct_messages.html:10
+msgid "Direct Messages"
+msgstr ""
+
+#: bookwyrm/templates/feed/direct_messages.html:13
 msgid "All messages"
 msgstr ""
 
-#: bookwyrm/templates/feed/direct_messages.html:16
+#: bookwyrm/templates/feed/direct_messages.html:22
 msgid "You have no messages right now."
 msgstr ""
 
@@ -313,21 +341,26 @@ msgid ""
 "There aren't any activities right now! Try following a user to get started"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed_layout.html:9
-msgid "Your books"
+#: bookwyrm/templates/feed/feed_layout.html:5
+msgid "Updates"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:11
+msgid "Your books"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed_layout.html:13
 msgid ""
 "There are no books here right now! Try searching for a book to get started"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed_layout.html:68
+#: bookwyrm/templates/feed/feed_layout.html:70 bookwyrm/templates/goal.html:25
+#: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
 msgid "%(year)s Reading Goal"
 msgstr ""
 
-#: bookwyrm/templates/feed/status.html:7
+#: bookwyrm/templates/feed/status.html:8
 msgid "Back"
 msgstr ""
 
@@ -349,102 +382,115 @@ msgstr ""
 msgid "%(name)s hasn't set a reading goal for %(year)s."
 msgstr ""
 
-#: bookwyrm/templates/import.html:6
+#: bookwyrm/templates/goal.html:50
+#, python-format
+msgid "Your %(year)s Books"
+msgstr ""
+
+#: bookwyrm/templates/goal.html:52
+#, python-format
+msgid "%(username)s's %(year)s Books"
+msgstr ""
+
+#: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
 msgid "Import Books"
 msgstr ""
 
-#: bookwyrm/templates/import.html:11
+#: bookwyrm/templates/import.html:14
 msgid "Data source"
 msgstr ""
 
-#: bookwyrm/templates/import.html:29
+#: bookwyrm/templates/import.html:32
 msgid "Include reviews"
 msgstr ""
 
-#: bookwyrm/templates/import.html:34
+#: bookwyrm/templates/import.html:37
 msgid "Privacy setting for imported reviews:"
 msgstr ""
 
-#: bookwyrm/templates/import.html:38
+#: bookwyrm/templates/import.html:41
 msgid "Import"
 msgstr ""
 
-#: bookwyrm/templates/import.html:43
+#: bookwyrm/templates/import.html:46
 msgid "Recent Imports"
 msgstr ""
 
-#: bookwyrm/templates/import.html:45
+#: bookwyrm/templates/import.html:48
 msgid "No recent imports"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:7
+#: bookwyrm/templates/import_status.html:6
+#: bookwyrm/templates/import_status.html:10
 msgid "Import Status"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:10
+#: bookwyrm/templates/import_status.html:13
 msgid "Import started:"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:14
+#: bookwyrm/templates/import_status.html:17
 msgid "Import completed:"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:17
+#: bookwyrm/templates/import_status.html:20
 msgid "TASK FAILED"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:23
+#: bookwyrm/templates/import_status.html:26
 msgid "Import still in progress."
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:25
+#: bookwyrm/templates/import_status.html:28
 msgid "(Hit reload to update!)"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:32
+#: bookwyrm/templates/import_status.html:35
 msgid "Failed to load"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:56
+#: bookwyrm/templates/import_status.html:59
 msgid "Select all"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:59
+#: bookwyrm/templates/import_status.html:62
 msgid "Retry items"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:81
+#: bookwyrm/templates/import_status.html:84
 msgid "Successfully imported"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:85
+#: bookwyrm/templates/import_status.html:88
 #: bookwyrm/templates/lists/curate.html:14
 msgid "Book"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:88
+#: bookwyrm/templates/import_status.html:91
+#: bookwyrm/templates/snippets/create_status_form.html:10
 #: bookwyrm/templates/snippets/shelf.html:10
 msgid "Title"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:91
+#: bookwyrm/templates/import_status.html:94
 #: bookwyrm/templates/snippets/shelf.html:11
 msgid "Author"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:114
+#: bookwyrm/templates/import_status.html:117
 msgid "Imported"
 msgstr ""
 
-#: bookwyrm/templates/invite.html:9 bookwyrm/templates/login.html:41
+#: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12
+#: bookwyrm/templates/login.html:43
 msgid "Create an Account"
 msgstr ""
 
-#: bookwyrm/templates/invite.html:18
+#: bookwyrm/templates/invite.html:21
 msgid "Permission Denied"
 msgstr ""
 
-#: bookwyrm/templates/invite.html:19
+#: bookwyrm/templates/invite.html:22
 msgid "Sorry! This invite code is no longer valid."
 msgstr ""
 
@@ -466,18 +512,19 @@ msgid "Feed"
 msgstr ""
 
 #: bookwyrm/templates/layout.html:125 bookwyrm/templates/layout.html:126
-#: bookwyrm/templates/notifications.html:7
+#: bookwyrm/templates/notifications.html:6
+#: bookwyrm/templates/notifications.html:10
 msgid "Notifications"
 msgstr ""
 
 #: bookwyrm/templates/layout.html:143 bookwyrm/templates/layout.html:147
-#: bookwyrm/templates/login.html:15
+#: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:152 bookwyrm/templates/login.html:8
-#: bookwyrm/templates/login.html:31
+#: bookwyrm/templates/layout.html:152 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr ""
 
@@ -595,165 +642,172 @@ msgid "Suggest"
 msgstr ""
 
 #: bookwyrm/templates/lists/list_items.html:19
-#: bookwyrm/templates/lists/list_layout.html:9
+#: bookwyrm/templates/lists/list_layout.html:11
 msgid "Created and curated by"
 msgstr ""
 
 #: bookwyrm/templates/lists/list_items.html:19
-#: bookwyrm/templates/lists/list_layout.html:9
+#: bookwyrm/templates/lists/list_layout.html:11
 msgid "Created by"
 msgstr ""
 
-#: bookwyrm/templates/lists/lists.html:11
+#: bookwyrm/templates/lists/lists.html:14
 msgid "Your lists"
 msgstr ""
 
-#: bookwyrm/templates/lists/lists.html:36
+#: bookwyrm/templates/lists/lists.html:39
 msgid "Recent Lists"
 msgstr ""
 
-#: bookwyrm/templates/login.html:21 bookwyrm/templates/password_reset.html:15
+#: bookwyrm/templates/login.html:4
+msgid "Login"
+msgstr ""
+
+#: bookwyrm/templates/login.html:23 bookwyrm/templates/password_reset.html:17
 #: bookwyrm/templates/snippets/register_form.html:22
 msgid "Password:"
 msgstr ""
 
-#: bookwyrm/templates/login.html:34
+#: bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr ""
 
-#: bookwyrm/templates/login.html:47
+#: bookwyrm/templates/login.html:49
 msgid "Contact an administrator to get an invite"
 msgstr ""
 
-#: bookwyrm/templates/login.html:57
+#: bookwyrm/templates/login.html:59
 msgid "More about this site"
 msgstr ""
 
-#: bookwyrm/templates/notfound.html:6
+#: bookwyrm/templates/notfound.html:4 bookwyrm/templates/notfound.html:8
 msgid "Not Found"
 msgstr ""
 
-#: bookwyrm/templates/notfound.html:7
+#: bookwyrm/templates/notfound.html:9
 msgid "The page your requested doesn't seem to exist!"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:11
+#: bookwyrm/templates/notifications.html:14
 msgid "Delete notifications"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:45
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
-msgstr ""
-
 #: bookwyrm/templates/notifications.html:48
 #, python-format
-msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:51
 #, python-format
+msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:54
+#, python-format
 msgid ""
 "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">"
 "%(preview_name)s</a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:54
+#: bookwyrm/templates/notifications.html:57
 msgid "followed you"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:57
+#: bookwyrm/templates/notifications.html:60
 msgid "sent you a follow request"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:62
+#: bookwyrm/templates/notifications.html:65
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:64
+#: bookwyrm/templates/notifications.html:67
 msgid "added"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:64
+#: bookwyrm/templates/notifications.html:67
 msgid "suggested adding"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:67
+#: bookwyrm/templates/notifications.html:70
 #, python-format
 msgid " your <a href=\"/import/%(related_id)s\">import</a> completed."
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:99
+#: bookwyrm/templates/notifications.html:102
 msgid "You're all caught up!"
 msgstr ""
 
-#: bookwyrm/templates/password_reset.html:8
-#: bookwyrm/templates/password_reset_request.html:8
+#: bookwyrm/templates/password_reset.html:4
+#: bookwyrm/templates/password_reset.html:10
+#: bookwyrm/templates/password_reset_request.html:4
+#: bookwyrm/templates/password_reset_request.html:10
 msgid "Reset Password"
 msgstr ""
 
-#: bookwyrm/templates/password_reset.html:21
-#: bookwyrm/templates/preferences/change_password.html:15
+#: bookwyrm/templates/password_reset.html:23
+#: bookwyrm/templates/preferences/change_password.html:18
 msgid "Confirm password:"
 msgstr ""
 
-#: bookwyrm/templates/password_reset.html:28
+#: bookwyrm/templates/password_reset.html:30
 msgid "Confirm"
 msgstr ""
 
-#: bookwyrm/templates/password_reset_request.html:10
+#: bookwyrm/templates/password_reset_request.html:12
 msgid "A link to reset your password will be sent to your email address"
 msgstr ""
 
-#: bookwyrm/templates/password_reset_request.html:14
-#: bookwyrm/templates/preferences/edit_user.html:35
+#: bookwyrm/templates/password_reset_request.html:16
+#: bookwyrm/templates/preferences/edit_user.html:38
 #: bookwyrm/templates/snippets/register_form.html:13
 msgid "Email address:"
 msgstr ""
 
-#: bookwyrm/templates/password_reset_request.html:21
+#: bookwyrm/templates/password_reset_request.html:23
 msgid "Reset password"
 msgstr ""
 
-#: bookwyrm/templates/preferences/blocks.html:5
+#: bookwyrm/templates/preferences/blocks.html:4
+#: bookwyrm/templates/preferences/blocks.html:7
+#: bookwyrm/templates/preferences/preferences_layout.html:23
 msgid "Blocked Users"
 msgstr ""
 
-#: bookwyrm/templates/preferences/blocks.html:10
+#: bookwyrm/templates/preferences/blocks.html:12
 msgid "No users currently blocked."
 msgstr ""
 
 #: bookwyrm/templates/preferences/change_password.html:4
+#: bookwyrm/templates/preferences/change_password.html:7
+#: bookwyrm/templates/preferences/change_password.html:21
+#: bookwyrm/templates/preferences/preferences_layout.html:17
 msgid "Change Password"
 msgstr ""
 
-#: bookwyrm/templates/preferences/change_password.html:11
+#: bookwyrm/templates/preferences/change_password.html:14
 msgid "New password:"
 msgstr ""
 
-#: bookwyrm/templates/preferences/change_password.html:18
-#: bookwyrm/templates/preferences/preferences_layout.html:17
-msgid "Change password"
-msgstr ""
-
 #: bookwyrm/templates/preferences/edit_user.html:4
+#: bookwyrm/templates/preferences/edit_user.html:7
 msgid "Edit Profile"
 msgstr ""
 
-#: bookwyrm/templates/preferences/edit_user.html:14
+#: bookwyrm/templates/preferences/edit_user.html:17
 msgid "Avatar:"
 msgstr ""
 
-#: bookwyrm/templates/preferences/edit_user.html:21
+#: bookwyrm/templates/preferences/edit_user.html:24
 msgid "Display name:"
 msgstr ""
 
-#: bookwyrm/templates/preferences/edit_user.html:28
+#: bookwyrm/templates/preferences/edit_user.html:31
 msgid "Summary:"
 msgstr ""
 
-#: bookwyrm/templates/preferences/edit_user.html:43
+#: bookwyrm/templates/preferences/edit_user.html:46
 msgid "Manually approve followers:"
 msgstr ""
 
@@ -769,42 +823,42 @@ msgstr ""
 msgid "Relationships"
 msgstr ""
 
-#: bookwyrm/templates/preferences/preferences_layout.html:23
-msgid "Blocked users"
+#: bookwyrm/templates/search_results.html:4
+msgid "Search Results"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:6
+#: bookwyrm/templates/search_results.html:9
 #, python-format
 msgid "Search Results for \"%(query)s\""
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:11
+#: bookwyrm/templates/search_results.html:14
 msgid "Matching Books"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:14
+#: bookwyrm/templates/search_results.html:17
 #, python-format
 msgid "No books found for \"%(query)s\""
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:30
+#: bookwyrm/templates/search_results.html:33
 msgid "Didn't find what you were looking for?"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:53
+#: bookwyrm/templates/search_results.html:56
 msgid "Import book"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:70
+#: bookwyrm/templates/search_results.html:73
 msgid "Matching Users"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:72
+#: bookwyrm/templates/search_results.html:75
 #, python-format
 msgid "No users found for \"%(query)s\""
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:87
+#: bookwyrm/templates/search_results.html:90
 #, python-format
 msgid "No lists found for \"%(query)s\""
 msgstr ""
@@ -819,7 +873,8 @@ msgid "Invites"
 msgstr ""
 
 #: bookwyrm/templates/settings/admin_layout.html:20
-#: bookwyrm/templates/settings/federation.html:3
+#: bookwyrm/templates/settings/federation.html:4
+#: bookwyrm/templates/settings/federation.html:6
 msgid "Federated Servers"
 msgstr ""
 
@@ -827,40 +882,35 @@ msgstr ""
 msgid "Instance Settings"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:29
-#: bookwyrm/templates/settings/site.html:3
-msgid "Site Configuration"
-msgstr ""
-
 #: bookwyrm/templates/settings/admin_layout.html:32
-#: bookwyrm/templates/settings/site.html:10
+#: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr ""
 
 #: bookwyrm/templates/settings/admin_layout.html:33
-#: bookwyrm/templates/settings/site.html:36
+#: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr ""
 
 #: bookwyrm/templates/settings/admin_layout.html:34
-#: bookwyrm/templates/settings/site.html:56
+#: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr ""
 
 #: bookwyrm/templates/settings/admin_layout.html:35
-#: bookwyrm/templates/settings/site.html:74
+#: bookwyrm/templates/settings/site.html:77
 msgid "Registration"
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:9
+#: bookwyrm/templates/settings/federation.html:12
 msgid "Server name"
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:10
+#: bookwyrm/templates/settings/federation.html:13
 msgid "Software"
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:11
+#: bookwyrm/templates/settings/federation.html:14
 msgid "Status"
 msgstr ""
 
@@ -900,55 +950,60 @@ msgstr ""
 msgid "No active invites"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:12
+#: bookwyrm/templates/settings/site.html:4
+#: bookwyrm/templates/settings/site.html:6
+msgid "Site Settings"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:15
 msgid "Instance Name:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:16
+#: bookwyrm/templates/settings/site.html:19
 msgid "Tagline:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:20
+#: bookwyrm/templates/settings/site.html:23
 msgid "Instance description:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:24
+#: bookwyrm/templates/settings/site.html:27
 msgid "Code of conduct:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:28
+#: bookwyrm/templates/settings/site.html:31
 msgid "Privacy Policy:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:39
+#: bookwyrm/templates/settings/site.html:42
 msgid "Logo:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:43
+#: bookwyrm/templates/settings/site.html:46
 msgid "Logo small:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:47
+#: bookwyrm/templates/settings/site.html:50
 msgid "Favicon:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:58
+#: bookwyrm/templates/settings/site.html:61
 msgid "Support link:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:62
+#: bookwyrm/templates/settings/site.html:65
 msgid "Support title:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:66
+#: bookwyrm/templates/settings/site.html:69
 msgid "Admin email:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:76
+#: bookwyrm/templates/settings/site.html:79
 msgid "Allow registration:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:80
+#: bookwyrm/templates/settings/site.html:83
 msgid "Registration closed text:"
 msgstr ""
 
@@ -985,6 +1040,7 @@ msgid "Review"
 msgstr ""
 
 #: bookwyrm/templates/snippets/create_status.html:11
+#: bookwyrm/templates/snippets/create_status_form.html:44
 msgid "Comment"
 msgstr ""
 
@@ -1003,10 +1059,6 @@ msgstr ""
 msgid "No rating"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:44
-msgid "Comment:"
-msgstr ""
-
 #: bookwyrm/templates/snippets/create_status_form.html:59
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
@@ -1066,11 +1118,6 @@ msgstr ""
 msgid "Accept"
 msgstr ""
 
-#: bookwyrm/templates/snippets/goal_card.html:6
-#, python-format
-msgid "%(year)s reading goal"
-msgstr ""
-
 #: bookwyrm/templates/snippets/goal_card.html:21
 msgid "Dismiss message"
 msgstr ""
@@ -1143,7 +1190,7 @@ msgid "Post privacy"
 msgstr ""
 
 #: bookwyrm/templates/snippets/privacy_select.html:16
-#: bookwyrm/templates/user/followers.html:17
+#: bookwyrm/templates/user/followers.html:13
 msgid "Followers"
 msgstr ""
 
@@ -1340,7 +1387,7 @@ msgstr ""
 msgid "Remove tag"
 msgstr ""
 
-#: bookwyrm/templates/tag.html:7
+#: bookwyrm/templates/tag.html:9
 #, python-format
 msgid "Books tagged \"%(tag.name)s\""
 msgstr ""
@@ -1361,73 +1408,101 @@ msgstr ""
 msgid "Update shelf"
 msgstr ""
 
-#: bookwyrm/templates/user/followers.html:30
+#: bookwyrm/templates/user/followers.html:7
+#: bookwyrm/templates/user/following.html:7 bookwyrm/templates/user/user.html:9
+msgid "User Profile"
+msgstr ""
+
+#: bookwyrm/templates/user/followers.html:26
 #, python-format
 msgid "%(username)s has no followers"
 msgstr ""
 
-#: bookwyrm/templates/user/following.html:17
+#: bookwyrm/templates/user/following.html:13
 msgid "Following"
 msgstr ""
 
-#: bookwyrm/templates/user/following.html:30
+#: bookwyrm/templates/user/following.html:26
 #, python-format
 msgid "%(username)s isn't following any users"
 msgstr ""
 
+#: bookwyrm/templates/user/lists.html:9
+msgid "Your Lists"
+msgstr ""
+
+#: bookwyrm/templates/user/lists.html:11
+#, python-format
+msgid "Lists: %(username)s"
+msgstr ""
+
 #: bookwyrm/templates/user/lists.html:28
 msgid "Create list"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:7
-msgid "User profile"
+#: bookwyrm/templates/user/shelf.html:5
+#, python-format
+msgid "Shelves: %(username)s"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:13
+#: bookwyrm/templates/user/shelf.html:11
+msgid "Your Shelves"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf.html:13
+#, python-format
+msgid "%(username)s: Shelves"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf.html:35
+msgid "Create Shelf"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:15
 msgid "Edit profile"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:24
-#: bookwyrm/templates/user/user_layout.html:66
+#: bookwyrm/templates/user/user.html:26
+#: bookwyrm/templates/user/user_layout.html:68
 msgid "Shelves"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:29
+#: bookwyrm/templates/user/user.html:31
 #, python-format
 msgid "See all %(size)s"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:42
+#: bookwyrm/templates/user/user.html:44
 #, python-format
 msgid "See all %(shelf_count)s shelves"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:54
+#: bookwyrm/templates/user/user.html:56
 #, python-format
 msgid "Set a reading goal for %(year)s"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:60
+#: bookwyrm/templates/user/user.html:62
 msgid "User Activity"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:63
+#: bookwyrm/templates/user/user.html:65
 msgid "RSS feed"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:74
+#: bookwyrm/templates/user/user.html:76
 msgid "No activities yet!"
 msgstr ""
 
-#: bookwyrm/templates/user/user_layout.html:30
+#: bookwyrm/templates/user/user_layout.html:32
 msgid "Follow Requests"
 msgstr ""
 
-#: bookwyrm/templates/user/user_layout.html:48
+#: bookwyrm/templates/user/user_layout.html:50
 msgid "Activity"
 msgstr ""
 
-#: bookwyrm/templates/user/user_layout.html:54
+#: bookwyrm/templates/user/user_layout.html:56
 msgid "Reading Goal"
 msgstr ""
 

From 0cf2baccac45c92e7c4cb706f9b452575961e2d7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Feb 2021 10:40:10 -0800
Subject: [PATCH 0116/1285] Adds merge migration

---
 bookwyrm/migrations/0047_merge_20210228_1839.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 bookwyrm/migrations/0047_merge_20210228_1839.py

diff --git a/bookwyrm/migrations/0047_merge_20210228_1839.py b/bookwyrm/migrations/0047_merge_20210228_1839.py
new file mode 100644
index 00000000..7e410761
--- /dev/null
+++ b/bookwyrm/migrations/0047_merge_20210228_1839.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.0.7 on 2021-02-28 18:39
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0046_reviewrating'),
+        ('bookwyrm', '0046_sitesettings_privacy_policy'),
+    ]
+
+    operations = [
+    ]

From 72c50b3f581d92b0d6daba58de082b3d6c5a1869 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Feb 2021 10:45:21 -0800
Subject: [PATCH 0117/1285] Fixes typo in admn layout page

---
 bookwyrm/templates/settings/admin_layout.html |  5 ++-
 bookwyrm/templates/settings/federation.html   |  2 -
 locale/en_US/LC_MESSAGES/django.po            | 38 ++++++++++---------
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/bookwyrm/templates/settings/admin_layout.html b/bookwyrm/templates/settings/admin_layout.html
index 0c3efce7..16741436 100644
--- a/bookwyrm/templates/settings/admin_layout.html
+++ b/bookwyrm/templates/settings/admin_layout.html
@@ -1,5 +1,8 @@
 {% extends 'layout.html' %}
 {% load i18n %}
+
+{% block title %}{% trans "Administration" %}{% endblock %}
+
 {% block content %}
 
 <header class="block column is-offset-one-quarter pl-1">
@@ -26,7 +29,7 @@
         <ul class="menu-list">
             <li>
                 {% url 'settings-site' as url %}
-                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Site Settings %}</a>
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Site Settings" %}</a>
                 {% if url in request.path %}
                 <ul class="emnu-list">
                     <li><a href="{{ url }}#instance-info">{% trans "Instance Info" %}</a></li>
diff --git a/bookwyrm/templates/settings/federation.html b/bookwyrm/templates/settings/federation.html
index aa965a36..c08ba66c 100644
--- a/bookwyrm/templates/settings/federation.html
+++ b/bookwyrm/templates/settings/federation.html
@@ -1,8 +1,6 @@
 {% extends 'settings/admin_layout.html' %}
 {% load i18n %}
 
-{% block title %}{% trans "Federated Servers" %}{% endblock %}
-
 {% block header %}{% trans "Federated Servers" %}{% endblock %}
 
 {% block panel %}
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index c9a87403..bcaa30df 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-28 10:09-0800\n"
+"POT-Creation-Date: 2021-02-28 10:45-0800\n"
 "PO-Revision-Date: 2021-02-27 13:50+PST\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -863,54 +863,63 @@ msgstr ""
 msgid "No lists found for \"%(query)s\""
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:12
+#: bookwyrm/templates/settings/admin_layout.html:4
+msgid "Administration"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:15
 msgid "Manage Users"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:16
+#: bookwyrm/templates/settings/admin_layout.html:19
 #: bookwyrm/templates/settings/manage_invites.html:3
 msgid "Invites"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:20
+#: bookwyrm/templates/settings/admin_layout.html:23
 #: bookwyrm/templates/settings/federation.html:4
-#: bookwyrm/templates/settings/federation.html:6
 msgid "Federated Servers"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:25
+#: bookwyrm/templates/settings/admin_layout.html:28
 msgid "Instance Settings"
 msgstr ""
 
 #: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/site.html:4
+#: bookwyrm/templates/settings/site.html:6
+msgid "Site Settings"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:35
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:33
+#: bookwyrm/templates/settings/admin_layout.html:36
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:34
+#: bookwyrm/templates/settings/admin_layout.html:37
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:35
+#: bookwyrm/templates/settings/admin_layout.html:38
 #: bookwyrm/templates/settings/site.html:77
 msgid "Registration"
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:12
+#: bookwyrm/templates/settings/federation.html:10
 msgid "Server name"
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:13
+#: bookwyrm/templates/settings/federation.html:11
 msgid "Software"
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:14
+#: bookwyrm/templates/settings/federation.html:12
 msgid "Status"
 msgstr ""
 
@@ -950,11 +959,6 @@ msgstr ""
 msgid "No active invites"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:4
-#: bookwyrm/templates/settings/site.html:6
-msgid "Site Settings"
-msgstr ""
-
 #: bookwyrm/templates/settings/site.html:15
 msgid "Instance Name:"
 msgstr ""

From 37d768956947f9bcf469b10d1b70313234f1ecef Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sun, 28 Feb 2021 19:54:39 +0100
Subject: [PATCH 0118/1285] Duplicate django.po for French translation.

---
 locale/fr_FR/LC_MESSAGES/django.po | 1437 ++++++++++++++++++++++++++++
 1 file changed, 1437 insertions(+)
 create mode 100644 locale/fr_FR/LC_MESSAGES/django.po

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
new file mode 100644
index 00000000..4d140e52
--- /dev/null
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -0,0 +1,1437 @@
+# English language text for the bookwyrm UI
+# Copyright (C) 2021 Mouse Reeve
+# This file is distributed under the same license as the bookwyrm package.
+# Mouse Reeve <mousereeve@riseup.net>, 2021
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: 0.1.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-02-28 08:42-0800\n"
+"PO-Revision-Date: 2021-02-27 13:50+PST\n"
+"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
+"Language-Team: Mouse Reeve <LL@li.org>\n"
+"Language: English \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: bookwyrm/templates/author.html:13 bookwyrm/templates/author.html:14
+msgid "Edit Author"
+msgstr ""
+
+#: bookwyrm/templates/author.html:29
+msgid "Wikipedia"
+msgstr ""
+
+#: bookwyrm/templates/author.html:34
+#, python-format
+msgid "Books by %(name)s"
+msgstr ""
+
+#: bookwyrm/templates/book.html:27 bookwyrm/templates/book.html:28
+msgid "Edit Book"
+msgstr ""
+
+#: bookwyrm/templates/book.html:43
+msgid "Add cover"
+msgstr ""
+
+#: bookwyrm/templates/book.html:49 bookwyrm/templates/lists/list.html:89
+msgid "Add"
+msgstr ""
+
+#: bookwyrm/templates/book.html:58
+msgid "ISBN:"
+msgstr ""
+
+#: bookwyrm/templates/book.html:65 bookwyrm/templates/edit_book.html:104
+msgid "OCLC Number:"
+msgstr ""
+
+#: bookwyrm/templates/book.html:72 bookwyrm/templates/edit_book.html:108
+msgid "ASIN:"
+msgstr ""
+
+#: bookwyrm/templates/book.html:84
+msgid "View on OpenLibrary"
+msgstr ""
+
+#: bookwyrm/templates/book.html:102 bookwyrm/templates/edit_book.html:36
+#: bookwyrm/templates/lists/form.html:12
+msgid "Description:"
+msgstr ""
+
+#: bookwyrm/templates/book.html:106 bookwyrm/templates/edit_author.html:75
+#: bookwyrm/templates/edit_book.html:117 bookwyrm/templates/lists/form.html:42
+#: bookwyrm/templates/preferences/edit_user.html:47
+#: bookwyrm/templates/settings/site.html:86
+#: bookwyrm/templates/snippets/progress_update.html:21
+#: bookwyrm/templates/snippets/readthrough.html:61
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
+msgid "Save"
+msgstr ""
+
+#: bookwyrm/templates/book.html:138
+msgid "Your reading activity"
+msgstr ""
+
+#: bookwyrm/templates/book.html:144
+msgid "You don't have any reading activity for this book."
+msgstr ""
+
+#: bookwyrm/templates/book.html:151
+msgid "Create"
+msgstr ""
+
+#: bookwyrm/templates/book.html:172
+msgid "Tags"
+msgstr ""
+
+#: bookwyrm/templates/book.html:176 bookwyrm/templates/snippets/tag.html:18
+msgid "Add tag"
+msgstr ""
+
+#: bookwyrm/templates/book.html:193
+msgid "Subjects"
+msgstr ""
+
+#: bookwyrm/templates/book.html:204
+msgid "Places"
+msgstr ""
+
+#: bookwyrm/templates/book.html:215 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/lists/lists.html:6
+#: bookwyrm/templates/search_results.html:85
+#: bookwyrm/templates/user/user_layout.html:60
+msgid "Lists"
+msgstr ""
+
+#: bookwyrm/templates/book.html:244
+msgid "rated it"
+msgstr ""
+
+#: bookwyrm/templates/discover/about.html:10
+#: bookwyrm/templates/discover/about.html:20
+msgid "Code of Conduct"
+msgstr ""
+
+#: bookwyrm/templates/discover/about.html:13
+#: bookwyrm/templates/discover/about.html:29
+msgid "Privacy Policy"
+msgstr ""
+
+#: bookwyrm/templates/discover/discover.html:6
+msgid "Recent Books"
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:15
+msgid "Decentralized"
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:21
+msgid "Friendly"
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:27
+msgid "Anti-Corporate"
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:42
+#, python-format
+msgid "Join %(name)s"
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:47
+#: bookwyrm/templates/login.html:46
+msgid "This instance is closed"
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:53
+msgid "Your Account"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:10 bookwyrm/templates/edit_book.html:10
+msgid "Added:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:11 bookwyrm/templates/edit_book.html:11
+msgid "Updated:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:12 bookwyrm/templates/edit_book.html:12
+msgid "Last edited by:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:28 bookwyrm/templates/edit_book.html:27
+msgid "Metadata"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:29 bookwyrm/templates/lists/form.html:8
+#: bookwyrm/templates/user/create_shelf_form.html:13
+#: bookwyrm/templates/user/edit_shelf_form.html:14
+msgid "Name:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:34
+msgid "Bio:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:39
+msgid "Wikipedia link:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:44
+msgid "Birth date:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:49
+msgid "Death date:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:55
+msgid "Author Identifiers"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:56 bookwyrm/templates/edit_book.html:100
+msgid "Openlibrary key:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:61
+msgid "Librarything key:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:66
+msgid "Goodreads key:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:76 bookwyrm/templates/edit_book.html:118
+msgid "Cancel"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:28
+#: bookwyrm/templates/snippets/create_status_form.html:10
+msgid "Title:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:32
+msgid "Subtitle:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:40
+msgid "Series:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:44
+msgid "Series number:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:48
+msgid "First published date:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:52
+msgid "Published date:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:65
+#: bookwyrm/templates/snippets/shelf.html:9
+msgid "Cover"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:75
+msgid "Physical Properties"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:76
+msgid "Format:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:84
+msgid "Pages:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:91
+msgid "Book Identifiers"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:92
+msgid "ISBN 13:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:96
+msgid "ISBN 10:"
+msgstr ""
+
+#: bookwyrm/templates/editions.html:6
+#, python-format
+msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+msgstr ""
+
+#: bookwyrm/templates/error.html:6
+msgid "Server Error"
+msgstr ""
+
+#: bookwyrm/templates/error.html:7
+msgid "Something went wrong! Sorry about that."
+msgstr ""
+
+#: bookwyrm/templates/feed/direct_messages.html:7
+msgid "All messages"
+msgstr ""
+
+#: bookwyrm/templates/feed/direct_messages.html:16
+msgid "You have no messages right now."
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:6
+#, python-format
+msgid "%(tab_title)s Timeline"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:10
+msgid "Home"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:13
+msgid "Local"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:16
+msgid "Federated"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:24
+msgid "Announcements"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:32
+msgid ""
+"There aren't any activities right now! Try following a user to get started"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed_layout.html:9
+msgid "Your books"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed_layout.html:11
+msgid ""
+"There are no books here right now! Try searching for a book to get started"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed_layout.html:68
+#, python-format
+msgid "%(year)s Reading Goal"
+msgstr ""
+
+#: bookwyrm/templates/feed/status.html:7
+msgid "Back"
+msgstr ""
+
+#: bookwyrm/templates/goal.html:7
+#, python-format
+msgid "%(year)s Reading Progress"
+msgstr ""
+
+#: bookwyrm/templates/goal.html:29
+#: bookwyrm/templates/snippets/goal_card.html:13
+#, python-format
+msgid ""
+"Set a goal for how many books you'll finish reading in %(year)s, and track "
+"your progress throughout the year."
+msgstr ""
+
+#: bookwyrm/templates/goal.html:38
+#, python-format
+msgid "%(name)s hasn't set a reading goal for %(year)s."
+msgstr ""
+
+#: bookwyrm/templates/import.html:6
+msgid "Import Books"
+msgstr ""
+
+#: bookwyrm/templates/import.html:11
+msgid "Data source"
+msgstr ""
+
+#: bookwyrm/templates/import.html:29
+msgid "Include reviews"
+msgstr ""
+
+#: bookwyrm/templates/import.html:34
+msgid "Privacy setting for imported reviews:"
+msgstr ""
+
+#: bookwyrm/templates/import.html:38
+msgid "Import"
+msgstr ""
+
+#: bookwyrm/templates/import.html:43
+msgid "Recent Imports"
+msgstr ""
+
+#: bookwyrm/templates/import.html:45
+msgid "No recent imports"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:7
+msgid "Import Status"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:10
+msgid "Import started:"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:14
+msgid "Import completed:"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:17
+msgid "TASK FAILED"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:23
+msgid "Import still in progress."
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:25
+msgid "(Hit reload to update!)"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:32
+msgid "Failed to load"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:56
+msgid "Select all"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:59
+msgid "Retry items"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:81
+msgid "Successfully imported"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:85
+#: bookwyrm/templates/lists/curate.html:14
+msgid "Book"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:88
+#: bookwyrm/templates/snippets/shelf.html:10
+msgid "Title"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:91
+#: bookwyrm/templates/snippets/shelf.html:11
+msgid "Author"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:114
+msgid "Imported"
+msgstr ""
+
+#: bookwyrm/templates/invite.html:9 bookwyrm/templates/login.html:41
+msgid "Create an Account"
+msgstr ""
+
+#: bookwyrm/templates/invite.html:18
+msgid "Permission Denied"
+msgstr ""
+
+#: bookwyrm/templates/invite.html:19
+msgid "Sorry! This invite code is no longer valid."
+msgstr ""
+
+#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
+#: bookwyrm/templates/lists/list.html:62
+msgid "Search"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48
+msgid "Main navigation menu"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:58
+msgid "Your shelves"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:61
+msgid "Feed"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:125 bookwyrm/templates/layout.html:126
+#: bookwyrm/templates/notifications.html:7
+msgid "Notifications"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:143 bookwyrm/templates/layout.html:147
+#: bookwyrm/templates/login.html:15
+#: bookwyrm/templates/snippets/register_form.html:4
+msgid "Username:"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:152 bookwyrm/templates/login.html:8
+#: bookwyrm/templates/login.html:31
+msgid "Log in"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:183
+msgid "About this server"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:187
+msgid "Contact site admin"
+msgstr ""
+
+#: bookwyrm/templates/lists/create_form.html:5
+msgid "Create List"
+msgstr ""
+
+#: bookwyrm/templates/lists/curate.html:6
+msgid "Pending Books"
+msgstr ""
+
+#: bookwyrm/templates/lists/curate.html:7
+msgid "Go to list"
+msgstr ""
+
+#: bookwyrm/templates/lists/curate.html:9
+msgid "You're all set!"
+msgstr ""
+
+#: bookwyrm/templates/lists/curate.html:15
+msgid "Suggested by"
+msgstr ""
+
+#: bookwyrm/templates/lists/curate.html:35
+msgid "Approve"
+msgstr ""
+
+#: bookwyrm/templates/lists/curate.html:41
+msgid "Discard"
+msgstr ""
+
+#: bookwyrm/templates/lists/edit_form.html:5
+msgid "Edit List"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:18
+msgid "List curation:"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:21
+msgid "Closed"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:22
+msgid "Only you can add and remove books to this list"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:26
+msgid "Curated"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:27
+msgid "Anyone can suggest books, subject to your approval"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:31
+msgid "Open"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:32
+msgid "Anyone can add books to this list"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:17
+msgid "This list is currently empty"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:35
+msgid "Added by"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:41
+msgid "Remove"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:54
+msgid "Add Books"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:54
+msgid "Suggest Books"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:58
+msgid "Search for a book"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:63
+msgid "search"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:69
+msgid "Clear search"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:74
+#, python-format
+msgid "No books found matching the query \"%(query)s\""
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:75
+msgid "No books found"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:89
+msgid "Suggest"
+msgstr ""
+
+#: bookwyrm/templates/lists/list_items.html:19
+#: bookwyrm/templates/lists/list_layout.html:9
+msgid "Created and curated by"
+msgstr ""
+
+#: bookwyrm/templates/lists/list_items.html:19
+#: bookwyrm/templates/lists/list_layout.html:9
+msgid "Created by"
+msgstr ""
+
+#: bookwyrm/templates/lists/lists.html:11
+msgid "Your lists"
+msgstr ""
+
+#: bookwyrm/templates/lists/lists.html:36
+msgid "Recent Lists"
+msgstr ""
+
+#: bookwyrm/templates/login.html:21 bookwyrm/templates/password_reset.html:15
+#: bookwyrm/templates/snippets/register_form.html:22
+msgid "Password:"
+msgstr ""
+
+#: bookwyrm/templates/login.html:34
+msgid "Forgot your password?"
+msgstr ""
+
+#: bookwyrm/templates/login.html:47
+msgid "Contact an administrator to get an invite"
+msgstr ""
+
+#: bookwyrm/templates/login.html:57
+msgid "More about this site"
+msgstr ""
+
+#: bookwyrm/templates/notfound.html:6
+msgid "Not Found"
+msgstr ""
+
+#: bookwyrm/templates/notfound.html:7
+msgid "The page your requested doesn't seem to exist!"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:11
+msgid "Delete notifications"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:45
+#, python-format
+msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:48
+#, python-format
+msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:51
+#, python-format
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">"
+"%(preview_name)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:54
+msgid "followed you"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:57
+msgid "sent you a follow request"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:62
+#, python-format
+msgid "boosted your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:64
+msgid "added"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:64
+msgid "suggested adding"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:67
+#, python-format
+msgid " your <a href=\"/import/%(related_id)s\">import</a> completed."
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:99
+msgid "You're all caught up!"
+msgstr ""
+
+#: bookwyrm/templates/password_reset.html:8
+#: bookwyrm/templates/password_reset_request.html:8
+msgid "Reset Password"
+msgstr ""
+
+#: bookwyrm/templates/password_reset.html:21
+#: bookwyrm/templates/preferences/change_password.html:15
+msgid "Confirm password:"
+msgstr ""
+
+#: bookwyrm/templates/password_reset.html:28
+msgid "Confirm"
+msgstr ""
+
+#: bookwyrm/templates/password_reset_request.html:10
+msgid "A link to reset your password will be sent to your email address"
+msgstr ""
+
+#: bookwyrm/templates/password_reset_request.html:14
+#: bookwyrm/templates/preferences/edit_user.html:35
+#: bookwyrm/templates/snippets/register_form.html:13
+msgid "Email address:"
+msgstr ""
+
+#: bookwyrm/templates/password_reset_request.html:21
+msgid "Reset password"
+msgstr ""
+
+#: bookwyrm/templates/preferences/blocks.html:5
+msgid "Blocked Users"
+msgstr ""
+
+#: bookwyrm/templates/preferences/blocks.html:10
+msgid "No users currently blocked."
+msgstr ""
+
+#: bookwyrm/templates/preferences/change_password.html:4
+msgid "Change Password"
+msgstr ""
+
+#: bookwyrm/templates/preferences/change_password.html:11
+msgid "New password:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/change_password.html:18
+#: bookwyrm/templates/preferences/preferences_layout.html:17
+msgid "Change password"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:4
+msgid "Edit Profile"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:14
+msgid "Avatar:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:21
+msgid "Display name:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:28
+msgid "Summary:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:43
+msgid "Manually approve followers:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/preferences_layout.html:11
+msgid "Account"
+msgstr ""
+
+#: bookwyrm/templates/preferences/preferences_layout.html:14
+msgid "Profile"
+msgstr ""
+
+#: bookwyrm/templates/preferences/preferences_layout.html:20
+msgid "Relationships"
+msgstr ""
+
+#: bookwyrm/templates/preferences/preferences_layout.html:23
+msgid "Blocked users"
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:6
+#, python-format
+msgid "Search Results for \"%(query)s\""
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:11
+msgid "Matching Books"
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:14
+#, python-format
+msgid "No books found for \"%(query)s\""
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:30
+msgid "Didn't find what you were looking for?"
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:53
+msgid "Import book"
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:70
+msgid "Matching Users"
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:72
+#, python-format
+msgid "No users found for \"%(query)s\""
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:87
+#, python-format
+msgid "No lists found for \"%(query)s\""
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:12
+msgid "Manage Users"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:16
+#: bookwyrm/templates/settings/manage_invites.html:3
+msgid "Invites"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:20
+#: bookwyrm/templates/settings/federation.html:3
+msgid "Federated Servers"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:25
+msgid "Instance Settings"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:29
+#: bookwyrm/templates/settings/site.html:3
+msgid "Site Configuration"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/site.html:10
+msgid "Instance Info"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:33
+#: bookwyrm/templates/settings/site.html:36
+msgid "Images"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:34
+#: bookwyrm/templates/settings/site.html:56
+msgid "Footer Content"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:35
+#: bookwyrm/templates/settings/site.html:74
+msgid "Registration"
+msgstr ""
+
+#: bookwyrm/templates/settings/federation.html:9
+msgid "Server name"
+msgstr ""
+
+#: bookwyrm/templates/settings/federation.html:10
+msgid "Software"
+msgstr ""
+
+#: bookwyrm/templates/settings/federation.html:11
+msgid "Status"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:7
+msgid "Generate New Invite"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:13
+msgid "Expiry:"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:19
+msgid "Use limit:"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:26
+msgid "Create Invite"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:33
+msgid "Link"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:34
+msgid "Expires"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:35
+msgid "Max uses"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:36
+msgid "Times used"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:39
+msgid "No active invites"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:12
+msgid "Instance Name:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:16
+msgid "Tagline:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:20
+msgid "Instance description:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:24
+msgid "Code of conduct:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:28
+msgid "Privacy Policy:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:39
+msgid "Logo:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:43
+msgid "Logo small:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:47
+msgid "Favicon:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:58
+msgid "Support link:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:62
+msgid "Support title:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:66
+msgid "Admin email:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:76
+msgid "Allow registration:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:80
+msgid "Registration closed text:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/block_button.html:5
+msgid "Block"
+msgstr ""
+
+#: bookwyrm/templates/snippets/block_button.html:10
+msgid "Un-block"
+msgstr ""
+
+#: bookwyrm/templates/snippets/boost_button.html:8
+#: bookwyrm/templates/snippets/boost_button.html:9
+#: bookwyrm/templates/snippets/status/status_body.html:40
+#: bookwyrm/templates/snippets/status/status_body.html:41
+msgid "Boost status"
+msgstr ""
+
+#: bookwyrm/templates/snippets/boost_button.html:16
+#: bookwyrm/templates/snippets/boost_button.html:17
+msgid "Un-boost status"
+msgstr ""
+
+#: bookwyrm/templates/snippets/content_warning_field.html:3
+msgid "Spoiler alert:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/content_warning_field.html:4
+msgid "Spoilers ahead!"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status.html:8
+msgid "Review"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status.html:11
+msgid "Comment"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status.html:14
+msgid "Quote"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status_form.html:21
+#: bookwyrm/templates/snippets/shelf.html:17
+msgid "Rating"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status_form.html:23
+#: bookwyrm/templates/snippets/rate_action.html:14
+#: bookwyrm/templates/snippets/stars.html:3
+msgid "No rating"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status_form.html:44
+msgid "Comment:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status_form.html:59
+#: bookwyrm/templates/snippets/privacy-icons.html:15
+#: bookwyrm/templates/snippets/privacy-icons.html:16
+#: bookwyrm/templates/snippets/privacy_select.html:19
+msgid "Private"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status_form.html:66
+msgid "Post"
+msgstr ""
+
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:4
+msgid "Delete these read dates?"
+msgstr ""
+
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
+#, python-format
+msgid ""
+"You are deleting this readthrough and its %(count)s associated progress "
+"updates."
+msgstr ""
+
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
+#: bookwyrm/templates/snippets/follow_request_buttons.html:13
+msgid "Delete"
+msgstr ""
+
+#: bookwyrm/templates/snippets/fav_button.html:7
+#: bookwyrm/templates/snippets/fav_button.html:8
+#: bookwyrm/templates/snippets/status/status_body.html:44
+#: bookwyrm/templates/snippets/status/status_body.html:45
+msgid "Like status"
+msgstr ""
+
+#: bookwyrm/templates/snippets/fav_button.html:15
+#: bookwyrm/templates/snippets/fav_button.html:16
+msgid "Un-like status"
+msgstr ""
+
+#: bookwyrm/templates/snippets/follow_button.html:6
+msgid "Follow request already sent."
+msgstr ""
+
+#: bookwyrm/templates/snippets/follow_button.html:19
+msgid "Send follow request"
+msgstr ""
+
+#: bookwyrm/templates/snippets/follow_button.html:21
+msgid "Follow"
+msgstr ""
+
+#: bookwyrm/templates/snippets/follow_button.html:27
+msgid "Unfollow"
+msgstr ""
+
+#: bookwyrm/templates/snippets/follow_request_buttons.html:8
+msgid "Accept"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_card.html:6
+#, python-format
+msgid "%(year)s reading goal"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_card.html:21
+msgid "Dismiss message"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_card.html:22
+#, python-format
+msgid ""
+"You can set or change your reading goal any time from your <a href=\"%(path)s"
+"\">profile page</a>"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_form.html:9
+msgid "Reading goal:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_form.html:14
+msgid "books"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_form.html:19
+msgid "Goal privacy:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_form.html:26
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:29
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20
+msgid "Post to feed"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_form.html:30
+msgid "Set goal"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_progress.html:5
+msgid "Success!"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_progress.html:7
+#, python-format
+msgid "%(percent)s%% complete!"
+msgstr ""
+
+#: bookwyrm/templates/snippets/pagination.html:7
+msgid "Previous"
+msgstr ""
+
+#: bookwyrm/templates/snippets/pagination.html:15
+msgid "Next"
+msgstr ""
+
+#: bookwyrm/templates/snippets/privacy-icons.html:3
+#: bookwyrm/templates/snippets/privacy-icons.html:4
+#: bookwyrm/templates/snippets/privacy_select.html:10
+msgid "Public"
+msgstr ""
+
+#: bookwyrm/templates/snippets/privacy-icons.html:7
+#: bookwyrm/templates/snippets/privacy-icons.html:8
+#: bookwyrm/templates/snippets/privacy_select.html:13
+msgid "Unlisted"
+msgstr ""
+
+#: bookwyrm/templates/snippets/privacy-icons.html:12
+msgid "Followers-only"
+msgstr ""
+
+#: bookwyrm/templates/snippets/privacy_select.html:6
+msgid "Post privacy"
+msgstr ""
+
+#: bookwyrm/templates/snippets/privacy_select.html:16
+#: bookwyrm/templates/user/followers.html:17
+msgid "Followers"
+msgstr ""
+
+#: bookwyrm/templates/snippets/progress_update.html:6
+msgid "Progress:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/progress_update.html:16
+#: bookwyrm/templates/snippets/readthrough_form.html:22
+msgid "pages"
+msgstr ""
+
+#: bookwyrm/templates/snippets/progress_update.html:17
+#: bookwyrm/templates/snippets/readthrough_form.html:23
+msgid "percent"
+msgstr ""
+
+#: bookwyrm/templates/snippets/progress_update.html:25
+#, python-format
+msgid "of %(book.pages)s pages"
+msgstr ""
+
+#: bookwyrm/templates/snippets/rate_action.html:4
+msgid "Leave a rating"
+msgstr ""
+
+#: bookwyrm/templates/snippets/rate_action.html:29
+msgid "Rate"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough.html:7
+msgid "Progress Updates:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough.html:11
+msgid "finished"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough.html:29
+msgid "Delete this progress update"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough.html:39
+msgid "started"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough.html:57
+msgid "Edit read dates"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough_form.html:7
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:19
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:17
+msgid "Started reading"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough_form.html:14
+msgid "Progress"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough_form.html:30
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25
+msgid "Finished reading"
+msgstr ""
+
+#: bookwyrm/templates/snippets/register_form.html:32
+msgid "Sign Up"
+msgstr ""
+
+#: bookwyrm/templates/snippets/rss_title.html:5
+#: bookwyrm/templates/snippets/status/status_header.html:9
+msgid "rated"
+msgstr ""
+
+#: bookwyrm/templates/snippets/rss_title.html:7
+#: bookwyrm/templates/snippets/status/status_header.html:11
+msgid "reviewed"
+msgstr ""
+
+#: bookwyrm/templates/snippets/rss_title.html:9
+#: bookwyrm/templates/snippets/status/status_header.html:13
+msgid "commented on"
+msgstr ""
+
+#: bookwyrm/templates/snippets/rss_title.html:11
+#: bookwyrm/templates/snippets/status/status_header.html:15
+msgid "quoted"
+msgstr ""
+
+#: bookwyrm/templates/snippets/search_result_text.html:3
+#, python-format
+msgid "by %(author)s"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:12
+msgid "Published"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:13
+msgid "Shelved"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:14
+msgid "Started"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:15
+msgid "Finished"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:16
+msgid "External links"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:44
+msgid "OpenLibrary"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:61
+msgid "This shelf is empty."
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:67
+msgid "Delete shelf"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf_selector.html:4
+msgid "Change shelf"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf_selector.html:27
+msgid "Unshelve"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
+#, python-format
+msgid "Finish \"<em>%(book_title)s</em>\""
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5
+msgid "More shelves"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:10
+msgid "Read"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
+#, python-format
+msgid "Start \"<em>%(book_title)s</em>\""
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:5
+#, python-format
+msgid "Want to Read \"<em>%(book_title)s</em>\""
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26
+msgid "Want to read"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status.html:7
+msgid "boosted"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_body.html:36
+#: bookwyrm/templates/snippets/status/status_body.html:37
+msgid "Reply"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_content.html:42
+msgid "Open image in new window"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_options.html:7
+#: bookwyrm/templates/snippets/user_options.html:7
+msgid "More options"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_options.html:17
+msgid "Delete post"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_options.html:23
+#: bookwyrm/templates/snippets/user_options.html:13
+msgid "Send direct message"
+msgstr ""
+
+#: bookwyrm/templates/snippets/switch_edition_button.html:5
+msgid "Switch to this edition"
+msgstr ""
+
+#: bookwyrm/templates/snippets/tag.html:14
+msgid "Remove tag"
+msgstr ""
+
+#: bookwyrm/templates/tag.html:7
+#, python-format
+msgid "Books tagged \"%(tag.name)s\""
+msgstr ""
+
+#: bookwyrm/templates/user/create_shelf_form.html:5
+msgid "Create New Shelf"
+msgstr ""
+
+#: bookwyrm/templates/user/create_shelf_form.html:22
+msgid "Create shelf"
+msgstr ""
+
+#: bookwyrm/templates/user/edit_shelf_form.html:5
+msgid "Edit Shelf"
+msgstr ""
+
+#: bookwyrm/templates/user/edit_shelf_form.html:26
+msgid "Update shelf"
+msgstr ""
+
+#: bookwyrm/templates/user/followers.html:30
+#, python-format
+msgid "%(username)s has no followers"
+msgstr ""
+
+#: bookwyrm/templates/user/following.html:17
+msgid "Following"
+msgstr ""
+
+#: bookwyrm/templates/user/following.html:30
+#, python-format
+msgid "%(username)s isn't following any users"
+msgstr ""
+
+#: bookwyrm/templates/user/lists.html:28
+msgid "Create list"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:7
+msgid "User profile"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:13
+msgid "Edit profile"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:24
+#: bookwyrm/templates/user/user_layout.html:66
+msgid "Shelves"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:29
+#, python-format
+msgid "See all %(size)s"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:42
+#, python-format
+msgid "See all %(shelf_count)s shelves"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:54
+#, python-format
+msgid "Set a reading goal for %(year)s"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:60
+msgid "User Activity"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:63
+msgid "RSS feed"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:74
+msgid "No activities yet!"
+msgstr ""
+
+#: bookwyrm/templates/user/user_layout.html:30
+msgid "Follow Requests"
+msgstr ""
+
+#: bookwyrm/templates/user/user_layout.html:48
+msgid "Activity"
+msgstr ""
+
+#: bookwyrm/templates/user/user_layout.html:54
+msgid "Reading Goal"
+msgstr ""
+
+#: bookwyrm/templates/user/user_preview.html:13
+#, python-format
+msgid "Joined %(date)s"
+msgstr ""

From 5a05c0caa9ae6c5bf7d5351c5a6209bd1dd3b0c4 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sun, 28 Feb 2021 20:04:34 +0100
Subject: [PATCH 0119/1285] =?UTF-8?q?Add=20=5F=E2=80=A6edit=E2=80=A6=5F=20?=
 =?UTF-8?q?strings.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Some translators might translate this as “éditer� when the proper translation is “modifier�.
---
 locale/fr_FR/LC_MESSAGES/django.po | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 4d140e52..74c68519 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -20,7 +20,7 @@ msgstr ""
 
 #: bookwyrm/templates/author.html:13 bookwyrm/templates/author.html:14
 msgid "Edit Author"
-msgstr ""
+msgstr "Modifier l’auteur"
 
 #: bookwyrm/templates/author.html:29
 msgid "Wikipedia"
@@ -33,7 +33,7 @@ msgstr ""
 
 #: bookwyrm/templates/book.html:27 bookwyrm/templates/book.html:28
 msgid "Edit Book"
-msgstr ""
+msgstr "Modifier le livre"
 
 #: bookwyrm/templates/book.html:43
 msgid "Add cover"
@@ -164,7 +164,7 @@ msgstr ""
 
 #: bookwyrm/templates/edit_author.html:12 bookwyrm/templates/edit_book.html:12
 msgid "Last edited by:"
-msgstr ""
+msgstr "Dernière modification par :"
 
 #: bookwyrm/templates/edit_author.html:28 bookwyrm/templates/edit_book.html:27
 msgid "Metadata"
@@ -519,7 +519,7 @@ msgstr ""
 
 #: bookwyrm/templates/lists/edit_form.html:5
 msgid "Edit List"
-msgstr ""
+msgstr "Modifier la liste"
 
 #: bookwyrm/templates/lists/form.html:18
 msgid "List curation:"
@@ -739,7 +739,7 @@ msgstr ""
 
 #: bookwyrm/templates/preferences/edit_user.html:4
 msgid "Edit Profile"
-msgstr ""
+msgstr "Modifier le profil"
 
 #: bookwyrm/templates/preferences/edit_user.html:14
 msgid "Avatar:"
@@ -1192,7 +1192,7 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/readthrough.html:57
 msgid "Edit read dates"
-msgstr ""
+msgstr "Modifier les date de lecture"
 
 #: bookwyrm/templates/snippets/readthrough_form.html:7
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:19
@@ -1355,7 +1355,7 @@ msgstr ""
 
 #: bookwyrm/templates/user/edit_shelf_form.html:5
 msgid "Edit Shelf"
-msgstr ""
+msgstr "Modifier l’étagère"
 
 #: bookwyrm/templates/user/edit_shelf_form.html:26
 msgid "Update shelf"
@@ -1385,7 +1385,7 @@ msgstr ""
 
 #: bookwyrm/templates/user/user.html:13
 msgid "Edit profile"
-msgstr ""
+msgstr "Modifier le profil"
 
 #: bookwyrm/templates/user/user.html:24
 #: bookwyrm/templates/user/user_layout.html:66

From 5e0a1749f33b1c8448f1949227cc2ba3ab13434f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Feb 2021 11:47:30 -0800
Subject: [PATCH 0120/1285] Fixes csrf failure logging on from multiple tabs

---
 bookwyrm/views/authentication.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bookwyrm/views/authentication.py b/bookwyrm/views/authentication.py
index a74febca..5d2ebc67 100644
--- a/bookwyrm/views/authentication.py
+++ b/bookwyrm/views/authentication.py
@@ -6,6 +6,7 @@ from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils import timezone
 from django.utils.decorators import method_decorator
+from django.views.decorators.csrf import csrf_exempt
 from django.views import View
 
 from bookwyrm import forms, models
@@ -13,6 +14,7 @@ from bookwyrm.settings import DOMAIN
 
 
 # pylint: disable= no-self-use
+@method_decorator(csrf_exempt, name='dispatch')
 class Login(View):
     ''' authenticate an existing user '''
     def get(self, request):
@@ -29,6 +31,8 @@ class Login(View):
 
     def post(self, request):
         ''' authentication action '''
+        if request.user.is_authenticated:
+            return redirect('/')
         login_form = forms.LoginForm(request.POST)
 
         localname = login_form.data['localname']

From 70ef940def4e36c578ac8ead44acefd5d04be1a9 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sun, 28 Feb 2021 22:07:44 +0100
Subject: [PATCH 0121/1285] Add French translations that can be tricky:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Add strings which need narrow non-breakable space.
- Add strings about “privacy� (“confidentialité� from Mastodon).
- Add strings about “curation� (“modération�).
- Add strings about “follower� (“abonné� from Mastodon).
- Add strings for “ reading goal� (“défi lecture�).
---
 locale/fr_FR/LC_MESSAGES/django.po | 190 +++++++++++++++--------------
 1 file changed, 97 insertions(+), 93 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 74c68519..e5d94ecd 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -45,15 +45,15 @@ msgstr ""
 
 #: bookwyrm/templates/book.html:58
 msgid "ISBN:"
-msgstr ""
+msgstr "ISBN :"
 
 #: bookwyrm/templates/book.html:65 bookwyrm/templates/edit_book.html:104
 msgid "OCLC Number:"
-msgstr ""
+msgstr "Numéro OCLC :"
 
 #: bookwyrm/templates/book.html:72 bookwyrm/templates/edit_book.html:108
 msgid "ASIN:"
-msgstr ""
+msgstr "ASIN :"
 
 #: bookwyrm/templates/book.html:84
 msgid "View on OpenLibrary"
@@ -62,7 +62,7 @@ msgstr ""
 #: bookwyrm/templates/book.html:102 bookwyrm/templates/edit_book.html:36
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
-msgstr ""
+msgstr "Description :"
 
 #: bookwyrm/templates/book.html:106 bookwyrm/templates/edit_author.html:75
 #: bookwyrm/templates/edit_book.html:117 bookwyrm/templates/lists/form.html:42
@@ -122,7 +122,7 @@ msgstr ""
 #: bookwyrm/templates/discover/about.html:13
 #: bookwyrm/templates/discover/about.html:29
 msgid "Privacy Policy"
-msgstr ""
+msgstr "Politique de vie privée"
 
 #: bookwyrm/templates/discover/discover.html:6
 msgid "Recent Books"
@@ -156,11 +156,11 @@ msgstr ""
 
 #: bookwyrm/templates/edit_author.html:10 bookwyrm/templates/edit_book.html:10
 msgid "Added:"
-msgstr ""
+msgstr "AJouté :"
 
 #: bookwyrm/templates/edit_author.html:11 bookwyrm/templates/edit_book.html:11
 msgid "Updated:"
-msgstr ""
+msgstr "Mis à jour :"
 
 #: bookwyrm/templates/edit_author.html:12 bookwyrm/templates/edit_book.html:12
 msgid "Last edited by:"
@@ -174,23 +174,23 @@ msgstr ""
 #: bookwyrm/templates/user/create_shelf_form.html:13
 #: bookwyrm/templates/user/edit_shelf_form.html:14
 msgid "Name:"
-msgstr ""
+msgstr "Nom :"
 
 #: bookwyrm/templates/edit_author.html:34
 msgid "Bio:"
-msgstr ""
+msgstr "Bio :"
 
 #: bookwyrm/templates/edit_author.html:39
 msgid "Wikipedia link:"
-msgstr ""
+msgstr "Wikipedia :"
 
 #: bookwyrm/templates/edit_author.html:44
 msgid "Birth date:"
-msgstr ""
+msgstr "Date de naissance :"
 
 #: bookwyrm/templates/edit_author.html:49
 msgid "Death date:"
-msgstr ""
+msgstr "Date de décès :"
 
 #: bookwyrm/templates/edit_author.html:55
 msgid "Author Identifiers"
@@ -198,15 +198,15 @@ msgstr ""
 
 #: bookwyrm/templates/edit_author.html:56 bookwyrm/templates/edit_book.html:100
 msgid "Openlibrary key:"
-msgstr ""
+msgstr "Clé Openlibrary :"
 
 #: bookwyrm/templates/edit_author.html:61
 msgid "Librarything key:"
-msgstr ""
+msgstr "Clé Librarything :"
 
 #: bookwyrm/templates/edit_author.html:66
 msgid "Goodreads key:"
-msgstr ""
+msgstr "Clé Goodreads :"
 
 #: bookwyrm/templates/edit_author.html:76 bookwyrm/templates/edit_book.html:118
 msgid "Cancel"
@@ -215,27 +215,27 @@ msgstr ""
 #: bookwyrm/templates/edit_book.html:28
 #: bookwyrm/templates/snippets/create_status_form.html:10
 msgid "Title:"
-msgstr ""
+msgstr "Titre :"
 
 #: bookwyrm/templates/edit_book.html:32
 msgid "Subtitle:"
-msgstr ""
+msgstr "Sous‑titre :"
 
 #: bookwyrm/templates/edit_book.html:40
 msgid "Series:"
-msgstr ""
+msgstr "Série :"
 
 #: bookwyrm/templates/edit_book.html:44
 msgid "Series number:"
-msgstr ""
+msgstr "Numéro dans la série :"
 
 #: bookwyrm/templates/edit_book.html:48
 msgid "First published date:"
-msgstr ""
+msgstr "Première date de publication :"
 
 #: bookwyrm/templates/edit_book.html:52
 msgid "Published date:"
-msgstr ""
+msgstr "Date de publication :"
 
 #: bookwyrm/templates/edit_book.html:65
 #: bookwyrm/templates/snippets/shelf.html:9
@@ -248,11 +248,11 @@ msgstr ""
 
 #: bookwyrm/templates/edit_book.html:76
 msgid "Format:"
-msgstr ""
+msgstr "Format :"
 
 #: bookwyrm/templates/edit_book.html:84
 msgid "Pages:"
-msgstr ""
+msgstr "Pages :"
 
 #: bookwyrm/templates/edit_book.html:91
 msgid "Book Identifiers"
@@ -260,11 +260,11 @@ msgstr ""
 
 #: bookwyrm/templates/edit_book.html:92
 msgid "ISBN 13:"
-msgstr ""
+msgstr "ISBN 13 :"
 
 #: bookwyrm/templates/edit_book.html:96
 msgid "ISBN 10:"
-msgstr ""
+msgstr "ISBN 10 :"
 
 #: bookwyrm/templates/editions.html:6
 #, python-format
@@ -277,7 +277,7 @@ msgstr ""
 
 #: bookwyrm/templates/error.html:7
 msgid "Something went wrong! Sorry about that."
-msgstr ""
+msgstr "Une erreur s’est produite ; désolé !"
 
 #: bookwyrm/templates/feed/direct_messages.html:7
 msgid "All messages"
@@ -325,7 +325,7 @@ msgstr ""
 #: bookwyrm/templates/feed/feed_layout.html:68
 #, python-format
 msgid "%(year)s Reading Goal"
-msgstr ""
+msgstr "Défi lecture pour %(year)s"
 
 #: bookwyrm/templates/feed/status.html:7
 msgid "Back"
@@ -343,11 +343,13 @@ msgid ""
 "Set a goal for how many books you'll finish reading in %(year)s, and track "
 "your progress throughout the year."
 msgstr ""
+"Définissez un nombre de livre à lire comme objectif pour %(year)s, et suivez"
+"votre progrès au fil de l’année."
 
 #: bookwyrm/templates/goal.html:38
 #, python-format
 msgid "%(name)s hasn't set a reading goal for %(year)s."
-msgstr ""
+msgstr "%(name)s n’a aucun défi lecture pour %(year)s."
 
 #: bookwyrm/templates/import.html:6
 msgid "Import Books"
@@ -363,7 +365,7 @@ msgstr ""
 
 #: bookwyrm/templates/import.html:34
 msgid "Privacy setting for imported reviews:"
-msgstr ""
+msgstr "Confidentialité des critiques importées :"
 
 #: bookwyrm/templates/import.html:38
 msgid "Import"
@@ -383,11 +385,11 @@ msgstr ""
 
 #: bookwyrm/templates/import_status.html:10
 msgid "Import started:"
-msgstr ""
+msgstr "Importation en cours :"
 
 #: bookwyrm/templates/import_status.html:14
 msgid "Import completed:"
-msgstr ""
+msgstr "Importation terminé :"
 
 #: bookwyrm/templates/import_status.html:17
 msgid "TASK FAILED"
@@ -399,7 +401,7 @@ msgstr ""
 
 #: bookwyrm/templates/import_status.html:25
 msgid "(Hit reload to update!)"
-msgstr ""
+msgstr "(Rechargez la page pour mettre à jour !"
 
 #: bookwyrm/templates/import_status.html:32
 msgid "Failed to load"
@@ -446,7 +448,7 @@ msgstr ""
 
 #: bookwyrm/templates/invite.html:19
 msgid "Sorry! This invite code is no longer valid."
-msgstr ""
+msgstr "Cette invitation n’est plus valide ; désolé !"
 
 #: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
 #: bookwyrm/templates/lists/list.html:62
@@ -474,7 +476,7 @@ msgstr ""
 #: bookwyrm/templates/login.html:15
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
-msgstr ""
+msgstr "Nom d’utilisateur :"
 
 #: bookwyrm/templates/layout.html:152 bookwyrm/templates/login.html:8
 #: bookwyrm/templates/login.html:31
@@ -503,7 +505,7 @@ msgstr ""
 
 #: bookwyrm/templates/lists/curate.html:9
 msgid "You're all set!"
-msgstr ""
+msgstr "Aucun livre en attente de validation !"
 
 #: bookwyrm/templates/lists/curate.html:15
 msgid "Suggested by"
@@ -523,7 +525,7 @@ msgstr "Modifier la liste"
 
 #: bookwyrm/templates/lists/form.html:18
 msgid "List curation:"
-msgstr ""
+msgstr "Modération de la liste :"
 
 #: bookwyrm/templates/lists/form.html:21
 msgid "Closed"
@@ -535,7 +537,7 @@ msgstr ""
 
 #: bookwyrm/templates/lists/form.html:26
 msgid "Curated"
-msgstr ""
+msgstr "Modérée"
 
 #: bookwyrm/templates/lists/form.html:27
 msgid "Anyone can suggest books, subject to your approval"
@@ -597,7 +599,7 @@ msgstr ""
 #: bookwyrm/templates/lists/list_items.html:19
 #: bookwyrm/templates/lists/list_layout.html:9
 msgid "Created and curated by"
-msgstr ""
+msgstr "Créée et modérée par"
 
 #: bookwyrm/templates/lists/list_items.html:19
 #: bookwyrm/templates/lists/list_layout.html:9
@@ -615,11 +617,11 @@ msgstr ""
 #: bookwyrm/templates/login.html:21 bookwyrm/templates/password_reset.html:15
 #: bookwyrm/templates/snippets/register_form.html:22
 msgid "Password:"
-msgstr ""
+msgstr "Mot de passe :"
 
 #: bookwyrm/templates/login.html:34
 msgid "Forgot your password?"
-msgstr ""
+msgstr "Mot de passe oublié ?"
 
 #: bookwyrm/templates/login.html:47
 msgid "Contact an administrator to get an invite"
@@ -635,7 +637,7 @@ msgstr ""
 
 #: bookwyrm/templates/notfound.html:7
 msgid "The page your requested doesn't seem to exist!"
-msgstr ""
+msgstr "Il semblerait que la page que vous avez demandée n’existe pas !"
 
 #: bookwyrm/templates/notifications.html:11
 msgid "Delete notifications"
@@ -660,11 +662,11 @@ msgstr ""
 
 #: bookwyrm/templates/notifications.html:54
 msgid "followed you"
-msgstr ""
+msgstr "s’est abonné(e)"
 
 #: bookwyrm/templates/notifications.html:57
 msgid "sent you a follow request"
-msgstr ""
+msgstr "vous a envoyé une demande d’abonnement"
 
 #: bookwyrm/templates/notifications.html:62
 #, python-format
@@ -686,7 +688,7 @@ msgstr ""
 
 #: bookwyrm/templates/notifications.html:99
 msgid "You're all caught up!"
-msgstr ""
+msgstr "Aucune nouvelle notification !"
 
 #: bookwyrm/templates/password_reset.html:8
 #: bookwyrm/templates/password_reset_request.html:8
@@ -696,7 +698,7 @@ msgstr ""
 #: bookwyrm/templates/password_reset.html:21
 #: bookwyrm/templates/preferences/change_password.html:15
 msgid "Confirm password:"
-msgstr ""
+msgstr "Confirmez le mot de passe :"
 
 #: bookwyrm/templates/password_reset.html:28
 msgid "Confirm"
@@ -710,7 +712,7 @@ msgstr ""
 #: bookwyrm/templates/preferences/edit_user.html:35
 #: bookwyrm/templates/snippets/register_form.html:13
 msgid "Email address:"
-msgstr ""
+msgstr "Adresse email :"
 
 #: bookwyrm/templates/password_reset_request.html:21
 msgid "Reset password"
@@ -730,7 +732,7 @@ msgstr ""
 
 #: bookwyrm/templates/preferences/change_password.html:11
 msgid "New password:"
-msgstr ""
+msgstr "Nouveau mot de passe :"
 
 #: bookwyrm/templates/preferences/change_password.html:18
 #: bookwyrm/templates/preferences/preferences_layout.html:17
@@ -743,19 +745,19 @@ msgstr "Modifier le profil"
 
 #: bookwyrm/templates/preferences/edit_user.html:14
 msgid "Avatar:"
-msgstr ""
+msgstr "Avatar :"
 
 #: bookwyrm/templates/preferences/edit_user.html:21
 msgid "Display name:"
-msgstr ""
+msgstr "Nom affiché :"
 
 #: bookwyrm/templates/preferences/edit_user.html:28
 msgid "Summary:"
-msgstr ""
+msgstr "Résumé :"
 
 #: bookwyrm/templates/preferences/edit_user.html:43
 msgid "Manually approve followers:"
-msgstr ""
+msgstr "Autoriser les abonnements manuellement :"
 
 #: bookwyrm/templates/preferences/preferences_layout.html:11
 msgid "Account"
@@ -789,7 +791,7 @@ msgstr ""
 
 #: bookwyrm/templates/search_results.html:30
 msgid "Didn't find what you were looking for?"
-msgstr ""
+msgstr "Vous n’avez pas trouvé ce que vous cherchiez ?"
 
 #: bookwyrm/templates/search_results.html:53
 msgid "Import book"
@@ -870,11 +872,11 @@ msgstr ""
 
 #: bookwyrm/templates/settings/manage_invites.html:13
 msgid "Expiry:"
-msgstr ""
+msgstr "Expiration :"
 
 #: bookwyrm/templates/settings/manage_invites.html:19
 msgid "Use limit:"
-msgstr ""
+msgstr "Limiter à :"
 
 #: bookwyrm/templates/settings/manage_invites.html:26
 msgid "Create Invite"
@@ -902,55 +904,55 @@ msgstr ""
 
 #: bookwyrm/templates/settings/site.html:12
 msgid "Instance Name:"
-msgstr ""
+msgstr "Nom de l’instance :"
 
 #: bookwyrm/templates/settings/site.html:16
 msgid "Tagline:"
-msgstr ""
+msgstr "Slogan :"
 
 #: bookwyrm/templates/settings/site.html:20
 msgid "Instance description:"
-msgstr ""
+msgstr "Description de l’instance :"
 
 #: bookwyrm/templates/settings/site.html:24
 msgid "Code of conduct:"
-msgstr ""
+msgstr "Code de conduite :"
 
 #: bookwyrm/templates/settings/site.html:28
 msgid "Privacy Policy:"
-msgstr ""
+msgstr "Politique de vie privée :"
 
 #: bookwyrm/templates/settings/site.html:39
 msgid "Logo:"
-msgstr ""
+msgstr "Logo :"
 
 #: bookwyrm/templates/settings/site.html:43
 msgid "Logo small:"
-msgstr ""
+msgstr "Logo réduit :"
 
 #: bookwyrm/templates/settings/site.html:47
 msgid "Favicon:"
-msgstr ""
+msgstr "Favicon :"
 
 #: bookwyrm/templates/settings/site.html:58
 msgid "Support link:"
-msgstr ""
+msgstr "URL pour soutenir l’instance :"
 
 #: bookwyrm/templates/settings/site.html:62
 msgid "Support title:"
-msgstr ""
+msgstr "Titre pour soutenir l’instance :"
 
 #: bookwyrm/templates/settings/site.html:66
 msgid "Admin email:"
-msgstr ""
+msgstr "Email de l’administrateur :"
 
 #: bookwyrm/templates/settings/site.html:76
 msgid "Allow registration:"
-msgstr ""
+msgstr "Autoriser l’enregistrement :"
 
 #: bookwyrm/templates/settings/site.html:80
 msgid "Registration closed text:"
-msgstr ""
+msgstr "Texte affiché lorsque les enregistrements sont clos :"
 
 #: bookwyrm/templates/snippets/block_button.html:5
 msgid "Block"
@@ -974,11 +976,11 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/content_warning_field.html:3
 msgid "Spoiler alert:"
-msgstr ""
+msgstr "Alerte Spoiler :"
 
 #: bookwyrm/templates/snippets/content_warning_field.html:4
 msgid "Spoilers ahead!"
-msgstr ""
+msgstr "Attention spoilers !"
 
 #: bookwyrm/templates/snippets/create_status.html:8
 msgid "Review"
@@ -1005,7 +1007,7 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/create_status_form.html:44
 msgid "Comment:"
-msgstr ""
+msgstr "Commentaire :"
 
 #: bookwyrm/templates/snippets/create_status_form.html:59
 #: bookwyrm/templates/snippets/privacy-icons.html:15
@@ -1020,7 +1022,7 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:4
 msgid "Delete these read dates?"
-msgstr ""
+msgstr "Supprimer ces dates de lecture ?"
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
 #, python-format
@@ -1048,19 +1050,19 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/follow_button.html:6
 msgid "Follow request already sent."
-msgstr ""
+msgstr "Demande d’abonnement déjà envoyée"
 
 #: bookwyrm/templates/snippets/follow_button.html:19
 msgid "Send follow request"
-msgstr ""
+msgstr "Envoyer une demande d’abonnement"
 
 #: bookwyrm/templates/snippets/follow_button.html:21
 msgid "Follow"
-msgstr ""
+msgstr "S’abonner"
 
 #: bookwyrm/templates/snippets/follow_button.html:27
 msgid "Unfollow"
-msgstr ""
+msgstr "Se désabonner"
 
 #: bookwyrm/templates/snippets/follow_request_buttons.html:8
 msgid "Accept"
@@ -1069,7 +1071,7 @@ msgstr ""
 #: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
 msgid "%(year)s reading goal"
-msgstr ""
+msgstr "Défi lecture pour %(year)s"
 
 #: bookwyrm/templates/snippets/goal_card.html:21
 msgid "Dismiss message"
@@ -1081,10 +1083,12 @@ msgid ""
 "You can set or change your reading goal any time from your <a href=\"%(path)s"
 "\">profile page</a>"
 msgstr ""
+"Vous pouvez définir ou changer vore défi lecture à n’importe quel moment"
+"depuis votre <a href=\"%(path)s\">profil</a>"
 
 #: bookwyrm/templates/snippets/goal_form.html:9
 msgid "Reading goal:"
-msgstr ""
+msgstr "Défi lecture :"
 
 #: bookwyrm/templates/snippets/goal_form.html:14
 msgid "books"
@@ -1092,7 +1096,7 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/goal_form.html:19
 msgid "Goal privacy:"
-msgstr ""
+msgstr "Confidentialité du défi :"
 
 #: bookwyrm/templates/snippets/goal_form.html:26
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37
@@ -1103,16 +1107,16 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/goal_form.html:30
 msgid "Set goal"
-msgstr ""
+msgstr "Valider ce défi"
 
 #: bookwyrm/templates/snippets/goal_progress.html:5
 msgid "Success!"
-msgstr ""
+msgstr "Bravo !"
 
 #: bookwyrm/templates/snippets/goal_progress.html:7
 #, python-format
 msgid "%(percent)s%% complete!"
-msgstr ""
+msgstr "%(percent)s%% terminé !"
 
 #: bookwyrm/templates/snippets/pagination.html:7
 msgid "Previous"
@@ -1136,20 +1140,20 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/privacy-icons.html:12
 msgid "Followers-only"
-msgstr ""
+msgstr "Abonnements seulement"
 
 #: bookwyrm/templates/snippets/privacy_select.html:6
 msgid "Post privacy"
-msgstr ""
+msgstr "Confidentialité du Message"
 
 #: bookwyrm/templates/snippets/privacy_select.html:16
 #: bookwyrm/templates/user/followers.html:17
 msgid "Followers"
-msgstr ""
+msgstr "Abonnements"
 
 #: bookwyrm/templates/snippets/progress_update.html:6
 msgid "Progress:"
-msgstr ""
+msgstr "Progrès :"
 
 #: bookwyrm/templates/snippets/progress_update.html:16
 #: bookwyrm/templates/snippets/readthrough_form.html:22
@@ -1176,7 +1180,7 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/readthrough.html:7
 msgid "Progress Updates:"
-msgstr ""
+msgstr "Progrès en cours :"
 
 #: bookwyrm/templates/snippets/readthrough.html:11
 msgid "finished"
@@ -1364,16 +1368,16 @@ msgstr ""
 #: bookwyrm/templates/user/followers.html:30
 #, python-format
 msgid "%(username)s has no followers"
-msgstr ""
+msgstr "%(username)s n’a pas d’abonné(e)"
 
 #: bookwyrm/templates/user/following.html:17
 msgid "Following"
-msgstr ""
+msgstr "Abonné(e) à"
 
 #: bookwyrm/templates/user/following.html:30
 #, python-format
 msgid "%(username)s isn't following any users"
-msgstr ""
+msgstr "%(username)s n’est abonné(e) à personne"
 
 #: bookwyrm/templates/user/lists.html:28
 msgid "Create list"
@@ -1405,7 +1409,7 @@ msgstr ""
 #: bookwyrm/templates/user/user.html:54
 #, python-format
 msgid "Set a reading goal for %(year)s"
-msgstr ""
+msgstr "Définir un défi lecture pour %(year)s"
 
 #: bookwyrm/templates/user/user.html:60
 msgid "User Activity"
@@ -1417,11 +1421,11 @@ msgstr ""
 
 #: bookwyrm/templates/user/user.html:74
 msgid "No activities yet!"
-msgstr ""
+msgstr "Aucune activité pour l’instant !"
 
 #: bookwyrm/templates/user/user_layout.html:30
 msgid "Follow Requests"
-msgstr ""
+msgstr "Demandes d’abonnement"
 
 #: bookwyrm/templates/user/user_layout.html:48
 msgid "Activity"
@@ -1429,7 +1433,7 @@ msgstr ""
 
 #: bookwyrm/templates/user/user_layout.html:54
 msgid "Reading Goal"
-msgstr ""
+msgstr "Défi lecture"
 
 #: bookwyrm/templates/user/user_preview.html:13
 #, python-format

From 3ecdc8f93e7ef0078587d4a0244985d269583a63 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Feb 2021 13:40:57 -0800
Subject: [PATCH 0122/1285] Track last edited by on partial edits

---
 bookwyrm/views/books.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index e05c4726..6d55676c 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -163,6 +163,7 @@ def upload_cover(request, book_id):
     if not form.is_valid():
         return redirect('/book/%d' % book.id)
 
+    book.last_edited_by = request.user
     book.cover = form.files['cover']
     book.save()
 
@@ -182,6 +183,7 @@ def add_description(request, book_id):
     description = request.POST.get('description')
 
     book.description = description
+    book.last_edited_by = request.user
     book.save()
 
     return redirect('/book/%s' % book.id)

From 54687b7b358bdbd957feda7bb01c96e8bd4f2db4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Feb 2021 13:45:49 -0800
Subject: [PATCH 0123/1285] Make users editors by default

---
 bookwyrm/models/user.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index f137236c..21ef8dd2 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -3,7 +3,7 @@ import re
 from urllib.parse import urlparse
 
 from django.apps import apps
-from django.contrib.auth.models import AbstractUser
+from django.contrib.auth.models import AbstractUser, Group
 from django.core.validators import MinValueValidator
 from django.db import models
 from django.utils import timezone
@@ -208,6 +208,9 @@ class User(OrderedCollectionPageMixin, AbstractUser):
         # an id needs to be set before we can proceed with related models
         super().save(*args, **kwargs)
 
+        # make users editors by default
+        self.groups.add(Group.objects.get(name='editor'))
+
         # create keys and shelves for new local users
         self.key_pair = KeyPair.objects.create(
             remote_id='%s/#main-key' % self.remote_id)

From 35195271e2aa1350e7f31c39faa1d121cca7da96 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Mon, 1 Mar 2021 00:41:49 +0100
Subject: [PATCH 0124/1285] Add French translations.

---
 locale/fr_FR/LC_MESSAGES/django.po | 449 +++++++++++++++--------------
 1 file changed, 227 insertions(+), 222 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index e5d94ecd..fdf9d4ff 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -20,16 +20,16 @@ msgstr ""
 
 #: bookwyrm/templates/author.html:13 bookwyrm/templates/author.html:14
 msgid "Edit Author"
-msgstr "Modifier l’auteur"
+msgstr "Modifier l’auteur ou autrice"
 
 #: bookwyrm/templates/author.html:29
 msgid "Wikipedia"
-msgstr ""
+msgstr "Wikipedia"
 
 #: bookwyrm/templates/author.html:34
 #, python-format
 msgid "Books by %(name)s"
-msgstr ""
+msgstr Livres par %(name)s
 
 #: bookwyrm/templates/book.html:27 bookwyrm/templates/book.html:28
 msgid "Edit Book"
@@ -37,11 +37,11 @@ msgstr "Modifier le livre"
 
 #: bookwyrm/templates/book.html:43
 msgid "Add cover"
-msgstr ""
+msgstr "Ajouter une couverture"
 
 #: bookwyrm/templates/book.html:49 bookwyrm/templates/lists/list.html:89
 msgid "Add"
-msgstr ""
+msgstr "Ajouter"
 
 #: bookwyrm/templates/book.html:58
 msgid "ISBN:"
@@ -57,7 +57,7 @@ msgstr "ASIN :"
 
 #: bookwyrm/templates/book.html:84
 msgid "View on OpenLibrary"
-msgstr ""
+msgstr "Voir sur OpenLibrary"
 
 #: bookwyrm/templates/book.html:102 bookwyrm/templates/edit_book.html:36
 #: bookwyrm/templates/lists/form.html:12
@@ -73,51 +73,51 @@ msgstr "Description :"
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
 msgid "Save"
-msgstr ""
+msgstr "Enregistrer"
 
 #: bookwyrm/templates/book.html:138
 msgid "Your reading activity"
-msgstr ""
+msgstr "Votre activité de lecture"
 
 #: bookwyrm/templates/book.html:144
 msgid "You don't have any reading activity for this book."
-msgstr ""
+msgstr "Vous n’avez aucune activité de lecture pour ce livre"
 
 #: bookwyrm/templates/book.html:151
 msgid "Create"
-msgstr ""
+msgstr "Créer"
 
 #: bookwyrm/templates/book.html:172
 msgid "Tags"
-msgstr ""
+msgstr "Tags"
 
 #: bookwyrm/templates/book.html:176 bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
-msgstr ""
+msgstr "Ajouter un tag"
 
 #: bookwyrm/templates/book.html:193
 msgid "Subjects"
-msgstr ""
+msgstr "Sujets"
 
 #: bookwyrm/templates/book.html:204
 msgid "Places"
-msgstr ""
+msgstr "Lieux"
 
 #: bookwyrm/templates/book.html:215 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:6
 #: bookwyrm/templates/search_results.html:85
 #: bookwyrm/templates/user/user_layout.html:60
 msgid "Lists"
-msgstr ""
+msgstr "Listes"
 
 #: bookwyrm/templates/book.html:244
 msgid "rated it"
-msgstr ""
+msgstr "l’a noté"
 
 #: bookwyrm/templates/discover/about.html:10
 #: bookwyrm/templates/discover/about.html:20
 msgid "Code of Conduct"
-msgstr ""
+msgstr "Code de conduite"
 
 #: bookwyrm/templates/discover/about.html:13
 #: bookwyrm/templates/discover/about.html:29
@@ -126,33 +126,33 @@ msgstr "Politique de vie privée"
 
 #: bookwyrm/templates/discover/discover.html:6
 msgid "Recent Books"
-msgstr ""
+msgstr "Livres récents"
 
 #: bookwyrm/templates/discover/landing_layout.html:15
 msgid "Decentralized"
-msgstr ""
+msgstr "Décentralisé"
 
 #: bookwyrm/templates/discover/landing_layout.html:21
 msgid "Friendly"
-msgstr ""
+msgstr "Sympa"
 
 #: bookwyrm/templates/discover/landing_layout.html:27
 msgid "Anti-Corporate"
-msgstr ""
+msgstr "Anti‑commercial"
 
 #: bookwyrm/templates/discover/landing_layout.html:42
 #, python-format
 msgid "Join %(name)s"
-msgstr ""
+msgstr "Rejoignez %(name)s"
 
 #: bookwyrm/templates/discover/landing_layout.html:47
 #: bookwyrm/templates/login.html:46
 msgid "This instance is closed"
-msgstr ""
+msgstr "Cette instance est fermée"
 
 #: bookwyrm/templates/discover/landing_layout.html:53
 msgid "Your Account"
-msgstr ""
+msgstr "Votre compte"
 
 #: bookwyrm/templates/edit_author.html:10 bookwyrm/templates/edit_book.html:10
 msgid "Added:"
@@ -168,7 +168,7 @@ msgstr "Dernière modification par :"
 
 #: bookwyrm/templates/edit_author.html:28 bookwyrm/templates/edit_book.html:27
 msgid "Metadata"
-msgstr ""
+msgstr "Métadonnées"
 
 #: bookwyrm/templates/edit_author.html:29 bookwyrm/templates/lists/form.html:8
 #: bookwyrm/templates/user/create_shelf_form.html:13
@@ -194,7 +194,7 @@ msgstr "Date de décès :"
 
 #: bookwyrm/templates/edit_author.html:55
 msgid "Author Identifiers"
-msgstr ""
+msgstr "Identifiants de l’auteur ou autrice"
 
 #: bookwyrm/templates/edit_author.html:56 bookwyrm/templates/edit_book.html:100
 msgid "Openlibrary key:"
@@ -210,7 +210,7 @@ msgstr "Clé Goodreads :"
 
 #: bookwyrm/templates/edit_author.html:76 bookwyrm/templates/edit_book.html:118
 msgid "Cancel"
-msgstr ""
+msgstr "Annuler les modifications"
 
 #: bookwyrm/templates/edit_book.html:28
 #: bookwyrm/templates/snippets/create_status_form.html:10
@@ -240,11 +240,11 @@ msgstr "Date de publication :"
 #: bookwyrm/templates/edit_book.html:65
 #: bookwyrm/templates/snippets/shelf.html:9
 msgid "Cover"
-msgstr ""
+msgstr "Couverture"
 
 #: bookwyrm/templates/edit_book.html:75
 msgid "Physical Properties"
-msgstr ""
+msgstr "Propriétés physiques"
 
 #: bookwyrm/templates/edit_book.html:76
 msgid "Format:"
@@ -256,7 +256,7 @@ msgstr "Pages :"
 
 #: bookwyrm/templates/edit_book.html:91
 msgid "Book Identifiers"
-msgstr ""
+msgstr "Identifiants du livre"
 
 #: bookwyrm/templates/edit_book.html:92
 msgid "ISBN 13:"
@@ -269,11 +269,11 @@ msgstr "ISBN 10 :"
 #: bookwyrm/templates/editions.html:6
 #, python-format
 msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
-msgstr ""
+msgstr "Éditions de <a href=\"%(work_path)s\">« %(work_title)s »</a>"
 
 #: bookwyrm/templates/error.html:6
 msgid "Server Error"
-msgstr ""
+msgstr "Erreur côté serveur"
 
 #: bookwyrm/templates/error.html:7
 msgid "Something went wrong! Sorry about that."
@@ -281,46 +281,48 @@ msgstr "Une erreur s’est produite ; désolé !"
 
 #: bookwyrm/templates/feed/direct_messages.html:7
 msgid "All messages"
-msgstr ""
+msgstr "Tous les messages"
 
 #: bookwyrm/templates/feed/direct_messages.html:16
 msgid "You have no messages right now."
-msgstr ""
+msgstr "Vous n’avez aucun message pour l’instant."
 
 #: bookwyrm/templates/feed/feed.html:6
 #, python-format
 msgid "%(tab_title)s Timeline"
-msgstr ""
+msgstr "%(tab_title)s — Fil d’actualité"
 
 #: bookwyrm/templates/feed/feed.html:10
 msgid "Home"
-msgstr ""
+msgstr "Accueil"
 
 #: bookwyrm/templates/feed/feed.html:13
 msgid "Local"
-msgstr ""
+msgstr "Local"
 
 #: bookwyrm/templates/feed/feed.html:16
 msgid "Federated"
-msgstr ""
+msgstr "Fédéré"
 
 #: bookwyrm/templates/feed/feed.html:24
 msgid "Announcements"
-msgstr ""
+msgstr "Annonces"
 
 #: bookwyrm/templates/feed/feed.html:32
 msgid ""
 "There aren't any activities right now! Try following a user to get started"
 msgstr ""
+"Aucune activité pour l’instant ! Abonnez‑vous à quelqu’un pour commencer"
 
 #: bookwyrm/templates/feed/feed_layout.html:9
 msgid "Your books"
-msgstr ""
+msgstr "Vos livres"
 
 #: bookwyrm/templates/feed/feed_layout.html:11
 msgid ""
 "There are no books here right now! Try searching for a book to get started"
 msgstr ""
+"Aucun livre ici pour l’instant ! Cherchez un livre pour commencer"
 
 #: bookwyrm/templates/feed/feed_layout.html:68
 #, python-format
@@ -329,12 +331,12 @@ msgstr "Défi lecture pour %(year)s"
 
 #: bookwyrm/templates/feed/status.html:7
 msgid "Back"
-msgstr ""
+msgstr "Retour"
 
 #: bookwyrm/templates/goal.html:7
 #, python-format
 msgid "%(year)s Reading Progress"
-msgstr ""
+msgstr "Progression de lecture pour %(year)s"
 
 #: bookwyrm/templates/goal.html:29
 #: bookwyrm/templates/snippets/goal_card.html:13
@@ -344,7 +346,7 @@ msgid ""
 "your progress throughout the year."
 msgstr ""
 "Définissez un nombre de livre à lire comme objectif pour %(year)s, et suivez"
-"votre progrès au fil de l’année."
+"votre progression au fil de l’année."
 
 #: bookwyrm/templates/goal.html:38
 #, python-format
@@ -353,15 +355,15 @@ msgstr "%(name)s n’a aucun défi lecture pour %(year)s."
 
 #: bookwyrm/templates/import.html:6
 msgid "Import Books"
-msgstr ""
+msgstr "Importer des livres"
 
 #: bookwyrm/templates/import.html:11
 msgid "Data source"
-msgstr ""
+msgstr "Source de données"
 
 #: bookwyrm/templates/import.html:29
 msgid "Include reviews"
-msgstr ""
+msgstr "Importer les critiques"
 
 #: bookwyrm/templates/import.html:34
 msgid "Privacy setting for imported reviews:"
@@ -369,19 +371,19 @@ msgstr "Confidentialité des critiques importées :"
 
 #: bookwyrm/templates/import.html:38
 msgid "Import"
-msgstr ""
+msgstr "Importer"
 
 #: bookwyrm/templates/import.html:43
 msgid "Recent Imports"
-msgstr ""
+msgstr "Importations récentes"
 
 #: bookwyrm/templates/import.html:45
 msgid "No recent imports"
-msgstr ""
+msgstr "Aucune importation récente"
 
 #: bookwyrm/templates/import_status.html:7
 msgid "Import Status"
-msgstr ""
+msgstr "Statut de l’importation"
 
 #: bookwyrm/templates/import_status.html:10
 msgid "Import started:"
@@ -393,11 +395,11 @@ msgstr "Importation terminé :"
 
 #: bookwyrm/templates/import_status.html:17
 msgid "TASK FAILED"
-msgstr ""
+msgstr "la tâche a échoué"
 
 #: bookwyrm/templates/import_status.html:23
 msgid "Import still in progress."
-msgstr ""
+msgstr "L’importation est toujours en cours"
 
 #: bookwyrm/templates/import_status.html:25
 msgid "(Hit reload to update!)"
@@ -405,46 +407,46 @@ msgstr "(Rechargez la page pour mettre à jour !"
 
 #: bookwyrm/templates/import_status.html:32
 msgid "Failed to load"
-msgstr ""
+msgstr "Le chargement a échoué"
 
 #: bookwyrm/templates/import_status.html:56
 msgid "Select all"
-msgstr ""
+msgstr "Tout sélectionner"
 
 #: bookwyrm/templates/import_status.html:59
 msgid "Retry items"
-msgstr ""
+msgstr "Essayer d’importer les objets sélectionnés de nouveau"
 
 #: bookwyrm/templates/import_status.html:81
 msgid "Successfully imported"
-msgstr ""
+msgstr "Importation réussie"
 
 #: bookwyrm/templates/import_status.html:85
 #: bookwyrm/templates/lists/curate.html:14
 msgid "Book"
-msgstr ""
+msgstr "Livre"
 
 #: bookwyrm/templates/import_status.html:88
 #: bookwyrm/templates/snippets/shelf.html:10
 msgid "Title"
-msgstr ""
+msgstr "Titre"
 
 #: bookwyrm/templates/import_status.html:91
 #: bookwyrm/templates/snippets/shelf.html:11
 msgid "Author"
-msgstr ""
+msgstr "Auteur ou autrice"
 
 #: bookwyrm/templates/import_status.html:114
 msgid "Imported"
-msgstr ""
+msgstr "Importé"
 
 #: bookwyrm/templates/invite.html:9 bookwyrm/templates/login.html:41
 msgid "Create an Account"
-msgstr ""
+msgstr "Créer un compte"
 
 #: bookwyrm/templates/invite.html:18
 msgid "Permission Denied"
-msgstr ""
+msgstr "Autorisation refusée"
 
 #: bookwyrm/templates/invite.html:19
 msgid "Sorry! This invite code is no longer valid."
@@ -453,24 +455,24 @@ msgstr "Cette invitation n’est plus valide ; désolé !"
 #: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
 #: bookwyrm/templates/lists/list.html:62
 msgid "Search"
-msgstr ""
+msgstr "Chercher"
 
 #: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48
 msgid "Main navigation menu"
-msgstr ""
+msgstr "Menu de navigation principal "
 
 #: bookwyrm/templates/layout.html:58
 msgid "Your shelves"
-msgstr ""
+msgstr "Vos étagères"
 
 #: bookwyrm/templates/layout.html:61
 msgid "Feed"
-msgstr ""
+msgstr "Fil d’actualité"
 
 #: bookwyrm/templates/layout.html:125 bookwyrm/templates/layout.html:126
 #: bookwyrm/templates/notifications.html:7
 msgid "Notifications"
-msgstr ""
+msgstr "Notifications"
 
 #: bookwyrm/templates/layout.html:143 bookwyrm/templates/layout.html:147
 #: bookwyrm/templates/login.html:15
@@ -481,27 +483,27 @@ msgstr "Nom d’utilisateur :"
 #: bookwyrm/templates/layout.html:152 bookwyrm/templates/login.html:8
 #: bookwyrm/templates/login.html:31
 msgid "Log in"
-msgstr ""
+msgstr "Se connecter"
 
 #: bookwyrm/templates/layout.html:183
 msgid "About this server"
-msgstr ""
+msgstr "À propos de ce serveur"
 
 #: bookwyrm/templates/layout.html:187
 msgid "Contact site admin"
-msgstr ""
+msgstr "Contacter l’administrateur du site"
 
 #: bookwyrm/templates/lists/create_form.html:5
 msgid "Create List"
-msgstr ""
+msgstr "Créer une liste"
 
 #: bookwyrm/templates/lists/curate.html:6
 msgid "Pending Books"
-msgstr ""
+msgstr "Livres en attente de modération"
 
 #: bookwyrm/templates/lists/curate.html:7
 msgid "Go to list"
-msgstr ""
+msgstr "Aller à la liste"
 
 #: bookwyrm/templates/lists/curate.html:9
 msgid "You're all set!"
@@ -509,15 +511,15 @@ msgstr "Aucun livre en attente de validation !"
 
 #: bookwyrm/templates/lists/curate.html:15
 msgid "Suggested by"
-msgstr ""
+msgstr "Suggéré par"
 
 #: bookwyrm/templates/lists/curate.html:35
 msgid "Approve"
-msgstr ""
+msgstr "Approuver"
 
 #: bookwyrm/templates/lists/curate.html:41
 msgid "Discard"
-msgstr ""
+msgstr "Rejeter"
 
 #: bookwyrm/templates/lists/edit_form.html:5
 msgid "Edit List"
@@ -529,11 +531,11 @@ msgstr "Modération de la liste :"
 
 #: bookwyrm/templates/lists/form.html:21
 msgid "Closed"
-msgstr ""
+msgstr "Fermée"
 
 #: bookwyrm/templates/lists/form.html:22
 msgid "Only you can add and remove books to this list"
-msgstr ""
+msgstr "Vous seul(e) pouvez ajouter ou supprimer des livres dans cette liste"
 
 #: bookwyrm/templates/lists/form.html:26
 msgid "Curated"
@@ -541,60 +543,60 @@ msgstr "Modérée"
 
 #: bookwyrm/templates/lists/form.html:27
 msgid "Anyone can suggest books, subject to your approval"
-msgstr ""
+msgstr "N’importe qui peut suggérer des livres, soumis à votre approbation"
 
 #: bookwyrm/templates/lists/form.html:31
 msgid "Open"
-msgstr ""
+msgstr "Ouverte"
 
 #: bookwyrm/templates/lists/form.html:32
 msgid "Anyone can add books to this list"
-msgstr ""
+msgstr "N’importe qui peut suggérer des livres"
 
 #: bookwyrm/templates/lists/list.html:17
 msgid "This list is currently empty"
-msgstr ""
+msgstr "Cette liste est vide actuellement"
 
 #: bookwyrm/templates/lists/list.html:35
 msgid "Added by"
-msgstr ""
+msgstr "Ajouté par"
 
 #: bookwyrm/templates/lists/list.html:41
 msgid "Remove"
-msgstr ""
+msgstr "Supprimer"
 
 #: bookwyrm/templates/lists/list.html:54
 msgid "Add Books"
-msgstr ""
+msgstr "Ajouter des livres"
 
 #: bookwyrm/templates/lists/list.html:54
 msgid "Suggest Books"
-msgstr ""
+msgstr "Suggérer des livres"
 
 #: bookwyrm/templates/lists/list.html:58
 msgid "Search for a book"
-msgstr ""
+msgstr "Chercher un livre"
 
 #: bookwyrm/templates/lists/list.html:63
 msgid "search"
-msgstr ""
+msgstr "Chercher"
 
 #: bookwyrm/templates/lists/list.html:69
 msgid "Clear search"
-msgstr ""
+msgstr "Vider la requête"
 
 #: bookwyrm/templates/lists/list.html:74
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
-msgstr ""
+msgstr "Aucun livre trouvé pour la requête « %(query)s »"
 
 #: bookwyrm/templates/lists/list.html:75
 msgid "No books found"
-msgstr ""
+msgstr "Aucun livre trouvé"
 
 #: bookwyrm/templates/lists/list.html:89
 msgid "Suggest"
-msgstr ""
+msgstr "Suggérer"
 
 #: bookwyrm/templates/lists/list_items.html:19
 #: bookwyrm/templates/lists/list_layout.html:9
@@ -604,15 +606,15 @@ msgstr "Créée et modérée par"
 #: bookwyrm/templates/lists/list_items.html:19
 #: bookwyrm/templates/lists/list_layout.html:9
 msgid "Created by"
-msgstr ""
+msgstr "Créée par"
 
 #: bookwyrm/templates/lists/lists.html:11
 msgid "Your lists"
-msgstr ""
+msgstr "Vos listes"
 
 #: bookwyrm/templates/lists/lists.html:36
 msgid "Recent Lists"
-msgstr ""
+msgstr "Listes récentes"
 
 #: bookwyrm/templates/login.html:21 bookwyrm/templates/password_reset.html:15
 #: bookwyrm/templates/snippets/register_form.html:22
@@ -625,15 +627,15 @@ msgstr "Mot de passe oublié ?"
 
 #: bookwyrm/templates/login.html:47
 msgid "Contact an administrator to get an invite"
-msgstr ""
+msgstr "Contacter un administrateur pour obtenir une invitation"
 
 #: bookwyrm/templates/login.html:57
 msgid "More about this site"
-msgstr ""
+msgstr "En savoir plus sur ce site"
 
 #: bookwyrm/templates/notfound.html:6
 msgid "Not Found"
-msgstr ""
+msgstr "Introuvable"
 
 #: bookwyrm/templates/notfound.html:7
 msgid "The page your requested doesn't seem to exist!"
@@ -641,17 +643,17 @@ msgstr "Il semblerait que la page que vous avez demandée n’existe pas !"
 
 #: bookwyrm/templates/notifications.html:11
 msgid "Delete notifications"
-msgstr ""
+msgstr "Supprimer les notifications"
 
 #: bookwyrm/templates/notifications.html:45
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
-msgstr ""
+msgstr "a ajouté <a href=\"%(related_path)s\">%(preview_name)s</a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:48
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
-msgstr ""
+msgstr "vous a mentionné dans un(e) <a href=\"%(related_path)s\">%(preview_name)s</a>"
 
 #: bookwyrm/templates/notifications.html:51
 #, python-format
@@ -659,6 +661,8 @@ msgid ""
 "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">"
 "%(preview_name)s</a>"
 msgstr ""
+"<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">"
+"%(preview_name)s</a>"
 
 #: bookwyrm/templates/notifications.html:54
 msgid "followed you"
@@ -671,20 +675,20 @@ msgstr "vous a envoyé une demande d’abonnement"
 #: bookwyrm/templates/notifications.html:62
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">%(preview_name)s</a>"
-msgstr ""
+msgstr "a partagé votre <a href=\"%(related_path)s\">%(preview_name)s</a>"
 
 #: bookwyrm/templates/notifications.html:64
 msgid "added"
-msgstr ""
+msgstr "a ajouté"
 
 #: bookwyrm/templates/notifications.html:64
 msgid "suggested adding"
-msgstr ""
+msgstr "a suggéré l’ajout de"
 
 #: bookwyrm/templates/notifications.html:67
 #, python-format
 msgid " your <a href=\"/import/%(related_id)s\">import</a> completed."
-msgstr ""
+msgstr " votre <a href=\"/import/%(related_id)s\">importation</a> est terminée."
 
 #: bookwyrm/templates/notifications.html:99
 msgid "You're all caught up!"
@@ -693,7 +697,7 @@ msgstr "Aucune nouvelle notification !"
 #: bookwyrm/templates/password_reset.html:8
 #: bookwyrm/templates/password_reset_request.html:8
 msgid "Reset Password"
-msgstr ""
+msgstr "Changez le mot de passe"
 
 #: bookwyrm/templates/password_reset.html:21
 #: bookwyrm/templates/preferences/change_password.html:15
@@ -702,11 +706,11 @@ msgstr "Confirmez le mot de passe :"
 
 #: bookwyrm/templates/password_reset.html:28
 msgid "Confirm"
-msgstr ""
+msgstr "Confirmer"
 
 #: bookwyrm/templates/password_reset_request.html:10
 msgid "A link to reset your password will be sent to your email address"
-msgstr ""
+msgstr "Un lien pour changer votre mot de passe sera envoyé à votre addresse email"
 
 #: bookwyrm/templates/password_reset_request.html:14
 #: bookwyrm/templates/preferences/edit_user.html:35
@@ -716,19 +720,19 @@ msgstr "Adresse email :"
 
 #: bookwyrm/templates/password_reset_request.html:21
 msgid "Reset password"
-msgstr ""
+msgstr "Changer de mot de passe"
 
 #: bookwyrm/templates/preferences/blocks.html:5
 msgid "Blocked Users"
-msgstr ""
+msgstr "Comptes bloqués"
 
 #: bookwyrm/templates/preferences/blocks.html:10
 msgid "No users currently blocked."
-msgstr ""
+msgstr "Aucun compte bloqué actuellement"
 
 #: bookwyrm/templates/preferences/change_password.html:4
 msgid "Change Password"
-msgstr ""
+msgstr "Changer le mot de passe"
 
 #: bookwyrm/templates/preferences/change_password.html:11
 msgid "New password:"
@@ -737,7 +741,7 @@ msgstr "Nouveau mot de passe :"
 #: bookwyrm/templates/preferences/change_password.html:18
 #: bookwyrm/templates/preferences/preferences_layout.html:17
 msgid "Change password"
-msgstr ""
+msgstr "Changer le mot de passe"
 
 #: bookwyrm/templates/preferences/edit_user.html:4
 msgid "Edit Profile"
@@ -761,33 +765,33 @@ msgstr "Autoriser les abonnements manuellement :"
 
 #: bookwyrm/templates/preferences/preferences_layout.html:11
 msgid "Account"
-msgstr ""
+msgstr "Compte"
 
 #: bookwyrm/templates/preferences/preferences_layout.html:14
 msgid "Profile"
-msgstr ""
+msgstr "Profil"
 
 #: bookwyrm/templates/preferences/preferences_layout.html:20
 msgid "Relationships"
-msgstr ""
+msgstr "Relations"
 
 #: bookwyrm/templates/preferences/preferences_layout.html:23
 msgid "Blocked users"
-msgstr ""
+msgstr "Comptes bloqués"
 
 #: bookwyrm/templates/search_results.html:6
 #, python-format
 msgid "Search Results for \"%(query)s\""
-msgstr ""
+msgstr "Résultats de recherche pour « %(query)s »"
 
 #: bookwyrm/templates/search_results.html:11
 msgid "Matching Books"
-msgstr ""
+msgstr "Livres correspondants"
 
 #: bookwyrm/templates/search_results.html:14
 #, python-format
 msgid "No books found for \"%(query)s\""
-msgstr ""
+msgstr "Aucun livre trouvé pour « %(query)s »"
 
 #: bookwyrm/templates/search_results.html:30
 msgid "Didn't find what you were looking for?"
@@ -795,80 +799,80 @@ msgstr "Vous n’avez pas trouvé ce que vous cherchiez ?"
 
 #: bookwyrm/templates/search_results.html:53
 msgid "Import book"
-msgstr ""
+msgstr "Importer le livre"
 
 #: bookwyrm/templates/search_results.html:70
 msgid "Matching Users"
-msgstr ""
+msgstr "Comptes correspondants"
 
 #: bookwyrm/templates/search_results.html:72
 #, python-format
 msgid "No users found for \"%(query)s\""
-msgstr ""
+msgstr "Aucun compte trouvé pour « %(query)s »"
 
 #: bookwyrm/templates/search_results.html:87
 #, python-format
 msgid "No lists found for \"%(query)s\""
-msgstr ""
+msgstr "Aucune liste trouvée pour « %(query)s »"
 
 #: bookwyrm/templates/settings/admin_layout.html:12
 msgid "Manage Users"
-msgstr ""
+msgstr "Gérer les comptes"
 
 #: bookwyrm/templates/settings/admin_layout.html:16
 #: bookwyrm/templates/settings/manage_invites.html:3
 msgid "Invites"
-msgstr ""
+msgstr "Invitations"
 
 #: bookwyrm/templates/settings/admin_layout.html:20
 #: bookwyrm/templates/settings/federation.html:3
 msgid "Federated Servers"
-msgstr ""
+msgstr "Serveurs fédérés"
 
 #: bookwyrm/templates/settings/admin_layout.html:25
 msgid "Instance Settings"
-msgstr ""
+msgstr "Paramètres de l’instance"
 
 #: bookwyrm/templates/settings/admin_layout.html:29
 #: bookwyrm/templates/settings/site.html:3
 msgid "Site Configuration"
-msgstr ""
+msgstr "Configuration du site"
 
 #: bookwyrm/templates/settings/admin_layout.html:32
 #: bookwyrm/templates/settings/site.html:10
 msgid "Instance Info"
-msgstr ""
+msgstr "Information sur l’instance"
 
 #: bookwyrm/templates/settings/admin_layout.html:33
 #: bookwyrm/templates/settings/site.html:36
 msgid "Images"
-msgstr ""
+msgstr "Images"
 
 #: bookwyrm/templates/settings/admin_layout.html:34
 #: bookwyrm/templates/settings/site.html:56
 msgid "Footer Content"
-msgstr ""
+msgstr "Contenu du pied de page"
 
 #: bookwyrm/templates/settings/admin_layout.html:35
 #: bookwyrm/templates/settings/site.html:74
 msgid "Registration"
-msgstr ""
+msgstr "Enregistrement"
 
 #: bookwyrm/templates/settings/federation.html:9
 msgid "Server name"
-msgstr ""
+msgstr "Nom du serveur"
 
 #: bookwyrm/templates/settings/federation.html:10
 msgid "Software"
-msgstr ""
+msgstr "Logiciel"
 
 #: bookwyrm/templates/settings/federation.html:11
 msgid "Status"
-msgstr ""
+msgstr "Statut"
 
 #: bookwyrm/templates/settings/manage_invites.html:7
 msgid "Generate New Invite"
-msgstr ""
+msgstr "Générer une nouvelle invitation"
 
 #: bookwyrm/templates/settings/manage_invites.html:13
 msgid "Expiry:"
@@ -880,27 +884,27 @@ msgstr "Limiter à :"
 
 #: bookwyrm/templates/settings/manage_invites.html:26
 msgid "Create Invite"
-msgstr ""
+msgstr "Créer une invitation"
 
 #: bookwyrm/templates/settings/manage_invites.html:33
 msgid "Link"
-msgstr ""
+msgstr "Lien"
 
 #: bookwyrm/templates/settings/manage_invites.html:34
 msgid "Expires"
-msgstr ""
+msgstr "Expiration"
 
 #: bookwyrm/templates/settings/manage_invites.html:35
 msgid "Max uses"
-msgstr ""
+msgstr "Nombre maximum d’utilisations"
 
 #: bookwyrm/templates/settings/manage_invites.html:36
 msgid "Times used"
-msgstr ""
+msgstr "Nombre de fois utilisée"
 
 #: bookwyrm/templates/settings/manage_invites.html:39
 msgid "No active invites"
-msgstr ""
+msgstr "Aucune invitation active"
 
 #: bookwyrm/templates/settings/site.html:12
 msgid "Instance Name:"
@@ -956,23 +960,23 @@ msgstr "Texte affiché lorsque les enregistrements sont clos :"
 
 #: bookwyrm/templates/snippets/block_button.html:5
 msgid "Block"
-msgstr ""
+msgstr "Bloquer"
 
 #: bookwyrm/templates/snippets/block_button.html:10
 msgid "Un-block"
-msgstr ""
+msgstr "Débloquer"
 
 #: bookwyrm/templates/snippets/boost_button.html:8
 #: bookwyrm/templates/snippets/boost_button.html:9
 #: bookwyrm/templates/snippets/status/status_body.html:40
 #: bookwyrm/templates/snippets/status/status_body.html:41
 msgid "Boost status"
-msgstr ""
+msgstr "Partager le statut"
 
 #: bookwyrm/templates/snippets/boost_button.html:16
 #: bookwyrm/templates/snippets/boost_button.html:17
 msgid "Un-boost status"
-msgstr ""
+msgstr "Annuler le partage du statut"
 
 #: bookwyrm/templates/snippets/content_warning_field.html:3
 msgid "Spoiler alert:"
@@ -984,26 +988,26 @@ msgstr "Attention spoilers !"
 
 #: bookwyrm/templates/snippets/create_status.html:8
 msgid "Review"
-msgstr ""
+msgstr "Critique"
 
 #: bookwyrm/templates/snippets/create_status.html:11
 msgid "Comment"
-msgstr ""
+msgstr "Commentaire"
 
 #: bookwyrm/templates/snippets/create_status.html:14
 msgid "Quote"
-msgstr ""
+msgstr "Citation"
 
 #: bookwyrm/templates/snippets/create_status_form.html:21
 #: bookwyrm/templates/snippets/shelf.html:17
 msgid "Rating"
-msgstr ""
+msgstr "Note"
 
 #: bookwyrm/templates/snippets/create_status_form.html:23
 #: bookwyrm/templates/snippets/rate_action.html:14
 #: bookwyrm/templates/snippets/stars.html:3
 msgid "No rating"
-msgstr ""
+msgstr "Aucune note"
 
 #: bookwyrm/templates/snippets/create_status_form.html:44
 msgid "Comment:"
@@ -1014,11 +1018,11 @@ msgstr "Commentaire :"
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:19
 msgid "Private"
-msgstr ""
+msgstr "Privé"
 
 #: bookwyrm/templates/snippets/create_status_form.html:66
 msgid "Post"
-msgstr ""
+msgstr "Publier"
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:4
 msgid "Delete these read dates?"
@@ -1030,23 +1034,24 @@ msgid ""
 "You are deleting this readthrough and its %(count)s associated progress "
 "updates."
 msgstr ""
+"Vous avez supprimé ce résumé et ses %(count)s progressions associées."
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
 #: bookwyrm/templates/snippets/follow_request_buttons.html:13
 msgid "Delete"
-msgstr ""
+msgstr "Supprimer"
 
 #: bookwyrm/templates/snippets/fav_button.html:7
 #: bookwyrm/templates/snippets/fav_button.html:8
 #: bookwyrm/templates/snippets/status/status_body.html:44
 #: bookwyrm/templates/snippets/status/status_body.html:45
 msgid "Like status"
-msgstr ""
+msgstr "Ajouter le statut aux favoris"
 
 #: bookwyrm/templates/snippets/fav_button.html:15
 #: bookwyrm/templates/snippets/fav_button.html:16
 msgid "Un-like status"
-msgstr ""
+msgstr "Supprimer le statut des favoris"
 
 #: bookwyrm/templates/snippets/follow_button.html:6
 msgid "Follow request already sent."
@@ -1066,7 +1071,7 @@ msgstr "Se désabonner"
 
 #: bookwyrm/templates/snippets/follow_request_buttons.html:8
 msgid "Accept"
-msgstr ""
+msgstr "Accepter"
 
 #: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
@@ -1075,7 +1080,7 @@ msgstr "Défi lecture pour %(year)s"
 
 #: bookwyrm/templates/snippets/goal_card.html:21
 msgid "Dismiss message"
-msgstr ""
+msgstr "Rejeter le message"
 
 #: bookwyrm/templates/snippets/goal_card.html:22
 #, python-format
@@ -1092,7 +1097,7 @@ msgstr "Défi lecture :"
 
 #: bookwyrm/templates/snippets/goal_form.html:14
 msgid "books"
-msgstr ""
+msgstr "livres"
 
 #: bookwyrm/templates/snippets/goal_form.html:19
 msgid "Goal privacy:"
@@ -1103,7 +1108,7 @@ msgstr "Confidentialité du défi :"
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:29
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20
 msgid "Post to feed"
-msgstr ""
+msgstr "Publier sur le fil d’actualité"
 
 #: bookwyrm/templates/snippets/goal_form.html:30
 msgid "Set goal"
@@ -1120,23 +1125,23 @@ msgstr "%(percent)s%% terminé !"
 
 #: bookwyrm/templates/snippets/pagination.html:7
 msgid "Previous"
-msgstr ""
+msgstr "Précédente"
 
 #: bookwyrm/templates/snippets/pagination.html:15
 msgid "Next"
-msgstr ""
+msgstr "Suivante"
 
 #: bookwyrm/templates/snippets/privacy-icons.html:3
 #: bookwyrm/templates/snippets/privacy-icons.html:4
 #: bookwyrm/templates/snippets/privacy_select.html:10
 msgid "Public"
-msgstr ""
+msgstr "Public"
 
 #: bookwyrm/templates/snippets/privacy-icons.html:7
 #: bookwyrm/templates/snippets/privacy-icons.html:8
 #: bookwyrm/templates/snippets/privacy_select.html:13
 msgid "Unlisted"
-msgstr ""
+msgstr "Non listé"
 
 #: bookwyrm/templates/snippets/privacy-icons.html:12
 msgid "Followers-only"
@@ -1144,7 +1149,7 @@ msgstr "Abonnements seulement"
 
 #: bookwyrm/templates/snippets/privacy_select.html:6
 msgid "Post privacy"
-msgstr "Confidentialité du Message"
+msgstr "Confidentialité du message"
 
 #: bookwyrm/templates/snippets/privacy_select.html:16
 #: bookwyrm/templates/user/followers.html:17
@@ -1153,46 +1158,46 @@ msgstr "Abonnements"
 
 #: bookwyrm/templates/snippets/progress_update.html:6
 msgid "Progress:"
-msgstr "Progrès :"
+msgstr "Progression :"
 
 #: bookwyrm/templates/snippets/progress_update.html:16
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 msgid "pages"
-msgstr ""
+msgstr "pages"
 
 #: bookwyrm/templates/snippets/progress_update.html:17
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 msgid "percent"
-msgstr ""
+msgstr "pourcent"
 
 #: bookwyrm/templates/snippets/progress_update.html:25
 #, python-format
 msgid "of %(book.pages)s pages"
-msgstr ""
+msgstr "sur %(book.pages)s pages"
 
 #: bookwyrm/templates/snippets/rate_action.html:4
 msgid "Leave a rating"
-msgstr ""
+msgstr "Laisser une note"
 
 #: bookwyrm/templates/snippets/rate_action.html:29
 msgid "Rate"
-msgstr ""
+msgstr "Noter"
 
 #: bookwyrm/templates/snippets/readthrough.html:7
 msgid "Progress Updates:"
-msgstr "Progrès en cours :"
+msgstr "Progression :"
 
 #: bookwyrm/templates/snippets/readthrough.html:11
 msgid "finished"
-msgstr ""
+msgstr "terminé"
 
 #: bookwyrm/templates/snippets/readthrough.html:29
 msgid "Delete this progress update"
-msgstr ""
+msgstr "Supprimer cette mise à jour"
 
 #: bookwyrm/templates/snippets/readthrough.html:39
 msgid "started"
-msgstr ""
+msgstr "commencé"
 
 #: bookwyrm/templates/snippets/readthrough.html:57
 msgid "Edit read dates"
@@ -1202,160 +1207,160 @@ msgstr "Modifier les date de lecture"
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:19
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:17
 msgid "Started reading"
-msgstr ""
+msgstr "A commencé la lecture"
 
 #: bookwyrm/templates/snippets/readthrough_form.html:14
 msgid "Progress"
-msgstr ""
+msgstr "Progression"
 
 #: bookwyrm/templates/snippets/readthrough_form.html:30
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25
 msgid "Finished reading"
-msgstr ""
+msgstr "A terminé la lecture"
 
 #: bookwyrm/templates/snippets/register_form.html:32
 msgid "Sign Up"
-msgstr ""
+msgstr "S’enregistrer"
 
 #: bookwyrm/templates/snippets/rss_title.html:5
 #: bookwyrm/templates/snippets/status/status_header.html:9
 msgid "rated"
-msgstr ""
+msgstr "avec notes"
 
 #: bookwyrm/templates/snippets/rss_title.html:7
 #: bookwyrm/templates/snippets/status/status_header.html:11
 msgid "reviewed"
-msgstr ""
+msgstr "avec critiques"
 
 #: bookwyrm/templates/snippets/rss_title.html:9
 #: bookwyrm/templates/snippets/status/status_header.html:13
 msgid "commented on"
-msgstr ""
+msgstr "avec commentaires"
 
 #: bookwyrm/templates/snippets/rss_title.html:11
 #: bookwyrm/templates/snippets/status/status_header.html:15
 msgid "quoted"
-msgstr ""
+msgstr "avec citations"
 
 #: bookwyrm/templates/snippets/search_result_text.html:3
 #, python-format
 msgid "by %(author)s"
-msgstr ""
+msgstr "par %(author)s"
 
 #: bookwyrm/templates/snippets/shelf.html:12
 msgid "Published"
-msgstr ""
+msgstr "Publié"
 
 #: bookwyrm/templates/snippets/shelf.html:13
 msgid "Shelved"
-msgstr ""
+msgstr "Ajouté à une étagère"
 
 #: bookwyrm/templates/snippets/shelf.html:14
 msgid "Started"
-msgstr ""
+msgstr "Commencé"
 
 #: bookwyrm/templates/snippets/shelf.html:15
 msgid "Finished"
-msgstr ""
+msgstr "Terminé"
 
 #: bookwyrm/templates/snippets/shelf.html:16
 msgid "External links"
-msgstr ""
+msgstr "Liens externes"
 
 #: bookwyrm/templates/snippets/shelf.html:44
 msgid "OpenLibrary"
-msgstr ""
+msgstr "OpenLibrary"
 
 #: bookwyrm/templates/snippets/shelf.html:61
 msgid "This shelf is empty."
-msgstr ""
+msgstr "Cette étagère est vide"
 
 #: bookwyrm/templates/snippets/shelf.html:67
 msgid "Delete shelf"
-msgstr ""
+msgstr "Supprimer l’étagère"
 
 #: bookwyrm/templates/snippets/shelf_selector.html:4
 msgid "Change shelf"
-msgstr ""
+msgstr "Changer d’étagère"
 
 #: bookwyrm/templates/snippets/shelf_selector.html:27
 msgid "Unshelve"
-msgstr ""
+msgstr "Enlever de l’étagère"
 
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
 #, python-format
 msgid "Finish \"<em>%(book_title)s</em>\""
-msgstr ""
+msgstr "Terminer « <em>%(book_title)s</em> »"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5
 msgid "More shelves"
-msgstr ""
+msgstr "Plus d’étagères"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:10
 msgid "Read"
-msgstr ""
+msgstr "Lire"
 
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
 #, python-format
 msgid "Start \"<em>%(book_title)s</em>\""
-msgstr ""
+msgstr "Commencer « <em>%(book_title)s</em> »"
 
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:5
 #, python-format
 msgid "Want to Read \"<em>%(book_title)s</em>\""
-msgstr ""
+msgstr "A envie de lire « <em>%(book_title)s</em> »"
 
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26
 msgid "Want to read"
-msgstr ""
+msgstr "A envie de lire"
 
 #: bookwyrm/templates/snippets/status/status.html:7
 msgid "boosted"
-msgstr ""
+msgstr "partagé"
 
 #: bookwyrm/templates/snippets/status/status_body.html:36
 #: bookwyrm/templates/snippets/status/status_body.html:37
 msgid "Reply"
-msgstr ""
+msgstr "Répondre"
 
 #: bookwyrm/templates/snippets/status/status_content.html:42
 msgid "Open image in new window"
-msgstr ""
+msgstr "Ouvrir l’image dans une nouvelle fenêtre"
 
 #: bookwyrm/templates/snippets/status/status_options.html:7
 #: bookwyrm/templates/snippets/user_options.html:7
 msgid "More options"
-msgstr ""
+msgstr "Plus d’options"
 
 #: bookwyrm/templates/snippets/status/status_options.html:17
 msgid "Delete post"
-msgstr ""
+msgstr "Supprimer le message"
 
 #: bookwyrm/templates/snippets/status/status_options.html:23
 #: bookwyrm/templates/snippets/user_options.html:13
 msgid "Send direct message"
-msgstr ""
+msgstr "Envoyer un message direct"
 
 #: bookwyrm/templates/snippets/switch_edition_button.html:5
 msgid "Switch to this edition"
-msgstr ""
+msgstr "Changer vers cette édition"
 
 #: bookwyrm/templates/snippets/tag.html:14
 msgid "Remove tag"
-msgstr ""
+msgstr "Supprimer le tag"
 
 #: bookwyrm/templates/tag.html:7
 #, python-format
 msgid "Books tagged \"%(tag.name)s\""
-msgstr ""
+msgstr "Livres tagués « %(tag.name)s »"
 
 #: bookwyrm/templates/user/create_shelf_form.html:5
 msgid "Create New Shelf"
-msgstr ""
+msgstr "Créer une nouvelle étagère"
 
 #: bookwyrm/templates/user/create_shelf_form.html:22
 msgid "Create shelf"
-msgstr ""
+msgstr "Créer l’étagère"
 
 #: bookwyrm/templates/user/edit_shelf_form.html:5
 msgid "Edit Shelf"
@@ -1363,7 +1368,7 @@ msgstr "Modifier l’étagère"
 
 #: bookwyrm/templates/user/edit_shelf_form.html:26
 msgid "Update shelf"
-msgstr ""
+msgstr "Mettre l’étagère à jour"
 
 #: bookwyrm/templates/user/followers.html:30
 #, python-format
@@ -1381,11 +1386,11 @@ msgstr "%(username)s n’est abonné(e) à personne"
 
 #: bookwyrm/templates/user/lists.html:28
 msgid "Create list"
-msgstr ""
+msgstr "Créer une liste"
 
 #: bookwyrm/templates/user/user.html:7
 msgid "User profile"
-msgstr ""
+msgstr "Profil"
 
 #: bookwyrm/templates/user/user.html:13
 msgid "Edit profile"
@@ -1394,17 +1399,17 @@ msgstr "Modifier le profil"
 #: bookwyrm/templates/user/user.html:24
 #: bookwyrm/templates/user/user_layout.html:66
 msgid "Shelves"
-msgstr ""
+msgstr "Étagères"
 
 #: bookwyrm/templates/user/user.html:29
 #, python-format
 msgid "See all %(size)s"
-msgstr ""
+msgstr "Voir les %(size)s"
 
 #: bookwyrm/templates/user/user.html:42
 #, python-format
 msgid "See all %(shelf_count)s shelves"
-msgstr ""
+msgstr "Voir les %(shelf_count)s étagères"
 
 #: bookwyrm/templates/user/user.html:54
 #, python-format
@@ -1413,11 +1418,11 @@ msgstr "Définir un défi lecture pour %(year)s"
 
 #: bookwyrm/templates/user/user.html:60
 msgid "User Activity"
-msgstr ""
+msgstr "Activité du compte"
 
 #: bookwyrm/templates/user/user.html:63
 msgid "RSS feed"
-msgstr ""
+msgstr "Flux RSS"
 
 #: bookwyrm/templates/user/user.html:74
 msgid "No activities yet!"
@@ -1429,7 +1434,7 @@ msgstr "Demandes d’abonnement"
 
 #: bookwyrm/templates/user/user_layout.html:48
 msgid "Activity"
-msgstr ""
+msgstr "Activité"
 
 #: bookwyrm/templates/user/user_layout.html:54
 msgid "Reading Goal"
@@ -1438,4 +1443,4 @@ msgstr "Défi lecture"
 #: bookwyrm/templates/user/user_preview.html:13
 #, python-format
 msgid "Joined %(date)s"
-msgstr ""
+msgstr "Enregistré(e) il y a %(date)s"

From 6a18803417acd175c91c07e7899a32462b4d48a7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Feb 2021 17:10:30 -0800
Subject: [PATCH 0125/1285] Catches more template translation moments

---
 bookwyrm/settings.py                           |  1 +
 bookwyrm/templates/book.html                   | 12 ++++++++----
 bookwyrm/templates/components/inline_form.html |  3 ++-
 bookwyrm/templates/feed/feed_layout.html       |  3 ++-
 bookwyrm/templates/goal.html                   | 11 +++++++++--
 bookwyrm/templates/layout.html                 | 18 +++++++++---------
 bookwyrm/templates/lists/list_layout.html      |  3 ++-
 bookwyrm/templates/lists/lists.html            |  3 ++-
 bookwyrm/templates/search_results.html         |  6 ++++--
 bookwyrm/templates/snippets/book_titleby.html  |  6 ++++--
 .../templates/snippets/create_status_form.html |  3 ++-
 .../snippets/delete_readthrough_modal.html     |  3 ++-
 .../snippets/generated_status/goal.html        |  2 +-
 bookwyrm/templates/snippets/goal_form.html     |  3 ++-
 bookwyrm/templates/snippets/goal_progress.html |  8 ++++++--
 bookwyrm/templates/snippets/readthrough.html   | 12 ++++++++----
 .../shelve_button/finish_reading_modal.html    |  3 ++-
 .../shelve_button/shelve_button_options.html   |  9 ++++++---
 .../shelve_button/start_reading_modal.html     |  3 ++-
 .../shelve_button/want_to_read_modal.html      |  3 ++-
 .../templates/snippets/status/status_body.html |  3 ++-
 .../snippets/status/status_content.html        |  6 ++++--
 bookwyrm/templates/snippets/trimmed_text.html  |  8 ++++++--
 bookwyrm/templates/user/lists.html             |  3 ++-
 bookwyrm/templates/user/shelf.html             |  7 +++++--
 bookwyrm/templates/user/user_preview.html      |  4 ++--
 26 files changed, 97 insertions(+), 49 deletions(-)

diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 9446b09c..8cdf87ff 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -140,6 +140,7 @@ AUTH_PASSWORD_VALIDATORS = [
 LANGUAGE_CODE = 'en-us'
 LANGUAGES = [
     ('en-us', _('English')),
+    ('fr-fr', _('French')),
 ]
 
 
diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html
index 35ddba37..92d758a6 100644
--- a/bookwyrm/templates/book.html
+++ b/bookwyrm/templates/book.html
@@ -93,7 +93,8 @@
                 {% include 'snippets/trimmed_text.html' with full=book|book_description %}
 
                 {% if request.user.is_authenticated and perms.bookwyrm.edit_book and not book|book_description %}
-                {% include 'snippets/toggle/open_button.html' with text="Add description" controls_text="add-description" controls_uid=book.id focus="id_description" hide_active=True id="hide-description" %}
+                {% trans 'Add Description' as button_text %}
+                {% include 'snippets/toggle/open_button.html' with text=button_text controls_text="add-description" controls_uid=book.id focus="id_description" hide_active=True id="hide-description" %}
 
                 <div class="box hidden" id="add-description-{{ book.id }}">
                     <form name="add-description" method="POST" action="/add-description/{{ book.id }}">
@@ -104,7 +105,8 @@
                         </p>
                         <div class="field">
                             <button class="button is-primary" type="submit">{% trans "Save" %}</button>
-                            {% include 'snippets/toggle/close_button.html' with text="Cancel" controls_text="add-description" controls_uid=book.id hide_inactive=True %}
+                            {% trans "Cancel" as button_text %}
+                            {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="add-description" controls_uid=book.id hide_inactive=True %}
                         </div>
                     </form>
                 </div>
@@ -137,7 +139,8 @@
                 <header class="columns">
                     <h2 class="column title is-5 mb-1">{% trans "Your reading activity" %}</h2>
                     <div class="column is-narrow">
-                        {% include 'snippets/toggle/open_button.html' with text="Add read dates" icon="plus" class="is-small" controls_text="add-readthrough" %}
+                        {% trans "Add read dates" as button_text %}
+                        {% include 'snippets/toggle/open_button.html' with text=button_text icon="plus" class="is-small" controls_text="add-readthrough" %}
                     </div>
                 </header>
                 {% if not readthroughs.exists %}
@@ -151,7 +154,8 @@
                                 <button class="button is-primary" type="submit">{% trans "Create" %}</button>
                             </div>
                             <div class="control">
-                                {% include 'snippets/toggle/close_button.html' with text="Cancel" controls_text="add-readthrough" %}
+                                {% trans "Cancel" as button_text %}
+                                {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="add-readthrough" %}
                             </div>
                         </div>
                     </form>
diff --git a/bookwyrm/templates/components/inline_form.html b/bookwyrm/templates/components/inline_form.html
index 6a244ffd..97f61996 100644
--- a/bookwyrm/templates/components/inline_form.html
+++ b/bookwyrm/templates/components/inline_form.html
@@ -4,7 +4,8 @@
             {% block header %}{% endblock %}
         </h2>
         <span class="card-header-icon">
-        {% include 'snippets/toggle/toggle_button.html' with label="Close" class="delete" nonbutton=True controls_text=controls_text %}
+            {% trans "Close" as button_text %}
+            {% include 'snippets/toggle/toggle_button.html' with label=button_text class="delete" nonbutton=True controls_text=controls_text %}
         </span>
     </header>
     <section class="card-content content">
diff --git a/bookwyrm/templates/feed/feed_layout.html b/bookwyrm/templates/feed/feed_layout.html
index edd4ce4a..f5d3a11b 100644
--- a/bookwyrm/templates/feed/feed_layout.html
+++ b/bookwyrm/templates/feed/feed_layout.html
@@ -46,7 +46,8 @@
                         <span>{% include 'snippets/book_titleby.html' with book=book %}</span>
                     </p>
                     <div class="card-header-icon is-hidden-tablet">
-                        {% include 'snippets/toggle/toggle_button.html' with label="close" controls_text="book" controls_uid=book.id class="delete" nonbutton=True pressed=True %}
+                        {% trans "Close" as button_text %}
+                        {% include 'snippets/toggle/toggle_button.html' with label=button_text controls_text="book" controls_uid=book.id class="delete" nonbutton=True pressed=True %}
                     </div>
                 </div>
                 <div class="card-content">
diff --git a/bookwyrm/templates/goal.html b/bookwyrm/templates/goal.html
index 4a16ccb6..53891d27 100644
--- a/bookwyrm/templates/goal.html
+++ b/bookwyrm/templates/goal.html
@@ -8,7 +8,8 @@
     </div>
     {% if is_self and goal %}
     <div class="column is-narrow">
-        {% include 'snippets/toggle/open_button.html' with text="Edit goal" icon="pencil" controls_text="show-edit-goal" focus="edit-form-header" %}
+        {% trans "Edit Goal" as button_text %}
+        {% include 'snippets/toggle/open_button.html' with text=button_text icon="pencil" controls_text="show-edit-goal" focus="edit-form-header" %}
     </div>
     {% endif %}
 </div>
@@ -45,7 +46,13 @@
 
 {% if goal.books %}
 <section class="content">
-    <h2>{% if goal.user == request.user %}Your{% else %}{{ goal.user.display_name }}'s{% endif %} {{ year }} Books</h2>
+    <h2>
+        {% if goal.user == request.user %}
+        {% blocktrans %}Your {{ year }} Books{% endblocktrans %}
+        {% else %}
+        {% blocktrans with username=goal.user.display_name %}{{ username }}'s {{ year }} Books{% endblocktrans %}
+        {% endif %}
+    </h2>
     <div class="columns is-multiline">
         {% for book in goal.books %}
         <div class="column is-narrow">
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index c4499c4e..a0e73128 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -30,7 +30,7 @@
         <form class="navbar-item column" action="/search/">
             <div class="field has-addons">
                 <div class="control">
-                    <input aria-label="Search for a book or user" id="search-input" class="input" type="text" name="q" placeholder="Search for a book or user" value="{{ query }}">
+                    <input aria-label="{% trans 'Search for a book or user' %}" id="search-input" class="input" type="text" name="q" placeholder="{% trans 'Search for a book or user' %}" value="{{ query }}">
                 </div>
                 <div class="control">
                     <button class="button" type="submit">
@@ -76,22 +76,22 @@
                 <ul class="navbar-dropdown" id="navbar-dropdown">
                     <li>
                         <a href="/direct-messages" class="navbar-item">
-                            Direct messages
+                            {% trans "Direct Messages" %}
                         </a>
                     </li>
                     <li>
                         <a href="/user/{{request.user.localname}}" class="navbar-item">
-                            Profile
+                            {% trans 'Profile' %}
                         </a>
                     </li>
                     <li>
                         <a href="/preferences/profile" class="navbar-item">
-                            Settings
+                            {% trans 'Settings' %}
                         </a>
                     </li>
                     <li>
                         <a href="/import" class="navbar-item">
-                            Import books
+                            {% trans 'Import Books' %}
                         </a>
                     </li>
                     {% if perms.bookwyrm.create_invites or perms.bookwyrm.edit_instance_settings%}
@@ -100,21 +100,21 @@
                     {% if perms.bookwyrm.create_invites %}
                     <li>
                         <a href="{% url 'settings-invites' %}" class="navbar-item">
-                            Invites
+                            {% trans 'Invites' %}
                         </a>
                     </li>
                     {% endif %}
                     {% if perms.bookwyrm.edit_instance_settings %}
                     <li>
                         <a href="{% url 'settings-site' %}" class="navbar-item">
-                            Site Configuration
+                            {% trans 'Site Configuration' %}
                         </a>
                     </li>
                     {% endif %}
                     <hr class="navbar-divider">
                     <li>
                         <a href="/logout" class="navbar-item">
-                            Log out
+                            {% trans 'Log out' %}
                         </a>
                     </li>
                 </ul>
@@ -195,7 +195,7 @@
             </div>
             {% endif %}
             <div class="column">
-                BookWyrm is open source software. You can contribute or report issues on <a href="https://github.com/mouse-reeve/bookwyrm">GitHub</a>.
+                {% trans 'BookWyrm is open source software. You can contribute or report issues on <a href="https://github.com/mouse-reeve/bookwyrm">GitHub</a>.' %}
             </div>
         </div>
     </div>
diff --git a/bookwyrm/templates/lists/list_layout.html b/bookwyrm/templates/lists/list_layout.html
index 8e2e36e6..4a153a67 100644
--- a/bookwyrm/templates/lists/list_layout.html
+++ b/bookwyrm/templates/lists/list_layout.html
@@ -12,7 +12,8 @@
     </div>
     {% if request.user == list.user %}
     <div class="column is-narrow">
-        {% include 'snippets/toggle/open_button.html' with text="Edit list" icon="pencil" controls_text="edit-list" focus="edit-list-header" %}
+        {% trans "Edit List" as button_text %}
+        {% include 'snippets/toggle/open_button.html' with text=button_text icon="pencil" controls_text="edit-list" focus="edit-list-header" %}
     </div>
     {% endif %}
 </header>
diff --git a/bookwyrm/templates/lists/lists.html b/bookwyrm/templates/lists/lists.html
index 07032676..936d9633 100644
--- a/bookwyrm/templates/lists/lists.html
+++ b/bookwyrm/templates/lists/lists.html
@@ -11,7 +11,8 @@
         <h2 class="title">{% trans "Your lists" %}</h2>
     </div>
     <div class="column is-narrow">
-        {% include 'snippets/toggle/open_button.html' with controls_text="create-list" icon="plus" text="Create new list" focus="create-list-header" %}
+        {% trans "Create List" as button_text %}
+        {% include 'snippets/toggle/open_button.html' with controls_text="create-list" icon="plus" text=button_text focus="create-list-header" %}
     </div>
 </header>
 
diff --git a/bookwyrm/templates/search_results.html b/bookwyrm/templates/search_results.html
index 30c88f3d..7223b17b 100644
--- a/bookwyrm/templates/search_results.html
+++ b/bookwyrm/templates/search_results.html
@@ -29,7 +29,8 @@
             <p>
                 {% trans "Didn't find what you were looking for?" %}
             </p>
-            {% include 'snippets/toggle/open_button.html' with text="Show results from other catalogues" small=True controls_text="more-results" %}
+            {% trans "Show results from other catalogues" as button_text %}
+            {% include 'snippets/toggle/open_button.html' with text=button_text small=True controls_text="more-results" %}
         </div>
         {% endif %}
 
@@ -60,7 +61,8 @@
             {% endfor %}
 
             {% if local_results.results %}
-            {% include 'snippets/toggle/close_button.html' with text="Hide results from other catalogues" small=True controls_text="more-results" %}
+            {% trans "Hide results from other catalogues" as button_text %}
+            {% include 'snippets/toggle/close_button.html' with text=button_text small=True controls_text="more-results" %}
             {% endif %}
         </div>
         {% endif %}
diff --git a/bookwyrm/templates/snippets/book_titleby.html b/bookwyrm/templates/snippets/book_titleby.html
index b01ede4c..e561a8a3 100644
--- a/bookwyrm/templates/snippets/book_titleby.html
+++ b/bookwyrm/templates/snippets/book_titleby.html
@@ -1,5 +1,7 @@
-<a href="/book/{{ book.id }}">{{ book.title }}</a>
+{% load i18n %}
 {% if book.authors %}
-by {% include 'snippets/authors.html' with book=book %}
+{% blocktrans with path=book.local_path title=book.title %}<a href="{{ path }}">{{ title }}</a> by {% endblocktrans %}{% include 'snippets/authors.html' with book=book %}
+{% else %}
+<a href="{{ book.local_path }}">{{ book.title }}</a>
 {% endif %}
 
diff --git a/bookwyrm/templates/snippets/create_status_form.html b/bookwyrm/templates/snippets/create_status_form.html
index b5a12084..11bdcd35 100644
--- a/bookwyrm/templates/snippets/create_status_form.html
+++ b/bookwyrm/templates/snippets/create_status_form.html
@@ -51,7 +51,8 @@
     <div class="columns pt-1">
         <div class="field has-addons column">
             <div class="control">
-                {% include 'snippets/toggle/toggle_button.html' with text="Include spoiler alert" icon="warning is-size-4" controls_text="spoilers" controls_uid=uuid focus="id_content_warning" checkbox="id_show_spoilers" class="toggle-button" pressed=status.content_warning %}
+                {% trans "Include spoiler alert" as button_text %}
+                {% include 'snippets/toggle/toggle_button.html' with text=button_text icon="warning is-size-4" controls_text="spoilers" controls_uid=uuid focus="id_content_warning" checkbox="id_show_spoilers" class="toggle-button" pressed=status.content_warning %}
             </div>
             <div class="control">
             {% if type == 'direct' %}
diff --git a/bookwyrm/templates/snippets/delete_readthrough_modal.html b/bookwyrm/templates/snippets/delete_readthrough_modal.html
index 557059ed..e1560f93 100644
--- a/bookwyrm/templates/snippets/delete_readthrough_modal.html
+++ b/bookwyrm/templates/snippets/delete_readthrough_modal.html
@@ -14,6 +14,7 @@
     <button class="button is-danger" type="submit">
         {% trans "Delete" %}
     </button>
-    {% include 'snippets/toggle/toggle_button.html' with text="Cancel" controls_text="delete-readthrough" controls_uid=readthrough.id %}
+    {% trans "Cancel" as button_text %}
+    {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="delete-readthrough" controls_uid=readthrough.id %}
 </form>
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/generated_status/goal.html b/bookwyrm/templates/snippets/generated_status/goal.html
index 3b4d0de4..7d60165f 100644
--- a/bookwyrm/templates/snippets/generated_status/goal.html
+++ b/bookwyrm/templates/snippets/generated_status/goal.html
@@ -1 +1 @@
-{% load humanize %}set a goal to read {{ goal.goal | intcomma }} book{{ goal.goal | pluralize }} in {{ goal.year }}
+{% load humanize %}{% blocktrans with count=goal.goal|intcomma year=goal.year %}set a goal to read {{ count }} book in {{ year }}{% plural %}set a goal to read {{ count }} books in {{ year }}{% endblocktrans %}
diff --git a/bookwyrm/templates/snippets/goal_form.html b/bookwyrm/templates/snippets/goal_form.html
index cf5d21f2..30ea1839 100644
--- a/bookwyrm/templates/snippets/goal_form.html
+++ b/bookwyrm/templates/snippets/goal_form.html
@@ -29,7 +29,8 @@
     <p>
         <button type="submit" class="button is-link">{% trans "Set goal" %}</button>
         {% if goal %}
-        {% include 'snippets/toggle/close_button.html' with text="Cancel" controls_text="show-edit-goal" %}
+        {% trans "Cancel" as button_text %}
+        {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="show-edit-goal" %}
         {% endif %}
     </p>
 </form>
diff --git a/bookwyrm/templates/snippets/goal_progress.html b/bookwyrm/templates/snippets/goal_progress.html
index 2fa0da54..2d46181e 100644
--- a/bookwyrm/templates/snippets/goal_progress.html
+++ b/bookwyrm/templates/snippets/goal_progress.html
@@ -4,9 +4,13 @@
     {% if goal.progress_percent >= 100 %}
         {% trans "Success!" %}
     {% elif goal.progress_percent %}
-        {% blocktrans with percent=goal.percent %}{{ percent }}% complete!{% endblocktrans %}
+        {% blocktrans with percent=goal.progress_percent %}{{ percent }}% complete!{% endblocktrans %}
+    {% endif %}
+    {% if goal.user == request.user %}
+    {% blocktrans with read_count=goal.book_count|intcomma goal_count=goal.goal|intcomma path=goal.local_path %}You've read <a href="{{ path }}">{{ read_count }} of {{ goal_count}} books</a>.{% endblocktrans %}
+    {% else %}
+    {% blocktrans with username=goal.user.display_name read_count=goal.book_count|intcomma goal_count=goal.goal|intcomma path=goal.local_path %}{{ username }} has read <a href="{{ path }}">{{ read_count }} of {{ goal_count}} books</a>.{% endblocktrans %}
     {% endif %}
-    {% if goal.user == request.user %}You've{% else %}{{ goal.user.display_name }} has{% endif %} read {% if request.path != goal.local_path %}<a href="{{ goal.local_path }}">{% endif %}{{ goal.book_count }} of {{ goal.goal | intcomma }} books{% if request.path != goal.local_path %}</a>{% endif %}.
 </p>
 <progress class="progress is-large" value="{{ goal.book_count }}" max="{{ goal.goal }}" aria-hidden="true">{{ goal.progress_percent }}%</progress>
 
diff --git a/bookwyrm/templates/snippets/readthrough.html b/bookwyrm/templates/snippets/readthrough.html
index de85635e..edac21cf 100644
--- a/bookwyrm/templates/snippets/readthrough.html
+++ b/bookwyrm/templates/snippets/readthrough.html
@@ -11,7 +11,8 @@
                     <li>{% if readthrough.finish_date %} {{ readthrough.finish_date | naturalday }}: {% trans "finished" %} {% else %}{% if readthrough.progress_mode == 'PG' %}on page {{ readthrough.progress }}{% if book.pages %} of {{ book.pages }}{% endif %}
                         {% else %}{{ readthrough.progress }}%{% endif %}{% endif %}
                         {% if readthrough.progress %}
-                        {% include 'snippets/toggle/toggle_button.html' with text="Show all updates" controls_text="updates" controls_uid=readthrough.id class="is-small" %}
+                        {% trans "Show all updates" as button_text %}
+                        {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="updates" controls_uid=readthrough.id class="is-small" %}
                         <ul id="updates-{{ readthrough.id }}" class="hidden">
                             {% for progress_update in readthrough.progress_updates %}
                             <li>
@@ -42,10 +43,12 @@
             <div class="column is-narrow">
                 <div class="field has-addons">
                     <div class="control">
-                        {% include 'snippets/toggle/toggle_button.html' with class="is-small" text="Edit read dates" icon="pencil" controls_text="edit-readthrough" controls_uid=readthrough.id focus="edit-readthrough" %}
+                        {% trans "Edit read dates" as button_text %}
+                        {% include 'snippets/toggle/toggle_button.html' with class="is-small" text=button_text icon="pencil" controls_text="edit-readthrough" controls_uid=readthrough.id focus="edit-readthrough" %}
                     </div>
                     <div class="control">
-                        {% include 'snippets/toggle/toggle_button.html' with class="is-small" text="Delete these read dates" icon="x" controls_text="delete-readthrough" controls_uid=readthrough.id focus="modal-title-delete-readthrough" %}
+                        {% trans "Delete these read dates" as button_text %}
+                        {% include 'snippets/toggle/toggle_button.html' with class="is-small" text=button_text icon="x" controls_text="delete-readthrough" controls_uid=readthrough.id focus="modal-title-delete-readthrough" %}
                     </div>
                 </div>
             </div>
@@ -59,7 +62,8 @@
         {% include 'snippets/readthrough_form.html' with readthrough=readthrough %}
         <div class="field is-grouped">
             <button class="button is-primary" type="submit">{% trans "Save" %}</button>
-            {% include 'snippets/toggle/close_button.html' with text="Cancel" controls_text="edit-readthrough" controls_uid=readthrough.id %}
+            {% trans "Cancel" as button_text %}
+            {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="edit-readthrough" controls_uid=readthrough.id %}
         </div>
     </form>
 </div>
diff --git a/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html b/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
index 896c8016..ca65bf06 100644
--- a/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
+++ b/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
@@ -40,7 +40,8 @@
     </div>
     <div class="column">
         <button type="submit" class="button is-success">{% trans "Save" %}</button>
-        {% include 'snippets/toggle/close_button.html' with text="Cancel" controls_text="finish-reading" controls_uid=uuid %}
+        {% trans "Cancel" as button_text %}
+        {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="finish-reading" controls_uid=uuid %}
     </div>
 </div>
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
index a1ef2c32..d6fdb13b 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
@@ -5,13 +5,16 @@
 {% if dropdown %}<li role="menuitem">{% endif %}
     <div class="{% if dropdown %}dropdown-item pt-0 pb-0{% elif active_shelf.shelf.identifier|next_shelf != shelf.identifier %}hidden{% endif %}">
     {% if shelf.identifier == 'reading' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
-        {% include 'snippets/toggle/toggle_button.html' with class=class text="Start reading" controls_text="start-reading" controls_uid=button_uuid focus="modal-title-start-reading" disabled=is_current %}
+        {% trans "Start reading" as button_text %}
+        {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="start-reading" controls_uid=button_uuid focus="modal-title-start-reading" disabled=is_current %}
     {% endif %}{% elif shelf.identifier == 'read' and active_shelf.shelf.identifier == 'read' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
     <button type="button" class="button {{ class }}" disabled><span>{% trans "Read" %}</span>
     {% endif %}{% elif shelf.identifier == 'read' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
-        {% include 'snippets/toggle/toggle_button.html' with class=class text="Finish reading" controls_text="finish-reading" controls_uid=button_uuid focus="modal-title-finish-reading" disabled=is_current %}
+        {% trans "Finish reading" as button_text %}
+        {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="finish-reading" controls_uid=button_uuid focus="modal-title-finish-reading" disabled=is_current %}
     {% endif %}{% elif shelf.identifier == 'to-read' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
-        {% include 'snippets/toggle/toggle_button.html' with class=class text="Want to read" controls_text="want-to-read" controls_uid=button_uuid focus="modal-title-want-to-read" disabled=is_current %}
+        {% trans "Want to read" as button_text %}
+        {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="want-to-read" controls_uid=button_uuid focus="modal-title-want-to-read" disabled=is_current %}
     {% endif %}{% elif shelf.editable %}
         <form name="shelve" action="/shelve/" method="post">
             {% csrf_token %}
diff --git a/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html b/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html
index cb3506e2..21341683 100644
--- a/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html
+++ b/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html
@@ -32,7 +32,8 @@
     </div>
     <div class="column">
         <button class="button is-success" type="submit">{% trans "Save" %}</button>
-        {% include 'snippets/toggle/toggle_button.html' with text="Cancel" controls_text="start-reading" controls_uid=uuid %}
+        {% trans "Cancel" as button_text %}
+        {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="start-reading" controls_uid=uuid %}
     </div>
 </div>
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html b/bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html
index 179e004e..d7c37897 100644
--- a/bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html
+++ b/bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html
@@ -25,7 +25,8 @@
         <button class="button is-success" type="submit">
             <span>{% trans "Want to read" %}</span>
         </button>
-        {% include 'snippets/toggle/toggle_button.html' with text="Cancel" controls_text="want-to-read" controls_uid=uuid %}
+        {% trans "Cancel" as button_text %}
+        {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="want-to-read" controls_uid=uuid %}
     </div>
 </div>
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/status/status_body.html b/bookwyrm/templates/snippets/status/status_body.html
index 1bf0d3c7..8d6c21ed 100644
--- a/bookwyrm/templates/snippets/status/status_body.html
+++ b/bookwyrm/templates/snippets/status/status_body.html
@@ -21,7 +21,8 @@
     {% if request.user.is_authenticated %}
     <div class="field has-addons">
         <div class="control">
-            {% include 'snippets/toggle/toggle_button.html' with controls_text="show-comment" controls_uid=status.id text="Reply" icon="comment" class="is-small toggle-button" focus="id_content_reply" %}
+            {% trans "Reply" as button_text %}
+            {% include 'snippets/toggle/toggle_button.html' with controls_text="show-comment" controls_uid=status.id text=button_text icon="comment" class="is-small toggle-button" focus="id_content_reply" %}
         </div>
         <div class="control">
             {% include 'snippets/boost_button.html' with status=status %}
diff --git a/bookwyrm/templates/snippets/status/status_content.html b/bookwyrm/templates/snippets/status/status_content.html
index b48566b0..bdbf3cfc 100644
--- a/bookwyrm/templates/snippets/status/status_content.html
+++ b/bookwyrm/templates/snippets/status/status_content.html
@@ -13,13 +13,15 @@
     {% if status.content_warning %}
     <div>
         <p>{{ status.content_warning }}</p>
-        {% include 'snippets/toggle/open_button.html' with text="show more" class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
+        {% trans "Show more" as button_text %}
+        {% include 'snippets/toggle/open_button.html' with text=button_text class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
     </div>
     {% endif %}
 
     <div{% if status.content_warning %} class="hidden" id="show-status-cw-{{ status.id }}"{% endif %}>
         {% if status.content_warning %}
-        {% include 'snippets/toggle/close_button.html' with text="show less" class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
+        {% trans "Show less" as button_text %}
+        {% include 'snippets/toggle/close_button.html' with text=button_text class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
         {% endif %}
 
         {% if status.quote %}
diff --git a/bookwyrm/templates/snippets/trimmed_text.html b/bookwyrm/templates/snippets/trimmed_text.html
index b349a4fc..339ef11f 100644
--- a/bookwyrm/templates/snippets/trimmed_text.html
+++ b/bookwyrm/templates/snippets/trimmed_text.html
@@ -1,4 +1,6 @@
 {% load bookwyrm_tags %}
+{% load i18n %}
+
 {% with 0|uuid as uuid %}
 {% if full %}
 {% with full|to_markdown|safe as full %}
@@ -7,12 +9,14 @@
 {% if trimmed != full %}
 <div id="hide-full-{{ uuid }}">
     <div class="content" id="trimmed-{{ uuid }}"><span dir="auto">{{ trimmed }}</span>
-        {% include 'snippets/toggle/open_button.html' with text="show more" controls_text="full" controls_uid=uuid class="is-small" %}
+        {% trans "Show more" as button_text %}
+        {% include 'snippets/toggle/open_button.html' with text=button_text controls_text="full" controls_uid=uuid class="is-small" %}
     </div>
 </div>
 <div id="full-{{ uuid }}" class="hidden">
     <div class="content"><span dir="auto">{{ full }}</span>
-        {% include 'snippets/toggle/close_button.html' with text="show less" controls_text="full" controls_uid=uuid class="is-small" %}
+        {% trans "Show less" as button_text %}
+        {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="full" controls_uid=uuid class="is-small" %}
     </div>
 </div>
 {% else %}
diff --git a/bookwyrm/templates/user/lists.html b/bookwyrm/templates/user/lists.html
index 6edf4430..a3f5b961 100644
--- a/bookwyrm/templates/user/lists.html
+++ b/bookwyrm/templates/user/lists.html
@@ -14,7 +14,8 @@
     </div>
     {% if is_self %}
     <div class="column is-narrow">
-        {% include 'snippets/toggle/open_button.html' with controls_text="create-list" icon="plus" text="Create new list" %}
+        {% trans "Create new list" as button_text %}
+        {% include 'snippets/toggle/open_button.html' with controls_text="create-list" icon="plus" text=button_text %}
     </div>
     {% endif %}
 </div>
diff --git a/bookwyrm/templates/user/shelf.html b/bookwyrm/templates/user/shelf.html
index 19b93cbd..b32d7a7c 100644
--- a/bookwyrm/templates/user/shelf.html
+++ b/bookwyrm/templates/user/shelf.html
@@ -1,5 +1,6 @@
 {% extends 'user/user_layout.html' %}
 {% load bookwyrm_tags %}
+{% load i18n %}
 
 {% block header %}
 <header class="columns">
@@ -29,7 +30,8 @@
 
     {% if is_self %}
     <div class="column is-narrow">
-        {% include 'snippets/toggle/open_button.html' with text="Create shelf" icon="plus" controls_text="create-shelf-form" focus="create-shelf-form-header" %}
+        {% trans "Create shelf" as button_text %}
+        {% include 'snippets/toggle/open_button.html' with text=button_text icon="plus" controls_text="create-shelf-form" focus="create-shelf-form-header" %}
     </div>
     {% endif %}
 </div>
@@ -49,7 +51,8 @@
     </div>
     {% if is_self %}
     <div class="column is-narrow">
-        {% include 'snippets/toggle/open_button.html' with text="Edit shelf" icon="pencil" controls_text="edit-shelf-form" focus="edit-shelf-form-header" %}
+        {% trans "Edit shelf" as button_text %}
+        {% include 'snippets/toggle/open_button.html' with text=button_text icon="pencil" controls_text="edit-shelf-form" focus="edit-shelf-form-header" %}
     </div>
     {% endif %}
 </div>
diff --git a/bookwyrm/templates/user/user_preview.html b/bookwyrm/templates/user/user_preview.html
index 3158ff54..c641c58f 100644
--- a/bookwyrm/templates/user/user_preview.html
+++ b/bookwyrm/templates/user/user_preview.html
@@ -12,8 +12,8 @@
         <p><a href="{{ user.remote_id }}">{{ user.username }}</a></p>
         <p>{% blocktrans with date=user.created_date|naturaltime %}Joined {{ date }}{% endblocktrans %}</p>
         <p>
-            <a href="{{ user.local_path }}/followers">{{ user.followers.count }} follower{{ user.followers.count | pluralize }}</a>,
-            <a href="{{ user.local_path }}/following">{{ user.following.count }} following</a>
+        <a href="{{ user.local_path }}/followers">{% blocktrans count counter=user.followers.count %}{{ counter }} follower{% plural %}{{ counter }} followers{% endblocktrans %}</a>,
+        <a href="{{ user.local_path }}/following">{% blocktrans with counter=user.following.count %}{{ counter }} following{% endblocktrans %}</a>
         </p>
     </div>
 </div>

From fc5a180f0f10353e6aee7267d6d32808230ecf76 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Feb 2021 17:11:41 -0800
Subject: [PATCH 0126/1285] Updates stub english translation file

---
 locale/en_US/LC_MESSAGES/django.po | 266 ++++++++++++++++++++++-------
 1 file changed, 207 insertions(+), 59 deletions(-)

diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index 4d140e52..df03d37a 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-28 08:42-0800\n"
+"POT-Creation-Date: 2021-02-28 17:11-0800\n"
 "PO-Revision-Date: 2021-02-27 13:50+PST\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -59,61 +59,85 @@ msgstr ""
 msgid "View on OpenLibrary"
 msgstr ""
 
-#: bookwyrm/templates/book.html:102 bookwyrm/templates/edit_book.html:36
+#: bookwyrm/templates/book.html:96
+msgid "Add Description"
+msgstr ""
+
+#: bookwyrm/templates/book.html:103 bookwyrm/templates/edit_book.html:36
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr ""
 
-#: bookwyrm/templates/book.html:106 bookwyrm/templates/edit_author.html:75
+#: bookwyrm/templates/book.html:107 bookwyrm/templates/edit_author.html:75
 #: bookwyrm/templates/edit_book.html:117 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:47
 #: bookwyrm/templates/settings/site.html:86
 #: bookwyrm/templates/snippets/progress_update.html:21
-#: bookwyrm/templates/snippets/readthrough.html:61
+#: bookwyrm/templates/snippets/readthrough.html:64
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
 msgid "Save"
 msgstr ""
 
-#: bookwyrm/templates/book.html:138
+#: bookwyrm/templates/book.html:108 bookwyrm/templates/book.html:157
+#: bookwyrm/templates/edit_author.html:76 bookwyrm/templates/edit_book.html:118
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
+#: bookwyrm/templates/snippets/goal_form.html:32
+#: bookwyrm/templates/snippets/readthrough.html:65
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
+msgid "Cancel"
+msgstr ""
+
+#: bookwyrm/templates/book.html:140
 msgid "Your reading activity"
 msgstr ""
 
-#: bookwyrm/templates/book.html:144
+#: bookwyrm/templates/book.html:142
+msgid "Add read dates"
+msgstr ""
+
+#: bookwyrm/templates/book.html:147
 msgid "You don't have any reading activity for this book."
 msgstr ""
 
-#: bookwyrm/templates/book.html:151
+#: bookwyrm/templates/book.html:154
 msgid "Create"
 msgstr ""
 
-#: bookwyrm/templates/book.html:172
+#: bookwyrm/templates/book.html:176
 msgid "Tags"
 msgstr ""
 
-#: bookwyrm/templates/book.html:176 bookwyrm/templates/snippets/tag.html:18
+#: bookwyrm/templates/book.html:180 bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr ""
 
-#: bookwyrm/templates/book.html:193
+#: bookwyrm/templates/book.html:197
 msgid "Subjects"
 msgstr ""
 
-#: bookwyrm/templates/book.html:204
+#: bookwyrm/templates/book.html:208
 msgid "Places"
 msgstr ""
 
-#: bookwyrm/templates/book.html:215 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book.html:219 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:6
-#: bookwyrm/templates/search_results.html:85
+#: bookwyrm/templates/search_results.html:87
 #: bookwyrm/templates/user/user_layout.html:60
 msgid "Lists"
 msgstr ""
 
-#: bookwyrm/templates/book.html:244
+#: bookwyrm/templates/book.html:248
 msgid "rated it"
 msgstr ""
 
+#: bookwyrm/templates/components/inline_form.html:7
+#: bookwyrm/templates/feed/feed_layout.html:49
+msgid "Close"
+msgstr ""
+
 #: bookwyrm/templates/discover/about.html:10
 #: bookwyrm/templates/discover/about.html:20
 msgid "Code of Conduct"
@@ -208,10 +232,6 @@ msgstr ""
 msgid "Goodreads key:"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:76 bookwyrm/templates/edit_book.html:118
-msgid "Cancel"
-msgstr ""
-
 #: bookwyrm/templates/edit_book.html:28
 #: bookwyrm/templates/snippets/create_status_form.html:10
 msgid "Title:"
@@ -322,7 +342,7 @@ msgid ""
 "There are no books here right now! Try searching for a book to get started"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed_layout.html:68
+#: bookwyrm/templates/feed/feed_layout.html:71
 #, python-format
 msgid "%(year)s Reading Goal"
 msgstr ""
@@ -336,7 +356,11 @@ msgstr ""
 msgid "%(year)s Reading Progress"
 msgstr ""
 
-#: bookwyrm/templates/goal.html:29
+#: bookwyrm/templates/goal.html:11
+msgid "Edit Goal"
+msgstr ""
+
+#: bookwyrm/templates/goal.html:30
 #: bookwyrm/templates/snippets/goal_card.html:13
 #, python-format
 msgid ""
@@ -344,12 +368,22 @@ msgid ""
 "your progress throughout the year."
 msgstr ""
 
-#: bookwyrm/templates/goal.html:38
+#: bookwyrm/templates/goal.html:39
 #, python-format
 msgid "%(name)s hasn't set a reading goal for %(year)s."
 msgstr ""
 
-#: bookwyrm/templates/import.html:6
+#: bookwyrm/templates/goal.html:51
+#, python-format
+msgid "Your %(year)s Books"
+msgstr ""
+
+#: bookwyrm/templates/goal.html:53
+#, python-format
+msgid "%(username)s's %(year)s Books"
+msgstr ""
+
+#: bookwyrm/templates/import.html:6 bookwyrm/templates/layout.html:94
 msgid "Import Books"
 msgstr ""
 
@@ -448,6 +482,10 @@ msgstr ""
 msgid "Sorry! This invite code is no longer valid."
 msgstr ""
 
+#: bookwyrm/templates/layout.html:33
+msgid "Search for a book or user"
+msgstr ""
+
 #: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
 #: bookwyrm/templates/lists/list.html:62
 msgid "Search"
@@ -465,6 +503,35 @@ msgstr ""
 msgid "Feed"
 msgstr ""
 
+#: bookwyrm/templates/layout.html:79
+msgid "Direct Messages"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:84
+#: bookwyrm/templates/preferences/preferences_layout.html:14
+msgid "Profile"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:89
+msgid "Settings"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:103
+#: bookwyrm/templates/settings/admin_layout.html:16
+#: bookwyrm/templates/settings/manage_invites.html:3
+msgid "Invites"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:110
+#: bookwyrm/templates/settings/admin_layout.html:29
+#: bookwyrm/templates/settings/site.html:3
+msgid "Site Configuration"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:117
+msgid "Log out"
+msgstr ""
+
 #: bookwyrm/templates/layout.html:125 bookwyrm/templates/layout.html:126
 #: bookwyrm/templates/notifications.html:7
 msgid "Notifications"
@@ -489,7 +556,14 @@ msgstr ""
 msgid "Contact site admin"
 msgstr ""
 
+#: bookwyrm/templates/layout.html:198
+msgid ""
+"BookWyrm is open source software. You can contribute or report issues on <a "
+"href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgstr ""
+
 #: bookwyrm/templates/lists/create_form.html:5
+#: bookwyrm/templates/lists/lists.html:14
 msgid "Create List"
 msgstr ""
 
@@ -518,6 +592,7 @@ msgid "Discard"
 msgstr ""
 
 #: bookwyrm/templates/lists/edit_form.html:5
+#: bookwyrm/templates/lists/list_layout.html:15
 msgid "Edit List"
 msgstr ""
 
@@ -608,7 +683,7 @@ msgstr ""
 msgid "Your lists"
 msgstr ""
 
-#: bookwyrm/templates/lists/lists.html:36
+#: bookwyrm/templates/lists/lists.html:37
 msgid "Recent Lists"
 msgstr ""
 
@@ -761,10 +836,6 @@ msgstr ""
 msgid "Account"
 msgstr ""
 
-#: bookwyrm/templates/preferences/preferences_layout.html:14
-msgid "Profile"
-msgstr ""
-
 #: bookwyrm/templates/preferences/preferences_layout.html:20
 msgid "Relationships"
 msgstr ""
@@ -791,20 +862,28 @@ msgstr ""
 msgid "Didn't find what you were looking for?"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:53
+#: bookwyrm/templates/search_results.html:32
+msgid "Show results from other catalogues"
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:54
 msgid "Import book"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:70
-msgid "Matching Users"
+#: bookwyrm/templates/search_results.html:64
+msgid "Hide results from other catalogues"
 msgstr ""
 
 #: bookwyrm/templates/search_results.html:72
+msgid "Matching Users"
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:74
 #, python-format
 msgid "No users found for \"%(query)s\""
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:87
+#: bookwyrm/templates/search_results.html:89
 #, python-format
 msgid "No lists found for \"%(query)s\""
 msgstr ""
@@ -813,11 +892,6 @@ msgstr ""
 msgid "Manage Users"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:16
-#: bookwyrm/templates/settings/manage_invites.html:3
-msgid "Invites"
-msgstr ""
-
 #: bookwyrm/templates/settings/admin_layout.html:20
 #: bookwyrm/templates/settings/federation.html:3
 msgid "Federated Servers"
@@ -827,11 +901,6 @@ msgstr ""
 msgid "Instance Settings"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:29
-#: bookwyrm/templates/settings/site.html:3
-msgid "Site Configuration"
-msgstr ""
-
 #: bookwyrm/templates/settings/admin_layout.html:32
 #: bookwyrm/templates/settings/site.html:10
 msgid "Instance Info"
@@ -960,10 +1029,15 @@ msgstr ""
 msgid "Un-block"
 msgstr ""
 
+#: bookwyrm/templates/snippets/book_titleby.html:3
+#, python-format
+msgid "<a href=\"%(path)s\">%(title)s</a> by "
+msgstr ""
+
 #: bookwyrm/templates/snippets/boost_button.html:8
 #: bookwyrm/templates/snippets/boost_button.html:9
-#: bookwyrm/templates/snippets/status/status_body.html:40
 #: bookwyrm/templates/snippets/status/status_body.html:41
+#: bookwyrm/templates/snippets/status/status_body.html:42
 msgid "Boost status"
 msgstr ""
 
@@ -980,15 +1054,15 @@ msgstr ""
 msgid "Spoilers ahead!"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status.html:8
+#: bookwyrm/templates/snippets/create_status.html:9
 msgid "Review"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status.html:11
+#: bookwyrm/templates/snippets/create_status.html:12
 msgid "Comment"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status.html:14
+#: bookwyrm/templates/snippets/create_status.html:15
 msgid "Quote"
 msgstr ""
 
@@ -1007,14 +1081,18 @@ msgstr ""
 msgid "Comment:"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:59
+#: bookwyrm/templates/snippets/create_status_form.html:54
+msgid "Include spoiler alert"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status_form.html:60
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:19
 msgid "Private"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:66
+#: bookwyrm/templates/snippets/create_status_form.html:67
 msgid "Post"
 msgstr ""
 
@@ -1036,8 +1114,8 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/fav_button.html:7
 #: bookwyrm/templates/snippets/fav_button.html:8
-#: bookwyrm/templates/snippets/status/status_body.html:44
 #: bookwyrm/templates/snippets/status/status_body.html:45
+#: bookwyrm/templates/snippets/status/status_body.html:46
 msgid "Like status"
 msgstr ""
 
@@ -1066,6 +1144,13 @@ msgstr ""
 msgid "Accept"
 msgstr ""
 
+#: bookwyrm/templates/snippets/generated_status/goal.html:1
+#, python-format
+msgid "set a goal to read %(count)s book in %(year)s"
+msgid_plural "set a goal to read %(count)s books in %(year)s"
+msgstr[0] ""
+msgstr[1] ""
+
 #: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
 msgid "%(year)s reading goal"
@@ -1114,6 +1199,19 @@ msgstr ""
 msgid "%(percent)s%% complete!"
 msgstr ""
 
+#: bookwyrm/templates/snippets/goal_progress.html:10
+#, python-format
+msgid ""
+"You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_progress.html:12
+#, python-format
+msgid ""
+"%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s "
+"books</a>."
+msgstr ""
+
 #: bookwyrm/templates/snippets/pagination.html:7
 msgid "Previous"
 msgstr ""
@@ -1182,18 +1280,27 @@ msgstr ""
 msgid "finished"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:29
+#: bookwyrm/templates/snippets/readthrough.html:14
+msgid "Show all updates"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough.html:30
 msgid "Delete this progress update"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:39
+#: bookwyrm/templates/snippets/readthrough.html:40
 msgid "started"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:57
+#: bookwyrm/templates/snippets/readthrough.html:46
+#: bookwyrm/templates/snippets/readthrough.html:60
 msgid "Edit read dates"
 msgstr ""
 
+#: bookwyrm/templates/snippets/readthrough.html:50
+msgid "Delete these read dates"
+msgstr ""
+
 #: bookwyrm/templates/snippets/readthrough_form.html:7
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:19
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:17
@@ -1287,10 +1394,23 @@ msgstr ""
 msgid "More shelves"
 msgstr ""
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:10
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:8
+msgid "Start reading"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
 msgid "Read"
 msgstr ""
 
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
+msgid "Finish reading"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26
+msgid "Want to read"
+msgstr ""
+
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
 #, python-format
 msgid "Start \"<em>%(book_title)s</em>\""
@@ -1301,20 +1421,27 @@ msgstr ""
 msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgstr ""
 
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26
-msgid "Want to read"
-msgstr ""
-
 #: bookwyrm/templates/snippets/status/status.html:7
 msgid "boosted"
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/status_body.html:36
+#: bookwyrm/templates/snippets/status/status_body.html:24
 #: bookwyrm/templates/snippets/status/status_body.html:37
+#: bookwyrm/templates/snippets/status/status_body.html:38
 msgid "Reply"
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/status_content.html:42
+#: bookwyrm/templates/snippets/status/status_content.html:16
+#: bookwyrm/templates/snippets/trimmed_text.html:12
+msgid "Show more"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_content.html:23
+#: bookwyrm/templates/snippets/trimmed_text.html:18
+msgid "Show less"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_content.html:44
 msgid "Open image in new window"
 msgstr ""
 
@@ -1350,6 +1477,7 @@ msgid "Create New Shelf"
 msgstr ""
 
 #: bookwyrm/templates/user/create_shelf_form.html:22
+#: bookwyrm/templates/user/shelf.html:33
 msgid "Create shelf"
 msgstr ""
 
@@ -1375,10 +1503,18 @@ msgstr ""
 msgid "%(username)s isn't following any users"
 msgstr ""
 
-#: bookwyrm/templates/user/lists.html:28
+#: bookwyrm/templates/user/lists.html:17
+msgid "Create new list"
+msgstr ""
+
+#: bookwyrm/templates/user/lists.html:29
 msgid "Create list"
 msgstr ""
 
+#: bookwyrm/templates/user/shelf.html:54
+msgid "Edit shelf"
+msgstr ""
+
 #: bookwyrm/templates/user/user.html:7
 msgid "User profile"
 msgstr ""
@@ -1435,3 +1571,15 @@ msgstr ""
 #, python-format
 msgid "Joined %(date)s"
 msgstr ""
+
+#: bookwyrm/templates/user/user_preview.html:15
+#, python-format
+msgid "%(counter)s follower"
+msgid_plural "%(counter)s followers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/user/user_preview.html:16
+#, python-format
+msgid "%(counter)s following"
+msgstr ""

From b9bf65ad2ae18a4158c013773974e126d5ce1e46 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Feb 2021 17:37:49 -0800
Subject: [PATCH 0127/1285] Adds missing i18n imports

---
 bookwyrm/templates/components/inline_form.html         | 1 +
 bookwyrm/templates/snippets/generated_status/goal.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/components/inline_form.html b/bookwyrm/templates/components/inline_form.html
index 97f61996..40915a92 100644
--- a/bookwyrm/templates/components/inline_form.html
+++ b/bookwyrm/templates/components/inline_form.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 <section class="card hidden {{ class }}" id="{{ controls_text }}{% if controls_uid %}-{{ controls_uid }}{% endif %}">
     <header class="card-header has-background-white-ter">
         <h2 class="card-header-title" tabindex="0" id="{{ controls_text }}{% if controls_uid %}-{{ controls_uid }}{% endif %}-header">
diff --git a/bookwyrm/templates/snippets/generated_status/goal.html b/bookwyrm/templates/snippets/generated_status/goal.html
index 7d60165f..46572265 100644
--- a/bookwyrm/templates/snippets/generated_status/goal.html
+++ b/bookwyrm/templates/snippets/generated_status/goal.html
@@ -1 +1 @@
-{% load humanize %}{% blocktrans with count=goal.goal|intcomma year=goal.year %}set a goal to read {{ count }} book in {{ year }}{% plural %}set a goal to read {{ count }} books in {{ year }}{% endblocktrans %}
+{% load i18n %}{% load humanize %}{% blocktrans count counter=goal.goal with counter=goal.goal year=goal.year %}set a goal to read {{ counter }} book in {{ year }}{% plural %}set a goal to read {{ counter }} books in {{ year }}{% endblocktrans %}

From 6e9fc0dbba3ec53274c7a90d202234b204bb9f3f Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Mon, 1 Mar 2021 09:56:30 +0100
Subject: [PATCH 0128/1285] Add missing quotes.

Resolve https://github.com/mouse-reeve/bookwyrm/pull/665#pullrequestreview-600325153
---
 locale/fr_FR/LC_MESSAGES/django.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index fdf9d4ff..c5f850be 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -29,7 +29,7 @@ msgstr "Wikipedia"
 #: bookwyrm/templates/author.html:34
 #, python-format
 msgid "Books by %(name)s"
-msgstr Livres par %(name)s
+msgstr "Livres par %(name)s"
 
 #: bookwyrm/templates/book.html:27 bookwyrm/templates/book.html:28
 msgid "Edit Book"

From 4a178d05cda54c70bac7f46a877bbbe1ab8262da Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Mon, 1 Mar 2021 10:01:24 +0100
Subject: [PATCH 0129/1285] [i18n:French] Remove _il y a_ for duration since
 registration.

Resolve https://github.com/mouse-reeve/bookwyrm/pull/665#pullrequestreview-600328048
---
 locale/fr_FR/LC_MESSAGES/django.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index c5f850be..7ddc9143 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -1443,4 +1443,4 @@ msgstr "Défi lecture"
 #: bookwyrm/templates/user/user_preview.html:13
 #, python-format
 msgid "Joined %(date)s"
-msgstr "Enregistré(e) il y a %(date)s"
+msgstr "Enregistré(e) %(date)s"

From 51a76792e782afe898b102e1d1a8c0463f15f9d3 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Mon, 1 Mar 2021 10:26:45 +0100
Subject: [PATCH 0130/1285] [i18n:French] Update headers with proper data.

---
 locale/fr_FR/LC_MESSAGES/django.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 7ddc9143..58124ac7 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -1,4 +1,4 @@
-# English language text for the bookwyrm UI
+# French language text for the bookwyrm UI
 # Copyright (C) 2021 Mouse Reeve
 # This file is distributed under the same license as the bookwyrm package.
 # Mouse Reeve <mousereeve@riseup.net>, 2021
@@ -8,11 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-28 08:42-0800\n"
-"PO-Revision-Date: 2021-02-27 13:50+PST\n"
-"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
+"POT-Creation-Date: 2021-02-28 19:54+0100\n"
+"PO-Revision-Date: 2021-03-01 10:10+0100\n"
+"Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
-"Language: English \n"
+"Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

From d16e4dc8088bdfaddf7a3858929a44a9066e683b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 1 Mar 2021 09:32:03 -0800
Subject: [PATCH 0131/1285] Enumerates notification options for translation

---
 bookwyrm/templates/notifications.html | 46 ++++++++++++++++++++++++---
 1 file changed, 41 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html
index b6074a4a..f6fd7dab 100644
--- a/bookwyrm/templates/notifications.html
+++ b/bookwyrm/templates/notifications.html
@@ -45,13 +45,37 @@
                             {% include 'snippets/avatar.html' with user=notification.related_user %}
                             {% include 'snippets/username.html' with user=notification.related_user %}
                             {% if notification.notification_type == 'FAVORITE' %}
-                                {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path %}favorited your <a href="{{ related_path }}">{{ preview_name }}</a>{% endblocktrans %}
+                                {% if related_status.status_type == 'Review' %}
+                                {% blocktrans with book_title=related_status.book.title related_path=related_status.local_path %}favorited your <a href="{{ related_path }}">review of <em>{{ book_title }}</em></a>{% endblocktrans %}
+                                {% elif related_status.status_type == 'Comment' %}
+                                {% blocktrans with book_title=related_status.book.title related_path=related_status.local_path %}favorited your <a href="{{ related_path }}">comment on <em>{{ book_title }}</em></a>{% endblocktrans %}
+                                {% elif related_status.status_type == 'Quotation' %}
+                                {% blocktrans with book_title=related_status.book.title related_path=related_status.local_path %}favorited your <a href="{{ related_path }}">quote from <em>{{ book_title }}</em></a>{% endblocktrans %}
+                                {% else %}
+                                {% blocktrans with related_path=related_status.local_path %}favorited your <a href="{{ related_path }}">status</a>{% endblocktrans %}
+                                {% endif %}
 
                             {% elif notification.notification_type == 'MENTION' %}
-                                {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path %}mentioned you in a <a href="{{ related_path }}">{{ preview_name }}</a>{% endblocktrans %}
+                                {% if related_status.status_type == 'Review' %}
+                                {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}mentioned you in a <a href="{{ related_path }}">review of <em>{{ book_title }}</em></a>{% endblocktrans %}
+                                {% elif related_status.status_type == 'Comment' %}
+                                {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}mentioned you in a <a href="{{ related_path }}">comment on <em>{{ book_title }}</em></a>{% endblocktrans %}
+                                {% elif related_status.status_type == 'Quotation' %}
+                                {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}mentioned you in a <a href="{{ related_path }}">quote from <em>{{ book_title }}</em></a>{% endblocktrans %}
+                                {% else %}
+                                {% blocktrans with related_path=related_status.local_path %}mentioned you in a <a href="{{ related_path }}">status</a>{% endblocktrans %}
+                                {% endif %}
 
                             {% elif notification.notification_type == 'REPLY' %}
-                                {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path parent_path=related_status.reply_parent.local_path %}<a href="{{ related_path }}">replied</a> to your <a href="{{ parent_path }}">{{ preview_name }}</a>{% endblocktrans %}
+                                {% if related_status.status_type == 'Review' %}
+                                {% blocktrans with related_path=related_status.local_path parent_path=related_status.reply_parent.local_path book_title=related_status.reply_parent.book.title %}<a href="{{ related_path }}">replied</a> to your <a href="{{ parent_path }}">review of <em>{{ book_title }}</em></a>{% endblocktrans %}
+                                {% elif related_status.status_type == 'Comment' %}
+                                {% blocktrans with related_path=related_status.local_path parent_path=related_status.reply_parent.local_path book_title=related_status.reply_parent.book.title %}<a href="{{ related_path }}">replied</a> to your <a href="{{ parent_path }}">comment on <em>{{ book_title }}</em></a>{% endblocktrans %}
+                                {% elif related_status.status_type == 'Quotation' %}
+                                {% blocktrans with related_path=related_status.local_path parent_path=related_status.reply_parent.local_path book_title=related_status.reply_parent.book.title %}<a href="{{ related_path }}">replied</a> to your <a href="{{ parent_path }}">quote from <em>{{ book_title }}</em></a>{% endblocktrans %}
+                                {% else %}
+                                {% blocktrans with related_path=related_status.local_path parent_path=related_status.reply_parent.local_path %}<a href="{{ related_path }}">replied</a> to your <a href="{{ parent_path }}">status</a>{% endblocktrans %}
+                                {% endif %}
 
                             {% elif notification.notification_type == 'FOLLOW' %}
                                 {% trans "followed you" %}
@@ -62,9 +86,21 @@
                                     {% include 'snippets/follow_request_buttons.html' with user=notification.related_user %}
                                 </div>
                             {% elif notification.notification_type == 'BOOST' %}
-                                {% blocktrans with preview_name=related_status|status_preview_name|safe related_path=related_status.local_path %}boosted your <a href="{{ related_path }}">{{ preview_name }}</a>{% endblocktrans %}
+                                {% if related_status.status_type == 'Review' %}
+                                {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}boosted your <a href="{{ related_path }}">review of <em>{{ book.title }}</em></a>{% endblocktrans %}
+                                {% elif related_status.status_type == 'Comment' %}
+                                {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}boosted your <a href="{{ related_path }}">comment on<em>{{ book.title }}</em></a>{% endblocktrans %}
+                                {% elif related_status.status_type == 'Quotation' %}
+                                {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}boosted your <a href="{{ related_path }}">quote from <em>{{ book.title }}</em></a>{% endblocktrans %}
+                                {% else %}
+                                {% blocktrans with related_path=related_status.local_path %}boosted your <a href="{{ related_path }}">status</a>{% endblocktrans %}
+                                {% endif %}
                             {% elif notification.notification_type == 'ADD' %}
-                            {% if notification.related_list_item.approved %}{% trans "added" %}{% else %}{% trans "suggested adding" %}{% endif %} {% include 'snippets/book_titleby.html' with book=notification.related_list_item.book %} to your list "<a href="{{ notification.related_list_item.book_list.local_path }}{% if not notification.related_list_item.approved %}/curate{% endif %}">{{ notification.related_list_item.book_list.name }}</a>"
+                                {% if notification.related_list_item.approved %}
+                                {% blocktrans with book_path=notification.related_list_item.book.local_path book_title=notification.related_list_item.book.title list_path=notification.related_list_item.book_list.local_path list_name=notification.related_list_item.book_list.name %} added <em><a href="{{ book_path }}">{{ book_title }}</a></em> to your list "<a href="{{ list_path }}">{{ list_name }}</a>"{% endblocktrans %}
+                                {% else %}
+                                {% blocktrans with book_path=notification.related_list_item.book.local_path book_title=notification.related_list_item.book.title list_path=notification.related_list_item.book_list.local_path list_name=notification.related_list_item.book_list.name %} suggested adding <em><a href="{{ book_path }}">{{ book_title }}</a></em> to your list "<a href="{{ list_path }}/curate">{{ list_name }}</a>"{% endblocktrans %}
+                                {% endif %}
                             {% endif %}
                         {% elif notification.related_import %}
                             {% blocktrans with related_id=notification.related_import.id %} your <a href="/import/{{ related_id }}">import</a> completed.{% endblocktrans %}

From 5a484e7f218333c869a3a399e7f2154de45fdc36 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 1 Mar 2021 09:33:04 -0800
Subject: [PATCH 0132/1285] Updates translation file

---
 locale/en_US/LC_MESSAGES/django.po | 130 ++++++++++++++++++++++++-----
 1 file changed, 110 insertions(+), 20 deletions(-)

diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index f33b27d0..85175813 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-28 17:19-0800\n"
+"POT-Creation-Date: 2021-03-01 09:32-0800\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"
@@ -135,7 +135,7 @@ msgstr ""
 msgid "rated it"
 msgstr ""
 
-#: bookwyrm/templates/components/inline_form.html:7
+#: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/feed/feed_layout.html:51
 msgid "Close"
 msgstr ""
@@ -753,50 +753,140 @@ msgstr ""
 msgid "Delete notifications"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:48
+#: bookwyrm/templates/notifications.html:49
 #, python-format
-msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid ""
+"favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</"
+"em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:51
 #, python-format
-msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid ""
+"favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</"
+"em></a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:54
+#: bookwyrm/templates/notifications.html:53
 #, python-format
 msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">"
-"%(preview_name)s</a>"
+"favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
+"em></a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:57
-msgid "followed you"
+#: bookwyrm/templates/notifications.html:55
+#, python-format
+msgid "favorited your <a href=\"%(related_path)s\">status</a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:60
+#, python-format
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">review of <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:62
+#, python-format
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">comment on <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:64
+#, python-format
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">quote from <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:66
+#, python-format
+msgid "mentioned you in a <a href=\"%(related_path)s\">status</a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:71
+#, python-format
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">review of <em>%(book_title)s</em></a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:73
+#, python-format
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">comment on <em>%(book_title)s</em></a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:75
+#, python-format
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">quote from <em>%(book_title)s</em></a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:77
+#, python-format
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">status</a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:81
+msgid "followed you"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:84
 msgid "sent you a follow request"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:65
+#: bookwyrm/templates/notifications.html:90
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid ""
+"boosted your <a href=\"%(related_path)s\">review of <em>%(book.title)s</em></"
+"a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:67
-msgid "added"
+#: bookwyrm/templates/notifications.html:92
+#, python-format
+msgid ""
+"boosted your <a href=\"%(related_path)s\">comment on<em>%(book.title)s</em></"
+"a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:67
-msgid "suggested adding"
+#: bookwyrm/templates/notifications.html:94
+#, python-format
+msgid ""
+"boosted your <a href=\"%(related_path)s\">quote from <em>%(book.title)s</"
+"em></a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:70
+#: bookwyrm/templates/notifications.html:96
+#, python-format
+msgid "boosted your <a href=\"%(related_path)s\">status</a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:100
+#, python-format
+msgid ""
+" added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
+"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:102
+#, python-format
+msgid ""
+" suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to "
+"your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:106
 #, python-format
 msgid " your <a href=\"/import/%(related_id)s\">import</a> completed."
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:102
+#: bookwyrm/templates/notifications.html:138
 msgid "You're all caught up!"
 msgstr ""
 
@@ -1193,8 +1283,8 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/generated_status/goal.html:1
 #, python-format
-msgid "set a goal to read %(count)s book in %(year)s"
-msgid_plural "set a goal to read %(count)s books in %(year)s"
+msgid "set a goal to read %(counter)s book in %(year)s"
+msgid_plural "set a goal to read %(counter)s books in %(year)s"
 msgstr[0] ""
 msgstr[1] ""
 

From 1d206c37394a63cb538aa94431af956238658169 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 1 Mar 2021 09:55:54 -0800
Subject: [PATCH 0133/1285] Fixes (hopefully) makemessages command

---
 Dockerfile | 1 +
 bw-dev     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7456996e..99d2671c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,6 +10,7 @@ WORKDIR /app
 
 COPY requirements.txt /app/
 RUN pip install -r requirements.txt
+RUN apt-get update && apt-get install -y gettext libgettextpo-dev
 
 COPY ./bookwyrm /app
 COPY ./celerywyrm /app
diff --git a/bw-dev b/bw-dev
index 27dbc4c3..7a003d01 100755
--- a/bw-dev
+++ b/bw-dev
@@ -91,10 +91,10 @@ case "$CMD" in
         execweb python manage.py collectstatic --no-input
         ;;
     makemessages)
-        django-admin makemessages --extension html --ignore=venv3 $@
+        execweb django-admin makemessages --extension html --ignore=venv3 $@
         ;;
     compilemessages)
-        django-admin compilemessages --ignore venv3 $@
+        execweb django-admin compilemessages --ignore venv3 $@
         ;;
     build)
         docker-compose build

From e74ac6db70c0d6e14ec9573ae16554fc20d0ea27 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Mon, 1 Mar 2021 19:59:47 +0100
Subject: [PATCH 0134/1285] [i18n:fr_FR] Compile locale successfully.

---
 locale/fr_FR/LC_MESSAGES/django.mo | Bin 0 -> 20458 bytes
 locale/fr_FR/LC_MESSAGES/django.po |  32 +++++++++++++++--------------
 2 files changed, 17 insertions(+), 15 deletions(-)
 create mode 100644 locale/fr_FR/LC_MESSAGES/django.mo

diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..85fe5bc0510e88835fd4fc746f6e8f352c661fbd
GIT binary patch
literal 20458
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

literal 0
HcmV?d00001

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 58124ac7..3101b7f2 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-28 19:54+0100\n"
+"POT-Creation-Date: 2021-03-01 18:43+0000\n"
 "PO-Revision-Date: 2021-03-01 10:10+0100\n"
 "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -321,8 +321,7 @@ msgstr "Vos livres"
 #: bookwyrm/templates/feed/feed_layout.html:11
 msgid ""
 "There are no books here right now! Try searching for a book to get started"
-msgstr ""
-"Aucun livre ici pour l’instant ! Cherchez un livre pour commencer"
+msgstr "Aucun livre ici pour l’instant ! Cherchez un livre pour commencer"
 
 #: bookwyrm/templates/feed/feed_layout.html:68
 #, python-format
@@ -345,8 +344,8 @@ msgid ""
 "Set a goal for how many books you'll finish reading in %(year)s, and track "
 "your progress throughout the year."
 msgstr ""
-"Définissez un nombre de livre à lire comme objectif pour %(year)s, et suivez"
-"votre progression au fil de l’année."
+"Définissez un nombre de livre à lire comme objectif pour %(year)s, et "
+"suivezvotre progression au fil de l’année."
 
 #: bookwyrm/templates/goal.html:38
 #, python-format
@@ -648,12 +647,14 @@ msgstr "Supprimer les notifications"
 #: bookwyrm/templates/notifications.html:45
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
-msgstr "a ajouté <a href=\"%(related_path)s\">%(preview_name)s</a> à ses favoris"
+msgstr ""
+"a ajouté <a href=\"%(related_path)s\">%(preview_name)s</a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:48
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
-msgstr "vous a mentionné dans un(e) <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgstr ""
+"vous a mentionné dans un(e) <a href=\"%(related_path)s\">%(preview_name)s</a>"
 
 #: bookwyrm/templates/notifications.html:51
 #, python-format
@@ -661,8 +662,8 @@ msgid ""
 "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">"
 "%(preview_name)s</a>"
 msgstr ""
-"<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">"
-"%(preview_name)s</a>"
+"<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s"
+"\">%(preview_name)s</a>"
 
 #: bookwyrm/templates/notifications.html:54
 msgid "followed you"
@@ -688,7 +689,8 @@ msgstr "a suggéré l’ajout de"
 #: bookwyrm/templates/notifications.html:67
 #, python-format
 msgid " your <a href=\"/import/%(related_id)s\">import</a> completed."
-msgstr " votre <a href=\"/import/%(related_id)s\">importation</a> est terminée."
+msgstr ""
+" votre <a href=\"/import/%(related_id)s\">importation</a> est terminée."
 
 #: bookwyrm/templates/notifications.html:99
 msgid "You're all caught up!"
@@ -710,7 +712,8 @@ msgstr "Confirmer"
 
 #: bookwyrm/templates/password_reset_request.html:10
 msgid "A link to reset your password will be sent to your email address"
-msgstr "Un lien pour changer votre mot de passe sera envoyé à votre addresse email"
+msgstr ""
+"Un lien pour changer votre mot de passe sera envoyé à votre addresse email"
 
 #: bookwyrm/templates/password_reset_request.html:14
 #: bookwyrm/templates/preferences/edit_user.html:35
@@ -1033,8 +1036,7 @@ msgstr "Supprimer ces dates de lecture ?"
 msgid ""
 "You are deleting this readthrough and its %(count)s associated progress "
 "updates."
-msgstr ""
-"Vous avez supprimé ce résumé et ses %(count)s progressions associées."
+msgstr "Vous avez supprimé ce résumé et ses %(count)s progressions associées."
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
 #: bookwyrm/templates/snippets/follow_request_buttons.html:13
@@ -1088,8 +1090,8 @@ msgid ""
 "You can set or change your reading goal any time from your <a href=\"%(path)s"
 "\">profile page</a>"
 msgstr ""
-"Vous pouvez définir ou changer vore défi lecture à n’importe quel moment"
-"depuis votre <a href=\"%(path)s\">profil</a>"
+"Vous pouvez définir ou changer vore défi lecture à n’importe quel "
+"moment depuis votre <a href=\"%(path)s\">profil</a>"
 
 #: bookwyrm/templates/snippets/goal_form.html:9
 msgid "Reading goal:"

From 252d1a3c8878ac16f3d29ec2da467794d6915b72 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Mon, 1 Mar 2021 22:09:31 +0100
Subject: [PATCH 0135/1285] [i18n:fr_FR] Update locale.

---
 locale/fr_FR/LC_MESSAGES/django.mo | Bin 20458 -> 20860 bytes
 locale/fr_FR/LC_MESSAGES/django.po | 956 +++++++++++++++++++++--------
 2 files changed, 693 insertions(+), 263 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index 85fe5bc0510e88835fd4fc746f6e8f352c661fbd..b89fd71bf9c3e45ccc4dc38a8f5e9a12fa950a4d 100644
GIT binary patch
delta 8450
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%0Am)L=_HI;J$X}ApMU@5+iMc8hd`<j+w
zzOExpt;lLJsbmhLR&vz%A!;W+!!+zL-F-xvm`u43s=g5Q){HduRj6k_3$=4z)Q;U`
zuHS}gw*eV1V%<k3g^GvGg=bI$yo3dK7`39WP%967&$8n1yJ-Q19};JYpA(N07g9fS
zv!9A3rg9yQr~YBaw+hJUwfGS+llU2N8PUcx9Erc9Je*id%p<g=7t$Frqlk1<q3ykp
zw9+l6u-o`6<8#==_|{v5-t(=5lD1P@c!Y>2Y6ztu@l#?O@t;H^p>)zE_BqGo_3V{?
zNsM6u2l1#XNUsoj+mtlEHH;gywR$C#cnPda%<2!5&m%m<6T}IkFQHScw4V4=EXTjR
z(B>HVe<AcUJeqPxB7vAdTyO6Ctq~%z_no&Smd5c}MhxQSN3kpZ8Xq8fk=M6a94cw%
z6@*^fZp1Bw-udpt?+K-eF0ub0t!z))b|Ee$pN9?VrIo@Dh^GjpLBs)~il`=(GP(I}
zEWsq=$yhD_wv6u)dV|_ge<6({-;cuOrfvuM!Ne?LGI1fD(kk@YDRt-Om3S|qKQbno
z#`lp|x<VhOt~U;&*i7h~FM(J=oF|m@L!(s6eSL{(<m-tJ#P^7Ii9$l-TjfL>Wk}x;
zzag$8MiNQ^q8puzAa0A*xF7FBF?Gq9flBj<Jw&c4k5DCPAmx|vQ{oX~Gr?~~#5zaj
z4}|^)gwkrFg?N+LPNY*`f`6T^G!+~0KZsRCh!{iY*YQI7Z!-4~3yHgl4)m8plo7XT
z{cETkLMSaK(zvh>ZzkR$lm<}uXS{<*Cf|ohB!45(iM-McF4nci7qLCp;)yTG&o%W~
z=6)4>L?|pJGaMJ28*Vq|;7!CbVkhwe@erXjiu+%6vsNK_rGF(7$sfYch@Qj{$~G~U
z{4a>n#9f3^f9fNSo439&euSM&{%ic0=t_*`W~E6k`n|CpBW&VBLTN8iN9-at5(R|P
z0HTQYsl<=Te?m+rNRikd5^mo8+yuo$XH)qVX4CLxQ}!7}lz4-<hRElh(|8$vH+?|i
z`$P)$pX2jHIr$0rpq~Fw3V)<<Aw5kdoA?P)OZ*$*C6q4Z-nMQw_Su>8adNYXXHESx
zcoor>YfAs+V(rH(s2ga?F*5mlomgZl@5k4OJBgHNQLk~GYW!he$O#k#?K*!$gMX>l
zw<y}!Yi&inCuj#8Ppv)5W7h|qy3x6L`AwcseL*mHOkTdOTpMdjLw}u}m%qsGY52CL
z+V5W+998TYGbs9TuQ}cFCwW73*5IeRklzkB)p|lsPC?6SnLmz;2D5rZW-kvk+Fp8U
za(s5s9}d(wP#0S22{?o7Yy4rm#^bYV{Jv1YTOAHLwm(3BP5wZLR>81COW(zb)`vn(
z!4bv9i@c%waP^=Xe`9f@KOA(50*<r9Dc0ncGGOkQ3U6pqxO!A^ye4{U*4*fstO+e;
z*+=7ZytNJk1j7v>_9ftNwEdxaC%`O1o(BIS25jlkXGL7gy1w1oB>0<xIW0T;JrF;>
z-oMoLG&Gn62Cb`9(clD4uF)TG+`7Nfb<6kxx$)6p(X=F|ftfok`->{#D*7+ceE#vL
z5no)<A@*=AK7%2rHoCRAcW1B98?1L~E%yXCwf1s<I9gRwzsL#M9$QaVk1aNSUjD@c
zqmFE^kB7h9@o<8y;NQPL_?Hbro&b|*X)W0l*X3fzo@&3(=QKLLP%wJ!;9V0uc0>5$
z<NZI+VK5x{>x0<fUBX_wC-JMnzUa+E2DW5eR@o-nFf21tZVrO&1VeV%XY*veHD0H|
zZtzy?+|A<9*iHWM5@*G?XOBa`X{_^j1CCwGxeIujbPR(O?CRLbu$Oo}7bp8S&SH=M
z{V>MP;;`GI{Y&S!L`#<@7FKzJ*M}LGgJcH|H0w}$G~oNIws^uJmiOIb*>3dZZQ6~~
z_AT@JeJxj%rNt*T1>axwcuvcd^3jR&s`L)gS;)_86pZ!R6!0&immv2Ctr<>JgVzaI
z;}0~unF|g6{^%`hDuyORU##>emwO%G62}*ADW0-Eu98jkXbb-t&+xgbsp;-BwVF6O
zo<#?mqcu}=qpwZPjOX!3r<e4O&Ysp3VfuBPYBr5s@>hS~sR?=O^o$zx;J$l^W4+mY
Y?R<NR|DSDxf6<s%mUEj>bD-J!ANPfvzW@LL

delta 8020
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

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 3101b7f2..a780ee34 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-01 18:43+0000\n"
+"POT-Creation-Date: 2021-03-01 21:06+0000\n"
 "PO-Revision-Date: 2021-03-01 10:10+0100\n"
 "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -18,102 +18,140 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/templates/author.html:13 bookwyrm/templates/author.html:14
+#: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
+#: bookwyrm/templates/edit_author.html:5
 msgid "Edit Author"
 msgstr "Modifier l’auteur ou autrice"
 
-#: bookwyrm/templates/author.html:29
+#: bookwyrm/templates/author.html:32
 msgid "Wikipedia"
 msgstr "Wikipedia"
 
-#: bookwyrm/templates/author.html:34
+#: bookwyrm/templates/author.html:37
 #, python-format
 msgid "Books by %(name)s"
 msgstr "Livres par %(name)s"
 
-#: bookwyrm/templates/book.html:27 bookwyrm/templates/book.html:28
+#: bookwyrm/templates/book.html:29 bookwyrm/templates/book.html:30
+#: bookwyrm/templates/edit_book.html:5
 msgid "Edit Book"
 msgstr "Modifier le livre"
 
-#: bookwyrm/templates/book.html:43
+#: bookwyrm/templates/book.html:45
 msgid "Add cover"
 msgstr "Ajouter une couverture"
 
-#: bookwyrm/templates/book.html:49 bookwyrm/templates/lists/list.html:89
+#: bookwyrm/templates/book.html:51 bookwyrm/templates/lists/list.html:89
 msgid "Add"
 msgstr "Ajouter"
 
-#: bookwyrm/templates/book.html:58
+#: bookwyrm/templates/book.html:60
 msgid "ISBN:"
 msgstr "ISBN :"
 
-#: bookwyrm/templates/book.html:65 bookwyrm/templates/edit_book.html:104
+#: bookwyrm/templates/book.html:67 bookwyrm/templates/edit_book.html:107
 msgid "OCLC Number:"
 msgstr "Numéro OCLC :"
 
-#: bookwyrm/templates/book.html:72 bookwyrm/templates/edit_book.html:108
+#: bookwyrm/templates/book.html:74 bookwyrm/templates/edit_book.html:111
 msgid "ASIN:"
 msgstr "ASIN :"
 
-#: bookwyrm/templates/book.html:84
+#: bookwyrm/templates/book.html:86
 msgid "View on OpenLibrary"
 msgstr "Voir sur OpenLibrary"
 
-#: bookwyrm/templates/book.html:102 bookwyrm/templates/edit_book.html:36
+#: bookwyrm/templates/book.html:98
+#, fuzzy
+#| msgid "Description:"
+msgid "Add Description"
+msgstr "Ajouter une description"
+
+#: bookwyrm/templates/book.html:105 bookwyrm/templates/edit_book.html:39
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Description :"
 
-#: bookwyrm/templates/book.html:106 bookwyrm/templates/edit_author.html:75
-#: bookwyrm/templates/edit_book.html:117 bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:47
-#: bookwyrm/templates/settings/site.html:86
+#: bookwyrm/templates/book.html:109 bookwyrm/templates/edit_author.html:78
+#: bookwyrm/templates/edit_book.html:120 bookwyrm/templates/lists/form.html:42
+#: bookwyrm/templates/preferences/edit_user.html:50
+#: bookwyrm/templates/settings/site.html:89
 #: bookwyrm/templates/snippets/progress_update.html:21
-#: bookwyrm/templates/snippets/readthrough.html:61
+#: bookwyrm/templates/snippets/readthrough.html:64
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
 msgid "Save"
 msgstr "Enregistrer"
 
-#: bookwyrm/templates/book.html:138
+#: bookwyrm/templates/book.html:110 bookwyrm/templates/book.html:159
+#: bookwyrm/templates/edit_author.html:79 bookwyrm/templates/edit_book.html:121
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
+#: bookwyrm/templates/snippets/goal_form.html:32
+#: bookwyrm/templates/snippets/readthrough.html:65
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
+msgid "Cancel"
+msgstr "Annuler"
+
+#: bookwyrm/templates/book.html:142
 msgid "Your reading activity"
 msgstr "Votre activité de lecture"
 
 #: bookwyrm/templates/book.html:144
+#, fuzzy
+#| msgid "Edit read dates"
+msgid "Add read dates"
+msgstr "Ajouter des dates de lecture"
+
+#: bookwyrm/templates/book.html:149
 msgid "You don't have any reading activity for this book."
 msgstr "Vous n’avez aucune activité de lecture pour ce livre"
 
-#: bookwyrm/templates/book.html:151
+#: bookwyrm/templates/book.html:156
 msgid "Create"
 msgstr "Créer"
 
-#: bookwyrm/templates/book.html:172
+#: bookwyrm/templates/book.html:178
 msgid "Tags"
 msgstr "Tags"
 
-#: bookwyrm/templates/book.html:176 bookwyrm/templates/snippets/tag.html:18
+#: bookwyrm/templates/book.html:182 bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr "Ajouter un tag"
 
-#: bookwyrm/templates/book.html:193
+#: bookwyrm/templates/book.html:199
 msgid "Subjects"
 msgstr "Sujets"
 
-#: bookwyrm/templates/book.html:204
+#: bookwyrm/templates/book.html:210
 msgid "Places"
 msgstr "Lieux"
 
-#: bookwyrm/templates/book.html:215 bookwyrm/templates/layout.html:64
-#: bookwyrm/templates/lists/lists.html:6
-#: bookwyrm/templates/search_results.html:85
-#: bookwyrm/templates/user/user_layout.html:60
+#: bookwyrm/templates/book.html:221 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
+#: bookwyrm/templates/search_results.html:90
+#: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listes"
 
-#: bookwyrm/templates/book.html:244
+#: bookwyrm/templates/book.html:250
 msgid "rated it"
 msgstr "l’a noté"
 
+#: bookwyrm/templates/components/inline_form.html:8
+#: bookwyrm/templates/feed/feed_layout.html:51
+#, fuzzy
+#| msgid "Closed"
+msgid "Close"
+msgstr "Fermer"
+
+#: bookwyrm/templates/discover/about.html:7
+#, fuzzy, python-format
+#| msgid "Join %(name)s"
+msgid "About %(site_name)s"
+msgstr "À propos de %(name)s"
+
 #: bookwyrm/templates/discover/about.html:10
 #: bookwyrm/templates/discover/about.html:20
 msgid "Code of Conduct"
@@ -128,162 +166,184 @@ msgstr "Politique de vie privée"
 msgid "Recent Books"
 msgstr "Livres récents"
 
-#: bookwyrm/templates/discover/landing_layout.html:15
+#: bookwyrm/templates/discover/landing_layout.html:5
+msgid "Welcome"
+msgstr "Bienvenue"
+
+#: bookwyrm/templates/discover/landing_layout.html:17
 msgid "Decentralized"
 msgstr "Décentralisé"
 
-#: bookwyrm/templates/discover/landing_layout.html:21
+#: bookwyrm/templates/discover/landing_layout.html:23
 msgid "Friendly"
 msgstr "Sympa"
 
-#: bookwyrm/templates/discover/landing_layout.html:27
+#: bookwyrm/templates/discover/landing_layout.html:29
 msgid "Anti-Corporate"
 msgstr "Anti‑commercial"
 
-#: bookwyrm/templates/discover/landing_layout.html:42
+#: bookwyrm/templates/discover/landing_layout.html:44
 #, python-format
 msgid "Join %(name)s"
 msgstr "Rejoignez %(name)s"
 
-#: bookwyrm/templates/discover/landing_layout.html:47
-#: bookwyrm/templates/login.html:46
+#: bookwyrm/templates/discover/landing_layout.html:49
+#: bookwyrm/templates/login.html:48
 msgid "This instance is closed"
 msgstr "Cette instance est fermée"
 
-#: bookwyrm/templates/discover/landing_layout.html:53
+#: bookwyrm/templates/discover/landing_layout.html:55
 msgid "Your Account"
 msgstr "Votre compte"
 
-#: bookwyrm/templates/edit_author.html:10 bookwyrm/templates/edit_book.html:10
+#: bookwyrm/templates/edit_author.html:13 bookwyrm/templates/edit_book.html:13
 msgid "Added:"
 msgstr "AJouté :"
 
-#: bookwyrm/templates/edit_author.html:11 bookwyrm/templates/edit_book.html:11
+#: bookwyrm/templates/edit_author.html:14 bookwyrm/templates/edit_book.html:14
 msgid "Updated:"
 msgstr "Mis à jour :"
 
-#: bookwyrm/templates/edit_author.html:12 bookwyrm/templates/edit_book.html:12
+#: bookwyrm/templates/edit_author.html:15 bookwyrm/templates/edit_book.html:15
 msgid "Last edited by:"
 msgstr "Dernière modification par :"
 
-#: bookwyrm/templates/edit_author.html:28 bookwyrm/templates/edit_book.html:27
+#: bookwyrm/templates/edit_author.html:31 bookwyrm/templates/edit_book.html:30
 msgid "Metadata"
 msgstr "Métadonnées"
 
-#: bookwyrm/templates/edit_author.html:29 bookwyrm/templates/lists/form.html:8
+#: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
 #: bookwyrm/templates/user/create_shelf_form.html:13
 #: bookwyrm/templates/user/edit_shelf_form.html:14
 msgid "Name:"
 msgstr "Nom :"
 
-#: bookwyrm/templates/edit_author.html:34
+#: bookwyrm/templates/edit_author.html:37
 msgid "Bio:"
 msgstr "Bio :"
 
-#: bookwyrm/templates/edit_author.html:39
+#: bookwyrm/templates/edit_author.html:42
 msgid "Wikipedia link:"
 msgstr "Wikipedia :"
 
-#: bookwyrm/templates/edit_author.html:44
+#: bookwyrm/templates/edit_author.html:47
 msgid "Birth date:"
 msgstr "Date de naissance :"
 
-#: bookwyrm/templates/edit_author.html:49
+#: bookwyrm/templates/edit_author.html:52
 msgid "Death date:"
 msgstr "Date de décès :"
 
-#: bookwyrm/templates/edit_author.html:55
+#: bookwyrm/templates/edit_author.html:58
 msgid "Author Identifiers"
 msgstr "Identifiants de l’auteur ou autrice"
 
-#: bookwyrm/templates/edit_author.html:56 bookwyrm/templates/edit_book.html:100
+#: bookwyrm/templates/edit_author.html:59 bookwyrm/templates/edit_book.html:103
 msgid "Openlibrary key:"
 msgstr "Clé Openlibrary :"
 
-#: bookwyrm/templates/edit_author.html:61
+#: bookwyrm/templates/edit_author.html:64
 msgid "Librarything key:"
 msgstr "Clé Librarything :"
 
-#: bookwyrm/templates/edit_author.html:66
+#: bookwyrm/templates/edit_author.html:69
 msgid "Goodreads key:"
 msgstr "Clé Goodreads :"
 
-#: bookwyrm/templates/edit_author.html:76 bookwyrm/templates/edit_book.html:118
-msgid "Cancel"
-msgstr "Annuler les modifications"
-
-#: bookwyrm/templates/edit_book.html:28
-#: bookwyrm/templates/snippets/create_status_form.html:10
+#: bookwyrm/templates/edit_book.html:31
 msgid "Title:"
 msgstr "Titre :"
 
-#: bookwyrm/templates/edit_book.html:32
+#: bookwyrm/templates/edit_book.html:35
 msgid "Subtitle:"
 msgstr "Sous‑titre :"
 
-#: bookwyrm/templates/edit_book.html:40
+#: bookwyrm/templates/edit_book.html:43
 msgid "Series:"
 msgstr "Série :"
 
-#: bookwyrm/templates/edit_book.html:44
+#: bookwyrm/templates/edit_book.html:47
 msgid "Series number:"
 msgstr "Numéro dans la série :"
 
-#: bookwyrm/templates/edit_book.html:48
+#: bookwyrm/templates/edit_book.html:51
 msgid "First published date:"
 msgstr "Première date de publication :"
 
-#: bookwyrm/templates/edit_book.html:52
+#: bookwyrm/templates/edit_book.html:55
 msgid "Published date:"
 msgstr "Date de publication :"
 
-#: bookwyrm/templates/edit_book.html:65
+#: bookwyrm/templates/edit_book.html:68
 #: bookwyrm/templates/snippets/shelf.html:9
 msgid "Cover"
 msgstr "Couverture"
 
-#: bookwyrm/templates/edit_book.html:75
+#: bookwyrm/templates/edit_book.html:78
 msgid "Physical Properties"
 msgstr "Propriétés physiques"
 
-#: bookwyrm/templates/edit_book.html:76
+#: bookwyrm/templates/edit_book.html:79
 msgid "Format:"
 msgstr "Format :"
 
-#: bookwyrm/templates/edit_book.html:84
+#: bookwyrm/templates/edit_book.html:87
 msgid "Pages:"
 msgstr "Pages :"
 
-#: bookwyrm/templates/edit_book.html:91
+#: bookwyrm/templates/edit_book.html:94
 msgid "Book Identifiers"
 msgstr "Identifiants du livre"
 
-#: bookwyrm/templates/edit_book.html:92
+#: bookwyrm/templates/edit_book.html:95
 msgid "ISBN 13:"
 msgstr "ISBN 13 :"
 
-#: bookwyrm/templates/edit_book.html:96
+#: bookwyrm/templates/edit_book.html:99
 msgid "ISBN 10:"
 msgstr "ISBN 10 :"
 
-#: bookwyrm/templates/editions.html:6
+#: bookwyrm/templates/editions.html:5
+#, fuzzy, python-format
+#| msgid "Finish \"<em>%(book_title)s</em>\""
+msgid "Editions of %(book_title)s"
+msgstr "Éditions de %(book_title)s"
+
+#: bookwyrm/templates/editions.html:9
 #, python-format
 msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 msgstr "Éditions de <a href=\"%(work_path)s\">« %(work_title)s »</a>"
 
-#: bookwyrm/templates/error.html:6
+#: bookwyrm/templates/error.html:4
+msgid "Oops!"
+msgstr "Oups !"
+
+#: bookwyrm/templates/error.html:8
 msgid "Server Error"
 msgstr "Erreur côté serveur"
 
-#: bookwyrm/templates/error.html:7
+#: bookwyrm/templates/error.html:9
 msgid "Something went wrong! Sorry about that."
 msgstr "Une erreur s’est produite ; désolé !"
 
-#: bookwyrm/templates/feed/direct_messages.html:7
+#: bookwyrm/templates/feed/direct_messages.html:8
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
+
+#: bookwyrm/templates/feed/direct_messages.html:10
+#: bookwyrm/templates/layout.html:79
+#, fuzzy
+#| msgid "Send direct message"
+msgid "Direct Messages"
+msgstr "Messages directs"
+
+#: bookwyrm/templates/feed/direct_messages.html:13
 msgid "All messages"
 msgstr "Tous les messages"
 
-#: bookwyrm/templates/feed/direct_messages.html:16
+#: bookwyrm/templates/feed/direct_messages.html:22
 msgid "You have no messages right now."
 msgstr "Vous n’avez aucun message pour l’instant."
 
@@ -314,21 +374,28 @@ msgid ""
 msgstr ""
 "Aucune activité pour l’instant ! Abonnez‑vous à quelqu’un pour commencer"
 
-#: bookwyrm/templates/feed/feed_layout.html:9
+#: bookwyrm/templates/feed/feed_layout.html:5
+#, fuzzy
+#| msgid "Updated:"
+msgid "Updates"
+msgstr "Mises à jour"
+
+#: bookwyrm/templates/feed/feed_layout.html:11
 msgid "Your books"
 msgstr "Vos livres"
 
-#: bookwyrm/templates/feed/feed_layout.html:11
+#: bookwyrm/templates/feed/feed_layout.html:13
 msgid ""
 "There are no books here right now! Try searching for a book to get started"
 msgstr "Aucun livre ici pour l’instant ! Cherchez un livre pour commencer"
 
-#: bookwyrm/templates/feed/feed_layout.html:68
+#: bookwyrm/templates/feed/feed_layout.html:73 bookwyrm/templates/goal.html:26
+#: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
 msgid "%(year)s Reading Goal"
 msgstr "Défi lecture pour %(year)s"
 
-#: bookwyrm/templates/feed/status.html:7
+#: bookwyrm/templates/feed/status.html:8
 msgid "Back"
 msgstr "Retour"
 
@@ -337,7 +404,13 @@ msgstr "Retour"
 msgid "%(year)s Reading Progress"
 msgstr "Progression de lecture pour %(year)s"
 
-#: bookwyrm/templates/goal.html:29
+#: bookwyrm/templates/goal.html:11
+#, fuzzy
+#| msgid "Edit Book"
+msgid "Edit Goal"
+msgstr "Modifier le défi"
+
+#: bookwyrm/templates/goal.html:30
 #: bookwyrm/templates/snippets/goal_card.html:13
 #, python-format
 msgid ""
@@ -347,110 +420,132 @@ msgstr ""
 "Définissez un nombre de livre à lire comme objectif pour %(year)s, et "
 "suivezvotre progression au fil de l’année."
 
-#: bookwyrm/templates/goal.html:38
+#: bookwyrm/templates/goal.html:39
 #, python-format
 msgid "%(name)s hasn't set a reading goal for %(year)s."
 msgstr "%(name)s n’a aucun défi lecture pour %(year)s."
 
-#: bookwyrm/templates/import.html:6
+#: bookwyrm/templates/goal.html:51
+#, fuzzy, python-format
+#| msgid "Your books"
+msgid "Your %(year)s Books"
+msgstr "Vos livres en %(year)s"
+
+#: bookwyrm/templates/goal.html:53
+#, fuzzy, python-format
+#| msgid "%(username)s has no followers"
+msgid "%(username)s's %(year)s Books"
+msgstr "Livres de %(username)s en %(year)s"
+
+#: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
+#: bookwyrm/templates/layout.html:94
 msgid "Import Books"
 msgstr "Importer des livres"
 
-#: bookwyrm/templates/import.html:11
+#: bookwyrm/templates/import.html:14
 msgid "Data source"
 msgstr "Source de données"
 
-#: bookwyrm/templates/import.html:29
+#: bookwyrm/templates/import.html:32
 msgid "Include reviews"
 msgstr "Importer les critiques"
 
-#: bookwyrm/templates/import.html:34
+#: bookwyrm/templates/import.html:37
 msgid "Privacy setting for imported reviews:"
 msgstr "Confidentialité des critiques importées :"
 
-#: bookwyrm/templates/import.html:38
+#: bookwyrm/templates/import.html:41
 msgid "Import"
 msgstr "Importer"
 
-#: bookwyrm/templates/import.html:43
+#: bookwyrm/templates/import.html:46
 msgid "Recent Imports"
 msgstr "Importations récentes"
 
-#: bookwyrm/templates/import.html:45
+#: bookwyrm/templates/import.html:48
 msgid "No recent imports"
 msgstr "Aucune importation récente"
 
-#: bookwyrm/templates/import_status.html:7
+#: bookwyrm/templates/import_status.html:6
+#: bookwyrm/templates/import_status.html:10
 msgid "Import Status"
 msgstr "Statut de l’importation"
 
-#: bookwyrm/templates/import_status.html:10
+#: bookwyrm/templates/import_status.html:13
 msgid "Import started:"
 msgstr "Importation en cours :"
 
-#: bookwyrm/templates/import_status.html:14
+#: bookwyrm/templates/import_status.html:17
 msgid "Import completed:"
 msgstr "Importation terminé :"
 
-#: bookwyrm/templates/import_status.html:17
+#: bookwyrm/templates/import_status.html:20
 msgid "TASK FAILED"
 msgstr "la tâche a échoué"
 
-#: bookwyrm/templates/import_status.html:23
+#: bookwyrm/templates/import_status.html:26
 msgid "Import still in progress."
 msgstr "L’importation est toujours en cours"
 
-#: bookwyrm/templates/import_status.html:25
+#: bookwyrm/templates/import_status.html:28
 msgid "(Hit reload to update!)"
 msgstr "(Rechargez la page pour mettre à jour !"
 
-#: bookwyrm/templates/import_status.html:32
+#: bookwyrm/templates/import_status.html:35
 msgid "Failed to load"
 msgstr "Le chargement a échoué"
 
-#: bookwyrm/templates/import_status.html:56
+#: bookwyrm/templates/import_status.html:59
 msgid "Select all"
 msgstr "Tout sélectionner"
 
-#: bookwyrm/templates/import_status.html:59
+#: bookwyrm/templates/import_status.html:62
 msgid "Retry items"
 msgstr "Essayer d’importer les objets sélectionnés de nouveau"
 
-#: bookwyrm/templates/import_status.html:81
+#: bookwyrm/templates/import_status.html:84
 msgid "Successfully imported"
 msgstr "Importation réussie"
 
-#: bookwyrm/templates/import_status.html:85
+#: bookwyrm/templates/import_status.html:88
 #: bookwyrm/templates/lists/curate.html:14
 msgid "Book"
 msgstr "Livre"
 
-#: bookwyrm/templates/import_status.html:88
+#: bookwyrm/templates/import_status.html:91
+#: bookwyrm/templates/snippets/create_status_form.html:10
 #: bookwyrm/templates/snippets/shelf.html:10
 msgid "Title"
 msgstr "Titre"
 
-#: bookwyrm/templates/import_status.html:91
+#: bookwyrm/templates/import_status.html:94
 #: bookwyrm/templates/snippets/shelf.html:11
 msgid "Author"
 msgstr "Auteur ou autrice"
 
-#: bookwyrm/templates/import_status.html:114
+#: bookwyrm/templates/import_status.html:117
 msgid "Imported"
 msgstr "Importé"
 
-#: bookwyrm/templates/invite.html:9 bookwyrm/templates/login.html:41
+#: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12
+#: bookwyrm/templates/login.html:43
 msgid "Create an Account"
 msgstr "Créer un compte"
 
-#: bookwyrm/templates/invite.html:18
+#: bookwyrm/templates/invite.html:21
 msgid "Permission Denied"
 msgstr "Autorisation refusée"
 
-#: bookwyrm/templates/invite.html:19
+#: bookwyrm/templates/invite.html:22
 msgid "Sorry! This invite code is no longer valid."
 msgstr "Cette invitation n’est plus valide ; désolé !"
 
+#: bookwyrm/templates/layout.html:33
+#, fuzzy
+#| msgid "Search for a book"
+msgid "Search for a book or user"
+msgstr "Chercher un livre ou un compte"
+
 #: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
 #: bookwyrm/templates/lists/list.html:62
 msgid "Search"
@@ -468,19 +563,47 @@ msgstr "Vos étagères"
 msgid "Feed"
 msgstr "Fil d’actualité"
 
+#: bookwyrm/templates/layout.html:84
+#: bookwyrm/templates/preferences/preferences_layout.html:14
+msgid "Profile"
+msgstr "Profil"
+
+#: bookwyrm/templates/layout.html:89
+#, fuzzy
+#| msgid "Instance Settings"
+msgid "Settings"
+msgstr "Paramètres de l’instance"
+
+#: bookwyrm/templates/layout.html:103
+#: bookwyrm/templates/settings/admin_layout.html:19
+#: bookwyrm/templates/settings/manage_invites.html:3
+msgid "Invites"
+msgstr "Invitations"
+
+#: bookwyrm/templates/layout.html:110
+msgid "Site Configuration"
+msgstr "Configuration du site"
+
+#: bookwyrm/templates/layout.html:117
+#, fuzzy
+#| msgid "Log in"
+msgid "Log out"
+msgstr "Se déconnecter"
+
 #: bookwyrm/templates/layout.html:125 bookwyrm/templates/layout.html:126
-#: bookwyrm/templates/notifications.html:7
+#: bookwyrm/templates/notifications.html:6
+#: bookwyrm/templates/notifications.html:10
 msgid "Notifications"
 msgstr "Notifications"
 
 #: bookwyrm/templates/layout.html:143 bookwyrm/templates/layout.html:147
-#: bookwyrm/templates/login.html:15
+#: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "Nom d’utilisateur :"
 
-#: bookwyrm/templates/layout.html:152 bookwyrm/templates/login.html:8
-#: bookwyrm/templates/login.html:31
+#: bookwyrm/templates/layout.html:152 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "Se connecter"
 
@@ -492,7 +615,16 @@ msgstr "À propos de ce serveur"
 msgid "Contact site admin"
 msgstr "Contacter l’administrateur du site"
 
+#: bookwyrm/templates/layout.html:198
+msgid ""
+"BookWyrm is open source software. You can contribute or report issues on <a "
+"href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgstr ""
+"Bookwyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports "
+"de bogues via <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+
 #: bookwyrm/templates/lists/create_form.html:5
+#: bookwyrm/templates/lists/lists.html:17
 msgid "Create List"
 msgstr "Créer une liste"
 
@@ -521,6 +653,7 @@ msgid "Discard"
 msgstr "Rejeter"
 
 #: bookwyrm/templates/lists/edit_form.html:5
+#: bookwyrm/templates/lists/list_layout.html:17
 msgid "Edit List"
 msgstr "Modifier la liste"
 
@@ -598,171 +731,324 @@ msgid "Suggest"
 msgstr "Suggérer"
 
 #: bookwyrm/templates/lists/list_items.html:19
-#: bookwyrm/templates/lists/list_layout.html:9
+#: bookwyrm/templates/lists/list_layout.html:11
 msgid "Created and curated by"
 msgstr "Créée et modérée par"
 
 #: bookwyrm/templates/lists/list_items.html:19
-#: bookwyrm/templates/lists/list_layout.html:9
+#: bookwyrm/templates/lists/list_layout.html:11
 msgid "Created by"
 msgstr "Créée par"
 
-#: bookwyrm/templates/lists/lists.html:11
+#: bookwyrm/templates/lists/lists.html:14
 msgid "Your lists"
 msgstr "Vos listes"
 
-#: bookwyrm/templates/lists/lists.html:36
+#: bookwyrm/templates/lists/lists.html:40
 msgid "Recent Lists"
 msgstr "Listes récentes"
 
-#: bookwyrm/templates/login.html:21 bookwyrm/templates/password_reset.html:15
+#: bookwyrm/templates/login.html:4
+msgid "Login"
+msgstr "Connexion"
+
+#: bookwyrm/templates/login.html:23 bookwyrm/templates/password_reset.html:17
 #: bookwyrm/templates/snippets/register_form.html:22
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: bookwyrm/templates/login.html:34
+#: bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr "Mot de passe oublié ?"
 
-#: bookwyrm/templates/login.html:47
+#: bookwyrm/templates/login.html:49
 msgid "Contact an administrator to get an invite"
 msgstr "Contacter un administrateur pour obtenir une invitation"
 
-#: bookwyrm/templates/login.html:57
+#: bookwyrm/templates/login.html:59
 msgid "More about this site"
 msgstr "En savoir plus sur ce site"
 
-#: bookwyrm/templates/notfound.html:6
+#: bookwyrm/templates/notfound.html:4 bookwyrm/templates/notfound.html:8
 msgid "Not Found"
 msgstr "Introuvable"
 
-#: bookwyrm/templates/notfound.html:7
+#: bookwyrm/templates/notfound.html:9
 msgid "The page your requested doesn't seem to exist!"
 msgstr "Il semblerait que la page que vous avez demandée n’existe pas !"
 
-#: bookwyrm/templates/notifications.html:11
+#: bookwyrm/templates/notifications.html:14
 msgid "Delete notifications"
 msgstr "Supprimer les notifications"
 
-#: bookwyrm/templates/notifications.html:45
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+#: bookwyrm/templates/notifications.html:49
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid ""
+"favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</"
+"em></a>"
 msgstr ""
-"a ajouté <a href=\"%(related_path)s\">%(preview_name)s</a> à ses favoris"
-
-#: bookwyrm/templates/notifications.html:48
-#, python-format
-msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
-msgstr ""
-"vous a mentionné dans un(e) <a href=\"%(related_path)s\">%(preview_name)s</a>"
+"a ajouté votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</"
+"em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:51
-#, python-format
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">"
-"%(preview_name)s</a>"
+"favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+"a ajouté votre <a href=\"%(related_path)s\">commentaire sur <em>"
+"%(book_title)s</em></a> à ses favoris"
+
+#: bookwyrm/templates/notifications.html:53
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid ""
+"favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+"a ajouté votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</"
+"em></a> à ses favoris"
+
+#: bookwyrm/templates/notifications.html:55
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid "favorited your <a href=\"%(related_path)s\">status</a>"
+msgstr "a ajouté votre <a href=\"%(related_path)s\">message</a> à ses favoris"
+
+#: bookwyrm/templates/notifications.html:60
+#, fuzzy, python-format
+#| msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">review of <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+"vous a mentionné dans sa <a href=\"%(related_path)s\">critique de <em>"
+"%(book_title)s</em></a>"
+
+#: bookwyrm/templates/notifications.html:62
+#, fuzzy, python-format
+#| msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">comment on <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+"vous a mentionné dans son <a href=\"%(related_path)s\">commentaire sur <em>"
+"%(book_title)s</em></a>"
+
+#: bookwyrm/templates/notifications.html:64
+#, fuzzy, python-format
+#| msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">quote from <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+"vous a mentionné dans sa <a href=\"%(related_path)s\">citation de <em>"
+"%(book_title)s</em></a>"
+
+#: bookwyrm/templates/notifications.html:66
+#, fuzzy, python-format
+#| msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid "mentioned you in a <a href=\"%(related_path)s\">status</a>"
+msgstr "vous a mentionné dans son <a href=\"%(related_path)s\">message</a>"
+
+#: bookwyrm/templates/notifications.html:71
+#, fuzzy, python-format
+#| msgid ""
+#| "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+#| "\">%(preview_name)s</a>"
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">review of <em>%(book_title)s</em></a>"
 msgstr ""
 "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s"
-"\">%(preview_name)s</a>"
+"\">critique de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:54
+#: bookwyrm/templates/notifications.html:73
+#, fuzzy, python-format
+#| msgid ""
+#| "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+#| "\">%(preview_name)s</a>"
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">comment on <em>%(book_title)s</em></a>"
+msgstr ""
+"<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s"
+"\">commentaire sur <em>%(book_title)s</em></a>"
+
+#: bookwyrm/templates/notifications.html:75
+#, fuzzy, python-format
+#| msgid ""
+#| "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+#| "\">%(preview_name)s</a>"
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">quote from <em>%(book_title)s</em></a>"
+msgstr ""
+"<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s"
+"\">citation de <em>%(book_title)s</em></a>"
+
+#: bookwyrm/templates/notifications.html:77
+#, fuzzy, python-format
+#| msgid ""
+#| "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+#| "\">%(preview_name)s</a>"
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">status</a>"
+msgstr ""
+"<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s"
+"\">message</a>"
+
+#: bookwyrm/templates/notifications.html:81
 msgid "followed you"
 msgstr "s’est abonné(e)"
 
-#: bookwyrm/templates/notifications.html:57
+#: bookwyrm/templates/notifications.html:84
 msgid "sent you a follow request"
 msgstr "vous a envoyé une demande d’abonnement"
 
-#: bookwyrm/templates/notifications.html:62
-#, python-format
-msgid "boosted your <a href=\"%(related_path)s\">%(preview_name)s</a>"
-msgstr "a partagé votre <a href=\"%(related_path)s\">%(preview_name)s</a>"
+#: bookwyrm/templates/notifications.html:90
+#, fuzzy, python-format
+#| msgid "boosted your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid ""
+"boosted your <a href=\"%(related_path)s\">review of <em>%(book.title)s</em></"
+"a>"
+msgstr ""
+"a partagé votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</"
+"em></a>"
 
-#: bookwyrm/templates/notifications.html:64
-msgid "added"
-msgstr "a ajouté"
+#: bookwyrm/templates/notifications.html:92
+#, fuzzy, python-format
+#| msgid "boosted your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid ""
+"boosted your <a href=\"%(related_path)s\">comment on<em>%(book.title)s</em></"
+"a>"
+msgstr ""
+"a partagé votre <a href=\"%(related_path)s\">commentaire sur <em>"
+"%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:64
-msgid "suggested adding"
-msgstr "a suggéré l’ajout de"
+#: bookwyrm/templates/notifications.html:94
+#, fuzzy, python-format
+#| msgid "boosted your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid ""
+"boosted your <a href=\"%(related_path)s\">quote from <em>%(book.title)s</"
+"em></a>"
+msgstr ""
+"a partagé votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</"
+"em></a>"
 
-#: bookwyrm/templates/notifications.html:67
+#: bookwyrm/templates/notifications.html:96
+#, fuzzy, python-format
+#| msgid "boosted your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid "boosted your <a href=\"%(related_path)s\">status</a>"
+msgstr "a partagé votre <a href=\"%(related_path)s\">message</a>"
+
+#: bookwyrm/templates/notifications.html:100
+#, fuzzy, python-format
+#| msgid ""
+#| "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+#| "\">%(preview_name)s</a>"
+msgid ""
+" added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
+"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgstr ""
+" a ajouté <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre "
+"liste « <a href=\"%(list_path)s\">%(list_name)s</a> »"
+
+#: bookwyrm/templates/notifications.html:102
+#, fuzzy, python-format
+#| msgid ""
+#| "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+#| "\">%(preview_name)s</a>"
+msgid ""
+" suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to "
+"your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgstr ""
+" a suggégré l’ajout de <em><a href=\"%(book_path)s\">%(book_title)s</a></em> "
+"à votre liste « <a href=\"%(list_path)s/curate\">%(list_name)s</a> »"
+
+#: bookwyrm/templates/notifications.html:106
 #, python-format
 msgid " your <a href=\"/import/%(related_id)s\">import</a> completed."
 msgstr ""
 " votre <a href=\"/import/%(related_id)s\">importation</a> est terminée."
 
-#: bookwyrm/templates/notifications.html:99
+#: bookwyrm/templates/notifications.html:138
 msgid "You're all caught up!"
 msgstr "Aucune nouvelle notification !"
 
-#: bookwyrm/templates/password_reset.html:8
-#: bookwyrm/templates/password_reset_request.html:8
+#: bookwyrm/templates/password_reset.html:4
+#: bookwyrm/templates/password_reset.html:10
+#: bookwyrm/templates/password_reset_request.html:4
+#: bookwyrm/templates/password_reset_request.html:10
 msgid "Reset Password"
 msgstr "Changez le mot de passe"
 
-#: bookwyrm/templates/password_reset.html:21
-#: bookwyrm/templates/preferences/change_password.html:15
+#: bookwyrm/templates/password_reset.html:23
+#: bookwyrm/templates/preferences/change_password.html:18
 msgid "Confirm password:"
 msgstr "Confirmez le mot de passe :"
 
-#: bookwyrm/templates/password_reset.html:28
+#: bookwyrm/templates/password_reset.html:30
 msgid "Confirm"
 msgstr "Confirmer"
 
-#: bookwyrm/templates/password_reset_request.html:10
+#: bookwyrm/templates/password_reset_request.html:12
 msgid "A link to reset your password will be sent to your email address"
 msgstr ""
 "Un lien pour changer votre mot de passe sera envoyé à votre addresse email"
 
-#: bookwyrm/templates/password_reset_request.html:14
-#: bookwyrm/templates/preferences/edit_user.html:35
+#: bookwyrm/templates/password_reset_request.html:16
+#: bookwyrm/templates/preferences/edit_user.html:38
 #: bookwyrm/templates/snippets/register_form.html:13
 msgid "Email address:"
 msgstr "Adresse email :"
 
-#: bookwyrm/templates/password_reset_request.html:21
+#: bookwyrm/templates/password_reset_request.html:23
 msgid "Reset password"
 msgstr "Changer de mot de passe"
 
-#: bookwyrm/templates/preferences/blocks.html:5
+#: bookwyrm/templates/preferences/blocks.html:4
+#: bookwyrm/templates/preferences/blocks.html:7
+#: bookwyrm/templates/preferences/preferences_layout.html:23
 msgid "Blocked Users"
 msgstr "Comptes bloqués"
 
-#: bookwyrm/templates/preferences/blocks.html:10
+#: bookwyrm/templates/preferences/blocks.html:12
 msgid "No users currently blocked."
 msgstr "Aucun compte bloqué actuellement"
 
 #: bookwyrm/templates/preferences/change_password.html:4
+#: bookwyrm/templates/preferences/change_password.html:7
+#: bookwyrm/templates/preferences/change_password.html:21
+#: bookwyrm/templates/preferences/preferences_layout.html:17
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
-#: bookwyrm/templates/preferences/change_password.html:11
+#: bookwyrm/templates/preferences/change_password.html:14
 msgid "New password:"
 msgstr "Nouveau mot de passe :"
 
-#: bookwyrm/templates/preferences/change_password.html:18
-#: bookwyrm/templates/preferences/preferences_layout.html:17
-msgid "Change password"
-msgstr "Changer le mot de passe"
-
 #: bookwyrm/templates/preferences/edit_user.html:4
+#: bookwyrm/templates/preferences/edit_user.html:7
 msgid "Edit Profile"
 msgstr "Modifier le profil"
 
-#: bookwyrm/templates/preferences/edit_user.html:14
+#: bookwyrm/templates/preferences/edit_user.html:17
 msgid "Avatar:"
 msgstr "Avatar :"
 
-#: bookwyrm/templates/preferences/edit_user.html:21
+#: bookwyrm/templates/preferences/edit_user.html:24
 msgid "Display name:"
 msgstr "Nom affiché :"
 
-#: bookwyrm/templates/preferences/edit_user.html:28
+#: bookwyrm/templates/preferences/edit_user.html:31
 msgid "Summary:"
 msgstr "Résumé :"
 
-#: bookwyrm/templates/preferences/edit_user.html:43
+#: bookwyrm/templates/preferences/edit_user.html:46
 msgid "Manually approve followers:"
 msgstr "Autoriser les abonnements manuellement :"
 
@@ -770,106 +1056,116 @@ msgstr "Autoriser les abonnements manuellement :"
 msgid "Account"
 msgstr "Compte"
 
-#: bookwyrm/templates/preferences/preferences_layout.html:14
-msgid "Profile"
-msgstr "Profil"
-
 #: bookwyrm/templates/preferences/preferences_layout.html:20
 msgid "Relationships"
 msgstr "Relations"
 
-#: bookwyrm/templates/preferences/preferences_layout.html:23
-msgid "Blocked users"
-msgstr "Comptes bloqués"
+#: bookwyrm/templates/search_results.html:4
+#, fuzzy
+#| msgid "Search Results for \"%(query)s\""
+msgid "Search Results"
+msgstr "Résultats de recherche"
 
-#: bookwyrm/templates/search_results.html:6
+#: bookwyrm/templates/search_results.html:9
 #, python-format
 msgid "Search Results for \"%(query)s\""
 msgstr "Résultats de recherche pour « %(query)s »"
 
-#: bookwyrm/templates/search_results.html:11
+#: bookwyrm/templates/search_results.html:14
 msgid "Matching Books"
 msgstr "Livres correspondants"
 
-#: bookwyrm/templates/search_results.html:14
+#: bookwyrm/templates/search_results.html:17
 #, python-format
 msgid "No books found for \"%(query)s\""
 msgstr "Aucun livre trouvé pour « %(query)s »"
 
-#: bookwyrm/templates/search_results.html:30
+#: bookwyrm/templates/search_results.html:33
 msgid "Didn't find what you were looking for?"
 msgstr "Vous n’avez pas trouvé ce que vous cherchiez ?"
 
-#: bookwyrm/templates/search_results.html:53
+#: bookwyrm/templates/search_results.html:35
+msgid "Show results from other catalogues"
+msgstr "Montrer les résultats d’autres catalogues"
+
+#: bookwyrm/templates/search_results.html:57
 msgid "Import book"
 msgstr "Importer le livre"
 
-#: bookwyrm/templates/search_results.html:70
+#: bookwyrm/templates/search_results.html:67
+msgid "Hide results from other catalogues"
+msgstr "Masquer les résultats d’autres catalogues"
+
+#: bookwyrm/templates/search_results.html:75
 msgid "Matching Users"
 msgstr "Comptes correspondants"
 
-#: bookwyrm/templates/search_results.html:72
+#: bookwyrm/templates/search_results.html:77
 #, python-format
 msgid "No users found for \"%(query)s\""
 msgstr "Aucun compte trouvé pour « %(query)s »"
 
-#: bookwyrm/templates/search_results.html:87
+#: bookwyrm/templates/search_results.html:92
 #, python-format
 msgid "No lists found for \"%(query)s\""
 msgstr "Aucune liste trouvée pour « %(query)s »"
 
-#: bookwyrm/templates/settings/admin_layout.html:12
+#: bookwyrm/templates/settings/admin_layout.html:4
+#, fuzzy
+#| msgid "Registration"
+msgid "Administration"
+msgstr "Administration"
+
+#: bookwyrm/templates/settings/admin_layout.html:15
 msgid "Manage Users"
 msgstr "Gérer les comptes"
 
-#: bookwyrm/templates/settings/admin_layout.html:16
-#: bookwyrm/templates/settings/manage_invites.html:3
-msgid "Invites"
-msgstr "Invitations"
-
-#: bookwyrm/templates/settings/admin_layout.html:20
-#: bookwyrm/templates/settings/federation.html:3
+#: bookwyrm/templates/settings/admin_layout.html:23
+#: bookwyrm/templates/settings/federation.html:4
 msgid "Federated Servers"
 msgstr "Serveurs fédérés"
 
-#: bookwyrm/templates/settings/admin_layout.html:25
+#: bookwyrm/templates/settings/admin_layout.html:28
 msgid "Instance Settings"
 msgstr "Paramètres de l’instance"
 
-#: bookwyrm/templates/settings/admin_layout.html:29
-#: bookwyrm/templates/settings/site.html:3
-msgid "Site Configuration"
-msgstr "Configuration du site"
-
 #: bookwyrm/templates/settings/admin_layout.html:32
-#: bookwyrm/templates/settings/site.html:10
+#: bookwyrm/templates/settings/site.html:4
+#: bookwyrm/templates/settings/site.html:6
+#, fuzzy
+#| msgid "Instance Settings"
+msgid "Site Settings"
+msgstr "Paramètres du site"
+
+#: bookwyrm/templates/settings/admin_layout.html:35
+#: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr "Information sur l’instance"
 
-#: bookwyrm/templates/settings/admin_layout.html:33
-#: bookwyrm/templates/settings/site.html:36
+#: bookwyrm/templates/settings/admin_layout.html:36
+#: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr "Images"
 
-#: bookwyrm/templates/settings/admin_layout.html:34
-#: bookwyrm/templates/settings/site.html:56
+#: bookwyrm/templates/settings/admin_layout.html:37
+#: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr "Contenu du pied de page"
 
-#: bookwyrm/templates/settings/admin_layout.html:35
-#: bookwyrm/templates/settings/site.html:74
+#: bookwyrm/templates/settings/admin_layout.html:38
+#: bookwyrm/templates/settings/site.html:77
 msgid "Registration"
 msgstr "Enregistrement"
 
-#: bookwyrm/templates/settings/federation.html:9
+#: bookwyrm/templates/settings/federation.html:10
 msgid "Server name"
 msgstr "Nom du serveur"
 
-#: bookwyrm/templates/settings/federation.html:10
+#: bookwyrm/templates/settings/federation.html:11
 msgid "Software"
 msgstr "Logiciel"
 
-#: bookwyrm/templates/settings/federation.html:11
+#: bookwyrm/templates/settings/federation.html:12
 msgid "Status"
 msgstr "Statut"
 
@@ -909,55 +1205,55 @@ msgstr "Nombre de fois utilisée"
 msgid "No active invites"
 msgstr "Aucune invitation active"
 
-#: bookwyrm/templates/settings/site.html:12
+#: bookwyrm/templates/settings/site.html:15
 msgid "Instance Name:"
 msgstr "Nom de l’instance :"
 
-#: bookwyrm/templates/settings/site.html:16
+#: bookwyrm/templates/settings/site.html:19
 msgid "Tagline:"
 msgstr "Slogan :"
 
-#: bookwyrm/templates/settings/site.html:20
+#: bookwyrm/templates/settings/site.html:23
 msgid "Instance description:"
 msgstr "Description de l’instance :"
 
-#: bookwyrm/templates/settings/site.html:24
+#: bookwyrm/templates/settings/site.html:27
 msgid "Code of conduct:"
 msgstr "Code de conduite :"
 
-#: bookwyrm/templates/settings/site.html:28
+#: bookwyrm/templates/settings/site.html:31
 msgid "Privacy Policy:"
 msgstr "Politique de vie privée :"
 
-#: bookwyrm/templates/settings/site.html:39
+#: bookwyrm/templates/settings/site.html:42
 msgid "Logo:"
 msgstr "Logo :"
 
-#: bookwyrm/templates/settings/site.html:43
+#: bookwyrm/templates/settings/site.html:46
 msgid "Logo small:"
 msgstr "Logo réduit :"
 
-#: bookwyrm/templates/settings/site.html:47
+#: bookwyrm/templates/settings/site.html:50
 msgid "Favicon:"
 msgstr "Favicon :"
 
-#: bookwyrm/templates/settings/site.html:58
+#: bookwyrm/templates/settings/site.html:61
 msgid "Support link:"
 msgstr "URL pour soutenir l’instance :"
 
-#: bookwyrm/templates/settings/site.html:62
+#: bookwyrm/templates/settings/site.html:65
 msgid "Support title:"
 msgstr "Titre pour soutenir l’instance :"
 
-#: bookwyrm/templates/settings/site.html:66
+#: bookwyrm/templates/settings/site.html:69
 msgid "Admin email:"
 msgstr "Email de l’administrateur :"
 
-#: bookwyrm/templates/settings/site.html:76
+#: bookwyrm/templates/settings/site.html:79
 msgid "Allow registration:"
 msgstr "Autoriser l’enregistrement :"
 
-#: bookwyrm/templates/settings/site.html:80
+#: bookwyrm/templates/settings/site.html:83
 msgid "Registration closed text:"
 msgstr "Texte affiché lorsque les enregistrements sont clos :"
 
@@ -969,10 +1265,16 @@ msgstr "Bloquer"
 msgid "Un-block"
 msgstr "Débloquer"
 
+#: bookwyrm/templates/snippets/book_titleby.html:3
+#, fuzzy, python-format
+#| msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+msgid "<a href=\"%(path)s\">%(title)s</a> by "
+msgstr "<a href=\"%(path)s\">%(title)s</a> par "
+
 #: bookwyrm/templates/snippets/boost_button.html:8
 #: bookwyrm/templates/snippets/boost_button.html:9
-#: bookwyrm/templates/snippets/status/status_body.html:40
 #: bookwyrm/templates/snippets/status/status_body.html:41
+#: bookwyrm/templates/snippets/status/status_body.html:42
 msgid "Boost status"
 msgstr "Partager le statut"
 
@@ -989,15 +1291,16 @@ msgstr "Alerte Spoiler :"
 msgid "Spoilers ahead!"
 msgstr "Attention spoilers !"
 
-#: bookwyrm/templates/snippets/create_status.html:8
+#: bookwyrm/templates/snippets/create_status.html:9
 msgid "Review"
 msgstr "Critique"
 
-#: bookwyrm/templates/snippets/create_status.html:11
+#: bookwyrm/templates/snippets/create_status.html:12
+#: bookwyrm/templates/snippets/create_status_form.html:44
 msgid "Comment"
 msgstr "Commentaire"
 
-#: bookwyrm/templates/snippets/create_status.html:14
+#: bookwyrm/templates/snippets/create_status.html:15
 msgid "Quote"
 msgstr "Citation"
 
@@ -1012,18 +1315,20 @@ msgstr "Note"
 msgid "No rating"
 msgstr "Aucune note"
 
-#: bookwyrm/templates/snippets/create_status_form.html:44
-msgid "Comment:"
-msgstr "Commentaire :"
+#: bookwyrm/templates/snippets/create_status_form.html:54
+#, fuzzy
+#| msgid "Spoiler alert:"
+msgid "Include spoiler alert"
+msgstr "Afficher une alerte spoiler"
 
-#: bookwyrm/templates/snippets/create_status_form.html:59
+#: bookwyrm/templates/snippets/create_status_form.html:60
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:19
 msgid "Private"
 msgstr "Privé"
 
-#: bookwyrm/templates/snippets/create_status_form.html:66
+#: bookwyrm/templates/snippets/create_status_form.html:67
 msgid "Post"
 msgstr "Publier"
 
@@ -1045,8 +1350,8 @@ msgstr "Supprimer"
 
 #: bookwyrm/templates/snippets/fav_button.html:7
 #: bookwyrm/templates/snippets/fav_button.html:8
-#: bookwyrm/templates/snippets/status/status_body.html:44
 #: bookwyrm/templates/snippets/status/status_body.html:45
+#: bookwyrm/templates/snippets/status/status_body.html:46
 msgid "Like status"
 msgstr "Ajouter le statut aux favoris"
 
@@ -1075,10 +1380,12 @@ msgstr "Se désabonner"
 msgid "Accept"
 msgstr "Accepter"
 
-#: bookwyrm/templates/snippets/goal_card.html:6
+#: bookwyrm/templates/snippets/generated_status/goal.html:1
 #, python-format
-msgid "%(year)s reading goal"
-msgstr "Défi lecture pour %(year)s"
+msgid "set a goal to read %(counter)s book in %(year)s"
+msgid_plural "set a goal to read %(counter)s books in %(year)s"
+msgstr[0] "Définir l’objectif de lire %(counter)s livre en %(year)s"
+msgstr[1] "Définir l’objectif de lire %(counter)s livres en %(year)s"
 
 #: bookwyrm/templates/snippets/goal_card.html:21
 msgid "Dismiss message"
@@ -1090,8 +1397,8 @@ msgid ""
 "You can set or change your reading goal any time from your <a href=\"%(path)s"
 "\">profile page</a>"
 msgstr ""
-"Vous pouvez définir ou changer vore défi lecture à n’importe quel "
-"moment depuis votre <a href=\"%(path)s\">profil</a>"
+"Vous pouvez définir ou changer vore défi lecture à n’importe quel moment "
+"depuis votre <a href=\"%(path)s\">profil</a>"
 
 #: bookwyrm/templates/snippets/goal_form.html:9
 msgid "Reading goal:"
@@ -1125,6 +1432,23 @@ msgstr "Bravo !"
 msgid "%(percent)s%% complete!"
 msgstr "%(percent)s%% terminé !"
 
+#: bookwyrm/templates/snippets/goal_progress.html:10
+#, python-format
+msgid ""
+"You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgstr ""
+"Vous avez lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s livres</"
+"a>."
+
+#: bookwyrm/templates/snippets/goal_progress.html:12
+#, python-format
+msgid ""
+"%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s "
+"books</a>."
+msgstr ""
+"%(username)s a lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s "
+"livres</a>."
+
 #: bookwyrm/templates/snippets/pagination.html:7
 msgid "Previous"
 msgstr "Précédente"
@@ -1154,7 +1478,7 @@ msgid "Post privacy"
 msgstr "Confidentialité du message"
 
 #: bookwyrm/templates/snippets/privacy_select.html:16
-#: bookwyrm/templates/user/followers.html:17
+#: bookwyrm/templates/user/followers.html:13
 msgid "Followers"
 msgstr "Abonnements"
 
@@ -1193,18 +1517,29 @@ msgstr "Progression :"
 msgid "finished"
 msgstr "terminé"
 
-#: bookwyrm/templates/snippets/readthrough.html:29
+#: bookwyrm/templates/snippets/readthrough.html:14
+msgid "Show all updates"
+msgstr "Montrer toutes les progressions"
+
+#: bookwyrm/templates/snippets/readthrough.html:30
 msgid "Delete this progress update"
 msgstr "Supprimer cette mise à jour"
 
-#: bookwyrm/templates/snippets/readthrough.html:39
+#: bookwyrm/templates/snippets/readthrough.html:40
 msgid "started"
 msgstr "commencé"
 
-#: bookwyrm/templates/snippets/readthrough.html:57
+#: bookwyrm/templates/snippets/readthrough.html:46
+#: bookwyrm/templates/snippets/readthrough.html:60
 msgid "Edit read dates"
 msgstr "Modifier les date de lecture"
 
+#: bookwyrm/templates/snippets/readthrough.html:50
+#, fuzzy
+#| msgid "Delete these read dates?"
+msgid "Delete these read dates"
+msgstr "Supprimer ces dates de lecture"
+
 #: bookwyrm/templates/snippets/readthrough_form.html:7
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:19
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:17
@@ -1298,10 +1633,27 @@ msgstr "Terminer « <em>%(book_title)s</em> »"
 msgid "More shelves"
 msgstr "Plus d’étagères"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:10
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:8
+#, fuzzy
+#| msgid "Started reading"
+msgid "Start reading"
+msgstr "Commencer la lecture"
+
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
 msgid "Read"
 msgstr "Lire"
 
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
+#, fuzzy
+#| msgid "Finished reading"
+msgid "Finish reading"
+msgstr "Terminer la lecture"
+
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26
+msgid "Want to read"
+msgstr "A envie de lire"
+
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
 #, python-format
 msgid "Start \"<em>%(book_title)s</em>\""
@@ -1312,20 +1664,27 @@ msgstr "Commencer « <em>%(book_title)s</em> »"
 msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgstr "A envie de lire « <em>%(book_title)s</em> »"
 
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26
-msgid "Want to read"
-msgstr "A envie de lire"
-
 #: bookwyrm/templates/snippets/status/status.html:7
 msgid "boosted"
 msgstr "partagé"
 
-#: bookwyrm/templates/snippets/status/status_body.html:36
+#: bookwyrm/templates/snippets/status/status_body.html:24
 #: bookwyrm/templates/snippets/status/status_body.html:37
+#: bookwyrm/templates/snippets/status/status_body.html:38
 msgid "Reply"
 msgstr "Répondre"
 
-#: bookwyrm/templates/snippets/status/status_content.html:42
+#: bookwyrm/templates/snippets/status/status_content.html:16
+#: bookwyrm/templates/snippets/trimmed_text.html:12
+msgid "Show more"
+msgstr "Déplier"
+
+#: bookwyrm/templates/snippets/status/status_content.html:23
+#: bookwyrm/templates/snippets/trimmed_text.html:18
+msgid "Show less"
+msgstr "Replier"
+
+#: bookwyrm/templates/snippets/status/status_content.html:44
 msgid "Open image in new window"
 msgstr "Ouvrir l’image dans une nouvelle fenêtre"
 
@@ -1351,7 +1710,7 @@ msgstr "Changer vers cette édition"
 msgid "Remove tag"
 msgstr "Supprimer le tag"
 
-#: bookwyrm/templates/tag.html:7
+#: bookwyrm/templates/tag.html:9
 #, python-format
 msgid "Books tagged \"%(tag.name)s\""
 msgstr "Livres tagués « %(tag.name)s »"
@@ -1361,6 +1720,7 @@ msgid "Create New Shelf"
 msgstr "Créer une nouvelle étagère"
 
 #: bookwyrm/templates/user/create_shelf_form.html:22
+#: bookwyrm/templates/user/shelf.html:33
 msgid "Create shelf"
 msgstr "Créer l’étagère"
 
@@ -1372,73 +1732,112 @@ msgstr "Modifier l’étagère"
 msgid "Update shelf"
 msgstr "Mettre l’étagère à jour"
 
-#: bookwyrm/templates/user/followers.html:30
+#: bookwyrm/templates/user/followers.html:7
+#: bookwyrm/templates/user/following.html:7 bookwyrm/templates/user/user.html:9
+#, fuzzy
+#| msgid "User profile"
+msgid "User Profile"
+msgstr "Profil"
+
+#: bookwyrm/templates/user/followers.html:26
 #, python-format
 msgid "%(username)s has no followers"
 msgstr "%(username)s n’a pas d’abonné(e)"
 
-#: bookwyrm/templates/user/following.html:17
+#: bookwyrm/templates/user/following.html:13
 msgid "Following"
 msgstr "Abonné(e) à"
 
-#: bookwyrm/templates/user/following.html:30
+#: bookwyrm/templates/user/following.html:26
 #, python-format
 msgid "%(username)s isn't following any users"
 msgstr "%(username)s n’est abonné(e) à personne"
 
-#: bookwyrm/templates/user/lists.html:28
+#: bookwyrm/templates/user/lists.html:9
+#, fuzzy
+#| msgid "Your lists"
+msgid "Your Lists"
+msgstr "Vos listes"
+
+#: bookwyrm/templates/user/lists.html:11
+#, fuzzy, python-format
+#| msgid "Join %(name)s"
+msgid "Lists: %(username)s"
+msgstr "Listes : %(username)s"
+
+#: bookwyrm/templates/user/lists.html:17
+#, fuzzy
+#| msgid "Create list"
+msgid "Create new list"
+msgstr "Créer une nouvelle liste"
+
+#: bookwyrm/templates/user/lists.html:29
 msgid "Create list"
 msgstr "Créer une liste"
 
-#: bookwyrm/templates/user/user.html:7
-msgid "User profile"
-msgstr "Profil"
+#: bookwyrm/templates/user/shelf.html:9
+#, fuzzy
+#| msgid "Your shelves"
+msgid "Your Shelves"
+msgstr "Vos étagères"
 
-#: bookwyrm/templates/user/user.html:13
+#: bookwyrm/templates/user/shelf.html:11
+#, fuzzy, python-format
+#| msgid "%(username)s has no followers"
+msgid "%(username)s: Shelves"
+msgstr "%(username)s : Étagères"
+
+#: bookwyrm/templates/user/shelf.html:54
+#, fuzzy
+#| msgid "Edit Shelf"
+msgid "Edit shelf"
+msgstr "Modifier l’étagère"
+
+#: bookwyrm/templates/user/user.html:15
 msgid "Edit profile"
 msgstr "Modifier le profil"
 
-#: bookwyrm/templates/user/user.html:24
-#: bookwyrm/templates/user/user_layout.html:66
+#: bookwyrm/templates/user/user.html:26
+#: bookwyrm/templates/user/user_layout.html:68
 msgid "Shelves"
 msgstr "Étagères"
 
-#: bookwyrm/templates/user/user.html:29
+#: bookwyrm/templates/user/user.html:31
 #, python-format
 msgid "See all %(size)s"
 msgstr "Voir les %(size)s"
 
-#: bookwyrm/templates/user/user.html:42
+#: bookwyrm/templates/user/user.html:44
 #, python-format
 msgid "See all %(shelf_count)s shelves"
 msgstr "Voir les %(shelf_count)s étagères"
 
-#: bookwyrm/templates/user/user.html:54
+#: bookwyrm/templates/user/user.html:56
 #, python-format
 msgid "Set a reading goal for %(year)s"
 msgstr "Définir un défi lecture pour %(year)s"
 
-#: bookwyrm/templates/user/user.html:60
+#: bookwyrm/templates/user/user.html:62
 msgid "User Activity"
 msgstr "Activité du compte"
 
-#: bookwyrm/templates/user/user.html:63
+#: bookwyrm/templates/user/user.html:65
 msgid "RSS feed"
 msgstr "Flux RSS"
 
-#: bookwyrm/templates/user/user.html:74
+#: bookwyrm/templates/user/user.html:76
 msgid "No activities yet!"
 msgstr "Aucune activité pour l’instant !"
 
-#: bookwyrm/templates/user/user_layout.html:30
+#: bookwyrm/templates/user/user_layout.html:32
 msgid "Follow Requests"
 msgstr "Demandes d’abonnement"
 
-#: bookwyrm/templates/user/user_layout.html:48
+#: bookwyrm/templates/user/user_layout.html:50
 msgid "Activity"
 msgstr "Activité"
 
-#: bookwyrm/templates/user/user_layout.html:54
+#: bookwyrm/templates/user/user_layout.html:56
 msgid "Reading Goal"
 msgstr "Défi lecture"
 
@@ -1446,3 +1845,34 @@ msgstr "Défi lecture"
 #, python-format
 msgid "Joined %(date)s"
 msgstr "Enregistré(e) %(date)s"
+
+#: bookwyrm/templates/user/user_preview.html:15
+#, fuzzy, python-format
+#| msgid "%(username)s has no followers"
+msgid "%(counter)s follower"
+msgid_plural "%(counter)s followers"
+msgstr[0] "%(username)s n’a pas d’abonné(e)"
+msgstr[1] "%(username)s n’a pas d’abonné(e)s"
+
+#: bookwyrm/templates/user/user_preview.html:16
+#, python-format
+msgid "%(counter)s following"
+msgstr "%(counter)s abonnements"
+
+#~ msgid "added"
+#~ msgstr "a ajouté"
+
+#~ msgid "suggested adding"
+#~ msgstr "a suggéré l’ajout de"
+
+#~ msgid "Change password"
+#~ msgstr "Changer le mot de passe"
+
+#~ msgid "Blocked users"
+#~ msgstr "Comptes bloqués"
+
+#~ msgid "Comment:"
+#~ msgstr "Commentaire :"
+
+#~ msgid "%(year)s reading goal"
+#~ msgstr "Défi lecture pour %(year)s"

From 4f58e1b4885063e6efc070b68c3d50ed223cb9d5 Mon Sep 17 00:00:00 2001
From: GuDzpoz <GuDzpoz@live.com>
Date: Tue, 2 Mar 2021 17:51:13 +0800
Subject: [PATCH 0136/1285] Added Simplified Chinese translation

---
 locale/zh_CN/LC_MESSAGES/django.mo |  Bin 0 -> 23975 bytes
 locale/zh_CN/LC_MESSAGES/django.po | 1774 ++++++++++++++++++++++++++++
 2 files changed, 1774 insertions(+)
 create mode 100644 locale/zh_CN/LC_MESSAGES/django.mo
 create mode 100644 locale/zh_CN/LC_MESSAGES/django.po

diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..7c5aea3b92e5e7b08e8905098f523ce4123273f5
GIT binary patch
literal 23975
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

literal 0
HcmV?d00001

diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
new file mode 100644
index 00000000..cecf2ac1
--- /dev/null
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -0,0 +1,1774 @@
+# Chinese language text for the bookwyrm UI
+# Copyright (C) 2021 Mouse Reeve
+# This file is distributed under the same license as the BookWyrm package.
+# Mouse Reeve <mousereeve@riseup.net>, 2021
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: 0.0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-03-01 09:32-0800\n"
+"PO-Revision-Date: 2021-03-02 17:19-0800\n"
+"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
+"Language-Team: Mouse Reeve <LL@li.org>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
+#: bookwyrm/templates/edit_author.html:5
+msgid "Edit Author"
+msgstr "编辑作者"
+
+#: bookwyrm/templates/author.html:32
+msgid "Wikipedia"
+msgstr "维基百科"
+
+#: bookwyrm/templates/author.html:37
+#, python-format
+msgid "Books by %(name)s"
+msgstr "%(name)s 所著的书"
+
+#: bookwyrm/templates/book.html:29 bookwyrm/templates/book.html:30
+#: bookwyrm/templates/edit_book.html:5
+msgid "Edit Book"
+msgstr "编辑书目"
+
+#: bookwyrm/templates/book.html:45
+msgid "Add cover"
+msgstr "添加��"
+
+#: bookwyrm/templates/book.html:51 bookwyrm/templates/lists/list.html:89
+msgid "Add"
+msgstr "添加"
+
+#: bookwyrm/templates/book.html:60
+msgid "ISBN:"
+msgstr "ISBN:"
+
+#: bookwyrm/templates/book.html:67 bookwyrm/templates/edit_book.html:107
+msgid "OCLC Number:"
+msgstr "OCLC �:"
+
+#: bookwyrm/templates/book.html:74 bookwyrm/templates/edit_book.html:111
+msgid "ASIN:"
+msgstr "ASIN:"
+
+#: bookwyrm/templates/book.html:86
+msgid "View on OpenLibrary"
+msgstr "在 OpenLibrary 查看"
+
+#: bookwyrm/templates/book.html:98
+msgid "Add Description"
+msgstr "添加�述"
+
+#: bookwyrm/templates/book.html:105 bookwyrm/templates/edit_book.html:39
+#: bookwyrm/templates/lists/form.html:12
+msgid "Description:"
+msgstr "�述:"
+
+#: bookwyrm/templates/book.html:109 bookwyrm/templates/edit_author.html:78
+#: bookwyrm/templates/edit_book.html:120 bookwyrm/templates/lists/form.html:42
+#: bookwyrm/templates/preferences/edit_user.html:50
+#: bookwyrm/templates/settings/site.html:89
+#: bookwyrm/templates/snippets/progress_update.html:21
+#: bookwyrm/templates/snippets/readthrough.html:64
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
+msgid "Save"
+msgstr "�存"
+
+#: bookwyrm/templates/book.html:110 bookwyrm/templates/book.html:159
+#: bookwyrm/templates/edit_author.html:79 bookwyrm/templates/edit_book.html:121
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
+#: bookwyrm/templates/snippets/goal_form.html:32
+#: bookwyrm/templates/snippets/readthrough.html:65
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
+msgid "Cancel"
+msgstr "�消"
+
+#: bookwyrm/templates/book.html:142
+msgid "Your reading activity"
+msgstr "你的阅读活动"
+
+#: bookwyrm/templates/book.html:144
+msgid "Add read dates"
+msgstr "添加阅读日期"
+
+#: bookwyrm/templates/book.html:149
+msgid "You don't have any reading activity for this book."
+msgstr "你还没有任何这本书的阅读活动。"
+
+#: bookwyrm/templates/book.html:156
+msgid "Create"
+msgstr "创建"
+
+#: bookwyrm/templates/book.html:178
+msgid "Tags"
+msgstr "标签"
+
+#: bookwyrm/templates/book.html:182 bookwyrm/templates/snippets/tag.html:18
+msgid "Add tag"
+msgstr "添加标签"
+
+#: bookwyrm/templates/book.html:199
+msgid "Subjects"
+msgstr "主题"
+
+#: bookwyrm/templates/book.html:210
+msgid "Places"
+msgstr "地点"
+
+#: bookwyrm/templates/book.html:221 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
+#: bookwyrm/templates/search_results.html:90
+#: bookwyrm/templates/user/user_layout.html:62
+msgid "Lists"
+msgstr "列表"
+
+#: bookwyrm/templates/book.html:250
+msgid "rated it"
+msgstr "评价了"
+
+#: bookwyrm/templates/components/inline_form.html:8
+#: bookwyrm/templates/feed/feed_layout.html:51
+msgid "Close"
+msgstr "关闭"
+
+#: bookwyrm/templates/discover/about.html:7
+#, python-format
+msgid "About %(site_name)s"
+msgstr "关于 %(site_name)s"
+
+#: bookwyrm/templates/discover/about.html:10
+#: bookwyrm/templates/discover/about.html:20
+msgid "Code of Conduct"
+msgstr "行为准则"
+
+#: bookwyrm/templates/discover/about.html:13
+#: bookwyrm/templates/discover/about.html:29
+msgid "Privacy Policy"
+msgstr "��政策"
+
+#: bookwyrm/templates/discover/discover.html:6
+msgid "Recent Books"
+msgstr "最近书目"
+
+#: bookwyrm/templates/discover/landing_layout.html:5
+msgid "Welcome"
+msgstr "欢迎"
+
+#: bookwyrm/templates/discover/landing_layout.html:17
+msgid "Decentralized"
+msgstr "去中心化"
+
+#: bookwyrm/templates/discover/landing_layout.html:23
+msgid "Friendly"
+msgstr "�好"
+
+#: bookwyrm/templates/discover/landing_layout.html:29
+msgid "Anti-Corporate"
+msgstr "��业"
+
+#: bookwyrm/templates/discover/landing_layout.html:44
+#, python-format
+msgid "Join %(name)s"
+msgstr "加入 %(name)s"
+
+#: bookwyrm/templates/discover/landing_layout.html:49
+#: bookwyrm/templates/login.html:48
+msgid "This instance is closed"
+msgstr "本实例�开放。"
+
+#: bookwyrm/templates/discover/landing_layout.html:55
+msgid "Your Account"
+msgstr "你的��"
+
+#: bookwyrm/templates/edit_author.html:13 bookwyrm/templates/edit_book.html:13
+msgid "Added:"
+msgstr "添加了:"
+
+#: bookwyrm/templates/edit_author.html:14 bookwyrm/templates/edit_book.html:14
+msgid "Updated:"
+msgstr "更新了:"
+
+#: bookwyrm/templates/edit_author.html:15 bookwyrm/templates/edit_book.html:15
+msgid "Last edited by:"
+msgstr "最�编辑人:"
+
+#: bookwyrm/templates/edit_author.html:31 bookwyrm/templates/edit_book.html:30
+msgid "Metadata"
+msgstr "元数�"
+
+#: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
+#: bookwyrm/templates/user/create_shelf_form.html:13
+#: bookwyrm/templates/user/edit_shelf_form.html:14
+msgid "Name:"
+msgstr "�称:"
+
+#: bookwyrm/templates/edit_author.html:37
+msgid "Bio:"
+msgstr "简介:"
+
+#: bookwyrm/templates/edit_author.html:42
+msgid "Wikipedia link:"
+msgstr "维基百科链接:"
+
+#: bookwyrm/templates/edit_author.html:47
+msgid "Birth date:"
+msgstr "出生日期:"
+
+#: bookwyrm/templates/edit_author.html:52
+msgid "Death date:"
+msgstr "死亡日期:"
+
+#: bookwyrm/templates/edit_author.html:58
+msgid "Author Identifiers"
+msgstr "作者标识�:"
+
+#: bookwyrm/templates/edit_author.html:59 bookwyrm/templates/edit_book.html:103
+msgid "Openlibrary key:"
+msgstr "Openlibrary key:"
+
+#: bookwyrm/templates/edit_author.html:64
+msgid "Librarything key:"
+msgstr "Librarything key:"
+
+#: bookwyrm/templates/edit_author.html:69
+msgid "Goodreads key:"
+msgstr "Goodreads key:"
+
+#: bookwyrm/templates/edit_book.html:31
+msgid "Title:"
+msgstr "标题:"
+
+#: bookwyrm/templates/edit_book.html:35
+msgid "Subtitle:"
+msgstr "副标题:"
+
+#: bookwyrm/templates/edit_book.html:43
+msgid "Series:"
+msgstr "系列:"
+
+#: bookwyrm/templates/edit_book.html:47
+msgid "Series number:"
+msgstr "系列编�:"
+
+#: bookwyrm/templates/edit_book.html:51
+msgid "First published date:"
+msgstr "�版时间:"
+
+#: bookwyrm/templates/edit_book.html:55
+msgid "Published date:"
+msgstr "出版时间:"
+
+#: bookwyrm/templates/edit_book.html:68
+#: bookwyrm/templates/snippets/shelf.html:9
+msgid "Cover"
+msgstr "��"
+
+#: bookwyrm/templates/edit_book.html:78
+msgid "Physical Properties"
+msgstr "实体性质"
+
+#: bookwyrm/templates/edit_book.html:79
+msgid "Format:"
+msgstr "格�:"
+
+#: bookwyrm/templates/edit_book.html:87
+msgid "Pages:"
+msgstr "页数:"
+
+#: bookwyrm/templates/edit_book.html:94
+msgid "Book Identifiers"
+msgstr "书目标识�"
+
+#: bookwyrm/templates/edit_book.html:95
+msgid "ISBN 13:"
+msgstr "ISBN 13:"
+
+#: bookwyrm/templates/edit_book.html:99
+msgid "ISBN 10:"
+msgstr "ISBN 10:"
+
+#: bookwyrm/templates/editions.html:5
+#, python-format
+msgid "Editions of %(book_title)s"
+msgstr "%(book_title)s 的�版本"
+
+#: bookwyrm/templates/editions.html:9
+#, python-format
+msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+msgstr "<a href=\"%(work_path)s\">\"%(work_title)s\"</a> 的�版本"
+
+#: bookwyrm/templates/error.html:4
+msgid "Oops!"
+msgstr "哎呀�"
+
+#: bookwyrm/templates/error.html:8
+msgid "Server Error"
+msgstr "�务器错误"
+
+#: bookwyrm/templates/error.html:9
+msgid "Something went wrong! Sorry about that."
+msgstr "�些东西出错了�对�起啦。"
+
+#: bookwyrm/templates/feed/direct_messages.html:8
+#, python-format
+msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+msgstr "与 <a href=\"%(path)s\">%(username)s</a> �信"
+
+#: bookwyrm/templates/feed/direct_messages.html:10
+#: bookwyrm/templates/layout.html:79
+msgid "Direct Messages"
+msgstr "�信"
+
+#: bookwyrm/templates/feed/direct_messages.html:13
+msgid "All messages"
+msgstr "所有消�"
+
+#: bookwyrm/templates/feed/direct_messages.html:22
+msgid "You have no messages right now."
+msgstr "你现在没有消�。"
+
+#: bookwyrm/templates/feed/feed.html:6
+#, python-format
+msgid "%(tab_title)s Timeline"
+msgstr "%(tab_title)s 时间线"
+
+#: bookwyrm/templates/feed/feed.html:10
+msgid "Home"
+msgstr "主页"
+
+#: bookwyrm/templates/feed/feed.html:13
+msgid "Local"
+msgstr "本站"
+
+#: bookwyrm/templates/feed/feed.html:16
+msgid "Federated"
+msgstr "跨站"
+
+#: bookwyrm/templates/feed/feed.html:24
+msgid "Announcements"
+msgstr "公告"
+
+#: bookwyrm/templates/feed/feed.html:32
+msgid ""
+"There aren't any activities right now! Try following a user to get started"
+msgstr "现在还没有任何活动��试�从关注一个用户开始�"
+
+#: bookwyrm/templates/feed/feed_layout.html:5
+msgid "Updates"
+msgstr "æ›´æ–°"
+
+#: bookwyrm/templates/feed/feed_layout.html:11
+msgid "Your books"
+msgstr "你的书目"
+
+#: bookwyrm/templates/feed/feed_layout.html:13
+msgid ""
+"There are no books here right now! Try searching for a book to get started"
+msgstr "现在这里还没有任何书目��试�从�索�本书开始�"
+
+#: bookwyrm/templates/feed/feed_layout.html:73 bookwyrm/templates/goal.html:26
+#: bookwyrm/templates/snippets/goal_card.html:6
+#, python-format
+msgid "%(year)s Reading Goal"
+msgstr "%(year)s 阅读目标"
+
+#: bookwyrm/templates/feed/status.html:8
+msgid "Back"
+msgstr "返回"
+
+#: bookwyrm/templates/goal.html:7
+#, python-format
+msgid "%(year)s Reading Progress"
+msgstr "%(year)s 阅读进度"
+
+#: bookwyrm/templates/goal.html:11
+msgid "Edit Goal"
+msgstr "编辑目标"
+
+#: bookwyrm/templates/goal.html:30
+#: bookwyrm/templates/snippets/goal_card.html:13
+#, python-format
+msgid ""
+"Set a goal for how many books you'll finish reading in %(year)s, and track "
+"your progress throughout the year."
+msgstr ""
+"设定一个 %(year)s 内�读多少书的目标，并记录"
+"你全年的进度。"
+
+#: bookwyrm/templates/goal.html:39
+#, python-format
+msgid "%(name)s hasn't set a reading goal for %(year)s."
+msgstr "%(name)s 还没有设定 %(year)s 的阅读目标。"
+
+#: bookwyrm/templates/goal.html:51
+#, python-format
+msgid "Your %(year)s Books"
+msgstr "你 %(year)s 的书目"
+
+#: bookwyrm/templates/goal.html:53
+#, python-format
+msgid "%(username)s's %(year)s Books"
+msgstr "%(username)s 在 %(year)s 的书目"
+
+#: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
+#: bookwyrm/templates/layout.html:94
+msgid "Import Books"
+msgstr "导入书目"
+
+#: bookwyrm/templates/import.html:14
+msgid "Data source"
+msgstr "数���"
+
+#: bookwyrm/templates/import.html:32
+msgid "Include reviews"
+msgstr "纳入书评"
+
+#: bookwyrm/templates/import.html:37
+msgid "Privacy setting for imported reviews:"
+msgstr "导入书评的��设定"
+
+#: bookwyrm/templates/import.html:41
+msgid "Import"
+msgstr "导入"
+
+#: bookwyrm/templates/import.html:46
+msgid "Recent Imports"
+msgstr "最近的导入"
+
+#: bookwyrm/templates/import.html:48
+msgid "No recent imports"
+msgstr "无最近的导入"
+
+#: bookwyrm/templates/import_status.html:6
+#: bookwyrm/templates/import_status.html:10
+msgid "Import Status"
+msgstr "导入状�"
+
+#: bookwyrm/templates/import_status.html:13
+msgid "Import started:"
+msgstr "导入开始:"
+
+#: bookwyrm/templates/import_status.html:17
+msgid "Import completed:"
+msgstr "导入完�:"
+
+#: bookwyrm/templates/import_status.html:20
+msgid "TASK FAILED"
+msgstr "任务失败"
+
+#: bookwyrm/templates/import_status.html:26
+msgid "Import still in progress."
+msgstr "还在导入中。"
+
+#: bookwyrm/templates/import_status.html:28
+msgid "(Hit reload to update!)"
+msgstr "（按下�新加载�更新�）"
+
+#: bookwyrm/templates/import_status.html:35
+msgid "Failed to load"
+msgstr "加载失败"
+
+#: bookwyrm/templates/import_status.html:59
+msgid "Select all"
+msgstr "全选"
+
+#: bookwyrm/templates/import_status.html:62
+msgid "Retry items"
+msgstr "�试项目"
+
+#: bookwyrm/templates/import_status.html:84
+msgid "Successfully imported"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:88
+#: bookwyrm/templates/lists/curate.html:14
+msgid "Book"
+msgstr "书目"
+
+#: bookwyrm/templates/import_status.html:91
+#: bookwyrm/templates/snippets/create_status_form.html:10
+#: bookwyrm/templates/snippets/shelf.html:10
+msgid "Title"
+msgstr "标题"
+
+#: bookwyrm/templates/import_status.html:94
+#: bookwyrm/templates/snippets/shelf.html:11
+msgid "Author"
+msgstr "作者"
+
+#: bookwyrm/templates/import_status.html:117
+msgid "Imported"
+msgstr "已导入"
+
+#: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12
+#: bookwyrm/templates/login.html:43
+msgid "Create an Account"
+msgstr "创建��"
+
+#: bookwyrm/templates/invite.html:21
+msgid "Permission Denied"
+msgstr "没有��"
+
+#: bookwyrm/templates/invite.html:22
+msgid "Sorry! This invite code is no longer valid."
+msgstr "抱歉�此邀请�已��有效。"
+
+#: bookwyrm/templates/layout.html:33
+msgid "Search for a book or user"
+msgstr "�索书目或用户"
+
+#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
+#: bookwyrm/templates/lists/list.html:62
+msgid "Search"
+msgstr "�索"
+
+#: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48
+msgid "Main navigation menu"
+msgstr "主导航��"
+
+#: bookwyrm/templates/layout.html:58
+msgid "Your shelves"
+msgstr "你的书架"
+
+#: bookwyrm/templates/layout.html:61
+msgid "Feed"
+msgstr "动�"
+
+#: bookwyrm/templates/layout.html:84
+#: bookwyrm/templates/preferences/preferences_layout.html:14
+msgid "Profile"
+msgstr "个人资料"
+
+#: bookwyrm/templates/layout.html:89
+msgid "Settings"
+msgstr "设置"
+
+#: bookwyrm/templates/layout.html:103
+#: bookwyrm/templates/settings/admin_layout.html:19
+#: bookwyrm/templates/settings/manage_invites.html:3
+msgid "Invites"
+msgstr "邀请"
+
+#: bookwyrm/templates/layout.html:110
+msgid "Site Configuration"
+msgstr "站点�置"
+
+#: bookwyrm/templates/layout.html:117
+msgid "Log out"
+msgstr "登出"
+
+#: bookwyrm/templates/layout.html:125 bookwyrm/templates/layout.html:126
+#: bookwyrm/templates/notifications.html:6
+#: bookwyrm/templates/notifications.html:10
+msgid "Notifications"
+msgstr "通知"
+
+#: bookwyrm/templates/layout.html:143 bookwyrm/templates/layout.html:147
+#: bookwyrm/templates/login.html:17
+#: bookwyrm/templates/snippets/register_form.html:4
+msgid "Username:"
+msgstr "用户�:"
+
+#: bookwyrm/templates/layout.html:152 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/login.html:33
+msgid "Log in"
+msgstr "登录"
+
+#: bookwyrm/templates/layout.html:183
+msgid "About this server"
+msgstr "关于本�务器"
+
+#: bookwyrm/templates/layout.html:187
+msgid "Contact site admin"
+msgstr "�系站点管�员"
+
+#: bookwyrm/templates/layout.html:198
+msgid ""
+"BookWyrm is open source software. You can contribute or report issues on <a "
+"href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgstr ""
+"BookWyrm 是开�软件。你�以在<a "
+"href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> 贡献或报告问题。"
+
+#: bookwyrm/templates/lists/create_form.html:5
+#: bookwyrm/templates/lists/lists.html:17
+msgid "Create List"
+msgstr "创建列表"
+
+#: bookwyrm/templates/lists/curate.html:6
+msgid "Pending Books"
+msgstr "等候中的书目"
+
+#: bookwyrm/templates/lists/curate.html:7
+msgid "Go to list"
+msgstr "�往列表"
+
+#: bookwyrm/templates/lists/curate.html:9
+msgid "You're all set!"
+msgstr "都弄好了�"
+
+#: bookwyrm/templates/lists/curate.html:15
+msgid "Suggested by"
+msgstr "推��自"
+
+#: bookwyrm/templates/lists/curate.html:35
+msgid "Approve"
+msgstr "批准"
+
+#: bookwyrm/templates/lists/curate.html:41
+msgid "Discard"
+msgstr "削除"
+
+#: bookwyrm/templates/lists/edit_form.html:5
+#: bookwyrm/templates/lists/list_layout.html:17
+msgid "Edit List"
+msgstr "编辑列表"
+
+#: bookwyrm/templates/lists/form.html:18
+msgid "List curation:"
+msgstr "列表策展:"
+
+#: bookwyrm/templates/lists/form.html:21
+msgid "Closed"
+msgstr "已关闭"
+
+#: bookwyrm/templates/lists/form.html:22
+msgid "Only you can add and remove books to this list"
+msgstr "�有你�以在此列表中添加或移除书目"
+
+#: bookwyrm/templates/lists/form.html:26
+msgid "Curated"
+msgstr "策展"
+
+#: bookwyrm/templates/lists/form.html:27
+msgid "Anyone can suggest books, subject to your approval"
+msgstr "任何人都�以推�书目�主题让你批准"
+
+#: bookwyrm/templates/lists/form.html:31
+msgid "Open"
+msgstr "开放"
+
+#: bookwyrm/templates/lists/form.html:32
+msgid "Anyone can add books to this list"
+msgstr "任何人都�以�此列表中添加书目"
+
+#: bookwyrm/templates/lists/list.html:17
+msgid "This list is currently empty"
+msgstr "此列表当�是空的"
+
+#: bookwyrm/templates/lists/list.html:35
+msgid "Added by"
+msgstr "添加�自"
+
+#: bookwyrm/templates/lists/list.html:41
+msgid "Remove"
+msgstr "移除"
+
+#: bookwyrm/templates/lists/list.html:54
+msgid "Add Books"
+msgstr "添加书目"
+
+#: bookwyrm/templates/lists/list.html:54
+msgid "Suggest Books"
+msgstr "推�书目"
+
+#: bookwyrm/templates/lists/list.html:58
+msgid "Search for a book"
+msgstr "�索书目"
+
+#: bookwyrm/templates/lists/list.html:63
+msgid "search"
+msgstr "�索"
+
+#: bookwyrm/templates/lists/list.html:69
+msgid "Clear search"
+msgstr "清除�索"
+
+#: bookwyrm/templates/lists/list.html:74
+#, python-format
+msgid "No books found matching the query \"%(query)s\""
+msgstr "没有符� \"%(query)s\" 请求的书目"
+
+#: bookwyrm/templates/lists/list.html:75
+msgid "No books found"
+msgstr "没有找到书目"
+
+#: bookwyrm/templates/lists/list.html:89
+msgid "Suggest"
+msgstr "推�"
+
+#: bookwyrm/templates/lists/list_items.html:19
+#: bookwyrm/templates/lists/list_layout.html:11
+msgid "Created and curated by"
+msgstr "创建者�策展者为"
+
+#: bookwyrm/templates/lists/list_items.html:19
+#: bookwyrm/templates/lists/list_layout.html:11
+msgid "Created by"
+msgstr "创建者为"
+
+#: bookwyrm/templates/lists/lists.html:14
+msgid "Your lists"
+msgstr "你的列表"
+
+#: bookwyrm/templates/lists/lists.html:40
+msgid "Recent Lists"
+msgstr "最近的列表"
+
+#: bookwyrm/templates/login.html:4
+msgid "Login"
+msgstr "登录"
+
+#: bookwyrm/templates/login.html:23 bookwyrm/templates/password_reset.html:17
+#: bookwyrm/templates/snippets/register_form.html:22
+msgid "Password:"
+msgstr "密�:"
+
+#: bookwyrm/templates/login.html:36
+msgid "Forgot your password?"
+msgstr "忘记了密�？"
+
+#: bookwyrm/templates/login.html:49
+msgid "Contact an administrator to get an invite"
+msgstr "�系管�员以�得邀请"
+
+#: bookwyrm/templates/login.html:59
+msgid "More about this site"
+msgstr "关于本站点的更多"
+
+#: bookwyrm/templates/notfound.html:4 bookwyrm/templates/notfound.html:8
+msgid "Not Found"
+msgstr "未找到"
+
+#: bookwyrm/templates/notfound.html:9
+msgid "The page your requested doesn't seem to exist!"
+msgstr "你请求的页�似乎并�存在�"
+
+#: bookwyrm/templates/notifications.html:14
+msgid "Delete notifications"
+msgstr "删除通知"
+
+#: bookwyrm/templates/notifications.html:49
+#, python-format
+msgid ""
+"favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+"喜欢了你 <a href=\"%(related_path)s\">对 <em>%(book_title)s</"
+"em> 的书评</a>"
+
+#: bookwyrm/templates/notifications.html:51
+#, python-format
+msgid ""
+"favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+"喜欢了你 <a href=\"%(related_path)s\">对 <em>%(book_title)s</"
+"em> 的评论</a>"
+
+#: bookwyrm/templates/notifications.html:53
+#, python-format
+msgid ""
+"favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+"喜欢了你 <a href=\"%(related_path)s\">�自 <em>%(book_title)s</"
+"em> 的引用</a>"
+
+#: bookwyrm/templates/notifications.html:55
+#, python-format
+msgid "favorited your <a href=\"%(related_path)s\">status</a>"
+msgstr "喜欢了你的 <a href=\"%(related_path)s\">状�</a>"
+
+#: bookwyrm/templates/notifications.html:60
+#, python-format
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">review of <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+"在 <a href=\"%(related_path)s\">对 <em>"
+"%(book_title)s</em> 的书评</a> 里�到了你"
+
+#: bookwyrm/templates/notifications.html:62
+#, python-format
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">comment on <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+"在 <a href=\"%(related_path)s\">对 <em>"
+"%(book_title)s</em> 的评论</a> 里�到了你"
+
+#: bookwyrm/templates/notifications.html:64
+#, python-format
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">quote from <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+"在 <a href=\"%(related_path)s\">对 <em>"
+"%(book_title)s</em> 的引用</a> 中�到了你"
+
+#: bookwyrm/templates/notifications.html:66
+#, python-format
+msgid "mentioned you in a <a href=\"%(related_path)s\">status</a>"
+msgstr "在 <a href=\"%(related_path)s\">状�</a> 中�到了你"
+
+#: bookwyrm/templates/notifications.html:71
+#, python-format
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">review of <em>%(book_title)s</em></a>"
+msgstr ""
+"<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s"
+"\">对 <em>%(book_title)s</em> 的书评</a>"
+
+#: bookwyrm/templates/notifications.html:73
+#, python-format
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">comment on <em>%(book_title)s</em></a>"
+msgstr ""
+"<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s"
+"\">对 <em>%(book_title)s</em> 的评论</a>"
+
+#: bookwyrm/templates/notifications.html:75
+#, python-format
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">quote from <em>%(book_title)s</em></a>"
+msgstr ""
+"<a href=\"%(related_path)s\">回�</a> 了你 <a href=\"%(parent_path)s"
+"\">对 <em>%(book_title)s</em> 中的引用</a>"
+
+#: bookwyrm/templates/notifications.html:77
+#, python-format
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">status</a>"
+msgstr ""
+"<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s"
+"\">状�</a>"
+
+#: bookwyrm/templates/notifications.html:81
+msgid "followed you"
+msgstr "关注了你"
+
+#: bookwyrm/templates/notifications.html:84
+msgid "sent you a follow request"
+msgstr "�你��了关注请求"
+
+#: bookwyrm/templates/notifications.html:90
+#, python-format
+msgid ""
+"boosted your <a href=\"%(related_path)s\">review of <em>%(book.title)s</em></"
+"a>"
+msgstr ""
+"转�了你的 <a href=\"%(related_path)s\">对 <em>%(book.title)s</em> 的书评</"
+"a>"
+
+#: bookwyrm/templates/notifications.html:92
+#, python-format
+msgid ""
+"boosted your <a href=\"%(related_path)s\">comment on<em>%(book.title)s</em></"
+"a>"
+msgstr ""
+"转�了你的 <a href=\"%(related_path)s\">对 <em>%(book.title)s</em> 的评论</"
+"a>"
+
+#: bookwyrm/templates/notifications.html:94
+#, python-format
+msgid ""
+"boosted your <a href=\"%(related_path)s\">quote from <em>%(book.title)s</"
+"em></a>"
+msgstr ""
+"转�了你的 <a href=\"%(related_path)s\">对 <em>%(book.title)s</"
+"em> 的引用</a>"
+
+#: bookwyrm/templates/notifications.html:96
+#, python-format
+msgid "boosted your <a href=\"%(related_path)s\">status</a>"
+msgstr "转�了你的 <a href=\"%(related_path)s\">状�</a>"
+
+#: bookwyrm/templates/notifications.html:100
+#, python-format
+msgid ""
+" added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
+"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgstr ""
+" 添加了 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 "
+"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+
+#: bookwyrm/templates/notifications.html:102
+#, python-format
+msgid ""
+" suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to "
+"your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgstr " 推�添加 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到"
+"你的列表 \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+
+#: bookwyrm/templates/notifications.html:106
+#, python-format
+msgid " your <a href=\"/import/%(related_id)s\">import</a> completed."
+msgstr " 你的 <a href=\"/import/%(related_id)s\">导入</a> 已完�。"
+
+#: bookwyrm/templates/notifications.html:138
+msgid "You're all caught up!"
+msgstr "你什么也没错过�"
+
+#: bookwyrm/templates/password_reset.html:4
+#: bookwyrm/templates/password_reset.html:10
+#: bookwyrm/templates/password_reset_request.html:4
+#: bookwyrm/templates/password_reset_request.html:10
+msgid "Reset Password"
+msgstr "�设密�"
+
+#: bookwyrm/templates/password_reset.html:23
+#: bookwyrm/templates/preferences/change_password.html:18
+msgid "Confirm password:"
+msgstr "确认密�:"
+
+#: bookwyrm/templates/password_reset.html:30
+msgid "Confirm"
+msgstr "确认"
+
+#: bookwyrm/templates/password_reset_request.html:12
+msgid "A link to reset your password will be sent to your email address"
+msgstr "�设你的密�的链接将会被��到你的邮箱地�"
+
+#: bookwyrm/templates/password_reset_request.html:16
+#: bookwyrm/templates/preferences/edit_user.html:38
+#: bookwyrm/templates/snippets/register_form.html:13
+msgid "Email address:"
+msgstr "邮箱地�:"
+
+#: bookwyrm/templates/password_reset_request.html:23
+msgid "Reset password"
+msgstr "�设密�"
+
+#: bookwyrm/templates/preferences/blocks.html:4
+#: bookwyrm/templates/preferences/blocks.html:7
+#: bookwyrm/templates/preferences/preferences_layout.html:23
+msgid "Blocked Users"
+msgstr "�蔽的用户"
+
+#: bookwyrm/templates/preferences/blocks.html:12
+msgid "No users currently blocked."
+msgstr "当�没有被�蔽的用户。"
+
+#: bookwyrm/templates/preferences/change_password.html:4
+#: bookwyrm/templates/preferences/change_password.html:7
+#: bookwyrm/templates/preferences/change_password.html:21
+#: bookwyrm/templates/preferences/preferences_layout.html:17
+msgid "Change Password"
+msgstr "更改密�"
+
+#: bookwyrm/templates/preferences/change_password.html:14
+msgid "New password:"
+msgstr "新密�:"
+
+#: bookwyrm/templates/preferences/edit_user.html:4
+#: bookwyrm/templates/preferences/edit_user.html:7
+msgid "Edit Profile"
+msgstr "编辑个人资料"
+
+#: bookwyrm/templates/preferences/edit_user.html:17
+msgid "Avatar:"
+msgstr "头�:"
+
+#: bookwyrm/templates/preferences/edit_user.html:24
+msgid "Display name:"
+msgstr "显示�称:"
+
+#: bookwyrm/templates/preferences/edit_user.html:31
+msgid "Summary:"
+msgstr "概�:"
+
+#: bookwyrm/templates/preferences/edit_user.html:46
+msgid "Manually approve followers:"
+msgstr "手动批准关注者:"
+
+#: bookwyrm/templates/preferences/preferences_layout.html:11
+msgid "Account"
+msgstr "��"
+
+#: bookwyrm/templates/preferences/preferences_layout.html:20
+msgid "Relationships"
+msgstr "关系"
+
+#: bookwyrm/templates/search_results.html:4
+msgid "Search Results"
+msgstr "�索结果"
+
+#: bookwyrm/templates/search_results.html:9
+#, python-format
+msgid "Search Results for \"%(query)s\""
+msgstr "\"%(query)s\" 的�索结果"
+
+#: bookwyrm/templates/search_results.html:14
+msgid "Matching Books"
+msgstr "匹�的书目"
+
+#: bookwyrm/templates/search_results.html:17
+#, python-format
+msgid "No books found for \"%(query)s\""
+msgstr "没有找到 \"%(query)s\" 的书目"
+
+#: bookwyrm/templates/search_results.html:33
+msgid "Didn't find what you were looking for?"
+msgstr "没有找到你想找的？"
+
+#: bookwyrm/templates/search_results.html:35
+msgid "Show results from other catalogues"
+msgstr "显示其它类别的结果"
+
+#: bookwyrm/templates/search_results.html:57
+msgid "Import book"
+msgstr "导入书目"
+
+#: bookwyrm/templates/search_results.html:67
+msgid "Hide results from other catalogues"
+msgstr "��其它类别的结果"
+
+#: bookwyrm/templates/search_results.html:75
+msgid "Matching Users"
+msgstr "匹�的用户"
+
+#: bookwyrm/templates/search_results.html:77
+#, python-format
+msgid "No users found for \"%(query)s\""
+msgstr "没有找到 \"%(query)s\" 的用户"
+
+#: bookwyrm/templates/search_results.html:92
+#, python-format
+msgid "No lists found for \"%(query)s\""
+msgstr "没有找到 \"%(query)s\" 的�目"
+
+#: bookwyrm/templates/settings/admin_layout.html:4
+msgid "Administration"
+msgstr "管�"
+
+#: bookwyrm/templates/settings/admin_layout.html:15
+msgid "Manage Users"
+msgstr "管�用户"
+
+#: bookwyrm/templates/settings/admin_layout.html:23
+#: bookwyrm/templates/settings/federation.html:4
+msgid "Federated Servers"
+msgstr "互�的�务器"
+
+#: bookwyrm/templates/settings/admin_layout.html:28
+msgid "Instance Settings"
+msgstr "实例设置"
+
+#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/site.html:4
+#: bookwyrm/templates/settings/site.html:6
+msgid "Site Settings"
+msgstr "站点设置"
+
+#: bookwyrm/templates/settings/admin_layout.html:35
+#: bookwyrm/templates/settings/site.html:13
+msgid "Instance Info"
+msgstr "实例信�"
+
+#: bookwyrm/templates/settings/admin_layout.html:36
+#: bookwyrm/templates/settings/site.html:39
+msgid "Images"
+msgstr "图�"
+
+#: bookwyrm/templates/settings/admin_layout.html:37
+#: bookwyrm/templates/settings/site.html:59
+msgid "Footer Content"
+msgstr "页脚内容"
+
+#: bookwyrm/templates/settings/admin_layout.html:38
+#: bookwyrm/templates/settings/site.html:77
+msgid "Registration"
+msgstr "注册"
+
+#: bookwyrm/templates/settings/federation.html:10
+msgid "Server name"
+msgstr "�务器�称"
+
+#: bookwyrm/templates/settings/federation.html:11
+msgid "Software"
+msgstr "软件"
+
+#: bookwyrm/templates/settings/federation.html:12
+msgid "Status"
+msgstr "状�"
+
+#: bookwyrm/templates/settings/manage_invites.html:7
+msgid "Generate New Invite"
+msgstr "生�新的邀请"
+
+#: bookwyrm/templates/settings/manage_invites.html:13
+msgid "Expiry:"
+msgstr "过期:"
+
+#: bookwyrm/templates/settings/manage_invites.html:19
+msgid "Use limit:"
+msgstr "使用�制:"
+
+#: bookwyrm/templates/settings/manage_invites.html:26
+msgid "Create Invite"
+msgstr "创建邀请"
+
+#: bookwyrm/templates/settings/manage_invites.html:33
+msgid "Link"
+msgstr "链接"
+
+#: bookwyrm/templates/settings/manage_invites.html:34
+msgid "Expires"
+msgstr "过期"
+
+#: bookwyrm/templates/settings/manage_invites.html:35
+msgid "Max uses"
+msgstr "最大使用次数"
+
+#: bookwyrm/templates/settings/manage_invites.html:36
+msgid "Times used"
+msgstr "已使用次数"
+
+#: bookwyrm/templates/settings/manage_invites.html:39
+msgid "No active invites"
+msgstr "无有效的邀请"
+
+#: bookwyrm/templates/settings/site.html:15
+msgid "Instance Name:"
+msgstr "实例�称"
+
+#: bookwyrm/templates/settings/site.html:19
+msgid "Tagline:"
+msgstr "标语"
+
+#: bookwyrm/templates/settings/site.html:23
+msgid "Instance description:"
+msgstr "实例�述:"
+
+#: bookwyrm/templates/settings/site.html:27
+msgid "Code of conduct:"
+msgstr "行为准则:"
+
+#: bookwyrm/templates/settings/site.html:31
+msgid "Privacy Policy:"
+msgstr "��政策:"
+
+#: bookwyrm/templates/settings/site.html:42
+msgid "Logo:"
+msgstr "图标:"
+
+#: bookwyrm/templates/settings/site.html:46
+msgid "Logo small:"
+msgstr "��图标:"
+
+#: bookwyrm/templates/settings/site.html:50
+msgid "Favicon:"
+msgstr "Favicon:"
+
+#: bookwyrm/templates/settings/site.html:61
+msgid "Support link:"
+msgstr "支�链接:"
+
+#: bookwyrm/templates/settings/site.html:65
+msgid "Support title:"
+msgstr "支�标题:"
+
+#: bookwyrm/templates/settings/site.html:69
+msgid "Admin email:"
+msgstr "管�员邮件:"
+
+#: bookwyrm/templates/settings/site.html:79
+msgid "Allow registration:"
+msgstr "�许注册:"
+
+#: bookwyrm/templates/settings/site.html:83
+msgid "Registration closed text:"
+msgstr "注册关闭文字:"
+
+#: bookwyrm/templates/snippets/block_button.html:5
+msgid "Block"
+msgstr "�蔽"
+
+#: bookwyrm/templates/snippets/block_button.html:10
+msgid "Un-block"
+msgstr "�消�蔽"
+
+#: bookwyrm/templates/snippets/book_titleby.html:3
+#, python-format
+msgid "<a href=\"%(path)s\">%(title)s</a> by "
+msgstr "<a href=\"%(path)s\">%(title)s</a> �自"
+
+#: bookwyrm/templates/snippets/boost_button.html:8
+#: bookwyrm/templates/snippets/boost_button.html:9
+#: bookwyrm/templates/snippets/status/status_body.html:41
+#: bookwyrm/templates/snippets/status/status_body.html:42
+msgid "Boost status"
+msgstr "转�状�"
+
+#: bookwyrm/templates/snippets/boost_button.html:16
+#: bookwyrm/templates/snippets/boost_button.html:17
+msgid "Un-boost status"
+msgstr "�消转�状�"
+
+#: bookwyrm/templates/snippets/content_warning_field.html:3
+msgid "Spoiler alert:"
+msgstr "剧�警告:"
+
+#: bookwyrm/templates/snippets/content_warning_field.html:4
+msgid "Spoilers ahead!"
+msgstr "�有剧��"
+
+#: bookwyrm/templates/snippets/create_status.html:9
+msgid "Review"
+msgstr "书评"
+
+#: bookwyrm/templates/snippets/create_status.html:12
+#: bookwyrm/templates/snippets/create_status_form.html:44
+msgid "Comment"
+msgstr "评论"
+
+#: bookwyrm/templates/snippets/create_status.html:15
+msgid "Quote"
+msgstr "引用"
+
+#: bookwyrm/templates/snippets/create_status_form.html:21
+#: bookwyrm/templates/snippets/shelf.html:17
+msgid "Rating"
+msgstr "评价"
+
+#: bookwyrm/templates/snippets/create_status_form.html:23
+#: bookwyrm/templates/snippets/rate_action.html:14
+#: bookwyrm/templates/snippets/stars.html:3
+msgid "No rating"
+msgstr "没有评价"
+
+#: bookwyrm/templates/snippets/create_status_form.html:54
+msgid "Include spoiler alert"
+msgstr "加入剧�警告"
+
+#: bookwyrm/templates/snippets/create_status_form.html:60
+#: bookwyrm/templates/snippets/privacy-icons.html:15
+#: bookwyrm/templates/snippets/privacy-icons.html:16
+#: bookwyrm/templates/snippets/privacy_select.html:19
+msgid "Private"
+msgstr "�密"
+
+#: bookwyrm/templates/snippets/create_status_form.html:67
+msgid "Post"
+msgstr "�布"
+
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:4
+msgid "Delete these read dates?"
+msgstr "删除这些阅读日期�？"
+
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
+#, python-format
+msgid ""
+"You are deleting this readthrough and its %(count)s associated progress "
+"updates."
+msgstr ""
+"你正�删除这篇阅读�过以�与之相关的 %(count)s 次进度"
+"更新。"
+
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
+#: bookwyrm/templates/snippets/follow_request_buttons.html:13
+msgid "Delete"
+msgstr "删除"
+
+#: bookwyrm/templates/snippets/fav_button.html:7
+#: bookwyrm/templates/snippets/fav_button.html:8
+#: bookwyrm/templates/snippets/status/status_body.html:45
+#: bookwyrm/templates/snippets/status/status_body.html:46
+msgid "Like status"
+msgstr "喜欢状�"
+
+#: bookwyrm/templates/snippets/fav_button.html:15
+#: bookwyrm/templates/snippets/fav_button.html:16
+msgid "Un-like status"
+msgstr "�消喜欢状�"
+
+#: bookwyrm/templates/snippets/follow_button.html:6
+msgid "Follow request already sent."
+msgstr "已���关注请求。"
+
+#: bookwyrm/templates/snippets/follow_button.html:19
+msgid "Send follow request"
+msgstr "��关注请求"
+
+#: bookwyrm/templates/snippets/follow_button.html:21
+msgid "Follow"
+msgstr "关注"
+
+#: bookwyrm/templates/snippets/follow_button.html:27
+msgid "Unfollow"
+msgstr "�消关注"
+
+#: bookwyrm/templates/snippets/follow_request_buttons.html:8
+msgid "Accept"
+msgstr "接�"
+
+#: bookwyrm/templates/snippets/generated_status/goal.html:1
+#, python-format
+msgid "set a goal to read %(counter)s book in %(year)s"
+msgid_plural "set a goal to read %(counter)s books in %(year)s"
+msgstr[0] "设定了在 %(year)s 内�读 %(counter)s 书的目标"
+
+#: bookwyrm/templates/snippets/goal_card.html:21
+msgid "Dismiss message"
+msgstr "�散消�"
+
+#: bookwyrm/templates/snippets/goal_card.html:22
+#, python-format
+msgid ""
+"You can set or change your reading goal any time from your <a href=\"%(path)s"
+"\">profile page</a>"
+msgstr ""
+"你�以在任何时候从你的<a href=\"%(path)s"
+"\">个人资料页�</a> 中设置或改�你的阅读目标"
+
+#: bookwyrm/templates/snippets/goal_form.html:9
+msgid "Reading goal:"
+msgstr "阅读目标:"
+
+#: bookwyrm/templates/snippets/goal_form.html:14
+msgid "books"
+msgstr "书目"
+
+#: bookwyrm/templates/snippets/goal_form.html:19
+msgid "Goal privacy:"
+msgstr "目标��:"
+
+#: bookwyrm/templates/snippets/goal_form.html:26
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:29
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20
+msgid "Post to feed"
+msgstr "�布到消��中"
+
+#: bookwyrm/templates/snippets/goal_form.html:30
+msgid "Set goal"
+msgstr "设置目标"
+
+#: bookwyrm/templates/snippets/goal_progress.html:5
+msgid "Success!"
+msgstr "�功�"
+
+#: bookwyrm/templates/snippets/goal_progress.html:7
+#, python-format
+msgid "%(percent)s%% complete!"
+msgstr "完�了 %(percent)s%% �"
+
+#: bookwyrm/templates/snippets/goal_progress.html:10
+#, python-format
+msgid ""
+"You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgstr ""
+"你已�阅读了 <a href=\"%(path)s\">%(goal_count)s 本书中的 %(read_count)s 本</a>。"
+
+#: bookwyrm/templates/snippets/goal_progress.html:12
+#, python-format
+msgid ""
+"%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s "
+"books</a>."
+msgstr ""
+"%(username)s 已�阅读了 <a href=\"%(path)s\">%(goal_count)s 本书中的 %(read_count)s "
+"本</a>。"
+
+#: bookwyrm/templates/snippets/pagination.html:7
+msgid "Previous"
+msgstr "往�"
+
+#: bookwyrm/templates/snippets/pagination.html:15
+msgid "Next"
+msgstr "往�"
+
+#: bookwyrm/templates/snippets/privacy-icons.html:3
+#: bookwyrm/templates/snippets/privacy-icons.html:4
+#: bookwyrm/templates/snippets/privacy_select.html:10
+msgid "Public"
+msgstr "公开"
+
+#: bookwyrm/templates/snippets/privacy-icons.html:7
+#: bookwyrm/templates/snippets/privacy-icons.html:8
+#: bookwyrm/templates/snippets/privacy_select.html:13
+msgid "Unlisted"
+msgstr "�公开"
+
+#: bookwyrm/templates/snippets/privacy-icons.html:12
+msgid "Followers-only"
+msgstr "仅关注者"
+
+#: bookwyrm/templates/snippets/privacy_select.html:6
+msgid "Post privacy"
+msgstr "�文��"
+
+#: bookwyrm/templates/snippets/privacy_select.html:16
+#: bookwyrm/templates/user/followers.html:13
+msgid "Followers"
+msgstr "关注者"
+
+#: bookwyrm/templates/snippets/progress_update.html:6
+msgid "Progress:"
+msgstr "进度:"
+
+#: bookwyrm/templates/snippets/progress_update.html:16
+#: bookwyrm/templates/snippets/readthrough_form.html:22
+msgid "pages"
+msgstr "页数"
+
+#: bookwyrm/templates/snippets/progress_update.html:17
+#: bookwyrm/templates/snippets/readthrough_form.html:23
+msgid "percent"
+msgstr "百分比"
+
+#: bookwyrm/templates/snippets/progress_update.html:25
+#, python-format
+msgid "of %(book.pages)s pages"
+msgstr "全书 %(book.pages)s 页"
+
+#: bookwyrm/templates/snippets/rate_action.html:4
+msgid "Leave a rating"
+msgstr "留下评价"
+
+#: bookwyrm/templates/snippets/rate_action.html:29
+msgid "Rate"
+msgstr "评价"
+
+#: bookwyrm/templates/snippets/readthrough.html:7
+msgid "Progress Updates:"
+msgstr "进度更新:"
+
+#: bookwyrm/templates/snippets/readthrough.html:11
+msgid "finished"
+msgstr "已完�"
+
+#: bookwyrm/templates/snippets/readthrough.html:14
+msgid "Show all updates"
+msgstr "显示所有更新"
+
+#: bookwyrm/templates/snippets/readthrough.html:30
+msgid "Delete this progress update"
+msgstr "删除此进度更新"
+
+#: bookwyrm/templates/snippets/readthrough.html:40
+msgid "started"
+msgstr "已开始"
+
+#: bookwyrm/templates/snippets/readthrough.html:46
+#: bookwyrm/templates/snippets/readthrough.html:60
+msgid "Edit read dates"
+msgstr "编辑阅读日期"
+
+#: bookwyrm/templates/snippets/readthrough.html:50
+msgid "Delete these read dates"
+msgstr "删除这些阅读日期"
+
+#: bookwyrm/templates/snippets/readthrough_form.html:7
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:19
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:17
+msgid "Started reading"
+msgstr "已开始阅读"
+
+#: bookwyrm/templates/snippets/readthrough_form.html:14
+msgid "Progress"
+msgstr "进度"
+
+#: bookwyrm/templates/snippets/readthrough_form.html:30
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25
+msgid "Finished reading"
+msgstr "已完�阅读"
+
+#: bookwyrm/templates/snippets/register_form.html:32
+msgid "Sign Up"
+msgstr "注册"
+
+#: bookwyrm/templates/snippets/rss_title.html:5
+#: bookwyrm/templates/snippets/status/status_header.html:9
+msgid "rated"
+msgstr "评价了"
+
+#: bookwyrm/templates/snippets/rss_title.html:7
+#: bookwyrm/templates/snippets/status/status_header.html:11
+msgid "reviewed"
+msgstr "写了书评给"
+
+#: bookwyrm/templates/snippets/rss_title.html:9
+#: bookwyrm/templates/snippets/status/status_header.html:13
+msgid "commented on"
+msgstr "评论了"
+
+#: bookwyrm/templates/snippets/rss_title.html:11
+#: bookwyrm/templates/snippets/status/status_header.html:15
+msgid "quoted"
+msgstr "引用了"
+
+#: bookwyrm/templates/snippets/search_result_text.html:3
+#, python-format
+msgid "by %(author)s"
+msgstr "由 %(author)s 所著"
+
+#: bookwyrm/templates/snippets/shelf.html:12
+msgid "Published"
+msgstr "已出版"
+
+#: bookwyrm/templates/snippets/shelf.html:13
+msgid "Shelved"
+msgstr "已上架"
+
+#: bookwyrm/templates/snippets/shelf.html:14
+msgid "Started"
+msgstr "已开始"
+
+#: bookwyrm/templates/snippets/shelf.html:15
+msgid "Finished"
+msgstr "已完�"
+
+#: bookwyrm/templates/snippets/shelf.html:16
+msgid "External links"
+msgstr "外部链接"
+
+#: bookwyrm/templates/snippets/shelf.html:44
+msgid "OpenLibrary"
+msgstr "OpenLibrary"
+
+#: bookwyrm/templates/snippets/shelf.html:61
+msgid "This shelf is empty."
+msgstr "此书架是空的。"
+
+#: bookwyrm/templates/snippets/shelf.html:67
+msgid "Delete shelf"
+msgstr "删除书架"
+
+#: bookwyrm/templates/snippets/shelf_selector.html:4
+msgid "Change shelf"
+msgstr "改�书架"
+
+#: bookwyrm/templates/snippets/shelf_selector.html:27
+msgid "Unshelve"
+msgstr "�下书架"
+
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
+#, python-format
+msgid "Finish \"<em>%(book_title)s</em>\""
+msgstr "完� \"<em>%(book_title)s</em>\""
+
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5
+msgid "More shelves"
+msgstr "更多书架"
+
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:8
+msgid "Start reading"
+msgstr "开始阅读"
+
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
+msgid "Read"
+msgstr "阅读"
+
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
+msgid "Finish reading"
+msgstr "完�阅读"
+
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26
+msgid "Want to read"
+msgstr "想�阅读"
+
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
+#, python-format
+msgid "Start \"<em>%(book_title)s</em>\""
+msgstr "开始 \"<em>%(book_title)s</em>\""
+
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:5
+#, python-format
+msgid "Want to Read \"<em>%(book_title)s</em>\""
+msgstr "想�阅读 \"<em>%(book_title)s</em>\""
+
+#: bookwyrm/templates/snippets/status/status.html:7
+msgid "boosted"
+msgstr "转�了"
+
+#: bookwyrm/templates/snippets/status/status_body.html:24
+#: bookwyrm/templates/snippets/status/status_body.html:37
+#: bookwyrm/templates/snippets/status/status_body.html:38
+msgid "Reply"
+msgstr "回�"
+
+#: bookwyrm/templates/snippets/status/status_content.html:16
+#: bookwyrm/templates/snippets/trimmed_text.html:12
+msgid "Show more"
+msgstr "显示更多"
+
+#: bookwyrm/templates/snippets/status/status_content.html:23
+#: bookwyrm/templates/snippets/trimmed_text.html:18
+msgid "Show less"
+msgstr "显示更少"
+
+#: bookwyrm/templates/snippets/status/status_content.html:44
+msgid "Open image in new window"
+msgstr "在新窗�中打开图�"
+
+#: bookwyrm/templates/snippets/status/status_options.html:7
+#: bookwyrm/templates/snippets/user_options.html:7
+msgid "More options"
+msgstr "更多选项"
+
+#: bookwyrm/templates/snippets/status/status_options.html:17
+msgid "Delete post"
+msgstr "删除�文"
+
+#: bookwyrm/templates/snippets/status/status_options.html:23
+#: bookwyrm/templates/snippets/user_options.html:13
+msgid "Send direct message"
+msgstr "���信"
+
+#: bookwyrm/templates/snippets/switch_edition_button.html:5
+msgid "Switch to this edition"
+msgstr "切�到此版本"
+
+#: bookwyrm/templates/snippets/tag.html:14
+msgid "Remove tag"
+msgstr "移除标签"
+
+#: bookwyrm/templates/tag.html:9
+#, python-format
+msgid "Books tagged \"%(tag.name)s\""
+msgstr "标有 \"%(tag.name)s\" 标签的书"
+
+#: bookwyrm/templates/user/create_shelf_form.html:5
+msgid "Create New Shelf"
+msgstr "新建书架"
+
+#: bookwyrm/templates/user/create_shelf_form.html:22
+#: bookwyrm/templates/user/shelf.html:33
+msgid "Create shelf"
+msgstr "创建书架"
+
+#: bookwyrm/templates/user/edit_shelf_form.html:5
+msgid "Edit Shelf"
+msgstr "编辑书架"
+
+#: bookwyrm/templates/user/edit_shelf_form.html:26
+msgid "Update shelf"
+msgstr "更新书架"
+
+#: bookwyrm/templates/user/followers.html:7
+#: bookwyrm/templates/user/following.html:7 bookwyrm/templates/user/user.html:9
+msgid "User Profile"
+msgstr "用户个人资料"
+
+#: bookwyrm/templates/user/followers.html:26
+#, python-format
+msgid "%(username)s has no followers"
+msgstr "%(username)s 没有关注者"
+
+#: bookwyrm/templates/user/following.html:13
+msgid "Following"
+msgstr "正在关注"
+
+#: bookwyrm/templates/user/following.html:26
+#, python-format
+msgid "%(username)s isn't following any users"
+msgstr "%(username)s 没有关注任何用户"
+
+#: bookwyrm/templates/user/lists.html:9
+msgid "Your Lists"
+msgstr "你的列表"
+
+#: bookwyrm/templates/user/lists.html:11
+#, python-format
+msgid "Lists: %(username)s"
+msgstr "列表: %(username)s"
+
+#: bookwyrm/templates/user/lists.html:17
+msgid "Create new list"
+msgstr "新建列表"
+
+#: bookwyrm/templates/user/lists.html:29
+msgid "Create list"
+msgstr "创建列表"
+
+#: bookwyrm/templates/user/shelf.html:9
+msgid "Your Shelves"
+msgstr "你的书架"
+
+#: bookwyrm/templates/user/shelf.html:11
+#, python-format
+msgid "%(username)s: Shelves"
+msgstr "%(username)s: 书架"
+
+#: bookwyrm/templates/user/shelf.html:54
+msgid "Edit shelf"
+msgstr "编辑书架"
+
+#: bookwyrm/templates/user/user.html:15
+msgid "Edit profile"
+msgstr "编辑个人资料"
+
+#: bookwyrm/templates/user/user.html:26
+#: bookwyrm/templates/user/user_layout.html:68
+msgid "Shelves"
+msgstr "书架"
+
+#: bookwyrm/templates/user/user.html:31
+#, python-format
+msgid "See all %(size)s"
+msgstr "查看所有 %(size)s"
+
+#: bookwyrm/templates/user/user.html:44
+#, python-format
+msgid "See all %(shelf_count)s shelves"
+msgstr "查看所有 %(shelf_count)s 个书架"
+
+#: bookwyrm/templates/user/user.html:56
+#, python-format
+msgid "Set a reading goal for %(year)s"
+msgstr "设定 %(year)s 的阅读目标"
+
+#: bookwyrm/templates/user/user.html:62
+msgid "User Activity"
+msgstr "用户活动"
+
+#: bookwyrm/templates/user/user.html:65
+msgid "RSS feed"
+msgstr "RSS �"
+
+#: bookwyrm/templates/user/user.html:76
+msgid "No activities yet!"
+msgstr "还没有活动�"
+
+#: bookwyrm/templates/user/user_layout.html:32
+msgid "Follow Requests"
+msgstr "关注请求"
+
+#: bookwyrm/templates/user/user_layout.html:50
+msgid "Activity"
+msgstr "活动"
+
+#: bookwyrm/templates/user/user_layout.html:56
+msgid "Reading Goal"
+msgstr "阅读目标"
+
+#: bookwyrm/templates/user/user_preview.html:13
+#, python-format
+msgid "Joined %(date)s"
+msgstr "已加入 %(date)s"
+
+#: bookwyrm/templates/user/user_preview.html:15
+#, python-format
+msgid "%(counter)s follower"
+msgid_plural "%(counter)s followers"
+msgstr[0] "%(counter)s 个关注者"
+
+#: bookwyrm/templates/user/user_preview.html:16
+#, python-format
+msgid "%(counter)s following"
+msgstr "关注� %(counter)s 人"

From e2617dde37712ab91516ab6cb6b71b5ba4f48a80 Mon Sep 17 00:00:00 2001
From: GuDzpoz <GuDzpoz@live.com>
Date: Tue, 2 Mar 2021 18:52:01 +0800
Subject: [PATCH 0137/1285] Regenerated .po file; made zh_CN translation
 available

---
 bookwyrm/settings.py               |   1 +
 locale/zh_CN/LC_MESSAGES/django.mo | Bin 23975 -> 23973 bytes
 locale/zh_CN/LC_MESSAGES/django.po |  91 +++++++++++++----------------
 3 files changed, 43 insertions(+), 49 deletions(-)

diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 8cdf87ff..598f6659 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -141,6 +141,7 @@ LANGUAGE_CODE = 'en-us'
 LANGUAGES = [
     ('en-us', _('English')),
     ('fr-fr', _('French')),
+    ('zh-cn', _('中文')),
 ]
 
 
diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
index 7c5aea3b92e5e7b08e8905098f523ce4123273f5..818dd2a106bc0d908fae88238bb4d2157c8c0708 100644
GIT binary patch
delta 4526
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

delta 4497
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

diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index cecf2ac1..9159c1ce 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -1,16 +1,16 @@
-# Chinese language text for the bookwyrm UI
+# Simplified Chinese language text for the BookWyrm UI
 # Copyright (C) 2021 Mouse Reeve
-# This file is distributed under the same license as the BookWyrm package.
-# Mouse Reeve <mousereeve@riseup.net>, 2021
+# This file is distributed under the same license as the bookwyrm package.
+# Mouse Reeve <mousereeve@riseup.net>, 2021.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 0.0.1\n"
+"Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-01 09:32-0800\n"
-"PO-Revision-Date: 2021-03-02 17:19-0800\n"
-"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
+"POT-Creation-Date: 2021-03-02 10:32+0000\n"
+"PO-Revision-Date: 2021-03-02 10:35+0000\n"
+"Last-Translator: Kana <gudzpoz@live.com>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
@@ -400,9 +400,7 @@ msgstr "编辑目标"
 msgid ""
 "Set a goal for how many books you'll finish reading in %(year)s, and track "
 "your progress throughout the year."
-msgstr ""
-"设定一个 %(year)s 内�读多少书的目标，并记录"
-"你全年的进度。"
+msgstr "设定一个 %(year)s 内�读多少书的目标，并记录你全年的进度。"
 
 #: bookwyrm/templates/goal.html:39
 #, python-format
@@ -487,7 +485,7 @@ msgstr "�试项目"
 
 #: bookwyrm/templates/import_status.html:84
 msgid "Successfully imported"
-msgstr ""
+msgstr "�功导入了"
 
 #: bookwyrm/templates/import_status.html:88
 #: bookwyrm/templates/lists/curate.html:14
@@ -596,8 +594,8 @@ msgid ""
 "BookWyrm is open source software. You can contribute or report issues on <a "
 "href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr ""
-"BookWyrm 是开�软件。你�以在<a "
-"href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> 贡献或报告问题。"
+"BookWyrm 是开�软件。你�以在<a href=\"https://github.com/mouse-reeve/"
+"bookwyrm\">GitHub</a> 贡献或报告问题。"
 
 #: bookwyrm/templates/lists/create_form.html:5
 #: bookwyrm/templates/lists/lists.html:17
@@ -763,8 +761,7 @@ msgid ""
 "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</"
 "em></a>"
 msgstr ""
-"喜欢了你 <a href=\"%(related_path)s\">对 <em>%(book_title)s</"
-"em> 的书评</a>"
+"喜欢了你 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的书评</a>"
 
 #: bookwyrm/templates/notifications.html:51
 #, python-format
@@ -772,8 +769,7 @@ msgid ""
 "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</"
 "em></a>"
 msgstr ""
-"喜欢了你 <a href=\"%(related_path)s\">对 <em>%(book_title)s</"
-"em> 的评论</a>"
+"喜欢了你 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的评论</a>"
 
 #: bookwyrm/templates/notifications.html:53
 #, python-format
@@ -781,8 +777,7 @@ msgid ""
 "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
 "em></a>"
 msgstr ""
-"喜欢了你 <a href=\"%(related_path)s\">�自 <em>%(book_title)s</"
-"em> 的引用</a>"
+"喜欢了你 <a href=\"%(related_path)s\">�自 <em>%(book_title)s</em> 的引用</a>"
 
 #: bookwyrm/templates/notifications.html:55
 #, python-format
@@ -795,8 +790,8 @@ msgid ""
 "mentioned you in a <a href=\"%(related_path)s\">review of <em>"
 "%(book_title)s</em></a>"
 msgstr ""
-"在 <a href=\"%(related_path)s\">对 <em>"
-"%(book_title)s</em> 的书评</a> 里�到了你"
+"在 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的书评</a> 里�到"
+"了你"
 
 #: bookwyrm/templates/notifications.html:62
 #, python-format
@@ -804,8 +799,8 @@ msgid ""
 "mentioned you in a <a href=\"%(related_path)s\">comment on <em>"
 "%(book_title)s</em></a>"
 msgstr ""
-"在 <a href=\"%(related_path)s\">对 <em>"
-"%(book_title)s</em> 的评论</a> 里�到了你"
+"在 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的评论</a> 里�到"
+"了你"
 
 #: bookwyrm/templates/notifications.html:64
 #, python-format
@@ -813,8 +808,8 @@ msgid ""
 "mentioned you in a <a href=\"%(related_path)s\">quote from <em>"
 "%(book_title)s</em></a>"
 msgstr ""
-"在 <a href=\"%(related_path)s\">对 <em>"
-"%(book_title)s</em> 的引用</a> 中�到了你"
+"在 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的引用</a> 中�到"
+"了你"
 
 #: bookwyrm/templates/notifications.html:66
 #, python-format
@@ -827,8 +822,8 @@ msgid ""
 "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
 "\">review of <em>%(book_title)s</em></a>"
 msgstr ""
-"<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s"
-"\">对 <em>%(book_title)s</em> 的书评</a>"
+"<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">对 "
+"<em>%(book_title)s</em> 的书评</a>"
 
 #: bookwyrm/templates/notifications.html:73
 #, python-format
@@ -836,8 +831,8 @@ msgid ""
 "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
 "\">comment on <em>%(book_title)s</em></a>"
 msgstr ""
-"<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s"
-"\">对 <em>%(book_title)s</em> 的评论</a>"
+"<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">对 "
+"<em>%(book_title)s</em> 的评论</a>"
 
 #: bookwyrm/templates/notifications.html:75
 #, python-format
@@ -845,8 +840,8 @@ msgid ""
 "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
 "\">quote from <em>%(book_title)s</em></a>"
 msgstr ""
-"<a href=\"%(related_path)s\">回�</a> 了你 <a href=\"%(parent_path)s"
-"\">对 <em>%(book_title)s</em> 中的引用</a>"
+"<a href=\"%(related_path)s\">回�</a> 了你 <a href=\"%(parent_path)s\">对 "
+"<em>%(book_title)s</em> 中的引用</a>"
 
 #: bookwyrm/templates/notifications.html:77
 #, python-format
@@ -854,8 +849,8 @@ msgid ""
 "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
 "\">status</a>"
 msgstr ""
-"<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s"
-"\">状�</a>"
+"<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">状�"
+"</a>"
 
 #: bookwyrm/templates/notifications.html:81
 msgid "followed you"
@@ -871,8 +866,7 @@ msgid ""
 "boosted your <a href=\"%(related_path)s\">review of <em>%(book.title)s</em></"
 "a>"
 msgstr ""
-"转�了你的 <a href=\"%(related_path)s\">对 <em>%(book.title)s</em> 的书评</"
-"a>"
+"转�了你的 <a href=\"%(related_path)s\">对 <em>%(book.title)s</em> 的书评</a>"
 
 #: bookwyrm/templates/notifications.html:92
 #, python-format
@@ -880,8 +874,7 @@ msgid ""
 "boosted your <a href=\"%(related_path)s\">comment on<em>%(book.title)s</em></"
 "a>"
 msgstr ""
-"转�了你的 <a href=\"%(related_path)s\">对 <em>%(book.title)s</em> 的评论</"
-"a>"
+"转�了你的 <a href=\"%(related_path)s\">对 <em>%(book.title)s</em> 的评论</a>"
 
 #: bookwyrm/templates/notifications.html:94
 #, python-format
@@ -889,8 +882,7 @@ msgid ""
 "boosted your <a href=\"%(related_path)s\">quote from <em>%(book.title)s</"
 "em></a>"
 msgstr ""
-"转�了你的 <a href=\"%(related_path)s\">对 <em>%(book.title)s</"
-"em> 的引用</a>"
+"转�了你的 <a href=\"%(related_path)s\">对 <em>%(book.title)s</em> 的引用</a>"
 
 #: bookwyrm/templates/notifications.html:96
 #, python-format
@@ -911,8 +903,9 @@ msgstr ""
 msgid ""
 " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to "
 "your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
-msgstr " 推�添加 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到"
-"你的列表 \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgstr ""
+" 推�添加 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 "
+"\"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 
 #: bookwyrm/templates/notifications.html:106
 #, python-format
@@ -927,6 +920,7 @@ msgstr "你什么也没错过�"
 #: bookwyrm/templates/password_reset.html:10
 #: bookwyrm/templates/password_reset_request.html:4
 #: bookwyrm/templates/password_reset_request.html:10
+#, fuzzy
 msgid "Reset Password"
 msgstr "�设密�"
 
@@ -1275,9 +1269,7 @@ msgstr "删除这些阅读日期�？"
 msgid ""
 "You are deleting this readthrough and its %(count)s associated progress "
 "updates."
-msgstr ""
-"你正�删除这篇阅读�过以�与之相关的 %(count)s 次进度"
-"更新。"
+msgstr "你正�删除这篇阅读�过以�与之相关的 %(count)s 次进度更新。"
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
 #: bookwyrm/templates/snippets/follow_request_buttons.html:13
@@ -1332,8 +1324,8 @@ msgid ""
 "You can set or change your reading goal any time from your <a href=\"%(path)s"
 "\">profile page</a>"
 msgstr ""
-"你�以在任何时候从你的<a href=\"%(path)s"
-"\">个人资料页�</a> 中设置或改�你的阅读目标"
+"你�以在任何时候从你的<a href=\"%(path)s\">个人资料页�</a> 中设置或改�你的"
+"阅读目标"
 
 #: bookwyrm/templates/snippets/goal_form.html:9
 msgid "Reading goal:"
@@ -1372,7 +1364,8 @@ msgstr "完�了 %(percent)s%% �"
 msgid ""
 "You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
 msgstr ""
-"你已�阅读了 <a href=\"%(path)s\">%(goal_count)s 本书中的 %(read_count)s 本</a>。"
+"你已�阅读了 <a href=\"%(path)s\">%(goal_count)s 本书中的 %(read_count)s 本</"
+"a>。"
 
 #: bookwyrm/templates/snippets/goal_progress.html:12
 #, python-format
@@ -1380,8 +1373,8 @@ msgid ""
 "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s "
 "books</a>."
 msgstr ""
-"%(username)s 已�阅读了 <a href=\"%(path)s\">%(goal_count)s 本书中的 %(read_count)s "
-"本</a>。"
+"%(username)s 已�阅读了 <a href=\"%(path)s\">%(goal_count)s 本书中的 "
+"%(read_count)s 本</a>。"
 
 #: bookwyrm/templates/snippets/pagination.html:7
 msgid "Previous"

From 005e84a03466b67a638e2876ebedf3d773dbb9b8 Mon Sep 17 00:00:00 2001
From: GuDzpoz <GuDzpoz@live.com>
Date: Tue, 2 Mar 2021 18:56:16 +0800
Subject: [PATCH 0138/1285] Removed code modification

---
 bookwyrm/settings.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 598f6659..8cdf87ff 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -141,7 +141,6 @@ LANGUAGE_CODE = 'en-us'
 LANGUAGES = [
     ('en-us', _('English')),
     ('fr-fr', _('French')),
-    ('zh-cn', _('中文')),
 ]
 
 

From 95e788c2a080b8043fd232771069cff3c0a18ac7 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Tue, 2 Mar 2021 12:28:47 +0100
Subject: [PATCH 0139/1285] [i18n:fr_FR] Fix translations:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Some strings were understood as full sentences when they were part of a sentence.
- Let’s say _statut_ can be used in this context.
- Reuse Mastodon translation for _Followers-only_.
---
 locale/fr_FR/LC_MESSAGES/django.mo | Bin 20860 -> 20803 bytes
 locale/fr_FR/LC_MESSAGES/django.po |  34 ++++++++++++++---------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index b89fd71bf9c3e45ccc4dc38a8f5e9a12fa950a4d..09c26ceb8d49055396b817284e592c2913cebb0c 100644
GIT binary patch
delta 2458
zcmYk-eN5F=9LMnk2v-CN(+Y$OKL`vgogl`8P(gtBfL?QIHB*_~>?#it_YytrXIe|$
zNH=K0Dx0<*V9{K6qi9rX=*qI$A2}_vQgdx>{Lylx<{!O3{*GIJz0Udl&OP6UbAE9B
zaLoAOm?KA%T%R!}r_7i;un=#<YMg=VQSU>TiXAu$cVZGAz(jl-{Wy%J_$}sPT)8pR
zumBTqA!`2$)P8|-<KFmTlYQV?_oD(G!ZaK~1w4rgcouKPOE?p+U<xKzc<(bXgLyvc
zeKo4UwU~>on2Gx<Tw`uwFwBF6_!+9=zfb|LqB2chY)lsVQJtx@u0*ZdjJIQ_o$o~j
zcoVDfQ`GOSqdJmO=_Q=*+Cc%T(o$5V0aT?MP!&9m3iK?_#U7lBpP*X$CFbC1)bFpN
zDvqx*W)AvM&udX}0yrJr5CbiI+P>I_%J6-R$0%y!QB(zI(T@|Tgp%$v<{r#Kb#6H-
z&>HI|RHEBacOY!%&mo1m<|PK{yy!;-_z0EZQR_L(XFiGADD!@=)%lpoyb@KwBbb35
zn2kNCM21m`j-u9`z%2Y7Q;Bcl9`IT?3su=%oPrIg4I5FJhfp1P5|gnDbws;RcccfE
z;6c<r@1X)8Lmk-})KSG%dj+IpHu22@20DuX&c=<X4WB`s{a#dS528BrE-KI$cK$W0
zL+4TJeKp>ZWMCQd2Aq#CqB?Q}RoEE1ISkG)n1|Qwf`SLVgi26})L<>HK?UwdC3Fby
z#zEA^r%<2mc~oa6QNP!Z9hiaYKr!lTX{e?DYUw5(Xu}|?1FfjUcB5K7gsS{w)R}*e
zN_YZwG#PcCxu`@6QJ?i9Yn^?+78Pd$>Mk_b(SKF+JP+i{7>}>w6zs!T96%k>8>mY<
zgbFZ*s^kQ!(u=4+M3+&mkE{1OQE9D5tqa(BlgmJvY`5-0{+OB9Q3;(wRrHIU|A`Bj
z|BXr{Z;3H?;=QQ(qo_;Qg8Hgl%*6pzXU9;V_i5BoxEB~G<0}|JUxP7s;R~ot-$Av0
z1ogv{n2kT753k`=j9uzox+GL*%1{9sQ13U|_girh^FAa|*L=f3Ej)+1OqVecon_wh
zxtPGb+S-6hY!zzVX4IwIX6LS*??D~eLDU`k0M&_6%)_5CL*IYQa&H4aPUA%}>g=nK
z`(<j7<20|}L--x4mCg$9k}gJd=rL;-#xviCO7Jz*zHgx}?+~hkUttRI%^!BbBx<9W
zMsMM4R4YqSN3;a>eXm2^nQf@bcVZD9K&?NH3jCw>B2H&MflKjU?8ds4^uLtB=M3iI
zBs!S4ivQVIhpaVin2cknN{(B9Ky~6*RD#z~N0k`x&O8<MJROs;z&<ZQUDB$6S$Cu2
z01wo%kX_J@x?J7X9jFa<qdL@wx>Unhh$Hwg{)Vc&Ji2GrR==;<DJrfgE{*<ERFn{{
zD4P?T&>3zDN5avq6>)LN<AVjk!cHgB7V3yZJFBvMH{bTx&WwqPL_e&XKQ(b#(CG?B
zx}BEjrN;HK)0{2st*ybf@c3Zwia`BBXG@5oX>!`yWy^&f12@M_&iLS#r$S-&4>}qU
gCFnE<dyfT5e4Xu)Cz?Xx-qh9k{~M?EHm^?m53HFyJOBUy

delta 2512
zcmZ|PeQ4EH9LMo9_i){#%WY2G)16OgZgR&>Ht$-gZI+K)YI8M$uGc&J#kQNfcan+S
zS)mOP@*zP>ltna6mUbzP5T!*pGFD*_F)4*mtWk?nij3Z${SN)tU$1k{@BGgBe!u7Z
zeuI5UfA=Mw{xmZ_%@|W&V@x5|Vgathd(c4-ZpU1F8T0WVX5tA<#}BXsFJLuZ#aURe
z$e0WaU>Y`{)?bBMZ{s2pAAd1w2liR}P#Yz1Dqccucn!7TC{D&Zn1>kwV{)(*^}G^`
zuo|__I#hzs;0)}+VtgwQH)axziwyYjOH{@wweAL4s7TAO6n&`5G+KkGK%zJWciH|?
z)CQ+<34VckZ_)#9MaoeDSHx|j7M1A=RHh+RCJ|JI+fW<r#ryC$PQ=eqCB1^>cnkG@
zR-K#iRGdTKhZ^62njgY!jBlf%((FbBa13>3=P(rqQ40^DGWZEg@GdH#q6f(W7oaNF
zisK1bBd9>Pqwc^fw!a5SEN%|cn8t&C)CQlR0=Z%x#o6@J9&#6|K$UtS7UL>Z0uC18
zPAtQts6fu60v$rl8^Kci9dp^=<SlkfG7FVi08_99wct~z$hV;?(t}yJ3w1;XP<P}g
zD$@bfI%iQEe}g)*o2b&~aUqnzJS<~>vzUg?;%S_You~zSQD=VyRoVemWj;i0G;I6d
zqAE0onqRooJ(BrYL%#(V;67AEE}{~<jPY_BH)&L2#>4J}8dN~_s6f_YJ%&&l_oD(j
zgY)qt)WScaKDRMcWzu*_@8_Zy%TX0rimE_MJ@r>fBMfN4Zd7DDP=OsrmHJ~;=9f@s
zehn4yKd7UrXmItT0tui#>t)tv`@9XcPY3EQbT?3cWwe(8c?eVS7^dLc)|04;yob7^
z=TRFBqcZs(mFaENckNl`mVOGV5{=d;Q1e2zAB)paBrjSIAwM-UfC}g)Dx)#mzl%Ql
zX^*&pRO3wg%Wb~{b?M@$uWCQez*DHZHH`YaZ=sGN{s#?3ocSo_!0C7|zJ`kQ9IEs~
zs28te8IGa{vzNPp7NGtErKrlRL~YP&pKr0xU%-Wozk>uCH&<z>gukLLlV^onGCyj(
z4%2YGwG|cEMoh;j>eB77{r$H8ChEw}pzhEGR3$FsEc^wF^!?|rbQkbp1`irgXWxX}
zFY`EZtmX)=#UD_m^sjO+=^9jpp0oC1D*ZlGfc>a--$z~E^Qa1bhdJzT{<0I&SGx=4
zqb63OO1T1cL{Fl=ZwGZ}cAzqU9jovpYW@gn<Dad!F`K?w!##l<d>&gcUQOdG8kLyd
z=zgcwI9C&pcg;@B!eLY<Bi0+JO8ka7nBC+aRWVMaKNB@xf%<A{?f7ccC2ejp&EutW
z7*NSxvJ+lKy|@px;c?8wckTFD)CQm7JRC-4^d~Cwu0(JC<`Pepx5^i&@+Iz6Ri#b#
zwuhtMj>smb%?Sl#PNXxMm|HVvf~O-KjRrS|6YB%X$?4(FSkxO0cef`(b)}yFp6#yB
zOG<XS!ihH;7EDZE;th9hb;90FiLY00n2@_Q9P)-D9UZ(IWKQ&eziF9&e9(!x8=0WG
zosn2LYTB>&91f~Ic)}eHbvZF-OE>SGYP!F$e(*$_)9G}1H7~O9*>EW4w0SojxY0EG
Kf1l+&=KB{(dsD{%

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index a780ee34..c4536ae9 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-01 21:06+0000\n"
-"PO-Revision-Date: 2021-03-01 10:10+0100\n"
+"POT-Creation-Date: 2021-03-02 11:28+0000\n"
+"PO-Revision-Date: 2021-03-02 12:27+0100\n"
 "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
 "Language: fr_FR\n"
@@ -815,7 +815,7 @@ msgstr ""
 #, fuzzy, python-format
 #| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "favorited your <a href=\"%(related_path)s\">status</a>"
-msgstr "a ajouté votre <a href=\"%(related_path)s\">message</a> à ses favoris"
+msgstr "a ajouté votre <a href=\"%(related_path)s\">statut</a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:60
 #, fuzzy, python-format
@@ -851,7 +851,7 @@ msgstr ""
 #, fuzzy, python-format
 #| msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "mentioned you in a <a href=\"%(related_path)s\">status</a>"
-msgstr "vous a mentionné dans son <a href=\"%(related_path)s\">message</a>"
+msgstr "vous a mentionné dans son <a href=\"%(related_path)s\">statut</a>"
 
 #: bookwyrm/templates/notifications.html:71
 #, fuzzy, python-format
@@ -899,7 +899,7 @@ msgid ""
 "\">status</a>"
 msgstr ""
 "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s"
-"\">message</a>"
+"\">statut</a>"
 
 #: bookwyrm/templates/notifications.html:81
 msgid "followed you"
@@ -943,7 +943,7 @@ msgstr ""
 #, fuzzy, python-format
 #| msgid "boosted your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "boosted your <a href=\"%(related_path)s\">status</a>"
-msgstr "a partagé votre <a href=\"%(related_path)s\">message</a>"
+msgstr "a partagé votre <a href=\"%(related_path)s\">statut</a>"
 
 #: bookwyrm/templates/notifications.html:100
 #, fuzzy, python-format
@@ -1384,8 +1384,8 @@ msgstr "Accepter"
 #, python-format
 msgid "set a goal to read %(counter)s book in %(year)s"
 msgid_plural "set a goal to read %(counter)s books in %(year)s"
-msgstr[0] "Définir l’objectif de lire %(counter)s livre en %(year)s"
-msgstr[1] "Définir l’objectif de lire %(counter)s livres en %(year)s"
+msgstr[0] "souhaite lire %(counter)s livre en %(year)s"
+msgstr[1] "souhaite lire %(counter)s livres en %(year)s"
 
 #: bookwyrm/templates/snippets/goal_card.html:21
 msgid "Dismiss message"
@@ -1471,11 +1471,11 @@ msgstr "Non listé"
 
 #: bookwyrm/templates/snippets/privacy-icons.html:12
 msgid "Followers-only"
-msgstr "Abonnements seulement"
+msgstr "Abonnemé(e)s uniquement"
 
 #: bookwyrm/templates/snippets/privacy_select.html:6
 msgid "Post privacy"
-msgstr "Confidentialité du message"
+msgstr "Confidentialité du statut"
 
 #: bookwyrm/templates/snippets/privacy_select.html:16
 #: bookwyrm/templates/user/followers.html:13
@@ -1562,22 +1562,22 @@ msgstr "S’enregistrer"
 #: bookwyrm/templates/snippets/rss_title.html:5
 #: bookwyrm/templates/snippets/status/status_header.html:9
 msgid "rated"
-msgstr "avec notes"
+msgstr "a noté"
 
 #: bookwyrm/templates/snippets/rss_title.html:7
 #: bookwyrm/templates/snippets/status/status_header.html:11
 msgid "reviewed"
-msgstr "avec critiques"
+msgstr "a écrit une critique de"
 
 #: bookwyrm/templates/snippets/rss_title.html:9
 #: bookwyrm/templates/snippets/status/status_header.html:13
 msgid "commented on"
-msgstr "avec commentaires"
+msgstr "a commenté"
 
 #: bookwyrm/templates/snippets/rss_title.html:11
 #: bookwyrm/templates/snippets/status/status_header.html:15
 msgid "quoted"
-msgstr "avec citations"
+msgstr "a cité"
 
 #: bookwyrm/templates/snippets/search_result_text.html:3
 #, python-format
@@ -1641,7 +1641,7 @@ msgstr "Commencer la lecture"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
 msgid "Read"
-msgstr "Lire"
+msgstr "Lu"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
 #, fuzzy
@@ -1652,7 +1652,7 @@ msgstr "Terminer la lecture"
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26
 msgid "Want to read"
-msgstr "A envie de lire"
+msgstr "Je veux le lire"
 
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
 #, python-format
@@ -1695,7 +1695,7 @@ msgstr "Plus d’options"
 
 #: bookwyrm/templates/snippets/status/status_options.html:17
 msgid "Delete post"
-msgstr "Supprimer le message"
+msgstr "Supprimer le statut"
 
 #: bookwyrm/templates/snippets/status/status_options.html:23
 #: bookwyrm/templates/snippets/user_options.html:13

From 436f73a7c4f5db3a15b4b11e2fd7fd2e4eb42c9c Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Tue, 2 Mar 2021 12:39:17 +0100
Subject: [PATCH 0140/1285] [i18n:fr_FR] Slightly tweak progression strings.

---
 locale/fr_FR/LC_MESSAGES/django.mo | Bin 20803 -> 20801 bytes
 locale/fr_FR/LC_MESSAGES/django.po |   8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index 09c26ceb8d49055396b817284e592c2913cebb0c..8b845aa782e4dddbeaef185c9447f67e8c99eeb3 100644
GIT binary patch
delta 1884
zcmXxjdrZzz9LMoft0z4vQAkPUmfS<5MIm`e7i-xv(`<Q23Zu+idW<kz{GnNfHfwHS
zbIENoTZ=VoW3y<i%w_&C{iQ;G<^AzH{(7D7Ip=rI_k7R!wKe*+Hu~ME3H3!9V_Fv*
zlYs9q1pnYz3|L~!R2+}$&%`Lq$51Rq&D(4HPotao8V2G$)VhyxB!0kH?8Q;&PB%U?
zlSXX1F+rG(+Ni)<jKhe_(1m+!ydNWokK#D2M{RHym0+8-8>bKtpw@}WFlG!+#_^bz
z;d4$<L`MuAyD$!GQHk6_W%?L((hi(}Uojm0ml`t~BTy$x!T|K3*2_U9UW%&7P8^O^
z7>q}JG_+7HD#HfULRV26Kga3Vh1$q}nR9|Dj3b_dx{7>^#*L`;_Ms|t5>?p-RAsK9
z_IYMwUpozz=o9J#*K+gkN}_QQu?J`4VN^wKqfXX>3D||RaL|q?W;zMYM<uchS6~5Z
z<9bv=mvDyR{;$)}!kwtc_z6{-0n`FR7?0tsq6#FV?$CoOX)$WS&8P~LqY^uTDs>a;
z<PTAI{u-5VFS^*@L}xj7lz>WP8jipP))jWV5Vg?;)LSS)o#=qI1_OytVF1>lKb}Kf
z(FN2aZ9=Wzf@9d<bkNXAzhD^lp-S(+(y2t6H48N_-^QCziIiE7U@Gx>RAQZ|1NGSW
zJI*EkiArRWhx$*VkwQZq>rszxJL<Qp#))_iRoWKR|NRbi6`xTF|HdkGtuiJN526yi
zj4J&D)OW8?kM=zV;ovIjKa7UoYUk0pQKeak+Q5Sv-)P6TU<z>^D$$pyx6q9|Cew$(
z7?<sQpM);r4C_i%V!5b!#o5$fkFL~q974q>P<M6_^@whuD)9&>;|J7VFoc>Pv&K2$
zT-4pCA@9p9MQ+m^!vgF;RdPa(^GH*DG*qGu)=CT{K84D#4&B&*dcD_CC47M@{Wm+_
zk6LF4H7_dHsbmUjUKZ;2E=0YVQdHu;!!(j<oJEzs9kp?n^)rSN|G?Eai2E=zk88rG
zI1BqR9w+AW2Vo{M)s*9Ke1bYiyY&rH37_eqp$z|^?kZ@lbLU~G{;?Q>Q*Hk|)ZM3{
zPMn9T*j77UfqGnft<|XSkE7<FLA|M)n53HAr%^=5N7Ts|HlK_vkM*11{42S`9g*WL
qsjS-Vjj#0XuGqGtt;ri--u!m)y3ok~10_2vD!e;NoRN&|fS|u2j^-=?

delta 1886
zcmY+@S!_)~9LMpwx?J5TYN@td6jdrTwnmFqZ{5~*LkMC`HBwzHX^S8StymKJQlTLg
zO>7N`XhNDaL=anr2aSD~NF;sI+)yvRKWAP%eda$iXXZcunRBPvbGO-ZtuD?PXpFg&
zZOjOKi81&a2V+EzF=H?V)t`?;Fo<zjiki2>_Sa)H@g<DFR@Ay}*bm=g3U*<CjG1K|
zGl9miS;lyAK5C<-)^*sMxC|q)%Er5K0C62A;wjVy*HH=Hv%bgC#39r=$+L|agrhMT
zvu8W*30BgPM8`H9j>k}mTt#KthB|2n4#RI4k709+Q3VrFCrih044~Fqh)TQ^RgtY2
zi!~U9wGIs}bPSbY6KbK0sEzMqI=(_}6qf6rAQ6WXPeNTq5QpMg)Ox#66*`KlY!j+7
z7f}1$wz2b&hD!7q^?^6f{JWAQoIxDGiMStCk!z@vwc`kUg&Ejm$J6Gz2~9yIl85=Y
z6t(dwR6^%)yy5;Y)6l}5n1G*Ar3s-H(APfbhpIp(>J9^_lCDE7Sc0lR1uC(_s8Y9}
zPJR=0=g(0IcVQ&^n<T$`M<Y>*jKjV-)#|t7%TODwM!kiNs1xn69>fUZ;~0(&*b5s`
zS9AvTNLx_rx8or8Hyt!|(y!PDyHTYND{w23Z7o2}3)*-CDv>g4EoKp)MkUsXI?x9j
z|G-JaKT(OK&ZGXLXiTG_j#a2fSC0Cv92|*_sM5Bh{_mHltN4OS_!m~AH(<<I+>1)|
zJgW3JP~Sa6J=!<u#hw85?@gmuq5J4!P^FoH+8}@$Uu(xV;Z))VRHBbjZ{a=im`pcD
zp|8m8Psd2&Tx$T8*kaVY^+nWQk8ZQ=a8U6P)SWe<9?=z4CE73*-=Y2j&wO`&3PuxW
zqV7Hid0!?ExlMBjm*7)WC4CFrM>^A?p%SgJ)?fs2Ju1T!sD;m>UT+Jkgbz@q|8B=a
zsC7IG-FZV%m7I>6HxKoDFGszZ&8UMq2WU*DaT4{xBh<#PtzR*YxC;yM5AH<&A{NJ6
zn1LbmVd`RI($J4gHI*2P?Wlu1vc5nn;h2v!lwl9*uA+kOoyVj46EOzUZ2uJ0-RGcA
z97I*D)Q)dKJ+7VBeW>pbqvkiD-qckbr<&ZLv4W0IsFP>49!V%q@np7!CO?Tz$n{l~
rY_BM-ynESKzQI>sQe0KNz4b-*vbce{zTzzv6(yC${|)67g?s-3OpN4(

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index c4536ae9..3956fc92 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-02 11:28+0000\n"
-"PO-Revision-Date: 2021-03-02 12:27+0100\n"
+"POT-Creation-Date: 2021-03-02 11:38+0000\n"
+"PO-Revision-Date: 2021-03-02 12:37+0100\n"
 "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
 "Language: fr_FR\n"
@@ -1544,7 +1544,7 @@ msgstr "Supprimer ces dates de lecture"
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:19
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:17
 msgid "Started reading"
-msgstr "A commencé la lecture"
+msgstr "Lecture commencée le"
 
 #: bookwyrm/templates/snippets/readthrough_form.html:14
 msgid "Progress"
@@ -1553,7 +1553,7 @@ msgstr "Progression"
 #: bookwyrm/templates/snippets/readthrough_form.html:30
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25
 msgid "Finished reading"
-msgstr "A terminé la lecture"
+msgstr "Lecture terminée le"
 
 #: bookwyrm/templates/snippets/register_form.html:32
 msgid "Sign Up"

From 2faf5cea2a723c43b09b5ffba164e951b23f9682 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 2 Mar 2021 09:01:31 -0800
Subject: [PATCH 0141/1285] modifies edit book code to allow creation as well

---
 bookwyrm/templates/edit_book.html | 80 +++++++++++++++++++------------
 bookwyrm/urls.py                  |  1 +
 bookwyrm/views/books.py           | 34 ++++++++-----
 3 files changed, 73 insertions(+), 42 deletions(-)

diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/edit_book.html
index 4d215949..aab9e103 100644
--- a/bookwyrm/templates/edit_book.html
+++ b/bookwyrm/templates/edit_book.html
@@ -2,12 +2,16 @@
 {% load i18n %}
 {% load humanize %}
 
-{% block title %}{% trans "Edit Book" %}{% endblock %}
+{% block title %}{% if book %}{% blocktrans with book_title=book.title %}Edit "{{ book_title }}"{% endblocktrans %}{% else %}{% trans "Add Book" %}{% endif %}{% endblock %}
 
 {% block content %}
 <header class="block">
     <h1 class="title level-left">
-        Edit "{{ book.title }}"
+        {% if book %}
+        {% blocktrans with book_title=book.title %}Edit "{{ book.title }}"{% endblocktrans %}
+        {% else %}
+        {% trans "Add Book" %}
+        {% endif %}
     </h1>
     <div>
         <p>{% trans "Added:" %} {{ book.created_date | naturaltime }}</p>
@@ -27,35 +31,49 @@
     <input type="hidden" name="last_edited_by" value="{{ request.user.id }}">
     <div class="columns">
         <div class="column">
-            <h2 class="title is-4">{% trans "Metadata" %}</h2>
-            <p class="fields is-grouped"><label class="label" for="id_title">{% trans "Title:" %}</label> {{ form.title }} </p>
-            {% for error in form.title.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
-            <p class="fields is-grouped"><label class="label" for="id_subtitle">{% trans "Subtitle:" %}</label> {{ form.subtitle }} </p>
-            {% for error in form.subtitle.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
-            <p class="fields is-grouped"><label class="label" for="id_description">{% trans "Description:" %}</label> {{ form.description }} </p>
-            {% for error in form.description.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
-            <p class="fields is-grouped"><label class="label" for="id_series">{% trans "Series:" %}</label> {{ form.series }} </p>
-            {% for error in form.series.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
-            <p class="fields is-grouped"><label class="label" for="id_series_number">{% trans "Series number:" %}</label> {{ form.series_number }} </p>
-            {% for error in form.series_number.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
-            <p class="fields is-grouped"><label class="label" for="id_first_published_date">{% trans "First published date:" %}</label> {{ form.first_published_date }} </p>
-            {% for error in form.first_published_date.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
-            <p class="fields is-grouped"><label class="label" for="id_published_date">{% trans "Published date:" %}</label> {{ form.published_date }} </p>
-            {% for error in form.published_date.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
+            <section class="block">
+                <h2 class="title is-4">{% trans "Metadata" %}</h2>
+                <p class="fields is-grouped"><label class="label" for="id_title">{% trans "Title:" %}</label> {{ form.title }} </p>
+                {% for error in form.title.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+                <p class="fields is-grouped"><label class="label" for="id_subtitle">{% trans "Subtitle:" %}</label> {{ form.subtitle }} </p>
+                {% for error in form.subtitle.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+                <p class="fields is-grouped"><label class="label" for="id_description">{% trans "Description:" %}</label> {{ form.description }} </p>
+                {% for error in form.description.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+                <p class="fields is-grouped"><label class="label" for="id_series">{% trans "Series:" %}</label> {{ form.series }} </p>
+                {% for error in form.series.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+                <p class="fields is-grouped"><label class="label" for="id_series_number">{% trans "Series number:" %}</label> {{ form.series_number }} </p>
+                {% for error in form.series_number.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+                <p class="fields is-grouped"><label class="label" for="id_first_published_date">{% trans "First published date:" %}</label> {{ form.first_published_date }} </p>
+                {% for error in form.first_published_date.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+                <p class="fields is-grouped"><label class="label" for="id_published_date">{% trans "Published date:" %}</label> {{ form.published_date }} </p>
+                {% for error in form.published_date.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+            </section>
+
+            <section class="block">
+                <h2 class="title is-4">{% trans "Authors" %}</h2>
+                {% for author in book.authors.all %}
+                <p><a href="{{ author.local_path }}">{{ author.name }}</a>
+                <label class="label">
+                    <input type="checkbox" name="remove-author" value="{{ author.id }}"> {% trans "Remove this author" %}
+                </label>
+                {% endfor %}
+                <label class="label" for="id_add_author">{% trans "Add Author:" %}</label>
+                <input class="input" type="text" name="author" id="id_add_author" placeholder="John Doe">
+            </section>
         </div>
 
         <div class="column">
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index a741088a..dfb64c23 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -134,6 +134,7 @@ urlpatterns = [
     re_path(r'^add-description/(?P<book_id>\d+)/?$', views.add_description),
     re_path(r'^resolve-book/?$', views.resolve_book),
     re_path(r'^switch-edition/?$', views.switch_edition),
+    re_path(r'^create-book/?$', views.EditBook.as_view()),
 
     # author
     re_path(r'^author/(?P<author_id>\d+)(.json)?/?$', views.Author.as_view()),
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 4d6afba9..1754982e 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -106,28 +106,40 @@ class Book(View):
     name='dispatch')
 class EditBook(View):
     ''' edit a book '''
-    def get(self, request, book_id):
+    def get(self, request, book_id=None):
         ''' info about a book '''
-        book = get_edition(book_id)
-        if not book.description:
-            book.description = book.parent_work.description
+        book = None
+        if book_id:
+            book = get_edition(book_id)
+            if not book.description:
+                book.description = book.parent_work.description
         data = {
             'book': book,
             'form': forms.EditionForm(instance=book)
         }
         return TemplateResponse(request, 'edit_book.html', data)
 
-    def post(self, request, book_id):
+    def post(self, request, book_id=None):
         ''' edit a book cool '''
-        book = get_object_or_404(models.Edition, id=book_id)
-
+        book = get_object_or_404(models.Edition, id=book_id) if book_id \
+                else None
         form = forms.EditionForm(request.POST, request.FILES, instance=book)
+
+        data = {
+            'book': book,
+            'form': form
+        }
         if not form.is_valid():
-            data = {
-                'book': book,
-                'form': form
-            }
             return TemplateResponse(request, 'edit_book.html', data)
+
+        if not book or form.author:
+            # creting a book or adding an author to a book needs another step
+            return TemplateResponse(request, 'confirm_book.html', data)
+
+        # remove authors
+        if request.POST.get('remove-author'):
+            import pdb;pdb.set_trace()
+            author = get_object_or_404(id=author_id)
         book = form.save()
 
         return redirect('/book/%s' % book.id)

From 01df4ad3216493eb5d65b7a1cc6e08e1ca122016 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 2 Mar 2021 09:25:45 -0800
Subject: [PATCH 0142/1285] Small fixes for translation

---
 bookwyrm/templates/lists/list.html                     | 2 +-
 bookwyrm/templates/snippets/status/status_options.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index ddfaad0a..ddac04f3 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -32,7 +32,7 @@
                     </div>
                     <div class="card-footer has-background-white-bis">
                         <div class="card-footer-item">
-                            <p>{% trans "Added by" %} {% include 'snippets/username.html' with user=item.user %}</p>
+                            <p>{% blocktrans with username=item.user.display_name user_path=user.local_path %}Added by <a href="{{ user_path }}">{{ username }}</a>{% endblocktrans %}</p>
                         </div>
                         {% if list.user == request.user or list.curation == 'open' and item.user == request.user %}
                         <form name="add-book" method="post" action="{% url 'list-remove-book' list.id %}" class="card-footer-item">
diff --git a/bookwyrm/templates/snippets/status/status_options.html b/bookwyrm/templates/snippets/status/status_options.html
index 735ff51c..babd8296 100644
--- a/bookwyrm/templates/snippets/status/status_options.html
+++ b/bookwyrm/templates/snippets/status/status_options.html
@@ -14,7 +14,7 @@
     <form class="dropdown-item pt-0 pb-0" name="delete-{{status.id}}" action="/delete-status/{{ status.id }}" method="post">
         {% csrf_token %}
         <button class="button is-danger is-light is-fullwidth is-small" type="submit">
-            {% trans "Delete post" %}
+            {% trans "Delete status" %}
         </button>
     </form>
 </li>

From bb6a82fdffd08b7ce78033cdfe0feb1093569ffc Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 2 Mar 2021 09:26:21 -0800
Subject: [PATCH 0143/1285] Adds simplified chinese language code to settings

---
 bookwyrm/settings.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 8cdf87ff..6c3bb7d2 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -141,6 +141,7 @@ LANGUAGE_CODE = 'en-us'
 LANGUAGES = [
     ('en-us', _('English')),
     ('fr-fr', _('French')),
+    ('zh-cn', _('Simplified Chinese')),
 ]
 
 

From 8bb7d5bba0e1cefa29cfe5b2886d8e394ef5d4dd Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 2 Mar 2021 09:55:28 -0800
Subject: [PATCH 0144/1285] Translates invite form values

---
 bookwyrm/forms.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index ba2fcc8c..b920fc9c 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -6,6 +6,7 @@ from django import forms
 from django.forms import ModelForm, PasswordInput, widgets
 from django.forms.widgets import Textarea
 from django.utils import timezone
+from django.utils.translation import gettext as _
 
 from bookwyrm import models
 
@@ -181,13 +182,14 @@ class CreateInviteForm(CustomForm):
         exclude = ['code', 'user', 'times_used']
         widgets = {
             'expiry': ExpiryWidget(choices=[
-                ('day', 'One Day'),
-                ('week', 'One Week'),
-                ('month', 'One Month'),
-                ('forever', 'Does Not Expire')]),
+                ('day', _('One Day')),
+                ('week', _('One Week')),
+                ('month', _('One Month')),
+                ('forever', _('Does Not Expire'))]),
             'use_limit': widgets.Select(
-                choices=[(i, "%d uses" % (i,)) for i in [1, 5, 10, 25, 50, 100]]
-                + [(None, 'Unlimited')])
+                choices=[(i, _("%(count)d uses" % {'count': i})) \
+                        for i in [1, 5, 10, 25, 50, 100]]
+                + [(None, _('Unlimited'))])
         }
 
 class ShelfForm(CustomForm):

From 5938c438e2621d9dfd70e91fc6973c48764b0b21 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 2 Mar 2021 09:59:15 -0800
Subject: [PATCH 0145/1285] Translate table titles in header

---
 bookwyrm/templates/feed/feed.html | 2 +-
 bookwyrm/views/feed.py            | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html
index 71b59cc1..1eae24d4 100644
--- a/bookwyrm/templates/feed/feed.html
+++ b/bookwyrm/templates/feed/feed.html
@@ -3,7 +3,7 @@
 {% load bookwyrm_tags %}
 {% block panel %}
 
-<h1 class="title">{% blocktrans with tab_title=tab|title %}{{ tab_title }} Timeline{% endblocktrans %}</h1>
+<h1 class="title">{% blocktrans %}{{ tab_title }} Timeline{% endblocktrans %}</h1>
 <div class="tabs">
     <ul>
         <li class="{% if tab == 'home' %}is-active{% endif %}">
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index 5300c762..f9cb9d59 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -6,6 +6,7 @@ from django.http import HttpResponseNotFound
 from django.template.response import TemplateResponse
 from django.utils import timezone
 from django.utils.decorators import method_decorator
+from django.utils.translation import gettext as _
 from django.views import View
 
 from bookwyrm import forms, models
@@ -29,18 +30,22 @@ class Feed(View):
         if tab == 'home':
             activities = get_activity_feed(
                 request.user, following_only=True)
+            tab_title = _('Home')
         elif tab == 'local':
             activities = get_activity_feed(
                 request.user, privacy=['public', 'followers'], local_only=True)
+            tab_title = _('Local')
         else:
             activities = get_activity_feed(
                 request.user, privacy=['public', 'followers'])
+            tab_title = _('Federated')
         paginated = Paginator(activities, PAGE_LENGTH)
 
         data = {**feed_page_data(request.user), **{
             'user': request.user,
             'activities': paginated.page(page),
             'tab': tab,
+            'tab_title': tab_title,
             'goal_form': forms.GoalForm(),
             'path': '/%s' % tab,
         }}

From 27914d07b9b1203412d49faea63a76281c3d2e80 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 2 Mar 2021 10:23:11 -0800
Subject: [PATCH 0146/1285] Missing translation strings on book and list pages

---
 bookwyrm/templates/book.html        | 26 +++++++++++++++++++-------
 bookwyrm/templates/lists/lists.html |  2 +-
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html
index 10682347..aabfb37b 100644
--- a/bookwyrm/templates/book.html
+++ b/bookwyrm/templates/book.html
@@ -18,7 +18,7 @@
             </h1>
             {% if book.authors %}
             <h2 class="subtitle">
-                by {% include 'snippets/authors.html' with book=book %}
+                {% trans "by" %} {% include 'snippets/authors.html' with book=book %}
             </h2>
             {% endif %}
         </div>
@@ -78,8 +78,13 @@
                 </dl>
 
                 <p>
-                {% if book.physical_format %}{{ book.physical_format | title }}{% if book.pages %},<br>{% endif %}{% endif %}
-                {% if book.pages %}{{ book.pages }} pages{% endif %}
+                {% if book.physical_format and not book.pages %}
+                {{ book.physical_format | title }}
+                {% elif book.physical_format and book.pages %}
+                {% blocktrans with format=book.physical_format|title pages=book.pages %}{{ format }}, {{ pages }} pages{% endblocktrans %}
+                {% elif book.pages %}
+                {% blocktrans with pages=book.pages %}{{ pages }} pages{% endblocktrans %}
+                {% endif %}
                 </p>
 
                 {% if book.openlibrary_key %}
@@ -90,7 +95,14 @@
 
         <div class="column">
             <div class="block">
-                <h3 class="field is-grouped">{% include 'snippets/stars.html' with rating=rating %} ({{ review_count }} review{{ review_count|pluralize }})</h3>
+                <h3 class="field is-grouped">
+                    {% include 'snippets/stars.html' with rating=rating %}
+                    {% blocktrans count counter=review_count %}
+                    ({{ review_count }} review)
+                    {% plural %}
+                    ({{ review_count }} reviews)
+                    {% endblocktrans %}
+                </h3>
 
                 {% include 'snippets/trimmed_text.html' with full=book|book_description %}
 
@@ -116,7 +128,7 @@
 
 
                 {% if book.parent_work.editions.count > 1 %}
-                <p><a href="/book/{{ book.parent_work.id }}/editions">{{ book.parent_work.editions.count }} editions</a></p>
+                <p>{% blocktrans with path=book.parent_work.local_path count=book.parent_work.editions.count %}<a href="{{ path }}/editions">{{ count }} editions</a>{% endblocktrans %}</p>
                 {% endif %}
             </div>
 
@@ -124,13 +136,13 @@
             <div class="block">
                 {% for shelf in user_shelves %}
                 <p>
-                    This edition is on your <a href="/user/{{ user.localname }}/shelf/{{ shelf.shelf.identifier }}">{{ shelf.shelf.name }}</a> shelf.
+                    {% blocktrans with path=shelf.shelf.local_path shelf_name=shelf.shelf.name %}This edition is on your <a href="{{ path }}">{{ shelf_name }}</a> shelf.{% endblocktrans %}
                     {% include 'snippets/shelf_selector.html' with current=shelf.shelf %}
                 </p>
                 {% endfor %}
                 {% for shelf in other_edition_shelves %}
                 <p>
-                    A <a href="/book/{{ shelf.book.id }}">different edition</a> of this book is on your <a href="/user/{{ user.localname }}/shelf/{{ shelf.shelf.identifier }}">{{ shelf.shelf.name }}</a> shelf.
+                {% blocktrans with book_path=shelf.book.local_path shelf_path=shelf.shelf.local_path shelf_name=shelf.shelf.name %}A <a href="{{ book_path }}">different edition</a> of this book is on your <a href="{{ shelf_path }}">{{ shelf_name }}</a> shelf.{% endblocktrans %}
                     {% include 'snippets/switch_edition_button.html' with edition=book %}
                 </p>
                 {% endfor %}
diff --git a/bookwyrm/templates/lists/lists.html b/bookwyrm/templates/lists/lists.html
index 795db6fb..f7ab020a 100644
--- a/bookwyrm/templates/lists/lists.html
+++ b/bookwyrm/templates/lists/lists.html
@@ -29,7 +29,7 @@
     {% endif %}
 
     {% if request.user.list_set.count > 4 %}
-    <a href="{% url 'user-lists' request.user.localname %}">See all {{ request.user.list_set.count}} lists</a>
+    <a href="{% url 'user-lists' request.user.localname %}">{% blocktrans with size=request.user.list_set.count %}See all {{ size }} lists{% endblocktrans %}</a>
     {% endif %}
 </section>
 {% endif %}

From 2c3789379099c76d430bb50817b996870f6e115b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 2 Mar 2021 10:32:46 -0800
Subject: [PATCH 0147/1285] Adds default shelf names translations

---
 bookwyrm/templates/feed/feed_layout.html | 5 ++++-
 bookwyrm/templates/user/shelf.html       | 2 +-
 bookwyrm/views/feed.py                   | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/feed/feed_layout.html b/bookwyrm/templates/feed/feed_layout.html
index 7f35d2f3..04826a64 100644
--- a/bookwyrm/templates/feed/feed_layout.html
+++ b/bookwyrm/templates/feed/feed_layout.html
@@ -20,7 +20,10 @@
                 {% with shelf_counter=forloop.counter %}
                     <li>
                         <p>
-                            {{ shelf.name }}
+                            {% if shelf.identifier == 'to-read' %}{% trans "To Read" %}
+                            {% elif shelf.identifier == 'reading' %}{% trans "Currently Reading" %}
+                            {% elif shelf.identifier == 'read' %}{% trans "Read" %}
+                            {% else %}{{ shelf.name }}{% endif %}
                         </p>
                         <div class="tabs is-small is-toggle">
                             <ul>
diff --git a/bookwyrm/templates/user/shelf.html b/bookwyrm/templates/user/shelf.html
index c7c83388..189d2856 100644
--- a/bookwyrm/templates/user/shelf.html
+++ b/bookwyrm/templates/user/shelf.html
@@ -21,7 +21,7 @@
             <ul>
             {% for shelf_tab in shelves %}
             <li class="{% if shelf_tab.identifier == shelf.identifier %}is-active{% endif %}">
-                    <a href="/user/{{ user | username }}/shelf/{{ shelf_tab.identifier }}"{% if shelf_tab.identifier == shelf.identifier %} aria-current="page"{% endif %}>{{ shelf_tab.name }}</a>
+                <a href="/user/{{ user | username }}/shelf/{{ shelf_tab.identifier }}"{% if shelf_tab.identifier == shelf.identifier %} aria-current="page"{% endif %}>{% if shelf_tab.identifier == 'to-read' %}{% trans "To Read" %}{% elif shelf_tab.identifier == 'reading' %}{% trans "Currently Reading" %}{% elif shelf_tab.identifier == 'read' %}{% trans "Read" %}{% else %}{{ shelf_tab.name }}{% endif %}</a>
                 </li>
             {% endfor %}
             </ul>
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index f9cb9d59..f7e93e9a 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -166,6 +166,7 @@ def get_suggested_books(user, max_books=5):
             continue
         shelf_preview = {
             'name': shelf.name,
+            'identifier': shelf.identifier,
             'books': [s.book for s in shelf_books]
         }
         suggested_books.append(shelf_preview)

From 9f2e255f501428de1ad524fff679dfc26537023b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 2 Mar 2021 10:33:48 -0800
Subject: [PATCH 0148/1285] Re-compile messages for new strings

---
 locale/en_US/LC_MESSAGES/django.mo | Bin 390 -> 386 bytes
 locale/en_US/LC_MESSAGES/django.po | 108 +++++++++++++++++++-----
 locale/fr_FR/LC_MESSAGES/django.mo | Bin 20801 -> 20692 bytes
 locale/fr_FR/LC_MESSAGES/django.po | 130 +++++++++++++++++++++++------
 locale/zh_CN/LC_MESSAGES/django.mo | Bin 23973 -> 23894 bytes
 locale/zh_CN/LC_MESSAGES/django.po | 129 ++++++++++++++++++++++------
 6 files changed, 296 insertions(+), 71 deletions(-)

diff --git a/locale/en_US/LC_MESSAGES/django.mo b/locale/en_US/LC_MESSAGES/django.mo
index c0a5dd97922819649185a3a8135344140fa5f096..e07529141a2dbe01f4f40179065965e72cb674c3 100644
GIT binary patch
delta 46
zcmZo;ZepIG!sszkRg2MJVt^@+g@U2Em7%4sfrWv=#0jqKu6gM>nZ+3sAIMGo-wps8
C4i0qy

delta 51
zcmZo-ZeyOH!ss(mRg2MZVt^^Pxq_jwm8pStKyb*!iLTtf`K86F3PGu<WvLVI$}uWT
H{M`-!Y2OeL

diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index 85175813..486494b0 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-01 09:32-0800\n"
+"POT-Creation-Date: 2021-03-02 18:33+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"
@@ -32,6 +32,10 @@ msgstr ""
 msgid "Books by %(name)s"
 msgstr ""
 
+#: bookwyrm/templates/book.html:21
+msgid "by"
+msgstr ""
+
 #: bookwyrm/templates/book.html:29 bookwyrm/templates/book.html:30
 #: bookwyrm/templates/edit_book.html:5
 msgid "Edit Book"
@@ -57,20 +61,43 @@ msgstr ""
 msgid "ASIN:"
 msgstr ""
 
+#: bookwyrm/templates/book.html:84
+#, python-format
+msgid "%(format)s, %(pages)s pages"
+msgstr ""
+
 #: bookwyrm/templates/book.html:86
+#, python-format
+msgid "%(pages)s pages"
+msgstr ""
+
+#: bookwyrm/templates/book.html:91
 msgid "View on OpenLibrary"
 msgstr ""
 
-#: bookwyrm/templates/book.html:98
+#: bookwyrm/templates/book.html:100
+#, python-format
+msgid ""
+"\n"
+"                    (%(review_count)s review)\n"
+"                    "
+msgid_plural ""
+"\n"
+"                    (%(review_count)s reviews)\n"
+"                    "
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/book.html:110
 msgid "Add Description"
 msgstr ""
 
-#: bookwyrm/templates/book.html:105 bookwyrm/templates/edit_book.html:39
+#: bookwyrm/templates/book.html:117 bookwyrm/templates/edit_book.html:39
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr ""
 
-#: bookwyrm/templates/book.html:109 bookwyrm/templates/edit_author.html:78
+#: bookwyrm/templates/book.html:121 bookwyrm/templates/edit_author.html:78
 #: bookwyrm/templates/edit_book.html:120 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:50
 #: bookwyrm/templates/settings/site.html:89
@@ -81,7 +108,7 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: bookwyrm/templates/book.html:110 bookwyrm/templates/book.html:159
+#: bookwyrm/templates/book.html:122 bookwyrm/templates/book.html:171
 #: bookwyrm/templates/edit_author.html:79 bookwyrm/templates/edit_book.html:121
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
@@ -92,51 +119,68 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: bookwyrm/templates/book.html:142
+#: bookwyrm/templates/book.html:131
+#, python-format
+msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
+msgstr ""
+
+#: bookwyrm/templates/book.html:139
+#, python-format
+msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
+msgstr ""
+
+#: bookwyrm/templates/book.html:145
+#, python-format
+msgid ""
+"A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a "
+"href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
+msgstr ""
+
+#: bookwyrm/templates/book.html:154
 msgid "Your reading activity"
 msgstr ""
 
-#: bookwyrm/templates/book.html:144
+#: bookwyrm/templates/book.html:156
 msgid "Add read dates"
 msgstr ""
 
-#: bookwyrm/templates/book.html:149
+#: bookwyrm/templates/book.html:161
 msgid "You don't have any reading activity for this book."
 msgstr ""
 
-#: bookwyrm/templates/book.html:156
+#: bookwyrm/templates/book.html:168
 msgid "Create"
 msgstr ""
 
-#: bookwyrm/templates/book.html:178
+#: bookwyrm/templates/book.html:190
 msgid "Tags"
 msgstr ""
 
-#: bookwyrm/templates/book.html:182 bookwyrm/templates/snippets/tag.html:18
+#: bookwyrm/templates/book.html:194 bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr ""
 
-#: bookwyrm/templates/book.html:199
+#: bookwyrm/templates/book.html:211
 msgid "Subjects"
 msgstr ""
 
-#: bookwyrm/templates/book.html:210
+#: bookwyrm/templates/book.html:222
 msgid "Places"
 msgstr ""
 
-#: bookwyrm/templates/book.html:221 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book.html:233 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
 #: bookwyrm/templates/search_results.html:90
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr ""
 
-#: bookwyrm/templates/book.html:250
+#: bookwyrm/templates/book.html:262
 msgid "rated it"
 msgstr ""
 
 #: bookwyrm/templates/components/inline_form.html:8
-#: bookwyrm/templates/feed/feed_layout.html:51
+#: bookwyrm/templates/feed/feed_layout.html:54
 msgid "Close"
 msgstr ""
 
@@ -375,7 +419,23 @@ msgid ""
 "There are no books here right now! Try searching for a book to get started"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed_layout.html:73 bookwyrm/templates/goal.html:26
+#: bookwyrm/templates/feed/feed_layout.html:23
+#: bookwyrm/templates/user/shelf.html:24
+msgid "To Read"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed_layout.html:24
+#: bookwyrm/templates/user/shelf.html:24
+msgid "Currently Reading"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed_layout.html:25
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
+#: bookwyrm/templates/user/shelf.html:24
+msgid "Read"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed_layout.html:76 bookwyrm/templates/goal.html:26
 #: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
 msgid "%(year)s Reading Goal"
@@ -662,7 +722,8 @@ msgid "This list is currently empty"
 msgstr ""
 
 #: bookwyrm/templates/lists/list.html:35
-msgid "Added by"
+#, python-format
+msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr ""
 
 #: bookwyrm/templates/lists/list.html:41
@@ -716,6 +777,11 @@ msgstr ""
 msgid "Your lists"
 msgstr ""
 
+#: bookwyrm/templates/lists/lists.html:32
+#, python-format
+msgid "See all %(size)s lists"
+msgstr ""
+
 #: bookwyrm/templates/lists/lists.html:40
 msgid "Recent Lists"
 msgstr ""
@@ -1530,10 +1596,6 @@ msgstr ""
 msgid "Start reading"
 msgstr ""
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-msgid "Read"
-msgstr ""
-
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
 msgid "Finish reading"
 msgstr ""
@@ -1583,7 +1645,7 @@ msgid "More options"
 msgstr ""
 
 #: bookwyrm/templates/snippets/status/status_options.html:17
-msgid "Delete post"
+msgid "Delete status"
 msgstr ""
 
 #: bookwyrm/templates/snippets/status/status_options.html:23
diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index 8b845aa782e4dddbeaef185c9447f67e8c99eeb3..9f8cca0a8c197b367ab948e30475b8a861aa1fc9 100644
GIT binary patch
delta 7043
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

delta 7129
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

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 3956fc92..f0a25f6b 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-02 11:38+0000\n"
+"POT-Creation-Date: 2021-03-02 18:33+0000\n"
 "PO-Revision-Date: 2021-03-02 12:37+0100\n"
 "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -32,6 +32,10 @@ msgstr "Wikipedia"
 msgid "Books by %(name)s"
 msgstr "Livres par %(name)s"
 
+#: bookwyrm/templates/book.html:21
+msgid "by"
+msgstr ""
+
 #: bookwyrm/templates/book.html:29 bookwyrm/templates/book.html:30
 #: bookwyrm/templates/edit_book.html:5
 msgid "Edit Book"
@@ -57,22 +61,47 @@ msgstr "Numéro OCLC :"
 msgid "ASIN:"
 msgstr "ASIN :"
 
+#: bookwyrm/templates/book.html:84
+#, fuzzy, python-format
+#| msgid "of %(book.pages)s pages"
+msgid "%(format)s, %(pages)s pages"
+msgstr "sur %(book.pages)s pages"
+
 #: bookwyrm/templates/book.html:86
+#, fuzzy, python-format
+#| msgid "of %(book.pages)s pages"
+msgid "%(pages)s pages"
+msgstr "sur %(book.pages)s pages"
+
+#: bookwyrm/templates/book.html:91
 msgid "View on OpenLibrary"
 msgstr "Voir sur OpenLibrary"
 
-#: bookwyrm/templates/book.html:98
+#: bookwyrm/templates/book.html:100
+#, python-format
+msgid ""
+"\n"
+"                    (%(review_count)s review)\n"
+"                    "
+msgid_plural ""
+"\n"
+"                    (%(review_count)s reviews)\n"
+"                    "
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/book.html:110
 #, fuzzy
 #| msgid "Description:"
 msgid "Add Description"
 msgstr "Ajouter une description"
 
-#: bookwyrm/templates/book.html:105 bookwyrm/templates/edit_book.html:39
+#: bookwyrm/templates/book.html:117 bookwyrm/templates/edit_book.html:39
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Description :"
 
-#: bookwyrm/templates/book.html:109 bookwyrm/templates/edit_author.html:78
+#: bookwyrm/templates/book.html:121 bookwyrm/templates/edit_author.html:78
 #: bookwyrm/templates/edit_book.html:120 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:50
 #: bookwyrm/templates/settings/site.html:89
@@ -83,7 +112,7 @@ msgstr "Description :"
 msgid "Save"
 msgstr "Enregistrer"
 
-#: bookwyrm/templates/book.html:110 bookwyrm/templates/book.html:159
+#: bookwyrm/templates/book.html:122 bookwyrm/templates/book.html:171
 #: bookwyrm/templates/edit_author.html:79 bookwyrm/templates/edit_book.html:121
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
@@ -94,53 +123,77 @@ msgstr "Enregistrer"
 msgid "Cancel"
 msgstr "Annuler"
 
-#: bookwyrm/templates/book.html:142
+#: bookwyrm/templates/book.html:131
+#, fuzzy, python-format
+#| msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
+msgstr "<a href=\"%(path)s\">%(title)s</a> par "
+
+#: bookwyrm/templates/book.html:139
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
+msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
+
+#: bookwyrm/templates/book.html:145
+#, fuzzy, python-format
+#| msgid ""
+#| "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+#| "\">%(preview_name)s</a>"
+msgid ""
+"A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a "
+"href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
+msgstr ""
+" a ajouté <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre "
+"liste « <a href=\"%(list_path)s\">%(list_name)s</a> »"
+
+#: bookwyrm/templates/book.html:154
 msgid "Your reading activity"
 msgstr "Votre activité de lecture"
 
-#: bookwyrm/templates/book.html:144
+#: bookwyrm/templates/book.html:156
 #, fuzzy
 #| msgid "Edit read dates"
 msgid "Add read dates"
 msgstr "Ajouter des dates de lecture"
 
-#: bookwyrm/templates/book.html:149
+#: bookwyrm/templates/book.html:161
 msgid "You don't have any reading activity for this book."
 msgstr "Vous n’avez aucune activité de lecture pour ce livre"
 
-#: bookwyrm/templates/book.html:156
+#: bookwyrm/templates/book.html:168
 msgid "Create"
 msgstr "Créer"
 
-#: bookwyrm/templates/book.html:178
+#: bookwyrm/templates/book.html:190
 msgid "Tags"
 msgstr "Tags"
 
-#: bookwyrm/templates/book.html:182 bookwyrm/templates/snippets/tag.html:18
+#: bookwyrm/templates/book.html:194 bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr "Ajouter un tag"
 
-#: bookwyrm/templates/book.html:199
+#: bookwyrm/templates/book.html:211
 msgid "Subjects"
 msgstr "Sujets"
 
-#: bookwyrm/templates/book.html:210
+#: bookwyrm/templates/book.html:222
 msgid "Places"
 msgstr "Lieux"
 
-#: bookwyrm/templates/book.html:221 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book.html:233 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
 #: bookwyrm/templates/search_results.html:90
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listes"
 
-#: bookwyrm/templates/book.html:250
+#: bookwyrm/templates/book.html:262
 msgid "rated it"
 msgstr "l’a noté"
 
 #: bookwyrm/templates/components/inline_form.html:8
-#: bookwyrm/templates/feed/feed_layout.html:51
+#: bookwyrm/templates/feed/feed_layout.html:54
 #, fuzzy
 #| msgid "Closed"
 msgid "Close"
@@ -389,7 +442,27 @@ msgid ""
 "There are no books here right now! Try searching for a book to get started"
 msgstr "Aucun livre ici pour l’instant ! Cherchez un livre pour commencer"
 
-#: bookwyrm/templates/feed/feed_layout.html:73 bookwyrm/templates/goal.html:26
+#: bookwyrm/templates/feed/feed_layout.html:23
+#: bookwyrm/templates/user/shelf.html:24
+#, fuzzy
+#| msgid "Read"
+msgid "To Read"
+msgstr "Lu"
+
+#: bookwyrm/templates/feed/feed_layout.html:24
+#: bookwyrm/templates/user/shelf.html:24
+#, fuzzy
+#| msgid "Started reading"
+msgid "Currently Reading"
+msgstr "Commencer la lecture"
+
+#: bookwyrm/templates/feed/feed_layout.html:25
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
+#: bookwyrm/templates/user/shelf.html:24
+msgid "Read"
+msgstr "Lu"
+
+#: bookwyrm/templates/feed/feed_layout.html:76 bookwyrm/templates/goal.html:26
 #: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
 msgid "%(year)s Reading Goal"
@@ -690,8 +763,10 @@ msgid "This list is currently empty"
 msgstr "Cette liste est vide actuellement"
 
 #: bookwyrm/templates/lists/list.html:35
-msgid "Added by"
-msgstr "Ajouté par"
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
+msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/lists/list.html:41
 msgid "Remove"
@@ -744,6 +819,12 @@ msgstr "Créée par"
 msgid "Your lists"
 msgstr "Vos listes"
 
+#: bookwyrm/templates/lists/lists.html:32
+#, fuzzy, python-format
+#| msgid "See all %(size)s"
+msgid "See all %(size)s lists"
+msgstr "Voir les %(size)s"
+
 #: bookwyrm/templates/lists/lists.html:40
 msgid "Recent Lists"
 msgstr "Listes récentes"
@@ -1639,10 +1720,6 @@ msgstr "Plus d’étagères"
 msgid "Start reading"
 msgstr "Commencer la lecture"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-msgid "Read"
-msgstr "Lu"
-
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
 #, fuzzy
 #| msgid "Finished reading"
@@ -1694,7 +1771,9 @@ msgid "More options"
 msgstr "Plus d’options"
 
 #: bookwyrm/templates/snippets/status/status_options.html:17
-msgid "Delete post"
+#, fuzzy
+#| msgid "Delete post"
+msgid "Delete status"
 msgstr "Supprimer le statut"
 
 #: bookwyrm/templates/snippets/status/status_options.html:23
@@ -1859,6 +1938,9 @@ msgstr[1] "%(username)s n’a pas d’abonné(e)s"
 msgid "%(counter)s following"
 msgstr "%(counter)s abonnements"
 
+#~ msgid "Added by"
+#~ msgstr "Ajouté par"
+
 #~ msgid "added"
 #~ msgstr "a ajouté"
 
diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
index 818dd2a106bc0d908fae88238bb4d2157c8c0708..1114628341af6f1ca8e4f07e6dadb2932b1b0b91 100644
GIT binary patch
delta 8038
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

delta 8093
zcmYk>3w+P@9>?)7v)OFJHe<|X!{$13zs+UKWkVXx{nlJVn2>Vo?-G+z<W@wkr-LP0
zNTl52pgMHsP(+Dxrw&Evyx#kLJRW|JK6`$@pWpZX`~Cl$M<+flux@7o-w)x17CEl*
z1)M93M}wXFo$};T$~u=;!MU;64rk(L*bH06I9DB~VkB<F+PDYR^*1buMPi*Rhq2fN
zTVgye^zuHplY#~~W!}Kj)cq@Z169Dv)Ei+I_A!s*DC*5BIhTPOF&Y0xe@v!R1h&O6
z?1ce10t@3<40Jx{CQ<Ms@d^gvY%GRvS$#DYrJjT8xDx|$A8Np(7=quT+MTod4b%ee
zV<;An^X`{N_UIC@F7vx|3L1DiYQQ-dj`J<Q77J0&F}EO3$!$Y_+>4sv5USk?ERNsf
zEWC<3fwA$<MdM7=f>)t0fWjsU+VNJqalkx|{^ZYM0A4_~yNa6NK5F5iRXih66P3ei
zn26d)Pt-UgP~(h2EqFo|&R;vpCZPcrpaxir`8z~SxEHnJ<EWSFEEd5#SQrab_1XuS
zk*En`Q4=O&32bQhJD|qvUX}CL+d7Cu6i!AR(IRWG1=*zAjatYBY>c;26W3y!$~Qz!
z*cP?$E*ONF=5TWyYT}ns8+grUiN&aa*4T|)EJJ-aYQj^fmn)ploF<MntD*9B%w!Ct
zo{mA-19hSUQ18Y#jKK-0e!is?)L}j95qyODIPOCo-6_<<&Y`{^ZlVSbt>Fz&3RRD{
zdTmtymZ*hxMUCGV^=TM_MQ|c=Vm>#Mf>yEs`AECfsFfZ-bv$f-i+YJpqZam)c?or-
zH&Kt^0S04mO>gI=P#dU*`d(>*8aE?9&-3p?K`S1C8elqVLGw^Y_nzI~g4)qRRJ(6b
z1D`Rkq53^Q^$SVx7E&Iyq3WpniKvaVzzBW*TU(+BYG?gW6AiZfNYswTTHS|wn`dGO
zE=9ex@1rKzXC6oG^hfhDs^9OZeu1?(e-$DrXhjt<6sw|E+z_>sB-H1)BNoL>ERR{p
zSndt0??Sx`-=q3nKrQSKyC0G0-LH$9r&%J;UkhkYf;O%@Y9X^w3wRy%v7C=Ofeoma
zbQ|iV4x%Rf8a3ca)WjE2FWaA}b|JOB@gh+3MVWE6Ie#5dT@pnx35#KSjKf~2M={l$
zjcPv+HPJh$1#Co3wAJdnP~&`w+RzD9ztgCVT|l+J?6brz)XMIlcH&pZtB0W$R^I9f
zW>eJLoQi7SA2nbW>f<#YHSsi5|7_F=E=ILmjarCry(KoG8g4~B+x-}Z=TQ^g#tK-h
zuJ;HMQ4=Mjj=F>S3~HRQsFRzH+SnY_0+!%NT!W0~b7A$oqp4#yMRjatcEIA)Gf+o8
z$Q*_GzIX}Mei?@28q|qwLml~ktb$)*4ZMw7U~GLoBA$P33ffsRs$(W<z)|@PI7-x!
z%|Z=07qyVZR$qzw{#cLd_c>~ugQ%V7q5Az~`75Xe+{Kd2?*bcmM^gdSum<Yc)W=%b
z1l!|KGZ*zs>mlkZxnx7{b6pShNYYTxJ_EJzo~Us%Q7`2%)B+};Pd8>;gZbuC)XLXb
zeKTrjJ5UqsLGAD;s@->}6Zr)r@D|3Se<SaHO;rCTsCFr+g>-1d`FEnwn?yg%LEZ}&
z%&$B>k`@?={ZJjop-$oz)I{H)7H}T5u$xx@%j$tmynF;|obssl^-(93(uDKZ%2G*m
z#B_WLms|ZRYC%n#dOIG88ekG?;j_(Cm`=TV5`*JJ)X9E`YX1p#!2@O){)En;p5>#!
zV%<J0h4)b_E79CrSQ*qatcc22Lk*m0Hn#gISekqqX5s+U#`a;O0?r-5iPZgCa(ehO
zCZo@fpHUQAqXy`U+QEw$jX9`=9m2AB4hQ1{jKhH`&hZzwdlgII2dJaoYo5f))URU|
zjCg|Y22AqwxeqN-sg-v`OOVC6tEe5<Z0!wP7xnp0MV&}5v%fji%t9Uccyoq157mFU
z)i>ws<6krs^zs}=ebMBhCb*d2z`1LvxBZ^w1KW6SaWPCFUmELSDyrWkb2@6gS5c2*
zspVH&eLaRUzuRIrK1aRfUt0Zy)z9E$^4CyDJG`y;%{LXb(>17xH(PzXx!*j70o?xq
z_3^u4`5Wld&hAqPz#^%hVW@l*>UTjrYT`C_zqdI6wSZyfcyoq1&s=V9Ft?-Lx&5j3
z`~M6HE#R^>xP@B4L#v0RdG|}BCX6u?%%-RTQ&9`fL@n5dg>ez;WnPY&X9wz=^@}vl
zUx^zeH1HkN#D49(dYD<>tYJ1ry-aPa-oxsH&6h0y8fxOVk*^Z>F>3tlsCn=EC}@R#
ze648#!DbW&QjbG5tc9Aefz{J6hI%@x-)IcNDX4cS8#U1qRR49Tb~&g8?Lf8n<=Kt1
z=2i19YQlgH-U3Ub28u=HtD*)>LQRy0`lZqhHNjw1`)R0+%r@tvKlP>FeV<$D72Nx%
z0XLaD%|oaO^33z71>8dIpwN?EzoMvowAE{wNoE>qoUW*a4aEH4|HCP$<3!ZwbuNbB
z3e;af8?F8ss^ekQK*y|p7WK_{(dvJh1v`4}gUsTnex*>4JPwQL^PfN=1e;??Y_A*G
z-+Ugmz-g!*FGRiVD^UHmoBL4%AHyPe3bo*$QT?x&56v)s(>18bjmi|NVk)XW8a40&
zRL7MVi@A0`Z$VgigilKe;+LMj`yx>FRMeE6QEx#H490P&vz>}s;(YTR)C{XoGk$FD
zL5=gZnP>Uas1Np~biO&%;BUJT(8)X82-L)}sQb-P1Glz%XAGs@1GSJLmLG-MzzcTY
zXZg9Pb_=ckuDPa@eRFIep$WF22HtJ;qgagkDf1F)L3c3%U1zUe!i+|ZQ_<>)R&Qvw
zvV14AyUz;!tifQ^&c|5&4b)LB!+6|c^^>TDTt`iK8}$eZKJ9HF61C$>s14LGlaT*h
z2YysQ-wFyEU^i;OBd8-hZuQd`PW?Qp-5t{}!&_)^RKJ?2`}NFZ%Xh>o<hz)YQ760>
zS(wj#L?MR6Ueo~RQ46@~HE{P(6BOYuFByjVTtuPTRYL7B!R|Lljnmrfj5>*asELP|
z<1n20-E<1-un0B5YI8km<(rXTDDEWkyW7Qf^&ZKys1NWIt1m_^BnLIlF4V;PP~#s#
zo#aXLit_sAct}Az3GU`Kj5I5vcAAJ9uqkQ>DRw^{HDDi9yDTh;6EPm=qbB|Y)&GFi
zk75M%Q|RM#-8BkXn9|+*TWAYvXJ^enQ9BFk!5{e;izRUiYJ!F4Dsz*$(>#P)Xr9%7
zMJ?!d56)jZzfXeGbpbs+dz+iF0eSyk-jOGv+IL1?c-I@%?*pqBWOZua1=Vg2<}VPL
z!mTpznHhaJfBi<!>Er#~d=a%W*Vh}Muo-4Xn{lWUNkp}8iP6{=8{+`f0+wL`d~{u;
z5JsXMo>5ZI|C|b3b*&|fbE63zaanSsh<%i65<>`GdJ%OsCH^7?5JRm0=ahAoA)dC}
z&y;^5(x?w0{-&(U7fYp(S9Xb%i(5H`av!29@jSU`tVd*1o?~r92D$mz7RL~}qKNUt
zV&VbO%<?sGEcK$e00$Oe|HCMxlK2O1B6KYyY7jlFV=`quCS5O()5q#8(U9_X<lERC
zB_3ToMfW9<Y5mtw9!5EU;9btYCglI*tly&WEK!%ZOB^QtNj!e_rQ?evUbp0T_z|&^
zc+MuF=zh`<u7gC81)WPr_%2auO^Zz2NPJJMCf*=kB1UpgAKo&LjiTS;b*R69cZmNG
z{i)Z(mkC`T6RpVo51%9|S^pc9BPl;iWa)h0C9#6g6+m?0#?$#Vep^s(OL-{KobqVm
zzTF!{xeC#V&~=PhMDRxEUoqqph*8vrqW*oVYb&vnNTMFC_gf#l5aJf0s}#|k7^#X~
z>8Ac}xo+jBY`_nw>$BF8`Z|omP`mdU^>+w9|86N!oBY2}S1sZS^XLCdS&6;+!Bx=1
zy={)O!FpjM%ZVo*E7!L+%PrT0dNs<Wi7G^#<sVU=`&X&>4)7z3*kO16L_co!w0aB{
zr(Tixk@6|ai|*u#;zG;SqJElk2o@mPQ@&^SQq4Ws!pe2L?-%}wW{F@r>DoffBm${_
zh7~XzYhrtA(+!^>63ItlAO;b-z9E{D%fnZd;M(Qk#^7-7r4#G*{2NpFkmM}lO`-+$
z4tSIJgU~gOI6+k7UJx;uax!j1U1KRH;Ur=P(Vr+st^_fa@}p}Bg*N0W;9TP0dj7hC
ziCm&A@fD$~Gck}DK~yHX(y=m8n0TJ(LQdCo4_BI;uJa!52P{vd5cQSgz8^FsW)l&F
z?>&C#x<*_k{E0(^u2|x0qNOT!H8w-dPqDg9oIp9AC`LUEds@C6<@X6)lZmJDOME}*
z`FFNP{YZXcHzs07LjSw?(be0^-&!J`dNa!H@VMnx;cem>YdhF{NNxn>LPQtB-||QF
z{Ht@b8=-5hNB;j~wxXK2mexVJU+qQ-oJU+B8W1IEQ;LXqtnF~}pXffh-%wWu(VF<3
zIH|A3X9!(kL=Lfmm_~FZ!s!@^Q;15$AVSw};z{oHBmPVIIbw5eT!k6_elY_k<gTuq
r?N?}Y*4S~mu~kQw4Y;^`-LKgja<f|x_Y1i2=KPC`vvV(}j)?p}rqDZy

diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index 9159c1ce..fc53bf05 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-02 10:32+0000\n"
+"POT-Creation-Date: 2021-03-02 18:33+0000\n"
 "PO-Revision-Date: 2021-03-02 10:35+0000\n"
 "Last-Translator: Kana <gudzpoz@live.com>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -32,6 +32,10 @@ msgstr "维基百科"
 msgid "Books by %(name)s"
 msgstr "%(name)s 所著的书"
 
+#: bookwyrm/templates/book.html:21
+msgid "by"
+msgstr ""
+
 #: bookwyrm/templates/book.html:29 bookwyrm/templates/book.html:30
 #: bookwyrm/templates/edit_book.html:5
 msgid "Edit Book"
@@ -57,20 +61,44 @@ msgstr "OCLC �:"
 msgid "ASIN:"
 msgstr "ASIN:"
 
+#: bookwyrm/templates/book.html:84
+#, fuzzy, python-format
+#| msgid "of %(book.pages)s pages"
+msgid "%(format)s, %(pages)s pages"
+msgstr "全书 %(book.pages)s 页"
+
 #: bookwyrm/templates/book.html:86
+#, fuzzy, python-format
+#| msgid "of %(book.pages)s pages"
+msgid "%(pages)s pages"
+msgstr "全书 %(book.pages)s 页"
+
+#: bookwyrm/templates/book.html:91
 msgid "View on OpenLibrary"
 msgstr "在 OpenLibrary 查看"
 
-#: bookwyrm/templates/book.html:98
+#: bookwyrm/templates/book.html:100
+#, python-format
+msgid ""
+"\n"
+"                    (%(review_count)s review)\n"
+"                    "
+msgid_plural ""
+"\n"
+"                    (%(review_count)s reviews)\n"
+"                    "
+msgstr[0] ""
+
+#: bookwyrm/templates/book.html:110
 msgid "Add Description"
 msgstr "添加�述"
 
-#: bookwyrm/templates/book.html:105 bookwyrm/templates/edit_book.html:39
+#: bookwyrm/templates/book.html:117 bookwyrm/templates/edit_book.html:39
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "�述:"
 
-#: bookwyrm/templates/book.html:109 bookwyrm/templates/edit_author.html:78
+#: bookwyrm/templates/book.html:121 bookwyrm/templates/edit_author.html:78
 #: bookwyrm/templates/edit_book.html:120 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:50
 #: bookwyrm/templates/settings/site.html:89
@@ -81,7 +109,7 @@ msgstr "�述:"
 msgid "Save"
 msgstr "�存"
 
-#: bookwyrm/templates/book.html:110 bookwyrm/templates/book.html:159
+#: bookwyrm/templates/book.html:122 bookwyrm/templates/book.html:171
 #: bookwyrm/templates/edit_author.html:79 bookwyrm/templates/edit_book.html:121
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
@@ -92,51 +120,75 @@ msgstr "�存"
 msgid "Cancel"
 msgstr "�消"
 
-#: bookwyrm/templates/book.html:142
+#: bookwyrm/templates/book.html:131
+#, fuzzy, python-format
+#| msgid "<a href=\"%(path)s\">%(title)s</a> by "
+msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
+msgstr "<a href=\"%(path)s\">%(title)s</a> �自"
+
+#: bookwyrm/templates/book.html:139
+#, fuzzy, python-format
+#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
+msgstr "与 <a href=\"%(path)s\">%(username)s</a> �信"
+
+#: bookwyrm/templates/book.html:145
+#, fuzzy, python-format
+#| msgid ""
+#| " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
+#| "\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgid ""
+"A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a "
+"href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
+msgstr ""
+" 添加了 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 "
+"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+
+#: bookwyrm/templates/book.html:154
 msgid "Your reading activity"
 msgstr "你的阅读活动"
 
-#: bookwyrm/templates/book.html:144
+#: bookwyrm/templates/book.html:156
 msgid "Add read dates"
 msgstr "添加阅读日期"
 
-#: bookwyrm/templates/book.html:149
+#: bookwyrm/templates/book.html:161
 msgid "You don't have any reading activity for this book."
 msgstr "你还没有任何这本书的阅读活动。"
 
-#: bookwyrm/templates/book.html:156
+#: bookwyrm/templates/book.html:168
 msgid "Create"
 msgstr "创建"
 
-#: bookwyrm/templates/book.html:178
+#: bookwyrm/templates/book.html:190
 msgid "Tags"
 msgstr "标签"
 
-#: bookwyrm/templates/book.html:182 bookwyrm/templates/snippets/tag.html:18
+#: bookwyrm/templates/book.html:194 bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr "添加标签"
 
-#: bookwyrm/templates/book.html:199
+#: bookwyrm/templates/book.html:211
 msgid "Subjects"
 msgstr "主题"
 
-#: bookwyrm/templates/book.html:210
+#: bookwyrm/templates/book.html:222
 msgid "Places"
 msgstr "地点"
 
-#: bookwyrm/templates/book.html:221 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book.html:233 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
 #: bookwyrm/templates/search_results.html:90
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "列表"
 
-#: bookwyrm/templates/book.html:250
+#: bookwyrm/templates/book.html:262
 msgid "rated it"
 msgstr "评价了"
 
 #: bookwyrm/templates/components/inline_form.html:8
-#: bookwyrm/templates/feed/feed_layout.html:51
+#: bookwyrm/templates/feed/feed_layout.html:54
 msgid "Close"
 msgstr "关闭"
 
@@ -375,7 +427,27 @@ msgid ""
 "There are no books here right now! Try searching for a book to get started"
 msgstr "现在这里还没有任何书目��试�从�索�本书开始�"
 
-#: bookwyrm/templates/feed/feed_layout.html:73 bookwyrm/templates/goal.html:26
+#: bookwyrm/templates/feed/feed_layout.html:23
+#: bookwyrm/templates/user/shelf.html:24
+#, fuzzy
+#| msgid "Read"
+msgid "To Read"
+msgstr "阅读"
+
+#: bookwyrm/templates/feed/feed_layout.html:24
+#: bookwyrm/templates/user/shelf.html:24
+#, fuzzy
+#| msgid "Start reading"
+msgid "Currently Reading"
+msgstr "开始阅读"
+
+#: bookwyrm/templates/feed/feed_layout.html:25
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
+#: bookwyrm/templates/user/shelf.html:24
+msgid "Read"
+msgstr "阅读"
+
+#: bookwyrm/templates/feed/feed_layout.html:76 bookwyrm/templates/goal.html:26
 #: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
 msgid "%(year)s Reading Goal"
@@ -664,8 +736,10 @@ msgid "This list is currently empty"
 msgstr "此列表当�是空的"
 
 #: bookwyrm/templates/lists/list.html:35
-msgid "Added by"
-msgstr "添加�自"
+#, fuzzy, python-format
+#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
+msgstr "与 <a href=\"%(path)s\">%(username)s</a> �信"
 
 #: bookwyrm/templates/lists/list.html:41
 msgid "Remove"
@@ -718,6 +792,12 @@ msgstr "创建者为"
 msgid "Your lists"
 msgstr "你的列表"
 
+#: bookwyrm/templates/lists/lists.html:32
+#, fuzzy, python-format
+#| msgid "See all %(size)s"
+msgid "See all %(size)s lists"
+msgstr "查看所有 %(size)s"
+
 #: bookwyrm/templates/lists/lists.html:40
 msgid "Recent Lists"
 msgstr "最近的列表"
@@ -1562,10 +1642,6 @@ msgstr "更多书架"
 msgid "Start reading"
 msgstr "开始阅读"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-msgid "Read"
-msgstr "阅读"
-
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
 msgid "Finish reading"
 msgstr "完�阅读"
@@ -1615,7 +1691,9 @@ msgid "More options"
 msgstr "更多选项"
 
 #: bookwyrm/templates/snippets/status/status_options.html:17
-msgid "Delete post"
+#, fuzzy
+#| msgid "Delete post"
+msgid "Delete status"
 msgstr "删除�文"
 
 #: bookwyrm/templates/snippets/status/status_options.html:23
@@ -1765,3 +1843,6 @@ msgstr[0] "%(counter)s 个关注者"
 #, python-format
 msgid "%(counter)s following"
 msgstr "关注� %(counter)s 人"
+
+#~ msgid "Added by"
+#~ msgstr "添加�自"

From 549d8768a6786b9bff67674ca308038523277de8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 2 Mar 2021 10:46:08 -0800
Subject: [PATCH 0149/1285] Combine a couple very similar translation strings

plus a whitespace fix
---
 bookwyrm/templates/book.html                  |   6 +-
 .../templates/user/create_shelf_form.html     |   4 +-
 bookwyrm/templates/user/edit_shelf_form.html  |   1 -
 bookwyrm/templates/user/lists.html            |   2 +-
 locale/en_US/LC_MESSAGES/django.po            |  62 ++++++---------
 locale/fr_FR/LC_MESSAGES/django.mo            | Bin 20692 -> 20629 bytes
 locale/fr_FR/LC_MESSAGES/django.po            |  74 +++++++++---------
 locale/zh_CN/LC_MESSAGES/django.mo            | Bin 23894 -> 23803 bytes
 locale/zh_CN/LC_MESSAGES/django.po            |  70 ++++++++---------
 9 files changed, 100 insertions(+), 119 deletions(-)

diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html
index aabfb37b..d80daca2 100644
--- a/bookwyrm/templates/book.html
+++ b/bookwyrm/templates/book.html
@@ -97,11 +97,7 @@
             <div class="block">
                 <h3 class="field is-grouped">
                     {% include 'snippets/stars.html' with rating=rating %}
-                    {% blocktrans count counter=review_count %}
-                    ({{ review_count }} review)
-                    {% plural %}
-                    ({{ review_count }} reviews)
-                    {% endblocktrans %}
+                    {% blocktrans count counter=review_count %}({{ review_count }} review){% plural %}({{ review_count }} reviews){% endblocktrans %}
                 </h3>
 
                 {% include 'snippets/trimmed_text.html' with full=book|book_description %}
diff --git a/bookwyrm/templates/user/create_shelf_form.html b/bookwyrm/templates/user/create_shelf_form.html
index 785c8d06..b7ea27de 100644
--- a/bookwyrm/templates/user/create_shelf_form.html
+++ b/bookwyrm/templates/user/create_shelf_form.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% block header %}
-{% trans "Create New Shelf" %}
+{% trans "Create Shelf" %}
 {% endblock %}
 
 {% block form %}
@@ -19,7 +19,7 @@
             {% include 'snippets/privacy_select.html' %}
         </div>
         <div class="control">
-            <button class="button is-primary" type="submit">{% trans "Create shelf" %}</button>
+            <button class="button is-primary" type="submit">{% trans "Create Shelf" %}</button>
         </div>
     </div>
 </form>
diff --git a/bookwyrm/templates/user/edit_shelf_form.html b/bookwyrm/templates/user/edit_shelf_form.html
index a9f86da4..753d0681 100644
--- a/bookwyrm/templates/user/edit_shelf_form.html
+++ b/bookwyrm/templates/user/edit_shelf_form.html
@@ -29,4 +29,3 @@
 </form>
 {% endblock %}
 
-
diff --git a/bookwyrm/templates/user/lists.html b/bookwyrm/templates/user/lists.html
index 8e47041f..85c7cc8c 100644
--- a/bookwyrm/templates/user/lists.html
+++ b/bookwyrm/templates/user/lists.html
@@ -14,7 +14,7 @@
     </div>
     {% if is_self %}
     <div class="column is-narrow">
-        {% trans "Create new list" as button_text %}
+        {% trans "Create list" as button_text %}
         {% include 'snippets/toggle/open_button.html' with controls_text="create-list" icon="plus" text=button_text %}
     </div>
     {% endif %}
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index 486494b0..8aae6c92 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-02 18:33+0000\n"
+"POT-Creation-Date: 2021-03-02 18:44+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"
@@ -77,27 +77,21 @@ msgstr ""
 
 #: bookwyrm/templates/book.html:100
 #, python-format
-msgid ""
-"\n"
-"                    (%(review_count)s review)\n"
-"                    "
-msgid_plural ""
-"\n"
-"                    (%(review_count)s reviews)\n"
-"                    "
+msgid "(%(review_count)s review)"
+msgid_plural "(%(review_count)s reviews)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/book.html:110
+#: bookwyrm/templates/book.html:106
 msgid "Add Description"
 msgstr ""
 
-#: bookwyrm/templates/book.html:117 bookwyrm/templates/edit_book.html:39
+#: bookwyrm/templates/book.html:113 bookwyrm/templates/edit_book.html:39
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr ""
 
-#: bookwyrm/templates/book.html:121 bookwyrm/templates/edit_author.html:78
+#: bookwyrm/templates/book.html:117 bookwyrm/templates/edit_author.html:78
 #: bookwyrm/templates/edit_book.html:120 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:50
 #: bookwyrm/templates/settings/site.html:89
@@ -108,7 +102,7 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: bookwyrm/templates/book.html:122 bookwyrm/templates/book.html:171
+#: bookwyrm/templates/book.html:118 bookwyrm/templates/book.html:167
 #: bookwyrm/templates/edit_author.html:79 bookwyrm/templates/edit_book.html:121
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
@@ -119,63 +113,63 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: bookwyrm/templates/book.html:131
+#: bookwyrm/templates/book.html:127
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr ""
 
-#: bookwyrm/templates/book.html:139
+#: bookwyrm/templates/book.html:135
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr ""
 
-#: bookwyrm/templates/book.html:145
+#: bookwyrm/templates/book.html:141
 #, python-format
 msgid ""
 "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a "
 "href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr ""
 
-#: bookwyrm/templates/book.html:154
+#: bookwyrm/templates/book.html:150
 msgid "Your reading activity"
 msgstr ""
 
-#: bookwyrm/templates/book.html:156
+#: bookwyrm/templates/book.html:152
 msgid "Add read dates"
 msgstr ""
 
-#: bookwyrm/templates/book.html:161
+#: bookwyrm/templates/book.html:157
 msgid "You don't have any reading activity for this book."
 msgstr ""
 
-#: bookwyrm/templates/book.html:168
+#: bookwyrm/templates/book.html:164
 msgid "Create"
 msgstr ""
 
-#: bookwyrm/templates/book.html:190
+#: bookwyrm/templates/book.html:186
 msgid "Tags"
 msgstr ""
 
-#: bookwyrm/templates/book.html:194 bookwyrm/templates/snippets/tag.html:18
+#: bookwyrm/templates/book.html:190 bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr ""
 
-#: bookwyrm/templates/book.html:211
+#: bookwyrm/templates/book.html:207
 msgid "Subjects"
 msgstr ""
 
-#: bookwyrm/templates/book.html:222
+#: bookwyrm/templates/book.html:218
 msgid "Places"
 msgstr ""
 
-#: bookwyrm/templates/book.html:233 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book.html:229 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
 #: bookwyrm/templates/search_results.html:90
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr ""
 
-#: bookwyrm/templates/book.html:262
+#: bookwyrm/templates/book.html:258
 msgid "rated it"
 msgstr ""
 
@@ -1667,12 +1661,8 @@ msgid "Books tagged \"%(tag.name)s\""
 msgstr ""
 
 #: bookwyrm/templates/user/create_shelf_form.html:5
-msgid "Create New Shelf"
-msgstr ""
-
 #: bookwyrm/templates/user/create_shelf_form.html:22
-#: bookwyrm/templates/user/shelf.html:33
-msgid "Create shelf"
+msgid "Create Shelf"
 msgstr ""
 
 #: bookwyrm/templates/user/edit_shelf_form.html:5
@@ -1711,11 +1701,7 @@ msgstr ""
 msgid "Lists: %(username)s"
 msgstr ""
 
-#: bookwyrm/templates/user/lists.html:17
-msgid "Create new list"
-msgstr ""
-
-#: bookwyrm/templates/user/lists.html:29
+#: bookwyrm/templates/user/lists.html:17 bookwyrm/templates/user/lists.html:29
 msgid "Create list"
 msgstr ""
 
@@ -1728,6 +1714,10 @@ msgstr ""
 msgid "%(username)s: Shelves"
 msgstr ""
 
+#: bookwyrm/templates/user/shelf.html:33
+msgid "Create shelf"
+msgstr ""
+
 #: bookwyrm/templates/user/shelf.html:54
 msgid "Edit shelf"
 msgstr ""
diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index 9f8cca0a8c197b367ab948e30475b8a861aa1fc9..a8d8ff0d4ff95439cf2ae37ec5b802c5110f58c8 100644
GIT binary patch
delta 6960
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

delta 7006
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
boHDhvtgO_tef8v#qqncB*mx>yedK=u4&uDv

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index f0a25f6b..76b70615 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-02 18:33+0000\n"
+"POT-Creation-Date: 2021-03-02 18:44+0000\n"
 "PO-Revision-Date: 2021-03-02 12:37+0100\n"
 "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -79,29 +79,23 @@ msgstr "Voir sur OpenLibrary"
 
 #: bookwyrm/templates/book.html:100
 #, python-format
-msgid ""
-"\n"
-"                    (%(review_count)s review)\n"
-"                    "
-msgid_plural ""
-"\n"
-"                    (%(review_count)s reviews)\n"
-"                    "
+msgid "(%(review_count)s review)"
+msgid_plural "(%(review_count)s reviews)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/book.html:110
+#: bookwyrm/templates/book.html:106
 #, fuzzy
 #| msgid "Description:"
 msgid "Add Description"
 msgstr "Ajouter une description"
 
-#: bookwyrm/templates/book.html:117 bookwyrm/templates/edit_book.html:39
+#: bookwyrm/templates/book.html:113 bookwyrm/templates/edit_book.html:39
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Description :"
 
-#: bookwyrm/templates/book.html:121 bookwyrm/templates/edit_author.html:78
+#: bookwyrm/templates/book.html:117 bookwyrm/templates/edit_author.html:78
 #: bookwyrm/templates/edit_book.html:120 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:50
 #: bookwyrm/templates/settings/site.html:89
@@ -112,7 +106,7 @@ msgstr "Description :"
 msgid "Save"
 msgstr "Enregistrer"
 
-#: bookwyrm/templates/book.html:122 bookwyrm/templates/book.html:171
+#: bookwyrm/templates/book.html:118 bookwyrm/templates/book.html:167
 #: bookwyrm/templates/edit_author.html:79 bookwyrm/templates/edit_book.html:121
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
@@ -123,19 +117,19 @@ msgstr "Enregistrer"
 msgid "Cancel"
 msgstr "Annuler"
 
-#: bookwyrm/templates/book.html:131
+#: bookwyrm/templates/book.html:127
 #, fuzzy, python-format
 #| msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s\">%(title)s</a> par "
 
-#: bookwyrm/templates/book.html:139
+#: bookwyrm/templates/book.html:135
 #, fuzzy, python-format
 #| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/book.html:145
+#: bookwyrm/templates/book.html:141
 #, fuzzy, python-format
 #| msgid ""
 #| "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
@@ -147,48 +141,48 @@ msgstr ""
 " a ajouté <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre "
 "liste « <a href=\"%(list_path)s\">%(list_name)s</a> »"
 
-#: bookwyrm/templates/book.html:154
+#: bookwyrm/templates/book.html:150
 msgid "Your reading activity"
 msgstr "Votre activité de lecture"
 
-#: bookwyrm/templates/book.html:156
+#: bookwyrm/templates/book.html:152
 #, fuzzy
 #| msgid "Edit read dates"
 msgid "Add read dates"
 msgstr "Ajouter des dates de lecture"
 
-#: bookwyrm/templates/book.html:161
+#: bookwyrm/templates/book.html:157
 msgid "You don't have any reading activity for this book."
 msgstr "Vous n’avez aucune activité de lecture pour ce livre"
 
-#: bookwyrm/templates/book.html:168
+#: bookwyrm/templates/book.html:164
 msgid "Create"
 msgstr "Créer"
 
-#: bookwyrm/templates/book.html:190
+#: bookwyrm/templates/book.html:186
 msgid "Tags"
 msgstr "Tags"
 
-#: bookwyrm/templates/book.html:194 bookwyrm/templates/snippets/tag.html:18
+#: bookwyrm/templates/book.html:190 bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr "Ajouter un tag"
 
-#: bookwyrm/templates/book.html:211
+#: bookwyrm/templates/book.html:207
 msgid "Subjects"
 msgstr "Sujets"
 
-#: bookwyrm/templates/book.html:222
+#: bookwyrm/templates/book.html:218
 msgid "Places"
 msgstr "Lieux"
 
-#: bookwyrm/templates/book.html:233 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book.html:229 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
 #: bookwyrm/templates/search_results.html:90
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listes"
 
-#: bookwyrm/templates/book.html:262
+#: bookwyrm/templates/book.html:258
 msgid "rated it"
 msgstr "l’a noté"
 
@@ -1795,12 +1789,10 @@ msgid "Books tagged \"%(tag.name)s\""
 msgstr "Livres tagués « %(tag.name)s »"
 
 #: bookwyrm/templates/user/create_shelf_form.html:5
-msgid "Create New Shelf"
-msgstr "Créer une nouvelle étagère"
-
 #: bookwyrm/templates/user/create_shelf_form.html:22
-#: bookwyrm/templates/user/shelf.html:33
-msgid "Create shelf"
+#, fuzzy
+#| msgid "Create shelf"
+msgid "Create Shelf"
 msgstr "Créer l’étagère"
 
 #: bookwyrm/templates/user/edit_shelf_form.html:5
@@ -1844,13 +1836,7 @@ msgstr "Vos listes"
 msgid "Lists: %(username)s"
 msgstr "Listes : %(username)s"
 
-#: bookwyrm/templates/user/lists.html:17
-#, fuzzy
-#| msgid "Create list"
-msgid "Create new list"
-msgstr "Créer une nouvelle liste"
-
-#: bookwyrm/templates/user/lists.html:29
+#: bookwyrm/templates/user/lists.html:17 bookwyrm/templates/user/lists.html:29
 msgid "Create list"
 msgstr "Créer une liste"
 
@@ -1866,6 +1852,10 @@ msgstr "Vos étagères"
 msgid "%(username)s: Shelves"
 msgstr "%(username)s : Étagères"
 
+#: bookwyrm/templates/user/shelf.html:33
+msgid "Create shelf"
+msgstr "Créer l’étagère"
+
 #: bookwyrm/templates/user/shelf.html:54
 #, fuzzy
 #| msgid "Edit Shelf"
@@ -1938,6 +1928,14 @@ msgstr[1] "%(username)s n’a pas d’abonné(e)s"
 msgid "%(counter)s following"
 msgstr "%(counter)s abonnements"
 
+#~ msgid "Create New Shelf"
+#~ msgstr "Créer une nouvelle étagère"
+
+#, fuzzy
+#~| msgid "Create list"
+#~ msgid "Create new list"
+#~ msgstr "Créer une nouvelle liste"
+
 #~ msgid "Added by"
 #~ msgstr "Ajouté par"
 
diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
index 1114628341af6f1ca8e4f07e6dadb2932b1b0b91..dbdd1daa82d0c6bbb300cab32443cddfb7fdd201 100644
GIT binary patch
delta 7934
zcmYk>3w+P@9>?+Dm|fV+E^ZsPxec?CxsAEY+_u>an@jHIzC^j7UvB9_#SV^`l8Pdg
ziCiitmqa<PsdEkzQ6m+OOC{&^-tXh_@O$*x^ZWUJf8WdR`}_U=`%ho*^!a0lk9#)E
zcbUWSgpcD?!%gKJ=LY4J%BppofM~~=jDffSXJZPMj&Ym@*d8n5IBbk_P+hlRB|L=H
z@jPbZeXNVwu_g7cGn0Y_SZTh8Rmu0G20Dke@iyjTwVIxba3cAi*c->yVlntBmO*t2
z2R{tONc6*o=#NPl;JA*{nnGzRI%6Pq#SqN0d>ED|ACKxd6E)C048rHFeTC(3p(ZZE
zVEo+LPa)UfT*M~mSBLSK-$|yR0XtwAc2xroKwlhgjz;c|GXcxsbkqbc>b%8R0hi)4
zxDIvY4eB~h6sDjSoP&Ni5?x*Ccx#wtK8IzfUygpb8g<?})C5JS1@1GyL``%O>*FQV
zg;a?1#;JvV<n>VtZj8E+wsGvgI(D~;fv6RZMm;=FVp&{-{<s3w@l|spYQXKN3HD<I
zeu*0AJn9*`hE>q7p0^XxsP@+N*nbx5bfrR9n2#;dMSuLr>i3`~I*MArS=6&qY~D2g
zLJb_iHfZ4$QF#n%`~<6SgOTK2T?(3TIO-u=jhc9)S!DIQ%tIJJ`?nZ~-=lW$D(V^d
z3uCY}@21A9jXFOGb?Z`4Z(AB_$K2r*w6d|N_kRXz;1#F=)>{6)<vURWe1Tf%In)G~
zQBVD^SQdTby&VfdjZ+<YQ=NvWg=QfATqoNrID=3R-6+(`#+#E-TQ~!C3l?HIT!y;x
zwWtdyLVa%RMJ?!z)n7s__!g>vP(yD)kr=A?zdi+>&>D3`nWz(UQ3L0hQ&Cs45H;~~
zEQcFVSG3jIcc3ohAZkaBSpGfg!hS@}^NZ^B{@<pcf$pgS0~5TbI0S>pYop%ZM^Fn$
zGY6usbeuT__4Ln1^;>GbiW+wl2ICggg7=`SE7?y$@9SyQ1jSeb?;`&>RT90t3+mYz
ziRzb+TG$+GFSPdE7)<>E)Iv@o|2gORp@mdv<Sn35BlchKWfT?Kfu^XZv^{F8GEo!e
zpavX<n)q?l*3Lzpw;Xjvg{TQ%H{V0;&~7Y``!NJhVjaBLi2c{SDBIXG4AmhLHBl|p
z0-B*FYG-*D)IhyZS2P6GZxm`F`Ka@!SUwZAu%}TMve@!fE(NV@gH>!d_o1HVW2g>S
zPy^mYy<W~E-o)il{X<bZ7=t>mA!;E>mbXNm*A8`S(=im?2^2Jui_y3eE8q^)M2ApY
zeaid^HPAiO&IR$SOjj0xT0ksLzy#EIt57?$%iM?R_m!vXoT8u!&!D#Ynt2EHfl(^S
z>re;7$P-XI(jGN%I>uo?j7Jx>z>TO|v=g<EL#Tems0G|9Y3KesO}#CvfEuteY9TR}
zH$Z(pB%wNXLk*OPy7IxOe&enFNz?-7p?--iMeWSnsPjHV-I`A@QS<Mm&>gRvZJK$%
zwVp+NB)^6c_%Z6197jELXHfV00&3u5)D_=AEueIBuRhF-GHat2o`9}8wxXab>x7!1
z2kHv@qD~xv+L1{Zjx(_?zGUs&Q2qC!&O3}+$SLfFKj357yoLA8XBq029Bje+Uy;I(
zRH(yWsGTU!uS89hi(0@0)WT+1zQFROW+7^v4c7h%YKIP^7IqBN@LNpBxMVMXDw+M~
zIdk?=p)0<Pny^eOZ{=a;aLk~7D{_|{-`3vNCZo>ph}oE7zJa~T?;>+LX?$g_jL)DJ
zwg$DZH(Uz3hnuXS2z5(#n4ekuVbp7S9Eadl)BtI19H)hk<MhE9<cr%n&U_4L=Y1Pq
zj8({wp!#1%U4Tz}@1xsoPC+Zn!fH4cN8&=PgFhqRsGaZ*-b2^|wbeb%VOX1d8pdHE
zPR9Laaz`(J7qvsNo%j&Kr;wd+ooy5%sMw8qzmK7I<f3`Syl&n_ZMoCgGuVto^^dc>
z73!HuMSZ?xp~f9<?PD=mzyGIN!vfUPy9g6-IVRygYrkXOM-AxrsCNr0qXv$)ye{fl
zO0@bE)WhA$^4^yB$63tpjHRG0y^Q+AyN9~Mm@eMH38=iO*}+V=_5rAc53~C5s0B>7
z_J!t)R=*7OJ768Un)ow2;T!WDYQjtA4bw@rEjJ@k4_BP!?a_}s&GKy2LWWwNZ|$=z
zpO?!1YoeE_&_IQ#m2E>U>=gRr6^z0gs0l*4dS56iq4Gyj<Mc#Lm}_~SImMh~zKD8O
zR&{0n)p4^`>@ttoiRV!hUqe0`oU+}#2|A-D&O$9P7d6gMb0P+i&qSR!A2s0%maoAW
z@;6-y>UaPH@dWB&IfJ^ApHTz+fjX}gACFp42nJ$2s=k@o(ab<iI1shKeAGBot^RMQ
ze(n+qnrIE`m&PX41iMfjPNS~mta%yBkpF7!x6FH}0eyRThMF}{<HwuHsD-5>7vMVm
zDX8NJYnWvDd~=Dp1~t$|)WUY4c4`l5z@w<w@&anSn;42dJ-s{})h`A$PFzXO{clD=
zA3!N~LZ+Ex4mL-jI!-`s=}goD=3x*PU?qIb>bIMpqZW7?b<2uT5Bp6F()%Br<_!>u
z8aNKiVk6XwTcHN%U}l?nsLzWTSPu&=KY&5xKcV{F!dMLCSD((0M=c~BT}_Z<6@yWq
zcw;OtM76I+JrkR;93Db#_1CBcUp9Y1O?Vr%fU+5$l~Lo=Hsh_nNe1^{?|D0G=wl57
zF_`)>sEMaqdx5pTV)=U1d7DuS*=_avP*-@^+D}>i1=M-PmS4|c|FyEaR-vyeTDd=J
z;0ViWVhDL7vmL5m28Lr_%g36NP~%Lqe1YYQ%#~LEmTQG~&8>FAF4UDDwEQA!r+&k_
z=%4B3iKvBiMoriQbqjJ(7cdTW#nVw2FvnbiS>*0o3egm9q6UbdRs+VOwy>V%O)!i+
z8FgMyGZ(ecQK)`%t^PT4xz(@3INIMak0T3oo!=>FWdXgtkHjjd36fC@=z?nRg_>Z9
znTL8yCZf)pjyi9iwHKhqdBt3h+KH{Go!MO?_x})uFe<)5b-03>=#F_GwQ@hczVK_n
zNko1_J5y1&<YUzPe8TdpsD+g3<Bb!Bnz$-z{8-d{iBj)>2W!YiUCB_($C=YmSGoYT
zu$NI+u)^BkL=CtFb>4o|2hmZii<eOom+$NKk3!`&(G922hyoYsbi#aGfeGl}&%3f_
zW;*K1@^Ao7#Y%VrHDIxM+w{%x>O;*MsD;K`-ZqE(uPf?7g|0jc**#~V`GM(|%f~eJ
z1F#}4L7l%Id2XE#Q2k2x_wpRn`R}04`wmMMhz#l6HhT?V|5foemy?X826|tUQ&0=*
ziyB~%nP*NiXQFmw0qXo^sJCG?w#1K6{eMFrd~keEA(#q%|8Tyw+W(q~51l!lI&E<k
z>c$eEQjRBv5jyxTT5@Rdw+a23HO%_&Drxclp)uX+zN78}(V6@)!u`Wes!rl-<#@^!
ztlWlj4pEz!KwV{QM9ic7jGZGgs9TI3aU!9k3h@N7l(<W@wE8&Ib5_=e`~MP!!BmXI
zPWU>$L+DsRG$69AV>`;)RvnY5(`)q~q6y_9<oAwqka%$D)_z6|wEnMB9!a?rq34Ca
z2KYzjl7i#B=%xCX73Y7%0pbnf;Ukxhlc{*tD!<0f#A+hXCQ;K_{ovS3_!VSU4R?Q_
z)SfeV5S;bIX<`lWJTZkBLz`aSN)L^qPn`tvNqC(&N(>@zf-?vm?-T8)`xW`d<3wBk
zE0jYi4=2WHpZ`I{D})X`s;M+&lw|zfjrvF%K_pW@p15OeLnzlGdJ;OmB9;)jN;s-f
zU!NFDc?2fec^{B(C-m286!SZMNc0l^Oz5agq!442*pX(|#9}LVw*lWK*Spq@d@aUe
zptUU|Uq<vJmJ<!B-;X*Hh|3N6@id|16A!19`FHbi8?0|Za8y)iW6M@rYqNsnsAxBm
z+8?R;Cozur&{}WeeWI`BF&M<THHb5mPg%X_O<j3>+3FgQe?vI{?_oFMmbG;;KSut<
zFE||)?C!BTf6mwOE-{DjCEtNj7>4z*3!x(m+Y*VCBQOB<!KC9b(VV(txIh&gA9<Ag
zA2t<x(EcVi)uXhL!d&77q7@C@@hWkH(D68NoTx)v8Dc2q6x@P3@+r5%sRR#(Gl-~4
zT?Jwm<p)Org$~q3<8#E9B@Of_N8vr98u3L*C0{@|aWLi4mS>X35T%I;M5fjM&8$eB
zj&mN)zp)0<o=778BuW#_i1|b~v5F{}^e4PTlp*#JI%0`K1+%M1yW1$$wc+*P)gj7}
zr(z$guTFU#p<|jy$<L1bOtW+PQ{HWDPhn3&|DX23(a*~NvWlAIt+l0(QaECjh4>pW
zz)l`&{!ZO!m5E-2kJW!pRehp2q2slZpM2<>VkXhr&R2d>KR6<YMY^TuDKsU*I4PV6
zdFbR()Ndsoq3#;$=tXoQej!d00|*_V#0KImVm6UQl&4=soKDmth7dY-5?yKQulMc*
hNglDOs7`dxfP%SkHHzMkTM}K6o*G&7Wa{~f{|8JzBSQcH

delta 7998
zcmYk>33N`^8piPxk`O{9A%-9^BteLnicoVz2tiQ96ctUCXbn|Uzm`@@O%<x<Dy62P
zh8S{NQ<Yw&SK4TMHMAGKD%=j#*t-AcJFm5zwO+sd?!C|6`|LA(S?&G(J_QGSJcS{?
zOB{{~K8{lr^GZ9;ACw1GRITIGiEy0pSQlT%RoEJ9MLJGB9EKI}EsV#ts8i2k82*CQ
z(5Hsu^uY*>#tBHh$5}x^1MD}?U}f^lsDU10ZLC<+amHe6b1P<(SFPnZY4{el!wcw#
zk(?BY(HM*g=#ME_0@JW0^E>Gjic>KH127ANaGd2cuq^pp)QKxl1FgeA+-&W+mLEq=
zoR4MjXKTNOT#Mry<v5Ko8cQ(0Gk}5y%)k)LQUgv!Uz};aiQFA$9{S-j)C6l#{kCB_
z{1|89QPh=pjdq-H9E4i%OX!cUqeoXd*BVxuo6wK?z37j5sD4LL6Xc^7c*!h6O>`6M
zqJNBgA@QhjI-)-&qZZr~bs<Ay*nbT;iV6)d)f(oZCR~PE@g~&6v=>X^mskS7MGbV(
zEJ96i2Q{I89mgq;Wl-bPL_Jdtu@WZLVgI!?!>q$J<RYBes0Hl67I+9t;9aZt;W9N*
zFlqr27=W>6GqWvf;$+mq`&piW8b8}(4KHIADrTc5T#tI_en3rJWZty;2WDyB!IHFB
z!2qm<+Q|l}XQC}eVkgvinW+8~P&@CLPC>8VeAJe$N3CoN>U(eyHSo8n0e-UlH_Pv%
z&My_~E;JG~K^@dv&<IOmB6{yVYMdd+8|-n$P|!*jqE1|5u0}mP8&M0}X6{C9=|R+h
zC$KaYpsxHU)CJr`eMfxjyW>_z)yJR~+#Jj3{qIgeD@sQVFv>biLv8&c)I`fs1AJ)i
zL!Ea5b>2DDLaw4N=$5tLLtRKf19wM)P<bu%*ZW_Wf+mW$h8C!S+F0Hd^%VESK+Hrv
zwBt|<m~XB^?ci2(59+*6Q0L{F7f}nij-E0U{-B^0`^33d;*a_eRYFY=i`6j!>FNxy
z{0-Ezu>rLMJ5UQdV(o?2{ugSV5)IvjR6wennhn{1t)v$fTEJ7N_i_+w2PUGP(pOQ>
zz#`Oy%TNQZLruIB^{^d9^*e_euMl<R|1p0>?a*IX7X9Pd{~!t#;vFXnqfob^o0*0>
zAssc*2-E^zL{0RH<!_+Ic^h>>Yf<NIL@i_os{bC#^H2*r?4h75Ic*i^Q7gM@`5n`*
zk^3}<p!(NG4VZv>z1pKDPC=dD8?}QOsD5Km3z=Z~WK=)TD-?8Z7ho`cgnDfbVFZ4U
z<?tSAqSE|yX{*D`dZ>Zgpmwf1>dN|}7BC#gU^Z&J^QfJ9;L81P;+|O63`0#=9ktaB
z&6daq!|8~cXe5SUHfl#+MGd?FWAI&!#Y3nC7NKs@ebhoqH`RIE|5yqduqCQPd(@Wo
zLJim-wU7+UpF@2>CZNungId5M)Rn)7I&YiR??o-(80tqXAGI^TU`gh8{-mIL^AO|E
zw;8|L*u;Dp^{aIf^-2B_%j4guTN3(&d+)2G7G4{*fLPQ8HAO9;lhvo0gV3XnnH040
zY-^Z`y0X_$6U;?j;Zjt;4^TVuF@|CuM&no3ej9bZZ*#X_AZj6D*b}312u^Cw{_`9-
z1ytys1n|>W0qdepXp7p3RMbSvQ49D8wXlPhAGbW;EJTfS)!HAT-j2YQ?!rQ_J9(9s
z?0*jmSyqvYT999Yd&MnK6Lv<eJk4B>spPkiyXGXea<_a6s{c&vgA2{em`0w!pU$ks
znU59ma}Ncr>;h`bE~D<@b*sOLx<&WQ;!nEmfmoUPP#lI0Q0LFb=01+|4o)FI-G<wU
z$!*=gj!$DH@}PF^`JOrybOjwS94DbxmV;Gs3ufX8jKa9~{BmI*)I<0ZYOCj&>##QY
zevH9F9FP7TT&I{fkR9?k!#i@H>5z-siQA}w|3barA)VYSjxy_;P0R$;mbW*1nCYnV
zvn-#AdS>24eP43WU+@2V>#zm&l<)I4IL>j@Q~o73z;oCH{Sw^;wKUtI224WTg8o)N
z%<^YY<BqlZ>8OYMHRa6jEVhajIE{P@YD?>McE5OSP*<3NdN#5xpJ>i77ob1wD^Uwy
zXZ71q3pjxOc)~n`-rxTM3i=JWgqpZ`lH0Me8HrjzjM>y|Z}u?L%`9^w>S3E<`3m$W
z|IqU7N$kH?mS+`TSch|#7n;{l1KmL_G`Neq(0D9C-Wm1q_CQTA3iTy@!SeS|7qAgE
z-)_r~bYcJ1aK<Xmn^#c}&!3hDB)fT-Sr>I)Yt+Qa$fv`}L`|>;wUBM71@1=m&ofVA
zN%8^@1$DfDn(&I{cQKM&pFf>g0|PJ)_3*SnP1FT-em_*d!Kej|LiL|z^$X2a=4RA<
zo?HrA;TNcZ&RWBFr~!*m6WvAqh?MB&P7sFb-xzfzEzJ(-N8Ziadzt-F;|(=OyLz0-
z6g0ssb1`aV@1w3@59-8Et^Snd7tA8_E@~YA6nA0eQ9Bim8ZQ?0nzq3}OvPZm|AVX|
z8+AofQ3K7ed?D(CwAAvg<}UMqc^Gxx3Dk}jpcYVwfp`PM@V?cDbf;bKe@zNnVPn)4
zC!(JARMd%C=0w!MGq4oSK`nR*>im`FcJm0<r2ZSMgLf>i!7rZ1?Svkk*o#699DzDv
z7HT1zP!sI3`~d0;c+B!U)?O^teI^31H0@ESt!{)`a0jz1YQEm61!ShO|0;~5LKAt+
zS=M15>Vvf0>UUUuE|#JG80u+1Ywb6z{g&m$db<4rPz$MunkNEvfzdtLe+?9G4Q;Gr
zqUGJqK4v;<!NXDKjkSC_29eJ(m!l@yjG?&G^3TjusB!W=R&miPel~Afy-zQ9pps?~
z>clYAmDjSoEo!GyFdBzjJ{z@=HK_A8pl-n~)CG8sQ_$9Yjk<#KW)b!#e}EB~N}>VA
zq6VCX+QONZ&%+S%#i)K8&E2Sl9!8z_gVkSh^*Fy-!`~P~2fsAe2B;PGMJ?=UjKuM%
z2^OOku-4kQpe8tI9zne&CsF;rMvYTw?Kdz`@Bb}t!EuW5=ZJP92sLp<GYUh<o1iA{
zjG8FT9Ee(Y2J&;^%tn5}owKN0QmL=|I>({%B-BC%qxbiJ3<XU*0X4xi)P%Fml~%tU
zbtQS0A2;(+S9%e(uxqFb_}$u_e(rc>Q2ioNAEH?FL{sQMK@&fV8sJ6Cr(-Dj9AuN6
z)i@S^#|Ak3Dfh}2nwwBpb_CP$EQVoRe|P*uv$r|4zrFvXtzt6j%4b==47H#Qs4L%w
z?5dM%1`crZ3~WaIUaWvcsQ$$U@^QmJ)OkZJ--YV$m(KlH$5t#?JCKNs?esRcn7)JD
z-}k{-nf9fqh3!P0zt22ko-zwiJ8}`#|5psh+t>m_J%il=QqYHrN5>@!K~(60`nOdU
zn(>cy%%)CTT!p&P#9_*@#0WwMf3tdzmi&8{7)Fe+^Z!Aa>*r*mr&az$`7+U&d>HW;
zWgQWeechtdfO0u2x1~Igh$i%GRK`Zc>y+QLKB5<O3$PPDPw1$m`6p0VOx!0Dtf4Nx
zKpu#1V+KBhiMSrO5;~R<^@x7d>u5`8TXl@5PH)u@L{rLpFqQa%cytWZ^&cY}VgszD
z{0wDZf`{CDOfnZ@CeetvO`IS$5RV_}oHvn*Iac{C?jTkZ&(ikjxM+pXw526;8dVPU
z{7k6>U54N$;ydC!VlMF_@f>Y>dn-LQObmHL^6_|+I7<vAZ;aCj9Ul|zsrw!I6UnJz
z=U=BBN;#7l<HJTQr(z|cL(gh54SIRJ2jxTxBZ*d&vx$3di!+>Z6w!mwafZktcy+u-
zb?Re@(PSgBnf2R6zMp7G9<Cd~*TVY}{ttCjBw7>CDY1jUIJ}4cOewN*iVe7hJc#H<
zz7A_)X=|HJzLXe1yi3GU|2gW=r%eCR)|sJ<<B<1XJ|E^g<~SRyf6nzP;lYh9TVbuu
zb1H{Nc&bwS3pGcHF+{Gl{)s-c^|w3{%aTVD7bu^zdeN7<vbf0V>XUy@xfDLcWa5ss
zbv8f6C)xPi@G_nwRu@2j9ovbSgg^N~tcD?254%{OKG=?kqdp8vqP}c8z9d>umyd6#
zg5!XT^E_tJ)}7c$`3XHr+bFz7%p+RU&=qeGw+J2Mh_8tl+DZ^lQ*ML1QO66E6L2!|
zDlwD@r!ItenewA!35AZ-Mc`Y+X>Wta{VQ}QNmb&X-b(ks-(*l8WqBGW)+GFhu|%5H
zzhYLTPREZf&Uvg(v?H1je-p)tX2dKalvqW0C%uOMCH#ovgpL}-shq*pB0T#j)v@9A
z;6)K-$dm9XtFK1+1473XqPw@mHv&_w&mhX5Sp7?wLg;_wJ~{?i`CnF1o4l1ix=9qi
zvdT612Qk<>KW#psZWQHWL~o+F)t{ukF433J@xF`G&=k{&C#}EoEBc3{JTYJI`hO@i
zRRx_Y5W$ai&Z2%V(S*8RQAcm0Bk>ziKnx~y1QVNy4+)0#{>qorn3SgywTR(_jy$3(
zZG-f)@(sze#7DdQB2r2Q^vIkPnU<9~dSp&=Omy+=%t^b3$E=PByz<VD%Lfl!+P~q-
T>b*G+JBJsiVpqAOYZd+vnW8?k

diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index fc53bf05..1feaad2e 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-02 18:33+0000\n"
+"POT-Creation-Date: 2021-03-02 18:44+0000\n"
 "PO-Revision-Date: 2021-03-02 10:35+0000\n"
 "Last-Translator: Kana <gudzpoz@live.com>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -79,26 +79,20 @@ msgstr "在 OpenLibrary 查看"
 
 #: bookwyrm/templates/book.html:100
 #, python-format
-msgid ""
-"\n"
-"                    (%(review_count)s review)\n"
-"                    "
-msgid_plural ""
-"\n"
-"                    (%(review_count)s reviews)\n"
-"                    "
+msgid "(%(review_count)s review)"
+msgid_plural "(%(review_count)s reviews)"
 msgstr[0] ""
 
-#: bookwyrm/templates/book.html:110
+#: bookwyrm/templates/book.html:106
 msgid "Add Description"
 msgstr "添加�述"
 
-#: bookwyrm/templates/book.html:117 bookwyrm/templates/edit_book.html:39
+#: bookwyrm/templates/book.html:113 bookwyrm/templates/edit_book.html:39
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "�述:"
 
-#: bookwyrm/templates/book.html:121 bookwyrm/templates/edit_author.html:78
+#: bookwyrm/templates/book.html:117 bookwyrm/templates/edit_author.html:78
 #: bookwyrm/templates/edit_book.html:120 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:50
 #: bookwyrm/templates/settings/site.html:89
@@ -109,7 +103,7 @@ msgstr "�述:"
 msgid "Save"
 msgstr "�存"
 
-#: bookwyrm/templates/book.html:122 bookwyrm/templates/book.html:171
+#: bookwyrm/templates/book.html:118 bookwyrm/templates/book.html:167
 #: bookwyrm/templates/edit_author.html:79 bookwyrm/templates/edit_book.html:121
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
@@ -120,19 +114,19 @@ msgstr "�存"
 msgid "Cancel"
 msgstr "�消"
 
-#: bookwyrm/templates/book.html:131
+#: bookwyrm/templates/book.html:127
 #, fuzzy, python-format
 #| msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s\">%(title)s</a> �自"
 
-#: bookwyrm/templates/book.html:139
+#: bookwyrm/templates/book.html:135
 #, fuzzy, python-format
 #| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "与 <a href=\"%(path)s\">%(username)s</a> �信"
 
-#: bookwyrm/templates/book.html:145
+#: bookwyrm/templates/book.html:141
 #, fuzzy, python-format
 #| msgid ""
 #| " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
@@ -144,46 +138,46 @@ msgstr ""
 " 添加了 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 "
 "\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 
-#: bookwyrm/templates/book.html:154
+#: bookwyrm/templates/book.html:150
 msgid "Your reading activity"
 msgstr "你的阅读活动"
 
-#: bookwyrm/templates/book.html:156
+#: bookwyrm/templates/book.html:152
 msgid "Add read dates"
 msgstr "添加阅读日期"
 
-#: bookwyrm/templates/book.html:161
+#: bookwyrm/templates/book.html:157
 msgid "You don't have any reading activity for this book."
 msgstr "你还没有任何这本书的阅读活动。"
 
-#: bookwyrm/templates/book.html:168
+#: bookwyrm/templates/book.html:164
 msgid "Create"
 msgstr "创建"
 
-#: bookwyrm/templates/book.html:190
+#: bookwyrm/templates/book.html:186
 msgid "Tags"
 msgstr "标签"
 
-#: bookwyrm/templates/book.html:194 bookwyrm/templates/snippets/tag.html:18
+#: bookwyrm/templates/book.html:190 bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr "添加标签"
 
-#: bookwyrm/templates/book.html:211
+#: bookwyrm/templates/book.html:207
 msgid "Subjects"
 msgstr "主题"
 
-#: bookwyrm/templates/book.html:222
+#: bookwyrm/templates/book.html:218
 msgid "Places"
 msgstr "地点"
 
-#: bookwyrm/templates/book.html:233 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book.html:229 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
 #: bookwyrm/templates/search_results.html:90
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "列表"
 
-#: bookwyrm/templates/book.html:262
+#: bookwyrm/templates/book.html:258
 msgid "rated it"
 msgstr "评价了"
 
@@ -1715,12 +1709,10 @@ msgid "Books tagged \"%(tag.name)s\""
 msgstr "标有 \"%(tag.name)s\" 标签的书"
 
 #: bookwyrm/templates/user/create_shelf_form.html:5
-msgid "Create New Shelf"
-msgstr "新建书架"
-
 #: bookwyrm/templates/user/create_shelf_form.html:22
-#: bookwyrm/templates/user/shelf.html:33
-msgid "Create shelf"
+#, fuzzy
+#| msgid "Create shelf"
+msgid "Create Shelf"
 msgstr "创建书架"
 
 #: bookwyrm/templates/user/edit_shelf_form.html:5
@@ -1759,11 +1751,7 @@ msgstr "你的列表"
 msgid "Lists: %(username)s"
 msgstr "列表: %(username)s"
 
-#: bookwyrm/templates/user/lists.html:17
-msgid "Create new list"
-msgstr "新建列表"
-
-#: bookwyrm/templates/user/lists.html:29
+#: bookwyrm/templates/user/lists.html:17 bookwyrm/templates/user/lists.html:29
 msgid "Create list"
 msgstr "创建列表"
 
@@ -1776,6 +1764,10 @@ msgstr "你的书架"
 msgid "%(username)s: Shelves"
 msgstr "%(username)s: 书架"
 
+#: bookwyrm/templates/user/shelf.html:33
+msgid "Create shelf"
+msgstr "创建书架"
+
 #: bookwyrm/templates/user/shelf.html:54
 msgid "Edit shelf"
 msgstr "编辑书架"
@@ -1844,5 +1836,11 @@ msgstr[0] "%(counter)s 个关注者"
 msgid "%(counter)s following"
 msgstr "关注� %(counter)s 人"
 
+#~ msgid "Create New Shelf"
+#~ msgstr "新建书架"
+
+#~ msgid "Create new list"
+#~ msgstr "新建列表"
+
 #~ msgid "Added by"
 #~ msgstr "添加�自"

From b09f806662e3b58f87292919378bf71560276b01 Mon Sep 17 00:00:00 2001
From: tofuwabohu <mail@lapete.de>
Date: Tue, 2 Mar 2021 20:39:10 +0100
Subject: [PATCH 0150/1285] Copied file and started translations

---
 locale/de_DE/LC_MESSAGES/django.po | 1736 ++++++++++++++++++++++++++++
 1 file changed, 1736 insertions(+)
 create mode 100644 locale/de_DE/LC_MESSAGES/django.po

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
new file mode 100644
index 00000000..89f2e2f7
--- /dev/null
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -0,0 +1,1736 @@
+# German language text for the bookwyrm UI
+# Copyright (C) 2021 Mouse Reeve
+# This file is distributed under the same license as the BookWyrm package.
+# Mouse Reeve <mousereeve@riseup.net>, 2021
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: 0.0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-03-02 09:32-0800\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"
+"Language: de_DE\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
+#: bookwyrm/templates/edit_author.html:5
+msgid "Edit Author"
+msgstr "Autor*in editieren"
+
+#: bookwyrm/templates/author.html:32
+msgid "Wikipedia"
+msgstr ""
+
+#: bookwyrm/templates/author.html:37
+#, python-format
+msgid "Books by %(name)s"
+msgstr "Bücher von %(name)s"
+
+#: bookwyrm/templates/book.html:29 bookwyrm/templates/book.html:30
+#: bookwyrm/templates/edit_book.html:5
+msgid "Edit Book"
+msgstr "Buch editieren"
+
+#: bookwyrm/templates/book.html:45
+msgid "Add cover"
+msgstr "Cover hinzufügen"
+
+#: bookwyrm/templates/book.html:51 bookwyrm/templates/lists/list.html:89
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: bookwyrm/templates/book.html:60
+msgid "ISBN:"
+msgstr ""
+
+#: bookwyrm/templates/book.html:67 bookwyrm/templates/edit_book.html:107
+msgid "OCLC Number:"
+msgstr "OCLC Nummer:"
+
+#: bookwyrm/templates/book.html:74 bookwyrm/templates/edit_book.html:111
+msgid "ASIN:"
+msgstr ""
+
+#: bookwyrm/templates/book.html:86
+msgid "View on OpenLibrary"
+msgstr "In OpenLibrary ansehen"
+
+#: bookwyrm/templates/book.html:98
+msgid "Add Description"
+msgstr "Beschreibung hinzufügen"
+
+#: bookwyrm/templates/book.html:105 bookwyrm/templates/edit_book.html:39
+#: bookwyrm/templates/lists/form.html:12
+msgid "Description:"
+msgstr "Beschreibung:"
+
+#: bookwyrm/templates/book.html:109 bookwyrm/templates/edit_author.html:78
+#: bookwyrm/templates/edit_book.html:120 bookwyrm/templates/lists/form.html:42
+#: bookwyrm/templates/preferences/edit_user.html:50
+#: bookwyrm/templates/settings/site.html:89
+#: bookwyrm/templates/snippets/progress_update.html:21
+#: bookwyrm/templates/snippets/readthrough.html:64
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
+msgid "Save"
+msgstr "Speichern"
+
+#: bookwyrm/templates/book.html:110 bookwyrm/templates/book.html:159
+#: bookwyrm/templates/edit_author.html:79 bookwyrm/templates/edit_book.html:121
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
+#: bookwyrm/templates/snippets/goal_form.html:32
+#: bookwyrm/templates/snippets/readthrough.html:65
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: bookwyrm/templates/book.html:142
+msgid "Your reading activity"
+msgstr "Deine Leseaktivität"
+
+#: bookwyrm/templates/book.html:144
+msgid "Add read dates"
+msgstr "Lesedaten hinzufügen"
+
+#: bookwyrm/templates/book.html:149
+msgid "You don't have any reading activity for this book."
+msgstr "Du hast keine Leseaktivität für dieses Buch."
+
+#: bookwyrm/templates/book.html:156
+msgid "Create"
+msgstr "Erstellen"
+
+#: bookwyrm/templates/book.html:178
+msgid "Tags"
+msgstr ""
+
+#: bookwyrm/templates/book.html:182 bookwyrm/templates/snippets/tag.html:18
+msgid "Add tag"
+msgstr "Tag hinzufügen"
+
+#: bookwyrm/templates/book.html:199
+msgid "Subjects"
+msgstr "Themen"
+
+#: bookwyrm/templates/book.html:210
+msgid "Places"
+msgstr "Orte"
+
+#: bookwyrm/templates/book.html:221 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
+#: bookwyrm/templates/search_results.html:90
+#: bookwyrm/templates/user/user_layout.html:62
+msgid "Lists"
+msgstr "Listen"
+
+#: bookwyrm/templates/book.html:250
+msgid "rated it"
+msgstr "bewertet"
+
+#: bookwyrm/templates/components/inline_form.html:8
+#: bookwyrm/templates/feed/feed_layout.html:51
+msgid "Close"
+msgstr "Schließen"
+
+#: bookwyrm/templates/discover/about.html:7
+#, python-format
+msgid "About %(site_name)s"
+msgstr "Ãœber %(site_name)s"
+
+#: bookwyrm/templates/discover/about.html:10
+#: bookwyrm/templates/discover/about.html:20
+msgid "Code of Conduct"
+msgstr ""
+
+#: bookwyrm/templates/discover/about.html:13
+#: bookwyrm/templates/discover/about.html:29
+msgid "Privacy Policy"
+msgstr ""
+
+#: bookwyrm/templates/discover/discover.html:6
+msgid "Recent Books"
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:5
+msgid "Welcome"
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:17
+msgid "Decentralized"
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:23
+msgid "Friendly"
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:29
+msgid "Anti-Corporate"
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:44
+#, python-format
+msgid "Join %(name)s"
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:49
+#: bookwyrm/templates/login.html:48
+msgid "This instance is closed"
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:55
+msgid "Your Account"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:13 bookwyrm/templates/edit_book.html:13
+msgid "Added:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:14 bookwyrm/templates/edit_book.html:14
+msgid "Updated:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:15 bookwyrm/templates/edit_book.html:15
+msgid "Last edited by:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:31 bookwyrm/templates/edit_book.html:30
+msgid "Metadata"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
+#: bookwyrm/templates/user/create_shelf_form.html:13
+#: bookwyrm/templates/user/edit_shelf_form.html:14
+msgid "Name:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:37
+msgid "Bio:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:42
+msgid "Wikipedia link:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:47
+msgid "Birth date:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:52
+msgid "Death date:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:58
+msgid "Author Identifiers"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:59 bookwyrm/templates/edit_book.html:103
+msgid "Openlibrary key:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:64
+msgid "Librarything key:"
+msgstr ""
+
+#: bookwyrm/templates/edit_author.html:69
+msgid "Goodreads key:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:31
+msgid "Title:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:35
+msgid "Subtitle:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:43
+msgid "Series:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:47
+msgid "Series number:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:51
+msgid "First published date:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:55
+msgid "Published date:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:68
+#: bookwyrm/templates/snippets/shelf.html:9
+msgid "Cover"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:78
+msgid "Physical Properties"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:79
+msgid "Format:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:87
+msgid "Pages:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:94
+msgid "Book Identifiers"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:95
+msgid "ISBN 13:"
+msgstr ""
+
+#: bookwyrm/templates/edit_book.html:99
+msgid "ISBN 10:"
+msgstr ""
+
+#: bookwyrm/templates/editions.html:5
+#, python-format
+msgid "Editions of %(book_title)s"
+msgstr ""
+
+#: bookwyrm/templates/editions.html:9
+#, python-format
+msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+msgstr ""
+
+#: bookwyrm/templates/error.html:4
+msgid "Oops!"
+msgstr ""
+
+#: bookwyrm/templates/error.html:8
+msgid "Server Error"
+msgstr ""
+
+#: bookwyrm/templates/error.html:9
+msgid "Something went wrong! Sorry about that."
+msgstr ""
+
+#: bookwyrm/templates/feed/direct_messages.html:8
+#, python-format
+msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/feed/direct_messages.html:10
+#: bookwyrm/templates/layout.html:79
+msgid "Direct Messages"
+msgstr ""
+
+#: bookwyrm/templates/feed/direct_messages.html:13
+msgid "All messages"
+msgstr ""
+
+#: bookwyrm/templates/feed/direct_messages.html:22
+msgid "You have no messages right now."
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:6
+#, python-format
+msgid "%(tab_title)s Timeline"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:10
+msgid "Home"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:13
+msgid "Local"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:16
+msgid "Federated"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:24
+msgid "Announcements"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:32
+msgid ""
+"There aren't any activities right now! Try following a user to get started"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed_layout.html:5
+msgid "Updates"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed_layout.html:11
+msgid "Your books"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed_layout.html:13
+msgid ""
+"There are no books here right now! Try searching for a book to get started"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed_layout.html:73 bookwyrm/templates/goal.html:26
+#: bookwyrm/templates/snippets/goal_card.html:6
+#, python-format
+msgid "%(year)s Reading Goal"
+msgstr ""
+
+#: bookwyrm/templates/feed/status.html:8
+msgid "Back"
+msgstr ""
+
+#: bookwyrm/templates/goal.html:7
+#, python-format
+msgid "%(year)s Reading Progress"
+msgstr ""
+
+#: bookwyrm/templates/goal.html:11
+msgid "Edit Goal"
+msgstr ""
+
+#: bookwyrm/templates/goal.html:30
+#: bookwyrm/templates/snippets/goal_card.html:13
+#, python-format
+msgid ""
+"Set a goal for how many books you'll finish reading in %(year)s, and track "
+"your progress throughout the year."
+msgstr ""
+
+#: bookwyrm/templates/goal.html:39
+#, python-format
+msgid "%(name)s hasn't set a reading goal for %(year)s."
+msgstr ""
+
+#: bookwyrm/templates/goal.html:51
+#, python-format
+msgid "Your %(year)s Books"
+msgstr ""
+
+#: bookwyrm/templates/goal.html:53
+#, python-format
+msgid "%(username)s's %(year)s Books"
+msgstr ""
+
+#: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
+#: bookwyrm/templates/layout.html:94
+msgid "Import Books"
+msgstr ""
+
+#: bookwyrm/templates/import.html:14
+msgid "Data source"
+msgstr ""
+
+#: bookwyrm/templates/import.html:32
+msgid "Include reviews"
+msgstr ""
+
+#: bookwyrm/templates/import.html:37
+msgid "Privacy setting for imported reviews:"
+msgstr ""
+
+#: bookwyrm/templates/import.html:41
+msgid "Import"
+msgstr ""
+
+#: bookwyrm/templates/import.html:46
+msgid "Recent Imports"
+msgstr ""
+
+#: bookwyrm/templates/import.html:48
+msgid "No recent imports"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:6
+#: bookwyrm/templates/import_status.html:10
+msgid "Import Status"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:13
+msgid "Import started:"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:17
+msgid "Import completed:"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:20
+msgid "TASK FAILED"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:26
+msgid "Import still in progress."
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:28
+msgid "(Hit reload to update!)"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:35
+msgid "Failed to load"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:59
+msgid "Select all"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:62
+msgid "Retry items"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:84
+msgid "Successfully imported"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:88
+#: bookwyrm/templates/lists/curate.html:14
+msgid "Book"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:91
+#: bookwyrm/templates/snippets/create_status_form.html:10
+#: bookwyrm/templates/snippets/shelf.html:10
+msgid "Title"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:94
+#: bookwyrm/templates/snippets/shelf.html:11
+msgid "Author"
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:117
+msgid "Imported"
+msgstr ""
+
+#: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12
+#: bookwyrm/templates/login.html:43
+msgid "Create an Account"
+msgstr ""
+
+#: bookwyrm/templates/invite.html:21
+msgid "Permission Denied"
+msgstr ""
+
+#: bookwyrm/templates/invite.html:22
+msgid "Sorry! This invite code is no longer valid."
+msgstr ""
+
+#: bookwyrm/templates/layout.html:33
+msgid "Search for a book or user"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
+#: bookwyrm/templates/lists/list.html:62
+msgid "Search"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48
+msgid "Main navigation menu"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:58
+msgid "Your shelves"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:61
+msgid "Feed"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:84
+#: bookwyrm/templates/preferences/preferences_layout.html:14
+msgid "Profile"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:89
+msgid "Settings"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:103
+#: bookwyrm/templates/settings/admin_layout.html:19
+#: bookwyrm/templates/settings/manage_invites.html:3
+msgid "Invites"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:110
+msgid "Site Configuration"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:117
+msgid "Log out"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:125 bookwyrm/templates/layout.html:126
+#: bookwyrm/templates/notifications.html:6
+#: bookwyrm/templates/notifications.html:10
+msgid "Notifications"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:143 bookwyrm/templates/layout.html:147
+#: bookwyrm/templates/login.html:17
+#: bookwyrm/templates/snippets/register_form.html:4
+msgid "Username:"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:152 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/login.html:33
+msgid "Log in"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:183
+msgid "About this server"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:187
+msgid "Contact site admin"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:198
+msgid ""
+"BookWyrm is open source software. You can contribute or report issues on <a "
+"href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgstr ""
+
+#: bookwyrm/templates/lists/create_form.html:5
+#: bookwyrm/templates/lists/lists.html:17
+msgid "Create List"
+msgstr ""
+
+#: bookwyrm/templates/lists/curate.html:6
+msgid "Pending Books"
+msgstr ""
+
+#: bookwyrm/templates/lists/curate.html:7
+msgid "Go to list"
+msgstr ""
+
+#: bookwyrm/templates/lists/curate.html:9
+msgid "You're all set!"
+msgstr ""
+
+#: bookwyrm/templates/lists/curate.html:15
+msgid "Suggested by"
+msgstr ""
+
+#: bookwyrm/templates/lists/curate.html:35
+msgid "Approve"
+msgstr ""
+
+#: bookwyrm/templates/lists/curate.html:41
+msgid "Discard"
+msgstr ""
+
+#: bookwyrm/templates/lists/edit_form.html:5
+#: bookwyrm/templates/lists/list_layout.html:17
+msgid "Edit List"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:18
+msgid "List curation:"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:21
+msgid "Closed"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:22
+msgid "Only you can add and remove books to this list"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:26
+msgid "Curated"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:27
+msgid "Anyone can suggest books, subject to your approval"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:31
+msgid "Open"
+msgstr ""
+
+#: bookwyrm/templates/lists/form.html:32
+msgid "Anyone can add books to this list"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:17
+msgid "This list is currently empty"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:35
+msgid "Added by"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:41
+msgid "Remove"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:54
+msgid "Add Books"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:54
+msgid "Suggest Books"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:58
+msgid "Search for a book"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:63
+msgid "search"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:69
+msgid "Clear search"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:74
+#, python-format
+msgid "No books found matching the query \"%(query)s\""
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:75
+msgid "No books found"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:89
+msgid "Suggest"
+msgstr ""
+
+#: bookwyrm/templates/lists/list_items.html:19
+#: bookwyrm/templates/lists/list_layout.html:11
+msgid "Created and curated by"
+msgstr ""
+
+#: bookwyrm/templates/lists/list_items.html:19
+#: bookwyrm/templates/lists/list_layout.html:11
+msgid "Created by"
+msgstr ""
+
+#: bookwyrm/templates/lists/lists.html:14
+msgid "Your lists"
+msgstr ""
+
+#: bookwyrm/templates/lists/lists.html:40
+msgid "Recent Lists"
+msgstr ""
+
+#: bookwyrm/templates/login.html:4
+msgid "Login"
+msgstr ""
+
+#: bookwyrm/templates/login.html:23 bookwyrm/templates/password_reset.html:17
+#: bookwyrm/templates/snippets/register_form.html:22
+msgid "Password:"
+msgstr ""
+
+#: bookwyrm/templates/login.html:36
+msgid "Forgot your password?"
+msgstr ""
+
+#: bookwyrm/templates/login.html:49
+msgid "Contact an administrator to get an invite"
+msgstr ""
+
+#: bookwyrm/templates/login.html:59
+msgid "More about this site"
+msgstr ""
+
+#: bookwyrm/templates/notfound.html:4 bookwyrm/templates/notfound.html:8
+msgid "Not Found"
+msgstr ""
+
+#: bookwyrm/templates/notfound.html:9
+msgid "The page your requested doesn't seem to exist!"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:14
+msgid "Delete notifications"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:49
+#, python-format
+msgid ""
+"favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:51
+#, python-format
+msgid ""
+"favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:53
+#, python-format
+msgid ""
+"favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:55
+#, python-format
+msgid "favorited your <a href=\"%(related_path)s\">status</a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:60
+#, python-format
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">review of <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:62
+#, python-format
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">comment on <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:64
+#, python-format
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">quote from <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:66
+#, python-format
+msgid "mentioned you in a <a href=\"%(related_path)s\">status</a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:71
+#, python-format
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">review of <em>%(book_title)s</em></a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:73
+#, python-format
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">comment on <em>%(book_title)s</em></a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:75
+#, python-format
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">quote from <em>%(book_title)s</em></a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:77
+#, python-format
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">status</a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:81
+msgid "followed you"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:84
+msgid "sent you a follow request"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:90
+#, python-format
+msgid ""
+"boosted your <a href=\"%(related_path)s\">review of <em>%(book.title)s</em></"
+"a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:92
+#, python-format
+msgid ""
+"boosted your <a href=\"%(related_path)s\">comment on<em>%(book.title)s</em></"
+"a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:94
+#, python-format
+msgid ""
+"boosted your <a href=\"%(related_path)s\">quote from <em>%(book.title)s</"
+"em></a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:96
+#, python-format
+msgid "boosted your <a href=\"%(related_path)s\">status</a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:100
+#, python-format
+msgid ""
+" added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
+"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:102
+#, python-format
+msgid ""
+" suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to "
+"your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:106
+#, python-format
+msgid " your <a href=\"/import/%(related_id)s\">import</a> completed."
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:138
+msgid "You're all caught up!"
+msgstr ""
+
+#: bookwyrm/templates/password_reset.html:4
+#: bookwyrm/templates/password_reset.html:10
+#: bookwyrm/templates/password_reset_request.html:4
+#: bookwyrm/templates/password_reset_request.html:10
+msgid "Reset Password"
+msgstr ""
+
+#: bookwyrm/templates/password_reset.html:23
+#: bookwyrm/templates/preferences/change_password.html:18
+msgid "Confirm password:"
+msgstr ""
+
+#: bookwyrm/templates/password_reset.html:30
+msgid "Confirm"
+msgstr ""
+
+#: bookwyrm/templates/password_reset_request.html:12
+msgid "A link to reset your password will be sent to your email address"
+msgstr ""
+
+#: bookwyrm/templates/password_reset_request.html:16
+#: bookwyrm/templates/preferences/edit_user.html:38
+#: bookwyrm/templates/snippets/register_form.html:13
+msgid "Email address:"
+msgstr ""
+
+#: bookwyrm/templates/password_reset_request.html:23
+msgid "Reset password"
+msgstr ""
+
+#: bookwyrm/templates/preferences/blocks.html:4
+#: bookwyrm/templates/preferences/blocks.html:7
+#: bookwyrm/templates/preferences/preferences_layout.html:23
+msgid "Blocked Users"
+msgstr ""
+
+#: bookwyrm/templates/preferences/blocks.html:12
+msgid "No users currently blocked."
+msgstr ""
+
+#: bookwyrm/templates/preferences/change_password.html:4
+#: bookwyrm/templates/preferences/change_password.html:7
+#: bookwyrm/templates/preferences/change_password.html:21
+#: bookwyrm/templates/preferences/preferences_layout.html:17
+msgid "Change Password"
+msgstr ""
+
+#: bookwyrm/templates/preferences/change_password.html:14
+msgid "New password:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:4
+#: bookwyrm/templates/preferences/edit_user.html:7
+msgid "Edit Profile"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:17
+msgid "Avatar:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:24
+msgid "Display name:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:31
+msgid "Summary:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:46
+msgid "Manually approve followers:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/preferences_layout.html:11
+msgid "Account"
+msgstr ""
+
+#: bookwyrm/templates/preferences/preferences_layout.html:20
+msgid "Relationships"
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:4
+msgid "Search Results"
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:9
+#, python-format
+msgid "Search Results for \"%(query)s\""
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:14
+msgid "Matching Books"
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:17
+#, python-format
+msgid "No books found for \"%(query)s\""
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:33
+msgid "Didn't find what you were looking for?"
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:35
+msgid "Show results from other catalogues"
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:57
+msgid "Import book"
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:67
+msgid "Hide results from other catalogues"
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:75
+msgid "Matching Users"
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:77
+#, python-format
+msgid "No users found for \"%(query)s\""
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:92
+#, python-format
+msgid "No lists found for \"%(query)s\""
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:4
+msgid "Administration"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:15
+msgid "Manage Users"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:23
+#: bookwyrm/templates/settings/federation.html:4
+msgid "Federated Servers"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:28
+msgid "Instance Settings"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/site.html:4
+#: bookwyrm/templates/settings/site.html:6
+msgid "Site Settings"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:35
+#: bookwyrm/templates/settings/site.html:13
+msgid "Instance Info"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:36
+#: bookwyrm/templates/settings/site.html:39
+msgid "Images"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:37
+#: bookwyrm/templates/settings/site.html:59
+msgid "Footer Content"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:38
+#: bookwyrm/templates/settings/site.html:77
+msgid "Registration"
+msgstr ""
+
+#: bookwyrm/templates/settings/federation.html:10
+msgid "Server name"
+msgstr ""
+
+#: bookwyrm/templates/settings/federation.html:11
+msgid "Software"
+msgstr ""
+
+#: bookwyrm/templates/settings/federation.html:12
+msgid "Status"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:7
+msgid "Generate New Invite"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:13
+msgid "Expiry:"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:19
+msgid "Use limit:"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:26
+msgid "Create Invite"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:33
+msgid "Link"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:34
+msgid "Expires"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:35
+msgid "Max uses"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:36
+msgid "Times used"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:39
+msgid "No active invites"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:15
+msgid "Instance Name:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:19
+msgid "Tagline:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:23
+msgid "Instance description:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:27
+msgid "Code of conduct:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:31
+msgid "Privacy Policy:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:42
+msgid "Logo:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:46
+msgid "Logo small:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:50
+msgid "Favicon:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:61
+msgid "Support link:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:65
+msgid "Support title:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:69
+msgid "Admin email:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:79
+msgid "Allow registration:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:83
+msgid "Registration closed text:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/block_button.html:5
+msgid "Block"
+msgstr ""
+
+#: bookwyrm/templates/snippets/block_button.html:10
+msgid "Un-block"
+msgstr ""
+
+#: bookwyrm/templates/snippets/book_titleby.html:3
+#, python-format
+msgid "<a href=\"%(path)s\">%(title)s</a> by "
+msgstr ""
+
+#: bookwyrm/templates/snippets/boost_button.html:8
+#: bookwyrm/templates/snippets/boost_button.html:9
+#: bookwyrm/templates/snippets/status/status_body.html:41
+#: bookwyrm/templates/snippets/status/status_body.html:42
+msgid "Boost status"
+msgstr ""
+
+#: bookwyrm/templates/snippets/boost_button.html:16
+#: bookwyrm/templates/snippets/boost_button.html:17
+msgid "Un-boost status"
+msgstr ""
+
+#: bookwyrm/templates/snippets/content_warning_field.html:3
+msgid "Spoiler alert:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/content_warning_field.html:4
+msgid "Spoilers ahead!"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status.html:9
+msgid "Review"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status.html:12
+#: bookwyrm/templates/snippets/create_status_form.html:44
+msgid "Comment"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status.html:15
+msgid "Quote"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status_form.html:21
+#: bookwyrm/templates/snippets/shelf.html:17
+msgid "Rating"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status_form.html:23
+#: bookwyrm/templates/snippets/rate_action.html:14
+#: bookwyrm/templates/snippets/stars.html:3
+msgid "No rating"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status_form.html:54
+msgid "Include spoiler alert"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status_form.html:60
+#: bookwyrm/templates/snippets/privacy-icons.html:15
+#: bookwyrm/templates/snippets/privacy-icons.html:16
+#: bookwyrm/templates/snippets/privacy_select.html:19
+msgid "Private"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status_form.html:67
+msgid "Post"
+msgstr ""
+
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:4
+msgid "Delete these read dates?"
+msgstr ""
+
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
+#, python-format
+msgid ""
+"You are deleting this readthrough and its %(count)s associated progress "
+"updates."
+msgstr ""
+
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
+#: bookwyrm/templates/snippets/follow_request_buttons.html:13
+msgid "Delete"
+msgstr ""
+
+#: bookwyrm/templates/snippets/fav_button.html:7
+#: bookwyrm/templates/snippets/fav_button.html:8
+#: bookwyrm/templates/snippets/status/status_body.html:45
+#: bookwyrm/templates/snippets/status/status_body.html:46
+msgid "Like status"
+msgstr ""
+
+#: bookwyrm/templates/snippets/fav_button.html:15
+#: bookwyrm/templates/snippets/fav_button.html:16
+msgid "Un-like status"
+msgstr ""
+
+#: bookwyrm/templates/snippets/follow_button.html:6
+msgid "Follow request already sent."
+msgstr ""
+
+#: bookwyrm/templates/snippets/follow_button.html:19
+msgid "Send follow request"
+msgstr ""
+
+#: bookwyrm/templates/snippets/follow_button.html:21
+msgid "Follow"
+msgstr ""
+
+#: bookwyrm/templates/snippets/follow_button.html:27
+msgid "Unfollow"
+msgstr ""
+
+#: bookwyrm/templates/snippets/follow_request_buttons.html:8
+msgid "Accept"
+msgstr ""
+
+#: bookwyrm/templates/snippets/generated_status/goal.html:1
+#, python-format
+msgid "set a goal to read %(counter)s book in %(year)s"
+msgid_plural "set a goal to read %(counter)s books in %(year)s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/snippets/goal_card.html:21
+msgid "Dismiss message"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_card.html:22
+#, python-format
+msgid ""
+"You can set or change your reading goal any time from your <a href=\"%(path)s"
+"\">profile page</a>"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_form.html:9
+msgid "Reading goal:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_form.html:14
+msgid "books"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_form.html:19
+msgid "Goal privacy:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_form.html:26
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:29
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20
+msgid "Post to feed"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_form.html:30
+msgid "Set goal"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_progress.html:5
+msgid "Success!"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_progress.html:7
+#, python-format
+msgid "%(percent)s%% complete!"
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_progress.html:10
+#, python-format
+msgid ""
+"You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgstr ""
+
+#: bookwyrm/templates/snippets/goal_progress.html:12
+#, python-format
+msgid ""
+"%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s "
+"books</a>."
+msgstr ""
+
+#: bookwyrm/templates/snippets/pagination.html:7
+msgid "Previous"
+msgstr ""
+
+#: bookwyrm/templates/snippets/pagination.html:15
+msgid "Next"
+msgstr ""
+
+#: bookwyrm/templates/snippets/privacy-icons.html:3
+#: bookwyrm/templates/snippets/privacy-icons.html:4
+#: bookwyrm/templates/snippets/privacy_select.html:10
+msgid "Public"
+msgstr ""
+
+#: bookwyrm/templates/snippets/privacy-icons.html:7
+#: bookwyrm/templates/snippets/privacy-icons.html:8
+#: bookwyrm/templates/snippets/privacy_select.html:13
+msgid "Unlisted"
+msgstr ""
+
+#: bookwyrm/templates/snippets/privacy-icons.html:12
+msgid "Followers-only"
+msgstr ""
+
+#: bookwyrm/templates/snippets/privacy_select.html:6
+msgid "Post privacy"
+msgstr ""
+
+#: bookwyrm/templates/snippets/privacy_select.html:16
+#: bookwyrm/templates/user/followers.html:13
+msgid "Followers"
+msgstr ""
+
+#: bookwyrm/templates/snippets/progress_update.html:6
+msgid "Progress:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/progress_update.html:16
+#: bookwyrm/templates/snippets/readthrough_form.html:22
+msgid "pages"
+msgstr ""
+
+#: bookwyrm/templates/snippets/progress_update.html:17
+#: bookwyrm/templates/snippets/readthrough_form.html:23
+msgid "percent"
+msgstr ""
+
+#: bookwyrm/templates/snippets/progress_update.html:25
+#, python-format
+msgid "of %(book.pages)s pages"
+msgstr ""
+
+#: bookwyrm/templates/snippets/rate_action.html:4
+msgid "Leave a rating"
+msgstr ""
+
+#: bookwyrm/templates/snippets/rate_action.html:29
+msgid "Rate"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough.html:7
+msgid "Progress Updates:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough.html:11
+msgid "finished"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough.html:14
+msgid "Show all updates"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough.html:30
+msgid "Delete this progress update"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough.html:40
+msgid "started"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough.html:46
+#: bookwyrm/templates/snippets/readthrough.html:60
+msgid "Edit read dates"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough.html:50
+msgid "Delete these read dates"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough_form.html:7
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:19
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:17
+msgid "Started reading"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough_form.html:14
+msgid "Progress"
+msgstr ""
+
+#: bookwyrm/templates/snippets/readthrough_form.html:30
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25
+msgid "Finished reading"
+msgstr ""
+
+#: bookwyrm/templates/snippets/register_form.html:32
+msgid "Sign Up"
+msgstr ""
+
+#: bookwyrm/templates/snippets/rss_title.html:5
+#: bookwyrm/templates/snippets/status/status_header.html:9
+msgid "rated"
+msgstr ""
+
+#: bookwyrm/templates/snippets/rss_title.html:7
+#: bookwyrm/templates/snippets/status/status_header.html:11
+msgid "reviewed"
+msgstr ""
+
+#: bookwyrm/templates/snippets/rss_title.html:9
+#: bookwyrm/templates/snippets/status/status_header.html:13
+msgid "commented on"
+msgstr ""
+
+#: bookwyrm/templates/snippets/rss_title.html:11
+#: bookwyrm/templates/snippets/status/status_header.html:15
+msgid "quoted"
+msgstr ""
+
+#: bookwyrm/templates/snippets/search_result_text.html:3
+#, python-format
+msgid "by %(author)s"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:12
+msgid "Published"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:13
+msgid "Shelved"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:14
+msgid "Started"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:15
+msgid "Finished"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:16
+msgid "External links"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:44
+msgid "OpenLibrary"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:61
+msgid "This shelf is empty."
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf.html:67
+msgid "Delete shelf"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf_selector.html:4
+msgid "Change shelf"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelf_selector.html:27
+msgid "Unshelve"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
+#, python-format
+msgid "Finish \"<em>%(book_title)s</em>\""
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5
+msgid "More shelves"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:8
+msgid "Start reading"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
+msgid "Read"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
+msgid "Finish reading"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26
+msgid "Want to read"
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
+#, python-format
+msgid "Start \"<em>%(book_title)s</em>\""
+msgstr ""
+
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:5
+#, python-format
+msgid "Want to Read \"<em>%(book_title)s</em>\""
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status.html:7
+msgid "boosted"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_body.html:24
+#: bookwyrm/templates/snippets/status/status_body.html:37
+#: bookwyrm/templates/snippets/status/status_body.html:38
+msgid "Reply"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_content.html:16
+#: bookwyrm/templates/snippets/trimmed_text.html:12
+msgid "Show more"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_content.html:23
+#: bookwyrm/templates/snippets/trimmed_text.html:18
+msgid "Show less"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_content.html:44
+msgid "Open image in new window"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_options.html:7
+#: bookwyrm/templates/snippets/user_options.html:7
+msgid "More options"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_options.html:17
+msgid "Delete post"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_options.html:23
+#: bookwyrm/templates/snippets/user_options.html:13
+msgid "Send direct message"
+msgstr ""
+
+#: bookwyrm/templates/snippets/switch_edition_button.html:5
+msgid "Switch to this edition"
+msgstr ""
+
+#: bookwyrm/templates/snippets/tag.html:14
+msgid "Remove tag"
+msgstr ""
+
+#: bookwyrm/templates/tag.html:9
+#, python-format
+msgid "Books tagged \"%(tag.name)s\""
+msgstr ""
+
+#: bookwyrm/templates/user/create_shelf_form.html:5
+msgid "Create New Shelf"
+msgstr ""
+
+#: bookwyrm/templates/user/create_shelf_form.html:22
+#: bookwyrm/templates/user/shelf.html:33
+msgid "Create shelf"
+msgstr ""
+
+#: bookwyrm/templates/user/edit_shelf_form.html:5
+msgid "Edit Shelf"
+msgstr ""
+
+#: bookwyrm/templates/user/edit_shelf_form.html:26
+msgid "Update shelf"
+msgstr ""
+
+#: bookwyrm/templates/user/followers.html:7
+#: bookwyrm/templates/user/following.html:7 bookwyrm/templates/user/user.html:9
+msgid "User Profile"
+msgstr ""
+
+#: bookwyrm/templates/user/followers.html:26
+#, python-format
+msgid "%(username)s has no followers"
+msgstr ""
+
+#: bookwyrm/templates/user/following.html:13
+msgid "Following"
+msgstr ""
+
+#: bookwyrm/templates/user/following.html:26
+#, python-format
+msgid "%(username)s isn't following any users"
+msgstr ""
+
+#: bookwyrm/templates/user/lists.html:9
+msgid "Your Lists"
+msgstr ""
+
+#: bookwyrm/templates/user/lists.html:11
+#, python-format
+msgid "Lists: %(username)s"
+msgstr ""
+
+#: bookwyrm/templates/user/lists.html:17
+msgid "Create new list"
+msgstr ""
+
+#: bookwyrm/templates/user/lists.html:29
+msgid "Create list"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf.html:9
+msgid "Your Shelves"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf.html:11
+#, python-format
+msgid "%(username)s: Shelves"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf.html:54
+msgid "Edit shelf"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:15
+msgid "Edit profile"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:26
+#: bookwyrm/templates/user/user_layout.html:68
+msgid "Shelves"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:31
+#, python-format
+msgid "See all %(size)s"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:44
+#, python-format
+msgid "See all %(shelf_count)s shelves"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:56
+#, python-format
+msgid "Set a reading goal for %(year)s"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:62
+msgid "User Activity"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:65
+msgid "RSS feed"
+msgstr ""
+
+#: bookwyrm/templates/user/user.html:76
+msgid "No activities yet!"
+msgstr ""
+
+#: bookwyrm/templates/user/user_layout.html:32
+msgid "Follow Requests"
+msgstr ""
+
+#: bookwyrm/templates/user/user_layout.html:50
+msgid "Activity"
+msgstr ""
+
+#: bookwyrm/templates/user/user_layout.html:56
+msgid "Reading Goal"
+msgstr ""
+
+#: bookwyrm/templates/user/user_preview.html:13
+#, python-format
+msgid "Joined %(date)s"
+msgstr ""
+
+#: bookwyrm/templates/user/user_preview.html:15
+#, python-format
+msgid "%(counter)s follower"
+msgid_plural "%(counter)s followers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/user/user_preview.html:16
+#, python-format
+msgid "%(counter)s following"
+msgstr ""

From 821862a8919e11c9e9e410cce4997367397f3882 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 2 Mar 2021 11:51:49 -0800
Subject: [PATCH 0151/1285] Updates bw-dev makemessages default flags

---
 bw-dev                             |   2 +-
 locale/en_US/LC_MESSAGES/django.po | 156 ++++++++--------
 locale/fr_FR/LC_MESSAGES/django.po | 281 ++++++++++++-----------------
 locale/zh_CN/LC_MESSAGES/django.po | 238 +++++++++++-------------
 4 files changed, 310 insertions(+), 367 deletions(-)

diff --git a/bw-dev b/bw-dev
index 7a003d01..b411751d 100755
--- a/bw-dev
+++ b/bw-dev
@@ -91,7 +91,7 @@ case "$CMD" in
         execweb python manage.py collectstatic --no-input
         ;;
     makemessages)
-        execweb django-admin makemessages --extension html --ignore=venv3 $@
+        execweb django-admin makemessages --no-wrap --ignore=venv3 $@
         ;;
     compilemessages)
         execweb django-admin compilemessages --ignore venv3 $@
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index 8aae6c92..25d38437 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-02 18:44+0000\n"
+"POT-Creation-Date: 2021-03-02 19:51+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"
@@ -18,6 +18,61 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: bookwyrm/forms.py:185
+msgid "One Day"
+msgstr ""
+
+#: bookwyrm/forms.py:186
+msgid "One Week"
+msgstr ""
+
+#: bookwyrm/forms.py:187
+msgid "One Month"
+msgstr ""
+
+#: bookwyrm/forms.py:188
+msgid "Does Not Expire"
+msgstr ""
+
+#: bookwyrm/forms.py:190
+#, python-format
+msgid "%(count)d uses"
+msgstr ""
+
+#: bookwyrm/forms.py:192
+msgid "Unlimited"
+msgstr ""
+
+#: bookwyrm/models/fields.py:24
+#, python-format
+msgid "%(value)s is not a valid remote_id"
+msgstr ""
+
+#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
+#, python-format
+msgid "%(value)s is not a valid username"
+msgstr ""
+
+#: bookwyrm/models/fields.py:164
+msgid "username"
+msgstr ""
+
+#: bookwyrm/models/fields.py:169
+msgid "A user with that username already exists."
+msgstr ""
+
+#: bookwyrm/settings.py:142
+msgid "English"
+msgstr ""
+
+#: bookwyrm/settings.py:143
+msgid "French"
+msgstr ""
+
+#: bookwyrm/settings.py:144
+msgid "Simplified Chinese"
+msgstr ""
+
 #: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
 #: bookwyrm/templates/edit_author.html:5
 msgid "Edit Author"
@@ -125,9 +180,7 @@ msgstr ""
 
 #: bookwyrm/templates/book.html:141
 #, python-format
-msgid ""
-"A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a "
-"href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
+msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr ""
 
 #: bookwyrm/templates/book.html:150
@@ -379,15 +432,15 @@ msgstr ""
 msgid "%(tab_title)s Timeline"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:10
+#: bookwyrm/templates/feed/feed.html:10 bookwyrm/views/feed.py:33
 msgid "Home"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:13
+#: bookwyrm/templates/feed/feed.html:13 bookwyrm/views/feed.py:37
 msgid "Local"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:16
+#: bookwyrm/templates/feed/feed.html:16 bookwyrm/views/feed.py:41
 msgid "Federated"
 msgstr ""
 
@@ -396,8 +449,7 @@ msgid "Announcements"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed.html:32
-msgid ""
-"There aren't any activities right now! Try following a user to get started"
+msgid "There aren't any activities right now! Try following a user to get started"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:5
@@ -409,8 +461,7 @@ msgid "Your books"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:13
-msgid ""
-"There are no books here right now! Try searching for a book to get started"
+msgid "There are no books here right now! Try searching for a book to get started"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:23
@@ -451,9 +502,7 @@ msgstr ""
 #: bookwyrm/templates/goal.html:30
 #: bookwyrm/templates/snippets/goal_card.html:13
 #, python-format
-msgid ""
-"Set a goal for how many books you'll finish reading in %(year)s, and track "
-"your progress throughout the year."
+msgid "Set a goal for how many books you'll finish reading in %(year)s, and track your progress throughout the year."
 msgstr ""
 
 #: bookwyrm/templates/goal.html:39
@@ -644,9 +693,7 @@ msgid "Contact site admin"
 msgstr ""
 
 #: bookwyrm/templates/layout.html:198
-msgid ""
-"BookWyrm is open source software. You can contribute or report issues on <a "
-"href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr ""
 
 #: bookwyrm/templates/lists/create_form.html:5
@@ -815,23 +862,17 @@ msgstr ""
 
 #: bookwyrm/templates/notifications.html:49
 #, python-format
-msgid ""
-"favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</"
-"em></a>"
+msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:51
 #, python-format
-msgid ""
-"favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</"
-"em></a>"
+msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:53
 #, python-format
-msgid ""
-"favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
-"em></a>"
+msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:55
@@ -841,23 +882,17 @@ msgstr ""
 
 #: bookwyrm/templates/notifications.html:60
 #, python-format
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">review of <em>"
-"%(book_title)s</em></a>"
+msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:62
 #, python-format
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">comment on <em>"
-"%(book_title)s</em></a>"
+msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:64
 #, python-format
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">quote from <em>"
-"%(book_title)s</em></a>"
+msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:66
@@ -867,30 +902,22 @@ msgstr ""
 
 #: bookwyrm/templates/notifications.html:71
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">review of <em>%(book_title)s</em></a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:73
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">comment on <em>%(book_title)s</em></a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:75
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">quote from <em>%(book_title)s</em></a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:77
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">status</a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:81
@@ -903,23 +930,17 @@ msgstr ""
 
 #: bookwyrm/templates/notifications.html:90
 #, python-format
-msgid ""
-"boosted your <a href=\"%(related_path)s\">review of <em>%(book.title)s</em></"
-"a>"
+msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book.title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:92
 #, python-format
-msgid ""
-"boosted your <a href=\"%(related_path)s\">comment on<em>%(book.title)s</em></"
-"a>"
+msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book.title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:94
 #, python-format
-msgid ""
-"boosted your <a href=\"%(related_path)s\">quote from <em>%(book.title)s</"
-"em></a>"
+msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book.title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:96
@@ -929,16 +950,12 @@ msgstr ""
 
 #: bookwyrm/templates/notifications.html:100
 #, python-format
-msgid ""
-" added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
-"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:102
 #, python-format
-msgid ""
-" suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to "
-"your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:106
@@ -1299,9 +1316,7 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
 #, python-format
-msgid ""
-"You are deleting this readthrough and its %(count)s associated progress "
-"updates."
+msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr ""
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
@@ -1354,9 +1369,7 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/goal_card.html:22
 #, python-format
-msgid ""
-"You can set or change your reading goal any time from your <a href=\"%(path)s"
-"\">profile page</a>"
+msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
 msgstr ""
 
 #: bookwyrm/templates/snippets/goal_form.html:9
@@ -1393,15 +1406,12 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/goal_progress.html:10
 #, python-format
-msgid ""
-"You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgid "You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
 msgstr ""
 
 #: bookwyrm/templates/snippets/goal_progress.html:12
 #, python-format
-msgid ""
-"%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s "
-"books</a>."
+msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
 msgstr ""
 
 #: bookwyrm/templates/snippets/pagination.html:7
diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 76b70615..263de6d1 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-02 18:44+0000\n"
+"POT-Creation-Date: 2021-03-02 19:51+0000\n"
 "PO-Revision-Date: 2021-03-02 12:37+0100\n"
 "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -18,6 +18,65 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: bookwyrm/forms.py:185
+msgid "One Day"
+msgstr ""
+
+#: bookwyrm/forms.py:186
+msgid "One Week"
+msgstr ""
+
+#: bookwyrm/forms.py:187
+msgid "One Month"
+msgstr ""
+
+#: bookwyrm/forms.py:188
+msgid "Does Not Expire"
+msgstr ""
+
+#: bookwyrm/forms.py:190
+#, python-format
+msgid "%(count)d uses"
+msgstr ""
+
+#: bookwyrm/forms.py:192
+#, fuzzy
+#| msgid "Unlisted"
+msgid "Unlimited"
+msgstr "Non listé"
+
+#: bookwyrm/models/fields.py:24
+#, python-format
+msgid "%(value)s is not a valid remote_id"
+msgstr ""
+
+#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
+#, python-format
+msgid "%(value)s is not a valid username"
+msgstr ""
+
+#: bookwyrm/models/fields.py:164
+#, fuzzy
+#| msgid "Username:"
+msgid "username"
+msgstr "Nom d’utilisateur :"
+
+#: bookwyrm/models/fields.py:169
+msgid "A user with that username already exists."
+msgstr ""
+
+#: bookwyrm/settings.py:142
+msgid "English"
+msgstr ""
+
+#: bookwyrm/settings.py:143
+msgid "French"
+msgstr ""
+
+#: bookwyrm/settings.py:144
+msgid "Simplified Chinese"
+msgstr ""
+
 #: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
 #: bookwyrm/templates/edit_author.html:5
 msgid "Edit Author"
@@ -131,15 +190,9 @@ msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/book.html:141
 #, fuzzy, python-format
-#| msgid ""
-#| "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-#| "\">%(preview_name)s</a>"
-msgid ""
-"A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a "
-"href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
-msgstr ""
-" a ajouté <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre "
-"liste « <a href=\"%(list_path)s\">%(list_name)s</a> »"
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
+msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
+msgstr " a ajouté <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre liste « <a href=\"%(list_path)s\">%(list_name)s</a> »"
 
 #: bookwyrm/templates/book.html:150
 msgid "Your reading activity"
@@ -399,15 +452,15 @@ msgstr "Vous n’avez aucun message pour l’instant."
 msgid "%(tab_title)s Timeline"
 msgstr "%(tab_title)s — Fil d’actualité"
 
-#: bookwyrm/templates/feed/feed.html:10
+#: bookwyrm/templates/feed/feed.html:10 bookwyrm/views/feed.py:33
 msgid "Home"
 msgstr "Accueil"
 
-#: bookwyrm/templates/feed/feed.html:13
+#: bookwyrm/templates/feed/feed.html:13 bookwyrm/views/feed.py:37
 msgid "Local"
 msgstr "Local"
 
-#: bookwyrm/templates/feed/feed.html:16
+#: bookwyrm/templates/feed/feed.html:16 bookwyrm/views/feed.py:41
 msgid "Federated"
 msgstr "Fédéré"
 
@@ -416,10 +469,8 @@ msgid "Announcements"
 msgstr "Annonces"
 
 #: bookwyrm/templates/feed/feed.html:32
-msgid ""
-"There aren't any activities right now! Try following a user to get started"
-msgstr ""
-"Aucune activité pour l’instant ! Abonnez‑vous à quelqu’un pour commencer"
+msgid "There aren't any activities right now! Try following a user to get started"
+msgstr "Aucune activité pour l’instant ! Abonnez‑vous à quelqu’un pour commencer"
 
 #: bookwyrm/templates/feed/feed_layout.html:5
 #, fuzzy
@@ -432,8 +483,7 @@ msgid "Your books"
 msgstr "Vos livres"
 
 #: bookwyrm/templates/feed/feed_layout.html:13
-msgid ""
-"There are no books here right now! Try searching for a book to get started"
+msgid "There are no books here right now! Try searching for a book to get started"
 msgstr "Aucun livre ici pour l’instant ! Cherchez un livre pour commencer"
 
 #: bookwyrm/templates/feed/feed_layout.html:23
@@ -480,12 +530,8 @@ msgstr "Modifier le défi"
 #: bookwyrm/templates/goal.html:30
 #: bookwyrm/templates/snippets/goal_card.html:13
 #, python-format
-msgid ""
-"Set a goal for how many books you'll finish reading in %(year)s, and track "
-"your progress throughout the year."
-msgstr ""
-"Définissez un nombre de livre à lire comme objectif pour %(year)s, et "
-"suivezvotre progression au fil de l’année."
+msgid "Set a goal for how many books you'll finish reading in %(year)s, and track your progress throughout the year."
+msgstr "Définissez un nombre de livre à lire comme objectif pour %(year)s, et suivezvotre progression au fil de l’année."
 
 #: bookwyrm/templates/goal.html:39
 #, python-format
@@ -683,12 +729,8 @@ msgid "Contact site admin"
 msgstr "Contacter l’administrateur du site"
 
 #: bookwyrm/templates/layout.html:198
-msgid ""
-"BookWyrm is open source software. You can contribute or report issues on <a "
-"href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
-msgstr ""
-"Bookwyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports "
-"de bogues via <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgstr "Bookwyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports de bogues via <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
 #: bookwyrm/templates/lists/create_form.html:5
 #: bookwyrm/templates/lists/lists.html:17
@@ -859,32 +901,20 @@ msgstr "Supprimer les notifications"
 #: bookwyrm/templates/notifications.html:49
 #, fuzzy, python-format
 #| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
-msgid ""
-"favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</"
-"em></a>"
-msgstr ""
-"a ajouté votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</"
-"em></a> à ses favoris"
+msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "a ajouté votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:51
 #, fuzzy, python-format
 #| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
-msgid ""
-"favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</"
-"em></a>"
-msgstr ""
-"a ajouté votre <a href=\"%(related_path)s\">commentaire sur <em>"
-"%(book_title)s</em></a> à ses favoris"
+msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
+msgstr "a ajouté votre <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:53
 #, fuzzy, python-format
 #| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
-msgid ""
-"favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
-"em></a>"
-msgstr ""
-"a ajouté votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</"
-"em></a> à ses favoris"
+msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr "a ajouté votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:55
 #, fuzzy, python-format
@@ -895,32 +925,20 @@ msgstr "a ajouté votre <a href=\"%(related_path)s\">statut</a> à ses favoris"
 #: bookwyrm/templates/notifications.html:60
 #, fuzzy, python-format
 #| msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">review of <em>"
-"%(book_title)s</em></a>"
-msgstr ""
-"vous a mentionné dans sa <a href=\"%(related_path)s\">critique de <em>"
-"%(book_title)s</em></a>"
+msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "vous a mentionné dans sa <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:62
 #, fuzzy, python-format
 #| msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">comment on <em>"
-"%(book_title)s</em></a>"
-msgstr ""
-"vous a mentionné dans son <a href=\"%(related_path)s\">commentaire sur <em>"
-"%(book_title)s</em></a>"
+msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
+msgstr "vous a mentionné dans son <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:64
 #, fuzzy, python-format
 #| msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">quote from <em>"
-"%(book_title)s</em></a>"
-msgstr ""
-"vous a mentionné dans sa <a href=\"%(related_path)s\">citation de <em>"
-"%(book_title)s</em></a>"
+msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr "vous a mentionné dans sa <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:66
 #, fuzzy, python-format
@@ -930,51 +948,27 @@ msgstr "vous a mentionné dans son <a href=\"%(related_path)s\">statut</a>"
 
 #: bookwyrm/templates/notifications.html:71
 #, fuzzy, python-format
-#| msgid ""
-#| "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-#| "\">%(preview_name)s</a>"
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">review of <em>%(book_title)s</em></a>"
-msgstr ""
-"<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s"
-"\">critique de <em>%(book_title)s</em></a>"
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">critique de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:73
 #, fuzzy, python-format
-#| msgid ""
-#| "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-#| "\">%(preview_name)s</a>"
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">comment on <em>%(book_title)s</em></a>"
-msgstr ""
-"<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s"
-"\">commentaire sur <em>%(book_title)s</em></a>"
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
+msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">commentaire sur <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:75
 #, fuzzy, python-format
-#| msgid ""
-#| "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-#| "\">%(preview_name)s</a>"
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">quote from <em>%(book_title)s</em></a>"
-msgstr ""
-"<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s"
-"\">citation de <em>%(book_title)s</em></a>"
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">citation de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:77
 #, fuzzy, python-format
-#| msgid ""
-#| "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-#| "\">%(preview_name)s</a>"
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">status</a>"
-msgstr ""
-"<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s"
-"\">statut</a>"
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
+msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">statut</a>"
 
 #: bookwyrm/templates/notifications.html:81
 msgid "followed you"
@@ -987,32 +981,20 @@ msgstr "vous a envoyé une demande d’abonnement"
 #: bookwyrm/templates/notifications.html:90
 #, fuzzy, python-format
 #| msgid "boosted your <a href=\"%(related_path)s\">%(preview_name)s</a>"
-msgid ""
-"boosted your <a href=\"%(related_path)s\">review of <em>%(book.title)s</em></"
-"a>"
-msgstr ""
-"a partagé votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</"
-"em></a>"
+msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book.title)s</em></a>"
+msgstr "a partagé votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:92
 #, fuzzy, python-format
 #| msgid "boosted your <a href=\"%(related_path)s\">%(preview_name)s</a>"
-msgid ""
-"boosted your <a href=\"%(related_path)s\">comment on<em>%(book.title)s</em></"
-"a>"
-msgstr ""
-"a partagé votre <a href=\"%(related_path)s\">commentaire sur <em>"
-"%(book_title)s</em></a>"
+msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book.title)s</em></a>"
+msgstr "a partagé votre <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:94
 #, fuzzy, python-format
 #| msgid "boosted your <a href=\"%(related_path)s\">%(preview_name)s</a>"
-msgid ""
-"boosted your <a href=\"%(related_path)s\">quote from <em>%(book.title)s</"
-"em></a>"
-msgstr ""
-"a partagé votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</"
-"em></a>"
+msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book.title)s</em></a>"
+msgstr "a partagé votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:96
 #, fuzzy, python-format
@@ -1022,33 +1004,20 @@ msgstr "a partagé votre <a href=\"%(related_path)s\">statut</a>"
 
 #: bookwyrm/templates/notifications.html:100
 #, fuzzy, python-format
-#| msgid ""
-#| "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-#| "\">%(preview_name)s</a>"
-msgid ""
-" added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
-"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
-msgstr ""
-" a ajouté <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre "
-"liste « <a href=\"%(list_path)s\">%(list_name)s</a> »"
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
+msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgstr " a ajouté <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre liste « <a href=\"%(list_path)s\">%(list_name)s</a> »"
 
 #: bookwyrm/templates/notifications.html:102
 #, fuzzy, python-format
-#| msgid ""
-#| "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-#| "\">%(preview_name)s</a>"
-msgid ""
-" suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to "
-"your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
-msgstr ""
-" a suggégré l’ajout de <em><a href=\"%(book_path)s\">%(book_title)s</a></em> "
-"à votre liste « <a href=\"%(list_path)s/curate\">%(list_name)s</a> »"
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
+msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgstr " a suggégré l’ajout de <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre liste « <a href=\"%(list_path)s/curate\">%(list_name)s</a> »"
 
 #: bookwyrm/templates/notifications.html:106
 #, python-format
 msgid " your <a href=\"/import/%(related_id)s\">import</a> completed."
-msgstr ""
-" votre <a href=\"/import/%(related_id)s\">importation</a> est terminée."
+msgstr " votre <a href=\"/import/%(related_id)s\">importation</a> est terminée."
 
 #: bookwyrm/templates/notifications.html:138
 msgid "You're all caught up!"
@@ -1072,8 +1041,7 @@ msgstr "Confirmer"
 
 #: bookwyrm/templates/password_reset_request.html:12
 msgid "A link to reset your password will be sent to your email address"
-msgstr ""
-"Un lien pour changer votre mot de passe sera envoyé à votre addresse email"
+msgstr "Un lien pour changer votre mot de passe sera envoyé à votre addresse email"
 
 #: bookwyrm/templates/password_reset_request.html:16
 #: bookwyrm/templates/preferences/edit_user.html:38
@@ -1413,9 +1381,7 @@ msgstr "Supprimer ces dates de lecture ?"
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
 #, python-format
-msgid ""
-"You are deleting this readthrough and its %(count)s associated progress "
-"updates."
+msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr "Vous avez supprimé ce résumé et ses %(count)s progressions associées."
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
@@ -1468,12 +1434,8 @@ msgstr "Rejeter le message"
 
 #: bookwyrm/templates/snippets/goal_card.html:22
 #, python-format
-msgid ""
-"You can set or change your reading goal any time from your <a href=\"%(path)s"
-"\">profile page</a>"
-msgstr ""
-"Vous pouvez définir ou changer vore défi lecture à n’importe quel moment "
-"depuis votre <a href=\"%(path)s\">profil</a>"
+msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
+msgstr "Vous pouvez définir ou changer vore défi lecture à n’importe quel moment depuis votre <a href=\"%(path)s\">profil</a>"
 
 #: bookwyrm/templates/snippets/goal_form.html:9
 msgid "Reading goal:"
@@ -1509,20 +1471,13 @@ msgstr "%(percent)s%% terminé !"
 
 #: bookwyrm/templates/snippets/goal_progress.html:10
 #, python-format
-msgid ""
-"You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
-msgstr ""
-"Vous avez lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s livres</"
-"a>."
+msgid "You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgstr "Vous avez lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s livres</a>."
 
 #: bookwyrm/templates/snippets/goal_progress.html:12
 #, python-format
-msgid ""
-"%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s "
-"books</a>."
-msgstr ""
-"%(username)s a lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s "
-"livres</a>."
+msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgstr "%(username)s a lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s livres</a>."
 
 #: bookwyrm/templates/snippets/pagination.html:7
 msgid "Previous"
diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index 1feaad2e..0f51c6c3 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-02 18:44+0000\n"
+"POT-Creation-Date: 2021-03-02 19:51+0000\n"
 "PO-Revision-Date: 2021-03-02 10:35+0000\n"
 "Last-Translator: Kana <gudzpoz@live.com>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -18,6 +18,65 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: bookwyrm/forms.py:185
+msgid "One Day"
+msgstr ""
+
+#: bookwyrm/forms.py:186
+msgid "One Week"
+msgstr ""
+
+#: bookwyrm/forms.py:187
+msgid "One Month"
+msgstr ""
+
+#: bookwyrm/forms.py:188
+msgid "Does Not Expire"
+msgstr ""
+
+#: bookwyrm/forms.py:190
+#, python-format
+msgid "%(count)d uses"
+msgstr ""
+
+#: bookwyrm/forms.py:192
+#, fuzzy
+#| msgid "Unlisted"
+msgid "Unlimited"
+msgstr "�公开"
+
+#: bookwyrm/models/fields.py:24
+#, python-format
+msgid "%(value)s is not a valid remote_id"
+msgstr ""
+
+#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
+#, python-format
+msgid "%(value)s is not a valid username"
+msgstr ""
+
+#: bookwyrm/models/fields.py:164
+#, fuzzy
+#| msgid "Username:"
+msgid "username"
+msgstr "用户�:"
+
+#: bookwyrm/models/fields.py:169
+msgid "A user with that username already exists."
+msgstr ""
+
+#: bookwyrm/settings.py:142
+msgid "English"
+msgstr ""
+
+#: bookwyrm/settings.py:143
+msgid "French"
+msgstr ""
+
+#: bookwyrm/settings.py:144
+msgid "Simplified Chinese"
+msgstr ""
+
 #: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
 #: bookwyrm/templates/edit_author.html:5
 msgid "Edit Author"
@@ -128,15 +187,9 @@ msgstr "与 <a href=\"%(path)s\">%(username)s</a> �信"
 
 #: bookwyrm/templates/book.html:141
 #, fuzzy, python-format
-#| msgid ""
-#| " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
-#| "\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
-msgid ""
-"A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a "
-"href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
-msgstr ""
-" 添加了 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 "
-"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+#| msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
+msgstr " 添加了 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 
 #: bookwyrm/templates/book.html:150
 msgid "Your reading activity"
@@ -387,15 +440,15 @@ msgstr "你现在没有消�。"
 msgid "%(tab_title)s Timeline"
 msgstr "%(tab_title)s 时间线"
 
-#: bookwyrm/templates/feed/feed.html:10
+#: bookwyrm/templates/feed/feed.html:10 bookwyrm/views/feed.py:33
 msgid "Home"
 msgstr "主页"
 
-#: bookwyrm/templates/feed/feed.html:13
+#: bookwyrm/templates/feed/feed.html:13 bookwyrm/views/feed.py:37
 msgid "Local"
 msgstr "本站"
 
-#: bookwyrm/templates/feed/feed.html:16
+#: bookwyrm/templates/feed/feed.html:16 bookwyrm/views/feed.py:41
 msgid "Federated"
 msgstr "跨站"
 
@@ -404,8 +457,7 @@ msgid "Announcements"
 msgstr "公告"
 
 #: bookwyrm/templates/feed/feed.html:32
-msgid ""
-"There aren't any activities right now! Try following a user to get started"
+msgid "There aren't any activities right now! Try following a user to get started"
 msgstr "现在还没有任何活动��试�从关注一个用户开始�"
 
 #: bookwyrm/templates/feed/feed_layout.html:5
@@ -417,8 +469,7 @@ msgid "Your books"
 msgstr "你的书目"
 
 #: bookwyrm/templates/feed/feed_layout.html:13
-msgid ""
-"There are no books here right now! Try searching for a book to get started"
+msgid "There are no books here right now! Try searching for a book to get started"
 msgstr "现在这里还没有任何书目��试�从�索�本书开始�"
 
 #: bookwyrm/templates/feed/feed_layout.html:23
@@ -463,9 +514,7 @@ msgstr "编辑目标"
 #: bookwyrm/templates/goal.html:30
 #: bookwyrm/templates/snippets/goal_card.html:13
 #, python-format
-msgid ""
-"Set a goal for how many books you'll finish reading in %(year)s, and track "
-"your progress throughout the year."
+msgid "Set a goal for how many books you'll finish reading in %(year)s, and track your progress throughout the year."
 msgstr "设定一个 %(year)s 内�读多少书的目标，并记录你全年的进度。"
 
 #: bookwyrm/templates/goal.html:39
@@ -656,12 +705,8 @@ msgid "Contact site admin"
 msgstr "�系站点管�员"
 
 #: bookwyrm/templates/layout.html:198
-msgid ""
-"BookWyrm is open source software. You can contribute or report issues on <a "
-"href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
-msgstr ""
-"BookWyrm 是开�软件。你�以在<a href=\"https://github.com/mouse-reeve/"
-"bookwyrm\">GitHub</a> 贡献或报告问题。"
+msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgstr "BookWyrm 是开�软件。你�以在<a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> 贡献或报告问题。"
 
 #: bookwyrm/templates/lists/create_form.html:5
 #: bookwyrm/templates/lists/lists.html:17
@@ -831,27 +876,18 @@ msgstr "删除通知"
 
 #: bookwyrm/templates/notifications.html:49
 #, python-format
-msgid ""
-"favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</"
-"em></a>"
-msgstr ""
-"喜欢了你 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的书评</a>"
+msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "喜欢了你 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的书评</a>"
 
 #: bookwyrm/templates/notifications.html:51
 #, python-format
-msgid ""
-"favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</"
-"em></a>"
-msgstr ""
-"喜欢了你 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的评论</a>"
+msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
+msgstr "喜欢了你 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的评论</a>"
 
 #: bookwyrm/templates/notifications.html:53
 #, python-format
-msgid ""
-"favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
-"em></a>"
-msgstr ""
-"喜欢了你 <a href=\"%(related_path)s\">�自 <em>%(book_title)s</em> 的引用</a>"
+msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr "喜欢了你 <a href=\"%(related_path)s\">�自 <em>%(book_title)s</em> 的引用</a>"
 
 #: bookwyrm/templates/notifications.html:55
 #, python-format
@@ -860,30 +896,18 @@ msgstr "喜欢了你的 <a href=\"%(related_path)s\">状�</a>"
 
 #: bookwyrm/templates/notifications.html:60
 #, python-format
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">review of <em>"
-"%(book_title)s</em></a>"
-msgstr ""
-"在 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的书评</a> 里�到"
-"了你"
+msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "在 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的书评</a> 里�到了你"
 
 #: bookwyrm/templates/notifications.html:62
 #, python-format
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">comment on <em>"
-"%(book_title)s</em></a>"
-msgstr ""
-"在 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的评论</a> 里�到"
-"了你"
+msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
+msgstr "在 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的评论</a> 里�到了你"
 
 #: bookwyrm/templates/notifications.html:64
 #, python-format
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">quote from <em>"
-"%(book_title)s</em></a>"
-msgstr ""
-"在 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的引用</a> 中�到"
-"了你"
+msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr "在 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的引用</a> 中�到了你"
 
 #: bookwyrm/templates/notifications.html:66
 #, python-format
@@ -892,39 +916,23 @@ msgstr "在 <a href=\"%(related_path)s\">状�</a> 中�到了你"
 
 #: bookwyrm/templates/notifications.html:71
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">review of <em>%(book_title)s</em></a>"
-msgstr ""
-"<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">对 "
-"<em>%(book_title)s</em> 的书评</a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">对 <em>%(book_title)s</em> 的书评</a>"
 
 #: bookwyrm/templates/notifications.html:73
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">comment on <em>%(book_title)s</em></a>"
-msgstr ""
-"<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">对 "
-"<em>%(book_title)s</em> 的评论</a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
+msgstr "<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">对 <em>%(book_title)s</em> 的评论</a>"
 
 #: bookwyrm/templates/notifications.html:75
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">quote from <em>%(book_title)s</em></a>"
-msgstr ""
-"<a href=\"%(related_path)s\">回�</a> 了你 <a href=\"%(parent_path)s\">对 "
-"<em>%(book_title)s</em> 中的引用</a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr "<a href=\"%(related_path)s\">回�</a> 了你 <a href=\"%(parent_path)s\">对 <em>%(book_title)s</em> 中的引用</a>"
 
 #: bookwyrm/templates/notifications.html:77
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">status</a>"
-msgstr ""
-"<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">状�"
-"</a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
+msgstr "<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">状�</a>"
 
 #: bookwyrm/templates/notifications.html:81
 msgid "followed you"
@@ -936,27 +944,18 @@ msgstr "�你��了关注请求"
 
 #: bookwyrm/templates/notifications.html:90
 #, python-format
-msgid ""
-"boosted your <a href=\"%(related_path)s\">review of <em>%(book.title)s</em></"
-"a>"
-msgstr ""
-"转�了你的 <a href=\"%(related_path)s\">对 <em>%(book.title)s</em> 的书评</a>"
+msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book.title)s</em></a>"
+msgstr "转�了你的 <a href=\"%(related_path)s\">对 <em>%(book.title)s</em> 的书评</a>"
 
 #: bookwyrm/templates/notifications.html:92
 #, python-format
-msgid ""
-"boosted your <a href=\"%(related_path)s\">comment on<em>%(book.title)s</em></"
-"a>"
-msgstr ""
-"转�了你的 <a href=\"%(related_path)s\">对 <em>%(book.title)s</em> 的评论</a>"
+msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book.title)s</em></a>"
+msgstr "转�了你的 <a href=\"%(related_path)s\">对 <em>%(book.title)s</em> 的评论</a>"
 
 #: bookwyrm/templates/notifications.html:94
 #, python-format
-msgid ""
-"boosted your <a href=\"%(related_path)s\">quote from <em>%(book.title)s</"
-"em></a>"
-msgstr ""
-"转�了你的 <a href=\"%(related_path)s\">对 <em>%(book.title)s</em> 的引用</a>"
+msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book.title)s</em></a>"
+msgstr "转�了你的 <a href=\"%(related_path)s\">对 <em>%(book.title)s</em> 的引用</a>"
 
 #: bookwyrm/templates/notifications.html:96
 #, python-format
@@ -965,21 +964,13 @@ msgstr "转�了你的 <a href=\"%(related_path)s\">状�</a>"
 
 #: bookwyrm/templates/notifications.html:100
 #, python-format
-msgid ""
-" added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
-"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
-msgstr ""
-" 添加了 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 "
-"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgstr " 添加了 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 
 #: bookwyrm/templates/notifications.html:102
 #, python-format
-msgid ""
-" suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to "
-"your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
-msgstr ""
-" 推�添加 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 "
-"\"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgstr " 推�添加 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 
 #: bookwyrm/templates/notifications.html:106
 #, python-format
@@ -1340,9 +1331,7 @@ msgstr "删除这些阅读日期�？"
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
 #, python-format
-msgid ""
-"You are deleting this readthrough and its %(count)s associated progress "
-"updates."
+msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr "你正�删除这篇阅读�过以�与之相关的 %(count)s 次进度更新。"
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
@@ -1394,12 +1383,8 @@ msgstr "�散消�"
 
 #: bookwyrm/templates/snippets/goal_card.html:22
 #, python-format
-msgid ""
-"You can set or change your reading goal any time from your <a href=\"%(path)s"
-"\">profile page</a>"
-msgstr ""
-"你�以在任何时候从你的<a href=\"%(path)s\">个人资料页�</a> 中设置或改�你的"
-"阅读目标"
+msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
+msgstr "你�以在任何时候从你的<a href=\"%(path)s\">个人资料页�</a> 中设置或改�你的阅读目标"
 
 #: bookwyrm/templates/snippets/goal_form.html:9
 msgid "Reading goal:"
@@ -1435,20 +1420,13 @@ msgstr "完�了 %(percent)s%% �"
 
 #: bookwyrm/templates/snippets/goal_progress.html:10
 #, python-format
-msgid ""
-"You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
-msgstr ""
-"你已�阅读了 <a href=\"%(path)s\">%(goal_count)s 本书中的 %(read_count)s 本</"
-"a>。"
+msgid "You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgstr "你已�阅读了 <a href=\"%(path)s\">%(goal_count)s 本书中的 %(read_count)s 本</a>。"
 
 #: bookwyrm/templates/snippets/goal_progress.html:12
 #, python-format
-msgid ""
-"%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s "
-"books</a>."
-msgstr ""
-"%(username)s 已�阅读了 <a href=\"%(path)s\">%(goal_count)s 本书中的 "
-"%(read_count)s 本</a>。"
+msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgstr "%(username)s 已�阅读了 <a href=\"%(path)s\">%(goal_count)s 本书中的 %(read_count)s 本</a>。"
 
 #: bookwyrm/templates/snippets/pagination.html:7
 msgid "Previous"

From 21f39bc310e880c2a54bd5760844789a8cb53ffc Mon Sep 17 00:00:00 2001
From: tofuwabohu <mail@lapete.de>
Date: Tue, 2 Mar 2021 20:52:11 +0100
Subject: [PATCH 0152/1285] More translations

---
 locale/de_DE/LC_MESSAGES/django.po | 74 +++++++++++++++---------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 89f2e2f7..fe817848 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -161,15 +161,15 @@ msgstr ""
 
 #: bookwyrm/templates/discover/landing_layout.html:5
 msgid "Welcome"
-msgstr ""
+msgstr "Willkommen"
 
 #: bookwyrm/templates/discover/landing_layout.html:17
 msgid "Decentralized"
-msgstr ""
+msgstr "Dezentral"
 
 #: bookwyrm/templates/discover/landing_layout.html:23
 msgid "Friendly"
-msgstr ""
+msgstr "Freundlich"
 
 #: bookwyrm/templates/discover/landing_layout.html:29
 msgid "Anti-Corporate"
@@ -178,32 +178,32 @@ msgstr ""
 #: bookwyrm/templates/discover/landing_layout.html:44
 #, python-format
 msgid "Join %(name)s"
-msgstr ""
+msgstr "Tritt %(name)s bei"
 
 #: bookwyrm/templates/discover/landing_layout.html:49
 #: bookwyrm/templates/login.html:48
 msgid "This instance is closed"
-msgstr ""
+msgstr "Diese Instanz ist geschlossen"
 
 #: bookwyrm/templates/discover/landing_layout.html:55
 msgid "Your Account"
-msgstr ""
+msgstr "Dein Account"
 
 #: bookwyrm/templates/edit_author.html:13 bookwyrm/templates/edit_book.html:13
 msgid "Added:"
-msgstr ""
+msgstr "Hinzugefügt:"
 
 #: bookwyrm/templates/edit_author.html:14 bookwyrm/templates/edit_book.html:14
 msgid "Updated:"
-msgstr ""
+msgstr "Aktualisiert:"
 
 #: bookwyrm/templates/edit_author.html:15 bookwyrm/templates/edit_book.html:15
 msgid "Last edited by:"
-msgstr ""
+msgstr "Zuletzt bearbeitet von:"
 
 #: bookwyrm/templates/edit_author.html:31 bookwyrm/templates/edit_book.html:30
 msgid "Metadata"
-msgstr ""
+msgstr "Metadaten"
 
 #: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
 #: bookwyrm/templates/user/create_shelf_form.html:13
@@ -217,19 +217,19 @@ msgstr ""
 
 #: bookwyrm/templates/edit_author.html:42
 msgid "Wikipedia link:"
-msgstr ""
+msgstr "Wikipedialink:"
 
 #: bookwyrm/templates/edit_author.html:47
 msgid "Birth date:"
-msgstr ""
+msgstr "Geburtsdatum:"
 
 #: bookwyrm/templates/edit_author.html:52
 msgid "Death date:"
-msgstr ""
+msgstr "Todesdatum:"
 
 #: bookwyrm/templates/edit_author.html:58
 msgid "Author Identifiers"
-msgstr ""
+msgstr "Autor*innenidentifikatoren"
 
 #: bookwyrm/templates/edit_author.html:59 bookwyrm/templates/edit_book.html:103
 msgid "Openlibrary key:"
@@ -245,27 +245,27 @@ msgstr ""
 
 #: bookwyrm/templates/edit_book.html:31
 msgid "Title:"
-msgstr ""
+msgstr "Titel:"
 
 #: bookwyrm/templates/edit_book.html:35
 msgid "Subtitle:"
-msgstr ""
+msgstr "Untertitel:"
 
 #: bookwyrm/templates/edit_book.html:43
 msgid "Series:"
-msgstr ""
+msgstr "Serie:"
 
 #: bookwyrm/templates/edit_book.html:47
 msgid "Series number:"
-msgstr ""
+msgstr "Seriennummer:"
 
 #: bookwyrm/templates/edit_book.html:51
 msgid "First published date:"
-msgstr ""
+msgstr "Erstveröffentlichungsdatum:"
 
 #: bookwyrm/templates/edit_book.html:55
 msgid "Published date:"
-msgstr ""
+msgstr "Veröffentlichungsdatum:"
 
 #: bookwyrm/templates/edit_book.html:68
 #: bookwyrm/templates/snippets/shelf.html:9
@@ -274,7 +274,7 @@ msgstr ""
 
 #: bookwyrm/templates/edit_book.html:78
 msgid "Physical Properties"
-msgstr ""
+msgstr "Physikalische Eigenschaften"
 
 #: bookwyrm/templates/edit_book.html:79
 msgid "Format:"
@@ -282,11 +282,11 @@ msgstr ""
 
 #: bookwyrm/templates/edit_book.html:87
 msgid "Pages:"
-msgstr ""
+msgstr "Seiten:"
 
 #: bookwyrm/templates/edit_book.html:94
 msgid "Book Identifiers"
-msgstr ""
+msgstr "Buchidentifikatoren"
 
 #: bookwyrm/templates/edit_book.html:95
 msgid "ISBN 13:"
@@ -299,16 +299,16 @@ msgstr ""
 #: bookwyrm/templates/editions.html:5
 #, python-format
 msgid "Editions of %(book_title)s"
-msgstr ""
+msgstr "Editionen von  %(book_title)s"
 
 #: bookwyrm/templates/editions.html:9
 #, python-format
 msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
-msgstr ""
+msgstr "Editionen von <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 
 #: bookwyrm/templates/error.html:4
 msgid "Oops!"
-msgstr ""
+msgstr "Ups!"
 
 #: bookwyrm/templates/error.html:8
 msgid "Server Error"
@@ -316,25 +316,25 @@ msgstr ""
 
 #: bookwyrm/templates/error.html:9
 msgid "Something went wrong! Sorry about that."
-msgstr ""
+msgstr "Etwas lief schief. Entschuldigung!"
 
 #: bookwyrm/templates/feed/direct_messages.html:8
 #, python-format
 msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
-msgstr ""
+msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
 #: bookwyrm/templates/layout.html:79
 msgid "Direct Messages"
-msgstr ""
+msgstr "Direktnachrichten"
 
 #: bookwyrm/templates/feed/direct_messages.html:13
 msgid "All messages"
-msgstr ""
+msgstr "Alle Nachrichten"
 
 #: bookwyrm/templates/feed/direct_messages.html:22
 msgid "You have no messages right now."
-msgstr ""
+msgstr "Du hast momentan keine Nachrichten."
 
 #: bookwyrm/templates/feed/feed.html:6
 #, python-format
@@ -347,20 +347,20 @@ msgstr ""
 
 #: bookwyrm/templates/feed/feed.html:13
 msgid "Local"
-msgstr ""
+msgstr "Lokal"
 
 #: bookwyrm/templates/feed/feed.html:16
 msgid "Federated"
-msgstr ""
+msgstr "Föderiert"
 
 #: bookwyrm/templates/feed/feed.html:24
 msgid "Announcements"
-msgstr ""
+msgstr "Ankündigungen"
 
 #: bookwyrm/templates/feed/feed.html:32
 msgid ""
 "There aren't any activities right now! Try following a user to get started"
-msgstr ""
+msgstr "Hier sind noch keine Aktivitäten! Folge anderen, um loszulegen"
 
 #: bookwyrm/templates/feed/feed_layout.html:5
 msgid "Updates"
@@ -368,12 +368,12 @@ msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:11
 msgid "Your books"
-msgstr ""
+msgstr "Deine Bücher"
 
 #: bookwyrm/templates/feed/feed_layout.html:13
 msgid ""
 "There are no books here right now! Try searching for a book to get started"
-msgstr ""
+msgstr "Hier sind noch keine Bücher! Versuche nach Büchern zu suchen um loszulegen"
 
 #: bookwyrm/templates/feed/feed_layout.html:73 bookwyrm/templates/goal.html:26
 #: bookwyrm/templates/snippets/goal_card.html:6

From 78d6b3a8c9b1a72a398ee2ab63ec2989573e487a Mon Sep 17 00:00:00 2001
From: tofuwabohu <mail@lapete.de>
Date: Tue, 2 Mar 2021 21:20:01 +0100
Subject: [PATCH 0153/1285] translation up to line 761

---
 locale/de_DE/LC_MESSAGES/django.po | 165 +++++++++++++++--------------
 1 file changed, 83 insertions(+), 82 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index fe817848..ebff507e 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -379,20 +379,20 @@ msgstr "Hier sind noch keine Bücher! Versuche nach Büchern zu suchen um loszul
 #: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
 msgid "%(year)s Reading Goal"
-msgstr ""
+msgstr "%(year)s Leseziel"
 
 #: bookwyrm/templates/feed/status.html:8
 msgid "Back"
-msgstr ""
+msgstr "Zurück"
 
 #: bookwyrm/templates/goal.html:7
 #, python-format
 msgid "%(year)s Reading Progress"
-msgstr ""
+msgstr "%(year)s Lesefortschritt"
 
 #: bookwyrm/templates/goal.html:11
 msgid "Edit Goal"
-msgstr ""
+msgstr "Ziel bearbeiten"
 
 #: bookwyrm/templates/goal.html:30
 #: bookwyrm/templates/snippets/goal_card.html:13
@@ -400,142 +400,142 @@ msgstr ""
 msgid ""
 "Set a goal for how many books you'll finish reading in %(year)s, and track "
 "your progress throughout the year."
-msgstr ""
+msgstr "Setze dir ein Ziel, wie viele Bücher du %(year)s lesen wirst und behalte deinen Fortschritt über's Jahr im Auge."
 
 #: bookwyrm/templates/goal.html:39
 #, python-format
 msgid "%(name)s hasn't set a reading goal for %(year)s."
-msgstr ""
+msgstr "%(name)s hat sich für %(year)s kein Leseziel gesetzt."
 
 #: bookwyrm/templates/goal.html:51
 #, python-format
 msgid "Your %(year)s Books"
-msgstr ""
+msgstr "Deine %(year)s Bücher"
 
 #: bookwyrm/templates/goal.html:53
 #, python-format
 msgid "%(username)s's %(year)s Books"
-msgstr ""
+msgstr "%(username)ss %(year)s Bücher"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
 #: bookwyrm/templates/layout.html:94
 msgid "Import Books"
-msgstr ""
+msgstr "Bücher importieren"
 
 #: bookwyrm/templates/import.html:14
 msgid "Data source"
-msgstr ""
+msgstr "Datenquelle"
 
 #: bookwyrm/templates/import.html:32
 msgid "Include reviews"
-msgstr ""
+msgstr "Bewertungen importieren"
 
 #: bookwyrm/templates/import.html:37
 msgid "Privacy setting for imported reviews:"
-msgstr ""
+msgstr "Datenschutzeinstellung für importierte Bewertungen"
 
 #: bookwyrm/templates/import.html:41
 msgid "Import"
-msgstr ""
+msgstr "Importieren"
 
 #: bookwyrm/templates/import.html:46
 msgid "Recent Imports"
-msgstr ""
+msgstr "Aktuelle Importe"
 
 #: bookwyrm/templates/import.html:48
 msgid "No recent imports"
-msgstr ""
+msgstr "Keine aktuellen Importe"
 
 #: bookwyrm/templates/import_status.html:6
 #: bookwyrm/templates/import_status.html:10
 msgid "Import Status"
-msgstr ""
+msgstr "Importstatus"
 
 #: bookwyrm/templates/import_status.html:13
 msgid "Import started:"
-msgstr ""
+msgstr "Import gestartet:"
 
 #: bookwyrm/templates/import_status.html:17
 msgid "Import completed:"
-msgstr ""
+msgstr "Import abgeschlossen:"
 
 #: bookwyrm/templates/import_status.html:20
 msgid "TASK FAILED"
-msgstr ""
+msgstr "AUFGABE GESCHEITERT"
 
 #: bookwyrm/templates/import_status.html:26
 msgid "Import still in progress."
-msgstr ""
+msgstr "Import läuft noch."
 
 #: bookwyrm/templates/import_status.html:28
 msgid "(Hit reload to update!)"
-msgstr ""
+msgstr "(Aktualisiere für ein Update!)"
 
 #: bookwyrm/templates/import_status.html:35
 msgid "Failed to load"
-msgstr ""
+msgstr "Laden fehlgeschlagen"
 
 #: bookwyrm/templates/import_status.html:59
 msgid "Select all"
-msgstr ""
+msgstr "Alle auswählen"
 
 #: bookwyrm/templates/import_status.html:62
 msgid "Retry items"
-msgstr ""
+msgstr "Punkte erneut versuchen"
 
 #: bookwyrm/templates/import_status.html:84
 msgid "Successfully imported"
-msgstr ""
+msgstr "Erfolgreich importiert"
 
 #: bookwyrm/templates/import_status.html:88
 #: bookwyrm/templates/lists/curate.html:14
 msgid "Book"
-msgstr ""
+msgstr "Buch"
 
 #: bookwyrm/templates/import_status.html:91
 #: bookwyrm/templates/snippets/create_status_form.html:10
 #: bookwyrm/templates/snippets/shelf.html:10
 msgid "Title"
-msgstr ""
+msgstr "Titel"
 
 #: bookwyrm/templates/import_status.html:94
 #: bookwyrm/templates/snippets/shelf.html:11
 msgid "Author"
-msgstr ""
+msgstr "Autor*in"
 
 #: bookwyrm/templates/import_status.html:117
 msgid "Imported"
-msgstr ""
+msgstr "Importiert"
 
 #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12
 #: bookwyrm/templates/login.html:43
 msgid "Create an Account"
-msgstr ""
+msgstr "Erstelle einen Account"
 
 #: bookwyrm/templates/invite.html:21
 msgid "Permission Denied"
-msgstr ""
+msgstr "Zugiff verweigert"
 
 #: bookwyrm/templates/invite.html:22
 msgid "Sorry! This invite code is no longer valid."
-msgstr ""
+msgstr "Sorry! Dieser Einladecode ist mehr gültig."
 
 #: bookwyrm/templates/layout.html:33
 msgid "Search for a book or user"
-msgstr ""
+msgstr "Suche nach Buch oder Benutzer*in"
 
 #: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
 #: bookwyrm/templates/lists/list.html:62
 msgid "Search"
-msgstr ""
+msgstr "Suche"
 
 #: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48
 msgid "Main navigation menu"
-msgstr ""
+msgstr "Navigationshauptmenü"
 
 #: bookwyrm/templates/layout.html:58
 msgid "Your shelves"
-msgstr ""
+msgstr "Deine Regale"
 
 #: bookwyrm/templates/layout.html:61
 msgid "Feed"
@@ -548,27 +548,27 @@ msgstr ""
 
 #: bookwyrm/templates/layout.html:89
 msgid "Settings"
-msgstr ""
+msgstr "Einstellungen"
 
 #: bookwyrm/templates/layout.html:103
 #: bookwyrm/templates/settings/admin_layout.html:19
 #: bookwyrm/templates/settings/manage_invites.html:3
 msgid "Invites"
-msgstr ""
+msgstr "Einladungen"
 
 #: bookwyrm/templates/layout.html:110
 msgid "Site Configuration"
-msgstr ""
+msgstr "Seiteneinstellungen"
 
 #: bookwyrm/templates/layout.html:117
 msgid "Log out"
-msgstr ""
+msgstr "Abmelden"
 
 #: bookwyrm/templates/layout.html:125 bookwyrm/templates/layout.html:126
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:10
 msgid "Notifications"
-msgstr ""
+msgstr "Benachrichtigungen"
 
 #: bookwyrm/templates/layout.html:143 bookwyrm/templates/layout.html:147
 #: bookwyrm/templates/login.html:17
@@ -579,146 +579,147 @@ msgstr ""
 #: bookwyrm/templates/layout.html:152 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
-msgstr ""
+msgstr "Anmelden"
 
 #: bookwyrm/templates/layout.html:183
 msgid "About this server"
-msgstr ""
+msgstr "Ãœber diesen Server"
 
 #: bookwyrm/templates/layout.html:187
 msgid "Contact site admin"
-msgstr ""
+msgstr "Admin kontaktieren"
 
 #: bookwyrm/templates/layout.html:198
 msgid ""
 "BookWyrm is open source software. You can contribute or report issues on <a "
 "href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
-msgstr ""
+msgstr "BookWyrm ist open source Software. Du kannst dich auf <a "
+"href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> beteiligen oder etwas melden."
 
 #: bookwyrm/templates/lists/create_form.html:5
 #: bookwyrm/templates/lists/lists.html:17
 msgid "Create List"
-msgstr ""
+msgstr "Liste erstellen"
 
 #: bookwyrm/templates/lists/curate.html:6
 msgid "Pending Books"
-msgstr ""
+msgstr "Unbestätigte Bücher"
 
 #: bookwyrm/templates/lists/curate.html:7
 msgid "Go to list"
-msgstr ""
+msgstr "Zur Liste"
 
 #: bookwyrm/templates/lists/curate.html:9
 msgid "You're all set!"
-msgstr ""
+msgstr "Du bist soweit!"
 
 #: bookwyrm/templates/lists/curate.html:15
 msgid "Suggested by"
-msgstr ""
+msgstr "Vorgeschlagen von"
 
 #: bookwyrm/templates/lists/curate.html:35
 msgid "Approve"
-msgstr ""
+msgstr "Bestätigen"
 
 #: bookwyrm/templates/lists/curate.html:41
 msgid "Discard"
-msgstr ""
+msgstr "Ablehnen"
 
 #: bookwyrm/templates/lists/edit_form.html:5
 #: bookwyrm/templates/lists/list_layout.html:17
 msgid "Edit List"
-msgstr ""
+msgstr "Liste bearbeiten"
 
 #: bookwyrm/templates/lists/form.html:18
 msgid "List curation:"
-msgstr ""
+msgstr "Listenkuratierung:"
 
 #: bookwyrm/templates/lists/form.html:21
 msgid "Closed"
-msgstr ""
+msgstr "Geschlossen"
 
 #: bookwyrm/templates/lists/form.html:22
 msgid "Only you can add and remove books to this list"
-msgstr ""
+msgstr "Nur du kannst Bücher hinzufügen oder entfernen"
 
 #: bookwyrm/templates/lists/form.html:26
 msgid "Curated"
-msgstr ""
+msgstr "Kuratiert"
 
 #: bookwyrm/templates/lists/form.html:27
 msgid "Anyone can suggest books, subject to your approval"
-msgstr ""
+msgstr "Alle können Bücher vorschlagen, du kannst diese bestätigen"
 
 #: bookwyrm/templates/lists/form.html:31
 msgid "Open"
-msgstr ""
+msgstr "Offen"
 
 #: bookwyrm/templates/lists/form.html:32
 msgid "Anyone can add books to this list"
-msgstr ""
+msgstr "Alle können Bücher hinzufügen"
 
 #: bookwyrm/templates/lists/list.html:17
 msgid "This list is currently empty"
-msgstr ""
+msgstr "Diese Liste ist momentan leer"
 
 #: bookwyrm/templates/lists/list.html:35
 msgid "Added by"
-msgstr ""
+msgstr "Hinzugefügt von"
 
 #: bookwyrm/templates/lists/list.html:41
 msgid "Remove"
-msgstr ""
+msgstr "Entfernen"
 
 #: bookwyrm/templates/lists/list.html:54
 msgid "Add Books"
-msgstr ""
+msgstr "Bücher hinzufügen"
 
 #: bookwyrm/templates/lists/list.html:54
 msgid "Suggest Books"
-msgstr ""
+msgstr "Bücher vorschlagen"
 
 #: bookwyrm/templates/lists/list.html:58
 msgid "Search for a book"
-msgstr ""
+msgstr "Nach einem Buch suchen"
 
 #: bookwyrm/templates/lists/list.html:63
 msgid "search"
-msgstr ""
+msgstr "suchen"
 
 #: bookwyrm/templates/lists/list.html:69
 msgid "Clear search"
-msgstr ""
+msgstr "Suche leeren"
 
 #: bookwyrm/templates/lists/list.html:74
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
-msgstr ""
+msgstr "Keine passenden Bücher zu \"%(query)s\" gefunden"
 
 #: bookwyrm/templates/lists/list.html:75
 msgid "No books found"
-msgstr ""
+msgstr "Keine Bücher gefunden"
 
 #: bookwyrm/templates/lists/list.html:89
 msgid "Suggest"
-msgstr ""
+msgstr "Vorschlagen"
 
 #: bookwyrm/templates/lists/list_items.html:19
 #: bookwyrm/templates/lists/list_layout.html:11
 msgid "Created and curated by"
-msgstr ""
+msgstr "Erstellt und kuratiert von"
 
 #: bookwyrm/templates/lists/list_items.html:19
 #: bookwyrm/templates/lists/list_layout.html:11
 msgid "Created by"
-msgstr ""
+msgstr "Erstellt von"
 
 #: bookwyrm/templates/lists/lists.html:14
 msgid "Your lists"
-msgstr ""
+msgstr "Deine Listen"
 
 #: bookwyrm/templates/lists/lists.html:40
 msgid "Recent Lists"
-msgstr ""
+msgstr "Aktuelle Listen"
 
 #: bookwyrm/templates/login.html:4
 msgid "Login"
@@ -727,31 +728,31 @@ msgstr ""
 #: bookwyrm/templates/login.html:23 bookwyrm/templates/password_reset.html:17
 #: bookwyrm/templates/snippets/register_form.html:22
 msgid "Password:"
-msgstr ""
+msgstr "Passwort:"
 
 #: bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
-msgstr ""
+msgstr "Passwort vergessen?"
 
 #: bookwyrm/templates/login.html:49
 msgid "Contact an administrator to get an invite"
-msgstr ""
+msgstr "Kontaktiere für eine Einladung eine*n Admin"
 
 #: bookwyrm/templates/login.html:59
 msgid "More about this site"
-msgstr ""
+msgstr "Mehr über diese Seite"
 
 #: bookwyrm/templates/notfound.html:4 bookwyrm/templates/notfound.html:8
 msgid "Not Found"
-msgstr ""
+msgstr "Nicht gefunden"
 
 #: bookwyrm/templates/notfound.html:9
 msgid "The page your requested doesn't seem to exist!"
-msgstr ""
+msgstr "Die Seite die du angefordert hast scheint nicht zu existieren!"
 
 #: bookwyrm/templates/notifications.html:14
 msgid "Delete notifications"
-msgstr ""
+msgstr "Benachrichtigungen löschen"
 
 #: bookwyrm/templates/notifications.html:49
 #, python-format

From f64442764b4516cc5582312ad0be2f1c1f4a9bf9 Mon Sep 17 00:00:00 2001
From: tofuwabohu <mail@lapete.de>
Date: Tue, 2 Mar 2021 21:34:20 +0100
Subject: [PATCH 0154/1285] translation up to line 901

---
 locale/de_DE/LC_MESSAGES/django.po | 55 ++++++++++++++++++------------
 1 file changed, 34 insertions(+), 21 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index ebff507e..f847cf59 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -759,133 +759,146 @@ msgstr "Benachrichtigungen löschen"
 msgid ""
 "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</"
 "em></a>"
-msgstr ""
+msgstr "hat deine <a href=\"%(related_path)s\">Bewertung von <em>%(book_title)s</"
+"em></a> favorisiert"
 
 #: bookwyrm/templates/notifications.html:51
 #, python-format
 msgid ""
 "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</"
 "em></a>"
-msgstr ""
+msgstr "hat deinen <a href=\"%(related_path)s\">Kommentar zu <em>%(book_title)s</"
+"em></a> favorisiert"
 
 #: bookwyrm/templates/notifications.html:53
 #, python-format
 msgid ""
 "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
 "em></a>"
-msgstr ""
+msgstr " hat dein <a href=\"%(related_path)s\">Zitat aus <em>%(book_title)s</"
+"em></a>"
 
 #: bookwyrm/templates/notifications.html:55
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">status</a>"
-msgstr ""
+msgstr "hat deinen <a href=\"%(related_path)s\">Status</a> favorisiert"
 
 #: bookwyrm/templates/notifications.html:60
 #, python-format
 msgid ""
 "mentioned you in a <a href=\"%(related_path)s\">review of <em>"
 "%(book_title)s</em></a>"
-msgstr ""
+msgstr "hat dich in einer <a href=\"%(related_path)s\">Bewertung von <em>"
+"%(book_title)s</em></a> erwähnt"
 
 #: bookwyrm/templates/notifications.html:62
 #, python-format
 msgid ""
 "mentioned you in a <a href=\"%(related_path)s\">comment on <em>"
 "%(book_title)s</em></a>"
-msgstr ""
+msgstr "hat dich in einem <a href=\"%(related_path)s\">Kommentar zu <em>"
+"%(book_title)s</em></a> erwähnt"
 
 #: bookwyrm/templates/notifications.html:64
 #, python-format
 msgid ""
 "mentioned you in a <a href=\"%(related_path)s\">quote from <em>"
 "%(book_title)s</em></a>"
-msgstr ""
+msgstr "hat dich in einem <a href=\"%(related_path)s\">Zitat von <em>"
+"%(book_title)s</em></a> erwähnt"
 
 #: bookwyrm/templates/notifications.html:66
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">status</a>"
-msgstr ""
+msgstr "hat dich in einem <a href=\"%(related_path)s\">Status</a> erwähnt"
 
 #: bookwyrm/templates/notifications.html:71
 #, python-format
 msgid ""
 "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
 "\">review of <em>%(book_title)s</em></a>"
-msgstr ""
+msgstr "hat auf deine <a href=\"%(parent_path)s"
+"\">Bewertung von <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a> "
 
 #: bookwyrm/templates/notifications.html:73
 #, python-format
 msgid ""
 "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
 "\">comment on <em>%(book_title)s</em></a>"
-msgstr ""
+msgstr "hat auf deinen <a href=\"%(parent_path)s"
+"\">Kommentar zu <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a>"
 
 #: bookwyrm/templates/notifications.html:75
 #, python-format
 msgid ""
 "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
 "\">quote from <em>%(book_title)s</em></a>"
-msgstr ""
+msgstr "hat auf dein <a href=\"%(parent_path)s"
+"\">Zitat aus <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a>"
 
 #: bookwyrm/templates/notifications.html:77
 #, python-format
 msgid ""
 "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
 "\">status</a>"
-msgstr ""
+msgstr "hat auf deinen <a href=\"%(parent_path)s"
+"\">Status</a> <a href=\"%(related_path)s\">geantwortet</a>"
 
 #: bookwyrm/templates/notifications.html:81
 msgid "followed you"
-msgstr ""
+msgstr "folgt dir"
 
 #: bookwyrm/templates/notifications.html:84
 msgid "sent you a follow request"
-msgstr ""
+msgstr "hat dir eine Folgeanfrage geschickt"
 
 #: bookwyrm/templates/notifications.html:90
 #, python-format
 msgid ""
 "boosted your <a href=\"%(related_path)s\">review of <em>%(book.title)s</em></"
 "a>"
-msgstr ""
+msgstr "hat deine <a href=\"%(related_path)s\">Bewertung von <em>%(book.title)s</em></"
+"a> geteilt"
 
 #: bookwyrm/templates/notifications.html:92
 #, python-format
 msgid ""
 "boosted your <a href=\"%(related_path)s\">comment on<em>%(book.title)s</em></"
 "a>"
-msgstr ""
+msgstr "hat deinen <a href=\"%(related_path)s\">Kommentar zu<em>%(book.title)s</em></"
+"a> geteilt"
 
 #: bookwyrm/templates/notifications.html:94
 #, python-format
 msgid ""
 "boosted your <a href=\"%(related_path)s\">quote from <em>%(book.title)s</"
 "em></a>"
-msgstr ""
+msgstr "hat dein <a href=\"%(related_path)s\">Zitat aus <em>%(book.title)s</"
+"em></a> geteilt"
 
 #: bookwyrm/templates/notifications.html:96
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">status</a>"
-msgstr ""
+msgstr "hat deinen <a href=\"%(related_path)s\">Status</a> geteilt"
 
 #: bookwyrm/templates/notifications.html:100
 #, python-format
 msgid ""
 " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
 "\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
-msgstr ""
+msgstr "hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> zu deiner Liste \"<a href=\"%(list_path)s\">%(list_name)s</a>\" Hinzugefügt"
 
 #: bookwyrm/templates/notifications.html:102
 #, python-format
 msgid ""
 " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to "
 "your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
-msgstr ""
+msgstr "hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> für deine Liste \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\" vorgeschlagen"
 
 #: bookwyrm/templates/notifications.html:106
 #, python-format
 msgid " your <a href=\"/import/%(related_id)s\">import</a> completed."
-msgstr ""
+msgstr " dein <a href=\"/import/%(related_id)s\">Import</a> ist abgeschlossen."
 
 #: bookwyrm/templates/notifications.html:138
 msgid "You're all caught up!"

From 46710b23e14a7846e9da26ed74be7a3db61d2237 Mon Sep 17 00:00:00 2001
From: tofuwabohu <mail@lapete.de>
Date: Tue, 2 Mar 2021 21:49:55 +0100
Subject: [PATCH 0155/1285] up to 1345

---
 locale/de_DE/LC_MESSAGES/django.po | 161 +++++++++++++++--------------
 1 file changed, 81 insertions(+), 80 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index f847cf59..968ebb52 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -902,63 +902,63 @@ msgstr " dein <a href=\"/import/%(related_id)s\">Import</a> ist abgeschlossen."
 
 #: bookwyrm/templates/notifications.html:138
 msgid "You're all caught up!"
-msgstr ""
+msgstr "Du bist auf dem neusten Stand!"
 
 #: bookwyrm/templates/password_reset.html:4
 #: bookwyrm/templates/password_reset.html:10
 #: bookwyrm/templates/password_reset_request.html:4
 #: bookwyrm/templates/password_reset_request.html:10
 msgid "Reset Password"
-msgstr ""
+msgstr "Passwort zurücksetzen!"
 
 #: bookwyrm/templates/password_reset.html:23
 #: bookwyrm/templates/preferences/change_password.html:18
 msgid "Confirm password:"
-msgstr ""
+msgstr "Passwort bestätigen:"
 
 #: bookwyrm/templates/password_reset.html:30
 msgid "Confirm"
-msgstr ""
+msgstr "Bestätigen"
 
 #: bookwyrm/templates/password_reset_request.html:12
 msgid "A link to reset your password will be sent to your email address"
-msgstr ""
+msgstr "Ein Link zum Zurücksetzen deines Passworts wird an deine Mailadresse geschickt"
 
 #: bookwyrm/templates/password_reset_request.html:16
 #: bookwyrm/templates/preferences/edit_user.html:38
 #: bookwyrm/templates/snippets/register_form.html:13
 msgid "Email address:"
-msgstr ""
+msgstr "E-Mail Adresse"
 
 #: bookwyrm/templates/password_reset_request.html:23
 msgid "Reset password"
-msgstr ""
+msgstr "Passwort zurücksetzen"
 
 #: bookwyrm/templates/preferences/blocks.html:4
 #: bookwyrm/templates/preferences/blocks.html:7
 #: bookwyrm/templates/preferences/preferences_layout.html:23
 msgid "Blocked Users"
-msgstr ""
+msgstr "Blockierte Nutzer*innen"
 
 #: bookwyrm/templates/preferences/blocks.html:12
 msgid "No users currently blocked."
-msgstr ""
+msgstr "Momentan keine Nutzer*innen blockiert."
 
 #: bookwyrm/templates/preferences/change_password.html:4
 #: bookwyrm/templates/preferences/change_password.html:7
 #: bookwyrm/templates/preferences/change_password.html:21
 #: bookwyrm/templates/preferences/preferences_layout.html:17
 msgid "Change Password"
-msgstr ""
+msgstr "Passwort ändern"
 
 #: bookwyrm/templates/preferences/change_password.html:14
 msgid "New password:"
-msgstr ""
+msgstr "Neues Passwort:"
 
 #: bookwyrm/templates/preferences/edit_user.html:4
 #: bookwyrm/templates/preferences/edit_user.html:7
 msgid "Edit Profile"
-msgstr ""
+msgstr "Profil bearbeiten:"
 
 #: bookwyrm/templates/preferences/edit_user.html:17
 msgid "Avatar:"
@@ -966,15 +966,15 @@ msgstr ""
 
 #: bookwyrm/templates/preferences/edit_user.html:24
 msgid "Display name:"
-msgstr ""
+msgstr "Displayname:"
 
 #: bookwyrm/templates/preferences/edit_user.html:31
 msgid "Summary:"
-msgstr ""
+msgstr "Zusammenfassung:"
 
 #: bookwyrm/templates/preferences/edit_user.html:46
 msgid "Manually approve followers:"
-msgstr ""
+msgstr "Folgende manuell bestätigen"
 
 #: bookwyrm/templates/preferences/preferences_layout.html:11
 msgid "Account"
@@ -982,55 +982,55 @@ msgstr ""
 
 #: bookwyrm/templates/preferences/preferences_layout.html:20
 msgid "Relationships"
-msgstr ""
+msgstr "Beziehungen"
 
 #: bookwyrm/templates/search_results.html:4
 msgid "Search Results"
-msgstr ""
+msgstr "Suchergebnisse"
 
 #: bookwyrm/templates/search_results.html:9
 #, python-format
 msgid "Search Results for \"%(query)s\""
-msgstr ""
+msgstr "Suchergebnisse für \"%(query)s\""
 
 #: bookwyrm/templates/search_results.html:14
 msgid "Matching Books"
-msgstr ""
+msgstr "Passende Bücher"
 
 #: bookwyrm/templates/search_results.html:17
 #, python-format
 msgid "No books found for \"%(query)s\""
-msgstr ""
+msgstr "Keine Bücher für \"%(query)s\" gefunden"
 
 #: bookwyrm/templates/search_results.html:33
 msgid "Didn't find what you were looking for?"
-msgstr ""
+msgstr "Nicht gefunden, wonach du gesucht hast?"
 
 #: bookwyrm/templates/search_results.html:35
 msgid "Show results from other catalogues"
-msgstr ""
+msgstr "Ergebnisse aus anderen Katalogen zeigen"
 
 #: bookwyrm/templates/search_results.html:57
 msgid "Import book"
-msgstr ""
+msgstr "Buch importieren"
 
 #: bookwyrm/templates/search_results.html:67
 msgid "Hide results from other catalogues"
-msgstr ""
+msgstr "Ergebnisse aus anderen Katalogen ausblenden"
 
 #: bookwyrm/templates/search_results.html:75
 msgid "Matching Users"
-msgstr ""
+msgstr "Passende Nutzer*innen"
 
 #: bookwyrm/templates/search_results.html:77
 #, python-format
 msgid "No users found for \"%(query)s\""
-msgstr ""
+msgstr "Keine Nutzer*innen für \"%(query)s\" gefunden"
 
 #: bookwyrm/templates/search_results.html:92
 #, python-format
 msgid "No lists found for \"%(query)s\""
-msgstr ""
+msgstr "Keine Liste für \"%(query)s\" gefunden"
 
 #: bookwyrm/templates/settings/admin_layout.html:4
 msgid "Administration"
@@ -1038,46 +1038,46 @@ msgstr ""
 
 #: bookwyrm/templates/settings/admin_layout.html:15
 msgid "Manage Users"
-msgstr ""
+msgstr "Nutzer*innen verwalten"
 
 #: bookwyrm/templates/settings/admin_layout.html:23
 #: bookwyrm/templates/settings/federation.html:4
 msgid "Federated Servers"
-msgstr ""
+msgstr "Föderierende Server"
 
 #: bookwyrm/templates/settings/admin_layout.html:28
 msgid "Instance Settings"
-msgstr ""
+msgstr "Instanzeinstellungen"
 
 #: bookwyrm/templates/settings/admin_layout.html:32
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
-msgstr ""
+msgstr "Seiteneinstellungen"
 
 #: bookwyrm/templates/settings/admin_layout.html:35
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
-msgstr ""
+msgstr "Instanzinformationen"
 
 #: bookwyrm/templates/settings/admin_layout.html:36
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
-msgstr ""
+msgstr "Bilder"
 
 #: bookwyrm/templates/settings/admin_layout.html:37
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
-msgstr ""
+msgstr "Inhalt des Footers"
 
 #: bookwyrm/templates/settings/admin_layout.html:38
 #: bookwyrm/templates/settings/site.html:77
 msgid "Registration"
-msgstr ""
+msgstr "Registrierung"
 
 #: bookwyrm/templates/settings/federation.html:10
 msgid "Server name"
-msgstr ""
+msgstr "Servername"
 
 #: bookwyrm/templates/settings/federation.html:11
 msgid "Software"
@@ -1089,19 +1089,19 @@ msgstr ""
 
 #: bookwyrm/templates/settings/manage_invites.html:7
 msgid "Generate New Invite"
-msgstr ""
+msgstr "Neue Einladung erzeugen"
 
 #: bookwyrm/templates/settings/manage_invites.html:13
 msgid "Expiry:"
-msgstr ""
+msgstr "Ablaufen:"
 
 #: bookwyrm/templates/settings/manage_invites.html:19
 msgid "Use limit:"
-msgstr ""
+msgstr "Begrenzte Benutzung"
 
 #: bookwyrm/templates/settings/manage_invites.html:26
 msgid "Create Invite"
-msgstr ""
+msgstr "Einladung erstellen"
 
 #: bookwyrm/templates/settings/manage_invites.html:33
 msgid "Link"
@@ -1109,23 +1109,23 @@ msgstr ""
 
 #: bookwyrm/templates/settings/manage_invites.html:34
 msgid "Expires"
-msgstr ""
+msgstr "Läuft aus"
 
 #: bookwyrm/templates/settings/manage_invites.html:35
 msgid "Max uses"
-msgstr ""
+msgstr "Maximale Benutzungen"
 
 #: bookwyrm/templates/settings/manage_invites.html:36
 msgid "Times used"
-msgstr ""
+msgstr "Mal benutzt"
 
 #: bookwyrm/templates/settings/manage_invites.html:39
 msgid "No active invites"
-msgstr ""
+msgstr "Keine aktiven Einladungen"
 
 #: bookwyrm/templates/settings/site.html:15
 msgid "Instance Name:"
-msgstr ""
+msgstr "Instanzname"
 
 #: bookwyrm/templates/settings/site.html:19
 msgid "Tagline:"
@@ -1133,7 +1133,7 @@ msgstr ""
 
 #: bookwyrm/templates/settings/site.html:23
 msgid "Instance description:"
-msgstr ""
+msgstr "Instanzbeschreibung"
 
 #: bookwyrm/templates/settings/site.html:27
 msgid "Code of conduct:"
@@ -1141,7 +1141,7 @@ msgstr ""
 
 #: bookwyrm/templates/settings/site.html:31
 msgid "Privacy Policy:"
-msgstr ""
+msgstr "Datenschutzerklärung"
 
 #: bookwyrm/templates/settings/site.html:42
 msgid "Logo:"
@@ -1149,7 +1149,7 @@ msgstr ""
 
 #: bookwyrm/templates/settings/site.html:46
 msgid "Logo small:"
-msgstr ""
+msgstr "Logo klein"
 
 #: bookwyrm/templates/settings/site.html:50
 msgid "Favicon:"
@@ -1157,11 +1157,11 @@ msgstr ""
 
 #: bookwyrm/templates/settings/site.html:61
 msgid "Support link:"
-msgstr ""
+msgstr "Unterstützungslink"
 
 #: bookwyrm/templates/settings/site.html:65
 msgid "Support title:"
-msgstr ""
+msgstr "Unterstützungstitel"
 
 #: bookwyrm/templates/settings/site.html:69
 msgid "Admin email:"
@@ -1169,11 +1169,11 @@ msgstr ""
 
 #: bookwyrm/templates/settings/site.html:79
 msgid "Allow registration:"
-msgstr ""
+msgstr "Registrierungen erlauben"
 
 #: bookwyrm/templates/settings/site.html:83
 msgid "Registration closed text:"
-msgstr ""
+msgstr "Registrierungen geschlossen text"
 
 #: bookwyrm/templates/snippets/block_button.html:5
 msgid "Block"
@@ -1186,40 +1186,40 @@ msgstr ""
 #: bookwyrm/templates/snippets/book_titleby.html:3
 #, python-format
 msgid "<a href=\"%(path)s\">%(title)s</a> by "
-msgstr ""
+msgstr "<a href=\"%(path)s\">%(title)s</a> von"
 
 #: bookwyrm/templates/snippets/boost_button.html:8
 #: bookwyrm/templates/snippets/boost_button.html:9
 #: bookwyrm/templates/snippets/status/status_body.html:41
 #: bookwyrm/templates/snippets/status/status_body.html:42
 msgid "Boost status"
-msgstr ""
+msgstr "Status teilen"
 
 #: bookwyrm/templates/snippets/boost_button.html:16
 #: bookwyrm/templates/snippets/boost_button.html:17
 msgid "Un-boost status"
-msgstr ""
+msgstr "Teilen zurücknehmen"
 
 #: bookwyrm/templates/snippets/content_warning_field.html:3
 msgid "Spoiler alert:"
-msgstr ""
+msgstr "Spoileralarm:"
 
 #: bookwyrm/templates/snippets/content_warning_field.html:4
 msgid "Spoilers ahead!"
-msgstr ""
+msgstr "Spoileralarm!"
 
 #: bookwyrm/templates/snippets/create_status.html:9
 msgid "Review"
-msgstr ""
+msgstr "Bewerten"
 
 #: bookwyrm/templates/snippets/create_status.html:12
 #: bookwyrm/templates/snippets/create_status_form.html:44
 msgid "Comment"
-msgstr ""
+msgstr "Kommentieren"
 
 #: bookwyrm/templates/snippets/create_status.html:15
 msgid "Quote"
-msgstr ""
+msgstr "Zitieren"
 
 #: bookwyrm/templates/snippets/create_status_form.html:21
 #: bookwyrm/templates/snippets/shelf.html:17
@@ -1234,14 +1234,14 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/create_status_form.html:54
 msgid "Include spoiler alert"
-msgstr ""
+msgstr "Spoileralarm aktivieren"
 
 #: bookwyrm/templates/snippets/create_status_form.html:60
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:19
 msgid "Private"
-msgstr ""
+msgstr "Privat"
 
 #: bookwyrm/templates/snippets/create_status_form.html:67
 msgid "Post"
@@ -1249,51 +1249,51 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:4
 msgid "Delete these read dates?"
-msgstr ""
+msgstr "Diese Lesedaten löschen?"
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
 #, python-format
 msgid ""
 "You are deleting this readthrough and its %(count)s associated progress "
 "updates."
-msgstr ""
+msgstr "Du löscht diesen Leseforschritt und %(count)s zugehörige Fortschrittsupdates."
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
 #: bookwyrm/templates/snippets/follow_request_buttons.html:13
 msgid "Delete"
-msgstr ""
+msgstr "Löschen"
 
 #: bookwyrm/templates/snippets/fav_button.html:7
 #: bookwyrm/templates/snippets/fav_button.html:8
 #: bookwyrm/templates/snippets/status/status_body.html:45
 #: bookwyrm/templates/snippets/status/status_body.html:46
 msgid "Like status"
-msgstr ""
+msgstr "Status favorisieren"
 
 #: bookwyrm/templates/snippets/fav_button.html:15
 #: bookwyrm/templates/snippets/fav_button.html:16
 msgid "Un-like status"
-msgstr ""
+msgstr "Favorisieren zurücknehmen"
 
 #: bookwyrm/templates/snippets/follow_button.html:6
 msgid "Follow request already sent."
-msgstr ""
+msgstr "Folgeanfrage bereits gesendet."
 
 #: bookwyrm/templates/snippets/follow_button.html:19
 msgid "Send follow request"
-msgstr ""
+msgstr "Folgeanfrage senden"
 
 #: bookwyrm/templates/snippets/follow_button.html:21
 msgid "Follow"
-msgstr ""
+msgstr "Folgen"
 
 #: bookwyrm/templates/snippets/follow_button.html:27
 msgid "Unfollow"
-msgstr ""
+msgstr "Entfolgen"
 
 #: bookwyrm/templates/snippets/follow_request_buttons.html:8
 msgid "Accept"
-msgstr ""
+msgstr "Annehmen"
 
 #: bookwyrm/templates/snippets/generated_status/goal.html:1
 #, python-format
@@ -1304,41 +1304,42 @@ msgstr[1] ""
 
 #: bookwyrm/templates/snippets/goal_card.html:21
 msgid "Dismiss message"
-msgstr ""
+msgstr "Nachricht verwerfen"
 
 #: bookwyrm/templates/snippets/goal_card.html:22
 #, python-format
 msgid ""
 "You can set or change your reading goal any time from your <a href=\"%(path)s"
 "\">profile page</a>"
-msgstr ""
+msgstr "Du kannst dein Leseziel jederzeit auf deiner <a href=\"%(path)s"
+"\">Profilseite</a> setzen oder ändern."
 
 #: bookwyrm/templates/snippets/goal_form.html:9
 msgid "Reading goal:"
-msgstr ""
+msgstr "Leseziel:"
 
 #: bookwyrm/templates/snippets/goal_form.html:14
 msgid "books"
-msgstr ""
+msgstr "Bücher"
 
 #: bookwyrm/templates/snippets/goal_form.html:19
 msgid "Goal privacy:"
-msgstr ""
+msgstr "Sichtbarkeit des Ziels"
 
 #: bookwyrm/templates/snippets/goal_form.html:26
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:29
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20
 msgid "Post to feed"
-msgstr ""
+msgstr "Posten"
 
 #: bookwyrm/templates/snippets/goal_form.html:30
 msgid "Set goal"
-msgstr ""
+msgstr "Ziel setzen"
 
 #: bookwyrm/templates/snippets/goal_progress.html:5
 msgid "Success!"
-msgstr ""
+msgstr "Erfolg!"
 
 #: bookwyrm/templates/snippets/goal_progress.html:7
 #, python-format

From f028df4691b2818e827354740de9857eef914539 Mon Sep 17 00:00:00 2001
From: tofuwabohu <mail@lapete.de>
Date: Tue, 2 Mar 2021 22:03:29 +0100
Subject: [PATCH 0156/1285] Finished translation except for some non intuitive
 ones

---
 locale/de_DE/LC_MESSAGES/django.po | 173 +++++++++++++++--------------
 1 file changed, 87 insertions(+), 86 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 968ebb52..242d7afd 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -1344,44 +1344,45 @@ msgstr "Erfolg!"
 #: bookwyrm/templates/snippets/goal_progress.html:7
 #, python-format
 msgid "%(percent)s%% complete!"
-msgstr ""
+msgstr "%(percent)s%% komplett!"
 
 #: bookwyrm/templates/snippets/goal_progress.html:10
 #, python-format
 msgid ""
 "You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
-msgstr ""
+msgstr "Du hast <a href=\"%(path)s\">%(read_count)s von %(goal_count)s Büchern</a> gelesen."
 
 #: bookwyrm/templates/snippets/goal_progress.html:12
 #, python-format
 msgid ""
 "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s "
 "books</a>."
-msgstr ""
+msgstr "%(username)s hat <a href=\"%(path)s\">%(read_count)s von %(goal_count)s "
+"Büchern</a> gelesen."
 
 #: bookwyrm/templates/snippets/pagination.html:7
 msgid "Previous"
-msgstr ""
+msgstr "Vorher"
 
 #: bookwyrm/templates/snippets/pagination.html:15
 msgid "Next"
-msgstr ""
+msgstr "Danach"
 
 #: bookwyrm/templates/snippets/privacy-icons.html:3
 #: bookwyrm/templates/snippets/privacy-icons.html:4
 #: bookwyrm/templates/snippets/privacy_select.html:10
 msgid "Public"
-msgstr ""
+msgstr "Öffentlich"
 
 #: bookwyrm/templates/snippets/privacy-icons.html:7
 #: bookwyrm/templates/snippets/privacy-icons.html:8
 #: bookwyrm/templates/snippets/privacy_select.html:13
 msgid "Unlisted"
-msgstr ""
+msgstr "Ungelistet"
 
 #: bookwyrm/templates/snippets/privacy-icons.html:12
 msgid "Followers-only"
-msgstr ""
+msgstr "Nur für Folgende"
 
 #: bookwyrm/templates/snippets/privacy_select.html:6
 msgid "Post privacy"
@@ -1390,30 +1391,30 @@ msgstr ""
 #: bookwyrm/templates/snippets/privacy_select.html:16
 #: bookwyrm/templates/user/followers.html:13
 msgid "Followers"
-msgstr ""
+msgstr "Folgende"
 
 #: bookwyrm/templates/snippets/progress_update.html:6
 msgid "Progress:"
-msgstr ""
+msgstr "Fortschritt:"
 
 #: bookwyrm/templates/snippets/progress_update.html:16
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 msgid "pages"
-msgstr ""
+msgstr "Seiten"
 
 #: bookwyrm/templates/snippets/progress_update.html:17
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 msgid "percent"
-msgstr ""
+msgstr "Prozent"
 
 #: bookwyrm/templates/snippets/progress_update.html:25
 #, python-format
 msgid "of %(book.pages)s pages"
-msgstr ""
+msgstr "von %(book.pages)s Seiten"
 
 #: bookwyrm/templates/snippets/rate_action.html:4
 msgid "Leave a rating"
-msgstr ""
+msgstr "Raten"
 
 #: bookwyrm/templates/snippets/rate_action.html:29
 msgid "Rate"
@@ -1421,51 +1422,51 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/readthrough.html:7
 msgid "Progress Updates:"
-msgstr ""
+msgstr "Fortschrittsupdates:"
 
 #: bookwyrm/templates/snippets/readthrough.html:11
 msgid "finished"
-msgstr ""
+msgstr "beendet"
 
 #: bookwyrm/templates/snippets/readthrough.html:14
 msgid "Show all updates"
-msgstr ""
+msgstr "Zeige alle Updates"
 
 #: bookwyrm/templates/snippets/readthrough.html:30
 msgid "Delete this progress update"
-msgstr ""
+msgstr "Dieses Fortschrittsupdate löschen"
 
 #: bookwyrm/templates/snippets/readthrough.html:40
 msgid "started"
-msgstr ""
+msgstr "Angefangen"
 
 #: bookwyrm/templates/snippets/readthrough.html:46
 #: bookwyrm/templates/snippets/readthrough.html:60
 msgid "Edit read dates"
-msgstr ""
+msgstr "Lesedaten bearbeiten"
 
 #: bookwyrm/templates/snippets/readthrough.html:50
 msgid "Delete these read dates"
-msgstr ""
+msgstr "Diese Lesedaten löschen"
 
 #: bookwyrm/templates/snippets/readthrough_form.html:7
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:19
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:17
 msgid "Started reading"
-msgstr ""
+msgstr "Zu lesen angefangen"
 
 #: bookwyrm/templates/snippets/readthrough_form.html:14
 msgid "Progress"
-msgstr ""
+msgstr "Fortschritt"
 
 #: bookwyrm/templates/snippets/readthrough_form.html:30
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25
 msgid "Finished reading"
-msgstr ""
+msgstr "Lesen beendet"
 
 #: bookwyrm/templates/snippets/register_form.html:32
 msgid "Sign Up"
-msgstr ""
+msgstr "Registrieren"
 
 #: bookwyrm/templates/snippets/rss_title.html:5
 #: bookwyrm/templates/snippets/status/status_header.html:9
@@ -1475,42 +1476,42 @@ msgstr ""
 #: bookwyrm/templates/snippets/rss_title.html:7
 #: bookwyrm/templates/snippets/status/status_header.html:11
 msgid "reviewed"
-msgstr ""
+msgstr "bewertet"
 
 #: bookwyrm/templates/snippets/rss_title.html:9
 #: bookwyrm/templates/snippets/status/status_header.html:13
 msgid "commented on"
-msgstr ""
+msgstr "kommentiert zu"
 
 #: bookwyrm/templates/snippets/rss_title.html:11
 #: bookwyrm/templates/snippets/status/status_header.html:15
 msgid "quoted"
-msgstr ""
+msgstr "zitiert"
 
 #: bookwyrm/templates/snippets/search_result_text.html:3
 #, python-format
 msgid "by %(author)s"
-msgstr ""
+msgstr "von %(author)s"
 
 #: bookwyrm/templates/snippets/shelf.html:12
 msgid "Published"
-msgstr ""
+msgstr "Veröffentlicht"
 
 #: bookwyrm/templates/snippets/shelf.html:13
 msgid "Shelved"
-msgstr ""
+msgstr "Ins Regal gestellt"
 
 #: bookwyrm/templates/snippets/shelf.html:14
 msgid "Started"
-msgstr ""
+msgstr "Gestartet"
 
 #: bookwyrm/templates/snippets/shelf.html:15
 msgid "Finished"
-msgstr ""
+msgstr "Beendet"
 
 #: bookwyrm/templates/snippets/shelf.html:16
 msgid "External links"
-msgstr ""
+msgstr "Eterne Links"
 
 #: bookwyrm/templates/snippets/shelf.html:44
 msgid "OpenLibrary"
@@ -1518,200 +1519,200 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/shelf.html:61
 msgid "This shelf is empty."
-msgstr ""
+msgstr "Dieses Regal ist leer."
 
 #: bookwyrm/templates/snippets/shelf.html:67
 msgid "Delete shelf"
-msgstr ""
+msgstr "Regal löschen"
 
 #: bookwyrm/templates/snippets/shelf_selector.html:4
 msgid "Change shelf"
-msgstr ""
+msgstr "Regal wechseln"
 
 #: bookwyrm/templates/snippets/shelf_selector.html:27
 msgid "Unshelve"
-msgstr ""
+msgstr "Vom Regal nehmen"
 
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
 #, python-format
 msgid "Finish \"<em>%(book_title)s</em>\""
-msgstr ""
+msgstr "\"<em>%(book_title)s</em>\" beenden"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5
 msgid "More shelves"
-msgstr ""
+msgstr "Mehr Regale"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:8
 msgid "Start reading"
-msgstr ""
+msgstr "Zu lesen beginnen"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
 msgid "Read"
-msgstr ""
+msgstr "Lesen"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
 msgid "Finish reading"
-msgstr ""
+msgstr "Lesen beenden"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26
 msgid "Want to read"
-msgstr ""
+msgstr "Auf Leseliste setzen"
 
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
 #, python-format
 msgid "Start \"<em>%(book_title)s</em>\""
-msgstr ""
+msgstr "\"<em>%(book_title)s</em>\" beginnen"
 
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:5
 #, python-format
 msgid "Want to Read \"<em>%(book_title)s</em>\""
-msgstr ""
+msgstr "\"<em>%(book_title)s</em>\" auf Leseliste setzen"
 
 #: bookwyrm/templates/snippets/status/status.html:7
 msgid "boosted"
-msgstr ""
+msgstr "geteilt"
 
 #: bookwyrm/templates/snippets/status/status_body.html:24
 #: bookwyrm/templates/snippets/status/status_body.html:37
 #: bookwyrm/templates/snippets/status/status_body.html:38
 msgid "Reply"
-msgstr ""
+msgstr "Antwort"
 
 #: bookwyrm/templates/snippets/status/status_content.html:16
 #: bookwyrm/templates/snippets/trimmed_text.html:12
 msgid "Show more"
-msgstr ""
+msgstr "Mehr anzeigen"
 
 #: bookwyrm/templates/snippets/status/status_content.html:23
 #: bookwyrm/templates/snippets/trimmed_text.html:18
 msgid "Show less"
-msgstr ""
+msgstr "Weniger anzeigen"
 
 #: bookwyrm/templates/snippets/status/status_content.html:44
 msgid "Open image in new window"
-msgstr ""
+msgstr "Bild in neuem Fenster öffnen"
 
 #: bookwyrm/templates/snippets/status/status_options.html:7
 #: bookwyrm/templates/snippets/user_options.html:7
 msgid "More options"
-msgstr ""
+msgstr "Mehr Optionen"
 
 #: bookwyrm/templates/snippets/status/status_options.html:17
 msgid "Delete post"
-msgstr ""
+msgstr "Post löschen"
 
 #: bookwyrm/templates/snippets/status/status_options.html:23
 #: bookwyrm/templates/snippets/user_options.html:13
 msgid "Send direct message"
-msgstr ""
+msgstr "Direktnachricht senden"
 
 #: bookwyrm/templates/snippets/switch_edition_button.html:5
 msgid "Switch to this edition"
-msgstr ""
+msgstr "Zu dieser Edition wechseln"
 
 #: bookwyrm/templates/snippets/tag.html:14
 msgid "Remove tag"
-msgstr ""
+msgstr "Tag entfernen"
 
 #: bookwyrm/templates/tag.html:9
 #, python-format
 msgid "Books tagged \"%(tag.name)s\""
-msgstr ""
+msgstr "Mit \"%(tag.name)s\" markierte Bücher"
 
 #: bookwyrm/templates/user/create_shelf_form.html:5
 msgid "Create New Shelf"
-msgstr ""
+msgstr "Neues Regal erstellen"
 
 #: bookwyrm/templates/user/create_shelf_form.html:22
 #: bookwyrm/templates/user/shelf.html:33
 msgid "Create shelf"
-msgstr ""
+msgstr "Regal erstellen"
 
 #: bookwyrm/templates/user/edit_shelf_form.html:5
 msgid "Edit Shelf"
-msgstr ""
+msgstr "Regal bearbeiten"
 
 #: bookwyrm/templates/user/edit_shelf_form.html:26
 msgid "Update shelf"
-msgstr ""
+msgstr "Regal aktualisieren"
 
 #: bookwyrm/templates/user/followers.html:7
 #: bookwyrm/templates/user/following.html:7 bookwyrm/templates/user/user.html:9
 msgid "User Profile"
-msgstr ""
+msgstr "Benutzerprofil"
 
 #: bookwyrm/templates/user/followers.html:26
 #, python-format
 msgid "%(username)s has no followers"
-msgstr ""
+msgstr "niemand folgt %(username)s "
 
 #: bookwyrm/templates/user/following.html:13
 msgid "Following"
-msgstr ""
+msgstr "Folgend"
 
 #: bookwyrm/templates/user/following.html:26
 #, python-format
 msgid "%(username)s isn't following any users"
-msgstr ""
+msgstr "%(username)s folgt niemandem"
 
 #: bookwyrm/templates/user/lists.html:9
 msgid "Your Lists"
-msgstr ""
+msgstr "Deine Listen"
 
 #: bookwyrm/templates/user/lists.html:11
 #, python-format
 msgid "Lists: %(username)s"
-msgstr ""
+msgstr "Listen: %(username)s"
 
 #: bookwyrm/templates/user/lists.html:17
 msgid "Create new list"
-msgstr ""
+msgstr "Neue Liste erstellen"
 
 #: bookwyrm/templates/user/lists.html:29
 msgid "Create list"
-msgstr ""
+msgstr "Liste Erstellen"
 
 #: bookwyrm/templates/user/shelf.html:9
 msgid "Your Shelves"
-msgstr ""
+msgstr "Deine Regale"
 
 #: bookwyrm/templates/user/shelf.html:11
 #, python-format
 msgid "%(username)s: Shelves"
-msgstr ""
+msgstr "%(username)s: Regale"
 
 #: bookwyrm/templates/user/shelf.html:54
 msgid "Edit shelf"
-msgstr ""
+msgstr "Regal bearbeiten"
 
 #: bookwyrm/templates/user/user.html:15
 msgid "Edit profile"
-msgstr ""
+msgstr "Profil bearbeiten"
 
 #: bookwyrm/templates/user/user.html:26
 #: bookwyrm/templates/user/user_layout.html:68
 msgid "Shelves"
-msgstr ""
+msgstr "Regale"
 
 #: bookwyrm/templates/user/user.html:31
 #, python-format
 msgid "See all %(size)s"
-msgstr ""
+msgstr "Alle %(size)s anzeigen"
 
 #: bookwyrm/templates/user/user.html:44
 #, python-format
 msgid "See all %(shelf_count)s shelves"
-msgstr ""
+msgstr "Alle %(shelf_count)s Regale anzeigen"
 
 #: bookwyrm/templates/user/user.html:56
 #, python-format
 msgid "Set a reading goal for %(year)s"
-msgstr ""
+msgstr "Leseziel für %(year)s setzen"
 
 #: bookwyrm/templates/user/user.html:62
 msgid "User Activity"
-msgstr ""
+msgstr "Nutzer*innenaktivität"
 
 #: bookwyrm/templates/user/user.html:65
 msgid "RSS feed"
@@ -1719,33 +1720,33 @@ msgstr ""
 
 #: bookwyrm/templates/user/user.html:76
 msgid "No activities yet!"
-msgstr ""
+msgstr "Noch keine Aktivitäten!"
 
 #: bookwyrm/templates/user/user_layout.html:32
 msgid "Follow Requests"
-msgstr ""
+msgstr "Folgeanfragen"
 
 #: bookwyrm/templates/user/user_layout.html:50
 msgid "Activity"
-msgstr ""
+msgstr "Aktivität"
 
 #: bookwyrm/templates/user/user_layout.html:56
 msgid "Reading Goal"
-msgstr ""
+msgstr "Leseziel"
 
 #: bookwyrm/templates/user/user_preview.html:13
 #, python-format
 msgid "Joined %(date)s"
-msgstr ""
+msgstr "Beigetreten %(date)s"
 
 #: bookwyrm/templates/user/user_preview.html:15
 #, python-format
 msgid "%(counter)s follower"
 msgid_plural "%(counter)s followers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(counter)s Folgende*r"
+msgstr[1] "%(counter)s Folgende"
 
 #: bookwyrm/templates/user/user_preview.html:16
 #, python-format
 msgid "%(counter)s following"
-msgstr ""
+msgstr "%(counter)s folgen"

From 1777e98a232b21ca3e0e79b3118edd7938211f6b Mon Sep 17 00:00:00 2001
From: tofuwabohu <mail@lapete.de>
Date: Tue, 2 Mar 2021 22:12:04 +0100
Subject: [PATCH 0157/1285] 2 more translations

---
 locale/de_DE/LC_MESSAGES/django.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 242d7afd..8d0b9375 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -157,7 +157,7 @@ msgstr ""
 
 #: bookwyrm/templates/discover/discover.html:6
 msgid "Recent Books"
-msgstr ""
+msgstr "Aktive Bücher"
 
 #: bookwyrm/templates/discover/landing_layout.html:5
 msgid "Welcome"
@@ -1299,8 +1299,8 @@ msgstr "Annehmen"
 #, python-format
 msgid "set a goal to read %(counter)s book in %(year)s"
 msgid_plural "set a goal to read %(counter)s books in %(year)s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Setze das Ziel, %(year)s %(counter)s Buch zu lesen"
+msgstr[1] "Setze das Ziel, %(year)s %(counter)s Bücher zu lesen"
 
 #: bookwyrm/templates/snippets/goal_card.html:21
 msgid "Dismiss message"

From caed268227185d2a391108b677b0883d931a8133 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 2 Mar 2021 13:36:30 -0800
Subject: [PATCH 0158/1285] Adds german language to settings

---
 bookwyrm/settings.py               |   1 +
 locale/de_DE/LC_MESSAGES/django.po | 348 ++++++++++++++++++-----------
 locale/en_US/LC_MESSAGES/django.po |   8 +-
 locale/fr_FR/LC_MESSAGES/django.po |   8 +-
 locale/zh_CN/LC_MESSAGES/django.po |   8 +-
 5 files changed, 232 insertions(+), 141 deletions(-)

diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 6c3bb7d2..499e72a7 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -140,6 +140,7 @@ AUTH_PASSWORD_VALIDATORS = [
 LANGUAGE_CODE = 'en-us'
 LANGUAGES = [
     ('en-us', _('English')),
+    ('de-de', _('German')),
     ('fr-fr', _('French')),
     ('zh-cn', _('Simplified Chinese')),
 ]
diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 8d0b9375..e4553211 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-02 09:32-0800\n"
+"POT-Creation-Date: 2021-03-02 21:36+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"
@@ -18,6 +18,69 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: bookwyrm/forms.py:185
+msgid "One Day"
+msgstr ""
+
+#: bookwyrm/forms.py:186
+msgid "One Week"
+msgstr ""
+
+#: bookwyrm/forms.py:187
+msgid "One Month"
+msgstr ""
+
+#: bookwyrm/forms.py:188
+msgid "Does Not Expire"
+msgstr ""
+
+#: bookwyrm/forms.py:190
+#, python-format
+msgid "%(count)d uses"
+msgstr ""
+
+#: bookwyrm/forms.py:192
+#, fuzzy
+#| msgid "Unlisted"
+msgid "Unlimited"
+msgstr "Ungelistet"
+
+#: bookwyrm/models/fields.py:24
+#, python-format
+msgid "%(value)s is not a valid remote_id"
+msgstr ""
+
+#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
+#, python-format
+msgid "%(value)s is not a valid username"
+msgstr ""
+
+#: bookwyrm/models/fields.py:164
+#, fuzzy
+#| msgid "Server name"
+msgid "username"
+msgstr "Servername"
+
+#: bookwyrm/models/fields.py:169
+msgid "A user with that username already exists."
+msgstr ""
+
+#: bookwyrm/settings.py:142
+msgid "English"
+msgstr ""
+
+#: bookwyrm/settings.py:143
+msgid "German"
+msgstr ""
+
+#: bookwyrm/settings.py:144
+msgid "French"
+msgstr ""
+
+#: bookwyrm/settings.py:145
+msgid "Simplified Chinese"
+msgstr ""
+
 #: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
 #: bookwyrm/templates/edit_author.html:5
 msgid "Edit Author"
@@ -32,6 +95,10 @@ msgstr ""
 msgid "Books by %(name)s"
 msgstr "Bücher von %(name)s"
 
+#: bookwyrm/templates/book.html:21
+msgid "by"
+msgstr ""
+
 #: bookwyrm/templates/book.html:29 bookwyrm/templates/book.html:30
 #: bookwyrm/templates/edit_book.html:5
 msgid "Edit Book"
@@ -57,20 +124,39 @@ msgstr "OCLC Nummer:"
 msgid "ASIN:"
 msgstr ""
 
+#: bookwyrm/templates/book.html:84
+#, fuzzy, python-format
+#| msgid "of %(book.pages)s pages"
+msgid "%(format)s, %(pages)s pages"
+msgstr "von %(book.pages)s Seiten"
+
 #: bookwyrm/templates/book.html:86
+#, fuzzy, python-format
+#| msgid "of %(book.pages)s pages"
+msgid "%(pages)s pages"
+msgstr "von %(book.pages)s Seiten"
+
+#: bookwyrm/templates/book.html:91
 msgid "View on OpenLibrary"
 msgstr "In OpenLibrary ansehen"
 
-#: bookwyrm/templates/book.html:98
+#: bookwyrm/templates/book.html:100
+#, python-format
+msgid "(%(review_count)s review)"
+msgid_plural "(%(review_count)s reviews)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/book.html:106
 msgid "Add Description"
 msgstr "Beschreibung hinzufügen"
 
-#: bookwyrm/templates/book.html:105 bookwyrm/templates/edit_book.html:39
+#: bookwyrm/templates/book.html:113 bookwyrm/templates/edit_book.html:39
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: bookwyrm/templates/book.html:109 bookwyrm/templates/edit_author.html:78
+#: bookwyrm/templates/book.html:117 bookwyrm/templates/edit_author.html:78
 #: bookwyrm/templates/edit_book.html:120 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:50
 #: bookwyrm/templates/settings/site.html:89
@@ -81,7 +167,7 @@ msgstr "Beschreibung:"
 msgid "Save"
 msgstr "Speichern"
 
-#: bookwyrm/templates/book.html:110 bookwyrm/templates/book.html:159
+#: bookwyrm/templates/book.html:118 bookwyrm/templates/book.html:167
 #: bookwyrm/templates/edit_author.html:79 bookwyrm/templates/edit_book.html:121
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
@@ -92,51 +178,69 @@ msgstr "Speichern"
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: bookwyrm/templates/book.html:142
+#: bookwyrm/templates/book.html:127
+#, fuzzy, python-format
+#| msgid "<a href=\"%(path)s\">%(title)s</a> by "
+msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
+msgstr "<a href=\"%(path)s\">%(title)s</a> von"
+
+#: bookwyrm/templates/book.html:135
+#, fuzzy, python-format
+#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
+msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
+
+#: bookwyrm/templates/book.html:141
+#, fuzzy, python-format
+#| msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
+msgstr "hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> zu deiner Liste \"<a href=\"%(list_path)s\">%(list_name)s</a>\" Hinzugefügt"
+
+#: bookwyrm/templates/book.html:150
 msgid "Your reading activity"
 msgstr "Deine Leseaktivität"
 
-#: bookwyrm/templates/book.html:144
+#: bookwyrm/templates/book.html:152
 msgid "Add read dates"
 msgstr "Lesedaten hinzufügen"
 
-#: bookwyrm/templates/book.html:149
+#: bookwyrm/templates/book.html:157
 msgid "You don't have any reading activity for this book."
 msgstr "Du hast keine Leseaktivität für dieses Buch."
 
-#: bookwyrm/templates/book.html:156
+#: bookwyrm/templates/book.html:164
 msgid "Create"
 msgstr "Erstellen"
 
-#: bookwyrm/templates/book.html:178
+#: bookwyrm/templates/book.html:186
 msgid "Tags"
 msgstr ""
 
-#: bookwyrm/templates/book.html:182 bookwyrm/templates/snippets/tag.html:18
+#: bookwyrm/templates/book.html:190 bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr "Tag hinzufügen"
 
-#: bookwyrm/templates/book.html:199
+#: bookwyrm/templates/book.html:207
 msgid "Subjects"
 msgstr "Themen"
 
-#: bookwyrm/templates/book.html:210
+#: bookwyrm/templates/book.html:218
 msgid "Places"
 msgstr "Orte"
 
-#: bookwyrm/templates/book.html:221 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book.html:229 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
 #: bookwyrm/templates/search_results.html:90
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listen"
 
-#: bookwyrm/templates/book.html:250
+#: bookwyrm/templates/book.html:258
 msgid "rated it"
 msgstr "bewertet"
 
 #: bookwyrm/templates/components/inline_form.html:8
-#: bookwyrm/templates/feed/feed_layout.html:51
+#: bookwyrm/templates/feed/feed_layout.html:54
 msgid "Close"
 msgstr "Schließen"
 
@@ -341,15 +445,15 @@ msgstr "Du hast momentan keine Nachrichten."
 msgid "%(tab_title)s Timeline"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:10
+#: bookwyrm/templates/feed/feed.html:10 bookwyrm/views/feed.py:33
 msgid "Home"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:13
+#: bookwyrm/templates/feed/feed.html:13 bookwyrm/views/feed.py:37
 msgid "Local"
 msgstr "Lokal"
 
-#: bookwyrm/templates/feed/feed.html:16
+#: bookwyrm/templates/feed/feed.html:16 bookwyrm/views/feed.py:41
 msgid "Federated"
 msgstr "Föderiert"
 
@@ -358,8 +462,7 @@ msgid "Announcements"
 msgstr "Ankündigungen"
 
 #: bookwyrm/templates/feed/feed.html:32
-msgid ""
-"There aren't any activities right now! Try following a user to get started"
+msgid "There aren't any activities right now! Try following a user to get started"
 msgstr "Hier sind noch keine Aktivitäten! Folge anderen, um loszulegen"
 
 #: bookwyrm/templates/feed/feed_layout.html:5
@@ -371,11 +474,30 @@ msgid "Your books"
 msgstr "Deine Bücher"
 
 #: bookwyrm/templates/feed/feed_layout.html:13
-msgid ""
-"There are no books here right now! Try searching for a book to get started"
+msgid "There are no books here right now! Try searching for a book to get started"
 msgstr "Hier sind noch keine Bücher! Versuche nach Büchern zu suchen um loszulegen"
 
-#: bookwyrm/templates/feed/feed_layout.html:73 bookwyrm/templates/goal.html:26
+#: bookwyrm/templates/feed/feed_layout.html:23
+#: bookwyrm/templates/user/shelf.html:24
+#, fuzzy
+#| msgid "Read"
+msgid "To Read"
+msgstr "Lesen"
+
+#: bookwyrm/templates/feed/feed_layout.html:24
+#: bookwyrm/templates/user/shelf.html:24
+#, fuzzy
+#| msgid "Start reading"
+msgid "Currently Reading"
+msgstr "Zu lesen beginnen"
+
+#: bookwyrm/templates/feed/feed_layout.html:25
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
+#: bookwyrm/templates/user/shelf.html:24
+msgid "Read"
+msgstr "Lesen"
+
+#: bookwyrm/templates/feed/feed_layout.html:76 bookwyrm/templates/goal.html:26
 #: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
 msgid "%(year)s Reading Goal"
@@ -397,9 +519,7 @@ msgstr "Ziel bearbeiten"
 #: bookwyrm/templates/goal.html:30
 #: bookwyrm/templates/snippets/goal_card.html:13
 #, python-format
-msgid ""
-"Set a goal for how many books you'll finish reading in %(year)s, and track "
-"your progress throughout the year."
+msgid "Set a goal for how many books you'll finish reading in %(year)s, and track your progress throughout the year."
 msgstr "Setze dir ein Ziel, wie viele Bücher du %(year)s lesen wirst und behalte deinen Fortschritt über's Jahr im Auge."
 
 #: bookwyrm/templates/goal.html:39
@@ -590,11 +710,8 @@ msgid "Contact site admin"
 msgstr "Admin kontaktieren"
 
 #: bookwyrm/templates/layout.html:198
-msgid ""
-"BookWyrm is open source software. You can contribute or report issues on <a "
-"href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
-msgstr "BookWyrm ist open source Software. Du kannst dich auf <a "
-"href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> beteiligen oder etwas melden."
+msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgstr "BookWyrm ist open source Software. Du kannst dich auf <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> beteiligen oder etwas melden."
 
 #: bookwyrm/templates/lists/create_form.html:5
 #: bookwyrm/templates/lists/lists.html:17
@@ -663,8 +780,10 @@ msgid "This list is currently empty"
 msgstr "Diese Liste ist momentan leer"
 
 #: bookwyrm/templates/lists/list.html:35
-msgid "Added by"
-msgstr "Hinzugefügt von"
+#, fuzzy, python-format
+#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
+msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/lists/list.html:41
 msgid "Remove"
@@ -717,6 +836,12 @@ msgstr "Erstellt von"
 msgid "Your lists"
 msgstr "Deine Listen"
 
+#: bookwyrm/templates/lists/lists.html:32
+#, fuzzy, python-format
+#| msgid "See all %(size)s"
+msgid "See all %(size)s lists"
+msgstr "Alle %(size)s anzeigen"
+
 #: bookwyrm/templates/lists/lists.html:40
 msgid "Recent Lists"
 msgstr "Aktuelle Listen"
@@ -756,27 +881,18 @@ msgstr "Benachrichtigungen löschen"
 
 #: bookwyrm/templates/notifications.html:49
 #, python-format
-msgid ""
-"favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</"
-"em></a>"
-msgstr "hat deine <a href=\"%(related_path)s\">Bewertung von <em>%(book_title)s</"
-"em></a> favorisiert"
+msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "hat deine <a href=\"%(related_path)s\">Bewertung von <em>%(book_title)s</em></a> favorisiert"
 
 #: bookwyrm/templates/notifications.html:51
 #, python-format
-msgid ""
-"favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</"
-"em></a>"
-msgstr "hat deinen <a href=\"%(related_path)s\">Kommentar zu <em>%(book_title)s</"
-"em></a> favorisiert"
+msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
+msgstr "hat deinen <a href=\"%(related_path)s\">Kommentar zu <em>%(book_title)s</em></a> favorisiert"
 
 #: bookwyrm/templates/notifications.html:53
 #, python-format
-msgid ""
-"favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
-"em></a>"
-msgstr " hat dein <a href=\"%(related_path)s\">Zitat aus <em>%(book_title)s</"
-"em></a>"
+msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr " hat dein <a href=\"%(related_path)s\">Zitat aus <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:55
 #, python-format
@@ -785,27 +901,18 @@ msgstr "hat deinen <a href=\"%(related_path)s\">Status</a> favorisiert"
 
 #: bookwyrm/templates/notifications.html:60
 #, python-format
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">review of <em>"
-"%(book_title)s</em></a>"
-msgstr "hat dich in einer <a href=\"%(related_path)s\">Bewertung von <em>"
-"%(book_title)s</em></a> erwähnt"
+msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "hat dich in einer <a href=\"%(related_path)s\">Bewertung von <em>%(book_title)s</em></a> erwähnt"
 
 #: bookwyrm/templates/notifications.html:62
 #, python-format
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">comment on <em>"
-"%(book_title)s</em></a>"
-msgstr "hat dich in einem <a href=\"%(related_path)s\">Kommentar zu <em>"
-"%(book_title)s</em></a> erwähnt"
+msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
+msgstr "hat dich in einem <a href=\"%(related_path)s\">Kommentar zu <em>%(book_title)s</em></a> erwähnt"
 
 #: bookwyrm/templates/notifications.html:64
 #, python-format
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">quote from <em>"
-"%(book_title)s</em></a>"
-msgstr "hat dich in einem <a href=\"%(related_path)s\">Zitat von <em>"
-"%(book_title)s</em></a> erwähnt"
+msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr "hat dich in einem <a href=\"%(related_path)s\">Zitat von <em>%(book_title)s</em></a> erwähnt"
 
 #: bookwyrm/templates/notifications.html:66
 #, python-format
@@ -814,35 +921,23 @@ msgstr "hat dich in einem <a href=\"%(related_path)s\">Status</a> erwähnt"
 
 #: bookwyrm/templates/notifications.html:71
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">review of <em>%(book_title)s</em></a>"
-msgstr "hat auf deine <a href=\"%(parent_path)s"
-"\">Bewertung von <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a> "
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "hat auf deine <a href=\"%(parent_path)s\">Bewertung von <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a> "
 
 #: bookwyrm/templates/notifications.html:73
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">comment on <em>%(book_title)s</em></a>"
-msgstr "hat auf deinen <a href=\"%(parent_path)s"
-"\">Kommentar zu <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
+msgstr "hat auf deinen <a href=\"%(parent_path)s\">Kommentar zu <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a>"
 
 #: bookwyrm/templates/notifications.html:75
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">quote from <em>%(book_title)s</em></a>"
-msgstr "hat auf dein <a href=\"%(parent_path)s"
-"\">Zitat aus <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr "hat auf dein <a href=\"%(parent_path)s\">Zitat aus <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a>"
 
 #: bookwyrm/templates/notifications.html:77
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">status</a>"
-msgstr "hat auf deinen <a href=\"%(parent_path)s"
-"\">Status</a> <a href=\"%(related_path)s\">geantwortet</a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
+msgstr "hat auf deinen <a href=\"%(parent_path)s\">Status</a> <a href=\"%(related_path)s\">geantwortet</a>"
 
 #: bookwyrm/templates/notifications.html:81
 msgid "followed you"
@@ -854,27 +949,18 @@ msgstr "hat dir eine Folgeanfrage geschickt"
 
 #: bookwyrm/templates/notifications.html:90
 #, python-format
-msgid ""
-"boosted your <a href=\"%(related_path)s\">review of <em>%(book.title)s</em></"
-"a>"
-msgstr "hat deine <a href=\"%(related_path)s\">Bewertung von <em>%(book.title)s</em></"
-"a> geteilt"
+msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book.title)s</em></a>"
+msgstr "hat deine <a href=\"%(related_path)s\">Bewertung von <em>%(book.title)s</em></a> geteilt"
 
 #: bookwyrm/templates/notifications.html:92
 #, python-format
-msgid ""
-"boosted your <a href=\"%(related_path)s\">comment on<em>%(book.title)s</em></"
-"a>"
-msgstr "hat deinen <a href=\"%(related_path)s\">Kommentar zu<em>%(book.title)s</em></"
-"a> geteilt"
+msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book.title)s</em></a>"
+msgstr "hat deinen <a href=\"%(related_path)s\">Kommentar zu<em>%(book.title)s</em></a> geteilt"
 
 #: bookwyrm/templates/notifications.html:94
 #, python-format
-msgid ""
-"boosted your <a href=\"%(related_path)s\">quote from <em>%(book.title)s</"
-"em></a>"
-msgstr "hat dein <a href=\"%(related_path)s\">Zitat aus <em>%(book.title)s</"
-"em></a> geteilt"
+msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book.title)s</em></a>"
+msgstr "hat dein <a href=\"%(related_path)s\">Zitat aus <em>%(book.title)s</em></a> geteilt"
 
 #: bookwyrm/templates/notifications.html:96
 #, python-format
@@ -883,16 +969,12 @@ msgstr "hat deinen <a href=\"%(related_path)s\">Status</a> geteilt"
 
 #: bookwyrm/templates/notifications.html:100
 #, python-format
-msgid ""
-" added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
-"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 msgstr "hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> zu deiner Liste \"<a href=\"%(list_path)s\">%(list_name)s</a>\" Hinzugefügt"
 
 #: bookwyrm/templates/notifications.html:102
 #, python-format
-msgid ""
-" suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to "
-"your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 msgstr "hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> für deine Liste \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\" vorgeschlagen"
 
 #: bookwyrm/templates/notifications.html:106
@@ -1253,9 +1335,7 @@ msgstr "Diese Lesedaten löschen?"
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
 #, python-format
-msgid ""
-"You are deleting this readthrough and its %(count)s associated progress "
-"updates."
+msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr "Du löscht diesen Leseforschritt und %(count)s zugehörige Fortschrittsupdates."
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
@@ -1308,11 +1388,8 @@ msgstr "Nachricht verwerfen"
 
 #: bookwyrm/templates/snippets/goal_card.html:22
 #, python-format
-msgid ""
-"You can set or change your reading goal any time from your <a href=\"%(path)s"
-"\">profile page</a>"
-msgstr "Du kannst dein Leseziel jederzeit auf deiner <a href=\"%(path)s"
-"\">Profilseite</a> setzen oder ändern."
+msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
+msgstr "Du kannst dein Leseziel jederzeit auf deiner <a href=\"%(path)s\">Profilseite</a> setzen oder ändern."
 
 #: bookwyrm/templates/snippets/goal_form.html:9
 msgid "Reading goal:"
@@ -1348,17 +1425,13 @@ msgstr "%(percent)s%% komplett!"
 
 #: bookwyrm/templates/snippets/goal_progress.html:10
 #, python-format
-msgid ""
-"You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgid "You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
 msgstr "Du hast <a href=\"%(path)s\">%(read_count)s von %(goal_count)s Büchern</a> gelesen."
 
 #: bookwyrm/templates/snippets/goal_progress.html:12
 #, python-format
-msgid ""
-"%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s "
-"books</a>."
-msgstr "%(username)s hat <a href=\"%(path)s\">%(read_count)s von %(goal_count)s "
-"Büchern</a> gelesen."
+msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgstr "%(username)s hat <a href=\"%(path)s\">%(read_count)s von %(goal_count)s Büchern</a> gelesen."
 
 #: bookwyrm/templates/snippets/pagination.html:7
 msgid "Previous"
@@ -1546,10 +1619,6 @@ msgstr "Mehr Regale"
 msgid "Start reading"
 msgstr "Zu lesen beginnen"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-msgid "Read"
-msgstr "Lesen"
-
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
 msgid "Finish reading"
 msgstr "Lesen beenden"
@@ -1599,7 +1668,9 @@ msgid "More options"
 msgstr "Mehr Optionen"
 
 #: bookwyrm/templates/snippets/status/status_options.html:17
-msgid "Delete post"
+#, fuzzy
+#| msgid "Delete post"
+msgid "Delete status"
 msgstr "Post löschen"
 
 #: bookwyrm/templates/snippets/status/status_options.html:23
@@ -1621,12 +1692,10 @@ msgid "Books tagged \"%(tag.name)s\""
 msgstr "Mit \"%(tag.name)s\" markierte Bücher"
 
 #: bookwyrm/templates/user/create_shelf_form.html:5
-msgid "Create New Shelf"
-msgstr "Neues Regal erstellen"
-
 #: bookwyrm/templates/user/create_shelf_form.html:22
-#: bookwyrm/templates/user/shelf.html:33
-msgid "Create shelf"
+#, fuzzy
+#| msgid "Create shelf"
+msgid "Create Shelf"
 msgstr "Regal erstellen"
 
 #: bookwyrm/templates/user/edit_shelf_form.html:5
@@ -1665,11 +1734,7 @@ msgstr "Deine Listen"
 msgid "Lists: %(username)s"
 msgstr "Listen: %(username)s"
 
-#: bookwyrm/templates/user/lists.html:17
-msgid "Create new list"
-msgstr "Neue Liste erstellen"
-
-#: bookwyrm/templates/user/lists.html:29
+#: bookwyrm/templates/user/lists.html:17 bookwyrm/templates/user/lists.html:29
 msgid "Create list"
 msgstr "Liste Erstellen"
 
@@ -1682,6 +1747,10 @@ msgstr "Deine Regale"
 msgid "%(username)s: Shelves"
 msgstr "%(username)s: Regale"
 
+#: bookwyrm/templates/user/shelf.html:33
+msgid "Create shelf"
+msgstr "Regal erstellen"
+
 #: bookwyrm/templates/user/shelf.html:54
 msgid "Edit shelf"
 msgstr "Regal bearbeiten"
@@ -1750,3 +1819,12 @@ msgstr[1] "%(counter)s Folgende"
 #, python-format
 msgid "%(counter)s following"
 msgstr "%(counter)s folgen"
+
+#~ msgid "Added by"
+#~ msgstr "Hinzugefügt von"
+
+#~ msgid "Create New Shelf"
+#~ msgstr "Neues Regal erstellen"
+
+#~ msgid "Create new list"
+#~ msgstr "Neue Liste erstellen"
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index 25d38437..33494e07 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-02 19:51+0000\n"
+"POT-Creation-Date: 2021-03-02 21:36+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"
@@ -66,10 +66,14 @@ msgid "English"
 msgstr ""
 
 #: bookwyrm/settings.py:143
-msgid "French"
+msgid "German"
 msgstr ""
 
 #: bookwyrm/settings.py:144
+msgid "French"
+msgstr ""
+
+#: bookwyrm/settings.py:145
 msgid "Simplified Chinese"
 msgstr ""
 
diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 263de6d1..9288363b 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-02 19:51+0000\n"
+"POT-Creation-Date: 2021-03-02 21:36+0000\n"
 "PO-Revision-Date: 2021-03-02 12:37+0100\n"
 "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -70,10 +70,14 @@ msgid "English"
 msgstr ""
 
 #: bookwyrm/settings.py:143
-msgid "French"
+msgid "German"
 msgstr ""
 
 #: bookwyrm/settings.py:144
+msgid "French"
+msgstr ""
+
+#: bookwyrm/settings.py:145
 msgid "Simplified Chinese"
 msgstr ""
 
diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index 0f51c6c3..a7b0869e 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-02 19:51+0000\n"
+"POT-Creation-Date: 2021-03-02 21:36+0000\n"
 "PO-Revision-Date: 2021-03-02 10:35+0000\n"
 "Last-Translator: Kana <gudzpoz@live.com>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -70,10 +70,14 @@ msgid "English"
 msgstr ""
 
 #: bookwyrm/settings.py:143
-msgid "French"
+msgid "German"
 msgstr ""
 
 #: bookwyrm/settings.py:144
+msgid "French"
+msgstr ""
+
+#: bookwyrm/settings.py:145
 msgid "Simplified Chinese"
 msgstr ""
 

From df196c787594e5d57e29a14646f152923484cf10 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 2 Mar 2021 13:51:56 -0800
Subject: [PATCH 0159/1285] Adds compiled german language file

---
 locale/de_DE/LC_MESSAGES/django.mo | Bin 0 -> 23092 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 locale/de_DE/LC_MESSAGES/django.mo

diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..ebd743358d676536065661036acf2b1a4aff20f9
GIT binary patch
literal 23092
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
G68{@WtnFU_

literal 0
HcmV?d00001


From be3c7ac90e09c61eb98fa991b5f942561eb8c936 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 2 Mar 2021 20:17:32 -0800
Subject: [PATCH 0160/1285] Fixes boost display

---
 bookwyrm/templates/snippets/status/status.html         | 2 +-
 bookwyrm/templates/snippets/status/status_content.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/snippets/status/status.html b/bookwyrm/templates/snippets/status/status.html
index b8925f18..e9ef1380 100644
--- a/bookwyrm/templates/snippets/status/status.html
+++ b/bookwyrm/templates/snippets/status/status.html
@@ -1,7 +1,7 @@
 {% load bookwyrm_tags %}
 {% load i18n %}
 {% if not status.deleted %}
-    {% if status.status_type == 'Boost' %}
+    {% if status.status_type == 'Announce' %}
         {% include 'snippets/avatar.html' with user=status.user %}
         {% include 'snippets/username.html' with user=status.user %}
         {% trans "boosted" %}
diff --git a/bookwyrm/templates/snippets/status/status_content.html b/bookwyrm/templates/snippets/status/status_content.html
index bdbf3cfc..d16c6922 100644
--- a/bookwyrm/templates/snippets/status/status_content.html
+++ b/bookwyrm/templates/snippets/status/status_content.html
@@ -32,7 +32,7 @@
         </div>
         {% endif %}
 
-        {% if status.content and status.status_type != 'GeneratedNote' and status.status_type != 'Boost' %}
+        {% if status.content and status.status_type != 'GeneratedNote' and status.status_type != 'Announce' %}
         {% include 'snippets/trimmed_text.html' with full=status.content|safe %}
         {% endif %}
         {% if status.attachments %}

From 3ee12345ec5db6ef847e219c2b77e322d6ff4e73 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 2 Mar 2021 20:19:50 -0800
Subject: [PATCH 0161/1285] Fixes boost notification

---
 bookwyrm/models/status.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index ba9727f5..6bcd5d93 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -294,14 +294,16 @@ class Boost(ActivityMixin, Status):
         if not self.boosted_status.user.local:
             return
 
-        notification_model = apps.get_model(
-            'bookwyrm.Notification', require_ready=True)
-        notification_model.objects.create(
-            user=self.boosted_status.user,
-            related_status=self.boosted_status,
-            related_user=self.user,
-            notification_type='BOOST',
-        )
+        if self.boosted_status.user.local and \
+                self.boosted_status.user != self.user:
+            notification_model = apps.get_model(
+                'bookwyrm.Notification', require_ready=True)
+            notification_model.objects.create(
+                user=self.boosted_status.user,
+                related_status=self.boosted_status,
+                related_user=self.user,
+                notification_type='BOOST',
+            )
 
     def delete(self, *args, **kwargs):
         ''' delete and un-notify '''

From 51cf580813894213f55f404297bfc260120c2550 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 2 Mar 2021 20:24:51 -0800
Subject: [PATCH 0162/1285] Revert "Fixes boost notification"

This reverts commit 3ee12345ec5db6ef847e219c2b77e322d6ff4e73.
---
 bookwyrm/models/status.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index 6bcd5d93..ba9727f5 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -294,16 +294,14 @@ class Boost(ActivityMixin, Status):
         if not self.boosted_status.user.local:
             return
 
-        if self.boosted_status.user.local and \
-                self.boosted_status.user != self.user:
-            notification_model = apps.get_model(
-                'bookwyrm.Notification', require_ready=True)
-            notification_model.objects.create(
-                user=self.boosted_status.user,
-                related_status=self.boosted_status,
-                related_user=self.user,
-                notification_type='BOOST',
-            )
+        notification_model = apps.get_model(
+            'bookwyrm.Notification', require_ready=True)
+        notification_model.objects.create(
+            user=self.boosted_status.user,
+            related_status=self.boosted_status,
+            related_user=self.user,
+            notification_type='BOOST',
+        )
 
     def delete(self, *args, **kwargs):
         ''' delete and un-notify '''

From 714e1f3809a667d2ae2dca6ae7d557073f9e56c3 Mon Sep 17 00:00:00 2001
From: erion <robjoy88@gmail.com>
Date: Wed, 3 Mar 2021 12:11:28 +0100
Subject: [PATCH 0163/1285] Reduce Dockerfile size and the number of RUN steps.

---
 Dockerfile | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 99d2671c..0f10015c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,15 +2,12 @@ FROM python:3.9
 
 ENV PYTHONUNBUFFERED 1
 
-RUN mkdir /app
-RUN mkdir /app/static
-RUN mkdir /app/images
+RUN mkdir /app /app/static /app/images
 
 WORKDIR /app
 
 COPY requirements.txt /app/
-RUN pip install -r requirements.txt
-RUN apt-get update && apt-get install -y gettext libgettextpo-dev
+RUN pip install -r requirements.txt --no-cache-dir
+RUN apt-get update && apt-get install -y gettext libgettextpo-dev && apt-get clean
 
-COPY ./bookwyrm /app
-COPY ./celerywyrm /app
+COPY ./bookwyrm ./celerywyrm /app/

From 0d8eb959ea6a68c7db88f729747a9e413525e8a8 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Wed, 3 Mar 2021 15:48:04 +0100
Subject: [PATCH 0164/1285] [profile] Use unique IDs on statuses.

---
 bookwyrm/templates/user/user.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index 5dd24cae..cefaab99 100644
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -67,7 +67,7 @@
         </div>
     </div>
     {% for activity in activities %}
-    <div class="block" id="feed">
+    <div class="block" id="feed-{{ activity.id }}">
         {% include 'snippets/status/status.html' with status=activity %}
     </div>
     {% endfor %}

From a05b14c338aeab3471f0416d5d5ee793c26f7067 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Wed, 3 Mar 2021 20:10:09 +0100
Subject: [PATCH 0165/1285] [profile] Various HTML fixes:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Wrap block level elements within block level elements, not inline.
- Avoid empty blocks.
- Change `<hr>` in lists into allowed type of children.
- Fix duplicated ID (some change that was not propagated across the template?).
- Make the anchor optional in the navbar (interactive elements (`a`, `input`, `button`…) should not appear into other interactive elements).
- Remove redundant `role` on main navigation.
- Make the modal a modal with `role="dialog".
- Use `button` instead of form-less `label`.
---
 bookwyrm/templates/components/dropdown.html   |  2 +-
 bookwyrm/templates/components/modal.html      | 11 ++++++---
 bookwyrm/templates/layout.html                | 22 +++++++++++------
 .../templates/snippets/shelf_selector.html    |  2 +-
 .../snippets/status/status_content.html       |  8 ++++---
 bookwyrm/templates/snippets/trimmed_text.html | 24 +++++++++++++------
 bookwyrm/templates/snippets/username.html     | 15 +++++++++++-
 7 files changed, 61 insertions(+), 23 deletions(-)

diff --git a/bookwyrm/templates/components/dropdown.html b/bookwyrm/templates/components/dropdown.html
index 1e45fe51..72582ddc 100644
--- a/bookwyrm/templates/components/dropdown.html
+++ b/bookwyrm/templates/components/dropdown.html
@@ -5,7 +5,7 @@
         {% block dropdown-trigger %}{% endblock %}
     </button>
     <div class="dropdown-menu">
-        <ul class="dropdown-content" role="menu" id="menu-options-{{ book.id }}">
+        <ul class="dropdown-content" role="menu" id="menu-options-{{ uuid }}">
             {% block dropdown-list %}{% endblock %}
         </ul>
     </div>
diff --git a/bookwyrm/templates/components/modal.html b/bookwyrm/templates/components/modal.html
index 554f9ccd..1110a8ee 100644
--- a/bookwyrm/templates/components/modal.html
+++ b/bookwyrm/templates/components/modal.html
@@ -1,8 +1,13 @@
-<div class="modal hidden" id="{{ controls_text }}-{{ controls_uid }}">
+<div
+    role="dialog"
+    class="modal hidden"
+    id="{{ controls_text }}-{{ controls_uid }}"
+    aria-labelledby="modal-card-title-{{ controls_uid }}"
+>
     <div class="modal-background"></div>
     <div class="modal-card">
         <header class="modal-card-head" tabindex="0" id="modal-title-{{ controls_text }}-{{ controls_uid }}">
-            <h2 class="modal-card-title">
+            <h2 class="modal-card-title" id="modal-card-title-{{ controls_uid }}">
                 {% block modal-title %}{% endblock %}
             </h2>
             {% include 'snippets/toggle/toggle_button.html' with label="close" class="delete" nonbutton=True %}
@@ -18,7 +23,7 @@
         </footer>
         {% block modal-form-close %}{% endblock %}
     </div>
-    <label class="modal-close is-large" for="{{ controls_text }}-{{ controls_uid }}" aria-label="close"></label>
+    <button class="modal-close is-large" aria-label="close"></button>
     {% include 'snippets/toggle/toggle_button.html' with label="close" class="modal-close is-large" nonbutton=True %}
 </div>
 
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index bc2e7e09..6e445889 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -22,7 +22,7 @@
     <meta name="twitter:image:alt" content="BookWyrm Logo">
 </head>
 <body>
-<nav class="navbar container" role="navigation" aria-label="main navigation">
+<nav class="navbar container" aria-label="main navigation">
     <div class="navbar-brand">
         <a class="navbar-item" href="/">
             <img class="image logo" src="{% if site.logo_small %}/images/{{ site.logo_small }}{% else %}/static/images/logo-small.png{% endif %}" alt="Home page">
@@ -67,12 +67,20 @@
         </div>
 
         <div class="navbar-end">
-	    {% if request.user.is_authenticated %}
+        {% if request.user.is_authenticated %}
             <div class="navbar-item has-dropdown is-hoverable">
-                <div class="navbar-link pulldown-menu" role="button" aria-expanded="false" tabindex="0" aria-haspopup="true" aria-controls="navbar-dropdown"><p>
+                <a
+                    href="{{ user.local_path }}"
+                    class="navbar-link pulldown-menu"
+                    role="button"
+                    aria-expanded="false"
+                    tabindex="0"
+                    aria-haspopup="true"
+                    aria-controls="navbar-dropdown"
+                >
                     {% include 'snippets/avatar.html' with user=request.user %}
-                    {% include 'snippets/username.html' with user=request.user %}
-                </p></div>
+                    {% include 'snippets/username.html' with user=request.user anchor=false %}
+                </a>
                 <ul class="navbar-dropdown" id="navbar-dropdown">
                     <li>
                         <a href="/direct-messages" class="navbar-item">
@@ -95,7 +103,7 @@
                         </a>
                     </li>
                     {% if perms.bookwyrm.create_invites or perms.bookwyrm.edit_instance_settings%}
-                    <hr class="navbar-divider">
+                    <li class="navbar-divider" role="presentation"></li>
                     {% endif %}
                     {% if perms.bookwyrm.create_invites %}
                     <li>
@@ -111,7 +119,7 @@
                         </a>
                     </li>
                     {% endif %}
-                    <hr class="navbar-divider">
+                    <li class="navbar-divider" role="presentation"></li>
                     <li>
                         <a href="/logout" class="navbar-item">
                             {% trans 'Log out' %}
diff --git a/bookwyrm/templates/snippets/shelf_selector.html b/bookwyrm/templates/snippets/shelf_selector.html
index 687f7a56..4f736c0e 100644
--- a/bookwyrm/templates/snippets/shelf_selector.html
+++ b/bookwyrm/templates/snippets/shelf_selector.html
@@ -18,7 +18,7 @@
 </li>
 {% endif %}
 {% endfor %}
-<hr class="navbar-divider">
+<li class="navbar-divider" role="presentation"></li>
 <li>
     <form class="dropdown-item pt-0 pb-0" name="shelve" action="/unshelve/" method="post">
         {% csrf_token %}
diff --git a/bookwyrm/templates/snippets/status/status_content.html b/bookwyrm/templates/snippets/status/status_content.html
index bdbf3cfc..521227b8 100644
--- a/bookwyrm/templates/snippets/status/status_content.html
+++ b/bookwyrm/templates/snippets/status/status_content.html
@@ -3,10 +3,12 @@
 <div class="block">
     {% if status.status_type == 'Review' %}
     <div>
+        {% if status.name %}
         <h3 class="title is-5 has-subtitle">
-            {% if status.name %}<span dir="auto">{{ status.name }}</span><br>{% endif %}
+            {{ status.name | escape }}
         </h3>
-        <p class="subtitle">{% include 'snippets/stars.html' with rating=status.rating %}</p>
+        {% endif %}
+        {% include 'snippets/stars.html' with rating=status.rating %}
     </div>
     {% endif %}
 
@@ -35,7 +37,7 @@
         {% if status.content and status.status_type != 'GeneratedNote' and status.status_type != 'Boost' %}
         {% include 'snippets/trimmed_text.html' with full=status.content|safe %}
         {% endif %}
-        {% if status.attachments %}
+        {% if status.attachments.all %}
         <div class="block">
             <div class="columns">
                 {% for attachment in status.attachments.all %}
diff --git a/bookwyrm/templates/snippets/trimmed_text.html b/bookwyrm/templates/snippets/trimmed_text.html
index 339ef11f..4ec92bd6 100644
--- a/bookwyrm/templates/snippets/trimmed_text.html
+++ b/bookwyrm/templates/snippets/trimmed_text.html
@@ -8,19 +8,29 @@
 {% with full|to_markdown|safe|truncatewords_html:60 as trimmed %}
 {% if trimmed != full %}
 <div id="hide-full-{{ uuid }}">
-    <div class="content" id="trimmed-{{ uuid }}"><span dir="auto">{{ trimmed }}</span>
-        {% trans "Show more" as button_text %}
-        {% include 'snippets/toggle/open_button.html' with text=button_text controls_text="full" controls_uid=uuid class="is-small" %}
+    <div class="content" id="trimmed-{{ uuid }}">
+        <p dir="auto">{{ trimmed }}</p>
+
+        <div>
+            {% trans "Show more" as button_text %}
+            {% include 'snippets/toggle/open_button.html' with text=button_text controls_text="full" controls_uid=uuid class="is-small" %}
+        </div>
     </div>
 </div>
 <div id="full-{{ uuid }}" class="hidden">
-    <div class="content"><span dir="auto">{{ full }}</span>
-        {% trans "Show less" as button_text %}
-        {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="full" controls_uid=uuid class="is-small" %}
+    <div class="content">
+        <div dir="auto">{{ full }}</div>
+
+        <div>
+            {% trans "Show less" as button_text %}
+            {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="full" controls_uid=uuid class="is-small" %}
+        </div>
     </div>
 </div>
 {% else %}
-<div class="content"><span dir="auto">{{ full }}</span></div>
+<div class="content">
+    <div dir="auto">{{ full }}</div>
+</div>
 {% endif %}
 {% endwith %}
 
diff --git a/bookwyrm/templates/snippets/username.html b/bookwyrm/templates/snippets/username.html
index a6f4b2b0..5fc08653 100644
--- a/bookwyrm/templates/snippets/username.html
+++ b/bookwyrm/templates/snippets/username.html
@@ -1,2 +1,15 @@
+{% spaceless %}
 {% load bookwyrm_tags %}
-<a href="{{ user.local_path }}" class="user">{% if user.name %}{{ user.name }}{% else %}{{ user | username }}{% endif %}</a>{% if possessive %}'s{% endif %}{% if show_full and user.name or show_full and user.localname %} ({{ user.username }}){% endif %}
+
+
+<{% if anchor %}a href="{{ user.local_path }}"{% else %}span{% endif %} class="user"
+>
+    {{ user.name|default:user|username }}
+</a>
+
+{% if possessive %}'s{% endif %}
+
+{% if show_full and user.name or show_full and user.localname %}
+ ({{ user.username }})
+{% endif %}
+{% endspaceless %}
\ No newline at end of file

From 7151aeedd632fd4b9fc063262ba536c7fbc50ef7 Mon Sep 17 00:00:00 2001
From: tofuwabohu <mail@lapete.de>
Date: Wed, 3 Mar 2021 22:54:22 +0100
Subject: [PATCH 0166/1285] New strings and some fixes

---
 locale/de_DE/LC_MESSAGES/django.po | 44 +++++++++++++++---------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index e4553211..a8bd5788 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -20,24 +20,24 @@ msgstr ""
 
 #: bookwyrm/forms.py:185
 msgid "One Day"
-msgstr ""
+msgstr "Ein Tag"
 
 #: bookwyrm/forms.py:186
 msgid "One Week"
-msgstr ""
+msgstr "Eine Woche"
 
 #: bookwyrm/forms.py:187
 msgid "One Month"
-msgstr ""
+msgstr "Ein Monat"
 
 #: bookwyrm/forms.py:188
 msgid "Does Not Expire"
-msgstr ""
+msgstr "Läuft nicht aus"
 
 #: bookwyrm/forms.py:190
 #, python-format
 msgid "%(count)d uses"
-msgstr ""
+msgstr "%(count)d Benutzungen"
 
 #: bookwyrm/forms.py:192
 #, fuzzy
@@ -48,12 +48,12 @@ msgstr "Ungelistet"
 #: bookwyrm/models/fields.py:24
 #, python-format
 msgid "%(value)s is not a valid remote_id"
-msgstr ""
+msgstr "%(value)s ist keine gültige remote_id"
 
 #: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
 #, python-format
 msgid "%(value)s is not a valid username"
-msgstr ""
+msgstr "%(value)s ist kein gültiger Username"
 
 #: bookwyrm/models/fields.py:164
 #, fuzzy
@@ -63,23 +63,23 @@ msgstr "Servername"
 
 #: bookwyrm/models/fields.py:169
 msgid "A user with that username already exists."
-msgstr ""
+msgstr "Dieser Benutzename ist bereits vergeben."
 
 #: bookwyrm/settings.py:142
 msgid "English"
-msgstr ""
+msgstr "Englisch"
 
 #: bookwyrm/settings.py:143
 msgid "German"
-msgstr ""
+msgstr "Deutsch"
 
 #: bookwyrm/settings.py:144
 msgid "French"
-msgstr ""
+msgstr "Französisch"
 
 #: bookwyrm/settings.py:145
 msgid "Simplified Chinese"
-msgstr ""
+msgstr "Vereinfachtes Chinesisch"
 
 #: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
 #: bookwyrm/templates/edit_author.html:5
@@ -97,7 +97,7 @@ msgstr "Bücher von %(name)s"
 
 #: bookwyrm/templates/book.html:21
 msgid "by"
-msgstr ""
+msgstr "von"
 
 #: bookwyrm/templates/book.html:29 bookwyrm/templates/book.html:30
 #: bookwyrm/templates/edit_book.html:5
@@ -144,8 +144,8 @@ msgstr "In OpenLibrary ansehen"
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "(%(review_count)s Bewertung)"
+msgstr[1] "(%(review_count)s Bewertungen)"
 
 #: bookwyrm/templates/book.html:106
 msgid "Add Description"
@@ -257,7 +257,7 @@ msgstr ""
 #: bookwyrm/templates/discover/about.html:13
 #: bookwyrm/templates/discover/about.html:29
 msgid "Privacy Policy"
-msgstr ""
+msgstr "Datenschutzerklärung"
 
 #: bookwyrm/templates/discover/discover.html:6
 msgid "Recent Books"
@@ -482,20 +482,20 @@ msgstr "Hier sind noch keine Bücher! Versuche nach Büchern zu suchen um loszul
 #, fuzzy
 #| msgid "Read"
 msgid "To Read"
-msgstr "Lesen"
+msgstr "Auf der Leseliste"
 
 #: bookwyrm/templates/feed/feed_layout.html:24
 #: bookwyrm/templates/user/shelf.html:24
 #, fuzzy
 #| msgid "Start reading"
 msgid "Currently Reading"
-msgstr "Zu lesen beginnen"
+msgstr "Gerade lesend"
 
 #: bookwyrm/templates/feed/feed_layout.html:25
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
 #: bookwyrm/templates/user/shelf.html:24
 msgid "Read"
-msgstr "Lesen"
+msgstr "Gelesen"
 
 #: bookwyrm/templates/feed/feed_layout.html:76 bookwyrm/templates/goal.html:26
 #: bookwyrm/templates/snippets/goal_card.html:6
@@ -1268,7 +1268,7 @@ msgstr ""
 #: bookwyrm/templates/snippets/book_titleby.html:3
 #, python-format
 msgid "<a href=\"%(path)s\">%(title)s</a> by "
-msgstr "<a href=\"%(path)s\">%(title)s</a> von"
+msgstr "<a href=\"%(path)s\">%(title)s</a> von "
 
 #: bookwyrm/templates/snippets/boost_button.html:8
 #: bookwyrm/templates/snippets/boost_button.html:9
@@ -1312,7 +1312,7 @@ msgstr ""
 #: bookwyrm/templates/snippets/rate_action.html:14
 #: bookwyrm/templates/snippets/stars.html:3
 msgid "No rating"
-msgstr ""
+msgstr "Kein Rating"
 
 #: bookwyrm/templates/snippets/create_status_form.html:54
 msgid "Include spoiler alert"
@@ -1327,7 +1327,7 @@ msgstr "Privat"
 
 #: bookwyrm/templates/snippets/create_status_form.html:67
 msgid "Post"
-msgstr ""
+msgstr "Absenden"
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:4
 msgid "Delete these read dates?"

From 8c26d8a51427cd7d84317c79d9ba3a6ac18c5323 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Wed, 3 Mar 2021 22:58:01 +0100
Subject: [PATCH 0167/1285] [profile] Updates for PR:

- Fix duplicated IDs between modals for the same status.
- Remove redundant button (https://github.com/mouse-reeve/bookwyrm/pull/680#discussion_r586743844).
- Remove redundant `role="navigation"` on `<nav>`.
- Add `dir="auto"` back for titles (https://github.com/mouse-reeve/bookwyrm/pull/680#discussion_r586715693).
- Use `exists` instead of `all` for conditional statement (https://github.com/mouse-reeve/bookwyrm/pull/680#discussion_r586716299).
- Fix missing spacing between avatar and username (https://github.com/mouse-reeve/bookwyrm/pull/680#discussion_r586740902).
---
 bookwyrm/templates/components/modal.html               | 5 ++---
 bookwyrm/templates/snippets/pagination.html            | 2 +-
 bookwyrm/templates/snippets/status/status_content.html | 6 +++---
 bookwyrm/templates/snippets/username.html              | 4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/templates/components/modal.html b/bookwyrm/templates/components/modal.html
index 1110a8ee..18b69b25 100644
--- a/bookwyrm/templates/components/modal.html
+++ b/bookwyrm/templates/components/modal.html
@@ -2,12 +2,12 @@
     role="dialog"
     class="modal hidden"
     id="{{ controls_text }}-{{ controls_uid }}"
-    aria-labelledby="modal-card-title-{{ controls_uid }}"
+    aria-labelledby="modal-card-title-{{ controls_text }}-{{ controls_uid }}"
 >
     <div class="modal-background"></div>
     <div class="modal-card">
         <header class="modal-card-head" tabindex="0" id="modal-title-{{ controls_text }}-{{ controls_uid }}">
-            <h2 class="modal-card-title" id="modal-card-title-{{ controls_uid }}">
+            <h2 class="modal-card-title" id="modal-card-title-{{ controls_text }}-{{ controls_uid }}">
                 {% block modal-title %}{% endblock %}
             </h2>
             {% include 'snippets/toggle/toggle_button.html' with label="close" class="delete" nonbutton=True %}
@@ -23,7 +23,6 @@
         </footer>
         {% block modal-form-close %}{% endblock %}
     </div>
-    <button class="modal-close is-large" aria-label="close"></button>
     {% include 'snippets/toggle/toggle_button.html' with label="close" class="modal-close is-large" nonbutton=True %}
 </div>
 
diff --git a/bookwyrm/templates/snippets/pagination.html b/bookwyrm/templates/snippets/pagination.html
index c9c73ac3..2ac10557 100644
--- a/bookwyrm/templates/snippets/pagination.html
+++ b/bookwyrm/templates/snippets/pagination.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-<nav class="pagination" role="navigation" aria-label="pagination">
+<nav class="pagination" aria-label="pagination">
     {% if page.has_previous %}
     <p class="pagination-previous">
         <a href="{{ path }}?page={{ page.previous_page_number }}{{ anchor }}">
diff --git a/bookwyrm/templates/snippets/status/status_content.html b/bookwyrm/templates/snippets/status/status_content.html
index 521227b8..e1e23d0e 100644
--- a/bookwyrm/templates/snippets/status/status_content.html
+++ b/bookwyrm/templates/snippets/status/status_content.html
@@ -4,8 +4,8 @@
     {% if status.status_type == 'Review' %}
     <div>
         {% if status.name %}
-        <h3 class="title is-5 has-subtitle">
-            {{ status.name | escape }}
+        <h3 class="title is-5 has-subtitle" dir="auto">
+            {{ status.name|escape }}
         </h3>
         {% endif %}
         {% include 'snippets/stars.html' with rating=status.rating %}
@@ -37,7 +37,7 @@
         {% if status.content and status.status_type != 'GeneratedNote' and status.status_type != 'Boost' %}
         {% include 'snippets/trimmed_text.html' with full=status.content|safe %}
         {% endif %}
-        {% if status.attachments.all %}
+        {% if status.attachments.exists %}
         <div class="block">
             <div class="columns">
                 {% for attachment in status.attachments.all %}
diff --git a/bookwyrm/templates/snippets/username.html b/bookwyrm/templates/snippets/username.html
index 5fc08653..e18ba1f8 100644
--- a/bookwyrm/templates/snippets/username.html
+++ b/bookwyrm/templates/snippets/username.html
@@ -1,8 +1,8 @@
 {% spaceless %}
 {% load bookwyrm_tags %}
 
-
-<{% if anchor %}a href="{{ user.local_path }}"{% else %}span{% endif %} class="user"
+<{% if anchor %}a href="{{ user.local_path }}"{% else %}span{% endif %}
+    class="user ml-1"
 >
     {{ user.name|default:user|username }}
 </a>

From 8946f89565e1617cefdd0fd602a9051120502abe Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 3 Mar 2021 15:17:22 -0800
Subject: [PATCH 0168/1285] Compiles german locale

---
 locale/de_DE/LC_MESSAGES/django.mo | Bin 23092 -> 24083 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo
index ebd743358d676536065661036acf2b1a4aff20f9..1be5cbcb284088a18da6e09eb8b6c090471d7194 100644
GIT binary patch
delta 8137
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

delta 7207
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


From a098313336c929d0fd5b8b91f7fdbd09e85afb8e Mon Sep 17 00:00:00 2001
From: reese <reesedporter@gmail.com>
Date: Wed, 3 Mar 2021 20:08:19 -0600
Subject: [PATCH 0169/1285] add spanish translations

---
 locale/es/LC_MESSAGES/django.mo |  Bin 0 -> 25533 bytes
 locale/es/LC_MESSAGES/django.po | 1778 +++++++++++++++++++++++++++++++
 2 files changed, 1778 insertions(+)
 create mode 100644 locale/es/LC_MESSAGES/django.mo
 create mode 100644 locale/es/LC_MESSAGES/django.po

diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000000000000000000000000000000000..31994622a4e68a39c42cfc8509a8a476ebf188ab
GIT binary patch
literal 25533
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

literal 0
HcmV?d00001

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
new file mode 100644
index 00000000..9eb7ad31
--- /dev/null
+++ b/locale/es/LC_MESSAGES/django.po
@@ -0,0 +1,1778 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-03-02 00:24+0000\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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
+#: bookwyrm/templates/edit_author.html:5
+msgid "Edit Author"
+msgstr "Editar Autor/Autora"
+
+#: bookwyrm/templates/author.html:32
+msgid "Wikipedia"
+msgstr "Wikipedia"
+
+#: bookwyrm/templates/author.html:37
+#, python-format
+msgid "Books by %(name)s"
+msgstr "Libros de %(name)s"
+
+#: bookwyrm/templates/book.html:29 bookwyrm/templates/book.html:30
+#: bookwyrm/templates/edit_book.html:5
+msgid "Edit Book"
+msgstr "Editar Libro"
+
+#: bookwyrm/templates/book.html:45
+msgid "Add cover"
+msgstr "Agregar portada"
+
+#: bookwyrm/templates/book.html:51 bookwyrm/templates/lists/list.html:89
+msgid "Add"
+msgstr "Agregar"
+
+#: bookwyrm/templates/book.html:60
+msgid "ISBN:"
+msgstr "ISBN:"
+
+#: bookwyrm/templates/book.html:67 bookwyrm/templates/edit_book.html:107
+msgid "OCLC Number:"
+msgstr "Número OCLC:"
+
+#: bookwyrm/templates/book.html:74 bookwyrm/templates/edit_book.html:111
+msgid "ASIN:"
+msgstr "ASIN:"
+
+#: bookwyrm/templates/book.html:86
+msgid "View on OpenLibrary"
+msgstr "Ver en OpenLibrary"
+
+#: bookwyrm/templates/book.html:98
+msgid "Add Description"
+msgstr "Agregar descripción"
+
+#: bookwyrm/templates/book.html:105 bookwyrm/templates/edit_book.html:39
+#: bookwyrm/templates/lists/form.html:12
+msgid "Description:"
+msgstr "Descripción:"
+
+#: bookwyrm/templates/book.html:109 bookwyrm/templates/edit_author.html:78
+#: bookwyrm/templates/edit_book.html:120 bookwyrm/templates/lists/form.html:42
+#: bookwyrm/templates/preferences/edit_user.html:50
+#: bookwyrm/templates/settings/site.html:89
+#: bookwyrm/templates/snippets/progress_update.html:21
+#: bookwyrm/templates/snippets/readthrough.html:64
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
+msgid "Save"
+msgstr "Guardar"
+
+#: bookwyrm/templates/book.html:110 bookwyrm/templates/book.html:159
+#: bookwyrm/templates/edit_author.html:79 bookwyrm/templates/edit_book.html:121
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
+#: bookwyrm/templates/snippets/goal_form.html:32
+#: bookwyrm/templates/snippets/readthrough.html:65
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: bookwyrm/templates/book.html:142
+msgid "Your reading activity"
+msgstr "Tu actividad de lectura"
+
+#: bookwyrm/templates/book.html:144
+msgid "Add read dates"
+msgstr "Agregar fechas de lectura"
+
+#: bookwyrm/templates/book.html:149
+msgid "You don't have any reading activity for this book."
+msgstr "No tienes ninguna actividad de lectura para este libro."
+
+#: bookwyrm/templates/book.html:156
+msgid "Create"
+msgstr "Crear"
+
+#: bookwyrm/templates/book.html:178
+msgid "Tags"
+msgstr "Etiquetas"
+
+#: bookwyrm/templates/book.html:182 bookwyrm/templates/snippets/tag.html:18
+msgid "Add tag"
+msgstr "Agregar etiqueta"
+
+#: bookwyrm/templates/book.html:199
+msgid "Subjects"
+msgstr "Sujetos"
+
+#: bookwyrm/templates/book.html:210
+msgid "Places"
+msgstr "Lugares"
+
+#: bookwyrm/templates/book.html:221 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
+#: bookwyrm/templates/search_results.html:90
+#: bookwyrm/templates/user/user_layout.html:62
+msgid "Lists"
+msgstr "Listas"
+
+#: bookwyrm/templates/book.html:250
+msgid "rated it"
+msgstr "lo calificó con"
+
+#: bookwyrm/templates/components/inline_form.html:8
+#: bookwyrm/templates/feed/feed_layout.html:51
+msgid "Close"
+msgstr "Cerrar"
+
+#: bookwyrm/templates/discover/about.html:7
+#, python-format
+msgid "About %(site_name)s"
+msgstr "Sobre %(site_name)s"
+
+#: bookwyrm/templates/discover/about.html:10
+#: bookwyrm/templates/discover/about.html:20
+msgid "Code of Conduct"
+msgstr "Código de conducta"
+
+#: bookwyrm/templates/discover/about.html:13
+#: bookwyrm/templates/discover/about.html:29
+msgid "Privacy Policy"
+msgstr "Política de privacidad"
+
+#: bookwyrm/templates/discover/discover.html:6
+msgid "Recent Books"
+msgstr "Libros recientes"
+
+#: bookwyrm/templates/discover/landing_layout.html:5
+msgid "Welcome"
+msgstr "Bienvenidos"
+
+#: bookwyrm/templates/discover/landing_layout.html:17
+msgid "Decentralized"
+msgstr "Descentralizado"
+
+#: bookwyrm/templates/discover/landing_layout.html:23
+msgid "Friendly"
+msgstr "Amigable"
+
+#: bookwyrm/templates/discover/landing_layout.html:29
+msgid "Anti-Corporate"
+msgstr "Anti-corporativo"
+
+#: bookwyrm/templates/discover/landing_layout.html:44
+#, python-format
+msgid "Join %(name)s"
+msgstr "Unirse con %(name)s"
+
+#: bookwyrm/templates/discover/landing_layout.html:49
+#: bookwyrm/templates/login.html:48
+msgid "This instance is closed"
+msgstr "Esta instancia está cerrada."
+
+#: bookwyrm/templates/discover/landing_layout.html:55
+msgid "Your Account"
+msgstr "Tu cuenta"
+
+#: bookwyrm/templates/edit_author.html:13 bookwyrm/templates/edit_book.html:13
+msgid "Added:"
+msgstr "Agregado:"
+
+#: bookwyrm/templates/edit_author.html:14 bookwyrm/templates/edit_book.html:14
+msgid "Updated:"
+msgstr "Actualizado:"
+
+#: bookwyrm/templates/edit_author.html:15 bookwyrm/templates/edit_book.html:15
+msgid "Last edited by:"
+msgstr "Editado más recientemente por:"
+
+#: bookwyrm/templates/edit_author.html:31 bookwyrm/templates/edit_book.html:30
+msgid "Metadata"
+msgstr "Metadatos"
+
+#: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
+#: bookwyrm/templates/user/create_shelf_form.html:13
+#: bookwyrm/templates/user/edit_shelf_form.html:14
+msgid "Name:"
+msgstr "Nombre:"
+
+#: bookwyrm/templates/edit_author.html:37
+msgid "Bio:"
+msgstr "Bio:"
+
+#: bookwyrm/templates/edit_author.html:42
+msgid "Wikipedia link:"
+msgstr "Enlace de Wikipedia:"
+
+#: bookwyrm/templates/edit_author.html:47
+msgid "Birth date:"
+msgstr "Fecha de nacimiento:"
+
+#: bookwyrm/templates/edit_author.html:52
+msgid "Death date:"
+msgstr "Fecha de muerte:"
+
+#: bookwyrm/templates/edit_author.html:58
+msgid "Author Identifiers"
+msgstr "Identificadores de autor/autora"
+
+#: bookwyrm/templates/edit_author.html:59 bookwyrm/templates/edit_book.html:103
+msgid "Openlibrary key:"
+msgstr "Clave OpenLibrary:"
+
+#: bookwyrm/templates/edit_author.html:64
+msgid "Librarything key:"
+msgstr "Clave Librarything:"
+
+#: bookwyrm/templates/edit_author.html:69
+msgid "Goodreads key:"
+msgstr "Clave Goodreads:"
+
+#: bookwyrm/templates/edit_book.html:31
+msgid "Title:"
+msgstr "Título:"
+
+#: bookwyrm/templates/edit_book.html:35
+msgid "Subtitle:"
+msgstr "Subtítulo:"
+
+#: bookwyrm/templates/edit_book.html:43
+msgid "Series:"
+msgstr "Serie:"
+
+#: bookwyrm/templates/edit_book.html:47
+msgid "Series number:"
+msgstr "Número de serie:"
+
+#: bookwyrm/templates/edit_book.html:51
+msgid "First published date:"
+msgstr "Fecha de primera publicación:"
+
+#: bookwyrm/templates/edit_book.html:55
+msgid "Published date:"
+msgstr "Fecha de publicación:"
+
+#: bookwyrm/templates/edit_book.html:68
+#: bookwyrm/templates/snippets/shelf.html:9
+msgid "Cover"
+msgstr "Portada:"
+
+#: bookwyrm/templates/edit_book.html:78
+msgid "Physical Properties"
+msgstr "Propiedades físicas:"
+
+#: bookwyrm/templates/edit_book.html:79
+msgid "Format:"
+msgstr "Formato:"
+
+#: bookwyrm/templates/edit_book.html:87
+msgid "Pages:"
+msgstr "Páginas:"
+
+#: bookwyrm/templates/edit_book.html:94
+msgid "Book Identifiers"
+msgstr "Identificadores de libro"
+
+#: bookwyrm/templates/edit_book.html:95
+msgid "ISBN 13:"
+msgstr "ISBN 13:"
+
+#: bookwyrm/templates/edit_book.html:99
+msgid "ISBN 10:"
+msgstr "ISBN 10:"
+
+#: bookwyrm/templates/editions.html:5
+#, python-format
+msgid "Editions of %(book_title)s"
+msgstr "Ediciones de %(book_title)s"
+
+#: bookwyrm/templates/editions.html:9
+#, python-format
+msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+msgstr "Ediciones de <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+
+#: bookwyrm/templates/error.html:4
+msgid "Oops!"
+msgstr "¡Úps!"
+
+#: bookwyrm/templates/error.html:8
+msgid "Server Error"
+msgstr "Error de servidor"
+
+#: bookwyrm/templates/error.html:9
+msgid "Something went wrong! Sorry about that."
+msgstr "¡Algo salió mal! Disculpa."
+
+#: bookwyrm/templates/feed/direct_messages.html:8
+#, python-format
+msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+msgstr "Mensajes directos con <a href=\"%(path)s\">%(username)s</a>"
+
+#: bookwyrm/templates/feed/direct_messages.html:10
+#: bookwyrm/templates/layout.html:79
+msgid "Direct Messages"
+msgstr "Mensajes directos"
+
+#: bookwyrm/templates/feed/direct_messages.html:13
+msgid "All messages"
+msgstr "Todos los mensajes"
+
+#: bookwyrm/templates/feed/direct_messages.html:22
+msgid "You have no messages right now."
+msgstr "No tienes ningún mensaje en este momento."
+
+#: bookwyrm/templates/feed/feed.html:6
+#, python-format
+msgid "%(tab_title)s Timeline"
+msgstr "%(tab_title)s Línea temporal"
+
+#: bookwyrm/templates/feed/feed.html:10
+msgid "Home"
+msgstr "Hogar"
+
+#: bookwyrm/templates/feed/feed.html:13
+msgid "Local"
+msgstr "Local"
+
+#: bookwyrm/templates/feed/feed.html:16
+msgid "Federated"
+msgstr "Federalizado"
+
+#: bookwyrm/templates/feed/feed.html:24
+msgid "Announcements"
+msgstr "Anuncios"
+
+#: bookwyrm/templates/feed/feed.html:32
+msgid ""
+"There aren't any activities right now! Try following a user to get started"
+msgstr ""
+"¡No hay ninguna actividad ahorita! Sigue a otro usuario para empezar"
+
+#: bookwyrm/templates/feed/feed_layout.html:5
+msgid "Updates"
+msgstr "Actualizaciones"
+
+#: bookwyrm/templates/feed/feed_layout.html:11
+msgid "Your books"
+msgstr "Tus libros"
+
+#: bookwyrm/templates/feed/feed_layout.html:13
+msgid ""
+"There are no books here right now! Try searching for a book to get started"
+msgstr ""
+"¡No hay ningún libro aqui ahorita! Busca a un libro para empezar"
+
+#: bookwyrm/templates/feed/feed_layout.html:73 bookwyrm/templates/goal.html:26
+#: bookwyrm/templates/snippets/goal_card.html:6
+#, python-format
+msgid "%(year)s Reading Goal"
+msgstr "%(year)s Meta de lectura"
+
+#: bookwyrm/templates/feed/status.html:8
+msgid "Back"
+msgstr "Volver"
+
+#: bookwyrm/templates/goal.html:7
+#, python-format
+msgid "%(year)s Reading Progress"
+msgstr "%(year)s Progreso de la meta de lectura"
+
+#: bookwyrm/templates/goal.html:11
+msgid "Edit Goal"
+msgstr "Editar meta"
+
+#: bookwyrm/templates/goal.html:30
+#: bookwyrm/templates/snippets/goal_card.html:13
+#, python-format
+msgid ""
+"Set a goal for how many books you'll finish reading in %(year)s, and track "
+"your progress throughout the year."
+msgstr ""
+"Establece una meta para cuantos libros leerás en %(year)s, y seguir "
+"tu progreso durante el año."
+
+#: bookwyrm/templates/goal.html:39
+#, python-format
+msgid "%(name)s hasn't set a reading goal for %(year)s."
+msgstr "%(name)s no ha establecido una meta de lectura para %(year)s."
+
+#: bookwyrm/templates/goal.html:51
+#, python-format
+msgid "Your %(year)s Books"
+msgstr "Tus libros de %(year)s"
+
+#: bookwyrm/templates/goal.html:53
+#, python-format
+msgid "%(username)s's %(year)s Books"
+msgstr "Los libros de %(username)s para %(year)s"
+
+#: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
+#: bookwyrm/templates/layout.html:94
+msgid "Import Books"
+msgstr "Importar libros"
+
+#: bookwyrm/templates/import.html:14
+msgid "Data source"
+msgstr "Fuente de datos"
+
+#: bookwyrm/templates/import.html:32
+msgid "Include reviews"
+msgstr "Incluir reseñas"
+
+#: bookwyrm/templates/import.html:37
+msgid "Privacy setting for imported reviews:"
+msgstr "Configuración de privacidad para las reseñas importadas:"
+
+#: bookwyrm/templates/import.html:41
+msgid "Import"
+msgstr "Importar"
+
+#: bookwyrm/templates/import.html:46
+msgid "Recent Imports"
+msgstr "Importaciones recientes"
+
+#: bookwyrm/templates/import.html:48
+msgid "No recent imports"
+msgstr "No hay ninguna importación reciente"
+
+#: bookwyrm/templates/import_status.html:6
+#: bookwyrm/templates/import_status.html:10
+msgid "Import Status"
+msgstr "Status de importación"
+
+#: bookwyrm/templates/import_status.html:13
+msgid "Import started:"
+msgstr "Importación ha empezado:"
+
+#: bookwyrm/templates/import_status.html:17
+msgid "Import completed:"
+msgstr "Importación ha terminado:"
+
+#: bookwyrm/templates/import_status.html:20
+msgid "TASK FAILED"
+msgstr "TAREA FALLÓ"
+
+#: bookwyrm/templates/import_status.html:26
+msgid "Import still in progress."
+msgstr "Importación todavia en progreso"
+
+#: bookwyrm/templates/import_status.html:28
+msgid "(Hit reload to update!)"
+msgstr "(¡Refresca para actualizar!)"
+
+#: bookwyrm/templates/import_status.html:35
+msgid "Failed to load"
+msgstr "Se falló a cargar"
+
+#: bookwyrm/templates/import_status.html:59
+msgid "Select all"
+msgstr "Seleccionar todo"
+
+#: bookwyrm/templates/import_status.html:62
+msgid "Retry items"
+msgstr "Reintentar ítems"
+
+#: bookwyrm/templates/import_status.html:84
+msgid "Successfully imported"
+msgstr "Importado exitosamente"
+
+#: bookwyrm/templates/import_status.html:88
+#: bookwyrm/templates/lists/curate.html:14
+msgid "Book"
+msgstr "Libro"
+
+#: bookwyrm/templates/import_status.html:91
+#: bookwyrm/templates/snippets/create_status_form.html:10
+#: bookwyrm/templates/snippets/shelf.html:10
+msgid "Title"
+msgstr "Título"
+
+#: bookwyrm/templates/import_status.html:94
+#: bookwyrm/templates/snippets/shelf.html:11
+msgid "Author"
+msgstr "Autor/Autora"
+
+#: bookwyrm/templates/import_status.html:117
+msgid "Imported"
+msgstr "Importado"
+
+#: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12
+#: bookwyrm/templates/login.html:43
+msgid "Create an Account"
+msgstr "Crear una cuenta"
+
+#: bookwyrm/templates/invite.html:21
+msgid "Permission Denied"
+msgstr "Permiso denegado"
+
+#: bookwyrm/templates/invite.html:22
+msgid "Sorry! This invite code is no longer valid."
+msgstr "¡Disculpa! Este código de invitación no queda válido."
+
+#: bookwyrm/templates/layout.html:33
+msgid "Search for a book or user"
+msgstr "Buscar un libro o un usuario"
+
+#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
+#: bookwyrm/templates/lists/list.html:62
+msgid "Search"
+msgstr "Buscar"
+
+#: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48
+msgid "Main navigation menu"
+msgstr "Menú de navigación central"
+
+#: bookwyrm/templates/layout.html:58
+msgid "Your shelves"
+msgstr "Tus estantes"
+
+#: bookwyrm/templates/layout.html:61
+msgid "Feed"
+msgstr "Actividad"
+
+#: bookwyrm/templates/layout.html:84
+#: bookwyrm/templates/preferences/preferences_layout.html:14
+msgid "Profile"
+msgstr "Perfil"
+
+#: bookwyrm/templates/layout.html:89
+msgid "Settings"
+msgstr "Configuración"
+
+#: bookwyrm/templates/layout.html:103
+#: bookwyrm/templates/settings/admin_layout.html:19
+#: bookwyrm/templates/settings/manage_invites.html:3
+msgid "Invites"
+msgstr "Invitaciones"
+
+#: bookwyrm/templates/layout.html:110
+msgid "Site Configuration"
+msgstr "Configuracion de sitio"
+
+#: bookwyrm/templates/layout.html:117
+msgid "Log out"
+msgstr "Cerrar sesión"
+
+#: bookwyrm/templates/layout.html:125 bookwyrm/templates/layout.html:126
+#: bookwyrm/templates/notifications.html:6
+#: bookwyrm/templates/notifications.html:10
+msgid "Notifications"
+msgstr "Notificaciones"
+
+#: bookwyrm/templates/layout.html:143 bookwyrm/templates/layout.html:147
+#: bookwyrm/templates/login.html:17
+#: bookwyrm/templates/snippets/register_form.html:4
+msgid "Username:"
+msgstr "Nombre de usuario:"
+
+#: bookwyrm/templates/layout.html:152 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/login.html:33
+msgid "Log in"
+msgstr "Iniciar sesión"
+
+#: bookwyrm/templates/layout.html:183
+msgid "About this server"
+msgstr "Sobre este servidor"
+
+#: bookwyrm/templates/layout.html:187
+msgid "Contact site admin"
+msgstr "Contactarse con administradores del sitio"
+
+#: bookwyrm/templates/layout.html:198
+msgid ""
+"BookWyrm is open source software. You can contribute or report issues on <a "
+"href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgstr ""
+"BookWyrm es software de código abierto. Puedes contribuir o reportar problemas en <a "
+"href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+
+#: bookwyrm/templates/lists/create_form.html:5
+#: bookwyrm/templates/lists/lists.html:17
+msgid "Create List"
+msgstr "Crear lista"
+
+#: bookwyrm/templates/lists/curate.html:6
+msgid "Pending Books"
+msgstr "Libros pendientes"
+
+#: bookwyrm/templates/lists/curate.html:7
+msgid "Go to list"
+msgstr "Irse a lista"
+
+#: bookwyrm/templates/lists/curate.html:9
+msgid "You're all set!"
+msgstr "!Está todo listo¡"
+
+#: bookwyrm/templates/lists/curate.html:15
+msgid "Suggested by"
+msgstr "Sugerido por"
+
+#: bookwyrm/templates/lists/curate.html:35
+msgid "Approve"
+msgstr "Aprobar"
+
+#: bookwyrm/templates/lists/curate.html:41
+msgid "Discard"
+msgstr "Desechar"
+
+#: bookwyrm/templates/lists/edit_form.html:5
+#: bookwyrm/templates/lists/list_layout.html:17
+msgid "Edit List"
+msgstr "Editar lista"
+
+#: bookwyrm/templates/lists/form.html:18
+msgid "List curation:"
+msgstr "Enumerar lista de comisariado:"
+
+#: bookwyrm/templates/lists/form.html:21
+msgid "Closed"
+msgstr "Cerrado"
+
+#: bookwyrm/templates/lists/form.html:22
+msgid "Only you can add and remove books to this list"
+msgstr "Solo tú puedes agregar a y sacar libros de esta lista"
+
+#: bookwyrm/templates/lists/form.html:26
+msgid "Curated"
+msgstr "De comisariado"
+
+#: bookwyrm/templates/lists/form.html:27
+msgid "Anyone can suggest books, subject to your approval"
+msgstr "Cualquier usuario puede sugerir libros, en cuanto lo hayas aprobado"
+
+#: bookwyrm/templates/lists/form.html:31
+msgid "Open"
+msgstr "Abierto"
+
+#: bookwyrm/templates/lists/form.html:32
+msgid "Anyone can add books to this list"
+msgstr "Cualquer usuario puede agregar libros a esta lista"
+
+#: bookwyrm/templates/lists/list.html:17
+msgid "This list is currently empty"
+msgstr "Esta lista está vacia"
+
+#: bookwyrm/templates/lists/list.html:35
+msgid "Added by"
+msgstr "Agregado por"
+
+#: bookwyrm/templates/lists/list.html:41
+msgid "Remove"
+msgstr "Quitar"
+
+#: bookwyrm/templates/lists/list.html:54
+msgid "Add Books"
+msgstr "Agregar libros"
+
+#: bookwyrm/templates/lists/list.html:54
+msgid "Suggest Books"
+msgstr "Sugerir libros"
+
+#: bookwyrm/templates/lists/list.html:58
+msgid "Search for a book"
+msgstr "Buscar libros"
+
+#: bookwyrm/templates/lists/list.html:63
+msgid "search"
+msgstr "buscar"
+
+#: bookwyrm/templates/lists/list.html:69
+msgid "Clear search"
+msgstr "Borrar búsqueda"
+
+#: bookwyrm/templates/lists/list.html:74
+#, python-format
+msgid "No books found matching the query \"%(query)s\""
+msgstr "No se encontró ningún libro correspondiente a la búsqueda: \"%(query)s\""
+
+#: bookwyrm/templates/lists/list.html:75
+msgid "No books found"
+msgstr "No se encontró ningún libro"
+
+#: bookwyrm/templates/lists/list.html:89
+msgid "Suggest"
+msgstr "Sugerir"
+
+#: bookwyrm/templates/lists/list_items.html:19
+#: bookwyrm/templates/lists/list_layout.html:11
+msgid "Created and curated by"
+msgstr "Creado y comisariado por"
+
+#: bookwyrm/templates/lists/list_items.html:19
+#: bookwyrm/templates/lists/list_layout.html:11
+msgid "Created by"
+msgstr "Creado por"
+
+#: bookwyrm/templates/lists/lists.html:14
+msgid "Your lists"
+msgstr "Tus listas"
+
+#: bookwyrm/templates/lists/lists.html:40
+msgid "Recent Lists"
+msgstr "Listas recientes"
+
+#: bookwyrm/templates/login.html:4
+msgid "Login"
+msgstr "Iniciar sesión"
+
+#: bookwyrm/templates/login.html:23 bookwyrm/templates/password_reset.html:17
+#: bookwyrm/templates/snippets/register_form.html:22
+msgid "Password:"
+msgstr "Contraseña:"
+
+#: bookwyrm/templates/login.html:36
+msgid "Forgot your password?"
+msgstr "¿Olvidaste tu contraseña?"
+
+#: bookwyrm/templates/login.html:49
+msgid "Contact an administrator to get an invite"
+msgstr "Contactar a unx administradorx para recibir una invitación"
+
+#: bookwyrm/templates/login.html:59
+msgid "More about this site"
+msgstr "Más sobre este sitio"
+
+#: bookwyrm/templates/notfound.html:4 bookwyrm/templates/notfound.html:8
+msgid "Not Found"
+msgstr "No encontrado"
+
+#: bookwyrm/templates/notfound.html:9
+msgid "The page you requested doesn't seem to exist!"
+msgstr "¡Parece que la página solicitada no existe!"
+
+#: bookwyrm/templates/notifications.html:14
+msgid "Delete notifications"
+msgstr "Borrar notificaciones"
+
+#: bookwyrm/templates/notifications.html:49
+#, python-format
+msgid ""
+"favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+"le gustó tu <a href=\"%(related_path)s\">reseña de <em>%(book_title)s</"
+"em></a>"
+
+#: bookwyrm/templates/notifications.html:51
+#, python-format
+msgid ""
+"favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+"le gustó tu <a href=\"%(related_path)s\">comentario en <em>%(book_title)s</"
+"em></a>"
+
+#: bookwyrm/templates/notifications.html:53
+#, python-format
+msgid ""
+"favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+"le gustó tu <a href=\"%(related_path)s\">cita de <em>%(book_title)s</"
+"em></a>"
+
+#: bookwyrm/templates/notifications.html:55
+#, python-format
+msgid "favorited your <a href=\"%(related_path)s\">status</a>"
+msgstr "le gustó tu <a href=\"%(related_path)s\">status</a>"
+
+#: bookwyrm/templates/notifications.html:60
+#, python-format
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">review of <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+"te mencionó en una <a href=\"%(related_path)s\">reseña de <em>"
+"%(book_title)s</em></a>"
+
+#: bookwyrm/templates/notifications.html:62
+#, python-format
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">comment on <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+"te mencionó en un <a href=\"%(related_path)s\">comentario de <em>"
+"%(book_title)s</em></a>"
+
+#: bookwyrm/templates/notifications.html:64
+#, python-format
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">quote from <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+"te mencionó en una <a href=\"%(related_path)s\">cita de <em>"
+"%(book_title)s</em></a>"
+
+#: bookwyrm/templates/notifications.html:66
+#, python-format
+msgid "mentioned you in a <a href=\"%(related_path)s\">status</a>"
+msgstr "te mencionó en un <a href=\"%(related_path)s\">status</a>"
+
+#: bookwyrm/templates/notifications.html:71
+#, python-format
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">review of <em>%(book_title)s</em></a>"
+msgstr ""
+"<a href=\"%(related_path)s\">contestó</a> tu <a href=\"%(parent_path)s"
+"\">reseña de <em>%(book_title)s</em></a>"
+
+#: bookwyrm/templates/notifications.html:73
+#, python-format
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">comment on <em>%(book_title)s</em></a>"
+msgstr ""
+"<a href=\"%(related_path)s\">contestó</a> tu <a href=\"%(parent_path)s"
+"\">comentario en <em>%(book_title)s</em></a>"
+
+#: bookwyrm/templates/notifications.html:75
+#, python-format
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">quote from <em>%(book_title)s</em></a>"
+msgstr ""
+"<a href=\"%(related_path)s\">contestó</a> tu <a href=\"%(parent_path)s"
+"\">cita de <em>%(book_title)s</em></a>"
+
+#: bookwyrm/templates/notifications.html:77
+#, python-format
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">status</a>"
+msgstr ""
+"<a href=\"%(related_path)s\">contestó</a> tu <a href=\"%(parent_path)s"
+"\">status</a>"
+
+#: bookwyrm/templates/notifications.html:81
+msgid "followed you"
+msgstr "te siguió"
+
+#: bookwyrm/templates/notifications.html:84
+msgid "sent you a follow request"
+msgstr "te quiere seguir"
+
+#: bookwyrm/templates/notifications.html:90
+#, python-format
+msgid ""
+"boosted your <a href=\"%(related_path)s\">review of <em>%(book.title)s</em></"
+"a>"
+msgstr ""
+"respaldó tu <a href=\"%(related_path)s\">reseña de <em>%(book.title)s</em></"
+"a>"
+
+#: bookwyrm/templates/notifications.html:92
+#, python-format
+msgid ""
+"boosted your <a href=\"%(related_path)s\">comment on<em>%(book.title)s</em></"
+"a>"
+msgstr ""
+"respaldó tu <a href=\"%(related_path)s\">comentario en<em>%(book.title)s</em></"
+"a>"
+
+#: bookwyrm/templates/notifications.html:94
+#, python-format
+msgid ""
+"boosted your <a href=\"%(related_path)s\">quote from <em>%(book.title)s</"
+"em></a>"
+msgstr ""
+"respaldó tu<a href=\"%(related_path)s\">cita de <em>%(book.title)s</"
+"em></a>"
+
+#: bookwyrm/templates/notifications.html:96
+#, python-format
+msgid "boosted your <a href=\"%(related_path)s\">status</a>"
+msgstr "respaldó tu <a href=\"%(related_path)s\">status</a>"
+
+#: bookwyrm/templates/notifications.html:100
+#, python-format
+msgid ""
+" added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
+"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgstr ""
+" agregó <em><a href=\"%(book_path)s\">%(book_title)s</a></em> a tu lista "
+"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+
+#: bookwyrm/templates/notifications.html:102
+#, python-format
+msgid ""
+" suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to "
+"your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgstr ""
+" sugirió agregar <em><a href=\"%(book_path)s\">%(book_title)s</a></em> a "
+"tu lista \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+
+#: bookwyrm/templates/notifications.html:106
+#, python-format
+msgid " your <a href=\"/import/%(related_id)s\">import</a> completed."
+msgstr " tu <a href=\"/import/%(related_id)s\">importación</a> ha terminado."
+
+#: bookwyrm/templates/notifications.html:138
+msgid "You're all caught up!"
+msgstr "¡Estás al día!"
+
+#: bookwyrm/templates/password_reset.html:4
+#: bookwyrm/templates/password_reset.html:10
+#: bookwyrm/templates/password_reset_request.html:4
+#: bookwyrm/templates/password_reset_request.html:10
+msgid "Reset Password"
+msgstr "Restablecer contraseña"
+
+#: bookwyrm/templates/password_reset.html:23
+#: bookwyrm/templates/preferences/change_password.html:18
+msgid "Confirm password:"
+msgstr "Confirmar contraseña:"
+
+#: bookwyrm/templates/password_reset.html:30
+msgid "Confirm"
+msgstr "Confirmar"
+
+#: bookwyrm/templates/password_reset_request.html:12
+msgid "A link to reset your password will be sent to your email address"
+msgstr "Un enlace para restablecer tu contraseña se enviará a tu dirección de correo electrónico"
+
+#: bookwyrm/templates/password_reset_request.html:16
+#: bookwyrm/templates/preferences/edit_user.html:38
+#: bookwyrm/templates/snippets/register_form.html:13
+msgid "Email address:"
+msgstr "Dirección de correo electrónico:"
+
+#: bookwyrm/templates/password_reset_request.html:23
+msgid "Reset password"
+msgstr "Restablecer contraseña"
+
+#: bookwyrm/templates/preferences/blocks.html:4
+#: bookwyrm/templates/preferences/blocks.html:7
+#: bookwyrm/templates/preferences/preferences_layout.html:23
+msgid "Blocked Users"
+msgstr "Usuarios bloqueados"
+
+#: bookwyrm/templates/preferences/blocks.html:12
+msgid "No users currently blocked."
+msgstr "No hay ningún usuario bloqueado actualmente."
+
+#: bookwyrm/templates/preferences/change_password.html:4
+#: bookwyrm/templates/preferences/change_password.html:7
+#: bookwyrm/templates/preferences/change_password.html:21
+#: bookwyrm/templates/preferences/preferences_layout.html:17
+msgid "Change Password"
+msgstr "Cambiar contraseña"
+
+#: bookwyrm/templates/preferences/change_password.html:14
+msgid "New password:"
+msgstr "Nueva contraseña:"
+
+#: bookwyrm/templates/preferences/edit_user.html:4
+#: bookwyrm/templates/preferences/edit_user.html:7
+msgid "Edit Profile"
+msgstr "Editar perfil"
+
+#: bookwyrm/templates/preferences/edit_user.html:17
+msgid "Avatar:"
+msgstr "Avatar:"
+
+#: bookwyrm/templates/preferences/edit_user.html:24
+msgid "Display name:"
+msgstr "Nombre de visualización:"
+
+#: bookwyrm/templates/preferences/edit_user.html:31
+msgid "Summary:"
+msgstr "Resumen:"
+
+#: bookwyrm/templates/preferences/edit_user.html:46
+msgid "Manually approve followers:"
+msgstr "Aprobar seguidores a mano:"
+
+#: bookwyrm/templates/preferences/preferences_layout.html:11
+msgid "Account"
+msgstr "Cuenta"
+
+#: bookwyrm/templates/preferences/preferences_layout.html:20
+msgid "Relationships"
+msgstr "Relaciones"
+
+#: bookwyrm/templates/search_results.html:4
+msgid "Search Results"
+msgstr "Resultados de búsqueda"
+
+#: bookwyrm/templates/search_results.html:9
+#, python-format
+msgid "Search Results for \"%(query)s\""
+msgstr "Resultados de búsqueda por \"%(query)s\""
+
+#: bookwyrm/templates/search_results.html:14
+msgid "Matching Books"
+msgstr "Libros correspondientes"
+
+#: bookwyrm/templates/search_results.html:17
+#, python-format
+msgid "No books found for \"%(query)s\""
+msgstr "No se encontró ningún libro correspondiente a \"%(query)s\""
+
+#: bookwyrm/templates/search_results.html:33
+msgid "Didn't find what you were looking for?"
+msgstr "¿No encontraste lo que buscabas?"
+
+#: bookwyrm/templates/search_results.html:35
+msgid "Show results from other catalogues"
+msgstr "Mostrar resultados de otros catálogos"
+
+#: bookwyrm/templates/search_results.html:57
+msgid "Import book"
+msgstr "Importar libro"
+
+#: bookwyrm/templates/search_results.html:67
+msgid "Hide results from other catalogues"
+msgstr "Ocultar resultados de otros catálogos"
+
+#: bookwyrm/templates/search_results.html:75
+msgid "Matching Users"
+msgstr "Usuarios correspondientes"
+
+#: bookwyrm/templates/search_results.html:77
+#, python-format
+msgid "No users found for \"%(query)s\""
+msgstr "No se encontró ningún usuario correspondiente a \"%(query)s\""
+
+#: bookwyrm/templates/search_results.html:92
+#, python-format
+msgid "No lists found for \"%(query)s\""
+msgstr "No se encontró ningúna lista correspondiente a \"%(query)s\""
+
+#: bookwyrm/templates/settings/admin_layout.html:4
+msgid "Administration"
+msgstr "Adminstración"
+
+#: bookwyrm/templates/settings/admin_layout.html:15
+msgid "Manage Users"
+msgstr "Administrar usuarios"
+
+#: bookwyrm/templates/settings/admin_layout.html:23
+#: bookwyrm/templates/settings/federation.html:4
+msgid "Federated Servers"
+msgstr "Servidores federalizados"
+
+#: bookwyrm/templates/settings/admin_layout.html:28
+msgid "Instance Settings"
+msgstr "Configuración de instancia"
+
+#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/site.html:4
+#: bookwyrm/templates/settings/site.html:6
+msgid "Site Settings"
+msgstr "Configuración de sitio"
+
+#: bookwyrm/templates/settings/admin_layout.html:35
+#: bookwyrm/templates/settings/site.html:13
+msgid "Instance Info"
+msgstr "Información de instancia"
+
+#: bookwyrm/templates/settings/admin_layout.html:36
+#: bookwyrm/templates/settings/site.html:39
+msgid "Images"
+msgstr "Imagenes"
+
+#: bookwyrm/templates/settings/admin_layout.html:37
+#: bookwyrm/templates/settings/site.html:59
+msgid "Footer Content"
+msgstr "Contenido del pie de página"
+
+#: bookwyrm/templates/settings/admin_layout.html:38
+#: bookwyrm/templates/settings/site.html:77
+msgid "Registration"
+msgstr "Registración"
+
+#: bookwyrm/templates/settings/federation.html:10
+msgid "Server name"
+msgstr "Nombre de servidor"
+
+#: bookwyrm/templates/settings/federation.html:11
+msgid "Software"
+msgstr "Software"
+
+#: bookwyrm/templates/settings/federation.html:12
+msgid "Status"
+msgstr "Status"
+
+#: bookwyrm/templates/settings/manage_invites.html:7
+msgid "Generate New Invite"
+msgstr "Generar nuevo invitación"
+
+#: bookwyrm/templates/settings/manage_invites.html:13
+msgid "Expiry:"
+msgstr "Vencimiento:"
+
+#: bookwyrm/templates/settings/manage_invites.html:19
+msgid "Use limit:"
+msgstr "Límite de uso:"
+
+#: bookwyrm/templates/settings/manage_invites.html:26
+msgid "Create Invite"
+msgstr "Crear invitación"
+
+#: bookwyrm/templates/settings/manage_invites.html:33
+msgid "Link"
+msgstr "Enlace"
+
+#: bookwyrm/templates/settings/manage_invites.html:34
+msgid "Expires"
+msgstr "Vence"
+
+#: bookwyrm/templates/settings/manage_invites.html:35
+msgid "Max uses"
+msgstr "Número máximo de usos"
+
+#: bookwyrm/templates/settings/manage_invites.html:36
+msgid "Times used"
+msgstr "Número de usos"
+
+#: bookwyrm/templates/settings/manage_invites.html:39
+msgid "No active invites"
+msgstr "No invitaciónes activas"
+
+#: bookwyrm/templates/settings/site.html:15
+msgid "Instance Name:"
+msgstr "Nombre de instancia:"
+
+#: bookwyrm/templates/settings/site.html:19
+msgid "Tagline:"
+msgstr "Lema:"
+
+#: bookwyrm/templates/settings/site.html:23
+msgid "Instance description:"
+msgstr "Descripción de instancia:"
+
+#: bookwyrm/templates/settings/site.html:27
+msgid "Code of conduct:"
+msgstr "Código de conducta:"
+
+#: bookwyrm/templates/settings/site.html:31
+msgid "Privacy Policy:"
+msgstr "Política de privacidad:"
+
+#: bookwyrm/templates/settings/site.html:42
+msgid "Logo:"
+msgstr "Logo:"
+
+#: bookwyrm/templates/settings/site.html:46
+msgid "Logo small:"
+msgstr "Logo pequeño:"
+
+#: bookwyrm/templates/settings/site.html:50
+msgid "Favicon:"
+msgstr "Favicon:"
+
+#: bookwyrm/templates/settings/site.html:61
+msgid "Support link:"
+msgstr "Enlace de apoyo:"
+
+#: bookwyrm/templates/settings/site.html:65
+msgid "Support title:"
+msgstr "Título de apoyo:"
+
+#: bookwyrm/templates/settings/site.html:69
+msgid "Admin email:"
+msgstr "Correo electrónico de administradorx:"
+
+#: bookwyrm/templates/settings/site.html:79
+msgid "Allow registration:"
+msgstr "Permitir registración:"
+
+#: bookwyrm/templates/settings/site.html:83
+msgid "Registration closed text:"
+msgstr "Texto de registración cerrada:"
+
+#: bookwyrm/templates/snippets/block_button.html:5
+msgid "Block"
+msgstr "Bloquear"
+
+#: bookwyrm/templates/snippets/block_button.html:10
+msgid "Un-block"
+msgstr "Desbloquear"
+
+#: bookwyrm/templates/snippets/book_titleby.html:3
+#, python-format
+msgid "<a href=\"%(path)s\">%(title)s</a> by "
+msgstr "<a href=\"%(path)s\">%(title)s</a> por "
+
+#: bookwyrm/templates/snippets/boost_button.html:8
+#: bookwyrm/templates/snippets/boost_button.html:9
+#: bookwyrm/templates/snippets/status/status_body.html:41
+#: bookwyrm/templates/snippets/status/status_body.html:42
+msgid "Boost status"
+msgstr "Status de respaldo"
+
+#: bookwyrm/templates/snippets/boost_button.html:16
+#: bookwyrm/templates/snippets/boost_button.html:17
+msgid "Un-boost status"
+msgstr "Status de des-respaldo"
+
+#: bookwyrm/templates/snippets/content_warning_field.html:3
+msgid "Spoiler alert:"
+msgstr "Alerta de spoiler:"
+
+#: bookwyrm/templates/snippets/content_warning_field.html:4
+msgid "Spoilers ahead!"
+msgstr "¡Advertencia, ya vienen spoilers!"
+
+#: bookwyrm/templates/snippets/create_status.html:9
+msgid "Review"
+msgstr "Reseña"
+
+#: bookwyrm/templates/snippets/create_status.html:12
+#: bookwyrm/templates/snippets/create_status_form.html:44
+msgid "Comment"
+msgstr "Comentario"
+
+#: bookwyrm/templates/snippets/create_status.html:15
+msgid "Quote"
+msgstr "Cita"
+
+#: bookwyrm/templates/snippets/create_status_form.html:21
+#: bookwyrm/templates/snippets/shelf.html:17
+msgid "Rating"
+msgstr "Calificación"
+
+#: bookwyrm/templates/snippets/create_status_form.html:23
+#: bookwyrm/templates/snippets/rate_action.html:14
+#: bookwyrm/templates/snippets/stars.html:3
+msgid "No rating"
+msgstr "No calificación"
+
+#: bookwyrm/templates/snippets/create_status_form.html:54
+msgid "Include spoiler alert"
+msgstr "Incluir alerta de spoiler"
+
+#: bookwyrm/templates/snippets/create_status_form.html:60
+#: bookwyrm/templates/snippets/privacy-icons.html:15
+#: bookwyrm/templates/snippets/privacy-icons.html:16
+#: bookwyrm/templates/snippets/privacy_select.html:19
+msgid "Private"
+msgstr "Privada"
+
+#: bookwyrm/templates/snippets/create_status_form.html:67
+msgid "Post"
+msgstr "Compartir"
+
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:4
+msgid "Delete these read dates?"
+msgstr "¿Eliminar estas fechas de lectura?"
+
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
+#, python-format
+msgid ""
+"You are deleting this readthrough and its %(count)s associated progress "
+"updates."
+msgstr ""
+"Estás eliminando y sus %(count)s actualizaciones de progreso asociados."
+
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
+#: bookwyrm/templates/snippets/follow_request_buttons.html:13
+msgid "Delete"
+msgstr "Eliminar"
+
+#: bookwyrm/templates/snippets/fav_button.html:7
+#: bookwyrm/templates/snippets/fav_button.html:8
+#: bookwyrm/templates/snippets/status/status_body.html:45
+#: bookwyrm/templates/snippets/status/status_body.html:46
+msgid "Like status"
+msgstr "Me gusta status"
+
+#: bookwyrm/templates/snippets/fav_button.html:15
+#: bookwyrm/templates/snippets/fav_button.html:16
+msgid "Un-like status"
+msgstr "Quitar me gusta de status"
+
+#: bookwyrm/templates/snippets/follow_button.html:6
+msgid "Follow request already sent."
+msgstr "Solicitud de seguidor ya se ha enviado."
+
+#: bookwyrm/templates/snippets/follow_button.html:19
+msgid "Send follow request"
+msgstr "Envia solicitud de seguidor"
+
+#: bookwyrm/templates/snippets/follow_button.html:21
+msgid "Follow"
+msgstr "Seguir"
+
+#: bookwyrm/templates/snippets/follow_button.html:27
+msgid "Unfollow"
+msgstr "Dejar de seguir"
+
+#: bookwyrm/templates/snippets/follow_request_buttons.html:8
+msgid "Accept"
+msgstr "Aceptar"
+
+#: bookwyrm/templates/snippets/generated_status/goal.html:1
+#, python-format
+msgid "set a goal to read %(counter)s book in %(year)s"
+msgid_plural "set a goal to read %(counter)s books in %(year)s"
+msgstr[0] "estableció una meta de leer %(counter)s libro en %(year)s"
+msgstr[1] "estableció una meta de leer %(counter)s libros en %(year)s"
+
+#: bookwyrm/templates/snippets/goal_card.html:21
+msgid "Dismiss message"
+msgstr "Desechar mensaje"
+
+#: bookwyrm/templates/snippets/goal_card.html:22
+#, python-format
+msgid ""
+"You can set or change your reading goal any time from your <a href=\"%(path)s"
+"\">profile page</a>"
+msgstr ""
+"Puedes establecer o cambiar en cualquier momento que desees desde tu <a href=\"%(path)s"
+"\">perfil</a>"
+
+#: bookwyrm/templates/snippets/goal_form.html:9
+msgid "Reading goal:"
+msgstr "Meta de lectura:"
+
+#: bookwyrm/templates/snippets/goal_form.html:14
+msgid "books"
+msgstr "libros"
+
+#: bookwyrm/templates/snippets/goal_form.html:19
+msgid "Goal privacy:"
+msgstr "Privacidad de meta:"
+
+#: bookwyrm/templates/snippets/goal_form.html:26
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:29
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20
+msgid "Post to feed"
+msgstr "Compartir con tu feed"
+
+#: bookwyrm/templates/snippets/goal_form.html:30
+msgid "Set goal"
+msgstr "Establecer meta"
+
+#: bookwyrm/templates/snippets/goal_progress.html:5
+msgid "Success!"
+msgstr "¡Meta logrado!"
+
+#: bookwyrm/templates/snippets/goal_progress.html:7
+#, python-format
+msgid "%(percent)s%% complete!"
+msgstr "%(percent)s%% terminado!"
+
+#: bookwyrm/templates/snippets/goal_progress.html:10
+#, python-format
+msgid ""
+"You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgstr ""
+"Has leído <a href=\"%(path)s\">%(read_count)s de %(goal_count)s libros</a>."
+
+#: bookwyrm/templates/snippets/goal_progress.html:12
+#, python-format
+msgid ""
+"%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s "
+"books</a>."
+msgstr ""
+"%(username)s ha leído <a href=\"%(path)s\">%(read_count)s de %(goal_count)s "
+"libros</a>."
+
+#: bookwyrm/templates/snippets/pagination.html:7
+msgid "Previous"
+msgstr "Anterior"
+
+#: bookwyrm/templates/snippets/pagination.html:15
+msgid "Next"
+msgstr "Siguiente"
+
+#: bookwyrm/templates/snippets/privacy-icons.html:3
+#: bookwyrm/templates/snippets/privacy-icons.html:4
+#: bookwyrm/templates/snippets/privacy_select.html:10
+msgid "Public"
+msgstr "Público"
+
+#: bookwyrm/templates/snippets/privacy-icons.html:7
+#: bookwyrm/templates/snippets/privacy-icons.html:8
+#: bookwyrm/templates/snippets/privacy_select.html:13
+msgid "Unlisted"
+msgstr "Privado"
+
+#: bookwyrm/templates/snippets/privacy-icons.html:12
+msgid "Followers-only"
+msgstr "Solo seguidores"
+
+#: bookwyrm/templates/snippets/privacy_select.html:6
+msgid "Post privacy"
+msgstr "Privacidad de publicación"
+
+#: bookwyrm/templates/snippets/privacy_select.html:16
+#: bookwyrm/templates/user/followers.html:13
+msgid "Followers"
+msgstr "Seguidores"
+
+#: bookwyrm/templates/snippets/progress_update.html:6
+msgid "Progress:"
+msgstr "Progreso:"
+
+#: bookwyrm/templates/snippets/progress_update.html:16
+#: bookwyrm/templates/snippets/readthrough_form.html:22
+msgid "pages"
+msgstr "páginas"
+
+#: bookwyrm/templates/snippets/progress_update.html:17
+#: bookwyrm/templates/snippets/readthrough_form.html:23
+msgid "percent"
+msgstr "por ciento"
+
+#: bookwyrm/templates/snippets/progress_update.html:25
+#, python-format
+msgid "of %(book.pages)s pages"
+msgstr "de %(book.pages)s páginas"
+
+#: bookwyrm/templates/snippets/rate_action.html:4
+msgid "Leave a rating"
+msgstr "Da una calificación"
+
+#: bookwyrm/templates/snippets/rate_action.html:29
+msgid "Rate"
+msgstr "Calificar"
+
+#: bookwyrm/templates/snippets/readthrough.html:7
+msgid "Progress Updates:"
+msgstr "Actualizaciones de progreso:"
+
+#: bookwyrm/templates/snippets/readthrough.html:11
+msgid "finished"
+msgstr "terminado"
+
+#: bookwyrm/templates/snippets/readthrough.html:14
+msgid "Show all updates"
+msgstr "Mostrar todas las actualizaciones"
+
+#: bookwyrm/templates/snippets/readthrough.html:30
+msgid "Delete this progress update"
+msgstr "Eliminar esta actualización de progreso"
+
+#: bookwyrm/templates/snippets/readthrough.html:40
+msgid "started"
+msgstr "empezado"
+
+#: bookwyrm/templates/snippets/readthrough.html:46
+#: bookwyrm/templates/snippets/readthrough.html:60
+msgid "Edit read dates"
+msgstr "Editar fechas de lectura"
+
+#: bookwyrm/templates/snippets/readthrough.html:50
+msgid "Delete these read dates"
+msgstr "Eliminar estas fechas de lectura"
+
+#: bookwyrm/templates/snippets/readthrough_form.html:7
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:19
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:17
+msgid "Started reading"
+msgstr "Lectura se empezó"
+
+#: bookwyrm/templates/snippets/readthrough_form.html:14
+msgid "Progress"
+msgstr "Progreso"
+
+#: bookwyrm/templates/snippets/readthrough_form.html:30
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25
+msgid "Finished reading"
+msgstr "Lectura se terminó"
+
+#: bookwyrm/templates/snippets/register_form.html:32
+msgid "Sign Up"
+msgstr "Inscribirse"
+
+#: bookwyrm/templates/snippets/rss_title.html:5
+#: bookwyrm/templates/snippets/status/status_header.html:9
+msgid "rated"
+msgstr "calificó"
+
+#: bookwyrm/templates/snippets/rss_title.html:7
+#: bookwyrm/templates/snippets/status/status_header.html:11
+msgid "reviewed"
+msgstr "reseñó"
+
+#: bookwyrm/templates/snippets/rss_title.html:9
+#: bookwyrm/templates/snippets/status/status_header.html:13
+msgid "commented on"
+msgstr "comentó en"
+
+#: bookwyrm/templates/snippets/rss_title.html:11
+#: bookwyrm/templates/snippets/status/status_header.html:15
+msgid "quoted"
+msgstr "citó"
+
+#: bookwyrm/templates/snippets/search_result_text.html:3
+#, python-format
+msgid "by %(author)s"
+msgstr "por %(author)s"
+
+#: bookwyrm/templates/snippets/shelf.html:12
+msgid "Published"
+msgstr "Publicado"
+
+#: bookwyrm/templates/snippets/shelf.html:13
+msgid "Shelved"
+msgstr "Archivado"
+
+#: bookwyrm/templates/snippets/shelf.html:14
+msgid "Started"
+msgstr "Empezado"
+
+#: bookwyrm/templates/snippets/shelf.html:15
+msgid "Finished"
+msgstr "Terminado"
+
+#: bookwyrm/templates/snippets/shelf.html:16
+msgid "External links"
+msgstr "Enlaces externos"
+
+#: bookwyrm/templates/snippets/shelf.html:44
+msgid "OpenLibrary"
+msgstr "OpenLibrary"
+
+#: bookwyrm/templates/snippets/shelf.html:61
+msgid "This shelf is empty."
+msgstr "Este estante está vacio."
+
+#: bookwyrm/templates/snippets/shelf.html:67
+msgid "Delete shelf"
+msgstr "Eliminar estante"
+
+#: bookwyrm/templates/snippets/shelf_selector.html:4
+msgid "Change shelf"
+msgstr "Cambiar estante"
+
+#: bookwyrm/templates/snippets/shelf_selector.html:27
+msgid "Unshelve"
+msgstr "Retirar del estante"
+
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
+#, python-format
+msgid "Finish \"<em>%(book_title)s</em>\""
+msgstr "Terminar \"<em>%(book_title)s</em>\""
+
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5
+msgid "More shelves"
+msgstr "Más estantes"
+
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:8
+msgid "Start reading"
+msgstr "Empezar leer"
+
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
+msgid "Read"
+msgstr "Leer"
+
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
+msgid "Finish reading"
+msgstr "Terminar de leer"
+
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26
+msgid "Want to read"
+msgstr "Quiero leer"
+
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
+#, python-format
+msgid "Start \"<em>%(book_title)s</em>\""
+msgstr "Empezar \"<em>%(book_title)s</em>\""
+
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:5
+#, python-format
+msgid "Want to Read \"<em>%(book_title)s</em>\""
+msgstr "Quiero leer \"<em>%(book_title)s</em>\""
+
+#: bookwyrm/templates/snippets/status/status.html:7
+msgid "boosted"
+msgstr "respaldó"
+
+#: bookwyrm/templates/snippets/status/status_body.html:24
+#: bookwyrm/templates/snippets/status/status_body.html:37
+#: bookwyrm/templates/snippets/status/status_body.html:38
+msgid "Reply"
+msgstr "Respuesta"
+
+#: bookwyrm/templates/snippets/status/status_content.html:16
+#: bookwyrm/templates/snippets/trimmed_text.html:12
+msgid "Show more"
+msgstr "Mostrar más"
+
+#: bookwyrm/templates/snippets/status/status_content.html:23
+#: bookwyrm/templates/snippets/trimmed_text.html:18
+msgid "Show less"
+msgstr "Mostrar menos"
+
+#: bookwyrm/templates/snippets/status/status_content.html:44
+msgid "Open image in new window"
+msgstr "Abrir imagen en una nueva ventana"
+
+#: bookwyrm/templates/snippets/status/status_options.html:7
+#: bookwyrm/templates/snippets/user_options.html:7
+msgid "More options"
+msgstr "Más opciones"
+
+#: bookwyrm/templates/snippets/status/status_options.html:17
+msgid "Delete post"
+msgstr "Eliminar publicación"
+
+#: bookwyrm/templates/snippets/status/status_options.html:23
+#: bookwyrm/templates/snippets/user_options.html:13
+msgid "Send direct message"
+msgstr "Enviar mensaje directo"
+
+#: bookwyrm/templates/snippets/switch_edition_button.html:5
+msgid "Switch to this edition"
+msgstr "Cambiar a esta edición"
+
+#: bookwyrm/templates/snippets/tag.html:14
+msgid "Remove tag"
+msgstr "Eliminar etiqueta"
+
+#: bookwyrm/templates/tag.html:9
+#, python-format
+msgid "Books tagged \"%(tag.name)s\""
+msgstr "Libros etiquetados con \"%(tag.name)s\""
+
+#: bookwyrm/templates/user/create_shelf_form.html:5
+msgid "Create New Shelf"
+msgstr "Crear nuevo estante"
+
+#: bookwyrm/templates/user/create_shelf_form.html:22
+#: bookwyrm/templates/user/shelf.html:33
+msgid "Create shelf"
+msgstr "Crear estante"
+
+#: bookwyrm/templates/user/edit_shelf_form.html:5
+msgid "Edit Shelf"
+msgstr "Editar estante"
+
+#: bookwyrm/templates/user/edit_shelf_form.html:26
+msgid "Update shelf"
+msgstr "Actualizar estante"
+
+#: bookwyrm/templates/user/followers.html:7
+#: bookwyrm/templates/user/following.html:7 bookwyrm/templates/user/user.html:9
+msgid "User Profile"
+msgstr "Perfil de usuario"
+
+#: bookwyrm/templates/user/followers.html:26
+#, python-format
+msgid "%(username)s has no followers"
+msgstr "%(username)s no tiene seguidores"
+
+#: bookwyrm/templates/user/following.html:13
+msgid "Following"
+msgstr "Siguiendo"
+
+#: bookwyrm/templates/user/following.html:26
+#, python-format
+msgid "%(username)s isn't following any users"
+msgstr "%(username)s no sigue a nadie"
+
+#: bookwyrm/templates/user/lists.html:9
+msgid "Your Lists"
+msgstr "Tus listas"
+
+#: bookwyrm/templates/user/lists.html:11
+#, python-format
+msgid "Lists: %(username)s"
+msgstr "Listas: %(username)s"
+
+#: bookwyrm/templates/user/lists.html:17
+msgid "Create new list"
+msgstr "Crear nueva lista"
+
+#: bookwyrm/templates/user/lists.html:29
+msgid "Create list"
+msgstr "Crear lista"
+
+#: bookwyrm/templates/user/shelf.html:9
+msgid "Your Shelves"
+msgstr "Tus estantes"
+
+#: bookwyrm/templates/user/shelf.html:11
+#, python-format
+msgid "%(username)s: Shelves"
+msgstr "%(username)s: Estantes"
+
+#: bookwyrm/templates/user/shelf.html:54
+msgid "Edit shelf"
+msgstr "Editar estante"
+
+#: bookwyrm/templates/user/user.html:15
+msgid "Edit profile"
+msgstr "Editar perfil"
+
+#: bookwyrm/templates/user/user.html:26
+#: bookwyrm/templates/user/user_layout.html:68
+msgid "Shelves"
+msgstr "Estantes"
+
+#: bookwyrm/templates/user/user.html:31
+#, python-format
+msgid "See all %(size)s"
+msgstr "Ver %(size)s"
+
+#: bookwyrm/templates/user/user.html:44
+#, python-format
+msgid "See all %(shelf_count)s shelves"
+msgstr "Ver los %(shelf_count)s estantes"
+
+#: bookwyrm/templates/user/user.html:56
+#, python-format
+msgid "Set a reading goal for %(year)s"
+msgstr "Establecer una meta de lectura para %(year)s"
+
+#: bookwyrm/templates/user/user.html:62
+msgid "User Activity"
+msgstr "Actividad de usuario"
+
+#: bookwyrm/templates/user/user.html:65
+msgid "RSS feed"
+msgstr "Feed RSS"
+
+#: bookwyrm/templates/user/user.html:76
+msgid "No activities yet!"
+msgstr "¡Aún no actividades!"
+
+#: bookwyrm/templates/user/user_layout.html:32
+msgid "Follow Requests"
+msgstr "Solicitudes de seguidor"
+
+#: bookwyrm/templates/user/user_layout.html:50
+msgid "Activity"
+msgstr "Actividad"
+
+#: bookwyrm/templates/user/user_layout.html:56
+msgid "Reading Goal"
+msgstr "Meta de lectura"
+
+#: bookwyrm/templates/user/user_preview.html:13
+#, python-format
+msgid "Joined %(date)s"
+msgstr "Unido %(date)s"
+
+#: bookwyrm/templates/user/user_preview.html:15
+#, python-format
+msgid "%(counter)s follower"
+msgid_plural "%(counter)s followers"
+msgstr[0] "%(counter)s seguidor"
+msgstr[1] "%(counter)s seguidores"
+
+#: bookwyrm/templates/user/user_preview.html:16
+#, python-format
+msgid "%(counter)s following"
+msgstr "%(counter)s siguiendo"

From 5fe8b67ba7cd648057d45128fcbc6cfdb4f6c617 Mon Sep 17 00:00:00 2001
From: reese <reesedporter@gmail.com>
Date: Wed, 3 Mar 2021 20:08:42 -0600
Subject: [PATCH 0170/1285] fix typo :)

---
 bookwyrm/templates/notfound.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/notfound.html b/bookwyrm/templates/notfound.html
index f6e765d4..210e1a13 100644
--- a/bookwyrm/templates/notfound.html
+++ b/bookwyrm/templates/notfound.html
@@ -6,6 +6,6 @@
 {% block content %}
 <div class="block">
     <h1 class="title">{% trans "Not Found" %}</h1>
-    <p>{% trans "The page your requested doesn't seem to exist!" %}</p>
+    <p>{% trans "The page you requested doesn't seem to exist!" %}</p>
 </div>
 {% endblock %}

From 208a38a34d7cee50b5e6442bb690759894c34ee8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 3 Mar 2021 20:14:42 -0800
Subject: [PATCH 0171/1285] Adds spanish locale to settings and rebuilds
 messages

---
 bookwyrm/settings.py               |   1 +
 locale/de_DE/LC_MESSAGES/django.mo | Bin 24083 -> 23957 bytes
 locale/de_DE/LC_MESSAGES/django.po |  12 +-
 locale/en_US/LC_MESSAGES/django.po |  10 +-
 locale/es/LC_MESSAGES/django.mo    | Bin 25533 -> 25326 bytes
 locale/es/LC_MESSAGES/django.po    | 392 ++++++++++++++++-------------
 locale/fr_FR/LC_MESSAGES/django.mo | Bin 20629 -> 20489 bytes
 locale/fr_FR/LC_MESSAGES/django.po |  12 +-
 locale/zh_CN/LC_MESSAGES/django.mo | Bin 23803 -> 23700 bytes
 locale/zh_CN/LC_MESSAGES/django.po |  12 +-
 10 files changed, 259 insertions(+), 180 deletions(-)

diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 499e72a7..45fdbd9d 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -141,6 +141,7 @@ LANGUAGE_CODE = 'en-us'
 LANGUAGES = [
     ('en-us', _('English')),
     ('de-de', _('German')),
+    ('es', _('Spanish')),
     ('fr-fr', _('French')),
     ('zh-cn', _('Simplified Chinese')),
 ]
diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo
index 1be5cbcb284088a18da6e09eb8b6c090471d7194..a12144464b93dd155c8653346aa8639373bfb22a 100644
GIT binary patch
delta 6194
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

delta 6317
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
AV*mgE

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index a8bd5788..1887fcd8 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-02 21:36+0000\n"
+"POT-Creation-Date: 2021-03-04 04:13+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"
@@ -74,10 +74,14 @@ msgid "German"
 msgstr "Deutsch"
 
 #: bookwyrm/settings.py:144
+msgid "Spanish"
+msgstr ""
+
+#: bookwyrm/settings.py:145
 msgid "French"
 msgstr "Französisch"
 
-#: bookwyrm/settings.py:145
+#: bookwyrm/settings.py:146
 msgid "Simplified Chinese"
 msgstr "Vereinfachtes Chinesisch"
 
@@ -872,7 +876,9 @@ msgid "Not Found"
 msgstr "Nicht gefunden"
 
 #: bookwyrm/templates/notfound.html:9
-msgid "The page your requested doesn't seem to exist!"
+#, fuzzy
+#| msgid "The page your requested doesn't seem to exist!"
+msgid "The page you requested doesn't seem to exist!"
 msgstr "Die Seite die du angefordert hast scheint nicht zu existieren!"
 
 #: bookwyrm/templates/notifications.html:14
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index 33494e07..32ee02b7 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-02 21:36+0000\n"
+"POT-Creation-Date: 2021-03-04 04:13+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"
@@ -70,10 +70,14 @@ msgid "German"
 msgstr ""
 
 #: bookwyrm/settings.py:144
-msgid "French"
+msgid "Spanish"
 msgstr ""
 
 #: bookwyrm/settings.py:145
+msgid "French"
+msgstr ""
+
+#: bookwyrm/settings.py:146
 msgid "Simplified Chinese"
 msgstr ""
 
@@ -857,7 +861,7 @@ msgid "Not Found"
 msgstr ""
 
 #: bookwyrm/templates/notfound.html:9
-msgid "The page your requested doesn't seem to exist!"
+msgid "The page you requested doesn't seem to exist!"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:14
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index 31994622a4e68a39c42cfc8509a8a476ebf188ab..d41050e6c2b04cf399c33585bbfceeef94ea12fc 100644
GIT binary patch
delta 8078
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

delta 8181
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

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 9eb7ad31..f8034b94 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-02 00:24+0000\n"
+"POT-Creation-Date: 2021-03-04 04:13+0000\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"
@@ -18,6 +18,73 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: bookwyrm/forms.py:185
+msgid "One Day"
+msgstr ""
+
+#: bookwyrm/forms.py:186
+msgid "One Week"
+msgstr ""
+
+#: bookwyrm/forms.py:187
+msgid "One Month"
+msgstr ""
+
+#: bookwyrm/forms.py:188
+msgid "Does Not Expire"
+msgstr ""
+
+#: bookwyrm/forms.py:190
+#, python-format
+msgid "%(count)d uses"
+msgstr ""
+
+#: bookwyrm/forms.py:192
+#, fuzzy
+#| msgid "Unlisted"
+msgid "Unlimited"
+msgstr "Privado"
+
+#: bookwyrm/models/fields.py:24
+#, python-format
+msgid "%(value)s is not a valid remote_id"
+msgstr ""
+
+#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
+#, python-format
+msgid "%(value)s is not a valid username"
+msgstr ""
+
+#: bookwyrm/models/fields.py:164
+#, fuzzy
+#| msgid "Username:"
+msgid "username"
+msgstr "Nombre de usuario:"
+
+#: bookwyrm/models/fields.py:169
+msgid "A user with that username already exists."
+msgstr ""
+
+#: bookwyrm/settings.py:142
+msgid "English"
+msgstr ""
+
+#: bookwyrm/settings.py:143
+msgid "German"
+msgstr ""
+
+#: bookwyrm/settings.py:144
+msgid "Spanish"
+msgstr ""
+
+#: bookwyrm/settings.py:145
+msgid "French"
+msgstr ""
+
+#: bookwyrm/settings.py:146
+msgid "Simplified Chinese"
+msgstr ""
+
 #: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
 #: bookwyrm/templates/edit_author.html:5
 msgid "Edit Author"
@@ -32,6 +99,10 @@ msgstr "Wikipedia"
 msgid "Books by %(name)s"
 msgstr "Libros de %(name)s"
 
+#: bookwyrm/templates/book.html:21
+msgid "by"
+msgstr ""
+
 #: bookwyrm/templates/book.html:29 bookwyrm/templates/book.html:30
 #: bookwyrm/templates/edit_book.html:5
 msgid "Edit Book"
@@ -57,20 +128,39 @@ msgstr "Número OCLC:"
 msgid "ASIN:"
 msgstr "ASIN:"
 
+#: bookwyrm/templates/book.html:84
+#, fuzzy, python-format
+#| msgid "of %(book.pages)s pages"
+msgid "%(format)s, %(pages)s pages"
+msgstr "de %(book.pages)s páginas"
+
 #: bookwyrm/templates/book.html:86
+#, fuzzy, python-format
+#| msgid "of %(book.pages)s pages"
+msgid "%(pages)s pages"
+msgstr "de %(book.pages)s páginas"
+
+#: bookwyrm/templates/book.html:91
 msgid "View on OpenLibrary"
 msgstr "Ver en OpenLibrary"
 
-#: bookwyrm/templates/book.html:98
+#: bookwyrm/templates/book.html:100
+#, python-format
+msgid "(%(review_count)s review)"
+msgid_plural "(%(review_count)s reviews)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/book.html:106
 msgid "Add Description"
 msgstr "Agregar descripción"
 
-#: bookwyrm/templates/book.html:105 bookwyrm/templates/edit_book.html:39
+#: bookwyrm/templates/book.html:113 bookwyrm/templates/edit_book.html:39
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Descripción:"
 
-#: bookwyrm/templates/book.html:109 bookwyrm/templates/edit_author.html:78
+#: bookwyrm/templates/book.html:117 bookwyrm/templates/edit_author.html:78
 #: bookwyrm/templates/edit_book.html:120 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:50
 #: bookwyrm/templates/settings/site.html:89
@@ -81,7 +171,7 @@ msgstr "Descripción:"
 msgid "Save"
 msgstr "Guardar"
 
-#: bookwyrm/templates/book.html:110 bookwyrm/templates/book.html:159
+#: bookwyrm/templates/book.html:118 bookwyrm/templates/book.html:167
 #: bookwyrm/templates/edit_author.html:79 bookwyrm/templates/edit_book.html:121
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
@@ -92,51 +182,69 @@ msgstr "Guardar"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: bookwyrm/templates/book.html:142
+#: bookwyrm/templates/book.html:127
+#, fuzzy, python-format
+#| msgid "<a href=\"%(path)s\">%(title)s</a> by "
+msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
+msgstr "<a href=\"%(path)s\">%(title)s</a> por "
+
+#: bookwyrm/templates/book.html:135
+#, fuzzy, python-format
+#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
+msgstr "Mensajes directos con <a href=\"%(path)s\">%(username)s</a>"
+
+#: bookwyrm/templates/book.html:141
+#, fuzzy, python-format
+#| msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
+msgstr " agregó <em><a href=\"%(book_path)s\">%(book_title)s</a></em> a tu lista \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+
+#: bookwyrm/templates/book.html:150
 msgid "Your reading activity"
 msgstr "Tu actividad de lectura"
 
-#: bookwyrm/templates/book.html:144
+#: bookwyrm/templates/book.html:152
 msgid "Add read dates"
 msgstr "Agregar fechas de lectura"
 
-#: bookwyrm/templates/book.html:149
+#: bookwyrm/templates/book.html:157
 msgid "You don't have any reading activity for this book."
 msgstr "No tienes ninguna actividad de lectura para este libro."
 
-#: bookwyrm/templates/book.html:156
+#: bookwyrm/templates/book.html:164
 msgid "Create"
 msgstr "Crear"
 
-#: bookwyrm/templates/book.html:178
+#: bookwyrm/templates/book.html:186
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: bookwyrm/templates/book.html:182 bookwyrm/templates/snippets/tag.html:18
+#: bookwyrm/templates/book.html:190 bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr "Agregar etiqueta"
 
-#: bookwyrm/templates/book.html:199
+#: bookwyrm/templates/book.html:207
 msgid "Subjects"
 msgstr "Sujetos"
 
-#: bookwyrm/templates/book.html:210
+#: bookwyrm/templates/book.html:218
 msgid "Places"
 msgstr "Lugares"
 
-#: bookwyrm/templates/book.html:221 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book.html:229 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
 #: bookwyrm/templates/search_results.html:90
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listas"
 
-#: bookwyrm/templates/book.html:250
+#: bookwyrm/templates/book.html:258
 msgid "rated it"
 msgstr "lo calificó con"
 
 #: bookwyrm/templates/components/inline_form.html:8
-#: bookwyrm/templates/feed/feed_layout.html:51
+#: bookwyrm/templates/feed/feed_layout.html:54
 msgid "Close"
 msgstr "Cerrar"
 
@@ -341,15 +449,15 @@ msgstr "No tienes ningún mensaje en este momento."
 msgid "%(tab_title)s Timeline"
 msgstr "%(tab_title)s Línea temporal"
 
-#: bookwyrm/templates/feed/feed.html:10
+#: bookwyrm/templates/feed/feed.html:10 bookwyrm/views/feed.py:33
 msgid "Home"
 msgstr "Hogar"
 
-#: bookwyrm/templates/feed/feed.html:13
+#: bookwyrm/templates/feed/feed.html:13 bookwyrm/views/feed.py:37
 msgid "Local"
 msgstr "Local"
 
-#: bookwyrm/templates/feed/feed.html:16
+#: bookwyrm/templates/feed/feed.html:16 bookwyrm/views/feed.py:41
 msgid "Federated"
 msgstr "Federalizado"
 
@@ -358,10 +466,8 @@ msgid "Announcements"
 msgstr "Anuncios"
 
 #: bookwyrm/templates/feed/feed.html:32
-msgid ""
-"There aren't any activities right now! Try following a user to get started"
-msgstr ""
-"¡No hay ninguna actividad ahorita! Sigue a otro usuario para empezar"
+msgid "There aren't any activities right now! Try following a user to get started"
+msgstr "¡No hay ninguna actividad ahorita! Sigue a otro usuario para empezar"
 
 #: bookwyrm/templates/feed/feed_layout.html:5
 msgid "Updates"
@@ -372,12 +478,30 @@ msgid "Your books"
 msgstr "Tus libros"
 
 #: bookwyrm/templates/feed/feed_layout.html:13
-msgid ""
-"There are no books here right now! Try searching for a book to get started"
-msgstr ""
-"¡No hay ningún libro aqui ahorita! Busca a un libro para empezar"
+msgid "There are no books here right now! Try searching for a book to get started"
+msgstr "¡No hay ningún libro aqui ahorita! Busca a un libro para empezar"
 
-#: bookwyrm/templates/feed/feed_layout.html:73 bookwyrm/templates/goal.html:26
+#: bookwyrm/templates/feed/feed_layout.html:23
+#: bookwyrm/templates/user/shelf.html:24
+#, fuzzy
+#| msgid "Read"
+msgid "To Read"
+msgstr "Leer"
+
+#: bookwyrm/templates/feed/feed_layout.html:24
+#: bookwyrm/templates/user/shelf.html:24
+#, fuzzy
+#| msgid "Start reading"
+msgid "Currently Reading"
+msgstr "Empezar leer"
+
+#: bookwyrm/templates/feed/feed_layout.html:25
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
+#: bookwyrm/templates/user/shelf.html:24
+msgid "Read"
+msgstr "Leer"
+
+#: bookwyrm/templates/feed/feed_layout.html:76 bookwyrm/templates/goal.html:26
 #: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
 msgid "%(year)s Reading Goal"
@@ -399,12 +523,8 @@ msgstr "Editar meta"
 #: bookwyrm/templates/goal.html:30
 #: bookwyrm/templates/snippets/goal_card.html:13
 #, python-format
-msgid ""
-"Set a goal for how many books you'll finish reading in %(year)s, and track "
-"your progress throughout the year."
-msgstr ""
-"Establece una meta para cuantos libros leerás en %(year)s, y seguir "
-"tu progreso durante el año."
+msgid "Set a goal for how many books you'll finish reading in %(year)s, and track your progress throughout the year."
+msgstr "Establece una meta para cuantos libros leerás en %(year)s, y seguir tu progreso durante el año."
 
 #: bookwyrm/templates/goal.html:39
 #, python-format
@@ -594,12 +714,8 @@ msgid "Contact site admin"
 msgstr "Contactarse con administradores del sitio"
 
 #: bookwyrm/templates/layout.html:198
-msgid ""
-"BookWyrm is open source software. You can contribute or report issues on <a "
-"href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
-msgstr ""
-"BookWyrm es software de código abierto. Puedes contribuir o reportar problemas en <a "
-"href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgstr "BookWyrm es software de código abierto. Puedes contribuir o reportar problemas en <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
 #: bookwyrm/templates/lists/create_form.html:5
 #: bookwyrm/templates/lists/lists.html:17
@@ -668,8 +784,10 @@ msgid "This list is currently empty"
 msgstr "Esta lista está vacia"
 
 #: bookwyrm/templates/lists/list.html:35
-msgid "Added by"
-msgstr "Agregado por"
+#, fuzzy, python-format
+#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
+msgstr "Mensajes directos con <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/lists/list.html:41
 msgid "Remove"
@@ -722,6 +840,12 @@ msgstr "Creado por"
 msgid "Your lists"
 msgstr "Tus listas"
 
+#: bookwyrm/templates/lists/lists.html:32
+#, fuzzy, python-format
+#| msgid "See all %(size)s"
+msgid "See all %(size)s lists"
+msgstr "Ver %(size)s"
+
 #: bookwyrm/templates/lists/lists.html:40
 msgid "Recent Lists"
 msgstr "Listas recientes"
@@ -761,30 +885,18 @@ msgstr "Borrar notificaciones"
 
 #: bookwyrm/templates/notifications.html:49
 #, python-format
-msgid ""
-"favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</"
-"em></a>"
-msgstr ""
-"le gustó tu <a href=\"%(related_path)s\">reseña de <em>%(book_title)s</"
-"em></a>"
+msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "le gustó tu <a href=\"%(related_path)s\">reseña de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:51
 #, python-format
-msgid ""
-"favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</"
-"em></a>"
-msgstr ""
-"le gustó tu <a href=\"%(related_path)s\">comentario en <em>%(book_title)s</"
-"em></a>"
+msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
+msgstr "le gustó tu <a href=\"%(related_path)s\">comentario en <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:53
 #, python-format
-msgid ""
-"favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
-"em></a>"
-msgstr ""
-"le gustó tu <a href=\"%(related_path)s\">cita de <em>%(book_title)s</"
-"em></a>"
+msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr "le gustó tu <a href=\"%(related_path)s\">cita de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:55
 #, python-format
@@ -793,30 +905,18 @@ msgstr "le gustó tu <a href=\"%(related_path)s\">status</a>"
 
 #: bookwyrm/templates/notifications.html:60
 #, python-format
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">review of <em>"
-"%(book_title)s</em></a>"
-msgstr ""
-"te mencionó en una <a href=\"%(related_path)s\">reseña de <em>"
-"%(book_title)s</em></a>"
+msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "te mencionó en una <a href=\"%(related_path)s\">reseña de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:62
 #, python-format
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">comment on <em>"
-"%(book_title)s</em></a>"
-msgstr ""
-"te mencionó en un <a href=\"%(related_path)s\">comentario de <em>"
-"%(book_title)s</em></a>"
+msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
+msgstr "te mencionó en un <a href=\"%(related_path)s\">comentario de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:64
 #, python-format
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">quote from <em>"
-"%(book_title)s</em></a>"
-msgstr ""
-"te mencionó en una <a href=\"%(related_path)s\">cita de <em>"
-"%(book_title)s</em></a>"
+msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr "te mencionó en una <a href=\"%(related_path)s\">cita de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:66
 #, python-format
@@ -825,39 +925,23 @@ msgstr "te mencionó en un <a href=\"%(related_path)s\">status</a>"
 
 #: bookwyrm/templates/notifications.html:71
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">review of <em>%(book_title)s</em></a>"
-msgstr ""
-"<a href=\"%(related_path)s\">contestó</a> tu <a href=\"%(parent_path)s"
-"\">reseña de <em>%(book_title)s</em></a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "<a href=\"%(related_path)s\">contestó</a> tu <a href=\"%(parent_path)s\">reseña de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:73
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">comment on <em>%(book_title)s</em></a>"
-msgstr ""
-"<a href=\"%(related_path)s\">contestó</a> tu <a href=\"%(parent_path)s"
-"\">comentario en <em>%(book_title)s</em></a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
+msgstr "<a href=\"%(related_path)s\">contestó</a> tu <a href=\"%(parent_path)s\">comentario en <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:75
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">quote from <em>%(book_title)s</em></a>"
-msgstr ""
-"<a href=\"%(related_path)s\">contestó</a> tu <a href=\"%(parent_path)s"
-"\">cita de <em>%(book_title)s</em></a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr "<a href=\"%(related_path)s\">contestó</a> tu <a href=\"%(parent_path)s\">cita de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:77
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">status</a>"
-msgstr ""
-"<a href=\"%(related_path)s\">contestó</a> tu <a href=\"%(parent_path)s"
-"\">status</a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
+msgstr "<a href=\"%(related_path)s\">contestó</a> tu <a href=\"%(parent_path)s\">status</a>"
 
 #: bookwyrm/templates/notifications.html:81
 msgid "followed you"
@@ -869,30 +953,18 @@ msgstr "te quiere seguir"
 
 #: bookwyrm/templates/notifications.html:90
 #, python-format
-msgid ""
-"boosted your <a href=\"%(related_path)s\">review of <em>%(book.title)s</em></"
-"a>"
-msgstr ""
-"respaldó tu <a href=\"%(related_path)s\">reseña de <em>%(book.title)s</em></"
-"a>"
+msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book.title)s</em></a>"
+msgstr "respaldó tu <a href=\"%(related_path)s\">reseña de <em>%(book.title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:92
 #, python-format
-msgid ""
-"boosted your <a href=\"%(related_path)s\">comment on<em>%(book.title)s</em></"
-"a>"
-msgstr ""
-"respaldó tu <a href=\"%(related_path)s\">comentario en<em>%(book.title)s</em></"
-"a>"
+msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book.title)s</em></a>"
+msgstr "respaldó tu <a href=\"%(related_path)s\">comentario en<em>%(book.title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:94
 #, python-format
-msgid ""
-"boosted your <a href=\"%(related_path)s\">quote from <em>%(book.title)s</"
-"em></a>"
-msgstr ""
-"respaldó tu<a href=\"%(related_path)s\">cita de <em>%(book.title)s</"
-"em></a>"
+msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book.title)s</em></a>"
+msgstr "respaldó tu<a href=\"%(related_path)s\">cita de <em>%(book.title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:96
 #, python-format
@@ -901,21 +973,13 @@ msgstr "respaldó tu <a href=\"%(related_path)s\">status</a>"
 
 #: bookwyrm/templates/notifications.html:100
 #, python-format
-msgid ""
-" added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
-"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
-msgstr ""
-" agregó <em><a href=\"%(book_path)s\">%(book_title)s</a></em> a tu lista "
-"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgstr " agregó <em><a href=\"%(book_path)s\">%(book_title)s</a></em> a tu lista \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 
 #: bookwyrm/templates/notifications.html:102
 #, python-format
-msgid ""
-" suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to "
-"your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
-msgstr ""
-" sugirió agregar <em><a href=\"%(book_path)s\">%(book_title)s</a></em> a "
-"tu lista \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgstr " sugirió agregar <em><a href=\"%(book_path)s\">%(book_title)s</a></em> a tu lista \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 
 #: bookwyrm/templates/notifications.html:106
 #, python-format
@@ -1275,11 +1339,8 @@ msgstr "¿Eliminar estas fechas de lectura?"
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
 #, python-format
-msgid ""
-"You are deleting this readthrough and its %(count)s associated progress "
-"updates."
-msgstr ""
-"Estás eliminando y sus %(count)s actualizaciones de progreso asociados."
+msgid "You are deleting this readthrough and its %(count)s associated progress updates."
+msgstr "Estás eliminando y sus %(count)s actualizaciones de progreso asociados."
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
 #: bookwyrm/templates/snippets/follow_request_buttons.html:13
@@ -1331,12 +1392,8 @@ msgstr "Desechar mensaje"
 
 #: bookwyrm/templates/snippets/goal_card.html:22
 #, python-format
-msgid ""
-"You can set or change your reading goal any time from your <a href=\"%(path)s"
-"\">profile page</a>"
-msgstr ""
-"Puedes establecer o cambiar en cualquier momento que desees desde tu <a href=\"%(path)s"
-"\">perfil</a>"
+msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
+msgstr "Puedes establecer o cambiar en cualquier momento que desees desde tu <a href=\"%(path)s\">perfil</a>"
 
 #: bookwyrm/templates/snippets/goal_form.html:9
 msgid "Reading goal:"
@@ -1372,19 +1429,13 @@ msgstr "%(percent)s%% terminado!"
 
 #: bookwyrm/templates/snippets/goal_progress.html:10
 #, python-format
-msgid ""
-"You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
-msgstr ""
-"Has leído <a href=\"%(path)s\">%(read_count)s de %(goal_count)s libros</a>."
+msgid "You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgstr "Has leído <a href=\"%(path)s\">%(read_count)s de %(goal_count)s libros</a>."
 
 #: bookwyrm/templates/snippets/goal_progress.html:12
 #, python-format
-msgid ""
-"%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s "
-"books</a>."
-msgstr ""
-"%(username)s ha leído <a href=\"%(path)s\">%(read_count)s de %(goal_count)s "
-"libros</a>."
+msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgstr "%(username)s ha leído <a href=\"%(path)s\">%(read_count)s de %(goal_count)s libros</a>."
 
 #: bookwyrm/templates/snippets/pagination.html:7
 msgid "Previous"
@@ -1572,10 +1623,6 @@ msgstr "Más estantes"
 msgid "Start reading"
 msgstr "Empezar leer"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-msgid "Read"
-msgstr "Leer"
-
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
 msgid "Finish reading"
 msgstr "Terminar de leer"
@@ -1625,7 +1672,9 @@ msgid "More options"
 msgstr "Más opciones"
 
 #: bookwyrm/templates/snippets/status/status_options.html:17
-msgid "Delete post"
+#, fuzzy
+#| msgid "Delete post"
+msgid "Delete status"
 msgstr "Eliminar publicación"
 
 #: bookwyrm/templates/snippets/status/status_options.html:23
@@ -1647,12 +1696,10 @@ msgid "Books tagged \"%(tag.name)s\""
 msgstr "Libros etiquetados con \"%(tag.name)s\""
 
 #: bookwyrm/templates/user/create_shelf_form.html:5
-msgid "Create New Shelf"
-msgstr "Crear nuevo estante"
-
 #: bookwyrm/templates/user/create_shelf_form.html:22
-#: bookwyrm/templates/user/shelf.html:33
-msgid "Create shelf"
+#, fuzzy
+#| msgid "Create shelf"
+msgid "Create Shelf"
 msgstr "Crear estante"
 
 #: bookwyrm/templates/user/edit_shelf_form.html:5
@@ -1691,11 +1738,7 @@ msgstr "Tus listas"
 msgid "Lists: %(username)s"
 msgstr "Listas: %(username)s"
 
-#: bookwyrm/templates/user/lists.html:17
-msgid "Create new list"
-msgstr "Crear nueva lista"
-
-#: bookwyrm/templates/user/lists.html:29
+#: bookwyrm/templates/user/lists.html:17 bookwyrm/templates/user/lists.html:29
 msgid "Create list"
 msgstr "Crear lista"
 
@@ -1708,6 +1751,10 @@ msgstr "Tus estantes"
 msgid "%(username)s: Shelves"
 msgstr "%(username)s: Estantes"
 
+#: bookwyrm/templates/user/shelf.html:33
+msgid "Create shelf"
+msgstr "Crear estante"
+
 #: bookwyrm/templates/user/shelf.html:54
 msgid "Edit shelf"
 msgstr "Editar estante"
@@ -1776,3 +1823,12 @@ msgstr[1] "%(counter)s seguidores"
 #, python-format
 msgid "%(counter)s following"
 msgstr "%(counter)s siguiendo"
+
+#~ msgid "Added by"
+#~ msgstr "Agregado por"
+
+#~ msgid "Create New Shelf"
+#~ msgstr "Crear nuevo estante"
+
+#~ msgid "Create new list"
+#~ msgstr "Crear nueva lista"
diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index a8d8ff0d4ff95439cf2ae37ec5b802c5110f58c8..d35bde77c5ea72217eead13ef5b3499b2b0922d3 100644
GIT binary patch
delta 6993
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
R)42M{_CYPH5A~}F`9B(Qne+ev

delta 7143
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

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 9288363b..0c770753 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-02 21:36+0000\n"
+"POT-Creation-Date: 2021-03-04 04:13+0000\n"
 "PO-Revision-Date: 2021-03-02 12:37+0100\n"
 "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -74,10 +74,14 @@ msgid "German"
 msgstr ""
 
 #: bookwyrm/settings.py:144
-msgid "French"
+msgid "Spanish"
 msgstr ""
 
 #: bookwyrm/settings.py:145
+msgid "French"
+msgstr ""
+
+#: bookwyrm/settings.py:146
 msgid "Simplified Chinese"
 msgstr ""
 
@@ -895,7 +899,9 @@ msgid "Not Found"
 msgstr "Introuvable"
 
 #: bookwyrm/templates/notfound.html:9
-msgid "The page your requested doesn't seem to exist!"
+#, fuzzy
+#| msgid "The page your requested doesn't seem to exist!"
+msgid "The page you requested doesn't seem to exist!"
 msgstr "Il semblerait que la page que vous avez demandée n’existe pas !"
 
 #: bookwyrm/templates/notifications.html:14
diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
index dbdd1daa82d0c6bbb300cab32443cddfb7fdd201..63517fd066a7fc3fef2ca474191a56dfcdf4a6d2 100644
GIT binary patch
delta 6717
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

delta 6817
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

diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index a7b0869e..21b46f81 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-02 21:36+0000\n"
+"POT-Creation-Date: 2021-03-04 04:13+0000\n"
 "PO-Revision-Date: 2021-03-02 10:35+0000\n"
 "Last-Translator: Kana <gudzpoz@live.com>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -74,10 +74,14 @@ msgid "German"
 msgstr ""
 
 #: bookwyrm/settings.py:144
-msgid "French"
+msgid "Spanish"
 msgstr ""
 
 #: bookwyrm/settings.py:145
+msgid "French"
+msgstr ""
+
+#: bookwyrm/settings.py:146
 msgid "Simplified Chinese"
 msgstr ""
 
@@ -871,7 +875,9 @@ msgid "Not Found"
 msgstr "未找到"
 
 #: bookwyrm/templates/notfound.html:9
-msgid "The page your requested doesn't seem to exist!"
+#, fuzzy
+#| msgid "The page your requested doesn't seem to exist!"
+msgid "The page you requested doesn't seem to exist!"
 msgstr "你请求的页�似乎并�存在�"
 
 #: bookwyrm/templates/notifications.html:14

From a5d2cf4677bebde404511787ac5e34e615d86955 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 4 Mar 2021 08:02:57 -0800
Subject: [PATCH 0172/1285] Un-fuzzies French translation strings

---
 bookwyrm/templates/notifications.html |   6 +-
 locale/fr_FR/LC_MESSAGES/django.mo    | Bin 20489 -> 25299 bytes
 locale/fr_FR/LC_MESSAGES/django.po    |  87 +++++---------------------
 3 files changed, 19 insertions(+), 74 deletions(-)

diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html
index f6fd7dab..007e6b05 100644
--- a/bookwyrm/templates/notifications.html
+++ b/bookwyrm/templates/notifications.html
@@ -87,11 +87,11 @@
                                 </div>
                             {% elif notification.notification_type == 'BOOST' %}
                                 {% if related_status.status_type == 'Review' %}
-                                {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}boosted your <a href="{{ related_path }}">review of <em>{{ book.title }}</em></a>{% endblocktrans %}
+                                {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}boosted your <a href="{{ related_path }}">review of <em>{{ book_title }}</em></a>{% endblocktrans %}
                                 {% elif related_status.status_type == 'Comment' %}
-                                {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}boosted your <a href="{{ related_path }}">comment on<em>{{ book.title }}</em></a>{% endblocktrans %}
+                                {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}boosted your <a href="{{ related_path }}">comment on<em>{{ book_title }}</em></a>{% endblocktrans %}
                                 {% elif related_status.status_type == 'Quotation' %}
-                                {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}boosted your <a href="{{ related_path }}">quote from <em>{{ book.title }}</em></a>{% endblocktrans %}
+                                {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}boosted your <a href="{{ related_path }}">quote from <em>{{ book_title }}</em></a>{% endblocktrans %}
                                 {% else %}
                                 {% blocktrans with related_path=related_status.local_path %}boosted your <a href="{{ related_path }}">status</a>{% endblocktrans %}
                                 {% endif %}
diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index d35bde77c5ea72217eead13ef5b3499b2b0922d3..2cddb7935337507fcce9245e070abe10274ca6fb 100644
GIT binary patch
literal 25299
zcmchf37i~dng5F$!hM5^R1yLSFgXZUh6I=#lLRLRnMnW-LQQwgOq1@ermB0AK^NgK
zqPQzwD1y2wUPN746%ZFsMi*UNyg=7=5yVAT1=kC8W!3%up7*Wpn#p1KFK&N$=UeYv
zZ@uU9KJW7$;d_Ve`R0IMyju`F4=&w52p-|NdXz$g;6IKFf(-r`z7oFV`9ZJ{{s0~c
z!{dWsE<6(+4TqsVeL3Wl;4N?f-T_a9`-Seixt_i7Si)Zn_5CP30p0);_;JtaQ-h$6
z|4pzT?mjID&W9V|UhpP(D0~Op8{Q80fp@`u;b-6;@IJU7yx;R7sCbV+efJ}H0Q?y|
z2tMuoQ>F*O;rNe+2f|aJ-Y<X@DOdqdgO@|4_YSD^-UknZANJv&g?r+^&+{vgCJ(+2
zRgZ_E(*J>f{|k5s{@=js;65~t>UjfvE_@eMc|Qe}-<RRR@M}K&QO_s+```QbyUlRv
z9tu_7X`UxTrGFZn1(!mVzYh0;*Ffd-DyVYa09F3CLzUw;sPFIe;rIFQZ$in%qi_oR
zEmXd{pXk1y;&~KQy3^p^a4tLoo&}YDAJqFx;4yF*svWNO@81sjFWAZ-YX^8X{zswm
zJN6_OJ{2mRc~Ip)4@xdx;JF?uzl~7kt$P1vsC2LO;Wt91|4t}*_!qbj{E_E>`taX+
z?mg4V<B?GLJs+yQX2LyTHw@u<a9?;CRR33?#@m%}Z}@tsa@+(pZa)B(-WQ<C@qqU~
z?EOE2`u;ai<vW1R-4`AKCD+G6)pH(HyDWrC=K{zO2rhvt-^-xByT<c1a4-CCf-2X|
zp6`NczYjpAcL!8E-wRdW2cXLTDAf4>IaIn+PIlpkLzQ<r)b|UZ%Cj8m`wjm62vmKp
zf{J$?RJu2Mz8C7dJD|QBhbqTIQ1$t~fB!?MdOYR%G*o?dJH@5HFVy=(puRuK`=>$4
z=S-;jE`pNB3!w5H@@zrX?^@5-LVfoZsP8`Hc{fx(Uxcd9{ZQrn4pjNS2Q?ml4we2M
zry@h}FxUm>dH+VZAO5SLzI!!Pxo+|A@AB^-g39L+cmRA7&W68-D#t7mRsM6J#@p#|
zf4B-tE-!&<r^})8y8<2vUka7)^-%KlHmG>FL#1~YRDSn(ehI359)haZ_n`XmNjL-k
z0ji&;Q#kPysQB}t@>vL#|7xgwF82P7Q0Y{l>N5uQ-OHiM@oK2}ul4>Lp~`hLJP^L$
z`|p4U;s3n%f6en@DEa*fRQx^XxbzN#Q}7=PmG24gAb7Ip0;qOe0hRv%RC!+H{g*+-
zABO7RQK)*p87jXIK&I5-^HBZpeW?6?3Dw?z@H}*`OJ@dDyPXbIzlBiwuY@(Y9xA<Y
zsP_2*RQxAAe+>`8|KCvUeBeCCqoMS}RH*n%q2#j<DxHn+Bsc;Q+2Hk1_4*V%7~T(+
z?{}fTf7*xdahhwF!=ci74phF=y}t`eKb#5mT_05Y4?xv#5bC?chi`$(_d2L~=*>{|
z|1ea%yP?|u^RNs4BfJ3q+Vi~m&OUh!l)k+cYW#i{s@)%i>gPwG`txz9bf18#=TlJm
z?{&HhKf?1k&l91_J;(bOLZ!P5s$OgT`%9tPVG}$Yw&02IdjJ0Kq1xlqQ1QM9mH$`a
zTKEXO6wW=v*(<MuYX5to+Ve4}_`idy|GsCsa`i)%=Q8i#<o#PbUjg;~4gURmq1xl4
zQ04gqTm?T1SHlC(a{d=XnmG6%R6QStYKNafmG^g^E16{1;J*b@h2SSp?R)$J7k?%k
zz<-A4YhXYAM<7vy`Q5Jns!-*+7OGsYf$Fa}`tX~f(tW4rZT|g7;jx6@4KIV=fck#^
zIoJ%l1;IJ+8vL)qIDRYKZ&48R!dv0d@W&9*4t6^iS%&kW`fW9w0b6h#d>hm_`5BbH
ze$IK0XTlTkuY)JU%~0Rn3b(*7!6xiE-|;SZ5&lzp7#r{vQ1$v6RC&JR{l9>!|L>vX
zWw*tyUi-tt@E;D3f+s@B?;@yi(+7`-7yIxn@KF4(f+4&aD!+g5;p1=?{)eF2<xf!g
z^)7MWt%a)3Ae5ZF8me4xf@<empycaT@4p*LAAJt0KfmtZe;ca(pM)A8*DZDF-U3yh
z&q1a4O{jMGE>ya|f-3)h%iR0tLZv?)9sy5>s`pB$a<7NS!Hw`N_*d`*cqdf({}rnI
zk3*&Z1XOyvQ+cI#IFx^;=K>#o0X&BAjZpb*fy(b%sPf+cRj+qL^~at5{THC*<pHRA
z{RArB?#rEiJ_<^2Er1%|8{m961XYe(AVVei5Znho4wc`NQ162kZXP-ms-5O~E{2LX
z03|2G-hUNTesA#MAAyKi@I|Qa_gU%M=~$?GoZvYhs{V_i>i;6R9~_3N&lOPly%K61
zycO;X$D!KwD{w0OKGgSnT;ST{V0a?_lc2&^L*?^AD7}+Gwc9m5{AM@>|Ht57@Y7J~
zjzg9Iaj5?PEmV1qd_fSL3THyK-+HKgUgBASDrXDs4X^V4S3=e61}Ob<D^&WQf-2tw
zo<D*!@M|zDofDzjdk$2;_d>PzAXGhG?!#|_8mAwJ`@?TSmG=>-c)x_thf`3_>gQQd
z^4bkmzqN2rScl3dgDU^)pxWgv@BsLBD7o4S_k*8=N^cyhybnU9_b^ocPs5YpK}-h9
zZvj+&)<Bha2p$NpgVL8bLZx>*RC|36s+}K%YNvmL%I7KX|07g;9nGYn_>17F@IrVt
zyb8{SpMYwYA41jdmr(tD&{}5)%!PV?DO7nbhlju|5S0;J50&o&Q04hHJOw@i_1*p#
zI=MU=s$EWnhrlyo2$w_Ee*~)jS3$Mwo1xNs8&v(@168iiK(+UyQ1yNis^9ls=gK=B
zs(&u@ycnt+8{xrlljlqQ`@e?D=Z#SEa0^s@KIVB3RC&GtB?tcmcZXkvYL9QgL*b)P
z>HiX{9=rFudL9c8!hbSUyDxxhht%_BQ0;M@_um9nj(2;05=t+99jaXW54idq0p$;&
z;?II}VGmS!QYg8;7EXun@!|Ku!|;CxYP>xGr@_6~yLO%hr{G@-)h}zH${)iPY{HY^
zPoT<u*ap`R)1kgw2qnMEq1tsAs+<Xw{B411r}x1l;hp~d{r>%f@C?FtyU3OEEO-?D
z3!vmGf@;6lLVbS|RDb`S=N(Yxx(6!WSKtxwTi*Xu?|%xa|E65*<mniwc9;P*kF9_j
z4>hRouZODN-$Kd3Rw()Z2wVn#1?l==!6mL8{{~84KLC$`U-o<qN}isED&KA|bm{I7
zCC5iWwcmWGcJKG^2cgobLB+ccsvX}074PHlaCk3NdwdHX4IhRo|5I=tobn>~-9o7R
z`#d*5wZ~;}C9K0O@NRe(ocCfkzA7-pe-oUk_iz>bKGe9J^AcB|g;3>M?)@7)BlsM`
ztN#6~pvwCeC^>ltq-%orLqtCKqvyIy(HRPdO7~%?as330;qPDsFWu<)IjH`bc9~0e
z7)tINQ1M;?DRS_*=VAiS$Nx^Kc77D9pZ*J~Tz`U+=Y0nq4}r@67^wIsK*d`GXTe^0
zF>FA!^Oxan@a?##ank+zl?l{%U80x#E_blMDSxNo*5ID!-=E0y?*92Hp8p>AZ@ATj
zE%)Jg?bnU}0G#sw0q#Ja8D7B@AMZ@~LHvJ*y9;*`e%0ZlIQ`Z;n4IYm5wbPWy>OLJ
zL*e>m4#5rZmALbGe}Rvqaq$)0&v3<Gg6B85jl@&i-i`Y*?i)D$-s2Fw8a{!09JiFX
z55R-q>98OElfrSY!d-}8^6_R|{@Xy<TAY58A+1+-!%g*JWx^KlJPbdEV`$p%<^25+
zZaz-u13!f;{5RM0{2g5W`z8<P<4*AJ6}}bMjk|=fs}#UbI_qTor@_^@*WjMxzuBGV
zPvM@6y9M_x+(o?mSNL9><Z%z&?YR8+w>%t+dk8nn2X?{p`R;6-bU^6SKNMDdoYQ=m
zykkDB1;3AD$OW5lZ^XSGr{B+U`}l8u%=0}8^uOm8(z@6`&*9x+Jii|<gLU{>T#S1k
zZf_s&h491pd*Q=Szdqd6xFZPr0{k8BN!(?){Ks$)ZuB1M`#$29aBK4ja0dSK;0oLy
zaT>3S32VUb;WYkBxB<fE;ts)GhhM*+;2yLmXSW~E^N(;5an|8Z;&~(PB|Lu@u7qEL
zFT+j2>32F|`rU@xi{~0#2rtE*q8I#Lg!>2FiwWBsR&c9u$KluSFx($-`{VEOVQV~J
z1ph;k_`MZ(8UA;}necN^zc1oGkDDqFzkkQ|;{Fjgk9dC#^=smOj~l{0g4>gKAAtI4
z-nbC=TX_n<cNU&s%kwd~kK;yhN8ldA9ZNcA!}ak0!D(<19s?hR`W@vEEP?-tdp>SD
zZZS^3kKlTUe-qrS0ROuK{tND(ad+Zw#RbGW0gUL`|MnnkHtxT@|9PHogM);h3a`N}
z;&}%A4DN@xx8M%Mok6&MU&Xz^o}BG`IN_hh|8*aBGklJJKFWWy#rvn@pX;B6Z~N!7
z;G1xBcz?A2#=kQBqUiC@XA$oro=^1gU&`|-{`qS>&&0g~cLpxP{Ry`S_Xb@48|UF&
zxKHA)#2wG~_rqV|^!qjLV8VV02XN=$-hn&S=fh*L9QQZ4=M#3M55E}yO56h6p1A#d
z`0IGq?^@h__C%V6v=nq4ZoUsY7cRvAS9-xO#2v1O!tY$3KY{x%+!eS3aQUyFhgqbt
z4DPEm!>C-2%i+SfcJ9I`97*G$Mbl=?988i;8yit`WL7rqT<>jGn$>t#ws1~#?!q}l
z51UCimbB8aTFIK>w8Ga4D12?+dQ|ftPYc4VH9Q<=P4Xr8N`3e*mi?SkD~+15>acAo
ztnlq(&#BZJN!pw<V`dsx`KG+FQdaF<uxcHal3Jr0^J;c5V`eF7)thlTD+`B`YBkwR
zH3)Up3`e4@eo`~c;$|3yX&hN4hm)vE<TRWyb1aVdQpq&pv=rByv$7d8+UZXvycrE{
z^er9^RBCaxQjZC4WpUccBdjMr_c+bAeXESab_L0+-JyE3(P}{Xlc8|NOckyjqVBhj
zRtXDPR;*U-`i4<`EY$0Xd3T5XBXM;!R;a6JxXw4ha&p-=bZwdpr*W1AGgnlaG*>mD
z+(=ieQKloN&I-0$hk`tYgJWSaQr?4kh10lEt;A*P#9V48q?ytMZHc9uYxu*YZgM$U
z{54XLhG#FoD_Ti24u{gD_J5OK8jn`u&FXfI`oDPfvS!q5nKT7G=!*I#buHb^*su}U
zh_Y;Rl9t2Gm1;E{j2SgFe%?)SEvi(dCQLwj`d6;*4tfTY7BNOD8FACmI1PGArMS@)
zG%8`UGFoYl1wG}mT)0>QZBM1d;uF@4h7}T*Nw8e2)I-b4d(dDgj!IGwdMH#4;f&B&
z@+6xn{BZj{@#}RmEya=<V$_?Jt|du|E<twjjwSUtEJbzIA+&*|x>@0+l8Q0BT6D2a
zMN1A|9+x^z5j7fVGRgqzu?G@wHAfOEZwObGDL`eYqT$#x8a1P|J6If*HU*0-2~U-@
zITC6-@mx(5tiPz>^)`UjLV^BFNJjw|jit4arcN4hJ<L$}CAugXYHp6wcy@S6(z4o>
zl6o_(47QMDG#mpCUCLKkE9OfEQa-ngG@FgAd(NEUN^_(&IGeFHr<R~Yy3#lvjpwL=
zHk0ABbC*||D_VmZX|t_dnFe{TV0{Q(I7|(guy~s7^x`zVV?uIb7c7bBnrg6QB&rX`
z;aV?ixj#cu4FyZ8sAEJaN=qYnk}NI<OOi4*848yq^>VA!Z2PIF{M`hYmVou4N?OYq
z=Hjdv^=3r>S>GdIPG)Ew`hQq6Lp`k25!1LGGsA<N5SJjy=@JyR-W$S|KDP7qNqYPn
zDO~E|UXX4+5PXOUnt%3Hwy4a%^>XOuNQ86Dr{ErK<}3$GktE;k!BR?-3(?Y8^Hv&F
zD_7E7OJhxp9!yIT#F7o5EDv-UyNG%3cwch_b%4;I_9da&dHFXsOptn;9{ha3yR4K}
z8XBG5!O}`uGwo1?ifkT<Os9mK<1`Mdh>~mzW?a&%q#8=A@_{_bkM5yjZ6PgAm7VF&
zwEogcR*F(8T*+#Pcdi=bZ&ahPP(s)pEGsjS`Qd5L8b~hGy3N9v_J%6e*af>Dv~cR%
z3GXzDi|1NV@u<Gd-Gx%4MmuI3qr&`to}6aIUshD7lyggihRGbq<j16`W2Q(?XF)Hz
zm+^(XYD&gCT0#E1gWk9tOT7`4KZX6KiTNg0u%vwiqj38Z%rqaN9g|E{QQ1(vm6Xxj
zXbmE?BZNDZ)oV6Z;D9-C1$qT->;0+ohf!6jjM)q_+rN}LbkTU~O6t`y@3qVlrrtEv
zNJW@=kq#%5rls=~T8kL*y=f(`m-&8qT(|0ntC>dqpj?hlr<pV+W#oj7v@#l%Xwv0L
z!rT>=vv5<4cSQxgLX)?uO)N*v`3cgWqC=ZeH5sN_!HT372P^v*uMX$U?e-6xQ!9kO
zHJgZ5nz4${^sJ;S%RT)z-{w9k)cm<^zbYB~5G9$?jRn8vVCKSn%+2;O>8X|VQnh7;
zm-#?;-k&uRq$H*B<FrXAX`*szm!YKNTW!Ol{jxu9Hfet);-i;~gW9!e7F>`}l(x>7
z4}q95Qz9`d3;H4iC1xZLI7rj>#nCA0Gt|V5AoW!S(<mK7g`fni?fWX5n7Ul^^daCx
zAq7)^rc2}{*`&lA+m{T}4hD=3(fN`vt3_3=3lPGzx+<cCb;iZ8DLd3by+vT1PVy5g
zo)#aBg>L%B&@)j+81;3tWW{qG*!H?9c~!JU)^!%FiklI2j)GMQdMzqgKbkx&FfnyV
zRK<{vkooNzT|(NKlvc-En!)NMWMZn&T5bX&st-Y}Fkz3y&8Z5K@MwM0s+T8urByZW
zG7i%*mPwOeGhkfJ5bn?-O^&Uh;?v$<V!jh81d5xn8M<|tl~gJ@Q@_b<r)3A7B{N%v
zaPO?h+ex+=_WH^cC#W?``j&*NTeZO$lW7eaLWXJEX44dz#x>^S?U`?Dl14T)Sc7e3
ze<-H9UP3{$vnVVlo9%^{MtiP0$#g=wR^z!l$So6|P%;u(ClhPqRPzk-87__MEMkJS
zBV!qJYc*v4VD+dD3)WVnl7Qi3e{%KXJSe6iY2~%D{4ut8Fy$1kO{$gB*d#9{@UJn^
zHIl3yUGtlsw&Cw%A%FQa2Hh$ye+bvx`c0MduXvJPFF8oPcb>eWzfg;zU|oN|EAl#-
zKm5^vUWXR7KPr>0Bo!i$7O&mBGC^_e<~>f&W%)Zd!q*k-ciwc2`LJZhU)W@jC_VN8
zG|P@u8cIPT;9-l0b*w7K2+&F<?>_I%#~a>eIu<faYf3>a7xbg0f_`UgI)tR5`M`(f
z-fiU9$JWq`OcwJGIw3N?H3WErra+g^m}wS6dugBRhQfOcIJ9X$7MzULYL!PszU(X}
zzw~ioPIWOFZ2BdP88Hj%e&jfBw}P=<!)0m8;>3Go7V)g@5OtPSZG@#%O<M>~%`oOp
zqQF>kG95H!s%vcmaJvYnnzf3_S=!`Rj=5pj97&Vb@Q7O##;C6-o$YhW(`o0L?@8Eu
zg$DhmF3X;@gbJp%bNdfIpsEcDdsRcnx~HAb<NcN4I%6Q{msM}egkjm#NL0}8*H1ju
zVmCu=mXh0?CiUT|VSkb$HMydXnp8$1Q^NtRd7aK?w}{CYZ(Y_Ii<>lLZCGJ%s=qiP
z(;d#6h0zFYIyLCmoWB#(%-%CHJ@cNBpLKlD?^dPuV5TKGv{-&;s6qcQ)Y5#HYYakd
zw=btxY(CWHZeG=D%+*S&VTOt9&yFw82P?fa(q2Am>Q`e9^z^?V?Cn|Ew`^%J5DoJw
z7B~-CFu>%~kUo|^_fkuS<s|mob8$_n#aoz*rYg3kR~$|1WYR*?%J4{&u+6kT-Qw1X
zlFh=fBNZ*_GG|Y9lG55lB5u>In_MR)=f;$hi)`eoKogU)E+=JKRXjT#MHW1361A}Q
zTo~6H?0eWt8~A!_VY35mBWB8@%p-fb?r(RnzTRass67<d&b+7=Os4f%blU$Qp7JG`
z_2@>K8iCXFW_S#F4@TvB7IoE1t%5G)F=bWiw`I(i&l~c%RnrFBma2!EP4oHkqR4Fq
zN!9N}X!B?q?!iTI6;n43E~;#*G?0?0^JEK~?m)X1>gckTt!jJ5U}lo;Rf(yZ3I>Yb
z=$*yz$+DzW(W<9y9p@Tiwk4=d9?b=);F8;JK<u;^(wU@87Mk>fGyUy-Vf~ixS2o-V
z&}7$^Z7Od$kuZ&zjf+I($$H5eGikJHNOWC^EHc8J?_Y&&*|Ya2N!-zMr3mHOq%u=g
zk35vBI6sDuGTZ+0SZ~^s%T9NaNm?S{cIeFGW@CGFIyh7QsT+IlQG(_}Cs)`-Z~~YG
zHeU7D1k=+^6NLtzyfKWJ_^sX@tW>S_cQv(L+{oS4<aTYJc2`qFf#ln;wviUut|1e@
zZv(^{T{;wvCaJBc#?%wL)O0)DM&9)Vcd_+$J;7aTzg<tS(1OlLK?C~5Tv?J9NR*h6
zXi0psT%u>80iRi-yV!`&EYV$S$Y+*jp)pNsAjX?!Yp%{vwZ_2zbq8dD)vO#~K+){>
z7qdEWMI*$`%7E!YtskKe{bs#0R;8J}@yQHp3axmEr~He?CMo^d_%g+qAe?m?P$TW7
zXtASh`>vJct_`eH5s2<^?(BK9=S^Y3z^-`Ls%*GY?poX$&bkJY?r_T5HC^ji8YpJh
zQmWS-o;LTid0lhocg;O5oOfFH{IgD(J8$mXDcbMo8c3sh#=0a)yTjgSkR7RTam1EH
zCDSfDyK~xdK0it~jZ|i{n{_T<)rVWOYu7*=)w;t~+H7Zq!Df57u&?j@>ZEAh%uE}5
z*G*Zqa@Dd<`RC1^JH>C3bq$O)D591~bJ+2$)X&jum(pB|)(`Y{o!yD2k`Bdb*RndM
zDwAw?c=lkWIc04XE4bR#%dT419o8G>%@&<@PUs#N&8&x07lrd?oil~g=`gw+vwnQ5
zDVc&gQh&8i>?WUK<tNnR?+QngCbOK`E8)E#dhF`k3u!2{kcN3>iMT^<;@*3YN}ywz
z@vXxtg{VGu_03iwEQh~viFSN+?F;5=)~?RZ&#!ISp~);{-;~Z{Q=vY-HJ*5o&4Qy|
z_vcvou3K1FmBXl2YSqK?_|~CHsC8nCMr~+@$i;v1S$3WUg`ISqO~_+c-x&6CtXEdr
zB*wahE)FJ~HM@KpQRZT)XyaRF#<M2Iio$BEsAO{sN~ib*!z8nkYPHw4RjQRymTzj3
zNr&9ZSdC<@VOfUA5j!o6u=>O^c&gGJj$hB=)A(&97A)Oy`?U8!808Y4?KWaClWhwI
z({OxcSdHA$#afv~qQsbTFd9;8({{%f4=em$zjbtjGp(QyYqIUbM(Oz0hK{o=dV8!C
zJ|PM8X?uuxOCe%sfI)$Eu>IYACHE|6T)}wp4flVSDRxkWxg#Iyla<Ua+yi*#O>EO*
z(^_zS9kqpeHvw=93YPe$&T1S|AVUlebUDkXD2(f)$ruW%-HV(yBayteQ|&+p=aSZ7
z{A#UU8VSRSV`=+(G;ZZ5=xiJ<;gSn`Zho!CsO*sf=7lHUY2B&8(++Csh&ySq>m$Wb
z2zH0;7nlaO?A`g3<X=NyC!OeE&E_W6+Z?_RFk3NH+Q)2U*<$LeXf>%6;<`VJH?3tk
z=s2F0GBGj69=rMtCbTIFw`xEO-0XKH*psd>rnyGow0lZ|g^KNROit;O78|sMhS%Zz
zpoyzHs8_S7*i<o;VbbE9yu<;IKdxteYkgr2vP~>^kZ%=ZE0M9U(|q&FQcxe(nff#B
z4Ol3L`r2*xy~vrl{Nr0W)liR3%CzPBF<8u8szZ018&LC{Lsd$ZSf_x4I^*A<UO)^-
zQA@Hgbk0wEQJEpr1!}mI;|+`(tID9AV}+xYg8lpdb?$G4mN}?-#?8#GBAEnB^>TB1
z@%*1=VA@`bEr!v9lpx|-`RJlWy~PogKl-;f#c|XQ*Q7MQ)$8<N1Lt+b)h#X>@`H?w
zUM5ebPMVn3*C3J#)j`bU0P7HjlMG|E6A|pHfOU_1Le0lvu@wFrv*O5?&X_nzoHj@X
zIj*eewT>FNLg2(r78=v3%Dc_z3d^lf*9#~_dz>y|0#IQL+a%TrHR~ylrldQ~)Bcub
zFul<Z@J82;KO^rD8@rZZRVXiYv&GJzSLJWm{j^&rYHu?GVy0Rz{(M{-zb&(NWBSeS
zBxEQq?Iot{wXg}DKbbC>csrr+ZbHop;cXG>grQ*ERRu|apUWx3d4;S>%-M7<x+<Ty
zi#Hdnz&5aCZ?LIzrPO)YWFvbNJ&tD9)HAA)S7H~E!?gHH%OJnP;5X=XI_NGZ<pCjy
zm9}paVfy>qgEqsgi!bNWMjCjUEV{%vNvnm?5O+96#<yBg=?uGD<V0&5J=J-wewV80
zgkYm-yRZ;KU)v5>A!tI|cfQ?DOyBZ_hTl;#<JafcB<Q4qSu^39ge?jtUX`H2_ugYI
z)Ki>9tsU&fgd1+1M|;!9WX)cy-Jn1~`_K$#%4ztsia<6wpg=5p-7O0Hrgwa+lYVzj
z(&AWiC=cS=!nP*zfLZR0aJQD(z5!<C4_s6-?DO_IUG1!XIvR5{u2p2Uni#7w?aGC_
zvtwoJmt5M4AVqLFsF9jCi@m)}$ipWEYn^a8mWVe>FbLXTFfF@hGpyN-uFJ$y6S)_;
zy)9jdj$_xe6*f5av;v~g>FR>%ljt<j1T?>;;YvPMYed2F@vW>FG_gxfaz}48uA*%V
z`mzUqs=<kR_c~4*+9qbVBvJNMW(Y$9+i6Lak=ee_VL_{+O!KYj6_l8c@ghxvYC9%+
zTC8xfgU!!YT&d=FJ1hZr&trc3**z35c`!iTDJIzzOq70`)oc`ynKNsgT()CVTQ?S6
zh`nvE{d`86wA~9#O>DT-snWiQX}VQo($eY!8TT=Lxe&2JmeklA&h)iu5Z?oKKLl0k
zj-$Bw!SM;#1Z380F`;>-;%|eP`jKKSgjso+)}z|^ZPu`p-WQc?yH$L8uCDEgGLyzj
zIGsc3w(W{#xhd&Huzky9DJs(ql$xnPH$pU7S*m?9zkCguSeRcWB>wb*?fCkzMazw6
zy2P0y*nwLxpS0U5<BaPAC_Tj0HHhlwWzyv$1)5(?={K9B&ZtH-@bDQni1#yY>YQh>
zm8%OXTH?t#afuLM536io$#iVrTVbNCmnscTW;Jd!Xk>M}IemiBO{h}}8nf8t+-}jZ
zlFye^D+9jdat2*pFU!7VG|M>HCYV_U1CvCyRBEl7jha@o!ceqUU}}@0(Vp^`At*E$
zb`KjxT>V98w1AOO!=92Gboo7)c0k)y(an*X6>+sxLDbsT?&@!GEdsTJwa#uwQB{PP
zRa}?JUzkr@7S0^&h^g9Os*B}@UOu63FU)=H=O1YiF4FKl)~n?|F#(@b#}3Uc-)%qC
zs7GA#tkLX@+MPu=xy|cr7sH$sB0RFEe6_ta<Vy-QNxSQPiJiRU8SgmXm8>D?glLe7
zX!V4<qTIqk{E|>ta;&q=M9Sh;m8~BoC_~A1;1E$3AX(e8>!?O%G$vwaemS+irqxi(
za!<!>-&jnMBkMT3uw$Q0m?wtfI_5rxOz||*2DbwI6&@?%TJ2ifQ*m;#0Kb4iVMZ8(
zG^I2XdL$p{w3{tweS614Eeuz?Qp12mbhW~1=)MoVY-*yl#od^RwZz+YuJTJAyJbTI
znO^0raa%iLt@;+-VBM>0K<%v#?x@)9AuGoYURd3>&0hmN*ZuzZpHy7a=uQz61)JlP
zrnnhae0I(0Z*`!<oWF2oh!k?ef3mr<Bwq#fR?)0nAd+O!O!^!2wI=S(P4pGJ%FBFy
zo6;#FsZkpV>H}%wLO^@oa8}HK48XSO%u+g)fneHn;${U33=_vr^DY1OZKKW-qVvS}
z?#hwdvC~@8PMEh@KXz8J6W5i&G8PGAh=eQ?XDr~6j!*bU1}JjmPRke?9is_d>Mf?I
z#gfbkN6@LM7SURh(7fvkMvu;k-C~7%Qri#Tu};WS#9H%K%Qhhz@Vxaa%?+9fRD;P^
zoC+$x7{^_6Vn>NRpH5||!ZPih(HbP}56b;gs_;ew*G%9^rf!fcEK?xN*(A-SDC^Pw
z&LelBwEa^WzeAG-_JZxXX_2L6x%V!Wp~-$&hKi#sbvHT66wrdo>{RW%Qhn|ZsN3kS
zA=jY!F8rxlQD;nJ@s)0;kad<_%9EAFlxLcN1QCKr9nArN&(*4rUfR+Aey{<HSX&`X
zxfads@=+V?XDQBhs|SS*@m1O_;v;shG-}jag%ZgQ(?85&eSuutL;itcGU#@0Pxn)e
z&Y<!dF~4Kg-tf@XUF~LZTZIh=*AeI>+vBG&ws%8+oug`H3Dz5)slgIky>}K1b`GLr
z0kb{qrj>em(pNpY109F{%9Tk$k12k&zqfp)4@uwlg-W!|pI^!OxP_&h$v_<iF3sX@
zW;M|k8p+x$A&WO~6p;Eo!4#{>GA*tHXx$d~O8MH3x9FwL6T;r!<Mpp)>##p#!<s4D
zs<wVzpA$d!K;4E^#}e}Ukz6!FWX%BCaU`e9*xa^jz1HwdO=umgScX({{8qF|aS7ee
z4rSzKhXLL5T3KZf)vzYgh<|rs`qrPG=-D<=Y=^~-VYQkzUF_Nyg^OH|6pbzf#ud6#
zAv5hluaj(mx?yQ`^Zh{^dNXS07GmfY!EETf!3xI^qM+3)T9k^BKPkyv6q($01x!N7
zv8vmHw8nDgp29~Nq7w}>_i=l0+SiIDYgo27@rM%jubtgZ(*)LK?yvPSW7Bq#RXMkX
zip)tEw83hl%vPckCo8|mksRfV9Jf-*-0DH|vh;kWbH8QvD#y`U-I``<7giVFB|hqe
zc3^umZ55@a;rxLZ7xHz}j8w+oWyS7sm(7q{R4o0YLk(|znBG-W`?W@X_+YbzY^I{g
z*Q0F=Y$DUc6z0zl*9#E27#qZv-%QnuS>27Y<l63qG%KqaxhA3Bo~6|Ev?)OP*_1jh
z*}02WRHFW38ePXfD7KWmnQUrW+r&(po%190`2;mj8)`Ioqre0a6IBa3>fC72%9Bo-
zI|q&wgBitk$}D50W7UY<0;)3#)Ovm!%1JkV+a}!3ckNl&Virc=?0j^!H*;9Iuq)Z#
zw3@i|nrL;K$~JS3CZFmW%F6m|93XG7V>vHn8#r9EA(@d2GMb+yIImSZf3#J-`*?e8
zHTir0ts8p`94R>sLqueoKAL>o>r|8-MA*7uXXmKTC|z%NYk)j!Y3}0D>oX~*(?}+(
zG#X=x{W<>i?5vDd^lf7;YKzNfxk06;_=h}gRoJ=J^5?s4*P8c#lf$kx_WvS>PSa0L
zB;S$_a)Zof2it)QMs@ZPp$zO&9mc9#*V{d({9hAy{$~yO#gAtq<~z!vaBR7q40f$U
zc3AwKC%$WavBSifQw!%DlT|>c9|FyC?n1-%FWuRJ8=LZs4ZE5Xu^iD<Ep41X+nELh
zHuFDU_@f3oi$mYQ{v5#K?O+*&aX5nQrdfdrs(3NaSy|}ve2o+QnYgw;-Hz<!0ZTdf
EAJoEVo&W#<

delta 7162
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
CS?0e0

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 0c770753..750a5de0 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -435,15 +435,12 @@ msgid "Something went wrong! Sorry about that."
 msgstr "Une erreur s’est produite ; désolé !"
 
 #: bookwyrm/templates/feed/direct_messages.html:8
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+#, python-format
 msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
 #: bookwyrm/templates/layout.html:79
-#, fuzzy
-#| msgid "Send direct message"
 msgid "Direct Messages"
 msgstr "Messages directs"
 
@@ -662,8 +659,6 @@ msgid "Sorry! This invite code is no longer valid."
 msgstr "Cette invitation n’est plus valide ; désolé !"
 
 #: bookwyrm/templates/layout.html:33
-#, fuzzy
-#| msgid "Search for a book"
 msgid "Search for a book or user"
 msgstr "Chercher un livre ou un compte"
 
@@ -706,8 +701,6 @@ msgid "Site Configuration"
 msgstr "Configuration du site"
 
 #: bookwyrm/templates/layout.html:117
-#, fuzzy
-#| msgid "Log in"
 msgid "Log out"
 msgstr "Se déconnecter"
 
@@ -899,8 +892,6 @@ msgid "Not Found"
 msgstr "Introuvable"
 
 #: bookwyrm/templates/notfound.html:9
-#, fuzzy
-#| msgid "The page your requested doesn't seem to exist!"
 msgid "The page you requested doesn't seem to exist!"
 msgstr "Il semblerait que la page que vous avez demandée n’existe pas !"
 
@@ -909,74 +900,56 @@ msgid "Delete notifications"
 msgstr "Supprimer les notifications"
 
 #: bookwyrm/templates/notifications.html:49
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:51
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:53
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:55
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "favorited your <a href=\"%(related_path)s\">status</a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">statut</a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:60
-#, fuzzy, python-format
-#| msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "vous a mentionné dans sa <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:62
-#, fuzzy, python-format
-#| msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "vous a mentionné dans son <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:64
-#, fuzzy, python-format
-#| msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
+#, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "vous a mentionné dans sa <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:66
-#, fuzzy, python-format
-#| msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
+#, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">status</a>"
 msgstr "vous a mentionné dans son <a href=\"%(related_path)s\">statut</a>"
 
 #: bookwyrm/templates/notifications.html:71
-#, fuzzy, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
+#, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">critique de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:73
-#, fuzzy, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
+#, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">commentaire sur <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:75
-#, fuzzy, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
+#, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">citation de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:77
-#, fuzzy, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
+#, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">statut</a>"
 
@@ -989,38 +962,32 @@ msgid "sent you a follow request"
 msgstr "vous a envoyé une demande d’abonnement"
 
 #: bookwyrm/templates/notifications.html:90
-#, fuzzy, python-format
-#| msgid "boosted your <a href=\"%(related_path)s\">%(preview_name)s</a>"
-msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book.title)s</em></a>"
+#, python-format
+msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "a partagé votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:92
-#, fuzzy, python-format
-#| msgid "boosted your <a href=\"%(related_path)s\">%(preview_name)s</a>"
-msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book.title)s</em></a>"
+#, python-format
+msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
 msgstr "a partagé votre <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:94
-#, fuzzy, python-format
-#| msgid "boosted your <a href=\"%(related_path)s\">%(preview_name)s</a>"
-msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book.title)s</em></a>"
+#, python-format
+msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "a partagé votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:96
-#, fuzzy, python-format
-#| msgid "boosted your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+#, python-format
 msgid "boosted your <a href=\"%(related_path)s\">status</a>"
 msgstr "a partagé votre <a href=\"%(related_path)s\">statut</a>"
 
 #: bookwyrm/templates/notifications.html:100
-#, fuzzy, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
+#, python-format
 msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 msgstr " a ajouté <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre liste « <a href=\"%(list_path)s\">%(list_name)s</a> »"
 
 #: bookwyrm/templates/notifications.html:102
-#, fuzzy, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
+#, python-format
 msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 msgstr " a suggégré l’ajout de <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre liste « <a href=\"%(list_path)s/curate\">%(list_name)s</a> »"
 
@@ -1114,8 +1081,6 @@ msgid "Relationships"
 msgstr "Relations"
 
 #: bookwyrm/templates/search_results.html:4
-#, fuzzy
-#| msgid "Search Results for \"%(query)s\""
 msgid "Search Results"
 msgstr "Résultats de recherche"
 
@@ -1164,8 +1129,6 @@ msgid "No lists found for \"%(query)s\""
 msgstr "Aucune liste trouvée pour « %(query)s »"
 
 #: bookwyrm/templates/settings/admin_layout.html:4
-#, fuzzy
-#| msgid "Registration"
 msgid "Administration"
 msgstr "Administration"
 
@@ -1319,8 +1282,6 @@ msgid "Un-block"
 msgstr "Débloquer"
 
 #: bookwyrm/templates/snippets/book_titleby.html:3
-#, fuzzy, python-format
-#| msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgstr "<a href=\"%(path)s\">%(title)s</a> par "
 
@@ -1369,8 +1330,6 @@ msgid "No rating"
 msgstr "Aucune note"
 
 #: bookwyrm/templates/snippets/create_status_form.html:54
-#, fuzzy
-#| msgid "Spoiler alert:"
 msgid "Include spoiler alert"
 msgstr "Afficher une alerte spoiler"
 
@@ -1730,8 +1689,6 @@ msgid "More options"
 msgstr "Plus d’options"
 
 #: bookwyrm/templates/snippets/status/status_options.html:17
-#, fuzzy
-#| msgid "Delete post"
 msgid "Delete status"
 msgstr "Supprimer le statut"
 
@@ -1755,8 +1712,6 @@ msgstr "Livres tagués « %(tag.name)s »"
 
 #: bookwyrm/templates/user/create_shelf_form.html:5
 #: bookwyrm/templates/user/create_shelf_form.html:22
-#, fuzzy
-#| msgid "Create shelf"
 msgid "Create Shelf"
 msgstr "Créer l’étagère"
 
@@ -1770,8 +1725,6 @@ msgstr "Mettre l’étagère à jour"
 
 #: bookwyrm/templates/user/followers.html:7
 #: bookwyrm/templates/user/following.html:7 bookwyrm/templates/user/user.html:9
-#, fuzzy
-#| msgid "User profile"
 msgid "User Profile"
 msgstr "Profil"
 
@@ -1790,8 +1743,6 @@ msgid "%(username)s isn't following any users"
 msgstr "%(username)s n’est abonné(e) à personne"
 
 #: bookwyrm/templates/user/lists.html:9
-#, fuzzy
-#| msgid "Your lists"
 msgid "Your Lists"
 msgstr "Vos listes"
 
@@ -1806,14 +1757,10 @@ msgid "Create list"
 msgstr "Créer une liste"
 
 #: bookwyrm/templates/user/shelf.html:9
-#, fuzzy
-#| msgid "Your shelves"
 msgid "Your Shelves"
 msgstr "Vos étagères"
 
 #: bookwyrm/templates/user/shelf.html:11
-#, fuzzy, python-format
-#| msgid "%(username)s has no followers"
 msgid "%(username)s: Shelves"
 msgstr "%(username)s : Étagères"
 
@@ -1822,8 +1769,6 @@ msgid "Create shelf"
 msgstr "Créer l’étagère"
 
 #: bookwyrm/templates/user/shelf.html:54
-#, fuzzy
-#| msgid "Edit Shelf"
 msgid "Edit shelf"
 msgstr "Modifier l’étagère"
 

From 4a06cc7a66ff4b885236d312811783334abb4322 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 4 Mar 2021 08:04:00 -0800
Subject: [PATCH 0173/1285] Revert "Un-fuzzies French translation strings"

This reverts commit a5d2cf4677bebde404511787ac5e34e615d86955.
---
 bookwyrm/templates/notifications.html |   6 +-
 locale/fr_FR/LC_MESSAGES/django.mo    | Bin 25299 -> 20489 bytes
 locale/fr_FR/LC_MESSAGES/django.po    |  87 +++++++++++++++++++++-----
 3 files changed, 74 insertions(+), 19 deletions(-)

diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html
index 007e6b05..f6fd7dab 100644
--- a/bookwyrm/templates/notifications.html
+++ b/bookwyrm/templates/notifications.html
@@ -87,11 +87,11 @@
                                 </div>
                             {% elif notification.notification_type == 'BOOST' %}
                                 {% if related_status.status_type == 'Review' %}
-                                {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}boosted your <a href="{{ related_path }}">review of <em>{{ book_title }}</em></a>{% endblocktrans %}
+                                {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}boosted your <a href="{{ related_path }}">review of <em>{{ book.title }}</em></a>{% endblocktrans %}
                                 {% elif related_status.status_type == 'Comment' %}
-                                {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}boosted your <a href="{{ related_path }}">comment on<em>{{ book_title }}</em></a>{% endblocktrans %}
+                                {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}boosted your <a href="{{ related_path }}">comment on<em>{{ book.title }}</em></a>{% endblocktrans %}
                                 {% elif related_status.status_type == 'Quotation' %}
-                                {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}boosted your <a href="{{ related_path }}">quote from <em>{{ book_title }}</em></a>{% endblocktrans %}
+                                {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}boosted your <a href="{{ related_path }}">quote from <em>{{ book.title }}</em></a>{% endblocktrans %}
                                 {% else %}
                                 {% blocktrans with related_path=related_status.local_path %}boosted your <a href="{{ related_path }}">status</a>{% endblocktrans %}
                                 {% endif %}
diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index 2cddb7935337507fcce9245e070abe10274ca6fb..d35bde77c5ea72217eead13ef5b3499b2b0922d3 100644
GIT binary patch
delta 7162
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
CS?0e0

literal 25299
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
EAJoEVo&W#<

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 750a5de0..0c770753 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -435,12 +435,15 @@ msgid "Something went wrong! Sorry about that."
 msgstr "Une erreur s’est produite ; désolé !"
 
 #: bookwyrm/templates/feed/direct_messages.html:8
-#, python-format
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
 #: bookwyrm/templates/layout.html:79
+#, fuzzy
+#| msgid "Send direct message"
 msgid "Direct Messages"
 msgstr "Messages directs"
 
@@ -659,6 +662,8 @@ msgid "Sorry! This invite code is no longer valid."
 msgstr "Cette invitation n’est plus valide ; désolé !"
 
 #: bookwyrm/templates/layout.html:33
+#, fuzzy
+#| msgid "Search for a book"
 msgid "Search for a book or user"
 msgstr "Chercher un livre ou un compte"
 
@@ -701,6 +706,8 @@ msgid "Site Configuration"
 msgstr "Configuration du site"
 
 #: bookwyrm/templates/layout.html:117
+#, fuzzy
+#| msgid "Log in"
 msgid "Log out"
 msgstr "Se déconnecter"
 
@@ -892,6 +899,8 @@ msgid "Not Found"
 msgstr "Introuvable"
 
 #: bookwyrm/templates/notfound.html:9
+#, fuzzy
+#| msgid "The page your requested doesn't seem to exist!"
 msgid "The page you requested doesn't seem to exist!"
 msgstr "Il semblerait que la page que vous avez demandée n’existe pas !"
 
@@ -900,56 +909,74 @@ msgid "Delete notifications"
 msgstr "Supprimer les notifications"
 
 #: bookwyrm/templates/notifications.html:49
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:51
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:53
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:55
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "favorited your <a href=\"%(related_path)s\">status</a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">statut</a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:60
+#, fuzzy, python-format
+#| msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "vous a mentionné dans sa <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:62
+#, fuzzy, python-format
+#| msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "vous a mentionné dans son <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:64
-#, python-format
+#, fuzzy, python-format
+#| msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "vous a mentionné dans sa <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:66
-#, python-format
+#, fuzzy, python-format
+#| msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "mentioned you in a <a href=\"%(related_path)s\">status</a>"
 msgstr "vous a mentionné dans son <a href=\"%(related_path)s\">statut</a>"
 
 #: bookwyrm/templates/notifications.html:71
-#, python-format
+#, fuzzy, python-format
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">critique de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:73
-#, python-format
+#, fuzzy, python-format
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">commentaire sur <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:75
-#, python-format
+#, fuzzy, python-format
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">citation de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:77
-#, python-format
+#, fuzzy, python-format
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">statut</a>"
 
@@ -962,32 +989,38 @@ msgid "sent you a follow request"
 msgstr "vous a envoyé une demande d’abonnement"
 
 #: bookwyrm/templates/notifications.html:90
-#, python-format
-msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+#, fuzzy, python-format
+#| msgid "boosted your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book.title)s</em></a>"
 msgstr "a partagé votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:92
-#, python-format
-msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+#, fuzzy, python-format
+#| msgid "boosted your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book.title)s</em></a>"
 msgstr "a partagé votre <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:94
-#, python-format
-msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+#, fuzzy, python-format
+#| msgid "boosted your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book.title)s</em></a>"
 msgstr "a partagé votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:96
-#, python-format
+#, fuzzy, python-format
+#| msgid "boosted your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "boosted your <a href=\"%(related_path)s\">status</a>"
 msgstr "a partagé votre <a href=\"%(related_path)s\">statut</a>"
 
 #: bookwyrm/templates/notifications.html:100
-#, python-format
+#, fuzzy, python-format
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
 msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 msgstr " a ajouté <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre liste « <a href=\"%(list_path)s\">%(list_name)s</a> »"
 
 #: bookwyrm/templates/notifications.html:102
-#, python-format
+#, fuzzy, python-format
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
 msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 msgstr " a suggégré l’ajout de <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre liste « <a href=\"%(list_path)s/curate\">%(list_name)s</a> »"
 
@@ -1081,6 +1114,8 @@ msgid "Relationships"
 msgstr "Relations"
 
 #: bookwyrm/templates/search_results.html:4
+#, fuzzy
+#| msgid "Search Results for \"%(query)s\""
 msgid "Search Results"
 msgstr "Résultats de recherche"
 
@@ -1129,6 +1164,8 @@ msgid "No lists found for \"%(query)s\""
 msgstr "Aucune liste trouvée pour « %(query)s »"
 
 #: bookwyrm/templates/settings/admin_layout.html:4
+#, fuzzy
+#| msgid "Registration"
 msgid "Administration"
 msgstr "Administration"
 
@@ -1282,6 +1319,8 @@ msgid "Un-block"
 msgstr "Débloquer"
 
 #: bookwyrm/templates/snippets/book_titleby.html:3
+#, fuzzy, python-format
+#| msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgstr "<a href=\"%(path)s\">%(title)s</a> par "
 
@@ -1330,6 +1369,8 @@ msgid "No rating"
 msgstr "Aucune note"
 
 #: bookwyrm/templates/snippets/create_status_form.html:54
+#, fuzzy
+#| msgid "Spoiler alert:"
 msgid "Include spoiler alert"
 msgstr "Afficher une alerte spoiler"
 
@@ -1689,6 +1730,8 @@ msgid "More options"
 msgstr "Plus d’options"
 
 #: bookwyrm/templates/snippets/status/status_options.html:17
+#, fuzzy
+#| msgid "Delete post"
 msgid "Delete status"
 msgstr "Supprimer le statut"
 
@@ -1712,6 +1755,8 @@ msgstr "Livres tagués « %(tag.name)s »"
 
 #: bookwyrm/templates/user/create_shelf_form.html:5
 #: bookwyrm/templates/user/create_shelf_form.html:22
+#, fuzzy
+#| msgid "Create shelf"
 msgid "Create Shelf"
 msgstr "Créer l’étagère"
 
@@ -1725,6 +1770,8 @@ msgstr "Mettre l’étagère à jour"
 
 #: bookwyrm/templates/user/followers.html:7
 #: bookwyrm/templates/user/following.html:7 bookwyrm/templates/user/user.html:9
+#, fuzzy
+#| msgid "User profile"
 msgid "User Profile"
 msgstr "Profil"
 
@@ -1743,6 +1790,8 @@ msgid "%(username)s isn't following any users"
 msgstr "%(username)s n’est abonné(e) à personne"
 
 #: bookwyrm/templates/user/lists.html:9
+#, fuzzy
+#| msgid "Your lists"
 msgid "Your Lists"
 msgstr "Vos listes"
 
@@ -1757,10 +1806,14 @@ msgid "Create list"
 msgstr "Créer une liste"
 
 #: bookwyrm/templates/user/shelf.html:9
+#, fuzzy
+#| msgid "Your shelves"
 msgid "Your Shelves"
 msgstr "Vos étagères"
 
 #: bookwyrm/templates/user/shelf.html:11
+#, fuzzy, python-format
+#| msgid "%(username)s has no followers"
 msgid "%(username)s: Shelves"
 msgstr "%(username)s : Étagères"
 
@@ -1769,6 +1822,8 @@ msgid "Create shelf"
 msgstr "Créer l’étagère"
 
 #: bookwyrm/templates/user/shelf.html:54
+#, fuzzy
+#| msgid "Edit Shelf"
 msgid "Edit shelf"
 msgstr "Modifier l’étagère"
 

From 4c71c5fb73b5b1e9d02d4f3de51dabbe0bf4c41a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 4 Mar 2021 08:04:55 -0800
Subject: [PATCH 0174/1285] Removes "fuzzy" flag from translated French strings

---
 bookwyrm/templates/notifications.html |   6 +-
 locale/fr_FR/LC_MESSAGES/django.mo    | Bin 20489 -> 25299 bytes
 locale/fr_FR/LC_MESSAGES/django.po    |  87 +++++---------------------
 3 files changed, 19 insertions(+), 74 deletions(-)

diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html
index f6fd7dab..007e6b05 100644
--- a/bookwyrm/templates/notifications.html
+++ b/bookwyrm/templates/notifications.html
@@ -87,11 +87,11 @@
                                 </div>
                             {% elif notification.notification_type == 'BOOST' %}
                                 {% if related_status.status_type == 'Review' %}
-                                {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}boosted your <a href="{{ related_path }}">review of <em>{{ book.title }}</em></a>{% endblocktrans %}
+                                {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}boosted your <a href="{{ related_path }}">review of <em>{{ book_title }}</em></a>{% endblocktrans %}
                                 {% elif related_status.status_type == 'Comment' %}
-                                {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}boosted your <a href="{{ related_path }}">comment on<em>{{ book.title }}</em></a>{% endblocktrans %}
+                                {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}boosted your <a href="{{ related_path }}">comment on<em>{{ book_title }}</em></a>{% endblocktrans %}
                                 {% elif related_status.status_type == 'Quotation' %}
-                                {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}boosted your <a href="{{ related_path }}">quote from <em>{{ book.title }}</em></a>{% endblocktrans %}
+                                {% blocktrans with related_path=related_status.local_path book_title=related_status.book.title %}boosted your <a href="{{ related_path }}">quote from <em>{{ book_title }}</em></a>{% endblocktrans %}
                                 {% else %}
                                 {% blocktrans with related_path=related_status.local_path %}boosted your <a href="{{ related_path }}">status</a>{% endblocktrans %}
                                 {% endif %}
diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index d35bde77c5ea72217eead13ef5b3499b2b0922d3..2cddb7935337507fcce9245e070abe10274ca6fb 100644
GIT binary patch
literal 25299
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
EAJoEVo&W#<

delta 7162
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
CS?0e0

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 0c770753..750a5de0 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -435,15 +435,12 @@ msgid "Something went wrong! Sorry about that."
 msgstr "Une erreur s’est produite ; désolé !"
 
 #: bookwyrm/templates/feed/direct_messages.html:8
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+#, python-format
 msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
 #: bookwyrm/templates/layout.html:79
-#, fuzzy
-#| msgid "Send direct message"
 msgid "Direct Messages"
 msgstr "Messages directs"
 
@@ -662,8 +659,6 @@ msgid "Sorry! This invite code is no longer valid."
 msgstr "Cette invitation n’est plus valide ; désolé !"
 
 #: bookwyrm/templates/layout.html:33
-#, fuzzy
-#| msgid "Search for a book"
 msgid "Search for a book or user"
 msgstr "Chercher un livre ou un compte"
 
@@ -706,8 +701,6 @@ msgid "Site Configuration"
 msgstr "Configuration du site"
 
 #: bookwyrm/templates/layout.html:117
-#, fuzzy
-#| msgid "Log in"
 msgid "Log out"
 msgstr "Se déconnecter"
 
@@ -899,8 +892,6 @@ msgid "Not Found"
 msgstr "Introuvable"
 
 #: bookwyrm/templates/notfound.html:9
-#, fuzzy
-#| msgid "The page your requested doesn't seem to exist!"
 msgid "The page you requested doesn't seem to exist!"
 msgstr "Il semblerait que la page que vous avez demandée n’existe pas !"
 
@@ -909,74 +900,56 @@ msgid "Delete notifications"
 msgstr "Supprimer les notifications"
 
 #: bookwyrm/templates/notifications.html:49
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:51
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:53
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:55
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "favorited your <a href=\"%(related_path)s\">status</a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">statut</a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:60
-#, fuzzy, python-format
-#| msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "vous a mentionné dans sa <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:62
-#, fuzzy, python-format
-#| msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "vous a mentionné dans son <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:64
-#, fuzzy, python-format
-#| msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
+#, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "vous a mentionné dans sa <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:66
-#, fuzzy, python-format
-#| msgid "mentioned you in a <a href=\"%(related_path)s\">%(preview_name)s</a>"
+#, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">status</a>"
 msgstr "vous a mentionné dans son <a href=\"%(related_path)s\">statut</a>"
 
 #: bookwyrm/templates/notifications.html:71
-#, fuzzy, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
+#, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">critique de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:73
-#, fuzzy, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
+#, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">commentaire sur <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:75
-#, fuzzy, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
+#, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">citation de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:77
-#, fuzzy, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
+#, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">statut</a>"
 
@@ -989,38 +962,32 @@ msgid "sent you a follow request"
 msgstr "vous a envoyé une demande d’abonnement"
 
 #: bookwyrm/templates/notifications.html:90
-#, fuzzy, python-format
-#| msgid "boosted your <a href=\"%(related_path)s\">%(preview_name)s</a>"
-msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book.title)s</em></a>"
+#, python-format
+msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "a partagé votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:92
-#, fuzzy, python-format
-#| msgid "boosted your <a href=\"%(related_path)s\">%(preview_name)s</a>"
-msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book.title)s</em></a>"
+#, python-format
+msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
 msgstr "a partagé votre <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:94
-#, fuzzy, python-format
-#| msgid "boosted your <a href=\"%(related_path)s\">%(preview_name)s</a>"
-msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book.title)s</em></a>"
+#, python-format
+msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "a partagé votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:96
-#, fuzzy, python-format
-#| msgid "boosted your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+#, python-format
 msgid "boosted your <a href=\"%(related_path)s\">status</a>"
 msgstr "a partagé votre <a href=\"%(related_path)s\">statut</a>"
 
 #: bookwyrm/templates/notifications.html:100
-#, fuzzy, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
+#, python-format
 msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 msgstr " a ajouté <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre liste « <a href=\"%(list_path)s\">%(list_name)s</a> »"
 
 #: bookwyrm/templates/notifications.html:102
-#, fuzzy, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
+#, python-format
 msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 msgstr " a suggégré l’ajout de <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre liste « <a href=\"%(list_path)s/curate\">%(list_name)s</a> »"
 
@@ -1114,8 +1081,6 @@ msgid "Relationships"
 msgstr "Relations"
 
 #: bookwyrm/templates/search_results.html:4
-#, fuzzy
-#| msgid "Search Results for \"%(query)s\""
 msgid "Search Results"
 msgstr "Résultats de recherche"
 
@@ -1164,8 +1129,6 @@ msgid "No lists found for \"%(query)s\""
 msgstr "Aucune liste trouvée pour « %(query)s »"
 
 #: bookwyrm/templates/settings/admin_layout.html:4
-#, fuzzy
-#| msgid "Registration"
 msgid "Administration"
 msgstr "Administration"
 
@@ -1319,8 +1282,6 @@ msgid "Un-block"
 msgstr "Débloquer"
 
 #: bookwyrm/templates/snippets/book_titleby.html:3
-#, fuzzy, python-format
-#| msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgstr "<a href=\"%(path)s\">%(title)s</a> par "
 
@@ -1369,8 +1330,6 @@ msgid "No rating"
 msgstr "Aucune note"
 
 #: bookwyrm/templates/snippets/create_status_form.html:54
-#, fuzzy
-#| msgid "Spoiler alert:"
 msgid "Include spoiler alert"
 msgstr "Afficher une alerte spoiler"
 
@@ -1730,8 +1689,6 @@ msgid "More options"
 msgstr "Plus d’options"
 
 #: bookwyrm/templates/snippets/status/status_options.html:17
-#, fuzzy
-#| msgid "Delete post"
 msgid "Delete status"
 msgstr "Supprimer le statut"
 
@@ -1755,8 +1712,6 @@ msgstr "Livres tagués « %(tag.name)s »"
 
 #: bookwyrm/templates/user/create_shelf_form.html:5
 #: bookwyrm/templates/user/create_shelf_form.html:22
-#, fuzzy
-#| msgid "Create shelf"
 msgid "Create Shelf"
 msgstr "Créer l’étagère"
 
@@ -1770,8 +1725,6 @@ msgstr "Mettre l’étagère à jour"
 
 #: bookwyrm/templates/user/followers.html:7
 #: bookwyrm/templates/user/following.html:7 bookwyrm/templates/user/user.html:9
-#, fuzzy
-#| msgid "User profile"
 msgid "User Profile"
 msgstr "Profil"
 
@@ -1790,8 +1743,6 @@ msgid "%(username)s isn't following any users"
 msgstr "%(username)s n’est abonné(e) à personne"
 
 #: bookwyrm/templates/user/lists.html:9
-#, fuzzy
-#| msgid "Your lists"
 msgid "Your Lists"
 msgstr "Vos listes"
 
@@ -1806,14 +1757,10 @@ msgid "Create list"
 msgstr "Créer une liste"
 
 #: bookwyrm/templates/user/shelf.html:9
-#, fuzzy
-#| msgid "Your shelves"
 msgid "Your Shelves"
 msgstr "Vos étagères"
 
 #: bookwyrm/templates/user/shelf.html:11
-#, fuzzy, python-format
-#| msgid "%(username)s has no followers"
 msgid "%(username)s: Shelves"
 msgstr "%(username)s : Étagères"
 
@@ -1822,8 +1769,6 @@ msgid "Create shelf"
 msgstr "Créer l’étagère"
 
 #: bookwyrm/templates/user/shelf.html:54
-#, fuzzy
-#| msgid "Edit Shelf"
 msgid "Edit shelf"
 msgstr "Modifier l’étagère"
 

From 5613f42a4d5c7226708ae7f831e0fe277e52f9bb Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 4 Mar 2021 08:07:35 -0800
Subject: [PATCH 0175/1285] Adds python-format tags

---
 locale/fr_FR/LC_MESSAGES/django.po | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 750a5de0..68bb0c46 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -900,26 +900,32 @@ msgid "Delete notifications"
 msgstr "Supprimer les notifications"
 
 #: bookwyrm/templates/notifications.html:49
+#, python-format
 msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:51
+#, python-format
 msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:53
+#, python-format
 msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:55
+#, python-format
 msgid "favorited your <a href=\"%(related_path)s\">status</a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">statut</a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:60
+#, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "vous a mentionné dans sa <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:62
+#, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "vous a mentionné dans son <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a>"
 

From 15392c007f648ec0337b6bf56eb24df3ef395673 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 4 Mar 2021 08:20:44 -0800
Subject: [PATCH 0176/1285] Updates translation instructions for fuzzy matches

---
 README.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 2564d7af..41bd7065 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ Code contributions are gladly welcomed! If you're not sure where to start, take
 If you have questions about the project or contributing, you can set up a video call during BookWyrm ["office hours"](https://calendly.com/mouse-reeve/30min).
 
 ### Translation
-Do you speak a language besides English? BookWyrm needs localization! If you're comfortable using git and want to get into the code, there are [instructions](#workin-with-translations-and-locale-files) on how to create and edit localization files. If you feel more comfortable working in a regular text editor and would prefer not to run the application, get in touch directly and we can figure out a system, like emailing a text file, that works best.
+Do you speak a language besides English? BookWyrm needs localization! If you're comfortable using git and want to get into the code, there are [instructions](#working-with-translations-and-locale-files) on how to create and edit localization files. If you feel more comfortable working in a regular text editor and would prefer not to run the application, get in touch directly and we can figure out a system, like emailing a text file, that works best.
 
 ### Financial Support
 BookWyrm is an ad-free passion project with no intentions of seeking out venture funding or corporate financial relationships. If you want to help keep the project going, you can donate to the [Patreon](https://www.patreon.com/bookwyrm), or make a one time gift via [PayPal](https://paypal.me/oulipo).
@@ -118,7 +118,7 @@ If you edit the CSS or JavaScript, you will need to run Django's `collectstatic`
 ./bw-dev collectstatic
 ```
 
-### Workin with translations and locale files
+### Working with translations and locale files
 Text in the html files are wrapped in translation tags (`{% trans %}` and `{% blocktrans %}`), and Django generates locale files for all the strings in which you can add translations for the text. You can find existing translations in the `locale/` directory.
 
 The application's language is set by a request header sent by your browser to the application, so to change the language of the application, you can change the default language requested by your browser.
@@ -132,7 +132,10 @@ To start translation into a language which is currently supported, run the djang
 #### Editing a locale
 When you have a locale file, open the `django.po` in the directory for the language (for example, if you were adding German, `locale/de/LC_MESSAGES/django.po`. All the the text in the application will be shown in paired strings, with `msgid` as the original text, and `msgstr` as the translation (by default, this is set to an empty string, and will display the original text).
 
-Add you translations to the `msgstr` strings, and when you're ready, compile the locale by running:
+Add your translations to the `msgstr` strings. As the messages in the application are updated, `gettext` will sometimes add best-guess fuzzy matched options for those translations. When a message is marked as fuzzy, it will not be used in the application, so be sure to remove it when you translate that line.
+
+When you're done, compile the locale by running:
+
 ``` bash
 ./bw-dev compilemessages
 ```

From 9842e63cb4fb6a2cd7afd32d80f21b75b38f41ed Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 4 Mar 2021 08:35:13 -0800
Subject: [PATCH 0177/1285] Ignore group not found error creating user

---
 bookwyrm/models/user.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 21ef8dd2..f47eb647 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -209,7 +209,11 @@ class User(OrderedCollectionPageMixin, AbstractUser):
         super().save(*args, **kwargs)
 
         # make users editors by default
-        self.groups.add(Group.objects.get(name='editor'))
+        try:
+            self.groups.add(Group.objects.get(name='editor'))
+        except Group.objects.DoesNotExist:
+            # this should never happen except in tests
+            pass
 
         # create keys and shelves for new local users
         self.key_pair = KeyPair.objects.create(

From 6caf45ac4fa484533d50dbd5b7a24aaa7515d441 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 4 Mar 2021 08:45:03 -0800
Subject: [PATCH 0178/1285] fixes error catching

---
 bookwyrm/models/user.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index f47eb647..49474e43 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -211,7 +211,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
         # make users editors by default
         try:
             self.groups.add(Group.objects.get(name='editor'))
-        except Group.objects.DoesNotExist:
+        except Group.DoesNotExist:
             # this should never happen except in tests
             pass
 

From 2542b72f3aa42fe7d94ed4c293303ddb8f8b69ff Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 4 Mar 2021 08:51:10 -0800
Subject: [PATCH 0179/1285] Try to get github to re-run checks

---
 bookwyrm/models/user.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 49474e43..bbeb10cc 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -212,7 +212,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
         try:
             self.groups.add(Group.objects.get(name='editor'))
         except Group.DoesNotExist:
-            # this should never happen except in tests
+            # this should only happen in tests
             pass
 
         # create keys and shelves for new local users

From 55ad637da4e4fee8f5120318a8a964c7764f0894 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Thu, 4 Mar 2021 18:40:57 +0100
Subject: [PATCH 0180/1285] Add editorconfig and matching Github Workflow.

---
 .editorconfig                         | 29 +++++++++++++++++++++++++++
 .github/workflows/linters-global.yaml | 21 +++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 .editorconfig
 create mode 100644 .github/workflows/linters-global.yaml

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..1a4da997
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,29 @@
+# @see https://editorconfig.org/
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+max_line_length = 100
+
+[*.{md,markdown}]
+trim_trailing_whitespace = false
+
+[*.{yml,yaml}]
+indent_size = 2
+max_line_length = off
+
+[{bw-dev,fr-dev,LICENSE}]
+max_line_length = off
+
+[*.{csv,json,html,md,po,py,svg,tsv}]
+max_line_length = off
+
+[fonts/**]
+insert_final_newline = unset
diff --git a/.github/workflows/linters-global.yaml b/.github/workflows/linters-global.yaml
new file mode 100644
index 00000000..b815ba62
--- /dev/null
+++ b/.github/workflows/linters-global.yaml
@@ -0,0 +1,21 @@
+# @url https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
+name: Global Linters
+
+on:
+  push:
+    branches: [ main, ci ]
+  pull_request:
+    branches: [ main, ci ]
+
+jobs:
+  linters:
+    name: linters
+    runs-on: ubuntu-20.04
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+
+      - name: EditorConfig lint
+        uses: greut/eclint-action@v0

From 99d2b34a1e391d299f6a4460cb3dd1edd7f39b5d Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Thu, 4 Mar 2021 18:44:36 +0100
Subject: [PATCH 0181/1285] [lint] Fix missing new lines.

---
 .coveragerc   | 2 +-
 .dockerignore | 2 +-
 .gitignore    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index 35bf78f5..08406450 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,2 +1,2 @@
 [run]
-omit = */test*,celerywyrm*,bookwyrm/migrations/*
\ No newline at end of file
+omit = */test*,celerywyrm*,bookwyrm/migrations/*
diff --git a/.dockerignore b/.dockerignore
index 3bf9f2c5..a5130c8b 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -4,4 +4,4 @@ __pycache__
 *.pyd
 .git
 .github
-.pytest*
\ No newline at end of file
+.pytest*
diff --git a/.gitignore b/.gitignore
index 1384056f..a81f0db1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,4 @@
 /images/
 
 # Testing
-.coverage
\ No newline at end of file
+.coverage

From 4a8d9bee735b1587a099853e9d7f0145f9790318 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Thu, 4 Mar 2021 19:05:01 +0100
Subject: [PATCH 0182/1285] [lint] Fix indentation in .md files.

---
 .github/ISSUE_TEMPLATE/bug_report.md |  14 ++--
 CODE_OF_CONDUCT.md                   |   6 +-
 README.md                            | 108 +++++++++++++--------------
 3 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index dd84ea78..56af524e 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -24,15 +24,15 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
+    - OS: [e.g. iOS]
+    - Browser [e.g. chrome, safari]
+    - Version [e.g. 22]
 
 **Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
+    - Device: [e.g. iPhone6]
+    - OS: [e.g. iOS8.1]
+    - Browser [e.g. stock browser, safari]
+    - Version [e.g. 22]
 
 **Additional context**
 Add any other context about the problem here.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index a60597ae..3ab87444 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -23,13 +23,13 @@ include:
 Examples of unacceptable behavior by participants include:
 
 * The use of sexualized language or imagery and unwelcome sexual attention or
- advances
+advances
 * Trolling, insulting/derogatory comments, and personal or political attacks
 * Public or private harassment
 * Publishing others' private information, such as a physical or electronic
- address, without explicit permission
+address, without explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
- professional setting
+professional setting
 
 ## Our Responsibilities
 
diff --git a/README.md b/README.md
index 2564d7af..f7455609 100644
--- a/README.md
+++ b/README.md
@@ -6,12 +6,12 @@ Social reading and reviewing, decentralized with ActivityPub
 - [Joining BookWyrm](#joining-bookwyrm)
 - [Contributing](#contributing)
 - [About BookWyrm](#about-bookwyrm)
-   - [What it is and isn't](#what-it-is-and-isnt)
-   - [The role of federation](#the-role-of-federation)
-   - [Features](#features)
- - [Setting up the developer environment](#setting-up-the-developer-environment)
- - [Installing in Production](#installing-in-production)
- - [Book data](#book-data)
+    - [What it is and isn't](#what-it-is-and-isnt)
+    - [The role of federation](#the-role-of-federation)
+    - [Features](#features)
+- [Setting up the developer environment](#setting-up-the-developer-environment)
+- [Installing in Production](#installing-in-production)
+- [Book data](#book-data)
 
 ## Joining BookWyrm
 BookWyrm is still a young piece of software, and isn't at the level of stability and feature-richness that you'd find in a production-ready application. But it does what it says on the box! If you'd like to join an instance, you can check out the [instances](https://github.com/mouse-reeve/bookwyrm/blob/main/instances.md) list.
@@ -47,49 +47,49 @@ Federation makes it possible to have small, self-determining communities, in con
 
 ### Features
 Since the project is still in its early stages, the features are growing every day, and there is plenty of room for suggestions and ideas. Open an [issue](https://github.com/mouse-reeve/bookwyrm/issues) to get the conversation going!
- - Posting about books
+- Posting about books
     - Compose reviews, with or without ratings, which are aggregated in the book page
     - Compose other kinds of statuses about books, such as:
-     - Comments on a book
-     - Quotes or excerpts
+        - Comments on a book
+        - Quotes or excerpts
     - Reply to statuses
     - View aggregate reviews of a book across connected BookWyrm instances
     - Differentiate local and federated reviews and rating in your activity feed
- - Track reading activity
+- Track reading activity
     - Shelve books on default "to-read," "currently reading," and "read" shelves
     - Create custom shelves
     - Store started reading/finished reading dates, as well as progress updates along the way
     - Update followers about reading activity (optionally, and with granular privacy controls)
     - Create lists of books which can be open to submissions from anyone, curated, or only edited by the creator
- - Federation with ActivityPub
+- Federation with ActivityPub
     - Broadcast and receive user statuses and activity
     - Share book data between instances to create a networked database of metadata
     - Identify shared books across instances and aggregate related content
     - Follow and interact with users across BookWyrm instances
     - Inter-operate with non-BookWyrm ActivityPub services (currently, Mastodon is supported)
- - Granular privacy controls
+- Granular privacy controls
     - Private, followers-only, and public privacy levels for posting, shelves, and lists
     - Option for users to manually approve followers
     - Allow blocking and flagging for moderation
 
 ### The Tech Stack
 Web backend
- - [Django](https://www.djangoproject.com/) web server
- - [PostgreSQL](https://www.postgresql.org/) database
- - [ActivityPub](http://activitypub.rocks/) federation
- - [Celery](http://celeryproject.org/) task queuing
- - [Redis](https://redis.io/) task backend
+- [Django](https://www.djangoproject.com/) web server
+- [PostgreSQL](https://www.postgresql.org/) database
+- [ActivityPub](http://activitypub.rocks/) federation
+- [Celery](http://celeryproject.org/) task queuing
+- [Redis](https://redis.io/) task backend
 
 Front end
- - Django templates
- - [Bulma.io](https://bulma.io/) css framework
- - Vanilla JavaScript, in moderation
+- Django templates
+- [Bulma.io](https://bulma.io/) css framework
+- Vanilla JavaScript, in moderation
 
 Deployment
- - [Docker](https://www.docker.com/) and docker-compose
- - [Gunicorn](https://gunicorn.org/) web runner
- - [Flower](https://github.com/mher/flower) celery monitoring
- - [Nginx](https://nginx.org/en/) HTTP server
+- [Docker](https://www.docker.com/) and docker-compose
+- [Gunicorn](https://gunicorn.org/) web runner
+- [Flower](https://github.com/mher/flower) celery monitoring
+- [Nginx](https://nginx.org/en/) HTTP server
 
 ## Setting up the developer environment
 
@@ -144,10 +144,10 @@ You can add the `-l <language code>` to only compile one language. When you refr
 This project is still young and isn't, at the moment, very stable, so please proceed with caution when running in production.
 
 ### Server setup
- - Get a domain name and set up DNS for your server
- - Set your server up with appropriate firewalls for running a web application (this instruction set is tested against Ubuntu 20.04)
- - Set up an email service (such as mailgun) and the appropriate SMTP/DNS settings
- - Install Docker and docker-compose
+- Get a domain name and set up DNS for your server
+- Set your server up with appropriate firewalls for running a web application (this instruction set is tested against Ubuntu 20.04)
+- Set up an email service (such as mailgun) and the appropriate SMTP/DNS settings
+- Install Docker and docker-compose
 
 ### Install and configure BookWyrm
 
@@ -155,33 +155,33 @@ The `production` branch of BookWyrm contains a number of tools not on the `main`
 
 Instructions for running BookWyrm in production:
 
- - Get the application code:
-  `git clone git@github.com:mouse-reeve/bookwyrm.git`
- - Switch to the `production` branch
-  `git checkout production`
- - Create your environment variables file
-  `cp .env.example .env`
-   - Add your domain, email address, SMTP credentials
-   - Set a secure redis password and secret key
-   - Set a secure database password for postgres
- - Update your nginx configuration in `nginx/default.conf`
-   - Replace `your-domain.com` with your domain name
- - Run the application (this should also set up a Certbot ssl cert for your domain) with
-  `docker-compose up --build`, and make sure all the images build successfully
- - When docker has built successfully, stop the process with `CTRL-C`
- - Comment out the `command: certonly...` line in `docker-compose.yml`
- - Run docker-compose in the background with: `docker-compose up -d`
- - Initialize the database with: `./bw-dev initdb`
- - Set up schedule backups with cron that runs that `docker-compose exec db pg_dump -U <databasename>` and saves the backup to a safe location
+- Get the application code:
+    `git clone git@github.com:mouse-reeve/bookwyrm.git`
+- Switch to the `production` branch
+    `git checkout production`
+- Create your environment variables file
+    `cp .env.example .env`
+    - Add your domain, email address, SMTP credentials
+    - Set a secure redis password and secret key
+    - Set a secure database password for postgres
+- Update your nginx configuration in `nginx/default.conf`
+    - Replace `your-domain.com` with your domain name
+- Run the application (this should also set up a Certbot ssl cert for your domain) with
+    `docker-compose up --build`, and make sure all the images build successfully
+- When docker has built successfully, stop the process with `CTRL-C`
+- Comment out the `command: certonly...` line in `docker-compose.yml`
+- Run docker-compose in the background with: `docker-compose up -d`
+- Initialize the database with: `./bw-dev initdb`
+- Set up schedule backups with cron that runs that `docker-compose exec db pg_dump -U <databasename>` and saves the backup to a safe location
 
 Congrats! You did it, go to your domain and enjoy the fruits of your labors.
 
 ### Configure your instance
- - Register a user account in the application UI
- - Make your account a superuser (warning: do *not* use django's `createsuperuser` command)
-   - On your server, open the django shell
+- Register a user account in the application UI
+- Make your account a superuser (warning: do *not* use django's `createsuperuser` command)
+    - On your server, open the django shell
     `./bw-dev shell`
-   - Load your user and make it a superuser
+    - Load your user and make it a superuser
     ```python
     from bookwyrm import models
     user = models.User.objects.get(id=1)
@@ -189,16 +189,16 @@ Congrats! You did it, go to your domain and enjoy the fruits of your labors.
     user.is_superuser = True
     user.save()
     ```
-   - Go to the site settings (`/settings/site-settings` on your domain) and configure your instance name, description, code of conduct, and toggle whether registration is open on your instance
+    - Go to the site settings (`/settings/site-settings` on your domain) and configure your instance name, description, code of conduct, and toggle whether registration is open on your instance
 
 
 ## Book data
 The application is set up to share book and author data between instances, and get book data from arbitrary outside sources. Right now, the only connector is to OpenLibrary, but other connectors could be written.
 
 There are three concepts in the book data model:
- - `Book`, an abstract, high-level concept that could mean either a `Work` or an `Edition`. No data is saved as a `Book`, it serves as shared model for `Work` and `Edition`
- - `Work`, the theoretical umbrella concept of a book that encompasses every edition of the book, and
- - `Edition`, a concrete, actually published version of a book
+- `Book`, an abstract, high-level concept that could mean either a `Work` or an `Edition`. No data is saved as a `Book`, it serves as shared model for `Work` and `Edition`
+- `Work`, the theoretical umbrella concept of a book that encompasses every edition of the book, and
+- `Edition`, a concrete, actually published version of a book
  
 Whenever a user interacts with a book, they are interacting with a specific edition. Every work has a default edition, but the user can select other editions. Reviews aggregated for all editions of a work when you view an edition's page.
 

From 1266a740e559ad3b646260554c91b34ca6f0c559 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Thu, 4 Mar 2021 19:06:12 +0100
Subject: [PATCH 0183/1285] [lint] Fix indentation in .py files.

---
 bookwyrm/activitypub/response.py    | 2 +-
 bookwyrm/models/book.py             | 2 +-
 bookwyrm/models/fields.py           | 8 +++++---
 bookwyrm/models/status.py           | 6 ++++--
 bookwyrm/tests/views/test_status.py | 2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/bookwyrm/activitypub/response.py b/bookwyrm/activitypub/response.py
index 8f3c050b..2f4edaaf 100644
--- a/bookwyrm/activitypub/response.py
+++ b/bookwyrm/activitypub/response.py
@@ -10,7 +10,7 @@ class ActivitypubResponse(JsonResponse):
     JsonResponse.
     """
     def __init__(self, data, encoder=ActivityEncoder, safe=False,
-                 json_dumps_params=None, **kwargs):
+                json_dumps_params=None, **kwargs):
 
         if 'content_type' not in kwargs:
             kwargs['content_type'] = 'application/activity+json'
diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index f1f20830..ca2c0922 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -224,7 +224,7 @@ def isbn_10_to_13(isbn_10):
     # multiply the odd digits by 1 and the even digits by 3 and sum them
     try:
         checksum = sum(int(i) for i in converted[::2]) + \
-               sum(int(i) * 3 for i in converted[1::2])
+            sum(int(i) * 3 for i in converted[1::2])
     except ValueError:
         return None
     # add the checksum mod 10 to the end
diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py
index 4ea527eb..a00718bd 100644
--- a/bookwyrm/models/fields.py
+++ b/bookwyrm/models/fields.py
@@ -46,9 +46,11 @@ def validate_username(value):
 
 class ActivitypubFieldMixin:
     ''' make a database field serializable '''
-    def __init__(self, *args, \
-                 activitypub_field=None, activitypub_wrapper=None,
-                 deduplication_field=False, **kwargs):
+    def __init__(
+        self, *args, \
+        activitypub_field=None, activitypub_wrapper=None,
+        deduplication_field=False, **kwargs
+    ):
         self.deduplication_field = deduplication_field
         if activitypub_wrapper:
             self.activitypub_wrapper = activitypub_field
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index ba9727f5..30e87970 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -74,8 +74,10 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
         for mention_user in self.mention_users.all():
             # avoid double-notifying about this status
             if not mention_user.local or \
-                    (self.reply_parent and \
-                     mention_user == self.reply_parent.user):
+                    (
+                        self.reply_parent and \
+                        mention_user == self.reply_parent.user
+                    ):
                 continue
             notification_model.objects.create(
                 user=mention_user,
diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py
index 4594a203..98e3d399 100644
--- a/bookwyrm/tests/views/test_status.py
+++ b/bookwyrm/tests/views/test_status.py
@@ -201,7 +201,7 @@ class StatusViews(TestCase):
                 'archive.org/details/dli.granth.72113/page/n25/mode/2up</a>' \
                 % url)
         url = 'https://openlibrary.org/search' \
-               '?q=arkady+strugatsky&mode=everything'
+            '?q=arkady+strugatsky&mode=everything'
         self.assertEqual(
             views.status.format_links(url),
             '<a href="%s">openlibrary.org/search' \

From bdfa217f0c83e4cf7bd6807e7c89ab55a33ded3f Mon Sep 17 00:00:00 2001
From: reese <reesedporter@gmail.com>
Date: Thu, 4 Mar 2021 12:18:43 -0600
Subject: [PATCH 0184/1285] updated spanish translations

---
 locale/es/LC_MESSAGES/django.mo | Bin 25326 -> 26251 bytes
 locale/es/LC_MESSAGES/django.po |  62 ++++++++++++++++----------------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index d41050e6c2b04cf399c33585bbfceeef94ea12fc..ee2cf48de00efd917b842f6e4e33dc8286d28e87 100644
GIT binary patch
delta 9128
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

delta 8238
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

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index f8034b94..75e24e0e 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -20,40 +20,40 @@ msgstr ""
 
 #: bookwyrm/forms.py:185
 msgid "One Day"
-msgstr ""
+msgstr "Un día"
 
 #: bookwyrm/forms.py:186
 msgid "One Week"
-msgstr ""
+msgstr "Una semana"
 
 #: bookwyrm/forms.py:187
 msgid "One Month"
-msgstr ""
+msgstr "Un mes"
 
 #: bookwyrm/forms.py:188
 msgid "Does Not Expire"
-msgstr ""
+msgstr "Nunca se vence"
 
 #: bookwyrm/forms.py:190
 #, python-format
 msgid "%(count)d uses"
-msgstr ""
+msgstr "%(count)d usos"
 
 #: bookwyrm/forms.py:192
 #, fuzzy
 #| msgid "Unlisted"
 msgid "Unlimited"
-msgstr "Privado"
+msgstr "Sin límite"
 
 #: bookwyrm/models/fields.py:24
 #, python-format
 msgid "%(value)s is not a valid remote_id"
-msgstr ""
+msgstr "%(value)s no es un remote_id válido"
 
 #: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
 #, python-format
 msgid "%(value)s is not a valid username"
-msgstr ""
+msgstr "%(value)s no es un usuario válido"
 
 #: bookwyrm/models/fields.py:164
 #, fuzzy
@@ -63,27 +63,27 @@ msgstr "Nombre de usuario:"
 
 #: bookwyrm/models/fields.py:169
 msgid "A user with that username already exists."
-msgstr ""
+msgstr "Ya existe un usuario con ese nombre."
 
 #: bookwyrm/settings.py:142
 msgid "English"
-msgstr ""
+msgstr "Inglés"
 
 #: bookwyrm/settings.py:143
 msgid "German"
-msgstr ""
+msgstr "Aléman"
 
 #: bookwyrm/settings.py:144
 msgid "Spanish"
-msgstr ""
+msgstr "Español"
 
 #: bookwyrm/settings.py:145
 msgid "French"
-msgstr ""
+msgstr "Francés"
 
 #: bookwyrm/settings.py:146
 msgid "Simplified Chinese"
-msgstr ""
+msgstr "Chino simplificado"
 
 #: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
 #: bookwyrm/templates/edit_author.html:5
@@ -101,7 +101,7 @@ msgstr "Libros de %(name)s"
 
 #: bookwyrm/templates/book.html:21
 msgid "by"
-msgstr ""
+msgstr "por"
 
 #: bookwyrm/templates/book.html:29 bookwyrm/templates/book.html:30
 #: bookwyrm/templates/edit_book.html:5
@@ -148,8 +148,8 @@ msgstr "Ver en OpenLibrary"
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "(%(review_count)s reseña)"
+msgstr[1] "(%(review_count)s reseñas)"
 
 #: bookwyrm/templates/book.html:106
 msgid "Add Description"
@@ -186,19 +186,19 @@ msgstr "Cancelar"
 #, fuzzy, python-format
 #| msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
-msgstr "<a href=\"%(path)s\">%(title)s</a> por "
+msgstr "<a href=\"%(path)s/editions\">%(count)s ediciones</a>"
 
 #: bookwyrm/templates/book.html:135
 #, fuzzy, python-format
 #| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
-msgstr "Mensajes directos con <a href=\"%(path)s\">%(username)s</a>"
+msgstr "Esta edición está en tu <a href=\"%(path)s\">%(shelf_name)s</a> estante."
 
 #: bookwyrm/templates/book.html:141
 #, fuzzy, python-format
 #| msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
-msgstr " agregó <em><a href=\"%(book_path)s\">%(book_title)s</a></em> a tu lista \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgstr "Una <a href=\"%(book_path)s\">edición diferente</a> de este libro está en tu <a href=\"%(shelf_path)s\">%(shelf_name)s</a> estante."
 
 #: bookwyrm/templates/book.html:150
 msgid "Your reading activity"
@@ -467,7 +467,7 @@ msgstr "Anuncios"
 
 #: bookwyrm/templates/feed/feed.html:32
 msgid "There aren't any activities right now! Try following a user to get started"
-msgstr "¡No hay ninguna actividad ahorita! Sigue a otro usuario para empezar"
+msgstr "¡No hay actividades en este momento! Sigue a otro usuario para empezar"
 
 #: bookwyrm/templates/feed/feed_layout.html:5
 msgid "Updates"
@@ -493,7 +493,7 @@ msgstr "Leer"
 #, fuzzy
 #| msgid "Start reading"
 msgid "Currently Reading"
-msgstr "Empezar leer"
+msgstr "Leyendo actualmente"
 
 #: bookwyrm/templates/feed/feed_layout.html:25
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
@@ -787,7 +787,7 @@ msgstr "Esta lista está vacia"
 #, fuzzy, python-format
 #| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
-msgstr "Mensajes directos con <a href=\"%(path)s\">%(username)s</a>"
+msgstr "Agregado por <a href=\"%(user_path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/lists/list.html:41
 msgid "Remove"
@@ -844,7 +844,7 @@ msgstr "Tus listas"
 #, fuzzy, python-format
 #| msgid "See all %(size)s"
 msgid "See all %(size)s lists"
-msgstr "Ver %(size)s"
+msgstr "Ver las %(size)s listas"
 
 #: bookwyrm/templates/lists/lists.html:40
 msgid "Recent Lists"
@@ -926,22 +926,22 @@ msgstr "te mencionó en un <a href=\"%(related_path)s\">status</a>"
 #: bookwyrm/templates/notifications.html:71
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr "<a href=\"%(related_path)s\">contestó</a> tu <a href=\"%(parent_path)s\">reseña de <em>%(book_title)s</em></a>"
+msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">reseña de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:73
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
-msgstr "<a href=\"%(related_path)s\">contestó</a> tu <a href=\"%(parent_path)s\">comentario en <em>%(book_title)s</em></a>"
+msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">comentario en <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:75
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr "<a href=\"%(related_path)s\">contestó</a> tu <a href=\"%(parent_path)s\">cita de <em>%(book_title)s</em></a>"
+msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">cita de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:77
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
-msgstr "<a href=\"%(related_path)s\">contestó</a> tu <a href=\"%(parent_path)s\">status</a>"
+msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">status</a>"
 
 #: bookwyrm/templates/notifications.html:81
 msgid "followed you"
@@ -1340,7 +1340,7 @@ msgstr "¿Eliminar estas fechas de lectura?"
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
 #, python-format
 msgid "You are deleting this readthrough and its %(count)s associated progress updates."
-msgstr "Estás eliminando y sus %(count)s actualizaciones de progreso asociados."
+msgstr "Estás eliminando esta lectura y sus %(count)s actualizaciones de progreso asociados."
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
 #: bookwyrm/templates/snippets/follow_request_buttons.html:13
@@ -1393,7 +1393,7 @@ msgstr "Desechar mensaje"
 #: bookwyrm/templates/snippets/goal_card.html:22
 #, python-format
 msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
-msgstr "Puedes establecer o cambiar en cualquier momento que desees desde tu <a href=\"%(path)s\">perfil</a>"
+msgstr "Puedes establecer o cambiar tu meta de lectura en cualquier momento que desees desde tu <a href=\"%(path)s\">perfil</a>"
 
 #: bookwyrm/templates/snippets/goal_form.html:9
 msgid "Reading goal:"
@@ -1675,7 +1675,7 @@ msgstr "Más opciones"
 #, fuzzy
 #| msgid "Delete post"
 msgid "Delete status"
-msgstr "Eliminar publicación"
+msgstr "Eliminar status"
 
 #: bookwyrm/templates/snippets/status/status_options.html:23
 #: bookwyrm/templates/snippets/user_options.html:13

From fc16211125c6e8b17da302916d469d33fa48624f Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Thu, 4 Mar 2021 19:24:11 +0100
Subject: [PATCH 0185/1285] [lint] Ignore newline in svg files within fonts/.

---
 .editorconfig                           | 15 ++++++---------
 bookwyrm/static/css/fonts/.editorconfig |  4 ++++
 2 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 bookwyrm/static/css/fonts/.editorconfig

diff --git a/.editorconfig b/.editorconfig
index 1a4da997..112b22d6 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,18 +12,15 @@ indent_style = space
 insert_final_newline = true
 max_line_length = 100
 
-[*.{md,markdown}]
-trim_trailing_whitespace = false
-
-[*.{yml,yaml}]
-indent_size = 2
-max_line_length = off
-
 [{bw-dev,fr-dev,LICENSE}]
 max_line_length = off
 
 [*.{csv,json,html,md,po,py,svg,tsv}]
 max_line_length = off
 
-[fonts/**]
-insert_final_newline = unset
+[*.{md,markdown}]
+trim_trailing_whitespace = false
+
+[*.{yml,yaml}]
+indent_size = 2
+max_line_length = off
diff --git a/bookwyrm/static/css/fonts/.editorconfig b/bookwyrm/static/css/fonts/.editorconfig
new file mode 100644
index 00000000..2e5ec87a
--- /dev/null
+++ b/bookwyrm/static/css/fonts/.editorconfig
@@ -0,0 +1,4 @@
+# @see https://editorconfig.org/
+
+[*.svg]
+insert_final_newline = unset

From 420a33d79f5584c5ef7e0e80df5369f462ee5aae Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Thu, 4 Mar 2021 19:27:03 +0100
Subject: [PATCH 0186/1285] [lint] fix indentation in CSS files.

---
 bookwyrm/static/css/format.css |   4 +-
 bookwyrm/static/css/icons.css  | 124 ++++++++++++++++-----------------
 2 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/bookwyrm/static/css/format.css b/bookwyrm/static/css/format.css
index 9d4b3105..5534e6a7 100644
--- a/bookwyrm/static/css/format.css
+++ b/bookwyrm/static/css/format.css
@@ -65,8 +65,8 @@
     content: '\e9d9';
 }
 .form-rate-stars label.icon:hover:before {
-     content: '\e9d9';
- }
+    content: '\e9d9';
+}
 .form-rate-stars label.icon:hover ~ label.icon:before{
     content: '\e9d7';
 }
diff --git a/bookwyrm/static/css/icons.css b/bookwyrm/static/css/icons.css
index c84446af..9915ecd1 100644
--- a/bookwyrm/static/css/icons.css
+++ b/bookwyrm/static/css/icons.css
@@ -1,153 +1,153 @@
 @font-face {
-  font-family: 'icomoon';
-  src:  url('fonts/icomoon.eot?n5x55');
-  src:  url('fonts/icomoon.eot?n5x55#iefix') format('embedded-opentype'),
-    url('fonts/icomoon.ttf?n5x55') format('truetype'),
-    url('fonts/icomoon.woff?n5x55') format('woff'),
-    url('fonts/icomoon.svg?n5x55#icomoon') format('svg');
-  font-weight: normal;
-  font-style: normal;
-  font-display: block;
+    font-family: 'icomoon';
+    src:  url('fonts/icomoon.eot?n5x55');
+    src:  url('fonts/icomoon.eot?n5x55#iefix') format('embedded-opentype'),
+        url('fonts/icomoon.ttf?n5x55') format('truetype'),
+        url('fonts/icomoon.woff?n5x55') format('woff'),
+        url('fonts/icomoon.svg?n5x55#icomoon') format('svg');
+    font-weight: normal;
+    font-style: normal;
+    font-display: block;
 }
 
 [class^="icon-"], [class*=" icon-"] {
-  /* use !important to prevent issues with browser extensions that change fonts */
-  font-family: 'icomoon' !important;
-  speak: never;
-  font-style: normal;
-  font-weight: normal;
-  font-variant: normal;
-  text-transform: none;
-  line-height: 1;
+    /* use !important to prevent issues with browser extensions that change fonts */
+    font-family: 'icomoon' !important;
+    speak: never;
+    font-style: normal;
+    font-weight: normal;
+    font-variant: normal;
+    text-transform: none;
+    line-height: 1;
 
-  /* Better Font Rendering =========== */
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
+    /* Better Font Rendering =========== */
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
 }
 
 .icon-graphic-heart:before {
-  content: "\e91e";
+    content: "\e91e";
 }
 .icon-graphic-paperplane:before {
-  content: "\e91f";
+    content: "\e91f";
 }
 .icon-graphic-banknote:before {
-  content: "\e920";
+    content: "\e920";
 }
 .icon-stars:before {
-  content: "\e91a";
+    content: "\e91a";
 }
 .icon-warning:before {
-  content: "\e91b";
+    content: "\e91b";
 }
 .icon-book:before {
-  content: "\e900";
+    content: "\e900";
 }
 .icon-bookmark:before {
-  content: "\e91c";
+    content: "\e91c";
 }
 .icon-rss:before {
-  content: "\e91d";
+    content: "\e91d";
 }
 .icon-envelope:before {
-  content: "\e901";
+    content: "\e901";
 }
 .icon-arrow-right:before {
-  content: "\e902";
+    content: "\e902";
 }
 .icon-bell:before {
-  content: "\e903";
+    content: "\e903";
 }
 .icon-x:before {
-  content: "\e904";
+    content: "\e904";
 }
 .icon-quote-close:before {
-  content: "\e905";
+    content: "\e905";
 }
 .icon-quote-open:before {
-  content: "\e906";
+    content: "\e906";
 }
 .icon-image:before {
-  content: "\e907";
+    content: "\e907";
 }
 .icon-pencil:before {
-  content: "\e908";
+    content: "\e908";
 }
 .icon-list:before {
-  content: "\e909";
+    content: "\e909";
 }
 .icon-unlock:before {
-  content: "\e90a";
+    content: "\e90a";
 }
 .icon-unlisted:before {
-  content: "\e90a";
+    content: "\e90a";
 }
 .icon-globe:before {
-  content: "\e90b";
+    content: "\e90b";
 }
 .icon-public:before {
-  content: "\e90b";
+    content: "\e90b";
 }
 .icon-lock:before {
-  content: "\e90c";
+    content: "\e90c";
 }
 .icon-followers:before {
-  content: "\e90c";
+    content: "\e90c";
 }
 .icon-chain-broken:before {
-  content: "\e90d";
+    content: "\e90d";
 }
 .icon-chain:before {
-  content: "\e90e";
+    content: "\e90e";
 }
 .icon-comments:before {
-  content: "\e90f";
+    content: "\e90f";
 }
 .icon-comment:before {
-  content: "\e910";
+    content: "\e910";
 }
 .icon-boost:before {
-  content: "\e911";
+    content: "\e911";
 }
 .icon-arrow-left:before {
-  content: "\e912";
+    content: "\e912";
 }
 .icon-arrow-up:before {
-  content: "\e913";
+    content: "\e913";
 }
 .icon-arrow-down:before {
-  content: "\e914";
+    content: "\e914";
 }
 .icon-home:before {
-  content: "\e915";
+    content: "\e915";
 }
 .icon-local:before {
-  content: "\e916";
+    content: "\e916";
 }
 .icon-dots-three:before {
-  content: "\e917";
+    content: "\e917";
 }
 .icon-check:before {
-  content: "\e918";
+    content: "\e918";
 }
 .icon-dots-three-vertical:before {
-  content: "\e919";
+    content: "\e919";
 }
 .icon-search:before {
-  content: "\e986";
+    content: "\e986";
 }
 .icon-star-empty:before {
-  content: "\e9d7";
+    content: "\e9d7";
 }
 .icon-star-half:before {
-  content: "\e9d8";
+    content: "\e9d8";
 }
 .icon-star-full:before {
-  content: "\e9d9";
+    content: "\e9d9";
 }
 .icon-heart:before {
-  content: "\e9da";
+    content: "\e9da";
 }
 .icon-plus:before {
-  content: "\ea0a";
+    content: "\ea0a";
 }

From 1cb84b0f620ed092a8678484e981dca279fd0b4f Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Thu, 4 Mar 2021 19:36:17 +0100
Subject: [PATCH 0187/1285] [lint] Fix indentation in JS files.

---
 bookwyrm/static/js/shared.js | 402 ++++++++++++++++++-----------------
 1 file changed, 202 insertions(+), 200 deletions(-)

diff --git a/bookwyrm/static/js/shared.js b/bookwyrm/static/js/shared.js
index 7d65ee03..f391d460 100644
--- a/bookwyrm/static/js/shared.js
+++ b/bookwyrm/static/js/shared.js
@@ -195,249 +195,251 @@ function removeClass(el, className) {
 */
 class TabGroup {
     constructor(container) {
-      this.container = container;
-  
-      this.tablist = this.container.querySelector('[role="tablist"]');
-      this.buttons = this.tablist.querySelectorAll('[role="tab"]');
-      this.panels = this.container.querySelectorAll(':scope > [role="tabpanel"]');
-      this.delay = this.determineDelay();
-  
-      if(!this.tablist || !this.buttons.length || !this.panels.length) {
-        return;
-      }
-  
-      this.keys = this.keys();
-      this.direction = this.direction();
-      this.initButtons();
-      this.initPanels();
+        this.container = container;
+
+        this.tablist = this.container.querySelector('[role="tablist"]');
+        this.buttons = this.tablist.querySelectorAll('[role="tab"]');
+        this.panels = this.container.querySelectorAll(':scope > [role="tabpanel"]');
+        this.delay = this.determineDelay();
+
+        if(!this.tablist || !this.buttons.length || !this.panels.length) {
+            return;
+        }
+
+        this.keys = this.keys();
+        this.direction = this.direction();
+        this.initButtons();
+        this.initPanels();
     }
-  
+
     keys() {
-      return {
-        end: 35,
-        home: 36,
-        left: 37,
-        up: 38,
-        right: 39,
-        down: 40
-      };
+        return {
+            end: 35,
+            home: 36,
+            left: 37,
+            up: 38,
+            right: 39,
+            down: 40
+        };
     }
-  
+
     // Add or substract depending on key pressed
     direction() {
-      return {
-        37: -1,
-        38: -1,
-        39: 1,
-        40: 1
-      };
+        return {
+            37: -1,
+            38: -1,
+            39: 1,
+            40: 1
+        };
     }
-  
-    initButtons() {
-      let count = 0;
-      for(let button of this.buttons) {
-        let isSelected = button.getAttribute("aria-selected") === "true";
-        button.setAttribute("tabindex", isSelected ? "0" : "-1");
-  
-        button.addEventListener('click', this.clickEventListener.bind(this));
-        button.addEventListener('keydown', this.keydownEventListener.bind(this));
-        button.addEventListener('keyup', this.keyupEventListener.bind(this));
-  
-        button.index = count++;
-      }
-    }
-  
-    initPanels() {
-      let selectedPanelId = this.tablist.querySelector('[role="tab"][aria-selected="true"]').getAttribute("aria-controls");
-      for(let panel of this.panels) {
-        if(panel.getAttribute("id") !== selectedPanelId) {
-          panel.setAttribute("hidden", "");
-        }
-        panel.setAttribute("tabindex", "0");
-      }
-    }
-  
-    clickEventListener(event) {
-      let button = event.target.closest('a');
 
-      event.preventDefault();
-  
-      this.activateTab(button, false);
+    initButtons() {
+        let count = 0;
+        for(let button of this.buttons) {
+            let isSelected = button.getAttribute("aria-selected") === "true";
+            button.setAttribute("tabindex", isSelected ? "0" : "-1");
+
+            button.addEventListener('click', this.clickEventListener.bind(this));
+            button.addEventListener('keydown', this.keydownEventListener.bind(this));
+            button.addEventListener('keyup', this.keyupEventListener.bind(this));
+
+            button.index = count++;
+        }
     }
-  
+
+    initPanels() {
+        let selectedPanelId = this.tablist
+            .querySelector('[role="tab"][aria-selected="true"]')
+            .getAttribute("aria-controls");
+        for(let panel of this.panels) {
+            if(panel.getAttribute("id") !== selectedPanelId) {
+                panel.setAttribute("hidden", "");
+            }
+            panel.setAttribute("tabindex", "0");
+        }
+    }
+
+    clickEventListener(event) {
+        let button = event.target.closest('a');
+
+        event.preventDefault();
+
+        this.activateTab(button, false);
+    }
+
     // Handle keydown on tabs
     keydownEventListener(event) {
-      var key = event.keyCode;
-  
-      switch (key) {
-        case this.keys.end:
-          event.preventDefault();
-          // Activate last tab
-          this.activateTab(this.buttons[this.buttons.length - 1]);
-          break;
-        case this.keys.home:
-          event.preventDefault();
-          // Activate first tab
-          this.activateTab(this.buttons[0]);
-          break;
-  
-        // Up and down are in keydown
-        // because we need to prevent page scroll >:)
-        case this.keys.up:
-        case this.keys.down:
-          this.determineOrientation(event);
-          break;
-      };
+        var key = event.keyCode;
+
+        switch (key) {
+            case this.keys.end:
+                event.preventDefault();
+                // Activate last tab
+                this.activateTab(this.buttons[this.buttons.length - 1]);
+                break;
+            case this.keys.home:
+                event.preventDefault();
+                // Activate first tab
+                this.activateTab(this.buttons[0]);
+                break;
+
+            // Up and down are in keydown
+            // because we need to prevent page scroll >:)
+            case this.keys.up:
+            case this.keys.down:
+                this.determineOrientation(event);
+                break;
+        };
     }
-  
+
     // Handle keyup on tabs
     keyupEventListener(event) {
-      var key = event.keyCode;
-  
-      switch (key) {
-        case this.keys.left:
-        case this.keys.right:
-          this.determineOrientation(event);
-          break;
-      };
+        var key = event.keyCode;
+
+        switch (key) {
+            case this.keys.left:
+            case this.keys.right:
+                this.determineOrientation(event);
+                break;
+        };
     }
-  
+
     // When a tablist’s aria-orientation is set to vertical,
     // only up and down arrow should function.
     // In all other cases only left and right arrow function.
     determineOrientation(event) {
-      var key = event.keyCode;
-      var vertical = this.tablist.getAttribute('aria-orientation') == 'vertical';
-      var proceed = false;
-  
-      if (vertical) {
-        if (key === this.keys.up || key === this.keys.down) {
-          event.preventDefault();
-          proceed = true;
+        var key = event.keyCode;
+        var vertical = this.tablist.getAttribute('aria-orientation') == 'vertical';
+        var proceed = false;
+
+        if (vertical) {
+            if (key === this.keys.up || key === this.keys.down) {
+                event.preventDefault();
+                proceed = true;
+            };
+        }
+        else {
+            if (key === this.keys.left || key === this.keys.right) {
+                proceed = true;
+            };
         };
-      }
-      else {
-        if (key === this.keys.left || key === this.keys.right) {
-          proceed = true;
+
+        if (proceed) {
+            this.switchTabOnArrowPress(event);
         };
-      };
-  
-      if (proceed) {
-        this.switchTabOnArrowPress(event);
-      };
     }
-  
+
     // Either focus the next, previous, first, or last tab
     // depending on key pressed
     switchTabOnArrowPress(event) {
-      var pressed = event.keyCode;
-  
-      for (let button of this.buttons) {
-        button.addEventListener('focus', this.focusEventHandler.bind(this));
-      };
-  
-      if (this.direction[pressed]) {
-        var target = event.target;
-        if (target.index !== undefined) {
-          if (this.buttons[target.index + this.direction[pressed]]) {
-            this.buttons[target.index + this.direction[pressed]].focus();
-          }
-          else if (pressed === this.keys.left || pressed === this.keys.up) {
-            this.focusLastTab();
-          }
-          else if (pressed === this.keys.right || pressed == this.keys.down) {
-            this.focusFirstTab();
-          }
+        var pressed = event.keyCode;
+
+        for (let button of this.buttons) {
+            button.addEventListener('focus', this.focusEventHandler.bind(this));
+        };
+
+        if (this.direction[pressed]) {
+            var target = event.target;
+            if (target.index !== undefined) {
+                if (this.buttons[target.index + this.direction[pressed]]) {
+                    this.buttons[target.index + this.direction[pressed]].focus();
+                }
+                else if (pressed === this.keys.left || pressed === this.keys.up) {
+                    this.focusLastTab();
+                }
+                else if (pressed === this.keys.right || pressed == this.keys.down) {
+                    this.focusFirstTab();
+                }
+            }
         }
-      }
     }
-  
+
     // Activates any given tab panel
     activateTab (tab, setFocus) {
-      if(tab.getAttribute("role") !== "tab") {
-        tab = tab.closest('[role="tab"]');
-      }
-  
-      setFocus = setFocus || true;
-  
-      // Deactivate all other tabs
-      this.deactivateTabs();
-  
-      // Remove tabindex attribute
-      tab.removeAttribute('tabindex');
-  
-      // Set the tab as selected
-      tab.setAttribute('aria-selected', 'true');
-      
-      // Give the tab parent an is-active class
-      tab.parentNode.classList.add('is-active');
-  
-      // Get the value of aria-controls (which is an ID)
-      var controls = tab.getAttribute('aria-controls');
-  
-      // Remove hidden attribute from tab panel to make it visible
-      document.getElementById(controls).removeAttribute('hidden');
-  
-      // Set focus when required
-      if (setFocus) {
-        tab.focus();
-      }
+        if(tab.getAttribute("role") !== "tab") {
+            tab = tab.closest('[role="tab"]');
+        }
+
+        setFocus = setFocus || true;
+
+        // Deactivate all other tabs
+        this.deactivateTabs();
+
+        // Remove tabindex attribute
+        tab.removeAttribute('tabindex');
+
+        // Set the tab as selected
+        tab.setAttribute('aria-selected', 'true');
+
+        // Give the tab parent an is-active class
+        tab.parentNode.classList.add('is-active');
+
+        // Get the value of aria-controls (which is an ID)
+        var controls = tab.getAttribute('aria-controls');
+
+        // Remove hidden attribute from tab panel to make it visible
+        document.getElementById(controls).removeAttribute('hidden');
+
+        // Set focus when required
+        if (setFocus) {
+            tab.focus();
+        }
     }
-  
+
     // Deactivate all tabs and tab panels
     deactivateTabs() {
-      for (let button of this.buttons) {
-        button.parentNode.classList.remove('is-active');
-        button.setAttribute('tabindex', '-1');
-        button.setAttribute('aria-selected', 'false');
-        button.removeEventListener('focus', this.focusEventHandler.bind(this));
-      }
-  
-      for (let panel of this.panels) {
-        panel.setAttribute('hidden', 'hidden');
-      }
+        for (let button of this.buttons) {
+            button.parentNode.classList.remove('is-active');
+            button.setAttribute('tabindex', '-1');
+            button.setAttribute('aria-selected', 'false');
+            button.removeEventListener('focus', this.focusEventHandler.bind(this));
+        }
+
+        for (let panel of this.panels) {
+            panel.setAttribute('hidden', 'hidden');
+        }
     }
-  
+
     focusFirstTab() {
-      this.buttons[0].focus();
+        this.buttons[0].focus();
     }
-  
+
     focusLastTab() {
-      this.buttons[this.buttons.length - 1].focus();
+        this.buttons[this.buttons.length - 1].focus();
     }
-  
+
     // Determine whether there should be a delay
     // when user navigates with the arrow keys
     determineDelay() {
-      var hasDelay = this.tablist.hasAttribute('data-delay');
-      var delay = 0;
-  
-      if (hasDelay) {
-        var delayValue = this.tablist.getAttribute('data-delay');
-        if (delayValue) {
-          delay = delayValue;
-        }
-        else {
-          // If no value is specified, default to 300ms
-          delay = 300;
+        var hasDelay = this.tablist.hasAttribute('data-delay');
+        var delay = 0;
+
+        if (hasDelay) {
+            var delayValue = this.tablist.getAttribute('data-delay');
+            if (delayValue) {
+                delay = delayValue;
+            }
+            else {
+            // If no value is specified, default to 300ms
+                delay = 300;
+            };
         };
-      };
-  
-      return delay;
+
+        return delay;
     }
-  
+
     focusEventHandler(event) {
-      var target = event.target;
-  
-      setTimeout(this.checkTabFocus.bind(this), this.delay, target);
+        var target = event.target;
+
+        setTimeout(this.checkTabFocus.bind(this), this.delay, target);
     };
-  
+
     // Only activate tab on focus if it still has focus after the delay
     checkTabFocus(target) {
-      let focused = document.activeElement;
-  
-      if (target === focused) {
-        this.activateTab(target, false);
-      }
+        let focused = document.activeElement;
+
+        if (target === focused) {
+            this.activateTab(target, false);
+        }
     }
-  }
+}

From c370cad7f96e919cd580e33840fed7a7ce2cd013 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Thu, 4 Mar 2021 19:42:23 +0100
Subject: [PATCH 0188/1285] [lint] Fix white spaces in HTML.

---
 bookwyrm/templates/import.html                 | 18 +++++++++---------
 bookwyrm/templates/layout.html                 |  2 +-
 .../templates/snippets/progress_update.html    | 11 ++++++++---
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/bookwyrm/templates/import.html b/bookwyrm/templates/import.html
index 6b6febb1..99ff5c42 100644
--- a/bookwyrm/templates/import.html
+++ b/bookwyrm/templates/import.html
@@ -11,16 +11,16 @@
         {% csrf_token %}
 
         <label class="label" for="source">
-          <p>{% trans "Data source" %}</p>
+            <p>{% trans "Data source" %}</p>
         <div class="select {{ class }}">
-          <select name="source" id="source">
-            <option value="GoodReads" {% if current == 'GoodReads' %}selected{% endif %}>
-            GoodReads
-            </option>
-            <option value="LibraryThing" {% if current == 'LibraryThing' %}selected{% endif %}>
-            LibraryThing
-            </option>
-          </select>
+            <select name="source" id="source">
+                <option value="GoodReads" {% if current == 'GoodReads' %}selected{% endif %}>
+                    GoodReads
+                </option>
+                <option value="LibraryThing" {% if current == 'LibraryThing' %}selected{% endif %}>
+                    LibraryThing
+                </option>
+            </select>
         </div>
         </label>
 
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index bc2e7e09..038707f8 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -67,7 +67,7 @@
         </div>
 
         <div class="navbar-end">
-	    {% if request.user.is_authenticated %}
+        {% if request.user.is_authenticated %}
             <div class="navbar-item has-dropdown is-hoverable">
                 <div class="navbar-link pulldown-menu" role="button" aria-expanded="false" tabindex="0" aria-haspopup="true" aria-controls="navbar-dropdown"><p>
                     {% include 'snippets/avatar.html' with user=request.user %}
diff --git a/bookwyrm/templates/snippets/progress_update.html b/bookwyrm/templates/snippets/progress_update.html
index 138defbd..321f47a6 100644
--- a/bookwyrm/templates/snippets/progress_update.html
+++ b/bookwyrm/templates/snippets/progress_update.html
@@ -7,9 +7,14 @@
         <div class="field has-addons mb-0">
             <div class="control">
                 <input
-                 aria-label="{% if readthrough.progress_mode == 'PG' %}Current page{% else %}Percent read{% endif %}"
-                 class="input is-small" type="number" min="0"
-                 name="progress" size="3" value="{{ readthrough.progress|default:'' }}">
+                    class="input is-small"
+                    type="number"
+                    name="progress"
+                    value="{{ readthrough.progress|default:'' }}"
+                    min="0"
+                    size="3"
+                    aria-label="{% if readthrough.progress_mode == 'PG' %}Current page{% else %}Percent read{% endif %}"
+                />
             </div>
             <div class="control select is-small">
                 <select name="progress_mode" aria-label="Progress mode">

From 4de30effa505b6d32cb8362049c3275141b3381a Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Thu, 4 Mar 2021 19:44:12 +0100
Subject: [PATCH 0189/1285] [lint] Fix indentation in .yaml files.

---
 docker-compose.yml | 148 ++++++++++++++++++++++-----------------------
 1 file changed, 74 insertions(+), 74 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 08567ce3..5d9cbf1b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,79 +1,79 @@
 version: '3'
 
 services:
-    nginx:
-        image: nginx:latest
-        ports:
-            - 1333:80
-        depends_on:
-            - web
-        networks:
-            - main
-        volumes:
-            - ./nginx:/etc/nginx/conf.d
-            - static_volume:/app/static
-            - media_volume:/app/images
-    db:
-        image: postgres
-        env_file: .env
-        volumes:
-          - pgdata:/var/lib/postgresql/data
-        networks:
-            - main
-    web:
-        build: .
-        env_file: .env
-        command: python manage.py runserver 0.0.0.0:8000
-        volumes:
-            - .:/app
-            - static_volume:/app/static
-            - media_volume:/app/images
-        depends_on:
-            - db
-            - celery_worker
-        networks:
-            - main
-        ports:
-            - 8000:8000
-    redis:
-        image: redis
-        env_file: .env
-        ports:
-          - 6379:6379
-        networks:
-            - main
-        restart: on-failure
-    celery_worker:
-        env_file: .env
-        build: .
-        networks:
-            - main
-        command: celery -A celerywyrm worker -l info
-        volumes:
-            - .:/app
-            - static_volume:/app/static
-            - media_volume:/app/images
-        depends_on:
-            - db
-            - redis
-        restart: on-failure
-    flower:
-        build: .
-        command: flower --port=8888
-        env_file: .env
-        environment:
-            - CELERY_BROKER_URL=${CELERY_BROKER}
-        networks:
-            - main
-        depends_on:
-            - db
-            - redis
-        restart: on-failure
-        ports:
-             - 8888:8888
+  nginx:
+    image: nginx:latest
+    ports:
+      - 1333:80
+    depends_on:
+      - web
+    networks:
+      - main
+    volumes:
+      - ./nginx:/etc/nginx/conf.d
+      - static_volume:/app/static
+      - media_volume:/app/images
+  db:
+    image: postgres
+    env_file: .env
+    volumes:
+      - pgdata:/var/lib/postgresql/data
+    networks:
+      - main
+  web:
+    build: .
+    env_file: .env
+    command: python manage.py runserver 0.0.0.0:8000
+    volumes:
+      - .:/app
+      - static_volume:/app/static
+      - media_volume:/app/images
+    depends_on:
+      - db
+      - celery_worker
+    networks:
+      - main
+    ports:
+      - 8000:8000
+  redis:
+    image: redis
+    env_file: .env
+    ports:
+      - 6379:6379
+    networks:
+      - main
+    restart: on-failure
+  celery_worker:
+    env_file: .env
+    build: .
+    networks:
+      - main
+    command: celery -A celerywyrm worker -l info
+    volumes:
+      - .:/app
+      - static_volume:/app/static
+      - media_volume:/app/images
+    depends_on:
+      - db
+      - redis
+    restart: on-failure
+  flower:
+    build: .
+    command: flower --port=8888
+    env_file: .env
+    environment:
+      - CELERY_BROKER_URL=${CELERY_BROKER}
+    networks:
+      - main
+    depends_on:
+      - db
+      - redis
+    restart: on-failure
+    ports:
+      - 8888:8888
 volumes:
-    pgdata:
-    static_volume:
-    media_volume:
+  pgdata:
+  static_volume:
+  media_volume:
 networks:
-    main:
+  main:

From d09036b9135fe3a9695480cd414d3778ce7c490d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 4 Mar 2021 10:54:19 -0800
Subject: [PATCH 0190/1285] Removes fuzzy tag from spanish translations

I took the liberty of adding a couple very small ones myself as well
---
 locale/es/LC_MESSAGES/django.po | 34 ++++++++++-----------------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 75e24e0e..3063fe70 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -40,7 +40,6 @@ msgid "%(count)d uses"
 msgstr "%(count)d usos"
 
 #: bookwyrm/forms.py:192
-#, fuzzy
 #| msgid "Unlisted"
 msgid "Unlimited"
 msgstr "Sin límite"
@@ -56,10 +55,8 @@ msgid "%(value)s is not a valid username"
 msgstr "%(value)s no es un usuario válido"
 
 #: bookwyrm/models/fields.py:164
-#, fuzzy
-#| msgid "Username:"
 msgid "username"
-msgstr "Nombre de usuario:"
+msgstr "nombre de usuario"
 
 #: bookwyrm/models/fields.py:169
 msgid "A user with that username already exists."
@@ -129,16 +126,14 @@ msgid "ASIN:"
 msgstr "ASIN:"
 
 #: bookwyrm/templates/book.html:84
-#, fuzzy, python-format
-#| msgid "of %(book.pages)s pages"
+#, python-format
 msgid "%(format)s, %(pages)s pages"
-msgstr "de %(book.pages)s páginas"
+msgstr "%(format)s, %(pages)s páginas"
 
 #: bookwyrm/templates/book.html:86
-#, fuzzy, python-format
-#| msgid "of %(book.pages)s pages"
+#, python-format
 msgid "%(pages)s pages"
-msgstr "de %(book.pages)s páginas"
+msgstr "%(pages)s páginas"
 
 #: bookwyrm/templates/book.html:91
 msgid "View on OpenLibrary"
@@ -183,20 +178,19 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #: bookwyrm/templates/book.html:127
-#, fuzzy, python-format
+#, python-format
 #| msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s/editions\">%(count)s ediciones</a>"
 
 #: bookwyrm/templates/book.html:135
-#, fuzzy, python-format
+#, python-format
 #| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "Esta edición está en tu <a href=\"%(path)s\">%(shelf_name)s</a> estante."
 
 #: bookwyrm/templates/book.html:141
-#, fuzzy, python-format
-#| msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+#, python-format
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr "Una <a href=\"%(book_path)s\">edición diferente</a> de este libro está en tu <a href=\"%(shelf_path)s\">%(shelf_name)s</a> estante."
 
@@ -490,8 +484,6 @@ msgstr "Leer"
 
 #: bookwyrm/templates/feed/feed_layout.html:24
 #: bookwyrm/templates/user/shelf.html:24
-#, fuzzy
-#| msgid "Start reading"
 msgid "Currently Reading"
 msgstr "Leyendo actualmente"
 
@@ -784,8 +776,7 @@ msgid "This list is currently empty"
 msgstr "Esta lista está vacia"
 
 #: bookwyrm/templates/lists/list.html:35
-#, fuzzy, python-format
-#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+#, python-format
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "Agregado por <a href=\"%(user_path)s\">%(username)s</a>"
 
@@ -841,8 +832,7 @@ msgid "Your lists"
 msgstr "Tus listas"
 
 #: bookwyrm/templates/lists/lists.html:32
-#, fuzzy, python-format
-#| msgid "See all %(size)s"
+#, python-format
 msgid "See all %(size)s lists"
 msgstr "Ver las %(size)s listas"
 
@@ -1672,8 +1662,6 @@ msgid "More options"
 msgstr "Más opciones"
 
 #: bookwyrm/templates/snippets/status/status_options.html:17
-#, fuzzy
-#| msgid "Delete post"
 msgid "Delete status"
 msgstr "Eliminar status"
 
@@ -1697,8 +1685,6 @@ msgstr "Libros etiquetados con \"%(tag.name)s\""
 
 #: bookwyrm/templates/user/create_shelf_form.html:5
 #: bookwyrm/templates/user/create_shelf_form.html:22
-#, fuzzy
-#| msgid "Create shelf"
 msgid "Create Shelf"
 msgstr "Crear estante"
 

From 16ea657b5bfc690e86869ac4d2204f8011a2708f Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Thu, 4 Mar 2021 20:14:11 +0100
Subject: [PATCH 0191/1285] [a11y] Add `aria-modal`:

- Addresses https://github.com/mouse-reeve/bookwyrm/pull/680#issuecomment-790603940
---
 bookwyrm/templates/components/modal.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bookwyrm/templates/components/modal.html b/bookwyrm/templates/components/modal.html
index 18b69b25..5950e3c6 100644
--- a/bookwyrm/templates/components/modal.html
+++ b/bookwyrm/templates/components/modal.html
@@ -1,8 +1,11 @@
+{# @todo Implement focus traps to prevent tabbing out of the modal. #}
+
 <div
     role="dialog"
     class="modal hidden"
     id="{{ controls_text }}-{{ controls_uid }}"
     aria-labelledby="modal-card-title-{{ controls_text }}-{{ controls_uid }}"
+    aria-modal="true"
 >
     <div class="modal-background"></div>
     <div class="modal-card">

From dab6592c12c3ba67270c295bb29ae297970624d3 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Thu, 4 Mar 2021 20:38:28 +0100
Subject: [PATCH 0192/1285] Testing moving a comment to see what accesslint
 says.

---
 bookwyrm/templates/components/modal.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bookwyrm/templates/components/modal.html b/bookwyrm/templates/components/modal.html
index 5950e3c6..9ffbc2b3 100644
--- a/bookwyrm/templates/components/modal.html
+++ b/bookwyrm/templates/components/modal.html
@@ -1,5 +1,3 @@
-{# @todo Implement focus traps to prevent tabbing out of the modal. #}
-
 <div
     role="dialog"
     class="modal hidden"
@@ -7,6 +5,7 @@
     aria-labelledby="modal-card-title-{{ controls_text }}-{{ controls_uid }}"
     aria-modal="true"
 >
+    {# @todo Implement focus traps to prevent tabbing out of the modal. #}
     <div class="modal-background"></div>
     <div class="modal-card">
         <header class="modal-card-head" tabindex="0" id="modal-title-{{ controls_text }}-{{ controls_uid }}">

From fa62fed787cf9f7dc3502ce296ff163a29696fa8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 4 Mar 2021 13:57:58 -0800
Subject: [PATCH 0193/1285] Compiles messages for spanish

---
 locale/es/LC_MESSAGES/django.mo | Bin 26251 -> 27410 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index ee2cf48de00efd917b842f6e4e33dc8286d28e87..9c747eebc62a11dec94bd2562215a8730fb75ac8 100644
GIT binary patch
delta 9453
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
Yp9V)3yNj|*Tn@IV)Kls#DR5i=0_eJ`+yDRo

delta 8469
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
Q`<Fg6yxiM%#J-^a0`+}{h5!Hn


From e2622d05942f90f46ea33a6f1e057f64390fd4d4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 4 Mar 2021 14:27:49 -0800
Subject: [PATCH 0194/1285] Catches a couple translations, hides profile box
 when empty

---
 bookwyrm/templates/discover/landing_layout.html |  4 ++--
 bookwyrm/templates/discover/large-book.html     |  3 ++-
 bookwyrm/templates/discover/small-book.html     |  3 ++-
 bookwyrm/templates/layout.html                  | 10 +++++-----
 bookwyrm/templates/snippets/username.html       |  4 ++--
 bookwyrm/templates/user/user_layout.html        |  4 ++--
 6 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/bookwyrm/templates/discover/landing_layout.html b/bookwyrm/templates/discover/landing_layout.html
index 3aa27e39..5cfa1fd3 100644
--- a/bookwyrm/templates/discover/landing_layout.html
+++ b/bookwyrm/templates/discover/landing_layout.html
@@ -54,11 +54,11 @@
         <div class="tile is-child box has-background-white-bis">
             <h2 class="title is-4">{% trans "Your Account" %}</h2>
             {% include 'user/user_preview.html' with user=request.user %}
+            {% if request.user.summary %}
             <div class="box content">
-                {% if request.user.summary %}
                 {{ request.user.summary | to_markdown | safe }}
-                {% endif %}
             </div>
+            {% endif %}
         </div>
         {% endif %}
     </div>
diff --git a/bookwyrm/templates/discover/large-book.html b/bookwyrm/templates/discover/large-book.html
index 7881a33a..44b91b94 100644
--- a/bookwyrm/templates/discover/large-book.html
+++ b/bookwyrm/templates/discover/large-book.html
@@ -1,4 +1,5 @@
 {% load bookwyrm_tags %}
+{% load i18n %}
 {% if book %}
 <div class="columns">
     <div class="column is-narrow">
@@ -8,7 +9,7 @@
     <div class="column">
         <h3 class="title is-5"><a href="/book/{{ book.id }}">{{ book.title }}</a></h3>
         {% if book.authors %}
-        <p class="subtitle is-5">by {% include 'snippets/authors.html' with book=book %}</p>
+        <p class="subtitle is-5">{% trans "by" %} {% include 'snippets/authors.html' with book=book %}</p>
         {% endif %}
         {% if book|book_description %}
         <blockquote class="content">{{ book|book_description|to_markdown|safe|truncatewords_html:50 }}</blockquote>
diff --git a/bookwyrm/templates/discover/small-book.html b/bookwyrm/templates/discover/small-book.html
index 72108c30..6df27746 100644
--- a/bookwyrm/templates/discover/small-book.html
+++ b/bookwyrm/templates/discover/small-book.html
@@ -1,11 +1,12 @@
 {% load bookwyrm_tags %}
+{% load i18n %}
 {% if book %}
 <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book %}</a>
 {% include 'snippets/stars.html' with rating=book|rating:request.user %}
 
 <h3 class="title is-6"><a href="/book/{{ book.id }}">{{ book.title }}</a></h3>
 {% if book.authors %}
-<p class="subtitle is-6">by {% include 'snippets/authors.html' with book=book %}</p>
+<p class="subtitle is-6">{% trans "by" %} {% include 'snippets/authors.html' with book=book %}</p>
 {% endif %}
 
 {% endif %}
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 6e445889..ee42b4f6 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -149,12 +149,12 @@
                             <div class="columns is-variable is-1">
                                 <div class="column">
                                     <label class="is-sr-only" for="id_localname">{% trans "Username:" %}</label>
-                                    <input type="text" name="localname" maxlength="150" class="input" required="" id="id_localname" placeholder="username">
+                                    <input type="text" name="localname" maxlength="150" class="input" required="" id="id_localname" placeholder="{% trans 'username' %}">
                                 </div>
                                 <div class="column">
                                     <label class="is-sr-only" for="id_password">{% trans "Username:" %}</label>
-                                    <input type="password" name="password" maxlength="128" class="input" required="" id="id_password" placeholder="password">
-                                    <p class="help"><a href="/password-reset">Forgot your password?</a></p>
+                                    <input type="password" name="password" maxlength="128" class="input" required="" id="id_password" placeholder="{% trans 'password' %}">
+                                    <p class="help"><a href="/password-reset">{% trans "Forgot your password?" %}</a></p>
                                 </div>
                                 <div class="column is-narrow">
                                     <button class="button is-primary" type="submit">{% trans "Log in" %}</button>
@@ -165,7 +165,7 @@
                     {% if site.allow_registration and request.path != '' and request.path != '/' %}
                     <div class="column is-narrow">
                         <a href="/" class="button is-link">
-                            Join
+                            {% trans "Join" %}
                         </a>
                     </div>
                     {% endif %}
@@ -199,7 +199,7 @@
             {% if site.support_link %}
             <div class="column">
                 <span class="icon icon-heart"></span>
-                Support {{ site.name }} on <a href="{{ site.support_link }}" target="_blank">{{ site.support_title }}</a>
+                {% blocktrans %}Support {{ site.name }} on <a href="{{ site.support_link }}" target="_blank">{{ site.support_title }}</a>{% endblocktrans %}
             </div>
             {% endif %}
             <div class="column">
diff --git a/bookwyrm/templates/snippets/username.html b/bookwyrm/templates/snippets/username.html
index e18ba1f8..b004582d 100644
--- a/bookwyrm/templates/snippets/username.html
+++ b/bookwyrm/templates/snippets/username.html
@@ -4,7 +4,7 @@
 <{% if anchor %}a href="{{ user.local_path }}"{% else %}span{% endif %}
     class="user ml-1"
 >
-    {{ user.name|default:user|username }}
+    {{ user.display_name }}
 </a>
 
 {% if possessive %}'s{% endif %}
@@ -12,4 +12,4 @@
 {% if show_full and user.name or show_full and user.localname %}
  ({{ user.username }})
 {% endif %}
-{% endspaceless %}
\ No newline at end of file
+{% endspaceless %}
diff --git a/bookwyrm/templates/user/user_layout.html b/bookwyrm/templates/user/user_layout.html
index bc7fe126..d7629160 100644
--- a/bookwyrm/templates/user/user_layout.html
+++ b/bookwyrm/templates/user/user_layout.html
@@ -17,11 +17,11 @@
             {% include 'user/user_preview.html' with user=user %}
         </div>
 
+        {% if user.summary %}
         <div class="column box has-background-white-bis content">
-            {% if user.summary %}
             {{ user.summary | to_markdown | safe }}
-            {% endif %}
         </div>
+        {% endif %}
     </div>
     {% if not is_self and request.user.is_authenticated %}
     {% include 'snippets/follow_button.html' with user=user %}

From 3e4c6c716d06c0684df92538e91f9fb7922a0d5e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 4 Mar 2021 14:36:01 -0800
Subject: [PATCH 0195/1285] Removes some more fuzziness and re-builds locale
 files

---
 locale/de_DE/LC_MESSAGES/django.mo | Bin 23957 -> 24221 bytes
 locale/de_DE/LC_MESSAGES/django.po |  81 +++++++++++++++------------
 locale/en_US/LC_MESSAGES/django.po |  69 ++++++++++++++---------
 locale/fr_FR/LC_MESSAGES/django.po |  67 ++++++++++++++--------
 locale/zh_CN/LC_MESSAGES/django.mo | Bin 23700 -> 24014 bytes
 locale/zh_CN/LC_MESSAGES/django.po |  86 +++++++++++++++--------------
 6 files changed, 176 insertions(+), 127 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo
index a12144464b93dd155c8653346aa8639373bfb22a..b6d454f671e73fcbb0ed77ef4250924023819690 100644
GIT binary patch
delta 7726
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

delta 7501
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

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 1887fcd8..7b3a4252 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-04 04:13+0000\n"
+"POT-Creation-Date: 2021-03-04 22:24+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"
@@ -55,7 +55,7 @@ msgstr "%(value)s ist keine gültige remote_id"
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s ist kein gültiger Username"
 
-#: bookwyrm/models/fields.py:164
+#: bookwyrm/models/fields.py:164 bookwyrm/templates/layout.html:152
 #, fuzzy
 #| msgid "Server name"
 msgid "username"
@@ -100,6 +100,8 @@ msgid "Books by %(name)s"
 msgstr "Bücher von %(name)s"
 
 #: bookwyrm/templates/book.html:21
+#: bookwyrm/templates/discover/large-book.html:12
+#: bookwyrm/templates/discover/small-book.html:9
 msgid "by"
 msgstr "von"
 
@@ -432,7 +434,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:79
+#: bookwyrm/templates/layout.html:87
 msgid "Direct Messages"
 msgstr "Direktnachrichten"
 
@@ -542,7 +544,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "%(username)ss %(year)s Bücher"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/layout.html:94
+#: bookwyrm/templates/layout.html:102
 msgid "Import Books"
 msgstr "Bücher importieren"
 
@@ -665,55 +667,72 @@ msgstr "Deine Regale"
 msgid "Feed"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:84
+#: bookwyrm/templates/layout.html:92
 #: bookwyrm/templates/preferences/preferences_layout.html:14
 msgid "Profile"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:89
+#: bookwyrm/templates/layout.html:97
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: bookwyrm/templates/layout.html:103
+#: bookwyrm/templates/layout.html:111
 #: bookwyrm/templates/settings/admin_layout.html:19
 #: bookwyrm/templates/settings/manage_invites.html:3
 msgid "Invites"
 msgstr "Einladungen"
 
-#: bookwyrm/templates/layout.html:110
+#: bookwyrm/templates/layout.html:118
 msgid "Site Configuration"
 msgstr "Seiteneinstellungen"
 
-#: bookwyrm/templates/layout.html:117
+#: bookwyrm/templates/layout.html:125
 msgid "Log out"
 msgstr "Abmelden"
 
-#: bookwyrm/templates/layout.html:125 bookwyrm/templates/layout.html:126
+#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:10
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: bookwyrm/templates/layout.html:143 bookwyrm/templates/layout.html:147
+#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:152 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:156
+msgid "password"
+msgstr "Passwort"
+
+#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36
+msgid "Forgot your password?"
+msgstr "Passwort vergessen?"
+
+#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "Anmelden"
 
-#: bookwyrm/templates/layout.html:183
+#: bookwyrm/templates/layout.html:168
+msgid "Join"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:191
 msgid "About this server"
 msgstr "Ãœber diesen Server"
 
-#: bookwyrm/templates/layout.html:187
+#: bookwyrm/templates/layout.html:195
 msgid "Contact site admin"
 msgstr "Admin kontaktieren"
 
-#: bookwyrm/templates/layout.html:198
+#: bookwyrm/templates/layout.html:202
+#, python-format
+msgid "Support %(site.name)s on <a href=\"%(site.support_link)s\" target=\"_blank\">%(site.support_title)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:206
 msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm ist open source Software. Du kannst dich auf <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> beteiligen oder etwas melden."
 
@@ -859,10 +878,6 @@ msgstr ""
 msgid "Password:"
 msgstr "Passwort:"
 
-#: bookwyrm/templates/login.html:36
-msgid "Forgot your password?"
-msgstr "Passwort vergessen?"
-
 #: bookwyrm/templates/login.html:49
 msgid "Contact an administrator to get an invite"
 msgstr "Kontaktiere für eine Einladung eine*n Admin"
@@ -876,8 +891,6 @@ msgid "Not Found"
 msgstr "Nicht gefunden"
 
 #: bookwyrm/templates/notfound.html:9
-#, fuzzy
-#| msgid "The page your requested doesn't seem to exist!"
 msgid "The page you requested doesn't seem to exist!"
 msgstr "Die Seite die du angefordert hast scheint nicht zu existieren!"
 
@@ -955,18 +968,18 @@ msgstr "hat dir eine Folgeanfrage geschickt"
 
 #: bookwyrm/templates/notifications.html:90
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book.title)s</em></a>"
-msgstr "hat deine <a href=\"%(related_path)s\">Bewertung von <em>%(book.title)s</em></a> geteilt"
+msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "hat deine <a href=\"%(related_path)s\">Bewertung von <em>%(book_title)s</em></a> geteilt"
 
 #: bookwyrm/templates/notifications.html:92
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book.title)s</em></a>"
-msgstr "hat deinen <a href=\"%(related_path)s\">Kommentar zu<em>%(book.title)s</em></a> geteilt"
+msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+msgstr "hat deinen <a href=\"%(related_path)s\">Kommentar zu<em>%(book_title)s</em></a> geteilt"
 
 #: bookwyrm/templates/notifications.html:94
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book.title)s</em></a>"
-msgstr "hat dein <a href=\"%(related_path)s\">Zitat aus <em>%(book.title)s</em></a> geteilt"
+msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr "hat dein <a href=\"%(related_path)s\">Zitat aus <em>%(book_title)s</em></a> geteilt"
 
 #: bookwyrm/templates/notifications.html:96
 #, python-format
@@ -1654,17 +1667,17 @@ msgstr "geteilt"
 msgid "Reply"
 msgstr "Antwort"
 
-#: bookwyrm/templates/snippets/status/status_content.html:16
-#: bookwyrm/templates/snippets/trimmed_text.html:12
+#: bookwyrm/templates/snippets/status/status_content.html:18
+#: bookwyrm/templates/snippets/trimmed_text.html:15
 msgid "Show more"
 msgstr "Mehr anzeigen"
 
-#: bookwyrm/templates/snippets/status/status_content.html:23
-#: bookwyrm/templates/snippets/trimmed_text.html:18
+#: bookwyrm/templates/snippets/status/status_content.html:25
+#: bookwyrm/templates/snippets/trimmed_text.html:25
 msgid "Show less"
 msgstr "Weniger anzeigen"
 
-#: bookwyrm/templates/snippets/status/status_content.html:44
+#: bookwyrm/templates/snippets/status/status_content.html:46
 msgid "Open image in new window"
 msgstr "Bild in neuem Fenster öffnen"
 
@@ -1674,8 +1687,6 @@ msgid "More options"
 msgstr "Mehr Optionen"
 
 #: bookwyrm/templates/snippets/status/status_options.html:17
-#, fuzzy
-#| msgid "Delete post"
 msgid "Delete status"
 msgstr "Post löschen"
 
@@ -1699,8 +1710,6 @@ msgstr "Mit \"%(tag.name)s\" markierte Bücher"
 
 #: bookwyrm/templates/user/create_shelf_form.html:5
 #: bookwyrm/templates/user/create_shelf_form.html:22
-#, fuzzy
-#| msgid "Create shelf"
 msgid "Create Shelf"
 msgstr "Regal erstellen"
 
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index 32ee02b7..bf9b8a92 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-04 04:13+0000\n"
+"POT-Creation-Date: 2021-03-04 22:24+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"
@@ -53,7 +53,7 @@ msgstr ""
 msgid "%(value)s is not a valid username"
 msgstr ""
 
-#: bookwyrm/models/fields.py:164
+#: bookwyrm/models/fields.py:164 bookwyrm/templates/layout.html:152
 msgid "username"
 msgstr ""
 
@@ -96,6 +96,8 @@ msgid "Books by %(name)s"
 msgstr ""
 
 #: bookwyrm/templates/book.html:21
+#: bookwyrm/templates/discover/large-book.html:12
+#: bookwyrm/templates/discover/small-book.html:9
 msgid "by"
 msgstr ""
 
@@ -423,7 +425,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr ""
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:79
+#: bookwyrm/templates/layout.html:87
 msgid "Direct Messages"
 msgstr ""
 
@@ -529,7 +531,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr ""
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/layout.html:94
+#: bookwyrm/templates/layout.html:102
 msgid "Import Books"
 msgstr ""
 
@@ -652,55 +654,72 @@ msgstr ""
 msgid "Feed"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:84
+#: bookwyrm/templates/layout.html:92
 #: bookwyrm/templates/preferences/preferences_layout.html:14
 msgid "Profile"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:89
+#: bookwyrm/templates/layout.html:97
 msgid "Settings"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:103
+#: bookwyrm/templates/layout.html:111
 #: bookwyrm/templates/settings/admin_layout.html:19
 #: bookwyrm/templates/settings/manage_invites.html:3
 msgid "Invites"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:110
+#: bookwyrm/templates/layout.html:118
 msgid "Site Configuration"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:117
+#: bookwyrm/templates/layout.html:125
 msgid "Log out"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:125 bookwyrm/templates/layout.html:126
+#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:10
 msgid "Notifications"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:143 bookwyrm/templates/layout.html:147
+#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:152 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:156
+msgid "password"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36
+msgid "Forgot your password?"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:183
+#: bookwyrm/templates/layout.html:168
+msgid "Join"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:191
 msgid "About this server"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:187
+#: bookwyrm/templates/layout.html:195
 msgid "Contact site admin"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:198
+#: bookwyrm/templates/layout.html:202
+#, python-format
+msgid "Support %(site.name)s on <a href=\"%(site.support_link)s\" target=\"_blank\">%(site.support_title)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:206
 msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr ""
 
@@ -844,10 +863,6 @@ msgstr ""
 msgid "Password:"
 msgstr ""
 
-#: bookwyrm/templates/login.html:36
-msgid "Forgot your password?"
-msgstr ""
-
 #: bookwyrm/templates/login.html:49
 msgid "Contact an administrator to get an invite"
 msgstr ""
@@ -938,17 +953,17 @@ msgstr ""
 
 #: bookwyrm/templates/notifications.html:90
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book.title)s</em></a>"
+msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:92
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book.title)s</em></a>"
+msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:94
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book.title)s</em></a>"
+msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:96
@@ -1637,17 +1652,17 @@ msgstr ""
 msgid "Reply"
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/status_content.html:16
-#: bookwyrm/templates/snippets/trimmed_text.html:12
+#: bookwyrm/templates/snippets/status/status_content.html:18
+#: bookwyrm/templates/snippets/trimmed_text.html:15
 msgid "Show more"
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/status_content.html:23
-#: bookwyrm/templates/snippets/trimmed_text.html:18
+#: bookwyrm/templates/snippets/status/status_content.html:25
+#: bookwyrm/templates/snippets/trimmed_text.html:25
 msgid "Show less"
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/status_content.html:44
+#: bookwyrm/templates/snippets/status/status_content.html:46
 msgid "Open image in new window"
 msgstr ""
 
diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 68bb0c46..49f43c4c 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-04 04:13+0000\n"
+"POT-Creation-Date: 2021-03-04 22:24+0000\n"
 "PO-Revision-Date: 2021-03-02 12:37+0100\n"
 "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -55,7 +55,7 @@ msgstr ""
 msgid "%(value)s is not a valid username"
 msgstr ""
 
-#: bookwyrm/models/fields.py:164
+#: bookwyrm/models/fields.py:164 bookwyrm/templates/layout.html:152
 #, fuzzy
 #| msgid "Username:"
 msgid "username"
@@ -100,6 +100,8 @@ msgid "Books by %(name)s"
 msgstr "Livres par %(name)s"
 
 #: bookwyrm/templates/book.html:21
+#: bookwyrm/templates/discover/large-book.html:12
+#: bookwyrm/templates/discover/small-book.html:9
 msgid "by"
 msgstr ""
 
@@ -440,7 +442,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:79
+#: bookwyrm/templates/layout.html:87
 msgid "Direct Messages"
 msgstr "Messages directs"
 
@@ -556,7 +558,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "Livres de %(username)s en %(year)s"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/layout.html:94
+#: bookwyrm/templates/layout.html:102
 msgid "Import Books"
 msgstr "Importer des livres"
 
@@ -679,57 +681,76 @@ msgstr "Vos étagères"
 msgid "Feed"
 msgstr "Fil d’actualité"
 
-#: bookwyrm/templates/layout.html:84
+#: bookwyrm/templates/layout.html:92
 #: bookwyrm/templates/preferences/preferences_layout.html:14
 msgid "Profile"
 msgstr "Profil"
 
-#: bookwyrm/templates/layout.html:89
+#: bookwyrm/templates/layout.html:97
 #, fuzzy
 #| msgid "Instance Settings"
 msgid "Settings"
 msgstr "Paramètres de l’instance"
 
-#: bookwyrm/templates/layout.html:103
+#: bookwyrm/templates/layout.html:111
 #: bookwyrm/templates/settings/admin_layout.html:19
 #: bookwyrm/templates/settings/manage_invites.html:3
 msgid "Invites"
 msgstr "Invitations"
 
-#: bookwyrm/templates/layout.html:110
+#: bookwyrm/templates/layout.html:118
 msgid "Site Configuration"
 msgstr "Configuration du site"
 
-#: bookwyrm/templates/layout.html:117
+#: bookwyrm/templates/layout.html:125
 msgid "Log out"
 msgstr "Se déconnecter"
 
-#: bookwyrm/templates/layout.html:125 bookwyrm/templates/layout.html:126
+#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:10
 msgid "Notifications"
 msgstr "Notifications"
 
-#: bookwyrm/templates/layout.html:143 bookwyrm/templates/layout.html:147
+#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "Nom d’utilisateur :"
 
-#: bookwyrm/templates/layout.html:152 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:156
+#, fuzzy
+#| msgid "Password:"
+msgid "password"
+msgstr "Mot de passe :"
+
+#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36
+msgid "Forgot your password?"
+msgstr "Mot de passe oublié ?"
+
+#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "Se connecter"
 
-#: bookwyrm/templates/layout.html:183
+#: bookwyrm/templates/layout.html:168
+msgid "Join"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:191
 msgid "About this server"
 msgstr "À propos de ce serveur"
 
-#: bookwyrm/templates/layout.html:187
+#: bookwyrm/templates/layout.html:195
 msgid "Contact site admin"
 msgstr "Contacter l’administrateur du site"
 
-#: bookwyrm/templates/layout.html:198
+#: bookwyrm/templates/layout.html:202
+#, python-format
+msgid "Support %(site.name)s on <a href=\"%(site.support_link)s\" target=\"_blank\">%(site.support_title)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:206
 msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "Bookwyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports de bogues via <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
@@ -875,10 +896,6 @@ msgstr "Connexion"
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: bookwyrm/templates/login.html:36
-msgid "Forgot your password?"
-msgstr "Mot de passe oublié ?"
-
 #: bookwyrm/templates/login.html:49
 msgid "Contact an administrator to get an invite"
 msgstr "Contacter un administrateur pour obtenir une invitation"
@@ -1288,6 +1305,7 @@ msgid "Un-block"
 msgstr "Débloquer"
 
 #: bookwyrm/templates/snippets/book_titleby.html:3
+#, python-format
 msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgstr "<a href=\"%(path)s\">%(title)s</a> par "
 
@@ -1675,17 +1693,17 @@ msgstr "partagé"
 msgid "Reply"
 msgstr "Répondre"
 
-#: bookwyrm/templates/snippets/status/status_content.html:16
-#: bookwyrm/templates/snippets/trimmed_text.html:12
+#: bookwyrm/templates/snippets/status/status_content.html:18
+#: bookwyrm/templates/snippets/trimmed_text.html:15
 msgid "Show more"
 msgstr "Déplier"
 
-#: bookwyrm/templates/snippets/status/status_content.html:23
-#: bookwyrm/templates/snippets/trimmed_text.html:18
+#: bookwyrm/templates/snippets/status/status_content.html:25
+#: bookwyrm/templates/snippets/trimmed_text.html:25
 msgid "Show less"
 msgstr "Replier"
 
-#: bookwyrm/templates/snippets/status/status_content.html:44
+#: bookwyrm/templates/snippets/status/status_content.html:46
 msgid "Open image in new window"
 msgstr "Ouvrir l’image dans une nouvelle fenêtre"
 
@@ -1767,6 +1785,7 @@ msgid "Your Shelves"
 msgstr "Vos étagères"
 
 #: bookwyrm/templates/user/shelf.html:11
+#, python-format
 msgid "%(username)s: Shelves"
 msgstr "%(username)s : Étagères"
 
diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
index 63517fd066a7fc3fef2ca474191a56dfcdf4a6d2..2503685567bb55afa351c7923f572c2f172ab692 100644
GIT binary patch
delta 8374
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

delta 8126
zcmYk>3w(}sAII_k*pZDLX`3;J*%&i~ZBBDOM6xmGjhc|dl03>ocPUi#NGmCYvLYn4
zEg6X-)RR(*@aP<#gi@-hr|0v%ub<b;_3C%O|Nr0hKVARpy6$_`p&bE_Zx8UDiVl3j
zam);Gt^t<ScJ318R`r#2?)Qey&B8x$Ax>}PTo=5AEip6Mxi}nynK%>G^?9s^RhWc_
zaTs2}=GeQjKksu>DQJL)%rzKKy%IIhhu92HV+n>g@tlV<sGq}p9MjafTzmzC@FK?G
zWsJgF3=)hDFa(=osPj3OPN61=>oE+ourBtrdLGuHJ{Hw+Dr%rv7>;x8{9>!GKux?3
zBXFCY--ld-JA&=-GKMg}Ymwp&*cPLyXQ3v#0Ru7L9Esc=Hx7ev3TlE9RJ-{Yi3@NM
zmZGjaf&EUzR;UH{$6y?eK3(ZpJ2B0?8-vI%!eCsAYFCPyU>$0K73NOVM0>FXeulab
zm+FlZgTYkeQ43B+T}VbM`>&2UmKcOu;YifOGZAayJPg6bsE*6bRj2{iqb8`tSlo#k
z=P>FSI)&HaWz<g8P4mvDr?LMm)@6~<6&7I@mS6~Ou>4lkM7vQ7ID~puj+@__=TQ^?
zj#_vS+o5_SYWyTrzBMLbmXCra%tt+BOHmWAGS^vtlUaqKoIi+R_%Uh+PokcI^O%g6
zP~*k&j;eiA)U9iUdfU39cFdPgK`R@LdjD_3FkFlpV7b-TT74sGfbFP-eu$djDC(*I
z5^Lcvs2%$oHBLmjbG)gp0cxS$k$yhc+bg)isE4iqwX(71EvPNL4K?5#tc?p%SH2u|
z0qaoT8|A14ePH>|Pz(MZ)&Eb_f@-x=f9`)g1vN-VT~QBI!vUy)N0^gP9p|7XUWB!A
zCF+XG?EFip3wZ;zBfG5rG3vsOq2~EQdA<LqDQKV{mB2qxPx0Rvj<K!1r?xR_0bR{O
zs4E>~7Nh!2NA+7^E<=s`3`XGds0D9DpRS~mg5KBts0ofEU-#}T@{bG6@ai2=&&F_6
zzarG@G}F#MV&^ww1o_ud3)zeO;|}wog}64}0)pGH|9UTLlh6({Lp`OLsIBUOny^1=
zz&zB%<563C2ddp7)D=B~n(#4m4QhurV;!u-y0{lp@JJi>U-zP#gshS2b*P1!C<e8F
z6x2j*tlkkdP%i3<ZbD5|fLcfqs(rE5r=k{iJL*E_TYZU-f>yTD66?(h)YH5N)!_tc
zz_X~=>mq96E2#bfZM_|gM73*xT1Zo?r=i-lLEYMJ7=^xZ6f{u@Ho}K65??}1RE65=
zedgz=fqq2o*q^8?3*;wFw=fE)V-jk-C8(X*WLBX1z3J(5`zUC_4^Ufu$~=Sm!uT20
zA+EjmkS3vaBoj4oH%!HTn2sf=1+GHfqK&A9RH6DEM~!#Jf1dk)k%G3&UGEJTf?7zV
z)e}(P4^2@Wvrz-}KwbF|)I!Euej;iCvrs=`3s5`r6sp||s9UoI2Qt4aR{{Tr`n4L+
z!TTznfU(r?LEVZ{)IDE~T5uWqw-$A!6{v~#TK*IBr1>3c!RM`h1%0}rz>eMo;ixOC
zk7}5L+KF};gI%yW-el+Jp!z?6YPS@%kQI0nzKDhR8*&$2K_`30Fpm05op}G%;Vlx{
zfe%p=CGeA|1!SPEytCE&T0P$^L=7~>&ihb1v=p_l$8az{jW^;Mt9Q!w7PK&%{nr)0
zK|&M0i(2_7X0sgbFZJ2T-EsR+TV9Q7U$e9KS8b#@5%bAcA#=Gp{Ha_Y`=J(Agj(1{
z)GeIuvlDls2A*r)Zw;1WJo!=_k1wMJsMFQCP60e%IG6g3-M9^S5OY=U?)}BH4Ap-F
z>H^-zMEni4Fkeir_pqhoL=ycm1-Br7IlCjMhwyjQR!8)(w*i|`&&E_N#96q=tTt!#
z^mgcLWKP$qm$wshka2x(K80vbJcinm7tGCOxmktU@;&Au^8~8@8LMAGJu{)bz3-J6
z)VR%1{nJsmJj<W=IoFqhp5DRO8b@GzT<CAWUpnS))ECu$)Gat>`7f=08a40*%m0OX
zxC8rm3y4M46LB7<V;u9l4HWcEw+pqxuTU#KZ}nfz8hyR<by4RVpcdZL@~u$|$iZOj
zZw|410qVQI7<DV}M_(|7rzps^s0FMyE6hFSA@c-YN4qmt59sIhuY>9zhgwJzt7qEz
zu2%1D4((^Z|Ai#9vN@=gt-ui6jCxutFc?3=3_NP};Qro(5vU0hte$3eFngLqP|wO(
ztC#d=|CN|$CzjcX=TQ^Cf_xRY_fZoB4e%BcgCW!tP*>c<Y=fcHyPy`_2Q~g6s~2H1
z^;=Q>7W*iKQFt8naI8j6v;{T5PE^BpPz(A9!|<HtFPk;_`c%6})PzZ>1!khg$+CQR
zRJ%OXJia0d`q7w<nqVHP!%EbZtT8uW5cOB>{5EqJYQTNw$L1HP3C@|-sD*{z;9Wo>
z($D8oDCk5xFX8%_d1eu6plPUu%|-3heW-rRQLkkgY9W;vg>PH^2&&&#sBz9%{W8Wf
zzx&G)(Sy8(@n*7_it3nw+R`ql1@y*n9ESC9g5~crA4Dy1CF+)KLcKMW7><Xe-v1L6
zH1HX$g%?pPzJeN{#$eAlGY$29(HYaQ(CUjZoccyozirqU-?Q`QPz$NcPoc(-N1qbO
z6!eYP5>+p>29r_GL<!c$C8(`_61CtB=2p~%Z=e?NzIhBa(Rb!K%U?ph=KQq!{0-_2
z@j5191o@VziL+1x472lNtUejlt^~D^`IcXZx`3s2eud@BQ0+EZz1*xC!v1T5JtVa9
z1E_&NwfZ+$m-<Che;lZNB*tKUtEZdoP~&7<y|2{=o1-m1$(-S{!fb0W4|U}aS^Wjn
zR=tMJ@qpDYpcWD|)SECIbqnHA7tjiI#W|=8=xOF*9`&2C5&9}AXvLqR2K*Yeg=ejP
z2{mvvs$B%VWddrUsi=OvEI-g3VfkWA<@{8$6t%z|$ijT?AcbTSpQ8q@MlB#D-&=VU
zYJ$dQ8tN@+gKC$9y29Reei&+;G3I2{PRvG4Jl|Y`(R%-%qM#0&Q4?)9cOzf>Za?x1
z>>`JGx1s>`9#6CSLev6Qq55w^P52sW+$xO5{pNAY|A=9F|Enz#INa+Hg}TCqr~zA`
zR-S3+yP*cW0oAS$^#wEqo8!HxiPxk0S6F=q#!x?iT$4MAz7h(V1>RpiYf)Er$UKd@
zGB<+lgh;H1(@+!KZ$4^1Yi=~Rp%%K=>PJxv`WAKTei*_2bMfw15^~^3&o$VA`Y#xV
zEk}7Ba*^lI4Meqn#_B(z+V>jmwYwYr3q*!+kD6!Ao?J~f`Bh`s|9A?YlF-U7pjLL-
zbYs1GEi)FiBMnjQGcXZ5U=|KV^?w)x@apk3g$NRQo<6taNvZqa`kI#0sB4R_BR7S3
zi*h<~GogdODgB35{~J+AOtAht{AYMIaj@mSr2Gxhi~2a?3S}Khlmk)oyM9z6Rp97C
zc?8jnm`=SuW)SyNUZe(g+(_;b%01MM&~Y7c2k{v32cdsK(UFRJ&T8Q@EX0Y}Gl2P@
zr?8RG@g&ib$hVH&DQjDG+)hrf)d`|4<#ObA#2p~69=g|W6JxCZ8p_3#YY=)~bj<c}
z|H4~z{cS1yO1w*y5!W6g={SqTgO>aZw-C<|x7s8+bxI!`?-0S)<o!uLz9YJm=dp0>
ziKE17;$iLooy25L>RqmPP3KhVt*Fn$pNWr%vDDk)TtdfIq8qu3$lo!pk@f$9auns8
ziQ9;k)So7F=)vtvZU}0A_di14aK%IxC#Dj=Q`S*LxhZi2q2mK$IWbBVjt1mg5Vujj
z1>0G>SE+9!I#SmgGMvyW`6HpDKG8+<Pw`j1kHJ=Mg8#Mh02}Zn>U#D1Q-2N{W0;*=
zO#KOB1hIlhC%+GMv?fjy_YyjGdAJ&Wx&Fs3QDTD)$Bvd0J+3LYu{KXx?t1EJl;er!
zL^I1@C4uv2sO%x85|wu17yO$j@b5o`WFnl#4T=9y{*<_S<dLgG<xxwtq<)NYDE@^5
zh|6}aulXkOp9cI#rn%b;p`VVI3EzEu1d`Z}i5QJ(*oV+D6uS}`lw&az^$n-veWC-o
z!?;ihjyF8~|7%Xgft-H<+v6r&KrA7$sSnisKS$*fq2qSqV<Lr<LBs^go$)o)F@tgr
z&LOmO<A`{2k;FX8SC3K(x#Sw*L&U%BL~VS9Xh0nF=WPFrs7&@J`0qb-OeSg)(}<y#
zzsHOtr{fC`cN`lMxkP*7PogH#fp~z3AyyGO&Jy1fLBw9de-(}KJ))Zuc62f$%-6BG
zP27rd3Q?PSKOAQHB+Bau9d~*7KYQ{y$l8piywlG81AT+|(Et0rdK6gsLrXNF-kEZ5
zJY>0N@h4)mwH<F(lbfV6F@y-P{C-j`h<rlFTK}j2e*@V5llUi*V;yw<TYYfE5=)7%
zi0g@H+QblbuW5TL`3fSF+<DY-6VZ#fKpY{)5IUlW4aAGYe7z%i6zb414(}$K65|OS
zRm4QjjUqmwJc-y$xa0}N#S@E5w|4JPUe+igv~*W$S?Pmmk>&TMMTeC?*Y=f~<@a<*
z4h+aBU6XyI|1-OEYnNEBR6aXrdyUdgUALBB?D}e0>6U)amXGXT9a>&AbV|+gi^C?V
k+s4s}rL#t5Q_3BiP`ZCq4yEUMC6*_Ru2HkJ`MA~p2PJVssQ>@~

diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index 21b46f81..f5dcadb6 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-04 04:13+0000\n"
+"POT-Creation-Date: 2021-03-04 22:24+0000\n"
 "PO-Revision-Date: 2021-03-02 10:35+0000\n"
 "Last-Translator: Kana <gudzpoz@live.com>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -55,11 +55,9 @@ msgstr ""
 msgid "%(value)s is not a valid username"
 msgstr ""
 
-#: bookwyrm/models/fields.py:164
-#, fuzzy
-#| msgid "Username:"
+#: bookwyrm/models/fields.py:164 bookwyrm/templates/layout.html:152
 msgid "username"
-msgstr "用户�:"
+msgstr "用户�"
 
 #: bookwyrm/models/fields.py:169
 msgid "A user with that username already exists."
@@ -100,6 +98,8 @@ msgid "Books by %(name)s"
 msgstr "%(name)s 所著的书"
 
 #: bookwyrm/templates/book.html:21
+#: bookwyrm/templates/discover/large-book.html:12
+#: bookwyrm/templates/discover/small-book.html:9
 msgid "by"
 msgstr ""
 
@@ -431,7 +431,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr "与 <a href=\"%(path)s\">%(username)s</a> �信"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:79
+#: bookwyrm/templates/layout.html:87
 msgid "Direct Messages"
 msgstr "�信"
 
@@ -541,7 +541,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "%(username)s 在 %(year)s 的书目"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/layout.html:94
+#: bookwyrm/templates/layout.html:102
 msgid "Import Books"
 msgstr "导入书目"
 
@@ -664,55 +664,72 @@ msgstr "你的书架"
 msgid "Feed"
 msgstr "动�"
 
-#: bookwyrm/templates/layout.html:84
+#: bookwyrm/templates/layout.html:92
 #: bookwyrm/templates/preferences/preferences_layout.html:14
 msgid "Profile"
 msgstr "个人资料"
 
-#: bookwyrm/templates/layout.html:89
+#: bookwyrm/templates/layout.html:97
 msgid "Settings"
 msgstr "设置"
 
-#: bookwyrm/templates/layout.html:103
+#: bookwyrm/templates/layout.html:111
 #: bookwyrm/templates/settings/admin_layout.html:19
 #: bookwyrm/templates/settings/manage_invites.html:3
 msgid "Invites"
 msgstr "邀请"
 
-#: bookwyrm/templates/layout.html:110
+#: bookwyrm/templates/layout.html:118
 msgid "Site Configuration"
 msgstr "站点�置"
 
-#: bookwyrm/templates/layout.html:117
+#: bookwyrm/templates/layout.html:125
 msgid "Log out"
 msgstr "登出"
 
-#: bookwyrm/templates/layout.html:125 bookwyrm/templates/layout.html:126
+#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:10
 msgid "Notifications"
 msgstr "通知"
 
-#: bookwyrm/templates/layout.html:143 bookwyrm/templates/layout.html:147
+#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "用户�:"
 
-#: bookwyrm/templates/layout.html:152 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:156
+msgid "password"
+msgstr "密�"
+
+#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36
+msgid "Forgot your password?"
+msgstr "忘记了密�？"
+
+#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "登录"
 
-#: bookwyrm/templates/layout.html:183
+#: bookwyrm/templates/layout.html:168
+msgid "Join"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:191
 msgid "About this server"
 msgstr "关于本�务器"
 
-#: bookwyrm/templates/layout.html:187
+#: bookwyrm/templates/layout.html:195
 msgid "Contact site admin"
 msgstr "�系站点管�员"
 
-#: bookwyrm/templates/layout.html:198
+#: bookwyrm/templates/layout.html:202
+#, python-format
+msgid "Support %(site.name)s on <a href=\"%(site.support_link)s\" target=\"_blank\">%(site.support_title)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:206
 msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm 是开�软件。你�以在<a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> 贡献或报告问题。"
 
@@ -858,10 +875,6 @@ msgstr "登录"
 msgid "Password:"
 msgstr "密�:"
 
-#: bookwyrm/templates/login.html:36
-msgid "Forgot your password?"
-msgstr "忘记了密�？"
-
 #: bookwyrm/templates/login.html:49
 msgid "Contact an administrator to get an invite"
 msgstr "�系管�员以�得邀请"
@@ -875,8 +888,6 @@ msgid "Not Found"
 msgstr "未找到"
 
 #: bookwyrm/templates/notfound.html:9
-#, fuzzy
-#| msgid "The page your requested doesn't seem to exist!"
 msgid "The page you requested doesn't seem to exist!"
 msgstr "你请求的页�似乎并�存在�"
 
@@ -954,18 +965,18 @@ msgstr "�你��了关注请求"
 
 #: bookwyrm/templates/notifications.html:90
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book.title)s</em></a>"
-msgstr "转�了你的 <a href=\"%(related_path)s\">对 <em>%(book.title)s</em> 的书评</a>"
+msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "转�了你的 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的书评</a>"
 
 #: bookwyrm/templates/notifications.html:92
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book.title)s</em></a>"
-msgstr "转�了你的 <a href=\"%(related_path)s\">对 <em>%(book.title)s</em> 的评论</a>"
+msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+msgstr "转�了你的 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的评论</a>"
 
 #: bookwyrm/templates/notifications.html:94
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book.title)s</em></a>"
-msgstr "转�了你的 <a href=\"%(related_path)s\">对 <em>%(book.title)s</em> 的引用</a>"
+msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr "转�了你的 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的引用</a>"
 
 #: bookwyrm/templates/notifications.html:96
 #, python-format
@@ -995,7 +1006,6 @@ msgstr "你什么也没错过�"
 #: bookwyrm/templates/password_reset.html:10
 #: bookwyrm/templates/password_reset_request.html:4
 #: bookwyrm/templates/password_reset_request.html:10
-#, fuzzy
 msgid "Reset Password"
 msgstr "�设密�"
 
@@ -1653,17 +1663,17 @@ msgstr "转�了"
 msgid "Reply"
 msgstr "回�"
 
-#: bookwyrm/templates/snippets/status/status_content.html:16
-#: bookwyrm/templates/snippets/trimmed_text.html:12
+#: bookwyrm/templates/snippets/status/status_content.html:18
+#: bookwyrm/templates/snippets/trimmed_text.html:15
 msgid "Show more"
 msgstr "显示更多"
 
-#: bookwyrm/templates/snippets/status/status_content.html:23
-#: bookwyrm/templates/snippets/trimmed_text.html:18
+#: bookwyrm/templates/snippets/status/status_content.html:25
+#: bookwyrm/templates/snippets/trimmed_text.html:25
 msgid "Show less"
 msgstr "显示更少"
 
-#: bookwyrm/templates/snippets/status/status_content.html:44
+#: bookwyrm/templates/snippets/status/status_content.html:46
 msgid "Open image in new window"
 msgstr "在新窗�中打开图�"
 
@@ -1673,8 +1683,6 @@ msgid "More options"
 msgstr "更多选项"
 
 #: bookwyrm/templates/snippets/status/status_options.html:17
-#, fuzzy
-#| msgid "Delete post"
 msgid "Delete status"
 msgstr "删除�文"
 
@@ -1698,8 +1706,6 @@ msgstr "标有 \"%(tag.name)s\" 标签的书"
 
 #: bookwyrm/templates/user/create_shelf_form.html:5
 #: bookwyrm/templates/user/create_shelf_form.html:22
-#, fuzzy
-#| msgid "Create shelf"
 msgid "Create Shelf"
 msgstr "创建书架"
 

From b79cdcaf385e331ec24d5c552348fbb1bbe3454c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 4 Mar 2021 14:39:22 -0800
Subject: [PATCH 0196/1285] More cleanup of spanish locale

---
 locale/es/LC_MESSAGES/django.mo | Bin 27410 -> 27447 bytes
 locale/es/LC_MESSAGES/django.po |  78 ++++++++++++++++++--------------
 2 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index 9c747eebc62a11dec94bd2562215a8730fb75ac8..78c835c25f62d44162dfb7e4b11a647fdf7cacd0 100644
GIT binary patch
delta 6710
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
DvUCxW

delta 6675
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

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 3063fe70..fed3b612 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-04 04:13+0000\n"
+"POT-Creation-Date: 2021-03-04 22:37+0000\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"
@@ -40,7 +40,6 @@ msgid "%(count)d uses"
 msgstr "%(count)d usos"
 
 #: bookwyrm/forms.py:192
-#| msgid "Unlisted"
 msgid "Unlimited"
 msgstr "Sin límite"
 
@@ -54,7 +53,7 @@ msgstr "%(value)s no es un remote_id válido"
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s no es un usuario válido"
 
-#: bookwyrm/models/fields.py:164
+#: bookwyrm/models/fields.py:164 bookwyrm/templates/layout.html:152
 msgid "username"
 msgstr "nombre de usuario"
 
@@ -97,6 +96,8 @@ msgid "Books by %(name)s"
 msgstr "Libros de %(name)s"
 
 #: bookwyrm/templates/book.html:21
+#: bookwyrm/templates/discover/large-book.html:12
+#: bookwyrm/templates/discover/small-book.html:9
 msgid "by"
 msgstr "por"
 
@@ -179,13 +180,11 @@ msgstr "Cancelar"
 
 #: bookwyrm/templates/book.html:127
 #, python-format
-#| msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s/editions\">%(count)s ediciones</a>"
 
 #: bookwyrm/templates/book.html:135
 #, python-format
-#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "Esta edición está en tu <a href=\"%(path)s\">%(shelf_name)s</a> estante."
 
@@ -426,7 +425,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Mensajes directos con <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:79
+#: bookwyrm/templates/layout.html:87
 msgid "Direct Messages"
 msgstr "Mensajes directos"
 
@@ -534,7 +533,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "Los libros de %(username)s para %(year)s"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/layout.html:94
+#: bookwyrm/templates/layout.html:102
 msgid "Import Books"
 msgstr "Importar libros"
 
@@ -657,55 +656,72 @@ msgstr "Tus estantes"
 msgid "Feed"
 msgstr "Actividad"
 
-#: bookwyrm/templates/layout.html:84
+#: bookwyrm/templates/layout.html:92
 #: bookwyrm/templates/preferences/preferences_layout.html:14
 msgid "Profile"
 msgstr "Perfil"
 
-#: bookwyrm/templates/layout.html:89
+#: bookwyrm/templates/layout.html:97
 msgid "Settings"
 msgstr "Configuración"
 
-#: bookwyrm/templates/layout.html:103
+#: bookwyrm/templates/layout.html:111
 #: bookwyrm/templates/settings/admin_layout.html:19
 #: bookwyrm/templates/settings/manage_invites.html:3
 msgid "Invites"
 msgstr "Invitaciones"
 
-#: bookwyrm/templates/layout.html:110
+#: bookwyrm/templates/layout.html:118
 msgid "Site Configuration"
 msgstr "Configuracion de sitio"
 
-#: bookwyrm/templates/layout.html:117
+#: bookwyrm/templates/layout.html:125
 msgid "Log out"
 msgstr "Cerrar sesión"
 
-#: bookwyrm/templates/layout.html:125 bookwyrm/templates/layout.html:126
+#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:10
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: bookwyrm/templates/layout.html:143 bookwyrm/templates/layout.html:147
+#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "Nombre de usuario:"
 
-#: bookwyrm/templates/layout.html:152 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:156
+msgid "password"
+msgstr "contraseña"
+
+#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36
+msgid "Forgot your password?"
+msgstr "¿Olvidaste tu contraseña?"
+
+#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "Iniciar sesión"
 
-#: bookwyrm/templates/layout.html:183
+#: bookwyrm/templates/layout.html:168
+msgid "Join"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:191
 msgid "About this server"
 msgstr "Sobre este servidor"
 
-#: bookwyrm/templates/layout.html:187
+#: bookwyrm/templates/layout.html:195
 msgid "Contact site admin"
 msgstr "Contactarse con administradores del sitio"
 
-#: bookwyrm/templates/layout.html:198
+#: bookwyrm/templates/layout.html:202
+#, python-format
+msgid "Support %(site.name)s on <a href=\"%(site.support_link)s\" target=\"_blank\">%(site.support_title)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:206
 msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm es software de código abierto. Puedes contribuir o reportar problemas en <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
@@ -849,10 +865,6 @@ msgstr "Iniciar sesión"
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: bookwyrm/templates/login.html:36
-msgid "Forgot your password?"
-msgstr "¿Olvidaste tu contraseña?"
-
 #: bookwyrm/templates/login.html:49
 msgid "Contact an administrator to get an invite"
 msgstr "Contactar a unx administradorx para recibir una invitación"
@@ -943,18 +955,18 @@ msgstr "te quiere seguir"
 
 #: bookwyrm/templates/notifications.html:90
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book.title)s</em></a>"
-msgstr "respaldó tu <a href=\"%(related_path)s\">reseña de <em>%(book.title)s</em></a>"
+msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "respaldó tu <a href=\"%(related_path)s\">reseña de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:92
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book.title)s</em></a>"
-msgstr "respaldó tu <a href=\"%(related_path)s\">comentario en<em>%(book.title)s</em></a>"
+msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+msgstr "respaldó tu <a href=\"%(related_path)s\">comentario en<em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:94
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book.title)s</em></a>"
-msgstr "respaldó tu<a href=\"%(related_path)s\">cita de <em>%(book.title)s</em></a>"
+msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr "respaldó tu<a href=\"%(related_path)s\">cita de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:96
 #, python-format
@@ -1642,17 +1654,17 @@ msgstr "respaldó"
 msgid "Reply"
 msgstr "Respuesta"
 
-#: bookwyrm/templates/snippets/status/status_content.html:16
-#: bookwyrm/templates/snippets/trimmed_text.html:12
+#: bookwyrm/templates/snippets/status/status_content.html:18
+#: bookwyrm/templates/snippets/trimmed_text.html:15
 msgid "Show more"
 msgstr "Mostrar más"
 
-#: bookwyrm/templates/snippets/status/status_content.html:23
-#: bookwyrm/templates/snippets/trimmed_text.html:18
+#: bookwyrm/templates/snippets/status/status_content.html:25
+#: bookwyrm/templates/snippets/trimmed_text.html:25
 msgid "Show less"
 msgstr "Mostrar menos"
 
-#: bookwyrm/templates/snippets/status/status_content.html:44
+#: bookwyrm/templates/snippets/status/status_content.html:46
 msgid "Open image in new window"
 msgstr "Abrir imagen en una nueva ventana"
 

From b2d1384bc5065725ec51c4204cc97f64a9a751f6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 4 Mar 2021 13:48:50 -0800
Subject: [PATCH 0197/1285] UI for adding and removing authors

---
 bookwyrm/templates/edit_book.html | 43 ++++++++++++++++++++++++++++---
 bookwyrm/tests/views/test_book.py | 16 ++++++++++++
 bookwyrm/views/books.py           | 33 ++++++++++++++++++------
 3 files changed, 81 insertions(+), 11 deletions(-)

diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/edit_book.html
index aab9e103..d0eb50be 100644
--- a/bookwyrm/templates/edit_book.html
+++ b/bookwyrm/templates/edit_book.html
@@ -26,7 +26,8 @@
 </div>
 {% endif %}
 
-<form class="block" name="edit-book" action="{{ book.local_path }}/edit" method="post" enctype="multipart/form-data">
+<form class="block" name="edit-book" action="{{ book.local_path }}/edit#deduplication" method="post" enctype="multipart/form-data">
+    <fieldset {% if confirm_mode %}disabled{% endif %}>
     {% csrf_token %}
     <input type="hidden" name="last_edited_by" value="{{ request.user.id }}">
     <div class="columns">
@@ -68,11 +69,11 @@
                 {% for author in book.authors.all %}
                 <p><a href="{{ author.local_path }}">{{ author.name }}</a>
                 <label class="label">
-                    <input type="checkbox" name="remove-author" value="{{ author.id }}"> {% trans "Remove this author" %}
+                    <input type="checkbox" name="remove_author" value="{{ author.id }}"> {% trans "Remove this author" %}
                 </label>
                 {% endfor %}
                 <label class="label" for="id_add_author">{% trans "Add Author:" %}</label>
-                <input class="input" type="text" name="author" id="id_add_author" placeholder="John Doe">
+                <input class="input" type="text" name="add_author" id="id_add_author" placeholder="John Doe" value="{{ add_author }}">
             </section>
         </div>
 
@@ -138,6 +139,42 @@
         <button class="button is-primary" type="submit">{% trans "Save" %}</button>
         <a class="button" href="/book/{{ book.id }}">{% trans "Cancel" %}</a>
     </div>
+    </fieldset>
 </form>
 
+{% if author_matches or book_matches %}
+<hr class="block">
+<form class="box content" id="deduplication">
+    <h2 class="title is-4">{% trans "Confirm Book Info" %}</h2>
+    <div class="columns">
+        {% if author_matches.exists %}
+        <fieldset class="column is-half">
+            <legend class="label">{% blocktrans %}Is "{{ add_author }}" an existing author?{% endblocktrans %}</legend>
+            {% for match in author_matches %}
+            <label class="label"><input type="radio" name="author_match" value="{{ match.id }}"> {{ match.name }}</label>
+            <p class="help">
+                <a href="{{ author.local_path }}" target="_blank">{% blocktrans with book_title=match.book_set.first.title %}Author of <em>{{ book_title }}</em>{% endblocktrans %}</a>
+            </p>
+            {% endfor %}
+            <label class="label"><input type="radio" name="author_match"> this is a new author</label>
+        </fieldset>
+        {% else %}
+        <p class="column is-half">{% blocktrans %}Creating a new author: {{ add_author }}{% endblocktrans %}</p>
+        {% endif %}
+
+        {% if not book %}
+        <fieldset class="column is-half">
+            <legend class="title is-5">{% trans "Is this an editions of an existing work?" %}</legend>
+            {% for match in book_matches %}
+            <label class="label"><input type="radio" name="book_match" value="{{ match.id }}"> {{ match.title }}</label>
+            {% endfor %}
+            <label class="label"><input type="radio" name="book_match"> this is a new work</label>
+        </fieldset>
+        {% endif %}
+    </div>
+
+    <button class="button is-primary" type="submit">{% trans "save" %}</button>
+</form>
+{% endif %}
+
 {% endblock %}
diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index b3360200..b7eaac4b 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -83,6 +83,22 @@ class BookViews(TestCase):
         self.assertEqual(self.book.title, 'New Title')
 
 
+    def test_edit_book_add_author(self):
+        ''' lets a user edit a book '''
+        view = views.EditBook.as_view()
+        self.local_user.groups.add(self.group)
+        form = forms.EditionForm(instance=self.book)
+        form.data['title'] = 'New Title'
+        form.data['last_edited_by'] = self.local_user.id
+        form.data['add_author'] = "John Doe"
+        request = self.factory.post('', form.data)
+        request.user = self.local_user
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+            view(request, self.book.id)
+        self.book.refresh_from_db()
+        self.assertEqual(self.book.title, 'New Title')
+
+
     def test_switch_edition(self):
         ''' updates user's relationships to a book '''
         work = models.Work.objects.create(title='test work')
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 1754982e..174ddaa3 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -1,6 +1,7 @@
 ''' the good stuff! the books! '''
-from django.core.paginator import Paginator
 from django.contrib.auth.decorators import login_required, permission_required
+from django.contrib.postgres.search import SearchRank, SearchVector
+from django.core.paginator import Paginator
 from django.db import transaction
 from django.db.models import Avg, Q
 from django.http import HttpResponseNotFound
@@ -132,16 +133,32 @@ class EditBook(View):
         if not form.is_valid():
             return TemplateResponse(request, 'edit_book.html', data)
 
-        if not book or form.author:
+        add_author = request.POST.get('add_author')
+        if not book or add_author:
             # creting a book or adding an author to a book needs another step
-            return TemplateResponse(request, 'confirm_book.html', data)
+            data['confirm_mode'] = True
+            data['add_author'] = add_author
+            # check for existing authors
+            vector = SearchVector('name', weight='A') +\
+                     SearchVector('aliases', weight='B')
+
+            data['author_matches'] = models.Author.objects.annotate(
+                search=vector
+            ).annotate(
+                rank=SearchRank(vector, add_author)
+            ).filter(rank__gt=0.8).order_by('-rank')[:5]
+
+            # check if this is an edition of an existing work
+            author_text = book.author_text if book else add_author
+            data['book_matches'] = connector_manager.local_search(
+                '%s %s' % (form.cleaned_data.get('title'), author_text),
+                min_confidence=0.5,
+                raw=True
+            )[:5]
+
+            return TemplateResponse(request, 'edit_book.html', data)
 
-        # remove authors
-        if request.POST.get('remove-author'):
-            import pdb;pdb.set_trace()
-            author = get_object_or_404(id=author_id)
         book = form.save()
-
         return redirect('/book/%s' % book.id)
 
 

From 51a08ac63394dc5c50fc60fb5a9d115968c02eff Mon Sep 17 00:00:00 2001
From: reese <reesedporter@gmail.com>
Date: Thu, 4 Mar 2021 19:00:26 -0600
Subject: [PATCH 0198/1285] minor translation tweak

---
 locale/es/LC_MESSAGES/django.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index fed3b612..75dafb6c 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -479,7 +479,7 @@ msgstr "¡No hay ningún libro aqui ahorita! Busca a un libro para empezar"
 #, fuzzy
 #| msgid "Read"
 msgid "To Read"
-msgstr "Leer"
+msgstr "Para leer"
 
 #: bookwyrm/templates/feed/feed_layout.html:24
 #: bookwyrm/templates/user/shelf.html:24

From 5c089db086f6d85748cfff84ea04d54aababd5fa Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 4 Mar 2021 17:09:49 -0800
Subject: [PATCH 0199/1285] Full add author flow

---
 bookwyrm/templates/edit_book.html | 84 +++++++++++++++++--------------
 bookwyrm/tests/views/test_book.py | 13 +----
 bookwyrm/urls.py                  |  1 +
 bookwyrm/views/__init__.py        |  2 +-
 bookwyrm/views/books.py           | 53 +++++++++++++++++--
 5 files changed, 96 insertions(+), 57 deletions(-)

diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/edit_book.html
index d0eb50be..0637bb79 100644
--- a/bookwyrm/templates/edit_book.html
+++ b/bookwyrm/templates/edit_book.html
@@ -8,7 +8,7 @@
 <header class="block">
     <h1 class="title level-left">
         {% if book %}
-        {% blocktrans with book_title=book.title %}Edit "{{ book.title }}"{% endblocktrans %}
+        {% blocktrans with book_title=book.title %}Edit "{{ book_title }}"{% endblocktrans %}
         {% else %}
         {% trans "Add Book" %}
         {% endif %}
@@ -26,9 +26,46 @@
 </div>
 {% endif %}
 
-<form class="block" name="edit-book" action="{{ book.local_path }}/edit#deduplication" method="post" enctype="multipart/form-data">
-    <fieldset {% if confirm_mode %}disabled{% endif %}>
+<form class="block" name="edit-book" action="{{ book.local_path }}/{% if confirm_mode %}confirm{% else %}edit{% endif %}" method="post" enctype="multipart/form-data">
     {% csrf_token %}
+    {% if confirm_mode %}
+    <div class="box">
+        <h2 class="title is-4">{% trans "Confirm Book Info" %}</h2>
+        <div class="columns">
+            {% if author_matches.exists %}
+            <fieldset class="column is-half">
+                <legend class="label">{% blocktrans with name=add_author %}Is "{{ name }}" an existing author?{% endblocktrans %}</legend>
+                {% for match in author_matches %}
+                <label><input type="radio" name="author_match" value="{{ match.id }}" required> {{ match.name }}</label>
+                <p class="help">
+                    <a href="{{ author.local_path }}" target="_blank">{% blocktrans with book_title=match.book_set.first.title %}Author of <em>{{ book_title }}</em>{% endblocktrans %}</a>
+                </p>
+                {% endfor %}
+                <label><input type="radio" name="author_match"> {% trans "This is a new author" %}</label>
+            </fieldset>
+            {% else %}
+            <p class="column is-half">{% blocktrans with name=add_author %}Creating a new author: {{ name }}{% endblocktrans %}</p>
+            {% endif %}
+
+            {% if not book %}
+            <fieldset class="column is-half">
+                <legend class="title is-5">{% trans "Is this an editions of an existing work?" %}</legend>
+                {% for match in book_matches %}
+                <label class="label"><input type="radio" name="parent_work" value="{{ match.parent_work.id }}"> {{ match.parent_work.title }}</label>
+                {% endfor %}
+                <label><input type="radio" name="parent_work"> this is a new work</label>
+            </fieldset>
+            {% endif %}
+        </div>
+
+        <button class="button is-primary" type="submit">{% trans "Confirm" %}</button>
+        <button class="button" type="button">{% trans "Back" %}</button>
+    </div>
+
+    <hr class="block">
+    {% endif %}
+
+    <fieldset>
     <input type="hidden" name="last_edited_by" value="{{ request.user.id }}">
     <div class="columns">
         <div class="column">
@@ -72,8 +109,12 @@
                     <input type="checkbox" name="remove_author" value="{{ author.id }}"> {% trans "Remove this author" %}
                 </label>
                 {% endfor %}
+                {% if confirm_mode %}
+                <input type="hidden" name="add_author" id="id_add_author" value="{{ add_author }}">
+                {% else %}
                 <label class="label" for="id_add_author">{% trans "Add Author:" %}</label>
-                <input class="input" type="text" name="add_author" id="id_add_author" placeholder="John Doe" value="{{ add_author }}">
+                <input class="input" type="text" name="add_author" id="id_add_author" placeholder="{% trans 'John Doe' %}" value="{{ add_author }}">
+                {% endif %}
             </section>
         </div>
 
@@ -142,39 +183,4 @@
     </fieldset>
 </form>
 
-{% if author_matches or book_matches %}
-<hr class="block">
-<form class="box content" id="deduplication">
-    <h2 class="title is-4">{% trans "Confirm Book Info" %}</h2>
-    <div class="columns">
-        {% if author_matches.exists %}
-        <fieldset class="column is-half">
-            <legend class="label">{% blocktrans %}Is "{{ add_author }}" an existing author?{% endblocktrans %}</legend>
-            {% for match in author_matches %}
-            <label class="label"><input type="radio" name="author_match" value="{{ match.id }}"> {{ match.name }}</label>
-            <p class="help">
-                <a href="{{ author.local_path }}" target="_blank">{% blocktrans with book_title=match.book_set.first.title %}Author of <em>{{ book_title }}</em>{% endblocktrans %}</a>
-            </p>
-            {% endfor %}
-            <label class="label"><input type="radio" name="author_match"> this is a new author</label>
-        </fieldset>
-        {% else %}
-        <p class="column is-half">{% blocktrans %}Creating a new author: {{ add_author }}{% endblocktrans %}</p>
-        {% endif %}
-
-        {% if not book %}
-        <fieldset class="column is-half">
-            <legend class="title is-5">{% trans "Is this an editions of an existing work?" %}</legend>
-            {% for match in book_matches %}
-            <label class="label"><input type="radio" name="book_match" value="{{ match.id }}"> {{ match.title }}</label>
-            {% endfor %}
-            <label class="label"><input type="radio" name="book_match"> this is a new work</label>
-        </fieldset>
-        {% endif %}
-    </div>
-
-    <button class="button is-primary" type="submit">{% trans "save" %}</button>
-</form>
-{% endif %}
-
 {% endblock %}
diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index b7eaac4b..8a6c66cb 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -85,18 +85,7 @@ class BookViews(TestCase):
 
     def test_edit_book_add_author(self):
         ''' lets a user edit a book '''
-        view = views.EditBook.as_view()
-        self.local_user.groups.add(self.group)
-        form = forms.EditionForm(instance=self.book)
-        form.data['title'] = 'New Title'
-        form.data['last_edited_by'] = self.local_user.id
-        form.data['add_author'] = "John Doe"
-        request = self.factory.post('', form.data)
-        request.user = self.local_user
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            view(request, self.book.id)
-        self.book.refresh_from_db()
-        self.assertEqual(self.book.title, 'New Title')
+        # TODO
 
 
     def test_switch_edition(self):
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index dfb64c23..9e0d4630 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -129,6 +129,7 @@ urlpatterns = [
     # books
     re_path(r'%s(.json)?/?$' % book_path, views.Book.as_view()),
     re_path(r'%s/edit/?$' % book_path, views.EditBook.as_view()),
+    re_path(r'%s/confirm/?$' % book_path, views.ConfirmEditBook.as_view()),
     re_path(r'%s/editions(.json)?/?$' % book_path, views.Editions.as_view()),
     re_path(r'^upload-cover/(?P<book_id>\d+)/?$', views.upload_cover),
     re_path(r'^add-description/(?P<book_id>\d+)/?$', views.add_description),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 2c7cdc46..c3d17da7 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -2,7 +2,7 @@
 from .authentication import Login, Register, Logout
 from .author import Author, EditAuthor
 from .block import Block, unblock
-from .books import Book, EditBook, Editions
+from .books import Book, EditBook, ConfirmEditBook, Editions
 from .books import upload_cover, add_description, switch_edition, resolve_book
 from .error import not_found_page, server_error_page
 from .federation import Federation
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 174ddaa3..0097eb9f 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -122,8 +122,8 @@ class EditBook(View):
 
     def post(self, request, book_id=None):
         ''' edit a book cool '''
-        book = get_object_or_404(models.Edition, id=book_id) if book_id \
-                else None
+        # returns None if no match is found
+        book = models.Edition.objects.filter(id=book_id).first()
         form = forms.EditionForm(request.POST, request.FILES, instance=book)
 
         data = {
@@ -134,9 +134,8 @@ class EditBook(View):
             return TemplateResponse(request, 'edit_book.html', data)
 
         add_author = request.POST.get('add_author')
-        if not book or add_author:
-            # creting a book or adding an author to a book needs another step
-            data['confirm_mode'] = True
+        # we're adding an author through a free text field
+        if add_author:
             data['add_author'] = add_author
             # check for existing authors
             vector = SearchVector('name', weight='A') +\
@@ -148,6 +147,8 @@ class EditBook(View):
                 rank=SearchRank(vector, add_author)
             ).filter(rank__gt=0.8).order_by('-rank')[:5]
 
+        # we're creating a new book
+        if not book:
             # check if this is an edition of an existing work
             author_text = book.author_text if book else add_author
             data['book_matches'] = connector_manager.local_search(
@@ -156,12 +157,54 @@ class EditBook(View):
                 raw=True
             )[:5]
 
+        # either of the above cases requires additional confirmation
+        if add_author or not book:
+            # creting a book or adding an author to a book needs another step
+            data['confirm_mode'] = True
             return TemplateResponse(request, 'edit_book.html', data)
 
         book = form.save()
         return redirect('/book/%s' % book.id)
 
 
+@method_decorator(login_required, name='dispatch')
+@method_decorator(
+    permission_required('bookwyrm.edit_book', raise_exception=True),
+    name='dispatch')
+class ConfirmEditBook(View):
+    ''' confirm edits to a book '''
+    def post(self, request, book_id=None):
+        ''' edit a book cool '''
+        # returns None if no match is found
+        book = models.Edition.objects.filter(id=book_id).first()
+        form = forms.EditionForm(request.POST, request.FILES, instance=book)
+
+        data = {
+            'book': book,
+            'form': form
+        }
+        if not form.is_valid():
+            return TemplateResponse(request, 'edit_book.html', data)
+
+        # create work, if needed
+        # TODO
+
+        # save book
+        book = form.save()
+
+        # get or create author as needed
+        if request.POST.get('add_author'):
+            if request.POST.get('author_match'):
+                author = get_object_or_404(
+                    models.Author, id=request.POST['author_match'])
+            else:
+                author = models.Author.objects.create(
+                    name=request.POST.get('add_author'))
+            book.authors.add(author)
+
+        return redirect('/book/%s' % book.id)
+
+
 class Editions(View):
     ''' list of editions '''
     def get(self, request, book_id):

From 5853988ed97a307f082c3e9f6a53d1d2a646d13a Mon Sep 17 00:00:00 2001
From: reese <reesedporter@gmail.com>
Date: Thu, 4 Mar 2021 19:15:15 -0600
Subject: [PATCH 0200/1285] remove fuzzy line 479

---
 locale/es/LC_MESSAGES/django.po | 1 -
 1 file changed, 1 deletion(-)

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 75dafb6c..f2bde711 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -476,7 +476,6 @@ msgstr "¡No hay ningún libro aqui ahorita! Busca a un libro para empezar"
 
 #: bookwyrm/templates/feed/feed_layout.html:23
 #: bookwyrm/templates/user/shelf.html:24
-#, fuzzy
 #| msgid "Read"
 msgid "To Read"
 msgstr "Para leer"

From 097b8e5811f8ac1d2d12c87dbe2185bcd876d610 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Fri, 5 Mar 2021 15:41:21 +0100
Subject: [PATCH 0201/1285] Fix toggling all checkboxes of failed imports:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Rename classes and function to something more descriptive.
- Listen to the element checked status instead of a click on a non‑focusable element.
- Use specific DOM targets instead of relying on the DOM ancestor tree.
- Add a skip‑link to the end of the list and avoid tabbing through all failed items.
- Update related i18n strings in French.
- Avoid having the label on the whole width to prevent accidental click.
- Move `fieldset` out of `ul`.
---
 bookwyrm/static/css/format.css        |  32 ++++++++++++++++++++
 bookwyrm/static/js/shared.js          |  26 ++++++++++++----
 bookwyrm/templates/import_status.html |  42 +++++++++++++++++++-------
 locale/fr_FR/LC_MESSAGES/django.mo    | Bin 25299 -> 25500 bytes
 locale/fr_FR/LC_MESSAGES/django.po    |  25 +++++++++------
 5 files changed, 98 insertions(+), 27 deletions(-)

diff --git a/bookwyrm/static/css/format.css b/bookwyrm/static/css/format.css
index 9d4b3105..92e0d92c 100644
--- a/bookwyrm/static/css/format.css
+++ b/bookwyrm/static/css/format.css
@@ -156,3 +156,35 @@
     content: "\e905";
     right: 0;
 }
+
+/**
+ * Accessibility (a11y)
+ ============================================================================ */
+
+/**
+ * Skip links
+ *
+ * @see https://webaim.org/styles/main.css
+ ---------------------------------------------------------------------------- */
+.skip-link {
+    position: absolute;
+    opacity: 0;
+    z-index: 100;
+    padding: 6px;
+    border: 1px solid white;
+    color: white;
+    background: #BF1722;
+    transition: opacity 1s ease-out;
+}
+
+.skip-link:focus {
+    opacity: 1;
+    outline-color: transparent;
+    transition: opacity .1s ease-in;
+}
+
+@media (prefers-reduced-motion: reduce) {
+    .skip-link {
+        transition-duration: 0.001ms !important;
+    }
+}
diff --git a/bookwyrm/static/js/shared.js b/bookwyrm/static/js/shared.js
index 7d65ee03..65f0dd65 100644
--- a/bookwyrm/static/js/shared.js
+++ b/bookwyrm/static/js/shared.js
@@ -8,9 +8,12 @@ window.onload = function() {
     Array.from(document.getElementsByClassName('interaction'))
         .forEach(t => t.onsubmit = interact);
 
-    // select all
-    Array.from(document.getElementsByClassName('select-all'))
-        .forEach(t => t.onclick = selectAll);
+    // Toggle all checkboxes.
+    document
+        .querySelectorAll('[data-action="toggle-all"]')
+        .forEach(input => {
+            input.addEventListener('change', toggleAllCheckboxes);
+        });
 
     // tab groups
     Array.from(document.getElementsByClassName('tab-group'))
@@ -136,9 +139,20 @@ function interact(e) {
         .forEach(t => addRemoveClass(t, 'hidden', t.className.indexOf('hidden') == -1));
 }
 
-function selectAll(e) {
-    e.target.parentElement.parentElement.querySelectorAll('[type="checkbox"]')
-        .forEach(t => t.checked=true);
+/**
+ * Toggle all descendant checkboxes of a target.
+ *
+ * Use `data-target="ID_OF_TARGET"` on the node being listened to.
+ *
+ * @param  {Event} event - change Event
+ * @return {undefined}
+ */
+function toggleAllCheckboxes(event) {
+    const mainCheckbox = event.target;
+
+    document
+        .querySelectorAll(`#${mainCheckbox.dataset.target} [type="checkbox"]`)
+        .forEach(checkbox => {checkbox.checked = mainCheckbox.checked;});
 }
 
 function toggleMenu(e) {
diff --git a/bookwyrm/templates/import_status.html b/bookwyrm/templates/import_status.html
index b28187b0..3ee9c4a5 100644
--- a/bookwyrm/templates/import_status.html
+++ b/bookwyrm/templates/import_status.html
@@ -5,7 +5,7 @@
 
 {% block title %}{% trans "Import Status" %}{% endblock %}
 
-{% block content %}
+{% block content %}{% spaceless %}
 <div class="block">
     <h1 class="title">{% trans "Import Status" %}</h1>
 
@@ -36,8 +36,15 @@
     {% if not job.retry %}
     <form name="retry" action="/import/{{ job.id }}" method="post">
         {% csrf_token %}
-        <ul>
-            <fieldset>
+
+        {% with failed_count=failed_items|length %}
+            <a class="skip-link" href="#select-all-failed-imports">
+                {% blocktrans %}Jump to the bottom of the list to select the {{ failed_count }} items which failed to import.{% endblocktrans %}
+            </a>
+        {% endwith %}
+
+        <fieldset id="failed-imports">
+            <ul>
             {% for item in failed_items %}
                 <li class="pb-1">
                     <input class="checkbox" type="checkbox" name="import_item" value="{{ item.id }}" id="import-item-{{ item.id }}">
@@ -51,15 +58,28 @@
                     </p>
                 </li>
             {% endfor %}
-            </fieldset>
-        </ul>
-        <div class="block pt-1 select-all">
-            <label class="label">
-                <input type="checkbox" class="checkbox">
+            </ul>
+        </fieldset>
+
+        <fieldset class="mt-3">
+            <a name="select-all-failed-imports"></a>
+
+            <label class="label is-inline mb-1">
+                <input
+                    id="toggle-all-checkboxes-failed-imports"
+                    class="checkbox"
+                    type="checkbox"
+                    data-action="toggle-all"
+                    data-target="failed-imports"
+                />
                 {% trans "Select all" %}
             </label>
-        </div>
-        <button class="button" type="submit">{% trans "Retry items" %}</button>
+
+            <button class="button is-block" type="submit">{% trans "Retry items" %}</button>
+        </fieldset>
+
+        <hr>
+
         {% else %}
         <ul>
             {% for item in failed_items %}
@@ -123,4 +143,4 @@
     </table>
 </div>
 </div>
-{% endblock %}
+{% endspaceless %}{% endblock %}
diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index 2cddb7935337507fcce9245e070abe10274ca6fb..2620d2499b37f4a2772a7de337251835e38f686a 100644
GIT binary patch
delta 7753
zcmZ|Ud3;V+9>?(;BtaxZ5J^NHWRZ}FSYj=qmLRrRVktrrGR;;=ijKOpL#rKYlqwZV
zEzwdfN;}4`6r;7Yv|4S7u2jZarmgvWpL@Kf|IB^$m-jj6o_qFtleTA%c&t3?VPC3U
z<rRx7%fqr7U_T$r`kM6gdMdT7Uqdac5bxt`%x!2{o$wac#rQA+dtx9?K|Q(vdBoa)
zL+~(0Vvx&uuB)SM4I>f6jT}@1b1)oNVLl!*wrXTqdF0n&D%NgnSzR#;J#i!Y;}-P7
zedvuJVpTkamGL}Q!;5Zh%eqQJ6>p#(yoWXL5A;KyCQd#W1IS0AFLp%TPe#UMrC|a-
zgKBRJs=b|98~2#<kFg5*^OF9pFG;ZKRyk@W*HInZQU&y2IclL7&cQ&`OjltDZbJ?D
zB&x&Du_k_F$}5b&oBP!xocsQ0tKmi@G~xtf2UG{$FdB!TW-tRiaS^JcWvGF!LQUW;
z)IfHlo<CyB&zthgsIyUl)zLfBvfUlmj&vFbHb$ZvPCzg0igmCTs)Ny}``K6@r=V71
zp}GGS@{jdCKin&U?Z{W4CK?^(l(&px{nbzs1)9MC)ZrLq%tUpVj~elGlYar#@Dfx0
z2C9R%QD@=@^u~L}ho;=SsdK*`>QF}5B-CLXYRTGR73_m99Dr4^0JT-qP_Nxf=!L6M
z1KEgreRrYSJBJ#`C6m8y^7l~Bd$F$?pxuB(RTAN-(;bVNX%cE>`k@*ciM$Y2Hfn%>
zM?JU5_!@eWUxyl4nQ<Fx1$Uv^JB(WCGsuK(>k<jgpaS(BuwtBsgHh#8P$O=IY9JXk
zpy8+$%QE+;qGmK7Rc|Tk`8RMB?lAdU&79|5=uiJv3lbVp5^82Cs163BW|VH6h?-e0
zs-q%PJ{^6?KWFmuQHOO2YUX9A!}%Vn-805=tg83FLJ7Q&dazP+=fOZ@IBFm*Q8P<K
z4YUVp1^S>~&(Ww3@{zBzH3MVub(24V)yV&ZdhRyb8krZh^gv@&g(URFzE}fCU>s(l
z2J#AO04q?h-)i*1_fd!R2x_H1L$&u6`r`Mfj_;t(ns*%QuZkhGt_B;UI*c;5My*T|
z`e7f`o{qo>%tmd+0^>4N{Zdp%n@|Jz0M*Z7lRtrK=hHaWUo*N&fgb!BHIUn=2kx7^
z)xsH=Cu%0OP2Pom<YP^~lQ9`}n1`Y27oggkfz@#~s^5h+2{o|PxE{5XJ5UeoM-Awx
z$)7~kKa1M3Z&5S#h<7>+z%cT$sI5prbvOpK<k`k&QSI1^NN5RHqn3UXY5+Si7Z0Es
zY|+wLp#iA+X~uC_i~J<iQcp8JkNRHBL)G7gI;6W%D}4f^^!}eC!NIqFLyf3ug0nY?
zsE&J~8klIx^HD2fqZ*on>Ue?4FGqbZ)}o%<joO0!s0p4zJ$KPv&i-E^p^k5&emi-z
za#o-|s$w{53t}-A6R;1CGro!X!{sjO6YSU8d5xQ)mcA=$ulu3~J_yxr8rGzLE1iS}
z@RYeR(>T|-7&Y=0Ccg>Q@H?oP?J@U{qgLWP24Fcx;vI9pK^td9qEYo)qFs|jM-l_E
zFOI>L$YNOkL2W@?TW3l8qv~g%R-gzquzjcjoizFLCV$0v1M71Cfw^BR(OHquMD|~M
z)P#Z*Y=-@Dn#mtS4Wu5wTQ$>URENV+1I{q+!~x{J+FKTrwT7XV_+?c6B{&4v81G^#
z`Mw=kf1b5UJ2-oI0ku~ZsDa%@?b#ou+_R(8u#d40>V7B&VK|P%$579gVqXt_J>x9$
zxA@cfRV?nzU(D!dKjw5i6nO!xTnxri)ZTr75m=6c(YuTDwv5CO@^g%9F`WEfjKRyO
z=lr@_)>LebMYzS-IEhsxZ!aU!kHihsl6C6l45$Yx{{(7=S*Syki<;RKtc^C-!^NmW
zT!#97?8Y!WY|5{oKlxkeLeK8*_H8SYgl@FJXiP#a&6B7O-!=F5pk{Omb=YpB2KEp&
zAg{-rL*|Fdhoe4B%~4z0+1&4r+JX@n!1=Rol2F55J)9XeM>Ws|1F;wC^o~UhwAkE#
z0oB0*tb?o3{pCar`~d3TfKDLi*!mH}u@SS=1bU(u{ab@bsDm_AgL$Y1ZIfSOTyM(X
z!}{Dmf$H!Is>2G@mOMbc|GvGPEop?hACEdS9Z(Y+hPEo^k!Xz1p}t`2QSbRdY=vh~
z1M})_S-d$`AbR5<REHx__j9lzK8sqZmBy{8dizml<*dp7)SLBJhrgQ}!O84D`Ie{#
z3Q<cn8+EuA8cR_F--=p+gIEnuneq#$4zHo!hKE=cWBNEN+X@?z@7;&>R|9{cKuhv8
zM&f*Q?<H!f51>9kU!dy!V9Kq&&H#hZlk#v>!!f7{^h2G2F{lAe$L6>IwSs$W5<Vmj
z8$Usf^h@-@t0sR9HRC&|4^1`RS#{6^HNZB;{un`iBC4Hvs3l*D+WRf275@k|5&JuH
z;}6vP8q9at2Roof+!IxC1dhk2P<wn1wdc1`hqnsfZOt?ot6)1+hn-Oq8G%}%aaaSh
zkTYgmg(Rv`@I0!)d8m=ELN&M%HIO41gBMU8R_24RnFXN+9*@2_5cLHegKBRYYUN%+
zE%_?cifzEEdjI#Cf@7$qD@Q%xJ<!>!5Nt=jH^$*C)Cz4w&2SHD&o5vsJ}~#24sr(6
z8f#JB4f)hqsi+CQir(~Zts&72%TNt}ihBRcQ7dy7)qs8hxWFH^0tu)U=#5(1v8Wkl
zqE;XmHLw>^OTHO3^IfPj@Cn))@pTf~qmWd`#;AcrV@+&h>|yQ?MRhb9bv80kGn#Ik
zjT+E=)LB@9m2f#~i&mmPZcb(W)xjPLG?SC4nO;Ueyp3A=%0rx$=w$4PsyEQ&(@_I?
z()c{;xfQ5^okLCNE0g~bRsZG?)<2#^^`Xv)I-*W@3O2zUQ@#*ulV6K^{dS_hm>;8-
z`X*LK-(k+y)JIJq4vVofM&WkUz%Qb<;+joD4|)!FPH`>N(#E4k-VU2%5^AOLurAIp
z_m`OauVWj^kD~@^r8z4afI3?-sIxQ-_53*0mfKI8#IvZ8{S8&|6|94$Ccnev_oDXj
zEb35|qgLV<)NeQc5zbrD7WMpK)C4D@&cbBWTQCKC=>6YAg7arp8tE+MP}Hd{!1}n@
z_$KO59YziCII7`usMGv4>O1foYUvw{a_%=nwbK?=Zvbi~bI?!k|8x=o6ugXDl2Q!B
z4X7FH#g=#$^`PfyX8?7LVW<^}#$-&ysW=N0@d4^BOL)S0eaB%_-NzKY|C>o@DSt)x
zSs3HYpcX10W{kmL@@>rhfv5qGMV*x_Wc#gr<i)X$8bii1dzGVBW&`SN*ok%~i323k
zF>0LST+|-@jA}TZn>tkOQT6)qgGpIijXwNh=t_PPYN^XmTXhii{4vy_K5hIQHGuN*
z{H3P{uA7Qp6P&*RYhoJZ?NNKZ7(MWH;x{6O(3MG{J|vHq%&iw@hpGx!BvIL<?~;Cp
z_=*@nS#MKL)_rv(?@OqcD}*0uUP;Tx)Jw!S$!{fg5lzW!O79Z7hC1kAltcykdLAO*
zzodO&nBA3{`qN*R&iB8F8_N9Y$|rq~7)L!V(EG%3;w+)-4F~H*yiR;a^q}s?SQA_0
z5Ilj}uosBI<k{tt^MSthaMFVaT{;2%NLL~no3aebI*^`-+X-Gp_hs|*Eus~n|1oe4
zlg%@8Nq<2+y3Ud4N<^6ZD&I_W(91oN!Wk;z(r2d``2_4wyhMbUhboc&r}D%K;yjVY
zy^FY>&}phnY$G0Br6hug&xmMKsP`<1=h_p2`j0k^Ob4|w$5d)%%9NdE%8K#Z691q;
z``@Ihni@Zm-eYQr27h{Tgh|th6+n6;_QX8gPw2(kKzN&aqi_rPUU&(0^&@5ybtyZ7
z_w{@7my)ueFgt~!3}PU~kFH4aUC8t%9uj(ox>HtwUlV#Kc~h*Rl(i)Mi8<t#6F(E5
z61tLzFyaSdJatluDAHqzF{HoL*7YIr5e3tU>V&Q~l<6uXyh!I_XB<m3(+w`ZlGZ<n
zCn)p6Y$AndNM4sdB!3V!$j6zofyUAJqbljU{3@hVuok27fXcZ(Bn}ddl;OHc^dycF
z3DkQTbrli+A+m^X2v6>9LS6cv4<de5=1<q^M``WMJVIZm9mLZ_9pW+(OhfH(7(Rzh
za6ATKIqItCV0Fiel0_i_v2T;=MvY}S#oQG;iO-2s#Cya#!lUGLNPu01+AWCRDbdxy
z!CHwEC~uClh{s4r;6CDeVkzNEw543vCq!R&%J~Df4&{5vpD|^xp?<IE3N+75rCE1D
zI0f<Ul=I_)Nhe|n5zqbl<{@*-&CQZE4FW>jac4OBC{yFFq??=c>5|h80#fu{?@Z|;
z_fyV~!?1?<fOv**QRgJyCUo5)YEgCzhY%f!RYYt_%g}((Fz(bNbfpo=M0=tNQN1KR
zG$7&_DP5gREhp#v>qcu+)}>^5XjF^c+<HJfMbvmy4O592YWBctdcu{Sk&&5EvZzy=
z?coh)))>{NIJdx6l<z8<l<69uUsRNz>&nk^=W?<Oi*%<jGbeKbDJn!X%}USC$;=o#
zA-_1UD7w&<U6h$y=$bMqd%`4_b4yQT=N9BoE{fZ}E~d0$K(f0^UVfe_K2%n?ePr^s
z%Hvbhi;FTRyE5}!<I@XW8JRA1nCU9WFP`iwJXEGmv-9)vsFIUe`2V`j`*!B?^l9mN
gMXrKk*P+ctlQaL<P2BcsDdk>OG{)^WQm^>^7fLy8+W-In

delta 7538
zcmYk>3w+P@9>?+TTxK>KHa5d-%w{u}F}E?f<hC`}%`KNPG31h>*5&x;B)1M-{w}#C
zRMJfvBFbeXaYU$8Y?74dqC`2>dA;}hcs%+&`t<zXe&5^g`}_UZqg4k3P8<mEoei(B
z#Bq%caIP+P3vsT5^rT3YI`?gibNAtQ_&AQJ=UfJ!$C?-y>s%_f!6+<1-ReVbaZ525
zw_qYxj`QwI_4K(OB%-Mpj_TlkY>10+Di)dX^_`nS-j6w0u7Pu%aS&F-Wmp|oV<2wA
zO1KS!@I5S#2eC39F4O1SDH3W}g1Ye{R>2=I3~yRKINrGk@=+LyDX98%WKOOZw#133
z{#K*<dlAF&H7nnZ704fyjPH(+VAtJo)Jo2v1~{(<_%l|+-*66AVtcgGMOX))M@@Ja
zYQRHS6^~hYsd>ff|FHUi1Rj$*u1-QTZeTV>4bT#ku^VayQ?Me=LJc$*HPJ<=1*}3%
z<Ym<TTdn+{m7hSJjZzH8>j}<RHgLH_uY+JS64h}748&Bdfo)L(WTWbbVl6B{?Zl&2
zzY6)sZRB5NJAv)Um!cLL-N-Ai--!KJM=dDO3Ob<<#~tQC)PQ-Y8BenO1E`K?Tlr$t
z0BcZZ;xnv-7tJ57{JI&K<Q>YIJ`x(R9%{>yumZNnIP8Q$I12TsCZJxshcFPILQP~D
z>h;}#>Tf@4B1bKM#_|_Y_y2~PpsxxKIEX|I)ai~vt+WMdXEIP7Wg#zu8;Y9XBdGgk
znG3KYc|U4m%gyIeJGcSW-xkzP??V>sb4N*N1*NF(z)z@-gByG05vUo*qdG`OO{gbo
z#|Bybc+`q!qT0<t^}E=70d?ON)P2Pm!uakK39aayHTVX#l56Ho)QSR9ya9qx_0>=-
ziL`tJ)FDkmt+*rVP-dY99%s%#EpWEf`@fKcZd{7G@l|s>YM=wC6&*%R^fYP(XHl=^
zPpARPH{l#%I5x!=me0e=<Y%Jpn}?d%3iRoQZPwrvYM>IVf>*E^{(+iEGQDa7%~7vi
zD-6NjsKYrFwNn#O15U$Gd>A$GeAF3RiE6j0Df_Puw^5)0cbXrdw&)aUWoJ>(@(L#4
zpQvXY&+KFhs(l)2pbXRm`k)3HV);B&KNC<3daxP$uN!?7Xd?4aH!QULV${TzV<^64
z`7Ibmey`<^nP*Uk_!6pph2~y=;TTLl8Z~f348z7gOQfT=vKMLsxu^*Zv-~L34F#x2
zc0X#ROHc!Dz*yXidKBkS171aK`JZO>RIi@|EPMZ3k<bb=P!q_+$v6<zVKHil&ZBO)
zZ2pSX$o~(u)uAmsqfp<8`l$BZP=_=d)lVKa!tuzt^|_}=Xl1*wDjr4+`~|9mn^s=F
zrMEK?sE%r*29CFUQ`C2&4eGvZ)Fa46EifN--&89v#4x@8b4ch{X$fivUPCq9j(P-p
zu_?ZfS@^5jDb4$XWdZ8byAJgl??!F?Nz}70K|Rt7sD3Y_7J3cC7~fTF<yF)$W6VU<
z%$r+21J!YN)XMr<{YcbK+>H@90~2w+)xU|_k#|w;4xlFR5&HU(C?PQtQ(Jp~!90n2
z1p821`W5Pi8>k%!YU52T2Q{HlmcQHbh2~?Z`xjaL3#c90jGEBfZP@?bBz9BK2SeNP
zF~Q-;F1uGyD?NkSiSJPpzF}tao7<QC3S<rL5^9TM)4lddm`lF3xd3y>mmp1DT6^|C
zio~S$-pppBX0`zJ%$~9G<*1I=m@ixXW{jqMJC4GSQTL~H;BSZk=Q`jl@^kr<`B|*o
z(YYSD4mIv~J`x;o7jPRV8q-kEt`8>Q3><(fk=MojfckdV?&R498<HP@jqw50ee19g
zKfvkOrL*TY985l?3vUSe9wVWZ9Yf9NwB>(B?Z6+XLle-|TUiK(laIhiOhmoD9Z_#j
zHpb!*D=)<A<mX}>E=P^`j#ut;#Uzp`IEC7pzflABxZS(4A8JMUsKYi7H8DSGt5={7
z**eQ_M}3&~pbpz{tN#@B2(F;sk~!Vfua6E$XhnNa9iBk##22WJe?hIFa(A!34r+jS
ztbwgiE6+qtd?3bP9=64QVME-CTEOS11zf<IjPEX!P>1DMzB-IR<&(^GE6>7Ol;@!a
zEJO`B8?}H%sFkfnJ(8_fzaMpGj-nQJ3DvG#Po94R5|JeI1xrW0=Yuc}$Dt;&0(oQH
zt5^vypa#5xs&~D-AEoN3ok}&kqT1!6&PsvhXQIY?x)=MeiZ>|WoVf$24k~4OTNRC3
zNkcOYwF6yIJ1`6@V*zSK(@+CGj(QuO#ULz3?d%b(kLOVLm(ODVwIx-vyw|P~s-h2S
zpgU0?p!-nmW?A`i3?}~;R>XHv9T%e(Z~=7&uA?SY^A6{lU=nHv2cpIq;j_d9)J$h!
zAkMV><EWJ_LVak~p$6E6n&46MA|{a6ORatqQ9Iil_3V3~wmcuT5TBL%mXXl=T7)5Z
z0yX0jRKu%S4}<wG>scqG-ir39752jlI0ZG(eW(RIiQ1W^SOr(1&ele(j60D2c>hUg
z#wSr7o<U9ECN{<}ei$@hI%-9IQ4=1Ap*RQi<y?%K;3m|L?LlqzNz_h#i5lmc<^RI6
z_dkkX5Z%xbn_z!zhcmGmzKz<MZ%`||ih9;z{k*>mQc?9IQ4^Yo)vyrxbh!Dbfsdjl
z^eLub35MwX59#ln&M4H@G{I`v2IH_NY6r%nc3>uIYnPxpT#4F&^{9!xhuZQ|)XJ}*
zo_*i|Z^H4YN7NsEN(>>P735)6yxV*jRsRHPpl48LVg+hNZ<#w$6WWhD3m;-R{0Oxp
zA7gbaMfHCbwUBZ-Jb$e;I>&p@8>6;99kmnpnvbB`&9VG4)I`>rJ5V2}<EV*+<a!IL
zfy&3B+9zWwc0o<(-dy%yr+YR9@wnb94q`a@)2P?(GU`hiIMCbbWDF+X4fSaHVi=Ca
z88{sq;U(0>!v}efA|7>L2I>&^^pVik7NBN26?F&;QCsyQ*2Jw=f7t3zVr$9+27422
zi;?8BP={+YY6lmh?q7y_l&_mxP!sd*B%y{!um*l&`R^@%4fPCzhj@po7HTIFP`_%u
zP;bR#)cx~OD|`-h7B-^Zf;X@`{(?Mymp-&?Cw=ZeBy?&wU@bgkeuX+zH&GJ|xYO%6
z1a+DtQCpaX+WH);&qwt$8P#qMYA4sD+7)30?!!R+{(nLuih?t!6<os>7(C3oF#|P$
zY;zE5M@C^LPQgOlj%~5UaPKvnfN|uPVUp^xH=aYip3O%v2IIR75}H|072qIqG}b0R
z$?E5#p5ao|Sy_!d9rqG)@ZDeLfRTJVRF3NR4C?j1jAQWzj>eIBJbxwjkkB(~Fv{z=
z0CoEBLDfHoOxj&AyHePh{2J6&m!clk@2H9WjXKmp`JUBK6R3r1-w@TVV?OgtCeed}
zA$SjJs}ErSt|D#{jR{?MQK<L!cK`CoSYKT=;YuXRS^663H;FHaK9u#ea<XMtd-7EX
zjdGp{CC#hkf~{Q}e1-h$#5ST4c};aQp=+RrPL#iGRA|M0<a_%wqhfuXXqjcb=zt#~
zez4ZJm`dU|B9C_3pzXvV;$uSBdJi`bFB2DtZnQm$Vb}_D@I#dobBX@sdCLBaQK7y;
zr27%NbOQ9BAOS>uE4z!bbkYU*7Qw4kcIgzpN~96`9|7NEFS}<x>C?om>ja6;L_@1r
z`9`9>e$0nbI8!BD`s_3&-xB)}3y9iwQ#sPRh&sdy;uB&pb)Vx4gicd=ViR%edX7Xi
zaf(Q`!lu}n``Qsvt~oE94Nx5?S)-O#rtE`OHUrQ3>qkfVej-)LT6{-(r?n7u{&D9J
zOEZWIC;bw3$0@j*(3|xl5oqo1#Mj98z%!^Tn|PF{LD_!1q2I|X{vFY=zHExd5dA2=
zbtRDRM5Y(<7om5kD`ofKSwipR7$TRlRH7O&hrF&!#L2Rh_osC%>5If@+6*8Xk<KGV
zkp4oCE|bIu6g)x%6S`Vart4**BI(JPfg_0&Rd5X>-XVrl7KjrFedc1w>k23SBtpnH
zwX(kEF#J}H^c{W{Mp3X9lW-5}Iza3t>MO(bHPM53pJ+k5Cs5aP;tygRQ9@LpZUgGl
z_q;!GU73GeYi_0WWEK*&h$7;CLO%vy5z%zi4hQ1Du>s~|Ei6S{ksj`L{L#O*PDIl;
zNOhsbGJL>l#TMc-;=jaJVjbc9=jufG%G0_T@jsPt)%9>IF`x1#IE&~=IsxA!z9E(p
zp+sxSb$vwKQI_)lfQ_L1UGm4RY&q7pbfn!==-h2(Me!7*TBZ2Z(rwXCG^akwZnCN}
ze)ey!8xhl%n!)4~t;NHnQ!IVVf39vs@4qSONIXs4x{66WPwXHbB4WAYF#ba5`jx0k
z*;ULXIuNUgCjKrl5i#|sscB;jp)`|7Cn^w?{nKJ15)P8m)xlbMIqyF=(yZ(@|Hha`
z32#&NJ28!@a;q8U5XrRcjzLA&Vs=+4s+RIxy;|90<Hn31eQ&|o$z!KXj~g9Vym8F<
gsWXZ<7VXV^vwYFX-lc&Rr{+%_JH2Ro?$=@e2fFJh(f|Me

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 49f43c4c..1f85035b 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-04 22:24+0000\n"
+"POT-Creation-Date: 2021-03-05 14:10+0000\n"
 "PO-Revision-Date: 2021-03-02 12:37+0100\n"
 "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -613,37 +613,42 @@ msgstr "(Rechargez la page pour mettre à jour !"
 
 #: bookwyrm/templates/import_status.html:35
 msgid "Failed to load"
-msgstr "Le chargement a échoué"
+msgstr "Items non importés"
 
-#: bookwyrm/templates/import_status.html:59
+#: bookwyrm/templates/import_status.html:42
+#, python-format
+msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
+msgstr "Sauter en bas de liste pour sélectionner les %(failed_count)s items n’ayant pu être importés."
+
+#: bookwyrm/templates/import_status.html:74
 msgid "Select all"
 msgstr "Tout sélectionner"
 
-#: bookwyrm/templates/import_status.html:62
+#: bookwyrm/templates/import_status.html:79
 msgid "Retry items"
-msgstr "Essayer d’importer les objets sélectionnés de nouveau"
+msgstr "Essayer d’importer les items sélectionnés de nouveau"
 
-#: bookwyrm/templates/import_status.html:84
+#: bookwyrm/templates/import_status.html:101
 msgid "Successfully imported"
 msgstr "Importation réussie"
 
-#: bookwyrm/templates/import_status.html:88
+#: bookwyrm/templates/import_status.html:105
 #: bookwyrm/templates/lists/curate.html:14
 msgid "Book"
 msgstr "Livre"
 
-#: bookwyrm/templates/import_status.html:91
+#: bookwyrm/templates/import_status.html:108
 #: bookwyrm/templates/snippets/create_status_form.html:10
 #: bookwyrm/templates/snippets/shelf.html:10
 msgid "Title"
 msgstr "Titre"
 
-#: bookwyrm/templates/import_status.html:94
+#: bookwyrm/templates/import_status.html:111
 #: bookwyrm/templates/snippets/shelf.html:11
 msgid "Author"
 msgstr "Auteur ou autrice"
 
-#: bookwyrm/templates/import_status.html:117
+#: bookwyrm/templates/import_status.html:134
 msgid "Imported"
 msgstr "Importé"
 

From b70e728ffb816574f68433b7ff5c1c1441217ac2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 5 Mar 2021 06:58:22 -0800
Subject: [PATCH 0202/1285] Removes the word "cover" from cover alt text

Fixes #694
---
 bookwyrm/models/book.py                  | 2 +-
 bookwyrm/tests/models/test_book_model.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index f1f20830..6a1a18b1 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -91,7 +91,7 @@ class Book(BookDataModel):
     @property
     def alt_text(self):
         ''' image alt test '''
-        text = '%s cover' % self.title
+        text = '%s' % self.title
         if self.edition_info:
             text += ' (%s)' % self.edition_info
         return text
diff --git a/bookwyrm/tests/models/test_book_model.py b/bookwyrm/tests/models/test_book_model.py
index 98d6d446..b4a099d0 100644
--- a/bookwyrm/tests/models/test_book_model.py
+++ b/bookwyrm/tests/models/test_book_model.py
@@ -81,7 +81,7 @@ class Book(TestCase):
         book.save()
         self.assertEqual(book.edition_info, 'worm, Glorbish language, 2020')
         self.assertEqual(
-            book.alt_text, 'Test Edition cover (worm, Glorbish language, 2020)')
+            book.alt_text, 'Test Edition (worm, Glorbish language, 2020)')
 
 
     def test_get_rank(self):

From 91a14d3a1334848132a0474824da8b2ce054f185 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 5 Mar 2021 07:50:23 -0800
Subject: [PATCH 0203/1285] Updates alt text in status model tests

---
 bookwyrm/tests/models/test_status_model.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py
index c6911b6d..29be5c07 100644
--- a/bookwyrm/tests/models/test_status_model.py
+++ b/bookwyrm/tests/models/test_status_model.py
@@ -150,7 +150,7 @@ class Status(TestCase):
         self.assertEqual(activity['attachment'][0].url, 'https://%s%s' % \
                 (settings.DOMAIN, self.book.cover.url))
         self.assertEqual(
-            activity['attachment'][0].name, 'Test Edition cover')
+            activity['attachment'][0].name, 'Test Edition')
 
     def test_comment_to_activity(self, _):
         ''' subclass of the base model version with a "pure" serializer '''
@@ -177,7 +177,7 @@ class Status(TestCase):
         self.assertEqual(activity['attachment'][0].url, 'https://%s%s' % \
                 (settings.DOMAIN, self.book.cover.url))
         self.assertEqual(
-            activity['attachment'][0].name, 'Test Edition cover')
+            activity['attachment'][0].name, 'Test Edition')
 
     def test_quotation_to_activity(self, _):
         ''' subclass of the base model version with a "pure" serializer '''
@@ -207,7 +207,7 @@ class Status(TestCase):
         self.assertEqual(activity['attachment'][0].url, 'https://%s%s' % \
                 (settings.DOMAIN, self.book.cover.url))
         self.assertEqual(
-            activity['attachment'][0].name, 'Test Edition cover')
+            activity['attachment'][0].name, 'Test Edition')
 
     def test_review_to_activity(self, _):
         ''' subclass of the base model version with a "pure" serializer '''
@@ -238,7 +238,7 @@ class Status(TestCase):
         self.assertEqual(activity['attachment'][0].url, 'https://%s%s' % \
                 (settings.DOMAIN, self.book.cover.url))
         self.assertEqual(
-            activity['attachment'][0].name, 'Test Edition cover')
+            activity['attachment'][0].name, 'Test Edition')
 
     def test_favorite(self, _):
         ''' fav a status '''

From 99e5e3e414386bae121cd4da0cd2d2db350916e5 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Fri, 5 Mar 2021 22:09:56 +0100
Subject: [PATCH 0204/1285] [import] Show skip link to all when there is more
 than 10 failed imports.

---
 bookwyrm/static/css/format.css        |  5 +++++
 bookwyrm/templates/import_status.html | 14 +++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/static/css/format.css b/bookwyrm/static/css/format.css
index 92e0d92c..9badfaf0 100644
--- a/bookwyrm/static/css/format.css
+++ b/bookwyrm/static/css/format.css
@@ -1,3 +1,8 @@
+html {
+    scroll-behavior: smooth;
+    scroll-padding-top: 20%;
+}
+
 /* --- --- */
 .image {
     overflow: hidden;
diff --git a/bookwyrm/templates/import_status.html b/bookwyrm/templates/import_status.html
index 3ee9c4a5..f9ba36bf 100644
--- a/bookwyrm/templates/import_status.html
+++ b/bookwyrm/templates/import_status.html
@@ -38,9 +38,13 @@
         {% csrf_token %}
 
         {% with failed_count=failed_items|length %}
-            <a class="skip-link" href="#select-all-failed-imports">
-                {% blocktrans %}Jump to the bottom of the list to select the {{ failed_count }} items which failed to import.{% endblocktrans %}
-            </a>
+            {% if failed_count > 10 %}
+                <p class="block">
+                    <a href="#select-all-failed-imports">
+                        {% blocktrans %}Jump to the bottom of the list to select the {{ failed_count }} items which failed to import.{% endblocktrans %}
+                    </a>
+                </p>
+            {% endif %}
         {% endwith %}
 
         <fieldset id="failed-imports">
@@ -64,7 +68,7 @@
         <fieldset class="mt-3">
             <a name="select-all-failed-imports"></a>
 
-            <label class="label is-inline mb-1">
+            <label class="label is-inline">
                 <input
                     id="toggle-all-checkboxes-failed-imports"
                     class="checkbox"
@@ -75,7 +79,7 @@
                 {% trans "Select all" %}
             </label>
 
-            <button class="button is-block" type="submit">{% trans "Retry items" %}</button>
+            <button class="button is-block mt-3" type="submit">{% trans "Retry items" %}</button>
         </fieldset>
 
         <hr>

From 703ff60271fe4ad36bf2210949e0b375998df084 Mon Sep 17 00:00:00 2001
From: Henri Bourcereau <hbourcereau@atixnet.fr>
Date: Mon, 1 Mar 2021 21:09:21 +0100
Subject: [PATCH 0205/1285] isbn search

---
 bookwyrm/connectors/abstract_connector.py     | 33 ++++++++++++
 bookwyrm/connectors/bookwyrm_connector.py     |  8 +++
 bookwyrm/connectors/connector_manager.py      | 33 ++++++++++--
 bookwyrm/connectors/openlibrary.py            | 16 ++++++
 bookwyrm/connectors/self_connector.py         | 42 +++++++++++++++
 bookwyrm/management/commands/initdb.py        |  3 ++
 .../0047_connector_isbn_search_url.py         | 18 +++++++
 bookwyrm/models/connector.py                  |  1 +
 bookwyrm/templates/isbn_search_results.html   | 33 ++++++++++++
 .../connectors/test_abstract_connector.py     |  4 ++
 .../test_abstract_minimal_connector.py        |  6 +++
 .../connectors/test_openlibrary_connector.py  | 29 ++++++++++
 bookwyrm/tests/data/ol_isbn_search.json       | 45 ++++++++++++++++
 bookwyrm/tests/views/test_isbn.py             | 54 +++++++++++++++++++
 bookwyrm/tests/views/test_search.py           |  4 ++
 bookwyrm/urls.py                              |  3 ++
 bookwyrm/views/__init__.py                    |  1 +
 bookwyrm/views/isbn.py                        | 29 ++++++++++
 18 files changed, 358 insertions(+), 4 deletions(-)
 create mode 100644 bookwyrm/migrations/0047_connector_isbn_search_url.py
 create mode 100644 bookwyrm/templates/isbn_search_results.html
 create mode 100644 bookwyrm/tests/data/ol_isbn_search.json
 create mode 100644 bookwyrm/tests/views/test_isbn.py
 create mode 100644 bookwyrm/views/isbn.py

diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index 68ff2a48..e6372438 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -26,6 +26,7 @@ class AbstractMinimalConnector(ABC):
             'books_url',
             'covers_url',
             'search_url',
+            'isbn_search_url',
             'max_query_count',
             'name',
             'identifier',
@@ -61,6 +62,30 @@ class AbstractMinimalConnector(ABC):
             results.append(self.format_search_result(doc))
         return results
 
+    def isbn_search(self, query):
+        ''' isbn search '''
+        params = {}
+        resp = requests.get(
+            '%s%s' % (self.isbn_search_url, query),
+            params=params,
+            headers={
+                'Accept': 'application/json; charset=utf-8',
+                'User-Agent': settings.USER_AGENT,
+            },
+        )
+        if not resp.ok:
+            resp.raise_for_status()
+        try:
+            data = resp.json()
+        except ValueError as e:
+            logger.exception(e)
+            raise ConnectorException('Unable to parse json response', e)
+        results = []
+
+        for doc in self.parse_isbn_search_data(data):
+            results.append(self.format_isbn_search_result(doc))
+        return results
+
     @abstractmethod
     def get_or_create_book(self, remote_id):
         ''' pull up a book record by whatever means possible '''
@@ -73,6 +98,14 @@ class AbstractMinimalConnector(ABC):
     def format_search_result(self, search_result):
         ''' create a SearchResult obj from json '''
 
+    @abstractmethod
+    def parse_isbn_search_data(self, data):
+        ''' turn the result json from a search into a list '''
+
+    @abstractmethod
+    def format_isbn_search_result(self, search_result):
+        ''' create a SearchResult obj from json '''
+
 
 class AbstractConnector(AbstractMinimalConnector):
     ''' generic book data connector '''
diff --git a/bookwyrm/connectors/bookwyrm_connector.py b/bookwyrm/connectors/bookwyrm_connector.py
index 00e6c62f..96b72f26 100644
--- a/bookwyrm/connectors/bookwyrm_connector.py
+++ b/bookwyrm/connectors/bookwyrm_connector.py
@@ -19,3 +19,11 @@ class Connector(AbstractMinimalConnector):
     def format_search_result(self, search_result):
         search_result['connector'] = self
         return SearchResult(**search_result)
+
+    def parse_isbn_search_data(self, data):
+        return data
+
+    def format_isbn_search_result(self, search_result):
+        search_result['connector'] = self
+        return SearchResult(**search_result)
+
diff --git a/bookwyrm/connectors/connector_manager.py b/bookwyrm/connectors/connector_manager.py
index a63a788e..053e1f9e 100644
--- a/bookwyrm/connectors/connector_manager.py
+++ b/bookwyrm/connectors/connector_manager.py
@@ -1,5 +1,6 @@
 ''' interface with whatever connectors the app has '''
 import importlib
+import re
 from urllib.parse import urlparse
 
 from requests import HTTPError
@@ -15,13 +16,31 @@ class ConnectorException(HTTPError):
 def search(query, min_confidence=0.1):
     ''' find books based on arbitary keywords '''
     results = []
+
+    # Have we got a ISBN ?
+    isbn = re.sub('[\W_]', '', query)
+    maybe_isbn = len(isbn) in [10, 13] # ISBN10 or ISBN13
+
     dedup_slug = lambda r: '%s/%s/%s' % (r.title, r.author, r.year)
     result_index = set()
     for connector in get_connectors():
-        try:
-            result_set = connector.search(query, min_confidence=min_confidence)
-        except (HTTPError, ConnectorException):
-            continue
+        result_set = None
+        if maybe_isbn:
+            # Search on ISBN
+            if not connector.isbn_search_url or connector.isbn_search_url == '': 
+                result_set = []
+            else:
+                try:
+                    result_set = connector.isbn_search(isbn)
+                except (HTTPError, ConnectorException):
+                    pass
+
+        # if no isbn search or results, we fallback to generic search
+        if result_set == None or result_set == []:
+            try:
+                result_set = connector.search(query, min_confidence=min_confidence)
+            except (HTTPError, ConnectorException):
+                continue
 
         result_set = [r for r in result_set \
                 if dedup_slug(r) not in result_index]
@@ -41,6 +60,12 @@ def local_search(query, min_confidence=0.1, raw=False):
     return connector.search(query, min_confidence=min_confidence, raw=raw)
 
 
+def isbn_local_search(query, raw=False):
+    ''' only look at local search results '''
+    connector = load_connector(models.Connector.objects.get(local=True))
+    return connector.isbn_search(query, raw=raw)
+
+
 def first_search_result(query, min_confidence=0.1):
     ''' search until you find a result that fits '''
     for connector in get_connectors():
diff --git a/bookwyrm/connectors/openlibrary.py b/bookwyrm/connectors/openlibrary.py
index a767a45a..8d227eef 100644
--- a/bookwyrm/connectors/openlibrary.py
+++ b/bookwyrm/connectors/openlibrary.py
@@ -129,6 +129,22 @@ class Connector(AbstractConnector):
         )
 
 
+    def parse_isbn_search_data(self, data):
+        return list(data.values())
+
+    def format_isbn_search_result(self, search_result):
+        # build the remote id from the openlibrary key
+        key = self.books_url + search_result['key']
+        authors = search_result.get('authors') or [{'name': 'Unknown'}]
+        author_names = [ author.get('name') for author in authors]
+        return SearchResult(
+            title=search_result.get('title'),
+            key=key,
+            author=', '.join(author_names),
+            connector=self,
+            year=search_result.get('publish_date'),
+        )
+
     def load_edition_data(self, olkey):
         ''' query openlibrary for editions of a work '''
         url = '%s/works/%s/editions' % (self.books_url, olkey)
diff --git a/bookwyrm/connectors/self_connector.py b/bookwyrm/connectors/self_connector.py
index f57fbc1c..b3a4d6f9 100644
--- a/bookwyrm/connectors/self_connector.py
+++ b/bookwyrm/connectors/self_connector.py
@@ -33,6 +33,31 @@ class Connector(AbstractConnector):
             search_results.sort(key=lambda r: r.confidence, reverse=True)
         return search_results
 
+    def isbn_search(self, query, raw=False):
+        ''' search your local database '''
+        if not query:
+            return []
+
+        filters = [{f: query} for f in ['isbn_10', 'isbn_13']]
+        results = models.Edition.objects.filter(
+            reduce(operator.or_, (Q(**f) for f in filters))
+        ).distinct()
+
+        # when there are multiple editions of the same work, pick the default.
+        # it would be odd for this to happen.
+        results = results.filter(parent_work__default_edition__id=F('id')) \
+                or results
+
+        search_results = []
+        for result in results:
+            if raw:
+                search_results.append(result)
+            else:
+                search_results.append(self.format_search_result(result))
+            if len(search_results) >= 10:
+                break
+        return search_results
+
 
     def format_search_result(self, search_result):
         return SearchResult(
@@ -47,6 +72,19 @@ class Connector(AbstractConnector):
         )
 
 
+    def format_isbn_search_result(self, search_result):
+        return SearchResult(
+            title=search_result.title,
+            key=search_result.remote_id,
+            author=search_result.author_text,
+            year=search_result.published_date.year if \
+                    search_result.published_date else None,
+            connector=self,
+            confidence=search_result.rank if \
+                    hasattr(search_result, 'rank') else 1,
+        )
+
+
     def is_work_data(self, data):
         pass
 
@@ -59,6 +97,10 @@ class Connector(AbstractConnector):
     def get_authors_from_data(self, data):
         return None
 
+    def parse_isbn_search_data(self, data):
+        ''' it's already in the right format, don't even worry about it '''
+        return data
+
     def parse_search_data(self, data):
         ''' it's already in the right format, don't even worry about it '''
         return data
diff --git a/bookwyrm/management/commands/initdb.py b/bookwyrm/management/commands/initdb.py
index 9fd11787..5759abfc 100644
--- a/bookwyrm/management/commands/initdb.py
+++ b/bookwyrm/management/commands/initdb.py
@@ -66,6 +66,7 @@ def init_connectors():
         books_url='https://%s/book' % DOMAIN,
         covers_url='https://%s/images/covers' % DOMAIN,
         search_url='https://%s/search?q=' % DOMAIN,
+        isbn_search_url='https://%s/isbn/' % DOMAIN,
         priority=1,
     )
 
@@ -77,6 +78,7 @@ def init_connectors():
         books_url='https://bookwyrm.social/book',
         covers_url='https://bookwyrm.social/images/covers',
         search_url='https://bookwyrm.social/search?q=',
+        isbn_search_url='https://bookwyrm.social/isbn/',
         priority=2,
     )
 
@@ -88,6 +90,7 @@ def init_connectors():
         books_url='https://openlibrary.org',
         covers_url='https://covers.openlibrary.org',
         search_url='https://openlibrary.org/search?q=',
+        isbn_search_url='https://openlibrary.org/api/books?jscmd=data&format=json&bibkeys=ISBN:',
         priority=3,
     )
 
diff --git a/bookwyrm/migrations/0047_connector_isbn_search_url.py b/bookwyrm/migrations/0047_connector_isbn_search_url.py
new file mode 100644
index 00000000..617a89d9
--- /dev/null
+++ b/bookwyrm/migrations/0047_connector_isbn_search_url.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.7 on 2021-02-28 16:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0046_sitesettings_privacy_policy'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='connector',
+            name='isbn_search_url',
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+    ]
diff --git a/bookwyrm/models/connector.py b/bookwyrm/models/connector.py
index 6f64cdf3..c1fbf58b 100644
--- a/bookwyrm/models/connector.py
+++ b/bookwyrm/models/connector.py
@@ -22,6 +22,7 @@ class Connector(BookWyrmModel):
     books_url = models.CharField(max_length=255)
     covers_url = models.CharField(max_length=255)
     search_url = models.CharField(max_length=255, null=True, blank=True)
+    isbn_search_url = models.CharField(max_length=255, null=True, blank=True)
 
     politeness_delay = models.IntegerField(null=True, blank=True) #seconds
     max_query_count = models.IntegerField(null=True, blank=True)
diff --git a/bookwyrm/templates/isbn_search_results.html b/bookwyrm/templates/isbn_search_results.html
new file mode 100644
index 00000000..a3861a68
--- /dev/null
+++ b/bookwyrm/templates/isbn_search_results.html
@@ -0,0 +1,33 @@
+{% extends 'layout.html' %}
+{% load i18n %}
+
+{% block title %}{% trans "Search Results" %}{% endblock %}
+
+{% block content %}
+{% with book_results|first as local_results %}
+<div class="block">
+    <h1 class="title">{% blocktrans %}Search Results for "{{ query }}"{% endblocktrans %}</h1>
+</div>
+
+<div class="block columns">
+    <div class="column">
+        <h2 class="title">{% trans "Matching Books" %}</h2>
+        <section class="block">
+            {% if not results %}
+            <p>{% blocktrans %}No books found for "{{ query }}"{% endblocktrans %}</p>
+            {% else %}
+            <ul>
+            {% for result in results %}
+                <li class="pd-4">
+                    <a href="{{ result.key }}">{% include 'snippets/search_result_text.html' with result=result link=True %}</a>
+                </li>
+            {% endfor %}
+            </ul>
+            {% endif %}
+        </section>
+
+    <div class="column">
+    </div>
+</div>
+{% endwith %}
+{% endblock %}
diff --git a/bookwyrm/tests/connectors/test_abstract_connector.py b/bookwyrm/tests/connectors/test_abstract_connector.py
index 6e912858..1b382104 100644
--- a/bookwyrm/tests/connectors/test_abstract_connector.py
+++ b/bookwyrm/tests/connectors/test_abstract_connector.py
@@ -42,6 +42,10 @@ class AbstractConnector(TestCase):
                 return search_result
             def parse_search_data(self, data):
                 return data
+            def format_isbn_search_result(self, search_result):
+                return search_result
+            def parse_isbn_search_data(self, data):
+                return data
             def is_work_data(self, data):
                 return data['type'] == 'work'
             def get_edition_from_work_data(self, data):
diff --git a/bookwyrm/tests/connectors/test_abstract_minimal_connector.py b/bookwyrm/tests/connectors/test_abstract_minimal_connector.py
index 0c6d2535..9b939067 100644
--- a/bookwyrm/tests/connectors/test_abstract_minimal_connector.py
+++ b/bookwyrm/tests/connectors/test_abstract_minimal_connector.py
@@ -18,6 +18,7 @@ class AbstractConnector(TestCase):
             books_url='https://example.com/books',
             covers_url='https://example.com/covers',
             search_url='https://example.com/search?q=',
+            isbn_search_url='https://example.com/isbn',
         )
 
         class TestConnector(abstract_connector.AbstractMinimalConnector):
@@ -28,6 +29,10 @@ class AbstractConnector(TestCase):
                 pass
             def parse_search_data(self, data):
                 return data
+            def format_isbn_search_result(self, search_result):
+                return search_result
+            def parse_isbn_search_data(self, data):
+                return data
         self.test_connector = TestConnector('example.com')
 
 
@@ -39,6 +44,7 @@ class AbstractConnector(TestCase):
         self.assertEqual(connector.books_url, 'https://example.com/books')
         self.assertEqual(connector.covers_url, 'https://example.com/covers')
         self.assertEqual(connector.search_url, 'https://example.com/search?q=')
+        self.assertEqual(connector.isbn_search_url, 'https://example.com/isbn')
         self.assertIsNone(connector.name)
         self.assertEqual(connector.identifier, 'example.com')
         self.assertIsNone(connector.max_query_count)
diff --git a/bookwyrm/tests/connectors/test_openlibrary_connector.py b/bookwyrm/tests/connectors/test_openlibrary_connector.py
index 576e353b..a174300a 100644
--- a/bookwyrm/tests/connectors/test_openlibrary_connector.py
+++ b/bookwyrm/tests/connectors/test_openlibrary_connector.py
@@ -27,6 +27,7 @@ class Openlibrary(TestCase):
             books_url='https://openlibrary.org',
             covers_url='https://covers.openlibrary.org',
             search_url='https://openlibrary.org/search?q=',
+            isbn_search_url='https://openlibrary.org/isbn',
         )
         self.connector = Connector('openlibrary.org')
 
@@ -149,6 +150,34 @@ class Openlibrary(TestCase):
         self.assertEqual(result.connector, self.connector)
 
 
+    def test_parse_isbn_search_result(self):
+        ''' extract the results from the search json response '''
+        datafile = pathlib.Path(__file__).parent.joinpath(
+            '../data/ol_isbn_search.json')
+        search_data = json.loads(datafile.read_bytes())
+        result = self.connector.parse_isbn_search_data(search_data)
+        self.assertIsInstance(result, list)
+        self.assertEqual(len(result), 1)
+
+
+    def test_format_isbn_search_result(self):
+        ''' translate json from openlibrary into SearchResult '''
+        datafile = pathlib.Path(__file__).parent.joinpath(
+            '../data/ol_isbn_search.json')
+        search_data = json.loads(datafile.read_bytes())
+        results = self.connector.parse_isbn_search_data(search_data)
+        self.assertIsInstance(results, list)
+
+        result = self.connector.format_isbn_search_result(results[0])
+        self.assertIsInstance(result, SearchResult)
+        self.assertEqual(result.title, 'Les ombres errantes')
+        self.assertEqual(
+            result.key, 'https://openlibrary.org/books/OL16262504M')
+        self.assertEqual(result.author, 'Pascal Quignard')
+        self.assertEqual(result.year, '2002')
+        self.assertEqual(result.connector, self.connector)
+
+
     @responses.activate
     def test_load_edition_data(self):
         ''' format url from key and make request '''
diff --git a/bookwyrm/tests/data/ol_isbn_search.json b/bookwyrm/tests/data/ol_isbn_search.json
new file mode 100644
index 00000000..8516ff06
--- /dev/null
+++ b/bookwyrm/tests/data/ol_isbn_search.json
@@ -0,0 +1,45 @@
+{
+  "ISBN:9782070427796": {
+    "url": "https://openlibrary.org/books/OL16262504M/Les_ombres_errantes",
+    "key": "/books/OL16262504M",
+    "title": "Les ombres errantes",
+    "authors": [
+      {
+        "url": "https://openlibrary.org/authors/OL269675A/Pascal_Quignard",
+        "name": "Pascal Quignard"
+      }
+    ],
+    "by_statement": "Pascal Quignard.",
+    "identifiers": {
+      "goodreads": [
+        "1835483"
+      ],
+      "librarything": [
+        "983474"
+      ],
+      "isbn_10": [
+        "207042779X"
+      ],
+      "openlibrary": [
+        "OL16262504M"
+      ]
+    },
+    "classifications": {
+      "dewey_decimal_class": [
+        "848/.91403"
+      ]
+    },
+    "publishers": [
+      {
+        "name": "Gallimard"
+      }
+    ],
+    "publish_places": [
+      {
+        "name": "Paris"
+      }
+    ],
+    "publish_date": "2002",
+    "notes": "Hardback published Grasset, 2002."
+  }
+}
diff --git a/bookwyrm/tests/views/test_isbn.py b/bookwyrm/tests/views/test_isbn.py
new file mode 100644
index 00000000..1966702b
--- /dev/null
+++ b/bookwyrm/tests/views/test_isbn.py
@@ -0,0 +1,54 @@
+''' test for app action functionality '''
+import json
+from unittest.mock import patch
+
+from django.http import JsonResponse
+from django.template.response import TemplateResponse
+from django.test import TestCase
+from django.test.client import RequestFactory
+
+from bookwyrm import models, views
+from bookwyrm.connectors import abstract_connector
+from bookwyrm.settings import DOMAIN
+
+
+class IsbnViews(TestCase):
+    ''' tag views'''
+    def setUp(self):
+        ''' we need basic test data and mocks '''
+        self.factory = RequestFactory()
+        self.local_user = models.User.objects.create_user(
+            'mouse@local.com', 'mouse@mouse.com', 'mouseword',
+            local=True, localname='mouse',
+            remote_id='https://example.com/users/mouse',
+        )
+        self.work = models.Work.objects.create(title='Test Work')
+        self.book = models.Edition.objects.create(
+            title='Test Book',
+            isbn_13='1234567890123',
+            remote_id='https://example.com/book/1',
+            parent_work=self.work
+        )
+        models.Connector.objects.create(
+            identifier='self',
+            connector_file='self_connector',
+            local=True
+        )
+        models.SiteSettings.objects.create()
+
+
+    def test_isbn_json_response(self):
+        ''' searches local data only and returns book data in json format '''
+        view = views.Isbn.as_view()
+        request = self.factory.get('')
+        with patch('bookwyrm.views.isbn.is_api_request') as is_api:
+            is_api.return_value = True
+            response = view(request, isbn='1234567890123')
+        self.assertIsInstance(response, JsonResponse)
+
+        data = json.loads(response.content)
+        self.assertEqual(len(data), 1)
+        self.assertEqual(data[0]['title'], 'Test Book')
+        self.assertEqual(
+            data[0]['key'], 'https://%s/book/%d' % (DOMAIN, self.book.id))
+
diff --git a/bookwyrm/tests/views/test_search.py b/bookwyrm/tests/views/test_search.py
index 655b4563..5d7109e7 100644
--- a/bookwyrm/tests/views/test_search.py
+++ b/bookwyrm/tests/views/test_search.py
@@ -64,6 +64,10 @@ class ShelfViews(TestCase):
                 pass
             def parse_search_data(self, data):
                 pass
+            def format_isbn_search_result(self, search_result):
+                return search_result
+            def parse_isbn_search_data(self, data):
+                return data
         models.Connector.objects.create(
             identifier='example.com',
             connector_file='openlibrary',
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index a741088a..1c3da301 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -135,6 +135,9 @@ urlpatterns = [
     re_path(r'^resolve-book/?$', views.resolve_book),
     re_path(r'^switch-edition/?$', views.switch_edition),
 
+    # isbn
+    re_path(r'^isbn/(?P<isbn>\d+)(.json)?/?$', views.Isbn.as_view()),
+
     # author
     re_path(r'^author/(?P<author_id>\d+)(.json)?/?$', views.Author.as_view()),
     re_path(r'^author/(?P<author_id>\d+)/edit/?$', views.EditAuthor.as_view()),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 2c7cdc46..dd601b28 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -31,3 +31,4 @@ from .site import Site
 from .status import CreateStatus, DeleteStatus
 from .updates import Updates
 from .user import User, EditUser, Followers, Following
+from .isbn import Isbn
diff --git a/bookwyrm/views/isbn.py b/bookwyrm/views/isbn.py
new file mode 100644
index 00000000..e5539ba3
--- /dev/null
+++ b/bookwyrm/views/isbn.py
@@ -0,0 +1,29 @@
+''' isbn search view '''
+from django.http import HttpResponseNotFound
+from django.http import JsonResponse
+from django.shortcuts import get_object_or_404, redirect
+from django.template.response import TemplateResponse
+from django.utils.decorators import method_decorator
+from django.views import View
+from django.views.decorators.http import require_POST
+
+from bookwyrm import forms, models
+from bookwyrm.connectors import connector_manager
+from .helpers import is_api_request
+
+# pylint: disable= no-self-use
+class Isbn(View):
+    ''' search a book by isbn '''
+    def get(self, request, isbn):
+        ''' info about a book '''
+        book_results = connector_manager.isbn_local_search(isbn)
+
+        if is_api_request(request):
+            return JsonResponse([r.json() for r in book_results], safe=False)
+
+        data = {
+            'title': 'ISBN Search Results',
+            'results': book_results,
+            'query': isbn,
+        }
+        return TemplateResponse(request, 'isbn_search_results.html', data)

From a52fee4ccfdd400ad07b2c291e8fb53462e8d486 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sat, 6 Mar 2021 21:18:39 +0100
Subject: [PATCH 0206/1285] Remove (potentially useful) unused CSS.

---
 bookwyrm/static/css/format.css | 32 --------------------------------
 1 file changed, 32 deletions(-)

diff --git a/bookwyrm/static/css/format.css b/bookwyrm/static/css/format.css
index 9badfaf0..435d8eb9 100644
--- a/bookwyrm/static/css/format.css
+++ b/bookwyrm/static/css/format.css
@@ -161,35 +161,3 @@ html {
     content: "\e905";
     right: 0;
 }
-
-/**
- * Accessibility (a11y)
- ============================================================================ */
-
-/**
- * Skip links
- *
- * @see https://webaim.org/styles/main.css
- ---------------------------------------------------------------------------- */
-.skip-link {
-    position: absolute;
-    opacity: 0;
-    z-index: 100;
-    padding: 6px;
-    border: 1px solid white;
-    color: white;
-    background: #BF1722;
-    transition: opacity 1s ease-out;
-}
-
-.skip-link:focus {
-    opacity: 1;
-    outline-color: transparent;
-    transition: opacity .1s ease-in;
-}
-
-@media (prefers-reduced-motion: reduce) {
-    .skip-link {
-        transition-duration: 0.001ms !important;
-    }
-}

From 9ed18a2b1d20f5c052d1331e30265fbf1f8e5a4e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 6 Mar 2021 13:11:44 -0800
Subject: [PATCH 0207/1285] Fixes display name showing up on user page

---
 bookwyrm/templates/user/user.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index cefaab99..52a91561 100644
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -1,7 +1,7 @@
 {% extends 'user/user_layout.html' %}
 {% load i18n %}
 
-{% block title %}{{ user.name }}{% endblock %}
+{% block title %}{{ user.display_name }}{% endblock %}
 
 {% block header %}
 <div class="columns is-mobile">

From 9536f0058af4eaebe8b9aa51c910c70164f2edaf Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 6 Mar 2021 13:43:20 -0800
Subject: [PATCH 0208/1285] Testing out a Black github action

---
 .github/workflows/black.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .github/workflows/black.yml

diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml
new file mode 100644
index 00000000..de770cce
--- /dev/null
+++ b/.github/workflows/black.yml
@@ -0,0 +1,13 @@
+name: Lint
+
+on: [push, pull_request]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+      - uses: psf/black@stable
+        with:
+          args: ". --check -l 80 -S"

From 09c5275ec41efb0a7467081e24b98668de7a299c Mon Sep 17 00:00:00 2001
From: erion <robjoy88@gmail.com>
Date: Sun, 7 Mar 2021 13:18:10 +0100
Subject: [PATCH 0209/1285] Fix typo.

---
 bookwyrm/templates/feed/status.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/feed/status.html b/bookwyrm/templates/feed/status.html
index fc92f855..9f90f355 100644
--- a/bookwyrm/templates/feed/status.html
+++ b/bookwyrm/templates/feed/status.html
@@ -4,7 +4,7 @@
 {% block panel %}
 <header class="block">
     <a href="/#feed" class="button" data-back>
-        <span class="icon icon-arrow-left" aira-hidden="true"></span>
+        <span class="icon icon-arrow-left" aria-hidden="true"></span>
         <span>{% trans "Back" %}</span>
     </a>
 </header>

From cb8ec01ccfff8ca71296226aea19f4050a5a12b8 Mon Sep 17 00:00:00 2001
From: erion <robjoy88@gmail.com>
Date: Sun, 7 Mar 2021 13:55:50 +0100
Subject: [PATCH 0210/1285] Indicate which page is the current.

---
 bookwyrm/templates/feed/feed.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html
index 1eae24d4..4eb363e4 100644
--- a/bookwyrm/templates/feed/feed.html
+++ b/bookwyrm/templates/feed/feed.html
@@ -6,13 +6,13 @@
 <h1 class="title">{% blocktrans %}{{ tab_title }} Timeline{% endblocktrans %}</h1>
 <div class="tabs">
     <ul>
-        <li class="{% if tab == 'home' %}is-active{% endif %}">
+        <li class="{% if tab == 'home' %}is-active{% endif %}"{% if tab == 'home' %} aria-current="page"{% endif %}>
             <a href="/#feed">{% trans "Home" %}</a>
         </li>
-        <li class="{% if tab == 'local' %}is-active{% endif %}">
+        <li class="{% if tab == 'local' %}is-active{% endif %}"{% if tab == 'local' %} aria-current="page"{% endif %}>
             <a href="/local#feed">{% trans "Local" %}</a>
         </li>
-        <li class="{% if tab == 'federated' %}is-active{% endif %}">
+        <li class="{% if tab == 'federated' %}is-active{% endif %}"{% if tab == 'federated' %} aria-current="page"{% endif %}>
             <a href="/federated#feed">{% trans "Federated" %}</a>
         </li>
     </ul>

From ae8d39995d514f62b2a83e1e401f3244dcb7938b Mon Sep 17 00:00:00 2001
From: erion <robjoy88@gmail.com>
Date: Sun, 7 Mar 2021 14:39:18 +0100
Subject: [PATCH 0211/1285] Hide avatar image to screen readers on the status
 pages, since there is a link present for a user already.

---
 bookwyrm/templates/snippets/avatar.html               | 2 +-
 bookwyrm/templates/snippets/status/status_header.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/snippets/avatar.html b/bookwyrm/templates/snippets/avatar.html
index ca49075c..6d27cd85 100644
--- a/bookwyrm/templates/snippets/avatar.html
+++ b/bookwyrm/templates/snippets/avatar.html
@@ -1,3 +1,3 @@
 {% load bookwyrm_tags %}
-<img class="avatar image {% if large %}is-96x96{% else %}is-32x32{% endif %}" src="{% if user.avatar %}/images/{{ user.avatar }}{% else %}/static/images/default_avi.jpg{% endif %}" alt="{{ user.alt_text }}">
+<img class="avatar image {% if large %}is-96x96{% else %}is-32x32{% endif %}" src="{% if user.avatar %}/images/{{ user.avatar }}{% else %}/static/images/default_avi.jpg{% endif %}" {% if ariaHide %}aria-hidden="true"{% endif %} alt="{{ user.alt_text }}">
 
diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html
index 2b941820..a9a8d72c 100644
--- a/bookwyrm/templates/snippets/status/status_header.html
+++ b/bookwyrm/templates/snippets/status/status_header.html
@@ -1,6 +1,6 @@
 {% load bookwyrm_tags %}
 {% load i18n %}
-{% include 'snippets/avatar.html' with user=status.user %}
+{% include 'snippets/avatar.html' with user=status.user ariaHide="true" %}
 {% include 'snippets/username.html' with user=status.user %}
 
 {% if status.status_type == 'GeneratedNote' %}

From 9082eefd8fd7073342af5116ac2432b82cb6a28d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 7 Mar 2021 07:08:19 -0800
Subject: [PATCH 0212/1285] Sets specific proportions for book page columns

---
 bookwyrm/templates/book.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html
index d80daca2..ec6c504a 100644
--- a/bookwyrm/templates/book.html
+++ b/bookwyrm/templates/book.html
@@ -35,7 +35,7 @@
     </div>
 
     <div class="columns">
-        <div class="column is-narrow">
+        <div class="column is-one-fifth">
             {% include 'snippets/book_cover.html' with book=book size=large %}
             {% include 'snippets/rate_action.html' with user=request.user book=book %}
             {% include 'snippets/shelve_button/shelve_button.html' %}
@@ -93,7 +93,7 @@
             </section>
         </div>
 
-        <div class="column">
+        <div class="column is-three-fifths">
             <div class="block">
                 <h3 class="field is-grouped">
                     {% include 'snippets/stars.html' with rating=rating %}
@@ -201,7 +201,7 @@
             </div>
 
         </div>
-        <div class="column is-narrow">
+        <div class="column is-one-fifth">
             {% if book.subjects %}
             <section class="content block">
                 <h2 class="title is-5">{% trans "Subjects" %}</h2>

From 9c94be8804b3bc7bcdb5c5bfbcb9bba83ffb4972 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 7 Mar 2021 07:35:38 -0800
Subject: [PATCH 0213/1285] Fixes typo in subject places block

---
 bookwyrm/templates/book.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html
index ec6c504a..c4cede2e 100644
--- a/bookwyrm/templates/book.html
+++ b/bookwyrm/templates/book.html
@@ -217,7 +217,7 @@
             <section class="content block">
                 <h2 class="title is-5">{% trans "Places" %}</h2>
                 <ul>
-                {% for place in book.subject_placess %}
+                {% for place in book.subject_places %}
                     <li>{{ place }}</li>
                 {% endfor %}
                 </ul>

From e5bdb4b9d1a9ef38ad49227362df28d1d9945099 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 7 Mar 2021 07:35:50 -0800
Subject: [PATCH 0214/1285] Make empty cover value null

---
 bookwyrm/activitypub/book.py       | 2 +-
 bookwyrm/tests/actions/__init__.py | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 bookwyrm/tests/actions/__init__.py

diff --git a/bookwyrm/activitypub/book.py b/bookwyrm/activitypub/book.py
index 87c40c90..8c32be96 100644
--- a/bookwyrm/activitypub/book.py
+++ b/bookwyrm/activitypub/book.py
@@ -26,7 +26,7 @@ class Book(ActivityObject):
     librarythingKey: str = ''
     goodreadsKey: str = ''
 
-    cover: Image = field(default_factory=lambda: {})
+    cover: Image = None
     type: str = 'Book'
 
 
diff --git a/bookwyrm/tests/actions/__init__.py b/bookwyrm/tests/actions/__init__.py
deleted file mode 100644
index b6e690fd..00000000
--- a/bookwyrm/tests/actions/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from . import *

From b895059f03f25a866cffde77d600c8a5cb8f3034 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 7 Mar 2021 07:42:02 -0800
Subject: [PATCH 0215/1285] Uses same alt text generation for books with no
 cover

---
 bookwyrm/templates/snippets/book_cover.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index 6d15b37f..92137853 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -6,8 +6,7 @@
     <div class="no-cover book-cover">
         <img class="book-cover" src="/static/images/no_cover.jpg" alt="No cover">
         <div>
-            <p>{{ book.title }}</p>
-            <p>({{ book.edition_info }})</p>
+            <p>{{ book.alt_text }}</p>
         </div>
     </div>
 {% endif %}

From dfecdca6f93bb4f52c4a7ac9f807041fab816495 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 7 Mar 2021 07:56:33 -0800
Subject: [PATCH 0216/1285] Fixes display of ratings

---
 bookwyrm/templates/book.html              | 4 ++--
 bookwyrm/templates/layout.html            | 2 +-
 bookwyrm/templates/snippets/username.html | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html
index c4cede2e..06578e89 100644
--- a/bookwyrm/templates/book.html
+++ b/bookwyrm/templates/book.html
@@ -254,8 +254,8 @@
                     <div>
                         {% include 'snippets/username.html' with user=rating.user %}
                     </div>
-                    <div class="field is-grouped mb-0">
-                        <div>{% trans "rated it" %}</div>
+                    <div class="is-flex">
+                        <p class="mr-1">{% trans "rated it" %}</p>
                         {% include 'snippets/stars.html' with rating=rating.rating %}
                     </div>
                     <div>
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index ee42b4f6..8a708f63 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -79,7 +79,7 @@
                     aria-controls="navbar-dropdown"
                 >
                     {% include 'snippets/avatar.html' with user=request.user %}
-                    {% include 'snippets/username.html' with user=request.user anchor=false %}
+                    <span class="ml-2">{% include 'snippets/username.html' with user=request.user anchor=false %}</span>
                 </a>
                 <ul class="navbar-dropdown" id="navbar-dropdown">
                     <li>
diff --git a/bookwyrm/templates/snippets/username.html b/bookwyrm/templates/snippets/username.html
index b004582d..561553db 100644
--- a/bookwyrm/templates/snippets/username.html
+++ b/bookwyrm/templates/snippets/username.html
@@ -1,9 +1,7 @@
 {% spaceless %}
 {% load bookwyrm_tags %}
 
-<{% if anchor %}a href="{{ user.local_path }}"{% else %}span{% endif %}
-    class="user ml-1"
->
+<{% if anchor %}a href="{{ user.local_path }}"{% else %}span{% endif %}>
     {{ user.display_name }}
 </a>
 

From 336a3769b604260dd7bce414a8170e2fff0a65ee Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 7 Mar 2021 08:03:28 -0800
Subject: [PATCH 0217/1285] Hide empty body on delete readthrough modal

---
 bookwyrm/templates/snippets/readthrough.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/readthrough.html b/bookwyrm/templates/snippets/readthrough.html
index edac21cf..82f6a088 100644
--- a/bookwyrm/templates/snippets/readthrough.html
+++ b/bookwyrm/templates/snippets/readthrough.html
@@ -67,4 +67,4 @@
         </div>
     </form>
 </div>
-{% include 'snippets/delete_readthrough_modal.html' with controls_text="delete-readthrough" controls_uid=readthrough.id %}
+{% include 'snippets/delete_readthrough_modal.html' with controls_text="delete-readthrough" controls_uid=readthrough.id no_body=True %}

From 5ddb3b810e800648d8607026d97bdad611cb4d65 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 7 Mar 2021 08:37:39 -0800
Subject: [PATCH 0218/1285] Don't show books lists when item isn't approved

---
 bookwyrm/views/books.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 4d6afba9..cf246446 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -89,7 +89,7 @@ class Book(View):
             'rating': reviews.aggregate(Avg('rating'))['rating__avg'],
             'tags':  models.UserTag.objects.filter(book=book),
             'lists': privacy_filter(
-                request.user, book.list_set.all()
+                request.user, book.list_set.filter(listitem__approved=True)
             ),
             'user_tags': user_tags,
             'user_shelves': user_shelves,

From a70264c12c71b1a08ee86d53da71480cc769c7a1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 7 Mar 2021 08:42:30 -0800
Subject: [PATCH 0219/1285] Fixes showing link to user lists

---
 bookwyrm/templates/snippets/status/status_header.html | 2 ++
 bookwyrm/templates/user/user_layout.html              | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html
index a9a8d72c..cecdddf6 100644
--- a/bookwyrm/templates/snippets/status/status_header.html
+++ b/bookwyrm/templates/snippets/status/status_header.html
@@ -1,7 +1,9 @@
 {% load bookwyrm_tags %}
 {% load i18n %}
+<a href="{{ status.user.local_path }}">
 {% include 'snippets/avatar.html' with user=status.user ariaHide="true" %}
 {% include 'snippets/username.html' with user=status.user %}
+</a>
 
 {% if status.status_type == 'GeneratedNote' %}
     {{ status.content | safe }}
diff --git a/bookwyrm/templates/user/user_layout.html b/bookwyrm/templates/user/user_layout.html
index d7629160..75dc61dc 100644
--- a/bookwyrm/templates/user/user_layout.html
+++ b/bookwyrm/templates/user/user_layout.html
@@ -56,7 +56,7 @@
             <a href="{{ url }}">{% trans "Reading Goal" %}</a>
         </li>
         {% endif %}
-        {% if is_self or user.lists.exists %}
+        {% if is_self or user.list_set.exists %}
         {% url 'user-lists' user|username as url %}
         <li{% if url in request.path %} class="is-active"{% endif %}>
             <a href="{{ url }}">{% trans "Lists" %}</a>

From ec92aff7930c4f4d2749d939c7c3704ce20fc7fe Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 7 Mar 2021 08:50:07 -0800
Subject: [PATCH 0220/1285] Clearer notification preview for generated notes

---
 bookwyrm/templates/notifications.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html
index 007e6b05..d27196ba 100644
--- a/bookwyrm/templates/notifications.html
+++ b/bookwyrm/templates/notifications.html
@@ -114,7 +114,9 @@
                         <div class="columns">
                             <div class="column">
                                 {% if related_status.content %}
-                                <a href="{{ related_status.local_path }}">{{ related_status.content | safe | truncatewords_html:10 }}</a>
+                                <a href="{{ related_status.local_path }}">
+                                    {{ related_status.content | safe | truncatewords_html:10 }}{% if related_status.mention_books %} <em>{{ related_status.mention_books.first.title }}</em>{% endif %}
+                                </a>
                                 {% elif related_status.quote %}
                                 <a href="{{ related_status.local_path }}">{{ related_status.quote | safe | truncatewords_html:10 }}</a>
                                 {% elif related_status.rating %}

From c0ccb7065c450f24ea67c2958603ddc90857c8b3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 7 Mar 2021 09:22:35 -0800
Subject: [PATCH 0221/1285] Safer federation of book data changes

Only broadcast to other BW instances, plus bonus error handling
---
 bookwyrm/models/activitypub_mixin.py | 2 +-
 bookwyrm/models/book.py              | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index bebe00d0..10015bf1 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -449,7 +449,7 @@ def broadcast_task(sender_id, activity, recipients):
     for recipient in recipients:
         try:
             sign_and_send(sender, activity, recipient)
-        except (HTTPError, SSLError) as e:
+        except (HTTPError, SSLError, ConnectionError) as e:
             logger.exception(e)
 
 
diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index 6a1a18b1..84bfbc6b 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -37,6 +37,10 @@ class BookDataModel(ObjectMixin, BookWyrmModel):
             self.remote_id = None
         return super().save(*args, **kwargs)
 
+    def broadcast(self, activity, sender, software='bookwyrm'):
+        ''' only send book data updates to other bookwyrm instances '''
+        super().broadcast(activity, sender, software=software)
+
 
 class Book(BookDataModel):
     ''' a generic book, which can mean either an edition or a work '''

From 71bbea83f97ca6cda270180aab940ab882687a7b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 7 Mar 2021 09:42:31 -0800
Subject: [PATCH 0222/1285] Adds discard check to favs

---
 bookwyrm/activitypub/base_activity.py | 2 +-
 bookwyrm/models/favorite.py           | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index 57f1a713..c732fe1d 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -102,7 +102,7 @@ class ActivityObject:
         if allow_create and \
                 hasattr(model, 'ignore_activity') and \
                 model.ignore_activity(self):
-            return None
+            raise ActivitySerializerError()
 
         # check for an existing instance
         instance = instance or model.find_existing(self.serialize())
diff --git a/bookwyrm/models/favorite.py b/bookwyrm/models/favorite.py
index f9019501..66befd80 100644
--- a/bookwyrm/models/favorite.py
+++ b/bookwyrm/models/favorite.py
@@ -17,6 +17,11 @@ class Favorite(ActivityMixin, BookWyrmModel):
 
     activity_serializer = activitypub.Like
 
+    @classmethod
+    def ignore_activity(cls, activity):
+        ''' don't bother with incoming favs of unknown statuses '''
+        return cls.objects.filter(remote_id=activity.object).exists()
+
     def save(self, *args, **kwargs):
         ''' update user active time '''
         self.user.last_active_date = timezone.now()

From 09b77e567f8dc886ed4a505a87d79141fbddc8d2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 7 Mar 2021 09:44:42 -0800
Subject: [PATCH 0223/1285] Check for invalid json before verifying signature

---
 bookwyrm/views/inbox.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/bookwyrm/views/inbox.py b/bookwyrm/views/inbox.py
index 4da4e5b6..46385093 100644
--- a/bookwyrm/views/inbox.py
+++ b/bookwyrm/views/inbox.py
@@ -20,7 +20,7 @@ class Inbox(View):
     ''' requests sent by outside servers'''
     def post(self, request, username=None):
         ''' only works as POST request '''
-        # first let's do some basic checks to see if this is legible
+        # make sure the user's inbox even exists
         if username:
             try:
                 models.User.objects.get(localname=username)
@@ -33,6 +33,11 @@ class Inbox(View):
         except json.decoder.JSONDecodeError:
             return HttpResponseBadRequest()
 
+        if not 'object' in activity_json or \
+                not 'type' in activity_json or \
+                not activity_json['type'] in activitypub.activity_objects:
+            return HttpResponseNotFound()
+
         # verify the signature
         if not has_valid_signature(request, activity_json):
             if activity_json['type'] == 'Delete':
@@ -42,12 +47,6 @@ class Inbox(View):
                 return HttpResponse()
             return HttpResponse(status=401)
 
-        # just some quick smell tests before we try to parse the json
-        if not 'object' in activity_json or \
-                not 'type' in activity_json or \
-                not activity_json['type'] in activitypub.activity_objects:
-            return HttpResponseNotFound()
-
         activity_task.delay(activity_json)
         return HttpResponse()
 
@@ -63,7 +62,11 @@ def activity_task(activity_json):
 
     # cool that worked, now we should do the action described by the type
     # (create, update, delete, etc)
-    activity.action()
+    try:
+        activity.action()
+    except activitypub.ActivitySerializerError:
+        # this is raised if the activity is discarded
+        return
 
 
 def has_valid_signature(request, activity):

From 47cf77145d19adb1ffc11364a8f45ec948ec8018 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 7 Mar 2021 09:45:02 -0800
Subject: [PATCH 0224/1285] Updates tests for inbox tweaks

---
 bookwyrm/models/favorite.py        |  2 +-
 bookwyrm/tests/views/test_inbox.py | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/models/favorite.py b/bookwyrm/models/favorite.py
index 66befd80..de500e51 100644
--- a/bookwyrm/models/favorite.py
+++ b/bookwyrm/models/favorite.py
@@ -20,7 +20,7 @@ class Favorite(ActivityMixin, BookWyrmModel):
     @classmethod
     def ignore_activity(cls, activity):
         ''' don't bother with incoming favs of unknown statuses '''
-        return cls.objects.filter(remote_id=activity.object).exists()
+        return not cls.objects.filter(remote_id=activity.object).exists()
 
     def save(self, *args, **kwargs):
         ''' update user active time '''
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index ff55ad04..b0bd3e42 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -74,7 +74,7 @@ class Inbox(TestCase):
             mock_valid.return_value = False
             result = self.client.post(
                 '/user/mouse/inbox',
-                '{"type": "Test", "object": "exists"}',
+                '{"type": "Announce", "object": "exists"}',
                 content_type="application/json"
             )
             self.assertEqual(result.status_code, 401)
@@ -494,6 +494,21 @@ class Inbox(TestCase):
         self.assertEqual(fav.remote_id, 'https://example.com/fav/1')
         self.assertEqual(fav.user, self.remote_user)
 
+    def test_ignore_favorite(self):
+        ''' don't try to save an unknown status '''
+        activity = {
+            '@context': 'https://www.w3.org/ns/activitystreams',
+            'id': 'https://example.com/fav/1',
+            'actor': 'https://example.com/users/rat',
+            'type': 'Like',
+            'published': 'Mon, 25 May 2020 19:31:20 GMT',
+            'object': 'https://unknown.status/not-found',
+        }
+
+        views.inbox.activity_task(activity)
+
+        self.assertFalse(models.Favorite.objects.exists())
+
     def test_handle_unfavorite(self):
         ''' fav a status '''
         activity = {

From 0bd27928e4d0641738a7fffe0b6d51e73e26b8e7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 7 Mar 2021 10:24:46 -0800
Subject: [PATCH 0225/1285] Removes username snippet

---
 bookwyrm/templates/book.html                       |  2 +-
 bookwyrm/templates/layout.html                     |  2 +-
 bookwyrm/templates/lists/created_text.html         | 10 ++++++++++
 bookwyrm/templates/lists/curate.html               |  2 +-
 bookwyrm/templates/lists/list_items.html           |  5 +++--
 bookwyrm/templates/lists/list_layout.html          |  5 +++--
 bookwyrm/templates/notifications.html              |  6 ++++--
 bookwyrm/templates/preferences/blocks.html         |  2 +-
 bookwyrm/templates/search_results.html             |  6 ++++--
 bookwyrm/templates/snippets/status/status.html     |  6 ++++--
 .../templates/snippets/status/status_header.html   | 14 ++++++++++++--
 bookwyrm/templates/snippets/username.html          | 13 -------------
 bookwyrm/templates/user/followers.html             | 13 ++++++++-----
 bookwyrm/templates/user/following.html             |  7 +++++--
 bookwyrm/templates/user/user_layout.html           |  2 +-
 15 files changed, 58 insertions(+), 37 deletions(-)
 create mode 100644 bookwyrm/templates/lists/created_text.html
 delete mode 100644 bookwyrm/templates/snippets/username.html

diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html
index 06578e89..16bf1197 100644
--- a/bookwyrm/templates/book.html
+++ b/bookwyrm/templates/book.html
@@ -252,7 +252,7 @@
                 <div class="media-left">{% include 'snippets/avatar.html' with user=rating.user %}</div>
                 <div class="media-content">
                     <div>
-                        {% include 'snippets/username.html' with user=rating.user %}
+                        <a href="{{ rating.user.local_path }}">{{ rating.user.display_name }}</a>
                     </div>
                     <div class="is-flex">
                         <p class="mr-1">{% trans "rated it" %}</p>
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 8a708f63..377acb6c 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -79,7 +79,7 @@
                     aria-controls="navbar-dropdown"
                 >
                     {% include 'snippets/avatar.html' with user=request.user %}
-                    <span class="ml-2">{% include 'snippets/username.html' with user=request.user anchor=false %}</span>
+                    <span class="ml-2">{{ user.display_name }}</span>
                 </a>
                 <ul class="navbar-dropdown" id="navbar-dropdown">
                     <li>
diff --git a/bookwyrm/templates/lists/created_text.html b/bookwyrm/templates/lists/created_text.html
new file mode 100644
index 00000000..eee5a75f
--- /dev/null
+++ b/bookwyrm/templates/lists/created_text.html
@@ -0,0 +1,10 @@
+{% load i18n %}
+{% spaceless %}
+
+{% if list.curation != 'open' %}
+{% blocktrans with username=list.user.display_name path=list.user.local_path %}Created and curated by <a href="{{ path }}">{{ username }}</a>{% endblocktrans %}
+{% else %}
+{% blocktrans with username=list.user.display_name path=list.user.local_path %}Created by <a href="{{ path }}">{{ username }}</a>{% endblocktrans %}
+{% endif %}
+
+{% endspaceless %}
diff --git a/bookwyrm/templates/lists/curate.html b/bookwyrm/templates/lists/curate.html
index a040dd5f..f4ee147a 100644
--- a/bookwyrm/templates/lists/curate.html
+++ b/bookwyrm/templates/lists/curate.html
@@ -24,7 +24,7 @@
                 {% include 'snippets/book_titleby.html' with book=item.book %}
             </td>
             <td>
-                {% include 'snippets/username.html' with user=item.user %}
+                <a href="{{ item.user.local_path }}">{{ item.user.display_name }}</a>
             </td>
             <td>
                 <div class="field has-addons">
diff --git a/bookwyrm/templates/lists/list_items.html b/bookwyrm/templates/lists/list_items.html
index 646a910f..04e7f014 100644
--- a/bookwyrm/templates/lists/list_items.html
+++ b/bookwyrm/templates/lists/list_items.html
@@ -1,5 +1,4 @@
 {% load bookwyrm_tags %}
-{% load i18n %}
 <div class="columns is-multiline">
     {% for list in lists %}
     <div class="column is-one-quarter">
@@ -16,7 +15,9 @@
             </div>
             <div class="card-content is-flex-grow-0">
                 {% if list.description %}{{ list.description | to_markdown | safe | truncatewords_html:20 }}{% endif %}
-                <p class="subtitle help">{% if list.curation != 'open' %}{% trans "Created and curated by" %}{% else %}{% trans "Created by" %}{% endif %} {% include 'snippets/username.html' with user=list.user %}</p>
+                <p class="subtitle help">
+                    {% include 'lists/created_text.html' with list=list %}
+                </p>
             </div>
         </div>
     </div>
diff --git a/bookwyrm/templates/lists/list_layout.html b/bookwyrm/templates/lists/list_layout.html
index 907f81f7..c0899c84 100644
--- a/bookwyrm/templates/lists/list_layout.html
+++ b/bookwyrm/templates/lists/list_layout.html
@@ -8,8 +8,9 @@
 <header class="columns content is-mobile">
     <div class="column">
         <h1 class="title">{{ list.name }} <span class="subtitle">{% include 'snippets/privacy-icons.html' with item=list %}</span></h1>
-        <p class="subtitle help">{% if list.curation != 'open' %}{% trans "Created and curated by" %}{% else %}{% trans "Created by" %} {% include 'snippets/username.html' with user=list.user %}</p>
-        {% endif %}
+        <p class="subtitle help">
+            {% include 'lists/created_text.html' with list=list %}
+        </p>
         {% include 'snippets/trimmed_text.html' with full=list.description %}
     </div>
     {% if request.user == list.user %}
diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html
index d27196ba..80ee2250 100644
--- a/bookwyrm/templates/notifications.html
+++ b/bookwyrm/templates/notifications.html
@@ -42,8 +42,10 @@
                     <p>
                         {# DESCRIPTION #}
                         {% if notification.related_user %}
-                            {% include 'snippets/avatar.html' with user=notification.related_user %}
-                            {% include 'snippets/username.html' with user=notification.related_user %}
+                            <a href="{{ notification.related_user.local_path }}">
+                                {% include 'snippets/avatar.html' with user=notification.related_user %}
+                                {{ notification.related_user.display_name }}
+                            </a>
                             {% if notification.notification_type == 'FAVORITE' %}
                                 {% if related_status.status_type == 'Review' %}
                                 {% blocktrans with book_title=related_status.book.title related_path=related_status.local_path %}favorited your <a href="{{ related_path }}">review of <em>{{ book_title }}</em></a>{% endblocktrans %}
diff --git a/bookwyrm/templates/preferences/blocks.html b/bookwyrm/templates/preferences/blocks.html
index 9cba06bf..72d4abd4 100644
--- a/bookwyrm/templates/preferences/blocks.html
+++ b/bookwyrm/templates/preferences/blocks.html
@@ -15,7 +15,7 @@
 {% for user in request.user.blocks.all %}
     <li class="is-flex">
         <p>
-            {% include 'snippets/avatar.html' with user=user %} {% include 'snippets/username.html' with user=user %}
+            <a href="{{ user.local_path }}">{% include 'snippets/avatar.html' with user=user %} {{ user.display_name }}</a>
         </p>
         <p class="mr-2">
             {% include 'snippets/block_button.html' with user=user %}
diff --git a/bookwyrm/templates/search_results.html b/bookwyrm/templates/search_results.html
index 8bbb7af2..4e8481f0 100644
--- a/bookwyrm/templates/search_results.html
+++ b/bookwyrm/templates/search_results.html
@@ -79,8 +79,10 @@
             <ul>
             {% for result in user_results %}
                 <li class="block">
-                    {% include 'snippets/avatar.html' with user=result %}</h2>
-                    {% include 'snippets/username.html' with user=result show_full=True %}</h2>
+                    <a href="{{ result.local_path }}">
+                        {% include 'snippets/avatar.html' with user=result %}
+                        {{ result.display_name }}
+                    </a> ({{ result.username }})
                     {% include 'snippets/follow_button.html' with user=result %}
                 </li>
             {% endfor %}
diff --git a/bookwyrm/templates/snippets/status/status.html b/bookwyrm/templates/snippets/status/status.html
index e9ef1380..50d3414d 100644
--- a/bookwyrm/templates/snippets/status/status.html
+++ b/bookwyrm/templates/snippets/status/status.html
@@ -2,8 +2,10 @@
 {% load i18n %}
 {% if not status.deleted %}
     {% if status.status_type == 'Announce' %}
-        {% include 'snippets/avatar.html' with user=status.user %}
-        {% include 'snippets/username.html' with user=status.user %}
+        <a href="{{ status.user.local_path }}">
+            {% include 'snippets/avatar.html' with user=status.user %}
+            {{ user.display_name }}
+        </a>
         {% trans "boosted" %}
         {% include 'snippets/status/status_body.html' with status=status|boosted_status %}
     {% else %}
diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html
index cecdddf6..09c011e4 100644
--- a/bookwyrm/templates/snippets/status/status_header.html
+++ b/bookwyrm/templates/snippets/status/status_header.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 <a href="{{ status.user.local_path }}">
 {% include 'snippets/avatar.html' with user=status.user ariaHide="true" %}
-{% include 'snippets/username.html' with user=status.user %}
+{{ status.user.display_name }}
 </a>
 
 {% if status.status_type == 'GeneratedNote' %}
@@ -17,7 +17,17 @@
     {% trans "quoted" %}
 {% elif status.reply_parent %}
     {% with parent_status=status|parent %}
-    replied to {% include 'snippets/username.html' with user=parent_status.user possessive=True %} <a href="{{parent_status.remote_id }}">{% if parent_status.status_type == 'GeneratedNote' %}update{% else %}{{ parent_status.status_type | lower }}{% endif %}</a>
+
+    {% if parent_status.status_type == 'Review' %}
+    {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to <a href="{{ user_path }}">{{ username}}'s</a> <a href="{{ status_path }}">review</a>{% endblocktrans %}
+    {% elif parent_status.status_type == 'Comment' %}
+    {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to <a href="{{ user_path }}">{{ username}}'s</a> <a href="{{ status_path }}">comment</a>{% endblocktrans %}
+    {% elif parent_status.status_type == 'Quotation' %}
+    {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to <a href="{{ user_path }}">{{ username}}'s</a> <a href="{{ status_path }}">quote</a>{% endblocktrans %}
+    {% else %}
+    {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to <a href="{{ user_path }}">{{ username}}'s</a> <a href="{{ status_path }}">status</a>{% endblocktrans %}
+    {% endif %}
+
     {% endwith %}
 {% endif %}
 {% if status.book %}
diff --git a/bookwyrm/templates/snippets/username.html b/bookwyrm/templates/snippets/username.html
deleted file mode 100644
index 561553db..00000000
--- a/bookwyrm/templates/snippets/username.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% spaceless %}
-{% load bookwyrm_tags %}
-
-<{% if anchor %}a href="{{ user.local_path }}"{% else %}span{% endif %}>
-    {{ user.display_name }}
-</a>
-
-{% if possessive %}'s{% endif %}
-
-{% if show_full and user.name or show_full and user.localname %}
- ({{ user.username }})
-{% endif %}
-{% endspaceless %}
diff --git a/bookwyrm/templates/user/followers.html b/bookwyrm/templates/user/followers.html
index 302bb8a3..45d87a3d 100644
--- a/bookwyrm/templates/user/followers.html
+++ b/bookwyrm/templates/user/followers.html
@@ -11,19 +11,22 @@
 {% block panel %}
 <div class="block">
     <h2 class="title">{% trans "Followers" %}</h2>
-    {% for followers in followers %}
+    {% for follower in followers %}
     <div class="block columns">
         <div class="column">
-            {% include 'snippets/avatar.html' with user=followers %}
-            {% include 'snippets/username.html' with user=followers show_full=True  %}
+            <a href="{{ follower.local_path }}">
+                {% include 'snippets/avatar.html' with user=follower %}
+                {{ follower.display_name }}
+            </a>
+            ({{ follower.username }})
         </div>
         <div class="column is-narrow">
-            {% include 'snippets/follow_button.html' with user=followers %}
+            {% include 'snippets/follow_button.html' with user=follower %}
         </div>
     </div>
     {% endfor %}
     {% if not followers.count %}
-    <div>{% blocktrans with username=user|username %}{{ username }} has no followers{% endblocktrans %}</div>
+    <div>{% blocktrans with username=user.display_name %}{{ username }} has no followers{% endblocktrans %}</div>
     {% endif %}
 </div>
 {% endblock %}
diff --git a/bookwyrm/templates/user/following.html b/bookwyrm/templates/user/following.html
index c565cd16..5904c1bb 100644
--- a/bookwyrm/templates/user/following.html
+++ b/bookwyrm/templates/user/following.html
@@ -14,8 +14,11 @@
     {% for follower in user.following.all %}
     <div class="block columns">
         <div class="column">
-            {% include 'snippets/avatar.html' with user=follower %}
-            {% include 'snippets/username.html' with user=follower show_full=True  %}
+            <a href="{{ follower.local_path }}">
+                {% include 'snippets/avatar.html' with user=follower %}
+                {{ follower.display_name }}
+            </a>
+            ({{ follower.username }})
         </div>
         <div class="column">
             {% include 'snippets/follow_button.html' with user=follower %}
diff --git a/bookwyrm/templates/user/user_layout.html b/bookwyrm/templates/user/user_layout.html
index 75dc61dc..d60db2a0 100644
--- a/bookwyrm/templates/user/user_layout.html
+++ b/bookwyrm/templates/user/user_layout.html
@@ -33,7 +33,7 @@
         {% for requester in user.follower_requests.all %}
             <div class="row shrink">
                 <p>
-                    {% include 'snippets/username.html' with user=requester show_full=True %}
+                    <a href="{{ requester.local_path }}">{{ requester.display_name }}</a> ({{ requester.username }})
                 </p>
                 {% include 'snippets/follow_request_buttons.html' with user=requester %}
             </div>

From 4d8f98705c28c00a2ace393b0f0fbed4d74dbc35 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 7 Mar 2021 11:42:06 -0800
Subject: [PATCH 0226/1285] re-builds messages

---
 locale/de_DE/LC_MESSAGES/django.mo | Bin 24221 -> 24289 bytes
 locale/de_DE/LC_MESSAGES/django.po | 189 +++++++++++++++++------------
 locale/en_US/LC_MESSAGES/django.po | 173 +++++++++++++++-----------
 locale/es/LC_MESSAGES/django.mo    | Bin 27447 -> 27379 bytes
 locale/es/LC_MESSAGES/django.po    | 178 ++++++++++++++++-----------
 locale/fr_FR/LC_MESSAGES/django.mo | Bin 25500 -> 25397 bytes
 locale/fr_FR/LC_MESSAGES/django.po | 174 +++++++++++++++-----------
 locale/zh_CN/LC_MESSAGES/django.mo | Bin 24014 -> 23894 bytes
 locale/zh_CN/LC_MESSAGES/django.po | 177 ++++++++++++++++-----------
 9 files changed, 536 insertions(+), 355 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo
index b6d454f671e73fcbb0ed77ef4250924023819690..16e093c62b5eccc153e7c26a85b6dbb4eb95839d 100644
GIT binary patch
delta 7589
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
Q1Q#~wJS94Gp!Med2MEs|4FCWD

delta 7563
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
D&0r|8

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 7b3a4252..44f51f47 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-04 22:24+0000\n"
+"POT-Creation-Date: 2021-03-07 18:25+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"
@@ -56,10 +56,8 @@ msgid "%(value)s is not a valid username"
 msgstr "%(value)s ist kein gültiger Username"
 
 #: bookwyrm/models/fields.py:164 bookwyrm/templates/layout.html:152
-#, fuzzy
-#| msgid "Server name"
 msgid "username"
-msgstr "Servername"
+msgstr "Username"
 
 #: bookwyrm/models/fields.py:169
 msgid "A user with that username already exists."
@@ -131,16 +129,12 @@ msgid "ASIN:"
 msgstr ""
 
 #: bookwyrm/templates/book.html:84
-#, fuzzy, python-format
-#| msgid "of %(book.pages)s pages"
 msgid "%(format)s, %(pages)s pages"
-msgstr "von %(book.pages)s Seiten"
+msgstr "%(format)s, %(book.pages)s Seiten"
 
 #: bookwyrm/templates/book.html:86
-#, fuzzy, python-format
-#| msgid "of %(book.pages)s pages"
 msgid "%(pages)s pages"
-msgstr "von %(book.pages)s Seiten"
+msgstr "%(book.pages)s Seiten"
 
 #: bookwyrm/templates/book.html:91
 msgid "View on OpenLibrary"
@@ -236,7 +230,7 @@ msgstr "Orte"
 
 #: bookwyrm/templates/book.html:229 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
-#: bookwyrm/templates/search_results.html:90
+#: bookwyrm/templates/search_results.html:92
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listen"
@@ -601,35 +595,40 @@ msgstr "(Aktualisiere für ein Update!)"
 msgid "Failed to load"
 msgstr "Laden fehlgeschlagen"
 
-#: bookwyrm/templates/import_status.html:59
+#: bookwyrm/templates/import_status.html:44
+#, python-format
+msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:79
 msgid "Select all"
 msgstr "Alle auswählen"
 
-#: bookwyrm/templates/import_status.html:62
+#: bookwyrm/templates/import_status.html:82
 msgid "Retry items"
 msgstr "Punkte erneut versuchen"
 
-#: bookwyrm/templates/import_status.html:84
+#: bookwyrm/templates/import_status.html:108
 msgid "Successfully imported"
 msgstr "Erfolgreich importiert"
 
-#: bookwyrm/templates/import_status.html:88
+#: bookwyrm/templates/import_status.html:112
 #: bookwyrm/templates/lists/curate.html:14
 msgid "Book"
 msgstr "Buch"
 
-#: bookwyrm/templates/import_status.html:91
+#: bookwyrm/templates/import_status.html:115
 #: bookwyrm/templates/snippets/create_status_form.html:10
 #: bookwyrm/templates/snippets/shelf.html:10
 msgid "Title"
 msgstr "Titel"
 
-#: bookwyrm/templates/import_status.html:94
+#: bookwyrm/templates/import_status.html:118
 #: bookwyrm/templates/snippets/shelf.html:11
 msgid "Author"
 msgstr "Autor*in"
 
-#: bookwyrm/templates/import_status.html:117
+#: bookwyrm/templates/import_status.html:141
 msgid "Imported"
 msgstr "Importiert"
 
@@ -646,6 +645,28 @@ msgstr "Zugiff verweigert"
 msgid "Sorry! This invite code is no longer valid."
 msgstr "Sorry! Dieser Einladecode ist mehr gültig."
 
+#: bookwyrm/templates/isbn_search_results.html:4
+#: bookwyrm/templates/search_results.html:4
+msgid "Search Results"
+msgstr "Suchergebnisse"
+
+#: bookwyrm/templates/isbn_search_results.html:9
+#: bookwyrm/templates/search_results.html:9
+#, python-format
+msgid "Search Results for \"%(query)s\""
+msgstr "Suchergebnisse für \"%(query)s\""
+
+#: bookwyrm/templates/isbn_search_results.html:14
+#: bookwyrm/templates/search_results.html:14
+msgid "Matching Books"
+msgstr "Passende Bücher"
+
+#: bookwyrm/templates/isbn_search_results.html:17
+#: bookwyrm/templates/search_results.html:17
+#, python-format
+msgid "No books found for \"%(query)s\""
+msgstr "Keine Bücher für \"%(query)s\" gefunden"
+
 #: bookwyrm/templates/layout.html:33
 msgid "Search for a book or user"
 msgstr "Suche nach Buch oder Benutzer*in"
@@ -741,6 +762,18 @@ msgstr "BookWyrm ist open source Software. Du kannst dich auf <a href=\"https://
 msgid "Create List"
 msgstr "Liste erstellen"
 
+#: bookwyrm/templates/lists/created_text.html:5
+#, fuzzy, python-format
+#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+msgid "Created and curated by <a href=\"%(path)s\">%(username)s</a>"
+msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
+
+#: bookwyrm/templates/lists/created_text.html:7
+#, fuzzy, python-format
+#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
+msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
+
 #: bookwyrm/templates/lists/curate.html:6
 msgid "Pending Books"
 msgstr "Unbestätigte Bücher"
@@ -766,7 +799,7 @@ msgid "Discard"
 msgstr "Ablehnen"
 
 #: bookwyrm/templates/lists/edit_form.html:5
-#: bookwyrm/templates/lists/list_layout.html:17
+#: bookwyrm/templates/lists/list_layout.html:18
 msgid "Edit List"
 msgstr "Liste bearbeiten"
 
@@ -845,16 +878,6 @@ msgstr "Keine Bücher gefunden"
 msgid "Suggest"
 msgstr "Vorschlagen"
 
-#: bookwyrm/templates/lists/list_items.html:19
-#: bookwyrm/templates/lists/list_layout.html:11
-msgid "Created and curated by"
-msgstr "Erstellt und kuratiert von"
-
-#: bookwyrm/templates/lists/list_items.html:19
-#: bookwyrm/templates/lists/list_layout.html:11
-msgid "Created by"
-msgstr "Erstellt von"
-
 #: bookwyrm/templates/lists/lists.html:14
 msgid "Your lists"
 msgstr "Deine Listen"
@@ -898,110 +921,110 @@ msgstr "Die Seite die du angefordert hast scheint nicht zu existieren!"
 msgid "Delete notifications"
 msgstr "Benachrichtigungen löschen"
 
-#: bookwyrm/templates/notifications.html:49
+#: bookwyrm/templates/notifications.html:51
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "hat deine <a href=\"%(related_path)s\">Bewertung von <em>%(book_title)s</em></a> favorisiert"
 
-#: bookwyrm/templates/notifications.html:51
+#: bookwyrm/templates/notifications.html:53
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "hat deinen <a href=\"%(related_path)s\">Kommentar zu <em>%(book_title)s</em></a> favorisiert"
 
-#: bookwyrm/templates/notifications.html:53
+#: bookwyrm/templates/notifications.html:55
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr " hat dein <a href=\"%(related_path)s\">Zitat aus <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:55
+#: bookwyrm/templates/notifications.html:57
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">status</a>"
 msgstr "hat deinen <a href=\"%(related_path)s\">Status</a> favorisiert"
 
-#: bookwyrm/templates/notifications.html:60
+#: bookwyrm/templates/notifications.html:62
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "hat dich in einer <a href=\"%(related_path)s\">Bewertung von <em>%(book_title)s</em></a> erwähnt"
 
-#: bookwyrm/templates/notifications.html:62
+#: bookwyrm/templates/notifications.html:64
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "hat dich in einem <a href=\"%(related_path)s\">Kommentar zu <em>%(book_title)s</em></a> erwähnt"
 
-#: bookwyrm/templates/notifications.html:64
+#: bookwyrm/templates/notifications.html:66
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "hat dich in einem <a href=\"%(related_path)s\">Zitat von <em>%(book_title)s</em></a> erwähnt"
 
-#: bookwyrm/templates/notifications.html:66
+#: bookwyrm/templates/notifications.html:68
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">status</a>"
 msgstr "hat dich in einem <a href=\"%(related_path)s\">Status</a> erwähnt"
 
-#: bookwyrm/templates/notifications.html:71
+#: bookwyrm/templates/notifications.html:73
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "hat auf deine <a href=\"%(parent_path)s\">Bewertung von <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a> "
 
-#: bookwyrm/templates/notifications.html:73
+#: bookwyrm/templates/notifications.html:75
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "hat auf deinen <a href=\"%(parent_path)s\">Kommentar zu <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a>"
 
-#: bookwyrm/templates/notifications.html:75
+#: bookwyrm/templates/notifications.html:77
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "hat auf dein <a href=\"%(parent_path)s\">Zitat aus <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a>"
 
-#: bookwyrm/templates/notifications.html:77
+#: bookwyrm/templates/notifications.html:79
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgstr "hat auf deinen <a href=\"%(parent_path)s\">Status</a> <a href=\"%(related_path)s\">geantwortet</a>"
 
-#: bookwyrm/templates/notifications.html:81
+#: bookwyrm/templates/notifications.html:83
 msgid "followed you"
 msgstr "folgt dir"
 
-#: bookwyrm/templates/notifications.html:84
+#: bookwyrm/templates/notifications.html:86
 msgid "sent you a follow request"
 msgstr "hat dir eine Folgeanfrage geschickt"
 
-#: bookwyrm/templates/notifications.html:90
+#: bookwyrm/templates/notifications.html:92
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "hat deine <a href=\"%(related_path)s\">Bewertung von <em>%(book_title)s</em></a> geteilt"
 
-#: bookwyrm/templates/notifications.html:92
+#: bookwyrm/templates/notifications.html:94
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
 msgstr "hat deinen <a href=\"%(related_path)s\">Kommentar zu<em>%(book_title)s</em></a> geteilt"
 
-#: bookwyrm/templates/notifications.html:94
+#: bookwyrm/templates/notifications.html:96
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "hat dein <a href=\"%(related_path)s\">Zitat aus <em>%(book_title)s</em></a> geteilt"
 
-#: bookwyrm/templates/notifications.html:96
+#: bookwyrm/templates/notifications.html:98
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">status</a>"
 msgstr "hat deinen <a href=\"%(related_path)s\">Status</a> geteilt"
 
-#: bookwyrm/templates/notifications.html:100
+#: bookwyrm/templates/notifications.html:102
 #, python-format
 msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 msgstr "hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> zu deiner Liste \"<a href=\"%(list_path)s\">%(list_name)s</a>\" Hinzugefügt"
 
-#: bookwyrm/templates/notifications.html:102
+#: bookwyrm/templates/notifications.html:104
 #, python-format
 msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 msgstr "hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> für deine Liste \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\" vorgeschlagen"
 
-#: bookwyrm/templates/notifications.html:106
+#: bookwyrm/templates/notifications.html:108
 #, python-format
 msgid " your <a href=\"/import/%(related_id)s\">import</a> completed."
 msgstr " dein <a href=\"/import/%(related_id)s\">Import</a> ist abgeschlossen."
 
-#: bookwyrm/templates/notifications.html:138
+#: bookwyrm/templates/notifications.html:142
 msgid "You're all caught up!"
 msgstr "Du bist auf dem neusten Stand!"
 
@@ -1085,24 +1108,6 @@ msgstr ""
 msgid "Relationships"
 msgstr "Beziehungen"
 
-#: bookwyrm/templates/search_results.html:4
-msgid "Search Results"
-msgstr "Suchergebnisse"
-
-#: bookwyrm/templates/search_results.html:9
-#, python-format
-msgid "Search Results for \"%(query)s\""
-msgstr "Suchergebnisse für \"%(query)s\""
-
-#: bookwyrm/templates/search_results.html:14
-msgid "Matching Books"
-msgstr "Passende Bücher"
-
-#: bookwyrm/templates/search_results.html:17
-#, python-format
-msgid "No books found for \"%(query)s\""
-msgstr "Keine Bücher für \"%(query)s\" gefunden"
-
 #: bookwyrm/templates/search_results.html:33
 msgid "Didn't find what you were looking for?"
 msgstr "Nicht gefunden, wonach du gesucht hast?"
@@ -1128,7 +1133,7 @@ msgstr "Passende Nutzer*innen"
 msgid "No users found for \"%(query)s\""
 msgstr "Keine Nutzer*innen für \"%(query)s\" gefunden"
 
-#: bookwyrm/templates/search_results.html:92
+#: bookwyrm/templates/search_results.html:94
 #, python-format
 msgid "No lists found for \"%(query)s\""
 msgstr "Keine Liste für \"%(query)s\" gefunden"
@@ -1561,22 +1566,22 @@ msgid "Sign Up"
 msgstr "Registrieren"
 
 #: bookwyrm/templates/snippets/rss_title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:9
+#: bookwyrm/templates/snippets/status/status_header.html:11
 msgid "rated"
 msgstr ""
 
 #: bookwyrm/templates/snippets/rss_title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:11
+#: bookwyrm/templates/snippets/status/status_header.html:13
 msgid "reviewed"
 msgstr "bewertet"
 
 #: bookwyrm/templates/snippets/rss_title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:13
+#: bookwyrm/templates/snippets/status/status_header.html:15
 msgid "commented on"
 msgstr "kommentiert zu"
 
 #: bookwyrm/templates/snippets/rss_title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:15
+#: bookwyrm/templates/snippets/status/status_header.html:17
 msgid "quoted"
 msgstr "zitiert"
 
@@ -1657,7 +1662,7 @@ msgstr "\"<em>%(book_title)s</em>\" beginnen"
 msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgstr "\"<em>%(book_title)s</em>\" auf Leseliste setzen"
 
-#: bookwyrm/templates/snippets/status/status.html:7
+#: bookwyrm/templates/snippets/status/status.html:9
 msgid "boosted"
 msgstr "geteilt"
 
@@ -1681,6 +1686,30 @@ msgstr "Weniger anzeigen"
 msgid "Open image in new window"
 msgstr "Bild in neuem Fenster öffnen"
 
+#: bookwyrm/templates/snippets/status/status_header.html:22
+#, fuzzy, python-format
+#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">review</a>"
+msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
+
+#: bookwyrm/templates/snippets/status/status_header.html:24
+#, fuzzy, python-format
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
+msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">comment</a>"
+msgstr "hat auf deinen <a href=\"%(parent_path)s\">Status</a> geantwortet</a>"
+
+#: bookwyrm/templates/snippets/status/status_header.html:26
+#, fuzzy, python-format
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
+msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">quote</a>"
+msgstr "hat auf deinen <a href=\"%(parent_path)s\">Status</a> <a href=\"%(related_path)s\">geantwortet</a>"
+
+#: bookwyrm/templates/snippets/status/status_header.html:28
+#, fuzzy, python-format
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
+msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
+msgstr "hat auf deinen <a href=\"%(parent_path)s\">Status</a> <a href=\"%(related_path)s\">geantwortet</a>"
+
 #: bookwyrm/templates/snippets/status/status_options.html:7
 #: bookwyrm/templates/snippets/user_options.html:7
 msgid "More options"
@@ -1726,7 +1755,7 @@ msgstr "Regal aktualisieren"
 msgid "User Profile"
 msgstr "Benutzerprofil"
 
-#: bookwyrm/templates/user/followers.html:26
+#: bookwyrm/templates/user/followers.html:29
 #, python-format
 msgid "%(username)s has no followers"
 msgstr "niemand folgt %(username)s "
@@ -1735,7 +1764,7 @@ msgstr "niemand folgt %(username)s "
 msgid "Following"
 msgstr "Folgend"
 
-#: bookwyrm/templates/user/following.html:26
+#: bookwyrm/templates/user/following.html:29
 #, python-format
 msgid "%(username)s isn't following any users"
 msgstr "%(username)s folgt niemandem"
@@ -1835,6 +1864,12 @@ msgstr[1] "%(counter)s Folgende"
 msgid "%(counter)s following"
 msgstr "%(counter)s folgen"
 
+#~ msgid "Created and curated by"
+#~ msgstr "Erstellt und kuratiert von"
+
+#~ msgid "Created by"
+#~ msgstr "Erstellt von"
+
 #~ msgid "Added by"
 #~ msgstr "Hinzugefügt von"
 
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index bf9b8a92..081d38df 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-04 22:24+0000\n"
+"POT-Creation-Date: 2021-03-07 18:25+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"
@@ -227,7 +227,7 @@ msgstr ""
 
 #: bookwyrm/templates/book.html:229 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
-#: bookwyrm/templates/search_results.html:90
+#: bookwyrm/templates/search_results.html:92
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr ""
@@ -588,35 +588,40 @@ msgstr ""
 msgid "Failed to load"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:59
+#: bookwyrm/templates/import_status.html:44
+#, python-format
+msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:79
 msgid "Select all"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:62
+#: bookwyrm/templates/import_status.html:82
 msgid "Retry items"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:84
+#: bookwyrm/templates/import_status.html:108
 msgid "Successfully imported"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:88
+#: bookwyrm/templates/import_status.html:112
 #: bookwyrm/templates/lists/curate.html:14
 msgid "Book"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:91
+#: bookwyrm/templates/import_status.html:115
 #: bookwyrm/templates/snippets/create_status_form.html:10
 #: bookwyrm/templates/snippets/shelf.html:10
 msgid "Title"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:94
+#: bookwyrm/templates/import_status.html:118
 #: bookwyrm/templates/snippets/shelf.html:11
 msgid "Author"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:117
+#: bookwyrm/templates/import_status.html:141
 msgid "Imported"
 msgstr ""
 
@@ -633,6 +638,28 @@ msgstr ""
 msgid "Sorry! This invite code is no longer valid."
 msgstr ""
 
+#: bookwyrm/templates/isbn_search_results.html:4
+#: bookwyrm/templates/search_results.html:4
+msgid "Search Results"
+msgstr ""
+
+#: bookwyrm/templates/isbn_search_results.html:9
+#: bookwyrm/templates/search_results.html:9
+#, python-format
+msgid "Search Results for \"%(query)s\""
+msgstr ""
+
+#: bookwyrm/templates/isbn_search_results.html:14
+#: bookwyrm/templates/search_results.html:14
+msgid "Matching Books"
+msgstr ""
+
+#: bookwyrm/templates/isbn_search_results.html:17
+#: bookwyrm/templates/search_results.html:17
+#, python-format
+msgid "No books found for \"%(query)s\""
+msgstr ""
+
 #: bookwyrm/templates/layout.html:33
 msgid "Search for a book or user"
 msgstr ""
@@ -728,6 +755,16 @@ msgstr ""
 msgid "Create List"
 msgstr ""
 
+#: bookwyrm/templates/lists/created_text.html:5
+#, python-format
+msgid "Created and curated by <a href=\"%(path)s\">%(username)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/lists/created_text.html:7
+#, python-format
+msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
+msgstr ""
+
 #: bookwyrm/templates/lists/curate.html:6
 msgid "Pending Books"
 msgstr ""
@@ -753,7 +790,7 @@ msgid "Discard"
 msgstr ""
 
 #: bookwyrm/templates/lists/edit_form.html:5
-#: bookwyrm/templates/lists/list_layout.html:17
+#: bookwyrm/templates/lists/list_layout.html:18
 msgid "Edit List"
 msgstr ""
 
@@ -831,16 +868,6 @@ msgstr ""
 msgid "Suggest"
 msgstr ""
 
-#: bookwyrm/templates/lists/list_items.html:19
-#: bookwyrm/templates/lists/list_layout.html:11
-msgid "Created and curated by"
-msgstr ""
-
-#: bookwyrm/templates/lists/list_items.html:19
-#: bookwyrm/templates/lists/list_layout.html:11
-msgid "Created by"
-msgstr ""
-
 #: bookwyrm/templates/lists/lists.html:14
 msgid "Your lists"
 msgstr ""
@@ -883,110 +910,110 @@ msgstr ""
 msgid "Delete notifications"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:49
+#: bookwyrm/templates/notifications.html:51
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:51
+#: bookwyrm/templates/notifications.html:53
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:53
+#: bookwyrm/templates/notifications.html:55
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:55
+#: bookwyrm/templates/notifications.html:57
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">status</a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:60
+#: bookwyrm/templates/notifications.html:62
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:62
+#: bookwyrm/templates/notifications.html:64
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:64
+#: bookwyrm/templates/notifications.html:66
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:66
+#: bookwyrm/templates/notifications.html:68
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">status</a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:71
+#: bookwyrm/templates/notifications.html:73
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:73
+#: bookwyrm/templates/notifications.html:75
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:75
+#: bookwyrm/templates/notifications.html:77
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:77
+#: bookwyrm/templates/notifications.html:79
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:81
+#: bookwyrm/templates/notifications.html:83
 msgid "followed you"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:84
+#: bookwyrm/templates/notifications.html:86
 msgid "sent you a follow request"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:90
-#, python-format
-msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr ""
-
 #: bookwyrm/templates/notifications.html:92
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:94
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:96
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">status</a>"
+msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:100
+#: bookwyrm/templates/notifications.html:98
 #, python-format
-msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgid "boosted your <a href=\"%(related_path)s\">status</a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:102
 #, python-format
+msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:104
+#, python-format
 msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:106
+#: bookwyrm/templates/notifications.html:108
 #, python-format
 msgid " your <a href=\"/import/%(related_id)s\">import</a> completed."
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:138
+#: bookwyrm/templates/notifications.html:142
 msgid "You're all caught up!"
 msgstr ""
 
@@ -1070,24 +1097,6 @@ msgstr ""
 msgid "Relationships"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:4
-msgid "Search Results"
-msgstr ""
-
-#: bookwyrm/templates/search_results.html:9
-#, python-format
-msgid "Search Results for \"%(query)s\""
-msgstr ""
-
-#: bookwyrm/templates/search_results.html:14
-msgid "Matching Books"
-msgstr ""
-
-#: bookwyrm/templates/search_results.html:17
-#, python-format
-msgid "No books found for \"%(query)s\""
-msgstr ""
-
 #: bookwyrm/templates/search_results.html:33
 msgid "Didn't find what you were looking for?"
 msgstr ""
@@ -1113,7 +1122,7 @@ msgstr ""
 msgid "No users found for \"%(query)s\""
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:92
+#: bookwyrm/templates/search_results.html:94
 #, python-format
 msgid "No lists found for \"%(query)s\""
 msgstr ""
@@ -1546,22 +1555,22 @@ msgid "Sign Up"
 msgstr ""
 
 #: bookwyrm/templates/snippets/rss_title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:9
+#: bookwyrm/templates/snippets/status/status_header.html:11
 msgid "rated"
 msgstr ""
 
 #: bookwyrm/templates/snippets/rss_title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:11
+#: bookwyrm/templates/snippets/status/status_header.html:13
 msgid "reviewed"
 msgstr ""
 
 #: bookwyrm/templates/snippets/rss_title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:13
+#: bookwyrm/templates/snippets/status/status_header.html:15
 msgid "commented on"
 msgstr ""
 
 #: bookwyrm/templates/snippets/rss_title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:15
+#: bookwyrm/templates/snippets/status/status_header.html:17
 msgid "quoted"
 msgstr ""
 
@@ -1642,7 +1651,7 @@ msgstr ""
 msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/status.html:7
+#: bookwyrm/templates/snippets/status/status.html:9
 msgid "boosted"
 msgstr ""
 
@@ -1666,6 +1675,26 @@ msgstr ""
 msgid "Open image in new window"
 msgstr ""
 
+#: bookwyrm/templates/snippets/status/status_header.html:22
+#, python-format
+msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">review</a>"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_header.html:24
+#, python-format
+msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">comment</a>"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_header.html:26
+#, python-format
+msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">quote</a>"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_header.html:28
+#, python-format
+msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
+msgstr ""
+
 #: bookwyrm/templates/snippets/status/status_options.html:7
 #: bookwyrm/templates/snippets/user_options.html:7
 msgid "More options"
@@ -1711,7 +1740,7 @@ msgstr ""
 msgid "User Profile"
 msgstr ""
 
-#: bookwyrm/templates/user/followers.html:26
+#: bookwyrm/templates/user/followers.html:29
 #, python-format
 msgid "%(username)s has no followers"
 msgstr ""
@@ -1720,7 +1749,7 @@ msgstr ""
 msgid "Following"
 msgstr ""
 
-#: bookwyrm/templates/user/following.html:26
+#: bookwyrm/templates/user/following.html:29
 #, python-format
 msgid "%(username)s isn't following any users"
 msgstr ""
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index 78c835c25f62d44162dfb7e4b11a647fdf7cacd0..0a0af7d1c49f9cff97432dbc2db21f6496708a76 100644
GIT binary patch
delta 8487
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
ZD~9)tt&yESJ3pyt>eSigS0?w0_#fizmjD0&

delta 8567
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
ISvol6zn5;Nxc~qF

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index f2bde711..29130421 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-04 22:37+0000\n"
+"POT-Creation-Date: 2021-03-07 18:25+0000\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"
@@ -227,7 +227,7 @@ msgstr "Lugares"
 
 #: bookwyrm/templates/book.html:229 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
-#: bookwyrm/templates/search_results.html:90
+#: bookwyrm/templates/search_results.html:92
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listas"
@@ -476,7 +476,6 @@ msgstr "¡No hay ningún libro aqui ahorita! Busca a un libro para empezar"
 
 #: bookwyrm/templates/feed/feed_layout.html:23
 #: bookwyrm/templates/user/shelf.html:24
-#| msgid "Read"
 msgid "To Read"
 msgstr "Para leer"
 
@@ -589,35 +588,40 @@ msgstr "(¡Refresca para actualizar!)"
 msgid "Failed to load"
 msgstr "Se falló a cargar"
 
-#: bookwyrm/templates/import_status.html:59
+#: bookwyrm/templates/import_status.html:44
+#, python-format
+msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:79
 msgid "Select all"
 msgstr "Seleccionar todo"
 
-#: bookwyrm/templates/import_status.html:62
+#: bookwyrm/templates/import_status.html:82
 msgid "Retry items"
 msgstr "Reintentar ítems"
 
-#: bookwyrm/templates/import_status.html:84
+#: bookwyrm/templates/import_status.html:108
 msgid "Successfully imported"
 msgstr "Importado exitosamente"
 
-#: bookwyrm/templates/import_status.html:88
+#: bookwyrm/templates/import_status.html:112
 #: bookwyrm/templates/lists/curate.html:14
 msgid "Book"
 msgstr "Libro"
 
-#: bookwyrm/templates/import_status.html:91
+#: bookwyrm/templates/import_status.html:115
 #: bookwyrm/templates/snippets/create_status_form.html:10
 #: bookwyrm/templates/snippets/shelf.html:10
 msgid "Title"
 msgstr "Título"
 
-#: bookwyrm/templates/import_status.html:94
+#: bookwyrm/templates/import_status.html:118
 #: bookwyrm/templates/snippets/shelf.html:11
 msgid "Author"
 msgstr "Autor/Autora"
 
-#: bookwyrm/templates/import_status.html:117
+#: bookwyrm/templates/import_status.html:141
 msgid "Imported"
 msgstr "Importado"
 
@@ -634,6 +638,28 @@ msgstr "Permiso denegado"
 msgid "Sorry! This invite code is no longer valid."
 msgstr "¡Disculpa! Este código de invitación no queda válido."
 
+#: bookwyrm/templates/isbn_search_results.html:4
+#: bookwyrm/templates/search_results.html:4
+msgid "Search Results"
+msgstr "Resultados de búsqueda"
+
+#: bookwyrm/templates/isbn_search_results.html:9
+#: bookwyrm/templates/search_results.html:9
+#, python-format
+msgid "Search Results for \"%(query)s\""
+msgstr "Resultados de búsqueda por \"%(query)s\""
+
+#: bookwyrm/templates/isbn_search_results.html:14
+#: bookwyrm/templates/search_results.html:14
+msgid "Matching Books"
+msgstr "Libros correspondientes"
+
+#: bookwyrm/templates/isbn_search_results.html:17
+#: bookwyrm/templates/search_results.html:17
+#, python-format
+msgid "No books found for \"%(query)s\""
+msgstr "No se encontró ningún libro correspondiente a \"%(query)s\""
+
 #: bookwyrm/templates/layout.html:33
 msgid "Search for a book or user"
 msgstr "Buscar un libro o un usuario"
@@ -729,6 +755,18 @@ msgstr "BookWyrm es software de código abierto. Puedes contribuir o reportar pr
 msgid "Create List"
 msgstr "Crear lista"
 
+#: bookwyrm/templates/lists/created_text.html:5
+#, fuzzy, python-format
+#| msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
+msgid "Created and curated by <a href=\"%(path)s\">%(username)s</a>"
+msgstr "Agregado por <a href=\"%(user_path)s\">%(username)s</a>"
+
+#: bookwyrm/templates/lists/created_text.html:7
+#, fuzzy, python-format
+#| msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
+msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
+msgstr "Agregado por <a href=\"%(user_path)s\">%(username)s</a>"
+
 #: bookwyrm/templates/lists/curate.html:6
 msgid "Pending Books"
 msgstr "Libros pendientes"
@@ -754,7 +792,7 @@ msgid "Discard"
 msgstr "Desechar"
 
 #: bookwyrm/templates/lists/edit_form.html:5
-#: bookwyrm/templates/lists/list_layout.html:17
+#: bookwyrm/templates/lists/list_layout.html:18
 msgid "Edit List"
 msgstr "Editar lista"
 
@@ -832,16 +870,6 @@ msgstr "No se encontró ningún libro"
 msgid "Suggest"
 msgstr "Sugerir"
 
-#: bookwyrm/templates/lists/list_items.html:19
-#: bookwyrm/templates/lists/list_layout.html:11
-msgid "Created and curated by"
-msgstr "Creado y comisariado por"
-
-#: bookwyrm/templates/lists/list_items.html:19
-#: bookwyrm/templates/lists/list_layout.html:11
-msgid "Created by"
-msgstr "Creado por"
-
 #: bookwyrm/templates/lists/lists.html:14
 msgid "Your lists"
 msgstr "Tus listas"
@@ -884,110 +912,110 @@ msgstr "¡Parece que la página solicitada no existe!"
 msgid "Delete notifications"
 msgstr "Borrar notificaciones"
 
-#: bookwyrm/templates/notifications.html:49
+#: bookwyrm/templates/notifications.html:51
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "le gustó tu <a href=\"%(related_path)s\">reseña de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:51
+#: bookwyrm/templates/notifications.html:53
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "le gustó tu <a href=\"%(related_path)s\">comentario en <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:53
+#: bookwyrm/templates/notifications.html:55
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "le gustó tu <a href=\"%(related_path)s\">cita de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:55
+#: bookwyrm/templates/notifications.html:57
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">status</a>"
 msgstr "le gustó tu <a href=\"%(related_path)s\">status</a>"
 
-#: bookwyrm/templates/notifications.html:60
+#: bookwyrm/templates/notifications.html:62
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "te mencionó en una <a href=\"%(related_path)s\">reseña de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:62
+#: bookwyrm/templates/notifications.html:64
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "te mencionó en un <a href=\"%(related_path)s\">comentario de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:64
+#: bookwyrm/templates/notifications.html:66
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "te mencionó en una <a href=\"%(related_path)s\">cita de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:66
+#: bookwyrm/templates/notifications.html:68
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">status</a>"
 msgstr "te mencionó en un <a href=\"%(related_path)s\">status</a>"
 
-#: bookwyrm/templates/notifications.html:71
+#: bookwyrm/templates/notifications.html:73
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">reseña de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:73
+#: bookwyrm/templates/notifications.html:75
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">comentario en <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:75
+#: bookwyrm/templates/notifications.html:77
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">cita de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:77
+#: bookwyrm/templates/notifications.html:79
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">status</a>"
 
-#: bookwyrm/templates/notifications.html:81
+#: bookwyrm/templates/notifications.html:83
 msgid "followed you"
 msgstr "te siguió"
 
-#: bookwyrm/templates/notifications.html:84
+#: bookwyrm/templates/notifications.html:86
 msgid "sent you a follow request"
 msgstr "te quiere seguir"
 
-#: bookwyrm/templates/notifications.html:90
+#: bookwyrm/templates/notifications.html:92
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "respaldó tu <a href=\"%(related_path)s\">reseña de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:92
+#: bookwyrm/templates/notifications.html:94
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
 msgstr "respaldó tu <a href=\"%(related_path)s\">comentario en<em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:94
+#: bookwyrm/templates/notifications.html:96
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "respaldó tu<a href=\"%(related_path)s\">cita de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:96
+#: bookwyrm/templates/notifications.html:98
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">status</a>"
 msgstr "respaldó tu <a href=\"%(related_path)s\">status</a>"
 
-#: bookwyrm/templates/notifications.html:100
+#: bookwyrm/templates/notifications.html:102
 #, python-format
 msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 msgstr " agregó <em><a href=\"%(book_path)s\">%(book_title)s</a></em> a tu lista \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 
-#: bookwyrm/templates/notifications.html:102
+#: bookwyrm/templates/notifications.html:104
 #, python-format
 msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 msgstr " sugirió agregar <em><a href=\"%(book_path)s\">%(book_title)s</a></em> a tu lista \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 
-#: bookwyrm/templates/notifications.html:106
+#: bookwyrm/templates/notifications.html:108
 #, python-format
 msgid " your <a href=\"/import/%(related_id)s\">import</a> completed."
 msgstr " tu <a href=\"/import/%(related_id)s\">importación</a> ha terminado."
 
-#: bookwyrm/templates/notifications.html:138
+#: bookwyrm/templates/notifications.html:142
 msgid "You're all caught up!"
 msgstr "¡Estás al día!"
 
@@ -1071,24 +1099,6 @@ msgstr "Cuenta"
 msgid "Relationships"
 msgstr "Relaciones"
 
-#: bookwyrm/templates/search_results.html:4
-msgid "Search Results"
-msgstr "Resultados de búsqueda"
-
-#: bookwyrm/templates/search_results.html:9
-#, python-format
-msgid "Search Results for \"%(query)s\""
-msgstr "Resultados de búsqueda por \"%(query)s\""
-
-#: bookwyrm/templates/search_results.html:14
-msgid "Matching Books"
-msgstr "Libros correspondientes"
-
-#: bookwyrm/templates/search_results.html:17
-#, python-format
-msgid "No books found for \"%(query)s\""
-msgstr "No se encontró ningún libro correspondiente a \"%(query)s\""
-
 #: bookwyrm/templates/search_results.html:33
 msgid "Didn't find what you were looking for?"
 msgstr "¿No encontraste lo que buscabas?"
@@ -1114,7 +1124,7 @@ msgstr "Usuarios correspondientes"
 msgid "No users found for \"%(query)s\""
 msgstr "No se encontró ningún usuario correspondiente a \"%(query)s\""
 
-#: bookwyrm/templates/search_results.html:92
+#: bookwyrm/templates/search_results.html:94
 #, python-format
 msgid "No lists found for \"%(query)s\""
 msgstr "No se encontró ningúna lista correspondiente a \"%(query)s\""
@@ -1547,22 +1557,22 @@ msgid "Sign Up"
 msgstr "Inscribirse"
 
 #: bookwyrm/templates/snippets/rss_title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:9
+#: bookwyrm/templates/snippets/status/status_header.html:11
 msgid "rated"
 msgstr "calificó"
 
 #: bookwyrm/templates/snippets/rss_title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:11
+#: bookwyrm/templates/snippets/status/status_header.html:13
 msgid "reviewed"
 msgstr "reseñó"
 
 #: bookwyrm/templates/snippets/rss_title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:13
+#: bookwyrm/templates/snippets/status/status_header.html:15
 msgid "commented on"
 msgstr "comentó en"
 
 #: bookwyrm/templates/snippets/rss_title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:15
+#: bookwyrm/templates/snippets/status/status_header.html:17
 msgid "quoted"
 msgstr "citó"
 
@@ -1643,7 +1653,7 @@ msgstr "Empezar \"<em>%(book_title)s</em>\""
 msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgstr "Quiero leer \"<em>%(book_title)s</em>\""
 
-#: bookwyrm/templates/snippets/status/status.html:7
+#: bookwyrm/templates/snippets/status/status.html:9
 msgid "boosted"
 msgstr "respaldó"
 
@@ -1667,6 +1677,30 @@ msgstr "Mostrar menos"
 msgid "Open image in new window"
 msgstr "Abrir imagen en una nueva ventana"
 
+#: bookwyrm/templates/snippets/status/status_header.html:22
+#, fuzzy, python-format
+#| msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
+msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">review</a>"
+msgstr "Agregado por <a href=\"%(user_path)s\">%(username)s</a>"
+
+#: bookwyrm/templates/snippets/status/status_header.html:24
+#, fuzzy, python-format
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
+msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">comment</a>"
+msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">status</a>"
+
+#: bookwyrm/templates/snippets/status/status_header.html:26
+#, fuzzy, python-format
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
+msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">quote</a>"
+msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">status</a>"
+
+#: bookwyrm/templates/snippets/status/status_header.html:28
+#, fuzzy, python-format
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
+msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
+msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">status</a>"
+
 #: bookwyrm/templates/snippets/status/status_options.html:7
 #: bookwyrm/templates/snippets/user_options.html:7
 msgid "More options"
@@ -1712,7 +1746,7 @@ msgstr "Actualizar estante"
 msgid "User Profile"
 msgstr "Perfil de usuario"
 
-#: bookwyrm/templates/user/followers.html:26
+#: bookwyrm/templates/user/followers.html:29
 #, python-format
 msgid "%(username)s has no followers"
 msgstr "%(username)s no tiene seguidores"
@@ -1721,7 +1755,7 @@ msgstr "%(username)s no tiene seguidores"
 msgid "Following"
 msgstr "Siguiendo"
 
-#: bookwyrm/templates/user/following.html:26
+#: bookwyrm/templates/user/following.html:29
 #, python-format
 msgid "%(username)s isn't following any users"
 msgstr "%(username)s no sigue a nadie"
@@ -1821,6 +1855,12 @@ msgstr[1] "%(counter)s seguidores"
 msgid "%(counter)s following"
 msgstr "%(counter)s siguiendo"
 
+#~ msgid "Created and curated by"
+#~ msgstr "Creado y comisariado por"
+
+#~ msgid "Created by"
+#~ msgstr "Creado por"
+
 #~ msgid "Added by"
 #~ msgstr "Agregado por"
 
diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index 2620d2499b37f4a2772a7de337251835e38f686a..05fdf2c0462c396ff3e4d7e9bddff27c0c6d3f62 100644
GIT binary patch
delta 7663
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
Wu<Tl`KLX35Q#aQsyV7-a!v6p-lNHkd

delta 7765
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

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 1f85035b..63dd93a1 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-05 14:10+0000\n"
+"POT-Creation-Date: 2021-03-07 18:25+0000\n"
 "PO-Revision-Date: 2021-03-02 12:37+0100\n"
 "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -240,7 +240,7 @@ msgstr "Lieux"
 
 #: bookwyrm/templates/book.html:229 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
-#: bookwyrm/templates/search_results.html:90
+#: bookwyrm/templates/search_results.html:92
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listes"
@@ -615,40 +615,40 @@ msgstr "(Rechargez la page pour mettre à jour !"
 msgid "Failed to load"
 msgstr "Items non importés"
 
-#: bookwyrm/templates/import_status.html:42
+#: bookwyrm/templates/import_status.html:44
 #, python-format
 msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
 msgstr "Sauter en bas de liste pour sélectionner les %(failed_count)s items n’ayant pu être importés."
 
-#: bookwyrm/templates/import_status.html:74
+#: bookwyrm/templates/import_status.html:79
 msgid "Select all"
 msgstr "Tout sélectionner"
 
-#: bookwyrm/templates/import_status.html:79
+#: bookwyrm/templates/import_status.html:82
 msgid "Retry items"
 msgstr "Essayer d’importer les items sélectionnés de nouveau"
 
-#: bookwyrm/templates/import_status.html:101
+#: bookwyrm/templates/import_status.html:108
 msgid "Successfully imported"
 msgstr "Importation réussie"
 
-#: bookwyrm/templates/import_status.html:105
+#: bookwyrm/templates/import_status.html:112
 #: bookwyrm/templates/lists/curate.html:14
 msgid "Book"
 msgstr "Livre"
 
-#: bookwyrm/templates/import_status.html:108
+#: bookwyrm/templates/import_status.html:115
 #: bookwyrm/templates/snippets/create_status_form.html:10
 #: bookwyrm/templates/snippets/shelf.html:10
 msgid "Title"
 msgstr "Titre"
 
-#: bookwyrm/templates/import_status.html:111
+#: bookwyrm/templates/import_status.html:118
 #: bookwyrm/templates/snippets/shelf.html:11
 msgid "Author"
 msgstr "Auteur ou autrice"
 
-#: bookwyrm/templates/import_status.html:134
+#: bookwyrm/templates/import_status.html:141
 msgid "Imported"
 msgstr "Importé"
 
@@ -665,6 +665,28 @@ msgstr "Autorisation refusée"
 msgid "Sorry! This invite code is no longer valid."
 msgstr "Cette invitation n’est plus valide ; désolé !"
 
+#: bookwyrm/templates/isbn_search_results.html:4
+#: bookwyrm/templates/search_results.html:4
+msgid "Search Results"
+msgstr "Résultats de recherche"
+
+#: bookwyrm/templates/isbn_search_results.html:9
+#: bookwyrm/templates/search_results.html:9
+#, python-format
+msgid "Search Results for \"%(query)s\""
+msgstr "Résultats de recherche pour « %(query)s »"
+
+#: bookwyrm/templates/isbn_search_results.html:14
+#: bookwyrm/templates/search_results.html:14
+msgid "Matching Books"
+msgstr "Livres correspondants"
+
+#: bookwyrm/templates/isbn_search_results.html:17
+#: bookwyrm/templates/search_results.html:17
+#, python-format
+msgid "No books found for \"%(query)s\""
+msgstr "Aucun livre trouvé pour « %(query)s »"
+
 #: bookwyrm/templates/layout.html:33
 msgid "Search for a book or user"
 msgstr "Chercher un livre ou un compte"
@@ -764,6 +786,18 @@ msgstr "Bookwyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapp
 msgid "Create List"
 msgstr "Créer une liste"
 
+#: bookwyrm/templates/lists/created_text.html:5
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid "Created and curated by <a href=\"%(path)s\">%(username)s</a>"
+msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
+
+#: bookwyrm/templates/lists/created_text.html:7
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
+msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
+
 #: bookwyrm/templates/lists/curate.html:6
 msgid "Pending Books"
 msgstr "Livres en attente de modération"
@@ -789,7 +823,7 @@ msgid "Discard"
 msgstr "Rejeter"
 
 #: bookwyrm/templates/lists/edit_form.html:5
-#: bookwyrm/templates/lists/list_layout.html:17
+#: bookwyrm/templates/lists/list_layout.html:18
 msgid "Edit List"
 msgstr "Modifier la liste"
 
@@ -868,16 +902,6 @@ msgstr "Aucun livre trouvé"
 msgid "Suggest"
 msgstr "Suggérer"
 
-#: bookwyrm/templates/lists/list_items.html:19
-#: bookwyrm/templates/lists/list_layout.html:11
-msgid "Created and curated by"
-msgstr "Créée et modérée par"
-
-#: bookwyrm/templates/lists/list_items.html:19
-#: bookwyrm/templates/lists/list_layout.html:11
-msgid "Created by"
-msgstr "Créée par"
-
 #: bookwyrm/templates/lists/lists.html:14
 msgid "Your lists"
 msgstr "Vos listes"
@@ -921,110 +945,110 @@ msgstr "Il semblerait que la page que vous avez demandée n’existe pas !"
 msgid "Delete notifications"
 msgstr "Supprimer les notifications"
 
-#: bookwyrm/templates/notifications.html:49
+#: bookwyrm/templates/notifications.html:51
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a> à ses favoris"
 
-#: bookwyrm/templates/notifications.html:51
+#: bookwyrm/templates/notifications.html:53
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a> à ses favoris"
 
-#: bookwyrm/templates/notifications.html:53
+#: bookwyrm/templates/notifications.html:55
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a> à ses favoris"
 
-#: bookwyrm/templates/notifications.html:55
+#: bookwyrm/templates/notifications.html:57
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">status</a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">statut</a> à ses favoris"
 
-#: bookwyrm/templates/notifications.html:60
+#: bookwyrm/templates/notifications.html:62
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "vous a mentionné dans sa <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:62
+#: bookwyrm/templates/notifications.html:64
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "vous a mentionné dans son <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:64
+#: bookwyrm/templates/notifications.html:66
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "vous a mentionné dans sa <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:66
+#: bookwyrm/templates/notifications.html:68
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">status</a>"
 msgstr "vous a mentionné dans son <a href=\"%(related_path)s\">statut</a>"
 
-#: bookwyrm/templates/notifications.html:71
+#: bookwyrm/templates/notifications.html:73
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">critique de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:73
+#: bookwyrm/templates/notifications.html:75
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">commentaire sur <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:75
+#: bookwyrm/templates/notifications.html:77
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">citation de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:77
+#: bookwyrm/templates/notifications.html:79
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">statut</a>"
 
-#: bookwyrm/templates/notifications.html:81
+#: bookwyrm/templates/notifications.html:83
 msgid "followed you"
 msgstr "s’est abonné(e)"
 
-#: bookwyrm/templates/notifications.html:84
+#: bookwyrm/templates/notifications.html:86
 msgid "sent you a follow request"
 msgstr "vous a envoyé une demande d’abonnement"
 
-#: bookwyrm/templates/notifications.html:90
+#: bookwyrm/templates/notifications.html:92
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "a partagé votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:92
+#: bookwyrm/templates/notifications.html:94
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
 msgstr "a partagé votre <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:94
+#: bookwyrm/templates/notifications.html:96
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "a partagé votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:96
+#: bookwyrm/templates/notifications.html:98
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">status</a>"
 msgstr "a partagé votre <a href=\"%(related_path)s\">statut</a>"
 
-#: bookwyrm/templates/notifications.html:100
+#: bookwyrm/templates/notifications.html:102
 #, python-format
 msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 msgstr " a ajouté <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre liste « <a href=\"%(list_path)s\">%(list_name)s</a> »"
 
-#: bookwyrm/templates/notifications.html:102
+#: bookwyrm/templates/notifications.html:104
 #, python-format
 msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 msgstr " a suggégré l’ajout de <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre liste « <a href=\"%(list_path)s/curate\">%(list_name)s</a> »"
 
-#: bookwyrm/templates/notifications.html:106
+#: bookwyrm/templates/notifications.html:108
 #, python-format
 msgid " your <a href=\"/import/%(related_id)s\">import</a> completed."
 msgstr " votre <a href=\"/import/%(related_id)s\">importation</a> est terminée."
 
-#: bookwyrm/templates/notifications.html:138
+#: bookwyrm/templates/notifications.html:142
 msgid "You're all caught up!"
 msgstr "Aucune nouvelle notification !"
 
@@ -1108,24 +1132,6 @@ msgstr "Compte"
 msgid "Relationships"
 msgstr "Relations"
 
-#: bookwyrm/templates/search_results.html:4
-msgid "Search Results"
-msgstr "Résultats de recherche"
-
-#: bookwyrm/templates/search_results.html:9
-#, python-format
-msgid "Search Results for \"%(query)s\""
-msgstr "Résultats de recherche pour « %(query)s »"
-
-#: bookwyrm/templates/search_results.html:14
-msgid "Matching Books"
-msgstr "Livres correspondants"
-
-#: bookwyrm/templates/search_results.html:17
-#, python-format
-msgid "No books found for \"%(query)s\""
-msgstr "Aucun livre trouvé pour « %(query)s »"
-
 #: bookwyrm/templates/search_results.html:33
 msgid "Didn't find what you were looking for?"
 msgstr "Vous n’avez pas trouvé ce que vous cherchiez ?"
@@ -1151,7 +1157,7 @@ msgstr "Comptes correspondants"
 msgid "No users found for \"%(query)s\""
 msgstr "Aucun compte trouvé pour « %(query)s »"
 
-#: bookwyrm/templates/search_results.html:92
+#: bookwyrm/templates/search_results.html:94
 #, python-format
 msgid "No lists found for \"%(query)s\""
 msgstr "Aucune liste trouvée pour « %(query)s »"
@@ -1588,22 +1594,22 @@ msgid "Sign Up"
 msgstr "S’enregistrer"
 
 #: bookwyrm/templates/snippets/rss_title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:9
+#: bookwyrm/templates/snippets/status/status_header.html:11
 msgid "rated"
 msgstr "a noté"
 
 #: bookwyrm/templates/snippets/rss_title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:11
+#: bookwyrm/templates/snippets/status/status_header.html:13
 msgid "reviewed"
 msgstr "a écrit une critique de"
 
 #: bookwyrm/templates/snippets/rss_title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:13
+#: bookwyrm/templates/snippets/status/status_header.html:15
 msgid "commented on"
 msgstr "a commenté"
 
 #: bookwyrm/templates/snippets/rss_title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:15
+#: bookwyrm/templates/snippets/status/status_header.html:17
 msgid "quoted"
 msgstr "a cité"
 
@@ -1688,7 +1694,7 @@ msgstr "Commencer « <em>%(book_title)s</em> »"
 msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgstr "A envie de lire « <em>%(book_title)s</em> »"
 
-#: bookwyrm/templates/snippets/status/status.html:7
+#: bookwyrm/templates/snippets/status/status.html:9
 msgid "boosted"
 msgstr "partagé"
 
@@ -1712,6 +1718,30 @@ msgstr "Replier"
 msgid "Open image in new window"
 msgstr "Ouvrir l’image dans une nouvelle fenêtre"
 
+#: bookwyrm/templates/snippets/status/status_header.html:22
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">review</a>"
+msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
+
+#: bookwyrm/templates/snippets/status/status_header.html:24
+#, fuzzy, python-format
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
+msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">comment</a>"
+msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">statut</a>"
+
+#: bookwyrm/templates/snippets/status/status_header.html:26
+#, fuzzy, python-format
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
+msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">quote</a>"
+msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">statut</a>"
+
+#: bookwyrm/templates/snippets/status/status_header.html:28
+#, fuzzy, python-format
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
+msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
+msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">statut</a>"
+
 #: bookwyrm/templates/snippets/status/status_options.html:7
 #: bookwyrm/templates/snippets/user_options.html:7
 msgid "More options"
@@ -1757,7 +1787,7 @@ msgstr "Mettre l’étagère à jour"
 msgid "User Profile"
 msgstr "Profil"
 
-#: bookwyrm/templates/user/followers.html:26
+#: bookwyrm/templates/user/followers.html:29
 #, python-format
 msgid "%(username)s has no followers"
 msgstr "%(username)s n’a pas d’abonné(e)"
@@ -1766,7 +1796,7 @@ msgstr "%(username)s n’a pas d’abonné(e)"
 msgid "Following"
 msgstr "Abonné(e) à"
 
-#: bookwyrm/templates/user/following.html:26
+#: bookwyrm/templates/user/following.html:29
 #, python-format
 msgid "%(username)s isn't following any users"
 msgstr "%(username)s n’est abonné(e) à personne"
@@ -1868,6 +1898,12 @@ msgstr[1] "%(username)s n’a pas d’abonné(e)s"
 msgid "%(counter)s following"
 msgstr "%(counter)s abonnements"
 
+#~ msgid "Created and curated by"
+#~ msgstr "Créée et modérée par"
+
+#~ msgid "Created by"
+#~ msgstr "Créée par"
+
 #~ msgid "Create New Shelf"
 #~ msgstr "Créer une nouvelle étagère"
 
diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
index 2503685567bb55afa351c7923f572c2f172ab692..96663265bb0157f1fa643430c843c3c7f712b366 100644
GIT binary patch
delta 8089
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
OfP@1vIk#GWAN@a*QZ=gp

delta 8198
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
I^;6OR0#6!R(f|Me

diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index f5dcadb6..a0ac2639 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-04 22:24+0000\n"
+"POT-Creation-Date: 2021-03-07 18:25+0000\n"
 "PO-Revision-Date: 2021-03-02 10:35+0000\n"
 "Last-Translator: Kana <gudzpoz@live.com>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -233,7 +233,7 @@ msgstr "地点"
 
 #: bookwyrm/templates/book.html:229 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
-#: bookwyrm/templates/search_results.html:90
+#: bookwyrm/templates/search_results.html:92
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "列表"
@@ -598,35 +598,40 @@ msgstr "（按下�新加载�更新�）"
 msgid "Failed to load"
 msgstr "加载失败"
 
-#: bookwyrm/templates/import_status.html:59
+#: bookwyrm/templates/import_status.html:44
+#, python-format
+msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
+msgstr ""
+
+#: bookwyrm/templates/import_status.html:79
 msgid "Select all"
 msgstr "全选"
 
-#: bookwyrm/templates/import_status.html:62
+#: bookwyrm/templates/import_status.html:82
 msgid "Retry items"
 msgstr "�试项目"
 
-#: bookwyrm/templates/import_status.html:84
+#: bookwyrm/templates/import_status.html:108
 msgid "Successfully imported"
 msgstr "�功导入了"
 
-#: bookwyrm/templates/import_status.html:88
+#: bookwyrm/templates/import_status.html:112
 #: bookwyrm/templates/lists/curate.html:14
 msgid "Book"
 msgstr "书目"
 
-#: bookwyrm/templates/import_status.html:91
+#: bookwyrm/templates/import_status.html:115
 #: bookwyrm/templates/snippets/create_status_form.html:10
 #: bookwyrm/templates/snippets/shelf.html:10
 msgid "Title"
 msgstr "标题"
 
-#: bookwyrm/templates/import_status.html:94
+#: bookwyrm/templates/import_status.html:118
 #: bookwyrm/templates/snippets/shelf.html:11
 msgid "Author"
 msgstr "作者"
 
-#: bookwyrm/templates/import_status.html:117
+#: bookwyrm/templates/import_status.html:141
 msgid "Imported"
 msgstr "已导入"
 
@@ -643,6 +648,28 @@ msgstr "没有��"
 msgid "Sorry! This invite code is no longer valid."
 msgstr "抱歉�此邀请�已��有效。"
 
+#: bookwyrm/templates/isbn_search_results.html:4
+#: bookwyrm/templates/search_results.html:4
+msgid "Search Results"
+msgstr "�索结果"
+
+#: bookwyrm/templates/isbn_search_results.html:9
+#: bookwyrm/templates/search_results.html:9
+#, python-format
+msgid "Search Results for \"%(query)s\""
+msgstr "\"%(query)s\" 的�索结果"
+
+#: bookwyrm/templates/isbn_search_results.html:14
+#: bookwyrm/templates/search_results.html:14
+msgid "Matching Books"
+msgstr "匹�的书目"
+
+#: bookwyrm/templates/isbn_search_results.html:17
+#: bookwyrm/templates/search_results.html:17
+#, python-format
+msgid "No books found for \"%(query)s\""
+msgstr "没有找到 \"%(query)s\" 的书目"
+
 #: bookwyrm/templates/layout.html:33
 msgid "Search for a book or user"
 msgstr "�索书目或用户"
@@ -738,6 +765,18 @@ msgstr "BookWyrm 是开�软件。你�以在<a href=\"https://github.com/mous
 msgid "Create List"
 msgstr "创建列表"
 
+#: bookwyrm/templates/lists/created_text.html:5
+#, fuzzy, python-format
+#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+msgid "Created and curated by <a href=\"%(path)s\">%(username)s</a>"
+msgstr "与 <a href=\"%(path)s\">%(username)s</a> �信"
+
+#: bookwyrm/templates/lists/created_text.html:7
+#, fuzzy, python-format
+#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
+msgstr "与 <a href=\"%(path)s\">%(username)s</a> �信"
+
 #: bookwyrm/templates/lists/curate.html:6
 msgid "Pending Books"
 msgstr "等候中的书目"
@@ -763,7 +802,7 @@ msgid "Discard"
 msgstr "削除"
 
 #: bookwyrm/templates/lists/edit_form.html:5
-#: bookwyrm/templates/lists/list_layout.html:17
+#: bookwyrm/templates/lists/list_layout.html:18
 msgid "Edit List"
 msgstr "编辑列表"
 
@@ -842,16 +881,6 @@ msgstr "没有找到书目"
 msgid "Suggest"
 msgstr "推�"
 
-#: bookwyrm/templates/lists/list_items.html:19
-#: bookwyrm/templates/lists/list_layout.html:11
-msgid "Created and curated by"
-msgstr "创建者�策展者为"
-
-#: bookwyrm/templates/lists/list_items.html:19
-#: bookwyrm/templates/lists/list_layout.html:11
-msgid "Created by"
-msgstr "创建者为"
-
 #: bookwyrm/templates/lists/lists.html:14
 msgid "Your lists"
 msgstr "你的列表"
@@ -895,110 +924,110 @@ msgstr "你请求的页�似乎并�存在�"
 msgid "Delete notifications"
 msgstr "删除通知"
 
-#: bookwyrm/templates/notifications.html:49
+#: bookwyrm/templates/notifications.html:51
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "喜欢了你 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的书评</a>"
 
-#: bookwyrm/templates/notifications.html:51
+#: bookwyrm/templates/notifications.html:53
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "喜欢了你 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的评论</a>"
 
-#: bookwyrm/templates/notifications.html:53
+#: bookwyrm/templates/notifications.html:55
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "喜欢了你 <a href=\"%(related_path)s\">�自 <em>%(book_title)s</em> 的引用</a>"
 
-#: bookwyrm/templates/notifications.html:55
+#: bookwyrm/templates/notifications.html:57
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">status</a>"
 msgstr "喜欢了你的 <a href=\"%(related_path)s\">状�</a>"
 
-#: bookwyrm/templates/notifications.html:60
+#: bookwyrm/templates/notifications.html:62
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "在 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的书评</a> 里�到了你"
 
-#: bookwyrm/templates/notifications.html:62
+#: bookwyrm/templates/notifications.html:64
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "在 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的评论</a> 里�到了你"
 
-#: bookwyrm/templates/notifications.html:64
+#: bookwyrm/templates/notifications.html:66
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "在 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的引用</a> 中�到了你"
 
-#: bookwyrm/templates/notifications.html:66
+#: bookwyrm/templates/notifications.html:68
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">status</a>"
 msgstr "在 <a href=\"%(related_path)s\">状�</a> 中�到了你"
 
-#: bookwyrm/templates/notifications.html:71
+#: bookwyrm/templates/notifications.html:73
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">对 <em>%(book_title)s</em> 的书评</a>"
 
-#: bookwyrm/templates/notifications.html:73
+#: bookwyrm/templates/notifications.html:75
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">对 <em>%(book_title)s</em> 的评论</a>"
 
-#: bookwyrm/templates/notifications.html:75
+#: bookwyrm/templates/notifications.html:77
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">回�</a> 了你 <a href=\"%(parent_path)s\">对 <em>%(book_title)s</em> 中的引用</a>"
 
-#: bookwyrm/templates/notifications.html:77
+#: bookwyrm/templates/notifications.html:79
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgstr "<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">状�</a>"
 
-#: bookwyrm/templates/notifications.html:81
+#: bookwyrm/templates/notifications.html:83
 msgid "followed you"
 msgstr "关注了你"
 
-#: bookwyrm/templates/notifications.html:84
+#: bookwyrm/templates/notifications.html:86
 msgid "sent you a follow request"
 msgstr "�你��了关注请求"
 
-#: bookwyrm/templates/notifications.html:90
+#: bookwyrm/templates/notifications.html:92
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "转�了你的 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的书评</a>"
 
-#: bookwyrm/templates/notifications.html:92
+#: bookwyrm/templates/notifications.html:94
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
 msgstr "转�了你的 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的评论</a>"
 
-#: bookwyrm/templates/notifications.html:94
+#: bookwyrm/templates/notifications.html:96
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "转�了你的 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的引用</a>"
 
-#: bookwyrm/templates/notifications.html:96
+#: bookwyrm/templates/notifications.html:98
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">status</a>"
 msgstr "转�了你的 <a href=\"%(related_path)s\">状�</a>"
 
-#: bookwyrm/templates/notifications.html:100
+#: bookwyrm/templates/notifications.html:102
 #, python-format
 msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 msgstr " 添加了 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 
-#: bookwyrm/templates/notifications.html:102
+#: bookwyrm/templates/notifications.html:104
 #, python-format
 msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 msgstr " 推�添加 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 
-#: bookwyrm/templates/notifications.html:106
+#: bookwyrm/templates/notifications.html:108
 #, python-format
 msgid " your <a href=\"/import/%(related_id)s\">import</a> completed."
 msgstr " 你的 <a href=\"/import/%(related_id)s\">导入</a> 已完�。"
 
-#: bookwyrm/templates/notifications.html:138
+#: bookwyrm/templates/notifications.html:142
 msgid "You're all caught up!"
 msgstr "你什么也没错过�"
 
@@ -1082,24 +1111,6 @@ msgstr "��"
 msgid "Relationships"
 msgstr "关系"
 
-#: bookwyrm/templates/search_results.html:4
-msgid "Search Results"
-msgstr "�索结果"
-
-#: bookwyrm/templates/search_results.html:9
-#, python-format
-msgid "Search Results for \"%(query)s\""
-msgstr "\"%(query)s\" 的�索结果"
-
-#: bookwyrm/templates/search_results.html:14
-msgid "Matching Books"
-msgstr "匹�的书目"
-
-#: bookwyrm/templates/search_results.html:17
-#, python-format
-msgid "No books found for \"%(query)s\""
-msgstr "没有找到 \"%(query)s\" 的书目"
-
 #: bookwyrm/templates/search_results.html:33
 msgid "Didn't find what you were looking for?"
 msgstr "没有找到你想找的？"
@@ -1125,7 +1136,7 @@ msgstr "匹�的用户"
 msgid "No users found for \"%(query)s\""
 msgstr "没有找到 \"%(query)s\" 的用户"
 
-#: bookwyrm/templates/search_results.html:92
+#: bookwyrm/templates/search_results.html:94
 #, python-format
 msgid "No lists found for \"%(query)s\""
 msgstr "没有找到 \"%(query)s\" 的�目"
@@ -1557,22 +1568,22 @@ msgid "Sign Up"
 msgstr "注册"
 
 #: bookwyrm/templates/snippets/rss_title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:9
+#: bookwyrm/templates/snippets/status/status_header.html:11
 msgid "rated"
 msgstr "评价了"
 
 #: bookwyrm/templates/snippets/rss_title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:11
+#: bookwyrm/templates/snippets/status/status_header.html:13
 msgid "reviewed"
 msgstr "写了书评给"
 
 #: bookwyrm/templates/snippets/rss_title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:13
+#: bookwyrm/templates/snippets/status/status_header.html:15
 msgid "commented on"
 msgstr "评论了"
 
 #: bookwyrm/templates/snippets/rss_title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:15
+#: bookwyrm/templates/snippets/status/status_header.html:17
 msgid "quoted"
 msgstr "引用了"
 
@@ -1653,7 +1664,7 @@ msgstr "开始 \"<em>%(book_title)s</em>\""
 msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgstr "想�阅读 \"<em>%(book_title)s</em>\""
 
-#: bookwyrm/templates/snippets/status/status.html:7
+#: bookwyrm/templates/snippets/status/status.html:9
 msgid "boosted"
 msgstr "转�了"
 
@@ -1677,6 +1688,30 @@ msgstr "显示更少"
 msgid "Open image in new window"
 msgstr "在新窗�中打开图�"
 
+#: bookwyrm/templates/snippets/status/status_header.html:22
+#, fuzzy, python-format
+#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">review</a>"
+msgstr "与 <a href=\"%(path)s\">%(username)s</a> �信"
+
+#: bookwyrm/templates/snippets/status/status_header.html:24
+#, fuzzy, python-format
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
+msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">comment</a>"
+msgstr "<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">状�</a>"
+
+#: bookwyrm/templates/snippets/status/status_header.html:26
+#, fuzzy, python-format
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
+msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">quote</a>"
+msgstr "<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">状�</a>"
+
+#: bookwyrm/templates/snippets/status/status_header.html:28
+#, fuzzy, python-format
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
+msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
+msgstr "<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">状�</a>"
+
 #: bookwyrm/templates/snippets/status/status_options.html:7
 #: bookwyrm/templates/snippets/user_options.html:7
 msgid "More options"
@@ -1722,7 +1757,7 @@ msgstr "更新书架"
 msgid "User Profile"
 msgstr "用户个人资料"
 
-#: bookwyrm/templates/user/followers.html:26
+#: bookwyrm/templates/user/followers.html:29
 #, python-format
 msgid "%(username)s has no followers"
 msgstr "%(username)s 没有关注者"
@@ -1731,7 +1766,7 @@ msgstr "%(username)s 没有关注者"
 msgid "Following"
 msgstr "正在关注"
 
-#: bookwyrm/templates/user/following.html:26
+#: bookwyrm/templates/user/following.html:29
 #, python-format
 msgid "%(username)s isn't following any users"
 msgstr "%(username)s 没有关注任何用户"
@@ -1830,6 +1865,12 @@ msgstr[0] "%(counter)s 个关注者"
 msgid "%(counter)s following"
 msgstr "关注� %(counter)s 人"
 
+#~ msgid "Created and curated by"
+#~ msgstr "创建者�策展者为"
+
+#~ msgid "Created by"
+#~ msgstr "创建者为"
+
 #~ msgid "Create New Shelf"
 #~ msgstr "新建书架"
 

From 410e0b04bb3ec780b760bbb28bc86890585a32c7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 7 Mar 2021 13:13:16 -0800
Subject: [PATCH 0227/1285] Fixes fav logic and base activity test

---
 bookwyrm/models/favorite.py                      | 3 ++-
 bookwyrm/tests/activitypub/test_base_activity.py | 5 ++++-
 bookwyrm/tests/views/test_inbox.py               | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/models/favorite.py b/bookwyrm/models/favorite.py
index de500e51..d34cbcba 100644
--- a/bookwyrm/models/favorite.py
+++ b/bookwyrm/models/favorite.py
@@ -7,6 +7,7 @@ from bookwyrm import activitypub
 from .activitypub_mixin import ActivityMixin
 from .base_model import BookWyrmModel
 from . import fields
+from .status import Status
 
 class Favorite(ActivityMixin, BookWyrmModel):
     ''' fav'ing a post '''
@@ -20,7 +21,7 @@ class Favorite(ActivityMixin, BookWyrmModel):
     @classmethod
     def ignore_activity(cls, activity):
         ''' don't bother with incoming favs of unknown statuses '''
-        return not cls.objects.filter(remote_id=activity.object).exists()
+        return not Status.objects.filter(remote_id=activity.object).exists()
 
     def save(self, *args, **kwargs):
         ''' update user active time '''
diff --git a/bookwyrm/tests/activitypub/test_base_activity.py b/bookwyrm/tests/activitypub/test_base_activity.py
index d489fdaa..de108eae 100644
--- a/bookwyrm/tests/activitypub/test_base_activity.py
+++ b/bookwyrm/tests/activitypub/test_base_activity.py
@@ -208,7 +208,10 @@ class BaseActivity(TestCase):
         # sets the celery task call to the function call
         with patch(
                 'bookwyrm.activitypub.base_activity.set_related_field.delay'):
-            update_data.to_model(model=models.Status, instance=status)
+            with patch('bookwyrm.models.status.Status.ignore_activity') \
+                    as discarder:
+                discarder.return_value = False
+                update_data.to_model(model=models.Status, instance=status)
         self.assertIsNone(status.attachments.first())
 
 
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index b0bd3e42..4202979b 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -484,7 +484,7 @@ class Inbox(TestCase):
             'actor': 'https://example.com/users/rat',
             'type': 'Like',
             'published': 'Mon, 25 May 2020 19:31:20 GMT',
-            'object': 'https://example.com/status/1',
+            'object': self.status.remote_id,
         }
 
         views.inbox.activity_task(activity)

From bbd3ac7242662964b055c89344de25c745c77019 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 7 Mar 2021 13:17:11 -0800
Subject: [PATCH 0228/1285] Removes ID field from hideen form value

---
 bookwyrm/templates/edit_book.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/edit_book.html
index 0637bb79..dc927e8a 100644
--- a/bookwyrm/templates/edit_book.html
+++ b/bookwyrm/templates/edit_book.html
@@ -110,7 +110,7 @@
                 </label>
                 {% endfor %}
                 {% if confirm_mode %}
-                <input type="hidden" name="add_author" id="id_add_author" value="{{ add_author }}">
+                <input type="hidden" name="add_author" value="{{ add_author }}">
                 {% else %}
                 <label class="label" for="id_add_author">{% trans "Add Author:" %}</label>
                 <input class="input" type="text" name="add_author" id="id_add_author" placeholder="{% trans 'John Doe' %}" value="{{ add_author }}">

From f1b699d8105c96dbb83f2b88102dffd75e83ddd0 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 7 Mar 2021 13:59:27 -0800
Subject: [PATCH 0229/1285] Tests adding author to book

---
 bookwyrm/tests/views/test_book.py | 36 +++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index 8a6c66cb..0ba09e3b 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -84,8 +84,40 @@ class BookViews(TestCase):
 
 
     def test_edit_book_add_author(self):
-        ''' lets a user edit a book '''
-        # TODO
+        ''' lets a user edit a book with new authors '''
+        view = views.EditBook.as_view()
+        self.local_user.groups.add(self.group)
+        form = forms.EditionForm(instance=self.book)
+        form.data['title'] = 'New Title'
+        form.data['last_edited_by'] = self.local_user.id
+        form.data['add_author'] = 'Sappho'
+        request = self.factory.post('', form.data)
+        request.user = self.local_user
+
+        result = view(request, self.book.id)
+        result.render()
+
+        # the changes haven't been saved yet
+        self.book.refresh_from_db()
+        self.assertEqual(self.book.title, 'Example Edition')
+
+    def test_edit_book_add_new_author_confirm(self):
+        ''' lets a user edit a book confirmed with new authors '''
+        view = views.ConfirmEditBook.as_view()
+        self.local_user.groups.add(self.group)
+        form = forms.EditionForm(instance=self.book)
+        form.data['title'] = 'New Title'
+        form.data['last_edited_by'] = self.local_user.id
+        form.data['add_author'] = 'Sappho'
+        request = self.factory.post('', form.data)
+        request.user = self.local_user
+
+        view(request, self.book.id)
+
+        # the changes haven't been saved yet
+        self.book.refresh_from_db()
+        self.assertEqual(self.book.title, 'New Title')
+        self.assertEqual(self.book.authors.first().name, 'Sappho')
 
 
     def test_switch_edition(self):

From 79d9c493f7fcc8b64d9e3c878f8358f331c29d11 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 7 Mar 2021 14:19:22 -0800
Subject: [PATCH 0230/1285] Remove author flow

---
 bookwyrm/templates/edit_book.html | 14 ++++++++------
 bookwyrm/views/books.py           |  4 ++++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/edit_book.html
index dc927e8a..a4d62efd 100644
--- a/bookwyrm/templates/edit_book.html
+++ b/bookwyrm/templates/edit_book.html
@@ -103,12 +103,14 @@
 
             <section class="block">
                 <h2 class="title is-4">{% trans "Authors" %}</h2>
-                {% for author in book.authors.all %}
-                <p><a href="{{ author.local_path }}">{{ author.name }}</a>
-                <label class="label">
-                    <input type="checkbox" name="remove_author" value="{{ author.id }}"> {% trans "Remove this author" %}
-                </label>
-                {% endfor %}
+                <fieldset>
+                    {% for author in book.authors.all %}
+                    <p><a href="{{ author.local_path }}">{{ author.name }}</a>
+                    <label class="label">
+                        <input type="checkbox" name="remove_authors" value="{{ author.id }}"> {% trans "Remove this author" %}
+                    </label>
+                    {% endfor %}
+                </fieldset>
                 {% if confirm_mode %}
                 <input type="hidden" name="add_author" value="{{ add_author }}">
                 {% else %}
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 0097eb9f..cc05a79c 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -163,6 +163,10 @@ class EditBook(View):
             data['confirm_mode'] = True
             return TemplateResponse(request, 'edit_book.html', data)
 
+        remove_authors = request.POST.getlist('remove_authors')
+        for author_id in remove_authors:
+            book.authors.remove(author_id)
+
         book = form.save()
         return redirect('/book/%s' % book.id)
 

From 1eac2b938618f6dcf8ed63989ed39b560e6cd826 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 7 Mar 2021 15:14:57 -0800
Subject: [PATCH 0231/1285] Test for deleting authors

---
 bookwyrm/tests/views/test_book.py | 20 +++++++++++++++++++-
 bookwyrm/views/books.py           |  4 ++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index 0ba09e3b..6a28ba9d 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -114,11 +114,29 @@ class BookViews(TestCase):
 
         view(request, self.book.id)
 
-        # the changes haven't been saved yet
         self.book.refresh_from_db()
         self.assertEqual(self.book.title, 'New Title')
         self.assertEqual(self.book.authors.first().name, 'Sappho')
 
+    def test_edit_book_remove_author(self):
+        ''' remove an author from a book '''
+        author = models.Author.objects.create(name='Sappho')
+        self.book.authors.add(author)
+        form = forms.EditionForm(instance=self.book)
+        view = views.EditBook.as_view()
+        self.local_user.groups.add(self.group)
+        form = forms.EditionForm(instance=self.book)
+        form.data['title'] = 'New Title'
+        form.data['last_edited_by'] = self.local_user.id
+        form.data['remove_authors'] = [author.id]
+        request = self.factory.post('', form.data)
+        request.user = self.local_user
+
+        view(request, self.book.id)
+        self.book.refresh_from_db()
+        self.assertEqual(self.book.title, 'New Title')
+        self.assertFalse(self.book.authors.exists())
+
 
     def test_switch_edition(self):
         ''' updates user's relationships to a book '''
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index cc05a79c..07a1d437 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -206,6 +206,10 @@ class ConfirmEditBook(View):
                     name=request.POST.get('add_author'))
             book.authors.add(author)
 
+        remove_authors = request.POST.getlist('remove_authors')
+        for author_id in remove_authors:
+            book.authors.remove(author_id)
+
         return redirect('/book/%s' % book.id)
 
 

From 0146cebb1a961fdf187d301bd2e9f9dfa621dd40 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 7 Mar 2021 15:17:51 -0800
Subject: [PATCH 0232/1285] Fixes incorrect user displayed for boosts

Fixes #706
---
 bookwyrm/templates/snippets/status/status.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/status/status.html b/bookwyrm/templates/snippets/status/status.html
index 50d3414d..08898326 100644
--- a/bookwyrm/templates/snippets/status/status.html
+++ b/bookwyrm/templates/snippets/status/status.html
@@ -4,7 +4,7 @@
     {% if status.status_type == 'Announce' %}
         <a href="{{ status.user.local_path }}">
             {% include 'snippets/avatar.html' with user=status.user %}
-            {{ user.display_name }}
+            {{ stauts.user.display_name }}
         </a>
         {% trans "boosted" %}
         {% include 'snippets/status/status_body.html' with status=status|boosted_status %}

From 7d55629823fc09771fa6340990d788b2dcc18ec2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 7 Mar 2021 15:20:09 -0800
Subject: [PATCH 0233/1285] typo fix

---
 bookwyrm/templates/snippets/status/status.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/status/status.html b/bookwyrm/templates/snippets/status/status.html
index 08898326..10492c48 100644
--- a/bookwyrm/templates/snippets/status/status.html
+++ b/bookwyrm/templates/snippets/status/status.html
@@ -4,7 +4,7 @@
     {% if status.status_type == 'Announce' %}
         <a href="{{ status.user.local_path }}">
             {% include 'snippets/avatar.html' with user=status.user %}
-            {{ stauts.user.display_name }}
+            {{ status.user.display_name }}
         </a>
         {% trans "boosted" %}
         {% include 'snippets/status/status_body.html' with status=status|boosted_status %}

From c7bb1b85d01c90f3c4f55c817bc0d10a0f83b15f Mon Sep 17 00:00:00 2001
From: tofuwabohu <mail@lapete.de>
Date: Mon, 8 Mar 2021 00:23:22 +0100
Subject: [PATCH 0234/1285] Better contextualized and some mistakes

---
 locale/de_DE/LC_MESSAGES/django.po | 32 +++++++++++++++---------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 44f51f47..61598bd7 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -530,7 +530,7 @@ msgstr "%(name)s hat sich für %(year)s kein Leseziel gesetzt."
 #: bookwyrm/templates/goal.html:51
 #, python-format
 msgid "Your %(year)s Books"
-msgstr "Deine %(year)s Bücher"
+msgstr "Deine Bücher %(year)s"
 
 #: bookwyrm/templates/goal.html:53
 #, python-format
@@ -691,7 +691,7 @@ msgstr ""
 #: bookwyrm/templates/layout.html:92
 #: bookwyrm/templates/preferences/preferences_layout.html:14
 msgid "Profile"
-msgstr ""
+msgstr "Profil"
 
 #: bookwyrm/templates/layout.html:97
 msgid "Settings"
@@ -934,7 +934,7 @@ msgstr "hat deinen <a href=\"%(related_path)s\">Kommentar zu <em>%(book_title)s<
 #: bookwyrm/templates/notifications.html:55
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr " hat dein <a href=\"%(related_path)s\">Zitat aus <em>%(book_title)s</em></a>"
+msgstr " hat dein <a href=\"%(related_path)s\">Zitat aus <em>%(book_title)s</em></a> favorisiert"
 
 #: bookwyrm/templates/notifications.html:57
 #, python-format
@@ -1094,7 +1094,7 @@ msgstr "Displayname:"
 
 #: bookwyrm/templates/preferences/edit_user.html:31
 msgid "Summary:"
-msgstr "Zusammenfassung:"
+msgstr "Bio:"
 
 #: bookwyrm/templates/preferences/edit_user.html:46
 msgid "Manually approve followers:"
@@ -1459,11 +1459,11 @@ msgstr "%(username)s hat <a href=\"%(path)s\">%(read_count)s von %(goal_count)s
 
 #: bookwyrm/templates/snippets/pagination.html:7
 msgid "Previous"
-msgstr "Vorher"
+msgstr "Zurück"
 
 #: bookwyrm/templates/snippets/pagination.html:15
 msgid "Next"
-msgstr "Danach"
+msgstr "Weiter"
 
 #: bookwyrm/templates/snippets/privacy-icons.html:3
 #: bookwyrm/templates/snippets/privacy-icons.html:4
@@ -1523,7 +1523,7 @@ msgstr "Fortschrittsupdates:"
 
 #: bookwyrm/templates/snippets/readthrough.html:11
 msgid "finished"
-msgstr "beendet"
+msgstr "Abgeschlossen"
 
 #: bookwyrm/templates/snippets/readthrough.html:14
 msgid "Show all updates"
@@ -1559,7 +1559,7 @@ msgstr "Fortschritt"
 #: bookwyrm/templates/snippets/readthrough_form.html:30
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25
 msgid "Finished reading"
-msgstr "Lesen beendet"
+msgstr "Lesen abgeschlossen"
 
 #: bookwyrm/templates/snippets/register_form.html:32
 msgid "Sign Up"
@@ -1573,17 +1573,17 @@ msgstr ""
 #: bookwyrm/templates/snippets/rss_title.html:7
 #: bookwyrm/templates/snippets/status/status_header.html:13
 msgid "reviewed"
-msgstr "bewertet"
+msgstr "bewertete"
 
 #: bookwyrm/templates/snippets/rss_title.html:9
 #: bookwyrm/templates/snippets/status/status_header.html:15
 msgid "commented on"
-msgstr "kommentiert zu"
+msgstr "kommentierte"
 
 #: bookwyrm/templates/snippets/rss_title.html:11
 #: bookwyrm/templates/snippets/status/status_header.html:17
 msgid "quoted"
-msgstr "zitiert"
+msgstr "zitierte"
 
 #: bookwyrm/templates/snippets/search_result_text.html:3
 #, python-format
@@ -1604,7 +1604,7 @@ msgstr "Gestartet"
 
 #: bookwyrm/templates/snippets/shelf.html:15
 msgid "Finished"
-msgstr "Beendet"
+msgstr "Abgeschlossen"
 
 #: bookwyrm/templates/snippets/shelf.html:16
 msgid "External links"
@@ -1633,7 +1633,7 @@ msgstr "Vom Regal nehmen"
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
 #, python-format
 msgid "Finish \"<em>%(book_title)s</em>\""
-msgstr "\"<em>%(book_title)s</em>\" beenden"
+msgstr "\"<em>%(book_title)s</em>\" abschließen"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5
 msgid "More shelves"
@@ -1645,7 +1645,7 @@ msgstr "Zu lesen beginnen"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
 msgid "Finish reading"
-msgstr "Lesen beenden"
+msgstr "Lesen abschließen"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26
@@ -1664,7 +1664,7 @@ msgstr "\"<em>%(book_title)s</em>\" auf Leseliste setzen"
 
 #: bookwyrm/templates/snippets/status/status.html:9
 msgid "boosted"
-msgstr "geteilt"
+msgstr "teilt"
 
 #: bookwyrm/templates/snippets/status/status_body.html:24
 #: bookwyrm/templates/snippets/status/status_body.html:37
@@ -1862,7 +1862,7 @@ msgstr[1] "%(counter)s Folgende"
 #: bookwyrm/templates/user/user_preview.html:16
 #, python-format
 msgid "%(counter)s following"
-msgstr "%(counter)s folgen"
+msgstr "Folgt %(counter)s"
 
 #~ msgid "Created and curated by"
 #~ msgstr "Erstellt und kuratiert von"

From 642a2f26d784fa49b131853016d456f11427baa5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 7 Mar 2021 15:42:49 -0800
Subject: [PATCH 0235/1285] Fixes support link display i18n

---
 bookwyrm/templates/layout.html     | 2 +-
 locale/de_DE/LC_MESSAGES/django.po | 8 ++++++--
 locale/en_US/LC_MESSAGES/django.po | 4 ++--
 locale/es/LC_MESSAGES/django.po    | 4 ++--
 locale/fr_FR/LC_MESSAGES/django.po | 4 ++--
 locale/zh_CN/LC_MESSAGES/django.po | 4 ++--
 6 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 377acb6c..901a12ff 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -199,7 +199,7 @@
             {% if site.support_link %}
             <div class="column">
                 <span class="icon icon-heart"></span>
-                {% blocktrans %}Support {{ site.name }} on <a href="{{ site.support_link }}" target="_blank">{{ site.support_title }}</a>{% endblocktrans %}
+                {% blocktrans with site_name=site.name support_link=site.support_link support_title=site.support_title %}Support {{ site_name }} on <a href="{{ support_link }}" target="_blank">{{ support_title }}</a>{% endblocktrans %}
             </div>
             {% endif %}
             <div class="column">
diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 44f51f47..7eb5aa20 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-07 18:25+0000\n"
+"POT-Creation-Date: 2021-03-07 23:40+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"
@@ -129,10 +129,14 @@ msgid "ASIN:"
 msgstr ""
 
 #: bookwyrm/templates/book.html:84
+#, fuzzy, python-format
+#| msgid "%(format)s, %(pages)s pages"
 msgid "%(format)s, %(pages)s pages"
 msgstr "%(format)s, %(book.pages)s Seiten"
 
 #: bookwyrm/templates/book.html:86
+#, fuzzy, python-format
+#| msgid "%(pages)s pages"
 msgid "%(pages)s pages"
 msgstr "%(book.pages)s Seiten"
 
@@ -750,7 +754,7 @@ msgstr "Admin kontaktieren"
 
 #: bookwyrm/templates/layout.html:202
 #, python-format
-msgid "Support %(site.name)s on <a href=\"%(site.support_link)s\" target=\"_blank\">%(site.support_title)s</a>"
+msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr ""
 
 #: bookwyrm/templates/layout.html:206
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index 081d38df..d69fe702 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-07 18:25+0000\n"
+"POT-Creation-Date: 2021-03-07 23:40+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"
@@ -743,7 +743,7 @@ msgstr ""
 
 #: bookwyrm/templates/layout.html:202
 #, python-format
-msgid "Support %(site.name)s on <a href=\"%(site.support_link)s\" target=\"_blank\">%(site.support_title)s</a>"
+msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr ""
 
 #: bookwyrm/templates/layout.html:206
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 29130421..6c6ee434 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-07 18:25+0000\n"
+"POT-Creation-Date: 2021-03-07 23:40+0000\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"
@@ -743,7 +743,7 @@ msgstr "Contactarse con administradores del sitio"
 
 #: bookwyrm/templates/layout.html:202
 #, python-format
-msgid "Support %(site.name)s on <a href=\"%(site.support_link)s\" target=\"_blank\">%(site.support_title)s</a>"
+msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr ""
 
 #: bookwyrm/templates/layout.html:206
diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 63dd93a1..38cdd955 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-07 18:25+0000\n"
+"POT-Creation-Date: 2021-03-07 23:40+0000\n"
 "PO-Revision-Date: 2021-03-02 12:37+0100\n"
 "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -774,7 +774,7 @@ msgstr "Contacter l’administrateur du site"
 
 #: bookwyrm/templates/layout.html:202
 #, python-format
-msgid "Support %(site.name)s on <a href=\"%(site.support_link)s\" target=\"_blank\">%(site.support_title)s</a>"
+msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr ""
 
 #: bookwyrm/templates/layout.html:206
diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index a0ac2639..34dbed2a 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-07 18:25+0000\n"
+"POT-Creation-Date: 2021-03-07 23:40+0000\n"
 "PO-Revision-Date: 2021-03-02 10:35+0000\n"
 "Last-Translator: Kana <gudzpoz@live.com>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -753,7 +753,7 @@ msgstr "�系站点管�员"
 
 #: bookwyrm/templates/layout.html:202
 #, python-format
-msgid "Support %(site.name)s on <a href=\"%(site.support_link)s\" target=\"_blank\">%(site.support_title)s</a>"
+msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr ""
 
 #: bookwyrm/templates/layout.html:206

From 33cf03df74409b7450304f1b455b9a1ed5b63164 Mon Sep 17 00:00:00 2001
From: Jim Fingal <jim.fingal@gmail.com>
Date: Sun, 7 Mar 2021 19:43:36 -0800
Subject: [PATCH 0236/1285] Add black command to bw-dev

---
 Makefile | 5 -----
 bw-dev   | 9 ++++++++-
 2 files changed, 8 insertions(+), 6 deletions(-)
 delete mode 100644 Makefile

diff --git a/Makefile b/Makefile
deleted file mode 100644
index 44abad0b..00000000
--- a/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-.PHONY: itblack
-
-itblack:
-	docker-compose run --rm web black celerywyrm
-	docker-compose run --rm web black bookwyrm
\ No newline at end of file
diff --git a/bw-dev b/bw-dev
index f3162bd3..2aa46942 100755
--- a/bw-dev
+++ b/bw-dev
@@ -35,6 +35,10 @@ function initdb {
     execweb python manage.py initdb
 }
 
+function makeitblack {
+    runweb black celerywyrm bookwyrm
+}
+
 CMD=$1
 shift
 
@@ -96,7 +100,10 @@ case "$CMD" in
     clean)
         clean
         ;;
+    black)
+        makeitblack
+        ;;
     *)
-        echo "Unrecognised command. Try: build, clean, up, initdb, resetdb, makemigrations, migrate, bash, shell, dbshell, restart_celery, test, pytest, test_report"
+        echo "Unrecognised command. Try: build, clean, up, initdb, resetdb, makemigrations, migrate, bash, shell, dbshell, restart_celery, test, pytest, test_report, black"
         ;;
 esac

From 70296e760b7400762744a3c8ec18b841cb39a344 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 8 Mar 2021 08:49:10 -0800
Subject: [PATCH 0237/1285] Runs black

---
 bookwyrm/activitypub/__init__.py              |    8 +-
 bookwyrm/activitypub/base_activity.py         |  128 +-
 bookwyrm/activitypub/book.py                  |   67 +-
 bookwyrm/activitypub/image.py                 |   12 +-
 bookwyrm/activitypub/note.py                  |   48 +-
 bookwyrm/activitypub/ordered_collection.py    |   30 +-
 bookwyrm/activitypub/person.py                |   12 +-
 bookwyrm/activitypub/response.py              |   16 +-
 bookwyrm/activitypub/verbs.py                 |  101 +-
 bookwyrm/admin.py                             |    2 +-
 bookwyrm/connectors/__init__.py               |    2 +-
 bookwyrm/connectors/abstract_connector.py     |  125 +-
 bookwyrm/connectors/bookwyrm_connector.py     |    9 +-
 bookwyrm/connectors/connector_manager.py      |   59 +-
 bookwyrm/connectors/openlibrary.py            |  205 +--
 bookwyrm/connectors/openlibrary_languages.py  |  930 +++++-----
 bookwyrm/connectors/self_connector.py         |   86 +-
 bookwyrm/connectors/settings.py               |    4 +-
 bookwyrm/context_processors.py                |   11 +-
 bookwyrm/emailing.py                          |   16 +-
 bookwyrm/forms.py                             |  175 +-
 bookwyrm/goodreads_import.py                  |   11 +-
 bookwyrm/importer.py                          |   82 +-
 bookwyrm/librarything_import.py               |   46 +-
 .../commands/deduplicate_book_data.py         |   58 +-
 bookwyrm/management/commands/initdb.py        |  128 +-
 .../management/commands/remove_editions.py    |   40 +-
 bookwyrm/migrations/0001_initial.py           |  493 +++--
 .../migrations/0002_auto_20200219_0816.py     |   56 +-
 .../migrations/0003_auto_20200221_0131.py     |   74 +-
 bookwyrm/migrations/0004_tag.py               |   37 +-
 .../migrations/0005_auto_20200221_1645.py     |   14 +-
 ..._1702_squashed_0064_merge_20201101_1913.py | 1625 +++++++++++------
 .../migrations/0007_auto_20201103_0014.py     |   10 +-
 .../migrations/0008_work_default_edition.py   |   21 +-
 bookwyrm/migrations/0009_shelf_privacy.py     |   17 +-
 bookwyrm/migrations/0010_importjob_retry.py   |    6 +-
 .../migrations/0011_auto_20201113_1727.py     |   13 +-
 bookwyrm/migrations/0012_attachment.py        |   38 +-
 bookwyrm/migrations/0012_progressupdate.py    |   49 +-
 bookwyrm/migrations/0013_book_origin_id.py    |    6 +-
 .../migrations/0014_auto_20201128_0118.py     |    6 +-
 .../migrations/0014_merge_20201128_0007.py    |    7 +-
 .../migrations/0015_auto_20201128_0349.py     |   13 +-
 .../migrations/0015_auto_20201128_0734.py     |   16 +-
 .../migrations/0016_auto_20201129_0304.py     |   95 +-
 .../migrations/0016_auto_20201211_2026.py     |   14 +-
 .../migrations/0017_auto_20201130_1819.py     |  302 ++-
 .../migrations/0017_auto_20201212_0059.py     |   10 +-
 .../migrations/0018_auto_20201130_1832.py     |   14 +-
 .../migrations/0019_auto_20201130_1939.py     |   22 +-
 .../migrations/0020_auto_20201208_0213.py     |  526 ++++--
 .../migrations/0021_merge_20201212_1737.py    |    7 +-
 .../migrations/0022_auto_20201212_1744.py     |   15 +-
 .../migrations/0023_auto_20201214_0511.py     |   17 +-
 .../migrations/0023_merge_20201216_0112.py    |    7 +-
 .../migrations/0024_merge_20201216_1721.py    |    7 +-
 .../migrations/0025_auto_20201217_0046.py     |   24 +-
 .../migrations/0026_status_content_warning.py |   10 +-
 .../migrations/0027_auto_20201220_2007.py     |   14 +-
 .../0028_remove_book_author_text.py           |    6 +-
 .../migrations/0029_auto_20201221_2014.py     |   62 +-
 .../migrations/0030_auto_20201224_1939.py     |   13 +-
 .../migrations/0031_auto_20210104_2040.py     |   20 +-
 .../migrations/0032_auto_20210104_2055.py     |   16 +-
 .../0033_siteinvite_created_date.py           |   10 +-
 .../migrations/0034_importjob_complete.py     |    6 +-
 .../migrations/0035_edition_edition_rank.py   |    9 +-
 bookwyrm/migrations/0036_annualgoal.py        |   55 +-
 .../migrations/0037_auto_20210118_1954.py     |   17 +-
 .../migrations/0038_auto_20210119_1534.py     |   10 +-
 .../migrations/0039_merge_20210120_0753.py    |    7 +-
 .../migrations/0040_auto_20210122_0057.py     |   38 +-
 .../migrations/0041_auto_20210131_1614.py     |  149 +-
 .../migrations/0042_auto_20210201_2108.py     |   36 +-
 .../migrations/0043_auto_20210204_2223.py     |   14 +-
 .../migrations/0044_auto_20210207_1924.py     |   15 +-
 .../migrations/0045_auto_20210210_2114.py     |  103 +-
 .../0046_sitesettings_privacy_policy.py       |    8 +-
 .../0047_connector_isbn_search_url.py         |    6 +-
 bookwyrm/models/__init__.py                   |   12 +-
 bookwyrm/models/activitypub_mixin.py          |  309 ++--
 bookwyrm/models/attachment.py                 |   22 +-
 bookwyrm/models/author.py                     |   12 +-
 bookwyrm/models/base_model.py                 |   30 +-
 bookwyrm/models/book.py                       |  156 +-
 bookwyrm/models/connector.py                  |   21 +-
 bookwyrm/models/favorite.py                   |   39 +-
 bookwyrm/models/federated_server.py           |    8 +-
 bookwyrm/models/fields.py                     |  258 +--
 bookwyrm/models/import_job.py                 |  134 +-
 bookwyrm/models/list.py                       |   83 +-
 bookwyrm/models/notification.py               |   53 +-
 bookwyrm/models/readthrough.py                |   55 +-
 bookwyrm/models/relationship.py               |  136 +-
 bookwyrm/models/shelf.py                      |   59 +-
 bookwyrm/models/site.py                       |   69 +-
 bookwyrm/models/status.py                     |  230 +--
 bookwyrm/models/tag.py                        |   47 +-
 bookwyrm/models/user.py                       |  290 +--
 bookwyrm/sanitize_html.py                     |   51 +-
 bookwyrm/settings.py                          |  159 +-
 bookwyrm/signatures.py                        |   99 +-
 bookwyrm/status.py                            |   14 +-
 bookwyrm/tasks.py                             |    6 +-
 bookwyrm/templatetags/bookwyrm_tags.py        |  224 ++-
 bookwyrm/tests/activitypub/test_author.py     |   19 +-
 .../tests/activitypub/test_base_activity.py   |  210 ++-
 bookwyrm/tests/activitypub/test_person.py     |   18 +-
 bookwyrm/tests/activitypub/test_quotation.py  |   47 +-
 .../connectors/test_abstract_connector.py     |   96 +-
 .../test_abstract_minimal_connector.py        |  110 +-
 .../connectors/test_bookwyrm_connector.py     |   45 +-
 .../connectors/test_connector_manager.py      |   71 +-
 .../connectors/test_openlibrary_connector.py  |  246 ++-
 .../tests/connectors/test_self_connector.py   |   86 +-
 .../tests/models/test_activitypub_mixin.py    |  339 ++--
 bookwyrm/tests/models/test_base_model.py      |   27 +-
 bookwyrm/tests/models/test_book_model.py      |   78 +-
 bookwyrm/tests/models/test_fields.py          |  418 ++---
 bookwyrm/tests/models/test_import_model.py    |  187 +-
 bookwyrm/tests/models/test_list.py            |   54 +-
 .../tests/models/test_readthrough_model.py    |   31 +-
 .../tests/models/test_relationship_models.py  |  101 +-
 bookwyrm/tests/models/test_shelf_model.py     |  114 +-
 bookwyrm/tests/models/test_status_model.py    |  371 ++--
 bookwyrm/tests/models/test_user_model.py      |  139 +-
 bookwyrm/tests/test_goodreads_import.py       |  197 +-
 bookwyrm/tests/test_librarything_import.py    |  197 +-
 bookwyrm/tests/test_sanitize_html.py          |   32 +-
 bookwyrm/tests/test_signing.py                |  165 +-
 bookwyrm/tests/test_templatetags.py           |  274 ++-
 bookwyrm/tests/views/test_authentication.py   |  155 +-
 bookwyrm/tests/views/test_author.py           |   92 +-
 bookwyrm/tests/views/test_block.py            |   50 +-
 bookwyrm/tests/views/test_book.py             |   98 +-
 bookwyrm/tests/views/test_federation.py       |   20 +-
 bookwyrm/tests/views/test_feed.py             |   80 +-
 bookwyrm/tests/views/test_follow.py           |  129 +-
 bookwyrm/tests/views/test_goal.py             |   86 +-
 bookwyrm/tests/views/test_helpers.py          |  324 ++--
 bookwyrm/tests/views/test_import.py           |   27 +-
 bookwyrm/tests/views/test_inbox.py            |  636 +++----
 bookwyrm/tests/views/test_interaction.py      |  116 +-
 bookwyrm/tests/views/test_invite.py           |   31 +-
 bookwyrm/tests/views/test_isbn.py             |   45 +-
 bookwyrm/tests/views/test_landing.py          |   30 +-
 bookwyrm/tests/views/test_list.py             |  332 ++--
 bookwyrm/tests/views/test_notifications.py    |   29 +-
 bookwyrm/tests/views/test_outbox.py           |  137 +-
 bookwyrm/tests/views/test_password.py         |   84 +-
 bookwyrm/tests/views/test_reading.py          |  162 +-
 bookwyrm/tests/views/test_readthrough.py      |   78 +-
 bookwyrm/tests/views/test_rss_feed.py         |   48 +-
 bookwyrm/tests/views/test_search.py           |   98 +-
 bookwyrm/tests/views/test_shelf.py            |  181 +-
 bookwyrm/tests/views/test_status.py           |  294 +--
 bookwyrm/tests/views/test_tag.py              |  110 +-
 bookwyrm/tests/views/test_user.py             |  163 +-
 bookwyrm/urls.py                              |  273 ++-
 bookwyrm/utils/regex.py                       |   16 +-
 bookwyrm/views/__init__.py                    |    2 +-
 bookwyrm/views/authentication.py              |   86 +-
 bookwyrm/views/author.py                      |   45 +-
 bookwyrm/views/block.py                       |   22 +-
 bookwyrm/views/books.py                       |  135 +-
 bookwyrm/views/error.py                       |   11 +-
 bookwyrm/views/federation.py                  |   18 +-
 bookwyrm/views/feed.py                        |  145 +-
 bookwyrm/views/follow.py                      |   30 +-
 bookwyrm/views/goal.py                        |   50 +-
 bookwyrm/views/helpers.py                     |  110 +-
 bookwyrm/views/import_data.py                 |   68 +-
 bookwyrm/views/inbox.py                       |   30 +-
 bookwyrm/views/interaction.py                 |   53 +-
 bookwyrm/views/invite.py                      |   64 +-
 bookwyrm/views/isbn.py                        |   15 +-
 bookwyrm/views/landing.py                     |   50 +-
 bookwyrm/views/list.py                        |  145 +-
 bookwyrm/views/notifications.py               |   22 +-
 bookwyrm/views/outbox.py                      |   11 +-
 bookwyrm/views/password.py                    |   68 +-
 bookwyrm/views/reading.py                     |   87 +-
 bookwyrm/views/rss_feed.py                    |   29 +-
 bookwyrm/views/search.py                      |   74 +-
 bookwyrm/views/shelf.py                       |   99 +-
 bookwyrm/views/site.py                        |   27 +-
 bookwyrm/views/status.py                      |   50 +-
 bookwyrm/views/tag.py                         |   45 +-
 bookwyrm/views/updates.py                     |   21 +-
 bookwyrm/views/user.py                        |  129 +-
 bookwyrm/wellknown.py                         |  145 +-
 celerywyrm/__init__.py                        |    4 +-
 celerywyrm/asgi.py                            |    2 +-
 celerywyrm/celery.py                          |   23 +-
 celerywyrm/settings.py                        |  124 +-
 celerywyrm/urls.py                            |    2 +-
 celerywyrm/wsgi.py                            |    2 +-
 198 files changed, 10239 insertions(+), 8572 deletions(-)

diff --git a/bookwyrm/activitypub/__init__.py b/bookwyrm/activitypub/__init__.py
index fdfbb1f0..1a156cae 100644
--- a/bookwyrm/activitypub/__init__.py
+++ b/bookwyrm/activitypub/__init__.py
@@ -1,4 +1,4 @@
-''' bring activitypub functions into the namespace '''
+""" bring activitypub functions into the namespace """
 import inspect
 import sys
 
@@ -21,9 +21,9 @@ from .verbs import Announce, Like
 # this creates a list of all the Activity types that we can serialize,
 # so when an Activity comes in from outside, we can check if it's known
 cls_members = inspect.getmembers(sys.modules[__name__], inspect.isclass)
-activity_objects = {c[0]: c[1] for c in cls_members \
-    if hasattr(c[1], 'to_model')}
+activity_objects = {c[0]: c[1] for c in cls_members if hasattr(c[1], "to_model")}
+
 
 def parse(activity_json):
-    ''' figure out what activity this is and parse it '''
+    """ figure out what activity this is and parse it """
     return naive_parse(activity_objects, activity_json)
diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index c732fe1d..315ff58c 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -1,4 +1,4 @@
-''' basics for an activitypub serializer '''
+""" basics for an activitypub serializer """
 from dataclasses import dataclass, fields, MISSING
 from json import JSONEncoder
 
@@ -8,46 +8,52 @@ from django.db import IntegrityError, transaction
 from bookwyrm.connectors import ConnectorException, get_data
 from bookwyrm.tasks import app
 
+
 class ActivitySerializerError(ValueError):
-    ''' routine problems serializing activitypub json '''
+    """ routine problems serializing activitypub json """
 
 
 class ActivityEncoder(JSONEncoder):
-    '''  used to convert an Activity object into json '''
+    """  used to convert an Activity object into json """
+
     def default(self, o):
         return o.__dict__
 
 
 @dataclass
 class Link:
-    ''' for tagging a book in a status '''
+    """ for tagging a book in a status """
+
     href: str
     name: str
-    type: str = 'Link'
+    type: str = "Link"
 
 
 @dataclass
 class Mention(Link):
-    ''' a subtype of Link for mentioning an actor '''
-    type: str = 'Mention'
+    """ a subtype of Link for mentioning an actor """
+
+    type: str = "Mention"
 
 
 @dataclass
 class Signature:
-    ''' public key block '''
+    """ public key block """
+
     creator: str
     created: str
     signatureValue: str
-    type: str = 'RsaSignature2017'
+    type: str = "RsaSignature2017"
+
 
 def naive_parse(activity_objects, activity_json, serializer=None):
-    ''' this navigates circular import issues '''
+    """ this navigates circular import issues """
     if not serializer:
-        if activity_json.get('publicKeyPem'):
+        if activity_json.get("publicKeyPem"):
             # ugh
-            activity_json['type'] = 'PublicKey'
+            activity_json["type"] = "PublicKey"
         try:
-            activity_type = activity_json['type']
+            activity_type = activity_json["type"]
             serializer = activity_objects[activity_type]
         except KeyError as e:
             raise ActivitySerializerError(e)
@@ -57,14 +63,15 @@ def naive_parse(activity_objects, activity_json, serializer=None):
 
 @dataclass(init=False)
 class ActivityObject:
-    ''' actor activitypub json '''
+    """ actor activitypub json """
+
     id: str
     type: str
 
     def __init__(self, activity_objects=None, **kwargs):
-        ''' this lets you pass in an object with fields that aren't in the
+        """this lets you pass in an object with fields that aren't in the
         dataclass, which it ignores. Any field in the dataclass is required or
-        has a default value '''
+        has a default value"""
         for field in fields(self):
             try:
                 value = kwargs[field.name]
@@ -75,7 +82,7 @@ class ActivityObject:
                 except TypeError:
                     is_subclass = False
                 # serialize a model obj
-                if hasattr(value, 'to_activity'):
+                if hasattr(value, "to_activity"):
                     value = value.to_activity()
                 # parse a dict into the appropriate activity
                 elif is_subclass and isinstance(value, dict):
@@ -83,25 +90,27 @@ class ActivityObject:
                         value = naive_parse(activity_objects, value)
                     else:
                         value = naive_parse(
-                            activity_objects, value, serializer=field.type)
+                            activity_objects, value, serializer=field.type
+                        )
 
             except KeyError:
-                if field.default == MISSING and \
-                        field.default_factory == MISSING:
-                    raise ActivitySerializerError(\
-                            'Missing required field: %s' % field.name)
+                if field.default == MISSING and field.default_factory == MISSING:
+                    raise ActivitySerializerError(
+                        "Missing required field: %s" % field.name
+                    )
                 value = field.default
             setattr(self, field.name, value)
 
-
     def to_model(self, model=None, instance=None, allow_create=True, save=True):
-        ''' convert from an activity to a model instance '''
+        """ convert from an activity to a model instance """
         model = model or get_model_from_type(self.type)
 
         # only reject statuses if we're potentially creating them
-        if allow_create and \
-                hasattr(model, 'ignore_activity') and \
-                model.ignore_activity(self):
+        if (
+            allow_create
+            and hasattr(model, "ignore_activity")
+            and model.ignore_activity(self)
+        ):
             raise ActivitySerializerError()
 
         # check for an existing instance
@@ -142,8 +151,10 @@ class ActivityObject:
                 field.set_field_from_activity(instance, self)
 
         # reversed relationships in the models
-        for (model_field_name, activity_field_name) in \
-                instance.deserialize_reverse_fields:
+        for (
+            model_field_name,
+            activity_field_name,
+        ) in instance.deserialize_reverse_fields:
             # attachments on Status, for example
             values = getattr(self, activity_field_name)
             if values is None or values is MISSING:
@@ -161,13 +172,12 @@ class ActivityObject:
                     instance.__class__.__name__,
                     related_field_name,
                     instance.remote_id,
-                    item
+                    item,
                 )
         return instance
 
-
     def serialize(self):
-        ''' convert to dictionary with context attr '''
+        """ convert to dictionary with context attr """
         data = self.__dict__.copy()
         # recursively serialize
         for (k, v) in data.items():
@@ -176,22 +186,19 @@ class ActivityObject:
                     data[k] = v.serialize()
             except TypeError:
                 pass
-        data = {k:v for (k, v) in data.items() if v is not None}
-        data['@context'] = 'https://www.w3.org/ns/activitystreams'
+        data = {k: v for (k, v) in data.items() if v is not None}
+        data["@context"] = "https://www.w3.org/ns/activitystreams"
         return data
 
 
 @app.task
 @transaction.atomic
 def set_related_field(
-        model_name, origin_model_name, related_field_name,
-        related_remote_id, data):
-    ''' load reverse related fields (editions, attachments) without blocking '''
-    model = apps.get_model('bookwyrm.%s' % model_name, require_ready=True)
-    origin_model = apps.get_model(
-        'bookwyrm.%s' % origin_model_name,
-        require_ready=True
-    )
+    model_name, origin_model_name, related_field_name, related_remote_id, data
+):
+    """ load reverse related fields (editions, attachments) without blocking """
+    model = apps.get_model("bookwyrm.%s" % model_name, require_ready=True)
+    origin_model = apps.get_model("bookwyrm.%s" % origin_model_name, require_ready=True)
 
     with transaction.atomic():
         if isinstance(data, str):
@@ -205,43 +212,45 @@ def set_related_field(
         # this must exist because it's the object that triggered this function
         instance = origin_model.find_existing_by_remote_id(related_remote_id)
         if not instance:
-            raise ValueError(
-                'Invalid related remote id: %s' % related_remote_id)
+            raise ValueError("Invalid related remote id: %s" % related_remote_id)
 
         # set the origin's remote id on the activity so it will be there when
         # the model instance is created
         # edition.parentWork = instance, for example
         model_field = getattr(model, related_field_name)
-        if hasattr(model_field, 'activitypub_field'):
+        if hasattr(model_field, "activitypub_field"):
             setattr(
-                activity,
-                getattr(model_field, 'activitypub_field'),
-                instance.remote_id
+                activity, getattr(model_field, "activitypub_field"), instance.remote_id
             )
         item = activity.to_model()
 
         # if the related field isn't serialized (attachments on Status), then
         # we have to set it post-creation
-        if not hasattr(model_field, 'activitypub_field'):
+        if not hasattr(model_field, "activitypub_field"):
             setattr(item, related_field_name, instance)
             item.save()
 
 
 def get_model_from_type(activity_type):
-    ''' given the activity, what type of model '''
+    """ given the activity, what type of model """
     models = apps.get_models()
-    model = [m for m in models if hasattr(m, 'activity_serializer') and \
-        hasattr(m.activity_serializer, 'type') and \
-        m.activity_serializer.type == activity_type]
+    model = [
+        m
+        for m in models
+        if hasattr(m, "activity_serializer")
+        and hasattr(m.activity_serializer, "type")
+        and m.activity_serializer.type == activity_type
+    ]
     if not model:
         raise ActivitySerializerError(
-            'No model found for activity type "%s"' % activity_type)
+            'No model found for activity type "%s"' % activity_type
+        )
     return model[0]
 
 
 def resolve_remote_id(remote_id, model=None, refresh=False, save=True):
-    ''' take a remote_id and return an instance, creating if necessary '''
-    if model:# a bonus check we can do if we already know the model
+    """ take a remote_id and return an instance, creating if necessary """
+    if model:  # a bonus check we can do if we already know the model
         result = model.find_existing_by_remote_id(remote_id)
         if result and not refresh:
             return result
@@ -251,11 +260,12 @@ def resolve_remote_id(remote_id, model=None, refresh=False, save=True):
         data = get_data(remote_id)
     except (ConnectorException, ConnectionError):
         raise ActivitySerializerError(
-            'Could not connect to host for remote_id in %s model: %s' % \
-                (model.__name__, remote_id))
+            "Could not connect to host for remote_id in %s model: %s"
+            % (model.__name__, remote_id)
+        )
     # determine the model implicitly, if not provided
     if not model:
-        model = get_model_from_type(data.get('type'))
+        model = get_model_from_type(data.get("type"))
 
     # check for existing items with shared unique identifiers
     result = model.find_existing(data)
diff --git a/bookwyrm/activitypub/book.py b/bookwyrm/activitypub/book.py
index 8c32be96..7e552b0a 100644
--- a/bookwyrm/activitypub/book.py
+++ b/bookwyrm/activitypub/book.py
@@ -1,70 +1,75 @@
-''' book and author data '''
+""" book and author data """
 from dataclasses import dataclass, field
 from typing import List
 
 from .base_activity import ActivityObject
 from .image import Image
 
+
 @dataclass(init=False)
 class Book(ActivityObject):
-    ''' serializes an edition or work, abstract '''
+    """ serializes an edition or work, abstract """
+
     title: str
-    sortTitle: str = ''
-    subtitle: str = ''
-    description: str = ''
+    sortTitle: str = ""
+    subtitle: str = ""
+    description: str = ""
     languages: List[str] = field(default_factory=lambda: [])
-    series: str = ''
-    seriesNumber: str = ''
+    series: str = ""
+    seriesNumber: str = ""
     subjects: List[str] = field(default_factory=lambda: [])
     subjectPlaces: List[str] = field(default_factory=lambda: [])
 
     authors: List[str] = field(default_factory=lambda: [])
-    firstPublishedDate: str = ''
-    publishedDate: str = ''
+    firstPublishedDate: str = ""
+    publishedDate: str = ""
 
-    openlibraryKey: str = ''
-    librarythingKey: str = ''
-    goodreadsKey: str = ''
+    openlibraryKey: str = ""
+    librarythingKey: str = ""
+    goodreadsKey: str = ""
 
     cover: Image = None
-    type: str = 'Book'
+    type: str = "Book"
 
 
 @dataclass(init=False)
 class Edition(Book):
-    ''' Edition instance of a book object '''
+    """ Edition instance of a book object """
+
     work: str
-    isbn10: str = ''
-    isbn13: str = ''
-    oclcNumber: str = ''
-    asin: str = ''
+    isbn10: str = ""
+    isbn13: str = ""
+    oclcNumber: str = ""
+    asin: str = ""
     pages: int = None
-    physicalFormat: str = ''
+    physicalFormat: str = ""
     publishers: List[str] = field(default_factory=lambda: [])
     editionRank: int = 0
 
-    type: str = 'Edition'
+    type: str = "Edition"
 
 
 @dataclass(init=False)
 class Work(Book):
-    ''' work instance of a book object '''
-    lccn: str = ''
-    defaultEdition: str = ''
+    """ work instance of a book object """
+
+    lccn: str = ""
+    defaultEdition: str = ""
     editions: List[str] = field(default_factory=lambda: [])
-    type: str = 'Work'
+    type: str = "Work"
 
 
 @dataclass(init=False)
 class Author(ActivityObject):
-    ''' author of a book '''
+    """ author of a book """
+
     name: str
     born: str = None
     died: str = None
     aliases: List[str] = field(default_factory=lambda: [])
-    bio: str = ''
-    openlibraryKey: str = ''
-    librarythingKey: str = ''
-    goodreadsKey: str = ''
-    wikipediaLink: str = ''
-    type: str = 'Author'
+    bio: str = ""
+    openlibraryKey: str = ""
+    librarythingKey: str = ""
+    goodreadsKey: str = ""
+    wikipediaLink: str = ""
+    type: str = "Author"
diff --git a/bookwyrm/activitypub/image.py b/bookwyrm/activitypub/image.py
index 569f83c5..248e7a4a 100644
--- a/bookwyrm/activitypub/image.py
+++ b/bookwyrm/activitypub/image.py
@@ -1,11 +1,13 @@
-''' an image, nothing fancy '''
+""" an image, nothing fancy """
 from dataclasses import dataclass
 from .base_activity import ActivityObject
 
+
 @dataclass(init=False)
 class Image(ActivityObject):
-    ''' image block '''
+    """ image block """
+
     url: str
-    name: str = ''
-    type: str = 'Image'
-    id: str = ''
+    name: str = ""
+    type: str = "Image"
+    id: str = ""
diff --git a/bookwyrm/activitypub/note.py b/bookwyrm/activitypub/note.py
index 705d6eed..f38fea5b 100644
--- a/bookwyrm/activitypub/note.py
+++ b/bookwyrm/activitypub/note.py
@@ -1,4 +1,4 @@
-''' note serializer and children thereof '''
+""" note serializer and children thereof """
 from dataclasses import dataclass, field
 from typing import Dict, List
 from django.apps import apps
@@ -6,64 +6,72 @@ from django.apps import apps
 from .base_activity import ActivityObject, Link
 from .image import Image
 
+
 @dataclass(init=False)
 class Tombstone(ActivityObject):
-    ''' the placeholder for a deleted status '''
-    type: str = 'Tombstone'
+    """ the placeholder for a deleted status """
+
+    type: str = "Tombstone"
 
     def to_model(self, *args, **kwargs):
-        ''' this should never really get serialized, just searched for '''
-        model = apps.get_model('bookwyrm.Status')
+        """ this should never really get serialized, just searched for """
+        model = apps.get_model("bookwyrm.Status")
         return model.find_existing_by_remote_id(self.id)
 
 
 @dataclass(init=False)
 class Note(ActivityObject):
-    ''' Note activity '''
+    """ Note activity """
+
     published: str
     attributedTo: str
-    content: str = ''
+    content: str = ""
     to: List[str] = field(default_factory=lambda: [])
     cc: List[str] = field(default_factory=lambda: [])
     replies: Dict = field(default_factory=lambda: {})
-    inReplyTo: str = ''
-    summary: str = ''
+    inReplyTo: str = ""
+    summary: str = ""
     tag: List[Link] = field(default_factory=lambda: [])
     attachment: List[Image] = field(default_factory=lambda: [])
     sensitive: bool = False
-    type: str = 'Note'
+    type: str = "Note"
 
 
 @dataclass(init=False)
 class Article(Note):
-    ''' what's an article except a note with more fields '''
+    """ what's an article except a note with more fields """
+
     name: str
-    type: str = 'Article'
+    type: str = "Article"
 
 
 @dataclass(init=False)
 class GeneratedNote(Note):
-    ''' just a re-typed note '''
-    type: str = 'GeneratedNote'
+    """ just a re-typed note """
+
+    type: str = "GeneratedNote"
 
 
 @dataclass(init=False)
 class Comment(Note):
-    ''' like a note but with a book '''
+    """ like a note but with a book """
+
     inReplyToBook: str
-    type: str = 'Comment'
+    type: str = "Comment"
 
 
 @dataclass(init=False)
 class Review(Comment):
-    ''' a full book review '''
+    """ a full book review """
+
     name: str = None
     rating: int = None
-    type: str = 'Review'
+    type: str = "Review"
 
 
 @dataclass(init=False)
 class Quotation(Comment):
-    ''' a quote and commentary on a book '''
+    """ a quote and commentary on a book """
+
     quote: str
-    type: str = 'Quotation'
+    type: str = "Quotation"
diff --git a/bookwyrm/activitypub/ordered_collection.py b/bookwyrm/activitypub/ordered_collection.py
index 14b35f3c..6da60832 100644
--- a/bookwyrm/activitypub/ordered_collection.py
+++ b/bookwyrm/activitypub/ordered_collection.py
@@ -1,4 +1,4 @@
-''' defines activitypub collections (lists) '''
+""" defines activitypub collections (lists) """
 from dataclasses import dataclass, field
 from typing import List
 
@@ -7,38 +7,46 @@ from .base_activity import ActivityObject
 
 @dataclass(init=False)
 class OrderedCollection(ActivityObject):
-    ''' structure of an ordered collection activity '''
+    """ structure of an ordered collection activity """
+
     totalItems: int
     first: str
     last: str = None
     name: str = None
     owner: str = None
-    type: str = 'OrderedCollection'
+    type: str = "OrderedCollection"
+
 
 @dataclass(init=False)
 class OrderedCollectionPrivate(OrderedCollection):
-    ''' an ordered collection with privacy settings '''
+    """ an ordered collection with privacy settings """
+
     to: List[str] = field(default_factory=lambda: [])
     cc: List[str] = field(default_factory=lambda: [])
 
+
 @dataclass(init=False)
 class Shelf(OrderedCollectionPrivate):
-    ''' structure of an ordered collection activity '''
-    type: str = 'Shelf'
+    """ structure of an ordered collection activity """
+
+    type: str = "Shelf"
+
 
 @dataclass(init=False)
 class BookList(OrderedCollectionPrivate):
-    ''' structure of an ordered collection activity '''
+    """ structure of an ordered collection activity """
+
     summary: str = None
-    curation: str = 'closed'
-    type: str = 'BookList'
+    curation: str = "closed"
+    type: str = "BookList"
 
 
 @dataclass(init=False)
 class OrderedCollectionPage(ActivityObject):
-    ''' structure of an ordered collection activity '''
+    """ structure of an ordered collection activity """
+
     partOf: str
     orderedItems: List
     next: str = None
     prev: str = None
-    type: str = 'OrderedCollectionPage'
+    type: str = "OrderedCollectionPage"
diff --git a/bookwyrm/activitypub/person.py b/bookwyrm/activitypub/person.py
index 7e7d027e..ba86b036 100644
--- a/bookwyrm/activitypub/person.py
+++ b/bookwyrm/activitypub/person.py
@@ -1,4 +1,4 @@
-''' actor serializer '''
+""" actor serializer """
 from dataclasses import dataclass, field
 from typing import Dict
 
@@ -8,15 +8,17 @@ from .image import Image
 
 @dataclass(init=False)
 class PublicKey(ActivityObject):
-    ''' public key block '''
+    """ public key block """
+
     owner: str
     publicKeyPem: str
-    type: str = 'PublicKey'
+    type: str = "PublicKey"
 
 
 @dataclass(init=False)
 class Person(ActivityObject):
-    ''' actor activitypub json '''
+    """ actor activitypub json """
+
     preferredUsername: str
     inbox: str
     outbox: str
@@ -29,4 +31,4 @@ class Person(ActivityObject):
     bookwyrmUser: bool = False
     manuallyApprovesFollowers: str = False
     discoverable: str = True
-    type: str = 'Person'
+    type: str = "Person"
diff --git a/bookwyrm/activitypub/response.py b/bookwyrm/activitypub/response.py
index 8f3c050b..07f39c7e 100644
--- a/bookwyrm/activitypub/response.py
+++ b/bookwyrm/activitypub/response.py
@@ -2,6 +2,7 @@ from django.http import JsonResponse
 
 from .base_activity import ActivityEncoder
 
+
 class ActivitypubResponse(JsonResponse):
     """
     A class to be used in any place that's serializing responses for
@@ -9,10 +10,17 @@ class ActivitypubResponse(JsonResponse):
     configures some stuff beforehand. Made to be a drop-in replacement of
     JsonResponse.
     """
-    def __init__(self, data, encoder=ActivityEncoder, safe=False,
-                 json_dumps_params=None, **kwargs):
 
-        if 'content_type' not in kwargs:
-            kwargs['content_type'] = 'application/activity+json'
+    def __init__(
+        self,
+        data,
+        encoder=ActivityEncoder,
+        safe=False,
+        json_dumps_params=None,
+        **kwargs
+    ):
+
+        if "content_type" not in kwargs:
+            kwargs["content_type"] = "application/activity+json"
 
         super().__init__(data, encoder, safe, json_dumps_params, **kwargs)
diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index 1236338b..cd7a757b 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -1,4 +1,4 @@
-''' undo wrapper activity '''
+""" undo wrapper activity """
 from dataclasses import dataclass
 from typing import List
 from django.apps import apps
@@ -9,160 +9,173 @@ from .book import Edition
 
 @dataclass(init=False)
 class Verb(ActivityObject):
-    ''' generic fields for activities - maybe an unecessary level of
-        abstraction but w/e '''
+    """generic fields for activities - maybe an unecessary level of
+    abstraction but w/e"""
+
     actor: str
     object: ActivityObject
 
     def action(self):
-        ''' usually we just want to save, this can be overridden as needed '''
+        """ usually we just want to save, this can be overridden as needed """
         self.object.to_model()
 
 
 @dataclass(init=False)
 class Create(Verb):
-    ''' Create activity '''
+    """ Create activity """
+
     to: List
     cc: List
     signature: Signature = None
-    type: str = 'Create'
+    type: str = "Create"
 
 
 @dataclass(init=False)
 class Delete(Verb):
-    ''' Create activity '''
+    """ Create activity """
+
     to: List
     cc: List
-    type: str = 'Delete'
+    type: str = "Delete"
 
     def action(self):
-        ''' find and delete the activity object '''
+        """ find and delete the activity object """
         obj = self.object.to_model(save=False, allow_create=False)
         obj.delete()
 
 
-
 @dataclass(init=False)
 class Update(Verb):
-    ''' Update activity '''
+    """ Update activity """
+
     to: List
-    type: str = 'Update'
+    type: str = "Update"
 
     def action(self):
-        ''' update a model instance from the dataclass '''
+        """ update a model instance from the dataclass """
         self.object.to_model(allow_create=False)
 
 
 @dataclass(init=False)
 class Undo(Verb):
-    ''' Undo an activity '''
-    type: str = 'Undo'
+    """ Undo an activity """
+
+    type: str = "Undo"
 
     def action(self):
-        ''' find and remove the activity object '''
+        """ find and remove the activity object """
         # this is so hacky but it does make it work....
         # (because you Reject a request and Undo a follow
         model = None
-        if self.object.type == 'Follow':
-            model = apps.get_model('bookwyrm.UserFollows')
+        if self.object.type == "Follow":
+            model = apps.get_model("bookwyrm.UserFollows")
         obj = self.object.to_model(model=model, save=False, allow_create=False)
         obj.delete()
 
 
 @dataclass(init=False)
 class Follow(Verb):
-    ''' Follow activity '''
+    """ Follow activity """
+
     object: str
-    type: str = 'Follow'
+    type: str = "Follow"
 
     def action(self):
-        ''' relationship save '''
+        """ relationship save """
         self.to_model()
 
 
 @dataclass(init=False)
 class Block(Verb):
-    ''' Block activity '''
+    """ Block activity """
+
     object: str
-    type: str = 'Block'
+    type: str = "Block"
 
     def action(self):
-        ''' relationship save '''
+        """ relationship save """
         self.to_model()
 
 
 @dataclass(init=False)
 class Accept(Verb):
-    ''' Accept activity '''
+    """ Accept activity """
+
     object: Follow
-    type: str = 'Accept'
+    type: str = "Accept"
 
     def action(self):
-        ''' find and remove the activity object '''
+        """ find and remove the activity object """
         obj = self.object.to_model(save=False, allow_create=False)
         obj.accept()
 
 
 @dataclass(init=False)
 class Reject(Verb):
-    ''' Reject activity '''
+    """ Reject activity """
+
     object: Follow
-    type: str = 'Reject'
+    type: str = "Reject"
 
     def action(self):
-        ''' find and remove the activity object '''
+        """ find and remove the activity object """
         obj = self.object.to_model(save=False, allow_create=False)
         obj.reject()
 
 
 @dataclass(init=False)
 class Add(Verb):
-    '''Add activity '''
+    """Add activity """
+
     target: str
     object: Edition
-    type: str = 'Add'
+    type: str = "Add"
     notes: str = None
     order: int = 0
     approved: bool = True
 
     def action(self):
-        ''' add obj to collection '''
+        """ add obj to collection """
         target = resolve_remote_id(self.target, refresh=False)
         # we want to related field that isn't the book, this is janky af sorry
-        model = [t for t in type(target)._meta.related_objects \
-                if t.name != 'edition'][0].related_model
+        model = [t for t in type(target)._meta.related_objects if t.name != "edition"][
+            0
+        ].related_model
         self.to_model(model=model)
 
 
 @dataclass(init=False)
 class Remove(Verb):
-    '''Remove activity '''
+    """Remove activity """
+
     target: ActivityObject
-    type: str = 'Remove'
+    type: str = "Remove"
 
     def action(self):
-        ''' find and remove the activity object '''
+        """ find and remove the activity object """
         obj = self.object.to_model(save=False, allow_create=False)
         obj.delete()
 
 
 @dataclass(init=False)
 class Like(Verb):
-    ''' a user faving an object '''
+    """ a user faving an object """
+
     object: str
-    type: str = 'Like'
+    type: str = "Like"
 
     def action(self):
-        ''' like '''
+        """ like """
         self.to_model()
 
 
 @dataclass(init=False)
 class Announce(Verb):
-    ''' boosting a status '''
+    """ boosting a status """
+
     object: str
-    type: str = 'Announce'
+    type: str = "Announce"
 
     def action(self):
-        ''' boost '''
+        """ boost """
         self.to_model()
diff --git a/bookwyrm/admin.py b/bookwyrm/admin.py
index 45af81d9..efe5e9d7 100644
--- a/bookwyrm/admin.py
+++ b/bookwyrm/admin.py
@@ -1,4 +1,4 @@
-''' models that will show up in django admin for superuser '''
+""" models that will show up in django admin for superuser """
 from django.contrib import admin
 from bookwyrm import models
 
diff --git a/bookwyrm/connectors/__init__.py b/bookwyrm/connectors/__init__.py
index cfafd286..689f2701 100644
--- a/bookwyrm/connectors/__init__.py
+++ b/bookwyrm/connectors/__init__.py
@@ -1,4 +1,4 @@
-''' bring connectors into the namespace '''
+""" bring connectors into the namespace """
 from .settings import CONNECTORS
 from .abstract_connector import ConnectorException
 from .abstract_connector import get_data, get_image
diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index e6372438..9f31b337 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -1,4 +1,4 @@
-''' functionality outline for a book data connector '''
+""" functionality outline for a book data connector """
 from abc import ABC, abstractmethod
 from dataclasses import asdict, dataclass
 import logging
@@ -13,8 +13,11 @@ from .connector_manager import load_more_data, ConnectorException
 
 
 logger = logging.getLogger(__name__)
+
+
 class AbstractMinimalConnector(ABC):
-    ''' just the bare bones, for other bookwyrm instances '''
+    """ just the bare bones, for other bookwyrm instances """
+
     def __init__(self, identifier):
         # load connector settings
         info = models.Connector.objects.get(identifier=identifier)
@@ -22,31 +25,31 @@ class AbstractMinimalConnector(ABC):
 
         # the things in the connector model to copy over
         self_fields = [
-            'base_url',
-            'books_url',
-            'covers_url',
-            'search_url',
-            'isbn_search_url',
-            'max_query_count',
-            'name',
-            'identifier',
-            'local'
+            "base_url",
+            "books_url",
+            "covers_url",
+            "search_url",
+            "isbn_search_url",
+            "max_query_count",
+            "name",
+            "identifier",
+            "local",
         ]
         for field in self_fields:
             setattr(self, field, getattr(info, field))
 
     def search(self, query, min_confidence=None):
-        ''' free text search '''
+        """ free text search """
         params = {}
         if min_confidence:
-            params['min_confidence'] = min_confidence
+            params["min_confidence"] = min_confidence
 
         resp = requests.get(
-            '%s%s' % (self.search_url, query),
+            "%s%s" % (self.search_url, query),
             params=params,
             headers={
-                'Accept': 'application/json; charset=utf-8',
-                'User-Agent': settings.USER_AGENT,
+                "Accept": "application/json; charset=utf-8",
+                "User-Agent": settings.USER_AGENT,
             },
         )
         if not resp.ok:
@@ -55,7 +58,7 @@ class AbstractMinimalConnector(ABC):
             data = resp.json()
         except ValueError as e:
             logger.exception(e)
-            raise ConnectorException('Unable to parse json response', e)
+            raise ConnectorException("Unable to parse json response", e)
         results = []
 
         for doc in self.parse_search_data(data)[:10]:
@@ -63,14 +66,14 @@ class AbstractMinimalConnector(ABC):
         return results
 
     def isbn_search(self, query):
-        ''' isbn search '''
+        """ isbn search """
         params = {}
         resp = requests.get(
-            '%s%s' % (self.isbn_search_url, query),
+            "%s%s" % (self.isbn_search_url, query),
             params=params,
             headers={
-                'Accept': 'application/json; charset=utf-8',
-                'User-Agent': settings.USER_AGENT,
+                "Accept": "application/json; charset=utf-8",
+                "User-Agent": settings.USER_AGENT,
             },
         )
         if not resp.ok:
@@ -79,7 +82,7 @@ class AbstractMinimalConnector(ABC):
             data = resp.json()
         except ValueError as e:
             logger.exception(e)
-            raise ConnectorException('Unable to parse json response', e)
+            raise ConnectorException("Unable to parse json response", e)
         results = []
 
         for doc in self.parse_isbn_search_data(data):
@@ -88,49 +91,49 @@ class AbstractMinimalConnector(ABC):
 
     @abstractmethod
     def get_or_create_book(self, remote_id):
-        ''' pull up a book record by whatever means possible '''
+        """ pull up a book record by whatever means possible """
 
     @abstractmethod
     def parse_search_data(self, data):
-        ''' turn the result json from a search into a list '''
+        """ turn the result json from a search into a list """
 
     @abstractmethod
     def format_search_result(self, search_result):
-        ''' create a SearchResult obj from json '''
+        """ create a SearchResult obj from json """
 
     @abstractmethod
     def parse_isbn_search_data(self, data):
-        ''' turn the result json from a search into a list '''
+        """ turn the result json from a search into a list """
 
     @abstractmethod
     def format_isbn_search_result(self, search_result):
-        ''' create a SearchResult obj from json '''
+        """ create a SearchResult obj from json """
 
 
 class AbstractConnector(AbstractMinimalConnector):
-    ''' generic book data connector '''
+    """ generic book data connector """
+
     def __init__(self, identifier):
         super().__init__(identifier)
         # fields we want to look for in book data to copy over
         # title we handle separately.
         self.book_mappings = []
 
-
     def is_available(self):
-        ''' check if you're allowed to use this connector '''
+        """ check if you're allowed to use this connector """
         if self.max_query_count is not None:
             if self.connector.query_count >= self.max_query_count:
                 return False
         return True
 
-
     def get_or_create_book(self, remote_id):
-        ''' translate arbitrary json into an Activitypub dataclass '''
+        """ translate arbitrary json into an Activitypub dataclass """
         # first, check if we have the origin_id saved
-        existing = models.Edition.find_existing_by_remote_id(remote_id) or \
-                models.Work.find_existing_by_remote_id(remote_id)
+        existing = models.Edition.find_existing_by_remote_id(
+            remote_id
+        ) or models.Work.find_existing_by_remote_id(remote_id)
         if existing:
-            if hasattr(existing, 'get_default_editon'):
+            if hasattr(existing, "get_default_editon"):
                 return existing.get_default_editon()
             return existing
 
@@ -154,7 +157,7 @@ class AbstractConnector(AbstractMinimalConnector):
             edition_data = data
 
         if not work_data or not edition_data:
-            raise ConnectorException('Unable to load book data: %s' % remote_id)
+            raise ConnectorException("Unable to load book data: %s" % remote_id)
 
         with transaction.atomic():
             # create activitypub object
@@ -168,11 +171,10 @@ class AbstractConnector(AbstractMinimalConnector):
         load_more_data.delay(self.connector.id, work.id)
         return edition
 
-
     def create_edition_from_data(self, work, edition_data):
-        ''' if we already have the work, we're ready '''
+        """ if we already have the work, we're ready """
         mapped_data = dict_from_mappings(edition_data, self.book_mappings)
-        mapped_data['work'] = work.remote_id
+        mapped_data["work"] = work.remote_id
         edition_activity = activitypub.Edition(**mapped_data)
         edition = edition_activity.to_model(model=models.Edition)
         edition.connector = self.connector
@@ -189,9 +191,8 @@ class AbstractConnector(AbstractMinimalConnector):
 
         return edition
 
-
     def get_or_create_author(self, remote_id):
-        ''' load that author '''
+        """ load that author """
         existing = models.Author.find_existing_by_remote_id(remote_id)
         if existing:
             return existing
@@ -203,31 +204,30 @@ class AbstractConnector(AbstractMinimalConnector):
         # this will dedupe
         return activity.to_model(model=models.Author)
 
-
     @abstractmethod
     def is_work_data(self, data):
-        ''' differentiate works and editions '''
+        """ differentiate works and editions """
 
     @abstractmethod
     def get_edition_from_work_data(self, data):
-        ''' every work needs at least one edition '''
+        """ every work needs at least one edition """
 
     @abstractmethod
     def get_work_from_edition_data(self, data):
-        ''' every edition needs a work '''
+        """ every edition needs a work """
 
     @abstractmethod
     def get_authors_from_data(self, data):
-        ''' load author data '''
+        """ load author data """
 
     @abstractmethod
     def expand_book_data(self, book):
-        ''' get more info on a book '''
+        """ get more info on a book """
 
 
 def dict_from_mappings(data, mappings):
-    ''' create a dict in Activitypub format, using mappings supplies by
-    the subclass '''
+    """create a dict in Activitypub format, using mappings supplies by
+    the subclass"""
     result = {}
     for mapping in mappings:
         result[mapping.local_field] = mapping.get_value(data)
@@ -235,13 +235,13 @@ def dict_from_mappings(data, mappings):
 
 
 def get_data(url):
-    ''' wrapper for request.get '''
+    """ wrapper for request.get """
     try:
         resp = requests.get(
             url,
             headers={
-                'Accept': 'application/json; charset=utf-8',
-                'User-Agent': settings.USER_AGENT,
+                "Accept": "application/json; charset=utf-8",
+                "User-Agent": settings.USER_AGENT,
             },
         )
     except (RequestError, SSLError) as e:
@@ -260,12 +260,12 @@ def get_data(url):
 
 
 def get_image(url):
-    ''' wrapper for requesting an image '''
+    """ wrapper for requesting an image """
     try:
         resp = requests.get(
             url,
             headers={
-                'User-Agent': settings.USER_AGENT,
+                "User-Agent": settings.USER_AGENT,
             },
         )
     except (RequestError, SSLError) as e:
@@ -278,7 +278,8 @@ def get_image(url):
 
 @dataclass
 class SearchResult:
-    ''' standardized search result object '''
+    """ standardized search result object """
+
     title: str
     key: str
     author: str
@@ -288,17 +289,19 @@ class SearchResult:
 
     def __repr__(self):
         return "<SearchResult key={!r} title={!r} author={!r}>".format(
-            self.key, self.title, self.author)
+            self.key, self.title, self.author
+        )
 
     def json(self):
-        ''' serialize a connector for json response '''
+        """ serialize a connector for json response """
         serialized = asdict(self)
-        del serialized['connector']
+        del serialized["connector"]
         return serialized
 
 
 class Mapping:
-    ''' associate a local database field with a field in an external dataset '''
+    """ associate a local database field with a field in an external dataset """
+
     def __init__(self, local_field, remote_field=None, formatter=None):
         noop = lambda x: x
 
@@ -307,11 +310,11 @@ class Mapping:
         self.formatter = formatter or noop
 
     def get_value(self, data):
-        ''' pull a field from incoming json and return the formatted version '''
+        """ pull a field from incoming json and return the formatted version """
         value = data.get(self.remote_field)
         if not value:
             return None
         try:
             return self.formatter(value)
-        except:# pylint: disable=bare-except
+        except:  # pylint: disable=bare-except
             return None
diff --git a/bookwyrm/connectors/bookwyrm_connector.py b/bookwyrm/connectors/bookwyrm_connector.py
index 96b72f26..742d7e85 100644
--- a/bookwyrm/connectors/bookwyrm_connector.py
+++ b/bookwyrm/connectors/bookwyrm_connector.py
@@ -1,10 +1,10 @@
-''' using another bookwyrm instance as a source of book data '''
+""" using another bookwyrm instance as a source of book data """
 from bookwyrm import activitypub, models
 from .abstract_connector import AbstractMinimalConnector, SearchResult
 
 
 class Connector(AbstractMinimalConnector):
-    ''' this is basically just for search '''
+    """ this is basically just for search """
 
     def get_or_create_book(self, remote_id):
         edition = activitypub.resolve_remote_id(remote_id, model=models.Edition)
@@ -17,13 +17,12 @@ class Connector(AbstractMinimalConnector):
         return data
 
     def format_search_result(self, search_result):
-        search_result['connector'] = self
+        search_result["connector"] = self
         return SearchResult(**search_result)
 
     def parse_isbn_search_data(self, data):
         return data
 
     def format_isbn_search_result(self, search_result):
-        search_result['connector'] = self
+        search_result["connector"] = self
         return SearchResult(**search_result)
-
diff --git a/bookwyrm/connectors/connector_manager.py b/bookwyrm/connectors/connector_manager.py
index 053e1f9e..3891d02a 100644
--- a/bookwyrm/connectors/connector_manager.py
+++ b/bookwyrm/connectors/connector_manager.py
@@ -1,4 +1,4 @@
-''' interface with whatever connectors the app has '''
+""" interface with whatever connectors the app has """
 import importlib
 import re
 from urllib.parse import urlparse
@@ -10,24 +10,24 @@ from bookwyrm.tasks import app
 
 
 class ConnectorException(HTTPError):
-    ''' when the connector can't do what was asked '''
+    """ when the connector can't do what was asked """
 
 
 def search(query, min_confidence=0.1):
-    ''' find books based on arbitary keywords '''
+    """ find books based on arbitary keywords """
     results = []
 
     # Have we got a ISBN ?
-    isbn = re.sub('[\W_]', '', query)
-    maybe_isbn = len(isbn) in [10, 13] # ISBN10 or ISBN13
+    isbn = re.sub("[\W_]", "", query)
+    maybe_isbn = len(isbn) in [10, 13]  # ISBN10 or ISBN13
 
-    dedup_slug = lambda r: '%s/%s/%s' % (r.title, r.author, r.year)
+    dedup_slug = lambda r: "%s/%s/%s" % (r.title, r.author, r.year)
     result_index = set()
     for connector in get_connectors():
         result_set = None
         if maybe_isbn:
             # Search on ISBN
-            if not connector.isbn_search_url or connector.isbn_search_url == '': 
+            if not connector.isbn_search_url or connector.isbn_search_url == "":
                 result_set = []
             else:
                 try:
@@ -42,32 +42,33 @@ def search(query, min_confidence=0.1):
             except (HTTPError, ConnectorException):
                 continue
 
-        result_set = [r for r in result_set \
-                if dedup_slug(r) not in result_index]
+        result_set = [r for r in result_set if dedup_slug(r) not in result_index]
         # `|=` concats two sets. WE ARE GETTING FANCY HERE
         result_index |= set(dedup_slug(r) for r in result_set)
-        results.append({
-            'connector': connector,
-            'results': result_set,
-        })
+        results.append(
+            {
+                "connector": connector,
+                "results": result_set,
+            }
+        )
 
     return results
 
 
 def local_search(query, min_confidence=0.1, raw=False):
-    ''' only look at local search results '''
+    """ only look at local search results """
     connector = load_connector(models.Connector.objects.get(local=True))
     return connector.search(query, min_confidence=min_confidence, raw=raw)
 
 
 def isbn_local_search(query, raw=False):
-    ''' only look at local search results '''
+    """ only look at local search results """
     connector = load_connector(models.Connector.objects.get(local=True))
     return connector.isbn_search(query, raw=raw)
 
 
 def first_search_result(query, min_confidence=0.1):
-    ''' search until you find a result that fits '''
+    """ search until you find a result that fits """
     for connector in get_connectors():
         result = connector.search(query, min_confidence=min_confidence)
         if result:
@@ -76,29 +77,29 @@ def first_search_result(query, min_confidence=0.1):
 
 
 def get_connectors():
-    ''' load all connectors '''
-    for info in models.Connector.objects.order_by('priority').all():
+    """ load all connectors """
+    for info in models.Connector.objects.order_by("priority").all():
         yield load_connector(info)
 
 
 def get_or_create_connector(remote_id):
-    ''' get the connector related to the author's server '''
+    """ get the connector related to the author's server """
     url = urlparse(remote_id)
     identifier = url.netloc
     if not identifier:
-        raise ValueError('Invalid remote id')
+        raise ValueError("Invalid remote id")
 
     try:
         connector_info = models.Connector.objects.get(identifier=identifier)
     except models.Connector.DoesNotExist:
         connector_info = models.Connector.objects.create(
             identifier=identifier,
-            connector_file='bookwyrm_connector',
-            base_url='https://%s' % identifier,
-            books_url='https://%s/book' % identifier,
-            covers_url='https://%s/images/covers' % identifier,
-            search_url='https://%s/search?q=' % identifier,
-            priority=2
+            connector_file="bookwyrm_connector",
+            base_url="https://%s" % identifier,
+            books_url="https://%s/book" % identifier,
+            covers_url="https://%s/images/covers" % identifier,
+            search_url="https://%s/search?q=" % identifier,
+            priority=2,
         )
 
     return load_connector(connector_info)
@@ -106,7 +107,7 @@ def get_or_create_connector(remote_id):
 
 @app.task
 def load_more_data(connector_id, book_id):
-    ''' background the work of getting all 10,000 editions of LoTR '''
+    """ background the work of getting all 10,000 editions of LoTR """
     connector_info = models.Connector.objects.get(id=connector_id)
     connector = load_connector(connector_info)
     book = models.Book.objects.select_subclasses().get(id=book_id)
@@ -114,8 +115,8 @@ def load_more_data(connector_id, book_id):
 
 
 def load_connector(connector_info):
-    ''' instantiate the connector class '''
+    """ instantiate the connector class """
     connector = importlib.import_module(
-        'bookwyrm.connectors.%s' % connector_info.connector_file
+        "bookwyrm.connectors.%s" % connector_info.connector_file
     )
     return connector.Connector(connector_info.identifier)
diff --git a/bookwyrm/connectors/openlibrary.py b/bookwyrm/connectors/openlibrary.py
index 8d227eef..fb9a4e47 100644
--- a/bookwyrm/connectors/openlibrary.py
+++ b/bookwyrm/connectors/openlibrary.py
@@ -1,4 +1,4 @@
-''' openlibrary data connector '''
+""" openlibrary data connector """
 import re
 
 from bookwyrm import models
@@ -9,148 +9,134 @@ from .openlibrary_languages import languages
 
 
 class Connector(AbstractConnector):
-    ''' instantiate a connector for OL '''
+    """ instantiate a connector for OL """
+
     def __init__(self, identifier):
         super().__init__(identifier)
 
         get_first = lambda a: a[0]
         get_remote_id = lambda a: self.base_url + a
         self.book_mappings = [
-            Mapping('title'),
-            Mapping('id', remote_field='key', formatter=get_remote_id),
+            Mapping("title"),
+            Mapping("id", remote_field="key", formatter=get_remote_id),
+            Mapping("cover", remote_field="covers", formatter=self.get_cover_url),
+            Mapping("sortTitle", remote_field="sort_title"),
+            Mapping("subtitle"),
+            Mapping("description", formatter=get_description),
+            Mapping("languages", formatter=get_languages),
+            Mapping("series", formatter=get_first),
+            Mapping("seriesNumber", remote_field="series_number"),
+            Mapping("subjects"),
+            Mapping("subjectPlaces", remote_field="subject_places"),
+            Mapping("isbn13", remote_field="isbn_13", formatter=get_first),
+            Mapping("isbn10", remote_field="isbn_10", formatter=get_first),
+            Mapping("lccn", formatter=get_first),
+            Mapping("oclcNumber", remote_field="oclc_numbers", formatter=get_first),
             Mapping(
-                'cover', remote_field='covers', formatter=self.get_cover_url),
-            Mapping('sortTitle', remote_field='sort_title'),
-            Mapping('subtitle'),
-            Mapping('description', formatter=get_description),
-            Mapping('languages', formatter=get_languages),
-            Mapping('series', formatter=get_first),
-            Mapping('seriesNumber', remote_field='series_number'),
-            Mapping('subjects'),
-            Mapping('subjectPlaces', remote_field='subject_places'),
-            Mapping('isbn13', remote_field='isbn_13', formatter=get_first),
-            Mapping('isbn10', remote_field='isbn_10', formatter=get_first),
-            Mapping('lccn', formatter=get_first),
-            Mapping(
-                'oclcNumber', remote_field='oclc_numbers',
-                formatter=get_first
+                "openlibraryKey", remote_field="key", formatter=get_openlibrary_key
             ),
+            Mapping("goodreadsKey", remote_field="goodreads_key"),
+            Mapping("asin"),
             Mapping(
-                'openlibraryKey', remote_field='key',
-                formatter=get_openlibrary_key
+                "firstPublishedDate",
+                remote_field="first_publish_date",
             ),
-            Mapping('goodreadsKey', remote_field='goodreads_key'),
-            Mapping('asin'),
-            Mapping(
-                'firstPublishedDate', remote_field='first_publish_date',
-            ),
-            Mapping('publishedDate', remote_field='publish_date'),
-            Mapping('pages', remote_field='number_of_pages'),
-            Mapping('physicalFormat', remote_field='physical_format'),
-            Mapping('publishers'),
+            Mapping("publishedDate", remote_field="publish_date"),
+            Mapping("pages", remote_field="number_of_pages"),
+            Mapping("physicalFormat", remote_field="physical_format"),
+            Mapping("publishers"),
         ]
 
         self.author_mappings = [
-            Mapping('id', remote_field='key', formatter=get_remote_id),
-            Mapping('name'),
+            Mapping("id", remote_field="key", formatter=get_remote_id),
+            Mapping("name"),
             Mapping(
-                'openlibraryKey', remote_field='key',
-                formatter=get_openlibrary_key
+                "openlibraryKey", remote_field="key", formatter=get_openlibrary_key
             ),
-            Mapping('born', remote_field='birth_date'),
-            Mapping('died', remote_field='death_date'),
-            Mapping('bio', formatter=get_description),
+            Mapping("born", remote_field="birth_date"),
+            Mapping("died", remote_field="death_date"),
+            Mapping("bio", formatter=get_description),
         ]
 
-
     def get_remote_id_from_data(self, data):
-        ''' format a url from an openlibrary id field '''
+        """ format a url from an openlibrary id field """
         try:
-            key = data['key']
+            key = data["key"]
         except KeyError:
-            raise ConnectorException('Invalid book data')
-        return '%s%s' % (self.books_url, key)
-
+            raise ConnectorException("Invalid book data")
+        return "%s%s" % (self.books_url, key)
 
     def is_work_data(self, data):
-        return bool(re.match(r'^[\/\w]+OL\d+W$', data['key']))
-
+        return bool(re.match(r"^[\/\w]+OL\d+W$", data["key"]))
 
     def get_edition_from_work_data(self, data):
         try:
-            key = data['key']
+            key = data["key"]
         except KeyError:
-            raise ConnectorException('Invalid book data')
-        url = '%s%s/editions' % (self.books_url, key)
+            raise ConnectorException("Invalid book data")
+        url = "%s%s/editions" % (self.books_url, key)
         data = get_data(url)
-        return pick_default_edition(data['entries'])
-
+        return pick_default_edition(data["entries"])
 
     def get_work_from_edition_data(self, data):
         try:
-            key = data['works'][0]['key']
+            key = data["works"][0]["key"]
         except (IndexError, KeyError):
-            raise ConnectorException('No work found for edition')
-        url = '%s%s' % (self.books_url, key)
+            raise ConnectorException("No work found for edition")
+        url = "%s%s" % (self.books_url, key)
         return get_data(url)
 
-
     def get_authors_from_data(self, data):
-        ''' parse author json and load or create authors '''
-        for author_blob in data.get('authors', []):
-            author_blob = author_blob.get('author', author_blob)
+        """ parse author json and load or create authors """
+        for author_blob in data.get("authors", []):
+            author_blob = author_blob.get("author", author_blob)
             # this id is "/authors/OL1234567A"
-            author_id = author_blob['key']
-            url = '%s%s' % (self.base_url, author_id)
+            author_id = author_blob["key"]
+            url = "%s%s" % (self.base_url, author_id)
             yield self.get_or_create_author(url)
 
-
     def get_cover_url(self, cover_blob):
-        ''' ask openlibrary for the cover '''
+        """ ask openlibrary for the cover """
         cover_id = cover_blob[0]
-        image_name = '%s-L.jpg' % cover_id
-        return '%s/b/id/%s' % (self.covers_url, image_name)
-
+        image_name = "%s-L.jpg" % cover_id
+        return "%s/b/id/%s" % (self.covers_url, image_name)
 
     def parse_search_data(self, data):
-        return data.get('docs')
-
+        return data.get("docs")
 
     def format_search_result(self, search_result):
         # build the remote id from the openlibrary key
-        key = self.books_url + search_result['key']
-        author = search_result.get('author_name') or ['Unknown']
+        key = self.books_url + search_result["key"]
+        author = search_result.get("author_name") or ["Unknown"]
         return SearchResult(
-            title=search_result.get('title'),
+            title=search_result.get("title"),
             key=key,
-            author=', '.join(author),
+            author=", ".join(author),
             connector=self,
-            year=search_result.get('first_publish_year'),
+            year=search_result.get("first_publish_year"),
         )
 
-
     def parse_isbn_search_data(self, data):
         return list(data.values())
 
     def format_isbn_search_result(self, search_result):
         # build the remote id from the openlibrary key
-        key = self.books_url + search_result['key']
-        authors = search_result.get('authors') or [{'name': 'Unknown'}]
-        author_names = [ author.get('name') for author in authors]
+        key = self.books_url + search_result["key"]
+        authors = search_result.get("authors") or [{"name": "Unknown"}]
+        author_names = [author.get("name") for author in authors]
         return SearchResult(
-            title=search_result.get('title'),
+            title=search_result.get("title"),
             key=key,
-            author=', '.join(author_names),
+            author=", ".join(author_names),
             connector=self,
-            year=search_result.get('publish_date'),
+            year=search_result.get("publish_date"),
         )
 
     def load_edition_data(self, olkey):
-        ''' query openlibrary for editions of a work '''
-        url = '%s/works/%s/editions' % (self.books_url, olkey)
+        """ query openlibrary for editions of a work """
+        url = "%s/works/%s/editions" % (self.books_url, olkey)
         return get_data(url)
 
-
     def expand_book_data(self, book):
         work = book
         # go from the edition to the work, if necessary
@@ -164,7 +150,7 @@ class Connector(AbstractConnector):
             # who knows, man
             return
 
-        for edition_data in edition_options.get('entries'):
+        for edition_data in edition_options.get("entries"):
             # does this edition have ANY interesting data?
             if ignore_edition(edition_data):
                 continue
@@ -172,62 +158,63 @@ class Connector(AbstractConnector):
 
 
 def ignore_edition(edition_data):
-    ''' don't load a million editions that have no metadata '''
+    """ don't load a million editions that have no metadata """
     # an isbn, we love to see it
-    if edition_data.get('isbn_13') or edition_data.get('isbn_10'):
-        print(edition_data.get('isbn_10'))
+    if edition_data.get("isbn_13") or edition_data.get("isbn_10"):
+        print(edition_data.get("isbn_10"))
         return False
     # grudgingly, oclc can stay
-    if edition_data.get('oclc_numbers'):
-        print(edition_data.get('oclc_numbers'))
+    if edition_data.get("oclc_numbers"):
+        print(edition_data.get("oclc_numbers"))
         return False
     # if it has a cover it can stay
-    if edition_data.get('covers'):
-        print(edition_data.get('covers'))
+    if edition_data.get("covers"):
+        print(edition_data.get("covers"))
         return False
     # keep non-english editions
-    if edition_data.get('languages') and \
-            'languages/eng' not in str(edition_data.get('languages')):
-        print(edition_data.get('languages'))
+    if edition_data.get("languages") and "languages/eng" not in str(
+        edition_data.get("languages")
+    ):
+        print(edition_data.get("languages"))
         return False
     return True
 
 
 def get_description(description_blob):
-    ''' descriptions can be a string or a dict '''
+    """ descriptions can be a string or a dict """
     if isinstance(description_blob, dict):
-        return description_blob.get('value')
+        return description_blob.get("value")
     return description_blob
 
 
 def get_openlibrary_key(key):
-    ''' convert /books/OL27320736M into OL27320736M '''
-    return key.split('/')[-1]
+    """ convert /books/OL27320736M into OL27320736M """
+    return key.split("/")[-1]
 
 
 def get_languages(language_blob):
-    ''' /language/eng -> English '''
+    """ /language/eng -> English """
     langs = []
     for lang in language_blob:
-        langs.append(
-            languages.get(lang.get('key', ''), None)
-        )
+        langs.append(languages.get(lang.get("key", ""), None))
     return langs
 
 
 def pick_default_edition(options):
-    ''' favor physical copies with covers in english '''
+    """ favor physical copies with covers in english """
     if not options:
         return None
     if len(options) == 1:
         return options[0]
 
-    options = [e for e in options if e.get('covers')] or options
-    options = [e for e in options if \
-        '/languages/eng' in str(e.get('languages'))] or options
-    formats = ['paperback', 'hardcover', 'mass market paperback']
-    options = [e for e in options if \
-        str(e.get('physical_format')).lower() in formats] or options
-    options = [e for e in options if e.get('isbn_13')] or options
-    options = [e for e in options if e.get('ocaid')] or options
+    options = [e for e in options if e.get("covers")] or options
+    options = [
+        e for e in options if "/languages/eng" in str(e.get("languages"))
+    ] or options
+    formats = ["paperback", "hardcover", "mass market paperback"]
+    options = [
+        e for e in options if str(e.get("physical_format")).lower() in formats
+    ] or options
+    options = [e for e in options if e.get("isbn_13")] or options
+    options = [e for e in options if e.get("ocaid")] or options
     return options[0]
diff --git a/bookwyrm/connectors/openlibrary_languages.py b/bookwyrm/connectors/openlibrary_languages.py
index b687f8b9..2520d1ea 100644
--- a/bookwyrm/connectors/openlibrary_languages.py
+++ b/bookwyrm/connectors/openlibrary_languages.py
@@ -1,467 +1,467 @@
-''' key lookups for openlibrary languages '''
+""" key lookups for openlibrary languages """
 languages = {
-    '/languages/eng': 'English',
-    '/languages/fre': 'French',
-    '/languages/spa': 'Spanish',
-    '/languages/ger': 'German',
-    '/languages/rus': 'Russian',
-    '/languages/ita': 'Italian',
-    '/languages/chi': 'Chinese',
-    '/languages/jpn': 'Japanese',
-    '/languages/por': 'Portuguese',
-    '/languages/ara': 'Arabic',
-    '/languages/pol': 'Polish',
-    '/languages/heb': 'Hebrew',
-    '/languages/kor': 'Korean',
-    '/languages/dut': 'Dutch',
-    '/languages/ind': 'Indonesian',
-    '/languages/lat': 'Latin',
-    '/languages/und': 'Undetermined',
-    '/languages/cmn': 'Mandarin',
-    '/languages/hin': 'Hindi',
-    '/languages/swe': 'Swedish',
-    '/languages/dan': 'Danish',
-    '/languages/urd': 'Urdu',
-    '/languages/hun': 'Hungarian',
-    '/languages/cze': 'Czech',
-    '/languages/tur': 'Turkish',
-    '/languages/ukr': 'Ukrainian',
-    '/languages/gre': 'Greek',
-    '/languages/vie': 'Vietnamese',
-    '/languages/bul': 'Bulgarian',
-    '/languages/ben': 'Bengali',
-    '/languages/rum': 'Romanian',
-    '/languages/cat': 'Catalan',
-    '/languages/nor': 'Norwegian',
-    '/languages/tha': 'Thai',
-    '/languages/per': 'Persian',
-    '/languages/scr': 'Croatian',
-    '/languages/mul': 'Multiple languages',
-    '/languages/fin': 'Finnish',
-    '/languages/tam': 'Tamil',
-    '/languages/guj': 'Gujarati',
-    '/languages/mar': 'Marathi',
-    '/languages/scc': 'Serbian',
-    '/languages/pan': 'Panjabi',
-    '/languages/wel': 'Welsh',
-    '/languages/tel': 'Telugu',
-    '/languages/yid': 'Yiddish',
-    '/languages/kan': 'Kannada',
-    '/languages/slo': 'Slovak',
-    '/languages/san': 'Sanskrit',
-    '/languages/arm': 'Armenian',
-    '/languages/mal': 'Malayalam',
-    '/languages/may': 'Malay',
-    '/languages/bur': 'Burmese',
-    '/languages/slv': 'Slovenian',
-    '/languages/lit': 'Lithuanian',
-    '/languages/tib': 'Tibetan',
-    '/languages/lav': 'Latvian',
-    '/languages/est': 'Estonian',
-    '/languages/nep': 'Nepali',
-    '/languages/ori': 'Oriya',
-    '/languages/mon': 'Mongolian',
-    '/languages/alb': 'Albanian',
-    '/languages/iri': 'Irish',
-    '/languages/geo': 'Georgian',
-    '/languages/afr': 'Afrikaans',
-    '/languages/grc': 'Ancient Greek',
-    '/languages/mac': 'Macedonian',
-    '/languages/bel': 'Belarusian',
-    '/languages/ice': 'Icelandic',
-    '/languages/srp': 'Serbian',
-    '/languages/snh': 'Sinhalese',
-    '/languages/snd': 'Sindhi',
-    '/languages/ota': 'Turkish, Ottoman',
-    '/languages/kur': 'Kurdish',
-    '/languages/aze': 'Azerbaijani',
-    '/languages/pus': 'Pushto',
-    '/languages/amh': 'Amharic',
-    '/languages/gag': 'Galician',
-    '/languages/hrv': 'Croatian',
-    '/languages/sin': 'Sinhalese',
-    '/languages/asm': 'Assamese',
-    '/languages/uzb': 'Uzbek',
-    '/languages/gae': 'Scottish Gaelix',
-    '/languages/kaz': 'Kazakh',
-    '/languages/swa': 'Swahili',
-    '/languages/bos': 'Bosnian',
-    '/languages/glg': 'Galician ',
-    '/languages/baq': 'Basque',
-    '/languages/tgl': 'Tagalog',
-    '/languages/raj': 'Rajasthani',
-    '/languages/gle': 'Irish',
-    '/languages/lao': 'Lao',
-    '/languages/jav': 'Javanese',
-    '/languages/mai': 'Maithili',
-    '/languages/tgk': 'Tajik ',
-    '/languages/khm': 'Khmer',
-    '/languages/roh': 'Raeto-Romance',
-    '/languages/kok': 'Konkani ',
-    '/languages/sit': 'Sino-Tibetan (Other)',
-    '/languages/mol': 'Moldavian',
-    '/languages/kir': 'Kyrgyz',
-    '/languages/new': 'Newari',
-    '/languages/inc': 'Indic (Other)',
-    '/languages/frm': 'French, Middle (ca. 1300-1600)',
-    '/languages/esp': 'Esperanto',
-    '/languages/hau': 'Hausa',
-    '/languages/tag': 'Tagalog',
-    '/languages/tuk': 'Turkmen',
-    '/languages/enm': 'English, Middle (1100-1500)',
-    '/languages/map': 'Austronesian (Other)',
-    '/languages/pli': 'Pali',
-    '/languages/fro': 'French, Old (ca. 842-1300)',
-    '/languages/nic': 'Niger-Kordofanian (Other)',
-    '/languages/tir': 'Tigrinya',
-    '/languages/wen': 'Sorbian (Other)',
-    '/languages/bho': 'Bhojpuri',
-    '/languages/roa': 'Romance (Other)',
-    '/languages/tut': 'Altaic (Other)',
-    '/languages/bra': 'Braj',
-    '/languages/sun': 'Sundanese',
-    '/languages/fiu': 'Finno-Ugrian (Other)',
-    '/languages/far': 'Faroese',
-    '/languages/ban': 'Balinese',
-    '/languages/tar': 'Tatar',
-    '/languages/bak': 'Bashkir',
-    '/languages/tat': 'Tatar',
-    '/languages/chu': 'Church Slavic',
-    '/languages/dra': 'Dravidian (Other)',
-    '/languages/pra': 'Prakrit languages',
-    '/languages/paa': 'Papuan (Other)',
-    '/languages/doi': 'Dogri',
-    '/languages/lah': 'Lahnd�',
-    '/languages/mni': 'Manipuri',
-    '/languages/yor': 'Yoruba',
-    '/languages/gmh': 'German, Middle High (ca. 1050-1500)',
-    '/languages/kas': 'Kashmiri',
-    '/languages/fri': 'Frisian',
-    '/languages/mla': 'Malagasy',
-    '/languages/egy': 'Egyptian',
-    '/languages/rom': 'Romani',
-    '/languages/syr': 'Syriac, Modern',
-    '/languages/cau': 'Caucasian (Other)',
-    '/languages/hbs': 'Serbo-Croatian',
-    '/languages/sai': 'South American Indian (Other)',
-    '/languages/pro': 'Provençal (to 1500)',
-    '/languages/cpf': 'Creoles and Pidgins, French-based (Other)',
-    '/languages/ang': 'English, Old (ca. 450-1100)',
-    '/languages/bal': 'Baluchi',
-    '/languages/gla': 'Scottish Gaelic',
-    '/languages/chv': 'Chuvash',
-    '/languages/kin': 'Kinyarwanda',
-    '/languages/zul': 'Zulu',
-    '/languages/sla': 'Slavic (Other)',
-    '/languages/som': 'Somali',
-    '/languages/mlt': 'Maltese',
-    '/languages/uig': 'Uighur',
-    '/languages/mlg': 'Malagasy',
-    '/languages/sho': 'Shona',
-    '/languages/lan': 'Occitan (post 1500)',
-    '/languages/bre': 'Breton',
-    '/languages/sco': 'Scots',
-    '/languages/sso': 'Sotho',
-    '/languages/myn': 'Mayan languages',
-    '/languages/xho': 'Xhosa',
-    '/languages/gem': 'Germanic (Other)',
-    '/languages/esk': 'Eskimo languages',
-    '/languages/akk': 'Akkadian',
-    '/languages/div': 'Maldivian',
-    '/languages/sah': 'Yakut',
-    '/languages/tsw': 'Tswana',
-    '/languages/nso': 'Northern Sotho',
-    '/languages/pap': 'Papiamento',
-    '/languages/bnt': 'Bantu (Other)',
-    '/languages/oss': 'Ossetic',
-    '/languages/cre': 'Cree',
-    '/languages/ibo': 'Igbo',
-    '/languages/fao': 'Faroese',
-    '/languages/nai': 'North American Indian (Other)',
-    '/languages/mag': 'Magahi',
-    '/languages/arc': 'Aramaic',
-    '/languages/epo': 'Esperanto',
-    '/languages/kha': 'Khasi',
-    '/languages/oji': 'Ojibwa',
-    '/languages/que': 'Quechua',
-    '/languages/lug': 'Ganda',
-    '/languages/mwr': 'Marwari',
-    '/languages/awa': 'Awadhi ',
-    '/languages/cor': 'Cornish',
-    '/languages/lad': 'Ladino',
-    '/languages/dzo': 'Dzongkha',
-    '/languages/cop': 'Coptic',
-    '/languages/nah': 'Nahuatl',
-    '/languages/cai': 'Central American Indian (Other)',
-    '/languages/phi': 'Philippine (Other)',
-    '/languages/moh': 'Mohawk',
-    '/languages/crp': 'Creoles and Pidgins (Other)',
-    '/languages/nya': 'Nyanja',
-    '/languages/wol': 'Wolof ',
-    '/languages/haw': 'Hawaiian',
-    '/languages/eth': 'Ethiopic',
-    '/languages/mis': 'Miscellaneous languages',
-    '/languages/mkh': 'Mon-Khmer (Other)',
-    '/languages/alg': 'Algonquian (Other)',
-    '/languages/nde': 'Ndebele (Zimbabwe)',
-    '/languages/ssa': 'Nilo-Saharan (Other)',
-    '/languages/chm': 'Mari',
-    '/languages/che': 'Chechen',
-    '/languages/gez': 'Ethiopic',
-    '/languages/ven': 'Venda',
-    '/languages/cam': 'Khmer',
-    '/languages/fur': 'Friulian',
-    '/languages/ful': 'Fula',
-    '/languages/gal': 'Oromo',
-    '/languages/jrb': 'Judeo-Arabic',
-    '/languages/bua': 'Buriat',
-    '/languages/ady': 'Adygei',
-    '/languages/bem': 'Bemba',
-    '/languages/kar': 'Karen languages',
-    '/languages/sna': 'Shona',
-    '/languages/twi': 'Twi',
-    '/languages/btk': 'Batak',
-    '/languages/kaa': 'Kara-Kalpak',
-    '/languages/kom': 'Komi',
-    '/languages/sot': 'Sotho',
-    '/languages/tso': 'Tsonga',
-    '/languages/cpe': 'Creoles and Pidgins, English-based (Other)',
-    '/languages/gua': 'Guarani',
-    '/languages/mao': 'Maori',
-    '/languages/mic': 'Micmac',
-    '/languages/swz': 'Swazi',
-    '/languages/taj': 'Tajik',
-    '/languages/smo': 'Samoan',
-    '/languages/ace': 'Achinese',
-    '/languages/afa': 'Afroasiatic (Other)',
-    '/languages/lap': 'Sami',
-    '/languages/min': 'Minangkabau',
-    '/languages/oci': 'Occitan (post 1500)',
-    '/languages/tsn': 'Tswana',
-    '/languages/pal': 'Pahlavi',
-    '/languages/sux': 'Sumerian',
-    '/languages/ewe': 'Ewe',
-    '/languages/him': 'Himachali',
-    '/languages/kaw': 'Kawi',
-    '/languages/lus': 'Lushai',
-    '/languages/ceb': 'Cebuano',
-    '/languages/chr': 'Cherokee',
-    '/languages/fil': 'Filipino',
-    '/languages/ndo': 'Ndonga',
-    '/languages/ilo': 'Iloko',
-    '/languages/kbd': 'Kabardian',
-    '/languages/orm': 'Oromo',
-    '/languages/dum': 'Dutch, Middle (ca. 1050-1350)',
-    '/languages/bam': 'Bambara',
-    '/languages/goh': 'Old High German',
-    '/languages/got': 'Gothic',
-    '/languages/kon': 'Kongo',
-    '/languages/mun': 'Munda (Other)',
-    '/languages/kru': 'Kurukh',
-    '/languages/pam': 'Pampanga',
-    '/languages/grn': 'Guarani',
-    '/languages/gaa': 'Gã',
-    '/languages/fry': 'Frisian',
-    '/languages/iba': 'Iban',
-    '/languages/mak': 'Makasar',
-    '/languages/kik': 'Kikuyu',
-    '/languages/cho': 'Choctaw',
-    '/languages/cpp': 'Creoles and Pidgins, Portuguese-based (Other)',
-    '/languages/dak': 'Dakota',
-    '/languages/udm': 'Udmurt ',
-    '/languages/hat': 'Haitian French Creole',
-    '/languages/mus': 'Creek',
-    '/languages/ber': 'Berber (Other)',
-    '/languages/hil': 'Hiligaynon',
-    '/languages/iro': 'Iroquoian (Other)',
-    '/languages/kua': 'Kuanyama',
-    '/languages/mno': 'Manobo languages',
-    '/languages/run': 'Rundi',
-    '/languages/sat': 'Santali',
-    '/languages/shn': 'Shan',
-    '/languages/tyv': 'Tuvinian',
-    '/languages/chg': 'Chagatai',
-    '/languages/syc': 'Syriac',
-    '/languages/ath': 'Athapascan (Other)',
-    '/languages/aym': 'Aymara',
-    '/languages/bug': 'Bugis',
-    '/languages/cel': 'Celtic (Other)',
-    '/languages/int': 'Interlingua (International Auxiliary Language Association)',
-    '/languages/xal': 'Oirat',
-    '/languages/ava': 'Avaric',
-    '/languages/son': 'Songhai',
-    '/languages/tah': 'Tahitian',
-    '/languages/tet': 'Tetum',
-    '/languages/ira': 'Iranian (Other)',
-    '/languages/kac': 'Kachin',
-    '/languages/nob': 'Norwegian (Bokmål)',
-    '/languages/vai': 'Vai',
-    '/languages/bik': 'Bikol',
-    '/languages/mos': 'Mooré',
-    '/languages/tig': 'Tigré',
-    '/languages/fat': 'Fanti',
-    '/languages/her': 'Herero',
-    '/languages/kal': 'Kalâtdlisut',
-    '/languages/mad': 'Madurese',
-    '/languages/yue': 'Cantonese',
-    '/languages/chn': 'Chinook jargon',
-    '/languages/hmn': 'Hmong',
-    '/languages/lin': 'Lingala',
-    '/languages/man': 'Mandingo',
-    '/languages/nds': 'Low German',
-    '/languages/bas': 'Basa',
-    '/languages/gay': 'Gayo',
-    '/languages/gsw': 'gsw',
-    '/languages/ine': 'Indo-European (Other)',
-    '/languages/kro': 'Kru (Other)',
-    '/languages/kum': 'Kumyk',
-    '/languages/tsi': 'Tsimshian',
-    '/languages/zap': 'Zapotec',
-    '/languages/ach': 'Acoli',
-    '/languages/ada': 'Adangme',
-    '/languages/aka': 'Akan',
-    '/languages/khi': 'Khoisan (Other)',
-    '/languages/srd': 'Sardinian',
-    '/languages/arn': 'Mapuche',
-    '/languages/dyu': 'Dyula',
-    '/languages/loz': 'Lozi',
-    '/languages/ltz': 'Luxembourgish',
-    '/languages/sag': 'Sango (Ubangi Creole)',
-    '/languages/lez': 'Lezgian',
-    '/languages/luo': 'Luo (Kenya and Tanzania)',
-    '/languages/ssw': 'Swazi ',
-    '/languages/krc': 'Karachay-Balkar',
-    '/languages/nyn': 'Nyankole',
-    '/languages/sal': 'Salishan languages',
-    '/languages/jpr': 'Judeo-Persian',
-    '/languages/pau': 'Palauan',
-    '/languages/smi': 'Sami',
-    '/languages/aar': 'Afar',
-    '/languages/abk': 'Abkhaz',
-    '/languages/gon': 'Gondi',
-    '/languages/nzi': 'Nzima',
-    '/languages/sam': 'Samaritan Aramaic',
-    '/languages/sao': 'Samoan',
-    '/languages/srr': 'Serer',
-    '/languages/apa': 'Apache languages',
-    '/languages/crh': 'Crimean Tatar',
-    '/languages/efi': 'Efik',
-    '/languages/iku': 'Inuktitut',
-    '/languages/nav': 'Navajo',
-    '/languages/pon': 'Ponape',
-    '/languages/tmh': 'Tamashek',
-    '/languages/aus': 'Australian languages',
-    '/languages/oto': 'Otomian languages',
-    '/languages/war': 'Waray',
-    '/languages/ypk': 'Yupik languages',
-    '/languages/ave': 'Avestan',
-    '/languages/cus': 'Cushitic (Other)',
-    '/languages/del': 'Delaware',
-    '/languages/fon': 'Fon',
-    '/languages/ina': 'Interlingua (International Auxiliary Language Association)',
-    '/languages/myv': 'Erzya',
-    '/languages/pag': 'Pangasinan',
-    '/languages/peo': 'Old Persian (ca. 600-400 B.C.)',
-    '/languages/vls': 'Flemish',
-    '/languages/bai': 'Bamileke languages',
-    '/languages/bla': 'Siksika',
-    '/languages/day': 'Dayak',
-    '/languages/men': 'Mende',
-    '/languages/tai': 'Tai',
-    '/languages/ton': 'Tongan',
-    '/languages/uga': 'Ugaritic',
-    '/languages/yao': 'Yao (Africa)',
-    '/languages/zza': 'Zaza',
-    '/languages/bin': 'Edo',
-    '/languages/frs': 'East Frisian',
-    '/languages/inh': 'Ingush',
-    '/languages/mah': 'Marshallese',
-    '/languages/sem': 'Semitic (Other)',
-    '/languages/art': 'Artificial (Other)',
-    '/languages/chy': 'Cheyenne',
-    '/languages/cmc': 'Chamic languages',
-    '/languages/dar': 'Dargwa',
-    '/languages/dua': 'Duala',
-    '/languages/elx': 'Elamite',
-    '/languages/fan': 'Fang',
-    '/languages/fij': 'Fijian',
-    '/languages/gil': 'Gilbertese',
-    '/languages/ijo': 'Ijo',
-    '/languages/kam': 'Kamba',
-    '/languages/nog': 'Nogai',
-    '/languages/non': 'Old Norse',
-    '/languages/tem': 'Temne',
-    '/languages/arg': 'Aragonese',
-    '/languages/arp': 'Arapaho',
-    '/languages/arw': 'Arawak',
-    '/languages/din': 'Dinka',
-    '/languages/grb': 'Grebo',
-    '/languages/kos': 'Kusaie',
-    '/languages/lub': 'Luba-Katanga',
-    '/languages/mnc': 'Manchu',
-    '/languages/nyo': 'Nyoro',
-    '/languages/rar': 'Rarotongan',
-    '/languages/sel': 'Selkup',
-    '/languages/tkl': 'Tokelauan',
-    '/languages/tog': 'Tonga (Nyasa)',
-    '/languages/tum': 'Tumbuka',
-    '/languages/alt': 'Altai',
-    '/languages/ase': 'American Sign Language',
-    '/languages/ast': 'Asturian',
-    '/languages/chk': 'Chuukese',
-    '/languages/cos': 'Corsican',
-    '/languages/ewo': 'Ewondo',
-    '/languages/gor': 'Gorontalo',
-    '/languages/hmo': 'Hiri Motu',
-    '/languages/lol': 'Mongo-Nkundu',
-    '/languages/lun': 'Lunda',
-    '/languages/mas': 'Masai',
-    '/languages/niu': 'Niuean',
-    '/languages/rup': 'Aromanian',
-    '/languages/sas': 'Sasak',
-    '/languages/sio': 'Siouan (Other)',
-    '/languages/sus': 'Susu',
-    '/languages/zun': 'Zuni',
-    '/languages/bat': 'Baltic (Other)',
-    '/languages/car': 'Carib',
-    '/languages/cha': 'Chamorro',
-    '/languages/kab': 'Kabyle',
-    '/languages/kau': 'Kanuri',
-    '/languages/kho': 'Khotanese',
-    '/languages/lua': 'Luba-Lulua',
-    '/languages/mdf': 'Moksha',
-    '/languages/nbl': 'Ndebele (South Africa)',
-    '/languages/umb': 'Umbundu',
-    '/languages/wak': 'Wakashan languages',
-    '/languages/wal': 'Wolayta',
-    '/languages/ale': 'Aleut',
-    '/languages/bis': 'Bislama',
-    '/languages/gba': 'Gbaya',
-    '/languages/glv': 'Manx',
-    '/languages/gul': 'Gullah',
-    '/languages/ipk': 'Inupiaq',
-    '/languages/krl': 'Karelian',
-    '/languages/lam': 'Lamba (Zambia and Congo)',
-    '/languages/sad': 'Sandawe',
-    '/languages/sid': 'Sidamo',
-    '/languages/snk': 'Soninke',
-    '/languages/srn': 'Sranan',
-    '/languages/suk': 'Sukuma',
-    '/languages/ter': 'Terena',
-    '/languages/tiv': 'Tiv',
-    '/languages/tli': 'Tlingit',
-    '/languages/tpi': 'Tok Pisin',
-    '/languages/tvl': 'Tuvaluan',
-    '/languages/yap': 'Yapese',
-    '/languages/eka': 'Ekajuk',
-    '/languages/hsb': 'Upper Sorbian',
-    '/languages/ido': 'Ido',
-    '/languages/kmb': 'Kimbundu',
-    '/languages/kpe': 'Kpelle',
-    '/languages/mwl': 'Mirandese',
-    '/languages/nno': 'Nynorsk',
-    '/languages/nub': 'Nubian languages',
-    '/languages/osa': 'Osage',
-    '/languages/sme': 'Northern Sami',
-    '/languages/znd': 'Zande languages',
+    "/languages/eng": "English",
+    "/languages/fre": "French",
+    "/languages/spa": "Spanish",
+    "/languages/ger": "German",
+    "/languages/rus": "Russian",
+    "/languages/ita": "Italian",
+    "/languages/chi": "Chinese",
+    "/languages/jpn": "Japanese",
+    "/languages/por": "Portuguese",
+    "/languages/ara": "Arabic",
+    "/languages/pol": "Polish",
+    "/languages/heb": "Hebrew",
+    "/languages/kor": "Korean",
+    "/languages/dut": "Dutch",
+    "/languages/ind": "Indonesian",
+    "/languages/lat": "Latin",
+    "/languages/und": "Undetermined",
+    "/languages/cmn": "Mandarin",
+    "/languages/hin": "Hindi",
+    "/languages/swe": "Swedish",
+    "/languages/dan": "Danish",
+    "/languages/urd": "Urdu",
+    "/languages/hun": "Hungarian",
+    "/languages/cze": "Czech",
+    "/languages/tur": "Turkish",
+    "/languages/ukr": "Ukrainian",
+    "/languages/gre": "Greek",
+    "/languages/vie": "Vietnamese",
+    "/languages/bul": "Bulgarian",
+    "/languages/ben": "Bengali",
+    "/languages/rum": "Romanian",
+    "/languages/cat": "Catalan",
+    "/languages/nor": "Norwegian",
+    "/languages/tha": "Thai",
+    "/languages/per": "Persian",
+    "/languages/scr": "Croatian",
+    "/languages/mul": "Multiple languages",
+    "/languages/fin": "Finnish",
+    "/languages/tam": "Tamil",
+    "/languages/guj": "Gujarati",
+    "/languages/mar": "Marathi",
+    "/languages/scc": "Serbian",
+    "/languages/pan": "Panjabi",
+    "/languages/wel": "Welsh",
+    "/languages/tel": "Telugu",
+    "/languages/yid": "Yiddish",
+    "/languages/kan": "Kannada",
+    "/languages/slo": "Slovak",
+    "/languages/san": "Sanskrit",
+    "/languages/arm": "Armenian",
+    "/languages/mal": "Malayalam",
+    "/languages/may": "Malay",
+    "/languages/bur": "Burmese",
+    "/languages/slv": "Slovenian",
+    "/languages/lit": "Lithuanian",
+    "/languages/tib": "Tibetan",
+    "/languages/lav": "Latvian",
+    "/languages/est": "Estonian",
+    "/languages/nep": "Nepali",
+    "/languages/ori": "Oriya",
+    "/languages/mon": "Mongolian",
+    "/languages/alb": "Albanian",
+    "/languages/iri": "Irish",
+    "/languages/geo": "Georgian",
+    "/languages/afr": "Afrikaans",
+    "/languages/grc": "Ancient Greek",
+    "/languages/mac": "Macedonian",
+    "/languages/bel": "Belarusian",
+    "/languages/ice": "Icelandic",
+    "/languages/srp": "Serbian",
+    "/languages/snh": "Sinhalese",
+    "/languages/snd": "Sindhi",
+    "/languages/ota": "Turkish, Ottoman",
+    "/languages/kur": "Kurdish",
+    "/languages/aze": "Azerbaijani",
+    "/languages/pus": "Pushto",
+    "/languages/amh": "Amharic",
+    "/languages/gag": "Galician",
+    "/languages/hrv": "Croatian",
+    "/languages/sin": "Sinhalese",
+    "/languages/asm": "Assamese",
+    "/languages/uzb": "Uzbek",
+    "/languages/gae": "Scottish Gaelix",
+    "/languages/kaz": "Kazakh",
+    "/languages/swa": "Swahili",
+    "/languages/bos": "Bosnian",
+    "/languages/glg": "Galician ",
+    "/languages/baq": "Basque",
+    "/languages/tgl": "Tagalog",
+    "/languages/raj": "Rajasthani",
+    "/languages/gle": "Irish",
+    "/languages/lao": "Lao",
+    "/languages/jav": "Javanese",
+    "/languages/mai": "Maithili",
+    "/languages/tgk": "Tajik ",
+    "/languages/khm": "Khmer",
+    "/languages/roh": "Raeto-Romance",
+    "/languages/kok": "Konkani ",
+    "/languages/sit": "Sino-Tibetan (Other)",
+    "/languages/mol": "Moldavian",
+    "/languages/kir": "Kyrgyz",
+    "/languages/new": "Newari",
+    "/languages/inc": "Indic (Other)",
+    "/languages/frm": "French, Middle (ca. 1300-1600)",
+    "/languages/esp": "Esperanto",
+    "/languages/hau": "Hausa",
+    "/languages/tag": "Tagalog",
+    "/languages/tuk": "Turkmen",
+    "/languages/enm": "English, Middle (1100-1500)",
+    "/languages/map": "Austronesian (Other)",
+    "/languages/pli": "Pali",
+    "/languages/fro": "French, Old (ca. 842-1300)",
+    "/languages/nic": "Niger-Kordofanian (Other)",
+    "/languages/tir": "Tigrinya",
+    "/languages/wen": "Sorbian (Other)",
+    "/languages/bho": "Bhojpuri",
+    "/languages/roa": "Romance (Other)",
+    "/languages/tut": "Altaic (Other)",
+    "/languages/bra": "Braj",
+    "/languages/sun": "Sundanese",
+    "/languages/fiu": "Finno-Ugrian (Other)",
+    "/languages/far": "Faroese",
+    "/languages/ban": "Balinese",
+    "/languages/tar": "Tatar",
+    "/languages/bak": "Bashkir",
+    "/languages/tat": "Tatar",
+    "/languages/chu": "Church Slavic",
+    "/languages/dra": "Dravidian (Other)",
+    "/languages/pra": "Prakrit languages",
+    "/languages/paa": "Papuan (Other)",
+    "/languages/doi": "Dogri",
+    "/languages/lah": "Lahnd�",
+    "/languages/mni": "Manipuri",
+    "/languages/yor": "Yoruba",
+    "/languages/gmh": "German, Middle High (ca. 1050-1500)",
+    "/languages/kas": "Kashmiri",
+    "/languages/fri": "Frisian",
+    "/languages/mla": "Malagasy",
+    "/languages/egy": "Egyptian",
+    "/languages/rom": "Romani",
+    "/languages/syr": "Syriac, Modern",
+    "/languages/cau": "Caucasian (Other)",
+    "/languages/hbs": "Serbo-Croatian",
+    "/languages/sai": "South American Indian (Other)",
+    "/languages/pro": "Provençal (to 1500)",
+    "/languages/cpf": "Creoles and Pidgins, French-based (Other)",
+    "/languages/ang": "English, Old (ca. 450-1100)",
+    "/languages/bal": "Baluchi",
+    "/languages/gla": "Scottish Gaelic",
+    "/languages/chv": "Chuvash",
+    "/languages/kin": "Kinyarwanda",
+    "/languages/zul": "Zulu",
+    "/languages/sla": "Slavic (Other)",
+    "/languages/som": "Somali",
+    "/languages/mlt": "Maltese",
+    "/languages/uig": "Uighur",
+    "/languages/mlg": "Malagasy",
+    "/languages/sho": "Shona",
+    "/languages/lan": "Occitan (post 1500)",
+    "/languages/bre": "Breton",
+    "/languages/sco": "Scots",
+    "/languages/sso": "Sotho",
+    "/languages/myn": "Mayan languages",
+    "/languages/xho": "Xhosa",
+    "/languages/gem": "Germanic (Other)",
+    "/languages/esk": "Eskimo languages",
+    "/languages/akk": "Akkadian",
+    "/languages/div": "Maldivian",
+    "/languages/sah": "Yakut",
+    "/languages/tsw": "Tswana",
+    "/languages/nso": "Northern Sotho",
+    "/languages/pap": "Papiamento",
+    "/languages/bnt": "Bantu (Other)",
+    "/languages/oss": "Ossetic",
+    "/languages/cre": "Cree",
+    "/languages/ibo": "Igbo",
+    "/languages/fao": "Faroese",
+    "/languages/nai": "North American Indian (Other)",
+    "/languages/mag": "Magahi",
+    "/languages/arc": "Aramaic",
+    "/languages/epo": "Esperanto",
+    "/languages/kha": "Khasi",
+    "/languages/oji": "Ojibwa",
+    "/languages/que": "Quechua",
+    "/languages/lug": "Ganda",
+    "/languages/mwr": "Marwari",
+    "/languages/awa": "Awadhi ",
+    "/languages/cor": "Cornish",
+    "/languages/lad": "Ladino",
+    "/languages/dzo": "Dzongkha",
+    "/languages/cop": "Coptic",
+    "/languages/nah": "Nahuatl",
+    "/languages/cai": "Central American Indian (Other)",
+    "/languages/phi": "Philippine (Other)",
+    "/languages/moh": "Mohawk",
+    "/languages/crp": "Creoles and Pidgins (Other)",
+    "/languages/nya": "Nyanja",
+    "/languages/wol": "Wolof ",
+    "/languages/haw": "Hawaiian",
+    "/languages/eth": "Ethiopic",
+    "/languages/mis": "Miscellaneous languages",
+    "/languages/mkh": "Mon-Khmer (Other)",
+    "/languages/alg": "Algonquian (Other)",
+    "/languages/nde": "Ndebele (Zimbabwe)",
+    "/languages/ssa": "Nilo-Saharan (Other)",
+    "/languages/chm": "Mari",
+    "/languages/che": "Chechen",
+    "/languages/gez": "Ethiopic",
+    "/languages/ven": "Venda",
+    "/languages/cam": "Khmer",
+    "/languages/fur": "Friulian",
+    "/languages/ful": "Fula",
+    "/languages/gal": "Oromo",
+    "/languages/jrb": "Judeo-Arabic",
+    "/languages/bua": "Buriat",
+    "/languages/ady": "Adygei",
+    "/languages/bem": "Bemba",
+    "/languages/kar": "Karen languages",
+    "/languages/sna": "Shona",
+    "/languages/twi": "Twi",
+    "/languages/btk": "Batak",
+    "/languages/kaa": "Kara-Kalpak",
+    "/languages/kom": "Komi",
+    "/languages/sot": "Sotho",
+    "/languages/tso": "Tsonga",
+    "/languages/cpe": "Creoles and Pidgins, English-based (Other)",
+    "/languages/gua": "Guarani",
+    "/languages/mao": "Maori",
+    "/languages/mic": "Micmac",
+    "/languages/swz": "Swazi",
+    "/languages/taj": "Tajik",
+    "/languages/smo": "Samoan",
+    "/languages/ace": "Achinese",
+    "/languages/afa": "Afroasiatic (Other)",
+    "/languages/lap": "Sami",
+    "/languages/min": "Minangkabau",
+    "/languages/oci": "Occitan (post 1500)",
+    "/languages/tsn": "Tswana",
+    "/languages/pal": "Pahlavi",
+    "/languages/sux": "Sumerian",
+    "/languages/ewe": "Ewe",
+    "/languages/him": "Himachali",
+    "/languages/kaw": "Kawi",
+    "/languages/lus": "Lushai",
+    "/languages/ceb": "Cebuano",
+    "/languages/chr": "Cherokee",
+    "/languages/fil": "Filipino",
+    "/languages/ndo": "Ndonga",
+    "/languages/ilo": "Iloko",
+    "/languages/kbd": "Kabardian",
+    "/languages/orm": "Oromo",
+    "/languages/dum": "Dutch, Middle (ca. 1050-1350)",
+    "/languages/bam": "Bambara",
+    "/languages/goh": "Old High German",
+    "/languages/got": "Gothic",
+    "/languages/kon": "Kongo",
+    "/languages/mun": "Munda (Other)",
+    "/languages/kru": "Kurukh",
+    "/languages/pam": "Pampanga",
+    "/languages/grn": "Guarani",
+    "/languages/gaa": "Gã",
+    "/languages/fry": "Frisian",
+    "/languages/iba": "Iban",
+    "/languages/mak": "Makasar",
+    "/languages/kik": "Kikuyu",
+    "/languages/cho": "Choctaw",
+    "/languages/cpp": "Creoles and Pidgins, Portuguese-based (Other)",
+    "/languages/dak": "Dakota",
+    "/languages/udm": "Udmurt ",
+    "/languages/hat": "Haitian French Creole",
+    "/languages/mus": "Creek",
+    "/languages/ber": "Berber (Other)",
+    "/languages/hil": "Hiligaynon",
+    "/languages/iro": "Iroquoian (Other)",
+    "/languages/kua": "Kuanyama",
+    "/languages/mno": "Manobo languages",
+    "/languages/run": "Rundi",
+    "/languages/sat": "Santali",
+    "/languages/shn": "Shan",
+    "/languages/tyv": "Tuvinian",
+    "/languages/chg": "Chagatai",
+    "/languages/syc": "Syriac",
+    "/languages/ath": "Athapascan (Other)",
+    "/languages/aym": "Aymara",
+    "/languages/bug": "Bugis",
+    "/languages/cel": "Celtic (Other)",
+    "/languages/int": "Interlingua (International Auxiliary Language Association)",
+    "/languages/xal": "Oirat",
+    "/languages/ava": "Avaric",
+    "/languages/son": "Songhai",
+    "/languages/tah": "Tahitian",
+    "/languages/tet": "Tetum",
+    "/languages/ira": "Iranian (Other)",
+    "/languages/kac": "Kachin",
+    "/languages/nob": "Norwegian (Bokmål)",
+    "/languages/vai": "Vai",
+    "/languages/bik": "Bikol",
+    "/languages/mos": "Mooré",
+    "/languages/tig": "Tigré",
+    "/languages/fat": "Fanti",
+    "/languages/her": "Herero",
+    "/languages/kal": "Kalâtdlisut",
+    "/languages/mad": "Madurese",
+    "/languages/yue": "Cantonese",
+    "/languages/chn": "Chinook jargon",
+    "/languages/hmn": "Hmong",
+    "/languages/lin": "Lingala",
+    "/languages/man": "Mandingo",
+    "/languages/nds": "Low German",
+    "/languages/bas": "Basa",
+    "/languages/gay": "Gayo",
+    "/languages/gsw": "gsw",
+    "/languages/ine": "Indo-European (Other)",
+    "/languages/kro": "Kru (Other)",
+    "/languages/kum": "Kumyk",
+    "/languages/tsi": "Tsimshian",
+    "/languages/zap": "Zapotec",
+    "/languages/ach": "Acoli",
+    "/languages/ada": "Adangme",
+    "/languages/aka": "Akan",
+    "/languages/khi": "Khoisan (Other)",
+    "/languages/srd": "Sardinian",
+    "/languages/arn": "Mapuche",
+    "/languages/dyu": "Dyula",
+    "/languages/loz": "Lozi",
+    "/languages/ltz": "Luxembourgish",
+    "/languages/sag": "Sango (Ubangi Creole)",
+    "/languages/lez": "Lezgian",
+    "/languages/luo": "Luo (Kenya and Tanzania)",
+    "/languages/ssw": "Swazi ",
+    "/languages/krc": "Karachay-Balkar",
+    "/languages/nyn": "Nyankole",
+    "/languages/sal": "Salishan languages",
+    "/languages/jpr": "Judeo-Persian",
+    "/languages/pau": "Palauan",
+    "/languages/smi": "Sami",
+    "/languages/aar": "Afar",
+    "/languages/abk": "Abkhaz",
+    "/languages/gon": "Gondi",
+    "/languages/nzi": "Nzima",
+    "/languages/sam": "Samaritan Aramaic",
+    "/languages/sao": "Samoan",
+    "/languages/srr": "Serer",
+    "/languages/apa": "Apache languages",
+    "/languages/crh": "Crimean Tatar",
+    "/languages/efi": "Efik",
+    "/languages/iku": "Inuktitut",
+    "/languages/nav": "Navajo",
+    "/languages/pon": "Ponape",
+    "/languages/tmh": "Tamashek",
+    "/languages/aus": "Australian languages",
+    "/languages/oto": "Otomian languages",
+    "/languages/war": "Waray",
+    "/languages/ypk": "Yupik languages",
+    "/languages/ave": "Avestan",
+    "/languages/cus": "Cushitic (Other)",
+    "/languages/del": "Delaware",
+    "/languages/fon": "Fon",
+    "/languages/ina": "Interlingua (International Auxiliary Language Association)",
+    "/languages/myv": "Erzya",
+    "/languages/pag": "Pangasinan",
+    "/languages/peo": "Old Persian (ca. 600-400 B.C.)",
+    "/languages/vls": "Flemish",
+    "/languages/bai": "Bamileke languages",
+    "/languages/bla": "Siksika",
+    "/languages/day": "Dayak",
+    "/languages/men": "Mende",
+    "/languages/tai": "Tai",
+    "/languages/ton": "Tongan",
+    "/languages/uga": "Ugaritic",
+    "/languages/yao": "Yao (Africa)",
+    "/languages/zza": "Zaza",
+    "/languages/bin": "Edo",
+    "/languages/frs": "East Frisian",
+    "/languages/inh": "Ingush",
+    "/languages/mah": "Marshallese",
+    "/languages/sem": "Semitic (Other)",
+    "/languages/art": "Artificial (Other)",
+    "/languages/chy": "Cheyenne",
+    "/languages/cmc": "Chamic languages",
+    "/languages/dar": "Dargwa",
+    "/languages/dua": "Duala",
+    "/languages/elx": "Elamite",
+    "/languages/fan": "Fang",
+    "/languages/fij": "Fijian",
+    "/languages/gil": "Gilbertese",
+    "/languages/ijo": "Ijo",
+    "/languages/kam": "Kamba",
+    "/languages/nog": "Nogai",
+    "/languages/non": "Old Norse",
+    "/languages/tem": "Temne",
+    "/languages/arg": "Aragonese",
+    "/languages/arp": "Arapaho",
+    "/languages/arw": "Arawak",
+    "/languages/din": "Dinka",
+    "/languages/grb": "Grebo",
+    "/languages/kos": "Kusaie",
+    "/languages/lub": "Luba-Katanga",
+    "/languages/mnc": "Manchu",
+    "/languages/nyo": "Nyoro",
+    "/languages/rar": "Rarotongan",
+    "/languages/sel": "Selkup",
+    "/languages/tkl": "Tokelauan",
+    "/languages/tog": "Tonga (Nyasa)",
+    "/languages/tum": "Tumbuka",
+    "/languages/alt": "Altai",
+    "/languages/ase": "American Sign Language",
+    "/languages/ast": "Asturian",
+    "/languages/chk": "Chuukese",
+    "/languages/cos": "Corsican",
+    "/languages/ewo": "Ewondo",
+    "/languages/gor": "Gorontalo",
+    "/languages/hmo": "Hiri Motu",
+    "/languages/lol": "Mongo-Nkundu",
+    "/languages/lun": "Lunda",
+    "/languages/mas": "Masai",
+    "/languages/niu": "Niuean",
+    "/languages/rup": "Aromanian",
+    "/languages/sas": "Sasak",
+    "/languages/sio": "Siouan (Other)",
+    "/languages/sus": "Susu",
+    "/languages/zun": "Zuni",
+    "/languages/bat": "Baltic (Other)",
+    "/languages/car": "Carib",
+    "/languages/cha": "Chamorro",
+    "/languages/kab": "Kabyle",
+    "/languages/kau": "Kanuri",
+    "/languages/kho": "Khotanese",
+    "/languages/lua": "Luba-Lulua",
+    "/languages/mdf": "Moksha",
+    "/languages/nbl": "Ndebele (South Africa)",
+    "/languages/umb": "Umbundu",
+    "/languages/wak": "Wakashan languages",
+    "/languages/wal": "Wolayta",
+    "/languages/ale": "Aleut",
+    "/languages/bis": "Bislama",
+    "/languages/gba": "Gbaya",
+    "/languages/glv": "Manx",
+    "/languages/gul": "Gullah",
+    "/languages/ipk": "Inupiaq",
+    "/languages/krl": "Karelian",
+    "/languages/lam": "Lamba (Zambia and Congo)",
+    "/languages/sad": "Sandawe",
+    "/languages/sid": "Sidamo",
+    "/languages/snk": "Soninke",
+    "/languages/srn": "Sranan",
+    "/languages/suk": "Sukuma",
+    "/languages/ter": "Terena",
+    "/languages/tiv": "Tiv",
+    "/languages/tli": "Tlingit",
+    "/languages/tpi": "Tok Pisin",
+    "/languages/tvl": "Tuvaluan",
+    "/languages/yap": "Yapese",
+    "/languages/eka": "Ekajuk",
+    "/languages/hsb": "Upper Sorbian",
+    "/languages/ido": "Ido",
+    "/languages/kmb": "Kimbundu",
+    "/languages/kpe": "Kpelle",
+    "/languages/mwl": "Mirandese",
+    "/languages/nno": "Nynorsk",
+    "/languages/nub": "Nubian languages",
+    "/languages/osa": "Osage",
+    "/languages/sme": "Northern Sami",
+    "/languages/znd": "Zande languages",
 }
diff --git a/bookwyrm/connectors/self_connector.py b/bookwyrm/connectors/self_connector.py
index b3a4d6f9..60acb59b 100644
--- a/bookwyrm/connectors/self_connector.py
+++ b/bookwyrm/connectors/self_connector.py
@@ -1,4 +1,4 @@
-''' using a bookwyrm instance as a source of book data '''
+""" using a bookwyrm instance as a source of book data """
 from functools import reduce
 import operator
 
@@ -10,10 +10,11 @@ from .abstract_connector import AbstractConnector, SearchResult
 
 
 class Connector(AbstractConnector):
-    ''' instantiate a connector  '''
+    """ instantiate a connector  """
+
     # pylint: disable=arguments-differ
     def search(self, query, min_confidence=0.1, raw=False):
-        ''' search your local database '''
+        """ search your local database """
         if not query:
             return []
         # first, try searching unqiue identifiers
@@ -34,19 +35,18 @@ class Connector(AbstractConnector):
         return search_results
 
     def isbn_search(self, query, raw=False):
-        ''' search your local database '''
+        """ search your local database """
         if not query:
             return []
 
-        filters = [{f: query} for f in ['isbn_10', 'isbn_13']]
+        filters = [{f: query} for f in ["isbn_10", "isbn_13"]]
         results = models.Edition.objects.filter(
             reduce(operator.or_, (Q(**f) for f in filters))
         ).distinct()
 
         # when there are multiple editions of the same work, pick the default.
         # it would be odd for this to happen.
-        results = results.filter(parent_work__default_edition__id=F('id')) \
-                or results
+        results = results.filter(parent_work__default_edition__id=F("id")) or results
 
         search_results = []
         for result in results:
@@ -58,33 +58,30 @@ class Connector(AbstractConnector):
                 break
         return search_results
 
-
     def format_search_result(self, search_result):
         return SearchResult(
             title=search_result.title,
             key=search_result.remote_id,
             author=search_result.author_text,
-            year=search_result.published_date.year if \
-                    search_result.published_date else None,
+            year=search_result.published_date.year
+            if search_result.published_date
+            else None,
             connector=self,
-            confidence=search_result.rank if \
-                    hasattr(search_result, 'rank') else 1,
+            confidence=search_result.rank if hasattr(search_result, "rank") else 1,
         )
 
-
     def format_isbn_search_result(self, search_result):
         return SearchResult(
             title=search_result.title,
             key=search_result.remote_id,
             author=search_result.author_text,
-            year=search_result.published_date.year if \
-                    search_result.published_date else None,
+            year=search_result.published_date.year
+            if search_result.published_date
+            else None,
             connector=self,
-            confidence=search_result.rank if \
-                    hasattr(search_result, 'rank') else 1,
+            confidence=search_result.rank if hasattr(search_result, "rank") else 1,
         )
 
-
     def is_work_data(self, data):
         pass
 
@@ -98,11 +95,11 @@ class Connector(AbstractConnector):
         return None
 
     def parse_isbn_search_data(self, data):
-        ''' it's already in the right format, don't even worry about it '''
+        """ it's already in the right format, don't even worry about it """
         return data
 
     def parse_search_data(self, data):
-        ''' it's already in the right format, don't even worry about it '''
+        """ it's already in the right format, don't even worry about it """
         return data
 
     def expand_book_data(self, book):
@@ -110,44 +107,47 @@ class Connector(AbstractConnector):
 
 
 def search_identifiers(query):
-    ''' tries remote_id, isbn; defined as dedupe fields on the model '''
-    filters = [{f.name: query} for f in models.Edition._meta.get_fields() \
-        if hasattr(f, 'deduplication_field') and f.deduplication_field]
+    """ tries remote_id, isbn; defined as dedupe fields on the model """
+    filters = [
+        {f.name: query}
+        for f in models.Edition._meta.get_fields()
+        if hasattr(f, "deduplication_field") and f.deduplication_field
+    ]
     results = models.Edition.objects.filter(
         reduce(operator.or_, (Q(**f) for f in filters))
     ).distinct()
 
     # when there are multiple editions of the same work, pick the default.
     # it would be odd for this to happen.
-    return results.filter(parent_work__default_edition__id=F('id')) \
-            or results
+    return results.filter(parent_work__default_edition__id=F("id")) or results
 
 
 def search_title_author(query, min_confidence):
-    ''' searches for title and author '''
-    vector = SearchVector('title', weight='A') +\
-        SearchVector('subtitle', weight='B') +\
-        SearchVector('authors__name', weight='C') +\
-        SearchVector('series', weight='D')
+    """ searches for title and author """
+    vector = (
+        SearchVector("title", weight="A")
+        + SearchVector("subtitle", weight="B")
+        + SearchVector("authors__name", weight="C")
+        + SearchVector("series", weight="D")
+    )
 
-    results = models.Edition.objects.annotate(
-        search=vector
-    ).annotate(
-        rank=SearchRank(vector, query)
-    ).filter(
-        rank__gt=min_confidence
-    ).order_by('-rank')
+    results = (
+        models.Edition.objects.annotate(search=vector)
+        .annotate(rank=SearchRank(vector, query))
+        .filter(rank__gt=min_confidence)
+        .order_by("-rank")
+    )
 
     # when there are multiple editions of the same work, pick the closest
-    editions_of_work = results.values(
-        'parent_work'
-    ).annotate(
-        Count('parent_work')
-    ).values_list('parent_work')
+    editions_of_work = (
+        results.values("parent_work")
+        .annotate(Count("parent_work"))
+        .values_list("parent_work")
+    )
 
     for work_id in set(editions_of_work):
         editions = results.filter(parent_work=work_id)
-        default = editions.filter(parent_work__default_edition=F('id'))
+        default = editions.filter(parent_work__default_edition=F("id"))
         default_rank = default.first().rank if default.exists() else 0
         # if mutliple books have the top rank, pick the default edition
         if default_rank == editions.first().rank:
diff --git a/bookwyrm/connectors/settings.py b/bookwyrm/connectors/settings.py
index e04aedef..f1674cf7 100644
--- a/bookwyrm/connectors/settings.py
+++ b/bookwyrm/connectors/settings.py
@@ -1,3 +1,3 @@
-''' settings book data connectors '''
+""" settings book data connectors """
 
-CONNECTORS = ['openlibrary', 'self_connector', 'bookwyrm_connector']
+CONNECTORS = ["openlibrary", "self_connector", "bookwyrm_connector"]
diff --git a/bookwyrm/context_processors.py b/bookwyrm/context_processors.py
index a1471ac4..8f79a652 100644
--- a/bookwyrm/context_processors.py
+++ b/bookwyrm/context_processors.py
@@ -1,8 +1,7 @@
-''' customize the info available in context for rendering templates '''
+""" customize the info available in context for rendering templates """
 from bookwyrm import models
 
-def site_settings(request):# pylint: disable=unused-argument
-    ''' include the custom info about the site '''
-    return {
-        'site': models.SiteSettings.objects.get()
-    }
+
+def site_settings(request):  # pylint: disable=unused-argument
+    """ include the custom info about the site """
+    return {"site": models.SiteSettings.objects.get()}
diff --git a/bookwyrm/emailing.py b/bookwyrm/emailing.py
index 2319d467..c7536876 100644
--- a/bookwyrm/emailing.py
+++ b/bookwyrm/emailing.py
@@ -1,25 +1,27 @@
-''' send emails '''
+""" send emails """
 from django.core.mail import send_mail
 
 from bookwyrm import models
 from bookwyrm.tasks import app
 
+
 def password_reset_email(reset_code):
-    ''' generate a password reset email '''
+    """ generate a password reset email """
     site = models.SiteSettings.get()
     send_email.delay(
         reset_code.user.email,
-        'Reset your password on %s' % site.name,
-        'Your password reset link: %s' % reset_code.link
+        "Reset your password on %s" % site.name,
+        "Your password reset link: %s" % reset_code.link,
     )
 
+
 @app.task
 def send_email(recipient, subject, message):
-    ''' use a task to send the email '''
+    """ use a task to send the email """
     send_mail(
         subject,
         message,
-        None, # sender will be the config default
+        None,  # sender will be the config default
         [recipient],
-        fail_silently=False
+        fail_silently=False,
     )
diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index b920fc9c..3d8839ef 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -1,4 +1,4 @@
-''' using django model forms '''
+""" using django model forms """
 import datetime
 from collections import defaultdict
 
@@ -12,115 +12,125 @@ from bookwyrm import models
 
 
 class CustomForm(ModelForm):
-    ''' add css classes to the forms '''
+    """ add css classes to the forms """
+
     def __init__(self, *args, **kwargs):
-        css_classes = defaultdict(lambda: '')
-        css_classes['text'] = 'input'
-        css_classes['password'] = 'input'
-        css_classes['email'] = 'input'
-        css_classes['number'] = 'input'
-        css_classes['checkbox'] = 'checkbox'
-        css_classes['textarea'] = 'textarea'
+        css_classes = defaultdict(lambda: "")
+        css_classes["text"] = "input"
+        css_classes["password"] = "input"
+        css_classes["email"] = "input"
+        css_classes["number"] = "input"
+        css_classes["checkbox"] = "checkbox"
+        css_classes["textarea"] = "textarea"
         super(CustomForm, self).__init__(*args, **kwargs)
         for visible in self.visible_fields():
-            if hasattr(visible.field.widget, 'input_type'):
+            if hasattr(visible.field.widget, "input_type"):
                 input_type = visible.field.widget.input_type
             if isinstance(visible.field.widget, Textarea):
-                input_type = 'textarea'
-                visible.field.widget.attrs['cols'] = None
-                visible.field.widget.attrs['rows'] = None
-            visible.field.widget.attrs['class'] = css_classes[input_type]
+                input_type = "textarea"
+                visible.field.widget.attrs["cols"] = None
+                visible.field.widget.attrs["rows"] = None
+            visible.field.widget.attrs["class"] = css_classes[input_type]
 
 
 # pylint: disable=missing-class-docstring
 class LoginForm(CustomForm):
     class Meta:
         model = models.User
-        fields = ['localname', 'password']
+        fields = ["localname", "password"]
         help_texts = {f: None for f in fields}
         widgets = {
-            'password': PasswordInput(),
+            "password": PasswordInput(),
         }
 
 
 class RegisterForm(CustomForm):
     class Meta:
         model = models.User
-        fields = ['localname', 'email', 'password']
+        fields = ["localname", "email", "password"]
         help_texts = {f: None for f in fields}
-        widgets = {
-            'password': PasswordInput()
-        }
+        widgets = {"password": PasswordInput()}
 
 
 class RatingForm(CustomForm):
     class Meta:
         model = models.Review
-        fields = ['user', 'book', 'content', 'rating', 'privacy']
+        fields = ["user", "book", "content", "rating", "privacy"]
 
 
 class ReviewForm(CustomForm):
     class Meta:
         model = models.Review
         fields = [
-            'user', 'book',
-            'name', 'content', 'rating',
-            'content_warning', 'sensitive',
-            'privacy']
+            "user",
+            "book",
+            "name",
+            "content",
+            "rating",
+            "content_warning",
+            "sensitive",
+            "privacy",
+        ]
 
 
 class CommentForm(CustomForm):
     class Meta:
         model = models.Comment
-        fields = [
-            'user', 'book', 'content',
-            'content_warning', 'sensitive',
-            'privacy']
+        fields = ["user", "book", "content", "content_warning", "sensitive", "privacy"]
 
 
 class QuotationForm(CustomForm):
     class Meta:
         model = models.Quotation
         fields = [
-            'user', 'book', 'quote', 'content',
-            'content_warning', 'sensitive', 'privacy']
+            "user",
+            "book",
+            "quote",
+            "content",
+            "content_warning",
+            "sensitive",
+            "privacy",
+        ]
 
 
 class ReplyForm(CustomForm):
     class Meta:
         model = models.Status
         fields = [
-            'user', 'content', 'content_warning', 'sensitive',
-            'reply_parent', 'privacy']
+            "user",
+            "content",
+            "content_warning",
+            "sensitive",
+            "reply_parent",
+            "privacy",
+        ]
+
 
 class StatusForm(CustomForm):
     class Meta:
         model = models.Status
-        fields = [
-            'user', 'content', 'content_warning', 'sensitive', 'privacy']
+        fields = ["user", "content", "content_warning", "sensitive", "privacy"]
 
 
 class EditUserForm(CustomForm):
     class Meta:
         model = models.User
-        fields = [
-            'avatar', 'name', 'email', 'summary', 'manually_approves_followers'
-        ]
+        fields = ["avatar", "name", "email", "summary", "manually_approves_followers"]
         help_texts = {f: None for f in fields}
 
 
 class TagForm(CustomForm):
     class Meta:
         model = models.Tag
-        fields = ['name']
+        fields = ["name"]
         help_texts = {f: None for f in fields}
-        labels = {'name': 'Add a tag'}
+        labels = {"name": "Add a tag"}
 
 
 class CoverForm(CustomForm):
     class Meta:
         model = models.Book
-        fields = ['cover']
+        fields = ["cover"]
         help_texts = {f: None for f in fields}
 
 
@@ -128,80 +138,87 @@ class EditionForm(CustomForm):
     class Meta:
         model = models.Edition
         exclude = [
-            'remote_id',
-            'origin_id',
-            'created_date',
-            'updated_date',
-            'edition_rank',
-
-            'authors',# TODO
-            'parent_work',
-            'shelves',
-
-            'subjects',# TODO
-            'subject_places',# TODO
-
-            'connector',
+            "remote_id",
+            "origin_id",
+            "created_date",
+            "updated_date",
+            "edition_rank",
+            "authors",  # TODO
+            "parent_work",
+            "shelves",
+            "subjects",  # TODO
+            "subject_places",  # TODO
+            "connector",
         ]
 
+
 class AuthorForm(CustomForm):
     class Meta:
         model = models.Author
         exclude = [
-            'remote_id',
-            'origin_id',
-            'created_date',
-            'updated_date',
+            "remote_id",
+            "origin_id",
+            "created_date",
+            "updated_date",
         ]
 
 
 class ImportForm(forms.Form):
     csv_file = forms.FileField()
 
+
 class ExpiryWidget(widgets.Select):
     def value_from_datadict(self, data, files, name):
-        ''' human-readable exiration time buckets '''
+        """ human-readable exiration time buckets """
         selected_string = super().value_from_datadict(data, files, name)
 
-        if selected_string == 'day':
+        if selected_string == "day":
             interval = datetime.timedelta(days=1)
-        elif selected_string == 'week':
+        elif selected_string == "week":
             interval = datetime.timedelta(days=7)
-        elif selected_string == 'month':
-            interval = datetime.timedelta(days=31) # Close enough?
-        elif selected_string == 'forever':
+        elif selected_string == "month":
+            interval = datetime.timedelta(days=31)  # Close enough?
+        elif selected_string == "forever":
             return None
         else:
-            return selected_string # "This will raise
+            return selected_string  # "This will raise
 
         return timezone.now() + interval
 
+
 class CreateInviteForm(CustomForm):
     class Meta:
         model = models.SiteInvite
-        exclude = ['code', 'user', 'times_used']
+        exclude = ["code", "user", "times_used"]
         widgets = {
-            'expiry': ExpiryWidget(choices=[
-                ('day', _('One Day')),
-                ('week', _('One Week')),
-                ('month', _('One Month')),
-                ('forever', _('Does Not Expire'))]),
-            'use_limit': widgets.Select(
-                choices=[(i, _("%(count)d uses" % {'count': i})) \
-                        for i in [1, 5, 10, 25, 50, 100]]
-                + [(None, _('Unlimited'))])
+            "expiry": ExpiryWidget(
+                choices=[
+                    ("day", _("One Day")),
+                    ("week", _("One Week")),
+                    ("month", _("One Month")),
+                    ("forever", _("Does Not Expire")),
+                ]
+            ),
+            "use_limit": widgets.Select(
+                choices=[
+                    (i, _("%(count)d uses" % {"count": i}))
+                    for i in [1, 5, 10, 25, 50, 100]
+                ]
+                + [(None, _("Unlimited"))]
+            ),
         }
 
+
 class ShelfForm(CustomForm):
     class Meta:
         model = models.Shelf
-        fields = ['user', 'name', 'privacy']
+        fields = ["user", "name", "privacy"]
 
 
 class GoalForm(CustomForm):
     class Meta:
         model = models.AnnualGoal
-        fields = ['user', 'year', 'goal', 'privacy']
+        fields = ["user", "year", "goal", "privacy"]
 
 
 class SiteForm(CustomForm):
@@ -213,4 +230,4 @@ class SiteForm(CustomForm):
 class ListForm(CustomForm):
     class Meta:
         model = models.List
-        fields = ['user', 'name', 'description', 'curation', 'privacy']
+        fields = ["user", "name", "description", "curation", "privacy"]
diff --git a/bookwyrm/goodreads_import.py b/bookwyrm/goodreads_import.py
index f5b84e17..fb4e8e0f 100644
--- a/bookwyrm/goodreads_import.py
+++ b/bookwyrm/goodreads_import.py
@@ -1,13 +1,14 @@
-''' handle reading a csv from goodreads '''
+""" handle reading a csv from goodreads """
 from bookwyrm.importer import Importer
 
-# GoodReads is the default importer, thus Importer follows its structure. For a more complete example of overriding see librarything_import.py  
+# GoodReads is the default importer, thus Importer follows its structure. For a more complete example of overriding see librarything_import.py
+
 
 class GoodreadsImporter(Importer):
-    service = 'GoodReads'
+    service = "GoodReads"
 
     def parse_fields(self, data):
-        data.update({'import_source': self.service }) 
+        data.update({"import_source": self.service})
         # add missing 'Date Started' field
-        data.update({'Date Started': None }) 
+        data.update({"Date Started": None})
         return data
diff --git a/bookwyrm/importer.py b/bookwyrm/importer.py
index a1288400..2fbb3430 100644
--- a/bookwyrm/importer.py
+++ b/bookwyrm/importer.py
@@ -1,4 +1,4 @@
-''' handle reading a csv from an external service, defaults are from GoodReads '''
+""" handle reading a csv from an external service, defaults are from GoodReads """
 import csv
 import logging
 
@@ -8,49 +8,48 @@ from bookwyrm.tasks import app
 
 logger = logging.getLogger(__name__)
 
+
 class Importer:
-    service = 'Unknown'
-    delimiter = ','
-    encoding = 'UTF-8'
-    mandatory_fields = ['Title', 'Author']
+    service = "Unknown"
+    delimiter = ","
+    encoding = "UTF-8"
+    mandatory_fields = ["Title", "Author"]
 
     def create_job(self, user, csv_file, include_reviews, privacy):
-        ''' check over a csv and creates a database entry for the job'''
+        """ check over a csv and creates a database entry for the job"""
         job = ImportJob.objects.create(
-            user=user,
-            include_reviews=include_reviews,
-            privacy=privacy
+            user=user, include_reviews=include_reviews, privacy=privacy
         )
-        for index, entry in enumerate(list(csv.DictReader(csv_file, delimiter=self.delimiter ))):
+        for index, entry in enumerate(
+            list(csv.DictReader(csv_file, delimiter=self.delimiter))
+        ):
             if not all(x in entry for x in self.mandatory_fields):
-                raise ValueError('Author and title must be in data.')
+                raise ValueError("Author and title must be in data.")
             entry = self.parse_fields(entry)
             self.save_item(job, index, entry)
         return job
 
-
     def save_item(self, job, index, data):
         ImportItem(job=job, index=index, data=data).save()
 
     def parse_fields(self, entry):
-        entry.update({'import_source': self.service }) 
-        return entry 
+        entry.update({"import_source": self.service})
+        return entry
 
     def create_retry_job(self, user, original_job, items):
-        ''' retry items that didn't import '''
+        """ retry items that didn't import """
         job = ImportJob.objects.create(
             user=user,
             include_reviews=original_job.include_reviews,
             privacy=original_job.privacy,
-            retry=True
+            retry=True,
         )
         for item in items:
             self.save_item(job, item.index, item.data)
         return job
 
-
     def start_import(self, job):
-        ''' initalizes a csv import job '''
+        """ initalizes a csv import job """
         result = import_data.delay(self.service, job.id)
         job.task_id = result.id
         job.save()
@@ -58,15 +57,15 @@ class Importer:
 
 @app.task
 def import_data(source, job_id):
-    ''' does the actual lookup work in a celery task '''
+    """ does the actual lookup work in a celery task """
     job = ImportJob.objects.get(id=job_id)
     try:
         for item in job.items.all():
             try:
                 item.resolve()
-            except Exception as e:# pylint: disable=broad-except
+            except Exception as e:  # pylint: disable=broad-except
                 logger.exception(e)
-                item.fail_reason = 'Error loading book'
+                item.fail_reason = "Error loading book"
                 item.save()
                 continue
 
@@ -74,10 +73,11 @@ def import_data(source, job_id):
                 item.save()
 
                 # shelves book and handles reviews
-                handle_imported_book(source,
-                    job.user, item, job.include_reviews, job.privacy)
+                handle_imported_book(
+                    source, job.user, item, job.include_reviews, job.privacy
+                )
             else:
-                item.fail_reason = 'Could not find a match for book'
+                item.fail_reason = "Could not find a match for book"
                 item.save()
     finally:
         job.complete = True
@@ -85,41 +85,41 @@ def import_data(source, job_id):
 
 
 def handle_imported_book(source, user, item, include_reviews, privacy):
-    ''' process a csv and then post about it '''
+    """ process a csv and then post about it """
     if isinstance(item.book, models.Work):
         item.book = item.book.default_edition
     if not item.book:
         return
 
-    existing_shelf = models.ShelfBook.objects.filter(
-        book=item.book, user=user).exists()
+    existing_shelf = models.ShelfBook.objects.filter(book=item.book, user=user).exists()
 
     # shelve the book if it hasn't been shelved already
     if item.shelf and not existing_shelf:
-        desired_shelf = models.Shelf.objects.get(
-            identifier=item.shelf,
-            user=user
-        )
-        models.ShelfBook.objects.create(
-            book=item.book, shelf=desired_shelf, user=user)
+        desired_shelf = models.Shelf.objects.get(identifier=item.shelf, user=user)
+        models.ShelfBook.objects.create(book=item.book, shelf=desired_shelf, user=user)
 
     for read in item.reads:
         # check for an existing readthrough with the same dates
         if models.ReadThrough.objects.filter(
-                user=user, book=item.book,
-                start_date=read.start_date,
-                finish_date=read.finish_date
-            ).exists():
+            user=user,
+            book=item.book,
+            start_date=read.start_date,
+            finish_date=read.finish_date,
+        ).exists():
             continue
         read.book = item.book
         read.user = user
         read.save()
 
     if include_reviews and (item.rating or item.review):
-        review_title = 'Review of {!r} on {!r}'.format(
-            item.book.title,
-            source,
-        ) if item.review else ''
+        review_title = (
+            "Review of {!r} on {!r}".format(
+                item.book.title,
+                source,
+            )
+            if item.review
+            else ""
+        )
 
         # we don't know the publication date of the review,
         # but "now" is a bad guess
diff --git a/bookwyrm/librarything_import.py b/bookwyrm/librarything_import.py
index 0584daad..b3dd9d56 100644
--- a/bookwyrm/librarything_import.py
+++ b/bookwyrm/librarything_import.py
@@ -1,4 +1,4 @@
-''' handle reading a csv from librarything '''
+""" handle reading a csv from librarything """
 import csv
 import re
 import math
@@ -9,34 +9,34 @@ from bookwyrm.importer import Importer
 
 
 class LibrarythingImporter(Importer):
-    service = 'LibraryThing'
-    delimiter = '\t'
-    encoding = 'ISO-8859-1'
+    service = "LibraryThing"
+    delimiter = "\t"
+    encoding = "ISO-8859-1"
     # mandatory_fields : fields matching the book title and author
-    mandatory_fields = ['Title', 'Primary Author']
+    mandatory_fields = ["Title", "Primary Author"]
 
     def parse_fields(self, initial):
         data = {}
-        data['import_source']   = self.service
-        data['Book Id'] = initial['Book Id']
-        data['Title'] = initial['Title']
-        data['Author'] = initial['Primary Author']
-        data['ISBN13'] = initial['ISBN']
-        data['My Review'] = initial['Review']
-        if initial['Rating']:
-            data['My Rating'] = math.ceil(float(initial['Rating']))
+        data["import_source"] = self.service
+        data["Book Id"] = initial["Book Id"]
+        data["Title"] = initial["Title"]
+        data["Author"] = initial["Primary Author"]
+        data["ISBN13"] = initial["ISBN"]
+        data["My Review"] = initial["Review"]
+        if initial["Rating"]:
+            data["My Rating"] = math.ceil(float(initial["Rating"]))
         else:
-            data['My Rating'] = ''
-        data['Date Added'] = re.sub('\[|\]', '', initial['Entry Date'])
-        data['Date Started'] = re.sub('\[|\]', '', initial['Date Started'])
-        data['Date Read'] = re.sub('\[|\]', '', initial['Date Read'])
+            data["My Rating"] = ""
+        data["Date Added"] = re.sub("\[|\]", "", initial["Entry Date"])
+        data["Date Started"] = re.sub("\[|\]", "", initial["Date Started"])
+        data["Date Read"] = re.sub("\[|\]", "", initial["Date Read"])
 
-        data['Exclusive Shelf'] = None
-        if data['Date Read']:
-            data['Exclusive Shelf'] = "read"
-        elif data['Date Started']:
-            data['Exclusive Shelf'] = "reading"
+        data["Exclusive Shelf"] = None
+        if data["Date Read"]:
+            data["Exclusive Shelf"] = "read"
+        elif data["Date Started"]:
+            data["Exclusive Shelf"] = "reading"
         else:
-            data['Exclusive Shelf'] = "to-read"
+            data["Exclusive Shelf"] = "to-read"
 
         return data
diff --git a/bookwyrm/management/commands/deduplicate_book_data.py b/bookwyrm/management/commands/deduplicate_book_data.py
index 044b2a98..edd91a71 100644
--- a/bookwyrm/management/commands/deduplicate_book_data.py
+++ b/bookwyrm/management/commands/deduplicate_book_data.py
@@ -1,26 +1,20 @@
-''' PROCEED WITH CAUTION: uses deduplication fields to permanently
-merge book data objects '''
+""" PROCEED WITH CAUTION: uses deduplication fields to permanently
+merge book data objects """
 from django.core.management.base import BaseCommand
 from django.db.models import Count
 from bookwyrm import models
 
 
 def update_related(canonical, obj):
-    ''' update all the models with fk to the object being removed '''
+    """ update all the models with fk to the object being removed """
     # move related models to canonical
     related_models = [
-        (r.remote_field.name, r.related_model) for r in \
-            canonical._meta.related_objects]
+        (r.remote_field.name, r.related_model) for r in canonical._meta.related_objects
+    ]
     for (related_field, related_model) in related_models:
-        related_objs = related_model.objects.filter(
-            **{related_field: obj})
+        related_objs = related_model.objects.filter(**{related_field: obj})
         for related_obj in related_objs:
-            print(
-                'replacing in',
-                related_model.__name__,
-                related_field,
-                related_obj.id
-            )
+            print("replacing in", related_model.__name__, related_field, related_obj.id)
             try:
                 setattr(related_obj, related_field, canonical)
                 related_obj.save()
@@ -30,40 +24,41 @@ def update_related(canonical, obj):
 
 
 def copy_data(canonical, obj):
-    ''' try to get the most data possible '''
+    """ try to get the most data possible """
     for data_field in obj._meta.get_fields():
-        if not hasattr(data_field, 'activitypub_field'):
+        if not hasattr(data_field, "activitypub_field"):
             continue
         data_value = getattr(obj, data_field.name)
         if not data_value:
             continue
         if not getattr(canonical, data_field.name):
-            print('setting data field', data_field.name, data_value)
+            print("setting data field", data_field.name, data_value)
             setattr(canonical, data_field.name, data_value)
     canonical.save()
 
 
 def dedupe_model(model):
-    ''' combine duplicate editions and update related models '''
+    """ combine duplicate editions and update related models """
     fields = model._meta.get_fields()
-    dedupe_fields = [f for f in fields if \
-            hasattr(f, 'deduplication_field') and f.deduplication_field]
+    dedupe_fields = [
+        f for f in fields if hasattr(f, "deduplication_field") and f.deduplication_field
+    ]
     for field in dedupe_fields:
-        dupes = model.objects.values(field.name).annotate(
-            Count(field.name)
-        ).filter(**{'%s__count__gt' % field.name: 1})
+        dupes = (
+            model.objects.values(field.name)
+            .annotate(Count(field.name))
+            .filter(**{"%s__count__gt" % field.name: 1})
+        )
 
         for dupe in dupes:
             value = dupe[field.name]
-            if not value or value == '':
+            if not value or value == "":
                 continue
-            print('----------')
+            print("----------")
             print(dupe)
-            objs = model.objects.filter(
-                **{field.name: value}
-            ).order_by('id')
+            objs = model.objects.filter(**{field.name: value}).order_by("id")
             canonical = objs.first()
-            print('keeping', canonical.remote_id)
+            print("keeping", canonical.remote_id)
             for obj in objs[1:]:
                 print(obj.remote_id)
                 copy_data(canonical, obj)
@@ -73,11 +68,12 @@ def dedupe_model(model):
 
 
 class Command(BaseCommand):
-    ''' dedplucate allllll the book data models '''
-    help = 'merges duplicate book data'
+    """ dedplucate allllll the book data models """
+
+    help = "merges duplicate book data"
     # pylint: disable=no-self-use,unused-argument
     def handle(self, *args, **options):
-        ''' run deudplications '''
+        """ run deudplications """
         dedupe_model(models.Edition)
         dedupe_model(models.Work)
         dedupe_model(models.Author)
diff --git a/bookwyrm/management/commands/initdb.py b/bookwyrm/management/commands/initdb.py
index 5759abfc..6b3f3762 100644
--- a/bookwyrm/management/commands/initdb.py
+++ b/bookwyrm/management/commands/initdb.py
@@ -5,51 +5,63 @@ from django.contrib.contenttypes.models import ContentType
 from bookwyrm.models import Connector, SiteSettings, User
 from bookwyrm.settings import DOMAIN
 
+
 def init_groups():
-    groups = ['admin', 'moderator', 'editor']
+    groups = ["admin", "moderator", "editor"]
     for group in groups:
         Group.objects.create(name=group)
 
+
 def init_permissions():
-    permissions = [{
-            'codename': 'edit_instance_settings',
-            'name': 'change the instance info',
-            'groups': ['admin',]
-        }, {
-            'codename': 'set_user_group',
-            'name': 'change what group a user is in',
-            'groups': ['admin', 'moderator']
-        }, {
-            'codename': 'control_federation',
-            'name': 'control who to federate with',
-            'groups': ['admin', 'moderator']
-        }, {
-            'codename': 'create_invites',
-            'name': 'issue invitations to join',
-            'groups': ['admin', 'moderator']
-        }, {
-            'codename': 'moderate_user',
-            'name': 'deactivate or silence a user',
-            'groups': ['admin', 'moderator']
-        }, {
-            'codename': 'moderate_post',
-            'name': 'delete other users\' posts',
-            'groups': ['admin', 'moderator']
-        }, {
-            'codename': 'edit_book',
-            'name': 'edit book info',
-            'groups': ['admin', 'moderator', 'editor']
-        }]
+    permissions = [
+        {
+            "codename": "edit_instance_settings",
+            "name": "change the instance info",
+            "groups": [
+                "admin",
+            ],
+        },
+        {
+            "codename": "set_user_group",
+            "name": "change what group a user is in",
+            "groups": ["admin", "moderator"],
+        },
+        {
+            "codename": "control_federation",
+            "name": "control who to federate with",
+            "groups": ["admin", "moderator"],
+        },
+        {
+            "codename": "create_invites",
+            "name": "issue invitations to join",
+            "groups": ["admin", "moderator"],
+        },
+        {
+            "codename": "moderate_user",
+            "name": "deactivate or silence a user",
+            "groups": ["admin", "moderator"],
+        },
+        {
+            "codename": "moderate_post",
+            "name": "delete other users' posts",
+            "groups": ["admin", "moderator"],
+        },
+        {
+            "codename": "edit_book",
+            "name": "edit book info",
+            "groups": ["admin", "moderator", "editor"],
+        },
+    ]
 
     content_type = ContentType.objects.get_for_model(User)
     for permission in permissions:
         permission_obj = Permission.objects.create(
-            codename=permission['codename'],
-            name=permission['name'],
+            codename=permission["codename"],
+            name=permission["name"],
             content_type=content_type,
         )
         # add the permission to the appropriate groups
-        for group_name in permission['groups']:
+        for group_name in permission["groups"]:
             Group.objects.get(name=group_name).permissions.add(permission_obj)
 
     # while the groups and permissions shouldn't be changed because the code
@@ -59,46 +71,48 @@ def init_permissions():
 def init_connectors():
     Connector.objects.create(
         identifier=DOMAIN,
-        name='Local',
+        name="Local",
         local=True,
-        connector_file='self_connector',
-        base_url='https://%s' % DOMAIN,
-        books_url='https://%s/book' % DOMAIN,
-        covers_url='https://%s/images/covers' % DOMAIN,
-        search_url='https://%s/search?q=' % DOMAIN,
-        isbn_search_url='https://%s/isbn/' % DOMAIN,
+        connector_file="self_connector",
+        base_url="https://%s" % DOMAIN,
+        books_url="https://%s/book" % DOMAIN,
+        covers_url="https://%s/images/covers" % DOMAIN,
+        search_url="https://%s/search?q=" % DOMAIN,
+        isbn_search_url="https://%s/isbn/" % DOMAIN,
         priority=1,
     )
 
     Connector.objects.create(
-        identifier='bookwyrm.social',
-        name='BookWyrm dot Social',
-        connector_file='bookwyrm_connector',
-        base_url='https://bookwyrm.social',
-        books_url='https://bookwyrm.social/book',
-        covers_url='https://bookwyrm.social/images/covers',
-        search_url='https://bookwyrm.social/search?q=',
-        isbn_search_url='https://bookwyrm.social/isbn/',
+        identifier="bookwyrm.social",
+        name="BookWyrm dot Social",
+        connector_file="bookwyrm_connector",
+        base_url="https://bookwyrm.social",
+        books_url="https://bookwyrm.social/book",
+        covers_url="https://bookwyrm.social/images/covers",
+        search_url="https://bookwyrm.social/search?q=",
+        isbn_search_url="https://bookwyrm.social/isbn/",
         priority=2,
     )
 
     Connector.objects.create(
-        identifier='openlibrary.org',
-        name='OpenLibrary',
-        connector_file='openlibrary',
-        base_url='https://openlibrary.org',
-        books_url='https://openlibrary.org',
-        covers_url='https://covers.openlibrary.org',
-        search_url='https://openlibrary.org/search?q=',
-        isbn_search_url='https://openlibrary.org/api/books?jscmd=data&format=json&bibkeys=ISBN:',
+        identifier="openlibrary.org",
+        name="OpenLibrary",
+        connector_file="openlibrary",
+        base_url="https://openlibrary.org",
+        books_url="https://openlibrary.org",
+        covers_url="https://covers.openlibrary.org",
+        search_url="https://openlibrary.org/search?q=",
+        isbn_search_url="https://openlibrary.org/api/books?jscmd=data&format=json&bibkeys=ISBN:",
         priority=3,
     )
 
+
 def init_settings():
     SiteSettings.objects.create()
 
+
 class Command(BaseCommand):
-    help = 'Initializes the database with starter data'
+    help = "Initializes the database with starter data"
 
     def handle(self, *args, **options):
         init_groups()
diff --git a/bookwyrm/management/commands/remove_editions.py b/bookwyrm/management/commands/remove_editions.py
index c5153f44..6829c6d1 100644
--- a/bookwyrm/management/commands/remove_editions.py
+++ b/bookwyrm/management/commands/remove_editions.py
@@ -1,34 +1,42 @@
-''' PROCEED WITH CAUTION: this permanently deletes book data '''
+""" PROCEED WITH CAUTION: this permanently deletes book data """
 from django.core.management.base import BaseCommand
 from django.db.models import Count, Q
 from bookwyrm import models
 
 
 def remove_editions():
-    ''' combine duplicate editions and update related models '''
+    """ combine duplicate editions and update related models """
     # not in use
-    filters = {'%s__isnull' % r.name: True \
-        for r in models.Edition._meta.related_objects}
+    filters = {
+        "%s__isnull" % r.name: True for r in models.Edition._meta.related_objects
+    }
     # no cover, no identifying fields
-    filters['cover'] = ''
-    null_fields = {'%s__isnull' % f: True for f in \
-        ['isbn_10', 'isbn_13', 'oclc_number']}
+    filters["cover"] = ""
+    null_fields = {
+        "%s__isnull" % f: True for f in ["isbn_10", "isbn_13", "oclc_number"]
+    }
 
-    editions = models.Edition.objects.filter(
-        Q(languages=[]) | Q(languages__contains=['English']),
-        **filters, **null_fields
-    ).annotate(Count('parent_work__editions')).filter(
-        # mustn't be the only edition for the work
-        parent_work__editions__count__gt=1
+    editions = (
+        models.Edition.objects.filter(
+            Q(languages=[]) | Q(languages__contains=["English"]),
+            **filters,
+            **null_fields
+        )
+        .annotate(Count("parent_work__editions"))
+        .filter(
+            # mustn't be the only edition for the work
+            parent_work__editions__count__gt=1
+        )
     )
     print(editions.count())
     editions.delete()
 
 
 class Command(BaseCommand):
-    ''' dedplucate allllll the book data models '''
-    help = 'merges duplicate book data'
+    """ dedplucate allllll the book data models """
+
+    help = "merges duplicate book data"
     # pylint: disable=no-self-use,unused-argument
     def handle(self, *args, **options):
-        ''' run deudplications '''
+        """ run deudplications """
         remove_editions()
diff --git a/bookwyrm/migrations/0001_initial.py b/bookwyrm/migrations/0001_initial.py
index 347057e1..a405b956 100644
--- a/bookwyrm/migrations/0001_initial.py
+++ b/bookwyrm/migrations/0001_initial.py
@@ -15,199 +15,448 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('auth', '0011_update_proxy_permissions'),
+        ("auth", "0011_update_proxy_permissions"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='User',
+            name="User",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('password', models.CharField(max_length=128, verbose_name='password')),
-                ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
-                ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
-                ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
-                ('first_name', models.CharField(blank=True, max_length=30, verbose_name='first name')),
-                ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')),
-                ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')),
-                ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
-                ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
-                ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
-                ('private_key', models.TextField(blank=True, null=True)),
-                ('public_key', models.TextField(blank=True, null=True)),
-                ('actor', models.CharField(max_length=255, unique=True)),
-                ('inbox', models.CharField(max_length=255, unique=True)),
-                ('shared_inbox', models.CharField(blank=True, max_length=255, null=True)),
-                ('outbox', models.CharField(max_length=255, unique=True)),
-                ('summary', models.TextField(blank=True, null=True)),
-                ('local', models.BooleanField(default=True)),
-                ('fedireads_user', models.BooleanField(default=True)),
-                ('localname', models.CharField(max_length=255, null=True, unique=True)),
-                ('name', models.CharField(blank=True, max_length=100, null=True)),
-                ('avatar', models.ImageField(blank=True, null=True, upload_to='avatars/')),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("password", models.CharField(max_length=128, verbose_name="password")),
+                (
+                    "last_login",
+                    models.DateTimeField(
+                        blank=True, null=True, verbose_name="last login"
+                    ),
+                ),
+                (
+                    "is_superuser",
+                    models.BooleanField(
+                        default=False,
+                        help_text="Designates that this user has all permissions without explicitly assigning them.",
+                        verbose_name="superuser status",
+                    ),
+                ),
+                (
+                    "username",
+                    models.CharField(
+                        error_messages={
+                            "unique": "A user with that username already exists."
+                        },
+                        help_text="Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.",
+                        max_length=150,
+                        unique=True,
+                        validators=[
+                            django.contrib.auth.validators.UnicodeUsernameValidator()
+                        ],
+                        verbose_name="username",
+                    ),
+                ),
+                (
+                    "first_name",
+                    models.CharField(
+                        blank=True, max_length=30, verbose_name="first name"
+                    ),
+                ),
+                (
+                    "last_name",
+                    models.CharField(
+                        blank=True, max_length=150, verbose_name="last name"
+                    ),
+                ),
+                (
+                    "email",
+                    models.EmailField(
+                        blank=True, max_length=254, verbose_name="email address"
+                    ),
+                ),
+                (
+                    "is_staff",
+                    models.BooleanField(
+                        default=False,
+                        help_text="Designates whether the user can log into this admin site.",
+                        verbose_name="staff status",
+                    ),
+                ),
+                (
+                    "is_active",
+                    models.BooleanField(
+                        default=True,
+                        help_text="Designates whether this user should be treated as active. Unselect this instead of deleting accounts.",
+                        verbose_name="active",
+                    ),
+                ),
+                (
+                    "date_joined",
+                    models.DateTimeField(
+                        default=django.utils.timezone.now, verbose_name="date joined"
+                    ),
+                ),
+                ("private_key", models.TextField(blank=True, null=True)),
+                ("public_key", models.TextField(blank=True, null=True)),
+                ("actor", models.CharField(max_length=255, unique=True)),
+                ("inbox", models.CharField(max_length=255, unique=True)),
+                (
+                    "shared_inbox",
+                    models.CharField(blank=True, max_length=255, null=True),
+                ),
+                ("outbox", models.CharField(max_length=255, unique=True)),
+                ("summary", models.TextField(blank=True, null=True)),
+                ("local", models.BooleanField(default=True)),
+                ("fedireads_user", models.BooleanField(default=True)),
+                ("localname", models.CharField(max_length=255, null=True, unique=True)),
+                ("name", models.CharField(blank=True, max_length=100, null=True)),
+                (
+                    "avatar",
+                    models.ImageField(blank=True, null=True, upload_to="avatars/"),
+                ),
             ],
             options={
-                'verbose_name': 'user',
-                'verbose_name_plural': 'users',
-                'abstract': False,
+                "verbose_name": "user",
+                "verbose_name_plural": "users",
+                "abstract": False,
             },
             managers=[
-                ('objects', django.contrib.auth.models.UserManager()),
+                ("objects", django.contrib.auth.models.UserManager()),
             ],
         ),
         migrations.CreateModel(
-            name='Author',
+            name="Author",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('content', models.TextField(blank=True, null=True)),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('openlibrary_key', models.CharField(max_length=255)),
-                ('data', JSONField()),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("content", models.TextField(blank=True, null=True)),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                ("openlibrary_key", models.CharField(max_length=255)),
+                ("data", JSONField()),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
         ),
         migrations.CreateModel(
-            name='Book',
+            name="Book",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('content', models.TextField(blank=True, null=True)),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('openlibrary_key', models.CharField(max_length=255, unique=True)),
-                ('data', JSONField()),
-                ('cover', models.ImageField(blank=True, null=True, upload_to='covers/')),
-                ('added_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
-                ('authors', models.ManyToManyField(to='bookwyrm.Author')),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("content", models.TextField(blank=True, null=True)),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                ("openlibrary_key", models.CharField(max_length=255, unique=True)),
+                ("data", JSONField()),
+                (
+                    "cover",
+                    models.ImageField(blank=True, null=True, upload_to="covers/"),
+                ),
+                (
+                    "added_by",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                ("authors", models.ManyToManyField(to="bookwyrm.Author")),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
         ),
         migrations.CreateModel(
-            name='FederatedServer',
+            name="FederatedServer",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('content', models.TextField(blank=True, null=True)),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('server_name', models.CharField(max_length=255, unique=True)),
-                ('status', models.CharField(default='federated', max_length=255)),
-                ('application_type', models.CharField(max_length=255, null=True)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("content", models.TextField(blank=True, null=True)),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                ("server_name", models.CharField(max_length=255, unique=True)),
+                ("status", models.CharField(default="federated", max_length=255)),
+                ("application_type", models.CharField(max_length=255, null=True)),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
         ),
         migrations.CreateModel(
-            name='Shelf',
+            name="Shelf",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('content', models.TextField(blank=True, null=True)),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('name', models.CharField(max_length=100)),
-                ('identifier', models.CharField(max_length=100)),
-                ('editable', models.BooleanField(default=True)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("content", models.TextField(blank=True, null=True)),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                ("name", models.CharField(max_length=100)),
+                ("identifier", models.CharField(max_length=100)),
+                ("editable", models.BooleanField(default=True)),
             ],
         ),
         migrations.CreateModel(
-            name='Status',
+            name="Status",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('content', models.TextField(blank=True, null=True)),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('status_type', models.CharField(default='Note', max_length=255)),
-                ('activity_type', models.CharField(default='Note', max_length=255)),
-                ('local', models.BooleanField(default=True)),
-                ('privacy', models.CharField(default='public', max_length=255)),
-                ('sensitive', models.BooleanField(default=False)),
-                ('mention_books', models.ManyToManyField(related_name='mention_book', to='bookwyrm.Book')),
-                ('mention_users', models.ManyToManyField(related_name='mention_user', to=settings.AUTH_USER_MODEL)),
-                ('reply_parent', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Status')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("content", models.TextField(blank=True, null=True)),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                ("status_type", models.CharField(default="Note", max_length=255)),
+                ("activity_type", models.CharField(default="Note", max_length=255)),
+                ("local", models.BooleanField(default=True)),
+                ("privacy", models.CharField(default="public", max_length=255)),
+                ("sensitive", models.BooleanField(default=False)),
+                (
+                    "mention_books",
+                    models.ManyToManyField(
+                        related_name="mention_book", to="bookwyrm.Book"
+                    ),
+                ),
+                (
+                    "mention_users",
+                    models.ManyToManyField(
+                        related_name="mention_user", to=settings.AUTH_USER_MODEL
+                    ),
+                ),
+                (
+                    "reply_parent",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to="bookwyrm.Status",
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
         ),
         migrations.CreateModel(
-            name='UserRelationship',
+            name="UserRelationship",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('content', models.TextField(blank=True, null=True)),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('status', models.CharField(default='follows', max_length=100, null=True)),
-                ('relationship_id', models.CharField(max_length=100)),
-                ('user_object', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='user_object', to=settings.AUTH_USER_MODEL)),
-                ('user_subject', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='user_subject', to=settings.AUTH_USER_MODEL)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("content", models.TextField(blank=True, null=True)),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                (
+                    "status",
+                    models.CharField(default="follows", max_length=100, null=True),
+                ),
+                ("relationship_id", models.CharField(max_length=100)),
+                (
+                    "user_object",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        related_name="user_object",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "user_subject",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        related_name="user_subject",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
         ),
         migrations.CreateModel(
-            name='ShelfBook',
+            name="ShelfBook",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('content', models.TextField(blank=True, null=True)),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('added_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
-                ('book', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Book')),
-                ('shelf', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Shelf')),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("content", models.TextField(blank=True, null=True)),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                (
+                    "added_by",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "book",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT, to="bookwyrm.Book"
+                    ),
+                ),
+                (
+                    "shelf",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT, to="bookwyrm.Shelf"
+                    ),
+                ),
             ],
             options={
-                'unique_together': {('book', 'shelf')},
+                "unique_together": {("book", "shelf")},
             },
         ),
         migrations.AddField(
-            model_name='shelf',
-            name='books',
-            field=models.ManyToManyField(through='bookwyrm.ShelfBook', to='bookwyrm.Book'),
+            model_name="shelf",
+            name="books",
+            field=models.ManyToManyField(
+                through="bookwyrm.ShelfBook", to="bookwyrm.Book"
+            ),
         ),
         migrations.AddField(
-            model_name='shelf',
-            name='user',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL),
+            model_name="shelf",
+            name="user",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL
+            ),
         ),
         migrations.AddField(
-            model_name='book',
-            name='shelves',
-            field=models.ManyToManyField(through='bookwyrm.ShelfBook', to='bookwyrm.Shelf'),
+            model_name="book",
+            name="shelves",
+            field=models.ManyToManyField(
+                through="bookwyrm.ShelfBook", to="bookwyrm.Shelf"
+            ),
         ),
         migrations.AddField(
-            model_name='user',
-            name='federated_server',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.FederatedServer'),
+            model_name="user",
+            name="federated_server",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to="bookwyrm.FederatedServer",
+            ),
         ),
         migrations.AddField(
-            model_name='user',
-            name='followers',
-            field=models.ManyToManyField(through='bookwyrm.UserRelationship', to=settings.AUTH_USER_MODEL),
+            model_name="user",
+            name="followers",
+            field=models.ManyToManyField(
+                through="bookwyrm.UserRelationship", to=settings.AUTH_USER_MODEL
+            ),
         ),
         migrations.AddField(
-            model_name='user',
-            name='groups',
-            field=models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups'),
+            model_name="user",
+            name="groups",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="The groups this user belongs to. A user will get all permissions granted to each of their groups.",
+                related_name="user_set",
+                related_query_name="user",
+                to="auth.Group",
+                verbose_name="groups",
+            ),
         ),
         migrations.AddField(
-            model_name='user',
-            name='user_permissions',
-            field=models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions'),
+            model_name="user",
+            name="user_permissions",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="Specific permissions for this user.",
+                related_name="user_set",
+                related_query_name="user",
+                to="auth.Permission",
+                verbose_name="user permissions",
+            ),
         ),
         migrations.AlterUniqueTogether(
-            name='shelf',
-            unique_together={('user', 'identifier')},
+            name="shelf",
+            unique_together={("user", "identifier")},
         ),
         migrations.CreateModel(
-            name='Review',
+            name="Review",
             fields=[
-                ('status_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.Status')),
-                ('name', models.CharField(max_length=255)),
-                ('rating', models.IntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(5)])),
-                ('book', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Book')),
+                (
+                    "status_ptr",
+                    models.OneToOneField(
+                        auto_created=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        parent_link=True,
+                        primary_key=True,
+                        serialize=False,
+                        to="bookwyrm.Status",
+                    ),
+                ),
+                ("name", models.CharField(max_length=255)),
+                (
+                    "rating",
+                    models.IntegerField(
+                        default=0,
+                        validators=[
+                            django.core.validators.MinValueValidator(0),
+                            django.core.validators.MaxValueValidator(5),
+                        ],
+                    ),
+                ),
+                (
+                    "book",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT, to="bookwyrm.Book"
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
-            bases=('bookwyrm.status',),
+            bases=("bookwyrm.status",),
         ),
     ]
diff --git a/bookwyrm/migrations/0002_auto_20200219_0816.py b/bookwyrm/migrations/0002_auto_20200219_0816.py
index 9cb5b726..07daad93 100644
--- a/bookwyrm/migrations/0002_auto_20200219_0816.py
+++ b/bookwyrm/migrations/0002_auto_20200219_0816.py
@@ -8,31 +8,59 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0001_initial'),
+        ("bookwyrm", "0001_initial"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='Favorite',
+            name="Favorite",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('content', models.TextField(blank=True, null=True)),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('status', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Status')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("content", models.TextField(blank=True, null=True)),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                (
+                    "status",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to="bookwyrm.Status",
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
             ],
             options={
-                'unique_together': {('user', 'status')},
+                "unique_together": {("user", "status")},
             },
         ),
         migrations.AddField(
-            model_name='status',
-            name='favorites',
-            field=models.ManyToManyField(related_name='user_favorites', through='bookwyrm.Favorite', to=settings.AUTH_USER_MODEL),
+            model_name="status",
+            name="favorites",
+            field=models.ManyToManyField(
+                related_name="user_favorites",
+                through="bookwyrm.Favorite",
+                to=settings.AUTH_USER_MODEL,
+            ),
         ),
         migrations.AddField(
-            model_name='user',
-            name='favorites',
-            field=models.ManyToManyField(related_name='favorite_statuses', through='bookwyrm.Favorite', to='bookwyrm.Status'),
+            model_name="user",
+            name="favorites",
+            field=models.ManyToManyField(
+                related_name="favorite_statuses",
+                through="bookwyrm.Favorite",
+                to="bookwyrm.Status",
+            ),
         ),
     ]
diff --git a/bookwyrm/migrations/0003_auto_20200221_0131.py b/bookwyrm/migrations/0003_auto_20200221_0131.py
index e53f042b..e3e16414 100644
--- a/bookwyrm/migrations/0003_auto_20200221_0131.py
+++ b/bookwyrm/migrations/0003_auto_20200221_0131.py
@@ -7,87 +7,89 @@ import django.utils.timezone
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0002_auto_20200219_0816'),
+        ("bookwyrm", "0002_auto_20200219_0816"),
     ]
 
     operations = [
         migrations.RemoveField(
-            model_name='author',
-            name='content',
+            model_name="author",
+            name="content",
         ),
         migrations.RemoveField(
-            model_name='book',
-            name='content',
+            model_name="book",
+            name="content",
         ),
         migrations.RemoveField(
-            model_name='favorite',
-            name='content',
+            model_name="favorite",
+            name="content",
         ),
         migrations.RemoveField(
-            model_name='federatedserver',
-            name='content',
+            model_name="federatedserver",
+            name="content",
         ),
         migrations.RemoveField(
-            model_name='shelf',
-            name='content',
+            model_name="shelf",
+            name="content",
         ),
         migrations.RemoveField(
-            model_name='shelfbook',
-            name='content',
+            model_name="shelfbook",
+            name="content",
         ),
         migrations.RemoveField(
-            model_name='userrelationship',
-            name='content',
+            model_name="userrelationship",
+            name="content",
         ),
         migrations.AddField(
-            model_name='author',
-            name='updated_date',
+            model_name="author",
+            name="updated_date",
             field=models.DateTimeField(auto_now=True),
         ),
         migrations.AddField(
-            model_name='book',
-            name='updated_date',
+            model_name="book",
+            name="updated_date",
             field=models.DateTimeField(auto_now=True),
         ),
         migrations.AddField(
-            model_name='favorite',
-            name='updated_date',
+            model_name="favorite",
+            name="updated_date",
             field=models.DateTimeField(auto_now=True),
         ),
         migrations.AddField(
-            model_name='federatedserver',
-            name='updated_date',
+            model_name="federatedserver",
+            name="updated_date",
             field=models.DateTimeField(auto_now=True),
         ),
         migrations.AddField(
-            model_name='shelf',
-            name='updated_date',
+            model_name="shelf",
+            name="updated_date",
             field=models.DateTimeField(auto_now=True),
         ),
         migrations.AddField(
-            model_name='shelfbook',
-            name='updated_date',
+            model_name="shelfbook",
+            name="updated_date",
             field=models.DateTimeField(auto_now=True),
         ),
         migrations.AddField(
-            model_name='status',
-            name='updated_date',
+            model_name="status",
+            name="updated_date",
             field=models.DateTimeField(auto_now=True),
         ),
         migrations.AddField(
-            model_name='user',
-            name='created_date',
-            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            model_name="user",
+            name="created_date",
+            field=models.DateTimeField(
+                auto_now_add=True, default=django.utils.timezone.now
+            ),
             preserve_default=False,
         ),
         migrations.AddField(
-            model_name='user',
-            name='updated_date',
+            model_name="user",
+            name="updated_date",
             field=models.DateTimeField(auto_now=True),
         ),
         migrations.AddField(
-            model_name='userrelationship',
-            name='updated_date',
+            model_name="userrelationship",
+            name="updated_date",
             field=models.DateTimeField(auto_now=True),
         ),
     ]
diff --git a/bookwyrm/migrations/0004_tag.py b/bookwyrm/migrations/0004_tag.py
index 20955000..b6210070 100644
--- a/bookwyrm/migrations/0004_tag.py
+++ b/bookwyrm/migrations/0004_tag.py
@@ -8,22 +8,41 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0003_auto_20200221_0131'),
+        ("bookwyrm", "0003_auto_20200221_0131"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='Tag',
+            name="Tag",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('updated_date', models.DateTimeField(auto_now=True)),
-                ('name', models.CharField(max_length=140)),
-                ('book', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Book')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                ("updated_date", models.DateTimeField(auto_now=True)),
+                ("name", models.CharField(max_length=140)),
+                (
+                    "book",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT, to="bookwyrm.Book"
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
             ],
             options={
-                'unique_together': {('user', 'book', 'name')},
+                "unique_together": {("user", "book", "name")},
             },
         ),
     ]
diff --git a/bookwyrm/migrations/0005_auto_20200221_1645.py b/bookwyrm/migrations/0005_auto_20200221_1645.py
index dbd87e92..449ce041 100644
--- a/bookwyrm/migrations/0005_auto_20200221_1645.py
+++ b/bookwyrm/migrations/0005_auto_20200221_1645.py
@@ -5,27 +5,27 @@ from django.db import migrations, models
 
 def populate_identifiers(app_registry, schema_editor):
     db_alias = schema_editor.connection.alias
-    tags = app_registry.get_model('bookwyrm', 'Tag')
+    tags = app_registry.get_model("bookwyrm", "Tag")
     for tag in tags.objects.using(db_alias):
-        tag.identifier = re.sub(r'\W+', '-', tag.name).lower()
+        tag.identifier = re.sub(r"\W+", "-", tag.name).lower()
         tag.save()
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0004_tag'),
+        ("bookwyrm", "0004_tag"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='tag',
-            name='identifier',
+            model_name="tag",
+            name="identifier",
             field=models.CharField(max_length=100, null=True),
         ),
         migrations.AlterField(
-            model_name='tag',
-            name='name',
+            model_name="tag",
+            name="name",
             field=models.CharField(max_length=100),
         ),
         migrations.RunPython(populate_identifiers),
diff --git a/bookwyrm/migrations/0006_auto_20200221_1702_squashed_0064_merge_20201101_1913.py b/bookwyrm/migrations/0006_auto_20200221_1702_squashed_0064_merge_20201101_1913.py
index 6a149ab5..c06fa40a 100644
--- a/bookwyrm/migrations/0006_auto_20200221_1702_squashed_0064_merge_20201101_1913.py
+++ b/bookwyrm/migrations/0006_auto_20200221_1702_squashed_0064_merge_20201101_1913.py
@@ -16,1056 +16,1647 @@ import uuid
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0005_auto_20200221_1645'),
+        ("bookwyrm", "0005_auto_20200221_1645"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='tag',
-            name='identifier',
+            model_name="tag",
+            name="identifier",
             field=models.CharField(max_length=100),
         ),
         migrations.AddConstraint(
-            model_name='userrelationship',
-            constraint=models.UniqueConstraint(fields=('user_subject', 'user_object'), name='followers_unique'),
+            model_name="userrelationship",
+            constraint=models.UniqueConstraint(
+                fields=("user_subject", "user_object"), name="followers_unique"
+            ),
         ),
         migrations.RemoveField(
-            model_name='user',
-            name='followers',
+            model_name="user",
+            name="followers",
         ),
         migrations.AddField(
-            model_name='status',
-            name='published_date',
+            model_name="status",
+            name="published_date",
             field=models.DateTimeField(default=django.utils.timezone.now),
         ),
         migrations.CreateModel(
-            name='Edition',
+            name="Edition",
             fields=[
-                ('book_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.Book')),
-                ('isbn', models.CharField(max_length=255, null=True, unique=True)),
-                ('oclc_number', models.CharField(max_length=255, null=True, unique=True)),
-                ('pages', models.IntegerField(null=True)),
+                (
+                    "book_ptr",
+                    models.OneToOneField(
+                        auto_created=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        parent_link=True,
+                        primary_key=True,
+                        serialize=False,
+                        to="bookwyrm.Book",
+                    ),
+                ),
+                ("isbn", models.CharField(max_length=255, null=True, unique=True)),
+                (
+                    "oclc_number",
+                    models.CharField(max_length=255, null=True, unique=True),
+                ),
+                ("pages", models.IntegerField(null=True)),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
-            bases=('bookwyrm.book',),
+            bases=("bookwyrm.book",),
         ),
         migrations.CreateModel(
-            name='Work',
+            name="Work",
             fields=[
-                ('book_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.Book')),
-                ('lccn', models.CharField(max_length=255, null=True, unique=True)),
+                (
+                    "book_ptr",
+                    models.OneToOneField(
+                        auto_created=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        parent_link=True,
+                        primary_key=True,
+                        serialize=False,
+                        to="bookwyrm.Book",
+                    ),
+                ),
+                ("lccn", models.CharField(max_length=255, null=True, unique=True)),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
-            bases=('bookwyrm.book',),
+            bases=("bookwyrm.book",),
         ),
         migrations.RemoveField(
-            model_name='author',
-            name='data',
+            model_name="author",
+            name="data",
         ),
         migrations.RemoveField(
-            model_name='book',
-            name='added_by',
+            model_name="book",
+            name="added_by",
         ),
         migrations.RemoveField(
-            model_name='book',
-            name='data',
+            model_name="book",
+            name="data",
         ),
         migrations.AddField(
-            model_name='author',
-            name='bio',
+            model_name="author",
+            name="bio",
             field=models.TextField(blank=True, null=True),
         ),
         migrations.AddField(
-            model_name='author',
-            name='born',
+            model_name="author",
+            name="born",
             field=models.DateTimeField(null=True),
         ),
         migrations.AddField(
-            model_name='author',
-            name='died',
+            model_name="author",
+            name="died",
             field=models.DateTimeField(null=True),
         ),
         migrations.AddField(
-            model_name='author',
-            name='first_name',
+            model_name="author",
+            name="first_name",
             field=models.CharField(max_length=255, null=True),
         ),
         migrations.AddField(
-            model_name='author',
-            name='last_name',
+            model_name="author",
+            name="last_name",
             field=models.CharField(max_length=255, null=True),
         ),
         migrations.AddField(
-            model_name='author',
-            name='name',
-            field=models.CharField(default='Unknown', max_length=255),
+            model_name="author",
+            name="name",
+            field=models.CharField(default="Unknown", max_length=255),
             preserve_default=False,
         ),
         migrations.AddField(
-            model_name='author',
-            name='wikipedia_link',
+            model_name="author",
+            name="wikipedia_link",
             field=models.CharField(blank=True, max_length=255, null=True),
         ),
         migrations.AddField(
-            model_name='book',
-            name='description',
+            model_name="book",
+            name="description",
             field=models.TextField(blank=True, null=True),
         ),
         migrations.AddField(
-            model_name='book',
-            name='first_published_date',
+            model_name="book",
+            name="first_published_date",
             field=models.DateTimeField(null=True),
         ),
         migrations.AddField(
-            model_name='book',
-            name='language',
+            model_name="book",
+            name="language",
             field=models.CharField(max_length=255, null=True),
         ),
         migrations.AddField(
-            model_name='book',
-            name='last_sync_date',
+            model_name="book",
+            name="last_sync_date",
             field=models.DateTimeField(default=django.utils.timezone.now),
         ),
         migrations.AddField(
-            model_name='book',
-            name='librarything_key',
+            model_name="book",
+            name="librarything_key",
             field=models.CharField(max_length=255, null=True, unique=True),
         ),
         migrations.AddField(
-            model_name='book',
-            name='local_edits',
+            model_name="book",
+            name="local_edits",
             field=models.BooleanField(default=False),
         ),
         migrations.AddField(
-            model_name='book',
-            name='local_key',
+            model_name="book",
+            name="local_key",
             field=models.CharField(default=uuid.uuid4, max_length=255, unique=True),
         ),
         migrations.AddField(
-            model_name='book',
-            name='misc_identifiers',
+            model_name="book",
+            name="misc_identifiers",
             field=JSONField(null=True),
         ),
         migrations.AddField(
-            model_name='book',
-            name='origin',
+            model_name="book",
+            name="origin",
             field=models.CharField(max_length=255, null=True, unique=True),
         ),
         migrations.AddField(
-            model_name='book',
-            name='published_date',
+            model_name="book",
+            name="published_date",
             field=models.DateTimeField(null=True),
         ),
         migrations.AddField(
-            model_name='book',
-            name='series',
+            model_name="book",
+            name="series",
             field=models.CharField(blank=True, max_length=255, null=True),
         ),
         migrations.AddField(
-            model_name='book',
-            name='series_number',
+            model_name="book",
+            name="series_number",
             field=models.CharField(blank=True, max_length=255, null=True),
         ),
         migrations.AddField(
-            model_name='book',
-            name='sort_title',
+            model_name="book",
+            name="sort_title",
             field=models.CharField(max_length=255, null=True),
         ),
         migrations.AddField(
-            model_name='book',
-            name='subtitle',
+            model_name="book",
+            name="subtitle",
             field=models.TextField(blank=True, null=True),
         ),
         migrations.AddField(
-            model_name='book',
-            name='sync',
+            model_name="book",
+            name="sync",
             field=models.BooleanField(default=True),
         ),
         migrations.AddField(
-            model_name='book',
-            name='title',
-            field=models.CharField(default='Unknown', max_length=255),
+            model_name="book",
+            name="title",
+            field=models.CharField(default="Unknown", max_length=255),
             preserve_default=False,
         ),
         migrations.AlterField(
-            model_name='author',
-            name='openlibrary_key',
+            model_name="author",
+            name="openlibrary_key",
             field=models.CharField(max_length=255, null=True, unique=True),
         ),
         migrations.AlterField(
-            model_name='book',
-            name='openlibrary_key',
+            model_name="book",
+            name="openlibrary_key",
             field=models.CharField(max_length=255, null=True, unique=True),
         ),
         migrations.AddField(
-            model_name='book',
-            name='parent_work',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Work'),
+            model_name="book",
+            name="parent_work",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to="bookwyrm.Work",
+            ),
         ),
         migrations.CreateModel(
-            name='Notification',
+            name="Notification",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('updated_date', models.DateTimeField(auto_now=True)),
-                ('read', models.BooleanField(default=False)),
-                ('notification_type', models.CharField(max_length=255)),
-                ('related_book', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Book')),
-                ('related_status', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Status')),
-                ('related_user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='related_user', to=settings.AUTH_USER_MODEL)),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                ("updated_date", models.DateTimeField(auto_now=True)),
+                ("read", models.BooleanField(default=False)),
+                ("notification_type", models.CharField(max_length=255)),
+                (
+                    "related_book",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to="bookwyrm.Book",
+                    ),
+                ),
+                (
+                    "related_status",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to="bookwyrm.Status",
+                    ),
+                ),
+                (
+                    "related_user",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.PROTECT,
+                        related_name="related_user",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
         ),
         migrations.AddField(
-            model_name='author',
-            name='aliases',
-            field=bookwyrm.models.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None),
+            model_name="author",
+            name="aliases",
+            field=bookwyrm.models.fields.ArrayField(
+                base_field=models.CharField(max_length=255),
+                blank=True,
+                default=list,
+                size=None,
+            ),
         ),
         migrations.AddField(
-            model_name='user',
-            name='manually_approves_followers',
+            model_name="user",
+            name="manually_approves_followers",
             field=models.BooleanField(default=False),
         ),
         migrations.AddField(
-            model_name='status',
-            name='remote_id',
+            model_name="status",
+            name="remote_id",
             field=models.CharField(max_length=255, null=True, unique=True),
         ),
         migrations.CreateModel(
-            name='UserBlocks',
+            name="UserBlocks",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('updated_date', models.DateTimeField(auto_now=True)),
-                ('relationship_id', models.CharField(max_length=100)),
-                ('user_object', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='userblocks_user_object', to=settings.AUTH_USER_MODEL)),
-                ('user_subject', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='userblocks_user_subject', to=settings.AUTH_USER_MODEL)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                ("updated_date", models.DateTimeField(auto_now=True)),
+                ("relationship_id", models.CharField(max_length=100)),
+                (
+                    "user_object",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        related_name="userblocks_user_object",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "user_subject",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        related_name="userblocks_user_subject",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
         ),
         migrations.CreateModel(
-            name='UserFollowRequest',
+            name="UserFollowRequest",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('updated_date', models.DateTimeField(auto_now=True)),
-                ('relationship_id', models.CharField(max_length=100)),
-                ('user_object', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='userfollowrequest_user_object', to=settings.AUTH_USER_MODEL)),
-                ('user_subject', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='userfollowrequest_user_subject', to=settings.AUTH_USER_MODEL)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                ("updated_date", models.DateTimeField(auto_now=True)),
+                ("relationship_id", models.CharField(max_length=100)),
+                (
+                    "user_object",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        related_name="userfollowrequest_user_object",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "user_subject",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        related_name="userfollowrequest_user_subject",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
         ),
         migrations.CreateModel(
-            name='UserFollows',
+            name="UserFollows",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('updated_date', models.DateTimeField(auto_now=True)),
-                ('relationship_id', models.CharField(max_length=100)),
-                ('user_object', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='userfollows_user_object', to=settings.AUTH_USER_MODEL)),
-                ('user_subject', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='userfollows_user_subject', to=settings.AUTH_USER_MODEL)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                ("updated_date", models.DateTimeField(auto_now=True)),
+                ("relationship_id", models.CharField(max_length=100)),
+                (
+                    "user_object",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        related_name="userfollows_user_object",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "user_subject",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        related_name="userfollows_user_subject",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
         ),
         migrations.DeleteModel(
-            name='UserRelationship',
+            name="UserRelationship",
         ),
         migrations.AddField(
-            model_name='user',
-            name='blocks',
-            field=models.ManyToManyField(related_name='blocked_by', through='bookwyrm.UserBlocks', to=settings.AUTH_USER_MODEL),
+            model_name="user",
+            name="blocks",
+            field=models.ManyToManyField(
+                related_name="blocked_by",
+                through="bookwyrm.UserBlocks",
+                to=settings.AUTH_USER_MODEL,
+            ),
         ),
         migrations.AddField(
-            model_name='user',
-            name='follow_requests',
-            field=models.ManyToManyField(related_name='follower_requests', through='bookwyrm.UserFollowRequest', to=settings.AUTH_USER_MODEL),
+            model_name="user",
+            name="follow_requests",
+            field=models.ManyToManyField(
+                related_name="follower_requests",
+                through="bookwyrm.UserFollowRequest",
+                to=settings.AUTH_USER_MODEL,
+            ),
         ),
         migrations.AddField(
-            model_name='user',
-            name='following',
-            field=models.ManyToManyField(related_name='followers', through='bookwyrm.UserFollows', to=settings.AUTH_USER_MODEL),
+            model_name="user",
+            name="following",
+            field=models.ManyToManyField(
+                related_name="followers",
+                through="bookwyrm.UserFollows",
+                to=settings.AUTH_USER_MODEL,
+            ),
         ),
         migrations.AddConstraint(
-            model_name='userfollows',
-            constraint=models.UniqueConstraint(fields=('user_subject', 'user_object'), name='userfollows_unique'),
+            model_name="userfollows",
+            constraint=models.UniqueConstraint(
+                fields=("user_subject", "user_object"), name="userfollows_unique"
+            ),
         ),
         migrations.AddConstraint(
-            model_name='userfollowrequest',
-            constraint=models.UniqueConstraint(fields=('user_subject', 'user_object'), name='userfollowrequest_unique'),
+            model_name="userfollowrequest",
+            constraint=models.UniqueConstraint(
+                fields=("user_subject", "user_object"), name="userfollowrequest_unique"
+            ),
         ),
         migrations.AddConstraint(
-            model_name='userblocks',
-            constraint=models.UniqueConstraint(fields=('user_subject', 'user_object'), name='userblocks_unique'),
+            model_name="userblocks",
+            constraint=models.UniqueConstraint(
+                fields=("user_subject", "user_object"), name="userblocks_unique"
+            ),
         ),
         migrations.AlterField(
-            model_name='notification',
-            name='notification_type',
-            field=models.CharField(choices=[('FAVORITE', 'Favorite'), ('REPLY', 'Reply'), ('TAG', 'Tag'), ('FOLLOW', 'Follow'), ('FOLLOW_REQUEST', 'Follow Request')], max_length=255),
+            model_name="notification",
+            name="notification_type",
+            field=models.CharField(
+                choices=[
+                    ("FAVORITE", "Favorite"),
+                    ("REPLY", "Reply"),
+                    ("TAG", "Tag"),
+                    ("FOLLOW", "Follow"),
+                    ("FOLLOW_REQUEST", "Follow Request"),
+                ],
+                max_length=255,
+            ),
         ),
         migrations.AddConstraint(
-            model_name='notification',
-            constraint=models.CheckConstraint(check=models.Q(notification_type__in=['FAVORITE', 'REPLY', 'TAG', 'FOLLOW', 'FOLLOW_REQUEST']), name='notification_type_valid'),
+            model_name="notification",
+            constraint=models.CheckConstraint(
+                check=models.Q(
+                    notification_type__in=[
+                        "FAVORITE",
+                        "REPLY",
+                        "TAG",
+                        "FOLLOW",
+                        "FOLLOW_REQUEST",
+                    ]
+                ),
+                name="notification_type_valid",
+            ),
         ),
         migrations.AddConstraint(
-            model_name='userblocks',
-            constraint=models.CheckConstraint(check=models.Q(_negated=True, user_subject=django.db.models.expressions.F('user_object')), name='userblocks_no_self'),
+            model_name="userblocks",
+            constraint=models.CheckConstraint(
+                check=models.Q(
+                    _negated=True,
+                    user_subject=django.db.models.expressions.F("user_object"),
+                ),
+                name="userblocks_no_self",
+            ),
         ),
         migrations.AddConstraint(
-            model_name='userfollowrequest',
-            constraint=models.CheckConstraint(check=models.Q(_negated=True, user_subject=django.db.models.expressions.F('user_object')), name='userfollowrequest_no_self'),
+            model_name="userfollowrequest",
+            constraint=models.CheckConstraint(
+                check=models.Q(
+                    _negated=True,
+                    user_subject=django.db.models.expressions.F("user_object"),
+                ),
+                name="userfollowrequest_no_self",
+            ),
         ),
         migrations.AddConstraint(
-            model_name='userfollows',
-            constraint=models.CheckConstraint(check=models.Q(_negated=True, user_subject=django.db.models.expressions.F('user_object')), name='userfollows_no_self'),
+            model_name="userfollows",
+            constraint=models.CheckConstraint(
+                check=models.Q(
+                    _negated=True,
+                    user_subject=django.db.models.expressions.F("user_object"),
+                ),
+                name="userfollows_no_self",
+            ),
         ),
         migrations.AddField(
-            model_name='favorite',
-            name='remote_id',
+            model_name="favorite",
+            name="remote_id",
             field=models.CharField(max_length=255, null=True, unique=True),
         ),
         migrations.CreateModel(
-            name='Comment',
+            name="Comment",
             fields=[
-                ('status_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.Status')),
-                ('name', models.CharField(max_length=255)),
-                ('book', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Book')),
+                (
+                    "status_ptr",
+                    models.OneToOneField(
+                        auto_created=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        parent_link=True,
+                        primary_key=True,
+                        serialize=False,
+                        to="bookwyrm.Status",
+                    ),
+                ),
+                ("name", models.CharField(max_length=255)),
+                (
+                    "book",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT, to="bookwyrm.Book"
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
-            bases=('bookwyrm.status',),
+            bases=("bookwyrm.status",),
         ),
         migrations.CreateModel(
-            name='Connector',
+            name="Connector",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('updated_date', models.DateTimeField(auto_now=True)),
-                ('identifier', models.CharField(max_length=255, unique=True)),
-                ('connector_file', models.CharField(choices=[('openlibrary', 'Openlibrary'), ('bookwyrm', 'BookWyrm')], default='openlibrary', max_length=255)),
-                ('is_self', models.BooleanField(default=False)),
-                ('api_key', models.CharField(max_length=255, null=True)),
-                ('base_url', models.CharField(max_length=255)),
-                ('covers_url', models.CharField(max_length=255)),
-                ('search_url', models.CharField(max_length=255, null=True)),
-                ('key_name', models.CharField(max_length=255)),
-                ('politeness_delay', models.IntegerField(null=True)),
-                ('max_query_count', models.IntegerField(null=True)),
-                ('query_count', models.IntegerField(default=0)),
-                ('query_count_expiry', models.DateTimeField(auto_now_add=True)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                ("updated_date", models.DateTimeField(auto_now=True)),
+                ("identifier", models.CharField(max_length=255, unique=True)),
+                (
+                    "connector_file",
+                    models.CharField(
+                        choices=[
+                            ("openlibrary", "Openlibrary"),
+                            ("bookwyrm", "BookWyrm"),
+                        ],
+                        default="openlibrary",
+                        max_length=255,
+                    ),
+                ),
+                ("is_self", models.BooleanField(default=False)),
+                ("api_key", models.CharField(max_length=255, null=True)),
+                ("base_url", models.CharField(max_length=255)),
+                ("covers_url", models.CharField(max_length=255)),
+                ("search_url", models.CharField(max_length=255, null=True)),
+                ("key_name", models.CharField(max_length=255)),
+                ("politeness_delay", models.IntegerField(null=True)),
+                ("max_query_count", models.IntegerField(null=True)),
+                ("query_count", models.IntegerField(default=0)),
+                ("query_count_expiry", models.DateTimeField(auto_now_add=True)),
             ],
         ),
         migrations.RenameField(
-            model_name='book',
-            old_name='local_key',
-            new_name='fedireads_key',
+            model_name="book",
+            old_name="local_key",
+            new_name="fedireads_key",
         ),
         migrations.RenameField(
-            model_name='book',
-            old_name='origin',
-            new_name='source_url',
+            model_name="book",
+            old_name="origin",
+            new_name="source_url",
         ),
         migrations.RemoveField(
-            model_name='book',
-            name='local_edits',
+            model_name="book",
+            name="local_edits",
         ),
         migrations.AddConstraint(
-            model_name='connector',
-            constraint=models.CheckConstraint(check=models.Q(connector_file__in=bookwyrm.models.connector.ConnectorFiles), name='connector_file_valid'),
+            model_name="connector",
+            constraint=models.CheckConstraint(
+                check=models.Q(
+                    connector_file__in=bookwyrm.models.connector.ConnectorFiles
+                ),
+                name="connector_file_valid",
+            ),
         ),
         migrations.AddField(
-            model_name='book',
-            name='connector',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Connector'),
+            model_name="book",
+            name="connector",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to="bookwyrm.Connector",
+            ),
         ),
         migrations.AddField(
-            model_name='book',
-            name='subject_places',
-            field=ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None),
+            model_name="book",
+            name="subject_places",
+            field=ArrayField(
+                base_field=models.CharField(max_length=255),
+                blank=True,
+                default=list,
+                size=None,
+            ),
         ),
         migrations.AddField(
-            model_name='book',
-            name='subjects',
-            field=ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None),
+            model_name="book",
+            name="subjects",
+            field=ArrayField(
+                base_field=models.CharField(max_length=255),
+                blank=True,
+                default=list,
+                size=None,
+            ),
         ),
         migrations.AddField(
-            model_name='edition',
-            name='publishers',
-            field=ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None),
+            model_name="edition",
+            name="publishers",
+            field=ArrayField(
+                base_field=models.CharField(max_length=255),
+                blank=True,
+                default=list,
+                size=None,
+            ),
         ),
         migrations.AlterField(
-            model_name='connector',
-            name='connector_file',
-            field=models.CharField(choices=[('openlibrary', 'Openlibrary'), ('fedireads_connector', 'Fedireads Connector')], default='openlibrary', max_length=255),
+            model_name="connector",
+            name="connector_file",
+            field=models.CharField(
+                choices=[
+                    ("openlibrary", "Openlibrary"),
+                    ("fedireads_connector", "Fedireads Connector"),
+                ],
+                default="openlibrary",
+                max_length=255,
+            ),
         ),
         migrations.RemoveField(
-            model_name='connector',
-            name='is_self',
+            model_name="connector",
+            name="is_self",
         ),
         migrations.AlterField(
-            model_name='connector',
-            name='connector_file',
-            field=models.CharField(choices=[('openlibrary', 'Openlibrary'), ('self_connector', 'Self Connector'), ('fedireads_connector', 'Fedireads Connector')], default='openlibrary', max_length=255),
+            model_name="connector",
+            name="connector_file",
+            field=models.CharField(
+                choices=[
+                    ("openlibrary", "Openlibrary"),
+                    ("self_connector", "Self Connector"),
+                    ("fedireads_connector", "Fedireads Connector"),
+                ],
+                default="openlibrary",
+                max_length=255,
+            ),
         ),
         migrations.AddField(
-            model_name='book',
-            name='sync_cover',
+            model_name="book",
+            name="sync_cover",
             field=models.BooleanField(default=True),
         ),
         migrations.AlterField(
-            model_name='author',
-            name='born',
+            model_name="author",
+            name="born",
             field=models.DateTimeField(blank=True, null=True),
         ),
         migrations.AlterField(
-            model_name='author',
-            name='died',
+            model_name="author",
+            name="died",
             field=models.DateTimeField(blank=True, null=True),
         ),
         migrations.AddField(
-            model_name='author',
-            name='fedireads_key',
+            model_name="author",
+            name="fedireads_key",
             field=models.CharField(default=uuid.uuid4, max_length=255, unique=True),
         ),
         migrations.AlterField(
-            model_name='author',
-            name='first_name',
+            model_name="author",
+            name="first_name",
             field=models.CharField(blank=True, max_length=255, null=True),
         ),
         migrations.AlterField(
-            model_name='author',
-            name='last_name',
+            model_name="author",
+            name="last_name",
             field=models.CharField(blank=True, max_length=255, null=True),
         ),
         migrations.AlterField(
-            model_name='author',
-            name='openlibrary_key',
+            model_name="author",
+            name="openlibrary_key",
             field=models.CharField(blank=True, max_length=255, null=True),
         ),
         migrations.AlterField(
-            model_name='book',
-            name='first_published_date',
+            model_name="book",
+            name="first_published_date",
             field=models.DateTimeField(blank=True, null=True),
         ),
         migrations.AddField(
-            model_name='book',
-            name='goodreads_key',
+            model_name="book",
+            name="goodreads_key",
             field=models.CharField(blank=True, max_length=255, null=True),
         ),
         migrations.AlterField(
-            model_name='book',
-            name='language',
+            model_name="book",
+            name="language",
             field=models.CharField(blank=True, max_length=255, null=True),
         ),
         migrations.AlterField(
-            model_name='book',
-            name='librarything_key',
+            model_name="book",
+            name="librarything_key",
             field=models.CharField(blank=True, max_length=255, null=True),
         ),
         migrations.AlterField(
-            model_name='book',
-            name='openlibrary_key',
+            model_name="book",
+            name="openlibrary_key",
             field=models.CharField(blank=True, max_length=255, null=True),
         ),
         migrations.AlterField(
-            model_name='book',
-            name='published_date',
+            model_name="book",
+            name="published_date",
             field=models.DateTimeField(blank=True, null=True),
         ),
         migrations.AlterField(
-            model_name='book',
-            name='sort_title',
+            model_name="book",
+            name="sort_title",
             field=models.CharField(blank=True, max_length=255, null=True),
         ),
         migrations.AlterField(
-            model_name='book',
-            name='subtitle',
+            model_name="book",
+            name="subtitle",
             field=models.CharField(blank=True, max_length=255, null=True),
         ),
         migrations.AlterField(
-            model_name='edition',
-            name='isbn',
+            model_name="edition",
+            name="isbn",
             field=models.CharField(blank=True, max_length=255, null=True),
         ),
         migrations.AlterField(
-            model_name='edition',
-            name='oclc_number',
+            model_name="edition",
+            name="oclc_number",
             field=models.CharField(blank=True, max_length=255, null=True),
         ),
         migrations.AlterField(
-            model_name='edition',
-            name='pages',
+            model_name="edition",
+            name="pages",
             field=models.IntegerField(blank=True, null=True),
         ),
         migrations.AddField(
-            model_name='edition',
-            name='physical_format',
+            model_name="edition",
+            name="physical_format",
             field=models.CharField(blank=True, max_length=255, null=True),
         ),
         migrations.AlterField(
-            model_name='work',
-            name='lccn',
+            model_name="work",
+            name="lccn",
             field=models.CharField(blank=True, max_length=255, null=True),
         ),
         migrations.AddField(
-            model_name='federatedserver',
-            name='application_version',
+            model_name="federatedserver",
+            name="application_version",
             field=models.CharField(max_length=255, null=True),
         ),
         migrations.AlterField(
-            model_name='book',
-            name='last_sync_date',
+            model_name="book",
+            name="last_sync_date",
             field=models.DateTimeField(default=django.utils.timezone.now),
         ),
         migrations.AlterField(
-            model_name='status',
-            name='published_date',
+            model_name="status",
+            name="published_date",
             field=models.DateTimeField(default=django.utils.timezone.now),
         ),
         migrations.CreateModel(
-            name='Boost',
+            name="Boost",
             fields=[
-                ('status_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.Status')),
+                (
+                    "status_ptr",
+                    models.OneToOneField(
+                        auto_created=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        parent_link=True,
+                        primary_key=True,
+                        serialize=False,
+                        to="bookwyrm.Status",
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
-            bases=('bookwyrm.status',),
+            bases=("bookwyrm.status",),
         ),
         migrations.RemoveConstraint(
-            model_name='notification',
-            name='notification_type_valid',
+            model_name="notification",
+            name="notification_type_valid",
         ),
         migrations.AlterField(
-            model_name='notification',
-            name='notification_type',
-            field=models.CharField(choices=[('FAVORITE', 'Favorite'), ('REPLY', 'Reply'), ('TAG', 'Tag'), ('FOLLOW', 'Follow'), ('FOLLOW_REQUEST', 'Follow Request'), ('BOOST', 'Boost')], max_length=255),
+            model_name="notification",
+            name="notification_type",
+            field=models.CharField(
+                choices=[
+                    ("FAVORITE", "Favorite"),
+                    ("REPLY", "Reply"),
+                    ("TAG", "Tag"),
+                    ("FOLLOW", "Follow"),
+                    ("FOLLOW_REQUEST", "Follow Request"),
+                    ("BOOST", "Boost"),
+                ],
+                max_length=255,
+            ),
         ),
         migrations.AddConstraint(
-            model_name='notification',
-            constraint=models.CheckConstraint(check=models.Q(notification_type__in=['FAVORITE', 'REPLY', 'TAG', 'FOLLOW', 'FOLLOW_REQUEST', 'BOOST']), name='notification_type_valid'),
+            model_name="notification",
+            constraint=models.CheckConstraint(
+                check=models.Q(
+                    notification_type__in=[
+                        "FAVORITE",
+                        "REPLY",
+                        "TAG",
+                        "FOLLOW",
+                        "FOLLOW_REQUEST",
+                        "BOOST",
+                    ]
+                ),
+                name="notification_type_valid",
+            ),
         ),
         migrations.AddField(
-            model_name='boost',
-            name='boosted_status',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='boosters', to='bookwyrm.Status'),
+            model_name="boost",
+            name="boosted_status",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="boosters",
+                to="bookwyrm.Status",
+            ),
         ),
         migrations.RemoveField(
-            model_name='book',
-            name='language',
+            model_name="book",
+            name="language",
         ),
         migrations.RemoveField(
-            model_name='book',
-            name='parent_work',
+            model_name="book",
+            name="parent_work",
         ),
         migrations.RemoveField(
-            model_name='book',
-            name='shelves',
+            model_name="book",
+            name="shelves",
         ),
         migrations.AddField(
-            model_name='book',
-            name='languages',
-            field=ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None),
+            model_name="book",
+            name="languages",
+            field=ArrayField(
+                base_field=models.CharField(max_length=255),
+                blank=True,
+                default=list,
+                size=None,
+            ),
         ),
         migrations.AddField(
-            model_name='edition',
-            name='default',
+            model_name="edition",
+            name="default",
             field=models.BooleanField(default=False),
         ),
         migrations.AddField(
-            model_name='edition',
-            name='parent_work',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Work'),
+            model_name="edition",
+            name="parent_work",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to="bookwyrm.Work",
+            ),
         ),
         migrations.AddField(
-            model_name='edition',
-            name='shelves',
-            field=models.ManyToManyField(through='bookwyrm.ShelfBook', to='bookwyrm.Shelf'),
+            model_name="edition",
+            name="shelves",
+            field=models.ManyToManyField(
+                through="bookwyrm.ShelfBook", to="bookwyrm.Shelf"
+            ),
         ),
         migrations.AlterField(
-            model_name='comment',
-            name='book',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition'),
+            model_name="comment",
+            name="book",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT, to="bookwyrm.Edition"
+            ),
         ),
         migrations.AlterField(
-            model_name='notification',
-            name='related_book',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition'),
+            model_name="notification",
+            name="related_book",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to="bookwyrm.Edition",
+            ),
         ),
         migrations.AlterField(
-            model_name='review',
-            name='book',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition'),
+            model_name="review",
+            name="book",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT, to="bookwyrm.Edition"
+            ),
         ),
         migrations.AlterField(
-            model_name='shelf',
-            name='books',
-            field=models.ManyToManyField(through='bookwyrm.ShelfBook', to='bookwyrm.Edition'),
+            model_name="shelf",
+            name="books",
+            field=models.ManyToManyField(
+                through="bookwyrm.ShelfBook", to="bookwyrm.Edition"
+            ),
         ),
         migrations.AlterField(
-            model_name='shelfbook',
-            name='book',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition'),
+            model_name="shelfbook",
+            name="book",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT, to="bookwyrm.Edition"
+            ),
         ),
         migrations.AlterField(
-            model_name='status',
-            name='mention_books',
-            field=models.ManyToManyField(related_name='mention_book', to='bookwyrm.Edition'),
+            model_name="status",
+            name="mention_books",
+            field=models.ManyToManyField(
+                related_name="mention_book", to="bookwyrm.Edition"
+            ),
         ),
         migrations.AlterField(
-            model_name='tag',
-            name='book',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition'),
+            model_name="tag",
+            name="book",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT, to="bookwyrm.Edition"
+            ),
         ),
         migrations.RemoveField(
-            model_name='comment',
-            name='name',
+            model_name="comment",
+            name="name",
         ),
         migrations.AlterField(
-            model_name='review',
-            name='rating',
-            field=models.IntegerField(blank=True, default=None, null=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(5)]),
+            model_name="review",
+            name="rating",
+            field=models.IntegerField(
+                blank=True,
+                default=None,
+                null=True,
+                validators=[
+                    django.core.validators.MinValueValidator(1),
+                    django.core.validators.MaxValueValidator(5),
+                ],
+            ),
         ),
         migrations.AlterField(
-            model_name='review',
-            name='name',
+            model_name="review",
+            name="name",
             field=models.CharField(max_length=255, null=True),
         ),
         migrations.CreateModel(
-            name='Quotation',
+            name="Quotation",
             fields=[
-                ('status_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.Status')),
-                ('quote', models.TextField()),
-                ('book', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition')),
+                (
+                    "status_ptr",
+                    models.OneToOneField(
+                        auto_created=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        parent_link=True,
+                        primary_key=True,
+                        serialize=False,
+                        to="bookwyrm.Status",
+                    ),
+                ),
+                ("quote", models.TextField()),
+                (
+                    "book",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to="bookwyrm.Edition",
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
-            bases=('bookwyrm.status',),
+            bases=("bookwyrm.status",),
         ),
         migrations.CreateModel(
-            name='ReadThrough',
+            name="ReadThrough",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('updated_date', models.DateTimeField(auto_now=True)),
-                ('pages_read', models.IntegerField(blank=True, null=True)),
-                ('start_date', models.DateTimeField(blank=True, null=True)),
-                ('finish_date', models.DateTimeField(blank=True, null=True)),
-                ('book', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Book')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                ("updated_date", models.DateTimeField(auto_now=True)),
+                ("pages_read", models.IntegerField(blank=True, null=True)),
+                ("start_date", models.DateTimeField(blank=True, null=True)),
+                ("finish_date", models.DateTimeField(blank=True, null=True)),
+                (
+                    "book",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT, to="bookwyrm.Book"
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
         ),
         migrations.CreateModel(
-            name='ImportItem',
+            name="ImportItem",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('data', JSONField()),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("data", JSONField()),
             ],
         ),
         migrations.CreateModel(
-            name='ImportJob',
+            name="ImportJob",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_date', models.DateTimeField(default=django.utils.timezone.now)),
-                ('task_id', models.CharField(max_length=100, null=True)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "created_date",
+                    models.DateTimeField(default=django.utils.timezone.now),
+                ),
+                ("task_id", models.CharField(max_length=100, null=True)),
             ],
         ),
         migrations.RemoveConstraint(
-            model_name='notification',
-            name='notification_type_valid',
+            model_name="notification",
+            name="notification_type_valid",
         ),
         migrations.AlterField(
-            model_name='notification',
-            name='notification_type',
-            field=models.CharField(choices=[('FAVORITE', 'Favorite'), ('REPLY', 'Reply'), ('TAG', 'Tag'), ('FOLLOW', 'Follow'), ('FOLLOW_REQUEST', 'Follow Request'), ('BOOST', 'Boost'), ('IMPORT_RESULT', 'Import Result')], max_length=255),
+            model_name="notification",
+            name="notification_type",
+            field=models.CharField(
+                choices=[
+                    ("FAVORITE", "Favorite"),
+                    ("REPLY", "Reply"),
+                    ("TAG", "Tag"),
+                    ("FOLLOW", "Follow"),
+                    ("FOLLOW_REQUEST", "Follow Request"),
+                    ("BOOST", "Boost"),
+                    ("IMPORT_RESULT", "Import Result"),
+                ],
+                max_length=255,
+            ),
         ),
         migrations.AddConstraint(
-            model_name='notification',
-            constraint=models.CheckConstraint(check=models.Q(notification_type__in=['FAVORITE', 'REPLY', 'TAG', 'FOLLOW', 'FOLLOW_REQUEST', 'BOOST', 'IMPORT_RESULT']), name='notification_type_valid'),
+            model_name="notification",
+            constraint=models.CheckConstraint(
+                check=models.Q(
+                    notification_type__in=[
+                        "FAVORITE",
+                        "REPLY",
+                        "TAG",
+                        "FOLLOW",
+                        "FOLLOW_REQUEST",
+                        "BOOST",
+                        "IMPORT_RESULT",
+                    ]
+                ),
+                name="notification_type_valid",
+            ),
         ),
         migrations.AddField(
-            model_name='importjob',
-            name='user',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+            model_name="importjob",
+            name="user",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+            ),
         ),
         migrations.AddField(
-            model_name='importitem',
-            name='book',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='bookwyrm.Book'),
+            model_name="importitem",
+            name="book",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to="bookwyrm.Book",
+            ),
         ),
         migrations.AddField(
-            model_name='importitem',
-            name='job',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='items', to='bookwyrm.ImportJob'),
+            model_name="importitem",
+            name="job",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="items",
+                to="bookwyrm.ImportJob",
+            ),
         ),
         migrations.RemoveConstraint(
-            model_name='notification',
-            name='notification_type_valid',
+            model_name="notification",
+            name="notification_type_valid",
         ),
         migrations.AddField(
-            model_name='importitem',
-            name='fail_reason',
+            model_name="importitem",
+            name="fail_reason",
             field=models.TextField(null=True),
         ),
         migrations.AddField(
-            model_name='importitem',
-            name='index',
+            model_name="importitem",
+            name="index",
             field=models.IntegerField(default=1),
             preserve_default=False,
         ),
         migrations.AddField(
-            model_name='notification',
-            name='related_import',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.ImportJob'),
+            model_name="notification",
+            name="related_import",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to="bookwyrm.ImportJob",
+            ),
         ),
         migrations.AlterField(
-            model_name='notification',
-            name='notification_type',
-            field=models.CharField(choices=[('FAVORITE', 'Favorite'), ('REPLY', 'Reply'), ('TAG', 'Tag'), ('FOLLOW', 'Follow'), ('FOLLOW_REQUEST', 'Follow Request'), ('BOOST', 'Boost'), ('IMPORT', 'Import')], max_length=255),
+            model_name="notification",
+            name="notification_type",
+            field=models.CharField(
+                choices=[
+                    ("FAVORITE", "Favorite"),
+                    ("REPLY", "Reply"),
+                    ("TAG", "Tag"),
+                    ("FOLLOW", "Follow"),
+                    ("FOLLOW_REQUEST", "Follow Request"),
+                    ("BOOST", "Boost"),
+                    ("IMPORT", "Import"),
+                ],
+                max_length=255,
+            ),
         ),
         migrations.AddConstraint(
-            model_name='notification',
-            constraint=models.CheckConstraint(check=models.Q(notification_type__in=['FAVORITE', 'REPLY', 'TAG', 'FOLLOW', 'FOLLOW_REQUEST', 'BOOST', 'IMPORT']), name='notification_type_valid'),
+            model_name="notification",
+            constraint=models.CheckConstraint(
+                check=models.Q(
+                    notification_type__in=[
+                        "FAVORITE",
+                        "REPLY",
+                        "TAG",
+                        "FOLLOW",
+                        "FOLLOW_REQUEST",
+                        "BOOST",
+                        "IMPORT",
+                    ]
+                ),
+                name="notification_type_valid",
+            ),
         ),
         migrations.RenameField(
-            model_name='edition',
-            old_name='isbn',
-            new_name='isbn_13',
+            model_name="edition",
+            old_name="isbn",
+            new_name="isbn_13",
         ),
         migrations.AddField(
-            model_name='book',
-            name='author_text',
+            model_name="book",
+            name="author_text",
             field=models.CharField(blank=True, max_length=255, null=True),
         ),
         migrations.AddField(
-            model_name='edition',
-            name='asin',
+            model_name="edition",
+            name="asin",
             field=models.CharField(blank=True, max_length=255, null=True),
         ),
         migrations.AddField(
-            model_name='edition',
-            name='isbn_10',
+            model_name="edition",
+            name="isbn_10",
             field=models.CharField(blank=True, max_length=255, null=True),
         ),
         migrations.AddField(
-            model_name='connector',
-            name='books_url',
-            field=models.CharField(default='https://openlibrary.org', max_length=255),
+            model_name="connector",
+            name="books_url",
+            field=models.CharField(default="https://openlibrary.org", max_length=255),
             preserve_default=False,
         ),
         migrations.AddField(
-            model_name='connector',
-            name='local',
+            model_name="connector",
+            name="local",
             field=models.BooleanField(default=False),
         ),
         migrations.AddField(
-            model_name='connector',
-            name='name',
+            model_name="connector",
+            name="name",
             field=models.CharField(max_length=255, null=True),
         ),
         migrations.AddField(
-            model_name='connector',
-            name='priority',
+            model_name="connector",
+            name="priority",
             field=models.IntegerField(default=2),
         ),
         migrations.AlterField(
-            model_name='connector',
-            name='connector_file',
-            field=models.CharField(choices=[('openlibrary', 'Openlibrary'), ('self_connector', 'Self Connector'), ('fedireads_connector', 'Fedireads Connector')], max_length=255),
+            model_name="connector",
+            name="connector_file",
+            field=models.CharField(
+                choices=[
+                    ("openlibrary", "Openlibrary"),
+                    ("self_connector", "Self Connector"),
+                    ("fedireads_connector", "Fedireads Connector"),
+                ],
+                max_length=255,
+            ),
         ),
         migrations.RemoveField(
-            model_name='author',
-            name='fedireads_key',
+            model_name="author",
+            name="fedireads_key",
         ),
         migrations.RemoveField(
-            model_name='book',
-            name='fedireads_key',
+            model_name="book",
+            name="fedireads_key",
         ),
         migrations.RemoveField(
-            model_name='book',
-            name='source_url',
+            model_name="book",
+            name="source_url",
         ),
         migrations.AddField(
-            model_name='author',
-            name='last_sync_date',
+            model_name="author",
+            name="last_sync_date",
             field=models.DateTimeField(default=django.utils.timezone.now),
         ),
         migrations.AddField(
-            model_name='author',
-            name='sync',
+            model_name="author",
+            name="sync",
             field=models.BooleanField(default=True),
         ),
         migrations.AddField(
-            model_name='book',
-            name='remote_id',
+            model_name="book",
+            name="remote_id",
             field=models.CharField(max_length=255, null=True),
         ),
         migrations.AddField(
-            model_name='author',
-            name='remote_id',
+            model_name="author",
+            name="remote_id",
             field=models.CharField(max_length=255, null=True),
         ),
         migrations.RemoveField(
-            model_name='book',
-            name='misc_identifiers',
+            model_name="book",
+            name="misc_identifiers",
         ),
         migrations.RemoveField(
-            model_name='connector',
-            name='key_name',
+            model_name="connector",
+            name="key_name",
         ),
         migrations.RemoveField(
-            model_name='user',
-            name='actor',
+            model_name="user",
+            name="actor",
         ),
         migrations.AddField(
-            model_name='connector',
-            name='remote_id',
+            model_name="connector",
+            name="remote_id",
             field=models.CharField(max_length=255, null=True),
         ),
         migrations.AddField(
-            model_name='federatedserver',
-            name='remote_id',
+            model_name="federatedserver",
+            name="remote_id",
             field=models.CharField(max_length=255, null=True),
         ),
         migrations.AddField(
-            model_name='notification',
-            name='remote_id',
+            model_name="notification",
+            name="remote_id",
             field=models.CharField(max_length=255, null=True),
         ),
         migrations.AddField(
-            model_name='readthrough',
-            name='remote_id',
+            model_name="readthrough",
+            name="remote_id",
             field=models.CharField(max_length=255, null=True),
         ),
         migrations.AddField(
-            model_name='shelf',
-            name='remote_id',
+            model_name="shelf",
+            name="remote_id",
             field=models.CharField(max_length=255, null=True),
         ),
         migrations.AddField(
-            model_name='shelfbook',
-            name='remote_id',
+            model_name="shelfbook",
+            name="remote_id",
             field=models.CharField(max_length=255, null=True),
         ),
         migrations.AddField(
-            model_name='tag',
-            name='remote_id',
+            model_name="tag",
+            name="remote_id",
             field=models.CharField(max_length=255, null=True),
         ),
         migrations.AddField(
-            model_name='userblocks',
-            name='remote_id',
+            model_name="userblocks",
+            name="remote_id",
             field=models.CharField(max_length=255, null=True),
         ),
         migrations.AddField(
-            model_name='userfollowrequest',
-            name='remote_id',
+            model_name="userfollowrequest",
+            name="remote_id",
             field=models.CharField(max_length=255, null=True),
         ),
         migrations.AddField(
-            model_name='userfollows',
-            name='remote_id',
+            model_name="userfollows",
+            name="remote_id",
             field=models.CharField(max_length=255, null=True),
         ),
         migrations.AlterField(
-            model_name='favorite',
-            name='remote_id',
+            model_name="favorite",
+            name="remote_id",
             field=models.CharField(max_length=255, null=True),
         ),
         migrations.AlterField(
-            model_name='status',
-            name='remote_id',
+            model_name="status",
+            name="remote_id",
             field=models.CharField(max_length=255, null=True),
         ),
         migrations.AddField(
-            model_name='user',
-            name='remote_id',
+            model_name="user",
+            name="remote_id",
             field=models.CharField(max_length=255, null=True, unique=True),
         ),
         migrations.CreateModel(
-            name='SiteInvite',
+            name="SiteInvite",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('code', models.CharField(default=bookwyrm.models.site.new_access_code, max_length=32)),
-                ('expiry', models.DateTimeField(blank=True, null=True)),
-                ('use_limit', models.IntegerField(blank=True, null=True)),
-                ('times_used', models.IntegerField(default=0)),
-                ('user', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "code",
+                    models.CharField(
+                        default=bookwyrm.models.site.new_access_code, max_length=32
+                    ),
+                ),
+                ("expiry", models.DateTimeField(blank=True, null=True)),
+                ("use_limit", models.IntegerField(blank=True, null=True)),
+                ("times_used", models.IntegerField(default=0)),
+                (
+                    "user",
+                    models.ForeignKey(
+                        default=1,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
             ],
         ),
         migrations.RemoveField(
-            model_name='status',
-            name='activity_type',
+            model_name="status",
+            name="activity_type",
         ),
         migrations.RemoveField(
-            model_name='status',
-            name='status_type',
+            model_name="status",
+            name="status_type",
         ),
         migrations.RenameField(
-            model_name='user',
-            old_name='fedireads_user',
-            new_name='bookwyrm_user',
+            model_name="user",
+            old_name="fedireads_user",
+            new_name="bookwyrm_user",
         ),
         migrations.AlterField(
-            model_name='connector',
-            name='connector_file',
-            field=models.CharField(choices=[('openlibrary', 'Openlibrary'), ('self_connector', 'Self Connector'), ('bookwyrm_connector', 'BookWyrm Connector')], max_length=255),
+            model_name="connector",
+            name="connector_file",
+            field=models.CharField(
+                choices=[
+                    ("openlibrary", "Openlibrary"),
+                    ("self_connector", "Self Connector"),
+                    ("bookwyrm_connector", "BookWyrm Connector"),
+                ],
+                max_length=255,
+            ),
         ),
         migrations.AlterField(
-            model_name='connector',
-            name='connector_file',
-            field=models.CharField(choices=[('openlibrary', 'Openlibrary'), ('self_connector', 'Self Connector'), ('bookwyrm_connector', 'Bookwyrm Connector')], max_length=255),
+            model_name="connector",
+            name="connector_file",
+            field=models.CharField(
+                choices=[
+                    ("openlibrary", "Openlibrary"),
+                    ("self_connector", "Self Connector"),
+                    ("bookwyrm_connector", "Bookwyrm Connector"),
+                ],
+                max_length=255,
+            ),
         ),
         migrations.CreateModel(
-            name='GeneratedStatus',
+            name="GeneratedStatus",
             fields=[
-                ('status_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.Status')),
+                (
+                    "status_ptr",
+                    models.OneToOneField(
+                        auto_created=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        parent_link=True,
+                        primary_key=True,
+                        serialize=False,
+                        to="bookwyrm.Status",
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
-            bases=('bookwyrm.status',),
+            bases=("bookwyrm.status",),
         ),
         migrations.CreateModel(
-            name='PasswordReset',
+            name="PasswordReset",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('code', models.CharField(default=bookwyrm.models.site.new_access_code, max_length=32)),
-                ('expiry', models.DateTimeField(default=bookwyrm.models.site.get_passowrd_reset_expiry)),
-                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "code",
+                    models.CharField(
+                        default=bookwyrm.models.site.new_access_code, max_length=32
+                    ),
+                ),
+                (
+                    "expiry",
+                    models.DateTimeField(
+                        default=bookwyrm.models.site.get_passowrd_reset_expiry
+                    ),
+                ),
+                (
+                    "user",
+                    models.OneToOneField(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
             ],
         ),
         migrations.AlterField(
-            model_name='user',
-            name='email',
+            model_name="user",
+            name="email",
             field=models.EmailField(max_length=254, unique=True),
         ),
         migrations.CreateModel(
-            name='SiteSettings',
+            name="SiteSettings",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(default='BookWyrm', max_length=100)),
-                ('instance_description', models.TextField(default='This instance has no description.')),
-                ('code_of_conduct', models.TextField(default='Add a code of conduct here.')),
-                ('allow_registration', models.BooleanField(default=True)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(default="BookWyrm", max_length=100)),
+                (
+                    "instance_description",
+                    models.TextField(default="This instance has no description."),
+                ),
+                (
+                    "code_of_conduct",
+                    models.TextField(default="Add a code of conduct here."),
+                ),
+                ("allow_registration", models.BooleanField(default=True)),
             ],
         ),
         migrations.AlterField(
-            model_name='user',
-            name='email',
-            field=models.EmailField(blank=True, max_length=254, verbose_name='email address'),
+            model_name="user",
+            name="email",
+            field=models.EmailField(
+                blank=True, max_length=254, verbose_name="email address"
+            ),
         ),
         migrations.AddField(
-            model_name='status',
-            name='deleted',
+            model_name="status",
+            name="deleted",
             field=models.BooleanField(default=False),
         ),
         migrations.AddField(
-            model_name='status',
-            name='deleted_date',
+            model_name="status",
+            name="deleted_date",
             field=models.DateTimeField(),
         ),
-        django.contrib.postgres.operations.TrigramExtension(
+        django.contrib.postgres.operations.TrigramExtension(),
+        migrations.RemoveField(
+            model_name="userblocks",
+            name="relationship_id",
         ),
         migrations.RemoveField(
-            model_name='userblocks',
-            name='relationship_id',
+            model_name="userfollowrequest",
+            name="relationship_id",
         ),
         migrations.RemoveField(
-            model_name='userfollowrequest',
-            name='relationship_id',
-        ),
-        migrations.RemoveField(
-            model_name='userfollows',
-            name='relationship_id',
+            model_name="userfollows",
+            name="relationship_id",
         ),
         migrations.AlterField(
-            model_name='status',
-            name='deleted_date',
+            model_name="status",
+            name="deleted_date",
             field=models.DateTimeField(blank=True, null=True),
         ),
         migrations.AlterField(
-            model_name='status',
-            name='privacy',
-            field=models.CharField(choices=[('public', 'Public'), ('unlisted', 'Unlisted'), ('followers', 'Followers'), ('direct', 'Direct')], default='public', max_length=255),
+            model_name="status",
+            name="privacy",
+            field=models.CharField(
+                choices=[
+                    ("public", "Public"),
+                    ("unlisted", "Unlisted"),
+                    ("followers", "Followers"),
+                    ("direct", "Direct"),
+                ],
+                default="public",
+                max_length=255,
+            ),
         ),
         migrations.AddField(
-            model_name='importjob',
-            name='include_reviews',
+            model_name="importjob",
+            name="include_reviews",
             field=models.BooleanField(default=True),
         ),
         migrations.AddField(
-            model_name='importjob',
-            name='privacy',
-            field=models.CharField(choices=[('public', 'Public'), ('unlisted', 'Unlisted'), ('followers', 'Followers'), ('direct', 'Direct')], default='public', max_length=255),
+            model_name="importjob",
+            name="privacy",
+            field=models.CharField(
+                choices=[
+                    ("public", "Public"),
+                    ("unlisted", "Unlisted"),
+                    ("followers", "Followers"),
+                    ("direct", "Direct"),
+                ],
+                default="public",
+                max_length=255,
+            ),
         ),
         migrations.AlterField(
-            model_name='user',
-            name='federated_server',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.FederatedServer'),
+            model_name="user",
+            name="federated_server",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to="bookwyrm.FederatedServer",
+            ),
         ),
         migrations.RenameModel(
-            old_name='GeneratedStatus',
-            new_name='GeneratedNote',
+            old_name="GeneratedStatus",
+            new_name="GeneratedNote",
         ),
         migrations.AlterField(
-            model_name='connector',
-            name='api_key',
+            model_name="connector",
+            name="api_key",
             field=models.CharField(blank=True, max_length=255, null=True),
         ),
         migrations.AlterField(
-            model_name='connector',
-            name='max_query_count',
+            model_name="connector",
+            name="max_query_count",
             field=models.IntegerField(blank=True, null=True),
         ),
         migrations.AlterField(
-            model_name='connector',
-            name='name',
+            model_name="connector",
+            name="name",
             field=models.CharField(blank=True, max_length=255, null=True),
         ),
         migrations.AlterField(
-            model_name='connector',
-            name='politeness_delay',
+            model_name="connector",
+            name="politeness_delay",
             field=models.IntegerField(blank=True, null=True),
         ),
         migrations.AlterField(
-            model_name='connector',
-            name='search_url',
+            model_name="connector",
+            name="search_url",
             field=models.CharField(blank=True, max_length=255, null=True),
         ),
         migrations.AddField(
-            model_name='user',
-            name='last_active_date',
+            model_name="user",
+            name="last_active_date",
             field=models.DateTimeField(auto_now=True),
         ),
         migrations.RemoveConstraint(
-            model_name='notification',
-            name='notification_type_valid',
+            model_name="notification",
+            name="notification_type_valid",
         ),
         migrations.AlterField(
-            model_name='notification',
-            name='notification_type',
-            field=models.CharField(choices=[('FAVORITE', 'Favorite'), ('REPLY', 'Reply'), ('MENTION', 'Mention'), ('TAG', 'Tag'), ('FOLLOW', 'Follow'), ('FOLLOW_REQUEST', 'Follow Request'), ('BOOST', 'Boost'), ('IMPORT', 'Import')], max_length=255),
+            model_name="notification",
+            name="notification_type",
+            field=models.CharField(
+                choices=[
+                    ("FAVORITE", "Favorite"),
+                    ("REPLY", "Reply"),
+                    ("MENTION", "Mention"),
+                    ("TAG", "Tag"),
+                    ("FOLLOW", "Follow"),
+                    ("FOLLOW_REQUEST", "Follow Request"),
+                    ("BOOST", "Boost"),
+                    ("IMPORT", "Import"),
+                ],
+                max_length=255,
+            ),
         ),
         migrations.AddConstraint(
-            model_name='notification',
-            constraint=models.CheckConstraint(check=models.Q(notification_type__in=['FAVORITE', 'REPLY', 'MENTION', 'TAG', 'FOLLOW', 'FOLLOW_REQUEST', 'BOOST', 'IMPORT']), name='notification_type_valid'),
+            model_name="notification",
+            constraint=models.CheckConstraint(
+                check=models.Q(
+                    notification_type__in=[
+                        "FAVORITE",
+                        "REPLY",
+                        "MENTION",
+                        "TAG",
+                        "FOLLOW",
+                        "FOLLOW_REQUEST",
+                        "BOOST",
+                        "IMPORT",
+                    ]
+                ),
+                name="notification_type_valid",
+            ),
         ),
     ]
diff --git a/bookwyrm/migrations/0007_auto_20201103_0014.py b/bookwyrm/migrations/0007_auto_20201103_0014.py
index bf0a12eb..116c97a3 100644
--- a/bookwyrm/migrations/0007_auto_20201103_0014.py
+++ b/bookwyrm/migrations/0007_auto_20201103_0014.py
@@ -8,13 +8,15 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0006_auto_20200221_1702_squashed_0064_merge_20201101_1913'),
+        ("bookwyrm", "0006_auto_20200221_1702_squashed_0064_merge_20201101_1913"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='siteinvite',
-            name='user',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+            model_name="siteinvite",
+            name="user",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+            ),
         ),
     ]
diff --git a/bookwyrm/migrations/0008_work_default_edition.py b/bookwyrm/migrations/0008_work_default_edition.py
index da1f959e..787e3776 100644
--- a/bookwyrm/migrations/0008_work_default_edition.py
+++ b/bookwyrm/migrations/0008_work_default_edition.py
@@ -6,8 +6,8 @@ import django.db.models.deletion
 
 def set_default_edition(app_registry, schema_editor):
     db_alias = schema_editor.connection.alias
-    works = app_registry.get_model('bookwyrm', 'Work').objects.using(db_alias)
-    editions = app_registry.get_model('bookwyrm', 'Edition').objects.using(db_alias)
+    works = app_registry.get_model("bookwyrm", "Work").objects.using(db_alias)
+    editions = app_registry.get_model("bookwyrm", "Edition").objects.using(db_alias)
     for work in works:
         ed = editions.filter(parent_work=work, default=True).first()
         if not ed:
@@ -15,21 +15,26 @@ def set_default_edition(app_registry, schema_editor):
         work.default_edition = ed
         work.save()
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0007_auto_20201103_0014'),
+        ("bookwyrm", "0007_auto_20201103_0014"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='work',
-            name='default_edition',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition'),
+            model_name="work",
+            name="default_edition",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to="bookwyrm.Edition",
+            ),
         ),
         migrations.RunPython(set_default_edition),
         migrations.RemoveField(
-            model_name='edition',
-            name='default',
+            model_name="edition",
+            name="default",
         ),
     ]
diff --git a/bookwyrm/migrations/0009_shelf_privacy.py b/bookwyrm/migrations/0009_shelf_privacy.py
index 8232c2ed..63566104 100644
--- a/bookwyrm/migrations/0009_shelf_privacy.py
+++ b/bookwyrm/migrations/0009_shelf_privacy.py
@@ -6,13 +6,22 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0008_work_default_edition'),
+        ("bookwyrm", "0008_work_default_edition"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='shelf',
-            name='privacy',
-            field=models.CharField(choices=[('public', 'Public'), ('unlisted', 'Unlisted'), ('followers', 'Followers'), ('direct', 'Direct')], default='public', max_length=255),
+            model_name="shelf",
+            name="privacy",
+            field=models.CharField(
+                choices=[
+                    ("public", "Public"),
+                    ("unlisted", "Unlisted"),
+                    ("followers", "Followers"),
+                    ("direct", "Direct"),
+                ],
+                default="public",
+                max_length=255,
+            ),
         ),
     ]
diff --git a/bookwyrm/migrations/0010_importjob_retry.py b/bookwyrm/migrations/0010_importjob_retry.py
index 21296cc4..b3cc371b 100644
--- a/bookwyrm/migrations/0010_importjob_retry.py
+++ b/bookwyrm/migrations/0010_importjob_retry.py
@@ -6,13 +6,13 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0009_shelf_privacy'),
+        ("bookwyrm", "0009_shelf_privacy"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='importjob',
-            name='retry',
+            model_name="importjob",
+            name="retry",
             field=models.BooleanField(default=False),
         ),
     ]
diff --git a/bookwyrm/migrations/0011_auto_20201113_1727.py b/bookwyrm/migrations/0011_auto_20201113_1727.py
index 15e853a3..f4ea55c5 100644
--- a/bookwyrm/migrations/0011_auto_20201113_1727.py
+++ b/bookwyrm/migrations/0011_auto_20201113_1727.py
@@ -2,9 +2,10 @@
 
 from django.db import migrations, models
 
+
 def set_origin_id(app_registry, schema_editor):
     db_alias = schema_editor.connection.alias
-    books = app_registry.get_model('bookwyrm', 'Book').objects.using(db_alias)
+    books = app_registry.get_model("bookwyrm", "Book").objects.using(db_alias)
     for book in books:
         book.origin_id = book.remote_id
         # the remote_id will be set automatically
@@ -15,18 +16,18 @@ def set_origin_id(app_registry, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0010_importjob_retry'),
+        ("bookwyrm", "0010_importjob_retry"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='author',
-            name='origin_id',
+            model_name="author",
+            name="origin_id",
             field=models.CharField(max_length=255, null=True),
         ),
         migrations.AddField(
-            model_name='book',
-            name='origin_id',
+            model_name="book",
+            name="origin_id",
             field=models.CharField(max_length=255, null=True),
         ),
         migrations.RunPython(set_origin_id),
diff --git a/bookwyrm/migrations/0012_attachment.py b/bookwyrm/migrations/0012_attachment.py
index 49553851..5188b463 100644
--- a/bookwyrm/migrations/0012_attachment.py
+++ b/bookwyrm/migrations/0012_attachment.py
@@ -7,23 +7,41 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0011_auto_20201113_1727'),
+        ("bookwyrm", "0011_auto_20201113_1727"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='Attachment',
+            name="Attachment",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('updated_date', models.DateTimeField(auto_now=True)),
-                ('remote_id', models.CharField(max_length=255, null=True)),
-                ('image', models.ImageField(blank=True, null=True, upload_to='status/')),
-                ('caption', models.TextField(blank=True, null=True)),
-                ('status', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='attachments', to='bookwyrm.Status')),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                ("updated_date", models.DateTimeField(auto_now=True)),
+                ("remote_id", models.CharField(max_length=255, null=True)),
+                (
+                    "image",
+                    models.ImageField(blank=True, null=True, upload_to="status/"),
+                ),
+                ("caption", models.TextField(blank=True, null=True)),
+                (
+                    "status",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="attachments",
+                        to="bookwyrm.Status",
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
         ),
     ]
diff --git a/bookwyrm/migrations/0012_progressupdate.py b/bookwyrm/migrations/0012_progressupdate.py
index 13141971..566556b7 100644
--- a/bookwyrm/migrations/0012_progressupdate.py
+++ b/bookwyrm/migrations/0012_progressupdate.py
@@ -8,24 +8,51 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0011_auto_20201113_1727'),
+        ("bookwyrm", "0011_auto_20201113_1727"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='ProgressUpdate',
+            name="ProgressUpdate",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('updated_date', models.DateTimeField(auto_now=True)),
-                ('remote_id', models.CharField(max_length=255, null=True)),
-                ('progress', models.IntegerField()),
-                ('mode', models.CharField(choices=[('PG', 'page'), ('PCT', 'percent')], default='PG', max_length=3)),
-                ('readthrough', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.ReadThrough')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                ("updated_date", models.DateTimeField(auto_now=True)),
+                ("remote_id", models.CharField(max_length=255, null=True)),
+                ("progress", models.IntegerField()),
+                (
+                    "mode",
+                    models.CharField(
+                        choices=[("PG", "page"), ("PCT", "percent")],
+                        default="PG",
+                        max_length=3,
+                    ),
+                ),
+                (
+                    "readthrough",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to="bookwyrm.ReadThrough",
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
         ),
     ]
diff --git a/bookwyrm/migrations/0013_book_origin_id.py b/bookwyrm/migrations/0013_book_origin_id.py
index 581a2406..08cf7bee 100644
--- a/bookwyrm/migrations/0013_book_origin_id.py
+++ b/bookwyrm/migrations/0013_book_origin_id.py
@@ -6,13 +6,13 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0012_attachment'),
+        ("bookwyrm", "0012_attachment"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='book',
-            name='origin_id',
+            model_name="book",
+            name="origin_id",
             field=models.CharField(blank=True, max_length=255, null=True),
         ),
     ]
diff --git a/bookwyrm/migrations/0014_auto_20201128_0118.py b/bookwyrm/migrations/0014_auto_20201128_0118.py
index babdd780..2626b965 100644
--- a/bookwyrm/migrations/0014_auto_20201128_0118.py
+++ b/bookwyrm/migrations/0014_auto_20201128_0118.py
@@ -6,12 +6,12 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0013_book_origin_id'),
+        ("bookwyrm", "0013_book_origin_id"),
     ]
 
     operations = [
         migrations.RenameModel(
-            old_name='Attachment',
-            new_name='Image',
+            old_name="Attachment",
+            new_name="Image",
         ),
     ]
diff --git a/bookwyrm/migrations/0014_merge_20201128_0007.py b/bookwyrm/migrations/0014_merge_20201128_0007.py
index e811fa7f..ce6bb5c0 100644
--- a/bookwyrm/migrations/0014_merge_20201128_0007.py
+++ b/bookwyrm/migrations/0014_merge_20201128_0007.py
@@ -6,9 +6,8 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0013_book_origin_id'),
-        ('bookwyrm', '0012_progressupdate'),
+        ("bookwyrm", "0013_book_origin_id"),
+        ("bookwyrm", "0012_progressupdate"),
     ]
 
-    operations = [
-    ]
+    operations = []
diff --git a/bookwyrm/migrations/0015_auto_20201128_0349.py b/bookwyrm/migrations/0015_auto_20201128_0349.py
index 52b15518..f4454c5d 100644
--- a/bookwyrm/migrations/0015_auto_20201128_0349.py
+++ b/bookwyrm/migrations/0015_auto_20201128_0349.py
@@ -7,13 +7,18 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0014_auto_20201128_0118'),
+        ("bookwyrm", "0014_auto_20201128_0118"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='image',
-            name='status',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='attachments', to='bookwyrm.Status'),
+            model_name="image",
+            name="status",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="attachments",
+                to="bookwyrm.Status",
+            ),
         ),
     ]
diff --git a/bookwyrm/migrations/0015_auto_20201128_0734.py b/bookwyrm/migrations/0015_auto_20201128_0734.py
index c6eb7815..efbad610 100644
--- a/bookwyrm/migrations/0015_auto_20201128_0734.py
+++ b/bookwyrm/migrations/0015_auto_20201128_0734.py
@@ -6,18 +6,20 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0014_merge_20201128_0007'),
+        ("bookwyrm", "0014_merge_20201128_0007"),
     ]
 
     operations = [
         migrations.RenameField(
-            model_name='readthrough',
-            old_name='pages_read',
-            new_name='progress',
+            model_name="readthrough",
+            old_name="pages_read",
+            new_name="progress",
         ),
         migrations.AddField(
-            model_name='readthrough',
-            name='progress_mode',
-            field=models.CharField(choices=[('PG', 'page'), ('PCT', 'percent')], default='PG', max_length=3),
+            model_name="readthrough",
+            name="progress_mode",
+            field=models.CharField(
+                choices=[("PG", "page"), ("PCT", "percent")], default="PG", max_length=3
+            ),
         ),
     ]
diff --git a/bookwyrm/migrations/0016_auto_20201129_0304.py b/bookwyrm/migrations/0016_auto_20201129_0304.py
index 1e715969..ef2cbe0f 100644
--- a/bookwyrm/migrations/0016_auto_20201129_0304.py
+++ b/bookwyrm/migrations/0016_auto_20201129_0304.py
@@ -5,58 +5,101 @@ from django.db import migrations, models
 import django.db.models.deletion
 from django.contrib.postgres.fields import ArrayField
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0015_auto_20201128_0349'),
+        ("bookwyrm", "0015_auto_20201128_0349"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='book',
-            name='subject_places',
-            field=ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, null=True, size=None),
+            model_name="book",
+            name="subject_places",
+            field=ArrayField(
+                base_field=models.CharField(max_length=255),
+                blank=True,
+                default=list,
+                null=True,
+                size=None,
+            ),
         ),
         migrations.AlterField(
-            model_name='book',
-            name='subjects',
-            field=ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, null=True, size=None),
+            model_name="book",
+            name="subjects",
+            field=ArrayField(
+                base_field=models.CharField(max_length=255),
+                blank=True,
+                default=list,
+                null=True,
+                size=None,
+            ),
         ),
         migrations.AlterField(
-            model_name='edition',
-            name='parent_work',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='editions', to='bookwyrm.Work'),
+            model_name="edition",
+            name="parent_work",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="editions",
+                to="bookwyrm.Work",
+            ),
         ),
         migrations.AlterField(
-            model_name='tag',
-            name='name',
+            model_name="tag",
+            name="name",
             field=models.CharField(max_length=100, unique=True),
         ),
         migrations.AlterUniqueTogether(
-            name='tag',
+            name="tag",
             unique_together=set(),
         ),
         migrations.RemoveField(
-            model_name='tag',
-            name='book',
+            model_name="tag",
+            name="book",
         ),
         migrations.RemoveField(
-            model_name='tag',
-            name='user',
+            model_name="tag",
+            name="user",
         ),
         migrations.CreateModel(
-            name='UserTag',
+            name="UserTag",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('updated_date', models.DateTimeField(auto_now=True)),
-                ('remote_id', models.CharField(max_length=255, null=True)),
-                ('book', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition')),
-                ('tag', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Tag')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                ("updated_date", models.DateTimeField(auto_now=True)),
+                ("remote_id", models.CharField(max_length=255, null=True)),
+                (
+                    "book",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to="bookwyrm.Edition",
+                    ),
+                ),
+                (
+                    "tag",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT, to="bookwyrm.Tag"
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
             ],
             options={
-                'unique_together': {('user', 'book', 'tag')},
+                "unique_together": {("user", "book", "tag")},
             },
         ),
     ]
diff --git a/bookwyrm/migrations/0016_auto_20201211_2026.py b/bookwyrm/migrations/0016_auto_20201211_2026.py
index 46b6140c..3793f90b 100644
--- a/bookwyrm/migrations/0016_auto_20201211_2026.py
+++ b/bookwyrm/migrations/0016_auto_20201211_2026.py
@@ -6,23 +6,23 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0015_auto_20201128_0349'),
+        ("bookwyrm", "0015_auto_20201128_0349"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='sitesettings',
-            name='admin_email',
+            model_name="sitesettings",
+            name="admin_email",
             field=models.EmailField(blank=True, max_length=255, null=True),
         ),
         migrations.AddField(
-            model_name='sitesettings',
-            name='support_link',
+            model_name="sitesettings",
+            name="support_link",
             field=models.CharField(blank=True, max_length=255, null=True),
         ),
         migrations.AddField(
-            model_name='sitesettings',
-            name='support_title',
+            model_name="sitesettings",
+            name="support_title",
             field=models.CharField(blank=True, max_length=100, null=True),
         ),
     ]
diff --git a/bookwyrm/migrations/0017_auto_20201130_1819.py b/bookwyrm/migrations/0017_auto_20201130_1819.py
index 0775269b..f6478e0a 100644
--- a/bookwyrm/migrations/0017_auto_20201130_1819.py
+++ b/bookwyrm/migrations/0017_auto_20201130_1819.py
@@ -6,184 +6,296 @@ from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
 
+
 def copy_rsa_keys(app_registry, schema_editor):
     db_alias = schema_editor.connection.alias
-    users = app_registry.get_model('bookwyrm', 'User')
-    keypair = app_registry.get_model('bookwyrm', 'KeyPair')
+    users = app_registry.get_model("bookwyrm", "User")
+    keypair = app_registry.get_model("bookwyrm", "KeyPair")
     for user in users.objects.using(db_alias):
         if user.public_key or user.private_key:
             user.key_pair = keypair.objects.create(
-                remote_id='%s/#main-key' % user.remote_id,
+                remote_id="%s/#main-key" % user.remote_id,
                 private_key=user.private_key,
-                public_key=user.public_key
+                public_key=user.public_key,
             )
             user.save()
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0016_auto_20201129_0304'),
+        ("bookwyrm", "0016_auto_20201129_0304"),
     ]
     operations = [
         migrations.CreateModel(
-            name='KeyPair',
+            name="KeyPair",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('updated_date', models.DateTimeField(auto_now=True)),
-                ('remote_id', bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id])),
-                ('private_key', models.TextField(blank=True, null=True)),
-                ('public_key', bookwyrm.models.fields.TextField(blank=True, null=True)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                ("updated_date", models.DateTimeField(auto_now=True)),
+                (
+                    "remote_id",
+                    bookwyrm.models.fields.RemoteIdField(
+                        max_length=255,
+                        null=True,
+                        validators=[bookwyrm.models.fields.validate_remote_id],
+                    ),
+                ),
+                ("private_key", models.TextField(blank=True, null=True)),
+                ("public_key", bookwyrm.models.fields.TextField(blank=True, null=True)),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
             bases=(bookwyrm.models.activitypub_mixin.ActivitypubMixin, models.Model),
         ),
         migrations.AddField(
-            model_name='user',
-            name='followers',
-            field=bookwyrm.models.fields.ManyToManyField(related_name='following', through='bookwyrm.UserFollows', to=settings.AUTH_USER_MODEL),
+            model_name="user",
+            name="followers",
+            field=bookwyrm.models.fields.ManyToManyField(
+                related_name="following",
+                through="bookwyrm.UserFollows",
+                to=settings.AUTH_USER_MODEL,
+            ),
         ),
         migrations.AlterField(
-            model_name='author',
-            name='remote_id',
-            field=bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id]),
+            model_name="author",
+            name="remote_id",
+            field=bookwyrm.models.fields.RemoteIdField(
+                max_length=255,
+                null=True,
+                validators=[bookwyrm.models.fields.validate_remote_id],
+            ),
         ),
         migrations.AlterField(
-            model_name='book',
-            name='remote_id',
-            field=bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id]),
+            model_name="book",
+            name="remote_id",
+            field=bookwyrm.models.fields.RemoteIdField(
+                max_length=255,
+                null=True,
+                validators=[bookwyrm.models.fields.validate_remote_id],
+            ),
         ),
         migrations.AlterField(
-            model_name='connector',
-            name='remote_id',
-            field=bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id]),
+            model_name="connector",
+            name="remote_id",
+            field=bookwyrm.models.fields.RemoteIdField(
+                max_length=255,
+                null=True,
+                validators=[bookwyrm.models.fields.validate_remote_id],
+            ),
         ),
         migrations.AlterField(
-            model_name='favorite',
-            name='remote_id',
-            field=bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id]),
+            model_name="favorite",
+            name="remote_id",
+            field=bookwyrm.models.fields.RemoteIdField(
+                max_length=255,
+                null=True,
+                validators=[bookwyrm.models.fields.validate_remote_id],
+            ),
         ),
         migrations.AlterField(
-            model_name='federatedserver',
-            name='remote_id',
-            field=bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id]),
+            model_name="federatedserver",
+            name="remote_id",
+            field=bookwyrm.models.fields.RemoteIdField(
+                max_length=255,
+                null=True,
+                validators=[bookwyrm.models.fields.validate_remote_id],
+            ),
         ),
         migrations.AlterField(
-            model_name='image',
-            name='remote_id',
-            field=bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id]),
+            model_name="image",
+            name="remote_id",
+            field=bookwyrm.models.fields.RemoteIdField(
+                max_length=255,
+                null=True,
+                validators=[bookwyrm.models.fields.validate_remote_id],
+            ),
         ),
         migrations.AlterField(
-            model_name='notification',
-            name='remote_id',
-            field=bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id]),
+            model_name="notification",
+            name="remote_id",
+            field=bookwyrm.models.fields.RemoteIdField(
+                max_length=255,
+                null=True,
+                validators=[bookwyrm.models.fields.validate_remote_id],
+            ),
         ),
         migrations.AlterField(
-            model_name='readthrough',
-            name='remote_id',
-            field=bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id]),
+            model_name="readthrough",
+            name="remote_id",
+            field=bookwyrm.models.fields.RemoteIdField(
+                max_length=255,
+                null=True,
+                validators=[bookwyrm.models.fields.validate_remote_id],
+            ),
         ),
         migrations.AlterField(
-            model_name='shelf',
-            name='remote_id',
-            field=bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id]),
+            model_name="shelf",
+            name="remote_id",
+            field=bookwyrm.models.fields.RemoteIdField(
+                max_length=255,
+                null=True,
+                validators=[bookwyrm.models.fields.validate_remote_id],
+            ),
         ),
         migrations.AlterField(
-            model_name='shelfbook',
-            name='remote_id',
-            field=bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id]),
+            model_name="shelfbook",
+            name="remote_id",
+            field=bookwyrm.models.fields.RemoteIdField(
+                max_length=255,
+                null=True,
+                validators=[bookwyrm.models.fields.validate_remote_id],
+            ),
         ),
         migrations.AlterField(
-            model_name='status',
-            name='remote_id',
-            field=bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id]),
+            model_name="status",
+            name="remote_id",
+            field=bookwyrm.models.fields.RemoteIdField(
+                max_length=255,
+                null=True,
+                validators=[bookwyrm.models.fields.validate_remote_id],
+            ),
         ),
         migrations.AlterField(
-            model_name='tag',
-            name='remote_id',
-            field=bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id]),
+            model_name="tag",
+            name="remote_id",
+            field=bookwyrm.models.fields.RemoteIdField(
+                max_length=255,
+                null=True,
+                validators=[bookwyrm.models.fields.validate_remote_id],
+            ),
         ),
         migrations.AlterField(
-            model_name='user',
-            name='avatar',
-            field=bookwyrm.models.fields.ImageField(blank=True, null=True, upload_to='avatars/'),
+            model_name="user",
+            name="avatar",
+            field=bookwyrm.models.fields.ImageField(
+                blank=True, null=True, upload_to="avatars/"
+            ),
         ),
         migrations.AlterField(
-            model_name='user',
-            name='bookwyrm_user',
+            model_name="user",
+            name="bookwyrm_user",
             field=bookwyrm.models.fields.BooleanField(default=True),
         ),
         migrations.AlterField(
-            model_name='user',
-            name='inbox',
-            field=bookwyrm.models.fields.RemoteIdField(max_length=255, unique=True, validators=[bookwyrm.models.fields.validate_remote_id]),
+            model_name="user",
+            name="inbox",
+            field=bookwyrm.models.fields.RemoteIdField(
+                max_length=255,
+                unique=True,
+                validators=[bookwyrm.models.fields.validate_remote_id],
+            ),
         ),
         migrations.AlterField(
-            model_name='user',
-            name='local',
+            model_name="user",
+            name="local",
             field=models.BooleanField(default=False),
         ),
         migrations.AlterField(
-            model_name='user',
-            name='manually_approves_followers',
+            model_name="user",
+            name="manually_approves_followers",
             field=bookwyrm.models.fields.BooleanField(default=False),
         ),
         migrations.AlterField(
-            model_name='user',
-            name='name',
-            field=bookwyrm.models.fields.CharField(blank=True, max_length=100, null=True),
+            model_name="user",
+            name="name",
+            field=bookwyrm.models.fields.CharField(
+                blank=True, max_length=100, null=True
+            ),
         ),
         migrations.AlterField(
-            model_name='user',
-            name='outbox',
-            field=bookwyrm.models.fields.RemoteIdField(max_length=255, unique=True, validators=[bookwyrm.models.fields.validate_remote_id]),
+            model_name="user",
+            name="outbox",
+            field=bookwyrm.models.fields.RemoteIdField(
+                max_length=255,
+                unique=True,
+                validators=[bookwyrm.models.fields.validate_remote_id],
+            ),
         ),
         migrations.AlterField(
-            model_name='user',
-            name='remote_id',
-            field=bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, unique=True, validators=[bookwyrm.models.fields.validate_remote_id]),
+            model_name="user",
+            name="remote_id",
+            field=bookwyrm.models.fields.RemoteIdField(
+                max_length=255,
+                null=True,
+                unique=True,
+                validators=[bookwyrm.models.fields.validate_remote_id],
+            ),
         ),
         migrations.AlterField(
-            model_name='user',
-            name='shared_inbox',
-            field=bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id]),
+            model_name="user",
+            name="shared_inbox",
+            field=bookwyrm.models.fields.RemoteIdField(
+                max_length=255,
+                null=True,
+                validators=[bookwyrm.models.fields.validate_remote_id],
+            ),
         ),
         migrations.AlterField(
-            model_name='user',
-            name='summary',
+            model_name="user",
+            name="summary",
             field=bookwyrm.models.fields.TextField(blank=True, null=True),
         ),
         migrations.AlterField(
-            model_name='user',
-            name='username',
+            model_name="user",
+            name="username",
             field=bookwyrm.models.fields.UsernameField(),
         ),
         migrations.AlterField(
-            model_name='userblocks',
-            name='remote_id',
-            field=bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id]),
+            model_name="userblocks",
+            name="remote_id",
+            field=bookwyrm.models.fields.RemoteIdField(
+                max_length=255,
+                null=True,
+                validators=[bookwyrm.models.fields.validate_remote_id],
+            ),
         ),
         migrations.AlterField(
-            model_name='userfollowrequest',
-            name='remote_id',
-            field=bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id]),
+            model_name="userfollowrequest",
+            name="remote_id",
+            field=bookwyrm.models.fields.RemoteIdField(
+                max_length=255,
+                null=True,
+                validators=[bookwyrm.models.fields.validate_remote_id],
+            ),
         ),
         migrations.AlterField(
-            model_name='userfollows',
-            name='remote_id',
-            field=bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id]),
+            model_name="userfollows",
+            name="remote_id",
+            field=bookwyrm.models.fields.RemoteIdField(
+                max_length=255,
+                null=True,
+                validators=[bookwyrm.models.fields.validate_remote_id],
+            ),
         ),
         migrations.AlterField(
-            model_name='usertag',
-            name='remote_id',
-            field=bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id]),
+            model_name="usertag",
+            name="remote_id",
+            field=bookwyrm.models.fields.RemoteIdField(
+                max_length=255,
+                null=True,
+                validators=[bookwyrm.models.fields.validate_remote_id],
+            ),
         ),
         migrations.AddField(
-            model_name='user',
-            name='key_pair',
-            field=bookwyrm.models.fields.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='owner', to='bookwyrm.KeyPair'),
+            model_name="user",
+            name="key_pair",
+            field=bookwyrm.models.fields.OneToOneField(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="owner",
+                to="bookwyrm.KeyPair",
+            ),
         ),
         migrations.RunPython(copy_rsa_keys),
     ]
diff --git a/bookwyrm/migrations/0017_auto_20201212_0059.py b/bookwyrm/migrations/0017_auto_20201212_0059.py
index c9e3fcf4..34d27a1f 100644
--- a/bookwyrm/migrations/0017_auto_20201212_0059.py
+++ b/bookwyrm/migrations/0017_auto_20201212_0059.py
@@ -7,13 +7,15 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0016_auto_20201211_2026'),
+        ("bookwyrm", "0016_auto_20201211_2026"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='readthrough',
-            name='book',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition'),
+            model_name="readthrough",
+            name="book",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT, to="bookwyrm.Edition"
+            ),
         ),
     ]
diff --git a/bookwyrm/migrations/0018_auto_20201130_1832.py b/bookwyrm/migrations/0018_auto_20201130_1832.py
index 278446cf..579b09f2 100644
--- a/bookwyrm/migrations/0018_auto_20201130_1832.py
+++ b/bookwyrm/migrations/0018_auto_20201130_1832.py
@@ -6,20 +6,20 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0017_auto_20201130_1819'),
+        ("bookwyrm", "0017_auto_20201130_1819"),
     ]
 
     operations = [
         migrations.RemoveField(
-            model_name='user',
-            name='following',
+            model_name="user",
+            name="following",
         ),
         migrations.RemoveField(
-            model_name='user',
-            name='private_key',
+            model_name="user",
+            name="private_key",
         ),
         migrations.RemoveField(
-            model_name='user',
-            name='public_key',
+            model_name="user",
+            name="public_key",
         ),
     ]
diff --git a/bookwyrm/migrations/0019_auto_20201130_1939.py b/bookwyrm/migrations/0019_auto_20201130_1939.py
index 11cf6a3b..e5e7674a 100644
--- a/bookwyrm/migrations/0019_auto_20201130_1939.py
+++ b/bookwyrm/migrations/0019_auto_20201130_1939.py
@@ -3,34 +3,36 @@
 import bookwyrm.models.fields
 from django.db import migrations
 
+
 def update_notnull(app_registry, schema_editor):
     db_alias = schema_editor.connection.alias
-    users = app_registry.get_model('bookwyrm', 'User')
+    users = app_registry.get_model("bookwyrm", "User")
     for user in users.objects.using(db_alias):
         if user.name and user.summary:
             continue
         if not user.summary:
-            user.summary = ''
+            user.summary = ""
         if not user.name:
-            user.name = ''
+            user.name = ""
         user.save()
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0018_auto_20201130_1832'),
+        ("bookwyrm", "0018_auto_20201130_1832"),
     ]
 
     operations = [
         migrations.RunPython(update_notnull),
         migrations.AlterField(
-            model_name='user',
-            name='name',
-            field=bookwyrm.models.fields.CharField(default='', max_length=100),
+            model_name="user",
+            name="name",
+            field=bookwyrm.models.fields.CharField(default="", max_length=100),
         ),
         migrations.AlterField(
-            model_name='user',
-            name='summary',
-            field=bookwyrm.models.fields.TextField(default=''),
+            model_name="user",
+            name="summary",
+            field=bookwyrm.models.fields.TextField(default=""),
         ),
     ]
diff --git a/bookwyrm/migrations/0020_auto_20201208_0213.py b/bookwyrm/migrations/0020_auto_20201208_0213.py
index 9c5345c7..79d9e73d 100644
--- a/bookwyrm/migrations/0020_auto_20201208_0213.py
+++ b/bookwyrm/migrations/0020_auto_20201208_0213.py
@@ -11,343 +11,497 @@ import django.utils.timezone
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0019_auto_20201130_1939'),
+        ("bookwyrm", "0019_auto_20201130_1939"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='author',
-            name='aliases',
-            field=bookwyrm.models.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None),
+            model_name="author",
+            name="aliases",
+            field=bookwyrm.models.fields.ArrayField(
+                base_field=models.CharField(max_length=255),
+                blank=True,
+                default=list,
+                size=None,
+            ),
         ),
         migrations.AlterField(
-            model_name='author',
-            name='bio',
+            model_name="author",
+            name="bio",
             field=bookwyrm.models.fields.TextField(blank=True, null=True),
         ),
         migrations.AlterField(
-            model_name='author',
-            name='born',
+            model_name="author",
+            name="born",
             field=bookwyrm.models.fields.DateTimeField(blank=True, null=True),
         ),
         migrations.AlterField(
-            model_name='author',
-            name='died',
+            model_name="author",
+            name="died",
             field=bookwyrm.models.fields.DateTimeField(blank=True, null=True),
         ),
         migrations.AlterField(
-            model_name='author',
-            name='name',
+            model_name="author",
+            name="name",
             field=bookwyrm.models.fields.CharField(max_length=255),
         ),
         migrations.AlterField(
-            model_name='author',
-            name='openlibrary_key',
-            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+            model_name="author",
+            name="openlibrary_key",
+            field=bookwyrm.models.fields.CharField(
+                blank=True, max_length=255, null=True
+            ),
         ),
         migrations.AlterField(
-            model_name='author',
-            name='wikipedia_link',
-            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+            model_name="author",
+            name="wikipedia_link",
+            field=bookwyrm.models.fields.CharField(
+                blank=True, max_length=255, null=True
+            ),
         ),
         migrations.AlterField(
-            model_name='book',
-            name='authors',
-            field=bookwyrm.models.fields.ManyToManyField(to='bookwyrm.Author'),
+            model_name="book",
+            name="authors",
+            field=bookwyrm.models.fields.ManyToManyField(to="bookwyrm.Author"),
         ),
         migrations.AlterField(
-            model_name='book',
-            name='cover',
-            field=bookwyrm.models.fields.ImageField(blank=True, null=True, upload_to='covers/'),
+            model_name="book",
+            name="cover",
+            field=bookwyrm.models.fields.ImageField(
+                blank=True, null=True, upload_to="covers/"
+            ),
         ),
         migrations.AlterField(
-            model_name='book',
-            name='description',
+            model_name="book",
+            name="description",
             field=bookwyrm.models.fields.TextField(blank=True, null=True),
         ),
         migrations.AlterField(
-            model_name='book',
-            name='first_published_date',
+            model_name="book",
+            name="first_published_date",
             field=bookwyrm.models.fields.DateTimeField(blank=True, null=True),
         ),
         migrations.AlterField(
-            model_name='book',
-            name='goodreads_key',
-            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+            model_name="book",
+            name="goodreads_key",
+            field=bookwyrm.models.fields.CharField(
+                blank=True, max_length=255, null=True
+            ),
         ),
         migrations.AlterField(
-            model_name='book',
-            name='languages',
-            field=bookwyrm.models.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None),
+            model_name="book",
+            name="languages",
+            field=bookwyrm.models.fields.ArrayField(
+                base_field=models.CharField(max_length=255),
+                blank=True,
+                default=list,
+                size=None,
+            ),
         ),
         migrations.AlterField(
-            model_name='book',
-            name='librarything_key',
-            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+            model_name="book",
+            name="librarything_key",
+            field=bookwyrm.models.fields.CharField(
+                blank=True, max_length=255, null=True
+            ),
         ),
         migrations.AlterField(
-            model_name='book',
-            name='openlibrary_key',
-            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+            model_name="book",
+            name="openlibrary_key",
+            field=bookwyrm.models.fields.CharField(
+                blank=True, max_length=255, null=True
+            ),
         ),
         migrations.AlterField(
-            model_name='book',
-            name='published_date',
+            model_name="book",
+            name="published_date",
             field=bookwyrm.models.fields.DateTimeField(blank=True, null=True),
         ),
         migrations.AlterField(
-            model_name='book',
-            name='series',
-            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+            model_name="book",
+            name="series",
+            field=bookwyrm.models.fields.CharField(
+                blank=True, max_length=255, null=True
+            ),
         ),
         migrations.AlterField(
-            model_name='book',
-            name='series_number',
-            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+            model_name="book",
+            name="series_number",
+            field=bookwyrm.models.fields.CharField(
+                blank=True, max_length=255, null=True
+            ),
         ),
         migrations.AlterField(
-            model_name='book',
-            name='sort_title',
-            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+            model_name="book",
+            name="sort_title",
+            field=bookwyrm.models.fields.CharField(
+                blank=True, max_length=255, null=True
+            ),
         ),
         migrations.AlterField(
-            model_name='book',
-            name='subject_places',
-            field=bookwyrm.models.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, null=True, size=None),
+            model_name="book",
+            name="subject_places",
+            field=bookwyrm.models.fields.ArrayField(
+                base_field=models.CharField(max_length=255),
+                blank=True,
+                default=list,
+                null=True,
+                size=None,
+            ),
         ),
         migrations.AlterField(
-            model_name='book',
-            name='subjects',
-            field=bookwyrm.models.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, null=True, size=None),
+            model_name="book",
+            name="subjects",
+            field=bookwyrm.models.fields.ArrayField(
+                base_field=models.CharField(max_length=255),
+                blank=True,
+                default=list,
+                null=True,
+                size=None,
+            ),
         ),
         migrations.AlterField(
-            model_name='book',
-            name='subtitle',
-            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+            model_name="book",
+            name="subtitle",
+            field=bookwyrm.models.fields.CharField(
+                blank=True, max_length=255, null=True
+            ),
         ),
         migrations.AlterField(
-            model_name='book',
-            name='title',
+            model_name="book",
+            name="title",
             field=bookwyrm.models.fields.CharField(max_length=255),
         ),
         migrations.AlterField(
-            model_name='boost',
-            name='boosted_status',
-            field=bookwyrm.models.fields.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='boosters', to='bookwyrm.Status'),
+            model_name="boost",
+            name="boosted_status",
+            field=bookwyrm.models.fields.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="boosters",
+                to="bookwyrm.Status",
+            ),
         ),
         migrations.AlterField(
-            model_name='comment',
-            name='book',
-            field=bookwyrm.models.fields.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition'),
+            model_name="comment",
+            name="book",
+            field=bookwyrm.models.fields.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT, to="bookwyrm.Edition"
+            ),
         ),
         migrations.AlterField(
-            model_name='edition',
-            name='asin',
-            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+            model_name="edition",
+            name="asin",
+            field=bookwyrm.models.fields.CharField(
+                blank=True, max_length=255, null=True
+            ),
         ),
         migrations.AlterField(
-            model_name='edition',
-            name='isbn_10',
-            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+            model_name="edition",
+            name="isbn_10",
+            field=bookwyrm.models.fields.CharField(
+                blank=True, max_length=255, null=True
+            ),
         ),
         migrations.AlterField(
-            model_name='edition',
-            name='isbn_13',
-            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+            model_name="edition",
+            name="isbn_13",
+            field=bookwyrm.models.fields.CharField(
+                blank=True, max_length=255, null=True
+            ),
         ),
         migrations.AlterField(
-            model_name='edition',
-            name='oclc_number',
-            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+            model_name="edition",
+            name="oclc_number",
+            field=bookwyrm.models.fields.CharField(
+                blank=True, max_length=255, null=True
+            ),
         ),
         migrations.AlterField(
-            model_name='edition',
-            name='pages',
+            model_name="edition",
+            name="pages",
             field=bookwyrm.models.fields.IntegerField(blank=True, null=True),
         ),
         migrations.AlterField(
-            model_name='edition',
-            name='parent_work',
-            field=bookwyrm.models.fields.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, related_name='editions', to='bookwyrm.Work'),
+            model_name="edition",
+            name="parent_work",
+            field=bookwyrm.models.fields.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="editions",
+                to="bookwyrm.Work",
+            ),
         ),
         migrations.AlterField(
-            model_name='edition',
-            name='physical_format',
-            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+            model_name="edition",
+            name="physical_format",
+            field=bookwyrm.models.fields.CharField(
+                blank=True, max_length=255, null=True
+            ),
         ),
         migrations.AlterField(
-            model_name='edition',
-            name='publishers',
-            field=bookwyrm.models.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None),
+            model_name="edition",
+            name="publishers",
+            field=bookwyrm.models.fields.ArrayField(
+                base_field=models.CharField(max_length=255),
+                blank=True,
+                default=list,
+                size=None,
+            ),
         ),
         migrations.AlterField(
-            model_name='favorite',
-            name='status',
-            field=bookwyrm.models.fields.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Status'),
+            model_name="favorite",
+            name="status",
+            field=bookwyrm.models.fields.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT, to="bookwyrm.Status"
+            ),
         ),
         migrations.AlterField(
-            model_name='favorite',
-            name='user',
-            field=bookwyrm.models.fields.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL),
+            model_name="favorite",
+            name="user",
+            field=bookwyrm.models.fields.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL
+            ),
         ),
         migrations.AlterField(
-            model_name='image',
-            name='caption',
+            model_name="image",
+            name="caption",
             field=bookwyrm.models.fields.TextField(blank=True, null=True),
         ),
         migrations.AlterField(
-            model_name='image',
-            name='image',
-            field=bookwyrm.models.fields.ImageField(blank=True, null=True, upload_to='status/'),
+            model_name="image",
+            name="image",
+            field=bookwyrm.models.fields.ImageField(
+                blank=True, null=True, upload_to="status/"
+            ),
         ),
         migrations.AlterField(
-            model_name='quotation',
-            name='book',
-            field=bookwyrm.models.fields.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition'),
+            model_name="quotation",
+            name="book",
+            field=bookwyrm.models.fields.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT, to="bookwyrm.Edition"
+            ),
         ),
         migrations.AlterField(
-            model_name='quotation',
-            name='quote',
+            model_name="quotation",
+            name="quote",
             field=bookwyrm.models.fields.TextField(),
         ),
         migrations.AlterField(
-            model_name='review',
-            name='book',
-            field=bookwyrm.models.fields.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition'),
+            model_name="review",
+            name="book",
+            field=bookwyrm.models.fields.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT, to="bookwyrm.Edition"
+            ),
         ),
         migrations.AlterField(
-            model_name='review',
-            name='name',
+            model_name="review",
+            name="name",
             field=bookwyrm.models.fields.CharField(max_length=255, null=True),
         ),
         migrations.AlterField(
-            model_name='review',
-            name='rating',
-            field=bookwyrm.models.fields.IntegerField(blank=True, default=None, null=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(5)]),
+            model_name="review",
+            name="rating",
+            field=bookwyrm.models.fields.IntegerField(
+                blank=True,
+                default=None,
+                null=True,
+                validators=[
+                    django.core.validators.MinValueValidator(1),
+                    django.core.validators.MaxValueValidator(5),
+                ],
+            ),
         ),
         migrations.AlterField(
-            model_name='shelf',
-            name='name',
+            model_name="shelf",
+            name="name",
             field=bookwyrm.models.fields.CharField(max_length=100),
         ),
         migrations.AlterField(
-            model_name='shelf',
-            name='privacy',
-            field=bookwyrm.models.fields.CharField(choices=[('public', 'Public'), ('unlisted', 'Unlisted'), ('followers', 'Followers'), ('direct', 'Direct')], default='public', max_length=255),
+            model_name="shelf",
+            name="privacy",
+            field=bookwyrm.models.fields.CharField(
+                choices=[
+                    ("public", "Public"),
+                    ("unlisted", "Unlisted"),
+                    ("followers", "Followers"),
+                    ("direct", "Direct"),
+                ],
+                default="public",
+                max_length=255,
+            ),
         ),
         migrations.AlterField(
-            model_name='shelf',
-            name='user',
-            field=bookwyrm.models.fields.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL),
+            model_name="shelf",
+            name="user",
+            field=bookwyrm.models.fields.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL
+            ),
         ),
         migrations.AlterField(
-            model_name='shelfbook',
-            name='added_by',
-            field=bookwyrm.models.fields.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL),
+            model_name="shelfbook",
+            name="added_by",
+            field=bookwyrm.models.fields.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to=settings.AUTH_USER_MODEL,
+            ),
         ),
         migrations.AlterField(
-            model_name='shelfbook',
-            name='book',
-            field=bookwyrm.models.fields.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition'),
+            model_name="shelfbook",
+            name="book",
+            field=bookwyrm.models.fields.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT, to="bookwyrm.Edition"
+            ),
         ),
         migrations.AlterField(
-            model_name='shelfbook',
-            name='shelf',
-            field=bookwyrm.models.fields.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Shelf'),
+            model_name="shelfbook",
+            name="shelf",
+            field=bookwyrm.models.fields.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT, to="bookwyrm.Shelf"
+            ),
         ),
         migrations.AlterField(
-            model_name='status',
-            name='content',
+            model_name="status",
+            name="content",
             field=bookwyrm.models.fields.TextField(blank=True, null=True),
         ),
         migrations.AlterField(
-            model_name='status',
-            name='mention_books',
-            field=bookwyrm.models.fields.TagField(related_name='mention_book', to='bookwyrm.Edition'),
+            model_name="status",
+            name="mention_books",
+            field=bookwyrm.models.fields.TagField(
+                related_name="mention_book", to="bookwyrm.Edition"
+            ),
         ),
         migrations.AlterField(
-            model_name='status',
-            name='mention_users',
-            field=bookwyrm.models.fields.TagField(related_name='mention_user', to=settings.AUTH_USER_MODEL),
+            model_name="status",
+            name="mention_users",
+            field=bookwyrm.models.fields.TagField(
+                related_name="mention_user", to=settings.AUTH_USER_MODEL
+            ),
         ),
         migrations.AlterField(
-            model_name='status',
-            name='published_date',
-            field=bookwyrm.models.fields.DateTimeField(default=django.utils.timezone.now),
+            model_name="status",
+            name="published_date",
+            field=bookwyrm.models.fields.DateTimeField(
+                default=django.utils.timezone.now
+            ),
         ),
         migrations.AlterField(
-            model_name='status',
-            name='reply_parent',
-            field=bookwyrm.models.fields.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Status'),
+            model_name="status",
+            name="reply_parent",
+            field=bookwyrm.models.fields.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to="bookwyrm.Status",
+            ),
         ),
         migrations.AlterField(
-            model_name='status',
-            name='sensitive',
+            model_name="status",
+            name="sensitive",
             field=bookwyrm.models.fields.BooleanField(default=False),
         ),
         migrations.AlterField(
-            model_name='status',
-            name='user',
-            field=bookwyrm.models.fields.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL),
+            model_name="status",
+            name="user",
+            field=bookwyrm.models.fields.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL
+            ),
         ),
         migrations.AlterField(
-            model_name='tag',
-            name='name',
+            model_name="tag",
+            name="name",
             field=bookwyrm.models.fields.CharField(max_length=100, unique=True),
         ),
         migrations.AlterField(
-            model_name='userblocks',
-            name='user_object',
-            field=bookwyrm.models.fields.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='userblocks_user_object', to=settings.AUTH_USER_MODEL),
+            model_name="userblocks",
+            name="user_object",
+            field=bookwyrm.models.fields.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="userblocks_user_object",
+                to=settings.AUTH_USER_MODEL,
+            ),
         ),
         migrations.AlterField(
-            model_name='userblocks',
-            name='user_subject',
-            field=bookwyrm.models.fields.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='userblocks_user_subject', to=settings.AUTH_USER_MODEL),
+            model_name="userblocks",
+            name="user_subject",
+            field=bookwyrm.models.fields.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="userblocks_user_subject",
+                to=settings.AUTH_USER_MODEL,
+            ),
         ),
         migrations.AlterField(
-            model_name='userfollowrequest',
-            name='user_object',
-            field=bookwyrm.models.fields.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='userfollowrequest_user_object', to=settings.AUTH_USER_MODEL),
+            model_name="userfollowrequest",
+            name="user_object",
+            field=bookwyrm.models.fields.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="userfollowrequest_user_object",
+                to=settings.AUTH_USER_MODEL,
+            ),
         ),
         migrations.AlterField(
-            model_name='userfollowrequest',
-            name='user_subject',
-            field=bookwyrm.models.fields.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='userfollowrequest_user_subject', to=settings.AUTH_USER_MODEL),
+            model_name="userfollowrequest",
+            name="user_subject",
+            field=bookwyrm.models.fields.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="userfollowrequest_user_subject",
+                to=settings.AUTH_USER_MODEL,
+            ),
         ),
         migrations.AlterField(
-            model_name='userfollows',
-            name='user_object',
-            field=bookwyrm.models.fields.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='userfollows_user_object', to=settings.AUTH_USER_MODEL),
+            model_name="userfollows",
+            name="user_object",
+            field=bookwyrm.models.fields.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="userfollows_user_object",
+                to=settings.AUTH_USER_MODEL,
+            ),
         ),
         migrations.AlterField(
-            model_name='userfollows',
-            name='user_subject',
-            field=bookwyrm.models.fields.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='userfollows_user_subject', to=settings.AUTH_USER_MODEL),
+            model_name="userfollows",
+            name="user_subject",
+            field=bookwyrm.models.fields.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="userfollows_user_subject",
+                to=settings.AUTH_USER_MODEL,
+            ),
         ),
         migrations.AlterField(
-            model_name='usertag',
-            name='book',
-            field=bookwyrm.models.fields.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition'),
+            model_name="usertag",
+            name="book",
+            field=bookwyrm.models.fields.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT, to="bookwyrm.Edition"
+            ),
         ),
         migrations.AlterField(
-            model_name='usertag',
-            name='tag',
-            field=bookwyrm.models.fields.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Tag'),
+            model_name="usertag",
+            name="tag",
+            field=bookwyrm.models.fields.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT, to="bookwyrm.Tag"
+            ),
         ),
         migrations.AlterField(
-            model_name='usertag',
-            name='user',
-            field=bookwyrm.models.fields.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL),
+            model_name="usertag",
+            name="user",
+            field=bookwyrm.models.fields.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL
+            ),
         ),
         migrations.AlterField(
-            model_name='work',
-            name='default_edition',
-            field=bookwyrm.models.fields.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition'),
+            model_name="work",
+            name="default_edition",
+            field=bookwyrm.models.fields.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to="bookwyrm.Edition",
+            ),
         ),
         migrations.AlterField(
-            model_name='work',
-            name='lccn',
-            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+            model_name="work",
+            name="lccn",
+            field=bookwyrm.models.fields.CharField(
+                blank=True, max_length=255, null=True
+            ),
         ),
     ]
diff --git a/bookwyrm/migrations/0021_merge_20201212_1737.py b/bookwyrm/migrations/0021_merge_20201212_1737.py
index 4ccf8c8c..c6b48820 100644
--- a/bookwyrm/migrations/0021_merge_20201212_1737.py
+++ b/bookwyrm/migrations/0021_merge_20201212_1737.py
@@ -6,9 +6,8 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0020_auto_20201208_0213'),
-        ('bookwyrm', '0016_auto_20201211_2026'),
+        ("bookwyrm", "0020_auto_20201208_0213"),
+        ("bookwyrm", "0016_auto_20201211_2026"),
     ]
 
-    operations = [
-    ]
+    operations = []
diff --git a/bookwyrm/migrations/0022_auto_20201212_1744.py b/bookwyrm/migrations/0022_auto_20201212_1744.py
index 0a98597f..2651578c 100644
--- a/bookwyrm/migrations/0022_auto_20201212_1744.py
+++ b/bookwyrm/migrations/0022_auto_20201212_1744.py
@@ -5,26 +5,27 @@ from django.db import migrations
 
 def set_author_name(app_registry, schema_editor):
     db_alias = schema_editor.connection.alias
-    authors = app_registry.get_model('bookwyrm', 'Author')
+    authors = app_registry.get_model("bookwyrm", "Author")
     for author in authors.objects.using(db_alias):
         if not author.name:
-            author.name = '%s %s' % (author.first_name, author.last_name)
+            author.name = "%s %s" % (author.first_name, author.last_name)
             author.save()
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0021_merge_20201212_1737'),
+        ("bookwyrm", "0021_merge_20201212_1737"),
     ]
 
     operations = [
         migrations.RunPython(set_author_name),
         migrations.RemoveField(
-            model_name='author',
-            name='first_name',
+            model_name="author",
+            name="first_name",
         ),
         migrations.RemoveField(
-            model_name='author',
-            name='last_name',
+            model_name="author",
+            name="last_name",
         ),
     ]
diff --git a/bookwyrm/migrations/0023_auto_20201214_0511.py b/bookwyrm/migrations/0023_auto_20201214_0511.py
index e811bded..4b4a0c4a 100644
--- a/bookwyrm/migrations/0023_auto_20201214_0511.py
+++ b/bookwyrm/migrations/0023_auto_20201214_0511.py
@@ -7,13 +7,22 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0022_auto_20201212_1744'),
+        ("bookwyrm", "0022_auto_20201212_1744"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='status',
-            name='privacy',
-            field=bookwyrm.models.fields.PrivacyField(choices=[('public', 'Public'), ('unlisted', 'Unlisted'), ('followers', 'Followers'), ('direct', 'Direct')], default='public', max_length=255),
+            model_name="status",
+            name="privacy",
+            field=bookwyrm.models.fields.PrivacyField(
+                choices=[
+                    ("public", "Public"),
+                    ("unlisted", "Unlisted"),
+                    ("followers", "Followers"),
+                    ("direct", "Direct"),
+                ],
+                default="public",
+                max_length=255,
+            ),
         ),
     ]
diff --git a/bookwyrm/migrations/0023_merge_20201216_0112.py b/bookwyrm/migrations/0023_merge_20201216_0112.py
index e3af4849..be88546e 100644
--- a/bookwyrm/migrations/0023_merge_20201216_0112.py
+++ b/bookwyrm/migrations/0023_merge_20201216_0112.py
@@ -6,9 +6,8 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0017_auto_20201212_0059'),
-        ('bookwyrm', '0022_auto_20201212_1744'),
+        ("bookwyrm", "0017_auto_20201212_0059"),
+        ("bookwyrm", "0022_auto_20201212_1744"),
     ]
 
-    operations = [
-    ]
+    operations = []
diff --git a/bookwyrm/migrations/0024_merge_20201216_1721.py b/bookwyrm/migrations/0024_merge_20201216_1721.py
index 41f81335..bb944d4e 100644
--- a/bookwyrm/migrations/0024_merge_20201216_1721.py
+++ b/bookwyrm/migrations/0024_merge_20201216_1721.py
@@ -6,9 +6,8 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0023_auto_20201214_0511'),
-        ('bookwyrm', '0023_merge_20201216_0112'),
+        ("bookwyrm", "0023_auto_20201214_0511"),
+        ("bookwyrm", "0023_merge_20201216_0112"),
     ]
 
-    operations = [
-    ]
+    operations = []
diff --git a/bookwyrm/migrations/0025_auto_20201217_0046.py b/bookwyrm/migrations/0025_auto_20201217_0046.py
index a3ffe8c1..82e1f503 100644
--- a/bookwyrm/migrations/0025_auto_20201217_0046.py
+++ b/bookwyrm/migrations/0025_auto_20201217_0046.py
@@ -7,33 +7,33 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0024_merge_20201216_1721'),
+        ("bookwyrm", "0024_merge_20201216_1721"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='author',
-            name='bio',
+            model_name="author",
+            name="bio",
             field=bookwyrm.models.fields.HtmlField(blank=True, null=True),
         ),
         migrations.AlterField(
-            model_name='book',
-            name='description',
+            model_name="book",
+            name="description",
             field=bookwyrm.models.fields.HtmlField(blank=True, null=True),
         ),
         migrations.AlterField(
-            model_name='quotation',
-            name='quote',
+            model_name="quotation",
+            name="quote",
             field=bookwyrm.models.fields.HtmlField(),
         ),
         migrations.AlterField(
-            model_name='status',
-            name='content',
+            model_name="status",
+            name="content",
             field=bookwyrm.models.fields.HtmlField(blank=True, null=True),
         ),
         migrations.AlterField(
-            model_name='user',
-            name='summary',
-            field=bookwyrm.models.fields.HtmlField(default=''),
+            model_name="user",
+            name="summary",
+            field=bookwyrm.models.fields.HtmlField(default=""),
         ),
     ]
diff --git a/bookwyrm/migrations/0026_status_content_warning.py b/bookwyrm/migrations/0026_status_content_warning.py
index f4e494db..5212e83a 100644
--- a/bookwyrm/migrations/0026_status_content_warning.py
+++ b/bookwyrm/migrations/0026_status_content_warning.py
@@ -7,13 +7,15 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0025_auto_20201217_0046'),
+        ("bookwyrm", "0025_auto_20201217_0046"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='status',
-            name='content_warning',
-            field=bookwyrm.models.fields.CharField(blank=True, max_length=500, null=True),
+            model_name="status",
+            name="content_warning",
+            field=bookwyrm.models.fields.CharField(
+                blank=True, max_length=500, null=True
+            ),
         ),
     ]
diff --git a/bookwyrm/migrations/0027_auto_20201220_2007.py b/bookwyrm/migrations/0027_auto_20201220_2007.py
index a3ad4dda..5eec5139 100644
--- a/bookwyrm/migrations/0027_auto_20201220_2007.py
+++ b/bookwyrm/migrations/0027_auto_20201220_2007.py
@@ -7,18 +7,20 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0026_status_content_warning'),
+        ("bookwyrm", "0026_status_content_warning"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='user',
-            name='name',
-            field=bookwyrm.models.fields.CharField(blank=True, max_length=100, null=True),
+            model_name="user",
+            name="name",
+            field=bookwyrm.models.fields.CharField(
+                blank=True, max_length=100, null=True
+            ),
         ),
         migrations.AlterField(
-            model_name='user',
-            name='summary',
+            model_name="user",
+            name="summary",
             field=bookwyrm.models.fields.HtmlField(blank=True, null=True),
         ),
     ]
diff --git a/bookwyrm/migrations/0028_remove_book_author_text.py b/bookwyrm/migrations/0028_remove_book_author_text.py
index 8743c910..1f91d1c1 100644
--- a/bookwyrm/migrations/0028_remove_book_author_text.py
+++ b/bookwyrm/migrations/0028_remove_book_author_text.py
@@ -6,12 +6,12 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0027_auto_20201220_2007'),
+        ("bookwyrm", "0027_auto_20201220_2007"),
     ]
 
     operations = [
         migrations.RemoveField(
-            model_name='book',
-            name='author_text',
+            model_name="book",
+            name="author_text",
         ),
     ]
diff --git a/bookwyrm/migrations/0029_auto_20201221_2014.py b/bookwyrm/migrations/0029_auto_20201221_2014.py
index ebf27a74..7a6b7180 100644
--- a/bookwyrm/migrations/0029_auto_20201221_2014.py
+++ b/bookwyrm/migrations/0029_auto_20201221_2014.py
@@ -9,53 +9,65 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0028_remove_book_author_text'),
+        ("bookwyrm", "0028_remove_book_author_text"),
     ]
 
     operations = [
         migrations.RemoveField(
-            model_name='author',
-            name='last_sync_date',
+            model_name="author",
+            name="last_sync_date",
         ),
         migrations.RemoveField(
-            model_name='author',
-            name='sync',
+            model_name="author",
+            name="sync",
         ),
         migrations.RemoveField(
-            model_name='book',
-            name='last_sync_date',
+            model_name="book",
+            name="last_sync_date",
         ),
         migrations.RemoveField(
-            model_name='book',
-            name='sync',
+            model_name="book",
+            name="sync",
         ),
         migrations.RemoveField(
-            model_name='book',
-            name='sync_cover',
+            model_name="book",
+            name="sync_cover",
         ),
         migrations.AddField(
-            model_name='author',
-            name='goodreads_key',
-            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+            model_name="author",
+            name="goodreads_key",
+            field=bookwyrm.models.fields.CharField(
+                blank=True, max_length=255, null=True
+            ),
         ),
         migrations.AddField(
-            model_name='author',
-            name='last_edited_by',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL),
+            model_name="author",
+            name="last_edited_by",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to=settings.AUTH_USER_MODEL,
+            ),
         ),
         migrations.AddField(
-            model_name='author',
-            name='librarything_key',
-            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+            model_name="author",
+            name="librarything_key",
+            field=bookwyrm.models.fields.CharField(
+                blank=True, max_length=255, null=True
+            ),
         ),
         migrations.AddField(
-            model_name='book',
-            name='last_edited_by',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL),
+            model_name="book",
+            name="last_edited_by",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to=settings.AUTH_USER_MODEL,
+            ),
         ),
         migrations.AlterField(
-            model_name='author',
-            name='origin_id',
+            model_name="author",
+            name="origin_id",
             field=models.CharField(blank=True, max_length=255, null=True),
         ),
     ]
diff --git a/bookwyrm/migrations/0030_auto_20201224_1939.py b/bookwyrm/migrations/0030_auto_20201224_1939.py
index 6de5d37f..beee20c4 100644
--- a/bookwyrm/migrations/0030_auto_20201224_1939.py
+++ b/bookwyrm/migrations/0030_auto_20201224_1939.py
@@ -7,13 +7,18 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0029_auto_20201221_2014'),
+        ("bookwyrm", "0029_auto_20201221_2014"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='user',
-            name='localname',
-            field=models.CharField(max_length=255, null=True, unique=True, validators=[bookwyrm.models.fields.validate_localname]),
+            model_name="user",
+            name="localname",
+            field=models.CharField(
+                max_length=255,
+                null=True,
+                unique=True,
+                validators=[bookwyrm.models.fields.validate_localname],
+            ),
         ),
     ]
diff --git a/bookwyrm/migrations/0031_auto_20210104_2040.py b/bookwyrm/migrations/0031_auto_20210104_2040.py
index 604392d4..c6418fc9 100644
--- a/bookwyrm/migrations/0031_auto_20210104_2040.py
+++ b/bookwyrm/migrations/0031_auto_20210104_2040.py
@@ -6,23 +6,23 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0030_auto_20201224_1939'),
+        ("bookwyrm", "0030_auto_20201224_1939"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='sitesettings',
-            name='favicon',
-            field=models.ImageField(blank=True, null=True, upload_to='logos/'),
+            model_name="sitesettings",
+            name="favicon",
+            field=models.ImageField(blank=True, null=True, upload_to="logos/"),
         ),
         migrations.AddField(
-            model_name='sitesettings',
-            name='logo',
-            field=models.ImageField(blank=True, null=True, upload_to='logos/'),
+            model_name="sitesettings",
+            name="logo",
+            field=models.ImageField(blank=True, null=True, upload_to="logos/"),
         ),
         migrations.AddField(
-            model_name='sitesettings',
-            name='logo_small',
-            field=models.ImageField(blank=True, null=True, upload_to='logos/'),
+            model_name="sitesettings",
+            name="logo_small",
+            field=models.ImageField(blank=True, null=True, upload_to="logos/"),
         ),
     ]
diff --git a/bookwyrm/migrations/0032_auto_20210104_2055.py b/bookwyrm/migrations/0032_auto_20210104_2055.py
index 692cd581..8b8012da 100644
--- a/bookwyrm/migrations/0032_auto_20210104_2055.py
+++ b/bookwyrm/migrations/0032_auto_20210104_2055.py
@@ -6,18 +6,20 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0031_auto_20210104_2040'),
+        ("bookwyrm", "0031_auto_20210104_2040"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='sitesettings',
-            name='instance_tagline',
-            field=models.CharField(default='Social Reading and Reviewing', max_length=150),
+            model_name="sitesettings",
+            name="instance_tagline",
+            field=models.CharField(
+                default="Social Reading and Reviewing", max_length=150
+            ),
         ),
         migrations.AddField(
-            model_name='sitesettings',
-            name='registration_closed_text',
-            field=models.TextField(default='Contact an administrator to get an invite'),
+            model_name="sitesettings",
+            name="registration_closed_text",
+            field=models.TextField(default="Contact an administrator to get an invite"),
         ),
     ]
diff --git a/bookwyrm/migrations/0033_siteinvite_created_date.py b/bookwyrm/migrations/0033_siteinvite_created_date.py
index 9a3f9896..36d489eb 100644
--- a/bookwyrm/migrations/0033_siteinvite_created_date.py
+++ b/bookwyrm/migrations/0033_siteinvite_created_date.py
@@ -7,14 +7,16 @@ import django.utils.timezone
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0032_auto_20210104_2055'),
+        ("bookwyrm", "0032_auto_20210104_2055"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='siteinvite',
-            name='created_date',
-            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            model_name="siteinvite",
+            name="created_date",
+            field=models.DateTimeField(
+                auto_now_add=True, default=django.utils.timezone.now
+            ),
             preserve_default=False,
         ),
     ]
diff --git a/bookwyrm/migrations/0034_importjob_complete.py b/bookwyrm/migrations/0034_importjob_complete.py
index 14170607..6593df9f 100644
--- a/bookwyrm/migrations/0034_importjob_complete.py
+++ b/bookwyrm/migrations/0034_importjob_complete.py
@@ -6,13 +6,13 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0033_siteinvite_created_date'),
+        ("bookwyrm", "0033_siteinvite_created_date"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='importjob',
-            name='complete',
+            model_name="importjob",
+            name="complete",
             field=models.BooleanField(default=False),
         ),
     ]
diff --git a/bookwyrm/migrations/0035_edition_edition_rank.py b/bookwyrm/migrations/0035_edition_edition_rank.py
index 1a75a097..7465c31b 100644
--- a/bookwyrm/migrations/0035_edition_edition_rank.py
+++ b/bookwyrm/migrations/0035_edition_edition_rank.py
@@ -6,20 +6,21 @@ from django.db import migrations
 
 def set_rank(app_registry, schema_editor):
     db_alias = schema_editor.connection.alias
-    books = app_registry.get_model('bookwyrm', 'Edition')
+    books = app_registry.get_model("bookwyrm", "Edition")
     for book in books.objects.using(db_alias):
         book.save()
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0034_importjob_complete'),
+        ("bookwyrm", "0034_importjob_complete"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='edition',
-            name='edition_rank',
+            model_name="edition",
+            name="edition_rank",
             field=bookwyrm.models.fields.IntegerField(default=0),
         ),
         migrations.RunPython(set_rank),
diff --git a/bookwyrm/migrations/0036_annualgoal.py b/bookwyrm/migrations/0036_annualgoal.py
index fb12833e..fd08fb24 100644
--- a/bookwyrm/migrations/0036_annualgoal.py
+++ b/bookwyrm/migrations/0036_annualgoal.py
@@ -9,24 +9,57 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0035_edition_edition_rank'),
+        ("bookwyrm", "0035_edition_edition_rank"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='AnnualGoal',
+            name="AnnualGoal",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('updated_date', models.DateTimeField(auto_now=True)),
-                ('remote_id', bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id])),
-                ('goal', models.IntegerField()),
-                ('year', models.IntegerField(default=2021)),
-                ('privacy', models.CharField(choices=[('public', 'Public'), ('unlisted', 'Unlisted'), ('followers', 'Followers'), ('direct', 'Direct')], default='public', max_length=255)),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                ("updated_date", models.DateTimeField(auto_now=True)),
+                (
+                    "remote_id",
+                    bookwyrm.models.fields.RemoteIdField(
+                        max_length=255,
+                        null=True,
+                        validators=[bookwyrm.models.fields.validate_remote_id],
+                    ),
+                ),
+                ("goal", models.IntegerField()),
+                ("year", models.IntegerField(default=2021)),
+                (
+                    "privacy",
+                    models.CharField(
+                        choices=[
+                            ("public", "Public"),
+                            ("unlisted", "Unlisted"),
+                            ("followers", "Followers"),
+                            ("direct", "Direct"),
+                        ],
+                        default="public",
+                        max_length=255,
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
             ],
             options={
-                'unique_together': {('user', 'year')},
+                "unique_together": {("user", "year")},
             },
         ),
     ]
diff --git a/bookwyrm/migrations/0037_auto_20210118_1954.py b/bookwyrm/migrations/0037_auto_20210118_1954.py
index 97ba8808..a0c27d45 100644
--- a/bookwyrm/migrations/0037_auto_20210118_1954.py
+++ b/bookwyrm/migrations/0037_auto_20210118_1954.py
@@ -2,36 +2,39 @@
 
 from django.db import migrations, models
 
+
 def empty_to_null(apps, schema_editor):
     User = apps.get_model("bookwyrm", "User")
     db_alias = schema_editor.connection.alias
     User.objects.using(db_alias).filter(email="").update(email=None)
 
+
 def null_to_empty(apps, schema_editor):
     User = apps.get_model("bookwyrm", "User")
     db_alias = schema_editor.connection.alias
     User.objects.using(db_alias).filter(email=None).update(email="")
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0036_annualgoal'),
+        ("bookwyrm", "0036_annualgoal"),
     ]
 
     operations = [
         migrations.AlterModelOptions(
-            name='shelfbook',
-            options={'ordering': ('-created_date',)},
+            name="shelfbook",
+            options={"ordering": ("-created_date",)},
         ),
         migrations.AlterField(
-            model_name='user',
-            name='email',
+            model_name="user",
+            name="email",
             field=models.EmailField(max_length=254, null=True),
         ),
         migrations.RunPython(empty_to_null, null_to_empty),
         migrations.AlterField(
-            model_name='user',
-            name='email',
+            model_name="user",
+            name="email",
             field=models.EmailField(max_length=254, null=True, unique=True),
         ),
     ]
diff --git a/bookwyrm/migrations/0038_auto_20210119_1534.py b/bookwyrm/migrations/0038_auto_20210119_1534.py
index ac7a0d68..14fd1ff2 100644
--- a/bookwyrm/migrations/0038_auto_20210119_1534.py
+++ b/bookwyrm/migrations/0038_auto_20210119_1534.py
@@ -7,13 +7,15 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0037_auto_20210118_1954'),
+        ("bookwyrm", "0037_auto_20210118_1954"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='annualgoal',
-            name='goal',
-            field=models.IntegerField(validators=[django.core.validators.MinValueValidator(1)]),
+            model_name="annualgoal",
+            name="goal",
+            field=models.IntegerField(
+                validators=[django.core.validators.MinValueValidator(1)]
+            ),
         ),
     ]
diff --git a/bookwyrm/migrations/0039_merge_20210120_0753.py b/bookwyrm/migrations/0039_merge_20210120_0753.py
index 1af40ee9..e698d8ea 100644
--- a/bookwyrm/migrations/0039_merge_20210120_0753.py
+++ b/bookwyrm/migrations/0039_merge_20210120_0753.py
@@ -6,9 +6,8 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0038_auto_20210119_1534'),
-        ('bookwyrm', '0015_auto_20201128_0734'),
+        ("bookwyrm", "0038_auto_20210119_1534"),
+        ("bookwyrm", "0015_auto_20201128_0734"),
     ]
 
-    operations = [
-    ]
+    operations = []
diff --git a/bookwyrm/migrations/0040_auto_20210122_0057.py b/bookwyrm/migrations/0040_auto_20210122_0057.py
index 8e528a89..0641f527 100644
--- a/bookwyrm/migrations/0040_auto_20210122_0057.py
+++ b/bookwyrm/migrations/0040_auto_20210122_0057.py
@@ -9,28 +9,40 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0039_merge_20210120_0753'),
+        ("bookwyrm", "0039_merge_20210120_0753"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='progressupdate',
-            name='progress',
-            field=models.IntegerField(validators=[django.core.validators.MinValueValidator(0)]),
+            model_name="progressupdate",
+            name="progress",
+            field=models.IntegerField(
+                validators=[django.core.validators.MinValueValidator(0)]
+            ),
         ),
         migrations.AlterField(
-            model_name='progressupdate',
-            name='readthrough',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='bookwyrm.ReadThrough'),
+            model_name="progressupdate",
+            name="readthrough",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE, to="bookwyrm.ReadThrough"
+            ),
         ),
         migrations.AlterField(
-            model_name='progressupdate',
-            name='remote_id',
-            field=bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id]),
+            model_name="progressupdate",
+            name="remote_id",
+            field=bookwyrm.models.fields.RemoteIdField(
+                max_length=255,
+                null=True,
+                validators=[bookwyrm.models.fields.validate_remote_id],
+            ),
         ),
         migrations.AlterField(
-            model_name='readthrough',
-            name='progress',
-            field=models.IntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(0)]),
+            model_name="readthrough",
+            name="progress",
+            field=models.IntegerField(
+                blank=True,
+                null=True,
+                validators=[django.core.validators.MinValueValidator(0)],
+            ),
         ),
     ]
diff --git a/bookwyrm/migrations/0041_auto_20210131_1614.py b/bookwyrm/migrations/0041_auto_20210131_1614.py
index 6fcf406b..01085dea 100644
--- a/bookwyrm/migrations/0041_auto_20210131_1614.py
+++ b/bookwyrm/migrations/0041_auto_20210131_1614.py
@@ -10,56 +10,141 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0040_auto_20210122_0057'),
+        ("bookwyrm", "0040_auto_20210122_0057"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='List',
+            name="List",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('updated_date', models.DateTimeField(auto_now=True)),
-                ('remote_id', bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id])),
-                ('name', bookwyrm.models.fields.CharField(max_length=100)),
-                ('description', bookwyrm.models.fields.TextField(blank=True, null=True)),
-                ('privacy', bookwyrm.models.fields.CharField(choices=[('public', 'Public'), ('unlisted', 'Unlisted'), ('followers', 'Followers'), ('direct', 'Direct')], default='public', max_length=255)),
-                ('curation', bookwyrm.models.fields.CharField(choices=[('closed', 'Closed'), ('open', 'Open'), ('curated', 'Curated')], default='closed', max_length=255)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                ("updated_date", models.DateTimeField(auto_now=True)),
+                (
+                    "remote_id",
+                    bookwyrm.models.fields.RemoteIdField(
+                        max_length=255,
+                        null=True,
+                        validators=[bookwyrm.models.fields.validate_remote_id],
+                    ),
+                ),
+                ("name", bookwyrm.models.fields.CharField(max_length=100)),
+                (
+                    "description",
+                    bookwyrm.models.fields.TextField(blank=True, null=True),
+                ),
+                (
+                    "privacy",
+                    bookwyrm.models.fields.CharField(
+                        choices=[
+                            ("public", "Public"),
+                            ("unlisted", "Unlisted"),
+                            ("followers", "Followers"),
+                            ("direct", "Direct"),
+                        ],
+                        default="public",
+                        max_length=255,
+                    ),
+                ),
+                (
+                    "curation",
+                    bookwyrm.models.fields.CharField(
+                        choices=[
+                            ("closed", "Closed"),
+                            ("open", "Open"),
+                            ("curated", "Curated"),
+                        ],
+                        default="closed",
+                        max_length=255,
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
-            bases=(bookwyrm.models.activitypub_mixin.OrderedCollectionMixin, models.Model),
+            bases=(
+                bookwyrm.models.activitypub_mixin.OrderedCollectionMixin,
+                models.Model,
+            ),
         ),
         migrations.CreateModel(
-            name='ListItem',
+            name="ListItem",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('updated_date', models.DateTimeField(auto_now=True)),
-                ('remote_id', bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id])),
-                ('notes', bookwyrm.models.fields.TextField(blank=True, null=True)),
-                ('approved', models.BooleanField(default=True)),
-                ('order', bookwyrm.models.fields.IntegerField(blank=True, null=True)),
-                ('added_by', bookwyrm.models.fields.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
-                ('book', bookwyrm.models.fields.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition')),
-                ('book_list', bookwyrm.models.fields.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='bookwyrm.List')),
-                ('endorsement', models.ManyToManyField(related_name='endorsers', to=settings.AUTH_USER_MODEL)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                ("updated_date", models.DateTimeField(auto_now=True)),
+                (
+                    "remote_id",
+                    bookwyrm.models.fields.RemoteIdField(
+                        max_length=255,
+                        null=True,
+                        validators=[bookwyrm.models.fields.validate_remote_id],
+                    ),
+                ),
+                ("notes", bookwyrm.models.fields.TextField(blank=True, null=True)),
+                ("approved", models.BooleanField(default=True)),
+                ("order", bookwyrm.models.fields.IntegerField(blank=True, null=True)),
+                (
+                    "added_by",
+                    bookwyrm.models.fields.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "book",
+                    bookwyrm.models.fields.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to="bookwyrm.Edition",
+                    ),
+                ),
+                (
+                    "book_list",
+                    bookwyrm.models.fields.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to="bookwyrm.List"
+                    ),
+                ),
+                (
+                    "endorsement",
+                    models.ManyToManyField(
+                        related_name="endorsers", to=settings.AUTH_USER_MODEL
+                    ),
+                ),
             ],
             options={
-                'ordering': ('-created_date',),
-                'unique_together': {('book', 'book_list')},
+                "ordering": ("-created_date",),
+                "unique_together": {("book", "book_list")},
             },
             bases=(bookwyrm.models.activitypub_mixin.ActivitypubMixin, models.Model),
         ),
         migrations.AddField(
-            model_name='list',
-            name='books',
-            field=models.ManyToManyField(through='bookwyrm.ListItem', to='bookwyrm.Edition'),
+            model_name="list",
+            name="books",
+            field=models.ManyToManyField(
+                through="bookwyrm.ListItem", to="bookwyrm.Edition"
+            ),
         ),
         migrations.AddField(
-            model_name='list',
-            name='user',
-            field=bookwyrm.models.fields.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL),
+            model_name="list",
+            name="user",
+            field=bookwyrm.models.fields.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL
+            ),
         ),
     ]
diff --git a/bookwyrm/migrations/0042_auto_20210201_2108.py b/bookwyrm/migrations/0042_auto_20210201_2108.py
index 95a144de..ee7201c1 100644
--- a/bookwyrm/migrations/0042_auto_20210201_2108.py
+++ b/bookwyrm/migrations/0042_auto_20210201_2108.py
@@ -7,22 +7,40 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0041_auto_20210131_1614'),
+        ("bookwyrm", "0041_auto_20210131_1614"),
     ]
 
     operations = [
         migrations.AlterModelOptions(
-            name='list',
-            options={'ordering': ('-updated_date',)},
+            name="list",
+            options={"ordering": ("-updated_date",)},
         ),
         migrations.AlterField(
-            model_name='list',
-            name='privacy',
-            field=bookwyrm.models.fields.PrivacyField(choices=[('public', 'Public'), ('unlisted', 'Unlisted'), ('followers', 'Followers'), ('direct', 'Direct')], default='public', max_length=255),
+            model_name="list",
+            name="privacy",
+            field=bookwyrm.models.fields.PrivacyField(
+                choices=[
+                    ("public", "Public"),
+                    ("unlisted", "Unlisted"),
+                    ("followers", "Followers"),
+                    ("direct", "Direct"),
+                ],
+                default="public",
+                max_length=255,
+            ),
         ),
         migrations.AlterField(
-            model_name='shelf',
-            name='privacy',
-            field=bookwyrm.models.fields.PrivacyField(choices=[('public', 'Public'), ('unlisted', 'Unlisted'), ('followers', 'Followers'), ('direct', 'Direct')], default='public', max_length=255),
+            model_name="shelf",
+            name="privacy",
+            field=bookwyrm.models.fields.PrivacyField(
+                choices=[
+                    ("public", "Public"),
+                    ("unlisted", "Unlisted"),
+                    ("followers", "Followers"),
+                    ("direct", "Direct"),
+                ],
+                default="public",
+                max_length=255,
+            ),
         ),
     ]
diff --git a/bookwyrm/migrations/0043_auto_20210204_2223.py b/bookwyrm/migrations/0043_auto_20210204_2223.py
index b9c328ea..2e8318c5 100644
--- a/bookwyrm/migrations/0043_auto_20210204_2223.py
+++ b/bookwyrm/migrations/0043_auto_20210204_2223.py
@@ -6,18 +6,18 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0042_auto_20210201_2108'),
+        ("bookwyrm", "0042_auto_20210201_2108"),
     ]
 
     operations = [
         migrations.RenameField(
-            model_name='listitem',
-            old_name='added_by',
-            new_name='user',
+            model_name="listitem",
+            old_name="added_by",
+            new_name="user",
         ),
         migrations.RenameField(
-            model_name='shelfbook',
-            old_name='added_by',
-            new_name='user',
+            model_name="shelfbook",
+            old_name="added_by",
+            new_name="user",
         ),
     ]
diff --git a/bookwyrm/migrations/0044_auto_20210207_1924.py b/bookwyrm/migrations/0044_auto_20210207_1924.py
index 7289c73d..897e8e02 100644
--- a/bookwyrm/migrations/0044_auto_20210207_1924.py
+++ b/bookwyrm/migrations/0044_auto_20210207_1924.py
@@ -5,9 +5,10 @@ from django.conf import settings
 from django.db import migrations
 import django.db.models.deletion
 
+
 def set_user(app_registry, schema_editor):
     db_alias = schema_editor.connection.alias
-    shelfbook = app_registry.get_model('bookwyrm', 'ShelfBook')
+    shelfbook = app_registry.get_model("bookwyrm", "ShelfBook")
     for item in shelfbook.objects.using(db_alias).filter(user__isnull=True):
         item.user = item.shelf.user
         try:
@@ -19,15 +20,19 @@ def set_user(app_registry, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0043_auto_20210204_2223'),
+        ("bookwyrm", "0043_auto_20210204_2223"),
     ]
 
     operations = [
         migrations.RunPython(set_user, lambda x, y: None),
         migrations.AlterField(
-            model_name='shelfbook',
-            name='user',
-            field=bookwyrm.models.fields.ForeignKey(default=2, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL),
+            model_name="shelfbook",
+            name="user",
+            field=bookwyrm.models.fields.ForeignKey(
+                default=2,
+                on_delete=django.db.models.deletion.PROTECT,
+                to=settings.AUTH_USER_MODEL,
+            ),
             preserve_default=False,
         ),
     ]
diff --git a/bookwyrm/migrations/0045_auto_20210210_2114.py b/bookwyrm/migrations/0045_auto_20210210_2114.py
index 87b9a318..22f33cf4 100644
--- a/bookwyrm/migrations/0045_auto_20210210_2114.py
+++ b/bookwyrm/migrations/0045_auto_20210210_2114.py
@@ -8,51 +8,102 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0044_auto_20210207_1924'),
+        ("bookwyrm", "0044_auto_20210207_1924"),
     ]
 
     operations = [
         migrations.RemoveConstraint(
-            model_name='notification',
-            name='notification_type_valid',
+            model_name="notification",
+            name="notification_type_valid",
         ),
         migrations.AddField(
-            model_name='notification',
-            name='related_list_item',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='bookwyrm.ListItem'),
+            model_name="notification",
+            name="related_list_item",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="bookwyrm.ListItem",
+            ),
         ),
         migrations.AlterField(
-            model_name='notification',
-            name='notification_type',
-            field=models.CharField(choices=[('FAVORITE', 'Favorite'), ('REPLY', 'Reply'), ('MENTION', 'Mention'), ('TAG', 'Tag'), ('FOLLOW', 'Follow'), ('FOLLOW_REQUEST', 'Follow Request'), ('BOOST', 'Boost'), ('IMPORT', 'Import'), ('ADD', 'Add')], max_length=255),
+            model_name="notification",
+            name="notification_type",
+            field=models.CharField(
+                choices=[
+                    ("FAVORITE", "Favorite"),
+                    ("REPLY", "Reply"),
+                    ("MENTION", "Mention"),
+                    ("TAG", "Tag"),
+                    ("FOLLOW", "Follow"),
+                    ("FOLLOW_REQUEST", "Follow Request"),
+                    ("BOOST", "Boost"),
+                    ("IMPORT", "Import"),
+                    ("ADD", "Add"),
+                ],
+                max_length=255,
+            ),
         ),
         migrations.AlterField(
-            model_name='notification',
-            name='related_book',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='bookwyrm.Edition'),
+            model_name="notification",
+            name="related_book",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="bookwyrm.Edition",
+            ),
         ),
         migrations.AlterField(
-            model_name='notification',
-            name='related_import',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='bookwyrm.ImportJob'),
+            model_name="notification",
+            name="related_import",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="bookwyrm.ImportJob",
+            ),
         ),
         migrations.AlterField(
-            model_name='notification',
-            name='related_status',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='bookwyrm.Status'),
+            model_name="notification",
+            name="related_status",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="bookwyrm.Status",
+            ),
         ),
         migrations.AlterField(
-            model_name='notification',
-            name='related_user',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='related_user', to=settings.AUTH_USER_MODEL),
+            model_name="notification",
+            name="related_user",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="related_user",
+                to=settings.AUTH_USER_MODEL,
+            ),
         ),
         migrations.AlterField(
-            model_name='notification',
-            name='user',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+            model_name="notification",
+            name="user",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL
+            ),
         ),
         migrations.AddConstraint(
-            model_name='notification',
-            constraint=models.CheckConstraint(check=models.Q(notification_type__in=['FAVORITE', 'REPLY', 'MENTION', 'TAG', 'FOLLOW', 'FOLLOW_REQUEST', 'BOOST', 'IMPORT', 'ADD']), name='notification_type_valid'),
+            model_name="notification",
+            constraint=models.CheckConstraint(
+                check=models.Q(
+                    notification_type__in=[
+                        "FAVORITE",
+                        "REPLY",
+                        "MENTION",
+                        "TAG",
+                        "FOLLOW",
+                        "FOLLOW_REQUEST",
+                        "BOOST",
+                        "IMPORT",
+                        "ADD",
+                    ]
+                ),
+                name="notification_type_valid",
+            ),
         ),
     ]
diff --git a/bookwyrm/migrations/0046_sitesettings_privacy_policy.py b/bookwyrm/migrations/0046_sitesettings_privacy_policy.py
index 0c49d607..f9193764 100644
--- a/bookwyrm/migrations/0046_sitesettings_privacy_policy.py
+++ b/bookwyrm/migrations/0046_sitesettings_privacy_policy.py
@@ -6,13 +6,13 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0045_auto_20210210_2114'),
+        ("bookwyrm", "0045_auto_20210210_2114"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='sitesettings',
-            name='privacy_policy',
-            field=models.TextField(default='Add a privacy policy here.'),
+            model_name="sitesettings",
+            name="privacy_policy",
+            field=models.TextField(default="Add a privacy policy here."),
         ),
     ]
diff --git a/bookwyrm/migrations/0047_connector_isbn_search_url.py b/bookwyrm/migrations/0047_connector_isbn_search_url.py
index 617a89d9..2ca802c5 100644
--- a/bookwyrm/migrations/0047_connector_isbn_search_url.py
+++ b/bookwyrm/migrations/0047_connector_isbn_search_url.py
@@ -6,13 +6,13 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0046_sitesettings_privacy_policy'),
+        ("bookwyrm", "0046_sitesettings_privacy_policy"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='connector',
-            name='isbn_search_url',
+            model_name="connector",
+            name="isbn_search_url",
             field=models.CharField(blank=True, max_length=255, null=True),
         ),
     ]
diff --git a/bookwyrm/models/__init__.py b/bookwyrm/models/__init__.py
index 0aef6385..bef9debe 100644
--- a/bookwyrm/models/__init__.py
+++ b/bookwyrm/models/__init__.py
@@ -1,4 +1,4 @@
-''' bring all the models into the app namespace '''
+""" bring all the models into the app namespace """
 import inspect
 import sys
 
@@ -27,8 +27,12 @@ from .import_job import ImportJob, ImportItem
 from .site import SiteSettings, SiteInvite, PasswordReset
 
 cls_members = inspect.getmembers(sys.modules[__name__], inspect.isclass)
-activity_models = {c[1].activity_serializer.__name__: c[1] \
-    for c in cls_members if hasattr(c[1], 'activity_serializer')}
+activity_models = {
+    c[1].activity_serializer.__name__: c[1]
+    for c in cls_members
+    if hasattr(c[1], "activity_serializer")
+}
 
 status_models = [
-    c.__name__ for (_, c) in activity_models.items() if issubclass(c, Status)]
+    c.__name__ for (_, c) in activity_models.items() if issubclass(c, Status)
+]
diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index 10015bf1..4ced78c2 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -1,4 +1,4 @@
-''' activitypub model functionality '''
+""" activitypub model functionality """
 from base64 import b64encode
 from functools import reduce
 import json
@@ -26,18 +26,19 @@ logger = logging.getLogger(__name__)
 # I tried to separate these classes into mutliple files but I kept getting
 # circular import errors so I gave up. I'm sure it could be done though!
 class ActivitypubMixin:
-    ''' add this mixin for models that are AP serializable '''
+    """ add this mixin for models that are AP serializable """
+
     activity_serializer = lambda: {}
     reverse_unfurl = False
 
     def __init__(self, *args, **kwargs):
-        ''' collect some info on model fields '''
+        """ collect some info on model fields """
         self.image_fields = []
         self.many_to_many_fields = []
-        self.simple_fields = [] # "simple"
+        self.simple_fields = []  # "simple"
         # sort model fields by type
         for field in self._meta.get_fields():
-            if not hasattr(field, 'field_to_activity'):
+            if not hasattr(field, "field_to_activity"):
                 continue
 
             if isinstance(field, ImageField):
@@ -48,33 +49,41 @@ class ActivitypubMixin:
                 self.simple_fields.append(field)
 
         # a list of allll the serializable fields
-        self.activity_fields = self.image_fields + \
-                self.many_to_many_fields + self.simple_fields
+        self.activity_fields = (
+            self.image_fields + self.many_to_many_fields + self.simple_fields
+        )
 
         # these are separate to avoid infinite recursion issues
-        self.deserialize_reverse_fields = self.deserialize_reverse_fields \
-                if hasattr(self, 'deserialize_reverse_fields') else []
-        self.serialize_reverse_fields = self.serialize_reverse_fields \
-                if hasattr(self, 'serialize_reverse_fields') else []
+        self.deserialize_reverse_fields = (
+            self.deserialize_reverse_fields
+            if hasattr(self, "deserialize_reverse_fields")
+            else []
+        )
+        self.serialize_reverse_fields = (
+            self.serialize_reverse_fields
+            if hasattr(self, "serialize_reverse_fields")
+            else []
+        )
 
         super().__init__(*args, **kwargs)
 
-
     @classmethod
     def find_existing_by_remote_id(cls, remote_id):
-        ''' look up a remote id in the db '''
-        return cls.find_existing({'id': remote_id})
+        """ look up a remote id in the db """
+        return cls.find_existing({"id": remote_id})
 
     @classmethod
     def find_existing(cls, data):
-        ''' compare data to fields that can be used for deduplation.
+        """compare data to fields that can be used for deduplation.
         This always includes remote_id, but can also be unique identifiers
-        like an isbn for an edition '''
+        like an isbn for an edition"""
         filters = []
         # grabs all the data from the model to create django queryset filters
         for field in cls._meta.get_fields():
-            if not hasattr(field, 'deduplication_field') or \
-                    not field.deduplication_field:
+            if (
+                not hasattr(field, "deduplication_field")
+                or not field.deduplication_field
+            ):
                 continue
 
             value = data.get(field.get_activitypub_field())
@@ -82,9 +91,9 @@ class ActivitypubMixin:
                 continue
             filters.append({field.name: value})
 
-        if hasattr(cls, 'origin_id') and 'id' in data:
+        if hasattr(cls, "origin_id") and "id" in data:
             # kinda janky, but this handles special case for books
-            filters.append({'origin_id': data['id']})
+            filters.append({"origin_id": data["id"]})
 
         if not filters:
             # if there are no deduplication fields, it will match the first
@@ -92,45 +101,41 @@ class ActivitypubMixin:
             return None
 
         objects = cls.objects
-        if hasattr(objects, 'select_subclasses'):
+        if hasattr(objects, "select_subclasses"):
             objects = objects.select_subclasses()
 
         # an OR operation on all the match fields, sorry for the dense syntax
-        match = objects.filter(
-            reduce(operator.or_, (Q(**f) for f in filters))
-        )
+        match = objects.filter(reduce(operator.or_, (Q(**f) for f in filters)))
         # there OUGHT to be only one match
         return match.first()
 
-
     def broadcast(self, activity, sender, software=None):
-        ''' send out an activity '''
+        """ send out an activity """
         broadcast_task.delay(
             sender.id,
             json.dumps(activity, cls=activitypub.ActivityEncoder),
-            self.get_recipients(software=software)
+            self.get_recipients(software=software),
         )
 
-
     def get_recipients(self, software=None):
-        ''' figure out which inbox urls to post to '''
+        """ figure out which inbox urls to post to """
         # first we have to figure out who should receive this activity
-        privacy = self.privacy if hasattr(self, 'privacy') else 'public'
+        privacy = self.privacy if hasattr(self, "privacy") else "public"
         # is this activity owned by a user (statuses, lists, shelves), or is it
         # general to the instance (like books)
-        user = self.user if hasattr(self, 'user') else None
-        user_model = apps.get_model('bookwyrm.User', require_ready=True)
+        user = self.user if hasattr(self, "user") else None
+        user_model = apps.get_model("bookwyrm.User", require_ready=True)
         if not user and isinstance(self, user_model):
             # or maybe the thing itself is a user
             user = self
         # find anyone who's tagged in a status, for example
-        mentions = self.recipients if hasattr(self, 'recipients') else []
+        mentions = self.recipients if hasattr(self, "recipients") else []
 
         # we always send activities to explicitly mentioned users' inboxes
         recipients = [u.inbox for u in mentions or []]
 
         # unless it's a dm, all the followers should receive the activity
-        if privacy != 'direct':
+        if privacy != "direct":
             # we will send this out to a subset of all remote users
             queryset = user_model.objects.filter(
                 local=False,
@@ -138,43 +143,43 @@ class ActivitypubMixin:
             # filter users first by whether they're using the desired software
             # this lets us send book updates only to other bw servers
             if software:
-                queryset = queryset.filter(
-                    bookwyrm_user=(software == 'bookwyrm')
-                )
+                queryset = queryset.filter(bookwyrm_user=(software == "bookwyrm"))
             # if there's a user, we only want to send to the user's followers
             if user:
                 queryset = queryset.filter(following=user)
 
             # ideally, we will send to shared inboxes for efficiency
-            shared_inboxes = queryset.filter(
-                shared_inbox__isnull=False
-            ).values_list('shared_inbox', flat=True).distinct()
+            shared_inboxes = (
+                queryset.filter(shared_inbox__isnull=False)
+                .values_list("shared_inbox", flat=True)
+                .distinct()
+            )
             # but not everyone has a shared inbox
-            inboxes = queryset.filter(
-                shared_inbox__isnull=True
-            ).values_list('inbox', flat=True)
+            inboxes = queryset.filter(shared_inbox__isnull=True).values_list(
+                "inbox", flat=True
+            )
             recipients += list(shared_inboxes) + list(inboxes)
         return recipients
 
-
     def to_activity_dataclass(self):
-        ''' convert from a model to an activity '''
+        """ convert from a model to an activity """
         activity = generate_activity(self)
         return self.activity_serializer(**activity)
 
-    def to_activity(self, **kwargs): # pylint: disable=unused-argument
-        ''' convert from a model to a json activity '''
+    def to_activity(self, **kwargs):  # pylint: disable=unused-argument
+        """ convert from a model to a json activity """
         return self.to_activity_dataclass().serialize()
 
 
 class ObjectMixin(ActivitypubMixin):
-    ''' add this mixin for object models that are AP serializable '''
+    """ add this mixin for object models that are AP serializable """
+
     def save(self, *args, created=None, **kwargs):
-        ''' broadcast created/updated/deleted objects as appropriate '''
-        broadcast = kwargs.get('broadcast', True)
+        """ broadcast created/updated/deleted objects as appropriate """
+        broadcast = kwargs.get("broadcast", True)
         # this bonus kwarg woul cause an error in the base save method
-        if 'broadcast' in kwargs:
-            del kwargs['broadcast']
+        if "broadcast" in kwargs:
+            del kwargs["broadcast"]
 
         created = created or not bool(self.id)
         # first off, we want to save normally no matter what
@@ -183,7 +188,7 @@ class ObjectMixin(ActivitypubMixin):
             return
 
         # this will work for objects owned by a user (lists, shelves)
-        user = self.user if hasattr(self, 'user') else None
+        user = self.user if hasattr(self, "user") else None
 
         if created:
             # broadcast Create activities for objects owned by a local user
@@ -193,10 +198,10 @@ class ObjectMixin(ActivitypubMixin):
             try:
                 software = None
                 # do we have a "pure" activitypub version of this for mastodon?
-                if hasattr(self, 'pure_content'):
+                if hasattr(self, "pure_content"):
                     pure_activity = self.to_create_activity(user, pure=True)
-                    self.broadcast(pure_activity, user, software='other')
-                    software = 'bookwyrm'
+                    self.broadcast(pure_activity, user, software="other")
+                    software = "bookwyrm"
                 # sends to BW only if we just did a pure version for masto
                 activity = self.to_create_activity(user)
                 self.broadcast(activity, user, software=software)
@@ -209,39 +214,38 @@ class ObjectMixin(ActivitypubMixin):
         # --- updating an existing object
         if not user:
             # users don't have associated users, they ARE users
-            user_model = apps.get_model('bookwyrm.User', require_ready=True)
+            user_model = apps.get_model("bookwyrm.User", require_ready=True)
             if isinstance(self, user_model):
                 user = self
             # book data tracks last editor
-            elif hasattr(self, 'last_edited_by'):
+            elif hasattr(self, "last_edited_by"):
                 user = self.last_edited_by
         # again, if we don't know the user or they're remote, don't bother
         if not user or not user.local:
             return
 
         # is this a deletion?
-        if hasattr(self, 'deleted') and self.deleted:
+        if hasattr(self, "deleted") and self.deleted:
             activity = self.to_delete_activity(user)
         else:
             activity = self.to_update_activity(user)
         self.broadcast(activity, user)
 
-
     def to_create_activity(self, user, **kwargs):
-        ''' returns the object wrapped in a Create activity '''
+        """ returns the object wrapped in a Create activity """
         activity_object = self.to_activity_dataclass(**kwargs)
 
         signature = None
-        create_id = self.remote_id + '/activity'
-        if hasattr(activity_object, 'content') and activity_object.content:
+        create_id = self.remote_id + "/activity"
+        if hasattr(activity_object, "content") and activity_object.content:
             signer = pkcs1_15.new(RSA.import_key(user.key_pair.private_key))
             content = activity_object.content
-            signed_message = signer.sign(SHA256.new(content.encode('utf8')))
+            signed_message = signer.sign(SHA256.new(content.encode("utf8")))
 
             signature = activitypub.Signature(
-                creator='%s#main-key' % user.remote_id,
+                creator="%s#main-key" % user.remote_id,
                 created=activity_object.published,
-                signatureValue=b64encode(signed_message).decode('utf8')
+                signatureValue=b64encode(signed_message).decode("utf8"),
             )
 
         return activitypub.Create(
@@ -253,50 +257,48 @@ class ObjectMixin(ActivitypubMixin):
             signature=signature,
         ).serialize()
 
-
     def to_delete_activity(self, user):
-        ''' notice of deletion '''
+        """ notice of deletion """
         return activitypub.Delete(
-            id=self.remote_id + '/activity',
+            id=self.remote_id + "/activity",
             actor=user.remote_id,
-            to=['%s/followers' % user.remote_id],
-            cc=['https://www.w3.org/ns/activitystreams#Public'],
+            to=["%s/followers" % user.remote_id],
+            cc=["https://www.w3.org/ns/activitystreams#Public"],
+            object=self,
+        ).serialize()
+
+    def to_update_activity(self, user):
+        """ wrapper for Updates to an activity """
+        activity_id = "%s#update/%s" % (self.remote_id, uuid4())
+        return activitypub.Update(
+            id=activity_id,
+            actor=user.remote_id,
+            to=["https://www.w3.org/ns/activitystreams#Public"],
             object=self,
         ).serialize()
 
 
-    def to_update_activity(self, user):
-        ''' wrapper for Updates to an activity '''
-        activity_id = '%s#update/%s' % (self.remote_id, uuid4())
-        return activitypub.Update(
-            id=activity_id,
-            actor=user.remote_id,
-            to=['https://www.w3.org/ns/activitystreams#Public'],
-            object=self
-        ).serialize()
-
-
 class OrderedCollectionPageMixin(ObjectMixin):
-    ''' just the paginator utilities, so you don't HAVE to
-        override ActivitypubMixin's to_activity (ie, for outbox) '''
+    """just the paginator utilities, so you don't HAVE to
+    override ActivitypubMixin's to_activity (ie, for outbox)"""
+
     @property
     def collection_remote_id(self):
-        ''' this can be overriden if there's a special remote id, ie outbox '''
+        """ this can be overriden if there's a special remote id, ie outbox """
         return self.remote_id
 
-
-    def to_ordered_collection(self, queryset, \
-            remote_id=None, page=False, collection_only=False, **kwargs):
-        ''' an ordered collection of whatevers '''
+    def to_ordered_collection(
+        self, queryset, remote_id=None, page=False, collection_only=False, **kwargs
+    ):
+        """ an ordered collection of whatevers """
         if not queryset.ordered:
-            raise RuntimeError('queryset must be ordered')
+            raise RuntimeError("queryset must be ordered")
 
         remote_id = remote_id or self.remote_id
         if page:
-            return to_ordered_collection_page(
-                queryset, remote_id, **kwargs)
+            return to_ordered_collection_page(queryset, remote_id, **kwargs)
 
-        if collection_only or not hasattr(self, 'activity_serializer'):
+        if collection_only or not hasattr(self, "activity_serializer"):
             serializer = activitypub.OrderedCollection
             activity = {}
         else:
@@ -305,23 +307,24 @@ class OrderedCollectionPageMixin(ObjectMixin):
             activity = generate_activity(self)
 
         if remote_id:
-            activity['id'] = remote_id
+            activity["id"] = remote_id
 
         paginated = Paginator(queryset, PAGE_LENGTH)
         # add computed fields specific to orderd collections
-        activity['totalItems'] = paginated.count
-        activity['first'] = '%s?page=1' % remote_id
-        activity['last'] = '%s?page=%d' % (remote_id, paginated.num_pages)
+        activity["totalItems"] = paginated.count
+        activity["first"] = "%s?page=1" % remote_id
+        activity["last"] = "%s?page=%d" % (remote_id, paginated.num_pages)
 
         return serializer(**activity)
 
 
 class OrderedCollectionMixin(OrderedCollectionPageMixin):
-    ''' extends activitypub models to work as ordered collections '''
+    """ extends activitypub models to work as ordered collections """
+
     @property
     def collection_queryset(self):
-        ''' usually an ordered collection model aggregates a different model '''
-        raise NotImplementedError('Model must define collection_queryset')
+        """ usually an ordered collection model aggregates a different model """
+        raise NotImplementedError("Model must define collection_queryset")
 
     activity_serializer = activitypub.OrderedCollection
 
@@ -329,18 +332,20 @@ class OrderedCollectionMixin(OrderedCollectionPageMixin):
         return self.to_ordered_collection(self.collection_queryset, **kwargs)
 
     def to_activity(self, **kwargs):
-        ''' an ordered collection of the specified model queryset  '''
+        """ an ordered collection of the specified model queryset  """
         return self.to_ordered_collection(
-            self.collection_queryset, **kwargs).serialize()
+            self.collection_queryset, **kwargs
+        ).serialize()
 
 
 class CollectionItemMixin(ActivitypubMixin):
-    ''' for items that are part of an (Ordered)Collection '''
+    """ for items that are part of an (Ordered)Collection """
+
     activity_serializer = activitypub.Add
     object_field = collection_field = None
 
     def save(self, *args, broadcast=True, **kwargs):
-        ''' broadcast updated '''
+        """ broadcast updated """
         created = not bool(self.id)
         # first off, we want to save normally no matter what
         super().save(*args, **kwargs)
@@ -353,89 +358,91 @@ class CollectionItemMixin(ActivitypubMixin):
         activity = self.to_add_activity()
         self.broadcast(activity, self.user)
 
-
     def delete(self, *args, **kwargs):
-        ''' broadcast a remove activity '''
+        """ broadcast a remove activity """
         activity = self.to_remove_activity()
         super().delete(*args, **kwargs)
         self.broadcast(activity, self.user)
 
-
     def to_add_activity(self):
-        ''' AP for shelving a book'''
+        """ AP for shelving a book"""
         object_field = getattr(self, self.object_field)
         collection_field = getattr(self, self.collection_field)
         return activitypub.Add(
-            id='%s#add' % self.remote_id,
+            id="%s#add" % self.remote_id,
             actor=self.user.remote_id,
             object=object_field,
-            target=collection_field.remote_id
+            target=collection_field.remote_id,
         ).serialize()
 
     def to_remove_activity(self):
-        ''' AP for un-shelving a book'''
+        """ AP for un-shelving a book"""
         object_field = getattr(self, self.object_field)
         collection_field = getattr(self, self.collection_field)
         return activitypub.Remove(
-            id='%s#remove' % self.remote_id,
+            id="%s#remove" % self.remote_id,
             actor=self.user.remote_id,
             object=object_field,
-            target=collection_field.remote_id
+            target=collection_field.remote_id,
         ).serialize()
 
 
 class ActivityMixin(ActivitypubMixin):
-    ''' add this mixin for models that are AP serializable '''
+    """ add this mixin for models that are AP serializable """
+
     def save(self, *args, broadcast=True, **kwargs):
-        ''' broadcast activity '''
+        """ broadcast activity """
         super().save(*args, **kwargs)
-        user = self.user if hasattr(self, 'user') else self.user_subject
+        user = self.user if hasattr(self, "user") else self.user_subject
         if broadcast and user.local:
             self.broadcast(self.to_activity(), user)
 
-
     def delete(self, *args, broadcast=True, **kwargs):
-        ''' nevermind, undo that activity '''
-        user = self.user if hasattr(self, 'user') else self.user_subject
+        """ nevermind, undo that activity """
+        user = self.user if hasattr(self, "user") else self.user_subject
         if broadcast and user.local:
             self.broadcast(self.to_undo_activity(), user)
         super().delete(*args, **kwargs)
 
-
     def to_undo_activity(self):
-        ''' undo an action '''
-        user = self.user if hasattr(self, 'user') else self.user_subject
+        """ undo an action """
+        user = self.user if hasattr(self, "user") else self.user_subject
         return activitypub.Undo(
-            id='%s#undo' % self.remote_id,
+            id="%s#undo" % self.remote_id,
             actor=user.remote_id,
             object=self,
         ).serialize()
 
 
 def generate_activity(obj):
-    ''' go through the fields on an object '''
+    """ go through the fields on an object """
     activity = {}
     for field in obj.activity_fields:
         field.set_activity_from_field(activity, obj)
 
-    if hasattr(obj, 'serialize_reverse_fields'):
+    if hasattr(obj, "serialize_reverse_fields"):
         # for example, editions of a work
-        for model_field_name, activity_field_name, sort_field in \
-                obj.serialize_reverse_fields:
+        for (
+            model_field_name,
+            activity_field_name,
+            sort_field,
+        ) in obj.serialize_reverse_fields:
             related_field = getattr(obj, model_field_name)
-            activity[activity_field_name] = \
-                    unfurl_related_field(related_field, sort_field)
+            activity[activity_field_name] = unfurl_related_field(
+                related_field, sort_field
+            )
 
-    if not activity.get('id'):
-        activity['id'] = obj.get_remote_id()
+    if not activity.get("id"):
+        activity["id"] = obj.get_remote_id()
     return activity
 
 
 def unfurl_related_field(related_field, sort_field=None):
-    ''' load reverse lookups (like public key owner or Status attachment '''
-    if hasattr(related_field, 'all'):
-        return [unfurl_related_field(i) for i in related_field.order_by(
-            sort_field).all()]
+    """ load reverse lookups (like public key owner or Status attachment """
+    if hasattr(related_field, "all"):
+        return [
+            unfurl_related_field(i) for i in related_field.order_by(sort_field).all()
+        ]
     if related_field.reverse_unfurl:
         return related_field.field_to_activity()
     return related_field.remote_id
@@ -443,8 +450,8 @@ def unfurl_related_field(related_field, sort_field=None):
 
 @app.task
 def broadcast_task(sender_id, activity, recipients):
-    ''' the celery task for broadcast '''
-    user_model = apps.get_model('bookwyrm.User', require_ready=True)
+    """ the celery task for broadcast """
+    user_model = apps.get_model("bookwyrm.User", require_ready=True)
     sender = user_model.objects.get(id=sender_id)
     for recipient in recipients:
         try:
@@ -454,12 +461,12 @@ def broadcast_task(sender_id, activity, recipients):
 
 
 def sign_and_send(sender, data, destination):
-    ''' crpyto whatever and http junk '''
+    """ crpyto whatever and http junk """
     now = http_date()
 
     if not sender.key_pair.private_key:
         # this shouldn't happen. it would be bad if it happened.
-        raise ValueError('No private key found for sender')
+        raise ValueError("No private key found for sender")
 
     digest = make_digest(data)
 
@@ -467,11 +474,11 @@ def sign_and_send(sender, data, destination):
         destination,
         data=data,
         headers={
-            'Date': now,
-            'Digest': digest,
-            'Signature': make_signature(sender, destination, now, digest),
-            'Content-Type': 'application/activity+json; charset=utf-8',
-            'User-Agent': USER_AGENT,
+            "Date": now,
+            "Digest": digest,
+            "Signature": make_signature(sender, destination, now, digest),
+            "Content-Type": "application/activity+json; charset=utf-8",
+            "User-Agent": USER_AGENT,
         },
     )
     if not response.ok:
@@ -481,8 +488,9 @@ def sign_and_send(sender, data, destination):
 
 # pylint: disable=unused-argument
 def to_ordered_collection_page(
-        queryset, remote_id, id_only=False, page=1, pure=False, **kwargs):
-    ''' serialize and pagiante a queryset '''
+    queryset, remote_id, id_only=False, page=1, pure=False, **kwargs
+):
+    """ serialize and pagiante a queryset """
     paginated = Paginator(queryset, PAGE_LENGTH)
 
     activity_page = paginated.page(page)
@@ -493,14 +501,13 @@ def to_ordered_collection_page(
 
     prev_page = next_page = None
     if activity_page.has_next():
-        next_page = '%s?page=%d' % (remote_id, activity_page.next_page_number())
+        next_page = "%s?page=%d" % (remote_id, activity_page.next_page_number())
     if activity_page.has_previous():
-        prev_page = '%s?page=%d' % \
-                (remote_id, activity_page.previous_page_number())
+        prev_page = "%s?page=%d" % (remote_id, activity_page.previous_page_number())
     return activitypub.OrderedCollectionPage(
-        id='%s?page=%s' % (remote_id, page),
+        id="%s?page=%s" % (remote_id, page),
         partOf=remote_id,
         orderedItems=items,
         next=next_page,
-        prev=prev_page
+        prev=prev_page,
     )
diff --git a/bookwyrm/models/attachment.py b/bookwyrm/models/attachment.py
index e3450a5a..0cd2c111 100644
--- a/bookwyrm/models/attachment.py
+++ b/bookwyrm/models/attachment.py
@@ -1,4 +1,4 @@
-''' media that is posted in the app '''
+""" media that is posted in the app """
 from django.db import models
 
 from bookwyrm import activitypub
@@ -8,23 +8,25 @@ from . import fields
 
 
 class Attachment(ActivitypubMixin, BookWyrmModel):
-    ''' an image (or, in the future, video etc) associated with a status '''
+    """ an image (or, in the future, video etc) associated with a status """
+
     status = models.ForeignKey(
-        'Status',
-        on_delete=models.CASCADE,
-        related_name='attachments',
-        null=True
+        "Status", on_delete=models.CASCADE, related_name="attachments", null=True
     )
     reverse_unfurl = True
+
     class Meta:
-        ''' one day we'll have other types of attachments besides images '''
+        """ one day we'll have other types of attachments besides images """
+
         abstract = True
 
 
 class Image(Attachment):
-    ''' an image attachment '''
+    """ an image attachment """
+
     image = fields.ImageField(
-        upload_to='status/', null=True, blank=True, activitypub_field='url')
-    caption = fields.TextField(null=True, blank=True, activitypub_field='name')
+        upload_to="status/", null=True, blank=True, activitypub_field="url"
+    )
+    caption = fields.TextField(null=True, blank=True, activitypub_field="name")
 
     activity_serializer = activitypub.Image
diff --git a/bookwyrm/models/author.py b/bookwyrm/models/author.py
index d0cb8d19..4c5fe6c8 100644
--- a/bookwyrm/models/author.py
+++ b/bookwyrm/models/author.py
@@ -1,4 +1,4 @@
-''' database schema for info about authors '''
+""" database schema for info about authors """
 from django.db import models
 
 from bookwyrm import activitypub
@@ -9,9 +9,11 @@ from . import fields
 
 
 class Author(BookDataModel):
-    ''' basic biographic info '''
+    """ basic biographic info """
+
     wikipedia_link = fields.CharField(
-        max_length=255, blank=True, null=True, deduplication_field=True)
+        max_length=255, blank=True, null=True, deduplication_field=True
+    )
     # idk probably other keys would be useful here?
     born = fields.DateTimeField(blank=True, null=True)
     died = fields.DateTimeField(blank=True, null=True)
@@ -22,7 +24,7 @@ class Author(BookDataModel):
     bio = fields.HtmlField(null=True, blank=True)
 
     def get_remote_id(self):
-        ''' editions and works both use "book" instead of model_name '''
-        return 'https://%s/author/%s' % (DOMAIN, self.id)
+        """ editions and works both use "book" instead of model_name """
+        return "https://%s/author/%s" % (DOMAIN, self.id)
 
     activity_serializer = activitypub.Author
diff --git a/bookwyrm/models/base_model.py b/bookwyrm/models/base_model.py
index 7af48749..60e5da0a 100644
--- a/bookwyrm/models/base_model.py
+++ b/bookwyrm/models/base_model.py
@@ -1,4 +1,4 @@
-''' base model with default fields '''
+""" base model with default fields """
 from django.db import models
 from django.dispatch import receiver
 
@@ -7,34 +7,36 @@ from .fields import RemoteIdField
 
 
 class BookWyrmModel(models.Model):
-    ''' shared fields '''
+    """ shared fields """
+
     created_date = models.DateTimeField(auto_now_add=True)
     updated_date = models.DateTimeField(auto_now=True)
-    remote_id = RemoteIdField(null=True, activitypub_field='id')
+    remote_id = RemoteIdField(null=True, activitypub_field="id")
 
     def get_remote_id(self):
-        ''' generate a url that resolves to the local object '''
-        base_path = 'https://%s' % DOMAIN
-        if hasattr(self, 'user'):
-            base_path = '%s%s' % (base_path, self.user.local_path)
+        """ generate a url that resolves to the local object """
+        base_path = "https://%s" % DOMAIN
+        if hasattr(self, "user"):
+            base_path = "%s%s" % (base_path, self.user.local_path)
         model_name = type(self).__name__.lower()
-        return '%s/%s/%d' % (base_path, model_name, self.id)
+        return "%s/%s/%d" % (base_path, model_name, self.id)
 
     class Meta:
-        ''' this is just here to provide default fields for other models '''
+        """ this is just here to provide default fields for other models """
+
         abstract = True
 
     @property
     def local_path(self):
-        ''' how to link to this object in the local app '''
-        return self.get_remote_id().replace('https://%s' % DOMAIN, '')
+        """ how to link to this object in the local app """
+        return self.get_remote_id().replace("https://%s" % DOMAIN, "")
 
 
 @receiver(models.signals.post_save)
-#pylint: disable=unused-argument
+# pylint: disable=unused-argument
 def execute_after_save(sender, instance, created, *args, **kwargs):
-    ''' set the remote_id after save (when the id is available) '''
-    if not created or not hasattr(instance, 'get_remote_id'):
+    """ set the remote_id after save (when the id is available) """
+    if not created or not hasattr(instance, "get_remote_id"):
         return
     if not instance.remote_id:
         instance.remote_id = instance.get_remote_id()
diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index 84bfbc6b..66b539bb 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -1,4 +1,4 @@
-''' database schema for books and shelves '''
+""" database schema for books and shelves """
 import re
 
 from django.db import models
@@ -11,25 +11,30 @@ from .activitypub_mixin import OrderedCollectionPageMixin, ObjectMixin
 from .base_model import BookWyrmModel
 from . import fields
 
+
 class BookDataModel(ObjectMixin, BookWyrmModel):
-    ''' fields shared between editable book data (books, works, authors) '''
+    """ fields shared between editable book data (books, works, authors) """
+
     origin_id = models.CharField(max_length=255, null=True, blank=True)
     openlibrary_key = fields.CharField(
-        max_length=255, blank=True, null=True, deduplication_field=True)
+        max_length=255, blank=True, null=True, deduplication_field=True
+    )
     librarything_key = fields.CharField(
-        max_length=255, blank=True, null=True, deduplication_field=True)
+        max_length=255, blank=True, null=True, deduplication_field=True
+    )
     goodreads_key = fields.CharField(
-        max_length=255, blank=True, null=True, deduplication_field=True)
+        max_length=255, blank=True, null=True, deduplication_field=True
+    )
 
-    last_edited_by = models.ForeignKey(
-        'User', on_delete=models.PROTECT, null=True)
+    last_edited_by = models.ForeignKey("User", on_delete=models.PROTECT, null=True)
 
     class Meta:
-        ''' can't initialize this model, that wouldn't make sense '''
+        """ can't initialize this model, that wouldn't make sense """
+
         abstract = True
 
     def save(self, *args, **kwargs):
-        ''' ensure that the remote_id is within this instance '''
+        """ ensure that the remote_id is within this instance """
         if self.id:
             self.remote_id = self.get_remote_id()
         else:
@@ -37,15 +42,15 @@ class BookDataModel(ObjectMixin, BookWyrmModel):
             self.remote_id = None
         return super().save(*args, **kwargs)
 
-    def broadcast(self, activity, sender, software='bookwyrm'):
-        ''' only send book data updates to other bookwyrm instances '''
+    def broadcast(self, activity, sender, software="bookwyrm"):
+        """ only send book data updates to other bookwyrm instances """
         super().broadcast(activity, sender, software=software)
 
 
 class Book(BookDataModel):
-    ''' a generic book, which can mean either an edition or a work '''
-    connector = models.ForeignKey(
-        'Connector', on_delete=models.PROTECT, null=True)
+    """ a generic book, which can mean either an edition or a work """
+
+    connector = models.ForeignKey("Connector", on_delete=models.PROTECT, null=True)
 
     # book/work metadata
     title = fields.CharField(max_length=255)
@@ -63,9 +68,10 @@ class Book(BookDataModel):
     subject_places = fields.ArrayField(
         models.CharField(max_length=255), blank=True, null=True, default=list
     )
-    authors = fields.ManyToManyField('Author')
+    authors = fields.ManyToManyField("Author")
     cover = fields.ImageField(
-        upload_to='covers/', blank=True, null=True, alt_field='alt_text')
+        upload_to="covers/", blank=True, null=True, alt_field="alt_text"
+    )
     first_published_date = fields.DateTimeField(blank=True, null=True)
     published_date = fields.DateTimeField(blank=True, null=True)
 
@@ -73,42 +79,43 @@ class Book(BookDataModel):
 
     @property
     def author_text(self):
-        ''' format a list of authors '''
-        return ', '.join(a.name for a in self.authors.all())
+        """ format a list of authors """
+        return ", ".join(a.name for a in self.authors.all())
 
     @property
     def latest_readthrough(self):
-        ''' most recent readthrough activity '''
-        return self.readthrough_set.order_by('-updated_date').first()
+        """ most recent readthrough activity """
+        return self.readthrough_set.order_by("-updated_date").first()
 
     @property
     def edition_info(self):
-        ''' properties of this edition, as a string '''
+        """ properties of this edition, as a string """
         items = [
-            self.physical_format if hasattr(self, 'physical_format') else None,
-            self.languages[0] + ' language' if self.languages and \
-                    self.languages[0] != 'English' else None,
+            self.physical_format if hasattr(self, "physical_format") else None,
+            self.languages[0] + " language"
+            if self.languages and self.languages[0] != "English"
+            else None,
             str(self.published_date.year) if self.published_date else None,
         ]
-        return ', '.join(i for i in items if i)
+        return ", ".join(i for i in items if i)
 
     @property
     def alt_text(self):
-        ''' image alt test '''
-        text = '%s' % self.title
+        """ image alt test """
+        text = "%s" % self.title
         if self.edition_info:
-            text += ' (%s)' % self.edition_info
+            text += " (%s)" % self.edition_info
         return text
 
     def save(self, *args, **kwargs):
-        ''' can't be abstract for query reasons, but you shouldn't USE it '''
+        """ can't be abstract for query reasons, but you shouldn't USE it """
         if not isinstance(self, Edition) and not isinstance(self, Work):
-            raise ValueError('Books should be added as Editions or Works')
+            raise ValueError("Books should be added as Editions or Works")
         return super().save(*args, **kwargs)
 
     def get_remote_id(self):
-        ''' editions and works both use "book" instead of model_name '''
-        return 'https://%s/book/%d' % (DOMAIN, self.id)
+        """ editions and works both use "book" instead of model_name """
+        return "https://%s/book/%d" % (DOMAIN, self.id)
 
     def __repr__(self):
         return "<{} key={!r} title={!r}>".format(
@@ -119,76 +126,82 @@ class Book(BookDataModel):
 
 
 class Work(OrderedCollectionPageMixin, Book):
-    ''' a work (an abstract concept of a book that manifests in an edition) '''
+    """ a work (an abstract concept of a book that manifests in an edition) """
+
     # library of congress catalog control number
     lccn = fields.CharField(
-        max_length=255, blank=True, null=True, deduplication_field=True)
+        max_length=255, blank=True, null=True, deduplication_field=True
+    )
     # this has to be nullable but should never be null
     default_edition = fields.ForeignKey(
-        'Edition',
-        on_delete=models.PROTECT,
-        null=True,
-        load_remote=False
+        "Edition", on_delete=models.PROTECT, null=True, load_remote=False
     )
 
     def save(self, *args, **kwargs):
-        ''' set some fields on the edition object '''
+        """ set some fields on the edition object """
         # set rank
         for edition in self.editions.all():
             edition.save()
         return super().save(*args, **kwargs)
 
     def get_default_edition(self):
-        ''' in case the default edition is not set '''
-        return self.default_edition or self.editions.order_by(
-            '-edition_rank'
-        ).first()
+        """ in case the default edition is not set """
+        return self.default_edition or self.editions.order_by("-edition_rank").first()
 
     def to_edition_list(self, **kwargs):
-        ''' an ordered collection of editions '''
+        """ an ordered collection of editions """
         return self.to_ordered_collection(
-            self.editions.order_by('-edition_rank').all(),
-            remote_id='%s/editions' % self.remote_id,
+            self.editions.order_by("-edition_rank").all(),
+            remote_id="%s/editions" % self.remote_id,
             **kwargs
         )
 
     activity_serializer = activitypub.Work
-    serialize_reverse_fields = [('editions', 'editions', '-edition_rank')]
-    deserialize_reverse_fields = [('editions', 'editions')]
+    serialize_reverse_fields = [("editions", "editions", "-edition_rank")]
+    deserialize_reverse_fields = [("editions", "editions")]
 
 
 class Edition(Book):
-    ''' an edition of a book '''
+    """ an edition of a book """
+
     # these identifiers only apply to editions, not works
     isbn_10 = fields.CharField(
-        max_length=255, blank=True, null=True, deduplication_field=True)
+        max_length=255, blank=True, null=True, deduplication_field=True
+    )
     isbn_13 = fields.CharField(
-        max_length=255, blank=True, null=True, deduplication_field=True)
+        max_length=255, blank=True, null=True, deduplication_field=True
+    )
     oclc_number = fields.CharField(
-        max_length=255, blank=True, null=True, deduplication_field=True)
+        max_length=255, blank=True, null=True, deduplication_field=True
+    )
     asin = fields.CharField(
-        max_length=255, blank=True, null=True, deduplication_field=True)
+        max_length=255, blank=True, null=True, deduplication_field=True
+    )
     pages = fields.IntegerField(blank=True, null=True)
     physical_format = fields.CharField(max_length=255, blank=True, null=True)
     publishers = fields.ArrayField(
         models.CharField(max_length=255), blank=True, default=list
     )
     shelves = models.ManyToManyField(
-        'Shelf',
+        "Shelf",
         symmetrical=False,
-        through='ShelfBook',
-        through_fields=('book', 'shelf')
+        through="ShelfBook",
+        through_fields=("book", "shelf"),
     )
     parent_work = fields.ForeignKey(
-        'Work', on_delete=models.PROTECT, null=True,
-        related_name='editions', activitypub_field='work')
+        "Work",
+        on_delete=models.PROTECT,
+        null=True,
+        related_name="editions",
+        activitypub_field="work",
+    )
     edition_rank = fields.IntegerField(default=0)
 
     activity_serializer = activitypub.Edition
-    name_field = 'title'
+    name_field = "title"
 
     def get_rank(self):
-        ''' calculate how complete the data is on this edition '''
+        """ calculate how complete the data is on this edition """
         if self.parent_work and self.parent_work.default_edition == self:
             # default edition has the highest rank
             return 20
@@ -204,9 +217,9 @@ class Edition(Book):
         return rank
 
     def save(self, *args, **kwargs):
-        ''' set some fields on the edition object '''
+        """ set some fields on the edition object """
         # calculate isbn 10/13
-        if self.isbn_13 and self.isbn_13[:3] == '978' and not self.isbn_10:
+        if self.isbn_13 and self.isbn_13[:3] == "978" and not self.isbn_10:
             self.isbn_10 = isbn_13_to_10(self.isbn_13)
         if self.isbn_10 and not self.isbn_13:
             self.isbn_13 = isbn_10_to_13(self.isbn_10)
@@ -218,17 +231,18 @@ class Edition(Book):
 
 
 def isbn_10_to_13(isbn_10):
-    ''' convert an isbn 10 into an isbn 13 '''
-    isbn_10 = re.sub(r'[^0-9X]', '', isbn_10)
+    """ convert an isbn 10 into an isbn 13 """
+    isbn_10 = re.sub(r"[^0-9X]", "", isbn_10)
     # drop the last character of the isbn 10 number (the original checkdigit)
     converted = isbn_10[:9]
     # add "978" to the front
-    converted = '978' + converted
+    converted = "978" + converted
     # add a check digit to the end
     # multiply the odd digits by 1 and the even digits by 3 and sum them
     try:
-        checksum = sum(int(i) for i in converted[::2]) + \
-               sum(int(i) * 3 for i in converted[1::2])
+        checksum = sum(int(i) for i in converted[::2]) + sum(
+            int(i) * 3 for i in converted[1::2]
+        )
     except ValueError:
         return None
     # add the checksum mod 10 to the end
@@ -239,11 +253,11 @@ def isbn_10_to_13(isbn_10):
 
 
 def isbn_13_to_10(isbn_13):
-    ''' convert isbn 13 to 10, if possible '''
-    if isbn_13[:3] != '978':
+    """ convert isbn 13 to 10, if possible """
+    if isbn_13[:3] != "978":
         return None
 
-    isbn_13 = re.sub(r'[^0-9X]', '', isbn_13)
+    isbn_13 = re.sub(r"[^0-9X]", "", isbn_13)
 
     # remove '978' and old checkdigit
     converted = isbn_13[3:-1]
@@ -256,5 +270,5 @@ def isbn_13_to_10(isbn_13):
     checkdigit = checksum % 11
     checkdigit = 11 - checkdigit
     if checkdigit == 10:
-        checkdigit = 'X'
+        checkdigit = "X"
     return converted + str(checkdigit)
diff --git a/bookwyrm/models/connector.py b/bookwyrm/models/connector.py
index c1fbf58b..11bdbee2 100644
--- a/bookwyrm/models/connector.py
+++ b/bookwyrm/models/connector.py
@@ -1,21 +1,21 @@
-''' manages interfaces with external sources of book data '''
+""" manages interfaces with external sources of book data """
 from django.db import models
 from bookwyrm.connectors.settings import CONNECTORS
 
 from .base_model import BookWyrmModel
 
 
-ConnectorFiles = models.TextChoices('ConnectorFiles', CONNECTORS)
+ConnectorFiles = models.TextChoices("ConnectorFiles", CONNECTORS)
+
+
 class Connector(BookWyrmModel):
-    ''' book data source connectors '''
+    """ book data source connectors """
+
     identifier = models.CharField(max_length=255, unique=True)
     priority = models.IntegerField(default=2)
     name = models.CharField(max_length=255, null=True, blank=True)
     local = models.BooleanField(default=False)
-    connector_file = models.CharField(
-        max_length=255,
-        choices=ConnectorFiles.choices
-    )
+    connector_file = models.CharField(max_length=255, choices=ConnectorFiles.choices)
     api_key = models.CharField(max_length=255, null=True, blank=True)
 
     base_url = models.CharField(max_length=255)
@@ -24,7 +24,7 @@ class Connector(BookWyrmModel):
     search_url = models.CharField(max_length=255, null=True, blank=True)
     isbn_search_url = models.CharField(max_length=255, null=True, blank=True)
 
-    politeness_delay = models.IntegerField(null=True, blank=True) #seconds
+    politeness_delay = models.IntegerField(null=True, blank=True)  # seconds
     max_query_count = models.IntegerField(null=True, blank=True)
     # how many queries executed in a unit of time, like a day
     query_count = models.IntegerField(default=0)
@@ -32,11 +32,12 @@ class Connector(BookWyrmModel):
     query_count_expiry = models.DateTimeField(auto_now_add=True, blank=True)
 
     class Meta:
-        ''' check that there's code to actually use this connector '''
+        """ check that there's code to actually use this connector """
+
         constraints = [
             models.CheckConstraint(
                 check=models.Q(connector_file__in=ConnectorFiles),
-                name='connector_file_valid'
+                name="connector_file_valid",
             )
         ]
 
diff --git a/bookwyrm/models/favorite.py b/bookwyrm/models/favorite.py
index d34cbcba..7b72d175 100644
--- a/bookwyrm/models/favorite.py
+++ b/bookwyrm/models/favorite.py
@@ -1,4 +1,4 @@
-''' like/fav/star a status '''
+""" like/fav/star a status """
 from django.apps import apps
 from django.db import models
 from django.utils import timezone
@@ -9,50 +9,59 @@ from .base_model import BookWyrmModel
 from . import fields
 from .status import Status
 
+
 class Favorite(ActivityMixin, BookWyrmModel):
-    ''' fav'ing a post '''
+    """ fav'ing a post """
+
     user = fields.ForeignKey(
-        'User', on_delete=models.PROTECT, activitypub_field='actor')
+        "User", on_delete=models.PROTECT, activitypub_field="actor"
+    )
     status = fields.ForeignKey(
-        'Status', on_delete=models.PROTECT, activitypub_field='object')
+        "Status", on_delete=models.PROTECT, activitypub_field="object"
+    )
 
     activity_serializer = activitypub.Like
 
     @classmethod
     def ignore_activity(cls, activity):
-        ''' don't bother with incoming favs of unknown statuses '''
+        """ don't bother with incoming favs of unknown statuses """
         return not Status.objects.filter(remote_id=activity.object).exists()
 
     def save(self, *args, **kwargs):
-        ''' update user active time '''
+        """ update user active time """
         self.user.last_active_date = timezone.now()
         self.user.save(broadcast=False)
         super().save(*args, **kwargs)
 
         if self.status.user.local and self.status.user != self.user:
             notification_model = apps.get_model(
-                'bookwyrm.Notification', require_ready=True)
+                "bookwyrm.Notification", require_ready=True
+            )
             notification_model.objects.create(
                 user=self.status.user,
-                notification_type='FAVORITE',
+                notification_type="FAVORITE",
                 related_user=self.user,
-                related_status=self.status
+                related_status=self.status,
             )
 
     def delete(self, *args, **kwargs):
-        ''' delete and delete notifications '''
+        """ delete and delete notifications """
         # check for notification
         if self.status.user.local:
             notification_model = apps.get_model(
-                'bookwyrm.Notification', require_ready=True)
+                "bookwyrm.Notification", require_ready=True
+            )
             notification = notification_model.objects.filter(
-                user=self.status.user, related_user=self.user,
-                related_status=self.status, notification_type='FAVORITE'
+                user=self.status.user,
+                related_user=self.user,
+                related_status=self.status,
+                notification_type="FAVORITE",
             ).first()
             if notification:
                 notification.delete()
         super().delete(*args, **kwargs)
 
     class Meta:
-        ''' can't fav things twice '''
-        unique_together = ('user', 'status')
+        """ can't fav things twice """
+
+        unique_together = ("user", "status")
diff --git a/bookwyrm/models/federated_server.py b/bookwyrm/models/federated_server.py
index 953cd9c8..ce804310 100644
--- a/bookwyrm/models/federated_server.py
+++ b/bookwyrm/models/federated_server.py
@@ -1,15 +1,17 @@
-''' connections to external ActivityPub servers '''
+""" connections to external ActivityPub servers """
 from django.db import models
 from .base_model import BookWyrmModel
 
 
 class FederatedServer(BookWyrmModel):
-    ''' store which server's we federate with '''
+    """ store which server's we federate with """
+
     server_name = models.CharField(max_length=255, unique=True)
     # federated, blocked, whatever else
-    status = models.CharField(max_length=255, default='federated')
+    status = models.CharField(max_length=255, default="federated")
     # is it mastodon, bookwyrm, etc
     application_type = models.CharField(max_length=255, null=True)
     application_version = models.CharField(max_length=255, null=True)
 
+
 # TODO: blocked servers
diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py
index 4ea527eb..1ca0b377 100644
--- a/bookwyrm/models/fields.py
+++ b/bookwyrm/models/fields.py
@@ -1,4 +1,4 @@
-''' activitypub-aware django model fields '''
+""" activitypub-aware django model fields """
 from dataclasses import MISSING
 import re
 from uuid import uuid4
@@ -18,37 +18,43 @@ from bookwyrm.settings import DOMAIN
 
 
 def validate_remote_id(value):
-    ''' make sure the remote_id looks like a url '''
-    if not value or not re.match(r'^http.?:\/\/[^\s]+$', value):
+    """ make sure the remote_id looks like a url """
+    if not value or not re.match(r"^http.?:\/\/[^\s]+$", value):
         raise ValidationError(
-            _('%(value)s is not a valid remote_id'),
-            params={'value': value},
+            _("%(value)s is not a valid remote_id"),
+            params={"value": value},
         )
 
 
 def validate_localname(value):
-    ''' make sure localnames look okay '''
-    if not re.match(r'^[A-Za-z\-_\.0-9]+$', value):
+    """ make sure localnames look okay """
+    if not re.match(r"^[A-Za-z\-_\.0-9]+$", value):
         raise ValidationError(
-            _('%(value)s is not a valid username'),
-            params={'value': value},
+            _("%(value)s is not a valid username"),
+            params={"value": value},
         )
 
 
 def validate_username(value):
-    ''' make sure usernames look okay '''
-    if not re.match(r'^[A-Za-z\-_\.0-9]+@[A-Za-z\-_\.0-9]+\.[a-z]{2,}$', value):
+    """ make sure usernames look okay """
+    if not re.match(r"^[A-Za-z\-_\.0-9]+@[A-Za-z\-_\.0-9]+\.[a-z]{2,}$", value):
         raise ValidationError(
-            _('%(value)s is not a valid username'),
-            params={'value': value},
+            _("%(value)s is not a valid username"),
+            params={"value": value},
         )
 
 
 class ActivitypubFieldMixin:
-    ''' make a database field serializable '''
-    def __init__(self, *args, \
-                 activitypub_field=None, activitypub_wrapper=None,
-                 deduplication_field=False, **kwargs):
+    """ make a database field serializable """
+
+    def __init__(
+        self,
+        *args,
+        activitypub_field=None,
+        activitypub_wrapper=None,
+        deduplication_field=False,
+        **kwargs
+    ):
         self.deduplication_field = deduplication_field
         if activitypub_wrapper:
             self.activitypub_wrapper = activitypub_field
@@ -57,24 +63,22 @@ class ActivitypubFieldMixin:
             self.activitypub_field = activitypub_field
         super().__init__(*args, **kwargs)
 
-
     def set_field_from_activity(self, instance, data):
-        ''' helper function for assinging a value to the field '''
+        """ helper function for assinging a value to the field """
         try:
             value = getattr(data, self.get_activitypub_field())
         except AttributeError:
             # masssively hack-y workaround for boosts
-            if self.get_activitypub_field() != 'attributedTo':
+            if self.get_activitypub_field() != "attributedTo":
                 raise
-            value = getattr(data, 'actor')
+            value = getattr(data, "actor")
         formatted = self.field_from_activity(value)
         if formatted is None or formatted is MISSING:
             return
         setattr(instance, self.name, formatted)
 
-
     def set_activity_from_field(self, activity, instance):
-        ''' update the json object '''
+        """ update the json object """
         value = getattr(instance, self.name)
         formatted = self.field_to_activity(value)
         if formatted is None:
@@ -82,37 +86,37 @@ class ActivitypubFieldMixin:
 
         key = self.get_activitypub_field()
         # TODO: surely there's a better way
-        if instance.__class__.__name__ == 'Boost' and key == 'attributedTo':
-            key = 'actor'
+        if instance.__class__.__name__ == "Boost" and key == "attributedTo":
+            key = "actor"
         if isinstance(activity.get(key), list):
             activity[key] += formatted
         else:
             activity[key] = formatted
 
-
     def field_to_activity(self, value):
-        ''' formatter to convert a model value into activitypub '''
-        if hasattr(self, 'activitypub_wrapper'):
+        """ formatter to convert a model value into activitypub """
+        if hasattr(self, "activitypub_wrapper"):
             return {self.activitypub_wrapper: value}
         return value
 
     def field_from_activity(self, value):
-        ''' formatter to convert activitypub into a model value '''
-        if hasattr(self, 'activitypub_wrapper'):
+        """ formatter to convert activitypub into a model value """
+        if hasattr(self, "activitypub_wrapper"):
             value = value.get(self.activitypub_wrapper)
         return value
 
     def get_activitypub_field(self):
-        ''' model_field_name to activitypubFieldName '''
+        """ model_field_name to activitypubFieldName """
         if self.activitypub_field:
             return self.activitypub_field
-        name = self.name.split('.')[-1]
-        components = name.split('_')
-        return components[0] + ''.join(x.title() for x in components[1:])
+        name = self.name.split(".")[-1]
+        components = name.split("_")
+        return components[0] + "".join(x.title() for x in components[1:])
 
 
 class ActivitypubRelatedFieldMixin(ActivitypubFieldMixin):
-    ''' default (de)serialization for foreign key and one to one '''
+    """ default (de)serialization for foreign key and one to one """
+
     def __init__(self, *args, load_remote=True, **kwargs):
         self.load_remote = load_remote
         super().__init__(*args, **kwargs)
@@ -122,7 +126,7 @@ class ActivitypubRelatedFieldMixin(ActivitypubFieldMixin):
             return None
 
         related_model = self.related_model
-        if hasattr(value, 'id') and value.id:
+        if hasattr(value, "id") and value.id:
             if not self.load_remote:
                 # only look in the local database
                 return related_model.find_existing(value.serialize())
@@ -142,99 +146,98 @@ class ActivitypubRelatedFieldMixin(ActivitypubFieldMixin):
 
 
 class RemoteIdField(ActivitypubFieldMixin, models.CharField):
-    ''' a url that serves as a unique identifier '''
+    """ a url that serves as a unique identifier """
+
     def __init__(self, *args, max_length=255, validators=None, **kwargs):
         validators = validators or [validate_remote_id]
-        super().__init__(
-            *args, max_length=max_length, validators=validators,
-            **kwargs
-        )
+        super().__init__(*args, max_length=max_length, validators=validators, **kwargs)
         # for this field, the default is true. false everywhere else.
-        self.deduplication_field = kwargs.get('deduplication_field', True)
+        self.deduplication_field = kwargs.get("deduplication_field", True)
 
 
 class UsernameField(ActivitypubFieldMixin, models.CharField):
-    ''' activitypub-aware username field '''
-    def __init__(self, activitypub_field='preferredUsername', **kwargs):
+    """ activitypub-aware username field """
+
+    def __init__(self, activitypub_field="preferredUsername", **kwargs):
         self.activitypub_field = activitypub_field
         # I don't totally know why pylint is mad at this, but it makes it work
-        super( #pylint: disable=bad-super-call
-            ActivitypubFieldMixin, self
-        ).__init__(
-            _('username'),
+        super(ActivitypubFieldMixin, self).__init__(  # pylint: disable=bad-super-call
+            _("username"),
             max_length=150,
             unique=True,
             validators=[validate_username],
             error_messages={
-                'unique': _('A user with that username already exists.'),
+                "unique": _("A user with that username already exists."),
             },
         )
 
     def deconstruct(self):
-        ''' implementation of models.Field deconstruct '''
+        """ implementation of models.Field deconstruct """
         name, path, args, kwargs = super().deconstruct()
-        del kwargs['verbose_name']
-        del kwargs['max_length']
-        del kwargs['unique']
-        del kwargs['validators']
-        del kwargs['error_messages']
+        del kwargs["verbose_name"]
+        del kwargs["max_length"]
+        del kwargs["unique"]
+        del kwargs["validators"]
+        del kwargs["error_messages"]
         return name, path, args, kwargs
 
     def field_to_activity(self, value):
-        return value.split('@')[0]
+        return value.split("@")[0]
 
 
-PrivacyLevels = models.TextChoices('Privacy', [
-    'public',
-    'unlisted',
-    'followers',
-    'direct'
-])
+PrivacyLevels = models.TextChoices(
+    "Privacy", ["public", "unlisted", "followers", "direct"]
+)
+
 
 class PrivacyField(ActivitypubFieldMixin, models.CharField):
-    ''' this maps to two differente activitypub fields '''
-    public = 'https://www.w3.org/ns/activitystreams#Public'
+    """ this maps to two differente activitypub fields """
+
+    public = "https://www.w3.org/ns/activitystreams#Public"
+
     def __init__(self, *args, **kwargs):
         super().__init__(
-            *args, max_length=255,
-            choices=PrivacyLevels.choices, default='public')
+            *args, max_length=255, choices=PrivacyLevels.choices, default="public"
+        )
 
     def set_field_from_activity(self, instance, data):
         to = data.to
         cc = data.cc
         if to == [self.public]:
-            setattr(instance, self.name, 'public')
+            setattr(instance, self.name, "public")
         elif cc == []:
-            setattr(instance, self.name, 'direct')
+            setattr(instance, self.name, "direct")
         elif self.public in cc:
-            setattr(instance, self.name, 'unlisted')
+            setattr(instance, self.name, "unlisted")
         else:
-            setattr(instance, self.name, 'followers')
+            setattr(instance, self.name, "followers")
 
     def set_activity_from_field(self, activity, instance):
         # explicitly to anyone mentioned (statuses only)
         mentions = []
-        if hasattr(instance, 'mention_users'):
+        if hasattr(instance, "mention_users"):
             mentions = [u.remote_id for u in instance.mention_users.all()]
         # this is a link to the followers list
-        followers = instance.user.__class__._meta.get_field('followers')\
-                .field_to_activity(instance.user.followers)
-        if instance.privacy == 'public':
-            activity['to'] = [self.public]
-            activity['cc'] = [followers] + mentions
-        elif instance.privacy == 'unlisted':
-            activity['to'] = [followers]
-            activity['cc'] = [self.public] + mentions
-        elif instance.privacy == 'followers':
-            activity['to'] = [followers]
-            activity['cc'] = mentions
-        if instance.privacy == 'direct':
-            activity['to'] = mentions
-            activity['cc'] = []
+        followers = instance.user.__class__._meta.get_field(
+            "followers"
+        ).field_to_activity(instance.user.followers)
+        if instance.privacy == "public":
+            activity["to"] = [self.public]
+            activity["cc"] = [followers] + mentions
+        elif instance.privacy == "unlisted":
+            activity["to"] = [followers]
+            activity["cc"] = [self.public] + mentions
+        elif instance.privacy == "followers":
+            activity["to"] = [followers]
+            activity["cc"] = mentions
+        if instance.privacy == "direct":
+            activity["to"] = mentions
+            activity["cc"] = []
 
 
 class ForeignKey(ActivitypubRelatedFieldMixin, models.ForeignKey):
-    ''' activitypub-aware foreign key field '''
+    """ activitypub-aware foreign key field """
+
     def field_to_activity(self, value):
         if not value:
             return None
@@ -242,7 +245,8 @@ class ForeignKey(ActivitypubRelatedFieldMixin, models.ForeignKey):
 
 
 class OneToOneField(ActivitypubRelatedFieldMixin, models.OneToOneField):
-    ''' activitypub-aware foreign key field '''
+    """ activitypub-aware foreign key field """
+
     def field_to_activity(self, value):
         if not value:
             return None
@@ -250,13 +254,14 @@ class OneToOneField(ActivitypubRelatedFieldMixin, models.OneToOneField):
 
 
 class ManyToManyField(ActivitypubFieldMixin, models.ManyToManyField):
-    ''' activitypub-aware many to many field '''
+    """ activitypub-aware many to many field """
+
     def __init__(self, *args, link_only=False, **kwargs):
         self.link_only = link_only
         super().__init__(*args, **kwargs)
 
     def set_field_from_activity(self, instance, data):
-        ''' helper function for assinging a value to the field '''
+        """ helper function for assinging a value to the field """
         value = getattr(data, self.get_activitypub_field())
         formatted = self.field_from_activity(value)
         if formatted is None or formatted is MISSING:
@@ -266,7 +271,7 @@ class ManyToManyField(ActivitypubFieldMixin, models.ManyToManyField):
 
     def field_to_activity(self, value):
         if self.link_only:
-            return '%s/%s' % (value.instance.remote_id, self.name)
+            return "%s/%s" % (value.instance.remote_id, self.name)
         return [i.remote_id for i in value.all()]
 
     def field_from_activity(self, value):
@@ -279,29 +284,31 @@ class ManyToManyField(ActivitypubFieldMixin, models.ManyToManyField):
             except ValidationError:
                 continue
             items.append(
-                activitypub.resolve_remote_id(
-                    remote_id, model=self.related_model)
+                activitypub.resolve_remote_id(remote_id, model=self.related_model)
             )
         return items
 
 
 class TagField(ManyToManyField):
-    ''' special case of many to many that uses Tags '''
+    """ special case of many to many that uses Tags """
+
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.activitypub_field = 'tag'
+        self.activitypub_field = "tag"
 
     def field_to_activity(self, value):
         tags = []
         for item in value.all():
             activity_type = item.__class__.__name__
-            if activity_type == 'User':
-                activity_type = 'Mention'
-            tags.append(activitypub.Link(
-                href=item.remote_id,
-                name=getattr(item, item.name_field),
-                type=activity_type
-            ))
+            if activity_type == "User":
+                activity_type = "Mention"
+            tags.append(
+                activitypub.Link(
+                    href=item.remote_id,
+                    name=getattr(item, item.name_field),
+                    type=activity_type,
+                )
+            )
         return tags
 
     def field_from_activity(self, value):
@@ -310,38 +317,38 @@ class TagField(ManyToManyField):
         items = []
         for link_json in value:
             link = activitypub.Link(**link_json)
-            tag_type = link.type if link.type != 'Mention' else 'Person'
-            if tag_type == 'Book':
-                tag_type = 'Edition'
+            tag_type = link.type if link.type != "Mention" else "Person"
+            if tag_type == "Book":
+                tag_type = "Edition"
             if tag_type != self.related_model.activity_serializer.type:
                 # tags can contain multiple types
                 continue
             items.append(
-                activitypub.resolve_remote_id(
-                    link.href, model=self.related_model)
+                activitypub.resolve_remote_id(link.href, model=self.related_model)
             )
         return items
 
 
 def image_serializer(value, alt):
-    ''' helper for serializing images '''
-    if value and hasattr(value, 'url'):
+    """ helper for serializing images """
+    if value and hasattr(value, "url"):
         url = value.url
     else:
         return None
-    url = 'https://%s%s' % (DOMAIN, url)
+    url = "https://%s%s" % (DOMAIN, url)
     return activitypub.Image(url=url, name=alt)
 
 
 class ImageField(ActivitypubFieldMixin, models.ImageField):
-    ''' activitypub-aware image field '''
+    """ activitypub-aware image field """
+
     def __init__(self, *args, alt_field=None, **kwargs):
         self.alt_field = alt_field
         super().__init__(*args, **kwargs)
 
     # pylint: disable=arguments-differ
     def set_field_from_activity(self, instance, data, save=True):
-        ''' helper function for assinging a value to the field '''
+        """ helper function for assinging a value to the field """
         value = getattr(data, self.get_activitypub_field())
         formatted = self.field_from_activity(value)
         if formatted is None or formatted is MISSING:
@@ -358,16 +365,14 @@ class ImageField(ActivitypubFieldMixin, models.ImageField):
         key = self.get_activitypub_field()
         activity[key] = formatted
 
-
     def field_to_activity(self, value, alt=None):
         return image_serializer(value, alt)
 
-
     def field_from_activity(self, value):
         image_slug = value
         # when it's an inline image (User avatar/icon, Book cover), it's a json
         # blob, but when it's an attached image, it's just a url
-        if hasattr(image_slug, 'url'):
+        if hasattr(image_slug, "url"):
             url = image_slug.url
         elif isinstance(image_slug, str):
             url = image_slug
@@ -383,13 +388,14 @@ class ImageField(ActivitypubFieldMixin, models.ImageField):
         if not response:
             return None
 
-        image_name = str(uuid4()) + '.' + url.split('.')[-1]
+        image_name = str(uuid4()) + "." + url.split(".")[-1]
         image_content = ContentFile(response.content)
         return [image_name, image_content]
 
 
 class DateTimeField(ActivitypubFieldMixin, models.DateTimeField):
-    ''' activitypub-aware datetime field '''
+    """ activitypub-aware datetime field """
+
     def field_to_activity(self, value):
         if not value:
             return None
@@ -405,8 +411,10 @@ class DateTimeField(ActivitypubFieldMixin, models.DateTimeField):
         except (ParserError, TypeError):
             return None
 
+
 class HtmlField(ActivitypubFieldMixin, models.TextField):
-    ''' a text field for storing html '''
+    """ a text field for storing html """
+
     def field_from_activity(self, value):
         if not value or value == MISSING:
             return None
@@ -414,19 +422,25 @@ class HtmlField(ActivitypubFieldMixin, models.TextField):
         sanitizer.feed(value)
         return sanitizer.get_output()
 
+
 class ArrayField(ActivitypubFieldMixin, DjangoArrayField):
-    ''' activitypub-aware array field '''
+    """ activitypub-aware array field """
+
     def field_to_activity(self, value):
         return [str(i) for i in value]
 
+
 class CharField(ActivitypubFieldMixin, models.CharField):
-    ''' activitypub-aware char field '''
+    """ activitypub-aware char field """
+
 
 class TextField(ActivitypubFieldMixin, models.TextField):
-    ''' activitypub-aware text field '''
+    """ activitypub-aware text field """
+
 
 class BooleanField(ActivitypubFieldMixin, models.BooleanField):
-    ''' activitypub-aware boolean field '''
+    """ activitypub-aware boolean field """
+
 
 class IntegerField(ActivitypubFieldMixin, models.IntegerField):
-    ''' activitypub-aware boolean field '''
+    """ activitypub-aware boolean field """
diff --git a/bookwyrm/models/import_job.py b/bookwyrm/models/import_job.py
index ca05ddb0..31dccda8 100644
--- a/bookwyrm/models/import_job.py
+++ b/bookwyrm/models/import_job.py
@@ -1,4 +1,4 @@
-''' track progress of goodreads imports '''
+""" track progress of goodreads imports """
 import re
 import dateutil.parser
 
@@ -14,13 +14,14 @@ from .fields import PrivacyLevels
 
 # Mapping goodreads -> bookwyrm shelf titles.
 GOODREADS_SHELVES = {
-    'read': 'read',
-    'currently-reading': 'reading',
-    'to-read': 'to-read',
+    "read": "read",
+    "currently-reading": "reading",
+    "to-read": "to-read",
 }
 
+
 def unquote_string(text):
-    ''' resolve csv quote weirdness '''
+    """ resolve csv quote weirdness """
     match = re.match(r'="([^"]*)"', text)
     if match:
         return match.group(1)
@@ -28,63 +29,57 @@ def unquote_string(text):
 
 
 def construct_search_term(title, author):
-    ''' formulate a query for the data connector '''
+    """ formulate a query for the data connector """
     # Strip brackets (usually series title from search term)
-    title = re.sub(r'\s*\([^)]*\)\s*', '', title)
+    title = re.sub(r"\s*\([^)]*\)\s*", "", title)
     # Open library doesn't like including author initials in search term.
-    author = re.sub(r'(\w\.)+\s*', '', author)
+    author = re.sub(r"(\w\.)+\s*", "", author)
 
-    return ' '.join([title, author])
+    return " ".join([title, author])
 
 
 class ImportJob(models.Model):
-    ''' entry for a specific request for book data import '''
+    """ entry for a specific request for book data import """
+
     user = models.ForeignKey(User, on_delete=models.CASCADE)
     created_date = models.DateTimeField(default=timezone.now)
     task_id = models.CharField(max_length=100, null=True)
     include_reviews = models.BooleanField(default=True)
     complete = models.BooleanField(default=False)
     privacy = models.CharField(
-        max_length=255,
-        default='public',
-        choices=PrivacyLevels.choices
+        max_length=255, default="public", choices=PrivacyLevels.choices
     )
     retry = models.BooleanField(default=False)
 
     def save(self, *args, **kwargs):
-        ''' save and notify '''
+        """ save and notify """
         super().save(*args, **kwargs)
         if self.complete:
             notification_model = apps.get_model(
-                'bookwyrm.Notification', require_ready=True)
+                "bookwyrm.Notification", require_ready=True
+            )
             notification_model.objects.create(
                 user=self.user,
-                notification_type='IMPORT',
+                notification_type="IMPORT",
                 related_import=self,
             )
 
 
 class ImportItem(models.Model):
-    ''' a single line of a csv being imported '''
-    job = models.ForeignKey(
-        ImportJob,
-        on_delete=models.CASCADE,
-        related_name='items')
+    """ a single line of a csv being imported """
+
+    job = models.ForeignKey(ImportJob, on_delete=models.CASCADE, related_name="items")
     index = models.IntegerField()
     data = JSONField()
-    book = models.ForeignKey(
-        Book, on_delete=models.SET_NULL, null=True, blank=True)
+    book = models.ForeignKey(Book, on_delete=models.SET_NULL, null=True, blank=True)
     fail_reason = models.TextField(null=True)
 
     def resolve(self):
-        ''' try various ways to lookup a book '''
-        self.book = (
-            self.get_book_from_isbn() or
-            self.get_book_from_title_author()
-        )
+        """ try various ways to lookup a book """
+        self.book = self.get_book_from_isbn() or self.get_book_from_title_author()
 
     def get_book_from_isbn(self):
-        ''' search by isbn '''
+        """ search by isbn """
         search_result = connector_manager.first_search_result(
             self.isbn, min_confidence=0.999
         )
@@ -93,13 +88,9 @@ class ImportItem(models.Model):
             return search_result.connector.get_or_create_book(search_result.key)
         return None
 
-
     def get_book_from_title_author(self):
-        ''' search by title and author '''
-        search_term = construct_search_term(
-            self.title,
-            self.author
-        )
+        """ search by title and author """
+        search_term = construct_search_term(self.title, self.author)
         search_result = connector_manager.first_search_result(
             search_term, min_confidence=0.999
         )
@@ -108,84 +99,85 @@ class ImportItem(models.Model):
             return search_result.connector.get_or_create_book(search_result.key)
         return None
 
-
     @property
     def title(self):
-        ''' get the book title '''
-        return self.data['Title']
+        """ get the book title """
+        return self.data["Title"]
 
     @property
     def author(self):
-        ''' get the book title '''
-        return self.data['Author']
+        """ get the book title """
+        return self.data["Author"]
 
     @property
     def isbn(self):
-        ''' pulls out the isbn13 field from the csv line data '''
-        return unquote_string(self.data['ISBN13'])
+        """ pulls out the isbn13 field from the csv line data """
+        return unquote_string(self.data["ISBN13"])
 
     @property
     def shelf(self):
-        ''' the goodreads shelf field '''
-        if self.data['Exclusive Shelf']:
-            return GOODREADS_SHELVES.get(self.data['Exclusive Shelf'])
+        """ the goodreads shelf field """
+        if self.data["Exclusive Shelf"]:
+            return GOODREADS_SHELVES.get(self.data["Exclusive Shelf"])
         return None
 
     @property
     def review(self):
-        ''' a user-written review, to be imported with the book data '''
-        return self.data['My Review']
+        """ a user-written review, to be imported with the book data """
+        return self.data["My Review"]
 
     @property
     def rating(self):
-        ''' x/5 star rating for a book '''
-        return int(self.data['My Rating'])
+        """ x/5 star rating for a book """
+        return int(self.data["My Rating"])
 
     @property
     def date_added(self):
-        ''' when the book was added to this dataset '''
-        if self.data['Date Added']:
-            return timezone.make_aware(
-                dateutil.parser.parse(self.data['Date Added']))
+        """ when the book was added to this dataset """
+        if self.data["Date Added"]:
+            return timezone.make_aware(dateutil.parser.parse(self.data["Date Added"]))
         return None
 
     @property
     def date_started(self):
-        ''' when the book was started '''
-        if "Date Started" in self.data and self.data['Date Started']:
-            return timezone.make_aware(
-                dateutil.parser.parse(self.data['Date Started']))
+        """ when the book was started """
+        if "Date Started" in self.data and self.data["Date Started"]:
+            return timezone.make_aware(dateutil.parser.parse(self.data["Date Started"]))
         return None
 
     @property
     def date_read(self):
-        ''' the date a book was completed '''
-        if self.data['Date Read']:
-            return timezone.make_aware(
-                dateutil.parser.parse(self.data['Date Read']))
+        """ the date a book was completed """
+        if self.data["Date Read"]:
+            return timezone.make_aware(dateutil.parser.parse(self.data["Date Read"]))
         return None
 
     @property
     def reads(self):
-        ''' formats a read through dataset for the book in this line '''
+        """ formats a read through dataset for the book in this line """
         start_date = self.date_started
 
         # Goodreads special case (no 'date started' field)
-        if ((self.shelf == 'reading' or (self.shelf == 'read' and self.date_read))
-                and self.date_added and not start_date):
+        if (
+            (self.shelf == "reading" or (self.shelf == "read" and self.date_read))
+            and self.date_added
+            and not start_date
+        ):
             start_date = self.date_added
 
-        if (start_date and start_date is not None and not self.date_read):
+        if start_date and start_date is not None and not self.date_read:
             return [ReadThrough(start_date=start_date)]
         if self.date_read:
-            return [ReadThrough(
-                start_date=start_date,
-                finish_date=self.date_read,
-            )]
+            return [
+                ReadThrough(
+                    start_date=start_date,
+                    finish_date=self.date_read,
+                )
+            ]
         return []
 
     def __repr__(self):
-        return "<{!r}Item {!r}>".format(self.data['import_source'], self.data['Title'])
+        return "<{!r}Item {!r}>".format(self.data["import_source"], self.data["Title"])
 
     def __str__(self):
-        return "{} by {}".format(self.data['Title'], self.data['Author'])
+        return "{} by {}".format(self.data["Title"], self.data["Author"])
diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index 1b14c2aa..a05325f3 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -1,4 +1,4 @@
-''' make a list of books!! '''
+""" make a list of books!! """
 from django.apps import apps
 from django.db import models
 
@@ -9,86 +9,89 @@ from .base_model import BookWyrmModel
 from . import fields
 
 
-CurationType = models.TextChoices('Curation', [
-    'closed',
-    'open',
-    'curated',
-])
+CurationType = models.TextChoices(
+    "Curation",
+    [
+        "closed",
+        "open",
+        "curated",
+    ],
+)
+
 
 class List(OrderedCollectionMixin, BookWyrmModel):
-    ''' a list of books '''
+    """ a list of books """
+
     name = fields.CharField(max_length=100)
     user = fields.ForeignKey(
-        'User', on_delete=models.PROTECT, activitypub_field='owner')
-    description = fields.TextField(
-        blank=True, null=True, activitypub_field='summary')
+        "User", on_delete=models.PROTECT, activitypub_field="owner"
+    )
+    description = fields.TextField(blank=True, null=True, activitypub_field="summary")
     privacy = fields.PrivacyField()
     curation = fields.CharField(
-        max_length=255,
-        default='closed',
-        choices=CurationType.choices
+        max_length=255, default="closed", choices=CurationType.choices
     )
     books = models.ManyToManyField(
-        'Edition',
+        "Edition",
         symmetrical=False,
-        through='ListItem',
-        through_fields=('book_list', 'book'),
+        through="ListItem",
+        through_fields=("book_list", "book"),
     )
     activity_serializer = activitypub.BookList
 
     def get_remote_id(self):
-        ''' don't want the user to be in there in this case '''
-        return 'https://%s/list/%d' % (DOMAIN, self.id)
+        """ don't want the user to be in there in this case """
+        return "https://%s/list/%d" % (DOMAIN, self.id)
 
     @property
     def collection_queryset(self):
-        ''' list of books for this shelf, overrides OrderedCollectionMixin  '''
-        return self.books.filter(
-            listitem__approved=True
-        ).all().order_by('listitem')
+        """ list of books for this shelf, overrides OrderedCollectionMixin  """
+        return self.books.filter(listitem__approved=True).all().order_by("listitem")
 
     class Meta:
-        ''' default sorting '''
-        ordering = ('-updated_date',)
+        """ default sorting """
+
+        ordering = ("-updated_date",)
 
 
 class ListItem(CollectionItemMixin, BookWyrmModel):
-    ''' ok '''
+    """ ok """
+
     book = fields.ForeignKey(
-        'Edition', on_delete=models.PROTECT, activitypub_field='object')
+        "Edition", on_delete=models.PROTECT, activitypub_field="object"
+    )
     book_list = fields.ForeignKey(
-        'List', on_delete=models.CASCADE, activitypub_field='target')
+        "List", on_delete=models.CASCADE, activitypub_field="target"
+    )
     user = fields.ForeignKey(
-        'User',
-        on_delete=models.PROTECT,
-        activitypub_field='actor'
+        "User", on_delete=models.PROTECT, activitypub_field="actor"
     )
     notes = fields.TextField(blank=True, null=True)
     approved = models.BooleanField(default=True)
     order = fields.IntegerField(blank=True, null=True)
-    endorsement = models.ManyToManyField('User', related_name='endorsers')
+    endorsement = models.ManyToManyField("User", related_name="endorsers")
 
     activity_serializer = activitypub.Add
-    object_field = 'book'
-    collection_field = 'book_list'
+    object_field = "book"
+    collection_field = "book_list"
 
     def save(self, *args, **kwargs):
-        ''' create a notification too '''
+        """ create a notification too """
         created = not bool(self.id)
         super().save(*args, **kwargs)
         list_owner = self.book_list.user
         # create a notification if somoene ELSE added to a local user's list
         if created and list_owner.local and list_owner != self.user:
-            model = apps.get_model('bookwyrm.Notification', require_ready=True)
+            model = apps.get_model("bookwyrm.Notification", require_ready=True)
             model.objects.create(
                 user=list_owner,
                 related_user=self.user,
                 related_list_item=self,
-                notification_type='ADD',
+                notification_type="ADD",
             )
 
-
     class Meta:
-        ''' an opinionated constraint! you can't put a book on a list twice '''
-        unique_together = ('book', 'book_list')
-        ordering = ('-created_date',)
+        """ an opinionated constraint! you can't put a book on a list twice """
+
+        unique_together = ("book", "book_list")
+        ordering = ("-created_date",)
diff --git a/bookwyrm/models/notification.py b/bookwyrm/models/notification.py
index 0470b325..19018165 100644
--- a/bookwyrm/models/notification.py
+++ b/bookwyrm/models/notification.py
@@ -1,47 +1,50 @@
-''' alert a user to activity '''
+""" alert a user to activity """
 from django.db import models
 from .base_model import BookWyrmModel
 
 
 NotificationType = models.TextChoices(
-    'NotificationType',
-    'FAVORITE REPLY MENTION TAG FOLLOW FOLLOW_REQUEST BOOST IMPORT ADD')
+    "NotificationType",
+    "FAVORITE REPLY MENTION TAG FOLLOW FOLLOW_REQUEST BOOST IMPORT ADD",
+)
+
 
 class Notification(BookWyrmModel):
-    ''' you've been tagged, liked, followed, etc '''
-    user = models.ForeignKey('User', on_delete=models.CASCADE)
-    related_book = models.ForeignKey(
-        'Edition', on_delete=models.CASCADE, null=True)
+    """ you've been tagged, liked, followed, etc """
+
+    user = models.ForeignKey("User", on_delete=models.CASCADE)
+    related_book = models.ForeignKey("Edition", on_delete=models.CASCADE, null=True)
     related_user = models.ForeignKey(
-        'User',
-        on_delete=models.CASCADE, null=True, related_name='related_user')
-    related_status = models.ForeignKey(
-        'Status', on_delete=models.CASCADE, null=True)
-    related_import = models.ForeignKey(
-        'ImportJob', on_delete=models.CASCADE, null=True)
+        "User", on_delete=models.CASCADE, null=True, related_name="related_user"
+    )
+    related_status = models.ForeignKey("Status", on_delete=models.CASCADE, null=True)
+    related_import = models.ForeignKey("ImportJob", on_delete=models.CASCADE, null=True)
     related_list_item = models.ForeignKey(
-        'ListItem', on_delete=models.CASCADE, null=True)
+        "ListItem", on_delete=models.CASCADE, null=True
+    )
     read = models.BooleanField(default=False)
     notification_type = models.CharField(
-        max_length=255, choices=NotificationType.choices)
+        max_length=255, choices=NotificationType.choices
+    )
 
     def save(self, *args, **kwargs):
-        ''' save, but don't make dupes '''
+        """ save, but don't make dupes """
         # there's probably a better way to do this
         if self.__class__.objects.filter(
-                user=self.user,
-                related_book=self.related_book,
-                related_user=self.related_user,
-                related_status=self.related_status,
-                related_import=self.related_import,
-                related_list_item=self.related_list_item,
-                notification_type=self.notification_type,
-            ).exists():
+            user=self.user,
+            related_book=self.related_book,
+            related_user=self.related_user,
+            related_status=self.related_status,
+            related_import=self.related_import,
+            related_list_item=self.related_list_item,
+            notification_type=self.notification_type,
+        ).exists():
             return
         super().save(*args, **kwargs)
 
     class Meta:
-        ''' checks if notifcation is in enum list for valid types '''
+        """ checks if notifcation is in enum list for valid types """
+
         constraints = [
             models.CheckConstraint(
                 check=models.Q(notification_type__in=NotificationType.values),
diff --git a/bookwyrm/models/readthrough.py b/bookwyrm/models/readthrough.py
index 2bec3a81..3445573c 100644
--- a/bookwyrm/models/readthrough.py
+++ b/bookwyrm/models/readthrough.py
@@ -1,35 +1,32 @@
-''' progress in a book '''
+""" progress in a book """
 from django.db import models
 from django.utils import timezone
 from django.core import validators
 
 from .base_model import BookWyrmModel
 
+
 class ProgressMode(models.TextChoices):
-    PAGE = 'PG', 'page'
-    PERCENT = 'PCT', 'percent'
+    PAGE = "PG", "page"
+    PERCENT = "PCT", "percent"
+
 
 class ReadThrough(BookWyrmModel):
-    ''' Store a read through a book in the database. '''
-    user = models.ForeignKey('User', on_delete=models.PROTECT)
-    book = models.ForeignKey('Edition', on_delete=models.PROTECT)
+    """ Store a read through a book in the database. """
+
+    user = models.ForeignKey("User", on_delete=models.PROTECT)
+    book = models.ForeignKey("Edition", on_delete=models.PROTECT)
     progress = models.IntegerField(
-        validators=[validators.MinValueValidator(0)],
-        null=True,
-        blank=True)
+        validators=[validators.MinValueValidator(0)], null=True, blank=True
+    )
     progress_mode = models.CharField(
-        max_length=3,
-        choices=ProgressMode.choices,
-        default=ProgressMode.PAGE)
-    start_date = models.DateTimeField(
-        blank=True,
-        null=True)
-    finish_date = models.DateTimeField(
-        blank=True,
-        null=True)
+        max_length=3, choices=ProgressMode.choices, default=ProgressMode.PAGE
+    )
+    start_date = models.DateTimeField(blank=True, null=True)
+    finish_date = models.DateTimeField(blank=True, null=True)
 
     def save(self, *args, **kwargs):
-        ''' update user active time '''
+        """ update user active time """
         self.user.last_active_date = timezone.now()
         self.user.save(broadcast=False)
         super().save(*args, **kwargs)
@@ -37,22 +34,22 @@ class ReadThrough(BookWyrmModel):
     def create_update(self):
         if self.progress:
             return self.progressupdate_set.create(
-                user=self.user,
-                progress=self.progress,
-                mode=self.progress_mode)
+                user=self.user, progress=self.progress, mode=self.progress_mode
+            )
+
 
 class ProgressUpdate(BookWyrmModel):
-    ''' Store progress through a book in the database. '''
-    user = models.ForeignKey('User', on_delete=models.PROTECT)
-    readthrough = models.ForeignKey('ReadThrough', on_delete=models.CASCADE)
+    """ Store progress through a book in the database. """
+
+    user = models.ForeignKey("User", on_delete=models.PROTECT)
+    readthrough = models.ForeignKey("ReadThrough", on_delete=models.CASCADE)
     progress = models.IntegerField(validators=[validators.MinValueValidator(0)])
     mode = models.CharField(
-        max_length=3,
-        choices=ProgressMode.choices,
-        default=ProgressMode.PAGE)
+        max_length=3, choices=ProgressMode.choices, default=ProgressMode.PAGE
+    )
 
     def save(self, *args, **kwargs):
-        ''' update user active time '''
+        """ update user active time """
         self.user.last_active_date = timezone.now()
         self.user.save(broadcast=False)
         super().save(*args, **kwargs)
diff --git a/bookwyrm/models/relationship.py b/bookwyrm/models/relationship.py
index 3b0e85d4..df99d216 100644
--- a/bookwyrm/models/relationship.py
+++ b/bookwyrm/models/relationship.py
@@ -1,4 +1,4 @@
-''' defines relationships between users '''
+""" defines relationships between users """
 from django.apps import apps
 from django.db import models, transaction, IntegrityError
 from django.db.models import Q
@@ -11,71 +11,74 @@ from . import fields
 
 
 class UserRelationship(BookWyrmModel):
-    ''' many-to-many through table for followers '''
+    """ many-to-many through table for followers """
+
     user_subject = fields.ForeignKey(
-        'User',
+        "User",
         on_delete=models.PROTECT,
-        related_name='%(class)s_user_subject',
-        activitypub_field='actor',
+        related_name="%(class)s_user_subject",
+        activitypub_field="actor",
     )
     user_object = fields.ForeignKey(
-        'User',
+        "User",
         on_delete=models.PROTECT,
-        related_name='%(class)s_user_object',
-        activitypub_field='object',
+        related_name="%(class)s_user_object",
+        activitypub_field="object",
     )
 
     @property
     def privacy(self):
-        ''' all relationships are handled directly with the participants '''
-        return 'direct'
+        """ all relationships are handled directly with the participants """
+        return "direct"
 
     @property
     def recipients(self):
-        ''' the remote user needs to recieve direct broadcasts '''
+        """ the remote user needs to recieve direct broadcasts """
         return [u for u in [self.user_subject, self.user_object] if not u.local]
 
     class Meta:
-        ''' relationships should be unique '''
+        """ relationships should be unique """
+
         abstract = True
         constraints = [
             models.UniqueConstraint(
-                fields=['user_subject', 'user_object'],
-                name='%(class)s_unique'
+                fields=["user_subject", "user_object"], name="%(class)s_unique"
             ),
             models.CheckConstraint(
-                check=~models.Q(user_subject=models.F('user_object')),
-                name='%(class)s_no_self'
-            )
+                check=~models.Q(user_subject=models.F("user_object")),
+                name="%(class)s_no_self",
+            ),
         ]
 
-    def get_remote_id(self, status=None):# pylint: disable=arguments-differ
-        ''' use shelf identifier in remote_id '''
-        status = status or 'follows'
+    def get_remote_id(self, status=None):  # pylint: disable=arguments-differ
+        """ use shelf identifier in remote_id """
+        status = status or "follows"
         base_path = self.user_subject.remote_id
-        return '%s#%s/%d' % (base_path, status, self.id)
+        return "%s#%s/%d" % (base_path, status, self.id)
 
 
 class UserFollows(ActivityMixin, UserRelationship):
-    ''' Following a user '''
-    status = 'follows'
+    """ Following a user """
+
+    status = "follows"
 
     def to_activity(self):
-        ''' overrides default to manually set serializer '''
+        """ overrides default to manually set serializer """
         return activitypub.Follow(**generate_activity(self))
 
     def save(self, *args, **kwargs):
-        ''' really really don't let a user follow someone who blocked them '''
+        """ really really don't let a user follow someone who blocked them """
         # blocking in either direction is a no-go
         if UserBlocks.objects.filter(
-                Q(
-                    user_subject=self.user_subject,
-                    user_object=self.user_object,
-                ) | Q(
-                    user_subject=self.user_object,
-                    user_object=self.user_subject,
-                )
-            ).exists():
+            Q(
+                user_subject=self.user_subject,
+                user_object=self.user_object,
+            )
+            | Q(
+                user_subject=self.user_object,
+                user_object=self.user_subject,
+            )
+        ).exists():
             raise IntegrityError()
         # don't broadcast this type of relationship -- accepts and requests
         # are handled by the UserFollowRequest model
@@ -83,7 +86,7 @@ class UserFollows(ActivityMixin, UserRelationship):
 
     @classmethod
     def from_request(cls, follow_request):
-        ''' converts a follow request into a follow relationship '''
+        """ converts a follow request into a follow relationship """
         return cls.objects.create(
             user_subject=follow_request.user_subject,
             user_object=follow_request.user_object,
@@ -92,28 +95,30 @@ class UserFollows(ActivityMixin, UserRelationship):
 
 
 class UserFollowRequest(ActivitypubMixin, UserRelationship):
-    ''' following a user requires manual or automatic confirmation '''
-    status = 'follow_request'
+    """ following a user requires manual or automatic confirmation """
+
+    status = "follow_request"
     activity_serializer = activitypub.Follow
 
     def save(self, *args, broadcast=True, **kwargs):
-        ''' make sure the follow or block relationship doesn't already exist '''
+        """ make sure the follow or block relationship doesn't already exist """
         # don't create a request if a follow already exists
         if UserFollows.objects.filter(
-                user_subject=self.user_subject,
-                user_object=self.user_object,
-            ).exists():
+            user_subject=self.user_subject,
+            user_object=self.user_object,
+        ).exists():
             raise IntegrityError()
         # blocking in either direction is a no-go
         if UserBlocks.objects.filter(
-                Q(
-                    user_subject=self.user_subject,
-                    user_object=self.user_object,
-                ) | Q(
-                    user_subject=self.user_object,
-                    user_object=self.user_subject,
-                )
-            ).exists():
+            Q(
+                user_subject=self.user_subject,
+                user_object=self.user_object,
+            )
+            | Q(
+                user_subject=self.user_object,
+                user_object=self.user_subject,
+            )
+        ).exists():
             raise IntegrityError()
         super().save(*args, **kwargs)
 
@@ -125,39 +130,35 @@ class UserFollowRequest(ActivitypubMixin, UserRelationship):
             if not manually_approves:
                 self.accept()
 
-            model = apps.get_model('bookwyrm.Notification', require_ready=True)
-            notification_type = 'FOLLOW_REQUEST' if \
-                    manually_approves else 'FOLLOW'
+            model = apps.get_model("bookwyrm.Notification", require_ready=True)
+            notification_type = "FOLLOW_REQUEST" if manually_approves else "FOLLOW"
             model.objects.create(
                 user=self.user_object,
                 related_user=self.user_subject,
                 notification_type=notification_type,
             )
 
-
     def accept(self):
-        ''' turn this request into the real deal'''
+        """ turn this request into the real deal"""
         user = self.user_object
         if not self.user_subject.local:
             activity = activitypub.Accept(
-                id=self.get_remote_id(status='accepts'),
+                id=self.get_remote_id(status="accepts"),
                 actor=self.user_object.remote_id,
-                object=self.to_activity()
+                object=self.to_activity(),
             ).serialize()
             self.broadcast(activity, user)
         with transaction.atomic():
             UserFollows.from_request(self)
             self.delete()
 
-
-
     def reject(self):
-        ''' generate a Reject for this follow request '''
+        """ generate a Reject for this follow request """
         if self.user_object.local:
             activity = activitypub.Reject(
-                id=self.get_remote_id(status='rejects'),
+                id=self.get_remote_id(status="rejects"),
                 actor=self.user_object.remote_id,
-                object=self.to_activity()
+                object=self.to_activity(),
             ).serialize()
             self.broadcast(activity, self.user_object)
 
@@ -165,19 +166,20 @@ class UserFollowRequest(ActivitypubMixin, UserRelationship):
 
 
 class UserBlocks(ActivityMixin, UserRelationship):
-    ''' prevent another user from following you and seeing your posts '''
-    status = 'blocks'
+    """ prevent another user from following you and seeing your posts """
+
+    status = "blocks"
     activity_serializer = activitypub.Block
 
     def save(self, *args, **kwargs):
-        ''' remove follow or follow request rels after a block is created '''
+        """ remove follow or follow request rels after a block is created """
         super().save(*args, **kwargs)
 
         UserFollows.objects.filter(
-            Q(user_subject=self.user_subject, user_object=self.user_object) | \
-            Q(user_subject=self.user_object, user_object=self.user_subject)
+            Q(user_subject=self.user_subject, user_object=self.user_object)
+            | Q(user_subject=self.user_object, user_object=self.user_subject)
         ).delete()
         UserFollowRequest.objects.filter(
-            Q(user_subject=self.user_subject, user_object=self.user_object) | \
-            Q(user_subject=self.user_object, user_object=self.user_subject)
+            Q(user_subject=self.user_subject, user_object=self.user_object)
+            | Q(user_subject=self.user_object, user_object=self.user_subject)
         ).delete()
diff --git a/bookwyrm/models/shelf.py b/bookwyrm/models/shelf.py
index dfb8b9b3..965541a2 100644
--- a/bookwyrm/models/shelf.py
+++ b/bookwyrm/models/shelf.py
@@ -1,4 +1,4 @@
-''' puttin' books on shelves '''
+""" puttin' books on shelves """
 import re
 from django.db import models
 
@@ -9,61 +9,68 @@ from . import fields
 
 
 class Shelf(OrderedCollectionMixin, BookWyrmModel):
-    ''' a list of books owned by a user '''
+    """ a list of books owned by a user """
+
     name = fields.CharField(max_length=100)
     identifier = models.CharField(max_length=100)
     user = fields.ForeignKey(
-        'User', on_delete=models.PROTECT, activitypub_field='owner')
+        "User", on_delete=models.PROTECT, activitypub_field="owner"
+    )
     editable = models.BooleanField(default=True)
     privacy = fields.PrivacyField()
     books = models.ManyToManyField(
-        'Edition',
+        "Edition",
         symmetrical=False,
-        through='ShelfBook',
-        through_fields=('shelf', 'book')
+        through="ShelfBook",
+        through_fields=("shelf", "book"),
     )
 
     activity_serializer = activitypub.Shelf
 
     def save(self, *args, **kwargs):
-        ''' set the identifier '''
+        """ set the identifier """
         super().save(*args, **kwargs)
         if not self.identifier:
-            slug = re.sub(r'[^\w]', '', self.name).lower()
-            self.identifier = '%s-%d' % (slug, self.id)
+            slug = re.sub(r"[^\w]", "", self.name).lower()
+            self.identifier = "%s-%d" % (slug, self.id)
             super().save(*args, **kwargs)
 
     @property
     def collection_queryset(self):
-        ''' list of books for this shelf, overrides OrderedCollectionMixin  '''
-        return self.books.all().order_by('shelfbook')
+        """ list of books for this shelf, overrides OrderedCollectionMixin  """
+        return self.books.all().order_by("shelfbook")
 
     def get_remote_id(self):
-        ''' shelf identifier instead of id '''
+        """ shelf identifier instead of id """
         base_path = self.user.remote_id
-        return '%s/shelf/%s' % (base_path, self.identifier)
+        return "%s/shelf/%s" % (base_path, self.identifier)
 
     class Meta:
-        ''' user/shelf unqiueness '''
-        unique_together = ('user', 'identifier')
+        """ user/shelf unqiueness """
+
+        unique_together = ("user", "identifier")
 
 
 class ShelfBook(CollectionItemMixin, BookWyrmModel):
-    ''' many to many join table for books and shelves '''
+    """ many to many join table for books and shelves """
+
     book = fields.ForeignKey(
-        'Edition', on_delete=models.PROTECT, activitypub_field='object')
+        "Edition", on_delete=models.PROTECT, activitypub_field="object"
+    )
     shelf = fields.ForeignKey(
-        'Shelf', on_delete=models.PROTECT, activitypub_field='target')
+        "Shelf", on_delete=models.PROTECT, activitypub_field="target"
+    )
     user = fields.ForeignKey(
-        'User', on_delete=models.PROTECT, activitypub_field='actor')
+        "User", on_delete=models.PROTECT, activitypub_field="actor"
+    )
 
     activity_serializer = activitypub.Add
-    object_field = 'book'
-    collection_field = 'shelf'
-
+    object_field = "book"
+    collection_field = "shelf"
 
     class Meta:
-        ''' an opinionated constraint!
-            you can't put a book on shelf twice '''
-        unique_together = ('book', 'shelf')
-        ordering = ('-created_date',)
+        """an opinionated constraint!
+        you can't put a book on shelf twice"""
+
+        unique_together = ("book", "shelf")
+        ordering = ("-created_date",)
diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py
index d39718b3..7fde6781 100644
--- a/bookwyrm/models/site.py
+++ b/bookwyrm/models/site.py
@@ -1,4 +1,4 @@
-''' the particulars for this instance of BookWyrm '''
+""" the particulars for this instance of BookWyrm """
 import base64
 import datetime
 
@@ -9,36 +9,31 @@ from django.utils import timezone
 from bookwyrm.settings import DOMAIN
 from .user import User
 
+
 class SiteSettings(models.Model):
-    ''' customized settings for this instance '''
-    name = models.CharField(default='BookWyrm', max_length=100)
+    """ customized settings for this instance """
+
+    name = models.CharField(default="BookWyrm", max_length=100)
     instance_tagline = models.CharField(
-        max_length=150, default='Social Reading and Reviewing')
-    instance_description = models.TextField(
-        default='This instance has no description.')
+        max_length=150, default="Social Reading and Reviewing"
+    )
+    instance_description = models.TextField(default="This instance has no description.")
     registration_closed_text = models.TextField(
-        default='Contact an administrator to get an invite')
-    code_of_conduct = models.TextField(
-        default='Add a code of conduct here.')
-    privacy_policy = models.TextField(
-        default='Add a privacy policy here.')
+        default="Contact an administrator to get an invite"
+    )
+    code_of_conduct = models.TextField(default="Add a code of conduct here.")
+    privacy_policy = models.TextField(default="Add a privacy policy here.")
     allow_registration = models.BooleanField(default=True)
-    logo = models.ImageField(
-        upload_to='logos/', null=True, blank=True
-    )
-    logo_small = models.ImageField(
-        upload_to='logos/', null=True, blank=True
-    )
-    favicon = models.ImageField(
-        upload_to='logos/', null=True, blank=True
-    )
+    logo = models.ImageField(upload_to="logos/", null=True, blank=True)
+    logo_small = models.ImageField(upload_to="logos/", null=True, blank=True)
+    favicon = models.ImageField(upload_to="logos/", null=True, blank=True)
     support_link = models.CharField(max_length=255, null=True, blank=True)
     support_title = models.CharField(max_length=100, null=True, blank=True)
     admin_email = models.EmailField(max_length=255, null=True, blank=True)
 
     @classmethod
     def get(cls):
-        ''' gets the site settings db entry or defaults '''
+        """ gets the site settings db entry or defaults """
         try:
             return cls.objects.get(id=1)
         except cls.DoesNotExist:
@@ -46,12 +41,15 @@ class SiteSettings(models.Model):
             default_settings.save()
             return default_settings
 
+
 def new_access_code():
-    ''' the identifier for a user invite '''
-    return base64.b32encode(Random.get_random_bytes(5)).decode('ascii')
+    """ the identifier for a user invite """
+    return base64.b32encode(Random.get_random_bytes(5)).decode("ascii")
+
 
 class SiteInvite(models.Model):
-    ''' gives someone access to create an account on the instance '''
+    """ gives someone access to create an account on the instance """
+
     created_date = models.DateTimeField(auto_now_add=True)
     code = models.CharField(max_length=32, default=new_access_code)
     expiry = models.DateTimeField(blank=True, null=True)
@@ -60,34 +58,35 @@ class SiteInvite(models.Model):
     user = models.ForeignKey(User, on_delete=models.CASCADE)
 
     def valid(self):
-        ''' make sure it hasn't expired or been used '''
-        return (
-            (self.expiry is None or self.expiry > timezone.now()) and
-            (self.use_limit is None or self.times_used < self.use_limit))
+        """ make sure it hasn't expired or been used """
+        return (self.expiry is None or self.expiry > timezone.now()) and (
+            self.use_limit is None or self.times_used < self.use_limit
+        )
 
     @property
     def link(self):
-        ''' formats the invite link '''
-        return 'https://{}/invite/{}'.format(DOMAIN, self.code)
+        """ formats the invite link """
+        return "https://{}/invite/{}".format(DOMAIN, self.code)
 
 
 def get_passowrd_reset_expiry():
-    ''' give people a limited time to use the link '''
+    """ give people a limited time to use the link """
     now = timezone.now()
     return now + datetime.timedelta(days=1)
 
 
 class PasswordReset(models.Model):
-    ''' gives someone access to create an account on the instance '''
+    """ gives someone access to create an account on the instance """
+
     code = models.CharField(max_length=32, default=new_access_code)
     expiry = models.DateTimeField(default=get_passowrd_reset_expiry)
     user = models.OneToOneField(User, on_delete=models.CASCADE)
 
     def valid(self):
-        ''' make sure it hasn't expired or been used '''
+        """ make sure it hasn't expired or been used """
         return self.expiry > timezone.now()
 
     @property
     def link(self):
-        ''' formats the invite link '''
-        return 'https://{}/password-reset/{}'.format(DOMAIN, self.code)
+        """ formats the invite link """
+        return "https://{}/password-reset/{}".format(DOMAIN, self.code)
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index ba9727f5..c18afd1b 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -1,4 +1,4 @@
-''' models for storing different kinds of Activities '''
+""" models for storing different kinds of Activities """
 from dataclasses import MISSING
 import re
 
@@ -17,76 +17,81 @@ from . import fields
 
 
 class Status(OrderedCollectionPageMixin, BookWyrmModel):
-    ''' any post, like a reply to a review, etc '''
+    """ any post, like a reply to a review, etc """
+
     user = fields.ForeignKey(
-        'User', on_delete=models.PROTECT, activitypub_field='attributedTo')
+        "User", on_delete=models.PROTECT, activitypub_field="attributedTo"
+    )
     content = fields.HtmlField(blank=True, null=True)
-    mention_users = fields.TagField('User', related_name='mention_user')
-    mention_books = fields.TagField('Edition', related_name='mention_book')
+    mention_users = fields.TagField("User", related_name="mention_user")
+    mention_books = fields.TagField("Edition", related_name="mention_book")
     local = models.BooleanField(default=True)
     content_warning = fields.CharField(
-        max_length=500, blank=True, null=True, activitypub_field='summary')
+        max_length=500, blank=True, null=True, activitypub_field="summary"
+    )
     privacy = fields.PrivacyField(max_length=255)
     sensitive = fields.BooleanField(default=False)
     # created date is different than publish date because of federated posts
     published_date = fields.DateTimeField(
-        default=timezone.now, activitypub_field='published')
+        default=timezone.now, activitypub_field="published"
+    )
     deleted = models.BooleanField(default=False)
     deleted_date = models.DateTimeField(blank=True, null=True)
     favorites = models.ManyToManyField(
-        'User',
+        "User",
         symmetrical=False,
-        through='Favorite',
-        through_fields=('status', 'user'),
-        related_name='user_favorites'
+        through="Favorite",
+        through_fields=("status", "user"),
+        related_name="user_favorites",
     )
     reply_parent = fields.ForeignKey(
-        'self',
+        "self",
         null=True,
         on_delete=models.PROTECT,
-        activitypub_field='inReplyTo',
+        activitypub_field="inReplyTo",
     )
     objects = InheritanceManager()
 
     activity_serializer = activitypub.Note
-    serialize_reverse_fields = [('attachments', 'attachment', 'id')]
-    deserialize_reverse_fields = [('attachments', 'attachment')]
-
+    serialize_reverse_fields = [("attachments", "attachment", "id")]
+    deserialize_reverse_fields = [("attachments", "attachment")]
 
     def save(self, *args, **kwargs):
-        ''' save and notify '''
+        """ save and notify """
         super().save(*args, **kwargs)
 
-        notification_model = apps.get_model(
-            'bookwyrm.Notification', require_ready=True)
+        notification_model = apps.get_model("bookwyrm.Notification", require_ready=True)
 
         if self.deleted:
             notification_model.objects.filter(related_status=self).delete()
 
-        if self.reply_parent and self.reply_parent.user != self.user and \
-                self.reply_parent.user.local:
+        if (
+            self.reply_parent
+            and self.reply_parent.user != self.user
+            and self.reply_parent.user.local
+        ):
             notification_model.objects.create(
                 user=self.reply_parent.user,
-                notification_type='REPLY',
+                notification_type="REPLY",
                 related_user=self.user,
                 related_status=self,
             )
         for mention_user in self.mention_users.all():
             # avoid double-notifying about this status
-            if not mention_user.local or \
-                    (self.reply_parent and \
-                     mention_user == self.reply_parent.user):
+            if not mention_user.local or (
+                self.reply_parent and mention_user == self.reply_parent.user
+            ):
                 continue
             notification_model.objects.create(
                 user=mention_user,
-                notification_type='MENTION',
+                notification_type="MENTION",
                 related_user=self.user,
                 related_status=self,
             )
 
-    def delete(self, *args, **kwargs):#pylint: disable=unused-argument
-        ''' "delete" a status '''
-        if hasattr(self, 'boosted_status'):
+    def delete(self, *args, **kwargs):  # pylint: disable=unused-argument
+        """ "delete" a status """
+        if hasattr(self, "boosted_status"):
             # okay but if it's a boost really delete it
             super().delete(*args, **kwargs)
             return
@@ -96,141 +101,154 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
 
     @property
     def recipients(self):
-        ''' tagged users who definitely need to get this status in broadcast '''
+        """ tagged users who definitely need to get this status in broadcast """
         mentions = [u for u in self.mention_users.all() if not u.local]
-        if hasattr(self, 'reply_parent') and self.reply_parent \
-                and not self.reply_parent.user.local:
+        if (
+            hasattr(self, "reply_parent")
+            and self.reply_parent
+            and not self.reply_parent.user.local
+        ):
             mentions.append(self.reply_parent.user)
         return list(set(mentions))
 
     @classmethod
     def ignore_activity(cls, activity):
-        ''' keep notes if they are replies to existing statuses '''
-        if activity.type == 'Announce':
+        """ keep notes if they are replies to existing statuses """
+        if activity.type == "Announce":
             # keep it if the booster or the boosted are local
             boosted = activitypub.resolve_remote_id(activity.object, save=False)
             return cls.ignore_activity(boosted.to_activity_dataclass())
 
         # keep if it if it's a custom type
-        if activity.type != 'Note':
+        if activity.type != "Note":
             return False
-        if cls.objects.filter(
-                remote_id=activity.inReplyTo).exists():
+        if cls.objects.filter(remote_id=activity.inReplyTo).exists():
             return False
 
         # keep notes if they mention local users
         if activity.tag == MISSING or activity.tag is None:
             return True
-        tags = [l['href'] for l in activity.tag if l['type'] == 'Mention']
-        user_model = apps.get_model('bookwyrm.User', require_ready=True)
+        tags = [l["href"] for l in activity.tag if l["type"] == "Mention"]
+        user_model = apps.get_model("bookwyrm.User", require_ready=True)
         for tag in tags:
-            if user_model.objects.filter(
-                    remote_id=tag, local=True).exists():
+            if user_model.objects.filter(remote_id=tag, local=True).exists():
                 # we found a mention of a known use boost
                 return False
         return True
 
     @classmethod
     def replies(cls, status):
-        ''' load all replies to a status. idk if there's a better way
-            to write this so it's just a property '''
-        return cls.objects.filter(
-            reply_parent=status
-        ).select_subclasses().order_by('published_date')
+        """load all replies to a status. idk if there's a better way
+        to write this so it's just a property"""
+        return (
+            cls.objects.filter(reply_parent=status)
+            .select_subclasses()
+            .order_by("published_date")
+        )
 
     @property
     def status_type(self):
-        ''' expose the type of status for the ui using activity type '''
+        """ expose the type of status for the ui using activity type """
         return self.activity_serializer.__name__
 
     @property
     def boostable(self):
-        ''' you can't boost dms '''
-        return self.privacy in ['unlisted', 'public']
+        """ you can't boost dms """
+        return self.privacy in ["unlisted", "public"]
 
     def to_replies(self, **kwargs):
-        ''' helper function for loading AP serialized replies to a status '''
+        """ helper function for loading AP serialized replies to a status """
         return self.to_ordered_collection(
             self.replies(self),
-            remote_id='%s/replies' % self.remote_id,
+            remote_id="%s/replies" % self.remote_id,
             collection_only=True,
             **kwargs
         ).serialize()
 
-    def to_activity_dataclass(self, pure=False):# pylint: disable=arguments-differ
-        ''' return tombstone if the status is deleted '''
+    def to_activity_dataclass(self, pure=False):  # pylint: disable=arguments-differ
+        """ return tombstone if the status is deleted """
         if self.deleted:
             return activitypub.Tombstone(
                 id=self.remote_id,
                 url=self.remote_id,
                 deleted=self.deleted_date.isoformat(),
-                published=self.deleted_date.isoformat()
+                published=self.deleted_date.isoformat(),
             )
         activity = ActivitypubMixin.to_activity_dataclass(self)
         activity.replies = self.to_replies()
 
         # "pure" serialization for non-bookwyrm instances
-        if pure and hasattr(self, 'pure_content'):
+        if pure and hasattr(self, "pure_content"):
             activity.content = self.pure_content
-            if hasattr(activity, 'name'):
+            if hasattr(activity, "name"):
                 activity.name = self.pure_name
             activity.type = self.pure_type
             activity.attachment = [
-                image_serializer(b.cover, b.alt_text) \
-                    for b in self.mention_books.all()[:4] if b.cover]
-            if hasattr(self, 'book') and self.book.cover:
+                image_serializer(b.cover, b.alt_text)
+                for b in self.mention_books.all()[:4]
+                if b.cover
+            ]
+            if hasattr(self, "book") and self.book.cover:
                 activity.attachment.append(
                     image_serializer(self.book.cover, self.book.alt_text)
                 )
         return activity
 
-    def to_activity(self, pure=False):# pylint: disable=arguments-differ
-        ''' json serialized activitypub class '''
+    def to_activity(self, pure=False):  # pylint: disable=arguments-differ
+        """ json serialized activitypub class """
         return self.to_activity_dataclass(pure=pure).serialize()
 
 
 class GeneratedNote(Status):
-    ''' these are app-generated messages about user activity '''
+    """ these are app-generated messages about user activity """
+
     @property
     def pure_content(self):
-        ''' indicate the book in question for mastodon (or w/e) users '''
+        """ indicate the book in question for mastodon (or w/e) users """
         message = self.content
-        books = ', '.join(
-            '<a href="%s">"%s"</a>' % (book.remote_id, book.title) \
+        books = ", ".join(
+            '<a href="%s">"%s"</a>' % (book.remote_id, book.title)
             for book in self.mention_books.all()
         )
-        return '%s %s %s' % (self.user.display_name, message, books)
+        return "%s %s %s" % (self.user.display_name, message, books)
 
     activity_serializer = activitypub.GeneratedNote
-    pure_type = 'Note'
+    pure_type = "Note"
 
 
 class Comment(Status):
-    ''' like a review but without a rating and transient '''
+    """ like a review but without a rating and transient """
+
     book = fields.ForeignKey(
-        'Edition', on_delete=models.PROTECT, activitypub_field='inReplyToBook')
+        "Edition", on_delete=models.PROTECT, activitypub_field="inReplyToBook"
+    )
 
     @property
     def pure_content(self):
-        ''' indicate the book in question for mastodon (or w/e) users '''
-        return '%s<p>(comment on <a href="%s">"%s"</a>)</p>' % \
-                (self.content, self.book.remote_id, self.book.title)
+        """ indicate the book in question for mastodon (or w/e) users """
+        return '%s<p>(comment on <a href="%s">"%s"</a>)</p>' % (
+            self.content,
+            self.book.remote_id,
+            self.book.title,
+        )
 
     activity_serializer = activitypub.Comment
-    pure_type = 'Note'
+    pure_type = "Note"
 
 
 class Quotation(Status):
-    ''' like a review but without a rating and transient '''
+    """ like a review but without a rating and transient """
+
     quote = fields.HtmlField()
     book = fields.ForeignKey(
-        'Edition', on_delete=models.PROTECT, activitypub_field='inReplyToBook')
+        "Edition", on_delete=models.PROTECT, activitypub_field="inReplyToBook"
+    )
 
     @property
     def pure_content(self):
-        ''' indicate the book in question for mastodon (or w/e) users '''
-        quote = re.sub(r'^<p>', '<p>"', self.quote)
-        quote = re.sub(r'</p>$', '"</p>', quote)
+        """ indicate the book in question for mastodon (or w/e) users """
+        quote = re.sub(r"^<p>", '<p>"', self.quote)
+        quote = re.sub(r"</p>$", '"</p>', quote)
         return '%s <p>-- <a href="%s">"%s"</a></p>%s' % (
             quote,
             self.book.remote_id,
@@ -239,90 +257,86 @@ class Quotation(Status):
         )
 
     activity_serializer = activitypub.Quotation
-    pure_type = 'Note'
+    pure_type = "Note"
 
 
 class Review(Status):
-    ''' a book review '''
+    """ a book review """
+
     name = fields.CharField(max_length=255, null=True)
     book = fields.ForeignKey(
-        'Edition', on_delete=models.PROTECT, activitypub_field='inReplyToBook')
+        "Edition", on_delete=models.PROTECT, activitypub_field="inReplyToBook"
+    )
     rating = fields.IntegerField(
         default=None,
         null=True,
         blank=True,
-        validators=[MinValueValidator(1), MaxValueValidator(5)]
+        validators=[MinValueValidator(1), MaxValueValidator(5)],
     )
 
     @property
     def pure_name(self):
-        ''' clarify review names for mastodon serialization '''
+        """ clarify review names for mastodon serialization """
         if self.rating:
-            #pylint: disable=bad-string-format-type
+            # pylint: disable=bad-string-format-type
             return 'Review of "%s" (%d stars): %s' % (
                 self.book.title,
                 self.rating,
-                self.name
+                self.name,
             )
-        return 'Review of "%s": %s' % (
-            self.book.title,
-            self.name
-        )
+        return 'Review of "%s": %s' % (self.book.title, self.name)
 
     @property
     def pure_content(self):
-        ''' indicate the book in question for mastodon (or w/e) users '''
+        """ indicate the book in question for mastodon (or w/e) users """
         return self.content
 
     activity_serializer = activitypub.Review
-    pure_type = 'Article'
+    pure_type = "Article"
 
 
 class Boost(ActivityMixin, Status):
-    ''' boost'ing a post '''
+    """ boost'ing a post """
+
     boosted_status = fields.ForeignKey(
-        'Status',
+        "Status",
         on_delete=models.PROTECT,
-        related_name='boosters',
-        activitypub_field='object',
+        related_name="boosters",
+        activitypub_field="object",
     )
     activity_serializer = activitypub.Announce
 
     def save(self, *args, **kwargs):
-        ''' save and notify '''
+        """ save and notify """
         super().save(*args, **kwargs)
         if not self.boosted_status.user.local:
             return
 
-        notification_model = apps.get_model(
-            'bookwyrm.Notification', require_ready=True)
+        notification_model = apps.get_model("bookwyrm.Notification", require_ready=True)
         notification_model.objects.create(
             user=self.boosted_status.user,
             related_status=self.boosted_status,
             related_user=self.user,
-            notification_type='BOOST',
+            notification_type="BOOST",
         )
 
     def delete(self, *args, **kwargs):
-        ''' delete and un-notify '''
-        notification_model = apps.get_model(
-            'bookwyrm.Notification', require_ready=True)
+        """ delete and un-notify """
+        notification_model = apps.get_model("bookwyrm.Notification", require_ready=True)
         notification_model.objects.filter(
             user=self.boosted_status.user,
             related_status=self.boosted_status,
             related_user=self.user,
-            notification_type='BOOST',
+            notification_type="BOOST",
         ).delete()
         super().delete(*args, **kwargs)
 
-
     def __init__(self, *args, **kwargs):
-        ''' the user field is "actor" here instead of "attributedTo" '''
+        """ the user field is "actor" here instead of "attributedTo" """
         super().__init__(*args, **kwargs)
 
-        reserve_fields = ['user', 'boosted_status']
-        self.simple_fields = [f for f in self.simple_fields if \
-                f.name in reserve_fields]
+        reserve_fields = ["user", "boosted_status"]
+        self.simple_fields = [f for f in self.simple_fields if f.name in reserve_fields]
         self.activity_fields = self.simple_fields
         self.many_to_many_fields = []
         self.image_fields = []
diff --git a/bookwyrm/models/tag.py b/bookwyrm/models/tag.py
index 83359170..2c45b8f9 100644
--- a/bookwyrm/models/tag.py
+++ b/bookwyrm/models/tag.py
@@ -1,4 +1,4 @@
-''' models for storing different kinds of Activities '''
+""" models for storing different kinds of Activities """
 import urllib.parse
 
 from django.apps import apps
@@ -12,28 +12,30 @@ from . import fields
 
 
 class Tag(OrderedCollectionMixin, BookWyrmModel):
-    ''' freeform tags for books '''
+    """ freeform tags for books """
+
     name = fields.CharField(max_length=100, unique=True)
     identifier = models.CharField(max_length=100)
 
     @property
     def books(self):
-        ''' count of books associated with this tag '''
-        edition_model = apps.get_model('bookwyrm.Edition', require_ready=True)
-        return edition_model.objects.filter(
-            usertag__tag__identifier=self.identifier
-        ).order_by('-created_date').distinct()
+        """ count of books associated with this tag """
+        edition_model = apps.get_model("bookwyrm.Edition", require_ready=True)
+        return (
+            edition_model.objects.filter(usertag__tag__identifier=self.identifier)
+            .order_by("-created_date")
+            .distinct()
+        )
 
     collection_queryset = books
 
     def get_remote_id(self):
-        ''' tag should use identifier not id in remote_id '''
-        base_path = 'https://%s' % DOMAIN
-        return '%s/tag/%s' % (base_path, self.identifier)
-
+        """ tag should use identifier not id in remote_id """
+        base_path = "https://%s" % DOMAIN
+        return "%s/tag/%s" % (base_path, self.identifier)
 
     def save(self, *args, **kwargs):
-        ''' create a url-safe lookup key for the tag '''
+        """ create a url-safe lookup key for the tag """
         if not self.id:
             # add identifiers to new tags
             self.identifier = urllib.parse.quote_plus(self.name)
@@ -41,18 +43,21 @@ class Tag(OrderedCollectionMixin, BookWyrmModel):
 
 
 class UserTag(CollectionItemMixin, BookWyrmModel):
-    ''' an instance of a tag on a book by a user '''
+    """ an instance of a tag on a book by a user """
+
     user = fields.ForeignKey(
-        'User', on_delete=models.PROTECT, activitypub_field='actor')
+        "User", on_delete=models.PROTECT, activitypub_field="actor"
+    )
     book = fields.ForeignKey(
-        'Edition', on_delete=models.PROTECT, activitypub_field='object')
-    tag = fields.ForeignKey(
-        'Tag', on_delete=models.PROTECT, activitypub_field='target')
+        "Edition", on_delete=models.PROTECT, activitypub_field="object"
+    )
+    tag = fields.ForeignKey("Tag", on_delete=models.PROTECT, activitypub_field="target")
 
     activity_serializer = activitypub.Add
-    object_field = 'book'
-    collection_field = 'tag'
+    object_field = "book"
+    collection_field = "tag"
 
     class Meta:
-        ''' unqiueness constraint '''
-        unique_together = ('user', 'book', 'tag')
+        """ unqiueness constraint """
+
+        unique_together = ("user", "book", "tag")
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index bbeb10cc..440b65d3 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -1,4 +1,4 @@
-''' database schema for user data '''
+""" database schema for user data """
 import re
 from urllib.parse import urlparse
 
@@ -23,25 +23,28 @@ from . import fields, Review
 
 
 class User(OrderedCollectionPageMixin, AbstractUser):
-    ''' a user who wants to read books '''
+    """ a user who wants to read books """
+
     username = fields.UsernameField()
     email = models.EmailField(unique=True, null=True)
 
     key_pair = fields.OneToOneField(
-        'KeyPair',
+        "KeyPair",
         on_delete=models.CASCADE,
-        blank=True, null=True,
-        activitypub_field='publicKey',
-        related_name='owner'
+        blank=True,
+        null=True,
+        activitypub_field="publicKey",
+        related_name="owner",
     )
     inbox = fields.RemoteIdField(unique=True)
     shared_inbox = fields.RemoteIdField(
-        activitypub_field='sharedInbox',
-        activitypub_wrapper='endpoints',
+        activitypub_field="sharedInbox",
+        activitypub_wrapper="endpoints",
         deduplication_field=False,
-        null=True)
+        null=True,
+    )
     federated_server = models.ForeignKey(
-        'FederatedServer',
+        "FederatedServer",
         on_delete=models.PROTECT,
         null=True,
         blank=True,
@@ -59,54 +62,58 @@ class User(OrderedCollectionPageMixin, AbstractUser):
     # name is your display name, which you can change at will
     name = fields.CharField(max_length=100, null=True, blank=True)
     avatar = fields.ImageField(
-        upload_to='avatars/', blank=True, null=True,
-        activitypub_field='icon', alt_field='alt_text')
+        upload_to="avatars/",
+        blank=True,
+        null=True,
+        activitypub_field="icon",
+        alt_field="alt_text",
+    )
     followers = fields.ManyToManyField(
-        'self',
+        "self",
         link_only=True,
         symmetrical=False,
-        through='UserFollows',
-        through_fields=('user_object', 'user_subject'),
-        related_name='following'
+        through="UserFollows",
+        through_fields=("user_object", "user_subject"),
+        related_name="following",
     )
     follow_requests = models.ManyToManyField(
-        'self',
+        "self",
         symmetrical=False,
-        through='UserFollowRequest',
-        through_fields=('user_subject', 'user_object'),
-        related_name='follower_requests'
+        through="UserFollowRequest",
+        through_fields=("user_subject", "user_object"),
+        related_name="follower_requests",
     )
     blocks = models.ManyToManyField(
-        'self',
+        "self",
         symmetrical=False,
-        through='UserBlocks',
-        through_fields=('user_subject', 'user_object'),
-        related_name='blocked_by'
+        through="UserBlocks",
+        through_fields=("user_subject", "user_object"),
+        related_name="blocked_by",
     )
     favorites = models.ManyToManyField(
-        'Status',
+        "Status",
         symmetrical=False,
-        through='Favorite',
-        through_fields=('user', 'status'),
-        related_name='favorite_statuses'
+        through="Favorite",
+        through_fields=("user", "status"),
+        related_name="favorite_statuses",
     )
-    remote_id = fields.RemoteIdField(
-        null=True, unique=True, activitypub_field='id')
+    remote_id = fields.RemoteIdField(null=True, unique=True, activitypub_field="id")
     created_date = models.DateTimeField(auto_now_add=True)
     updated_date = models.DateTimeField(auto_now=True)
     last_active_date = models.DateTimeField(auto_now=True)
     manually_approves_followers = fields.BooleanField(default=False)
 
-    name_field = 'username'
+    name_field = "username"
+
     @property
     def alt_text(self):
-        ''' alt text with username '''
-        return 'avatar for %s' % (self.localname or self.username)
+        """ alt text with username """
+        return "avatar for %s" % (self.localname or self.username)
 
     @property
     def display_name(self):
-        ''' show the cleanest version of the user's name possible '''
-        if self.name and self.name != '':
+        """ show the cleanest version of the user's name possible """
+        if self.name and self.name != "":
             return self.name
         return self.localname or self.username
 
@@ -114,78 +121,82 @@ class User(OrderedCollectionPageMixin, AbstractUser):
 
     @classmethod
     def viewer_aware_objects(cls, viewer):
-        ''' the user queryset filtered for the context of the logged in user '''
+        """ the user queryset filtered for the context of the logged in user """
         queryset = cls.objects.filter(is_active=True)
         if viewer.is_authenticated:
-            queryset = queryset.exclude(
-                blocks=viewer
-            )
+            queryset = queryset.exclude(blocks=viewer)
         return queryset
 
     def to_outbox(self, filter_type=None, **kwargs):
-        ''' an ordered collection of statuses '''
+        """ an ordered collection of statuses """
         if filter_type:
             filter_class = apps.get_model(
-                'bookwyrm.%s' % filter_type, require_ready=True)
+                "bookwyrm.%s" % filter_type, require_ready=True
+            )
             if not issubclass(filter_class, Status):
                 raise TypeError(
-                    'filter_status_class must be a subclass of models.Status')
+                    "filter_status_class must be a subclass of models.Status"
+                )
             queryset = filter_class.objects
         else:
             queryset = Status.objects
 
-        queryset = queryset.filter(
-            user=self,
-            deleted=False,
-            privacy__in=['public', 'unlisted'],
-        ).select_subclasses().order_by('-published_date')
-        return self.to_ordered_collection(queryset, \
-            collection_only=True, remote_id=self.outbox, **kwargs).serialize()
+        queryset = (
+            queryset.filter(
+                user=self,
+                deleted=False,
+                privacy__in=["public", "unlisted"],
+            )
+            .select_subclasses()
+            .order_by("-published_date")
+        )
+        return self.to_ordered_collection(
+            queryset, collection_only=True, remote_id=self.outbox, **kwargs
+        ).serialize()
 
     def to_following_activity(self, **kwargs):
-        ''' activitypub following list '''
-        remote_id = '%s/following' % self.remote_id
+        """ activitypub following list """
+        remote_id = "%s/following" % self.remote_id
         return self.to_ordered_collection(
-            self.following.order_by('-updated_date').all(),
+            self.following.order_by("-updated_date").all(),
             remote_id=remote_id,
             id_only=True,
             **kwargs
         )
 
     def to_followers_activity(self, **kwargs):
-        ''' activitypub followers list '''
-        remote_id = '%s/followers' % self.remote_id
+        """ activitypub followers list """
+        remote_id = "%s/followers" % self.remote_id
         return self.to_ordered_collection(
-            self.followers.order_by('-updated_date').all(),
+            self.followers.order_by("-updated_date").all(),
             remote_id=remote_id,
             id_only=True,
             **kwargs
         )
 
     def to_activity(self):
-        ''' override default AP serializer to add context object
-            idk if this is the best way to go about this '''
+        """override default AP serializer to add context object
+        idk if this is the best way to go about this"""
         activity_object = super().to_activity()
-        activity_object['@context'] = [
-            'https://www.w3.org/ns/activitystreams',
-            'https://w3id.org/security/v1',
+        activity_object["@context"] = [
+            "https://www.w3.org/ns/activitystreams",
+            "https://w3id.org/security/v1",
             {
-                'manuallyApprovesFollowers': 'as:manuallyApprovesFollowers',
-                'schema': 'http://schema.org#',
-                'PropertyValue': 'schema:PropertyValue',
-                'value': 'schema:value',
-            }
+                "manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
+                "schema": "http://schema.org#",
+                "PropertyValue": "schema:PropertyValue",
+                "value": "schema:value",
+            },
         ]
         return activity_object
 
-
     def save(self, *args, **kwargs):
-        ''' populate fields for new local users '''
+        """ populate fields for new local users """
         created = not bool(self.id)
         if not self.local and not re.match(regex.full_username, self.username):
             # generate a username that uses the domain (webfinger format)
             actor_parts = urlparse(self.remote_id)
-            self.username = '%s@%s' % (self.username, actor_parts.netloc)
+            self.username = "%s@%s" % (self.username, actor_parts.netloc)
             super().save(*args, **kwargs)
 
         # this user already exists, no need to populate fields
@@ -200,114 +211,120 @@ class User(OrderedCollectionPageMixin, AbstractUser):
             return
 
         # populate fields for local users
-        self.remote_id = 'https://%s/user/%s' % (DOMAIN, self.localname)
-        self.inbox = '%s/inbox' % self.remote_id
-        self.shared_inbox = 'https://%s/inbox' % DOMAIN
-        self.outbox = '%s/outbox' % self.remote_id
+        self.remote_id = "https://%s/user/%s" % (DOMAIN, self.localname)
+        self.inbox = "%s/inbox" % self.remote_id
+        self.shared_inbox = "https://%s/inbox" % DOMAIN
+        self.outbox = "%s/outbox" % self.remote_id
 
         # an id needs to be set before we can proceed with related models
         super().save(*args, **kwargs)
 
         # make users editors by default
         try:
-            self.groups.add(Group.objects.get(name='editor'))
+            self.groups.add(Group.objects.get(name="editor"))
         except Group.DoesNotExist:
             # this should only happen in tests
             pass
 
         # create keys and shelves for new local users
         self.key_pair = KeyPair.objects.create(
-            remote_id='%s/#main-key' % self.remote_id)
+            remote_id="%s/#main-key" % self.remote_id
+        )
         self.save(broadcast=False)
 
-        shelves = [{
-            'name': 'To Read',
-            'identifier': 'to-read',
-        }, {
-            'name': 'Currently Reading',
-            'identifier': 'reading',
-        }, {
-            'name': 'Read',
-            'identifier': 'read',
-        }]
+        shelves = [
+            {
+                "name": "To Read",
+                "identifier": "to-read",
+            },
+            {
+                "name": "Currently Reading",
+                "identifier": "reading",
+            },
+            {
+                "name": "Read",
+                "identifier": "read",
+            },
+        ]
 
         for shelf in shelves:
             Shelf(
-                name=shelf['name'],
-                identifier=shelf['identifier'],
+                name=shelf["name"],
+                identifier=shelf["identifier"],
                 user=self,
-                editable=False
+                editable=False,
             ).save(broadcast=False)
 
     @property
     def local_path(self):
-        ''' this model doesn't inherit bookwyrm model, so here we are '''
-        return '/user/%s' % (self.localname or self.username)
+        """ this model doesn't inherit bookwyrm model, so here we are """
+        return "/user/%s" % (self.localname or self.username)
 
 
 class KeyPair(ActivitypubMixin, BookWyrmModel):
-    ''' public and private keys for a user '''
+    """ public and private keys for a user """
+
     private_key = models.TextField(blank=True, null=True)
     public_key = fields.TextField(
-        blank=True, null=True, activitypub_field='publicKeyPem')
+        blank=True, null=True, activitypub_field="publicKeyPem"
+    )
 
     activity_serializer = activitypub.PublicKey
-    serialize_reverse_fields = [('owner', 'owner', 'id')]
+    serialize_reverse_fields = [("owner", "owner", "id")]
 
     def get_remote_id(self):
         # self.owner is set by the OneToOneField on User
-        return '%s/#main-key' % self.owner.remote_id
+        return "%s/#main-key" % self.owner.remote_id
 
     def save(self, *args, **kwargs):
-        ''' create a key pair '''
+        """ create a key pair """
         # no broadcasting happening here
-        if 'broadcast' in kwargs:
-            del kwargs['broadcast']
+        if "broadcast" in kwargs:
+            del kwargs["broadcast"]
         if not self.public_key:
             self.private_key, self.public_key = create_key_pair()
         return super().save(*args, **kwargs)
 
     def to_activity(self):
-        ''' override default AP serializer to add context object
-            idk if this is the best way to go about this '''
+        """override default AP serializer to add context object
+        idk if this is the best way to go about this"""
         activity_object = super().to_activity()
-        del activity_object['@context']
-        del activity_object['type']
+        del activity_object["@context"]
+        del activity_object["type"]
         return activity_object
 
 
 class AnnualGoal(BookWyrmModel):
-    ''' set a goal for how many books you read in a year '''
-    user = models.ForeignKey('User', on_delete=models.PROTECT)
-    goal = models.IntegerField(
-        validators=[MinValueValidator(1)]
-    )
+    """ set a goal for how many books you read in a year """
+
+    user = models.ForeignKey("User", on_delete=models.PROTECT)
+    goal = models.IntegerField(validators=[MinValueValidator(1)])
     year = models.IntegerField(default=timezone.now().year)
     privacy = models.CharField(
-        max_length=255,
-        default='public',
-        choices=fields.PrivacyLevels.choices
+        max_length=255, default="public", choices=fields.PrivacyLevels.choices
     )
 
     class Meta:
-        ''' unqiueness constraint '''
-        unique_together = ('user', 'year')
+        """ unqiueness constraint """
+
+        unique_together = ("user", "year")
 
     def get_remote_id(self):
-        ''' put the year in the path '''
-        return '%s/goal/%d' % (self.user.remote_id, self.year)
+        """ put the year in the path """
+        return "%s/goal/%d" % (self.user.remote_id, self.year)
 
     @property
     def books(self):
-        ''' the books you've read this year '''
-        return self.user.readthrough_set.filter(
-            finish_date__year__gte=self.year
-        ).order_by('-finish_date').all()
-
+        """ the books you've read this year """
+        return (
+            self.user.readthrough_set.filter(finish_date__year__gte=self.year)
+            .order_by("-finish_date")
+            .all()
+        )
 
     @property
     def ratings(self):
-        ''' ratings for books read this year '''
+        """ ratings for books read this year """
         book_ids = [r.book.id for r in self.books]
         reviews = Review.objects.filter(
             user=self.user,
@@ -315,55 +332,50 @@ class AnnualGoal(BookWyrmModel):
         )
         return {r.book.id: r.rating for r in reviews}
 
-
     @property
     def progress_percent(self):
-        ''' how close to your goal, in percent form '''
+        """ how close to your goal, in percent form """
         return int(float(self.book_count / self.goal) * 100)
 
-
     @property
     def book_count(self):
-        ''' how many books you've read this year '''
+        """ how many books you've read this year """
         return self.user.readthrough_set.filter(
-            finish_date__year__gte=self.year).count()
+            finish_date__year__gte=self.year
+        ).count()
 
 
 @app.task
 def set_remote_server(user_id):
-    ''' figure out the user's remote server in the background '''
+    """ figure out the user's remote server in the background """
     user = User.objects.get(id=user_id)
     actor_parts = urlparse(user.remote_id)
-    user.federated_server = \
-        get_or_create_remote_server(actor_parts.netloc)
+    user.federated_server = get_or_create_remote_server(actor_parts.netloc)
     user.save(broadcast=False)
     if user.bookwyrm_user:
         get_remote_reviews.delay(user.outbox)
 
 
 def get_or_create_remote_server(domain):
-    ''' get info on a remote server '''
+    """ get info on a remote server """
     try:
-        return FederatedServer.objects.get(
-            server_name=domain
-        )
+        return FederatedServer.objects.get(server_name=domain)
     except FederatedServer.DoesNotExist:
         pass
 
     try:
-        data = get_data('https://%s/.well-known/nodeinfo' % domain)
+        data = get_data("https://%s/.well-known/nodeinfo" % domain)
         try:
-            nodeinfo_url = data.get('links')[0].get('href')
+            nodeinfo_url = data.get("links")[0].get("href")
         except (TypeError, KeyError):
             raise ConnectorException()
 
         data = get_data(nodeinfo_url)
-        application_type = data.get('software', {}).get('name')
-        application_version = data.get('software', {}).get('version')
+        application_type = data.get("software", {}).get("name")
+        application_version = data.get("software", {}).get("version")
     except ConnectorException:
         application_type = application_version = None
 
-
     server = FederatedServer.objects.create(
         server_name=domain,
         application_type=application_type,
@@ -374,12 +386,12 @@ def get_or_create_remote_server(domain):
 
 @app.task
 def get_remote_reviews(outbox):
-    ''' ingest reviews by a new remote bookwyrm user '''
-    outbox_page = outbox + '?page=true&type=Review'
+    """ ingest reviews by a new remote bookwyrm user """
+    outbox_page = outbox + "?page=true&type=Review"
     data = get_data(outbox_page)
 
     # TODO: pagination?
-    for activity in data['orderedItems']:
-        if not activity['type'] == 'Review':
+    for activity in data["orderedItems"]:
+        if not activity["type"] == "Review":
             continue
         activitypub.Review(**activity).to_model()
diff --git a/bookwyrm/sanitize_html.py b/bookwyrm/sanitize_html.py
index be7fb56f..2a630f83 100644
--- a/bookwyrm/sanitize_html.py
+++ b/bookwyrm/sanitize_html.py
@@ -1,56 +1,63 @@
-''' html parser to clean up incoming text from unknown sources '''
+""" html parser to clean up incoming text from unknown sources """
 from html.parser import HTMLParser
 
-class InputHtmlParser(HTMLParser):#pylint: disable=abstract-method
-    ''' Removes any html that isn't allowed_tagsed from a block '''
+
+class InputHtmlParser(HTMLParser):  # pylint: disable=abstract-method
+    """ Removes any html that isn't allowed_tagsed from a block """
 
     def __init__(self):
         HTMLParser.__init__(self)
         self.allowed_tags = [
-            'p', 'blockquote', 'br',
-            'b', 'i', 'strong', 'em', 'pre',
-            'a', 'span', 'ul', 'ol', 'li'
+            "p",
+            "blockquote",
+            "br",
+            "b",
+            "i",
+            "strong",
+            "em",
+            "pre",
+            "a",
+            "span",
+            "ul",
+            "ol",
+            "li",
         ]
         self.tag_stack = []
         self.output = []
         # if the html appears invalid, we just won't allow any at all
         self.allow_html = True
 
-
     def handle_starttag(self, tag, attrs):
-        ''' check if the tag is valid '''
+        """ check if the tag is valid """
         if self.allow_html and tag in self.allowed_tags:
-            self.output.append(('tag', self.get_starttag_text()))
+            self.output.append(("tag", self.get_starttag_text()))
             self.tag_stack.append(tag)
         else:
-            self.output.append(('data', ''))
-
+            self.output.append(("data", ""))
 
     def handle_endtag(self, tag):
-        ''' keep the close tag '''
+        """ keep the close tag """
         if not self.allow_html or tag not in self.allowed_tags:
-            self.output.append(('data', ''))
+            self.output.append(("data", ""))
             return
 
         if not self.tag_stack or self.tag_stack[-1] != tag:
             # the end tag doesn't match the most recent start tag
             self.allow_html = False
-            self.output.append(('data', ''))
+            self.output.append(("data", ""))
             return
 
         self.tag_stack = self.tag_stack[:-1]
-        self.output.append(('tag', '</%s>' % tag))
-
+        self.output.append(("tag", "</%s>" % tag))
 
     def handle_data(self, data):
-        ''' extract the answer, if we're in an answer tag '''
-        self.output.append(('data', data))
-
+        """ extract the answer, if we're in an answer tag """
+        self.output.append(("data", data))
 
     def get_output(self):
-        ''' convert the output from a list of tuples to a string '''
+        """ convert the output from a list of tuples to a string """
         if self.tag_stack:
             self.allow_html = False
         if not self.allow_html:
-            return ''.join(v for (k, v) in self.output if k == 'data')
-        return ''.join(v for (k, v) in self.output)
+            return "".join(v for (k, v) in self.output if k == "data")
+        return "".join(v for (k, v) in self.output)
diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 45fdbd9d..bcff5828 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -1,4 +1,4 @@
-''' bookwyrm settings and configuration '''
+""" bookwyrm settings and configuration """
 import os
 from environs import Env
 
@@ -7,129 +7,129 @@ from django.utils.translation import gettext_lazy as _
 
 
 env = Env()
-DOMAIN = env('DOMAIN')
-VERSION = '0.0.1'
+DOMAIN = env("DOMAIN")
+VERSION = "0.0.1"
 
-PAGE_LENGTH = env('PAGE_LENGTH', 15)
+PAGE_LENGTH = env("PAGE_LENGTH", 15)
 
 # celery
-CELERY_BROKER = env('CELERY_BROKER')
-CELERY_RESULT_BACKEND = env('CELERY_RESULT_BACKEND')
-CELERY_ACCEPT_CONTENT = ['application/json']
-CELERY_TASK_SERIALIZER = 'json'
-CELERY_RESULT_SERIALIZER = 'json'
+CELERY_BROKER = env("CELERY_BROKER")
+CELERY_RESULT_BACKEND = env("CELERY_RESULT_BACKEND")
+CELERY_ACCEPT_CONTENT = ["application/json"]
+CELERY_TASK_SERIALIZER = "json"
+CELERY_RESULT_SERIALIZER = "json"
 
 # email
-EMAIL_HOST = env('EMAIL_HOST')
-EMAIL_PORT = env('EMAIL_PORT', 587)
-EMAIL_HOST_USER = env('EMAIL_HOST_USER')
-EMAIL_HOST_PASSWORD = env('EMAIL_HOST_PASSWORD')
-EMAIL_USE_TLS = env('EMAIL_USE_TLS', True)
+EMAIL_HOST = env("EMAIL_HOST")
+EMAIL_PORT = env("EMAIL_PORT", 587)
+EMAIL_HOST_USER = env("EMAIL_HOST_USER")
+EMAIL_HOST_PASSWORD = env("EMAIL_HOST_PASSWORD")
+EMAIL_USE_TLS = env("EMAIL_USE_TLS", True)
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-LOCALE_PATHS = [os.path.join(BASE_DIR, 'locale'),]
+LOCALE_PATHS = [
+    os.path.join(BASE_DIR, "locale"),
+]
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/2.0/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = env('SECRET_KEY')
+SECRET_KEY = env("SECRET_KEY")
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = env.bool('DEBUG', True)
+DEBUG = env.bool("DEBUG", True)
 
-ALLOWED_HOSTS = env.list('ALLOWED_HOSTS', ['*'])
-OL_URL = env('OL_URL')
+ALLOWED_HOSTS = env.list("ALLOWED_HOSTS", ["*"])
+OL_URL = env("OL_URL")
 
 # Application definition
 
 INSTALLED_APPS = [
-    'django.contrib.admin',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    'django.contrib.humanize',
-    'django_rename_app',
-    'bookwyrm',
-    'celery',
+    "django.contrib.admin",
+    "django.contrib.auth",
+    "django.contrib.contenttypes",
+    "django.contrib.sessions",
+    "django.contrib.messages",
+    "django.contrib.staticfiles",
+    "django.contrib.humanize",
+    "django_rename_app",
+    "bookwyrm",
+    "celery",
 ]
 
 MIDDLEWARE = [
-    'django.middleware.security.SecurityMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.locale.LocaleMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    "django.middleware.security.SecurityMiddleware",
+    "django.contrib.sessions.middleware.SessionMiddleware",
+    "django.middleware.locale.LocaleMiddleware",
+    "django.middleware.common.CommonMiddleware",
+    "django.middleware.csrf.CsrfViewMiddleware",
+    "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "django.contrib.messages.middleware.MessageMiddleware",
+    "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]
 
-ROOT_URLCONF = 'bookwyrm.urls'
+ROOT_URLCONF = "bookwyrm.urls"
 
 TEMPLATES = [
     {
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': ['templates'],
-        'APP_DIRS': True,
-        'OPTIONS': {
-            'context_processors': [
-                'django.template.context_processors.debug',
-                'django.template.context_processors.request',
-                'django.contrib.auth.context_processors.auth',
-                'django.contrib.messages.context_processors.messages',
-                'bookwyrm.context_processors.site_settings',
+        "BACKEND": "django.template.backends.django.DjangoTemplates",
+        "DIRS": ["templates"],
+        "APP_DIRS": True,
+        "OPTIONS": {
+            "context_processors": [
+                "django.template.context_processors.debug",
+                "django.template.context_processors.request",
+                "django.contrib.auth.context_processors.auth",
+                "django.contrib.messages.context_processors.messages",
+                "bookwyrm.context_processors.site_settings",
             ],
         },
     },
 ]
 
 
-WSGI_APPLICATION = 'bookwyrm.wsgi.application'
+WSGI_APPLICATION = "bookwyrm.wsgi.application"
 
 
 # Database
 # https://docs.djangoproject.com/en/2.0/ref/settings/#databases
 
-BOOKWYRM_DATABASE_BACKEND = env('BOOKWYRM_DATABASE_BACKEND', 'postgres')
+BOOKWYRM_DATABASE_BACKEND = env("BOOKWYRM_DATABASE_BACKEND", "postgres")
 
 BOOKWYRM_DBS = {
-    'postgres': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': env('POSTGRES_DB', 'fedireads'),
-        'USER': env('POSTGRES_USER', 'fedireads'),
-        'PASSWORD': env('POSTGRES_PASSWORD', 'fedireads'),
-        'HOST': env('POSTGRES_HOST', ''),
-        'PORT': 5432
+    "postgres": {
+        "ENGINE": "django.db.backends.postgresql_psycopg2",
+        "NAME": env("POSTGRES_DB", "fedireads"),
+        "USER": env("POSTGRES_USER", "fedireads"),
+        "PASSWORD": env("POSTGRES_PASSWORD", "fedireads"),
+        "HOST": env("POSTGRES_HOST", ""),
+        "PORT": 5432,
     },
 }
 
-DATABASES = {
-    'default': BOOKWYRM_DBS[BOOKWYRM_DATABASE_BACKEND]
-}
+DATABASES = {"default": BOOKWYRM_DBS[BOOKWYRM_DATABASE_BACKEND]}
 
 
-LOGIN_URL = '/login/'
-AUTH_USER_MODEL = 'bookwyrm.User'
+LOGIN_URL = "/login/"
+AUTH_USER_MODEL = "bookwyrm.User"
 
 # Password validation
 # https://docs.djangoproject.com/en/2.0/ref/settings/#auth-password-validators
 
 AUTH_PASSWORD_VALIDATORS = [
     {
-        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+        "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
     },
     {
-        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+        "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
     },
     {
-        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+        "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",
     },
     {
-        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+        "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",
     },
 ]
 
@@ -137,17 +137,17 @@ AUTH_PASSWORD_VALIDATORS = [
 # Internationalization
 # https://docs.djangoproject.com/en/2.0/topics/i18n/
 
-LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = "en-us"
 LANGUAGES = [
-    ('en-us', _('English')),
-    ('de-de', _('German')),
-    ('es', _('Spanish')),
-    ('fr-fr', _('French')),
-    ('zh-cn', _('Simplified Chinese')),
+    ("en-us", _("English")),
+    ("de-de", _("German")),
+    ("es", _("Spanish")),
+    ("fr-fr", _("French")),
+    ("zh-cn", _("Simplified Chinese")),
 ]
 
 
-TIME_ZONE = 'UTC'
+TIME_ZONE = "UTC"
 
 USE_I18N = True
 
@@ -160,10 +160,13 @@ USE_TZ = True
 # https://docs.djangoproject.com/en/2.0/howto/static-files/
 
 PROJECT_DIR = os.path.dirname(os.path.abspath(__file__))
-STATIC_URL = '/static/'
-STATIC_ROOT = os.path.join(BASE_DIR, env('STATIC_ROOT', 'static'))
-MEDIA_URL = '/images/'
-MEDIA_ROOT = os.path.join(BASE_DIR, env('MEDIA_ROOT', 'images'))
+STATIC_URL = "/static/"
+STATIC_ROOT = os.path.join(BASE_DIR, env("STATIC_ROOT", "static"))
+MEDIA_URL = "/images/"
+MEDIA_ROOT = os.path.join(BASE_DIR, env("MEDIA_ROOT", "images"))
 
 USER_AGENT = "%s (BookWyrm/%s; +https://%s/)" % (
-    requests.utils.default_user_agent(), VERSION, DOMAIN)
+    requests.utils.default_user_agent(),
+    VERSION,
+    DOMAIN,
+)
diff --git a/bookwyrm/signatures.py b/bookwyrm/signatures.py
index ff281664..80cbfdc7 100644
--- a/bookwyrm/signatures.py
+++ b/bookwyrm/signatures.py
@@ -1,4 +1,4 @@
-''' signs activitypub activities '''
+""" signs activitypub activities """
 import hashlib
 from urllib.parse import urlparse
 import datetime
@@ -6,54 +6,56 @@ from base64 import b64encode, b64decode
 
 from Crypto import Random
 from Crypto.PublicKey import RSA
-from Crypto.Signature import pkcs1_15 #pylint: disable=no-name-in-module
+from Crypto.Signature import pkcs1_15  # pylint: disable=no-name-in-module
 from Crypto.Hash import SHA256
 
 MAX_SIGNATURE_AGE = 300
 
+
 def create_key_pair():
-    ''' a new public/private key pair, used for creating new users '''
+    """ a new public/private key pair, used for creating new users """
     random_generator = Random.new().read
     key = RSA.generate(1024, random_generator)
-    private_key = key.export_key().decode('utf8')
-    public_key = key.publickey().export_key().decode('utf8')
+    private_key = key.export_key().decode("utf8")
+    public_key = key.publickey().export_key().decode("utf8")
 
     return private_key, public_key
 
 
 def make_signature(sender, destination, date, digest):
-    ''' uses a private key to sign an outgoing message '''
+    """ uses a private key to sign an outgoing message """
     inbox_parts = urlparse(destination)
     signature_headers = [
-        '(request-target): post %s' % inbox_parts.path,
-        'host: %s' % inbox_parts.netloc,
-        'date: %s' % date,
-        'digest: %s' % digest,
+        "(request-target): post %s" % inbox_parts.path,
+        "host: %s" % inbox_parts.netloc,
+        "date: %s" % date,
+        "digest: %s" % digest,
     ]
-    message_to_sign = '\n'.join(signature_headers)
+    message_to_sign = "\n".join(signature_headers)
     signer = pkcs1_15.new(RSA.import_key(sender.key_pair.private_key))
-    signed_message = signer.sign(SHA256.new(message_to_sign.encode('utf8')))
+    signed_message = signer.sign(SHA256.new(message_to_sign.encode("utf8")))
     signature = {
-        'keyId': '%s#main-key' % sender.remote_id,
-        'algorithm': 'rsa-sha256',
-        'headers': '(request-target) host date digest',
-        'signature': b64encode(signed_message).decode('utf8'),
+        "keyId": "%s#main-key" % sender.remote_id,
+        "algorithm": "rsa-sha256",
+        "headers": "(request-target) host date digest",
+        "signature": b64encode(signed_message).decode("utf8"),
     }
-    return ','.join('%s="%s"' % (k, v) for (k, v) in signature.items())
+    return ",".join('%s="%s"' % (k, v) for (k, v) in signature.items())
 
 
 def make_digest(data):
-    ''' creates a message digest for signing '''
-    return 'SHA-256=' + b64encode(hashlib.sha256(data.encode('utf-8'))\
-                        .digest()).decode('utf-8')
+    """ creates a message digest for signing """
+    return "SHA-256=" + b64encode(hashlib.sha256(data.encode("utf-8")).digest()).decode(
+        "utf-8"
+    )
 
 
 def verify_digest(request):
-    ''' checks if a digest is syntactically valid and matches the message '''
-    algorithm, digest = request.headers['digest'].split('=', 1)
-    if algorithm == 'SHA-256':
+    """ checks if a digest is syntactically valid and matches the message """
+    algorithm, digest = request.headers["digest"].split("=", 1)
+    if algorithm == "SHA-256":
         hash_function = hashlib.sha256
-    elif algorithm == 'SHA-512':
+    elif algorithm == "SHA-512":
         hash_function = hashlib.sha512
     else:
         raise ValueError("Unsupported hash function: {}".format(algorithm))
@@ -62,8 +64,10 @@ def verify_digest(request):
     if b64decode(digest) != expected:
         raise ValueError("Invalid HTTP Digest header")
 
+
 class Signature:
-    ''' read and validate incoming signatures '''
+    """ read and validate incoming signatures """
+
     def __init__(self, key_id, headers, signature):
         self.key_id = key_id
         self.headers = headers
@@ -71,42 +75,39 @@ class Signature:
 
     @classmethod
     def parse(cls, request):
-        ''' extract and parse a signature from an http request '''
+        """ extract and parse a signature from an http request """
         signature_dict = {}
-        for pair in request.headers['Signature'].split(','):
-            k, v = pair.split('=', 1)
-            v = v.replace('"', '')
+        for pair in request.headers["Signature"].split(","):
+            k, v = pair.split("=", 1)
+            v = v.replace('"', "")
             signature_dict[k] = v
 
         try:
-            key_id = signature_dict['keyId']
-            headers = signature_dict['headers']
-            signature = b64decode(signature_dict['signature'])
+            key_id = signature_dict["keyId"]
+            headers = signature_dict["headers"]
+            signature = b64decode(signature_dict["signature"])
         except KeyError:
-            raise ValueError('Invalid auth header')
+            raise ValueError("Invalid auth header")
 
         return cls(key_id, headers, signature)
 
     def verify(self, public_key, request):
-        ''' verify rsa signature '''
-        if http_date_age(request.headers['date']) > MAX_SIGNATURE_AGE:
-            raise ValueError(
-                "Request too old: %s" % (request.headers['date'],))
+        """ verify rsa signature """
+        if http_date_age(request.headers["date"]) > MAX_SIGNATURE_AGE:
+            raise ValueError("Request too old: %s" % (request.headers["date"],))
         public_key = RSA.import_key(public_key)
 
         comparison_string = []
-        for signed_header_name in self.headers.split(' '):
-            if signed_header_name == '(request-target)':
-                comparison_string.append(
-                    '(request-target): post %s' % request.path)
+        for signed_header_name in self.headers.split(" "):
+            if signed_header_name == "(request-target)":
+                comparison_string.append("(request-target): post %s" % request.path)
             else:
-                if signed_header_name == 'digest':
+                if signed_header_name == "digest":
                     verify_digest(request)
-                comparison_string.append('%s: %s' % (
-                    signed_header_name,
-                    request.headers[signed_header_name]
-                ))
-        comparison_string = '\n'.join(comparison_string)
+                comparison_string.append(
+                    "%s: %s" % (signed_header_name, request.headers[signed_header_name])
+                )
+        comparison_string = "\n".join(comparison_string)
 
         signer = pkcs1_15.new(public_key)
         digest = SHA256.new()
@@ -117,7 +118,7 @@ class Signature:
 
 
 def http_date_age(datestr):
-    ''' age of a signature in seconds '''
-    parsed = datetime.datetime.strptime(datestr, '%a, %d %b %Y %H:%M:%S GMT')
+    """ age of a signature in seconds """
+    parsed = datetime.datetime.strptime(datestr, "%a, %d %b %Y %H:%M:%S GMT")
     delta = datetime.datetime.utcnow() - parsed
     return delta.total_seconds()
diff --git a/bookwyrm/status.py b/bookwyrm/status.py
index 4dc4991d..7f075741 100644
--- a/bookwyrm/status.py
+++ b/bookwyrm/status.py
@@ -1,4 +1,4 @@
-''' Handle user activity '''
+""" Handle user activity """
 from django.db import transaction
 from django.utils import timezone
 
@@ -7,14 +7,14 @@ from bookwyrm.sanitize_html import InputHtmlParser
 
 
 def delete_status(status):
-    ''' replace the status with a tombstone '''
+    """ replace the status with a tombstone """
     status.deleted = True
     status.deleted_date = timezone.now()
     status.save()
 
 
-def create_generated_note(user, content, mention_books=None, privacy='public'):
-    ''' a note created by the app about user activity '''
+def create_generated_note(user, content, mention_books=None, privacy="public"):
+    """ a note created by the app about user activity """
     # sanitize input html
     parser = InputHtmlParser()
     parser.feed(content)
@@ -22,11 +22,7 @@ def create_generated_note(user, content, mention_books=None, privacy='public'):
 
     with transaction.atomic():
         # create but don't save
-        status = models.GeneratedNote(
-            user=user,
-            content=content,
-            privacy=privacy
-        )
+        status = models.GeneratedNote(user=user, content=content, privacy=privacy)
         # we have to save it to set the related fields, but hold off on telling
         # folks about it because it is not ready
         status.save(broadcast=False)
diff --git a/bookwyrm/tasks.py b/bookwyrm/tasks.py
index fc0b9739..23765f09 100644
--- a/bookwyrm/tasks.py
+++ b/bookwyrm/tasks.py
@@ -1,12 +1,12 @@
-''' background tasks '''
+""" background tasks """
 import os
 from celery import Celery
 
 from bookwyrm import settings
 
 # set the default Django settings module for the 'celery' program.
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'celerywyrm.settings')
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "celerywyrm.settings")
 app = Celery(
-    'tasks',
+    "tasks",
     broker=settings.CELERY_BROKER,
 )
diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index 67354ac6..77be0ca3 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -1,4 +1,4 @@
-''' template filters '''
+""" template filters """
 from uuid import uuid4
 from datetime import datetime
 
@@ -13,66 +13,78 @@ from bookwyrm.views.status import to_markdown
 
 register = template.Library()
 
-@register.filter(name='dict_key')
+
+@register.filter(name="dict_key")
 def dict_key(d, k):
-    ''' Returns the given key from a dictionary. '''
+    """ Returns the given key from a dictionary. """
     return d.get(k) or 0
 
 
-@register.filter(name='rating')
+@register.filter(name="rating")
 def get_rating(book, user):
-    ''' get the overall rating of a book '''
+    """ get the overall rating of a book """
     queryset = views.helpers.privacy_filter(
-        user, models.Review.objects.filter(book=book))
-    return queryset.aggregate(Avg('rating'))['rating__avg']
+        user, models.Review.objects.filter(book=book)
+    )
+    return queryset.aggregate(Avg("rating"))["rating__avg"]
 
 
-@register.filter(name='user_rating')
+@register.filter(name="user_rating")
 def get_user_rating(book, user):
-    ''' get a user's rating of a book '''
-    rating = models.Review.objects.filter(
-        user=user,
-        book=book,
-        rating__isnull=False,
-    ).order_by('-published_date').first()
+    """ get a user's rating of a book """
+    rating = (
+        models.Review.objects.filter(
+            user=user,
+            book=book,
+            rating__isnull=False,
+        )
+        .order_by("-published_date")
+        .first()
+    )
     if rating:
         return rating.rating
     return 0
 
 
-@register.filter(name='username')
+@register.filter(name="username")
 def get_user_identifier(user):
-    ''' use localname for local users, username for remote '''
+    """ use localname for local users, username for remote """
     return user.localname if user.localname else user.username
 
 
-@register.filter(name='notification_count')
+@register.filter(name="notification_count")
 def get_notification_count(user):
-    ''' how many UNREAD notifications are there '''
+    """ how many UNREAD notifications are there """
     return user.notification_set.filter(read=False).count()
 
 
-@register.filter(name='replies')
+@register.filter(name="replies")
 def get_replies(status):
-    ''' get all direct replies to a status '''
-    #TODO: this limit could cause problems
-    return models.Status.objects.filter(
-        reply_parent=status,
-        deleted=False,
-    ).select_subclasses().all()[:10]
+    """ get all direct replies to a status """
+    # TODO: this limit could cause problems
+    return (
+        models.Status.objects.filter(
+            reply_parent=status,
+            deleted=False,
+        )
+        .select_subclasses()
+        .all()[:10]
+    )
 
 
-@register.filter(name='parent')
+@register.filter(name="parent")
 def get_parent(status):
-    ''' get the reply parent for a status '''
-    return models.Status.objects.filter(
-        id=status.reply_parent_id
-    ).select_subclasses().get()
+    """ get the reply parent for a status """
+    return (
+        models.Status.objects.filter(id=status.reply_parent_id)
+        .select_subclasses()
+        .get()
+    )
 
 
-@register.filter(name='liked')
+@register.filter(name="liked")
 def get_user_liked(user, status):
-    ''' did the given user fav a status? '''
+    """ did the given user fav a status? """
     try:
         models.Favorite.objects.get(user=user, status=status)
         return True
@@ -80,15 +92,15 @@ def get_user_liked(user, status):
         return False
 
 
-@register.filter(name='boosted')
+@register.filter(name="boosted")
 def get_user_boosted(user, status):
-    ''' did the given user fav a status? '''
-    return user.id in status.boosters.all().values_list('user', flat=True)
+    """ did the given user fav a status? """
+    return user.id in status.boosters.all().values_list("user", flat=True)
 
 
-@register.filter(name='follow_request_exists')
+@register.filter(name="follow_request_exists")
 def follow_request_exists(user, requester):
-    ''' see if there is a pending follow request for a user '''
+    """ see if there is a pending follow request for a user """
     try:
         models.UserFollowRequest.objects.filter(
             user_subject=requester,
@@ -99,129 +111,139 @@ def follow_request_exists(user, requester):
         return False
 
 
-@register.filter(name='boosted_status')
+@register.filter(name="boosted_status")
 def get_boosted(boost):
-    ''' load a boosted status. have to do this or it wont get foregin keys '''
-    return models.Status.objects.select_subclasses().filter(
-        id=boost.boosted_status.id
-    ).get()
+    """ load a boosted status. have to do this or it wont get foregin keys """
+    return (
+        models.Status.objects.select_subclasses()
+        .filter(id=boost.boosted_status.id)
+        .get()
+    )
 
 
-@register.filter(name='book_description')
+@register.filter(name="book_description")
 def get_book_description(book):
-    ''' use the work's text if the book doesn't have it '''
+    """ use the work's text if the book doesn't have it """
     return book.description or book.parent_work.description
 
 
-@register.filter(name='uuid')
+@register.filter(name="uuid")
 def get_uuid(identifier):
-    ''' for avoiding clashing ids when there are many forms '''
-    return '%s%s' % (identifier, uuid4())
+    """ for avoiding clashing ids when there are many forms """
+    return "%s%s" % (identifier, uuid4())
 
 
-@register.filter(name='post_date')
+@register.filter(name="post_date")
 def time_since(date):
-    ''' concise time ago function '''
+    """ concise time ago function """
     if not isinstance(date, datetime):
-        return ''
+        return ""
     now = timezone.now()
     delta = now - date
 
     if date < (now - relativedelta(weeks=1)):
-        formatter = '%b %-d'
+        formatter = "%b %-d"
         if date.year != now.year:
-            formatter += ' %Y'
+            formatter += " %Y"
         return date.strftime(formatter)
     delta = relativedelta(now, date)
     if delta.days:
-        return '%dd' % delta.days
+        return "%dd" % delta.days
     if delta.hours:
-        return '%dh' % delta.hours
+        return "%dh" % delta.hours
     if delta.minutes:
-        return '%dm' % delta.minutes
-    return '%ds' % delta.seconds
+        return "%dm" % delta.minutes
+    return "%ds" % delta.seconds
 
 
-@register.filter(name='to_markdown')
+@register.filter(name="to_markdown")
 def get_markdown(content):
-    ''' convert markdown to html '''
+    """ convert markdown to html """
     if content:
         return to_markdown(content)
     return None
 
-@register.filter(name='mentions')
-def get_mentions(status, user):
-    ''' people to @ in a reply: the parent and all mentions '''
-    mentions = set([status.user] + list(status.mention_users.all()))
-    return ' '.join(
-        '@' + get_user_identifier(m) for m in mentions if not m == user) + ' '
 
-@register.filter(name='status_preview_name')
+@register.filter(name="mentions")
+def get_mentions(status, user):
+    """ people to @ in a reply: the parent and all mentions """
+    mentions = set([status.user] + list(status.mention_users.all()))
+    return (
+        " ".join("@" + get_user_identifier(m) for m in mentions if not m == user) + " "
+    )
+
+
+@register.filter(name="status_preview_name")
 def get_status_preview_name(obj):
-    ''' text snippet with book context for a status '''
+    """ text snippet with book context for a status """
     name = obj.__class__.__name__.lower()
-    if name == 'review':
-        return '%s of <em>%s</em>' % (name, obj.book.title)
-    if name == 'comment':
-        return '%s on <em>%s</em>' % (name, obj.book.title)
-    if name == 'quotation':
-        return '%s from <em>%s</em>' % (name, obj.book.title)
+    if name == "review":
+        return "%s of <em>%s</em>" % (name, obj.book.title)
+    if name == "comment":
+        return "%s on <em>%s</em>" % (name, obj.book.title)
+    if name == "quotation":
+        return "%s from <em>%s</em>" % (name, obj.book.title)
     return name
 
-@register.filter(name='next_shelf')
+
+@register.filter(name="next_shelf")
 def get_next_shelf(current_shelf):
-    ''' shelf you'd use to update reading progress '''
-    if current_shelf == 'to-read':
-        return 'reading'
-    if current_shelf == 'reading':
-        return 'read'
-    if current_shelf == 'read':
-        return 'read'
-    return 'to-read'
+    """ shelf you'd use to update reading progress """
+    if current_shelf == "to-read":
+        return "reading"
+    if current_shelf == "reading":
+        return "read"
+    if current_shelf == "read":
+        return "read"
+    return "to-read"
+
 
 @register.simple_tag(takes_context=False)
 def related_status(notification):
-    ''' for notifications '''
+    """ for notifications """
     if not notification.related_status:
         return None
-    if hasattr(notification.related_status, 'quotation'):
+    if hasattr(notification.related_status, "quotation"):
         return notification.related_status.quotation
-    if hasattr(notification.related_status, 'review'):
+    if hasattr(notification.related_status, "review"):
         return notification.related_status.review
-    if hasattr(notification.related_status, 'comment'):
+    if hasattr(notification.related_status, "comment"):
         return notification.related_status.comment
     return notification.related_status
 
+
 @register.simple_tag(takes_context=True)
 def active_shelf(context, book):
-    ''' check what shelf a user has a book on, if any '''
+    """ check what shelf a user has a book on, if any """
     shelf = models.ShelfBook.objects.filter(
-        shelf__user=context['request'].user,
-        book__in=book.parent_work.editions.all()
+        shelf__user=context["request"].user, book__in=book.parent_work.editions.all()
     ).first()
-    return shelf if shelf else {'book': book}
+    return shelf if shelf else {"book": book}
 
 
 @register.simple_tag(takes_context=False)
 def latest_read_through(book, user):
-    ''' the most recent read activity '''
-    return models.ReadThrough.objects.filter(
-        user=user,
-        book=book
-    ).order_by('-start_date').first()
+    """ the most recent read activity """
+    return (
+        models.ReadThrough.objects.filter(user=user, book=book)
+        .order_by("-start_date")
+        .first()
+    )
 
 
 @register.simple_tag(takes_context=False)
 def active_read_through(book, user):
-    ''' the most recent read activity '''
-    return models.ReadThrough.objects.filter(
-        user=user,
-        book=book,
-        finish_date__isnull=True
-    ).order_by('-start_date').first()
+    """ the most recent read activity """
+    return (
+        models.ReadThrough.objects.filter(
+            user=user, book=book, finish_date__isnull=True
+        )
+        .order_by("-start_date")
+        .first()
+    )
 
 
 @register.simple_tag(takes_context=False)
 def comparison_bool(str1, str2):
-    ''' idk why I need to write a tag for this, it reutrns a bool '''
+    """ idk why I need to write a tag for this, it reutrns a bool """
     return str1 == str2
diff --git a/bookwyrm/tests/activitypub/test_author.py b/bookwyrm/tests/activitypub/test_author.py
index fd31f105..e65f86b7 100644
--- a/bookwyrm/tests/activitypub/test_author.py
+++ b/bookwyrm/tests/activitypub/test_author.py
@@ -7,19 +7,18 @@ from bookwyrm import models
 class Author(TestCase):
     def setUp(self):
         self.book = models.Edition.objects.create(
-            title='Example Edition',
-            remote_id='https://example.com/book/1',
+            title="Example Edition",
+            remote_id="https://example.com/book/1",
         )
         self.author = models.Author.objects.create(
-            name='Author fullname',
-            aliases=['One', 'Two'],
-            bio='bio bio bio',
+            name="Author fullname",
+            aliases=["One", "Two"],
+            bio="bio bio bio",
         )
 
-
     def test_serialize_model(self):
         activity = self.author.to_activity()
-        self.assertEqual(activity['id'], self.author.remote_id)
-        self.assertIsInstance(activity['aliases'], list)
-        self.assertEqual(activity['aliases'], ['One', 'Two'])
-        self.assertEqual(activity['name'], 'Author fullname')
+        self.assertEqual(activity["id"], self.author.remote_id)
+        self.assertIsInstance(activity["aliases"], list)
+        self.assertEqual(activity["aliases"], ["One", "Two"])
+        self.assertEqual(activity["name"], "Author fullname")
diff --git a/bookwyrm/tests/activitypub/test_base_activity.py b/bookwyrm/tests/activitypub/test_base_activity.py
index de108eae..b3e28261 100644
--- a/bookwyrm/tests/activitypub/test_base_activity.py
+++ b/bookwyrm/tests/activitypub/test_base_activity.py
@@ -1,4 +1,4 @@
-''' tests the base functionality for activitypub dataclasses '''
+""" tests the base functionality for activitypub dataclasses """
 from io import BytesIO
 import json
 import pathlib
@@ -10,231 +10,229 @@ from PIL import Image
 import responses
 
 from bookwyrm import activitypub
-from bookwyrm.activitypub.base_activity import ActivityObject, \
-    resolve_remote_id, set_related_field
+from bookwyrm.activitypub.base_activity import (
+    ActivityObject,
+    resolve_remote_id,
+    set_related_field,
+)
 from bookwyrm.activitypub import ActivitySerializerError
 from bookwyrm import models
 
+
 class BaseActivity(TestCase):
-    ''' the super class for model-linked activitypub dataclasses '''
+    """ the super class for model-linked activitypub dataclasses """
+
     def setUp(self):
-        ''' we're probably going to re-use this so why copy/paste '''
+        """ we're probably going to re-use this so why copy/paste """
         self.user = models.User.objects.create_user(
-            'mouse', 'mouse@mouse.mouse', 'mouseword',
-            local=True, localname='mouse')
-        self.user.remote_id = 'http://example.com/a/b'
+            "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
+        )
+        self.user.remote_id = "http://example.com/a/b"
         self.user.save(broadcast=False)
 
-        datafile = pathlib.Path(__file__).parent.joinpath(
-            '../data/ap_user.json'
-        )
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json")
         self.userdata = json.loads(datafile.read_bytes())
         # don't try to load the user icon
-        del self.userdata['icon']
+        del self.userdata["icon"]
 
         image_file = pathlib.Path(__file__).parent.joinpath(
-            '../../static/images/default_avi.jpg')
+            "../../static/images/default_avi.jpg"
+        )
         image = Image.open(image_file)
         output = BytesIO()
         image.save(output, format=image.format)
         self.image_data = output.getvalue()
 
     def test_init(self):
-        ''' simple successfuly init '''
-        instance = ActivityObject(id='a', type='b')
-        self.assertTrue(hasattr(instance, 'id'))
-        self.assertTrue(hasattr(instance, 'type'))
+        """ simple successfuly init """
+        instance = ActivityObject(id="a", type="b")
+        self.assertTrue(hasattr(instance, "id"))
+        self.assertTrue(hasattr(instance, "type"))
 
     def test_init_missing(self):
-        ''' init with missing required params '''
+        """ init with missing required params """
         with self.assertRaises(ActivitySerializerError):
             ActivityObject()
 
     def test_init_extra_fields(self):
-        ''' init ignoring additional fields '''
-        instance = ActivityObject(id='a', type='b', fish='c')
-        self.assertTrue(hasattr(instance, 'id'))
-        self.assertTrue(hasattr(instance, 'type'))
+        """ init ignoring additional fields """
+        instance = ActivityObject(id="a", type="b", fish="c")
+        self.assertTrue(hasattr(instance, "id"))
+        self.assertTrue(hasattr(instance, "type"))
 
     def test_init_default_field(self):
-        ''' replace an existing required field with a default field '''
+        """ replace an existing required field with a default field """
+
         @dataclass(init=False)
         class TestClass(ActivityObject):
-            ''' test class with default field '''
-            type: str = 'TestObject'
+            """ test class with default field """
 
-        instance = TestClass(id='a')
-        self.assertEqual(instance.id, 'a')
-        self.assertEqual(instance.type, 'TestObject')
+            type: str = "TestObject"
+
+        instance = TestClass(id="a")
+        self.assertEqual(instance.id, "a")
+        self.assertEqual(instance.type, "TestObject")
 
     def test_serialize(self):
-        ''' simple function for converting dataclass to dict '''
-        instance = ActivityObject(id='a', type='b')
+        """ simple function for converting dataclass to dict """
+        instance = ActivityObject(id="a", type="b")
         serialized = instance.serialize()
         self.assertIsInstance(serialized, dict)
-        self.assertEqual(serialized['id'], 'a')
-        self.assertEqual(serialized['type'], 'b')
+        self.assertEqual(serialized["id"], "a")
+        self.assertEqual(serialized["type"], "b")
 
     @responses.activate
     def test_resolve_remote_id(self):
-        ''' look up or load remote data '''
+        """ look up or load remote data """
         # existing item
-        result = resolve_remote_id('http://example.com/a/b', model=models.User)
+        result = resolve_remote_id("http://example.com/a/b", model=models.User)
         self.assertEqual(result, self.user)
 
         # remote item
         responses.add(
             responses.GET,
-            'https://example.com/user/mouse',
+            "https://example.com/user/mouse",
             json=self.userdata,
-            status=200)
+            status=200,
+        )
 
-        with patch('bookwyrm.models.user.set_remote_server.delay'):
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
             result = resolve_remote_id(
-                'https://example.com/user/mouse', model=models.User)
+                "https://example.com/user/mouse", model=models.User
+            )
         self.assertIsInstance(result, models.User)
-        self.assertEqual(result.remote_id, 'https://example.com/user/mouse')
-        self.assertEqual(result.name, 'MOUSE?? MOUSE!!')
+        self.assertEqual(result.remote_id, "https://example.com/user/mouse")
+        self.assertEqual(result.name, "MOUSE?? MOUSE!!")
 
     def test_to_model_invalid_model(self):
-        ''' catch mismatch between activity type and model type '''
-        instance = ActivityObject(id='a', type='b')
+        """ catch mismatch between activity type and model type """
+        instance = ActivityObject(id="a", type="b")
         with self.assertRaises(ActivitySerializerError):
             instance.to_model(model=models.User)
 
-
     @responses.activate
     def test_to_model_image(self):
-        ''' update an image field '''
+        """ update an image field """
         activity = activitypub.Person(
             id=self.user.remote_id,
-            name='New Name',
-            preferredUsername='mouse',
-            inbox='http://www.com/',
-            outbox='http://www.com/',
-            followers='',
-            summary='',
-            publicKey={
-                'id': 'hi',
-                'owner': self.user.remote_id,
-                'publicKeyPem': 'hi'},
+            name="New Name",
+            preferredUsername="mouse",
+            inbox="http://www.com/",
+            outbox="http://www.com/",
+            followers="",
+            summary="",
+            publicKey={"id": "hi", "owner": self.user.remote_id, "publicKeyPem": "hi"},
             endpoints={},
-            icon={
-                'type': 'Image',
-                'url': 'http://www.example.com/image.jpg'
-            }
+            icon={"type": "Image", "url": "http://www.example.com/image.jpg"},
         )
 
         responses.add(
             responses.GET,
-            'http://www.example.com/image.jpg',
+            "http://www.example.com/image.jpg",
             body=self.image_data,
-            status=200)
+            status=200,
+        )
 
         self.assertIsNone(self.user.avatar.name)
         with self.assertRaises(ValueError):
-            self.user.avatar.file #pylint: disable=pointless-statement
+            self.user.avatar.file  # pylint: disable=pointless-statement
 
         # this would trigger a broadcast because it's a local user
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             activity.to_model(model=models.User, instance=self.user)
         self.assertIsNotNone(self.user.avatar.file)
-        self.assertEqual(self.user.name, 'New Name')
-        self.assertEqual(self.user.key_pair.public_key, 'hi')
+        self.assertEqual(self.user.name, "New Name")
+        self.assertEqual(self.user.key_pair.public_key, "hi")
 
     def test_to_model_many_to_many(self):
-        ''' annoying that these all need special handling '''
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        """ annoying that these all need special handling """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             status = models.Status.objects.create(
-                content='test status',
+                content="test status",
                 user=self.user,
             )
         book = models.Edition.objects.create(
-            title='Test Edition', remote_id='http://book.com/book')
+            title="Test Edition", remote_id="http://book.com/book"
+        )
         update_data = activitypub.Note(
             id=status.remote_id,
             content=status.content,
             attributedTo=self.user.remote_id,
-            published='hi',
+            published="hi",
             to=[],
             cc=[],
             tag=[
+                {"type": "Mention", "name": "gerald", "href": "http://example.com/a/b"},
                 {
-                    'type': 'Mention',
-                    'name': 'gerald',
-                    'href': 'http://example.com/a/b'
+                    "type": "Edition",
+                    "name": "gerald j. books",
+                    "href": "http://book.com/book",
                 },
-                {
-                    'type': 'Edition',
-                    'name': 'gerald j. books',
-                    'href': 'http://book.com/book'
-                },
-            ]
+            ],
         )
         update_data.to_model(model=models.Status, instance=status)
         self.assertEqual(status.mention_users.first(), self.user)
         self.assertEqual(status.mention_books.first(), book)
 
-
     @responses.activate
     def test_to_model_one_to_many(self):
-        ''' these are reversed relationships, where the secondary object
-        keys the primary object but not vice versa '''
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        """these are reversed relationships, where the secondary object
+        keys the primary object but not vice versa"""
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             status = models.Status.objects.create(
-                content='test status',
+                content="test status",
                 user=self.user,
             )
         update_data = activitypub.Note(
             id=status.remote_id,
             content=status.content,
             attributedTo=self.user.remote_id,
-            published='hi',
+            published="hi",
             to=[],
             cc=[],
-            attachment=[{
-                'url': 'http://www.example.com/image.jpg',
-                'name': 'alt text',
-                'type': 'Image',
-            }],
+            attachment=[
+                {
+                    "url": "http://www.example.com/image.jpg",
+                    "name": "alt text",
+                    "type": "Image",
+                }
+            ],
         )
 
         responses.add(
             responses.GET,
-            'http://www.example.com/image.jpg',
+            "http://www.example.com/image.jpg",
             body=self.image_data,
-            status=200)
+            status=200,
+        )
 
         # sets the celery task call to the function call
-        with patch(
-                'bookwyrm.activitypub.base_activity.set_related_field.delay'):
-            with patch('bookwyrm.models.status.Status.ignore_activity') \
-                    as discarder:
+        with patch("bookwyrm.activitypub.base_activity.set_related_field.delay"):
+            with patch("bookwyrm.models.status.Status.ignore_activity") as discarder:
                 discarder.return_value = False
                 update_data.to_model(model=models.Status, instance=status)
         self.assertIsNone(status.attachments.first())
 
-
     @responses.activate
     def test_set_related_field(self):
-        ''' celery task to add back-references to created objects '''
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        """ celery task to add back-references to created objects """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             status = models.Status.objects.create(
-                content='test status',
+                content="test status",
                 user=self.user,
             )
         data = {
-            'url': 'http://www.example.com/image.jpg',
-            'name': 'alt text',
-            'type': 'Image',
+            "url": "http://www.example.com/image.jpg",
+            "name": "alt text",
+            "type": "Image",
         }
         responses.add(
             responses.GET,
-            'http://www.example.com/image.jpg',
+            "http://www.example.com/image.jpg",
             body=self.image_data,
-            status=200)
-        set_related_field(
-            'Image', 'Status', 'status', status.remote_id, data)
+            status=200,
+        )
+        set_related_field("Image", "Status", "status", status.remote_id, data)
 
         self.assertIsInstance(status.attachments.first(), models.Image)
         self.assertIsNotNone(status.attachments.first().image)
diff --git a/bookwyrm/tests/activitypub/test_person.py b/bookwyrm/tests/activitypub/test_person.py
index 06240281..67aaf891 100644
--- a/bookwyrm/tests/activitypub/test_person.py
+++ b/bookwyrm/tests/activitypub/test_person.py
@@ -9,23 +9,19 @@ from bookwyrm import activitypub, models
 
 class Person(TestCase):
     def setUp(self):
-        datafile = pathlib.Path(__file__).parent.joinpath(
-            '../data/ap_user.json'
-        )
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json")
         self.user_data = json.loads(datafile.read_bytes())
 
-
     def test_load_user_data(self):
         activity = activitypub.Person(**self.user_data)
-        self.assertEqual(activity.id, 'https://example.com/user/mouse')
-        self.assertEqual(activity.preferredUsername, 'mouse')
-        self.assertEqual(activity.type, 'Person')
-
+        self.assertEqual(activity.id, "https://example.com/user/mouse")
+        self.assertEqual(activity.preferredUsername, "mouse")
+        self.assertEqual(activity.type, "Person")
 
     def test_user_to_model(self):
         activity = activitypub.Person(**self.user_data)
-        with patch('bookwyrm.models.user.set_remote_server.delay'):
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
             user = activity.to_model(model=models.User)
-        self.assertEqual(user.username, 'mouse@example.com')
-        self.assertEqual(user.remote_id, 'https://example.com/user/mouse')
+        self.assertEqual(user.username, "mouse@example.com")
+        self.assertEqual(user.remote_id, "https://example.com/user/mouse")
         self.assertFalse(user.local)
diff --git a/bookwyrm/tests/activitypub/test_quotation.py b/bookwyrm/tests/activitypub/test_quotation.py
index 1cd1f05d..1f429dd2 100644
--- a/bookwyrm/tests/activitypub/test_quotation.py
+++ b/bookwyrm/tests/activitypub/test_quotation.py
@@ -1,4 +1,4 @@
-''' quotation activty object serializer class '''
+""" quotation activty object serializer class """
 import json
 import pathlib
 from unittest.mock import patch
@@ -8,43 +8,40 @@ from bookwyrm import activitypub, models
 
 
 class Quotation(TestCase):
-    ''' we have hecka ways to create statuses '''
+    """ we have hecka ways to create statuses """
+
     def setUp(self):
-        ''' model objects we'll need '''
-        with patch('bookwyrm.models.user.set_remote_server.delay'):
+        """ model objects we'll need """
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
             self.user = models.User.objects.create_user(
-                'mouse', 'mouse@mouse.mouse', 'mouseword',
+                "mouse",
+                "mouse@mouse.mouse",
+                "mouseword",
                 local=False,
-                inbox='https://example.com/user/mouse/inbox',
-                outbox='https://example.com/user/mouse/outbox',
-                remote_id='https://example.com/user/mouse',
+                inbox="https://example.com/user/mouse/inbox",
+                outbox="https://example.com/user/mouse/outbox",
+                remote_id="https://example.com/user/mouse",
             )
         self.book = models.Edition.objects.create(
-            title='Example Edition',
-            remote_id='https://example.com/book/1',
-        )
-        datafile = pathlib.Path(__file__).parent.joinpath(
-            '../data/ap_quotation.json'
+            title="Example Edition",
+            remote_id="https://example.com/book/1",
         )
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_quotation.json")
         self.status_data = json.loads(datafile.read_bytes())
 
-
     def test_quotation_activity(self):
-        ''' create a Quoteation ap object from json '''
+        """ create a Quoteation ap object from json """
         quotation = activitypub.Quotation(**self.status_data)
 
-        self.assertEqual(quotation.type, 'Quotation')
-        self.assertEqual(
-            quotation.id, 'https://example.com/user/mouse/quotation/13')
-        self.assertEqual(quotation.content, 'commentary')
-        self.assertEqual(quotation.quote, 'quote body')
-        self.assertEqual(quotation.inReplyToBook, 'https://example.com/book/1')
-        self.assertEqual(
-            quotation.published, '2020-05-10T02:38:31.150343+00:00')
-
+        self.assertEqual(quotation.type, "Quotation")
+        self.assertEqual(quotation.id, "https://example.com/user/mouse/quotation/13")
+        self.assertEqual(quotation.content, "commentary")
+        self.assertEqual(quotation.quote, "quote body")
+        self.assertEqual(quotation.inReplyToBook, "https://example.com/book/1")
+        self.assertEqual(quotation.published, "2020-05-10T02:38:31.150343+00:00")
 
     def test_activity_to_model(self):
-        ''' create a model instance from an activity object '''
+        """ create a model instance from an activity object """
         activity = activitypub.Quotation(**self.status_data)
         quotation = activity.to_model(model=models.Quotation)
 
diff --git a/bookwyrm/tests/connectors/test_abstract_connector.py b/bookwyrm/tests/connectors/test_abstract_connector.py
index 1b382104..9aa78f6a 100644
--- a/bookwyrm/tests/connectors/test_abstract_connector.py
+++ b/bookwyrm/tests/connectors/test_abstract_connector.py
@@ -1,4 +1,4 @@
-''' testing book data connectors '''
+""" testing book data connectors """
 from unittest.mock import patch
 from django.test import TestCase
 import responses
@@ -10,109 +10,115 @@ from bookwyrm.settings import DOMAIN
 
 
 class AbstractConnector(TestCase):
-    ''' generic code for connecting to outside data sources '''
+    """ generic code for connecting to outside data sources """
+
     def setUp(self):
-        ''' we need an example connector '''
+        """ we need an example connector """
         self.connector_info = models.Connector.objects.create(
-            identifier='example.com',
-            connector_file='openlibrary',
-            base_url='https://example.com',
-            books_url='https://example.com/books',
-            covers_url='https://example.com/covers',
-            search_url='https://example.com/search?q=',
+            identifier="example.com",
+            connector_file="openlibrary",
+            base_url="https://example.com",
+            books_url="https://example.com/books",
+            covers_url="https://example.com/covers",
+            search_url="https://example.com/search?q=",
         )
         work_data = {
-            'id': 'abc1',
-            'title': 'Test work',
-            'type': 'work',
-            'openlibraryKey': 'OL1234W',
+            "id": "abc1",
+            "title": "Test work",
+            "type": "work",
+            "openlibraryKey": "OL1234W",
         }
         self.work_data = work_data
         edition_data = {
-            'id': 'abc2',
-            'title': 'Test edition',
-            'type': 'edition',
-            'openlibraryKey': 'OL1234M',
+            "id": "abc2",
+            "title": "Test edition",
+            "type": "edition",
+            "openlibraryKey": "OL1234M",
         }
         self.edition_data = edition_data
 
         class TestConnector(abstract_connector.AbstractConnector):
-            ''' nothing added here '''
+            """ nothing added here """
+
             def format_search_result(self, search_result):
                 return search_result
+
             def parse_search_data(self, data):
                 return data
+
             def format_isbn_search_result(self, search_result):
                 return search_result
+
             def parse_isbn_search_data(self, data):
                 return data
+
             def is_work_data(self, data):
-                return data['type'] == 'work'
+                return data["type"] == "work"
+
             def get_edition_from_work_data(self, data):
                 return edition_data
+
             def get_work_from_edition_data(self, data):
                 return work_data
+
             def get_authors_from_data(self, data):
                 return []
+
             def expand_book_data(self, book):
                 pass
-        self.connector = TestConnector('example.com')
+
+        self.connector = TestConnector("example.com")
         self.connector.book_mappings = [
-            Mapping('id'),
-            Mapping('title'),
-            Mapping('openlibraryKey'),
+            Mapping("id"),
+            Mapping("title"),
+            Mapping("openlibraryKey"),
         ]
 
         self.book = models.Edition.objects.create(
-            title='Test Book', remote_id='https://example.com/book/1234',
-            openlibrary_key='OL1234M')
-
+            title="Test Book",
+            remote_id="https://example.com/book/1234",
+            openlibrary_key="OL1234M",
+        )
 
     def test_abstract_connector_init(self):
-        ''' barebones connector for search with defaults '''
+        """ barebones connector for search with defaults """
         self.assertIsInstance(self.connector.book_mappings, list)
 
-
     def test_is_available(self):
-        ''' this isn't used.... '''
+        """ this isn't used.... """
         self.assertTrue(self.connector.is_available())
         self.connector.max_query_count = 1
         self.connector.connector.query_count = 2
         self.assertFalse(self.connector.is_available())
 
-
     def test_get_or_create_book_existing(self):
-        ''' find an existing book by remote/origin id '''
+        """ find an existing book by remote/origin id """
         self.assertEqual(models.Book.objects.count(), 1)
         self.assertEqual(
-            self.book.remote_id, 'https://%s/book/%d' % (DOMAIN, self.book.id))
-        self.assertEqual(
-            self.book.origin_id, 'https://example.com/book/1234')
+            self.book.remote_id, "https://%s/book/%d" % (DOMAIN, self.book.id)
+        )
+        self.assertEqual(self.book.origin_id, "https://example.com/book/1234")
 
         # dedupe by origin id
-        result = self.connector.get_or_create_book(
-            'https://example.com/book/1234')
+        result = self.connector.get_or_create_book("https://example.com/book/1234")
         self.assertEqual(models.Book.objects.count(), 1)
         self.assertEqual(result, self.book)
 
         # dedupe by remote id
         result = self.connector.get_or_create_book(
-            'https://%s/book/%d' % (DOMAIN, self.book.id))
+            "https://%s/book/%d" % (DOMAIN, self.book.id)
+        )
         self.assertEqual(models.Book.objects.count(), 1)
         self.assertEqual(result, self.book)
 
     @responses.activate
     def test_get_or_create_book_deduped(self):
-        ''' load remote data and deduplicate '''
+        """ load remote data and deduplicate """
         responses.add(
-            responses.GET,
-            'https://example.com/book/abcd',
-            json=self.edition_data
+            responses.GET, "https://example.com/book/abcd", json=self.edition_data
         )
-        with patch(
-                'bookwyrm.connectors.abstract_connector.load_more_data.delay'):
-            result = self.connector.get_or_create_book(
-                'https://example.com/book/abcd')
+        with patch("bookwyrm.connectors.abstract_connector.load_more_data.delay"):
+            result = self.connector.get_or_create_book("https://example.com/book/abcd")
         self.assertEqual(result, self.book)
         self.assertEqual(models.Edition.objects.count(), 1)
         self.assertEqual(models.Edition.objects.count(), 1)
diff --git a/bookwyrm/tests/connectors/test_abstract_minimal_connector.py b/bookwyrm/tests/connectors/test_abstract_minimal_connector.py
index 9b939067..957d3233 100644
--- a/bookwyrm/tests/connectors/test_abstract_minimal_connector.py
+++ b/bookwyrm/tests/connectors/test_abstract_minimal_connector.py
@@ -1,4 +1,4 @@
-''' testing book data connectors '''
+""" testing book data connectors """
 from django.test import TestCase
 import responses
 
@@ -8,99 +8,101 @@ from bookwyrm.connectors.abstract_connector import Mapping, SearchResult
 
 
 class AbstractConnector(TestCase):
-    ''' generic code for connecting to outside data sources '''
+    """ generic code for connecting to outside data sources """
+
     def setUp(self):
-        ''' we need an example connector '''
+        """ we need an example connector """
         self.connector_info = models.Connector.objects.create(
-            identifier='example.com',
-            connector_file='openlibrary',
-            base_url='https://example.com',
-            books_url='https://example.com/books',
-            covers_url='https://example.com/covers',
-            search_url='https://example.com/search?q=',
-            isbn_search_url='https://example.com/isbn',
+            identifier="example.com",
+            connector_file="openlibrary",
+            base_url="https://example.com",
+            books_url="https://example.com/books",
+            covers_url="https://example.com/covers",
+            search_url="https://example.com/search?q=",
+            isbn_search_url="https://example.com/isbn",
         )
 
         class TestConnector(abstract_connector.AbstractMinimalConnector):
-            ''' nothing added here '''
+            """ nothing added here """
+
             def format_search_result(self, search_result):
                 return search_result
+
             def get_or_create_book(self, remote_id):
                 pass
+
             def parse_search_data(self, data):
                 return data
+
             def format_isbn_search_result(self, search_result):
                 return search_result
+
             def parse_isbn_search_data(self, data):
                 return data
-        self.test_connector = TestConnector('example.com')
 
+        self.test_connector = TestConnector("example.com")
 
     def test_abstract_minimal_connector_init(self):
-        ''' barebones connector for search with defaults '''
+        """ barebones connector for search with defaults """
         connector = self.test_connector
         self.assertEqual(connector.connector, self.connector_info)
-        self.assertEqual(connector.base_url, 'https://example.com')
-        self.assertEqual(connector.books_url, 'https://example.com/books')
-        self.assertEqual(connector.covers_url, 'https://example.com/covers')
-        self.assertEqual(connector.search_url, 'https://example.com/search?q=')
-        self.assertEqual(connector.isbn_search_url, 'https://example.com/isbn')
+        self.assertEqual(connector.base_url, "https://example.com")
+        self.assertEqual(connector.books_url, "https://example.com/books")
+        self.assertEqual(connector.covers_url, "https://example.com/covers")
+        self.assertEqual(connector.search_url, "https://example.com/search?q=")
+        self.assertEqual(connector.isbn_search_url, "https://example.com/isbn")
         self.assertIsNone(connector.name)
-        self.assertEqual(connector.identifier, 'example.com')
+        self.assertEqual(connector.identifier, "example.com")
         self.assertIsNone(connector.max_query_count)
         self.assertFalse(connector.local)
 
-
     @responses.activate
     def test_search(self):
-        ''' makes an http request to the outside service '''
+        """ makes an http request to the outside service """
         responses.add(
             responses.GET,
-            'https://example.com/search?q=a%20book%20title',
-            json=['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l'],
-            status=200)
-        results = self.test_connector.search('a book title')
+            "https://example.com/search?q=a%20book%20title",
+            json=["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l"],
+            status=200,
+        )
+        results = self.test_connector.search("a book title")
         self.assertEqual(len(results), 10)
-        self.assertEqual(results[0], 'a')
-        self.assertEqual(results[1], 'b')
-        self.assertEqual(results[2], 'c')
-
+        self.assertEqual(results[0], "a")
+        self.assertEqual(results[1], "b")
+        self.assertEqual(results[2], "c")
 
     def test_search_result(self):
-        ''' a class that stores info about a search result '''
+        """ a class that stores info about a search result """
         result = SearchResult(
-            title='Title',
-            key='https://example.com/book/1',
-            author='Author Name',
-            year='1850',
+            title="Title",
+            key="https://example.com/book/1",
+            author="Author Name",
+            year="1850",
             connector=self.test_connector,
         )
         # there's really not much to test here, it's just a dataclass
         self.assertEqual(result.confidence, 1)
-        self.assertEqual(result.title, 'Title')
-
+        self.assertEqual(result.title, "Title")
 
     def test_create_mapping(self):
-        ''' maps remote fields for book data to bookwyrm activitypub fields '''
-        mapping = Mapping('isbn')
-        self.assertEqual(mapping.local_field, 'isbn')
-        self.assertEqual(mapping.remote_field, 'isbn')
-        self.assertEqual(mapping.formatter('bb'), 'bb')
-
+        """ maps remote fields for book data to bookwyrm activitypub fields """
+        mapping = Mapping("isbn")
+        self.assertEqual(mapping.local_field, "isbn")
+        self.assertEqual(mapping.remote_field, "isbn")
+        self.assertEqual(mapping.formatter("bb"), "bb")
 
     def test_create_mapping_with_remote(self):
-        ''' the remote field is different than the local field '''
-        mapping = Mapping('isbn', remote_field='isbn13')
-        self.assertEqual(mapping.local_field, 'isbn')
-        self.assertEqual(mapping.remote_field, 'isbn13')
-        self.assertEqual(mapping.formatter('bb'), 'bb')
-
+        """ the remote field is different than the local field """
+        mapping = Mapping("isbn", remote_field="isbn13")
+        self.assertEqual(mapping.local_field, "isbn")
+        self.assertEqual(mapping.remote_field, "isbn13")
+        self.assertEqual(mapping.formatter("bb"), "bb")
 
     def test_create_mapping_with_formatter(self):
-        ''' a function is provided to modify the data '''
-        formatter = lambda x: 'aa' + x
-        mapping = Mapping('isbn', formatter=formatter)
-        self.assertEqual(mapping.local_field, 'isbn')
-        self.assertEqual(mapping.remote_field, 'isbn')
+        """ a function is provided to modify the data """
+        formatter = lambda x: "aa" + x
+        mapping = Mapping("isbn", formatter=formatter)
+        self.assertEqual(mapping.local_field, "isbn")
+        self.assertEqual(mapping.remote_field, "isbn")
         self.assertEqual(mapping.formatter, formatter)
-        self.assertEqual(mapping.formatter('bb'), 'aabb')
+        self.assertEqual(mapping.formatter("bb"), "aabb")
diff --git a/bookwyrm/tests/connectors/test_bookwyrm_connector.py b/bookwyrm/tests/connectors/test_bookwyrm_connector.py
index 6b00b0e3..1fc71688 100644
--- a/bookwyrm/tests/connectors/test_bookwyrm_connector.py
+++ b/bookwyrm/tests/connectors/test_bookwyrm_connector.py
@@ -1,4 +1,4 @@
-''' testing book data connectors '''
+""" testing book data connectors """
 import json
 import pathlib
 from django.test import TestCase
@@ -9,39 +9,36 @@ from bookwyrm.connectors.abstract_connector import SearchResult
 
 
 class BookWyrmConnector(TestCase):
-    ''' this connector doesn't do much, just search '''
-    def setUp(self):
-        ''' create the connector '''
-        models.Connector.objects.create(
-            identifier='example.com',
-            connector_file='bookwyrm_connector',
-            base_url='https://example.com',
-            books_url='https://example.com',
-            covers_url='https://example.com/images/covers',
-            search_url='https://example.com/search?q=',
-        )
-        self.connector = Connector('example.com')
+    """ this connector doesn't do much, just search """
 
-        work_file = pathlib.Path(__file__).parent.joinpath(
-            '../data/bw_work.json')
-        edition_file = pathlib.Path(__file__).parent.joinpath(
-            '../data/bw_edition.json')
+    def setUp(self):
+        """ create the connector """
+        models.Connector.objects.create(
+            identifier="example.com",
+            connector_file="bookwyrm_connector",
+            base_url="https://example.com",
+            books_url="https://example.com",
+            covers_url="https://example.com/images/covers",
+            search_url="https://example.com/search?q=",
+        )
+        self.connector = Connector("example.com")
+
+        work_file = pathlib.Path(__file__).parent.joinpath("../data/bw_work.json")
+        edition_file = pathlib.Path(__file__).parent.joinpath("../data/bw_edition.json")
         self.work_data = json.loads(work_file.read_bytes())
         self.edition_data = json.loads(edition_file.read_bytes())
 
-
     def test_format_search_result(self):
-        ''' create a SearchResult object from search response json '''
-        datafile = pathlib.Path(__file__).parent.joinpath(
-            '../data/bw_search.json')
+        """ create a SearchResult object from search response json """
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/bw_search.json")
         search_data = json.loads(datafile.read_bytes())
         results = self.connector.parse_search_data(search_data)
         self.assertIsInstance(results, list)
 
         result = self.connector.format_search_result(results[0])
         self.assertIsInstance(result, SearchResult)
-        self.assertEqual(result.title, 'Jonathan Strange and Mr Norrell')
-        self.assertEqual(result.key, 'https://example.com/book/122')
-        self.assertEqual(result.author, 'Susanna Clarke')
+        self.assertEqual(result.title, "Jonathan Strange and Mr Norrell")
+        self.assertEqual(result.key, "https://example.com/book/122")
+        self.assertEqual(result.author, "Susanna Clarke")
         self.assertEqual(result.year, 2017)
         self.assertEqual(result.connector, self.connector)
diff --git a/bookwyrm/tests/connectors/test_connector_manager.py b/bookwyrm/tests/connectors/test_connector_manager.py
index 783b5a27..4410e011 100644
--- a/bookwyrm/tests/connectors/test_connector_manager.py
+++ b/bookwyrm/tests/connectors/test_connector_manager.py
@@ -1,54 +1,49 @@
-''' interface between the app and various connectors '''
+""" interface between the app and various connectors """
 from django.test import TestCase
 
 from bookwyrm import models
 from bookwyrm.connectors import connector_manager
-from bookwyrm.connectors.bookwyrm_connector \
-    import Connector as BookWyrmConnector
-from bookwyrm.connectors.self_connector \
-    import Connector as SelfConnector
+from bookwyrm.connectors.bookwyrm_connector import Connector as BookWyrmConnector
+from bookwyrm.connectors.self_connector import Connector as SelfConnector
 
 
 class ConnectorManager(TestCase):
-    ''' interface between the app and various connectors '''
+    """ interface between the app and various connectors """
+
     def setUp(self):
-        ''' we'll need some books and a connector info entry '''
-        self.work = models.Work.objects.create(
-            title='Example Work'
-        )
+        """ we'll need some books and a connector info entry """
+        self.work = models.Work.objects.create(title="Example Work")
 
         self.edition = models.Edition.objects.create(
-            title='Example Edition',
-            parent_work=self.work
+            title="Example Edition", parent_work=self.work
         )
         self.work.default_edition = self.edition
         self.work.save()
 
         self.connector = models.Connector.objects.create(
-            identifier='test_connector',
+            identifier="test_connector",
             priority=1,
             local=True,
-            connector_file='self_connector',
-            base_url='http://test.com/',
-            books_url='http://test.com/',
-            covers_url='http://test.com/',
+            connector_file="self_connector",
+            base_url="http://test.com/",
+            books_url="http://test.com/",
+            covers_url="http://test.com/",
         )
 
-
     def test_get_or_create_connector(self):
-        ''' loads a connector if the data source is known or creates one '''
-        remote_id = 'https://example.com/object/1'
+        """ loads a connector if the data source is known or creates one """
+        remote_id = "https://example.com/object/1"
         connector = connector_manager.get_or_create_connector(remote_id)
         self.assertIsInstance(connector, BookWyrmConnector)
-        self.assertEqual(connector.identifier, 'example.com')
-        self.assertEqual(connector.base_url, 'https://example.com')
+        self.assertEqual(connector.identifier, "example.com")
+        self.assertEqual(connector.base_url, "https://example.com")
 
         same_connector = connector_manager.get_or_create_connector(remote_id)
         self.assertEqual(connector.identifier, same_connector.identifier)
 
     def test_get_connectors(self):
-        ''' load all connectors '''
-        remote_id = 'https://example.com/object/1'
+        """ load all connectors """
+        remote_id = "https://example.com/object/1"
         connector_manager.get_or_create_connector(remote_id)
         connectors = list(connector_manager.get_connectors())
         self.assertEqual(len(connectors), 2)
@@ -56,28 +51,28 @@ class ConnectorManager(TestCase):
         self.assertIsInstance(connectors[1], BookWyrmConnector)
 
     def test_search(self):
-        ''' search all connectors '''
-        results = connector_manager.search('Example')
+        """ search all connectors """
+        results = connector_manager.search("Example")
         self.assertEqual(len(results), 1)
-        self.assertIsInstance(results[0]['connector'], SelfConnector)
-        self.assertEqual(len(results[0]['results']), 1)
-        self.assertEqual(results[0]['results'][0].title, 'Example Edition')
+        self.assertIsInstance(results[0]["connector"], SelfConnector)
+        self.assertEqual(len(results[0]["results"]), 1)
+        self.assertEqual(results[0]["results"][0].title, "Example Edition")
 
     def test_local_search(self):
-        ''' search only the local database '''
-        results = connector_manager.local_search('Example')
+        """ search only the local database """
+        results = connector_manager.local_search("Example")
         self.assertEqual(len(results), 1)
-        self.assertEqual(results[0].title, 'Example Edition')
+        self.assertEqual(results[0].title, "Example Edition")
 
     def test_first_search_result(self):
-        ''' only get one search result '''
-        result = connector_manager.first_search_result('Example')
-        self.assertEqual(result.title, 'Example Edition')
-        no_result = connector_manager.first_search_result('dkjfhg')
+        """ only get one search result """
+        result = connector_manager.first_search_result("Example")
+        self.assertEqual(result.title, "Example Edition")
+        no_result = connector_manager.first_search_result("dkjfhg")
         self.assertIsNone(no_result)
 
     def test_load_connector(self):
-        ''' load a connector object from the database entry '''
+        """ load a connector object from the database entry """
         connector = connector_manager.load_connector(self.connector)
         self.assertIsInstance(connector, SelfConnector)
-        self.assertEqual(connector.identifier, 'test_connector')
+        self.assertEqual(connector.identifier, "test_connector")
diff --git a/bookwyrm/tests/connectors/test_openlibrary_connector.py b/bookwyrm/tests/connectors/test_openlibrary_connector.py
index a174300a..bb018830 100644
--- a/bookwyrm/tests/connectors/test_openlibrary_connector.py
+++ b/bookwyrm/tests/connectors/test_openlibrary_connector.py
@@ -1,4 +1,4 @@
-''' testing book data connectors '''
+""" testing book data connectors """
 import json
 import pathlib
 from unittest.mock import patch
@@ -9,253 +9,231 @@ import responses
 from bookwyrm import models
 from bookwyrm.connectors.openlibrary import Connector
 from bookwyrm.connectors.openlibrary import get_languages, get_description
-from bookwyrm.connectors.openlibrary import pick_default_edition, \
-        get_openlibrary_key
+from bookwyrm.connectors.openlibrary import pick_default_edition, get_openlibrary_key
 from bookwyrm.connectors.abstract_connector import SearchResult
 from bookwyrm.connectors.connector_manager import ConnectorException
 
 
 class Openlibrary(TestCase):
-    ''' test loading data from openlibrary.org '''
-    def setUp(self):
-        ''' creates the connector we'll use '''
-        models.Connector.objects.create(
-            identifier='openlibrary.org',
-            name='OpenLibrary',
-            connector_file='openlibrary',
-            base_url='https://openlibrary.org',
-            books_url='https://openlibrary.org',
-            covers_url='https://covers.openlibrary.org',
-            search_url='https://openlibrary.org/search?q=',
-            isbn_search_url='https://openlibrary.org/isbn',
-        )
-        self.connector = Connector('openlibrary.org')
+    """ test loading data from openlibrary.org """
 
-        work_file = pathlib.Path(__file__).parent.joinpath(
-            '../data/ol_work.json')
-        edition_file = pathlib.Path(__file__).parent.joinpath(
-            '../data/ol_edition.json')
+    def setUp(self):
+        """ creates the connector we'll use """
+        models.Connector.objects.create(
+            identifier="openlibrary.org",
+            name="OpenLibrary",
+            connector_file="openlibrary",
+            base_url="https://openlibrary.org",
+            books_url="https://openlibrary.org",
+            covers_url="https://covers.openlibrary.org",
+            search_url="https://openlibrary.org/search?q=",
+            isbn_search_url="https://openlibrary.org/isbn",
+        )
+        self.connector = Connector("openlibrary.org")
+
+        work_file = pathlib.Path(__file__).parent.joinpath("../data/ol_work.json")
+        edition_file = pathlib.Path(__file__).parent.joinpath("../data/ol_edition.json")
         edition_list_file = pathlib.Path(__file__).parent.joinpath(
-            '../data/ol_edition_list.json')
+            "../data/ol_edition_list.json"
+        )
         self.work_data = json.loads(work_file.read_bytes())
         self.edition_data = json.loads(edition_file.read_bytes())
         self.edition_list_data = json.loads(edition_list_file.read_bytes())
 
-
     def test_get_remote_id_from_data(self):
-        ''' format the remote id from the data '''
-        data = {'key': '/work/OL1234W'}
+        """ format the remote id from the data """
+        data = {"key": "/work/OL1234W"}
         result = self.connector.get_remote_id_from_data(data)
-        self.assertEqual(result, 'https://openlibrary.org/work/OL1234W')
+        self.assertEqual(result, "https://openlibrary.org/work/OL1234W")
         # error handlding
         with self.assertRaises(ConnectorException):
             self.connector.get_remote_id_from_data({})
 
-
     def test_is_work_data(self):
-        ''' detect if the loaded json is a work '''
+        """ detect if the loaded json is a work """
         self.assertEqual(self.connector.is_work_data(self.work_data), True)
         self.assertEqual(self.connector.is_work_data(self.edition_data), False)
 
-
     @responses.activate
     def test_get_edition_from_work_data(self):
-        ''' loads a list of editions '''
-        data = {'key': '/work/OL1234W'}
+        """ loads a list of editions """
+        data = {"key": "/work/OL1234W"}
         responses.add(
             responses.GET,
-            'https://openlibrary.org/work/OL1234W/editions',
-            json={'entries': []},
-            status=200)
-        with patch('bookwyrm.connectors.openlibrary.pick_default_edition') \
-                as pick_edition:
-            pick_edition.return_value = 'hi'
+            "https://openlibrary.org/work/OL1234W/editions",
+            json={"entries": []},
+            status=200,
+        )
+        with patch(
+            "bookwyrm.connectors.openlibrary.pick_default_edition"
+        ) as pick_edition:
+            pick_edition.return_value = "hi"
             result = self.connector.get_edition_from_work_data(data)
-        self.assertEqual(result, 'hi')
-
+        self.assertEqual(result, "hi")
 
     @responses.activate
     def test_get_work_from_edition_data(self):
-        ''' loads a list of editions '''
-        data = {'works': [{'key': '/work/OL1234W'}]}
+        """ loads a list of editions """
+        data = {"works": [{"key": "/work/OL1234W"}]}
         responses.add(
             responses.GET,
-            'https://openlibrary.org/work/OL1234W',
-            json={'hi': 'there'},
-            status=200)
+            "https://openlibrary.org/work/OL1234W",
+            json={"hi": "there"},
+            status=200,
+        )
         result = self.connector.get_work_from_edition_data(data)
-        self.assertEqual(result, {'hi': 'there'})
-
+        self.assertEqual(result, {"hi": "there"})
 
     @responses.activate
     def test_get_authors_from_data(self):
-        ''' find authors in data '''
+        """ find authors in data """
         responses.add(
             responses.GET,
-            'https://openlibrary.org/authors/OL382982A',
+            "https://openlibrary.org/authors/OL382982A",
             json={
                 "name": "George Elliott",
                 "personal_name": "George Elliott",
                 "last_modified": {
                     "type": "/type/datetime",
-                    "value": "2008-08-31 10:09:33.413686"
-                    },
+                    "value": "2008-08-31 10:09:33.413686",
+                },
                 "key": "/authors/OL453734A",
-                "type": {
-                    "key": "/type/author"
-                    },
+                "type": {"key": "/type/author"},
                 "id": 1259965,
-                "revision": 2
+                "revision": 2,
             },
-            status=200)
+            status=200,
+        )
         results = self.connector.get_authors_from_data(self.work_data)
         result = list(results)[0]
         self.assertIsInstance(result, models.Author)
-        self.assertEqual(result.name, 'George Elliott')
-        self.assertEqual(result.openlibrary_key, 'OL453734A')
-
+        self.assertEqual(result.name, "George Elliott")
+        self.assertEqual(result.openlibrary_key, "OL453734A")
 
     def test_get_cover_url(self):
-        ''' formats a url that should contain the cover image '''
-        blob = ['image']
+        """ formats a url that should contain the cover image """
+        blob = ["image"]
         result = self.connector.get_cover_url(blob)
-        self.assertEqual(
-            result, 'https://covers.openlibrary.org/b/id/image-L.jpg')
+        self.assertEqual(result, "https://covers.openlibrary.org/b/id/image-L.jpg")
 
     def test_parse_search_result(self):
-        ''' extract the results from the search json response '''
-        datafile = pathlib.Path(__file__).parent.joinpath(
-            '../data/ol_search.json')
+        """ extract the results from the search json response """
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/ol_search.json")
         search_data = json.loads(datafile.read_bytes())
         result = self.connector.parse_search_data(search_data)
         self.assertIsInstance(result, list)
         self.assertEqual(len(result), 2)
 
-
     def test_format_search_result(self):
-        ''' translate json from openlibrary into SearchResult '''
-        datafile = pathlib.Path(__file__).parent.joinpath(
-            '../data/ol_search.json')
+        """ translate json from openlibrary into SearchResult """
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/ol_search.json")
         search_data = json.loads(datafile.read_bytes())
         results = self.connector.parse_search_data(search_data)
         self.assertIsInstance(results, list)
 
         result = self.connector.format_search_result(results[0])
         self.assertIsInstance(result, SearchResult)
-        self.assertEqual(result.title, 'This Is How You Lose the Time War')
-        self.assertEqual(
-            result.key, 'https://openlibrary.org/works/OL20639540W')
-        self.assertEqual(result.author, 'Amal El-Mohtar, Max Gladstone')
+        self.assertEqual(result.title, "This Is How You Lose the Time War")
+        self.assertEqual(result.key, "https://openlibrary.org/works/OL20639540W")
+        self.assertEqual(result.author, "Amal El-Mohtar, Max Gladstone")
         self.assertEqual(result.year, 2019)
         self.assertEqual(result.connector, self.connector)
 
-
     def test_parse_isbn_search_result(self):
-        ''' extract the results from the search json response '''
-        datafile = pathlib.Path(__file__).parent.joinpath(
-            '../data/ol_isbn_search.json')
+        """ extract the results from the search json response """
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/ol_isbn_search.json")
         search_data = json.loads(datafile.read_bytes())
         result = self.connector.parse_isbn_search_data(search_data)
         self.assertIsInstance(result, list)
         self.assertEqual(len(result), 1)
 
-
     def test_format_isbn_search_result(self):
-        ''' translate json from openlibrary into SearchResult '''
-        datafile = pathlib.Path(__file__).parent.joinpath(
-            '../data/ol_isbn_search.json')
+        """ translate json from openlibrary into SearchResult """
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/ol_isbn_search.json")
         search_data = json.loads(datafile.read_bytes())
         results = self.connector.parse_isbn_search_data(search_data)
         self.assertIsInstance(results, list)
 
         result = self.connector.format_isbn_search_result(results[0])
         self.assertIsInstance(result, SearchResult)
-        self.assertEqual(result.title, 'Les ombres errantes')
-        self.assertEqual(
-            result.key, 'https://openlibrary.org/books/OL16262504M')
-        self.assertEqual(result.author, 'Pascal Quignard')
-        self.assertEqual(result.year, '2002')
+        self.assertEqual(result.title, "Les ombres errantes")
+        self.assertEqual(result.key, "https://openlibrary.org/books/OL16262504M")
+        self.assertEqual(result.author, "Pascal Quignard")
+        self.assertEqual(result.year, "2002")
         self.assertEqual(result.connector, self.connector)
 
-
     @responses.activate
     def test_load_edition_data(self):
-        ''' format url from key and make request '''
-        key = 'OL1234W'
+        """ format url from key and make request """
+        key = "OL1234W"
         responses.add(
             responses.GET,
-            'https://openlibrary.org/works/OL1234W/editions',
-            json={'hi': 'there'}
+            "https://openlibrary.org/works/OL1234W/editions",
+            json={"hi": "there"},
         )
         result = self.connector.load_edition_data(key)
-        self.assertEqual(result, {'hi': 'there'})
-
+        self.assertEqual(result, {"hi": "there"})
 
     @responses.activate
     def test_expand_book_data(self):
-        ''' given a book, get more editions '''
-        work = models.Work.objects.create(
-            title='Test Work', openlibrary_key='OL1234W')
-        edition = models.Edition.objects.create(
-            title='Test Edition', parent_work=work)
+        """ given a book, get more editions """
+        work = models.Work.objects.create(title="Test Work", openlibrary_key="OL1234W")
+        edition = models.Edition.objects.create(title="Test Edition", parent_work=work)
 
         responses.add(
             responses.GET,
-            'https://openlibrary.org/works/OL1234W/editions',
-            json={'entries': []},
+            "https://openlibrary.org/works/OL1234W/editions",
+            json={"entries": []},
         )
         with patch(
-                'bookwyrm.connectors.abstract_connector.AbstractConnector.' \
-                    'create_edition_from_data'):
+            "bookwyrm.connectors.abstract_connector.AbstractConnector."
+            "create_edition_from_data"
+        ):
             self.connector.expand_book_data(edition)
             self.connector.expand_book_data(work)
 
-
     def test_get_description(self):
-        ''' should do some cleanup on the description data '''
-        description = get_description(self.work_data['description'])
-        expected = 'First in the Old Kingdom/Abhorsen series.'
+        """ should do some cleanup on the description data """
+        description = get_description(self.work_data["description"])
+        expected = "First in the Old Kingdom/Abhorsen series."
         self.assertEqual(description, expected)
 
-
     def test_get_openlibrary_key(self):
-        ''' extracts the uuid '''
-        key = get_openlibrary_key('/books/OL27320736M')
-        self.assertEqual(key, 'OL27320736M')
-
+        """ extracts the uuid """
+        key = get_openlibrary_key("/books/OL27320736M")
+        self.assertEqual(key, "OL27320736M")
 
     def test_get_languages(self):
-        ''' looks up languages from a list '''
-        languages = get_languages(self.edition_data['languages'])
-        self.assertEqual(languages, ['English'])
-
+        """ looks up languages from a list """
+        languages = get_languages(self.edition_data["languages"])
+        self.assertEqual(languages, ["English"])
 
     def test_pick_default_edition(self):
-        ''' detect if the loaded json is an edition '''
-        edition = pick_default_edition(self.edition_list_data['entries'])
-        self.assertEqual(edition['key'], '/books/OL9788823M')
-
+        """ detect if the loaded json is an edition """
+        edition = pick_default_edition(self.edition_list_data["entries"])
+        self.assertEqual(edition["key"], "/books/OL9788823M")
 
     @responses.activate
     def test_create_edition_from_data(self):
-        ''' okay but can it actually create an edition with proper metadata '''
-        work = models.Work.objects.create(title='Hello')
+        """ okay but can it actually create an edition with proper metadata """
+        work = models.Work.objects.create(title="Hello")
         responses.add(
             responses.GET,
-            'https://openlibrary.org/authors/OL382982A',
-            json={'hi': 'there'},
-            status=200)
-        with patch('bookwyrm.connectors.openlibrary.Connector.' \
-                'get_authors_from_data') as mock:
+            "https://openlibrary.org/authors/OL382982A",
+            json={"hi": "there"},
+            status=200,
+        )
+        with patch(
+            "bookwyrm.connectors.openlibrary.Connector." "get_authors_from_data"
+        ) as mock:
             mock.return_value = []
-            result = self.connector.create_edition_from_data(
-                work, self.edition_data)
+            result = self.connector.create_edition_from_data(work, self.edition_data)
         self.assertEqual(result.parent_work, work)
-        self.assertEqual(result.title, 'Sabriel')
-        self.assertEqual(result.isbn_10, '0060273224')
+        self.assertEqual(result.title, "Sabriel")
+        self.assertEqual(result.isbn_10, "0060273224")
         self.assertIsNotNone(result.description)
-        self.assertEqual(result.languages[0], 'English')
-        self.assertEqual(result.publishers[0], 'Harper Trophy')
+        self.assertEqual(result.languages[0], "English")
+        self.assertEqual(result.publishers[0], "Harper Trophy")
         self.assertEqual(result.pages, 491)
-        self.assertEqual(result.subjects[0], 'Fantasy.')
-        self.assertEqual(result.physical_format, 'Hardcover')
+        self.assertEqual(result.subjects[0], "Fantasy.")
+        self.assertEqual(result.physical_format, "Hardcover")
diff --git a/bookwyrm/tests/connectors/test_self_connector.py b/bookwyrm/tests/connectors/test_self_connector.py
index 0fc78955..9925f594 100644
--- a/bookwyrm/tests/connectors/test_self_connector.py
+++ b/bookwyrm/tests/connectors/test_self_connector.py
@@ -1,4 +1,4 @@
-''' testing book data connectors '''
+""" testing book data connectors """
 import datetime
 from django.test import TestCase
 from django.utils import timezone
@@ -9,100 +9,98 @@ from bookwyrm.settings import DOMAIN
 
 
 class SelfConnector(TestCase):
-    ''' just uses local data '''
+    """ just uses local data """
+
     def setUp(self):
-        ''' creating the connector '''
+        """ creating the connector """
         models.Connector.objects.create(
             identifier=DOMAIN,
-            name='Local',
+            name="Local",
             local=True,
-            connector_file='self_connector',
-            base_url='https://%s' % DOMAIN,
-            books_url='https://%s/book' % DOMAIN,
-            covers_url='https://%s/images/covers' % DOMAIN,
-            search_url='https://%s/search?q=' % DOMAIN,
+            connector_file="self_connector",
+            base_url="https://%s" % DOMAIN,
+            books_url="https://%s/book" % DOMAIN,
+            covers_url="https://%s/images/covers" % DOMAIN,
+            search_url="https://%s/search?q=" % DOMAIN,
             priority=1,
         )
         self.connector = Connector(DOMAIN)
 
-
     def test_format_search_result(self):
-        ''' create a SearchResult '''
-        author = models.Author.objects.create(name='Anonymous')
+        """ create a SearchResult """
+        author = models.Author.objects.create(name="Anonymous")
         edition = models.Edition.objects.create(
-            title='Edition of Example Work',
+            title="Edition of Example Work",
             published_date=datetime.datetime(1980, 5, 10, tzinfo=timezone.utc),
         )
         edition.authors.add(author)
-        result = self.connector.search('Edition of Example')[0]
-        self.assertEqual(result.title, 'Edition of Example Work')
+        result = self.connector.search("Edition of Example")[0]
+        self.assertEqual(result.title, "Edition of Example Work")
         self.assertEqual(result.key, edition.remote_id)
-        self.assertEqual(result.author, 'Anonymous')
+        self.assertEqual(result.author, "Anonymous")
         self.assertEqual(result.year, 1980)
         self.assertEqual(result.connector, self.connector)
 
-
     def test_search_rank(self):
-        ''' prioritize certain results '''
-        author = models.Author.objects.create(name='Anonymous')
+        """ prioritize certain results """
+        author = models.Author.objects.create(name="Anonymous")
         edition = models.Edition.objects.create(
-            title='Edition of Example Work',
+            title="Edition of Example Work",
             published_date=datetime.datetime(1980, 5, 10, tzinfo=timezone.utc),
-            parent_work=models.Work.objects.create(title='')
+            parent_work=models.Work.objects.create(title=""),
         )
         # author text is rank C
         edition.authors.add(author)
 
         # series is rank D
         models.Edition.objects.create(
-            title='Another Edition',
-            series='Anonymous',
-            parent_work=models.Work.objects.create(title='')
+            title="Another Edition",
+            series="Anonymous",
+            parent_work=models.Work.objects.create(title=""),
         )
         # subtitle is rank B
         models.Edition.objects.create(
-            title='More Editions',
-            subtitle='The Anonymous Edition',
-            parent_work=models.Work.objects.create(title='')
+            title="More Editions",
+            subtitle="The Anonymous Edition",
+            parent_work=models.Work.objects.create(title=""),
         )
         # title is rank A
-        models.Edition.objects.create(title='Anonymous')
+        models.Edition.objects.create(title="Anonymous")
         # doesn't rank in this search
         edition = models.Edition.objects.create(
-            title='An Edition',
-            parent_work=models.Work.objects.create(title='')
+            title="An Edition", parent_work=models.Work.objects.create(title="")
         )
 
-        results = self.connector.search('Anonymous')
+        results = self.connector.search("Anonymous")
         self.assertEqual(len(results), 3)
-        self.assertEqual(results[0].title, 'Anonymous')
-        self.assertEqual(results[1].title, 'More Editions')
-        self.assertEqual(results[2].title, 'Edition of Example Work')
-
+        self.assertEqual(results[0].title, "Anonymous")
+        self.assertEqual(results[1].title, "More Editions")
+        self.assertEqual(results[2].title, "Edition of Example Work")
 
     def test_search_multiple_editions(self):
-        ''' it should get rid of duplicate editions for the same work '''
-        work = models.Work.objects.create(title='Work Title')
+        """ it should get rid of duplicate editions for the same work """
+        work = models.Work.objects.create(title="Work Title")
         edition_1 = models.Edition.objects.create(
-            title='Edition 1 Title', parent_work=work)
+            title="Edition 1 Title", parent_work=work
+        )
         edition_2 = models.Edition.objects.create(
-            title='Edition 2 Title', parent_work=work)
-        edition_3 = models.Edition.objects.create(
-            title='Fish', parent_work=work)
+            title="Edition 2 Title", parent_work=work
+        )
+        edition_3 = models.Edition.objects.create(title="Fish", parent_work=work)
         work.default_edition = edition_2
         work.save()
 
         # pick the best edition
-        results = self.connector.search('Edition 1 Title')
+        results = self.connector.search("Edition 1 Title")
         self.assertEqual(len(results), 1)
         self.assertEqual(results[0].key, edition_1.remote_id)
 
         # pick the default edition when no match is best
-        results = self.connector.search('Edition Title')
+        results = self.connector.search("Edition Title")
         self.assertEqual(len(results), 1)
         self.assertEqual(results[0].key, edition_2.remote_id)
 
         # only matches one edition, so no deduplication takes place
-        results = self.connector.search('Fish')
+        results = self.connector.search("Fish")
         self.assertEqual(len(results), 1)
         self.assertEqual(results[0].key, edition_3.remote_id)
diff --git a/bookwyrm/tests/models/test_activitypub_mixin.py b/bookwyrm/tests/models/test_activitypub_mixin.py
index 11b944d9..930f3a53 100644
--- a/bookwyrm/tests/models/test_activitypub_mixin.py
+++ b/bookwyrm/tests/models/test_activitypub_mixin.py
@@ -1,4 +1,4 @@
-''' testing model activitypub utilities '''
+""" testing model activitypub utilities """
 from unittest.mock import patch
 from collections import namedtuple
 from dataclasses import dataclass
@@ -12,238 +12,249 @@ from bookwyrm.models import base_model
 from bookwyrm.models.activitypub_mixin import ActivitypubMixin
 from bookwyrm.models.activitypub_mixin import ActivityMixin, ObjectMixin
 
+
 class ActivitypubMixins(TestCase):
-    ''' functionality shared across models '''
+    """ functionality shared across models """
+
     def setUp(self):
-        ''' shared data '''
+        """ shared data """
         self.local_user = models.User.objects.create_user(
-            'mouse', 'mouse@mouse.com', 'mouseword',
-            local=True, localname='mouse')
-        self.local_user.remote_id = 'http://example.com/a/b'
+            "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse"
+        )
+        self.local_user.remote_id = "http://example.com/a/b"
         self.local_user.save(broadcast=False)
-        with patch('bookwyrm.models.user.set_remote_server.delay'):
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
             self.remote_user = models.User.objects.create_user(
-                'rat', 'rat@rat.com', 'ratword',
+                "rat",
+                "rat@rat.com",
+                "ratword",
                 local=False,
-                remote_id='https://example.com/users/rat',
-                inbox='https://example.com/users/rat/inbox',
-                outbox='https://example.com/users/rat/outbox',
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
             )
 
         self.object_mock = {
-            'to': 'to field', 'cc': 'cc field',
-            'content': 'hi', 'id': 'bip', 'type': 'Test',
-            'published': '2020-12-04T17:52:22.623807+00:00',
+            "to": "to field",
+            "cc": "cc field",
+            "content": "hi",
+            "id": "bip",
+            "type": "Test",
+            "published": "2020-12-04T17:52:22.623807+00:00",
         }
 
-
     # ActivitypubMixin
     def test_to_activity(self):
-        ''' model to ActivityPub json '''
+        """ model to ActivityPub json """
+
         @dataclass(init=False)
         class TestActivity(ActivityObject):
-            ''' real simple mock '''
-            type: str = 'Test'
+            """ real simple mock """
+
+            type: str = "Test"
 
         class TestModel(ActivitypubMixin, base_model.BookWyrmModel):
-            ''' real simple mock model because BookWyrmModel is abstract '''
+            """ real simple mock model because BookWyrmModel is abstract """
 
         instance = TestModel()
-        instance.remote_id = 'https://www.example.com/test'
+        instance.remote_id = "https://www.example.com/test"
         instance.activity_serializer = TestActivity
 
         activity = instance.to_activity()
         self.assertIsInstance(activity, dict)
-        self.assertEqual(activity['id'], 'https://www.example.com/test')
-        self.assertEqual(activity['type'], 'Test')
-
+        self.assertEqual(activity["id"], "https://www.example.com/test")
+        self.assertEqual(activity["type"], "Test")
 
     def test_find_existing_by_remote_id(self):
-        ''' attempt to match a remote id to an object in the db '''
+        """ attempt to match a remote id to an object in the db """
         # uses a different remote id scheme
         # this isn't really part of this test directly but it's helpful to state
         book = models.Edition.objects.create(
-            title='Test Edition', remote_id='http://book.com/book')
+            title="Test Edition", remote_id="http://book.com/book"
+        )
 
-        self.assertEqual(book.origin_id, 'http://book.com/book')
-        self.assertNotEqual(book.remote_id, 'http://book.com/book')
+        self.assertEqual(book.origin_id, "http://book.com/book")
+        self.assertNotEqual(book.remote_id, "http://book.com/book")
 
         # uses subclasses
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             models.Comment.objects.create(
-                user=self.local_user, content='test status', book=book, \
-                remote_id='https://comment.net')
+                user=self.local_user,
+                content="test status",
+                book=book,
+                remote_id="https://comment.net",
+            )
 
-        result = models.User.find_existing_by_remote_id('hi')
+        result = models.User.find_existing_by_remote_id("hi")
         self.assertIsNone(result)
 
-        result = models.User.find_existing_by_remote_id(
-            'http://example.com/a/b')
+        result = models.User.find_existing_by_remote_id("http://example.com/a/b")
         self.assertEqual(result, self.local_user)
 
         # test using origin id
-        result = models.Edition.find_existing_by_remote_id(
-            'http://book.com/book')
+        result = models.Edition.find_existing_by_remote_id("http://book.com/book")
         self.assertEqual(result, book)
 
         # test subclass match
-        result = models.Status.find_existing_by_remote_id(
-            'https://comment.net')
-
+        result = models.Status.find_existing_by_remote_id("https://comment.net")
 
     def test_find_existing(self):
-        ''' match a blob of data to a model '''
+        """ match a blob of data to a model """
         book = models.Edition.objects.create(
-            title='Test edition',
-            openlibrary_key='OL1234',
+            title="Test edition",
+            openlibrary_key="OL1234",
         )
 
-        result = models.Edition.find_existing(
-            {'openlibraryKey': 'OL1234'})
+        result = models.Edition.find_existing({"openlibraryKey": "OL1234"})
         self.assertEqual(result, book)
 
-
     def test_get_recipients_public_object(self):
-        ''' determines the recipients for an object's broadcast '''
-        MockSelf = namedtuple('Self', ('privacy'))
-        mock_self = MockSelf('public')
+        """ determines the recipients for an object's broadcast """
+        MockSelf = namedtuple("Self", ("privacy"))
+        mock_self = MockSelf("public")
         recipients = ActivitypubMixin.get_recipients(mock_self)
         self.assertEqual(len(recipients), 1)
         self.assertEqual(recipients[0], self.remote_user.inbox)
 
-
     def test_get_recipients_public_user_object_no_followers(self):
-        ''' determines the recipients for a user's object broadcast '''
-        MockSelf = namedtuple('Self', ('privacy', 'user'))
-        mock_self = MockSelf('public', self.local_user)
+        """ determines the recipients for a user's object broadcast """
+        MockSelf = namedtuple("Self", ("privacy", "user"))
+        mock_self = MockSelf("public", self.local_user)
 
         recipients = ActivitypubMixin.get_recipients(mock_self)
         self.assertEqual(len(recipients), 0)
 
-
     def test_get_recipients_public_user_object(self):
-        ''' determines the recipients for a user's object broadcast '''
-        MockSelf = namedtuple('Self', ('privacy', 'user'))
-        mock_self = MockSelf('public', self.local_user)
+        """ determines the recipients for a user's object broadcast """
+        MockSelf = namedtuple("Self", ("privacy", "user"))
+        mock_self = MockSelf("public", self.local_user)
         self.local_user.followers.add(self.remote_user)
 
         recipients = ActivitypubMixin.get_recipients(mock_self)
         self.assertEqual(len(recipients), 1)
         self.assertEqual(recipients[0], self.remote_user.inbox)
 
-
     def test_get_recipients_public_user_object_with_mention(self):
-        ''' determines the recipients for a user's object broadcast '''
-        MockSelf = namedtuple('Self', ('privacy', 'user'))
-        mock_self = MockSelf('public', self.local_user)
+        """ determines the recipients for a user's object broadcast """
+        MockSelf = namedtuple("Self", ("privacy", "user"))
+        mock_self = MockSelf("public", self.local_user)
         self.local_user.followers.add(self.remote_user)
-        with patch('bookwyrm.models.user.set_remote_server.delay'):
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
             another_remote_user = models.User.objects.create_user(
-                'nutria', 'nutria@nutria.com', 'nutriaword',
+                "nutria",
+                "nutria@nutria.com",
+                "nutriaword",
                 local=False,
-                remote_id='https://example.com/users/nutria',
-                inbox='https://example.com/users/nutria/inbox',
-                outbox='https://example.com/users/nutria/outbox',
+                remote_id="https://example.com/users/nutria",
+                inbox="https://example.com/users/nutria/inbox",
+                outbox="https://example.com/users/nutria/outbox",
             )
-        MockSelf = namedtuple('Self', ('privacy', 'user', 'recipients'))
-        mock_self = MockSelf('public', self.local_user, [another_remote_user])
+        MockSelf = namedtuple("Self", ("privacy", "user", "recipients"))
+        mock_self = MockSelf("public", self.local_user, [another_remote_user])
 
         recipients = ActivitypubMixin.get_recipients(mock_self)
         self.assertEqual(len(recipients), 2)
         self.assertEqual(recipients[0], another_remote_user.inbox)
         self.assertEqual(recipients[1], self.remote_user.inbox)
 
-
     def test_get_recipients_direct(self):
-        ''' determines the recipients for a user's object broadcast '''
-        MockSelf = namedtuple('Self', ('privacy', 'user'))
-        mock_self = MockSelf('public', self.local_user)
+        """ determines the recipients for a user's object broadcast """
+        MockSelf = namedtuple("Self", ("privacy", "user"))
+        mock_self = MockSelf("public", self.local_user)
         self.local_user.followers.add(self.remote_user)
-        with patch('bookwyrm.models.user.set_remote_server.delay'):
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
             another_remote_user = models.User.objects.create_user(
-                'nutria', 'nutria@nutria.com', 'nutriaword',
+                "nutria",
+                "nutria@nutria.com",
+                "nutriaword",
                 local=False,
-                remote_id='https://example.com/users/nutria',
-                inbox='https://example.com/users/nutria/inbox',
-                outbox='https://example.com/users/nutria/outbox',
+                remote_id="https://example.com/users/nutria",
+                inbox="https://example.com/users/nutria/inbox",
+                outbox="https://example.com/users/nutria/outbox",
             )
-        MockSelf = namedtuple('Self', ('privacy', 'user', 'recipients'))
-        mock_self = MockSelf('direct', self.local_user, [another_remote_user])
+        MockSelf = namedtuple("Self", ("privacy", "user", "recipients"))
+        mock_self = MockSelf("direct", self.local_user, [another_remote_user])
 
         recipients = ActivitypubMixin.get_recipients(mock_self)
         self.assertEqual(len(recipients), 1)
         self.assertEqual(recipients[0], another_remote_user.inbox)
 
-
     def test_get_recipients_combine_inboxes(self):
-        ''' should combine users with the same shared_inbox '''
-        self.remote_user.shared_inbox = 'http://example.com/inbox'
+        """ should combine users with the same shared_inbox """
+        self.remote_user.shared_inbox = "http://example.com/inbox"
         self.remote_user.save(broadcast=False)
-        with patch('bookwyrm.models.user.set_remote_server.delay'):
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
             another_remote_user = models.User.objects.create_user(
-                'nutria', 'nutria@nutria.com', 'nutriaword',
+                "nutria",
+                "nutria@nutria.com",
+                "nutriaword",
                 local=False,
-                remote_id='https://example.com/users/nutria',
-                inbox='https://example.com/users/nutria/inbox',
-                shared_inbox='http://example.com/inbox',
-                outbox='https://example.com/users/nutria/outbox',
+                remote_id="https://example.com/users/nutria",
+                inbox="https://example.com/users/nutria/inbox",
+                shared_inbox="http://example.com/inbox",
+                outbox="https://example.com/users/nutria/outbox",
             )
-        MockSelf = namedtuple('Self', ('privacy', 'user'))
-        mock_self = MockSelf('public', self.local_user)
+        MockSelf = namedtuple("Self", ("privacy", "user"))
+        mock_self = MockSelf("public", self.local_user)
         self.local_user.followers.add(self.remote_user)
         self.local_user.followers.add(another_remote_user)
 
         recipients = ActivitypubMixin.get_recipients(mock_self)
         self.assertEqual(len(recipients), 1)
-        self.assertEqual(recipients[0], 'http://example.com/inbox')
-
+        self.assertEqual(recipients[0], "http://example.com/inbox")
 
     def test_get_recipients_software(self):
-        ''' should differentiate between bookwyrm and other remote users '''
-        with patch('bookwyrm.models.user.set_remote_server.delay'):
+        """ should differentiate between bookwyrm and other remote users """
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
             another_remote_user = models.User.objects.create_user(
-                'nutria', 'nutria@nutria.com', 'nutriaword',
+                "nutria",
+                "nutria@nutria.com",
+                "nutriaword",
                 local=False,
-                remote_id='https://example.com/users/nutria',
-                inbox='https://example.com/users/nutria/inbox',
-                outbox='https://example.com/users/nutria/outbox',
+                remote_id="https://example.com/users/nutria",
+                inbox="https://example.com/users/nutria/inbox",
+                outbox="https://example.com/users/nutria/outbox",
                 bookwyrm_user=False,
             )
-        MockSelf = namedtuple('Self', ('privacy', 'user'))
-        mock_self = MockSelf('public', self.local_user)
+        MockSelf = namedtuple("Self", ("privacy", "user"))
+        mock_self = MockSelf("public", self.local_user)
         self.local_user.followers.add(self.remote_user)
         self.local_user.followers.add(another_remote_user)
 
         recipients = ActivitypubMixin.get_recipients(mock_self)
         self.assertEqual(len(recipients), 2)
 
-        recipients = ActivitypubMixin.get_recipients(
-            mock_self, software='bookwyrm')
+        recipients = ActivitypubMixin.get_recipients(mock_self, software="bookwyrm")
         self.assertEqual(len(recipients), 1)
         self.assertEqual(recipients[0], self.remote_user.inbox)
 
-        recipients = ActivitypubMixin.get_recipients(
-            mock_self, software='other')
+        recipients = ActivitypubMixin.get_recipients(mock_self, software="other")
         self.assertEqual(len(recipients), 1)
         self.assertEqual(recipients[0], another_remote_user.inbox)
 
-
     # ObjectMixin
     def test_object_save_create(self):
-        ''' should save uneventufully when broadcast is disabled '''
+        """ should save uneventufully when broadcast is disabled """
+
         class Success(Exception):
-            ''' this means we got to the right method '''
+            """ this means we got to the right method """
 
         class ObjectModel(ObjectMixin, base_model.BookWyrmModel):
-            ''' real simple mock model because BookWyrmModel is abstract '''
-            user = models.fields.ForeignKey('User', on_delete=db.models.CASCADE)
+            """ real simple mock model because BookWyrmModel is abstract """
+
+            user = models.fields.ForeignKey("User", on_delete=db.models.CASCADE)
+
             def save(self, *args, **kwargs):
-                with patch('django.db.models.Model.save'):
+                with patch("django.db.models.Model.save"):
                     super().save(*args, **kwargs)
-            def broadcast(self, activity, sender, **kwargs):#pylint: disable=arguments-differ
-                ''' do something '''
+
+            def broadcast(
+                self, activity, sender, **kwargs
+            ):  # pylint: disable=arguments-differ
+                """ do something """
                 raise Success()
-            def to_create_activity(self, user):#pylint: disable=arguments-differ
+
+            def to_create_activity(self, user):  # pylint: disable=arguments-differ
                 return {}
 
         with self.assertRaises(Success):
@@ -253,20 +264,24 @@ class ActivitypubMixins(TestCase):
         ObjectModel(user=self.local_user).save(broadcast=False)
         ObjectModel(user=None).save()
 
-
     def test_object_save_update(self):
-        ''' should save uneventufully when broadcast is disabled '''
+        """ should save uneventufully when broadcast is disabled """
+
         class Success(Exception):
-            ''' this means we got to the right method '''
+            """ this means we got to the right method """
 
         class UpdateObjectModel(ObjectMixin, base_model.BookWyrmModel):
-            ''' real simple mock model because BookWyrmModel is abstract '''
-            user = models.fields.ForeignKey('User', on_delete=db.models.CASCADE)
+            """ real simple mock model because BookWyrmModel is abstract """
+
+            user = models.fields.ForeignKey("User", on_delete=db.models.CASCADE)
             last_edited_by = models.fields.ForeignKey(
-                'User', on_delete=db.models.CASCADE)
+                "User", on_delete=db.models.CASCADE
+            )
+
             def save(self, *args, **kwargs):
-                with patch('django.db.models.Model.save'):
+                with patch("django.db.models.Model.save"):
                     super().save(*args, **kwargs)
+
             def to_update_activity(self, user):
                 raise Success()
 
@@ -275,87 +290,71 @@ class ActivitypubMixins(TestCase):
         with self.assertRaises(Success):
             UpdateObjectModel(id=1, last_edited_by=self.local_user).save()
 
-
     def test_object_save_delete(self):
-        ''' should create delete activities when objects are deleted by flag '''
+        """ should create delete activities when objects are deleted by flag """
+
         class ActivitySuccess(Exception):
-            ''' this means we got to the right method '''
+            """ this means we got to the right method """
 
         class DeletableObjectModel(ObjectMixin, base_model.BookWyrmModel):
-            ''' real simple mock model because BookWyrmModel is abstract '''
-            user = models.fields.ForeignKey('User', on_delete=db.models.CASCADE)
+            """ real simple mock model because BookWyrmModel is abstract """
+
+            user = models.fields.ForeignKey("User", on_delete=db.models.CASCADE)
             deleted = models.fields.BooleanField()
+
             def save(self, *args, **kwargs):
-                with patch('django.db.models.Model.save'):
+                with patch("django.db.models.Model.save"):
                     super().save(*args, **kwargs)
+
             def to_delete_activity(self, user):
                 raise ActivitySuccess()
 
         with self.assertRaises(ActivitySuccess):
-            DeletableObjectModel(
-                id=1, user=self.local_user, deleted=True).save()
-
+            DeletableObjectModel(id=1, user=self.local_user, deleted=True).save()
 
     def test_to_delete_activity(self):
-        ''' wrapper for Delete activity '''
-        MockSelf = namedtuple('Self', ('remote_id', 'to_activity'))
+        """ wrapper for Delete activity """
+        MockSelf = namedtuple("Self", ("remote_id", "to_activity"))
         mock_self = MockSelf(
-            'https://example.com/status/1',
-            lambda *args: self.object_mock
+            "https://example.com/status/1", lambda *args: self.object_mock
         )
-        activity = ObjectMixin.to_delete_activity(
-            mock_self, self.local_user)
+        activity = ObjectMixin.to_delete_activity(mock_self, self.local_user)
+        self.assertEqual(activity["id"], "https://example.com/status/1/activity")
+        self.assertEqual(activity["actor"], self.local_user.remote_id)
+        self.assertEqual(activity["type"], "Delete")
+        self.assertEqual(activity["to"], ["%s/followers" % self.local_user.remote_id])
         self.assertEqual(
-            activity['id'],
-            'https://example.com/status/1/activity'
+            activity["cc"], ["https://www.w3.org/ns/activitystreams#Public"]
         )
-        self.assertEqual(activity['actor'], self.local_user.remote_id)
-        self.assertEqual(activity['type'], 'Delete')
-        self.assertEqual(
-            activity['to'],
-            ['%s/followers' % self.local_user.remote_id])
-        self.assertEqual(
-            activity['cc'],
-            ['https://www.w3.org/ns/activitystreams#Public'])
-
 
     def test_to_update_activity(self):
-        ''' ditto above but for Update '''
-        MockSelf = namedtuple('Self', ('remote_id', 'to_activity'))
+        """ ditto above but for Update """
+        MockSelf = namedtuple("Self", ("remote_id", "to_activity"))
         mock_self = MockSelf(
-            'https://example.com/status/1',
-            lambda *args: self.object_mock
+            "https://example.com/status/1", lambda *args: self.object_mock
         )
-        activity = ObjectMixin.to_update_activity(
-            mock_self, self.local_user)
+        activity = ObjectMixin.to_update_activity(mock_self, self.local_user)
         self.assertIsNotNone(
-            re.match(
-                r'^https:\/\/example\.com\/status\/1#update\/.*',
-                activity['id']
-            )
+            re.match(r"^https:\/\/example\.com\/status\/1#update\/.*", activity["id"])
         )
-        self.assertEqual(activity['actor'], self.local_user.remote_id)
-        self.assertEqual(activity['type'], 'Update')
+        self.assertEqual(activity["actor"], self.local_user.remote_id)
+        self.assertEqual(activity["type"], "Update")
         self.assertEqual(
-            activity['to'],
-            ['https://www.w3.org/ns/activitystreams#Public'])
-        self.assertIsInstance(activity['object'], dict)
-
+            activity["to"], ["https://www.w3.org/ns/activitystreams#Public"]
+        )
+        self.assertIsInstance(activity["object"], dict)
 
     # Activity mixin
     def test_to_undo_activity(self):
-        ''' and again, for Undo '''
-        MockSelf = namedtuple('Self', ('remote_id', 'to_activity', 'user'))
+        """ and again, for Undo """
+        MockSelf = namedtuple("Self", ("remote_id", "to_activity", "user"))
         mock_self = MockSelf(
-            'https://example.com/status/1',
+            "https://example.com/status/1",
             lambda *args: self.object_mock,
             self.local_user,
         )
         activity = ActivityMixin.to_undo_activity(mock_self)
-        self.assertEqual(
-            activity['id'],
-            'https://example.com/status/1#undo'
-        )
-        self.assertEqual(activity['actor'], self.local_user.remote_id)
-        self.assertEqual(activity['type'], 'Undo')
-        self.assertIsInstance(activity['object'], dict)
+        self.assertEqual(activity["id"], "https://example.com/status/1#undo")
+        self.assertEqual(activity["actor"], self.local_user.remote_id)
+        self.assertEqual(activity["type"], "Undo")
+        self.assertIsInstance(activity["object"], dict)
diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py
index ab388efe..4479d156 100644
--- a/bookwyrm/tests/models/test_base_model.py
+++ b/bookwyrm/tests/models/test_base_model.py
@@ -1,42 +1,41 @@
-''' testing models '''
+""" testing models """
 from django.test import TestCase
 
 from bookwyrm import models
 from bookwyrm.models import base_model
 from bookwyrm.settings import DOMAIN
 
+
 class BaseModel(TestCase):
-    ''' functionality shared across models '''
+    """ functionality shared across models """
+
     def test_remote_id(self):
-        ''' these should be generated '''
+        """ these should be generated """
         instance = base_model.BookWyrmModel()
         instance.id = 1
         expected = instance.get_remote_id()
-        self.assertEqual(expected, 'https://%s/bookwyrmmodel/1' % DOMAIN)
+        self.assertEqual(expected, "https://%s/bookwyrmmodel/1" % DOMAIN)
 
     def test_remote_id_with_user(self):
-        ''' format of remote id when there's a user object '''
+        """ format of remote id when there's a user object """
         user = models.User.objects.create_user(
-            'mouse', 'mouse@mouse.com', 'mouseword',
-            local=True, localname='mouse')
+            "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse"
+        )
         instance = base_model.BookWyrmModel()
         instance.user = user
         instance.id = 1
         expected = instance.get_remote_id()
-        self.assertEqual(
-            expected,
-            'https://%s/user/mouse/bookwyrmmodel/1' % DOMAIN)
+        self.assertEqual(expected, "https://%s/user/mouse/bookwyrmmodel/1" % DOMAIN)
 
     def test_execute_after_save(self):
-        ''' this function sets remote ids after creation '''
+        """ this function sets remote ids after creation """
         # using Work because it BookWrymModel is abstract and this requires save
         # Work is a relatively not-fancy model.
-        instance = models.Work.objects.create(title='work title')
+        instance = models.Work.objects.create(title="work title")
         instance.remote_id = None
         base_model.execute_after_save(None, instance, True)
         self.assertEqual(
-            instance.remote_id,
-            'https://%s/book/%d' % (DOMAIN, instance.id)
+            instance.remote_id, "https://%s/book/%d" % (DOMAIN, instance.id)
         )
 
         # shouldn't set remote_id if it's not created
diff --git a/bookwyrm/tests/models/test_book_model.py b/bookwyrm/tests/models/test_book_model.py
index b4a099d0..14ab0c57 100644
--- a/bookwyrm/tests/models/test_book_model.py
+++ b/bookwyrm/tests/models/test_book_model.py
@@ -1,4 +1,4 @@
-''' testing models '''
+""" testing models """
 from dateutil.parser import parse
 from django.test import TestCase
 from django.utils import timezone
@@ -8,88 +8,80 @@ from bookwyrm.models.book import isbn_10_to_13, isbn_13_to_10
 
 
 class Book(TestCase):
-    ''' not too much going on in the books model but here we are '''
+    """ not too much going on in the books model but here we are """
+
     def setUp(self):
-        ''' we'll need some books '''
+        """ we'll need some books """
         self.work = models.Work.objects.create(
-            title='Example Work',
-            remote_id='https://example.com/book/1'
+            title="Example Work", remote_id="https://example.com/book/1"
         )
         self.first_edition = models.Edition.objects.create(
-            title='Example Edition',
+            title="Example Edition",
             parent_work=self.work,
         )
         self.second_edition = models.Edition.objects.create(
-            title='Another Example Edition',
+            title="Another Example Edition",
             parent_work=self.work,
         )
 
     def test_remote_id(self):
-        ''' fanciness with remote/origin ids '''
-        remote_id = 'https://%s/book/%d' % (settings.DOMAIN, self.work.id)
+        """ fanciness with remote/origin ids """
+        remote_id = "https://%s/book/%d" % (settings.DOMAIN, self.work.id)
         self.assertEqual(self.work.get_remote_id(), remote_id)
         self.assertEqual(self.work.remote_id, remote_id)
 
     def test_create_book(self):
-        ''' you shouldn't be able to create Books (only editions and works) '''
-        self.assertRaises(
-            ValueError,
-            models.Book.objects.create,
-            title='Invalid Book'
-        )
+        """ you shouldn't be able to create Books (only editions and works) """
+        self.assertRaises(ValueError, models.Book.objects.create, title="Invalid Book")
 
     def test_isbn_10_to_13(self):
-        ''' checksums and so on '''
-        isbn_10 = '178816167X'
+        """ checksums and so on """
+        isbn_10 = "178816167X"
         isbn_13 = isbn_10_to_13(isbn_10)
-        self.assertEqual(isbn_13, '9781788161671')
+        self.assertEqual(isbn_13, "9781788161671")
 
-        isbn_10 = '1-788-16167-X'
+        isbn_10 = "1-788-16167-X"
         isbn_13 = isbn_10_to_13(isbn_10)
-        self.assertEqual(isbn_13, '9781788161671')
-
+        self.assertEqual(isbn_13, "9781788161671")
 
     def test_isbn_13_to_10(self):
-        ''' checksums and so on '''
-        isbn_13 = '9781788161671'
+        """ checksums and so on """
+        isbn_13 = "9781788161671"
         isbn_10 = isbn_13_to_10(isbn_13)
-        self.assertEqual(isbn_10, '178816167X')
+        self.assertEqual(isbn_10, "178816167X")
 
-        isbn_13 = '978-1788-16167-1'
+        isbn_13 = "978-1788-16167-1"
         isbn_10 = isbn_13_to_10(isbn_13)
-        self.assertEqual(isbn_10, '178816167X')
-
+        self.assertEqual(isbn_10, "178816167X")
 
     def test_get_edition_info(self):
-        ''' text slug about an edition '''
-        book = models.Edition.objects.create(title='Test Edition')
-        self.assertEqual(book.edition_info, '')
+        """ text slug about an edition """
+        book = models.Edition.objects.create(title="Test Edition")
+        self.assertEqual(book.edition_info, "")
 
-        book.physical_format = 'worm'
+        book.physical_format = "worm"
         book.save()
-        self.assertEqual(book.edition_info, 'worm')
+        self.assertEqual(book.edition_info, "worm")
 
-        book.languages = ['English']
+        book.languages = ["English"]
         book.save()
-        self.assertEqual(book.edition_info, 'worm')
+        self.assertEqual(book.edition_info, "worm")
 
-        book.languages = ['Glorbish', 'English']
+        book.languages = ["Glorbish", "English"]
         book.save()
-        self.assertEqual(book.edition_info, 'worm, Glorbish language')
+        self.assertEqual(book.edition_info, "worm, Glorbish language")
 
-        book.published_date = timezone.make_aware(parse('2020'))
+        book.published_date = timezone.make_aware(parse("2020"))
         book.save()
-        self.assertEqual(book.edition_info, 'worm, Glorbish language, 2020')
-        self.assertEqual(
-            book.alt_text, 'Test Edition (worm, Glorbish language, 2020)')
-
+        self.assertEqual(book.edition_info, "worm, Glorbish language, 2020")
+        self.assertEqual(book.alt_text, "Test Edition (worm, Glorbish language, 2020)")
 
     def test_get_rank(self):
-        ''' sets the data quality index for the book '''
+        """ sets the data quality index for the book """
         # basic rank
         self.assertEqual(self.first_edition.edition_rank, 0)
 
-        self.first_edition.description = 'hi'
+        self.first_edition.description = "hi"
         self.first_edition.save()
         self.assertEqual(self.first_edition.edition_rank, 1)
 
diff --git a/bookwyrm/tests/models/test_fields.py b/bookwyrm/tests/models/test_fields.py
index 24c0fb02..522d16f9 100644
--- a/bookwyrm/tests/models/test_fields.py
+++ b/bookwyrm/tests/models/test_fields.py
@@ -1,4 +1,4 @@
-''' testing models '''
+""" testing models """
 from io import BytesIO
 from collections import namedtuple
 from dataclasses import dataclass
@@ -23,408 +23,388 @@ from bookwyrm.models import fields, User, Status
 from bookwyrm.models.base_model import BookWyrmModel
 from bookwyrm.models.activitypub_mixin import ActivitypubMixin
 
-#pylint: disable=too-many-public-methods
+# pylint: disable=too-many-public-methods
 class ActivitypubFields(TestCase):
-    ''' overwrites standard model feilds to work with activitypub '''
+    """ overwrites standard model feilds to work with activitypub """
+
     def test_validate_remote_id(self):
-        ''' should look like a url '''
-        self.assertIsNone(fields.validate_remote_id('http://www.example.com'))
-        self.assertIsNone(fields.validate_remote_id('https://www.example.com'))
-        self.assertIsNone(fields.validate_remote_id('http://exle.com/dlg-23/x'))
+        """ should look like a url """
+        self.assertIsNone(fields.validate_remote_id("http://www.example.com"))
+        self.assertIsNone(fields.validate_remote_id("https://www.example.com"))
+        self.assertIsNone(fields.validate_remote_id("http://exle.com/dlg-23/x"))
         self.assertRaises(
-            ValidationError, fields.validate_remote_id,
-            'http:/example.com/dlfjg-23/x')
+            ValidationError, fields.validate_remote_id, "http:/example.com/dlfjg-23/x"
+        )
         self.assertRaises(
-            ValidationError, fields.validate_remote_id,
-            'www.example.com/dlfjg-23/x')
+            ValidationError, fields.validate_remote_id, "www.example.com/dlfjg-23/x"
+        )
         self.assertRaises(
-            ValidationError, fields.validate_remote_id,
-            'http://www.example.com/dlfjg 23/x')
+            ValidationError,
+            fields.validate_remote_id,
+            "http://www.example.com/dlfjg 23/x",
+        )
 
     def test_activitypub_field_mixin(self):
-        ''' generic mixin with super basic to and from functionality '''
+        """ generic mixin with super basic to and from functionality """
         instance = fields.ActivitypubFieldMixin()
-        self.assertEqual(instance.field_to_activity('fish'), 'fish')
-        self.assertEqual(instance.field_from_activity('fish'), 'fish')
+        self.assertEqual(instance.field_to_activity("fish"), "fish")
+        self.assertEqual(instance.field_from_activity("fish"), "fish")
         self.assertFalse(instance.deduplication_field)
 
         instance = fields.ActivitypubFieldMixin(
-            activitypub_wrapper='endpoints', activitypub_field='outbox'
+            activitypub_wrapper="endpoints", activitypub_field="outbox"
         )
-        self.assertEqual(
-            instance.field_to_activity('fish'),
-            {'outbox': 'fish'}
-        )
-        self.assertEqual(
-            instance.field_from_activity({'outbox': 'fish'}),
-            'fish'
-        )
-        self.assertEqual(instance.get_activitypub_field(), 'endpoints')
+        self.assertEqual(instance.field_to_activity("fish"), {"outbox": "fish"})
+        self.assertEqual(instance.field_from_activity({"outbox": "fish"}), "fish")
+        self.assertEqual(instance.get_activitypub_field(), "endpoints")
 
         instance = fields.ActivitypubFieldMixin()
-        instance.name = 'snake_case_name'
-        self.assertEqual(instance.get_activitypub_field(), 'snakeCaseName')
+        instance.name = "snake_case_name"
+        self.assertEqual(instance.get_activitypub_field(), "snakeCaseName")
 
     def test_set_field_from_activity(self):
-        ''' setter from entire json blob '''
+        """ setter from entire json blob """
+
         @dataclass
         class TestModel:
-            ''' real simple mock '''
+            """ real simple mock """
+
             field_name: str
 
-        mock_model = TestModel(field_name='bip')
-        TestActivity = namedtuple('test', ('fieldName', 'unrelated'))
-        data = TestActivity(fieldName='hi', unrelated='bfkjh')
+        mock_model = TestModel(field_name="bip")
+        TestActivity = namedtuple("test", ("fieldName", "unrelated"))
+        data = TestActivity(fieldName="hi", unrelated="bfkjh")
 
         instance = fields.ActivitypubFieldMixin()
-        instance.name = 'field_name'
+        instance.name = "field_name"
 
         instance.set_field_from_activity(mock_model, data)
-        self.assertEqual(mock_model.field_name, 'hi')
+        self.assertEqual(mock_model.field_name, "hi")
 
     def test_set_activity_from_field(self):
-        ''' set json field given entire model '''
+        """ set json field given entire model """
+
         @dataclass
         class TestModel:
-            ''' real simple mock '''
+            """ real simple mock """
+
             field_name: str
             unrelated: str
-        mock_model = TestModel(field_name='bip', unrelated='field')
+
+        mock_model = TestModel(field_name="bip", unrelated="field")
         instance = fields.ActivitypubFieldMixin()
-        instance.name = 'field_name'
+        instance.name = "field_name"
 
         data = {}
         instance.set_activity_from_field(data, mock_model)
-        self.assertEqual(data['fieldName'], 'bip')
+        self.assertEqual(data["fieldName"], "bip")
 
     def test_remote_id_field(self):
-        ''' just sets some defaults on charfield '''
+        """ just sets some defaults on charfield """
         instance = fields.RemoteIdField()
         self.assertEqual(instance.max_length, 255)
         self.assertTrue(instance.deduplication_field)
 
         with self.assertRaises(ValidationError):
-            instance.run_validators('http://www.example.com/dlfjg 23/x')
+            instance.run_validators("http://www.example.com/dlfjg 23/x")
 
     def test_username_field(self):
-        ''' again, just setting defaults on username field '''
+        """ again, just setting defaults on username field """
         instance = fields.UsernameField()
-        self.assertEqual(instance.activitypub_field, 'preferredUsername')
+        self.assertEqual(instance.activitypub_field, "preferredUsername")
         self.assertEqual(instance.max_length, 150)
         self.assertEqual(instance.unique, True)
         with self.assertRaises(ValidationError):
-            instance.run_validators('mouse')
-            instance.run_validators('mouseexample.com')
-            instance.run_validators('mouse@example.c')
-            instance.run_validators('@example.com')
-            instance.run_validators('mouse@examplecom')
-            instance.run_validators('one two@fish.aaaa')
-            instance.run_validators('a*&@exampke.com')
-            instance.run_validators('trailingwhite@example.com ')
-        self.assertIsNone(instance.run_validators('mouse@example.com'))
-        self.assertIsNone(instance.run_validators('mo-2use@ex3ample.com'))
-        self.assertIsNone(instance.run_validators('aksdhf@sdkjf-df.cm'))
-
-        self.assertEqual(instance.field_to_activity('test@example.com'), 'test')
+            instance.run_validators("mouse")
+            instance.run_validators("mouseexample.com")
+            instance.run_validators("mouse@example.c")
+            instance.run_validators("@example.com")
+            instance.run_validators("mouse@examplecom")
+            instance.run_validators("one two@fish.aaaa")
+            instance.run_validators("a*&@exampke.com")
+            instance.run_validators("trailingwhite@example.com ")
+        self.assertIsNone(instance.run_validators("mouse@example.com"))
+        self.assertIsNone(instance.run_validators("mo-2use@ex3ample.com"))
+        self.assertIsNone(instance.run_validators("aksdhf@sdkjf-df.cm"))
 
+        self.assertEqual(instance.field_to_activity("test@example.com"), "test")
 
     def test_privacy_field_defaults(self):
-        ''' post privacy field's many default values '''
+        """ post privacy field's many default values """
         instance = fields.PrivacyField()
         self.assertEqual(instance.max_length, 255)
         self.assertEqual(
             [c[0] for c in instance.choices],
-            ['public', 'unlisted', 'followers', 'direct'])
-        self.assertEqual(instance.default, 'public')
+            ["public", "unlisted", "followers", "direct"],
+        )
+        self.assertEqual(instance.default, "public")
         self.assertEqual(
-            instance.public, 'https://www.w3.org/ns/activitystreams#Public')
+            instance.public, "https://www.w3.org/ns/activitystreams#Public"
+        )
 
     def test_privacy_field_set_field_from_activity(self):
-        ''' translate between to/cc fields and privacy '''
+        """ translate between to/cc fields and privacy """
+
         @dataclass(init=False)
         class TestActivity(ActivityObject):
-            ''' real simple mock '''
+            """ real simple mock """
+
             to: List[str]
             cc: List[str]
-            id: str = 'http://hi.com'
-            type: str = 'Test'
+            id: str = "http://hi.com"
+            type: str = "Test"
 
         class TestPrivacyModel(ActivitypubMixin, BookWyrmModel):
-            ''' real simple mock model because BookWyrmModel is abstract '''
+            """ real simple mock model because BookWyrmModel is abstract """
+
             privacy_field = fields.PrivacyField()
             mention_users = fields.TagField(User)
             user = fields.ForeignKey(User, on_delete=models.CASCADE)
 
-        public = 'https://www.w3.org/ns/activitystreams#Public'
+        public = "https://www.w3.org/ns/activitystreams#Public"
         data = TestActivity(
             to=[public],
-            cc=['bleh'],
+            cc=["bleh"],
         )
-        model_instance = TestPrivacyModel(privacy_field='direct')
-        self.assertEqual(model_instance.privacy_field, 'direct')
+        model_instance = TestPrivacyModel(privacy_field="direct")
+        self.assertEqual(model_instance.privacy_field, "direct")
 
         instance = fields.PrivacyField()
-        instance.name = 'privacy_field'
+        instance.name = "privacy_field"
         instance.set_field_from_activity(model_instance, data)
-        self.assertEqual(model_instance.privacy_field, 'public')
+        self.assertEqual(model_instance.privacy_field, "public")
 
-        data.to = ['bleh']
+        data.to = ["bleh"]
         data.cc = []
         instance.set_field_from_activity(model_instance, data)
-        self.assertEqual(model_instance.privacy_field, 'direct')
+        self.assertEqual(model_instance.privacy_field, "direct")
 
-        data.to = ['bleh']
-        data.cc = [public, 'waah']
+        data.to = ["bleh"]
+        data.cc = [public, "waah"]
         instance.set_field_from_activity(model_instance, data)
-        self.assertEqual(model_instance.privacy_field, 'unlisted')
+        self.assertEqual(model_instance.privacy_field, "unlisted")
 
-
-    @patch('bookwyrm.models.activitypub_mixin.ObjectMixin.broadcast')
+    @patch("bookwyrm.models.activitypub_mixin.ObjectMixin.broadcast")
     def test_privacy_field_set_activity_from_field(self, _):
-        ''' translate between to/cc fields and privacy '''
+        """ translate between to/cc fields and privacy """
         user = User.objects.create_user(
-            'rat', 'rat@rat.rat', 'ratword',
-            local=True, localname='rat')
-        public = 'https://www.w3.org/ns/activitystreams#Public'
-        followers = '%s/followers' % user.remote_id
+            "rat", "rat@rat.rat", "ratword", local=True, localname="rat"
+        )
+        public = "https://www.w3.org/ns/activitystreams#Public"
+        followers = "%s/followers" % user.remote_id
 
         instance = fields.PrivacyField()
-        instance.name = 'privacy_field'
+        instance.name = "privacy_field"
 
-        model_instance = Status.objects.create(user=user, content='hi')
+        model_instance = Status.objects.create(user=user, content="hi")
         activity = {}
         instance.set_activity_from_field(activity, model_instance)
-        self.assertEqual(activity['to'], [public])
-        self.assertEqual(activity['cc'], [followers])
+        self.assertEqual(activity["to"], [public])
+        self.assertEqual(activity["cc"], [followers])
 
         model_instance = Status.objects.create(
-            user=user, content='hi', privacy='unlisted')
+            user=user, content="hi", privacy="unlisted"
+        )
         activity = {}
         instance.set_activity_from_field(activity, model_instance)
-        self.assertEqual(activity['to'], [followers])
-        self.assertEqual(activity['cc'], [public])
+        self.assertEqual(activity["to"], [followers])
+        self.assertEqual(activity["cc"], [public])
 
         model_instance = Status.objects.create(
-            user=user, content='hi', privacy='followers')
+            user=user, content="hi", privacy="followers"
+        )
         activity = {}
         instance.set_activity_from_field(activity, model_instance)
-        self.assertEqual(activity['to'], [followers])
-        self.assertEqual(activity['cc'], [])
+        self.assertEqual(activity["to"], [followers])
+        self.assertEqual(activity["cc"], [])
 
         model_instance = Status.objects.create(
             user=user,
-            content='hi',
-            privacy='direct',
+            content="hi",
+            privacy="direct",
         )
         model_instance.mention_users.set([user])
         activity = {}
         instance.set_activity_from_field(activity, model_instance)
-        self.assertEqual(activity['to'], [user.remote_id])
-        self.assertEqual(activity['cc'], [])
-
+        self.assertEqual(activity["to"], [user.remote_id])
+        self.assertEqual(activity["cc"], [])
 
     def test_foreign_key(self):
-        ''' should be able to format a related model '''
-        instance = fields.ForeignKey('User', on_delete=models.CASCADE)
-        Serializable = namedtuple('Serializable', ('to_activity', 'remote_id'))
-        item = Serializable(lambda: {'a': 'b'}, 'https://e.b/c')
+        """ should be able to format a related model """
+        instance = fields.ForeignKey("User", on_delete=models.CASCADE)
+        Serializable = namedtuple("Serializable", ("to_activity", "remote_id"))
+        item = Serializable(lambda: {"a": "b"}, "https://e.b/c")
         # returns the remote_id field of the related object
-        self.assertEqual(instance.field_to_activity(item), 'https://e.b/c')
-
+        self.assertEqual(instance.field_to_activity(item), "https://e.b/c")
 
     @responses.activate
     def test_foreign_key_from_activity_str(self):
-        ''' create a new object from a foreign key '''
+        """ create a new object from a foreign key """
         instance = fields.ForeignKey(User, on_delete=models.CASCADE)
-        datafile = pathlib.Path(__file__).parent.joinpath(
-            '../data/ap_user.json')
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json")
         userdata = json.loads(datafile.read_bytes())
         # don't try to load the user icon
-        del userdata['icon']
+        del userdata["icon"]
 
         # it shouldn't match with this unrelated user:
         unrelated_user = User.objects.create_user(
-            'rat', 'rat@rat.rat', 'ratword',
-            local=True, localname='rat')
+            "rat", "rat@rat.rat", "ratword", local=True, localname="rat"
+        )
 
         # test receiving an unknown remote id and loading data
         responses.add(
-            responses.GET,
-            'https://example.com/user/mouse',
-            json=userdata,
-            status=200)
-        with patch('bookwyrm.models.user.set_remote_server.delay'):
-            value = instance.field_from_activity(
-                'https://example.com/user/mouse')
+            responses.GET, "https://example.com/user/mouse", json=userdata, status=200
+        )
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            value = instance.field_from_activity("https://example.com/user/mouse")
         self.assertIsInstance(value, User)
         self.assertNotEqual(value, unrelated_user)
-        self.assertEqual(value.remote_id, 'https://example.com/user/mouse')
-        self.assertEqual(value.name, 'MOUSE?? MOUSE!!')
-
+        self.assertEqual(value.remote_id, "https://example.com/user/mouse")
+        self.assertEqual(value.name, "MOUSE?? MOUSE!!")
 
     def test_foreign_key_from_activity_dict(self):
-        ''' test recieving activity json '''
+        """ test recieving activity json """
         instance = fields.ForeignKey(User, on_delete=models.CASCADE)
-        datafile = pathlib.Path(__file__).parent.joinpath(
-            '../data/ap_user.json')
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json")
         userdata = json.loads(datafile.read_bytes())
         # don't try to load the user icon
-        del userdata['icon']
+        del userdata["icon"]
 
         # it shouldn't match with this unrelated user:
         unrelated_user = User.objects.create_user(
-            'rat', 'rat@rat.rat', 'ratword',
-            local=True, localname='rat')
-        with patch('bookwyrm.models.user.set_remote_server.delay'):
+            "rat", "rat@rat.rat", "ratword", local=True, localname="rat"
+        )
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
             value = instance.field_from_activity(activitypub.Person(**userdata))
         self.assertIsInstance(value, User)
         self.assertNotEqual(value, unrelated_user)
-        self.assertEqual(value.remote_id, 'https://example.com/user/mouse')
-        self.assertEqual(value.name, 'MOUSE?? MOUSE!!')
+        self.assertEqual(value.remote_id, "https://example.com/user/mouse")
+        self.assertEqual(value.name, "MOUSE?? MOUSE!!")
         # et cetera but we're not testing serializing user json
 
-
     def test_foreign_key_from_activity_dict_existing(self):
-        ''' test receiving a dict of an existing object in the db '''
+        """ test receiving a dict of an existing object in the db """
         instance = fields.ForeignKey(User, on_delete=models.CASCADE)
-        datafile = pathlib.Path(__file__).parent.joinpath(
-            '../data/ap_user.json'
-        )
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json")
         userdata = json.loads(datafile.read_bytes())
         user = User.objects.create_user(
-            'mouse', 'mouse@mouse.mouse', 'mouseword',
-            local=True, localname='mouse')
-        user.remote_id = 'https://example.com/user/mouse'
+            "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
+        )
+        user.remote_id = "https://example.com/user/mouse"
         user.save(broadcast=False)
         User.objects.create_user(
-            'rat', 'rat@rat.rat', 'ratword',
-            local=True, localname='rat')
+            "rat", "rat@rat.rat", "ratword", local=True, localname="rat"
+        )
 
-        with patch('bookwyrm.models.activitypub_mixin.ObjectMixin.broadcast'):
+        with patch("bookwyrm.models.activitypub_mixin.ObjectMixin.broadcast"):
             value = instance.field_from_activity(activitypub.Person(**userdata))
         self.assertEqual(value, user)
 
-
     def test_foreign_key_from_activity_str_existing(self):
-        ''' test receiving a remote id of an existing object in the db '''
+        """ test receiving a remote id of an existing object in the db """
         instance = fields.ForeignKey(User, on_delete=models.CASCADE)
         user = User.objects.create_user(
-            'mouse', 'mouse@mouse.mouse', 'mouseword',
-            local=True, localname='mouse')
+            "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
+        )
         User.objects.create_user(
-            'rat', 'rat@rat.rat', 'ratword',
-            local=True, localname='rat')
+            "rat", "rat@rat.rat", "ratword", local=True, localname="rat"
+        )
 
         value = instance.field_from_activity(user.remote_id)
         self.assertEqual(value, user)
 
-
     def test_one_to_one_field(self):
-        ''' a gussied up foreign key '''
-        instance = fields.OneToOneField('User', on_delete=models.CASCADE)
-        Serializable = namedtuple('Serializable', ('to_activity', 'remote_id'))
-        item = Serializable(lambda: {'a': 'b'}, 'https://e.b/c')
-        self.assertEqual(instance.field_to_activity(item), {'a': 'b'})
+        """ a gussied up foreign key """
+        instance = fields.OneToOneField("User", on_delete=models.CASCADE)
+        Serializable = namedtuple("Serializable", ("to_activity", "remote_id"))
+        item = Serializable(lambda: {"a": "b"}, "https://e.b/c")
+        self.assertEqual(instance.field_to_activity(item), {"a": "b"})
 
     def test_many_to_many_field(self):
-        ''' lists! '''
-        instance = fields.ManyToManyField('User')
+        """ lists! """
+        instance = fields.ManyToManyField("User")
 
-        Serializable = namedtuple('Serializable', ('to_activity', 'remote_id'))
-        Queryset = namedtuple('Queryset', ('all', 'instance'))
-        item = Serializable(lambda: {'a': 'b'}, 'https://e.b/c')
-        another_item = Serializable(lambda: {}, 'example.com')
+        Serializable = namedtuple("Serializable", ("to_activity", "remote_id"))
+        Queryset = namedtuple("Queryset", ("all", "instance"))
+        item = Serializable(lambda: {"a": "b"}, "https://e.b/c")
+        another_item = Serializable(lambda: {}, "example.com")
 
         items = Queryset(lambda: [item], another_item)
 
-        self.assertEqual(instance.field_to_activity(items), ['https://e.b/c'])
+        self.assertEqual(instance.field_to_activity(items), ["https://e.b/c"])
 
-        instance = fields.ManyToManyField('User', link_only=True)
-        instance.name = 'snake_case'
-        self.assertEqual(
-            instance.field_to_activity(items),
-            'example.com/snake_case'
-        )
+        instance = fields.ManyToManyField("User", link_only=True)
+        instance.name = "snake_case"
+        self.assertEqual(instance.field_to_activity(items), "example.com/snake_case")
 
     @responses.activate
     def test_many_to_many_field_from_activity(self):
-        ''' resolve related fields for a list, takes a list of remote ids '''
+        """ resolve related fields for a list, takes a list of remote ids """
         instance = fields.ManyToManyField(User)
-        datafile = pathlib.Path(__file__).parent.joinpath(
-            '../data/ap_user.json'
-        )
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json")
         userdata = json.loads(datafile.read_bytes())
         # don't try to load the user icon
-        del userdata['icon']
+        del userdata["icon"]
 
         # test receiving an unknown remote id and loading data
         responses.add(
-            responses.GET,
-            'https://example.com/user/mouse',
-            json=userdata,
-            status=200)
-        with patch('bookwyrm.models.user.set_remote_server.delay'):
+            responses.GET, "https://example.com/user/mouse", json=userdata, status=200
+        )
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
             value = instance.field_from_activity(
-                ['https://example.com/user/mouse', 'bleh']
+                ["https://example.com/user/mouse", "bleh"]
             )
         self.assertIsInstance(value, list)
         self.assertEqual(len(value), 1)
         self.assertIsInstance(value[0], User)
 
     def test_tag_field(self):
-        ''' a special type of many to many field '''
-        instance = fields.TagField('User')
+        """ a special type of many to many field """
+        instance = fields.TagField("User")
 
         Serializable = namedtuple(
-            'Serializable',
-            ('to_activity', 'remote_id', 'name_field', 'name')
+            "Serializable", ("to_activity", "remote_id", "name_field", "name")
         )
-        Queryset = namedtuple('Queryset', ('all', 'instance'))
-        item = Serializable(
-            lambda: {'a': 'b'}, 'https://e.b/c', 'name', 'Name')
-        another_item = Serializable(
-            lambda: {}, 'example.com', '', '')
+        Queryset = namedtuple("Queryset", ("all", "instance"))
+        item = Serializable(lambda: {"a": "b"}, "https://e.b/c", "name", "Name")
+        another_item = Serializable(lambda: {}, "example.com", "", "")
         items = Queryset(lambda: [item], another_item)
 
         result = instance.field_to_activity(items)
         self.assertIsInstance(result, list)
         self.assertEqual(len(result), 1)
-        self.assertEqual(result[0].href, 'https://e.b/c')
-        self.assertEqual(result[0].name, 'Name')
-        self.assertEqual(result[0].type, 'Serializable')
-
+        self.assertEqual(result[0].href, "https://e.b/c")
+        self.assertEqual(result[0].name, "Name")
+        self.assertEqual(result[0].type, "Serializable")
 
     def test_tag_field_from_activity(self):
-        ''' loadin' a list of items from Links '''
+        """ loadin' a list of items from Links """
         # TODO
 
-
     @responses.activate
-    @patch('bookwyrm.models.activitypub_mixin.ObjectMixin.broadcast')
+    @patch("bookwyrm.models.activitypub_mixin.ObjectMixin.broadcast")
     def test_image_field(self, _):
-        ''' storing images '''
+        """ storing images """
         user = User.objects.create_user(
-            'mouse', 'mouse@mouse.mouse', 'mouseword',
-            local=True, localname='mouse')
+            "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
+        )
         image_file = pathlib.Path(__file__).parent.joinpath(
-            '../../static/images/default_avi.jpg')
+            "../../static/images/default_avi.jpg"
+        )
         image = Image.open(image_file)
         output = BytesIO()
         image.save(output, format=image.format)
-        user.avatar.save(
-            'test.jpg',
-            ContentFile(output.getvalue())
-        )
+        user.avatar.save("test.jpg", ContentFile(output.getvalue()))
 
-        output = fields.image_serializer(user.avatar, alt='alt text')
+        output = fields.image_serializer(user.avatar, alt="alt text")
         self.assertIsNotNone(
             re.match(
-                r'.*\.jpg',
+                r".*\.jpg",
                 output.url,
             )
         )
-        self.assertEqual(output.name, 'alt text')
-        self.assertEqual(output.type, 'Image')
+        self.assertEqual(output.name, "alt text")
+        self.assertEqual(output.type, "Image")
 
         instance = fields.ImageField()
 
@@ -433,36 +413,30 @@ class ActivitypubFields(TestCase):
 
         responses.add(
             responses.GET,
-            'http://www.example.com/image.jpg',
+            "http://www.example.com/image.jpg",
             body=user.avatar.file.read(),
-            status=200)
-        loaded_image = instance.field_from_activity(
-            'http://www.example.com/image.jpg')
+            status=200,
+        )
+        loaded_image = instance.field_from_activity("http://www.example.com/image.jpg")
         self.assertIsInstance(loaded_image, list)
         self.assertIsInstance(loaded_image[1], ContentFile)
 
-
     def test_datetime_field(self):
-        ''' this one is pretty simple, it just has to use isoformat '''
+        """ this one is pretty simple, it just has to use isoformat """
         instance = fields.DateTimeField()
         now = timezone.now()
         self.assertEqual(instance.field_to_activity(now), now.isoformat())
-        self.assertEqual(
-            instance.field_from_activity(now.isoformat()), now
-        )
-        self.assertEqual(instance.field_from_activity('bip'), None)
-
+        self.assertEqual(instance.field_from_activity(now.isoformat()), now)
+        self.assertEqual(instance.field_from_activity("bip"), None)
 
     def test_array_field(self):
-        ''' idk why it makes them strings but probably for a good reason '''
+        """ idk why it makes them strings but probably for a good reason """
         instance = fields.ArrayField(fields.IntegerField)
-        self.assertEqual(instance.field_to_activity([0, 1]), ['0', '1'])
-
+        self.assertEqual(instance.field_to_activity([0, 1]), ["0", "1"])
 
     def test_html_field(self):
-        ''' sanitizes html, the sanitizer has its own tests '''
+        """ sanitizes html, the sanitizer has its own tests """
         instance = fields.HtmlField()
         self.assertEqual(
-            instance.field_from_activity('<marquee><p>hi</p></marquee>'),
-            '<p>hi</p>'
+            instance.field_from_activity("<marquee><p>hi</p></marquee>"), "<p>hi</p>"
         )
diff --git a/bookwyrm/tests/models/test_import_model.py b/bookwyrm/tests/models/test_import_model.py
index 7ec4e700..38c3b1ed 100644
--- a/bookwyrm/tests/models/test_import_model.py
+++ b/bookwyrm/tests/models/test_import_model.py
@@ -1,4 +1,4 @@
-''' testing models '''
+""" testing models """
 import datetime
 import json
 import pathlib
@@ -14,165 +14,166 @@ from bookwyrm.connectors.abstract_connector import SearchResult
 
 
 class ImportJob(TestCase):
-    ''' this is a fancy one!!! '''
+    """ this is a fancy one!!! """
+
     def setUp(self):
-        ''' data is from a goodreads export of The Raven Tower '''
+        """ data is from a goodreads export of The Raven Tower """
         read_data = {
-            'Book Id': 39395857,
-            'Title': 'The Raven Tower',
-            'Author': 'Ann Leckie',
-            'Author l-f': 'Leckie, Ann',
-            'Additional Authors': '',
-            'ISBN': '="0356506991"',
-            'ISBN13': '="9780356506999"',
-            'My Rating': 0,
-            'Average Rating': 4.06,
-            'Publisher': 'Orbit',
-            'Binding': 'Hardcover',
-            'Number of Pages': 416,
-            'Year Published': 2019,
-            'Original Publication Year': 2019,
-            'Date Read': '2019/04/12',
-            'Date Added': '2019/04/09',
-            'Bookshelves': '',
-            'Bookshelves with positions': '',
-            'Exclusive Shelf': 'read',
-            'My Review': '',
-            'Spoiler': '',
-            'Private Notes': '',
-            'Read Count': 1,
-            'Recommended For': '',
-            'Recommended By': '',
-            'Owned Copies': 0,
-            'Original Purchase Date': '',
-            'Original Purchase Location': '',
-            'Condition': '',
-            'Condition Description': '',
-            'BCID': ''
+            "Book Id": 39395857,
+            "Title": "The Raven Tower",
+            "Author": "Ann Leckie",
+            "Author l-f": "Leckie, Ann",
+            "Additional Authors": "",
+            "ISBN": '="0356506991"',
+            "ISBN13": '="9780356506999"',
+            "My Rating": 0,
+            "Average Rating": 4.06,
+            "Publisher": "Orbit",
+            "Binding": "Hardcover",
+            "Number of Pages": 416,
+            "Year Published": 2019,
+            "Original Publication Year": 2019,
+            "Date Read": "2019/04/12",
+            "Date Added": "2019/04/09",
+            "Bookshelves": "",
+            "Bookshelves with positions": "",
+            "Exclusive Shelf": "read",
+            "My Review": "",
+            "Spoiler": "",
+            "Private Notes": "",
+            "Read Count": 1,
+            "Recommended For": "",
+            "Recommended By": "",
+            "Owned Copies": 0,
+            "Original Purchase Date": "",
+            "Original Purchase Location": "",
+            "Condition": "",
+            "Condition Description": "",
+            "BCID": "",
         }
         currently_reading_data = read_data.copy()
-        currently_reading_data['Exclusive Shelf'] = 'currently-reading'
-        currently_reading_data['Date Read'] = ''
+        currently_reading_data["Exclusive Shelf"] = "currently-reading"
+        currently_reading_data["Date Read"] = ""
 
         unknown_read_data = currently_reading_data.copy()
-        unknown_read_data['Exclusive Shelf'] = 'read'
-        unknown_read_data['Date Read'] = ''
+        unknown_read_data["Exclusive Shelf"] = "read"
+        unknown_read_data["Date Read"] = ""
 
         user = models.User.objects.create_user(
-            'mouse', 'mouse@mouse.mouse', 'mouseword',
-            local=True, localname='mouse')
+            "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
+        )
         job = models.ImportJob.objects.create(user=user)
         self.item_1 = models.ImportItem.objects.create(
-            job=job, index=1, data=currently_reading_data)
-        self.item_2 = models.ImportItem.objects.create(
-            job=job, index=2, data=read_data)
+            job=job, index=1, data=currently_reading_data
+        )
+        self.item_2 = models.ImportItem.objects.create(job=job, index=2, data=read_data)
         self.item_3 = models.ImportItem.objects.create(
-            job=job, index=3, data=unknown_read_data)
-
+            job=job, index=3, data=unknown_read_data
+        )
 
     def test_isbn(self):
-        ''' it unquotes the isbn13 field from data '''
-        expected = '9780356506999'
+        """ it unquotes the isbn13 field from data """
+        expected = "9780356506999"
         item = models.ImportItem.objects.get(index=1)
         self.assertEqual(item.isbn, expected)
 
-
     def test_shelf(self):
-        ''' converts to the local shelf typology '''
-        expected = 'reading'
+        """ converts to the local shelf typology """
+        expected = "reading"
         self.assertEqual(self.item_1.shelf, expected)
 
-
     def test_date_added(self):
-        ''' converts to the local shelf typology '''
+        """ converts to the local shelf typology """
         expected = datetime.datetime(2019, 4, 9, 0, 0, tzinfo=timezone.utc)
         item = models.ImportItem.objects.get(index=1)
         self.assertEqual(item.date_added, expected)
 
-
     def test_date_read(self):
-        ''' converts to the local shelf typology '''
+        """ converts to the local shelf typology """
         expected = datetime.datetime(2019, 4, 12, 0, 0, tzinfo=timezone.utc)
         item = models.ImportItem.objects.get(index=2)
         self.assertEqual(item.date_read, expected)
 
-
     def test_currently_reading_reads(self):
-        ''' infer currently reading dates where available '''
-        expected = [models.ReadThrough(
-            start_date=datetime.datetime(2019, 4, 9, 0, 0, tzinfo=timezone.utc)
-        )]
+        """ infer currently reading dates where available """
+        expected = [
+            models.ReadThrough(
+                start_date=datetime.datetime(2019, 4, 9, 0, 0, tzinfo=timezone.utc)
+            )
+        ]
         actual = models.ImportItem.objects.get(index=1)
         self.assertEqual(actual.reads[0].start_date, expected[0].start_date)
         self.assertEqual(actual.reads[0].finish_date, expected[0].finish_date)
 
     def test_read_reads(self):
-        ''' infer read dates where available '''
+        """ infer read dates where available """
         actual = self.item_2
         self.assertEqual(
             actual.reads[0].start_date,
-            datetime.datetime(2019, 4, 9, 0, 0, tzinfo=timezone.utc))
+            datetime.datetime(2019, 4, 9, 0, 0, tzinfo=timezone.utc),
+        )
         self.assertEqual(
             actual.reads[0].finish_date,
-            datetime.datetime(2019, 4, 12, 0, 0, tzinfo=timezone.utc))
+            datetime.datetime(2019, 4, 12, 0, 0, tzinfo=timezone.utc),
+        )
 
     def test_unread_reads(self):
-        ''' handle books with no read dates '''
+        """ handle books with no read dates """
         expected = []
         actual = models.ImportItem.objects.get(index=3)
         self.assertEqual(actual.reads, expected)
 
-
     @responses.activate
     def test_get_book_from_isbn(self):
-        ''' search and load books by isbn (9780356506999) '''
+        """ search and load books by isbn (9780356506999) """
         connector_info = models.Connector.objects.create(
-            identifier='openlibrary.org',
-            name='OpenLibrary',
-            connector_file='openlibrary',
-            base_url='https://openlibrary.org',
-            books_url='https://openlibrary.org',
-            covers_url='https://covers.openlibrary.org',
-            search_url='https://openlibrary.org/search?q=',
+            identifier="openlibrary.org",
+            name="OpenLibrary",
+            connector_file="openlibrary",
+            base_url="https://openlibrary.org",
+            books_url="https://openlibrary.org",
+            covers_url="https://covers.openlibrary.org",
+            search_url="https://openlibrary.org/search?q=",
             priority=3,
         )
         connector = connector_manager.load_connector(connector_info)
         result = SearchResult(
-            title='Test Result',
-            key='https://openlibrary.org/works/OL1234W',
-            author='An Author',
-            year='1980',
+            title="Test Result",
+            key="https://openlibrary.org/works/OL1234W",
+            author="An Author",
+            year="1980",
             connector=connector,
         )
 
-
-        datafile = pathlib.Path(__file__).parent.joinpath(
-            '../data/ol_edition.json')
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/ol_edition.json")
         bookdata = json.loads(datafile.read_bytes())
         responses.add(
             responses.GET,
-            'https://openlibrary.org/works/OL1234W',
+            "https://openlibrary.org/works/OL1234W",
             json=bookdata,
-            status=200)
+            status=200,
+        )
         responses.add(
             responses.GET,
-            'https://openlibrary.org/works/OL15832982W',
+            "https://openlibrary.org/works/OL15832982W",
             json=bookdata,
-            status=200)
+            status=200,
+        )
         responses.add(
             responses.GET,
-            'https://openlibrary.org/authors/OL382982A',
-            json={'name': 'test author'},
-            status=200)
+            "https://openlibrary.org/authors/OL382982A",
+            json={"name": "test author"},
+            status=200,
+        )
 
-        with patch(
-                'bookwyrm.connectors.abstract_connector.load_more_data.delay'):
+        with patch("bookwyrm.connectors.abstract_connector.load_more_data.delay"):
             with patch(
-                    'bookwyrm.connectors.connector_manager.first_search_result'
-                ) as search:
+                "bookwyrm.connectors.connector_manager.first_search_result"
+            ) as search:
                 search.return_value = result
-                with patch('bookwyrm.connectors.openlibrary.Connector.' \
-                        'get_authors_from_data'):
+                with patch(
+                    "bookwyrm.connectors.openlibrary.Connector." "get_authors_from_data"
+                ):
                     book = self.item_1.get_book_from_isbn()
 
-        self.assertEqual(book.title, 'Sabriel')
+        self.assertEqual(book.title, "Sabriel")
diff --git a/bookwyrm/tests/models/test_list.py b/bookwyrm/tests/models/test_list.py
index d41b81c7..6bc4b796 100644
--- a/bookwyrm/tests/models/test_list.py
+++ b/bookwyrm/tests/models/test_list.py
@@ -1,43 +1,41 @@
-''' testing models '''
+""" testing models """
 from unittest.mock import patch
 from django.test import TestCase
 
 from bookwyrm import models, settings
 
 
-@patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay')
+@patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 class List(TestCase):
-    ''' some activitypub oddness ahead '''
+    """ some activitypub oddness ahead """
+
     def setUp(self):
-        ''' look, a list '''
+        """ look, a list """
         self.user = models.User.objects.create_user(
-            'mouse', 'mouse@mouse.mouse', 'mouseword',
-            local=True, localname='mouse')
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            self.list = models.List.objects.create(
-                name='Test List', user=self.user)
+            "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
+        )
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            self.list = models.List.objects.create(name="Test List", user=self.user)
 
     def test_remote_id(self, _):
-        ''' shelves use custom remote ids '''
-        expected_id = 'https://%s/list/%d' % \
-            (settings.DOMAIN, self.list.id)
+        """ shelves use custom remote ids """
+        expected_id = "https://%s/list/%d" % (settings.DOMAIN, self.list.id)
         self.assertEqual(self.list.get_remote_id(), expected_id)
 
-
     def test_to_activity(self, _):
-        ''' jsonify it '''
+        """ jsonify it """
         activity_json = self.list.to_activity()
         self.assertIsInstance(activity_json, dict)
-        self.assertEqual(activity_json['id'], self.list.remote_id)
-        self.assertEqual(activity_json['totalItems'], 0)
-        self.assertEqual(activity_json['type'], 'BookList')
-        self.assertEqual(activity_json['name'], 'Test List')
-        self.assertEqual(activity_json['owner'], self.user.remote_id)
+        self.assertEqual(activity_json["id"], self.list.remote_id)
+        self.assertEqual(activity_json["totalItems"], 0)
+        self.assertEqual(activity_json["type"], "BookList")
+        self.assertEqual(activity_json["name"], "Test List")
+        self.assertEqual(activity_json["owner"], self.user.remote_id)
 
     def test_list_item(self, _):
-        ''' a list entry '''
-        work = models.Work.objects.create(title='hello')
-        book = models.Edition.objects.create(title='hi', parent_work=work)
+        """ a list entry """
+        work = models.Work.objects.create(title="hello")
+        book = models.Edition.objects.create(title="hi", parent_work=work)
         item = models.ListItem.objects.create(
             book_list=self.list,
             book=book,
@@ -47,11 +45,11 @@ class List(TestCase):
         self.assertTrue(item.approved)
 
         add_activity = item.to_add_activity()
-        self.assertEqual(add_activity['actor'], self.user.remote_id)
-        self.assertEqual(add_activity['object']['id'], book.remote_id)
-        self.assertEqual(add_activity['target'], self.list.remote_id)
+        self.assertEqual(add_activity["actor"], self.user.remote_id)
+        self.assertEqual(add_activity["object"]["id"], book.remote_id)
+        self.assertEqual(add_activity["target"], self.list.remote_id)
 
         remove_activity = item.to_remove_activity()
-        self.assertEqual(remove_activity['actor'], self.user.remote_id)
-        self.assertEqual(remove_activity['object']['id'], book.remote_id)
-        self.assertEqual(remove_activity['target'], self.list.remote_id)
+        self.assertEqual(remove_activity["actor"], self.user.remote_id)
+        self.assertEqual(remove_activity["object"]["id"], book.remote_id)
+        self.assertEqual(remove_activity["target"], self.list.remote_id)
diff --git a/bookwyrm/tests/models/test_readthrough_model.py b/bookwyrm/tests/models/test_readthrough_model.py
index 3fcdf1e4..f69e8779 100644
--- a/bookwyrm/tests/models/test_readthrough_model.py
+++ b/bookwyrm/tests/models/test_readthrough_model.py
@@ -1,4 +1,4 @@
-''' testing models '''
+""" testing models """
 from django.test import TestCase
 from django.core.exceptions import ValidationError
 
@@ -6,39 +6,36 @@ from bookwyrm import models, settings
 
 
 class ReadThrough(TestCase):
-    ''' some activitypub oddness ahead '''
-    def setUp(self):
-        ''' look, a shelf '''
-        self.user = models.User.objects.create_user(
-            'mouse', 'mouse@mouse.mouse', 'mouseword',
-            local=True, localname='mouse')
+    """ some activitypub oddness ahead """
 
-        self.work = models.Work.objects.create(
-            title='Example Work'
+    def setUp(self):
+        """ look, a shelf """
+        self.user = models.User.objects.create_user(
+            "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
         )
 
+        self.work = models.Work.objects.create(title="Example Work")
+
         self.edition = models.Edition.objects.create(
-            title='Example Edition',
-            parent_work=self.work
+            title="Example Edition", parent_work=self.work
         )
         self.work.default_edition = self.edition
         self.work.save()
 
         self.readthrough = models.ReadThrough.objects.create(
-            user=self.user,
-            book=self.edition)
+            user=self.user, book=self.edition
+        )
 
     def test_progress_update(self):
-        ''' Test progress updates '''
-        self.readthrough.create_update() # No-op, no progress yet
+        """ Test progress updates """
+        self.readthrough.create_update()  # No-op, no progress yet
         self.readthrough.progress = 10
         self.readthrough.create_update()
         self.readthrough.progress = 20
         self.readthrough.progress_mode = models.ProgressMode.PERCENT
         self.readthrough.create_update()
 
-        updates = self.readthrough.progressupdate_set \
-                    .order_by('created_date').all()
+        updates = self.readthrough.progressupdate_set.order_by("created_date").all()
         self.assertEqual(len(updates), 2)
         self.assertEqual(updates[0].progress, 10)
         self.assertEqual(updates[0].mode, models.ProgressMode.PAGE)
diff --git a/bookwyrm/tests/models/test_relationship_models.py b/bookwyrm/tests/models/test_relationship_models.py
index 0ef53450..0e842b21 100644
--- a/bookwyrm/tests/models/test_relationship_models.py
+++ b/bookwyrm/tests/models/test_relationship_models.py
@@ -1,4 +1,4 @@
-''' testing models '''
+""" testing models """
 from unittest.mock import patch
 from django.test import TestCase
 
@@ -6,87 +6,79 @@ from bookwyrm import models
 
 
 class Relationship(TestCase):
-    ''' following, blocking, stuff like that '''
+    """ following, blocking, stuff like that """
+
     def setUp(self):
-        ''' we need some users for this '''
-        with patch('bookwyrm.models.user.set_remote_server.delay'):
+        """ we need some users for this """
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
             self.remote_user = models.User.objects.create_user(
-                'rat', 'rat@rat.com', 'ratword',
+                "rat",
+                "rat@rat.com",
+                "ratword",
                 local=False,
-                remote_id='https://example.com/users/rat',
-                inbox='https://example.com/users/rat/inbox',
-                outbox='https://example.com/users/rat/outbox',
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
             )
         self.local_user = models.User.objects.create_user(
-            'mouse', 'mouse@mouse.com', 'mouseword',
-            local=True, localname='mouse')
-        self.local_user.remote_id = 'http://local.com/user/mouse'
+            "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse"
+        )
+        self.local_user.remote_id = "http://local.com/user/mouse"
         self.local_user.save(broadcast=False)
 
-
     def test_user_follows_from_request(self):
-        ''' convert a follow request into a follow '''
+        """ convert a follow request into a follow """
         real_broadcast = models.UserFollowRequest.broadcast
+
         def mock_broadcast(_, activity, user):
-            ''' introspect what's being sent out '''
+            """ introspect what's being sent out """
             self.assertEqual(user.remote_id, self.local_user.remote_id)
-            self.assertEqual(activity['type'], 'Follow')
+            self.assertEqual(activity["type"], "Follow")
 
         models.UserFollowRequest.broadcast = mock_broadcast
         request = models.UserFollowRequest.objects.create(
-            user_subject=self.local_user,
-            user_object=self.remote_user
+            user_subject=self.local_user, user_object=self.remote_user
         )
         self.assertEqual(
-            request.remote_id,
-            'http://local.com/user/mouse#follows/%d' % request.id
+            request.remote_id, "http://local.com/user/mouse#follows/%d" % request.id
         )
-        self.assertEqual(request.status, 'follow_request')
+        self.assertEqual(request.status, "follow_request")
 
         rel = models.UserFollows.from_request(request)
         self.assertEqual(
-            rel.remote_id,
-            'http://local.com/user/mouse#follows/%d' % request.id
+            rel.remote_id, "http://local.com/user/mouse#follows/%d" % request.id
         )
-        self.assertEqual(rel.status, 'follows')
+        self.assertEqual(rel.status, "follows")
         self.assertEqual(rel.user_subject, self.local_user)
         self.assertEqual(rel.user_object, self.remote_user)
         models.UserFollowRequest.broadcast = real_broadcast
 
-
-
     def test_user_follows_from_request_custom_remote_id(self):
-        ''' store a specific remote id for a relationship provided by remote '''
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        """ store a specific remote id for a relationship provided by remote """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             request = models.UserFollowRequest.objects.create(
                 user_subject=self.local_user,
                 user_object=self.remote_user,
-                remote_id='http://antoher.server/sdkfhskdjf/23'
+                remote_id="http://antoher.server/sdkfhskdjf/23",
             )
-        self.assertEqual(
-            request.remote_id,
-            'http://antoher.server/sdkfhskdjf/23'
-        )
-        self.assertEqual(request.status, 'follow_request')
+        self.assertEqual(request.remote_id, "http://antoher.server/sdkfhskdjf/23")
+        self.assertEqual(request.status, "follow_request")
 
         rel = models.UserFollows.from_request(request)
-        self.assertEqual(
-            rel.remote_id,
-            'http://antoher.server/sdkfhskdjf/23'
-        )
-        self.assertEqual(rel.status, 'follows')
+        self.assertEqual(rel.remote_id, "http://antoher.server/sdkfhskdjf/23")
+        self.assertEqual(rel.status, "follows")
         self.assertEqual(rel.user_subject, self.local_user)
         self.assertEqual(rel.user_object, self.remote_user)
 
-
     def test_follow_request_activity(self):
-        ''' accept a request and make it a relationship '''
+        """ accept a request and make it a relationship """
         real_broadcast = models.UserFollowRequest.broadcast
+
         def mock_broadcast(_, activity, user):
             self.assertEqual(user.remote_id, self.local_user.remote_id)
-            self.assertEqual(activity['actor'], self.local_user.remote_id)
-            self.assertEqual(activity['object'], self.remote_user.remote_id)
-            self.assertEqual(activity['type'], 'Follow')
+            self.assertEqual(activity["actor"], self.local_user.remote_id)
+            self.assertEqual(activity["object"], self.remote_user.remote_id)
+            self.assertEqual(activity["type"], "Follow")
 
         models.UserFollowRequest.broadcast = mock_broadcast
         models.UserFollowRequest.objects.create(
@@ -95,15 +87,15 @@ class Relationship(TestCase):
         )
         models.UserFollowRequest.broadcast = real_broadcast
 
-
     def test_follow_request_accept(self):
-        ''' accept a request and make it a relationship '''
+        """ accept a request and make it a relationship """
         real_broadcast = models.UserFollowRequest.broadcast
+
         def mock_broadcast(_, activity, user):
             self.assertEqual(user.remote_id, self.local_user.remote_id)
-            self.assertEqual(activity['type'], 'Accept')
-            self.assertEqual(activity['actor'], self.local_user.remote_id)
-            self.assertEqual(activity['object']['id'], 'https://www.hi.com/')
+            self.assertEqual(activity["type"], "Accept")
+            self.assertEqual(activity["actor"], self.local_user.remote_id)
+            self.assertEqual(activity["object"]["id"], "https://www.hi.com/")
 
         self.local_user.manually_approves_followers = True
         self.local_user.save(broadcast=False)
@@ -111,7 +103,7 @@ class Relationship(TestCase):
         request = models.UserFollowRequest.objects.create(
             user_subject=self.remote_user,
             user_object=self.local_user,
-            remote_id='https://www.hi.com/'
+            remote_id="https://www.hi.com/",
         )
         request.accept()
 
@@ -122,16 +114,15 @@ class Relationship(TestCase):
         self.assertEqual(rel.user_object, self.local_user)
         models.UserFollowRequest.broadcast = real_broadcast
 
-
     def test_follow_request_reject(self):
-        ''' accept a request and make it a relationship '''
+        """ accept a request and make it a relationship """
         real_broadcast = models.UserFollowRequest.broadcast
+
         def mock_reject(_, activity, user):
             self.assertEqual(user.remote_id, self.local_user.remote_id)
-            self.assertEqual(activity['type'], 'Reject')
-            self.assertEqual(activity['actor'], self.local_user.remote_id)
-            self.assertEqual(
-                activity['object']['id'], request.remote_id)
+            self.assertEqual(activity["type"], "Reject")
+            self.assertEqual(activity["actor"], self.local_user.remote_id)
+            self.assertEqual(activity["object"]["id"], request.remote_id)
 
         models.UserFollowRequest.broadcast = mock_reject
         self.local_user.manually_approves_followers = True
diff --git a/bookwyrm/tests/models/test_shelf_model.py b/bookwyrm/tests/models/test_shelf_model.py
index c997326e..3bbb9890 100644
--- a/bookwyrm/tests/models/test_shelf_model.py
+++ b/bookwyrm/tests/models/test_shelf_model.py
@@ -1,116 +1,120 @@
-''' testing models '''
+""" testing models """
 from django.test import TestCase
 
 from bookwyrm import models, settings
 
 
-#pylint: disable=unused-argument
+# pylint: disable=unused-argument
 class Shelf(TestCase):
-    ''' some activitypub oddness ahead '''
+    """ some activitypub oddness ahead """
+
     def setUp(self):
-        ''' look, a shelf '''
+        """ look, a shelf """
         self.local_user = models.User.objects.create_user(
-            'mouse', 'mouse@mouse.mouse', 'mouseword',
-            local=True, localname='mouse')
-        work = models.Work.objects.create(title='Test Work')
-        self.book = models.Edition.objects.create(
-            title='test book',
-            parent_work=work)
+            "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
+        )
+        work = models.Work.objects.create(title="Test Work")
+        self.book = models.Edition.objects.create(title="test book", parent_work=work)
 
     def test_remote_id(self):
-        ''' shelves use custom remote ids '''
+        """ shelves use custom remote ids """
         real_broadcast = models.Shelf.broadcast
+
         def broadcast_mock(_, activity, user, **kwargs):
-            ''' nah '''
+            """ nah """
+
         models.Shelf.broadcast = broadcast_mock
         shelf = models.Shelf.objects.create(
-            name='Test Shelf', identifier='test-shelf',
-            user=self.local_user)
-        expected_id = 'https://%s/user/mouse/shelf/test-shelf' % settings.DOMAIN
+            name="Test Shelf", identifier="test-shelf", user=self.local_user
+        )
+        expected_id = "https://%s/user/mouse/shelf/test-shelf" % settings.DOMAIN
         self.assertEqual(shelf.get_remote_id(), expected_id)
         models.Shelf.broadcast = real_broadcast
 
-
     def test_to_activity(self):
-        ''' jsonify it '''
+        """ jsonify it """
         real_broadcast = models.Shelf.broadcast
+
         def empty_mock(_, activity, user, **kwargs):
-            ''' nah '''
+            """ nah """
+
         models.Shelf.broadcast = empty_mock
         shelf = models.Shelf.objects.create(
-            name='Test Shelf', identifier='test-shelf',
-            user=self.local_user)
+            name="Test Shelf", identifier="test-shelf", user=self.local_user
+        )
         activity_json = shelf.to_activity()
         self.assertIsInstance(activity_json, dict)
-        self.assertEqual(activity_json['id'], shelf.remote_id)
-        self.assertEqual(activity_json['totalItems'], 0)
-        self.assertEqual(activity_json['type'], 'Shelf')
-        self.assertEqual(activity_json['name'], 'Test Shelf')
-        self.assertEqual(activity_json['owner'], self.local_user.remote_id)
+        self.assertEqual(activity_json["id"], shelf.remote_id)
+        self.assertEqual(activity_json["totalItems"], 0)
+        self.assertEqual(activity_json["type"], "Shelf")
+        self.assertEqual(activity_json["name"], "Test Shelf")
+        self.assertEqual(activity_json["owner"], self.local_user.remote_id)
         models.Shelf.broadcast = real_broadcast
 
-
     def test_create_update_shelf(self):
-        ''' create and broadcast shelf creation '''
+        """ create and broadcast shelf creation """
         real_broadcast = models.Shelf.broadcast
+
         def create_mock(_, activity, user, **kwargs):
-            ''' ok '''
+            """ ok """
             self.assertEqual(user.remote_id, self.local_user.remote_id)
-            self.assertEqual(activity['type'], 'Create')
-            self.assertEqual(activity['actor'], self.local_user.remote_id)
-            self.assertEqual(activity['object']['name'], 'Test Shelf')
+            self.assertEqual(activity["type"], "Create")
+            self.assertEqual(activity["actor"], self.local_user.remote_id)
+            self.assertEqual(activity["object"]["name"], "Test Shelf")
+
         models.Shelf.broadcast = create_mock
 
         shelf = models.Shelf.objects.create(
-            name='Test Shelf', identifier='test-shelf', user=self.local_user)
+            name="Test Shelf", identifier="test-shelf", user=self.local_user
+        )
 
         def update_mock(_, activity, user, **kwargs):
-            ''' ok '''
+            """ ok """
             self.assertEqual(user.remote_id, self.local_user.remote_id)
-            self.assertEqual(activity['type'], 'Update')
-            self.assertEqual(activity['actor'], self.local_user.remote_id)
-            self.assertEqual(activity['object']['name'], 'arthur russel')
+            self.assertEqual(activity["type"], "Update")
+            self.assertEqual(activity["actor"], self.local_user.remote_id)
+            self.assertEqual(activity["object"]["name"], "arthur russel")
+
         models.Shelf.broadcast = update_mock
 
-        shelf.name = 'arthur russel'
+        shelf.name = "arthur russel"
         shelf.save()
-        self.assertEqual(shelf.name, 'arthur russel')
+        self.assertEqual(shelf.name, "arthur russel")
         models.Shelf.broadcast = real_broadcast
 
-
     def test_shelve(self):
-        ''' create and broadcast shelf creation '''
+        """ create and broadcast shelf creation """
         real_broadcast = models.Shelf.broadcast
         real_shelfbook_broadcast = models.ShelfBook.broadcast
 
         def add_mock(_, activity, user, **kwargs):
-            ''' ok '''
+            """ ok """
             self.assertEqual(user.remote_id, self.local_user.remote_id)
-            self.assertEqual(activity['type'], 'Add')
-            self.assertEqual(activity['actor'], self.local_user.remote_id)
-            self.assertEqual(activity['object']['id'], self.book.remote_id)
-            self.assertEqual(activity['target'], shelf.remote_id)
+            self.assertEqual(activity["type"], "Add")
+            self.assertEqual(activity["actor"], self.local_user.remote_id)
+            self.assertEqual(activity["object"]["id"], self.book.remote_id)
+            self.assertEqual(activity["target"], shelf.remote_id)
 
         def remove_mock(_, activity, user, **kwargs):
-            ''' ok '''
+            """ ok """
             self.assertEqual(user.remote_id, self.local_user.remote_id)
-            self.assertEqual(activity['type'], 'Remove')
-            self.assertEqual(activity['actor'], self.local_user.remote_id)
-            self.assertEqual(activity['object']['id'], self.book.remote_id)
-            self.assertEqual(activity['target'], shelf.remote_id)
+            self.assertEqual(activity["type"], "Remove")
+            self.assertEqual(activity["actor"], self.local_user.remote_id)
+            self.assertEqual(activity["object"]["id"], self.book.remote_id)
+            self.assertEqual(activity["target"], shelf.remote_id)
 
         def empty_mock(_, activity, user, **kwargs):
-            ''' nah '''
+            """ nah """
 
         models.Shelf.broadcast = empty_mock
         shelf = models.Shelf.objects.create(
-            name='Test Shelf', identifier='test-shelf', user=self.local_user)
+            name="Test Shelf", identifier="test-shelf", user=self.local_user
+        )
 
         models.ShelfBook.broadcast = add_mock
         shelf_book = models.ShelfBook.objects.create(
-            shelf=shelf,
-            user=self.local_user,
-            book=self.book)
+            shelf=shelf, user=self.local_user, book=self.book
+        )
         self.assertEqual(shelf.books.first(), self.book)
 
         models.ShelfBook.broadcast = remove_mock
diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py
index 29be5c07..21982c20 100644
--- a/bookwyrm/tests/models/test_status_model.py
+++ b/bookwyrm/tests/models/test_status_model.py
@@ -1,4 +1,4 @@
-''' testing models '''
+""" testing models """
 from unittest.mock import patch
 from io import BytesIO
 import pathlib
@@ -12,44 +12,45 @@ from django.utils import timezone
 from bookwyrm import models, settings
 
 
-@patch('bookwyrm.models.Status.broadcast')
+@patch("bookwyrm.models.Status.broadcast")
 class Status(TestCase):
-    ''' lotta types of statuses '''
+    """ lotta types of statuses """
+
     def setUp(self):
-        ''' useful things for creating a status '''
+        """ useful things for creating a status """
         self.user = models.User.objects.create_user(
-            'mouse', 'mouse@mouse.mouse', 'mouseword',
-            local=True, localname='mouse')
-        self.book = models.Edition.objects.create(title='Test Edition')
+            "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
+        )
+        self.book = models.Edition.objects.create(title="Test Edition")
 
         image_file = pathlib.Path(__file__).parent.joinpath(
-            '../../static/images/default_avi.jpg')
+            "../../static/images/default_avi.jpg"
+        )
         image = Image.open(image_file)
         output = BytesIO()
-        with patch('bookwyrm.models.Status.broadcast'):
+        with patch("bookwyrm.models.Status.broadcast"):
             image.save(output, format=image.format)
-            self.book.cover.save(
-                'test.jpg',
-                ContentFile(output.getvalue())
-            )
+            self.book.cover.save("test.jpg", ContentFile(output.getvalue()))
 
     def test_status_generated_fields(self, _):
-        ''' setting remote id '''
-        status = models.Status.objects.create(content='bleh', user=self.user)
-        expected_id = 'https://%s/user/mouse/status/%d' % \
-                (settings.DOMAIN, status.id)
+        """ setting remote id """
+        status = models.Status.objects.create(content="bleh", user=self.user)
+        expected_id = "https://%s/user/mouse/status/%d" % (settings.DOMAIN, status.id)
         self.assertEqual(status.remote_id, expected_id)
-        self.assertEqual(status.privacy, 'public')
+        self.assertEqual(status.privacy, "public")
 
     def test_replies(self, _):
-        ''' get a list of replies '''
-        parent = models.Status.objects.create(content='hi', user=self.user)
+        """ get a list of replies """
+        parent = models.Status.objects.create(content="hi", user=self.user)
         child = models.Status.objects.create(
-            content='hello', reply_parent=parent, user=self.user)
+            content="hello", reply_parent=parent, user=self.user
+        )
         models.Review.objects.create(
-            content='hey', reply_parent=parent, user=self.user, book=self.book)
+            content="hey", reply_parent=parent, user=self.user, book=self.book
+        )
         models.Status.objects.create(
-            content='hi hello', reply_parent=child, user=self.user)
+            content="hi hello", reply_parent=child, user=self.user
+        )
 
         replies = models.Status.replies(parent)
         self.assertEqual(replies.count(), 2)
@@ -58,199 +59,228 @@ class Status(TestCase):
         self.assertIsInstance(replies.last(), models.Review)
 
     def test_status_type(self, _):
-        ''' class name '''
-        self.assertEqual(models.Status().status_type, 'Note')
-        self.assertEqual(models.Review().status_type, 'Review')
-        self.assertEqual(models.Quotation().status_type, 'Quotation')
-        self.assertEqual(models.Comment().status_type, 'Comment')
-        self.assertEqual(models.Boost().status_type, 'Announce')
+        """ class name """
+        self.assertEqual(models.Status().status_type, "Note")
+        self.assertEqual(models.Review().status_type, "Review")
+        self.assertEqual(models.Quotation().status_type, "Quotation")
+        self.assertEqual(models.Comment().status_type, "Comment")
+        self.assertEqual(models.Boost().status_type, "Announce")
 
     def test_boostable(self, _):
-        ''' can a status be boosted, based on privacy '''
-        self.assertTrue(models.Status(privacy='public').boostable)
-        self.assertTrue(models.Status(privacy='unlisted').boostable)
-        self.assertFalse(models.Status(privacy='followers').boostable)
-        self.assertFalse(models.Status(privacy='direct').boostable)
+        """ can a status be boosted, based on privacy """
+        self.assertTrue(models.Status(privacy="public").boostable)
+        self.assertTrue(models.Status(privacy="unlisted").boostable)
+        self.assertFalse(models.Status(privacy="followers").boostable)
+        self.assertFalse(models.Status(privacy="direct").boostable)
 
     def test_to_replies(self, _):
-        ''' activitypub replies collection '''
-        parent = models.Status.objects.create(content='hi', user=self.user)
+        """ activitypub replies collection """
+        parent = models.Status.objects.create(content="hi", user=self.user)
         child = models.Status.objects.create(
-            content='hello', reply_parent=parent, user=self.user)
+            content="hello", reply_parent=parent, user=self.user
+        )
         models.Review.objects.create(
-            content='hey', reply_parent=parent, user=self.user, book=self.book)
+            content="hey", reply_parent=parent, user=self.user, book=self.book
+        )
         models.Status.objects.create(
-            content='hi hello', reply_parent=child, user=self.user)
+            content="hi hello", reply_parent=child, user=self.user
+        )
 
         replies = parent.to_replies()
-        self.assertEqual(replies['id'], '%s/replies' % parent.remote_id)
-        self.assertEqual(replies['totalItems'], 2)
+        self.assertEqual(replies["id"], "%s/replies" % parent.remote_id)
+        self.assertEqual(replies["totalItems"], 2)
 
     def test_status_to_activity(self, _):
-        ''' subclass of the base model version with a "pure" serializer '''
-        status = models.Status.objects.create(
-            content='test content', user=self.user)
+        """ subclass of the base model version with a "pure" serializer """
+        status = models.Status.objects.create(content="test content", user=self.user)
         activity = status.to_activity()
-        self.assertEqual(activity['id'], status.remote_id)
-        self.assertEqual(activity['type'], 'Note')
-        self.assertEqual(activity['content'], 'test content')
-        self.assertEqual(activity['sensitive'], False)
+        self.assertEqual(activity["id"], status.remote_id)
+        self.assertEqual(activity["type"], "Note")
+        self.assertEqual(activity["content"], "test content")
+        self.assertEqual(activity["sensitive"], False)
 
     def test_status_to_activity_tombstone(self, _):
-        ''' subclass of the base model version with a "pure" serializer '''
+        """ subclass of the base model version with a "pure" serializer """
         status = models.Status.objects.create(
-            content='test content', user=self.user,
-            deleted=True, deleted_date=timezone.now())
+            content="test content",
+            user=self.user,
+            deleted=True,
+            deleted_date=timezone.now(),
+        )
         activity = status.to_activity()
-        self.assertEqual(activity['id'], status.remote_id)
-        self.assertEqual(activity['type'], 'Tombstone')
-        self.assertFalse(hasattr(activity, 'content'))
+        self.assertEqual(activity["id"], status.remote_id)
+        self.assertEqual(activity["type"], "Tombstone")
+        self.assertFalse(hasattr(activity, "content"))
 
     def test_status_to_pure_activity(self, _):
-        ''' subclass of the base model version with a "pure" serializer '''
-        status = models.Status.objects.create(
-            content='test content', user=self.user)
+        """ subclass of the base model version with a "pure" serializer """
+        status = models.Status.objects.create(content="test content", user=self.user)
         activity = status.to_activity(pure=True)
-        self.assertEqual(activity['id'], status.remote_id)
-        self.assertEqual(activity['type'], 'Note')
-        self.assertEqual(activity['content'], 'test content')
-        self.assertEqual(activity['sensitive'], False)
-        self.assertEqual(activity['attachment'], [])
+        self.assertEqual(activity["id"], status.remote_id)
+        self.assertEqual(activity["type"], "Note")
+        self.assertEqual(activity["content"], "test content")
+        self.assertEqual(activity["sensitive"], False)
+        self.assertEqual(activity["attachment"], [])
 
     def test_generated_note_to_activity(self, _):
-        ''' subclass of the base model version with a "pure" serializer '''
+        """ subclass of the base model version with a "pure" serializer """
         status = models.GeneratedNote.objects.create(
-            content='test content', user=self.user)
+            content="test content", user=self.user
+        )
         status.mention_books.set([self.book])
         status.mention_users.set([self.user])
         activity = status.to_activity()
-        self.assertEqual(activity['id'], status.remote_id)
-        self.assertEqual(activity['type'], 'GeneratedNote')
-        self.assertEqual(activity['content'], 'test content')
-        self.assertEqual(activity['sensitive'], False)
-        self.assertEqual(len(activity['tag']), 2)
+        self.assertEqual(activity["id"], status.remote_id)
+        self.assertEqual(activity["type"], "GeneratedNote")
+        self.assertEqual(activity["content"], "test content")
+        self.assertEqual(activity["sensitive"], False)
+        self.assertEqual(len(activity["tag"]), 2)
 
     def test_generated_note_to_pure_activity(self, _):
-        ''' subclass of the base model version with a "pure" serializer '''
+        """ subclass of the base model version with a "pure" serializer """
         status = models.GeneratedNote.objects.create(
-            content='test content', user=self.user)
+            content="test content", user=self.user
+        )
         status.mention_books.set([self.book])
         status.mention_users.set([self.user])
         activity = status.to_activity(pure=True)
-        self.assertEqual(activity['id'], status.remote_id)
+        self.assertEqual(activity["id"], status.remote_id)
         self.assertEqual(
-            activity['content'],
-            'mouse test content <a href="%s">"Test Edition"</a>' % \
-                self.book.remote_id)
-        self.assertEqual(len(activity['tag']), 2)
-        self.assertEqual(activity['type'], 'Note')
-        self.assertEqual(activity['sensitive'], False)
-        self.assertIsInstance(activity['attachment'], list)
-        self.assertEqual(activity['attachment'][0].type, 'Image')
-        self.assertEqual(activity['attachment'][0].url, 'https://%s%s' % \
-                (settings.DOMAIN, self.book.cover.url))
+            activity["content"],
+            'mouse test content <a href="%s">"Test Edition"</a>' % self.book.remote_id,
+        )
+        self.assertEqual(len(activity["tag"]), 2)
+        self.assertEqual(activity["type"], "Note")
+        self.assertEqual(activity["sensitive"], False)
+        self.assertIsInstance(activity["attachment"], list)
+        self.assertEqual(activity["attachment"][0].type, "Image")
         self.assertEqual(
-            activity['attachment'][0].name, 'Test Edition')
+            activity["attachment"][0].url,
+            "https://%s%s" % (settings.DOMAIN, self.book.cover.url),
+        )
+        self.assertEqual(activity["attachment"][0].name, "Test Edition")
 
     def test_comment_to_activity(self, _):
-        ''' subclass of the base model version with a "pure" serializer '''
+        """ subclass of the base model version with a "pure" serializer """
         status = models.Comment.objects.create(
-            content='test content', user=self.user, book=self.book)
+            content="test content", user=self.user, book=self.book
+        )
         activity = status.to_activity()
-        self.assertEqual(activity['id'], status.remote_id)
-        self.assertEqual(activity['type'], 'Comment')
-        self.assertEqual(activity['content'], 'test content')
-        self.assertEqual(activity['inReplyToBook'], self.book.remote_id)
+        self.assertEqual(activity["id"], status.remote_id)
+        self.assertEqual(activity["type"], "Comment")
+        self.assertEqual(activity["content"], "test content")
+        self.assertEqual(activity["inReplyToBook"], self.book.remote_id)
 
     def test_comment_to_pure_activity(self, _):
-        ''' subclass of the base model version with a "pure" serializer '''
+        """ subclass of the base model version with a "pure" serializer """
         status = models.Comment.objects.create(
-            content='test content', user=self.user, book=self.book)
+            content="test content", user=self.user, book=self.book
+        )
         activity = status.to_activity(pure=True)
-        self.assertEqual(activity['id'], status.remote_id)
-        self.assertEqual(activity['type'], 'Note')
+        self.assertEqual(activity["id"], status.remote_id)
+        self.assertEqual(activity["type"], "Note")
         self.assertEqual(
-            activity['content'],
-            'test content<p>(comment on <a href="%s">"Test Edition"</a>)</p>' %
-            self.book.remote_id)
-        self.assertEqual(activity['attachment'][0].type, 'Image')
-        self.assertEqual(activity['attachment'][0].url, 'https://%s%s' % \
-                (settings.DOMAIN, self.book.cover.url))
+            activity["content"],
+            'test content<p>(comment on <a href="%s">"Test Edition"</a>)</p>'
+            % self.book.remote_id,
+        )
+        self.assertEqual(activity["attachment"][0].type, "Image")
         self.assertEqual(
-            activity['attachment'][0].name, 'Test Edition')
+            activity["attachment"][0].url,
+            "https://%s%s" % (settings.DOMAIN, self.book.cover.url),
+        )
+        self.assertEqual(activity["attachment"][0].name, "Test Edition")
 
     def test_quotation_to_activity(self, _):
-        ''' subclass of the base model version with a "pure" serializer '''
+        """ subclass of the base model version with a "pure" serializer """
         status = models.Quotation.objects.create(
-            quote='a sickening sense', content='test content',
-            user=self.user, book=self.book)
+            quote="a sickening sense",
+            content="test content",
+            user=self.user,
+            book=self.book,
+        )
         activity = status.to_activity()
-        self.assertEqual(activity['id'], status.remote_id)
-        self.assertEqual(activity['type'], 'Quotation')
-        self.assertEqual(activity['quote'], 'a sickening sense')
-        self.assertEqual(activity['content'], 'test content')
-        self.assertEqual(activity['inReplyToBook'], self.book.remote_id)
+        self.assertEqual(activity["id"], status.remote_id)
+        self.assertEqual(activity["type"], "Quotation")
+        self.assertEqual(activity["quote"], "a sickening sense")
+        self.assertEqual(activity["content"], "test content")
+        self.assertEqual(activity["inReplyToBook"], self.book.remote_id)
 
     def test_quotation_to_pure_activity(self, _):
-        ''' subclass of the base model version with a "pure" serializer '''
+        """ subclass of the base model version with a "pure" serializer """
         status = models.Quotation.objects.create(
-            quote='a sickening sense', content='test content',
-            user=self.user, book=self.book)
+            quote="a sickening sense",
+            content="test content",
+            user=self.user,
+            book=self.book,
+        )
         activity = status.to_activity(pure=True)
-        self.assertEqual(activity['id'], status.remote_id)
-        self.assertEqual(activity['type'], 'Note')
+        self.assertEqual(activity["id"], status.remote_id)
+        self.assertEqual(activity["type"], "Note")
         self.assertEqual(
-            activity['content'],
-            'a sickening sense <p>-- <a href="%s">"Test Edition"</a></p>' \
-                    'test content' % self.book.remote_id)
-        self.assertEqual(activity['attachment'][0].type, 'Image')
-        self.assertEqual(activity['attachment'][0].url, 'https://%s%s' % \
-                (settings.DOMAIN, self.book.cover.url))
+            activity["content"],
+            'a sickening sense <p>-- <a href="%s">"Test Edition"</a></p>'
+            "test content" % self.book.remote_id,
+        )
+        self.assertEqual(activity["attachment"][0].type, "Image")
         self.assertEqual(
-            activity['attachment'][0].name, 'Test Edition')
+            activity["attachment"][0].url,
+            "https://%s%s" % (settings.DOMAIN, self.book.cover.url),
+        )
+        self.assertEqual(activity["attachment"][0].name, "Test Edition")
 
     def test_review_to_activity(self, _):
-        ''' subclass of the base model version with a "pure" serializer '''
+        """ subclass of the base model version with a "pure" serializer """
         status = models.Review.objects.create(
-            name='Review name', content='test content', rating=3,
-            user=self.user, book=self.book)
+            name="Review name",
+            content="test content",
+            rating=3,
+            user=self.user,
+            book=self.book,
+        )
         activity = status.to_activity()
-        self.assertEqual(activity['id'], status.remote_id)
-        self.assertEqual(activity['type'], 'Review')
-        self.assertEqual(activity['rating'], 3)
-        self.assertEqual(activity['name'], 'Review name')
-        self.assertEqual(activity['content'], 'test content')
-        self.assertEqual(activity['inReplyToBook'], self.book.remote_id)
+        self.assertEqual(activity["id"], status.remote_id)
+        self.assertEqual(activity["type"], "Review")
+        self.assertEqual(activity["rating"], 3)
+        self.assertEqual(activity["name"], "Review name")
+        self.assertEqual(activity["content"], "test content")
+        self.assertEqual(activity["inReplyToBook"], self.book.remote_id)
 
     def test_review_to_pure_activity(self, _):
-        ''' subclass of the base model version with a "pure" serializer '''
+        """ subclass of the base model version with a "pure" serializer """
         status = models.Review.objects.create(
-            name='Review name', content='test content', rating=3,
-            user=self.user, book=self.book)
+            name="Review name",
+            content="test content",
+            rating=3,
+            user=self.user,
+            book=self.book,
+        )
         activity = status.to_activity(pure=True)
-        self.assertEqual(activity['id'], status.remote_id)
-        self.assertEqual(activity['type'], 'Article')
+        self.assertEqual(activity["id"], status.remote_id)
+        self.assertEqual(activity["type"], "Article")
         self.assertEqual(
-            activity['name'], 'Review of "%s" (3 stars): Review name' \
-                % self.book.title)
-        self.assertEqual(activity['content'], 'test content')
-        self.assertEqual(activity['attachment'][0].type, 'Image')
-        self.assertEqual(activity['attachment'][0].url, 'https://%s%s' % \
-                (settings.DOMAIN, self.book.cover.url))
+            activity["name"], 'Review of "%s" (3 stars): Review name' % self.book.title
+        )
+        self.assertEqual(activity["content"], "test content")
+        self.assertEqual(activity["attachment"][0].type, "Image")
         self.assertEqual(
-            activity['attachment'][0].name, 'Test Edition')
+            activity["attachment"][0].url,
+            "https://%s%s" % (settings.DOMAIN, self.book.cover.url),
+        )
+        self.assertEqual(activity["attachment"][0].name, "Test Edition")
 
     def test_favorite(self, _):
-        ''' fav a status '''
+        """ fav a status """
         real_broadcast = models.Favorite.broadcast
+
         def fav_broadcast_mock(_, activity, user):
-            ''' ok '''
+            """ ok """
             self.assertEqual(user.remote_id, self.user.remote_id)
-            self.assertEqual(activity['type'], 'Like')
+            self.assertEqual(activity["type"], "Like")
+
         models.Favorite.broadcast = fav_broadcast_mock
 
-        status = models.Status.objects.create(
-            content='test content', user=self.user)
+        status = models.Status.objects.create(content="test content", user=self.user)
         fav = models.Favorite.objects.create(status=status, user=self.user)
 
         # can't fav a status twice
@@ -258,50 +288,47 @@ class Status(TestCase):
             models.Favorite.objects.create(status=status, user=self.user)
 
         activity = fav.to_activity()
-        self.assertEqual(activity['type'], 'Like')
-        self.assertEqual(activity['actor'], self.user.remote_id)
-        self.assertEqual(activity['object'], status.remote_id)
+        self.assertEqual(activity["type"], "Like")
+        self.assertEqual(activity["actor"], self.user.remote_id)
+        self.assertEqual(activity["object"], status.remote_id)
         models.Favorite.broadcast = real_broadcast
 
     def test_boost(self, _):
-        ''' boosting, this one's a bit fussy '''
-        status = models.Status.objects.create(
-            content='test content', user=self.user)
-        boost = models.Boost.objects.create(
-            boosted_status=status, user=self.user)
+        """ boosting, this one's a bit fussy """
+        status = models.Status.objects.create(content="test content", user=self.user)
+        boost = models.Boost.objects.create(boosted_status=status, user=self.user)
         activity = boost.to_activity()
-        self.assertEqual(activity['actor'], self.user.remote_id)
-        self.assertEqual(activity['object'], status.remote_id)
-        self.assertEqual(activity['type'], 'Announce')
+        self.assertEqual(activity["actor"], self.user.remote_id)
+        self.assertEqual(activity["object"], status.remote_id)
+        self.assertEqual(activity["type"], "Announce")
         self.assertEqual(activity, boost.to_activity(pure=True))
 
     def test_notification(self, _):
-        ''' a simple model '''
+        """ a simple model """
         notification = models.Notification.objects.create(
-            user=self.user, notification_type='FAVORITE')
+            user=self.user, notification_type="FAVORITE"
+        )
         self.assertFalse(notification.read)
 
         with self.assertRaises(IntegrityError):
             models.Notification.objects.create(
-                user=self.user, notification_type='GLORB')
-
+                user=self.user, notification_type="GLORB"
+            )
 
     def test_create_broadcast(self, broadcast_mock):
-        ''' should send out two verions of a status on create '''
-        models.Comment.objects.create(
-            content='hi', user=self.user, book=self.book)
+        """ should send out two verions of a status on create """
+        models.Comment.objects.create(content="hi", user=self.user, book=self.book)
         self.assertEqual(broadcast_mock.call_count, 2)
         pure_call = broadcast_mock.call_args_list[0]
         bw_call = broadcast_mock.call_args_list[1]
 
-        self.assertEqual(pure_call[1]['software'], 'other')
+        self.assertEqual(pure_call[1]["software"], "other")
         args = pure_call[0][0]
-        self.assertEqual(args['type'], 'Create')
-        self.assertEqual(args['object']['type'], 'Note')
-        self.assertTrue('content' in args['object'])
+        self.assertEqual(args["type"], "Create")
+        self.assertEqual(args["object"]["type"], "Note")
+        self.assertTrue("content" in args["object"])
 
-
-        self.assertEqual(bw_call[1]['software'], 'bookwyrm')
+        self.assertEqual(bw_call[1]["software"], "bookwyrm")
         args = bw_call[0][0]
-        self.assertEqual(args['type'], 'Create')
-        self.assertEqual(args['object']['type'], 'Comment')
+        self.assertEqual(args["type"], "Create")
+        self.assertEqual(args["object"]["type"], "Comment")
diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py
index ed3ad41a..618e4f78 100644
--- a/bookwyrm/tests/models/test_user_model.py
+++ b/bookwyrm/tests/models/test_user_model.py
@@ -1,4 +1,4 @@
-''' testing models '''
+""" testing models """
 from unittest.mock import patch
 from django.test import TestCase
 import responses
@@ -11,75 +11,84 @@ from bookwyrm.settings import DOMAIN
 class User(TestCase):
     def setUp(self):
         self.user = models.User.objects.create_user(
-            'mouse@%s' % DOMAIN, 'mouse@mouse.mouse', 'mouseword',
-            local=True, localname='mouse', name='hi', bookwyrm_user=False)
+            "mouse@%s" % DOMAIN,
+            "mouse@mouse.mouse",
+            "mouseword",
+            local=True,
+            localname="mouse",
+            name="hi",
+            bookwyrm_user=False,
+        )
 
     def test_computed_fields(self):
-        ''' username instead of id here '''
-        expected_id = 'https://%s/user/mouse' % DOMAIN
+        """ username instead of id here """
+        expected_id = "https://%s/user/mouse" % DOMAIN
         self.assertEqual(self.user.remote_id, expected_id)
-        self.assertEqual(self.user.username, 'mouse@%s' % DOMAIN)
-        self.assertEqual(self.user.localname, 'mouse')
-        self.assertEqual(self.user.shared_inbox, 'https://%s/inbox' % DOMAIN)
-        self.assertEqual(self.user.inbox, '%s/inbox' % expected_id)
-        self.assertEqual(self.user.outbox, '%s/outbox' % expected_id)
+        self.assertEqual(self.user.username, "mouse@%s" % DOMAIN)
+        self.assertEqual(self.user.localname, "mouse")
+        self.assertEqual(self.user.shared_inbox, "https://%s/inbox" % DOMAIN)
+        self.assertEqual(self.user.inbox, "%s/inbox" % expected_id)
+        self.assertEqual(self.user.outbox, "%s/outbox" % expected_id)
         self.assertIsNotNone(self.user.key_pair.private_key)
         self.assertIsNotNone(self.user.key_pair.public_key)
 
     def test_remote_user(self):
-        with patch('bookwyrm.models.user.set_remote_server.delay'):
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
             user = models.User.objects.create_user(
-                'rat', 'rat@rat.rat', 'ratword', local=False,
-                remote_id='https://example.com/dfjkg', bookwyrm_user=False)
-        self.assertEqual(user.username, 'rat@example.com')
-
+                "rat",
+                "rat@rat.rat",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/dfjkg",
+                bookwyrm_user=False,
+            )
+        self.assertEqual(user.username, "rat@example.com")
 
     def test_user_shelves(self):
         shelves = models.Shelf.objects.filter(user=self.user).all()
         self.assertEqual(len(shelves), 3)
         names = [s.name for s in shelves]
-        self.assertTrue('To Read' in names)
-        self.assertTrue('Currently Reading' in names)
-        self.assertTrue('Read' in names)
+        self.assertTrue("To Read" in names)
+        self.assertTrue("Currently Reading" in names)
+        self.assertTrue("Read" in names)
         ids = [s.identifier for s in shelves]
-        self.assertTrue('to-read' in ids)
-        self.assertTrue('reading' in ids)
-        self.assertTrue('read' in ids)
-
+        self.assertTrue("to-read" in ids)
+        self.assertTrue("reading" in ids)
+        self.assertTrue("read" in ids)
 
     def test_activitypub_serialize(self):
         activity = self.user.to_activity()
-        self.assertEqual(activity['id'], self.user.remote_id)
-        self.assertEqual(activity['@context'], [
-            'https://www.w3.org/ns/activitystreams',
-            'https://w3id.org/security/v1',
-            {
-                'manuallyApprovesFollowers': 'as:manuallyApprovesFollowers',
-                'schema': 'http://schema.org#',
-                'PropertyValue': 'schema:PropertyValue',
-                'value': 'schema:value',
-            }
-        ])
-        self.assertEqual(activity['preferredUsername'], self.user.localname)
-        self.assertEqual(activity['name'], self.user.name)
-        self.assertEqual(activity['inbox'], self.user.inbox)
-        self.assertEqual(activity['outbox'], self.user.outbox)
-        self.assertEqual(activity['bookwyrmUser'], False)
-        self.assertEqual(activity['discoverable'], True)
-        self.assertEqual(activity['type'], 'Person')
+        self.assertEqual(activity["id"], self.user.remote_id)
+        self.assertEqual(
+            activity["@context"],
+            [
+                "https://www.w3.org/ns/activitystreams",
+                "https://w3id.org/security/v1",
+                {
+                    "manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
+                    "schema": "http://schema.org#",
+                    "PropertyValue": "schema:PropertyValue",
+                    "value": "schema:value",
+                },
+            ],
+        )
+        self.assertEqual(activity["preferredUsername"], self.user.localname)
+        self.assertEqual(activity["name"], self.user.name)
+        self.assertEqual(activity["inbox"], self.user.inbox)
+        self.assertEqual(activity["outbox"], self.user.outbox)
+        self.assertEqual(activity["bookwyrmUser"], False)
+        self.assertEqual(activity["discoverable"], True)
+        self.assertEqual(activity["type"], "Person")
 
     def test_activitypub_outbox(self):
         activity = self.user.to_outbox()
-        self.assertEqual(activity['type'], 'OrderedCollection')
-        self.assertEqual(activity['id'], self.user.outbox)
-        self.assertEqual(activity['totalItems'], 0)
-
+        self.assertEqual(activity["type"], "OrderedCollection")
+        self.assertEqual(activity["id"], self.user.outbox)
+        self.assertEqual(activity["totalItems"], 0)
 
     def test_set_remote_server(self):
         server = models.FederatedServer.objects.create(
-            server_name=DOMAIN,
-            application_type='test type',
-            application_version=3
+            server_name=DOMAIN, application_type="test type", application_version=3
         )
 
         models.user.set_remote_server(self.user.id)
@@ -91,26 +100,24 @@ class User(TestCase):
     def test_get_or_create_remote_server(self):
         responses.add(
             responses.GET,
-            'https://%s/.well-known/nodeinfo' % DOMAIN,
-            json={'links': [{'href': 'http://www.example.com'}, {}]}
+            "https://%s/.well-known/nodeinfo" % DOMAIN,
+            json={"links": [{"href": "http://www.example.com"}, {}]},
         )
         responses.add(
             responses.GET,
-            'http://www.example.com',
-            json={'software': {'name': 'hi', 'version': '2'}},
+            "http://www.example.com",
+            json={"software": {"name": "hi", "version": "2"}},
         )
 
         server = models.user.get_or_create_remote_server(DOMAIN)
         self.assertEqual(server.server_name, DOMAIN)
-        self.assertEqual(server.application_type, 'hi')
-        self.assertEqual(server.application_version, '2')
+        self.assertEqual(server.application_type, "hi")
+        self.assertEqual(server.application_version, "2")
 
     @responses.activate
     def test_get_or_create_remote_server_no_wellknown(self):
         responses.add(
-            responses.GET,
-            'https://%s/.well-known/nodeinfo' % DOMAIN,
-            status=404
+            responses.GET, "https://%s/.well-known/nodeinfo" % DOMAIN, status=404
         )
 
         server = models.user.get_or_create_remote_server(DOMAIN)
@@ -122,14 +129,10 @@ class User(TestCase):
     def test_get_or_create_remote_server_no_links(self):
         responses.add(
             responses.GET,
-            'https://%s/.well-known/nodeinfo' % DOMAIN,
-            json={'links': [{'href': 'http://www.example.com'}, {}]}
-        )
-        responses.add(
-            responses.GET,
-            'http://www.example.com',
-            status=404
+            "https://%s/.well-known/nodeinfo" % DOMAIN,
+            json={"links": [{"href": "http://www.example.com"}, {}]},
         )
+        responses.add(responses.GET, "http://www.example.com", status=404)
 
         server = models.user.get_or_create_remote_server(DOMAIN)
         self.assertEqual(server.server_name, DOMAIN)
@@ -140,14 +143,10 @@ class User(TestCase):
     def test_get_or_create_remote_server_unknown_format(self):
         responses.add(
             responses.GET,
-            'https://%s/.well-known/nodeinfo' % DOMAIN,
-            json={'links': [{'href': 'http://www.example.com'}, {}]}
-        )
-        responses.add(
-            responses.GET,
-            'http://www.example.com',
-            json={'fish': 'salmon'}
+            "https://%s/.well-known/nodeinfo" % DOMAIN,
+            json={"links": [{"href": "http://www.example.com"}, {}]},
         )
+        responses.add(responses.GET, "http://www.example.com", json={"fish": "salmon"})
 
         server = models.user.get_or_create_remote_server(DOMAIN)
         self.assertEqual(server.server_name, DOMAIN)
diff --git a/bookwyrm/tests/test_goodreads_import.py b/bookwyrm/tests/test_goodreads_import.py
index aee9afe4..080ccd15 100644
--- a/bookwyrm/tests/test_goodreads_import.py
+++ b/bookwyrm/tests/test_goodreads_import.py
@@ -1,4 +1,4 @@
-''' testing import '''
+""" testing import """
 from collections import namedtuple
 import csv
 import pathlib
@@ -12,125 +12,117 @@ from bookwyrm.goodreads_import import GoodreadsImporter
 from bookwyrm import importer
 from bookwyrm.settings import DOMAIN
 
+
 class GoodreadsImport(TestCase):
-    ''' importing from goodreads csv '''
+    """ importing from goodreads csv """
+
     def setUp(self):
         self.importer = GoodreadsImporter()
-        ''' use a test csv '''
-        datafile = pathlib.Path(__file__).parent.joinpath(
-            'data/goodreads.csv')
-        self.csv = open(datafile, 'r', encoding=self.importer.encoding)
+        """ use a test csv """
+        datafile = pathlib.Path(__file__).parent.joinpath("data/goodreads.csv")
+        self.csv = open(datafile, "r", encoding=self.importer.encoding)
         self.user = models.User.objects.create_user(
-            'mouse', 'mouse@mouse.mouse', 'password', local=True)
+            "mouse", "mouse@mouse.mouse", "password", local=True
+        )
 
         models.Connector.objects.create(
             identifier=DOMAIN,
-            name='Local',
+            name="Local",
             local=True,
-            connector_file='self_connector',
-            base_url='https://%s' % DOMAIN,
-            books_url='https://%s/book' % DOMAIN,
-            covers_url='https://%s/images/covers' % DOMAIN,
-            search_url='https://%s/search?q=' % DOMAIN,
+            connector_file="self_connector",
+            base_url="https://%s" % DOMAIN,
+            books_url="https://%s/book" % DOMAIN,
+            covers_url="https://%s/images/covers" % DOMAIN,
+            search_url="https://%s/search?q=" % DOMAIN,
             priority=1,
         )
-        work = models.Work.objects.create(title='Test Work')
+        work = models.Work.objects.create(title="Test Work")
         self.book = models.Edition.objects.create(
-            title='Example Edition',
-            remote_id='https://example.com/book/1',
-            parent_work=work
+            title="Example Edition",
+            remote_id="https://example.com/book/1",
+            parent_work=work,
         )
 
-
     def test_create_job(self):
-        ''' creates the import job entry and checks csv '''
-        import_job = self.importer.create_job(
-            self.user, self.csv, False, 'public')
+        """ creates the import job entry and checks csv """
+        import_job = self.importer.create_job(self.user, self.csv, False, "public")
         self.assertEqual(import_job.user, self.user)
         self.assertEqual(import_job.include_reviews, False)
-        self.assertEqual(import_job.privacy, 'public')
+        self.assertEqual(import_job.privacy, "public")
 
         import_items = models.ImportItem.objects.filter(job=import_job).all()
         self.assertEqual(len(import_items), 3)
         self.assertEqual(import_items[0].index, 0)
-        self.assertEqual(import_items[0].data['Book Id'], '42036538')
+        self.assertEqual(import_items[0].data["Book Id"], "42036538")
         self.assertEqual(import_items[1].index, 1)
-        self.assertEqual(import_items[1].data['Book Id'], '52691223')
+        self.assertEqual(import_items[1].data["Book Id"], "52691223")
         self.assertEqual(import_items[2].index, 2)
-        self.assertEqual(import_items[2].data['Book Id'], '28694510')
-
+        self.assertEqual(import_items[2].data["Book Id"], "28694510")
 
     def test_create_retry_job(self):
-        ''' trying again with items that didn't import '''
-        import_job = self.importer.create_job(
-            self.user, self.csv, False, 'unlisted')
-        import_items = models.ImportItem.objects.filter(
-            job=import_job
-            ).all()[:2]
+        """ trying again with items that didn't import """
+        import_job = self.importer.create_job(self.user, self.csv, False, "unlisted")
+        import_items = models.ImportItem.objects.filter(job=import_job).all()[:2]
 
-        retry = self.importer.create_retry_job(
-            self.user, import_job, import_items)
+        retry = self.importer.create_retry_job(self.user, import_job, import_items)
         self.assertNotEqual(import_job, retry)
         self.assertEqual(retry.user, self.user)
         self.assertEqual(retry.include_reviews, False)
-        self.assertEqual(retry.privacy, 'unlisted')
+        self.assertEqual(retry.privacy, "unlisted")
 
         retry_items = models.ImportItem.objects.filter(job=retry).all()
         self.assertEqual(len(retry_items), 2)
         self.assertEqual(retry_items[0].index, 0)
-        self.assertEqual(retry_items[0].data['Book Id'], '42036538')
+        self.assertEqual(retry_items[0].data["Book Id"], "42036538")
         self.assertEqual(retry_items[1].index, 1)
-        self.assertEqual(retry_items[1].data['Book Id'], '52691223')
-
+        self.assertEqual(retry_items[1].data["Book Id"], "52691223")
 
     def test_start_import(self):
-        ''' begin loading books '''
-        import_job = self.importer.create_job(
-            self.user, self.csv, False, 'unlisted')
-        MockTask = namedtuple('Task', ('id'))
+        """ begin loading books """
+        import_job = self.importer.create_job(self.user, self.csv, False, "unlisted")
+        MockTask = namedtuple("Task", ("id"))
         mock_task = MockTask(7)
-        with patch('bookwyrm.importer.import_data.delay') as start:
+        with patch("bookwyrm.importer.import_data.delay") as start:
             start.return_value = mock_task
             self.importer.start_import(import_job)
         import_job.refresh_from_db()
-        self.assertEqual(import_job.task_id, '7')
-
+        self.assertEqual(import_job.task_id, "7")
 
     @responses.activate
     def test_import_data(self):
-        ''' resolve entry '''
-        import_job = self.importer.create_job(
-            self.user, self.csv, False, 'unlisted')
-        book = models.Edition.objects.create(title='Test Book')
+        """ resolve entry """
+        import_job = self.importer.create_job(self.user, self.csv, False, "unlisted")
+        book = models.Edition.objects.create(title="Test Book")
 
         with patch(
-                'bookwyrm.models.import_job.ImportItem.get_book_from_isbn'
-                ) as resolve:
+            "bookwyrm.models.import_job.ImportItem.get_book_from_isbn"
+        ) as resolve:
             resolve.return_value = book
-            with patch('bookwyrm.importer.handle_imported_book'):
+            with patch("bookwyrm.importer.handle_imported_book"):
                 importer.import_data(self.importer.service, import_job.id)
 
         import_item = models.ImportItem.objects.get(job=import_job, index=0)
         self.assertEqual(import_item.book.id, book.id)
 
-
     def test_handle_imported_book(self):
-        ''' goodreads import added a book, this adds related connections '''
-        shelf = self.user.shelf_set.filter(identifier='read').first()
+        """ goodreads import added a book, this adds related connections """
+        shelf = self.user.shelf_set.filter(identifier="read").first()
         self.assertIsNone(shelf.books.first())
 
         import_job = models.ImportJob.objects.create(user=self.user)
-        datafile = pathlib.Path(__file__).parent.joinpath('data/goodreads.csv')
-        csv_file = open(datafile, 'r')
+        datafile = pathlib.Path(__file__).parent.joinpath("data/goodreads.csv")
+        csv_file = open(datafile, "r")
         for index, entry in enumerate(list(csv.DictReader(csv_file))):
             entry = self.importer.parse_fields(entry)
             import_item = models.ImportItem.objects.create(
-                job_id=import_job.id, index=index, data=entry, book=self.book)
+                job_id=import_job.id, index=index, data=entry, book=self.book
+            )
             break
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             importer.handle_imported_book(
-                self.importer.service, self.user, import_item, False, 'public')
+                self.importer.service, self.user, import_item, False, "public"
+            )
 
         shelf.refresh_from_db()
         self.assertEqual(shelf.books.first(), self.book)
@@ -145,31 +137,30 @@ class GoodreadsImport(TestCase):
         self.assertEqual(readthrough.finish_date.month, 10)
         self.assertEqual(readthrough.finish_date.day, 25)
 
-
     def test_handle_imported_book_already_shelved(self):
-        ''' goodreads import added a book, this adds related connections '''
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            shelf = self.user.shelf_set.filter(identifier='to-read').first()
-            models.ShelfBook.objects.create(
-                shelf=shelf, user=self.user, book=self.book)
+        """ goodreads import added a book, this adds related connections """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            shelf = self.user.shelf_set.filter(identifier="to-read").first()
+            models.ShelfBook.objects.create(shelf=shelf, user=self.user, book=self.book)
 
         import_job = models.ImportJob.objects.create(user=self.user)
-        datafile = pathlib.Path(__file__).parent.joinpath('data/goodreads.csv')
-        csv_file = open(datafile, 'r')
+        datafile = pathlib.Path(__file__).parent.joinpath("data/goodreads.csv")
+        csv_file = open(datafile, "r")
         for index, entry in enumerate(list(csv.DictReader(csv_file))):
             entry = self.importer.parse_fields(entry)
             import_item = models.ImportItem.objects.create(
-                job_id=import_job.id, index=index, data=entry, book=self.book)
+                job_id=import_job.id, index=index, data=entry, book=self.book
+            )
             break
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             importer.handle_imported_book(
-                self.importer.service, self.user, import_item, False, 'public')
+                self.importer.service, self.user, import_item, False, "public"
+            )
 
         shelf.refresh_from_db()
         self.assertEqual(shelf.books.first(), self.book)
-        self.assertIsNone(
-            self.user.shelf_set.get(identifier='read').books.first())
+        self.assertIsNone(self.user.shelf_set.get(identifier="read").books.first())
         readthrough = models.ReadThrough.objects.get(user=self.user)
         self.assertEqual(readthrough.book, self.book)
         self.assertEqual(readthrough.start_date.year, 2020)
@@ -179,24 +170,26 @@ class GoodreadsImport(TestCase):
         self.assertEqual(readthrough.finish_date.month, 10)
         self.assertEqual(readthrough.finish_date.day, 25)
 
-
     def test_handle_import_twice(self):
-        ''' re-importing books '''
-        shelf = self.user.shelf_set.filter(identifier='read').first()
+        """ re-importing books """
+        shelf = self.user.shelf_set.filter(identifier="read").first()
         import_job = models.ImportJob.objects.create(user=self.user)
-        datafile = pathlib.Path(__file__).parent.joinpath('data/goodreads.csv')
-        csv_file = open(datafile, 'r')
+        datafile = pathlib.Path(__file__).parent.joinpath("data/goodreads.csv")
+        csv_file = open(datafile, "r")
         for index, entry in enumerate(list(csv.DictReader(csv_file))):
             entry = self.importer.parse_fields(entry)
             import_item = models.ImportItem.objects.create(
-                job_id=import_job.id, index=index, data=entry, book=self.book)
+                job_id=import_job.id, index=index, data=entry, book=self.book
+            )
             break
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             importer.handle_imported_book(
-                self.importer.service, self.user, import_item, False, 'public')
+                self.importer.service, self.user, import_item, False, "public"
+            )
             importer.handle_imported_book(
-                self.importer.service, self.user, import_item, False, 'public')
+                self.importer.service, self.user, import_item, False, "public"
+            )
 
         shelf.refresh_from_db()
         self.assertEqual(shelf.books.first(), self.book)
@@ -211,42 +204,44 @@ class GoodreadsImport(TestCase):
         self.assertEqual(readthrough.finish_date.month, 10)
         self.assertEqual(readthrough.finish_date.day, 25)
 
-
     def test_handle_imported_book_review(self):
-        ''' goodreads review import '''
+        """ goodreads review import """
         import_job = models.ImportJob.objects.create(user=self.user)
-        datafile = pathlib.Path(__file__).parent.joinpath('data/goodreads.csv')
-        csv_file = open(datafile, 'r')
+        datafile = pathlib.Path(__file__).parent.joinpath("data/goodreads.csv")
+        csv_file = open(datafile, "r")
         entry = list(csv.DictReader(csv_file))[2]
         entry = self.importer.parse_fields(entry)
         import_item = models.ImportItem.objects.create(
-            job_id=import_job.id, index=0, data=entry, book=self.book)
+            job_id=import_job.id, index=0, data=entry, book=self.book
+        )
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             importer.handle_imported_book(
-                self.importer.service, self.user, import_item, True, 'unlisted')
+                self.importer.service, self.user, import_item, True, "unlisted"
+            )
         review = models.Review.objects.get(book=self.book, user=self.user)
-        self.assertEqual(review.content, 'mixed feelings')
+        self.assertEqual(review.content, "mixed feelings")
         self.assertEqual(review.rating, 2)
         self.assertEqual(review.published_date.year, 2019)
         self.assertEqual(review.published_date.month, 7)
         self.assertEqual(review.published_date.day, 8)
-        self.assertEqual(review.privacy, 'unlisted')
-
+        self.assertEqual(review.privacy, "unlisted")
 
     def test_handle_imported_book_reviews_disabled(self):
-        ''' goodreads review import '''
+        """ goodreads review import """
         import_job = models.ImportJob.objects.create(user=self.user)
-        datafile = pathlib.Path(__file__).parent.joinpath('data/goodreads.csv')
-        csv_file = open(datafile, 'r')
+        datafile = pathlib.Path(__file__).parent.joinpath("data/goodreads.csv")
+        csv_file = open(datafile, "r")
         entry = list(csv.DictReader(csv_file))[2]
         entry = self.importer.parse_fields(entry)
         import_item = models.ImportItem.objects.create(
-            job_id=import_job.id, index=0, data=entry, book=self.book)
+            job_id=import_job.id, index=0, data=entry, book=self.book
+        )
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             importer.handle_imported_book(
-                self.importer.service, self.user, import_item, False, 'unlisted')
-        self.assertFalse(models.Review.objects.filter(
-            book=self.book, user=self.user
-        ).exists())
+                self.importer.service, self.user, import_item, False, "unlisted"
+            )
+        self.assertFalse(
+            models.Review.objects.filter(book=self.book, user=self.user).exists()
+        )
diff --git a/bookwyrm/tests/test_librarything_import.py b/bookwyrm/tests/test_librarything_import.py
index 2623a504..a8e4cfe4 100644
--- a/bookwyrm/tests/test_librarything_import.py
+++ b/bookwyrm/tests/test_librarything_import.py
@@ -1,4 +1,4 @@
-''' testing import '''
+""" testing import """
 from collections import namedtuple
 import csv
 import pathlib
@@ -11,114 +11,110 @@ from bookwyrm import models, importer
 from bookwyrm.librarything_import import LibrarythingImporter
 from bookwyrm.settings import DOMAIN
 
+
 class LibrarythingImport(TestCase):
-    ''' importing from librarything tsv '''
+    """ importing from librarything tsv """
+
     def setUp(self):
         self.importer = LibrarythingImporter()
-        ''' use a test tsv '''
-        datafile = pathlib.Path(__file__).parent.joinpath(
-            'data/librarything.tsv')
+        """ use a test tsv """
+        datafile = pathlib.Path(__file__).parent.joinpath("data/librarything.tsv")
 
         # Librarything generates latin encoded exports...
-        self.csv = open(datafile, 'r', encoding=self.importer.encoding)
+        self.csv = open(datafile, "r", encoding=self.importer.encoding)
         self.user = models.User.objects.create_user(
-            'mmai', 'mmai@mmai.mmai', 'password', local=True)
+            "mmai", "mmai@mmai.mmai", "password", local=True
+        )
 
         models.Connector.objects.create(
             identifier=DOMAIN,
-            name='Local',
+            name="Local",
             local=True,
-            connector_file='self_connector',
-            base_url='https://%s' % DOMAIN,
-            books_url='https://%s/book' % DOMAIN,
-            covers_url='https://%s/images/covers' % DOMAIN,
-            search_url='https://%s/search?q=' % DOMAIN,
+            connector_file="self_connector",
+            base_url="https://%s" % DOMAIN,
+            books_url="https://%s/book" % DOMAIN,
+            covers_url="https://%s/images/covers" % DOMAIN,
+            search_url="https://%s/search?q=" % DOMAIN,
             priority=1,
         )
-        work = models.Work.objects.create(title='Test Work')
+        work = models.Work.objects.create(title="Test Work")
         self.book = models.Edition.objects.create(
-            title='Example Edition',
-            remote_id='https://example.com/book/1',
-            parent_work=work
+            title="Example Edition",
+            remote_id="https://example.com/book/1",
+            parent_work=work,
         )
 
-
     def test_create_job(self):
-        ''' creates the import job entry and checks csv '''
-        import_job = self.importer.create_job(
-            self.user, self.csv, False, 'public')
+        """ creates the import job entry and checks csv """
+        import_job = self.importer.create_job(self.user, self.csv, False, "public")
         self.assertEqual(import_job.user, self.user)
         self.assertEqual(import_job.include_reviews, False)
-        self.assertEqual(import_job.privacy, 'public')
+        self.assertEqual(import_job.privacy, "public")
 
         import_items = models.ImportItem.objects.filter(job=import_job).all()
         self.assertEqual(len(import_items), 3)
         self.assertEqual(import_items[0].index, 0)
-        self.assertEqual(import_items[0].data['Book Id'], '5498194')
+        self.assertEqual(import_items[0].data["Book Id"], "5498194")
         self.assertEqual(import_items[1].index, 1)
-        self.assertEqual(import_items[1].data['Book Id'], '5015319')
+        self.assertEqual(import_items[1].data["Book Id"], "5015319")
         self.assertEqual(import_items[2].index, 2)
-        self.assertEqual(import_items[2].data['Book Id'], '5015399')
-
+        self.assertEqual(import_items[2].data["Book Id"], "5015399")
 
     def test_create_retry_job(self):
-        ''' trying again with items that didn't import '''
-        import_job = self.importer.create_job(
-            self.user, self.csv, False, 'unlisted')
-        import_items = models.ImportItem.objects.filter(
-            job=import_job
-            ).all()[:2]
+        """ trying again with items that didn't import """
+        import_job = self.importer.create_job(self.user, self.csv, False, "unlisted")
+        import_items = models.ImportItem.objects.filter(job=import_job).all()[:2]
 
-        retry = self.importer.create_retry_job(
-            self.user, import_job, import_items)
+        retry = self.importer.create_retry_job(self.user, import_job, import_items)
         self.assertNotEqual(import_job, retry)
         self.assertEqual(retry.user, self.user)
         self.assertEqual(retry.include_reviews, False)
-        self.assertEqual(retry.privacy, 'unlisted')
+        self.assertEqual(retry.privacy, "unlisted")
 
         retry_items = models.ImportItem.objects.filter(job=retry).all()
         self.assertEqual(len(retry_items), 2)
         self.assertEqual(retry_items[0].index, 0)
-        self.assertEqual(import_items[0].data['Book Id'], '5498194')
+        self.assertEqual(import_items[0].data["Book Id"], "5498194")
         self.assertEqual(retry_items[1].index, 1)
-        self.assertEqual(retry_items[1].data['Book Id'], '5015319')
-
+        self.assertEqual(retry_items[1].data["Book Id"], "5015319")
 
     @responses.activate
     def test_import_data(self):
-        ''' resolve entry '''
-        import_job = self.importer.create_job(
-            self.user, self.csv, False, 'unlisted')
-        book = models.Edition.objects.create(title='Test Book')
+        """ resolve entry """
+        import_job = self.importer.create_job(self.user, self.csv, False, "unlisted")
+        book = models.Edition.objects.create(title="Test Book")
 
         with patch(
-                'bookwyrm.models.import_job.ImportItem.get_book_from_isbn'
-                ) as resolve:
+            "bookwyrm.models.import_job.ImportItem.get_book_from_isbn"
+        ) as resolve:
             resolve.return_value = book
-            with patch('bookwyrm.importer.handle_imported_book'):
+            with patch("bookwyrm.importer.handle_imported_book"):
                 importer.import_data(self.importer.service, import_job.id)
 
         import_item = models.ImportItem.objects.get(job=import_job, index=0)
         self.assertEqual(import_item.book.id, book.id)
 
-
     def test_handle_imported_book(self):
-        ''' librarything import added a book, this adds related connections '''
-        shelf = self.user.shelf_set.filter(identifier='read').first()
+        """ librarything import added a book, this adds related connections """
+        shelf = self.user.shelf_set.filter(identifier="read").first()
         self.assertIsNone(shelf.books.first())
 
         import_job = models.ImportJob.objects.create(user=self.user)
-        datafile = pathlib.Path(__file__).parent.joinpath('data/librarything.tsv')
-        csv_file = open(datafile, 'r', encoding=self.importer.encoding)
-        for index, entry in enumerate(list(csv.DictReader(csv_file, delimiter=self.importer.delimiter))):
+        datafile = pathlib.Path(__file__).parent.joinpath("data/librarything.tsv")
+        csv_file = open(datafile, "r", encoding=self.importer.encoding)
+        for index, entry in enumerate(
+            list(csv.DictReader(csv_file, delimiter=self.importer.delimiter))
+        ):
             entry = self.importer.parse_fields(entry)
             import_item = models.ImportItem.objects.create(
-                job_id=import_job.id, index=index, data=entry, book=self.book)
+                job_id=import_job.id, index=index, data=entry, book=self.book
+            )
             break
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             importer.handle_imported_book(
-                self.importer.service, self.user, import_item, False, 'public')
+                self.importer.service, self.user, import_item, False, "public"
+            )
 
         shelf.refresh_from_db()
         self.assertEqual(shelf.books.first(), self.book)
@@ -133,31 +129,32 @@ class LibrarythingImport(TestCase):
         self.assertEqual(readthrough.finish_date.month, 5)
         self.assertEqual(readthrough.finish_date.day, 8)
 
-
     def test_handle_imported_book_already_shelved(self):
-        ''' librarything import added a book, this adds related connections '''
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            shelf = self.user.shelf_set.filter(identifier='to-read').first()
-            models.ShelfBook.objects.create(
-                shelf=shelf, user=self.user, book=self.book)
+        """ librarything import added a book, this adds related connections """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            shelf = self.user.shelf_set.filter(identifier="to-read").first()
+            models.ShelfBook.objects.create(shelf=shelf, user=self.user, book=self.book)
 
         import_job = models.ImportJob.objects.create(user=self.user)
-        datafile = pathlib.Path(__file__).parent.joinpath('data/librarything.tsv')
-        csv_file = open(datafile, 'r', encoding=self.importer.encoding)
-        for index, entry in enumerate(list(csv.DictReader(csv_file, delimiter=self.importer.delimiter))):
+        datafile = pathlib.Path(__file__).parent.joinpath("data/librarything.tsv")
+        csv_file = open(datafile, "r", encoding=self.importer.encoding)
+        for index, entry in enumerate(
+            list(csv.DictReader(csv_file, delimiter=self.importer.delimiter))
+        ):
             entry = self.importer.parse_fields(entry)
             import_item = models.ImportItem.objects.create(
-                job_id=import_job.id, index=index, data=entry, book=self.book)
+                job_id=import_job.id, index=index, data=entry, book=self.book
+            )
             break
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             importer.handle_imported_book(
-                self.importer.service, self.user, import_item, False, 'public')
+                self.importer.service, self.user, import_item, False, "public"
+            )
 
         shelf.refresh_from_db()
         self.assertEqual(shelf.books.first(), self.book)
-        self.assertIsNone(
-            self.user.shelf_set.get(identifier='read').books.first())
+        self.assertIsNone(self.user.shelf_set.get(identifier="read").books.first())
         readthrough = models.ReadThrough.objects.get(user=self.user)
         self.assertEqual(readthrough.book, self.book)
         self.assertEqual(readthrough.start_date.year, 2007)
@@ -167,24 +164,28 @@ class LibrarythingImport(TestCase):
         self.assertEqual(readthrough.finish_date.month, 5)
         self.assertEqual(readthrough.finish_date.day, 8)
 
-
     def test_handle_import_twice(self):
-        ''' re-importing books '''
-        shelf = self.user.shelf_set.filter(identifier='read').first()
+        """ re-importing books """
+        shelf = self.user.shelf_set.filter(identifier="read").first()
         import_job = models.ImportJob.objects.create(user=self.user)
-        datafile = pathlib.Path(__file__).parent.joinpath('data/librarything.tsv')
-        csv_file = open(datafile, 'r', encoding=self.importer.encoding)
-        for index, entry in enumerate(list(csv.DictReader(csv_file, delimiter=self.importer.delimiter))):
+        datafile = pathlib.Path(__file__).parent.joinpath("data/librarything.tsv")
+        csv_file = open(datafile, "r", encoding=self.importer.encoding)
+        for index, entry in enumerate(
+            list(csv.DictReader(csv_file, delimiter=self.importer.delimiter))
+        ):
             entry = self.importer.parse_fields(entry)
             import_item = models.ImportItem.objects.create(
-                job_id=import_job.id, index=index, data=entry, book=self.book)
+                job_id=import_job.id, index=index, data=entry, book=self.book
+            )
             break
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             importer.handle_imported_book(
-                self.importer.service, self.user, import_item, False, 'public')
+                self.importer.service, self.user, import_item, False, "public"
+            )
             importer.handle_imported_book(
-                self.importer.service, self.user, import_item, False, 'public')
+                self.importer.service, self.user, import_item, False, "public"
+            )
 
         shelf.refresh_from_db()
         self.assertEqual(shelf.books.first(), self.book)
@@ -199,42 +200,44 @@ class LibrarythingImport(TestCase):
         self.assertEqual(readthrough.finish_date.month, 5)
         self.assertEqual(readthrough.finish_date.day, 8)
 
-
     def test_handle_imported_book_review(self):
-        ''' librarything review import '''
+        """ librarything review import """
         import_job = models.ImportJob.objects.create(user=self.user)
-        datafile = pathlib.Path(__file__).parent.joinpath('data/librarything.tsv')
-        csv_file = open(datafile, 'r', encoding=self.importer.encoding)
+        datafile = pathlib.Path(__file__).parent.joinpath("data/librarything.tsv")
+        csv_file = open(datafile, "r", encoding=self.importer.encoding)
         entry = list(csv.DictReader(csv_file, delimiter=self.importer.delimiter))[0]
         entry = self.importer.parse_fields(entry)
         import_item = models.ImportItem.objects.create(
-            job_id=import_job.id, index=0, data=entry, book=self.book)
+            job_id=import_job.id, index=0, data=entry, book=self.book
+        )
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             importer.handle_imported_book(
-                self.importer.service, self.user, import_item, True, 'unlisted')
+                self.importer.service, self.user, import_item, True, "unlisted"
+            )
         review = models.Review.objects.get(book=self.book, user=self.user)
-        self.assertEqual(review.content, 'chef d\'oeuvre')
+        self.assertEqual(review.content, "chef d'oeuvre")
         self.assertEqual(review.rating, 5)
         self.assertEqual(review.published_date.year, 2007)
         self.assertEqual(review.published_date.month, 5)
         self.assertEqual(review.published_date.day, 8)
-        self.assertEqual(review.privacy, 'unlisted')
-
+        self.assertEqual(review.privacy, "unlisted")
 
     def test_handle_imported_book_reviews_disabled(self):
-        ''' librarything review import '''
+        """ librarything review import """
         import_job = models.ImportJob.objects.create(user=self.user)
-        datafile = pathlib.Path(__file__).parent.joinpath('data/librarything.tsv')
-        csv_file = open(datafile, 'r', encoding=self.importer.encoding)
+        datafile = pathlib.Path(__file__).parent.joinpath("data/librarything.tsv")
+        csv_file = open(datafile, "r", encoding=self.importer.encoding)
         entry = list(csv.DictReader(csv_file, delimiter=self.importer.delimiter))[2]
         entry = self.importer.parse_fields(entry)
         import_item = models.ImportItem.objects.create(
-            job_id=import_job.id, index=0, data=entry, book=self.book)
+            job_id=import_job.id, index=0, data=entry, book=self.book
+        )
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             importer.handle_imported_book(
-                self.importer.service, self.user, import_item, False, 'unlisted')
-        self.assertFalse(models.Review.objects.filter(
-            book=self.book, user=self.user
-        ).exists())
+                self.importer.service, self.user, import_item, False, "unlisted"
+            )
+        self.assertFalse(
+            models.Review.objects.filter(book=self.book, user=self.user).exists()
+        )
diff --git a/bookwyrm/tests/test_sanitize_html.py b/bookwyrm/tests/test_sanitize_html.py
index 58d94311..2b3d0378 100644
--- a/bookwyrm/tests/test_sanitize_html.py
+++ b/bookwyrm/tests/test_sanitize_html.py
@@ -1,28 +1,30 @@
-''' make sure only valid html gets to the app '''
+""" make sure only valid html gets to the app """
 from django.test import TestCase
 
 from bookwyrm.sanitize_html import InputHtmlParser
 
+
 class Sanitizer(TestCase):
-    ''' sanitizer tests '''
+    """ sanitizer tests """
+
     def test_no_html(self):
-        ''' just text '''
-        input_text = 'no      html  '
+        """ just text """
+        input_text = "no      html  "
         parser = InputHtmlParser()
         parser.feed(input_text)
         output = parser.get_output()
         self.assertEqual(input_text, output)
 
     def test_valid_html(self):
-        ''' leave the html untouched '''
-        input_text = '<b>yes    </b> <i>html</i>'
+        """ leave the html untouched """
+        input_text = "<b>yes    </b> <i>html</i>"
         parser = InputHtmlParser()
         parser.feed(input_text)
         output = parser.get_output()
         self.assertEqual(input_text, output)
 
     def test_valid_html_attrs(self):
-        ''' and don't remove attributes '''
+        """ and don't remove attributes """
         input_text = '<a href="fish.com">yes    </a> <i>html</i>'
         parser = InputHtmlParser()
         parser.feed(input_text)
@@ -30,23 +32,23 @@ class Sanitizer(TestCase):
         self.assertEqual(input_text, output)
 
     def test_invalid_html(self):
-        ''' remove all html when the html is malformed '''
-        input_text = '<b>yes  <i>html</i>'
+        """ remove all html when the html is malformed """
+        input_text = "<b>yes  <i>html</i>"
         parser = InputHtmlParser()
         parser.feed(input_text)
         output = parser.get_output()
-        self.assertEqual('yes  html', output)
+        self.assertEqual("yes  html", output)
 
-        input_text = 'yes <i></b>html   </i>'
+        input_text = "yes <i></b>html   </i>"
         parser = InputHtmlParser()
         parser.feed(input_text)
         output = parser.get_output()
-        self.assertEqual('yes html   ', output)
+        self.assertEqual("yes html   ", output)
 
     def test_disallowed_html(self):
-        ''' remove disallowed html but keep allowed html '''
-        input_text = '<div>  yes <i>html</i></div>'
+        """ remove disallowed html but keep allowed html """
+        input_text = "<div>  yes <i>html</i></div>"
         parser = InputHtmlParser()
         parser.feed(input_text)
         output = parser.get_output()
-        self.assertEqual('  yes <i>html</i>', output)
+        self.assertEqual("  yes <i>html</i>", output)
diff --git a/bookwyrm/tests/test_signing.py b/bookwyrm/tests/test_signing.py
index f6de11e1..d9cc411c 100644
--- a/bookwyrm/tests/test_signing.py
+++ b/bookwyrm/tests/test_signing.py
@@ -1,4 +1,4 @@
-''' getting and verifying signatures '''
+""" getting and verifying signatures """
 import time
 from collections import namedtuple
 from urllib.parse import urlsplit
@@ -18,141 +18,125 @@ from bookwyrm.activitypub import Follow
 from bookwyrm.settings import DOMAIN
 from bookwyrm.signatures import create_key_pair, make_signature, make_digest
 
+
 def get_follow_activity(follower, followee):
-    ''' generates a test activity '''
+    """ generates a test activity """
     return Follow(
-        id='https://test.com/user/follow/id',
+        id="https://test.com/user/follow/id",
         actor=follower.remote_id,
         object=followee.remote_id,
     ).serialize()
 
-KeyPair = namedtuple('KeyPair', ('private_key', 'public_key'))
-Sender = namedtuple('Sender', ('remote_id', 'key_pair'))
+
+KeyPair = namedtuple("KeyPair", ("private_key", "public_key"))
+Sender = namedtuple("Sender", ("remote_id", "key_pair"))
+
 
 class Signature(TestCase):
-    ''' signature test '''
+    """ signature test """
+
     def setUp(self):
-        ''' create users and test data '''
+        """ create users and test data """
         self.mouse = models.User.objects.create_user(
-            'mouse@%s' % DOMAIN, 'mouse@example.com', '',
-            local=True, localname='mouse')
+            "mouse@%s" % DOMAIN, "mouse@example.com", "", local=True, localname="mouse"
+        )
         self.rat = models.User.objects.create_user(
-            'rat@%s' % DOMAIN, 'rat@example.com', '',
-            local=True, localname='rat')
+            "rat@%s" % DOMAIN, "rat@example.com", "", local=True, localname="rat"
+        )
         self.cat = models.User.objects.create_user(
-            'cat@%s' % DOMAIN, 'cat@example.com', '',
-            local=True, localname='cat')
+            "cat@%s" % DOMAIN, "cat@example.com", "", local=True, localname="cat"
+        )
 
         private_key, public_key = create_key_pair()
 
         self.fake_remote = Sender(
-            'http://localhost/user/remote',
-            KeyPair(private_key, public_key)
+            "http://localhost/user/remote", KeyPair(private_key, public_key)
         )
 
         models.SiteSettings.objects.create()
 
     def send(self, signature, now, data, digest):
-        ''' test request '''
+        """ test request """
         c = Client()
         return c.post(
             urlsplit(self.rat.inbox).path,
             data=data,
-            content_type='application/json',
+            content_type="application/json",
             **{
-                'HTTP_DATE': now,
-                'HTTP_SIGNATURE': signature,
-                'HTTP_DIGEST': digest,
-                'HTTP_CONTENT_TYPE': 'application/activity+json; charset=utf-8',
-                'HTTP_HOST': DOMAIN,
+                "HTTP_DATE": now,
+                "HTTP_SIGNATURE": signature,
+                "HTTP_DIGEST": digest,
+                "HTTP_CONTENT_TYPE": "application/activity+json; charset=utf-8",
+                "HTTP_HOST": DOMAIN,
             }
         )
 
-    def send_test_request(#pylint: disable=too-many-arguments
-            self,
-            sender,
-            signer=None,
-            send_data=None,
-            digest=None,
-            date=None):
-        ''' sends a follow request to the "rat" user '''
+    def send_test_request(  # pylint: disable=too-many-arguments
+        self, sender, signer=None, send_data=None, digest=None, date=None
+    ):
+        """ sends a follow request to the "rat" user """
         now = date or http_date()
         data = json.dumps(get_follow_activity(sender, self.rat))
         digest = digest or make_digest(data)
-        signature = make_signature(
-            signer or sender, self.rat.inbox, now, digest)
-        with patch('bookwyrm.views.inbox.activity_task.delay'):
-            with patch('bookwyrm.models.user.set_remote_server.delay'):
+        signature = make_signature(signer or sender, self.rat.inbox, now, digest)
+        with patch("bookwyrm.views.inbox.activity_task.delay"):
+            with patch("bookwyrm.models.user.set_remote_server.delay"):
                 return self.send(signature, now, send_data or data, digest)
 
     def test_correct_signature(self):
-        ''' this one should just work '''
+        """ this one should just work """
         response = self.send_test_request(sender=self.mouse)
         self.assertEqual(response.status_code, 200)
 
     def test_wrong_signature(self):
-        ''' Messages must be signed by the right actor.
-            (cat cannot sign messages on behalf of mouse) '''
+        """Messages must be signed by the right actor.
+        (cat cannot sign messages on behalf of mouse)"""
         response = self.send_test_request(sender=self.mouse, signer=self.cat)
         self.assertEqual(response.status_code, 401)
 
     @responses.activate
     def test_remote_signer(self):
-        ''' signtures for remote users '''
-        datafile = pathlib.Path(__file__).parent.joinpath('data/ap_user.json')
+        """ signtures for remote users """
+        datafile = pathlib.Path(__file__).parent.joinpath("data/ap_user.json")
         data = json.loads(datafile.read_bytes())
-        data['id'] = self.fake_remote.remote_id
-        data['publicKey']['publicKeyPem'] = self.fake_remote.key_pair.public_key
-        del data['icon'] # Avoid having to return an avatar.
+        data["id"] = self.fake_remote.remote_id
+        data["publicKey"]["publicKeyPem"] = self.fake_remote.key_pair.public_key
+        del data["icon"]  # Avoid having to return an avatar.
+        responses.add(responses.GET, self.fake_remote.remote_id, json=data, status=200)
+        responses.add(
+            responses.GET, "https://localhost/.well-known/nodeinfo", status=404
+        )
         responses.add(
             responses.GET,
-            self.fake_remote.remote_id,
-            json=data,
-            status=200)
-        responses.add(
-            responses.GET,
-            'https://localhost/.well-known/nodeinfo',
-            status=404)
-        responses.add(
-            responses.GET,
-            'https://example.com/user/mouse/outbox?page=true',
-            json={'orderedItems': []},
-            status=200
+            "https://example.com/user/mouse/outbox?page=true",
+            json={"orderedItems": []},
+            status=200,
         )
 
-        with patch('bookwyrm.models.user.get_remote_reviews.delay'):
+        with patch("bookwyrm.models.user.get_remote_reviews.delay"):
             response = self.send_test_request(sender=self.fake_remote)
             self.assertEqual(response.status_code, 200)
 
     @responses.activate
     def test_key_needs_refresh(self):
-        ''' an out of date key should be updated and the new key work '''
-        datafile = pathlib.Path(__file__).parent.joinpath('data/ap_user.json')
+        """ an out of date key should be updated and the new key work """
+        datafile = pathlib.Path(__file__).parent.joinpath("data/ap_user.json")
         data = json.loads(datafile.read_bytes())
-        data['id'] = self.fake_remote.remote_id
-        data['publicKey']['publicKeyPem'] = self.fake_remote.key_pair.public_key
-        del data['icon'] # Avoid having to return an avatar.
+        data["id"] = self.fake_remote.remote_id
+        data["publicKey"]["publicKeyPem"] = self.fake_remote.key_pair.public_key
+        del data["icon"]  # Avoid having to return an avatar.
+        responses.add(responses.GET, self.fake_remote.remote_id, json=data, status=200)
         responses.add(
-            responses.GET,
-            self.fake_remote.remote_id,
-            json=data,
-            status=200)
-        responses.add(
-            responses.GET,
-            'https://localhost/.well-known/nodeinfo',
-            status=404)
+            responses.GET, "https://localhost/.well-known/nodeinfo", status=404
+        )
 
         # Second and subsequent fetches get a different key:
         key_pair = KeyPair(*create_key_pair())
         new_sender = Sender(self.fake_remote.remote_id, key_pair)
-        data['publicKey']['publicKeyPem'] = key_pair.public_key
-        responses.add(
-            responses.GET,
-            self.fake_remote.remote_id,
-            json=data,
-            status=200)
+        data["publicKey"]["publicKeyPem"] = key_pair.public_key
+        responses.add(responses.GET, self.fake_remote.remote_id, json=data, status=200)
 
-        with patch('bookwyrm.models.user.get_remote_reviews.delay'):
+        with patch("bookwyrm.models.user.get_remote_reviews.delay"):
             # Key correct:
             response = self.send_test_request(sender=self.fake_remote)
             self.assertEqual(response.status_code, 200)
@@ -169,43 +153,42 @@ class Signature(TestCase):
             response = self.send_test_request(sender=self.fake_remote)
             self.assertEqual(response.status_code, 401)
 
-
     @responses.activate
     def test_nonexistent_signer(self):
-        ''' fail when unable to look up signer '''
+        """ fail when unable to look up signer """
         responses.add(
             responses.GET,
             self.fake_remote.remote_id,
-            json={'error': 'not found'},
-            status=404)
+            json={"error": "not found"},
+            status=404,
+        )
 
         response = self.send_test_request(sender=self.fake_remote)
         self.assertEqual(response.status_code, 401)
 
     @pytest.mark.integration
     def test_changed_data(self):
-        '''Message data must match the digest header.'''
-        with patch('bookwyrm.activitypub.resolve_remote_id'):
+        """Message data must match the digest header."""
+        with patch("bookwyrm.activitypub.resolve_remote_id"):
             response = self.send_test_request(
-                self.mouse,
-                send_data=get_follow_activity(self.mouse, self.cat))
+                self.mouse, send_data=get_follow_activity(self.mouse, self.cat)
+            )
             self.assertEqual(response.status_code, 401)
 
     @pytest.mark.integration
     def test_invalid_digest(self):
-        ''' signature digest must be valid '''
-        with patch('bookwyrm.activitypub.resolve_remote_id'):
+        """ signature digest must be valid """
+        with patch("bookwyrm.activitypub.resolve_remote_id"):
             response = self.send_test_request(
-                self.mouse,
-                digest='SHA-256=AAAAAAAAAAAAAAAAAA')
+                self.mouse, digest="SHA-256=AAAAAAAAAAAAAAAAAA"
+            )
             self.assertEqual(response.status_code, 401)
 
     @pytest.mark.integration
     def test_old_message(self):
-        '''Old messages should be rejected to prevent replay attacks.'''
-        with patch('bookwyrm.activitypub.resolve_remote_id'):
+        """Old messages should be rejected to prevent replay attacks."""
+        with patch("bookwyrm.activitypub.resolve_remote_id"):
             response = self.send_test_request(
-                self.mouse,
-                date=http_date(time.time() - 301)
+                self.mouse, date=http_date(time.time() - 301)
             )
             self.assertEqual(response.status_code, 401)
diff --git a/bookwyrm/tests/test_templatetags.py b/bookwyrm/tests/test_templatetags.py
index 45c99344..6bdbd04c 100644
--- a/bookwyrm/tests/test_templatetags.py
+++ b/bookwyrm/tests/test_templatetags.py
@@ -1,4 +1,4 @@
-''' style fixes and lookups for templates '''
+""" style fixes and lookups for templates """
 import re
 from unittest.mock import patch
 
@@ -11,82 +11,85 @@ from bookwyrm.templatetags import bookwyrm_tags
 
 
 class TemplateTags(TestCase):
-    ''' lotta different things here '''
-    def setUp(self):
-        ''' create some filler objects '''
-        self.user = models.User.objects.create_user(
-            'mouse@example.com', 'mouse@mouse.mouse', 'mouseword',
-            local=True, localname='mouse')
-        with patch('bookwyrm.models.user.set_remote_server.delay'):
-            self.remote_user = models.User.objects.create_user(
-                'rat', 'rat@rat.rat', 'ratword',
-                remote_id='http://example.com/rat', local=False)
-        self.book = models.Edition.objects.create(title='Test Book')
+    """ lotta different things here """
 
+    def setUp(self):
+        """ create some filler objects """
+        self.user = models.User.objects.create_user(
+            "mouse@example.com",
+            "mouse@mouse.mouse",
+            "mouseword",
+            local=True,
+            localname="mouse",
+        )
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            self.remote_user = models.User.objects.create_user(
+                "rat",
+                "rat@rat.rat",
+                "ratword",
+                remote_id="http://example.com/rat",
+                local=False,
+            )
+        self.book = models.Edition.objects.create(title="Test Book")
 
     def test_dict_key(self):
-        ''' just getting a value out of a dict '''
-        test_dict = {'a': 1, 'b': 3}
-        self.assertEqual(
-            bookwyrm_tags.dict_key(test_dict, 'a'), 1)
-        self.assertEqual(
-            bookwyrm_tags.dict_key(test_dict, 'c'), 0)
-
+        """ just getting a value out of a dict """
+        test_dict = {"a": 1, "b": 3}
+        self.assertEqual(bookwyrm_tags.dict_key(test_dict, "a"), 1)
+        self.assertEqual(bookwyrm_tags.dict_key(test_dict, "c"), 0)
 
     def test_get_user_rating(self):
-        ''' get a user's most recent rating of a book '''
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            models.Review.objects.create(
-                user=self.user, book=self.book, rating=3)
-        self.assertEqual(
-            bookwyrm_tags.get_user_rating(self.book, self.user), 3)
-
+        """ get a user's most recent rating of a book """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            models.Review.objects.create(user=self.user, book=self.book, rating=3)
+        self.assertEqual(bookwyrm_tags.get_user_rating(self.book, self.user), 3)
 
     def test_get_user_rating_doesnt_exist(self):
-        ''' there is no rating available '''
-        self.assertEqual(
-            bookwyrm_tags.get_user_rating(self.book, self.user), 0)
-
+        """ there is no rating available """
+        self.assertEqual(bookwyrm_tags.get_user_rating(self.book, self.user), 0)
 
     def test_get_user_identifer_local(self):
-        ''' fall back to the simplest uid available '''
+        """ fall back to the simplest uid available """
         self.assertNotEqual(self.user.username, self.user.localname)
-        self.assertEqual(
-            bookwyrm_tags.get_user_identifier(self.user), 'mouse')
+        self.assertEqual(bookwyrm_tags.get_user_identifier(self.user), "mouse")
 
     def test_get_user_identifer_remote(self):
-        ''' for a remote user, should be their full username '''
+        """ for a remote user, should be their full username """
         self.assertEqual(
-            bookwyrm_tags.get_user_identifier(self.remote_user),
-            'rat@example.com')
+            bookwyrm_tags.get_user_identifier(self.remote_user), "rat@example.com"
+        )
 
     def test_get_notification_count(self):
-        ''' just countin' '''
+        """ just countin' """
         self.assertEqual(bookwyrm_tags.get_notification_count(self.user), 0)
 
-        models.Notification.objects.create(
-            user=self.user, notification_type='FAVORITE')
-        models.Notification.objects.create(
-            user=self.user, notification_type='MENTION')
+        models.Notification.objects.create(user=self.user, notification_type="FAVORITE")
+        models.Notification.objects.create(user=self.user, notification_type="MENTION")
 
         models.Notification.objects.create(
-            user=self.remote_user, notification_type='FOLLOW')
+            user=self.remote_user, notification_type="FOLLOW"
+        )
 
         self.assertEqual(bookwyrm_tags.get_notification_count(self.user), 2)
 
-
     def test_get_replies(self):
-        ''' direct replies to a status '''
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        """ direct replies to a status """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             parent = models.Review.objects.create(
-                user=self.user, book=self.book, content='hi')
+                user=self.user, book=self.book, content="hi"
+            )
             first_child = models.Status.objects.create(
-                reply_parent=parent, user=self.user, content='hi')
+                reply_parent=parent, user=self.user, content="hi"
+            )
             second_child = models.Status.objects.create(
-                reply_parent=parent, user=self.user, content='hi')
+                reply_parent=parent, user=self.user, content="hi"
+            )
             third_child = models.Status.objects.create(
-                reply_parent=parent, user=self.user,
-                deleted=True, deleted_date=timezone.now())
+                reply_parent=parent,
+                user=self.user,
+                deleted=True,
+                deleted_date=timezone.now(),
+            )
 
         replies = bookwyrm_tags.get_replies(parent)
         self.assertEqual(len(replies), 2)
@@ -94,181 +97,162 @@ class TemplateTags(TestCase):
         self.assertTrue(second_child in replies)
         self.assertFalse(third_child in replies)
 
-
     def test_get_parent(self):
-        ''' get the reply parent of a status '''
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        """ get the reply parent of a status """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             parent = models.Review.objects.create(
-                user=self.user, book=self.book, content='hi')
+                user=self.user, book=self.book, content="hi"
+            )
             child = models.Status.objects.create(
-                reply_parent=parent, user=self.user, content='hi')
+                reply_parent=parent, user=self.user, content="hi"
+            )
 
         result = bookwyrm_tags.get_parent(child)
         self.assertEqual(result, parent)
         self.assertIsInstance(result, models.Review)
 
-
     def test_get_user_liked(self):
-        ''' did a user like a status '''
-        status = models.Review.objects.create(
-            user=self.remote_user, book=self.book)
+        """ did a user like a status """
+        status = models.Review.objects.create(user=self.remote_user, book=self.book)
 
         self.assertFalse(bookwyrm_tags.get_user_liked(self.user, status))
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            models.Favorite.objects.create(
-                user=self.user,
-                status=status
-            )
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            models.Favorite.objects.create(user=self.user, status=status)
         self.assertTrue(bookwyrm_tags.get_user_liked(self.user, status))
 
-
     def test_get_user_boosted(self):
-        ''' did a user boost a status '''
-        status = models.Review.objects.create(
-            user=self.remote_user, book=self.book)
+        """ did a user boost a status """
+        status = models.Review.objects.create(user=self.remote_user, book=self.book)
 
         self.assertFalse(bookwyrm_tags.get_user_boosted(self.user, status))
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            models.Boost.objects.create(
-                user=self.user,
-                boosted_status=status
-            )
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            models.Boost.objects.create(user=self.user, boosted_status=status)
         self.assertTrue(bookwyrm_tags.get_user_boosted(self.user, status))
 
-
     def test_follow_request_exists(self):
-        ''' does a user want to follow '''
+        """ does a user want to follow """
         self.assertFalse(
-            bookwyrm_tags.follow_request_exists(self.user, self.remote_user))
+            bookwyrm_tags.follow_request_exists(self.user, self.remote_user)
+        )
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             models.UserFollowRequest.objects.create(
-                user_subject=self.user,
-                user_object=self.remote_user)
+                user_subject=self.user, user_object=self.remote_user
+            )
 
         self.assertFalse(
-            bookwyrm_tags.follow_request_exists(self.user, self.remote_user))
+            bookwyrm_tags.follow_request_exists(self.user, self.remote_user)
+        )
         self.assertTrue(
-            bookwyrm_tags.follow_request_exists(self.remote_user, self.user))
-
+            bookwyrm_tags.follow_request_exists(self.remote_user, self.user)
+        )
 
     def test_get_boosted(self):
-        ''' load a boosted status '''
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            status = models.Review.objects.create(
-                user=self.remote_user, book=self.book)
-            boost = models.Boost.objects.create(
-                user=self.user,
-                boosted_status=status
-            )
+        """ load a boosted status """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            status = models.Review.objects.create(user=self.remote_user, book=self.book)
+            boost = models.Boost.objects.create(user=self.user, boosted_status=status)
         boosted = bookwyrm_tags.get_boosted(boost)
         self.assertIsInstance(boosted, models.Review)
         self.assertEqual(boosted, status)
 
-
     def test_get_book_description(self):
-        ''' grab it from the edition or the parent '''
-        work = models.Work.objects.create(title='Test Work')
+        """ grab it from the edition or the parent """
+        work = models.Work.objects.create(title="Test Work")
         self.book.parent_work = work
         self.book.save()
 
         self.assertIsNone(bookwyrm_tags.get_book_description(self.book))
 
-        work.description = 'hi'
+        work.description = "hi"
         work.save()
-        self.assertEqual(bookwyrm_tags.get_book_description(self.book), 'hi')
+        self.assertEqual(bookwyrm_tags.get_book_description(self.book), "hi")
 
-        self.book.description = 'hello'
+        self.book.description = "hello"
         self.book.save()
-        self.assertEqual(bookwyrm_tags.get_book_description(self.book), 'hello')
-
+        self.assertEqual(bookwyrm_tags.get_book_description(self.book), "hello")
 
     def test_get_uuid(self):
-        ''' uuid functionality '''
-        uuid = bookwyrm_tags.get_uuid('hi')
-        self.assertTrue(re.match(r'hi[A-Za-z0-9\-]', uuid))
-
+        """ uuid functionality """
+        uuid = bookwyrm_tags.get_uuid("hi")
+        self.assertTrue(re.match(r"hi[A-Za-z0-9\-]", uuid))
 
     def test_time_since(self):
-        ''' ultraconcise timestamps '''
-        self.assertEqual(bookwyrm_tags.time_since('bleh'), '')
+        """ ultraconcise timestamps """
+        self.assertEqual(bookwyrm_tags.time_since("bleh"), "")
 
         now = timezone.now()
-        self.assertEqual(bookwyrm_tags.time_since(now), '0s')
+        self.assertEqual(bookwyrm_tags.time_since(now), "0s")
 
         seconds_ago = now - relativedelta(seconds=4)
-        self.assertEqual(bookwyrm_tags.time_since(seconds_ago), '4s')
+        self.assertEqual(bookwyrm_tags.time_since(seconds_ago), "4s")
 
         minutes_ago = now - relativedelta(minutes=8)
-        self.assertEqual(bookwyrm_tags.time_since(minutes_ago), '8m')
+        self.assertEqual(bookwyrm_tags.time_since(minutes_ago), "8m")
 
         hours_ago = now - relativedelta(hours=9)
-        self.assertEqual(bookwyrm_tags.time_since(hours_ago), '9h')
+        self.assertEqual(bookwyrm_tags.time_since(hours_ago), "9h")
 
         days_ago = now - relativedelta(days=3)
-        self.assertEqual(bookwyrm_tags.time_since(days_ago), '3d')
+        self.assertEqual(bookwyrm_tags.time_since(days_ago), "3d")
 
         # I am not going to figure out how to mock dates tonight.
         months_ago = now - relativedelta(months=5)
-        self.assertTrue(re.match(
-            r'[A-Z][a-z]{2} \d?\d',
-            bookwyrm_tags.time_since(months_ago)
-        ))
+        self.assertTrue(
+            re.match(r"[A-Z][a-z]{2} \d?\d", bookwyrm_tags.time_since(months_ago))
+        )
 
         years_ago = now - relativedelta(years=10)
-        self.assertTrue(re.match(
-            r'[A-Z][a-z]{2} \d?\d \d{4}',
-            bookwyrm_tags.time_since(years_ago)
-        ))
-
+        self.assertTrue(
+            re.match(r"[A-Z][a-z]{2} \d?\d \d{4}", bookwyrm_tags.time_since(years_ago))
+        )
 
     def test_get_markdown(self):
-        ''' mardown format data '''
-        result = bookwyrm_tags.get_markdown('_hi_')
-        self.assertEqual(result, '<p><em>hi</em></p>')
-
-        result = bookwyrm_tags.get_markdown('<marquee>_hi_</marquee>')
-        self.assertEqual(result, '<p><em>hi</em></p>')
+        """ mardown format data """
+        result = bookwyrm_tags.get_markdown("_hi_")
+        self.assertEqual(result, "<p><em>hi</em></p>")
 
+        result = bookwyrm_tags.get_markdown("<marquee>_hi_</marquee>")
+        self.assertEqual(result, "<p><em>hi</em></p>")
 
     def test_get_mentions(self):
-        ''' list of people mentioned '''
-        status = models.Status.objects.create(
-            content='hi', user=self.remote_user)
+        """ list of people mentioned """
+        status = models.Status.objects.create(content="hi", user=self.remote_user)
         result = bookwyrm_tags.get_mentions(status, self.user)
-        self.assertEqual(result, '@rat@example.com ')
-
+        self.assertEqual(result, "@rat@example.com ")
 
     def test_get_status_preview_name(self):
-        ''' status context string '''
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            status = models.Status.objects.create(content='hi', user=self.user)
+        """ status context string """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            status = models.Status.objects.create(content="hi", user=self.user)
             result = bookwyrm_tags.get_status_preview_name(status)
-            self.assertEqual(result, 'status')
+            self.assertEqual(result, "status")
 
             status = models.Review.objects.create(
-                content='hi', user=self.user, book=self.book)
+                content="hi", user=self.user, book=self.book
+            )
             result = bookwyrm_tags.get_status_preview_name(status)
-            self.assertEqual(result, 'review of <em>Test Book</em>')
+            self.assertEqual(result, "review of <em>Test Book</em>")
 
             status = models.Comment.objects.create(
-                content='hi', user=self.user, book=self.book)
+                content="hi", user=self.user, book=self.book
+            )
             result = bookwyrm_tags.get_status_preview_name(status)
-            self.assertEqual(result, 'comment on <em>Test Book</em>')
+            self.assertEqual(result, "comment on <em>Test Book</em>")
 
             status = models.Quotation.objects.create(
-                content='hi', user=self.user, book=self.book)
+                content="hi", user=self.user, book=self.book
+            )
         result = bookwyrm_tags.get_status_preview_name(status)
-        self.assertEqual(result, 'quotation from <em>Test Book</em>')
-
+        self.assertEqual(result, "quotation from <em>Test Book</em>")
 
     def test_related_status(self):
-        ''' gets the subclass model for a notification status '''
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            status = models.Status.objects.create(content='hi', user=self.user)
+        """ gets the subclass model for a notification status """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            status = models.Status.objects.create(content="hi", user=self.user)
         notification = models.Notification.objects.create(
-            user=self.user, notification_type='MENTION',
-            related_status=status)
+            user=self.user, notification_type="MENTION", related_status=status
+        )
 
         result = bookwyrm_tags.related_status(notification)
         self.assertIsInstance(result, models.Status)
diff --git a/bookwyrm/tests/views/test_authentication.py b/bookwyrm/tests/views/test_authentication.py
index dc52719c..f6d31861 100644
--- a/bookwyrm/tests/views/test_authentication.py
+++ b/bookwyrm/tests/views/test_authentication.py
@@ -1,4 +1,4 @@
-''' test for app action functionality '''
+""" test for app action functionality """
 from unittest.mock import patch
 
 from django.contrib.auth.models import AnonymousUser
@@ -14,21 +14,26 @@ from bookwyrm.settings import DOMAIN
 
 # pylint: disable=too-many-public-methods
 class AuthenticationViews(TestCase):
-    ''' login and password management '''
+    """ login and password management """
+
     def setUp(self):
-        ''' we need basic test data and mocks '''
+        """ we need basic test data and mocks """
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
-            'mouse@local.com', 'mouse@mouse.com', 'password',
-            local=True, localname='mouse')
+            "mouse@local.com",
+            "mouse@mouse.com",
+            "password",
+            local=True,
+            localname="mouse",
+        )
         self.anonymous_user = AnonymousUser
         self.anonymous_user.is_authenticated = False
         self.settings = models.SiteSettings.objects.create(id=1)
 
     def test_login_get(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         login = views.Login.as_view()
-        request = self.factory.get('')
+        request = self.factory.get("")
         request.user = self.anonymous_user
 
         result = login(request)
@@ -38,135 +43,117 @@ class AuthenticationViews(TestCase):
 
         request.user = self.local_user
         result = login(request)
-        self.assertEqual(result.url, '/')
+        self.assertEqual(result.url, "/")
         self.assertEqual(result.status_code, 302)
 
-
     def test_register(self):
-        ''' create a user '''
+        """ create a user """
         view = views.Register.as_view()
         self.assertEqual(models.User.objects.count(), 1)
         request = self.factory.post(
-            'register/',
+            "register/",
             {
-                'localname': 'nutria-user.user_nutria',
-                'password': 'mouseword',
-                'email': 'aa@bb.cccc'
-            })
-        with patch('bookwyrm.views.authentication.login'):
+                "localname": "nutria-user.user_nutria",
+                "password": "mouseword",
+                "email": "aa@bb.cccc",
+            },
+        )
+        with patch("bookwyrm.views.authentication.login"):
             response = view(request)
         self.assertEqual(models.User.objects.count(), 2)
         self.assertEqual(response.status_code, 302)
         nutria = models.User.objects.last()
-        self.assertEqual(nutria.username, 'nutria-user.user_nutria@%s' % DOMAIN)
-        self.assertEqual(nutria.localname, 'nutria-user.user_nutria')
+        self.assertEqual(nutria.username, "nutria-user.user_nutria@%s" % DOMAIN)
+        self.assertEqual(nutria.localname, "nutria-user.user_nutria")
         self.assertEqual(nutria.local, True)
 
     def test_register_trailing_space(self):
-        ''' django handles this so weirdly '''
+        """ django handles this so weirdly """
         view = views.Register.as_view()
         request = self.factory.post(
-            'register/',
-            {
-                'localname': 'nutria ',
-                'password': 'mouseword',
-                'email': 'aa@bb.ccc'
-            })
-        with patch('bookwyrm.views.authentication.login'):
+            "register/",
+            {"localname": "nutria ", "password": "mouseword", "email": "aa@bb.ccc"},
+        )
+        with patch("bookwyrm.views.authentication.login"):
             response = view(request)
         self.assertEqual(models.User.objects.count(), 2)
         self.assertEqual(response.status_code, 302)
         nutria = models.User.objects.last()
-        self.assertEqual(nutria.username, 'nutria@%s' % DOMAIN)
-        self.assertEqual(nutria.localname, 'nutria')
+        self.assertEqual(nutria.username, "nutria@%s" % DOMAIN)
+        self.assertEqual(nutria.localname, "nutria")
         self.assertEqual(nutria.local, True)
 
     def test_register_invalid_email(self):
-        ''' gotta have an email '''
+        """ gotta have an email """
         view = views.Register.as_view()
         self.assertEqual(models.User.objects.count(), 1)
         request = self.factory.post(
-            'register/',
-            {
-                'localname': 'nutria',
-                'password': 'mouseword',
-                'email': 'aa'
-            })
+            "register/", {"localname": "nutria", "password": "mouseword", "email": "aa"}
+        )
         response = view(request)
         self.assertEqual(models.User.objects.count(), 1)
         response.render()
 
     def test_register_invalid_username(self):
-        ''' gotta have an email '''
+        """ gotta have an email """
         view = views.Register.as_view()
         self.assertEqual(models.User.objects.count(), 1)
         request = self.factory.post(
-            'register/',
-            {
-                'localname': 'nut@ria',
-                'password': 'mouseword',
-                'email': 'aa@bb.ccc'
-            })
+            "register/",
+            {"localname": "nut@ria", "password": "mouseword", "email": "aa@bb.ccc"},
+        )
         response = view(request)
         self.assertEqual(models.User.objects.count(), 1)
         response.render()
 
         request = self.factory.post(
-            'register/',
-            {
-                'localname': 'nutr ia',
-                'password': 'mouseword',
-                'email': 'aa@bb.ccc'
-            })
+            "register/",
+            {"localname": "nutr ia", "password": "mouseword", "email": "aa@bb.ccc"},
+        )
         response = view(request)
         self.assertEqual(models.User.objects.count(), 1)
         response.render()
 
         request = self.factory.post(
-            'register/',
-            {
-                'localname': 'nut@ria',
-                'password': 'mouseword',
-                'email': 'aa@bb.ccc'
-            })
+            "register/",
+            {"localname": "nut@ria", "password": "mouseword", "email": "aa@bb.ccc"},
+        )
         response = view(request)
         self.assertEqual(models.User.objects.count(), 1)
         response.render()
 
-
     def test_register_closed_instance(self):
-        ''' you can't just register '''
+        """ you can't just register """
         view = views.Register.as_view()
         self.settings.allow_registration = False
         self.settings.save()
         request = self.factory.post(
-            'register/',
-            {
-                'localname': 'nutria ',
-                'password': 'mouseword',
-                'email': 'aa@bb.ccc'
-            })
+            "register/",
+            {"localname": "nutria ", "password": "mouseword", "email": "aa@bb.ccc"},
+        )
         with self.assertRaises(PermissionDenied):
             view(request)
 
     def test_register_invite(self):
-        ''' you can't just register '''
+        """ you can't just register """
         view = views.Register.as_view()
         self.settings.allow_registration = False
         self.settings.save()
         models.SiteInvite.objects.create(
-            code='testcode', user=self.local_user, use_limit=1)
+            code="testcode", user=self.local_user, use_limit=1
+        )
         self.assertEqual(models.SiteInvite.objects.get().times_used, 0)
 
         request = self.factory.post(
-            'register/',
+            "register/",
             {
-                'localname': 'nutria',
-                'password': 'mouseword',
-                'email': 'aa@bb.ccc',
-                'invite_code': 'testcode'
-            })
-        with patch('bookwyrm.views.authentication.login'):
+                "localname": "nutria",
+                "password": "mouseword",
+                "email": "aa@bb.ccc",
+                "invite_code": "testcode",
+            },
+        )
+        with patch("bookwyrm.views.authentication.login"):
             response = view(request)
         self.assertEqual(models.User.objects.count(), 2)
         self.assertEqual(response.status_code, 302)
@@ -174,26 +161,28 @@ class AuthenticationViews(TestCase):
 
         # invite already used to max capacity
         request = self.factory.post(
-            'register/',
+            "register/",
             {
-                'localname': 'nutria2',
-                'password': 'mouseword',
-                'email': 'aa@bb.ccc',
-                'invite_code': 'testcode'
-            })
+                "localname": "nutria2",
+                "password": "mouseword",
+                "email": "aa@bb.ccc",
+                "invite_code": "testcode",
+            },
+        )
         with self.assertRaises(PermissionDenied):
             response = view(request)
         self.assertEqual(models.User.objects.count(), 2)
 
         # bad invite code
         request = self.factory.post(
-            'register/',
+            "register/",
             {
-                'localname': 'nutria3',
-                'password': 'mouseword',
-                'email': 'aa@bb.ccc',
-                'invite_code': 'dkfkdjgdfkjgkdfj'
-            })
+                "localname": "nutria3",
+                "password": "mouseword",
+                "email": "aa@bb.ccc",
+                "invite_code": "dkfkdjgdfkjgkdfj",
+            },
+        )
         with self.assertRaises(Http404):
             response = view(request)
         self.assertEqual(models.User.objects.count(), 2)
diff --git a/bookwyrm/tests/views/test_author.py b/bookwyrm/tests/views/test_author.py
index 3c1a68bb..bb047b7c 100644
--- a/bookwyrm/tests/views/test_author.py
+++ b/bookwyrm/tests/views/test_author.py
@@ -1,4 +1,4 @@
-''' test for app action functionality '''
+""" test for app action functionality """
 from unittest.mock import patch
 from django.contrib.auth.models import Group, Permission
 from django.contrib.contenttypes.models import ContentType
@@ -12,37 +12,41 @@ from bookwyrm.activitypub import ActivitypubResponse
 
 
 class AuthorViews(TestCase):
-    ''' author views'''
+    """ author views"""
+
     def setUp(self):
-        ''' we need basic test data and mocks '''
+        """ we need basic test data and mocks """
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
-            'mouse@local.com', 'mouse@mouse.com', 'mouseword',
-            local=True, localname='mouse',
-            remote_id='https://example.com/users/mouse',
+            "mouse@local.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+            remote_id="https://example.com/users/mouse",
         )
-        self.group = Group.objects.create(name='editor')
+        self.group = Group.objects.create(name="editor")
         self.group.permissions.add(
             Permission.objects.create(
-                name='edit_book',
-                codename='edit_book',
-                content_type=ContentType.objects.get_for_model(models.User)).id
+                name="edit_book",
+                codename="edit_book",
+                content_type=ContentType.objects.get_for_model(models.User),
+            ).id
         )
-        self.work = models.Work.objects.create(title='Test Work')
+        self.work = models.Work.objects.create(title="Test Work")
         self.book = models.Edition.objects.create(
-            title='Example Edition',
-            remote_id='https://example.com/book/1',
-            parent_work=self.work
+            title="Example Edition",
+            remote_id="https://example.com/book/1",
+            parent_work=self.work,
         )
         models.SiteSettings.objects.create()
 
-
     def test_author_page(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.Author.as_view()
-        author = models.Author.objects.create(name='Jessica')
-        request = self.factory.get('')
-        with patch('bookwyrm.views.author.is_api_request') as is_api:
+        author = models.Author.objects.create(name="Jessica")
+        request = self.factory.get("")
+        with patch("bookwyrm.views.author.is_api_request") as is_api:
             is_api.return_value = False
             result = view(request, author.id)
         self.assertIsInstance(result, TemplateResponse)
@@ -50,19 +54,18 @@ class AuthorViews(TestCase):
         self.assertEqual(result.status_code, 200)
         self.assertEqual(result.status_code, 200)
 
-        request = self.factory.get('')
-        with patch('bookwyrm.views.author.is_api_request') as is_api:
+        request = self.factory.get("")
+        with patch("bookwyrm.views.author.is_api_request") as is_api:
             is_api.return_value = True
             result = view(request, author.id)
         self.assertIsInstance(result, ActivitypubResponse)
         self.assertEqual(result.status_code, 200)
 
-
     def test_edit_author_page(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.EditAuthor.as_view()
-        author = models.Author.objects.create(name='Test Author')
-        request = self.factory.get('')
+        author = models.Author.objects.create(name="Test Author")
+        request = self.factory.get("")
         request.user = self.local_user
         request.user.is_superuser = True
 
@@ -72,52 +75,51 @@ class AuthorViews(TestCase):
         self.assertEqual(result.status_code, 200)
         self.assertEqual(result.status_code, 200)
 
-
     def test_edit_author(self):
-        ''' edit an author '''
+        """ edit an author """
         view = views.EditAuthor.as_view()
-        author = models.Author.objects.create(name='Test Author')
+        author = models.Author.objects.create(name="Test Author")
         self.local_user.groups.add(self.group)
         form = forms.AuthorForm(instance=author)
-        form.data['name'] = 'New Name'
-        form.data['last_edited_by'] = self.local_user.id
-        request = self.factory.post('', form.data)
+        form.data["name"] = "New Name"
+        form.data["last_edited_by"] = self.local_user.id
+        request = self.factory.post("", form.data)
         request.user = self.local_user
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             view(request, author.id)
         author.refresh_from_db()
-        self.assertEqual(author.name, 'New Name')
+        self.assertEqual(author.name, "New Name")
         self.assertEqual(author.last_edited_by, self.local_user)
 
     def test_edit_author_non_editor(self):
-        ''' edit an author with invalid post data'''
+        """ edit an author with invalid post data"""
         view = views.EditAuthor.as_view()
-        author = models.Author.objects.create(name='Test Author')
+        author = models.Author.objects.create(name="Test Author")
         form = forms.AuthorForm(instance=author)
-        form.data['name'] = 'New Name'
-        form.data['last_edited_by'] = self.local_user.id
-        request = self.factory.post('', form.data)
+        form.data["name"] = "New Name"
+        form.data["last_edited_by"] = self.local_user.id
+        request = self.factory.post("", form.data)
         request.user = self.local_user
 
         with self.assertRaises(PermissionDenied):
             view(request, author.id)
         author.refresh_from_db()
-        self.assertEqual(author.name, 'Test Author')
+        self.assertEqual(author.name, "Test Author")
 
     def test_edit_author_invalid_form(self):
-        ''' edit an author with invalid post data'''
+        """ edit an author with invalid post data"""
         view = views.EditAuthor.as_view()
-        author = models.Author.objects.create(name='Test Author')
+        author = models.Author.objects.create(name="Test Author")
         self.local_user.groups.add(self.group)
         form = forms.AuthorForm(instance=author)
-        form.data['name'] = ''
-        form.data['last_edited_by'] = self.local_user.id
-        request = self.factory.post('', form.data)
+        form.data["name"] = ""
+        form.data["last_edited_by"] = self.local_user.id
+        request = self.factory.post("", form.data)
         request.user = self.local_user
 
         resp = view(request, author.id)
         author.refresh_from_db()
-        self.assertEqual(author.name, 'Test Author')
+        self.assertEqual(author.name, "Test Author")
         resp.render()
         self.assertEqual(resp.status_code, 200)
diff --git a/bookwyrm/tests/views/test_block.py b/bookwyrm/tests/views/test_block.py
index 315dc224..60920e38 100644
--- a/bookwyrm/tests/views/test_block.py
+++ b/bookwyrm/tests/views/test_block.py
@@ -1,4 +1,4 @@
-''' test for app action functionality '''
+""" test for app action functionality """
 from unittest.mock import patch
 from django.template.response import TemplateResponse
 from django.test import TestCase
@@ -8,28 +8,34 @@ from bookwyrm import models, views
 
 
 class BlockViews(TestCase):
-    ''' view user and edit profile '''
+    """ view user and edit profile """
+
     def setUp(self):
-        ''' we need basic test data and mocks '''
+        """ we need basic test data and mocks """
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
-            'mouse@local.com', 'mouse@mouse.mouse', 'password',
-            local=True, localname='mouse')
-        with patch('bookwyrm.models.user.set_remote_server.delay'):
+            "mouse@local.com",
+            "mouse@mouse.mouse",
+            "password",
+            local=True,
+            localname="mouse",
+        )
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
             self.remote_user = models.User.objects.create_user(
-                'rat', 'rat@rat.com', 'ratword',
+                "rat",
+                "rat@rat.com",
+                "ratword",
                 local=False,
-                remote_id='https://example.com/users/rat',
-                inbox='https://example.com/users/rat/inbox',
-                outbox='https://example.com/users/rat/outbox',
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
             )
         models.SiteSettings.objects.create()
 
-
     def test_block_get(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.Block.as_view()
-        request = self.factory.get('')
+        request = self.factory.get("")
         request.user = self.local_user
         result = view(request)
         self.assertIsInstance(result, TemplateResponse)
@@ -37,19 +43,19 @@ class BlockViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_block_post(self):
-        ''' create a "block" database entry from an activity '''
+        """ create a "block" database entry from an activity """
         view = views.Block.as_view()
         self.local_user.followers.add(self.remote_user)
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             models.UserFollowRequest.objects.create(
-                user_subject=self.local_user,
-                user_object=self.remote_user)
+                user_subject=self.local_user, user_object=self.remote_user
+            )
         self.assertTrue(models.UserFollows.objects.exists())
         self.assertTrue(models.UserFollowRequest.objects.exists())
 
-        request = self.factory.post('')
+        request = self.factory.post("")
         request.user = self.local_user
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             view(request, self.remote_user.id)
         block = models.UserBlocks.objects.get()
         self.assertEqual(block.user_subject, self.local_user)
@@ -59,12 +65,12 @@ class BlockViews(TestCase):
         self.assertFalse(models.UserFollowRequest.objects.exists())
 
     def test_unblock(self):
-        ''' undo a block '''
+        """ undo a block """
         self.local_user.blocks.add(self.remote_user)
-        request = self.factory.post('')
+        request = self.factory.post("")
         request.user = self.local_user
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             views.block.unblock(request, self.remote_user.id)
 
         self.assertFalse(models.UserBlocks.objects.exists())
diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index b3360200..eb8c89b9 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -1,4 +1,4 @@
-''' test for app action functionality '''
+""" test for app action functionality """
 from unittest.mock import patch
 from django.contrib.auth.models import Group, Permission
 from django.contrib.contenttypes.models import ContentType
@@ -11,55 +11,58 @@ from bookwyrm.activitypub import ActivitypubResponse
 
 
 class BookViews(TestCase):
-    ''' books books books '''
+    """ books books books """
+
     def setUp(self):
-        ''' we need basic test data and mocks '''
+        """ we need basic test data and mocks """
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
-            'mouse@local.com', 'mouse@mouse.com', 'mouseword',
-            local=True, localname='mouse',
-            remote_id='https://example.com/users/mouse',
+            "mouse@local.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+            remote_id="https://example.com/users/mouse",
         )
-        self.group = Group.objects.create(name='editor')
+        self.group = Group.objects.create(name="editor")
         self.group.permissions.add(
             Permission.objects.create(
-                name='edit_book',
-                codename='edit_book',
-                content_type=ContentType.objects.get_for_model(models.User)).id
+                name="edit_book",
+                codename="edit_book",
+                content_type=ContentType.objects.get_for_model(models.User),
+            ).id
         )
-        self.work = models.Work.objects.create(title='Test Work')
+        self.work = models.Work.objects.create(title="Test Work")
         self.book = models.Edition.objects.create(
-            title='Example Edition',
-            remote_id='https://example.com/book/1',
-            parent_work=self.work
+            title="Example Edition",
+            remote_id="https://example.com/book/1",
+            parent_work=self.work,
         )
         models.SiteSettings.objects.create()
 
-
     def test_book_page(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.Book.as_view()
-        request = self.factory.get('')
+        request = self.factory.get("")
         request.user = self.local_user
-        with patch('bookwyrm.views.books.is_api_request') as is_api:
+        with patch("bookwyrm.views.books.is_api_request") as is_api:
             is_api.return_value = False
             result = view(request, self.book.id)
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
 
-        request = self.factory.get('')
-        with patch('bookwyrm.views.books.is_api_request') as is_api:
+        request = self.factory.get("")
+        with patch("bookwyrm.views.books.is_api_request") as is_api:
             is_api.return_value = True
             result = view(request, self.book.id)
         self.assertIsInstance(result, ActivitypubResponse)
         self.assertEqual(result.status_code, 200)
 
-
     def test_edit_book_page(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.EditBook.as_view()
-        request = self.factory.get('')
+        request = self.factory.get("")
         request.user = self.local_user
         request.user.is_superuser = True
         result = view(request, self.book.id)
@@ -67,66 +70,57 @@ class BookViews(TestCase):
         result.render()
         self.assertEqual(result.status_code, 200)
 
-
     def test_edit_book(self):
-        ''' lets a user edit a book '''
+        """ lets a user edit a book """
         view = views.EditBook.as_view()
         self.local_user.groups.add(self.group)
         form = forms.EditionForm(instance=self.book)
-        form.data['title'] = 'New Title'
-        form.data['last_edited_by'] = self.local_user.id
-        request = self.factory.post('', form.data)
+        form.data["title"] = "New Title"
+        form.data["last_edited_by"] = self.local_user.id
+        request = self.factory.post("", form.data)
         request.user = self.local_user
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             view(request, self.book.id)
         self.book.refresh_from_db()
-        self.assertEqual(self.book.title, 'New Title')
-
+        self.assertEqual(self.book.title, "New Title")
 
     def test_switch_edition(self):
-        ''' updates user's relationships to a book '''
-        work = models.Work.objects.create(title='test work')
-        edition1 = models.Edition.objects.create(
-            title='first ed', parent_work=work)
-        edition2 = models.Edition.objects.create(
-            title='second ed', parent_work=work)
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            shelf = models.Shelf.objects.create(
-                name='Test Shelf', user=self.local_user)
+        """ updates user's relationships to a book """
+        work = models.Work.objects.create(title="test work")
+        edition1 = models.Edition.objects.create(title="first ed", parent_work=work)
+        edition2 = models.Edition.objects.create(title="second ed", parent_work=work)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            shelf = models.Shelf.objects.create(name="Test Shelf", user=self.local_user)
             models.ShelfBook.objects.create(
                 book=edition1,
                 user=self.local_user,
                 shelf=shelf,
             )
-        models.ReadThrough.objects.create(
-            user=self.local_user, book=edition1)
+        models.ReadThrough.objects.create(user=self.local_user, book=edition1)
 
         self.assertEqual(models.ShelfBook.objects.get().book, edition1)
         self.assertEqual(models.ReadThrough.objects.get().book, edition1)
-        request = self.factory.post('', {
-            'edition': edition2.id
-        })
+        request = self.factory.post("", {"edition": edition2.id})
         request.user = self.local_user
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             views.switch_edition(request)
 
         self.assertEqual(models.ShelfBook.objects.get().book, edition2)
         self.assertEqual(models.ReadThrough.objects.get().book, edition2)
 
-
     def test_editions_page(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.Editions.as_view()
-        request = self.factory.get('')
-        with patch('bookwyrm.views.books.is_api_request') as is_api:
+        request = self.factory.get("")
+        with patch("bookwyrm.views.books.is_api_request") as is_api:
             is_api.return_value = False
             result = view(request, self.work.id)
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
 
-        request = self.factory.get('')
-        with patch('bookwyrm.views.books.is_api_request') as is_api:
+        request = self.factory.get("")
+        with patch("bookwyrm.views.books.is_api_request") as is_api:
             is_api.return_value = True
             result = view(request, self.work.id)
         self.assertIsInstance(result, ActivitypubResponse)
diff --git a/bookwyrm/tests/views/test_federation.py b/bookwyrm/tests/views/test_federation.py
index 70cf41f6..d11d7415 100644
--- a/bookwyrm/tests/views/test_federation.py
+++ b/bookwyrm/tests/views/test_federation.py
@@ -1,4 +1,4 @@
-''' test for app action functionality '''
+""" test for app action functionality """
 from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
@@ -8,20 +8,24 @@ from bookwyrm import views
 
 
 class FederationViews(TestCase):
-    ''' every response to a get request, html or json '''
+    """ every response to a get request, html or json """
+
     def setUp(self):
-        ''' we need basic test data and mocks '''
+        """ we need basic test data and mocks """
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
-            'mouse@local.com', 'mouse@mouse.mouse', 'password',
-            local=True, localname='mouse')
+            "mouse@local.com",
+            "mouse@mouse.mouse",
+            "password",
+            local=True,
+            localname="mouse",
+        )
         models.SiteSettings.objects.create()
 
-
     def test_federation_page(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.Federation.as_view()
-        request = self.factory.get('')
+        request = self.factory.get("")
         request.user = self.local_user
         request.user.is_superuser = True
         result = view(request)
diff --git a/bookwyrm/tests/views/test_feed.py b/bookwyrm/tests/views/test_feed.py
index 93af9944..c54be006 100644
--- a/bookwyrm/tests/views/test_feed.py
+++ b/bookwyrm/tests/views/test_feed.py
@@ -1,4 +1,4 @@
-''' test for app action functionality '''
+""" test for app action functionality """
 from unittest.mock import patch
 from django.template.response import TemplateResponse
 from django.test import TestCase
@@ -10,95 +10,93 @@ from bookwyrm.activitypub import ActivitypubResponse
 
 
 class FeedMessageViews(TestCase):
-    ''' dms '''
+    """ dms """
+
     def setUp(self):
-        ''' we need basic test data and mocks '''
+        """ we need basic test data and mocks """
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
-            'mouse@local.com', 'mouse@mouse.mouse', 'password',
-            local=True, localname='mouse')
+            "mouse@local.com",
+            "mouse@mouse.mouse",
+            "password",
+            local=True,
+            localname="mouse",
+        )
         self.book = models.Edition.objects.create(
-            parent_work=models.Work.objects.create(title='hi'),
-            title='Example Edition',
-            remote_id='https://example.com/book/1',
+            parent_work=models.Work.objects.create(title="hi"),
+            title="Example Edition",
+            remote_id="https://example.com/book/1",
         )
         models.SiteSettings.objects.create()
 
-
     def test_feed(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.Feed.as_view()
-        request = self.factory.get('')
+        request = self.factory.get("")
         request.user = self.local_user
-        result = view(request, 'local')
+        result = view(request, "local")
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
 
-
     def test_status_page(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.Status.as_view()
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            status = models.Status.objects.create(
-                content='hi', user=self.local_user)
-        request = self.factory.get('')
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            status = models.Status.objects.create(content="hi", user=self.local_user)
+        request = self.factory.get("")
         request.user = self.local_user
-        with patch('bookwyrm.views.feed.is_api_request') as is_api:
+        with patch("bookwyrm.views.feed.is_api_request") as is_api:
             is_api.return_value = False
-            result = view(request, 'mouse', status.id)
+            result = view(request, "mouse", status.id)
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
 
-        with patch('bookwyrm.views.feed.is_api_request') as is_api:
+        with patch("bookwyrm.views.feed.is_api_request") as is_api:
             is_api.return_value = True
-            result = view(request, 'mouse', status.id)
+            result = view(request, "mouse", status.id)
         self.assertIsInstance(result, ActivitypubResponse)
         self.assertEqual(result.status_code, 200)
 
-
     def test_replies_page(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.Replies.as_view()
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            status = models.Status.objects.create(
-                content='hi', user=self.local_user)
-        request = self.factory.get('')
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            status = models.Status.objects.create(content="hi", user=self.local_user)
+        request = self.factory.get("")
         request.user = self.local_user
-        with patch('bookwyrm.views.feed.is_api_request') as is_api:
+        with patch("bookwyrm.views.feed.is_api_request") as is_api:
             is_api.return_value = False
-            result = view(request, 'mouse', status.id)
+            result = view(request, "mouse", status.id)
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
 
-        with patch('bookwyrm.views.feed.is_api_request') as is_api:
+        with patch("bookwyrm.views.feed.is_api_request") as is_api:
             is_api.return_value = True
-            result = view(request, 'mouse', status.id)
+            result = view(request, "mouse", status.id)
         self.assertIsInstance(result, ActivitypubResponse)
         self.assertEqual(result.status_code, 200)
 
-
     def test_direct_messages_page(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.DirectMessage.as_view()
-        request = self.factory.get('')
+        request = self.factory.get("")
         request.user = self.local_user
         result = view(request)
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
 
-
     def test_get_suggested_book(self):
-        ''' gets books the ~*~ algorithm ~*~ thinks you want to post about '''
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        """ gets books the ~*~ algorithm ~*~ thinks you want to post about """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             models.ShelfBook.objects.create(
                 book=self.book,
                 user=self.local_user,
-                shelf=self.local_user.shelf_set.get(identifier='reading')
+                shelf=self.local_user.shelf_set.get(identifier="reading"),
             )
         suggestions = views.feed.get_suggested_books(self.local_user)
-        self.assertEqual(suggestions[0]['name'], 'Currently Reading')
-        self.assertEqual(suggestions[0]['books'][0], self.book)
+        self.assertEqual(suggestions[0]["name"], "Currently Reading")
+        self.assertEqual(suggestions[0]["books"][0], self.book)
diff --git a/bookwyrm/tests/views/test_follow.py b/bookwyrm/tests/views/test_follow.py
index 62543d2d..67ac0f0b 100644
--- a/bookwyrm/tests/views/test_follow.py
+++ b/bookwyrm/tests/views/test_follow.py
@@ -1,4 +1,4 @@
-''' test for app action functionality '''
+""" test for app action functionality """
 from unittest.mock import patch
 from django.contrib.auth.models import Group, Permission
 from django.contrib.contenttypes.models import ContentType
@@ -9,148 +9,147 @@ from bookwyrm import models, views
 
 
 class BookViews(TestCase):
-    ''' books books books '''
+    """ books books books """
+
     def setUp(self):
-        ''' we need basic test data and mocks '''
+        """ we need basic test data and mocks """
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
-            'mouse@local.com', 'mouse@mouse.com', 'mouseword',
-            local=True, localname='mouse',
-            remote_id='https://example.com/users/mouse',
+            "mouse@local.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+            remote_id="https://example.com/users/mouse",
         )
-        with patch('bookwyrm.models.user.set_remote_server'):
+        with patch("bookwyrm.models.user.set_remote_server"):
             self.remote_user = models.User.objects.create_user(
-                'rat', 'rat@email.com', 'ratword',
+                "rat",
+                "rat@email.com",
+                "ratword",
                 local=False,
-                remote_id='https://example.com/users/rat',
-                inbox='https://example.com/users/rat/inbox',
-                outbox='https://example.com/users/rat/outbox',
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
             )
-        self.group = Group.objects.create(name='editor')
+        self.group = Group.objects.create(name="editor")
         self.group.permissions.add(
             Permission.objects.create(
-                name='edit_book',
-                codename='edit_book',
-                content_type=ContentType.objects.get_for_model(models.User)).id
+                name="edit_book",
+                codename="edit_book",
+                content_type=ContentType.objects.get_for_model(models.User),
+            ).id
         )
-        self.work = models.Work.objects.create(title='Test Work')
+        self.work = models.Work.objects.create(title="Test Work")
         self.book = models.Edition.objects.create(
-            title='Example Edition',
-            remote_id='https://example.com/book/1',
-            parent_work=self.work
+            title="Example Edition",
+            remote_id="https://example.com/book/1",
+            parent_work=self.work,
         )
 
     def test_handle_follow_remote(self):
-        ''' send a follow request '''
-        request = self.factory.post('', {'user': self.remote_user.username})
+        """ send a follow request """
+        request = self.factory.post("", {"user": self.remote_user.username})
         request.user = self.local_user
         self.assertEqual(models.UserFollowRequest.objects.count(), 0)
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             views.follow(request)
 
         rel = models.UserFollowRequest.objects.get()
 
         self.assertEqual(rel.user_subject, self.local_user)
         self.assertEqual(rel.user_object, self.remote_user)
-        self.assertEqual(rel.status, 'follow_request')
-
+        self.assertEqual(rel.status, "follow_request")
 
     def test_handle_follow_local_manually_approves(self):
-        ''' send a follow request '''
+        """ send a follow request """
         rat = models.User.objects.create_user(
-            'rat@local.com', 'rat@rat.com', 'ratword',
-            local=True, localname='rat',
-            remote_id='https://example.com/users/rat',
+            "rat@local.com",
+            "rat@rat.com",
+            "ratword",
+            local=True,
+            localname="rat",
+            remote_id="https://example.com/users/rat",
             manually_approves_followers=True,
         )
-        request = self.factory.post('', {'user': rat})
+        request = self.factory.post("", {"user": rat})
         request.user = self.local_user
         self.assertEqual(models.UserFollowRequest.objects.count(), 0)
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             views.follow(request)
         rel = models.UserFollowRequest.objects.get()
 
         self.assertEqual(rel.user_subject, self.local_user)
         self.assertEqual(rel.user_object, rat)
-        self.assertEqual(rel.status, 'follow_request')
-
+        self.assertEqual(rel.status, "follow_request")
 
     def test_handle_follow_local(self):
-        ''' send a follow request '''
+        """ send a follow request """
         rat = models.User.objects.create_user(
-            'rat@local.com', 'rat@rat.com', 'ratword',
-            local=True, localname='rat',
-            remote_id='https://example.com/users/rat',
+            "rat@local.com",
+            "rat@rat.com",
+            "ratword",
+            local=True,
+            localname="rat",
+            remote_id="https://example.com/users/rat",
         )
-        request = self.factory.post('', {'user': rat})
+        request = self.factory.post("", {"user": rat})
         request.user = self.local_user
         self.assertEqual(models.UserFollowRequest.objects.count(), 0)
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             views.follow(request)
 
         rel = models.UserFollows.objects.get()
 
         self.assertEqual(rel.user_subject, self.local_user)
         self.assertEqual(rel.user_object, rat)
-        self.assertEqual(rel.status, 'follows')
-
+        self.assertEqual(rel.status, "follows")
 
     def test_handle_unfollow(self):
-        ''' send an unfollow '''
-        request = self.factory.post('', {'user': self.remote_user.username})
+        """ send an unfollow """
+        request = self.factory.post("", {"user": self.remote_user.username})
         request.user = self.local_user
         self.remote_user.followers.add(self.local_user)
         self.assertEqual(self.remote_user.followers.count(), 1)
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay') \
-                as mock:
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
             views.unfollow(request)
             self.assertEqual(mock.call_count, 1)
 
         self.assertEqual(self.remote_user.followers.count(), 0)
 
-
     def test_handle_accept(self):
-        ''' accept a follow request '''
+        """ accept a follow request """
         self.local_user.manually_approves_followers = True
         self.local_user.save(broadcast=False)
-        request = self.factory.post('', {'user': self.remote_user.username})
+        request = self.factory.post("", {"user": self.remote_user.username})
         request.user = self.local_user
         rel = models.UserFollowRequest.objects.create(
-            user_subject=self.remote_user,
-            user_object=self.local_user
+            user_subject=self.remote_user, user_object=self.local_user
         )
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             views.accept_follow_request(request)
         # request should be deleted
-        self.assertEqual(
-            models.UserFollowRequest.objects.filter(id=rel.id).count(), 0
-        )
+        self.assertEqual(models.UserFollowRequest.objects.filter(id=rel.id).count(), 0)
         # follow relationship should exist
         self.assertEqual(self.local_user.followers.first(), self.remote_user)
 
-
     def test_handle_reject(self):
-        ''' reject a follow request '''
+        """ reject a follow request """
         self.local_user.manually_approves_followers = True
         self.local_user.save(broadcast=False)
-        request = self.factory.post('', {'user': self.remote_user.username})
+        request = self.factory.post("", {"user": self.remote_user.username})
         request.user = self.local_user
         rel = models.UserFollowRequest.objects.create(
-            user_subject=self.remote_user,
-            user_object=self.local_user
+            user_subject=self.remote_user, user_object=self.local_user
         )
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             views.delete_follow_request(request)
         # request should be deleted
-        self.assertEqual(
-            models.UserFollowRequest.objects.filter(id=rel.id).count(), 0
-        )
+        self.assertEqual(models.UserFollowRequest.objects.filter(id=rel.id).count(), 0)
         # follow relationship should not exist
-        self.assertEqual(
-            models.UserFollows.objects.filter(id=rel.id).count(), 0
-        )
+        self.assertEqual(models.UserFollows.objects.filter(id=rel.id).count(), 0)
diff --git a/bookwyrm/tests/views/test_goal.py b/bookwyrm/tests/views/test_goal.py
index 0d534112..990bb5c2 100644
--- a/bookwyrm/tests/views/test_goal.py
+++ b/bookwyrm/tests/views/test_goal.py
@@ -1,4 +1,4 @@
-''' test for app action functionality '''
+""" test for app action functionality """
 from unittest.mock import patch
 from django.utils import timezone
 
@@ -11,60 +11,65 @@ from bookwyrm import models, views
 
 
 class GoalViews(TestCase):
-    ''' viewing and creating statuses '''
+    """ viewing and creating statuses """
+
     def setUp(self):
-        ''' we need basic test data and mocks '''
+        """ we need basic test data and mocks """
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
-            'mouse@local.com', 'mouse@mouse.com', 'mouseword',
-            local=True, localname='mouse',
-            remote_id='https://example.com/users/mouse',
+            "mouse@local.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+            remote_id="https://example.com/users/mouse",
         )
         self.rat = models.User.objects.create_user(
-            'rat@local.com', 'rat@rat.com', 'ratword',
-            local=True, localname='rat',
-            remote_id='https://example.com/users/rat',
+            "rat@local.com",
+            "rat@rat.com",
+            "ratword",
+            local=True,
+            localname="rat",
+            remote_id="https://example.com/users/rat",
         )
         self.book = models.Edition.objects.create(
-            title='Example Edition',
-            remote_id='https://example.com/book/1',
+            title="Example Edition",
+            remote_id="https://example.com/book/1",
         )
         self.anonymous_user = AnonymousUser
         self.anonymous_user.is_authenticated = False
         models.SiteSettings.objects.create()
 
-
     def test_goal_page_no_goal(self):
-        ''' view a reading goal page for another's unset goal '''
+        """ view a reading goal page for another's unset goal """
         view = views.Goal.as_view()
-        request = self.factory.get('')
+        request = self.factory.get("")
         request.user = self.rat
 
         result = view(request, self.local_user.localname, 2020)
         self.assertEqual(result.status_code, 404)
 
     def test_goal_page_no_goal_self(self):
-        ''' view a reading goal page for your own unset goal '''
+        """ view a reading goal page for your own unset goal """
         view = views.Goal.as_view()
-        request = self.factory.get('')
+        request = self.factory.get("")
         request.user = self.local_user
 
         result = view(request, self.local_user.localname, 2020)
         result.render()
         self.assertIsInstance(result, TemplateResponse)
 
-
     def test_goal_page_anonymous(self):
-        ''' can't view it without login '''
+        """ can't view it without login """
         view = views.Goal.as_view()
-        request = self.factory.get('')
+        request = self.factory.get("")
         request.user = self.anonymous_user
 
         result = view(request, self.local_user.localname, 2020)
         self.assertEqual(result.status_code, 302)
 
     def test_goal_page_public(self):
-        ''' view a user's public goal '''
+        """ view a user's public goal """
         models.ReadThrough.objects.create(
             finish_date=timezone.now(),
             user=self.local_user,
@@ -75,9 +80,10 @@ class GoalViews(TestCase):
             user=self.local_user,
             year=timezone.now().year,
             goal=128937123,
-            privacy='public')
+            privacy="public",
+        )
         view = views.Goal.as_view()
-        request = self.factory.get('')
+        request = self.factory.get("")
         request.user = self.rat
 
         result = view(request, self.local_user.localname, timezone.now().year)
@@ -85,40 +91,40 @@ class GoalViews(TestCase):
         self.assertIsInstance(result, TemplateResponse)
 
     def test_goal_page_private(self):
-        ''' view a user's private goal '''
+        """ view a user's private goal """
         models.AnnualGoal.objects.create(
-            user=self.local_user,
-            year=2020,
-            goal=15,
-            privacy='followers')
+            user=self.local_user, year=2020, goal=15, privacy="followers"
+        )
         view = views.Goal.as_view()
-        request = self.factory.get('')
+        request = self.factory.get("")
         request.user = self.rat
 
         result = view(request, self.local_user.localname, 2020)
         self.assertEqual(result.status_code, 404)
 
-
     def test_create_goal(self):
-        ''' create a new goal '''
+        """ create a new goal """
         view = views.Goal.as_view()
-        request = self.factory.post('', {
-            'user': self.local_user.id,
-            'goal': 10,
-            'year': 2020,
-            'privacy': 'unlisted',
-            'post-status': True
-        })
+        request = self.factory.post(
+            "",
+            {
+                "user": self.local_user.id,
+                "goal": 10,
+                "year": 2020,
+                "privacy": "unlisted",
+                "post-status": True,
+            },
+        )
         request.user = self.local_user
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             view(request, self.local_user.localname, 2020)
 
         goal = models.AnnualGoal.objects.get()
         self.assertEqual(goal.user, self.local_user)
         self.assertEqual(goal.goal, 10)
         self.assertEqual(goal.year, 2020)
-        self.assertEqual(goal.privacy, 'unlisted')
+        self.assertEqual(goal.privacy, "unlisted")
 
         status = models.GeneratedNote.objects.get()
         self.assertEqual(status.user, self.local_user)
-        self.assertEqual(status.privacy, 'unlisted')
+        self.assertEqual(status.privacy, "unlisted")
diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py
index eff08307..bb4cf69c 100644
--- a/bookwyrm/tests/views/test_helpers.py
+++ b/bookwyrm/tests/views/test_helpers.py
@@ -1,4 +1,4 @@
-''' test for app action functionality '''
+""" test for app action functionality """
 import json
 from unittest.mock import patch
 import pathlib
@@ -9,127 +9,129 @@ import responses
 from bookwyrm import models, views
 from bookwyrm.settings import USER_AGENT
 
+
 class ViewsHelpers(TestCase):
-    ''' viewing and creating statuses '''
+    """ viewing and creating statuses """
+
     def setUp(self):
-        ''' we need basic test data and mocks '''
+        """ we need basic test data and mocks """
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
-            'mouse@local.com', 'mouse@mouse.com', 'mouseword',
-            local=True, localname='mouse',
-            remote_id='https://example.com/users/mouse',
+            "mouse@local.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+            remote_id="https://example.com/users/mouse",
         )
-        self.work = models.Work.objects.create(title='Test Work')
+        self.work = models.Work.objects.create(title="Test Work")
         self.book = models.Edition.objects.create(
-            title='Test Book',
-            remote_id='https://example.com/book/1',
-            parent_work=self.work
+            title="Test Book",
+            remote_id="https://example.com/book/1",
+            parent_work=self.work,
         )
-        with patch('bookwyrm.models.user.set_remote_server.delay'):
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
             self.remote_user = models.User.objects.create_user(
-                'rat', 'rat@rat.com', 'ratword',
+                "rat",
+                "rat@rat.com",
+                "ratword",
                 local=False,
-                remote_id='https://example.com/users/rat',
-                inbox='https://example.com/users/rat/inbox',
-                outbox='https://example.com/users/rat/outbox',
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
             )
-        datafile = pathlib.Path(__file__).parent.joinpath(
-            '../data/ap_user.json'
-        )
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json")
         self.userdata = json.loads(datafile.read_bytes())
-        del self.userdata['icon']
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        del self.userdata["icon"]
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             self.shelf = models.Shelf.objects.create(
-                name='Test Shelf',
-                identifier='test-shelf',
-                user=self.local_user
+                name="Test Shelf", identifier="test-shelf", user=self.local_user
             )
 
-
     def test_get_edition(self):
-        ''' given an edition or a work, returns an edition '''
-        self.assertEqual(
-            views.helpers.get_edition(self.book.id), self.book)
-        self.assertEqual(
-            views.helpers.get_edition(self.work.id), self.book)
+        """ given an edition or a work, returns an edition """
+        self.assertEqual(views.helpers.get_edition(self.book.id), self.book)
+        self.assertEqual(views.helpers.get_edition(self.work.id), self.book)
 
     def test_get_user_from_username(self):
-        ''' works for either localname or username '''
+        """ works for either localname or username """
         self.assertEqual(
-            views.helpers.get_user_from_username(
-                self.local_user, 'mouse'), self.local_user)
+            views.helpers.get_user_from_username(self.local_user, "mouse"),
+            self.local_user,
+        )
         self.assertEqual(
-            views.helpers.get_user_from_username(
-                self.local_user, 'mouse@local.com'), self.local_user)
+            views.helpers.get_user_from_username(self.local_user, "mouse@local.com"),
+            self.local_user,
+        )
         with self.assertRaises(models.User.DoesNotExist):
-            views.helpers.get_user_from_username(
-                self.local_user, 'mojfse@example.com')
-
+            views.helpers.get_user_from_username(self.local_user, "mojfse@example.com")
 
     def test_is_api_request(self):
-        ''' should it return html or json '''
-        request = self.factory.get('/path')
-        request.headers = {'Accept': 'application/json'}
+        """ should it return html or json """
+        request = self.factory.get("/path")
+        request.headers = {"Accept": "application/json"}
         self.assertTrue(views.helpers.is_api_request(request))
 
-        request = self.factory.get('/path.json')
-        request.headers = {'Accept': 'Praise'}
+        request = self.factory.get("/path.json")
+        request.headers = {"Accept": "Praise"}
         self.assertTrue(views.helpers.is_api_request(request))
 
-        request = self.factory.get('/path')
-        request.headers = {'Accept': 'Praise'}
+        request = self.factory.get("/path")
+        request.headers = {"Accept": "Praise"}
         self.assertFalse(views.helpers.is_api_request(request))
 
-
     def test_get_activity_feed(self):
-        ''' loads statuses '''
+        """ loads statuses """
         rat = models.User.objects.create_user(
-            'rat', 'rat@rat.rat', 'password', local=True)
+            "rat", "rat@rat.rat", "password", local=True
+        )
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             public_status = models.Comment.objects.create(
-                content='public status', book=self.book, user=self.local_user)
+                content="public status", book=self.book, user=self.local_user
+            )
             direct_status = models.Status.objects.create(
-                content='direct', user=self.local_user, privacy='direct')
+                content="direct", user=self.local_user, privacy="direct"
+            )
 
-            rat_public = models.Status.objects.create(
-                content='blah blah', user=rat)
+            rat_public = models.Status.objects.create(content="blah blah", user=rat)
             rat_unlisted = models.Status.objects.create(
-                content='blah blah', user=rat, privacy='unlisted')
+                content="blah blah", user=rat, privacy="unlisted"
+            )
             remote_status = models.Status.objects.create(
-                content='blah blah', user=self.remote_user)
+                content="blah blah", user=self.remote_user
+            )
             followers_status = models.Status.objects.create(
-                content='blah', user=rat, privacy='followers')
+                content="blah", user=rat, privacy="followers"
+            )
             rat_mention = models.Status.objects.create(
-                content='blah blah blah', user=rat, privacy='followers')
+                content="blah blah blah", user=rat, privacy="followers"
+            )
             rat_mention.mention_users.set([self.local_user])
 
         statuses = views.helpers.get_activity_feed(
             self.local_user,
-            privacy=['public', 'unlisted', 'followers'],
+            privacy=["public", "unlisted", "followers"],
             following_only=True,
-            queryset=models.Comment.objects
+            queryset=models.Comment.objects,
         )
         self.assertEqual(len(statuses), 1)
         self.assertEqual(statuses[0], public_status)
 
         statuses = views.helpers.get_activity_feed(
-            self.local_user,
-            privacy=['public', 'followers'],
-            local_only=True
+            self.local_user, privacy=["public", "followers"], local_only=True
         )
         self.assertEqual(len(statuses), 2)
         self.assertEqual(statuses[1], public_status)
         self.assertEqual(statuses[0], rat_public)
 
-        statuses = views.helpers.get_activity_feed(
-            self.local_user, privacy=['direct'])
+        statuses = views.helpers.get_activity_feed(self.local_user, privacy=["direct"])
         self.assertEqual(len(statuses), 1)
         self.assertEqual(statuses[0], direct_status)
 
         statuses = views.helpers.get_activity_feed(
             self.local_user,
-            privacy=['public', 'followers'],
+            privacy=["public", "followers"],
         )
         self.assertEqual(len(statuses), 3)
         self.assertEqual(statuses[2], public_status)
@@ -138,8 +140,8 @@ class ViewsHelpers(TestCase):
 
         statuses = views.helpers.get_activity_feed(
             self.local_user,
-            privacy=['public', 'unlisted', 'followers'],
-            following_only=True
+            privacy=["public", "unlisted", "followers"],
+            following_only=True,
         )
         self.assertEqual(len(statuses), 2)
         self.assertEqual(statuses[1], public_status)
@@ -148,8 +150,8 @@ class ViewsHelpers(TestCase):
         rat.followers.add(self.local_user)
         statuses = views.helpers.get_activity_feed(
             self.local_user,
-            privacy=['public', 'unlisted', 'followers'],
-            following_only=True
+            privacy=["public", "unlisted", "followers"],
+            following_only=True,
         )
         self.assertEqual(len(statuses), 5)
         self.assertEqual(statuses[4], public_status)
@@ -158,187 +160,187 @@ class ViewsHelpers(TestCase):
         self.assertEqual(statuses[1], followers_status)
         self.assertEqual(statuses[0], rat_mention)
 
-
     def test_get_activity_feed_blocks(self):
-        ''' feed generation with blocked users '''
+        """ feed generation with blocked users """
         rat = models.User.objects.create_user(
-            'rat', 'rat@rat.rat', 'password', local=True)
+            "rat", "rat@rat.rat", "password", local=True
+        )
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             public_status = models.Comment.objects.create(
-                content='public status', book=self.book, user=self.local_user)
-            rat_public = models.Status.objects.create(
-                content='blah blah', user=rat)
+                content="public status", book=self.book, user=self.local_user
+            )
+            rat_public = models.Status.objects.create(content="blah blah", user=rat)
 
             statuses = views.helpers.get_activity_feed(
-                self.local_user, privacy=['public'])
+                self.local_user, privacy=["public"]
+            )
             self.assertEqual(len(statuses), 2)
 
         # block relationship
         rat.blocks.add(self.local_user)
-        statuses = views.helpers.get_activity_feed(
-            self.local_user, privacy=['public'])
+        statuses = views.helpers.get_activity_feed(self.local_user, privacy=["public"])
         self.assertEqual(len(statuses), 1)
         self.assertEqual(statuses[0], public_status)
 
-        statuses = views.helpers.get_activity_feed(
-            rat, privacy=['public'])
+        statuses = views.helpers.get_activity_feed(rat, privacy=["public"])
         self.assertEqual(len(statuses), 1)
         self.assertEqual(statuses[0], rat_public)
 
-
-
     def test_is_bookwyrm_request(self):
-        ''' checks if a request came from a bookwyrm instance '''
-        request = self.factory.get('', {'q': 'Test Book'})
+        """ checks if a request came from a bookwyrm instance """
+        request = self.factory.get("", {"q": "Test Book"})
         self.assertFalse(views.helpers.is_bookwyrm_request(request))
 
         request = self.factory.get(
-            '', {'q': 'Test Book'},
-            HTTP_USER_AGENT=\
-                "http.rb/4.4.1 (Mastodon/3.3.0; +https://mastodon.social/)"
+            "",
+            {"q": "Test Book"},
+            HTTP_USER_AGENT="http.rb/4.4.1 (Mastodon/3.3.0; +https://mastodon.social/)",
         )
         self.assertFalse(views.helpers.is_bookwyrm_request(request))
 
-        request = self.factory.get(
-            '', {'q': 'Test Book'}, HTTP_USER_AGENT=USER_AGENT)
+        request = self.factory.get("", {"q": "Test Book"}, HTTP_USER_AGENT=USER_AGENT)
         self.assertTrue(views.helpers.is_bookwyrm_request(request))
 
-
     def test_existing_user(self):
-        ''' simple database lookup by username '''
-        result = views.helpers.handle_remote_webfinger('@mouse@local.com')
+        """ simple database lookup by username """
+        result = views.helpers.handle_remote_webfinger("@mouse@local.com")
         self.assertEqual(result, self.local_user)
 
-        result = views.helpers.handle_remote_webfinger('mouse@local.com')
+        result = views.helpers.handle_remote_webfinger("mouse@local.com")
         self.assertEqual(result, self.local_user)
 
-
     @responses.activate
     def test_load_user(self):
-        ''' find a remote user using webfinger '''
-        username = 'mouse@example.com'
+        """ find a remote user using webfinger """
+        username = "mouse@example.com"
         wellknown = {
             "subject": "acct:mouse@example.com",
-            "links": [{
-                "rel": "self",
-                "type": "application/activity+json",
-                "href": "https://example.com/user/mouse"
-            }]
+            "links": [
+                {
+                    "rel": "self",
+                    "type": "application/activity+json",
+                    "href": "https://example.com/user/mouse",
+                }
+            ],
         }
         responses.add(
             responses.GET,
-            'https://example.com/.well-known/webfinger?resource=acct:%s' \
-                    % username,
+            "https://example.com/.well-known/webfinger?resource=acct:%s" % username,
             json=wellknown,
-            status=200)
+            status=200,
+        )
         responses.add(
             responses.GET,
-            'https://example.com/user/mouse',
+            "https://example.com/user/mouse",
             json=self.userdata,
-            status=200)
-        with patch('bookwyrm.models.user.set_remote_server.delay'):
-            result = views.helpers.handle_remote_webfinger('@mouse@example.com')
+            status=200,
+        )
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            result = views.helpers.handle_remote_webfinger("@mouse@example.com")
             self.assertIsInstance(result, models.User)
-            self.assertEqual(result.username, 'mouse@example.com')
-
+            self.assertEqual(result.username, "mouse@example.com")
 
     def test_handle_reading_status_to_read(self):
-        ''' posts shelve activities '''
-        shelf = self.local_user.shelf_set.get(identifier='to-read')
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        """ posts shelve activities """
+        shelf = self.local_user.shelf_set.get(identifier="to-read")
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             views.helpers.handle_reading_status(
-                self.local_user, shelf, self.book, 'public')
+                self.local_user, shelf, self.book, "public"
+            )
         status = models.GeneratedNote.objects.get()
         self.assertEqual(status.user, self.local_user)
         self.assertEqual(status.mention_books.first(), self.book)
-        self.assertEqual(status.content, 'wants to read')
+        self.assertEqual(status.content, "wants to read")
 
     def test_handle_reading_status_reading(self):
-        ''' posts shelve activities '''
-        shelf = self.local_user.shelf_set.get(identifier='reading')
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        """ posts shelve activities """
+        shelf = self.local_user.shelf_set.get(identifier="reading")
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             views.helpers.handle_reading_status(
-                self.local_user, shelf, self.book, 'public')
+                self.local_user, shelf, self.book, "public"
+            )
         status = models.GeneratedNote.objects.get()
         self.assertEqual(status.user, self.local_user)
         self.assertEqual(status.mention_books.first(), self.book)
-        self.assertEqual(status.content, 'started reading')
+        self.assertEqual(status.content, "started reading")
 
     def test_handle_reading_status_read(self):
-        ''' posts shelve activities '''
-        shelf = self.local_user.shelf_set.get(identifier='read')
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        """ posts shelve activities """
+        shelf = self.local_user.shelf_set.get(identifier="read")
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             views.helpers.handle_reading_status(
-                self.local_user, shelf, self.book, 'public')
+                self.local_user, shelf, self.book, "public"
+            )
         status = models.GeneratedNote.objects.get()
         self.assertEqual(status.user, self.local_user)
         self.assertEqual(status.mention_books.first(), self.book)
-        self.assertEqual(status.content, 'finished reading')
+        self.assertEqual(status.content, "finished reading")
 
     def test_handle_reading_status_other(self):
-        ''' posts shelve activities '''
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        """ posts shelve activities """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             views.helpers.handle_reading_status(
-                self.local_user, self.shelf, self.book, 'public')
+                self.local_user, self.shelf, self.book, "public"
+            )
         self.assertFalse(models.GeneratedNote.objects.exists())
 
     def test_object_visible_to_user(self):
-        ''' does a user have permission to view an object '''
+        """ does a user have permission to view an object """
         obj = models.Status.objects.create(
-            content='hi', user=self.remote_user, privacy='public')
-        self.assertTrue(
-            views.helpers.object_visible_to_user(self.local_user, obj))
+            content="hi", user=self.remote_user, privacy="public"
+        )
+        self.assertTrue(views.helpers.object_visible_to_user(self.local_user, obj))
 
         obj = models.Shelf.objects.create(
-            name='test', user=self.remote_user, privacy='unlisted')
-        self.assertTrue(
-            views.helpers.object_visible_to_user(self.local_user, obj))
+            name="test", user=self.remote_user, privacy="unlisted"
+        )
+        self.assertTrue(views.helpers.object_visible_to_user(self.local_user, obj))
 
         obj = models.Status.objects.create(
-            content='hi', user=self.remote_user, privacy='followers')
-        self.assertFalse(
-            views.helpers.object_visible_to_user(self.local_user, obj))
+            content="hi", user=self.remote_user, privacy="followers"
+        )
+        self.assertFalse(views.helpers.object_visible_to_user(self.local_user, obj))
 
         obj = models.Status.objects.create(
-            content='hi', user=self.remote_user, privacy='direct')
-        self.assertFalse(
-            views.helpers.object_visible_to_user(self.local_user, obj))
+            content="hi", user=self.remote_user, privacy="direct"
+        )
+        self.assertFalse(views.helpers.object_visible_to_user(self.local_user, obj))
 
         obj = models.Status.objects.create(
-            content='hi', user=self.remote_user, privacy='direct')
+            content="hi", user=self.remote_user, privacy="direct"
+        )
         obj.mention_users.add(self.local_user)
-        self.assertTrue(
-            views.helpers.object_visible_to_user(self.local_user, obj))
+        self.assertTrue(views.helpers.object_visible_to_user(self.local_user, obj))
 
     def test_object_visible_to_user_follower(self):
-        ''' what you can see if you follow a user '''
+        """ what you can see if you follow a user """
         self.remote_user.followers.add(self.local_user)
         obj = models.Status.objects.create(
-            content='hi', user=self.remote_user, privacy='followers')
-        self.assertTrue(
-            views.helpers.object_visible_to_user(self.local_user, obj))
+            content="hi", user=self.remote_user, privacy="followers"
+        )
+        self.assertTrue(views.helpers.object_visible_to_user(self.local_user, obj))
 
         obj = models.Status.objects.create(
-            content='hi', user=self.remote_user, privacy='direct')
-        self.assertFalse(
-            views.helpers.object_visible_to_user(self.local_user, obj))
+            content="hi", user=self.remote_user, privacy="direct"
+        )
+        self.assertFalse(views.helpers.object_visible_to_user(self.local_user, obj))
 
         obj = models.Status.objects.create(
-            content='hi', user=self.remote_user, privacy='direct')
+            content="hi", user=self.remote_user, privacy="direct"
+        )
         obj.mention_users.add(self.local_user)
-        self.assertTrue(
-            views.helpers.object_visible_to_user(self.local_user, obj))
+        self.assertTrue(views.helpers.object_visible_to_user(self.local_user, obj))
 
     def test_object_visible_to_user_blocked(self):
-        ''' you can't see it if they block you '''
+        """ you can't see it if they block you """
         self.remote_user.blocks.add(self.local_user)
         obj = models.Status.objects.create(
-            content='hi', user=self.remote_user, privacy='public')
-        self.assertFalse(
-            views.helpers.object_visible_to_user(self.local_user, obj))
+            content="hi", user=self.remote_user, privacy="public"
+        )
+        self.assertFalse(views.helpers.object_visible_to_user(self.local_user, obj))
 
         obj = models.Shelf.objects.create(
-            name='test', user=self.remote_user, privacy='unlisted')
-        self.assertFalse(
-            views.helpers.object_visible_to_user(self.local_user, obj))
+            name="test", user=self.remote_user, privacy="unlisted"
+        )
+        self.assertFalse(views.helpers.object_visible_to_user(self.local_user, obj))
diff --git a/bookwyrm/tests/views/test_import.py b/bookwyrm/tests/views/test_import.py
index ba8f2457..b98b2516 100644
--- a/bookwyrm/tests/views/test_import.py
+++ b/bookwyrm/tests/views/test_import.py
@@ -1,4 +1,4 @@
-''' test for app action functionality '''
+""" test for app action functionality """
 from unittest.mock import patch
 from django.template.response import TemplateResponse
 from django.test import TestCase
@@ -9,34 +9,37 @@ from bookwyrm import views
 
 
 class ImportViews(TestCase):
-    ''' goodreads import views '''
+    """ goodreads import views """
+
     def setUp(self):
-        ''' we need basic test data and mocks '''
+        """ we need basic test data and mocks """
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
-            'mouse@local.com', 'mouse@mouse.mouse', 'password',
-            local=True, localname='mouse')
+            "mouse@local.com",
+            "mouse@mouse.mouse",
+            "password",
+            local=True,
+            localname="mouse",
+        )
         models.SiteSettings.objects.create()
 
-
     def test_import_page(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.Import.as_view()
-        request = self.factory.get('')
+        request = self.factory.get("")
         request.user = self.local_user
         result = view(request)
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
 
-
     def test_import_status(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.ImportStatus.as_view()
         import_job = models.ImportJob.objects.create(user=self.local_user)
-        request = self.factory.get('')
+        request = self.factory.get("")
         request.user = self.local_user
-        with patch('bookwyrm.tasks.app.AsyncResult') as async_result:
+        with patch("bookwyrm.tasks.app.AsyncResult") as async_result:
             async_result.return_value = []
             result = view(request, import_job.id)
         self.assertIsInstance(result, TemplateResponse)
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index 4202979b..cab50892 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -1,4 +1,4 @@
-''' tests incoming activities'''
+""" tests incoming activities"""
 from datetime import datetime
 import json
 import pathlib
@@ -11,101 +11,100 @@ import responses
 from bookwyrm import models, views
 
 
-#pylint: disable=too-many-public-methods
+# pylint: disable=too-many-public-methods
 class Inbox(TestCase):
-    ''' readthrough tests '''
+    """ readthrough tests """
+
     def setUp(self):
-        ''' basic user and book data '''
+        """ basic user and book data """
         self.client = Client()
         self.local_user = models.User.objects.create_user(
-            'mouse@example.com', 'mouse@mouse.com', 'mouseword',
-            local=True, localname='mouse')
-        self.local_user.remote_id = 'https://example.com/user/mouse'
+            "mouse@example.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+        )
+        self.local_user.remote_id = "https://example.com/user/mouse"
         self.local_user.save(broadcast=False)
-        with patch('bookwyrm.models.user.set_remote_server.delay'):
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
             self.remote_user = models.User.objects.create_user(
-                'rat', 'rat@rat.com', 'ratword',
+                "rat",
+                "rat@rat.com",
+                "ratword",
                 local=False,
-                remote_id='https://example.com/users/rat',
-                inbox='https://example.com/users/rat/inbox',
-                outbox='https://example.com/users/rat/outbox',
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
             )
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             self.status = models.Status.objects.create(
                 user=self.local_user,
-                content='Test status',
-                remote_id='https://example.com/status/1',
+                content="Test status",
+                remote_id="https://example.com/status/1",
             )
 
         self.create_json = {
-            'id': 'hi',
-            'type': 'Create',
-            'actor': 'hi',
-            "to": [
-                "https://www.w3.org/ns/activitystreams#public"
-            ],
-            "cc": [
-                "https://example.com/user/mouse/followers"
-            ],
-            'object': {}
+            "id": "hi",
+            "type": "Create",
+            "actor": "hi",
+            "to": ["https://www.w3.org/ns/activitystreams#public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "object": {},
         }
         models.SiteSettings.objects.create()
 
-
     def test_inbox_invalid_get(self):
-        ''' shouldn't try to handle if the user is not found '''
-        result = self.client.get(
-            '/inbox', content_type="application/json"
-        )
+        """ shouldn't try to handle if the user is not found """
+        result = self.client.get("/inbox", content_type="application/json")
         self.assertIsInstance(result, HttpResponseNotAllowed)
 
     def test_inbox_invalid_user(self):
-        ''' shouldn't try to handle if the user is not found '''
+        """ shouldn't try to handle if the user is not found """
         result = self.client.post(
-            '/user/bleh/inbox',
+            "/user/bleh/inbox",
             '{"type": "Test", "object": "exists"}',
-            content_type="application/json"
+            content_type="application/json",
         )
         self.assertIsInstance(result, HttpResponseNotFound)
 
     def test_inbox_invalid_bad_signature(self):
-        ''' bad request for invalid signature '''
-        with patch('bookwyrm.views.inbox.has_valid_signature') as mock_valid:
+        """ bad request for invalid signature """
+        with patch("bookwyrm.views.inbox.has_valid_signature") as mock_valid:
             mock_valid.return_value = False
             result = self.client.post(
-                '/user/mouse/inbox',
+                "/user/mouse/inbox",
                 '{"type": "Announce", "object": "exists"}',
-                content_type="application/json"
+                content_type="application/json",
             )
             self.assertEqual(result.status_code, 401)
 
     def test_inbox_invalid_bad_signature_delete(self):
-        ''' invalid signature for Delete is okay though '''
-        with patch('bookwyrm.views.inbox.has_valid_signature') as mock_valid:
+        """ invalid signature for Delete is okay though """
+        with patch("bookwyrm.views.inbox.has_valid_signature") as mock_valid:
             mock_valid.return_value = False
             result = self.client.post(
-                '/user/mouse/inbox',
+                "/user/mouse/inbox",
                 '{"type": "Delete", "object": "exists"}',
-                content_type="application/json"
+                content_type="application/json",
             )
             self.assertEqual(result.status_code, 200)
 
     def test_inbox_unknown_type(self):
-        ''' never heard of that activity type, don't have a handler for it '''
-        with patch('bookwyrm.views.inbox.has_valid_signature') as mock_valid:
+        """ never heard of that activity type, don't have a handler for it """
+        with patch("bookwyrm.views.inbox.has_valid_signature") as mock_valid:
             result = self.client.post(
-                '/inbox',
+                "/inbox",
                 '{"type": "Fish", "object": "exists"}',
-                content_type="application/json"
+                content_type="application/json",
             )
             mock_valid.return_value = True
             self.assertIsInstance(result, HttpResponseNotFound)
 
-
     def test_inbox_success(self):
-        ''' a known type, for which we start a task '''
+        """ a known type, for which we start a task """
         activity = self.create_json
-        activity['object'] = {
+        activity["object"] = {
             "id": "https://example.com/list/22",
             "type": "BookList",
             "totalItems": 1,
@@ -113,47 +112,41 @@ class Inbox(TestCase):
             "last": "https://example.com/list/22?page=1",
             "name": "Test List",
             "owner": "https://example.com/user/mouse",
-            "to": [
-                "https://www.w3.org/ns/activitystreams#Public"
-            ],
-            "cc": [
-                "https://example.com/user/mouse/followers"
-            ],
+            "to": ["https://www.w3.org/ns/activitystreams#Public"],
+            "cc": ["https://example.com/user/mouse/followers"],
             "summary": "summary text",
             "curation": "curated",
-            "@context": "https://www.w3.org/ns/activitystreams"
+            "@context": "https://www.w3.org/ns/activitystreams",
         }
-        with patch('bookwyrm.views.inbox.has_valid_signature') as mock_valid:
+        with patch("bookwyrm.views.inbox.has_valid_signature") as mock_valid:
             mock_valid.return_value = True
 
-            with patch('bookwyrm.views.inbox.activity_task.delay'):
+            with patch("bookwyrm.views.inbox.activity_task.delay"):
                 result = self.client.post(
-                    '/inbox',
-                    json.dumps(activity),
-                    content_type="application/json"
+                    "/inbox", json.dumps(activity), content_type="application/json"
                 )
         self.assertEqual(result.status_code, 200)
 
-
     def test_handle_create_status(self):
-        ''' the "it justs works" mode '''
+        """ the "it justs works" mode """
         self.assertEqual(models.Status.objects.count(), 1)
 
-        datafile = pathlib.Path(__file__).parent.joinpath(
-            '../data/ap_quotation.json')
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_quotation.json")
         status_data = json.loads(datafile.read_bytes())
         models.Edition.objects.create(
-            title='Test Book', remote_id='https://example.com/book/1')
+            title="Test Book", remote_id="https://example.com/book/1"
+        )
         activity = self.create_json
-        activity['object'] = status_data
+        activity["object"] = status_data
 
         views.inbox.activity_task(activity)
 
         status = models.Quotation.objects.get()
         self.assertEqual(
-            status.remote_id, 'https://example.com/user/mouse/quotation/13')
-        self.assertEqual(status.quote, 'quote body')
-        self.assertEqual(status.content, 'commentary')
+            status.remote_id, "https://example.com/user/mouse/quotation/13"
+        )
+        self.assertEqual(status.quote, "quote body")
+        self.assertEqual(status.content, "commentary")
         self.assertEqual(status.user, self.local_user)
         self.assertEqual(models.Status.objects.count(), 2)
 
@@ -161,56 +154,50 @@ class Inbox(TestCase):
         views.inbox.activity_task(activity)
         self.assertEqual(models.Status.objects.count(), 2)
 
-
     def test_handle_create_status_remote_note_with_mention(self):
-        ''' should only create it under the right circumstances '''
+        """ should only create it under the right circumstances """
         self.assertEqual(models.Status.objects.count(), 1)
         self.assertFalse(
-            models.Notification.objects.filter(user=self.local_user).exists())
+            models.Notification.objects.filter(user=self.local_user).exists()
+        )
 
-        datafile = pathlib.Path(__file__).parent.joinpath(
-            '../data/ap_note.json')
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_note.json")
         status_data = json.loads(datafile.read_bytes())
         activity = self.create_json
-        activity['object'] = status_data
+        activity["object"] = status_data
 
         views.inbox.activity_task(activity)
         status = models.Status.objects.last()
-        self.assertEqual(status.content, 'test content in note')
+        self.assertEqual(status.content, "test content in note")
         self.assertEqual(status.mention_users.first(), self.local_user)
         self.assertTrue(
-            models.Notification.objects.filter(user=self.local_user).exists())
-        self.assertEqual(
-            models.Notification.objects.get().notification_type, 'MENTION')
+            models.Notification.objects.filter(user=self.local_user).exists()
+        )
+        self.assertEqual(models.Notification.objects.get().notification_type, "MENTION")
 
     def test_handle_create_status_remote_note_with_reply(self):
-        ''' should only create it under the right circumstances '''
+        """ should only create it under the right circumstances """
         self.assertEqual(models.Status.objects.count(), 1)
-        self.assertFalse(
-            models.Notification.objects.filter(user=self.local_user))
+        self.assertFalse(models.Notification.objects.filter(user=self.local_user))
 
-        datafile = pathlib.Path(__file__).parent.joinpath(
-            '../data/ap_note.json')
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_note.json")
         status_data = json.loads(datafile.read_bytes())
-        del status_data['tag']
-        status_data['inReplyTo'] = self.status.remote_id
+        del status_data["tag"]
+        status_data["inReplyTo"] = self.status.remote_id
         activity = self.create_json
-        activity['object'] = status_data
+        activity["object"] = status_data
 
         views.inbox.activity_task(activity)
         status = models.Status.objects.last()
-        self.assertEqual(status.content, 'test content in note')
+        self.assertEqual(status.content, "test content in note")
         self.assertEqual(status.reply_parent, self.status)
-        self.assertTrue(
-            models.Notification.objects.filter(user=self.local_user))
-        self.assertEqual(
-            models.Notification.objects.get().notification_type, 'REPLY')
-
+        self.assertTrue(models.Notification.objects.filter(user=self.local_user))
+        self.assertEqual(models.Notification.objects.get().notification_type, "REPLY")
 
     def test_handle_create_list(self):
-        ''' a new list '''
+        """ a new list """
         activity = self.create_json
-        activity['object'] = {
+        activity["object"] = {
             "id": "https://example.com/list/22",
             "type": "BookList",
             "totalItems": 1,
@@ -218,44 +205,38 @@ class Inbox(TestCase):
             "last": "https://example.com/list/22?page=1",
             "name": "Test List",
             "owner": "https://example.com/user/mouse",
-            "to": [
-                "https://www.w3.org/ns/activitystreams#Public"
-            ],
-            "cc": [
-                "https://example.com/user/mouse/followers"
-            ],
+            "to": ["https://www.w3.org/ns/activitystreams#Public"],
+            "cc": ["https://example.com/user/mouse/followers"],
             "summary": "summary text",
             "curation": "curated",
-            "@context": "https://www.w3.org/ns/activitystreams"
+            "@context": "https://www.w3.org/ns/activitystreams",
         }
         views.inbox.activity_task(activity)
         book_list = models.List.objects.get()
-        self.assertEqual(book_list.name, 'Test List')
-        self.assertEqual(book_list.curation, 'curated')
-        self.assertEqual(book_list.description, 'summary text')
-        self.assertEqual(book_list.remote_id, 'https://example.com/list/22')
-
+        self.assertEqual(book_list.name, "Test List")
+        self.assertEqual(book_list.curation, "curated")
+        self.assertEqual(book_list.description, "summary text")
+        self.assertEqual(book_list.remote_id, "https://example.com/list/22")
 
     def test_handle_follow_x(self):
-        ''' remote user wants to follow local user '''
+        """ remote user wants to follow local user """
         activity = {
             "@context": "https://www.w3.org/ns/activitystreams",
             "id": "https://example.com/users/rat/follows/123",
             "type": "Follow",
             "actor": "https://example.com/users/rat",
-            "object": "https://example.com/user/mouse"
+            "object": "https://example.com/user/mouse",
         }
 
         self.assertFalse(models.UserFollowRequest.objects.exists())
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay') \
-                as mock:
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
             views.inbox.activity_task(activity)
             self.assertEqual(mock.call_count, 1)
 
         # notification created
         notification = models.Notification.objects.get()
         self.assertEqual(notification.user, self.local_user)
-        self.assertEqual(notification.notification_type, 'FOLLOW')
+        self.assertEqual(notification.notification_type, "FOLLOW")
 
         # the request should have been deleted
         self.assertFalse(models.UserFollowRequest.objects.exists())
@@ -264,27 +245,26 @@ class Inbox(TestCase):
         follow = models.UserFollows.objects.get(user_object=self.local_user)
         self.assertEqual(follow.user_subject, self.remote_user)
 
-
     def test_handle_follow_manually_approved(self):
-        ''' needs approval before following '''
+        """ needs approval before following """
         activity = {
             "@context": "https://www.w3.org/ns/activitystreams",
             "id": "https://example.com/users/rat/follows/123",
             "type": "Follow",
             "actor": "https://example.com/users/rat",
-            "object": "https://example.com/user/mouse"
+            "object": "https://example.com/user/mouse",
         }
 
         self.local_user.manually_approves_followers = True
         self.local_user.save(broadcast=False)
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             views.inbox.activity_task(activity)
 
         # notification created
         notification = models.Notification.objects.get()
         self.assertEqual(notification.user, self.local_user)
-        self.assertEqual(notification.notification_type, 'FOLLOW_REQUEST')
+        self.assertEqual(notification.notification_type, "FOLLOW_REQUEST")
 
         # the request should exist
         request = models.UserFollowRequest.objects.get()
@@ -295,38 +275,36 @@ class Inbox(TestCase):
         follow = models.UserFollows.objects.all()
         self.assertEqual(list(follow), [])
 
-
     def test_handle_unfollow(self):
-        ''' remove a relationship '''
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        """ remove a relationship """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             rel = models.UserFollows.objects.create(
-                user_subject=self.remote_user, user_object=self.local_user)
+                user_subject=self.remote_user, user_object=self.local_user
+            )
         activity = {
             "type": "Undo",
             "id": "bleh",
             "to": ["https://www.w3.org/ns/activitystreams#Public"],
             "cc": ["https://example.com/user/mouse/followers"],
-            'actor': self.remote_user.remote_id,
+            "actor": self.remote_user.remote_id,
             "@context": "https://www.w3.org/ns/activitystreams",
             "object": {
                 "id": rel.remote_id,
                 "type": "Follow",
                 "actor": "https://example.com/users/rat",
-                "object": "https://example.com/user/mouse"
-            }
+                "object": "https://example.com/user/mouse",
+            },
         }
         self.assertEqual(self.remote_user, self.local_user.followers.first())
 
         views.inbox.activity_task(activity)
         self.assertIsNone(self.local_user.followers.first())
 
-
     def test_handle_follow_accept(self):
-        ''' a remote user approved a follow request from local '''
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        """ a remote user approved a follow request from local """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             rel = models.UserFollowRequest.objects.create(
-                user_subject=self.local_user,
-                user_object=self.remote_user
+                user_subject=self.local_user, user_object=self.remote_user
             )
         activity = {
             "@context": "https://www.w3.org/ns/activitystreams",
@@ -337,8 +315,8 @@ class Inbox(TestCase):
                 "id": rel.remote_id,
                 "type": "Follow",
                 "actor": "https://example.com/user/mouse",
-                "object": "https://example.com/users/rat"
-            }
+                "object": "https://example.com/users/rat",
+            },
         }
 
         self.assertEqual(models.UserFollowRequest.objects.count(), 1)
@@ -353,13 +331,11 @@ class Inbox(TestCase):
         self.assertEqual(follows.count(), 1)
         self.assertEqual(follows.first(), self.local_user)
 
-
     def test_handle_follow_reject(self):
-        ''' turn down a follow request '''
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        """ turn down a follow request """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             rel = models.UserFollowRequest.objects.create(
-                user_subject=self.local_user,
-                user_object=self.remote_user
+                user_subject=self.local_user, user_object=self.remote_user
             )
         activity = {
             "@context": "https://www.w3.org/ns/activitystreams",
@@ -370,8 +346,8 @@ class Inbox(TestCase):
                 "id": rel.remote_id,
                 "type": "Follow",
                 "actor": "https://example.com/user/mouse",
-                "object": "https://example.com/users/rat"
-            }
+                "object": "https://example.com/users/rat",
+            },
         }
 
         self.assertEqual(models.UserFollowRequest.objects.count(), 1)
@@ -382,18 +358,19 @@ class Inbox(TestCase):
         self.assertFalse(models.UserFollowRequest.objects.exists())
         self.assertFalse(self.remote_user.followers.exists())
 
-
     def test_handle_update_list(self):
-        ''' a new list '''
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        """ a new list """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             book_list = models.List.objects.create(
-                name='hi', remote_id='https://example.com/list/22',
-                user=self.local_user)
+                name="hi", remote_id="https://example.com/list/22", user=self.local_user
+            )
         activity = {
-            'type': 'Update',
-            'to': [], 'cc': [], 'actor': 'hi',
-            'id': 'sdkjf',
-            'object': {
+            "type": "Update",
+            "to": [],
+            "cc": [],
+            "actor": "hi",
+            "id": "sdkjf",
+            "object": {
                 "id": "https://example.com/list/22",
                 "type": "BookList",
                 "totalItems": 1,
@@ -401,38 +378,33 @@ class Inbox(TestCase):
                 "last": "https://example.com/list/22?page=1",
                 "name": "Test List",
                 "owner": "https://example.com/user/mouse",
-                "to": [
-                    "https://www.w3.org/ns/activitystreams#Public"
-                ],
-                "cc": [
-                    "https://example.com/user/mouse/followers"
-                ],
+                "to": ["https://www.w3.org/ns/activitystreams#Public"],
+                "cc": ["https://example.com/user/mouse/followers"],
                 "summary": "summary text",
                 "curation": "curated",
-                "@context": "https://www.w3.org/ns/activitystreams"
-            }
+                "@context": "https://www.w3.org/ns/activitystreams",
+            },
         }
         views.inbox.activity_task(activity)
         book_list.refresh_from_db()
-        self.assertEqual(book_list.name, 'Test List')
-        self.assertEqual(book_list.curation, 'curated')
-        self.assertEqual(book_list.description, 'summary text')
-        self.assertEqual(book_list.remote_id, 'https://example.com/list/22')
-
+        self.assertEqual(book_list.name, "Test List")
+        self.assertEqual(book_list.curation, "curated")
+        self.assertEqual(book_list.description, "summary text")
+        self.assertEqual(book_list.remote_id, "https://example.com/list/22")
 
     def test_handle_delete_status(self):
-        ''' remove a status '''
+        """ remove a status """
         self.status.user = self.remote_user
         self.status.save(broadcast=False)
 
         self.assertFalse(self.status.deleted)
         activity = {
-            'type': 'Delete',
+            "type": "Delete",
             "to": ["https://www.w3.org/ns/activitystreams#Public"],
             "cc": ["https://example.com/user/mouse/followers"],
-            'id': '%s/activity' % self.status.remote_id,
-            'actor': self.remote_user.remote_id,
-            'object': {'id': self.status.remote_id, 'type': 'Tombstone'},
+            "id": "%s/activity" % self.status.remote_id,
+            "actor": self.remote_user.remote_id,
+            "object": {"id": self.status.remote_id, "type": "Tombstone"},
         }
         views.inbox.activity_task(activity)
         # deletion doens't remove the status, it turns it into a tombstone
@@ -440,30 +412,28 @@ class Inbox(TestCase):
         self.assertTrue(status.deleted)
         self.assertIsInstance(status.deleted_date, datetime)
 
-
     def test_handle_delete_status_notifications(self):
-        ''' remove a status with related notifications '''
+        """ remove a status with related notifications """
         self.status.user = self.remote_user
         self.status.save(broadcast=False)
         models.Notification.objects.create(
             related_status=self.status,
             user=self.local_user,
-            notification_type='MENTION'
+            notification_type="MENTION",
         )
         # this one is innocent, don't delete it
         notif = models.Notification.objects.create(
-            user=self.local_user,
-            notification_type='MENTION'
+            user=self.local_user, notification_type="MENTION"
         )
         self.assertFalse(self.status.deleted)
         self.assertEqual(models.Notification.objects.count(), 2)
         activity = {
-            'type': 'Delete',
+            "type": "Delete",
             "to": ["https://www.w3.org/ns/activitystreams#Public"],
             "cc": ["https://example.com/user/mouse/followers"],
-            'id': '%s/activity' % self.status.remote_id,
-            'actor': self.remote_user.remote_id,
-            'object': {'id': self.status.remote_id, 'type': 'Tombstone'},
+            "id": "%s/activity" % self.status.remote_id,
+            "actor": self.remote_user.remote_id,
+            "object": {"id": self.status.remote_id, "type": "Tombstone"},
         }
         views.inbox.activity_task(activity)
         # deletion doens't remove the status, it turns it into a tombstone
@@ -475,34 +445,33 @@ class Inbox(TestCase):
         self.assertEqual(models.Notification.objects.count(), 1)
         self.assertEqual(models.Notification.objects.get(), notif)
 
-
     def test_handle_favorite(self):
-        ''' fav a status '''
+        """ fav a status """
         activity = {
-            '@context': 'https://www.w3.org/ns/activitystreams',
-            'id': 'https://example.com/fav/1',
-            'actor': 'https://example.com/users/rat',
-            'type': 'Like',
-            'published': 'Mon, 25 May 2020 19:31:20 GMT',
-            'object': self.status.remote_id,
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "id": "https://example.com/fav/1",
+            "actor": "https://example.com/users/rat",
+            "type": "Like",
+            "published": "Mon, 25 May 2020 19:31:20 GMT",
+            "object": self.status.remote_id,
         }
 
         views.inbox.activity_task(activity)
 
-        fav = models.Favorite.objects.get(remote_id='https://example.com/fav/1')
+        fav = models.Favorite.objects.get(remote_id="https://example.com/fav/1")
         self.assertEqual(fav.status, self.status)
-        self.assertEqual(fav.remote_id, 'https://example.com/fav/1')
+        self.assertEqual(fav.remote_id, "https://example.com/fav/1")
         self.assertEqual(fav.user, self.remote_user)
 
     def test_ignore_favorite(self):
-        ''' don't try to save an unknown status '''
+        """ don't try to save an unknown status """
         activity = {
-            '@context': 'https://www.w3.org/ns/activitystreams',
-            'id': 'https://example.com/fav/1',
-            'actor': 'https://example.com/users/rat',
-            'type': 'Like',
-            'published': 'Mon, 25 May 2020 19:31:20 GMT',
-            'object': 'https://unknown.status/not-found',
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "id": "https://example.com/fav/1",
+            "actor": "https://example.com/users/rat",
+            "type": "Like",
+            "published": "Mon, 25 May 2020 19:31:20 GMT",
+            "object": "https://unknown.status/not-found",
         }
 
         views.inbox.activity_task(activity)
@@ -510,43 +479,42 @@ class Inbox(TestCase):
         self.assertFalse(models.Favorite.objects.exists())
 
     def test_handle_unfavorite(self):
-        ''' fav a status '''
+        """ fav a status """
         activity = {
-            'id': 'https://example.com/fav/1#undo',
-            'type': 'Undo',
+            "id": "https://example.com/fav/1#undo",
+            "type": "Undo",
             "to": ["https://www.w3.org/ns/activitystreams#Public"],
             "cc": ["https://example.com/user/mouse/followers"],
-            'actor': self.remote_user.remote_id,
-            'object': {
-                '@context': 'https://www.w3.org/ns/activitystreams',
-                'id': 'https://example.com/fav/1',
-                'actor': 'https://example.com/users/rat',
-                'type': 'Like',
-                'published': 'Mon, 25 May 2020 19:31:20 GMT',
-                'object': self.status.remote_id,
-            }
+            "actor": self.remote_user.remote_id,
+            "object": {
+                "@context": "https://www.w3.org/ns/activitystreams",
+                "id": "https://example.com/fav/1",
+                "actor": "https://example.com/users/rat",
+                "type": "Like",
+                "published": "Mon, 25 May 2020 19:31:20 GMT",
+                "object": self.status.remote_id,
+            },
         }
         models.Favorite.objects.create(
             status=self.status,
             user=self.remote_user,
-            remote_id='https://example.com/fav/1')
+            remote_id="https://example.com/fav/1",
+        )
         self.assertEqual(models.Favorite.objects.count(), 1)
 
         views.inbox.activity_task(activity)
         self.assertEqual(models.Favorite.objects.count(), 0)
 
-
     def test_handle_boost(self):
-        ''' boost a status '''
+        """ boost a status """
         self.assertEqual(models.Notification.objects.count(), 0)
         activity = {
-            'type': 'Announce',
-            'id': '%s/boost' % self.status.remote_id,
-            'actor': self.remote_user.remote_id,
-            'object': self.status.remote_id,
+            "type": "Announce",
+            "id": "%s/boost" % self.status.remote_id,
+            "actor": self.remote_user.remote_id,
+            "object": self.status.remote_id,
         }
-        with patch('bookwyrm.models.status.Status.ignore_activity') \
-                as discarder:
+        with patch("bookwyrm.models.status.Status.ignore_activity") as discarder:
             discarder.return_value = False
             views.inbox.activity_task(activity)
         boost = models.Boost.objects.get()
@@ -555,59 +523,56 @@ class Inbox(TestCase):
         self.assertEqual(notification.user, self.local_user)
         self.assertEqual(notification.related_status, self.status)
 
-
     @responses.activate
     def test_handle_discarded_boost(self):
-        ''' test a boost of a mastodon status that will be discarded '''
+        """ test a boost of a mastodon status that will be discarded """
         status = models.Status(
-            content='hi',
+            content="hi",
             user=self.remote_user,
         )
         status.save(broadcast=False)
         activity = {
-            'type': 'Announce',
-            'id': 'http://www.faraway.com/boost/12',
-            'actor': self.remote_user.remote_id,
-            'object': status.remote_id,
+            "type": "Announce",
+            "id": "http://www.faraway.com/boost/12",
+            "actor": self.remote_user.remote_id,
+            "object": status.remote_id,
         }
         responses.add(
-            responses.GET,
-            status.remote_id,
-            json=status.to_activity(),
-            status=200)
+            responses.GET, status.remote_id, json=status.to_activity(), status=200
+        )
         views.inbox.activity_task(activity)
         self.assertEqual(models.Boost.objects.count(), 0)
 
-
     def test_handle_unboost(self):
-        ''' undo a boost '''
+        """ undo a boost """
         boost = models.Boost.objects.create(
-            boosted_status=self.status, user=self.remote_user)
+            boosted_status=self.status, user=self.remote_user
+        )
         activity = {
-            'type': 'Undo',
-            'actor': 'hi',
-            'id': 'bleh',
+            "type": "Undo",
+            "actor": "hi",
+            "id": "bleh",
             "to": ["https://www.w3.org/ns/activitystreams#public"],
             "cc": ["https://example.com/user/mouse/followers"],
-            'object': {
-                'type': 'Announce',
-                'id': boost.remote_id,
-                'actor': self.remote_user.remote_id,
-                'object': self.status.remote_id,
-            }
+            "object": {
+                "type": "Announce",
+                "id": boost.remote_id,
+                "actor": self.remote_user.remote_id,
+                "object": self.status.remote_id,
+            },
         }
         views.inbox.activity_task(activity)
 
-
     def test_handle_add_book_to_shelf(self):
-        ''' shelving a book '''
-        work = models.Work.objects.create(title='work title')
+        """ shelving a book """
+        work = models.Work.objects.create(title="work title")
         book = models.Edition.objects.create(
-            title='Test', remote_id='https://bookwyrm.social/book/37292',
-            parent_work=work)
-        shelf = models.Shelf.objects.create(
-            user=self.remote_user, name='Test Shelf')
-        shelf.remote_id = 'https://bookwyrm.social/user/mouse/shelf/to-read'
+            title="Test",
+            remote_id="https://bookwyrm.social/book/37292",
+            parent_work=work,
+        )
+        shelf = models.Shelf.objects.create(user=self.remote_user, name="Test Shelf")
+        shelf.remote_id = "https://bookwyrm.social/user/mouse/shelf/to-read"
         shelf.save()
 
         activity = {
@@ -621,23 +586,24 @@ class Inbox(TestCase):
                 "id": "https://bookwyrm.social/book/37292",
             },
             "target": "https://bookwyrm.social/user/mouse/shelf/to-read",
-            "@context": "https://www.w3.org/ns/activitystreams"
+            "@context": "https://www.w3.org/ns/activitystreams",
         }
         views.inbox.activity_task(activity)
         self.assertEqual(shelf.books.first(), book)
 
-
     @responses.activate
     def test_handle_add_book_to_list(self):
-        ''' listing a book '''
-        work = models.Work.objects.create(title='work title')
+        """ listing a book """
+        work = models.Work.objects.create(title="work title")
         book = models.Edition.objects.create(
-            title='Test', remote_id='https://bookwyrm.social/book/37292',
-            parent_work=work)
+            title="Test",
+            remote_id="https://bookwyrm.social/book/37292",
+            parent_work=work,
+        )
 
         responses.add(
             responses.GET,
-            'https://bookwyrm.social/user/mouse/list/to-read',
+            "https://bookwyrm.social/user/mouse/list/to-read",
             json={
                 "id": "https://example.com/list/22",
                 "type": "BookList",
@@ -646,16 +612,12 @@ class Inbox(TestCase):
                 "last": "https://example.com/list/22?page=1",
                 "name": "Test List",
                 "owner": "https://example.com/user/mouse",
-                "to": [
-                    "https://www.w3.org/ns/activitystreams#Public"
-                ],
-                "cc": [
-                    "https://example.com/user/mouse/followers"
-                ],
+                "to": ["https://www.w3.org/ns/activitystreams#Public"],
+                "cc": ["https://example.com/user/mouse/followers"],
                 "summary": "summary text",
                 "curation": "curated",
-                "@context": "https://www.w3.org/ns/activitystreams"
-            }
+                "@context": "https://www.w3.org/ns/activitystreams",
+            },
         )
 
         activity = {
@@ -669,26 +631,27 @@ class Inbox(TestCase):
                 "id": "https://bookwyrm.social/book/37292",
             },
             "target": "https://bookwyrm.social/user/mouse/list/to-read",
-            "@context": "https://www.w3.org/ns/activitystreams"
+            "@context": "https://www.w3.org/ns/activitystreams",
         }
         views.inbox.activity_task(activity)
 
         booklist = models.List.objects.get()
-        self.assertEqual(booklist.name, 'Test List')
+        self.assertEqual(booklist.name, "Test List")
         self.assertEqual(booklist.books.first(), book)
 
-
     @responses.activate
     def test_handle_tag_book(self):
-        ''' listing a book '''
-        work = models.Work.objects.create(title='work title')
+        """ listing a book """
+        work = models.Work.objects.create(title="work title")
         book = models.Edition.objects.create(
-            title='Test', remote_id='https://bookwyrm.social/book/37292',
-            parent_work=work)
+            title="Test",
+            remote_id="https://bookwyrm.social/book/37292",
+            parent_work=work,
+        )
 
         responses.add(
             responses.GET,
-            'https://www.example.com/tag/cool-tag',
+            "https://www.example.com/tag/cool-tag",
             json={
                 "id": "https://1b1a78582461.ngrok.io/tag/tag",
                 "type": "OrderedCollection",
@@ -696,8 +659,8 @@ class Inbox(TestCase):
                 "first": "https://1b1a78582461.ngrok.io/tag/tag?page=1",
                 "last": "https://1b1a78582461.ngrok.io/tag/tag?page=1",
                 "name": "cool tag",
-                "@context": "https://www.w3.org/ns/activitystreams"
-            }
+                "@context": "https://www.w3.org/ns/activitystreams",
+            },
         )
 
         activity = {
@@ -711,95 +674,101 @@ class Inbox(TestCase):
                 "id": "https://bookwyrm.social/book/37292",
             },
             "target": "https://www.example.com/tag/cool-tag",
-            "@context": "https://www.w3.org/ns/activitystreams"
+            "@context": "https://www.w3.org/ns/activitystreams",
         }
         views.inbox.activity_task(activity)
 
         tag = models.Tag.objects.get()
         self.assertFalse(models.List.objects.exists())
-        self.assertEqual(tag.name, 'cool tag')
+        self.assertEqual(tag.name, "cool tag")
         self.assertEqual(tag.books.first(), book)
 
-
     def test_handle_update_user(self):
-        ''' update an existing user '''
+        """ update an existing user """
         # we only do this with remote users
         self.local_user.local = False
         self.local_user.save()
 
-        datafile = pathlib.Path(__file__).parent.joinpath(
-            '../data/ap_user.json')
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json")
         userdata = json.loads(datafile.read_bytes())
-        del userdata['icon']
+        del userdata["icon"]
         self.assertIsNone(self.local_user.name)
-        views.inbox.activity_task({
-            'type': 'Update',
-            'to': [], 'cc': [], 'actor': 'hi',
-            'id': 'sdkjf',
-            'object': userdata
-        })
+        views.inbox.activity_task(
+            {
+                "type": "Update",
+                "to": [],
+                "cc": [],
+                "actor": "hi",
+                "id": "sdkjf",
+                "object": userdata,
+            }
+        )
         user = models.User.objects.get(id=self.local_user.id)
-        self.assertEqual(user.name, 'MOUSE?? MOUSE!!')
-        self.assertEqual(user.username, 'mouse@example.com')
-        self.assertEqual(user.localname, 'mouse')
-
+        self.assertEqual(user.name, "MOUSE?? MOUSE!!")
+        self.assertEqual(user.username, "mouse@example.com")
+        self.assertEqual(user.localname, "mouse")
 
     def test_handle_update_edition(self):
-        ''' update an existing edition '''
-        datafile = pathlib.Path(__file__).parent.joinpath(
-            '../data/bw_edition.json')
+        """ update an existing edition """
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/bw_edition.json")
         bookdata = json.loads(datafile.read_bytes())
 
         models.Work.objects.create(
-            title='Test Work', remote_id='https://bookwyrm.social/book/5988')
+            title="Test Work", remote_id="https://bookwyrm.social/book/5988"
+        )
         book = models.Edition.objects.create(
-            title='Test Book', remote_id='https://bookwyrm.social/book/5989')
+            title="Test Book", remote_id="https://bookwyrm.social/book/5989"
+        )
 
-        del bookdata['authors']
-        self.assertEqual(book.title, 'Test Book')
+        del bookdata["authors"]
+        self.assertEqual(book.title, "Test Book")
 
-        with patch(
-                'bookwyrm.activitypub.base_activity.set_related_field.delay'):
-            views.inbox.activity_task({
-                'type': 'Update',
-                'to': [], 'cc': [], 'actor': 'hi',
-                'id': 'sdkjf',
-                'object': bookdata
-            })
+        with patch("bookwyrm.activitypub.base_activity.set_related_field.delay"):
+            views.inbox.activity_task(
+                {
+                    "type": "Update",
+                    "to": [],
+                    "cc": [],
+                    "actor": "hi",
+                    "id": "sdkjf",
+                    "object": bookdata,
+                }
+            )
         book = models.Edition.objects.get(id=book.id)
-        self.assertEqual(book.title, 'Piranesi')
-
+        self.assertEqual(book.title, "Piranesi")
 
     def test_handle_update_work(self):
-        ''' update an existing edition '''
-        datafile = pathlib.Path(__file__).parent.joinpath(
-            '../data/bw_work.json')
+        """ update an existing edition """
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/bw_work.json")
         bookdata = json.loads(datafile.read_bytes())
 
         book = models.Work.objects.create(
-            title='Test Book', remote_id='https://bookwyrm.social/book/5988')
+            title="Test Book", remote_id="https://bookwyrm.social/book/5988"
+        )
 
-        del bookdata['authors']
-        self.assertEqual(book.title, 'Test Book')
-        with patch(
-                'bookwyrm.activitypub.base_activity.set_related_field.delay'):
-            views.inbox.activity_task({
-                'type': 'Update',
-                'to': [], 'cc': [], 'actor': 'hi',
-                'id': 'sdkjf',
-                'object': bookdata
-            })
+        del bookdata["authors"]
+        self.assertEqual(book.title, "Test Book")
+        with patch("bookwyrm.activitypub.base_activity.set_related_field.delay"):
+            views.inbox.activity_task(
+                {
+                    "type": "Update",
+                    "to": [],
+                    "cc": [],
+                    "actor": "hi",
+                    "id": "sdkjf",
+                    "object": bookdata,
+                }
+            )
         book = models.Work.objects.get(id=book.id)
-        self.assertEqual(book.title, 'Piranesi')
-
+        self.assertEqual(book.title, "Piranesi")
 
     def test_handle_blocks(self):
-        ''' create a "block" database entry from an activity '''
+        """ create a "block" database entry from an activity """
         self.local_user.followers.add(self.remote_user)
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             models.UserFollowRequest.objects.create(
-                user_subject=self.local_user,
-                user_object=self.remote_user)
+                user_subject=self.local_user, user_object=self.remote_user
+            )
         self.assertTrue(models.UserFollows.objects.exists())
         self.assertTrue(models.UserFollowRequest.objects.exists())
 
@@ -808,42 +777,41 @@ class Inbox(TestCase):
             "id": "https://example.com/9e1f41ac-9ddd-4159",
             "type": "Block",
             "actor": "https://example.com/users/rat",
-            "object": "https://example.com/user/mouse"
+            "object": "https://example.com/user/mouse",
         }
 
         views.inbox.activity_task(activity)
         block = models.UserBlocks.objects.get()
         self.assertEqual(block.user_subject, self.remote_user)
         self.assertEqual(block.user_object, self.local_user)
-        self.assertEqual(
-            block.remote_id, 'https://example.com/9e1f41ac-9ddd-4159')
+        self.assertEqual(block.remote_id, "https://example.com/9e1f41ac-9ddd-4159")
 
         self.assertFalse(models.UserFollows.objects.exists())
         self.assertFalse(models.UserFollowRequest.objects.exists())
 
-
     def test_handle_unblock(self):
-        ''' unblock a user '''
+        """ unblock a user """
         self.remote_user.blocks.add(self.local_user)
 
         block = models.UserBlocks.objects.get()
-        block.remote_id = 'https://example.com/9e1f41ac-9ddd-4159'
+        block.remote_id = "https://example.com/9e1f41ac-9ddd-4159"
         block.save()
 
         self.assertEqual(block.user_subject, self.remote_user)
         self.assertEqual(block.user_object, self.local_user)
         activity = {
-            'type': 'Undo',
-            'actor': 'hi',
-            'id': 'bleh',
+            "type": "Undo",
+            "actor": "hi",
+            "id": "bleh",
             "to": ["https://www.w3.org/ns/activitystreams#public"],
             "cc": ["https://example.com/user/mouse/followers"],
-            'object': {
+            "object": {
                 "@context": "https://www.w3.org/ns/activitystreams",
                 "id": "https://example.com/9e1f41ac-9ddd-4159",
                 "type": "Block",
                 "actor": "https://example.com/users/rat",
-                "object": "https://example.com/user/mouse"
-            }}
+                "object": "https://example.com/user/mouse",
+            },
+        }
         views.inbox.activity_task(activity)
         self.assertFalse(models.UserBlocks.objects.exists())
diff --git a/bookwyrm/tests/views/test_interaction.py b/bookwyrm/tests/views/test_interaction.py
index c6d39f29..857f7061 100644
--- a/bookwyrm/tests/views/test_interaction.py
+++ b/bookwyrm/tests/views/test_interaction.py
@@ -1,4 +1,4 @@
-''' test for app action functionality '''
+""" test for app action functionality """
 from unittest.mock import patch
 from django.test import TestCase
 from django.test.client import RequestFactory
@@ -7,40 +7,44 @@ from bookwyrm import models, views
 
 
 class InteractionViews(TestCase):
-    ''' viewing and creating statuses '''
+    """ viewing and creating statuses """
+
     def setUp(self):
-        ''' we need basic test data and mocks '''
+        """ we need basic test data and mocks """
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
-            'mouse@local.com', 'mouse@mouse.com', 'mouseword',
-            local=True, localname='mouse',
-            remote_id='https://example.com/users/mouse',
+            "mouse@local.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+            remote_id="https://example.com/users/mouse",
         )
-        with patch('bookwyrm.models.user.set_remote_server'):
+        with patch("bookwyrm.models.user.set_remote_server"):
             self.remote_user = models.User.objects.create_user(
-                'rat', 'rat@email.com', 'ratword',
+                "rat",
+                "rat@email.com",
+                "ratword",
                 local=False,
-                remote_id='https://example.com/users/rat',
-                inbox='https://example.com/users/rat/inbox',
-                outbox='https://example.com/users/rat/outbox',
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
             )
 
-        work = models.Work.objects.create(title='Test Work')
+        work = models.Work.objects.create(title="Test Work")
         self.book = models.Edition.objects.create(
-            title='Example Edition',
-            remote_id='https://example.com/book/1',
-            parent_work=work
+            title="Example Edition",
+            remote_id="https://example.com/book/1",
+            parent_work=work,
         )
 
-
     def test_handle_favorite(self):
-        ''' create and broadcast faving a status '''
+        """ create and broadcast faving a status """
         view = views.Favorite.as_view()
-        request = self.factory.post('')
+        request = self.factory.post("")
         request.user = self.remote_user
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            status = models.Status.objects.create(
-                user=self.local_user, content='hi')
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            status = models.Status.objects.create(user=self.local_user, content="hi")
 
             view(request, status.id)
         fav = models.Favorite.objects.get()
@@ -48,106 +52,100 @@ class InteractionViews(TestCase):
         self.assertEqual(fav.user, self.remote_user)
 
         notification = models.Notification.objects.get()
-        self.assertEqual(notification.notification_type, 'FAVORITE')
+        self.assertEqual(notification.notification_type, "FAVORITE")
         self.assertEqual(notification.user, self.local_user)
         self.assertEqual(notification.related_user, self.remote_user)
 
-
     def test_handle_unfavorite(self):
-        ''' unfav a status '''
+        """ unfav a status """
         view = views.Unfavorite.as_view()
-        request = self.factory.post('')
+        request = self.factory.post("")
         request.user = self.remote_user
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            status = models.Status.objects.create(
-                user=self.local_user, content='hi')
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            status = models.Status.objects.create(user=self.local_user, content="hi")
             views.Favorite.as_view()(request, status.id)
 
         self.assertEqual(models.Favorite.objects.count(), 1)
         self.assertEqual(models.Notification.objects.count(), 1)
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             view(request, status.id)
         self.assertEqual(models.Favorite.objects.count(), 0)
         self.assertEqual(models.Notification.objects.count(), 0)
 
-
     def test_handle_boost(self):
-        ''' boost a status '''
+        """ boost a status """
         view = views.Boost.as_view()
-        request = self.factory.post('')
+        request = self.factory.post("")
         request.user = self.remote_user
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            status = models.Status.objects.create(
-                user=self.local_user, content='hi')
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            status = models.Status.objects.create(user=self.local_user, content="hi")
 
             view(request, status.id)
 
         boost = models.Boost.objects.get()
         self.assertEqual(boost.boosted_status, status)
         self.assertEqual(boost.user, self.remote_user)
-        self.assertEqual(boost.privacy, 'public')
+        self.assertEqual(boost.privacy, "public")
 
         notification = models.Notification.objects.get()
-        self.assertEqual(notification.notification_type, 'BOOST')
+        self.assertEqual(notification.notification_type, "BOOST")
         self.assertEqual(notification.user, self.local_user)
         self.assertEqual(notification.related_user, self.remote_user)
         self.assertEqual(notification.related_status, status)
 
     def test_handle_boost_unlisted(self):
-        ''' boost a status '''
+        """ boost a status """
         view = views.Boost.as_view()
-        request = self.factory.post('')
+        request = self.factory.post("")
         request.user = self.local_user
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             status = models.Status.objects.create(
-                user=self.local_user, content='hi', privacy='unlisted')
+                user=self.local_user, content="hi", privacy="unlisted"
+            )
 
             view(request, status.id)
 
         boost = models.Boost.objects.get()
-        self.assertEqual(boost.privacy, 'unlisted')
+        self.assertEqual(boost.privacy, "unlisted")
 
     def test_handle_boost_private(self):
-        ''' boost a status '''
+        """ boost a status """
         view = views.Boost.as_view()
-        request = self.factory.post('')
+        request = self.factory.post("")
         request.user = self.local_user
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             status = models.Status.objects.create(
-                user=self.local_user, content='hi', privacy='followers')
+                user=self.local_user, content="hi", privacy="followers"
+            )
 
             view(request, status.id)
         self.assertFalse(models.Boost.objects.exists())
 
     def test_handle_boost_twice(self):
-        ''' boost a status '''
+        """ boost a status """
         view = views.Boost.as_view()
-        request = self.factory.post('')
+        request = self.factory.post("")
         request.user = self.local_user
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            status = models.Status.objects.create(
-                user=self.local_user, content='hi')
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            status = models.Status.objects.create(user=self.local_user, content="hi")
 
             view(request, status.id)
             view(request, status.id)
         self.assertEqual(models.Boost.objects.count(), 1)
 
-
     def test_handle_unboost(self):
-        ''' undo a boost '''
+        """ undo a boost """
         view = views.Unboost.as_view()
-        request = self.factory.post('')
+        request = self.factory.post("")
         request.user = self.local_user
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            status = models.Status.objects.create(
-                user=self.local_user, content='hi')
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            status = models.Status.objects.create(user=self.local_user, content="hi")
             views.Boost.as_view()(request, status.id)
 
         self.assertEqual(models.Boost.objects.count(), 1)
         self.assertEqual(models.Notification.objects.count(), 1)
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay') \
-                as mock:
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
             view(request, status.id)
             self.assertEqual(mock.call_count, 1)
         self.assertEqual(models.Boost.objects.count(), 0)
diff --git a/bookwyrm/tests/views/test_invite.py b/bookwyrm/tests/views/test_invite.py
index e93e7209..cd2276c0 100644
--- a/bookwyrm/tests/views/test_invite.py
+++ b/bookwyrm/tests/views/test_invite.py
@@ -1,4 +1,4 @@
-''' test for app action functionality '''
+""" test for app action functionality """
 from unittest.mock import patch
 
 from django.contrib.auth.models import AnonymousUser
@@ -11,36 +11,39 @@ from bookwyrm import views
 
 
 class InviteViews(TestCase):
-    ''' every response to a get request, html or json '''
+    """ every response to a get request, html or json """
+
     def setUp(self):
-        ''' we need basic test data and mocks '''
+        """ we need basic test data and mocks """
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
-            'mouse@local.com', 'mouse@mouse.mouse', 'password',
-            local=True, localname='mouse')
+            "mouse@local.com",
+            "mouse@mouse.mouse",
+            "password",
+            local=True,
+            localname="mouse",
+        )
         models.SiteSettings.objects.create()
 
-
     def test_invite_page(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.Invite.as_view()
-        models.SiteInvite.objects.create(code='hi', user=self.local_user)
-        request = self.factory.get('')
+        models.SiteInvite.objects.create(code="hi", user=self.local_user)
+        request = self.factory.get("")
         request.user = AnonymousUser
         # why?? this is annoying.
         request.user.is_authenticated = False
-        with patch('bookwyrm.models.site.SiteInvite.valid') as invite:
+        with patch("bookwyrm.models.site.SiteInvite.valid") as invite:
             invite.return_value = True
-            result = view(request, 'hi')
+            result = view(request, "hi")
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
 
-
     def test_manage_invites(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.ManageInvites.as_view()
-        request = self.factory.get('')
+        request = self.factory.get("")
         request.user = self.local_user
         request.user.is_superuser = True
         result = view(request)
diff --git a/bookwyrm/tests/views/test_isbn.py b/bookwyrm/tests/views/test_isbn.py
index 1966702b..c7ae1f39 100644
--- a/bookwyrm/tests/views/test_isbn.py
+++ b/bookwyrm/tests/views/test_isbn.py
@@ -1,4 +1,4 @@
-''' test for app action functionality '''
+""" test for app action functionality """
 import json
 from unittest.mock import patch
 
@@ -13,42 +13,41 @@ from bookwyrm.settings import DOMAIN
 
 
 class IsbnViews(TestCase):
-    ''' tag views'''
+    """ tag views"""
+
     def setUp(self):
-        ''' we need basic test data and mocks '''
+        """ we need basic test data and mocks """
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
-            'mouse@local.com', 'mouse@mouse.com', 'mouseword',
-            local=True, localname='mouse',
-            remote_id='https://example.com/users/mouse',
+            "mouse@local.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+            remote_id="https://example.com/users/mouse",
         )
-        self.work = models.Work.objects.create(title='Test Work')
+        self.work = models.Work.objects.create(title="Test Work")
         self.book = models.Edition.objects.create(
-            title='Test Book',
-            isbn_13='1234567890123',
-            remote_id='https://example.com/book/1',
-            parent_work=self.work
+            title="Test Book",
+            isbn_13="1234567890123",
+            remote_id="https://example.com/book/1",
+            parent_work=self.work,
         )
         models.Connector.objects.create(
-            identifier='self',
-            connector_file='self_connector',
-            local=True
+            identifier="self", connector_file="self_connector", local=True
         )
         models.SiteSettings.objects.create()
 
-
     def test_isbn_json_response(self):
-        ''' searches local data only and returns book data in json format '''
+        """ searches local data only and returns book data in json format """
         view = views.Isbn.as_view()
-        request = self.factory.get('')
-        with patch('bookwyrm.views.isbn.is_api_request') as is_api:
+        request = self.factory.get("")
+        with patch("bookwyrm.views.isbn.is_api_request") as is_api:
             is_api.return_value = True
-            response = view(request, isbn='1234567890123')
+            response = view(request, isbn="1234567890123")
         self.assertIsInstance(response, JsonResponse)
 
         data = json.loads(response.content)
         self.assertEqual(len(data), 1)
-        self.assertEqual(data[0]['title'], 'Test Book')
-        self.assertEqual(
-            data[0]['key'], 'https://%s/book/%d' % (DOMAIN, self.book.id))
-
+        self.assertEqual(data[0]["title"], "Test Book")
+        self.assertEqual(data[0]["key"], "https://%s/book/%d" % (DOMAIN, self.book.id))
diff --git a/bookwyrm/tests/views/test_landing.py b/bookwyrm/tests/views/test_landing.py
index 5e0e50cf..910e4a85 100644
--- a/bookwyrm/tests/views/test_landing.py
+++ b/bookwyrm/tests/views/test_landing.py
@@ -1,4 +1,4 @@
-''' test for app action functionality '''
+""" test for app action functionality """
 from django.contrib.auth.models import AnonymousUser
 from django.template.response import TemplateResponse
 from django.test import TestCase
@@ -9,22 +9,26 @@ from bookwyrm import views
 
 
 class LandingViews(TestCase):
-    ''' pages you land on without really trying '''
+    """ pages you land on without really trying """
+
     def setUp(self):
-        ''' we need basic test data and mocks '''
+        """ we need basic test data and mocks """
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
-            'mouse@local.com', 'mouse@mouse.mouse', 'password',
-            local=True, localname='mouse')
+            "mouse@local.com",
+            "mouse@mouse.mouse",
+            "password",
+            local=True,
+            localname="mouse",
+        )
         self.anonymous_user = AnonymousUser
         self.anonymous_user.is_authenticated = False
         models.SiteSettings.objects.create()
 
-
     def test_home_page(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.Home.as_view()
-        request = self.factory.get('')
+        request = self.factory.get("")
         request.user = self.local_user
         result = view(request)
         self.assertEqual(result.status_code, 200)
@@ -36,21 +40,19 @@ class LandingViews(TestCase):
         self.assertEqual(result.status_code, 200)
         result.render()
 
-
     def test_about_page(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.About.as_view()
-        request = self.factory.get('')
+        request = self.factory.get("")
         request.user = self.local_user
         result = view(request)
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
 
-
     def test_discover(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.Discover.as_view()
-        request = self.factory.get('')
+        request = self.factory.get("")
         result = view(request)
         self.assertIsInstance(result, TemplateResponse)
diff --git a/bookwyrm/tests/views/test_list.py b/bookwyrm/tests/views/test_list.py
index e41d9806..cc895ad1 100644
--- a/bookwyrm/tests/views/test_list.py
+++ b/bookwyrm/tests/views/test_list.py
@@ -1,4 +1,4 @@
-''' test for app action functionality '''
+""" test for app action functionality """
 from unittest.mock import patch
 
 from django.contrib.auth.models import AnonymousUser
@@ -9,44 +9,52 @@ from django.test.client import RequestFactory
 from bookwyrm import models, views
 from bookwyrm.activitypub import ActivitypubResponse
 
-#pylint: disable=unused-argument
+# pylint: disable=unused-argument
 class ListViews(TestCase):
-    ''' tag views'''
+    """ tag views"""
+
     def setUp(self):
-        ''' we need basic test data and mocks '''
+        """ we need basic test data and mocks """
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
-            'mouse@local.com', 'mouse@mouse.com', 'mouseword',
-            local=True, localname='mouse',
-            remote_id='https://example.com/users/mouse',
+            "mouse@local.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+            remote_id="https://example.com/users/mouse",
         )
         self.rat = models.User.objects.create_user(
-            'rat@local.com', 'rat@rat.com', 'ratword',
-            local=True, localname='rat',
-            remote_id='https://example.com/users/rat',
+            "rat@local.com",
+            "rat@rat.com",
+            "ratword",
+            local=True,
+            localname="rat",
+            remote_id="https://example.com/users/rat",
         )
-        work = models.Work.objects.create(title='Work')
+        work = models.Work.objects.create(title="Work")
         self.book = models.Edition.objects.create(
-            title='Example Edition',
-            remote_id='https://example.com/book/1',
+            title="Example Edition",
+            remote_id="https://example.com/book/1",
             parent_work=work,
         )
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             self.list = models.List.objects.create(
-                name='Test List', user=self.local_user)
+                name="Test List", user=self.local_user
+            )
         self.anonymous_user = AnonymousUser
         self.anonymous_user.is_authenticated = False
         models.SiteSettings.objects.create()
 
-
     def test_lists_page(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.Lists.as_view()
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            models.List.objects.create(name='Public list', user=self.local_user)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            models.List.objects.create(name="Public list", user=self.local_user)
             models.List.objects.create(
-                name='Private list', privacy='direct', user=self.local_user)
-        request = self.factory.get('')
+                name="Private list", privacy="direct", user=self.local_user
+            )
+        request = self.factory.get("")
         request.user = self.local_user
 
         result = view(request)
@@ -61,42 +69,45 @@ class ListViews(TestCase):
         result.render()
         self.assertEqual(result.status_code, 200)
 
-
     def test_lists_create(self):
-        ''' create list view '''
+        """ create list view """
         real_broadcast = models.List.broadcast
+
         def mock_broadcast(_, activity, user, **kwargs):
-            ''' ok '''
+            """ ok """
             self.assertEqual(user.remote_id, self.local_user.remote_id)
-            self.assertEqual(activity['type'], 'Create')
-            self.assertEqual(activity['actor'], self.local_user.remote_id)
+            self.assertEqual(activity["type"], "Create")
+            self.assertEqual(activity["actor"], self.local_user.remote_id)
+
         models.List.broadcast = mock_broadcast
 
         view = views.Lists.as_view()
-        request = self.factory.post('', {
-            'name': 'A list',
-            'description': 'wow',
-            'privacy': 'unlisted',
-            'curation': 'open',
-            'user': self.local_user.id,
-        })
+        request = self.factory.post(
+            "",
+            {
+                "name": "A list",
+                "description": "wow",
+                "privacy": "unlisted",
+                "curation": "open",
+                "user": self.local_user.id,
+            },
+        )
         request.user = self.local_user
         result = view(request)
         self.assertEqual(result.status_code, 302)
-        new_list = models.List.objects.filter(name='A list').get()
-        self.assertEqual(new_list.description, 'wow')
-        self.assertEqual(new_list.privacy, 'unlisted')
-        self.assertEqual(new_list.curation, 'open')
+        new_list = models.List.objects.filter(name="A list").get()
+        self.assertEqual(new_list.description, "wow")
+        self.assertEqual(new_list.privacy, "unlisted")
+        self.assertEqual(new_list.curation, "open")
         models.List.broadcast = real_broadcast
 
-
     def test_list_page(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.List.as_view()
-        request = self.factory.get('')
+        request = self.factory.get("")
         request.user = self.local_user
 
-        with patch('bookwyrm.views.list.is_api_request') as is_api:
+        with patch("bookwyrm.views.list.is_api_request") as is_api:
             is_api.return_value = False
             result = view(request, self.list.id)
         self.assertIsInstance(result, TemplateResponse)
@@ -104,68 +115,72 @@ class ListViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
         request.user = self.anonymous_user
-        with patch('bookwyrm.views.list.is_api_request') as is_api:
+        with patch("bookwyrm.views.list.is_api_request") as is_api:
             is_api.return_value = False
             result = view(request, self.list.id)
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
 
-        with patch('bookwyrm.views.list.is_api_request') as is_api:
+        with patch("bookwyrm.views.list.is_api_request") as is_api:
             is_api.return_value = True
             result = view(request, self.list.id)
         self.assertIsInstance(result, ActivitypubResponse)
         self.assertEqual(result.status_code, 200)
 
-        request = self.factory.get('/?page=1')
+        request = self.factory.get("/?page=1")
         request.user = self.local_user
-        with patch('bookwyrm.views.list.is_api_request') as is_api:
+        with patch("bookwyrm.views.list.is_api_request") as is_api:
             is_api.return_value = True
             result = view(request, self.list.id)
         self.assertIsInstance(result, ActivitypubResponse)
         self.assertEqual(result.status_code, 200)
 
-
     def test_list_edit(self):
-        ''' edit a list '''
+        """ edit a list """
         real_broadcast = models.List.broadcast
+
         def mock_broadcast(_, activity, user, **kwargs):
-            ''' ok '''
+            """ ok """
             self.assertEqual(user.remote_id, self.local_user.remote_id)
-            self.assertEqual(activity['type'], 'Update')
-            self.assertEqual(activity['actor'], self.local_user.remote_id)
-            self.assertEqual(activity['object']['id'], self.list.remote_id)
+            self.assertEqual(activity["type"], "Update")
+            self.assertEqual(activity["actor"], self.local_user.remote_id)
+            self.assertEqual(activity["object"]["id"], self.list.remote_id)
+
         models.List.broadcast = mock_broadcast
 
         view = views.List.as_view()
-        request = self.factory.post('', {
-            'name': 'New Name',
-            'description': 'wow',
-            'privacy': 'direct',
-            'curation': 'curated',
-            'user': self.local_user.id,
-        })
+        request = self.factory.post(
+            "",
+            {
+                "name": "New Name",
+                "description": "wow",
+                "privacy": "direct",
+                "curation": "curated",
+                "user": self.local_user.id,
+            },
+        )
         request.user = self.local_user
 
         result = view(request, self.list.id)
         self.assertEqual(result.status_code, 302)
 
         self.list.refresh_from_db()
-        self.assertEqual(self.list.name, 'New Name')
-        self.assertEqual(self.list.description, 'wow')
-        self.assertEqual(self.list.privacy, 'direct')
-        self.assertEqual(self.list.curation, 'curated')
+        self.assertEqual(self.list.name, "New Name")
+        self.assertEqual(self.list.description, "wow")
+        self.assertEqual(self.list.privacy, "direct")
+        self.assertEqual(self.list.curation, "curated")
         models.List.broadcast = real_broadcast
 
-
     def test_curate_page(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.Curate.as_view()
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            models.List.objects.create(name='Public list', user=self.local_user)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            models.List.objects.create(name="Public list", user=self.local_user)
             models.List.objects.create(
-                name='Private list', privacy='direct', user=self.local_user)
-        request = self.factory.get('')
+                name="Private list", privacy="direct", user=self.local_user
+            )
+        request = self.factory.get("")
         request.user = self.local_user
 
         result = view(request, self.list.id)
@@ -177,31 +192,35 @@ class ListViews(TestCase):
         result = view(request, self.list.id)
         self.assertEqual(result.status_code, 302)
 
-
     def test_curate_approve(self):
-        ''' approve a pending item '''
+        """ approve a pending item """
         real_broadcast = models.List.broadcast
+
         def mock_broadcast(_, activity, user, **kwargs):
-            ''' ok '''
+            """ ok """
             self.assertEqual(user.remote_id, self.local_user.remote_id)
-            self.assertEqual(activity['type'], 'Add')
-            self.assertEqual(activity['actor'], self.local_user.remote_id)
-            self.assertEqual(activity['target'], self.list.remote_id)
+            self.assertEqual(activity["type"], "Add")
+            self.assertEqual(activity["actor"], self.local_user.remote_id)
+            self.assertEqual(activity["target"], self.list.remote_id)
+
         models.ListItem.broadcast = mock_broadcast
 
         view = views.Curate.as_view()
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             pending = models.ListItem.objects.create(
                 book_list=self.list,
                 user=self.local_user,
                 book=self.book,
-                approved=False
+                approved=False,
             )
 
-        request = self.factory.post('', {
-            'item': pending.id,
-            'approved': 'true',
-        })
+        request = self.factory.post(
+            "",
+            {
+                "item": pending.id,
+                "approved": "true",
+            },
+        )
         request.user = self.local_user
 
         view(request, self.list.id)
@@ -211,43 +230,49 @@ class ListViews(TestCase):
         self.assertTrue(pending.approved)
         models.ListItem.broadcast = real_broadcast
 
-
     def test_curate_reject(self):
-        ''' approve a pending item '''
+        """ approve a pending item """
         view = views.Curate.as_view()
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             pending = models.ListItem.objects.create(
                 book_list=self.list,
                 user=self.local_user,
                 book=self.book,
-                approved=False
+                approved=False,
             )
 
-        request = self.factory.post('', {
-            'item': pending.id,
-            'approved': 'false',
-        })
+        request = self.factory.post(
+            "",
+            {
+                "item": pending.id,
+                "approved": "false",
+            },
+        )
         request.user = self.local_user
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             view(request, self.list.id)
         self.assertFalse(self.list.books.exists())
         self.assertFalse(models.ListItem.objects.exists())
 
-
     def test_add_book(self):
-        ''' put a book on a list '''
+        """ put a book on a list """
         real_broadcast = models.List.broadcast
+
         def mock_broadcast(_, activity, user):
-            ''' ok '''
+            """ ok """
             self.assertEqual(user.remote_id, self.local_user.remote_id)
-            self.assertEqual(activity['type'], 'Add')
-            self.assertEqual(activity['actor'], self.local_user.remote_id)
-            self.assertEqual(activity['target'], self.list.remote_id)
+            self.assertEqual(activity["type"], "Add")
+            self.assertEqual(activity["actor"], self.local_user.remote_id)
+            self.assertEqual(activity["target"], self.list.remote_id)
+
         models.ListItem.broadcast = mock_broadcast
-        request = self.factory.post('', {
-            'book': self.book.id,
-        })
+        request = self.factory.post(
+            "",
+            {
+                "book": self.book.id,
+            },
+        )
         request.user = self.local_user
 
         views.list.add_book(request, self.list.id)
@@ -257,22 +282,26 @@ class ListViews(TestCase):
         self.assertTrue(item.approved)
         models.ListItem.broadcast = real_broadcast
 
-
     def test_add_book_outsider(self):
-        ''' put a book on a list '''
+        """ put a book on a list """
         real_broadcast = models.List.broadcast
+
         def mock_broadcast(_, activity, user):
-            ''' ok '''
+            """ ok """
             self.assertEqual(user.remote_id, self.rat.remote_id)
-            self.assertEqual(activity['type'], 'Add')
-            self.assertEqual(activity['actor'], self.rat.remote_id)
-            self.assertEqual(activity['target'], self.list.remote_id)
+            self.assertEqual(activity["type"], "Add")
+            self.assertEqual(activity["actor"], self.rat.remote_id)
+            self.assertEqual(activity["target"], self.list.remote_id)
+
         models.ListItem.broadcast = mock_broadcast
-        self.list.curation = 'open'
+        self.list.curation = "open"
         self.list.save(broadcast=False)
-        request = self.factory.post('', {
-            'book': self.book.id,
-        })
+        request = self.factory.post(
+            "",
+            {
+                "book": self.book.id,
+            },
+        )
         request.user = self.rat
 
         views.list.add_book(request, self.list.id)
@@ -282,23 +311,27 @@ class ListViews(TestCase):
         self.assertTrue(item.approved)
         models.ListItem.broadcast = real_broadcast
 
-
     def test_add_book_pending(self):
-        ''' put a book on a list awaiting approval '''
+        """ put a book on a list awaiting approval """
         real_broadcast = models.List.broadcast
+
         def mock_broadcast(_, activity, user):
-            ''' ok '''
+            """ ok """
             self.assertEqual(user.remote_id, self.rat.remote_id)
-            self.assertEqual(activity['type'], 'Add')
-            self.assertEqual(activity['actor'], self.rat.remote_id)
-            self.assertEqual(activity['target'], self.list.remote_id)
-            self.assertEqual(activity['object']['id'], self.book.remote_id)
+            self.assertEqual(activity["type"], "Add")
+            self.assertEqual(activity["actor"], self.rat.remote_id)
+            self.assertEqual(activity["target"], self.list.remote_id)
+            self.assertEqual(activity["object"]["id"], self.book.remote_id)
+
         models.ListItem.broadcast = mock_broadcast
-        self.list.curation = 'curated'
+        self.list.curation = "curated"
         self.list.save(broadcast=False)
-        request = self.factory.post('', {
-            'book': self.book.id,
-        })
+        request = self.factory.post(
+            "",
+            {
+                "book": self.book.id,
+            },
+        )
         request.user = self.rat
 
         views.list.add_book(request, self.list.id)
@@ -308,23 +341,27 @@ class ListViews(TestCase):
         self.assertFalse(item.approved)
         models.ListItem.broadcast = real_broadcast
 
-
     def test_add_book_self_curated(self):
-        ''' put a book on a list automatically approved '''
+        """ put a book on a list automatically approved """
         real_broadcast = models.ListItem.broadcast
+
         def mock_broadcast(_, activity, user):
-            ''' ok '''
+            """ ok """
             self.assertEqual(user.remote_id, self.local_user.remote_id)
-            self.assertEqual(activity['type'], 'Add')
-            self.assertEqual(activity['actor'], self.local_user.remote_id)
-            self.assertEqual(activity['target'], self.list.remote_id)
+            self.assertEqual(activity["type"], "Add")
+            self.assertEqual(activity["actor"], self.local_user.remote_id)
+            self.assertEqual(activity["target"], self.list.remote_id)
+
         models.ListItem.broadcast = mock_broadcast
 
-        self.list.curation = 'curated'
+        self.list.curation = "curated"
         self.list.save(broadcast=False)
-        request = self.factory.post('', {
-            'book': self.book.id,
-        })
+        request = self.factory.post(
+            "",
+            {
+                "book": self.book.id,
+            },
+        )
         request.user = self.local_user
 
         views.list.add_book(request, self.list.id)
@@ -334,12 +371,11 @@ class ListViews(TestCase):
         self.assertTrue(item.approved)
         models.ListItem.broadcast = real_broadcast
 
-
     def test_remove_book(self):
-        ''' take an item off a list '''
+        """ take an item off a list """
         real_broadcast = models.ListItem.broadcast
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             item = models.ListItem.objects.create(
                 book_list=self.list,
                 user=self.local_user,
@@ -348,15 +384,19 @@ class ListViews(TestCase):
         self.assertTrue(self.list.listitem_set.exists())
 
         def mock_broadcast(_, activity, user):
-            ''' ok '''
+            """ ok """
             self.assertEqual(user.remote_id, self.local_user.remote_id)
-            self.assertEqual(activity['type'], 'Remove')
-            self.assertEqual(activity['actor'], self.local_user.remote_id)
-            self.assertEqual(activity['target'], self.list.remote_id)
+            self.assertEqual(activity["type"], "Remove")
+            self.assertEqual(activity["actor"], self.local_user.remote_id)
+            self.assertEqual(activity["target"], self.list.remote_id)
+
         models.ListItem.broadcast = mock_broadcast
-        request = self.factory.post('', {
-            'item': item.id,
-        })
+        request = self.factory.post(
+            "",
+            {
+                "item": item.id,
+            },
+        )
         request.user = self.local_user
 
         views.list.remove_book(request, self.list.id)
@@ -364,19 +404,21 @@ class ListViews(TestCase):
         self.assertFalse(self.list.listitem_set.exists())
         models.ListItem.broadcast = real_broadcast
 
-
     def test_remove_book_unauthorized(self):
-        ''' take an item off a list '''
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        """ take an item off a list """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             item = models.ListItem.objects.create(
                 book_list=self.list,
                 user=self.local_user,
                 book=self.book,
             )
         self.assertTrue(self.list.listitem_set.exists())
-        request = self.factory.post('', {
-            'item': item.id,
-        })
+        request = self.factory.post(
+            "",
+            {
+                "item": item.id,
+            },
+        )
         request.user = self.rat
 
         views.list.remove_book(request, self.list.id)
diff --git a/bookwyrm/tests/views/test_notifications.py b/bookwyrm/tests/views/test_notifications.py
index 55513359..6d92485e 100644
--- a/bookwyrm/tests/views/test_notifications.py
+++ b/bookwyrm/tests/views/test_notifications.py
@@ -1,4 +1,4 @@
-''' test for app action functionality '''
+""" test for app action functionality """
 from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
@@ -8,19 +8,24 @@ from bookwyrm import views
 
 
 class NotificationViews(TestCase):
-    ''' notifications '''
+    """ notifications """
+
     def setUp(self):
-        ''' we need basic test data and mocks '''
+        """ we need basic test data and mocks """
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
-            'mouse@local.com', 'mouse@mouse.mouse', 'password',
-            local=True, localname='mouse')
+            "mouse@local.com",
+            "mouse@mouse.mouse",
+            "password",
+            local=True,
+            localname="mouse",
+        )
         models.SiteSettings.objects.create()
 
     def test_notifications_page(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.Notifications.as_view()
-        request = self.factory.get('')
+        request = self.factory.get("")
         request.user = self.local_user
         result = view(request)
         self.assertIsInstance(result, TemplateResponse)
@@ -28,14 +33,16 @@ class NotificationViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_clear_notifications(self):
-        ''' erase notifications '''
+        """ erase notifications """
         models.Notification.objects.create(
-            user=self.local_user, notification_type='FAVORITE')
+            user=self.local_user, notification_type="FAVORITE"
+        )
         models.Notification.objects.create(
-            user=self.local_user, notification_type='MENTION', read=True)
+            user=self.local_user, notification_type="MENTION", read=True
+        )
         self.assertEqual(models.Notification.objects.count(), 2)
         view = views.Notifications.as_view()
-        request = self.factory.post('')
+        request = self.factory.post("")
         request.user = self.local_user
         result = view(request)
         self.assertEqual(result.status_code, 302)
diff --git a/bookwyrm/tests/views/test_outbox.py b/bookwyrm/tests/views/test_outbox.py
index 7986dea6..5934eb7c 100644
--- a/bookwyrm/tests/views/test_outbox.py
+++ b/bookwyrm/tests/views/test_outbox.py
@@ -1,4 +1,4 @@
-''' sending out activities '''
+""" sending out activities """
 from unittest.mock import patch
 import json
 
@@ -12,118 +12,127 @@ from bookwyrm.settings import USER_AGENT
 
 # pylint: disable=too-many-public-methods
 class OutboxView(TestCase):
-    ''' sends out activities '''
+    """ sends out activities """
+
     def setUp(self):
-        ''' we'll need some data '''
+        """ we'll need some data """
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
-            'mouse@local.com', 'mouse@mouse.com', 'mouseword',
-            local=True, localname='mouse',
-            remote_id='https://example.com/users/mouse',
+            "mouse@local.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+            remote_id="https://example.com/users/mouse",
         )
-        work = models.Work.objects.create(title='Test Work')
+        work = models.Work.objects.create(title="Test Work")
         self.book = models.Edition.objects.create(
-            title='Example Edition',
-            remote_id='https://example.com/book/1',
-            parent_work=work
+            title="Example Edition",
+            remote_id="https://example.com/book/1",
+            parent_work=work,
         )
 
-
     def test_outbox(self):
-        ''' returns user's statuses '''
-        request = self.factory.get('')
-        result = views.Outbox.as_view()(request, 'mouse')
+        """ returns user's statuses """
+        request = self.factory.get("")
+        result = views.Outbox.as_view()(request, "mouse")
         self.assertIsInstance(result, JsonResponse)
 
     def test_outbox_bad_method(self):
-        ''' can't POST to outbox '''
-        request = self.factory.post('')
-        result = views.Outbox.as_view()(request, 'mouse')
+        """ can't POST to outbox """
+        request = self.factory.post("")
+        result = views.Outbox.as_view()(request, "mouse")
         self.assertEqual(result.status_code, 405)
 
     def test_outbox_unknown_user(self):
-        ''' should 404 for unknown and remote users '''
-        request = self.factory.post('')
-        result = views.Outbox.as_view()(request, 'beepboop')
+        """ should 404 for unknown and remote users """
+        request = self.factory.post("")
+        result = views.Outbox.as_view()(request, "beepboop")
         self.assertEqual(result.status_code, 405)
-        result = views.Outbox.as_view()(request, 'rat')
+        result = views.Outbox.as_view()(request, "rat")
         self.assertEqual(result.status_code, 405)
 
     def test_outbox_privacy(self):
-        ''' don't show dms et cetera in outbox '''
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        """ don't show dms et cetera in outbox """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             models.Status.objects.create(
-                content='PRIVATE!!', user=self.local_user, privacy='direct')
+                content="PRIVATE!!", user=self.local_user, privacy="direct"
+            )
             models.Status.objects.create(
-                content='bffs ONLY', user=self.local_user, privacy='followers')
+                content="bffs ONLY", user=self.local_user, privacy="followers"
+            )
             models.Status.objects.create(
-                content='unlisted status', user=self.local_user,
-                privacy='unlisted')
+                content="unlisted status", user=self.local_user, privacy="unlisted"
+            )
             models.Status.objects.create(
-                content='look at this', user=self.local_user, privacy='public')
+                content="look at this", user=self.local_user, privacy="public"
+            )
 
-        request = self.factory.get('')
-        result = views.Outbox.as_view()(request, 'mouse')
+        request = self.factory.get("")
+        result = views.Outbox.as_view()(request, "mouse")
         self.assertIsInstance(result, JsonResponse)
         data = json.loads(result.content)
-        self.assertEqual(data['type'], 'OrderedCollection')
-        self.assertEqual(data['totalItems'], 2)
+        self.assertEqual(data["type"], "OrderedCollection")
+        self.assertEqual(data["totalItems"], 2)
 
     def test_outbox_filter(self):
-        ''' if we only care about reviews, only get reviews '''
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        """ if we only care about reviews, only get reviews """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             models.Review.objects.create(
-                content='look at this', name='hi', rating=1,
-                book=self.book, user=self.local_user)
-            models.Status.objects.create(
-                content='look at this', user=self.local_user)
+                content="look at this",
+                name="hi",
+                rating=1,
+                book=self.book,
+                user=self.local_user,
+            )
+            models.Status.objects.create(content="look at this", user=self.local_user)
 
-        request = self.factory.get('', {'type': 'bleh'})
-        result = views.Outbox.as_view()(request, 'mouse')
+        request = self.factory.get("", {"type": "bleh"})
+        result = views.Outbox.as_view()(request, "mouse")
         self.assertIsInstance(result, JsonResponse)
         data = json.loads(result.content)
-        self.assertEqual(data['type'], 'OrderedCollection')
-        self.assertEqual(data['totalItems'], 2)
+        self.assertEqual(data["type"], "OrderedCollection")
+        self.assertEqual(data["totalItems"], 2)
 
-        request = self.factory.get('', {'type': 'Review'})
-        result = views.Outbox.as_view()(request, 'mouse')
+        request = self.factory.get("", {"type": "Review"})
+        result = views.Outbox.as_view()(request, "mouse")
         self.assertIsInstance(result, JsonResponse)
         data = json.loads(result.content)
-        self.assertEqual(data['type'], 'OrderedCollection')
-        self.assertEqual(data['totalItems'], 1)
+        self.assertEqual(data["type"], "OrderedCollection")
+        self.assertEqual(data["totalItems"], 1)
 
     def test_outbox_bookwyrm_request_true(self):
-        ''' should differentiate between bookwyrm and outside requests '''
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        """ should differentiate between bookwyrm and outside requests """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             models.Review.objects.create(
-                name='hi',
-                content='look at this',
+                name="hi",
+                content="look at this",
                 user=self.local_user,
                 book=self.book,
-                privacy='public',
+                privacy="public",
             )
 
-        request = self.factory.get('', {'page': 1}, HTTP_USER_AGENT=USER_AGENT)
-        result = views.Outbox.as_view()(request, 'mouse')
+        request = self.factory.get("", {"page": 1}, HTTP_USER_AGENT=USER_AGENT)
+        result = views.Outbox.as_view()(request, "mouse")
 
         data = json.loads(result.content)
-        self.assertEqual(len(data['orderedItems']), 1)
-        self.assertEqual(data['orderedItems'][0]['type'], 'Review')
+        self.assertEqual(len(data["orderedItems"]), 1)
+        self.assertEqual(data["orderedItems"][0]["type"], "Review")
 
     def test_outbox_bookwyrm_request_false(self):
-        ''' should differentiate between bookwyrm and outside requests '''
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        """ should differentiate between bookwyrm and outside requests """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             models.Review.objects.create(
-                name='hi',
-                content='look at this',
+                name="hi",
+                content="look at this",
                 user=self.local_user,
                 book=self.book,
-                privacy='public',
+                privacy="public",
             )
 
-        request = self.factory.get('', {'page': 1})
-        result = views.Outbox.as_view()(request, 'mouse')
+        request = self.factory.get("", {"page": 1})
+        result = views.Outbox.as_view()(request, "mouse")
 
         data = json.loads(result.content)
-        self.assertEqual(len(data['orderedItems']), 1)
-        self.assertEqual(data['orderedItems'][0]['type'], 'Article')
+        self.assertEqual(len(data["orderedItems"]), 1)
+        self.assertEqual(data["orderedItems"][0]["type"], "Article")
diff --git a/bookwyrm/tests/views/test_password.py b/bookwyrm/tests/views/test_password.py
index 9fc37fdb..f67f5538 100644
--- a/bookwyrm/tests/views/test_password.py
+++ b/bookwyrm/tests/views/test_password.py
@@ -1,4 +1,4 @@
-''' test for app action functionality '''
+""" test for app action functionality """
 from unittest.mock import patch
 
 from django.contrib.auth.models import AnonymousUser
@@ -10,22 +10,26 @@ from bookwyrm import models, views
 
 
 class PasswordViews(TestCase):
-    ''' view user and edit profile '''
+    """ view user and edit profile """
+
     def setUp(self):
-        ''' we need basic test data and mocks '''
+        """ we need basic test data and mocks """
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
-            'mouse@local.com', 'mouse@mouse.com', 'password',
-            local=True, localname='mouse')
+            "mouse@local.com",
+            "mouse@mouse.com",
+            "password",
+            local=True,
+            localname="mouse",
+        )
         self.anonymous_user = AnonymousUser
         self.anonymous_user.is_authenticated = False
         models.SiteSettings.objects.create(id=1)
 
-
     def test_password_reset_request(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.PasswordResetRequest.as_view()
-        request = self.factory.get('')
+        request = self.factory.get("")
         request.user = self.local_user
 
         result = view(request)
@@ -33,76 +37,63 @@ class PasswordViews(TestCase):
         result.render()
         self.assertEqual(result.status_code, 200)
 
-
     def test_password_reset_request_post(self):
-        ''' send 'em an email '''
-        request = self.factory.post('', {'email': 'aa@bb.ccc'})
+        """ send 'em an email """
+        request = self.factory.post("", {"email": "aa@bb.ccc"})
         view = views.PasswordResetRequest.as_view()
         resp = view(request)
         self.assertEqual(resp.status_code, 302)
 
-        request = self.factory.post('', {'email': 'mouse@mouse.com'})
-        with patch('bookwyrm.emailing.send_email.delay'):
+        request = self.factory.post("", {"email": "mouse@mouse.com"})
+        with patch("bookwyrm.emailing.send_email.delay"):
             resp = view(request)
         resp.render()
 
-        self.assertEqual(
-            models.PasswordReset.objects.get().user, self.local_user)
+        self.assertEqual(models.PasswordReset.objects.get().user, self.local_user)
 
     def test_password_reset(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.PasswordReset.as_view()
         code = models.PasswordReset.objects.create(user=self.local_user)
-        request = self.factory.get('')
+        request = self.factory.get("")
         request.user = self.anonymous_user
         result = view(request, code.code)
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
 
-
     def test_password_reset_post(self):
-        ''' reset from code '''
+        """ reset from code """
         view = views.PasswordReset.as_view()
         code = models.PasswordReset.objects.create(user=self.local_user)
-        request = self.factory.post('', {
-            'password': 'hi',
-            'confirm-password': 'hi'
-        })
-        with patch('bookwyrm.views.password.login'):
+        request = self.factory.post("", {"password": "hi", "confirm-password": "hi"})
+        with patch("bookwyrm.views.password.login"):
             resp = view(request, code.code)
         self.assertEqual(resp.status_code, 302)
         self.assertFalse(models.PasswordReset.objects.exists())
 
     def test_password_reset_wrong_code(self):
-        ''' reset from code '''
+        """ reset from code """
         view = views.PasswordReset.as_view()
         models.PasswordReset.objects.create(user=self.local_user)
-        request = self.factory.post('', {
-            'password': 'hi',
-            'confirm-password': 'hi'
-        })
-        resp = view(request, 'jhgdkfjgdf')
+        request = self.factory.post("", {"password": "hi", "confirm-password": "hi"})
+        resp = view(request, "jhgdkfjgdf")
         resp.render()
         self.assertTrue(models.PasswordReset.objects.exists())
 
     def test_password_reset_mismatch(self):
-        ''' reset from code '''
+        """ reset from code """
         view = views.PasswordReset.as_view()
         code = models.PasswordReset.objects.create(user=self.local_user)
-        request = self.factory.post('', {
-            'password': 'hi',
-            'confirm-password': 'hihi'
-        })
+        request = self.factory.post("", {"password": "hi", "confirm-password": "hihi"})
         resp = view(request, code.code)
         resp.render()
         self.assertTrue(models.PasswordReset.objects.exists())
 
-
     def test_password_change_get(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.ChangePassword.as_view()
-        request = self.factory.get('')
+        request = self.factory.get("")
         request.user = self.local_user
 
         result = view(request)
@@ -110,28 +101,21 @@ class PasswordViews(TestCase):
         result.render()
         self.assertEqual(result.status_code, 200)
 
-
     def test_password_change(self):
-        ''' change password '''
+        """ change password """
         view = views.ChangePassword.as_view()
         password_hash = self.local_user.password
-        request = self.factory.post('', {
-            'password': 'hi',
-            'confirm-password': 'hi'
-        })
+        request = self.factory.post("", {"password": "hi", "confirm-password": "hi"})
         request.user = self.local_user
-        with patch('bookwyrm.views.password.login'):
+        with patch("bookwyrm.views.password.login"):
             view(request)
         self.assertNotEqual(self.local_user.password, password_hash)
 
     def test_password_change_mismatch(self):
-        ''' change password '''
+        """ change password """
         view = views.ChangePassword.as_view()
         password_hash = self.local_user.password
-        request = self.factory.post('', {
-            'password': 'hi',
-            'confirm-password': 'hihi'
-        })
+        request = self.factory.post("", {"password": "hi", "confirm-password": "hihi"})
         request.user = self.local_user
         view(request)
         self.assertEqual(self.local_user.password, password_hash)
diff --git a/bookwyrm/tests/views/test_reading.py b/bookwyrm/tests/views/test_reading.py
index 2bb052ae..96d1f1f4 100644
--- a/bookwyrm/tests/views/test_reading.py
+++ b/bookwyrm/tests/views/test_reading.py
@@ -1,4 +1,4 @@
-''' test for app action functionality '''
+""" test for app action functionality """
 from unittest.mock import patch
 import dateutil
 from django.test import TestCase
@@ -7,45 +7,54 @@ from django.utils import timezone
 
 from bookwyrm import models, views
 
+
 class ReadingViews(TestCase):
-    ''' viewing and creating statuses '''
+    """ viewing and creating statuses """
+
     def setUp(self):
-        ''' we need basic test data and mocks '''
+        """ we need basic test data and mocks """
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
-            'mouse@local.com', 'mouse@mouse.com', 'mouseword',
-            local=True, localname='mouse',
-            remote_id='https://example.com/users/mouse',
+            "mouse@local.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+            remote_id="https://example.com/users/mouse",
         )
-        self.work = models.Work.objects.create(title='Test Work')
+        self.work = models.Work.objects.create(title="Test Work")
         self.book = models.Edition.objects.create(
-            title='Test Book',
-            remote_id='https://example.com/book/1',
-            parent_work=self.work
+            title="Test Book",
+            remote_id="https://example.com/book/1",
+            parent_work=self.work,
         )
-        with patch('bookwyrm.models.user.set_remote_server.delay'):
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
             self.remote_user = models.User.objects.create_user(
-                'rat', 'rat@rat.com', 'ratword',
+                "rat",
+                "rat@rat.com",
+                "ratword",
                 local=False,
-                remote_id='https://example.com/users/rat',
-                inbox='https://example.com/users/rat/inbox',
-                outbox='https://example.com/users/rat/outbox',
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
             )
 
-
     def test_start_reading(self):
-        ''' begin a book '''
-        shelf = self.local_user.shelf_set.get(identifier='reading')
+        """ begin a book """
+        shelf = self.local_user.shelf_set.get(identifier="reading")
         self.assertFalse(shelf.books.exists())
         self.assertFalse(models.Status.objects.exists())
 
-        request = self.factory.post('', {
-            'post-status': True,
-            'privacy': 'followers',
-            'start_date': '2020-01-05',
-        })
+        request = self.factory.post(
+            "",
+            {
+                "post-status": True,
+                "privacy": "followers",
+                "start_date": "2020-01-05",
+            },
+        )
         request.user = self.local_user
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             views.start_reading(request, self.book.id)
 
         self.assertEqual(shelf.books.get(), self.book)
@@ -53,7 +62,7 @@ class ReadingViews(TestCase):
         status = models.GeneratedNote.objects.get()
         self.assertEqual(status.user, self.local_user)
         self.assertEqual(status.mention_books.get(), self.book)
-        self.assertEqual(status.privacy, 'followers')
+        self.assertEqual(status.privacy, "followers")
 
         readthrough = models.ReadThrough.objects.get()
         self.assertIsNotNone(readthrough.start_date)
@@ -61,45 +70,47 @@ class ReadingViews(TestCase):
         self.assertEqual(readthrough.user, self.local_user)
         self.assertEqual(readthrough.book, self.book)
 
-
     def test_start_reading_reshelf(self):
-        ''' begin a book '''
-        to_read_shelf = self.local_user.shelf_set.get(identifier='to-read')
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        """ begin a book """
+        to_read_shelf = self.local_user.shelf_set.get(identifier="to-read")
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             models.ShelfBook.objects.create(
-                shelf=to_read_shelf, book=self.book, user=self.local_user)
-        shelf = self.local_user.shelf_set.get(identifier='reading')
+                shelf=to_read_shelf, book=self.book, user=self.local_user
+            )
+        shelf = self.local_user.shelf_set.get(identifier="reading")
         self.assertEqual(to_read_shelf.books.get(), self.book)
         self.assertFalse(shelf.books.exists())
         self.assertFalse(models.Status.objects.exists())
 
-        request = self.factory.post('')
+        request = self.factory.post("")
         request.user = self.local_user
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             views.start_reading(request, self.book.id)
 
         self.assertFalse(to_read_shelf.books.exists())
         self.assertEqual(shelf.books.get(), self.book)
 
     def test_finish_reading(self):
-        ''' begin a book '''
-        shelf = self.local_user.shelf_set.get(identifier='read')
+        """ begin a book """
+        shelf = self.local_user.shelf_set.get(identifier="read")
         self.assertFalse(shelf.books.exists())
         self.assertFalse(models.Status.objects.exists())
         readthrough = models.ReadThrough.objects.create(
-            user=self.local_user,
-            start_date=timezone.now(),
-            book=self.book)
+            user=self.local_user, start_date=timezone.now(), book=self.book
+        )
 
-        request = self.factory.post('', {
-            'post-status': True,
-            'privacy': 'followers',
-            'finish_date': '2020-01-07',
-            'id': readthrough.id,
-        })
+        request = self.factory.post(
+            "",
+            {
+                "post-status": True,
+                "privacy": "followers",
+                "finish_date": "2020-01-07",
+                "id": readthrough.id,
+            },
+        )
         request.user = self.local_user
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             views.finish_reading(request, self.book.id)
 
         self.assertEqual(shelf.books.get(), self.book)
@@ -107,7 +118,7 @@ class ReadingViews(TestCase):
         status = models.GeneratedNote.objects.get()
         self.assertEqual(status.user, self.local_user)
         self.assertEqual(status.mention_books.get(), self.book)
-        self.assertEqual(status.privacy, 'followers')
+        self.assertEqual(status.privacy, "followers")
 
         readthrough = models.ReadThrough.objects.get()
         self.assertIsNotNone(readthrough.start_date)
@@ -115,19 +126,21 @@ class ReadingViews(TestCase):
         self.assertEqual(readthrough.user, self.local_user)
         self.assertEqual(readthrough.book, self.book)
 
-
     def test_edit_readthrough(self):
-        ''' adding dates to an ongoing readthrough '''
-        start = timezone.make_aware(dateutil.parser.parse('2021-01-03'))
+        """ adding dates to an ongoing readthrough """
+        start = timezone.make_aware(dateutil.parser.parse("2021-01-03"))
         readthrough = models.ReadThrough.objects.create(
-            book=self.book, user=self.local_user, start_date=start)
+            book=self.book, user=self.local_user, start_date=start
+        )
         request = self.factory.post(
-            '', {
-                'start_date': '2017-01-01',
-                'finish_date': '2018-03-07',
-                'book': '',
-                'id': readthrough.id,
-            })
+            "",
+            {
+                "start_date": "2017-01-01",
+                "finish_date": "2018-03-07",
+                "book": "",
+                "id": readthrough.id,
+            },
+        )
         request.user = self.local_user
 
         views.edit_readthrough(request)
@@ -140,33 +153,34 @@ class ReadingViews(TestCase):
         self.assertEqual(readthrough.finish_date.day, 7)
         self.assertEqual(readthrough.book, self.book)
 
-
     def test_delete_readthrough(self):
-        ''' remove a readthrough '''
+        """ remove a readthrough """
         readthrough = models.ReadThrough.objects.create(
-            book=self.book, user=self.local_user)
-        models.ReadThrough.objects.create(
-            book=self.book, user=self.local_user)
+            book=self.book, user=self.local_user
+        )
+        models.ReadThrough.objects.create(book=self.book, user=self.local_user)
         request = self.factory.post(
-            '', {
-                'id': readthrough.id,
-            })
+            "",
+            {
+                "id": readthrough.id,
+            },
+        )
         request.user = self.local_user
 
         views.delete_readthrough(request)
-        self.assertFalse(
-            models.ReadThrough.objects.filter(id=readthrough.id).exists())
-
+        self.assertFalse(models.ReadThrough.objects.filter(id=readthrough.id).exists())
 
     def test_create_readthrough(self):
-        ''' adding new read dates '''
+        """ adding new read dates """
         request = self.factory.post(
-            '', {
-                'start_date': '2017-01-01',
-                'finish_date': '2018-03-07',
-                'book': self.book.id,
-                'id': '',
-            })
+            "",
+            {
+                "start_date": "2017-01-01",
+                "finish_date": "2018-03-07",
+                "book": self.book.id,
+                "id": "",
+            },
+        )
         request.user = self.local_user
 
         views.create_readthrough(request)
diff --git a/bookwyrm/tests/views/test_readthrough.py b/bookwyrm/tests/views/test_readthrough.py
index 41e38a1d..5399f673 100644
--- a/bookwyrm/tests/views/test_readthrough.py
+++ b/bookwyrm/tests/views/test_readthrough.py
@@ -1,4 +1,4 @@
-''' tests updating reading progress '''
+""" tests updating reading progress """
 from datetime import datetime
 from unittest.mock import patch
 from django.test import TestCase, Client
@@ -6,63 +6,68 @@ from django.utils import timezone
 
 from bookwyrm import models
 
-@patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay')
+
+@patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 class ReadThrough(TestCase):
-    ''' readthrough tests '''
+    """ readthrough tests """
+
     def setUp(self):
-        ''' basic user and book data '''
+        """ basic user and book data """
         self.client = Client()
 
-        self.work = models.Work.objects.create(
-            title='Example Work'
-        )
+        self.work = models.Work.objects.create(title="Example Work")
 
         self.edition = models.Edition.objects.create(
-            title='Example Edition',
-            parent_work=self.work
+            title="Example Edition", parent_work=self.work
         )
         self.work.default_edition = self.edition
         self.work.save()
 
         self.user = models.User.objects.create_user(
-            'cinco', 'cinco@example.com', 'seissiete',
-            local=True, localname='cinco')
+            "cinco", "cinco@example.com", "seissiete", local=True, localname="cinco"
+        )
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             self.client.force_login(self.user)
 
     def test_create_basic_readthrough(self, delay_mock):
         """A basic readthrough doesn't create a progress update"""
         self.assertEqual(self.edition.readthrough_set.count(), 0)
 
-        self.client.post('/start-reading/{}'.format(self.edition.id), {
-            'start_date': '2020-11-27',
-        })
+        self.client.post(
+            "/start-reading/{}".format(self.edition.id),
+            {
+                "start_date": "2020-11-27",
+            },
+        )
 
         readthroughs = self.edition.readthrough_set.all()
         self.assertEqual(len(readthroughs), 1)
         self.assertEqual(readthroughs[0].progressupdate_set.count(), 0)
         self.assertEqual(
-            readthroughs[0].start_date,
-            datetime(2020, 11, 27, tzinfo=timezone.utc))
+            readthroughs[0].start_date, datetime(2020, 11, 27, tzinfo=timezone.utc)
+        )
         self.assertEqual(readthroughs[0].progress, None)
         self.assertEqual(readthroughs[0].finish_date, None)
         self.assertEqual(delay_mock.call_count, 1)
 
     def test_create_progress_readthrough(self, delay_mock):
-        ''' a readthrough with progress '''
+        """ a readthrough with progress """
         self.assertEqual(self.edition.readthrough_set.count(), 0)
 
-        self.client.post('/start-reading/{}'.format(self.edition.id), {
-            'start_date': '2020-11-27',
-            'progress': 50,
-        })
+        self.client.post(
+            "/start-reading/{}".format(self.edition.id),
+            {
+                "start_date": "2020-11-27",
+                "progress": 50,
+            },
+        )
 
         readthroughs = self.edition.readthrough_set.all()
         self.assertEqual(len(readthroughs), 1)
         self.assertEqual(
-            readthroughs[0].start_date,
-            datetime(2020, 11, 27, tzinfo=timezone.utc))
+            readthroughs[0].start_date, datetime(2020, 11, 27, tzinfo=timezone.utc)
+        )
         self.assertEqual(readthroughs[0].progress, 50)
         self.assertEqual(readthroughs[0].finish_date, None)
 
@@ -73,13 +78,17 @@ class ReadThrough(TestCase):
         self.assertEqual(delay_mock.call_count, 1)
 
         # Update progress
-        self.client.post('/edit-readthrough', {
-            'id': readthroughs[0].id,
-            'progress': 100,
-        })
+        self.client.post(
+            "/edit-readthrough",
+            {
+                "id": readthroughs[0].id,
+                "progress": 100,
+            },
+        )
 
-        progress_updates = readthroughs[0].progressupdate_set\
-            .order_by('updated_date').all()
+        progress_updates = (
+            readthroughs[0].progressupdate_set.order_by("updated_date").all()
+        )
         self.assertEqual(len(progress_updates), 2)
         self.assertEqual(progress_updates[1].mode, models.ProgressMode.PAGE)
         self.assertEqual(progress_updates[1].progress, 100)
@@ -87,9 +96,12 @@ class ReadThrough(TestCase):
         # Edit doesn't publish anything
         self.assertEqual(delay_mock.call_count, 1)
 
-        self.client.post('/delete-readthrough', {
-            'id': readthroughs[0].id,
-        })
+        self.client.post(
+            "/delete-readthrough",
+            {
+                "id": readthroughs[0].id,
+            },
+        )
 
         readthroughs = self.edition.readthrough_set.all()
         updates = self.user.progressupdate_set.all()
diff --git a/bookwyrm/tests/views/test_rss_feed.py b/bookwyrm/tests/views/test_rss_feed.py
index 3d5bec49..c7fef2a9 100644
--- a/bookwyrm/tests/views/test_rss_feed.py
+++ b/bookwyrm/tests/views/test_rss_feed.py
@@ -1,4 +1,4 @@
-''' testing import '''
+""" testing import """
 
 from unittest.mock import patch
 from django.test import RequestFactory, TestCase
@@ -6,41 +6,51 @@ from django.test import RequestFactory, TestCase
 from bookwyrm import models
 from bookwyrm.views import rss_feed
 
+
 class RssFeedView(TestCase):
-    ''' rss feed behaves as expected '''
+    """ rss feed behaves as expected """
+
     def setUp(self):
-        ''' test data '''
+        """ test data """
         self.site = models.SiteSettings.objects.create()
 
         self.user = models.User.objects.create_user(
-            'rss_user', 'rss@test.rss', 'password', local=True)
-
-        work = models.Work.objects.create(title='Test Work')
-        self.book = models.Edition.objects.create(
-            title='Example Edition',
-            remote_id='https://example.com/book/1',
-            parent_work=work
+            "rss_user", "rss@test.rss", "password", local=True
         )
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        work = models.Work.objects.create(title="Test Work")
+        self.book = models.Edition.objects.create(
+            title="Example Edition",
+            remote_id="https://example.com/book/1",
+            parent_work=work,
+        )
+
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             self.review = models.Review.objects.create(
-                name='Review name', content='test content', rating=3,
-                user=self.user, book=self.book)
+                name="Review name",
+                content="test content",
+                rating=3,
+                user=self.user,
+                book=self.book,
+            )
 
             self.quote = models.Quotation.objects.create(
-                quote='a sickening sense', content='test content',
-                user=self.user, book=self.book)
+                quote="a sickening sense",
+                content="test content",
+                user=self.user,
+                book=self.book,
+            )
 
             self.generatednote = models.GeneratedNote.objects.create(
-                content='test content', user=self.user)
+                content="test content", user=self.user
+            )
 
         self.factory = RequestFactory()
 
-
     def test_rss_feed(self):
-        ''' load an rss feed '''
+        """ load an rss feed """
         view = rss_feed.RssFeed()
-        request = self.factory.get('/user/rss_user/rss')
+        request = self.factory.get("/user/rss_user/rss")
         request.user = self.user
         with patch("bookwyrm.models.SiteSettings.objects.get") as site:
             site.return_value = self.site
diff --git a/bookwyrm/tests/views/test_search.py b/bookwyrm/tests/views/test_search.py
index 5d7109e7..78c7a103 100644
--- a/bookwyrm/tests/views/test_search.py
+++ b/bookwyrm/tests/views/test_search.py
@@ -1,4 +1,4 @@
-''' test for app action functionality '''
+""" test for app action functionality """
 import json
 from unittest.mock import patch
 
@@ -13,103 +13,107 @@ from bookwyrm.settings import DOMAIN
 
 
 class ShelfViews(TestCase):
-    ''' tag views'''
+    """ tag views"""
+
     def setUp(self):
-        ''' we need basic test data and mocks '''
+        """ we need basic test data and mocks """
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
-            'mouse@local.com', 'mouse@mouse.com', 'mouseword',
-            local=True, localname='mouse',
-            remote_id='https://example.com/users/mouse',
+            "mouse@local.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+            remote_id="https://example.com/users/mouse",
         )
-        self.work = models.Work.objects.create(title='Test Work')
+        self.work = models.Work.objects.create(title="Test Work")
         self.book = models.Edition.objects.create(
-            title='Test Book',
-            remote_id='https://example.com/book/1',
-            parent_work=self.work
+            title="Test Book",
+            remote_id="https://example.com/book/1",
+            parent_work=self.work,
         )
         models.Connector.objects.create(
-            identifier='self',
-            connector_file='self_connector',
-            local=True
+            identifier="self", connector_file="self_connector", local=True
         )
         models.SiteSettings.objects.create()
 
-
     def test_search_json_response(self):
-        ''' searches local data only and returns book data in json format '''
+        """ searches local data only and returns book data in json format """
         view = views.Search.as_view()
         # we need a connector for this, sorry
-        request = self.factory.get('', {'q': 'Test Book'})
-        with patch('bookwyrm.views.search.is_api_request') as is_api:
+        request = self.factory.get("", {"q": "Test Book"})
+        with patch("bookwyrm.views.search.is_api_request") as is_api:
             is_api.return_value = True
             response = view(request)
         self.assertIsInstance(response, JsonResponse)
 
         data = json.loads(response.content)
         self.assertEqual(len(data), 1)
-        self.assertEqual(data[0]['title'], 'Test Book')
-        self.assertEqual(
-            data[0]['key'], 'https://%s/book/%d' % (DOMAIN, self.book.id))
-
+        self.assertEqual(data[0]["title"], "Test Book")
+        self.assertEqual(data[0]["key"], "https://%s/book/%d" % (DOMAIN, self.book.id))
 
     def test_search_html_response(self):
-        ''' searches remote connectors '''
+        """ searches remote connectors """
         view = views.Search.as_view()
+
         class TestConnector(abstract_connector.AbstractMinimalConnector):
-            ''' nothing added here '''
+            """ nothing added here """
+
             def format_search_result(self, search_result):
                 pass
+
             def get_or_create_book(self, remote_id):
                 pass
+
             def parse_search_data(self, data):
                 pass
+
             def format_isbn_search_result(self, search_result):
                 return search_result
+
             def parse_isbn_search_data(self, data):
                 return data
+
         models.Connector.objects.create(
-            identifier='example.com',
-            connector_file='openlibrary',
-            base_url='https://example.com',
-            books_url='https://example.com/books',
-            covers_url='https://example.com/covers',
-            search_url='https://example.com/search?q=',
+            identifier="example.com",
+            connector_file="openlibrary",
+            base_url="https://example.com",
+            books_url="https://example.com/books",
+            covers_url="https://example.com/covers",
+            search_url="https://example.com/search?q=",
         )
-        connector = TestConnector('example.com')
+        connector = TestConnector("example.com")
 
         search_result = abstract_connector.SearchResult(
-            key='http://www.example.com/book/1',
-            title='Gideon the Ninth',
-            author='Tamsyn Muir',
-            year='2019',
-            connector=connector
+            key="http://www.example.com/book/1",
+            title="Gideon the Ninth",
+            author="Tamsyn Muir",
+            year="2019",
+            connector=connector,
         )
 
-        request = self.factory.get('', {'q': 'Test Book'})
+        request = self.factory.get("", {"q": "Test Book"})
         request.user = self.local_user
-        with patch('bookwyrm.views.search.is_api_request') as is_api:
+        with patch("bookwyrm.views.search.is_api_request") as is_api:
             is_api.return_value = False
-            with patch(
-                    'bookwyrm.connectors.connector_manager.search') as manager:
+            with patch("bookwyrm.connectors.connector_manager.search") as manager:
                 manager.return_value = [search_result]
                 response = view(request)
         self.assertIsInstance(response, TemplateResponse)
         response.render()
         self.assertEqual(
-            response.context_data['book_results'][0].title, 'Gideon the Ninth')
-
+            response.context_data["book_results"][0].title, "Gideon the Ninth"
+        )
 
     def test_search_html_response_users(self):
-        ''' searches remote connectors '''
+        """ searches remote connectors """
         view = views.Search.as_view()
-        request = self.factory.get('', {'q': 'mouse'})
+        request = self.factory.get("", {"q": "mouse"})
         request.user = self.local_user
-        with patch('bookwyrm.views.search.is_api_request') as is_api:
+        with patch("bookwyrm.views.search.is_api_request") as is_api:
             is_api.return_value = False
-            with patch('bookwyrm.connectors.connector_manager.search'):
+            with patch("bookwyrm.connectors.connector_manager.search"):
                 response = view(request)
         self.assertIsInstance(response, TemplateResponse)
         response.render()
-        self.assertEqual(
-            response.context_data['user_results'][0], self.local_user)
+        self.assertEqual(response.context_data["user_results"][0], self.local_user)
diff --git a/bookwyrm/tests/views/test_shelf.py b/bookwyrm/tests/views/test_shelf.py
index 4fa63689..a308fe56 100644
--- a/bookwyrm/tests/views/test_shelf.py
+++ b/bookwyrm/tests/views/test_shelf.py
@@ -1,4 +1,4 @@
-''' test for app action functionality '''
+""" test for app action functionality """
 from unittest.mock import patch
 from django.template.response import TemplateResponse
 from django.test import TestCase
@@ -8,195 +8,172 @@ from bookwyrm import models, views
 from bookwyrm.activitypub import ActivitypubResponse
 
 
-@patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay')
+@patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 class ShelfViews(TestCase):
-    ''' tag views'''
+    """ tag views"""
+
     def setUp(self):
-        ''' we need basic test data and mocks '''
+        """ we need basic test data and mocks """
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
-            'mouse@local.com', 'mouse@mouse.com', 'mouseword',
-            local=True, localname='mouse',
-            remote_id='https://example.com/users/mouse',
+            "mouse@local.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+            remote_id="https://example.com/users/mouse",
         )
-        self.work = models.Work.objects.create(title='Test Work')
+        self.work = models.Work.objects.create(title="Test Work")
         self.book = models.Edition.objects.create(
-            title='Example Edition',
-            remote_id='https://example.com/book/1',
-            parent_work=self.work
+            title="Example Edition",
+            remote_id="https://example.com/book/1",
+            parent_work=self.work,
         )
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             self.shelf = models.Shelf.objects.create(
-                name='Test Shelf',
-                identifier='test-shelf',
-                user=self.local_user
+                name="Test Shelf", identifier="test-shelf", user=self.local_user
             )
         models.SiteSettings.objects.create()
 
-
     def test_shelf_page(self, _):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.Shelf.as_view()
         shelf = self.local_user.shelf_set.first()
-        request = self.factory.get('')
+        request = self.factory.get("")
         request.user = self.local_user
-        with patch('bookwyrm.views.shelf.is_api_request') as is_api:
+        with patch("bookwyrm.views.shelf.is_api_request") as is_api:
             is_api.return_value = False
             result = view(request, self.local_user.username, shelf.identifier)
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
 
-        with patch('bookwyrm.views.shelf.is_api_request') as is_api:
+        with patch("bookwyrm.views.shelf.is_api_request") as is_api:
             is_api.return_value = True
-            result = view(
-                request, self.local_user.username, shelf.identifier)
+            result = view(request, self.local_user.username, shelf.identifier)
         self.assertIsInstance(result, ActivitypubResponse)
         self.assertEqual(result.status_code, 200)
 
-        request = self.factory.get('/?page=1')
+        request = self.factory.get("/?page=1")
         request.user = self.local_user
-        with patch('bookwyrm.views.shelf.is_api_request') as is_api:
+        with patch("bookwyrm.views.shelf.is_api_request") as is_api:
             is_api.return_value = True
-            result = view(
-                request, self.local_user.username, shelf.identifier)
+            result = view(request, self.local_user.username, shelf.identifier)
         self.assertIsInstance(result, ActivitypubResponse)
         self.assertEqual(result.status_code, 200)
 
-
     def test_edit_shelf_privacy(self, _):
-        ''' set name or privacy on shelf '''
+        """ set name or privacy on shelf """
         view = views.Shelf.as_view()
-        shelf = self.local_user.shelf_set.get(identifier='to-read')
-        self.assertEqual(shelf.privacy, 'public')
+        shelf = self.local_user.shelf_set.get(identifier="to-read")
+        self.assertEqual(shelf.privacy, "public")
 
         request = self.factory.post(
-            '', {
-                'privacy': 'unlisted',
-                'user': self.local_user.id,
-                'name': 'To Read',
-            })
+            "",
+            {
+                "privacy": "unlisted",
+                "user": self.local_user.id,
+                "name": "To Read",
+            },
+        )
         request.user = self.local_user
         view(request, self.local_user.username, shelf.identifier)
         shelf.refresh_from_db()
 
-        self.assertEqual(shelf.privacy, 'unlisted')
-
+        self.assertEqual(shelf.privacy, "unlisted")
 
     def test_edit_shelf_name(self, _):
-        ''' change the name of an editable shelf '''
+        """ change the name of an editable shelf """
         view = views.Shelf.as_view()
-        shelf = models.Shelf.objects.create(
-            name='Test Shelf', user=self.local_user)
-        self.assertEqual(shelf.privacy, 'public')
+        shelf = models.Shelf.objects.create(name="Test Shelf", user=self.local_user)
+        self.assertEqual(shelf.privacy, "public")
 
         request = self.factory.post(
-            '', {
-                'privacy': 'public',
-                'user': self.local_user.id,
-                'name': 'cool name'
-            })
+            "", {"privacy": "public", "user": self.local_user.id, "name": "cool name"}
+        )
         request.user = self.local_user
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             view(request, request.user.username, shelf.identifier)
         shelf.refresh_from_db()
 
-        self.assertEqual(shelf.name, 'cool name')
-        self.assertEqual(shelf.identifier, 'testshelf-%d' % shelf.id)
-
+        self.assertEqual(shelf.name, "cool name")
+        self.assertEqual(shelf.identifier, "testshelf-%d" % shelf.id)
 
     def test_edit_shelf_name_not_editable(self, _):
-        ''' can't change the name of an non-editable shelf '''
+        """ can't change the name of an non-editable shelf """
         view = views.Shelf.as_view()
-        shelf = self.local_user.shelf_set.get(identifier='to-read')
-        self.assertEqual(shelf.privacy, 'public')
+        shelf = self.local_user.shelf_set.get(identifier="to-read")
+        self.assertEqual(shelf.privacy, "public")
 
         request = self.factory.post(
-            '', {
-                'privacy': 'public',
-                'user': self.local_user.id,
-                'name': 'cool name'
-            })
+            "", {"privacy": "public", "user": self.local_user.id, "name": "cool name"}
+        )
         request.user = self.local_user
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             view(request, request.user.username, shelf.identifier)
 
-        self.assertEqual(shelf.name, 'To Read')
-
+        self.assertEqual(shelf.name, "To Read")
 
     def test_handle_shelve(self, _):
-        ''' shelve a book '''
-        request = self.factory.post('', {
-            'book': self.book.id,
-            'shelf': self.shelf.identifier
-        })
+        """ shelve a book """
+        request = self.factory.post(
+            "", {"book": self.book.id, "shelf": self.shelf.identifier}
+        )
         request.user = self.local_user
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             views.shelve(request)
         # make sure the book is on the shelf
         self.assertEqual(self.shelf.books.get(), self.book)
 
-
     def test_handle_shelve_to_read(self, _):
-        ''' special behavior for the to-read shelf '''
-        shelf = models.Shelf.objects.get(identifier='to-read')
-        request = self.factory.post('', {
-            'book': self.book.id,
-            'shelf': shelf.identifier
-        })
+        """ special behavior for the to-read shelf """
+        shelf = models.Shelf.objects.get(identifier="to-read")
+        request = self.factory.post(
+            "", {"book": self.book.id, "shelf": shelf.identifier}
+        )
         request.user = self.local_user
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             views.shelve(request)
         # make sure the book is on the shelf
         self.assertEqual(shelf.books.get(), self.book)
 
-
     def test_handle_shelve_reading(self, _):
-        ''' special behavior for the reading shelf '''
-        shelf = models.Shelf.objects.get(identifier='reading')
-        request = self.factory.post('', {
-            'book': self.book.id,
-            'shelf': shelf.identifier
-        })
+        """ special behavior for the reading shelf """
+        shelf = models.Shelf.objects.get(identifier="reading")
+        request = self.factory.post(
+            "", {"book": self.book.id, "shelf": shelf.identifier}
+        )
         request.user = self.local_user
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             views.shelve(request)
         # make sure the book is on the shelf
         self.assertEqual(shelf.books.get(), self.book)
 
-
     def test_handle_shelve_read(self, _):
-        ''' special behavior for the read shelf '''
-        shelf = models.Shelf.objects.get(identifier='read')
-        request = self.factory.post('', {
-            'book': self.book.id,
-            'shelf': shelf.identifier
-        })
+        """ special behavior for the read shelf """
+        shelf = models.Shelf.objects.get(identifier="read")
+        request = self.factory.post(
+            "", {"book": self.book.id, "shelf": shelf.identifier}
+        )
         request.user = self.local_user
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             views.shelve(request)
         # make sure the book is on the shelf
         self.assertEqual(shelf.books.get(), self.book)
 
-
     def test_handle_unshelve(self, _):
-        ''' remove a book from a shelf '''
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        """ remove a book from a shelf """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             models.ShelfBook.objects.create(
-                book=self.book,
-                user=self.local_user,
-                shelf=self.shelf
+                book=self.book, user=self.local_user, shelf=self.shelf
             )
         self.shelf.save()
         self.assertEqual(self.shelf.books.count(), 1)
-        request = self.factory.post('', {
-            'book': self.book.id,
-            'shelf': self.shelf.id
-        })
+        request = self.factory.post("", {"book": self.book.id, "shelf": self.shelf.id})
         request.user = self.local_user
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             views.unshelve(request)
         self.assertEqual(self.shelf.books.count(), 0)
diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py
index 4594a203..7fdc0e06 100644
--- a/bookwyrm/tests/views/test_status.py
+++ b/bookwyrm/tests/views/test_status.py
@@ -1,4 +1,4 @@
-''' test for app action functionality '''
+""" test for app action functionality """
 import json
 from unittest.mock import patch
 from django.test import TestCase
@@ -9,239 +9,247 @@ from bookwyrm.settings import DOMAIN
 
 
 class StatusViews(TestCase):
-    ''' viewing and creating statuses '''
+    """ viewing and creating statuses """
+
     def setUp(self):
-        ''' we need basic test data and mocks '''
+        """ we need basic test data and mocks """
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
-            'mouse@local.com', 'mouse@mouse.com', 'mouseword',
-            local=True, localname='mouse',
-            remote_id='https://example.com/users/mouse',
+            "mouse@local.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+            remote_id="https://example.com/users/mouse",
         )
-        with patch('bookwyrm.models.user.set_remote_server'):
+        with patch("bookwyrm.models.user.set_remote_server"):
             self.remote_user = models.User.objects.create_user(
-                'rat', 'rat@email.com', 'ratword',
+                "rat",
+                "rat@email.com",
+                "ratword",
                 local=False,
-                remote_id='https://example.com/users/rat',
-                inbox='https://example.com/users/rat/inbox',
-                outbox='https://example.com/users/rat/outbox',
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
             )
 
-        work = models.Work.objects.create(title='Test Work')
+        work = models.Work.objects.create(title="Test Work")
         self.book = models.Edition.objects.create(
-            title='Example Edition',
-            remote_id='https://example.com/book/1',
-            parent_work=work
+            title="Example Edition",
+            remote_id="https://example.com/book/1",
+            parent_work=work,
         )
 
-
     def test_handle_status(self):
-        ''' create a status '''
+        """ create a status """
         view = views.CreateStatus.as_view()
-        form = forms.CommentForm({
-            'content': 'hi',
-            'user': self.local_user.id,
-            'book': self.book.id,
-            'privacy': 'public',
-        })
-        request = self.factory.post('', form.data)
+        form = forms.CommentForm(
+            {
+                "content": "hi",
+                "user": self.local_user.id,
+                "book": self.book.id,
+                "privacy": "public",
+            }
+        )
+        request = self.factory.post("", form.data)
         request.user = self.local_user
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            view(request, 'comment')
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            view(request, "comment")
         status = models.Comment.objects.get()
-        self.assertEqual(status.content, '<p>hi</p>')
+        self.assertEqual(status.content, "<p>hi</p>")
         self.assertEqual(status.user, self.local_user)
         self.assertEqual(status.book, self.book)
 
     def test_handle_status_reply(self):
-        ''' create a status in reply to an existing status '''
+        """ create a status in reply to an existing status """
         view = views.CreateStatus.as_view()
         user = models.User.objects.create_user(
-            'rat', 'rat@rat.com', 'password', local=True)
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+            "rat", "rat@rat.com", "password", local=True
+        )
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             parent = models.Status.objects.create(
-                content='parent status', user=self.local_user)
-        form = forms.ReplyForm({
-            'content': 'hi',
-            'user': user.id,
-            'reply_parent': parent.id,
-            'privacy': 'public',
-        })
-        request = self.factory.post('', form.data)
+                content="parent status", user=self.local_user
+            )
+        form = forms.ReplyForm(
+            {
+                "content": "hi",
+                "user": user.id,
+                "reply_parent": parent.id,
+                "privacy": "public",
+            }
+        )
+        request = self.factory.post("", form.data)
         request.user = user
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            view(request, 'reply')
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            view(request, "reply")
         status = models.Status.objects.get(user=user)
-        self.assertEqual(status.content, '<p>hi</p>')
+        self.assertEqual(status.content, "<p>hi</p>")
         self.assertEqual(status.user, user)
-        self.assertEqual(
-            models.Notification.objects.get().user, self.local_user)
+        self.assertEqual(models.Notification.objects.get().user, self.local_user)
 
     def test_handle_status_mentions(self):
-        ''' @mention a user in a post '''
+        """ @mention a user in a post """
         view = views.CreateStatus.as_view()
         user = models.User.objects.create_user(
-            'rat@%s' % DOMAIN, 'rat@rat.com', 'password',
-            local=True, localname='rat')
-        form = forms.CommentForm({
-            'content': 'hi @rat',
-            'user': self.local_user.id,
-            'book': self.book.id,
-            'privacy': 'public',
-        })
-        request = self.factory.post('', form.data)
+            "rat@%s" % DOMAIN, "rat@rat.com", "password", local=True, localname="rat"
+        )
+        form = forms.CommentForm(
+            {
+                "content": "hi @rat",
+                "user": self.local_user.id,
+                "book": self.book.id,
+                "privacy": "public",
+            }
+        )
+        request = self.factory.post("", form.data)
         request.user = self.local_user
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            view(request, 'comment')
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            view(request, "comment")
         status = models.Status.objects.get()
         self.assertEqual(list(status.mention_users.all()), [user])
         self.assertEqual(models.Notification.objects.get().user, user)
         self.assertEqual(
-            status.content,
-            '<p>hi <a href="%s">@rat</a></p>' % user.remote_id)
+            status.content, '<p>hi <a href="%s">@rat</a></p>' % user.remote_id
+        )
 
     def test_handle_status_reply_with_mentions(self):
-        ''' reply to a post with an @mention'ed user '''
+        """ reply to a post with an @mention'ed user """
         view = views.CreateStatus.as_view()
         user = models.User.objects.create_user(
-            'rat', 'rat@rat.com', 'password',
-            local=True, localname='rat')
-        form = forms.CommentForm({
-            'content': 'hi @rat@example.com',
-            'user': self.local_user.id,
-            'book': self.book.id,
-            'privacy': 'public',
-        })
-        request = self.factory.post('', form.data)
+            "rat", "rat@rat.com", "password", local=True, localname="rat"
+        )
+        form = forms.CommentForm(
+            {
+                "content": "hi @rat@example.com",
+                "user": self.local_user.id,
+                "book": self.book.id,
+                "privacy": "public",
+            }
+        )
+        request = self.factory.post("", form.data)
         request.user = self.local_user
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            view(request, 'comment')
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            view(request, "comment")
         status = models.Status.objects.get()
 
-        form = forms.ReplyForm({
-            'content': 'right',
-            'user': user.id,
-            'privacy': 'public',
-            'reply_parent': status.id
-        })
-        request = self.factory.post('', form.data)
+        form = forms.ReplyForm(
+            {
+                "content": "right",
+                "user": user.id,
+                "privacy": "public",
+                "reply_parent": status.id,
+            }
+        )
+        request = self.factory.post("", form.data)
         request.user = user
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            view(request, 'reply')
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            view(request, "reply")
 
         reply = models.Status.replies(status).first()
-        self.assertEqual(reply.content, '<p>right</p>')
+        self.assertEqual(reply.content, "<p>right</p>")
         self.assertEqual(reply.user, user)
         # the mentioned user in the parent post is only included if @'ed
         self.assertFalse(self.remote_user in reply.mention_users.all())
         self.assertTrue(self.local_user in reply.mention_users.all())
 
     def test_find_mentions(self):
-        ''' detect and look up @ mentions of users '''
+        """ detect and look up @ mentions of users """
         user = models.User.objects.create_user(
-            'nutria@%s' % DOMAIN, 'nutria@nutria.com', 'password',
-            local=True, localname='nutria')
-        self.assertEqual(user.username, 'nutria@%s' % DOMAIN)
+            "nutria@%s" % DOMAIN,
+            "nutria@nutria.com",
+            "password",
+            local=True,
+            localname="nutria",
+        )
+        self.assertEqual(user.username, "nutria@%s" % DOMAIN)
 
         self.assertEqual(
-            list(views.status.find_mentions('@nutria'))[0],
-            ('@nutria', user)
+            list(views.status.find_mentions("@nutria"))[0], ("@nutria", user)
         )
         self.assertEqual(
-            list(views.status.find_mentions('leading text @nutria'))[0],
-            ('@nutria', user)
+            list(views.status.find_mentions("leading text @nutria"))[0],
+            ("@nutria", user),
         )
         self.assertEqual(
-            list(views.status.find_mentions(
-                'leading @nutria trailing text'))[0],
-            ('@nutria', user)
+            list(views.status.find_mentions("leading @nutria trailing text"))[0],
+            ("@nutria", user),
         )
         self.assertEqual(
-            list(views.status.find_mentions(
-                '@rat@example.com'))[0],
-            ('@rat@example.com', self.remote_user)
+            list(views.status.find_mentions("@rat@example.com"))[0],
+            ("@rat@example.com", self.remote_user),
         )
 
-        multiple = list(views.status.find_mentions(
-            '@nutria and @rat@example.com'))
-        self.assertEqual(multiple[0], ('@nutria', user))
-        self.assertEqual(multiple[1], ('@rat@example.com', self.remote_user))
+        multiple = list(views.status.find_mentions("@nutria and @rat@example.com"))
+        self.assertEqual(multiple[0], ("@nutria", user))
+        self.assertEqual(multiple[1], ("@rat@example.com", self.remote_user))
 
-        with patch('bookwyrm.views.status.handle_remote_webfinger') as rw:
+        with patch("bookwyrm.views.status.handle_remote_webfinger") as rw:
             rw.return_value = self.local_user
             self.assertEqual(
-                list(views.status.find_mentions('@beep@beep.com'))[0],
-                ('@beep@beep.com', self.local_user)
+                list(views.status.find_mentions("@beep@beep.com"))[0],
+                ("@beep@beep.com", self.local_user),
             )
-        with patch('bookwyrm.views.status.handle_remote_webfinger') as rw:
+        with patch("bookwyrm.views.status.handle_remote_webfinger") as rw:
             rw.return_value = None
-            self.assertEqual(list(views.status.find_mentions(
-                '@beep@beep.com')), [])
+            self.assertEqual(list(views.status.find_mentions("@beep@beep.com")), [])
 
         self.assertEqual(
-            list(views.status.find_mentions('@nutria@%s' % DOMAIN))[0],
-            ('@nutria@%s' % DOMAIN, user)
+            list(views.status.find_mentions("@nutria@%s" % DOMAIN))[0],
+            ("@nutria@%s" % DOMAIN, user),
         )
 
     def test_format_links(self):
-        ''' find and format urls into a tags '''
-        url = 'http://www.fish.com/'
+        """ find and format urls into a tags """
+        url = "http://www.fish.com/"
+        self.assertEqual(
+            views.status.format_links(url), '<a href="%s">www.fish.com/</a>' % url
+        )
+        self.assertEqual(
+            views.status.format_links("(%s)" % url),
+            '(<a href="%s">www.fish.com/</a>)' % url,
+        )
+        url = "https://archive.org/details/dli.granth.72113/page/n25/mode/2up"
         self.assertEqual(
             views.status.format_links(url),
-            '<a href="%s">www.fish.com/</a>' % url)
-        self.assertEqual(
-            views.status.format_links('(%s)' % url),
-            '(<a href="%s">www.fish.com/</a>)' % url)
-        url = 'https://archive.org/details/dli.granth.72113/page/n25/mode/2up'
+            '<a href="%s">'
+            "archive.org/details/dli.granth.72113/page/n25/mode/2up</a>" % url,
+        )
+        url = "https://openlibrary.org/search" "?q=arkady+strugatsky&mode=everything"
         self.assertEqual(
             views.status.format_links(url),
-            '<a href="%s">' \
-                'archive.org/details/dli.granth.72113/page/n25/mode/2up</a>' \
-                % url)
-        url = 'https://openlibrary.org/search' \
-               '?q=arkady+strugatsky&mode=everything'
-        self.assertEqual(
-            views.status.format_links(url),
-            '<a href="%s">openlibrary.org/search' \
-                '?q=arkady+strugatsky&mode=everything</a>' % url)
-
+            '<a href="%s">openlibrary.org/search'
+            "?q=arkady+strugatsky&mode=everything</a>" % url,
+        )
 
     def test_to_markdown(self):
-        ''' this is mostly handled in other places, but nonetheless '''
-        text = '_hi_ and http://fish.com is <marquee>rad</marquee>'
+        """ this is mostly handled in other places, but nonetheless """
+        text = "_hi_ and http://fish.com is <marquee>rad</marquee>"
         result = views.status.to_markdown(text)
         self.assertEqual(
             result,
-            '<p><em>hi</em> and <a href="http://fish.com">fish.com</a> ' \
-                    'is rad</p>')
-
+            '<p><em>hi</em> and <a href="http://fish.com">fish.com</a> ' "is rad</p>",
+        )
 
     def test_to_markdown_link(self):
-        ''' this is mostly handled in other places, but nonetheless '''
-        text = '[hi](http://fish.com) is <marquee>rad</marquee>'
+        """ this is mostly handled in other places, but nonetheless """
+        text = "[hi](http://fish.com) is <marquee>rad</marquee>"
         result = views.status.to_markdown(text)
-        self.assertEqual(
-            result,
-            '<p><a href="http://fish.com">hi</a> ' \
-                    'is rad</p>')
-
+        self.assertEqual(result, '<p><a href="http://fish.com">hi</a> ' "is rad</p>")
 
     def test_handle_delete_status(self):
-        ''' marks a status as deleted '''
+        """ marks a status as deleted """
         view = views.DeleteStatus.as_view()
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            status = models.Status.objects.create(
-                user=self.local_user, content='hi')
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            status = models.Status.objects.create(user=self.local_user, content="hi")
         self.assertFalse(status.deleted)
-        request = self.factory.post('')
+        request = self.factory.post("")
         request.user = self.local_user
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay') \
-                as mock:
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
             view(request, status.id)
             activity = json.loads(mock.call_args_list[0][0][1])
-            self.assertEqual(activity['type'], 'Delete')
-            self.assertEqual(activity['object']['type'], 'Tombstone')
+            self.assertEqual(activity["type"], "Delete")
+            self.assertEqual(activity["object"]["type"], "Tombstone")
         status.refresh_from_db()
         self.assertTrue(status.deleted)
diff --git a/bookwyrm/tests/views/test_tag.py b/bookwyrm/tests/views/test_tag.py
index ef809b46..6ad6ab25 100644
--- a/bookwyrm/tests/views/test_tag.py
+++ b/bookwyrm/tests/views/test_tag.py
@@ -1,4 +1,4 @@
-''' test for app action functionality '''
+""" test for app action functionality """
 from unittest.mock import patch
 from django.contrib.auth.models import Group, Permission
 from django.contrib.contenttypes.models import ContentType
@@ -11,107 +11,109 @@ from bookwyrm.activitypub import ActivitypubResponse
 
 
 class TagViews(TestCase):
-    ''' tag views'''
+    """ tag views"""
+
     def setUp(self):
-        ''' we need basic test data and mocks '''
+        """ we need basic test data and mocks """
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
-            'mouse@local.com', 'mouse@mouse.com', 'mouseword',
-            local=True, localname='mouse',
-            remote_id='https://example.com/users/mouse',
+            "mouse@local.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+            remote_id="https://example.com/users/mouse",
         )
-        self.group = Group.objects.create(name='editor')
+        self.group = Group.objects.create(name="editor")
         self.group.permissions.add(
             Permission.objects.create(
-                name='edit_book',
-                codename='edit_book',
-                content_type=ContentType.objects.get_for_model(models.User)).id
+                name="edit_book",
+                codename="edit_book",
+                content_type=ContentType.objects.get_for_model(models.User),
+            ).id
         )
-        self.work = models.Work.objects.create(title='Test Work')
+        self.work = models.Work.objects.create(title="Test Work")
         self.book = models.Edition.objects.create(
-            title='Example Edition',
-            remote_id='https://example.com/book/1',
-            parent_work=self.work
+            title="Example Edition",
+            remote_id="https://example.com/book/1",
+            parent_work=self.work,
         )
         models.SiteSettings.objects.create()
 
-
     def test_tag_page(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.Tag.as_view()
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            tag = models.Tag.objects.create(name='hi there')
-            models.UserTag.objects.create(
-                tag=tag, user=self.local_user, book=self.book)
-        request = self.factory.get('')
-        with patch('bookwyrm.views.tag.is_api_request') as is_api:
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            tag = models.Tag.objects.create(name="hi there")
+            models.UserTag.objects.create(tag=tag, user=self.local_user, book=self.book)
+        request = self.factory.get("")
+        with patch("bookwyrm.views.tag.is_api_request") as is_api:
             is_api.return_value = False
             result = view(request, tag.identifier)
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
 
-        request = self.factory.get('')
-        with patch('bookwyrm.views.tag.is_api_request') as is_api:
+        request = self.factory.get("")
+        with patch("bookwyrm.views.tag.is_api_request") as is_api:
             is_api.return_value = True
             result = view(request, tag.identifier)
         self.assertIsInstance(result, ActivitypubResponse)
         self.assertEqual(result.status_code, 200)
 
-
     def test_tag_page_activitypub_page(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.Tag.as_view()
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            tag = models.Tag.objects.create(name='hi there')
-            models.UserTag.objects.create(
-                tag=tag, user=self.local_user, book=self.book)
-        request = self.factory.get('', {'page': 1})
-        with patch('bookwyrm.views.tag.is_api_request') as is_api:
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            tag = models.Tag.objects.create(name="hi there")
+            models.UserTag.objects.create(tag=tag, user=self.local_user, book=self.book)
+        request = self.factory.get("", {"page": 1})
+        with patch("bookwyrm.views.tag.is_api_request") as is_api:
             is_api.return_value = True
             result = view(request, tag.identifier)
         self.assertIsInstance(result, ActivitypubResponse)
         self.assertEqual(result.status_code, 200)
 
-
     def test_tag(self):
-        ''' add a tag to a book '''
+        """ add a tag to a book """
         view = views.AddTag.as_view()
         request = self.factory.post(
-            '', {
-                'name': 'A Tag!?',
-                'book': self.book.id,
-            })
+            "",
+            {
+                "name": "A Tag!?",
+                "book": self.book.id,
+            },
+        )
         request.user = self.local_user
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             view(request)
 
         tag = models.Tag.objects.get()
         user_tag = models.UserTag.objects.get()
-        self.assertEqual(tag.name, 'A Tag!?')
-        self.assertEqual(tag.identifier, 'A+Tag%21%3F')
+        self.assertEqual(tag.name, "A Tag!?")
+        self.assertEqual(tag.identifier, "A+Tag%21%3F")
         self.assertEqual(user_tag.user, self.local_user)
         self.assertEqual(user_tag.book, self.book)
 
-
     def test_untag(self):
-        ''' remove a tag from a book '''
+        """ remove a tag from a book """
         view = views.RemoveTag.as_view()
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
-            tag = models.Tag.objects.create(name='A Tag!?')
-            models.UserTag.objects.create(
-                user=self.local_user, book=self.book, tag=tag)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            tag = models.Tag.objects.create(name="A Tag!?")
+            models.UserTag.objects.create(user=self.local_user, book=self.book, tag=tag)
         request = self.factory.post(
-            '', {
-                'user': self.local_user.id,
-                'book': self.book.id,
-                'name': tag.name,
-            })
+            "",
+            {
+                "user": self.local_user.id,
+                "book": self.book.id,
+                "name": tag.name,
+            },
+        )
         request.user = self.local_user
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             view(request)
 
-        self.assertTrue(models.Tag.objects.filter(name='A Tag!?').exists())
+        self.assertTrue(models.Tag.objects.filter(name="A Tag!?").exists())
         self.assertFalse(models.UserTag.objects.exists())
diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py
index f08c17e7..596ea8bf 100644
--- a/bookwyrm/tests/views/test_user.py
+++ b/bookwyrm/tests/views/test_user.py
@@ -1,4 +1,4 @@
-''' test for app action functionality '''
+""" test for app action functionality """
 import pathlib
 from unittest.mock import patch
 from PIL import Image
@@ -15,180 +15,177 @@ from bookwyrm.activitypub import ActivitypubResponse
 
 
 class UserViews(TestCase):
-    ''' view user and edit profile '''
+    """ view user and edit profile """
+
     def setUp(self):
-        ''' we need basic test data and mocks '''
+        """ we need basic test data and mocks """
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
-            'mouse@local.com', 'mouse@mouse.mouse', 'password',
-            local=True, localname='mouse')
+            "mouse@local.com",
+            "mouse@mouse.mouse",
+            "password",
+            local=True,
+            localname="mouse",
+        )
         self.rat = models.User.objects.create_user(
-            'rat@local.com', 'rat@rat.rat', 'password',
-            local=True, localname='rat')
+            "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat"
+        )
         models.SiteSettings.objects.create()
         self.anonymous_user = AnonymousUser
         self.anonymous_user.is_authenticated = False
 
-
     def test_user_page(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.User.as_view()
-        request = self.factory.get('')
+        request = self.factory.get("")
         request.user = self.local_user
-        with patch('bookwyrm.views.user.is_api_request') as is_api:
+        with patch("bookwyrm.views.user.is_api_request") as is_api:
             is_api.return_value = False
-            result = view(request, 'mouse')
+            result = view(request, "mouse")
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
 
         request.user = self.anonymous_user
-        with patch('bookwyrm.views.user.is_api_request') as is_api:
+        with patch("bookwyrm.views.user.is_api_request") as is_api:
             is_api.return_value = False
-            result = view(request, 'mouse')
+            result = view(request, "mouse")
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
 
-        with patch('bookwyrm.views.user.is_api_request') as is_api:
+        with patch("bookwyrm.views.user.is_api_request") as is_api:
             is_api.return_value = True
-            result = view(request, 'mouse')
+            result = view(request, "mouse")
         self.assertIsInstance(result, ActivitypubResponse)
         self.assertEqual(result.status_code, 200)
 
-
     def test_user_page_blocked(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.User.as_view()
-        request = self.factory.get('')
+        request = self.factory.get("")
         request.user = self.local_user
         self.rat.blocks.add(self.local_user)
-        with patch('bookwyrm.views.user.is_api_request') as is_api:
+        with patch("bookwyrm.views.user.is_api_request") as is_api:
             is_api.return_value = False
-            result = view(request, 'rat')
+            result = view(request, "rat")
         self.assertEqual(result.status_code, 404)
 
-
     def test_followers_page(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.Followers.as_view()
-        request = self.factory.get('')
+        request = self.factory.get("")
         request.user = self.local_user
-        with patch('bookwyrm.views.user.is_api_request') as is_api:
+        with patch("bookwyrm.views.user.is_api_request") as is_api:
             is_api.return_value = False
-            result = view(request, 'mouse')
+            result = view(request, "mouse")
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
 
-        with patch('bookwyrm.views.user.is_api_request') as is_api:
+        with patch("bookwyrm.views.user.is_api_request") as is_api:
             is_api.return_value = True
-            result = view(request, 'mouse')
+            result = view(request, "mouse")
         self.assertIsInstance(result, ActivitypubResponse)
         self.assertEqual(result.status_code, 200)
 
-
     def test_followers_page_blocked(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.Followers.as_view()
-        request = self.factory.get('')
+        request = self.factory.get("")
         request.user = self.local_user
         self.rat.blocks.add(self.local_user)
-        with patch('bookwyrm.views.user.is_api_request') as is_api:
+        with patch("bookwyrm.views.user.is_api_request") as is_api:
             is_api.return_value = False
-            result = view(request, 'rat')
+            result = view(request, "rat")
         self.assertEqual(result.status_code, 404)
 
-
     def test_following_page(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.Following.as_view()
-        request = self.factory.get('')
+        request = self.factory.get("")
         request.user = self.local_user
-        with patch('bookwyrm.views.user.is_api_request') as is_api:
+        with patch("bookwyrm.views.user.is_api_request") as is_api:
             is_api.return_value = False
-            result = view(request, 'mouse')
+            result = view(request, "mouse")
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
 
-        with patch('bookwyrm.views.user.is_api_request') as is_api:
+        with patch("bookwyrm.views.user.is_api_request") as is_api:
             is_api.return_value = True
-            result = view(request, 'mouse')
+            result = view(request, "mouse")
         self.assertIsInstance(result, ActivitypubResponse)
         self.assertEqual(result.status_code, 200)
 
-
     def test_following_page_blocked(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.Following.as_view()
-        request = self.factory.get('')
+        request = self.factory.get("")
         request.user = self.local_user
         self.rat.blocks.add(self.local_user)
-        with patch('bookwyrm.views.user.is_api_request') as is_api:
+        with patch("bookwyrm.views.user.is_api_request") as is_api:
             is_api.return_value = False
-            result = view(request, 'rat')
+            result = view(request, "rat")
         self.assertEqual(result.status_code, 404)
 
-
     def test_edit_user_page(self):
-        ''' there are so many views, this just makes sure it LOADS '''
+        """ there are so many views, this just makes sure it LOADS """
         view = views.EditUser.as_view()
-        request = self.factory.get('')
+        request = self.factory.get("")
         request.user = self.local_user
         result = view(request)
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
 
-
     def test_edit_user(self):
-        ''' use a form to update a user '''
+        """ use a form to update a user """
         view = views.EditUser.as_view()
         form = forms.EditUserForm(instance=self.local_user)
-        form.data['name'] = 'New Name'
-        form.data['email'] = 'wow@email.com'
-        request = self.factory.post('', form.data)
+        form.data["name"] = "New Name"
+        form.data["email"] = "wow@email.com"
+        request = self.factory.post("", form.data)
         request.user = self.local_user
 
         self.assertIsNone(self.local_user.name)
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay') \
-                as delay_mock:
+        with patch(
+            "bookwyrm.models.activitypub_mixin.broadcast_task.delay"
+        ) as delay_mock:
             view(request)
             self.assertEqual(delay_mock.call_count, 1)
-        self.assertEqual(self.local_user.name, 'New Name')
-        self.assertEqual(self.local_user.email, 'wow@email.com')
+        self.assertEqual(self.local_user.name, "New Name")
+        self.assertEqual(self.local_user.email, "wow@email.com")
 
+    # idk how to mock the upload form, got tired of triyng to make it work
+    #     def test_edit_user_avatar(self):
+    #         ''' use a form to update a user '''
+    #         view = views.EditUser.as_view()
+    #         form = forms.EditUserForm(instance=self.local_user)
+    #         form.data['name'] = 'New Name'
+    #         form.data['email'] = 'wow@email.com'
+    #         image_file = pathlib.Path(__file__).parent.joinpath(
+    #             '../../static/images/no_cover.jpg')
+    #         image = Image.open(image_file)
+    #         form.files['avatar'] = SimpleUploadedFile(
+    #             image_file, open(image_file), content_type='image/jpeg')
+    #         request = self.factory.post('', form.data, form.files)
+    #         request.user = self.local_user
 
-# idk how to mock the upload form, got tired of triyng to make it work
-#     def test_edit_user_avatar(self):
-#         ''' use a form to update a user '''
-#         view = views.EditUser.as_view()
-#         form = forms.EditUserForm(instance=self.local_user)
-#         form.data['name'] = 'New Name'
-#         form.data['email'] = 'wow@email.com'
-#         image_file = pathlib.Path(__file__).parent.joinpath(
-#             '../../static/images/no_cover.jpg')
-#         image = Image.open(image_file)
-#         form.files['avatar'] = SimpleUploadedFile(
-#             image_file, open(image_file), content_type='image/jpeg')
-#         request = self.factory.post('', form.data, form.files)
-#         request.user = self.local_user
-
-#         with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay') \
-#                 as delay_mock:
-#             view(request)
-#             self.assertEqual(delay_mock.call_count, 1)
-#         self.assertEqual(self.local_user.name, 'New Name')
-#         self.assertEqual(self.local_user.email, 'wow@email.com')
-#         self.assertIsNotNone(self.local_user.avatar)
-#         self.assertEqual(self.local_user.avatar.size, (120, 120))
-
+    #         with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay') \
+    #                 as delay_mock:
+    #             view(request)
+    #             self.assertEqual(delay_mock.call_count, 1)
+    #         self.assertEqual(self.local_user.name, 'New Name')
+    #         self.assertEqual(self.local_user.email, 'wow@email.com')
+    #         self.assertIsNotNone(self.local_user.avatar)
+    #         self.assertEqual(self.local_user.avatar.size, (120, 120))
 
     def test_crop_avatar(self):
-        ''' reduce that image size '''
+        """ reduce that image size """
         image_file = pathlib.Path(__file__).parent.joinpath(
-            '../../static/images/no_cover.jpg')
+            "../../static/images/no_cover.jpg"
+        )
         image = Image.open(image_file)
 
         result = views.user.crop_avatar(image)
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 1c3da301..8aaf2951 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -1,4 +1,4 @@
-''' url routing for the app and api '''
+""" url routing for the app and api """
 from django.conf.urls.static import static
 from django.contrib import admin
 from django.urls import path, re_path
@@ -7,170 +7,157 @@ from django.urls import path, re_path
 from bookwyrm import settings, views, wellknown
 from bookwyrm.utils import regex
 
-user_path = r'^user/(?P<username>%s)' % regex.username
-local_user_path = r'^user/(?P<username>%s)' % regex.localname
+user_path = r"^user/(?P<username>%s)" % regex.username
+local_user_path = r"^user/(?P<username>%s)" % regex.localname
 
-status_types = [
-    'status',
-    'review',
-    'comment',
-    'quotation',
-    'boost',
-    'generatednote'
-]
-status_path = r'%s/(%s)/(?P<status_id>\d+)' % \
-        (user_path, '|'.join(status_types))
+status_types = ["status", "review", "comment", "quotation", "boost", "generatednote"]
+status_path = r"%s/(%s)/(?P<status_id>\d+)" % (user_path, "|".join(status_types))
 
-book_path = r'^book/(?P<book_id>\d+)'
+book_path = r"^book/(?P<book_id>\d+)"
 
-handler404 = 'bookwyrm.views.not_found_page'
-handler500 = 'bookwyrm.views.server_error_page'
+handler404 = "bookwyrm.views.not_found_page"
+handler500 = "bookwyrm.views.server_error_page"
 urlpatterns = [
-    path('admin/', admin.site.urls),
-
+    path("admin/", admin.site.urls),
     # federation endpoints
-    re_path(r'^inbox/?$', views.Inbox.as_view()),
-    re_path(r'%s/inbox/?$' % local_user_path, views.Inbox.as_view()),
-    re_path(r'%s/outbox/?$' % local_user_path, views.Outbox.as_view()),
-    re_path(r'^.well-known/webfinger/?$', wellknown.webfinger),
-    re_path(r'^.well-known/nodeinfo/?$', wellknown.nodeinfo_pointer),
-    re_path(r'^nodeinfo/2\.0/?$', wellknown.nodeinfo),
-    re_path(r'^api/v1/instance/?$', wellknown.instance_info),
-    re_path(r'^api/v1/instance/peers/?$', wellknown.peers),
-
+    re_path(r"^inbox/?$", views.Inbox.as_view()),
+    re_path(r"%s/inbox/?$" % local_user_path, views.Inbox.as_view()),
+    re_path(r"%s/outbox/?$" % local_user_path, views.Outbox.as_view()),
+    re_path(r"^.well-known/webfinger/?$", wellknown.webfinger),
+    re_path(r"^.well-known/nodeinfo/?$", wellknown.nodeinfo_pointer),
+    re_path(r"^nodeinfo/2\.0/?$", wellknown.nodeinfo),
+    re_path(r"^api/v1/instance/?$", wellknown.instance_info),
+    re_path(r"^api/v1/instance/peers/?$", wellknown.peers),
     # polling updates
-    re_path('^api/updates/notifications/?$', views.Updates.as_view()),
-
+    re_path("^api/updates/notifications/?$", views.Updates.as_view()),
     # authentication
-    re_path(r'^login/?$', views.Login.as_view()),
-    re_path(r'^register/?$', views.Register.as_view()),
-    re_path(r'^logout/?$', views.Logout.as_view()),
-    re_path(r'^password-reset/?$', views.PasswordResetRequest.as_view()),
-    re_path(r'^password-reset/(?P<code>[A-Za-z0-9]+)/?$',
-            views.PasswordReset.as_view()),
-
+    re_path(r"^login/?$", views.Login.as_view()),
+    re_path(r"^register/?$", views.Register.as_view()),
+    re_path(r"^logout/?$", views.Logout.as_view()),
+    re_path(r"^password-reset/?$", views.PasswordResetRequest.as_view()),
+    re_path(
+        r"^password-reset/(?P<code>[A-Za-z0-9]+)/?$", views.PasswordReset.as_view()
+    ),
     # admin
-    re_path(r'^settings/site-settings',
-            views.Site.as_view(), name='settings-site'),
-    re_path(r'^settings/federation',
-            views.Federation.as_view(), name='settings-federation'),
-    re_path(r'^settings/invites/?$',
-            views.ManageInvites.as_view(), name='settings-invites'),
-    re_path(r'^invite/(?P<code>[A-Za-z0-9]+)/?$', views.Invite.as_view()),
-
+    re_path(r"^settings/site-settings", views.Site.as_view(), name="settings-site"),
+    re_path(
+        r"^settings/federation", views.Federation.as_view(), name="settings-federation"
+    ),
+    re_path(
+        r"^settings/invites/?$", views.ManageInvites.as_view(), name="settings-invites"
+    ),
+    re_path(r"^invite/(?P<code>[A-Za-z0-9]+)/?$", views.Invite.as_view()),
     # landing pages
-    re_path(r'^about/?$', views.About.as_view()),
-    path('', views.Home.as_view()),
-    re_path(r'^discover/?$', views.Discover.as_view()),
-    re_path(r'^notifications/?$', views.Notifications.as_view()),
-
+    re_path(r"^about/?$", views.About.as_view()),
+    path("", views.Home.as_view()),
+    re_path(r"^discover/?$", views.Discover.as_view()),
+    re_path(r"^notifications/?$", views.Notifications.as_view()),
     # feeds
-    re_path(r'^(?P<tab>home|local|federated)/?$', views.Feed.as_view()),
-    re_path(r'^direct-messages/?$', views.DirectMessage.as_view()),
-    re_path(r'^direct-messages/(?P<username>%s)?$' % regex.username,
-            views.DirectMessage.as_view()),
-
+    re_path(r"^(?P<tab>home|local|federated)/?$", views.Feed.as_view()),
+    re_path(r"^direct-messages/?$", views.DirectMessage.as_view()),
+    re_path(
+        r"^direct-messages/(?P<username>%s)?$" % regex.username,
+        views.DirectMessage.as_view(),
+    ),
     # search
-    re_path(r'^search/?$', views.Search.as_view()),
-
+    re_path(r"^search/?$", views.Search.as_view()),
     # imports
-    re_path(r'^import/?$', views.Import.as_view()),
-    re_path(r'^import/(\d+)/?$', views.ImportStatus.as_view()),
-
+    re_path(r"^import/?$", views.Import.as_view()),
+    re_path(r"^import/(\d+)/?$", views.ImportStatus.as_view()),
     # users
-    re_path(r'%s/?$' % user_path, views.User.as_view(), name='user-feed'),
-    re_path(r'%s\.json$' % user_path, views.User.as_view()),
-    re_path(r'%s/rss' % user_path, views.rss_feed.RssFeed(), name='user-rss'),
-    re_path(r'%s/followers(.json)?/?$' % user_path,
-            views.Followers.as_view(), name='user-followers'),
-    re_path(r'%s/following(.json)?/?$' % user_path,
-            views.Following.as_view(), name='user-following'),
-    re_path(r'%s/shelves/?$' % user_path,
-            views.user_shelves_page, name='user-shelves'),
-    re_path(r'%s/lists/?$' % user_path,
-            views.UserLists.as_view(), name='user-lists'),
-    re_path(r'%s/goal/(?P<year>\d{4})/?$' % user_path,
-            views.Goal.as_view(), name='user-goal'),
-
-
+    re_path(r"%s/?$" % user_path, views.User.as_view(), name="user-feed"),
+    re_path(r"%s\.json$" % user_path, views.User.as_view()),
+    re_path(r"%s/rss" % user_path, views.rss_feed.RssFeed(), name="user-rss"),
+    re_path(
+        r"%s/followers(.json)?/?$" % user_path,
+        views.Followers.as_view(),
+        name="user-followers",
+    ),
+    re_path(
+        r"%s/following(.json)?/?$" % user_path,
+        views.Following.as_view(),
+        name="user-following",
+    ),
+    re_path(r"%s/shelves/?$" % user_path, views.user_shelves_page, name="user-shelves"),
+    re_path(r"%s/lists/?$" % user_path, views.UserLists.as_view(), name="user-lists"),
+    re_path(
+        r"%s/goal/(?P<year>\d{4})/?$" % user_path,
+        views.Goal.as_view(),
+        name="user-goal",
+    ),
     # lists
-    re_path(r'^list/?$', views.Lists.as_view(), name='lists'),
-    re_path(r'^list/(?P<list_id>\d+)(.json)?/?$',
-            views.List.as_view(), name='list'),
-    re_path(r'^list/(?P<list_id>\d+)/add/?$',
-            views.list.add_book, name='list-add-book'),
-    re_path(r'^list/(?P<list_id>\d+)/remove/?$',
-            views.list.remove_book, name='list-remove-book'),
-    re_path(r'^list/(?P<list_id>\d+)/curate/?$',
-            views.Curate.as_view(), name='list-curate'),
-
+    re_path(r"^list/?$", views.Lists.as_view(), name="lists"),
+    re_path(r"^list/(?P<list_id>\d+)(.json)?/?$", views.List.as_view(), name="list"),
+    re_path(
+        r"^list/(?P<list_id>\d+)/add/?$", views.list.add_book, name="list-add-book"
+    ),
+    re_path(
+        r"^list/(?P<list_id>\d+)/remove/?$",
+        views.list.remove_book,
+        name="list-remove-book",
+    ),
+    re_path(
+        r"^list/(?P<list_id>\d+)/curate/?$", views.Curate.as_view(), name="list-curate"
+    ),
     # preferences
-    re_path(r'^preferences/profile/?$',
-            views.EditUser.as_view(), name='prefs-profile'),
-    re_path(r'^preferences/password/?$', views.ChangePassword.as_view()),
-    re_path(r'^preferences/block/?$', views.Block.as_view()),
-    re_path(r'^block/(?P<user_id>\d+)/?$', views.Block.as_view()),
-    re_path(r'^unblock/(?P<user_id>\d+)/?$', views.unblock),
-
+    re_path(r"^preferences/profile/?$", views.EditUser.as_view(), name="prefs-profile"),
+    re_path(r"^preferences/password/?$", views.ChangePassword.as_view()),
+    re_path(r"^preferences/block/?$", views.Block.as_view()),
+    re_path(r"^block/(?P<user_id>\d+)/?$", views.Block.as_view()),
+    re_path(r"^unblock/(?P<user_id>\d+)/?$", views.unblock),
     # statuses
-    re_path(r'%s(.json)?/?$' % status_path, views.Status.as_view()),
-    re_path(r'%s/activity/?$' % status_path, views.Status.as_view()),
-    re_path(r'%s/replies(.json)?/?$' % status_path, views.Replies.as_view()),
-    re_path(r'^post/(?P<status_type>\w+)/?$', views.CreateStatus.as_view()),
-    re_path(r'^delete-status/(?P<status_id>\d+)/?$',
-            views.DeleteStatus.as_view()),
-
+    re_path(r"%s(.json)?/?$" % status_path, views.Status.as_view()),
+    re_path(r"%s/activity/?$" % status_path, views.Status.as_view()),
+    re_path(r"%s/replies(.json)?/?$" % status_path, views.Replies.as_view()),
+    re_path(r"^post/(?P<status_type>\w+)/?$", views.CreateStatus.as_view()),
+    re_path(r"^delete-status/(?P<status_id>\d+)/?$", views.DeleteStatus.as_view()),
     # interact
-    re_path(r'^favorite/(?P<status_id>\d+)/?$', views.Favorite.as_view()),
-    re_path(r'^unfavorite/(?P<status_id>\d+)/?$', views.Unfavorite.as_view()),
-    re_path(r'^boost/(?P<status_id>\d+)/?$', views.Boost.as_view()),
-    re_path(r'^unboost/(?P<status_id>\d+)/?$', views.Unboost.as_view()),
-
+    re_path(r"^favorite/(?P<status_id>\d+)/?$", views.Favorite.as_view()),
+    re_path(r"^unfavorite/(?P<status_id>\d+)/?$", views.Unfavorite.as_view()),
+    re_path(r"^boost/(?P<status_id>\d+)/?$", views.Boost.as_view()),
+    re_path(r"^unboost/(?P<status_id>\d+)/?$", views.Unboost.as_view()),
     # books
-    re_path(r'%s(.json)?/?$' % book_path, views.Book.as_view()),
-    re_path(r'%s/edit/?$' % book_path, views.EditBook.as_view()),
-    re_path(r'%s/editions(.json)?/?$' % book_path, views.Editions.as_view()),
-    re_path(r'^upload-cover/(?P<book_id>\d+)/?$', views.upload_cover),
-    re_path(r'^add-description/(?P<book_id>\d+)/?$', views.add_description),
-    re_path(r'^resolve-book/?$', views.resolve_book),
-    re_path(r'^switch-edition/?$', views.switch_edition),
-
+    re_path(r"%s(.json)?/?$" % book_path, views.Book.as_view()),
+    re_path(r"%s/edit/?$" % book_path, views.EditBook.as_view()),
+    re_path(r"%s/editions(.json)?/?$" % book_path, views.Editions.as_view()),
+    re_path(r"^upload-cover/(?P<book_id>\d+)/?$", views.upload_cover),
+    re_path(r"^add-description/(?P<book_id>\d+)/?$", views.add_description),
+    re_path(r"^resolve-book/?$", views.resolve_book),
+    re_path(r"^switch-edition/?$", views.switch_edition),
     # isbn
-    re_path(r'^isbn/(?P<isbn>\d+)(.json)?/?$', views.Isbn.as_view()),
-
+    re_path(r"^isbn/(?P<isbn>\d+)(.json)?/?$", views.Isbn.as_view()),
     # author
-    re_path(r'^author/(?P<author_id>\d+)(.json)?/?$', views.Author.as_view()),
-    re_path(r'^author/(?P<author_id>\d+)/edit/?$', views.EditAuthor.as_view()),
-
+    re_path(r"^author/(?P<author_id>\d+)(.json)?/?$", views.Author.as_view()),
+    re_path(r"^author/(?P<author_id>\d+)/edit/?$", views.EditAuthor.as_view()),
     # tags
-    re_path(r'^tag/(?P<tag_id>.+)\.json/?$', views.Tag.as_view()),
-    re_path(r'^tag/(?P<tag_id>.+)/?$', views.Tag.as_view()),
-    re_path(r'^tag/?$', views.AddTag.as_view()),
-    re_path(r'^untag/?$', views.RemoveTag.as_view()),
-
+    re_path(r"^tag/(?P<tag_id>.+)\.json/?$", views.Tag.as_view()),
+    re_path(r"^tag/(?P<tag_id>.+)/?$", views.Tag.as_view()),
+    re_path(r"^tag/?$", views.AddTag.as_view()),
+    re_path(r"^untag/?$", views.RemoveTag.as_view()),
     # shelf
-    re_path(r'^%s/shelf/(?P<shelf_identifier>[\w-]+)(.json)?/?$' % \
-            user_path, views.Shelf.as_view(), name='shelf'),
-    re_path(r'^%s/shelf/(?P<shelf_identifier>[\w-]+)(.json)?/?$' % \
-            local_user_path, views.Shelf.as_view()),
-    re_path(r'^create-shelf/?$', views.create_shelf, name='shelf-create'),
-    re_path(r'^delete-shelf/(?P<shelf_id>\d+)?$', views.delete_shelf),
-    re_path(r'^shelve/?$', views.shelve),
-    re_path(r'^unshelve/?$', views.unshelve),
-
+    re_path(
+        r"^%s/shelf/(?P<shelf_identifier>[\w-]+)(.json)?/?$" % user_path,
+        views.Shelf.as_view(),
+        name="shelf",
+    ),
+    re_path(
+        r"^%s/shelf/(?P<shelf_identifier>[\w-]+)(.json)?/?$" % local_user_path,
+        views.Shelf.as_view(),
+    ),
+    re_path(r"^create-shelf/?$", views.create_shelf, name="shelf-create"),
+    re_path(r"^delete-shelf/(?P<shelf_id>\d+)?$", views.delete_shelf),
+    re_path(r"^shelve/?$", views.shelve),
+    re_path(r"^unshelve/?$", views.unshelve),
     # reading progress
-    re_path(r'^edit-readthrough/?$', views.edit_readthrough),
-    re_path(r'^delete-readthrough/?$', views.delete_readthrough),
-    re_path(r'^create-readthrough/?$', views.create_readthrough),
-    re_path(r'^delete-progressupdate/?$', views.delete_progressupdate),
-
-    re_path(r'^start-reading/(?P<book_id>\d+)/?$', views.start_reading),
-    re_path(r'^finish-reading/(?P<book_id>\d+)/?$', views.finish_reading),
-
+    re_path(r"^edit-readthrough/?$", views.edit_readthrough),
+    re_path(r"^delete-readthrough/?$", views.delete_readthrough),
+    re_path(r"^create-readthrough/?$", views.create_readthrough),
+    re_path(r"^delete-progressupdate/?$", views.delete_progressupdate),
+    re_path(r"^start-reading/(?P<book_id>\d+)/?$", views.start_reading),
+    re_path(r"^finish-reading/(?P<book_id>\d+)/?$", views.finish_reading),
     # following
-    re_path(r'^follow/?$', views.follow),
-    re_path(r'^unfollow/?$', views.unfollow),
-    re_path(r'^accept-follow-request/?$', views.accept_follow_request),
-    re_path(r'^delete-follow-request/?$', views.delete_follow_request),
-
+    re_path(r"^follow/?$", views.follow),
+    re_path(r"^unfollow/?$", views.unfollow),
+    re_path(r"^accept-follow-request/?$", views.accept_follow_request),
+    re_path(r"^delete-follow-request/?$", views.delete_follow_request),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
diff --git a/bookwyrm/utils/regex.py b/bookwyrm/utils/regex.py
index c818bc41..6389c35d 100644
--- a/bookwyrm/utils/regex.py
+++ b/bookwyrm/utils/regex.py
@@ -1,10 +1,10 @@
-''' defining regexes for regularly used concepts '''
+""" defining regexes for regularly used concepts """
 
-domain = r'[\w_\-\.]+\.[a-z]{2,}'
-localname = r'@?[a-zA-Z_\-\.0-9]+'
-strict_localname = r'@[a-zA-Z_\-\.0-9]+'
-username = r'%s(@%s)?' % (localname, domain)
-strict_username = r'\B%s(@%s)?\b' % (strict_localname, domain)
-full_username = r'%s@%s\b' % (localname, domain)
+domain = r"[\w_\-\.]+\.[a-z]{2,}"
+localname = r"@?[a-zA-Z_\-\.0-9]+"
+strict_localname = r"@[a-zA-Z_\-\.0-9]+"
+username = r"%s(@%s)?" % (localname, domain)
+strict_username = r"\B%s(@%s)?\b" % (strict_localname, domain)
+full_username = r"%s@%s\b" % (localname, domain)
 # should match (BookWyrm/1.0.0; or (BookWyrm/99.1.2;
-bookwyrm_user_agent = r'\(BookWyrm/[0-9]+\.[0-9]+\.[0-9]+;'
+bookwyrm_user_agent = r"\(BookWyrm/[0-9]+\.[0-9]+\.[0-9]+;"
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index dd601b28..48da8ec1 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -1,4 +1,4 @@
-''' make sure all our nice views are available '''
+""" make sure all our nice views are available """
 from .authentication import Login, Register, Logout
 from .author import Author, EditAuthor
 from .block import Block, unblock
diff --git a/bookwyrm/views/authentication.py b/bookwyrm/views/authentication.py
index 13c9ce49..a9147556 100644
--- a/bookwyrm/views/authentication.py
+++ b/bookwyrm/views/authentication.py
@@ -1,4 +1,4 @@
-''' class views for login/register views '''
+""" class views for login/register views """
 from django.contrib.auth import authenticate, login, logout
 from django.contrib.auth.decorators import login_required
 from django.core.exceptions import PermissionDenied
@@ -14,60 +14,59 @@ from bookwyrm.settings import DOMAIN
 
 
 # pylint: disable= no-self-use
-@method_decorator(csrf_exempt, name='dispatch')
+@method_decorator(csrf_exempt, name="dispatch")
 class Login(View):
-    ''' authenticate an existing user '''
+    """ authenticate an existing user """
+
     def get(self, request):
-        ''' login page '''
+        """ login page """
         if request.user.is_authenticated:
-            return redirect('/')
+            return redirect("/")
         # sene user to the login page
         data = {
-            'login_form': forms.LoginForm(),
-            'register_form': forms.RegisterForm(),
+            "login_form": forms.LoginForm(),
+            "register_form": forms.RegisterForm(),
         }
-        return TemplateResponse(request, 'login.html', data)
+        return TemplateResponse(request, "login.html", data)
 
     def post(self, request):
-        ''' authentication action '''
+        """ authentication action """
         if request.user.is_authenticated:
-            return redirect('/')
+            return redirect("/")
         login_form = forms.LoginForm(request.POST)
 
-        localname = login_form.data['localname']
-        if '@' in localname: # looks like an email address to me
+        localname = login_form.data["localname"]
+        if "@" in localname:  # looks like an email address to me
             email = localname
             try:
                 username = models.User.objects.get(email=email)
-            except models.User.DoesNotExist: # maybe it's a full username?
+            except models.User.DoesNotExist:  # maybe it's a full username?
                 username = localname
         else:
-            username = '%s@%s' % (localname, DOMAIN)
-        password = login_form.data['password']
+            username = "%s@%s" % (localname, DOMAIN)
+        password = login_form.data["password"]
         user = authenticate(request, username=username, password=password)
         if user is not None:
             # successful login
             login(request, user)
             user.last_active_date = timezone.now()
             user.save(broadcast=False)
-            return redirect(request.GET.get('next', '/'))
+            return redirect(request.GET.get("next", "/"))
 
         # login errors
-        login_form.non_field_errors = 'Username or password are incorrect'
+        login_form.non_field_errors = "Username or password are incorrect"
         register_form = forms.RegisterForm()
-        data = {
-            'login_form': login_form,
-            'register_form': register_form
-        }
-        return TemplateResponse(request, 'login.html', data)
+        data = {"login_form": login_form, "register_form": register_form}
+        return TemplateResponse(request, "login.html", data)
 
 
 class Register(View):
-    ''' register a user '''
+    """ register a user """
+
     def post(self, request):
-        ''' join the server '''
+        """ join the server """
         if not models.SiteSettings.get().allow_registration:
-            invite_code = request.POST.get('invite_code')
+            invite_code = request.POST.get("invite_code")
 
             if not invite_code:
                 raise PermissionDenied
@@ -83,42 +82,43 @@ class Register(View):
         if not form.is_valid():
             errors = True
 
-        localname = form.data['localname'].strip()
-        email = form.data['email']
-        password = form.data['password']
+        localname = form.data["localname"].strip()
+        email = form.data["email"]
+        password = form.data["password"]
 
         # check localname and email uniqueness
         if models.User.objects.filter(localname=localname).first():
-            form.errors['localname'] = [
-                'User with this username already exists']
+            form.errors["localname"] = ["User with this username already exists"]
             errors = True
 
         if errors:
             data = {
-                'login_form': forms.LoginForm(),
-                'register_form': form,
-                'invite': invite,
-                'valid': invite.valid() if invite else True,
+                "login_form": forms.LoginForm(),
+                "register_form": form,
+                "invite": invite,
+                "valid": invite.valid() if invite else True,
             }
             if invite:
-                return TemplateResponse(request, 'invite.html', data)
-            return TemplateResponse(request, 'login.html', data)
+                return TemplateResponse(request, "invite.html", data)
+            return TemplateResponse(request, "login.html", data)
 
-        username = '%s@%s' % (localname, DOMAIN)
+        username = "%s@%s" % (localname, DOMAIN)
         user = models.User.objects.create_user(
-            username, email, password, localname=localname, local=True)
+            username, email, password, localname=localname, local=True
+        )
         if invite:
             invite.times_used += 1
             invite.save()
 
         login(request, user)
-        return redirect('/')
+        return redirect("/")
 
 
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
 class Logout(View):
-    ''' log out '''
+    """ log out """
+
     def get(self, request):
-        ''' done with this place! outa here! '''
+        """ done with this place! outa here! """
         logout(request)
-        return redirect('/')
+        return redirect("/")
diff --git a/bookwyrm/views/author.py b/bookwyrm/views/author.py
index 356c95ff..50a3588d 100644
--- a/bookwyrm/views/author.py
+++ b/bookwyrm/views/author.py
@@ -1,4 +1,4 @@
-''' the good people stuff! the authors! '''
+""" the good people stuff! the authors! """
 from django.contrib.auth.decorators import login_required, permission_required
 from django.db.models import Q
 from django.shortcuts import get_object_or_404, redirect
@@ -13,49 +13,46 @@ from .helpers import is_api_request
 
 # pylint: disable= no-self-use
 class Author(View):
-    ''' this person wrote a book '''
+    """ this person wrote a book """
+
     def get(self, request, author_id):
-        ''' landing page for an author '''
+        """ landing page for an author """
         author = get_object_or_404(models.Author, id=author_id)
 
         if is_api_request(request):
             return ActivitypubResponse(author.to_activity())
 
         books = models.Work.objects.filter(
-            Q(authors=author) | Q(editions__authors=author)).distinct()
+            Q(authors=author) | Q(editions__authors=author)
+        ).distinct()
         data = {
-            'author': author,
-            'books': [b.get_default_edition() for b in books],
+            "author": author,
+            "books": [b.get_default_edition() for b in books],
         }
-        return TemplateResponse(request, 'author.html', data)
+        return TemplateResponse(request, "author.html", data)
 
 
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
 @method_decorator(
-    permission_required('bookwyrm.edit_book', raise_exception=True),
-    name='dispatch')
+    permission_required("bookwyrm.edit_book", raise_exception=True), name="dispatch"
+)
 class EditAuthor(View):
-    ''' edit author info '''
+    """ edit author info """
+
     def get(self, request, author_id):
-        ''' info about a book '''
+        """ info about a book """
         author = get_object_or_404(models.Author, id=author_id)
-        data = {
-            'author': author,
-            'form': forms.AuthorForm(instance=author)
-        }
-        return TemplateResponse(request, 'edit_author.html', data)
+        data = {"author": author, "form": forms.AuthorForm(instance=author)}
+        return TemplateResponse(request, "edit_author.html", data)
 
     def post(self, request, author_id):
-        ''' edit a author cool '''
+        """ edit a author cool """
         author = get_object_or_404(models.Author, id=author_id)
 
         form = forms.AuthorForm(request.POST, request.FILES, instance=author)
         if not form.is_valid():
-            data = {
-                'author': author,
-                'form': form
-            }
-            return TemplateResponse(request, 'edit_author.html', data)
+            data = {"author": author, "form": form}
+            return TemplateResponse(request, "edit_author.html", data)
         author = form.save()
 
-        return redirect('/author/%s' % author.id)
+        return redirect("/author/%s" % author.id)
diff --git a/bookwyrm/views/block.py b/bookwyrm/views/block.py
index 90e5033b..6d6a8a58 100644
--- a/bookwyrm/views/block.py
+++ b/bookwyrm/views/block.py
@@ -1,4 +1,4 @@
-''' views for actions you can take in the application '''
+""" views for actions you can take in the application """
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponseNotFound
 from django.shortcuts import get_object_or_404, redirect
@@ -10,25 +10,27 @@ from django.views.decorators.http import require_POST
 from bookwyrm import models
 
 # pylint: disable= no-self-use
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
 class Block(View):
-    ''' blocking users '''
+    """ blocking users """
+
     def get(self, request):
-        ''' list of blocked users? '''
-        return TemplateResponse(request, 'preferences/blocks.html')
+        """ list of blocked users? """
+        return TemplateResponse(request, "preferences/blocks.html")
 
     def post(self, request, user_id):
-        ''' block a user '''
+        """ block a user """
         to_block = get_object_or_404(models.User, id=user_id)
         models.UserBlocks.objects.create(
-            user_subject=request.user, user_object=to_block)
-        return redirect('/preferences/block')
+            user_subject=request.user, user_object=to_block
+        )
+        return redirect("/preferences/block")
 
 
 @require_POST
 @login_required
 def unblock(request, user_id):
-    ''' undo a block '''
+    """ undo a block """
     to_unblock = get_object_or_404(models.User, id=user_id)
     try:
         block = models.UserBlocks.objects.get(
@@ -38,4 +40,4 @@ def unblock(request, user_id):
     except models.UserBlocks.DoesNotExist:
         return HttpResponseNotFound()
     block.delete()
-    return redirect('/preferences/block')
+    return redirect("/preferences/block")
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index cf246446..46df0483 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -1,4 +1,4 @@
-''' the good stuff! the books! '''
+""" the good stuff! the books! """
 from django.core.paginator import Paginator
 from django.contrib.auth.decorators import login_required, permission_required
 from django.db import transaction
@@ -20,11 +20,12 @@ from .helpers import privacy_filter
 
 # pylint: disable= no-self-use
 class Book(View):
-    ''' a book! this is the stuff '''
+    """ a book! this is the stuff """
+
     def get(self, request, book_id):
-        ''' info about a book '''
+        """ info about a book """
         try:
-            page = int(request.GET.get('page', 1))
+            page = int(request.GET.get("page", 1))
         except ValueError:
             page = 1
 
@@ -50,30 +51,28 @@ class Book(View):
         reviews = get_activity_feed(request.user, queryset=reviews)
 
         # the reviews to show
-        paginated = Paginator(reviews.exclude(
-            Q(content__isnull=True) | Q(content='')
-        ), PAGE_LENGTH)
+        paginated = Paginator(
+            reviews.exclude(Q(content__isnull=True) | Q(content="")), PAGE_LENGTH
+        )
         reviews_page = paginated.page(page)
 
         user_tags = readthroughs = user_shelves = other_edition_shelves = []
         if request.user.is_authenticated:
             user_tags = models.UserTag.objects.filter(
                 book=book, user=request.user
-            ).values_list('tag__identifier', flat=True)
+            ).values_list("tag__identifier", flat=True)
 
             readthroughs = models.ReadThrough.objects.filter(
                 user=request.user,
                 book=book,
-            ).order_by('start_date')
+            ).order_by("start_date")
 
             for readthrough in readthroughs:
-                readthrough.progress_updates = \
-                    readthrough.progressupdate_set.all() \
-                    .order_by('-updated_date')
+                readthrough.progress_updates = (
+                    readthrough.progressupdate_set.all().order_by("-updated_date")
+                )
 
-            user_shelves = models.ShelfBook.objects.filter(
-                user=request.user, book=book
-            )
+            user_shelves = models.ShelfBook.objects.filter(user=request.user, book=book)
 
             other_edition_shelves = models.ShelfBook.objects.filter(
                 ~Q(book=book),
@@ -82,129 +81,124 @@ class Book(View):
             )
 
         data = {
-            'book': book,
-            'reviews': reviews_page,
-            'review_count': reviews.count(),
-            'ratings': reviews.filter(Q(content__isnull=True) | Q(content='')),
-            'rating': reviews.aggregate(Avg('rating'))['rating__avg'],
-            'tags':  models.UserTag.objects.filter(book=book),
-            'lists': privacy_filter(
+            "book": book,
+            "reviews": reviews_page,
+            "review_count": reviews.count(),
+            "ratings": reviews.filter(Q(content__isnull=True) | Q(content="")),
+            "rating": reviews.aggregate(Avg("rating"))["rating__avg"],
+            "tags": models.UserTag.objects.filter(book=book),
+            "lists": privacy_filter(
                 request.user, book.list_set.filter(listitem__approved=True)
             ),
-            'user_tags': user_tags,
-            'user_shelves': user_shelves,
-            'other_edition_shelves': other_edition_shelves,
-            'readthroughs': readthroughs,
-            'path': '/book/%s' % book_id,
+            "user_tags": user_tags,
+            "user_shelves": user_shelves,
+            "other_edition_shelves": other_edition_shelves,
+            "readthroughs": readthroughs,
+            "path": "/book/%s" % book_id,
         }
-        return TemplateResponse(request, 'book.html', data)
+        return TemplateResponse(request, "book.html", data)
 
 
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
 @method_decorator(
-    permission_required('bookwyrm.edit_book', raise_exception=True),
-    name='dispatch')
+    permission_required("bookwyrm.edit_book", raise_exception=True), name="dispatch"
+)
 class EditBook(View):
-    ''' edit a book '''
+    """ edit a book """
+
     def get(self, request, book_id):
-        ''' info about a book '''
+        """ info about a book """
         book = get_edition(book_id)
         if not book.description:
             book.description = book.parent_work.description
-        data = {
-            'book': book,
-            'form': forms.EditionForm(instance=book)
-        }
-        return TemplateResponse(request, 'edit_book.html', data)
+        data = {"book": book, "form": forms.EditionForm(instance=book)}
+        return TemplateResponse(request, "edit_book.html", data)
 
     def post(self, request, book_id):
-        ''' edit a book cool '''
+        """ edit a book cool """
         book = get_object_or_404(models.Edition, id=book_id)
 
         form = forms.EditionForm(request.POST, request.FILES, instance=book)
         if not form.is_valid():
-            data = {
-                'book': book,
-                'form': form
-            }
-            return TemplateResponse(request, 'edit_book.html', data)
+            data = {"book": book, "form": form}
+            return TemplateResponse(request, "edit_book.html", data)
         book = form.save()
 
-        return redirect('/book/%s' % book.id)
+        return redirect("/book/%s" % book.id)
 
 
 class Editions(View):
-    ''' list of editions '''
+    """ list of editions """
+
     def get(self, request, book_id):
-        ''' list of editions of a book '''
+        """ list of editions of a book """
         work = get_object_or_404(models.Work, id=book_id)
 
         if is_api_request(request):
             return ActivitypubResponse(work.to_edition_list(**request.GET))
 
         data = {
-            'editions': work.editions.order_by('-edition_rank').all(),
-            'work': work,
+            "editions": work.editions.order_by("-edition_rank").all(),
+            "work": work,
         }
-        return TemplateResponse(request, 'editions.html', data)
+        return TemplateResponse(request, "editions.html", data)
 
 
 @login_required
 @require_POST
 def upload_cover(request, book_id):
-    ''' upload a new cover '''
+    """ upload a new cover """
     book = get_object_or_404(models.Edition, id=book_id)
 
     form = forms.CoverForm(request.POST, request.FILES, instance=book)
     if not form.is_valid():
-        return redirect('/book/%d' % book.id)
+        return redirect("/book/%d" % book.id)
 
     book.last_edited_by = request.user
-    book.cover = form.files['cover']
+    book.cover = form.files["cover"]
     book.save()
 
-    return redirect('/book/%s' % book.id)
+    return redirect("/book/%s" % book.id)
 
 
 @login_required
 @require_POST
-@permission_required('bookwyrm.edit_book', raise_exception=True)
+@permission_required("bookwyrm.edit_book", raise_exception=True)
 def add_description(request, book_id):
-    ''' upload a new cover '''
-    if not request.method == 'POST':
-        return redirect('/')
+    """ upload a new cover """
+    if not request.method == "POST":
+        return redirect("/")
 
     book = get_object_or_404(models.Edition, id=book_id)
 
-    description = request.POST.get('description')
+    description = request.POST.get("description")
 
     book.description = description
     book.last_edited_by = request.user
     book.save()
 
-    return redirect('/book/%s' % book.id)
+    return redirect("/book/%s" % book.id)
 
 
 @require_POST
 def resolve_book(request):
-    ''' figure out the local path to a book from a remote_id '''
-    remote_id = request.POST.get('remote_id')
+    """ figure out the local path to a book from a remote_id """
+    remote_id = request.POST.get("remote_id")
     connector = connector_manager.get_or_create_connector(remote_id)
     book = connector.get_or_create_book(remote_id)
 
-    return redirect('/book/%d' % book.id)
+    return redirect("/book/%d" % book.id)
 
 
 @login_required
 @require_POST
 @transaction.atomic
 def switch_edition(request):
-    ''' switch your copy of a book to a different edition '''
-    edition_id = request.POST.get('edition')
+    """ switch your copy of a book to a different edition """
+    edition_id = request.POST.get("edition")
     new_edition = get_object_or_404(models.Edition, id=edition_id)
     shelfbooks = models.ShelfBook.objects.filter(
-        book__parent_work=new_edition.parent_work,
-        shelf__user=request.user
+        book__parent_work=new_edition.parent_work, shelf__user=request.user
     )
     for shelfbook in shelfbooks.all():
         with transaction.atomic():
@@ -212,16 +206,15 @@ def switch_edition(request):
                 created_date=shelfbook.created_date,
                 user=shelfbook.user,
                 shelf=shelfbook.shelf,
-                book=new_edition
+                book=new_edition,
             )
             shelfbook.delete()
 
     readthroughs = models.ReadThrough.objects.filter(
-        book__parent_work=new_edition.parent_work,
-        user=request.user
+        book__parent_work=new_edition.parent_work, user=request.user
     )
     for readthrough in readthroughs.all():
         readthrough.book = new_edition
         readthrough.save()
 
-    return redirect('/book/%d' % new_edition.id)
+    return redirect("/book/%d" % new_edition.id)
diff --git a/bookwyrm/views/error.py b/bookwyrm/views/error.py
index 82999d6e..9bd94ca3 100644
--- a/bookwyrm/views/error.py
+++ b/bookwyrm/views/error.py
@@ -1,11 +1,12 @@
-''' something has gone amiss '''
+""" something has gone amiss """
 from django.template.response import TemplateResponse
 
+
 def server_error_page(request):
-    ''' 500 errors '''
-    return TemplateResponse(request, 'error.html', status=500)
+    """ 500 errors """
+    return TemplateResponse(request, "error.html", status=500)
 
 
 def not_found_page(request, _):
-    ''' 404s '''
-    return TemplateResponse(request, 'notfound.html', status=404)
+    """ 404s """
+    return TemplateResponse(request, "notfound.html", status=404)
diff --git a/bookwyrm/views/federation.py b/bookwyrm/views/federation.py
index 62ae076c..e9c0466e 100644
--- a/bookwyrm/views/federation.py
+++ b/bookwyrm/views/federation.py
@@ -1,4 +1,4 @@
-''' manage federated servers '''
+""" manage federated servers """
 from django.contrib.auth.decorators import login_required, permission_required
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
@@ -8,14 +8,16 @@ from bookwyrm import models
 
 
 # pylint: disable= no-self-use
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
 @method_decorator(
-    permission_required('bookwyrm.control_federation', raise_exception=True),
-    name='dispatch')
+    permission_required("bookwyrm.control_federation", raise_exception=True),
+    name="dispatch",
+)
 class Federation(View):
-    ''' what servers do we federate with '''
+    """ what servers do we federate with """
+
     def get(self, request):
-        ''' edit form '''
+        """ edit form """
         servers = models.FederatedServer.objects.all()
-        data = {'servers': servers}
-        return TemplateResponse(request, 'settings/federation.html', data)
+        data = {"servers": servers}
+        return TemplateResponse(request, "settings/federation.html", data)
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index f7e93e9a..d08c9a42 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -1,4 +1,4 @@
-''' non-interactive pages '''
+""" non-interactive pages """
 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
 from django.db.models import Q
@@ -17,48 +17,54 @@ from .helpers import is_api_request, is_bookwyrm_request, object_visible_to_user
 
 
 # pylint: disable= no-self-use
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
 class Feed(View):
-    ''' activity stream '''
+    """ activity stream """
+
     def get(self, request, tab):
-        ''' user's homepage with activity feed '''
+        """ user's homepage with activity feed """
         try:
-            page = int(request.GET.get('page', 1))
+            page = int(request.GET.get("page", 1))
         except ValueError:
             page = 1
 
-        if tab == 'home':
+        if tab == "home":
+            activities = get_activity_feed(request.user, following_only=True)
+            tab_title = _("Home")
+        elif tab == "local":
             activities = get_activity_feed(
-                request.user, following_only=True)
-            tab_title = _('Home')
-        elif tab == 'local':
-            activities = get_activity_feed(
-                request.user, privacy=['public', 'followers'], local_only=True)
-            tab_title = _('Local')
+                request.user, privacy=["public", "followers"], local_only=True
+            )
+            tab_title = _("Local")
         else:
             activities = get_activity_feed(
-                request.user, privacy=['public', 'followers'])
-            tab_title = _('Federated')
+                request.user, privacy=["public", "followers"]
+            )
+            tab_title = _("Federated")
         paginated = Paginator(activities, PAGE_LENGTH)
 
-        data = {**feed_page_data(request.user), **{
-            'user': request.user,
-            'activities': paginated.page(page),
-            'tab': tab,
-            'tab_title': tab_title,
-            'goal_form': forms.GoalForm(),
-            'path': '/%s' % tab,
-        }}
-        return TemplateResponse(request, 'feed/feed.html', data)
+        data = {
+            **feed_page_data(request.user),
+            **{
+                "user": request.user,
+                "activities": paginated.page(page),
+                "tab": tab,
+                "tab_title": tab_title,
+                "goal_form": forms.GoalForm(),
+                "path": "/%s" % tab,
+            },
+        }
+        return TemplateResponse(request, "feed/feed.html", data)
 
 
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
 class DirectMessage(View):
-    ''' dm view '''
+    """ dm view """
+
     def get(self, request, username=None):
-        ''' like a feed but for dms only '''
+        """ like a feed but for dms only """
         try:
-            page = int(request.GET.get('page', 1))
+            page = int(request.GET.get("page", 1))
         except ValueError:
             page = 1
 
@@ -74,27 +80,33 @@ class DirectMessage(View):
             queryset = queryset.filter(Q(user=user) | Q(mention_users=user))
 
         activities = get_activity_feed(
-            request.user, privacy=['direct'], queryset=queryset)
+            request.user, privacy=["direct"], queryset=queryset
+        )
 
         paginated = Paginator(activities, PAGE_LENGTH)
         activity_page = paginated.page(page)
-        data = {**feed_page_data(request.user), **{
-            'user': request.user,
-            'partner': user,
-            'activities': activity_page,
-            'path': '/direct-messages',
-        }}
-        return TemplateResponse(request, 'feed/direct_messages.html', data)
+        data = {
+            **feed_page_data(request.user),
+            **{
+                "user": request.user,
+                "partner": user,
+                "activities": activity_page,
+                "path": "/direct-messages",
+            },
+        }
+        return TemplateResponse(request, "feed/direct_messages.html", data)
 
 
 class Status(View):
-    ''' get posting '''
+    """ get posting """
+
     def get(self, request, username, status_id):
-        ''' display a particular status (and replies, etc) '''
+        """ display a particular status (and replies, etc) """
         try:
             user = get_user_from_username(request.user, username)
             status = models.Status.objects.select_subclasses().get(
-                id=status_id, deleted=False)
+                id=status_id, deleted=False
+            )
         except ValueError:
             return HttpResponseNotFound()
 
@@ -108,18 +120,23 @@ class Status(View):
 
         if is_api_request(request):
             return ActivitypubResponse(
-                status.to_activity(pure=not is_bookwyrm_request(request)))
+                status.to_activity(pure=not is_bookwyrm_request(request))
+            )
 
-        data = {**feed_page_data(request.user), **{
-            'status': status,
-        }}
-        return TemplateResponse(request, 'feed/status.html', data)
+        data = {
+            **feed_page_data(request.user),
+            **{
+                "status": status,
+            },
+        }
+        return TemplateResponse(request, "feed/status.html", data)
 
 
 class Replies(View):
-    ''' replies page (a json view of status) '''
+    """ replies page (a json view of status) """
+
     def get(self, request, username, status_id):
-        ''' ordered collection of replies to a status '''
+        """ ordered collection of replies to a status """
         # the html view is the same as Status
         if not is_api_request(request):
             status_view = Status.as_view()
@@ -134,41 +151,39 @@ class Replies(View):
 
 
 def feed_page_data(user):
-    ''' info we need for every feed page '''
+    """ info we need for every feed page """
     if not user.is_authenticated:
         return {}
 
-    goal = models.AnnualGoal.objects.filter(
-        user=user, year=timezone.now().year
-    ).first()
+    goal = models.AnnualGoal.objects.filter(user=user, year=timezone.now().year).first()
     return {
-        'suggested_books': get_suggested_books(user),
-        'goal': goal,
-        'goal_form': forms.GoalForm(),
+        "suggested_books": get_suggested_books(user),
+        "goal": goal,
+        "goal_form": forms.GoalForm(),
     }
 
+
 def get_suggested_books(user, max_books=5):
-    ''' helper to get a user's recent books '''
+    """ helper to get a user's recent books """
     book_count = 0
-    preset_shelves = [
-        ('reading', max_books), ('read', 2), ('to-read', max_books)
-    ]
+    preset_shelves = [("reading", max_books), ("read", 2), ("to-read", max_books)]
     suggested_books = []
     for (preset, shelf_max) in preset_shelves:
-        limit = shelf_max if shelf_max < (max_books - book_count) \
-                else max_books - book_count
+        limit = (
+            shelf_max
+            if shelf_max < (max_books - book_count)
+            else max_books - book_count
+        )
         shelf = user.shelf_set.get(identifier=preset)
 
-        shelf_books = shelf.shelfbook_set.order_by(
-            '-updated_date'
-        ).all()[:limit]
+        shelf_books = shelf.shelfbook_set.order_by("-updated_date").all()[:limit]
         if not shelf_books:
             continue
         shelf_preview = {
-            'name': shelf.name,
-            'identifier': shelf.identifier,
-            'books': [s.book for s in shelf_books]
+            "name": shelf.name,
+            "identifier": shelf.identifier,
+            "books": [s.book for s in shelf_books],
         }
         suggested_books.append(shelf_preview)
-        book_count += len(shelf_preview['books'])
+        book_count += len(shelf_preview["books"])
     return suggested_books
diff --git a/bookwyrm/views/follow.py b/bookwyrm/views/follow.py
index 4c69890c..515bf325 100644
--- a/bookwyrm/views/follow.py
+++ b/bookwyrm/views/follow.py
@@ -1,4 +1,4 @@
-''' views for actions you can take in the application '''
+""" views for actions you can take in the application """
 from django.contrib.auth.decorators import login_required
 from django.db import IntegrityError
 from django.http import HttpResponseBadRequest
@@ -8,11 +8,12 @@ from django.views.decorators.http import require_POST
 from bookwyrm import models
 from .helpers import get_user_from_username
 
+
 @login_required
 @require_POST
 def follow(request):
-    ''' follow another user, here or abroad '''
-    username = request.POST['user']
+    """ follow another user, here or abroad """
+    username = request.POST["user"]
     try:
         to_follow = get_user_from_username(request.user, username)
     except models.User.DoesNotExist:
@@ -32,16 +33,15 @@ def follow(request):
 @login_required
 @require_POST
 def unfollow(request):
-    ''' unfollow a user '''
-    username = request.POST['user']
+    """ unfollow a user """
+    username = request.POST["user"]
     try:
         to_unfollow = get_user_from_username(request.user, username)
     except models.User.DoesNotExist:
         return HttpResponseBadRequest()
 
     models.UserFollows.objects.get(
-        user_subject=request.user,
-        user_object=to_unfollow
+        user_subject=request.user, user_object=to_unfollow
     ).delete()
     return redirect(to_unfollow.local_path)
 
@@ -49,8 +49,8 @@ def unfollow(request):
 @login_required
 @require_POST
 def accept_follow_request(request):
-    ''' a user accepts a follow request '''
-    username = request.POST['user']
+    """ a user accepts a follow request """
+    username = request.POST["user"]
     try:
         requester = get_user_from_username(request.user, username)
     except models.User.DoesNotExist:
@@ -58,8 +58,7 @@ def accept_follow_request(request):
 
     try:
         follow_request = models.UserFollowRequest.objects.get(
-            user_subject=requester,
-            user_object=request.user
+            user_subject=requester, user_object=request.user
         )
     except models.UserFollowRequest.DoesNotExist:
         # Request already dealt with.
@@ -72,8 +71,8 @@ def accept_follow_request(request):
 @login_required
 @require_POST
 def delete_follow_request(request):
-    ''' a user rejects a follow request '''
-    username = request.POST['user']
+    """ a user rejects a follow request """
+    username = request.POST["user"]
     try:
         requester = get_user_from_username(request.user, username)
     except models.User.DoesNotExist:
@@ -81,11 +80,10 @@ def delete_follow_request(request):
 
     try:
         follow_request = models.UserFollowRequest.objects.get(
-            user_subject=requester,
-            user_object=request.user
+            user_subject=requester, user_object=request.user
         )
     except models.UserFollowRequest.DoesNotExist:
         return HttpResponseBadRequest()
 
     follow_request.delete()
-    return redirect('/user/%s' % request.user.localname)
+    return redirect("/user/%s" % request.user.localname)
diff --git a/bookwyrm/views/goal.py b/bookwyrm/views/goal.py
index 7da9e434..4e3a9534 100644
--- a/bookwyrm/views/goal.py
+++ b/bookwyrm/views/goal.py
@@ -1,4 +1,4 @@
-''' non-interactive pages '''
+""" non-interactive pages """
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponseNotFound
 from django.shortcuts import redirect
@@ -13,16 +13,15 @@ from .helpers import get_user_from_username, object_visible_to_user
 
 
 # pylint: disable= no-self-use
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
 class Goal(View):
-    ''' track books for the year '''
+    """ track books for the year """
+
     def get(self, request, username, year):
-        ''' reading goal page '''
+        """ reading goal page """
         user = get_user_from_username(request.user, username)
         year = int(year)
-        goal = models.AnnualGoal.objects.filter(
-            year=year, user=user
-        ).first()
+        goal = models.AnnualGoal.objects.filter(year=year, user=user).first()
         if not goal and user != request.user:
             return HttpResponseNotFound()
 
@@ -30,42 +29,39 @@ class Goal(View):
             return HttpResponseNotFound()
 
         data = {
-            'goal_form': forms.GoalForm(instance=goal),
-            'goal': goal,
-            'user': user,
-            'year': year,
-            'is_self': request.user == user,
+            "goal_form": forms.GoalForm(instance=goal),
+            "goal": goal,
+            "user": user,
+            "year": year,
+            "is_self": request.user == user,
         }
-        return TemplateResponse(request, 'goal.html', data)
-
+        return TemplateResponse(request, "goal.html", data)
 
     def post(self, request, username, year):
-        ''' update or create an annual goal '''
+        """ update or create an annual goal """
         user = get_user_from_username(request.user, username)
         if user != request.user:
             return HttpResponseNotFound()
 
         year = int(year)
-        goal = models.AnnualGoal.objects.filter(
-            year=year, user=request.user
-        ).first()
+        goal = models.AnnualGoal.objects.filter(year=year, user=request.user).first()
         form = forms.GoalForm(request.POST, instance=goal)
         if not form.is_valid():
             data = {
-                'goal_form': form,
-                'goal': goal,
-                'year': year,
+                "goal_form": form,
+                "goal": goal,
+                "year": year,
             }
-            return TemplateResponse(request, 'goal.html', data)
+            return TemplateResponse(request, "goal.html", data)
         goal = form.save()
 
-        if request.POST.get('post-status'):
+        if request.POST.get("post-status"):
             # create status, if appropraite
-            template = get_template('snippets/generated_status/goal.html')
+            template = get_template("snippets/generated_status/goal.html")
             create_generated_note(
                 request.user,
-                template.render({'goal': goal, 'user': request.user}).strip(),
-                privacy=goal.privacy
+                template.render({"goal": goal, "user": request.user}).strip(),
+                privacy=goal.privacy,
             )
 
-        return redirect(request.headers.get('Referer', '/'))
+        return redirect(request.headers.get("Referer", "/"))
diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index 64f0fc26..20332cbd 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -1,4 +1,4 @@
-''' helper functions used in various views '''
+""" helper functions used in various views """
 import re
 from requests import HTTPError
 from django.core.exceptions import FieldError
@@ -11,7 +11,7 @@ from bookwyrm.utils import regex
 
 
 def get_user_from_username(viewer, username):
-    ''' helper function to resolve a localname or a username to a user '''
+    """ helper function to resolve a localname or a username to a user """
     # raises DoesNotExist if user is now found
     try:
         return models.User.viewer_aware_objects(viewer).get(localname=username)
@@ -20,22 +20,20 @@ def get_user_from_username(viewer, username):
 
 
 def is_api_request(request):
-    ''' check whether a request is asking for html or data '''
-    return 'json' in request.headers.get('Accept') or \
-            request.path[-5:] == '.json'
+    """ check whether a request is asking for html or data """
+    return "json" in request.headers.get("Accept") or request.path[-5:] == ".json"
 
 
 def is_bookwyrm_request(request):
-    ''' check if the request is coming from another bookwyrm instance '''
-    user_agent = request.headers.get('User-Agent')
-    if user_agent is None or \
-            re.search(regex.bookwyrm_user_agent, user_agent) is None:
+    """ check if the request is coming from another bookwyrm instance """
+    user_agent = request.headers.get("User-Agent")
+    if user_agent is None or re.search(regex.bookwyrm_user_agent, user_agent) is None:
         return False
     return True
 
 
 def object_visible_to_user(viewer, obj):
-    ''' is a user authorized to view an object? '''
+    """ is a user authorized to view an object? """
     if not obj:
         return False
 
@@ -44,37 +42,32 @@ def object_visible_to_user(viewer, obj):
         return False
 
     # you can see your own posts and any public or unlisted posts
-    if viewer == obj.user or obj.privacy in ['public', 'unlisted']:
+    if viewer == obj.user or obj.privacy in ["public", "unlisted"]:
         return True
 
     # you can see the followers only posts of people you follow
-    if obj.privacy == 'followers' and \
-            obj.user.followers.filter(id=viewer.id).first():
+    if obj.privacy == "followers" and obj.user.followers.filter(id=viewer.id).first():
         return True
 
     # you can see dms you are tagged in
     if isinstance(obj, models.Status):
-        if obj.privacy == 'direct' and \
-                obj.mention_users.filter(id=viewer.id).first():
+        if obj.privacy == "direct" and obj.mention_users.filter(id=viewer.id).first():
             return True
     return False
 
 
 def privacy_filter(viewer, queryset, privacy_levels=None, following_only=False):
-    ''' filter objects that have "user" and "privacy" fields '''
-    privacy_levels = privacy_levels or \
-            ['public', 'unlisted', 'followers', 'direct']
+    """ filter objects that have "user" and "privacy" fields """
+    privacy_levels = privacy_levels or ["public", "unlisted", "followers", "direct"]
 
     # exclude blocks from both directions
     if not viewer.is_anonymous:
         blocked = models.User.objects.filter(id__in=viewer.blocks.all()).all()
-        queryset = queryset.exclude(
-            Q(user__in=blocked) | Q(user__blocks=viewer))
+        queryset = queryset.exclude(Q(user__in=blocked) | Q(user__blocks=viewer))
 
     # you can't see followers only or direct messages if you're not logged in
     if viewer.is_anonymous:
-        privacy_levels = [p for p in privacy_levels if \
-            not p in ['followers', 'direct']]
+        privacy_levels = [p for p in privacy_levels if not p in ["followers", "direct"]]
 
     # filter to only privided privacy levels
     queryset = queryset.filter(privacy__in=privacy_levels)
@@ -82,53 +75,48 @@ def privacy_filter(viewer, queryset, privacy_levels=None, following_only=False):
     # only include statuses the user follows
     if following_only:
         queryset = queryset.exclude(
-            ~Q(# remove everythign except
-                Q(user__in=viewer.following.all()) | # user following
-                Q(user=viewer) |# is self
-                Q(mention_users=viewer)# mentions user
+            ~Q(  # remove everythign except
+                Q(user__in=viewer.following.all())
+                | Q(user=viewer)  # user following
+                | Q(mention_users=viewer)  # is self  # mentions user
             ),
         )
     # exclude followers-only statuses the user doesn't follow
-    elif 'followers' in privacy_levels:
+    elif "followers" in privacy_levels:
         queryset = queryset.exclude(
-            ~Q(# user isn't following and it isn't their own status
+            ~Q(  # user isn't following and it isn't their own status
                 Q(user__in=viewer.following.all()) | Q(user=viewer)
             ),
-            privacy='followers' # and the status is followers only
+            privacy="followers",  # and the status is followers only
         )
 
     # exclude direct messages not intended for the user
-    if 'direct' in privacy_levels:
+    if "direct" in privacy_levels:
         try:
             queryset = queryset.exclude(
-                ~Q(
-                    Q(user=viewer) | Q(mention_users=viewer)
-                ), privacy='direct'
+                ~Q(Q(user=viewer) | Q(mention_users=viewer)), privacy="direct"
             )
         except FieldError:
-            queryset = queryset.exclude(
-                ~Q(user=viewer), privacy='direct'
-            )
+            queryset = queryset.exclude(~Q(user=viewer), privacy="direct")
 
     return queryset
 
 
 def get_activity_feed(
-        user, privacy=None, local_only=False, following_only=False,
-        queryset=None):
-    ''' get a filtered queryset of statuses '''
+    user, privacy=None, local_only=False, following_only=False, queryset=None
+):
+    """ get a filtered queryset of statuses """
     if queryset is None:
         queryset = models.Status.objects.select_subclasses()
 
     # exclude deleted
-    queryset = queryset.exclude(deleted=True).order_by('-published_date')
+    queryset = queryset.exclude(deleted=True).order_by("-published_date")
 
     # apply privacy filters
-    queryset = privacy_filter(
-        user, queryset, privacy, following_only=following_only)
+    queryset = privacy_filter(user, queryset, privacy, following_only=following_only)
 
     # only show dms if we only want dms
-    if privacy == ['direct']:
+    if privacy == ["direct"]:
         # dms are direct statuses not related to books
         queryset = queryset.filter(
             review__isnull=True,
@@ -143,7 +131,7 @@ def get_activity_feed(
                 comment__isnull=True,
                 quotation__isnull=True,
                 generatednote__isnull=True,
-                privacy='direct'
+                privacy="direct",
             )
         except FieldError:
             # if we're looking at a subtype of Status (like Review)
@@ -163,36 +151,35 @@ def get_activity_feed(
 
 
 def handle_remote_webfinger(query):
-    ''' webfingerin' other servers '''
+    """ webfingerin' other servers """
     user = None
 
     # usernames could be @user@domain or user@domain
     if not query:
         return None
 
-    if query[0] == '@':
+    if query[0] == "@":
         query = query[1:]
 
     try:
-        domain = query.split('@')[1]
+        domain = query.split("@")[1]
     except IndexError:
         return None
 
     try:
         user = models.User.objects.get(username=query)
     except models.User.DoesNotExist:
-        url = 'https://%s/.well-known/webfinger?resource=acct:%s' % \
-            (domain, query)
+        url = "https://%s/.well-known/webfinger?resource=acct:%s" % (domain, query)
         try:
             data = get_data(url)
         except (ConnectorException, HTTPError):
             return None
 
-        for link in data.get('links'):
-            if link.get('rel') == 'self':
+        for link in data.get("links"):
+            if link.get("rel") == "self":
                 try:
                     user = activitypub.resolve_remote_id(
-                        link['href'], model=models.User
+                        link["href"], model=models.User
                     )
                 except KeyError:
                     return None
@@ -200,7 +187,7 @@ def handle_remote_webfinger(query):
 
 
 def get_edition(book_id):
-    ''' look up a book in the db and return an edition '''
+    """ look up a book in the db and return an edition """
     book = models.Book.objects.select_subclasses().get(id=book_id)
     if isinstance(book, models.Work):
         book = book.get_default_edition()
@@ -208,29 +195,24 @@ def get_edition(book_id):
 
 
 def handle_reading_status(user, shelf, book, privacy):
-    ''' post about a user reading a book '''
+    """ post about a user reading a book """
     # tell the world about this cool thing that happened
     try:
         message = {
-            'to-read': 'wants to read',
-            'reading': 'started reading',
-            'read': 'finished reading'
+            "to-read": "wants to read",
+            "reading": "started reading",
+            "read": "finished reading",
         }[shelf.identifier]
     except KeyError:
         # it's a non-standard shelf, don't worry about it
         return
 
-    status = create_generated_note(
-        user,
-        message,
-        mention_books=[book],
-        privacy=privacy
-    )
+    status = create_generated_note(user, message, mention_books=[book], privacy=privacy)
     status.save()
 
 
 def is_blocked(viewer, user):
-    ''' is this viewer blocked by the user? '''
+    """ is this viewer blocked by the user? """
     if viewer.is_authenticated and viewer in user.blocks.all():
         return True
     return False
diff --git a/bookwyrm/views/import_data.py b/bookwyrm/views/import_data.py
index cf33163a..8f9ea27f 100644
--- a/bookwyrm/views/import_data.py
+++ b/bookwyrm/views/import_data.py
@@ -1,4 +1,4 @@
-''' import books from another app '''
+""" import books from another app """
 from io import TextIOWrapper
 
 from django.contrib.auth.decorators import login_required
@@ -13,27 +13,33 @@ from bookwyrm import forms, goodreads_import, librarything_import, models
 from bookwyrm.tasks import app
 
 # pylint: disable= no-self-use
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
 class Import(View):
-    ''' import view '''
+    """ import view """
+
     def get(self, request):
-        ''' load import page '''
-        return TemplateResponse(request, 'import.html', {
-            'import_form': forms.ImportForm(),
-            'jobs': models.ImportJob.
-                    objects.filter(user=request.user).order_by('-created_date'),
-        })
+        """ load import page """
+        return TemplateResponse(
+            request,
+            "import.html",
+            {
+                "import_form": forms.ImportForm(),
+                "jobs": models.ImportJob.objects.filter(user=request.user).order_by(
+                    "-created_date"
+                ),
+            },
+        )
 
     def post(self, request):
-        ''' ingest a goodreads csv '''
+        """ ingest a goodreads csv """
         form = forms.ImportForm(request.POST, request.FILES)
         if form.is_valid():
-            include_reviews = request.POST.get('include_reviews') == 'on'
-            privacy = request.POST.get('privacy')
-            source = request.POST.get('source')
+            include_reviews = request.POST.get("include_reviews") == "on"
+            privacy = request.POST.get("privacy")
+            source = request.POST.get("source")
 
             importer = None
-            if source == 'LibraryThing':
+            if source == "LibraryThing":
                 importer = librarything_import.LibrarythingImporter()
             else:
                 # Default : GoodReads
@@ -43,44 +49,44 @@ class Import(View):
                 job = importer.create_job(
                     request.user,
                     TextIOWrapper(
-                        request.FILES['csv_file'],
-                        encoding=importer.encoding),
+                        request.FILES["csv_file"], encoding=importer.encoding
+                    ),
                     include_reviews,
                     privacy,
                 )
             except (UnicodeDecodeError, ValueError):
-                return HttpResponseBadRequest('Not a valid csv file')
+                return HttpResponseBadRequest("Not a valid csv file")
 
             importer.start_import(job)
 
-            return redirect('/import/%d' % job.id)
+            return redirect("/import/%d" % job.id)
         return HttpResponseBadRequest()
 
 
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
 class ImportStatus(View):
-    ''' status of an existing import '''
+    """ status of an existing import """
+
     def get(self, request, job_id):
-        ''' status of an import job '''
+        """ status of an import job """
         job = models.ImportJob.objects.get(id=job_id)
         if job.user != request.user:
             raise PermissionDenied
         task = app.AsyncResult(job.task_id)
-        items = job.items.order_by('index').all()
+        items = job.items.order_by("index").all()
         failed_items = [i for i in items if i.fail_reason]
         items = [i for i in items if not i.fail_reason]
-        return TemplateResponse(request, 'import_status.html', {
-            'job': job,
-            'items': items,
-            'failed_items': failed_items,
-            'task': task
-        })
+        return TemplateResponse(
+            request,
+            "import_status.html",
+            {"job": job, "items": items, "failed_items": failed_items, "task": task},
+        )
 
     def post(self, request, job_id):
-        ''' retry lines from an import '''
+        """ retry lines from an import """
         job = get_object_or_404(models.ImportJob, id=job_id)
         items = []
-        for item in request.POST.getlist('import_item'):
+        for item in request.POST.getlist("import_item"):
             items.append(get_object_or_404(models.ImportItem, id=item))
 
         job = goodreads_import.create_retry_job(
@@ -89,4 +95,4 @@ class ImportStatus(View):
             items,
         )
         goodreads_import.start_import(job)
-        return redirect('/import/%d' % job.id)
+        return redirect("/import/%d" % job.id)
diff --git a/bookwyrm/views/inbox.py b/bookwyrm/views/inbox.py
index 46385093..34bd2e1c 100644
--- a/bookwyrm/views/inbox.py
+++ b/bookwyrm/views/inbox.py
@@ -1,4 +1,4 @@
-''' incoming activities '''
+""" incoming activities """
 import json
 from urllib.parse import urldefrag
 
@@ -14,12 +14,13 @@ from bookwyrm.tasks import app
 from bookwyrm.signatures import Signature
 
 
-@method_decorator(csrf_exempt, name='dispatch')
+@method_decorator(csrf_exempt, name="dispatch")
 # pylint: disable=no-self-use
 class Inbox(View):
-    ''' requests sent by outside servers'''
+    """ requests sent by outside servers"""
+
     def post(self, request, username=None):
-        ''' only works as POST request '''
+        """ only works as POST request """
         # make sure the user's inbox even exists
         if username:
             try:
@@ -33,14 +34,16 @@ class Inbox(View):
         except json.decoder.JSONDecodeError:
             return HttpResponseBadRequest()
 
-        if not 'object' in activity_json or \
-                not 'type' in activity_json or \
-                not activity_json['type'] in activitypub.activity_objects:
+        if (
+            not "object" in activity_json
+            or not "type" in activity_json
+            or not activity_json["type"] in activitypub.activity_objects
+        ):
             return HttpResponseNotFound()
 
         # verify the signature
         if not has_valid_signature(request, activity_json):
-            if activity_json['type'] == 'Delete':
+            if activity_json["type"] == "Delete":
                 # Pretend that unauth'd deletes succeed. Auth may be failing
                 # because the resource or owner of the resource might have
                 # been deleted.
@@ -53,7 +56,7 @@ class Inbox(View):
 
 @app.task
 def activity_task(activity_json):
-    ''' do something with this json we think is legit '''
+    """ do something with this json we think is legit """
     # lets see if the activitypub module can make sense of this json
     try:
         activity = activitypub.parse(activity_json)
@@ -70,16 +73,15 @@ def activity_task(activity_json):
 
 
 def has_valid_signature(request, activity):
-    ''' verify incoming signature '''
+    """ verify incoming signature """
     try:
         signature = Signature.parse(request)
 
         key_actor = urldefrag(signature.key_id).url
-        if key_actor != activity.get('actor'):
+        if key_actor != activity.get("actor"):
             raise ValueError("Wrong actor created signature.")
 
-        remote_user = activitypub.resolve_remote_id(
-            key_actor, model=models.User)
+        remote_user = activitypub.resolve_remote_id(key_actor, model=models.User)
         if not remote_user:
             return False
 
@@ -91,7 +93,7 @@ def has_valid_signature(request, activity):
                 remote_user.remote_id, model=models.User, refresh=True
             )
             if remote_user.key_pair.public_key == old_key:
-                raise # Key unchanged.
+                raise  # Key unchanged.
             signature.verify(remote_user.key_pair.public_key, request)
     except (ValueError, requests.exceptions.HTTPError):
         return False
diff --git a/bookwyrm/views/interaction.py b/bookwyrm/views/interaction.py
index a7fcc231..e337f2ef 100644
--- a/bookwyrm/views/interaction.py
+++ b/bookwyrm/views/interaction.py
@@ -1,4 +1,4 @@
-''' boosts and favs '''
+""" boosts and favs """
 from django.db import IntegrityError
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponseBadRequest, HttpResponseNotFound
@@ -10,75 +10,74 @@ from bookwyrm import models
 
 
 # pylint: disable= no-self-use
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
 class Favorite(View):
-    ''' like a status '''
+    """ like a status """
+
     def post(self, request, status_id):
-        ''' create a like '''
+        """ create a like """
         status = models.Status.objects.get(id=status_id)
         try:
-            models.Favorite.objects.create(
-                status=status,
-                user=request.user
-            )
+            models.Favorite.objects.create(status=status, user=request.user)
         except IntegrityError:
             # you already fav'ed that
             return HttpResponseBadRequest()
 
-        return redirect(request.headers.get('Referer', '/'))
+        return redirect(request.headers.get("Referer", "/"))
 
 
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
 class Unfavorite(View):
-    ''' take back a fav '''
+    """ take back a fav """
+
     def post(self, request, status_id):
-        ''' unlike a status '''
+        """ unlike a status """
         status = models.Status.objects.get(id=status_id)
         try:
-            favorite = models.Favorite.objects.get(
-                status=status,
-                user=request.user
-            )
+            favorite = models.Favorite.objects.get(status=status, user=request.user)
         except models.Favorite.DoesNotExist:
             # can't find that status, idk
             return HttpResponseNotFound()
 
         favorite.delete()
-        return redirect(request.headers.get('Referer', '/'))
+        return redirect(request.headers.get("Referer", "/"))
 
 
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
 class Boost(View):
-    ''' boost a status '''
+    """ boost a status """
+
     def post(self, request, status_id):
-        ''' boost a status '''
+        """ boost a status """
         status = models.Status.objects.get(id=status_id)
         # is it boostable?
         if not status.boostable:
             return HttpResponseBadRequest()
 
         if models.Boost.objects.filter(
-                boosted_status=status, user=request.user).exists():
+            boosted_status=status, user=request.user
+        ).exists():
             # you already boosted that.
-            return redirect(request.headers.get('Referer', '/'))
+            return redirect(request.headers.get("Referer", "/"))
 
         models.Boost.objects.create(
             boosted_status=status,
             privacy=status.privacy,
             user=request.user,
         )
-        return redirect(request.headers.get('Referer', '/'))
+        return redirect(request.headers.get("Referer", "/"))
 
 
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
 class Unboost(View):
-    ''' boost a status '''
+    """ boost a status """
+
     def post(self, request, status_id):
-        ''' boost a status '''
+        """ boost a status """
         status = models.Status.objects.get(id=status_id)
         boost = models.Boost.objects.filter(
             boosted_status=status, user=request.user
         ).first()
 
         boost.delete()
-        return redirect(request.headers.get('Referer', '/'))
+        return redirect(request.headers.get("Referer", "/"))
diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/invite.py
index 750a5c2b..1f1ccaf1 100644
--- a/bookwyrm/views/invite.py
+++ b/bookwyrm/views/invite.py
@@ -1,4 +1,4 @@
-''' invites when registration is closed '''
+""" invites when registration is closed """
 from django.contrib.auth.decorators import login_required, permission_required
 from django.core.paginator import Paginator
 from django.http import HttpResponseBadRequest
@@ -12,31 +12,36 @@ from bookwyrm.settings import PAGE_LENGTH
 
 
 # pylint: disable= no-self-use
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
 @method_decorator(
-    permission_required('bookwyrm.create_invites', raise_exception=True),
-    name='dispatch')
+    permission_required("bookwyrm.create_invites", raise_exception=True),
+    name="dispatch",
+)
 class ManageInvites(View):
-    ''' create invites '''
+    """ create invites """
+
     def get(self, request):
-        ''' invite management page '''
+        """ invite management page """
         try:
-            page = int(request.GET.get('page', 1))
+            page = int(request.GET.get("page", 1))
         except ValueError:
             page = 1
 
-        paginated = Paginator(models.SiteInvite.objects.filter(
-            user=request.user
-        ).order_by('-created_date'), PAGE_LENGTH)
+        paginated = Paginator(
+            models.SiteInvite.objects.filter(user=request.user).order_by(
+                "-created_date"
+            ),
+            PAGE_LENGTH,
+        )
 
         data = {
-            'invites': paginated.page(page),
-            'form': forms.CreateInviteForm(),
+            "invites": paginated.page(page),
+            "form": forms.CreateInviteForm(),
         }
-        return TemplateResponse(request, 'settings/manage_invites.html', data)
+        return TemplateResponse(request, "settings/manage_invites.html", data)
 
     def post(self, request):
-        ''' creates an invite database entry '''
+        """ creates an invite database entry """
         form = forms.CreateInviteForm(request.POST)
         if not form.is_valid():
             return HttpResponseBadRequest("ERRORS : %s" % (form.errors,))
@@ -45,29 +50,30 @@ class ManageInvites(View):
         invite.user = request.user
         invite.save()
 
-        paginated = Paginator(models.SiteInvite.objects.filter(
-            user=request.user
-        ).order_by('-created_date'), PAGE_LENGTH)
-        data = {
-            'invites': paginated.page(1),
-            'form': form
-        }
-        return TemplateResponse(request, 'settings/manage_invites.html', data)
+        paginated = Paginator(
+            models.SiteInvite.objects.filter(user=request.user).order_by(
+                "-created_date"
+            ),
+            PAGE_LENGTH,
+        )
+        data = {"invites": paginated.page(1), "form": form}
+        return TemplateResponse(request, "settings/manage_invites.html", data)
 
 
 class Invite(View):
-    ''' use an invite to register '''
+    """ use an invite to register """
+
     def get(self, request, code):
-        ''' endpoint for using an invites '''
+        """ endpoint for using an invites """
         if request.user.is_authenticated:
-            return redirect('/')
+            return redirect("/")
         invite = get_object_or_404(models.SiteInvite, code=code)
 
         data = {
-            'register_form': forms.RegisterForm(),
-            'invite': invite,
-            'valid': invite.valid() if invite else True,
+            "register_form": forms.RegisterForm(),
+            "invite": invite,
+            "valid": invite.valid() if invite else True,
         }
-        return TemplateResponse(request, 'invite.html', data)
+        return TemplateResponse(request, "invite.html", data)
 
     # post handling is in views.authentication.Register
diff --git a/bookwyrm/views/isbn.py b/bookwyrm/views/isbn.py
index e5539ba3..b7ba02dd 100644
--- a/bookwyrm/views/isbn.py
+++ b/bookwyrm/views/isbn.py
@@ -1,4 +1,4 @@
-''' isbn search view '''
+""" isbn search view """
 from django.http import HttpResponseNotFound
 from django.http import JsonResponse
 from django.shortcuts import get_object_or_404, redirect
@@ -13,17 +13,18 @@ from .helpers import is_api_request
 
 # pylint: disable= no-self-use
 class Isbn(View):
-    ''' search a book by isbn '''
+    """ search a book by isbn """
+
     def get(self, request, isbn):
-        ''' info about a book '''
+        """ info about a book """
         book_results = connector_manager.isbn_local_search(isbn)
 
         if is_api_request(request):
             return JsonResponse([r.json() for r in book_results], safe=False)
 
         data = {
-            'title': 'ISBN Search Results',
-            'results': book_results,
-            'query': isbn,
+            "title": "ISBN Search Results",
+            "results": book_results,
+            "query": isbn,
         }
-        return TemplateResponse(request, 'isbn_search_results.html', data)
+        return TemplateResponse(request, "isbn_search_results.html", data)
diff --git a/bookwyrm/views/landing.py b/bookwyrm/views/landing.py
index 94b27b8f..2c4a5147 100644
--- a/bookwyrm/views/landing.py
+++ b/bookwyrm/views/landing.py
@@ -1,4 +1,4 @@
-''' non-interactive pages '''
+""" non-interactive pages """
 from django.db.models import Max
 from django.template.response import TemplateResponse
 from django.views import View
@@ -9,38 +9,44 @@ from .feed import Feed
 
 # pylint: disable= no-self-use
 class About(View):
-    ''' create invites '''
+    """ create invites """
+
     def get(self, request):
-        ''' more information about the instance '''
-        return TemplateResponse(request, 'discover/about.html')
+        """ more information about the instance """
+        return TemplateResponse(request, "discover/about.html")
+
 
 class Home(View):
-    ''' discover page or home feed depending on auth '''
+    """ discover page or home feed depending on auth """
+
     def get(self, request):
-        ''' this is the same as the feed on the home tab '''
+        """ this is the same as the feed on the home tab """
         if request.user.is_authenticated:
             feed_view = Feed.as_view()
-            return feed_view(request, 'home')
+            return feed_view(request, "home")
         discover_view = Discover.as_view()
         return discover_view(request)
 
+
 class Discover(View):
-    ''' preview of recently reviewed books '''
+    """ preview of recently reviewed books """
+
     def get(self, request):
-        ''' tiled book activity page '''
-        books = models.Edition.objects.filter(
-            review__published_date__isnull=False,
-            review__deleted=False,
-            review__user__local=True,
-            review__privacy__in=['public', 'unlisted'],
-        ).exclude(
-            cover__exact=''
-        ).annotate(
-            Max('review__published_date')
-        ).order_by('-review__published_date__max')[:6]
+        """ tiled book activity page """
+        books = (
+            models.Edition.objects.filter(
+                review__published_date__isnull=False,
+                review__deleted=False,
+                review__user__local=True,
+                review__privacy__in=["public", "unlisted"],
+            )
+            .exclude(cover__exact="")
+            .annotate(Max("review__published_date"))
+            .order_by("-review__published_date__max")[:6]
+        )
 
         data = {
-            'register_form': forms.RegisterForm(),
-            'books': list(set(books)),
+            "register_form": forms.RegisterForm(),
+            "books": list(set(books)),
         }
-        return TemplateResponse(request, 'discover/discover.html', data)
+        return TemplateResponse(request, "discover/discover.html", data)
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index b1741b11..ba3200d1 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -1,4 +1,4 @@
-''' book list views'''
+""" book list views"""
 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
 from django.db import IntegrityError
@@ -18,51 +18,57 @@ from .helpers import get_user_from_username
 
 # pylint: disable=no-self-use
 class Lists(View):
-    ''' book list page '''
+    """ book list page """
+
     def get(self, request):
-        ''' display a book list '''
+        """ display a book list """
         try:
-            page = int(request.GET.get('page', 1))
+            page = int(request.GET.get("page", 1))
         except ValueError:
             page = 1
 
         user = request.user if request.user.is_authenticated else None
         # hide lists with no approved books
-        lists = models.List.objects.filter(
-            ~Q(user=user),
-        ).annotate(
-            item_count=Count('listitem', filter=Q(listitem__approved=True))
-        ).filter(
-            item_count__gt=0
-        ).distinct().all()
+        lists = (
+            models.List.objects.filter(
+                ~Q(user=user),
+            )
+            .annotate(item_count=Count("listitem", filter=Q(listitem__approved=True)))
+            .filter(item_count__gt=0)
+            .distinct()
+            .all()
+        )
         lists = privacy_filter(
-            request.user, lists, privacy_levels=['public', 'followers'])
+            request.user, lists, privacy_levels=["public", "followers"]
+        )
 
         paginated = Paginator(lists, 12)
         data = {
-            'lists': paginated.page(page),
-            'list_form': forms.ListForm(),
-            'path': '/list',
+            "lists": paginated.page(page),
+            "list_form": forms.ListForm(),
+            "path": "/list",
         }
-        return TemplateResponse(request, 'lists/lists.html', data)
+        return TemplateResponse(request, "lists/lists.html", data)
 
-    @method_decorator(login_required, name='dispatch')
+    @method_decorator(login_required, name="dispatch")
     # pylint: disable=unused-argument
     def post(self, request):
-        ''' create a book_list '''
+        """ create a book_list """
         form = forms.ListForm(request.POST)
         if not form.is_valid():
-            return redirect('lists')
+            return redirect("lists")
         book_list = form.save()
 
         return redirect(book_list.local_path)
 
+
 class UserLists(View):
-    ''' a user's book list page '''
+    """ a user's book list page """
+
     def get(self, request, username):
-        ''' display a book list '''
+        """ display a book list """
         try:
-            page = int(request.GET.get('page', 1))
+            page = int(request.GET.get("page", 1))
         except ValueError:
             page = 1
         user = get_user_from_username(request.user, username)
@@ -71,19 +77,20 @@ class UserLists(View):
         paginated = Paginator(lists, 12)
 
         data = {
-            'user': user,
-            'is_self': request.user.id == user.id,
-            'lists': paginated.page(page),
-            'list_form': forms.ListForm(),
-            'path': user.local_path + '/lists',
+            "user": user,
+            "is_self": request.user.id == user.id,
+            "lists": paginated.page(page),
+            "list_form": forms.ListForm(),
+            "path": user.local_path + "/lists",
         }
-        return TemplateResponse(request, 'user/lists.html', data)
+        return TemplateResponse(request, "user/lists.html", data)
 
 
 class List(View):
-    ''' book list page '''
+    """ book list page """
+
     def get(self, request, list_id):
-        ''' display a book list '''
+        """ display a book list """
         book_list = get_object_or_404(models.List, id=list_id)
         if not object_visible_to_user(request.user, book_list):
             return HttpResponseNotFound()
@@ -91,7 +98,7 @@ class List(View):
         if is_api_request(request):
             return ActivitypubResponse(book_list.to_activity(**request.GET))
 
-        query = request.GET.get('q')
+        query = request.GET.get("q")
         suggestions = None
         if query and request.user.is_authenticated:
             # search for books
@@ -104,89 +111,85 @@ class List(View):
             suggestions = [s.book for s in suggestions[:5]]
             if len(suggestions) < 5:
                 suggestions += [
-                    s.default_edition for s in \
-                        models.Work.objects.filter(
-                            ~Q(editions__in=book_list.books.all()),
-                        ).order_by('-updated_date')
-                ][:5 - len(suggestions)]
-
+                    s.default_edition
+                    for s in models.Work.objects.filter(
+                        ~Q(editions__in=book_list.books.all()),
+                    ).order_by("-updated_date")
+                ][: 5 - len(suggestions)]
 
         data = {
-            'list': book_list,
-            'items': book_list.listitem_set.filter(approved=True),
-            'pending_count': book_list.listitem_set.filter(
-                approved=False).count(),
-            'suggested_books': suggestions,
-            'list_form': forms.ListForm(instance=book_list),
-            'query': query or ''
+            "list": book_list,
+            "items": book_list.listitem_set.filter(approved=True),
+            "pending_count": book_list.listitem_set.filter(approved=False).count(),
+            "suggested_books": suggestions,
+            "list_form": forms.ListForm(instance=book_list),
+            "query": query or "",
         }
-        return TemplateResponse(request, 'lists/list.html', data)
+        return TemplateResponse(request, "lists/list.html", data)
 
-
-    @method_decorator(login_required, name='dispatch')
+    @method_decorator(login_required, name="dispatch")
     # pylint: disable=unused-argument
     def post(self, request, list_id):
-        ''' edit a list '''
+        """ edit a list """
         book_list = get_object_or_404(models.List, id=list_id)
         form = forms.ListForm(request.POST, instance=book_list)
         if not form.is_valid():
-            return redirect('list', book_list.id)
+            return redirect("list", book_list.id)
         book_list = form.save()
         return redirect(book_list.local_path)
 
 
 class Curate(View):
-    ''' approve or discard list suggestsions '''
-    @method_decorator(login_required, name='dispatch')
+    """ approve or discard list suggestsions """
+
+    @method_decorator(login_required, name="dispatch")
     def get(self, request, list_id):
-        ''' display a pending list '''
+        """ display a pending list """
         book_list = get_object_or_404(models.List, id=list_id)
         if not book_list.user == request.user:
             # only the creater can curate the list
             return HttpResponseNotFound()
 
         data = {
-            'list': book_list,
-            'pending': book_list.listitem_set.filter(approved=False),
-            'list_form': forms.ListForm(instance=book_list),
+            "list": book_list,
+            "pending": book_list.listitem_set.filter(approved=False),
+            "list_form": forms.ListForm(instance=book_list),
         }
-        return TemplateResponse(request, 'lists/curate.html', data)
+        return TemplateResponse(request, "lists/curate.html", data)
 
-
-    @method_decorator(login_required, name='dispatch')
+    @method_decorator(login_required, name="dispatch")
     # pylint: disable=unused-argument
     def post(self, request, list_id):
-        ''' edit a book_list '''
+        """ edit a book_list """
         book_list = get_object_or_404(models.List, id=list_id)
-        suggestion = get_object_or_404(
-            models.ListItem, id=request.POST.get('item'))
-        approved = request.POST.get('approved') == 'true'
+        suggestion = get_object_or_404(models.ListItem, id=request.POST.get("item"))
+        approved = request.POST.get("approved") == "true"
         if approved:
             suggestion.approved = True
             suggestion.save()
         else:
             suggestion.delete()
-        return redirect('list-curate', book_list.id)
+        return redirect("list-curate", book_list.id)
 
 
 @require_POST
 def add_book(request, list_id):
-    ''' put a book on a list '''
+    """ put a book on a list """
     book_list = get_object_or_404(models.List, id=list_id)
     if not object_visible_to_user(request.user, book_list):
         return HttpResponseNotFound()
 
-    book = get_object_or_404(models.Edition, id=request.POST.get('book'))
+    book = get_object_or_404(models.Edition, id=request.POST.get("book"))
     # do you have permission to add to the list?
     try:
-        if request.user == book_list.user or book_list.curation == 'open':
+        if request.user == book_list.user or book_list.curation == "open":
             # go ahead and add it
             models.ListItem.objects.create(
                 book=book,
                 book_list=book_list,
                 user=request.user,
             )
-        elif book_list.curation == 'curated':
+        elif book_list.curation == "curated":
             # make a pending entry
             models.ListItem.objects.create(
                 approved=False,
@@ -201,17 +204,17 @@ def add_book(request, list_id):
         # if the book is already on the list, don't flip out
         pass
 
-    return redirect('list', list_id)
+    return redirect("list", list_id)
 
 
 @require_POST
 def remove_book(request, list_id):
-    ''' put a book on a list '''
+    """ put a book on a list """
     book_list = get_object_or_404(models.List, id=list_id)
-    item = get_object_or_404(models.ListItem, id=request.POST.get('item'))
+    item = get_object_or_404(models.ListItem, id=request.POST.get("item"))
 
     if not book_list.user == request.user and not item.user == request.user:
         return HttpResponseNotFound()
 
     item.delete()
-    return redirect('list', list_id)
+    return redirect("list", list_id)
diff --git a/bookwyrm/views/notifications.py b/bookwyrm/views/notifications.py
index 684154e4..7a62ec01 100644
--- a/bookwyrm/views/notifications.py
+++ b/bookwyrm/views/notifications.py
@@ -1,4 +1,4 @@
-''' non-interactive pages '''
+""" non-interactive pages """
 from django.contrib.auth.decorators import login_required
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
@@ -7,22 +7,22 @@ from django.views import View
 
 
 # pylint: disable= no-self-use
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
 class Notifications(View):
-    ''' notifications view '''
+    """ notifications view """
+
     def get(self, request):
-        ''' people are interacting with you, get hyped '''
-        notifications = request.user.notification_set.all() \
-                .order_by('-created_date')
+        """ people are interacting with you, get hyped """
+        notifications = request.user.notification_set.all().order_by("-created_date")
         unread = [n.id for n in notifications.filter(read=False)]
         data = {
-            'notifications': notifications,
-            'unread': unread,
+            "notifications": notifications,
+            "unread": unread,
         }
         notifications.update(read=True)
-        return TemplateResponse(request, 'notifications.html', data)
+        return TemplateResponse(request, "notifications.html", data)
 
     def post(self, request):
-        ''' permanently delete notification for user '''
+        """ permanently delete notification for user """
         request.user.notification_set.filter(read=True).delete()
-        return redirect('/notifications')
+        return redirect("/notifications")
diff --git a/bookwyrm/views/outbox.py b/bookwyrm/views/outbox.py
index 5df9d199..ec6f5cd3 100644
--- a/bookwyrm/views/outbox.py
+++ b/bookwyrm/views/outbox.py
@@ -1,4 +1,4 @@
-''' the good stuff! the books! '''
+""" the good stuff! the books! """
 from django.http import JsonResponse
 from django.shortcuts import get_object_or_404
 from django.views import View
@@ -9,11 +9,12 @@ from .helpers import is_bookwyrm_request
 
 # pylint: disable= no-self-use
 class Outbox(View):
-    ''' outbox '''
+    """ outbox """
+
     def get(self, request, username):
-        ''' outbox for the requested user '''
+        """ outbox for the requested user """
         user = get_object_or_404(models.User, localname=username)
-        filter_type = request.GET.get('type')
+        filter_type = request.GET.get("type")
         if filter_type not in models.status_models:
             filter_type = None
 
@@ -23,5 +24,5 @@ class Outbox(View):
                 filter_type=filter_type,
                 pure=not is_bookwyrm_request(request)
             ),
-            encoder=activitypub.ActivityEncoder
+            encoder=activitypub.ActivityEncoder,
         )
diff --git a/bookwyrm/views/password.py b/bookwyrm/views/password.py
index 792da2d7..e853d16b 100644
--- a/bookwyrm/views/password.py
+++ b/bookwyrm/views/password.py
@@ -1,4 +1,4 @@
-''' class views for password management '''
+""" class views for password management """
 from django.contrib.auth import login
 from django.contrib.auth.decorators import login_required
 from django.core.exceptions import PermissionDenied
@@ -13,21 +13,22 @@ from bookwyrm.emailing import password_reset_email
 
 # pylint: disable= no-self-use
 class PasswordResetRequest(View):
-    ''' forgot password flow '''
+    """ forgot password flow """
+
     def get(self, request):
-        ''' password reset page '''
+        """ password reset page """
         return TemplateResponse(
             request,
-            'password_reset_request.html',
+            "password_reset_request.html",
         )
 
     def post(self, request):
-        ''' create a password reset token '''
-        email = request.POST.get('email')
+        """ create a password reset token """
+        email = request.POST.get("email")
         try:
             user = models.User.objects.get(email=email)
         except models.User.DoesNotExist:
-            return redirect('/password-reset')
+            return redirect("/password-reset")
 
         # remove any existing password reset cods for this user
         models.PasswordReset.objects.filter(user=user).all().delete()
@@ -35,16 +36,17 @@ class PasswordResetRequest(View):
         # create a new reset code
         code = models.PasswordReset.objects.create(user=user)
         password_reset_email(code)
-        data = {'message': 'Password reset link sent to %s' % email}
-        return TemplateResponse(request, 'password_reset_request.html', data)
+        data = {"message": "Password reset link sent to %s" % email}
+        return TemplateResponse(request, "password_reset_request.html", data)
 
 
 class PasswordReset(View):
-    ''' set new password '''
+    """ set new password """
+
     def get(self, request, code):
-        ''' endpoint for sending invites '''
+        """ endpoint for sending invites """
         if request.user.is_authenticated:
-            return redirect('/')
+            return redirect("/")
         try:
             reset_code = models.PasswordReset.objects.get(code=code)
             if not reset_code.valid():
@@ -52,50 +54,48 @@ class PasswordReset(View):
         except models.PasswordReset.DoesNotExist:
             raise PermissionDenied
 
-        return TemplateResponse(request, 'password_reset.html')
+        return TemplateResponse(request, "password_reset.html")
 
     def post(self, request, code):
-        ''' allow a user to change their password through an emailed token '''
+        """ allow a user to change their password through an emailed token """
         try:
-            reset_code = models.PasswordReset.objects.get(
-                code=code
-            )
+            reset_code = models.PasswordReset.objects.get(code=code)
         except models.PasswordReset.DoesNotExist:
-            data = {'errors': ['Invalid password reset link']}
-            return TemplateResponse(request, 'password_reset.html', data)
+            data = {"errors": ["Invalid password reset link"]}
+            return TemplateResponse(request, "password_reset.html", data)
 
         user = reset_code.user
 
-        new_password = request.POST.get('password')
-        confirm_password = request.POST.get('confirm-password')
+        new_password = request.POST.get("password")
+        confirm_password = request.POST.get("confirm-password")
 
         if new_password != confirm_password:
-            data = {'errors': ['Passwords do not match']}
-            return TemplateResponse(request, 'password_reset.html', data)
+            data = {"errors": ["Passwords do not match"]}
+            return TemplateResponse(request, "password_reset.html", data)
 
         user.set_password(new_password)
         user.save(broadcast=False)
         login(request, user)
         reset_code.delete()
-        return redirect('/')
+        return redirect("/")
 
 
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
 class ChangePassword(View):
-    ''' change password as logged in user '''
+    """ change password as logged in user """
+
     def get(self, request):
-        ''' change password page '''
-        data = {'user': request.user}
-        return TemplateResponse(
-            request, 'preferences/change_password.html', data)
+        """ change password page """
+        data = {"user": request.user}
+        return TemplateResponse(request, "preferences/change_password.html", data)
 
     def post(self, request):
-        ''' allow a user to change their password '''
-        new_password = request.POST.get('password')
-        confirm_password = request.POST.get('confirm-password')
+        """ allow a user to change their password """
+        new_password = request.POST.get("password")
+        confirm_password = request.POST.get("confirm-password")
 
         if new_password != confirm_password:
-            return redirect('preferences/password')
+            return redirect("preferences/password")
 
         request.user.set_password(new_password)
         request.user.save(broadcast=False)
diff --git a/bookwyrm/views/reading.py b/bookwyrm/views/reading.py
index 6b2bf242..fb63f2a3 100644
--- a/bookwyrm/views/reading.py
+++ b/bookwyrm/views/reading.py
@@ -1,4 +1,4 @@
-''' the good stuff! the books! '''
+""" the good stuff! the books! """
 import dateutil.parser
 from dateutil.parser import ParserError
 
@@ -17,12 +17,9 @@ from .shelf import handle_unshelve
 @login_required
 @require_POST
 def start_reading(request, book_id):
-    ''' begin reading a book '''
+    """ begin reading a book """
     book = get_edition(book_id)
-    shelf = models.Shelf.objects.filter(
-        identifier='reading',
-        user=request.user
-    ).first()
+    shelf = models.Shelf.objects.filter(identifier="reading", user=request.user).first()
 
     # create a readthrough
     readthrough = update_readthrough(request, book=book)
@@ -33,36 +30,29 @@ def start_reading(request, book_id):
         readthrough.create_update()
 
     # shelve the book
-    if request.POST.get('reshelve', True):
+    if request.POST.get("reshelve", True):
         try:
-            current_shelf = models.Shelf.objects.get(
-                user=request.user,
-                edition=book
-            )
+            current_shelf = models.Shelf.objects.get(user=request.user, edition=book)
             handle_unshelve(request.user, book, current_shelf)
         except models.Shelf.DoesNotExist:
             # this just means it isn't currently on the user's shelves
             pass
-    models.ShelfBook.objects.create(
-        book=book, shelf=shelf, user=request.user)
+    models.ShelfBook.objects.create(book=book, shelf=shelf, user=request.user)
 
     # post about it (if you want)
-    if request.POST.get('post-status'):
-        privacy = request.POST.get('privacy')
+    if request.POST.get("post-status"):
+        privacy = request.POST.get("privacy")
         handle_reading_status(request.user, shelf, book, privacy)
 
-    return redirect(request.headers.get('Referer', '/'))
+    return redirect(request.headers.get("Referer", "/"))
 
 
 @login_required
 @require_POST
 def finish_reading(request, book_id):
-    ''' a user completed a book, yay '''
+    """ a user completed a book, yay """
     book = get_edition(book_id)
-    shelf = models.Shelf.objects.filter(
-        identifier='read',
-        user=request.user
-    ).first()
+    shelf = models.Shelf.objects.filter(identifier="read", user=request.user).first()
 
     # update or create a readthrough
     readthrough = update_readthrough(request, book=book)
@@ -70,31 +60,27 @@ def finish_reading(request, book_id):
         readthrough.save()
 
     # shelve the book
-    if request.POST.get('reshelve', True):
+    if request.POST.get("reshelve", True):
         try:
-            current_shelf = models.Shelf.objects.get(
-                user=request.user,
-                edition=book
-            )
+            current_shelf = models.Shelf.objects.get(user=request.user, edition=book)
             handle_unshelve(request.user, book, current_shelf)
         except models.Shelf.DoesNotExist:
             # this just means it isn't currently on the user's shelves
             pass
-    models.ShelfBook.objects.create(
-        book=book, shelf=shelf, user=request.user)
+    models.ShelfBook.objects.create(book=book, shelf=shelf, user=request.user)
 
     # post about it (if you want)
-    if request.POST.get('post-status'):
-        privacy = request.POST.get('privacy')
+    if request.POST.get("post-status"):
+        privacy = request.POST.get("privacy")
         handle_reading_status(request.user, shelf, book, privacy)
 
-    return redirect(request.headers.get('Referer', '/'))
+    return redirect(request.headers.get("Referer", "/"))
 
 
 @login_required
 @require_POST
 def edit_readthrough(request):
-    ''' can't use the form because the dates are too finnicky '''
+    """ can't use the form because the dates are too finnicky """
     readthrough = update_readthrough(request, create=False)
     if not readthrough:
         return HttpResponseNotFound()
@@ -108,40 +94,39 @@ def edit_readthrough(request):
     # use default now for date field
     readthrough.create_update()
 
-    return redirect(request.headers.get('Referer', '/'))
+    return redirect(request.headers.get("Referer", "/"))
 
 
 @login_required
 @require_POST
 def delete_readthrough(request):
-    ''' remove a readthrough '''
-    readthrough = get_object_or_404(
-        models.ReadThrough, id=request.POST.get('id'))
+    """ remove a readthrough """
+    readthrough = get_object_or_404(models.ReadThrough, id=request.POST.get("id"))
 
     # don't let people edit other people's data
     if request.user != readthrough.user:
         return HttpResponseBadRequest()
 
     readthrough.delete()
-    return redirect(request.headers.get('Referer', '/'))
+    return redirect(request.headers.get("Referer", "/"))
 
 
 @login_required
 @require_POST
 def create_readthrough(request):
-    ''' can't use the form because the dates are too finnicky '''
-    book = get_object_or_404(models.Edition, id=request.POST.get('book'))
+    """ can't use the form because the dates are too finnicky """
+    book = get_object_or_404(models.Edition, id=request.POST.get("book"))
     readthrough = update_readthrough(request, create=True, book=book)
     if not readthrough:
         return redirect(book.local_path)
     readthrough.save()
-    return redirect(request.headers.get('Referer', '/'))
+    return redirect(request.headers.get("Referer", "/"))
 
 
 def update_readthrough(request, book=None, create=True):
-    ''' updates but does not save dates on a readthrough '''
+    """ updates but does not save dates on a readthrough """
     try:
-        read_id = request.POST.get('id')
+        read_id = request.POST.get("id")
         if not read_id:
             raise models.ReadThrough.DoesNotExist
         readthrough = models.ReadThrough.objects.get(id=read_id)
@@ -153,7 +138,7 @@ def update_readthrough(request, book=None, create=True):
             book=book,
         )
 
-    start_date = request.POST.get('start_date')
+    start_date = request.POST.get("start_date")
     if start_date:
         try:
             start_date = timezone.make_aware(dateutil.parser.parse(start_date))
@@ -161,16 +146,15 @@ def update_readthrough(request, book=None, create=True):
         except ParserError:
             pass
 
-    finish_date = request.POST.get('finish_date')
+    finish_date = request.POST.get("finish_date")
     if finish_date:
         try:
-            finish_date = timezone.make_aware(
-                dateutil.parser.parse(finish_date))
+            finish_date = timezone.make_aware(dateutil.parser.parse(finish_date))
             readthrough.finish_date = finish_date
         except ParserError:
             pass
 
-    progress = request.POST.get('progress')
+    progress = request.POST.get("progress")
     if progress:
         try:
             progress = int(progress)
@@ -178,7 +162,7 @@ def update_readthrough(request, book=None, create=True):
         except ValueError:
             pass
 
-    progress_mode = request.POST.get('progress_mode')
+    progress_mode = request.POST.get("progress_mode")
     if progress_mode:
         try:
             progress_mode = models.ProgressMode(progress_mode)
@@ -191,15 +175,16 @@ def update_readthrough(request, book=None, create=True):
 
     return readthrough
 
+
 @login_required
 @require_POST
 def delete_progressupdate(request):
-    ''' remove a progress update '''
-    update = get_object_or_404(models.ProgressUpdate, id=request.POST.get('id'))
+    """ remove a progress update """
+    update = get_object_or_404(models.ProgressUpdate, id=request.POST.get("id"))
 
     # don't let people edit other people's data
     if request.user != update.user:
         return HttpResponseBadRequest()
 
     update.delete()
-    return redirect(request.headers.get('Referer', '/'))
+    return redirect(request.headers.get("Referer", "/"))
diff --git a/bookwyrm/views/rss_feed.py b/bookwyrm/views/rss_feed.py
index d24b636e..57821af4 100644
--- a/bookwyrm/views/rss_feed.py
+++ b/bookwyrm/views/rss_feed.py
@@ -1,38 +1,35 @@
-''' serialize user's posts in rss feed '''
+""" serialize user's posts in rss feed """
 
 from django.contrib.syndication.views import Feed
 from .helpers import get_activity_feed, get_user_from_username
 
 # pylint: disable=no-self-use, unused-argument
 class RssFeed(Feed):
-    ''' serialize user's posts in rss feed '''
-    description_template = 'snippets/rss_content.html'
-    title_template = 'snippets/rss_title.html'
+    """ serialize user's posts in rss feed """
+
+    description_template = "snippets/rss_content.html"
+    title_template = "snippets/rss_title.html"
 
     def get_object(self, request, username):
-        ''' the user who's posts get serialized '''
+        """ the user who's posts get serialized """
         return get_user_from_username(request.user, username)
 
-
     def link(self, obj):
-        ''' link to the user's profile '''
+        """ link to the user's profile """
         return obj.local_path
 
-
     def title(self, obj):
-        ''' title of the rss feed entry '''
-        return f'Status updates from {obj.display_name}'
-
+        """ title of the rss feed entry """
+        return f"Status updates from {obj.display_name}"
 
     def items(self, obj):
-        ''' the user's activity feed '''
+        """ the user's activity feed """
         return get_activity_feed(
             obj,
-            privacy=['public', 'unlisted'],
-            queryset=obj.status_set.select_subclasses()
+            privacy=["public", "unlisted"],
+            queryset=obj.status_set.select_subclasses(),
         )
 
-
     def item_link(self, item):
-        ''' link to the status '''
+        """ link to the status """
         return item.local_path
diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py
index b44c49f8..80969d31 100644
--- a/bookwyrm/views/search.py
+++ b/bookwyrm/views/search.py
@@ -1,4 +1,4 @@
-''' search views'''
+""" search views"""
 import re
 
 from django.contrib.postgres.search import TrigramSimilarity
@@ -16,51 +16,63 @@ from .helpers import handle_remote_webfinger
 
 # pylint: disable= no-self-use
 class Search(View):
-    ''' search users or books '''
+    """ search users or books """
+
     def get(self, request):
-        ''' that search bar up top '''
-        query = request.GET.get('q')
-        min_confidence = request.GET.get('min_confidence', 0.1)
+        """ that search bar up top """
+        query = request.GET.get("q")
+        min_confidence = request.GET.get("min_confidence", 0.1)
 
         if is_api_request(request):
             # only return local book results via json so we don't cascade
             book_results = connector_manager.local_search(
-                query, min_confidence=min_confidence)
+                query, min_confidence=min_confidence
+            )
             return JsonResponse([r.json() for r in book_results], safe=False)
 
         # use webfinger for mastodon style account@domain.com username
-        if re.match(r'\B%s' % regex.full_username, query):
+        if re.match(r"\B%s" % regex.full_username, query):
             handle_remote_webfinger(query)
 
         # do a  user search
-        user_results = models.User.viewer_aware_objects(request.user).annotate(
-            similarity=Greatest(
-                TrigramSimilarity('username', query),
-                TrigramSimilarity('localname', query),
+        user_results = (
+            models.User.viewer_aware_objects(request.user)
+            .annotate(
+                similarity=Greatest(
+                    TrigramSimilarity("username", query),
+                    TrigramSimilarity("localname", query),
+                )
             )
-        ).filter(
-            similarity__gt=0.5,
-        ).order_by('-similarity')[:10]
+            .filter(
+                similarity__gt=0.5,
+            )
+            .order_by("-similarity")[:10]
+        )
 
         # any relevent lists?
-        list_results = privacy_filter(
-            request.user, models.List.objects,
-            privacy_levels=['public', 'followers']
-        ).annotate(
-            similarity=Greatest(
-                TrigramSimilarity('name', query),
-                TrigramSimilarity('description', query),
+        list_results = (
+            privacy_filter(
+                request.user,
+                models.List.objects,
+                privacy_levels=["public", "followers"],
             )
-        ).filter(
-            similarity__gt=0.1,
-        ).order_by('-similarity')[:10]
+            .annotate(
+                similarity=Greatest(
+                    TrigramSimilarity("name", query),
+                    TrigramSimilarity("description", query),
+                )
+            )
+            .filter(
+                similarity__gt=0.1,
+            )
+            .order_by("-similarity")[:10]
+        )
 
-        book_results = connector_manager.search(
-            query, min_confidence=min_confidence)
+        book_results = connector_manager.search(query, min_confidence=min_confidence)
         data = {
-            'book_results': book_results,
-            'user_results': user_results,
-            'list_results': list_results,
-            'query': query,
+            "book_results": book_results,
+            "user_results": user_results,
+            "list_results": list_results,
+            "query": query,
         }
-        return TemplateResponse(request, 'search_results.html', data)
+        return TemplateResponse(request, "search_results.html", data)
diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index 867c7d91..6256eac7 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -1,4 +1,4 @@
-''' shelf views'''
+""" shelf views"""
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponseBadRequest, HttpResponseNotFound
 from django.shortcuts import get_object_or_404, redirect
@@ -15,9 +15,10 @@ from .helpers import handle_reading_status
 
 # pylint: disable= no-self-use
 class Shelf(View):
-    ''' shelf page '''
+    """ shelf page """
+
     def get(self, request, username, shelf_identifier):
-        ''' display a shelf '''
+        """ display a shelf """
         try:
             user = get_user_from_username(request.user, username)
         except models.User.DoesNotExist:
@@ -34,38 +35,40 @@ class Shelf(View):
         if not is_self:
             follower = user.followers.filter(id=request.user.id).exists()
             # make sure the user has permission to view the shelf
-            if shelf.privacy == 'direct' or \
-                    (shelf.privacy == 'followers' and not follower):
+            if shelf.privacy == "direct" or (
+                shelf.privacy == "followers" and not follower
+            ):
                 return HttpResponseNotFound()
 
             # only show other shelves that should be visible
             if follower:
-                shelves = shelves.filter(privacy__in=['public', 'followers'])
+                shelves = shelves.filter(privacy__in=["public", "followers"])
             else:
-                shelves = shelves.filter(privacy='public')
-
+                shelves = shelves.filter(privacy="public")
 
         if is_api_request(request):
             return ActivitypubResponse(shelf.to_activity(**request.GET))
 
-        books = models.ShelfBook.objects.filter(
-            user=user, shelf=shelf
-        ).order_by('-updated_date').all()
+        books = (
+            models.ShelfBook.objects.filter(user=user, shelf=shelf)
+            .order_by("-updated_date")
+            .all()
+        )
 
         data = {
-            'user': user,
-            'is_self': is_self,
-            'shelves': shelves.all(),
-            'shelf': shelf,
-            'books': [b.book for b in books],
+            "user": user,
+            "is_self": is_self,
+            "shelves": shelves.all(),
+            "shelf": shelf,
+            "books": [b.book for b in books],
         }
 
-        return TemplateResponse(request, 'user/shelf.html', data)
+        return TemplateResponse(request, "user/shelf.html", data)
 
-    @method_decorator(login_required, name='dispatch')
+    @method_decorator(login_required, name="dispatch")
     # pylint: disable=unused-argument
     def post(self, request, username, shelf_identifier):
-        ''' edit a shelf '''
+        """ edit a shelf """
         try:
             shelf = request.user.shelf_set.get(identifier=shelf_identifier)
         except models.Shelf.DoesNotExist:
@@ -73,7 +76,7 @@ class Shelf(View):
 
         if request.user != shelf.user:
             return HttpResponseBadRequest()
-        if not shelf.editable and request.POST.get('name') != shelf.name:
+        if not shelf.editable and request.POST.get("name") != shelf.name:
             return HttpResponseBadRequest()
 
         form = forms.ShelfForm(request.POST, instance=shelf)
@@ -84,88 +87,76 @@ class Shelf(View):
 
 
 def user_shelves_page(request, username):
-    ''' default shelf '''
+    """ default shelf """
     return Shelf.as_view()(request, username, None)
 
 
 @login_required
 @require_POST
 def create_shelf(request):
-    ''' user generated shelves '''
+    """ user generated shelves """
     form = forms.ShelfForm(request.POST)
     if not form.is_valid():
-        return redirect(request.headers.get('Referer', '/'))
+        return redirect(request.headers.get("Referer", "/"))
 
     shelf = form.save()
-    return redirect('/user/%s/shelf/%s' % \
-            (request.user.localname, shelf.identifier))
+    return redirect("/user/%s/shelf/%s" % (request.user.localname, shelf.identifier))
 
 
 @login_required
 @require_POST
 def delete_shelf(request, shelf_id):
-    ''' user generated shelves '''
+    """ user generated shelves """
     shelf = get_object_or_404(models.Shelf, id=shelf_id)
     if request.user != shelf.user or not shelf.editable:
         return HttpResponseBadRequest()
 
     shelf.delete()
-    return redirect('/user/%s/shelves' % request.user.localname)
+    return redirect("/user/%s/shelves" % request.user.localname)
 
 
 @login_required
 @require_POST
 def shelve(request):
-    ''' put a  on a user's shelf '''
-    book = get_edition(request.POST.get('book'))
+    """ put a  on a user's shelf """
+    book = get_edition(request.POST.get("book"))
 
     desired_shelf = models.Shelf.objects.filter(
-        identifier=request.POST.get('shelf'),
-        user=request.user
+        identifier=request.POST.get("shelf"), user=request.user
     ).first()
     if not desired_shelf:
         return HttpResponseNotFound()
 
-    if request.POST.get('reshelve', True):
+    if request.POST.get("reshelve", True):
         try:
-            current_shelf = models.Shelf.objects.get(
-                user=request.user,
-                edition=book
-            )
+            current_shelf = models.Shelf.objects.get(user=request.user, edition=book)
             handle_unshelve(request.user, book, current_shelf)
         except models.Shelf.DoesNotExist:
             # this just means it isn't currently on the user's shelves
             pass
-    models.ShelfBook.objects.create(
-        book=book, shelf=desired_shelf, user=request.user)
+    models.ShelfBook.objects.create(book=book, shelf=desired_shelf, user=request.user)
 
     # post about "want to read" shelves
-    if desired_shelf.identifier == 'to-read' and \
-            request.POST.get('post-status'):
-        privacy = request.POST.get('privacy') or desired_shelf.privacy
-        handle_reading_status(
-            request.user,
-            desired_shelf,
-            book,
-            privacy=privacy
-        )
+    if desired_shelf.identifier == "to-read" and request.POST.get("post-status"):
+        privacy = request.POST.get("privacy") or desired_shelf.privacy
+        handle_reading_status(request.user, desired_shelf, book, privacy=privacy)
 
-    return redirect('/')
+    return redirect("/")
 
 
 @login_required
 @require_POST
 def unshelve(request):
-    ''' put a  on a user's shelf '''
-    book = models.Edition.objects.get(id=request.POST['book'])
-    current_shelf = models.Shelf.objects.get(id=request.POST['shelf'])
+    """ put a  on a user's shelf """
+    book = models.Edition.objects.get(id=request.POST["book"])
+    current_shelf = models.Shelf.objects.get(id=request.POST["shelf"])
 
     handle_unshelve(request.user, book, current_shelf)
-    return redirect(request.headers.get('Referer', '/'))
+    return redirect(request.headers.get("Referer", "/"))
 
 
-#pylint: disable=unused-argument
+# pylint: disable=unused-argument
 def handle_unshelve(user, book, shelf):
-    ''' unshelve a book '''
+    """ unshelve a book """
     row = models.ShelfBook.objects.get(book=book, shelf=shelf)
     row.delete()
diff --git a/bookwyrm/views/site.py b/bookwyrm/views/site.py
index e60354a3..c40a9e76 100644
--- a/bookwyrm/views/site.py
+++ b/bookwyrm/views/site.py
@@ -1,4 +1,4 @@
-''' manage site settings '''
+""" manage site settings """
 from django.contrib.auth.decorators import login_required, permission_required
 from django.shortcuts import redirect
 from django.template.response import TemplateResponse
@@ -9,26 +9,27 @@ from bookwyrm import forms, models
 
 
 # pylint: disable= no-self-use
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
 @method_decorator(
-    permission_required(
-        'bookwyrm.edit_instance_settings', raise_exception=True),
-    name='dispatch')
+    permission_required("bookwyrm.edit_instance_settings", raise_exception=True),
+    name="dispatch",
+)
 class Site(View):
-    ''' manage things like the instance name '''
+    """ manage things like the instance name """
+
     def get(self, request):
-        ''' edit form '''
+        """ edit form """
         site = models.SiteSettings.objects.get()
-        data = {'site_form': forms.SiteForm(instance=site)}
-        return TemplateResponse(request, 'settings/site.html', data)
+        data = {"site_form": forms.SiteForm(instance=site)}
+        return TemplateResponse(request, "settings/site.html", data)
 
     def post(self, request):
-        ''' edit the site settings '''
+        """ edit the site settings """
         site = models.SiteSettings.objects.get()
         form = forms.SiteForm(request.POST, instance=site)
         if not form.is_valid():
-            data = {'site_form': form}
-            return TemplateResponse(request, 'settings/site.html', data)
+            data = {"site_form": form}
+            return TemplateResponse(request, "settings/site.html", data)
         form.save()
 
-        return redirect('settings-site')
+        return redirect("settings-site")
diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py
index db924ce8..9a626371 100644
--- a/bookwyrm/views/status.py
+++ b/bookwyrm/views/status.py
@@ -1,4 +1,4 @@
-''' what are we here for if not for posting '''
+""" what are we here for if not for posting """
 import re
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponseBadRequest
@@ -16,19 +16,20 @@ from .helpers import handle_remote_webfinger
 
 
 # pylint: disable= no-self-use
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
 class CreateStatus(View):
-    ''' the view for *posting* '''
+    """ the view for *posting* """
+
     def post(self, request, status_type):
-        ''' create  status of whatever type '''
+        """ create  status of whatever type """
         status_type = status_type[0].upper() + status_type[1:]
 
         try:
-            form = getattr(forms, '%sForm' % status_type)(request.POST)
+            form = getattr(forms, "%sForm" % status_type)(request.POST)
         except AttributeError:
             return HttpResponseBadRequest()
         if not form.is_valid():
-            return redirect(request.headers.get('Referer', '/'))
+            return redirect(request.headers.get("Referer", "/"))
 
         status = form.save(commit=False)
         if not status.sensitive and status.content_warning:
@@ -44,10 +45,10 @@ class CreateStatus(View):
 
             # turn the mention into a link
             content = re.sub(
-                r'%s([^@]|$)' % mention_text,
-                r'<a href="%s">%s</a>\g<1>' % \
-                    (mention_user.remote_id, mention_text),
-                content)
+                r"%s([^@]|$)" % mention_text,
+                r'<a href="%s">%s</a>\g<1>' % (mention_user.remote_id, mention_text),
+                content,
+            )
         # add reply parent to mentions
         if status.reply_parent:
             status.mention_users.add(status.reply_parent.user)
@@ -59,17 +60,18 @@ class CreateStatus(View):
         if not isinstance(status, models.GeneratedNote):
             status.content = to_markdown(content)
         # do apply formatting to quotes
-        if hasattr(status, 'quote'):
+        if hasattr(status, "quote"):
             status.quote = to_markdown(status.quote)
 
         status.save(created=True)
-        return redirect(request.headers.get('Referer', '/'))
+        return redirect(request.headers.get("Referer", "/"))
 
 
 class DeleteStatus(View):
-    ''' tombstone that bad boy '''
+    """ tombstone that bad boy """
+
     def post(self, request, status_id):
-        ''' delete and tombstone a status '''
+        """ delete and tombstone a status """
         status = get_object_or_404(models.Status, id=status_id)
 
         # don't let people delete other people's statuses
@@ -78,16 +80,17 @@ class DeleteStatus(View):
 
         # perform deletion
         delete_status(status)
-        return redirect(request.headers.get('Referer', '/'))
+        return redirect(request.headers.get("Referer", "/"))
+
 
 def find_mentions(content):
-    ''' detect @mentions in raw status content '''
+    """ detect @mentions in raw status content """
     for match in re.finditer(regex.strict_username, content):
-        username = match.group().strip().split('@')[1:]
+        username = match.group().strip().split("@")[1:]
         if len(username) == 1:
             # this looks like a local user (@user), fill in the domain
             username.append(DOMAIN)
-        username = '@'.join(username)
+        username = "@".join(username)
 
         mention_user = handle_remote_webfinger(username)
         if not mention_user:
@@ -97,15 +100,16 @@ def find_mentions(content):
 
 
 def format_links(content):
-    ''' detect and format links '''
+    """ detect and format links """
     return re.sub(
-        r'([^(href=")]|^|\()(https?:\/\/(%s([\w\.\-_\/+&\?=:;,])*))' % \
-                regex.domain,
+        r'([^(href=")]|^|\()(https?:\/\/(%s([\w\.\-_\/+&\?=:;,])*))' % regex.domain,
         r'\g<1><a href="\g<2>">\g<3></a>',
-        content)
+        content,
+    )
+
 
 def to_markdown(content):
-    ''' catch links and convert to markdown '''
+    """ catch links and convert to markdown """
     content = markdown(content)
     content = format_links(content)
     # sanitize resulting html
diff --git a/bookwyrm/views/tag.py b/bookwyrm/views/tag.py
index e106e8dc..a6bdf05a 100644
--- a/bookwyrm/views/tag.py
+++ b/bookwyrm/views/tag.py
@@ -1,4 +1,4 @@
-''' tagging views'''
+""" tagging views"""
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
@@ -12,34 +12,35 @@ from .helpers import is_api_request
 
 # pylint: disable= no-self-use
 class Tag(View):
-    ''' tag page '''
+    """ tag page """
+
     def get(self, request, tag_id):
-        ''' see books related to a tag '''
+        """ see books related to a tag """
         tag_obj = get_object_or_404(models.Tag, identifier=tag_id)
 
         if is_api_request(request):
-            return ActivitypubResponse(
-                tag_obj.to_activity(**request.GET))
+            return ActivitypubResponse(tag_obj.to_activity(**request.GET))
 
         books = models.Edition.objects.filter(
             usertag__tag__identifier=tag_id
         ).distinct()
         data = {
-            'books': books,
-            'tag': tag_obj,
+            "books": books,
+            "tag": tag_obj,
         }
-        return TemplateResponse(request, 'tag.html', data)
+        return TemplateResponse(request, "tag.html", data)
 
 
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
 class AddTag(View):
-    ''' add a tag to a book '''
+    """ add a tag to a book """
+
     def post(self, request):
-        ''' tag a book '''
+        """ tag a book """
         # I'm not using a form here because sometimes "name" is sent as a hidden
         # field which doesn't validate
-        name = request.POST.get('name')
-        book_id = request.POST.get('book')
+        name = request.POST.get("name")
+        book_id = request.POST.get("book")
         book = get_object_or_404(models.Edition, id=book_id)
         tag_obj, _ = models.Tag.objects.get_or_create(
             name=name,
@@ -50,21 +51,23 @@ class AddTag(View):
             tag=tag_obj,
         )
 
-        return redirect('/book/%s' % book_id)
+        return redirect("/book/%s" % book_id)
 
 
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
 class RemoveTag(View):
-    ''' remove a user's tag from a book '''
+    """ remove a user's tag from a book """
+
     def post(self, request):
-        ''' untag a book '''
-        name = request.POST.get('name')
+        """ untag a book """
+        name = request.POST.get("name")
         tag_obj = get_object_or_404(models.Tag, name=name)
-        book_id = request.POST.get('book')
+        book_id = request.POST.get("book")
         book = get_object_or_404(models.Edition, id=book_id)
 
         user_tag = get_object_or_404(
-            models.UserTag, tag=tag_obj, book=book, user=request.user)
+            models.UserTag, tag=tag_obj, book=book, user=request.user
+        )
         user_tag.delete()
 
-        return redirect('/book/%s' % book_id)
+        return redirect("/book/%s" % book_id)
diff --git a/bookwyrm/views/updates.py b/bookwyrm/views/updates.py
index 233e5191..83b680c0 100644
--- a/bookwyrm/views/updates.py
+++ b/bookwyrm/views/updates.py
@@ -1,17 +1,20 @@
-''' endpoints for getting updates about activity '''
+""" endpoints for getting updates about activity """
 from django.contrib.auth.decorators import login_required
 from django.http import JsonResponse
 from django.utils.decorators import method_decorator
 from django.views import View
 
 # pylint: disable= no-self-use
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
 class Updates(View):
-    ''' so the app can poll '''
+    """ so the app can poll """
+
     def get(self, request):
-        ''' any notifications waiting? '''
-        return JsonResponse({
-            'notifications': request.user.notification_set.filter(
-                read=False
-            ).count(),
-        })
+        """ any notifications waiting? """
+        return JsonResponse(
+            {
+                "notifications": request.user.notification_set.filter(
+                    read=False
+                ).count(),
+            }
+        )
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index f3a088c1..469a82d3 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -1,4 +1,4 @@
-''' non-interactive pages '''
+""" non-interactive pages """
 from io import BytesIO
 from uuid import uuid4
 from PIL import Image
@@ -22,9 +22,10 @@ from .helpers import is_blocked, object_visible_to_user
 
 # pylint: disable= no-self-use
 class User(View):
-    ''' user profile page '''
+    """ user profile page """
+
     def get(self, request, username):
-        ''' profile page for a user '''
+        """ profile page for a user """
         try:
             user = get_user_from_username(request.user, username)
         except models.User.DoesNotExist:
@@ -40,7 +41,7 @@ class User(View):
         # otherwise we're at a UI view
 
         try:
-            page = int(request.GET.get('page', 1))
+            page = int(request.GET.get("page", 1))
         except ValueError:
             page = 1
 
@@ -52,19 +53,21 @@ class User(View):
         if not is_self:
             follower = user.followers.filter(id=request.user.id).exists()
             if follower:
-                shelves = shelves.filter(privacy__in=['public', 'followers'])
+                shelves = shelves.filter(privacy__in=["public", "followers"])
             else:
-                shelves = shelves.filter(privacy='public')
+                shelves = shelves.filter(privacy="public")
 
         for user_shelf in shelves.all():
             if not user_shelf.books.count():
                 continue
-            shelf_preview.append({
-                'name': user_shelf.name,
-                'local_path': user_shelf.local_path,
-                'books': user_shelf.books.all()[:3],
-                'size': user_shelf.books.count(),
-            })
+            shelf_preview.append(
+                {
+                    "name": user_shelf.name,
+                    "local_path": user_shelf.local_path,
+                    "books": user_shelf.books.all()[:3],
+                    "size": user_shelf.books.count(),
+                }
+            )
             if len(shelf_preview) > 2:
                 break
 
@@ -75,24 +78,27 @@ class User(View):
         )
         paginated = Paginator(activities, PAGE_LENGTH)
         goal = models.AnnualGoal.objects.filter(
-            user=user, year=timezone.now().year).first()
+            user=user, year=timezone.now().year
+        ).first()
         if not object_visible_to_user(request.user, goal):
             goal = None
         data = {
-            'user': user,
-            'is_self': is_self,
-            'shelves': shelf_preview,
-            'shelf_count': shelves.count(),
-            'activities': paginated.page(page),
-            'goal': goal,
+            "user": user,
+            "is_self": is_self,
+            "shelves": shelf_preview,
+            "shelf_count": shelves.count(),
+            "activities": paginated.page(page),
+            "goal": goal,
         }
 
-        return TemplateResponse(request, 'user/user.html', data)
+        return TemplateResponse(request, "user/user.html", data)
+
 
 class Followers(View):
-    ''' list of followers view '''
+    """ list of followers view """
+
     def get(self, request, username):
-        ''' list of followers '''
+        """ list of followers """
         try:
             user = get_user_from_username(request.user, username)
         except models.User.DoesNotExist:
@@ -103,20 +109,21 @@ class Followers(View):
             return HttpResponseNotFound()
 
         if is_api_request(request):
-            return ActivitypubResponse(
-                user.to_followers_activity(**request.GET))
+            return ActivitypubResponse(user.to_followers_activity(**request.GET))
 
         data = {
-            'user': user,
-            'is_self': request.user.id == user.id,
-            'followers': user.followers.all(),
+            "user": user,
+            "is_self": request.user.id == user.id,
+            "followers": user.followers.all(),
         }
-        return TemplateResponse(request, 'user/followers.html', data)
+        return TemplateResponse(request, "user/followers.html", data)
+
 
 class Following(View):
-    ''' list of following view '''
+    """ list of following view """
+
     def get(self, request, username):
-        ''' list of followers '''
+        """ list of followers """
         try:
             user = get_user_from_username(request.user, username)
         except models.User.DoesNotExist:
@@ -127,46 +134,45 @@ class Following(View):
             return HttpResponseNotFound()
 
         if is_api_request(request):
-            return ActivitypubResponse(
-                user.to_following_activity(**request.GET))
+            return ActivitypubResponse(user.to_following_activity(**request.GET))
 
         data = {
-            'user': user,
-            'is_self': request.user.id == user.id,
-            'following': user.following.all(),
+            "user": user,
+            "is_self": request.user.id == user.id,
+            "following": user.following.all(),
         }
-        return TemplateResponse(request, 'user/following.html', data)
+        return TemplateResponse(request, "user/following.html", data)
 
 
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
 class EditUser(View):
-    ''' edit user view '''
+    """ edit user view """
+
     def get(self, request):
-        ''' edit profile page for a user '''
+        """ edit profile page for a user """
         data = {
-            'form': forms.EditUserForm(instance=request.user),
-            'user': request.user,
+            "form": forms.EditUserForm(instance=request.user),
+            "user": request.user,
         }
-        return TemplateResponse(request, 'preferences/edit_user.html', data)
+        return TemplateResponse(request, "preferences/edit_user.html", data)
 
     def post(self, request):
-        ''' les get fancy with images '''
-        form = forms.EditUserForm(
-            request.POST, request.FILES, instance=request.user)
+        """ les get fancy with images """
+        form = forms.EditUserForm(request.POST, request.FILES, instance=request.user)
         if not form.is_valid():
-            data = {'form': form, 'user': request.user}
-            return TemplateResponse(request, 'preferences/edit_user.html', data)
+            data = {"form": form, "user": request.user}
+            return TemplateResponse(request, "preferences/edit_user.html", data)
 
         user = form.save(commit=False)
 
-        if 'avatar' in form.files:
+        if "avatar" in form.files:
             # crop and resize avatar upload
-            image = Image.open(form.files['avatar'])
+            image = Image.open(form.files["avatar"])
             image = crop_avatar(image)
 
             # set the name to a hash
-            extension = form.files['avatar'].name.split('.')[-1]
-            filename = '%s.%s' % (uuid4(), extension)
+            extension = form.files["avatar"].name.split(".")[-1]
+            filename = "%s.%s" % (uuid4(), extension)
             user.avatar.save(filename, image)
         user.save()
 
@@ -174,22 +180,27 @@ class EditUser(View):
 
 
 def crop_avatar(image):
-    ''' reduce the size and make an avatar square '''
+    """ reduce the size and make an avatar square """
     target_size = 120
     width, height = image.size
-    thumbnail_scale = height / (width / target_size) if height > width \
+    thumbnail_scale = (
+        height / (width / target_size)
+        if height > width
         else width / (height / target_size)
+    )
     image.thumbnail([thumbnail_scale, thumbnail_scale])
     width, height = image.size
 
     width_diff = width - target_size
     height_diff = height - target_size
-    cropped = image.crop((
-        int(width_diff / 2),
-        int(height_diff / 2),
-        int(width - (width_diff / 2)),
-        int(height - (height_diff / 2))
-    ))
+    cropped = image.crop(
+        (
+            int(width_diff / 2),
+            int(height_diff / 2),
+            int(width - (width_diff / 2)),
+            int(height - (height_diff / 2)),
+        )
+    )
     output = BytesIO()
     cropped.save(output, format=image.format)
     return ContentFile(output.getvalue())
diff --git a/bookwyrm/wellknown.py b/bookwyrm/wellknown.py
index 1f6d4ccf..eb014808 100644
--- a/bookwyrm/wellknown.py
+++ b/bookwyrm/wellknown.py
@@ -1,4 +1,4 @@
-''' responds to various requests to /.well-know '''
+""" responds to various requests to /.well-know """
 
 from dateutil.relativedelta import relativedelta
 from django.http import HttpResponseNotFound
@@ -10,50 +10,54 @@ from bookwyrm.settings import DOMAIN, VERSION
 
 
 def webfinger(request):
-    ''' allow other servers to ask about a user '''
-    if request.method != 'GET':
+    """ allow other servers to ask about a user """
+    if request.method != "GET":
         return HttpResponseNotFound()
 
-    resource = request.GET.get('resource')
-    if not resource and not resource.startswith('acct:'):
+    resource = request.GET.get("resource")
+    if not resource and not resource.startswith("acct:"):
         return HttpResponseNotFound()
 
-    username = resource.replace('acct:', '')
+    username = resource.replace("acct:", "")
     try:
         user = models.User.objects.get(username=username)
     except models.User.DoesNotExist:
-        return HttpResponseNotFound('No account found')
+        return HttpResponseNotFound("No account found")
 
-    return JsonResponse({
-        'subject': 'acct:%s' % (user.username),
-        'links': [
-            {
-                'rel': 'self',
-                'type': 'application/activity+json',
-                'href': user.remote_id
-            }
-        ]
-    })
+    return JsonResponse(
+        {
+            "subject": "acct:%s" % (user.username),
+            "links": [
+                {
+                    "rel": "self",
+                    "type": "application/activity+json",
+                    "href": user.remote_id,
+                }
+            ],
+        }
+    )
 
 
 def nodeinfo_pointer(request):
-    ''' direct servers to nodeinfo '''
-    if request.method != 'GET':
+    """ direct servers to nodeinfo """
+    if request.method != "GET":
         return HttpResponseNotFound()
 
-    return JsonResponse({
-        'links': [
-            {
-                'rel': 'http://nodeinfo.diaspora.software/ns/schema/2.0',
-                'href': 'https://%s/nodeinfo/2.0' % DOMAIN
-            }
-        ]
-    })
+    return JsonResponse(
+        {
+            "links": [
+                {
+                    "rel": "http://nodeinfo.diaspora.software/ns/schema/2.0",
+                    "href": "https://%s/nodeinfo/2.0" % DOMAIN,
+                }
+            ]
+        }
+    )
 
 
 def nodeinfo(request):
-    ''' basic info about the server '''
-    if request.method != 'GET':
+    """ basic info about the server """
+    if request.method != "GET":
         return HttpResponseNotFound()
 
     status_count = models.Status.objects.filter(user__local=True).count()
@@ -61,70 +65,65 @@ def nodeinfo(request):
 
     month_ago = timezone.now() - relativedelta(months=1)
     last_month_count = models.User.objects.filter(
-        local=True,
-        last_active_date__gt=month_ago
+        local=True, last_active_date__gt=month_ago
     ).count()
 
     six_months_ago = timezone.now() - relativedelta(months=6)
     six_month_count = models.User.objects.filter(
-        local=True,
-        last_active_date__gt=six_months_ago
+        local=True, last_active_date__gt=six_months_ago
     ).count()
 
     site = models.SiteSettings.get()
-    return JsonResponse({
-        'version': '2.0',
-        'software': {
-            'name': 'bookwyrm',
-            'version': VERSION
-        },
-        'protocols': [
-            'activitypub'
-        ],
-        'usage': {
-            'users': {
-                'total': user_count,
-                'activeMonth': last_month_count,
-                'activeHalfyear': six_month_count,
+    return JsonResponse(
+        {
+            "version": "2.0",
+            "software": {"name": "bookwyrm", "version": VERSION},
+            "protocols": ["activitypub"],
+            "usage": {
+                "users": {
+                    "total": user_count,
+                    "activeMonth": last_month_count,
+                    "activeHalfyear": six_month_count,
+                },
+                "localPosts": status_count,
             },
-            'localPosts': status_count,
-        },
-        'openRegistrations': site.allow_registration,
-    })
+            "openRegistrations": site.allow_registration,
+        }
+    )
 
 
 def instance_info(request):
-    ''' let's talk about your cool unique instance '''
-    if request.method != 'GET':
+    """ let's talk about your cool unique instance """
+    if request.method != "GET":
         return HttpResponseNotFound()
 
     user_count = models.User.objects.filter(local=True).count()
     status_count = models.Status.objects.filter(user__local=True).count()
 
     site = models.SiteSettings.get()
-    return JsonResponse({
-        'uri': DOMAIN,
-        'title': site.name,
-        'short_description': '',
-        'description': site.instance_description,
-        'version': '0.0.1',
-        'stats': {
-            'user_count': user_count,
-            'status_count': status_count,
-        },
-        'thumbnail': 'https://%s/static/images/logo.png' % DOMAIN,
-        'languages': [
-            'en'
-        ],
-        'registrations': site.allow_registration,
-        'approval_required': False,
-    })
+    return JsonResponse(
+        {
+            "uri": DOMAIN,
+            "title": site.name,
+            "short_description": "",
+            "description": site.instance_description,
+            "version": "0.0.1",
+            "stats": {
+                "user_count": user_count,
+                "status_count": status_count,
+            },
+            "thumbnail": "https://%s/static/images/logo.png" % DOMAIN,
+            "languages": ["en"],
+            "registrations": site.allow_registration,
+            "approval_required": False,
+        }
+    )
 
 
 def peers(request):
-    ''' list of federated servers this instance connects with '''
-    if request.method != 'GET':
+    """ list of federated servers this instance connects with """
+    if request.method != "GET":
         return HttpResponseNotFound()
 
-    names = models.FederatedServer.objects.values_list('server_name', flat=True)
+    names = models.FederatedServer.objects.values_list("server_name", flat=True)
     return JsonResponse(list(names), safe=False)
diff --git a/celerywyrm/__init__.py b/celerywyrm/__init__.py
index 1c8fa15d..fe0c87ff 100644
--- a/celerywyrm/__init__.py
+++ b/celerywyrm/__init__.py
@@ -1,8 +1,8 @@
-''' we need this file to initialize celery '''
+""" we need this file to initialize celery """
 from __future__ import absolute_import, unicode_literals
 
 # This will make sure the app is always imported when
 # Django starts so that shared_task will use this app.
 from .celery import app as celery_app
 
-__all__ = ('celery_app',)
+__all__ = ("celery_app",)
diff --git a/celerywyrm/asgi.py b/celerywyrm/asgi.py
index c03a6ec6..0f0b0021 100644
--- a/celerywyrm/asgi.py
+++ b/celerywyrm/asgi.py
@@ -11,6 +11,6 @@ import os
 
 from django.core.asgi import get_asgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'celerywyrm.settings')
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "celerywyrm.settings")
 
 application = get_asgi_application()
diff --git a/celerywyrm/celery.py b/celerywyrm/celery.py
index 2937ef0f..4af8e281 100644
--- a/celerywyrm/celery.py
+++ b/celerywyrm/celery.py
@@ -1,4 +1,4 @@
-''' configures celery for task management '''
+""" configures celery for task management """
 from __future__ import absolute_import, unicode_literals
 import os
 
@@ -7,23 +7,22 @@ from . import settings
 
 
 # set the default Django settings module for the 'celery' program.
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'celerywyrm.settings')
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "celerywyrm.settings")
 
-app = Celery('celerywyrm')
+app = Celery("celerywyrm")
 
 # Using a string here means the worker doesn't have to serialize
 # the configuration object to child processes.
 # - namespace='CELERY' means all celery-related configuration keys
 #   should have a `CELERY_` prefix.
-app.config_from_object('django.conf:settings', namespace='CELERY')
+app.config_from_object("django.conf:settings", namespace="CELERY")
 
 # Load task modules from all registered Django app configs.
 app.autodiscover_tasks()
-app.autodiscover_tasks(['bookwyrm'], related_name='activitypub.base_activity')
-app.autodiscover_tasks(['bookwyrm'], related_name='broadcast')
-app.autodiscover_tasks(
-    ['bookwyrm'], related_name='connectors.abstract_connector')
-app.autodiscover_tasks(['bookwyrm'], related_name='emailing')
-app.autodiscover_tasks(['bookwyrm'], related_name='goodreads_import')
-app.autodiscover_tasks(['bookwyrm'], related_name='models.user')
-app.autodiscover_tasks(['bookwyrm'], related_name='views.inbox')
+app.autodiscover_tasks(["bookwyrm"], related_name="activitypub.base_activity")
+app.autodiscover_tasks(["bookwyrm"], related_name="broadcast")
+app.autodiscover_tasks(["bookwyrm"], related_name="connectors.abstract_connector")
+app.autodiscover_tasks(["bookwyrm"], related_name="emailing")
+app.autodiscover_tasks(["bookwyrm"], related_name="goodreads_import")
+app.autodiscover_tasks(["bookwyrm"], related_name="models.user")
+app.autodiscover_tasks(["bookwyrm"], related_name="views.inbox")
diff --git a/celerywyrm/settings.py b/celerywyrm/settings.py
index 92986d8e..7591163b 100644
--- a/celerywyrm/settings.py
+++ b/celerywyrm/settings.py
@@ -16,31 +16,31 @@ from environs import Env
 env = Env()
 
 # emailing
-EMAIL_HOST = env('EMAIL_HOST')
-EMAIL_PORT = env('EMAIL_PORT')
-EMAIL_HOST_USER = env('EMAIL_HOST_USER')
-EMAIL_HOST_PASSWORD = env('EMAIL_HOST_PASSWORD')
-EMAIL_USE_TLS = env('EMAIL_USE_TLS')
+EMAIL_HOST = env("EMAIL_HOST")
+EMAIL_PORT = env("EMAIL_PORT")
+EMAIL_HOST_USER = env("EMAIL_HOST_USER")
+EMAIL_HOST_PASSWORD = env("EMAIL_HOST_PASSWORD")
+EMAIL_USE_TLS = env("EMAIL_USE_TLS")
 
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 # celery/rebbitmq
-CELERY_BROKER_URL = env('CELERY_BROKER')
-CELERY_ACCEPT_CONTENT = ['json']
-CELERY_TASK_SERIALIZER = 'json'
-CELERY_RESULT_BACKEND = 'redis'
+CELERY_BROKER_URL = env("CELERY_BROKER")
+CELERY_ACCEPT_CONTENT = ["json"]
+CELERY_TASK_SERIALIZER = "json"
+CELERY_RESULT_BACKEND = "redis"
 
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = '0a^0gpwjc1ap+lb$dinin=efc@e&_0%102$o3(&gt9e7lndiaw'
+SECRET_KEY = "0a^0gpwjc1ap+lb$dinin=efc@e&_0%102$o3(&gt9e7lndiaw"
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = env.bool('DEBUG', True)
+DEBUG = env.bool("DEBUG", True)
 
 
 ALLOWED_HOSTS = []
@@ -49,71 +49,69 @@ ALLOWED_HOSTS = []
 # Application definition
 
 INSTALLED_APPS = [
-    'django.contrib.admin',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    'celerywyrm',
-    'bookwyrm',
-    'celery',
+    "django.contrib.admin",
+    "django.contrib.auth",
+    "django.contrib.contenttypes",
+    "django.contrib.sessions",
+    "django.contrib.messages",
+    "django.contrib.staticfiles",
+    "celerywyrm",
+    "bookwyrm",
+    "celery",
 ]
 
 MIDDLEWARE = [
-    'django.middleware.security.SecurityMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    "django.middleware.security.SecurityMiddleware",
+    "django.contrib.sessions.middleware.SessionMiddleware",
+    "django.middleware.common.CommonMiddleware",
+    "django.middleware.csrf.CsrfViewMiddleware",
+    "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "django.contrib.messages.middleware.MessageMiddleware",
+    "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]
 
-ROOT_URLCONF = 'celerywyrm.urls'
+ROOT_URLCONF = "celerywyrm.urls"
 
 TEMPLATES = [
     {
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
-        'APP_DIRS': True,
-        'OPTIONS': {
-            'context_processors': [
-                'django.template.context_processors.debug',
-                'django.template.context_processors.request',
-                'django.contrib.auth.context_processors.auth',
-                'django.contrib.messages.context_processors.messages',
+        "BACKEND": "django.template.backends.django.DjangoTemplates",
+        "DIRS": [],
+        "APP_DIRS": True,
+        "OPTIONS": {
+            "context_processors": [
+                "django.template.context_processors.debug",
+                "django.template.context_processors.request",
+                "django.contrib.auth.context_processors.auth",
+                "django.contrib.messages.context_processors.messages",
             ],
         },
     },
 ]
 
-WSGI_APPLICATION = 'celerywyrm.wsgi.application'
+WSGI_APPLICATION = "celerywyrm.wsgi.application"
 
 
 # Database
 # https://docs.djangoproject.com/en/3.0/ref/settings/#databases
 
-BOOKWYRM_DATABASE_BACKEND = env('BOOKWYRM_DATABASE_BACKEND', 'postgres')
+BOOKWYRM_DATABASE_BACKEND = env("BOOKWYRM_DATABASE_BACKEND", "postgres")
 
 BOOKWYRM_DBS = {
-    'postgres': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': env('POSTGRES_DB', 'fedireads'),
-        'USER': env('POSTGRES_USER', 'fedireads'),
-        'PASSWORD': env('POSTGRES_PASSWORD', 'fedireads'),
-        'HOST': env('POSTGRES_HOST', ''),
-        'PORT': 5432
+    "postgres": {
+        "ENGINE": "django.db.backends.postgresql_psycopg2",
+        "NAME": env("POSTGRES_DB", "fedireads"),
+        "USER": env("POSTGRES_USER", "fedireads"),
+        "PASSWORD": env("POSTGRES_PASSWORD", "fedireads"),
+        "HOST": env("POSTGRES_HOST", ""),
+        "PORT": 5432,
+    },
+    "sqlite": {
+        "ENGINE": "django.db.backends.sqlite3",
+        "NAME": os.path.join(BASE_DIR, "fedireads.db"),
     },
-    'sqlite': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'fedireads.db')
-    }
 }
 
-DATABASES = {
-    'default': BOOKWYRM_DBS[BOOKWYRM_DATABASE_BACKEND]
-}
+DATABASES = {"default": BOOKWYRM_DBS[BOOKWYRM_DATABASE_BACKEND]}
 
 
 # Password validation
@@ -121,16 +119,16 @@ DATABASES = {
 
 AUTH_PASSWORD_VALIDATORS = [
     {
-        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+        "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
     },
     {
-        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+        "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
     },
     {
-        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+        "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",
     },
     {
-        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+        "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",
     },
 ]
 
@@ -138,9 +136,9 @@ AUTH_PASSWORD_VALIDATORS = [
 # Internationalization
 # https://docs.djangoproject.com/en/3.0/topics/i18n/
 
-LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = "en-us"
 
-TIME_ZONE = 'UTC'
+TIME_ZONE = "UTC"
 
 USE_I18N = False
 
@@ -152,7 +150,7 @@ USE_TZ = True
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/3.0/howto/static-files/
 
-STATIC_URL = '/static/'
-STATIC_ROOT = os.path.join(BASE_DIR, env('STATIC_ROOT', 'static'))
-MEDIA_URL = '/images/'
-MEDIA_ROOT = os.path.join(BASE_DIR, env('MEDIA_ROOT', 'images'))
+STATIC_URL = "/static/"
+STATIC_ROOT = os.path.join(BASE_DIR, env("STATIC_ROOT", "static"))
+MEDIA_URL = "/images/"
+MEDIA_ROOT = os.path.join(BASE_DIR, env("MEDIA_ROOT", "images"))
diff --git a/celerywyrm/urls.py b/celerywyrm/urls.py
index 21c8dee8..394c0ef0 100644
--- a/celerywyrm/urls.py
+++ b/celerywyrm/urls.py
@@ -20,5 +20,5 @@ from django.urls import path
 from celerywyrm import settings
 
 urlpatterns = [
-    path('admin/', admin.site.urls),
+    path("admin/", admin.site.urls),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
diff --git a/celerywyrm/wsgi.py b/celerywyrm/wsgi.py
index 6de8d633..7ccf36a9 100644
--- a/celerywyrm/wsgi.py
+++ b/celerywyrm/wsgi.py
@@ -11,6 +11,6 @@ import os
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'celerywyrm.settings')
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "celerywyrm.settings")
 
 application = get_wsgi_application()

From d3162e12db9d4f9ae975253f5fe10e21747f6c0a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 8 Mar 2021 08:51:54 -0800
Subject: [PATCH 0238/1285] Adds broadcast mock to edit book tests

---
 bookwyrm/tests/views/test_book.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index 6a28ba9d..484c695b 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -112,7 +112,8 @@ class BookViews(TestCase):
         request = self.factory.post('', form.data)
         request.user = self.local_user
 
-        view(request, self.book.id)
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+            view(request, self.book.id)
 
         self.book.refresh_from_db()
         self.assertEqual(self.book.title, 'New Title')
@@ -132,7 +133,8 @@ class BookViews(TestCase):
         request = self.factory.post('', form.data)
         request.user = self.local_user
 
-        view(request, self.book.id)
+        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+            view(request, self.book.id)
         self.book.refresh_from_db()
         self.assertEqual(self.book.title, 'New Title')
         self.assertFalse(self.book.authors.exists())

From a5baa1f5c618e393b8f8e791c3730868044324da Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 8 Mar 2021 09:28:22 -0800
Subject: [PATCH 0239/1285] Create new books

---
 bookwyrm/forms.py                      |  2 +-
 bookwyrm/templates/edit_book.html      | 11 ++++---
 bookwyrm/templates/search_results.html |  4 +++
 bookwyrm/urls.py                       |  3 +-
 bookwyrm/views/books.py                | 42 +++++++++++++++-----------
 5 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index b920fc9c..1ab6e0ee 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -134,7 +134,7 @@ class EditionForm(CustomForm):
             'updated_date',
             'edition_rank',
 
-            'authors',# TODO
+            'authors',
             'parent_work',
             'shelves',
 
diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/edit_book.html
index a4d62efd..1ebcc6b9 100644
--- a/bookwyrm/templates/edit_book.html
+++ b/bookwyrm/templates/edit_book.html
@@ -13,11 +13,13 @@
         {% trans "Add Book" %}
         {% endif %}
     </h1>
+    {% if book %}
     <div>
         <p>{% trans "Added:" %} {{ book.created_date | naturaltime }}</p>
         <p>{% trans "Updated:" %} {{ book.updated_date | naturaltime }}</p>
         <p>{% trans "Last edited by:" %} <a href="{{ book.last_edited_by.remote_id }}">{{ book.last_edited_by.display_name }}</a></p>
     </div>
+    {% endif %}
 </header>
 
 {% if form.non_field_errors %}
@@ -26,7 +28,12 @@
 </div>
 {% endif %}
 
+{% if book %}
 <form class="block" name="edit-book" action="{{ book.local_path }}/{% if confirm_mode %}confirm{% else %}edit{% endif %}" method="post" enctype="multipart/form-data">
+{% else %}
+<form class="block" name="create-book" action="/create-book{% if confirm_mode %}/confirm{% endif %}" method="post" enctype="multipart/form-data">
+{% endif %}
+
     {% csrf_token %}
     {% if confirm_mode %}
     <div class="box">
@@ -111,12 +118,8 @@
                     </label>
                     {% endfor %}
                 </fieldset>
-                {% if confirm_mode %}
-                <input type="hidden" name="add_author" value="{{ add_author }}">
-                {% else %}
                 <label class="label" for="id_add_author">{% trans "Add Author:" %}</label>
                 <input class="input" type="text" name="add_author" id="id_add_author" placeholder="{% trans 'John Doe' %}" value="{{ add_author }}">
-                {% endif %}
             </section>
         </div>
 
diff --git a/bookwyrm/templates/search_results.html b/bookwyrm/templates/search_results.html
index 4e8481f0..13497df8 100644
--- a/bookwyrm/templates/search_results.html
+++ b/bookwyrm/templates/search_results.html
@@ -68,6 +68,10 @@
             {% include 'snippets/toggle/close_button.html' with text=button_text small=True controls_text="more-results" %}
             {% endif %}
         </div>
+
+        <div class="block">
+            <a href="/create-book">Manually add book</a>
+        </div>
         {% endif %}
     </div>
     <div class="column">
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 25b44fb4..0000015e 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -130,12 +130,13 @@ urlpatterns = [
     re_path(r'%s(.json)?/?$' % book_path, views.Book.as_view()),
     re_path(r'%s/edit/?$' % book_path, views.EditBook.as_view()),
     re_path(r'%s/confirm/?$' % book_path, views.ConfirmEditBook.as_view()),
+    re_path(r'^create-book/?$', views.EditBook.as_view()),
+    re_path(r'^create-book/confirm?$', views.ConfirmEditBook.as_view()),
     re_path(r'%s/editions(.json)?/?$' % book_path, views.Editions.as_view()),
     re_path(r'^upload-cover/(?P<book_id>\d+)/?$', views.upload_cover),
     re_path(r'^add-description/(?P<book_id>\d+)/?$', views.add_description),
     re_path(r'^resolve-book/?$', views.resolve_book),
     re_path(r'^switch-edition/?$', views.switch_edition),
-    re_path(r'^create-book/?$', views.EditBook.as_view()),
 
     # isbn
     re_path(r'^isbn/(?P<isbn>\d+)(.json)?/?$', views.Isbn.as_view()),
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 5f03e1a9..a115ac49 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -145,7 +145,7 @@ class EditBook(View):
                 search=vector
             ).annotate(
                 rank=SearchRank(vector, add_author)
-            ).filter(rank__gt=0.8).order_by('-rank')[:5]
+            ).filter(rank__gt=0.4).order_by('-rank')[:5]
 
         # we're creating a new book
         if not book:
@@ -190,25 +190,33 @@ class ConfirmEditBook(View):
         if not form.is_valid():
             return TemplateResponse(request, 'edit_book.html', data)
 
-        # create work, if needed
-        # TODO
+        with transaction.atomic():
+            # save book
+            book = form.save()
 
-        # save book
-        book = form.save()
+            # get or create author as needed
+            if request.POST.get('add_author'):
+                if request.POST.get('author_match'):
+                    author = get_object_or_404(
+                        models.Author, id=request.POST['author_match'])
+                else:
+                    author = models.Author.objects.create(
+                        name=request.POST.get('add_author'))
+                book.authors.add(author)
 
-        # get or create author as needed
-        if request.POST.get('add_author'):
-            if request.POST.get('author_match'):
-                author = get_object_or_404(
-                    models.Author, id=request.POST['author_match'])
-            else:
-                author = models.Author.objects.create(
-                    name=request.POST.get('add_author'))
-            book.authors.add(author)
+            # create work, if needed
+            if not book_id:
+                work_match = request.POST.get('parent_work')
+                if work_match:
+                    work = get_object_or_404(models.Work, id=work_match)
+                else:
+                    work = models.Work.objects.create(title=form.cleaned_data.title)
+                    work.authors.set(book.authors.all())
+                book.parent_work = work
+                book.save()
 
-        remove_authors = request.POST.getlist('remove_authors')
-        for author_id in remove_authors:
-            book.authors.remove(author_id)
+            for author_id in request.POST.getlist('remove_authors'):
+                book.authors.remove(author_id)
 
         return redirect('/book/%s' % book.id)
 

From 3bdfc341e410560fc6b2b68504a65f12ce851403 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 8 Mar 2021 09:54:02 -0800
Subject: [PATCH 0240/1285] Runs black

---
 bookwyrm/activitypub/note.py                  |  6 +--
 bookwyrm/migrations/0046_reviewrating.py      | 43 +++++++++++++------
 .../migrations/0047_merge_20210228_1839.py    |  7 ++-
 bookwyrm/models/status.py                     |  8 ++--
 4 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/bookwyrm/activitypub/note.py b/bookwyrm/activitypub/note.py
index bea275d1..a739eafa 100644
--- a/bookwyrm/activitypub/note.py
+++ b/bookwyrm/activitypub/note.py
@@ -13,9 +13,9 @@ class Tombstone(ActivityObject):
 
     type: str = "Tombstone"
 
-    def to_model(self, *args, **kwargs):# pylint: disable=unused-argument
-        ''' this should never really get serialized, just searched for '''
-        model = apps.get_model('bookwyrm.Status')
+    def to_model(self, *args, **kwargs):  # pylint: disable=unused-argument
+        """ this should never really get serialized, just searched for """
+        model = apps.get_model("bookwyrm.Status")
         return model.find_existing_by_remote_id(self.id)
 
 
diff --git a/bookwyrm/migrations/0046_reviewrating.py b/bookwyrm/migrations/0046_reviewrating.py
index e410ba91..8d149004 100644
--- a/bookwyrm/migrations/0046_reviewrating.py
+++ b/bookwyrm/migrations/0046_reviewrating.py
@@ -6,44 +6,61 @@ from django.db.models import Q
 import django.db.models.deletion
 from psycopg2.extras import execute_values
 
+
 def convert_review_rating(app_registry, schema_editor):
-    ''' take rating type Reviews and convert them to ReviewRatings '''
+    """ take rating type Reviews and convert them to ReviewRatings """
     db_alias = schema_editor.connection.alias
 
-    reviews = app_registry.get_model(
-        'bookwyrm', 'Review'
-    ).objects.using(db_alias).filter(
-        Q(content__isnull=True) | Q(content='')
+    reviews = (
+        app_registry.get_model("bookwyrm", "Review")
+        .objects.using(db_alias)
+        .filter(Q(content__isnull=True) | Q(content=""))
     )
 
     with connection.cursor() as cursor:
         values = [(r.id,) for r in reviews]
-        execute_values(cursor, '''
+        execute_values(
+            cursor,
+            """
 INSERT INTO bookwyrm_reviewrating(review_ptr_id)
-VALUES %s''', values)
+VALUES %s""",
+            values,
+        )
+
 
 def unconvert_review_rating(app_registry, schema_editor):
-    ''' undo the conversion from ratings back to reviews'''
+    """ undo the conversion from ratings back to reviews"""
     # All we need to do to revert this is drop the table, which Django will do
     # on its own, as long as we have a valid reverse function. So, this is a
     # no-op function so Django will do its thing
 
+
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0045_auto_20210210_2114'),
+        ("bookwyrm", "0045_auto_20210210_2114"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='ReviewRating',
+            name="ReviewRating",
             fields=[
-                ('review_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.Review')),
+                (
+                    "review_ptr",
+                    models.OneToOneField(
+                        auto_created=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        parent_link=True,
+                        primary_key=True,
+                        serialize=False,
+                        to="bookwyrm.Review",
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
-            bases=('bookwyrm.review',),
+            bases=("bookwyrm.review",),
         ),
         migrations.RunPython(convert_review_rating, unconvert_review_rating),
     ]
diff --git a/bookwyrm/migrations/0047_merge_20210228_1839.py b/bookwyrm/migrations/0047_merge_20210228_1839.py
index 7e410761..4be39e56 100644
--- a/bookwyrm/migrations/0047_merge_20210228_1839.py
+++ b/bookwyrm/migrations/0047_merge_20210228_1839.py
@@ -6,9 +6,8 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0046_reviewrating'),
-        ('bookwyrm', '0046_sitesettings_privacy_policy'),
+        ("bookwyrm", "0046_reviewrating"),
+        ("bookwyrm", "0046_sitesettings_privacy_policy"),
     ]
 
-    operations = [
-    ]
+    operations = []
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index 9378772c..80f2b593 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -295,11 +295,11 @@ class Review(Status):
 
 
 class ReviewRating(Review):
-    ''' a subtype of review that only contains a rating '''
+    """ a subtype of review that only contains a rating """
+
     def save(self, *args, **kwargs):
         if not self.rating:
-            raise ValueError(
-                'ReviewRating object must include a numerical rating')
+            raise ValueError("ReviewRating object must include a numerical rating")
         return super().save(*args, **kwargs)
 
     @property
@@ -307,7 +307,7 @@ class ReviewRating(Review):
         return 'Rated "{}": {:d} stars'.format(self.book.title, self.rating)
 
     activity_serializer = activitypub.Rating
-    pure_type = 'Note'
+    pure_type = "Note"
 
 
 class Boost(ActivityMixin, Status):

From 84534a299164f3acc2c819100e77484c833d535c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 8 Mar 2021 09:54:53 -0800
Subject: [PATCH 0241/1285] Adds merge migration

---
 bookwyrm/migrations/0048_merge_20210308_1754.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 bookwyrm/migrations/0048_merge_20210308_1754.py

diff --git a/bookwyrm/migrations/0048_merge_20210308_1754.py b/bookwyrm/migrations/0048_merge_20210308_1754.py
new file mode 100644
index 00000000..6c4488a4
--- /dev/null
+++ b/bookwyrm/migrations/0048_merge_20210308_1754.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.0.7 on 2021-03-08 17:54
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0047_connector_isbn_search_url'),
+        ('bookwyrm', '0047_merge_20210228_1839'),
+    ]
+
+    operations = [
+    ]

From 5fe989e20f39f9edd4a3b3f7dee7de810c6d6d96 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 8 Mar 2021 09:58:07 -0800
Subject: [PATCH 0242/1285] Formats migrationwq

---
 bookwyrm/migrations/0048_merge_20210308_1754.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/migrations/0048_merge_20210308_1754.py b/bookwyrm/migrations/0048_merge_20210308_1754.py
index 6c4488a4..47fa9e77 100644
--- a/bookwyrm/migrations/0048_merge_20210308_1754.py
+++ b/bookwyrm/migrations/0048_merge_20210308_1754.py
@@ -6,9 +6,8 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0047_connector_isbn_search_url'),
-        ('bookwyrm', '0047_merge_20210228_1839'),
+        ("bookwyrm", "0047_connector_isbn_search_url"),
+        ("bookwyrm", "0047_merge_20210228_1839"),
     ]
 
-    operations = [
-    ]
+    operations = []

From acbebbe94768bdefe763424ff157a6f3a13059bd Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 8 Mar 2021 10:10:30 -0800
Subject: [PATCH 0243/1285] Formats code changes

---
 bookwyrm/forms.py                 |  1 -
 bookwyrm/tests/views/test_book.py | 45 ++++++++--------
 bookwyrm/urls.py                  | 21 ++++----
 bookwyrm/views/books.py           | 87 +++++++++++++++----------------
 bw-dev                            |  2 +-
 5 files changed, 75 insertions(+), 81 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 09e13ae5..99c45ed2 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -138,7 +138,6 @@ class EditionForm(CustomForm):
     class Meta:
         model = models.Edition
         exclude = [
-
             "remote_id",
             "origin_id",
             "created_date",
diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index feadf862..02493769 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -85,14 +85,14 @@ class BookViews(TestCase):
         self.assertEqual(self.book.title, "New Title")
 
     def test_edit_book_add_author(self):
-        ''' lets a user edit a book with new authors '''
+        """ lets a user edit a book with new authors """
         view = views.EditBook.as_view()
         self.local_user.groups.add(self.group)
         form = forms.EditionForm(instance=self.book)
-        form.data['title'] = 'New Title'
-        form.data['last_edited_by'] = self.local_user.id
-        form.data['add_author'] = 'Sappho'
-        request = self.factory.post('', form.data)
+        form.data["title"] = "New Title"
+        form.data["last_edited_by"] = self.local_user.id
+        form.data["add_author"] = "Sappho"
+        request = self.factory.post("", form.data)
         request.user = self.local_user
 
         result = view(request, self.book.id)
@@ -100,47 +100,46 @@ class BookViews(TestCase):
 
         # the changes haven't been saved yet
         self.book.refresh_from_db()
-        self.assertEqual(self.book.title, 'Example Edition')
+        self.assertEqual(self.book.title, "Example Edition")
 
     def test_edit_book_add_new_author_confirm(self):
-        ''' lets a user edit a book confirmed with new authors '''
+        """ lets a user edit a book confirmed with new authors """
         view = views.ConfirmEditBook.as_view()
         self.local_user.groups.add(self.group)
         form = forms.EditionForm(instance=self.book)
-        form.data['title'] = 'New Title'
-        form.data['last_edited_by'] = self.local_user.id
-        form.data['add_author'] = 'Sappho'
-        request = self.factory.post('', form.data)
+        form.data["title"] = "New Title"
+        form.data["last_edited_by"] = self.local_user.id
+        form.data["add_author"] = "Sappho"
+        request = self.factory.post("", form.data)
         request.user = self.local_user
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             view(request, self.book.id)
 
         self.book.refresh_from_db()
-        self.assertEqual(self.book.title, 'New Title')
-        self.assertEqual(self.book.authors.first().name, 'Sappho')
+        self.assertEqual(self.book.title, "New Title")
+        self.assertEqual(self.book.authors.first().name, "Sappho")
 
     def test_edit_book_remove_author(self):
-        ''' remove an author from a book '''
-        author = models.Author.objects.create(name='Sappho')
+        """ remove an author from a book """
+        author = models.Author.objects.create(name="Sappho")
         self.book.authors.add(author)
         form = forms.EditionForm(instance=self.book)
         view = views.EditBook.as_view()
         self.local_user.groups.add(self.group)
         form = forms.EditionForm(instance=self.book)
-        form.data['title'] = 'New Title'
-        form.data['last_edited_by'] = self.local_user.id
-        form.data['remove_authors'] = [author.id]
-        request = self.factory.post('', form.data)
+        form.data["title"] = "New Title"
+        form.data["last_edited_by"] = self.local_user.id
+        form.data["remove_authors"] = [author.id]
+        request = self.factory.post("", form.data)
         request.user = self.local_user
 
-        with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay'):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             view(request, self.book.id)
         self.book.refresh_from_db()
-        self.assertEqual(self.book.title, 'New Title')
+        self.assertEqual(self.book.title, "New Title")
         self.assertFalse(self.book.authors.exists())
 
-
     def test_switch_edition(self):
         """ updates user's relationships to a book """
         work = models.Work.objects.create(title="test work")
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 246ac8af..ed752e75 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -117,17 +117,16 @@ urlpatterns = [
     re_path(r"^boost/(?P<status_id>\d+)/?$", views.Boost.as_view()),
     re_path(r"^unboost/(?P<status_id>\d+)/?$", views.Unboost.as_view()),
     # books
-    re_path(r'%s(.json)?/?$' % book_path, views.Book.as_view()),
-    re_path(r'%s/edit/?$' % book_path, views.EditBook.as_view()),
-    re_path(r'%s/confirm/?$' % book_path, views.ConfirmEditBook.as_view()),
-    re_path(r'^create-book/?$', views.EditBook.as_view()),
-    re_path(r'^create-book/confirm?$', views.ConfirmEditBook.as_view()),
-    re_path(r'%s/editions(.json)?/?$' % book_path, views.Editions.as_view()),
-    re_path(r'^upload-cover/(?P<book_id>\d+)/?$', views.upload_cover),
-    re_path(r'^add-description/(?P<book_id>\d+)/?$', views.add_description),
-    re_path(r'^resolve-book/?$', views.resolve_book),
-    re_path(r'^switch-edition/?$', views.switch_edition),
-
+    re_path(r"%s(.json)?/?$" % book_path, views.Book.as_view()),
+    re_path(r"%s/edit/?$" % book_path, views.EditBook.as_view()),
+    re_path(r"%s/confirm/?$" % book_path, views.ConfirmEditBook.as_view()),
+    re_path(r"^create-book/?$", views.EditBook.as_view()),
+    re_path(r"^create-book/confirm?$", views.ConfirmEditBook.as_view()),
+    re_path(r"%s/editions(.json)?/?$" % book_path, views.Editions.as_view()),
+    re_path(r"^upload-cover/(?P<book_id>\d+)/?$", views.upload_cover),
+    re_path(r"^add-description/(?P<book_id>\d+)/?$", views.add_description),
+    re_path(r"^resolve-book/?$", views.resolve_book),
+    re_path(r"^switch-edition/?$", views.switch_edition),
     # isbn
     re_path(r"^isbn/(?P<isbn>\d+)(.json)?/?$", views.Isbn.as_view()),
     # author
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 7c3ec348..55cc75b4 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -106,107 +106,104 @@ class Book(View):
     permission_required("bookwyrm.edit_book", raise_exception=True), name="dispatch"
 )
 class EditBook(View):
-    ''' edit a book '''
+    """ edit a book """
+
     def get(self, request, book_id=None):
-        ''' info about a book '''
+        """ info about a book """
         book = None
         if book_id:
             book = get_edition(book_id)
             if not book.description:
                 book.description = book.parent_work.description
-        data = {
-            'book': book,
-            'form': forms.EditionForm(instance=book)
-        }
-        return TemplateResponse(request, 'edit_book.html', data)
+        data = {"book": book, "form": forms.EditionForm(instance=book)}
+        return TemplateResponse(request, "edit_book.html", data)
 
     def post(self, request, book_id=None):
-        ''' edit a book cool '''
+        """ edit a book cool """
         # returns None if no match is found
         book = models.Edition.objects.filter(id=book_id).first()
         form = forms.EditionForm(request.POST, request.FILES, instance=book)
 
-        data = {
-            'book': book,
-            'form': form
-        }
+        data = {"book": book, "form": form}
         if not form.is_valid():
-            return TemplateResponse(request, 'edit_book.html', data)
+            return TemplateResponse(request, "edit_book.html", data)
 
-        add_author = request.POST.get('add_author')
+        add_author = request.POST.get("add_author")
         # we're adding an author through a free text field
         if add_author:
-            data['add_author'] = add_author
+            data["add_author"] = add_author
             # check for existing authors
-            vector = SearchVector('name', weight='A') +\
-                     SearchVector('aliases', weight='B')
+            vector = SearchVector("name", weight="A") + SearchVector(
+                "aliases", weight="B"
+            )
 
-            data['author_matches'] = models.Author.objects.annotate(
-                search=vector
-            ).annotate(
-                rank=SearchRank(vector, add_author)
-            ).filter(rank__gt=0.4).order_by('-rank')[:5]
+            data["author_matches"] = (
+                models.Author.objects.annotate(search=vector)
+                .annotate(rank=SearchRank(vector, add_author))
+                .filter(rank__gt=0.4)
+                .order_by("-rank")[:5]
+            )
 
         # we're creating a new book
         if not book:
             # check if this is an edition of an existing work
             author_text = book.author_text if book else add_author
-            data['book_matches'] = connector_manager.local_search(
-                '%s %s' % (form.cleaned_data.get('title'), author_text),
+            data["book_matches"] = connector_manager.local_search(
+                "%s %s" % (form.cleaned_data.get("title"), author_text),
                 min_confidence=0.5,
-                raw=True
+                raw=True,
             )[:5]
 
         # either of the above cases requires additional confirmation
         if add_author or not book:
             # creting a book or adding an author to a book needs another step
-            data['confirm_mode'] = True
-            return TemplateResponse(request, 'edit_book.html', data)
+            data["confirm_mode"] = True
+            return TemplateResponse(request, "edit_book.html", data)
 
-        remove_authors = request.POST.getlist('remove_authors')
+        remove_authors = request.POST.getlist("remove_authors")
         for author_id in remove_authors:
             book.authors.remove(author_id)
 
         book = form.save()
-        return redirect('/book/%s' % book.id)
+        return redirect("/book/%s" % book.id)
 
 
-@method_decorator(login_required, name='dispatch')
+@method_decorator(login_required, name="dispatch")
 @method_decorator(
-    permission_required('bookwyrm.edit_book', raise_exception=True),
-    name='dispatch')
+    permission_required("bookwyrm.edit_book", raise_exception=True), name="dispatch"
+)
 class ConfirmEditBook(View):
-    ''' confirm edits to a book '''
+    """ confirm edits to a book """
+
     def post(self, request, book_id=None):
-        ''' edit a book cool '''
+        """ edit a book cool """
         # returns None if no match is found
         book = models.Edition.objects.filter(id=book_id).first()
         form = forms.EditionForm(request.POST, request.FILES, instance=book)
 
-        data = {
-            'book': book,
-            'form': form
-        }
+        data = {"book": book, "form": form}
         if not form.is_valid():
-            return TemplateResponse(request, 'edit_book.html', data)
+            return TemplateResponse(request, "edit_book.html", data)
 
         with transaction.atomic():
             # save book
             book = form.save()
 
             # get or create author as needed
-            if request.POST.get('add_author'):
-                if request.POST.get('author_match'):
+            if request.POST.get("add_author"):
+                if request.POST.get("author_match"):
                     author = get_object_or_404(
-                        models.Author, id=request.POST['author_match'])
+                        models.Author, id=request.POST["author_match"]
+                    )
                 else:
                     author = models.Author.objects.create(
-                        name=request.POST.get('add_author'))
+                        name=request.POST.get("add_author")
+                    )
                 book.authors.add(author)
 
             # create work, if needed
             if not book_id:
-                work_match = request.POST.get('parent_work')
+                work_match = request.POST.get("parent_work")
                 if work_match:
                     work = get_object_or_404(models.Work, id=work_match)
                 else:
@@ -215,7 +212,7 @@ class ConfirmEditBook(View):
                 book.parent_work = work
                 book.save()
 
-            for author_id in request.POST.getlist('remove_authors'):
+            for author_id in request.POST.getlist("remove_authors"):
                 book.authors.remove(author_id)
 
         return redirect("/book/%s" % book.id)
diff --git a/bw-dev b/bw-dev
index 74c42fbb..712b8028 100755
--- a/bw-dev
+++ b/bw-dev
@@ -36,7 +36,7 @@ function initdb {
 }
 
 function makeitblack {
-    runweb black celerywyrm bookwyrm
+    docker-compose run --rm web black celerywyrm bookwyrm
 }
 
 CMD=$1

From 031235009f0f10ca055704c14ffbe33a03b05799 Mon Sep 17 00:00:00 2001
From: erion <robjoy88@gmail.com>
Date: Mon, 8 Mar 2021 19:20:55 +0100
Subject: [PATCH 0244/1285] Fix albel for the OCLC number field.

---
 bookwyrm/templates/edit_book.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/edit_book.html
index 4d215949..7374e6a0 100644
--- a/bookwyrm/templates/edit_book.html
+++ b/bookwyrm/templates/edit_book.html
@@ -104,7 +104,7 @@
                 {% for error in form.openlibrary_key.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
-                <p class="fields is-grouped"><label class="label" for="id_librarything_key">{% trans "OCLC Number:" %}</label> {{ form.oclc_number }} </p>
+                <p class="fields is-grouped"><label class="label" for="id_oclc_number">{% trans "OCLC Number:" %}</label> {{ form.oclc_number }} </p>
                 {% for error in form.oclc_number.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}

From 58b48faff870723a8aba0bf745756c82c266c6ed Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 8 Mar 2021 10:48:45 -0800
Subject: [PATCH 0245/1285] Tests create books flow

---
 bookwyrm/tests/views/test_book.py | 29 +++++++++++++++++++++++++++++
 bookwyrm/views/books.py           |  3 +--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index 02493769..90b7359d 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -140,6 +140,35 @@ class BookViews(TestCase):
         self.assertEqual(self.book.title, "New Title")
         self.assertFalse(self.book.authors.exists())
 
+    def test_create_book(self):
+        """ create an entirely new book and work """
+        view = views.ConfirmEditBook.as_view()
+        self.local_user.groups.add(self.group)
+        form = forms.EditionForm()
+        form.data["title"] = "New Title"
+        form.data["last_edited_by"] = self.local_user.id
+        request = self.factory.post("", form.data)
+        request.user = self.local_user
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            view(request)
+        book = models.Edition.objects.get(title="New Title")
+        self.assertEqual(book.parent_work.title, "New Title")
+
+    def test_create_book_existing_work(self):
+        """ create an entirely new book and work """
+        view = views.ConfirmEditBook.as_view()
+        self.local_user.groups.add(self.group)
+        form = forms.EditionForm()
+        form.data["title"] = "New Title"
+        form.data["parent_work"] = self.work.id
+        form.data["last_edited_by"] = self.local_user.id
+        request = self.factory.post("", form.data)
+        request.user = self.local_user
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            view(request)
+        book = models.Edition.objects.get(title="New Title")
+        self.assertEqual(book.parent_work, self.work)
+
     def test_switch_edition(self):
         """ updates user's relationships to a book """
         work = models.Work.objects.create(title="test work")
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 55cc75b4..ecba4376 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -1,5 +1,4 @@
 """ the good stuff! the books! """
-from django.core.paginator import Paginator
 from django.contrib.auth.decorators import login_required, permission_required
 from django.contrib.postgres.search import SearchRank, SearchVector
 from django.core.paginator import Paginator
@@ -207,7 +206,7 @@ class ConfirmEditBook(View):
                 if work_match:
                     work = get_object_or_404(models.Work, id=work_match)
                 else:
-                    work = models.Work.objects.create(title=form.cleaned_data.title)
+                    work = models.Work.objects.create(title=form.cleaned_data["title"])
                     work.authors.set(book.authors.all())
                 book.parent_work = work
                 book.save()

From 37e29cc735f8b4c01fb225ab78265656f145bca7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 8 Mar 2021 11:11:05 -0800
Subject: [PATCH 0246/1285] Adds tests of creating book with author

---
 bookwyrm/tests/views/test_book.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index 90b7359d..bba83714 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -169,6 +169,23 @@ class BookViews(TestCase):
         book = models.Edition.objects.get(title="New Title")
         self.assertEqual(book.parent_work, self.work)
 
+    def test_create_book_with_author(self):
+        """ create an entirely new book and work """
+        view = views.ConfirmEditBook.as_view()
+        self.local_user.groups.add(self.group)
+        form = forms.EditionForm()
+        form.data["title"] = "New Title"
+        form.data["add_author"] = "Sappho"
+        form.data["last_edited_by"] = self.local_user.id
+        request = self.factory.post("", form.data)
+        request.user = self.local_user
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            view(request)
+        book = models.Edition.objects.get(title="New Title")
+        self.assertEqual(book.parent_work.title, "New Title")
+        self.assertEqual(book.authors.first().name, "Sappho")
+        self.assertEqual(book.authors.first(), book.parent_work.authors.first())
+
     def test_switch_edition(self):
         """ updates user's relationships to a book """
         work = models.Work.objects.create(title="test work")

From 500394fc52bc5b75393d5632fa6412c01fa244ac Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 8 Mar 2021 11:54:26 -0800
Subject: [PATCH 0247/1285] Make sure creating books doesn't broadcast in tests

---
 bookwyrm/tests/views/test_book.py | 12 ++++++------
 bookwyrm/views/books.py           |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index bba83714..1549bdc6 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -149,8 +149,8 @@ class BookViews(TestCase):
         form.data["last_edited_by"] = self.local_user.id
         request = self.factory.post("", form.data)
         request.user = self.local_user
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            view(request)
+
+        view(request)
         book = models.Edition.objects.get(title="New Title")
         self.assertEqual(book.parent_work.title, "New Title")
 
@@ -164,8 +164,8 @@ class BookViews(TestCase):
         form.data["last_edited_by"] = self.local_user.id
         request = self.factory.post("", form.data)
         request.user = self.local_user
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            view(request)
+
+        view(request)
         book = models.Edition.objects.get(title="New Title")
         self.assertEqual(book.parent_work, self.work)
 
@@ -179,8 +179,8 @@ class BookViews(TestCase):
         form.data["last_edited_by"] = self.local_user.id
         request = self.factory.post("", form.data)
         request.user = self.local_user
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            view(request)
+
+        view(request)
         book = models.Edition.objects.get(title="New Title")
         self.assertEqual(book.parent_work.title, "New Title")
         self.assertEqual(book.authors.first().name, "Sappho")
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index ecba4376..ae60c677 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -209,7 +209,8 @@ class ConfirmEditBook(View):
                     work = models.Work.objects.create(title=form.cleaned_data["title"])
                     work.authors.set(book.authors.all())
                 book.parent_work = work
-                book.save()
+                # we don't tell the world when creating a book
+                book.save(broadcast=False)
 
             for author_id in request.POST.getlist("remove_authors"):
                 book.authors.remove(author_id)

From a29d6a5f16ba1f0f75d0d283c4d01917bc0e4d82 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 8 Mar 2021 14:11:08 -0800
Subject: [PATCH 0248/1285] Hide secondary save button in confirm mode

---
 bookwyrm/templates/edit_book.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/edit_book.html
index 1ebcc6b9..700dc570 100644
--- a/bookwyrm/templates/edit_book.html
+++ b/bookwyrm/templates/edit_book.html
@@ -72,7 +72,6 @@
     <hr class="block">
     {% endif %}
 
-    <fieldset>
     <input type="hidden" name="last_edited_by" value="{{ request.user.id }}">
     <div class="columns">
         <div class="column">
@@ -181,11 +180,12 @@
         </div>
     </div>
 
+    {% if not confirm_mode %}
     <div class="block">
         <button class="button is-primary" type="submit">{% trans "Save" %}</button>
         <a class="button" href="/book/{{ book.id }}">{% trans "Cancel" %}</a>
     </div>
-    </fieldset>
+    {% endif %}
 </form>
 
 {% endblock %}

From ab57b5b906641df96be76fee71186d8eb4b51896 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 8 Mar 2021 15:49:44 -0800
Subject: [PATCH 0249/1285] First pass at views for reporting

---
 bookwyrm/templates/layout.html                |  4 +-
 bookwyrm/templates/settings/admin_layout.html |  4 ++
 .../templates/settings/report_preview.html    | 14 +++++++
 bookwyrm/templates/settings/reports.html      | 27 +++++++++++++
 .../snippets/status/status_options.html       |  5 +++
 bookwyrm/templates/snippets/user_options.html |  3 ++
 bookwyrm/urls.py                              |  7 ++++
 bookwyrm/views/__init__.py                    |  3 +-
 bookwyrm/views/reports.py                     | 38 +++++++++++++++++++
 9 files changed, 102 insertions(+), 3 deletions(-)
 create mode 100644 bookwyrm/templates/settings/report_preview.html
 create mode 100644 bookwyrm/templates/settings/reports.html
 create mode 100644 bookwyrm/views/reports.py

diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 901a12ff..fc2ebdb7 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -114,8 +114,8 @@
                     {% endif %}
                     {% if perms.bookwyrm.edit_instance_settings %}
                     <li>
-                        <a href="{% url 'settings-site' %}" class="navbar-item">
-                            {% trans 'Site Configuration' %}
+                        <a href="{% url 'settings-reports' %}" class="navbar-item">
+                            {% trans 'Admin' %}
                         </a>
                     </li>
                     {% endif %}
diff --git a/bookwyrm/templates/settings/admin_layout.html b/bookwyrm/templates/settings/admin_layout.html
index 16741436..312d502a 100644
--- a/bookwyrm/templates/settings/admin_layout.html
+++ b/bookwyrm/templates/settings/admin_layout.html
@@ -18,6 +18,10 @@
                 {% url 'settings-invites' as url %}
                 <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Invites" %}</a>
             </li>
+            <li>
+                {% url 'settings-reports' as url %}
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Reports" %}</a>
+            </li>
             <li>
                 {% url 'settings-federation' as url %}
                 <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Federated Servers" %}</a>
diff --git a/bookwyrm/templates/settings/report_preview.html b/bookwyrm/templates/settings/report_preview.html
new file mode 100644
index 00000000..67bffe27
--- /dev/null
+++ b/bookwyrm/templates/settings/report_preview.html
@@ -0,0 +1,14 @@
+{% extends 'components/card.html' %}
+{% load i18n %}
+{% block card-header %}
+<h2 class="title is-4">
+    <a href="{% url settings-report report.id %}">report title</a></h2>
+{% endblock %}
+
+{% block card-content %}
+about this report
+{% endblock %}
+
+{% block card-footer %}
+footer
+{% endblock
diff --git a/bookwyrm/templates/settings/reports.html b/bookwyrm/templates/settings/reports.html
new file mode 100644
index 00000000..efca7244
--- /dev/null
+++ b/bookwyrm/templates/settings/reports.html
@@ -0,0 +1,27 @@
+{% extends 'settings/admin_layout.html' %}
+{% load i18n %}
+
+{% block header %}{% trans "Reports" %}{% endblock %}
+
+{% block panel %}
+<div class="tabs">
+    <ul>
+        <li class="{% if filter == 'open' %}is-active{% endif %}"{% if filter == 'open' %} aria-current="page"{% endif %}>
+            <a href="{% url 'settings-reports' %}?status=open">{% trans "Open" %}</a>
+        </li>
+        <li class="{% if filter == 'resolved' %}is-active{% endif %}"{% if filter == 'resolved' %} aria-current="page"{% endif %}>
+            <a href="{% url 'settings-reports' %}?status=closed">{% trans "Resolved" %}</a>
+        </li>
+    </ul>
+</div>
+
+<ul>
+    {% for report in reports %}
+    <li class="card">
+        {% include 'settings/report_preview.html' with report=report %}
+    </li>
+    {% endfor %}
+</ul>
+
+{% endblock %}
+
diff --git a/bookwyrm/templates/snippets/status/status_options.html b/bookwyrm/templates/snippets/status/status_options.html
index babd8296..0f099e17 100644
--- a/bookwyrm/templates/snippets/status/status_options.html
+++ b/bookwyrm/templates/snippets/status/status_options.html
@@ -10,6 +10,7 @@
 
 {% block dropdown-list %}
 {% if status.user == request.user %}
+{# things you can do to your own statuses #}
 <li role="menuitem">
     <form class="dropdown-item pt-0 pb-0" name="delete-{{status.id}}" action="/delete-status/{{ status.id }}" method="post">
         {% csrf_token %}
@@ -19,9 +20,13 @@
     </form>
 </li>
 {% else %}
+{# things you can do to other people's statuses #}
 <li role="menuitem">
     <a href="/direct-messages/{{ status.user|username }}" class="button is-fullwidth is-small">{% trans "Send direct message" %}</a>
 </li>
+<li role="menuitem">
+    <a href="{{ status.local_path }}/report" class="button is-fullwidth is-small">{% trans "Report status" %}</a>
+</li>
 <li role="menuitem">
     {% include 'snippets/block_button.html' with user=status.user class="is-fullwidth" %}
 </li>
diff --git a/bookwyrm/templates/snippets/user_options.html b/bookwyrm/templates/snippets/user_options.html
index b3f66782..c9fdac0a 100644
--- a/bookwyrm/templates/snippets/user_options.html
+++ b/bookwyrm/templates/snippets/user_options.html
@@ -12,6 +12,9 @@
 <li role="menuitem">
     <a href="/direct-messages/{{ user|username }}" class="button is-fullwidth is-small">{% trans "Send direct message" %}</a>
 </li>
+<li role="menuitem">
+    <a href="{{ user.local_path }}/report" class="button is-fullwidth is-small">{% trans "Report user" %}</a>
+</li>
 <li role="menuitem">
     {% include 'snippets/block_button.html' with user=user class="is-fullwidth" %}
 </li>
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 844f8993..c7ec7f4b 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -54,6 +54,13 @@ urlpatterns = [
     re_path(
         r"^settings/invites/?$", views.ManageInvites.as_view(), name="settings-invites"
     ),
+    # moderation
+    re_path(r"^settings/reports/?$", views.Reports.as_view(), name="settings-reports"),
+    re_path(
+        r"^settings/report/(?P<report_id>\d+)/?$",
+        views.Report.as_view(),
+        name="settings-report",
+    ),
     re_path(r"^invite/(?P<code>[A-Za-z0-9]+)/?$", views.Invite.as_view()),
     # landing pages
     re_path(r"^about/?$", views.About.as_view()),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 48da8ec1..36a64ddf 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -20,15 +20,16 @@ from .notifications import Notifications
 from .outbox import Outbox
 from .reading import edit_readthrough, create_readthrough, delete_readthrough
 from .reading import start_reading, finish_reading, delete_progressupdate
+from .reports import Report, Reports
 from .rss_feed import RssFeed
 from .password import PasswordResetRequest, PasswordReset, ChangePassword
-from .tag import Tag, AddTag, RemoveTag
 from .search import Search
 from .shelf import Shelf
 from .shelf import user_shelves_page, create_shelf, delete_shelf
 from .shelf import shelve, unshelve
 from .site import Site
 from .status import CreateStatus, DeleteStatus
+from .tag import Tag, AddTag, RemoveTag
 from .updates import Updates
 from .user import User, EditUser, Followers, Following
 from .isbn import Isbn
diff --git a/bookwyrm/views/reports.py b/bookwyrm/views/reports.py
new file mode 100644
index 00000000..a90fffaf
--- /dev/null
+++ b/bookwyrm/views/reports.py
@@ -0,0 +1,38 @@
+""" moderation via flagged posts and users """
+from django.contrib.auth.decorators import login_required, permission_required
+from django.shortcuts import get_object_or_404
+from django.template.response import TemplateResponse
+from django.utils.decorators import method_decorator
+from django.views import View
+
+from bookwyrm import models
+
+
+# pylint: disable= no-self-use
+@method_decorator(login_required, name="dispatch")
+@method_decorator(
+    permission_required("bookwyrm.moderate_user", raise_exception=True),
+    name="dispatch",
+)
+@method_decorator(
+    permission_required("bookwyrm.moderate_post", raise_exception=True),
+    name="dispatch",
+)
+class Reports(View):
+    """ list of reports  """
+
+    def get(self, request, status="open"):
+        """ view current reports """
+        data = {
+            "status": status
+        }  # {"reports": models.Report.objects.filter(status=status)}
+        return TemplateResponse(request, "settings/reports.html", data)
+
+
+class Report(View):
+    """ view a specific report """
+
+    def get(self, request, report_id):
+        """ load a report """
+        data = {"report": get_object_or_404(models.REport, id=report_id)}
+        return TemplateResponse(request, "settings/report.html", data)

From 7337a357fa676459634cab18c47b9c3a2fd6690c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 8 Mar 2021 16:02:16 -0800
Subject: [PATCH 0250/1285] Adds tests file

---
 bookwyrm/tests/views/test_reports.py | 48 ++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 bookwyrm/tests/views/test_reports.py

diff --git a/bookwyrm/tests/views/test_reports.py b/bookwyrm/tests/views/test_reports.py
new file mode 100644
index 00000000..3b8dec26
--- /dev/null
+++ b/bookwyrm/tests/views/test_reports.py
@@ -0,0 +1,48 @@
+""" test for app action functionality """
+from django.template.response import TemplateResponse
+from django.test import TestCase
+from django.test.client import RequestFactory
+
+from bookwyrm import models
+from bookwyrm import views
+
+
+class ReportViews(TestCase):
+    """ every response to a get request, html or json """
+
+    def setUp(self):
+        """ we need basic test data and mocks """
+        self.factory = RequestFactory()
+        self.local_user = models.User.objects.create_user(
+            "mouse@local.com",
+            "mouse@mouse.mouse",
+            "password",
+            local=True,
+            localname="mouse",
+        )
+        models.SiteSettings.objects.create()
+
+    def test_reports_page(self):
+        """ there are so many views, this just makes sure it LOADS """
+        view = views.Reports.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+        request.user.is_superuser = True
+        result = view(request)
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+
+    def test_report_page(self):
+        """ there are so many views, this just makes sure it LOADS """
+        view = views.Report.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+        request.user.is_superuser = True
+        report = models.Report.objects.create()
+
+        result = view(request, report.id)
+
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)

From e59c12768642a9ebaa810a138972eebf6098c6b7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 8 Mar 2021 17:16:59 -0800
Subject: [PATCH 0251/1285] Adds models for reporting

---
 .gitignore                                    |  3 +-
 .../migrations/0049_report_reportcomment.py   | 48 +++++++++++++++++++
 bookwyrm/models/__init__.py                   |  1 +
 bookwyrm/models/federated_server.py           |  2 +-
 bookwyrm/models/report.py                     | 23 +++++++++
 bookwyrm/tests/views/test_reports.py          |  9 +++-
 bookwyrm/views/reports.py                     | 12 +++--
 7 files changed, 90 insertions(+), 8 deletions(-)
 create mode 100644 bookwyrm/migrations/0049_report_reportcomment.py
 create mode 100644 bookwyrm/models/report.py

diff --git a/.gitignore b/.gitignore
index 1384056f..4b5b7fef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 /venv
 *.pyc
 *.swp
+**/__pycache__
 
 # VSCode
 /.vscode
@@ -15,4 +16,4 @@
 /images/
 
 # Testing
-.coverage
\ No newline at end of file
+.coverage
diff --git a/bookwyrm/migrations/0049_report_reportcomment.py b/bookwyrm/migrations/0049_report_reportcomment.py
new file mode 100644
index 00000000..deb8ba6f
--- /dev/null
+++ b/bookwyrm/migrations/0049_report_reportcomment.py
@@ -0,0 +1,48 @@
+# Generated by Django 3.0.7 on 2021-03-09 00:55
+
+import bookwyrm.models.fields
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0048_merge_20210308_1754'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Report',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_date', models.DateTimeField(auto_now_add=True)),
+                ('updated_date', models.DateTimeField(auto_now=True)),
+                ('remote_id', bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id])),
+                ('note', models.TextField(blank=True, null=True)),
+                ('resolved', models.BooleanField(default=False)),
+                ('reporter', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='reporter', to=settings.AUTH_USER_MODEL)),
+                ('statuses', models.ManyToManyField(to='bookwyrm.Status')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='ReportComment',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_date', models.DateTimeField(auto_now_add=True)),
+                ('updated_date', models.DateTimeField(auto_now=True)),
+                ('remote_id', bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id])),
+                ('note', models.TextField()),
+                ('report', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Report')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]
diff --git a/bookwyrm/models/__init__.py b/bookwyrm/models/__init__.py
index 67ee16d3..326a673e 100644
--- a/bookwyrm/models/__init__.py
+++ b/bookwyrm/models/__init__.py
@@ -21,6 +21,7 @@ from .tag import Tag, UserTag
 
 from .user import User, KeyPair, AnnualGoal
 from .relationship import UserFollows, UserFollowRequest, UserBlocks
+from .report import Report, ReportComment
 from .federated_server import FederatedServer
 
 from .import_job import ImportJob, ImportItem
diff --git a/bookwyrm/models/federated_server.py b/bookwyrm/models/federated_server.py
index ce804310..8f7d903e 100644
--- a/bookwyrm/models/federated_server.py
+++ b/bookwyrm/models/federated_server.py
@@ -4,7 +4,7 @@ from .base_model import BookWyrmModel
 
 
 class FederatedServer(BookWyrmModel):
-    """ store which server's we federate with """
+    """ store which servers we federate with """
 
     server_name = models.CharField(max_length=255, unique=True)
     # federated, blocked, whatever else
diff --git a/bookwyrm/models/report.py b/bookwyrm/models/report.py
new file mode 100644
index 00000000..afbc356b
--- /dev/null
+++ b/bookwyrm/models/report.py
@@ -0,0 +1,23 @@
+""" flagged for moderation """
+from django.db import models
+from .base_model import BookWyrmModel
+
+
+class Report(BookWyrmModel):
+    """ reported status or user """
+
+    reporter = models.ForeignKey(
+        "User", related_name="reporter", on_delete=models.PROTECT
+    )
+    note = models.TextField(null=True, blank=True)
+    user = models.ForeignKey("User", on_delete=models.PROTECT)
+    statuses = models.ManyToManyField("Status")
+    resolved = models.BooleanField(default=False)
+
+
+class ReportComment(BookWyrmModel):
+    """ updates on a report """
+
+    user = models.ForeignKey("User", on_delete=models.PROTECT)
+    note = models.TextField()
+    report = models.ForeignKey(Report, on_delete=models.PROTECT)
diff --git a/bookwyrm/tests/views/test_reports.py b/bookwyrm/tests/views/test_reports.py
index 3b8dec26..d35633cb 100644
--- a/bookwyrm/tests/views/test_reports.py
+++ b/bookwyrm/tests/views/test_reports.py
@@ -20,6 +20,13 @@ class ReportViews(TestCase):
             local=True,
             localname="mouse",
         )
+        self.local_user = models.User.objects.create_user(
+            "rat@local.com",
+            "rat@mouse.mouse",
+            "password",
+            local=True,
+            localname="rat",
+        )
         models.SiteSettings.objects.create()
 
     def test_reports_page(self):
@@ -39,7 +46,7 @@ class ReportViews(TestCase):
         request = self.factory.get("")
         request.user = self.local_user
         request.user.is_superuser = True
-        report = models.Report.objects.create()
+        report = models.Report.objects.create(reporter=self.local_user, user=self.rat)
 
         result = view(request, report.id)
 
diff --git a/bookwyrm/views/reports.py b/bookwyrm/views/reports.py
index a90fffaf..2e374d5e 100644
--- a/bookwyrm/views/reports.py
+++ b/bookwyrm/views/reports.py
@@ -8,7 +8,7 @@ from django.views import View
 from bookwyrm import models
 
 
-# pylint: disable= no-self-use
+# pylint: disable=no-self-use
 @method_decorator(login_required, name="dispatch")
 @method_decorator(
     permission_required("bookwyrm.moderate_user", raise_exception=True),
@@ -21,11 +21,13 @@ from bookwyrm import models
 class Reports(View):
     """ list of reports  """
 
-    def get(self, request, status="open"):
+    def get(self, request):
         """ view current reports """
+        resolved = request.GET.get("resolved")
         data = {
-            "status": status
-        }  # {"reports": models.Report.objects.filter(status=status)}
+            "resolved": resolved,
+            "reports": models.Report.objects.filter(resolved=resolved),
+        }
         return TemplateResponse(request, "settings/reports.html", data)
 
 
@@ -34,5 +36,5 @@ class Report(View):
 
     def get(self, request, report_id):
         """ load a report """
-        data = {"report": get_object_or_404(models.REport, id=report_id)}
+        data = {"report": get_object_or_404(models.Report, id=report_id)}
         return TemplateResponse(request, "settings/report.html", data)

From 21f199c5482d2aae87058433ce68c2d6930e610a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 8 Mar 2021 18:36:34 -0800
Subject: [PATCH 0252/1285] Make reports

---
 bookwyrm/forms.py                             |  6 ++++
 ...tcomment.py => 0049_auto_20210309_0156.py} | 12 ++++---
 bookwyrm/models/report.py                     | 11 ++++++-
 bookwyrm/templates/settings/report.html       |  2 ++
 .../templates/settings/report_preview.html    |  4 +--
 .../templates/snippets/report_button.html     |  7 ++++
 .../snippets/status/status_options.html       |  2 +-
 bookwyrm/templates/snippets/user_options.html |  2 +-
 bookwyrm/tests/views/test_reports.py          | 33 +++++++++++++++++--
 bookwyrm/urls.py                              |  5 +--
 bookwyrm/views/__init__.py                    |  2 +-
 bookwyrm/views/reports.py                     | 29 ++++++++++++++--
 12 files changed, 96 insertions(+), 19 deletions(-)
 rename bookwyrm/migrations/{0049_report_reportcomment.py => 0049_auto_20210309_0156.py} (83%)
 create mode 100644 bookwyrm/templates/settings/report.html
 create mode 100644 bookwyrm/templates/snippets/report_button.html

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 380e701f..654130cf 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -231,3 +231,9 @@ class ListForm(CustomForm):
     class Meta:
         model = models.List
         fields = ["user", "name", "description", "curation", "privacy"]
+
+
+class ReportForm(CustomForm):
+    class Meta:
+        model = models.Report
+        fields = ["user", "reporter", "statuses", "note"]
diff --git a/bookwyrm/migrations/0049_report_reportcomment.py b/bookwyrm/migrations/0049_auto_20210309_0156.py
similarity index 83%
rename from bookwyrm/migrations/0049_report_reportcomment.py
rename to bookwyrm/migrations/0049_auto_20210309_0156.py
index deb8ba6f..494f5bc8 100644
--- a/bookwyrm/migrations/0049_report_reportcomment.py
+++ b/bookwyrm/migrations/0049_auto_20210309_0156.py
@@ -1,9 +1,10 @@
-# Generated by Django 3.0.7 on 2021-03-09 00:55
+# Generated by Django 3.0.7 on 2021-03-09 01:56
 
 import bookwyrm.models.fields
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
+import django.db.models.expressions
 
 
 class Migration(migrations.Migration):
@@ -23,12 +24,9 @@ class Migration(migrations.Migration):
                 ('note', models.TextField(blank=True, null=True)),
                 ('resolved', models.BooleanField(default=False)),
                 ('reporter', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='reporter', to=settings.AUTH_USER_MODEL)),
-                ('statuses', models.ManyToManyField(to='bookwyrm.Status')),
+                ('statuses', models.ManyToManyField(blank=True, null=True, to='bookwyrm.Status')),
                 ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
             ],
-            options={
-                'abstract': False,
-            },
         ),
         migrations.CreateModel(
             name='ReportComment',
@@ -45,4 +43,8 @@ class Migration(migrations.Migration):
                 'abstract': False,
             },
         ),
+        migrations.AddConstraint(
+            model_name='report',
+            constraint=models.CheckConstraint(check=models.Q(_negated=True, reporter=django.db.models.expressions.F('user')), name='self_report'),
+        ),
     ]
diff --git a/bookwyrm/models/report.py b/bookwyrm/models/report.py
index afbc356b..e1e8c2a4 100644
--- a/bookwyrm/models/report.py
+++ b/bookwyrm/models/report.py
@@ -1,5 +1,6 @@
 """ flagged for moderation """
 from django.db import models
+from django.db.models import F, Q
 from .base_model import BookWyrmModel
 
 
@@ -11,9 +12,17 @@ class Report(BookWyrmModel):
     )
     note = models.TextField(null=True, blank=True)
     user = models.ForeignKey("User", on_delete=models.PROTECT)
-    statuses = models.ManyToManyField("Status")
+    statuses = models.ManyToManyField("Status", null=True, blank=True)
     resolved = models.BooleanField(default=False)
 
+    class Meta:
+        """ don't let users report themselves """
+        constraints = [
+            models.CheckConstraint(
+                check=~Q(reporter=F('user')),
+                name='self_report'
+            )
+        ]
 
 class ReportComment(BookWyrmModel):
     """ updates on a report """
diff --git a/bookwyrm/templates/settings/report.html b/bookwyrm/templates/settings/report.html
new file mode 100644
index 00000000..1f55906b
--- /dev/null
+++ b/bookwyrm/templates/settings/report.html
@@ -0,0 +1,2 @@
+{% extends 'settings/admin_layout.html' %}
+{% load i18n %}
diff --git a/bookwyrm/templates/settings/report_preview.html b/bookwyrm/templates/settings/report_preview.html
index 67bffe27..b72dd958 100644
--- a/bookwyrm/templates/settings/report_preview.html
+++ b/bookwyrm/templates/settings/report_preview.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% block card-header %}
 <h2 class="title is-4">
-    <a href="{% url settings-report report.id %}">report title</a></h2>
+    <a href="{% url 'settings-report' report.id %}">report title</a></h2>
 {% endblock %}
 
 {% block card-content %}
@@ -11,4 +11,4 @@ about this report
 
 {% block card-footer %}
 footer
-{% endblock
+{% endblock %}
diff --git a/bookwyrm/templates/snippets/report_button.html b/bookwyrm/templates/snippets/report_button.html
new file mode 100644
index 00000000..5fbaee99
--- /dev/null
+++ b/bookwyrm/templates/snippets/report_button.html
@@ -0,0 +1,7 @@
+{% load i18n %}
+<form name="report" method="post" action="{% url 'report' %}">
+    {% csrf_token %}
+    <input type="hidden" name="reporter" value="{{ request.user.id }}">
+    <input type="hidden" name="user" value="{{ user.id }}">
+    <button class="button is-danger is-light is-small {{ class }}" type="submit">{% trans "Report" %}</button>
+</form>
diff --git a/bookwyrm/templates/snippets/status/status_options.html b/bookwyrm/templates/snippets/status/status_options.html
index 0f099e17..f703ba6e 100644
--- a/bookwyrm/templates/snippets/status/status_options.html
+++ b/bookwyrm/templates/snippets/status/status_options.html
@@ -25,7 +25,7 @@
     <a href="/direct-messages/{{ status.user|username }}" class="button is-fullwidth is-small">{% trans "Send direct message" %}</a>
 </li>
 <li role="menuitem">
-    <a href="{{ status.local_path }}/report" class="button is-fullwidth is-small">{% trans "Report status" %}</a>
+    {% include 'snippets/report_button.html' with user=status.user class="is-fullwidth" %}
 </li>
 <li role="menuitem">
     {% include 'snippets/block_button.html' with user=status.user class="is-fullwidth" %}
diff --git a/bookwyrm/templates/snippets/user_options.html b/bookwyrm/templates/snippets/user_options.html
index c9fdac0a..585417c7 100644
--- a/bookwyrm/templates/snippets/user_options.html
+++ b/bookwyrm/templates/snippets/user_options.html
@@ -13,7 +13,7 @@
     <a href="/direct-messages/{{ user|username }}" class="button is-fullwidth is-small">{% trans "Send direct message" %}</a>
 </li>
 <li role="menuitem">
-    <a href="{{ user.local_path }}/report" class="button is-fullwidth is-small">{% trans "Report user" %}</a>
+    {% include 'snippets/report_button.html' with user=status.user class="is-fullwidth" %}
 </li>
 <li role="menuitem">
     {% include 'snippets/block_button.html' with user=user class="is-fullwidth" %}
diff --git a/bookwyrm/tests/views/test_reports.py b/bookwyrm/tests/views/test_reports.py
index d35633cb..70414dcb 100644
--- a/bookwyrm/tests/views/test_reports.py
+++ b/bookwyrm/tests/views/test_reports.py
@@ -3,8 +3,7 @@ from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
 
-from bookwyrm import models
-from bookwyrm import views
+from bookwyrm import forms, models, views
 
 
 class ReportViews(TestCase):
@@ -20,7 +19,7 @@ class ReportViews(TestCase):
             local=True,
             localname="mouse",
         )
-        self.local_user = models.User.objects.create_user(
+        self.rat = models.User.objects.create_user(
             "rat@local.com",
             "rat@mouse.mouse",
             "password",
@@ -35,6 +34,20 @@ class ReportViews(TestCase):
         request = self.factory.get("")
         request.user = self.local_user
         request.user.is_superuser = True
+
+        result = view(request)
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+
+    def test_reports_page_with_data(self):
+        """ there are so many views, this just makes sure it LOADS """
+        view = views.Reports.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+        request.user.is_superuser = True
+        report = models.Report.objects.create(reporter=self.local_user, user=self.rat)
+
         result = view(request)
         self.assertIsInstance(result, TemplateResponse)
         result.render()
@@ -53,3 +66,17 @@ class ReportViews(TestCase):
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
+
+    def test_make_report(self):
+        """ a user reports another user """
+        form = forms.ReportForm()
+        form.data["reporter"] = self.local_user.id
+        form.data["user"] = self.rat.id
+        request = self.factory.post("", form.data)
+        request.user = self.local_user
+
+        views.make_report(request)
+
+        report = models.Report.objects.get()
+        self.assertEqual(report.reporter, self.local_user)
+        self.assertEqual(report.user, self.rat)
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index c7ec7f4b..42b9803d 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -54,14 +54,15 @@ urlpatterns = [
     re_path(
         r"^settings/invites/?$", views.ManageInvites.as_view(), name="settings-invites"
     ),
+    re_path(r"^invite/(?P<code>[A-Za-z0-9]+)/?$", views.Invite.as_view()),
     # moderation
     re_path(r"^settings/reports/?$", views.Reports.as_view(), name="settings-reports"),
     re_path(
-        r"^settings/report/(?P<report_id>\d+)/?$",
+        r"^settings/reports/(?P<report_id>\d+)/?$",
         views.Report.as_view(),
         name="settings-report",
     ),
-    re_path(r"^invite/(?P<code>[A-Za-z0-9]+)/?$", views.Invite.as_view()),
+    re_path(r"^report/?$", views.make_report, name="report"),
     # landing pages
     re_path(r"^about/?$", views.About.as_view()),
     path("", views.Home.as_view()),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 36a64ddf..b433dca2 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -20,7 +20,7 @@ from .notifications import Notifications
 from .outbox import Outbox
 from .reading import edit_readthrough, create_readthrough, delete_readthrough
 from .reading import start_reading, finish_reading, delete_progressupdate
-from .reports import Report, Reports
+from .reports import Report, Reports, make_report
 from .rss_feed import RssFeed
 from .password import PasswordResetRequest, PasswordReset, ChangePassword
 from .search import Search
diff --git a/bookwyrm/views/reports.py b/bookwyrm/views/reports.py
index 2e374d5e..9eaf9bdc 100644
--- a/bookwyrm/views/reports.py
+++ b/bookwyrm/views/reports.py
@@ -1,11 +1,12 @@
 """ moderation via flagged posts and users """
 from django.contrib.auth.decorators import login_required, permission_required
-from django.shortcuts import get_object_or_404
+from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
+from django.views.decorators.http import require_POST
 
-from bookwyrm import models
+from bookwyrm import forms, models
 
 
 # pylint: disable=no-self-use
@@ -23,7 +24,7 @@ class Reports(View):
 
     def get(self, request):
         """ view current reports """
-        resolved = request.GET.get("resolved")
+        resolved = request.GET.get("resolved", False)
         data = {
             "resolved": resolved,
             "reports": models.Report.objects.filter(resolved=resolved),
@@ -31,6 +32,15 @@ class Reports(View):
         return TemplateResponse(request, "settings/reports.html", data)
 
 
+@method_decorator(login_required, name="dispatch")
+@method_decorator(
+    permission_required("bookwyrm.moderate_user", raise_exception=True),
+    name="dispatch",
+)
+@method_decorator(
+    permission_required("bookwyrm.moderate_post", raise_exception=True),
+    name="dispatch",
+)
 class Report(View):
     """ view a specific report """
 
@@ -38,3 +48,16 @@ class Report(View):
         """ load a report """
         data = {"report": get_object_or_404(models.Report, id=report_id)}
         return TemplateResponse(request, "settings/report.html", data)
+
+
+@login_required
+@require_POST
+def make_report(request):
+    """ a user reports something """
+    form = forms.ReportForm(request.POST)
+    if not form.is_valid():
+        print(form.errors)
+        return redirect(request.headers.get("Referer", "/"))
+
+    form.save()
+    return redirect(request.headers.get("Referer", "/"))

From ff624e33fa93a46ef238596709eea4b96d63bb14 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 9 Mar 2021 10:08:02 -0800
Subject: [PATCH 0253/1285] fixes display of report items on admin page

---
 bookwyrm/templates/settings/admin_layout.html   |  2 +-
 bookwyrm/templates/settings/report_preview.html | 13 +++++++++----
 bookwyrm/templates/settings/reports.html        |  8 ++++----
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/templates/settings/admin_layout.html b/bookwyrm/templates/settings/admin_layout.html
index 312d502a..a34fe638 100644
--- a/bookwyrm/templates/settings/admin_layout.html
+++ b/bookwyrm/templates/settings/admin_layout.html
@@ -46,7 +46,7 @@
         </ul>
         {% endif %}
     </nav>
-    <div class="column content">
+    <div class="column">
         {% block panel %}{% endblock %}
     </div>
 </div>
diff --git a/bookwyrm/templates/settings/report_preview.html b/bookwyrm/templates/settings/report_preview.html
index b72dd958..63eca0fc 100644
--- a/bookwyrm/templates/settings/report_preview.html
+++ b/bookwyrm/templates/settings/report_preview.html
@@ -1,14 +1,19 @@
 {% extends 'components/card.html' %}
 {% load i18n %}
 {% block card-header %}
-<h2 class="title is-4">
-    <a href="{% url 'settings-report' report.id %}">report title</a></h2>
+<h2 class="card-header-title has-background-white-ter is-block">
+    <a href="{% url 'settings-report' report.id %}">report title</a>
+</h2>
 {% endblock %}
 
 {% block card-content %}
-about this report
+<div class="block">
+    about this report
+</div>
 {% endblock %}
 
 {% block card-footer %}
-footer
+<div class="card-footer-item">
+    footer
+</div>
 {% endblock %}
diff --git a/bookwyrm/templates/settings/reports.html b/bookwyrm/templates/settings/reports.html
index efca7244..59fbaf56 100644
--- a/bookwyrm/templates/settings/reports.html
+++ b/bookwyrm/templates/settings/reports.html
@@ -15,13 +15,13 @@
     </ul>
 </div>
 
-<ul>
+<div class="block">
     {% for report in reports %}
-    <li class="card">
+    <div class="block">
         {% include 'settings/report_preview.html' with report=report %}
-    </li>
+    </div>
     {% endfor %}
-</ul>
+</div>
 
 {% endblock %}
 

From 59f1d567eb05f6159d0474be3d814b0cf68e9cb6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 9 Mar 2021 10:35:35 -0800
Subject: [PATCH 0254/1285] Updates README on main for production changes

---
 README.md | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 41bd7065..98ce9c76 100644
--- a/README.md
+++ b/README.md
@@ -175,7 +175,6 @@ Instructions for running BookWyrm in production:
  - Comment out the `command: certonly...` line in `docker-compose.yml`
  - Run docker-compose in the background with: `docker-compose up -d`
  - Initialize the database with: `./bw-dev initdb`
- - Set up schedule backups with cron that runs that `docker-compose exec db pg_dump -U <databasename>` and saves the backup to a safe location
 
 Congrats! You did it, go to your domain and enjoy the fruits of your labors.
 
@@ -205,3 +204,16 @@ There are three concepts in the book data model:
  
 Whenever a user interacts with a book, they are interacting with a specific edition. Every work has a default edition, but the user can select other editions. Reviews aggregated for all editions of a work when you view an edition's page.
 
+### Backups
+
+Bookwyrm's db service dumps a backup copy of its database to its `/backups` directory daily at midnight UTC.
+Backups are named `backup__%Y-%m-%d.sql`.
+
+The db service has an optional script for periodically pruning the backups directory so that all recent daily backups are kept, but for older backups, only weekly or monthly backups are kept.
+To enable this script:
+- Uncomment the final line in `postgres-docker/cronfile`
+- rebuild your instance `docker-compose up --build`
+
+You can copy backups from the backups volume to your host machine with `docker cp`:
+- Run `docker-compose ps` to confirm the db service's full name (it's probably `bookwyrm_db_1`.
+- Run `docker cp <container_name>:/backups <host machine path>

From 999bff4bbadb25f0e1a3015a4ece75bcc0559baa Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 9 Mar 2021 12:35:07 -0800
Subject: [PATCH 0255/1285] Basic reports admin templates

---
 bookwyrm/templates/settings/report.html       | 41 +++++++++++++++++++
 .../templates/settings/report_preview.html    | 13 ++++--
 bookwyrm/templates/settings/reports.html      |  9 ++--
 bookwyrm/views/reports.py                     |  2 +-
 4 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/bookwyrm/templates/settings/report.html b/bookwyrm/templates/settings/report.html
index 1f55906b..74c3641b 100644
--- a/bookwyrm/templates/settings/report.html
+++ b/bookwyrm/templates/settings/report.html
@@ -1,2 +1,43 @@
 {% extends 'settings/admin_layout.html' %}
 {% load i18n %}
+
+{% block title %}{% blocktrans with report_id=report.id %}Report #{{ report_id }}{% endblocktrans %}{% endblock %}
+{% block header %}{% blocktrans with report_id=report.id %}Report #{{ report_id }}{% endblocktrans %}{% endblock %}
+
+{% block panel %}
+<div class="block">
+    <a href="{% url 'settings-reports' %}">{% trans "Back to reports" %}</a>
+</div>
+
+<div class="block">
+    {% include 'settings/report_preview.html' with report=report %}
+</div>
+
+<div class="block content">
+    <h3>{% trans "Actions" %}</h3>
+    <div class="field is-grouped">
+        <button class="button">Direct message</button>
+        <button class="button">Suspend</button>
+    </div>
+
+    {% for comment in report.reportcomment_set.all %}
+    <div class="block">
+        {{ comment }}
+    </div>
+    {% endfor %}
+    <form>
+        <label for="report_comment" class="label">Comment on report</label>
+        <textarea name="comment" id="report_comment" class="textarea"></textarea>
+        <button class="button">{% trans "Comment" %}</button>
+    </forM=m>
+</div>
+
+<div class="block content">
+    <h3>{% trans "Reported statuses" %}</h3>
+    <ul>
+        {% for status in report.statuses.all %}
+        <li>{{ status.id }}</li>
+        {% endfor %}
+    </ul>
+</div>
+{% endblock %}
diff --git a/bookwyrm/templates/settings/report_preview.html b/bookwyrm/templates/settings/report_preview.html
index 63eca0fc..25cb8a2f 100644
--- a/bookwyrm/templates/settings/report_preview.html
+++ b/bookwyrm/templates/settings/report_preview.html
@@ -1,19 +1,26 @@
 {% extends 'components/card.html' %}
 {% load i18n %}
+{% load humanize %}
 {% block card-header %}
 <h2 class="card-header-title has-background-white-ter is-block">
-    <a href="{% url 'settings-report' report.id %}">report title</a>
+    <a href="{% url 'settings-report' report.id %}">{{ report.user.username }}</a>
 </h2>
 {% endblock %}
 
 {% block card-content %}
 <div class="block">
-    about this report
+    {% if report.notes %}{{ report.notes }}{% else %}<em>{% trans "No notes provided" %}</em>{% endif %}
 </div>
 {% endblock %}
 
 {% block card-footer %}
 <div class="card-footer-item">
-    footer
+    <p>{% blocktrans with username=report.reporter.display_name path=report.reporter.local_path %}Reported by <a href="{{ path }}">{{ username }}</a>{% endblocktrans %}</p>
+</div>
+<div class="card-footer-item">
+    {{ report.created_date | naturaltime }}
+</div>
+<div class="card-footer-item">
+    <button class="button">{% trans "Mark as resolved" %}</button>
 </div>
 {% endblock %}
diff --git a/bookwyrm/templates/settings/reports.html b/bookwyrm/templates/settings/reports.html
index 59fbaf56..329901ea 100644
--- a/bookwyrm/templates/settings/reports.html
+++ b/bookwyrm/templates/settings/reports.html
@@ -1,16 +1,17 @@
 {% extends 'settings/admin_layout.html' %}
 {% load i18n %}
 
+{% block title %}{% trans "Reports" %}{% endblock %}
 {% block header %}{% trans "Reports" %}{% endblock %}
 
 {% block panel %}
 <div class="tabs">
     <ul>
-        <li class="{% if filter == 'open' %}is-active{% endif %}"{% if filter == 'open' %} aria-current="page"{% endif %}>
-            <a href="{% url 'settings-reports' %}?status=open">{% trans "Open" %}</a>
+        <li class="{% if not resolved %}is-active{% endif %}"{% if not resolved == 'open' %} aria-current="page"{% endif %}>
+            <a href="{% url 'settings-reports' %}?resolved=false">{% trans "Open" %}</a>
         </li>
-        <li class="{% if filter == 'resolved' %}is-active{% endif %}"{% if filter == 'resolved' %} aria-current="page"{% endif %}>
-            <a href="{% url 'settings-reports' %}?status=closed">{% trans "Resolved" %}</a>
+        <li class="{% if resolved %}is-active{% endif %}"{% if resolved %} aria-current="page"{% endif %}>
+            <a href="{% url 'settings-reports' %}?resolved=true">{% trans "Resolved" %}</a>
         </li>
     </ul>
 </div>
diff --git a/bookwyrm/views/reports.py b/bookwyrm/views/reports.py
index 9eaf9bdc..eda56532 100644
--- a/bookwyrm/views/reports.py
+++ b/bookwyrm/views/reports.py
@@ -24,7 +24,7 @@ class Reports(View):
 
     def get(self, request):
         """ view current reports """
-        resolved = request.GET.get("resolved", False)
+        resolved = request.GET.get("resolved") == "true"
         data = {
             "resolved": resolved,
             "reports": models.Report.objects.filter(resolved=resolved),

From 0d2c641d01dc7017ebb2a45d8941569b1d5e3df5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 9 Mar 2021 12:57:38 -0800
Subject: [PATCH 0256/1285] Reformats report model

---
 .../migrations/0049_auto_20210309_0156.py     | 107 ++++++++++++++----
 bookwyrm/models/report.py                     |   7 +-
 2 files changed, 88 insertions(+), 26 deletions(-)

diff --git a/bookwyrm/migrations/0049_auto_20210309_0156.py b/bookwyrm/migrations/0049_auto_20210309_0156.py
index 494f5bc8..ae9d77a8 100644
--- a/bookwyrm/migrations/0049_auto_20210309_0156.py
+++ b/bookwyrm/migrations/0049_auto_20210309_0156.py
@@ -10,41 +10,104 @@ import django.db.models.expressions
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0048_merge_20210308_1754'),
+        ("bookwyrm", "0048_merge_20210308_1754"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='Report',
+            name="Report",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('updated_date', models.DateTimeField(auto_now=True)),
-                ('remote_id', bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id])),
-                ('note', models.TextField(blank=True, null=True)),
-                ('resolved', models.BooleanField(default=False)),
-                ('reporter', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='reporter', to=settings.AUTH_USER_MODEL)),
-                ('statuses', models.ManyToManyField(blank=True, null=True, to='bookwyrm.Status')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                ("updated_date", models.DateTimeField(auto_now=True)),
+                (
+                    "remote_id",
+                    bookwyrm.models.fields.RemoteIdField(
+                        max_length=255,
+                        null=True,
+                        validators=[bookwyrm.models.fields.validate_remote_id],
+                    ),
+                ),
+                ("note", models.TextField(blank=True, null=True)),
+                ("resolved", models.BooleanField(default=False)),
+                (
+                    "reporter",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        related_name="reporter",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "statuses",
+                    models.ManyToManyField(blank=True, null=True, to="bookwyrm.Status"),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
             ],
         ),
         migrations.CreateModel(
-            name='ReportComment',
+            name="ReportComment",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('updated_date', models.DateTimeField(auto_now=True)),
-                ('remote_id', bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id])),
-                ('note', models.TextField()),
-                ('report', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Report')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                ("updated_date", models.DateTimeField(auto_now=True)),
+                (
+                    "remote_id",
+                    bookwyrm.models.fields.RemoteIdField(
+                        max_length=255,
+                        null=True,
+                        validators=[bookwyrm.models.fields.validate_remote_id],
+                    ),
+                ),
+                ("note", models.TextField()),
+                (
+                    "report",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to="bookwyrm.Report",
+                    ),
+                ),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
         ),
         migrations.AddConstraint(
-            model_name='report',
-            constraint=models.CheckConstraint(check=models.Q(_negated=True, reporter=django.db.models.expressions.F('user')), name='self_report'),
+            model_name="report",
+            constraint=models.CheckConstraint(
+                check=models.Q(
+                    _negated=True, reporter=django.db.models.expressions.F("user")
+                ),
+                name="self_report",
+            ),
         ),
     ]
diff --git a/bookwyrm/models/report.py b/bookwyrm/models/report.py
index e1e8c2a4..3a8fdd13 100644
--- a/bookwyrm/models/report.py
+++ b/bookwyrm/models/report.py
@@ -17,13 +17,12 @@ class Report(BookWyrmModel):
 
     class Meta:
         """ don't let users report themselves """
+
         constraints = [
-            models.CheckConstraint(
-                check=~Q(reporter=F('user')),
-                name='self_report'
-            )
+            models.CheckConstraint(check=~Q(reporter=F("user")), name="self_report")
         ]
 
+
 class ReportComment(BookWyrmModel):
     """ updates on a report """
 

From 7f452066939495ee74a7f2dac129bae1c1e2d7e8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 10 Mar 2021 12:38:49 -0800
Subject: [PATCH 0257/1285] Moves moderation templates to their own directory

---
 bookwyrm/templates/{settings => moderation}/report.html       | 2 +-
 .../templates/{settings => moderation}/report_preview.html    | 0
 bookwyrm/templates/{settings => moderation}/reports.html      | 2 +-
 bookwyrm/templates/snippets/report_button.html                | 1 +
 bookwyrm/views/reports.py                                     | 4 ++--
 5 files changed, 5 insertions(+), 4 deletions(-)
 rename bookwyrm/templates/{settings => moderation}/report.html (94%)
 rename bookwyrm/templates/{settings => moderation}/report_preview.html (100%)
 rename bookwyrm/templates/{settings => moderation}/reports.html (91%)

diff --git a/bookwyrm/templates/settings/report.html b/bookwyrm/templates/moderation/report.html
similarity index 94%
rename from bookwyrm/templates/settings/report.html
rename to bookwyrm/templates/moderation/report.html
index 74c3641b..ca68d51d 100644
--- a/bookwyrm/templates/settings/report.html
+++ b/bookwyrm/templates/moderation/report.html
@@ -10,7 +10,7 @@
 </div>
 
 <div class="block">
-    {% include 'settings/report_preview.html' with report=report %}
+    {% include 'moderation/report_preview.html' with report=report %}
 </div>
 
 <div class="block content">
diff --git a/bookwyrm/templates/settings/report_preview.html b/bookwyrm/templates/moderation/report_preview.html
similarity index 100%
rename from bookwyrm/templates/settings/report_preview.html
rename to bookwyrm/templates/moderation/report_preview.html
diff --git a/bookwyrm/templates/settings/reports.html b/bookwyrm/templates/moderation/reports.html
similarity index 91%
rename from bookwyrm/templates/settings/reports.html
rename to bookwyrm/templates/moderation/reports.html
index 329901ea..ebf29a7a 100644
--- a/bookwyrm/templates/settings/reports.html
+++ b/bookwyrm/templates/moderation/reports.html
@@ -19,7 +19,7 @@
 <div class="block">
     {% for report in reports %}
     <div class="block">
-        {% include 'settings/report_preview.html' with report=report %}
+        {% include 'moderation/report_preview.html' with report=report %}
     </div>
     {% endfor %}
 </div>
diff --git a/bookwyrm/templates/snippets/report_button.html b/bookwyrm/templates/snippets/report_button.html
index 5fbaee99..9d32d5fb 100644
--- a/bookwyrm/templates/snippets/report_button.html
+++ b/bookwyrm/templates/snippets/report_button.html
@@ -3,5 +3,6 @@
     {% csrf_token %}
     <input type="hidden" name="reporter" value="{{ request.user.id }}">
     <input type="hidden" name="user" value="{{ user.id }}">
+    <input type="hidden" name="statuses" value="{{ user.id }}">
     <button class="button is-danger is-light is-small {{ class }}" type="submit">{% trans "Report" %}</button>
 </form>
diff --git a/bookwyrm/views/reports.py b/bookwyrm/views/reports.py
index eda56532..87547081 100644
--- a/bookwyrm/views/reports.py
+++ b/bookwyrm/views/reports.py
@@ -29,7 +29,7 @@ class Reports(View):
             "resolved": resolved,
             "reports": models.Report.objects.filter(resolved=resolved),
         }
-        return TemplateResponse(request, "settings/reports.html", data)
+        return TemplateResponse(request, "moderation/reports.html", data)
 
 
 @method_decorator(login_required, name="dispatch")
@@ -47,7 +47,7 @@ class Report(View):
     def get(self, request, report_id):
         """ load a report """
         data = {"report": get_object_or_404(models.Report, id=report_id)}
-        return TemplateResponse(request, "settings/report.html", data)
+        return TemplateResponse(request, "moderation/report.html", data)
 
 
 @login_required

From 965d84f86f4e9bef3eabeac6512058183229c462 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 11 Mar 2021 15:41:12 -0800
Subject: [PATCH 0258/1285] Fixes creating news works

---
 bookwyrm/templates/edit_book.html | 2 +-
 bookwyrm/views/books.py           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/edit_book.html
index 700dc570..e42f77f2 100644
--- a/bookwyrm/templates/edit_book.html
+++ b/bookwyrm/templates/edit_book.html
@@ -60,7 +60,7 @@
                 {% for match in book_matches %}
                 <label class="label"><input type="radio" name="parent_work" value="{{ match.parent_work.id }}"> {{ match.parent_work.title }}</label>
                 {% endfor %}
-                <label><input type="radio" name="parent_work"> this is a new work</label>
+                <label><input type="radio" name="parent_work" value="0"> this is a new work</label>
             </fieldset>
             {% endif %}
         </div>
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index ae60c677..9048f43d 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -203,7 +203,7 @@ class ConfirmEditBook(View):
             # create work, if needed
             if not book_id:
                 work_match = request.POST.get("parent_work")
-                if work_match:
+                if work_match and work_match != "0":
                     work = get_object_or_404(models.Work, id=work_match)
                 else:
                     work = models.Work.objects.create(title=form.cleaned_data["title"])

From c1976dbd62bf5491b4e5036e2005ddd1ba61db12 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 11 Mar 2021 16:33:49 -0800
Subject: [PATCH 0259/1285] Add multiple authors

---
 bookwyrm/templates/edit_book.html | 55 ++++++++++++++++++-------------
 bookwyrm/views/books.py           | 47 +++++++++++++++-----------
 2 files changed, 61 insertions(+), 41 deletions(-)

diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/edit_book.html
index e42f77f2..107e75c5 100644
--- a/bookwyrm/templates/edit_book.html
+++ b/bookwyrm/templates/edit_book.html
@@ -39,29 +39,37 @@
     <div class="box">
         <h2 class="title is-4">{% trans "Confirm Book Info" %}</h2>
         <div class="columns">
-            {% if author_matches.exists %}
-            <fieldset class="column is-half">
-                <legend class="label">{% blocktrans with name=add_author %}Is "{{ name }}" an existing author?{% endblocktrans %}</legend>
-                {% for match in author_matches %}
-                <label><input type="radio" name="author_match" value="{{ match.id }}" required> {{ match.name }}</label>
-                <p class="help">
-                    <a href="{{ author.local_path }}" target="_blank">{% blocktrans with book_title=match.book_set.first.title %}Author of <em>{{ book_title }}</em>{% endblocktrans %}</a>
-                </p>
+            {% if author_matches %}
+            <div class="column is-half">
+                {% for author in author_matches %}
+                <fieldset class="mb-4">
+                    <legend class="title is-5 mb-1">{% blocktrans with name=author.name %}Is "{{ name }}" an existing author?{% endblocktrans %}</legend>
+                    {% with forloop.counter as counter %}
+                    {% for match in author.matches %}
+                    <label><input type="radio" name="author_match-{{ counter }}" value="{{ match.id }}" required> {{ match.name }}</label>
+                    <p class="help">
+                        <a href="{{ author.local_path }}" target="_blank">{% blocktrans with book_title=match.book_set.first.title %}Author of <em>{{ book_title }}</em>{% endblocktrans %}</a>
+                    </p>
+                    {% endfor %}
+                    <label><input type="radio" name="author_match-{{ counter }}" value="0" required> {% trans "This is a new author" %}</label>
+                    {% endwith %}
+                </fieldset>
                 {% endfor %}
-                <label><input type="radio" name="author_match"> {% trans "This is a new author" %}</label>
-            </fieldset>
+            </div>
             {% else %}
             <p class="column is-half">{% blocktrans with name=add_author %}Creating a new author: {{ name }}{% endblocktrans %}</p>
             {% endif %}
 
             {% if not book %}
-            <fieldset class="column is-half">
-                <legend class="title is-5">{% trans "Is this an editions of an existing work?" %}</legend>
-                {% for match in book_matches %}
-                <label class="label"><input type="radio" name="parent_work" value="{{ match.parent_work.id }}"> {{ match.parent_work.title }}</label>
-                {% endfor %}
-                <label><input type="radio" name="parent_work" value="0"> this is a new work</label>
-            </fieldset>
+            <div class="column is-half">
+                <fieldset>
+                    <legend class="title is-5 mb-1">{% trans "Is this an edition of an existing work?" %}</legend>
+                    {% for match in book_matches %}
+                    <label class="label"><input type="radio" name="parent_work" value="{{ match.parent_work.id }}"> {{ match.parent_work.title }}</label>
+                    {% endfor %}
+                    <label><input type="radio" name="parent_work" value="0" required> {% trans "This is a new work" %}</label>
+                </fieldset>
+            </div>
             {% endif %}
         </div>
 
@@ -109,16 +117,19 @@
 
             <section class="block">
                 <h2 class="title is-4">{% trans "Authors" %}</h2>
+                {% if book.authors.exists %}
                 <fieldset>
                     {% for author in book.authors.all %}
-                    <p><a href="{{ author.local_path }}">{{ author.name }}</a>
-                    <label class="label">
-                        <input type="checkbox" name="remove_authors" value="{{ author.id }}"> {% trans "Remove this author" %}
+                    <label class="label mb-2">
+                        <input type="checkbox" name="remove_authors" value="{{ author.id }}" {% if author.id|stringformat:"i" in remove_authors %}checked{% endif %}>
+                        {% blocktrans with name=author.name path=author.local_path %}Remove <a href="{{ path }}">{{ name }}</a>{% endblocktrans %}
                     </label>
                     {% endfor %}
                 </fieldset>
-                <label class="label" for="id_add_author">{% trans "Add Author:" %}</label>
-                <input class="input" type="text" name="add_author" id="id_add_author" placeholder="{% trans 'John Doe' %}" value="{{ add_author }}">
+                {% endif %}
+                <label class="label" for="id_add_author">{% trans "Add Authors:" %}</label>
+                <p class="help">Separate multiple author names with commas.</p>
+                <input class="input" type="text" name="add_author" id="id_add_author" placeholder="{% trans 'John Doe, Jane Smith' %}" value="{{ add_author }}">
             </section>
         </div>
 
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 9048f43d..ff0d6764 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -131,17 +131,22 @@ class EditBook(View):
         # we're adding an author through a free text field
         if add_author:
             data["add_author"] = add_author
-            # check for existing authors
-            vector = SearchVector("name", weight="A") + SearchVector(
-                "aliases", weight="B"
-            )
+            data['author_matches'] = []
+            for author in add_author.split(','):
+                # check for existing authors
+                vector = SearchVector("name", weight="A") + SearchVector(
+                    "aliases", weight="B"
+                )
 
-            data["author_matches"] = (
-                models.Author.objects.annotate(search=vector)
-                .annotate(rank=SearchRank(vector, add_author))
-                .filter(rank__gt=0.4)
-                .order_by("-rank")[:5]
-            )
+                data["author_matches"].append({
+                    'name': author.strip(),
+                    'matches': (
+                        models.Author.objects.annotate(search=vector)
+                        .annotate(rank=SearchRank(vector, add_author))
+                        .filter(rank__gt=0.4)
+                        .order_by("-rank")[:5]
+                    )
+                })
 
         # we're creating a new book
         if not book:
@@ -157,6 +162,8 @@ class EditBook(View):
         if add_author or not book:
             # creting a book or adding an author to a book needs another step
             data["confirm_mode"] = True
+            # this isn't preserved because it isn't part of the form obj
+            data["remove_authors"] = request.POST.getlist("remove_authors")
             return TemplateResponse(request, "edit_book.html", data)
 
         remove_authors = request.POST.getlist("remove_authors")
@@ -190,15 +197,17 @@ class ConfirmEditBook(View):
 
             # get or create author as needed
             if request.POST.get("add_author"):
-                if request.POST.get("author_match"):
-                    author = get_object_or_404(
-                        models.Author, id=request.POST["author_match"]
-                    )
-                else:
-                    author = models.Author.objects.create(
-                        name=request.POST.get("add_author")
-                    )
-                book.authors.add(author)
+                for (i, author) in enumerate(request.POST.get("add_author").split(',')):
+                    match = request.POST.get("author_match-%d" % i)
+                    if match and match != "0":
+                        author = get_object_or_404(
+                            models.Author, id=request.POST["author_match-%d" % i]
+                        )
+                    else:
+                        author = models.Author.objects.create(
+                            name=author.strip()
+                        )
+                    book.authors.add(author)
 
             # create work, if needed
             if not book_id:

From 28db3e2733d57e9b7a5988e22d2e6c376587496a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 11 Mar 2021 16:40:35 -0800
Subject: [PATCH 0260/1285] Formatting

---
 bookwyrm/views/books.py | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index ff0d6764..1cb21f5e 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -131,22 +131,24 @@ class EditBook(View):
         # we're adding an author through a free text field
         if add_author:
             data["add_author"] = add_author
-            data['author_matches'] = []
-            for author in add_author.split(','):
+            data["author_matches"] = []
+            for author in add_author.split(","):
                 # check for existing authors
                 vector = SearchVector("name", weight="A") + SearchVector(
                     "aliases", weight="B"
                 )
 
-                data["author_matches"].append({
-                    'name': author.strip(),
-                    'matches': (
-                        models.Author.objects.annotate(search=vector)
-                        .annotate(rank=SearchRank(vector, add_author))
-                        .filter(rank__gt=0.4)
-                        .order_by("-rank")[:5]
-                    )
-                })
+                data["author_matches"].append(
+                    {
+                        "name": author.strip(),
+                        "matches": (
+                            models.Author.objects.annotate(search=vector)
+                            .annotate(rank=SearchRank(vector, add_author))
+                            .filter(rank__gt=0.4)
+                            .order_by("-rank")[:5]
+                        ),
+                    }
+                )
 
         # we're creating a new book
         if not book:
@@ -197,16 +199,14 @@ class ConfirmEditBook(View):
 
             # get or create author as needed
             if request.POST.get("add_author"):
-                for (i, author) in enumerate(request.POST.get("add_author").split(',')):
+                for (i, author) in enumerate(request.POST.get("add_author").split(",")):
                     match = request.POST.get("author_match-%d" % i)
                     if match and match != "0":
                         author = get_object_or_404(
                             models.Author, id=request.POST["author_match-%d" % i]
                         )
                     else:
-                        author = models.Author.objects.create(
-                            name=author.strip()
-                        )
+                        author = models.Author.objects.create(name=author.strip())
                     book.authors.add(author)
 
             # create work, if needed

From 33b8537a3d692c2dcbcab73b7c4da11958c79094 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 11 Mar 2021 17:38:21 -0800
Subject: [PATCH 0261/1285] Let user supply a note for report

---
 bookwyrm/models/report.py                     |  1 +
 bookwyrm/templates/moderation/report.html     | 10 +++--
 .../templates/moderation/report_modal.html    | 37 +++++++++++++++++++
 .../templates/moderation/report_preview.html  |  2 +-
 bookwyrm/templates/notifications.html         | 10 +----
 .../templates/snippets/report_button.html     | 16 ++++----
 .../snippets/status/status_body.html          |  9 ++++-
 .../snippets/status/status_options.html       |  4 +-
 .../templates/snippets/status_preview.html    |  9 +++++
 9 files changed, 73 insertions(+), 25 deletions(-)
 create mode 100644 bookwyrm/templates/moderation/report_modal.html
 create mode 100644 bookwyrm/templates/snippets/status_preview.html

diff --git a/bookwyrm/models/report.py b/bookwyrm/models/report.py
index 3a8fdd13..8893f42f 100644
--- a/bookwyrm/models/report.py
+++ b/bookwyrm/models/report.py
@@ -21,6 +21,7 @@ class Report(BookWyrmModel):
         constraints = [
             models.CheckConstraint(check=~Q(reporter=F("user")), name="self_report")
         ]
+        ordering = ("-created_date",)
 
 
 class ReportComment(BookWyrmModel):
diff --git a/bookwyrm/templates/moderation/report.html b/bookwyrm/templates/moderation/report.html
index ca68d51d..ce0a0b3a 100644
--- a/bookwyrm/templates/moderation/report.html
+++ b/bookwyrm/templates/moderation/report.html
@@ -32,11 +32,13 @@
     </forM=m>
 </div>
 
-<div class="block content">
-    <h3>{% trans "Reported statuses" %}</h3>
+<div class="block">
+    <h3 class="title is-4">{% trans "Reported statuses" %}</h3>
     <ul>
-        {% for status in report.statuses.all %}
-        <li>{{ status.id }}</li>
+        {% for status in report.statuses.select_subclasses.all %}
+        <li>
+            {% include 'snippets/status/status.html' with status=status moderation_mode=True %}
+        </li>
         {% endfor %}
     </ul>
 </div>
diff --git a/bookwyrm/templates/moderation/report_modal.html b/bookwyrm/templates/moderation/report_modal.html
new file mode 100644
index 00000000..28613130
--- /dev/null
+++ b/bookwyrm/templates/moderation/report_modal.html
@@ -0,0 +1,37 @@
+{% extends 'components/modal.html' %}
+{% load i18n %}
+{% load humanize %}
+
+{% block modal-title %}
+{% blocktrans with username=user.username %}Report @{{ username }}{% endblocktrans %}
+{% endblock %}
+
+{% block modal-form-open %}
+<form name="report" method="post" action="{% url 'report' %}">
+{% endblock %}
+
+{% block modal-body %}
+
+{% csrf_token %}
+<input type="hidden" name="reporter" value="{{ reporter.id }}">
+<input type="hidden" name="user" value="{{ user.id }}">
+<input type="hidden" name="statuses" value="{{ status.id }}">
+
+<section class="content">
+    <p>{% blocktrans with site_name=site.name %}This report will be sent to {{ site_name }}'s moderators for review.{% endblocktrans %}</p>
+    <label class="label" for="id_{{ controls_uid}}_report_note">{% trans "More info about this report:" %}</label>
+    <textarea class="textarea" name="note" id="id_{{ controls_uid }}_report_note"></textarea>
+</section>
+
+{% endblock %}
+
+
+{% block modal-footer %}
+
+<button class="button is-success" type="submit">{% trans "Submit" %}</button>
+{% trans "Cancel" as button_text %}
+{% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="report" controls_uid=report_uuid class="" %}
+
+{% endblock %}
+{% block modal-form-close %}</form>{% endblock %}
+
diff --git a/bookwyrm/templates/moderation/report_preview.html b/bookwyrm/templates/moderation/report_preview.html
index 25cb8a2f..9acc4f77 100644
--- a/bookwyrm/templates/moderation/report_preview.html
+++ b/bookwyrm/templates/moderation/report_preview.html
@@ -9,7 +9,7 @@
 
 {% block card-content %}
 <div class="block">
-    {% if report.notes %}{{ report.notes }}{% else %}<em>{% trans "No notes provided" %}</em>{% endif %}
+    {% if report.note %}{{ report.note }}{% else %}<em>{% trans "No notes provided" %}</em>{% endif %}
 </div>
 {% endblock %}
 
diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html
index 80ee2250..3f0300bd 100644
--- a/bookwyrm/templates/notifications.html
+++ b/bookwyrm/templates/notifications.html
@@ -115,15 +115,7 @@
                     <div class="notification py-2 {% if notification.id in unread %}is-primary is-light{% else %}has-background-white{% if notification.notification_type == 'REPLY' or notification.notification_type == 'MENTION' %} has-text-black{% else %}-bis has-text-grey-dark{% endif %}{% endif %}">
                         <div class="columns">
                             <div class="column">
-                                {% if related_status.content %}
-                                <a href="{{ related_status.local_path }}">
-                                    {{ related_status.content | safe | truncatewords_html:10 }}{% if related_status.mention_books %} <em>{{ related_status.mention_books.first.title }}</em>{% endif %}
-                                </a>
-                                {% elif related_status.quote %}
-                                <a href="{{ related_status.local_path }}">{{ related_status.quote | safe | truncatewords_html:10 }}</a>
-                                {% elif related_status.rating %}
-                                {% include 'snippets/stars.html' with rating=related_status.rating %}
-                                {% endif %}
+                                {% include 'snippets/status_preview.html' with status=related_status %}
                             </div>
                             <div class="column is-narrow {% if notification.notification_type == 'REPLY' or notification.notification_type == 'MENTION' %}has-text-black{% else %}has-text-grey-dark{% endif %}">
                                 {{ related_status.published_date | post_date }}
diff --git a/bookwyrm/templates/snippets/report_button.html b/bookwyrm/templates/snippets/report_button.html
index 9d32d5fb..2fa0a3f3 100644
--- a/bookwyrm/templates/snippets/report_button.html
+++ b/bookwyrm/templates/snippets/report_button.html
@@ -1,8 +1,10 @@
 {% load i18n %}
-<form name="report" method="post" action="{% url 'report' %}">
-    {% csrf_token %}
-    <input type="hidden" name="reporter" value="{{ request.user.id }}">
-    <input type="hidden" name="user" value="{{ user.id }}">
-    <input type="hidden" name="statuses" value="{{ user.id }}">
-    <button class="button is-danger is-light is-small {{ class }}" type="submit">{% trans "Report" %}</button>
-</form>
+{% load bookwyrm_tags %}
+{% with 0|uuid as report_uuid %}
+
+{% trans "Report" as button_text %}
+{% include 'snippets/toggle/toggle_button.html' with class="is-danger is-light is-small is-fullwidth" text=button_text controls_text="report" controls_uid=report_uuid focus="modal-title-report" disabled=is_current %}
+
+{% include 'moderation/report_modal.html' with user=user reporter=request.user controls_text="report" controls_uid=report_uuid %}
+
+{% endwith %}
diff --git a/bookwyrm/templates/snippets/status/status_body.html b/bookwyrm/templates/snippets/status/status_body.html
index 8d6c21ed..f3732d1a 100644
--- a/bookwyrm/templates/snippets/status/status_body.html
+++ b/bookwyrm/templates/snippets/status/status_body.html
@@ -18,7 +18,10 @@
 
 {% block card-footer %}
 <div class="card-footer-item">
-    {% if request.user.is_authenticated %}
+    {% if moderation_mode and perms.bookwyrm.moderate_post %}
+    {# moderation options #}
+    <button class="button is-danger is-light">{% trans "Delete status" %}</button>
+    {% elif request.user.is_authenticated %}
     <div class="field has-addons">
         <div class="control">
             {% trans "Reply" as button_text %}
@@ -56,14 +59,16 @@
 <div class="card-footer-item">
     <a href="{{ status.remote_id }}">{{ status.published_date | post_date }}</a>
 </div>
+{% if not moderation_mode %}
 <div class="card-footer-item">
     {% include 'snippets/status/status_options.html' with class="is-small" right=True %}
 </div>
+{% endif %}
 {% endblock %}
 
 
 {% block card-bonus %}
-{% if request.user.is_authenticated %}
+{% if request.user.is_authenticated and not moderation_mode %}
 {% with status.id|uuid as uuid %}
 <section class="hidden" id="show-comment-{{ status.id }}">
     <div class="card-footer">
diff --git a/bookwyrm/templates/snippets/status/status_options.html b/bookwyrm/templates/snippets/status/status_options.html
index f703ba6e..3c710055 100644
--- a/bookwyrm/templates/snippets/status/status_options.html
+++ b/bookwyrm/templates/snippets/status/status_options.html
@@ -22,10 +22,10 @@
 {% else %}
 {# things you can do to other people's statuses #}
 <li role="menuitem">
-    <a href="/direct-messages/{{ status.user|username }}" class="button is-fullwidth is-small">{% trans "Send direct message" %}</a>
+    <a href="/direct-messages/{{ status.user|username }}" class="button is-small is-fullwidth">{% trans "Send direct message" %}</a>
 </li>
 <li role="menuitem">
-    {% include 'snippets/report_button.html' with user=status.user class="is-fullwidth" %}
+    {% include 'snippets/report_button.html' with user=status.user status=status %}
 </li>
 <li role="menuitem">
     {% include 'snippets/block_button.html' with user=status.user class="is-fullwidth" %}
diff --git a/bookwyrm/templates/snippets/status_preview.html b/bookwyrm/templates/snippets/status_preview.html
new file mode 100644
index 00000000..b1eb3eca
--- /dev/null
+++ b/bookwyrm/templates/snippets/status_preview.html
@@ -0,0 +1,9 @@
+{% if status.content %}
+<a href="{{ status.local_path }}">
+    {{ status.content | safe | truncatewords_html:10 }}{% if status.mention_books %} <em>{{ status.mention_books.first.title }}</em>{% endif %}
+</a>
+{% elif status.quote %}
+<a href="{{ status.local_path }}">{{ status.quote | safe | truncatewords_html:10 }}</a>
+{% elif status.rating %}
+{% include 'snippets/stars.html' with rating=status.rating %}
+{% endif %}

From 4583662f51935097f577fb3a0c436cdb5fa28373 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 11 Mar 2021 17:45:41 -0800
Subject: [PATCH 0262/1285] Whitespace for so accesslint can clap at me every
 time I commit

---
 bookwyrm/templates/moderation/report_modal.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/moderation/report_modal.html b/bookwyrm/templates/moderation/report_modal.html
index 28613130..ce8408ee 100644
--- a/bookwyrm/templates/moderation/report_modal.html
+++ b/bookwyrm/templates/moderation/report_modal.html
@@ -19,7 +19,7 @@
 
 <section class="content">
     <p>{% blocktrans with site_name=site.name %}This report will be sent to {{ site_name }}'s moderators for review.{% endblocktrans %}</p>
-    <label class="label" for="id_{{ controls_uid}}_report_note">{% trans "More info about this report:" %}</label>
+    <label class="label" for="id_{{ controls_uid }}_report_note">{% trans "More info about this report:" %}</label>
     <textarea class="textarea" name="note" id="id_{{ controls_uid }}_report_note"></textarea>
 </section>
 

From b42c761b0b986402c973d53697e937cd692e1adf Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 12 Mar 2021 09:46:28 -0800
Subject: [PATCH 0263/1285] Safer author add logic

---
 bookwyrm/templates/edit_book.html | 6 ++++--
 bookwyrm/views/books.py           | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/edit_book.html
index 107e75c5..61f04e37 100644
--- a/bookwyrm/templates/edit_book.html
+++ b/bookwyrm/templates/edit_book.html
@@ -74,7 +74,9 @@
         </div>
 
         <button class="button is-primary" type="submit">{% trans "Confirm" %}</button>
-        <button class="button" type="button">{% trans "Back" %}</button>
+        <a href="#" class="button" data-back>
+            <span>{% trans "Back" %}</span>
+        </a>
     </div>
 
     <hr class="block">
@@ -129,7 +131,7 @@
                 {% endif %}
                 <label class="label" for="id_add_author">{% trans "Add Authors:" %}</label>
                 <p class="help">Separate multiple author names with commas.</p>
-                <input class="input" type="text" name="add_author" id="id_add_author" placeholder="{% trans 'John Doe, Jane Smith' %}" value="{{ add_author }}">
+                <input class="input" type="text" name="add_author" id="id_add_author" placeholder="{% trans 'John Doe, Jane Smith' %}" value="{{ add_author }}" {% if confirm_mode %}readonly{% endif %}>
             </section>
         </div>
 
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 1cb21f5e..0a11b87c 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -133,6 +133,8 @@ class EditBook(View):
             data["add_author"] = add_author
             data["author_matches"] = []
             for author in add_author.split(","):
+                if not author:
+                    continue
                 # check for existing authors
                 vector = SearchVector("name", weight="A") + SearchVector(
                     "aliases", weight="B"
@@ -200,6 +202,8 @@ class ConfirmEditBook(View):
             # get or create author as needed
             if request.POST.get("add_author"):
                 for (i, author) in enumerate(request.POST.get("add_author").split(",")):
+                    if not author:
+                        continue
                     match = request.POST.get("author_match-%d" % i)
                     if match and match != "0":
                         author = get_object_or_404(

From bedc9e0a88e6e8d36f096eb7c94e3768918bc5f2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 12 Mar 2021 10:22:03 -0800
Subject: [PATCH 0264/1285] Resolve and re-open reports

---
 .../templates/moderation/report_preview.html  | 11 +++++++++-
 bookwyrm/tests/views/test_reports.py          | 20 ++++++++++++++++++-
 bookwyrm/urls.py                              |  5 +++++
 bookwyrm/views/__init__.py                    |  2 +-
 bookwyrm/views/reports.py                     | 15 ++++++++++++++
 5 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/moderation/report_preview.html b/bookwyrm/templates/moderation/report_preview.html
index 9acc4f77..3888be27 100644
--- a/bookwyrm/templates/moderation/report_preview.html
+++ b/bookwyrm/templates/moderation/report_preview.html
@@ -21,6 +21,15 @@
     {{ report.created_date | naturaltime }}
 </div>
 <div class="card-footer-item">
-    <button class="button">{% trans "Mark as resolved" %}</button>
+    <form name="resolve" method="post" action="{% url 'settings-report-resolve' report.id %}">
+        {% csrf_token %}
+        <button class="button" type="submit">
+            {% if report.resolved %}
+            {% trans "Re-open" %}
+            {% else %}
+            {% trans "Resolve" %}
+            {% endif %}
+        </button>
+    </form>
 </div>
 {% endblock %}
diff --git a/bookwyrm/tests/views/test_reports.py b/bookwyrm/tests/views/test_reports.py
index 70414dcb..1a5bfd15 100644
--- a/bookwyrm/tests/views/test_reports.py
+++ b/bookwyrm/tests/views/test_reports.py
@@ -46,7 +46,7 @@ class ReportViews(TestCase):
         request = self.factory.get("")
         request.user = self.local_user
         request.user.is_superuser = True
-        report = models.Report.objects.create(reporter=self.local_user, user=self.rat)
+        models.Report.objects.create(reporter=self.local_user, user=self.rat)
 
         result = view(request)
         self.assertIsInstance(result, TemplateResponse)
@@ -80,3 +80,21 @@ class ReportViews(TestCase):
         report = models.Report.objects.get()
         self.assertEqual(report.reporter, self.local_user)
         self.assertEqual(report.user, self.rat)
+
+    def test_resolve_report(self):
+        """ toggle report resolution status """
+        report = models.Report.objects.create(reporter=self.local_user, user=self.rat)
+        self.assertFalse(report.resolved)
+        request = self.factory.post("")
+        request.user = self.local_user
+        request.user.is_superuser = True
+
+        # resolve
+        views.resolve_report(request, report.id)
+        report.refresh_from_db()
+        self.assertTrue(report.resolved)
+
+        # un-resolve
+        views.resolve_report(request, report.id)
+        report.refresh_from_db()
+        self.assertFalse(report.resolved)
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 42b9803d..551be1e3 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -62,6 +62,11 @@ urlpatterns = [
         views.Report.as_view(),
         name="settings-report",
     ),
+    re_path(
+        r"^settings/reports/(?P<report_id>\d+)/resolve/?$",
+        views.resolve_report,
+        name="settings-report-resolve",
+    ),
     re_path(r"^report/?$", views.make_report, name="report"),
     # landing pages
     re_path(r"^about/?$", views.About.as_view()),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index b433dca2..63ab98e5 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -20,7 +20,7 @@ from .notifications import Notifications
 from .outbox import Outbox
 from .reading import edit_readthrough, create_readthrough, delete_readthrough
 from .reading import start_reading, finish_reading, delete_progressupdate
-from .reports import Report, Reports, make_report
+from .reports import Report, Reports, make_report, resolve_report
 from .rss_feed import RssFeed
 from .password import PasswordResetRequest, PasswordReset, ChangePassword
 from .search import Search
diff --git a/bookwyrm/views/reports.py b/bookwyrm/views/reports.py
index 87547081..59b9b9e4 100644
--- a/bookwyrm/views/reports.py
+++ b/bookwyrm/views/reports.py
@@ -49,6 +49,21 @@ class Report(View):
         data = {"report": get_object_or_404(models.Report, id=report_id)}
         return TemplateResponse(request, "moderation/report.html", data)
 
+    def post(self, request, report_id):
+        """ update a report """
+
+
+@login_required
+@permission_required("bookwyrm_moderate_post")
+def resolve_report(_, report_id):
+    """ mark a report as (un)resolved """
+    report = get_object_or_404(models.Report, id=report_id)
+    report.resolved = not report.resolved
+    report.save()
+    if not report.resolved:
+        return redirect("settings-report", report.id)
+    return redirect("settings-reports")
+
 
 @login_required
 @require_POST

From 8bd12f0e062337a5bfeb6b103f7d36ab8498ab61 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 12 Mar 2021 10:27:08 -0800
Subject: [PATCH 0265/1285] Remove unused method

---
 bookwyrm/views/reports.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bookwyrm/views/reports.py b/bookwyrm/views/reports.py
index 59b9b9e4..ad22da2b 100644
--- a/bookwyrm/views/reports.py
+++ b/bookwyrm/views/reports.py
@@ -49,9 +49,6 @@ class Report(View):
         data = {"report": get_object_or_404(models.Report, id=report_id)}
         return TemplateResponse(request, "moderation/report.html", data)
 
-    def post(self, request, report_id):
-        """ update a report """
-
 
 @login_required
 @permission_required("bookwyrm_moderate_post")

From 422cd2da73c7583a1383bb6f5722295711fd8eb5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 12 Mar 2021 10:37:52 -0800
Subject: [PATCH 0266/1285] Direct message report action

---
 bookwyrm/templates/moderation/report.html              | 2 +-
 bookwyrm/templates/snippets/status/status_options.html | 2 +-
 bookwyrm/urls.py                                       | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/moderation/report.html b/bookwyrm/templates/moderation/report.html
index ce0a0b3a..32fdf6d7 100644
--- a/bookwyrm/templates/moderation/report.html
+++ b/bookwyrm/templates/moderation/report.html
@@ -16,7 +16,7 @@
 <div class="block content">
     <h3>{% trans "Actions" %}</h3>
     <div class="field is-grouped">
-        <button class="button">Direct message</button>
+        <a class="button" href="{% url 'direct-messages-user' report.user.username %}">{% trans "Send direct message" %}</a>
         <button class="button">Suspend</button>
     </div>
 
diff --git a/bookwyrm/templates/snippets/status/status_options.html b/bookwyrm/templates/snippets/status/status_options.html
index 3c710055..6f0ca2e6 100644
--- a/bookwyrm/templates/snippets/status/status_options.html
+++ b/bookwyrm/templates/snippets/status/status_options.html
@@ -22,7 +22,7 @@
 {% else %}
 {# things you can do to other people's statuses #}
 <li role="menuitem">
-    <a href="/direct-messages/{{ status.user|username }}" class="button is-small is-fullwidth">{% trans "Send direct message" %}</a>
+    <a href="{% url 'direct-messages-user' status.user|username %}" class="button is-small is-fullwidth">{% trans "Send direct message" %}</a>
 </li>
 <li role="menuitem">
     {% include 'snippets/report_button.html' with user=status.user status=status %}
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 551be1e3..0ad464f4 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -75,10 +75,13 @@ urlpatterns = [
     re_path(r"^notifications/?$", views.Notifications.as_view()),
     # feeds
     re_path(r"^(?P<tab>home|local|federated)/?$", views.Feed.as_view()),
-    re_path(r"^direct-messages/?$", views.DirectMessage.as_view()),
+    re_path(
+        r"^direct-messages/?$", views.DirectMessage.as_view(), name="direct-messages"
+    ),
     re_path(
         r"^direct-messages/(?P<username>%s)?$" % regex.username,
         views.DirectMessage.as_view(),
+        name="direct-messages-user",
     ),
     # search
     re_path(r"^search/?$", views.Search.as_view()),

From 677a49fee31cc2fe0e24848ea05cbe9a9f3ff63f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 12 Mar 2021 11:13:53 -0800
Subject: [PATCH 0267/1285] Option to deactivate reported users

---
 bookwyrm/templates/moderation/report.html     | 15 ++++++++++++---
 .../templates/moderation/report_preview.html  |  7 +++++--
 bookwyrm/tests/views/test_reports.py          | 19 +++++++++++++++++++
 bookwyrm/urls.py                              |  5 +++++
 bookwyrm/views/__init__.py                    |  2 +-
 bookwyrm/views/reports.py                     | 10 ++++++++++
 6 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/templates/moderation/report.html b/bookwyrm/templates/moderation/report.html
index 32fdf6d7..b2e61cc4 100644
--- a/bookwyrm/templates/moderation/report.html
+++ b/bookwyrm/templates/moderation/report.html
@@ -15,9 +15,18 @@
 
 <div class="block content">
     <h3>{% trans "Actions" %}</h3>
-    <div class="field is-grouped">
-        <a class="button" href="{% url 'direct-messages-user' report.user.username %}">{% trans "Send direct message" %}</a>
-        <button class="button">Suspend</button>
+    <div class="is-flex">
+        <p class="mr-1">
+            <a class="button" href="{% url 'direct-messages-user' report.user.username %}">{% trans "Send direct message" %}</a>
+        </p>
+        <form name="deactivate" method="post" action="{% url 'settings-report-deactivate' report.id  %}">
+            {% csrf_token %}
+            {% if report.user.is_active %}
+            <button type="submit" class="button is-danger is-light">{% trans "Deactivate user" %}</button>
+            {% else %}
+            <button class="button">{% trans "Reactivate user" %}</button>
+            {% endif %}
+        </form>
     </div>
 
     {% for comment in report.reportcomment_set.all %}
diff --git a/bookwyrm/templates/moderation/report_preview.html b/bookwyrm/templates/moderation/report_preview.html
index 3888be27..c35010cf 100644
--- a/bookwyrm/templates/moderation/report_preview.html
+++ b/bookwyrm/templates/moderation/report_preview.html
@@ -8,8 +8,11 @@
 {% endblock %}
 
 {% block card-content %}
-<div class="block">
-    {% if report.note %}{{ report.note }}{% else %}<em>{% trans "No notes provided" %}</em>{% endif %}
+<div class="block content">
+    <p>
+        {% if report.note %}{{ report.note }}{% else %}<em>{% trans "No notes provided" %}</em>{% endif %}
+    </p>
+    <p><a href="{{ report.user.local_path }}">{% trans "View user profile" %}</a></p>
 </div>
 {% endblock %}
 
diff --git a/bookwyrm/tests/views/test_reports.py b/bookwyrm/tests/views/test_reports.py
index 1a5bfd15..724e7b5a 100644
--- a/bookwyrm/tests/views/test_reports.py
+++ b/bookwyrm/tests/views/test_reports.py
@@ -98,3 +98,22 @@ class ReportViews(TestCase):
         views.resolve_report(request, report.id)
         report.refresh_from_db()
         self.assertFalse(report.resolved)
+
+
+    def test_deactivate_user(self):
+        """ toggle whether a user is able to log in """
+        self.assertTrue(self.rat.is_active)
+        report = models.Report.objects.create(reporter=self.local_user, user=self.rat)
+        request = self.factory.post("")
+        request.user = self.local_user
+        request.user.is_superuser = True
+
+        # resolve
+        views.deactivate_user(request, report.id)
+        self.rat.refresh_from_db()
+        self.assertFalse(self.rat.is_active)
+
+        # un-resolve
+        views.deactivate_user(request, report.id)
+        self.rat.refresh_from_db()
+        self.assertTrue(self.rat.is_active)
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 0ad464f4..26ce67a3 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -62,6 +62,11 @@ urlpatterns = [
         views.Report.as_view(),
         name="settings-report",
     ),
+    re_path(
+        r"^settings/reports/(?P<report_id>\d+)/deactivate/?$",
+        views.deactivate_user,
+        name="settings-report-deactivate",
+    ),
     re_path(
         r"^settings/reports/(?P<report_id>\d+)/resolve/?$",
         views.resolve_report,
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 63ab98e5..606624b8 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -20,7 +20,7 @@ from .notifications import Notifications
 from .outbox import Outbox
 from .reading import edit_readthrough, create_readthrough, delete_readthrough
 from .reading import start_reading, finish_reading, delete_progressupdate
-from .reports import Report, Reports, make_report, resolve_report
+from .reports import Report, Reports, make_report, resolve_report, deactivate_user
 from .rss_feed import RssFeed
 from .password import PasswordResetRequest, PasswordReset, ChangePassword
 from .search import Search
diff --git a/bookwyrm/views/reports.py b/bookwyrm/views/reports.py
index ad22da2b..2ba0d27a 100644
--- a/bookwyrm/views/reports.py
+++ b/bookwyrm/views/reports.py
@@ -50,6 +50,16 @@ class Report(View):
         return TemplateResponse(request, "moderation/report.html", data)
 
 
+@login_required
+@permission_required("bookwyrm_moderate_user")
+def deactivate_user(_, report_id):
+    """ mark an account as inactive """
+    report = get_object_or_404(models.Report, id=report_id)
+    report.user.is_active = not report.user.is_active
+    report.user.save()
+    return redirect("settings-report", report.id)
+
+
 @login_required
 @permission_required("bookwyrm_moderate_post")
 def resolve_report(_, report_id):

From 8c74beb78cec60bf44723661b2b6dd2ed5304a3a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 12 Mar 2021 11:25:56 -0800
Subject: [PATCH 0268/1285] Allow moderators to delete reported statuses

---
 bookwyrm/templates/moderation/report.html     |  5 +++
 .../templates/moderation/report_preview.html  |  1 -
 .../snippets/status/status_body.html          |  9 ++++-
 bookwyrm/tests/views/test_reports.py          |  1 -
 bookwyrm/tests/views/test_status.py           | 34 ++++++++++++++++++-
 bookwyrm/views/status.py                      |  2 +-
 6 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/templates/moderation/report.html b/bookwyrm/templates/moderation/report.html
index b2e61cc4..ae014d68 100644
--- a/bookwyrm/templates/moderation/report.html
+++ b/bookwyrm/templates/moderation/report.html
@@ -15,6 +15,7 @@
 
 <div class="block content">
     <h3>{% trans "Actions" %}</h3>
+    <p><a href="{{ report.user.local_path }}">{% trans "View user profile" %}</a></p>
     <div class="is-flex">
         <p class="mr-1">
             <a class="button" href="{% url 'direct-messages-user' report.user.username %}">{% trans "Send direct message" %}</a>
@@ -46,7 +47,11 @@
     <ul>
         {% for status in report.statuses.select_subclasses.all %}
         <li>
+            {% if status.deleted %}
+            <em>{% trans "Statuses has been deleted" %}</em>
+            {% else %}
             {% include 'snippets/status/status.html' with status=status moderation_mode=True %}
+            {% endif %}
         </li>
         {% endfor %}
     </ul>
diff --git a/bookwyrm/templates/moderation/report_preview.html b/bookwyrm/templates/moderation/report_preview.html
index c35010cf..3a5ebcf9 100644
--- a/bookwyrm/templates/moderation/report_preview.html
+++ b/bookwyrm/templates/moderation/report_preview.html
@@ -12,7 +12,6 @@
     <p>
         {% if report.note %}{{ report.note }}{% else %}<em>{% trans "No notes provided" %}</em>{% endif %}
     </p>
-    <p><a href="{{ report.user.local_path }}">{% trans "View user profile" %}</a></p>
 </div>
 {% endblock %}
 
diff --git a/bookwyrm/templates/snippets/status/status_body.html b/bookwyrm/templates/snippets/status/status_body.html
index f3732d1a..a7e8e884 100644
--- a/bookwyrm/templates/snippets/status/status_body.html
+++ b/bookwyrm/templates/snippets/status/status_body.html
@@ -19,8 +19,15 @@
 {% block card-footer %}
 <div class="card-footer-item">
     {% if moderation_mode and perms.bookwyrm.moderate_post %}
+
     {# moderation options #}
-    <button class="button is-danger is-light">{% trans "Delete status" %}</button>
+    <form class="dropdown-item pt-0 pb-0" name="delete-{{status.id}}" action="/delete-status/{{ status.id }}" method="post">
+        {% csrf_token %}
+        <button class="button is-danger is-light" type="submit">
+            {% trans "Delete status" %}
+        </button>
+    </form>
+
     {% elif request.user.is_authenticated %}
     <div class="field has-addons">
         <div class="control">
diff --git a/bookwyrm/tests/views/test_reports.py b/bookwyrm/tests/views/test_reports.py
index 724e7b5a..98d28acd 100644
--- a/bookwyrm/tests/views/test_reports.py
+++ b/bookwyrm/tests/views/test_reports.py
@@ -99,7 +99,6 @@ class ReportViews(TestCase):
         report.refresh_from_db()
         self.assertFalse(report.resolved)
 
-
     def test_deactivate_user(self):
         """ toggle whether a user is able to log in """
         self.assertTrue(self.rat.is_active)
diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py
index 7fdc0e06..32080a5a 100644
--- a/bookwyrm/tests/views/test_status.py
+++ b/bookwyrm/tests/views/test_status.py
@@ -216,7 +216,7 @@ class StatusViews(TestCase):
             '<a href="%s">'
             "archive.org/details/dli.granth.72113/page/n25/mode/2up</a>" % url,
         )
-        url = "https://openlibrary.org/search" "?q=arkady+strugatsky&mode=everything"
+        url = "https://openlibrary.org/search?q=arkady+strugatsky&mode=everything"
         self.assertEqual(
             views.status.format_links(url),
             '<a href="%s">openlibrary.org/search'
@@ -253,3 +253,35 @@ class StatusViews(TestCase):
             self.assertEqual(activity["object"]["type"], "Tombstone")
         status.refresh_from_db()
         self.assertTrue(status.deleted)
+
+    def test_handle_delete_status_permission_denied(self):
+        """ marks a status as deleted """
+        view = views.DeleteStatus.as_view()
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            status = models.Status.objects.create(user=self.local_user, content="hi")
+        self.assertFalse(status.deleted)
+        request = self.factory.post("")
+        request.user = self.remote_user
+
+        view(request, status.id)
+
+        status.refresh_from_db()
+        self.assertFalse(status.deleted)
+
+    def test_handle_delete_status_moderator(self):
+        """ marks a status as deleted """
+        view = views.DeleteStatus.as_view()
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            status = models.Status.objects.create(user=self.local_user, content="hi")
+        self.assertFalse(status.deleted)
+        request = self.factory.post("")
+        request.user = self.remote_user
+        request.user.is_superuser = True
+
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
+            view(request, status.id)
+            activity = json.loads(mock.call_args_list[0][0][1])
+            self.assertEqual(activity["type"], "Delete")
+            self.assertEqual(activity["object"]["type"], "Tombstone")
+        status.refresh_from_db()
+        self.assertTrue(status.deleted)
diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py
index 8cc5df69..0cb5974b 100644
--- a/bookwyrm/views/status.py
+++ b/bookwyrm/views/status.py
@@ -75,7 +75,7 @@ class DeleteStatus(View):
         status = get_object_or_404(models.Status, id=status_id)
 
         # don't let people delete other people's statuses
-        if status.user != request.user:
+        if status.user != request.user and not request.user.has_perm("moderate_post"):
             return HttpResponseBadRequest()
 
         # perform deletion

From 46581e37e2b34d78679fcb2e58d0a1e2b75b125d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 12 Mar 2021 15:24:57 -0800
Subject: [PATCH 0269/1285] Mocks boradcast for moderation test

---
 bookwyrm/tests/views/test_reports.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/tests/views/test_reports.py b/bookwyrm/tests/views/test_reports.py
index 98d28acd..d181febc 100644
--- a/bookwyrm/tests/views/test_reports.py
+++ b/bookwyrm/tests/views/test_reports.py
@@ -1,4 +1,5 @@
 """ test for app action functionality """
+from unittest.mock import patch
 from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
@@ -107,12 +108,14 @@ class ReportViews(TestCase):
         request.user = self.local_user
         request.user.is_superuser = True
 
-        # resolve
-        views.deactivate_user(request, report.id)
+        # de-activate
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            views.deactivate_user(request, report.id)
         self.rat.refresh_from_db()
         self.assertFalse(self.rat.is_active)
 
-        # un-resolve
-        views.deactivate_user(request, report.id)
+        # re-activate
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            views.deactivate_user(request, report.id)
         self.rat.refresh_from_db()
         self.assertTrue(self.rat.is_active)

From 9245b9d9caeccba90c7b7afb62af1269d6ffca59 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 12 Mar 2021 15:56:54 -0800
Subject: [PATCH 0270/1285] Comments on reports

---
 bookwyrm/models/report.py                 |  5 +++++
 bookwyrm/templates/moderation/report.html | 23 ++++++++++++++++++-----
 bookwyrm/views/reports.py                 | 14 +++++++++++++-
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/models/report.py b/bookwyrm/models/report.py
index 8893f42f..a1e17eb2 100644
--- a/bookwyrm/models/report.py
+++ b/bookwyrm/models/report.py
@@ -30,3 +30,8 @@ class ReportComment(BookWyrmModel):
     user = models.ForeignKey("User", on_delete=models.PROTECT)
     note = models.TextField()
     report = models.ForeignKey(Report, on_delete=models.PROTECT)
+
+    class Meta:
+        """ sort comments """
+
+        ordering = ("-created_date",)
diff --git a/bookwyrm/templates/moderation/report.html b/bookwyrm/templates/moderation/report.html
index ae014d68..d2769544 100644
--- a/bookwyrm/templates/moderation/report.html
+++ b/bookwyrm/templates/moderation/report.html
@@ -1,5 +1,6 @@
 {% extends 'settings/admin_layout.html' %}
 {% load i18n %}
+{% load humanize %}
 
 {% block title %}{% blocktrans with report_id=report.id %}Report #{{ report_id }}{% endblocktrans %}{% endblock %}
 {% block header %}{% blocktrans with report_id=report.id %}Report #{{ report_id }}{% endblocktrans %}{% endblock %}
@@ -29,17 +30,29 @@
             {% endif %}
         </form>
     </div>
+</div>
 
+<div class="block">
+    <h3 class="title is-4">{% trans "Moderator Comments" %}</h3>
     {% for comment in report.reportcomment_set.all %}
-    <div class="block">
-        {{ comment }}
+    <div class="card block">
+        <p class="card-content">{{ comment.note }}</p>
+        <div class="card-footer">
+            <div class="card-footer-item">
+                <a href="{{ comment.user.local_path }}">{{ comment.user.display_name }}</a>
+            </div>
+            <div class="card-footer-item">
+                {{ comment.created_date | naturaltime }}
+            </div>
+        </div>
     </div>
     {% endfor %}
-    <form>
+    <form class="block" name="report-comment" method="post" action="{% url 'settings-report' report.id %}">
+        {% csrf_token %}
         <label for="report_comment" class="label">Comment on report</label>
-        <textarea name="comment" id="report_comment" class="textarea"></textarea>
+        <textarea name="note" id="report_comment" class="textarea"></textarea>
         <button class="button">{% trans "Comment" %}</button>
-    </forM=m>
+    </form>
 </div>
 
 <div class="block">
diff --git a/bookwyrm/views/reports.py b/bookwyrm/views/reports.py
index 2ba0d27a..06909cf1 100644
--- a/bookwyrm/views/reports.py
+++ b/bookwyrm/views/reports.py
@@ -46,9 +46,21 @@ class Report(View):
 
     def get(self, request, report_id):
         """ load a report """
-        data = {"report": get_object_or_404(models.Report, id=report_id)}
+        data = {
+            "report": get_object_or_404(models.Report, id=report_id),
+        }
         return TemplateResponse(request, "moderation/report.html", data)
 
+    def post(self, request, report_id):
+        """ comment on a report """
+        report = get_object_or_404(models.Report, id=report_id)
+        models.ReportComment.objects.create(
+            user=request.user,
+            report=report,
+            note=request.POST.get("note"),
+        )
+        return redirect("settings-report", report.id)
+
 
 @login_required
 @permission_required("bookwyrm_moderate_user")

From 7323f638032771ce04b97a6ceb186a0a4ecf2626 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 12 Mar 2021 16:02:23 -0800
Subject: [PATCH 0271/1285] Adds test for report comments

---
 bookwyrm/tests/views/test_reports.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/bookwyrm/tests/views/test_reports.py b/bookwyrm/tests/views/test_reports.py
index d181febc..1c56067a 100644
--- a/bookwyrm/tests/views/test_reports.py
+++ b/bookwyrm/tests/views/test_reports.py
@@ -68,6 +68,21 @@ class ReportViews(TestCase):
         result.render()
         self.assertEqual(result.status_code, 200)
 
+    def test_report_comment(self):
+        """ comment on a report """
+        view = views.Report.as_view()
+        request = self.factory.post("", {"note": "hi"})
+        request.user = self.local_user
+        request.user.is_superuser = True
+        report = models.Report.objects.create(reporter=self.local_user, user=self.rat)
+
+        view(request, report.id)
+
+        comment = models.ReportComment.objects.get()
+        self.assertEqual(comment.user, self.local_user)
+        self.assertEqual(comment.note, "hi")
+        self.assertEqual(comment.report, report)
+
     def test_make_report(self):
         """ a user reports another user """
         form = forms.ReportForm()

From 1617cfaac71b680e0d4dd264718934776d9a3725 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 12 Mar 2021 16:20:10 -0800
Subject: [PATCH 0272/1285] Clarifies report headers in moderation panel

---
 bookwyrm/templates/moderation/report.html         | 8 ++++++--
 bookwyrm/templates/moderation/report_preview.html | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/moderation/report.html b/bookwyrm/templates/moderation/report.html
index d2769544..a231c41c 100644
--- a/bookwyrm/templates/moderation/report.html
+++ b/bookwyrm/templates/moderation/report.html
@@ -2,8 +2,8 @@
 {% load i18n %}
 {% load humanize %}
 
-{% block title %}{% blocktrans with report_id=report.id %}Report #{{ report_id }}{% endblocktrans %}{% endblock %}
-{% block header %}{% blocktrans with report_id=report.id %}Report #{{ report_id }}{% endblocktrans %}{% endblock %}
+{% block title %}{% blocktrans with report_id=report.id username=report.user.username %}Report #{{ report_id }}: {{ username }}{% endblocktrans %}{% endblock %}
+{% block header %}{% blocktrans with report_id=report.id username=report.user.username %}Report #{{ report_id }}: {{ username }}{% endblocktrans %}{% endblock %}
 
 {% block panel %}
 <div class="block">
@@ -57,6 +57,9 @@
 
 <div class="block">
     <h3 class="title is-4">{% trans "Reported statuses" %}</h3>
+    {% if not report.statuses.exists %}
+    <em>{% trans "No statuses reported" %}</em>
+    {% else %}
     <ul>
         {% for status in report.statuses.select_subclasses.all %}
         <li>
@@ -68,5 +71,6 @@
         </li>
         {% endfor %}
     </ul>
+    {% endif %}
 </div>
 {% endblock %}
diff --git a/bookwyrm/templates/moderation/report_preview.html b/bookwyrm/templates/moderation/report_preview.html
index 3a5ebcf9..363783d5 100644
--- a/bookwyrm/templates/moderation/report_preview.html
+++ b/bookwyrm/templates/moderation/report_preview.html
@@ -3,7 +3,7 @@
 {% load humanize %}
 {% block card-header %}
 <h2 class="card-header-title has-background-white-ter is-block">
-    <a href="{% url 'settings-report' report.id %}">{{ report.user.username }}</a>
+    <a href="{% url 'settings-report' report.id %}">{% blocktrans with report_id=report.id username=report.user.username %}Report #{{ report_id }}: {{ username }}{% endblocktrans %}</a>
 </h2>
 {% endblock %}
 

From 848edd29726dff04c581c1f0dae571441132e8a8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 12 Mar 2021 16:31:46 -0800
Subject: [PATCH 0273/1285] Adds missing migration for reports model

---
 .../migrations/0050_auto_20210313_0030.py     | 26 +++++++++++++++++++
 bookwyrm/models/report.py                     |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 bookwyrm/migrations/0050_auto_20210313_0030.py

diff --git a/bookwyrm/migrations/0050_auto_20210313_0030.py b/bookwyrm/migrations/0050_auto_20210313_0030.py
new file mode 100644
index 00000000..8c81c452
--- /dev/null
+++ b/bookwyrm/migrations/0050_auto_20210313_0030.py
@@ -0,0 +1,26 @@
+# Generated by Django 3.0.7 on 2021-03-13 00:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0049_auto_20210309_0156"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="report",
+            options={"ordering": ("-created_date",)},
+        ),
+        migrations.AlterModelOptions(
+            name="reportcomment",
+            options={"ordering": ("-created_date",)},
+        ),
+        migrations.AlterField(
+            model_name="report",
+            name="statuses",
+            field=models.ManyToManyField(blank=True, to="bookwyrm.Status"),
+        ),
+    ]
diff --git a/bookwyrm/models/report.py b/bookwyrm/models/report.py
index a1e17eb2..6a76d9fd 100644
--- a/bookwyrm/models/report.py
+++ b/bookwyrm/models/report.py
@@ -12,7 +12,7 @@ class Report(BookWyrmModel):
     )
     note = models.TextField(null=True, blank=True)
     user = models.ForeignKey("User", on_delete=models.PROTECT)
-    statuses = models.ManyToManyField("Status", null=True, blank=True)
+    statuses = models.ManyToManyField("Status", blank=True)
     resolved = models.BooleanField(default=False)
 
     class Meta:

From 2548ba926aaca6be25ae5e26cbe0c55271edfedd Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 07:15:30 -0800
Subject: [PATCH 0274/1285] Fixes error when receiving Undo for unknown boost

---
 bookwyrm/activitypub/verbs.py      |  3 +++
 bookwyrm/tests/views/test_inbox.py | 17 +++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index cd7a757b..1788dda7 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -70,6 +70,9 @@ class Undo(Verb):
         if self.object.type == "Follow":
             model = apps.get_model("bookwyrm.UserFollows")
         obj = self.object.to_model(model=model, save=False, allow_create=False)
+        if not obj:
+            # if we don't have the object, we can't undo it. happens a lot with boosts
+            return
         obj.delete()
 
 
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index cab50892..d43018db 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -563,6 +563,23 @@ class Inbox(TestCase):
         }
         views.inbox.activity_task(activity)
 
+    def test_handle_unboost_unknown_boost(self):
+        """ undo a boost """
+        activity = {
+            "type": "Undo",
+            "actor": "hi",
+            "id": "bleh",
+            "to": ["https://www.w3.org/ns/activitystreams#public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "object": {
+                "type": "Announce",
+                "id": "http://fake.com/unknown/boost",
+                "actor": self.remote_user.remote_id,
+                "object": self.status.remote_id,
+            },
+        }
+        views.inbox.activity_task(activity)
+
     def test_handle_add_book_to_shelf(self):
         """ shelving a book """
         work = models.Work.objects.create(title="work title")

From 1f4b3e958639c951a63c2335e4a828ca7d28ed01 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 07:38:19 -0800
Subject: [PATCH 0275/1285] Adds tests for status recipients property

---
 bookwyrm/tests/models/test_status_model.py | 121 +++++++++++++++------
 1 file changed, 87 insertions(+), 34 deletions(-)

diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py
index 21982c20..ddc92d36 100644
--- a/bookwyrm/tests/models/test_status_model.py
+++ b/bookwyrm/tests/models/test_status_model.py
@@ -12,15 +12,26 @@ from django.utils import timezone
 from bookwyrm import models, settings
 
 
+# pylint: disable=too-many-public-methods
 @patch("bookwyrm.models.Status.broadcast")
 class Status(TestCase):
     """ lotta types of statuses """
 
     def setUp(self):
         """ useful things for creating a status """
-        self.user = models.User.objects.create_user(
+        self.local_user = models.User.objects.create_user(
             "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
         )
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            self.remote_user = models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
         self.book = models.Edition.objects.create(title="Test Edition")
 
         image_file = pathlib.Path(__file__).parent.joinpath(
@@ -34,22 +45,22 @@ class Status(TestCase):
 
     def test_status_generated_fields(self, _):
         """ setting remote id """
-        status = models.Status.objects.create(content="bleh", user=self.user)
+        status = models.Status.objects.create(content="bleh", user=self.local_user)
         expected_id = "https://%s/user/mouse/status/%d" % (settings.DOMAIN, status.id)
         self.assertEqual(status.remote_id, expected_id)
         self.assertEqual(status.privacy, "public")
 
     def test_replies(self, _):
         """ get a list of replies """
-        parent = models.Status.objects.create(content="hi", user=self.user)
+        parent = models.Status.objects.create(content="hi", user=self.local_user)
         child = models.Status.objects.create(
-            content="hello", reply_parent=parent, user=self.user
+            content="hello", reply_parent=parent, user=self.local_user
         )
         models.Review.objects.create(
-            content="hey", reply_parent=parent, user=self.user, book=self.book
+            content="hey", reply_parent=parent, user=self.local_user, book=self.book
         )
         models.Status.objects.create(
-            content="hi hello", reply_parent=child, user=self.user
+            content="hi hello", reply_parent=child, user=self.local_user
         )
 
         replies = models.Status.replies(parent)
@@ -75,15 +86,15 @@ class Status(TestCase):
 
     def test_to_replies(self, _):
         """ activitypub replies collection """
-        parent = models.Status.objects.create(content="hi", user=self.user)
+        parent = models.Status.objects.create(content="hi", user=self.local_user)
         child = models.Status.objects.create(
-            content="hello", reply_parent=parent, user=self.user
+            content="hello", reply_parent=parent, user=self.local_user
         )
         models.Review.objects.create(
-            content="hey", reply_parent=parent, user=self.user, book=self.book
+            content="hey", reply_parent=parent, user=self.local_user, book=self.book
         )
         models.Status.objects.create(
-            content="hi hello", reply_parent=child, user=self.user
+            content="hi hello", reply_parent=child, user=self.local_user
         )
 
         replies = parent.to_replies()
@@ -92,7 +103,9 @@ class Status(TestCase):
 
     def test_status_to_activity(self, _):
         """ subclass of the base model version with a "pure" serializer """
-        status = models.Status.objects.create(content="test content", user=self.user)
+        status = models.Status.objects.create(
+            content="test content", user=self.local_user
+        )
         activity = status.to_activity()
         self.assertEqual(activity["id"], status.remote_id)
         self.assertEqual(activity["type"], "Note")
@@ -103,7 +116,7 @@ class Status(TestCase):
         """ subclass of the base model version with a "pure" serializer """
         status = models.Status.objects.create(
             content="test content",
-            user=self.user,
+            user=self.local_user,
             deleted=True,
             deleted_date=timezone.now(),
         )
@@ -114,7 +127,9 @@ class Status(TestCase):
 
     def test_status_to_pure_activity(self, _):
         """ subclass of the base model version with a "pure" serializer """
-        status = models.Status.objects.create(content="test content", user=self.user)
+        status = models.Status.objects.create(
+            content="test content", user=self.local_user
+        )
         activity = status.to_activity(pure=True)
         self.assertEqual(activity["id"], status.remote_id)
         self.assertEqual(activity["type"], "Note")
@@ -125,10 +140,10 @@ class Status(TestCase):
     def test_generated_note_to_activity(self, _):
         """ subclass of the base model version with a "pure" serializer """
         status = models.GeneratedNote.objects.create(
-            content="test content", user=self.user
+            content="test content", user=self.local_user
         )
         status.mention_books.set([self.book])
-        status.mention_users.set([self.user])
+        status.mention_users.set([self.local_user])
         activity = status.to_activity()
         self.assertEqual(activity["id"], status.remote_id)
         self.assertEqual(activity["type"], "GeneratedNote")
@@ -139,10 +154,10 @@ class Status(TestCase):
     def test_generated_note_to_pure_activity(self, _):
         """ subclass of the base model version with a "pure" serializer """
         status = models.GeneratedNote.objects.create(
-            content="test content", user=self.user
+            content="test content", user=self.local_user
         )
         status.mention_books.set([self.book])
-        status.mention_users.set([self.user])
+        status.mention_users.set([self.local_user])
         activity = status.to_activity(pure=True)
         self.assertEqual(activity["id"], status.remote_id)
         self.assertEqual(
@@ -163,7 +178,7 @@ class Status(TestCase):
     def test_comment_to_activity(self, _):
         """ subclass of the base model version with a "pure" serializer """
         status = models.Comment.objects.create(
-            content="test content", user=self.user, book=self.book
+            content="test content", user=self.local_user, book=self.book
         )
         activity = status.to_activity()
         self.assertEqual(activity["id"], status.remote_id)
@@ -174,7 +189,7 @@ class Status(TestCase):
     def test_comment_to_pure_activity(self, _):
         """ subclass of the base model version with a "pure" serializer """
         status = models.Comment.objects.create(
-            content="test content", user=self.user, book=self.book
+            content="test content", user=self.local_user, book=self.book
         )
         activity = status.to_activity(pure=True)
         self.assertEqual(activity["id"], status.remote_id)
@@ -196,7 +211,7 @@ class Status(TestCase):
         status = models.Quotation.objects.create(
             quote="a sickening sense",
             content="test content",
-            user=self.user,
+            user=self.local_user,
             book=self.book,
         )
         activity = status.to_activity()
@@ -211,7 +226,7 @@ class Status(TestCase):
         status = models.Quotation.objects.create(
             quote="a sickening sense",
             content="test content",
-            user=self.user,
+            user=self.local_user,
             book=self.book,
         )
         activity = status.to_activity(pure=True)
@@ -235,7 +250,7 @@ class Status(TestCase):
             name="Review name",
             content="test content",
             rating=3,
-            user=self.user,
+            user=self.local_user,
             book=self.book,
         )
         activity = status.to_activity()
@@ -252,7 +267,7 @@ class Status(TestCase):
             name="Review name",
             content="test content",
             rating=3,
-            user=self.user,
+            user=self.local_user,
             book=self.book,
         )
         activity = status.to_activity(pure=True)
@@ -275,30 +290,34 @@ class Status(TestCase):
 
         def fav_broadcast_mock(_, activity, user):
             """ ok """
-            self.assertEqual(user.remote_id, self.user.remote_id)
+            self.assertEqual(user.remote_id, self.local_user.remote_id)
             self.assertEqual(activity["type"], "Like")
 
         models.Favorite.broadcast = fav_broadcast_mock
 
-        status = models.Status.objects.create(content="test content", user=self.user)
-        fav = models.Favorite.objects.create(status=status, user=self.user)
+        status = models.Status.objects.create(
+            content="test content", user=self.local_user
+        )
+        fav = models.Favorite.objects.create(status=status, user=self.local_user)
 
         # can't fav a status twice
         with self.assertRaises(IntegrityError):
-            models.Favorite.objects.create(status=status, user=self.user)
+            models.Favorite.objects.create(status=status, user=self.local_user)
 
         activity = fav.to_activity()
         self.assertEqual(activity["type"], "Like")
-        self.assertEqual(activity["actor"], self.user.remote_id)
+        self.assertEqual(activity["actor"], self.local_user.remote_id)
         self.assertEqual(activity["object"], status.remote_id)
         models.Favorite.broadcast = real_broadcast
 
     def test_boost(self, _):
         """ boosting, this one's a bit fussy """
-        status = models.Status.objects.create(content="test content", user=self.user)
-        boost = models.Boost.objects.create(boosted_status=status, user=self.user)
+        status = models.Status.objects.create(
+            content="test content", user=self.local_user
+        )
+        boost = models.Boost.objects.create(boosted_status=status, user=self.local_user)
         activity = boost.to_activity()
-        self.assertEqual(activity["actor"], self.user.remote_id)
+        self.assertEqual(activity["actor"], self.local_user.remote_id)
         self.assertEqual(activity["object"], status.remote_id)
         self.assertEqual(activity["type"], "Announce")
         self.assertEqual(activity, boost.to_activity(pure=True))
@@ -306,18 +325,20 @@ class Status(TestCase):
     def test_notification(self, _):
         """ a simple model """
         notification = models.Notification.objects.create(
-            user=self.user, notification_type="FAVORITE"
+            user=self.local_user, notification_type="FAVORITE"
         )
         self.assertFalse(notification.read)
 
         with self.assertRaises(IntegrityError):
             models.Notification.objects.create(
-                user=self.user, notification_type="GLORB"
+                user=self.local_user, notification_type="GLORB"
             )
 
     def test_create_broadcast(self, broadcast_mock):
         """ should send out two verions of a status on create """
-        models.Comment.objects.create(content="hi", user=self.user, book=self.book)
+        models.Comment.objects.create(
+            content="hi", user=self.local_user, book=self.book
+        )
         self.assertEqual(broadcast_mock.call_count, 2)
         pure_call = broadcast_mock.call_args_list[0]
         bw_call = broadcast_mock.call_args_list[1]
@@ -332,3 +353,35 @@ class Status(TestCase):
         args = bw_call[0][0]
         self.assertEqual(args["type"], "Create")
         self.assertEqual(args["object"]["type"], "Comment")
+
+    def test_recipients_with_mentions(self, _):
+        """ get recipients to broadcast a status """
+        status = models.GeneratedNote.objects.create(
+            content="test content", user=self.local_user
+        )
+        status.mention_users.add(self.remote_user)
+
+        self.assertEqual(status.recipients, [self.remote_user])
+
+    def test_recipients_with_reply_parent(self, _):
+        """ get recipients to broadcast a status """
+        parent_status = models.GeneratedNote.objects.create(
+            content="test content", user=self.remote_user
+        )
+        status = models.GeneratedNote.objects.create(
+            content="test content", user=self.local_user, reply_parent=parent_status
+        )
+
+        self.assertEqual(status.recipients, [self.remote_user])
+
+    def test_recipients_with_reply_parent_and_mentions(self, _):
+        """ get recipients to broadcast a status """
+        parent_status = models.GeneratedNote.objects.create(
+            content="test content", user=self.remote_user
+        )
+        status = models.GeneratedNote.objects.create(
+            content="test content", user=self.local_user, reply_parent=parent_status
+        )
+        status.mention_users.set([self.remote_user])
+
+        self.assertEqual(status.recipients, [self.remote_user])

From 919b166241ee1b9b2193265d4a07f75e27096982 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 08:13:20 -0800
Subject: [PATCH 0276/1285] Catch error in serializing unknown boosts

---
 bookwyrm/activitypub/base_activity.py      |  5 ++---
 bookwyrm/connectors/abstract_connector.py  |  2 +-
 bookwyrm/models/status.py                  |  9 +++++++--
 bookwyrm/tests/models/test_status_model.py | 16 +++++++++++++++-
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index 315ff58c..170bdfb9 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -258,10 +258,9 @@ def resolve_remote_id(remote_id, model=None, refresh=False, save=True):
     # load the data and create the object
     try:
         data = get_data(remote_id)
-    except (ConnectorException, ConnectionError):
+    except ConnectorException:
         raise ActivitySerializerError(
-            "Could not connect to host for remote_id in %s model: %s"
-            % (model.__name__, remote_id)
+            "Could not connect to host for remote_id in: %s" % (remote_id)
         )
     # determine the model implicitly, if not provided
     if not model:
diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index 9f31b337..3ebedf65 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -244,7 +244,7 @@ def get_data(url):
                 "User-Agent": settings.USER_AGENT,
             },
         )
-    except (RequestError, SSLError) as e:
+    except (RequestError, SSLError, ConnectionError) as e:
         logger.exception(e)
         raise ConnectorException()
 
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index 80f2b593..c5e69936 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -115,13 +115,18 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
     def ignore_activity(cls, activity):
         """ keep notes if they are replies to existing statuses """
         if activity.type == "Announce":
-            # keep it if the booster or the boosted are local
-            boosted = activitypub.resolve_remote_id(activity.object, save=False)
+            try:
+                boosted = activitypub.resolve_remote_id(activity.object, save=False)
+            except activitypub.ActivitySerializerError:
+                # if we can't load the status, definitely ignore it
+                return True
+            # keep the boost if we would keep the status
             return cls.ignore_activity(boosted.to_activity_dataclass())
 
         # keep if it if it's a custom type
         if activity.type != "Note":
             return False
+        # keep it if it's a reply to an existing status
         if cls.objects.filter(remote_id=activity.inReplyTo).exists():
             return False
 
diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py
index ddc92d36..b2ee69b8 100644
--- a/bookwyrm/tests/models/test_status_model.py
+++ b/bookwyrm/tests/models/test_status_model.py
@@ -8,8 +8,9 @@ from django.core.files.base import ContentFile
 from django.db import IntegrityError
 from django.test import TestCase
 from django.utils import timezone
+import responses
 
-from bookwyrm import models, settings
+from bookwyrm import activitypub, models, settings
 
 
 # pylint: disable=too-many-public-methods
@@ -385,3 +386,16 @@ class Status(TestCase):
         status.mention_users.set([self.remote_user])
 
         self.assertEqual(status.recipients, [self.remote_user])
+
+    @responses.activate
+    def test_ignore_activity_boost(self, _):
+        """ don't bother with most remote statuses """
+        activity = activitypub.Announce(
+            id="http://www.faraway.com/boost/12",
+            actor=self.remote_user.remote_id,
+            object="http://fish.com/nothing",
+        )
+
+        responses.add(responses.GET, "http://fish.com/nothing", status=404)
+
+        self.assertTrue(models.Status.ignore_activity(activity))

From 3edfcb76318e6f09e6d14a8dfdc623ac5e6a8bfe Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 08:15:58 -0800
Subject: [PATCH 0277/1285] Trying to fix broadcast connectionerror exceptions

---
 bookwyrm/models/activitypub_mixin.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index 4ced78c2..691cad00 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -456,8 +456,8 @@ def broadcast_task(sender_id, activity, recipients):
     for recipient in recipients:
         try:
             sign_and_send(sender, activity, recipient)
-        except (HTTPError, SSLError, ConnectionError) as e:
-            logger.exception(e)
+        except (HTTPError, SSLError, ConnectionError):
+            pass
 
 
 def sign_and_send(sender, data, destination):

From e1a8c4d260df6d4d26d3fbabeea2082a4f845a3a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 08:43:36 -0800
Subject: [PATCH 0278/1285] Fixes handling incoming unshelve activities

---
 bookwyrm/activitypub/verbs.py        |  8 +++++--
 bookwyrm/models/activitypub_mixin.py |  7 +++---
 bookwyrm/tests/views/test_inbox.py   | 35 ++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index cd7a757b..48dbf28b 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -137,7 +137,7 @@ class Add(Verb):
     def action(self):
         """ add obj to collection """
         target = resolve_remote_id(self.target, refresh=False)
-        # we want to related field that isn't the book, this is janky af sorry
+        # we want to get the related field that isn't the book, this is janky af sorry
         model = [t for t in type(target)._meta.related_objects if t.name != "edition"][
             0
         ].related_model
@@ -153,7 +153,11 @@ class Remove(Verb):
 
     def action(self):
         """ find and remove the activity object """
-        obj = self.object.to_model(save=False, allow_create=False)
+        target = resolve_remote_id(self.target, refresh=False)
+        model = [t for t in type(target)._meta.related_objects if t.name != "edition"][
+            0
+        ].related_model
+        obj = self.to_model(model=model, save=False, allow_create=False)
         obj.delete()
 
 
diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index 4ced78c2..adc8e2f3 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -362,14 +362,15 @@ class CollectionItemMixin(ActivitypubMixin):
         """ broadcast a remove activity """
         activity = self.to_remove_activity()
         super().delete(*args, **kwargs)
-        self.broadcast(activity, self.user)
+        if self.user.local:
+            self.broadcast(activity, self.user)
 
     def to_add_activity(self):
         """ AP for shelving a book"""
         object_field = getattr(self, self.object_field)
         collection_field = getattr(self, self.collection_field)
         return activitypub.Add(
-            id="%s#add" % self.remote_id,
+            id=self.remote_id,
             actor=self.user.remote_id,
             object=object_field,
             target=collection_field.remote_id,
@@ -380,7 +381,7 @@ class CollectionItemMixin(ActivitypubMixin):
         object_field = getattr(self, self.object_field)
         collection_field = getattr(self, self.collection_field)
         return activitypub.Remove(
-            id="%s#remove" % self.remote_id,
+            id=self.remote_id,
             actor=self.user.remote_id,
             object=object_field,
             target=collection_field.remote_id,
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index cab50892..35f5bf4c 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -591,6 +591,41 @@ class Inbox(TestCase):
         views.inbox.activity_task(activity)
         self.assertEqual(shelf.books.first(), book)
 
+    def test_handle_unshelve_book(self):
+        """ remove a book from a shelf """
+        work = models.Work.objects.create(title="work title")
+        book = models.Edition.objects.create(
+            title="Test",
+            remote_id="https://bookwyrm.social/book/37292",
+            parent_work=work,
+        )
+        shelf = models.Shelf.objects.create(user=self.remote_user, name="Test Shelf")
+        shelf.remote_id = "https://bookwyrm.social/user/mouse/shelf/to-read"
+        shelf.save()
+
+        shelfbook = models.ShelfBook.objects.create(
+            user=self.remote_user, shelf=shelf, book=book
+        )
+
+        self.assertEqual(shelf.books.first(), book)
+        self.assertEqual(shelf.books.count(), 1)
+
+        activity = {
+            "id": shelfbook.remote_id,
+            "type": "Remove",
+            "actor": "https://example.com/users/rat",
+            "object": {
+                "type": "Edition",
+                "title": "Test Title",
+                "work": work.remote_id,
+                "id": "https://bookwyrm.social/book/37292",
+            },
+            "target": "https://bookwyrm.social/user/mouse/shelf/to-read",
+            "@context": "https://www.w3.org/ns/activitystreams",
+        }
+        views.inbox.activity_task(activity)
+        self.assertFalse(shelf.books.exists())
+
     @responses.activate
     def test_handle_add_book_to_list(self):
         """ listing a book """

From 2ab913018d9dde0e9e35aea49f3c1a24ce83b526 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 08:52:36 -0800
Subject: [PATCH 0279/1285] Use get_data helper when executing searches

---
 bookwyrm/connectors/abstract_connector.py | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index 9f31b337..9d8a05e0 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -44,21 +44,10 @@ class AbstractMinimalConnector(ABC):
         if min_confidence:
             params["min_confidence"] = min_confidence
 
-        resp = requests.get(
+        data = get_data(
             "%s%s" % (self.search_url, query),
             params=params,
-            headers={
-                "Accept": "application/json; charset=utf-8",
-                "User-Agent": settings.USER_AGENT,
-            },
         )
-        if not resp.ok:
-            resp.raise_for_status()
-        try:
-            data = resp.json()
-        except ValueError as e:
-            logger.exception(e)
-            raise ConnectorException("Unable to parse json response", e)
         results = []
 
         for doc in self.parse_search_data(data)[:10]:
@@ -234,11 +223,12 @@ def dict_from_mappings(data, mappings):
     return result
 
 
-def get_data(url):
+def get_data(url, params=None):
     """ wrapper for request.get """
     try:
         resp = requests.get(
             url,
+            params=params,
             headers={
                 "Accept": "application/json; charset=utf-8",
                 "User-Agent": settings.USER_AGENT,

From e459c440de12d11535d3f8e04d4cde5b25b36cc7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 08:52:48 -0800
Subject: [PATCH 0280/1285] tests formulating search queries with
 min_confidence field

---
 .../connectors/test_abstract_minimal_connector.py    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/bookwyrm/tests/connectors/test_abstract_minimal_connector.py b/bookwyrm/tests/connectors/test_abstract_minimal_connector.py
index 957d3233..d710abf8 100644
--- a/bookwyrm/tests/connectors/test_abstract_minimal_connector.py
+++ b/bookwyrm/tests/connectors/test_abstract_minimal_connector.py
@@ -71,6 +71,18 @@ class AbstractConnector(TestCase):
         self.assertEqual(results[1], "b")
         self.assertEqual(results[2], "c")
 
+    @responses.activate
+    def test_search_min_confidence(self):
+        """ makes an http request to the outside service """
+        responses.add(
+            responses.GET,
+            "https://example.com/search?q=a%20book%20title&min_confidence=1",
+            json=["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l"],
+            status=200,
+        )
+        results = self.test_connector.search("a book title", min_confidence=1)
+        self.assertEqual(len(results), 10)
+
     def test_search_result(self):
         """ a class that stores info about a search result """
         result = SearchResult(

From d3b1941eaad6b91f93e19e76361e412e9d072520 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 09:07:19 -0800
Subject: [PATCH 0281/1285] Uses get_data helper in isbn search (plus test)

---
 bookwyrm/connectors/abstract_connector.py        | 16 +++-------------
 .../test_abstract_minimal_connector.py           | 16 ++++++++++++++--
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index 9d8a05e0..7635f57e 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -57,24 +57,14 @@ class AbstractMinimalConnector(ABC):
     def isbn_search(self, query):
         """ isbn search """
         params = {}
-        resp = requests.get(
+        data = get_data(
             "%s%s" % (self.isbn_search_url, query),
             params=params,
-            headers={
-                "Accept": "application/json; charset=utf-8",
-                "User-Agent": settings.USER_AGENT,
-            },
         )
-        if not resp.ok:
-            resp.raise_for_status()
-        try:
-            data = resp.json()
-        except ValueError as e:
-            logger.exception(e)
-            raise ConnectorException("Unable to parse json response", e)
         results = []
 
-        for doc in self.parse_isbn_search_data(data):
+        # this shouldn't be returning mutliple results, but just in case
+        for doc in self.parse_isbn_search_data(data)[:10]:
             results.append(self.format_isbn_search_result(doc))
         return results
 
diff --git a/bookwyrm/tests/connectors/test_abstract_minimal_connector.py b/bookwyrm/tests/connectors/test_abstract_minimal_connector.py
index d710abf8..fa7c85f4 100644
--- a/bookwyrm/tests/connectors/test_abstract_minimal_connector.py
+++ b/bookwyrm/tests/connectors/test_abstract_minimal_connector.py
@@ -19,7 +19,7 @@ class AbstractConnector(TestCase):
             books_url="https://example.com/books",
             covers_url="https://example.com/covers",
             search_url="https://example.com/search?q=",
-            isbn_search_url="https://example.com/isbn",
+            isbn_search_url="https://example.com/isbn?q=",
         )
 
         class TestConnector(abstract_connector.AbstractMinimalConnector):
@@ -50,7 +50,7 @@ class AbstractConnector(TestCase):
         self.assertEqual(connector.books_url, "https://example.com/books")
         self.assertEqual(connector.covers_url, "https://example.com/covers")
         self.assertEqual(connector.search_url, "https://example.com/search?q=")
-        self.assertEqual(connector.isbn_search_url, "https://example.com/isbn")
+        self.assertEqual(connector.isbn_search_url, "https://example.com/isbn?q=")
         self.assertIsNone(connector.name)
         self.assertEqual(connector.identifier, "example.com")
         self.assertIsNone(connector.max_query_count)
@@ -83,6 +83,18 @@ class AbstractConnector(TestCase):
         results = self.test_connector.search("a book title", min_confidence=1)
         self.assertEqual(len(results), 10)
 
+    @responses.activate
+    def test_isbn_search(self):
+        """ makes an http request to the outside service """
+        responses.add(
+            responses.GET,
+            "https://example.com/isbn?q=123456",
+            json=["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l"],
+            status=200,
+        )
+        results = self.test_connector.isbn_search("123456")
+        self.assertEqual(len(results), 10)
+
     def test_search_result(self):
         """ a class that stores info about a search result """
         result = SearchResult(

From 382170d662d71fdd896a889e48d5faecf4d3426f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 09:27:59 -0800
Subject: [PATCH 0282/1285] Adds get_or_create_author abstract connector test

---
 .../connectors/test_abstract_connector.py     | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/bookwyrm/tests/connectors/test_abstract_connector.py b/bookwyrm/tests/connectors/test_abstract_connector.py
index 9aa78f6a..97190c16 100644
--- a/bookwyrm/tests/connectors/test_abstract_connector.py
+++ b/bookwyrm/tests/connectors/test_abstract_connector.py
@@ -122,3 +122,27 @@ class AbstractConnector(TestCase):
         self.assertEqual(result, self.book)
         self.assertEqual(models.Edition.objects.count(), 1)
         self.assertEqual(models.Edition.objects.count(), 1)
+
+    @responses.activate
+    def test_get_or_create_author(self):
+        """ load an author """
+        self.connector.author_mappings = [
+            Mapping("id"),
+            Mapping("name"),
+        ]
+
+        responses.add(
+            responses.GET,
+            "https://www.example.com/author",
+            json={"id": "https://www.example.com/author", "name": "Test Author"},
+        )
+        result = self.connector.get_or_create_author("https://www.example.com/author")
+        self.assertIsInstance(result, models.Author)
+        self.assertEqual(result.name, "Test Author")
+        self.assertEqual(result.origin_id, "https://www.example.com/author")
+
+    def test_get_or_create_author_existing(self):
+        """ get an existing author """
+        author = models.Author.objects.create(name="Test Author")
+        result = self.connector.get_or_create_author(author.remote_id)
+        self.assertEqual(author, result)

From 6b22de207577356127f924e9177e460fb2e3b94e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 09:41:40 -0800
Subject: [PATCH 0283/1285] More tests for bookwyrm connector

---
 .../connectors/test_bookwyrm_connector.py      | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/tests/connectors/test_bookwyrm_connector.py b/bookwyrm/tests/connectors/test_bookwyrm_connector.py
index 1fc71688..386c1350 100644
--- a/bookwyrm/tests/connectors/test_bookwyrm_connector.py
+++ b/bookwyrm/tests/connectors/test_bookwyrm_connector.py
@@ -23,10 +23,12 @@ class BookWyrmConnector(TestCase):
         )
         self.connector = Connector("example.com")
 
-        work_file = pathlib.Path(__file__).parent.joinpath("../data/bw_work.json")
-        edition_file = pathlib.Path(__file__).parent.joinpath("../data/bw_edition.json")
-        self.work_data = json.loads(work_file.read_bytes())
-        self.edition_data = json.loads(edition_file.read_bytes())
+    def test_get_or_create_book_existing(self):
+        """ load book activity """
+        work = models.Work.objects.create(title="Test Work")
+        book = models.Edition.objects.create(title="Test Edition", parent_work=work)
+        result = self.connector.get_or_create_book(book.remote_id)
+        self.assertEqual(book, result)
 
     def test_format_search_result(self):
         """ create a SearchResult object from search response json """
@@ -42,3 +44,11 @@ class BookWyrmConnector(TestCase):
         self.assertEqual(result.author, "Susanna Clarke")
         self.assertEqual(result.year, 2017)
         self.assertEqual(result.connector, self.connector)
+
+    def test_format_isbn_search_result(self):
+        """ just gotta attach the connector  """
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/bw_search.json")
+        search_data = json.loads(datafile.read_bytes())
+        results = self.connector.parse_isbn_search_data(search_data)
+        result = self.connector.format_isbn_search_result(results[0])
+        self.assertEqual(result.connector, self.connector)

From 414dd6bd20f93691dc8f3c1816c31c6966b9a083 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 10:01:17 -0800
Subject: [PATCH 0284/1285] Adds isbn search test to connector manager

---
 bookwyrm/connectors/connector_manager.py            |  4 ++--
 bookwyrm/tests/connectors/test_connector_manager.py | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/connectors/connector_manager.py b/bookwyrm/connectors/connector_manager.py
index 3891d02a..3ed25ceb 100644
--- a/bookwyrm/connectors/connector_manager.py
+++ b/bookwyrm/connectors/connector_manager.py
@@ -18,7 +18,7 @@ def search(query, min_confidence=0.1):
     results = []
 
     # Have we got a ISBN ?
-    isbn = re.sub("[\W_]", "", query)
+    isbn = re.sub(r"[\W_]", "", query)
     maybe_isbn = len(isbn) in [10, 13]  # ISBN10 or ISBN13
 
     dedup_slug = lambda r: "%s/%s/%s" % (r.title, r.author, r.year)
@@ -36,7 +36,7 @@ def search(query, min_confidence=0.1):
                     pass
 
         # if no isbn search or results, we fallback to generic search
-        if result_set == None or result_set == []:
+        if result_set in (None, []):
             try:
                 result_set = connector.search(query, min_confidence=min_confidence)
             except (HTTPError, ConnectorException):
diff --git a/bookwyrm/tests/connectors/test_connector_manager.py b/bookwyrm/tests/connectors/test_connector_manager.py
index 4410e011..52589323 100644
--- a/bookwyrm/tests/connectors/test_connector_manager.py
+++ b/bookwyrm/tests/connectors/test_connector_manager.py
@@ -15,7 +15,7 @@ class ConnectorManager(TestCase):
         self.work = models.Work.objects.create(title="Example Work")
 
         self.edition = models.Edition.objects.create(
-            title="Example Edition", parent_work=self.work
+            title="Example Edition", parent_work=self.work, isbn_10="0000000000"
         )
         self.work.default_edition = self.edition
         self.work.save()
@@ -28,6 +28,7 @@ class ConnectorManager(TestCase):
             base_url="http://test.com/",
             books_url="http://test.com/",
             covers_url="http://test.com/",
+            isbn_search_url="http://test.com/isbn/",
         )
 
     def test_get_or_create_connector(self):
@@ -58,6 +59,14 @@ class ConnectorManager(TestCase):
         self.assertEqual(len(results[0]["results"]), 1)
         self.assertEqual(results[0]["results"][0].title, "Example Edition")
 
+    def test_search_isbn(self):
+        """ special handling if a query resembles an isbn """
+        results = connector_manager.search("0000000000")
+        self.assertEqual(len(results), 1)
+        self.assertIsInstance(results[0]["connector"], SelfConnector)
+        self.assertEqual(len(results[0]["results"]), 1)
+        self.assertEqual(results[0]["results"][0].title, "Example Edition")
+
     def test_local_search(self):
         """ search only the local database """
         results = connector_manager.local_search("Example")

From 76f16432698c4c4067d834ea82b9dfb7be4ef729 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 10:11:13 -0800
Subject: [PATCH 0285/1285] Tests ignore edition openlibrary connector code

also removes print statements oops
---
 bookwyrm/connectors/openlibrary.py                     |  4 ----
 .../tests/connectors/test_openlibrary_connector.py     | 10 ++++++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/connectors/openlibrary.py b/bookwyrm/connectors/openlibrary.py
index fb9a4e47..c83a65d6 100644
--- a/bookwyrm/connectors/openlibrary.py
+++ b/bookwyrm/connectors/openlibrary.py
@@ -161,21 +161,17 @@ def ignore_edition(edition_data):
     """ don't load a million editions that have no metadata """
     # an isbn, we love to see it
     if edition_data.get("isbn_13") or edition_data.get("isbn_10"):
-        print(edition_data.get("isbn_10"))
         return False
     # grudgingly, oclc can stay
     if edition_data.get("oclc_numbers"):
-        print(edition_data.get("oclc_numbers"))
         return False
     # if it has a cover it can stay
     if edition_data.get("covers"):
-        print(edition_data.get("covers"))
         return False
     # keep non-english editions
     if edition_data.get("languages") and "languages/eng" not in str(
         edition_data.get("languages")
     ):
-        print(edition_data.get("languages"))
         return False
     return True
 
diff --git a/bookwyrm/tests/connectors/test_openlibrary_connector.py b/bookwyrm/tests/connectors/test_openlibrary_connector.py
index bb018830..3cff4fb0 100644
--- a/bookwyrm/tests/connectors/test_openlibrary_connector.py
+++ b/bookwyrm/tests/connectors/test_openlibrary_connector.py
@@ -8,6 +8,7 @@ import responses
 
 from bookwyrm import models
 from bookwyrm.connectors.openlibrary import Connector
+from bookwyrm.connectors.openlibrary import ignore_edition
 from bookwyrm.connectors.openlibrary import get_languages, get_description
 from bookwyrm.connectors.openlibrary import pick_default_edition, get_openlibrary_key
 from bookwyrm.connectors.abstract_connector import SearchResult
@@ -237,3 +238,12 @@ class Openlibrary(TestCase):
         self.assertEqual(result.pages, 491)
         self.assertEqual(result.subjects[0], "Fantasy.")
         self.assertEqual(result.physical_format, "Hardcover")
+
+    def test_ignore_edition(self):
+        """ skip editions with poor metadata """
+        self.assertFalse(ignore_edition({"isbn_13": "hi"}))
+        self.assertFalse(ignore_edition({"oclc_numbers": "hi"}))
+        self.assertFalse(ignore_edition({"covers": "hi"}))
+        self.assertFalse(ignore_edition({"languages": "languages/fr"}))
+        self.assertTrue(ignore_edition({"languages": "languages/eng"}))
+        self.assertTrue(ignore_edition({"format": "paperback"}))

From 139416d9c37762e51b7b07a4e2969bcfbf2a3aa1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 10:58:54 -0800
Subject: [PATCH 0286/1285] Moves federation info endpoints into views module

---
 bookwyrm/tests/views/test_user.py      |  1 -
 bookwyrm/tests/views/test_wellknown.py | 84 ++++++++++++++++++++++++++
 bookwyrm/urls.py                       | 12 ++--
 bookwyrm/views/__init__.py             |  3 +-
 bookwyrm/{ => views}/wellknown.py      | 31 ++++------
 5 files changed, 103 insertions(+), 28 deletions(-)
 create mode 100644 bookwyrm/tests/views/test_wellknown.py
 rename bookwyrm/{ => views}/wellknown.py (86%)

diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py
index 596ea8bf..426c1a79 100644
--- a/bookwyrm/tests/views/test_user.py
+++ b/bookwyrm/tests/views/test_user.py
@@ -5,7 +5,6 @@ from PIL import Image
 
 from django.contrib.auth.models import AnonymousUser
 from django.core.files.base import ContentFile
-from django.core.files.uploadedfile import SimpleUploadedFile
 from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
diff --git a/bookwyrm/tests/views/test_wellknown.py b/bookwyrm/tests/views/test_wellknown.py
new file mode 100644
index 00000000..f408460f
--- /dev/null
+++ b/bookwyrm/tests/views/test_wellknown.py
@@ -0,0 +1,84 @@
+""" test for app action functionality """
+import json
+from unittest.mock import patch
+
+from django.contrib.auth.models import AnonymousUser
+from django.http import JsonResponse
+from django.test import TestCase
+from django.test.client import RequestFactory
+
+from bookwyrm import models, views
+
+
+class UserViews(TestCase):
+    """ view user and edit profile """
+
+    def setUp(self):
+        """ we need basic test data and mocks """
+        self.factory = RequestFactory()
+        self.local_user = models.User.objects.create_user(
+            "mouse@local.com",
+            "mouse@mouse.mouse",
+            "password",
+            local=True,
+            localname="mouse",
+        )
+        models.User.objects.create_user(
+            "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat"
+        )
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            models.User.objects.create_user(
+                "rat",
+                "rat@remote.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
+        models.SiteSettings.objects.create()
+        self.anonymous_user = AnonymousUser
+        self.anonymous_user.is_authenticated = False
+
+    def test_webfinger(self):
+        """ there are so many views, this just makes sure it LOADS """
+        request = self.factory.get("", {"resource": "acct:mouse@local.com"})
+        request.user = self.anonymous_user
+
+        result = views.webfinger(request)
+        self.assertIsInstance(result, JsonResponse)
+        data = json.loads(result.getvalue())
+        self.assertEqual(data["subject"], "acct:mouse@local.com")
+
+    def test_nodeinfo_pointer(self):
+        """ just tells you where nodeinfo is """
+        request = self.factory.get("")
+        request.user = self.anonymous_user
+
+        result = views.nodeinfo_pointer(request)
+        data = json.loads(result.getvalue())
+        self.assertIsInstance(result, JsonResponse)
+        self.assertTrue("href" in data["links"][0])
+
+    def test_nodeinfo(self):
+        """ info about the instance """
+        request = self.factory.get("")
+        request.user = self.anonymous_user
+
+        result = views.nodeinfo(request)
+        data = json.loads(result.getvalue())
+        self.assertIsInstance(result, JsonResponse)
+        self.assertEqual(data["software"]["name"], "bookwyrm")
+        self.assertEqual(data["usage"]["users"]["total"], 2)
+        self.assertEqual(models.User.objects.count(), 3)
+
+    def test_instanceinfo(self):
+        """ about the instance's user activity """
+        request = self.factory.get("")
+        request.user = self.anonymous_user
+
+        result = views.instance_info(request)
+        data = json.loads(result.getvalue())
+        self.assertIsInstance(result, JsonResponse)
+        self.assertEqual(data["stats"]["user_count"], 2)
+        self.assertEqual(models.User.objects.count(), 3)
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 70998172..b645e943 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -4,7 +4,7 @@ from django.contrib import admin
 from django.urls import path, re_path
 
 
-from bookwyrm import settings, views, wellknown
+from bookwyrm import settings, views
 from bookwyrm.utils import regex
 
 user_path = r"^user/(?P<username>%s)" % regex.username
@@ -31,11 +31,11 @@ urlpatterns = [
     re_path(r"^inbox/?$", views.Inbox.as_view()),
     re_path(r"%s/inbox/?$" % local_user_path, views.Inbox.as_view()),
     re_path(r"%s/outbox/?$" % local_user_path, views.Outbox.as_view()),
-    re_path(r"^.well-known/webfinger/?$", wellknown.webfinger),
-    re_path(r"^.well-known/nodeinfo/?$", wellknown.nodeinfo_pointer),
-    re_path(r"^nodeinfo/2\.0/?$", wellknown.nodeinfo),
-    re_path(r"^api/v1/instance/?$", wellknown.instance_info),
-    re_path(r"^api/v1/instance/peers/?$", wellknown.peers),
+    re_path(r"^.well-known/webfinger/?$", views.webfinger),
+    re_path(r"^.well-known/nodeinfo/?$", views.nodeinfo_pointer),
+    re_path(r"^nodeinfo/2\.0/?$", views.nodeinfo),
+    re_path(r"^api/v1/instance/?$", views.instance_info),
+    re_path(r"^api/v1/instance/peers/?$", views.peers),
     # polling updates
     re_path("^api/updates/notifications/?$", views.Updates.as_view()),
     # authentication
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index e7f84544..2c32bc9d 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -14,6 +14,7 @@ from .import_data import Import, ImportStatus
 from .inbox import Inbox
 from .interaction import Favorite, Unfavorite, Boost, Unboost
 from .invite import ManageInvites, Invite
+from .isbn import Isbn
 from .landing import About, Home, Discover
 from .list import Lists, List, Curate, UserLists
 from .notifications import Notifications
@@ -32,4 +33,4 @@ from .status import CreateStatus, DeleteStatus
 from .tag import Tag, AddTag, RemoveTag
 from .updates import Updates
 from .user import User, EditUser, Followers, Following
-from .isbn import Isbn
+from .wellknown import webfinger, nodeinfo_pointer, nodeinfo, instance_info, peers
diff --git a/bookwyrm/wellknown.py b/bookwyrm/views/wellknown.py
similarity index 86%
rename from bookwyrm/wellknown.py
rename to bookwyrm/views/wellknown.py
index eb014808..127c7491 100644
--- a/bookwyrm/wellknown.py
+++ b/bookwyrm/views/wellknown.py
@@ -4,18 +4,17 @@ from dateutil.relativedelta import relativedelta
 from django.http import HttpResponseNotFound
 from django.http import JsonResponse
 from django.utils import timezone
+from django.views.decorators.http import require_GET
 
 from bookwyrm import models
 from bookwyrm.settings import DOMAIN, VERSION
 
 
+@require_GET
 def webfinger(request):
     """ allow other servers to ask about a user """
-    if request.method != "GET":
-        return HttpResponseNotFound()
-
     resource = request.GET.get("resource")
-    if not resource and not resource.startswith("acct:"):
+    if not resource or not resource.startswith("acct:"):
         return HttpResponseNotFound()
 
     username = resource.replace("acct:", "")
@@ -38,11 +37,9 @@ def webfinger(request):
     )
 
 
-def nodeinfo_pointer(request):
+@require_GET
+def nodeinfo_pointer(_):
     """ direct servers to nodeinfo """
-    if request.method != "GET":
-        return HttpResponseNotFound()
-
     return JsonResponse(
         {
             "links": [
@@ -55,11 +52,9 @@ def nodeinfo_pointer(request):
     )
 
 
-def nodeinfo(request):
+@require_GET
+def nodeinfo(_):
     """ basic info about the server """
-    if request.method != "GET":
-        return HttpResponseNotFound()
-
     status_count = models.Status.objects.filter(user__local=True).count()
     user_count = models.User.objects.filter(local=True).count()
 
@@ -92,11 +87,9 @@ def nodeinfo(request):
     )
 
 
-def instance_info(request):
+@require_GET
+def instance_info(_):
     """ let's talk about your cool unique instance """
-    if request.method != "GET":
-        return HttpResponseNotFound()
-
     user_count = models.User.objects.filter(local=True).count()
     status_count = models.Status.objects.filter(user__local=True).count()
 
@@ -120,10 +113,8 @@ def instance_info(request):
     )
 
 
-def peers(request):
+@require_GET
+def peers(_):
     """ list of federated servers this instance connects with """
-    if request.method != "GET":
-        return HttpResponseNotFound()
-
     names = models.FederatedServer.objects.values_list("server_name", flat=True)
     return JsonResponse(list(names), safe=False)

From 1f2da1865564a20a82d1a97b8c17e4fb5571718e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 11:11:06 -0800
Subject: [PATCH 0287/1285] Adds test for updates endpoint

---
 bookwyrm/tests/views/test_updates.py | 42 ++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 bookwyrm/tests/views/test_updates.py

diff --git a/bookwyrm/tests/views/test_updates.py b/bookwyrm/tests/views/test_updates.py
new file mode 100644
index 00000000..b41b2014
--- /dev/null
+++ b/bookwyrm/tests/views/test_updates.py
@@ -0,0 +1,42 @@
+""" test for app action functionality """
+import json
+from django.http import JsonResponse
+from django.test import TestCase
+from django.test.client import RequestFactory
+
+from bookwyrm import models, views
+
+
+class UpdateViews(TestCase):
+    """ lets the ui check for unread notification """
+
+    def setUp(self):
+        """ we need basic test data and mocks """
+        self.factory = RequestFactory()
+        self.local_user = models.User.objects.create_user(
+            "mouse@local.com",
+            "mouse@mouse.mouse",
+            "password",
+            local=True,
+            localname="mouse",
+        )
+        models.SiteSettings.objects.create()
+
+    def test_get_updates(self):
+        """ there are so many views, this just makes sure it LOADS """
+        view = views.Updates.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+
+        result = view(request)
+        self.assertIsInstance(result, JsonResponse)
+        data = json.loads(result.getvalue())
+        self.assertEqual(data["notifications"], 0)
+
+        models.Notification.objects.create(
+            notification_type="BOOST", user=self.local_user
+        )
+        result = view(request)
+        self.assertIsInstance(result, JsonResponse)
+        data = json.loads(result.getvalue())
+        self.assertEqual(data["notifications"], 1)

From 7cf0f904e5268b5e4b0e0b7c69a64ee5a2b508e2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 12:04:30 -0800
Subject: [PATCH 0288/1285] Adds production port instructions to main branch
 readme

---
 README.md | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 89 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 98ce9c76..3d5ea4a7 100644
--- a/README.md
+++ b/README.md
@@ -169,8 +169,11 @@ Instructions for running BookWyrm in production:
    - Set a secure database password for postgres
  - Update your nginx configuration in `nginx/default.conf`
    - Replace `your-domain.com` with your domain name
+   - If you are running another web-server on your host machine, you will need to follow the [reverse-proxy instructions](#running-bookwyrm-behind-a-reverse-proxy)
  - Run the application (this should also set up a Certbot ssl cert for your domain) with
   `docker-compose up --build`, and make sure all the images build successfully
+    - If you are running other services on your host machine, you may run into errors where services fail when attempting to bind to a port.
+    See the [troubleshooting guide](#port-conflicts) for advice on resolving this.
  - When docker has built successfully, stop the process with `CTRL-C`
  - Comment out the `command: certonly...` line in `docker-compose.yml`
  - Run docker-compose in the background with: `docker-compose up -d`
@@ -201,19 +204,99 @@ There are three concepts in the book data model:
  - `Book`, an abstract, high-level concept that could mean either a `Work` or an `Edition`. No data is saved as a `Book`, it serves as shared model for `Work` and `Edition`
  - `Work`, the theoretical umbrella concept of a book that encompasses every edition of the book, and
  - `Edition`, a concrete, actually published version of a book
- 
+
 Whenever a user interacts with a book, they are interacting with a specific edition. Every work has a default edition, but the user can select other editions. Reviews aggregated for all editions of a work when you view an edition's page.
 
 ### Backups
 
-Bookwyrm's db service dumps a backup copy of its database to its `/backups` directory daily at midnight UTC.
+BookWyrm's db service dumps a backup copy of its database to its `/backups` directory daily at midnight UTC.
 Backups are named `backup__%Y-%m-%d.sql`.
 
 The db service has an optional script for periodically pruning the backups directory so that all recent daily backups are kept, but for older backups, only weekly or monthly backups are kept.
 To enable this script:
-- Uncomment the final line in `postgres-docker/cronfile`
-- rebuild your instance `docker-compose up --build`
+ - Uncomment the final line in `postgres-docker/cronfile`
+ - rebuild your instance `docker-compose up --build`
 
 You can copy backups from the backups volume to your host machine with `docker cp`:
-- Run `docker-compose ps` to confirm the db service's full name (it's probably `bookwyrm_db_1`.
-- Run `docker cp <container_name>:/backups <host machine path>
+ - Run `docker-compose ps` to confirm the db service's full name (it's probably `bookwyrm_db_1`.
+ - Run `docker cp <container_name>:/backups <host machine path>`
+
+### Port Conflicts
+
+BookWyrm has multiple services that run on their default ports.
+This means that, depending on what else you are running on your host machine, you may run into errors when building or running BookWyrm when attempts to bind to those ports fail.
+
+If this occurs, you will need to change your configuration to run services on different ports.
+This may require one or more changes the following files:
+ - `docker-compose.yml`
+ - `nginx/default.conf`
+ - `.env` (You create this file yourself during setup)
+
+E.g., If you need Redis to run on a different port:
+ - In `docker-compose.yml`:
+    - In `services` -> `redis` -> `command`, add `--port YOUR_PORT` to the command
+    - In `services` -> `redis` -> `ports`, change `6379:6379` to your port
+ - In `.env`, update `REDIS_PORT`
+
+If you are already running a web-server on your machine, you will need to set up a reverse-proxy.
+
+#### Running BookWyrm Behind a Reverse-Proxy
+
+If you are running another web-server on your machine, you should have it handle proxying web requests to BookWyrm.
+
+The default BookWyrm configuration already has an nginx server that proxies requests to the django app that handles SSL and directly serves static files.
+The static files are stored in a Docker volume that several BookWyrm services access, so it is not recommended to remove this server completely.
+
+To run BookWyrm behind a reverse-proxy, make the following changes:
+ - In `nginx/default.conf`:
+    - Comment out the two default servers
+    - Uncomment the server labeled Reverse-Proxy server
+    - Replace `your-domain.com` with your domain name
+ - In `docker-compose.yml`:
+    - In `services` -> `nginx` -> `ports`, comment out the default ports and add `- 8001:8001`
+    - In `services` -> `nginx` -> `volumes`, comment out the two volumes that begin `./certbot/`
+    - In `services`, comment out the `certbot` service
+
+At this point, you can follow, the [setup](#server-setup) instructions as listed.
+Once docker is running, you can access your BookWyrm instance at `http://localhost:8001` (**NOTE:** your server is not accessible over `https`).
+
+Steps for setting up a reverse-proxy are server dependent.
+
+##### Nginx
+
+Before you can set up nginx, you will need to locate your nginx configuration directory, which is dependent on your platform and how you installed nginx.
+See [nginx's guide](http://nginx.org/en/docs/beginners_guide.html) for details.
+
+To set up your server:
+ - In you `nginx.conf` file, ensure that `include servers/*;` isn't commented out.
+ - In your nginx `servers` directory, create a new file named after your domain containing the following information:
+   ```nginx
+   server {
+      server_name your-domain.com www.your-domain.com;
+
+      location / {
+          proxy_pass http://localhost:8000;
+          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          proxy_set_header Host $host;
+      }
+
+      location /images/ {
+          proxy_pass http://localhost:8001;
+          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          proxy_set_header Host $host;
+      }
+
+      location /static/ {
+          proxy_pass http://localhost:8001;
+          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          proxy_set_header Host $host;
+      }
+
+      listen [::]:80 ssl;
+      listen 80 ssl;
+   }
+   ```
+ - run `sudo certbot run --nginx --email YOUR_EMAIL -d your-domain.com -d www.your-domain.com`
+ - restart nginx
+
+If everything worked correctly, your BookWyrm instance should now be externally accessible.
\ No newline at end of file

From 091ad5306199a564dd9a979b5e6c4e0aea9fb5b3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 12:13:44 -0800
Subject: [PATCH 0289/1285] JS linting and whitespace fixes

---
 bookwyrm/static/js/shared.js | 406 +++++++++++++++++------------------
 1 file changed, 203 insertions(+), 203 deletions(-)

diff --git a/bookwyrm/static/js/shared.js b/bookwyrm/static/js/shared.js
index 65f0dd65..391efcc2 100644
--- a/bookwyrm/static/js/shared.js
+++ b/bookwyrm/static/js/shared.js
@@ -209,249 +209,249 @@ function removeClass(el, className) {
 */
 class TabGroup {
     constructor(container) {
-      this.container = container;
-  
-      this.tablist = this.container.querySelector('[role="tablist"]');
-      this.buttons = this.tablist.querySelectorAll('[role="tab"]');
-      this.panels = this.container.querySelectorAll(':scope > [role="tabpanel"]');
-      this.delay = this.determineDelay();
-  
-      if(!this.tablist || !this.buttons.length || !this.panels.length) {
-        return;
-      }
-  
-      this.keys = this.keys();
-      this.direction = this.direction();
-      this.initButtons();
-      this.initPanels();
+        this.container = container;
+
+        this.tablist = this.container.querySelector('[role="tablist"]');
+        this.buttons = this.tablist.querySelectorAll('[role="tab"]');
+        this.panels = this.container.querySelectorAll(':scope > [role="tabpanel"]');
+        this.delay = this.determineDelay();
+
+        if(!this.tablist || !this.buttons.length || !this.panels.length) {
+            return;
+        }
+
+        this.keys = this.keys();
+        this.direction = this.direction();
+        this.initButtons();
+        this.initPanels();
     }
-  
+
     keys() {
-      return {
-        end: 35,
-        home: 36,
-        left: 37,
-        up: 38,
-        right: 39,
-        down: 40
-      };
+        return {
+            end: 35,
+            home: 36,
+            left: 37,
+            up: 38,
+            right: 39,
+            down: 40
+        };
     }
-  
+
     // Add or substract depending on key pressed
     direction() {
-      return {
-        37: -1,
-        38: -1,
-        39: 1,
-        40: 1
-      };
+        return {
+            37: -1,
+            38: -1,
+            39: 1,
+            40: 1
+        };
     }
-  
-    initButtons() {
-      let count = 0;
-      for(let button of this.buttons) {
-        let isSelected = button.getAttribute("aria-selected") === "true";
-        button.setAttribute("tabindex", isSelected ? "0" : "-1");
-  
-        button.addEventListener('click', this.clickEventListener.bind(this));
-        button.addEventListener('keydown', this.keydownEventListener.bind(this));
-        button.addEventListener('keyup', this.keyupEventListener.bind(this));
-  
-        button.index = count++;
-      }
-    }
-  
-    initPanels() {
-      let selectedPanelId = this.tablist.querySelector('[role="tab"][aria-selected="true"]').getAttribute("aria-controls");
-      for(let panel of this.panels) {
-        if(panel.getAttribute("id") !== selectedPanelId) {
-          panel.setAttribute("hidden", "");
-        }
-        panel.setAttribute("tabindex", "0");
-      }
-    }
-  
-    clickEventListener(event) {
-      let button = event.target.closest('a');
 
-      event.preventDefault();
-  
-      this.activateTab(button, false);
+    initButtons() {
+        let count = 0;
+        for(let button of this.buttons) {
+            let isSelected = button.getAttribute("aria-selected") === "true";
+            button.setAttribute("tabindex", isSelected ? "0" : "-1");
+
+            button.addEventListener('click', this.clickEventListener.bind(this));
+            button.addEventListener('keydown', this.keydownEventListener.bind(this));
+            button.addEventListener('keyup', this.keyupEventListener.bind(this));
+
+            button.index = count++;
+        }
     }
-  
+
+    initPanels() {
+        let selectedPanelId = this.tablist.querySelector('[role="tab"][aria-selected="true"]').getAttribute("aria-controls");
+        for(let panel of this.panels) {
+            if(panel.getAttribute("id") !== selectedPanelId) {
+                panel.setAttribute("hidden", "");
+            }
+            panel.setAttribute("tabindex", "0");
+        }
+    }
+
+    clickEventListener(event) {
+        let button = event.target.closest('a');
+
+        event.preventDefault();
+
+        this.activateTab(button, false);
+    }
+
     // Handle keydown on tabs
     keydownEventListener(event) {
-      var key = event.keyCode;
-  
-      switch (key) {
-        case this.keys.end:
-          event.preventDefault();
-          // Activate last tab
-          this.activateTab(this.buttons[this.buttons.length - 1]);
-          break;
-        case this.keys.home:
-          event.preventDefault();
-          // Activate first tab
-          this.activateTab(this.buttons[0]);
-          break;
-  
-        // Up and down are in keydown
-        // because we need to prevent page scroll >:)
-        case this.keys.up:
-        case this.keys.down:
-          this.determineOrientation(event);
-          break;
-      };
+        var key = event.keyCode;
+
+        switch (key) {
+            case this.keys.end:
+                event.preventDefault();
+                // Activate last tab
+                this.activateTab(this.buttons[this.buttons.length - 1]);
+                break;
+            case this.keys.home:
+                event.preventDefault();
+                // Activate first tab
+                this.activateTab(this.buttons[0]);
+                break;
+
+            // Up and down are in keydown
+            // because we need to prevent page scroll >:)
+            case this.keys.up:
+            case this.keys.down:
+                this.determineOrientation(event);
+                break;
+        }
     }
-  
+
     // Handle keyup on tabs
     keyupEventListener(event) {
-      var key = event.keyCode;
-  
-      switch (key) {
-        case this.keys.left:
-        case this.keys.right:
-          this.determineOrientation(event);
-          break;
-      };
+        var key = event.keyCode;
+
+        switch (key) {
+            case this.keys.left:
+            case this.keys.right:
+                this.determineOrientation(event);
+                break;
+        }
     }
-  
+
     // When a tablist’s aria-orientation is set to vertical,
     // only up and down arrow should function.
     // In all other cases only left and right arrow function.
     determineOrientation(event) {
-      var key = event.keyCode;
-      var vertical = this.tablist.getAttribute('aria-orientation') == 'vertical';
-      var proceed = false;
-  
-      if (vertical) {
-        if (key === this.keys.up || key === this.keys.down) {
-          event.preventDefault();
-          proceed = true;
-        };
-      }
-      else {
-        if (key === this.keys.left || key === this.keys.right) {
-          proceed = true;
-        };
-      };
-  
-      if (proceed) {
-        this.switchTabOnArrowPress(event);
-      };
+        var key = event.keyCode;
+        var vertical = this.tablist.getAttribute('aria-orientation') == 'vertical';
+        var proceed = false;
+
+        if (vertical) {
+            if (key === this.keys.up || key === this.keys.down) {
+                event.preventDefault();
+                proceed = true;
+            }
+        }
+        else {
+            if (key === this.keys.left || key === this.keys.right) {
+                proceed = true;
+            }
+        }
+
+        if (proceed) {
+            this.switchTabOnArrowPress(event);
+        }
     }
-  
+
     // Either focus the next, previous, first, or last tab
     // depending on key pressed
     switchTabOnArrowPress(event) {
-      var pressed = event.keyCode;
-  
-      for (let button of this.buttons) {
-        button.addEventListener('focus', this.focusEventHandler.bind(this));
-      };
-  
-      if (this.direction[pressed]) {
-        var target = event.target;
-        if (target.index !== undefined) {
-          if (this.buttons[target.index + this.direction[pressed]]) {
-            this.buttons[target.index + this.direction[pressed]].focus();
-          }
-          else if (pressed === this.keys.left || pressed === this.keys.up) {
-            this.focusLastTab();
-          }
-          else if (pressed === this.keys.right || pressed == this.keys.down) {
-            this.focusFirstTab();
-          }
+        var pressed = event.keyCode;
+
+        for (let button of this.buttons) {
+            button.addEventListener('focus', this.focusEventHandler.bind(this));
+        }
+
+        if (this.direction[pressed]) {
+            var target = event.target;
+            if (target.index !== undefined) {
+                if (this.buttons[target.index + this.direction[pressed]]) {
+                    this.buttons[target.index + this.direction[pressed]].focus();
+                }
+                else if (pressed === this.keys.left || pressed === this.keys.up) {
+                    this.focusLastTab();
+                }
+                else if (pressed === this.keys.right || pressed == this.keys.down) {
+                    this.focusFirstTab();
+                }
+            }
         }
-      }
     }
-  
+
     // Activates any given tab panel
     activateTab (tab, setFocus) {
-      if(tab.getAttribute("role") !== "tab") {
-        tab = tab.closest('[role="tab"]');
-      }
-  
-      setFocus = setFocus || true;
-  
-      // Deactivate all other tabs
-      this.deactivateTabs();
-  
-      // Remove tabindex attribute
-      tab.removeAttribute('tabindex');
-  
-      // Set the tab as selected
-      tab.setAttribute('aria-selected', 'true');
-      
-      // Give the tab parent an is-active class
-      tab.parentNode.classList.add('is-active');
-  
-      // Get the value of aria-controls (which is an ID)
-      var controls = tab.getAttribute('aria-controls');
-  
-      // Remove hidden attribute from tab panel to make it visible
-      document.getElementById(controls).removeAttribute('hidden');
-  
-      // Set focus when required
-      if (setFocus) {
-        tab.focus();
-      }
+        if(tab.getAttribute("role") !== "tab") {
+            tab = tab.closest('[role="tab"]');
+        }
+
+        setFocus = setFocus || true;
+
+        // Deactivate all other tabs
+        this.deactivateTabs();
+
+        // Remove tabindex attribute
+        tab.removeAttribute('tabindex');
+
+        // Set the tab as selected
+        tab.setAttribute('aria-selected', 'true');
+
+        // Give the tab parent an is-active class
+        tab.parentNode.classList.add('is-active');
+
+        // Get the value of aria-controls (which is an ID)
+        var controls = tab.getAttribute('aria-controls');
+
+        // Remove hidden attribute from tab panel to make it visible
+        document.getElementById(controls).removeAttribute('hidden');
+
+        // Set focus when required
+        if (setFocus) {
+            tab.focus();
+        }
     }
-  
+
     // Deactivate all tabs and tab panels
     deactivateTabs() {
-      for (let button of this.buttons) {
-        button.parentNode.classList.remove('is-active');
-        button.setAttribute('tabindex', '-1');
-        button.setAttribute('aria-selected', 'false');
-        button.removeEventListener('focus', this.focusEventHandler.bind(this));
-      }
-  
-      for (let panel of this.panels) {
-        panel.setAttribute('hidden', 'hidden');
-      }
+        for (let button of this.buttons) {
+            button.parentNode.classList.remove('is-active');
+            button.setAttribute('tabindex', '-1');
+            button.setAttribute('aria-selected', 'false');
+            button.removeEventListener('focus', this.focusEventHandler.bind(this));
+        }
+
+        for (let panel of this.panels) {
+            panel.setAttribute('hidden', 'hidden');
+        }
     }
-  
+
     focusFirstTab() {
-      this.buttons[0].focus();
+        this.buttons[0].focus();
     }
-  
+
     focusLastTab() {
-      this.buttons[this.buttons.length - 1].focus();
+        this.buttons[this.buttons.length - 1].focus();
     }
-  
+
     // Determine whether there should be a delay
     // when user navigates with the arrow keys
     determineDelay() {
-      var hasDelay = this.tablist.hasAttribute('data-delay');
-      var delay = 0;
-  
-      if (hasDelay) {
-        var delayValue = this.tablist.getAttribute('data-delay');
-        if (delayValue) {
-          delay = delayValue;
+        var hasDelay = this.tablist.hasAttribute('data-delay');
+        var delay = 0;
+
+        if (hasDelay) {
+            var delayValue = this.tablist.getAttribute('data-delay');
+            if (delayValue) {
+                delay = delayValue;
+            }
+            else {
+                // If no value is specified, default to 300ms
+                delay = 300;
+            }
         }
-        else {
-          // If no value is specified, default to 300ms
-          delay = 300;
-        };
-      };
-  
-      return delay;
+
+        return delay;
     }
-  
+
     focusEventHandler(event) {
-      var target = event.target;
-  
-      setTimeout(this.checkTabFocus.bind(this), this.delay, target);
-    };
-  
+        var target = event.target;
+
+        setTimeout(this.checkTabFocus.bind(this), this.delay, target);
+    }
+
     // Only activate tab on focus if it still has focus after the delay
     checkTabFocus(target) {
-      let focused = document.activeElement;
-  
-      if (target === focused) {
-        this.activateTab(target, false);
-      }
+        let focused = document.activeElement;
+
+        if (target === focused) {
+            this.activateTab(target, false);
+        }
     }
-  }
+}

From 611e7870e7707fe5d847e9bad589533acbc221f1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 12:36:53 -0800
Subject: [PATCH 0290/1285] Show publisher on book data page

---
 bookwyrm/templates/book.html | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html
index 16bf1197..ee1ea270 100644
--- a/bookwyrm/templates/book.html
+++ b/bookwyrm/templates/book.html
@@ -78,13 +78,22 @@
                 </dl>
 
                 <p>
-                {% if book.physical_format and not book.pages %}
-                {{ book.physical_format | title }}
-                {% elif book.physical_format and book.pages %}
-                {% blocktrans with format=book.physical_format|title pages=book.pages %}{{ format }}, {{ pages }} pages{% endblocktrans %}
-                {% elif book.pages %}
-                {% blocktrans with pages=book.pages %}{{ pages }} pages{% endblocktrans %}
-                {% endif %}
+                    {% if book.physical_format and not book.pages %}
+                    {{ book.physical_format | title }}
+                    {% elif book.physical_format and book.pages %}
+                    {% blocktrans with format=book.physical_format|title pages=book.pages %}{{ format }}, {{ pages }} pages{% endblocktrans %}
+                    {% elif book.pages %}
+                    {% blocktrans with pages=book.pages %}{{ pages }} pages{% endblocktrans %}
+                    {% endif %}
+                </p>
+                <p>
+                    {% if book.published_date and book.publishers %}
+                    {% blocktrans with date=book.published_date|date:'M jS Y' publisher=book.publishers|join:', ' %}Published {{ date }} by {{ publisher }}.{% endblocktrans %}
+                    {% elif book.published_date %}
+                    {% blocktrans with date=book.published_date|date:'M jS Y' %}Published {{ date }}{% endblocktrans %}
+                    {% else %}
+                    {% blocktrans with publisher=book.publishers|join:', ' %}Published by {{ publisher }}.{% endblocktrans %}
+                    {% endif %}
                 </p>
 
                 {% if book.openlibrary_key %}

From 05fcfbc66f9662b66d020ee61d54bea3dfb009ba Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 13:55:20 -0800
Subject: [PATCH 0291/1285] Show more data about books in search

---
 bookwyrm/connectors/abstract_connector.py     |  5 +--
 bookwyrm/connectors/bookwyrm_connector.py     |  3 +-
 bookwyrm/connectors/openlibrary.py            |  9 +++--
 bookwyrm/connectors/self_connector.py         | 12 ++-----
 bookwyrm/management/commands/initdb.py        |  4 +--
 bookwyrm/templates/search_results.html        |  9 ++---
 .../snippets/search_result_text.html          | 35 +++++++++++++++++--
 7 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index 4b118d64..00b5c5c9 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -262,9 +262,10 @@ class SearchResult:
 
     title: str
     key: str
-    author: str
-    year: str
     connector: object
+    author: str = None
+    year: str = None
+    cover: str = None
     confidence: int = 1
 
     def __repr__(self):
diff --git a/bookwyrm/connectors/bookwyrm_connector.py b/bookwyrm/connectors/bookwyrm_connector.py
index 742d7e85..f7869d55 100644
--- a/bookwyrm/connectors/bookwyrm_connector.py
+++ b/bookwyrm/connectors/bookwyrm_connector.py
@@ -24,5 +24,4 @@ class Connector(AbstractMinimalConnector):
         return data
 
     def format_isbn_search_result(self, search_result):
-        search_result["connector"] = self
-        return SearchResult(**search_result)
+        return self.format_search_result(search_result)
diff --git a/bookwyrm/connectors/openlibrary.py b/bookwyrm/connectors/openlibrary.py
index c83a65d6..8df96526 100644
--- a/bookwyrm/connectors/openlibrary.py
+++ b/bookwyrm/connectors/openlibrary.py
@@ -95,10 +95,12 @@ class Connector(AbstractConnector):
             url = "%s%s" % (self.base_url, author_id)
             yield self.get_or_create_author(url)
 
-    def get_cover_url(self, cover_blob):
+    def get_cover_url(self, cover_blob, size='L'):
         """ ask openlibrary for the cover """
+        if not cover_blob:
+            return None
         cover_id = cover_blob[0]
-        image_name = "%s-L.jpg" % cover_id
+        image_name = "%s-%s.jpg" % (cover_id, size)
         return "%s/b/id/%s" % (self.covers_url, image_name)
 
     def parse_search_data(self, data):
@@ -108,12 +110,15 @@ class Connector(AbstractConnector):
         # build the remote id from the openlibrary key
         key = self.books_url + search_result["key"]
         author = search_result.get("author_name") or ["Unknown"]
+        cover_blob = search_result.get("cover_i")
+        cover = self.get_cover_url([cover_blob], size='M') if cover_blob else None
         return SearchResult(
             title=search_result.get("title"),
             key=key,
             author=", ".join(author),
             connector=self,
             year=search_result.get("first_publish_year"),
+            cover=cover,
         )
 
     def parse_isbn_search_data(self, data):
diff --git a/bookwyrm/connectors/self_connector.py b/bookwyrm/connectors/self_connector.py
index 60acb59b..10777b2b 100644
--- a/bookwyrm/connectors/self_connector.py
+++ b/bookwyrm/connectors/self_connector.py
@@ -67,20 +67,12 @@ class Connector(AbstractConnector):
             if search_result.published_date
             else None,
             connector=self,
+            cover='%s%s' % (self.covers_url, search_result.cover),
             confidence=search_result.rank if hasattr(search_result, "rank") else 1,
         )
 
     def format_isbn_search_result(self, search_result):
-        return SearchResult(
-            title=search_result.title,
-            key=search_result.remote_id,
-            author=search_result.author_text,
-            year=search_result.published_date.year
-            if search_result.published_date
-            else None,
-            connector=self,
-            confidence=search_result.rank if hasattr(search_result, "rank") else 1,
-        )
+        return self.format_search_result(search_result)
 
     def is_work_data(self, data):
         pass
diff --git a/bookwyrm/management/commands/initdb.py b/bookwyrm/management/commands/initdb.py
index 6b3f3762..d6101c87 100644
--- a/bookwyrm/management/commands/initdb.py
+++ b/bookwyrm/management/commands/initdb.py
@@ -76,7 +76,7 @@ def init_connectors():
         connector_file="self_connector",
         base_url="https://%s" % DOMAIN,
         books_url="https://%s/book" % DOMAIN,
-        covers_url="https://%s/images/covers" % DOMAIN,
+        covers_url="https://%s/images/" % DOMAIN,
         search_url="https://%s/search?q=" % DOMAIN,
         isbn_search_url="https://%s/isbn/" % DOMAIN,
         priority=1,
@@ -88,7 +88,7 @@ def init_connectors():
         connector_file="bookwyrm_connector",
         base_url="https://bookwyrm.social",
         books_url="https://bookwyrm.social/book",
-        covers_url="https://bookwyrm.social/images/covers",
+        covers_url="https://bookwyrm.social/images/",
         search_url="https://bookwyrm.social/search?q=",
         isbn_search_url="https://bookwyrm.social/isbn/",
         priority=2,
diff --git a/bookwyrm/templates/search_results.html b/bookwyrm/templates/search_results.html
index 13497df8..6444cc18 100644
--- a/bookwyrm/templates/search_results.html
+++ b/bookwyrm/templates/search_results.html
@@ -19,7 +19,7 @@
             <ul>
             {% for result in local_results.results %}
                 <li class="pd-4">
-                    <a href="{{ result.key }}">{% include 'snippets/search_result_text.html' with result=result link=True %}</a>
+                    {% include 'snippets/search_result_text.html' with result=result %}
                 </li>
             {% endfor %}
             </ul>
@@ -50,12 +50,7 @@
                 <ul>
                 {% for result in result_set.results %}
                     <li class="pb-4">
-                        <form action="/resolve-book" method="POST">
-                            {% csrf_token %}
-                            <input type="hidden" name="remote_id" value="{{ result.key }}">
-                            <div>{% include 'snippets/search_result_text.html' with result=result link=False %}</div>
-                            <button type="submit" class="button is-small is-link">{% trans "Import book" %}</button>
-                        </form>
+                        {% include 'snippets/search_result_text.html' with result=result remote_result=True %}
                     </li>
                 {% endfor %}
                 </ul>
diff --git a/bookwyrm/templates/snippets/search_result_text.html b/bookwyrm/templates/snippets/search_result_text.html
index 36009050..059b8e7e 100644
--- a/bookwyrm/templates/snippets/search_result_text.html
+++ b/bookwyrm/templates/snippets/search_result_text.html
@@ -1,3 +1,34 @@
 {% load i18n %}
-<strong>{% if link %}<a href="{{ result.key }}">{{ result.title }}</a>{% else %}{{ result.title }}{% endif %}</strong>
-{% if result.author %} {% blocktrans with author=result.author %}by {{ author }}{% endblocktrans %}{% endif %}{% if result.year %} ({{ result.year }}){% endif %}
+<div class="columns is-mobile">
+    <div class="cover-container is-small column is-2">
+    {% if result.cover %}
+        <img src="{{ result.cover }}" class="book-cover" aria-hidden="true">
+    {% else %}
+        <div class="no-cover book-cover">
+            <img class="book-cover" src="/static/images/no_cover.jpg" aria-hidden="true">
+            <div>
+                <p>{% trans "No cover" %}</p>
+            </div>
+        </div>
+    {% endif %}
+    </div>
+
+    <div class="column">
+        <p>
+            <strong>
+                <a href="{{ result.key }}"{% if remote_result %} rel=�noopener� target="_blank"{% endif %}>{{ result.title }}</a>
+            </strong>
+            {% if result.author %}
+            {% blocktrans with author=result.author %}by {{ author }}{% endblocktrans %}{% endif %}{% if result.year %} ({{ result.year }})
+            {% endif %}
+        </p>
+
+        {% if remote_result %}
+        <form action="/resolve-book" method="POST">
+            {% csrf_token %}
+            <input type="hidden" name="remote_id" value="{{ result.key }}">
+            <button type="submit" class="button is-small is-link">{% trans "Import book" %}</button>
+        </form>
+        {% endif %}
+    </div>
+</div>

From ad8257f8bddcb9b5b8d815d069db59ef9ca04405 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 14:04:41 -0800
Subject: [PATCH 0292/1285] Formats changes

---
 bookwyrm/connectors/openlibrary.py    | 4 ++--
 bookwyrm/connectors/self_connector.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/connectors/openlibrary.py b/bookwyrm/connectors/openlibrary.py
index 8df96526..9be0266c 100644
--- a/bookwyrm/connectors/openlibrary.py
+++ b/bookwyrm/connectors/openlibrary.py
@@ -95,7 +95,7 @@ class Connector(AbstractConnector):
             url = "%s%s" % (self.base_url, author_id)
             yield self.get_or_create_author(url)
 
-    def get_cover_url(self, cover_blob, size='L'):
+    def get_cover_url(self, cover_blob, size="L"):
         """ ask openlibrary for the cover """
         if not cover_blob:
             return None
@@ -111,7 +111,7 @@ class Connector(AbstractConnector):
         key = self.books_url + search_result["key"]
         author = search_result.get("author_name") or ["Unknown"]
         cover_blob = search_result.get("cover_i")
-        cover = self.get_cover_url([cover_blob], size='M') if cover_blob else None
+        cover = self.get_cover_url([cover_blob], size="M") if cover_blob else None
         return SearchResult(
             title=search_result.get("title"),
             key=key,
diff --git a/bookwyrm/connectors/self_connector.py b/bookwyrm/connectors/self_connector.py
index 10777b2b..500ffd74 100644
--- a/bookwyrm/connectors/self_connector.py
+++ b/bookwyrm/connectors/self_connector.py
@@ -67,7 +67,7 @@ class Connector(AbstractConnector):
             if search_result.published_date
             else None,
             connector=self,
-            cover='%s%s' % (self.covers_url, search_result.cover),
+            cover="%s%s" % (self.covers_url, search_result.cover),
             confidence=search_result.rank if hasattr(search_result, "rank") else 1,
         )
 

From e9575cae6c295ccbe4175ca04e5fc90acf6701cc Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 14:48:15 -0800
Subject: [PATCH 0293/1285] Buttons for undoing follow requests

---
 bookwyrm/templates/snippets/follow_button.html | 14 ++++++--------
 bookwyrm/urls.py                               |  4 ++--
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/bookwyrm/templates/snippets/follow_button.html b/bookwyrm/templates/snippets/follow_button.html
index 419aa211..eddf61cb 100644
--- a/bookwyrm/templates/snippets/follow_button.html
+++ b/bookwyrm/templates/snippets/follow_button.html
@@ -1,18 +1,12 @@
 {% load i18n %}
 {% if request.user == user or not request.user.is_authenticated %}
-{% elif request.user in user.follower_requests.all %}
-
-<div>
-    {% trans "Follow request already sent." %}
-</div>
-
 {% elif user in request.user.blocks.all %}
 {% include 'snippets/block_button.html' %}
 {% else %}
 
 <div class="field has-addons">
     <div class="control">
-        <form action="/follow/" method="POST" class="interaction follow-{{ user.id }} {% if request.user in user.followers.all %}hidden{%endif %}" data-id="follow-{{ user.id }}">
+        <form action="{% url 'follow' %}" method="POST" class="interaction follow-{{ user.id }} {% if request.user in user.followers.all or request.user in user.follower_requests.all %}hidden{%endif %}" data-id="follow-{{ user.id }}">
             {% csrf_token %}
             <input type="hidden" name="user" value="{{ user.username }}">
             {% if user.manually_approves_followers %}
@@ -21,10 +15,14 @@
                 <button class="button is-small is-link" type="submit">{% trans "Follow" %}</button>
             {% endif %}
         </form>
-        <form action="/unfollow/" method="POST" class="interaction follow-{{ user.id }} {% if not request.user in user.followers.all %}hidden{%endif %}" data-id="follow-{{ user.id }}">
+        <form action="{% url 'unfollow' %}" method="POST" class="interaction follow-{{ user.id }} {% if not request.user in user.followers.all and not request.user in user.follower_requests.all %}hidden{%endif %}" data-id="follow-{{ user.id }}">
             {% csrf_token %}
             <input type="hidden" name="user" value="{{ user.username }}">
+            {% if user.manually_approves_followers %}
+            <button class="button is-small is-danger is-light" type="submit">{% trans "Undo follow request" %}</button>
+            {% else %}
             <button class="button is-small is-danger is-light" type="submit">{% trans "Unfollow" %}</button>
+            {% endif %}
         </form>
     </div>
     <div class="control">
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index b645e943..3ef2a79b 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -188,8 +188,8 @@ urlpatterns = [
     re_path(r"^start-reading/(?P<book_id>\d+)/?$", views.start_reading),
     re_path(r"^finish-reading/(?P<book_id>\d+)/?$", views.finish_reading),
     # following
-    re_path(r"^follow/?$", views.follow),
-    re_path(r"^unfollow/?$", views.unfollow),
+    re_path(r"^follow/?$", views.follow, name="follow"),
+    re_path(r"^unfollow/?$", views.unfollow, name="unfollow"),
     re_path(r"^accept-follow-request/?$", views.accept_follow_request),
     re_path(r"^delete-follow-request/?$", views.delete_follow_request),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

From 4d7364d045ac27fa5bfa4cfe1375728a7e6c132e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 14:55:09 -0800
Subject: [PATCH 0294/1285] Undo follow request view

---
 .../templates/snippets/follow_button.html     |  2 +-
 bookwyrm/views/follow.py                      | 20 +++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/templates/snippets/follow_button.html b/bookwyrm/templates/snippets/follow_button.html
index eddf61cb..3df85a1a 100644
--- a/bookwyrm/templates/snippets/follow_button.html
+++ b/bookwyrm/templates/snippets/follow_button.html
@@ -18,7 +18,7 @@
         <form action="{% url 'unfollow' %}" method="POST" class="interaction follow-{{ user.id }} {% if not request.user in user.followers.all and not request.user in user.follower_requests.all %}hidden{%endif %}" data-id="follow-{{ user.id }}">
             {% csrf_token %}
             <input type="hidden" name="user" value="{{ user.username }}">
-            {% if user.manually_approves_followers %}
+            {% if user.manually_approves_followers and request.user not in user.followers.all %}
             <button class="button is-small is-danger is-light" type="submit">{% trans "Undo follow request" %}</button>
             {% else %}
             <button class="button is-small is-danger is-light" type="submit">{% trans "Unfollow" %}</button>
diff --git a/bookwyrm/views/follow.py b/bookwyrm/views/follow.py
index 515bf325..d9f455eb 100644
--- a/bookwyrm/views/follow.py
+++ b/bookwyrm/views/follow.py
@@ -40,10 +40,22 @@ def unfollow(request):
     except models.User.DoesNotExist:
         return HttpResponseBadRequest()
 
-    models.UserFollows.objects.get(
-        user_subject=request.user, user_object=to_unfollow
-    ).delete()
-    return redirect(to_unfollow.local_path)
+    try:
+        models.UserFollows.objects.get(
+            user_subject=request.user, user_object=to_unfollow
+        ).delete()
+    except models.UserFollows.DoesNotExist:
+        pass
+
+    try:
+        models.UserFollowRequest.objects.get(
+            user_subject=request.user, user_object=to_unfollow
+        ).delete()
+    except models.UserFollowRequest.DoesNotExist:
+        pass
+
+    # this is handled with ajax so it shouldn't really matter
+    return redirect(request.headers.get("Referer", "/"))
 
 
 @login_required

From e2d394d89477626290f7c274734f4f5c16012e6d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 15:04:23 -0800
Subject: [PATCH 0295/1285] Checks activity type in view test

---
 bookwyrm/tests/views/test_follow.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bookwyrm/tests/views/test_follow.py b/bookwyrm/tests/views/test_follow.py
index 67ac0f0b..6b4de05d 100644
--- a/bookwyrm/tests/views/test_follow.py
+++ b/bookwyrm/tests/views/test_follow.py
@@ -1,5 +1,7 @@
 """ test for app action functionality """
+import json
 from unittest.mock import patch
+
 from django.contrib.auth.models import Group, Permission
 from django.contrib.contenttypes.models import ContentType
 from django.test import TestCase
@@ -117,6 +119,8 @@ class BookViews(TestCase):
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
             views.unfollow(request)
             self.assertEqual(mock.call_count, 1)
+            activity = json.loads(mock.call_args_list[0][0][1])
+            self.assertEqual(activity["type"], "Undo")
 
         self.assertEqual(self.remote_user.followers.count(), 0)
 

From 6490a55274eb4cc2556be0a626fad0c3ebe23525 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 15:32:56 -0800
Subject: [PATCH 0296/1285] Handle incoming follow request cancellations

---
 bookwyrm/activitypub/verbs.py      |  8 +++++++-
 bookwyrm/tests/views/test_inbox.py | 31 ++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index 883eb895..c63cd5dc 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -69,7 +69,13 @@ class Undo(Verb):
         model = None
         if self.object.type == "Follow":
             model = apps.get_model("bookwyrm.UserFollows")
-        obj = self.object.to_model(model=model, save=False, allow_create=False)
+            obj = self.object.to_model(model=model, save=False, allow_create=False)
+            if not obj:
+                # this could be a folloq request not a follow proper
+                model = apps.get_model("bookwyrm.UserFollowRequest")
+                obj = self.object.to_model(model=model, save=False, allow_create=False)
+        else:
+            obj = self.object.to_model(model=model, save=False, allow_create=False)
         if not obj:
             # if we don't have the object, we can't undo it. happens a lot with boosts
             return
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index 3e52b475..0a8983f5 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -275,6 +275,37 @@ class Inbox(TestCase):
         follow = models.UserFollows.objects.all()
         self.assertEqual(list(follow), [])
 
+    def test_handle_undo_follow_request(self):
+        """ the requester cancels a follow request """
+        self.local_user.manually_approves_followers = True
+        self.local_user.save(broadcast=False)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            request = models.UserFollowRequest.objects.create(
+                user_subject=self.remote_user,
+                user_object=self.local_user
+            )
+        self.assertTrue(self.local_user.follower_requests.exists())
+
+        activity = {
+            "type": "Undo",
+            "id": "bleh",
+            "to": ["https://www.w3.org/ns/activitystreams#Public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "actor": self.remote_user.remote_id,
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "object": {
+                "@context": "https://www.w3.org/ns/activitystreams",
+                "id": request.remote_id,
+                "type": "Follow",
+                "actor": "https://example.com/users/rat",
+                "object": "https://example.com/user/mouse",
+            }
+        }
+
+        views.inbox.activity_task(activity)
+
+        self.assertFalse(self.local_user.follower_requests.exists())
+
     def test_handle_unfollow(self):
         """ remove a relationship """
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):

From 54682d6f5c0e3d8d73111d6507d0a00577035538 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 15:36:00 -0800
Subject: [PATCH 0297/1285] Formatting

---
 bookwyrm/tests/views/test_inbox.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index 0a8983f5..b681b961 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -281,8 +281,7 @@ class Inbox(TestCase):
         self.local_user.save(broadcast=False)
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             request = models.UserFollowRequest.objects.create(
-                user_subject=self.remote_user,
-                user_object=self.local_user
+                user_subject=self.remote_user, user_object=self.local_user
             )
         self.assertTrue(self.local_user.follower_requests.exists())
 
@@ -299,7 +298,7 @@ class Inbox(TestCase):
                 "type": "Follow",
                 "actor": "https://example.com/users/rat",
                 "object": "https://example.com/user/mouse",
-            }
+            },
         }
 
         views.inbox.activity_task(activity)

From d802f4b85e6db5e3b4135548a0a906acada4d70c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 15:57:54 -0800
Subject: [PATCH 0298/1285] Fixes layout showing wrong user in header on user
 page

---
 bookwyrm/templates/layout.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index fc2ebdb7..7b005853 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -79,7 +79,7 @@
                     aria-controls="navbar-dropdown"
                 >
                     {% include 'snippets/avatar.html' with user=request.user %}
-                    <span class="ml-2">{{ user.display_name }}</span>
+                    <span class="ml-2">{{ request.user.display_name }}</span>
                 </a>
                 <ul class="navbar-dropdown" id="navbar-dropdown">
                     <li>

From 23cca85ee39043d4215725b7f592ae913a8e1026 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 17:31:06 -0800
Subject: [PATCH 0299/1285] Fixes busted author path in confirmation step

---
 bookwyrm/templates/edit_book.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/edit_book.html
index 7c660e9c..a19e78f4 100644
--- a/bookwyrm/templates/edit_book.html
+++ b/bookwyrm/templates/edit_book.html
@@ -48,7 +48,7 @@
                     {% for match in author.matches %}
                     <label><input type="radio" name="author_match-{{ counter }}" value="{{ match.id }}" required> {{ match.name }}</label>
                     <p class="help">
-                        <a href="{{ author.local_path }}" target="_blank">{% blocktrans with book_title=match.book_set.first.title %}Author of <em>{{ book_title }}</em>{% endblocktrans %}</a>
+                        <a href="{{ match.local_path }}" target="_blank">{% blocktrans with book_title=match.book_set.first.title %}Author of <em>{{ book_title }}</em>{% endblocktrans %}</a>
                     </p>
                     {% endfor %}
                     <label><input type="radio" name="author_match-{{ counter }}" value="0" required> {% trans "This is a new author" %}</label>

From 8e71186067e722d7e1ba5fc3db76e2d4f26c8f44 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 18:09:09 -0800
Subject: [PATCH 0300/1285] Fixes adding mutiple authors

---
 bookwyrm/templates/edit_book.html |  5 +++--
 bookwyrm/tests/views/test_book.py |  6 ++++--
 bookwyrm/views/books.py           | 31 +++++++++++++++++--------------
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/edit_book.html
index a19e78f4..401dc294 100644
--- a/bookwyrm/templates/edit_book.html
+++ b/bookwyrm/templates/edit_book.html
@@ -40,18 +40,19 @@
         <h2 class="title is-4">{% trans "Confirm Book Info" %}</h2>
         <div class="columns">
             {% if author_matches %}
+            <input type="hidden" name="author-match-count" value="{{ author_matches|length }}">
             <div class="column is-half">
                 {% for author in author_matches %}
                 <fieldset class="mb-4">
                     <legend class="title is-5 mb-1">{% blocktrans with name=author.name %}Is "{{ name }}" an existing author?{% endblocktrans %}</legend>
-                    {% with forloop.counter as counter %}
+                    {% with forloop.counter0 as counter %}
                     {% for match in author.matches %}
                     <label><input type="radio" name="author_match-{{ counter }}" value="{{ match.id }}" required> {{ match.name }}</label>
                     <p class="help">
                         <a href="{{ match.local_path }}" target="_blank">{% blocktrans with book_title=match.book_set.first.title %}Author of <em>{{ book_title }}</em>{% endblocktrans %}</a>
                     </p>
                     {% endfor %}
-                    <label><input type="radio" name="author_match-{{ counter }}" value="0" required> {% trans "This is a new author" %}</label>
+                    <label><input type="radio" name="author_match-{{ counter }}" value="{{ author.name }}" required> {% trans "This is a new author" %}</label>
                     {% endwith %}
                 </fieldset>
                 {% endfor %}
diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index 1549bdc6..850be8db 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -109,7 +109,8 @@ class BookViews(TestCase):
         form = forms.EditionForm(instance=self.book)
         form.data["title"] = "New Title"
         form.data["last_edited_by"] = self.local_user.id
-        form.data["add_author"] = "Sappho"
+        form.data["author-match-count"] = 1
+        form.data["author_match-0"] = "Sappho"
         request = self.factory.post("", form.data)
         request.user = self.local_user
 
@@ -175,7 +176,8 @@ class BookViews(TestCase):
         self.local_user.groups.add(self.group)
         form = forms.EditionForm()
         form.data["title"] = "New Title"
-        form.data["add_author"] = "Sappho"
+        form.data["author-match-count"] = "1"
+        form.data["author_match-0"] = "Sappho"
         form.data["last_edited_by"] = self.local_user.id
         request = self.factory.post("", form.data)
         request.user = self.local_user
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 0a11b87c..0b23b0d6 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -4,7 +4,7 @@ from django.contrib.postgres.search import SearchRank, SearchVector
 from django.core.paginator import Paginator
 from django.db import transaction
 from django.db.models import Avg, Q
-from django.http import HttpResponseNotFound
+from django.http import HttpResponseBadRequest, HttpResponseNotFound
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
@@ -145,12 +145,13 @@ class EditBook(View):
                         "name": author.strip(),
                         "matches": (
                             models.Author.objects.annotate(search=vector)
-                            .annotate(rank=SearchRank(vector, add_author))
+                            .annotate(rank=SearchRank(vector, author))
                             .filter(rank__gt=0.4)
                             .order_by("-rank")[:5]
                         ),
                     }
                 )
+                print(data["author_matches"])
 
         # we're creating a new book
         if not book:
@@ -200,18 +201,20 @@ class ConfirmEditBook(View):
             book = form.save()
 
             # get or create author as needed
-            if request.POST.get("add_author"):
-                for (i, author) in enumerate(request.POST.get("add_author").split(",")):
-                    if not author:
-                        continue
-                    match = request.POST.get("author_match-%d" % i)
-                    if match and match != "0":
-                        author = get_object_or_404(
-                            models.Author, id=request.POST["author_match-%d" % i]
-                        )
-                    else:
-                        author = models.Author.objects.create(name=author.strip())
-                    book.authors.add(author)
+            for i in range(int(request.POST.get("author-match-count", 0))):
+                match = request.POST.get("author_match-%d" % i)
+                if not match:
+                    return HttpResponseBadRequest()
+                try:
+                    # if it's an int, it's an ID
+                    match = int(match)
+                    author = get_object_or_404(
+                        models.Author, id=request.POST["author_match-%d" % i]
+                    )
+                except ValueError:
+                    # otherwise it's a name
+                    author = models.Author.objects.create(name=match)
+                book.authors.add(author)
 
             # create work, if needed
             if not book_id:

From aa2950daf35041d3e4d4e9b9b330d885daab6e70 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 13 Mar 2021 18:24:35 -0800
Subject: [PATCH 0301/1285] Render rating status from template

---
 bookwyrm/models/status.py                                | 4 +++-
 bookwyrm/templates/snippets/generated_status/rating.html | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 bookwyrm/templates/snippets/generated_status/rating.html

diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index c5e69936..0e18dc1b 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -5,6 +5,7 @@ import re
 from django.apps import apps
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
+from django.template.loader import get_template
 from django.utils import timezone
 from model_utils.managers import InheritanceManager
 
@@ -309,7 +310,8 @@ class ReviewRating(Review):
 
     @property
     def pure_content(self):
-        return 'Rated "{}": {:d} stars'.format(self.book.title, self.rating)
+        template = get_template("snippets/generated_status/rating.html")
+        return template.render({"book": self.book, "rating": self.rating}).strip()
 
     activity_serializer = activitypub.Rating
     pure_type = "Note"
diff --git a/bookwyrm/templates/snippets/generated_status/rating.html b/bookwyrm/templates/snippets/generated_status/rating.html
new file mode 100644
index 00000000..e4e42fca
--- /dev/null
+++ b/bookwyrm/templates/snippets/generated_status/rating.html
@@ -0,0 +1,5 @@
+{% load i18n %}{% load humanize %}{{% spaceless %}
+
+{% blocktrans with title=book.title path=book.local_path rating=rating %}Rated <em><a href="{{ path }}">{{ title }}</a> </em>: {{ rating }} stars{% endblocktrans %}
+
+{% endspaceless %}

From 99ba39413e2d3d4231ab27f2ecfa8a88da0545c8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 15 Mar 2021 10:05:08 -0700
Subject: [PATCH 0302/1285] Fixes upload and display of logos in admin panel

---
 bookwyrm/templates/settings/site.html  | 2 +-
 bookwyrm/templates/snippets/about.html | 2 +-
 bookwyrm/views/site.py                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/settings/site.html b/bookwyrm/templates/settings/site.html
index 2e43bb74..27be0c9b 100644
--- a/bookwyrm/templates/settings/site.html
+++ b/bookwyrm/templates/settings/site.html
@@ -7,7 +7,7 @@
 
 {% block panel %}
 
-<form action="{% url 'settings-site' %}" method="POST" class="content">
+<form action="{% url 'settings-site' %}" method="POST" class="content" enctype="multipart/form-data">
     {% csrf_token %}
     <section class="block" id="instance-info">
         <h2 class="title is-4">{% trans "Instance Info" %}</h2>
diff --git a/bookwyrm/templates/snippets/about.html b/bookwyrm/templates/snippets/about.html
index aad5d5de..820fb575 100644
--- a/bookwyrm/templates/snippets/about.html
+++ b/bookwyrm/templates/snippets/about.html
@@ -1,7 +1,7 @@
 <div class="columns">
     <div class="column is-narrow is-hidden-mobile">
         <figure class="block">
-            <img src="{% if site.logo_small %}/images/{{ site.logo }}{% else %}/static/images/logo.png{% endif %}" alt="BookWyrm logo">
+            <img src="{% if site.logo %}/images/{{ site.logo }}{% else %}/static/images/logo.png{% endif %}" alt="BookWyrm logo">
         </figure>
     </div>
     <div class="content">
diff --git a/bookwyrm/views/site.py b/bookwyrm/views/site.py
index c40a9e76..ce64e6e0 100644
--- a/bookwyrm/views/site.py
+++ b/bookwyrm/views/site.py
@@ -26,7 +26,7 @@ class Site(View):
     def post(self, request):
         """ edit the site settings """
         site = models.SiteSettings.objects.get()
-        form = forms.SiteForm(request.POST, instance=site)
+        form = forms.SiteForm(request.POST, request.FILES, instance=site)
         if not form.is_valid():
             data = {"site_form": form}
             return TemplateResponse(request, "settings/site.html", data)

From 220f2c1eb4b214887ce43df95c0407f6043f5ea8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 15 Mar 2021 13:55:48 -0700
Subject: [PATCH 0303/1285] Fixes image attachments

---
 bookwyrm/activitypub/image.py        |  4 +--
 bookwyrm/models/activitypub_mixin.py |  6 +++-
 bookwyrm/models/attachment.py        |  6 +++-
 bookwyrm/tests/views/test_feed.py    | 45 ++++++++++++++++++++++++++--
 4 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/activitypub/image.py b/bookwyrm/activitypub/image.py
index 248e7a4a..931de977 100644
--- a/bookwyrm/activitypub/image.py
+++ b/bookwyrm/activitypub/image.py
@@ -9,5 +9,5 @@ class Image(ActivityObject):
 
     url: str
     name: str = ""
-    type: str = "Image"
-    id: str = ""
+    type: str = "Document"
+    id: str = None
diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index 0a3c33a1..23ac1642 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -445,7 +445,11 @@ def unfurl_related_field(related_field, sort_field=None):
             unfurl_related_field(i) for i in related_field.order_by(sort_field).all()
         ]
     if related_field.reverse_unfurl:
-        return related_field.field_to_activity()
+        # if it's a one-to-one (key pair)
+        if hasattr(related_field, "field_to_activity"):
+            return related_field.field_to_activity()
+        # if it's one-to-many (attachments)
+        return related_field.to_activity()
     return related_field.remote_id
 
 
diff --git a/bookwyrm/models/attachment.py b/bookwyrm/models/attachment.py
index 0cd2c111..8d2238a1 100644
--- a/bookwyrm/models/attachment.py
+++ b/bookwyrm/models/attachment.py
@@ -25,7 +25,11 @@ class Image(Attachment):
     """ an image attachment """
 
     image = fields.ImageField(
-        upload_to="status/", null=True, blank=True, activitypub_field="url"
+        upload_to="status/",
+        null=True,
+        blank=True,
+        activitypub_field="url",
+        alt_field="caption",
     )
     caption = fields.TextField(null=True, blank=True, activitypub_field="name")
 
diff --git a/bookwyrm/tests/views/test_feed.py b/bookwyrm/tests/views/test_feed.py
index c54be006..42668467 100644
--- a/bookwyrm/tests/views/test_feed.py
+++ b/bookwyrm/tests/views/test_feed.py
@@ -1,5 +1,10 @@
 """ test for app action functionality """
+from io import BytesIO
 from unittest.mock import patch
+import pathlib
+
+from PIL import Image
+from django.core.files.base import ContentFile
 from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
@@ -9,8 +14,8 @@ from bookwyrm import views
 from bookwyrm.activitypub import ActivitypubResponse
 
 
-class FeedMessageViews(TestCase):
-    """ dms """
+class FeedViews(TestCase):
+    """ activity feed, statuses, dms """
 
     def setUp(self):
         """ we need basic test data and mocks """
@@ -59,6 +64,42 @@ class FeedMessageViews(TestCase):
         self.assertIsInstance(result, ActivitypubResponse)
         self.assertEqual(result.status_code, 200)
 
+    def test_status_page_with_image(self):
+        """ there are so many views, this just makes sure it LOADS """
+        view = views.Status.as_view()
+
+        image_file = pathlib.Path(__file__).parent.joinpath(
+            "../../static/images/default_avi.jpg"
+        )
+        image = Image.open(image_file)
+        output = BytesIO()
+        image.save(output, format=image.format)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            status = models.Review.objects.create(
+                content="hi",
+                user=self.local_user,
+                book=self.book,
+            )
+            attachment = models.Image.objects.create(
+                status=status, caption="alt text here"
+            )
+            attachment.image.save("test.jpg", ContentFile(output.getvalue()))
+
+        request = self.factory.get("")
+        request.user = self.local_user
+        with patch("bookwyrm.views.feed.is_api_request") as is_api:
+            is_api.return_value = False
+            result = view(request, "mouse", status.id)
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+
+        with patch("bookwyrm.views.feed.is_api_request") as is_api:
+            is_api.return_value = True
+            result = view(request, "mouse", status.id)
+        self.assertIsInstance(result, ActivitypubResponse)
+        self.assertEqual(result.status_code, 200)
+
     def test_replies_page(self):
         """ there are so many views, this just makes sure it LOADS """
         view = views.Replies.as_view()

From 6bd0f94269e317a0e36bf7ea0cba191ad6d38dd3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 15 Mar 2021 14:09:04 -0700
Subject: [PATCH 0304/1285] Adds plural version for rating text

---
 bookwyrm/templates/snippets/generated_status/rating.html | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/snippets/generated_status/rating.html b/bookwyrm/templates/snippets/generated_status/rating.html
index e4e42fca..13afd94d 100644
--- a/bookwyrm/templates/snippets/generated_status/rating.html
+++ b/bookwyrm/templates/snippets/generated_status/rating.html
@@ -1,5 +1,3 @@
-{% load i18n %}{% load humanize %}{{% spaceless %}
+{% load i18n %}{% load humanize %}
 
-{% blocktrans with title=book.title path=book.local_path rating=rating %}Rated <em><a href="{{ path }}">{{ title }}</a> </em>: {{ rating }} stars{% endblocktrans %}
-
-{% endspaceless %}
+{% blocktrans with title=book.title path=book.remote_id rating=rating count counter=rating %}Rated <em><a href="{{ path }}">{{ title }}</a></em>: {{ rating }} star{% plural %}Rated <em><a href="{{ path }}">{{ title }}</a></em>: {{ rating }} stars{% endblocktrans %}

From 6e6417cb91afe204bd5a4b04256cb682203d74ff Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 15 Mar 2021 14:26:15 -0700
Subject: [PATCH 0308/1285] Updates readme from production copy

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3d5ea4a7..414c0164 100644
--- a/README.md
+++ b/README.md
@@ -169,13 +169,15 @@ Instructions for running BookWyrm in production:
    - Set a secure database password for postgres
  - Update your nginx configuration in `nginx/default.conf`
    - Replace `your-domain.com` with your domain name
+   - If you aren't using the `www` subdomain, remove the www.your-domain.com version of the domain from the `server_name` in the first server block in `nginx/default.conf` and remove the `-d www.${DOMAIN}` flag at the end of the `certbot` command in `docker-compose.yml`.
    - If you are running another web-server on your host machine, you will need to follow the [reverse-proxy instructions](#running-bookwyrm-behind-a-reverse-proxy)
  - Run the application (this should also set up a Certbot ssl cert for your domain) with
   `docker-compose up --build`, and make sure all the images build successfully
     - If you are running other services on your host machine, you may run into errors where services fail when attempting to bind to a port.
     See the [troubleshooting guide](#port-conflicts) for advice on resolving this.
  - When docker has built successfully, stop the process with `CTRL-C`
- - Comment out the `command: certonly...` line in `docker-compose.yml`
+ - Comment out the `command: certonly...` line in `docker-compose.yml`, and uncomment the following line (`command: renew ...`) so that the certificate will be automatically renewed.
+ - Uncomment the https redirect and `server` block in `nginx/default.conf` (lines 17-48).
  - Run docker-compose in the background with: `docker-compose up -d`
  - Initialize the database with: `./bw-dev initdb`
 

From f0a936f15ebfd5d73527ac3105341d35f2e82074 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 15 Mar 2021 14:44:03 -0700
Subject: [PATCH 0309/1285] Add books to lists from the book page

---
 bookwyrm/templates/book.html       | 22 +++++++++++++++++++++-
 bookwyrm/templates/lists/list.html |  3 ++-
 bookwyrm/urls.py                   |  2 +-
 bookwyrm/views/list.py             |  6 +++---
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html
index ee1ea270..a96c6096 100644
--- a/bookwyrm/templates/book.html
+++ b/bookwyrm/templates/book.html
@@ -233,7 +233,7 @@
             </section>
             {% endif %}
 
-            {% if lists.exists %}
+            {% if lists.exists or request.user.list_set.exists %}
             <section class="content block">
                 <h2 class="title is-5">{% trans "Lists" %}</h2>
                 <ul>
@@ -241,6 +241,26 @@
                 <li><a href="{{ list.local_path }}">{{ list.name }}</a></li>
                 {% endfor %}
                 </ul>
+
+                {% if request.user.list_set.exists %}
+                <form name="list-add" method="post" action="{% url 'list-add-book' %}">
+                    {% csrf_token %}
+                    <input type="hidden" name="book" value="{{ book.id }}">
+                    <label class="label" for="id_list">{% trans "Add to list" %}</label>
+                    <div class="field has-addons">
+                        <div class="select control">
+                            <select name="list" id="id_list">
+                                {% for list in user.list_set.all %}
+                                <option value="{{ list.id }}">{{ list.name }}</option>
+                                {% endfor %}
+                            </select>
+                        </div>
+                        <div class="control">
+                            <button type="submit" class="button is-link">{% trans "Add" %}</button>
+                        </div>
+                    </div>
+                </form>
+                {% endif %}
             </section>
             {% endif %}
         </div>
diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index ddac04f3..b4f3e5de 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -83,9 +83,10 @@
             </div>
             <div class="column">
                 <p>{% include 'snippets/book_titleby.html' with book=book %}</p>
-                <form name="add-book" method="post" action="{% url 'list-add-book' list.id %}">
+                <form name="add-book" method="post" action="{% url 'list-add-book' %}">
                     {% csrf_token %}
                     <input type="hidden" name="book" value="{{ book.id }}">
+                    <input type="hidden" name="list" value="{{ list.id }}">
                     <button type="submit" class="button is-small is-link">{% if list.curation == 'open' or request.user == list.user %}{% trans "Add" %}{% else %}{% trans "Suggest" %}{% endif %}</button>
                 </form>
             </div>
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 3ef2a79b..05382e93 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -118,7 +118,7 @@ urlpatterns = [
     re_path(r"^list/?$", views.Lists.as_view(), name="lists"),
     re_path(r"^list/(?P<list_id>\d+)(.json)?/?$", views.List.as_view(), name="list"),
     re_path(
-        r"^list/(?P<list_id>\d+)/add/?$", views.list.add_book, name="list-add-book"
+        r"^list/add-book/?$", views.list.add_book, name="list-add-book"
     ),
     re_path(
         r"^list/(?P<list_id>\d+)/remove/?$",
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index ba3200d1..eb82a0f1 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -173,9 +173,9 @@ class Curate(View):
 
 
 @require_POST
-def add_book(request, list_id):
+def add_book(request):
     """ put a book on a list """
-    book_list = get_object_or_404(models.List, id=list_id)
+    book_list = get_object_or_404(models.List, id=request.POST.get('list'))
     if not object_visible_to_user(request.user, book_list):
         return HttpResponseNotFound()
 
@@ -204,7 +204,7 @@ def add_book(request, list_id):
         # if the book is already on the list, don't flip out
         pass
 
-    return redirect("list", list_id)
+    return redirect("list", book_list.id)
 
 
 @require_POST

From f79bb60d81a2bff5ac5c6ff8e49a81d67fda0387 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 15 Mar 2021 15:08:20 -0700
Subject: [PATCH 0310/1285] Adds ability to reset default edition based on
 computer ranks

---
 bookwyrm/models/book.py          | 19 ++++++++++++++++---
 bookwyrm/templates/editions.html |  2 +-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index 66b539bb..5306950c 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -1,7 +1,7 @@
 """ database schema for books and shelves """
 import re
 
-from django.db import models
+from django.db import models, transaction
 from model_utils.managers import InheritanceManager
 
 from bookwyrm import activitypub
@@ -148,6 +148,15 @@ class Work(OrderedCollectionPageMixin, Book):
         """ in case the default edition is not set """
         return self.default_edition or self.editions.order_by("-edition_rank").first()
 
+    @transaction.atomic()
+    def reset_default_edition(self):
+        """ sets a new default edition based on computed rank """
+        self.default_edition = None
+        # editions are re-ranked implicitly
+        self.save()
+        self.default_edition = self.get_default_edition()
+        self.save()
+
     def to_edition_list(self, **kwargs):
         """ an ordered collection of editions """
         return self.to_ordered_collection(
@@ -200,9 +209,13 @@ class Edition(Book):
     activity_serializer = activitypub.Edition
     name_field = "title"
 
-    def get_rank(self):
+    def get_rank(self, ignore_default=False):
         """ calculate how complete the data is on this edition """
-        if self.parent_work and self.parent_work.default_edition == self:
+        if (
+            not ignore_default
+            and self.parent_work
+            and self.parent_work.default_edition == self
+        ):
             # default edition has the highest rank
             return 20
         rank = 0
diff --git a/bookwyrm/templates/editions.html b/bookwyrm/templates/editions.html
index 38147a86..f8319757 100644
--- a/bookwyrm/templates/editions.html
+++ b/bookwyrm/templates/editions.html
@@ -6,7 +6,7 @@
 
 {% block content %}
 <div class="block">
-    <h1 class="title">{% blocktrans with path=work.local_path work_title=work.title %}Editions of <a href="{{ work_path }}">"{{ work_title }}"</a>{% endblocktrans %}</h1>
+    <h1 class="title">{% blocktrans with work_path=work.local_path work_title=work.title %}Editions of <a href="{{ work_path }}">"{{ work_title }}"</a>{% endblocktrans %}</h1>
 
     {% include 'snippets/book_tiles.html' with books=editions %}
 </div>

From b3951a77d9aae7f81c71ed010c788d0e27c55f2a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 15 Mar 2021 15:28:50 -0700
Subject: [PATCH 0311/1285] Adds publishers to edit book form

---
 bookwyrm/templates/edit_book.html | 45 ++++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/edit_book.html
index 401dc294..5c21ac95 100644
--- a/bookwyrm/templates/edit_book.html
+++ b/bookwyrm/templates/edit_book.html
@@ -88,31 +88,46 @@
         <div class="column">
             <section class="block">
                 <h2 class="title is-4">{% trans "Metadata" %}</h2>
-                <p class="fields is-grouped"><label class="label" for="id_title">{% trans "Title:" %}</label> {{ form.title }} </p>
+                <p class="mb-2"><label class="label" for="id_title">{% trans "Title:" %}</label> {{ form.title }} </p>
                 {% for error in form.title.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
-                <p class="fields is-grouped"><label class="label" for="id_subtitle">{% trans "Subtitle:" %}</label> {{ form.subtitle }} </p>
+
+                <p class="mb-2"><label class="label" for="id_subtitle">{% trans "Subtitle:" %}</label> {{ form.subtitle }} </p>
                 {% for error in form.subtitle.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
-                <p class="fields is-grouped"><label class="label" for="id_description">{% trans "Description:" %}</label> {{ form.description }} </p>
+
+                <p class="mb-2"><label class="label" for="id_description">{% trans "Description:" %}</label> {{ form.description }} </p>
                 {% for error in form.description.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
-                <p class="fields is-grouped"><label class="label" for="id_series">{% trans "Series:" %}</label> {{ form.series }} </p>
+
+                <p class="mb-2"><label class="label" for="id_series">{% trans "Series:" %}</label> {{ form.series }} </p>
                 {% for error in form.series.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
-                <p class="fields is-grouped"><label class="label" for="id_series_number">{% trans "Series number:" %}</label> {{ form.series_number }} </p>
+
+                <p class="mb-2"><label class="label" for="id_series_number">{% trans "Series number:" %}</label> {{ form.series_number }} </p>
                 {% for error in form.series_number.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
-                <p class="fields is-grouped"><label class="label" for="id_first_published_date">{% trans "First published date:" %}</label> {{ form.first_published_date }} </p>
+
+                <p class="mb-2">
+                    <label class="label" for="id_publishers">{% trans "Publisher:" %}</label>
+                    {{ form.publishers }}
+                    <span class="help">{% trans "Separate multiple publishers with commas." %}</span>
+                </p>
+                {% for error in form.publishers.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+
+                <p class="mb-2"><label class="label" for="id_first_published_date">{% trans "First published date:" %}</label> {{ form.first_published_date }} </p>
                 {% for error in form.first_published_date.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
-                <p class="fields is-grouped"><label class="label" for="id_published_date">{% trans "Published date:" %}</label> {{ form.published_date }} </p>
+
+                <p class="mb-2"><label class="label" for="id_published_date">{% trans "Published date:" %}</label> {{ form.published_date }} </p>
                 {% for error in form.published_date.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
@@ -131,8 +146,8 @@
                 </fieldset>
                 {% endif %}
                 <label class="label" for="id_add_author">{% trans "Add Authors:" %}</label>
-                <p class="help">Separate multiple author names with commas.</p>
                 <input class="input" type="text" name="add_author" id="id_add_author" placeholder="{% trans 'John Doe, Jane Smith' %}" value="{{ add_author }}" {% if confirm_mode %}readonly{% endif %}>
+                <p class="help">Separate multiple author names with commas.</p>
             </section>
         </div>
 
@@ -154,7 +169,7 @@
 
             <div class="block">
                 <h2 class="title is-4">{% trans "Physical Properties" %}</h2>
-                <p class="fields is-grouped"><label class="label" for="id_physical_format">{% trans "Format:" %}</label> {{ form.physical_format }} </p>
+                <p class="mb-2"><label class="label" for="id_physical_format">{% trans "Format:" %}</label> {{ form.physical_format }} </p>
                 {% for error in form.physical_format.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
@@ -162,7 +177,7 @@
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
 
-                <p class="fields is-grouped"><label class="label" for="id_pages">{% trans "Pages:" %}</label> {{ form.pages }} </p>
+                <p class="mb-2"><label class="label" for="id_pages">{% trans "Pages:" %}</label> {{ form.pages }} </p>
                 {% for error in form.pages.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
@@ -170,23 +185,23 @@
 
             <div class="block">
                 <h2 class="title is-4">{% trans "Book Identifiers" %}</h2>
-                <p class="fields is-grouped"><label class="label" for="id_isbn_13">{% trans "ISBN 13:" %}</label> {{ form.isbn_13 }} </p>
+                <p class="mb-2"><label class="label" for="id_isbn_13">{% trans "ISBN 13:" %}</label> {{ form.isbn_13 }} </p>
                 {% for error in form.isbn_13.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
-                <p class="fields is-grouped"><label class="label" for="id_isbn_10">{% trans "ISBN 10:" %}</label> {{ form.isbn_10 }} </p>
+                <p class="mb-2"><label class="label" for="id_isbn_10">{% trans "ISBN 10:" %}</label> {{ form.isbn_10 }} </p>
                 {% for error in form.isbn_10.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
-                <p class="fields is-grouped"><label class="label" for="id_openlibrary_key">{% trans "Openlibrary key:" %}</label> {{ form.openlibrary_key }} </p>
+                <p class="mb-2"><label class="label" for="id_openlibrary_key">{% trans "Openlibrary key:" %}</label> {{ form.openlibrary_key }} </p>
                 {% for error in form.openlibrary_key.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
-                <p class="fields is-grouped"><label class="label" for="id_oclc_number">{% trans "OCLC Number:" %}</label> {{ form.oclc_number }} </p>
+                <p class="mb-2"><label class="label" for="id_oclc_number">{% trans "OCLC Number:" %}</label> {{ form.oclc_number }} </p>
                 {% for error in form.oclc_number.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
-                <p class="fields is-grouped"><label class="label" for="id_asin">{% trans "ASIN:" %}</label> {{ form.asin }} </p>
+                <p class="mb-2"><label class="label" for="id_asin">{% trans "ASIN:" %}</label> {{ form.asin }} </p>
                 {% for error in form.ASIN.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}

From b1335d28111c82606503b8cf4a78b546edb51cf4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 15 Mar 2021 15:33:05 -0700
Subject: [PATCH 0314/1285] Formatting

---
 bookwyrm/urls.py       | 4 +---
 bookwyrm/views/list.py | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 05382e93..199827ae 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -117,9 +117,7 @@ urlpatterns = [
     # lists
     re_path(r"^list/?$", views.Lists.as_view(), name="lists"),
     re_path(r"^list/(?P<list_id>\d+)(.json)?/?$", views.List.as_view(), name="list"),
-    re_path(
-        r"^list/add-book/?$", views.list.add_book, name="list-add-book"
-    ),
+    re_path(r"^list/add-book/?$", views.list.add_book, name="list-add-book"),
     re_path(
         r"^list/(?P<list_id>\d+)/remove/?$",
         views.list.remove_book,
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index eb82a0f1..91475d48 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -175,7 +175,7 @@ class Curate(View):
 @require_POST
 def add_book(request):
     """ put a book on a list """
-    book_list = get_object_or_404(models.List, id=request.POST.get('list'))
+    book_list = get_object_or_404(models.List, id=request.POST.get("list"))
     if not object_visible_to_user(request.user, book_list):
         return HttpResponseNotFound()
 

From d947632b690ccab266e7022b07c2eb6aac02131f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 15 Mar 2021 15:39:16 -0700
Subject: [PATCH 0315/1285] Adds publisher to book cover alt text

---
 bookwyrm/models/book.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index 66b539bb..82aec7b6 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -96,6 +96,7 @@ class Book(BookDataModel):
             if self.languages and self.languages[0] != "English"
             else None,
             str(self.published_date.year) if self.published_date else None,
+            ', '.join(self.publishers)
         ]
         return ", ".join(i for i in items if i)
 

From 0037a22cb63da0b799fe6d27055e03d32bae5624 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 15 Mar 2021 15:41:11 -0700
Subject: [PATCH 0316/1285] Updates list tests

---
 bookwyrm/tests/views/test_list.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/tests/views/test_list.py b/bookwyrm/tests/views/test_list.py
index cc895ad1..c2c75453 100644
--- a/bookwyrm/tests/views/test_list.py
+++ b/bookwyrm/tests/views/test_list.py
@@ -271,11 +271,12 @@ class ListViews(TestCase):
             "",
             {
                 "book": self.book.id,
+                "list": self.list.id,
             },
         )
         request.user = self.local_user
 
-        views.list.add_book(request, self.list.id)
+        views.list.add_book(request)
         item = self.list.listitem_set.get()
         self.assertEqual(item.book, self.book)
         self.assertEqual(item.user, self.local_user)
@@ -300,11 +301,12 @@ class ListViews(TestCase):
             "",
             {
                 "book": self.book.id,
+                "list": self.list.id,
             },
         )
         request.user = self.rat
 
-        views.list.add_book(request, self.list.id)
+        views.list.add_book(request)
         item = self.list.listitem_set.get()
         self.assertEqual(item.book, self.book)
         self.assertEqual(item.user, self.rat)
@@ -330,11 +332,12 @@ class ListViews(TestCase):
             "",
             {
                 "book": self.book.id,
+                "list": self.list.id,
             },
         )
         request.user = self.rat
 
-        views.list.add_book(request, self.list.id)
+        views.list.add_book(request)
         item = self.list.listitem_set.get()
         self.assertEqual(item.book, self.book)
         self.assertEqual(item.user, self.rat)
@@ -360,11 +363,12 @@ class ListViews(TestCase):
             "",
             {
                 "book": self.book.id,
+                "list": self.list.id,
             },
         )
         request.user = self.local_user
 
-        views.list.add_book(request, self.list.id)
+        views.list.add_book(request)
         item = self.list.listitem_set.get()
         self.assertEqual(item.book, self.book)
         self.assertEqual(item.user, self.local_user)

From 20bcbb1a3ca8b1895a1fb351d130a37ef23c4254 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 15 Mar 2021 15:44:26 -0700
Subject: [PATCH 0317/1285] Updates image type to Document in status model
 tests

---
 bookwyrm/tests/models/test_status_model.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py
index b2ee69b8..1dcf5633 100644
--- a/bookwyrm/tests/models/test_status_model.py
+++ b/bookwyrm/tests/models/test_status_model.py
@@ -169,7 +169,7 @@ class Status(TestCase):
         self.assertEqual(activity["type"], "Note")
         self.assertEqual(activity["sensitive"], False)
         self.assertIsInstance(activity["attachment"], list)
-        self.assertEqual(activity["attachment"][0].type, "Image")
+        self.assertEqual(activity["attachment"][0].type, "Document")
         self.assertEqual(
             activity["attachment"][0].url,
             "https://%s%s" % (settings.DOMAIN, self.book.cover.url),
@@ -200,7 +200,7 @@ class Status(TestCase):
             'test content<p>(comment on <a href="%s">"Test Edition"</a>)</p>'
             % self.book.remote_id,
         )
-        self.assertEqual(activity["attachment"][0].type, "Image")
+        self.assertEqual(activity["attachment"][0].type, "Document")
         self.assertEqual(
             activity["attachment"][0].url,
             "https://%s%s" % (settings.DOMAIN, self.book.cover.url),
@@ -238,7 +238,7 @@ class Status(TestCase):
             'a sickening sense <p>-- <a href="%s">"Test Edition"</a></p>'
             "test content" % self.book.remote_id,
         )
-        self.assertEqual(activity["attachment"][0].type, "Image")
+        self.assertEqual(activity["attachment"][0].type, "Document")
         self.assertEqual(
             activity["attachment"][0].url,
             "https://%s%s" % (settings.DOMAIN, self.book.cover.url),
@@ -278,7 +278,7 @@ class Status(TestCase):
             activity["name"], 'Review of "%s" (3 stars): Review name' % self.book.title
         )
         self.assertEqual(activity["content"], "test content")
-        self.assertEqual(activity["attachment"][0].type, "Image")
+        self.assertEqual(activity["attachment"][0].type, "Document")
         self.assertEqual(
             activity["attachment"][0].url,
             "https://%s%s" % (settings.DOMAIN, self.book.cover.url),

From 5a24c97cb5cc521b6883f6c41e765b191f01a574 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 15 Mar 2021 15:45:18 -0700
Subject: [PATCH 0318/1285] Updates image type in fields tests

---
 bookwyrm/tests/models/test_fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/tests/models/test_fields.py b/bookwyrm/tests/models/test_fields.py
index 522d16f9..28faf52c 100644
--- a/bookwyrm/tests/models/test_fields.py
+++ b/bookwyrm/tests/models/test_fields.py
@@ -404,7 +404,7 @@ class ActivitypubFields(TestCase):
             )
         )
         self.assertEqual(output.name, "alt text")
-        self.assertEqual(output.type, "Image")
+        self.assertEqual(output.type, "Document")
 
         instance = fields.ImageField()
 

From bb8ce74f5205650e9b2b27d7fe0a1d49d877758e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 15 Mar 2021 15:57:00 -0700
Subject: [PATCH 0319/1285] Updates base activity tests for updated Image type

---
 bookwyrm/tests/activitypub/test_base_activity.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/tests/activitypub/test_base_activity.py b/bookwyrm/tests/activitypub/test_base_activity.py
index b3e28261..f3d3decd 100644
--- a/bookwyrm/tests/activitypub/test_base_activity.py
+++ b/bookwyrm/tests/activitypub/test_base_activity.py
@@ -123,7 +123,7 @@ class BaseActivity(TestCase):
             summary="",
             publicKey={"id": "hi", "owner": self.user.remote_id, "publicKeyPem": "hi"},
             endpoints={},
-            icon={"type": "Image", "url": "http://www.example.com/image.jpg"},
+            icon={"type": "Document", "url": "http://www.example.com/image.jpg"},
         )
 
         responses.add(
@@ -194,7 +194,7 @@ class BaseActivity(TestCase):
                 {
                     "url": "http://www.example.com/image.jpg",
                     "name": "alt text",
-                    "type": "Image",
+                    "type": "Document",
                 }
             ],
         )
@@ -224,7 +224,7 @@ class BaseActivity(TestCase):
         data = {
             "url": "http://www.example.com/image.jpg",
             "name": "alt text",
-            "type": "Image",
+            "type": "Document",
         }
         responses.add(
             responses.GET,

From c50ca9f951301ffe48c1e83280906ee9cc694012 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 15 Mar 2021 16:23:04 -0700
Subject: [PATCH 0320/1285] Still trying to catch connection error

I guess I was catching the wrong TYPE of connection error? annoying.
---
 bookwyrm/models/activitypub_mixin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index 23ac1642..a253207a 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -461,7 +461,7 @@ def broadcast_task(sender_id, activity, recipients):
     for recipient in recipients:
         try:
             sign_and_send(sender, activity, recipient)
-        except (HTTPError, SSLError, ConnectionError):
+        except (HTTPError, SSLError, requests.exceptions.ConnectionError):
             pass
 
 

From 08edba4891be13f57a04324ed1cbf470de12db2f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 16 Mar 2021 12:00:21 -0700
Subject: [PATCH 0321/1285] Ignore activities that expect dict args but get
 strs

Some Undo activities are coming from Pleroma with just the id
of the activity, rather than the serialized object. There isn't
an obvious way to know what is being undone, so for now this
just ignores those
---
 bookwyrm/activitypub/verbs.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index c63cd5dc..d684171e 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -64,6 +64,11 @@ class Undo(Verb):
 
     def action(self):
         """ find and remove the activity object """
+        if isinstance(self.object, str):
+            # it may be that sometihng should be done with these, but idk what
+            # this seems just to be coming from pleroma
+            return
+
         # this is so hacky but it does make it work....
         # (because you Reject a request and Undo a follow
         model = None

From e5750de3dd7b58cd76986f7904d53589c7c78e15 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 16 Mar 2021 12:57:23 -0700
Subject: [PATCH 0322/1285] Notify admins when a report is filed

---
 .../migrations/0051_auto_20210316_1950.py     | 32 +++++++++++++++++++
 bookwyrm/models/notification.py               |  4 ++-
 bookwyrm/models/report.py                     | 19 +++++++++++
 bookwyrm/templates/notifications.html         |  7 +++-
 4 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 bookwyrm/migrations/0051_auto_20210316_1950.py

diff --git a/bookwyrm/migrations/0051_auto_20210316_1950.py b/bookwyrm/migrations/0051_auto_20210316_1950.py
new file mode 100644
index 00000000..d8695d5c
--- /dev/null
+++ b/bookwyrm/migrations/0051_auto_20210316_1950.py
@@ -0,0 +1,32 @@
+# Generated by Django 3.0.7 on 2021-03-16 19:50
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0050_auto_20210313_0030'),
+    ]
+
+    operations = [
+        migrations.RemoveConstraint(
+            model_name='notification',
+            name='notification_type_valid',
+        ),
+        migrations.AddField(
+            model_name='notification',
+            name='related_report',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='bookwyrm.Report'),
+        ),
+        migrations.AlterField(
+            model_name='notification',
+            name='notification_type',
+            field=models.CharField(choices=[('FAVORITE', 'Favorite'), ('REPLY', 'Reply'), ('MENTION', 'Mention'), ('TAG', 'Tag'), ('FOLLOW', 'Follow'), ('FOLLOW_REQUEST', 'Follow Request'), ('BOOST', 'Boost'), ('IMPORT', 'Import'), ('ADD', 'Add'), ('REPORT', 'Report')], max_length=255),
+        ),
+        migrations.AddConstraint(
+            model_name='notification',
+            constraint=models.CheckConstraint(check=models.Q(notification_type__in=['FAVORITE', 'REPLY', 'MENTION', 'TAG', 'FOLLOW', 'FOLLOW_REQUEST', 'BOOST', 'IMPORT', 'ADD', 'REPORT']), name='notification_type_valid'),
+        ),
+    ]
diff --git a/bookwyrm/models/notification.py b/bookwyrm/models/notification.py
index 19018165..233d635b 100644
--- a/bookwyrm/models/notification.py
+++ b/bookwyrm/models/notification.py
@@ -5,7 +5,7 @@ from .base_model import BookWyrmModel
 
 NotificationType = models.TextChoices(
     "NotificationType",
-    "FAVORITE REPLY MENTION TAG FOLLOW FOLLOW_REQUEST BOOST IMPORT ADD",
+    "FAVORITE REPLY MENTION TAG FOLLOW FOLLOW_REQUEST BOOST IMPORT ADD REPORT",
 )
 
 
@@ -22,6 +22,7 @@ class Notification(BookWyrmModel):
     related_list_item = models.ForeignKey(
         "ListItem", on_delete=models.CASCADE, null=True
     )
+    related_report = models.ForeignKey("Report", on_delete=models.CASCADE, null=True)
     read = models.BooleanField(default=False)
     notification_type = models.CharField(
         max_length=255, choices=NotificationType.choices
@@ -37,6 +38,7 @@ class Notification(BookWyrmModel):
             related_status=self.related_status,
             related_import=self.related_import,
             related_list_item=self.related_list_item,
+            related_report=self.related_report,
             notification_type=self.notification_type,
         ).exists():
             return
diff --git a/bookwyrm/models/report.py b/bookwyrm/models/report.py
index 6a76d9fd..bdd7765e 100644
--- a/bookwyrm/models/report.py
+++ b/bookwyrm/models/report.py
@@ -1,4 +1,5 @@
 """ flagged for moderation """
+from django.apps import apps
 from django.db import models
 from django.db.models import F, Q
 from .base_model import BookWyrmModel
@@ -15,6 +16,24 @@ class Report(BookWyrmModel):
     statuses = models.ManyToManyField("Status", blank=True)
     resolved = models.BooleanField(default=False)
 
+    def save(self, *args, **kwargs):
+        """ notify admins when a report is created """
+        super().save(*args, **kwargs)
+        user_model = apps.get_model("bookwyrm.User", require_ready=True)
+        # moderators and superusers should be notified
+        admins = user_model.objects.filter(
+            Q(user_permissions__name__in=["moderate_user", "moderate_post"]) |
+            Q(is_superuser=True)
+        ).all()
+        notification_model = apps.get_model("bookwyrm.Notification", require_ready=True)
+        for admin in admins:
+            notification_model.objects.create(
+                user=admin,
+                related_report=self,
+                notification_type="REPORT",
+            )
+
+
     class Meta:
         """ don't let users report themselves """
 
diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html
index 3f0300bd..7c694d78 100644
--- a/bookwyrm/templates/notifications.html
+++ b/bookwyrm/templates/notifications.html
@@ -35,6 +35,8 @@
                 <span class="icon icon-list"></span>
                 {% elif notification.notification_type == 'ADD' %}
                 <span class="icon icon-plus"></span>
+                {% elif notification.notification_type == 'REPORT' %}
+                <span class="icon icon-warning"></span>
                 {% endif %}
             </div>
             <div class="column">
@@ -105,7 +107,10 @@
                                 {% endif %}
                             {% endif %}
                         {% elif notification.related_import %}
-                            {% blocktrans with related_id=notification.related_import.id %} your <a href="/import/{{ related_id }}">import</a> completed.{% endblocktrans %}
+                            {% blocktrans with related_id=notification.related_import.id %}Your <a href="/import/{{ related_id }}">import</a> completed.{% endblocktrans %}
+                        {% elif notification.related_report %}
+                            {% url 'settings-report' notification.related_report.id as path %}
+                            {% blocktrans with related_id=path %}A new <a href="{{ path }}">report</a> needs moderation.{% endblocktrans %}
                         {% endif %}
                     </p>
                 </div>

From 550eba1f6881d4aa8ed09e1bb239bdb4d51396bd Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 16 Mar 2021 12:59:25 -0700
Subject: [PATCH 0323/1285] Black formatting

---
 .../migrations/0051_auto_20210316_1950.py     | 56 +++++++++++++++----
 bookwyrm/models/report.py                     |  5 +-
 2 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/bookwyrm/migrations/0051_auto_20210316_1950.py b/bookwyrm/migrations/0051_auto_20210316_1950.py
index d8695d5c..3caecbbe 100644
--- a/bookwyrm/migrations/0051_auto_20210316_1950.py
+++ b/bookwyrm/migrations/0051_auto_20210316_1950.py
@@ -7,26 +7,60 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0050_auto_20210313_0030'),
+        ("bookwyrm", "0050_auto_20210313_0030"),
     ]
 
     operations = [
         migrations.RemoveConstraint(
-            model_name='notification',
-            name='notification_type_valid',
+            model_name="notification",
+            name="notification_type_valid",
         ),
         migrations.AddField(
-            model_name='notification',
-            name='related_report',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='bookwyrm.Report'),
+            model_name="notification",
+            name="related_report",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="bookwyrm.Report",
+            ),
         ),
         migrations.AlterField(
-            model_name='notification',
-            name='notification_type',
-            field=models.CharField(choices=[('FAVORITE', 'Favorite'), ('REPLY', 'Reply'), ('MENTION', 'Mention'), ('TAG', 'Tag'), ('FOLLOW', 'Follow'), ('FOLLOW_REQUEST', 'Follow Request'), ('BOOST', 'Boost'), ('IMPORT', 'Import'), ('ADD', 'Add'), ('REPORT', 'Report')], max_length=255),
+            model_name="notification",
+            name="notification_type",
+            field=models.CharField(
+                choices=[
+                    ("FAVORITE", "Favorite"),
+                    ("REPLY", "Reply"),
+                    ("MENTION", "Mention"),
+                    ("TAG", "Tag"),
+                    ("FOLLOW", "Follow"),
+                    ("FOLLOW_REQUEST", "Follow Request"),
+                    ("BOOST", "Boost"),
+                    ("IMPORT", "Import"),
+                    ("ADD", "Add"),
+                    ("REPORT", "Report"),
+                ],
+                max_length=255,
+            ),
         ),
         migrations.AddConstraint(
-            model_name='notification',
-            constraint=models.CheckConstraint(check=models.Q(notification_type__in=['FAVORITE', 'REPLY', 'MENTION', 'TAG', 'FOLLOW', 'FOLLOW_REQUEST', 'BOOST', 'IMPORT', 'ADD', 'REPORT']), name='notification_type_valid'),
+            model_name="notification",
+            constraint=models.CheckConstraint(
+                check=models.Q(
+                    notification_type__in=[
+                        "FAVORITE",
+                        "REPLY",
+                        "MENTION",
+                        "TAG",
+                        "FOLLOW",
+                        "FOLLOW_REQUEST",
+                        "BOOST",
+                        "IMPORT",
+                        "ADD",
+                        "REPORT",
+                    ]
+                ),
+                name="notification_type_valid",
+            ),
         ),
     ]
diff --git a/bookwyrm/models/report.py b/bookwyrm/models/report.py
index bdd7765e..f9e8905b 100644
--- a/bookwyrm/models/report.py
+++ b/bookwyrm/models/report.py
@@ -22,8 +22,8 @@ class Report(BookWyrmModel):
         user_model = apps.get_model("bookwyrm.User", require_ready=True)
         # moderators and superusers should be notified
         admins = user_model.objects.filter(
-            Q(user_permissions__name__in=["moderate_user", "moderate_post"]) |
-            Q(is_superuser=True)
+            Q(user_permissions__name__in=["moderate_user", "moderate_post"])
+            | Q(is_superuser=True)
         ).all()
         notification_model = apps.get_model("bookwyrm.Notification", require_ready=True)
         for admin in admins:
@@ -33,7 +33,6 @@ class Report(BookWyrmModel):
                 notification_type="REPORT",
             )
 
-
     class Meta:
         """ don't let users report themselves """
 

From b285fb2fc09a1f7eb2123fd6d3bebb320bf7a4c7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 16 Mar 2021 13:37:22 -0700
Subject: [PATCH 0324/1285] Set shelf user by default

---
 bookwyrm/models/shelf.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bookwyrm/models/shelf.py b/bookwyrm/models/shelf.py
index 965541a2..3185b47f 100644
--- a/bookwyrm/models/shelf.py
+++ b/bookwyrm/models/shelf.py
@@ -68,6 +68,11 @@ class ShelfBook(CollectionItemMixin, BookWyrmModel):
     object_field = "book"
     collection_field = "shelf"
 
+    def save(self, *args, **kwargs):
+        if not self.user:
+            self.user = self.shelf.user
+        super().save(*args, **kwargs)
+
     class Meta:
         """an opinionated constraint!
         you can't put a book on shelf twice"""

From 6370fbf2c6e9ddda476a798afd42daf549e9ca04 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 16 Mar 2021 13:39:33 -0700
Subject: [PATCH 0325/1285] Formatting

---
 bookwyrm/models/book.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index 82aec7b6..2b518b82 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -96,7 +96,7 @@ class Book(BookDataModel):
             if self.languages and self.languages[0] != "English"
             else None,
             str(self.published_date.year) if self.published_date else None,
-            ', '.join(self.publishers)
+            ", ".join(self.publishers),
         ]
         return ", ".join(i for i in items if i)
 

From 6755137bad2ccc077c01c7a94cf15ccfa3b4a5a9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 16 Mar 2021 13:46:02 -0700
Subject: [PATCH 0326/1285] Fixes displaying publisehrs when none are set

---
 bookwyrm/templates/book.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html
index ee1ea270..53e684b0 100644
--- a/bookwyrm/templates/book.html
+++ b/bookwyrm/templates/book.html
@@ -91,7 +91,7 @@
                     {% blocktrans with date=book.published_date|date:'M jS Y' publisher=book.publishers|join:', ' %}Published {{ date }} by {{ publisher }}.{% endblocktrans %}
                     {% elif book.published_date %}
                     {% blocktrans with date=book.published_date|date:'M jS Y' %}Published {{ date }}{% endblocktrans %}
-                    {% else %}
+                    {% elif book.publishers %}
                     {% blocktrans with publisher=book.publishers|join:', ' %}Published by {{ publisher }}.{% endblocktrans %}
                     {% endif %}
                 </p>

From 9251883d77337b13ef22b379009d4be2146d8b6a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 16 Mar 2021 13:54:15 -0700
Subject: [PATCH 0327/1285] Checks if publisher fields is present (it isn't on
 works)

---
 bookwyrm/models/book.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index 2b518b82..e6aa4d06 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -96,7 +96,7 @@ class Book(BookDataModel):
             if self.languages and self.languages[0] != "English"
             else None,
             str(self.published_date.year) if self.published_date else None,
-            ", ".join(self.publishers),
+            ", ".join(self.publishers) if hasattr(self, "publishers") else None,
         ]
         return ", ".join(i for i in items if i)
 

From 46906f7e4114544d22267def143e12a86ebaf7ea Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 16 Mar 2021 14:03:25 -0700
Subject: [PATCH 0328/1285] Fixes whitespace jump when switching from trimmed
 to full

---
 bookwyrm/templates/snippets/trimmed_text.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/trimmed_text.html b/bookwyrm/templates/snippets/trimmed_text.html
index 4ec92bd6..cac6e41b 100644
--- a/bookwyrm/templates/snippets/trimmed_text.html
+++ b/bookwyrm/templates/snippets/trimmed_text.html
@@ -9,7 +9,7 @@
 {% if trimmed != full %}
 <div id="hide-full-{{ uuid }}">
     <div class="content" id="trimmed-{{ uuid }}">
-        <p dir="auto">{{ trimmed }}</p>
+        <div dir="auto">{{ trimmed }}</div>
 
         <div>
             {% trans "Show more" as button_text %}

From 64eb6e8b07ca5a7236ca793138d9b1b9e76a530c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 16 Mar 2021 14:04:51 -0700
Subject: [PATCH 0329/1285] Fixes large covers overlapping on book page

---
 bookwyrm/templates/book.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html
index a96c6096..b6e50b53 100644
--- a/bookwyrm/templates/book.html
+++ b/bookwyrm/templates/book.html
@@ -35,7 +35,7 @@
     </div>
 
     <div class="columns">
-        <div class="column is-one-fifth">
+        <div class="column is-one-fifth is-clipped">
             {% include 'snippets/book_cover.html' with book=book size=large %}
             {% include 'snippets/rate_action.html' with user=request.user book=book %}
             {% include 'snippets/shelve_button/shelve_button.html' %}

From bb1e8edc0073308166f09b8ceea11fbad5520fc5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 16 Mar 2021 14:09:21 -0700
Subject: [PATCH 0330/1285] Shifts alignment on oclc number with line wrap

---
 bookwyrm/templates/book.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html
index b6e50b53..438c1437 100644
--- a/bookwyrm/templates/book.html
+++ b/bookwyrm/templates/book.html
@@ -56,21 +56,21 @@
             <section class="content">
                 <dl>
                     {% if book.isbn_13 %}
-                    <div class="is-flex is-justify-content-space-between">
+                    <div class="is-flex is-justify-content-space-between is-align-items-center">
                         <dt>{% trans "ISBN:" %}</dt>
                         <dd>{{ book.isbn_13 }}</dd>
                     </div>
                     {% endif %}
 
                     {% if book.oclc_number %}
-                    <div class="is-flex is-justify-content-space-between">
+                    <div class="is-flex is-justify-content-space-between is-align-items-center">
                         <dt>{% trans "OCLC Number:" %}</dt>
                         <dd>{{ book.oclc_number }}</dd>
                     </div>
                     {% endif %}
 
                     {% if book.asin %}
-                    <div class="is-flex is-justify-content-space-between">
+                    <div class="is-flex is-justify-content-space-between is-align-items-center">
                         <dt>{% trans "ASIN:" %}</dt>
                         <dd>{{ book.asin }}</dd>
                     </div>

From f0711ad40e11d25c8b43da7e8651f851a23c2713 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 16 Mar 2021 14:13:42 -0700
Subject: [PATCH 0331/1285] Fixes margins on lists

---
 bookwyrm/templates/lists/list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index b4f3e5de..ace8aa63 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -20,7 +20,7 @@
         {% for item in items %}
             <li class="block pb-3">
                 <div class="card">
-                    <div class="card-content columns p-0 mb-0 is-mobile">
+                    <div class="card-content columns p-0 pr-2 mb-0 is-mobile">
                         <div class="column is-narrow pt-0 pb-0">
                             <a href="{{ item.book.local_path }}">{% include 'snippets/book_cover.html' with book=item.book size="medium" %}</a>
                         </div>

From db426d71eed978fdb80a692a22a5feef5ec795fd Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 17 Mar 2021 09:22:45 -0700
Subject: [PATCH 0332/1285] Fixes failed serialization of empty avatar field

---
 bookwyrm/activitypub/base_activity.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index 170bdfb9..791502d0 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -75,7 +75,7 @@ class ActivityObject:
         for field in fields(self):
             try:
                 value = kwargs[field.name]
-                if value in (None, MISSING):
+                if value in (None, MISSING, {}):
                     raise KeyError()
                 try:
                     is_subclass = issubclass(field.type, ActivityObject)

From 0d8e1f0ae26dee88c180a1ea12634d2af7232ffa Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 17 Mar 2021 09:34:20 -0700
Subject: [PATCH 0333/1285] Makes endponts a default field

---
 bookwyrm/activitypub/person.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/activitypub/person.py b/bookwyrm/activitypub/person.py
index ba86b036..f2cacc15 100644
--- a/bookwyrm/activitypub/person.py
+++ b/bookwyrm/activitypub/person.py
@@ -24,7 +24,7 @@ class Person(ActivityObject):
     outbox: str
     followers: str
     publicKey: PublicKey
-    endpoints: Dict
+    endpoints: Dict = field(default_factory=lambda: {})
     name: str = None
     summary: str = None
     icon: Image = field(default_factory=lambda: {})

From ba09377041b8a772c86f9a71b045dac68755cff0 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 17 Mar 2021 13:59:16 -0700
Subject: [PATCH 0334/1285] Use None instead of empty dict for endpoint default
 value

---
 bookwyrm/activitypub/person.py | 2 +-
 bookwyrm/models/fields.py      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/activitypub/person.py b/bookwyrm/activitypub/person.py
index f2cacc15..f1298b92 100644
--- a/bookwyrm/activitypub/person.py
+++ b/bookwyrm/activitypub/person.py
@@ -24,7 +24,7 @@ class Person(ActivityObject):
     outbox: str
     followers: str
     publicKey: PublicKey
-    endpoints: Dict = field(default_factory=lambda: {})
+    endpoints: Dict = None
     name: str = None
     summary: str = None
     icon: Image = field(default_factory=lambda: {})
diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py
index 1ca0b377..1bdc6c45 100644
--- a/bookwyrm/models/fields.py
+++ b/bookwyrm/models/fields.py
@@ -73,7 +73,7 @@ class ActivitypubFieldMixin:
                 raise
             value = getattr(data, "actor")
         formatted = self.field_from_activity(value)
-        if formatted is None or formatted is MISSING:
+        if formatted is None or formatted is MISSING or formatted == {}:
             return
         setattr(instance, self.name, formatted)
 
@@ -101,7 +101,7 @@ class ActivitypubFieldMixin:
 
     def field_from_activity(self, value):
         """ formatter to convert activitypub into a model value """
-        if hasattr(self, "activitypub_wrapper"):
+        if value and hasattr(self, "activitypub_wrapper"):
             value = value.get(self.activitypub_wrapper)
         return value
 

From 9a20b5dbd5d31d216c7f7456359edba2cca601f7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 18 Mar 2021 09:00:25 -0700
Subject: [PATCH 0335/1285] Hide goal using database field instead of
 localstorage

---
 bookwyrm/migrations/0052_user_show_goal.py | 18 ++++++++++++++++++
 bookwyrm/models/user.py                    |  1 +
 bookwyrm/templates/feed/feed.html          |  4 ++--
 bookwyrm/templates/snippets/goal_card.html |  7 ++++---
 bookwyrm/urls.py                           |  2 ++
 bookwyrm/views/__init__.py                 |  2 +-
 bookwyrm/views/goal.py                     | 10 ++++++++++
 7 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 bookwyrm/migrations/0052_user_show_goal.py

diff --git a/bookwyrm/migrations/0052_user_show_goal.py b/bookwyrm/migrations/0052_user_show_goal.py
new file mode 100644
index 00000000..4455e048
--- /dev/null
+++ b/bookwyrm/migrations/0052_user_show_goal.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.7 on 2021-03-18 15:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0051_auto_20210316_1950'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='show_goal',
+            field=models.BooleanField(default=True),
+        ),
+    ]
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 440b65d3..46f08509 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -102,6 +102,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
     updated_date = models.DateTimeField(auto_now=True)
     last_active_date = models.DateTimeField(auto_now=True)
     manually_approves_followers = fields.BooleanField(default=False)
+    show_goal = models.BooleanField(default=True)
 
     name_field = "username"
 
diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html
index 4eb363e4..13533f72 100644
--- a/bookwyrm/templates/feed/feed.html
+++ b/bookwyrm/templates/feed/feed.html
@@ -19,9 +19,9 @@
 </div>
 
 {# announcements and system messages #}
-{% if not goal and tab == 'home' %}
+{% if request.user.show_goal and not goal and tab == 'home' %}
 {% now 'Y' as year %}
-<section class="block hidden" aria-title="{% trans 'Announcements' %}" data-hide="hide-{{ year }}-reading-goal">
+<section class="block" aria-title="{% trans 'Announcements' %}">
     {% include 'snippets/goal_card.html' with year=year %}
     <hr>
 </section>
diff --git a/bookwyrm/templates/snippets/goal_card.html b/bookwyrm/templates/snippets/goal_card.html
index 084a5ad0..329fea54 100644
--- a/bookwyrm/templates/snippets/goal_card.html
+++ b/bookwyrm/templates/snippets/goal_card.html
@@ -17,8 +17,9 @@
 {% endblock %}
 
 {% block card-footer %}
-<div class="card-footer-item is-flex-direction-column">
-    <button class="button is-danger is-light is-block set-display" data-id="hide-{{ year }}-reading-goal" data-value="true">{% trans "Dismiss message" %}</button>
+<form class="card-footer-item is-flex-direction-column" method="post" action="{% url 'hide-goal' %}">
+    {% csrf_token %}
+    <button type="submit" class="button is-danger is-light is-block set-display" >{% trans "Dismiss message" %}</button>
     <p class="help">{% blocktrans with path=request.user.local_path %}You can set or change your reading goal any time from your <a href="{{ path }}">profile page</a>{% endblocktrans %}</p>
-</div>
+</form>
 {% endblock %}
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 199827ae..688c8a77 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -109,11 +109,13 @@ urlpatterns = [
     ),
     re_path(r"%s/shelves/?$" % user_path, views.user_shelves_page, name="user-shelves"),
     re_path(r"%s/lists/?$" % user_path, views.UserLists.as_view(), name="user-lists"),
+    # goals
     re_path(
         r"%s/goal/(?P<year>\d{4})/?$" % user_path,
         views.Goal.as_view(),
         name="user-goal",
     ),
+    re_path(r"^hide-goal/?$", views.hide_goal, name="hide-goal"),
     # lists
     re_path(r"^list/?$", views.Lists.as_view(), name="lists"),
     re_path(r"^list/(?P<list_id>\d+)(.json)?/?$", views.List.as_view(), name="list"),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 2c32bc9d..e98cb24a 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -9,7 +9,7 @@ from .federation import Federation
 from .feed import DirectMessage, Feed, Replies, Status
 from .follow import follow, unfollow
 from .follow import accept_follow_request, delete_follow_request
-from .goal import Goal
+from .goal import Goal, hide_goal
 from .import_data import Import, ImportStatus
 from .inbox import Inbox
 from .interaction import Favorite, Unfavorite, Boost, Unboost
diff --git a/bookwyrm/views/goal.py b/bookwyrm/views/goal.py
index 4e3a9534..9c4e117c 100644
--- a/bookwyrm/views/goal.py
+++ b/bookwyrm/views/goal.py
@@ -6,6 +6,7 @@ from django.template.loader import get_template
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
+from django.views.decorators.http import require_POST
 
 from bookwyrm import forms, models
 from bookwyrm.status import create_generated_note
@@ -65,3 +66,12 @@ class Goal(View):
             )
 
         return redirect(request.headers.get("Referer", "/"))
+
+
+@require_POST
+@login_required
+def hide_goal(request):
+    """ don't keep bugging people to set a goal """
+    request.user.show_goal = False
+    request.user.save(broadcast=False)
+    return redirect(request.headers.get("Referer", "/"))

From baee0796cd9ca7cb803496dd181e3508548d4733 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 18 Mar 2021 09:02:07 -0700
Subject: [PATCH 0336/1285] Moves localstorage handlers into its own file

---
 bookwyrm/static/js/localstorage.js | 27 +++++++++++++++++++++++++++
 bookwyrm/static/js/shared.js       | 26 --------------------------
 2 files changed, 27 insertions(+), 26 deletions(-)
 create mode 100644 bookwyrm/static/js/localstorage.js

diff --git a/bookwyrm/static/js/localstorage.js b/bookwyrm/static/js/localstorage.js
new file mode 100644
index 00000000..ff4027e6
--- /dev/null
+++ b/bookwyrm/static/js/localstorage.js
@@ -0,0 +1,27 @@
+// set javascript listeners
+window.onload = function() {
+    // display based on localstorage vars
+    document.querySelectorAll('[data-hide]')
+        .forEach(t => setDisplay(t));
+
+    // update localstorage
+    Array.from(document.getElementsByClassName('set-display'))
+        .forEach(t => t.onclick = updateDisplay);
+};
+
+function updateDisplay(e) {
+    // used in set reading goal
+    var key = e.target.getAttribute('data-id');
+    var value = e.target.getAttribute('data-value');
+    window.localStorage.setItem(key, value);
+
+    document.querySelectorAll('[data-hide="' + key + '"]')
+        .forEach(t => setDisplay(t));
+}
+
+function setDisplay(el) {
+    // used in set reading goal
+    var key = el.getAttribute('data-hide');
+    var value = window.localStorage.getItem(key);
+    addRemoveClass(el, 'hidden', value);
+}
diff --git a/bookwyrm/static/js/shared.js b/bookwyrm/static/js/shared.js
index 391efcc2..a7f30660 100644
--- a/bookwyrm/static/js/shared.js
+++ b/bookwyrm/static/js/shared.js
@@ -23,14 +23,6 @@ window.onload = function() {
     Array.from(document.getElementsByClassName('pulldown-menu'))
         .forEach(t => t.onclick = toggleMenu);
 
-    // display based on localstorage vars
-    document.querySelectorAll('[data-hide]')
-        .forEach(t => setDisplay(t));
-
-    // update localstorage
-    Array.from(document.getElementsByClassName('set-display'))
-        .forEach(t => t.onclick = updateDisplay);
-
     // hidden submit button in a form
     document.querySelectorAll('.hidden-form input')
         .forEach(t => t.onchange = revealForm);
@@ -78,24 +70,6 @@ function revealForm(e) {
 }
 
 
-function updateDisplay(e) {
-    // used in set reading goal
-    var key = e.target.getAttribute('data-id');
-    var value = e.target.getAttribute('data-value');
-    window.localStorage.setItem(key, value);
-
-    document.querySelectorAll('[data-hide="' + key + '"]')
-        .forEach(t => setDisplay(t));
-}
-
-function setDisplay(el) {
-    // used in set reading goal
-    var key = el.getAttribute('data-hide');
-    var value = window.localStorage.getItem(key);
-    addRemoveClass(el, 'hidden', value);
-}
-
-
 function toggleAction(e) {
     var el = e.currentTarget;
     var pressed = el.getAttribute('aria-pressed') == 'false';

From 91aaf704f5ac45fb5db2994cda5e35aebc29aed4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 18 Mar 2021 09:05:18 -0700
Subject: [PATCH 0337/1285] Adds set reading goal display control in user
 settings

---
 bookwyrm/forms.py                             | 2 +-
 bookwyrm/templates/preferences/edit_user.html | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index c6dfa9fe..f93816de 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -115,7 +115,7 @@ class StatusForm(CustomForm):
 class EditUserForm(CustomForm):
     class Meta:
         model = models.User
-        fields = ["avatar", "name", "email", "summary", "manually_approves_followers"]
+        fields = ["avatar", "name", "email", "summary", "manually_approves_followers", "show_goal"]
         help_texts = {f: None for f in fields}
 
 
diff --git a/bookwyrm/templates/preferences/edit_user.html b/bookwyrm/templates/preferences/edit_user.html
index b643f4ce..ca0f81c2 100644
--- a/bookwyrm/templates/preferences/edit_user.html
+++ b/bookwyrm/templates/preferences/edit_user.html
@@ -41,6 +41,12 @@
         <p class="help is-danger">{{ error | escape }}</p>
         {% endfor %}
     </div>
+    <div class="block">
+        <label class="checkbox label" for="id_show_goal">
+            {% trans "Show set reading goal prompt in feed:" %}
+            {{ form.show_goal }}
+        </label>
+    </div>
     <div class="block">
         <label class="checkbox label" for="id_manually_approves_followers">
             {% trans "Manually approve followers:" %}

From 48a5232ebb0e4a47c29a70f0b77933db8fccae8f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 18 Mar 2021 09:06:00 -0700
Subject: [PATCH 0338/1285] Formatting

---
 bookwyrm/forms.py                          | 9 ++++++++-
 bookwyrm/migrations/0052_user_show_goal.py | 6 +++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index f93816de..edf1d9e4 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -115,7 +115,14 @@ class StatusForm(CustomForm):
 class EditUserForm(CustomForm):
     class Meta:
         model = models.User
-        fields = ["avatar", "name", "email", "summary", "manually_approves_followers", "show_goal"]
+        fields = [
+            "avatar",
+            "name",
+            "email",
+            "summary",
+            "manually_approves_followers",
+            "show_goal",
+        ]
         help_texts = {f: None for f in fields}
 
 
diff --git a/bookwyrm/migrations/0052_user_show_goal.py b/bookwyrm/migrations/0052_user_show_goal.py
index 4455e048..3b72ee7a 100644
--- a/bookwyrm/migrations/0052_user_show_goal.py
+++ b/bookwyrm/migrations/0052_user_show_goal.py
@@ -6,13 +6,13 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0051_auto_20210316_1950'),
+        ("bookwyrm", "0051_auto_20210316_1950"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='user',
-            name='show_goal',
+            model_name="user",
+            name="show_goal",
             field=models.BooleanField(default=True),
         ),
     ]

From 77f11572f30e7fcf984f201709a1f94076350416 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 18 Mar 2021 09:08:19 -0700
Subject: [PATCH 0339/1285] Remove invalid aria tag

thank you, bot
---
 bookwyrm/templates/feed/feed.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html
index 13533f72..b7ff6e25 100644
--- a/bookwyrm/templates/feed/feed.html
+++ b/bookwyrm/templates/feed/feed.html
@@ -21,7 +21,7 @@
 {# announcements and system messages #}
 {% if request.user.show_goal and not goal and tab == 'home' %}
 {% now 'Y' as year %}
-<section class="block" aria-title="{% trans 'Announcements' %}">
+<section class="block">
     {% include 'snippets/goal_card.html' with year=year %}
     <hr>
 </section>

From c2386bd3a18e91bfdfa3c2ceb78a6b553ce80b66 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 18 Mar 2021 09:15:47 -0700
Subject: [PATCH 0340/1285] Remove a step when unfurling statuses with content
 warnings

---
 bookwyrm/templates/snippets/status/status_content.html | 2 +-
 bookwyrm/templates/snippets/trimmed_text.html          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/snippets/status/status_content.html b/bookwyrm/templates/snippets/status/status_content.html
index 616e1e63..53ccc5ca 100644
--- a/bookwyrm/templates/snippets/status/status_content.html
+++ b/bookwyrm/templates/snippets/status/status_content.html
@@ -35,7 +35,7 @@
         {% endif %}
 
         {% if status.content and status.status_type != 'GeneratedNote' and status.status_type != 'Announce' %}
-        {% include 'snippets/trimmed_text.html' with full=status.content|safe %}
+        {% include 'snippets/trimmed_text.html' with full=status.content|safe no_trim=status.content_warning %}
         {% endif %}
         {% if status.attachments.exists %}
         <div class="block">
diff --git a/bookwyrm/templates/snippets/trimmed_text.html b/bookwyrm/templates/snippets/trimmed_text.html
index cac6e41b..f91fe19b 100644
--- a/bookwyrm/templates/snippets/trimmed_text.html
+++ b/bookwyrm/templates/snippets/trimmed_text.html
@@ -6,7 +6,7 @@
 {% with full|to_markdown|safe as full %}
 
 {% with full|to_markdown|safe|truncatewords_html:60 as trimmed %}
-{% if trimmed != full %}
+{% if not no_trim and trimmed != full %}
 <div id="hide-full-{{ uuid }}">
     <div class="content" id="trimmed-{{ uuid }}">
         <div dir="auto">{{ trimmed }}</div>

From 4e55018e415cb8aab065eded438031da424db1c6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 18 Mar 2021 09:37:16 -0700
Subject: [PATCH 0341/1285] Moves book templates into dir

---
 bookwyrm/templates/{ => book}/book.html      |  4 ++--
 bookwyrm/templates/{ => book}/edit_book.html |  0
 bookwyrm/urls.py                             |  2 +-
 bookwyrm/views/books.py                      | 10 +++++-----
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename bookwyrm/templates/{ => book}/book.html (98%)
 rename bookwyrm/templates/{ => book}/edit_book.html (100%)

diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book/book.html
similarity index 98%
rename from bookwyrm/templates/book.html
rename to bookwyrm/templates/book/book.html
index b9708451..adc40e48 100644
--- a/bookwyrm/templates/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -43,10 +43,10 @@
             {% if request.user.is_authenticated and not book.cover %}
             <div class="box p-2">
                 <h3 class="title is-6 mb-1">{% trans "Add cover" %}</h3>
-                <form name="add-cover" method="POST" action="/upload-cover/{{ book.id }}" enctype="multipart/form-data">
+                <form name="add-cover" method="POST" action="{% url 'upload-cover' book.id %}" enctype="multipart/form-data">
                     {% csrf_token %}
                     <label class="label">
-                        <input type="file" name="cover" accept="image/*" enctype="multipart/form-data" id="id_cover" required>
+                        <input type="file" name="cover" accept="image/*" enctype="multipart/form-data" id="id_cover">
                     </label>
                     <button class="button is-small is-primary" type="submit">{% trans "Add" %}</button>
                 </form>
diff --git a/bookwyrm/templates/edit_book.html b/bookwyrm/templates/book/edit_book.html
similarity index 100%
rename from bookwyrm/templates/edit_book.html
rename to bookwyrm/templates/book/edit_book.html
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 688c8a77..fca645ab 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -152,7 +152,7 @@ urlpatterns = [
     re_path(r"^create-book/?$", views.EditBook.as_view()),
     re_path(r"^create-book/confirm?$", views.ConfirmEditBook.as_view()),
     re_path(r"%s/editions(.json)?/?$" % book_path, views.Editions.as_view()),
-    re_path(r"^upload-cover/(?P<book_id>\d+)/?$", views.upload_cover),
+    re_path(r"^upload-cover/(?P<book_id>\d+)/?$", views.upload_cover, name="upload-cover"),
     re_path(r"^add-description/(?P<book_id>\d+)/?$", views.add_description),
     re_path(r"^resolve-book/?$", views.resolve_book),
     re_path(r"^switch-edition/?$", views.switch_edition),
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 0b23b0d6..00f3bc54 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -97,7 +97,7 @@ class Book(View):
             "readthroughs": readthroughs,
             "path": "/book/%s" % book_id,
         }
-        return TemplateResponse(request, "book.html", data)
+        return TemplateResponse(request, "book/book.html", data)
 
 
 @method_decorator(login_required, name="dispatch")
@@ -115,7 +115,7 @@ class EditBook(View):
             if not book.description:
                 book.description = book.parent_work.description
         data = {"book": book, "form": forms.EditionForm(instance=book)}
-        return TemplateResponse(request, "edit_book.html", data)
+        return TemplateResponse(request, "book/edit_book.html", data)
 
     def post(self, request, book_id=None):
         """ edit a book cool """
@@ -125,7 +125,7 @@ class EditBook(View):
 
         data = {"book": book, "form": form}
         if not form.is_valid():
-            return TemplateResponse(request, "edit_book.html", data)
+            return TemplateResponse(request, "book/edit_book.html", data)
 
         add_author = request.POST.get("add_author")
         # we're adding an author through a free text field
@@ -169,7 +169,7 @@ class EditBook(View):
             data["confirm_mode"] = True
             # this isn't preserved because it isn't part of the form obj
             data["remove_authors"] = request.POST.getlist("remove_authors")
-            return TemplateResponse(request, "edit_book.html", data)
+            return TemplateResponse(request, "book/edit_book.html", data)
 
         remove_authors = request.POST.getlist("remove_authors")
         for author_id in remove_authors:
@@ -194,7 +194,7 @@ class ConfirmEditBook(View):
 
         data = {"book": book, "form": form}
         if not form.is_valid():
-            return TemplateResponse(request, "edit_book.html", data)
+            return TemplateResponse(request, "book/edit_book.html", data)
 
         with transaction.atomic():
             # save book

From ae6d8529af7ff1ad952b0088576347350943cb58 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 18 Mar 2021 09:44:59 -0700
Subject: [PATCH 0342/1285] Moves add cover into modal

---
 bookwyrm/templates/book/book.html        | 13 ++++--------
 bookwyrm/templates/book/cover_modal.html | 26 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 9 deletions(-)
 create mode 100644 bookwyrm/templates/book/cover_modal.html

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index adc40e48..0d908110 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -41,15 +41,10 @@
             {% include 'snippets/shelve_button/shelve_button.html' %}
 
             {% if request.user.is_authenticated and not book.cover %}
-            <div class="box p-2">
-                <h3 class="title is-6 mb-1">{% trans "Add cover" %}</h3>
-                <form name="add-cover" method="POST" action="{% url 'upload-cover' book.id %}" enctype="multipart/form-data">
-                    {% csrf_token %}
-                    <label class="label">
-                        <input type="file" name="cover" accept="image/*" enctype="multipart/form-data" id="id_cover">
-                    </label>
-                    <button class="button is-small is-primary" type="submit">{% trans "Add" %}</button>
-                </form>
+            <div class="block">
+                {% trans "Add cover" as button_text %}
+                {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="add-cover" controls_uid=book.id focus="modal-title-add-cover" class="is-small" %}
+                {% include 'book/cover_modal.html' with book=book controls_text="add-cover" controls_uid=book.id %}
             </div>
             {% endif %}
 
diff --git a/bookwyrm/templates/book/cover_modal.html b/bookwyrm/templates/book/cover_modal.html
new file mode 100644
index 00000000..b82c441f
--- /dev/null
+++ b/bookwyrm/templates/book/cover_modal.html
@@ -0,0 +1,26 @@
+{% extends 'components/modal.html' %}
+{% load i18n %}
+
+{% block modal-title %}
+{% trans "Add cover" %}
+{% endblock %}
+
+{% block modal-form-open %}
+<form name="add-cover" method="POST" action="{% url 'upload-cover' book.id %}" enctype="multipart/form-data">
+{% endblock %}
+
+{% block modal-body %}
+<section class="modal-card-body">
+    {% csrf_token %}
+    {% csrf_token %}
+    <label class="label">
+        <input type="file" name="cover" accept="image/*" enctype="multipart/form-data" id="id_cover">
+    </label>
+</section>
+{% endblock %}
+
+{% block modal-footer %}
+<button class="button is-primary" type="submit">{% trans "Add" %}</button>
+{% endblock %}
+{% block modal-form-close %}</form>{% endblock %}
+

From 9470b2831f0e364dd961ca82806637e9abbc83b1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 18 Mar 2021 10:03:53 -0700
Subject: [PATCH 0343/1285] Add cover via url

---
 bookwyrm/templates/book/cover_modal.html | 18 ++++++++++++++----
 bookwyrm/urls.py                         |  4 +++-
 bookwyrm/views/books.py                  | 15 +++++++++++++++
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/templates/book/cover_modal.html b/bookwyrm/templates/book/cover_modal.html
index b82c441f..f09b4495 100644
--- a/bookwyrm/templates/book/cover_modal.html
+++ b/bookwyrm/templates/book/cover_modal.html
@@ -10,17 +10,27 @@
 {% endblock %}
 
 {% block modal-body %}
-<section class="modal-card-body">
+<section class="modal-card-body columns">
     {% csrf_token %}
-    {% csrf_token %}
-    <label class="label">
+    <div class="column">
+        <label class="label" for="id_cover">
+            {% trans "Upload cover:" %}
+        </label>
         <input type="file" name="cover" accept="image/*" enctype="multipart/form-data" id="id_cover">
-    </label>
+    </div>
+    <div class="column">
+        <label class="label" for="id_cover_url">
+            {% trans "Load cover from url:" %}
+        </label>
+        <input class="input" name="cover-url" id="id_cover_url">
+    </div>
 </section>
 {% endblock %}
 
 {% block modal-footer %}
 <button class="button is-primary" type="submit">{% trans "Add" %}</button>
+{% trans "Cancel" as button_text %}
+{% include 'snippets/toggle/toggle_button.html' with text=button_text %}
 {% endblock %}
 {% block modal-form-close %}</form>{% endblock %}
 
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index fca645ab..44492668 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -152,7 +152,9 @@ urlpatterns = [
     re_path(r"^create-book/?$", views.EditBook.as_view()),
     re_path(r"^create-book/confirm?$", views.ConfirmEditBook.as_view()),
     re_path(r"%s/editions(.json)?/?$" % book_path, views.Editions.as_view()),
-    re_path(r"^upload-cover/(?P<book_id>\d+)/?$", views.upload_cover, name="upload-cover"),
+    re_path(
+        r"^upload-cover/(?P<book_id>\d+)/?$", views.upload_cover, name="upload-cover"
+    ),
     re_path(r"^add-description/(?P<book_id>\d+)/?$", views.add_description),
     re_path(r"^resolve-book/?$", views.resolve_book),
     re_path(r"^switch-edition/?$", views.switch_edition),
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 00f3bc54..34432e7e 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -1,6 +1,9 @@
 """ the good stuff! the books! """
+from uuid import uuid4
+
 from django.contrib.auth.decorators import login_required, permission_required
 from django.contrib.postgres.search import SearchRank, SearchVector
+from django.core.files.base import ContentFile
 from django.core.paginator import Paginator
 from django.db import transaction
 from django.db.models import Avg, Q
@@ -14,6 +17,7 @@ from django.views.decorators.http import require_POST
 from bookwyrm import forms, models
 from bookwyrm.activitypub import ActivitypubResponse
 from bookwyrm.connectors import connector_manager
+from bookwyrm.connectors.abstract_connector import get_image
 from bookwyrm.settings import PAGE_LENGTH
 from .helpers import is_api_request, get_activity_feed, get_edition
 from .helpers import privacy_filter
@@ -257,6 +261,17 @@ def upload_cover(request, book_id):
     """ upload a new cover """
     book = get_object_or_404(models.Edition, id=book_id)
 
+    url = request.POST.get("cover-url")
+    if url:
+        # load it from a url
+        image_file = get_image(url)
+        if not image_file:
+            return redirect("/book/%d" % book.id)
+        image_name = str(uuid4()) + "." + url.split(".")[-1]
+        image_content = ContentFile(image_file.content)
+        book.cover.save(*[image_name, image_content])
+        return redirect("/book/%d" % book.id)
+
     form = forms.CoverForm(request.POST, request.FILES, instance=book)
     if not form.is_valid():
         return redirect("/book/%d" % book.id)

From 138f6f50a1c96fe6078d30d8b59bb427683a32f5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 18 Mar 2021 15:55:05 -0700
Subject: [PATCH 0344/1285] Updates django to latest

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index f354fd43..6126bf9c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 celery==4.4.2
-Django==3.0.7
+Django==3.1.6
 django-model-utils==4.0.0
 environs==7.2.0
 flower==0.9.4

From a8545e27012d9edb2c89589f2c732a96f15d9d73 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 19 Mar 2021 09:20:48 -0700
Subject: [PATCH 0345/1285] Adds tests for upload cover view

bonus test for user view
---
 bookwyrm/tests/views/test_book.py | 57 +++++++++++++++++++++++++++++++
 bookwyrm/tests/views/test_user.py | 46 +++++++++++++------------
 bookwyrm/views/user.py            |  2 +-
 3 files changed, 83 insertions(+), 22 deletions(-)

diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index 850be8db..8dc830b0 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -1,7 +1,14 @@
 """ test for app action functionality """
+from io import BytesIO
+import pathlib
 from unittest.mock import patch
+
+from PIL import Image
+import responses
+
 from django.contrib.auth.models import Group, Permission
 from django.contrib.contenttypes.models import ContentType
+from django.core.files.uploadedfile import SimpleUploadedFile
 from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
@@ -229,3 +236,53 @@ class BookViews(TestCase):
             result = view(request, self.work.id)
         self.assertIsInstance(result, ActivitypubResponse)
         self.assertEqual(result.status_code, 200)
+
+    def test_upload_cover_file(self):
+        """ add a cover via file upload """
+        self.assertFalse(self.book.cover)
+        image_file = pathlib.Path(__file__).parent.joinpath(
+            "../../static/images/default_avi.jpg"
+        )
+
+        form = forms.CoverForm(instance=self.book)
+        form.data["cover"] = SimpleUploadedFile(
+            image_file, open(image_file, "rb").read(), content_type="image/jpeg"
+        )
+
+        request = self.factory.post("", form.data)
+        request.user = self.local_user
+
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            views.upload_cover(request, self.book.id)
+
+        self.book.refresh_from_db()
+        self.assertTrue(self.book.cover)
+
+    @responses.activate
+    def test_upload_cover_url(self):
+        """ add a cover via url """
+        self.assertFalse(self.book.cover)
+        image_file = pathlib.Path(__file__).parent.joinpath(
+            "../../static/images/default_avi.jpg"
+        )
+        image = Image.open(image_file)
+        output = BytesIO()
+        image.save(output, format=image.format)
+        responses.add(
+            responses.GET,
+            "http://example.com",
+            body=output.getvalue(),
+            status=200,
+        )
+
+        form = forms.CoverForm(instance=self.book)
+        form.data["cover-url"] = "http://example.com"
+
+        request = self.factory.post("", form.data)
+        request.user = self.local_user
+
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            views.upload_cover(request, self.book.id)
+
+        self.book.refresh_from_db()
+        self.assertTrue(self.book.cover)
diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py
index 426c1a79..1708ec53 100644
--- a/bookwyrm/tests/views/test_user.py
+++ b/bookwyrm/tests/views/test_user.py
@@ -5,6 +5,7 @@ from PIL import Image
 
 from django.contrib.auth.models import AnonymousUser
 from django.core.files.base import ContentFile
+from django.core.files.uploadedfile import SimpleUploadedFile
 from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
@@ -157,28 +158,31 @@ class UserViews(TestCase):
         self.assertEqual(self.local_user.email, "wow@email.com")
 
     # idk how to mock the upload form, got tired of triyng to make it work
-    #     def test_edit_user_avatar(self):
-    #         ''' use a form to update a user '''
-    #         view = views.EditUser.as_view()
-    #         form = forms.EditUserForm(instance=self.local_user)
-    #         form.data['name'] = 'New Name'
-    #         form.data['email'] = 'wow@email.com'
-    #         image_file = pathlib.Path(__file__).parent.joinpath(
-    #             '../../static/images/no_cover.jpg')
-    #         image = Image.open(image_file)
-    #         form.files['avatar'] = SimpleUploadedFile(
-    #             image_file, open(image_file), content_type='image/jpeg')
-    #         request = self.factory.post('', form.data, form.files)
-    #         request.user = self.local_user
+    def test_edit_user_avatar(self):
+        """ use a form to update a user """
+        view = views.EditUser.as_view()
+        form = forms.EditUserForm(instance=self.local_user)
+        form.data["name"] = "New Name"
+        form.data["email"] = "wow@email.com"
+        image_file = pathlib.Path(__file__).parent.joinpath(
+            "../../static/images/no_cover.jpg"
+        )
+        form.data["avatar"] = SimpleUploadedFile(
+            image_file, open(image_file, "rb").read(), content_type="image/jpeg"
+        )
+        request = self.factory.post("", form.data)
+        request.user = self.local_user
 
-    #         with patch('bookwyrm.models.activitypub_mixin.broadcast_task.delay') \
-    #                 as delay_mock:
-    #             view(request)
-    #             self.assertEqual(delay_mock.call_count, 1)
-    #         self.assertEqual(self.local_user.name, 'New Name')
-    #         self.assertEqual(self.local_user.email, 'wow@email.com')
-    #         self.assertIsNotNone(self.local_user.avatar)
-    #         self.assertEqual(self.local_user.avatar.size, (120, 120))
+        with patch(
+            "bookwyrm.models.activitypub_mixin.broadcast_task.delay"
+        ) as delay_mock:
+            view(request)
+            self.assertEqual(delay_mock.call_count, 1)
+        self.assertEqual(self.local_user.name, "New Name")
+        self.assertEqual(self.local_user.email, "wow@email.com")
+        self.assertIsNotNone(self.local_user.avatar)
+        self.assertEqual(self.local_user.avatar.width, 120)
+        self.assertEqual(self.local_user.avatar.height, 120)
 
     def test_crop_avatar(self):
         """ reduce that image size """
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index 469a82d3..690bf158 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -173,7 +173,7 @@ class EditUser(View):
             # set the name to a hash
             extension = form.files["avatar"].name.split(".")[-1]
             filename = "%s.%s" % (uuid4(), extension)
-            user.avatar.save(filename, image)
+            user.avatar.save(filename, image, save=False)
         user.save()
 
         return redirect(user.local_path)

From e92a506e61413e06875cd0d258b496d5583f5b36 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 19 Mar 2021 10:29:34 -0700
Subject: [PATCH 0346/1285] Upload cover via url form edit book view

---
 bookwyrm/templates/book/edit_book.html | 19 +++++++++++----
 bookwyrm/tests/views/test_book.py      | 10 ++++++--
 bookwyrm/views/books.py                | 32 ++++++++++++++++++--------
 3 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html
index 5c21ac95..d7c84235 100644
--- a/bookwyrm/templates/book/edit_book.html
+++ b/bookwyrm/templates/book/edit_book.html
@@ -85,7 +85,7 @@
 
     <input type="hidden" name="last_edited_by" value="{{ request.user.id }}">
     <div class="columns">
-        <div class="column">
+        <div class="column is-half">
             <section class="block">
                 <h2 class="title is-4">{% trans "Metadata" %}</h2>
                 <p class="mb-2"><label class="label" for="id_title">{% trans "Title:" %}</label> {{ form.title }} </p>
@@ -151,15 +151,26 @@
             </section>
         </div>
 
-        <div class="column">
+        <div class="column is-half">
+            <h2 class="title is-4">{% trans "Cover" %}</h2>
             <div class="columns">
                 <div class="column is-narrow">
                     {% include 'snippets/book_cover.html' with book=book size="small" %}
                 </div>
                 <div class="column is-narrow">
                     <div class="block">
-                        <h2 class="title is-4">{% trans "Cover" %}</h2>
-                        <p>{{ form.cover }}</p>
+                        <p>
+                            <label class="label" for="id_cover">{% trans "Upload cover:" %}</label>
+                            {{ form.cover }}
+                        </p>
+                        {% if book %}
+                        <p>
+                            <label class="label" for="id_cover_url">
+                                {% trans "Load cover from url:" %}
+                            </label>
+                            <input class="input" name="cover-url" id="id_cover_url">
+                        </p>
+                        {% endif %}
                         {% for error in form.cover.errors %}
                         <p class="help is-danger">{{ error | escape }}</p>
                         {% endfor %}
diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index 8dc830b0..ade6131d 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -252,8 +252,11 @@ class BookViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = self.local_user
 
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+        with patch(
+            "bookwyrm.models.activitypub_mixin.broadcast_task.delay"
+        ) as delay_mock:
             views.upload_cover(request, self.book.id)
+            self.assertEqual(delay_mock.call_count, 1)
 
         self.book.refresh_from_db()
         self.assertTrue(self.book.cover)
@@ -281,8 +284,11 @@ class BookViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = self.local_user
 
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+        with patch(
+            "bookwyrm.models.activitypub_mixin.broadcast_task.delay"
+        ) as delay_mock:
             views.upload_cover(request, self.book.id)
+            self.assertEqual(delay_mock.call_count, 1)
 
         self.book.refresh_from_db()
         self.assertTrue(self.book.cover)
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 34432e7e..f2aa76d7 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -179,7 +179,13 @@ class EditBook(View):
         for author_id in remove_authors:
             book.authors.remove(author_id)
 
-        book = form.save()
+        book = form.save(commit=False)
+        url = request.POST.get("cover-url")
+        if url:
+            image = set_cover_from_url(url)
+            if image:
+                book.cover.save(*image, save=False)
+        book.save()
         return redirect("/book/%s" % book.id)
 
 
@@ -260,29 +266,35 @@ class Editions(View):
 def upload_cover(request, book_id):
     """ upload a new cover """
     book = get_object_or_404(models.Edition, id=book_id)
+    book.last_edited_by = request.user
 
     url = request.POST.get("cover-url")
     if url:
-        # load it from a url
-        image_file = get_image(url)
-        if not image_file:
-            return redirect("/book/%d" % book.id)
-        image_name = str(uuid4()) + "." + url.split(".")[-1]
-        image_content = ContentFile(image_file.content)
-        book.cover.save(*[image_name, image_content])
+        image = set_cover_from_url(url)
+        book.cover.save(*image)
+
         return redirect("/book/%d" % book.id)
 
     form = forms.CoverForm(request.POST, request.FILES, instance=book)
-    if not form.is_valid():
+    if not form.is_valid() or not form.files.get("cover"):
         return redirect("/book/%d" % book.id)
 
-    book.last_edited_by = request.user
     book.cover = form.files["cover"]
     book.save()
 
     return redirect("/book/%s" % book.id)
 
 
+def set_cover_from_url(url):
+    """ load it from a url """
+    image_file = get_image(url)
+    if not image_file:
+        return None
+    image_name = str(uuid4()) + "." + url.split(".")[-1]
+    image_content = ContentFile(image_file.content)
+    return [image_name, image_content]
+
+
 @login_required
 @require_POST
 @permission_required("bookwyrm.edit_book", raise_exception=True)

From 443daab1287d4e05b9f63472fce9882ff199d8b0 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 19 Mar 2021 10:47:32 -0700
Subject: [PATCH 0347/1285] Move tabs javascript into separate file

---
 bookwyrm/static/js/shared.js             | 259 ----------------------
 bookwyrm/static/js/tabs.js               | 261 +++++++++++++++++++++++
 bookwyrm/templates/feed/feed_layout.html |   3 +
 bookwyrm/templates/layout.html           |   1 +
 4 files changed, 265 insertions(+), 259 deletions(-)
 create mode 100644 bookwyrm/static/js/tabs.js

diff --git a/bookwyrm/static/js/shared.js b/bookwyrm/static/js/shared.js
index a7f30660..98525f6e 100644
--- a/bookwyrm/static/js/shared.js
+++ b/bookwyrm/static/js/shared.js
@@ -15,10 +15,6 @@ window.onload = function() {
             input.addEventListener('change', toggleAllCheckboxes);
         });
 
-    // tab groups
-    Array.from(document.getElementsByClassName('tab-group'))
-        .forEach(t => new TabGroup(t));
-
     // handle aria settings on menus
     Array.from(document.getElementsByClassName('pulldown-menu'))
         .forEach(t => t.onclick = toggleMenu);
@@ -174,258 +170,3 @@ function removeClass(el, className) {
     }
     el.className = classes.join(' ');
 }
-
-/*
-* The content below is licensed according to the W3C Software License at
-* https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
-* Heavily modified to web component by Zach Leatherman
-* Modified back to vanilla JavaScript with support for Bulma markup and nested tabs by Ned Zimmerman
-*/
-class TabGroup {
-    constructor(container) {
-        this.container = container;
-
-        this.tablist = this.container.querySelector('[role="tablist"]');
-        this.buttons = this.tablist.querySelectorAll('[role="tab"]');
-        this.panels = this.container.querySelectorAll(':scope > [role="tabpanel"]');
-        this.delay = this.determineDelay();
-
-        if(!this.tablist || !this.buttons.length || !this.panels.length) {
-            return;
-        }
-
-        this.keys = this.keys();
-        this.direction = this.direction();
-        this.initButtons();
-        this.initPanels();
-    }
-
-    keys() {
-        return {
-            end: 35,
-            home: 36,
-            left: 37,
-            up: 38,
-            right: 39,
-            down: 40
-        };
-    }
-
-    // Add or substract depending on key pressed
-    direction() {
-        return {
-            37: -1,
-            38: -1,
-            39: 1,
-            40: 1
-        };
-    }
-
-    initButtons() {
-        let count = 0;
-        for(let button of this.buttons) {
-            let isSelected = button.getAttribute("aria-selected") === "true";
-            button.setAttribute("tabindex", isSelected ? "0" : "-1");
-
-            button.addEventListener('click', this.clickEventListener.bind(this));
-            button.addEventListener('keydown', this.keydownEventListener.bind(this));
-            button.addEventListener('keyup', this.keyupEventListener.bind(this));
-
-            button.index = count++;
-        }
-    }
-
-    initPanels() {
-        let selectedPanelId = this.tablist.querySelector('[role="tab"][aria-selected="true"]').getAttribute("aria-controls");
-        for(let panel of this.panels) {
-            if(panel.getAttribute("id") !== selectedPanelId) {
-                panel.setAttribute("hidden", "");
-            }
-            panel.setAttribute("tabindex", "0");
-        }
-    }
-
-    clickEventListener(event) {
-        let button = event.target.closest('a');
-
-        event.preventDefault();
-
-        this.activateTab(button, false);
-    }
-
-    // Handle keydown on tabs
-    keydownEventListener(event) {
-        var key = event.keyCode;
-
-        switch (key) {
-            case this.keys.end:
-                event.preventDefault();
-                // Activate last tab
-                this.activateTab(this.buttons[this.buttons.length - 1]);
-                break;
-            case this.keys.home:
-                event.preventDefault();
-                // Activate first tab
-                this.activateTab(this.buttons[0]);
-                break;
-
-            // Up and down are in keydown
-            // because we need to prevent page scroll >:)
-            case this.keys.up:
-            case this.keys.down:
-                this.determineOrientation(event);
-                break;
-        }
-    }
-
-    // Handle keyup on tabs
-    keyupEventListener(event) {
-        var key = event.keyCode;
-
-        switch (key) {
-            case this.keys.left:
-            case this.keys.right:
-                this.determineOrientation(event);
-                break;
-        }
-    }
-
-    // When a tablist’s aria-orientation is set to vertical,
-    // only up and down arrow should function.
-    // In all other cases only left and right arrow function.
-    determineOrientation(event) {
-        var key = event.keyCode;
-        var vertical = this.tablist.getAttribute('aria-orientation') == 'vertical';
-        var proceed = false;
-
-        if (vertical) {
-            if (key === this.keys.up || key === this.keys.down) {
-                event.preventDefault();
-                proceed = true;
-            }
-        }
-        else {
-            if (key === this.keys.left || key === this.keys.right) {
-                proceed = true;
-            }
-        }
-
-        if (proceed) {
-            this.switchTabOnArrowPress(event);
-        }
-    }
-
-    // Either focus the next, previous, first, or last tab
-    // depending on key pressed
-    switchTabOnArrowPress(event) {
-        var pressed = event.keyCode;
-
-        for (let button of this.buttons) {
-            button.addEventListener('focus', this.focusEventHandler.bind(this));
-        }
-
-        if (this.direction[pressed]) {
-            var target = event.target;
-            if (target.index !== undefined) {
-                if (this.buttons[target.index + this.direction[pressed]]) {
-                    this.buttons[target.index + this.direction[pressed]].focus();
-                }
-                else if (pressed === this.keys.left || pressed === this.keys.up) {
-                    this.focusLastTab();
-                }
-                else if (pressed === this.keys.right || pressed == this.keys.down) {
-                    this.focusFirstTab();
-                }
-            }
-        }
-    }
-
-    // Activates any given tab panel
-    activateTab (tab, setFocus) {
-        if(tab.getAttribute("role") !== "tab") {
-            tab = tab.closest('[role="tab"]');
-        }
-
-        setFocus = setFocus || true;
-
-        // Deactivate all other tabs
-        this.deactivateTabs();
-
-        // Remove tabindex attribute
-        tab.removeAttribute('tabindex');
-
-        // Set the tab as selected
-        tab.setAttribute('aria-selected', 'true');
-
-        // Give the tab parent an is-active class
-        tab.parentNode.classList.add('is-active');
-
-        // Get the value of aria-controls (which is an ID)
-        var controls = tab.getAttribute('aria-controls');
-
-        // Remove hidden attribute from tab panel to make it visible
-        document.getElementById(controls).removeAttribute('hidden');
-
-        // Set focus when required
-        if (setFocus) {
-            tab.focus();
-        }
-    }
-
-    // Deactivate all tabs and tab panels
-    deactivateTabs() {
-        for (let button of this.buttons) {
-            button.parentNode.classList.remove('is-active');
-            button.setAttribute('tabindex', '-1');
-            button.setAttribute('aria-selected', 'false');
-            button.removeEventListener('focus', this.focusEventHandler.bind(this));
-        }
-
-        for (let panel of this.panels) {
-            panel.setAttribute('hidden', 'hidden');
-        }
-    }
-
-    focusFirstTab() {
-        this.buttons[0].focus();
-    }
-
-    focusLastTab() {
-        this.buttons[this.buttons.length - 1].focus();
-    }
-
-    // Determine whether there should be a delay
-    // when user navigates with the arrow keys
-    determineDelay() {
-        var hasDelay = this.tablist.hasAttribute('data-delay');
-        var delay = 0;
-
-        if (hasDelay) {
-            var delayValue = this.tablist.getAttribute('data-delay');
-            if (delayValue) {
-                delay = delayValue;
-            }
-            else {
-                // If no value is specified, default to 300ms
-                delay = 300;
-            }
-        }
-
-        return delay;
-    }
-
-    focusEventHandler(event) {
-        var target = event.target;
-
-        setTimeout(this.checkTabFocus.bind(this), this.delay, target);
-    }
-
-    // Only activate tab on focus if it still has focus after the delay
-    checkTabFocus(target) {
-        let focused = document.activeElement;
-
-        if (target === focused) {
-            this.activateTab(target, false);
-        }
-    }
-}
diff --git a/bookwyrm/static/js/tabs.js b/bookwyrm/static/js/tabs.js
new file mode 100644
index 00000000..e32312a3
--- /dev/null
+++ b/bookwyrm/static/js/tabs.js
@@ -0,0 +1,261 @@
+// tab groups
+window.onload = function() {
+    Array.from(document.getElementsByClassName('tab-group'))
+        .forEach(t => new TabGroup(t));
+};
+
+
+/*
+* The content below is licensed according to the W3C Software License at
+* https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
+* Heavily modified to web component by Zach Leatherman
+* Modified back to vanilla JavaScript with support for Bulma markup and nested tabs by Ned Zimmerman
+*/
+class TabGroup {
+    constructor(container) {
+        this.container = container;
+
+        this.tablist = this.container.querySelector('[role="tablist"]');
+        this.buttons = this.tablist.querySelectorAll('[role="tab"]');
+        this.panels = this.container.querySelectorAll(':scope > [role="tabpanel"]');
+        this.delay = this.determineDelay();
+
+        if(!this.tablist || !this.buttons.length || !this.panels.length) {
+            return;
+        }
+
+        this.keys = this.keys();
+        this.direction = this.direction();
+        this.initButtons();
+        this.initPanels();
+    }
+
+    keys() {
+        return {
+            end: 35,
+            home: 36,
+            left: 37,
+            up: 38,
+            right: 39,
+            down: 40
+        };
+    }
+
+    // Add or substract depending on key pressed
+    direction() {
+        return {
+            37: -1,
+            38: -1,
+            39: 1,
+            40: 1
+        };
+    }
+
+    initButtons() {
+        let count = 0;
+        for(let button of this.buttons) {
+            let isSelected = button.getAttribute("aria-selected") === "true";
+            button.setAttribute("tabindex", isSelected ? "0" : "-1");
+
+            button.addEventListener('click', this.clickEventListener.bind(this));
+            button.addEventListener('keydown', this.keydownEventListener.bind(this));
+            button.addEventListener('keyup', this.keyupEventListener.bind(this));
+
+            button.index = count++;
+        }
+    }
+
+    initPanels() {
+        let selectedPanelId = this.tablist.querySelector('[role="tab"][aria-selected="true"]').getAttribute("aria-controls");
+        for(let panel of this.panels) {
+            if(panel.getAttribute("id") !== selectedPanelId) {
+                panel.setAttribute("hidden", "");
+            }
+            panel.setAttribute("tabindex", "0");
+        }
+    }
+
+    clickEventListener(event) {
+        let button = event.target.closest('a');
+
+        event.preventDefault();
+
+        this.activateTab(button, false);
+    }
+
+    // Handle keydown on tabs
+    keydownEventListener(event) {
+        var key = event.keyCode;
+
+        switch (key) {
+            case this.keys.end:
+                event.preventDefault();
+                // Activate last tab
+                this.activateTab(this.buttons[this.buttons.length - 1]);
+                break;
+            case this.keys.home:
+                event.preventDefault();
+                // Activate first tab
+                this.activateTab(this.buttons[0]);
+                break;
+
+            // Up and down are in keydown
+            // because we need to prevent page scroll >:)
+            case this.keys.up:
+            case this.keys.down:
+                this.determineOrientation(event);
+                break;
+        }
+    }
+
+    // Handle keyup on tabs
+    keyupEventListener(event) {
+        var key = event.keyCode;
+
+        switch (key) {
+            case this.keys.left:
+            case this.keys.right:
+                this.determineOrientation(event);
+                break;
+        }
+    }
+
+    // When a tablist’s aria-orientation is set to vertical,
+    // only up and down arrow should function.
+    // In all other cases only left and right arrow function.
+    determineOrientation(event) {
+        var key = event.keyCode;
+        var vertical = this.tablist.getAttribute('aria-orientation') == 'vertical';
+        var proceed = false;
+
+        if (vertical) {
+            if (key === this.keys.up || key === this.keys.down) {
+                event.preventDefault();
+                proceed = true;
+            }
+        }
+        else {
+            if (key === this.keys.left || key === this.keys.right) {
+                proceed = true;
+            }
+        }
+
+        if (proceed) {
+            this.switchTabOnArrowPress(event);
+        }
+    }
+
+    // Either focus the next, previous, first, or last tab
+    // depending on key pressed
+    switchTabOnArrowPress(event) {
+        var pressed = event.keyCode;
+
+        for (let button of this.buttons) {
+            button.addEventListener('focus', this.focusEventHandler.bind(this));
+        }
+
+        if (this.direction[pressed]) {
+            var target = event.target;
+            if (target.index !== undefined) {
+                if (this.buttons[target.index + this.direction[pressed]]) {
+                    this.buttons[target.index + this.direction[pressed]].focus();
+                }
+                else if (pressed === this.keys.left || pressed === this.keys.up) {
+                    this.focusLastTab();
+                }
+                else if (pressed === this.keys.right || pressed == this.keys.down) {
+                    this.focusFirstTab();
+                }
+            }
+        }
+    }
+
+    // Activates any given tab panel
+    activateTab (tab, setFocus) {
+        if(tab.getAttribute("role") !== "tab") {
+            tab = tab.closest('[role="tab"]');
+        }
+
+        setFocus = setFocus || true;
+
+        // Deactivate all other tabs
+        this.deactivateTabs();
+
+        // Remove tabindex attribute
+        tab.removeAttribute('tabindex');
+
+        // Set the tab as selected
+        tab.setAttribute('aria-selected', 'true');
+
+        // Give the tab parent an is-active class
+        tab.parentNode.classList.add('is-active');
+
+        // Get the value of aria-controls (which is an ID)
+        var controls = tab.getAttribute('aria-controls');
+
+        // Remove hidden attribute from tab panel to make it visible
+        document.getElementById(controls).removeAttribute('hidden');
+
+        // Set focus when required
+        if (setFocus) {
+            tab.focus();
+        }
+    }
+
+    // Deactivate all tabs and tab panels
+    deactivateTabs() {
+        for (let button of this.buttons) {
+            button.parentNode.classList.remove('is-active');
+            button.setAttribute('tabindex', '-1');
+            button.setAttribute('aria-selected', 'false');
+            button.removeEventListener('focus', this.focusEventHandler.bind(this));
+        }
+
+        for (let panel of this.panels) {
+            panel.setAttribute('hidden', 'hidden');
+        }
+    }
+
+    focusFirstTab() {
+        this.buttons[0].focus();
+    }
+
+    focusLastTab() {
+        this.buttons[this.buttons.length - 1].focus();
+    }
+
+    // Determine whether there should be a delay
+    // when user navigates with the arrow keys
+    determineDelay() {
+        var hasDelay = this.tablist.hasAttribute('data-delay');
+        var delay = 0;
+
+        if (hasDelay) {
+            var delayValue = this.tablist.getAttribute('data-delay');
+            if (delayValue) {
+                delay = delayValue;
+            }
+            else {
+                // If no value is specified, default to 300ms
+                delay = 300;
+            }
+        }
+
+        return delay;
+    }
+
+    focusEventHandler(event) {
+        var target = event.target;
+
+        setTimeout(this.checkTabFocus.bind(this), this.delay, target);
+    }
+
+    // Only activate tab on focus if it still has focus after the delay
+    checkTabFocus(target) {
+        let focused = document.activeElement;
+
+        if (target === focused) {
+            this.activateTab(target, false);
+        }
+    }
+}
diff --git a/bookwyrm/templates/feed/feed_layout.html b/bookwyrm/templates/feed/feed_layout.html
index 04826a64..24294e5d 100644
--- a/bookwyrm/templates/feed/feed_layout.html
+++ b/bookwyrm/templates/feed/feed_layout.html
@@ -91,3 +91,6 @@
 </div>
 {% endblock %}
 
+{% block scripts %}
+<script src="/static/js/tabs.js"></script>
+{% endblock %}
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 7b005853..c7d10b57 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -213,5 +213,6 @@
     var csrf_token = '{{ csrf_token }}';
 </script>
 <script src="/static/js/shared.js"></script>
+{% block scripts %}{% endblock %}
 </body>
 </html>

From 5ad645c225ded91a507f17805a3ed566aed873aa Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 19 Mar 2021 10:51:45 -0700
Subject: [PATCH 0348/1285] Move check all js into separate file

---
 bookwyrm/static/js/check_all.js       | 24 ++++++++++++++++++++++++
 bookwyrm/static/js/shared.js          | 23 -----------------------
 bookwyrm/templates/import_status.html |  4 ++++
 3 files changed, 28 insertions(+), 23 deletions(-)
 create mode 100644 bookwyrm/static/js/check_all.js

diff --git a/bookwyrm/static/js/check_all.js b/bookwyrm/static/js/check_all.js
new file mode 100644
index 00000000..1d02f6b0
--- /dev/null
+++ b/bookwyrm/static/js/check_all.js
@@ -0,0 +1,24 @@
+// Toggle all checkboxes.
+window.onload = function() {
+    document
+        .querySelectorAll('[data-action="toggle-all"]')
+        .forEach(input => {
+            input.addEventListener('change', toggleAllCheckboxes);
+        });
+};
+
+/**
+ * Toggle all descendant checkboxes of a target.
+ *
+ * Use `data-target="ID_OF_TARGET"` on the node being listened to.
+ *
+ * @param  {Event} event - change Event
+ * @return {undefined}
+ */
+function toggleAllCheckboxes(event) {
+    const mainCheckbox = event.target;
+
+    document
+        .querySelectorAll(`#${mainCheckbox.dataset.target} [type="checkbox"]`)
+        .forEach(checkbox => {checkbox.checked = mainCheckbox.checked;});
+}
diff --git a/bookwyrm/static/js/shared.js b/bookwyrm/static/js/shared.js
index 98525f6e..97767d72 100644
--- a/bookwyrm/static/js/shared.js
+++ b/bookwyrm/static/js/shared.js
@@ -8,13 +8,6 @@ window.onload = function() {
     Array.from(document.getElementsByClassName('interaction'))
         .forEach(t => t.onsubmit = interact);
 
-    // Toggle all checkboxes.
-    document
-        .querySelectorAll('[data-action="toggle-all"]')
-        .forEach(input => {
-            input.addEventListener('change', toggleAllCheckboxes);
-        });
-
     // handle aria settings on menus
     Array.from(document.getElementsByClassName('pulldown-menu'))
         .forEach(t => t.onclick = toggleMenu);
@@ -109,22 +102,6 @@ function interact(e) {
         .forEach(t => addRemoveClass(t, 'hidden', t.className.indexOf('hidden') == -1));
 }
 
-/**
- * Toggle all descendant checkboxes of a target.
- *
- * Use `data-target="ID_OF_TARGET"` on the node being listened to.
- *
- * @param  {Event} event - change Event
- * @return {undefined}
- */
-function toggleAllCheckboxes(event) {
-    const mainCheckbox = event.target;
-
-    document
-        .querySelectorAll(`#${mainCheckbox.dataset.target} [type="checkbox"]`)
-        .forEach(checkbox => {checkbox.checked = mainCheckbox.checked;});
-}
-
 function toggleMenu(e) {
     var el = e.currentTarget;
     var expanded = el.getAttribute('aria-expanded') == 'false';
diff --git a/bookwyrm/templates/import_status.html b/bookwyrm/templates/import_status.html
index f9ba36bf..c2985c12 100644
--- a/bookwyrm/templates/import_status.html
+++ b/bookwyrm/templates/import_status.html
@@ -148,3 +148,7 @@
 </div>
 </div>
 {% endspaceless %}{% endblock %}
+
+{% block scripts %}
+<script src="/static/js/check_all.js"></script>
+{% endblock %}

From 90cfff67d6fb1e96eb88f843fba1b2181f967591 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 19 Mar 2021 11:58:27 -0700
Subject: [PATCH 0349/1285] Updaates locale files

---
 .../templates/snippets/progress_update.html   |   2 +-
 locale/de_DE/LC_MESSAGES/django.mo            | Bin 24289 -> 24140 bytes
 locale/de_DE/LC_MESSAGES/django.po            | 823 ++++++++++++-----
 locale/en_US/LC_MESSAGES/django.po            | 639 +++++++++-----
 locale/es/LC_MESSAGES/django.mo               | Bin 27379 -> 27175 bytes
 locale/es/LC_MESSAGES/django.po               | 825 +++++++++++++-----
 locale/fr_FR/LC_MESSAGES/django.mo            | Bin 25397 -> 25205 bytes
 locale/fr_FR/LC_MESSAGES/django.po            | 798 ++++++++++++-----
 locale/zh_CN/LC_MESSAGES/django.mo            | Bin 23894 -> 23724 bytes
 locale/zh_CN/LC_MESSAGES/django.po            | 797 ++++++++++++-----
 10 files changed, 2836 insertions(+), 1048 deletions(-)

diff --git a/bookwyrm/templates/snippets/progress_update.html b/bookwyrm/templates/snippets/progress_update.html
index 138defbd..cb709625 100644
--- a/bookwyrm/templates/snippets/progress_update.html
+++ b/bookwyrm/templates/snippets/progress_update.html
@@ -22,7 +22,7 @@
             </div>
         </div>
         {% if readthrough.progress_mode == 'PG' and book.pages %}
-        <p class="help">{% blocktrans %}of {{ book.pages }} pages{% endblocktrans %}</p>
+        <p class="help">{% blocktrans with pages=book.pages %}of {{ pages }} pages{% endblocktrans %}</p>
         {% endif %}
     </div>
 </form>
diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo
index 16e093c62b5eccc153e7c26a85b6dbb4eb95839d..40fbee8d9c94aee1ae58b831cb6482f9801e9893 100644
GIT binary patch
delta 7767
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

delta 7852
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
W<R_bH?s;x+oxARjL}2rj?f(P8%7Ov_

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index a335f2ce..ff3b0fdd 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-07 23:40+0000\n"
+"POT-Creation-Date: 2021-03-19 11:41-0700\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"
@@ -18,28 +18,28 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/forms.py:185
+#: bookwyrm/forms.py:203
 msgid "One Day"
 msgstr "Ein Tag"
 
-#: bookwyrm/forms.py:186
+#: bookwyrm/forms.py:204
 msgid "One Week"
 msgstr "Eine Woche"
 
-#: bookwyrm/forms.py:187
+#: bookwyrm/forms.py:205
 msgid "One Month"
 msgstr "Ein Monat"
 
-#: bookwyrm/forms.py:188
+#: bookwyrm/forms.py:206
 msgid "Does Not Expire"
 msgstr "Läuft nicht aus"
 
-#: bookwyrm/forms.py:190
+#: bookwyrm/forms.py:211
 #, python-format
 msgid "%(count)d uses"
 msgstr "%(count)d Benutzungen"
 
-#: bookwyrm/forms.py:192
+#: bookwyrm/forms.py:214
 #, fuzzy
 #| msgid "Unlisted"
 msgid "Unlimited"
@@ -55,11 +55,11 @@ msgstr "%(value)s ist keine gültige remote_id"
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s ist kein gültiger Username"
 
-#: bookwyrm/models/fields.py:164 bookwyrm/templates/layout.html:152
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:152
 msgid "username"
 msgstr "Username"
 
-#: bookwyrm/models/fields.py:169
+#: bookwyrm/models/fields.py:170
 msgid "A user with that username already exists."
 msgstr "Dieser Benutzename ist bereits vergeben."
 
@@ -97,72 +97,86 @@ msgstr ""
 msgid "Books by %(name)s"
 msgstr "Bücher von %(name)s"
 
-#: bookwyrm/templates/book.html:21
+#: bookwyrm/templates/book/book.html:21
 #: bookwyrm/templates/discover/large-book.html:12
 #: bookwyrm/templates/discover/small-book.html:9
 msgid "by"
 msgstr "von"
 
-#: bookwyrm/templates/book.html:29 bookwyrm/templates/book.html:30
-#: bookwyrm/templates/edit_book.html:5
+#: bookwyrm/templates/book/book.html:29 bookwyrm/templates/book/book.html:30
 msgid "Edit Book"
 msgstr "Buch editieren"
 
-#: bookwyrm/templates/book.html:45
+#: bookwyrm/templates/book/book.html:45
+#: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "Cover hinzufügen"
 
-#: bookwyrm/templates/book.html:51 bookwyrm/templates/lists/list.html:89
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: bookwyrm/templates/book.html:60
+#: bookwyrm/templates/book/book.html:55
 msgid "ISBN:"
 msgstr ""
 
-#: bookwyrm/templates/book.html:67 bookwyrm/templates/edit_book.html:107
+#: bookwyrm/templates/book/book.html:62
+#: bookwyrm/templates/book/edit_book.html:211
 msgid "OCLC Number:"
 msgstr "OCLC Nummer:"
 
-#: bookwyrm/templates/book.html:74 bookwyrm/templates/edit_book.html:111
+#: bookwyrm/templates/book/book.html:69
+#: bookwyrm/templates/book/edit_book.html:215
 msgid "ASIN:"
 msgstr ""
 
-#: bookwyrm/templates/book.html:84
-#, fuzzy, python-format
-#| msgid "%(format)s, %(pages)s pages"
+#: bookwyrm/templates/book/book.html:79
+#, python-format
 msgid "%(format)s, %(pages)s pages"
-msgstr "%(format)s, %(book.pages)s Seiten"
+msgstr "%(format)s, %(pages)s Seiten"
 
-#: bookwyrm/templates/book.html:86
-#, fuzzy, python-format
-#| msgid "%(pages)s pages"
+#: bookwyrm/templates/book/book.html:81
+#, python-format
 msgid "%(pages)s pages"
-msgstr "%(book.pages)s Seiten"
+msgstr "%(pages)s Seiten"
 
-#: bookwyrm/templates/book.html:91
+#: bookwyrm/templates/book/book.html:86
+#, python-format
+msgid "Published %(date)s by %(publisher)s."
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:88
+#, fuzzy, python-format
+#| msgid "Published date:"
+msgid "Published %(date)s"
+msgstr "Veröffentlichungsdatum:"
+
+#: bookwyrm/templates/book/book.html:90
+#, python-format
+msgid "Published by %(publisher)s."
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:95
 msgid "View on OpenLibrary"
 msgstr "In OpenLibrary ansehen"
 
-#: bookwyrm/templates/book.html:100
+#: bookwyrm/templates/book/book.html:104
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s Bewertung)"
 msgstr[1] "(%(review_count)s Bewertungen)"
 
-#: bookwyrm/templates/book.html:106
+#: bookwyrm/templates/book/book.html:110
 msgid "Add Description"
 msgstr "Beschreibung hinzufügen"
 
-#: bookwyrm/templates/book.html:113 bookwyrm/templates/edit_book.html:39
+#: bookwyrm/templates/book/book.html:117
+#: bookwyrm/templates/book/edit_book.html:101
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: bookwyrm/templates/book.html:117 bookwyrm/templates/edit_author.html:78
-#: bookwyrm/templates/edit_book.html:120 bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:50
+#: bookwyrm/templates/book/book.html:121
+#: bookwyrm/templates/book/edit_book.html:225
+#: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
+#: bookwyrm/templates/preferences/edit_user.html:56
 #: bookwyrm/templates/settings/site.html:89
 #: bookwyrm/templates/snippets/progress_update.html:21
 #: bookwyrm/templates/snippets/readthrough.html:64
@@ -171,8 +185,11 @@ msgstr "Beschreibung:"
 msgid "Save"
 msgstr "Speichern"
 
-#: bookwyrm/templates/book.html:118 bookwyrm/templates/book.html:167
-#: bookwyrm/templates/edit_author.html:79 bookwyrm/templates/edit_book.html:121
+#: bookwyrm/templates/book/book.html:122 bookwyrm/templates/book/book.html:171
+#: bookwyrm/templates/book/cover_modal.html:32
+#: bookwyrm/templates/book/edit_book.html:226
+#: bookwyrm/templates/edit_author.html:79
+#: bookwyrm/templates/moderation/report_modal.html:32
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
 #: bookwyrm/templates/snippets/readthrough.html:65
@@ -182,67 +199,258 @@ msgstr "Speichern"
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: bookwyrm/templates/book.html:127
+#: bookwyrm/templates/book/book.html:131
 #, fuzzy, python-format
 #| msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s\">%(title)s</a> von"
 
-#: bookwyrm/templates/book.html:135
+#: bookwyrm/templates/book/book.html:139
 #, fuzzy, python-format
 #| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/book.html:141
+#: bookwyrm/templates/book/book.html:145
 #, fuzzy, python-format
 #| msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr "hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> zu deiner Liste \"<a href=\"%(list_path)s\">%(list_name)s</a>\" Hinzugefügt"
 
-#: bookwyrm/templates/book.html:150
+#: bookwyrm/templates/book/book.html:154
 msgid "Your reading activity"
 msgstr "Deine Leseaktivität"
 
-#: bookwyrm/templates/book.html:152
+#: bookwyrm/templates/book/book.html:156
 msgid "Add read dates"
 msgstr "Lesedaten hinzufügen"
 
-#: bookwyrm/templates/book.html:157
+#: bookwyrm/templates/book/book.html:161
 msgid "You don't have any reading activity for this book."
 msgstr "Du hast keine Leseaktivität für dieses Buch."
 
-#: bookwyrm/templates/book.html:164
+#: bookwyrm/templates/book/book.html:168
 msgid "Create"
 msgstr "Erstellen"
 
-#: bookwyrm/templates/book.html:186
+#: bookwyrm/templates/book/book.html:190
 msgid "Tags"
 msgstr ""
 
-#: bookwyrm/templates/book.html:190 bookwyrm/templates/snippets/tag.html:18
+#: bookwyrm/templates/book/book.html:194
+#: bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr "Tag hinzufügen"
 
-#: bookwyrm/templates/book.html:207
+#: bookwyrm/templates/book/book.html:211
 msgid "Subjects"
 msgstr "Themen"
 
-#: bookwyrm/templates/book.html:218
+#: bookwyrm/templates/book/book.html:222
 msgid "Places"
 msgstr "Orte"
 
-#: bookwyrm/templates/book.html:229 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book/book.html:233 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
-#: bookwyrm/templates/search_results.html:92
+#: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listen"
 
-#: bookwyrm/templates/book.html:258
+#: bookwyrm/templates/book/book.html:244
+#, fuzzy
+#| msgid "Go to list"
+msgid "Add to list"
+msgstr "Zur Liste"
+
+#: bookwyrm/templates/book/book.html:254
+#: bookwyrm/templates/book/cover_modal.html:31
+#: bookwyrm/templates/lists/list.html:90
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: bookwyrm/templates/book/book.html:282
 msgid "rated it"
 msgstr "bewertet"
 
+#: bookwyrm/templates/book/cover_modal.html:17
+#: bookwyrm/templates/book/edit_book.html:163
+#, fuzzy
+#| msgid "Add cover"
+msgid "Upload cover:"
+msgstr "Cover hinzufügen"
+
+#: bookwyrm/templates/book/cover_modal.html:23
+#: bookwyrm/templates/book/edit_book.html:169
+msgid "Load cover from url:"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:5
+#: bookwyrm/templates/book/edit_book.html:11
+#, fuzzy, python-format
+#| msgid "Editions of %(book_title)s"
+msgid "Edit \"%(book_title)s\""
+msgstr "Editionen von  %(book_title)s"
+
+#: bookwyrm/templates/book/edit_book.html:5
+#: bookwyrm/templates/book/edit_book.html:13
+#, fuzzy
+#| msgid "Add Books"
+msgid "Add Book"
+msgstr "Bücher hinzufügen"
+
+#: bookwyrm/templates/book/edit_book.html:18
+#: bookwyrm/templates/edit_author.html:13
+msgid "Added:"
+msgstr "Hinzugefügt:"
+
+#: bookwyrm/templates/book/edit_book.html:19
+#: bookwyrm/templates/edit_author.html:14
+msgid "Updated:"
+msgstr "Aktualisiert:"
+
+#: bookwyrm/templates/book/edit_book.html:20
+#: bookwyrm/templates/edit_author.html:15
+msgid "Last edited by:"
+msgstr "Zuletzt bearbeitet von:"
+
+#: bookwyrm/templates/book/edit_book.html:40
+msgid "Confirm Book Info"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:47
+#, python-format
+msgid "Is \"%(name)s\" an existing author?"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:52
+#, fuzzy, python-format
+#| msgid "Start \"<em>%(book_title)s</em>\""
+msgid "Author of <em>%(book_title)s</em>"
+msgstr "\"<em>%(book_title)s</em>\" beginnen"
+
+#: bookwyrm/templates/book/edit_book.html:55
+msgid "This is a new author"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:61
+#, python-format
+msgid "Creating a new author: %(name)s"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:67
+msgid "Is this an edition of an existing work?"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:71
+msgid "This is a new work"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:77
+#: bookwyrm/templates/password_reset.html:30
+msgid "Confirm"
+msgstr "Bestätigen"
+
+#: bookwyrm/templates/book/edit_book.html:79
+#: bookwyrm/templates/feed/status.html:8
+msgid "Back"
+msgstr "Zurück"
+
+#: bookwyrm/templates/book/edit_book.html:90
+#: bookwyrm/templates/edit_author.html:31
+msgid "Metadata"
+msgstr "Metadaten"
+
+#: bookwyrm/templates/book/edit_book.html:91
+msgid "Title:"
+msgstr "Titel:"
+
+#: bookwyrm/templates/book/edit_book.html:96
+msgid "Subtitle:"
+msgstr "Untertitel:"
+
+#: bookwyrm/templates/book/edit_book.html:106
+msgid "Series:"
+msgstr "Serie:"
+
+#: bookwyrm/templates/book/edit_book.html:111
+msgid "Series number:"
+msgstr "Seriennummer:"
+
+#: bookwyrm/templates/book/edit_book.html:117
+#, fuzzy
+#| msgid "Published"
+msgid "Publisher:"
+msgstr "Veröffentlicht"
+
+#: bookwyrm/templates/book/edit_book.html:119
+msgid "Separate multiple publishers with commas."
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:125
+msgid "First published date:"
+msgstr "Erstveröffentlichungsdatum:"
+
+#: bookwyrm/templates/book/edit_book.html:130
+msgid "Published date:"
+msgstr "Veröffentlichungsdatum:"
+
+#: bookwyrm/templates/book/edit_book.html:137
+#, fuzzy
+#| msgid "Author"
+msgid "Authors"
+msgstr "Autor*in"
+
+#: bookwyrm/templates/book/edit_book.html:143
+#, fuzzy, python-format
+#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
+msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
+
+#: bookwyrm/templates/book/edit_book.html:148
+#, fuzzy
+#| msgid "Edit Author"
+msgid "Add Authors:"
+msgstr "Autor*in editieren"
+
+#: bookwyrm/templates/book/edit_book.html:149
+msgid "John Doe, Jane Smith"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:155
+#: bookwyrm/templates/snippets/shelf.html:9
+msgid "Cover"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:182
+msgid "Physical Properties"
+msgstr "Physikalische Eigenschaften"
+
+#: bookwyrm/templates/book/edit_book.html:183
+msgid "Format:"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:191
+msgid "Pages:"
+msgstr "Seiten:"
+
+#: bookwyrm/templates/book/edit_book.html:198
+msgid "Book Identifiers"
+msgstr "Buchidentifikatoren"
+
+#: bookwyrm/templates/book/edit_book.html:199
+msgid "ISBN 13:"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:203
+msgid "ISBN 10:"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:207
+#: bookwyrm/templates/edit_author.html:59
+msgid "Openlibrary key:"
+msgstr ""
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/feed/feed_layout.html:54
 msgid "Close"
@@ -297,22 +505,6 @@ msgstr "Diese Instanz ist geschlossen"
 msgid "Your Account"
 msgstr "Dein Account"
 
-#: bookwyrm/templates/edit_author.html:13 bookwyrm/templates/edit_book.html:13
-msgid "Added:"
-msgstr "Hinzugefügt:"
-
-#: bookwyrm/templates/edit_author.html:14 bookwyrm/templates/edit_book.html:14
-msgid "Updated:"
-msgstr "Aktualisiert:"
-
-#: bookwyrm/templates/edit_author.html:15 bookwyrm/templates/edit_book.html:15
-msgid "Last edited by:"
-msgstr "Zuletzt bearbeitet von:"
-
-#: bookwyrm/templates/edit_author.html:31 bookwyrm/templates/edit_book.html:30
-msgid "Metadata"
-msgstr "Metadaten"
-
 #: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
 #: bookwyrm/templates/user/create_shelf_form.html:13
 #: bookwyrm/templates/user/edit_shelf_form.html:14
@@ -339,10 +531,6 @@ msgstr "Todesdatum:"
 msgid "Author Identifiers"
 msgstr "Autor*innenidentifikatoren"
 
-#: bookwyrm/templates/edit_author.html:59 bookwyrm/templates/edit_book.html:103
-msgid "Openlibrary key:"
-msgstr ""
-
 #: bookwyrm/templates/edit_author.html:64
 msgid "Librarything key:"
 msgstr ""
@@ -351,59 +539,6 @@ msgstr ""
 msgid "Goodreads key:"
 msgstr ""
 
-#: bookwyrm/templates/edit_book.html:31
-msgid "Title:"
-msgstr "Titel:"
-
-#: bookwyrm/templates/edit_book.html:35
-msgid "Subtitle:"
-msgstr "Untertitel:"
-
-#: bookwyrm/templates/edit_book.html:43
-msgid "Series:"
-msgstr "Serie:"
-
-#: bookwyrm/templates/edit_book.html:47
-msgid "Series number:"
-msgstr "Seriennummer:"
-
-#: bookwyrm/templates/edit_book.html:51
-msgid "First published date:"
-msgstr "Erstveröffentlichungsdatum:"
-
-#: bookwyrm/templates/edit_book.html:55
-msgid "Published date:"
-msgstr "Veröffentlichungsdatum:"
-
-#: bookwyrm/templates/edit_book.html:68
-#: bookwyrm/templates/snippets/shelf.html:9
-msgid "Cover"
-msgstr ""
-
-#: bookwyrm/templates/edit_book.html:78
-msgid "Physical Properties"
-msgstr "Physikalische Eigenschaften"
-
-#: bookwyrm/templates/edit_book.html:79
-msgid "Format:"
-msgstr ""
-
-#: bookwyrm/templates/edit_book.html:87
-msgid "Pages:"
-msgstr "Seiten:"
-
-#: bookwyrm/templates/edit_book.html:94
-msgid "Book Identifiers"
-msgstr "Buchidentifikatoren"
-
-#: bookwyrm/templates/edit_book.html:95
-msgid "ISBN 13:"
-msgstr ""
-
-#: bookwyrm/templates/edit_book.html:99
-msgid "ISBN 10:"
-msgstr ""
-
 #: bookwyrm/templates/editions.html:5
 #, python-format
 msgid "Editions of %(book_title)s"
@@ -453,18 +588,14 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:13 bookwyrm/views/feed.py:37
+#: bookwyrm/templates/feed/feed.html:13 bookwyrm/views/feed.py:38
 msgid "Local"
 msgstr "Lokal"
 
-#: bookwyrm/templates/feed/feed.html:16 bookwyrm/views/feed.py:41
+#: bookwyrm/templates/feed/feed.html:16 bookwyrm/views/feed.py:43
 msgid "Federated"
 msgstr "Föderiert"
 
-#: bookwyrm/templates/feed/feed.html:24
-msgid "Announcements"
-msgstr "Ankündigungen"
-
 #: bookwyrm/templates/feed/feed.html:32
 msgid "There aren't any activities right now! Try following a user to get started"
 msgstr "Hier sind noch keine Aktivitäten! Folge anderen, um loszulegen"
@@ -507,10 +638,6 @@ msgstr "Gelesen"
 msgid "%(year)s Reading Goal"
 msgstr "%(year)s Leseziel"
 
-#: bookwyrm/templates/feed/status.html:8
-msgid "Back"
-msgstr "Zurück"
-
 #: bookwyrm/templates/goal.html:7
 #, python-format
 msgid "%(year)s Reading Progress"
@@ -708,8 +835,8 @@ msgid "Invites"
 msgstr "Einladungen"
 
 #: bookwyrm/templates/layout.html:118
-msgid "Site Configuration"
-msgstr "Seiteneinstellungen"
+msgid "Admin"
+msgstr ""
 
 #: bookwyrm/templates/layout.html:125
 msgid "Log out"
@@ -828,6 +955,7 @@ msgid "Anyone can suggest books, subject to your approval"
 msgstr "Alle können Bücher vorschlagen, du kannst diese bestätigen"
 
 #: bookwyrm/templates/lists/form.html:31
+#: bookwyrm/templates/moderation/reports.html:11
 msgid "Open"
 msgstr "Offen"
 
@@ -878,7 +1006,7 @@ msgstr "Keine passenden Bücher zu \"%(query)s\" gefunden"
 msgid "No books found"
 msgstr "Keine Bücher gefunden"
 
-#: bookwyrm/templates/lists/list.html:89
+#: bookwyrm/templates/lists/list.html:90
 msgid "Suggest"
 msgstr "Vorschlagen"
 
@@ -913,6 +1041,120 @@ msgstr "Kontaktiere für eine Einladung eine*n Admin"
 msgid "More about this site"
 msgstr "Mehr über diese Seite"
 
+#: bookwyrm/templates/moderation/report.html:5
+#: bookwyrm/templates/moderation/report.html:6
+#: bookwyrm/templates/moderation/report_preview.html:6
+#, python-format
+msgid "Report #%(report_id)s: %(username)s"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:10
+msgid "Back to reports"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:18
+#, fuzzy
+#| msgid "Notifications"
+msgid "Actions"
+msgstr "Benachrichtigungen"
+
+#: bookwyrm/templates/moderation/report.html:19
+#, fuzzy
+#| msgid "User Profile"
+msgid "View user profile"
+msgstr "Benutzerprofil"
+
+#: bookwyrm/templates/moderation/report.html:22
+#: bookwyrm/templates/snippets/status/status_options.html:25
+#: bookwyrm/templates/snippets/user_options.html:13
+msgid "Send direct message"
+msgstr "Direktnachricht senden"
+
+#: bookwyrm/templates/moderation/report.html:27
+msgid "Deactivate user"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:29
+msgid "Reactivate user"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:36
+msgid "Moderator Comments"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:54
+#: bookwyrm/templates/snippets/create_status.html:12
+#: bookwyrm/templates/snippets/create_status_form.html:44
+msgid "Comment"
+msgstr "Kommentieren"
+
+#: bookwyrm/templates/moderation/report.html:59
+#, fuzzy
+#| msgid "Delete status"
+msgid "Reported statuses"
+msgstr "Post löschen"
+
+#: bookwyrm/templates/moderation/report.html:61
+msgid "No statuses reported"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:67
+msgid "Statuses has been deleted"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report_modal.html:6
+#, fuzzy, python-format
+#| msgid "Lists: %(username)s"
+msgid "Report @%(username)s"
+msgstr "Listen: %(username)s"
+
+#: bookwyrm/templates/moderation/report_modal.html:21
+#, python-format
+msgid "This report will be sent to %(site_name)s's moderators for review."
+msgstr ""
+
+#: bookwyrm/templates/moderation/report_modal.html:22
+#, fuzzy
+#| msgid "More about this site"
+msgid "More info about this report:"
+msgstr "Mehr über diese Seite"
+
+#: bookwyrm/templates/moderation/report_modal.html:31
+msgid "Submit"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report_preview.html:13
+msgid "No notes provided"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report_preview.html:20
+#, fuzzy, python-format
+#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+msgid "Reported by <a href=\"%(path)s\">%(username)s</a>"
+msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
+
+#: bookwyrm/templates/moderation/report_preview.html:30
+msgid "Re-open"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report_preview.html:32
+msgid "Resolve"
+msgstr ""
+
+#: bookwyrm/templates/moderation/reports.html:4
+#: bookwyrm/templates/moderation/reports.html:5
+#: bookwyrm/templates/settings/admin_layout.html:23
+#, fuzzy
+#| msgid "Recent Imports"
+msgid "Reports"
+msgstr "Aktuelle Importe"
+
+#: bookwyrm/templates/moderation/reports.html:14
+#, fuzzy
+#| msgid "Shelved"
+msgid "Resolved"
+msgstr "Ins Regal gestellt"
+
 #: bookwyrm/templates/notfound.html:4 bookwyrm/templates/notfound.html:8
 msgid "Not Found"
 msgstr "Nicht gefunden"
@@ -925,110 +1167,115 @@ msgstr "Die Seite die du angefordert hast scheint nicht zu existieren!"
 msgid "Delete notifications"
 msgstr "Benachrichtigungen löschen"
 
-#: bookwyrm/templates/notifications.html:51
+#: bookwyrm/templates/notifications.html:53
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "hat deine <a href=\"%(related_path)s\">Bewertung von <em>%(book_title)s</em></a> favorisiert"
 
-#: bookwyrm/templates/notifications.html:53
+#: bookwyrm/templates/notifications.html:55
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "hat deinen <a href=\"%(related_path)s\">Kommentar zu <em>%(book_title)s</em></a> favorisiert"
 
-#: bookwyrm/templates/notifications.html:55
+#: bookwyrm/templates/notifications.html:57
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr " hat dein <a href=\"%(related_path)s\">Zitat aus <em>%(book_title)s</em></a> favorisiert"
 
-#: bookwyrm/templates/notifications.html:57
+#: bookwyrm/templates/notifications.html:59
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">status</a>"
 msgstr "hat deinen <a href=\"%(related_path)s\">Status</a> favorisiert"
 
-#: bookwyrm/templates/notifications.html:62
+#: bookwyrm/templates/notifications.html:64
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "hat dich in einer <a href=\"%(related_path)s\">Bewertung von <em>%(book_title)s</em></a> erwähnt"
 
-#: bookwyrm/templates/notifications.html:64
+#: bookwyrm/templates/notifications.html:66
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "hat dich in einem <a href=\"%(related_path)s\">Kommentar zu <em>%(book_title)s</em></a> erwähnt"
 
-#: bookwyrm/templates/notifications.html:66
+#: bookwyrm/templates/notifications.html:68
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "hat dich in einem <a href=\"%(related_path)s\">Zitat von <em>%(book_title)s</em></a> erwähnt"
 
-#: bookwyrm/templates/notifications.html:68
+#: bookwyrm/templates/notifications.html:70
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">status</a>"
 msgstr "hat dich in einem <a href=\"%(related_path)s\">Status</a> erwähnt"
 
-#: bookwyrm/templates/notifications.html:73
+#: bookwyrm/templates/notifications.html:75
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "hat auf deine <a href=\"%(parent_path)s\">Bewertung von <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a> "
 
-#: bookwyrm/templates/notifications.html:75
+#: bookwyrm/templates/notifications.html:77
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "hat auf deinen <a href=\"%(parent_path)s\">Kommentar zu <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a>"
 
-#: bookwyrm/templates/notifications.html:77
+#: bookwyrm/templates/notifications.html:79
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "hat auf dein <a href=\"%(parent_path)s\">Zitat aus <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a>"
 
-#: bookwyrm/templates/notifications.html:79
+#: bookwyrm/templates/notifications.html:81
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgstr "hat auf deinen <a href=\"%(parent_path)s\">Status</a> <a href=\"%(related_path)s\">geantwortet</a>"
 
-#: bookwyrm/templates/notifications.html:83
+#: bookwyrm/templates/notifications.html:85
 msgid "followed you"
 msgstr "folgt dir"
 
-#: bookwyrm/templates/notifications.html:86
+#: bookwyrm/templates/notifications.html:88
 msgid "sent you a follow request"
 msgstr "hat dir eine Folgeanfrage geschickt"
 
-#: bookwyrm/templates/notifications.html:92
+#: bookwyrm/templates/notifications.html:94
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "hat deine <a href=\"%(related_path)s\">Bewertung von <em>%(book_title)s</em></a> geteilt"
 
-#: bookwyrm/templates/notifications.html:94
+#: bookwyrm/templates/notifications.html:96
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
 msgstr "hat deinen <a href=\"%(related_path)s\">Kommentar zu<em>%(book_title)s</em></a> geteilt"
 
-#: bookwyrm/templates/notifications.html:96
+#: bookwyrm/templates/notifications.html:98
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "hat dein <a href=\"%(related_path)s\">Zitat aus <em>%(book_title)s</em></a> geteilt"
 
-#: bookwyrm/templates/notifications.html:98
+#: bookwyrm/templates/notifications.html:100
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">status</a>"
 msgstr "hat deinen <a href=\"%(related_path)s\">Status</a> geteilt"
 
-#: bookwyrm/templates/notifications.html:102
+#: bookwyrm/templates/notifications.html:104
 #, python-format
 msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 msgstr "hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> zu deiner Liste \"<a href=\"%(list_path)s\">%(list_name)s</a>\" Hinzugefügt"
 
-#: bookwyrm/templates/notifications.html:104
+#: bookwyrm/templates/notifications.html:106
 #, python-format
 msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 msgstr "hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> für deine Liste \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\" vorgeschlagen"
 
-#: bookwyrm/templates/notifications.html:108
+#: bookwyrm/templates/notifications.html:110
 #, python-format
-msgid " your <a href=\"/import/%(related_id)s\">import</a> completed."
-msgstr " dein <a href=\"/import/%(related_id)s\">Import</a> ist abgeschlossen."
+msgid "Your <a href=\"/import/%(related_id)s\">import</a> completed."
+msgstr "Dein <a href=\"/import/%(related_id)s\">Import</a> ist abgeschlossen."
 
-#: bookwyrm/templates/notifications.html:142
+#: bookwyrm/templates/notifications.html:113
+#, python-format
+msgid "A new <a href=\"%(path)s\">report</a> needs moderation."
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:139
 msgid "You're all caught up!"
 msgstr "Du bist auf dem neusten Stand!"
 
@@ -1044,10 +1291,6 @@ msgstr "Passwort zurücksetzen!"
 msgid "Confirm password:"
 msgstr "Passwort bestätigen:"
 
-#: bookwyrm/templates/password_reset.html:30
-msgid "Confirm"
-msgstr "Bestätigen"
-
 #: bookwyrm/templates/password_reset_request.html:12
 msgid "A link to reset your password will be sent to your email address"
 msgstr "Ein Link zum Zurücksetzen deines Passworts wird an deine Mailadresse geschickt"
@@ -1101,6 +1344,10 @@ msgid "Summary:"
 msgstr "Bio:"
 
 #: bookwyrm/templates/preferences/edit_user.html:46
+msgid "Show set reading goal prompt in feed:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:52
 msgid "Manually approve followers:"
 msgstr "Folgende manuell bestätigen"
 
@@ -1120,24 +1367,20 @@ msgstr "Nicht gefunden, wonach du gesucht hast?"
 msgid "Show results from other catalogues"
 msgstr "Ergebnisse aus anderen Katalogen zeigen"
 
-#: bookwyrm/templates/search_results.html:57
-msgid "Import book"
-msgstr "Buch importieren"
-
-#: bookwyrm/templates/search_results.html:67
+#: bookwyrm/templates/search_results.html:62
 msgid "Hide results from other catalogues"
 msgstr "Ergebnisse aus anderen Katalogen ausblenden"
 
-#: bookwyrm/templates/search_results.html:75
+#: bookwyrm/templates/search_results.html:74
 msgid "Matching Users"
 msgstr "Passende Nutzer*innen"
 
-#: bookwyrm/templates/search_results.html:77
+#: bookwyrm/templates/search_results.html:76
 #, python-format
 msgid "No users found for \"%(query)s\""
 msgstr "Keine Nutzer*innen für \"%(query)s\" gefunden"
 
-#: bookwyrm/templates/search_results.html:94
+#: bookwyrm/templates/search_results.html:93
 #, python-format
 msgid "No lists found for \"%(query)s\""
 msgstr "Keine Liste für \"%(query)s\" gefunden"
@@ -1150,37 +1393,37 @@ msgstr ""
 msgid "Manage Users"
 msgstr "Nutzer*innen verwalten"
 
-#: bookwyrm/templates/settings/admin_layout.html:23
+#: bookwyrm/templates/settings/admin_layout.html:27
 #: bookwyrm/templates/settings/federation.html:4
 msgid "Federated Servers"
 msgstr "Föderierende Server"
 
-#: bookwyrm/templates/settings/admin_layout.html:28
+#: bookwyrm/templates/settings/admin_layout.html:32
 msgid "Instance Settings"
 msgstr "Instanzeinstellungen"
 
-#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/admin_layout.html:36
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr "Seiteneinstellungen"
 
-#: bookwyrm/templates/settings/admin_layout.html:35
+#: bookwyrm/templates/settings/admin_layout.html:39
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr "Instanzinformationen"
 
-#: bookwyrm/templates/settings/admin_layout.html:36
+#: bookwyrm/templates/settings/admin_layout.html:40
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr "Bilder"
 
-#: bookwyrm/templates/settings/admin_layout.html:37
+#: bookwyrm/templates/settings/admin_layout.html:41
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr "Inhalt des Footers"
 
-#: bookwyrm/templates/settings/admin_layout.html:38
+#: bookwyrm/templates/settings/admin_layout.html:42
 #: bookwyrm/templates/settings/site.html:77
 msgid "Registration"
 msgstr "Registrierung"
@@ -1300,8 +1543,8 @@ msgstr "<a href=\"%(path)s\">%(title)s</a> von "
 
 #: bookwyrm/templates/snippets/boost_button.html:8
 #: bookwyrm/templates/snippets/boost_button.html:9
-#: bookwyrm/templates/snippets/status/status_body.html:41
-#: bookwyrm/templates/snippets/status/status_body.html:42
+#: bookwyrm/templates/snippets/status/status_body.html:51
+#: bookwyrm/templates/snippets/status/status_body.html:52
 msgid "Boost status"
 msgstr "Status teilen"
 
@@ -1322,11 +1565,6 @@ msgstr "Spoileralarm!"
 msgid "Review"
 msgstr "Bewerten"
 
-#: bookwyrm/templates/snippets/create_status.html:12
-#: bookwyrm/templates/snippets/create_status_form.html:44
-msgid "Comment"
-msgstr "Kommentieren"
-
 #: bookwyrm/templates/snippets/create_status.html:15
 msgid "Quote"
 msgstr "Zitieren"
@@ -1373,8 +1611,8 @@ msgstr "Löschen"
 
 #: bookwyrm/templates/snippets/fav_button.html:7
 #: bookwyrm/templates/snippets/fav_button.html:8
-#: bookwyrm/templates/snippets/status/status_body.html:45
-#: bookwyrm/templates/snippets/status/status_body.html:46
+#: bookwyrm/templates/snippets/status/status_body.html:55
+#: bookwyrm/templates/snippets/status/status_body.html:56
 msgid "Like status"
 msgstr "Status favorisieren"
 
@@ -1383,19 +1621,21 @@ msgstr "Status favorisieren"
 msgid "Un-like status"
 msgstr "Favorisieren zurücknehmen"
 
-#: bookwyrm/templates/snippets/follow_button.html:6
-msgid "Follow request already sent."
-msgstr "Folgeanfrage bereits gesendet."
-
-#: bookwyrm/templates/snippets/follow_button.html:19
+#: bookwyrm/templates/snippets/follow_button.html:13
 msgid "Send follow request"
 msgstr "Folgeanfrage senden"
 
-#: bookwyrm/templates/snippets/follow_button.html:21
+#: bookwyrm/templates/snippets/follow_button.html:15
 msgid "Follow"
 msgstr "Folgen"
 
-#: bookwyrm/templates/snippets/follow_button.html:27
+#: bookwyrm/templates/snippets/follow_button.html:22
+#, fuzzy
+#| msgid "Send follow request"
+msgid "Undo follow request"
+msgstr "Folgeanfrage senden"
+
+#: bookwyrm/templates/snippets/follow_button.html:24
 msgid "Unfollow"
 msgstr "Entfolgen"
 
@@ -1410,11 +1650,19 @@ msgid_plural "set a goal to read %(counter)s books in %(year)s"
 msgstr[0] "Setze das Ziel, %(year)s %(counter)s Buch zu lesen"
 msgstr[1] "Setze das Ziel, %(year)s %(counter)s Bücher zu lesen"
 
-#: bookwyrm/templates/snippets/goal_card.html:21
+#: bookwyrm/templates/snippets/generated_status/rating.html:3
+#, fuzzy, python-format
+#| msgid "<a href=\"%(path)s\">%(title)s</a> by "
+msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(rating)s star"
+msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(rating)s stars"
+msgstr[0] "<a href=\"%(path)s\">%(title)s</a> von "
+msgstr[1] "<a href=\"%(path)s\">%(title)s</a> von "
+
+#: bookwyrm/templates/snippets/goal_card.html:22
 msgid "Dismiss message"
 msgstr "Nachricht verwerfen"
 
-#: bookwyrm/templates/snippets/goal_card.html:22
+#: bookwyrm/templates/snippets/goal_card.html:23
 #, python-format
 msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
 msgstr "Du kannst dein Leseziel jederzeit auf deiner <a href=\"%(path)s\">Profilseite</a> setzen oder ändern."
@@ -1510,8 +1758,8 @@ msgstr "Prozent"
 
 #: bookwyrm/templates/snippets/progress_update.html:25
 #, python-format
-msgid "of %(book.pages)s pages"
-msgstr "von %(book.pages)s Seiten"
+msgid "of %(pages)s pages"
+msgstr "von %(pages)s Seiten"
 
 #: bookwyrm/templates/snippets/rate_action.html:4
 msgid "Leave a rating"
@@ -1569,6 +1817,12 @@ msgstr "Lesen abgeschlossen"
 msgid "Sign Up"
 msgstr "Registrieren"
 
+#: bookwyrm/templates/snippets/report_button.html:5
+#, fuzzy
+#| msgid "Import"
+msgid "Report"
+msgstr "Importieren"
+
 #: bookwyrm/templates/snippets/rss_title.html:5
 #: bookwyrm/templates/snippets/status/status_header.html:11
 msgid "rated"
@@ -1589,11 +1843,21 @@ msgstr "kommentierte"
 msgid "quoted"
 msgstr "zitierte"
 
-#: bookwyrm/templates/snippets/search_result_text.html:3
+#: bookwyrm/templates/snippets/search_result_text.html:10
+#, fuzzy
+#| msgid "Add cover"
+msgid "No cover"
+msgstr "Cover hinzufügen"
+
+#: bookwyrm/templates/snippets/search_result_text.html:22
 #, python-format
 msgid "by %(author)s"
 msgstr "von %(author)s"
 
+#: bookwyrm/templates/snippets/search_result_text.html:30
+msgid "Import book"
+msgstr "Buch importieren"
+
 #: bookwyrm/templates/snippets/shelf.html:12
 msgid "Published"
 msgstr "Veröffentlicht"
@@ -1670,9 +1934,14 @@ msgstr "\"<em>%(book_title)s</em>\" auf Leseliste setzen"
 msgid "boosted"
 msgstr "teilt"
 
-#: bookwyrm/templates/snippets/status/status_body.html:24
-#: bookwyrm/templates/snippets/status/status_body.html:37
-#: bookwyrm/templates/snippets/status/status_body.html:38
+#: bookwyrm/templates/snippets/status/status_body.html:27
+#: bookwyrm/templates/snippets/status/status_options.html:18
+msgid "Delete status"
+msgstr "Post löschen"
+
+#: bookwyrm/templates/snippets/status/status_body.html:34
+#: bookwyrm/templates/snippets/status/status_body.html:47
+#: bookwyrm/templates/snippets/status/status_body.html:48
 msgid "Reply"
 msgstr "Antwort"
 
@@ -1719,15 +1988,6 @@ msgstr "hat auf deinen <a href=\"%(parent_path)s\">Status</a> <a href=\"%(relate
 msgid "More options"
 msgstr "Mehr Optionen"
 
-#: bookwyrm/templates/snippets/status/status_options.html:17
-msgid "Delete status"
-msgstr "Post löschen"
-
-#: bookwyrm/templates/snippets/status/status_options.html:23
-#: bookwyrm/templates/snippets/user_options.html:13
-msgid "Send direct message"
-msgstr "Direktnachricht senden"
-
 #: bookwyrm/templates/snippets/switch_edition_button.html:5
 msgid "Switch to this edition"
 msgstr "Zu dieser Edition wechseln"
@@ -1868,6 +2128,143 @@ msgstr[1] "%(counter)s Folgende"
 msgid "%(counter)s following"
 msgstr "Folgt %(counter)s"
 
+#, fuzzy
+#~| msgid "All messages"
+#~ msgid "Messages"
+#~ msgstr "Alle Nachrichten"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "Enter a valid email address."
+#~ msgstr "E-Mail Adresse"
+
+#, fuzzy
+#~| msgid "Series number:"
+#~ msgid "Enter a number."
+#~ msgstr "Seriennummer:"
+
+#, fuzzy, python-format
+#~| msgid "%(value)s is not a valid remote_id"
+#~ msgid "Value %(value)r is not a valid choice."
+#~ msgstr "%(value)s ist keine gültige remote_id"
+
+#, fuzzy
+#~| msgid "Series number:"
+#~ msgid "Decimal number"
+#~ msgstr "Seriennummer:"
+
+#, fuzzy
+#~| msgid "List curation:"
+#~ msgid "Duration"
+#~ msgstr "Listenkuratierung:"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "Email address"
+#~ msgstr "E-Mail Adresse"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "IPv4 address"
+#~ msgstr "E-Mail Adresse"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "IP address"
+#~ msgstr "E-Mail Adresse"
+
+#, fuzzy
+#~| msgid "No active invites"
+#~ msgid "Positive integer"
+#~ msgstr "Keine aktiven Einladungen"
+
+#, fuzzy, python-format
+#~| msgid "%(value)s is not a valid username"
+#~ msgid "“%(value)s� is not a valid UUID."
+#~ msgstr "%(value)s ist kein gültiger Username"
+
+#, fuzzy
+#~| msgid "Images"
+#~ msgid "Image"
+#~ msgstr "Bilder"
+
+#, fuzzy
+#~| msgid "Relationships"
+#~ msgid "One-to-one relationship"
+#~ msgstr "Beziehungen"
+
+#, fuzzy
+#~| msgid "This shelf is empty."
+#~ msgid "This field is required."
+#~ msgstr "Dieses Regal ist leer."
+
+#, fuzzy
+#~| msgid "This shelf is empty."
+#~ msgid "The submitted file is empty."
+#~ msgstr "Dieses Regal ist leer."
+
+#, fuzzy, python-format
+#~| msgid "%(value)s is not a valid username"
+#~ msgid "“%(pk)s� is not a valid value."
+#~ msgstr "%(value)s ist kein gültiger Username"
+
+#, fuzzy
+#~| msgid "Start reading"
+#~ msgid "Currently"
+#~ msgstr "Gerade lesend"
+
+#, fuzzy
+#~| msgid "Change shelf"
+#~ msgid "Change"
+#~ msgstr "Regal wechseln"
+
+#, fuzzy
+#~| msgid "Started"
+#~ msgid "Sat"
+#~ msgstr "Gestartet"
+
+#, fuzzy
+#~| msgid "Search"
+#~ msgid "March"
+#~ msgstr "Suche"
+
+#, fuzzy
+#~| msgid "Series number:"
+#~ msgid "September"
+#~ msgstr "Seriennummer:"
+
+#, fuzzy
+#~| msgid "Search"
+#~ msgctxt "abbrev. month"
+#~ msgid "March"
+#~ msgstr "Suche"
+
+#, fuzzy
+#~| msgid "Search"
+#~ msgctxt "alt. month"
+#~ msgid "March"
+#~ msgstr "Suche"
+
+#, fuzzy
+#~| msgid "Series number:"
+#~ msgctxt "alt. month"
+#~ msgid "September"
+#~ msgstr "Seriennummer:"
+
+#, fuzzy, python-format
+#~| msgid "No books found matching the query \"%(query)s\""
+#~ msgid "No %(verbose_name)s found matching the query"
+#~ msgstr "Keine passenden Bücher zu \"%(query)s\" gefunden"
+
+#~ msgid "Announcements"
+#~ msgstr "Ankündigungen"
+
+#~ msgid "Site Configuration"
+#~ msgstr "Seiteneinstellungen"
+
+#~ msgid "Follow request already sent."
+#~ msgstr "Folgeanfrage bereits gesendet."
+
 #~ msgid "Created and curated by"
 #~ msgstr "Erstellt und kuratiert von"
 
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index d69fe702..fe0047b2 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-07 23:40+0000\n"
+"POT-Creation-Date: 2021-03-19 11:41-0700\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"
@@ -18,28 +18,28 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/forms.py:185
+#: bookwyrm/forms.py:203
 msgid "One Day"
 msgstr ""
 
-#: bookwyrm/forms.py:186
+#: bookwyrm/forms.py:204
 msgid "One Week"
 msgstr ""
 
-#: bookwyrm/forms.py:187
+#: bookwyrm/forms.py:205
 msgid "One Month"
 msgstr ""
 
-#: bookwyrm/forms.py:188
+#: bookwyrm/forms.py:206
 msgid "Does Not Expire"
 msgstr ""
 
-#: bookwyrm/forms.py:190
+#: bookwyrm/forms.py:211
 #, python-format
 msgid "%(count)d uses"
 msgstr ""
 
-#: bookwyrm/forms.py:192
+#: bookwyrm/forms.py:214
 msgid "Unlimited"
 msgstr ""
 
@@ -53,11 +53,11 @@ msgstr ""
 msgid "%(value)s is not a valid username"
 msgstr ""
 
-#: bookwyrm/models/fields.py:164 bookwyrm/templates/layout.html:152
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:152
 msgid "username"
 msgstr ""
 
-#: bookwyrm/models/fields.py:169
+#: bookwyrm/models/fields.py:170
 msgid "A user with that username already exists."
 msgstr ""
 
@@ -95,70 +95,85 @@ msgstr ""
 msgid "Books by %(name)s"
 msgstr ""
 
-#: bookwyrm/templates/book.html:21
+#: bookwyrm/templates/book/book.html:21
 #: bookwyrm/templates/discover/large-book.html:12
 #: bookwyrm/templates/discover/small-book.html:9
 msgid "by"
 msgstr ""
 
-#: bookwyrm/templates/book.html:29 bookwyrm/templates/book.html:30
-#: bookwyrm/templates/edit_book.html:5
+#: bookwyrm/templates/book/book.html:29 bookwyrm/templates/book/book.html:30
 msgid "Edit Book"
 msgstr ""
 
-#: bookwyrm/templates/book.html:45
+#: bookwyrm/templates/book/book.html:45
+#: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr ""
 
-#: bookwyrm/templates/book.html:51 bookwyrm/templates/lists/list.html:89
-msgid "Add"
-msgstr ""
-
-#: bookwyrm/templates/book.html:60
+#: bookwyrm/templates/book/book.html:55
 msgid "ISBN:"
 msgstr ""
 
-#: bookwyrm/templates/book.html:67 bookwyrm/templates/edit_book.html:107
+#: bookwyrm/templates/book/book.html:62
+#: bookwyrm/templates/book/edit_book.html:211
 msgid "OCLC Number:"
 msgstr ""
 
-#: bookwyrm/templates/book.html:74 bookwyrm/templates/edit_book.html:111
+#: bookwyrm/templates/book/book.html:69
+#: bookwyrm/templates/book/edit_book.html:215
 msgid "ASIN:"
 msgstr ""
 
-#: bookwyrm/templates/book.html:84
+#: bookwyrm/templates/book/book.html:79
 #, python-format
 msgid "%(format)s, %(pages)s pages"
 msgstr ""
 
-#: bookwyrm/templates/book.html:86
+#: bookwyrm/templates/book/book.html:81
 #, python-format
 msgid "%(pages)s pages"
 msgstr ""
 
-#: bookwyrm/templates/book.html:91
+#: bookwyrm/templates/book/book.html:86
+#, python-format
+msgid "Published %(date)s by %(publisher)s."
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:88
+#, python-format
+msgid "Published %(date)s"
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:90
+#, python-format
+msgid "Published by %(publisher)s."
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:95
 msgid "View on OpenLibrary"
 msgstr ""
 
-#: bookwyrm/templates/book.html:100
+#: bookwyrm/templates/book/book.html:104
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/book.html:106
+#: bookwyrm/templates/book/book.html:110
 msgid "Add Description"
 msgstr ""
 
-#: bookwyrm/templates/book.html:113 bookwyrm/templates/edit_book.html:39
+#: bookwyrm/templates/book/book.html:117
+#: bookwyrm/templates/book/edit_book.html:101
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr ""
 
-#: bookwyrm/templates/book.html:117 bookwyrm/templates/edit_author.html:78
-#: bookwyrm/templates/edit_book.html:120 bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:50
+#: bookwyrm/templates/book/book.html:121
+#: bookwyrm/templates/book/edit_book.html:225
+#: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
+#: bookwyrm/templates/preferences/edit_user.html:56
 #: bookwyrm/templates/settings/site.html:89
 #: bookwyrm/templates/snippets/progress_update.html:21
 #: bookwyrm/templates/snippets/readthrough.html:64
@@ -167,8 +182,11 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: bookwyrm/templates/book.html:118 bookwyrm/templates/book.html:167
-#: bookwyrm/templates/edit_author.html:79 bookwyrm/templates/edit_book.html:121
+#: bookwyrm/templates/book/book.html:122 bookwyrm/templates/book/book.html:171
+#: bookwyrm/templates/book/cover_modal.html:32
+#: bookwyrm/templates/book/edit_book.html:226
+#: bookwyrm/templates/edit_author.html:79
+#: bookwyrm/templates/moderation/report_modal.html:32
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
 #: bookwyrm/templates/snippets/readthrough.html:65
@@ -178,64 +196,240 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: bookwyrm/templates/book.html:127
+#: bookwyrm/templates/book/book.html:131
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr ""
 
-#: bookwyrm/templates/book.html:135
+#: bookwyrm/templates/book/book.html:139
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr ""
 
-#: bookwyrm/templates/book.html:141
+#: bookwyrm/templates/book/book.html:145
 #, python-format
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr ""
 
-#: bookwyrm/templates/book.html:150
+#: bookwyrm/templates/book/book.html:154
 msgid "Your reading activity"
 msgstr ""
 
-#: bookwyrm/templates/book.html:152
+#: bookwyrm/templates/book/book.html:156
 msgid "Add read dates"
 msgstr ""
 
-#: bookwyrm/templates/book.html:157
+#: bookwyrm/templates/book/book.html:161
 msgid "You don't have any reading activity for this book."
 msgstr ""
 
-#: bookwyrm/templates/book.html:164
+#: bookwyrm/templates/book/book.html:168
 msgid "Create"
 msgstr ""
 
-#: bookwyrm/templates/book.html:186
+#: bookwyrm/templates/book/book.html:190
 msgid "Tags"
 msgstr ""
 
-#: bookwyrm/templates/book.html:190 bookwyrm/templates/snippets/tag.html:18
+#: bookwyrm/templates/book/book.html:194
+#: bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr ""
 
-#: bookwyrm/templates/book.html:207
+#: bookwyrm/templates/book/book.html:211
 msgid "Subjects"
 msgstr ""
 
-#: bookwyrm/templates/book.html:218
+#: bookwyrm/templates/book/book.html:222
 msgid "Places"
 msgstr ""
 
-#: bookwyrm/templates/book.html:229 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book/book.html:233 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
-#: bookwyrm/templates/search_results.html:92
+#: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr ""
 
-#: bookwyrm/templates/book.html:258
+#: bookwyrm/templates/book/book.html:244
+msgid "Add to list"
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:254
+#: bookwyrm/templates/book/cover_modal.html:31
+#: bookwyrm/templates/lists/list.html:90
+msgid "Add"
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:282
 msgid "rated it"
 msgstr ""
 
+#: bookwyrm/templates/book/cover_modal.html:17
+#: bookwyrm/templates/book/edit_book.html:163
+msgid "Upload cover:"
+msgstr ""
+
+#: bookwyrm/templates/book/cover_modal.html:23
+#: bookwyrm/templates/book/edit_book.html:169
+msgid "Load cover from url:"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:5
+#: bookwyrm/templates/book/edit_book.html:11
+#, python-format
+msgid "Edit \"%(book_title)s\""
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:5
+#: bookwyrm/templates/book/edit_book.html:13
+msgid "Add Book"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:18
+#: bookwyrm/templates/edit_author.html:13
+msgid "Added:"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:19
+#: bookwyrm/templates/edit_author.html:14
+msgid "Updated:"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:20
+#: bookwyrm/templates/edit_author.html:15
+msgid "Last edited by:"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:40
+msgid "Confirm Book Info"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:47
+#, python-format
+msgid "Is \"%(name)s\" an existing author?"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:52
+#, python-format
+msgid "Author of <em>%(book_title)s</em>"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:55
+msgid "This is a new author"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:61
+#, python-format
+msgid "Creating a new author: %(name)s"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:67
+msgid "Is this an edition of an existing work?"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:71
+msgid "This is a new work"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:77
+#: bookwyrm/templates/password_reset.html:30
+msgid "Confirm"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:79
+#: bookwyrm/templates/feed/status.html:8
+msgid "Back"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:90
+#: bookwyrm/templates/edit_author.html:31
+msgid "Metadata"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:91
+msgid "Title:"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:96
+msgid "Subtitle:"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:106
+msgid "Series:"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:111
+msgid "Series number:"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:117
+msgid "Publisher:"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:119
+msgid "Separate multiple publishers with commas."
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:125
+msgid "First published date:"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:130
+msgid "Published date:"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:137
+msgid "Authors"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:143
+#, python-format
+msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:148
+msgid "Add Authors:"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:149
+msgid "John Doe, Jane Smith"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:155
+#: bookwyrm/templates/snippets/shelf.html:9
+msgid "Cover"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:182
+msgid "Physical Properties"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:183
+msgid "Format:"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:191
+msgid "Pages:"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:198
+msgid "Book Identifiers"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:199
+msgid "ISBN 13:"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:203
+msgid "ISBN 10:"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:207
+#: bookwyrm/templates/edit_author.html:59
+msgid "Openlibrary key:"
+msgstr ""
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/feed/feed_layout.html:54
 msgid "Close"
@@ -290,22 +484,6 @@ msgstr ""
 msgid "Your Account"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:13 bookwyrm/templates/edit_book.html:13
-msgid "Added:"
-msgstr ""
-
-#: bookwyrm/templates/edit_author.html:14 bookwyrm/templates/edit_book.html:14
-msgid "Updated:"
-msgstr ""
-
-#: bookwyrm/templates/edit_author.html:15 bookwyrm/templates/edit_book.html:15
-msgid "Last edited by:"
-msgstr ""
-
-#: bookwyrm/templates/edit_author.html:31 bookwyrm/templates/edit_book.html:30
-msgid "Metadata"
-msgstr ""
-
 #: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
 #: bookwyrm/templates/user/create_shelf_form.html:13
 #: bookwyrm/templates/user/edit_shelf_form.html:14
@@ -332,10 +510,6 @@ msgstr ""
 msgid "Author Identifiers"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:59 bookwyrm/templates/edit_book.html:103
-msgid "Openlibrary key:"
-msgstr ""
-
 #: bookwyrm/templates/edit_author.html:64
 msgid "Librarything key:"
 msgstr ""
@@ -344,59 +518,6 @@ msgstr ""
 msgid "Goodreads key:"
 msgstr ""
 
-#: bookwyrm/templates/edit_book.html:31
-msgid "Title:"
-msgstr ""
-
-#: bookwyrm/templates/edit_book.html:35
-msgid "Subtitle:"
-msgstr ""
-
-#: bookwyrm/templates/edit_book.html:43
-msgid "Series:"
-msgstr ""
-
-#: bookwyrm/templates/edit_book.html:47
-msgid "Series number:"
-msgstr ""
-
-#: bookwyrm/templates/edit_book.html:51
-msgid "First published date:"
-msgstr ""
-
-#: bookwyrm/templates/edit_book.html:55
-msgid "Published date:"
-msgstr ""
-
-#: bookwyrm/templates/edit_book.html:68
-#: bookwyrm/templates/snippets/shelf.html:9
-msgid "Cover"
-msgstr ""
-
-#: bookwyrm/templates/edit_book.html:78
-msgid "Physical Properties"
-msgstr ""
-
-#: bookwyrm/templates/edit_book.html:79
-msgid "Format:"
-msgstr ""
-
-#: bookwyrm/templates/edit_book.html:87
-msgid "Pages:"
-msgstr ""
-
-#: bookwyrm/templates/edit_book.html:94
-msgid "Book Identifiers"
-msgstr ""
-
-#: bookwyrm/templates/edit_book.html:95
-msgid "ISBN 13:"
-msgstr ""
-
-#: bookwyrm/templates/edit_book.html:99
-msgid "ISBN 10:"
-msgstr ""
-
 #: bookwyrm/templates/editions.html:5
 #, python-format
 msgid "Editions of %(book_title)s"
@@ -446,18 +567,14 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:13 bookwyrm/views/feed.py:37
+#: bookwyrm/templates/feed/feed.html:13 bookwyrm/views/feed.py:38
 msgid "Local"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:16 bookwyrm/views/feed.py:41
+#: bookwyrm/templates/feed/feed.html:16 bookwyrm/views/feed.py:43
 msgid "Federated"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:24
-msgid "Announcements"
-msgstr ""
-
 #: bookwyrm/templates/feed/feed.html:32
 msgid "There aren't any activities right now! Try following a user to get started"
 msgstr ""
@@ -496,10 +613,6 @@ msgstr ""
 msgid "%(year)s Reading Goal"
 msgstr ""
 
-#: bookwyrm/templates/feed/status.html:8
-msgid "Back"
-msgstr ""
-
 #: bookwyrm/templates/goal.html:7
 #, python-format
 msgid "%(year)s Reading Progress"
@@ -697,7 +810,7 @@ msgid "Invites"
 msgstr ""
 
 #: bookwyrm/templates/layout.html:118
-msgid "Site Configuration"
+msgid "Admin"
 msgstr ""
 
 #: bookwyrm/templates/layout.html:125
@@ -815,6 +928,7 @@ msgid "Anyone can suggest books, subject to your approval"
 msgstr ""
 
 #: bookwyrm/templates/lists/form.html:31
+#: bookwyrm/templates/moderation/reports.html:11
 msgid "Open"
 msgstr ""
 
@@ -864,7 +978,7 @@ msgstr ""
 msgid "No books found"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:89
+#: bookwyrm/templates/lists/list.html:90
 msgid "Suggest"
 msgstr ""
 
@@ -898,6 +1012,106 @@ msgstr ""
 msgid "More about this site"
 msgstr ""
 
+#: bookwyrm/templates/moderation/report.html:5
+#: bookwyrm/templates/moderation/report.html:6
+#: bookwyrm/templates/moderation/report_preview.html:6
+#, python-format
+msgid "Report #%(report_id)s: %(username)s"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:10
+msgid "Back to reports"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:18
+msgid "Actions"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:19
+msgid "View user profile"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:22
+#: bookwyrm/templates/snippets/status/status_options.html:25
+#: bookwyrm/templates/snippets/user_options.html:13
+msgid "Send direct message"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:27
+msgid "Deactivate user"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:29
+msgid "Reactivate user"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:36
+msgid "Moderator Comments"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:54
+#: bookwyrm/templates/snippets/create_status.html:12
+#: bookwyrm/templates/snippets/create_status_form.html:44
+msgid "Comment"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:59
+msgid "Reported statuses"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:61
+msgid "No statuses reported"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:67
+msgid "Statuses has been deleted"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report_modal.html:6
+#, python-format
+msgid "Report @%(username)s"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report_modal.html:21
+#, python-format
+msgid "This report will be sent to %(site_name)s's moderators for review."
+msgstr ""
+
+#: bookwyrm/templates/moderation/report_modal.html:22
+msgid "More info about this report:"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report_modal.html:31
+msgid "Submit"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report_preview.html:13
+msgid "No notes provided"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report_preview.html:20
+#, python-format
+msgid "Reported by <a href=\"%(path)s\">%(username)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report_preview.html:30
+msgid "Re-open"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report_preview.html:32
+msgid "Resolve"
+msgstr ""
+
+#: bookwyrm/templates/moderation/reports.html:4
+#: bookwyrm/templates/moderation/reports.html:5
+#: bookwyrm/templates/settings/admin_layout.html:23
+msgid "Reports"
+msgstr ""
+
+#: bookwyrm/templates/moderation/reports.html:14
+msgid "Resolved"
+msgstr ""
+
 #: bookwyrm/templates/notfound.html:4 bookwyrm/templates/notfound.html:8
 msgid "Not Found"
 msgstr ""
@@ -910,110 +1124,115 @@ msgstr ""
 msgid "Delete notifications"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:51
+#: bookwyrm/templates/notifications.html:53
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:53
+#: bookwyrm/templates/notifications.html:55
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:55
+#: bookwyrm/templates/notifications.html:57
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:57
+#: bookwyrm/templates/notifications.html:59
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">status</a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:62
+#: bookwyrm/templates/notifications.html:64
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:64
+#: bookwyrm/templates/notifications.html:66
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:66
+#: bookwyrm/templates/notifications.html:68
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:68
+#: bookwyrm/templates/notifications.html:70
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">status</a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:73
+#: bookwyrm/templates/notifications.html:75
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:75
+#: bookwyrm/templates/notifications.html:77
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:77
+#: bookwyrm/templates/notifications.html:79
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:79
+#: bookwyrm/templates/notifications.html:81
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:83
+#: bookwyrm/templates/notifications.html:85
 msgid "followed you"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:86
+#: bookwyrm/templates/notifications.html:88
 msgid "sent you a follow request"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:92
-#, python-format
-msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr ""
-
 #: bookwyrm/templates/notifications.html:94
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:96
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:98
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">status</a>"
+msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:102
+#: bookwyrm/templates/notifications.html:100
 #, python-format
-msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgid "boosted your <a href=\"%(related_path)s\">status</a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:104
 #, python-format
+msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:106
+#, python-format
 msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:108
+#: bookwyrm/templates/notifications.html:110
 #, python-format
-msgid " your <a href=\"/import/%(related_id)s\">import</a> completed."
+msgid "Your <a href=\"/import/%(related_id)s\">import</a> completed."
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:142
+#: bookwyrm/templates/notifications.html:113
+#, python-format
+msgid "A new <a href=\"%(path)s\">report</a> needs moderation."
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:139
 msgid "You're all caught up!"
 msgstr ""
 
@@ -1029,10 +1248,6 @@ msgstr ""
 msgid "Confirm password:"
 msgstr ""
 
-#: bookwyrm/templates/password_reset.html:30
-msgid "Confirm"
-msgstr ""
-
 #: bookwyrm/templates/password_reset_request.html:12
 msgid "A link to reset your password will be sent to your email address"
 msgstr ""
@@ -1086,6 +1301,10 @@ msgid "Summary:"
 msgstr ""
 
 #: bookwyrm/templates/preferences/edit_user.html:46
+msgid "Show set reading goal prompt in feed:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:52
 msgid "Manually approve followers:"
 msgstr ""
 
@@ -1105,24 +1324,20 @@ msgstr ""
 msgid "Show results from other catalogues"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:57
-msgid "Import book"
-msgstr ""
-
-#: bookwyrm/templates/search_results.html:67
+#: bookwyrm/templates/search_results.html:62
 msgid "Hide results from other catalogues"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:75
+#: bookwyrm/templates/search_results.html:74
 msgid "Matching Users"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:77
+#: bookwyrm/templates/search_results.html:76
 #, python-format
 msgid "No users found for \"%(query)s\""
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:94
+#: bookwyrm/templates/search_results.html:93
 #, python-format
 msgid "No lists found for \"%(query)s\""
 msgstr ""
@@ -1135,37 +1350,37 @@ msgstr ""
 msgid "Manage Users"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:23
+#: bookwyrm/templates/settings/admin_layout.html:27
 #: bookwyrm/templates/settings/federation.html:4
 msgid "Federated Servers"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:28
+#: bookwyrm/templates/settings/admin_layout.html:32
 msgid "Instance Settings"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/admin_layout.html:36
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:35
+#: bookwyrm/templates/settings/admin_layout.html:39
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:36
+#: bookwyrm/templates/settings/admin_layout.html:40
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:37
+#: bookwyrm/templates/settings/admin_layout.html:41
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:38
+#: bookwyrm/templates/settings/admin_layout.html:42
 #: bookwyrm/templates/settings/site.html:77
 msgid "Registration"
 msgstr ""
@@ -1285,8 +1500,8 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/boost_button.html:8
 #: bookwyrm/templates/snippets/boost_button.html:9
-#: bookwyrm/templates/snippets/status/status_body.html:41
-#: bookwyrm/templates/snippets/status/status_body.html:42
+#: bookwyrm/templates/snippets/status/status_body.html:51
+#: bookwyrm/templates/snippets/status/status_body.html:52
 msgid "Boost status"
 msgstr ""
 
@@ -1307,11 +1522,6 @@ msgstr ""
 msgid "Review"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status.html:12
-#: bookwyrm/templates/snippets/create_status_form.html:44
-msgid "Comment"
-msgstr ""
-
 #: bookwyrm/templates/snippets/create_status.html:15
 msgid "Quote"
 msgstr ""
@@ -1358,8 +1568,8 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/fav_button.html:7
 #: bookwyrm/templates/snippets/fav_button.html:8
-#: bookwyrm/templates/snippets/status/status_body.html:45
-#: bookwyrm/templates/snippets/status/status_body.html:46
+#: bookwyrm/templates/snippets/status/status_body.html:55
+#: bookwyrm/templates/snippets/status/status_body.html:56
 msgid "Like status"
 msgstr ""
 
@@ -1368,19 +1578,19 @@ msgstr ""
 msgid "Un-like status"
 msgstr ""
 
-#: bookwyrm/templates/snippets/follow_button.html:6
-msgid "Follow request already sent."
-msgstr ""
-
-#: bookwyrm/templates/snippets/follow_button.html:19
+#: bookwyrm/templates/snippets/follow_button.html:13
 msgid "Send follow request"
 msgstr ""
 
-#: bookwyrm/templates/snippets/follow_button.html:21
+#: bookwyrm/templates/snippets/follow_button.html:15
 msgid "Follow"
 msgstr ""
 
-#: bookwyrm/templates/snippets/follow_button.html:27
+#: bookwyrm/templates/snippets/follow_button.html:22
+msgid "Undo follow request"
+msgstr ""
+
+#: bookwyrm/templates/snippets/follow_button.html:24
 msgid "Unfollow"
 msgstr ""
 
@@ -1395,11 +1605,18 @@ msgid_plural "set a goal to read %(counter)s books in %(year)s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/snippets/goal_card.html:21
+#: bookwyrm/templates/snippets/generated_status/rating.html:3
+#, python-format
+msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(rating)s star"
+msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(rating)s stars"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/snippets/goal_card.html:22
 msgid "Dismiss message"
 msgstr ""
 
-#: bookwyrm/templates/snippets/goal_card.html:22
+#: bookwyrm/templates/snippets/goal_card.html:23
 #, python-format
 msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
 msgstr ""
@@ -1554,6 +1771,10 @@ msgstr ""
 msgid "Sign Up"
 msgstr ""
 
+#: bookwyrm/templates/snippets/report_button.html:5
+msgid "Report"
+msgstr ""
+
 #: bookwyrm/templates/snippets/rss_title.html:5
 #: bookwyrm/templates/snippets/status/status_header.html:11
 msgid "rated"
@@ -1574,11 +1795,19 @@ msgstr ""
 msgid "quoted"
 msgstr ""
 
-#: bookwyrm/templates/snippets/search_result_text.html:3
+#: bookwyrm/templates/snippets/search_result_text.html:10
+msgid "No cover"
+msgstr ""
+
+#: bookwyrm/templates/snippets/search_result_text.html:22
 #, python-format
 msgid "by %(author)s"
 msgstr ""
 
+#: bookwyrm/templates/snippets/search_result_text.html:30
+msgid "Import book"
+msgstr ""
+
 #: bookwyrm/templates/snippets/shelf.html:12
 msgid "Published"
 msgstr ""
@@ -1655,9 +1884,14 @@ msgstr ""
 msgid "boosted"
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/status_body.html:24
-#: bookwyrm/templates/snippets/status/status_body.html:37
-#: bookwyrm/templates/snippets/status/status_body.html:38
+#: bookwyrm/templates/snippets/status/status_body.html:27
+#: bookwyrm/templates/snippets/status/status_options.html:18
+msgid "Delete status"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_body.html:34
+#: bookwyrm/templates/snippets/status/status_body.html:47
+#: bookwyrm/templates/snippets/status/status_body.html:48
 msgid "Reply"
 msgstr ""
 
@@ -1700,15 +1934,6 @@ msgstr ""
 msgid "More options"
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/status_options.html:17
-msgid "Delete status"
-msgstr ""
-
-#: bookwyrm/templates/snippets/status/status_options.html:23
-#: bookwyrm/templates/snippets/user_options.html:13
-msgid "Send direct message"
-msgstr ""
-
 #: bookwyrm/templates/snippets/switch_edition_button.html:5
 msgid "Switch to this edition"
 msgstr ""
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index 0a0af7d1c49f9cff97432dbc2db21f6496708a76..6e6dc04432d6f98bbbd9ab4ae59db541fb2da4d6 100644
GIT binary patch
delta 8686
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

delta 8861
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

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 6c6ee434..fdbb0609 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -1,15 +1,15 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Spanish-language translation
+# Copyright (C) 2021 Mouse Reeve
+# This file is distributed under the same license as the BookWyrm package.
+# Mouse Reeve <mousereeve@riseup.net>, 2021
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-07 23:40+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"POT-Creation-Date: 2021-03-19 11:41-0700\n"
+"PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -18,28 +18,28 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/forms.py:185
+#: bookwyrm/forms.py:203
 msgid "One Day"
 msgstr "Un día"
 
-#: bookwyrm/forms.py:186
+#: bookwyrm/forms.py:204
 msgid "One Week"
 msgstr "Una semana"
 
-#: bookwyrm/forms.py:187
+#: bookwyrm/forms.py:205
 msgid "One Month"
 msgstr "Un mes"
 
-#: bookwyrm/forms.py:188
+#: bookwyrm/forms.py:206
 msgid "Does Not Expire"
 msgstr "Nunca se vence"
 
-#: bookwyrm/forms.py:190
+#: bookwyrm/forms.py:211
 #, python-format
 msgid "%(count)d uses"
 msgstr "%(count)d usos"
 
-#: bookwyrm/forms.py:192
+#: bookwyrm/forms.py:214
 msgid "Unlimited"
 msgstr "Sin límite"
 
@@ -53,11 +53,11 @@ msgstr "%(value)s no es un remote_id válido"
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s no es un usuario válido"
 
-#: bookwyrm/models/fields.py:164 bookwyrm/templates/layout.html:152
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:152
 msgid "username"
 msgstr "nombre de usuario"
 
-#: bookwyrm/models/fields.py:169
+#: bookwyrm/models/fields.py:170
 msgid "A user with that username already exists."
 msgstr "Ya existe un usuario con ese nombre."
 
@@ -95,70 +95,86 @@ msgstr "Wikipedia"
 msgid "Books by %(name)s"
 msgstr "Libros de %(name)s"
 
-#: bookwyrm/templates/book.html:21
+#: bookwyrm/templates/book/book.html:21
 #: bookwyrm/templates/discover/large-book.html:12
 #: bookwyrm/templates/discover/small-book.html:9
 msgid "by"
 msgstr "por"
 
-#: bookwyrm/templates/book.html:29 bookwyrm/templates/book.html:30
-#: bookwyrm/templates/edit_book.html:5
+#: bookwyrm/templates/book/book.html:29 bookwyrm/templates/book/book.html:30
 msgid "Edit Book"
 msgstr "Editar Libro"
 
-#: bookwyrm/templates/book.html:45
+#: bookwyrm/templates/book/book.html:45
+#: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "Agregar portada"
 
-#: bookwyrm/templates/book.html:51 bookwyrm/templates/lists/list.html:89
-msgid "Add"
-msgstr "Agregar"
-
-#: bookwyrm/templates/book.html:60
+#: bookwyrm/templates/book/book.html:55
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: bookwyrm/templates/book.html:67 bookwyrm/templates/edit_book.html:107
+#: bookwyrm/templates/book/book.html:62
+#: bookwyrm/templates/book/edit_book.html:211
 msgid "OCLC Number:"
 msgstr "Número OCLC:"
 
-#: bookwyrm/templates/book.html:74 bookwyrm/templates/edit_book.html:111
+#: bookwyrm/templates/book/book.html:69
+#: bookwyrm/templates/book/edit_book.html:215
 msgid "ASIN:"
 msgstr "ASIN:"
 
-#: bookwyrm/templates/book.html:84
+#: bookwyrm/templates/book/book.html:79
 #, python-format
 msgid "%(format)s, %(pages)s pages"
 msgstr "%(format)s, %(pages)s páginas"
 
-#: bookwyrm/templates/book.html:86
+#: bookwyrm/templates/book/book.html:81
 #, python-format
 msgid "%(pages)s pages"
 msgstr "%(pages)s páginas"
 
-#: bookwyrm/templates/book.html:91
+#: bookwyrm/templates/book/book.html:86
+#, python-format
+msgid "Published %(date)s by %(publisher)s."
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:88
+#, fuzzy, python-format
+#| msgid "Published date:"
+msgid "Published %(date)s"
+msgstr "Fecha de publicación:"
+
+#: bookwyrm/templates/book/book.html:90
+#, python-format
+msgid "Published by %(publisher)s."
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:95
 msgid "View on OpenLibrary"
 msgstr "Ver en OpenLibrary"
 
-#: bookwyrm/templates/book.html:100
+#: bookwyrm/templates/book/book.html:104
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s reseña)"
 msgstr[1] "(%(review_count)s reseñas)"
 
-#: bookwyrm/templates/book.html:106
+#: bookwyrm/templates/book/book.html:110
 msgid "Add Description"
 msgstr "Agregar descripción"
 
-#: bookwyrm/templates/book.html:113 bookwyrm/templates/edit_book.html:39
+#: bookwyrm/templates/book/book.html:117
+#: bookwyrm/templates/book/edit_book.html:101
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Descripción:"
 
-#: bookwyrm/templates/book.html:117 bookwyrm/templates/edit_author.html:78
-#: bookwyrm/templates/edit_book.html:120 bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:50
+#: bookwyrm/templates/book/book.html:121
+#: bookwyrm/templates/book/edit_book.html:225
+#: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
+#: bookwyrm/templates/preferences/edit_user.html:56
 #: bookwyrm/templates/settings/site.html:89
 #: bookwyrm/templates/snippets/progress_update.html:21
 #: bookwyrm/templates/snippets/readthrough.html:64
@@ -167,8 +183,11 @@ msgstr "Descripción:"
 msgid "Save"
 msgstr "Guardar"
 
-#: bookwyrm/templates/book.html:118 bookwyrm/templates/book.html:167
-#: bookwyrm/templates/edit_author.html:79 bookwyrm/templates/edit_book.html:121
+#: bookwyrm/templates/book/book.html:122 bookwyrm/templates/book/book.html:171
+#: bookwyrm/templates/book/cover_modal.html:32
+#: bookwyrm/templates/book/edit_book.html:226
+#: bookwyrm/templates/edit_author.html:79
+#: bookwyrm/templates/moderation/report_modal.html:32
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
 #: bookwyrm/templates/snippets/readthrough.html:65
@@ -178,64 +197,255 @@ msgstr "Guardar"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: bookwyrm/templates/book.html:127
+#: bookwyrm/templates/book/book.html:131
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s/editions\">%(count)s ediciones</a>"
 
-#: bookwyrm/templates/book.html:135
+#: bookwyrm/templates/book/book.html:139
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "Esta edición está en tu <a href=\"%(path)s\">%(shelf_name)s</a> estante."
 
-#: bookwyrm/templates/book.html:141
+#: bookwyrm/templates/book/book.html:145
 #, python-format
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr "Una <a href=\"%(book_path)s\">edición diferente</a> de este libro está en tu <a href=\"%(shelf_path)s\">%(shelf_name)s</a> estante."
 
-#: bookwyrm/templates/book.html:150
+#: bookwyrm/templates/book/book.html:154
 msgid "Your reading activity"
 msgstr "Tu actividad de lectura"
 
-#: bookwyrm/templates/book.html:152
+#: bookwyrm/templates/book/book.html:156
 msgid "Add read dates"
 msgstr "Agregar fechas de lectura"
 
-#: bookwyrm/templates/book.html:157
+#: bookwyrm/templates/book/book.html:161
 msgid "You don't have any reading activity for this book."
 msgstr "No tienes ninguna actividad de lectura para este libro."
 
-#: bookwyrm/templates/book.html:164
+#: bookwyrm/templates/book/book.html:168
 msgid "Create"
 msgstr "Crear"
 
-#: bookwyrm/templates/book.html:186
+#: bookwyrm/templates/book/book.html:190
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: bookwyrm/templates/book.html:190 bookwyrm/templates/snippets/tag.html:18
+#: bookwyrm/templates/book/book.html:194
+#: bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr "Agregar etiqueta"
 
-#: bookwyrm/templates/book.html:207
+#: bookwyrm/templates/book/book.html:211
 msgid "Subjects"
 msgstr "Sujetos"
 
-#: bookwyrm/templates/book.html:218
+#: bookwyrm/templates/book/book.html:222
 msgid "Places"
 msgstr "Lugares"
 
-#: bookwyrm/templates/book.html:229 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book/book.html:233 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
-#: bookwyrm/templates/search_results.html:92
+#: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listas"
 
-#: bookwyrm/templates/book.html:258
+#: bookwyrm/templates/book/book.html:244
+#, fuzzy
+#| msgid "Go to list"
+msgid "Add to list"
+msgstr "Irse a lista"
+
+#: bookwyrm/templates/book/book.html:254
+#: bookwyrm/templates/book/cover_modal.html:31
+#: bookwyrm/templates/lists/list.html:90
+msgid "Add"
+msgstr "Agregar"
+
+#: bookwyrm/templates/book/book.html:282
 msgid "rated it"
 msgstr "lo calificó con"
 
+#: bookwyrm/templates/book/cover_modal.html:17
+#: bookwyrm/templates/book/edit_book.html:163
+#, fuzzy
+#| msgid "Add cover"
+msgid "Upload cover:"
+msgstr "Agregar portada"
+
+#: bookwyrm/templates/book/cover_modal.html:23
+#: bookwyrm/templates/book/edit_book.html:169
+msgid "Load cover from url:"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:5
+#: bookwyrm/templates/book/edit_book.html:11
+#, fuzzy, python-format
+#| msgid "Editions of %(book_title)s"
+msgid "Edit \"%(book_title)s\""
+msgstr "Ediciones de %(book_title)s"
+
+#: bookwyrm/templates/book/edit_book.html:5
+#: bookwyrm/templates/book/edit_book.html:13
+#, fuzzy
+#| msgid "Add Books"
+msgid "Add Book"
+msgstr "Agregar libro"
+
+#: bookwyrm/templates/book/edit_book.html:18
+#: bookwyrm/templates/edit_author.html:13
+msgid "Added:"
+msgstr "Agregado:"
+
+#: bookwyrm/templates/book/edit_book.html:19
+#: bookwyrm/templates/edit_author.html:14
+msgid "Updated:"
+msgstr "Actualizado:"
+
+#: bookwyrm/templates/book/edit_book.html:20
+#: bookwyrm/templates/edit_author.html:15
+msgid "Last edited by:"
+msgstr "Editado más recientemente por:"
+
+#: bookwyrm/templates/book/edit_book.html:40
+msgid "Confirm Book Info"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:47
+#, python-format
+msgid "Is \"%(name)s\" an existing author?"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:52
+#, fuzzy, python-format
+#| msgid "Start \"<em>%(book_title)s</em>\""
+msgid "Author of <em>%(book_title)s</em>"
+msgstr "Empezar \"<em>%(book_title)s</em>\""
+
+#: bookwyrm/templates/book/edit_book.html:55
+msgid "This is a new author"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:61
+#, python-format
+msgid "Creating a new author: %(name)s"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:67
+msgid "Is this an edition of an existing work?"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:71
+msgid "This is a new work"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:77
+#: bookwyrm/templates/password_reset.html:30
+msgid "Confirm"
+msgstr "Confirmar"
+
+#: bookwyrm/templates/book/edit_book.html:79
+#: bookwyrm/templates/feed/status.html:8
+msgid "Back"
+msgstr "Volver"
+
+#: bookwyrm/templates/book/edit_book.html:90
+#: bookwyrm/templates/edit_author.html:31
+msgid "Metadata"
+msgstr "Metadatos"
+
+#: bookwyrm/templates/book/edit_book.html:91
+msgid "Title:"
+msgstr "Título:"
+
+#: bookwyrm/templates/book/edit_book.html:96
+msgid "Subtitle:"
+msgstr "Subtítulo:"
+
+#: bookwyrm/templates/book/edit_book.html:106
+msgid "Series:"
+msgstr "Serie:"
+
+#: bookwyrm/templates/book/edit_book.html:111
+msgid "Series number:"
+msgstr "Número de serie:"
+
+#: bookwyrm/templates/book/edit_book.html:117
+#, fuzzy
+#| msgid "Published"
+msgid "Publisher:"
+msgstr "Publicado"
+
+#: bookwyrm/templates/book/edit_book.html:119
+msgid "Separate multiple publishers with commas."
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:125
+msgid "First published date:"
+msgstr "Fecha de primera publicación:"
+
+#: bookwyrm/templates/book/edit_book.html:130
+msgid "Published date:"
+msgstr "Fecha de publicación:"
+
+#: bookwyrm/templates/book/edit_book.html:137
+#, fuzzy
+#| msgid "Author"
+msgid "Authors"
+msgstr "Autor/Autora"
+
+#: bookwyrm/templates/book/edit_book.html:143
+#, fuzzy, python-format
+#| msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
+msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
+msgstr "Agregado por <a href=\"%(user_path)s\">%(username)s</a>"
+
+#: bookwyrm/templates/book/edit_book.html:148
+#, fuzzy
+#| msgid "Edit Author"
+msgid "Add Authors:"
+msgstr "Editar Autor/Autora"
+
+#: bookwyrm/templates/book/edit_book.html:149
+msgid "John Doe, Jane Smith"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:155
+#: bookwyrm/templates/snippets/shelf.html:9
+msgid "Cover"
+msgstr "Portada:"
+
+#: bookwyrm/templates/book/edit_book.html:182
+msgid "Physical Properties"
+msgstr "Propiedades físicas:"
+
+#: bookwyrm/templates/book/edit_book.html:183
+msgid "Format:"
+msgstr "Formato:"
+
+#: bookwyrm/templates/book/edit_book.html:191
+msgid "Pages:"
+msgstr "Páginas:"
+
+#: bookwyrm/templates/book/edit_book.html:198
+msgid "Book Identifiers"
+msgstr "Identificadores de libro"
+
+#: bookwyrm/templates/book/edit_book.html:199
+msgid "ISBN 13:"
+msgstr "ISBN 13:"
+
+#: bookwyrm/templates/book/edit_book.html:203
+msgid "ISBN 10:"
+msgstr "ISBN 10:"
+
+#: bookwyrm/templates/book/edit_book.html:207
+#: bookwyrm/templates/edit_author.html:59
+msgid "Openlibrary key:"
+msgstr "Clave OpenLibrary:"
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/feed/feed_layout.html:54
 msgid "Close"
@@ -290,22 +500,6 @@ msgstr "Esta instancia está cerrada."
 msgid "Your Account"
 msgstr "Tu cuenta"
 
-#: bookwyrm/templates/edit_author.html:13 bookwyrm/templates/edit_book.html:13
-msgid "Added:"
-msgstr "Agregado:"
-
-#: bookwyrm/templates/edit_author.html:14 bookwyrm/templates/edit_book.html:14
-msgid "Updated:"
-msgstr "Actualizado:"
-
-#: bookwyrm/templates/edit_author.html:15 bookwyrm/templates/edit_book.html:15
-msgid "Last edited by:"
-msgstr "Editado más recientemente por:"
-
-#: bookwyrm/templates/edit_author.html:31 bookwyrm/templates/edit_book.html:30
-msgid "Metadata"
-msgstr "Metadatos"
-
 #: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
 #: bookwyrm/templates/user/create_shelf_form.html:13
 #: bookwyrm/templates/user/edit_shelf_form.html:14
@@ -332,10 +526,6 @@ msgstr "Fecha de muerte:"
 msgid "Author Identifiers"
 msgstr "Identificadores de autor/autora"
 
-#: bookwyrm/templates/edit_author.html:59 bookwyrm/templates/edit_book.html:103
-msgid "Openlibrary key:"
-msgstr "Clave OpenLibrary:"
-
 #: bookwyrm/templates/edit_author.html:64
 msgid "Librarything key:"
 msgstr "Clave Librarything:"
@@ -344,59 +534,6 @@ msgstr "Clave Librarything:"
 msgid "Goodreads key:"
 msgstr "Clave Goodreads:"
 
-#: bookwyrm/templates/edit_book.html:31
-msgid "Title:"
-msgstr "Título:"
-
-#: bookwyrm/templates/edit_book.html:35
-msgid "Subtitle:"
-msgstr "Subtítulo:"
-
-#: bookwyrm/templates/edit_book.html:43
-msgid "Series:"
-msgstr "Serie:"
-
-#: bookwyrm/templates/edit_book.html:47
-msgid "Series number:"
-msgstr "Número de serie:"
-
-#: bookwyrm/templates/edit_book.html:51
-msgid "First published date:"
-msgstr "Fecha de primera publicación:"
-
-#: bookwyrm/templates/edit_book.html:55
-msgid "Published date:"
-msgstr "Fecha de publicación:"
-
-#: bookwyrm/templates/edit_book.html:68
-#: bookwyrm/templates/snippets/shelf.html:9
-msgid "Cover"
-msgstr "Portada:"
-
-#: bookwyrm/templates/edit_book.html:78
-msgid "Physical Properties"
-msgstr "Propiedades físicas:"
-
-#: bookwyrm/templates/edit_book.html:79
-msgid "Format:"
-msgstr "Formato:"
-
-#: bookwyrm/templates/edit_book.html:87
-msgid "Pages:"
-msgstr "Páginas:"
-
-#: bookwyrm/templates/edit_book.html:94
-msgid "Book Identifiers"
-msgstr "Identificadores de libro"
-
-#: bookwyrm/templates/edit_book.html:95
-msgid "ISBN 13:"
-msgstr "ISBN 13:"
-
-#: bookwyrm/templates/edit_book.html:99
-msgid "ISBN 10:"
-msgstr "ISBN 10:"
-
 #: bookwyrm/templates/editions.html:5
 #, python-format
 msgid "Editions of %(book_title)s"
@@ -446,18 +583,14 @@ msgstr "%(tab_title)s Línea temporal"
 msgid "Home"
 msgstr "Hogar"
 
-#: bookwyrm/templates/feed/feed.html:13 bookwyrm/views/feed.py:37
+#: bookwyrm/templates/feed/feed.html:13 bookwyrm/views/feed.py:38
 msgid "Local"
 msgstr "Local"
 
-#: bookwyrm/templates/feed/feed.html:16 bookwyrm/views/feed.py:41
+#: bookwyrm/templates/feed/feed.html:16 bookwyrm/views/feed.py:43
 msgid "Federated"
 msgstr "Federalizado"
 
-#: bookwyrm/templates/feed/feed.html:24
-msgid "Announcements"
-msgstr "Anuncios"
-
 #: bookwyrm/templates/feed/feed.html:32
 msgid "There aren't any activities right now! Try following a user to get started"
 msgstr "¡No hay actividades en este momento! Sigue a otro usuario para empezar"
@@ -496,10 +629,6 @@ msgstr "Leer"
 msgid "%(year)s Reading Goal"
 msgstr "%(year)s Meta de lectura"
 
-#: bookwyrm/templates/feed/status.html:8
-msgid "Back"
-msgstr "Volver"
-
 #: bookwyrm/templates/goal.html:7
 #, python-format
 msgid "%(year)s Reading Progress"
@@ -697,8 +826,8 @@ msgid "Invites"
 msgstr "Invitaciones"
 
 #: bookwyrm/templates/layout.html:118
-msgid "Site Configuration"
-msgstr "Configuracion de sitio"
+msgid "Admin"
+msgstr ""
 
 #: bookwyrm/templates/layout.html:125
 msgid "Log out"
@@ -817,6 +946,7 @@ msgid "Anyone can suggest books, subject to your approval"
 msgstr "Cualquier usuario puede sugerir libros, en cuanto lo hayas aprobado"
 
 #: bookwyrm/templates/lists/form.html:31
+#: bookwyrm/templates/moderation/reports.html:11
 msgid "Open"
 msgstr "Abierto"
 
@@ -866,7 +996,7 @@ msgstr "No se encontró ningún libro correspondiente a la búsqueda: \"%(query)
 msgid "No books found"
 msgstr "No se encontró ningún libro"
 
-#: bookwyrm/templates/lists/list.html:89
+#: bookwyrm/templates/lists/list.html:90
 msgid "Suggest"
 msgstr "Sugerir"
 
@@ -900,6 +1030,120 @@ msgstr "Contactar a unx administradorx para recibir una invitación"
 msgid "More about this site"
 msgstr "Más sobre este sitio"
 
+#: bookwyrm/templates/moderation/report.html:5
+#: bookwyrm/templates/moderation/report.html:6
+#: bookwyrm/templates/moderation/report_preview.html:6
+#, python-format
+msgid "Report #%(report_id)s: %(username)s"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:10
+msgid "Back to reports"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:18
+#, fuzzy
+#| msgid "Notifications"
+msgid "Actions"
+msgstr "Notificaciones"
+
+#: bookwyrm/templates/moderation/report.html:19
+#, fuzzy
+#| msgid "User Profile"
+msgid "View user profile"
+msgstr "Perfil de usuario"
+
+#: bookwyrm/templates/moderation/report.html:22
+#: bookwyrm/templates/snippets/status/status_options.html:25
+#: bookwyrm/templates/snippets/user_options.html:13
+msgid "Send direct message"
+msgstr "Enviar mensaje directo"
+
+#: bookwyrm/templates/moderation/report.html:27
+msgid "Deactivate user"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:29
+msgid "Reactivate user"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:36
+msgid "Moderator Comments"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:54
+#: bookwyrm/templates/snippets/create_status.html:12
+#: bookwyrm/templates/snippets/create_status_form.html:44
+msgid "Comment"
+msgstr "Comentario"
+
+#: bookwyrm/templates/moderation/report.html:59
+#, fuzzy
+#| msgid "Delete status"
+msgid "Reported statuses"
+msgstr "Eliminar status"
+
+#: bookwyrm/templates/moderation/report.html:61
+msgid "No statuses reported"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:67
+msgid "Statuses has been deleted"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report_modal.html:6
+#, fuzzy, python-format
+#| msgid "Lists: %(username)s"
+msgid "Report @%(username)s"
+msgstr "Listas: %(username)s"
+
+#: bookwyrm/templates/moderation/report_modal.html:21
+#, python-format
+msgid "This report will be sent to %(site_name)s's moderators for review."
+msgstr ""
+
+#: bookwyrm/templates/moderation/report_modal.html:22
+#, fuzzy
+#| msgid "More about this site"
+msgid "More info about this report:"
+msgstr "Más sobre este sitio"
+
+#: bookwyrm/templates/moderation/report_modal.html:31
+msgid "Submit"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report_preview.html:13
+msgid "No notes provided"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report_preview.html:20
+#, fuzzy, python-format
+#| msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
+msgid "Reported by <a href=\"%(path)s\">%(username)s</a>"
+msgstr "Agregado por <a href=\"%(user_path)s\">%(username)s</a>"
+
+#: bookwyrm/templates/moderation/report_preview.html:30
+msgid "Re-open"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report_preview.html:32
+msgid "Resolve"
+msgstr ""
+
+#: bookwyrm/templates/moderation/reports.html:4
+#: bookwyrm/templates/moderation/reports.html:5
+#: bookwyrm/templates/settings/admin_layout.html:23
+#, fuzzy
+#| msgid "Recent Imports"
+msgid "Reports"
+msgstr "Importaciones recientes"
+
+#: bookwyrm/templates/moderation/reports.html:14
+#, fuzzy
+#| msgid "Shelved"
+msgid "Resolved"
+msgstr "Archivado"
+
 #: bookwyrm/templates/notfound.html:4 bookwyrm/templates/notfound.html:8
 msgid "Not Found"
 msgstr "No encontrado"
@@ -912,110 +1156,115 @@ msgstr "¡Parece que la página solicitada no existe!"
 msgid "Delete notifications"
 msgstr "Borrar notificaciones"
 
-#: bookwyrm/templates/notifications.html:51
+#: bookwyrm/templates/notifications.html:53
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "le gustó tu <a href=\"%(related_path)s\">reseña de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:53
+#: bookwyrm/templates/notifications.html:55
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "le gustó tu <a href=\"%(related_path)s\">comentario en <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:55
+#: bookwyrm/templates/notifications.html:57
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "le gustó tu <a href=\"%(related_path)s\">cita de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:57
+#: bookwyrm/templates/notifications.html:59
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">status</a>"
 msgstr "le gustó tu <a href=\"%(related_path)s\">status</a>"
 
-#: bookwyrm/templates/notifications.html:62
+#: bookwyrm/templates/notifications.html:64
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "te mencionó en una <a href=\"%(related_path)s\">reseña de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:64
+#: bookwyrm/templates/notifications.html:66
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "te mencionó en un <a href=\"%(related_path)s\">comentario de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:66
+#: bookwyrm/templates/notifications.html:68
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "te mencionó en una <a href=\"%(related_path)s\">cita de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:68
+#: bookwyrm/templates/notifications.html:70
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">status</a>"
 msgstr "te mencionó en un <a href=\"%(related_path)s\">status</a>"
 
-#: bookwyrm/templates/notifications.html:73
+#: bookwyrm/templates/notifications.html:75
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">reseña de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:75
+#: bookwyrm/templates/notifications.html:77
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">comentario en <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:77
+#: bookwyrm/templates/notifications.html:79
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">cita de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:79
+#: bookwyrm/templates/notifications.html:81
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">status</a>"
 
-#: bookwyrm/templates/notifications.html:83
+#: bookwyrm/templates/notifications.html:85
 msgid "followed you"
 msgstr "te siguió"
 
-#: bookwyrm/templates/notifications.html:86
+#: bookwyrm/templates/notifications.html:88
 msgid "sent you a follow request"
 msgstr "te quiere seguir"
 
-#: bookwyrm/templates/notifications.html:92
+#: bookwyrm/templates/notifications.html:94
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "respaldó tu <a href=\"%(related_path)s\">reseña de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:94
+#: bookwyrm/templates/notifications.html:96
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
 msgstr "respaldó tu <a href=\"%(related_path)s\">comentario en<em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:96
+#: bookwyrm/templates/notifications.html:98
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "respaldó tu<a href=\"%(related_path)s\">cita de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:98
+#: bookwyrm/templates/notifications.html:100
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">status</a>"
 msgstr "respaldó tu <a href=\"%(related_path)s\">status</a>"
 
-#: bookwyrm/templates/notifications.html:102
+#: bookwyrm/templates/notifications.html:104
 #, python-format
 msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 msgstr " agregó <em><a href=\"%(book_path)s\">%(book_title)s</a></em> a tu lista \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 
-#: bookwyrm/templates/notifications.html:104
+#: bookwyrm/templates/notifications.html:106
 #, python-format
 msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 msgstr " sugirió agregar <em><a href=\"%(book_path)s\">%(book_title)s</a></em> a tu lista \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 
-#: bookwyrm/templates/notifications.html:108
+#: bookwyrm/templates/notifications.html:110
 #, python-format
-msgid " your <a href=\"/import/%(related_id)s\">import</a> completed."
-msgstr " tu <a href=\"/import/%(related_id)s\">importación</a> ha terminado."
+msgid "Your <a href=\"/import/%(related_id)s\">import</a> completed."
+msgstr "Tu <a href=\"/import/%(related_id)s\">importación</a> ha terminado."
 
-#: bookwyrm/templates/notifications.html:142
+#: bookwyrm/templates/notifications.html:113
+#, python-format
+msgid "A new <a href=\"%(path)s\">report</a> needs moderation."
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:139
 msgid "You're all caught up!"
 msgstr "¡Estás al día!"
 
@@ -1031,10 +1280,6 @@ msgstr "Restablecer contraseña"
 msgid "Confirm password:"
 msgstr "Confirmar contraseña:"
 
-#: bookwyrm/templates/password_reset.html:30
-msgid "Confirm"
-msgstr "Confirmar"
-
 #: bookwyrm/templates/password_reset_request.html:12
 msgid "A link to reset your password will be sent to your email address"
 msgstr "Un enlace para restablecer tu contraseña se enviará a tu dirección de correo electrónico"
@@ -1088,6 +1333,10 @@ msgid "Summary:"
 msgstr "Resumen:"
 
 #: bookwyrm/templates/preferences/edit_user.html:46
+msgid "Show set reading goal prompt in feed:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:52
 msgid "Manually approve followers:"
 msgstr "Aprobar seguidores a mano:"
 
@@ -1107,24 +1356,20 @@ msgstr "¿No encontraste lo que buscabas?"
 msgid "Show results from other catalogues"
 msgstr "Mostrar resultados de otros catálogos"
 
-#: bookwyrm/templates/search_results.html:57
-msgid "Import book"
-msgstr "Importar libro"
-
-#: bookwyrm/templates/search_results.html:67
+#: bookwyrm/templates/search_results.html:62
 msgid "Hide results from other catalogues"
 msgstr "Ocultar resultados de otros catálogos"
 
-#: bookwyrm/templates/search_results.html:75
+#: bookwyrm/templates/search_results.html:74
 msgid "Matching Users"
 msgstr "Usuarios correspondientes"
 
-#: bookwyrm/templates/search_results.html:77
+#: bookwyrm/templates/search_results.html:76
 #, python-format
 msgid "No users found for \"%(query)s\""
 msgstr "No se encontró ningún usuario correspondiente a \"%(query)s\""
 
-#: bookwyrm/templates/search_results.html:94
+#: bookwyrm/templates/search_results.html:93
 #, python-format
 msgid "No lists found for \"%(query)s\""
 msgstr "No se encontró ningúna lista correspondiente a \"%(query)s\""
@@ -1137,37 +1382,37 @@ msgstr "Adminstración"
 msgid "Manage Users"
 msgstr "Administrar usuarios"
 
-#: bookwyrm/templates/settings/admin_layout.html:23
+#: bookwyrm/templates/settings/admin_layout.html:27
 #: bookwyrm/templates/settings/federation.html:4
 msgid "Federated Servers"
 msgstr "Servidores federalizados"
 
-#: bookwyrm/templates/settings/admin_layout.html:28
+#: bookwyrm/templates/settings/admin_layout.html:32
 msgid "Instance Settings"
 msgstr "Configuración de instancia"
 
-#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/admin_layout.html:36
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr "Configuración de sitio"
 
-#: bookwyrm/templates/settings/admin_layout.html:35
+#: bookwyrm/templates/settings/admin_layout.html:39
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr "Información de instancia"
 
-#: bookwyrm/templates/settings/admin_layout.html:36
+#: bookwyrm/templates/settings/admin_layout.html:40
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr "Imagenes"
 
-#: bookwyrm/templates/settings/admin_layout.html:37
+#: bookwyrm/templates/settings/admin_layout.html:41
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr "Contenido del pie de página"
 
-#: bookwyrm/templates/settings/admin_layout.html:38
+#: bookwyrm/templates/settings/admin_layout.html:42
 #: bookwyrm/templates/settings/site.html:77
 msgid "Registration"
 msgstr "Registración"
@@ -1287,8 +1532,8 @@ msgstr "<a href=\"%(path)s\">%(title)s</a> por "
 
 #: bookwyrm/templates/snippets/boost_button.html:8
 #: bookwyrm/templates/snippets/boost_button.html:9
-#: bookwyrm/templates/snippets/status/status_body.html:41
-#: bookwyrm/templates/snippets/status/status_body.html:42
+#: bookwyrm/templates/snippets/status/status_body.html:51
+#: bookwyrm/templates/snippets/status/status_body.html:52
 msgid "Boost status"
 msgstr "Status de respaldo"
 
@@ -1309,11 +1554,6 @@ msgstr "¡Advertencia, ya vienen spoilers!"
 msgid "Review"
 msgstr "Reseña"
 
-#: bookwyrm/templates/snippets/create_status.html:12
-#: bookwyrm/templates/snippets/create_status_form.html:44
-msgid "Comment"
-msgstr "Comentario"
-
 #: bookwyrm/templates/snippets/create_status.html:15
 msgid "Quote"
 msgstr "Cita"
@@ -1360,8 +1600,8 @@ msgstr "Eliminar"
 
 #: bookwyrm/templates/snippets/fav_button.html:7
 #: bookwyrm/templates/snippets/fav_button.html:8
-#: bookwyrm/templates/snippets/status/status_body.html:45
-#: bookwyrm/templates/snippets/status/status_body.html:46
+#: bookwyrm/templates/snippets/status/status_body.html:55
+#: bookwyrm/templates/snippets/status/status_body.html:56
 msgid "Like status"
 msgstr "Me gusta status"
 
@@ -1370,19 +1610,21 @@ msgstr "Me gusta status"
 msgid "Un-like status"
 msgstr "Quitar me gusta de status"
 
-#: bookwyrm/templates/snippets/follow_button.html:6
-msgid "Follow request already sent."
-msgstr "Solicitud de seguidor ya se ha enviado."
-
-#: bookwyrm/templates/snippets/follow_button.html:19
+#: bookwyrm/templates/snippets/follow_button.html:13
 msgid "Send follow request"
 msgstr "Envia solicitud de seguidor"
 
-#: bookwyrm/templates/snippets/follow_button.html:21
+#: bookwyrm/templates/snippets/follow_button.html:15
 msgid "Follow"
 msgstr "Seguir"
 
-#: bookwyrm/templates/snippets/follow_button.html:27
+#: bookwyrm/templates/snippets/follow_button.html:22
+#, fuzzy
+#| msgid "Send follow request"
+msgid "Undo follow request"
+msgstr "Envia solicitud de seguidor"
+
+#: bookwyrm/templates/snippets/follow_button.html:24
 msgid "Unfollow"
 msgstr "Dejar de seguir"
 
@@ -1397,11 +1639,19 @@ msgid_plural "set a goal to read %(counter)s books in %(year)s"
 msgstr[0] "estableció una meta de leer %(counter)s libro en %(year)s"
 msgstr[1] "estableció una meta de leer %(counter)s libros en %(year)s"
 
-#: bookwyrm/templates/snippets/goal_card.html:21
+#: bookwyrm/templates/snippets/generated_status/rating.html:3
+#, fuzzy, python-format
+#| msgid "<a href=\"%(path)s\">%(title)s</a> by "
+msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(rating)s star"
+msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(rating)s stars"
+msgstr[0] "<a href=\"%(path)s\">%(title)s</a> por "
+msgstr[1] "<a href=\"%(path)s\">%(title)s</a> por "
+
+#: bookwyrm/templates/snippets/goal_card.html:22
 msgid "Dismiss message"
 msgstr "Desechar mensaje"
 
-#: bookwyrm/templates/snippets/goal_card.html:22
+#: bookwyrm/templates/snippets/goal_card.html:23
 #, python-format
 msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
 msgstr "Puedes establecer o cambiar tu meta de lectura en cualquier momento que desees desde tu <a href=\"%(path)s\">perfil</a>"
@@ -1497,8 +1747,8 @@ msgstr "por ciento"
 
 #: bookwyrm/templates/snippets/progress_update.html:25
 #, python-format
-msgid "of %(book.pages)s pages"
-msgstr "de %(book.pages)s páginas"
+msgid "of %(pages)s pages"
+msgstr "de %(pages)s páginas"
 
 #: bookwyrm/templates/snippets/rate_action.html:4
 msgid "Leave a rating"
@@ -1556,6 +1806,12 @@ msgstr "Lectura se terminó"
 msgid "Sign Up"
 msgstr "Inscribirse"
 
+#: bookwyrm/templates/snippets/report_button.html:5
+#, fuzzy
+#| msgid "Import"
+msgid "Report"
+msgstr "Importar"
+
 #: bookwyrm/templates/snippets/rss_title.html:5
 #: bookwyrm/templates/snippets/status/status_header.html:11
 msgid "rated"
@@ -1576,11 +1832,21 @@ msgstr "comentó en"
 msgid "quoted"
 msgstr "citó"
 
-#: bookwyrm/templates/snippets/search_result_text.html:3
+#: bookwyrm/templates/snippets/search_result_text.html:10
+#, fuzzy
+#| msgid "Add cover"
+msgid "No cover"
+msgstr "Agregar portada"
+
+#: bookwyrm/templates/snippets/search_result_text.html:22
 #, python-format
 msgid "by %(author)s"
 msgstr "por %(author)s"
 
+#: bookwyrm/templates/snippets/search_result_text.html:30
+msgid "Import book"
+msgstr "Importar libro"
+
 #: bookwyrm/templates/snippets/shelf.html:12
 msgid "Published"
 msgstr "Publicado"
@@ -1657,9 +1923,14 @@ msgstr "Quiero leer \"<em>%(book_title)s</em>\""
 msgid "boosted"
 msgstr "respaldó"
 
-#: bookwyrm/templates/snippets/status/status_body.html:24
-#: bookwyrm/templates/snippets/status/status_body.html:37
-#: bookwyrm/templates/snippets/status/status_body.html:38
+#: bookwyrm/templates/snippets/status/status_body.html:27
+#: bookwyrm/templates/snippets/status/status_options.html:18
+msgid "Delete status"
+msgstr "Eliminar status"
+
+#: bookwyrm/templates/snippets/status/status_body.html:34
+#: bookwyrm/templates/snippets/status/status_body.html:47
+#: bookwyrm/templates/snippets/status/status_body.html:48
 msgid "Reply"
 msgstr "Respuesta"
 
@@ -1706,15 +1977,6 @@ msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path
 msgid "More options"
 msgstr "Más opciones"
 
-#: bookwyrm/templates/snippets/status/status_options.html:17
-msgid "Delete status"
-msgstr "Eliminar status"
-
-#: bookwyrm/templates/snippets/status/status_options.html:23
-#: bookwyrm/templates/snippets/user_options.html:13
-msgid "Send direct message"
-msgstr "Enviar mensaje directo"
-
 #: bookwyrm/templates/snippets/switch_edition_button.html:5
 msgid "Switch to this edition"
 msgstr "Cambiar a esta edición"
@@ -1855,6 +2117,143 @@ msgstr[1] "%(counter)s seguidores"
 msgid "%(counter)s following"
 msgstr "%(counter)s siguiendo"
 
+#, fuzzy
+#~| msgid "All messages"
+#~ msgid "Messages"
+#~ msgstr "Todos los mensajes"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "Enter a valid email address."
+#~ msgstr "Dirección de correo electrónico:"
+
+#, fuzzy
+#~| msgid "Series number:"
+#~ msgid "Enter a number."
+#~ msgstr "Número de serie:"
+
+#, fuzzy, python-format
+#~| msgid "%(value)s is not a valid remote_id"
+#~ msgid "Value %(value)r is not a valid choice."
+#~ msgstr "%(value)s no es un remote_id válido"
+
+#, fuzzy
+#~| msgid "Series number:"
+#~ msgid "Decimal number"
+#~ msgstr "Número de serie:"
+
+#, fuzzy
+#~| msgid "List curation:"
+#~ msgid "Duration"
+#~ msgstr "Enumerar lista de comisariado:"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "Email address"
+#~ msgstr "Dirección de correo electrónico:"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "IPv4 address"
+#~ msgstr "Dirección de correo electrónico:"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "IP address"
+#~ msgstr "Dirección de correo electrónico:"
+
+#, fuzzy
+#~| msgid "No active invites"
+#~ msgid "Positive integer"
+#~ msgstr "No invitaciónes activas"
+
+#, fuzzy, python-format
+#~| msgid "%(value)s is not a valid username"
+#~ msgid "“%(value)s� is not a valid UUID."
+#~ msgstr "%(value)s no es un usuario válido"
+
+#, fuzzy
+#~| msgid "Images"
+#~ msgid "Image"
+#~ msgstr "Imagenes"
+
+#, fuzzy
+#~| msgid "Relationships"
+#~ msgid "One-to-one relationship"
+#~ msgstr "Relaciones"
+
+#, fuzzy
+#~| msgid "This shelf is empty."
+#~ msgid "This field is required."
+#~ msgstr "Este estante está vacio."
+
+#, fuzzy
+#~| msgid "This shelf is empty."
+#~ msgid "The submitted file is empty."
+#~ msgstr "Este estante está vacio."
+
+#, fuzzy, python-format
+#~| msgid "%(value)s is not a valid username"
+#~ msgid "“%(pk)s� is not a valid value."
+#~ msgstr "%(value)s no es un usuario válido"
+
+#, fuzzy
+#~| msgid "Currently Reading"
+#~ msgid "Currently"
+#~ msgstr "Leyendo actualmente"
+
+#, fuzzy
+#~| msgid "Change shelf"
+#~ msgid "Change"
+#~ msgstr "Cambiar estante"
+
+#, fuzzy
+#~| msgid "Status"
+#~ msgid "Sat"
+#~ msgstr "Status"
+
+#, fuzzy
+#~| msgid "Search"
+#~ msgid "March"
+#~ msgstr "Buscar"
+
+#, fuzzy
+#~| msgid "Series number:"
+#~ msgid "September"
+#~ msgstr "Número de serie:"
+
+#, fuzzy
+#~| msgid "Search"
+#~ msgctxt "abbrev. month"
+#~ msgid "March"
+#~ msgstr "Buscar"
+
+#, fuzzy
+#~| msgid "Search"
+#~ msgctxt "alt. month"
+#~ msgid "March"
+#~ msgstr "Buscar"
+
+#, fuzzy
+#~| msgid "Series number:"
+#~ msgctxt "alt. month"
+#~ msgid "September"
+#~ msgstr "Número de serie:"
+
+#, fuzzy, python-format
+#~| msgid "No books found matching the query \"%(query)s\""
+#~ msgid "No %(verbose_name)s found matching the query"
+#~ msgstr "No se encontró ningún libro correspondiente a la búsqueda: \"%(query)s\""
+
+#~ msgid "Announcements"
+#~ msgstr "Anuncios"
+
+#~ msgid "Site Configuration"
+#~ msgstr "Configuracion de sitio"
+
+#~ msgid "Follow request already sent."
+#~ msgstr "Solicitud de seguidor ya se ha enviado."
+
 #~ msgid "Created and curated by"
 #~ msgstr "Creado y comisariado por"
 
diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index 05fdf2c0462c396ff3e4d7e9bddff27c0c6d3f62..0a96b5131dadfb37d2ee2116ce73110d2e1bdc8f 100644
GIT binary patch
delta 7716
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
H&p+{h;9?vr

delta 7899
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
Ku4Hk}PyYo1iC;+o

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 38cdd955..5e58018f 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-07 23:40+0000\n"
+"POT-Creation-Date: 2021-03-19 11:41-0700\n"
 "PO-Revision-Date: 2021-03-02 12:37+0100\n"
 "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -18,28 +18,28 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/forms.py:185
+#: bookwyrm/forms.py:203
 msgid "One Day"
 msgstr ""
 
-#: bookwyrm/forms.py:186
+#: bookwyrm/forms.py:204
 msgid "One Week"
 msgstr ""
 
-#: bookwyrm/forms.py:187
+#: bookwyrm/forms.py:205
 msgid "One Month"
 msgstr ""
 
-#: bookwyrm/forms.py:188
+#: bookwyrm/forms.py:206
 msgid "Does Not Expire"
 msgstr ""
 
-#: bookwyrm/forms.py:190
+#: bookwyrm/forms.py:211
 #, python-format
 msgid "%(count)d uses"
 msgstr ""
 
-#: bookwyrm/forms.py:192
+#: bookwyrm/forms.py:214
 #, fuzzy
 #| msgid "Unlisted"
 msgid "Unlimited"
@@ -55,13 +55,13 @@ msgstr ""
 msgid "%(value)s is not a valid username"
 msgstr ""
 
-#: bookwyrm/models/fields.py:164 bookwyrm/templates/layout.html:152
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:152
 #, fuzzy
 #| msgid "Username:"
 msgid "username"
 msgstr "Nom d’utilisateur :"
 
-#: bookwyrm/models/fields.py:169
+#: bookwyrm/models/fields.py:170
 msgid "A user with that username already exists."
 msgstr ""
 
@@ -99,74 +99,90 @@ msgstr "Wikipedia"
 msgid "Books by %(name)s"
 msgstr "Livres par %(name)s"
 
-#: bookwyrm/templates/book.html:21
+#: bookwyrm/templates/book/book.html:21
 #: bookwyrm/templates/discover/large-book.html:12
 #: bookwyrm/templates/discover/small-book.html:9
 msgid "by"
 msgstr ""
 
-#: bookwyrm/templates/book.html:29 bookwyrm/templates/book.html:30
-#: bookwyrm/templates/edit_book.html:5
+#: bookwyrm/templates/book/book.html:29 bookwyrm/templates/book/book.html:30
 msgid "Edit Book"
 msgstr "Modifier le livre"
 
-#: bookwyrm/templates/book.html:45
+#: bookwyrm/templates/book/book.html:45
+#: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "Ajouter une couverture"
 
-#: bookwyrm/templates/book.html:51 bookwyrm/templates/lists/list.html:89
-msgid "Add"
-msgstr "Ajouter"
-
-#: bookwyrm/templates/book.html:60
+#: bookwyrm/templates/book/book.html:55
 msgid "ISBN:"
 msgstr "ISBN :"
 
-#: bookwyrm/templates/book.html:67 bookwyrm/templates/edit_book.html:107
+#: bookwyrm/templates/book/book.html:62
+#: bookwyrm/templates/book/edit_book.html:211
 msgid "OCLC Number:"
 msgstr "Numéro OCLC :"
 
-#: bookwyrm/templates/book.html:74 bookwyrm/templates/edit_book.html:111
+#: bookwyrm/templates/book/book.html:69
+#: bookwyrm/templates/book/edit_book.html:215
 msgid "ASIN:"
 msgstr "ASIN :"
 
-#: bookwyrm/templates/book.html:84
+#: bookwyrm/templates/book/book.html:79
 #, fuzzy, python-format
 #| msgid "of %(book.pages)s pages"
 msgid "%(format)s, %(pages)s pages"
 msgstr "sur %(book.pages)s pages"
 
-#: bookwyrm/templates/book.html:86
+#: bookwyrm/templates/book/book.html:81
 #, fuzzy, python-format
 #| msgid "of %(book.pages)s pages"
 msgid "%(pages)s pages"
 msgstr "sur %(book.pages)s pages"
 
-#: bookwyrm/templates/book.html:91
+#: bookwyrm/templates/book/book.html:86
+#, python-format
+msgid "Published %(date)s by %(publisher)s."
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:88
+#, fuzzy, python-format
+#| msgid "Published date:"
+msgid "Published %(date)s"
+msgstr "Date de publication :"
+
+#: bookwyrm/templates/book/book.html:90
+#, python-format
+msgid "Published by %(publisher)s."
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:95
 msgid "View on OpenLibrary"
 msgstr "Voir sur OpenLibrary"
 
-#: bookwyrm/templates/book.html:100
+#: bookwyrm/templates/book/book.html:104
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/book.html:106
+#: bookwyrm/templates/book/book.html:110
 #, fuzzy
 #| msgid "Description:"
 msgid "Add Description"
 msgstr "Ajouter une description"
 
-#: bookwyrm/templates/book.html:113 bookwyrm/templates/edit_book.html:39
+#: bookwyrm/templates/book/book.html:117
+#: bookwyrm/templates/book/edit_book.html:101
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Description :"
 
-#: bookwyrm/templates/book.html:117 bookwyrm/templates/edit_author.html:78
-#: bookwyrm/templates/edit_book.html:120 bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:50
+#: bookwyrm/templates/book/book.html:121
+#: bookwyrm/templates/book/edit_book.html:225
+#: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
+#: bookwyrm/templates/preferences/edit_user.html:56
 #: bookwyrm/templates/settings/site.html:89
 #: bookwyrm/templates/snippets/progress_update.html:21
 #: bookwyrm/templates/snippets/readthrough.html:64
@@ -175,8 +191,11 @@ msgstr "Description :"
 msgid "Save"
 msgstr "Enregistrer"
 
-#: bookwyrm/templates/book.html:118 bookwyrm/templates/book.html:167
-#: bookwyrm/templates/edit_author.html:79 bookwyrm/templates/edit_book.html:121
+#: bookwyrm/templates/book/book.html:122 bookwyrm/templates/book/book.html:171
+#: bookwyrm/templates/book/cover_modal.html:32
+#: bookwyrm/templates/book/edit_book.html:226
+#: bookwyrm/templates/edit_author.html:79
+#: bookwyrm/templates/moderation/report_modal.html:32
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
 #: bookwyrm/templates/snippets/readthrough.html:65
@@ -186,69 +205,260 @@ msgstr "Enregistrer"
 msgid "Cancel"
 msgstr "Annuler"
 
-#: bookwyrm/templates/book.html:127
+#: bookwyrm/templates/book/book.html:131
 #, fuzzy, python-format
 #| msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s\">%(title)s</a> par "
 
-#: bookwyrm/templates/book.html:135
+#: bookwyrm/templates/book/book.html:139
 #, fuzzy, python-format
 #| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/book.html:141
+#: bookwyrm/templates/book/book.html:145
 #, fuzzy, python-format
 #| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr " a ajouté <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre liste « <a href=\"%(list_path)s\">%(list_name)s</a> »"
 
-#: bookwyrm/templates/book.html:150
+#: bookwyrm/templates/book/book.html:154
 msgid "Your reading activity"
 msgstr "Votre activité de lecture"
 
-#: bookwyrm/templates/book.html:152
+#: bookwyrm/templates/book/book.html:156
 #, fuzzy
 #| msgid "Edit read dates"
 msgid "Add read dates"
 msgstr "Ajouter des dates de lecture"
 
-#: bookwyrm/templates/book.html:157
+#: bookwyrm/templates/book/book.html:161
 msgid "You don't have any reading activity for this book."
 msgstr "Vous n’avez aucune activité de lecture pour ce livre"
 
-#: bookwyrm/templates/book.html:164
+#: bookwyrm/templates/book/book.html:168
 msgid "Create"
 msgstr "Créer"
 
-#: bookwyrm/templates/book.html:186
+#: bookwyrm/templates/book/book.html:190
 msgid "Tags"
 msgstr "Tags"
 
-#: bookwyrm/templates/book.html:190 bookwyrm/templates/snippets/tag.html:18
+#: bookwyrm/templates/book/book.html:194
+#: bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr "Ajouter un tag"
 
-#: bookwyrm/templates/book.html:207
+#: bookwyrm/templates/book/book.html:211
 msgid "Subjects"
 msgstr "Sujets"
 
-#: bookwyrm/templates/book.html:218
+#: bookwyrm/templates/book/book.html:222
 msgid "Places"
 msgstr "Lieux"
 
-#: bookwyrm/templates/book.html:229 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book/book.html:233 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
-#: bookwyrm/templates/search_results.html:92
+#: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listes"
 
-#: bookwyrm/templates/book.html:258
+#: bookwyrm/templates/book/book.html:244
+#, fuzzy
+#| msgid "Go to list"
+msgid "Add to list"
+msgstr "Aller à la liste"
+
+#: bookwyrm/templates/book/book.html:254
+#: bookwyrm/templates/book/cover_modal.html:31
+#: bookwyrm/templates/lists/list.html:90
+msgid "Add"
+msgstr "Ajouter"
+
+#: bookwyrm/templates/book/book.html:282
 msgid "rated it"
 msgstr "l’a noté"
 
+#: bookwyrm/templates/book/cover_modal.html:17
+#: bookwyrm/templates/book/edit_book.html:163
+#, fuzzy
+#| msgid "Add cover"
+msgid "Upload cover:"
+msgstr "Ajouter une couverture"
+
+#: bookwyrm/templates/book/cover_modal.html:23
+#: bookwyrm/templates/book/edit_book.html:169
+msgid "Load cover from url:"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:5
+#: bookwyrm/templates/book/edit_book.html:11
+#, fuzzy, python-format
+#| msgid "Finish \"<em>%(book_title)s</em>\""
+msgid "Edit \"%(book_title)s\""
+msgstr "Éditions de %(book_title)s"
+
+#: bookwyrm/templates/book/edit_book.html:5
+#: bookwyrm/templates/book/edit_book.html:13
+#, fuzzy
+#| msgid "Add Books"
+msgid "Add Book"
+msgstr "Ajouter des livres"
+
+#: bookwyrm/templates/book/edit_book.html:18
+#: bookwyrm/templates/edit_author.html:13
+msgid "Added:"
+msgstr "AJouté :"
+
+#: bookwyrm/templates/book/edit_book.html:19
+#: bookwyrm/templates/edit_author.html:14
+msgid "Updated:"
+msgstr "Mis à jour :"
+
+#: bookwyrm/templates/book/edit_book.html:20
+#: bookwyrm/templates/edit_author.html:15
+msgid "Last edited by:"
+msgstr "Dernière modification par :"
+
+#: bookwyrm/templates/book/edit_book.html:40
+msgid "Confirm Book Info"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:47
+#, python-format
+msgid "Is \"%(name)s\" an existing author?"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:52
+#, fuzzy, python-format
+#| msgid "Start \"<em>%(book_title)s</em>\""
+msgid "Author of <em>%(book_title)s</em>"
+msgstr "Commencer « <em>%(book_title)s</em> »"
+
+#: bookwyrm/templates/book/edit_book.html:55
+msgid "This is a new author"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:61
+#, python-format
+msgid "Creating a new author: %(name)s"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:67
+msgid "Is this an edition of an existing work?"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:71
+msgid "This is a new work"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:77
+#: bookwyrm/templates/password_reset.html:30
+msgid "Confirm"
+msgstr "Confirmer"
+
+#: bookwyrm/templates/book/edit_book.html:79
+#: bookwyrm/templates/feed/status.html:8
+msgid "Back"
+msgstr "Retour"
+
+#: bookwyrm/templates/book/edit_book.html:90
+#: bookwyrm/templates/edit_author.html:31
+msgid "Metadata"
+msgstr "Métadonnées"
+
+#: bookwyrm/templates/book/edit_book.html:91
+msgid "Title:"
+msgstr "Titre :"
+
+#: bookwyrm/templates/book/edit_book.html:96
+msgid "Subtitle:"
+msgstr "Sous‑titre :"
+
+#: bookwyrm/templates/book/edit_book.html:106
+msgid "Series:"
+msgstr "Série :"
+
+#: bookwyrm/templates/book/edit_book.html:111
+msgid "Series number:"
+msgstr "Numéro dans la série :"
+
+#: bookwyrm/templates/book/edit_book.html:117
+#, fuzzy
+#| msgid "Published"
+msgid "Publisher:"
+msgstr "Publié"
+
+#: bookwyrm/templates/book/edit_book.html:119
+msgid "Separate multiple publishers with commas."
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:125
+msgid "First published date:"
+msgstr "Première date de publication :"
+
+#: bookwyrm/templates/book/edit_book.html:130
+msgid "Published date:"
+msgstr "Date de publication :"
+
+#: bookwyrm/templates/book/edit_book.html:137
+#, fuzzy
+#| msgid "Author"
+msgid "Authors"
+msgstr "Auteur ou autrice"
+
+#: bookwyrm/templates/book/edit_book.html:143
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
+msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
+
+#: bookwyrm/templates/book/edit_book.html:148
+#, fuzzy
+#| msgid "Edit Author"
+msgid "Add Authors:"
+msgstr "Modifier l’auteur ou autrice"
+
+#: bookwyrm/templates/book/edit_book.html:149
+msgid "John Doe, Jane Smith"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:155
+#: bookwyrm/templates/snippets/shelf.html:9
+msgid "Cover"
+msgstr "Couverture"
+
+#: bookwyrm/templates/book/edit_book.html:182
+msgid "Physical Properties"
+msgstr "Propriétés physiques"
+
+#: bookwyrm/templates/book/edit_book.html:183
+msgid "Format:"
+msgstr "Format :"
+
+#: bookwyrm/templates/book/edit_book.html:191
+msgid "Pages:"
+msgstr "Pages :"
+
+#: bookwyrm/templates/book/edit_book.html:198
+msgid "Book Identifiers"
+msgstr "Identifiants du livre"
+
+#: bookwyrm/templates/book/edit_book.html:199
+msgid "ISBN 13:"
+msgstr "ISBN 13 :"
+
+#: bookwyrm/templates/book/edit_book.html:203
+msgid "ISBN 10:"
+msgstr "ISBN 10 :"
+
+#: bookwyrm/templates/book/edit_book.html:207
+#: bookwyrm/templates/edit_author.html:59
+msgid "Openlibrary key:"
+msgstr "Clé Openlibrary :"
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/feed/feed_layout.html:54
 #, fuzzy
@@ -306,22 +516,6 @@ msgstr "Cette instance est fermée"
 msgid "Your Account"
 msgstr "Votre compte"
 
-#: bookwyrm/templates/edit_author.html:13 bookwyrm/templates/edit_book.html:13
-msgid "Added:"
-msgstr "AJouté :"
-
-#: bookwyrm/templates/edit_author.html:14 bookwyrm/templates/edit_book.html:14
-msgid "Updated:"
-msgstr "Mis à jour :"
-
-#: bookwyrm/templates/edit_author.html:15 bookwyrm/templates/edit_book.html:15
-msgid "Last edited by:"
-msgstr "Dernière modification par :"
-
-#: bookwyrm/templates/edit_author.html:31 bookwyrm/templates/edit_book.html:30
-msgid "Metadata"
-msgstr "Métadonnées"
-
 #: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
 #: bookwyrm/templates/user/create_shelf_form.html:13
 #: bookwyrm/templates/user/edit_shelf_form.html:14
@@ -348,10 +542,6 @@ msgstr "Date de décès :"
 msgid "Author Identifiers"
 msgstr "Identifiants de l’auteur ou autrice"
 
-#: bookwyrm/templates/edit_author.html:59 bookwyrm/templates/edit_book.html:103
-msgid "Openlibrary key:"
-msgstr "Clé Openlibrary :"
-
 #: bookwyrm/templates/edit_author.html:64
 msgid "Librarything key:"
 msgstr "Clé Librarything :"
@@ -360,59 +550,6 @@ msgstr "Clé Librarything :"
 msgid "Goodreads key:"
 msgstr "Clé Goodreads :"
 
-#: bookwyrm/templates/edit_book.html:31
-msgid "Title:"
-msgstr "Titre :"
-
-#: bookwyrm/templates/edit_book.html:35
-msgid "Subtitle:"
-msgstr "Sous‑titre :"
-
-#: bookwyrm/templates/edit_book.html:43
-msgid "Series:"
-msgstr "Série :"
-
-#: bookwyrm/templates/edit_book.html:47
-msgid "Series number:"
-msgstr "Numéro dans la série :"
-
-#: bookwyrm/templates/edit_book.html:51
-msgid "First published date:"
-msgstr "Première date de publication :"
-
-#: bookwyrm/templates/edit_book.html:55
-msgid "Published date:"
-msgstr "Date de publication :"
-
-#: bookwyrm/templates/edit_book.html:68
-#: bookwyrm/templates/snippets/shelf.html:9
-msgid "Cover"
-msgstr "Couverture"
-
-#: bookwyrm/templates/edit_book.html:78
-msgid "Physical Properties"
-msgstr "Propriétés physiques"
-
-#: bookwyrm/templates/edit_book.html:79
-msgid "Format:"
-msgstr "Format :"
-
-#: bookwyrm/templates/edit_book.html:87
-msgid "Pages:"
-msgstr "Pages :"
-
-#: bookwyrm/templates/edit_book.html:94
-msgid "Book Identifiers"
-msgstr "Identifiants du livre"
-
-#: bookwyrm/templates/edit_book.html:95
-msgid "ISBN 13:"
-msgstr "ISBN 13 :"
-
-#: bookwyrm/templates/edit_book.html:99
-msgid "ISBN 10:"
-msgstr "ISBN 10 :"
-
 #: bookwyrm/templates/editions.html:5
 #, fuzzy, python-format
 #| msgid "Finish \"<em>%(book_title)s</em>\""
@@ -463,18 +600,14 @@ msgstr "%(tab_title)s — Fil d’actualité"
 msgid "Home"
 msgstr "Accueil"
 
-#: bookwyrm/templates/feed/feed.html:13 bookwyrm/views/feed.py:37
+#: bookwyrm/templates/feed/feed.html:13 bookwyrm/views/feed.py:38
 msgid "Local"
 msgstr "Local"
 
-#: bookwyrm/templates/feed/feed.html:16 bookwyrm/views/feed.py:41
+#: bookwyrm/templates/feed/feed.html:16 bookwyrm/views/feed.py:43
 msgid "Federated"
 msgstr "Fédéré"
 
-#: bookwyrm/templates/feed/feed.html:24
-msgid "Announcements"
-msgstr "Annonces"
-
 #: bookwyrm/templates/feed/feed.html:32
 msgid "There aren't any activities right now! Try following a user to get started"
 msgstr "Aucune activité pour l’instant ! Abonnez‑vous à quelqu’un pour commencer"
@@ -519,10 +652,6 @@ msgstr "Lu"
 msgid "%(year)s Reading Goal"
 msgstr "Défi lecture pour %(year)s"
 
-#: bookwyrm/templates/feed/status.html:8
-msgid "Back"
-msgstr "Retour"
-
 #: bookwyrm/templates/goal.html:7
 #, python-format
 msgid "%(year)s Reading Progress"
@@ -726,8 +855,8 @@ msgid "Invites"
 msgstr "Invitations"
 
 #: bookwyrm/templates/layout.html:118
-msgid "Site Configuration"
-msgstr "Configuration du site"
+msgid "Admin"
+msgstr ""
 
 #: bookwyrm/templates/layout.html:125
 msgid "Log out"
@@ -848,6 +977,7 @@ msgid "Anyone can suggest books, subject to your approval"
 msgstr "N’importe qui peut suggérer des livres, soumis à votre approbation"
 
 #: bookwyrm/templates/lists/form.html:31
+#: bookwyrm/templates/moderation/reports.html:11
 msgid "Open"
 msgstr "Ouverte"
 
@@ -898,7 +1028,7 @@ msgstr "Aucun livre trouvé pour la requête « %(query)s »"
 msgid "No books found"
 msgstr "Aucun livre trouvé"
 
-#: bookwyrm/templates/lists/list.html:89
+#: bookwyrm/templates/lists/list.html:90
 msgid "Suggest"
 msgstr "Suggérer"
 
@@ -933,6 +1063,120 @@ msgstr "Contacter un administrateur pour obtenir une invitation"
 msgid "More about this site"
 msgstr "En savoir plus sur ce site"
 
+#: bookwyrm/templates/moderation/report.html:5
+#: bookwyrm/templates/moderation/report.html:6
+#: bookwyrm/templates/moderation/report_preview.html:6
+#, python-format
+msgid "Report #%(report_id)s: %(username)s"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:10
+msgid "Back to reports"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:18
+#, fuzzy
+#| msgid "Notifications"
+msgid "Actions"
+msgstr "Notifications"
+
+#: bookwyrm/templates/moderation/report.html:19
+#, fuzzy
+#| msgid "User Profile"
+msgid "View user profile"
+msgstr "Profil"
+
+#: bookwyrm/templates/moderation/report.html:22
+#: bookwyrm/templates/snippets/status/status_options.html:25
+#: bookwyrm/templates/snippets/user_options.html:13
+msgid "Send direct message"
+msgstr "Envoyer un message direct"
+
+#: bookwyrm/templates/moderation/report.html:27
+msgid "Deactivate user"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:29
+msgid "Reactivate user"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:36
+msgid "Moderator Comments"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:54
+#: bookwyrm/templates/snippets/create_status.html:12
+#: bookwyrm/templates/snippets/create_status_form.html:44
+msgid "Comment"
+msgstr "Commentaire"
+
+#: bookwyrm/templates/moderation/report.html:59
+#, fuzzy
+#| msgid "Delete status"
+msgid "Reported statuses"
+msgstr "Supprimer le statut"
+
+#: bookwyrm/templates/moderation/report.html:61
+msgid "No statuses reported"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:67
+msgid "Statuses has been deleted"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report_modal.html:6
+#, fuzzy, python-format
+#| msgid "Join %(name)s"
+msgid "Report @%(username)s"
+msgstr "Listes : %(username)s"
+
+#: bookwyrm/templates/moderation/report_modal.html:21
+#, python-format
+msgid "This report will be sent to %(site_name)s's moderators for review."
+msgstr ""
+
+#: bookwyrm/templates/moderation/report_modal.html:22
+#, fuzzy
+#| msgid "More about this site"
+msgid "More info about this report:"
+msgstr "En savoir plus sur ce site"
+
+#: bookwyrm/templates/moderation/report_modal.html:31
+msgid "Submit"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report_preview.html:13
+msgid "No notes provided"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report_preview.html:20
+#, fuzzy, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid "Reported by <a href=\"%(path)s\">%(username)s</a>"
+msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
+
+#: bookwyrm/templates/moderation/report_preview.html:30
+msgid "Re-open"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report_preview.html:32
+msgid "Resolve"
+msgstr ""
+
+#: bookwyrm/templates/moderation/reports.html:4
+#: bookwyrm/templates/moderation/reports.html:5
+#: bookwyrm/templates/settings/admin_layout.html:23
+#, fuzzy
+#| msgid "Recent Imports"
+msgid "Reports"
+msgstr "Importations récentes"
+
+#: bookwyrm/templates/moderation/reports.html:14
+#, fuzzy
+#| msgid "Shelved"
+msgid "Resolved"
+msgstr "Ajouté à une étagère"
+
 #: bookwyrm/templates/notfound.html:4 bookwyrm/templates/notfound.html:8
 msgid "Not Found"
 msgstr "Introuvable"
@@ -945,110 +1189,115 @@ msgstr "Il semblerait que la page que vous avez demandée n’existe pas !"
 msgid "Delete notifications"
 msgstr "Supprimer les notifications"
 
-#: bookwyrm/templates/notifications.html:51
+#: bookwyrm/templates/notifications.html:53
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a> à ses favoris"
 
-#: bookwyrm/templates/notifications.html:53
+#: bookwyrm/templates/notifications.html:55
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a> à ses favoris"
 
-#: bookwyrm/templates/notifications.html:55
+#: bookwyrm/templates/notifications.html:57
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a> à ses favoris"
 
-#: bookwyrm/templates/notifications.html:57
+#: bookwyrm/templates/notifications.html:59
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">status</a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">statut</a> à ses favoris"
 
-#: bookwyrm/templates/notifications.html:62
+#: bookwyrm/templates/notifications.html:64
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "vous a mentionné dans sa <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:64
+#: bookwyrm/templates/notifications.html:66
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "vous a mentionné dans son <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:66
+#: bookwyrm/templates/notifications.html:68
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "vous a mentionné dans sa <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:68
+#: bookwyrm/templates/notifications.html:70
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">status</a>"
 msgstr "vous a mentionné dans son <a href=\"%(related_path)s\">statut</a>"
 
-#: bookwyrm/templates/notifications.html:73
+#: bookwyrm/templates/notifications.html:75
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">critique de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:75
+#: bookwyrm/templates/notifications.html:77
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">commentaire sur <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:77
+#: bookwyrm/templates/notifications.html:79
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">citation de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:79
+#: bookwyrm/templates/notifications.html:81
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">statut</a>"
 
-#: bookwyrm/templates/notifications.html:83
+#: bookwyrm/templates/notifications.html:85
 msgid "followed you"
 msgstr "s’est abonné(e)"
 
-#: bookwyrm/templates/notifications.html:86
+#: bookwyrm/templates/notifications.html:88
 msgid "sent you a follow request"
 msgstr "vous a envoyé une demande d’abonnement"
 
-#: bookwyrm/templates/notifications.html:92
+#: bookwyrm/templates/notifications.html:94
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "a partagé votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:94
+#: bookwyrm/templates/notifications.html:96
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
 msgstr "a partagé votre <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:96
+#: bookwyrm/templates/notifications.html:98
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "a partagé votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:98
+#: bookwyrm/templates/notifications.html:100
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">status</a>"
 msgstr "a partagé votre <a href=\"%(related_path)s\">statut</a>"
 
-#: bookwyrm/templates/notifications.html:102
+#: bookwyrm/templates/notifications.html:104
 #, python-format
 msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 msgstr " a ajouté <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre liste « <a href=\"%(list_path)s\">%(list_name)s</a> »"
 
-#: bookwyrm/templates/notifications.html:104
+#: bookwyrm/templates/notifications.html:106
 #, python-format
 msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 msgstr " a suggégré l’ajout de <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre liste « <a href=\"%(list_path)s/curate\">%(list_name)s</a> »"
 
-#: bookwyrm/templates/notifications.html:108
+#: bookwyrm/templates/notifications.html:110
 #, python-format
-msgid " your <a href=\"/import/%(related_id)s\">import</a> completed."
-msgstr " votre <a href=\"/import/%(related_id)s\">importation</a> est terminée."
+msgid "Your <a href=\"/import/%(related_id)s\">import</a> completed."
+msgstr "Votre <a href=\"/import/%(related_id)s\">importation</a> est terminée."
 
-#: bookwyrm/templates/notifications.html:142
+#: bookwyrm/templates/notifications.html:113
+#, python-format
+msgid "A new <a href=\"%(path)s\">report</a> needs moderation."
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:139
 msgid "You're all caught up!"
 msgstr "Aucune nouvelle notification !"
 
@@ -1064,10 +1313,6 @@ msgstr "Changez le mot de passe"
 msgid "Confirm password:"
 msgstr "Confirmez le mot de passe :"
 
-#: bookwyrm/templates/password_reset.html:30
-msgid "Confirm"
-msgstr "Confirmer"
-
 #: bookwyrm/templates/password_reset_request.html:12
 msgid "A link to reset your password will be sent to your email address"
 msgstr "Un lien pour changer votre mot de passe sera envoyé à votre addresse email"
@@ -1121,6 +1366,10 @@ msgid "Summary:"
 msgstr "Résumé :"
 
 #: bookwyrm/templates/preferences/edit_user.html:46
+msgid "Show set reading goal prompt in feed:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:52
 msgid "Manually approve followers:"
 msgstr "Autoriser les abonnements manuellement :"
 
@@ -1140,24 +1389,20 @@ msgstr "Vous n’avez pas trouvé ce que vous cherchiez ?"
 msgid "Show results from other catalogues"
 msgstr "Montrer les résultats d’autres catalogues"
 
-#: bookwyrm/templates/search_results.html:57
-msgid "Import book"
-msgstr "Importer le livre"
-
-#: bookwyrm/templates/search_results.html:67
+#: bookwyrm/templates/search_results.html:62
 msgid "Hide results from other catalogues"
 msgstr "Masquer les résultats d’autres catalogues"
 
-#: bookwyrm/templates/search_results.html:75
+#: bookwyrm/templates/search_results.html:74
 msgid "Matching Users"
 msgstr "Comptes correspondants"
 
-#: bookwyrm/templates/search_results.html:77
+#: bookwyrm/templates/search_results.html:76
 #, python-format
 msgid "No users found for \"%(query)s\""
 msgstr "Aucun compte trouvé pour « %(query)s »"
 
-#: bookwyrm/templates/search_results.html:94
+#: bookwyrm/templates/search_results.html:93
 #, python-format
 msgid "No lists found for \"%(query)s\""
 msgstr "Aucune liste trouvée pour « %(query)s »"
@@ -1170,16 +1415,16 @@ msgstr "Administration"
 msgid "Manage Users"
 msgstr "Gérer les comptes"
 
-#: bookwyrm/templates/settings/admin_layout.html:23
+#: bookwyrm/templates/settings/admin_layout.html:27
 #: bookwyrm/templates/settings/federation.html:4
 msgid "Federated Servers"
 msgstr "Serveurs fédérés"
 
-#: bookwyrm/templates/settings/admin_layout.html:28
+#: bookwyrm/templates/settings/admin_layout.html:32
 msgid "Instance Settings"
 msgstr "Paramètres de l’instance"
 
-#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/admin_layout.html:36
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 #, fuzzy
@@ -1187,22 +1432,22 @@ msgstr "Paramètres de l’instance"
 msgid "Site Settings"
 msgstr "Paramètres du site"
 
-#: bookwyrm/templates/settings/admin_layout.html:35
+#: bookwyrm/templates/settings/admin_layout.html:39
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr "Information sur l’instance"
 
-#: bookwyrm/templates/settings/admin_layout.html:36
+#: bookwyrm/templates/settings/admin_layout.html:40
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr "Images"
 
-#: bookwyrm/templates/settings/admin_layout.html:37
+#: bookwyrm/templates/settings/admin_layout.html:41
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr "Contenu du pied de page"
 
-#: bookwyrm/templates/settings/admin_layout.html:38
+#: bookwyrm/templates/settings/admin_layout.html:42
 #: bookwyrm/templates/settings/site.html:77
 msgid "Registration"
 msgstr "Enregistrement"
@@ -1322,8 +1567,8 @@ msgstr "<a href=\"%(path)s\">%(title)s</a> par "
 
 #: bookwyrm/templates/snippets/boost_button.html:8
 #: bookwyrm/templates/snippets/boost_button.html:9
-#: bookwyrm/templates/snippets/status/status_body.html:41
-#: bookwyrm/templates/snippets/status/status_body.html:42
+#: bookwyrm/templates/snippets/status/status_body.html:51
+#: bookwyrm/templates/snippets/status/status_body.html:52
 msgid "Boost status"
 msgstr "Partager le statut"
 
@@ -1344,11 +1589,6 @@ msgstr "Attention spoilers !"
 msgid "Review"
 msgstr "Critique"
 
-#: bookwyrm/templates/snippets/create_status.html:12
-#: bookwyrm/templates/snippets/create_status_form.html:44
-msgid "Comment"
-msgstr "Commentaire"
-
 #: bookwyrm/templates/snippets/create_status.html:15
 msgid "Quote"
 msgstr "Citation"
@@ -1395,8 +1635,8 @@ msgstr "Supprimer"
 
 #: bookwyrm/templates/snippets/fav_button.html:7
 #: bookwyrm/templates/snippets/fav_button.html:8
-#: bookwyrm/templates/snippets/status/status_body.html:45
-#: bookwyrm/templates/snippets/status/status_body.html:46
+#: bookwyrm/templates/snippets/status/status_body.html:55
+#: bookwyrm/templates/snippets/status/status_body.html:56
 msgid "Like status"
 msgstr "Ajouter le statut aux favoris"
 
@@ -1405,19 +1645,21 @@ msgstr "Ajouter le statut aux favoris"
 msgid "Un-like status"
 msgstr "Supprimer le statut des favoris"
 
-#: bookwyrm/templates/snippets/follow_button.html:6
-msgid "Follow request already sent."
-msgstr "Demande d’abonnement déjà envoyée"
-
-#: bookwyrm/templates/snippets/follow_button.html:19
+#: bookwyrm/templates/snippets/follow_button.html:13
 msgid "Send follow request"
 msgstr "Envoyer une demande d’abonnement"
 
-#: bookwyrm/templates/snippets/follow_button.html:21
+#: bookwyrm/templates/snippets/follow_button.html:15
 msgid "Follow"
 msgstr "S’abonner"
 
-#: bookwyrm/templates/snippets/follow_button.html:27
+#: bookwyrm/templates/snippets/follow_button.html:22
+#, fuzzy
+#| msgid "Send follow request"
+msgid "Undo follow request"
+msgstr "Envoyer une demande d’abonnement"
+
+#: bookwyrm/templates/snippets/follow_button.html:24
 msgid "Unfollow"
 msgstr "Se désabonner"
 
@@ -1432,11 +1674,19 @@ msgid_plural "set a goal to read %(counter)s books in %(year)s"
 msgstr[0] "souhaite lire %(counter)s livre en %(year)s"
 msgstr[1] "souhaite lire %(counter)s livres en %(year)s"
 
-#: bookwyrm/templates/snippets/goal_card.html:21
+#: bookwyrm/templates/snippets/generated_status/rating.html:3
+#, fuzzy, python-format
+#| msgid "<a href=\"%(path)s\">%(title)s</a> by "
+msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(rating)s star"
+msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(rating)s stars"
+msgstr[0] "<a href=\"%(path)s\">%(title)s</a> par "
+msgstr[1] "<a href=\"%(path)s\">%(title)s</a> par "
+
+#: bookwyrm/templates/snippets/goal_card.html:22
 msgid "Dismiss message"
 msgstr "Rejeter le message"
 
-#: bookwyrm/templates/snippets/goal_card.html:22
+#: bookwyrm/templates/snippets/goal_card.html:23
 #, python-format
 msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
 msgstr "Vous pouvez définir ou changer vore défi lecture à n’importe quel moment depuis votre <a href=\"%(path)s\">profil</a>"
@@ -1532,8 +1782,8 @@ msgstr "pourcent"
 
 #: bookwyrm/templates/snippets/progress_update.html:25
 #, python-format
-msgid "of %(book.pages)s pages"
-msgstr "sur %(book.pages)s pages"
+msgid "of %(pages)s pages"
+msgstr "sur %(pages)s pages"
 
 #: bookwyrm/templates/snippets/rate_action.html:4
 msgid "Leave a rating"
@@ -1593,6 +1843,12 @@ msgstr "Lecture terminée le"
 msgid "Sign Up"
 msgstr "S’enregistrer"
 
+#: bookwyrm/templates/snippets/report_button.html:5
+#, fuzzy
+#| msgid "Import"
+msgid "Report"
+msgstr "Importer"
+
 #: bookwyrm/templates/snippets/rss_title.html:5
 #: bookwyrm/templates/snippets/status/status_header.html:11
 msgid "rated"
@@ -1613,11 +1869,21 @@ msgstr "a commenté"
 msgid "quoted"
 msgstr "a cité"
 
-#: bookwyrm/templates/snippets/search_result_text.html:3
+#: bookwyrm/templates/snippets/search_result_text.html:10
+#, fuzzy
+#| msgid "Add cover"
+msgid "No cover"
+msgstr "Ajouter une couverture"
+
+#: bookwyrm/templates/snippets/search_result_text.html:22
 #, python-format
 msgid "by %(author)s"
 msgstr "par %(author)s"
 
+#: bookwyrm/templates/snippets/search_result_text.html:30
+msgid "Import book"
+msgstr "Importer le livre"
+
 #: bookwyrm/templates/snippets/shelf.html:12
 msgid "Published"
 msgstr "Publié"
@@ -1698,9 +1964,14 @@ msgstr "A envie de lire « <em>%(book_title)s</em> »"
 msgid "boosted"
 msgstr "partagé"
 
-#: bookwyrm/templates/snippets/status/status_body.html:24
-#: bookwyrm/templates/snippets/status/status_body.html:37
-#: bookwyrm/templates/snippets/status/status_body.html:38
+#: bookwyrm/templates/snippets/status/status_body.html:27
+#: bookwyrm/templates/snippets/status/status_options.html:18
+msgid "Delete status"
+msgstr "Supprimer le statut"
+
+#: bookwyrm/templates/snippets/status/status_body.html:34
+#: bookwyrm/templates/snippets/status/status_body.html:47
+#: bookwyrm/templates/snippets/status/status_body.html:48
 msgid "Reply"
 msgstr "Répondre"
 
@@ -1747,15 +2018,6 @@ msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_
 msgid "More options"
 msgstr "Plus d’options"
 
-#: bookwyrm/templates/snippets/status/status_options.html:17
-msgid "Delete status"
-msgstr "Supprimer le statut"
-
-#: bookwyrm/templates/snippets/status/status_options.html:23
-#: bookwyrm/templates/snippets/user_options.html:13
-msgid "Send direct message"
-msgstr "Envoyer un message direct"
-
 #: bookwyrm/templates/snippets/switch_edition_button.html:5
 msgid "Switch to this edition"
 msgstr "Changer vers cette édition"
@@ -1898,6 +2160,128 @@ msgstr[1] "%(username)s n’a pas d’abonné(e)s"
 msgid "%(counter)s following"
 msgstr "%(counter)s abonnements"
 
+#, fuzzy
+#~| msgid "All messages"
+#~ msgid "Messages"
+#~ msgstr "Tous les messages"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "Enter a valid email address."
+#~ msgstr "Adresse email :"
+
+#, fuzzy
+#~| msgid "Series number:"
+#~ msgid "Enter a number."
+#~ msgstr "Numéro dans la série :"
+
+#, fuzzy
+#~| msgid "Series number:"
+#~ msgid "Decimal number"
+#~ msgstr "Numéro dans la série :"
+
+#, fuzzy
+#~| msgid "List curation:"
+#~ msgid "Duration"
+#~ msgstr "Modération de la liste :"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "Email address"
+#~ msgstr "Adresse email :"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "IPv4 address"
+#~ msgstr "Adresse email :"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "IP address"
+#~ msgstr "Adresse email :"
+
+#, fuzzy
+#~| msgid "No active invites"
+#~ msgid "Positive integer"
+#~ msgstr "Aucune invitation active"
+
+#, fuzzy
+#~| msgid "Images"
+#~ msgid "Image"
+#~ msgstr "Images"
+
+#, fuzzy
+#~| msgid "Relationships"
+#~ msgid "One-to-one relationship"
+#~ msgstr "Relations"
+
+#, fuzzy
+#~| msgid "This shelf is empty."
+#~ msgid "This field is required."
+#~ msgstr "Cette étagère est vide"
+
+#, fuzzy
+#~| msgid "This shelf is empty."
+#~ msgid "The submitted file is empty."
+#~ msgstr "Cette étagère est vide"
+
+#, fuzzy
+#~| msgid "Started reading"
+#~ msgid "Currently"
+#~ msgstr "Commencer la lecture"
+
+#, fuzzy
+#~| msgid "Change shelf"
+#~ msgid "Change"
+#~ msgstr "Changer d’étagère"
+
+#, fuzzy
+#~| msgid "Status"
+#~ msgid "Sat"
+#~ msgstr "Statut"
+
+#, fuzzy
+#~| msgid "Search"
+#~ msgid "March"
+#~ msgstr "Chercher"
+
+#, fuzzy
+#~| msgid "Series number:"
+#~ msgid "September"
+#~ msgstr "Numéro dans la série :"
+
+#, fuzzy
+#~| msgid "Search"
+#~ msgctxt "abbrev. month"
+#~ msgid "March"
+#~ msgstr "Chercher"
+
+#, fuzzy
+#~| msgid "Search"
+#~ msgctxt "alt. month"
+#~ msgid "March"
+#~ msgstr "Chercher"
+
+#, fuzzy
+#~| msgid "Series number:"
+#~ msgctxt "alt. month"
+#~ msgid "September"
+#~ msgstr "Numéro dans la série :"
+
+#, fuzzy, python-format
+#~| msgid "No books found matching the query \"%(query)s\""
+#~ msgid "No %(verbose_name)s found matching the query"
+#~ msgstr "Aucun livre trouvé pour la requête « %(query)s »"
+
+#~ msgid "Announcements"
+#~ msgstr "Annonces"
+
+#~ msgid "Site Configuration"
+#~ msgstr "Configuration du site"
+
+#~ msgid "Follow request already sent."
+#~ msgstr "Demande d’abonnement déjà envoyée"
+
 #~ msgid "Created and curated by"
 #~ msgstr "Créée et modérée par"
 
diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
index 96663265bb0157f1fa643430c843c3c7f712b366..5f8be31c4c8c43bf8dc50cfc48ca2598e338052a 100644
GIT binary patch
delta 8084
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

delta 8220
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
R4)z6d`}eg0bABGY|No!bcVhqm

diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index 34dbed2a..6961b335 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-07 23:40+0000\n"
+"POT-Creation-Date: 2021-03-19 11:41-0700\n"
 "PO-Revision-Date: 2021-03-02 10:35+0000\n"
 "Last-Translator: Kana <gudzpoz@live.com>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -18,28 +18,28 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: bookwyrm/forms.py:185
+#: bookwyrm/forms.py:203
 msgid "One Day"
 msgstr ""
 
-#: bookwyrm/forms.py:186
+#: bookwyrm/forms.py:204
 msgid "One Week"
 msgstr ""
 
-#: bookwyrm/forms.py:187
+#: bookwyrm/forms.py:205
 msgid "One Month"
 msgstr ""
 
-#: bookwyrm/forms.py:188
+#: bookwyrm/forms.py:206
 msgid "Does Not Expire"
 msgstr ""
 
-#: bookwyrm/forms.py:190
+#: bookwyrm/forms.py:211
 #, python-format
 msgid "%(count)d uses"
 msgstr ""
 
-#: bookwyrm/forms.py:192
+#: bookwyrm/forms.py:214
 #, fuzzy
 #| msgid "Unlisted"
 msgid "Unlimited"
@@ -55,11 +55,11 @@ msgstr ""
 msgid "%(value)s is not a valid username"
 msgstr ""
 
-#: bookwyrm/models/fields.py:164 bookwyrm/templates/layout.html:152
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:152
 msgid "username"
 msgstr "用户�"
 
-#: bookwyrm/models/fields.py:169
+#: bookwyrm/models/fields.py:170
 msgid "A user with that username already exists."
 msgstr ""
 
@@ -97,71 +97,87 @@ msgstr "维基百科"
 msgid "Books by %(name)s"
 msgstr "%(name)s 所著的书"
 
-#: bookwyrm/templates/book.html:21
+#: bookwyrm/templates/book/book.html:21
 #: bookwyrm/templates/discover/large-book.html:12
 #: bookwyrm/templates/discover/small-book.html:9
 msgid "by"
 msgstr ""
 
-#: bookwyrm/templates/book.html:29 bookwyrm/templates/book.html:30
-#: bookwyrm/templates/edit_book.html:5
+#: bookwyrm/templates/book/book.html:29 bookwyrm/templates/book/book.html:30
 msgid "Edit Book"
 msgstr "编辑书目"
 
-#: bookwyrm/templates/book.html:45
+#: bookwyrm/templates/book/book.html:45
+#: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "添加��"
 
-#: bookwyrm/templates/book.html:51 bookwyrm/templates/lists/list.html:89
-msgid "Add"
-msgstr "添加"
-
-#: bookwyrm/templates/book.html:60
+#: bookwyrm/templates/book/book.html:55
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: bookwyrm/templates/book.html:67 bookwyrm/templates/edit_book.html:107
+#: bookwyrm/templates/book/book.html:62
+#: bookwyrm/templates/book/edit_book.html:211
 msgid "OCLC Number:"
 msgstr "OCLC �:"
 
-#: bookwyrm/templates/book.html:74 bookwyrm/templates/edit_book.html:111
+#: bookwyrm/templates/book/book.html:69
+#: bookwyrm/templates/book/edit_book.html:215
 msgid "ASIN:"
 msgstr "ASIN:"
 
-#: bookwyrm/templates/book.html:84
+#: bookwyrm/templates/book/book.html:79
 #, fuzzy, python-format
 #| msgid "of %(book.pages)s pages"
 msgid "%(format)s, %(pages)s pages"
 msgstr "全书 %(book.pages)s 页"
 
-#: bookwyrm/templates/book.html:86
+#: bookwyrm/templates/book/book.html:81
 #, fuzzy, python-format
 #| msgid "of %(book.pages)s pages"
 msgid "%(pages)s pages"
 msgstr "全书 %(book.pages)s 页"
 
-#: bookwyrm/templates/book.html:91
+#: bookwyrm/templates/book/book.html:86
+#, python-format
+msgid "Published %(date)s by %(publisher)s."
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:88
+#, fuzzy, python-format
+#| msgid "Published date:"
+msgid "Published %(date)s"
+msgstr "出版时间:"
+
+#: bookwyrm/templates/book/book.html:90
+#, python-format
+msgid "Published by %(publisher)s."
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:95
 msgid "View on OpenLibrary"
 msgstr "在 OpenLibrary 查看"
 
-#: bookwyrm/templates/book.html:100
+#: bookwyrm/templates/book/book.html:104
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] ""
 
-#: bookwyrm/templates/book.html:106
+#: bookwyrm/templates/book/book.html:110
 msgid "Add Description"
 msgstr "添加�述"
 
-#: bookwyrm/templates/book.html:113 bookwyrm/templates/edit_book.html:39
+#: bookwyrm/templates/book/book.html:117
+#: bookwyrm/templates/book/edit_book.html:101
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "�述:"
 
-#: bookwyrm/templates/book.html:117 bookwyrm/templates/edit_author.html:78
-#: bookwyrm/templates/edit_book.html:120 bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:50
+#: bookwyrm/templates/book/book.html:121
+#: bookwyrm/templates/book/edit_book.html:225
+#: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
+#: bookwyrm/templates/preferences/edit_user.html:56
 #: bookwyrm/templates/settings/site.html:89
 #: bookwyrm/templates/snippets/progress_update.html:21
 #: bookwyrm/templates/snippets/readthrough.html:64
@@ -170,8 +186,11 @@ msgstr "�述:"
 msgid "Save"
 msgstr "�存"
 
-#: bookwyrm/templates/book.html:118 bookwyrm/templates/book.html:167
-#: bookwyrm/templates/edit_author.html:79 bookwyrm/templates/edit_book.html:121
+#: bookwyrm/templates/book/book.html:122 bookwyrm/templates/book/book.html:171
+#: bookwyrm/templates/book/cover_modal.html:32
+#: bookwyrm/templates/book/edit_book.html:226
+#: bookwyrm/templates/edit_author.html:79
+#: bookwyrm/templates/moderation/report_modal.html:32
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
 #: bookwyrm/templates/snippets/readthrough.html:65
@@ -181,67 +200,258 @@ msgstr "�存"
 msgid "Cancel"
 msgstr "�消"
 
-#: bookwyrm/templates/book.html:127
+#: bookwyrm/templates/book/book.html:131
 #, fuzzy, python-format
 #| msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s\">%(title)s</a> �自"
 
-#: bookwyrm/templates/book.html:135
+#: bookwyrm/templates/book/book.html:139
 #, fuzzy, python-format
 #| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "与 <a href=\"%(path)s\">%(username)s</a> �信"
 
-#: bookwyrm/templates/book.html:141
+#: bookwyrm/templates/book/book.html:145
 #, fuzzy, python-format
 #| msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr " 添加了 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 
-#: bookwyrm/templates/book.html:150
+#: bookwyrm/templates/book/book.html:154
 msgid "Your reading activity"
 msgstr "你的阅读活动"
 
-#: bookwyrm/templates/book.html:152
+#: bookwyrm/templates/book/book.html:156
 msgid "Add read dates"
 msgstr "添加阅读日期"
 
-#: bookwyrm/templates/book.html:157
+#: bookwyrm/templates/book/book.html:161
 msgid "You don't have any reading activity for this book."
 msgstr "你还没有任何这本书的阅读活动。"
 
-#: bookwyrm/templates/book.html:164
+#: bookwyrm/templates/book/book.html:168
 msgid "Create"
 msgstr "创建"
 
-#: bookwyrm/templates/book.html:186
+#: bookwyrm/templates/book/book.html:190
 msgid "Tags"
 msgstr "标签"
 
-#: bookwyrm/templates/book.html:190 bookwyrm/templates/snippets/tag.html:18
+#: bookwyrm/templates/book/book.html:194
+#: bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr "添加标签"
 
-#: bookwyrm/templates/book.html:207
+#: bookwyrm/templates/book/book.html:211
 msgid "Subjects"
 msgstr "主题"
 
-#: bookwyrm/templates/book.html:218
+#: bookwyrm/templates/book/book.html:222
 msgid "Places"
 msgstr "地点"
 
-#: bookwyrm/templates/book.html:229 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book/book.html:233 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
-#: bookwyrm/templates/search_results.html:92
+#: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "列表"
 
-#: bookwyrm/templates/book.html:258
+#: bookwyrm/templates/book/book.html:244
+#, fuzzy
+#| msgid "Go to list"
+msgid "Add to list"
+msgstr "�往列表"
+
+#: bookwyrm/templates/book/book.html:254
+#: bookwyrm/templates/book/cover_modal.html:31
+#: bookwyrm/templates/lists/list.html:90
+msgid "Add"
+msgstr "添加"
+
+#: bookwyrm/templates/book/book.html:282
 msgid "rated it"
 msgstr "评价了"
 
+#: bookwyrm/templates/book/cover_modal.html:17
+#: bookwyrm/templates/book/edit_book.html:163
+#, fuzzy
+#| msgid "Add cover"
+msgid "Upload cover:"
+msgstr "添加��"
+
+#: bookwyrm/templates/book/cover_modal.html:23
+#: bookwyrm/templates/book/edit_book.html:169
+msgid "Load cover from url:"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:5
+#: bookwyrm/templates/book/edit_book.html:11
+#, fuzzy, python-format
+#| msgid "Editions of %(book_title)s"
+msgid "Edit \"%(book_title)s\""
+msgstr "%(book_title)s 的�版本"
+
+#: bookwyrm/templates/book/edit_book.html:5
+#: bookwyrm/templates/book/edit_book.html:13
+#, fuzzy
+#| msgid "Add Books"
+msgid "Add Book"
+msgstr "添加书目"
+
+#: bookwyrm/templates/book/edit_book.html:18
+#: bookwyrm/templates/edit_author.html:13
+msgid "Added:"
+msgstr "添加了:"
+
+#: bookwyrm/templates/book/edit_book.html:19
+#: bookwyrm/templates/edit_author.html:14
+msgid "Updated:"
+msgstr "更新了:"
+
+#: bookwyrm/templates/book/edit_book.html:20
+#: bookwyrm/templates/edit_author.html:15
+msgid "Last edited by:"
+msgstr "最�编辑人:"
+
+#: bookwyrm/templates/book/edit_book.html:40
+msgid "Confirm Book Info"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:47
+#, python-format
+msgid "Is \"%(name)s\" an existing author?"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:52
+#, fuzzy, python-format
+#| msgid "Start \"<em>%(book_title)s</em>\""
+msgid "Author of <em>%(book_title)s</em>"
+msgstr "开始 \"<em>%(book_title)s</em>\""
+
+#: bookwyrm/templates/book/edit_book.html:55
+msgid "This is a new author"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:61
+#, python-format
+msgid "Creating a new author: %(name)s"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:67
+msgid "Is this an edition of an existing work?"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:71
+msgid "This is a new work"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:77
+#: bookwyrm/templates/password_reset.html:30
+msgid "Confirm"
+msgstr "确认"
+
+#: bookwyrm/templates/book/edit_book.html:79
+#: bookwyrm/templates/feed/status.html:8
+msgid "Back"
+msgstr "返回"
+
+#: bookwyrm/templates/book/edit_book.html:90
+#: bookwyrm/templates/edit_author.html:31
+msgid "Metadata"
+msgstr "元数�"
+
+#: bookwyrm/templates/book/edit_book.html:91
+msgid "Title:"
+msgstr "标题:"
+
+#: bookwyrm/templates/book/edit_book.html:96
+msgid "Subtitle:"
+msgstr "副标题:"
+
+#: bookwyrm/templates/book/edit_book.html:106
+msgid "Series:"
+msgstr "系列:"
+
+#: bookwyrm/templates/book/edit_book.html:111
+msgid "Series number:"
+msgstr "系列编�:"
+
+#: bookwyrm/templates/book/edit_book.html:117
+#, fuzzy
+#| msgid "Published"
+msgid "Publisher:"
+msgstr "已出版"
+
+#: bookwyrm/templates/book/edit_book.html:119
+msgid "Separate multiple publishers with commas."
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:125
+msgid "First published date:"
+msgstr "�版时间:"
+
+#: bookwyrm/templates/book/edit_book.html:130
+msgid "Published date:"
+msgstr "出版时间:"
+
+#: bookwyrm/templates/book/edit_book.html:137
+#, fuzzy
+#| msgid "Author"
+msgid "Authors"
+msgstr "作者"
+
+#: bookwyrm/templates/book/edit_book.html:143
+#, fuzzy, python-format
+#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
+msgstr "与 <a href=\"%(path)s\">%(username)s</a> �信"
+
+#: bookwyrm/templates/book/edit_book.html:148
+#, fuzzy
+#| msgid "Edit Author"
+msgid "Add Authors:"
+msgstr "编辑作者"
+
+#: bookwyrm/templates/book/edit_book.html:149
+msgid "John Doe, Jane Smith"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:155
+#: bookwyrm/templates/snippets/shelf.html:9
+msgid "Cover"
+msgstr "��"
+
+#: bookwyrm/templates/book/edit_book.html:182
+msgid "Physical Properties"
+msgstr "实体性质"
+
+#: bookwyrm/templates/book/edit_book.html:183
+msgid "Format:"
+msgstr "格�:"
+
+#: bookwyrm/templates/book/edit_book.html:191
+msgid "Pages:"
+msgstr "页数:"
+
+#: bookwyrm/templates/book/edit_book.html:198
+msgid "Book Identifiers"
+msgstr "书目标识�"
+
+#: bookwyrm/templates/book/edit_book.html:199
+msgid "ISBN 13:"
+msgstr "ISBN 13:"
+
+#: bookwyrm/templates/book/edit_book.html:203
+msgid "ISBN 10:"
+msgstr "ISBN 10:"
+
+#: bookwyrm/templates/book/edit_book.html:207
+#: bookwyrm/templates/edit_author.html:59
+msgid "Openlibrary key:"
+msgstr "Openlibrary key:"
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/feed/feed_layout.html:54
 msgid "Close"
@@ -296,22 +506,6 @@ msgstr "本实例�开放。"
 msgid "Your Account"
 msgstr "你的��"
 
-#: bookwyrm/templates/edit_author.html:13 bookwyrm/templates/edit_book.html:13
-msgid "Added:"
-msgstr "添加了:"
-
-#: bookwyrm/templates/edit_author.html:14 bookwyrm/templates/edit_book.html:14
-msgid "Updated:"
-msgstr "更新了:"
-
-#: bookwyrm/templates/edit_author.html:15 bookwyrm/templates/edit_book.html:15
-msgid "Last edited by:"
-msgstr "最�编辑人:"
-
-#: bookwyrm/templates/edit_author.html:31 bookwyrm/templates/edit_book.html:30
-msgid "Metadata"
-msgstr "元数�"
-
 #: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
 #: bookwyrm/templates/user/create_shelf_form.html:13
 #: bookwyrm/templates/user/edit_shelf_form.html:14
@@ -338,10 +532,6 @@ msgstr "死亡日期:"
 msgid "Author Identifiers"
 msgstr "作者标识�:"
 
-#: bookwyrm/templates/edit_author.html:59 bookwyrm/templates/edit_book.html:103
-msgid "Openlibrary key:"
-msgstr "Openlibrary key:"
-
 #: bookwyrm/templates/edit_author.html:64
 msgid "Librarything key:"
 msgstr "Librarything key:"
@@ -350,59 +540,6 @@ msgstr "Librarything key:"
 msgid "Goodreads key:"
 msgstr "Goodreads key:"
 
-#: bookwyrm/templates/edit_book.html:31
-msgid "Title:"
-msgstr "标题:"
-
-#: bookwyrm/templates/edit_book.html:35
-msgid "Subtitle:"
-msgstr "副标题:"
-
-#: bookwyrm/templates/edit_book.html:43
-msgid "Series:"
-msgstr "系列:"
-
-#: bookwyrm/templates/edit_book.html:47
-msgid "Series number:"
-msgstr "系列编�:"
-
-#: bookwyrm/templates/edit_book.html:51
-msgid "First published date:"
-msgstr "�版时间:"
-
-#: bookwyrm/templates/edit_book.html:55
-msgid "Published date:"
-msgstr "出版时间:"
-
-#: bookwyrm/templates/edit_book.html:68
-#: bookwyrm/templates/snippets/shelf.html:9
-msgid "Cover"
-msgstr "��"
-
-#: bookwyrm/templates/edit_book.html:78
-msgid "Physical Properties"
-msgstr "实体性质"
-
-#: bookwyrm/templates/edit_book.html:79
-msgid "Format:"
-msgstr "格�:"
-
-#: bookwyrm/templates/edit_book.html:87
-msgid "Pages:"
-msgstr "页数:"
-
-#: bookwyrm/templates/edit_book.html:94
-msgid "Book Identifiers"
-msgstr "书目标识�"
-
-#: bookwyrm/templates/edit_book.html:95
-msgid "ISBN 13:"
-msgstr "ISBN 13:"
-
-#: bookwyrm/templates/edit_book.html:99
-msgid "ISBN 10:"
-msgstr "ISBN 10:"
-
 #: bookwyrm/templates/editions.html:5
 #, python-format
 msgid "Editions of %(book_title)s"
@@ -452,18 +589,14 @@ msgstr "%(tab_title)s 时间线"
 msgid "Home"
 msgstr "主页"
 
-#: bookwyrm/templates/feed/feed.html:13 bookwyrm/views/feed.py:37
+#: bookwyrm/templates/feed/feed.html:13 bookwyrm/views/feed.py:38
 msgid "Local"
 msgstr "本站"
 
-#: bookwyrm/templates/feed/feed.html:16 bookwyrm/views/feed.py:41
+#: bookwyrm/templates/feed/feed.html:16 bookwyrm/views/feed.py:43
 msgid "Federated"
 msgstr "跨站"
 
-#: bookwyrm/templates/feed/feed.html:24
-msgid "Announcements"
-msgstr "公告"
-
 #: bookwyrm/templates/feed/feed.html:32
 msgid "There aren't any activities right now! Try following a user to get started"
 msgstr "现在还没有任何活动��试�从关注一个用户开始�"
@@ -506,10 +639,6 @@ msgstr "阅读"
 msgid "%(year)s Reading Goal"
 msgstr "%(year)s 阅读目标"
 
-#: bookwyrm/templates/feed/status.html:8
-msgid "Back"
-msgstr "返回"
-
 #: bookwyrm/templates/goal.html:7
 #, python-format
 msgid "%(year)s Reading Progress"
@@ -707,8 +836,8 @@ msgid "Invites"
 msgstr "邀请"
 
 #: bookwyrm/templates/layout.html:118
-msgid "Site Configuration"
-msgstr "站点�置"
+msgid "Admin"
+msgstr ""
 
 #: bookwyrm/templates/layout.html:125
 msgid "Log out"
@@ -827,6 +956,7 @@ msgid "Anyone can suggest books, subject to your approval"
 msgstr "任何人都�以推�书目�主题让你批准"
 
 #: bookwyrm/templates/lists/form.html:31
+#: bookwyrm/templates/moderation/reports.html:11
 msgid "Open"
 msgstr "开放"
 
@@ -877,7 +1007,7 @@ msgstr "没有符� \"%(query)s\" 请求的书目"
 msgid "No books found"
 msgstr "没有找到书目"
 
-#: bookwyrm/templates/lists/list.html:89
+#: bookwyrm/templates/lists/list.html:90
 msgid "Suggest"
 msgstr "推�"
 
@@ -912,6 +1042,120 @@ msgstr "�系管�员以�得邀请"
 msgid "More about this site"
 msgstr "关于本站点的更多"
 
+#: bookwyrm/templates/moderation/report.html:5
+#: bookwyrm/templates/moderation/report.html:6
+#: bookwyrm/templates/moderation/report_preview.html:6
+#, python-format
+msgid "Report #%(report_id)s: %(username)s"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:10
+msgid "Back to reports"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:18
+#, fuzzy
+#| msgid "Notifications"
+msgid "Actions"
+msgstr "通知"
+
+#: bookwyrm/templates/moderation/report.html:19
+#, fuzzy
+#| msgid "User Profile"
+msgid "View user profile"
+msgstr "用户个人资料"
+
+#: bookwyrm/templates/moderation/report.html:22
+#: bookwyrm/templates/snippets/status/status_options.html:25
+#: bookwyrm/templates/snippets/user_options.html:13
+msgid "Send direct message"
+msgstr "���信"
+
+#: bookwyrm/templates/moderation/report.html:27
+msgid "Deactivate user"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:29
+msgid "Reactivate user"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:36
+msgid "Moderator Comments"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:54
+#: bookwyrm/templates/snippets/create_status.html:12
+#: bookwyrm/templates/snippets/create_status_form.html:44
+msgid "Comment"
+msgstr "评论"
+
+#: bookwyrm/templates/moderation/report.html:59
+#, fuzzy
+#| msgid "Delete status"
+msgid "Reported statuses"
+msgstr "删除�文"
+
+#: bookwyrm/templates/moderation/report.html:61
+msgid "No statuses reported"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report.html:67
+msgid "Statuses has been deleted"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report_modal.html:6
+#, fuzzy, python-format
+#| msgid "Lists: %(username)s"
+msgid "Report @%(username)s"
+msgstr "列表: %(username)s"
+
+#: bookwyrm/templates/moderation/report_modal.html:21
+#, python-format
+msgid "This report will be sent to %(site_name)s's moderators for review."
+msgstr ""
+
+#: bookwyrm/templates/moderation/report_modal.html:22
+#, fuzzy
+#| msgid "More about this site"
+msgid "More info about this report:"
+msgstr "关于本站点的更多"
+
+#: bookwyrm/templates/moderation/report_modal.html:31
+msgid "Submit"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report_preview.html:13
+msgid "No notes provided"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report_preview.html:20
+#, fuzzy, python-format
+#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+msgid "Reported by <a href=\"%(path)s\">%(username)s</a>"
+msgstr "与 <a href=\"%(path)s\">%(username)s</a> �信"
+
+#: bookwyrm/templates/moderation/report_preview.html:30
+msgid "Re-open"
+msgstr ""
+
+#: bookwyrm/templates/moderation/report_preview.html:32
+msgid "Resolve"
+msgstr ""
+
+#: bookwyrm/templates/moderation/reports.html:4
+#: bookwyrm/templates/moderation/reports.html:5
+#: bookwyrm/templates/settings/admin_layout.html:23
+#, fuzzy
+#| msgid "Recent Imports"
+msgid "Reports"
+msgstr "最近的导入"
+
+#: bookwyrm/templates/moderation/reports.html:14
+#, fuzzy
+#| msgid "Shelved"
+msgid "Resolved"
+msgstr "已上架"
+
 #: bookwyrm/templates/notfound.html:4 bookwyrm/templates/notfound.html:8
 msgid "Not Found"
 msgstr "未找到"
@@ -924,110 +1168,115 @@ msgstr "你请求的页�似乎并�存在�"
 msgid "Delete notifications"
 msgstr "删除通知"
 
-#: bookwyrm/templates/notifications.html:51
+#: bookwyrm/templates/notifications.html:53
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "喜欢了你 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的书评</a>"
 
-#: bookwyrm/templates/notifications.html:53
+#: bookwyrm/templates/notifications.html:55
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "喜欢了你 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的评论</a>"
 
-#: bookwyrm/templates/notifications.html:55
+#: bookwyrm/templates/notifications.html:57
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "喜欢了你 <a href=\"%(related_path)s\">�自 <em>%(book_title)s</em> 的引用</a>"
 
-#: bookwyrm/templates/notifications.html:57
+#: bookwyrm/templates/notifications.html:59
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">status</a>"
 msgstr "喜欢了你的 <a href=\"%(related_path)s\">状�</a>"
 
-#: bookwyrm/templates/notifications.html:62
+#: bookwyrm/templates/notifications.html:64
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "在 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的书评</a> 里�到了你"
 
-#: bookwyrm/templates/notifications.html:64
+#: bookwyrm/templates/notifications.html:66
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "在 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的评论</a> 里�到了你"
 
-#: bookwyrm/templates/notifications.html:66
+#: bookwyrm/templates/notifications.html:68
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "在 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的引用</a> 中�到了你"
 
-#: bookwyrm/templates/notifications.html:68
+#: bookwyrm/templates/notifications.html:70
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">status</a>"
 msgstr "在 <a href=\"%(related_path)s\">状�</a> 中�到了你"
 
-#: bookwyrm/templates/notifications.html:73
+#: bookwyrm/templates/notifications.html:75
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">对 <em>%(book_title)s</em> 的书评</a>"
 
-#: bookwyrm/templates/notifications.html:75
+#: bookwyrm/templates/notifications.html:77
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">对 <em>%(book_title)s</em> 的评论</a>"
 
-#: bookwyrm/templates/notifications.html:77
+#: bookwyrm/templates/notifications.html:79
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">回�</a> 了你 <a href=\"%(parent_path)s\">对 <em>%(book_title)s</em> 中的引用</a>"
 
-#: bookwyrm/templates/notifications.html:79
+#: bookwyrm/templates/notifications.html:81
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgstr "<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">状�</a>"
 
-#: bookwyrm/templates/notifications.html:83
+#: bookwyrm/templates/notifications.html:85
 msgid "followed you"
 msgstr "关注了你"
 
-#: bookwyrm/templates/notifications.html:86
+#: bookwyrm/templates/notifications.html:88
 msgid "sent you a follow request"
 msgstr "�你��了关注请求"
 
-#: bookwyrm/templates/notifications.html:92
+#: bookwyrm/templates/notifications.html:94
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "转�了你的 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的书评</a>"
 
-#: bookwyrm/templates/notifications.html:94
+#: bookwyrm/templates/notifications.html:96
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
 msgstr "转�了你的 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的评论</a>"
 
-#: bookwyrm/templates/notifications.html:96
+#: bookwyrm/templates/notifications.html:98
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "转�了你的 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的引用</a>"
 
-#: bookwyrm/templates/notifications.html:98
+#: bookwyrm/templates/notifications.html:100
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">status</a>"
 msgstr "转�了你的 <a href=\"%(related_path)s\">状�</a>"
 
-#: bookwyrm/templates/notifications.html:102
+#: bookwyrm/templates/notifications.html:104
 #, python-format
 msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 msgstr " 添加了 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 
-#: bookwyrm/templates/notifications.html:104
+#: bookwyrm/templates/notifications.html:106
 #, python-format
 msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 msgstr " 推�添加 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 
-#: bookwyrm/templates/notifications.html:108
+#: bookwyrm/templates/notifications.html:110
 #, python-format
-msgid " your <a href=\"/import/%(related_id)s\">import</a> completed."
-msgstr " 你的 <a href=\"/import/%(related_id)s\">导入</a> 已完�。"
+msgid "Your <a href=\"/import/%(related_id)s\">import</a> completed."
+msgstr "你的 <a href=\"/import/%(related_id)s\">导入</a> 已完�。"
 
-#: bookwyrm/templates/notifications.html:142
+#: bookwyrm/templates/notifications.html:113
+#, python-format
+msgid "A new <a href=\"%(path)s\">report</a> needs moderation."
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:139
 msgid "You're all caught up!"
 msgstr "你什么也没错过�"
 
@@ -1043,10 +1292,6 @@ msgstr "�设密�"
 msgid "Confirm password:"
 msgstr "确认密�:"
 
-#: bookwyrm/templates/password_reset.html:30
-msgid "Confirm"
-msgstr "确认"
-
 #: bookwyrm/templates/password_reset_request.html:12
 msgid "A link to reset your password will be sent to your email address"
 msgstr "�设你的密�的链接将会被��到你的邮箱地�"
@@ -1100,6 +1345,10 @@ msgid "Summary:"
 msgstr "概�:"
 
 #: bookwyrm/templates/preferences/edit_user.html:46
+msgid "Show set reading goal prompt in feed:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:52
 msgid "Manually approve followers:"
 msgstr "手动批准关注者:"
 
@@ -1119,24 +1368,20 @@ msgstr "没有找到你想找的？"
 msgid "Show results from other catalogues"
 msgstr "显示其它类别的结果"
 
-#: bookwyrm/templates/search_results.html:57
-msgid "Import book"
-msgstr "导入书目"
-
-#: bookwyrm/templates/search_results.html:67
+#: bookwyrm/templates/search_results.html:62
 msgid "Hide results from other catalogues"
 msgstr "��其它类别的结果"
 
-#: bookwyrm/templates/search_results.html:75
+#: bookwyrm/templates/search_results.html:74
 msgid "Matching Users"
 msgstr "匹�的用户"
 
-#: bookwyrm/templates/search_results.html:77
+#: bookwyrm/templates/search_results.html:76
 #, python-format
 msgid "No users found for \"%(query)s\""
 msgstr "没有找到 \"%(query)s\" 的用户"
 
-#: bookwyrm/templates/search_results.html:94
+#: bookwyrm/templates/search_results.html:93
 #, python-format
 msgid "No lists found for \"%(query)s\""
 msgstr "没有找到 \"%(query)s\" 的�目"
@@ -1149,37 +1394,37 @@ msgstr "管�"
 msgid "Manage Users"
 msgstr "管�用户"
 
-#: bookwyrm/templates/settings/admin_layout.html:23
+#: bookwyrm/templates/settings/admin_layout.html:27
 #: bookwyrm/templates/settings/federation.html:4
 msgid "Federated Servers"
 msgstr "互�的�务器"
 
-#: bookwyrm/templates/settings/admin_layout.html:28
+#: bookwyrm/templates/settings/admin_layout.html:32
 msgid "Instance Settings"
 msgstr "实例设置"
 
-#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/admin_layout.html:36
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr "站点设置"
 
-#: bookwyrm/templates/settings/admin_layout.html:35
+#: bookwyrm/templates/settings/admin_layout.html:39
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr "实例信�"
 
-#: bookwyrm/templates/settings/admin_layout.html:36
+#: bookwyrm/templates/settings/admin_layout.html:40
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr "图�"
 
-#: bookwyrm/templates/settings/admin_layout.html:37
+#: bookwyrm/templates/settings/admin_layout.html:41
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr "页脚内容"
 
-#: bookwyrm/templates/settings/admin_layout.html:38
+#: bookwyrm/templates/settings/admin_layout.html:42
 #: bookwyrm/templates/settings/site.html:77
 msgid "Registration"
 msgstr "注册"
@@ -1299,8 +1544,8 @@ msgstr "<a href=\"%(path)s\">%(title)s</a> �自"
 
 #: bookwyrm/templates/snippets/boost_button.html:8
 #: bookwyrm/templates/snippets/boost_button.html:9
-#: bookwyrm/templates/snippets/status/status_body.html:41
-#: bookwyrm/templates/snippets/status/status_body.html:42
+#: bookwyrm/templates/snippets/status/status_body.html:51
+#: bookwyrm/templates/snippets/status/status_body.html:52
 msgid "Boost status"
 msgstr "转�状�"
 
@@ -1321,11 +1566,6 @@ msgstr "�有剧��"
 msgid "Review"
 msgstr "书评"
 
-#: bookwyrm/templates/snippets/create_status.html:12
-#: bookwyrm/templates/snippets/create_status_form.html:44
-msgid "Comment"
-msgstr "评论"
-
 #: bookwyrm/templates/snippets/create_status.html:15
 msgid "Quote"
 msgstr "引用"
@@ -1372,8 +1612,8 @@ msgstr "删除"
 
 #: bookwyrm/templates/snippets/fav_button.html:7
 #: bookwyrm/templates/snippets/fav_button.html:8
-#: bookwyrm/templates/snippets/status/status_body.html:45
-#: bookwyrm/templates/snippets/status/status_body.html:46
+#: bookwyrm/templates/snippets/status/status_body.html:55
+#: bookwyrm/templates/snippets/status/status_body.html:56
 msgid "Like status"
 msgstr "喜欢状�"
 
@@ -1382,19 +1622,21 @@ msgstr "喜欢状�"
 msgid "Un-like status"
 msgstr "�消喜欢状�"
 
-#: bookwyrm/templates/snippets/follow_button.html:6
-msgid "Follow request already sent."
-msgstr "已���关注请求。"
-
-#: bookwyrm/templates/snippets/follow_button.html:19
+#: bookwyrm/templates/snippets/follow_button.html:13
 msgid "Send follow request"
 msgstr "��关注请求"
 
-#: bookwyrm/templates/snippets/follow_button.html:21
+#: bookwyrm/templates/snippets/follow_button.html:15
 msgid "Follow"
 msgstr "关注"
 
-#: bookwyrm/templates/snippets/follow_button.html:27
+#: bookwyrm/templates/snippets/follow_button.html:22
+#, fuzzy
+#| msgid "Send follow request"
+msgid "Undo follow request"
+msgstr "��关注请求"
+
+#: bookwyrm/templates/snippets/follow_button.html:24
 msgid "Unfollow"
 msgstr "�消关注"
 
@@ -1408,11 +1650,18 @@ msgid "set a goal to read %(counter)s book in %(year)s"
 msgid_plural "set a goal to read %(counter)s books in %(year)s"
 msgstr[0] "设定了在 %(year)s 内�读 %(counter)s 书的目标"
 
-#: bookwyrm/templates/snippets/goal_card.html:21
+#: bookwyrm/templates/snippets/generated_status/rating.html:3
+#, fuzzy, python-format
+#| msgid "<a href=\"%(path)s\">%(title)s</a> by "
+msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(rating)s star"
+msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(rating)s stars"
+msgstr[0] "<a href=\"%(path)s\">%(title)s</a> �自"
+
+#: bookwyrm/templates/snippets/goal_card.html:22
 msgid "Dismiss message"
 msgstr "�散消�"
 
-#: bookwyrm/templates/snippets/goal_card.html:22
+#: bookwyrm/templates/snippets/goal_card.html:23
 #, python-format
 msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
 msgstr "你�以在任何时候从你的<a href=\"%(path)s\">个人资料页�</a> 中设置或改�你的阅读目标"
@@ -1508,8 +1757,8 @@ msgstr "百分比"
 
 #: bookwyrm/templates/snippets/progress_update.html:25
 #, python-format
-msgid "of %(book.pages)s pages"
-msgstr "全书 %(book.pages)s 页"
+msgid "of %(pages)s pages"
+msgstr "全书 %(pages)s 页"
 
 #: bookwyrm/templates/snippets/rate_action.html:4
 msgid "Leave a rating"
@@ -1567,6 +1816,12 @@ msgstr "已完�阅读"
 msgid "Sign Up"
 msgstr "注册"
 
+#: bookwyrm/templates/snippets/report_button.html:5
+#, fuzzy
+#| msgid "Import"
+msgid "Report"
+msgstr "导入"
+
 #: bookwyrm/templates/snippets/rss_title.html:5
 #: bookwyrm/templates/snippets/status/status_header.html:11
 msgid "rated"
@@ -1587,11 +1842,21 @@ msgstr "评论了"
 msgid "quoted"
 msgstr "引用了"
 
-#: bookwyrm/templates/snippets/search_result_text.html:3
+#: bookwyrm/templates/snippets/search_result_text.html:10
+#, fuzzy
+#| msgid "Add cover"
+msgid "No cover"
+msgstr "添加��"
+
+#: bookwyrm/templates/snippets/search_result_text.html:22
 #, python-format
 msgid "by %(author)s"
 msgstr "由 %(author)s 所著"
 
+#: bookwyrm/templates/snippets/search_result_text.html:30
+msgid "Import book"
+msgstr "导入书目"
+
 #: bookwyrm/templates/snippets/shelf.html:12
 msgid "Published"
 msgstr "已出版"
@@ -1668,9 +1933,14 @@ msgstr "想�阅读 \"<em>%(book_title)s</em>\""
 msgid "boosted"
 msgstr "转�了"
 
-#: bookwyrm/templates/snippets/status/status_body.html:24
-#: bookwyrm/templates/snippets/status/status_body.html:37
-#: bookwyrm/templates/snippets/status/status_body.html:38
+#: bookwyrm/templates/snippets/status/status_body.html:27
+#: bookwyrm/templates/snippets/status/status_options.html:18
+msgid "Delete status"
+msgstr "删除�文"
+
+#: bookwyrm/templates/snippets/status/status_body.html:34
+#: bookwyrm/templates/snippets/status/status_body.html:47
+#: bookwyrm/templates/snippets/status/status_body.html:48
 msgid "Reply"
 msgstr "回�"
 
@@ -1717,15 +1987,6 @@ msgstr "<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_pat
 msgid "More options"
 msgstr "更多选项"
 
-#: bookwyrm/templates/snippets/status/status_options.html:17
-msgid "Delete status"
-msgstr "删除�文"
-
-#: bookwyrm/templates/snippets/status/status_options.html:23
-#: bookwyrm/templates/snippets/user_options.html:13
-msgid "Send direct message"
-msgstr "���信"
-
 #: bookwyrm/templates/snippets/switch_edition_button.html:5
 msgid "Switch to this edition"
 msgstr "切�到此版本"
@@ -1865,6 +2126,128 @@ msgstr[0] "%(counter)s 个关注者"
 msgid "%(counter)s following"
 msgstr "关注� %(counter)s 人"
 
+#, fuzzy
+#~| msgid "All messages"
+#~ msgid "Messages"
+#~ msgstr "所有消�"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "Enter a valid email address."
+#~ msgstr "邮箱地�:"
+
+#, fuzzy
+#~| msgid "Series number:"
+#~ msgid "Enter a number."
+#~ msgstr "系列编�:"
+
+#, fuzzy
+#~| msgid "Series number:"
+#~ msgid "Decimal number"
+#~ msgstr "系列编�:"
+
+#, fuzzy
+#~| msgid "List curation:"
+#~ msgid "Duration"
+#~ msgstr "列表策展:"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "Email address"
+#~ msgstr "邮箱地�:"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "IPv4 address"
+#~ msgstr "邮箱地�:"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "IP address"
+#~ msgstr "邮箱地�:"
+
+#, fuzzy
+#~| msgid "No active invites"
+#~ msgid "Positive integer"
+#~ msgstr "无有效的邀请"
+
+#, fuzzy
+#~| msgid "Images"
+#~ msgid "Image"
+#~ msgstr "图�"
+
+#, fuzzy
+#~| msgid "Relationships"
+#~ msgid "One-to-one relationship"
+#~ msgstr "关系"
+
+#, fuzzy
+#~| msgid "This shelf is empty."
+#~ msgid "This field is required."
+#~ msgstr "此书架是空的。"
+
+#, fuzzy
+#~| msgid "This shelf is empty."
+#~ msgid "The submitted file is empty."
+#~ msgstr "此书架是空的。"
+
+#, fuzzy
+#~| msgid "Start reading"
+#~ msgid "Currently"
+#~ msgstr "开始阅读"
+
+#, fuzzy
+#~| msgid "Change shelf"
+#~ msgid "Change"
+#~ msgstr "改�书架"
+
+#, fuzzy
+#~| msgid "Status"
+#~ msgid "Sat"
+#~ msgstr "状�"
+
+#, fuzzy
+#~| msgid "Search"
+#~ msgid "March"
+#~ msgstr "�索"
+
+#, fuzzy
+#~| msgid "Series number:"
+#~ msgid "September"
+#~ msgstr "系列编�:"
+
+#, fuzzy
+#~| msgid "Search"
+#~ msgctxt "abbrev. month"
+#~ msgid "March"
+#~ msgstr "�索"
+
+#, fuzzy
+#~| msgid "Search"
+#~ msgctxt "alt. month"
+#~ msgid "March"
+#~ msgstr "�索"
+
+#, fuzzy
+#~| msgid "Series number:"
+#~ msgctxt "alt. month"
+#~ msgid "September"
+#~ msgstr "系列编�:"
+
+#, fuzzy, python-format
+#~| msgid "No books found matching the query \"%(query)s\""
+#~ msgid "No %(verbose_name)s found matching the query"
+#~ msgstr "没有符� \"%(query)s\" 请求的书目"
+
+#~ msgid "Announcements"
+#~ msgstr "公告"
+
+#~ msgid "Site Configuration"
+#~ msgstr "站点�置"
+
+#~ msgid "Follow request already sent."
+#~ msgstr "已���关注请求。"
+
 #~ msgid "Created and curated by"
 #~ msgstr "创建者�策展者为"
 

From 266c6fe77717eef5220874447b51a4b651edc982 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 19 Mar 2021 12:14:59 -0700
Subject: [PATCH 0350/1285] Make rating a decimal field

---
 .../migrations/0053_auto_20210319_1913.py     | 20 +++++++++++++++++++
 bookwyrm/models/fields.py                     |  4 ++++
 bookwyrm/models/status.py                     |  4 +++-
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 bookwyrm/migrations/0053_auto_20210319_1913.py

diff --git a/bookwyrm/migrations/0053_auto_20210319_1913.py b/bookwyrm/migrations/0053_auto_20210319_1913.py
new file mode 100644
index 00000000..be086cd2
--- /dev/null
+++ b/bookwyrm/migrations/0053_auto_20210319_1913.py
@@ -0,0 +1,20 @@
+# Generated by Django 3.1.6 on 2021-03-19 19:13
+
+import bookwyrm.models.fields
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0052_user_show_goal'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='review',
+            name='rating',
+            field=bookwyrm.models.fields.DecimalField(blank=True, decimal_places=2, default=None, max_digits=3, null=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(5)]),
+        ),
+    ]
diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py
index 1bdc6c45..247c6aca 100644
--- a/bookwyrm/models/fields.py
+++ b/bookwyrm/models/fields.py
@@ -444,3 +444,7 @@ class BooleanField(ActivitypubFieldMixin, models.BooleanField):
 
 class IntegerField(ActivitypubFieldMixin, models.IntegerField):
     """ activitypub-aware boolean field """
+
+
+class DecimalField(ActivitypubFieldMixin, models.DecimalField):
+    """ activitypub-aware boolean field """
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index 0e18dc1b..09a7c4ec 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -273,11 +273,13 @@ class Review(Status):
     book = fields.ForeignKey(
         "Edition", on_delete=models.PROTECT, activitypub_field="inReplyToBook"
     )
-    rating = fields.IntegerField(
+    rating = fields.DecimalField(
         default=None,
         null=True,
         blank=True,
         validators=[MinValueValidator(1), MaxValueValidator(5)],
+        decimal_places=2,
+        max_digits=3,
     )
 
     @property

From 5ed3320c9bae75e223bdf91c2fa4cc09e9637e06 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 19 Mar 2021 12:16:44 -0700
Subject: [PATCH 0351/1285] Formatting

---
 bookwyrm/migrations/0053_auto_20210319_1913.py | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/migrations/0053_auto_20210319_1913.py b/bookwyrm/migrations/0053_auto_20210319_1913.py
index be086cd2..023319b3 100644
--- a/bookwyrm/migrations/0053_auto_20210319_1913.py
+++ b/bookwyrm/migrations/0053_auto_20210319_1913.py
@@ -8,13 +8,23 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0052_user_show_goal'),
+        ("bookwyrm", "0052_user_show_goal"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='review',
-            name='rating',
-            field=bookwyrm.models.fields.DecimalField(blank=True, decimal_places=2, default=None, max_digits=3, null=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(5)]),
+            model_name="review",
+            name="rating",
+            field=bookwyrm.models.fields.DecimalField(
+                blank=True,
+                decimal_places=2,
+                default=None,
+                max_digits=3,
+                null=True,
+                validators=[
+                    django.core.validators.MinValueValidator(1),
+                    django.core.validators.MaxValueValidator(5),
+                ],
+            ),
         ),
     ]

From 5a0723cde753c2a3cc093be34d56a234edd4fb8a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 19 Mar 2021 12:43:36 -0700
Subject: [PATCH 0352/1285] Migrations for django 3.1 upgrade

---
 .../migrations/0054_auto_20210319_1942.py     | 23 +++++++++++++++++++
 bookwyrm/models/import_job.py                 |  3 +--
 2 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 bookwyrm/migrations/0054_auto_20210319_1942.py

diff --git a/bookwyrm/migrations/0054_auto_20210319_1942.py b/bookwyrm/migrations/0054_auto_20210319_1942.py
new file mode 100644
index 00000000..1c853ae7
--- /dev/null
+++ b/bookwyrm/migrations/0054_auto_20210319_1942.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.1.6 on 2021-03-19 19:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0053_auto_20210319_1913'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='importitem',
+            name='data',
+            field=models.JSONField(),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='first_name',
+            field=models.CharField(blank=True, max_length=150, verbose_name='first name'),
+        ),
+    ]
diff --git a/bookwyrm/models/import_job.py b/bookwyrm/models/import_job.py
index 31dccda8..026cf7cd 100644
--- a/bookwyrm/models/import_job.py
+++ b/bookwyrm/models/import_job.py
@@ -3,7 +3,6 @@ import re
 import dateutil.parser
 
 from django.apps import apps
-from django.contrib.postgres.fields import JSONField
 from django.db import models
 from django.utils import timezone
 
@@ -70,7 +69,7 @@ class ImportItem(models.Model):
 
     job = models.ForeignKey(ImportJob, on_delete=models.CASCADE, related_name="items")
     index = models.IntegerField()
-    data = JSONField()
+    data = models.JSONField()
     book = models.ForeignKey(Book, on_delete=models.SET_NULL, null=True, blank=True)
     fail_reason = models.TextField(null=True)
 

From 1b5c71c7b1377754ce1378d7594bcc29ada9d55a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 19 Mar 2021 12:44:30 -0700
Subject: [PATCH 0353/1285] formatting

---
 bookwyrm/migrations/0054_auto_20210319_1942.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/migrations/0054_auto_20210319_1942.py b/bookwyrm/migrations/0054_auto_20210319_1942.py
index 1c853ae7..5d5865b6 100644
--- a/bookwyrm/migrations/0054_auto_20210319_1942.py
+++ b/bookwyrm/migrations/0054_auto_20210319_1942.py
@@ -6,18 +6,20 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0053_auto_20210319_1913'),
+        ("bookwyrm", "0053_auto_20210319_1913"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='importitem',
-            name='data',
+            model_name="importitem",
+            name="data",
             field=models.JSONField(),
         ),
         migrations.AlterField(
-            model_name='user',
-            name='first_name',
-            field=models.CharField(blank=True, max_length=150, verbose_name='first name'),
+            model_name="user",
+            name="first_name",
+            field=models.CharField(
+                blank=True, max_length=150, verbose_name="first name"
+            ),
         ),
     ]

From c31bf1f0c8864b2556911e4ec0406110312a175e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 19 Mar 2021 15:59:28 -0700
Subject: [PATCH 0354/1285] Fixes loading javascript listeners

---
 bookwyrm/static/js/check_all.js    |  7 -------
 bookwyrm/static/js/localstorage.js | 10 ----------
 bookwyrm/static/js/shared.js       | 18 ++++++++++++++++++
 bookwyrm/static/js/tabs.js         |  7 -------
 4 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/bookwyrm/static/js/check_all.js b/bookwyrm/static/js/check_all.js
index 1d02f6b0..ea2300ce 100644
--- a/bookwyrm/static/js/check_all.js
+++ b/bookwyrm/static/js/check_all.js
@@ -1,11 +1,4 @@
 // Toggle all checkboxes.
-window.onload = function() {
-    document
-        .querySelectorAll('[data-action="toggle-all"]')
-        .forEach(input => {
-            input.addEventListener('change', toggleAllCheckboxes);
-        });
-};
 
 /**
  * Toggle all descendant checkboxes of a target.
diff --git a/bookwyrm/static/js/localstorage.js b/bookwyrm/static/js/localstorage.js
index ff4027e6..b63c4392 100644
--- a/bookwyrm/static/js/localstorage.js
+++ b/bookwyrm/static/js/localstorage.js
@@ -1,14 +1,4 @@
 // set javascript listeners
-window.onload = function() {
-    // display based on localstorage vars
-    document.querySelectorAll('[data-hide]')
-        .forEach(t => setDisplay(t));
-
-    // update localstorage
-    Array.from(document.getElementsByClassName('set-display'))
-        .forEach(t => t.onclick = updateDisplay);
-};
-
 function updateDisplay(e) {
     // used in set reading goal
     var key = e.target.getAttribute('data-id');
diff --git a/bookwyrm/static/js/shared.js b/bookwyrm/static/js/shared.js
index 97767d72..d390f482 100644
--- a/bookwyrm/static/js/shared.js
+++ b/bookwyrm/static/js/shared.js
@@ -23,6 +23,24 @@ window.onload = function() {
     // browser back behavior
     document.querySelectorAll('[data-back]')
         .forEach(t => t.onclick = back);
+
+    Array.from(document.getElementsByClassName('tab-group'))
+        .forEach(t => new TabGroup(t));
+
+    // display based on localstorage vars
+    document.querySelectorAll('[data-hide]')
+        .forEach(t => setDisplay(t));
+
+    // update localstorage
+    Array.from(document.getElementsByClassName('set-display'))
+        .forEach(t => t.onclick = updateDisplay);
+
+    // Toggle all checkboxes.
+    document
+        .querySelectorAll('[data-action="toggle-all"]')
+        .forEach(input => {
+            input.addEventListener('change', toggleAllCheckboxes);
+        });
 };
 
 function back(e) {
diff --git a/bookwyrm/static/js/tabs.js b/bookwyrm/static/js/tabs.js
index e32312a3..1cb525ce 100644
--- a/bookwyrm/static/js/tabs.js
+++ b/bookwyrm/static/js/tabs.js
@@ -1,10 +1,3 @@
-// tab groups
-window.onload = function() {
-    Array.from(document.getElementsByClassName('tab-group'))
-        .forEach(t => new TabGroup(t));
-};
-
-
 /*
 * The content below is licensed according to the W3C Software License at
 * https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document

From 3ff871f20d7eff98a2961f985fa4b2145bf0d99a Mon Sep 17 00:00:00 2001
From: GuDzpoz <GuDzpoz@live.com>
Date: Sat, 20 Mar 2021 09:49:22 +0800
Subject: [PATCH 0355/1285] Updated Chinese translation

---
 locale/zh_CN/LC_MESSAGES/django.mo | Bin 23724 -> 30401 bytes
 locale/zh_CN/LC_MESSAGES/django.po | 261 ++++++++++++-----------------
 2 files changed, 103 insertions(+), 158 deletions(-)

diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
index 5f8be31c4c8c43bf8dc50cfc48ca2598e338052a..53738ad30f2f45f2e331c403d7d4ceaaa313ce13 100644
GIT binary patch
literal 30401
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
KW+!pd4gMSAzCp?W

delta 8686
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

diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index 6961b335..37acbbdf 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-03-19 11:41-0700\n"
-"PO-Revision-Date: 2021-03-02 10:35+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"
 "Language: zh_CN\n"
@@ -20,40 +20,38 @@ msgstr ""
 
 #: bookwyrm/forms.py:203
 msgid "One Day"
-msgstr ""
+msgstr "一天"
 
 #: bookwyrm/forms.py:204
 msgid "One Week"
-msgstr ""
+msgstr "一周"
 
 #: bookwyrm/forms.py:205
 msgid "One Month"
-msgstr ""
+msgstr "一个月"
 
 #: bookwyrm/forms.py:206
 msgid "Does Not Expire"
-msgstr ""
+msgstr "永�失效"
 
 #: bookwyrm/forms.py:211
 #, python-format
 msgid "%(count)d uses"
-msgstr ""
+msgstr "%(count)d 次使用"
 
 #: bookwyrm/forms.py:214
-#, fuzzy
-#| msgid "Unlisted"
 msgid "Unlimited"
-msgstr "�公开"
+msgstr "���"
 
 #: bookwyrm/models/fields.py:24
 #, python-format
 msgid "%(value)s is not a valid remote_id"
-msgstr ""
+msgstr "%(value)s �是有效的 remote_id"
 
 #: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
 #, python-format
 msgid "%(value)s is not a valid username"
-msgstr ""
+msgstr "%(value)s �是有效的用户�"
 
 #: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:152
 msgid "username"
@@ -61,27 +59,27 @@ msgstr "用户�"
 
 #: bookwyrm/models/fields.py:170
 msgid "A user with that username already exists."
-msgstr ""
+msgstr "已�存在使用该用户�的用户。"
 
 #: bookwyrm/settings.py:142
 msgid "English"
-msgstr ""
+msgstr "English（英语）"
 
 #: bookwyrm/settings.py:143
 msgid "German"
-msgstr ""
+msgstr "Deutsch（德语）"
 
 #: bookwyrm/settings.py:144
 msgid "Spanish"
-msgstr ""
+msgstr "Español（西�牙语）"
 
 #: bookwyrm/settings.py:145
 msgid "French"
-msgstr ""
+msgstr "Français（法语）"
 
 #: bookwyrm/settings.py:146
 msgid "Simplified Chinese"
-msgstr ""
+msgstr "简体中文"
 
 #: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
 #: bookwyrm/templates/edit_author.html:5
@@ -101,7 +99,7 @@ msgstr "%(name)s 所著的书"
 #: bookwyrm/templates/discover/large-book.html:12
 #: bookwyrm/templates/discover/small-book.html:9
 msgid "by"
-msgstr ""
+msgstr "作者"
 
 #: bookwyrm/templates/book/book.html:29 bookwyrm/templates/book/book.html:30
 msgid "Edit Book"
@@ -127,32 +125,29 @@ msgid "ASIN:"
 msgstr "ASIN:"
 
 #: bookwyrm/templates/book/book.html:79
-#, fuzzy, python-format
-#| msgid "of %(book.pages)s pages"
+#, python-format
 msgid "%(format)s, %(pages)s pages"
-msgstr "全书 %(book.pages)s 页"
+msgstr "%(format)s, %(pages)s 页"
 
 #: bookwyrm/templates/book/book.html:81
-#, fuzzy, python-format
-#| msgid "of %(book.pages)s pages"
+#, python-format
 msgid "%(pages)s pages"
-msgstr "全书 %(book.pages)s 页"
+msgstr "%(pages)s 页"
 
 #: bookwyrm/templates/book/book.html:86
 #, python-format
 msgid "Published %(date)s by %(publisher)s."
-msgstr ""
+msgstr "在 %(date)s 由 %(publisher)s 出版。"
 
 #: bookwyrm/templates/book/book.html:88
-#, fuzzy, python-format
-#| msgid "Published date:"
+#, python-format
 msgid "Published %(date)s"
-msgstr "出版时间:"
+msgstr "于 %(date)s 出版"
 
 #: bookwyrm/templates/book/book.html:90
 #, python-format
 msgid "Published by %(publisher)s."
-msgstr ""
+msgstr "由 %(publisher)s 出版。"
 
 #: bookwyrm/templates/book/book.html:95
 msgid "View on OpenLibrary"
@@ -162,7 +157,7 @@ msgstr "在 OpenLibrary 查看"
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
-msgstr[0] ""
+msgstr[0] "(%(review_count)s 则书评)"
 
 #: bookwyrm/templates/book/book.html:110
 msgid "Add Description"
@@ -201,22 +196,19 @@ msgid "Cancel"
 msgstr "�消"
 
 #: bookwyrm/templates/book/book.html:131
-#, fuzzy, python-format
-#| msgid "<a href=\"%(path)s\">%(title)s</a> by "
+#, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
-msgstr "<a href=\"%(path)s\">%(title)s</a> �自"
+msgstr "<a href=\"%(path)s/editions\">%(count)s 个版本</a>"
 
 #: bookwyrm/templates/book/book.html:139
-#, fuzzy, python-format
-#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+#, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
-msgstr "与 <a href=\"%(path)s\">%(username)s</a> �信"
+msgstr "此版本在你的 <a href=\"%(path)s\">%(shelf_name)s</a> 书架上。"
 
 #: bookwyrm/templates/book/book.html:145
-#, fuzzy, python-format
-#| msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+#, python-format
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
-msgstr " 添加了 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgstr "本书的 <a href=\"%(book_path)s\">�一个版本</a> 在你的 <a href=\"%(shelf_path)s\">%(shelf_name)s</a> 书架上。"
 
 #: bookwyrm/templates/book/book.html:154
 msgid "Your reading activity"
@@ -259,10 +251,8 @@ msgid "Lists"
 msgstr "列表"
 
 #: bookwyrm/templates/book/book.html:244
-#, fuzzy
-#| msgid "Go to list"
 msgid "Add to list"
-msgstr "�往列表"
+msgstr "添加到列表"
 
 #: bookwyrm/templates/book/book.html:254
 #: bookwyrm/templates/book/cover_modal.html:31
@@ -276,27 +266,22 @@ msgstr "评价了"
 
 #: bookwyrm/templates/book/cover_modal.html:17
 #: bookwyrm/templates/book/edit_book.html:163
-#, fuzzy
-#| msgid "Add cover"
 msgid "Upload cover:"
-msgstr "添加��"
+msgstr "上传��:"
 
 #: bookwyrm/templates/book/cover_modal.html:23
 #: bookwyrm/templates/book/edit_book.html:169
 msgid "Load cover from url:"
-msgstr ""
+msgstr "从网�加载��:"
 
 #: bookwyrm/templates/book/edit_book.html:5
 #: bookwyrm/templates/book/edit_book.html:11
-#, fuzzy, python-format
-#| msgid "Editions of %(book_title)s"
+#, python-format
 msgid "Edit \"%(book_title)s\""
-msgstr "%(book_title)s 的�版本"
+msgstr "编辑 \"%(book_title)s\""
 
 #: bookwyrm/templates/book/edit_book.html:5
 #: bookwyrm/templates/book/edit_book.html:13
-#, fuzzy
-#| msgid "Add Books"
 msgid "Add Book"
 msgstr "添加书目"
 
@@ -317,35 +302,34 @@ msgstr "最�编辑人:"
 
 #: bookwyrm/templates/book/edit_book.html:40
 msgid "Confirm Book Info"
-msgstr ""
+msgstr "确认书目信�"
 
 #: bookwyrm/templates/book/edit_book.html:47
 #, python-format
 msgid "Is \"%(name)s\" an existing author?"
-msgstr ""
+msgstr "\"%(name)s\" 是已存在的作者�？"
 
 #: bookwyrm/templates/book/edit_book.html:52
-#, fuzzy, python-format
-#| msgid "Start \"<em>%(book_title)s</em>\""
+#, python-format
 msgid "Author of <em>%(book_title)s</em>"
-msgstr "开始 \"<em>%(book_title)s</em>\""
+msgstr "<em>%(book_title)s</em> 的作者"
 
 #: bookwyrm/templates/book/edit_book.html:55
 msgid "This is a new author"
-msgstr ""
+msgstr "这是一�新的作者"
 
 #: bookwyrm/templates/book/edit_book.html:61
 #, python-format
 msgid "Creating a new author: %(name)s"
-msgstr ""
+msgstr "正在创建新的作者： %(name)s"
 
 #: bookwyrm/templates/book/edit_book.html:67
 msgid "Is this an edition of an existing work?"
-msgstr ""
+msgstr "这是已存在的作�的一个版本�？"
 
 #: bookwyrm/templates/book/edit_book.html:71
 msgid "This is a new work"
-msgstr ""
+msgstr "这是一个新的作�。"
 
 #: bookwyrm/templates/book/edit_book.html:77
 #: bookwyrm/templates/password_reset.html:30
@@ -379,14 +363,12 @@ msgid "Series number:"
 msgstr "系列编�:"
 
 #: bookwyrm/templates/book/edit_book.html:117
-#, fuzzy
-#| msgid "Published"
 msgid "Publisher:"
-msgstr "已出版"
+msgstr "出版社:"
 
 #: bookwyrm/templates/book/edit_book.html:119
 msgid "Separate multiple publishers with commas."
-msgstr ""
+msgstr "请用英文逗�(,)分开多个出版社。"
 
 #: bookwyrm/templates/book/edit_book.html:125
 msgid "First published date:"
@@ -397,26 +379,21 @@ msgid "Published date:"
 msgstr "出版时间:"
 
 #: bookwyrm/templates/book/edit_book.html:137
-#, fuzzy
-#| msgid "Author"
 msgid "Authors"
 msgstr "作者"
 
 #: bookwyrm/templates/book/edit_book.html:143
-#, fuzzy, python-format
-#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+#, python-format
 msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
-msgstr "与 <a href=\"%(path)s\">%(username)s</a> �信"
+msgstr "移除 <a href=\"%(path)s\">%(name)s</a>"
 
 #: bookwyrm/templates/book/edit_book.html:148
-#, fuzzy
-#| msgid "Edit Author"
 msgid "Add Authors:"
-msgstr "编辑作者"
+msgstr "添加作者:"
 
 #: bookwyrm/templates/book/edit_book.html:149
 msgid "John Doe, Jane Smith"
-msgstr ""
+msgstr "张三, �四"
 
 #: bookwyrm/templates/book/edit_book.html:155
 #: bookwyrm/templates/snippets/shelf.html:9
@@ -615,23 +592,19 @@ msgstr "现在这里还没有任何书目��试�从�索�本书开始�
 
 #: bookwyrm/templates/feed/feed_layout.html:23
 #: bookwyrm/templates/user/shelf.html:24
-#, fuzzy
-#| msgid "Read"
 msgid "To Read"
-msgstr "阅读"
+msgstr "想读"
 
 #: bookwyrm/templates/feed/feed_layout.html:24
 #: bookwyrm/templates/user/shelf.html:24
-#, fuzzy
-#| msgid "Start reading"
 msgid "Currently Reading"
-msgstr "开始阅读"
+msgstr "在读"
 
 #: bookwyrm/templates/feed/feed_layout.html:25
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
 #: bookwyrm/templates/user/shelf.html:24
 msgid "Read"
-msgstr "阅读"
+msgstr "读过"
 
 #: bookwyrm/templates/feed/feed_layout.html:76 bookwyrm/templates/goal.html:26
 #: bookwyrm/templates/snippets/goal_card.html:6
@@ -730,7 +703,7 @@ msgstr "加载失败"
 #: bookwyrm/templates/import_status.html:44
 #, python-format
 msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
-msgstr ""
+msgstr "跳转至列表底部�选� %(failed_count)s 个导入失败的项目。"
 
 #: bookwyrm/templates/import_status.html:79
 msgid "Select all"
@@ -837,7 +810,7 @@ msgstr "邀请"
 
 #: bookwyrm/templates/layout.html:118
 msgid "Admin"
-msgstr ""
+msgstr "管�员"
 
 #: bookwyrm/templates/layout.html:125
 msgid "Log out"
@@ -870,7 +843,7 @@ msgstr "登录"
 
 #: bookwyrm/templates/layout.html:168
 msgid "Join"
-msgstr ""
+msgstr "加入"
 
 #: bookwyrm/templates/layout.html:191
 msgid "About this server"
@@ -883,7 +856,7 @@ msgstr "�系站点管�员"
 #: bookwyrm/templates/layout.html:202
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
-msgstr ""
+msgstr "在 <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a> 上支� %(site_name)s"
 
 #: bookwyrm/templates/layout.html:206
 msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
@@ -895,16 +868,14 @@ msgid "Create List"
 msgstr "创建列表"
 
 #: bookwyrm/templates/lists/created_text.html:5
-#, fuzzy, python-format
-#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+#, python-format
 msgid "Created and curated by <a href=\"%(path)s\">%(username)s</a>"
-msgstr "与 <a href=\"%(path)s\">%(username)s</a> �信"
+msgstr "由 <a href=\"%(path)s\">%(username)s</a> 创建并策展"
 
 #: bookwyrm/templates/lists/created_text.html:7
-#, fuzzy, python-format
-#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+#, python-format
 msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
-msgstr "与 <a href=\"%(path)s\">%(username)s</a> �信"
+msgstr "由 <a href=\"%(path)s\">%(username)s</a> 创建"
 
 #: bookwyrm/templates/lists/curate.html:6
 msgid "Pending Books"
@@ -969,10 +940,9 @@ msgid "This list is currently empty"
 msgstr "此列表当�是空的"
 
 #: bookwyrm/templates/lists/list.html:35
-#, fuzzy, python-format
-#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+#, python-format
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
-msgstr "与 <a href=\"%(path)s\">%(username)s</a> �信"
+msgstr "由 <a href=\"%(user_path)s\">%(username)s</a> 添加"
 
 #: bookwyrm/templates/lists/list.html:41
 msgid "Remove"
@@ -1019,7 +989,7 @@ msgstr "你的列表"
 #, fuzzy, python-format
 #| msgid "See all %(size)s"
 msgid "See all %(size)s lists"
-msgstr "查看所有 %(size)s"
+msgstr "查看所有 %(size)s 大�的列表"
 
 #: bookwyrm/templates/lists/lists.html:40
 msgid "Recent Lists"
@@ -1047,23 +1017,19 @@ msgstr "关于本站点的更多"
 #: bookwyrm/templates/moderation/report_preview.html:6
 #, python-format
 msgid "Report #%(report_id)s: %(username)s"
-msgstr ""
+msgstr "报告 #%(report_id)s: %(username)s"
 
 #: bookwyrm/templates/moderation/report.html:10
 msgid "Back to reports"
-msgstr ""
+msgstr "回到报告"
 
 #: bookwyrm/templates/moderation/report.html:18
-#, fuzzy
-#| msgid "Notifications"
 msgid "Actions"
-msgstr "通知"
+msgstr "动作"
 
 #: bookwyrm/templates/moderation/report.html:19
-#, fuzzy
-#| msgid "User Profile"
 msgid "View user profile"
-msgstr "用户个人资料"
+msgstr "查看用户个人资料"
 
 #: bookwyrm/templates/moderation/report.html:22
 #: bookwyrm/templates/snippets/status/status_options.html:25
@@ -1073,15 +1039,15 @@ msgstr "���信"
 
 #: bookwyrm/templates/moderation/report.html:27
 msgid "Deactivate user"
-msgstr ""
+msgstr "�用用户"
 
 #: bookwyrm/templates/moderation/report.html:29
 msgid "Reactivate user"
-msgstr ""
+msgstr "�用用户"
 
 #: bookwyrm/templates/moderation/report.html:36
 msgid "Moderator Comments"
-msgstr ""
+msgstr "监察员评论"
 
 #: bookwyrm/templates/moderation/report.html:54
 #: bookwyrm/templates/snippets/create_status.html:12
@@ -1090,71 +1056,61 @@ msgid "Comment"
 msgstr "评论"
 
 #: bookwyrm/templates/moderation/report.html:59
-#, fuzzy
-#| msgid "Delete status"
 msgid "Reported statuses"
-msgstr "删除�文"
+msgstr "被报告的状�"
 
 #: bookwyrm/templates/moderation/report.html:61
 msgid "No statuses reported"
-msgstr ""
+msgstr "没有被报告的状�"
 
 #: bookwyrm/templates/moderation/report.html:67
 msgid "Statuses has been deleted"
-msgstr ""
+msgstr "状�已被删除"
 
 #: bookwyrm/templates/moderation/report_modal.html:6
-#, fuzzy, python-format
-#| msgid "Lists: %(username)s"
+#, python-format
 msgid "Report @%(username)s"
-msgstr "列表: %(username)s"
+msgstr "报告 %(username)s"
 
 #: bookwyrm/templates/moderation/report_modal.html:21
 #, python-format
 msgid "This report will be sent to %(site_name)s's moderators for review."
-msgstr ""
+msgstr "本报告会被��至 %(site_name)s 的监察员以�查。"
 
 #: bookwyrm/templates/moderation/report_modal.html:22
-#, fuzzy
-#| msgid "More about this site"
 msgid "More info about this report:"
-msgstr "关于本站点的更多"
+msgstr "关于本报告的更多信�"
 
 #: bookwyrm/templates/moderation/report_modal.html:31
 msgid "Submit"
-msgstr ""
+msgstr "�交"
 
 #: bookwyrm/templates/moderation/report_preview.html:13
 msgid "No notes provided"
-msgstr ""
+msgstr "没有�供摘记"
 
 #: bookwyrm/templates/moderation/report_preview.html:20
-#, fuzzy, python-format
-#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+#, python-format
 msgid "Reported by <a href=\"%(path)s\">%(username)s</a>"
-msgstr "与 <a href=\"%(path)s\">%(username)s</a> �信"
+msgstr "由 <a href=\"%(path)s\">%(username)s</a> 报告"
 
 #: bookwyrm/templates/moderation/report_preview.html:30
 msgid "Re-open"
-msgstr ""
+msgstr "�新开�"
 
 #: bookwyrm/templates/moderation/report_preview.html:32
 msgid "Resolve"
-msgstr ""
+msgstr "解决"
 
 #: bookwyrm/templates/moderation/reports.html:4
 #: bookwyrm/templates/moderation/reports.html:5
 #: bookwyrm/templates/settings/admin_layout.html:23
-#, fuzzy
-#| msgid "Recent Imports"
 msgid "Reports"
-msgstr "最近的导入"
+msgstr "报告"
 
 #: bookwyrm/templates/moderation/reports.html:14
-#, fuzzy
-#| msgid "Shelved"
 msgid "Resolved"
-msgstr "已上架"
+msgstr "已解决"
 
 #: bookwyrm/templates/notfound.html:4 bookwyrm/templates/notfound.html:8
 msgid "Not Found"
@@ -1274,7 +1230,7 @@ msgstr "你的 <a href=\"/import/%(related_id)s\">导入</a> 已完�。"
 #: bookwyrm/templates/notifications.html:113
 #, python-format
 msgid "A new <a href=\"%(path)s\">report</a> needs moderation."
-msgstr ""
+msgstr "有新的 <a href=\"%(path)s\">报告</a> 需�仲�。"
 
 #: bookwyrm/templates/notifications.html:139
 msgid "You're all caught up!"
@@ -1346,7 +1302,7 @@ msgstr "概�:"
 
 #: bookwyrm/templates/preferences/edit_user.html:46
 msgid "Show set reading goal prompt in feed:"
-msgstr ""
+msgstr "在消��中显示设置阅读目标的�示:"
 
 #: bookwyrm/templates/preferences/edit_user.html:52
 msgid "Manually approve followers:"
@@ -1384,7 +1340,7 @@ msgstr "没有找到 \"%(query)s\" 的用户"
 #: bookwyrm/templates/search_results.html:93
 #, python-format
 msgid "No lists found for \"%(query)s\""
-msgstr "没有找到 \"%(query)s\" 的�目"
+msgstr "没有找到 \"%(query)s\" 的列表"
 
 #: bookwyrm/templates/settings/admin_layout.html:4
 msgid "Administration"
@@ -1631,10 +1587,8 @@ msgid "Follow"
 msgstr "关注"
 
 #: bookwyrm/templates/snippets/follow_button.html:22
-#, fuzzy
-#| msgid "Send follow request"
 msgid "Undo follow request"
-msgstr "��关注请求"
+msgstr "撤回关注请求"
 
 #: bookwyrm/templates/snippets/follow_button.html:24
 msgid "Unfollow"
@@ -1651,11 +1605,10 @@ msgid_plural "set a goal to read %(counter)s books in %(year)s"
 msgstr[0] "设定了在 %(year)s 内�读 %(counter)s 书的目标"
 
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
-#, fuzzy, python-format
-#| msgid "<a href=\"%(path)s\">%(title)s</a> by "
+#, python-format
 msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(rating)s star"
 msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(rating)s stars"
-msgstr[0] "<a href=\"%(path)s\">%(title)s</a> �自"
+msgstr[0] "给 <em><a href=\"%(path)s\">%(title)s</a></em> 打了分: %(rating)s 星"
 
 #: bookwyrm/templates/snippets/goal_card.html:22
 msgid "Dismiss message"
@@ -1817,10 +1770,8 @@ msgid "Sign Up"
 msgstr "注册"
 
 #: bookwyrm/templates/snippets/report_button.html:5
-#, fuzzy
-#| msgid "Import"
 msgid "Report"
-msgstr "导入"
+msgstr "报告"
 
 #: bookwyrm/templates/snippets/rss_title.html:5
 #: bookwyrm/templates/snippets/status/status_header.html:11
@@ -1843,10 +1794,8 @@ msgid "quoted"
 msgstr "引用了"
 
 #: bookwyrm/templates/snippets/search_result_text.html:10
-#, fuzzy
-#| msgid "Add cover"
 msgid "No cover"
-msgstr "添加��"
+msgstr "没有��"
 
 #: bookwyrm/templates/snippets/search_result_text.html:22
 #, python-format
@@ -1959,28 +1908,24 @@ msgid "Open image in new window"
 msgstr "在新窗�中打开图�"
 
 #: bookwyrm/templates/snippets/status/status_header.html:22
-#, fuzzy, python-format
-#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+#, python-format
 msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">review</a>"
-msgstr "与 <a href=\"%(path)s\">%(username)s</a> �信"
+msgstr "回�了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">书评</a>"
 
 #: bookwyrm/templates/snippets/status/status_header.html:24
-#, fuzzy, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
+#, python-format
 msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">comment</a>"
-msgstr "<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">状�</a>"
+msgstr "��了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">评论</a>"
 
 #: bookwyrm/templates/snippets/status/status_header.html:26
-#, fuzzy, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
+#, python-format
 msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">quote</a>"
-msgstr "<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">状�</a>"
+msgstr "回�了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">引用</a>"
 
 #: bookwyrm/templates/snippets/status/status_header.html:28
-#, fuzzy, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
+#, python-format
 msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
-msgstr "<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">状�</a>"
+msgstr "回�了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">状�</a>"
 
 #: bookwyrm/templates/snippets/status/status_options.html:7
 #: bookwyrm/templates/snippets/user_options.html:7
@@ -2113,7 +2058,7 @@ msgstr "阅读目标"
 #: bookwyrm/templates/user/user_preview.html:13
 #, python-format
 msgid "Joined %(date)s"
-msgstr "已加入 %(date)s"
+msgstr "在 %(date)s 加入"
 
 #: bookwyrm/templates/user/user_preview.html:15
 #, python-format

From c4bb87ae318c6f9359d24f8339488f0a3d353bee Mon Sep 17 00:00:00 2001
From: GuDzpoz <GuDzpoz@live.com>
Date: Sat, 20 Mar 2021 10:44:32 +0800
Subject: [PATCH 0356/1285] Contextual fixes.

---
 locale/zh_CN/LC_MESSAGES/django.mo | Bin 30401 -> 30412 bytes
 locale/zh_CN/LC_MESSAGES/django.po |  14 +++++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
index 53738ad30f2f45f2e331c403d7d4ceaaa313ce13..3a9118667fc2c6fe54944adc17710ae9f428045c 100644
GIT binary patch
delta 3142
zcmXZeeQZu=7{~EbrCKkmvehtMv9&_l1!=^}EZuC_(xzzI@{B6V<F%+Rv+^t~*%&sd
z5i=rXY9<@&jOqTMjSvw=ri*NotVK3UO}bbjNcR0XKZ$(q>$=~r`#$G6oNkZ1&>nZB
zs#k1H5CmTo2f<S~q$CIi;~4CL5lq0S<4U{6Zgl?+Ok&&~=MQ2};$!Y_w&$@o`OEIV
zQ4++0G!h*oR6t5;xM8NvMir7{^K5~Q*r=_>(Trb@+1QBB;ce7GlBb8JqShTaJr*{G
zkx<2>-7&!fr#LRP6?P>)&G`3F2iS=^zzOV%7jXc#pf>J66?EV6&>7*rFT`kQ<FQUm
z#=gYGj+faQyTNWpUFAN<-#c!$EzbXi0~q%oj=|oMaKAUP4{>Zd4OO@lRrxB^)vU1_
zF_Cx&YTRDb#`TU*Vmk3@)Vx;IyYLSt<9*ZtlimvF_eG6ML&n8|;ZEe(JX?U;D1s_%
z8S0APMisKz{o7C{sYfl`h}!TRK7lQ$8@P#@7dJCJP~u~G{wXxN(9s_?Al+u77R<J}
zb|PwnB0C3F=yKG_-$%{c;`}bhU)x4|4tuhHaFvEOZo>?`jais7D?Gt?RDV9|N{dh@
zo`-MXJJ<`)pf+y76l`;R4>iA2nI8oz?u)S}X{6Ce#Zjn^$+pmz*jcEPSD+qA6{?^b
z)W(}o>+D43kJwYF8~O=#Lv5)3_A;KoenyW-q+#mpaG@NVhuWwByJ0b^z;e`rQCnj_
zMt#8Qa44QZ6?Vt@2dH^z<zaqAc`Qu4L_&oW;vigzgK-n8;%`tJ|KRwP<MWO$JN^|%
zF|O75)H&h2bks|jiQVxP)FUg1(a;IY>;hDUm8i<s+fPsh?6&)z{|X;}c$~lJ{8iMW
zYDH~)*Zn=_hU@l0trttDp@EsGLUP<O4t4TZQ7>CQ>PpK|3x0%}SC4u$$50ENLalSw
z@g;nnxW#eWys&`hLu0{68k#uX9j~Dlp6Ylu>SbAK*P_O6K^69?<1g(I%piXpb%WQP
z|J!!p5c2o25AR<vup<06k3e0087AOL)B>yR2dEp_X7@OM5EIBBvp?Eq)co_P8~era
zzo<tR%%@QH4^nCL!*Q5^#i)rhQ3Wl+EL@AanZwu>Poi$7$zH)J#I5)&<}3);DMGDV
zjygcp@k)$ogVi*&;b!|8s^WSafz7A|?z#V=O^Sy3RLrD*pq+sIiI<=X{t#8@c1*_u
zsQu1Hx&I^@KYPG+)JAtuh23+UxG>Boqh7XDOu|8^g@>c&<)RkOvjy0dID-5;6wE~x
zblP58=->bEBsB3ZYN1EA^P=!%-EkuMQ8)o>Y!m8PCN2)YA8DwY8|`>1jwfD>8h02U
zKQh!lS7J0&;Wa1zz#hbZ;^P~ziA%zG0IEM5bpyF}g7XD7g5BtkqBg3+p7^fafLbTE
zgN8QRkD72C^$l-AeG#u=26mt(^jjJ(n1PD3P(Q;LaVqBHGOWWa>`kC`Ubdx}OuPbT
zuz#?QhBmy8x~hAqg>x!H^K5~Q*eI&-YR4N;C*6*^ncX-I>+M5ZxSX}gAHW3t{(qyP
zXVZq7cpnQfenq%I5h^}}n)nbkZsf|az_D0DJjvGC2dMvYO{)q5{VTf#Rp35*2$R@9
zII0FV+B5bNaz(*4o3kp6x7v10rhig(xNs@z<txKntU;}N!Zu+XvHo1=Zw*01<eAFc
zxb)f!#YemB`tH`|x`uTnQ+veUIB~M}LGG}IPV=_L#os*sZEbBuW9Rf+pC4|>pFbrz
Lo<{B7>OublIh&pp

delta 3127
zcmXZedrX#P7{~F4IYB%C9-vGSPra56^FZYxZB$0iAW?=WrlO*FLPKPgv?q1B%+wWX
zMyAWmPBSws71t=|WI8Qf;+CzJmZdIoEZkiBN8caM&&_@A>$(ru_1w?<zIwVj?z`r=
zFDg^Q>L3U{oEikF*uRLsI1)Q!F~(z=<7KwmuJ`;lOk~}A&VPhmh!1-Hm_3Qz$e;E6
z??piv^dZqgLJg!$iweeUCaRGvn{D%Ku`RPJ@e$Uq!68_W1MwQ_L6W9NrlQX6Jw1#D
z_mfb^4}0QCFU)sbWJ_%Y-p%?D^#I#Z4{!(*@C^3CCRE`TR71BM4=Rr84hb2k@E9j1
z;9bOpj?3*T`<mT~y2{;-zjA!cHaUM4d$H~&j>4`pqIwgtJ8?LTfjV4@>bw$lHPv=K
zb|Bt{TDJ>Tc(3Cl*q8WQ)V@oo&%!^LjJHq^*x|Woe;R6CI<hVd20M{uvuz%#P%)~p
za?}-9p&EI^^EId^*^4^39#yarlduVO1An0Q1v8@uN@$b!pTeL$`JSi+88(JGFw>5<
zIj8~!b`Gl1<)|lLi`uu*`C7;OY`ty7F4PasGf?5n7{hCri7B(9Cm4sC&qZBn0qTk8
z;Y54^Q}8&da1(aL%Z^)7`{QQ&RiNTD40|w0XOM=&Q4<sFBs<m4L_K*a>XocOHM9y<
zcmwL3?Wp{I+km>EA5b@R88!d+Y~H`VMt4Z`!PJuIpe&n>DwKyEu@Kc@3F^QyyUK1t
z{eZoX_u+9=W6jS0huW7uC&~|<6Gn-#B-F?x?1u}nKW;#E{5h)dVaE-QPdYy9_#%#A
z-6iK!=SKT7P#?k=cEZO|uPiTQpeLMV7oa*^hU$Ec-Hd8rhyB3$PqFQX$N4kPpGUo_
zOQ^y(Jl|<vbZ$4)d0_?vEsUWW$@0Xbs3(5{^<m3JU1<sGz}Hdx_M%?RLDYc_sB=y@
z{vLCPn;fT?Mhy&%41-||v~ip##-k3N?07cn!?M)Aj9R}D)z}utAKU#HBmXt(27ht>
zx^2M$<ZoejK7T>)`O$ClP}J4W!g#De9q^)E=X?$7W@??^<NN`8*fx0n1nS0qbbJH#
z%I;u{`a!n^QDPLv6F-Y8T!?CDE@omC>Sp#}0)C0QnR<H)Clg=949qNx&dEicI~~<{
ziQ~l>sz3z;6@1mch3a@04#T6U1DZYGYU370`6L{~e5xIb_Yjw&8h!=U=qBuoJ5lu-
z7IOcI3{HE&1yrFwQH?b_4i-iE1k{Hu2@|m=>fiyWeIrl@kG46OKwN<QI~2@7HFU%_
zF7o%kiG(&@MICh0-a$QCyTw89G(LdivC`I~-es^P`u#{l-Q0tYC*oto^HA&dVB0H0
z)j1V1P>1K7_z61`|AuWhV1uPm+#NL^L*2j#JJ$IeTYw#zFF_Srf?aThU5z>?+{{3Q
zcAz%wNBxG^qka+3VGOUMHgqkI4(x-9??rtLhvO7{3YTFmW@1MIoiozrV>0m~ET(?&
z5(5>yfV!$?)WMm{BS+gDTVP92jh8!Kje62esGHe}1-Q$$+6m7G!9(PCV!Xcp=NahT
z{EXVzg86tGbwF-K6z@iDY(=dbydr8a3yX-eZLR$m^<S=MDubX0u0u8WuHB7^)DJ$<
z0PE~Gwh_6a;GE4|8O7`E6-;J6yDB<3ANAoY!jV{sI(MHvgmJ|B^DBR=3F>C_UOuMg
w%+v$zw;Z{$d3)X3qA8u*{dM%6n%iRr*R?BsGp^?C`A6#t7fepB`K+qn|KAyum;e9(

diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index 37acbbdf..19eb19e6 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -860,7 +860,7 @@ msgstr "在 <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>
 
 #: bookwyrm/templates/layout.html:206
 msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
-msgstr "BookWyrm 是开�软件。你�以在<a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> 贡献或报告问题。"
+msgstr "BookWyrm 是开�软件。你�以在 <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> 贡献或报告问题。"
 
 #: bookwyrm/templates/lists/create_form.html:5
 #: bookwyrm/templates/lists/lists.html:17
@@ -989,7 +989,7 @@ msgstr "你的列表"
 #, fuzzy, python-format
 #| msgid "See all %(size)s"
 msgid "See all %(size)s lists"
-msgstr "查看所有 %(size)s 大�的列表"
+msgstr "查看所有 %(size)s 个列表"
 
 #: bookwyrm/templates/lists/lists.html:40
 msgid "Recent Lists"
@@ -1100,7 +1100,7 @@ msgstr "�新开�"
 
 #: bookwyrm/templates/moderation/report_preview.html:32
 msgid "Resolve"
-msgstr "解决"
+msgstr "已解决"
 
 #: bookwyrm/templates/moderation/reports.html:4
 #: bookwyrm/templates/moderation/reports.html:5
@@ -1602,13 +1602,13 @@ msgstr "接�"
 #, python-format
 msgid "set a goal to read %(counter)s book in %(year)s"
 msgid_plural "set a goal to read %(counter)s books in %(year)s"
-msgstr[0] "设定了在 %(year)s 内�读 %(counter)s 书的目标"
+msgstr[0] "设定了在 %(year)s 内�读 %(counter)s 本书的目标"
 
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
 #, python-format
 msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(rating)s star"
 msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(rating)s stars"
-msgstr[0] "给 <em><a href=\"%(path)s\">%(title)s</a></em> 打了分: %(rating)s 星"
+msgstr[0] "为 <em><a href=\"%(path)s\">%(title)s</a></em> 打了分: %(rating)s 星"
 
 #: bookwyrm/templates/snippets/goal_card.html:22
 msgid "Dismiss message"
@@ -1840,7 +1840,7 @@ msgstr "删除书架"
 
 #: bookwyrm/templates/snippets/shelf_selector.html:4
 msgid "Change shelf"
-msgstr "改�书架"
+msgstr "更�书架"
 
 #: bookwyrm/templates/snippets/shelf_selector.html:27
 msgid "Unshelve"
@@ -2019,7 +2019,7 @@ msgstr "书架"
 #: bookwyrm/templates/user/user.html:31
 #, python-format
 msgid "See all %(size)s"
-msgstr "查看所有 %(size)s"
+msgstr "查看所有 %(size)s 本"
 
 #: bookwyrm/templates/user/user.html:44
 #, python-format

From f16f2526f38083e9d040ab77aebab7db31352ec9 Mon Sep 17 00:00:00 2001
From: GuDzpoz <GuDzpoz@live.com>
Date: Sat, 20 Mar 2021 10:51:14 +0800
Subject: [PATCH 0357/1285] Removed "fuzzy" tag.

---
 locale/zh_CN/LC_MESSAGES/django.mo | Bin 30412 -> 30507 bytes
 locale/zh_CN/LC_MESSAGES/django.po |   3 +--
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
index 3a9118667fc2c6fe54944adc17710ae9f428045c..9f83e170da5dc194e47c05a445012b5b47ecc85e 100644
GIT binary patch
delta 9806
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
T@9lrhUv+D9R&I~<i6#CI^M5;%

delta 9742
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
V4g^IP);w^e<K;#N4nI37;6LmE7P|ld

diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index 19eb19e6..aad277e0 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -986,8 +986,7 @@ msgid "Your lists"
 msgstr "你的列表"
 
 #: bookwyrm/templates/lists/lists.html:32
-#, fuzzy, python-format
-#| msgid "See all %(size)s"
+#, python-format
 msgid "See all %(size)s lists"
 msgstr "查看所有 %(size)s 个列表"
 

From 543dcbd592f2aee5f7764814c57bda1cadd4c528 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sat, 20 Mar 2021 15:30:48 +0100
Subject: [PATCH 0358/1285] Fix indentation in README.md.

---
 README.md | 74 +++++++++++++++++++++++++++----------------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/README.md b/README.md
index 345af77b..6487137c 100644
--- a/README.md
+++ b/README.md
@@ -234,12 +234,12 @@ Backups are named `backup__%Y-%m-%d.sql`.
 
 The db service has an optional script for periodically pruning the backups directory so that all recent daily backups are kept, but for older backups, only weekly or monthly backups are kept.
 To enable this script:
- - Uncomment the final line in `postgres-docker/cronfile`
- - rebuild your instance `docker-compose up --build`
+- Uncomment the final line in `postgres-docker/cronfile`
+- rebuild your instance `docker-compose up --build`
 
 You can copy backups from the backups volume to your host machine with `docker cp`:
- - Run `docker-compose ps` to confirm the db service's full name (it's probably `bookwyrm_db_1`.
- - Run `docker cp <container_name>:/backups <host machine path>`
+- Run `docker-compose ps` to confirm the db service's full name (it's probably `bookwyrm_db_1`.
+- Run `docker cp <container_name>:/backups <host machine path>`
 
 ### Port Conflicts
 
@@ -248,15 +248,15 @@ This means that, depending on what else you are running on your host machine, yo
 
 If this occurs, you will need to change your configuration to run services on different ports.
 This may require one or more changes the following files:
- - `docker-compose.yml`
- - `nginx/default.conf`
- - `.env` (You create this file yourself during setup)
+- `docker-compose.yml`
+- `nginx/default.conf`
+- `.env` (You create this file yourself during setup)
 
 E.g., If you need Redis to run on a different port:
- - In `docker-compose.yml`:
+- In `docker-compose.yml`:
     - In `services` -> `redis` -> `command`, add `--port YOUR_PORT` to the command
     - In `services` -> `redis` -> `ports`, change `6379:6379` to your port
- - In `.env`, update `REDIS_PORT`
+- In `.env`, update `REDIS_PORT`
 
 If you are already running a web-server on your machine, you will need to set up a reverse-proxy.
 
@@ -268,11 +268,11 @@ The default BookWyrm configuration already has an nginx server that proxies requ
 The static files are stored in a Docker volume that several BookWyrm services access, so it is not recommended to remove this server completely.
 
 To run BookWyrm behind a reverse-proxy, make the following changes:
- - In `nginx/default.conf`:
+- In `nginx/default.conf`:
     - Comment out the two default servers
     - Uncomment the server labeled Reverse-Proxy server
     - Replace `your-domain.com` with your domain name
- - In `docker-compose.yml`:
+- In `docker-compose.yml`:
     - In `services` -> `nginx` -> `ports`, comment out the default ports and add `- 8001:8001`
     - In `services` -> `nginx` -> `volumes`, comment out the two volumes that begin `./certbot/`
     - In `services`, comment out the `certbot` service
@@ -288,35 +288,35 @@ Before you can set up nginx, you will need to locate your nginx configuration di
 See [nginx's guide](http://nginx.org/en/docs/beginners_guide.html) for details.
 
 To set up your server:
- - In you `nginx.conf` file, ensure that `include servers/*;` isn't commented out.
- - In your nginx `servers` directory, create a new file named after your domain containing the following information:
-   ```nginx
-   server {
-      server_name your-domain.com www.your-domain.com;
+- In you `nginx.conf` file, ensure that `include servers/*;` isn't commented out.
+- In your nginx `servers` directory, create a new file named after your domain containing the following information:
+    ```nginx
+    server {
+        server_name your-domain.com www.your-domain.com;
 
-      location / {
-          proxy_pass http://localhost:8000;
-          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-          proxy_set_header Host $host;
-      }
+        location / {
+            proxy_pass http://localhost:8000;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header Host $host;
+        }
 
-      location /images/ {
-          proxy_pass http://localhost:8001;
-          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-          proxy_set_header Host $host;
-      }
+        location /images/ {
+            proxy_pass http://localhost:8001;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header Host $host;
+        }
 
-      location /static/ {
-          proxy_pass http://localhost:8001;
-          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-          proxy_set_header Host $host;
-      }
+        location /static/ {
+            proxy_pass http://localhost:8001;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header Host $host;
+        }
 
-      listen [::]:80 ssl;
-      listen 80 ssl;
-   }
-   ```
- - run `sudo certbot run --nginx --email YOUR_EMAIL -d your-domain.com -d www.your-domain.com`
- - restart nginx
+        listen [::]:80 ssl;
+        listen 80 ssl;
+    }
+    ```
+- run `sudo certbot run --nginx --email YOUR_EMAIL -d your-domain.com -d www.your-domain.com`
+- restart nginx
 
 If everything worked correctly, your BookWyrm instance should now be externally accessible.

From 4a7c0cd18430e8e3c92de47c2a87064336cf6f27 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sat, 20 Mar 2021 15:36:25 +0100
Subject: [PATCH 0359/1285] Fix indentation in
 bookwyrm/tests/data/ol_isbn_search.json.

---
 bookwyrm/tests/data/ol_isbn_search.json | 86 ++++++++++++-------------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/bookwyrm/tests/data/ol_isbn_search.json b/bookwyrm/tests/data/ol_isbn_search.json
index 8516ff06..62561b18 100644
--- a/bookwyrm/tests/data/ol_isbn_search.json
+++ b/bookwyrm/tests/data/ol_isbn_search.json
@@ -1,45 +1,45 @@
 {
-  "ISBN:9782070427796": {
-    "url": "https://openlibrary.org/books/OL16262504M/Les_ombres_errantes",
-    "key": "/books/OL16262504M",
-    "title": "Les ombres errantes",
-    "authors": [
-      {
-        "url": "https://openlibrary.org/authors/OL269675A/Pascal_Quignard",
-        "name": "Pascal Quignard"
-      }
-    ],
-    "by_statement": "Pascal Quignard.",
-    "identifiers": {
-      "goodreads": [
-        "1835483"
-      ],
-      "librarything": [
-        "983474"
-      ],
-      "isbn_10": [
-        "207042779X"
-      ],
-      "openlibrary": [
-        "OL16262504M"
-      ]
-    },
-    "classifications": {
-      "dewey_decimal_class": [
-        "848/.91403"
-      ]
-    },
-    "publishers": [
-      {
-        "name": "Gallimard"
-      }
-    ],
-    "publish_places": [
-      {
-        "name": "Paris"
-      }
-    ],
-    "publish_date": "2002",
-    "notes": "Hardback published Grasset, 2002."
-  }
+    "ISBN:9782070427796": {
+        "url": "https://openlibrary.org/books/OL16262504M/Les_ombres_errantes",
+        "key": "/books/OL16262504M",
+        "title": "Les ombres errantes",
+        "authors": [
+            {
+                "url": "https://openlibrary.org/authors/OL269675A/Pascal_Quignard",
+                "name": "Pascal Quignard"
+            }
+        ],
+        "by_statement": "Pascal Quignard.",
+        "identifiers": {
+            "goodreads": [
+                "1835483"
+            ],
+            "librarything": [
+                "983474"
+            ],
+            "isbn_10": [
+                "207042779X"
+            ],
+            "openlibrary": [
+                "OL16262504M"
+            ]
+        },
+        "classifications": {
+            "dewey_decimal_class": [
+                "848/.91403"
+            ]
+        },
+        "publishers": [
+            {
+                "name": "Gallimard"
+            }
+        ],
+        "publish_places": [
+            {
+                "name": "Paris"
+            }
+        ],
+        "publish_date": "2002",
+        "notes": "Hardback published Grasset, 2002."
+    }
 }

From e3cd09930b4f39ae5fa85d0a0fe5899482aa9ef9 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sat, 20 Mar 2021 16:00:37 +0100
Subject: [PATCH 0360/1285] [lint] Exclude JS vendor file and show all errors.

---
 .github/workflows/linters-global.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/linters-global.yaml b/.github/workflows/linters-global.yaml
index b815ba62..44127906 100644
--- a/.github/workflows/linters-global.yaml
+++ b/.github/workflows/linters-global.yaml
@@ -19,3 +19,5 @@ jobs:
 
       - name: EditorConfig lint
         uses: greut/eclint-action@v0
+        with:
+          args: '-show_all_errors -exclude static/js/tabs.js'

From 3ff336b10422779c5c32088e0fedd76dd0c430bf Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sat, 20 Mar 2021 16:08:47 +0100
Subject: [PATCH 0361/1285] Use the file on mouse-reeve/bookwyrm, verbatim.

---
 bookwyrm/activitypub/response.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bookwyrm/activitypub/response.py b/bookwyrm/activitypub/response.py
index a3c699b9..07f39c7e 100644
--- a/bookwyrm/activitypub/response.py
+++ b/bookwyrm/activitypub/response.py
@@ -2,6 +2,7 @@ from django.http import JsonResponse
 
 from .base_activity import ActivityEncoder
 
+
 class ActivitypubResponse(JsonResponse):
     """
     A class to be used in any place that's serializing responses for

From e81ae2df9bb6609c3a8cd1c42235c227626f3e7e Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sat, 20 Mar 2021 16:13:19 +0100
Subject: [PATCH 0362/1285] Rename linters to be less ambiguous.

---
 .github/workflows/black.yml           | 2 +-
 .github/workflows/linters-global.yaml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml
index de770cce..afa9cf2b 100644
--- a/.github/workflows/black.yml
+++ b/.github/workflows/black.yml
@@ -1,4 +1,4 @@
-name: Lint
+name: Lint Python
 
 on: [push, pull_request]
 
diff --git a/.github/workflows/linters-global.yaml b/.github/workflows/linters-global.yaml
index 44127906..c4a62f00 100644
--- a/.github/workflows/linters-global.yaml
+++ b/.github/workflows/linters-global.yaml
@@ -1,5 +1,5 @@
 # @url https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
-name: Global Linters
+name: Lint Project
 
 on:
   push:
@@ -20,4 +20,4 @@ jobs:
       - name: EditorConfig lint
         uses: greut/eclint-action@v0
         with:
-          args: '-show_all_errors -exclude static/js/tabs.js'
+          args: '-show_all_errors -exclude bookwyrm/static/js/tabs.js'

From 5c5fc981180322c8eab67ddf96507ae18f6bbf8b Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sat, 20 Mar 2021 16:19:20 +0100
Subject: [PATCH 0363/1285] [lint] Trying out new syntax for vendor file.

---
 .github/workflows/linters-global.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/linters-global.yaml b/.github/workflows/linters-global.yaml
index c4a62f00..52abb12c 100644
--- a/.github/workflows/linters-global.yaml
+++ b/.github/workflows/linters-global.yaml
@@ -17,7 +17,7 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
 
-      - name: EditorConfig lint
+      - name: EditorConfig
         uses: greut/eclint-action@v0
         with:
-          args: '-show_all_errors -exclude bookwyrm/static/js/tabs.js'
+          args: '-show_all_errors -exclude "bookwyrm/static/js/tabs.js"'

From fa79070b5978924388b47ecadaf65c952b0bf7b2 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sat, 20 Mar 2021 16:33:18 +0100
Subject: [PATCH 0364/1285] [lint] Update editorconfig linting:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Add settings for comments.
- Remove custom settings that don’t work.
- Fix vendor JS file:
---
 .editorconfig                         | 5 +++++
 .github/workflows/linters-global.yaml | 2 --
 bookwyrm/static/js/tabs.js            | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 112b22d6..c03185f9 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,6 +12,11 @@ indent_style = space
 insert_final_newline = true
 max_line_length = 100
 
+# C-style doc comments
+block_comment_start = /*
+block_comment = *
+block_comment_end = */
+
 [{bw-dev,fr-dev,LICENSE}]
 max_line_length = off
 
diff --git a/.github/workflows/linters-global.yaml b/.github/workflows/linters-global.yaml
index 52abb12c..291125c7 100644
--- a/.github/workflows/linters-global.yaml
+++ b/.github/workflows/linters-global.yaml
@@ -19,5 +19,3 @@ jobs:
 
       - name: EditorConfig
         uses: greut/eclint-action@v0
-        with:
-          args: '-show_all_errors -exclude "bookwyrm/static/js/tabs.js"'
diff --git a/bookwyrm/static/js/tabs.js b/bookwyrm/static/js/tabs.js
index 1cb525ce..59c07251 100644
--- a/bookwyrm/static/js/tabs.js
+++ b/bookwyrm/static/js/tabs.js
@@ -59,7 +59,9 @@ class TabGroup {
     }
 
     initPanels() {
-        let selectedPanelId = this.tablist.querySelector('[role="tab"][aria-selected="true"]').getAttribute("aria-controls");
+        let selectedPanelId = this.tablist
+            .querySelector('[role="tab"][aria-selected="true"]')
+            .getAttribute("aria-controls");
         for(let panel of this.panels) {
             if(panel.getAttribute("id") !== selectedPanelId) {
                 panel.setAttribute("hidden", "");

From 00ed5ecccbc04ca02e648b9a2de88169ae277e66 Mon Sep 17 00:00:00 2001
From: Lasse Petersen <git@lapete.de>
Date: Sat, 20 Mar 2021 20:12:55 +0100
Subject: [PATCH 0365/1285] Translations for Moderation

---
 locale/de_DE/LC_MESSAGES/django.po | 54 +++++++++++++++---------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index ff3b0fdd..d02973f8 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -73,7 +73,7 @@ msgstr "Deutsch"
 
 #: bookwyrm/settings.py:144
 msgid "Spanish"
-msgstr ""
+msgstr "Spanisch"
 
 #: bookwyrm/settings.py:145
 msgid "French"
@@ -139,7 +139,7 @@ msgstr "%(pages)s Seiten"
 #: bookwyrm/templates/book/book.html:86
 #, python-format
 msgid "Published %(date)s by %(publisher)s."
-msgstr ""
+msgstr "Am %(date)s von %(publisher)s veröffentlicht."
 
 #: bookwyrm/templates/book/book.html:88
 #, fuzzy, python-format
@@ -150,7 +150,7 @@ msgstr "Veröffentlichungsdatum:"
 #: bookwyrm/templates/book/book.html:90
 #, python-format
 msgid "Published by %(publisher)s."
-msgstr ""
+msgstr "Veröffentlicht von %(publisher)s."
 
 #: bookwyrm/templates/book/book.html:95
 msgid "View on OpenLibrary"
@@ -283,7 +283,7 @@ msgstr "Cover hinzufügen"
 #: bookwyrm/templates/book/cover_modal.html:23
 #: bookwyrm/templates/book/edit_book.html:169
 msgid "Load cover from url:"
-msgstr ""
+msgstr "Cover von URL laden:"
 
 #: bookwyrm/templates/book/edit_book.html:5
 #: bookwyrm/templates/book/edit_book.html:11
@@ -316,12 +316,12 @@ msgstr "Zuletzt bearbeitet von:"
 
 #: bookwyrm/templates/book/edit_book.html:40
 msgid "Confirm Book Info"
-msgstr ""
+msgstr "Buchinfo bestätigen"
 
 #: bookwyrm/templates/book/edit_book.html:47
 #, python-format
 msgid "Is \"%(name)s\" an existing author?"
-msgstr ""
+msgstr "Existiert \"%(name)s\" bereits als Autor:in?"
 
 #: bookwyrm/templates/book/edit_book.html:52
 #, fuzzy, python-format
@@ -331,20 +331,20 @@ msgstr "\"<em>%(book_title)s</em>\" beginnen"
 
 #: bookwyrm/templates/book/edit_book.html:55
 msgid "This is a new author"
-msgstr ""
+msgstr "Neue:r Autor:in"
 
 #: bookwyrm/templates/book/edit_book.html:61
 #, python-format
 msgid "Creating a new author: %(name)s"
-msgstr ""
+msgstr "Neu als Autor:in erstellen: %(name)s"
 
 #: bookwyrm/templates/book/edit_book.html:67
 msgid "Is this an edition of an existing work?"
-msgstr ""
+msgstr "Ist das eine Edition eines vorhandenen Werkes?"
 
 #: bookwyrm/templates/book/edit_book.html:71
 msgid "This is a new work"
-msgstr ""
+msgstr "Dies ist ein neues Werk."
 
 #: bookwyrm/templates/book/edit_book.html:77
 #: bookwyrm/templates/password_reset.html:30
@@ -385,7 +385,7 @@ msgstr "Veröffentlicht"
 
 #: bookwyrm/templates/book/edit_book.html:119
 msgid "Separate multiple publishers with commas."
-msgstr ""
+msgstr "Mehrere Herausgeber:innen durch Kommata trennen"
 
 #: bookwyrm/templates/book/edit_book.html:125
 msgid "First published date:"
@@ -729,7 +729,7 @@ msgstr "Laden fehlgeschlagen"
 #: bookwyrm/templates/import_status.html:44
 #, python-format
 msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
-msgstr ""
+msgstr "Zum Ende der Liste springen, um die %(failed_count)s Einträge, deren Import fehlschlug, auszuwählen."
 
 #: bookwyrm/templates/import_status.html:79
 msgid "Select all"
@@ -882,7 +882,7 @@ msgstr "Admin kontaktieren"
 #: bookwyrm/templates/layout.html:202
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
-msgstr ""
+msgstr "%(site_name)s auf <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a> unterstützen"
 
 #: bookwyrm/templates/layout.html:206
 msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
@@ -1046,11 +1046,11 @@ msgstr "Mehr über diese Seite"
 #: bookwyrm/templates/moderation/report_preview.html:6
 #, python-format
 msgid "Report #%(report_id)s: %(username)s"
-msgstr ""
+msgstr "Meldung #%(report_id)s: %(username)s"
 
 #: bookwyrm/templates/moderation/report.html:10
 msgid "Back to reports"
-msgstr ""
+msgstr "Zurück zu den Meldungen"
 
 #: bookwyrm/templates/moderation/report.html:18
 #, fuzzy
@@ -1072,15 +1072,15 @@ msgstr "Direktnachricht senden"
 
 #: bookwyrm/templates/moderation/report.html:27
 msgid "Deactivate user"
-msgstr ""
+msgstr "Nutzer:in deaktivieren"
 
 #: bookwyrm/templates/moderation/report.html:29
 msgid "Reactivate user"
-msgstr ""
+msgstr "Nutzer:in reaktivieren"
 
 #: bookwyrm/templates/moderation/report.html:36
 msgid "Moderator Comments"
-msgstr ""
+msgstr "Moderator:innenkommentare"
 
 #: bookwyrm/templates/moderation/report.html:54
 #: bookwyrm/templates/snippets/create_status.html:12
@@ -1096,11 +1096,11 @@ msgstr "Post löschen"
 
 #: bookwyrm/templates/moderation/report.html:61
 msgid "No statuses reported"
-msgstr ""
+msgstr "Keine Beiträge gemeldet"
 
 #: bookwyrm/templates/moderation/report.html:67
 msgid "Statuses has been deleted"
-msgstr ""
+msgstr "Beiträge wurden gelöscht"
 
 #: bookwyrm/templates/moderation/report_modal.html:6
 #, fuzzy, python-format
@@ -1111,7 +1111,7 @@ msgstr "Listen: %(username)s"
 #: bookwyrm/templates/moderation/report_modal.html:21
 #, python-format
 msgid "This report will be sent to %(site_name)s's moderators for review."
-msgstr ""
+msgstr "Diese Meldung wird an die Moderator:innen von %(site_name)s weitergeletiet."
 
 #: bookwyrm/templates/moderation/report_modal.html:22
 #, fuzzy
@@ -1121,11 +1121,11 @@ msgstr "Mehr über diese Seite"
 
 #: bookwyrm/templates/moderation/report_modal.html:31
 msgid "Submit"
-msgstr ""
+msgstr "Absenden"
 
 #: bookwyrm/templates/moderation/report_preview.html:13
 msgid "No notes provided"
-msgstr ""
+msgstr "Keine Notizen angegeben."
 
 #: bookwyrm/templates/moderation/report_preview.html:20
 #, fuzzy, python-format
@@ -1135,11 +1135,11 @@ msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/moderation/report_preview.html:30
 msgid "Re-open"
-msgstr ""
+msgstr "Wiedereröffnen"
 
 #: bookwyrm/templates/moderation/report_preview.html:32
 msgid "Resolve"
-msgstr ""
+msgstr "Lösen"
 
 #: bookwyrm/templates/moderation/reports.html:4
 #: bookwyrm/templates/moderation/reports.html:5
@@ -1273,7 +1273,7 @@ msgstr "Dein <a href=\"/import/%(related_id)s\">Import</a> ist abgeschlossen."
 #: bookwyrm/templates/notifications.html:113
 #, python-format
 msgid "A new <a href=\"%(path)s\">report</a> needs moderation."
-msgstr ""
+msgstr "Eine neue <a href=\"%(path)s\">Meldung</a> muss moderiert werden."
 
 #: bookwyrm/templates/notifications.html:139
 msgid "You're all caught up!"
@@ -1345,7 +1345,7 @@ msgstr "Bio:"
 
 #: bookwyrm/templates/preferences/edit_user.html:46
 msgid "Show set reading goal prompt in feed:"
-msgstr ""
+msgstr "Angegebenes Leseziel im Feed anzeigen."
 
 #: bookwyrm/templates/preferences/edit_user.html:52
 msgid "Manually approve followers:"

From 942c4a666449180c084934a1404364bb96570f06 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 20 Mar 2021 17:18:18 -0700
Subject: [PATCH 0366/1285] Move progress updates into modal

---
 bookwyrm/models/readthrough.py                |  3 ++
 bookwyrm/static/css/format.css                |  3 --
 bookwyrm/templates/feed/feed_layout.html      | 14 +++----
 .../snippets/create_status_form.html          | 39 ++++++++++++++++-
 .../templates/snippets/progress_update.html   | 28 -------------
 .../shelve_button/progress_update_modal.html  | 42 +++++++++++++++++++
 .../snippets/shelve_button/shelve_button.html |  4 +-
 .../shelve_button/shelve_button_options.html  |  8 ++++
 bookwyrm/urls.py                              |  2 +-
 9 files changed, 101 insertions(+), 42 deletions(-)
 delete mode 100644 bookwyrm/templates/snippets/progress_update.html
 create mode 100644 bookwyrm/templates/snippets/shelve_button/progress_update_modal.html

diff --git a/bookwyrm/models/readthrough.py b/bookwyrm/models/readthrough.py
index 3445573c..b76b9022 100644
--- a/bookwyrm/models/readthrough.py
+++ b/bookwyrm/models/readthrough.py
@@ -7,6 +7,7 @@ from .base_model import BookWyrmModel
 
 
 class ProgressMode(models.TextChoices):
+    """ types of prgress available """
     PAGE = "PG", "page"
     PERCENT = "PCT", "percent"
 
@@ -32,10 +33,12 @@ class ReadThrough(BookWyrmModel):
         super().save(*args, **kwargs)
 
     def create_update(self):
+        """ add update to the readthrough """
         if self.progress:
             return self.progressupdate_set.create(
                 user=self.user, progress=self.progress, mode=self.progress_mode
             )
+        return None
 
 
 class ProgressUpdate(BookWyrmModel):
diff --git a/bookwyrm/static/css/format.css b/bookwyrm/static/css/format.css
index 435d8eb9..05451e16 100644
--- a/bookwyrm/static/css/format.css
+++ b/bookwyrm/static/css/format.css
@@ -14,9 +14,6 @@ html {
 .card {
     overflow: visible;
 }
-.card-header-title {
-    overflow: hidden;
-}
 
 /* --- SHELVING --- */
 .shelf-option:disabled > *::after {
diff --git a/bookwyrm/templates/feed/feed_layout.html b/bookwyrm/templates/feed/feed_layout.html
index 24294e5d..6ed696a1 100644
--- a/bookwyrm/templates/feed/feed_layout.html
+++ b/bookwyrm/templates/feed/feed_layout.html
@@ -47,20 +47,18 @@
             {% for book in shelf.books %}
             <div class="suggested-tabs card" role="tabpanel" id="book-{{ book.id }}"{% if shelf_counter != 1 or not forloop.first %} hidden{% endif %} aria-labelledby="tab-book-{{ book.id }}">
                 <div class="card-header">
-                    <p class="card-header-title">
-                        <span>{% include 'snippets/book_titleby.html' with book=book %}</span>
-                    </p>
+                    <div class="card-header-title">
+                        <div>
+                            <p class="mb-2">{% include 'snippets/book_titleby.html' with book=book %}</p>
+                            {% include 'snippets/shelve_button/shelve_button.html' with book=book %}
+                        </div>
+                    </div>
                     <div class="card-header-icon is-hidden-tablet">
                         {% trans "Close" as button_text %}
                         {% include 'snippets/toggle/toggle_button.html' with label=button_text controls_text="book" controls_uid=book.id class="delete" nonbutton=True pressed=True %}
                     </div>
                 </div>
                 <div class="card-content">
-                {% include 'snippets/shelve_button/shelve_button.html' with book=book %}
-                {% active_shelf book as active_shelf %}
-                {% if active_shelf.shelf.identifier == 'reading' and book.latest_readthrough %}
-                {% include 'snippets/progress_update.html' with readthrough=book.latest_readthrough %}
-                {% endif %}
                 {% include 'snippets/create_status.html' with book=book %}
                 </div>
             </div>
diff --git a/bookwyrm/templates/snippets/create_status_form.html b/bookwyrm/templates/snippets/create_status_form.html
index 187eae60..d0b763bf 100644
--- a/bookwyrm/templates/snippets/create_status_form.html
+++ b/bookwyrm/templates/snippets/create_status_form.html
@@ -13,7 +13,15 @@
     {% endif %}
     <div class="control">
         {% if type != 'reply' and type != 'direct'  %}
-        <label class="label" for="id_{% if type == 'quotation' %}quote{% else %}content{% endif %}_{{ book.id }}_{{ type }}">{{ type|title }}:</label>
+        <label class="label" for="id_{% if type == 'quotation' %}quote{% else %}content{% endif %}_{{ book.id }}_{{ type }}">
+            {% if type == 'comment' %}
+            {% trans "Comment:" %}
+            {% elif type == 'quotation' %}
+            {% trans "Quote:" %}
+            {% elif type == 'review' %}
+            {% trans "Review:" %}
+            {% endif %}
+        </label>
         {% endif %}
 
         {% if type == 'review' %}
@@ -45,6 +53,35 @@
         {% include 'snippets/content_warning_field.html' with parent_status=status %}
         <textarea name="content" class="textarea is-small" id="id_content_quote-{{ book.id }}"></textarea>
     </div>
+    {% elif type == 'comment' %}
+    <div class="control">
+        {% active_shelf book as active_shelf %}
+        {% if active_shelf.shelf.identifier == 'reading' and book.latest_readthrough %}
+
+        {% with readthrough=book.latest_readthrough %}
+        <div class="field">
+            <label class="label" for="progress">{% trans "Progress:" %}</label>
+            <div class="field has-addons mb-0">
+                <div class="control">
+                    <input
+                     aria-label="{% if readthrough.progress_mode == 'PG' %}Current page{% else %}Percent read{% endif %}"
+                     class="input" type="number" min="0"
+                     name="progress" size="3" value="{{ readthrough.progress|default:'' }}">
+                </div>
+                <div class="control select">
+                    <select name="progress_mode" aria-label="Progress mode">
+                        <option value="PG" {% if readthrough.progress_mode == 'PG' %}selected{% endif %}>{% trans "pages" %}</option>
+                        <option value="PCT" {% if readthrough.progress_mode == 'PCT' %}selected{% endif %}>{% trans "percent" %}</option>
+                    </select>
+                </div>
+            </div>
+            {% if readthrough.progress_mode == 'PG' and book.pages %}
+            <p class="help">{% blocktrans with pages=book.pages %}of {{ pages }} pages{% endblocktrans %}</p>
+            {% endif %}
+        </div>
+        {% endwith %}
+        {% endif %}
+    </div>
     {% endif %}
     <input type="checkbox" class="hidden" name="sensitive" id="id_show_spoilers-{{ uuid }}" {% if status.content_warning %}checked{% endif %} aria-hidden="true">
     {# bottom bar #}
diff --git a/bookwyrm/templates/snippets/progress_update.html b/bookwyrm/templates/snippets/progress_update.html
deleted file mode 100644
index cb709625..00000000
--- a/bookwyrm/templates/snippets/progress_update.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{% load i18n %}
-<form class="field is-grouped is-small" action="/edit-readthrough" method="POST">
-    {% csrf_token %}
-    <input type="hidden" name="id" value="{{ readthrough.id }}"/>
-    <div class="field">
-        <label class="label is-align-self-center mb-0 pr-2" for="progress">{% trans "Progress:" %}</label>
-        <div class="field has-addons mb-0">
-            <div class="control">
-                <input
-                 aria-label="{% if readthrough.progress_mode == 'PG' %}Current page{% else %}Percent read{% endif %}"
-                 class="input is-small" type="number" min="0"
-                 name="progress" size="3" value="{{ readthrough.progress|default:'' }}">
-            </div>
-            <div class="control select is-small">
-                <select name="progress_mode" aria-label="Progress mode">
-                    <option value="PG" {% if readthrough.progress_mode == 'PG' %}selected{% endif %}>{% trans "pages" %}</option>
-                    <option value="PCT" {% if readthrough.progress_mode == 'PCT' %}selected{% endif %}>{% trans "percent" %}</option>
-                </select>
-            </div>
-            <div class="control">
-                <button class="button is-small px-2 is-primary" type="submit">{% trans "Save" %}</button>
-            </div>
-        </div>
-        {% if readthrough.progress_mode == 'PG' and book.pages %}
-        <p class="help">{% blocktrans with pages=book.pages %}of {{ pages }} pages{% endblocktrans %}</p>
-        {% endif %}
-    </div>
-</form>
diff --git a/bookwyrm/templates/snippets/shelve_button/progress_update_modal.html b/bookwyrm/templates/snippets/shelve_button/progress_update_modal.html
new file mode 100644
index 00000000..5879264b
--- /dev/null
+++ b/bookwyrm/templates/snippets/shelve_button/progress_update_modal.html
@@ -0,0 +1,42 @@
+{% extends 'components/modal.html' %}
+{% load i18n %}
+
+{% block modal-title %}
+{% trans "Update progress" %}
+{% endblock %}
+
+{% block modal-form-open %}
+<form action="{% url 'edit-readthrough' %}" method="POST">
+{% endblock %}
+
+{% block modal-body %}
+{% csrf_token %}
+<input type="hidden" name="id" value="{{ readthrough.id }}"/>
+<div class="field">
+    <label class="label is-align-self-center mb-0 pr-2" for="progress">{% trans "Progress:" %}</label>
+    <div class="field has-addons mb-0">
+        <div class="control">
+            <input
+             aria-label="{% if readthrough.progress_mode == 'PG' %}Current page{% else %}Percent read{% endif %}"
+             class="input" type="number" min="0"
+             name="progress" size="3" value="{{ readthrough.progress|default:'' }}">
+        </div>
+        <div class="control select">
+            <select name="progress_mode" aria-label="Progress mode">
+                <option value="PG" {% if readthrough.progress_mode == 'PG' %}selected{% endif %}>{% trans "pages" %}</option>
+                <option value="PCT" {% if readthrough.progress_mode == 'PCT' %}selected{% endif %}>{% trans "percent" %}</option>
+            </select>
+        </div>
+    </div>
+    {% if readthrough.progress_mode == 'PG' and book.pages %}
+    <p class="help">{% blocktrans with pages=book.pages %}of {{ pages }} pages{% endblocktrans %}</p>
+    {% endif %}
+</div>
+{% endblock %}
+
+{% block modal-footer %}
+<button class="button is-success" type="submit">{% trans "Save" %}</button>
+{% trans "Cancel" as button_text %}
+{% include 'snippets/toggle/toggle_button.html' with text=button_text %}
+{% endblock %}
+{% block modal-form-close %}</form>{% endblock %}
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button.html b/bookwyrm/templates/snippets/shelve_button/shelve_button.html
index 5f6ed8d2..586d7d9d 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button.html
@@ -3,7 +3,7 @@
 
 {% with book.id|uuid as uuid %}
 {% active_shelf book as active_shelf %}
-<div class="field has-addons">
+<div class="field has-addons mb-0">
     {% if switch_mode and active_shelf.book != book %}
     <div class="control">
         {% include 'snippets/switch_edition_button.html' with edition=book size='is-small' %}
@@ -23,5 +23,7 @@
 {% latest_read_through book request.user as readthrough %}
 {% include 'snippets/shelve_button/finish_reading_modal.html' with book=active_shelf.book controls_text="finish-reading" controls_uid=uuid readthrough=readthrough %}
 
+{% include 'snippets/shelve_button/progress_update_modal.html' with book=shelf_book.book controls_text="progress-update" controls_uid=uuid readthrough=readthrough %}
+
 {% endwith %}
 {% endif %}
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
index d6fdb13b..56783b2c 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
@@ -27,3 +27,11 @@
     </div>
 {% if dropdown %}</li>{% endif %}
 {% endfor %}
+{% if dropdown %}
+<li role="menuitem">
+    <div class="dropdown-item pt-0 pb-0">
+        {% trans "Update progress" as button_text %}
+        {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="progress-update" controls_uid=button_uuid focus="modal-title-progress-update" %}
+    </div>
+</li>
+{% endif %}
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 44492668..c24b83f7 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -183,7 +183,7 @@ urlpatterns = [
     re_path(r"^shelve/?$", views.shelve),
     re_path(r"^unshelve/?$", views.unshelve),
     # reading progress
-    re_path(r"^edit-readthrough/?$", views.edit_readthrough),
+    re_path(r"^edit-readthrough/?$", views.edit_readthrough, name="edit-readthrough"),
     re_path(r"^delete-readthrough/?$", views.delete_readthrough),
     re_path(r"^create-readthrough/?$", views.create_readthrough),
     re_path(r"^delete-progressupdate/?$", views.delete_progressupdate),

From daa0268eb31512a3e3aa59ed29a8b979d51d3a5f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 20 Mar 2021 17:34:58 -0700
Subject: [PATCH 0367/1285] Update progress with comments

---
 bookwyrm/forms.py                             |  2 +-
 .../migrations/0055_auto_20210321_0025.py     | 24 +++++++++++++++++++
 bookwyrm/models/status.py                     |  8 +++++++
 .../snippets/create_status_form.html          |  5 ++--
 bookwyrm/views/status.py                      |  5 ++++
 5 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 bookwyrm/migrations/0055_auto_20210321_0025.py

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index edf1d9e4..6cc81c04 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -76,7 +76,7 @@ class ReviewForm(CustomForm):
 class CommentForm(CustomForm):
     class Meta:
         model = models.Comment
-        fields = ["user", "book", "content", "content_warning", "sensitive", "privacy"]
+        fields = ["user", "book", "content", "content_warning", "sensitive", "privacy", "progress", "mode"]
 
 
 class QuotationForm(CustomForm):
diff --git a/bookwyrm/migrations/0055_auto_20210321_0025.py b/bookwyrm/migrations/0055_auto_20210321_0025.py
new file mode 100644
index 00000000..446181f9
--- /dev/null
+++ b/bookwyrm/migrations/0055_auto_20210321_0025.py
@@ -0,0 +1,24 @@
+# Generated by Django 3.1.6 on 2021-03-21 00:25
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0054_auto_20210319_1942'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='comment',
+            name='mode',
+            field=models.CharField(blank=True, choices=[('PG', 'page'), ('PCT', 'percent')], default='PG', max_length=3, null=True),
+        ),
+        migrations.AddField(
+            model_name='comment',
+            name='progress',
+            field=models.IntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(0)]),
+        ),
+    ]
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index 09a7c4ec..60c00f5a 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -14,6 +14,7 @@ from .activitypub_mixin import ActivitypubMixin, ActivityMixin
 from .activitypub_mixin import OrderedCollectionPageMixin
 from .base_model import BookWyrmModel
 from .fields import image_serializer
+from .readthrough import ProgressMode
 from . import fields
 
 
@@ -229,6 +230,13 @@ class Comment(Status):
         "Edition", on_delete=models.PROTECT, activitypub_field="inReplyToBook"
     )
 
+    # this is it's own field instead of a foreign key to the progress update
+    # so that the update can be deleted without impacting the status
+    progress = models.IntegerField(validators=[MinValueValidator(0)], null=True, blank=True)
+    mode = models.CharField(
+        max_length=3, choices=ProgressMode.choices, default=ProgressMode.PAGE, null=True, blank=True
+    )
+
     @property
     def pure_content(self):
         """ indicate the book in question for mastodon (or w/e) users """
diff --git a/bookwyrm/templates/snippets/create_status_form.html b/bookwyrm/templates/snippets/create_status_form.html
index d0b763bf..75f5d28b 100644
--- a/bookwyrm/templates/snippets/create_status_form.html
+++ b/bookwyrm/templates/snippets/create_status_form.html
@@ -60,13 +60,14 @@
 
         {% with readthrough=book.latest_readthrough %}
         <div class="field">
-            <label class="label" for="progress">{% trans "Progress:" %}</label>
+            <input type="hidden" name="id" value="{{ readthrough.id }}"/>
+            <label class="label" for="progress-{{ uuid }}">{% trans "Progress:" %}</label>
             <div class="field has-addons mb-0">
                 <div class="control">
                     <input
                      aria-label="{% if readthrough.progress_mode == 'PG' %}Current page{% else %}Percent read{% endif %}"
                      class="input" type="number" min="0"
-                     name="progress" size="3" value="{{ readthrough.progress|default:'' }}">
+                     name="progress" size="3" value="{{ readthrough.progress|default:'' }}" id="progress-{{ uuid }}">
                 </div>
                 <div class="control select">
                     <select name="progress_mode" aria-label="Progress mode">
diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py
index 0cb5974b..fb548690 100644
--- a/bookwyrm/views/status.py
+++ b/bookwyrm/views/status.py
@@ -13,6 +13,7 @@ from bookwyrm.settings import DOMAIN
 from bookwyrm.status import delete_status
 from bookwyrm.utils import regex
 from .helpers import handle_remote_webfinger
+from .reading import edit_readthrough
 
 
 # pylint: disable= no-self-use
@@ -64,6 +65,10 @@ class CreateStatus(View):
             status.quote = to_markdown(status.quote)
 
         status.save(created=True)
+
+        # update a readthorugh, if needed
+        edit_readthrough(request)
+
         return redirect(request.headers.get("Referer", "/"))
 
 

From 2a612f7278be1bdf13a6675f8481f0eb58562327 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 20 Mar 2021 17:39:05 -0700
Subject: [PATCH 0368/1285] Formatting

---
 bookwyrm/forms.py                             | 11 ++++++++-
 .../migrations/0055_auto_20210321_0025.py     | 24 +++++++++++++------
 bookwyrm/models/readthrough.py                |  1 +
 bookwyrm/models/status.py                     | 10 ++++++--
 4 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 6cc81c04..3b3751ee 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -76,7 +76,16 @@ class ReviewForm(CustomForm):
 class CommentForm(CustomForm):
     class Meta:
         model = models.Comment
-        fields = ["user", "book", "content", "content_warning", "sensitive", "privacy", "progress", "mode"]
+        fields = [
+            "user",
+            "book",
+            "content",
+            "content_warning",
+            "sensitive",
+            "privacy",
+            "progress",
+            "mode",
+        ]
 
 
 class QuotationForm(CustomForm):
diff --git a/bookwyrm/migrations/0055_auto_20210321_0025.py b/bookwyrm/migrations/0055_auto_20210321_0025.py
index 446181f9..d7b4b518 100644
--- a/bookwyrm/migrations/0055_auto_20210321_0025.py
+++ b/bookwyrm/migrations/0055_auto_20210321_0025.py
@@ -7,18 +7,28 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0054_auto_20210319_1942'),
+        ("bookwyrm", "0054_auto_20210319_1942"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='comment',
-            name='mode',
-            field=models.CharField(blank=True, choices=[('PG', 'page'), ('PCT', 'percent')], default='PG', max_length=3, null=True),
+            model_name="comment",
+            name="mode",
+            field=models.CharField(
+                blank=True,
+                choices=[("PG", "page"), ("PCT", "percent")],
+                default="PG",
+                max_length=3,
+                null=True,
+            ),
         ),
         migrations.AddField(
-            model_name='comment',
-            name='progress',
-            field=models.IntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(0)]),
+            model_name="comment",
+            name="progress",
+            field=models.IntegerField(
+                blank=True,
+                null=True,
+                validators=[django.core.validators.MinValueValidator(0)],
+            ),
         ),
     ]
diff --git a/bookwyrm/models/readthrough.py b/bookwyrm/models/readthrough.py
index b76b9022..1a5fcb0d 100644
--- a/bookwyrm/models/readthrough.py
+++ b/bookwyrm/models/readthrough.py
@@ -8,6 +8,7 @@ from .base_model import BookWyrmModel
 
 class ProgressMode(models.TextChoices):
     """ types of prgress available """
+
     PAGE = "PG", "page"
     PERCENT = "PCT", "percent"
 
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index 60c00f5a..9db67726 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -232,9 +232,15 @@ class Comment(Status):
 
     # this is it's own field instead of a foreign key to the progress update
     # so that the update can be deleted without impacting the status
-    progress = models.IntegerField(validators=[MinValueValidator(0)], null=True, blank=True)
+    progress = models.IntegerField(
+        validators=[MinValueValidator(0)], null=True, blank=True
+    )
     mode = models.CharField(
-        max_length=3, choices=ProgressMode.choices, default=ProgressMode.PAGE, null=True, blank=True
+        max_length=3,
+        choices=ProgressMode.choices,
+        default=ProgressMode.PAGE,
+        null=True,
+        blank=True,
     )
 
     @property

From 17489f002f1d53b0f20ba3fe71341aedde83b49c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 20 Mar 2021 17:43:51 -0700
Subject: [PATCH 0369/1285] html linter fixes

---
 .../templates/snippets/create_status_form.html     |  5 +----
 .../shelve_button/progress_update_modal.html       | 14 +++++++-------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/bookwyrm/templates/snippets/create_status_form.html b/bookwyrm/templates/snippets/create_status_form.html
index 75f5d28b..c70a0e58 100644
--- a/bookwyrm/templates/snippets/create_status_form.html
+++ b/bookwyrm/templates/snippets/create_status_form.html
@@ -64,10 +64,7 @@
             <label class="label" for="progress-{{ uuid }}">{% trans "Progress:" %}</label>
             <div class="field has-addons mb-0">
                 <div class="control">
-                    <input
-                     aria-label="{% if readthrough.progress_mode == 'PG' %}Current page{% else %}Percent read{% endif %}"
-                     class="input" type="number" min="0"
-                     name="progress" size="3" value="{{ readthrough.progress|default:'' }}" id="progress-{{ uuid }}">
+                    <input aria-label="{% if readthrough.progress_mode == 'PG' %}Current page{% else %}Percent read{% endif %}" class="input" type="number" min="0" name="progress" size="3" value="{{ readthrough.progress|default:'' }}" id="progress-{{ uuid }}">
                 </div>
                 <div class="control select">
                     <select name="progress_mode" aria-label="Progress mode">
diff --git a/bookwyrm/templates/snippets/shelve_button/progress_update_modal.html b/bookwyrm/templates/snippets/shelve_button/progress_update_modal.html
index b9fbddcd..c766153a 100644
--- a/bookwyrm/templates/snippets/shelve_button/progress_update_modal.html
+++ b/bookwyrm/templates/snippets/shelve_button/progress_update_modal.html
@@ -17,13 +17,13 @@
     <div class="field has-addons mb-0">
         <div class="control">
             <input
-             aria-label="{% if readthrough.progress_mode == 'PG' %}Current page{% else %}Percent read{% endif %}"
-             class="input"
-             type="number"
-             min="0"
-             name="progress"
-             size="3"
-             value="{{ readthrough.progress|default:'' }}">
+                aria-label="{% if readthrough.progress_mode == 'PG' %}Current page{% else %}Percent read{% endif %}"
+                class="input"
+                type="number"
+                min="0"
+                name="progress"
+                size="3"
+                value="{{ readthrough.progress|default:'' }}">
         </div>
         <div class="control select">
             <select name="progress_mode" aria-label="Progress mode">

From d3a4282f11f31d47d5eef998c78c9c06843daad1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 20 Mar 2021 18:03:20 -0700
Subject: [PATCH 0370/1285] Show progress on status

---
 bookwyrm/forms.py                             |  2 +-
 .../migrations/0055_auto_20210321_0025.py     | 34 -------------------
 .../migrations/0055_auto_20210321_0101.py     | 24 +++++++++++++
 bookwyrm/models/status.py                     |  2 +-
 .../snippets/status/status_header.html        |  6 ++++
 5 files changed, 32 insertions(+), 36 deletions(-)
 delete mode 100644 bookwyrm/migrations/0055_auto_20210321_0025.py
 create mode 100644 bookwyrm/migrations/0055_auto_20210321_0101.py

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 3b3751ee..d723ebdb 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -84,7 +84,7 @@ class CommentForm(CustomForm):
             "sensitive",
             "privacy",
             "progress",
-            "mode",
+            "progress_mode",
         ]
 
 
diff --git a/bookwyrm/migrations/0055_auto_20210321_0025.py b/bookwyrm/migrations/0055_auto_20210321_0025.py
deleted file mode 100644
index d7b4b518..00000000
--- a/bookwyrm/migrations/0055_auto_20210321_0025.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Generated by Django 3.1.6 on 2021-03-21 00:25
-
-import django.core.validators
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookwyrm", "0054_auto_20210319_1942"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="comment",
-            name="mode",
-            field=models.CharField(
-                blank=True,
-                choices=[("PG", "page"), ("PCT", "percent")],
-                default="PG",
-                max_length=3,
-                null=True,
-            ),
-        ),
-        migrations.AddField(
-            model_name="comment",
-            name="progress",
-            field=models.IntegerField(
-                blank=True,
-                null=True,
-                validators=[django.core.validators.MinValueValidator(0)],
-            ),
-        ),
-    ]
diff --git a/bookwyrm/migrations/0055_auto_20210321_0101.py b/bookwyrm/migrations/0055_auto_20210321_0101.py
new file mode 100644
index 00000000..c67d355d
--- /dev/null
+++ b/bookwyrm/migrations/0055_auto_20210321_0101.py
@@ -0,0 +1,24 @@
+# Generated by Django 3.1.6 on 2021-03-21 01:01
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0054_auto_20210319_1942'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='comment',
+            name='progress',
+            field=models.IntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(0)]),
+        ),
+        migrations.AddField(
+            model_name='comment',
+            name='progress_mode',
+            field=models.CharField(blank=True, choices=[('PG', 'page'), ('PCT', 'percent')], default='PG', max_length=3, null=True),
+        ),
+    ]
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index 9db67726..904ce461 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -235,7 +235,7 @@ class Comment(Status):
     progress = models.IntegerField(
         validators=[MinValueValidator(0)], null=True, blank=True
     )
-    mode = models.CharField(
+    progress_mode = models.CharField(
         max_length=3,
         choices=ProgressMode.choices,
         default=ProgressMode.PAGE,
diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html
index a04177d9..dc112f4d 100644
--- a/bookwyrm/templates/snippets/status/status_header.html
+++ b/bookwyrm/templates/snippets/status/status_header.html
@@ -35,3 +35,9 @@
 {% elif status.mention_books %}
 <a href="/book/{{ status.mention_books.first.id }}">{{ status.mention_books.first.title }}</a>
 {% endif %}
+
+{% if status.progress %}
+<p class="help">
+    ({% if status.progress_mode == 'PG' %}page {{ status.progress }}{%else %}{{ status.progress }}%{% endif %})
+</p>
+{% endif %}

From 396a43136d95dd2a08c513c06d41ff768c249f01 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 20 Mar 2021 18:04:10 -0700
Subject: [PATCH 0371/1285] Black formatting

---
 .../migrations/0055_auto_20210321_0101.py     | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/migrations/0055_auto_20210321_0101.py b/bookwyrm/migrations/0055_auto_20210321_0101.py
index c67d355d..dea219c4 100644
--- a/bookwyrm/migrations/0055_auto_20210321_0101.py
+++ b/bookwyrm/migrations/0055_auto_20210321_0101.py
@@ -7,18 +7,28 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0054_auto_20210319_1942'),
+        ("bookwyrm", "0054_auto_20210319_1942"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='comment',
-            name='progress',
-            field=models.IntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(0)]),
+            model_name="comment",
+            name="progress",
+            field=models.IntegerField(
+                blank=True,
+                null=True,
+                validators=[django.core.validators.MinValueValidator(0)],
+            ),
         ),
         migrations.AddField(
-            model_name='comment',
-            name='progress_mode',
-            field=models.CharField(blank=True, choices=[('PG', 'page'), ('PCT', 'percent')], default='PG', max_length=3, null=True),
+            model_name="comment",
+            name="progress_mode",
+            field=models.CharField(
+                blank=True,
+                choices=[("PG", "page"), ("PCT", "percent")],
+                default="PG",
+                max_length=3,
+                null=True,
+            ),
         ),
     ]

From 4d07cb1eb56d011ab4040621f27bb6fac7e954e3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 20 Mar 2021 18:23:59 -0700
Subject: [PATCH 0372/1285] Adds invite request model

---
 bookwyrm/forms.py                             |  6 ++
 .../migrations/0056_auto_20210321_0123.py     | 58 +++++++++++++++++++
 bookwyrm/models/__init__.py                   |  2 +-
 bookwyrm/models/site.py                       | 20 ++++++-
 4 files changed, 84 insertions(+), 2 deletions(-)
 create mode 100644 bookwyrm/migrations/0056_auto_20210321_0123.py

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index d723ebdb..0a69dbe0 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -202,6 +202,12 @@ class ExpiryWidget(widgets.Select):
         return timezone.now() + interval
 
 
+class InviteRequestForm(CustomForm):
+    class Meta:
+        model = models.InviteRequest
+        fields = ["email"]
+
+
 class CreateInviteForm(CustomForm):
     class Meta:
         model = models.SiteInvite
diff --git a/bookwyrm/migrations/0056_auto_20210321_0123.py b/bookwyrm/migrations/0056_auto_20210321_0123.py
new file mode 100644
index 00000000..f36e4b12
--- /dev/null
+++ b/bookwyrm/migrations/0056_auto_20210321_0123.py
@@ -0,0 +1,58 @@
+# Generated by Django 3.1.6 on 2021-03-21 01:23
+
+import bookwyrm.models.fields
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0055_auto_20210321_0101"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="sitesettings",
+            name="allow_invite_requests",
+            field=models.BooleanField(default=True),
+        ),
+        migrations.CreateModel(
+            name="InviteRequest",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                ("updated_date", models.DateTimeField(auto_now=True)),
+                (
+                    "remote_id",
+                    bookwyrm.models.fields.RemoteIdField(
+                        max_length=255,
+                        null=True,
+                        validators=[bookwyrm.models.fields.validate_remote_id],
+                    ),
+                ),
+                ("email", models.EmailField(max_length=255, unique=True)),
+                ("invite_sent", models.BooleanField(default=False)),
+                (
+                    "invite",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        to="bookwyrm.siteinvite",
+                    ),
+                ),
+            ],
+            options={
+                "abstract": False,
+            },
+        ),
+    ]
diff --git a/bookwyrm/models/__init__.py b/bookwyrm/models/__init__.py
index 326a673e..35e32c2c 100644
--- a/bookwyrm/models/__init__.py
+++ b/bookwyrm/models/__init__.py
@@ -26,7 +26,7 @@ from .federated_server import FederatedServer
 
 from .import_job import ImportJob, ImportItem
 
-from .site import SiteSettings, SiteInvite, PasswordReset
+from .site import SiteSettings, SiteInvite, PasswordReset, InviteRequest
 
 cls_members = inspect.getmembers(sys.modules[__name__], inspect.isclass)
 activity_models = {
diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py
index 7fde6781..2722de17 100644
--- a/bookwyrm/models/site.py
+++ b/bookwyrm/models/site.py
@@ -3,10 +3,11 @@ import base64
 import datetime
 
 from Crypto import Random
-from django.db import models
+from django.db import models, IntegrityError
 from django.utils import timezone
 
 from bookwyrm.settings import DOMAIN
+from .base_model import BookWyrmModel
 from .user import User
 
 
@@ -24,6 +25,7 @@ class SiteSettings(models.Model):
     code_of_conduct = models.TextField(default="Add a code of conduct here.")
     privacy_policy = models.TextField(default="Add a privacy policy here.")
     allow_registration = models.BooleanField(default=True)
+    allow_invite_requests = models.BooleanField(default=True)
     logo = models.ImageField(upload_to="logos/", null=True, blank=True)
     logo_small = models.ImageField(upload_to="logos/", null=True, blank=True)
     favicon = models.ImageField(upload_to="logos/", null=True, blank=True)
@@ -69,6 +71,22 @@ class SiteInvite(models.Model):
         return "https://{}/invite/{}".format(DOMAIN, self.code)
 
 
+class InviteRequest(BookWyrmModel):
+    """ prospective users can request an invite """
+
+    email = models.EmailField(max_length=255, unique=True)
+    invite = models.ForeignKey(
+        SiteInvite, on_delete=models.SET_NULL, null=True, blank=True
+    )
+    invite_sent = models.BooleanField(default=False)
+
+    def save(self, *args, **kwargs):
+        """ don't create a request for a registered email """
+        if User.objects.filter(email=self.email).exists():
+            raise IntegrityError()
+        super().save(*args, **kwargs)
+
+
 def get_passowrd_reset_expiry():
     """ give people a limited time to use the link """
     now = timezone.now()

From d15396eb26c1352bc713bc603ad1057b24be6eee Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 20 Mar 2021 19:14:41 -0700
Subject: [PATCH 0373/1285] Request invite flow

---
 bookwyrm/forms.py                             |  8 +++++++
 .../templates/discover/landing_layout.html    | 24 +++++++++++++++++++
 bookwyrm/templates/settings/site.html         |  4 ++++
 bookwyrm/urls.py                              |  3 +++
 bookwyrm/views/__init__.py                    |  2 +-
 bookwyrm/views/helpers.py                     | 19 ++++++++++++++-
 bookwyrm/views/invite.py                      | 20 ++++++++++++++++
 bookwyrm/views/landing.py                     | 17 +++----------
 8 files changed, 81 insertions(+), 16 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 0a69dbe0..d330211c 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -3,6 +3,7 @@ import datetime
 from collections import defaultdict
 
 from django import forms
+from django.core.exceptions import ValidationError
 from django.forms import ModelForm, PasswordInput, widgets
 from django.forms.widgets import Textarea
 from django.utils import timezone
@@ -203,6 +204,13 @@ class ExpiryWidget(widgets.Select):
 
 
 class InviteRequestForm(CustomForm):
+    def clean(self):
+        """ make sure the email isn't in use by a registered user """
+        cleaned_data = super().clean()
+        email = cleaned_data.get("email")
+        if email and models.User.objects.filter(email=email).exists():
+            self.add_error("email", _("A user with this email already exists."))
+
     class Meta:
         model = models.InviteRequest
         fields = ["email"]
diff --git a/bookwyrm/templates/discover/landing_layout.html b/bookwyrm/templates/discover/landing_layout.html
index 5cfa1fd3..8e507531 100644
--- a/bookwyrm/templates/discover/landing_layout.html
+++ b/bookwyrm/templates/discover/landing_layout.html
@@ -45,9 +45,33 @@
             <form name="register" method="post" action="/register">
                 {% include 'snippets/register_form.html' %}
             </form>
+
             {% else %}
+
             <h2 class="title">{% trans "This instance is closed" %}</h2>
             <p>{{ site.registration_closed_text | safe}}</p>
+
+            {% if site.allow_invite_requests %}
+            {% if request_received %}
+            <p>
+                {% trans "Thank you! Your request has been received." %}
+            </p>
+            {% else %}
+            <h3>{% trans "Request an Invitation" %}</h3>
+            <form name="invite-request" action="{% url 'invite-request' %}" method="post">
+                {% csrf_token %}
+                <div class="block">
+                    <label for="id_request_email" class="label">{% trans "Email address:" %}</label>
+                    <input type="email" name="email" maxlength="255" class="input" required="" id="id_request_email">
+                    {% for error in request_form.email.errors %}
+                    <p class="help is-danger">{{ error | escape }}</p>
+                    {% endfor %}
+                </div>
+                <button type="submit" class="button is-link">{% trans "Submit" %}</button>
+            </form>
+            {% endif %}
+            {% endif %}
+
             {% endif %}
         </div>
         {% else %}
diff --git a/bookwyrm/templates/settings/site.html b/bookwyrm/templates/settings/site.html
index 27be0c9b..28009e1a 100644
--- a/bookwyrm/templates/settings/site.html
+++ b/bookwyrm/templates/settings/site.html
@@ -79,6 +79,10 @@
             <label class="label" for="id_allow_registration">{% trans "Allow registration:" %}
             {{ site_form.allow_registration }}
         </div>
+        <div class="control">
+            <label class="label" for="id_allow_invite_requests">{% trans "Allow invite requests:" %}
+            {{ site_form.allow_invite_requests }}
+        </div>
         <div class="control">
             <label class="label" for="id_registration_closed_text">{% trans "Registration closed text:" %}</label>
             {{ site_form.registration_closed_text }}
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index c24b83f7..ca58d300 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -54,6 +54,9 @@ urlpatterns = [
     re_path(
         r"^settings/invites/?$", views.ManageInvites.as_view(), name="settings-invites"
     ),
+    re_path(
+        r"^invite-request/?$", views.InviteRequest.as_view(), name="invite-request"
+    ),
     re_path(r"^invite/(?P<code>[A-Za-z0-9]+)/?$", views.Invite.as_view()),
     # moderation
     re_path(r"^settings/reports/?$", views.Reports.as_view(), name="settings-reports"),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index e98cb24a..119fc492 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -13,7 +13,7 @@ from .goal import Goal, hide_goal
 from .import_data import Import, ImportStatus
 from .inbox import Inbox
 from .interaction import Favorite, Unfavorite, Boost, Unboost
-from .invite import ManageInvites, Invite
+from .invite import ManageInvites, Invite, InviteRequest
 from .isbn import Isbn
 from .landing import About, Home, Discover
 from .list import Lists, List, Curate, UserLists
diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index 20332cbd..c62856ba 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -2,7 +2,7 @@
 import re
 from requests import HTTPError
 from django.core.exceptions import FieldError
-from django.db.models import Q
+from django.db.models import Max, Q
 
 from bookwyrm import activitypub, models
 from bookwyrm.connectors import ConnectorException, get_data
@@ -216,3 +216,20 @@ def is_blocked(viewer, user):
     if viewer.is_authenticated and viewer in user.blocks.all():
         return True
     return False
+
+
+def get_discover_books():
+    """ list of books for the discover page """
+    return list(
+        set(
+            models.Edition.objects.filter(
+                review__published_date__isnull=False,
+                review__deleted=False,
+                review__user__local=True,
+                review__privacy__in=["public", "unlisted"],
+            )
+            .exclude(cover__exact="")
+            .annotate(Max("review__published_date"))
+            .order_by("-review__published_date__max")[:6]
+        )
+    )
diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/invite.py
index 1f1ccaf1..0f5a65b6 100644
--- a/bookwyrm/views/invite.py
+++ b/bookwyrm/views/invite.py
@@ -9,6 +9,7 @@ from django.views import View
 
 from bookwyrm import forms, models
 from bookwyrm.settings import PAGE_LENGTH
+from . import helpers
 
 
 # pylint: disable= no-self-use
@@ -77,3 +78,22 @@ class Invite(View):
         return TemplateResponse(request, "invite.html", data)
 
     # post handling is in views.authentication.Register
+
+
+class InviteRequest(View):
+    """ prospective users sign up here """
+
+    def post(self, request):
+        """ create a request """
+        form = forms.InviteRequestForm(request.POST)
+        received = False
+        if form.is_valid():
+            received = True
+            form.save()
+
+        data = {
+            "request_form": form,
+            "request_received": received,
+            "books": helpers.get_discover_books(),
+        }
+        return TemplateResponse(request, "discover/discover.html", data)
diff --git a/bookwyrm/views/landing.py b/bookwyrm/views/landing.py
index 2c4a5147..86f7d3e9 100644
--- a/bookwyrm/views/landing.py
+++ b/bookwyrm/views/landing.py
@@ -1,10 +1,10 @@
 """ non-interactive pages """
-from django.db.models import Max
 from django.template.response import TemplateResponse
 from django.views import View
 
 from bookwyrm import forms, models
 from .feed import Feed
+from . import helpers
 
 
 # pylint: disable= no-self-use
@@ -33,20 +33,9 @@ class Discover(View):
 
     def get(self, request):
         """ tiled book activity page """
-        books = (
-            models.Edition.objects.filter(
-                review__published_date__isnull=False,
-                review__deleted=False,
-                review__user__local=True,
-                review__privacy__in=["public", "unlisted"],
-            )
-            .exclude(cover__exact="")
-            .annotate(Max("review__published_date"))
-            .order_by("-review__published_date__max")[:6]
-        )
-
         data = {
             "register_form": forms.RegisterForm(),
-            "books": list(set(books)),
+            "request_form": forms.InviteRequestForm(),
+            "books": helpers.get_discover_books(),
         }
         return TemplateResponse(request, "discover/discover.html", data)

From f91a8144f40f7fda52f6b0abfd25e31357c43598 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 20 Mar 2021 19:39:08 -0700
Subject: [PATCH 0374/1285] Admin UI for managing invite requests

---
 .../settings/manage_invite_requests.html      | 42 +++++++++++++++++++
 .../templates/settings/manage_invites.html    | 14 +++++++
 bookwyrm/urls.py                              |  5 +++
 bookwyrm/views/__init__.py                    |  2 +-
 bookwyrm/views/invite.py                      | 21 ++++++++++
 5 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 bookwyrm/templates/settings/manage_invite_requests.html

diff --git a/bookwyrm/templates/settings/manage_invite_requests.html b/bookwyrm/templates/settings/manage_invite_requests.html
new file mode 100644
index 00000000..ef2a3356
--- /dev/null
+++ b/bookwyrm/templates/settings/manage_invite_requests.html
@@ -0,0 +1,42 @@
+{% extends 'settings/admin_layout.html' %}
+{% load i18n %}
+{% load humanize %}
+{% block header %}{% trans "Invite Requests" %}{% endblock %}
+{% block panel %}
+
+<div class="tabs">
+    <ul>
+        {% url 'settings-invites' as url %}
+        <li {% if url in request.path %}class="is-active" aria-current="page"{% endif %}>
+            <a href="{{ url }}">{% trans "Invites" %}</a>
+        </li>
+        {% url 'settings-invite-requests' as url %}
+        <li {% if url in request.path %}class="is-active" aria-current="page"{% endif %}>
+            <a href="{{ url }}">{% trans "Invite Requests" %}</a>
+        </li>
+    </ul>
+</div>
+
+<section class="block">
+    <h2 class="title is-4">{% trans "Invite Requests" %}</h2>
+
+    <table class="table is-striped">
+        <tr>
+            <th>{% trans "Date" %}</th>
+            <th>{% trans "Email" %}</th>
+            <th>{% trans "Status" %}</th>
+        </tr>
+        {% if not requests %}
+        <tr><td colspan="4">{% trans "No requests" %}</td></tr>
+        {% endif %}
+        {% for req in requests %}
+        <tr>
+            <td>{{ req.created_date | naturaltime }}</td>
+            <td>{{ req.email }}</td>
+            <td>{% trans "Pending" %}</td>
+        </tr>
+        {% endfor %}
+    </table>
+    {% include 'snippets/pagination.html' with page=requests path=request.path %}
+</section>
+{% endblock %}
diff --git a/bookwyrm/templates/settings/manage_invites.html b/bookwyrm/templates/settings/manage_invites.html
index 6bc7469b..7ce60908 100644
--- a/bookwyrm/templates/settings/manage_invites.html
+++ b/bookwyrm/templates/settings/manage_invites.html
@@ -3,6 +3,20 @@
 {% block header %}{% trans "Invites" %}{% endblock %}
 {% load humanize %}
 {% block panel %}
+
+<div class="tabs">
+    <ul>
+        {% url 'settings-invites' as url %}
+        <li {% if url in request.path %}class="is-active" aria-current="page"{% endif %}>
+            <a href="{{ url }}">{% trans "Invites" %}</a>
+        </li>
+        {% url 'settings-invite-requests' as url %}
+        <li {% if url in request.path %}class="is-active" aria-current="page"{% endif %}>
+            <a href="{{ url }}">{% trans "Invite Requests" %}</a>
+        </li>
+    </ul>
+</div>
+
 <section class="block">
     <h2 class="title is-4">{% trans "Generate New Invite" %}</h2>
 
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index ca58d300..e61758a8 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -54,6 +54,11 @@ urlpatterns = [
     re_path(
         r"^settings/invites/?$", views.ManageInvites.as_view(), name="settings-invites"
     ),
+    re_path(
+        r"^settings/requests/?$",
+        views.ManageInviteRequests.as_view(),
+        name="settings-invite-requests",
+    ),
     re_path(
         r"^invite-request/?$", views.InviteRequest.as_view(), name="invite-request"
     ),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 119fc492..24265741 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -13,7 +13,7 @@ from .goal import Goal, hide_goal
 from .import_data import Import, ImportStatus
 from .inbox import Inbox
 from .interaction import Favorite, Unfavorite, Boost, Unboost
-from .invite import ManageInvites, Invite, InviteRequest
+from .invite import ManageInvites, Invite, InviteRequest, ManageInviteRequests
 from .isbn import Isbn
 from .landing import About, Home, Discover
 from .list import Lists, List, Curate, UserLists
diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/invite.py
index 0f5a65b6..03723d94 100644
--- a/bookwyrm/views/invite.py
+++ b/bookwyrm/views/invite.py
@@ -80,6 +80,27 @@ class Invite(View):
     # post handling is in views.authentication.Register
 
 
+class ManageInviteRequests(View):
+    """ grant invites like the benevolent lord you are """
+
+    def get(self, request):
+        """ view a list of requests """
+        try:
+            page = int(request.GET.get("page", 1))
+        except ValueError:
+            page = 1
+
+        paginated = Paginator(
+            models.InviteRequest.objects.all().order_by("-created_date"),
+            PAGE_LENGTH,
+        )
+
+        data = {
+            "requests": paginated.page(page),
+        }
+        return TemplateResponse(request, "settings/manage_invite_requests.html", data)
+
+
 class InviteRequest(View):
     """ prospective users sign up here """
 

From 5e24b438ffc922f8cf449fe848fadbc58c7ed99d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 20 Mar 2021 20:15:50 -0700
Subject: [PATCH 0375/1285] Placeholders for send/ignore request flows

---
 .../migrations/0056_auto_20210321_0123.py     | 58 -------------------
 .../migrations/0056_auto_20210321_0303.py     | 36 ++++++++++++
 bookwyrm/models/site.py                       |  1 +
 .../settings/manage_invite_requests.html      | 29 +++++++++-
 bookwyrm/urls.py                              |  5 ++
 bookwyrm/views/__init__.py                    |  3 +-
 bookwyrm/views/invite.py                      | 16 ++++-
 7 files changed, 87 insertions(+), 61 deletions(-)
 delete mode 100644 bookwyrm/migrations/0056_auto_20210321_0123.py
 create mode 100644 bookwyrm/migrations/0056_auto_20210321_0303.py

diff --git a/bookwyrm/migrations/0056_auto_20210321_0123.py b/bookwyrm/migrations/0056_auto_20210321_0123.py
deleted file mode 100644
index f36e4b12..00000000
--- a/bookwyrm/migrations/0056_auto_20210321_0123.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# Generated by Django 3.1.6 on 2021-03-21 01:23
-
-import bookwyrm.models.fields
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookwyrm", "0055_auto_20210321_0101"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="sitesettings",
-            name="allow_invite_requests",
-            field=models.BooleanField(default=True),
-        ),
-        migrations.CreateModel(
-            name="InviteRequest",
-            fields=[
-                (
-                    "id",
-                    models.AutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                ("created_date", models.DateTimeField(auto_now_add=True)),
-                ("updated_date", models.DateTimeField(auto_now=True)),
-                (
-                    "remote_id",
-                    bookwyrm.models.fields.RemoteIdField(
-                        max_length=255,
-                        null=True,
-                        validators=[bookwyrm.models.fields.validate_remote_id],
-                    ),
-                ),
-                ("email", models.EmailField(max_length=255, unique=True)),
-                ("invite_sent", models.BooleanField(default=False)),
-                (
-                    "invite",
-                    models.ForeignKey(
-                        blank=True,
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        to="bookwyrm.siteinvite",
-                    ),
-                ),
-            ],
-            options={
-                "abstract": False,
-            },
-        ),
-    ]
diff --git a/bookwyrm/migrations/0056_auto_20210321_0303.py b/bookwyrm/migrations/0056_auto_20210321_0303.py
new file mode 100644
index 00000000..ba406b86
--- /dev/null
+++ b/bookwyrm/migrations/0056_auto_20210321_0303.py
@@ -0,0 +1,36 @@
+# Generated by Django 3.1.6 on 2021-03-21 03:03
+
+import bookwyrm.models.fields
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0055_auto_20210321_0101'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='sitesettings',
+            name='allow_invite_requests',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.CreateModel(
+            name='InviteRequest',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_date', models.DateTimeField(auto_now_add=True)),
+                ('updated_date', models.DateTimeField(auto_now=True)),
+                ('remote_id', bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id])),
+                ('email', models.EmailField(max_length=255, unique=True)),
+                ('invite_sent', models.BooleanField(default=False)),
+                ('ignored', models.BooleanField(default=False)),
+                ('invite', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='bookwyrm.siteinvite')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]
diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py
index 2722de17..2c8d2553 100644
--- a/bookwyrm/models/site.py
+++ b/bookwyrm/models/site.py
@@ -79,6 +79,7 @@ class InviteRequest(BookWyrmModel):
         SiteInvite, on_delete=models.SET_NULL, null=True, blank=True
     )
     invite_sent = models.BooleanField(default=False)
+    ignored = models.BooleanField(default=False)
 
     def save(self, *args, **kwargs):
         """ don't create a request for a registered email """
diff --git a/bookwyrm/templates/settings/manage_invite_requests.html b/bookwyrm/templates/settings/manage_invite_requests.html
index ef2a3356..2441ed80 100644
--- a/bookwyrm/templates/settings/manage_invite_requests.html
+++ b/bookwyrm/templates/settings/manage_invite_requests.html
@@ -25,6 +25,7 @@
             <th>{% trans "Date" %}</th>
             <th>{% trans "Email" %}</th>
             <th>{% trans "Status" %}</th>
+            <th>{% trans "Action" %}</th>
         </tr>
         {% if not requests %}
         <tr><td colspan="4">{% trans "No requests" %}</td></tr>
@@ -33,7 +34,33 @@
         <tr>
             <td>{{ req.created_date | naturaltime }}</td>
             <td>{{ req.email }}</td>
-            <td>{% trans "Pending" %}</td>
+            <td>
+                {% if req.invite.times_used %}
+                {% trans "Accepted" %}
+                {% elif req.invite %}
+                {% trans "Sent" %}
+                {% else %}
+                {% trans "Requested" %}
+                {% endif %}
+            </td>
+            <td>
+                {% if req.invite and not req.invite.times_used %}
+                <button class="button is-danger is-light is-small">{% trans "Revoke invite" %}</button>
+                {% else %}
+                <div class="field is-grouped">
+                    <form name="send-invite" method="post" action="{% url 'settings-invite-requests' %}">
+                        {% csrf_token %}
+                        <input type="hidden" name="invite-request" value="{{ req.id }}">
+                        <button type="submit" class="button is-link is-light is-small">{% trans "Send invite" %}</button>
+                    </form>
+
+                    <form name="ignore-request" method="post" action="{% url 'settings-invite-requests-ignore' %}">
+                        <input type="hidden" name="invite-request" value="{{ req.id }}">
+                        <button type="submit" class="button is-danger is-light is-small">{% trans "Ignore" %}</button>
+                    </form>
+                </div>
+                {% endif %}
+            </td>
         </tr>
         {% endfor %}
     </table>
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index e61758a8..30c1bba4 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -59,6 +59,11 @@ urlpatterns = [
         views.ManageInviteRequests.as_view(),
         name="settings-invite-requests",
     ),
+    re_path(
+        r"^settings/requests/ignore?$",
+        views.ignore_invite_request,
+        name="settings-invite-requests-ignore",
+    ),
     re_path(
         r"^invite-request/?$", views.InviteRequest.as_view(), name="invite-request"
     ),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 24265741..3402e65f 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -13,7 +13,8 @@ from .goal import Goal, hide_goal
 from .import_data import Import, ImportStatus
 from .inbox import Inbox
 from .interaction import Favorite, Unfavorite, Boost, Unboost
-from .invite import ManageInvites, Invite, InviteRequest, ManageInviteRequests
+from .invite import ManageInvites, Invite, InviteRequest
+from .invite import ManageInviteRequests, ignore_invite_request
 from .isbn import Isbn
 from .landing import About, Home, Discover
 from .list import Lists, List, Curate, UserLists
diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/invite.py
index 03723d94..39d6435e 100644
--- a/bookwyrm/views/invite.py
+++ b/bookwyrm/views/invite.py
@@ -6,6 +6,7 @@ from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
+from django.views.decorators.http import require_POST
 
 from bookwyrm import forms, models
 from bookwyrm.settings import PAGE_LENGTH
@@ -85,21 +86,29 @@ class ManageInviteRequests(View):
 
     def get(self, request):
         """ view a list of requests """
+        ignored = request.GET.get("ignored", False)
         try:
             page = int(request.GET.get("page", 1))
         except ValueError:
             page = 1
 
         paginated = Paginator(
-            models.InviteRequest.objects.all().order_by("-created_date"),
+            models.InviteRequest.objects.filter(
+                ignored=ignored
+            ).order_by("-created_date"),
             PAGE_LENGTH,
         )
 
         data = {
+            "ignored": ignored,
             "requests": paginated.page(page),
         }
         return TemplateResponse(request, "settings/manage_invite_requests.html", data)
 
+    def post(self, request):
+        """ send out an invite """
+
+
 
 class InviteRequest(View):
     """ prospective users sign up here """
@@ -118,3 +127,8 @@ class InviteRequest(View):
             "books": helpers.get_discover_books(),
         }
         return TemplateResponse(request, "discover/discover.html", data)
+
+
+@require_POST
+def ignore_invite_request(request):
+    """ ok """

From 81ab73f3094f78e2bd64c1d6f10629b7ef349f6b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 20 Mar 2021 20:19:27 -0700
Subject: [PATCH 0376/1285] Black formatting

---
 .../migrations/0056_auto_20210321_0303.py     | 49 ++++++++++++++-----
 bookwyrm/views/invite.py                      |  7 ++-
 2 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/bookwyrm/migrations/0056_auto_20210321_0303.py b/bookwyrm/migrations/0056_auto_20210321_0303.py
index ba406b86..aa475e03 100644
--- a/bookwyrm/migrations/0056_auto_20210321_0303.py
+++ b/bookwyrm/migrations/0056_auto_20210321_0303.py
@@ -8,29 +8,52 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0055_auto_20210321_0101'),
+        ("bookwyrm", "0055_auto_20210321_0101"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='sitesettings',
-            name='allow_invite_requests',
+            model_name="sitesettings",
+            name="allow_invite_requests",
             field=models.BooleanField(default=True),
         ),
         migrations.CreateModel(
-            name='InviteRequest',
+            name="InviteRequest",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('created_date', models.DateTimeField(auto_now_add=True)),
-                ('updated_date', models.DateTimeField(auto_now=True)),
-                ('remote_id', bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id])),
-                ('email', models.EmailField(max_length=255, unique=True)),
-                ('invite_sent', models.BooleanField(default=False)),
-                ('ignored', models.BooleanField(default=False)),
-                ('invite', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='bookwyrm.siteinvite')),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                ("updated_date", models.DateTimeField(auto_now=True)),
+                (
+                    "remote_id",
+                    bookwyrm.models.fields.RemoteIdField(
+                        max_length=255,
+                        null=True,
+                        validators=[bookwyrm.models.fields.validate_remote_id],
+                    ),
+                ),
+                ("email", models.EmailField(max_length=255, unique=True)),
+                ("invite_sent", models.BooleanField(default=False)),
+                ("ignored", models.BooleanField(default=False)),
+                (
+                    "invite",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        to="bookwyrm.siteinvite",
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
         ),
     ]
diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/invite.py
index 39d6435e..cec0458a 100644
--- a/bookwyrm/views/invite.py
+++ b/bookwyrm/views/invite.py
@@ -93,9 +93,9 @@ class ManageInviteRequests(View):
             page = 1
 
         paginated = Paginator(
-            models.InviteRequest.objects.filter(
-                ignored=ignored
-            ).order_by("-created_date"),
+            models.InviteRequest.objects.filter(ignored=ignored).order_by(
+                "-created_date"
+            ),
             PAGE_LENGTH,
         )
 
@@ -109,7 +109,6 @@ class ManageInviteRequests(View):
         """ send out an invite """
 
 
-
 class InviteRequest(View):
     """ prospective users sign up here """
 

From 5297b9d796ab61a3c17d4a18534b1c201bd3f502 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 21 Mar 2021 08:17:48 -0700
Subject: [PATCH 0377/1285] Ignore request flow

---
 bookwyrm/templates/settings/admin_layout.html |  3 ++-
 .../settings/manage_invite_requests.html      | 27 +++++++++++++++----
 .../templates/settings/manage_invites.html    |  8 +++---
 bookwyrm/views/invite.py                      |  9 ++++++-
 4 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/bookwyrm/templates/settings/admin_layout.html b/bookwyrm/templates/settings/admin_layout.html
index a34fe638..397df473 100644
--- a/bookwyrm/templates/settings/admin_layout.html
+++ b/bookwyrm/templates/settings/admin_layout.html
@@ -16,7 +16,8 @@
         <ul class="menu-list">
             <li>
                 {% url 'settings-invites' as url %}
-                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Invites" %}</a>
+                {% url 'settings-invite-requests' as alt_url %}
+                <a href="{{ url }}"{% if url in request.path or request.path in alt_url %} class="is-active" aria-selected="true"{% endif %}>{% trans "Invites" %}</a>
             </li>
             <li>
                 {% url 'settings-reports' as url %}
diff --git a/bookwyrm/templates/settings/manage_invite_requests.html b/bookwyrm/templates/settings/manage_invite_requests.html
index 2441ed80..538ffccf 100644
--- a/bookwyrm/templates/settings/manage_invite_requests.html
+++ b/bookwyrm/templates/settings/manage_invite_requests.html
@@ -6,19 +6,25 @@
 
 <div class="tabs">
     <ul>
-        {% url 'settings-invites' as url %}
-        <li {% if url in request.path %}class="is-active" aria-current="page"{% endif %}>
-            <a href="{{ url }}">{% trans "Invites" %}</a>
-        </li>
         {% url 'settings-invite-requests' as url %}
         <li {% if url in request.path %}class="is-active" aria-current="page"{% endif %}>
             <a href="{{ url }}">{% trans "Invite Requests" %}</a>
         </li>
+        {% url 'settings-invites' as url %}
+        <li {% if url in request.path %}class="is-active" aria-current="page"{% endif %}>
+            <a href="{{ url }}">{% trans "Invites" %}</a>
+        </li>
     </ul>
 </div>
 
 <section class="block">
-    <h2 class="title is-4">{% trans "Invite Requests" %}</h2>
+    <h2 class="title is-4">
+        {% if ignored %}
+        {% trans "Ignored Invite Requests" %}
+        {% else %}
+        {% trans "Invite Requests" %}
+        {% endif %}
+    </h2>
 
     <table class="table is-striped">
         <tr>
@@ -55,8 +61,13 @@
                     </form>
 
                     <form name="ignore-request" method="post" action="{% url 'settings-invite-requests-ignore' %}">
+                        {% csrf_token %}
                         <input type="hidden" name="invite-request" value="{{ req.id }}">
+                        {% if not req.ignored %}
                         <button type="submit" class="button is-danger is-light is-small">{% trans "Ignore" %}</button>
+                        {% else %}
+                        <button type="submit" class="button is-danger is-light is-small">{% trans "Un-gnore" %}</button>
+                        {% endif %}
                     </form>
                 </div>
                 {% endif %}
@@ -65,5 +76,11 @@
         {% endfor %}
     </table>
     {% include 'snippets/pagination.html' with page=requests path=request.path %}
+
+    {% if ignored %}
+    <p><a href="{% url 'settings-invite-requests' %}">{% trans "Back to pending requests" %}</a></p>
+    {% else %}
+    <p><a href="{% url 'settings-invite-requests' %}?ignored=True">{% trans "View ignored requests" %}</a></p>
+    {% endif %}
 </section>
 {% endblock %}
diff --git a/bookwyrm/templates/settings/manage_invites.html b/bookwyrm/templates/settings/manage_invites.html
index 7ce60908..5b075114 100644
--- a/bookwyrm/templates/settings/manage_invites.html
+++ b/bookwyrm/templates/settings/manage_invites.html
@@ -6,14 +6,14 @@
 
 <div class="tabs">
     <ul>
-        {% url 'settings-invites' as url %}
-        <li {% if url in request.path %}class="is-active" aria-current="page"{% endif %}>
-            <a href="{{ url }}">{% trans "Invites" %}</a>
-        </li>
         {% url 'settings-invite-requests' as url %}
         <li {% if url in request.path %}class="is-active" aria-current="page"{% endif %}>
             <a href="{{ url }}">{% trans "Invite Requests" %}</a>
         </li>
+        {% url 'settings-invites' as url %}
+        <li {% if url in request.path %}class="is-active" aria-current="page"{% endif %}>
+            <a href="{{ url }}">{% trans "Invites" %}</a>
+        </li>
     </ul>
 </div>
 
diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/invite.py
index cec0458a..dea377cf 100644
--- a/bookwyrm/views/invite.py
+++ b/bookwyrm/views/invite.py
@@ -130,4 +130,11 @@ class InviteRequest(View):
 
 @require_POST
 def ignore_invite_request(request):
-    """ ok """
+    """ hide an invite request """
+    invite_request = get_object_or_404(
+        models.InviteRequest, id=request.POST.get("invite-request")
+    )
+
+    invite_request.ignored = not invite_request.ignored
+    invite_request.save()
+    return redirect("settings-invite-requests")

From 5b8bd9ad44e9aff54109e7746403ac150cdaa5d5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 21 Mar 2021 08:18:10 -0700
Subject: [PATCH 0378/1285] Adds tests

---
 bookwyrm/tests/views/test_invite.py | 79 ++++++++++++++++++++++++++++-
 1 file changed, 78 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/tests/views/test_invite.py b/bookwyrm/tests/views/test_invite.py
index cd2276c0..9cb2f9ee 100644
--- a/bookwyrm/tests/views/test_invite.py
+++ b/bookwyrm/tests/views/test_invite.py
@@ -6,7 +6,7 @@ from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
 
-from bookwyrm import models
+from bookwyrm import forms, models
 from bookwyrm import views
 
 
@@ -50,3 +50,80 @@ class InviteViews(TestCase):
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
+
+    def test_invite_request(self):
+        """ request to join a server """
+        form = forms.InviteRequestForm()
+        form.data["email"] = "new@user.email"
+
+        view = views.InviteRequest.as_view()
+        request = self.factory.post("", form.data)
+
+        result = view(request)
+        result.render()
+
+        req = models.InviteRequest.objects.get()
+        self.assertEqual(req.email, "new@user.email")
+
+    def test_invite_request_email_taken(self):
+        """ request to join a server with an existing user email """
+        form = forms.InviteRequestForm()
+        form.data["email"] = "mouse@mouse.mouse"
+
+        view = views.InviteRequest.as_view()
+        request = self.factory.post("", form.data)
+
+        result = view(request)
+        result.render()
+
+        # no request created
+        self.assertFalse(models.InviteRequest.objects.exists())
+
+    def test_manage_invite_requests(self):
+        """ there are so many views, this just makes sure it LOADS """
+        view = views.ManageInviteRequests.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+        request.user.is_superuser = True
+        result = view(request)
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+
+        # now with data
+        models.InviteRequest.objects.create(email="fish@example.com")
+        result = view(request)
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+
+    def test_manage_invite_requests_send(self):
+        """ send an invite """
+        req = models.InviteRequest.objects.create(email="fish@example.com")
+
+        view = views.InviteRequest.as_view()
+        request = self.factory.post("", {"id": req.id})
+        request.user = self.local_user
+        request.user.is_superuser = True
+
+        with patch("bookwyrm.emailing.send_email.delay") as mock:
+            view(request)
+            self.assertEqual(mock.call_count, 1)
+        self.assertIsNotNone(req.invite)
+
+    def test_ignore_invite_request(self):
+        """ don't invite that jerk """
+        req = models.InviteRequest.objects.create(email="fish@example.com")
+
+        view = views.ignore_invite_request
+        request = self.factory.post("", {"invite-request": req.id})
+        request.user = self.local_user
+        request.user.is_superuser = True
+
+        view(request)
+        req.refresh_from_db()
+        self.assertTrue(req.ignored)
+
+        view(request)
+        req.refresh_from_db()
+        self.assertFalse(req.ignored)

From 685da1f5b815c0608730ab83f2b794478711e391 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 21 Mar 2021 08:54:57 -0700
Subject: [PATCH 0379/1285] Adds email templating

---
 bookwyrm/emailing.py                          | 37 +++++++++++--------
 .../email/password_reset/html_content.html    |  2 +
 .../email/password_reset/subject.html         |  2 +
 .../email/password_reset/text_content.html    |  2 +
 4 files changed, 28 insertions(+), 15 deletions(-)
 create mode 100644 bookwyrm/templates/email/password_reset/html_content.html
 create mode 100644 bookwyrm/templates/email/password_reset/subject.html
 create mode 100644 bookwyrm/templates/email/password_reset/text_content.html

diff --git a/bookwyrm/emailing.py b/bookwyrm/emailing.py
index c7536876..561e892f 100644
--- a/bookwyrm/emailing.py
+++ b/bookwyrm/emailing.py
@@ -1,5 +1,6 @@
 """ send emails """
-from django.core.mail import send_mail
+from django.core.mail import EmailMultiAlternatives
+from django.template.loader import get_template
 
 from bookwyrm import models
 from bookwyrm.tasks import app
@@ -7,21 +8,27 @@ from bookwyrm.tasks import app
 
 def password_reset_email(reset_code):
     """ generate a password reset email """
-    site = models.SiteSettings.get()
-    send_email.delay(
-        reset_code.user.email,
-        "Reset your password on %s" % site.name,
-        "Your password reset link: %s" % reset_code.link,
-    )
+    site = models.SiteSettings.objects.get()
+    data = {
+        "site_name": site.name,
+        "reset_link": reset_code.link,
+    }
+    send_email.delay(reset_code.user.email, "password_reset", data)
 
 
 @app.task
-def send_email(recipient, subject, message):
+def send_email(recipient, message_name, data):
     """ use a task to send the email """
-    send_mail(
-        subject,
-        message,
-        None,  # sender will be the config default
-        [recipient],
-        fail_silently=False,
-    )
+    subject = get_template(
+        "email/{}/subject.html".format(message_name)
+    ).render(data).strip()
+    html_content = get_template(
+        "email/{}/html_content.html".format(message_name)
+    ).render(data).strip()
+    text_content = get_template(
+        "email/{}/text_content.html".format(message_name)
+    ).render(data).strip()
+
+    email = EmailMultiAlternatives(subject, text_content, None, [recipient])
+    email.attach_alternative(html_content, "text/html")
+    email.send()
diff --git a/bookwyrm/templates/email/password_reset/html_content.html b/bookwyrm/templates/email/password_reset/html_content.html
new file mode 100644
index 00000000..e3a006b0
--- /dev/null
+++ b/bookwyrm/templates/email/password_reset/html_content.html
@@ -0,0 +1,2 @@
+{% load i18n %}
+{% blocktrans %}Your password reset link is: {{ reset_link }}{% endblocktrans %}
diff --git a/bookwyrm/templates/email/password_reset/subject.html b/bookwyrm/templates/email/password_reset/subject.html
new file mode 100644
index 00000000..b216a6c2
--- /dev/null
+++ b/bookwyrm/templates/email/password_reset/subject.html
@@ -0,0 +1,2 @@
+{% load i18n %}
+{% blocktrans %}Reset your password on {{ site_name }}{% endblocktrans %}
diff --git a/bookwyrm/templates/email/password_reset/text_content.html b/bookwyrm/templates/email/password_reset/text_content.html
new file mode 100644
index 00000000..e3a006b0
--- /dev/null
+++ b/bookwyrm/templates/email/password_reset/text_content.html
@@ -0,0 +1,2 @@
+{% load i18n %}
+{% blocktrans %}Your password reset link is: {{ reset_link }}{% endblocktrans %}

From 1644c421e5fd55b9d1fe32c479b93f3c7a30ed75 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 21 Mar 2021 09:13:21 -0700
Subject: [PATCH 0380/1285] Send invites

---
 bookwyrm/emailing.py                          | 10 +++++
 .../templates/email/invite/html_content.html  |  2 +
 bookwyrm/templates/email/invite/subject.html  |  2 +
 .../templates/email/invite/text_content.html  |  2 +
 bookwyrm/templates/settings/admin_layout.html |  4 +-
 .../settings/manage_invite_requests.html      | 42 ++++++++++---------
 bookwyrm/views/invite.py                      | 14 ++++++-
 7 files changed, 53 insertions(+), 23 deletions(-)
 create mode 100644 bookwyrm/templates/email/invite/html_content.html
 create mode 100644 bookwyrm/templates/email/invite/subject.html
 create mode 100644 bookwyrm/templates/email/invite/text_content.html

diff --git a/bookwyrm/emailing.py b/bookwyrm/emailing.py
index 561e892f..34ba136a 100644
--- a/bookwyrm/emailing.py
+++ b/bookwyrm/emailing.py
@@ -6,6 +6,16 @@ from bookwyrm import models
 from bookwyrm.tasks import app
 
 
+def invite_email(invite_request):
+    """ send out an invite code """
+    site = models.SiteSettings.objects.get()
+    data = {
+        "site_name": site.name,
+        "invite_link": invite_request.invite.link,
+    }
+    send_email.delay(invite_request.email, "invite", data)
+
+
 def password_reset_email(reset_code):
     """ generate a password reset email """
     site = models.SiteSettings.objects.get()
diff --git a/bookwyrm/templates/email/invite/html_content.html b/bookwyrm/templates/email/invite/html_content.html
new file mode 100644
index 00000000..672d3407
--- /dev/null
+++ b/bookwyrm/templates/email/invite/html_content.html
@@ -0,0 +1,2 @@
+{% load i18n %}
+<a href="{{ invite_link }}">{% blocktrans %}Join {{ site_name }}{% endblocktrans %}</a>
diff --git a/bookwyrm/templates/email/invite/subject.html b/bookwyrm/templates/email/invite/subject.html
new file mode 100644
index 00000000..b3c4a141
--- /dev/null
+++ b/bookwyrm/templates/email/invite/subject.html
@@ -0,0 +1,2 @@
+{% load i18n %}
+{% blocktrans %}You're invited! Join {{ site_name }}{% endblocktrans %}
diff --git a/bookwyrm/templates/email/invite/text_content.html b/bookwyrm/templates/email/invite/text_content.html
new file mode 100644
index 00000000..7add9010
--- /dev/null
+++ b/bookwyrm/templates/email/invite/text_content.html
@@ -0,0 +1,2 @@
+{% load i18n %}
+{% blocktrans %}Join {{ site_name }}: {{ invite_link }}{% endblocktrans %}
diff --git a/bookwyrm/templates/settings/admin_layout.html b/bookwyrm/templates/settings/admin_layout.html
index 397df473..cfc7a92a 100644
--- a/bookwyrm/templates/settings/admin_layout.html
+++ b/bookwyrm/templates/settings/admin_layout.html
@@ -15,8 +15,8 @@
         <h2 class="menu-label">{% trans "Manage Users" %}</h2>
         <ul class="menu-list">
             <li>
-                {% url 'settings-invites' as url %}
-                {% url 'settings-invite-requests' as alt_url %}
+                {% url 'settings-invite-requests' as url %}
+                {% url 'settings-invites' as alt_url %}
                 <a href="{{ url }}"{% if url in request.path or request.path in alt_url %} class="is-active" aria-selected="true"{% endif %}>{% trans "Invites" %}</a>
             </li>
             <li>
diff --git a/bookwyrm/templates/settings/manage_invite_requests.html b/bookwyrm/templates/settings/manage_invite_requests.html
index 538ffccf..a7648a7f 100644
--- a/bookwyrm/templates/settings/manage_invite_requests.html
+++ b/bookwyrm/templates/settings/manage_invite_requests.html
@@ -49,27 +49,29 @@
                 {% trans "Requested" %}
                 {% endif %}
             </td>
-            <td>
-                {% if req.invite and not req.invite.times_used %}
-                <button class="button is-danger is-light is-small">{% trans "Revoke invite" %}</button>
-                {% else %}
-                <div class="field is-grouped">
-                    <form name="send-invite" method="post" action="{% url 'settings-invite-requests' %}">
-                        {% csrf_token %}
-                        <input type="hidden" name="invite-request" value="{{ req.id }}">
-                        <button type="submit" class="button is-link is-light is-small">{% trans "Send invite" %}</button>
-                    </form>
+            <td class="field is-grouped">
+                <form name="send-invite" method="post" action="{% url 'settings-invite-requests' %}">
+                    {% csrf_token %}
+                    <input type="hidden" name="invite-request" value="{{ req.id }}">
+                    {% if not req.invite %}
+                    <button type="submit" class="button is-link is-light is-small">{% trans "Send invite" %}</button>
+                    {% else %}
+                    <button type="submit" class="button is-link is-light is-small">{% trans "Re-send invite" %}</button>
+                    {% endif %}
+                </form>
 
-                    <form name="ignore-request" method="post" action="{% url 'settings-invite-requests-ignore' %}">
-                        {% csrf_token %}
-                        <input type="hidden" name="invite-request" value="{{ req.id }}">
-                        {% if not req.ignored %}
-                        <button type="submit" class="button is-danger is-light is-small">{% trans "Ignore" %}</button>
-                        {% else %}
-                        <button type="submit" class="button is-danger is-light is-small">{% trans "Un-gnore" %}</button>
-                        {% endif %}
-                    </form>
-                </div>
+                {% if req.invite and not req.invite.times_used %}
+                {# <button class="button is-danger is-light is-small">{% trans "Revoke invite" %}</button> #}
+                {% else %}
+                <form name="ignore-request" method="post" action="{% url 'settings-invite-requests-ignore' %}">
+                    {% csrf_token %}
+                    <input type="hidden" name="invite-request" value="{{ req.id }}">
+                    {% if not req.ignored %}
+                    <button type="submit" class="button is-danger is-light is-small">{% trans "Ignore" %}</button>
+                    {% else %}
+                    <button type="submit" class="button is-danger is-light is-small">{% trans "Un-gnore" %}</button>
+                    {% endif %}
+                </form>
                 {% endif %}
             </td>
         </tr>
diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/invite.py
index dea377cf..c0532e98 100644
--- a/bookwyrm/views/invite.py
+++ b/bookwyrm/views/invite.py
@@ -8,7 +8,7 @@ from django.utils.decorators import method_decorator
 from django.views import View
 from django.views.decorators.http import require_POST
 
-from bookwyrm import forms, models
+from bookwyrm import emailing, forms, models
 from bookwyrm.settings import PAGE_LENGTH
 from . import helpers
 
@@ -107,6 +107,18 @@ class ManageInviteRequests(View):
 
     def post(self, request):
         """ send out an invite """
+        invite_request = get_object_or_404(
+            models.InviteRequest, id=request.POST.get("invite-request")
+        )
+        # allows re-sending invites
+        invite_request.invite, _ = models.SiteInvite.objects.get_or_create(
+            use_limit=1,
+            user=request.user,
+        )
+
+        invite_request.save()
+        emailing.invite_email(invite_request)
+        return redirect('settings-invite-requests')
 
 
 class InviteRequest(View):

From 4575fe24c72b01db579d2270fb0141c26f6a111c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 21 Mar 2021 09:20:32 -0700
Subject: [PATCH 0381/1285] Updates readme

---
 README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/README.md b/README.md
index 6487137c..10f77c04 100644
--- a/README.md
+++ b/README.md
@@ -16,9 +16,6 @@ Social reading and reviewing, decentralized with ActivityPub
 ## Joining BookWyrm
 BookWyrm is still a young piece of software, and isn't at the level of stability and feature-richness that you'd find in a production-ready application. But it does what it says on the box! If you'd like to join an instance, you can check out the [instances](https://github.com/mouse-reeve/bookwyrm/blob/main/instances.md) list.
 
-You can request an invite to https://bookwyrm.social by [email](mailto:mousereeve@riseup.net), [Mastodon direct message](https://friend.camp/@tripofmice), or [Twitter direct message](https://twitter.com/tripofmice).
-
-
 ## Contributing
 There are many ways you can contribute to this project, regardless of your level of technical expertise.
 

From 33b5639af04e73ddacec55abae9c55352e8a88ec Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 21 Mar 2021 09:20:37 -0700
Subject: [PATCH 0382/1285] Fixes tests

---
 bookwyrm/emailing.py                | 22 +++++++++++++---------
 bookwyrm/tests/views/test_invite.py |  5 +++--
 bookwyrm/views/invite.py            |  2 +-
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/bookwyrm/emailing.py b/bookwyrm/emailing.py
index 34ba136a..7069286d 100644
--- a/bookwyrm/emailing.py
+++ b/bookwyrm/emailing.py
@@ -29,15 +29,19 @@ def password_reset_email(reset_code):
 @app.task
 def send_email(recipient, message_name, data):
     """ use a task to send the email """
-    subject = get_template(
-        "email/{}/subject.html".format(message_name)
-    ).render(data).strip()
-    html_content = get_template(
-        "email/{}/html_content.html".format(message_name)
-    ).render(data).strip()
-    text_content = get_template(
-        "email/{}/text_content.html".format(message_name)
-    ).render(data).strip()
+    subject = (
+        get_template("email/{}/subject.html".format(message_name)).render(data).strip()
+    )
+    html_content = (
+        get_template("email/{}/html_content.html".format(message_name))
+        .render(data)
+        .strip()
+    )
+    text_content = (
+        get_template("email/{}/text_content.html".format(message_name))
+        .render(data)
+        .strip()
+    )
 
     email = EmailMultiAlternatives(subject, text_content, None, [recipient])
     email.attach_alternative(html_content, "text/html")
diff --git a/bookwyrm/tests/views/test_invite.py b/bookwyrm/tests/views/test_invite.py
index 9cb2f9ee..7bfc8fe5 100644
--- a/bookwyrm/tests/views/test_invite.py
+++ b/bookwyrm/tests/views/test_invite.py
@@ -101,14 +101,15 @@ class InviteViews(TestCase):
         """ send an invite """
         req = models.InviteRequest.objects.create(email="fish@example.com")
 
-        view = views.InviteRequest.as_view()
-        request = self.factory.post("", {"id": req.id})
+        view = views.ManageInviteRequests.as_view()
+        request = self.factory.post("", {"invite-request": req.id})
         request.user = self.local_user
         request.user.is_superuser = True
 
         with patch("bookwyrm.emailing.send_email.delay") as mock:
             view(request)
             self.assertEqual(mock.call_count, 1)
+        req.refresh_from_db()
         self.assertIsNotNone(req.invite)
 
     def test_ignore_invite_request(self):
diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/invite.py
index c0532e98..e4b98cba 100644
--- a/bookwyrm/views/invite.py
+++ b/bookwyrm/views/invite.py
@@ -118,7 +118,7 @@ class ManageInviteRequests(View):
 
         invite_request.save()
         emailing.invite_email(invite_request)
-        return redirect('settings-invite-requests')
+        return redirect("settings-invite-requests")
 
 
 class InviteRequest(View):

From d8a20175b685e26df3fc40f338a2cf074b26ccf6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 21 Mar 2021 11:43:14 -0700
Subject: [PATCH 0383/1285] Adds email template layout and formatting

---
 bookwyrm/emailing.py                          |  32 ++++++++++++------
 bookwyrm/static/images/logo-small.png         | Bin 7039 -> 7314 bytes
 bookwyrm/templates/email/html_layout.html     |  26 ++++++++++++++
 .../templates/email/invite/html_content.html  |  17 +++++++++-
 bookwyrm/templates/email/invite/subject.html  |   2 +-
 .../templates/email/invite/text_content.html  |  10 +++++-
 .../email/password_reset/html_content.html    |  15 +++++++-
 .../email/password_reset/subject.html         |   2 +-
 .../email/password_reset/text_content.html    |   9 ++++-
 bookwyrm/templates/email/preview.html         |  19 +++++++++++
 bookwyrm/templates/email/snippets/action.html |   5 +++
 bookwyrm/templates/email/text_layout.html     |   3 ++
 .../templates/password_reset_request.html     |   7 +++-
 bookwyrm/urls.py                              |   9 +++--
 bookwyrm/views/site.py                        |  16 ++++++++-
 15 files changed, 152 insertions(+), 20 deletions(-)
 create mode 100644 bookwyrm/templates/email/html_layout.html
 create mode 100644 bookwyrm/templates/email/preview.html
 create mode 100644 bookwyrm/templates/email/snippets/action.html
 create mode 100644 bookwyrm/templates/email/text_layout.html

diff --git a/bookwyrm/emailing.py b/bookwyrm/emailing.py
index 7069286d..4025aa22 100644
--- a/bookwyrm/emailing.py
+++ b/bookwyrm/emailing.py
@@ -4,25 +4,37 @@ from django.template.loader import get_template
 
 from bookwyrm import models
 from bookwyrm.tasks import app
+from bookwyrm.settings import DOMAIN
+
+
+def email_data():
+    """ fields every email needs """
+    site = models.SiteSettings.objects.get()
+    if site.logo_small:
+        logo_path = '/images/{}'.format(site.logo_small.url)
+    else:
+        logo_path = '/static/images/logo-small.png'
+
+    return {
+        "site_name": site.name,
+        "logo": logo_path,
+        "domain": DOMAIN,
+        "user": None,
+    }
 
 
 def invite_email(invite_request):
     """ send out an invite code """
-    site = models.SiteSettings.objects.get()
-    data = {
-        "site_name": site.name,
-        "invite_link": invite_request.invite.link,
-    }
+    data = email_data()
+    data["invite_link"] = invite_request.invite.link
     send_email.delay(invite_request.email, "invite", data)
 
 
 def password_reset_email(reset_code):
     """ generate a password reset email """
-    site = models.SiteSettings.objects.get()
-    data = {
-        "site_name": site.name,
-        "reset_link": reset_code.link,
-    }
+    data = email_data()
+    data["reset_link"] = reset_code.link
+    data["user"] = reset_code.user.diplay_name
     send_email.delay(reset_code.user.email, "password_reset", data)
 
 
diff --git a/bookwyrm/static/images/logo-small.png b/bookwyrm/static/images/logo-small.png
index 10ea7a38fce9c962399af6697619cc9952cde89a..72f49ef78b35ce0ab8408ea3a254398274a219bf 100644
GIT binary patch
delta 6585
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

delta 6307
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
Z{|EBj^_`|r6vqGn002ovPDHLkV1lYr@3Q~^

diff --git a/bookwyrm/templates/email/html_layout.html b/bookwyrm/templates/email/html_layout.html
new file mode 100644
index 00000000..02527ff5
--- /dev/null
+++ b/bookwyrm/templates/email/html_layout.html
@@ -0,0 +1,26 @@
+{% load i18n %}
+<div style="font-family: BlinkMacSystemFont,-apple-system,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Fira Sans','Droid Sans','Helvetica Neue',Helvetica,Arial,sans-serif; border-radius: 6px; background-color: #efefef; max-width: 632px;">
+    <div style="padding: 1rem; overflow: auto;">
+        <div style="float: left; margin-right: 1rem;">
+            <a style="color: #3273dc;" href="https://{{ domain }}" style="text-decoration: none;"><img src="https://{{ domain }}/{{ logo }}" alt="logo"></a>
+        </div>
+        <div>
+            <a style="color: black; text-decoration: none" href="https://{{ domain }}" style="text-decoration: none;"><strong>{{ site_name }}</strong><br>
+            {{ domain }}</a>
+        </div>
+    </div>
+
+    <div style="padding: 1rem; background-color: white;">
+        <p>
+            {% if user %}{{ user }},{% else %}{% trans "Hi there," %}{% endif %}
+        </p>
+        {% block content %}{% endblock %}
+    </div>
+
+    <div style="padding: 1rem; font-size: 0.8rem;">
+        <p style="margin: 0; color: #333;">{% blocktrans %}BookWyrm hosted on <a style="color: #3273dc;" href="https://{{ domain }}">{{ site_name }}</a>{% endblocktrans %}</p>
+        {% if user %}
+        <p style="margin: 0; color: #333;"><a style="color: #3273dc;" href="https://{{ domain }}{% url 'prefs-profile' %}">{% trans "Email preference" %}</a></p>
+        {% endif %}
+    </div>
+</div>
diff --git a/bookwyrm/templates/email/invite/html_content.html b/bookwyrm/templates/email/invite/html_content.html
index 672d3407..358e23dc 100644
--- a/bookwyrm/templates/email/invite/html_content.html
+++ b/bookwyrm/templates/email/invite/html_content.html
@@ -1,2 +1,17 @@
+{% extends 'email/html_layout.html' %}
 {% load i18n %}
-<a href="{{ invite_link }}">{% blocktrans %}Join {{ site_name }}{% endblocktrans %}</a>
+
+{% block content %}
+<p>
+    {% blocktrans %}You're invited to join {{ site_name }}!{% endblocktrans %}
+</p>
+
+{% trans "Join Now" as text %}
+{% include 'email/snippets/action.html' with path=invite_link text=text %}
+
+<p>
+    {% url 'code-of-conduct' as coc_path %}
+    {% url 'about' as about_path %}
+    {% blocktrans %}Learn more <a href="https://{{ domain }}{{ about_path }}">about this instance</a>.{% endblocktrans %}
+</p>
+{% endblock %}
diff --git a/bookwyrm/templates/email/invite/subject.html b/bookwyrm/templates/email/invite/subject.html
index b3c4a141..efb8be5a 100644
--- a/bookwyrm/templates/email/invite/subject.html
+++ b/bookwyrm/templates/email/invite/subject.html
@@ -1,2 +1,2 @@
 {% load i18n %}
-{% blocktrans %}You're invited! Join {{ site_name }}{% endblocktrans %}
+{% blocktrans %}You're invited to join {{ site_name }}!{% endblocktrans %}
diff --git a/bookwyrm/templates/email/invite/text_content.html b/bookwyrm/templates/email/invite/text_content.html
index 7add9010..c3fcdc04 100644
--- a/bookwyrm/templates/email/invite/text_content.html
+++ b/bookwyrm/templates/email/invite/text_content.html
@@ -1,2 +1,10 @@
+{% extends 'email/text_layout.html' %}
 {% load i18n %}
-{% blocktrans %}Join {{ site_name }}: {{ invite_link }}{% endblocktrans %}
+{% block content %}
+{% blocktrans %}You're invited to join {{ site_name }}! Click the link below to create an account.{% endblocktrans %}
+
+{{ invite_link }}
+
+{% trans "Learn more about this instance:" %} https://{{ domain }}{% url 'about' %}
+
+{% endblock %}
diff --git a/bookwyrm/templates/email/password_reset/html_content.html b/bookwyrm/templates/email/password_reset/html_content.html
index e3a006b0..eef0e5e5 100644
--- a/bookwyrm/templates/email/password_reset/html_content.html
+++ b/bookwyrm/templates/email/password_reset/html_content.html
@@ -1,2 +1,15 @@
+{% extends 'email/html_layout.html' %}
 {% load i18n %}
-{% blocktrans %}Your password reset link is: {{ reset_link }}{% endblocktrans %}
+
+{% block content %}
+<p>
+    {% blocktrans %}You requested to reset your {{ site_name }} password. Click the link below to set a new password and log in to your account.{% endblocktrans %}
+</p>
+
+{% trans "Reset Password" as text %}
+{% include 'email/snippets/action.html' with path=reset_link text=text %}
+
+<p>
+    {% trans "If you didn't request to reset your password, you can ignore this email." %}
+</p>
+{% endblock %}
diff --git a/bookwyrm/templates/email/password_reset/subject.html b/bookwyrm/templates/email/password_reset/subject.html
index b216a6c2..88680140 100644
--- a/bookwyrm/templates/email/password_reset/subject.html
+++ b/bookwyrm/templates/email/password_reset/subject.html
@@ -1,2 +1,2 @@
 {% load i18n %}
-{% blocktrans %}Reset your password on {{ site_name }}{% endblocktrans %}
+{% blocktrans %}Reset your {{ site_name }} password{% endblocktrans %}
diff --git a/bookwyrm/templates/email/password_reset/text_content.html b/bookwyrm/templates/email/password_reset/text_content.html
index e3a006b0..b5cf754e 100644
--- a/bookwyrm/templates/email/password_reset/text_content.html
+++ b/bookwyrm/templates/email/password_reset/text_content.html
@@ -1,2 +1,9 @@
+{% extends 'email/text_layout.html' %}
 {% load i18n %}
-{% blocktrans %}Your password reset link is: {{ reset_link }}{% endblocktrans %}
+{% block content %}
+{% blocktrans %}You requested to reset your {{ site_name }} password. Click the link below to set a new password and log in to your account.{% endblocktrans %}
+
+{{ reset_link }}
+
+{% trans "If you didn't request to reset your password, you can ignore this email." %}
+{% endblock %}
diff --git a/bookwyrm/templates/email/preview.html b/bookwyrm/templates/email/preview.html
new file mode 100644
index 00000000..66d856c0
--- /dev/null
+++ b/bookwyrm/templates/email/preview.html
@@ -0,0 +1,19 @@
+<html>
+<body>
+    <div>
+        <strong>Subject:</strong> {% include subject_path %}
+    </div>
+    <hr>
+
+    <strong>Html email:</strong>
+    <div style="border: 1px solid #c0c0c0; margin: 2em; padding: 1em;">
+        {% include html_content_path %}
+    </div>
+    <hr>
+
+    <strong>Text email:</strong>
+    <div style="border: 1px solid #c0c0c0; margin: 2em; padding: 1em; white-space: pre;">
+        {% include text_content_path %}
+    </div>
+</body>
+</html>
diff --git a/bookwyrm/templates/email/snippets/action.html b/bookwyrm/templates/email/snippets/action.html
new file mode 100644
index 00000000..56feb9ef
--- /dev/null
+++ b/bookwyrm/templates/email/snippets/action.html
@@ -0,0 +1,5 @@
+<p style="text-align: center; margin: 2rem;">
+    <a href="{{ path }}" style="background-color: #3273dc; color: #fff; border-radius: 4px; padding: 0.5rem 1rem; text-decoration: none;">
+        {{ text }} 
+    </a>
+</p>
diff --git a/bookwyrm/templates/email/text_layout.html b/bookwyrm/templates/email/text_layout.html
new file mode 100644
index 00000000..cd0444f1
--- /dev/null
+++ b/bookwyrm/templates/email/text_layout.html
@@ -0,0 +1,3 @@
+{% load i18n %}
+{% if user %}{{ user.display_name }},{% else %}{% trans "Hi there," %}{% endif %}
+{% block content %}{% endblock %}
diff --git a/bookwyrm/templates/password_reset_request.html b/bookwyrm/templates/password_reset_request.html
index 97191afa..5d877442 100644
--- a/bookwyrm/templates/password_reset_request.html
+++ b/bookwyrm/templates/password_reset_request.html
@@ -8,7 +8,9 @@
     <div class="column is-half">
         <div class="block">
             <h1 class="title">{% trans "Reset Password" %}</h1>
-            {% if message %}<p>{{ message }}</p>{% endif %}
+
+            {% if message %}<p class="notification is-primary">{{ message }}</p>{% endif %}
+
             <p>{% trans "A link to reset your password will be sent to your email address" %}</p>
             <form name="password-reset" method="post" action="/password-reset">
                 {% csrf_token %}
@@ -16,6 +18,9 @@
                     <label class="label" for="id_email_register">{% trans "Email address:" %}</label>
                     <div class="control">
                         <input type="email" name="email" maxlength="254" class="input" id="id_email_register">
+                        {% if error %}
+                        <p class="help is-danger">{{ error }}</p>
+                        {% endif %}
                     </div>
                 </div>
                 <div class="field is-grouped">
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 30c1bba4..4aced6fe 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -48,6 +48,11 @@ urlpatterns = [
     ),
     # admin
     re_path(r"^settings/site-settings", views.Site.as_view(), name="settings-site"),
+    re_path(
+        r"^settings/email-preview",
+        views.site.email_preview,
+        name="settings-email-preview",
+    ),
     re_path(
         r"^settings/federation", views.Federation.as_view(), name="settings-federation"
     ),
@@ -87,8 +92,8 @@ urlpatterns = [
     ),
     re_path(r"^report/?$", views.make_report, name="report"),
     # landing pages
-    re_path(r"^about/?$", views.About.as_view()),
-    path("", views.Home.as_view()),
+    re_path(r"^about/?$", views.About.as_view(), name="about"),
+    path("", views.Home.as_view(), name="landing"),
     re_path(r"^discover/?$", views.Discover.as_view()),
     re_path(r"^notifications/?$", views.Notifications.as_view()),
     # feeds
diff --git a/bookwyrm/views/site.py b/bookwyrm/views/site.py
index ce64e6e0..5b33b92a 100644
--- a/bookwyrm/views/site.py
+++ b/bookwyrm/views/site.py
@@ -5,7 +5,7 @@ from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
 
-from bookwyrm import forms, models
+from bookwyrm import emailing, forms, models
 
 
 # pylint: disable= no-self-use
@@ -33,3 +33,17 @@ class Site(View):
         form.save()
 
         return redirect("settings-site")
+
+
+@login_required
+@permission_required("bookwyrm.edit_instance_settings", raise_exception=True)
+def email_preview(request):
+    """ for development, renders and example email template """
+    template = request.GET.get('email')
+    data = emailing.email_data()
+    data["subject_path"] = "email/{}/subject.html".format(template)
+    data["html_content_path"] = "email/{}/html_content.html".format(template)
+    data["text_content_path"] = "email/{}/text_content.html".format(template)
+    data["reset_link"] = "https://example.com/link"
+    data["invite_link"] = "https://example.com/link"
+    return TemplateResponse(request, "email/preview.html", data)

From c76ad0a3122f481e7aedfb5f5759868598c73d61 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 21 Mar 2021 12:06:20 -0700
Subject: [PATCH 0384/1285] Celery can't render tempaltes

---
 bookwyrm/emailing.py       | 23 +++++++++++++----------
 bookwyrm/views/password.py |  6 ++++--
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/bookwyrm/emailing.py b/bookwyrm/emailing.py
index 4025aa22..e58423e8 100644
--- a/bookwyrm/emailing.py
+++ b/bookwyrm/emailing.py
@@ -27,34 +27,37 @@ def invite_email(invite_request):
     """ send out an invite code """
     data = email_data()
     data["invite_link"] = invite_request.invite.link
-    send_email.delay(invite_request.email, "invite", data)
+    send_email.delay(invite_request.email, *format_email("invite", data))
 
 
 def password_reset_email(reset_code):
     """ generate a password reset email """
     data = email_data()
     data["reset_link"] = reset_code.link
-    data["user"] = reset_code.user.diplay_name
-    send_email.delay(reset_code.user.email, "password_reset", data)
+    data["user"] = reset_code.user.display_name
+    send_email.delay(reset_code.user.email, *format_email("password_reset", data))
 
-
-@app.task
-def send_email(recipient, message_name, data):
-    """ use a task to send the email """
+def format_email(email_name, data):
+    """ render the email templates """
     subject = (
-        get_template("email/{}/subject.html".format(message_name)).render(data).strip()
+        get_template("email/{}/subject.html".format(email_name)).render(data).strip()
     )
     html_content = (
-        get_template("email/{}/html_content.html".format(message_name))
+        get_template("email/{}/html_content.html".format(email_name))
         .render(data)
         .strip()
     )
     text_content = (
-        get_template("email/{}/text_content.html".format(message_name))
+        get_template("email/{}/text_content.html".format(email_name))
         .render(data)
         .strip()
     )
+    return (subject, html_content, text_content)
 
+
+@app.task
+def send_email(recipient, subject, html_content, text_content):
+    """ use a task to send the email """
     email = EmailMultiAlternatives(subject, text_content, None, [recipient])
     email.attach_alternative(html_content, "text/html")
     email.send()
diff --git a/bookwyrm/views/password.py b/bookwyrm/views/password.py
index e853d16b..2926b9d7 100644
--- a/bookwyrm/views/password.py
+++ b/bookwyrm/views/password.py
@@ -5,6 +5,7 @@ from django.core.exceptions import PermissionDenied
 from django.shortcuts import redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
+from django.utils.translation import gettext as _
 from django.views import View
 
 from bookwyrm import models
@@ -28,7 +29,8 @@ class PasswordResetRequest(View):
         try:
             user = models.User.objects.get(email=email)
         except models.User.DoesNotExist:
-            return redirect("/password-reset")
+            data = {"error": _("No user with that email address was found.")}
+            return TemplateResponse(request, "password_reset_request.html", data)
 
         # remove any existing password reset cods for this user
         models.PasswordReset.objects.filter(user=user).all().delete()
@@ -36,7 +38,7 @@ class PasswordResetRequest(View):
         # create a new reset code
         code = models.PasswordReset.objects.create(user=user)
         password_reset_email(code)
-        data = {"message": "Password reset link sent to %s" % email}
+        data = {"message": _("A password reset link sent to %s" % email)}
         return TemplateResponse(request, "password_reset_request.html", data)
 
 

From da2d146f0bccc99c10e8b02606cf1c1503a619fd Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 21 Mar 2021 12:07:58 -0700
Subject: [PATCH 0385/1285] runs black for python formatting

---
 bookwyrm/emailing.py   | 5 +++--
 bookwyrm/views/site.py | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/emailing.py b/bookwyrm/emailing.py
index e58423e8..47ac59df 100644
--- a/bookwyrm/emailing.py
+++ b/bookwyrm/emailing.py
@@ -11,9 +11,9 @@ def email_data():
     """ fields every email needs """
     site = models.SiteSettings.objects.get()
     if site.logo_small:
-        logo_path = '/images/{}'.format(site.logo_small.url)
+        logo_path = "/images/{}".format(site.logo_small.url)
     else:
-        logo_path = '/static/images/logo-small.png'
+        logo_path = "/static/images/logo-small.png"
 
     return {
         "site_name": site.name,
@@ -37,6 +37,7 @@ def password_reset_email(reset_code):
     data["user"] = reset_code.user.display_name
     send_email.delay(reset_code.user.email, *format_email("password_reset", data))
 
+
 def format_email(email_name, data):
     """ render the email templates """
     subject = (
diff --git a/bookwyrm/views/site.py b/bookwyrm/views/site.py
index 5b33b92a..e5897660 100644
--- a/bookwyrm/views/site.py
+++ b/bookwyrm/views/site.py
@@ -39,7 +39,7 @@ class Site(View):
 @permission_required("bookwyrm.edit_instance_settings", raise_exception=True)
 def email_preview(request):
     """ for development, renders and example email template """
-    template = request.GET.get('email')
+    template = request.GET.get("email")
     data = emailing.email_data()
     data["subject_path"] = "email/{}/subject.html".format(template)
     data["html_content_path"] = "email/{}/html_content.html".format(template)

From a0b106f6bbfadabb1d8d50e060d5e14b53550d48 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 21 Mar 2021 12:30:53 -0700
Subject: [PATCH 0386/1285] Adds emailing tests

---
 bookwyrm/tests/test_emailing.py         | 51 +++++++++++++++++++++++++
 bookwyrm/tests/test_goodreads_import.py |  3 +-
 2 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 bookwyrm/tests/test_emailing.py

diff --git a/bookwyrm/tests/test_emailing.py b/bookwyrm/tests/test_emailing.py
new file mode 100644
index 00000000..5d7d4894
--- /dev/null
+++ b/bookwyrm/tests/test_emailing.py
@@ -0,0 +1,51 @@
+""" test creating emails """
+from unittest.mock import patch
+
+from django.test import TestCase
+from django.test.client import RequestFactory
+import responses
+
+from bookwyrm import emailing, models
+
+
+@patch("bookwyrm.emailing.send_email.delay")
+class Emailing(TestCase):
+    """ every response to a get request, html or json """
+
+    def setUp(self):
+        """ we need basic test data and mocks """
+        self.factory = RequestFactory()
+        self.local_user = models.User.objects.create_user(
+            "mouse@local.com",
+            "mouse@mouse.mouse",
+            "password",
+            local=True,
+            localname="mouse",
+        )
+        models.SiteSettings.objects.create()
+
+    def test_invite_email(self, email_mock):
+        """ load the invite email """
+        invite_request = models.InviteRequest.objects.create(
+            email="test@email.com",
+            invite=models.SiteInvite.objects.create(user=self.local_user),
+        )
+
+        emailing.invite_email(invite_request)
+
+        self.assertEqual(email_mock.call_count, 1)
+        args = email_mock.call_args[0]
+        self.assertEqual(args[0], "test@email.com")
+        self.assertEqual(args[1], "You're invited to join BookWyrm!")
+        self.assertEqual(len(args), 4)
+
+    def test_password_reset_email(self, email_mock):
+        """ load the password reset email """
+        reset = models.PasswordReset.objects.create(user=self.local_user)
+        emailing.password_reset_email(reset)
+
+        self.assertEqual(email_mock.call_count, 1)
+        args = email_mock.call_args[0]
+        self.assertEqual(args[0], "mouse@mouse.mouse")
+        self.assertEqual(args[1], "Reset your BookWyrm password")
+        self.assertEqual(len(args), 4)
diff --git a/bookwyrm/tests/test_goodreads_import.py b/bookwyrm/tests/test_goodreads_import.py
index 080ccd15..a62cfdd2 100644
--- a/bookwyrm/tests/test_goodreads_import.py
+++ b/bookwyrm/tests/test_goodreads_import.py
@@ -9,7 +9,6 @@ import responses
 
 from bookwyrm import models, importer
 from bookwyrm.goodreads_import import GoodreadsImporter
-from bookwyrm import importer
 from bookwyrm.settings import DOMAIN
 
 
@@ -17,8 +16,8 @@ class GoodreadsImport(TestCase):
     """ importing from goodreads csv """
 
     def setUp(self):
-        self.importer = GoodreadsImporter()
         """ use a test csv """
+        self.importer = GoodreadsImporter()
         datafile = pathlib.Path(__file__).parent.joinpath("data/goodreads.csv")
         self.csv = open(datafile, "r", encoding=self.importer.encoding)
         self.user = models.User.objects.create_user(

From b29be11862586d97eb76bf72c469a628dba8d5d6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 21 Mar 2021 12:33:19 -0700
Subject: [PATCH 0387/1285] Updates reset password view test

---
 bookwyrm/tests/views/test_password.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/tests/views/test_password.py b/bookwyrm/tests/views/test_password.py
index f67f5538..53a9bcbd 100644
--- a/bookwyrm/tests/views/test_password.py
+++ b/bookwyrm/tests/views/test_password.py
@@ -42,7 +42,8 @@ class PasswordViews(TestCase):
         request = self.factory.post("", {"email": "aa@bb.ccc"})
         view = views.PasswordResetRequest.as_view()
         resp = view(request)
-        self.assertEqual(resp.status_code, 302)
+        self.assertEqual(resp.status_code, 200)
+        resp.render()
 
         request = self.factory.post("", {"email": "mouse@mouse.com"})
         with patch("bookwyrm.emailing.send_email.delay"):

From ef07a797e24a7b44827b816ea0d797bf77da6978 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 21 Mar 2021 14:31:51 -0700
Subject: [PATCH 0388/1285] Copies over the production README

---
 README.md | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 10f77c04..e6a75375 100644
--- a/README.md
+++ b/README.md
@@ -213,17 +213,6 @@ Congrats! You did it, go to your domain and enjoy the fruits of your labors.
     ```
     - Go to the site settings (`/settings/site-settings` on your domain) and configure your instance name, description, code of conduct, and toggle whether registration is open on your instance
 
-
-## Book data
-The application is set up to share book and author data between instances, and get book data from arbitrary outside sources. Right now, the only connector is to OpenLibrary, but other connectors could be written.
-
-There are three concepts in the book data model:
-- `Book`, an abstract, high-level concept that could mean either a `Work` or an `Edition`. No data is saved as a `Book`, it serves as shared model for `Work` and `Edition`
-- `Work`, the theoretical umbrella concept of a book that encompasses every edition of the book, and
-- `Edition`, a concrete, actually published version of a book
- 
-Whenever a user interacts with a book, they are interacting with a specific edition. Every work has a default edition, but the user can select other editions. Reviews aggregated for all editions of a work when you view an edition's page.
-
 ### Backups
 
 BookWyrm's db service dumps a backup copy of its database to its `/backups` directory daily at midnight UTC.
@@ -238,6 +227,15 @@ You can copy backups from the backups volume to your host machine with `docker c
 - Run `docker-compose ps` to confirm the db service's full name (it's probably `bookwyrm_db_1`.
 - Run `docker cp <container_name>:/backups <host machine path>`
 
+### Updating your instance
+
+When there are changes available in the production branch, you can install and get them running on your instance using the command `./bw-dev update`. This does a number of things:
+- `git pull` gets the updated code from the git repository. If there are conflicts, you may need to run `git pull` separately and resolve the conflicts before trying the `./bw-dev update` script again.
+- `docker-compose build` rebuilds the images, which ensures that the correct packages are installed. This step takes a long time and is only needed when the dependencies (including pip `requirements.txt` packages) have changed, so you can comment it out if you want a quicker update path and don't mind un-commenting it as needed.
+- `docker-compose exec web python manage.py migrate` runs the database migrations in Django
+- `docker-compose exec web python manage.py collectstatic --no-input` loads any updated static files (such as the JavaScript and CSS)
+- `docker-compose restart` reloads the docker containers
+
 ### Port Conflicts
 
 BookWyrm has multiple services that run on their default ports.
@@ -317,3 +315,14 @@ To set up your server:
 - restart nginx
 
 If everything worked correctly, your BookWyrm instance should now be externally accessible.
+
+
+## Book data
+The application is set up to share book and author data between instances, and get book data from arbitrary outside sources. Right now, the only connector is to OpenLibrary, but other connectors could be written.
+
+There are three concepts in the book data model:
+- `Book`, an abstract, high-level concept that could mean either a `Work` or an `Edition`. No data is saved as a `Book`, it serves as shared model for `Work` and `Edition`
+- `Work`, the theoretical umbrella concept of a book that encompasses every edition of the book, and
+- `Edition`, a concrete, actually published version of a book
+
+Whenever a user interacts with a book, they are interacting with a specific edition. Every work has a default edition, but the user can select other editions. Reviews aggregated for all editions of a work when you view an edition's page.

From ad8baa9122e90d3b6b28579f3d6a947ec4ec054f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 21 Mar 2021 14:32:18 -0700
Subject: [PATCH 0389/1285] Adds compiled german translations

---
 locale/de_DE/LC_MESSAGES/django.mo | Bin 24140 -> 26527 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo
index 40fbee8d9c94aee1ae58b831cb6482f9801e9893..61a659d88d5d224d5972244a1911861061102464 100644
GIT binary patch
delta 10033
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

delta 7725
zcmZwMd0bUx9>?)>RTLCZKoBGlQE^37T)<p$mjo3Q4W&phDJ2z2EA6Uj>6lyBEz7iV
zsmw9!T8&GkO^s>hQrT{1)?}JxnQJ=D=X=ku*ULZVy!!Eee$RQ%vz>D;S6X}6b8xrE
z`*mcs<qpS4kK^2e-_>-S4=8VmR;}ZFLuCb?#JM;u!EwUzOKgE>P)(x~9VZ@JVjJv-
zwQ(BO!+A(kXC3C_o0#G_UMH%7d!jR{qY;>l<=7CHTD>3R$oFG=Jca5wHpy`sV;j5=
zhneqUIe7;<$-@oU1Fv9n%w&)##&^b0h@fIBR>%1mj7zX8K8Yc?2DPH+EPoxf6ML}+
z9zk9I8HVBsjKZH#3vn7bPCH0OwI7Dn8Q&RAArecl8cxMpI32@qp4G3wI^<8`qqqe%
z@pP82t?z>xxEM8&a@2$?t$wcg1O`#R7QJe?k%DHl#oUhScsFXR4xuJ^1=YS*6L(^f
zsEH<_25yDAF4O9>t-b)&e~HzPH>WjW|Fyz7RH)-8ur5A{>ToOS{4UhJ-jA_(61C!M
zsCF?afrrUygj(@H%)r}G1N*H0DO7(iTD~KN{nrZiQ=xl&%sgTKh#KGm@?tnnQ#Y@L
z8YmW3-wf+xI%?n?)U)vz*1#3!Gv+4L`K?|nyn&j)LDUw0f=PJV&WAK}AIezNGtdzA
zwzR|Q*dH~aTvR`Ipav+je46F6QP(X+UFUs{LNJA`sHgRHJMlhhWgnup>^SluJ7?{D
zI1h$8h(_(uEvR<QQ9IfRwUAz@i48-&zNHw9Ubo)s%%h+gtwMFM6*cqSs1Dw@^T)9U
z`2|$FKTsWq@F^tYP}em_O(4Va-WWulhg#rB%O_xUz5f*y)bWF;3umJq!bPZ+tw%j<
z+fV}>G`~cx<cxU%b=`H;brCIH6HyaxiPbO@wXkj&srP>{1$8_I`BZc!V=6AS{4ES2
z{~C4SX$(C5c0Q(+d%go|pzf#%3_>mJcGUHEp(Z>YTVo}9wKW?kXl9#Huh&bcd;1>h
z!o#SJKSxdA2h>(xMYRiKwz|G9hGHCQpcK@?(onak8}i0FIjD(ENoD_4m`;T*n1dQ%
zA!^{Yr~zKEd>g8xov4W)Kn;8ZHSjSE!*4A=kD9;@%R^aqV1lTJF{L&8uM2ump@DL+
zCJsXla3_Z2ShEsqk<UT3UxJ#zO3R<daPsx2TlorVK}S&op27xr1N9mwc+=bgTcfr#
z(;S51<i)5Rnur>B8cx7DsE&R^?OY_kb7efLePgo~)*)|?+R;8{F6wpmj-(K{1*p&X
zIj9|3iA`}M@|-yzpeA$`Yh!R*cLK4f_8F*t`l8O~pe9s=8u)I@C!t>V2a)z(X9)#$
zunKi=HlZ%`Tm5d-zy~k}KS%Avc}&IYI1pR#yH!@Aepl>4eWCdb^;%v;-P)Sz?yZf+
z!22IhK{HN94b%=bfu80-GY>VvQI?mXI-HDJzzjRT0HerPVG3@s`j1dM^bKmf(>Pe~
z{}l>FIH0}z1>t$rz5NokRezu^i0I(1upvf~kH=eaCTe24Q4`v4`Nx)@G=IWq&R<5g
z59?^}e|-v?SrQJyW|)KbTmCMxdrnj*$EkvSQ7ayR>Zkw*V~P1H=8{+ES0QtEhNE_L
z0jm8n%*SUlxc@3#q9PBoGu>aGYcZ1iGt_H%7S+M8sEJ-fy?#|XyY(SvB&t3h<1iWT
z#4f1o)}Z>?h<!c$uIbGF&!pla`#2x(@8WKe)75?IV=#jHEY!o4k8FlB3G3kVSPyrg
zK9Y}OA)Z6EAJEPH92kpr$>*Y;iPfl2!o6M!8sG<v#jB`$8rj`_269jh%W*m`!>Jh2
zg9i@hV-eQq>2CR0Y)1YX>KQp<UO=t9Mwa`G)Iq&P-gpXX*c3H^TTv6rM?EZKQ4imA
z)IEP3wer=d_Ag=*zJn~<`5x7Aqh9WSX;_~;19c1XQ2i7lJLh%EDCi?}7HT4o;u2hq
z+On3t-S783P#2b>K2R!96PbZ}Z5N>)t~IE)U^8kWuUh?H%MYOz_64?LeCIp`J!}bm
z+>YCzCej(T@*J}WW5~-bpKC5hO=u%(z?aNjR=*Fm^+!?9$QP&yU&1iPcY^x5TN#CV
zYFlA4_C>9@44dLq)U8>Iya3M2sE*H~Cj2{U2ZH;#I}?psSPE*uOw@w<+xZdbRf96C
zn2s7?A!_T_TK#rRAb%HmbDUGC4io#k6G%mEc}LVv^h8Z08`aMUJ3qnlX_!L&!v5^P
zCa|3ft#lu1CC5;&&yQFgs}FF`hhZ>zJZhqiu?BWT_0tV?{SedyN-^*eje1RIpxQ6T
z5L`2W{ntHxj*6D}CThSlsC)S<s>2(o4kHG-Tbqb_h|*9K>4R!lfHm=6)PVP!i%>hU
z3Dxf|%lCOH=)$k;#Cg<8u3LlJ*=|RTF^KvusP<W?cEeE<E<+745!G%kYNr;M%djT-
z8q~y}M=jj@CIxNvG1Tkyn>DC<o7-U=hEU%cbwLK|R^?(X9F2OY%1{$|0QC^hM14N2
zMqTH}rg#9;@HcFt_dj`%+fjeimgQp#j>lH$Lp^MJP%A!+q4+K8UjBlb;APYbJvr_l
zAVRSkc~{hqWT777{;2E5Vu;@Vathj#X{dX-2=$(>Lv^qlwUv8OD?EVe;3(?4&&^*j
zojfSlZI@~GK<!jN)Gf+GEnuAL_5N2<sExBwTecK6;AYf7e#>{ER{9Qx;~~^7JC3#S
zXAHytViJZ9b_Y&HU6+YE-wW065cF!xM^ex|nuN;dp(d~nb>R!BE%c)X-hmD9J=Arl
zF$w>~#+Wq3t?z@H*eJ`#qaNNzP!m}>g#Fi+Zlpr@ZVOJv*HQPX#ZY@TP#5H5B;JL(
zuF~@9SciNus@*zlid#`z{RwJkPoXAo9rX!YCy)JaNg+MYz3>im0;<777=h2Ac48Yw
z;ZD>94x#StG1QixMD56rR<Cb2QRJbhev(knR6DEh<fTxTifq)c$vf@DL&#SFXEEM}
zhp;=w4|8{>(0l+j;7Zg)wxVv;PSgbVU|rmY>i;X$LN23r-0K<cZe1v9rU|GmY-@RU
zj3LiM-TQkie*jyPFF_6P7OKOKQSDA3&!O`(mSDF6xBYr-ME)Tr>ixe&K@Umv2*=^J
zI887Hry*YfoW-bn_>uXIc@8zvYnBI(bSDyxYTp8NOFE%;q&u=`rw{UYIZxqmz5nMZ
zWKhxjcK7dnGf*p-h3aSt@}IMYA1ubXVtFoK^tzC5Mor`g)Ye`^eI@%7`OhgD#h+tv
zC-%Vlquq%XV&Lz86DjC*n~Iw8Ov~q)OHm!KM%~j5s4aXE$Kher)@LxP`ssxpY^@(0
zk;Hl86{03}Poa+SgtsRZLDsOp`AOikJDFtaUb9@!$6?}A;@?*HGFG+gKBs&ykwG45
zbzhU~!A&PRTir6sIy&qAkDzjrn>(?TPg*(J{C{XWbu4fR{N49$%JYd_`e<kM;w54m
z(UJOFiNB656h`U(54fo^#m*izZ{u7G%K9+T@gU)$PWOEW5k)zj_?7ZNq8nx1g6{Yw
zb|Q3iBA@OSo%WP}qO5;_6f=I{_}T1=sYE%^-s(QY<5rI6qV1G#wOl-D<v4Q#t|G=-
z{=B)^JYtH#_=~J!B<j;i|1V%8UbOmo<}U2Rxlp1DagcnWo%@S>D73XC$-Emk6YmjU
z5toVgiM1NPf<gkF)yL}CiqJ6>^|b34M!5}!*ty>+>lJ&8=uHf!z6t)9(D5%~O`ybY
zJ-bF}L&_gny*@1i-~TsRMIHPP5l*AV#5JoAyi1gaTSwnh&L*BE#u4$v4MHDcd=@#u
zv};EEMmdzILHPjgCu$NM$aVZ(KeYdKtwQ-${orUvoezf+*_7*IJz@y)*D;#HqeM62
zb|Qj!fq0X+i%2A1CH_I&NmL=4+gNq*A#(2we(WYD6M0ld6Q5Dmaf!G>Xp+^apNSFJ
zl4wA5AkRV_ei!FYj3Js6`c%}>gIKNtN4~ZHf^sbnU8hp9l%zk=hH_Kl8_ItW|0ISH
zI<kny#1!HKqAIb1Xh7(Qb#dOsQlf<o)QobPox5&|eMCWEX*X47+*E#t@@!%v(VBRU
zXhf%pL_Xy-JcT8Mj=e5{?-M5||3JjirVIxVIh2Q^jvS&kc@Hl?DoGj=j}Si+J&ChK
zKhD)BbUZ<%Sotx^e<OO4Pe2{v#A)JbVlYui4B`9|yg=+BRuj2|jz+}8gm(--z9V$R
zaKRf`fDhn$Vjb}ep`!`)I(iXFR#x7RI76Hx22sBfLx@`_=V4!BF7Yj~lc-1i{m9`B
z{7d#@HwpYh<TlD}X)ws@g76qIkh*DBmw<<etCsiX+#Jebc=OSRqzZK%Z?2^LI`KI1
zqV|0jg|2qtFO;Ve$%K<sTvAe6;`3y6@Ru}b5ai#{ILqU&mD11SD{1;{WaZ@IDWxS&
z@8T)NNfq~1P99V0@7HWjwS<B9m6azoX;xl5p|p90qpY-qyoA=xD}0Mm3w+m77yF)W
zeag2q?H2#rY5P3B18u{7=i9FEZElz7JJRmB|I_sP9$&o<5Bt`1D5+6-*FB|Urd0Tv
zcP#Rs>=@_qC1)h~XJ_mV_dnckqsQN6fY;+YGVp!hp6nR^x$K@nzIj7h_~M4%;afO#
zyT33m%Hw-1Kgqu*zeyF(a9>hxtZ#5Zh;L@WCSUf5H2<s-wLShlBfEQiDTNDsI}0aN
c%O6)d!IwL#)E_-M%j26_)X4u!(YE0K0iuOdBLDyZ


From 16994908d88e8e2daf8175078da6ff2d0609ff0d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 21 Mar 2021 12:53:30 -0700
Subject: [PATCH 0390/1285] Lets users opt in to directory

---
 bookwyrm/migrations/0057_user_discoverable.py | 19 +++++++++++++++++++
 bookwyrm/models/user.py                       |  1 +
 2 files changed, 20 insertions(+)
 create mode 100644 bookwyrm/migrations/0057_user_discoverable.py

diff --git a/bookwyrm/migrations/0057_user_discoverable.py b/bookwyrm/migrations/0057_user_discoverable.py
new file mode 100644
index 00000000..522f0869
--- /dev/null
+++ b/bookwyrm/migrations/0057_user_discoverable.py
@@ -0,0 +1,19 @@
+# Generated by Django 3.1.6 on 2021-03-21 21:44
+
+import bookwyrm.models.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0056_auto_20210321_0303'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='discoverable',
+            field=bookwyrm.models.fields.BooleanField(default=False),
+        ),
+    ]
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 46f08509..84391e10 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -103,6 +103,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
     last_active_date = models.DateTimeField(auto_now=True)
     manually_approves_followers = fields.BooleanField(default=False)
     show_goal = models.BooleanField(default=True)
+    show_in_directory = models.BooleanField(default=False)
 
     name_field = "username"
 

From 3e75253ff179842dc4942f5acb21e49e6d09dd59 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 21 Mar 2021 14:50:36 -0700
Subject: [PATCH 0391/1285] Updates activitpub and tests for discoverability

---
 bookwyrm/activitypub/person.py     | 2 +-
 bookwyrm/models/user.py            | 2 +-
 bookwyrm/templates/layout.html     | 2 +-
 bookwyrm/tests/data/ap_user.json   | 3 +++
 bookwyrm/tests/views/test_inbox.py | 1 +
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/activitypub/person.py b/bookwyrm/activitypub/person.py
index f1298b92..dafd1910 100644
--- a/bookwyrm/activitypub/person.py
+++ b/bookwyrm/activitypub/person.py
@@ -30,5 +30,5 @@ class Person(ActivityObject):
     icon: Image = field(default_factory=lambda: {})
     bookwyrmUser: bool = False
     manuallyApprovesFollowers: str = False
-    discoverable: str = True
+    discoverable: str = False
     type: str = "Person"
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 84391e10..c2a74c63 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -103,7 +103,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
     last_active_date = models.DateTimeField(auto_now=True)
     manually_approves_followers = fields.BooleanField(default=False)
     show_goal = models.BooleanField(default=True)
-    show_in_directory = models.BooleanField(default=False)
+    discoverable = fields.BooleanField(default=False)
 
     name_field = "username"
 
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index c7d10b57..b25bef45 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -107,7 +107,7 @@
                     {% endif %}
                     {% if perms.bookwyrm.create_invites %}
                     <li>
-                        <a href="{% url 'settings-invites' %}" class="navbar-item">
+                        <a href="{% url 'settings-invite-requests' %}" class="navbar-item">
                             {% trans 'Invites' %}
                         </a>
                     </li>
diff --git a/bookwyrm/tests/data/ap_user.json b/bookwyrm/tests/data/ap_user.json
index b159ae65..bc4488e3 100644
--- a/bookwyrm/tests/data/ap_user.json
+++ b/bookwyrm/tests/data/ap_user.json
@@ -28,6 +28,9 @@
     },
     "bookwyrmUser": true,
     "manuallyApprovesFollowers": false,
+    "discoverable": true,
+    "devices": "https://friend.camp/users/tripofmice/collections/devices",
+    "tag": [],
     "icon": {
         "type": "Image",
         "mediaType": "image/png",
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index b681b961..10f55f89 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -789,6 +789,7 @@ class Inbox(TestCase):
         self.assertEqual(user.name, "MOUSE?? MOUSE!!")
         self.assertEqual(user.username, "mouse@example.com")
         self.assertEqual(user.localname, "mouse")
+        self.assertTrue(user.discoverable)
 
     def test_handle_update_edition(self):
         """ update an existing edition """

From ba00672e66b19987c83897625f8fadd438422955 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 21 Mar 2021 16:37:52 -0700
Subject: [PATCH 0392/1285] Directory view

---
 bookwyrm/forms.py                             |  4 +-
 bookwyrm/templates/directory.html             | 67 +++++++++++++++++++
 bookwyrm/templates/edit_author.html           |  4 +-
 bookwyrm/templates/preferences/edit_user.html |  8 +++
 bookwyrm/templates/snippets/avatar.html       |  2 +-
 bookwyrm/urls.py                              |  1 +
 bookwyrm/views/__init__.py                    |  1 +
 bookwyrm/views/directory.py                   | 32 +++++++++
 bookwyrm/views/landing.py                     |  2 +-
 9 files changed, 115 insertions(+), 6 deletions(-)
 create mode 100644 bookwyrm/templates/directory.html
 create mode 100644 bookwyrm/views/directory.py

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index d330211c..4e92b32e 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -3,7 +3,6 @@ import datetime
 from collections import defaultdict
 
 from django import forms
-from django.core.exceptions import ValidationError
 from django.forms import ModelForm, PasswordInput, widgets
 from django.forms.widgets import Textarea
 from django.utils import timezone
@@ -130,8 +129,9 @@ class EditUserForm(CustomForm):
             "name",
             "email",
             "summary",
-            "manually_approves_followers",
             "show_goal",
+            "manually_approves_followers",
+            "discoverable",
         ]
         help_texts = {f: None for f in fields}
 
diff --git a/bookwyrm/templates/directory.html b/bookwyrm/templates/directory.html
new file mode 100644
index 00000000..9323752f
--- /dev/null
+++ b/bookwyrm/templates/directory.html
@@ -0,0 +1,67 @@
+{% extends 'layout.html' %}
+{% load i18n %}
+{% load bookwyrm_tags %}
+{% load humanize %}
+
+{% block title %}{% trans "Directory" %}{% endblock %}
+
+{% block content %}
+<header class="block">
+    <h1 class="title">
+        {% trans "Directory" %}
+    </h1>
+</header>
+<div class="columns is-multiline">
+    {% for user in users %}
+    <div class="column is-one-third">
+        <div class="card block">
+            <div class="card-content">
+                <div class="media">
+                    <span class="media-left">
+                        {% include 'snippets/avatar.html' with user=user large=True %}
+                    </span>
+                    <div class="media-content">
+                        <a href="{{ user.local_path }}" class="is-block mb-2">
+                            <span class="title is-4 is-block">{{ user.display_name }}</span>
+                            <span class="subtitle is-6 is-block">@{{ user|username }}</span>
+                        </a>
+                        {% include 'snippets/follow_button.html' with user=user %}
+                    </div>
+                </div>
+
+                {% if user.summary %}
+                <div class="content">
+                    {{ user.summary | to_markdown | safe | truncatechars_html:40 }}
+                </div>
+                {% endif %}
+            </div>
+            <footer class="card-footer content">
+                <div class="card-footer-item">
+                    <div class="has-text-centered">
+                        <p class="title is-6 mb-0">{{ user.shelfbook_set.count }}</p>
+                        <p class="help">{% trans "books shelved" %}</p>
+                    </div>
+                </div>
+                <div class="card-footer-item">
+                    <div class="has-text-centered">
+                        <p class="title is-6 mb-0">{{ user.status_set.count|intword }}</p>
+                        <p class="help">{% trans "posts" %}</p>
+                    </div>
+                </div>
+                <div class="card-footer-item">
+                    <div class="has-text-centered">
+                        <p class="title is-6 mb-0">{{ user.last_active_date|naturalday }}</p>
+                        <p class="help">{% trans "last active" %}</p>
+                    </div>
+                </div>
+            </footer>
+        </div>
+    </div>
+    {% endfor %}
+</div>
+
+<div>
+    {% include 'snippets/pagination.html' with page=users path="/directory" %}
+</div>
+
+{% endblock %}
diff --git a/bookwyrm/templates/edit_author.html b/bookwyrm/templates/edit_author.html
index 0316a66f..542b57f9 100644
--- a/bookwyrm/templates/edit_author.html
+++ b/bookwyrm/templates/edit_author.html
@@ -2,11 +2,11 @@
 {% load i18n %}
 {% load humanize %}
 
-{% block title %}{% trans "Edit Author" %}: {{ author.name }}{% endblock %}
+{% block title %}{% trans "Edit Author:" %} {{ author.name }}{% endblock %}
 
 {% block content %}
 <header class="block">
-    <h1 class="title level-left">
+    <h1 class="title">
         Edit "{{ author.name }}"
     </h1>
     <div>
diff --git a/bookwyrm/templates/preferences/edit_user.html b/bookwyrm/templates/preferences/edit_user.html
index ca0f81c2..327d745b 100644
--- a/bookwyrm/templates/preferences/edit_user.html
+++ b/bookwyrm/templates/preferences/edit_user.html
@@ -53,6 +53,14 @@
             {{ form.manually_approves_followers }}
         </label>
     </div>
+    <div class="block">
+        <label class="checkbox label" for="id_discoverable">
+            {% trans "Show this account in suggested users:" %}
+            {{ form.discoverable }}
+        </label>
+        {% url 'directory' as path %}
+        <p class="help">{% blocktrans %}Your account will show up in the <a href="{{ path }}">directory</a>, and may be recommended to other BookWyrm users.{% endblocktrans %}</p>
+    </div>
     <button class="button is-primary" type="submit">{% trans "Save" %}</button>
 </form>
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/avatar.html b/bookwyrm/templates/snippets/avatar.html
index 6d27cd85..d53acf2b 100644
--- a/bookwyrm/templates/snippets/avatar.html
+++ b/bookwyrm/templates/snippets/avatar.html
@@ -1,3 +1,3 @@
 {% load bookwyrm_tags %}
-<img class="avatar image {% if large %}is-96x96{% else %}is-32x32{% endif %}" src="{% if user.avatar %}/images/{{ user.avatar }}{% else %}/static/images/default_avi.jpg{% endif %}" {% if ariaHide %}aria-hidden="true"{% endif %} alt="{{ user.alt_text }}">
+<img class="avatar image {% if large %}is-96x96{% elif medium %}is-48x48{% else %}is-32x32{% endif %}" src="{% if user.avatar %}/images/{{ user.avatar }}{% else %}/static/images/default_avi.jpg{% endif %}" {% if ariaHide %}aria-hidden="true"{% endif %} alt="{{ user.alt_text }}">
 
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 4aced6fe..76622799 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -96,6 +96,7 @@ urlpatterns = [
     path("", views.Home.as_view(), name="landing"),
     re_path(r"^discover/?$", views.Discover.as_view()),
     re_path(r"^notifications/?$", views.Notifications.as_view()),
+    re_path(r"^directory/?", views.Directory.as_view(), name="directory"),
     # feeds
     re_path(r"^(?P<tab>home|local|federated)/?$", views.Feed.as_view()),
     re_path(
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 3402e65f..f1ebfc4c 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -4,6 +4,7 @@ from .author import Author, EditAuthor
 from .block import Block, unblock
 from .books import Book, EditBook, ConfirmEditBook, Editions
 from .books import upload_cover, add_description, switch_edition, resolve_book
+from .directory import Directory
 from .error import not_found_page, server_error_page
 from .federation import Federation
 from .feed import DirectMessage, Feed, Replies, Status
diff --git a/bookwyrm/views/directory.py b/bookwyrm/views/directory.py
new file mode 100644
index 00000000..bbfbffe8
--- /dev/null
+++ b/bookwyrm/views/directory.py
@@ -0,0 +1,32 @@
+""" who all's here? """
+from django.contrib.auth.decorators import login_required
+from django.core.paginator import Paginator
+from django.template.response import TemplateResponse
+from django.views import View
+from django.utils.decorators import method_decorator
+
+from bookwyrm import models
+
+# pylint: disable=no-self-use
+@method_decorator(login_required, name="dispatch")
+class Directory(View):
+    """ display of known bookwyrm users """
+
+    def get(self, request):
+        """ lets see your cute faces """
+        try:
+            page = int(request.GET.get("page", 1))
+        except ValueError:
+            page = 1
+
+        users = models.User.objects.filter(
+            discoverable=True,
+            bookwyrm_user=True,
+            is_active=True,
+        ).order_by('-last_active_date')
+        paginated = Paginator(users, 12)
+
+        data = {
+            "users": paginated.page(page),
+        }
+        return TemplateResponse(request, "directory.html", data)
diff --git a/bookwyrm/views/landing.py b/bookwyrm/views/landing.py
index 86f7d3e9..407451fb 100644
--- a/bookwyrm/views/landing.py
+++ b/bookwyrm/views/landing.py
@@ -2,7 +2,7 @@
 from django.template.response import TemplateResponse
 from django.views import View
 
-from bookwyrm import forms, models
+from bookwyrm import forms
 from .feed import Feed
 from . import helpers
 

From 6e3a203b466d24ef02518b1f6aa442801e308364 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 21 Mar 2021 16:43:13 -0700
Subject: [PATCH 0393/1285] Adds directory to main menu

---
 bookwyrm/templates/layout.html | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index b25bef45..e57f6152 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -83,18 +83,18 @@
                 </a>
                 <ul class="navbar-dropdown" id="navbar-dropdown">
                     <li>
-                        <a href="/direct-messages" class="navbar-item">
+                        <a href="{% url 'direct-messages' %}" class="navbar-item">
                             {% trans "Direct Messages" %}
                         </a>
                     </li>
                     <li>
-                        <a href="/user/{{request.user.localname}}" class="navbar-item">
+                        <a href="{{ request.user.local_path }}" class="navbar-item">
                             {% trans 'Profile' %}
                         </a>
                     </li>
                     <li>
-                        <a href="/preferences/profile" class="navbar-item">
-                            {% trans 'Settings' %}
+                        <a href="{% url 'directory' %}" class="navbar-item">
+                            {% trans 'Directory' %}
                         </a>
                     </li>
                     <li>
@@ -102,6 +102,11 @@
                             {% trans 'Import Books' %}
                         </a>
                     </li>
+                    <li>
+                        <a href="/preferences/profile" class="navbar-item">
+                            {% trans 'Settings' %}
+                        </a>
+                    </li>
                     {% if perms.bookwyrm.create_invites or perms.bookwyrm.edit_instance_settings%}
                     <li class="navbar-divider" role="presentation"></li>
                     {% endif %}

From abde06a7007b605a4abc9c4611e95997f4d4ae1c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 21 Mar 2021 16:47:09 -0700
Subject: [PATCH 0394/1285] Pytohn formatting

---
 bookwyrm/migrations/0057_user_discoverable.py | 6 +++---
 bookwyrm/views/directory.py                   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/migrations/0057_user_discoverable.py b/bookwyrm/migrations/0057_user_discoverable.py
index 522f0869..c49592bf 100644
--- a/bookwyrm/migrations/0057_user_discoverable.py
+++ b/bookwyrm/migrations/0057_user_discoverable.py
@@ -7,13 +7,13 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0056_auto_20210321_0303'),
+        ("bookwyrm", "0056_auto_20210321_0303"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='user',
-            name='discoverable',
+            model_name="user",
+            name="discoverable",
             field=bookwyrm.models.fields.BooleanField(default=False),
         ),
     ]
diff --git a/bookwyrm/views/directory.py b/bookwyrm/views/directory.py
index bbfbffe8..cc21baf2 100644
--- a/bookwyrm/views/directory.py
+++ b/bookwyrm/views/directory.py
@@ -23,7 +23,7 @@ class Directory(View):
             discoverable=True,
             bookwyrm_user=True,
             is_active=True,
-        ).order_by('-last_active_date')
+        ).order_by("-last_active_date")
         paginated = Paginator(users, 12)
 
         data = {

From 01104581de2d2cdcd8468b5d6897c40767a74d97 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 21 Mar 2021 16:50:03 -0700
Subject: [PATCH 0395/1285] Adds test for directory view

---
 bookwyrm/tests/views/test_directory.py | 43 ++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 bookwyrm/tests/views/test_directory.py

diff --git a/bookwyrm/tests/views/test_directory.py b/bookwyrm/tests/views/test_directory.py
new file mode 100644
index 00000000..80d9eaf7
--- /dev/null
+++ b/bookwyrm/tests/views/test_directory.py
@@ -0,0 +1,43 @@
+""" test for app action functionality """
+from django.template.response import TemplateResponse
+from django.test import TestCase
+from django.test.client import RequestFactory
+
+from bookwyrm import models, views
+
+# pylint: disable=unused-argument
+class DirectoryViews(TestCase):
+    """ tag views"""
+
+    def setUp(self):
+        """ we need basic test data and mocks """
+        self.factory = RequestFactory()
+        self.local_user = models.User.objects.create_user(
+            "mouse@local.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+            remote_id="https://example.com/users/mouse",
+        )
+        self.rat = models.User.objects.create_user(
+            "rat@local.com",
+            "rat@rat.com",
+            "ratword",
+            local=True,
+            localname="rat",
+            remote_id="https://example.com/users/rat",
+            discoverable=True,
+        )
+        models.SiteSettings.objects.create()
+
+    def test_directory_page(self):
+        """ there are so many views, this just makes sure it LOADS """
+        view = views.Directory.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+
+        result = view(request)
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)

From dedac83b5cd3887ecf3b1f7b9e299c656cb1657d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 21 Mar 2021 17:18:42 -0700
Subject: [PATCH 0396/1285] Fixes model test

---
 bookwyrm/tests/models/test_user_model.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py
index 618e4f78..bd5255ce 100644
--- a/bookwyrm/tests/models/test_user_model.py
+++ b/bookwyrm/tests/models/test_user_model.py
@@ -77,7 +77,7 @@ class User(TestCase):
         self.assertEqual(activity["inbox"], self.user.inbox)
         self.assertEqual(activity["outbox"], self.user.outbox)
         self.assertEqual(activity["bookwyrmUser"], False)
-        self.assertEqual(activity["discoverable"], True)
+        self.assertEqual(activity["discoverable"], False)
         self.assertEqual(activity["type"], "Person")
 
     def test_activitypub_outbox(self):

From 5890386fbaf59d486d3aab2aaf5a862e4e09da99 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 22 Mar 2021 08:50:41 -0700
Subject: [PATCH 0397/1285] Only show reading goal insert on first page of feed

---
 bookwyrm/templates/feed/feed.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html
index b7ff6e25..76afea7e 100644
--- a/bookwyrm/templates/feed/feed.html
+++ b/bookwyrm/templates/feed/feed.html
@@ -19,7 +19,7 @@
 </div>
 
 {# announcements and system messages #}
-{% if request.user.show_goal and not goal and tab == 'home' %}
+{% if request.user.show_goal and not goal and tab == 'home' and not activities.number > 1 %}
 {% now 'Y' as year %}
 <section class="block">
     {% include 'snippets/goal_card.html' with year=year %}
@@ -31,9 +31,10 @@
 {% if not activities %}
 <p>{% trans "There aren't any activities right now! Try following a user to get started" %}</p>
 {% endif %}
+
 {% for activity in activities %}
 <div class="block">
-{% include 'snippets/status/status.html' with status=activity %}
+    {% include 'snippets/status/status.html' with status=activity %}
 </div>
 {% endfor %}
 

From e513ea8b9c110c112b7328489588423fffd7d67e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 22 Mar 2021 12:37:01 -0700
Subject: [PATCH 0398/1285] Adds javascript for tabs on book page

---
 bookwyrm/templates/book/book.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index 0d908110..0275eb1a 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -296,3 +296,7 @@
 </div>
 
 {% endblock %}
+
+{% block scripts %}
+<script src="/static/js/tabs.js"></script>
+{% endblock %}

From ebc01362e6884157746b031d2974459d58cf91cd Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 22 Mar 2021 10:44:42 -0700
Subject: [PATCH 0399/1285] Adds redis image for activity streams

---
 .env.example         |  9 +++++++--
 bookwyrm/settings.py |  3 +++
 docker-compose.yml   | 15 ++++++++++++---
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/.env.example b/.env.example
index 7a67045c..7f80a72c 100644
--- a/.env.example
+++ b/.env.example
@@ -22,8 +22,13 @@ POSTGRES_USER=fedireads
 POSTGRES_DB=fedireads
 POSTGRES_HOST=db
 
-CELERY_BROKER=redis://redis:6379/0
-CELERY_RESULT_BACKEND=redis://redis:6379/0
+# Redis activity stream manager
+REDIS_ACTIVITY_HOST=redis_activity
+REDIS_ACTIVITY_PORT=6379
+
+# Celery config with redis broker
+CELERY_BROKER=redis://redis_broker:6379/0
+CELERY_RESULT_BACKEND=redis://redis_broker:6379/0
 
 EMAIL_HOST="smtp.mailgun.org"
 EMAIL_PORT=587
diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index bcff5828..cd844850 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -92,6 +92,9 @@ TEMPLATES = [
 
 WSGI_APPLICATION = "bookwyrm.wsgi.application"
 
+# redis
+REDIS_ACTIVITY_HOST = env("REDIS_ACTIVITY_HOST", "localhost")
+REDIS_ACTIVITY_PORT = env("REDIS_ACTIVITY_PORT", 6379)
 
 # Database
 # https://docs.djangoproject.com/en/2.0/ref/settings/#databases
diff --git a/docker-compose.yml b/docker-compose.yml
index 5d9cbf1b..3ee9037f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -31,11 +31,20 @@ services:
     depends_on:
       - db
       - celery_worker
+      - redis_activity
     networks:
       - main
     ports:
       - 8000:8000
-  redis:
+  redis_activity:
+    image: redis
+    env_file: .env
+    ports:
+      - 6378:6378
+    networks:
+      - main
+    restart: on-failure
+  redis_broker:
     image: redis
     env_file: .env
     ports:
@@ -55,7 +64,7 @@ services:
       - media_volume:/app/images
     depends_on:
       - db
-      - redis
+      - redis_broker
     restart: on-failure
   flower:
     build: .
@@ -67,7 +76,7 @@ services:
       - main
     depends_on:
       - db
-      - redis
+      - redis_broker
     restart: on-failure
     ports:
       - 8888:8888

From 459479db43feb217854f4e272893086c895f3790 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 22 Mar 2021 14:11:23 -0700
Subject: [PATCH 0400/1285] Add statuses to timelines

---
 bookwyrm/models/base_model.py |  2 +-
 bookwyrm/models/status.py     | 77 ++++++++++++++++++++++++++++++++++-
 bookwyrm/settings.py          |  4 +-
 bookwyrm/views/feed.py        | 27 ++++++------
 4 files changed, 95 insertions(+), 15 deletions(-)

diff --git a/bookwyrm/models/base_model.py b/bookwyrm/models/base_model.py
index 60e5da0a..cb2fc851 100644
--- a/bookwyrm/models/base_model.py
+++ b/bookwyrm/models/base_model.py
@@ -34,7 +34,7 @@ class BookWyrmModel(models.Model):
 
 @receiver(models.signals.post_save)
 # pylint: disable=unused-argument
-def execute_after_save(sender, instance, created, *args, **kwargs):
+def set_remote_id(sender, instance, created, *args, **kwargs):
     """ set the remote_id after save (when the id is available) """
     if not created or not hasattr(instance, "get_remote_id"):
         return
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index 904ce461..6d93ff0a 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -5,11 +5,14 @@ import re
 from django.apps import apps
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
+from django.db.models import Q
+from django.dispatch import receiver
 from django.template.loader import get_template
 from django.utils import timezone
 from model_utils.managers import InheritanceManager
+import redis
 
-from bookwyrm import activitypub
+from bookwyrm import activitypub, settings
 from .activitypub_mixin import ActivitypubMixin, ActivityMixin
 from .activitypub_mixin import OrderedCollectionPageMixin
 from .base_model import BookWyrmModel
@@ -17,6 +20,10 @@ from .fields import image_serializer
 from .readthrough import ProgressMode
 from . import fields
 
+r = redis.Redis(
+    host=settings.REDIS_ACTIVITY_HOST, port=settings.REDIS_ACTIVITY_PORT, db=0
+)
+
 
 class Status(OrderedCollectionPageMixin, BookWyrmModel):
     """ any post, like a reply to a review, etc """
@@ -383,3 +390,71 @@ class Boost(ActivityMixin, Status):
     # This constraint can't work as it would cross tables.
     # class Meta:
     #     unique_together = ('user', 'boosted_status')
+
+
+@receiver(models.signals.post_save)
+# pylint: disable=unused-argument
+def update_feeds(sender, instance, created, *args, **kwargs):
+    """ add statuses to activity feeds """
+    # we're only interested in new statuses that aren't dms
+    if not created or not issubclass(sender, Status) or instance.privacy == 'direct':
+        return
+
+    user = instance.user
+
+    community = user.__class__.objects.filter(
+        local=True # we only manage timelines for local users
+    ).exclude(
+        Q(id__in=user.blocks.all()) | Q(blocks=user)  # not blocked
+    )
+
+    # ------ home timeline: users you follow and yourself
+    friends = community.filter(
+        Q(id=user.id) | Q(following=user)
+    )
+    add_status(friends, instance, 'home')
+
+    # local and federated timelines only get public statuses
+    if instance.privacy != 'public':
+        return
+
+    # ------ federated timeline: to anyone, anywhere
+    add_status(community, instance, 'federated')
+
+    # if the author is a remote user, it doesn't go on the local timeline
+    if not user.local:
+        return
+
+    # ------ local timeline: to anyone, anywhere
+    add_status(community, instance, 'local')
+
+
+def add_status(users, status, feed_name):
+    """ add a status to users' feeds """
+    # we want to do this as a bulk operation
+    pipeline = r.pipeline()
+    value = {status.id: status.published_date.timestamp()}
+    for user in users:
+        feed_id = '{}-{}'.format(user.id, feed_name)
+        unread_feed_id = '{}-unread'.format(feed_id)
+
+        # add the status to the feed
+        pipeline.zadd(feed_id, value)
+
+        # add to the unread status count
+        pipeline.incr(unread_feed_id)
+    pipeline.execute()
+
+
+def get_activity_stream(user, feed_name, start, end):
+    """ load the ids for statuses to be displayed """
+    feed_id = '{}-{}'.format(user.id, feed_name)
+    unread_feed_id = '{}-unread'.format(feed_id)
+
+    # clear unreads for this feed
+    r.set(unread_feed_id, 0)
+
+    statuses = r.zrange(feed_id, start, end)
+    return Status.objects.select_subclasses().filter(
+        id__in=statuses
+    ).order_by('-published_date')
diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index cd844850..bc210dac 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -92,10 +92,12 @@ TEMPLATES = [
 
 WSGI_APPLICATION = "bookwyrm.wsgi.application"
 
-# redis
+# redis/activity streams settings
 REDIS_ACTIVITY_HOST = env("REDIS_ACTIVITY_HOST", "localhost")
 REDIS_ACTIVITY_PORT = env("REDIS_ACTIVITY_PORT", 6379)
 
+MAX_STREAM_LENGTH = env("MAX_STREAM_LENGTH", 200)
+
 # Database
 # https://docs.djangoproject.com/en/2.0/ref/settings/#databases
 
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index d08c9a42..a19c2738 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -28,19 +28,22 @@ class Feed(View):
         except ValueError:
             page = 1
 
-        if tab == "home":
-            activities = get_activity_feed(request.user, following_only=True)
+        try:
+            tab_title = {
+                'home': _("Home"),
+                "local": _("Local"),
+                "federated": _("Federated")
+            }[tab]
+        except KeyError:
+            tab = 'home'
             tab_title = _("Home")
-        elif tab == "local":
-            activities = get_activity_feed(
-                request.user, privacy=["public", "followers"], local_only=True
-            )
-            tab_title = _("Local")
-        else:
-            activities = get_activity_feed(
-                request.user, privacy=["public", "followers"]
-            )
-            tab_title = _("Federated")
+
+        activities = models.status.get_activity_stream(
+            request.user, tab,
+            (1 - page) * PAGE_LENGTH,
+            page * PAGE_LENGTH
+        )
+
         paginated = Paginator(activities, PAGE_LENGTH)
 
         data = {

From 3efabf1da371a27de04fcd8f4a67ae51afd6562b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 22 Mar 2021 18:39:16 -0700
Subject: [PATCH 0401/1285] Creates activity stream class

---
 bookwyrm/activitystreams.py | 176 ++++++++++++++++++++++++++++++++++++
 bookwyrm/models/status.py   |  77 +---------------
 bookwyrm/settings.py        |   1 +
 bookwyrm/views/feed.py      |  25 ++---
 4 files changed, 189 insertions(+), 90 deletions(-)
 create mode 100644 bookwyrm/activitystreams.py

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
new file mode 100644
index 00000000..bceb1cad
--- /dev/null
+++ b/bookwyrm/activitystreams.py
@@ -0,0 +1,176 @@
+""" access the activity streams stored in redis """
+from abc import ABC
+from django.dispatch import receiver
+from django.db.models import signals
+from django.db.models import Q
+import redis
+
+from bookwyrm import models, settings
+from bookwyrm.views.helpers import privacy_filter
+
+r = redis.Redis(
+    host=settings.REDIS_ACTIVITY_HOST, port=settings.REDIS_ACTIVITY_PORT, db=0
+)
+
+
+class ActivityStream(ABC):
+    """ a category of activity stream (like home, local, federated) """
+
+    def stream_id(self, user):
+        """ the redis key for this user's instance of this stream """
+        return '{}-{}'.format(user.id, self.key)
+
+    def unread_id(self, user):
+        """ the redis key for this user's unread count for this stream """
+        return '{}-unread'.format(self.stream_id(user))
+
+    def add_status(self, status):
+        """ add a status to users' feeds """
+        value = self.get_value(status)
+        # we want to do this as a bulk operation, hence "pipeline"
+        pipeline = r.pipeline()
+        for user in self.stream_users(status):
+            # add the status to the feed
+            pipeline.zadd(self.stream_id(user), value)
+
+            # add to the unread status count
+            pipeline.incr(self.unread_id(user))
+        # and go!
+        pipeline.execute()
+
+
+    def get_value(self, status):  # pylint: disable=no-self-use
+        """ the status id and the rank (ie, published date) """
+        return {status.id: status.published_date.timestamp()}
+
+
+    def get_activity_stream(self, user):
+        """ load the ids for statuses to be displayed """
+        # clear unreads for this feed
+        r.set(self.unread_id(user), 0)
+
+        statuses = r.zrevrange(self.stream_id(user), 0, -1)
+        return models.Status.objects.select_subclasses().filter(
+            id__in=statuses
+        ).order_by('-published_date')
+
+
+    def populate_stream(self, user):
+        ''' go from zero to a timeline '''
+        pipeline = r.pipeline()
+        statuses = self.stream_statuses(user)
+
+        stream_id = self.stream_id(user)
+        for status in statuses.all()[:settings.MAX_STREAM_LENGTH]:
+            pipeline.zadd(stream_id, self.get_value(status))
+        pipeline.execute()
+
+
+    def stream_users(self, status):  # pylint: disable=no-self-use
+        """ given a status, what users should see it """
+        # direct messages don't appeard in feeds.
+        if status.privacy == 'direct':
+            return None
+
+        # everybody who could plausibly see this status
+        audience = models.User.objects.filter(
+            is_active=True,
+            local=True  # we only create feeds for users of this instance
+        ).exclude(
+            Q(id__in=status.user.blocks.all()) | Q(blocks=status.user)  # not blocked
+        )
+
+        # only visible to the poster's followers and tagged users
+        if status.privacy == 'followers':
+            audience = audience.filter(
+                Q(id=status.user.id)  # if the user is the post's author
+                | Q(following=status.user) # if the user is following the author
+            )
+        return audience
+
+
+    def stream_statuses(self, user):  # pylint: disable=no-self-use
+        """ given a user, what statuses should they see on this stream """
+        return privacy_filter(
+            user,
+            models.Status.objects.select_subclasses(),
+            privacy_levels=["public", 'unlisted', 'followers'],
+        )
+
+
+class HomeStream(ActivityStream):
+    """ users you follow """
+    key = 'home'
+
+    def stream_users(self, status):
+        audience = super().stream_users(status)
+        return audience.filter(
+            Q(id=status.user.id)  # if the user is the post's author
+            | Q(following=status.user) # if the user is following the author
+            | Q(id__in=status.mention_users.all()) # or the user is mentioned
+        )
+
+    def stream_statuses(self, user):
+        return privacy_filter(
+            user,
+            models.Status.objects.select_subclasses(),
+            privacy_levels=["public", 'unlisted', 'followers'],
+            following_only=True
+        )
+
+
+class LocalStream(ActivityStream):
+    """ users you follow """
+    key = 'local'
+
+    def stream_users(self, status):
+        # this stream wants no part in non-public statuses
+        if status.privacy != 'public':
+            return None
+        return super().stream_users(status)
+
+    def stream_statuses(self, user):
+        # all public statuses by a local user
+        return privacy_filter(
+            user,
+            models.Status.objects.select_subclasses().filter(user__local=True),
+            privacy_levels=["public"],
+        )
+
+
+class FederatedStream(ActivityStream):
+    """ users you follow """
+    key = 'federated'
+
+    def stream_users(self, status):
+        # this stream wants no part in non-public statuses
+        if status.privacy != 'public':
+            return None
+        return super().stream_users(status)
+
+    def stream_statuses(self, user):
+        return privacy_filter(
+            user,
+            models.Status.objects.select_subclasses(),
+            privacy_levels=["public"],
+        )
+
+
+
+streams = {
+    'home': HomeStream(),
+    'local': LocalStream(),
+    'federated': FederatedStream(),
+}
+
+@receiver(signals.post_save)
+# pylint: disable=unused-argument
+def update_feeds(sender, instance, created, *args, **kwargs):
+    """ add statuses to activity feeds """
+    # we're only interested in new statuses that aren't dms
+    if not created or not issubclass(sender, models.Status) or \
+            instance.privacy == 'direct':
+        return
+
+    for stream in streams.values():
+        stream.add_status(instance)
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index 6d93ff0a..b313ac86 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -10,9 +10,8 @@ from django.dispatch import receiver
 from django.template.loader import get_template
 from django.utils import timezone
 from model_utils.managers import InheritanceManager
-import redis
 
-from bookwyrm import activitypub, settings
+from bookwyrm import activitypub
 from .activitypub_mixin import ActivitypubMixin, ActivityMixin
 from .activitypub_mixin import OrderedCollectionPageMixin
 from .base_model import BookWyrmModel
@@ -20,10 +19,6 @@ from .fields import image_serializer
 from .readthrough import ProgressMode
 from . import fields
 
-r = redis.Redis(
-    host=settings.REDIS_ACTIVITY_HOST, port=settings.REDIS_ACTIVITY_PORT, db=0
-)
-
 
 class Status(OrderedCollectionPageMixin, BookWyrmModel):
     """ any post, like a reply to a review, etc """
@@ -121,7 +116,7 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
         return list(set(mentions))
 
     @classmethod
-    def ignore_activity(cls, activity):
+    def ignore_activity(cls, activity):  # pylint: disable=too-many-return-statements
         """ keep notes if they are replies to existing statuses """
         if activity.type == "Announce":
             try:
@@ -390,71 +385,3 @@ class Boost(ActivityMixin, Status):
     # This constraint can't work as it would cross tables.
     # class Meta:
     #     unique_together = ('user', 'boosted_status')
-
-
-@receiver(models.signals.post_save)
-# pylint: disable=unused-argument
-def update_feeds(sender, instance, created, *args, **kwargs):
-    """ add statuses to activity feeds """
-    # we're only interested in new statuses that aren't dms
-    if not created or not issubclass(sender, Status) or instance.privacy == 'direct':
-        return
-
-    user = instance.user
-
-    community = user.__class__.objects.filter(
-        local=True # we only manage timelines for local users
-    ).exclude(
-        Q(id__in=user.blocks.all()) | Q(blocks=user)  # not blocked
-    )
-
-    # ------ home timeline: users you follow and yourself
-    friends = community.filter(
-        Q(id=user.id) | Q(following=user)
-    )
-    add_status(friends, instance, 'home')
-
-    # local and federated timelines only get public statuses
-    if instance.privacy != 'public':
-        return
-
-    # ------ federated timeline: to anyone, anywhere
-    add_status(community, instance, 'federated')
-
-    # if the author is a remote user, it doesn't go on the local timeline
-    if not user.local:
-        return
-
-    # ------ local timeline: to anyone, anywhere
-    add_status(community, instance, 'local')
-
-
-def add_status(users, status, feed_name):
-    """ add a status to users' feeds """
-    # we want to do this as a bulk operation
-    pipeline = r.pipeline()
-    value = {status.id: status.published_date.timestamp()}
-    for user in users:
-        feed_id = '{}-{}'.format(user.id, feed_name)
-        unread_feed_id = '{}-unread'.format(feed_id)
-
-        # add the status to the feed
-        pipeline.zadd(feed_id, value)
-
-        # add to the unread status count
-        pipeline.incr(unread_feed_id)
-    pipeline.execute()
-
-
-def get_activity_stream(user, feed_name, start, end):
-    """ load the ids for statuses to be displayed """
-    feed_id = '{}-{}'.format(user.id, feed_name)
-    unread_feed_id = '{}-unread'.format(feed_id)
-
-    # clear unreads for this feed
-    r.set(unread_feed_id, 0)
-
-    statuses = r.zrange(feed_id, start, end)
-    return Status.objects.select_subclasses().filter(
-        id__in=statuses
-    ).order_by('-published_date')
diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index bc210dac..36806435 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -97,6 +97,7 @@ REDIS_ACTIVITY_HOST = env("REDIS_ACTIVITY_HOST", "localhost")
 REDIS_ACTIVITY_PORT = env("REDIS_ACTIVITY_PORT", 6379)
 
 MAX_STREAM_LENGTH = env("MAX_STREAM_LENGTH", 200)
+STREAMS = ["home", "local", "federated"]
 
 # Database
 # https://docs.djangoproject.com/en/2.0/ref/settings/#databases
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index a19c2738..4c003f39 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -9,9 +9,9 @@ from django.utils.decorators import method_decorator
 from django.utils.translation import gettext as _
 from django.views import View
 
-from bookwyrm import forms, models
+from bookwyrm import activitystreams, forms, models
 from bookwyrm.activitypub import ActivitypubResponse
-from bookwyrm.settings import PAGE_LENGTH
+from bookwyrm.settings import PAGE_LENGTH, STREAMS
 from .helpers import get_activity_feed, get_user_from_username
 from .helpers import is_api_request, is_bookwyrm_request, object_visible_to_user
 
@@ -28,21 +28,16 @@ class Feed(View):
         except ValueError:
             page = 1
 
-        try:
-            tab_title = {
-                'home': _("Home"),
-                "local": _("Local"),
-                "federated": _("Federated")
-            }[tab]
-        except KeyError:
+        if not tab in STREAMS:
             tab = 'home'
-            tab_title = _("Home")
 
-        activities = models.status.get_activity_stream(
-            request.user, tab,
-            (1 - page) * PAGE_LENGTH,
-            page * PAGE_LENGTH
-        )
+        tab_title = {
+            'home': _("Home"),
+            "local": _("Local"),
+            "federated": _("Federated")
+        }[tab]
+
+        activities = activitystreams.streams[tab].get_activity_stream(request.user)
 
         paginated = Paginator(activities, PAGE_LENGTH)
 

From 2fe9d1044a7651fd9cd59061ec77ac412c58be4a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 22 Mar 2021 18:42:12 -0700
Subject: [PATCH 0402/1285] Moves tab title translations into templates

---
 bookwyrm/templates/feed/feed.html | 10 +++++++++-
 bookwyrm/views/feed.py            |  8 --------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html
index b7ff6e25..5ad18db6 100644
--- a/bookwyrm/templates/feed/feed.html
+++ b/bookwyrm/templates/feed/feed.html
@@ -3,7 +3,15 @@
 {% load bookwyrm_tags %}
 {% block panel %}
 
-<h1 class="title">{% blocktrans %}{{ tab_title }} Timeline{% endblocktrans %}</h1>
+<h1 class="title">
+    {% if tab == 'home' %}
+    {% trans "Home Timeline" %}
+    {% elif tab == 'local' %}
+    {% trans "Local Timeline" %}
+    {% else %}
+    {% trans "Federated Timeline" %}
+    {% endif %}
+</h1>
 <div class="tabs">
     <ul>
         <li class="{% if tab == 'home' %}is-active{% endif %}"{% if tab == 'home' %} aria-current="page"{% endif %}>
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index 4c003f39..a07ea524 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -6,7 +6,6 @@ from django.http import HttpResponseNotFound
 from django.template.response import TemplateResponse
 from django.utils import timezone
 from django.utils.decorators import method_decorator
-from django.utils.translation import gettext as _
 from django.views import View
 
 from bookwyrm import activitystreams, forms, models
@@ -31,12 +30,6 @@ class Feed(View):
         if not tab in STREAMS:
             tab = 'home'
 
-        tab_title = {
-            'home': _("Home"),
-            "local": _("Local"),
-            "federated": _("Federated")
-        }[tab]
-
         activities = activitystreams.streams[tab].get_activity_stream(request.user)
 
         paginated = Paginator(activities, PAGE_LENGTH)
@@ -47,7 +40,6 @@ class Feed(View):
                 "user": request.user,
                 "activities": paginated.page(page),
                 "tab": tab,
-                "tab_title": tab_title,
                 "goal_form": forms.GoalForm(),
                 "path": "/%s" % tab,
             },

From 0caea7e9ffb2a84f582157b1891778fa5ceec5b1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 22 Mar 2021 18:54:17 -0700
Subject: [PATCH 0403/1285] Python formatting

---
 bookwyrm/activitystreams.py | 67 +++++++++++++++++++------------------
 bookwyrm/views/feed.py      |  2 +-
 2 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index bceb1cad..6910d7bc 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -18,11 +18,11 @@ class ActivityStream(ABC):
 
     def stream_id(self, user):
         """ the redis key for this user's instance of this stream """
-        return '{}-{}'.format(user.id, self.key)
+        return "{}-{}".format(user.id, self.key)
 
     def unread_id(self, user):
         """ the redis key for this user's unread count for this stream """
-        return '{}-unread'.format(self.stream_id(user))
+        return "{}-unread".format(self.stream_id(user))
 
     def add_status(self, status):
         """ add a status to users' feeds """
@@ -38,94 +38,93 @@ class ActivityStream(ABC):
         # and go!
         pipeline.execute()
 
-
     def get_value(self, status):  # pylint: disable=no-self-use
         """ the status id and the rank (ie, published date) """
         return {status.id: status.published_date.timestamp()}
 
-
     def get_activity_stream(self, user):
         """ load the ids for statuses to be displayed """
         # clear unreads for this feed
         r.set(self.unread_id(user), 0)
 
         statuses = r.zrevrange(self.stream_id(user), 0, -1)
-        return models.Status.objects.select_subclasses().filter(
-            id__in=statuses
-        ).order_by('-published_date')
-
+        return (
+            models.Status.objects.select_subclasses()
+            .filter(id__in=statuses)
+            .order_by("-published_date")
+        )
 
     def populate_stream(self, user):
-        ''' go from zero to a timeline '''
+        """ go from zero to a timeline """
         pipeline = r.pipeline()
         statuses = self.stream_statuses(user)
 
         stream_id = self.stream_id(user)
-        for status in statuses.all()[:settings.MAX_STREAM_LENGTH]:
+        for status in statuses.all()[: settings.MAX_STREAM_LENGTH]:
             pipeline.zadd(stream_id, self.get_value(status))
         pipeline.execute()
 
-
     def stream_users(self, status):  # pylint: disable=no-self-use
         """ given a status, what users should see it """
         # direct messages don't appeard in feeds.
-        if status.privacy == 'direct':
+        if status.privacy == "direct":
             return None
 
         # everybody who could plausibly see this status
         audience = models.User.objects.filter(
             is_active=True,
-            local=True  # we only create feeds for users of this instance
+            local=True,  # we only create feeds for users of this instance
         ).exclude(
             Q(id__in=status.user.blocks.all()) | Q(blocks=status.user)  # not blocked
         )
 
         # only visible to the poster's followers and tagged users
-        if status.privacy == 'followers':
+        if status.privacy == "followers":
             audience = audience.filter(
                 Q(id=status.user.id)  # if the user is the post's author
-                | Q(following=status.user) # if the user is following the author
+                | Q(following=status.user)  # if the user is following the author
             )
         return audience
 
-
     def stream_statuses(self, user):  # pylint: disable=no-self-use
         """ given a user, what statuses should they see on this stream """
         return privacy_filter(
             user,
             models.Status.objects.select_subclasses(),
-            privacy_levels=["public", 'unlisted', 'followers'],
+            privacy_levels=["public", "unlisted", "followers"],
         )
 
 
 class HomeStream(ActivityStream):
     """ users you follow """
-    key = 'home'
+
+    key = "home"
 
     def stream_users(self, status):
         audience = super().stream_users(status)
         return audience.filter(
             Q(id=status.user.id)  # if the user is the post's author
-            | Q(following=status.user) # if the user is following the author
-            | Q(id__in=status.mention_users.all()) # or the user is mentioned
+            | Q(following=status.user)  # if the user is following the author
+            | Q(id__in=status.mention_users.all())  # or the user is mentioned
         )
 
     def stream_statuses(self, user):
         return privacy_filter(
             user,
             models.Status.objects.select_subclasses(),
-            privacy_levels=["public", 'unlisted', 'followers'],
-            following_only=True
+            privacy_levels=["public", "unlisted", "followers"],
+            following_only=True,
         )
 
 
 class LocalStream(ActivityStream):
     """ users you follow """
-    key = 'local'
+
+    key = "local"
 
     def stream_users(self, status):
         # this stream wants no part in non-public statuses
-        if status.privacy != 'public':
+        if status.privacy != "public":
             return None
         return super().stream_users(status)
 
@@ -140,11 +139,12 @@ class LocalStream(ActivityStream):
 
 class FederatedStream(ActivityStream):
     """ users you follow """
-    key = 'federated'
+
+    key = "federated"
 
     def stream_users(self, status):
         # this stream wants no part in non-public statuses
-        if status.privacy != 'public':
+        if status.privacy != "public":
             return None
         return super().stream_users(status)
 
@@ -156,20 +156,23 @@ class FederatedStream(ActivityStream):
         )
 
 
-
 streams = {
-    'home': HomeStream(),
-    'local': LocalStream(),
-    'federated': FederatedStream(),
+    "home": HomeStream(),
+    "local": LocalStream(),
+    "federated": FederatedStream(),
 }
 
+
 @receiver(signals.post_save)
 # pylint: disable=unused-argument
 def update_feeds(sender, instance, created, *args, **kwargs):
     """ add statuses to activity feeds """
     # we're only interested in new statuses that aren't dms
-    if not created or not issubclass(sender, models.Status) or \
-            instance.privacy == 'direct':
+    if (
+        not created
+        or not issubclass(sender, models.Status)
+        or instance.privacy == "direct"
+    ):
         return
 
     for stream in streams.values():
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index a07ea524..b7ef9eb8 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -28,7 +28,7 @@ class Feed(View):
             page = 1
 
         if not tab in STREAMS:
-            tab = 'home'
+            tab = "home"
 
         activities = activitystreams.streams[tab].get_activity_stream(request.user)
 

From 7eb494b4abc44ae2a2c4025f420fb82e6d99c7e9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 22 Mar 2021 19:17:46 -0700
Subject: [PATCH 0404/1285] Removes get activity feed function

---
 bookwyrm/activitystreams.py          |   4 +-
 bookwyrm/models/status.py            |   2 -
 bookwyrm/tests/views/test_helpers.py | 107 ---------------------------
 bookwyrm/views/books.py              |   5 +-
 bookwyrm/views/feed.py               |  14 +++-
 bookwyrm/views/helpers.py            |  53 ++-----------
 bookwyrm/views/rss_feed.py           |   8 +-
 bookwyrm/views/user.py               |   8 +-
 8 files changed, 27 insertions(+), 174 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 6910d7bc..3ece0503 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -66,8 +66,8 @@ class ActivityStream(ABC):
 
     def stream_users(self, status):  # pylint: disable=no-self-use
         """ given a status, what users should see it """
-        # direct messages don't appeard in feeds.
-        if status.privacy == "direct":
+        # direct messages don't appeard in feeds, direct comments/reviews/etc do
+        if status.privacy == "direct" and status.status_type == 'Note':
             return None
 
         # everybody who could plausibly see this status
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index b313ac86..77ac4b58 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -5,8 +5,6 @@ import re
 from django.apps import apps
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
-from django.db.models import Q
-from django.dispatch import receiver
 from django.template.loader import get_template
 from django.utils import timezone
 from model_utils.managers import InheritanceManager
diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py
index bb4cf69c..926f9622 100644
--- a/bookwyrm/tests/views/test_helpers.py
+++ b/bookwyrm/tests/views/test_helpers.py
@@ -80,113 +80,6 @@ class ViewsHelpers(TestCase):
         request.headers = {"Accept": "Praise"}
         self.assertFalse(views.helpers.is_api_request(request))
 
-    def test_get_activity_feed(self):
-        """ loads statuses """
-        rat = models.User.objects.create_user(
-            "rat", "rat@rat.rat", "password", local=True
-        )
-
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            public_status = models.Comment.objects.create(
-                content="public status", book=self.book, user=self.local_user
-            )
-            direct_status = models.Status.objects.create(
-                content="direct", user=self.local_user, privacy="direct"
-            )
-
-            rat_public = models.Status.objects.create(content="blah blah", user=rat)
-            rat_unlisted = models.Status.objects.create(
-                content="blah blah", user=rat, privacy="unlisted"
-            )
-            remote_status = models.Status.objects.create(
-                content="blah blah", user=self.remote_user
-            )
-            followers_status = models.Status.objects.create(
-                content="blah", user=rat, privacy="followers"
-            )
-            rat_mention = models.Status.objects.create(
-                content="blah blah blah", user=rat, privacy="followers"
-            )
-            rat_mention.mention_users.set([self.local_user])
-
-        statuses = views.helpers.get_activity_feed(
-            self.local_user,
-            privacy=["public", "unlisted", "followers"],
-            following_only=True,
-            queryset=models.Comment.objects,
-        )
-        self.assertEqual(len(statuses), 1)
-        self.assertEqual(statuses[0], public_status)
-
-        statuses = views.helpers.get_activity_feed(
-            self.local_user, privacy=["public", "followers"], local_only=True
-        )
-        self.assertEqual(len(statuses), 2)
-        self.assertEqual(statuses[1], public_status)
-        self.assertEqual(statuses[0], rat_public)
-
-        statuses = views.helpers.get_activity_feed(self.local_user, privacy=["direct"])
-        self.assertEqual(len(statuses), 1)
-        self.assertEqual(statuses[0], direct_status)
-
-        statuses = views.helpers.get_activity_feed(
-            self.local_user,
-            privacy=["public", "followers"],
-        )
-        self.assertEqual(len(statuses), 3)
-        self.assertEqual(statuses[2], public_status)
-        self.assertEqual(statuses[1], rat_public)
-        self.assertEqual(statuses[0], remote_status)
-
-        statuses = views.helpers.get_activity_feed(
-            self.local_user,
-            privacy=["public", "unlisted", "followers"],
-            following_only=True,
-        )
-        self.assertEqual(len(statuses), 2)
-        self.assertEqual(statuses[1], public_status)
-        self.assertEqual(statuses[0], rat_mention)
-
-        rat.followers.add(self.local_user)
-        statuses = views.helpers.get_activity_feed(
-            self.local_user,
-            privacy=["public", "unlisted", "followers"],
-            following_only=True,
-        )
-        self.assertEqual(len(statuses), 5)
-        self.assertEqual(statuses[4], public_status)
-        self.assertEqual(statuses[3], rat_public)
-        self.assertEqual(statuses[2], rat_unlisted)
-        self.assertEqual(statuses[1], followers_status)
-        self.assertEqual(statuses[0], rat_mention)
-
-    def test_get_activity_feed_blocks(self):
-        """ feed generation with blocked users """
-        rat = models.User.objects.create_user(
-            "rat", "rat@rat.rat", "password", local=True
-        )
-
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            public_status = models.Comment.objects.create(
-                content="public status", book=self.book, user=self.local_user
-            )
-            rat_public = models.Status.objects.create(content="blah blah", user=rat)
-
-            statuses = views.helpers.get_activity_feed(
-                self.local_user, privacy=["public"]
-            )
-            self.assertEqual(len(statuses), 2)
-
-        # block relationship
-        rat.blocks.add(self.local_user)
-        statuses = views.helpers.get_activity_feed(self.local_user, privacy=["public"])
-        self.assertEqual(len(statuses), 1)
-        self.assertEqual(statuses[0], public_status)
-
-        statuses = views.helpers.get_activity_feed(rat, privacy=["public"])
-        self.assertEqual(len(statuses), 1)
-        self.assertEqual(statuses[0], rat_public)
-
     def test_is_bookwyrm_request(self):
         """ checks if a request came from a bookwyrm instance """
         request = self.factory.get("", {"q": "Test Book"})
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index f2aa76d7..cabc3223 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -19,8 +19,7 @@ from bookwyrm.activitypub import ActivitypubResponse
 from bookwyrm.connectors import connector_manager
 from bookwyrm.connectors.abstract_connector import get_image
 from bookwyrm.settings import PAGE_LENGTH
-from .helpers import is_api_request, get_activity_feed, get_edition
-from .helpers import privacy_filter
+from .helpers import is_api_request, get_edition, privacy_filter
 
 
 # pylint: disable= no-self-use
@@ -53,7 +52,7 @@ class Book(View):
 
         # all reviews for the book
         reviews = models.Review.objects.filter(book__in=work.editions.all())
-        reviews = get_activity_feed(request.user, queryset=reviews)
+        reviews = privacy_filter(request.user, reviews)
 
         # the reviews to show
         paginated = Paginator(
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index b7ef9eb8..f2f3c2bd 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -11,7 +11,7 @@ from django.views import View
 from bookwyrm import activitystreams, forms, models
 from bookwyrm.activitypub import ActivitypubResponse
 from bookwyrm.settings import PAGE_LENGTH, STREAMS
-from .helpers import get_activity_feed, get_user_from_username
+from .helpers import get_user_from_username, privacy_filter
 from .helpers import is_api_request, is_bookwyrm_request, object_visible_to_user
 
 
@@ -58,7 +58,13 @@ class DirectMessage(View):
         except ValueError:
             page = 1
 
-        queryset = models.Status.objects
+        # remove fancy subclasses of status, keep just good ol' notes
+        queryset = models.Status.objects.filter(
+            review__isnull=True,
+            comment__isnull=True,
+            quotation__isnull=True,
+            generatednote__isnull=True,
+        )
 
         user = None
         if username:
@@ -69,8 +75,8 @@ class DirectMessage(View):
         if user:
             queryset = queryset.filter(Q(user=user) | Q(mention_users=user))
 
-        activities = get_activity_feed(
-            request.user, privacy=["direct"], queryset=queryset
+        activities = privacy_filter(
+            request.user, queryset, privacy_levels=["direct"]
         )
 
         paginated = Paginator(activities, PAGE_LENGTH)
diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index c62856ba..41822da2 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -59,6 +59,11 @@ def object_visible_to_user(viewer, obj):
 def privacy_filter(viewer, queryset, privacy_levels=None, following_only=False):
     """ filter objects that have "user" and "privacy" fields """
     privacy_levels = privacy_levels or ["public", "unlisted", "followers", "direct"]
+    # if there'd a deleted field, exclude deleted items
+    try:
+        queryset = queryset.filter(deleted=False)
+    except FieldError:
+        pass
 
     # exclude blocks from both directions
     if not viewer.is_anonymous:
@@ -102,54 +107,6 @@ def privacy_filter(viewer, queryset, privacy_levels=None, following_only=False):
     return queryset
 
 
-def get_activity_feed(
-    user, privacy=None, local_only=False, following_only=False, queryset=None
-):
-    """ get a filtered queryset of statuses """
-    if queryset is None:
-        queryset = models.Status.objects.select_subclasses()
-
-    # exclude deleted
-    queryset = queryset.exclude(deleted=True).order_by("-published_date")
-
-    # apply privacy filters
-    queryset = privacy_filter(user, queryset, privacy, following_only=following_only)
-
-    # only show dms if we only want dms
-    if privacy == ["direct"]:
-        # dms are direct statuses not related to books
-        queryset = queryset.filter(
-            review__isnull=True,
-            comment__isnull=True,
-            quotation__isnull=True,
-            generatednote__isnull=True,
-        )
-    else:
-        try:
-            queryset = queryset.exclude(
-                review__isnull=True,
-                comment__isnull=True,
-                quotation__isnull=True,
-                generatednote__isnull=True,
-                privacy="direct",
-            )
-        except FieldError:
-            # if we're looking at a subtype of Status (like Review)
-            pass
-
-    # filter for only local status
-    if local_only:
-        queryset = queryset.filter(user__local=True)
-
-    # remove statuses that have boosts in the same queryset
-    try:
-        queryset = queryset.filter(~Q(boosters__in=queryset))
-    except ValueError:
-        pass
-
-    return queryset
-
-
 def handle_remote_webfinger(query):
     """ webfingerin' other servers """
     user = None
diff --git a/bookwyrm/views/rss_feed.py b/bookwyrm/views/rss_feed.py
index 57821af4..ed3e84f4 100644
--- a/bookwyrm/views/rss_feed.py
+++ b/bookwyrm/views/rss_feed.py
@@ -1,7 +1,7 @@
 """ serialize user's posts in rss feed """
 
 from django.contrib.syndication.views import Feed
-from .helpers import get_activity_feed, get_user_from_username
+from .helpers import get_user_from_username, privacy_filter
 
 # pylint: disable=no-self-use, unused-argument
 class RssFeed(Feed):
@@ -24,10 +24,10 @@ class RssFeed(Feed):
 
     def items(self, obj):
         """ the user's activity feed """
-        return get_activity_feed(
+        return privacy_filter(
             obj,
-            privacy=["public", "unlisted"],
-            queryset=obj.status_set.select_subclasses(),
+            obj.status_set.select_subclasses(),
+            privacy_levels=["public", "unlisted"],
         )
 
     def item_link(self, item):
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index 690bf158..b8e3a86d 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -16,8 +16,8 @@ from django.views import View
 from bookwyrm import forms, models
 from bookwyrm.activitypub import ActivitypubResponse
 from bookwyrm.settings import PAGE_LENGTH
-from .helpers import get_activity_feed, get_user_from_username, is_api_request
-from .helpers import is_blocked, object_visible_to_user
+from .helpers import get_user_from_username, is_api_request
+from .helpers import is_blocked, privacy_filter, object_visible_to_user
 
 
 # pylint: disable= no-self-use
@@ -72,9 +72,9 @@ class User(View):
                 break
 
         # user's posts
-        activities = get_activity_feed(
+        activities = privacy_filter(
             request.user,
-            queryset=user.status_set.select_subclasses(),
+            user.status_set.select_subclasses(),
         )
         paginated = Paginator(activities, PAGE_LENGTH)
         goal = models.AnnualGoal.objects.filter(

From 73185c6e4016c11ab9618546aa906f8f60385d46 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 22 Mar 2021 19:19:21 -0700
Subject: [PATCH 0405/1285] Python formatting

---
 bookwyrm/activitystreams.py | 2 +-
 bookwyrm/views/feed.py      | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 3ece0503..dc5323f6 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -67,7 +67,7 @@ class ActivityStream(ABC):
     def stream_users(self, status):  # pylint: disable=no-self-use
         """ given a status, what users should see it """
         # direct messages don't appeard in feeds, direct comments/reviews/etc do
-        if status.privacy == "direct" and status.status_type == 'Note':
+        if status.privacy == "direct" and status.status_type == "Note":
             return None
 
         # everybody who could plausibly see this status
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index f2f3c2bd..e0de932d 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -75,9 +75,7 @@ class DirectMessage(View):
         if user:
             queryset = queryset.filter(Q(user=user) | Q(mention_users=user))
 
-        activities = privacy_filter(
-            request.user, queryset, privacy_levels=["direct"]
-        )
+        activities = privacy_filter(request.user, queryset, privacy_levels=["direct"])
 
         paginated = Paginator(activities, PAGE_LENGTH)
         activity_page = paginated.page(page)

From 26fa81f19be4fe31d1ba4c1656989f685455e662 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 22 Mar 2021 19:53:26 -0700
Subject: [PATCH 0406/1285] Use redis lists instead of ordered sets

Django unsorts it so there's no point
---
 bookwyrm/activitystreams.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index dc5323f6..aecad727 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -26,28 +26,24 @@ class ActivityStream(ABC):
 
     def add_status(self, status):
         """ add a status to users' feeds """
-        value = self.get_value(status)
         # we want to do this as a bulk operation, hence "pipeline"
         pipeline = r.pipeline()
         for user in self.stream_users(status):
             # add the status to the feed
-            pipeline.zadd(self.stream_id(user), value)
+            pipeline.lpush(self.stream_id(user), status.id)
+            pipeline.ltrim(self.stream_id(user), 0, settings.MAX_STREAM_LENGTH)
 
             # add to the unread status count
             pipeline.incr(self.unread_id(user))
         # and go!
         pipeline.execute()
 
-    def get_value(self, status):  # pylint: disable=no-self-use
-        """ the status id and the rank (ie, published date) """
-        return {status.id: status.published_date.timestamp()}
-
     def get_activity_stream(self, user):
         """ load the ids for statuses to be displayed """
         # clear unreads for this feed
         r.set(self.unread_id(user), 0)
 
-        statuses = r.zrevrange(self.stream_id(user), 0, -1)
+        statuses = r.lrange(self.stream_id(user), 0, -1)
         return (
             models.Status.objects.select_subclasses()
             .filter(id__in=statuses)
@@ -61,7 +57,7 @@ class ActivityStream(ABC):
 
         stream_id = self.stream_id(user)
         for status in statuses.all()[: settings.MAX_STREAM_LENGTH]:
-            pipeline.zadd(stream_id, self.get_value(status))
+            pipeline.lpush(stream_id, status.id)
         pipeline.execute()
 
     def stream_users(self, status):  # pylint: disable=no-self-use

From 39f34bc6e6f273f48376b8a049c66486631bfa11 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 22 Mar 2021 20:32:59 -0700
Subject: [PATCH 0407/1285] Adds activity stream utility for adding and
 removing statuses

---
 bookwyrm/activitystreams.py     | 21 +++++++++++++++++++++
 bookwyrm/models/relationship.py |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index aecad727..7a959df9 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -38,6 +38,27 @@ class ActivityStream(ABC):
         # and go!
         pipeline.execute()
 
+    def remove_status(self, status):
+        """ remove a status from all feeds """
+        pipeline = r.pipeline()
+        for user in self.stream_users(status):
+            pipeline.lrem(self.stream_id(user), -1, status.id)
+        pipeline.execute()
+
+    def add_user_statuses(self, user, viewer):
+        """ add a user's statuses to another user's feed """
+        pipeline = r.pipeline()
+        for status in user.status_set.objects.all()[: settings.MAX_STREAM_LENGTH]:
+            pipeline.lpush(self.stream_id(viewer), status.id)
+        pipeline.execute()
+
+    def remove_user_statuses(self, user, viewer):
+        """ remove a user's status from another user's feed """
+        pipeline = r.pipeline()
+        for status in user.status_set.objects.all()[: settings.MAX_STREAM_LENGTH]:
+            pipeline.lrem(self.stream_id(viewer), status.id)
+        pipeline.execute()
+
     def get_activity_stream(self, user):
         """ load the ids for statuses to be displayed """
         # clear unreads for this feed
diff --git a/bookwyrm/models/relationship.py b/bookwyrm/models/relationship.py
index df99d216..998d7bed 100644
--- a/bookwyrm/models/relationship.py
+++ b/bookwyrm/models/relationship.py
@@ -62,7 +62,7 @@ class UserFollows(ActivityMixin, UserRelationship):
 
     status = "follows"
 
-    def to_activity(self):
+    def to_activity(self):  # pylint: disable=arguments-differ
         """ overrides default to manually set serializer """
         return activitypub.Follow(**generate_activity(self))
 

From 371e908e8a174a59c148e50346b18eea0a402210 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 22 Mar 2021 21:11:23 -0700
Subject: [PATCH 0408/1285] Adds handlers for user relationship state changes

---
 bookwyrm/activitystreams.py | 53 ++++++++++++++++++++++++++-----------
 1 file changed, 38 insertions(+), 15 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 7a959df9..dfffd490 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -1,8 +1,7 @@
 """ access the activity streams stored in redis """
 from abc import ABC
 from django.dispatch import receiver
-from django.db.models import signals
-from django.db.models import Q
+from django.db.models import signals, Q
 import redis
 
 from bookwyrm import models, settings
@@ -45,18 +44,18 @@ class ActivityStream(ABC):
             pipeline.lrem(self.stream_id(user), -1, status.id)
         pipeline.execute()
 
-    def add_user_statuses(self, user, viewer):
+    def add_user_statuses(self, viewer, user):
         """ add a user's statuses to another user's feed """
         pipeline = r.pipeline()
-        for status in user.status_set.objects.all()[: settings.MAX_STREAM_LENGTH]:
+        for status in user.status_set.all()[: settings.MAX_STREAM_LENGTH]:
             pipeline.lpush(self.stream_id(viewer), status.id)
         pipeline.execute()
 
-    def remove_user_statuses(self, user, viewer):
+    def remove_user_statuses(self, viewer, user):
         """ remove a user's status from another user's feed """
         pipeline = r.pipeline()
-        for status in user.status_set.objects.all()[: settings.MAX_STREAM_LENGTH]:
-            pipeline.lrem(self.stream_id(viewer), status.id)
+        for status in user.status_set.all()[: settings.MAX_STREAM_LENGTH]:
+            pipeline.lrem(self.stream_id(viewer), -1, status.id)
         pipeline.execute()
 
     def get_activity_stream(self, user):
@@ -182,15 +181,39 @@ streams = {
 
 @receiver(signals.post_save)
 # pylint: disable=unused-argument
-def update_feeds(sender, instance, created, *args, **kwargs):
-    """ add statuses to activity feeds """
-    # we're only interested in new statuses that aren't dms
-    if (
-        not created
-        or not issubclass(sender, models.Status)
-        or instance.privacy == "direct"
-    ):
+def add_status_on_create(sender, instance, created, *args, **kwargs):
+    """ add newly created statuses to activity feeds """
+    # we're only interested in new statuses
+    if not created or not issubclass(sender, models.Status):
         return
 
+    # iterates through Home, Local, Federated
     for stream in streams.values():
         stream.add_status(instance)
+
+
+@receiver(signals.post_save, sender=models.UserFollows)
+# pylint: disable=unused-argument
+def add_statuses_on_follow(sender, instance, created, *args, **kwargs):
+    """ add a newly followed user's statuses to feeds """
+    if not created:
+        return  # idk when this would ever happen though
+    HomeStream().add_user_statuses(instance.user_subject, instance.user_object)
+
+
+@receiver(signals.post_delete, sender=models.UserFollows)
+# pylint: disable=unused-argument
+def remove_statuses_on_unfollow(sender, instance, *args, **kwargs):
+    """ remove statuses from a feed on unfollow """
+    HomeStream().remove_user_statuses(instance.user_subject, instance.user_object)
+
+
+@receiver(signals.post_save, sender=models.UserBlocks)
+# pylint: disable=unused-argument
+def remove_statuses_on_block(sender, instance, *args, **kwargs):
+    """ remove statuses from all feeds on block """
+    # blocks apply ot all feeds
+    for stream in streams.values():
+        # and in both directions
+        stream.remove_user_statuses(instance.user_subject, instance.user_object)
+        stream.remove_user_statuses(instance.user_object, instance.user_subject)

From 04d20852765f238204e3a5434872b9cd24a4377c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Mar 2021 07:01:49 -0700
Subject: [PATCH 0409/1285] Create feeds on user registration

---
 bookwyrm/activitystreams.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index dfffd490..6182f510 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -217,3 +217,14 @@ def remove_statuses_on_block(sender, instance, *args, **kwargs):
         # and in both directions
         stream.remove_user_statuses(instance.user_subject, instance.user_object)
         stream.remove_user_statuses(instance.user_object, instance.user_subject)
+
+
+@receiver(signals.post_save, sender=models.User)
+# pylint: disable=unused-argument
+def populate_feed_on_account_create(sender, instance, created, *args, **kwargs):
+    """ build a user's feeds when they join """
+    if not created or not instance.local:
+        return
+
+    for stream in streams.values():
+        stream.populate_stream(instance)

From e17ee408002f19a2dd8594a44486aafb838427cc Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Mar 2021 07:28:44 -0700
Subject: [PATCH 0410/1285]     Generalizes broadcast mock in status view tests

---
 bookwyrm/tests/views/test_status.py | 76 +++++++++++++----------------
 1 file changed, 35 insertions(+), 41 deletions(-)

diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py
index 32080a5a..665fd627 100644
--- a/bookwyrm/tests/views/test_status.py
+++ b/bookwyrm/tests/views/test_status.py
@@ -8,6 +8,7 @@ from bookwyrm import forms, models, views
 from bookwyrm.settings import DOMAIN
 
 
+@patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 class StatusViews(TestCase):
     """ viewing and creating statuses """
 
@@ -40,7 +41,7 @@ class StatusViews(TestCase):
             parent_work=work,
         )
 
-    def test_handle_status(self):
+    def test_handle_status(self, _):
         """ create a status """
         view = views.CreateStatus.as_view()
         form = forms.CommentForm(
@@ -53,23 +54,22 @@ class StatusViews(TestCase):
         )
         request = self.factory.post("", form.data)
         request.user = self.local_user
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            view(request, "comment")
+
+        view(request, "comment")
         status = models.Comment.objects.get()
         self.assertEqual(status.content, "<p>hi</p>")
         self.assertEqual(status.user, self.local_user)
         self.assertEqual(status.book, self.book)
 
-    def test_handle_status_reply(self):
+    def test_handle_status_reply(self, _):
         """ create a status in reply to an existing status """
         view = views.CreateStatus.as_view()
         user = models.User.objects.create_user(
             "rat", "rat@rat.com", "password", local=True
         )
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            parent = models.Status.objects.create(
-                content="parent status", user=self.local_user
-            )
+        parent = models.Status.objects.create(
+            content="parent status", user=self.local_user
+        )
         form = forms.ReplyForm(
             {
                 "content": "hi",
@@ -80,14 +80,14 @@ class StatusViews(TestCase):
         )
         request = self.factory.post("", form.data)
         request.user = user
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            view(request, "reply")
+
+        view(request, "reply")
         status = models.Status.objects.get(user=user)
         self.assertEqual(status.content, "<p>hi</p>")
         self.assertEqual(status.user, user)
         self.assertEqual(models.Notification.objects.get().user, self.local_user)
 
-    def test_handle_status_mentions(self):
+    def test_handle_status_mentions(self, _):
         """ @mention a user in a post """
         view = views.CreateStatus.as_view()
         user = models.User.objects.create_user(
@@ -104,8 +104,7 @@ class StatusViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = self.local_user
 
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            view(request, "comment")
+        view(request, "comment")
         status = models.Status.objects.get()
         self.assertEqual(list(status.mention_users.all()), [user])
         self.assertEqual(models.Notification.objects.get().user, user)
@@ -113,7 +112,7 @@ class StatusViews(TestCase):
             status.content, '<p>hi <a href="%s">@rat</a></p>' % user.remote_id
         )
 
-    def test_handle_status_reply_with_mentions(self):
+    def test_handle_status_reply_with_mentions(self, _):
         """ reply to a post with an @mention'ed user """
         view = views.CreateStatus.as_view()
         user = models.User.objects.create_user(
@@ -130,8 +129,7 @@ class StatusViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = self.local_user
 
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            view(request, "comment")
+        view(request, "comment")
         status = models.Status.objects.get()
 
         form = forms.ReplyForm(
@@ -144,8 +142,8 @@ class StatusViews(TestCase):
         )
         request = self.factory.post("", form.data)
         request.user = user
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            view(request, "reply")
+
+        view(request, "reply")
 
         reply = models.Status.replies(status).first()
         self.assertEqual(reply.content, "<p>right</p>")
@@ -154,7 +152,7 @@ class StatusViews(TestCase):
         self.assertFalse(self.remote_user in reply.mention_users.all())
         self.assertTrue(self.local_user in reply.mention_users.all())
 
-    def test_find_mentions(self):
+    def test_find_mentions(self, _):
         """ detect and look up @ mentions of users """
         user = models.User.objects.create_user(
             "nutria@%s" % DOMAIN,
@@ -200,7 +198,7 @@ class StatusViews(TestCase):
             ("@nutria@%s" % DOMAIN, user),
         )
 
-    def test_format_links(self):
+    def test_format_links(self, _):
         """ find and format urls into a tags """
         url = "http://www.fish.com/"
         self.assertEqual(
@@ -223,7 +221,7 @@ class StatusViews(TestCase):
             "?q=arkady+strugatsky&mode=everything</a>" % url,
         )
 
-    def test_to_markdown(self):
+    def test_to_markdown(self, _):
         """ this is mostly handled in other places, but nonetheless """
         text = "_hi_ and http://fish.com is <marquee>rad</marquee>"
         result = views.status.to_markdown(text)
@@ -232,33 +230,31 @@ class StatusViews(TestCase):
             '<p><em>hi</em> and <a href="http://fish.com">fish.com</a> ' "is rad</p>",
         )
 
-    def test_to_markdown_link(self):
+    def test_to_markdown_link(self, _):
         """ this is mostly handled in other places, but nonetheless """
         text = "[hi](http://fish.com) is <marquee>rad</marquee>"
         result = views.status.to_markdown(text)
         self.assertEqual(result, '<p><a href="http://fish.com">hi</a> ' "is rad</p>")
 
-    def test_handle_delete_status(self):
+    def test_handle_delete_status(self, mock):
         """ marks a status as deleted """
         view = views.DeleteStatus.as_view()
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            status = models.Status.objects.create(user=self.local_user, content="hi")
+        status = models.Status.objects.create(user=self.local_user, content="hi")
         self.assertFalse(status.deleted)
         request = self.factory.post("")
         request.user = self.local_user
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
-            view(request, status.id)
-            activity = json.loads(mock.call_args_list[0][0][1])
-            self.assertEqual(activity["type"], "Delete")
-            self.assertEqual(activity["object"]["type"], "Tombstone")
+
+        view(request, status.id)
+        activity = json.loads(mock.call_args_list[0][0][1])
+        self.assertEqual(activity["type"], "Delete")
+        self.assertEqual(activity["object"]["type"], "Tombstone")
         status.refresh_from_db()
         self.assertTrue(status.deleted)
 
-    def test_handle_delete_status_permission_denied(self):
+    def test_handle_delete_status_permission_denied(self, _):
         """ marks a status as deleted """
         view = views.DeleteStatus.as_view()
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            status = models.Status.objects.create(user=self.local_user, content="hi")
+        status = models.Status.objects.create(user=self.local_user, content="hi")
         self.assertFalse(status.deleted)
         request = self.factory.post("")
         request.user = self.remote_user
@@ -268,20 +264,18 @@ class StatusViews(TestCase):
         status.refresh_from_db()
         self.assertFalse(status.deleted)
 
-    def test_handle_delete_status_moderator(self):
+    def test_handle_delete_status_moderator(self, mock):
         """ marks a status as deleted """
         view = views.DeleteStatus.as_view()
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            status = models.Status.objects.create(user=self.local_user, content="hi")
+        status = models.Status.objects.create(user=self.local_user, content="hi")
         self.assertFalse(status.deleted)
         request = self.factory.post("")
         request.user = self.remote_user
         request.user.is_superuser = True
 
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
-            view(request, status.id)
-            activity = json.loads(mock.call_args_list[0][0][1])
-            self.assertEqual(activity["type"], "Delete")
-            self.assertEqual(activity["object"]["type"], "Tombstone")
+        view(request, status.id)
+        activity = json.loads(mock.call_args_list[0][0][1])
+        self.assertEqual(activity["type"], "Delete")
+        self.assertEqual(activity["object"]["type"], "Tombstone")
         status.refresh_from_db()
         self.assertTrue(status.deleted)

From ea71c2aa88f50906f57b9704c8ef84289f2ca569 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Mar 2021 08:13:57 -0700
Subject: [PATCH 0411/1285] Fixes status views tests

---
 bookwyrm/activitystreams.py         |  7 +++-
 bookwyrm/tests/views/test_status.py | 56 +++++++++++++++++++++--------
 2 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 6182f510..53eb756a 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -184,7 +184,12 @@ streams = {
 def add_status_on_create(sender, instance, created, *args, **kwargs):
     """ add newly created statuses to activity feeds """
     # we're only interested in new statuses
-    if not created or not issubclass(sender, models.Status):
+    if not issubclass(sender, models.Status):
+        return
+
+    if not created and instance.deleted:
+        for stream in streams.values():
+            stream.remove_status(instance)
         return
 
     # iterates through Home, Local, Federated
diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py
index 665fd627..2a612850 100644
--- a/bookwyrm/tests/views/test_status.py
+++ b/bookwyrm/tests/views/test_status.py
@@ -55,7 +55,10 @@ class StatusViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = self.local_user
 
-        view(request, "comment")
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
+            view(request, "comment")
+            self.assertTrue(redis_mock.called)
+
         status = models.Comment.objects.get()
         self.assertEqual(status.content, "<p>hi</p>")
         self.assertEqual(status.user, self.local_user)
@@ -67,9 +70,10 @@ class StatusViews(TestCase):
         user = models.User.objects.create_user(
             "rat", "rat@rat.com", "password", local=True
         )
-        parent = models.Status.objects.create(
-            content="parent status", user=self.local_user
-        )
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+            parent = models.Status.objects.create(
+                content="parent status", user=self.local_user
+            )
         form = forms.ReplyForm(
             {
                 "content": "hi",
@@ -81,7 +85,10 @@ class StatusViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = user
 
-        view(request, "reply")
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
+            view(request, "reply")
+            self.assertTrue(redis_mock.called)
+
         status = models.Status.objects.get(user=user)
         self.assertEqual(status.content, "<p>hi</p>")
         self.assertEqual(status.user, user)
@@ -104,7 +111,10 @@ class StatusViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = self.local_user
 
-        view(request, "comment")
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
+            view(request, "comment")
+            self.assertTrue(redis_mock.called)
+
         status = models.Status.objects.get()
         self.assertEqual(list(status.mention_users.all()), [user])
         self.assertEqual(models.Notification.objects.get().user, user)
@@ -129,7 +139,9 @@ class StatusViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = self.local_user
 
-        view(request, "comment")
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
+            view(request, "comment")
+            self.assertTrue(redis_mock.called)
         status = models.Status.objects.get()
 
         form = forms.ReplyForm(
@@ -143,7 +155,10 @@ class StatusViews(TestCase):
         request = self.factory.post("", form.data)
         request.user = user
 
-        view(request, "reply")
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
+            view(request, "reply")
+            self.assertTrue(redis_mock.called)
+
 
         reply = models.Status.replies(status).first()
         self.assertEqual(reply.content, "<p>right</p>")
@@ -239,13 +254,18 @@ class StatusViews(TestCase):
     def test_handle_delete_status(self, mock):
         """ marks a status as deleted """
         view = views.DeleteStatus.as_view()
-        status = models.Status.objects.create(user=self.local_user, content="hi")
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+            status = models.Status.objects.create(user=self.local_user, content="hi")
         self.assertFalse(status.deleted)
         request = self.factory.post("")
         request.user = self.local_user
 
-        view(request, status.id)
-        activity = json.loads(mock.call_args_list[0][0][1])
+        with patch(
+            "bookwyrm.activitystreams.ActivityStream.remove_status"
+        ) as redis_mock:
+            view(request, status.id)
+            self.assertTrue(redis_mock.called)
+        activity = json.loads(mock.call_args_list[1][0][1])
         self.assertEqual(activity["type"], "Delete")
         self.assertEqual(activity["object"]["type"], "Tombstone")
         status.refresh_from_db()
@@ -254,7 +274,8 @@ class StatusViews(TestCase):
     def test_handle_delete_status_permission_denied(self, _):
         """ marks a status as deleted """
         view = views.DeleteStatus.as_view()
-        status = models.Status.objects.create(user=self.local_user, content="hi")
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+            status = models.Status.objects.create(user=self.local_user, content="hi")
         self.assertFalse(status.deleted)
         request = self.factory.post("")
         request.user = self.remote_user
@@ -267,14 +288,19 @@ class StatusViews(TestCase):
     def test_handle_delete_status_moderator(self, mock):
         """ marks a status as deleted """
         view = views.DeleteStatus.as_view()
-        status = models.Status.objects.create(user=self.local_user, content="hi")
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+            status = models.Status.objects.create(user=self.local_user, content="hi")
         self.assertFalse(status.deleted)
         request = self.factory.post("")
         request.user = self.remote_user
         request.user.is_superuser = True
 
-        view(request, status.id)
-        activity = json.loads(mock.call_args_list[0][0][1])
+        with patch(
+            "bookwyrm.activitystreams.ActivityStream.remove_status"
+        ) as redis_mock:
+            view(request, status.id)
+            self.assertTrue(redis_mock.called)
+        activity = json.loads(mock.call_args_list[1][0][1])
         self.assertEqual(activity["type"], "Delete")
         self.assertEqual(activity["object"]["type"], "Tombstone")
         status.refresh_from_db()

From 73661b9472134c83a884770f92756df7511ce51f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Mar 2021 08:19:25 -0700
Subject: [PATCH 0412/1285] Mocks redis in outbox tests

---
 bookwyrm/tests/views/test_outbox.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/bookwyrm/tests/views/test_outbox.py b/bookwyrm/tests/views/test_outbox.py
index 5934eb7c..0bcfde69 100644
--- a/bookwyrm/tests/views/test_outbox.py
+++ b/bookwyrm/tests/views/test_outbox.py
@@ -11,6 +11,7 @@ from bookwyrm.settings import USER_AGENT
 
 
 # pylint: disable=too-many-public-methods
+@patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 class OutboxView(TestCase):
     """ sends out activities """
 
@@ -32,19 +33,19 @@ class OutboxView(TestCase):
             parent_work=work,
         )
 
-    def test_outbox(self):
+    def test_outbox(self, _):
         """ returns user's statuses """
         request = self.factory.get("")
         result = views.Outbox.as_view()(request, "mouse")
         self.assertIsInstance(result, JsonResponse)
 
-    def test_outbox_bad_method(self):
+    def test_outbox_bad_method(self, _):
         """ can't POST to outbox """
         request = self.factory.post("")
         result = views.Outbox.as_view()(request, "mouse")
         self.assertEqual(result.status_code, 405)
 
-    def test_outbox_unknown_user(self):
+    def test_outbox_unknown_user(self, _):
         """ should 404 for unknown and remote users """
         request = self.factory.post("")
         result = views.Outbox.as_view()(request, "beepboop")
@@ -52,9 +53,9 @@ class OutboxView(TestCase):
         result = views.Outbox.as_view()(request, "rat")
         self.assertEqual(result.status_code, 405)
 
-    def test_outbox_privacy(self):
+    def test_outbox_privacy(self, _):
         """ don't show dms et cetera in outbox """
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
             models.Status.objects.create(
                 content="PRIVATE!!", user=self.local_user, privacy="direct"
             )
@@ -75,9 +76,9 @@ class OutboxView(TestCase):
         self.assertEqual(data["type"], "OrderedCollection")
         self.assertEqual(data["totalItems"], 2)
 
-    def test_outbox_filter(self):
+    def test_outbox_filter(self, _):
         """ if we only care about reviews, only get reviews """
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
             models.Review.objects.create(
                 content="look at this",
                 name="hi",
@@ -101,9 +102,9 @@ class OutboxView(TestCase):
         self.assertEqual(data["type"], "OrderedCollection")
         self.assertEqual(data["totalItems"], 1)
 
-    def test_outbox_bookwyrm_request_true(self):
+    def test_outbox_bookwyrm_request_true(self, _):
         """ should differentiate between bookwyrm and outside requests """
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
             models.Review.objects.create(
                 name="hi",
                 content="look at this",
@@ -119,9 +120,9 @@ class OutboxView(TestCase):
         self.assertEqual(len(data["orderedItems"]), 1)
         self.assertEqual(data["orderedItems"][0]["type"], "Review")
 
-    def test_outbox_bookwyrm_request_false(self):
+    def test_outbox_bookwyrm_request_false(self, _):
         """ should differentiate between bookwyrm and outside requests """
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
             models.Review.objects.create(
                 name="hi",
                 content="look at this",

From 1cf4c0d5cc632918cbb479b272ec11700a09facc Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Mar 2021 08:27:24 -0700
Subject: [PATCH 0413/1285] Mocks redis in interaction tests

---
 bookwyrm/tests/views/test_interaction.py | 35 ++++++++++++------------
 bookwyrm/tests/views/test_isbn.py        |  2 --
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/bookwyrm/tests/views/test_interaction.py b/bookwyrm/tests/views/test_interaction.py
index 857f7061..b52e9a66 100644
--- a/bookwyrm/tests/views/test_interaction.py
+++ b/bookwyrm/tests/views/test_interaction.py
@@ -5,7 +5,7 @@ from django.test.client import RequestFactory
 
 from bookwyrm import models, views
 
-
+@patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 class InteractionViews(TestCase):
     """ viewing and creating statuses """
 
@@ -38,12 +38,12 @@ class InteractionViews(TestCase):
             parent_work=work,
         )
 
-    def test_handle_favorite(self):
+    def test_handle_favorite(self, _):
         """ create and broadcast faving a status """
         view = views.Favorite.as_view()
         request = self.factory.post("")
         request.user = self.remote_user
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
             status = models.Status.objects.create(user=self.local_user, content="hi")
 
             view(request, status.id)
@@ -56,12 +56,12 @@ class InteractionViews(TestCase):
         self.assertEqual(notification.user, self.local_user)
         self.assertEqual(notification.related_user, self.remote_user)
 
-    def test_handle_unfavorite(self):
+    def test_handle_unfavorite(self, _):
         """ unfav a status """
         view = views.Unfavorite.as_view()
         request = self.factory.post("")
         request.user = self.remote_user
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
             status = models.Status.objects.create(user=self.local_user, content="hi")
             views.Favorite.as_view()(request, status.id)
 
@@ -73,12 +73,12 @@ class InteractionViews(TestCase):
         self.assertEqual(models.Favorite.objects.count(), 0)
         self.assertEqual(models.Notification.objects.count(), 0)
 
-    def test_handle_boost(self):
+    def test_handle_boost(self, _):
         """ boost a status """
         view = views.Boost.as_view()
         request = self.factory.post("")
         request.user = self.remote_user
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
             status = models.Status.objects.create(user=self.local_user, content="hi")
 
             view(request, status.id)
@@ -94,12 +94,12 @@ class InteractionViews(TestCase):
         self.assertEqual(notification.related_user, self.remote_user)
         self.assertEqual(notification.related_status, status)
 
-    def test_handle_boost_unlisted(self):
+    def test_handle_boost_unlisted(self, _):
         """ boost a status """
         view = views.Boost.as_view()
         request = self.factory.post("")
         request.user = self.local_user
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
             status = models.Status.objects.create(
                 user=self.local_user, content="hi", privacy="unlisted"
             )
@@ -109,12 +109,12 @@ class InteractionViews(TestCase):
         boost = models.Boost.objects.get()
         self.assertEqual(boost.privacy, "unlisted")
 
-    def test_handle_boost_private(self):
+    def test_handle_boost_private(self, _):
         """ boost a status """
         view = views.Boost.as_view()
         request = self.factory.post("")
         request.user = self.local_user
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
             status = models.Status.objects.create(
                 user=self.local_user, content="hi", privacy="followers"
             )
@@ -122,31 +122,32 @@ class InteractionViews(TestCase):
             view(request, status.id)
         self.assertFalse(models.Boost.objects.exists())
 
-    def test_handle_boost_twice(self):
+    def test_handle_boost_twice(self, _):
         """ boost a status """
         view = views.Boost.as_view()
         request = self.factory.post("")
         request.user = self.local_user
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
             status = models.Status.objects.create(user=self.local_user, content="hi")
 
             view(request, status.id)
             view(request, status.id)
         self.assertEqual(models.Boost.objects.count(), 1)
 
-    def test_handle_unboost(self):
+    def test_handle_unboost(self, broadcast_mock):
         """ undo a boost """
         view = views.Unboost.as_view()
         request = self.factory.post("")
         request.user = self.local_user
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
             status = models.Status.objects.create(user=self.local_user, content="hi")
             views.Boost.as_view()(request, status.id)
 
         self.assertEqual(models.Boost.objects.count(), 1)
         self.assertEqual(models.Notification.objects.count(), 1)
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
+        broadcast_mock.call_count = 0
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
             view(request, status.id)
-            self.assertEqual(mock.call_count, 1)
+            self.assertEqual(broadcast_mock.call_count, 1)
         self.assertEqual(models.Boost.objects.count(), 0)
         self.assertEqual(models.Notification.objects.count(), 0)
diff --git a/bookwyrm/tests/views/test_isbn.py b/bookwyrm/tests/views/test_isbn.py
index c7ae1f39..7f03a610 100644
--- a/bookwyrm/tests/views/test_isbn.py
+++ b/bookwyrm/tests/views/test_isbn.py
@@ -3,12 +3,10 @@ import json
 from unittest.mock import patch
 
 from django.http import JsonResponse
-from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
 
 from bookwyrm import models, views
-from bookwyrm.connectors import abstract_connector
 from bookwyrm.settings import DOMAIN
 
 

From f290e60b852d15923cc02632a60fef32db140518 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Mar 2021 08:53:28 -0700
Subject: [PATCH 0414/1285] Improves signal handling and updates inbox tests

---
 bookwyrm/activitystreams.py        | 48 +++++++++++++++++----
 bookwyrm/tests/views/test_inbox.py | 67 ++++++++++++++++++++++--------
 2 files changed, 90 insertions(+), 25 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 53eb756a..c1c548d2 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -187,22 +187,34 @@ def add_status_on_create(sender, instance, created, *args, **kwargs):
     if not issubclass(sender, models.Status):
         return
 
-    if not created and instance.deleted:
+    if instance.deleted:
         for stream in streams.values():
             stream.remove_status(instance)
         return
 
+    if not created:
+        return
+
     # iterates through Home, Local, Federated
     for stream in streams.values():
         stream.add_status(instance)
 
 
+@receiver(signals.post_delete, sender=models.Boost)
+# pylint: disable=unused-argument
+def remove_boost_on_delete(sender, instance, *args, **kwargs):
+    """ boosts are deleted """
+    # we're only interested in new statuses
+    for stream in streams.values():
+        stream.remove_status(instance)
+
+
 @receiver(signals.post_save, sender=models.UserFollows)
 # pylint: disable=unused-argument
 def add_statuses_on_follow(sender, instance, created, *args, **kwargs):
     """ add a newly followed user's statuses to feeds """
-    if not created:
-        return  # idk when this would ever happen though
+    if not created or not instance.user_subject.local:
+        return
     HomeStream().add_user_statuses(instance.user_subject, instance.user_object)
 
 
@@ -210,6 +222,8 @@ def add_statuses_on_follow(sender, instance, created, *args, **kwargs):
 # pylint: disable=unused-argument
 def remove_statuses_on_unfollow(sender, instance, *args, **kwargs):
     """ remove statuses from a feed on unfollow """
+    if not instance.user_subject.local:
+        return
     HomeStream().remove_user_statuses(instance.user_subject, instance.user_object)
 
 
@@ -218,10 +232,30 @@ def remove_statuses_on_unfollow(sender, instance, *args, **kwargs):
 def remove_statuses_on_block(sender, instance, *args, **kwargs):
     """ remove statuses from all feeds on block """
     # blocks apply ot all feeds
-    for stream in streams.values():
-        # and in both directions
-        stream.remove_user_statuses(instance.user_subject, instance.user_object)
-        stream.remove_user_statuses(instance.user_object, instance.user_subject)
+    if instance.user_subject.local:
+        for stream in streams.values():
+            stream.remove_user_statuses(instance.user_subject, instance.user_object)
+
+    # and in both directions
+    if instance.user_object.local:
+        for stream in streams.values():
+            stream.remove_user_statuses(instance.user_object, instance.user_subject)
+
+
+@receiver(signals.post_delete, sender=models.UserBlocks)
+# pylint: disable=unused-argument
+def add_statuses_on_unblock(sender, instance, *args, **kwargs):
+    """ remove statuses from all feeds on block """
+    public_streams = [LocalStream(), FederatedStream()]
+    # add statuses back to streams with statuses from anyone
+    if instance.user_subject.local:
+        for stream in public_streams:
+            stream.add_user_statuses(instance.user_subject, instance.user_object)
+
+    # add statuses back to streams with statuses from anyone
+    if instance.user_object.local:
+        for stream in public_streams:
+            stream.add_user_statuses(instance.user_object, instance.user_subject)
 
 
 @receiver(signals.post_save, sender=models.User)
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index 10f55f89..7d08a1e4 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -38,11 +38,12 @@ class Inbox(TestCase):
                 outbox="https://example.com/users/rat/outbox",
             )
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            self.status = models.Status.objects.create(
-                user=self.local_user,
-                content="Test status",
-                remote_id="https://example.com/status/1",
-            )
+            with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+                self.status = models.Status.objects.create(
+                    user=self.local_user,
+                    content="Test status",
+                    remote_id="https://example.com/status/1",
+                )
 
         self.create_json = {
             "id": "hi",
@@ -139,7 +140,9 @@ class Inbox(TestCase):
         activity = self.create_json
         activity["object"] = status_data
 
-        views.inbox.activity_task(activity)
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
+            views.inbox.activity_task(activity)
+            self.assertTrue(redis_mock.called)
 
         status = models.Quotation.objects.get()
         self.assertEqual(
@@ -166,7 +169,9 @@ class Inbox(TestCase):
         activity = self.create_json
         activity["object"] = status_data
 
-        views.inbox.activity_task(activity)
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
+            views.inbox.activity_task(activity)
+            self.assertTrue(redis_mock.called)
         status = models.Status.objects.last()
         self.assertEqual(status.content, "test content in note")
         self.assertEqual(status.mention_users.first(), self.local_user)
@@ -187,7 +192,9 @@ class Inbox(TestCase):
         activity = self.create_json
         activity["object"] = status_data
 
-        views.inbox.activity_task(activity)
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
+            views.inbox.activity_task(activity)
+            self.assertTrue(redis_mock.called)
         status = models.Status.objects.last()
         self.assertEqual(status.content, "test content in note")
         self.assertEqual(status.reply_parent, self.status)
@@ -218,7 +225,7 @@ class Inbox(TestCase):
         self.assertEqual(book_list.description, "summary text")
         self.assertEqual(book_list.remote_id, "https://example.com/list/22")
 
-    def test_handle_follow_x(self):
+    def test_handle_follow(self):
         """ remote user wants to follow local user """
         activity = {
             "@context": "https://www.w3.org/ns/activitystreams",
@@ -436,7 +443,11 @@ class Inbox(TestCase):
             "actor": self.remote_user.remote_id,
             "object": {"id": self.status.remote_id, "type": "Tombstone"},
         }
-        views.inbox.activity_task(activity)
+        with patch(
+            "bookwyrm.activitystreams.ActivityStream.remove_status"
+        ) as redis_mock:
+            views.inbox.activity_task(activity)
+            self.assertTrue(redis_mock.called)
         # deletion doens't remove the status, it turns it into a tombstone
         status = models.Status.objects.get()
         self.assertTrue(status.deleted)
@@ -465,7 +476,11 @@ class Inbox(TestCase):
             "actor": self.remote_user.remote_id,
             "object": {"id": self.status.remote_id, "type": "Tombstone"},
         }
-        views.inbox.activity_task(activity)
+        with patch(
+            "bookwyrm.activitystreams.ActivityStream.remove_status"
+        ) as redis_mock:
+            views.inbox.activity_task(activity)
+            self.assertTrue(redis_mock.called)
         # deletion doens't remove the status, it turns it into a tombstone
         status = models.Status.objects.get()
         self.assertTrue(status.deleted)
@@ -535,7 +550,8 @@ class Inbox(TestCase):
         views.inbox.activity_task(activity)
         self.assertEqual(models.Favorite.objects.count(), 0)
 
-    def test_handle_boost(self):
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_handle_boost(self, _):
         """ boost a status """
         self.assertEqual(models.Notification.objects.count(), 0)
         activity = {
@@ -560,7 +576,8 @@ class Inbox(TestCase):
             content="hi",
             user=self.remote_user,
         )
-        status.save(broadcast=False)
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+            status.save(broadcast=False)
         activity = {
             "type": "Announce",
             "id": "http://www.faraway.com/boost/12",
@@ -575,9 +592,10 @@ class Inbox(TestCase):
 
     def test_handle_unboost(self):
         """ undo a boost """
-        boost = models.Boost.objects.create(
-            boosted_status=self.status, user=self.remote_user
-        )
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+            boost = models.Boost.objects.create(
+                boosted_status=self.status, user=self.remote_user
+            )
         activity = {
             "type": "Undo",
             "actor": "hi",
@@ -591,7 +609,11 @@ class Inbox(TestCase):
                 "object": self.status.remote_id,
             },
         }
-        views.inbox.activity_task(activity)
+        with patch(
+            "bookwyrm.activitystreams.ActivityStream.remove_status"
+        ) as redis_mock:
+            views.inbox.activity_task(activity)
+            self.assertTrue(redis_mock.called)
 
     def test_handle_unboost_unknown_boost(self):
         """ undo a boost """
@@ -863,6 +885,11 @@ class Inbox(TestCase):
             "object": "https://example.com/user/mouse",
         }
 
+        with patch(
+            "bookwyrm.activitystreams.ActivityStream.remove_user_statuses"
+        ) as redis_mock:
+            views.inbox.activity_task(activity)
+            self.assertTrue(redis_mock.called)
         views.inbox.activity_task(activity)
         block = models.UserBlocks.objects.get()
         self.assertEqual(block.user_subject, self.remote_user)
@@ -896,5 +923,9 @@ class Inbox(TestCase):
                 "object": "https://example.com/user/mouse",
             },
         }
-        views.inbox.activity_task(activity)
+        with patch(
+            "bookwyrm.activitystreams.ActivityStream.add_user_statuses"
+        ) as redis_mock:
+            views.inbox.activity_task(activity)
+            self.assertTrue(redis_mock.called)
         self.assertFalse(models.UserBlocks.objects.exists())

From b9ec6a1e2b42d39017f1885d897d7ef4df987e71 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Mar 2021 09:00:04 -0700
Subject: [PATCH 0415/1285] Mocks redis for helpers tests

---
 bookwyrm/tests/views/test_helpers.py | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py
index 926f9622..4fd7ce66 100644
--- a/bookwyrm/tests/views/test_helpers.py
+++ b/bookwyrm/tests/views/test_helpers.py
@@ -134,7 +134,8 @@ class ViewsHelpers(TestCase):
             self.assertIsInstance(result, models.User)
             self.assertEqual(result.username, "mouse@example.com")
 
-    def test_handle_reading_status_to_read(self):
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_handle_reading_status_to_read(self, _):
         """ posts shelve activities """
         shelf = self.local_user.shelf_set.get(identifier="to-read")
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
@@ -146,7 +147,8 @@ class ViewsHelpers(TestCase):
         self.assertEqual(status.mention_books.first(), self.book)
         self.assertEqual(status.content, "wants to read")
 
-    def test_handle_reading_status_reading(self):
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_handle_reading_status_reading(self, _):
         """ posts shelve activities """
         shelf = self.local_user.shelf_set.get(identifier="reading")
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
@@ -158,7 +160,8 @@ class ViewsHelpers(TestCase):
         self.assertEqual(status.mention_books.first(), self.book)
         self.assertEqual(status.content, "started reading")
 
-    def test_handle_reading_status_read(self):
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_handle_reading_status_read(self, _):
         """ posts shelve activities """
         shelf = self.local_user.shelf_set.get(identifier="read")
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
@@ -170,7 +173,8 @@ class ViewsHelpers(TestCase):
         self.assertEqual(status.mention_books.first(), self.book)
         self.assertEqual(status.content, "finished reading")
 
-    def test_handle_reading_status_other(self):
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_handle_reading_status_other(self, _):
         """ posts shelve activities """
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             views.helpers.handle_reading_status(
@@ -178,7 +182,8 @@ class ViewsHelpers(TestCase):
             )
         self.assertFalse(models.GeneratedNote.objects.exists())
 
-    def test_object_visible_to_user(self):
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_object_visible_to_user(self, _):
         """ does a user have permission to view an object """
         obj = models.Status.objects.create(
             content="hi", user=self.remote_user, privacy="public"
@@ -206,7 +211,8 @@ class ViewsHelpers(TestCase):
         obj.mention_users.add(self.local_user)
         self.assertTrue(views.helpers.object_visible_to_user(self.local_user, obj))
 
-    def test_object_visible_to_user_follower(self):
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_object_visible_to_user_follower(self, _):
         """ what you can see if you follow a user """
         self.remote_user.followers.add(self.local_user)
         obj = models.Status.objects.create(
@@ -225,7 +231,8 @@ class ViewsHelpers(TestCase):
         obj.mention_users.add(self.local_user)
         self.assertTrue(views.helpers.object_visible_to_user(self.local_user, obj))
 
-    def test_object_visible_to_user_blocked(self):
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_object_visible_to_user_blocked(self, _):
         """ you can't see it if they block you """
         self.remote_user.blocks.add(self.local_user)
         obj = models.Status.objects.create(

From 2d350474bf4c036f591415be7fcd303f43699aa7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Mar 2021 09:09:30 -0700
Subject: [PATCH 0416/1285] Mocks redis in feed view tests

---
 bookwyrm/tests/views/test_feed.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/tests/views/test_feed.py b/bookwyrm/tests/views/test_feed.py
index 42668467..1ff99573 100644
--- a/bookwyrm/tests/views/test_feed.py
+++ b/bookwyrm/tests/views/test_feed.py
@@ -14,6 +14,8 @@ from bookwyrm import views
 from bookwyrm.activitypub import ActivitypubResponse
 
 
+@patch("bookwyrm.activitystreams.ActivityStream.get_activity_stream")
+@patch("bookwyrm.activitystreams.ActivityStream.add_status")
 class FeedViews(TestCase):
     """ activity feed, statuses, dms """
 
@@ -34,7 +36,7 @@ class FeedViews(TestCase):
         )
         models.SiteSettings.objects.create()
 
-    def test_feed(self):
+    def test_feed(self, *_):
         """ there are so many views, this just makes sure it LOADS """
         view = views.Feed.as_view()
         request = self.factory.get("")
@@ -44,7 +46,7 @@ class FeedViews(TestCase):
         result.render()
         self.assertEqual(result.status_code, 200)
 
-    def test_status_page(self):
+    def test_status_page(self, *_):
         """ there are so many views, this just makes sure it LOADS """
         view = views.Status.as_view()
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
@@ -64,7 +66,7 @@ class FeedViews(TestCase):
         self.assertIsInstance(result, ActivitypubResponse)
         self.assertEqual(result.status_code, 200)
 
-    def test_status_page_with_image(self):
+    def test_status_page_with_image(self, *_):
         """ there are so many views, this just makes sure it LOADS """
         view = views.Status.as_view()
 
@@ -100,7 +102,7 @@ class FeedViews(TestCase):
         self.assertIsInstance(result, ActivitypubResponse)
         self.assertEqual(result.status_code, 200)
 
-    def test_replies_page(self):
+    def test_replies_page(self, *_):
         """ there are so many views, this just makes sure it LOADS """
         view = views.Replies.as_view()
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
@@ -120,7 +122,7 @@ class FeedViews(TestCase):
         self.assertIsInstance(result, ActivitypubResponse)
         self.assertEqual(result.status_code, 200)
 
-    def test_direct_messages_page(self):
+    def test_direct_messages_page(self, *_):
         """ there are so many views, this just makes sure it LOADS """
         view = views.DirectMessage.as_view()
         request = self.factory.get("")
@@ -130,7 +132,7 @@ class FeedViews(TestCase):
         result.render()
         self.assertEqual(result.status_code, 200)
 
-    def test_get_suggested_book(self):
+    def test_get_suggested_book(self, *_):
         """ gets books the ~*~ algorithm ~*~ thinks you want to post about """
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             models.ShelfBook.objects.create(

From de2cea5ff20a0c9ea4bf86357eb7b8d47ded1860 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Mar 2021 09:14:31 -0700
Subject: [PATCH 0417/1285] Adds mocks for block tests

---
 bookwyrm/tests/views/test_block.py | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/tests/views/test_block.py b/bookwyrm/tests/views/test_block.py
index 60920e38..71583d70 100644
--- a/bookwyrm/tests/views/test_block.py
+++ b/bookwyrm/tests/views/test_block.py
@@ -7,6 +7,7 @@ from django.test.client import RequestFactory
 from bookwyrm import models, views
 
 
+@patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 class BlockViews(TestCase):
     """ view user and edit profile """
 
@@ -32,7 +33,7 @@ class BlockViews(TestCase):
             )
         models.SiteSettings.objects.create()
 
-    def test_block_get(self):
+    def test_block_get(self, _):
         """ there are so many views, this just makes sure it LOADS """
         view = views.Block.as_view()
         request = self.factory.get("")
@@ -42,20 +43,19 @@ class BlockViews(TestCase):
         result.render()
         self.assertEqual(result.status_code, 200)
 
-    def test_block_post(self):
+    def test_block_post(self, _):
         """ create a "block" database entry from an activity """
         view = views.Block.as_view()
         self.local_user.followers.add(self.remote_user)
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            models.UserFollowRequest.objects.create(
-                user_subject=self.local_user, user_object=self.remote_user
-            )
+        models.UserFollowRequest.objects.create(
+            user_subject=self.local_user, user_object=self.remote_user
+        )
         self.assertTrue(models.UserFollows.objects.exists())
         self.assertTrue(models.UserFollowRequest.objects.exists())
 
         request = self.factory.post("")
         request.user = self.local_user
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+        with patch("bookwyrm.activitystreams.ActivityStream.remove_user_statuses"):
             view(request, self.remote_user.id)
         block = models.UserBlocks.objects.get()
         self.assertEqual(block.user_subject, self.local_user)
@@ -64,13 +64,13 @@ class BlockViews(TestCase):
         self.assertFalse(models.UserFollows.objects.exists())
         self.assertFalse(models.UserFollowRequest.objects.exists())
 
-    def test_unblock(self):
+    def test_unblock(self, _):
         """ undo a block """
         self.local_user.blocks.add(self.remote_user)
         request = self.factory.post("")
         request.user = self.local_user
 
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+        with patch("bookwyrm.activitystreams.ActivityStream.add_user_statuses"):
             views.block.unblock(request, self.remote_user.id)
 
         self.assertFalse(models.UserBlocks.objects.exists())

From 59deb1cd052d154d745ac45d162a871fabf16f98 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Mar 2021 09:19:11 -0700
Subject: [PATCH 0418/1285] More mocks for more tests

---
 bookwyrm/tests/test_goodreads_import.py    |  3 +-
 bookwyrm/tests/test_librarything_import.py |  6 +--
 bookwyrm/tests/test_templatetags.py        | 52 +++++++++++-----------
 3 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/bookwyrm/tests/test_goodreads_import.py b/bookwyrm/tests/test_goodreads_import.py
index a62cfdd2..c06b49fc 100644
--- a/bookwyrm/tests/test_goodreads_import.py
+++ b/bookwyrm/tests/test_goodreads_import.py
@@ -203,7 +203,8 @@ class GoodreadsImport(TestCase):
         self.assertEqual(readthrough.finish_date.month, 10)
         self.assertEqual(readthrough.finish_date.day, 25)
 
-    def test_handle_imported_book_review(self):
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_handle_imported_book_review(self, _):
         """ goodreads review import """
         import_job = models.ImportJob.objects.create(user=self.user)
         datafile = pathlib.Path(__file__).parent.joinpath("data/goodreads.csv")
diff --git a/bookwyrm/tests/test_librarything_import.py b/bookwyrm/tests/test_librarything_import.py
index a8e4cfe4..54b8b422 100644
--- a/bookwyrm/tests/test_librarything_import.py
+++ b/bookwyrm/tests/test_librarything_import.py
@@ -1,5 +1,4 @@
 """ testing import """
-from collections import namedtuple
 import csv
 import pathlib
 from unittest.mock import patch
@@ -16,8 +15,8 @@ class LibrarythingImport(TestCase):
     """ importing from librarything tsv """
 
     def setUp(self):
-        self.importer = LibrarythingImporter()
         """ use a test tsv """
+        self.importer = LibrarythingImporter()
         datafile = pathlib.Path(__file__).parent.joinpath("data/librarything.tsv")
 
         # Librarything generates latin encoded exports...
@@ -200,7 +199,8 @@ class LibrarythingImport(TestCase):
         self.assertEqual(readthrough.finish_date.month, 5)
         self.assertEqual(readthrough.finish_date.day, 8)
 
-    def test_handle_imported_book_review(self):
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_handle_imported_book_review(self, _):
         """ librarything review import """
         import_job = models.ImportJob.objects.create(user=self.user)
         datafile = pathlib.Path(__file__).parent.joinpath("data/librarything.tsv")
diff --git a/bookwyrm/tests/test_templatetags.py b/bookwyrm/tests/test_templatetags.py
index 6bdbd04c..61136c2e 100644
--- a/bookwyrm/tests/test_templatetags.py
+++ b/bookwyrm/tests/test_templatetags.py
@@ -10,6 +10,7 @@ from bookwyrm import models
 from bookwyrm.templatetags import bookwyrm_tags
 
 
+@patch("bookwyrm.activitystreams.ActivityStream.add_status")
 class TemplateTags(TestCase):
     """ lotta different things here """
 
@@ -32,34 +33,34 @@ class TemplateTags(TestCase):
             )
         self.book = models.Edition.objects.create(title="Test Book")
 
-    def test_dict_key(self):
+    def test_dict_key(self, _):
         """ just getting a value out of a dict """
         test_dict = {"a": 1, "b": 3}
         self.assertEqual(bookwyrm_tags.dict_key(test_dict, "a"), 1)
         self.assertEqual(bookwyrm_tags.dict_key(test_dict, "c"), 0)
 
-    def test_get_user_rating(self):
+    def test_get_user_rating(self, _):
         """ get a user's most recent rating of a book """
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             models.Review.objects.create(user=self.user, book=self.book, rating=3)
         self.assertEqual(bookwyrm_tags.get_user_rating(self.book, self.user), 3)
 
-    def test_get_user_rating_doesnt_exist(self):
+    def test_get_user_rating_doesnt_exist(self, _):
         """ there is no rating available """
         self.assertEqual(bookwyrm_tags.get_user_rating(self.book, self.user), 0)
 
-    def test_get_user_identifer_local(self):
+    def test_get_user_identifer_local(self, _):
         """ fall back to the simplest uid available """
         self.assertNotEqual(self.user.username, self.user.localname)
         self.assertEqual(bookwyrm_tags.get_user_identifier(self.user), "mouse")
 
-    def test_get_user_identifer_remote(self):
+    def test_get_user_identifer_remote(self, _):
         """ for a remote user, should be their full username """
         self.assertEqual(
             bookwyrm_tags.get_user_identifier(self.remote_user), "rat@example.com"
         )
 
-    def test_get_notification_count(self):
+    def test_get_notification_count(self, _):
         """ just countin' """
         self.assertEqual(bookwyrm_tags.get_notification_count(self.user), 0)
 
@@ -72,7 +73,7 @@ class TemplateTags(TestCase):
 
         self.assertEqual(bookwyrm_tags.get_notification_count(self.user), 2)
 
-    def test_get_replies(self):
+    def test_get_replies(self, _):
         """ direct replies to a status """
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             parent = models.Review.objects.create(
@@ -84,12 +85,13 @@ class TemplateTags(TestCase):
             second_child = models.Status.objects.create(
                 reply_parent=parent, user=self.user, content="hi"
             )
-            third_child = models.Status.objects.create(
-                reply_parent=parent,
-                user=self.user,
-                deleted=True,
-                deleted_date=timezone.now(),
-            )
+            with patch("bookwyrm.activitystreams.ActivityStream.remove_status"):
+                third_child = models.Status.objects.create(
+                    reply_parent=parent,
+                    user=self.user,
+                    deleted=True,
+                    deleted_date=timezone.now(),
+                )
 
         replies = bookwyrm_tags.get_replies(parent)
         self.assertEqual(len(replies), 2)
@@ -97,7 +99,7 @@ class TemplateTags(TestCase):
         self.assertTrue(second_child in replies)
         self.assertFalse(third_child in replies)
 
-    def test_get_parent(self):
+    def test_get_parent(self, _):
         """ get the reply parent of a status """
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             parent = models.Review.objects.create(
@@ -111,7 +113,7 @@ class TemplateTags(TestCase):
         self.assertEqual(result, parent)
         self.assertIsInstance(result, models.Review)
 
-    def test_get_user_liked(self):
+    def test_get_user_liked(self, _):
         """ did a user like a status """
         status = models.Review.objects.create(user=self.remote_user, book=self.book)
 
@@ -120,7 +122,7 @@ class TemplateTags(TestCase):
             models.Favorite.objects.create(user=self.user, status=status)
         self.assertTrue(bookwyrm_tags.get_user_liked(self.user, status))
 
-    def test_get_user_boosted(self):
+    def test_get_user_boosted(self, _):
         """ did a user boost a status """
         status = models.Review.objects.create(user=self.remote_user, book=self.book)
 
@@ -129,7 +131,7 @@ class TemplateTags(TestCase):
             models.Boost.objects.create(user=self.user, boosted_status=status)
         self.assertTrue(bookwyrm_tags.get_user_boosted(self.user, status))
 
-    def test_follow_request_exists(self):
+    def test_follow_request_exists(self, _):
         """ does a user want to follow """
         self.assertFalse(
             bookwyrm_tags.follow_request_exists(self.user, self.remote_user)
@@ -147,7 +149,7 @@ class TemplateTags(TestCase):
             bookwyrm_tags.follow_request_exists(self.remote_user, self.user)
         )
 
-    def test_get_boosted(self):
+    def test_get_boosted(self, _):
         """ load a boosted status """
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             status = models.Review.objects.create(user=self.remote_user, book=self.book)
@@ -156,7 +158,7 @@ class TemplateTags(TestCase):
         self.assertIsInstance(boosted, models.Review)
         self.assertEqual(boosted, status)
 
-    def test_get_book_description(self):
+    def test_get_book_description(self, _):
         """ grab it from the edition or the parent """
         work = models.Work.objects.create(title="Test Work")
         self.book.parent_work = work
@@ -172,12 +174,12 @@ class TemplateTags(TestCase):
         self.book.save()
         self.assertEqual(bookwyrm_tags.get_book_description(self.book), "hello")
 
-    def test_get_uuid(self):
+    def test_get_uuid(self, _):
         """ uuid functionality """
         uuid = bookwyrm_tags.get_uuid("hi")
         self.assertTrue(re.match(r"hi[A-Za-z0-9\-]", uuid))
 
-    def test_time_since(self):
+    def test_time_since(self, _):
         """ ultraconcise timestamps """
         self.assertEqual(bookwyrm_tags.time_since("bleh"), "")
 
@@ -207,7 +209,7 @@ class TemplateTags(TestCase):
             re.match(r"[A-Z][a-z]{2} \d?\d \d{4}", bookwyrm_tags.time_since(years_ago))
         )
 
-    def test_get_markdown(self):
+    def test_get_markdown(self, _):
         """ mardown format data """
         result = bookwyrm_tags.get_markdown("_hi_")
         self.assertEqual(result, "<p><em>hi</em></p>")
@@ -215,13 +217,13 @@ class TemplateTags(TestCase):
         result = bookwyrm_tags.get_markdown("<marquee>_hi_</marquee>")
         self.assertEqual(result, "<p><em>hi</em></p>")
 
-    def test_get_mentions(self):
+    def test_get_mentions(self, _):
         """ list of people mentioned """
         status = models.Status.objects.create(content="hi", user=self.remote_user)
         result = bookwyrm_tags.get_mentions(status, self.user)
         self.assertEqual(result, "@rat@example.com ")
 
-    def test_get_status_preview_name(self):
+    def test_get_status_preview_name(self, _):
         """ status context string """
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             status = models.Status.objects.create(content="hi", user=self.user)
@@ -246,7 +248,7 @@ class TemplateTags(TestCase):
         result = bookwyrm_tags.get_status_preview_name(status)
         self.assertEqual(result, "quotation from <em>Test Book</em>")
 
-    def test_related_status(self):
+    def test_related_status(self, _):
         """ gets the subclass model for a notification status """
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             status = models.Status.objects.create(content="hi", user=self.user)

From 9e23bfe7c0677efebebf87868f66ff3ece39d6e8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Mar 2021 10:25:52 -0700
Subject: [PATCH 0419/1285] Updates activitypub tests

---
 .../tests/activitypub/test_base_activity.py   | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/bookwyrm/tests/activitypub/test_base_activity.py b/bookwyrm/tests/activitypub/test_base_activity.py
index f3d3decd..8ec0b703 100644
--- a/bookwyrm/tests/activitypub/test_base_activity.py
+++ b/bookwyrm/tests/activitypub/test_base_activity.py
@@ -19,6 +19,7 @@ from bookwyrm.activitypub import ActivitySerializerError
 from bookwyrm import models
 
 
+@patch("bookwyrm.activitystreams.ActivityStream.add_status")
 class BaseActivity(TestCase):
     """ the super class for model-linked activitypub dataclasses """
 
@@ -43,24 +44,24 @@ class BaseActivity(TestCase):
         image.save(output, format=image.format)
         self.image_data = output.getvalue()
 
-    def test_init(self):
+    def test_init(self, _):
         """ simple successfuly init """
         instance = ActivityObject(id="a", type="b")
         self.assertTrue(hasattr(instance, "id"))
         self.assertTrue(hasattr(instance, "type"))
 
-    def test_init_missing(self):
+    def test_init_missing(self, _):
         """ init with missing required params """
         with self.assertRaises(ActivitySerializerError):
             ActivityObject()
 
-    def test_init_extra_fields(self):
+    def test_init_extra_fields(self, _):
         """ init ignoring additional fields """
         instance = ActivityObject(id="a", type="b", fish="c")
         self.assertTrue(hasattr(instance, "id"))
         self.assertTrue(hasattr(instance, "type"))
 
-    def test_init_default_field(self):
+    def test_init_default_field(self, _):
         """ replace an existing required field with a default field """
 
         @dataclass(init=False)
@@ -73,7 +74,7 @@ class BaseActivity(TestCase):
         self.assertEqual(instance.id, "a")
         self.assertEqual(instance.type, "TestObject")
 
-    def test_serialize(self):
+    def test_serialize(self, _):
         """ simple function for converting dataclass to dict """
         instance = ActivityObject(id="a", type="b")
         serialized = instance.serialize()
@@ -82,7 +83,7 @@ class BaseActivity(TestCase):
         self.assertEqual(serialized["type"], "b")
 
     @responses.activate
-    def test_resolve_remote_id(self):
+    def test_resolve_remote_id(self, _):
         """ look up or load remote data """
         # existing item
         result = resolve_remote_id("http://example.com/a/b", model=models.User)
@@ -104,14 +105,14 @@ class BaseActivity(TestCase):
         self.assertEqual(result.remote_id, "https://example.com/user/mouse")
         self.assertEqual(result.name, "MOUSE?? MOUSE!!")
 
-    def test_to_model_invalid_model(self):
+    def test_to_model_invalid_model(self, _):
         """ catch mismatch between activity type and model type """
         instance = ActivityObject(id="a", type="b")
         with self.assertRaises(ActivitySerializerError):
             instance.to_model(model=models.User)
 
     @responses.activate
-    def test_to_model_image(self):
+    def test_to_model_image(self, _):
         """ update an image field """
         activity = activitypub.Person(
             id=self.user.remote_id,
@@ -144,7 +145,7 @@ class BaseActivity(TestCase):
         self.assertEqual(self.user.name, "New Name")
         self.assertEqual(self.user.key_pair.public_key, "hi")
 
-    def test_to_model_many_to_many(self):
+    def test_to_model_many_to_many(self, _):
         """ annoying that these all need special handling """
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             status = models.Status.objects.create(
@@ -175,7 +176,7 @@ class BaseActivity(TestCase):
         self.assertEqual(status.mention_books.first(), book)
 
     @responses.activate
-    def test_to_model_one_to_many(self):
+    def test_to_model_one_to_many(self, _):
         """these are reversed relationships, where the secondary object
         keys the primary object but not vice versa"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
@@ -214,7 +215,7 @@ class BaseActivity(TestCase):
         self.assertIsNone(status.attachments.first())
 
     @responses.activate
-    def test_set_related_field(self):
+    def test_set_related_field(self, _):
         """ celery task to add back-references to created objects """
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             status = models.Status.objects.create(

From 7f271dbde712fe2ce76d14fc2f48000e5a3cd140 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Mar 2021 10:41:18 -0700
Subject: [PATCH 0420/1285] Fixes model tests

---
 .../tests/models/test_activitypub_mixin.py    | 33 +++++-----
 bookwyrm/tests/models/test_base_model.py      |  6 +-
 bookwyrm/tests/models/test_fields.py          |  3 +-
 bookwyrm/tests/models/test_status_model.py    | 62 ++++++++++---------
 4 files changed, 54 insertions(+), 50 deletions(-)

diff --git a/bookwyrm/tests/models/test_activitypub_mixin.py b/bookwyrm/tests/models/test_activitypub_mixin.py
index 930f3a53..0d1acd97 100644
--- a/bookwyrm/tests/models/test_activitypub_mixin.py
+++ b/bookwyrm/tests/models/test_activitypub_mixin.py
@@ -13,6 +13,7 @@ from bookwyrm.models.activitypub_mixin import ActivitypubMixin
 from bookwyrm.models.activitypub_mixin import ActivityMixin, ObjectMixin
 
 
+@patch("bookwyrm.activitystreams.ActivityStream.add_status")
 class ActivitypubMixins(TestCase):
     """ functionality shared across models """
 
@@ -44,7 +45,7 @@ class ActivitypubMixins(TestCase):
         }
 
     # ActivitypubMixin
-    def test_to_activity(self):
+    def test_to_activity(self, _):
         """ model to ActivityPub json """
 
         @dataclass(init=False)
@@ -65,7 +66,7 @@ class ActivitypubMixins(TestCase):
         self.assertEqual(activity["id"], "https://www.example.com/test")
         self.assertEqual(activity["type"], "Test")
 
-    def test_find_existing_by_remote_id(self):
+    def test_find_existing_by_remote_id(self, _):
         """ attempt to match a remote id to an object in the db """
         # uses a different remote id scheme
         # this isn't really part of this test directly but it's helpful to state
@@ -98,7 +99,7 @@ class ActivitypubMixins(TestCase):
         # test subclass match
         result = models.Status.find_existing_by_remote_id("https://comment.net")
 
-    def test_find_existing(self):
+    def test_find_existing(self, _):
         """ match a blob of data to a model """
         book = models.Edition.objects.create(
             title="Test edition",
@@ -108,7 +109,7 @@ class ActivitypubMixins(TestCase):
         result = models.Edition.find_existing({"openlibraryKey": "OL1234"})
         self.assertEqual(result, book)
 
-    def test_get_recipients_public_object(self):
+    def test_get_recipients_public_object(self, _):
         """ determines the recipients for an object's broadcast """
         MockSelf = namedtuple("Self", ("privacy"))
         mock_self = MockSelf("public")
@@ -116,7 +117,7 @@ class ActivitypubMixins(TestCase):
         self.assertEqual(len(recipients), 1)
         self.assertEqual(recipients[0], self.remote_user.inbox)
 
-    def test_get_recipients_public_user_object_no_followers(self):
+    def test_get_recipients_public_user_object_no_followers(self, _):
         """ determines the recipients for a user's object broadcast """
         MockSelf = namedtuple("Self", ("privacy", "user"))
         mock_self = MockSelf("public", self.local_user)
@@ -124,7 +125,7 @@ class ActivitypubMixins(TestCase):
         recipients = ActivitypubMixin.get_recipients(mock_self)
         self.assertEqual(len(recipients), 0)
 
-    def test_get_recipients_public_user_object(self):
+    def test_get_recipients_public_user_object(self, _):
         """ determines the recipients for a user's object broadcast """
         MockSelf = namedtuple("Self", ("privacy", "user"))
         mock_self = MockSelf("public", self.local_user)
@@ -134,7 +135,7 @@ class ActivitypubMixins(TestCase):
         self.assertEqual(len(recipients), 1)
         self.assertEqual(recipients[0], self.remote_user.inbox)
 
-    def test_get_recipients_public_user_object_with_mention(self):
+    def test_get_recipients_public_user_object_with_mention(self, _):
         """ determines the recipients for a user's object broadcast """
         MockSelf = namedtuple("Self", ("privacy", "user"))
         mock_self = MockSelf("public", self.local_user)
@@ -157,7 +158,7 @@ class ActivitypubMixins(TestCase):
         self.assertEqual(recipients[0], another_remote_user.inbox)
         self.assertEqual(recipients[1], self.remote_user.inbox)
 
-    def test_get_recipients_direct(self):
+    def test_get_recipients_direct(self, _):
         """ determines the recipients for a user's object broadcast """
         MockSelf = namedtuple("Self", ("privacy", "user"))
         mock_self = MockSelf("public", self.local_user)
@@ -179,7 +180,7 @@ class ActivitypubMixins(TestCase):
         self.assertEqual(len(recipients), 1)
         self.assertEqual(recipients[0], another_remote_user.inbox)
 
-    def test_get_recipients_combine_inboxes(self):
+    def test_get_recipients_combine_inboxes(self, _):
         """ should combine users with the same shared_inbox """
         self.remote_user.shared_inbox = "http://example.com/inbox"
         self.remote_user.save(broadcast=False)
@@ -203,7 +204,7 @@ class ActivitypubMixins(TestCase):
         self.assertEqual(len(recipients), 1)
         self.assertEqual(recipients[0], "http://example.com/inbox")
 
-    def test_get_recipients_software(self):
+    def test_get_recipients_software(self, _):
         """ should differentiate between bookwyrm and other remote users """
         with patch("bookwyrm.models.user.set_remote_server.delay"):
             another_remote_user = models.User.objects.create_user(
@@ -233,7 +234,7 @@ class ActivitypubMixins(TestCase):
         self.assertEqual(recipients[0], another_remote_user.inbox)
 
     # ObjectMixin
-    def test_object_save_create(self):
+    def test_object_save_create(self, _):
         """ should save uneventufully when broadcast is disabled """
 
         class Success(Exception):
@@ -264,7 +265,7 @@ class ActivitypubMixins(TestCase):
         ObjectModel(user=self.local_user).save(broadcast=False)
         ObjectModel(user=None).save()
 
-    def test_object_save_update(self):
+    def test_object_save_update(self, _):
         """ should save uneventufully when broadcast is disabled """
 
         class Success(Exception):
@@ -290,7 +291,7 @@ class ActivitypubMixins(TestCase):
         with self.assertRaises(Success):
             UpdateObjectModel(id=1, last_edited_by=self.local_user).save()
 
-    def test_object_save_delete(self):
+    def test_object_save_delete(self, _):
         """ should create delete activities when objects are deleted by flag """
 
         class ActivitySuccess(Exception):
@@ -312,7 +313,7 @@ class ActivitypubMixins(TestCase):
         with self.assertRaises(ActivitySuccess):
             DeletableObjectModel(id=1, user=self.local_user, deleted=True).save()
 
-    def test_to_delete_activity(self):
+    def test_to_delete_activity(self, _):
         """ wrapper for Delete activity """
         MockSelf = namedtuple("Self", ("remote_id", "to_activity"))
         mock_self = MockSelf(
@@ -327,7 +328,7 @@ class ActivitypubMixins(TestCase):
             activity["cc"], ["https://www.w3.org/ns/activitystreams#Public"]
         )
 
-    def test_to_update_activity(self):
+    def test_to_update_activity(self, _):
         """ ditto above but for Update """
         MockSelf = namedtuple("Self", ("remote_id", "to_activity"))
         mock_self = MockSelf(
@@ -345,7 +346,7 @@ class ActivitypubMixins(TestCase):
         self.assertIsInstance(activity["object"], dict)
 
     # Activity mixin
-    def test_to_undo_activity(self):
+    def test_to_undo_activity(self, _):
         """ and again, for Undo """
         MockSelf = namedtuple("Self", ("remote_id", "to_activity", "user"))
         mock_self = MockSelf(
diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py
index 4479d156..25a2e7ee 100644
--- a/bookwyrm/tests/models/test_base_model.py
+++ b/bookwyrm/tests/models/test_base_model.py
@@ -27,18 +27,18 @@ class BaseModel(TestCase):
         expected = instance.get_remote_id()
         self.assertEqual(expected, "https://%s/user/mouse/bookwyrmmodel/1" % DOMAIN)
 
-    def test_execute_after_save(self):
+    def test_set_remote_id(self):
         """ this function sets remote ids after creation """
         # using Work because it BookWrymModel is abstract and this requires save
         # Work is a relatively not-fancy model.
         instance = models.Work.objects.create(title="work title")
         instance.remote_id = None
-        base_model.execute_after_save(None, instance, True)
+        base_model.set_remote_id(None, instance, True)
         self.assertEqual(
             instance.remote_id, "https://%s/book/%d" % (DOMAIN, instance.id)
         )
 
         # shouldn't set remote_id if it's not created
         instance.remote_id = None
-        base_model.execute_after_save(None, instance, False)
+        base_model.set_remote_id(None, instance, False)
         self.assertIsNone(instance.remote_id)
diff --git a/bookwyrm/tests/models/test_fields.py b/bookwyrm/tests/models/test_fields.py
index 28faf52c..18bb028f 100644
--- a/bookwyrm/tests/models/test_fields.py
+++ b/bookwyrm/tests/models/test_fields.py
@@ -185,7 +185,8 @@ class ActivitypubFields(TestCase):
         self.assertEqual(model_instance.privacy_field, "unlisted")
 
     @patch("bookwyrm.models.activitypub_mixin.ObjectMixin.broadcast")
-    def test_privacy_field_set_activity_from_field(self, _):
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_privacy_field_set_activity_from_field(self, *_):
         """ translate between to/cc fields and privacy """
         user = User.objects.create_user(
             "rat", "rat@rat.rat", "ratword", local=True, localname="rat"
diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py
index 1dcf5633..54fe7fee 100644
--- a/bookwyrm/tests/models/test_status_model.py
+++ b/bookwyrm/tests/models/test_status_model.py
@@ -15,6 +15,7 @@ from bookwyrm import activitypub, models, settings
 
 # pylint: disable=too-many-public-methods
 @patch("bookwyrm.models.Status.broadcast")
+@patch("bookwyrm.activitystreams.ActivityStream.add_status")
 class Status(TestCase):
     """ lotta types of statuses """
 
@@ -44,14 +45,14 @@ class Status(TestCase):
             image.save(output, format=image.format)
             self.book.cover.save("test.jpg", ContentFile(output.getvalue()))
 
-    def test_status_generated_fields(self, _):
+    def test_status_generated_fields(self, *_):
         """ setting remote id """
         status = models.Status.objects.create(content="bleh", user=self.local_user)
         expected_id = "https://%s/user/mouse/status/%d" % (settings.DOMAIN, status.id)
         self.assertEqual(status.remote_id, expected_id)
         self.assertEqual(status.privacy, "public")
 
-    def test_replies(self, _):
+    def test_replies(self, *_):
         """ get a list of replies """
         parent = models.Status.objects.create(content="hi", user=self.local_user)
         child = models.Status.objects.create(
@@ -70,7 +71,7 @@ class Status(TestCase):
         # should select subclasses
         self.assertIsInstance(replies.last(), models.Review)
 
-    def test_status_type(self, _):
+    def test_status_type(self, *_):
         """ class name """
         self.assertEqual(models.Status().status_type, "Note")
         self.assertEqual(models.Review().status_type, "Review")
@@ -78,14 +79,14 @@ class Status(TestCase):
         self.assertEqual(models.Comment().status_type, "Comment")
         self.assertEqual(models.Boost().status_type, "Announce")
 
-    def test_boostable(self, _):
+    def test_boostable(self, *_):
         """ can a status be boosted, based on privacy """
         self.assertTrue(models.Status(privacy="public").boostable)
         self.assertTrue(models.Status(privacy="unlisted").boostable)
         self.assertFalse(models.Status(privacy="followers").boostable)
         self.assertFalse(models.Status(privacy="direct").boostable)
 
-    def test_to_replies(self, _):
+    def test_to_replies(self, *_):
         """ activitypub replies collection """
         parent = models.Status.objects.create(content="hi", user=self.local_user)
         child = models.Status.objects.create(
@@ -102,7 +103,7 @@ class Status(TestCase):
         self.assertEqual(replies["id"], "%s/replies" % parent.remote_id)
         self.assertEqual(replies["totalItems"], 2)
 
-    def test_status_to_activity(self, _):
+    def test_status_to_activity(self, *_):
         """ subclass of the base model version with a "pure" serializer """
         status = models.Status.objects.create(
             content="test content", user=self.local_user
@@ -113,20 +114,21 @@ class Status(TestCase):
         self.assertEqual(activity["content"], "test content")
         self.assertEqual(activity["sensitive"], False)
 
-    def test_status_to_activity_tombstone(self, _):
+    def test_status_to_activity_tombstone(self, *_):
         """ subclass of the base model version with a "pure" serializer """
-        status = models.Status.objects.create(
-            content="test content",
-            user=self.local_user,
-            deleted=True,
-            deleted_date=timezone.now(),
-        )
+        with patch("bookwyrm.activitystreams.ActivityStream.remove_status"):
+            status = models.Status.objects.create(
+                content="test content",
+                user=self.local_user,
+                deleted=True,
+                deleted_date=timezone.now(),
+            )
         activity = status.to_activity()
         self.assertEqual(activity["id"], status.remote_id)
         self.assertEqual(activity["type"], "Tombstone")
         self.assertFalse(hasattr(activity, "content"))
 
-    def test_status_to_pure_activity(self, _):
+    def test_status_to_pure_activity(self, *_):
         """ subclass of the base model version with a "pure" serializer """
         status = models.Status.objects.create(
             content="test content", user=self.local_user
@@ -138,7 +140,7 @@ class Status(TestCase):
         self.assertEqual(activity["sensitive"], False)
         self.assertEqual(activity["attachment"], [])
 
-    def test_generated_note_to_activity(self, _):
+    def test_generated_note_to_activity(self, *_):
         """ subclass of the base model version with a "pure" serializer """
         status = models.GeneratedNote.objects.create(
             content="test content", user=self.local_user
@@ -152,7 +154,7 @@ class Status(TestCase):
         self.assertEqual(activity["sensitive"], False)
         self.assertEqual(len(activity["tag"]), 2)
 
-    def test_generated_note_to_pure_activity(self, _):
+    def test_generated_note_to_pure_activity(self, *_):
         """ subclass of the base model version with a "pure" serializer """
         status = models.GeneratedNote.objects.create(
             content="test content", user=self.local_user
@@ -176,7 +178,7 @@ class Status(TestCase):
         )
         self.assertEqual(activity["attachment"][0].name, "Test Edition")
 
-    def test_comment_to_activity(self, _):
+    def test_comment_to_activity(self, *_):
         """ subclass of the base model version with a "pure" serializer """
         status = models.Comment.objects.create(
             content="test content", user=self.local_user, book=self.book
@@ -187,7 +189,7 @@ class Status(TestCase):
         self.assertEqual(activity["content"], "test content")
         self.assertEqual(activity["inReplyToBook"], self.book.remote_id)
 
-    def test_comment_to_pure_activity(self, _):
+    def test_comment_to_pure_activity(self, *_):
         """ subclass of the base model version with a "pure" serializer """
         status = models.Comment.objects.create(
             content="test content", user=self.local_user, book=self.book
@@ -207,7 +209,7 @@ class Status(TestCase):
         )
         self.assertEqual(activity["attachment"][0].name, "Test Edition")
 
-    def test_quotation_to_activity(self, _):
+    def test_quotation_to_activity(self, *_):
         """ subclass of the base model version with a "pure" serializer """
         status = models.Quotation.objects.create(
             quote="a sickening sense",
@@ -222,7 +224,7 @@ class Status(TestCase):
         self.assertEqual(activity["content"], "test content")
         self.assertEqual(activity["inReplyToBook"], self.book.remote_id)
 
-    def test_quotation_to_pure_activity(self, _):
+    def test_quotation_to_pure_activity(self, *_):
         """ subclass of the base model version with a "pure" serializer """
         status = models.Quotation.objects.create(
             quote="a sickening sense",
@@ -245,7 +247,7 @@ class Status(TestCase):
         )
         self.assertEqual(activity["attachment"][0].name, "Test Edition")
 
-    def test_review_to_activity(self, _):
+    def test_review_to_activity(self, *_):
         """ subclass of the base model version with a "pure" serializer """
         status = models.Review.objects.create(
             name="Review name",
@@ -262,7 +264,7 @@ class Status(TestCase):
         self.assertEqual(activity["content"], "test content")
         self.assertEqual(activity["inReplyToBook"], self.book.remote_id)
 
-    def test_review_to_pure_activity(self, _):
+    def test_review_to_pure_activity(self, *_):
         """ subclass of the base model version with a "pure" serializer """
         status = models.Review.objects.create(
             name="Review name",
@@ -285,7 +287,7 @@ class Status(TestCase):
         )
         self.assertEqual(activity["attachment"][0].name, "Test Edition")
 
-    def test_favorite(self, _):
+    def test_favorite(self, *_):
         """ fav a status """
         real_broadcast = models.Favorite.broadcast
 
@@ -311,7 +313,7 @@ class Status(TestCase):
         self.assertEqual(activity["object"], status.remote_id)
         models.Favorite.broadcast = real_broadcast
 
-    def test_boost(self, _):
+    def test_boost(self, *_):
         """ boosting, this one's a bit fussy """
         status = models.Status.objects.create(
             content="test content", user=self.local_user
@@ -323,7 +325,7 @@ class Status(TestCase):
         self.assertEqual(activity["type"], "Announce")
         self.assertEqual(activity, boost.to_activity(pure=True))
 
-    def test_notification(self, _):
+    def test_notification(self, *_):
         """ a simple model """
         notification = models.Notification.objects.create(
             user=self.local_user, notification_type="FAVORITE"
@@ -335,7 +337,7 @@ class Status(TestCase):
                 user=self.local_user, notification_type="GLORB"
             )
 
-    def test_create_broadcast(self, broadcast_mock):
+    def test_create_broadcast(self, _, broadcast_mock):
         """ should send out two verions of a status on create """
         models.Comment.objects.create(
             content="hi", user=self.local_user, book=self.book
@@ -355,7 +357,7 @@ class Status(TestCase):
         self.assertEqual(args["type"], "Create")
         self.assertEqual(args["object"]["type"], "Comment")
 
-    def test_recipients_with_mentions(self, _):
+    def test_recipients_with_mentions(self, *_):
         """ get recipients to broadcast a status """
         status = models.GeneratedNote.objects.create(
             content="test content", user=self.local_user
@@ -364,7 +366,7 @@ class Status(TestCase):
 
         self.assertEqual(status.recipients, [self.remote_user])
 
-    def test_recipients_with_reply_parent(self, _):
+    def test_recipients_with_reply_parent(self, *_):
         """ get recipients to broadcast a status """
         parent_status = models.GeneratedNote.objects.create(
             content="test content", user=self.remote_user
@@ -375,7 +377,7 @@ class Status(TestCase):
 
         self.assertEqual(status.recipients, [self.remote_user])
 
-    def test_recipients_with_reply_parent_and_mentions(self, _):
+    def test_recipients_with_reply_parent_and_mentions(self, *_):
         """ get recipients to broadcast a status """
         parent_status = models.GeneratedNote.objects.create(
             content="test content", user=self.remote_user
@@ -388,7 +390,7 @@ class Status(TestCase):
         self.assertEqual(status.recipients, [self.remote_user])
 
     @responses.activate
-    def test_ignore_activity_boost(self, _):
+    def test_ignore_activity_boost(self, *_):
         """ don't bother with most remote statuses """
         activity = activitypub.Announce(
             id="http://www.faraway.com/boost/12",

From 28651bd8042883118bfa61d9aea64f1073950697 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Mar 2021 11:27:00 -0700
Subject: [PATCH 0421/1285] Fixes views tests

---
 bookwyrm/tests/views/test_goal.py        |  3 +-
 bookwyrm/tests/views/test_interaction.py |  6 +++-
 bookwyrm/tests/views/test_landing.py     |  4 ++-
 bookwyrm/tests/views/test_reading.py     | 13 +++++----
 bookwyrm/tests/views/test_rss_feed.py    | 36 +++++++++++++-----------
 bookwyrm/tests/views/test_status.py      |  1 -
 6 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/bookwyrm/tests/views/test_goal.py b/bookwyrm/tests/views/test_goal.py
index 990bb5c2..cbe4fe01 100644
--- a/bookwyrm/tests/views/test_goal.py
+++ b/bookwyrm/tests/views/test_goal.py
@@ -102,7 +102,8 @@ class GoalViews(TestCase):
         result = view(request, self.local_user.localname, 2020)
         self.assertEqual(result.status_code, 404)
 
-    def test_create_goal(self):
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_create_goal(self, _):
         """ create a new goal """
         view = views.Goal.as_view()
         request = self.factory.post(
diff --git a/bookwyrm/tests/views/test_interaction.py b/bookwyrm/tests/views/test_interaction.py
index b52e9a66..40152c0f 100644
--- a/bookwyrm/tests/views/test_interaction.py
+++ b/bookwyrm/tests/views/test_interaction.py
@@ -5,6 +5,7 @@ from django.test.client import RequestFactory
 
 from bookwyrm import models, views
 
+
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 class InteractionViews(TestCase):
     """ viewing and creating statuses """
@@ -146,8 +147,11 @@ class InteractionViews(TestCase):
         self.assertEqual(models.Boost.objects.count(), 1)
         self.assertEqual(models.Notification.objects.count(), 1)
         broadcast_mock.call_count = 0
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+        with patch(
+            "bookwyrm.activitystreams.ActivityStream.remove_status"
+        ) as redis_mock:
             view(request, status.id)
             self.assertEqual(broadcast_mock.call_count, 1)
+            self.assertTrue(redis_mock.called)
         self.assertEqual(models.Boost.objects.count(), 0)
         self.assertEqual(models.Notification.objects.count(), 0)
diff --git a/bookwyrm/tests/views/test_landing.py b/bookwyrm/tests/views/test_landing.py
index 910e4a85..2513fecc 100644
--- a/bookwyrm/tests/views/test_landing.py
+++ b/bookwyrm/tests/views/test_landing.py
@@ -1,4 +1,5 @@
 """ test for app action functionality """
+from unittest.mock import patch
 from django.contrib.auth.models import AnonymousUser
 from django.template.response import TemplateResponse
 from django.test import TestCase
@@ -30,7 +31,8 @@ class LandingViews(TestCase):
         view = views.Home.as_view()
         request = self.factory.get("")
         request.user = self.local_user
-        result = view(request)
+        with patch("bookwyrm.activitystreams.ActivityStream.get_activity_stream"):
+            result = view(request)
         self.assertEqual(result.status_code, 200)
         result.render()
 
diff --git a/bookwyrm/tests/views/test_reading.py b/bookwyrm/tests/views/test_reading.py
index 96d1f1f4..4661e487 100644
--- a/bookwyrm/tests/views/test_reading.py
+++ b/bookwyrm/tests/views/test_reading.py
@@ -8,6 +8,7 @@ from django.utils import timezone
 from bookwyrm import models, views
 
 
+@patch("bookwyrm.activitystreams.ActivityStream.add_status")
 class ReadingViews(TestCase):
     """ viewing and creating statuses """
 
@@ -39,7 +40,7 @@ class ReadingViews(TestCase):
                 outbox="https://example.com/users/rat/outbox",
             )
 
-    def test_start_reading(self):
+    def test_start_reading(self, _):
         """ begin a book """
         shelf = self.local_user.shelf_set.get(identifier="reading")
         self.assertFalse(shelf.books.exists())
@@ -70,7 +71,7 @@ class ReadingViews(TestCase):
         self.assertEqual(readthrough.user, self.local_user)
         self.assertEqual(readthrough.book, self.book)
 
-    def test_start_reading_reshelf(self):
+    def test_start_reading_reshelf(self, _):
         """ begin a book """
         to_read_shelf = self.local_user.shelf_set.get(identifier="to-read")
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
@@ -90,7 +91,7 @@ class ReadingViews(TestCase):
         self.assertFalse(to_read_shelf.books.exists())
         self.assertEqual(shelf.books.get(), self.book)
 
-    def test_finish_reading(self):
+    def test_finish_reading(self, _):
         """ begin a book """
         shelf = self.local_user.shelf_set.get(identifier="read")
         self.assertFalse(shelf.books.exists())
@@ -126,7 +127,7 @@ class ReadingViews(TestCase):
         self.assertEqual(readthrough.user, self.local_user)
         self.assertEqual(readthrough.book, self.book)
 
-    def test_edit_readthrough(self):
+    def test_edit_readthrough(self, _):
         """ adding dates to an ongoing readthrough """
         start = timezone.make_aware(dateutil.parser.parse("2021-01-03"))
         readthrough = models.ReadThrough.objects.create(
@@ -153,7 +154,7 @@ class ReadingViews(TestCase):
         self.assertEqual(readthrough.finish_date.day, 7)
         self.assertEqual(readthrough.book, self.book)
 
-    def test_delete_readthrough(self):
+    def test_delete_readthrough(self, _):
         """ remove a readthrough """
         readthrough = models.ReadThrough.objects.create(
             book=self.book, user=self.local_user
@@ -170,7 +171,7 @@ class ReadingViews(TestCase):
         views.delete_readthrough(request)
         self.assertFalse(models.ReadThrough.objects.filter(id=readthrough.id).exists())
 
-    def test_create_readthrough(self):
+    def test_create_readthrough(self, _):
         """ adding new read dates """
         request = self.factory.post(
             "",
diff --git a/bookwyrm/tests/views/test_rss_feed.py b/bookwyrm/tests/views/test_rss_feed.py
index c7fef2a9..0230b4a9 100644
--- a/bookwyrm/tests/views/test_rss_feed.py
+++ b/bookwyrm/tests/views/test_rss_feed.py
@@ -26,28 +26,30 @@ class RssFeedView(TestCase):
         )
 
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            self.review = models.Review.objects.create(
-                name="Review name",
-                content="test content",
-                rating=3,
-                user=self.user,
-                book=self.book,
-            )
+            with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+                self.review = models.Review.objects.create(
+                    name="Review name",
+                    content="test content",
+                    rating=3,
+                    user=self.user,
+                    book=self.book,
+                )
 
-            self.quote = models.Quotation.objects.create(
-                quote="a sickening sense",
-                content="test content",
-                user=self.user,
-                book=self.book,
-            )
+                self.quote = models.Quotation.objects.create(
+                    quote="a sickening sense",
+                    content="test content",
+                    user=self.user,
+                    book=self.book,
+                )
 
-            self.generatednote = models.GeneratedNote.objects.create(
-                content="test content", user=self.user
-            )
+                self.generatednote = models.GeneratedNote.objects.create(
+                    content="test content", user=self.user
+                )
 
         self.factory = RequestFactory()
 
-    def test_rss_feed(self):
+    @patch("bookwyrm.activitystreams.ActivityStream.get_activity_stream")
+    def test_rss_feed(self, _):
         """ load an rss feed """
         view = rss_feed.RssFeed()
         request = self.factory.get("/user/rss_user/rss")
diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py
index 2a612850..5dc0e49a 100644
--- a/bookwyrm/tests/views/test_status.py
+++ b/bookwyrm/tests/views/test_status.py
@@ -159,7 +159,6 @@ class StatusViews(TestCase):
             view(request, "reply")
             self.assertTrue(redis_mock.called)
 
-
         reply = models.Status.replies(status).first()
         self.assertEqual(reply.content, "<p>right</p>")
         self.assertEqual(reply.user, user)

From b8cd1d5bce861f1f85725323fbce34620461b8c9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Mar 2021 12:52:38 -0700
Subject: [PATCH 0422/1285] Show unread status reload link

---
 bookwyrm/activitystreams.py       |  4 ++++
 bookwyrm/static/js/shared.js      |  4 ++--
 bookwyrm/templates/feed/feed.html |  4 ++++
 bookwyrm/templates/layout.html    |  4 ++--
 bookwyrm/urls.py                  |  3 ++-
 bookwyrm/views/__init__.py        |  2 +-
 bookwyrm/views/updates.py         | 34 +++++++++++++++++--------------
 7 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index c1c548d2..1c8f78be 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -70,6 +70,10 @@ class ActivityStream(ABC):
             .order_by("-published_date")
         )
 
+    def get_unread_count(self, user):
+        """ get the unread status count for this user's feed """
+        return int(r.get(self.unread_id(user)))
+
     def populate_stream(self, user):
         """ go from zero to a timeline """
         pipeline = r.pipeline()
diff --git a/bookwyrm/static/js/shared.js b/bookwyrm/static/js/shared.js
index d390f482..1f26aba6 100644
--- a/bookwyrm/static/js/shared.js
+++ b/bookwyrm/static/js/shared.js
@@ -61,9 +61,9 @@ function polling(el, delay) {
 
 function updateCountElement(el, data) {
     const currentCount = el.innerText;
-    const count = data[el.getAttribute('data-poll')];
+    const count = data.count;
     if (count != currentCount) {
-        addRemoveClass(el, 'hidden', count < 1);
+        addRemoveClass(el.closest('[data-poll-wrapper]'), 'hidden', count < 1);
         el.innerText = count;
     }
 }
diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html
index 5ad18db6..77b593fe 100644
--- a/bookwyrm/templates/feed/feed.html
+++ b/bookwyrm/templates/feed/feed.html
@@ -26,6 +26,10 @@
     </ul>
 </div>
 
+<a href="{{ request.path }}" class="hidden notification is-primary is-block" data-poll-wrapper>
+    {% blocktrans %}load <span data-poll="stream/{{ tab }}">0</span> unread status(es){% endblocktrans %}
+</a>
+
 {# announcements and system messages #}
 {% if request.user.show_goal and not goal and tab == 'home' %}
 {% now 'Y' as year %}
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index e57f6152..d08b1820 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -139,8 +139,8 @@
                             <span class="is-sr-only">{% trans "Notifications" %}</span>
                         </span>
                     </span>
-                    <span class="{% if not request.user|notification_count %}hidden {% endif %}tag is-danger is-medium" data-poll="notifications">
-                        {{ request.user | notification_count }}
+                    <span class="{% if not request.user|notification_count %}hidden {% endif %}tag is-danger is-medium" data-poll-wrapper>
+                        <span data-poll="notifications">{{ request.user | notification_count }}</span>
                     </span>
                 </a>
             </div>
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 76622799..44db6892 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -37,7 +37,8 @@ urlpatterns = [
     re_path(r"^api/v1/instance/?$", views.instance_info),
     re_path(r"^api/v1/instance/peers/?$", views.peers),
     # polling updates
-    re_path("^api/updates/notifications/?$", views.Updates.as_view()),
+    re_path("^api/updates/notifications/?$", views.get_notification_count),
+    re_path("^api/updates/stream/(?P<stream>[a-z]+)/?$", views.get_unread_status_count),
     # authentication
     re_path(r"^login/?$", views.Login.as_view()),
     re_path(r"^register/?$", views.Register.as_view()),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index f1ebfc4c..3439304f 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -33,6 +33,6 @@ from .shelf import shelve, unshelve
 from .site import Site
 from .status import CreateStatus, DeleteStatus
 from .tag import Tag, AddTag, RemoveTag
-from .updates import Updates
+from .updates import get_notification_count, get_unread_status_count
 from .user import User, EditUser, Followers, Following
 from .wellknown import webfinger, nodeinfo_pointer, nodeinfo, instance_info, peers
diff --git a/bookwyrm/views/updates.py b/bookwyrm/views/updates.py
index 83b680c0..5bcb26b9 100644
--- a/bookwyrm/views/updates.py
+++ b/bookwyrm/views/updates.py
@@ -1,20 +1,24 @@
 """ endpoints for getting updates about activity """
 from django.contrib.auth.decorators import login_required
 from django.http import JsonResponse
-from django.utils.decorators import method_decorator
-from django.views import View
 
-# pylint: disable= no-self-use
-@method_decorator(login_required, name="dispatch")
-class Updates(View):
-    """ so the app can poll """
+from bookwyrm import activitystreams
 
-    def get(self, request):
-        """ any notifications waiting? """
-        return JsonResponse(
-            {
-                "notifications": request.user.notification_set.filter(
-                    read=False
-                ).count(),
-            }
-        )
+@login_required
+def get_notification_count(request):
+    """ any notifications waiting? """
+    return JsonResponse({
+        "count": request.user.notification_set.filter(
+            read=False
+        ).count(),
+    })
+
+@login_required
+def get_unread_status_count(request, stream):
+    """ any unread statuses for this feed? """
+    stream = activitystreams.streams.get(stream)
+    if not stream:
+        return JsonResponse({})
+    return JsonResponse({
+        "count": stream.get_unread_count(request.user)
+    })

From 9e9fd5c5a66f6a289e025d2aec9fa2a30d7de68e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Mar 2021 12:54:49 -0700
Subject: [PATCH 0423/1285] Only show feed additions on the first page

---
 bookwyrm/templates/feed/feed.html | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html
index 88fffbc7..379bf927 100644
--- a/bookwyrm/templates/feed/feed.html
+++ b/bookwyrm/templates/feed/feed.html
@@ -26,12 +26,13 @@
     </ul>
 </div>
 
+{# announcements and system messages #}
+{% if not activities.number > 1 %}
 <a href="{{ request.path }}" class="hidden notification is-primary is-block" data-poll-wrapper>
     {% blocktrans %}load <span data-poll="stream/{{ tab }}">0</span> unread status(es){% endblocktrans %}
 </a>
 
-{# announcements and system messages #}
-{% if request.user.show_goal and not goal and tab == 'home' and not activities.number > 1 %}
+{% if request.user.show_goal and not goal and tab == 'home' %}
 {% now 'Y' as year %}
 <section class="block">
     {% include 'snippets/goal_card.html' with year=year %}
@@ -39,6 +40,8 @@
 </section>
 {% endif %}
 
+{% endif %}
+
 {# activity feed #}
 {% if not activities %}
 <p>{% trans "There aren't any activities right now! Try following a user to get started" %}</p>

From 5caac46c319201d5fd14a75e7938b7a56653702d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Mar 2021 13:02:45 -0700
Subject: [PATCH 0424/1285] Updates updates tests

---
 bookwyrm/tests/views/test_updates.py | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/tests/views/test_updates.py b/bookwyrm/tests/views/test_updates.py
index b41b2014..3fe5b944 100644
--- a/bookwyrm/tests/views/test_updates.py
+++ b/bookwyrm/tests/views/test_updates.py
@@ -1,5 +1,7 @@
 """ test for app action functionality """
 import json
+from unittest.mock import patch
+
 from django.http import JsonResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
@@ -22,21 +24,33 @@ class UpdateViews(TestCase):
         )
         models.SiteSettings.objects.create()
 
-    def test_get_updates(self):
+    def test_get_notification_count(self):
         """ there are so many views, this just makes sure it LOADS """
-        view = views.Updates.as_view()
         request = self.factory.get("")
         request.user = self.local_user
 
-        result = view(request)
+        result = views.get_notification_count(request)
         self.assertIsInstance(result, JsonResponse)
         data = json.loads(result.getvalue())
-        self.assertEqual(data["notifications"], 0)
+        self.assertEqual(data["count"], 0)
 
         models.Notification.objects.create(
             notification_type="BOOST", user=self.local_user
         )
-        result = view(request)
+        result = views.get_notification_count(request)
         self.assertIsInstance(result, JsonResponse)
         data = json.loads(result.getvalue())
-        self.assertEqual(data["notifications"], 1)
+        self.assertEqual(data["count"], 1)
+
+    def test_get_unread_status_count(self):
+        """ there are so many views, this just makes sure it LOADS """
+        request = self.factory.get("")
+        request.user = self.local_user
+
+        with patch('bookwyrm.activitystreams.ActivityStream.get_unread_count') as mock:
+            mock.return_value = 3
+            result = views.get_unread_status_count(request, 'home')
+
+        self.assertIsInstance(result, JsonResponse)
+        data = json.loads(result.getvalue())
+        self.assertEqual(data["count"], 3)

From 0d88794f46633cf6b8d3729b20260ca6f3795974 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Mar 2021 13:07:29 -0700
Subject: [PATCH 0425/1285] Python formatting

---
 bookwyrm/tests/views/test_updates.py |  4 ++--
 bookwyrm/views/updates.py            | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bookwyrm/tests/views/test_updates.py b/bookwyrm/tests/views/test_updates.py
index 3fe5b944..dff730e6 100644
--- a/bookwyrm/tests/views/test_updates.py
+++ b/bookwyrm/tests/views/test_updates.py
@@ -47,9 +47,9 @@ class UpdateViews(TestCase):
         request = self.factory.get("")
         request.user = self.local_user
 
-        with patch('bookwyrm.activitystreams.ActivityStream.get_unread_count') as mock:
+        with patch("bookwyrm.activitystreams.ActivityStream.get_unread_count") as mock:
             mock.return_value = 3
-            result = views.get_unread_status_count(request, 'home')
+            result = views.get_unread_status_count(request, "home")
 
         self.assertIsInstance(result, JsonResponse)
         data = json.loads(result.getvalue())
diff --git a/bookwyrm/views/updates.py b/bookwyrm/views/updates.py
index 5bcb26b9..b095c965 100644
--- a/bookwyrm/views/updates.py
+++ b/bookwyrm/views/updates.py
@@ -4,14 +4,16 @@ from django.http import JsonResponse
 
 from bookwyrm import activitystreams
 
+
 @login_required
 def get_notification_count(request):
     """ any notifications waiting? """
-    return JsonResponse({
-        "count": request.user.notification_set.filter(
-            read=False
-        ).count(),
-    })
+    return JsonResponse(
+        {
+            "count": request.user.notification_set.filter(read=False).count(),
+        }
+    )
+
 
 @login_required
 def get_unread_status_count(request, stream):
@@ -19,6 +21,4 @@ def get_unread_status_count(request, stream):
     stream = activitystreams.streams.get(stream)
     if not stream:
         return JsonResponse({})
-    return JsonResponse({
-        "count": stream.get_unread_count(request.user)
-    })
+    return JsonResponse({"count": stream.get_unread_count(request.user)})

From 02bd94fdc85c7e1ad0cb021fc0b60db734d2f4c0 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Mar 2021 13:21:14 -0700
Subject: [PATCH 0426/1285] Handle '/' view in updates

---
 bookwyrm/views/updates.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/views/updates.py b/bookwyrm/views/updates.py
index b095c965..13ad8513 100644
--- a/bookwyrm/views/updates.py
+++ b/bookwyrm/views/updates.py
@@ -16,7 +16,7 @@ def get_notification_count(request):
 
 
 @login_required
-def get_unread_status_count(request, stream):
+def get_unread_status_count(request, stream='home'):
     """ any unread statuses for this feed? """
     stream = activitystreams.streams.get(stream)
     if not stream:

From 1fa7330595730a9896dc72b02ff8124cafe7b1e8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Mar 2021 13:23:35 -0700
Subject: [PATCH 0427/1285] Management command for rebuilding ALL feeds

---
 bookwyrm/management/commands/rebuild_feeds.py | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 bookwyrm/management/commands/rebuild_feeds.py

diff --git a/bookwyrm/management/commands/rebuild_feeds.py b/bookwyrm/management/commands/rebuild_feeds.py
new file mode 100644
index 00000000..ce7ead0f
--- /dev/null
+++ b/bookwyrm/management/commands/rebuild_feeds.py
@@ -0,0 +1,34 @@
+""" Delete and re-create user feeds """
+from django.core.management.base import BaseCommand
+import redis
+
+from bookwyrm import activitystreams, models, settings
+
+r = redis.Redis(
+    host=settings.REDIS_ACTIVITY_HOST, port=settings.REDIS_ACTIVITY_PORT, db=0
+)
+
+def erase_feeds():
+    """ throw the whole redis away """
+    r.flushall()
+
+def create_feeds():
+    """ build all the fields for all the users """
+    users = models.User.objects.filter(
+        local=True,
+        is_active=True,
+    )
+    for user in users:
+        for stream in activitystreams.streams.values():
+            stream.populate_stream(user)
+
+
+class Command(BaseCommand):
+    """ start all over with user feeds """
+
+    help = "Delete and re-create all the user feeds"
+    # pylint: disable=no-self-use,unused-argument
+    def handle(self, *args, **options):
+        """ run feed builder """
+        erase_feeds()
+        create_feeds()

From 3a0025b105cc4f200b8dd09c840f4e745d2e2d9d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Mar 2021 13:28:05 -0700
Subject: [PATCH 0428/1285] Python formatting

---
 bookwyrm/management/commands/rebuild_feeds.py | 2 ++
 bookwyrm/views/updates.py                     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/management/commands/rebuild_feeds.py b/bookwyrm/management/commands/rebuild_feeds.py
index ce7ead0f..70d4dd98 100644
--- a/bookwyrm/management/commands/rebuild_feeds.py
+++ b/bookwyrm/management/commands/rebuild_feeds.py
@@ -8,10 +8,12 @@ r = redis.Redis(
     host=settings.REDIS_ACTIVITY_HOST, port=settings.REDIS_ACTIVITY_PORT, db=0
 )
 
+
 def erase_feeds():
     """ throw the whole redis away """
     r.flushall()
 
+
 def create_feeds():
     """ build all the fields for all the users """
     users = models.User.objects.filter(
diff --git a/bookwyrm/views/updates.py b/bookwyrm/views/updates.py
index 13ad8513..cc5fc419 100644
--- a/bookwyrm/views/updates.py
+++ b/bookwyrm/views/updates.py
@@ -16,7 +16,7 @@ def get_notification_count(request):
 
 
 @login_required
-def get_unread_status_count(request, stream='home'):
+def get_unread_status_count(request, stream="home"):
     """ any unread statuses for this feed? """
     stream = activitystreams.streams.get(stream)
     if not stream:

From 7b8bb6bb21923e6b0cee74e4ecef7d3af04e023f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Mar 2021 13:38:03 -0700
Subject: [PATCH 0429/1285] Updates readme

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index e6a75375..e798fedf 100644
--- a/README.md
+++ b/README.md
@@ -76,6 +76,7 @@ Web backend
 - [ActivityPub](http://activitypub.rocks/) federation
 - [Celery](http://celeryproject.org/) task queuing
 - [Redis](https://redis.io/) task backend
+- [Redis (again)](https://redis.io/) activity stream manager
 
 Front end
 - Django templates
@@ -236,6 +237,11 @@ When there are changes available in the production branch, you can install and g
 - `docker-compose exec web python manage.py collectstatic --no-input` loads any updated static files (such as the JavaScript and CSS)
 - `docker-compose restart` reloads the docker containers
 
+### Re-building activity streams
+
+If something goes awry with user timelines, and you want to re-create them en mass, there's a management command for that:
+`docker-compose run --rm web python manage.py rebuild_feeds`
+
 ### Port Conflicts
 
 BookWyrm has multiple services that run on their default ports.

From 3e888c17dd1ac01f14f1e711bc98644c09f7d041 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Mar 2021 14:59:51 -0700
Subject: [PATCH 0430/1285] Fixes audience filters with tests

---
 bookwyrm/activitystreams.py            |  11 +-
 bookwyrm/tests/test_activitystreams.py | 216 +++++++++++++++++++++++++
 2 files changed, 224 insertions(+), 3 deletions(-)
 create mode 100644 bookwyrm/tests/test_activitystreams.py

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 1c8f78be..88f1f011 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -98,8 +98,14 @@ class ActivityStream(ABC):
             Q(id__in=status.user.blocks.all()) | Q(blocks=status.user)  # not blocked
         )
 
+        # only visible to the poster and mentioned users
+        if status.privacy == "direct":
+            audience = audience.filter(
+                Q(id=status.user.id)  # if the user is the post's author
+                | Q(id__in=status.mention_users.all())  # if the user is mentioned
+            )
         # only visible to the poster's followers and tagged users
-        if status.privacy == "followers":
+        elif status.privacy == "followers":
             audience = audience.filter(
                 Q(id=status.user.id)  # if the user is the post's author
                 | Q(following=status.user)  # if the user is following the author
@@ -125,7 +131,6 @@ class HomeStream(ActivityStream):
         return audience.filter(
             Q(id=status.user.id)  # if the user is the post's author
             | Q(following=status.user)  # if the user is following the author
-            | Q(id__in=status.mention_users.all())  # or the user is mentioned
         )
 
     def stream_statuses(self, user):
@@ -144,7 +149,7 @@ class LocalStream(ActivityStream):
 
     def stream_users(self, status):
         # this stream wants no part in non-public statuses
-        if status.privacy != "public":
+        if status.privacy != "public" or not status.user.local:
             return None
         return super().stream_users(status)
 
diff --git a/bookwyrm/tests/test_activitystreams.py b/bookwyrm/tests/test_activitystreams.py
new file mode 100644
index 00000000..a8daea84
--- /dev/null
+++ b/bookwyrm/tests/test_activitystreams.py
@@ -0,0 +1,216 @@
+""" testing activitystreams """
+from unittest.mock import patch
+from django.test import TestCase
+from bookwyrm import activitystreams, models
+
+
+class Activitystreams(TestCase):
+    """ using redis to build activity streams """
+
+    def setUp(self):
+        """ use a test csv """
+        self.local_user = models.User.objects.create_user(
+            "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse"
+        )
+        self.another_user = models.User.objects.create_user(
+            "nutria", "nutria@nutria.nutria", "password", local=True, localname="nutria"
+        )
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            self.remote_user = models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
+        self.book = models.Edition.objects.create(title="test book")
+
+        class TestStream(activitystreams.ActivityStream):
+            """ test stream, don't have to do anything here  """
+
+            key = "test"
+
+        self.test_stream = TestStream()
+
+    def test_activitystream_class_ids(self):
+        """ the abstract base class for stream objects """
+        self.assertEqual(
+            self.test_stream.stream_id(self.local_user),
+            "{}-test".format(self.local_user.id),
+        )
+        self.assertEqual(
+            self.test_stream.unread_id(self.local_user),
+            "{}-test-unread".format(self.local_user.id),
+        )
+
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_abstractstream_stream_users(self, _):
+        """ get a list of users that should see a status """
+        status = models.Status.objects.create(
+            user=self.remote_user, content="hi", privacy="public"
+        )
+        users = self.test_stream.stream_users(status)
+        # remote users don't have feeds
+        self.assertFalse(self.remote_user in users)
+        self.assertTrue(self.local_user in users)
+        self.assertTrue(self.another_user in users)
+
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_abstractstream_stream_users_direct(self, _):
+        """ get a list of users that should see a status """
+        status = models.Status.objects.create(
+            user=self.remote_user,
+            content="hi",
+            privacy="direct",
+        )
+        status.mention_users.add(self.local_user)
+        users = self.test_stream.stream_users(status)
+        self.assertIsNone(users)
+
+        status = models.Comment.objects.create(
+            user=self.remote_user,
+            content="hi",
+            privacy="direct",
+            book=self.book,
+        )
+        status.mention_users.add(self.local_user)
+        users = self.test_stream.stream_users(status)
+        self.assertTrue(self.local_user in users)
+        self.assertFalse(self.another_user in users)
+        self.assertFalse(self.remote_user in users)
+
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_abstractstream_stream_users_followers_remote_user(self, _):
+        """ get a list of users that should see a status """
+        status = models.Status.objects.create(
+            user=self.remote_user,
+            content="hi",
+            privacy="followers",
+        )
+        users = self.test_stream.stream_users(status)
+        self.assertFalse(users.exists())
+
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_abstractstream_stream_users_followers_self(self, _):
+        """ get a list of users that should see a status """
+        status = models.Comment.objects.create(
+            user=self.local_user,
+            content="hi",
+            privacy="direct",
+            book=self.book,
+        )
+        users = self.test_stream.stream_users(status)
+        self.assertTrue(self.local_user in users)
+        self.assertFalse(self.another_user in users)
+        self.assertFalse(self.remote_user in users)
+
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_abstractstream_stream_users_followers_with_mention(self, _):
+        """ get a list of users that should see a status """
+        status = models.Comment.objects.create(
+            user=self.remote_user,
+            content="hi",
+            privacy="direct",
+            book=self.book,
+        )
+        status.mention_users.add(self.local_user)
+
+        users = self.test_stream.stream_users(status)
+        self.assertTrue(self.local_user in users)
+        self.assertFalse(self.another_user in users)
+        self.assertFalse(self.remote_user in users)
+
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_abstractstream_stream_users_followers_with_relationship(self, _):
+        """ get a list of users that should see a status """
+        self.remote_user.followers.add(self.local_user)
+        status = models.Comment.objects.create(
+            user=self.remote_user,
+            content="hi",
+            privacy="direct",
+            book=self.book,
+        )
+        users = self.test_stream.stream_users(status)
+        self.assertFalse(self.local_user in users)
+        self.assertFalse(self.another_user in users)
+        self.assertFalse(self.remote_user in users)
+
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_homestream_stream_users(self, _):
+        """ get a list of users that should see a status """
+        status = models.Status.objects.create(
+            user=self.remote_user, content="hi", privacy="public"
+        )
+        users = activitystreams.HomeStream().stream_users(status)
+        self.assertFalse(users.exists())
+
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_homestream_stream_users_with_mentions(self, _):
+        """ get a list of users that should see a status """
+        status = models.Status.objects.create(
+            user=self.remote_user, content="hi", privacy="public"
+        )
+        status.mention_users.add(self.local_user)
+        users = activitystreams.HomeStream().stream_users(status)
+        self.assertFalse(self.local_user in users)
+        self.assertFalse(self.another_user in users)
+
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_homestream_stream_users_with_relationship(self, _):
+        """ get a list of users that should see a status """
+        self.remote_user.followers.add(self.local_user)
+        status = models.Status.objects.create(
+            user=self.remote_user, content="hi", privacy="public"
+        )
+        users = activitystreams.HomeStream().stream_users(status)
+        self.assertTrue(self.local_user in users)
+        self.assertFalse(self.another_user in users)
+
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_localstream_stream_users_remote_status(self, _):
+        """ get a list of users that should see a status """
+        status = models.Status.objects.create(
+            user=self.remote_user, content="hi", privacy="public"
+        )
+        users = activitystreams.LocalStream().stream_users(status)
+        self.assertIsNone(users)
+
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_localstream_stream_users_local_status(self, _):
+        """ get a list of users that should see a status """
+        status = models.Status.objects.create(
+            user=self.local_user, content="hi", privacy="public"
+        )
+        users = activitystreams.LocalStream().stream_users(status)
+        self.assertTrue(self.local_user in users)
+        self.assertTrue(self.another_user in users)
+
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_localstream_stream_users_unlisted(self, _):
+        """ get a list of users that should see a status """
+        status = models.Status.objects.create(
+            user=self.local_user, content="hi", privacy="unlisted"
+        )
+        users = activitystreams.LocalStream().stream_users(status)
+        self.assertIsNone(users)
+
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_federatedstream_stream_users(self, _):
+        """ get a list of users that should see a status """
+        status = models.Status.objects.create(
+            user=self.remote_user, content="hi", privacy="public"
+        )
+        users = activitystreams.FederatedStream().stream_users(status)
+        self.assertTrue(self.local_user in users)
+        self.assertTrue(self.another_user in users)
+
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_federatedstream_stream_users_unlisted(self, _):
+        """ get a list of users that should see a status """
+        status = models.Status.objects.create(
+            user=self.remote_user, content="hi", privacy="unlisted"
+        )
+        users = activitystreams.FederatedStream().stream_users(status)
+        self.assertIsNone(users)

From 701487c526bdcfdd46aa1cb1171b2bcf52604a2a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Mar 2021 15:03:05 -0700
Subject: [PATCH 0431/1285] Fixes mocks on activitystreams tests

---
 bookwyrm/tests/test_activitystreams.py | 46 ++++++++++----------------
 1 file changed, 17 insertions(+), 29 deletions(-)

diff --git a/bookwyrm/tests/test_activitystreams.py b/bookwyrm/tests/test_activitystreams.py
index a8daea84..d7a3d4eb 100644
--- a/bookwyrm/tests/test_activitystreams.py
+++ b/bookwyrm/tests/test_activitystreams.py
@@ -4,6 +4,8 @@ from django.test import TestCase
 from bookwyrm import activitystreams, models
 
 
+@patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
+@patch("bookwyrm.activitystreams.ActivityStream.add_status")
 class Activitystreams(TestCase):
     """ using redis to build activity streams """
 
@@ -34,7 +36,7 @@ class Activitystreams(TestCase):
 
         self.test_stream = TestStream()
 
-    def test_activitystream_class_ids(self):
+    def test_activitystream_class_ids(self, *_):
         """ the abstract base class for stream objects """
         self.assertEqual(
             self.test_stream.stream_id(self.local_user),
@@ -45,8 +47,7 @@ class Activitystreams(TestCase):
             "{}-test-unread".format(self.local_user.id),
         )
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
-    def test_abstractstream_stream_users(self, _):
+    def test_abstractstream_stream_users(self, *_):
         """ get a list of users that should see a status """
         status = models.Status.objects.create(
             user=self.remote_user, content="hi", privacy="public"
@@ -57,8 +58,7 @@ class Activitystreams(TestCase):
         self.assertTrue(self.local_user in users)
         self.assertTrue(self.another_user in users)
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
-    def test_abstractstream_stream_users_direct(self, _):
+    def test_abstractstream_stream_users_direct(self, *_):
         """ get a list of users that should see a status """
         status = models.Status.objects.create(
             user=self.remote_user,
@@ -81,8 +81,7 @@ class Activitystreams(TestCase):
         self.assertFalse(self.another_user in users)
         self.assertFalse(self.remote_user in users)
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
-    def test_abstractstream_stream_users_followers_remote_user(self, _):
+    def test_abstractstream_stream_users_followers_remote_user(self, *_):
         """ get a list of users that should see a status """
         status = models.Status.objects.create(
             user=self.remote_user,
@@ -92,8 +91,7 @@ class Activitystreams(TestCase):
         users = self.test_stream.stream_users(status)
         self.assertFalse(users.exists())
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
-    def test_abstractstream_stream_users_followers_self(self, _):
+    def test_abstractstream_stream_users_followers_self(self, *_):
         """ get a list of users that should see a status """
         status = models.Comment.objects.create(
             user=self.local_user,
@@ -106,8 +104,7 @@ class Activitystreams(TestCase):
         self.assertFalse(self.another_user in users)
         self.assertFalse(self.remote_user in users)
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
-    def test_abstractstream_stream_users_followers_with_mention(self, _):
+    def test_abstractstream_stream_users_followers_with_mention(self, *_):
         """ get a list of users that should see a status """
         status = models.Comment.objects.create(
             user=self.remote_user,
@@ -122,8 +119,7 @@ class Activitystreams(TestCase):
         self.assertFalse(self.another_user in users)
         self.assertFalse(self.remote_user in users)
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
-    def test_abstractstream_stream_users_followers_with_relationship(self, _):
+    def test_abstractstream_stream_users_followers_with_relationship(self, *_):
         """ get a list of users that should see a status """
         self.remote_user.followers.add(self.local_user)
         status = models.Comment.objects.create(
@@ -137,8 +133,7 @@ class Activitystreams(TestCase):
         self.assertFalse(self.another_user in users)
         self.assertFalse(self.remote_user in users)
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
-    def test_homestream_stream_users(self, _):
+    def test_homestream_stream_users(self, *_):
         """ get a list of users that should see a status """
         status = models.Status.objects.create(
             user=self.remote_user, content="hi", privacy="public"
@@ -146,8 +141,7 @@ class Activitystreams(TestCase):
         users = activitystreams.HomeStream().stream_users(status)
         self.assertFalse(users.exists())
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
-    def test_homestream_stream_users_with_mentions(self, _):
+    def test_homestream_stream_users_with_mentions(self, *_):
         """ get a list of users that should see a status """
         status = models.Status.objects.create(
             user=self.remote_user, content="hi", privacy="public"
@@ -157,8 +151,7 @@ class Activitystreams(TestCase):
         self.assertFalse(self.local_user in users)
         self.assertFalse(self.another_user in users)
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
-    def test_homestream_stream_users_with_relationship(self, _):
+    def test_homestream_stream_users_with_relationship(self, *_):
         """ get a list of users that should see a status """
         self.remote_user.followers.add(self.local_user)
         status = models.Status.objects.create(
@@ -168,8 +161,7 @@ class Activitystreams(TestCase):
         self.assertTrue(self.local_user in users)
         self.assertFalse(self.another_user in users)
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
-    def test_localstream_stream_users_remote_status(self, _):
+    def test_localstream_stream_users_remote_status(self, *_):
         """ get a list of users that should see a status """
         status = models.Status.objects.create(
             user=self.remote_user, content="hi", privacy="public"
@@ -177,8 +169,7 @@ class Activitystreams(TestCase):
         users = activitystreams.LocalStream().stream_users(status)
         self.assertIsNone(users)
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
-    def test_localstream_stream_users_local_status(self, _):
+    def test_localstream_stream_users_local_status(self, *_):
         """ get a list of users that should see a status """
         status = models.Status.objects.create(
             user=self.local_user, content="hi", privacy="public"
@@ -187,8 +178,7 @@ class Activitystreams(TestCase):
         self.assertTrue(self.local_user in users)
         self.assertTrue(self.another_user in users)
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
-    def test_localstream_stream_users_unlisted(self, _):
+    def test_localstream_stream_users_unlisted(self, *_):
         """ get a list of users that should see a status """
         status = models.Status.objects.create(
             user=self.local_user, content="hi", privacy="unlisted"
@@ -196,8 +186,7 @@ class Activitystreams(TestCase):
         users = activitystreams.LocalStream().stream_users(status)
         self.assertIsNone(users)
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
-    def test_federatedstream_stream_users(self, _):
+    def test_federatedstream_stream_users(self, *_):
         """ get a list of users that should see a status """
         status = models.Status.objects.create(
             user=self.remote_user, content="hi", privacy="public"
@@ -206,8 +195,7 @@ class Activitystreams(TestCase):
         self.assertTrue(self.local_user in users)
         self.assertTrue(self.another_user in users)
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
-    def test_federatedstream_stream_users_unlisted(self, _):
+    def test_federatedstream_stream_users_unlisted(self, *_):
         """ get a list of users that should see a status """
         status = models.Status.objects.create(
             user=self.remote_user, content="hi", privacy="unlisted"

From 8d5630e059391e5ff976694a2cc374be8faaf82c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 23 Mar 2021 17:52:58 -0700
Subject: [PATCH 0432/1285] Adds css transitions to notification and unread
 statuses

---
 bookwyrm/static/css/format.css    | 23 +++++++++++++++++++++++
 bookwyrm/templates/feed/feed.html |  2 +-
 bookwyrm/templates/layout.html    |  2 +-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/static/css/format.css b/bookwyrm/static/css/format.css
index c68eb40d..6a1167b2 100644
--- a/bookwyrm/static/css/format.css
+++ b/bookwyrm/static/css/format.css
@@ -34,6 +34,29 @@ html {
 .hidden {
     display: none !important;
 }
+.hidden.transition-y, .hidden.transition-x {
+    display: block !important;
+    visibility: hidden !important;
+    height: 0;
+    width: 0;
+    margin: 0;
+    padding: 0;
+}
+.transition-y {
+    transition-property: height, margin-top, margin-bottom, padding-top, padding-bottom;
+    transition-duration: 0.5s;
+    transition-timing-function: ease;
+}
+.transition-x {
+    transition-property: width, margin-left, margin-right, padding-left, padding-right;
+    transition-duration: 0.5s;
+    transition-timing-function: ease;
+}
+@media (prefers-reduced-motion: reduce) {
+    .transition-x, .transition-y {
+        transition-duration: 0.001ms !important;
+    }
+}
 
 /* --- STARS --- */
 .rate-stars button.icon {
diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html
index 379bf927..bc35d3b9 100644
--- a/bookwyrm/templates/feed/feed.html
+++ b/bookwyrm/templates/feed/feed.html
@@ -28,7 +28,7 @@
 
 {# announcements and system messages #}
 {% if not activities.number > 1 %}
-<a href="{{ request.path }}" class="hidden notification is-primary is-block" data-poll-wrapper>
+<a href="{{ request.path }}" class="transition-y hidden notification is-primary is-block" data-poll-wrapper>
     {% blocktrans %}load <span data-poll="stream/{{ tab }}">0</span> unread status(es){% endblocktrans %}
 </a>
 
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index d08b1820..4f657358 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -139,7 +139,7 @@
                             <span class="is-sr-only">{% trans "Notifications" %}</span>
                         </span>
                     </span>
-                    <span class="{% if not request.user|notification_count %}hidden {% endif %}tag is-danger is-medium" data-poll-wrapper>
+                    <span class="{% if not request.user|notification_count %}hidden {% endif %}tag is-danger is-medium transition-x" data-poll-wrapper>
                         <span data-poll="notifications">{{ request.user | notification_count }}</span>
                     </span>
                 </a>

From a67b0ae8a781f6e240671a7485c0998d89bbce3d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 24 Mar 2021 08:29:12 -0700
Subject: [PATCH 0434/1285] Adds stream length to .env

---
 .env.example         | 1 +
 bookwyrm/settings.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.env.example b/.env.example
index 7f80a72c..cf3705af 100644
--- a/.env.example
+++ b/.env.example
@@ -23,6 +23,7 @@ POSTGRES_DB=fedireads
 POSTGRES_HOST=db
 
 # Redis activity stream manager
+MAX_STREAM_LENGTH=200
 REDIS_ACTIVITY_HOST=redis_activity
 REDIS_ACTIVITY_PORT=6379
 
diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 36806435..b615fa29 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -96,7 +96,7 @@ WSGI_APPLICATION = "bookwyrm.wsgi.application"
 REDIS_ACTIVITY_HOST = env("REDIS_ACTIVITY_HOST", "localhost")
 REDIS_ACTIVITY_PORT = env("REDIS_ACTIVITY_PORT", 6379)
 
-MAX_STREAM_LENGTH = env("MAX_STREAM_LENGTH", 200)
+MAX_STREAM_LENGTH = int(env("MAX_STREAM_LENGTH", 200))
 STREAMS = ["home", "local", "federated"]
 
 # Database

From 1707bba8a8aa610006808c0ed7d144f6f14a52e8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 24 Mar 2021 08:37:25 -0700
Subject: [PATCH 0435/1285] Adds ordering to status model

---
 bookwyrm/migrations/0058_auto_20210324_1536.py | 17 +++++++++++++++++
 bookwyrm/models/status.py                      |  4 ++++
 2 files changed, 21 insertions(+)
 create mode 100644 bookwyrm/migrations/0058_auto_20210324_1536.py

diff --git a/bookwyrm/migrations/0058_auto_20210324_1536.py b/bookwyrm/migrations/0058_auto_20210324_1536.py
new file mode 100644
index 00000000..d69dbab0
--- /dev/null
+++ b/bookwyrm/migrations/0058_auto_20210324_1536.py
@@ -0,0 +1,17 @@
+# Generated by Django 3.1.6 on 2021-03-24 15:36
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0057_user_discoverable'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='status',
+            options={'ordering': ('-published_date',)},
+        ),
+    ]
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index 77ac4b58..e90c2dec 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -58,6 +58,10 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
     serialize_reverse_fields = [("attachments", "attachment", "id")]
     deserialize_reverse_fields = [("attachments", "attachment")]
 
+    class Meta:
+        """ default sorting """
+        ordering = ("-published_date",)
+
     def save(self, *args, **kwargs):
         """ save and notify """
         super().save(*args, **kwargs)

From 320dfd1a59f06148ea8cab988e4ccf80886e0526 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 24 Mar 2021 08:39:37 -0700
Subject: [PATCH 0436/1285] Python formatting

---
 bookwyrm/migrations/0058_auto_20210324_1536.py | 6 +++---
 bookwyrm/models/status.py                      | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/migrations/0058_auto_20210324_1536.py b/bookwyrm/migrations/0058_auto_20210324_1536.py
index d69dbab0..0fa8c90b 100644
--- a/bookwyrm/migrations/0058_auto_20210324_1536.py
+++ b/bookwyrm/migrations/0058_auto_20210324_1536.py
@@ -6,12 +6,12 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0057_user_discoverable'),
+        ("bookwyrm", "0057_user_discoverable"),
     ]
 
     operations = [
         migrations.AlterModelOptions(
-            name='status',
-            options={'ordering': ('-published_date',)},
+            name="status",
+            options={"ordering": ("-published_date",)},
         ),
     ]
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index e90c2dec..0ddcfd17 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -60,6 +60,7 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
 
     class Meta:
         """ default sorting """
+
         ordering = ("-published_date",)
 
     def save(self, *args, **kwargs):

From bde6ce8525c6d16205a5a4bd784fbf83572e9783 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 24 Mar 2021 09:31:45 -0700
Subject: [PATCH 0437/1285] Fixes review name in pure serialization

---
 bookwyrm/models/fields.py                         |  3 +++
 bookwyrm/models/status.py                         | 15 +++++++--------
 .../generated_status/review_pure_name.html        | 10 ++++++++++
 3 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 bookwyrm/templates/snippets/generated_status/review_pure_name.html

diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py
index 247c6aca..a5985e8d 100644
--- a/bookwyrm/models/fields.py
+++ b/bookwyrm/models/fields.py
@@ -448,3 +448,6 @@ class IntegerField(ActivitypubFieldMixin, models.IntegerField):
 
 class DecimalField(ActivitypubFieldMixin, models.DecimalField):
     """ activitypub-aware boolean field """
+
+    def field_to_activity(self, value):
+        return float(value)
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index 0ddcfd17..56f30020 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -304,13 +304,12 @@ class Review(Status):
     @property
     def pure_name(self):
         """ clarify review names for mastodon serialization """
-        if self.rating:
-            return 'Review of "{}" ({:d} stars): {}'.format(
-                self.book.title,
-                self.rating,
-                self.name,
-            )
-        return 'Review of "{}": {}'.format(self.book.title, self.name)
+        template = get_template("snippets/generated_status/review_pure_name.html")
+        return template.render({
+            "book": self.book,
+            "rating": int(self.rating),
+            "name": self.name
+        }).strip()
 
     @property
     def pure_content(self):
@@ -332,7 +331,7 @@ class ReviewRating(Review):
     @property
     def pure_content(self):
         template = get_template("snippets/generated_status/rating.html")
-        return template.render({"book": self.book, "rating": self.rating}).strip()
+        return template.render({"book": self.book, "rating": int(self.rating)}).strip()
 
     activity_serializer = activitypub.Rating
     pure_type = "Note"
diff --git a/bookwyrm/templates/snippets/generated_status/review_pure_name.html b/bookwyrm/templates/snippets/generated_status/review_pure_name.html
new file mode 100644
index 00000000..3c133678
--- /dev/null
+++ b/bookwyrm/templates/snippets/generated_status/review_pure_name.html
@@ -0,0 +1,10 @@
+{% load i18n %}
+{% if rating %}
+
+{% blocktrans with book_title=book.title rating=rating review_title=name count counter=rating %}Review of <em>{{ book_title }}</em> ({{ rating }} star): {{ review_title }}{% plural %}Review of <em>{{ book_title }}</em> ({{ rating }} stars): {{ review_title }}{% endblocktrans %}
+
+{% else %}
+
+{% blocktrans with book_title=book.title review_title=name %}Review of <em>{{ book_title }}</em>: {{ review_title }}{% endblocktrans %}
+
+{% endif %}

From 9dc19b8bffe77012bda489c7a408b5db96cf2669 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 24 Mar 2021 09:34:21 -0700
Subject: [PATCH 0438/1285] Python formatting

---
 bookwyrm/models/status.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index 56f30020..e655616f 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -305,11 +305,9 @@ class Review(Status):
     def pure_name(self):
         """ clarify review names for mastodon serialization """
         template = get_template("snippets/generated_status/review_pure_name.html")
-        return template.render({
-            "book": self.book,
-            "rating": int(self.rating),
-            "name": self.name
-        }).strip()
+        return template.render(
+            {"book": self.book, "rating": int(self.rating), "name": self.name}
+        ).strip()
 
     @property
     def pure_content(self):

From 1d53a06e35dd5b89e1deb0fcf5e458fe1b9d76c0 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 24 Mar 2021 09:51:49 -0700
Subject: [PATCH 0439/1285] Fixes decimaal formatting

---
 bookwyrm/models/fields.py                                     | 2 ++
 bookwyrm/models/status.py                                     | 4 ++--
 bookwyrm/templates/snippets/generated_status/rating.html      | 2 +-
 .../templates/snippets/generated_status/review_pure_name.html | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py
index a5985e8d..e034d59e 100644
--- a/bookwyrm/models/fields.py
+++ b/bookwyrm/models/fields.py
@@ -450,4 +450,6 @@ class DecimalField(ActivitypubFieldMixin, models.DecimalField):
     """ activitypub-aware boolean field """
 
     def field_to_activity(self, value):
+        if not value:
+            return None
         return float(value)
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index e655616f..adc9d39d 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -306,7 +306,7 @@ class Review(Status):
         """ clarify review names for mastodon serialization """
         template = get_template("snippets/generated_status/review_pure_name.html")
         return template.render(
-            {"book": self.book, "rating": int(self.rating), "name": self.name}
+            {"book": self.book, "rating": self.rating, "name": self.name}
         ).strip()
 
     @property
@@ -329,7 +329,7 @@ class ReviewRating(Review):
     @property
     def pure_content(self):
         template = get_template("snippets/generated_status/rating.html")
-        return template.render({"book": self.book, "rating": int(self.rating)}).strip()
+        return template.render({"book": self.book, "rating": self.rating}).strip()
 
     activity_serializer = activitypub.Rating
     pure_type = "Note"
diff --git a/bookwyrm/templates/snippets/generated_status/rating.html b/bookwyrm/templates/snippets/generated_status/rating.html
index 13afd94d..c23d0eb8 100644
--- a/bookwyrm/templates/snippets/generated_status/rating.html
+++ b/bookwyrm/templates/snippets/generated_status/rating.html
@@ -1,3 +1,3 @@
 {% load i18n %}{% load humanize %}
 
-{% blocktrans with title=book.title path=book.remote_id rating=rating count counter=rating %}Rated <em><a href="{{ path }}">{{ title }}</a></em>: {{ rating }} star{% plural %}Rated <em><a href="{{ path }}">{{ title }}</a></em>: {{ rating }} stars{% endblocktrans %}
+{% blocktrans with title=book.title path=book.remote_id rating=rating|floatformat:"0" count counter=rating %}Rated <em><a href="{{ path }}">{{ title }}</a></em>: {{ rating }} star{% plural %}Rated <em><a href="{{ path }}">{{ title }}</a></em>: {{ rating }} stars{% endblocktrans %}
diff --git a/bookwyrm/templates/snippets/generated_status/review_pure_name.html b/bookwyrm/templates/snippets/generated_status/review_pure_name.html
index 3c133678..f5864384 100644
--- a/bookwyrm/templates/snippets/generated_status/review_pure_name.html
+++ b/bookwyrm/templates/snippets/generated_status/review_pure_name.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 {% if rating %}
 
-{% blocktrans with book_title=book.title rating=rating review_title=name count counter=rating %}Review of <em>{{ book_title }}</em> ({{ rating }} star): {{ review_title }}{% plural %}Review of <em>{{ book_title }}</em> ({{ rating }} stars): {{ review_title }}{% endblocktrans %}
+{% blocktrans with book_title=book.title rating=rating|floatformat:"0" review_title=name count counter=rating %}Review of <em>{{ book_title }}</em> ({{ rating }} star): {{ review_title }}{% plural %}Review of <em>{{ book_title }}</em> ({{ rating }} stars): {{ review_title }}{% endblocktrans %}
 
 {% else %}
 

From 73e38f9050af0bf7c1f63a233add9ec4fe67f316 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 24 Mar 2021 10:07:39 -0700
Subject: [PATCH 0440/1285] Fixes formatting rating value in template

---
 .../generated_status/review_pure_name.html    |  2 +-
 bookwyrm/tests/models/test_status_model.py    | 25 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/snippets/generated_status/review_pure_name.html b/bookwyrm/templates/snippets/generated_status/review_pure_name.html
index f5864384..a8d3fa5b 100644
--- a/bookwyrm/templates/snippets/generated_status/review_pure_name.html
+++ b/bookwyrm/templates/snippets/generated_status/review_pure_name.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 {% if rating %}
 
-{% blocktrans with book_title=book.title rating=rating|floatformat:"0" review_title=name count counter=rating %}Review of <em>{{ book_title }}</em> ({{ rating }} star): {{ review_title }}{% plural %}Review of <em>{{ book_title }}</em> ({{ rating }} stars): {{ review_title }}{% endblocktrans %}
+{% blocktrans with book_title=book.title display_rating=rating|floatformat:"0" review_title=name count counter=rating %}Review of <em>{{ book_title }}</em> ({{ display_rating }} star): {{ review_title }}{% plural %}Review of <em>{{ book_title }}</em> ({{ display_rating }} stars): {{ review_title }}{% endblocktrans %}
 
 {% else %}
 
diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py
index 54fe7fee..05cd2f00 100644
--- a/bookwyrm/tests/models/test_status_model.py
+++ b/bookwyrm/tests/models/test_status_model.py
@@ -277,7 +277,30 @@ class Status(TestCase):
         self.assertEqual(activity["id"], status.remote_id)
         self.assertEqual(activity["type"], "Article")
         self.assertEqual(
-            activity["name"], 'Review of "%s" (3 stars): Review name' % self.book.title
+            activity["name"],
+            "Review of <em>%s</em> (3 stars): Review name" % self.book.title,
+        )
+        self.assertEqual(activity["content"], "test content")
+        self.assertEqual(activity["attachment"][0].type, "Document")
+        self.assertEqual(
+            activity["attachment"][0].url,
+            "https://%s%s" % (settings.DOMAIN, self.book.cover.url),
+        )
+        self.assertEqual(activity["attachment"][0].name, "Test Edition")
+
+    def test_review_to_pure_activity_no_rating(self, *_):
+        """ subclass of the base model version with a "pure" serializer """
+        status = models.Review.objects.create(
+            name="Review name",
+            content="test content",
+            user=self.local_user,
+            book=self.book,
+        )
+        activity = status.to_activity(pure=True)
+        self.assertEqual(activity["id"], status.remote_id)
+        self.assertEqual(activity["type"], "Article")
+        self.assertEqual(
+            activity["name"], "Review of <em>%s</em>: Review name" % self.book.title
         )
         self.assertEqual(activity["content"], "test content")
         self.assertEqual(activity["attachment"][0].type, "Document")

From 30cebc017fcd8653b81034a2ac562e194d9c9244 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 24 Mar 2021 10:17:45 -0700
Subject: [PATCH 0441/1285] Updates tests to catch decimal/float/int errors in
 status serialization

---
 .../snippets/generated_status/rating.html     |  2 +-
 bookwyrm/tests/models/test_status_model.py    | 26 +++++++++++++++++--
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/snippets/generated_status/rating.html b/bookwyrm/templates/snippets/generated_status/rating.html
index c23d0eb8..b70171cd 100644
--- a/bookwyrm/templates/snippets/generated_status/rating.html
+++ b/bookwyrm/templates/snippets/generated_status/rating.html
@@ -1,3 +1,3 @@
 {% load i18n %}{% load humanize %}
 
-{% blocktrans with title=book.title path=book.remote_id rating=rating|floatformat:"0" count counter=rating %}Rated <em><a href="{{ path }}">{{ title }}</a></em>: {{ rating }} star{% plural %}Rated <em><a href="{{ path }}">{{ title }}</a></em>: {{ rating }} stars{% endblocktrans %}
+{% blocktrans with title=book.title path=book.remote_id display_rating=rating|floatformat:"0" count counter=rating %}Rated <em><a href="{{ path }}">{{ title }}</a></em>: {{ display_rating }} star{% plural %}Rated <em><a href="{{ path }}">{{ title }}</a></em>: {{ display_rating }} stars{% endblocktrans %}
diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py
index 05cd2f00..97df315f 100644
--- a/bookwyrm/tests/models/test_status_model.py
+++ b/bookwyrm/tests/models/test_status_model.py
@@ -252,7 +252,7 @@ class Status(TestCase):
         status = models.Review.objects.create(
             name="Review name",
             content="test content",
-            rating=3,
+            rating=3.0,
             user=self.local_user,
             book=self.book,
         )
@@ -269,7 +269,7 @@ class Status(TestCase):
         status = models.Review.objects.create(
             name="Review name",
             content="test content",
-            rating=3,
+            rating=3.0,
             user=self.local_user,
             book=self.book,
         )
@@ -310,6 +310,28 @@ class Status(TestCase):
         )
         self.assertEqual(activity["attachment"][0].name, "Test Edition")
 
+    def test_reviewrating_to_pure_activity(self, *_):
+        """ subclass of the base model version with a "pure" serializer """
+        status = models.ReviewRating.objects.create(
+            rating=3.0,
+            user=self.local_user,
+            book=self.book,
+        )
+        activity = status.to_activity(pure=True)
+        self.assertEqual(activity["id"], status.remote_id)
+        self.assertEqual(activity["type"], "Note")
+        self.assertEqual(
+            activity["content"],
+            'Rated <em><a href="%s">%s</a></em>: 3 stars'
+            % (self.book.remote_id, self.book.title),
+        )
+        self.assertEqual(activity["attachment"][0].type, "Document")
+        self.assertEqual(
+            activity["attachment"][0].url,
+            "https://%s%s" % (settings.DOMAIN, self.book.cover.url),
+        )
+        self.assertEqual(activity["attachment"][0].name, "Test Edition")
+
     def test_favorite(self, *_):
         """ fav a status """
         real_broadcast = models.Favorite.broadcast

From c1e0471d1ad4578cc8f120c72fadef03405d639f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 24 Mar 2021 10:57:17 -0700
Subject: [PATCH 0442/1285] Don't use html in article names for mastodon

---
 .../templates/snippets/generated_status/review_pure_name.html | 4 ++--
 bookwyrm/tests/models/test_status_model.py                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/snippets/generated_status/review_pure_name.html b/bookwyrm/templates/snippets/generated_status/review_pure_name.html
index a8d3fa5b..90a6936e 100644
--- a/bookwyrm/templates/snippets/generated_status/review_pure_name.html
+++ b/bookwyrm/templates/snippets/generated_status/review_pure_name.html
@@ -1,10 +1,10 @@
 {% load i18n %}
 {% if rating %}
 
-{% blocktrans with book_title=book.title display_rating=rating|floatformat:"0" review_title=name count counter=rating %}Review of <em>{{ book_title }}</em> ({{ display_rating }} star): {{ review_title }}{% plural %}Review of <em>{{ book_title }}</em> ({{ display_rating }} stars): {{ review_title }}{% endblocktrans %}
+{% blocktrans with book_title=book.title display_rating=rating|floatformat:"0" review_title=name count counter=rating %}Review of "{{ book_title }}" ({{ display_rating }} star): {{ review_title }}{% plural %}Review of "{{ book_title }}" ({{ display_rating }} stars): {{ review_title }}{% endblocktrans %}
 
 {% else %}
 
-{% blocktrans with book_title=book.title review_title=name %}Review of <em>{{ book_title }}</em>: {{ review_title }}{% endblocktrans %}
+{% blocktrans with book_title=book.title review_title=name %}Review of "{{ book_title }}": {{ review_title }}{% endblocktrans %}
 
 {% endif %}
diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py
index 97df315f..10c09cd9 100644
--- a/bookwyrm/tests/models/test_status_model.py
+++ b/bookwyrm/tests/models/test_status_model.py
@@ -278,7 +278,7 @@ class Status(TestCase):
         self.assertEqual(activity["type"], "Article")
         self.assertEqual(
             activity["name"],
-            "Review of <em>%s</em> (3 stars): Review name" % self.book.title,
+            "Review of \"%s\" (3 stars): Review name" % self.book.title,
         )
         self.assertEqual(activity["content"], "test content")
         self.assertEqual(activity["attachment"][0].type, "Document")
@@ -300,7 +300,7 @@ class Status(TestCase):
         self.assertEqual(activity["id"], status.remote_id)
         self.assertEqual(activity["type"], "Article")
         self.assertEqual(
-            activity["name"], "Review of <em>%s</em>: Review name" % self.book.title
+            activity["name"], "Review of \"%s\": Review name" % self.book.title
         )
         self.assertEqual(activity["content"], "test content")
         self.assertEqual(activity["attachment"][0].type, "Document")

From 61a773cbe227771bda6619abd00d1570a55c991f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 24 Mar 2021 11:01:23 -0700
Subject: [PATCH 0443/1285] Python formatting

---
 bookwyrm/tests/models/test_status_model.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py
index 10c09cd9..c3cdf17e 100644
--- a/bookwyrm/tests/models/test_status_model.py
+++ b/bookwyrm/tests/models/test_status_model.py
@@ -278,7 +278,7 @@ class Status(TestCase):
         self.assertEqual(activity["type"], "Article")
         self.assertEqual(
             activity["name"],
-            "Review of \"%s\" (3 stars): Review name" % self.book.title,
+            'Review of "%s" (3 stars): Review name' % self.book.title,
         )
         self.assertEqual(activity["content"], "test content")
         self.assertEqual(activity["attachment"][0].type, "Document")
@@ -300,7 +300,7 @@ class Status(TestCase):
         self.assertEqual(activity["id"], status.remote_id)
         self.assertEqual(activity["type"], "Article")
         self.assertEqual(
-            activity["name"], "Review of \"%s\": Review name" % self.book.title
+            activity["name"], 'Review of "%s": Review name' % self.book.title
         )
         self.assertEqual(activity["content"], "test content")
         self.assertEqual(activity["attachment"][0].type, "Document")

From 81bd3f5be8994751214232c1a6281974ba1972f3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 24 Mar 2021 12:05:00 -0700
Subject: [PATCH 0444/1285] Tests not showing notifications for self boosts

---
 bookwyrm/models/status.py                |  2 +-
 bookwyrm/tests/views/test_interaction.py | 23 +++++++++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index adc9d39d..c5ba7993 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -349,7 +349,7 @@ class Boost(ActivityMixin, Status):
     def save(self, *args, **kwargs):
         """ save and notify """
         super().save(*args, **kwargs)
-        if not self.boosted_status.user.local:
+        if not self.boosted_status.user.local or self.boosted_status.user == self.user:
             return
 
         notification_model = apps.get_model("bookwyrm.Notification", require_ready=True)
diff --git a/bookwyrm/tests/views/test_interaction.py b/bookwyrm/tests/views/test_interaction.py
index 40152c0f..297eeb73 100644
--- a/bookwyrm/tests/views/test_interaction.py
+++ b/bookwyrm/tests/views/test_interaction.py
@@ -95,6 +95,23 @@ class InteractionViews(TestCase):
         self.assertEqual(notification.related_user, self.remote_user)
         self.assertEqual(notification.related_status, status)
 
+    def test_handle_self_boost(self, _):
+        """ boost your own status """
+        view = views.Boost.as_view()
+        request = self.factory.post("")
+        request.user = self.local_user
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+            status = models.Status.objects.create(user=self.local_user, content="hi")
+
+            view(request, status.id)
+
+        boost = models.Boost.objects.get()
+        self.assertEqual(boost.boosted_status, status)
+        self.assertEqual(boost.user, self.local_user)
+        self.assertEqual(boost.privacy, "public")
+
+        self.assertFalse(models.Notification.objects.exists())
+
     def test_handle_boost_unlisted(self, _):
         """ boost a status """
         view = views.Boost.as_view()
@@ -135,23 +152,21 @@ class InteractionViews(TestCase):
             view(request, status.id)
         self.assertEqual(models.Boost.objects.count(), 1)
 
-    def test_handle_unboost(self, broadcast_mock):
+    def test_handle_unboost(self, _):
         """ undo a boost """
         view = views.Unboost.as_view()
         request = self.factory.post("")
-        request.user = self.local_user
+        request.user = self.remote_user
         with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
             status = models.Status.objects.create(user=self.local_user, content="hi")
             views.Boost.as_view()(request, status.id)
 
         self.assertEqual(models.Boost.objects.count(), 1)
         self.assertEqual(models.Notification.objects.count(), 1)
-        broadcast_mock.call_count = 0
         with patch(
             "bookwyrm.activitystreams.ActivityStream.remove_status"
         ) as redis_mock:
             view(request, status.id)
-            self.assertEqual(broadcast_mock.call_count, 1)
             self.assertTrue(redis_mock.called)
         self.assertEqual(models.Boost.objects.count(), 0)
         self.assertEqual(models.Notification.objects.count(), 0)

From 28dc67bf5c0d5bfb24dba3ed6a6fc958afc7a036 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 24 Mar 2021 12:37:42 -0700
Subject: [PATCH 0445/1285] Fixes ignore test for valid remote statuses

---
 bookwyrm/activitypub/base_activity.py | 7 ++++++-
 bookwyrm/models/status.py             | 6 ++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index 791502d0..c1f81bb0 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -248,7 +248,9 @@ def get_model_from_type(activity_type):
     return model[0]
 
 
-def resolve_remote_id(remote_id, model=None, refresh=False, save=True):
+def resolve_remote_id(
+    remote_id, model=None, refresh=False, save=True, get_activity=False
+):
     """ take a remote_id and return an instance, creating if necessary """
     if model:  # a bonus check we can do if we already know the model
         result = model.find_existing_by_remote_id(remote_id)
@@ -272,5 +274,8 @@ def resolve_remote_id(remote_id, model=None, refresh=False, save=True):
         return result
 
     item = model.activity_serializer(**data)
+    if get_activity:
+        return item
+
     # if we're refreshing, "result" will be set and we'll update it
     return item.to_model(model=model, instance=result, save=save)
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index c5ba7993..c471a4d9 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -123,12 +123,14 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
         """ keep notes if they are replies to existing statuses """
         if activity.type == "Announce":
             try:
-                boosted = activitypub.resolve_remote_id(activity.object, save=False)
+                boosted = activitypub.resolve_remote_id(
+                    activity.object, get_activity=True
+                )
             except activitypub.ActivitySerializerError:
                 # if we can't load the status, definitely ignore it
                 return True
             # keep the boost if we would keep the status
-            return cls.ignore_activity(boosted.to_activity_dataclass())
+            return cls.ignore_activity(boosted)
 
         # keep if it if it's a custom type
         if activity.type != "Note":

From d8c83fa31c84553723cc0e43bbac5a77472cf19a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 24 Mar 2021 12:58:39 -0700
Subject: [PATCH 0446/1285] Return activities for existing objs in
 resolve_remote_id

---
 .github/workflows/django-tests.yml    | 2 +-
 bookwyrm/activitypub/base_activity.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/django-tests.yml b/.github/workflows/django-tests.yml
index e734d18e..3ce368ec 100644
--- a/.github/workflows/django-tests.yml
+++ b/.github/workflows/django-tests.yml
@@ -65,4 +65,4 @@ jobs:
         EMAIL_HOST_PASSWORD: ""
         EMAIL_USE_TLS: true
       run: |
-        python manage.py test -v 3
+        python manage.py test
diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index c1f81bb0..768eb208 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -255,7 +255,7 @@ def resolve_remote_id(
     if model:  # a bonus check we can do if we already know the model
         result = model.find_existing_by_remote_id(remote_id)
         if result and not refresh:
-            return result
+            return result if not get_activity else result.to_activity_dataclass()
 
     # load the data and create the object
     try:
@@ -271,7 +271,7 @@ def resolve_remote_id(
     # check for existing items with shared unique identifiers
     result = model.find_existing(data)
     if result and not refresh:
-        return result
+        return result if not get_activity else result.to_activity_dataclass()
 
     item = model.activity_serializer(**data)
     if get_activity:

From 3fe3b0b2d590d809db16ceeea4c8a7bb75ac38e4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 24 Mar 2021 13:25:00 -0700
Subject: [PATCH 0447/1285] Adds published date field to boost activity

---
 bookwyrm/activitypub/verbs.py | 1 +
 bookwyrm/models/status.py     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index d684171e..900c9a21 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -191,6 +191,7 @@ class Like(Verb):
 class Announce(Verb):
     """ boosting a status """
 
+    published: str
     object: str
     type: str = "Announce"
 
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index c471a4d9..aa330d61 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -377,7 +377,7 @@ class Boost(ActivityMixin, Status):
         """ the user field is "actor" here instead of "attributedTo" """
         super().__init__(*args, **kwargs)
 
-        reserve_fields = ["user", "boosted_status"]
+        reserve_fields = ["user", "boosted_status", "published_date"]
         self.simple_fields = [f for f in self.simple_fields if f.name in reserve_fields]
         self.activity_fields = self.simple_fields
         self.many_to_many_fields = []

From 9acb8e53d8259f0f34d439a30e356934870d9c1b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 24 Mar 2021 13:35:49 -0700
Subject: [PATCH 0448/1285] Adds privacy fields to boost activities

---
 bookwyrm/activitypub/verbs.py | 4 +++-
 bookwyrm/models/status.py     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index 900c9a21..3686b3f3 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -1,5 +1,5 @@
 """ undo wrapper activity """
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from typing import List
 from django.apps import apps
 
@@ -192,6 +192,8 @@ class Announce(Verb):
     """ boosting a status """
 
     published: str
+    to: List[str] = field(default_factory=lambda: [])
+    cc: List[str] = field(default_factory=lambda: [])
     object: str
     type: str = "Announce"
 
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index aa330d61..8038e3ee 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -377,7 +377,7 @@ class Boost(ActivityMixin, Status):
         """ the user field is "actor" here instead of "attributedTo" """
         super().__init__(*args, **kwargs)
 
-        reserve_fields = ["user", "boosted_status", "published_date"]
+        reserve_fields = ["user", "boosted_status", "published_date", "privacy"]
         self.simple_fields = [f for f in self.simple_fields if f.name in reserve_fields]
         self.activity_fields = self.simple_fields
         self.many_to_many_fields = []

From ae6c2b6375097c9165aef45bc9195b0a0ea7f088 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 24 Mar 2021 14:19:12 -0700
Subject: [PATCH 0449/1285] Updates tests

---
 bookwyrm/tests/models/test_status_model.py | 3 +++
 bookwyrm/tests/views/test_inbox.py         | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py
index c3cdf17e..208bf3ab 100644
--- a/bookwyrm/tests/models/test_status_model.py
+++ b/bookwyrm/tests/models/test_status_model.py
@@ -441,6 +441,9 @@ class Status(TestCase):
             id="http://www.faraway.com/boost/12",
             actor=self.remote_user.remote_id,
             object="http://fish.com/nothing",
+            published="2021-03-24T18:59:41.841208+00:00",
+            cc="",
+            to="",
         )
 
         responses.add(responses.GET, "http://fish.com/nothing", status=404)
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index 7d08a1e4..37cf00dd 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -559,6 +559,9 @@ class Inbox(TestCase):
             "id": "%s/boost" % self.status.remote_id,
             "actor": self.remote_user.remote_id,
             "object": self.status.remote_id,
+            "to": ["https://www.w3.org/ns/activitystreams#public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "published": "Mon, 25 May 2020 19:31:20 GMT",
         }
         with patch("bookwyrm.models.status.Status.ignore_activity") as discarder:
             discarder.return_value = False
@@ -607,6 +610,9 @@ class Inbox(TestCase):
                 "id": boost.remote_id,
                 "actor": self.remote_user.remote_id,
                 "object": self.status.remote_id,
+                "to": ["https://www.w3.org/ns/activitystreams#public"],
+                "cc": ["https://example.com/user/mouse/followers"],
+                "published": "Mon, 25 May 2020 19:31:20 GMT",
             },
         }
         with patch(
@@ -614,6 +620,7 @@ class Inbox(TestCase):
         ) as redis_mock:
             views.inbox.activity_task(activity)
             self.assertTrue(redis_mock.called)
+        self.assertFalse(models.Boost.objects.exists())
 
     def test_handle_unboost_unknown_boost(self):
         """ undo a boost """

From 6548291571155494f5ed48548a0934d60b43c3be Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 25 Mar 2021 08:39:45 -0700
Subject: [PATCH 0450/1285] Adds join directory insert

---
 bookwyrm/templates/directory.html | 17 +++++++++++++++++
 bookwyrm/views/directory.py       |  7 +++++++
 2 files changed, 24 insertions(+)

diff --git a/bookwyrm/templates/directory.html b/bookwyrm/templates/directory.html
index 9323752f..9e1cfae9 100644
--- a/bookwyrm/templates/directory.html
+++ b/bookwyrm/templates/directory.html
@@ -11,6 +11,23 @@
         {% trans "Directory" %}
     </h1>
 </header>
+
+{% if not request.user.discoverable %}
+<div class="box has-text-centered content">
+    {% url 'settings-profile' as path %}
+    <p>
+        {% trans "Make your profile discoverable so other BookWyrm users can find you." %}
+    </p>
+    <form name="directory" method="POST" action="{% url 'directory' %}">
+        {% csrf_token %}
+        <button class="button is-primary" type="submit">Join Directory</button>
+        <p class="help">
+            {% blocktrans %}You can opt-out at any time in your <a href="{{ path }}">profile settings</a>{% endblocktrans %}
+        </p>
+    </form>
+</div>
+{% endif %}
+
 <div class="columns is-multiline">
     {% for user in users %}
     <div class="column is-one-third">
diff --git a/bookwyrm/views/directory.py b/bookwyrm/views/directory.py
index cc21baf2..addb85c2 100644
--- a/bookwyrm/views/directory.py
+++ b/bookwyrm/views/directory.py
@@ -1,6 +1,7 @@
 """ who all's here? """
 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
+from django.shortcuts import redirect
 from django.template.response import TemplateResponse
 from django.views import View
 from django.utils.decorators import method_decorator
@@ -30,3 +31,9 @@ class Directory(View):
             "users": paginated.page(page),
         }
         return TemplateResponse(request, "directory.html", data)
+
+    def post(self, request):
+        """ join the directory """
+        request.user.discoverable = True
+        request.user.save()
+        return redirect('directory')

From 7711d4338047364f2adb02151c35c1f9489455b5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 25 Mar 2021 08:43:53 -0700
Subject: [PATCH 0451/1285] Display tweaks to make directory card size more
 consistent

---
 bookwyrm/templates/directory.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/directory.html b/bookwyrm/templates/directory.html
index 9e1cfae9..d70ff987 100644
--- a/bookwyrm/templates/directory.html
+++ b/bookwyrm/templates/directory.html
@@ -40,17 +40,17 @@
                     <div class="media-content">
                         <a href="{{ user.local_path }}" class="is-block mb-2">
                             <span class="title is-4 is-block">{{ user.display_name }}</span>
-                            <span class="subtitle is-6 is-block">@{{ user|username }}</span>
+                            <span class="subtitle is-7 is-block">@{{ user|username }}</span>
                         </a>
                         {% include 'snippets/follow_button.html' with user=user %}
                     </div>
                 </div>
 
-                {% if user.summary %}
                 <div class="content">
+                {% if user.summary %}
                     {{ user.summary | to_markdown | safe | truncatechars_html:40 }}
+                {% else %}&nbsp;{% endif %}
                 </div>
-                {% endif %}
             </div>
             <footer class="card-footer content">
                 <div class="card-footer-item">

From cdcef6ccb34f7bc1bbd685a576191cd345c7bc60 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 25 Mar 2021 10:24:22 -0700
Subject: [PATCH 0452/1285] Simplifies wording for directory opt-in

---
 bookwyrm/templates/directory.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/directory.html b/bookwyrm/templates/directory.html
index d70ff987..fe523c52 100644
--- a/bookwyrm/templates/directory.html
+++ b/bookwyrm/templates/directory.html
@@ -16,7 +16,7 @@
 <div class="box has-text-centered content">
     {% url 'settings-profile' as path %}
     <p>
-        {% trans "Make your profile discoverable so other BookWyrm users can find you." %}
+        {% trans "Make your profile discoverable to other BookWyrm users." %}
     </p>
     <form name="directory" method="POST" action="{% url 'directory' %}">
         {% csrf_token %}

From e6e16f61d3bc9e04dae16837dc64adf79318ac6b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 25 Mar 2021 10:58:00 -0700
Subject: [PATCH 0453/1285] Adds filters ui

---
 bookwyrm/templates/directory.html | 44 +++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/bookwyrm/templates/directory.html b/bookwyrm/templates/directory.html
index fe523c52..fa0e6c63 100644
--- a/bookwyrm/templates/directory.html
+++ b/bookwyrm/templates/directory.html
@@ -28,6 +28,50 @@
 </div>
 {% endif %}
 
+<div class="notification content">
+    <h2 class="columns is-mobile mb-0">
+        <span class="column pb-0">Filters</span>
+
+        <span class="column is-narrow pb-0">
+            {% trans "Show filters" as text %}
+            {% include 'snippets/toggle/open_button.html' with text=text controls_text="filters" icon="arrow-down" class="is-small" %}
+            {% trans "Hide filters" as text %}
+            {% include 'snippets/toggle/close_button.html' with text=text controls_text="filters" icon="x" class="is-small" %}
+        </span>
+    </h2>
+
+    <div class="hidden mt-3" id="filters">
+        <div class="columns">
+            <div class="column">
+                <legend class="label">User type</legend>
+                <div class="box">
+                    <label class="label"><input type="radio" class="radio"> {% trans "BookWyrm instances" %}</label>
+                    <label class="label"><input type="radio" class="radio"> {% trans "All services" %}</label>
+                </div>
+            </div>
+            <div class="column">
+                <legend class="label">Community</legend>
+                <div class="box">
+                    <label class="label"><input type="radio" class="radio"> Local users</label>
+                    <label class="label"><input type="radio" class="radio"> Federated community</label>
+                </div>
+            </div>
+            <div class="column">
+                <legend class="label">Order by</legend>
+                <div class="box">
+                    <div class="select">
+                        <select>
+                            <option checked>Suggested</option>
+                            <option>Recently active</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <button class="button is-primary">{% trans "Apply filters" %}</button>
+    </div>
+</div>
+
 <div class="columns is-multiline">
     {% for user in users %}
     <div class="column is-one-third">

From c4901b9c4e65223241c519441f1811146c7ce508 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 25 Mar 2021 12:04:26 -0700
Subject: [PATCH 0454/1285] Python formatting

---
 bookwyrm/views/directory.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/views/directory.py b/bookwyrm/views/directory.py
index addb85c2..02c81381 100644
--- a/bookwyrm/views/directory.py
+++ b/bookwyrm/views/directory.py
@@ -36,4 +36,4 @@ class Directory(View):
         """ join the directory """
         request.user.discoverable = True
         request.user.save()
-        return redirect('directory')
+        return redirect("directory")

From 53af667698101fc3a3b3babcd5dde90a327f3f04 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 25 Mar 2021 13:36:35 -0700
Subject: [PATCH 0455/1285] Adds filtering

---
 bookwyrm/templates/directory.html | 54 +++++++++++++++++++------------
 bookwyrm/views/directory.py       | 29 ++++++++++++++---
 2 files changed, 59 insertions(+), 24 deletions(-)

diff --git a/bookwyrm/templates/directory.html b/bookwyrm/templates/directory.html
index fa0e6c63..cca2cfe0 100644
--- a/bookwyrm/templates/directory.html
+++ b/bookwyrm/templates/directory.html
@@ -40,36 +40,48 @@
         </span>
     </h2>
 
-    <div class="hidden mt-3" id="filters">
+    <form class="hidden mt-3" id="filters" method-"get" action="{% url 'directory' %}">
         <div class="columns">
-            <div class="column">
-                <legend class="label">User type</legend>
-                <div class="box">
-                    <label class="label"><input type="radio" class="radio"> {% trans "BookWyrm instances" %}</label>
-                    <label class="label"><input type="radio" class="radio"> {% trans "All services" %}</label>
+            <div class="column is-flex">
+                <div class="box is-flex-grow-1">
+                    <legend class="label">{% trans "User type" %}</legend>
+                    <label class="is-block">
+                        <input type="radio" class="radio" name="software" value="bookwyrm" {% if not request.GET.sort or  request.GET.software == 'bookwyrm' %}checked{% endif %}>
+                        {% trans "BookWyrm users" %}
+                    </label>
+                    <label class="is-block">
+                        <input type="radio" class="radio" name="software" value="all" {% if request.GET.software == 'all' %}checked{% endif %}>
+                        {% trans "All known users" %}
+                    </label>
                 </div>
             </div>
-            <div class="column">
-                <legend class="label">Community</legend>
-                <div class="box">
-                    <label class="label"><input type="radio" class="radio"> Local users</label>
-                    <label class="label"><input type="radio" class="radio"> Federated community</label>
+            <div class="column is-flex">
+                <div class="box is-flex-grow-1">
+                    <legend class="label">{% trans "Community" %}</legend>
+                    <label class="is-block">
+                        <input type="radio" class="radio" name="scope" value="local" {% if request.GET.scope == "local" %}checked{% endif %}>
+                        {% trans "Local users" %}
+                    </label>
+                    <label class="is-block">
+                        <input type="radio" class="radio" name="scope" value="federated" {% if not request.GET.sort or request.GET.scope == "federated" %}checked{% endif %}>
+                        {% trans "Federated community" %}
+                    </label>
                 </div>
             </div>
-            <div class="column">
-                <legend class="label">Order by</legend>
-                <div class="box">
+            <div class="column is-flex">
+                <div class="box is-flex-grow-1">
+                    <legend class="label">{% trans "Order by" %}</legend>
                     <div class="select">
-                        <select>
-                            <option checked>Suggested</option>
-                            <option>Recently active</option>
+                        <select name="sort">
+                            <option value="suggested" {% if not request.GET.sort or request.GET.sort == "suggested" %}checked{% endif %}>{% trans "Suggested" %}</option>
+                            <option value="recent" {% if request.GET.sort == "suggested" %}checked{% endif %}>{% trans "Recently active" %}</option>
                         </select>
                     </div>
                 </div>
             </div>
         </div>
         <button class="button is-primary">{% trans "Apply filters" %}</button>
-    </div>
+    </form>
 </div>
 
 <div class="columns is-multiline">
@@ -97,12 +109,14 @@
                 </div>
             </div>
             <footer class="card-footer content">
+                {% if user != request.user %}
                 <div class="card-footer-item">
                     <div class="has-text-centered">
-                        <p class="title is-6 mb-0">{{ user.shelfbook_set.count }}</p>
-                        <p class="help">{% trans "books shelved" %}</p>
+                        <p class="title is-6 mb-0">{{ user.mutuals }}</p>
+                        <p class="help">{% trans "followers you follow" %}</p>
                     </div>
                 </div>
+                {% endif %}
                 <div class="card-footer-item">
                     <div class="has-text-centered">
                         <p class="title is-6 mb-0">{{ user.status_set.count|intword }}</p>
diff --git a/bookwyrm/views/directory.py b/bookwyrm/views/directory.py
index 02c81381..94137d94 100644
--- a/bookwyrm/views/directory.py
+++ b/bookwyrm/views/directory.py
@@ -1,6 +1,7 @@
 """ who all's here? """
 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
+from django.db.models import Count, Q
 from django.shortcuts import redirect
 from django.template.response import TemplateResponse
 from django.views import View
@@ -20,11 +21,31 @@ class Directory(View):
         except ValueError:
             page = 1
 
+        # filters
+        filters = {}
+        software = request.GET.get("software")
+        if software == "bookwyrm":
+            filters["bookwyrm_user"] = True
+        scope = request.GET.get("scope")
+        if scope == "local":
+            filters["local"] = True
+
         users = models.User.objects.filter(
-            discoverable=True,
-            bookwyrm_user=True,
-            is_active=True,
-        ).order_by("-last_active_date")
+            discoverable=True, is_active=True, **filters
+        ).annotate(
+            mutuals=Count(
+                "following",
+                filter=Q(
+                    ~Q(id=request.user.id), following__in=request.user.following.all()
+                ),
+            )
+        )
+        sort = request.GET.get("sort")
+        if sort == "recent":
+            users = users.order_by("-last_active_date")
+        else:
+            users = users.order_by("-mutuals", "-last_active_date")
+
         paginated = Paginator(users, 12)
 
         data = {

From f9e5bdebc65e81815e63638d95c67f35f540e1ae Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 25 Mar 2021 13:39:19 -0700
Subject: [PATCH 0456/1285] Adds clear filters link

---
 bookwyrm/templates/directory.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bookwyrm/templates/directory.html b/bookwyrm/templates/directory.html
index cca2cfe0..e8a421d3 100644
--- a/bookwyrm/templates/directory.html
+++ b/bookwyrm/templates/directory.html
@@ -82,6 +82,9 @@
         </div>
         <button class="button is-primary">{% trans "Apply filters" %}</button>
     </form>
+    {% if request.GET %}
+    <a class="help" href="{% url 'directory' %}">{% trans "Clear filters" %}</a>
+    {% endif %}
 </div>
 
 <div class="columns is-multiline">

From 2e0386aed819bba24e931a6bfe84cb931b63a385 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 25 Mar 2021 13:44:11 -0700
Subject: [PATCH 0457/1285] Fixes missing label for select

---
 bookwyrm/templates/directory.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/directory.html b/bookwyrm/templates/directory.html
index e8a421d3..697cfa3c 100644
--- a/bookwyrm/templates/directory.html
+++ b/bookwyrm/templates/directory.html
@@ -70,9 +70,9 @@
             </div>
             <div class="column is-flex">
                 <div class="box is-flex-grow-1">
-                    <legend class="label">{% trans "Order by" %}</legend>
+                    <label class="label" for="id_sort">{% trans "Order by" %}</label>
                     <div class="select">
-                        <select name="sort">
+                        <select name="sort" id="id_sort">
                             <option value="suggested" {% if not request.GET.sort or request.GET.sort == "suggested" %}checked{% endif %}>{% trans "Suggested" %}</option>
                             <option value="recent" {% if request.GET.sort == "suggested" %}checked{% endif %}>{% trans "Recently active" %}</option>
                         </select>

From b94def80b0de56a360155ac1f3a4011e5903cfa0 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 25 Mar 2021 16:32:15 -0700
Subject: [PATCH 0458/1285] Adds localstorage hide option for directory prompt

---
 bookwyrm/templates/directory.html | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/directory.html b/bookwyrm/templates/directory.html
index 697cfa3c..6b24a2f8 100644
--- a/bookwyrm/templates/directory.html
+++ b/bookwyrm/templates/directory.html
@@ -13,8 +13,8 @@
 </header>
 
 {% if not request.user.discoverable %}
-<div class="box has-text-centered content">
-    {% url 'settings-profile' as path %}
+<div class="box has-text-centered content" data-hide="hide-join-directory"><div class="columns">
+    <div class="column">
     <p>
         {% trans "Make your profile discoverable to other BookWyrm users." %}
     </p>
@@ -22,10 +22,18 @@
         {% csrf_token %}
         <button class="button is-primary" type="submit">Join Directory</button>
         <p class="help">
-            {% blocktrans %}You can opt-out at any time in your <a href="{{ path }}">profile settings</a>{% endblocktrans %}
+            {% url 'settings-profile' as path %}
+            {% blocktrans %}You can opt-out at any time in your <a href="{{ path }}">profile settings.</a>{% endblocktrans %}
         </p>
     </form>
-</div>
+    </div>
+    <div class="column is-narrow">
+        {% trans "Dismiss message" as button_text %}
+        <button type="button" class="delete set-display" data-id="hide-join-directory" data-value="true">
+            <span>Dismiss message</span>
+        </button>
+    </div>
+</div></div>
 {% endif %}
 
 <div class="notification content">
@@ -143,3 +151,7 @@
 </div>
 
 {% endblock %}
+
+{% block scripts %}
+<script src="/static/js/localstorage.js"></script>
+{% endblock %}

From 6552dcefe83d44630149fdc9e6d813d04c3780f5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 25 Mar 2021 16:42:50 -0700
Subject: [PATCH 0459/1285] Adds focus to filters toggle

---
 bookwyrm/templates/directory.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/directory.html b/bookwyrm/templates/directory.html
index 6b24a2f8..6f8bc3e4 100644
--- a/bookwyrm/templates/directory.html
+++ b/bookwyrm/templates/directory.html
@@ -42,13 +42,13 @@
 
         <span class="column is-narrow pb-0">
             {% trans "Show filters" as text %}
-            {% include 'snippets/toggle/open_button.html' with text=text controls_text="filters" icon="arrow-down" class="is-small" %}
+            {% include 'snippets/toggle/open_button.html' with text=text controls_text="filters" icon="arrow-down" class="is-small" focus="filters" %}
             {% trans "Hide filters" as text %}
             {% include 'snippets/toggle/close_button.html' with text=text controls_text="filters" icon="x" class="is-small" %}
         </span>
     </h2>
 
-    <form class="hidden mt-3" id="filters" method-"get" action="{% url 'directory' %}">
+    <form class="hidden mt-3" id="filters" method-"get" action="{% url 'directory' %}" tabindex="0">
         <div class="columns">
             <div class="column is-flex">
                 <div class="box is-flex-grow-1">

From 2c9efd1ba6b62cd78ed77ebb9cd2cf799f329186 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 25 Mar 2021 17:00:16 -0700
Subject: [PATCH 0460/1285] BookWyrm users is the default directory filter

---
 bookwyrm/views/directory.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/views/directory.py b/bookwyrm/views/directory.py
index 94137d94..1a454e80 100644
--- a/bookwyrm/views/directory.py
+++ b/bookwyrm/views/directory.py
@@ -24,7 +24,7 @@ class Directory(View):
         # filters
         filters = {}
         software = request.GET.get("software")
-        if software == "bookwyrm":
+        if not software or software == "bookwyrm":
             filters["bookwyrm_user"] = True
         scope = request.GET.get("scope")
         if scope == "local":

From daf69d2375ec17100234cfe24660cfa6a368f1ef Mon Sep 17 00:00:00 2001
From: Pablo Barton <pablo.barton@gmail.com>
Date: Thu, 25 Mar 2021 19:57:20 -0400
Subject: [PATCH 0461/1285] 716 books can be on multiple shelves, but only on
 one shelf for reading status

---
 .gitignore                                    |  4 ++
 bookwyrm/models/shelf.py                      |  6 ++
 .../templates/snippets/shelf_selector.html    |  1 +
 bookwyrm/tests/views/test_reading.py          |  6 +-
 bookwyrm/views/reading.py                     | 64 ++++++++++++-------
 bookwyrm/views/shelf.py                       | 62 +++++++++++++-----
 6 files changed, 102 insertions(+), 41 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4b5b7fef..00dd239d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *.pyc
 *.swp
 **/__pycache__
+.local
 
 # VSCode
 /.vscode
@@ -17,3 +18,6 @@
 
 # Testing
 .coverage
+
+#PyCharm
+.idea
diff --git a/bookwyrm/models/shelf.py b/bookwyrm/models/shelf.py
index 3185b47f..739c0599 100644
--- a/bookwyrm/models/shelf.py
+++ b/bookwyrm/models/shelf.py
@@ -11,6 +11,12 @@ from . import fields
 class Shelf(OrderedCollectionMixin, BookWyrmModel):
     """ a list of books owned by a user """
 
+    TO_READ = "to-read"
+    READING = "reading"
+    READ_FINISHED = "read"
+
+    READ_STATUS_IDENTIFIERS = (TO_READ, READING, READ_FINISHED)
+
     name = fields.CharField(max_length=100)
     identifier = models.CharField(max_length=100)
     user = fields.ForeignKey(
diff --git a/bookwyrm/templates/snippets/shelf_selector.html b/bookwyrm/templates/snippets/shelf_selector.html
index 4f736c0e..47ea73a0 100644
--- a/bookwyrm/templates/snippets/shelf_selector.html
+++ b/bookwyrm/templates/snippets/shelf_selector.html
@@ -12,6 +12,7 @@
     <form class="dropdown-item pt-0 pb-0" name="shelve" action="/shelve/" method="post">
         {% csrf_token %}
         <input type="hidden" name="book" value="{{ book.id }}">
+        <input type="hidden" name="change-shelf-from" value={{ current.identifier }}>
         <input type="hidden" name="shelf" value="{{ shelf.identifier }}">
         <button class="button is-fullwidth is-small" type="submit">{{ shelf.name }}</button>
     </form>
diff --git a/bookwyrm/tests/views/test_reading.py b/bookwyrm/tests/views/test_reading.py
index 4661e487..b1ae6b88 100644
--- a/bookwyrm/tests/views/test_reading.py
+++ b/bookwyrm/tests/views/test_reading.py
@@ -42,7 +42,7 @@ class ReadingViews(TestCase):
 
     def test_start_reading(self, _):
         """ begin a book """
-        shelf = self.local_user.shelf_set.get(identifier="reading")
+        shelf = self.local_user.shelf_set.get(identifier=models.Shelf.READING)
         self.assertFalse(shelf.books.exists())
         self.assertFalse(models.Status.objects.exists())
 
@@ -73,7 +73,7 @@ class ReadingViews(TestCase):
 
     def test_start_reading_reshelf(self, _):
         """ begin a book """
-        to_read_shelf = self.local_user.shelf_set.get(identifier="to-read")
+        to_read_shelf = self.local_user.shelf_set.get(identifier=models.Shelf.TO_READ)
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             models.ShelfBook.objects.create(
                 shelf=to_read_shelf, book=self.book, user=self.local_user
@@ -93,7 +93,7 @@ class ReadingViews(TestCase):
 
     def test_finish_reading(self, _):
         """ begin a book """
-        shelf = self.local_user.shelf_set.get(identifier="read")
+        shelf = self.local_user.shelf_set.get(identifier=models.Shelf.READ_FINISHED)
         self.assertFalse(shelf.books.exists())
         self.assertFalse(models.Status.objects.exists())
         readthrough = models.ReadThrough.objects.create(
diff --git a/bookwyrm/views/reading.py b/bookwyrm/views/reading.py
index fb63f2a3..1cf9b4dc 100644
--- a/bookwyrm/views/reading.py
+++ b/bookwyrm/views/reading.py
@@ -19,7 +19,9 @@ from .shelf import handle_unshelve
 def start_reading(request, book_id):
     """ begin reading a book """
     book = get_edition(book_id)
-    shelf = models.Shelf.objects.filter(identifier="reading", user=request.user).first()
+    reading_shelf = models.Shelf.objects.filter(
+        identifier=models.Shelf.READING, user=request.user
+    ).first()
 
     # create a readthrough
     readthrough = update_readthrough(request, book=book)
@@ -29,20 +31,27 @@ def start_reading(request, book_id):
         # create a progress update if we have a page
         readthrough.create_update()
 
-    # shelve the book
-    if request.POST.get("reshelve", True):
-        try:
-            current_shelf = models.Shelf.objects.get(user=request.user, edition=book)
-            handle_unshelve(request.user, book, current_shelf)
-        except models.Shelf.DoesNotExist:
-            # this just means it isn't currently on the user's shelves
-            pass
-    models.ShelfBook.objects.create(book=book, shelf=shelf, user=request.user)
+    current_status_shelfbook = (
+        models.ShelfBook.objects.select_related("shelf")
+        .filter(
+            shelf__identifier__in=models.Shelf.READ_STATUS_IDENTIFIERS,
+            user=request.user,
+            book=book,
+        )
+        .first()
+    )
+    if current_status_shelfbook is not None:
+        if current_status_shelfbook.shelf.identifier != models.Shelf.READING:
+            handle_unshelve(book, current_status_shelfbook.shelf)
+        else:  # It already was on the shelf
+            return redirect(request.headers.get("Referer", "/"))
+
+    models.ShelfBook.objects.create(book=book, shelf=reading_shelf, user=request.user)
 
     # post about it (if you want)
     if request.POST.get("post-status"):
         privacy = request.POST.get("privacy")
-        handle_reading_status(request.user, shelf, book, privacy)
+        handle_reading_status(request.user, reading_shelf, book, privacy)
 
     return redirect(request.headers.get("Referer", "/"))
 
@@ -52,27 +61,38 @@ def start_reading(request, book_id):
 def finish_reading(request, book_id):
     """ a user completed a book, yay """
     book = get_edition(book_id)
-    shelf = models.Shelf.objects.filter(identifier="read", user=request.user).first()
+    finished_read_shelf = models.Shelf.objects.filter(
+        identifier=models.Shelf.READ_FINISHED, user=request.user
+    ).first()
 
     # update or create a readthrough
     readthrough = update_readthrough(request, book=book)
     if readthrough:
         readthrough.save()
 
-    # shelve the book
-    if request.POST.get("reshelve", True):
-        try:
-            current_shelf = models.Shelf.objects.get(user=request.user, edition=book)
-            handle_unshelve(request.user, book, current_shelf)
-        except models.Shelf.DoesNotExist:
-            # this just means it isn't currently on the user's shelves
-            pass
-    models.ShelfBook.objects.create(book=book, shelf=shelf, user=request.user)
+    current_status_shelfbook = (
+        models.ShelfBook.objects.select_related("shelf")
+        .filter(
+            shelf__identifier__in=models.Shelf.READ_STATUS_IDENTIFIERS,
+            user=request.user,
+            book=book,
+        )
+        .first()
+    )
+    if current_status_shelfbook is not None:
+        if current_status_shelfbook.shelf.identifier != models.Shelf.READ_FINISHED:
+            handle_unshelve(book, current_status_shelfbook.shelf)
+        else:  # It already was on the shelf
+            return redirect(request.headers.get("Referer", "/"))
+
+    models.ShelfBook.objects.create(
+        book=book, shelf=finished_read_shelf, user=request.user
+    )
 
     # post about it (if you want)
     if request.POST.get("post-status"):
         privacy = request.POST.get("privacy")
-        handle_reading_status(request.user, shelf, book, privacy)
+        handle_reading_status(request.user, finished_read_shelf, book, privacy)
 
     return redirect(request.headers.get("Referer", "/"))
 
diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index 6256eac7..1a952c71 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -1,4 +1,5 @@
 """ shelf views"""
+from django.db import IntegrityError
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponseBadRequest, HttpResponseNotFound
 from django.shortcuts import get_object_or_404, redirect
@@ -118,7 +119,7 @@ def delete_shelf(request, shelf_id):
 @login_required
 @require_POST
 def shelve(request):
-    """ put a  on a user's shelf """
+    """ put a book on a user's shelf """
     book = get_edition(request.POST.get("book"))
 
     desired_shelf = models.Shelf.objects.filter(
@@ -127,21 +128,50 @@ def shelve(request):
     if not desired_shelf:
         return HttpResponseNotFound()
 
-    if request.POST.get("reshelve", True):
+    change_from_current_identifier = request.POST.get("change-shelf-from")
+    if change_from_current_identifier is not None:
+        current_shelf = models.Shelf.objects.get(
+            user=request.user, identifier=change_from_current_identifier
+        )
+        handle_unshelve(book, current_shelf)
+
+    # A book can be on multiple shelves, but only on one read status shelf at a time
+    if desired_shelf.identifier in models.Shelf.READ_STATUS_IDENTIFIERS:
+        current_read_status_shelfbook = (
+            models.ShelfBook.objects.select_related("shelf")
+            .filter(
+                shelf__identifier__in=models.Shelf.READ_STATUS_IDENTIFIERS,
+                user=request.user,
+                book=book,
+            )
+            .first()
+        )
+        if current_read_status_shelfbook is not None:
+            if (
+                current_read_status_shelfbook.shelf.identifier
+                != desired_shelf.identifier
+            ):
+                handle_unshelve(book, current_read_status_shelfbook.shelf)
+            else:  # It is already on the shelf
+                return redirect(request.headers.get("Referer", "/"))
+
+        models.ShelfBook.objects.create(
+            book=book, shelf=desired_shelf, user=request.user
+        )
+        if desired_shelf.identifier == models.Shelf.TO_READ and request.POST.get(
+            "post-status"
+        ):
+            privacy = request.POST.get("privacy") or desired_shelf.privacy
+            handle_reading_status(request.user, desired_shelf, book, privacy=privacy)
+    else:
         try:
-            current_shelf = models.Shelf.objects.get(user=request.user, edition=book)
-            handle_unshelve(request.user, book, current_shelf)
-        except models.Shelf.DoesNotExist:
-            # this just means it isn't currently on the user's shelves
+            models.ShelfBook.objects.create(
+                book=book, shelf=desired_shelf, user=request.user
+            )
+        # The book is already on this shelf. Might be good to alert, or reject the action?
+        except IntegrityError:
             pass
-    models.ShelfBook.objects.create(book=book, shelf=desired_shelf, user=request.user)
-
-    # post about "want to read" shelves
-    if desired_shelf.identifier == "to-read" and request.POST.get("post-status"):
-        privacy = request.POST.get("privacy") or desired_shelf.privacy
-        handle_reading_status(request.user, desired_shelf, book, privacy=privacy)
-
-    return redirect("/")
+    return redirect(request.headers.get("Referer", "/"))
 
 
 @login_required
@@ -151,12 +181,12 @@ def unshelve(request):
     book = models.Edition.objects.get(id=request.POST["book"])
     current_shelf = models.Shelf.objects.get(id=request.POST["shelf"])
 
-    handle_unshelve(request.user, book, current_shelf)
+    handle_unshelve(book, current_shelf)
     return redirect(request.headers.get("Referer", "/"))
 
 
 # pylint: disable=unused-argument
-def handle_unshelve(user, book, shelf):
+def handle_unshelve(book, shelf):
     """ unshelve a book """
     row = models.ShelfBook.objects.get(book=book, shelf=shelf)
     row.delete()

From b0e1095fe6a9c201acebcf7089f67b462da0f50e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 26 Mar 2021 10:32:42 -0700
Subject: [PATCH 0462/1285] Adds "suggested follows" panel

---
 bookwyrm/static/css/format.css                |  5 ++++
 bookwyrm/templates/feed/feed.html             | 27 +++++++++++++++++++
 .../templates/snippets/follow_button.html     | 10 +++----
 bookwyrm/views/feed.py                        | 18 ++++++++++++-
 4 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/static/css/format.css b/bookwyrm/static/css/format.css
index 6a1167b2..c640cd27 100644
--- a/bookwyrm/static/css/format.css
+++ b/bookwyrm/static/css/format.css
@@ -15,6 +15,11 @@ html {
     overflow: visible;
 }
 
+.scroll-x {
+    overflow: hidden;
+    overflow-x: auto;
+}
+
 /* --- SHELVING --- */
 .shelf-option:disabled > *::after {
     font-family: "icomoon";
diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html
index bc35d3b9..24131051 100644
--- a/bookwyrm/templates/feed/feed.html
+++ b/bookwyrm/templates/feed/feed.html
@@ -1,6 +1,7 @@
 {% extends 'feed/feed_layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
+{% load humanize %}
 {% block panel %}
 
 <h1 class="title">
@@ -48,6 +49,32 @@
 {% endif %}
 
 {% for activity in activities %}
+
+{% if not activities.number > 1 and forloop.counter0 == 2 and suggested_users %}
+{# suggested users on the first page, two statuses down #}
+<section class="block">
+    <h2 class="title is-5">{% trans "Who to follow" %}</h2>
+    <div class="columns is-mobile is-gapless scroll-x">
+    {% for user in suggested_users %}
+    <div class="column is-flex">
+        <div class="box has-text-centered is-shadowless has-background-white-bis">
+            <a href="{{ user.local_path }}" class="has-text-black">
+                {% include 'snippets/avatar.html' with user=user large=True %}
+                <span title="{{ user.display_name }}" class="is-block is-6 has-text-weight-bold">{{ user.display_name|truncatechars:10 }}</span>
+                <span title="@{{ user|username }}" class="is-block pb-3">@{{ user|username|truncatechars:8 }}</span>
+            </a>
+            {% include 'snippets/follow_button.html' with user=user minimal=True %}
+            {% if user.mutuals %}
+            <p class="help">
+            {% blocktrans with mutuals=user.mutuals|intcomma count counter=user.mutuals %}{{ mutuals }} follower you follow{% plural %}{{ mutuals }} followers you follow{% endblocktrans %}
+            </p>
+            {% endif %}
+        </div>
+    </div>
+    {% endfor %}
+    </div>
+</section>
+{% endif %}
 <div class="block">
     {% include 'snippets/status/status.html' with status=activity %}
 </div>
diff --git a/bookwyrm/templates/snippets/follow_button.html b/bookwyrm/templates/snippets/follow_button.html
index 3df85a1a..962d4d34 100644
--- a/bookwyrm/templates/snippets/follow_button.html
+++ b/bookwyrm/templates/snippets/follow_button.html
@@ -4,16 +4,12 @@
 {% include 'snippets/block_button.html' %}
 {% else %}
 
-<div class="field has-addons">
+<div class="field{% if not minimal %} has-addons{% else %} mb-0{% endif %}">
     <div class="control">
         <form action="{% url 'follow' %}" method="POST" class="interaction follow-{{ user.id }} {% if request.user in user.followers.all or request.user in user.follower_requests.all %}hidden{%endif %}" data-id="follow-{{ user.id }}">
             {% csrf_token %}
             <input type="hidden" name="user" value="{{ user.username }}">
-            {% if user.manually_approves_followers %}
-                <button class="button is-small is-link" type="submit">{% trans "Send follow request" %}</button>
-            {% else %}
-                <button class="button is-small is-link" type="submit">{% trans "Follow" %}</button>
-            {% endif %}
+            <button class="button is-small{% if not minimal %} is-link{% endif %}" type="submit">{% trans "Follow" %}</button>
         </form>
         <form action="{% url 'unfollow' %}" method="POST" class="interaction follow-{{ user.id }} {% if not request.user in user.followers.all and not request.user in user.follower_requests.all %}hidden{%endif %}" data-id="follow-{{ user.id }}">
             {% csrf_token %}
@@ -25,8 +21,10 @@
             {% endif %}
         </form>
     </div>
+    {% if not minimal %}
     <div class="control">
         {% include 'snippets/user_options.html' with user=user class="is-small" %}
     </div>
+    {% endif %}
 </div>
 {% endif %}
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index e0de932d..21a14d8e 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -1,7 +1,7 @@
 """ non-interactive pages """
 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
-from django.db.models import Q
+from django.db.models import Count, Q
 from django.http import HttpResponseNotFound
 from django.template.response import TemplateResponse
 from django.utils import timezone
@@ -34,11 +34,27 @@ class Feed(View):
 
         paginated = Paginator(activities, PAGE_LENGTH)
 
+        suggested_users = models.User.objects.filter(
+            ~Q(id__in=request.user.following.all()),
+            ~Q(id=request.user.id),
+            discoverable=True,
+            is_active=True,
+            bookwyrm_user=True,
+        ).annotate(
+            mutuals=Count(
+                "following",
+                filter=Q(
+                    following__in=request.user.following.all()
+                ),
+            )
+        ).order_by("-mutuals", "-last_active_date").all()[:5]
+
         data = {
             **feed_page_data(request.user),
             **{
                 "user": request.user,
                 "activities": paginated.page(page),
+                "suggested_users": suggested_users,
                 "tab": tab,
                 "goal_form": forms.GoalForm(),
                 "path": "/%s" % tab,

From 2490aa07aabdb61af8f0a90a73a522da8d97d1fb Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 26 Mar 2021 10:35:37 -0700
Subject: [PATCH 0463/1285] Python formtting

---
 bookwyrm/views/feed.py | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index 21a14d8e..7d85675c 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -34,20 +34,23 @@ class Feed(View):
 
         paginated = Paginator(activities, PAGE_LENGTH)
 
-        suggested_users = models.User.objects.filter(
-            ~Q(id__in=request.user.following.all()),
-            ~Q(id=request.user.id),
-            discoverable=True,
-            is_active=True,
-            bookwyrm_user=True,
-        ).annotate(
-            mutuals=Count(
-                "following",
-                filter=Q(
-                    following__in=request.user.following.all()
-                ),
+        suggested_users = (
+            models.User.objects.filter(
+                ~Q(id__in=request.user.following.all()),
+                ~Q(id=request.user.id),
+                discoverable=True,
+                is_active=True,
+                bookwyrm_user=True,
             )
-        ).order_by("-mutuals", "-last_active_date").all()[:5]
+            .annotate(
+                mutuals=Count(
+                    "following",
+                    filter=Q(following__in=request.user.following.all()),
+                )
+            )
+            .order_by("-mutuals", "-last_active_date")
+            .all()[:5]
+        )
 
         data = {
             **feed_page_data(request.user),

From ee067b7d65dbaebeb6995f643fc4366c7a52e215 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 26 Mar 2021 12:09:37 -0700
Subject: [PATCH 0464/1285] Fixes error adding unlisted statuses

---
 bookwyrm/activitystreams.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 88f1f011..6fa36700 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -88,7 +88,7 @@ class ActivityStream(ABC):
         """ given a status, what users should see it """
         # direct messages don't appeard in feeds, direct comments/reviews/etc do
         if status.privacy == "direct" and status.status_type == "Note":
-            return None
+            return []
 
         # everybody who could plausibly see this status
         audience = models.User.objects.filter(
@@ -150,7 +150,7 @@ class LocalStream(ActivityStream):
     def stream_users(self, status):
         # this stream wants no part in non-public statuses
         if status.privacy != "public" or not status.user.local:
-            return None
+            return []
         return super().stream_users(status)
 
     def stream_statuses(self, user):
@@ -170,7 +170,7 @@ class FederatedStream(ActivityStream):
     def stream_users(self, status):
         # this stream wants no part in non-public statuses
         if status.privacy != "public":
-            return None
+            return []
         return super().stream_users(status)
 
     def stream_statuses(self, user):

From c8118c9bf458ddc183efd0879e8717ce75144504 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 26 Mar 2021 12:52:04 -0700
Subject: [PATCH 0465/1285] Updates activity streams tests

---
 bookwyrm/tests/test_activitystreams.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/tests/test_activitystreams.py b/bookwyrm/tests/test_activitystreams.py
index d7a3d4eb..88ca4693 100644
--- a/bookwyrm/tests/test_activitystreams.py
+++ b/bookwyrm/tests/test_activitystreams.py
@@ -67,7 +67,7 @@ class Activitystreams(TestCase):
         )
         status.mention_users.add(self.local_user)
         users = self.test_stream.stream_users(status)
-        self.assertIsNone(users)
+        self.assertEqual(users, [])
 
         status = models.Comment.objects.create(
             user=self.remote_user,
@@ -167,7 +167,7 @@ class Activitystreams(TestCase):
             user=self.remote_user, content="hi", privacy="public"
         )
         users = activitystreams.LocalStream().stream_users(status)
-        self.assertIsNone(users)
+        self.assertEqual(users, [])
 
     def test_localstream_stream_users_local_status(self, *_):
         """ get a list of users that should see a status """
@@ -184,7 +184,7 @@ class Activitystreams(TestCase):
             user=self.local_user, content="hi", privacy="unlisted"
         )
         users = activitystreams.LocalStream().stream_users(status)
-        self.assertIsNone(users)
+        self.assertEqual(users, [])
 
     def test_federatedstream_stream_users(self, *_):
         """ get a list of users that should see a status """
@@ -201,4 +201,4 @@ class Activitystreams(TestCase):
             user=self.remote_user, content="hi", privacy="unlisted"
         )
         users = activitystreams.FederatedStream().stream_users(status)
-        self.assertIsNone(users)
+        self.assertEqual(users, [])

From 0ef33d2acba50a65810b84c2f658dffeb83788a4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 27 Mar 2021 07:36:14 -0700
Subject: [PATCH 0466/1285] Adds shared books as a metric for recommending
 follows

---
 bookwyrm/static/css/format.css    | 10 +++++++--
 bookwyrm/templates/directory.html | 11 ++++++++-
 bookwyrm/templates/feed/feed.html | 37 +++++++++++++++++--------------
 bookwyrm/views/directory.py       | 16 +++----------
 bookwyrm/views/feed.py            | 22 ++++--------------
 bookwyrm/views/helpers.py         | 28 ++++++++++++++++++++++-
 6 files changed, 72 insertions(+), 52 deletions(-)

diff --git a/bookwyrm/static/css/format.css b/bookwyrm/static/css/format.css
index c640cd27..0956517d 100644
--- a/bookwyrm/static/css/format.css
+++ b/bookwyrm/static/css/format.css
@@ -163,9 +163,15 @@ html {
     vertical-align: middle;
     display: inline;
 }
-.navbar .avatar {
-    max-height: none;
+.is-32x32 {
+    min-width: 32px;
+    min-height: 32px;
 }
+.is-96x96 {
+    min-width: 96px;
+    min-height: 96px;
+}
+
 
 
 /* --- QUOTES --- */
diff --git a/bookwyrm/templates/directory.html b/bookwyrm/templates/directory.html
index 6f8bc3e4..3d47e26b 100644
--- a/bookwyrm/templates/directory.html
+++ b/bookwyrm/templates/directory.html
@@ -121,12 +121,21 @@
             </div>
             <footer class="card-footer content">
                 {% if user != request.user %}
+                {% if user.mutuals %}
                 <div class="card-footer-item">
                     <div class="has-text-centered">
                         <p class="title is-6 mb-0">{{ user.mutuals }}</p>
-                        <p class="help">{% trans "followers you follow" %}</p>
+                        <p class="help">{% blocktrans count counter=user.mutuals %}follower you follow{% plural %}followers you follow{% endblocktrans %}</p>
                     </div>
                 </div>
+                {% elif user.shared_books %}
+                <div class="card-footer-item">
+                    <div class="has-text-centered">
+                        <p class="title is-6 mb-0">{{ user.shared_books }}</p>
+                        <p class="help">{% blocktrans count counter=user.shared_books %}book on your shelves{% plural %}books on your shelves{% endblocktrans %}</p>
+                    </div>
+                </div>
+                {% endif %}
                 {% endif %}
                 <div class="card-footer-item">
                     <div class="has-text-centered">
diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html
index 24131051..3f9d36f7 100644
--- a/bookwyrm/templates/feed/feed.html
+++ b/bookwyrm/templates/feed/feed.html
@@ -54,25 +54,28 @@
 {# suggested users on the first page, two statuses down #}
 <section class="block">
     <h2 class="title is-5">{% trans "Who to follow" %}</h2>
-    <div class="columns is-mobile is-gapless scroll-x">
-    {% for user in suggested_users %}
-    <div class="column is-flex">
-        <div class="box has-text-centered is-shadowless has-background-white-bis">
-            <a href="{{ user.local_path }}" class="has-text-black">
-                {% include 'snippets/avatar.html' with user=user large=True %}
-                <span title="{{ user.display_name }}" class="is-block is-6 has-text-weight-bold">{{ user.display_name|truncatechars:10 }}</span>
-                <span title="@{{ user|username }}" class="is-block pb-3">@{{ user|username|truncatechars:8 }}</span>
-            </a>
-            {% include 'snippets/follow_button.html' with user=user minimal=True %}
-            {% if user.mutuals %}
-            <p class="help">
-            {% blocktrans with mutuals=user.mutuals|intcomma count counter=user.mutuals %}{{ mutuals }} follower you follow{% plural %}{{ mutuals }} followers you follow{% endblocktrans %}
-            </p>
-            {% endif %}
+    <div class="columns is-mobile scroll-x mb-0">
+        {% for user in suggested_users %}
+        <div class="column is-flex">
+            <div class="box has-text-centered is-shadowless has-background-white-bis m-0">
+                <a href="{{ user.local_path }}" class="has-text-black">
+                    {% include 'snippets/avatar.html' with user=user large=True %}
+                    <span title="{{ user.display_name }}" class="is-block is-6 has-text-weight-bold">{{ user.display_name|truncatechars:10 }}</span>
+                    <span title="@{{ user|username }}" class="is-block pb-3">@{{ user|username|truncatechars:8 }}</span>
+                </a>
+                {% include 'snippets/follow_button.html' with user=user minimal=True %}
+                {% if user.mutuals %}
+                <p class="help">
+                {% blocktrans with mutuals=user.mutuals|intcomma count counter=user.mutuals %}{{ mutuals }} follower you follow{% plural %}{{ mutuals }} followers you follow{% endblocktrans %}
+                </p>
+                {% elif user.shared_books %}
+                <p class="help">{% blocktrans with shared_books=user.shared_books|intcomma count counter=user.shared_books %}{{ shared_books }} book on your shelves{% plural %}{{ shared_books }} books on your shelves{% endblocktrans %}</p>
+                {% endif %}
+            </div>
         </div>
+        {% endfor %}
     </div>
-    {% endfor %}
-    </div>
+    <a class="help" href="{% url 'directory' %}">View directory <span class="icon icon-arrow-right"></a>
 </section>
 {% endif %}
 <div class="block">
diff --git a/bookwyrm/views/directory.py b/bookwyrm/views/directory.py
index 1a454e80..c57b47f7 100644
--- a/bookwyrm/views/directory.py
+++ b/bookwyrm/views/directory.py
@@ -1,13 +1,12 @@
 """ who all's here? """
 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
-from django.db.models import Count, Q
 from django.shortcuts import redirect
 from django.template.response import TemplateResponse
 from django.views import View
 from django.utils.decorators import method_decorator
 
-from bookwyrm import models
+from .helpers import get_suggested_users
 
 # pylint: disable=no-self-use
 @method_decorator(login_required, name="dispatch")
@@ -30,21 +29,12 @@ class Directory(View):
         if scope == "local":
             filters["local"] = True
 
-        users = models.User.objects.filter(
-            discoverable=True, is_active=True, **filters
-        ).annotate(
-            mutuals=Count(
-                "following",
-                filter=Q(
-                    ~Q(id=request.user.id), following__in=request.user.following.all()
-                ),
-            )
-        )
+        users = get_suggested_users(request.user, **filters)
         sort = request.GET.get("sort")
         if sort == "recent":
             users = users.order_by("-last_active_date")
         else:
-            users = users.order_by("-mutuals", "-last_active_date")
+            users = users.order_by("-mutuals", "-shared_books", "-last_active_date")
 
         paginated = Paginator(users, 12)
 
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index 7d85675c..90104912 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -11,7 +11,7 @@ from django.views import View
 from bookwyrm import activitystreams, forms, models
 from bookwyrm.activitypub import ActivitypubResponse
 from bookwyrm.settings import PAGE_LENGTH, STREAMS
-from .helpers import get_user_from_username, privacy_filter
+from .helpers import get_user_from_username, privacy_filter, get_suggested_users
 from .helpers import is_api_request, is_bookwyrm_request, object_visible_to_user
 
 
@@ -34,23 +34,9 @@ class Feed(View):
 
         paginated = Paginator(activities, PAGE_LENGTH)
 
-        suggested_users = (
-            models.User.objects.filter(
-                ~Q(id__in=request.user.following.all()),
-                ~Q(id=request.user.id),
-                discoverable=True,
-                is_active=True,
-                bookwyrm_user=True,
-            )
-            .annotate(
-                mutuals=Count(
-                    "following",
-                    filter=Q(following__in=request.user.following.all()),
-                )
-            )
-            .order_by("-mutuals", "-last_active_date")
-            .all()[:5]
-        )
+        suggested_users = get_suggested_users(
+            request.user, ~Q(id=request.user.id), bookwyrm_user=True
+        ).order_by("-mutuals", "-last_active_date").all()[:5]
 
         data = {
             **feed_page_data(request.user),
diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index 41822da2..b664bcb1 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -2,7 +2,7 @@
 import re
 from requests import HTTPError
 from django.core.exceptions import FieldError
-from django.db.models import Max, Q
+from django.db.models import Count, Max, Q
 
 from bookwyrm import activitypub, models
 from bookwyrm.connectors import ConnectorException, get_data
@@ -190,3 +190,29 @@ def get_discover_books():
             .order_by("-review__published_date__max")[:6]
         )
     )
+
+
+def get_suggested_users(user, *args, **kwargs):
+    """ Users, annotated with things they have in common """
+    return models.User.objects.filter(
+        discoverable=True, is_active=True, *args, **kwargs
+    ).exclude(
+        Q(id__in=user.blocks.all()) | Q(blocks=user)
+    ).annotate(
+        mutuals=Count(
+            "following",
+            filter=Q(
+                ~Q(id=user.id),
+                ~Q(id__in=user.following.all()),
+                following__in=user.following.all()
+            ),
+        ),
+        shared_books=Count(
+            "shelfbook",
+            filter=Q(
+                ~Q(id=user.id),
+                shelfbook__book__parent_work__in=[
+                    s.book.parent_work for s in user.shelfbook_set.all()]
+            )
+        )
+    )

From 25a3a7763cadda8e1b04b5e81ceab3a0ba40d1d3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 27 Mar 2021 08:15:39 -0700
Subject: [PATCH 0467/1285] Adds books in common as a recommendation metric

---
 bookwyrm/views/feed.py    | 15 +++++++++++----
 bookwyrm/views/helpers.py | 39 ++++++++++++++++++++-------------------
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index 90104912..d068834a 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -1,7 +1,7 @@
 """ non-interactive pages """
 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
-from django.db.models import Count, Q
+from django.db.models import Q
 from django.http import HttpResponseNotFound
 from django.template.response import TemplateResponse
 from django.utils import timezone
@@ -34,9 +34,16 @@ class Feed(View):
 
         paginated = Paginator(activities, PAGE_LENGTH)
 
-        suggested_users = get_suggested_users(
-            request.user, ~Q(id=request.user.id), bookwyrm_user=True
-        ).order_by("-mutuals", "-last_active_date").all()[:5]
+        suggested_users = (
+            get_suggested_users(
+                request.user,
+                ~Q(id=request.user.id),
+                ~Q(followers=request.user),
+                bookwyrm_user=True,
+            )
+            .order_by("-mutuals", "-last_active_date")
+            .all()[:5]
+        )
 
         data = {
             **feed_page_data(request.user),
diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index b664bcb1..2a5f9d10 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -194,25 +194,26 @@ def get_discover_books():
 
 def get_suggested_users(user, *args, **kwargs):
     """ Users, annotated with things they have in common """
-    return models.User.objects.filter(
-        discoverable=True, is_active=True, *args, **kwargs
-    ).exclude(
-        Q(id__in=user.blocks.all()) | Q(blocks=user)
-    ).annotate(
-        mutuals=Count(
-            "following",
-            filter=Q(
-                ~Q(id=user.id),
-                ~Q(id__in=user.following.all()),
-                following__in=user.following.all()
+    return (
+        models.User.objects.filter(discoverable=True, is_active=True, *args, **kwargs)
+        .exclude(Q(id__in=user.blocks.all()) | Q(blocks=user))
+        .annotate(
+            mutuals=Count(
+                "following",
+                filter=Q(
+                    ~Q(id=user.id),
+                    ~Q(id__in=user.following.all()),
+                    following__in=user.following.all(),
+                ),
+            ),
+            shared_books=Count(
+                "shelfbook",
+                filter=Q(
+                    ~Q(id=user.id),
+                    shelfbook__book__parent_work__in=[
+                        s.book.parent_work for s in user.shelfbook_set.all()
+                    ],
+                ),
             ),
-        ),
-        shared_books=Count(
-            "shelfbook",
-            filter=Q(
-                ~Q(id=user.id),
-                shelfbook__book__parent_work__in=[
-                    s.book.parent_work for s in user.shelfbook_set.all()]
-            )
         )
     )

From 1341341a4f783409d4e3cc2147926c048804bb5f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 27 Mar 2021 09:56:46 -0700
Subject: [PATCH 0468/1285] Adds test for annotated user helper

---
 bookwyrm/tests/views/test_helpers.py | 66 +++++++++++++++++++++++-----
 1 file changed, 55 insertions(+), 11 deletions(-)

diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py
index 4fd7ce66..0176f710 100644
--- a/bookwyrm/tests/views/test_helpers.py
+++ b/bookwyrm/tests/views/test_helpers.py
@@ -10,6 +10,7 @@ from bookwyrm import models, views
 from bookwyrm.settings import USER_AGENT
 
 
+@patch("bookwyrm.activitystreams.ActivityStream.add_status")
 class ViewsHelpers(TestCase):
     """ viewing and creating statuses """
 
@@ -21,6 +22,7 @@ class ViewsHelpers(TestCase):
             "mouse@mouse.com",
             "mouseword",
             local=True,
+            discoverable=True,
             localname="mouse",
             remote_id="https://example.com/users/mouse",
         )
@@ -37,6 +39,7 @@ class ViewsHelpers(TestCase):
                 "ratword",
                 local=False,
                 remote_id="https://example.com/users/rat",
+                discoverable=True,
                 inbox="https://example.com/users/rat/inbox",
                 outbox="https://example.com/users/rat/outbox",
             )
@@ -48,12 +51,12 @@ class ViewsHelpers(TestCase):
                 name="Test Shelf", identifier="test-shelf", user=self.local_user
             )
 
-    def test_get_edition(self):
+    def test_get_edition(self, _):
         """ given an edition or a work, returns an edition """
         self.assertEqual(views.helpers.get_edition(self.book.id), self.book)
         self.assertEqual(views.helpers.get_edition(self.work.id), self.book)
 
-    def test_get_user_from_username(self):
+    def test_get_user_from_username(self, _):
         """ works for either localname or username """
         self.assertEqual(
             views.helpers.get_user_from_username(self.local_user, "mouse"),
@@ -66,7 +69,7 @@ class ViewsHelpers(TestCase):
         with self.assertRaises(models.User.DoesNotExist):
             views.helpers.get_user_from_username(self.local_user, "mojfse@example.com")
 
-    def test_is_api_request(self):
+    def test_is_api_request(self, _):
         """ should it return html or json """
         request = self.factory.get("/path")
         request.headers = {"Accept": "application/json"}
@@ -80,7 +83,7 @@ class ViewsHelpers(TestCase):
         request.headers = {"Accept": "Praise"}
         self.assertFalse(views.helpers.is_api_request(request))
 
-    def test_is_bookwyrm_request(self):
+    def test_is_bookwyrm_request(self, _):
         """ checks if a request came from a bookwyrm instance """
         request = self.factory.get("", {"q": "Test Book"})
         self.assertFalse(views.helpers.is_bookwyrm_request(request))
@@ -95,7 +98,7 @@ class ViewsHelpers(TestCase):
         request = self.factory.get("", {"q": "Test Book"}, HTTP_USER_AGENT=USER_AGENT)
         self.assertTrue(views.helpers.is_bookwyrm_request(request))
 
-    def test_existing_user(self):
+    def test_existing_user(self, _):
         """ simple database lookup by username """
         result = views.helpers.handle_remote_webfinger("@mouse@local.com")
         self.assertEqual(result, self.local_user)
@@ -104,7 +107,7 @@ class ViewsHelpers(TestCase):
         self.assertEqual(result, self.local_user)
 
     @responses.activate
-    def test_load_user(self):
+    def test_load_user(self, _):
         """ find a remote user using webfinger """
         username = "mouse@example.com"
         wellknown = {
@@ -134,7 +137,6 @@ class ViewsHelpers(TestCase):
             self.assertIsInstance(result, models.User)
             self.assertEqual(result.username, "mouse@example.com")
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
     def test_handle_reading_status_to_read(self, _):
         """ posts shelve activities """
         shelf = self.local_user.shelf_set.get(identifier="to-read")
@@ -147,7 +149,6 @@ class ViewsHelpers(TestCase):
         self.assertEqual(status.mention_books.first(), self.book)
         self.assertEqual(status.content, "wants to read")
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
     def test_handle_reading_status_reading(self, _):
         """ posts shelve activities """
         shelf = self.local_user.shelf_set.get(identifier="reading")
@@ -182,7 +183,6 @@ class ViewsHelpers(TestCase):
             )
         self.assertFalse(models.GeneratedNote.objects.exists())
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
     def test_object_visible_to_user(self, _):
         """ does a user have permission to view an object """
         obj = models.Status.objects.create(
@@ -211,7 +211,6 @@ class ViewsHelpers(TestCase):
         obj.mention_users.add(self.local_user)
         self.assertTrue(views.helpers.object_visible_to_user(self.local_user, obj))
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
     def test_object_visible_to_user_follower(self, _):
         """ what you can see if you follow a user """
         self.remote_user.followers.add(self.local_user)
@@ -231,7 +230,6 @@ class ViewsHelpers(TestCase):
         obj.mention_users.add(self.local_user)
         self.assertTrue(views.helpers.object_visible_to_user(self.local_user, obj))
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
     def test_object_visible_to_user_blocked(self, _):
         """ you can't see it if they block you """
         self.remote_user.blocks.add(self.local_user)
@@ -244,3 +242,49 @@ class ViewsHelpers(TestCase):
             name="test", user=self.remote_user, privacy="unlisted"
         )
         self.assertFalse(views.helpers.object_visible_to_user(self.local_user, obj))
+
+    def test_get_suggested_users(self, _):
+        """ list of people you might know """
+        user_1 = models.User.objects.create_user(
+            "nutria@local.com",
+            "nutria@nutria.com",
+            "nutriaword",
+            local=True,
+            localname="nutria",
+            discoverable=True,
+        )
+        user_2 = models.User.objects.create_user(
+            "fish@local.com",
+            "fish@fish.com",
+            "fishword",
+            local=True,
+            localname="fish",
+        )
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            # 1 shared follow
+            self.local_user.following.add(user_2)
+            user_1.following.add(user_2)
+
+            # 1 shared book
+            models.ShelfBook.objects.create(
+                user=self.local_user,
+                book=self.book,
+                shelf=self.local_user.shelf_set.first()
+            )
+            models.ShelfBook.objects.create(
+                user=user_1, book=self.book, shelf=user_1.shelf_set.first())
+
+        result = views.helpers.get_suggested_users(self.local_user)
+        self.assertEqual(result.count(), 3)
+        self.assertTrue(user_1 in result)
+        self.assertFalse(user_2 in result)
+        self.assertTrue(self.local_user in result)
+        self.assertTrue(self.remote_user in result)
+
+        user_1_annotated = result.get(id=user_1.id)
+        self.assertEqual(user_1_annotated.mutuals, 1)
+        self.assertEqual(user_1_annotated.shared_books, 1)
+
+        remote_user_annotated = result.get(id=self.remote_user.id)
+        self.assertEqual(remote_user_annotated.mutuals, 0)
+        self.assertEqual(remote_user_annotated.shared_books, 0)

From c398d8a870267a4879dd1128be32e10defe8c4e7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 27 Mar 2021 10:00:32 -0700
Subject: [PATCH 0469/1285] Python formatting

---
 bookwyrm/tests/views/test_helpers.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py
index 0176f710..f77ccbf5 100644
--- a/bookwyrm/tests/views/test_helpers.py
+++ b/bookwyrm/tests/views/test_helpers.py
@@ -269,10 +269,11 @@ class ViewsHelpers(TestCase):
             models.ShelfBook.objects.create(
                 user=self.local_user,
                 book=self.book,
-                shelf=self.local_user.shelf_set.first()
+                shelf=self.local_user.shelf_set.first(),
             )
             models.ShelfBook.objects.create(
-                user=user_1, book=self.book, shelf=user_1.shelf_set.first())
+                user=user_1, book=self.book, shelf=user_1.shelf_set.first()
+            )
 
         result = views.helpers.get_suggested_users(self.local_user)
         self.assertEqual(result.count(), 3)

From 81925b11cf39a356b58bde5bde511e0cf2f51d81 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 27 Mar 2021 10:38:07 -0700
Subject: [PATCH 0470/1285] Removes duplicate patch annotation

---
 bookwyrm/tests/views/test_helpers.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py
index f77ccbf5..7d6df948 100644
--- a/bookwyrm/tests/views/test_helpers.py
+++ b/bookwyrm/tests/views/test_helpers.py
@@ -161,7 +161,6 @@ class ViewsHelpers(TestCase):
         self.assertEqual(status.mention_books.first(), self.book)
         self.assertEqual(status.content, "started reading")
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
     def test_handle_reading_status_read(self, _):
         """ posts shelve activities """
         shelf = self.local_user.shelf_set.get(identifier="read")
@@ -174,7 +173,6 @@ class ViewsHelpers(TestCase):
         self.assertEqual(status.mention_books.first(), self.book)
         self.assertEqual(status.content, "finished reading")
 
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
     def test_handle_reading_status_other(self, _):
         """ posts shelve activities """
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):

From c42719ee1ec535fe89759896e555ad9be0c577d1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Mar 2021 10:32:58 -0700
Subject: [PATCH 0471/1285] Fixes wildly high similiarity metrics in directory

---
 bookwyrm/tests/views/test_helpers.py | 46 ++++++++++++++++++++++++++++
 bookwyrm/views/helpers.py            |  2 ++
 2 files changed, 48 insertions(+)

diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py
index 7d6df948..2d100f7b 100644
--- a/bookwyrm/tests/views/test_helpers.py
+++ b/bookwyrm/tests/views/test_helpers.py
@@ -2,6 +2,7 @@
 import json
 from unittest.mock import patch
 import pathlib
+from django.db.models import Q
 from django.test import TestCase
 from django.test.client import RequestFactory
 import responses
@@ -287,3 +288,48 @@ class ViewsHelpers(TestCase):
         remote_user_annotated = result.get(id=self.remote_user.id)
         self.assertEqual(remote_user_annotated.mutuals, 0)
         self.assertEqual(remote_user_annotated.shared_books, 0)
+
+    def test_get_suggested_users_counts(self, _):
+        """ correct counting for multiple shared attributed """
+        user_1 = models.User.objects.create_user(
+            "nutria@local.com",
+            "nutria@nutria.com",
+            "nutriaword",
+            local=True,
+            localname="nutria",
+            discoverable=True,
+        )
+        for i in range(3):
+            user = models.User.objects.create_user(
+                "{:d}@local.com".format(i),
+                "{:d}@nutria.com".format(i),
+                "password",
+                local=True,
+                localname=i,
+            )
+            user.followers.add(user_1)
+            user.followers.add(self.local_user)
+
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            for i in range(3):
+                book = models.Edition.objects.create(
+                    title=i,
+                    parent_work=models.Work.objects.create(title=i),
+                )
+                models.ShelfBook.objects.create(
+                    user=self.local_user,
+                    book=book,
+                    shelf=self.local_user.shelf_set.first(),
+                )
+                models.ShelfBook.objects.create(
+                    user=user_1, book=book, shelf=user_1.shelf_set.first()
+                )
+
+        result = views.helpers.get_suggested_users(
+            self.local_user,
+            ~Q(id=self.local_user.id),
+            ~Q(followers=self.local_user),
+        )
+        self.assertEqual(result.count(), 2)
+        user_1_annotated = result.get(id=user_1.id)
+        self.assertEqual(user_1_annotated.mutuals, 3)
diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index 2a5f9d10..2c2f96c3 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -205,6 +205,7 @@ def get_suggested_users(user, *args, **kwargs):
                     ~Q(id__in=user.following.all()),
                     following__in=user.following.all(),
                 ),
+                distinct=True
             ),
             shared_books=Count(
                 "shelfbook",
@@ -214,6 +215,7 @@ def get_suggested_users(user, *args, **kwargs):
                         s.book.parent_work for s in user.shelfbook_set.all()
                     ],
                 ),
+                distinct=True
             ),
         )
     )

From 6f99947cac3fe7fb9977fb70b88efcb87e4b7161 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Mar 2021 10:45:46 -0700
Subject: [PATCH 0472/1285] Fixes python formatting

---
 bookwyrm/views/helpers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index 2c2f96c3..52b5818f 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -205,7 +205,7 @@ def get_suggested_users(user, *args, **kwargs):
                     ~Q(id__in=user.following.all()),
                     following__in=user.following.all(),
                 ),
-                distinct=True
+                distinct=True,
             ),
             shared_books=Count(
                 "shelfbook",
@@ -215,7 +215,7 @@ def get_suggested_users(user, *args, **kwargs):
                         s.book.parent_work for s in user.shelfbook_set.all()
                     ],
                 ),
-                distinct=True
+                distinct=True,
             ),
         )
     )

From 71f6e0d330adc56693f3cc9cd9f91d206e34e26f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Mar 2021 11:15:26 -0700
Subject: [PATCH 0473/1285] Show invite request count

---
 bookwyrm/templates/settings/manage_invite_requests.html | 2 +-
 bookwyrm/views/invite.py                                | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/settings/manage_invite_requests.html b/bookwyrm/templates/settings/manage_invite_requests.html
index a7648a7f..7a7088d9 100644
--- a/bookwyrm/templates/settings/manage_invite_requests.html
+++ b/bookwyrm/templates/settings/manage_invite_requests.html
@@ -23,7 +23,7 @@
         {% trans "Ignored Invite Requests" %}
         {% else %}
         {% trans "Invite Requests" %}
-        {% endif %}
+        {% endif %} ({{ count }})
     </h2>
 
     <table class="table is-striped">
diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/invite.py
index e4b98cba..106afe65 100644
--- a/bookwyrm/views/invite.py
+++ b/bookwyrm/views/invite.py
@@ -101,6 +101,7 @@ class ManageInviteRequests(View):
 
         data = {
             "ignored": ignored,
+            "count": paginated.count,
             "requests": paginated.page(page),
         }
         return TemplateResponse(request, "settings/manage_invite_requests.html", data)

From 323c72002b4a795d414cf9c3d54dfcd6bb3e41dc Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Mar 2021 11:18:01 -0700
Subject: [PATCH 0474/1285] Fixes shelve menu display on book page

---
 bookwyrm/templates/book/book.html | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index 0275eb1a..df92e11a 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -35,9 +35,11 @@
     </div>
 
     <div class="columns">
-        <div class="column is-one-fifth is-clipped">
-            {% include 'snippets/book_cover.html' with book=book size=large %}
-            {% include 'snippets/rate_action.html' with user=request.user book=book %}
+        <div class="column is-one-fifth">
+            <div class="is-clipped">
+                {% include 'snippets/book_cover.html' with book=book size=large %}
+                {% include 'snippets/rate_action.html' with user=request.user book=book %}
+            </div>
             {% include 'snippets/shelve_button/shelve_button.html' %}
 
             {% if request.user.is_authenticated and not book.cover %}
@@ -48,7 +50,7 @@
             </div>
             {% endif %}
 
-            <section class="content">
+            <section class="content is-clipped">
                 <dl>
                     {% if book.isbn_13 %}
                     <div class="is-flex is-justify-content-space-between is-align-items-center">

From f0876b57c50cb45eb309f1d6b6f22a6b7df0970d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Mar 2021 11:25:05 -0700
Subject: [PATCH 0475/1285] Fixes change shelf menu display on shelf page

---
 bookwyrm/templates/snippets/shelf.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/shelf.html b/bookwyrm/templates/snippets/shelf.html
index 9ac7760c..8cae29e6 100644
--- a/bookwyrm/templates/snippets/shelf.html
+++ b/bookwyrm/templates/snippets/shelf.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load bookwyrm_tags %}
 {% if books|length > 0 %}
-<div class="table-container">
+<div class="scroll-x">
 <table class="table is-striped is-fullwidth">
 
 <tr class="book-preview">

From 63b319e28604572739a761598d0244a7cf2b450b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Mar 2021 11:27:09 -0700
Subject: [PATCH 0476/1285] Space between shelve button and isbn on book page

---
 bookwyrm/templates/book/book.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index df92e11a..aef8fba1 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -40,7 +40,9 @@
                 {% include 'snippets/book_cover.html' with book=book size=large %}
                 {% include 'snippets/rate_action.html' with user=request.user book=book %}
             </div>
-            {% include 'snippets/shelve_button/shelve_button.html' %}
+            <div class="mb-3">
+                {% include 'snippets/shelve_button/shelve_button.html' %}
+            </div>
 
             {% if request.user.is_authenticated and not book.cover %}
             <div class="block">

From ecf5ee4afcf3e6f576198ce9ec54e0552f3afbc0 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Mar 2021 11:30:53 -0700
Subject: [PATCH 0477/1285] margin between quote and attribution

---
 bookwyrm/templates/snippets/status/status_content.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/status/status_content.html b/bookwyrm/templates/snippets/status/status_content.html
index 53ccc5ca..43cdc5d2 100644
--- a/bookwyrm/templates/snippets/status/status_content.html
+++ b/bookwyrm/templates/snippets/status/status_content.html
@@ -28,7 +28,7 @@
 
         {% if status.quote %}
         <div class="quote block">
-            <blockquote dir="auto">{{ status.quote | safe }}</blockquote>
+            <blockquote dir="auto" class="mb-2">{{ status.quote | safe }}</blockquote>
 
             <p> &mdash; {% include 'snippets/book_titleby.html' with book=status.book %}</p>
         </div>

From 5441d4db095becafe15de3944dcadbb715b822d2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Mar 2021 11:38:39 -0700
Subject: [PATCH 0478/1285] Separates erase and populate stream comands

---
 bookwyrm/management/commands/erase_streams.py | 23 +++++++++++++++++++
 .../{rebuild_feeds.py => populate_streams.py} | 18 +++++----------
 2 files changed, 29 insertions(+), 12 deletions(-)
 create mode 100644 bookwyrm/management/commands/erase_streams.py
 rename bookwyrm/management/commands/{rebuild_feeds.py => populate_streams.py} (64%)

diff --git a/bookwyrm/management/commands/erase_streams.py b/bookwyrm/management/commands/erase_streams.py
new file mode 100644
index 00000000..3dbe1708
--- /dev/null
+++ b/bookwyrm/management/commands/erase_streams.py
@@ -0,0 +1,23 @@
+""" Delete user streams """
+from django.core.management.base import BaseCommand
+import redis
+
+from bookwyrm import settings
+
+r = redis.Redis(
+    host=settings.REDIS_ACTIVITY_HOST, port=settings.REDIS_ACTIVITY_PORT, db=0
+)
+
+
+def erase_streams():
+    """ throw the whole redis away """
+    r.flushall()
+
+class Command(BaseCommand):
+    """ delete activity streams for all users """
+
+    help = "Delete all the user streams"
+    # pylint: disable=no-self-use,unused-argument
+    def handle(self, *args, **options):
+        """ flush all, baby """
+        erase_streams()
diff --git a/bookwyrm/management/commands/rebuild_feeds.py b/bookwyrm/management/commands/populate_streams.py
similarity index 64%
rename from bookwyrm/management/commands/rebuild_feeds.py
rename to bookwyrm/management/commands/populate_streams.py
index 70d4dd98..06ca5f07 100644
--- a/bookwyrm/management/commands/rebuild_feeds.py
+++ b/bookwyrm/management/commands/populate_streams.py
@@ -1,4 +1,4 @@
-""" Delete and re-create user feeds """
+""" Re-create user streams """
 from django.core.management.base import BaseCommand
 import redis
 
@@ -9,13 +9,8 @@ r = redis.Redis(
 )
 
 
-def erase_feeds():
-    """ throw the whole redis away """
-    r.flushall()
-
-
-def create_feeds():
-    """ build all the fields for all the users """
+def populate_streams():
+    """ build all the streams for all the users """
     users = models.User.objects.filter(
         local=True,
         is_active=True,
@@ -26,11 +21,10 @@ def create_feeds():
 
 
 class Command(BaseCommand):
-    """ start all over with user feeds """
+    """ start all over with user streams """
 
-    help = "Delete and re-create all the user feeds"
+    help = "Populate streams for all users"
     # pylint: disable=no-self-use,unused-argument
     def handle(self, *args, **options):
         """ run feed builder """
-        erase_feeds()
-        create_feeds()
+        populate_streams()

From 87d1aa71a25deca6fbbef2dd89ab440a7c95b44c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Mar 2021 11:46:07 -0700
Subject: [PATCH 0479/1285] Adds populate streams to bw commands

---
 bw-dev | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bw-dev b/bw-dev
index 712b8028..b6406f2c 100755
--- a/bw-dev
+++ b/bw-dev
@@ -109,7 +109,10 @@ case "$CMD" in
     black)
         makeitblack
         ;;
+    populate_feeds)
+        execweb python manage.py populate_streams
+        ;;
     *)
-        echo "Unrecognised command. Try: build, clean, up, initdb, resetdb, makemigrations, migrate, bash, shell, dbshell, restart_celery, test, pytest, test_report, black"
+        echo "Unrecognised command. Try: build, clean, up, initdb, resetdb, makemigrations, migrate, bash, shell, dbshell, restart_celery, test, pytest, test_report, black, populate_feeds"
         ;;
 esac

From 713ec8bd69cabfab8ba46ed21034612bc0d8dcc2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Mar 2021 11:51:02 -0700
Subject: [PATCH 0480/1285] Python whitespace formatting

---
 bookwyrm/management/commands/erase_streams.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bookwyrm/management/commands/erase_streams.py b/bookwyrm/management/commands/erase_streams.py
index 3dbe1708..042e857f 100644
--- a/bookwyrm/management/commands/erase_streams.py
+++ b/bookwyrm/management/commands/erase_streams.py
@@ -13,6 +13,7 @@ def erase_streams():
     """ throw the whole redis away """
     r.flushall()
 
+
 class Command(BaseCommand):
     """ delete activity streams for all users """
 

From 96ea2b4477a064acd815bc7521001b5d2ff4e35d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Mar 2021 12:34:55 -0700
Subject: [PATCH 0481/1285] Adds detail page for federated servers

---
 .../templates/settings/federated_server.html  | 68 +++++++++++++++++++
 bookwyrm/templates/settings/federation.html   |  3 +-
 bookwyrm/urls.py                              |  9 ++-
 bookwyrm/views/__init__.py                    |  2 +-
 bookwyrm/views/federation.py                  | 26 +++++++
 5 files changed, 105 insertions(+), 3 deletions(-)
 create mode 100644 bookwyrm/templates/settings/federated_server.html

diff --git a/bookwyrm/templates/settings/federated_server.html b/bookwyrm/templates/settings/federated_server.html
new file mode 100644
index 00000000..dfeb6b3a
--- /dev/null
+++ b/bookwyrm/templates/settings/federated_server.html
@@ -0,0 +1,68 @@
+{% extends 'settings/admin_layout.html' %}
+{% block title %}{{ server.server_name }}{% endblock %}
+{% load i18n %}
+
+{% block header %}
+{{ server.server_name }}
+<a href="{% url 'settings-federation' %}" class="has-text-weight-normal help">{% trans "Back to server list" %}</a>
+{% endblock %}
+
+{% block panel %}
+<section class="block content">
+    <h2 class="title is-4">{% trans "Details" %}</h2>
+    <dl>
+        <div class="is-flex">
+            <dt>{% trans "Software:" %}</dt>
+            <dd>{{ server.application_type }}</dd>
+        </div>
+        <div class="is-flex">
+            <dt>{% trans "Version:" %}</dt>
+            <dd>{{ server.application_version }}</dd>
+        </div>
+        <div class="is-flex">
+            <dt>{% trans "Status:" %}</dt>
+            <dd>Federated</dd>
+        </div>
+    </dl>
+</section>
+
+<section class="block content">
+    <h2 class="title is-4">{% trans "Activity" %}</h2>
+    <dl>
+        <div class="is-flex">
+            <dt>{% trans "Users:" %}</dt>
+            <dd>
+                {{ users.count }}
+                {# {% if server.user_set.count %}(<a href="{% url 'settings-users' server=server.id %}">{% trans "View all users" %}</a>){% endif %} #}
+            </dd>
+        </div>
+        <div class="is-flex">
+            <dt>{% trans "Reports:" %}</dt>
+            <dd>
+                {{ reports.count }}
+                {# {% if server.user_set.count %}(<a href="{% url 'settings-users' server=server.id %}">{% trans "View all users" %}</a>){% endif %} #}
+            </dd>
+        </div>
+        <div class="is-flex">
+            <dt>{% trans "Followed by us:" %}</dt>
+            <dd>
+                {{ followed_by_us.count }}
+            </dd>
+        </div>
+        <div class="is-flex">
+            <dt>{% trans "Followed by them:" %}</dt>
+            <dd>
+                {{ followed_by_them.count }}
+            </dd>
+        </div>
+        <div class="is-flex">
+            <dt>{% trans "Blocked by us:" %}</dt>
+            <dd>
+                {{ blocked_by_us.count }}
+            </dd>
+        </div>
+    </dl>
+</section>
+
+{% endblock %}
+
diff --git a/bookwyrm/templates/settings/federation.html b/bookwyrm/templates/settings/federation.html
index c08ba66c..8c87eda2 100644
--- a/bookwyrm/templates/settings/federation.html
+++ b/bookwyrm/templates/settings/federation.html
@@ -1,5 +1,6 @@
 {% extends 'settings/admin_layout.html' %}
 {% load i18n %}
+{% block title %}{% trans "Federated Servers" %}{% endblock %}
 
 {% block header %}{% trans "Federated Servers" %}{% endblock %}
 
@@ -13,7 +14,7 @@
     </tr>
     {% for server in servers %}
     <tr>
-        <td>{{ server.server_name }}</td>
+        <td><a href="{% url 'settings-federated-server' server.id %}">{{ server.server_name }}</a></td>
         <td>{{ server.application_type }} ({{ server.application_version }})</td>
         <td>{{ server.status }}</td>
     </tr>
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 44db6892..a0d8d007 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -55,7 +55,14 @@ urlpatterns = [
         name="settings-email-preview",
     ),
     re_path(
-        r"^settings/federation", views.Federation.as_view(), name="settings-federation"
+        r"^settings/federation/?$",
+        views.Federation.as_view(),
+        name="settings-federation",
+    ),
+    re_path(
+        r"^settings/federation/(?P<server>\d+)/?$",
+        views.FederatedServer.as_view(),
+        name="settings-federated-server",
     ),
     re_path(
         r"^settings/invites/?$", views.ManageInvites.as_view(), name="settings-invites"
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 3439304f..94ac8f13 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -6,7 +6,7 @@ from .books import Book, EditBook, ConfirmEditBook, Editions
 from .books import upload_cover, add_description, switch_edition, resolve_book
 from .directory import Directory
 from .error import not_found_page, server_error_page
-from .federation import Federation
+from .federation import Federation, FederatedServer
 from .feed import DirectMessage, Feed, Replies, Status
 from .follow import follow, unfollow
 from .follow import accept_follow_request, delete_follow_request
diff --git a/bookwyrm/views/federation.py b/bookwyrm/views/federation.py
index e9c0466e..c7d7a2e7 100644
--- a/bookwyrm/views/federation.py
+++ b/bookwyrm/views/federation.py
@@ -1,5 +1,6 @@
 """ manage federated servers """
 from django.contrib.auth.decorators import login_required, permission_required
+from django.shortcuts import get_object_or_404
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
@@ -21,3 +22,28 @@ class Federation(View):
         servers = models.FederatedServer.objects.all()
         data = {"servers": servers}
         return TemplateResponse(request, "settings/federation.html", data)
+
+
+@method_decorator(login_required, name="dispatch")
+@method_decorator(
+    permission_required("bookwyrm.control_federation", raise_exception=True),
+    name="dispatch",
+)
+class FederatedServer(View):
+    """ views for handling a specific federated server """
+
+    def get(self, request, server):
+        """ load a server """
+        server = get_object_or_404(models.FederatedServer, id=server)
+        users = server.user_set
+        data = {
+            "server": server,
+            "users": users,
+            "reports": models.Report.objects.filter(user__in=users.all()),
+            "followed_by_us": users.filter(followers__local=True),
+            "followed_by_them": users.filter(following__local=True),
+            "blocked_by_us": models.UserBlocks.objects.filter(
+                user_subject__in=users.all()
+            ),
+        }
+        return TemplateResponse(request, "settings/federated_server.html", data)

From 62cbfe0fac3be7c50e1bdf89e17490dacac8fbaf Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Mar 2021 13:03:24 -0700
Subject: [PATCH 0482/1285] Filter reports by server

---
 bookwyrm/templates/moderation/reports.html    | 21 +++++++++++++++++--
 .../templates/settings/federated_server.html  |  2 +-
 bookwyrm/views/reports.py                     | 10 ++++++++-
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/moderation/reports.html b/bookwyrm/templates/moderation/reports.html
index ebf29a7a..f486711f 100644
--- a/bookwyrm/templates/moderation/reports.html
+++ b/bookwyrm/templates/moderation/reports.html
@@ -1,8 +1,21 @@
 {% extends 'settings/admin_layout.html' %}
 {% load i18n %}
 
-{% block title %}{% trans "Reports" %}{% endblock %}
-{% block header %}{% trans "Reports" %}{% endblock %}
+{% block title %}
+{% if server %}
+{% blocktrans with server_name=server.server_name %}Reports: {{ server_name }}{% endblocktrans %}
+{% else %}
+{% trans "Reports" %}
+{% endif %}
+{% endblock %}
+{% block header %}
+{% if server %}
+{% blocktrans with server_name=server.server_name %}Reports: <small>{{ server_name }}</small>{% endblocktrans %}
+<a href="{% url 'settings-reports' %}" class="help has-text-weight-normal">Clear filters</a>
+{% else %}
+{% trans "Reports" %}
+{% endif %}
+{% endblock %}
 
 {% block panel %}
 <div class="tabs">
@@ -17,6 +30,10 @@
 </div>
 
 <div class="block">
+    {% if not reports %}
+    <em>{% trans "No reports found." %}</em>
+    {% endif %}
+
     {% for report in reports %}
     <div class="block">
         {% include 'moderation/report_preview.html' with report=report %}
diff --git a/bookwyrm/templates/settings/federated_server.html b/bookwyrm/templates/settings/federated_server.html
index dfeb6b3a..7d65309b 100644
--- a/bookwyrm/templates/settings/federated_server.html
+++ b/bookwyrm/templates/settings/federated_server.html
@@ -40,7 +40,7 @@
             <dt>{% trans "Reports:" %}</dt>
             <dd>
                 {{ reports.count }}
-                {# {% if server.user_set.count %}(<a href="{% url 'settings-users' server=server.id %}">{% trans "View all users" %}</a>){% endif %} #}
+                {% if reports.count %}(<a href="{% url 'settings-reports' %}?server={{ server.id }}">{% trans "View all" %}</a>){% endif %}
             </dd>
         </div>
         <div class="is-flex">
diff --git a/bookwyrm/views/reports.py b/bookwyrm/views/reports.py
index 06909cf1..cb1a62ff 100644
--- a/bookwyrm/views/reports.py
+++ b/bookwyrm/views/reports.py
@@ -24,10 +24,18 @@ class Reports(View):
 
     def get(self, request):
         """ view current reports """
+        filters = {}
+
         resolved = request.GET.get("resolved") == "true"
+        server = request.GET.get("server")
+        if server:
+            server = get_object_or_404(models.FederatedServer, id=server)
+            filters["user__federated_server"] = server
+        filters["resolved"] = resolved
         data = {
             "resolved": resolved,
-            "reports": models.Report.objects.filter(resolved=resolved),
+            "server": server,
+            "reports": models.Report.objects.filter(**filters),
         }
         return TemplateResponse(request, "moderation/reports.html", data)
 

From 158d2c52315617792a4eb9fe00ea3e038abcebab Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Mar 2021 13:08:24 -0700
Subject: [PATCH 0483/1285] Paginates federated server list

---
 bookwyrm/templates/settings/federation.html |  1 +
 bookwyrm/views/federation.py                | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/settings/federation.html b/bookwyrm/templates/settings/federation.html
index 8c87eda2..cfcf4d9c 100644
--- a/bookwyrm/templates/settings/federation.html
+++ b/bookwyrm/templates/settings/federation.html
@@ -21,4 +21,5 @@
     {% endfor %}
 </table>
 
+{% include 'snippets/pagination.html' with page=servers path=request.path %}
 {% endblock %}
diff --git a/bookwyrm/views/federation.py b/bookwyrm/views/federation.py
index c7d7a2e7..92f590bc 100644
--- a/bookwyrm/views/federation.py
+++ b/bookwyrm/views/federation.py
@@ -1,11 +1,13 @@
 """ manage federated servers """
 from django.contrib.auth.decorators import login_required, permission_required
+from django.core.paginator import Paginator
 from django.shortcuts import get_object_or_404
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
 
 from bookwyrm import models
+from bookwyrm.settings import PAGE_LENGTH
 
 
 # pylint: disable= no-self-use
@@ -18,9 +20,15 @@ class Federation(View):
     """ what servers do we federate with """
 
     def get(self, request):
-        """ edit form """
+        """ list of servers """
+        try:
+            page = int(request.GET.get("page", 1))
+        except ValueError:
+            page = 1
+
         servers = models.FederatedServer.objects.all()
-        data = {"servers": servers}
+        paginated = Paginator(servers, PAGE_LENGTH)
+        data = {"servers": paginated.page(page)}
         return TemplateResponse(request, "settings/federation.html", data)
 
 

From 7373a7e8c4ba3426925457ad4d9dc4e4b5773ec5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Mar 2021 13:36:05 -0700
Subject: [PATCH 0484/1285] Sort federated servers list

---
 bookwyrm/templates/settings/federation.html      | 16 ++++++++++++++--
 .../templates/snippets/table-sort-header.html    | 13 +++++++++++++
 bookwyrm/views/federation.py                     |  8 +++++++-
 3 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 bookwyrm/templates/snippets/table-sort-header.html

diff --git a/bookwyrm/templates/settings/federation.html b/bookwyrm/templates/settings/federation.html
index cfcf4d9c..696d7a20 100644
--- a/bookwyrm/templates/settings/federation.html
+++ b/bookwyrm/templates/settings/federation.html
@@ -8,13 +8,25 @@
 
 <table class="table is-striped">
     <tr>
-        <th>{% trans "Server name" %}</th>
-        <th>{% trans "Software" %}</th>
+        {% url 'settings-federation' as url %}
+        <th>
+            {% trans "Server name" as text %}
+            {% include 'snippets/table-sort-header.html' with field="server_name" sort=sort text=text %}
+        </th>
+        <th>
+            {% trans "Date federated" 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 "Status" %}</th>
     </tr>
     {% for server in servers %}
     <tr>
         <td><a href="{% url 'settings-federated-server' server.id %}">{{ server.server_name }}</a></td>
+        <td>{{ server.created_date }}</td>
         <td>{{ server.application_type }} ({{ server.application_version }})</td>
         <td>{{ server.status }}</td>
     </tr>
diff --git a/bookwyrm/templates/snippets/table-sort-header.html b/bookwyrm/templates/snippets/table-sort-header.html
new file mode 100644
index 00000000..bb34591d
--- /dev/null
+++ b/bookwyrm/templates/snippets/table-sort-header.html
@@ -0,0 +1,13 @@
+{% load i18n %}
+<a href="{{ url }}?sort={% if sort == field %}-{% endif %}{{ field }}">
+    {{ text }}
+    {% if sort == field %}
+    <span class="icon icon-arrow-down">
+        <span class="is-sr-only">{% trans "Sorted asccending" %}</span>
+    </span>
+    {% elif sort == "-"|add:field %}
+    <span class="icon icon-arrow-up">
+        <span class="is-sr-only">{% trans "Sorted descending" %}</span>
+    </span>
+    {% endif %}
+</a>
diff --git a/bookwyrm/views/federation.py b/bookwyrm/views/federation.py
index 92f590bc..8a246e28 100644
--- a/bookwyrm/views/federation.py
+++ b/bookwyrm/views/federation.py
@@ -27,8 +27,14 @@ class Federation(View):
             page = 1
 
         servers = models.FederatedServer.objects.all()
+
+        sort = request.GET.get('sort')
+        sort_fields = ['created_date', 'application_type', 'server_name']
+        if sort in sort_fields + ["-{:s}".format(f) for f in sort_fields]:
+            servers = servers.order_by(sort)
+
         paginated = Paginator(servers, PAGE_LENGTH)
-        data = {"servers": paginated.page(page)}
+        data = {"servers": paginated.page(page), "sort": sort}
         return TemplateResponse(request, "settings/federation.html", data)
 
 

From 5416bb10fdafe0857f9a7ca36cac550e0191b968 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Mar 2021 13:41:25 -0700
Subject: [PATCH 0485/1285] Python formatting

---
 bookwyrm/views/federation.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/views/federation.py b/bookwyrm/views/federation.py
index 8a246e28..464a207c 100644
--- a/bookwyrm/views/federation.py
+++ b/bookwyrm/views/federation.py
@@ -28,8 +28,8 @@ class Federation(View):
 
         servers = models.FederatedServer.objects.all()
 
-        sort = request.GET.get('sort')
-        sort_fields = ['created_date', 'application_type', 'server_name']
+        sort = request.GET.get("sort")
+        sort_fields = ["created_date", "application_type", "server_name"]
         if sort in sort_fields + ["-{:s}".format(f) for f in sort_fields]:
             servers = servers.order_by(sort)
 

From 43fc940a07ead15cd05efb384d7a313310d73923 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Mar 2021 14:20:49 -0700
Subject: [PATCH 0486/1285] Adds user admin view

---
 bookwyrm/templates/settings/admin_layout.html |  4 ++
 bookwyrm/templates/settings/user_admin.html   | 52 +++++++++++++++++++
 .../templates/snippets/table-sort-header.html |  4 +-
 bookwyrm/urls.py                              |  1 +
 bookwyrm/views/__init__.py                    |  1 +
 bookwyrm/views/user_admin.py                  | 43 +++++++++++++++
 6 files changed, 103 insertions(+), 2 deletions(-)
 create mode 100644 bookwyrm/templates/settings/user_admin.html
 create mode 100644 bookwyrm/views/user_admin.py

diff --git a/bookwyrm/templates/settings/admin_layout.html b/bookwyrm/templates/settings/admin_layout.html
index cfc7a92a..9340da9e 100644
--- a/bookwyrm/templates/settings/admin_layout.html
+++ b/bookwyrm/templates/settings/admin_layout.html
@@ -14,6 +14,10 @@
         {% if perms.bookwyrm.create_invites %}
         <h2 class="menu-label">{% trans "Manage Users" %}</h2>
         <ul class="menu-list">
+            <li>
+                {% url 'settings-users' as url %}
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Users" %}</a>
+            </li>
             <li>
                 {% url 'settings-invite-requests' as url %}
                 {% url 'settings-invites' as alt_url %}
diff --git a/bookwyrm/templates/settings/user_admin.html b/bookwyrm/templates/settings/user_admin.html
new file mode 100644
index 00000000..eba7fbf7
--- /dev/null
+++ b/bookwyrm/templates/settings/user_admin.html
@@ -0,0 +1,52 @@
+{% extends 'settings/admin_layout.html' %}
+{% load i18n %}
+{% block title %}{% trans "Users" %}{% endblock %}
+
+{% block header %}{% trans "Users" %}{% endblock %}
+
+{% block panel %}
+
+<table class="table is-striped">
+    <tr>
+        {% url 'settings-users' as url %}
+        <th>
+            {% trans "Username" as text %}
+            {% include 'snippets/table-sort-header.html' with field="username" sort=sort text=text %}
+        </th>
+        <th>
+            {% trans "Date Added" as text %}
+            {% include 'snippets/table-sort-header.html' with field="created_date" sort=sort text=text %}
+        </th>
+        <th>
+            {% trans "Last Active" as text %}
+            {% include 'snippets/table-sort-header.html' with field="last_active_date" sort=sort text=text %}
+        </th>
+        <th>
+            {% trans "Status" as text %}
+            {% include 'snippets/table-sort-header.html' with field="is_active" sort=sort text=text %}
+        </th>
+        <th>
+            {% trans "Remote server" as text %}
+            {% include 'snippets/table-sort-header.html' with field="federated_server__server_name" sort=sort text=text %}
+        </th>
+    </tr>
+    {% for user in users %}
+    <tr>
+        <td>{{ user.username }}</td>
+        <td>{{ user.created_date }}</td>
+        <td>{{ user.last_active_date }}</td>
+        <td>{% if user.is_active %}{% trans "Active" %}{% else %}{% trans "Inactive" %}{% endif %}</td>
+        <td>
+            {% if user.federated_server %}
+            <a href="{% url 'settings-federated-server' user.federated_server.id %}">{{ user.federated_server.server_name }}</a>
+            {% elif not user.local %}
+            <em>{% trans "Not set" %}</em>
+            {% endif %}
+        </td>
+    </tr>
+    {% endfor %}
+</table>
+
+{% include 'snippets/pagination.html' with page=users path=request.path %}
+{% endblock %}
+
diff --git a/bookwyrm/templates/snippets/table-sort-header.html b/bookwyrm/templates/snippets/table-sort-header.html
index bb34591d..ae54f415 100644
--- a/bookwyrm/templates/snippets/table-sort-header.html
+++ b/bookwyrm/templates/snippets/table-sort-header.html
@@ -2,11 +2,11 @@
 <a href="{{ url }}?sort={% if sort == field %}-{% endif %}{{ field }}">
     {{ text }}
     {% if sort == field %}
-    <span class="icon icon-arrow-down">
+    <span class="icon icon-arrow-up">
         <span class="is-sr-only">{% trans "Sorted asccending" %}</span>
     </span>
     {% elif sort == "-"|add:field %}
-    <span class="icon icon-arrow-up">
+    <span class="icon icon-arrow-down">
         <span class="is-sr-only">{% trans "Sorted descending" %}</span>
     </span>
     {% endif %}
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index a0d8d007..a2250c48 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -54,6 +54,7 @@ urlpatterns = [
         views.site.email_preview,
         name="settings-email-preview",
     ),
+    re_path(r"^settings/users", views.UserAdmin.as_view(), name="settings-users"),
     re_path(
         r"^settings/federation/?$",
         views.Federation.as_view(),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 94ac8f13..6ec79c1c 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -35,4 +35,5 @@ from .status import CreateStatus, DeleteStatus
 from .tag import Tag, AddTag, RemoveTag
 from .updates import get_notification_count, get_unread_status_count
 from .user import User, EditUser, Followers, Following
+from .user_admin import UserAdmin
 from .wellknown import webfinger, nodeinfo_pointer, nodeinfo, instance_info, peers
diff --git a/bookwyrm/views/user_admin.py b/bookwyrm/views/user_admin.py
new file mode 100644
index 00000000..491b8150
--- /dev/null
+++ b/bookwyrm/views/user_admin.py
@@ -0,0 +1,43 @@
+""" manage user """
+from django.contrib.auth.decorators import login_required, permission_required
+from django.core.paginator import Paginator
+from django.template.response import TemplateResponse
+from django.utils.decorators import method_decorator
+from django.views import View
+
+from bookwyrm import models
+from bookwyrm.settings import PAGE_LENGTH
+
+
+# pylint: disable= no-self-use
+@method_decorator(login_required, name="dispatch")
+@method_decorator(
+    permission_required("bookwyrm.moderate_users", raise_exception=True),
+    name="dispatch",
+)
+class UserAdmin(View):
+    """ admin view of users on this server """
+
+    def get(self, request):
+        """ list of users """
+        try:
+            page = int(request.GET.get("page", 1))
+        except ValueError:
+            page = 1
+
+        users = models.User.objects.all()
+
+        sort = request.GET.get("sort", "-created_date")
+        sort_fields = [
+            "created_date",
+            "last_active_date",
+            "username",
+            "federated_server__server_name",
+            "is_active",
+        ]
+        if sort in sort_fields + ["-{:s}".format(f) for f in sort_fields]:
+            users = users.order_by(sort)
+
+        paginated = Paginator(users, PAGE_LENGTH)
+        data = {"users": paginated.page(page), "sort": sort}
+        return TemplateResponse(request, "settings/user_admin.html", data)

From f491f03ffa5dcedc7fda31c4785b659a645a84e7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Mar 2021 14:27:56 -0700
Subject: [PATCH 0487/1285] Adds filtering by server on users page

---
 bookwyrm/templates/settings/federated_server.html |  2 +-
 bookwyrm/templates/settings/user_admin.html       |  9 ++++++++-
 bookwyrm/views/user_admin.py                      | 11 +++++++++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/settings/federated_server.html b/bookwyrm/templates/settings/federated_server.html
index 7d65309b..13715bfb 100644
--- a/bookwyrm/templates/settings/federated_server.html
+++ b/bookwyrm/templates/settings/federated_server.html
@@ -33,7 +33,7 @@
             <dt>{% trans "Users:" %}</dt>
             <dd>
                 {{ users.count }}
-                {# {% if server.user_set.count %}(<a href="{% url 'settings-users' server=server.id %}">{% trans "View all users" %}</a>){% endif %} #}
+                {% if server.user_set.count %}(<a href="{% url 'settings-users' %}?server={{ server.id }}">{% trans "View all" %}</a>){% endif %}
             </dd>
         </div>
         <div class="is-flex">
diff --git a/bookwyrm/templates/settings/user_admin.html b/bookwyrm/templates/settings/user_admin.html
index eba7fbf7..bb0534e0 100644
--- a/bookwyrm/templates/settings/user_admin.html
+++ b/bookwyrm/templates/settings/user_admin.html
@@ -2,7 +2,14 @@
 {% load i18n %}
 {% block title %}{% trans "Users" %}{% endblock %}
 
-{% block header %}{% trans "Users" %}{% endblock %}
+{% block header %}
+{% if server %}
+{% blocktrans with server_name=server.server_name %}Users: <small>{{ server_name }}</small>{% endblocktrans %}
+<a href="{% url 'settings-users' %}" class="help has-text-weight-normal">Clear filters</a>
+{% else %}
+{% trans "Users" %}
+{% endif %}
+{% endblock %}
 
 {% block panel %}
 
diff --git a/bookwyrm/views/user_admin.py b/bookwyrm/views/user_admin.py
index 491b8150..a8c155a1 100644
--- a/bookwyrm/views/user_admin.py
+++ b/bookwyrm/views/user_admin.py
@@ -1,6 +1,7 @@
 """ manage user """
 from django.contrib.auth.decorators import login_required, permission_required
 from django.core.paginator import Paginator
+from django.shortcuts import get_object_or_404
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
@@ -25,7 +26,13 @@ class UserAdmin(View):
         except ValueError:
             page = 1
 
-        users = models.User.objects.all()
+        filters = {}
+        server = request.GET.get("server")
+        if server:
+            server = get_object_or_404(models.FederatedServer, id=server)
+            filters["federated_server"] = server
+
+        users = models.User.objects.filter(**filters).all()
 
         sort = request.GET.get("sort", "-created_date")
         sort_fields = [
@@ -39,5 +46,5 @@ class UserAdmin(View):
             users = users.order_by(sort)
 
         paginated = Paginator(users, PAGE_LENGTH)
-        data = {"users": paginated.page(page), "sort": sort}
+        data = {"users": paginated.page(page), "sort": sort, "server": server}
         return TemplateResponse(request, "settings/user_admin.html", data)

From 9a0568dabcacd72bdb2ef392e6768cd6ec03f8f6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Mar 2021 14:36:07 -0700
Subject: [PATCH 0488/1285] Adds tests for server and users admin views

---
 bookwyrm/tests/views/test_federation.py | 16 ++++++++++--
 bookwyrm/tests/views/test_user_admin.py | 33 +++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 2 deletions(-)
 create mode 100644 bookwyrm/tests/views/test_user_admin.py

diff --git a/bookwyrm/tests/views/test_federation.py b/bookwyrm/tests/views/test_federation.py
index d11d7415..a60ea432 100644
--- a/bookwyrm/tests/views/test_federation.py
+++ b/bookwyrm/tests/views/test_federation.py
@@ -3,8 +3,7 @@ from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
 
-from bookwyrm import models
-from bookwyrm import views
+from bookwyrm import models, views
 
 
 class FederationViews(TestCase):
@@ -32,3 +31,16 @@ class FederationViews(TestCase):
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
+
+    def test_server_page(self):
+        """ there are so many views, this just makes sure it LOADS """
+        server = models.FederatedServer.objects.create(server_name="hi.there.com")
+        view = views.FederatedServer.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+        request.user.is_superuser = True
+
+        result = view(request, server.id)
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
diff --git a/bookwyrm/tests/views/test_user_admin.py b/bookwyrm/tests/views/test_user_admin.py
new file mode 100644
index 00000000..dd20c1b6
--- /dev/null
+++ b/bookwyrm/tests/views/test_user_admin.py
@@ -0,0 +1,33 @@
+""" test for app action functionality """
+from django.template.response import TemplateResponse
+from django.test import TestCase
+from django.test.client import RequestFactory
+
+from bookwyrm import models, views
+
+
+class UserAdminViews(TestCase):
+    """ every response to a get request, html or json """
+
+    def setUp(self):
+        """ we need basic test data and mocks """
+        self.factory = RequestFactory()
+        self.local_user = models.User.objects.create_user(
+            "mouse@local.com",
+            "mouse@mouse.mouse",
+            "password",
+            local=True,
+            localname="mouse",
+        )
+        models.SiteSettings.objects.create()
+
+    def test_user_admin_page(self):
+        """ there are so many views, this just makes sure it LOADS """
+        view = views.UserAdmin.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+        request.user.is_superuser = True
+        result = view(request)
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)

From b0dc5f3f9359f714fbf2945d2963d0617dd4204c Mon Sep 17 00:00:00 2001
From: Pablo Barton <pablo.barton@gmail.com>
Date: Sun, 28 Mar 2021 18:51:40 -0400
Subject: [PATCH 0489/1285] 357 Users set preferred timezone, used for
 readthroughs

---
 bookwyrm/forms.py                             |   1 +
 .../0059_user_preferred_timezone.py           | 628 ++++++++++++++++++
 bookwyrm/models/user.py                       |   6 +
 bookwyrm/templates/preferences/edit_user.html |   4 +
 bookwyrm/templatetags/bookwyrm_tags.py        |   1 -
 bookwyrm/tests/views/test_user.py             |   2 +
 bookwyrm/views/reading.py                     |  18 +-
 locale/de_DE/LC_MESSAGES/django.mo            | Bin 26527 -> 26471 bytes
 locale/de_DE/LC_MESSAGES/django.po            | 611 +++++++++++++----
 locale/en_US/LC_MESSAGES/django.po            | 547 +++++++++++----
 locale/es/LC_MESSAGES/django.mo               | Bin 27175 -> 27102 bytes
 locale/es/LC_MESSAGES/django.po               | 611 +++++++++++++----
 locale/fr_FR/LC_MESSAGES/django.mo            | Bin 25205 -> 25097 bytes
 locale/fr_FR/LC_MESSAGES/django.po            | 607 +++++++++++++----
 locale/zh_CN/LC_MESSAGES/django.mo            | Bin 30507 -> 30138 bytes
 locale/zh_CN/LC_MESSAGES/django.po            | 608 +++++++++++++----
 requirements.txt                              |   1 +
 17 files changed, 3029 insertions(+), 616 deletions(-)
 create mode 100644 bookwyrm/migrations/0059_user_preferred_timezone.py

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 4e92b32e..c0f4a923 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -132,6 +132,7 @@ class EditUserForm(CustomForm):
             "show_goal",
             "manually_approves_followers",
             "discoverable",
+            "preferred_timezone",
         ]
         help_texts = {f: None for f in fields}
 
diff --git a/bookwyrm/migrations/0059_user_preferred_timezone.py b/bookwyrm/migrations/0059_user_preferred_timezone.py
new file mode 100644
index 00000000..122ec121
--- /dev/null
+++ b/bookwyrm/migrations/0059_user_preferred_timezone.py
@@ -0,0 +1,628 @@
+# Generated by Django 3.1.6 on 2021-03-28 21:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0058_auto_20210324_1536"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="preferred_timezone",
+            field=models.CharField(
+                choices=[
+                    ("Africa/Abidjan", "Africa/Abidjan"),
+                    ("Africa/Accra", "Africa/Accra"),
+                    ("Africa/Addis_Ababa", "Africa/Addis_Ababa"),
+                    ("Africa/Algiers", "Africa/Algiers"),
+                    ("Africa/Asmara", "Africa/Asmara"),
+                    ("Africa/Asmera", "Africa/Asmera"),
+                    ("Africa/Bamako", "Africa/Bamako"),
+                    ("Africa/Bangui", "Africa/Bangui"),
+                    ("Africa/Banjul", "Africa/Banjul"),
+                    ("Africa/Bissau", "Africa/Bissau"),
+                    ("Africa/Blantyre", "Africa/Blantyre"),
+                    ("Africa/Brazzaville", "Africa/Brazzaville"),
+                    ("Africa/Bujumbura", "Africa/Bujumbura"),
+                    ("Africa/Cairo", "Africa/Cairo"),
+                    ("Africa/Casablanca", "Africa/Casablanca"),
+                    ("Africa/Ceuta", "Africa/Ceuta"),
+                    ("Africa/Conakry", "Africa/Conakry"),
+                    ("Africa/Dakar", "Africa/Dakar"),
+                    ("Africa/Dar_es_Salaam", "Africa/Dar_es_Salaam"),
+                    ("Africa/Djibouti", "Africa/Djibouti"),
+                    ("Africa/Douala", "Africa/Douala"),
+                    ("Africa/El_Aaiun", "Africa/El_Aaiun"),
+                    ("Africa/Freetown", "Africa/Freetown"),
+                    ("Africa/Gaborone", "Africa/Gaborone"),
+                    ("Africa/Harare", "Africa/Harare"),
+                    ("Africa/Johannesburg", "Africa/Johannesburg"),
+                    ("Africa/Juba", "Africa/Juba"),
+                    ("Africa/Kampala", "Africa/Kampala"),
+                    ("Africa/Khartoum", "Africa/Khartoum"),
+                    ("Africa/Kigali", "Africa/Kigali"),
+                    ("Africa/Kinshasa", "Africa/Kinshasa"),
+                    ("Africa/Lagos", "Africa/Lagos"),
+                    ("Africa/Libreville", "Africa/Libreville"),
+                    ("Africa/Lome", "Africa/Lome"),
+                    ("Africa/Luanda", "Africa/Luanda"),
+                    ("Africa/Lubumbashi", "Africa/Lubumbashi"),
+                    ("Africa/Lusaka", "Africa/Lusaka"),
+                    ("Africa/Malabo", "Africa/Malabo"),
+                    ("Africa/Maputo", "Africa/Maputo"),
+                    ("Africa/Maseru", "Africa/Maseru"),
+                    ("Africa/Mbabane", "Africa/Mbabane"),
+                    ("Africa/Mogadishu", "Africa/Mogadishu"),
+                    ("Africa/Monrovia", "Africa/Monrovia"),
+                    ("Africa/Nairobi", "Africa/Nairobi"),
+                    ("Africa/Ndjamena", "Africa/Ndjamena"),
+                    ("Africa/Niamey", "Africa/Niamey"),
+                    ("Africa/Nouakchott", "Africa/Nouakchott"),
+                    ("Africa/Ouagadougou", "Africa/Ouagadougou"),
+                    ("Africa/Porto-Novo", "Africa/Porto-Novo"),
+                    ("Africa/Sao_Tome", "Africa/Sao_Tome"),
+                    ("Africa/Timbuktu", "Africa/Timbuktu"),
+                    ("Africa/Tripoli", "Africa/Tripoli"),
+                    ("Africa/Tunis", "Africa/Tunis"),
+                    ("Africa/Windhoek", "Africa/Windhoek"),
+                    ("America/Adak", "America/Adak"),
+                    ("America/Anchorage", "America/Anchorage"),
+                    ("America/Anguilla", "America/Anguilla"),
+                    ("America/Antigua", "America/Antigua"),
+                    ("America/Araguaina", "America/Araguaina"),
+                    (
+                        "America/Argentina/Buenos_Aires",
+                        "America/Argentina/Buenos_Aires",
+                    ),
+                    ("America/Argentina/Catamarca", "America/Argentina/Catamarca"),
+                    (
+                        "America/Argentina/ComodRivadavia",
+                        "America/Argentina/ComodRivadavia",
+                    ),
+                    ("America/Argentina/Cordoba", "America/Argentina/Cordoba"),
+                    ("America/Argentina/Jujuy", "America/Argentina/Jujuy"),
+                    ("America/Argentina/La_Rioja", "America/Argentina/La_Rioja"),
+                    ("America/Argentina/Mendoza", "America/Argentina/Mendoza"),
+                    (
+                        "America/Argentina/Rio_Gallegos",
+                        "America/Argentina/Rio_Gallegos",
+                    ),
+                    ("America/Argentina/Salta", "America/Argentina/Salta"),
+                    ("America/Argentina/San_Juan", "America/Argentina/San_Juan"),
+                    ("America/Argentina/San_Luis", "America/Argentina/San_Luis"),
+                    ("America/Argentina/Tucuman", "America/Argentina/Tucuman"),
+                    ("America/Argentina/Ushuaia", "America/Argentina/Ushuaia"),
+                    ("America/Aruba", "America/Aruba"),
+                    ("America/Asuncion", "America/Asuncion"),
+                    ("America/Atikokan", "America/Atikokan"),
+                    ("America/Atka", "America/Atka"),
+                    ("America/Bahia", "America/Bahia"),
+                    ("America/Bahia_Banderas", "America/Bahia_Banderas"),
+                    ("America/Barbados", "America/Barbados"),
+                    ("America/Belem", "America/Belem"),
+                    ("America/Belize", "America/Belize"),
+                    ("America/Blanc-Sablon", "America/Blanc-Sablon"),
+                    ("America/Boa_Vista", "America/Boa_Vista"),
+                    ("America/Bogota", "America/Bogota"),
+                    ("America/Boise", "America/Boise"),
+                    ("America/Buenos_Aires", "America/Buenos_Aires"),
+                    ("America/Cambridge_Bay", "America/Cambridge_Bay"),
+                    ("America/Campo_Grande", "America/Campo_Grande"),
+                    ("America/Cancun", "America/Cancun"),
+                    ("America/Caracas", "America/Caracas"),
+                    ("America/Catamarca", "America/Catamarca"),
+                    ("America/Cayenne", "America/Cayenne"),
+                    ("America/Cayman", "America/Cayman"),
+                    ("America/Chicago", "America/Chicago"),
+                    ("America/Chihuahua", "America/Chihuahua"),
+                    ("America/Coral_Harbour", "America/Coral_Harbour"),
+                    ("America/Cordoba", "America/Cordoba"),
+                    ("America/Costa_Rica", "America/Costa_Rica"),
+                    ("America/Creston", "America/Creston"),
+                    ("America/Cuiaba", "America/Cuiaba"),
+                    ("America/Curacao", "America/Curacao"),
+                    ("America/Danmarkshavn", "America/Danmarkshavn"),
+                    ("America/Dawson", "America/Dawson"),
+                    ("America/Dawson_Creek", "America/Dawson_Creek"),
+                    ("America/Denver", "America/Denver"),
+                    ("America/Detroit", "America/Detroit"),
+                    ("America/Dominica", "America/Dominica"),
+                    ("America/Edmonton", "America/Edmonton"),
+                    ("America/Eirunepe", "America/Eirunepe"),
+                    ("America/El_Salvador", "America/El_Salvador"),
+                    ("America/Ensenada", "America/Ensenada"),
+                    ("America/Fort_Nelson", "America/Fort_Nelson"),
+                    ("America/Fort_Wayne", "America/Fort_Wayne"),
+                    ("America/Fortaleza", "America/Fortaleza"),
+                    ("America/Glace_Bay", "America/Glace_Bay"),
+                    ("America/Godthab", "America/Godthab"),
+                    ("America/Goose_Bay", "America/Goose_Bay"),
+                    ("America/Grand_Turk", "America/Grand_Turk"),
+                    ("America/Grenada", "America/Grenada"),
+                    ("America/Guadeloupe", "America/Guadeloupe"),
+                    ("America/Guatemala", "America/Guatemala"),
+                    ("America/Guayaquil", "America/Guayaquil"),
+                    ("America/Guyana", "America/Guyana"),
+                    ("America/Halifax", "America/Halifax"),
+                    ("America/Havana", "America/Havana"),
+                    ("America/Hermosillo", "America/Hermosillo"),
+                    ("America/Indiana/Indianapolis", "America/Indiana/Indianapolis"),
+                    ("America/Indiana/Knox", "America/Indiana/Knox"),
+                    ("America/Indiana/Marengo", "America/Indiana/Marengo"),
+                    ("America/Indiana/Petersburg", "America/Indiana/Petersburg"),
+                    ("America/Indiana/Tell_City", "America/Indiana/Tell_City"),
+                    ("America/Indiana/Vevay", "America/Indiana/Vevay"),
+                    ("America/Indiana/Vincennes", "America/Indiana/Vincennes"),
+                    ("America/Indiana/Winamac", "America/Indiana/Winamac"),
+                    ("America/Indianapolis", "America/Indianapolis"),
+                    ("America/Inuvik", "America/Inuvik"),
+                    ("America/Iqaluit", "America/Iqaluit"),
+                    ("America/Jamaica", "America/Jamaica"),
+                    ("America/Jujuy", "America/Jujuy"),
+                    ("America/Juneau", "America/Juneau"),
+                    ("America/Kentucky/Louisville", "America/Kentucky/Louisville"),
+                    ("America/Kentucky/Monticello", "America/Kentucky/Monticello"),
+                    ("America/Knox_IN", "America/Knox_IN"),
+                    ("America/Kralendijk", "America/Kralendijk"),
+                    ("America/La_Paz", "America/La_Paz"),
+                    ("America/Lima", "America/Lima"),
+                    ("America/Los_Angeles", "America/Los_Angeles"),
+                    ("America/Louisville", "America/Louisville"),
+                    ("America/Lower_Princes", "America/Lower_Princes"),
+                    ("America/Maceio", "America/Maceio"),
+                    ("America/Managua", "America/Managua"),
+                    ("America/Manaus", "America/Manaus"),
+                    ("America/Marigot", "America/Marigot"),
+                    ("America/Martinique", "America/Martinique"),
+                    ("America/Matamoros", "America/Matamoros"),
+                    ("America/Mazatlan", "America/Mazatlan"),
+                    ("America/Mendoza", "America/Mendoza"),
+                    ("America/Menominee", "America/Menominee"),
+                    ("America/Merida", "America/Merida"),
+                    ("America/Metlakatla", "America/Metlakatla"),
+                    ("America/Mexico_City", "America/Mexico_City"),
+                    ("America/Miquelon", "America/Miquelon"),
+                    ("America/Moncton", "America/Moncton"),
+                    ("America/Monterrey", "America/Monterrey"),
+                    ("America/Montevideo", "America/Montevideo"),
+                    ("America/Montreal", "America/Montreal"),
+                    ("America/Montserrat", "America/Montserrat"),
+                    ("America/Nassau", "America/Nassau"),
+                    ("America/New_York", "America/New_York"),
+                    ("America/Nipigon", "America/Nipigon"),
+                    ("America/Nome", "America/Nome"),
+                    ("America/Noronha", "America/Noronha"),
+                    ("America/North_Dakota/Beulah", "America/North_Dakota/Beulah"),
+                    ("America/North_Dakota/Center", "America/North_Dakota/Center"),
+                    (
+                        "America/North_Dakota/New_Salem",
+                        "America/North_Dakota/New_Salem",
+                    ),
+                    ("America/Nuuk", "America/Nuuk"),
+                    ("America/Ojinaga", "America/Ojinaga"),
+                    ("America/Panama", "America/Panama"),
+                    ("America/Pangnirtung", "America/Pangnirtung"),
+                    ("America/Paramaribo", "America/Paramaribo"),
+                    ("America/Phoenix", "America/Phoenix"),
+                    ("America/Port-au-Prince", "America/Port-au-Prince"),
+                    ("America/Port_of_Spain", "America/Port_of_Spain"),
+                    ("America/Porto_Acre", "America/Porto_Acre"),
+                    ("America/Porto_Velho", "America/Porto_Velho"),
+                    ("America/Puerto_Rico", "America/Puerto_Rico"),
+                    ("America/Punta_Arenas", "America/Punta_Arenas"),
+                    ("America/Rainy_River", "America/Rainy_River"),
+                    ("America/Rankin_Inlet", "America/Rankin_Inlet"),
+                    ("America/Recife", "America/Recife"),
+                    ("America/Regina", "America/Regina"),
+                    ("America/Resolute", "America/Resolute"),
+                    ("America/Rio_Branco", "America/Rio_Branco"),
+                    ("America/Rosario", "America/Rosario"),
+                    ("America/Santa_Isabel", "America/Santa_Isabel"),
+                    ("America/Santarem", "America/Santarem"),
+                    ("America/Santiago", "America/Santiago"),
+                    ("America/Santo_Domingo", "America/Santo_Domingo"),
+                    ("America/Sao_Paulo", "America/Sao_Paulo"),
+                    ("America/Scoresbysund", "America/Scoresbysund"),
+                    ("America/Shiprock", "America/Shiprock"),
+                    ("America/Sitka", "America/Sitka"),
+                    ("America/St_Barthelemy", "America/St_Barthelemy"),
+                    ("America/St_Johns", "America/St_Johns"),
+                    ("America/St_Kitts", "America/St_Kitts"),
+                    ("America/St_Lucia", "America/St_Lucia"),
+                    ("America/St_Thomas", "America/St_Thomas"),
+                    ("America/St_Vincent", "America/St_Vincent"),
+                    ("America/Swift_Current", "America/Swift_Current"),
+                    ("America/Tegucigalpa", "America/Tegucigalpa"),
+                    ("America/Thule", "America/Thule"),
+                    ("America/Thunder_Bay", "America/Thunder_Bay"),
+                    ("America/Tijuana", "America/Tijuana"),
+                    ("America/Toronto", "America/Toronto"),
+                    ("America/Tortola", "America/Tortola"),
+                    ("America/Vancouver", "America/Vancouver"),
+                    ("America/Virgin", "America/Virgin"),
+                    ("America/Whitehorse", "America/Whitehorse"),
+                    ("America/Winnipeg", "America/Winnipeg"),
+                    ("America/Yakutat", "America/Yakutat"),
+                    ("America/Yellowknife", "America/Yellowknife"),
+                    ("Antarctica/Casey", "Antarctica/Casey"),
+                    ("Antarctica/Davis", "Antarctica/Davis"),
+                    ("Antarctica/DumontDUrville", "Antarctica/DumontDUrville"),
+                    ("Antarctica/Macquarie", "Antarctica/Macquarie"),
+                    ("Antarctica/Mawson", "Antarctica/Mawson"),
+                    ("Antarctica/McMurdo", "Antarctica/McMurdo"),
+                    ("Antarctica/Palmer", "Antarctica/Palmer"),
+                    ("Antarctica/Rothera", "Antarctica/Rothera"),
+                    ("Antarctica/South_Pole", "Antarctica/South_Pole"),
+                    ("Antarctica/Syowa", "Antarctica/Syowa"),
+                    ("Antarctica/Troll", "Antarctica/Troll"),
+                    ("Antarctica/Vostok", "Antarctica/Vostok"),
+                    ("Arctic/Longyearbyen", "Arctic/Longyearbyen"),
+                    ("Asia/Aden", "Asia/Aden"),
+                    ("Asia/Almaty", "Asia/Almaty"),
+                    ("Asia/Amman", "Asia/Amman"),
+                    ("Asia/Anadyr", "Asia/Anadyr"),
+                    ("Asia/Aqtau", "Asia/Aqtau"),
+                    ("Asia/Aqtobe", "Asia/Aqtobe"),
+                    ("Asia/Ashgabat", "Asia/Ashgabat"),
+                    ("Asia/Ashkhabad", "Asia/Ashkhabad"),
+                    ("Asia/Atyrau", "Asia/Atyrau"),
+                    ("Asia/Baghdad", "Asia/Baghdad"),
+                    ("Asia/Bahrain", "Asia/Bahrain"),
+                    ("Asia/Baku", "Asia/Baku"),
+                    ("Asia/Bangkok", "Asia/Bangkok"),
+                    ("Asia/Barnaul", "Asia/Barnaul"),
+                    ("Asia/Beirut", "Asia/Beirut"),
+                    ("Asia/Bishkek", "Asia/Bishkek"),
+                    ("Asia/Brunei", "Asia/Brunei"),
+                    ("Asia/Calcutta", "Asia/Calcutta"),
+                    ("Asia/Chita", "Asia/Chita"),
+                    ("Asia/Choibalsan", "Asia/Choibalsan"),
+                    ("Asia/Chongqing", "Asia/Chongqing"),
+                    ("Asia/Chungking", "Asia/Chungking"),
+                    ("Asia/Colombo", "Asia/Colombo"),
+                    ("Asia/Dacca", "Asia/Dacca"),
+                    ("Asia/Damascus", "Asia/Damascus"),
+                    ("Asia/Dhaka", "Asia/Dhaka"),
+                    ("Asia/Dili", "Asia/Dili"),
+                    ("Asia/Dubai", "Asia/Dubai"),
+                    ("Asia/Dushanbe", "Asia/Dushanbe"),
+                    ("Asia/Famagusta", "Asia/Famagusta"),
+                    ("Asia/Gaza", "Asia/Gaza"),
+                    ("Asia/Harbin", "Asia/Harbin"),
+                    ("Asia/Hebron", "Asia/Hebron"),
+                    ("Asia/Ho_Chi_Minh", "Asia/Ho_Chi_Minh"),
+                    ("Asia/Hong_Kong", "Asia/Hong_Kong"),
+                    ("Asia/Hovd", "Asia/Hovd"),
+                    ("Asia/Irkutsk", "Asia/Irkutsk"),
+                    ("Asia/Istanbul", "Asia/Istanbul"),
+                    ("Asia/Jakarta", "Asia/Jakarta"),
+                    ("Asia/Jayapura", "Asia/Jayapura"),
+                    ("Asia/Jerusalem", "Asia/Jerusalem"),
+                    ("Asia/Kabul", "Asia/Kabul"),
+                    ("Asia/Kamchatka", "Asia/Kamchatka"),
+                    ("Asia/Karachi", "Asia/Karachi"),
+                    ("Asia/Kashgar", "Asia/Kashgar"),
+                    ("Asia/Kathmandu", "Asia/Kathmandu"),
+                    ("Asia/Katmandu", "Asia/Katmandu"),
+                    ("Asia/Khandyga", "Asia/Khandyga"),
+                    ("Asia/Kolkata", "Asia/Kolkata"),
+                    ("Asia/Krasnoyarsk", "Asia/Krasnoyarsk"),
+                    ("Asia/Kuala_Lumpur", "Asia/Kuala_Lumpur"),
+                    ("Asia/Kuching", "Asia/Kuching"),
+                    ("Asia/Kuwait", "Asia/Kuwait"),
+                    ("Asia/Macao", "Asia/Macao"),
+                    ("Asia/Macau", "Asia/Macau"),
+                    ("Asia/Magadan", "Asia/Magadan"),
+                    ("Asia/Makassar", "Asia/Makassar"),
+                    ("Asia/Manila", "Asia/Manila"),
+                    ("Asia/Muscat", "Asia/Muscat"),
+                    ("Asia/Nicosia", "Asia/Nicosia"),
+                    ("Asia/Novokuznetsk", "Asia/Novokuznetsk"),
+                    ("Asia/Novosibirsk", "Asia/Novosibirsk"),
+                    ("Asia/Omsk", "Asia/Omsk"),
+                    ("Asia/Oral", "Asia/Oral"),
+                    ("Asia/Phnom_Penh", "Asia/Phnom_Penh"),
+                    ("Asia/Pontianak", "Asia/Pontianak"),
+                    ("Asia/Pyongyang", "Asia/Pyongyang"),
+                    ("Asia/Qatar", "Asia/Qatar"),
+                    ("Asia/Qostanay", "Asia/Qostanay"),
+                    ("Asia/Qyzylorda", "Asia/Qyzylorda"),
+                    ("Asia/Rangoon", "Asia/Rangoon"),
+                    ("Asia/Riyadh", "Asia/Riyadh"),
+                    ("Asia/Saigon", "Asia/Saigon"),
+                    ("Asia/Sakhalin", "Asia/Sakhalin"),
+                    ("Asia/Samarkand", "Asia/Samarkand"),
+                    ("Asia/Seoul", "Asia/Seoul"),
+                    ("Asia/Shanghai", "Asia/Shanghai"),
+                    ("Asia/Singapore", "Asia/Singapore"),
+                    ("Asia/Srednekolymsk", "Asia/Srednekolymsk"),
+                    ("Asia/Taipei", "Asia/Taipei"),
+                    ("Asia/Tashkent", "Asia/Tashkent"),
+                    ("Asia/Tbilisi", "Asia/Tbilisi"),
+                    ("Asia/Tehran", "Asia/Tehran"),
+                    ("Asia/Tel_Aviv", "Asia/Tel_Aviv"),
+                    ("Asia/Thimbu", "Asia/Thimbu"),
+                    ("Asia/Thimphu", "Asia/Thimphu"),
+                    ("Asia/Tokyo", "Asia/Tokyo"),
+                    ("Asia/Tomsk", "Asia/Tomsk"),
+                    ("Asia/Ujung_Pandang", "Asia/Ujung_Pandang"),
+                    ("Asia/Ulaanbaatar", "Asia/Ulaanbaatar"),
+                    ("Asia/Ulan_Bator", "Asia/Ulan_Bator"),
+                    ("Asia/Urumqi", "Asia/Urumqi"),
+                    ("Asia/Ust-Nera", "Asia/Ust-Nera"),
+                    ("Asia/Vientiane", "Asia/Vientiane"),
+                    ("Asia/Vladivostok", "Asia/Vladivostok"),
+                    ("Asia/Yakutsk", "Asia/Yakutsk"),
+                    ("Asia/Yangon", "Asia/Yangon"),
+                    ("Asia/Yekaterinburg", "Asia/Yekaterinburg"),
+                    ("Asia/Yerevan", "Asia/Yerevan"),
+                    ("Atlantic/Azores", "Atlantic/Azores"),
+                    ("Atlantic/Bermuda", "Atlantic/Bermuda"),
+                    ("Atlantic/Canary", "Atlantic/Canary"),
+                    ("Atlantic/Cape_Verde", "Atlantic/Cape_Verde"),
+                    ("Atlantic/Faeroe", "Atlantic/Faeroe"),
+                    ("Atlantic/Faroe", "Atlantic/Faroe"),
+                    ("Atlantic/Jan_Mayen", "Atlantic/Jan_Mayen"),
+                    ("Atlantic/Madeira", "Atlantic/Madeira"),
+                    ("Atlantic/Reykjavik", "Atlantic/Reykjavik"),
+                    ("Atlantic/South_Georgia", "Atlantic/South_Georgia"),
+                    ("Atlantic/St_Helena", "Atlantic/St_Helena"),
+                    ("Atlantic/Stanley", "Atlantic/Stanley"),
+                    ("Australia/ACT", "Australia/ACT"),
+                    ("Australia/Adelaide", "Australia/Adelaide"),
+                    ("Australia/Brisbane", "Australia/Brisbane"),
+                    ("Australia/Broken_Hill", "Australia/Broken_Hill"),
+                    ("Australia/Canberra", "Australia/Canberra"),
+                    ("Australia/Currie", "Australia/Currie"),
+                    ("Australia/Darwin", "Australia/Darwin"),
+                    ("Australia/Eucla", "Australia/Eucla"),
+                    ("Australia/Hobart", "Australia/Hobart"),
+                    ("Australia/LHI", "Australia/LHI"),
+                    ("Australia/Lindeman", "Australia/Lindeman"),
+                    ("Australia/Lord_Howe", "Australia/Lord_Howe"),
+                    ("Australia/Melbourne", "Australia/Melbourne"),
+                    ("Australia/NSW", "Australia/NSW"),
+                    ("Australia/North", "Australia/North"),
+                    ("Australia/Perth", "Australia/Perth"),
+                    ("Australia/Queensland", "Australia/Queensland"),
+                    ("Australia/South", "Australia/South"),
+                    ("Australia/Sydney", "Australia/Sydney"),
+                    ("Australia/Tasmania", "Australia/Tasmania"),
+                    ("Australia/Victoria", "Australia/Victoria"),
+                    ("Australia/West", "Australia/West"),
+                    ("Australia/Yancowinna", "Australia/Yancowinna"),
+                    ("Brazil/Acre", "Brazil/Acre"),
+                    ("Brazil/DeNoronha", "Brazil/DeNoronha"),
+                    ("Brazil/East", "Brazil/East"),
+                    ("Brazil/West", "Brazil/West"),
+                    ("CET", "CET"),
+                    ("CST6CDT", "CST6CDT"),
+                    ("Canada/Atlantic", "Canada/Atlantic"),
+                    ("Canada/Central", "Canada/Central"),
+                    ("Canada/Eastern", "Canada/Eastern"),
+                    ("Canada/Mountain", "Canada/Mountain"),
+                    ("Canada/Newfoundland", "Canada/Newfoundland"),
+                    ("Canada/Pacific", "Canada/Pacific"),
+                    ("Canada/Saskatchewan", "Canada/Saskatchewan"),
+                    ("Canada/Yukon", "Canada/Yukon"),
+                    ("Chile/Continental", "Chile/Continental"),
+                    ("Chile/EasterIsland", "Chile/EasterIsland"),
+                    ("Cuba", "Cuba"),
+                    ("EET", "EET"),
+                    ("EST", "EST"),
+                    ("EST5EDT", "EST5EDT"),
+                    ("Egypt", "Egypt"),
+                    ("Eire", "Eire"),
+                    ("Etc/GMT", "Etc/GMT"),
+                    ("Etc/GMT+0", "Etc/GMT+0"),
+                    ("Etc/GMT+1", "Etc/GMT+1"),
+                    ("Etc/GMT+10", "Etc/GMT+10"),
+                    ("Etc/GMT+11", "Etc/GMT+11"),
+                    ("Etc/GMT+12", "Etc/GMT+12"),
+                    ("Etc/GMT+2", "Etc/GMT+2"),
+                    ("Etc/GMT+3", "Etc/GMT+3"),
+                    ("Etc/GMT+4", "Etc/GMT+4"),
+                    ("Etc/GMT+5", "Etc/GMT+5"),
+                    ("Etc/GMT+6", "Etc/GMT+6"),
+                    ("Etc/GMT+7", "Etc/GMT+7"),
+                    ("Etc/GMT+8", "Etc/GMT+8"),
+                    ("Etc/GMT+9", "Etc/GMT+9"),
+                    ("Etc/GMT-0", "Etc/GMT-0"),
+                    ("Etc/GMT-1", "Etc/GMT-1"),
+                    ("Etc/GMT-10", "Etc/GMT-10"),
+                    ("Etc/GMT-11", "Etc/GMT-11"),
+                    ("Etc/GMT-12", "Etc/GMT-12"),
+                    ("Etc/GMT-13", "Etc/GMT-13"),
+                    ("Etc/GMT-14", "Etc/GMT-14"),
+                    ("Etc/GMT-2", "Etc/GMT-2"),
+                    ("Etc/GMT-3", "Etc/GMT-3"),
+                    ("Etc/GMT-4", "Etc/GMT-4"),
+                    ("Etc/GMT-5", "Etc/GMT-5"),
+                    ("Etc/GMT-6", "Etc/GMT-6"),
+                    ("Etc/GMT-7", "Etc/GMT-7"),
+                    ("Etc/GMT-8", "Etc/GMT-8"),
+                    ("Etc/GMT-9", "Etc/GMT-9"),
+                    ("Etc/GMT0", "Etc/GMT0"),
+                    ("Etc/Greenwich", "Etc/Greenwich"),
+                    ("Etc/UCT", "Etc/UCT"),
+                    ("Etc/UTC", "Etc/UTC"),
+                    ("Etc/Universal", "Etc/Universal"),
+                    ("Etc/Zulu", "Etc/Zulu"),
+                    ("Europe/Amsterdam", "Europe/Amsterdam"),
+                    ("Europe/Andorra", "Europe/Andorra"),
+                    ("Europe/Astrakhan", "Europe/Astrakhan"),
+                    ("Europe/Athens", "Europe/Athens"),
+                    ("Europe/Belfast", "Europe/Belfast"),
+                    ("Europe/Belgrade", "Europe/Belgrade"),
+                    ("Europe/Berlin", "Europe/Berlin"),
+                    ("Europe/Bratislava", "Europe/Bratislava"),
+                    ("Europe/Brussels", "Europe/Brussels"),
+                    ("Europe/Bucharest", "Europe/Bucharest"),
+                    ("Europe/Budapest", "Europe/Budapest"),
+                    ("Europe/Busingen", "Europe/Busingen"),
+                    ("Europe/Chisinau", "Europe/Chisinau"),
+                    ("Europe/Copenhagen", "Europe/Copenhagen"),
+                    ("Europe/Dublin", "Europe/Dublin"),
+                    ("Europe/Gibraltar", "Europe/Gibraltar"),
+                    ("Europe/Guernsey", "Europe/Guernsey"),
+                    ("Europe/Helsinki", "Europe/Helsinki"),
+                    ("Europe/Isle_of_Man", "Europe/Isle_of_Man"),
+                    ("Europe/Istanbul", "Europe/Istanbul"),
+                    ("Europe/Jersey", "Europe/Jersey"),
+                    ("Europe/Kaliningrad", "Europe/Kaliningrad"),
+                    ("Europe/Kiev", "Europe/Kiev"),
+                    ("Europe/Kirov", "Europe/Kirov"),
+                    ("Europe/Lisbon", "Europe/Lisbon"),
+                    ("Europe/Ljubljana", "Europe/Ljubljana"),
+                    ("Europe/London", "Europe/London"),
+                    ("Europe/Luxembourg", "Europe/Luxembourg"),
+                    ("Europe/Madrid", "Europe/Madrid"),
+                    ("Europe/Malta", "Europe/Malta"),
+                    ("Europe/Mariehamn", "Europe/Mariehamn"),
+                    ("Europe/Minsk", "Europe/Minsk"),
+                    ("Europe/Monaco", "Europe/Monaco"),
+                    ("Europe/Moscow", "Europe/Moscow"),
+                    ("Europe/Nicosia", "Europe/Nicosia"),
+                    ("Europe/Oslo", "Europe/Oslo"),
+                    ("Europe/Paris", "Europe/Paris"),
+                    ("Europe/Podgorica", "Europe/Podgorica"),
+                    ("Europe/Prague", "Europe/Prague"),
+                    ("Europe/Riga", "Europe/Riga"),
+                    ("Europe/Rome", "Europe/Rome"),
+                    ("Europe/Samara", "Europe/Samara"),
+                    ("Europe/San_Marino", "Europe/San_Marino"),
+                    ("Europe/Sarajevo", "Europe/Sarajevo"),
+                    ("Europe/Saratov", "Europe/Saratov"),
+                    ("Europe/Simferopol", "Europe/Simferopol"),
+                    ("Europe/Skopje", "Europe/Skopje"),
+                    ("Europe/Sofia", "Europe/Sofia"),
+                    ("Europe/Stockholm", "Europe/Stockholm"),
+                    ("Europe/Tallinn", "Europe/Tallinn"),
+                    ("Europe/Tirane", "Europe/Tirane"),
+                    ("Europe/Tiraspol", "Europe/Tiraspol"),
+                    ("Europe/Ulyanovsk", "Europe/Ulyanovsk"),
+                    ("Europe/Uzhgorod", "Europe/Uzhgorod"),
+                    ("Europe/Vaduz", "Europe/Vaduz"),
+                    ("Europe/Vatican", "Europe/Vatican"),
+                    ("Europe/Vienna", "Europe/Vienna"),
+                    ("Europe/Vilnius", "Europe/Vilnius"),
+                    ("Europe/Volgograd", "Europe/Volgograd"),
+                    ("Europe/Warsaw", "Europe/Warsaw"),
+                    ("Europe/Zagreb", "Europe/Zagreb"),
+                    ("Europe/Zaporozhye", "Europe/Zaporozhye"),
+                    ("Europe/Zurich", "Europe/Zurich"),
+                    ("GB", "GB"),
+                    ("GB-Eire", "GB-Eire"),
+                    ("GMT", "GMT"),
+                    ("GMT+0", "GMT+0"),
+                    ("GMT-0", "GMT-0"),
+                    ("GMT0", "GMT0"),
+                    ("Greenwich", "Greenwich"),
+                    ("HST", "HST"),
+                    ("Hongkong", "Hongkong"),
+                    ("Iceland", "Iceland"),
+                    ("Indian/Antananarivo", "Indian/Antananarivo"),
+                    ("Indian/Chagos", "Indian/Chagos"),
+                    ("Indian/Christmas", "Indian/Christmas"),
+                    ("Indian/Cocos", "Indian/Cocos"),
+                    ("Indian/Comoro", "Indian/Comoro"),
+                    ("Indian/Kerguelen", "Indian/Kerguelen"),
+                    ("Indian/Mahe", "Indian/Mahe"),
+                    ("Indian/Maldives", "Indian/Maldives"),
+                    ("Indian/Mauritius", "Indian/Mauritius"),
+                    ("Indian/Mayotte", "Indian/Mayotte"),
+                    ("Indian/Reunion", "Indian/Reunion"),
+                    ("Iran", "Iran"),
+                    ("Israel", "Israel"),
+                    ("Jamaica", "Jamaica"),
+                    ("Japan", "Japan"),
+                    ("Kwajalein", "Kwajalein"),
+                    ("Libya", "Libya"),
+                    ("MET", "MET"),
+                    ("MST", "MST"),
+                    ("MST7MDT", "MST7MDT"),
+                    ("Mexico/BajaNorte", "Mexico/BajaNorte"),
+                    ("Mexico/BajaSur", "Mexico/BajaSur"),
+                    ("Mexico/General", "Mexico/General"),
+                    ("NZ", "NZ"),
+                    ("NZ-CHAT", "NZ-CHAT"),
+                    ("Navajo", "Navajo"),
+                    ("PRC", "PRC"),
+                    ("PST8PDT", "PST8PDT"),
+                    ("Pacific/Apia", "Pacific/Apia"),
+                    ("Pacific/Auckland", "Pacific/Auckland"),
+                    ("Pacific/Bougainville", "Pacific/Bougainville"),
+                    ("Pacific/Chatham", "Pacific/Chatham"),
+                    ("Pacific/Chuuk", "Pacific/Chuuk"),
+                    ("Pacific/Easter", "Pacific/Easter"),
+                    ("Pacific/Efate", "Pacific/Efate"),
+                    ("Pacific/Enderbury", "Pacific/Enderbury"),
+                    ("Pacific/Fakaofo", "Pacific/Fakaofo"),
+                    ("Pacific/Fiji", "Pacific/Fiji"),
+                    ("Pacific/Funafuti", "Pacific/Funafuti"),
+                    ("Pacific/Galapagos", "Pacific/Galapagos"),
+                    ("Pacific/Gambier", "Pacific/Gambier"),
+                    ("Pacific/Guadalcanal", "Pacific/Guadalcanal"),
+                    ("Pacific/Guam", "Pacific/Guam"),
+                    ("Pacific/Honolulu", "Pacific/Honolulu"),
+                    ("Pacific/Johnston", "Pacific/Johnston"),
+                    ("Pacific/Kiritimati", "Pacific/Kiritimati"),
+                    ("Pacific/Kosrae", "Pacific/Kosrae"),
+                    ("Pacific/Kwajalein", "Pacific/Kwajalein"),
+                    ("Pacific/Majuro", "Pacific/Majuro"),
+                    ("Pacific/Marquesas", "Pacific/Marquesas"),
+                    ("Pacific/Midway", "Pacific/Midway"),
+                    ("Pacific/Nauru", "Pacific/Nauru"),
+                    ("Pacific/Niue", "Pacific/Niue"),
+                    ("Pacific/Norfolk", "Pacific/Norfolk"),
+                    ("Pacific/Noumea", "Pacific/Noumea"),
+                    ("Pacific/Pago_Pago", "Pacific/Pago_Pago"),
+                    ("Pacific/Palau", "Pacific/Palau"),
+                    ("Pacific/Pitcairn", "Pacific/Pitcairn"),
+                    ("Pacific/Pohnpei", "Pacific/Pohnpei"),
+                    ("Pacific/Ponape", "Pacific/Ponape"),
+                    ("Pacific/Port_Moresby", "Pacific/Port_Moresby"),
+                    ("Pacific/Rarotonga", "Pacific/Rarotonga"),
+                    ("Pacific/Saipan", "Pacific/Saipan"),
+                    ("Pacific/Samoa", "Pacific/Samoa"),
+                    ("Pacific/Tahiti", "Pacific/Tahiti"),
+                    ("Pacific/Tarawa", "Pacific/Tarawa"),
+                    ("Pacific/Tongatapu", "Pacific/Tongatapu"),
+                    ("Pacific/Truk", "Pacific/Truk"),
+                    ("Pacific/Wake", "Pacific/Wake"),
+                    ("Pacific/Wallis", "Pacific/Wallis"),
+                    ("Pacific/Yap", "Pacific/Yap"),
+                    ("Poland", "Poland"),
+                    ("Portugal", "Portugal"),
+                    ("ROC", "ROC"),
+                    ("ROK", "ROK"),
+                    ("Singapore", "Singapore"),
+                    ("Turkey", "Turkey"),
+                    ("UCT", "UCT"),
+                    ("US/Alaska", "US/Alaska"),
+                    ("US/Aleutian", "US/Aleutian"),
+                    ("US/Arizona", "US/Arizona"),
+                    ("US/Central", "US/Central"),
+                    ("US/East-Indiana", "US/East-Indiana"),
+                    ("US/Eastern", "US/Eastern"),
+                    ("US/Hawaii", "US/Hawaii"),
+                    ("US/Indiana-Starke", "US/Indiana-Starke"),
+                    ("US/Michigan", "US/Michigan"),
+                    ("US/Mountain", "US/Mountain"),
+                    ("US/Pacific", "US/Pacific"),
+                    ("US/Samoa", "US/Samoa"),
+                    ("UTC", "UTC"),
+                    ("Universal", "Universal"),
+                    ("W-SU", "W-SU"),
+                    ("WET", "WET"),
+                    ("Zulu", "Zulu"),
+                ],
+                default="UTC",
+                max_length=255,
+            ),
+        ),
+    ]
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index c2a74c63..5ef0934c 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -7,6 +7,7 @@ from django.contrib.auth.models import AbstractUser, Group
 from django.core.validators import MinValueValidator
 from django.db import models
 from django.utils import timezone
+import pytz
 
 from bookwyrm import activitypub
 from bookwyrm.connectors import get_data, ConnectorException
@@ -104,6 +105,11 @@ class User(OrderedCollectionPageMixin, AbstractUser):
     manually_approves_followers = fields.BooleanField(default=False)
     show_goal = models.BooleanField(default=True)
     discoverable = fields.BooleanField(default=False)
+    preferred_timezone = models.CharField(
+        choices=[(str(tz), str(tz)) for tz in pytz.all_timezones],
+        default=str(pytz.utc),
+        max_length=255,
+    )
 
     name_field = "username"
 
diff --git a/bookwyrm/templates/preferences/edit_user.html b/bookwyrm/templates/preferences/edit_user.html
index 327d745b..1edde6e3 100644
--- a/bookwyrm/templates/preferences/edit_user.html
+++ b/bookwyrm/templates/preferences/edit_user.html
@@ -61,6 +61,10 @@
         {% url 'directory' as path %}
         <p class="help">{% blocktrans %}Your account will show up in the <a href="{{ path }}">directory</a>, and may be recommended to other BookWyrm users.{% endblocktrans %}</p>
     </div>
+    <div>
+        <label class="dropdown label" for="id_preferred_timezone">{% trans "Preferred Timezone: " %}</label>
+        {{ form.preferred_timezone }}
+    </div>
     <button class="button is-primary" type="submit">{% trans "Save" %}</button>
 </form>
 {% endblock %}
diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index 77be0ca3..775c6190 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -139,7 +139,6 @@ def time_since(date):
     if not isinstance(date, datetime):
         return ""
     now = timezone.now()
-    delta = now - date
 
     if date < (now - relativedelta(weeks=1)):
         formatter = "%b %-d"
diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py
index 1708ec53..055edae2 100644
--- a/bookwyrm/tests/views/test_user.py
+++ b/bookwyrm/tests/views/test_user.py
@@ -145,6 +145,7 @@ class UserViews(TestCase):
         form = forms.EditUserForm(instance=self.local_user)
         form.data["name"] = "New Name"
         form.data["email"] = "wow@email.com"
+        form.data["preferred_timezone"] = "UTC"
         request = self.factory.post("", form.data)
         request.user = self.local_user
 
@@ -164,6 +165,7 @@ class UserViews(TestCase):
         form = forms.EditUserForm(instance=self.local_user)
         form.data["name"] = "New Name"
         form.data["email"] = "wow@email.com"
+        form.data["preferred_timezone"] = "UTC"
         image_file = pathlib.Path(__file__).parent.joinpath(
             "../../static/images/no_cover.jpg"
         )
diff --git a/bookwyrm/views/reading.py b/bookwyrm/views/reading.py
index fb63f2a3..27e95855 100644
--- a/bookwyrm/views/reading.py
+++ b/bookwyrm/views/reading.py
@@ -1,5 +1,7 @@
 """ the good stuff! the books! """
+from datetime import datetime
 import dateutil.parser
+import dateutil.tz
 from dateutil.parser import ParserError
 
 from django.contrib.auth.decorators import login_required
@@ -123,6 +125,12 @@ def create_readthrough(request):
     return redirect(request.headers.get("Referer", "/"))
 
 
+def load_date_in_user_tz_as_utc(date_str: str, user: models.User) -> datetime:
+    user_tz = dateutil.tz.gettz(user.preferred_timezone)
+    start_date = dateutil.parser.parse(date_str, ignoretz=True)
+    return start_date.replace(tzinfo=user_tz).astimezone(dateutil.tz.UTC)
+
+
 def update_readthrough(request, book=None, create=True):
     """ updates but does not save dates on a readthrough """
     try:
@@ -141,16 +149,18 @@ def update_readthrough(request, book=None, create=True):
     start_date = request.POST.get("start_date")
     if start_date:
         try:
-            start_date = timezone.make_aware(dateutil.parser.parse(start_date))
-            readthrough.start_date = start_date
+            readthrough.start_date = load_date_in_user_tz_as_utc(
+                start_date, request.user
+            )
         except ParserError:
             pass
 
     finish_date = request.POST.get("finish_date")
     if finish_date:
         try:
-            finish_date = timezone.make_aware(dateutil.parser.parse(finish_date))
-            readthrough.finish_date = finish_date
+            readthrough.finish_date = load_date_in_user_tz_as_utc(
+                finish_date, request.user
+            )
         except ParserError:
             pass
 
diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo
index 61a659d88d5d224d5972244a1911861061102464..cee809a37a853ef2da916d11d3d3135f02a1fe7d 100644
GIT binary patch
delta 7175
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
Uio~plt(&`in!0sGN%Lm^2bfzAEdT%j

delta 7208
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
F{{yw>9lQVl

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index d02973f8..6d98fa0b 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 11:41-0700\n"
+"POT-Creation-Date: 2021-03-28 22:42+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"
@@ -18,73 +18,78 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/forms.py:203
+#: bookwyrm/forms.py:213
+#, fuzzy
+#| msgid "A user with that username already exists."
+msgid "A user with this email already exists."
+msgstr "Dieser Benutzename ist bereits vergeben."
+
+#: bookwyrm/forms.py:227
 msgid "One Day"
 msgstr "Ein Tag"
 
-#: bookwyrm/forms.py:204
+#: bookwyrm/forms.py:228
 msgid "One Week"
 msgstr "Eine Woche"
 
-#: bookwyrm/forms.py:205
+#: bookwyrm/forms.py:229
 msgid "One Month"
 msgstr "Ein Monat"
 
-#: bookwyrm/forms.py:206
+#: bookwyrm/forms.py:230
 msgid "Does Not Expire"
 msgstr "Läuft nicht aus"
 
-#: bookwyrm/forms.py:211
+#: bookwyrm/forms.py:235
 #, python-format
 msgid "%(count)d uses"
 msgstr "%(count)d Benutzungen"
 
-#: bookwyrm/forms.py:214
+#: bookwyrm/forms.py:238
 #, fuzzy
 #| msgid "Unlisted"
 msgid "Unlimited"
 msgstr "Ungelistet"
 
-#: bookwyrm/models/fields.py:24
+#: bookwyrm/models/fields.py:25
 #, python-format
 msgid "%(value)s is not a valid remote_id"
 msgstr "%(value)s ist keine gültige remote_id"
 
-#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
+#: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:47
 #, python-format
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s ist kein gültiger Username"
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:152
+#: bookwyrm/models/fields.py:170 bookwyrm/templates/layout.html:157
 msgid "username"
 msgstr "Username"
 
-#: bookwyrm/models/fields.py:170
+#: bookwyrm/models/fields.py:175
 msgid "A user with that username already exists."
 msgstr "Dieser Benutzename ist bereits vergeben."
 
-#: bookwyrm/settings.py:142
+#: bookwyrm/settings.py:148
 msgid "English"
 msgstr "Englisch"
 
-#: bookwyrm/settings.py:143
+#: bookwyrm/settings.py:149
 msgid "German"
 msgstr "Deutsch"
 
-#: bookwyrm/settings.py:144
+#: bookwyrm/settings.py:150
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: bookwyrm/settings.py:145
+#: bookwyrm/settings.py:151
 msgid "French"
 msgstr "Französisch"
 
-#: bookwyrm/settings.py:146
+#: bookwyrm/settings.py:152
 msgid "Simplified Chinese"
 msgstr "Vereinfachtes Chinesisch"
 
 #: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
-#: bookwyrm/templates/edit_author.html:5
 msgid "Edit Author"
 msgstr "Autor*in editieren"
 
@@ -176,11 +181,11 @@ msgstr "Beschreibung:"
 #: bookwyrm/templates/book/book.html:121
 #: bookwyrm/templates/book/edit_book.html:225
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:56
-#: bookwyrm/templates/settings/site.html:89
-#: bookwyrm/templates/snippets/progress_update.html:21
+#: bookwyrm/templates/preferences/edit_user.html:68
+#: bookwyrm/templates/settings/site.html:93
 #: bookwyrm/templates/snippets/readthrough.html:64
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
 msgid "Save"
 msgstr "Speichern"
@@ -194,6 +199,7 @@ msgstr "Speichern"
 #: bookwyrm/templates/snippets/goal_form.html:32
 #: bookwyrm/templates/snippets/readthrough.html:65
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
 msgid "Cancel"
@@ -452,10 +458,120 @@ msgid "Openlibrary key:"
 msgstr ""
 
 #: bookwyrm/templates/components/inline_form.html:8
-#: bookwyrm/templates/feed/feed_layout.html:54
+#: bookwyrm/templates/feed/feed_layout.html:57
 msgid "Close"
 msgstr "Schließen"
 
+#: bookwyrm/templates/directory.html:6 bookwyrm/templates/directory.html:11
+#: bookwyrm/templates/layout.html:97
+msgid "Directory"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:19
+msgid "Make your profile discoverable to other BookWyrm users."
+msgstr ""
+
+#: bookwyrm/templates/directory.html:26
+#, fuzzy, python-format
+#| msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
+msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
+msgstr "Du kannst dein Leseziel jederzeit auf deiner <a href=\"%(path)s\">Profilseite</a> setzen oder ändern."
+
+#: bookwyrm/templates/directory.html:31
+#: bookwyrm/templates/snippets/goal_card.html:22
+msgid "Dismiss message"
+msgstr "Nachricht verwerfen"
+
+#: bookwyrm/templates/directory.html:44
+#, fuzzy
+#| msgid "Show less"
+msgid "Show filters"
+msgstr "Weniger anzeigen"
+
+#: bookwyrm/templates/directory.html:46
+msgid "Hide filters"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:55
+#, fuzzy
+#| msgid "User Activity"
+msgid "User type"
+msgstr "Nutzer*innenaktivität"
+
+#: bookwyrm/templates/directory.html:58
+msgid "BookWyrm users"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:62
+msgid "All known users"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:68
+#, fuzzy
+#| msgid "Comment"
+msgid "Community"
+msgstr "Kommentieren"
+
+#: bookwyrm/templates/directory.html:71
+#, fuzzy
+#| msgid "Max uses"
+msgid "Local users"
+msgstr "Maximale Benutzungen"
+
+#: bookwyrm/templates/directory.html:75
+#, fuzzy
+#| msgid "Federated"
+msgid "Federated community"
+msgstr "Föderiert"
+
+#: bookwyrm/templates/directory.html:81
+msgid "Order by"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:84
+#, fuzzy
+#| msgid "Suggest"
+msgid "Suggested"
+msgstr "Vorschlagen"
+
+#: bookwyrm/templates/directory.html:85
+msgid "Recently active"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:91
+msgid "Apply filters"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:94
+#, fuzzy
+#| msgid "Clear search"
+msgid "Clear filters"
+msgstr "Suche leeren"
+
+#: bookwyrm/templates/directory.html:128
+#, fuzzy
+#| msgid "followed you"
+msgid "follower you follow"
+msgid_plural "followers you follow"
+msgstr[0] "folgt dir"
+msgstr[1] "folgt dir"
+
+#: bookwyrm/templates/directory.html:135
+#, fuzzy
+#| msgid "Your shelves"
+msgid "book on your shelves"
+msgid_plural "books on your shelves"
+msgstr[0] "Deine Regale"
+msgstr[1] "Deine Regale"
+
+#: bookwyrm/templates/directory.html:143
+msgid "posts"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:149
+msgid "last active"
+msgstr ""
+
 #: bookwyrm/templates/discover/about.html:7
 #, python-format
 msgid "About %(site_name)s"
@@ -496,15 +612,41 @@ msgstr ""
 msgid "Join %(name)s"
 msgstr "Tritt %(name)s bei"
 
-#: bookwyrm/templates/discover/landing_layout.html:49
+#: bookwyrm/templates/discover/landing_layout.html:51
 #: bookwyrm/templates/login.html:48
 msgid "This instance is closed"
 msgstr "Diese Instanz ist geschlossen"
 
-#: bookwyrm/templates/discover/landing_layout.html:55
+#: bookwyrm/templates/discover/landing_layout.html:57
+msgid "Thank you! Your request has been received."
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:60
+msgid "Request an Invitation"
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:64
+#: bookwyrm/templates/password_reset_request.html:18
+#: bookwyrm/templates/preferences/edit_user.html:38
+#: bookwyrm/templates/snippets/register_form.html:13
+msgid "Email address:"
+msgstr "E-Mail Adresse"
+
+#: bookwyrm/templates/discover/landing_layout.html:70
+#: bookwyrm/templates/moderation/report_modal.html:31
+msgid "Submit"
+msgstr "Absenden"
+
+#: bookwyrm/templates/discover/landing_layout.html:79
 msgid "Your Account"
 msgstr "Dein Account"
 
+#: bookwyrm/templates/edit_author.html:5
+#, fuzzy
+#| msgid "Edit Author"
+msgid "Edit Author:"
+msgstr "Autor*in editieren"
+
 #: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
 #: bookwyrm/templates/user/create_shelf_form.html:13
 #: bookwyrm/templates/user/edit_shelf_form.html:14
@@ -549,6 +691,72 @@ msgstr "Editionen von  %(book_title)s"
 msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 msgstr "Editionen von <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 
+#: bookwyrm/templates/email/html_layout.html:15
+#: bookwyrm/templates/email/text_layout.html:2
+msgid "Hi there,"
+msgstr ""
+
+#: bookwyrm/templates/email/html_layout.html:21
+#, python-format
+msgid "BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/email/html_layout.html:23
+msgid "Email preference"
+msgstr ""
+
+#: bookwyrm/templates/email/invite/html_content.html:6
+#: bookwyrm/templates/email/invite/subject.html:2
+#, fuzzy, python-format
+#| msgid "About %(site_name)s"
+msgid "You're invited to join %(site_name)s!"
+msgstr "Ãœber %(site_name)s"
+
+#: bookwyrm/templates/email/invite/html_content.html:9
+msgid "Join Now"
+msgstr ""
+
+#: bookwyrm/templates/email/invite/html_content.html:15
+#, python-format
+msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
+msgstr ""
+
+#: bookwyrm/templates/email/invite/text_content.html:4
+#, python-format
+msgid "You're invited to join %(site_name)s! Click the link below to create an account."
+msgstr ""
+
+#: bookwyrm/templates/email/invite/text_content.html:8
+#, fuzzy
+#| msgid "More about this site"
+msgid "Learn more about this instance:"
+msgstr "Mehr über diese Seite"
+
+#: bookwyrm/templates/email/password_reset/html_content.html:6
+#: bookwyrm/templates/email/password_reset/text_content.html:4
+#, python-format
+msgid "You requested to reset your %(site_name)s password. Click the link below to set a new password and log in to your account."
+msgstr ""
+
+#: bookwyrm/templates/email/password_reset/html_content.html:9
+#: bookwyrm/templates/password_reset.html:4
+#: bookwyrm/templates/password_reset.html:10
+#: bookwyrm/templates/password_reset_request.html:4
+#: bookwyrm/templates/password_reset_request.html:10
+msgid "Reset Password"
+msgstr "Passwort zurücksetzen!"
+
+#: bookwyrm/templates/email/password_reset/html_content.html:13
+#: bookwyrm/templates/email/password_reset/text_content.html:8
+msgid "If you didn't request to reset your password, you can ignore this email."
+msgstr ""
+
+#: bookwyrm/templates/email/password_reset/subject.html:2
+#, fuzzy, python-format
+#| msgid "About %(site_name)s"
+msgid "Reset your %(site_name)s password"
+msgstr "Ãœber %(site_name)s"
+
 #: bookwyrm/templates/error.html:4
 msgid "Oops!"
 msgstr "Ups!"
@@ -579,27 +787,59 @@ msgstr "Alle Nachrichten"
 msgid "You have no messages right now."
 msgstr "Du hast momentan keine Nachrichten."
 
-#: bookwyrm/templates/feed/feed.html:6
-#, python-format
-msgid "%(tab_title)s Timeline"
+#: bookwyrm/templates/feed/feed.html:9
+msgid "Home Timeline"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:10 bookwyrm/views/feed.py:33
+#: bookwyrm/templates/feed/feed.html:11
+msgid "Local Timeline"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:13
+#, fuzzy
+#| msgid "Federated Servers"
+msgid "Federated Timeline"
+msgstr "Föderierende Server"
+
+#: bookwyrm/templates/feed/feed.html:19
 msgid "Home"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:13 bookwyrm/views/feed.py:38
+#: bookwyrm/templates/feed/feed.html:22
 msgid "Local"
 msgstr "Lokal"
 
-#: bookwyrm/templates/feed/feed.html:16 bookwyrm/views/feed.py:43
+#: bookwyrm/templates/feed/feed.html:25
 msgid "Federated"
 msgstr "Föderiert"
 
-#: bookwyrm/templates/feed/feed.html:32
+#: bookwyrm/templates/feed/feed.html:33
+#, python-format
+msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:48
 msgid "There aren't any activities right now! Try following a user to get started"
 msgstr "Hier sind noch keine Aktivitäten! Folge anderen, um loszulegen"
 
+#: bookwyrm/templates/feed/feed.html:56
+msgid "Who to follow"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:69
+#, python-format
+msgid "%(mutuals)s follower you follow"
+msgid_plural "%(mutuals)s followers you follow"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/feed/feed.html:72
+#, python-format
+msgid "%(shared_books)s book on your shelves"
+msgid_plural "%(shared_books)s books on your shelves"
+msgstr[0] ""
+msgstr[1] ""
+
 #: bookwyrm/templates/feed/feed_layout.html:5
 msgid "Updates"
 msgstr ""
@@ -632,7 +872,7 @@ msgstr "Gerade lesend"
 msgid "Read"
 msgstr "Gelesen"
 
-#: bookwyrm/templates/feed/feed_layout.html:76 bookwyrm/templates/goal.html:26
+#: bookwyrm/templates/feed/feed_layout.html:74 bookwyrm/templates/goal.html:26
 #: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
 msgid "%(year)s Reading Goal"
@@ -824,67 +1064,69 @@ msgstr ""
 msgid "Profile"
 msgstr "Profil"
 
-#: bookwyrm/templates/layout.html:97
+#: bookwyrm/templates/layout.html:107
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: bookwyrm/templates/layout.html:111
-#: bookwyrm/templates/settings/admin_layout.html:19
+#: bookwyrm/templates/layout.html:116
+#: bookwyrm/templates/settings/admin_layout.html:20
+#: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
+#: bookwyrm/templates/settings/manage_invites.html:15
 msgid "Invites"
 msgstr "Einladungen"
 
-#: bookwyrm/templates/layout.html:118
+#: bookwyrm/templates/layout.html:123
 msgid "Admin"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:125
+#: bookwyrm/templates/layout.html:130
 msgid "Log out"
 msgstr "Abmelden"
 
-#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
+#: bookwyrm/templates/layout.html:138 bookwyrm/templates/layout.html:139
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:10
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155
+#: bookwyrm/templates/layout.html:156 bookwyrm/templates/layout.html:160
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:156
+#: bookwyrm/templates/layout.html:161
 msgid "password"
 msgstr "Passwort"
 
-#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:162 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:165 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "Anmelden"
 
-#: bookwyrm/templates/layout.html:168
+#: bookwyrm/templates/layout.html:173
 msgid "Join"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:191
+#: bookwyrm/templates/layout.html:196
 msgid "About this server"
 msgstr "Ãœber diesen Server"
 
-#: bookwyrm/templates/layout.html:195
+#: bookwyrm/templates/layout.html:200
 msgid "Contact site admin"
 msgstr "Admin kontaktieren"
 
-#: bookwyrm/templates/layout.html:202
+#: bookwyrm/templates/layout.html:207
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr "%(site_name)s auf <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a> unterstützen"
 
-#: bookwyrm/templates/layout.html:206
+#: bookwyrm/templates/layout.html:211
 msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm ist open source Software. Du kannst dich auf <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> beteiligen oder etwas melden."
 
@@ -1084,7 +1326,7 @@ msgstr "Moderator:innenkommentare"
 
 #: bookwyrm/templates/moderation/report.html:54
 #: bookwyrm/templates/snippets/create_status.html:12
-#: bookwyrm/templates/snippets/create_status_form.html:44
+#: bookwyrm/templates/snippets/create_status_form.html:52
 msgid "Comment"
 msgstr "Kommentieren"
 
@@ -1119,10 +1361,6 @@ msgstr "Diese Meldung wird an die Moderator:innen von %(site_name)s weitergeleti
 msgid "More info about this report:"
 msgstr "Mehr über diese Seite"
 
-#: bookwyrm/templates/moderation/report_modal.html:31
-msgid "Submit"
-msgstr "Absenden"
-
 #: bookwyrm/templates/moderation/report_preview.html:13
 msgid "No notes provided"
 msgstr "Keine Notizen angegeben."
@@ -1143,7 +1381,7 @@ msgstr "Lösen"
 
 #: bookwyrm/templates/moderation/reports.html:4
 #: bookwyrm/templates/moderation/reports.html:5
-#: bookwyrm/templates/settings/admin_layout.html:23
+#: bookwyrm/templates/settings/admin_layout.html:24
 #, fuzzy
 #| msgid "Recent Imports"
 msgid "Reports"
@@ -1279,29 +1517,16 @@ msgstr "Eine neue <a href=\"%(path)s\">Meldung</a> muss moderiert werden."
 msgid "You're all caught up!"
 msgstr "Du bist auf dem neusten Stand!"
 
-#: bookwyrm/templates/password_reset.html:4
-#: bookwyrm/templates/password_reset.html:10
-#: bookwyrm/templates/password_reset_request.html:4
-#: bookwyrm/templates/password_reset_request.html:10
-msgid "Reset Password"
-msgstr "Passwort zurücksetzen!"
-
 #: bookwyrm/templates/password_reset.html:23
 #: bookwyrm/templates/preferences/change_password.html:18
 msgid "Confirm password:"
 msgstr "Passwort bestätigen:"
 
-#: bookwyrm/templates/password_reset_request.html:12
+#: bookwyrm/templates/password_reset_request.html:14
 msgid "A link to reset your password will be sent to your email address"
 msgstr "Ein Link zum Zurücksetzen deines Passworts wird an deine Mailadresse geschickt"
 
-#: bookwyrm/templates/password_reset_request.html:16
-#: bookwyrm/templates/preferences/edit_user.html:38
-#: bookwyrm/templates/snippets/register_form.html:13
-msgid "Email address:"
-msgstr "E-Mail Adresse"
-
-#: bookwyrm/templates/password_reset_request.html:23
+#: bookwyrm/templates/password_reset_request.html:28
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
@@ -1351,6 +1576,19 @@ msgstr "Angegebenes Leseziel im Feed anzeigen."
 msgid "Manually approve followers:"
 msgstr "Folgende manuell bestätigen"
 
+#: bookwyrm/templates/preferences/edit_user.html:58
+msgid "Show this account in suggested users:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:62
+#, python-format
+msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:65
+msgid "Preferred Timezone: "
+msgstr ""
+
 #: bookwyrm/templates/preferences/preferences_layout.html:11
 msgid "Account"
 msgstr ""
@@ -1393,37 +1631,37 @@ msgstr ""
 msgid "Manage Users"
 msgstr "Nutzer*innen verwalten"
 
-#: bookwyrm/templates/settings/admin_layout.html:27
+#: bookwyrm/templates/settings/admin_layout.html:28
 #: bookwyrm/templates/settings/federation.html:4
 msgid "Federated Servers"
 msgstr "Föderierende Server"
 
-#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/admin_layout.html:33
 msgid "Instance Settings"
 msgstr "Instanzeinstellungen"
 
-#: bookwyrm/templates/settings/admin_layout.html:36
+#: bookwyrm/templates/settings/admin_layout.html:37
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr "Seiteneinstellungen"
 
-#: bookwyrm/templates/settings/admin_layout.html:39
+#: bookwyrm/templates/settings/admin_layout.html:40
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr "Instanzinformationen"
 
-#: bookwyrm/templates/settings/admin_layout.html:40
+#: bookwyrm/templates/settings/admin_layout.html:41
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr "Bilder"
 
-#: bookwyrm/templates/settings/admin_layout.html:41
+#: bookwyrm/templates/settings/admin_layout.html:42
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr "Inhalt des Footers"
 
-#: bookwyrm/templates/settings/admin_layout.html:42
+#: bookwyrm/templates/settings/admin_layout.html:43
 #: bookwyrm/templates/settings/site.html:77
 msgid "Registration"
 msgstr "Registrierung"
@@ -1437,42 +1675,116 @@ msgid "Software"
 msgstr ""
 
 #: bookwyrm/templates/settings/federation.html:12
+#: bookwyrm/templates/settings/manage_invite_requests.html:33
 msgid "Status"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invites.html:7
+#: bookwyrm/templates/settings/manage_invite_requests.html:4
+#: bookwyrm/templates/settings/manage_invite_requests.html:11
+#: bookwyrm/templates/settings/manage_invite_requests.html:25
+#: bookwyrm/templates/settings/manage_invites.html:11
+#, fuzzy
+#| msgid "Invites"
+msgid "Invite Requests"
+msgstr "Einladungen"
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:23
+msgid "Ignored Invite Requests"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:31
+msgid "Date"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:32
+msgid "Email"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:34
+#, fuzzy
+#| msgid "Notifications"
+msgid "Action"
+msgstr "Benachrichtigungen"
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:37
+#, fuzzy
+#| msgid "Follow Requests"
+msgid "No requests"
+msgstr "Folgeanfragen"
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:45
+#, fuzzy
+#| msgid "Accept"
+msgid "Accepted"
+msgstr "Annehmen"
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:47
+msgid "Sent"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:49
+msgid "Requested"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:57
+msgid "Send invite"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:59
+msgid "Re-send invite"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:70
+msgid "Ignore"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:72
+msgid "Un-gnore"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:83
+#, fuzzy
+#| msgid "Back to reports"
+msgid "Back to pending requests"
+msgstr "Zurück zu den Meldungen"
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:85
+msgid "View ignored requests"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:21
 msgid "Generate New Invite"
 msgstr "Neue Einladung erzeugen"
 
-#: bookwyrm/templates/settings/manage_invites.html:13
+#: bookwyrm/templates/settings/manage_invites.html:27
 msgid "Expiry:"
 msgstr "Ablaufen:"
 
-#: bookwyrm/templates/settings/manage_invites.html:19
+#: bookwyrm/templates/settings/manage_invites.html:33
 msgid "Use limit:"
 msgstr "Begrenzte Benutzung"
 
-#: bookwyrm/templates/settings/manage_invites.html:26
+#: bookwyrm/templates/settings/manage_invites.html:40
 msgid "Create Invite"
 msgstr "Einladung erstellen"
 
-#: bookwyrm/templates/settings/manage_invites.html:33
+#: bookwyrm/templates/settings/manage_invites.html:47
 msgid "Link"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invites.html:34
+#: bookwyrm/templates/settings/manage_invites.html:48
 msgid "Expires"
 msgstr "Läuft aus"
 
-#: bookwyrm/templates/settings/manage_invites.html:35
+#: bookwyrm/templates/settings/manage_invites.html:49
 msgid "Max uses"
 msgstr "Maximale Benutzungen"
 
-#: bookwyrm/templates/settings/manage_invites.html:36
+#: bookwyrm/templates/settings/manage_invites.html:50
 msgid "Times used"
 msgstr "Mal benutzt"
 
-#: bookwyrm/templates/settings/manage_invites.html:39
+#: bookwyrm/templates/settings/manage_invites.html:53
 msgid "No active invites"
 msgstr "Keine aktiven Einladungen"
 
@@ -1525,6 +1837,12 @@ msgid "Allow registration:"
 msgstr "Registrierungen erlauben"
 
 #: bookwyrm/templates/settings/site.html:83
+#, fuzzy
+#| msgid "Follow Requests"
+msgid "Allow invite requests:"
+msgstr "Folgeanfragen"
+
+#: bookwyrm/templates/settings/site.html:87
 msgid "Registration closed text:"
 msgstr "Registrierungen geschlossen text"
 
@@ -1569,29 +1887,70 @@ msgstr "Bewerten"
 msgid "Quote"
 msgstr "Zitieren"
 
-#: bookwyrm/templates/snippets/create_status_form.html:21
+#: bookwyrm/templates/snippets/create_status_form.html:18
+#, fuzzy
+#| msgid "Comment"
+msgid "Comment:"
+msgstr "Kommentieren"
+
+#: bookwyrm/templates/snippets/create_status_form.html:20
+#, fuzzy
+#| msgid "Quote"
+msgid "Quote:"
+msgstr "Zitieren"
+
+#: bookwyrm/templates/snippets/create_status_form.html:22
+#, fuzzy
+#| msgid "Review"
+msgid "Review:"
+msgstr "Bewerten"
+
+#: bookwyrm/templates/snippets/create_status_form.html:29
 #: bookwyrm/templates/snippets/shelf.html:17
 msgid "Rating"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:23
+#: bookwyrm/templates/snippets/create_status_form.html:31
 #: bookwyrm/templates/snippets/rate_action.html:14
 #: bookwyrm/templates/snippets/stars.html:3
 msgid "No rating"
 msgstr "Kein Rating"
 
-#: bookwyrm/templates/snippets/create_status_form.html:54
+#: bookwyrm/templates/snippets/create_status_form.html:64
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
+msgid "Progress:"
+msgstr "Fortschritt:"
+
+#: bookwyrm/templates/snippets/create_status_form.html:71
+#: bookwyrm/templates/snippets/readthrough_form.html:22
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
+msgid "pages"
+msgstr "Seiten"
+
+#: bookwyrm/templates/snippets/create_status_form.html:72
+#: bookwyrm/templates/snippets/readthrough_form.html:23
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
+msgid "percent"
+msgstr "Prozent"
+
+#: bookwyrm/templates/snippets/create_status_form.html:77
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
+#, python-format
+msgid "of %(pages)s pages"
+msgstr "von %(pages)s Seiten"
+
+#: bookwyrm/templates/snippets/create_status_form.html:89
 msgid "Include spoiler alert"
 msgstr "Spoileralarm aktivieren"
 
-#: bookwyrm/templates/snippets/create_status_form.html:60
+#: bookwyrm/templates/snippets/create_status_form.html:95
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:19
 msgid "Private"
 msgstr "Privat"
 
-#: bookwyrm/templates/snippets/create_status_form.html:67
+#: bookwyrm/templates/snippets/create_status_form.html:102
 msgid "Post"
 msgstr "Absenden"
 
@@ -1621,21 +1980,17 @@ msgstr "Status favorisieren"
 msgid "Un-like status"
 msgstr "Favorisieren zurücknehmen"
 
-#: bookwyrm/templates/snippets/follow_button.html:13
-msgid "Send follow request"
-msgstr "Folgeanfrage senden"
-
-#: bookwyrm/templates/snippets/follow_button.html:15
+#: bookwyrm/templates/snippets/follow_button.html:12
 msgid "Follow"
 msgstr "Folgen"
 
-#: bookwyrm/templates/snippets/follow_button.html:22
+#: bookwyrm/templates/snippets/follow_button.html:18
 #, fuzzy
 #| msgid "Send follow request"
 msgid "Undo follow request"
 msgstr "Folgeanfrage senden"
 
-#: bookwyrm/templates/snippets/follow_button.html:24
+#: bookwyrm/templates/snippets/follow_button.html:20
 msgid "Unfollow"
 msgstr "Entfolgen"
 
@@ -1653,14 +2008,22 @@ msgstr[1] "Setze das Ziel, %(year)s %(counter)s Bücher zu lesen"
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
 #, fuzzy, python-format
 #| msgid "<a href=\"%(path)s\">%(title)s</a> by "
-msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(rating)s star"
-msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(rating)s stars"
+msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
+msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
 msgstr[0] "<a href=\"%(path)s\">%(title)s</a> von "
 msgstr[1] "<a href=\"%(path)s\">%(title)s</a> von "
 
-#: bookwyrm/templates/snippets/goal_card.html:22
-msgid "Dismiss message"
-msgstr "Nachricht verwerfen"
+#: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4
+#, python-format
+msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
+msgid_plural "Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/snippets/generated_status/review_pure_name.html:8
+#, python-format
+msgid "Review of \"%(book_title)s\": %(review_title)s"
+msgstr ""
 
 #: bookwyrm/templates/snippets/goal_card.html:23
 #, python-format
@@ -1742,25 +2105,6 @@ msgstr ""
 msgid "Followers"
 msgstr "Folgende"
 
-#: bookwyrm/templates/snippets/progress_update.html:6
-msgid "Progress:"
-msgstr "Fortschritt:"
-
-#: bookwyrm/templates/snippets/progress_update.html:16
-#: bookwyrm/templates/snippets/readthrough_form.html:22
-msgid "pages"
-msgstr "Seiten"
-
-#: bookwyrm/templates/snippets/progress_update.html:17
-#: bookwyrm/templates/snippets/readthrough_form.html:23
-msgid "percent"
-msgstr "Prozent"
-
-#: bookwyrm/templates/snippets/progress_update.html:25
-#, python-format
-msgid "of %(pages)s pages"
-msgstr "von %(pages)s Seiten"
-
 #: bookwyrm/templates/snippets/rate_action.html:4
 msgid "Leave a rating"
 msgstr "Raten"
@@ -1903,6 +2247,13 @@ msgstr "Vom Regal nehmen"
 msgid "Finish \"<em>%(book_title)s</em>\""
 msgstr "\"<em>%(book_title)s</em>\" abschließen"
 
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:33
+#, fuzzy
+#| msgid "Progress"
+msgid "Update progress"
+msgstr "Fortschritt"
+
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5
 msgid "More shelves"
 msgstr "Mehr Regale"
@@ -2128,6 +2479,20 @@ msgstr[1] "%(counter)s Folgende"
 msgid "%(counter)s following"
 msgstr "Folgt %(counter)s"
 
+#: bookwyrm/views/password.py:32
+#, fuzzy
+#| msgid "A user with that username already exists."
+msgid "No user with that email address was found."
+msgstr "Dieser Benutzename ist bereits vergeben."
+
+#: bookwyrm/views/password.py:41
+#, python-format
+msgid "A password reset link sent to %s"
+msgstr ""
+
+#~ msgid "Send follow request"
+#~ msgstr "Folgeanfrage senden"
+
 #, fuzzy
 #~| msgid "All messages"
 #~ msgid "Messages"
@@ -2143,7 +2508,7 @@ msgstr "Folgt %(counter)s"
 #~ msgid "Enter a number."
 #~ msgstr "Seriennummer:"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "%(value)s is not a valid remote_id"
 #~ msgid "Value %(value)r is not a valid choice."
 #~ msgstr "%(value)s ist keine gültige remote_id"
@@ -2178,7 +2543,7 @@ msgstr "Folgt %(counter)s"
 #~ msgid "Positive integer"
 #~ msgstr "Keine aktiven Einladungen"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "%(value)s is not a valid username"
 #~ msgid "“%(value)s� is not a valid UUID."
 #~ msgstr "%(value)s ist kein gültiger Username"
@@ -2203,7 +2568,7 @@ msgstr "Folgt %(counter)s"
 #~ msgid "The submitted file is empty."
 #~ msgstr "Dieses Regal ist leer."
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "%(value)s is not a valid username"
 #~ msgid "“%(pk)s� is not a valid value."
 #~ msgstr "%(value)s ist kein gültiger Username"
@@ -2251,7 +2616,7 @@ msgstr "Folgt %(counter)s"
 #~ msgid "September"
 #~ msgstr "Seriennummer:"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "No books found matching the query \"%(query)s\""
 #~ msgid "No %(verbose_name)s found matching the query"
 #~ msgstr "Keine passenden Bücher zu \"%(query)s\" gefunden"
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index fe0047b2..e6256a7f 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 11:41-0700\n"
+"POT-Creation-Date: 2021-03-28 22:42+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"
@@ -18,71 +18,74 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/forms.py:203
+#: bookwyrm/forms.py:213
+msgid "A user with this email already exists."
+msgstr ""
+
+#: bookwyrm/forms.py:227
 msgid "One Day"
 msgstr ""
 
-#: bookwyrm/forms.py:204
+#: bookwyrm/forms.py:228
 msgid "One Week"
 msgstr ""
 
-#: bookwyrm/forms.py:205
+#: bookwyrm/forms.py:229
 msgid "One Month"
 msgstr ""
 
-#: bookwyrm/forms.py:206
+#: bookwyrm/forms.py:230
 msgid "Does Not Expire"
 msgstr ""
 
-#: bookwyrm/forms.py:211
+#: bookwyrm/forms.py:235
 #, python-format
 msgid "%(count)d uses"
 msgstr ""
 
-#: bookwyrm/forms.py:214
+#: bookwyrm/forms.py:238
 msgid "Unlimited"
 msgstr ""
 
-#: bookwyrm/models/fields.py:24
+#: bookwyrm/models/fields.py:25
 #, python-format
 msgid "%(value)s is not a valid remote_id"
 msgstr ""
 
-#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
+#: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:47
 #, python-format
 msgid "%(value)s is not a valid username"
 msgstr ""
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:152
+#: bookwyrm/models/fields.py:170 bookwyrm/templates/layout.html:157
 msgid "username"
 msgstr ""
 
-#: bookwyrm/models/fields.py:170
+#: bookwyrm/models/fields.py:175
 msgid "A user with that username already exists."
 msgstr ""
 
-#: bookwyrm/settings.py:142
+#: bookwyrm/settings.py:148
 msgid "English"
 msgstr ""
 
-#: bookwyrm/settings.py:143
+#: bookwyrm/settings.py:149
 msgid "German"
 msgstr ""
 
-#: bookwyrm/settings.py:144
+#: bookwyrm/settings.py:150
 msgid "Spanish"
 msgstr ""
 
-#: bookwyrm/settings.py:145
+#: bookwyrm/settings.py:151
 msgid "French"
 msgstr ""
 
-#: bookwyrm/settings.py:146
+#: bookwyrm/settings.py:152
 msgid "Simplified Chinese"
 msgstr ""
 
 #: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
-#: bookwyrm/templates/edit_author.html:5
 msgid "Edit Author"
 msgstr ""
 
@@ -173,11 +176,11 @@ msgstr ""
 #: bookwyrm/templates/book/book.html:121
 #: bookwyrm/templates/book/edit_book.html:225
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:56
-#: bookwyrm/templates/settings/site.html:89
-#: bookwyrm/templates/snippets/progress_update.html:21
+#: bookwyrm/templates/preferences/edit_user.html:68
+#: bookwyrm/templates/settings/site.html:93
 #: bookwyrm/templates/snippets/readthrough.html:64
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
 msgid "Save"
 msgstr ""
@@ -191,6 +194,7 @@ msgstr ""
 #: bookwyrm/templates/snippets/goal_form.html:32
 #: bookwyrm/templates/snippets/readthrough.html:65
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
 msgid "Cancel"
@@ -431,10 +435,101 @@ msgid "Openlibrary key:"
 msgstr ""
 
 #: bookwyrm/templates/components/inline_form.html:8
-#: bookwyrm/templates/feed/feed_layout.html:54
+#: bookwyrm/templates/feed/feed_layout.html:57
 msgid "Close"
 msgstr ""
 
+#: bookwyrm/templates/directory.html:6 bookwyrm/templates/directory.html:11
+#: bookwyrm/templates/layout.html:97
+msgid "Directory"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:19
+msgid "Make your profile discoverable to other BookWyrm users."
+msgstr ""
+
+#: bookwyrm/templates/directory.html:26
+#, python-format
+msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:31
+#: bookwyrm/templates/snippets/goal_card.html:22
+msgid "Dismiss message"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:44
+msgid "Show filters"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:46
+msgid "Hide filters"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:55
+msgid "User type"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:58
+msgid "BookWyrm users"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:62
+msgid "All known users"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:68
+msgid "Community"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:71
+msgid "Local users"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:75
+msgid "Federated community"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:81
+msgid "Order by"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:84
+msgid "Suggested"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:85
+msgid "Recently active"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:91
+msgid "Apply filters"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:94
+msgid "Clear filters"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:128
+msgid "follower you follow"
+msgid_plural "followers you follow"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/directory.html:135
+msgid "book on your shelves"
+msgid_plural "books on your shelves"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/directory.html:143
+msgid "posts"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:149
+msgid "last active"
+msgstr ""
+
 #: bookwyrm/templates/discover/about.html:7
 #, python-format
 msgid "About %(site_name)s"
@@ -475,15 +570,39 @@ msgstr ""
 msgid "Join %(name)s"
 msgstr ""
 
-#: bookwyrm/templates/discover/landing_layout.html:49
+#: bookwyrm/templates/discover/landing_layout.html:51
 #: bookwyrm/templates/login.html:48
 msgid "This instance is closed"
 msgstr ""
 
-#: bookwyrm/templates/discover/landing_layout.html:55
+#: bookwyrm/templates/discover/landing_layout.html:57
+msgid "Thank you! Your request has been received."
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:60
+msgid "Request an Invitation"
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:64
+#: bookwyrm/templates/password_reset_request.html:18
+#: bookwyrm/templates/preferences/edit_user.html:38
+#: bookwyrm/templates/snippets/register_form.html:13
+msgid "Email address:"
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:70
+#: bookwyrm/templates/moderation/report_modal.html:31
+msgid "Submit"
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:79
 msgid "Your Account"
 msgstr ""
 
+#: bookwyrm/templates/edit_author.html:5
+msgid "Edit Author:"
+msgstr ""
+
 #: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
 #: bookwyrm/templates/user/create_shelf_form.html:13
 #: bookwyrm/templates/user/edit_shelf_form.html:14
@@ -528,6 +647,68 @@ msgstr ""
 msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 msgstr ""
 
+#: bookwyrm/templates/email/html_layout.html:15
+#: bookwyrm/templates/email/text_layout.html:2
+msgid "Hi there,"
+msgstr ""
+
+#: bookwyrm/templates/email/html_layout.html:21
+#, python-format
+msgid "BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/email/html_layout.html:23
+msgid "Email preference"
+msgstr ""
+
+#: bookwyrm/templates/email/invite/html_content.html:6
+#: bookwyrm/templates/email/invite/subject.html:2
+#, python-format
+msgid "You're invited to join %(site_name)s!"
+msgstr ""
+
+#: bookwyrm/templates/email/invite/html_content.html:9
+msgid "Join Now"
+msgstr ""
+
+#: bookwyrm/templates/email/invite/html_content.html:15
+#, python-format
+msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
+msgstr ""
+
+#: bookwyrm/templates/email/invite/text_content.html:4
+#, python-format
+msgid "You're invited to join %(site_name)s! Click the link below to create an account."
+msgstr ""
+
+#: bookwyrm/templates/email/invite/text_content.html:8
+msgid "Learn more about this instance:"
+msgstr ""
+
+#: bookwyrm/templates/email/password_reset/html_content.html:6
+#: bookwyrm/templates/email/password_reset/text_content.html:4
+#, python-format
+msgid "You requested to reset your %(site_name)s password. Click the link below to set a new password and log in to your account."
+msgstr ""
+
+#: bookwyrm/templates/email/password_reset/html_content.html:9
+#: bookwyrm/templates/password_reset.html:4
+#: bookwyrm/templates/password_reset.html:10
+#: bookwyrm/templates/password_reset_request.html:4
+#: bookwyrm/templates/password_reset_request.html:10
+msgid "Reset Password"
+msgstr ""
+
+#: bookwyrm/templates/email/password_reset/html_content.html:13
+#: bookwyrm/templates/email/password_reset/text_content.html:8
+msgid "If you didn't request to reset your password, you can ignore this email."
+msgstr ""
+
+#: bookwyrm/templates/email/password_reset/subject.html:2
+#, python-format
+msgid "Reset your %(site_name)s password"
+msgstr ""
+
 #: bookwyrm/templates/error.html:4
 msgid "Oops!"
 msgstr ""
@@ -558,27 +739,57 @@ msgstr ""
 msgid "You have no messages right now."
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:6
-#, python-format
-msgid "%(tab_title)s Timeline"
+#: bookwyrm/templates/feed/feed.html:9
+msgid "Home Timeline"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:10 bookwyrm/views/feed.py:33
+#: bookwyrm/templates/feed/feed.html:11
+msgid "Local Timeline"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:13
+msgid "Federated Timeline"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:19
 msgid "Home"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:13 bookwyrm/views/feed.py:38
+#: bookwyrm/templates/feed/feed.html:22
 msgid "Local"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:16 bookwyrm/views/feed.py:43
+#: bookwyrm/templates/feed/feed.html:25
 msgid "Federated"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:32
+#: bookwyrm/templates/feed/feed.html:33
+#, python-format
+msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:48
 msgid "There aren't any activities right now! Try following a user to get started"
 msgstr ""
 
+#: bookwyrm/templates/feed/feed.html:56
+msgid "Who to follow"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:69
+#, python-format
+msgid "%(mutuals)s follower you follow"
+msgid_plural "%(mutuals)s followers you follow"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/feed/feed.html:72
+#, python-format
+msgid "%(shared_books)s book on your shelves"
+msgid_plural "%(shared_books)s books on your shelves"
+msgstr[0] ""
+msgstr[1] ""
+
 #: bookwyrm/templates/feed/feed_layout.html:5
 msgid "Updates"
 msgstr ""
@@ -607,7 +818,7 @@ msgstr ""
 msgid "Read"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed_layout.html:76 bookwyrm/templates/goal.html:26
+#: bookwyrm/templates/feed/feed_layout.html:74 bookwyrm/templates/goal.html:26
 #: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
 msgid "%(year)s Reading Goal"
@@ -799,67 +1010,69 @@ msgstr ""
 msgid "Profile"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:97
+#: bookwyrm/templates/layout.html:107
 msgid "Settings"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:111
-#: bookwyrm/templates/settings/admin_layout.html:19
+#: bookwyrm/templates/layout.html:116
+#: bookwyrm/templates/settings/admin_layout.html:20
+#: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
+#: bookwyrm/templates/settings/manage_invites.html:15
 msgid "Invites"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:118
+#: bookwyrm/templates/layout.html:123
 msgid "Admin"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:125
+#: bookwyrm/templates/layout.html:130
 msgid "Log out"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
+#: bookwyrm/templates/layout.html:138 bookwyrm/templates/layout.html:139
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:10
 msgid "Notifications"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155
+#: bookwyrm/templates/layout.html:156 bookwyrm/templates/layout.html:160
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:156
+#: bookwyrm/templates/layout.html:161
 msgid "password"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:162 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:165 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:168
+#: bookwyrm/templates/layout.html:173
 msgid "Join"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:191
+#: bookwyrm/templates/layout.html:196
 msgid "About this server"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:195
+#: bookwyrm/templates/layout.html:200
 msgid "Contact site admin"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:202
+#: bookwyrm/templates/layout.html:207
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:206
+#: bookwyrm/templates/layout.html:211
 msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr ""
 
@@ -1051,7 +1264,7 @@ msgstr ""
 
 #: bookwyrm/templates/moderation/report.html:54
 #: bookwyrm/templates/snippets/create_status.html:12
-#: bookwyrm/templates/snippets/create_status_form.html:44
+#: bookwyrm/templates/snippets/create_status_form.html:52
 msgid "Comment"
 msgstr ""
 
@@ -1081,10 +1294,6 @@ msgstr ""
 msgid "More info about this report:"
 msgstr ""
 
-#: bookwyrm/templates/moderation/report_modal.html:31
-msgid "Submit"
-msgstr ""
-
 #: bookwyrm/templates/moderation/report_preview.html:13
 msgid "No notes provided"
 msgstr ""
@@ -1104,7 +1313,7 @@ msgstr ""
 
 #: bookwyrm/templates/moderation/reports.html:4
 #: bookwyrm/templates/moderation/reports.html:5
-#: bookwyrm/templates/settings/admin_layout.html:23
+#: bookwyrm/templates/settings/admin_layout.html:24
 msgid "Reports"
 msgstr ""
 
@@ -1236,29 +1445,16 @@ msgstr ""
 msgid "You're all caught up!"
 msgstr ""
 
-#: bookwyrm/templates/password_reset.html:4
-#: bookwyrm/templates/password_reset.html:10
-#: bookwyrm/templates/password_reset_request.html:4
-#: bookwyrm/templates/password_reset_request.html:10
-msgid "Reset Password"
-msgstr ""
-
 #: bookwyrm/templates/password_reset.html:23
 #: bookwyrm/templates/preferences/change_password.html:18
 msgid "Confirm password:"
 msgstr ""
 
-#: bookwyrm/templates/password_reset_request.html:12
+#: bookwyrm/templates/password_reset_request.html:14
 msgid "A link to reset your password will be sent to your email address"
 msgstr ""
 
-#: bookwyrm/templates/password_reset_request.html:16
-#: bookwyrm/templates/preferences/edit_user.html:38
-#: bookwyrm/templates/snippets/register_form.html:13
-msgid "Email address:"
-msgstr ""
-
-#: bookwyrm/templates/password_reset_request.html:23
+#: bookwyrm/templates/password_reset_request.html:28
 msgid "Reset password"
 msgstr ""
 
@@ -1308,6 +1504,19 @@ msgstr ""
 msgid "Manually approve followers:"
 msgstr ""
 
+#: bookwyrm/templates/preferences/edit_user.html:58
+msgid "Show this account in suggested users:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:62
+#, python-format
+msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:65
+msgid "Preferred Timezone: "
+msgstr ""
+
 #: bookwyrm/templates/preferences/preferences_layout.html:11
 msgid "Account"
 msgstr ""
@@ -1350,37 +1559,37 @@ msgstr ""
 msgid "Manage Users"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:27
+#: bookwyrm/templates/settings/admin_layout.html:28
 #: bookwyrm/templates/settings/federation.html:4
 msgid "Federated Servers"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/admin_layout.html:33
 msgid "Instance Settings"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:36
+#: bookwyrm/templates/settings/admin_layout.html:37
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:39
+#: bookwyrm/templates/settings/admin_layout.html:40
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:40
+#: bookwyrm/templates/settings/admin_layout.html:41
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:41
+#: bookwyrm/templates/settings/admin_layout.html:42
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:42
+#: bookwyrm/templates/settings/admin_layout.html:43
 #: bookwyrm/templates/settings/site.html:77
 msgid "Registration"
 msgstr ""
@@ -1394,42 +1603,106 @@ msgid "Software"
 msgstr ""
 
 #: bookwyrm/templates/settings/federation.html:12
+#: bookwyrm/templates/settings/manage_invite_requests.html:33
 msgid "Status"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invites.html:7
+#: bookwyrm/templates/settings/manage_invite_requests.html:4
+#: bookwyrm/templates/settings/manage_invite_requests.html:11
+#: bookwyrm/templates/settings/manage_invite_requests.html:25
+#: bookwyrm/templates/settings/manage_invites.html:11
+msgid "Invite Requests"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:23
+msgid "Ignored Invite Requests"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:31
+msgid "Date"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:32
+msgid "Email"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:34
+msgid "Action"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:37
+msgid "No requests"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:45
+msgid "Accepted"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:47
+msgid "Sent"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:49
+msgid "Requested"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:57
+msgid "Send invite"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:59
+msgid "Re-send invite"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:70
+msgid "Ignore"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:72
+msgid "Un-gnore"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:83
+msgid "Back to pending requests"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:85
+msgid "View ignored requests"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:21
 msgid "Generate New Invite"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invites.html:13
+#: bookwyrm/templates/settings/manage_invites.html:27
 msgid "Expiry:"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invites.html:19
+#: bookwyrm/templates/settings/manage_invites.html:33
 msgid "Use limit:"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invites.html:26
+#: bookwyrm/templates/settings/manage_invites.html:40
 msgid "Create Invite"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invites.html:33
+#: bookwyrm/templates/settings/manage_invites.html:47
 msgid "Link"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invites.html:34
+#: bookwyrm/templates/settings/manage_invites.html:48
 msgid "Expires"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invites.html:35
+#: bookwyrm/templates/settings/manage_invites.html:49
 msgid "Max uses"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invites.html:36
+#: bookwyrm/templates/settings/manage_invites.html:50
 msgid "Times used"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invites.html:39
+#: bookwyrm/templates/settings/manage_invites.html:53
 msgid "No active invites"
 msgstr ""
 
@@ -1482,6 +1755,10 @@ msgid "Allow registration:"
 msgstr ""
 
 #: bookwyrm/templates/settings/site.html:83
+msgid "Allow invite requests:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:87
 msgid "Registration closed text:"
 msgstr ""
 
@@ -1526,29 +1803,64 @@ msgstr ""
 msgid "Quote"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:21
+#: bookwyrm/templates/snippets/create_status_form.html:18
+msgid "Comment:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status_form.html:20
+msgid "Quote:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status_form.html:22
+msgid "Review:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status_form.html:29
 #: bookwyrm/templates/snippets/shelf.html:17
 msgid "Rating"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:23
+#: bookwyrm/templates/snippets/create_status_form.html:31
 #: bookwyrm/templates/snippets/rate_action.html:14
 #: bookwyrm/templates/snippets/stars.html:3
 msgid "No rating"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:54
+#: bookwyrm/templates/snippets/create_status_form.html:64
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
+msgid "Progress:"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status_form.html:71
+#: bookwyrm/templates/snippets/readthrough_form.html:22
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
+msgid "pages"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status_form.html:72
+#: bookwyrm/templates/snippets/readthrough_form.html:23
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
+msgid "percent"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status_form.html:77
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
+#, python-format
+msgid "of %(pages)s pages"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status_form.html:89
 msgid "Include spoiler alert"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:60
+#: bookwyrm/templates/snippets/create_status_form.html:95
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:19
 msgid "Private"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:67
+#: bookwyrm/templates/snippets/create_status_form.html:102
 msgid "Post"
 msgstr ""
 
@@ -1578,19 +1890,15 @@ msgstr ""
 msgid "Un-like status"
 msgstr ""
 
-#: bookwyrm/templates/snippets/follow_button.html:13
-msgid "Send follow request"
-msgstr ""
-
-#: bookwyrm/templates/snippets/follow_button.html:15
+#: bookwyrm/templates/snippets/follow_button.html:12
 msgid "Follow"
 msgstr ""
 
-#: bookwyrm/templates/snippets/follow_button.html:22
+#: bookwyrm/templates/snippets/follow_button.html:18
 msgid "Undo follow request"
 msgstr ""
 
-#: bookwyrm/templates/snippets/follow_button.html:24
+#: bookwyrm/templates/snippets/follow_button.html:20
 msgid "Unfollow"
 msgstr ""
 
@@ -1607,13 +1915,21 @@ msgstr[1] ""
 
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
 #, python-format
-msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(rating)s star"
-msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(rating)s stars"
+msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
+msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/snippets/goal_card.html:22
-msgid "Dismiss message"
+#: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4
+#, python-format
+msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
+msgid_plural "Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/snippets/generated_status/review_pure_name.html:8
+#, python-format
+msgid "Review of \"%(book_title)s\": %(review_title)s"
 msgstr ""
 
 #: bookwyrm/templates/snippets/goal_card.html:23
@@ -1696,25 +2012,6 @@ msgstr ""
 msgid "Followers"
 msgstr ""
 
-#: bookwyrm/templates/snippets/progress_update.html:6
-msgid "Progress:"
-msgstr ""
-
-#: bookwyrm/templates/snippets/progress_update.html:16
-#: bookwyrm/templates/snippets/readthrough_form.html:22
-msgid "pages"
-msgstr ""
-
-#: bookwyrm/templates/snippets/progress_update.html:17
-#: bookwyrm/templates/snippets/readthrough_form.html:23
-msgid "percent"
-msgstr ""
-
-#: bookwyrm/templates/snippets/progress_update.html:25
-#, python-format
-msgid "of %(book.pages)s pages"
-msgstr ""
-
 #: bookwyrm/templates/snippets/rate_action.html:4
 msgid "Leave a rating"
 msgstr ""
@@ -1853,6 +2150,11 @@ msgstr ""
 msgid "Finish \"<em>%(book_title)s</em>\""
 msgstr ""
 
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:33
+msgid "Update progress"
+msgstr ""
+
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5
 msgid "More shelves"
 msgstr ""
@@ -2073,3 +2375,12 @@ msgstr[1] ""
 #, python-format
 msgid "%(counter)s following"
 msgstr ""
+
+#: bookwyrm/views/password.py:32
+msgid "No user with that email address was found."
+msgstr ""
+
+#: bookwyrm/views/password.py:41
+#, python-format
+msgid "A password reset link sent to %s"
+msgstr ""
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index 6e6dc04432d6f98bbbd9ab4ae59db541fb2da4d6..a0e975bfd6c5cf6cfbb0e2831935875c92417082 100644
GIT binary patch
delta 8604
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

delta 8716
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

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index fdbb0609..729048eb 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 11:41-0700\n"
+"POT-Creation-Date: 2021-03-28 22:42+0000\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,71 +18,76 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/forms.py:203
+#: bookwyrm/forms.py:213
+#, fuzzy
+#| msgid "A user with that username already exists."
+msgid "A user with this email already exists."
+msgstr "Ya existe un usuario con ese nombre."
+
+#: bookwyrm/forms.py:227
 msgid "One Day"
 msgstr "Un día"
 
-#: bookwyrm/forms.py:204
+#: bookwyrm/forms.py:228
 msgid "One Week"
 msgstr "Una semana"
 
-#: bookwyrm/forms.py:205
+#: bookwyrm/forms.py:229
 msgid "One Month"
 msgstr "Un mes"
 
-#: bookwyrm/forms.py:206
+#: bookwyrm/forms.py:230
 msgid "Does Not Expire"
 msgstr "Nunca se vence"
 
-#: bookwyrm/forms.py:211
+#: bookwyrm/forms.py:235
 #, python-format
 msgid "%(count)d uses"
 msgstr "%(count)d usos"
 
-#: bookwyrm/forms.py:214
+#: bookwyrm/forms.py:238
 msgid "Unlimited"
 msgstr "Sin límite"
 
-#: bookwyrm/models/fields.py:24
+#: bookwyrm/models/fields.py:25
 #, python-format
 msgid "%(value)s is not a valid remote_id"
 msgstr "%(value)s no es un remote_id válido"
 
-#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
+#: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:47
 #, python-format
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s no es un usuario válido"
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:152
+#: bookwyrm/models/fields.py:170 bookwyrm/templates/layout.html:157
 msgid "username"
 msgstr "nombre de usuario"
 
-#: bookwyrm/models/fields.py:170
+#: bookwyrm/models/fields.py:175
 msgid "A user with that username already exists."
 msgstr "Ya existe un usuario con ese nombre."
 
-#: bookwyrm/settings.py:142
+#: bookwyrm/settings.py:148
 msgid "English"
 msgstr "Inglés"
 
-#: bookwyrm/settings.py:143
+#: bookwyrm/settings.py:149
 msgid "German"
 msgstr "Aléman"
 
-#: bookwyrm/settings.py:144
+#: bookwyrm/settings.py:150
 msgid "Spanish"
 msgstr "Español"
 
-#: bookwyrm/settings.py:145
+#: bookwyrm/settings.py:151
 msgid "French"
 msgstr "Francés"
 
-#: bookwyrm/settings.py:146
+#: bookwyrm/settings.py:152
 msgid "Simplified Chinese"
 msgstr "Chino simplificado"
 
 #: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
-#: bookwyrm/templates/edit_author.html:5
 msgid "Edit Author"
 msgstr "Editar Autor/Autora"
 
@@ -174,11 +179,11 @@ msgstr "Descripción:"
 #: bookwyrm/templates/book/book.html:121
 #: bookwyrm/templates/book/edit_book.html:225
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:56
-#: bookwyrm/templates/settings/site.html:89
-#: bookwyrm/templates/snippets/progress_update.html:21
+#: bookwyrm/templates/preferences/edit_user.html:68
+#: bookwyrm/templates/settings/site.html:93
 #: bookwyrm/templates/snippets/readthrough.html:64
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
 msgid "Save"
 msgstr "Guardar"
@@ -192,6 +197,7 @@ msgstr "Guardar"
 #: bookwyrm/templates/snippets/goal_form.html:32
 #: bookwyrm/templates/snippets/readthrough.html:65
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
 msgid "Cancel"
@@ -447,10 +453,120 @@ msgid "Openlibrary key:"
 msgstr "Clave OpenLibrary:"
 
 #: bookwyrm/templates/components/inline_form.html:8
-#: bookwyrm/templates/feed/feed_layout.html:54
+#: bookwyrm/templates/feed/feed_layout.html:57
 msgid "Close"
 msgstr "Cerrar"
 
+#: bookwyrm/templates/directory.html:6 bookwyrm/templates/directory.html:11
+#: bookwyrm/templates/layout.html:97
+msgid "Directory"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:19
+msgid "Make your profile discoverable to other BookWyrm users."
+msgstr ""
+
+#: bookwyrm/templates/directory.html:26
+#, fuzzy, python-format
+#| msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
+msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
+msgstr "Puedes establecer o cambiar tu meta de lectura en cualquier momento que desees desde tu <a href=\"%(path)s\">perfil</a>"
+
+#: bookwyrm/templates/directory.html:31
+#: bookwyrm/templates/snippets/goal_card.html:22
+msgid "Dismiss message"
+msgstr "Desechar mensaje"
+
+#: bookwyrm/templates/directory.html:44
+#, fuzzy
+#| msgid "Show less"
+msgid "Show filters"
+msgstr "Mostrar menos"
+
+#: bookwyrm/templates/directory.html:46
+msgid "Hide filters"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:55
+#, fuzzy
+#| msgid "User Activity"
+msgid "User type"
+msgstr "Actividad de usuario"
+
+#: bookwyrm/templates/directory.html:58
+msgid "BookWyrm users"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:62
+msgid "All known users"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:68
+#, fuzzy
+#| msgid "Comment"
+msgid "Community"
+msgstr "Comentario"
+
+#: bookwyrm/templates/directory.html:71
+#, fuzzy
+#| msgid "Max uses"
+msgid "Local users"
+msgstr "Número máximo de usos"
+
+#: bookwyrm/templates/directory.html:75
+#, fuzzy
+#| msgid "Federated"
+msgid "Federated community"
+msgstr "Federalizado"
+
+#: bookwyrm/templates/directory.html:81
+msgid "Order by"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:84
+#, fuzzy
+#| msgid "Suggest"
+msgid "Suggested"
+msgstr "Sugerir"
+
+#: bookwyrm/templates/directory.html:85
+msgid "Recently active"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:91
+msgid "Apply filters"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:94
+#, fuzzy
+#| msgid "Clear search"
+msgid "Clear filters"
+msgstr "Borrar búsqueda"
+
+#: bookwyrm/templates/directory.html:128
+#, fuzzy
+#| msgid "followed you"
+msgid "follower you follow"
+msgid_plural "followers you follow"
+msgstr[0] "te siguió"
+msgstr[1] "te siguió"
+
+#: bookwyrm/templates/directory.html:135
+#, fuzzy
+#| msgid "Your shelves"
+msgid "book on your shelves"
+msgid_plural "books on your shelves"
+msgstr[0] "Tus estantes"
+msgstr[1] "Tus estantes"
+
+#: bookwyrm/templates/directory.html:143
+msgid "posts"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:149
+msgid "last active"
+msgstr ""
+
 #: bookwyrm/templates/discover/about.html:7
 #, python-format
 msgid "About %(site_name)s"
@@ -491,15 +607,41 @@ msgstr "Anti-corporativo"
 msgid "Join %(name)s"
 msgstr "Unirse con %(name)s"
 
-#: bookwyrm/templates/discover/landing_layout.html:49
+#: bookwyrm/templates/discover/landing_layout.html:51
 #: bookwyrm/templates/login.html:48
 msgid "This instance is closed"
 msgstr "Esta instancia está cerrada."
 
-#: bookwyrm/templates/discover/landing_layout.html:55
+#: bookwyrm/templates/discover/landing_layout.html:57
+msgid "Thank you! Your request has been received."
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:60
+msgid "Request an Invitation"
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:64
+#: bookwyrm/templates/password_reset_request.html:18
+#: bookwyrm/templates/preferences/edit_user.html:38
+#: bookwyrm/templates/snippets/register_form.html:13
+msgid "Email address:"
+msgstr "Dirección de correo electrónico:"
+
+#: bookwyrm/templates/discover/landing_layout.html:70
+#: bookwyrm/templates/moderation/report_modal.html:31
+msgid "Submit"
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:79
 msgid "Your Account"
 msgstr "Tu cuenta"
 
+#: bookwyrm/templates/edit_author.html:5
+#, fuzzy
+#| msgid "Edit Author"
+msgid "Edit Author:"
+msgstr "Editar Autor/Autora"
+
 #: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
 #: bookwyrm/templates/user/create_shelf_form.html:13
 #: bookwyrm/templates/user/edit_shelf_form.html:14
@@ -544,6 +686,72 @@ msgstr "Ediciones de %(book_title)s"
 msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 msgstr "Ediciones de <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 
+#: bookwyrm/templates/email/html_layout.html:15
+#: bookwyrm/templates/email/text_layout.html:2
+msgid "Hi there,"
+msgstr ""
+
+#: bookwyrm/templates/email/html_layout.html:21
+#, python-format
+msgid "BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/email/html_layout.html:23
+msgid "Email preference"
+msgstr ""
+
+#: bookwyrm/templates/email/invite/html_content.html:6
+#: bookwyrm/templates/email/invite/subject.html:2
+#, fuzzy, python-format
+#| msgid "About %(site_name)s"
+msgid "You're invited to join %(site_name)s!"
+msgstr "Sobre %(site_name)s"
+
+#: bookwyrm/templates/email/invite/html_content.html:9
+msgid "Join Now"
+msgstr ""
+
+#: bookwyrm/templates/email/invite/html_content.html:15
+#, python-format
+msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
+msgstr ""
+
+#: bookwyrm/templates/email/invite/text_content.html:4
+#, python-format
+msgid "You're invited to join %(site_name)s! Click the link below to create an account."
+msgstr ""
+
+#: bookwyrm/templates/email/invite/text_content.html:8
+#, fuzzy
+#| msgid "More about this site"
+msgid "Learn more about this instance:"
+msgstr "Más sobre este sitio"
+
+#: bookwyrm/templates/email/password_reset/html_content.html:6
+#: bookwyrm/templates/email/password_reset/text_content.html:4
+#, python-format
+msgid "You requested to reset your %(site_name)s password. Click the link below to set a new password and log in to your account."
+msgstr ""
+
+#: bookwyrm/templates/email/password_reset/html_content.html:9
+#: bookwyrm/templates/password_reset.html:4
+#: bookwyrm/templates/password_reset.html:10
+#: bookwyrm/templates/password_reset_request.html:4
+#: bookwyrm/templates/password_reset_request.html:10
+msgid "Reset Password"
+msgstr "Restablecer contraseña"
+
+#: bookwyrm/templates/email/password_reset/html_content.html:13
+#: bookwyrm/templates/email/password_reset/text_content.html:8
+msgid "If you didn't request to reset your password, you can ignore this email."
+msgstr ""
+
+#: bookwyrm/templates/email/password_reset/subject.html:2
+#, fuzzy, python-format
+#| msgid "About %(site_name)s"
+msgid "Reset your %(site_name)s password"
+msgstr "Sobre %(site_name)s"
+
 #: bookwyrm/templates/error.html:4
 msgid "Oops!"
 msgstr "¡Úps!"
@@ -574,27 +782,61 @@ msgstr "Todos los mensajes"
 msgid "You have no messages right now."
 msgstr "No tienes ningún mensaje en este momento."
 
-#: bookwyrm/templates/feed/feed.html:6
-#, python-format
-msgid "%(tab_title)s Timeline"
+#: bookwyrm/templates/feed/feed.html:9
+msgid "Home Timeline"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:11
+#, fuzzy
+#| msgid "%(tab_title)s Timeline"
+msgid "Local Timeline"
 msgstr "%(tab_title)s Línea temporal"
 
-#: bookwyrm/templates/feed/feed.html:10 bookwyrm/views/feed.py:33
+#: bookwyrm/templates/feed/feed.html:13
+#, fuzzy
+#| msgid "Federated Servers"
+msgid "Federated Timeline"
+msgstr "Servidores federalizados"
+
+#: bookwyrm/templates/feed/feed.html:19
 msgid "Home"
 msgstr "Hogar"
 
-#: bookwyrm/templates/feed/feed.html:13 bookwyrm/views/feed.py:38
+#: bookwyrm/templates/feed/feed.html:22
 msgid "Local"
 msgstr "Local"
 
-#: bookwyrm/templates/feed/feed.html:16 bookwyrm/views/feed.py:43
+#: bookwyrm/templates/feed/feed.html:25
 msgid "Federated"
 msgstr "Federalizado"
 
-#: bookwyrm/templates/feed/feed.html:32
+#: bookwyrm/templates/feed/feed.html:33
+#, python-format
+msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:48
 msgid "There aren't any activities right now! Try following a user to get started"
 msgstr "¡No hay actividades en este momento! Sigue a otro usuario para empezar"
 
+#: bookwyrm/templates/feed/feed.html:56
+msgid "Who to follow"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:69
+#, python-format
+msgid "%(mutuals)s follower you follow"
+msgid_plural "%(mutuals)s followers you follow"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/feed/feed.html:72
+#, python-format
+msgid "%(shared_books)s book on your shelves"
+msgid_plural "%(shared_books)s books on your shelves"
+msgstr[0] ""
+msgstr[1] ""
+
 #: bookwyrm/templates/feed/feed_layout.html:5
 msgid "Updates"
 msgstr "Actualizaciones"
@@ -623,7 +865,7 @@ msgstr "Leyendo actualmente"
 msgid "Read"
 msgstr "Leer"
 
-#: bookwyrm/templates/feed/feed_layout.html:76 bookwyrm/templates/goal.html:26
+#: bookwyrm/templates/feed/feed_layout.html:74 bookwyrm/templates/goal.html:26
 #: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
 msgid "%(year)s Reading Goal"
@@ -815,67 +1057,69 @@ msgstr "Actividad"
 msgid "Profile"
 msgstr "Perfil"
 
-#: bookwyrm/templates/layout.html:97
+#: bookwyrm/templates/layout.html:107
 msgid "Settings"
 msgstr "Configuración"
 
-#: bookwyrm/templates/layout.html:111
-#: bookwyrm/templates/settings/admin_layout.html:19
+#: bookwyrm/templates/layout.html:116
+#: bookwyrm/templates/settings/admin_layout.html:20
+#: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
+#: bookwyrm/templates/settings/manage_invites.html:15
 msgid "Invites"
 msgstr "Invitaciones"
 
-#: bookwyrm/templates/layout.html:118
+#: bookwyrm/templates/layout.html:123
 msgid "Admin"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:125
+#: bookwyrm/templates/layout.html:130
 msgid "Log out"
 msgstr "Cerrar sesión"
 
-#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
+#: bookwyrm/templates/layout.html:138 bookwyrm/templates/layout.html:139
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:10
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155
+#: bookwyrm/templates/layout.html:156 bookwyrm/templates/layout.html:160
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "Nombre de usuario:"
 
-#: bookwyrm/templates/layout.html:156
+#: bookwyrm/templates/layout.html:161
 msgid "password"
 msgstr "contraseña"
 
-#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:162 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr "¿Olvidaste tu contraseña?"
 
-#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:165 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "Iniciar sesión"
 
-#: bookwyrm/templates/layout.html:168
+#: bookwyrm/templates/layout.html:173
 msgid "Join"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:191
+#: bookwyrm/templates/layout.html:196
 msgid "About this server"
 msgstr "Sobre este servidor"
 
-#: bookwyrm/templates/layout.html:195
+#: bookwyrm/templates/layout.html:200
 msgid "Contact site admin"
 msgstr "Contactarse con administradores del sitio"
 
-#: bookwyrm/templates/layout.html:202
+#: bookwyrm/templates/layout.html:207
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:206
+#: bookwyrm/templates/layout.html:211
 msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm es software de código abierto. Puedes contribuir o reportar problemas en <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
@@ -1073,7 +1317,7 @@ msgstr ""
 
 #: bookwyrm/templates/moderation/report.html:54
 #: bookwyrm/templates/snippets/create_status.html:12
-#: bookwyrm/templates/snippets/create_status_form.html:44
+#: bookwyrm/templates/snippets/create_status_form.html:52
 msgid "Comment"
 msgstr "Comentario"
 
@@ -1108,10 +1352,6 @@ msgstr ""
 msgid "More info about this report:"
 msgstr "Más sobre este sitio"
 
-#: bookwyrm/templates/moderation/report_modal.html:31
-msgid "Submit"
-msgstr ""
-
 #: bookwyrm/templates/moderation/report_preview.html:13
 msgid "No notes provided"
 msgstr ""
@@ -1132,7 +1372,7 @@ msgstr ""
 
 #: bookwyrm/templates/moderation/reports.html:4
 #: bookwyrm/templates/moderation/reports.html:5
-#: bookwyrm/templates/settings/admin_layout.html:23
+#: bookwyrm/templates/settings/admin_layout.html:24
 #, fuzzy
 #| msgid "Recent Imports"
 msgid "Reports"
@@ -1268,29 +1508,16 @@ msgstr ""
 msgid "You're all caught up!"
 msgstr "¡Estás al día!"
 
-#: bookwyrm/templates/password_reset.html:4
-#: bookwyrm/templates/password_reset.html:10
-#: bookwyrm/templates/password_reset_request.html:4
-#: bookwyrm/templates/password_reset_request.html:10
-msgid "Reset Password"
-msgstr "Restablecer contraseña"
-
 #: bookwyrm/templates/password_reset.html:23
 #: bookwyrm/templates/preferences/change_password.html:18
 msgid "Confirm password:"
 msgstr "Confirmar contraseña:"
 
-#: bookwyrm/templates/password_reset_request.html:12
+#: bookwyrm/templates/password_reset_request.html:14
 msgid "A link to reset your password will be sent to your email address"
 msgstr "Un enlace para restablecer tu contraseña se enviará a tu dirección de correo electrónico"
 
-#: bookwyrm/templates/password_reset_request.html:16
-#: bookwyrm/templates/preferences/edit_user.html:38
-#: bookwyrm/templates/snippets/register_form.html:13
-msgid "Email address:"
-msgstr "Dirección de correo electrónico:"
-
-#: bookwyrm/templates/password_reset_request.html:23
+#: bookwyrm/templates/password_reset_request.html:28
 msgid "Reset password"
 msgstr "Restablecer contraseña"
 
@@ -1340,6 +1567,19 @@ msgstr ""
 msgid "Manually approve followers:"
 msgstr "Aprobar seguidores a mano:"
 
+#: bookwyrm/templates/preferences/edit_user.html:58
+msgid "Show this account in suggested users:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:62
+#, python-format
+msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:65
+msgid "Preferred Timezone: "
+msgstr "Huso horario preferido"
+
 #: bookwyrm/templates/preferences/preferences_layout.html:11
 msgid "Account"
 msgstr "Cuenta"
@@ -1382,37 +1622,37 @@ msgstr "Adminstración"
 msgid "Manage Users"
 msgstr "Administrar usuarios"
 
-#: bookwyrm/templates/settings/admin_layout.html:27
+#: bookwyrm/templates/settings/admin_layout.html:28
 #: bookwyrm/templates/settings/federation.html:4
 msgid "Federated Servers"
 msgstr "Servidores federalizados"
 
-#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/admin_layout.html:33
 msgid "Instance Settings"
 msgstr "Configuración de instancia"
 
-#: bookwyrm/templates/settings/admin_layout.html:36
+#: bookwyrm/templates/settings/admin_layout.html:37
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr "Configuración de sitio"
 
-#: bookwyrm/templates/settings/admin_layout.html:39
+#: bookwyrm/templates/settings/admin_layout.html:40
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr "Información de instancia"
 
-#: bookwyrm/templates/settings/admin_layout.html:40
+#: bookwyrm/templates/settings/admin_layout.html:41
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr "Imagenes"
 
-#: bookwyrm/templates/settings/admin_layout.html:41
+#: bookwyrm/templates/settings/admin_layout.html:42
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr "Contenido del pie de página"
 
-#: bookwyrm/templates/settings/admin_layout.html:42
+#: bookwyrm/templates/settings/admin_layout.html:43
 #: bookwyrm/templates/settings/site.html:77
 msgid "Registration"
 msgstr "Registración"
@@ -1426,42 +1666,114 @@ msgid "Software"
 msgstr "Software"
 
 #: bookwyrm/templates/settings/federation.html:12
+#: bookwyrm/templates/settings/manage_invite_requests.html:33
 msgid "Status"
 msgstr "Status"
 
-#: bookwyrm/templates/settings/manage_invites.html:7
+#: bookwyrm/templates/settings/manage_invite_requests.html:4
+#: bookwyrm/templates/settings/manage_invite_requests.html:11
+#: bookwyrm/templates/settings/manage_invite_requests.html:25
+#: bookwyrm/templates/settings/manage_invites.html:11
+#, fuzzy
+#| msgid "Invites"
+msgid "Invite Requests"
+msgstr "Invitaciones"
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:23
+msgid "Ignored Invite Requests"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:31
+msgid "Date"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:32
+msgid "Email"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:34
+#, fuzzy
+#| msgid "Notifications"
+msgid "Action"
+msgstr "Notificaciones"
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:37
+#, fuzzy
+#| msgid "Follow Requests"
+msgid "No requests"
+msgstr "Solicitudes de seguidor"
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:45
+#, fuzzy
+#| msgid "Accept"
+msgid "Accepted"
+msgstr "Aceptar"
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:47
+msgid "Sent"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:49
+msgid "Requested"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:57
+msgid "Send invite"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:59
+msgid "Re-send invite"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:70
+msgid "Ignore"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:72
+msgid "Un-gnore"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:83
+msgid "Back to pending requests"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:85
+msgid "View ignored requests"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:21
 msgid "Generate New Invite"
 msgstr "Generar nuevo invitación"
 
-#: bookwyrm/templates/settings/manage_invites.html:13
+#: bookwyrm/templates/settings/manage_invites.html:27
 msgid "Expiry:"
 msgstr "Vencimiento:"
 
-#: bookwyrm/templates/settings/manage_invites.html:19
+#: bookwyrm/templates/settings/manage_invites.html:33
 msgid "Use limit:"
 msgstr "Límite de uso:"
 
-#: bookwyrm/templates/settings/manage_invites.html:26
+#: bookwyrm/templates/settings/manage_invites.html:40
 msgid "Create Invite"
 msgstr "Crear invitación"
 
-#: bookwyrm/templates/settings/manage_invites.html:33
+#: bookwyrm/templates/settings/manage_invites.html:47
 msgid "Link"
 msgstr "Enlace"
 
-#: bookwyrm/templates/settings/manage_invites.html:34
+#: bookwyrm/templates/settings/manage_invites.html:48
 msgid "Expires"
 msgstr "Vence"
 
-#: bookwyrm/templates/settings/manage_invites.html:35
+#: bookwyrm/templates/settings/manage_invites.html:49
 msgid "Max uses"
 msgstr "Número máximo de usos"
 
-#: bookwyrm/templates/settings/manage_invites.html:36
+#: bookwyrm/templates/settings/manage_invites.html:50
 msgid "Times used"
 msgstr "Número de usos"
 
-#: bookwyrm/templates/settings/manage_invites.html:39
+#: bookwyrm/templates/settings/manage_invites.html:53
 msgid "No active invites"
 msgstr "No invitaciónes activas"
 
@@ -1514,6 +1826,12 @@ msgid "Allow registration:"
 msgstr "Permitir registración:"
 
 #: bookwyrm/templates/settings/site.html:83
+#, fuzzy
+#| msgid "Follow Requests"
+msgid "Allow invite requests:"
+msgstr "Solicitudes de seguidor"
+
+#: bookwyrm/templates/settings/site.html:87
 msgid "Registration closed text:"
 msgstr "Texto de registración cerrada:"
 
@@ -1558,29 +1876,70 @@ msgstr "Reseña"
 msgid "Quote"
 msgstr "Cita"
 
-#: bookwyrm/templates/snippets/create_status_form.html:21
+#: bookwyrm/templates/snippets/create_status_form.html:18
+#, fuzzy
+#| msgid "Comment"
+msgid "Comment:"
+msgstr "Comentario"
+
+#: bookwyrm/templates/snippets/create_status_form.html:20
+#, fuzzy
+#| msgid "Quote"
+msgid "Quote:"
+msgstr "Cita"
+
+#: bookwyrm/templates/snippets/create_status_form.html:22
+#, fuzzy
+#| msgid "Review"
+msgid "Review:"
+msgstr "Reseña"
+
+#: bookwyrm/templates/snippets/create_status_form.html:29
 #: bookwyrm/templates/snippets/shelf.html:17
 msgid "Rating"
 msgstr "Calificación"
 
-#: bookwyrm/templates/snippets/create_status_form.html:23
+#: bookwyrm/templates/snippets/create_status_form.html:31
 #: bookwyrm/templates/snippets/rate_action.html:14
 #: bookwyrm/templates/snippets/stars.html:3
 msgid "No rating"
 msgstr "No calificación"
 
-#: bookwyrm/templates/snippets/create_status_form.html:54
+#: bookwyrm/templates/snippets/create_status_form.html:64
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
+msgid "Progress:"
+msgstr "Progreso:"
+
+#: bookwyrm/templates/snippets/create_status_form.html:71
+#: bookwyrm/templates/snippets/readthrough_form.html:22
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
+msgid "pages"
+msgstr "páginas"
+
+#: bookwyrm/templates/snippets/create_status_form.html:72
+#: bookwyrm/templates/snippets/readthrough_form.html:23
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
+msgid "percent"
+msgstr "por ciento"
+
+#: bookwyrm/templates/snippets/create_status_form.html:77
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
+#, python-format
+msgid "of %(pages)s pages"
+msgstr "de %(pages)s páginas"
+
+#: bookwyrm/templates/snippets/create_status_form.html:89
 msgid "Include spoiler alert"
 msgstr "Incluir alerta de spoiler"
 
-#: bookwyrm/templates/snippets/create_status_form.html:60
+#: bookwyrm/templates/snippets/create_status_form.html:95
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:19
 msgid "Private"
 msgstr "Privada"
 
-#: bookwyrm/templates/snippets/create_status_form.html:67
+#: bookwyrm/templates/snippets/create_status_form.html:102
 msgid "Post"
 msgstr "Compartir"
 
@@ -1610,21 +1969,17 @@ msgstr "Me gusta status"
 msgid "Un-like status"
 msgstr "Quitar me gusta de status"
 
-#: bookwyrm/templates/snippets/follow_button.html:13
-msgid "Send follow request"
-msgstr "Envia solicitud de seguidor"
-
-#: bookwyrm/templates/snippets/follow_button.html:15
+#: bookwyrm/templates/snippets/follow_button.html:12
 msgid "Follow"
 msgstr "Seguir"
 
-#: bookwyrm/templates/snippets/follow_button.html:22
+#: bookwyrm/templates/snippets/follow_button.html:18
 #, fuzzy
 #| msgid "Send follow request"
 msgid "Undo follow request"
 msgstr "Envia solicitud de seguidor"
 
-#: bookwyrm/templates/snippets/follow_button.html:24
+#: bookwyrm/templates/snippets/follow_button.html:20
 msgid "Unfollow"
 msgstr "Dejar de seguir"
 
@@ -1642,14 +1997,22 @@ msgstr[1] "estableció una meta de leer %(counter)s libros en %(year)s"
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
 #, fuzzy, python-format
 #| msgid "<a href=\"%(path)s\">%(title)s</a> by "
-msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(rating)s star"
-msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(rating)s stars"
+msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
+msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
 msgstr[0] "<a href=\"%(path)s\">%(title)s</a> por "
 msgstr[1] "<a href=\"%(path)s\">%(title)s</a> por "
 
-#: bookwyrm/templates/snippets/goal_card.html:22
-msgid "Dismiss message"
-msgstr "Desechar mensaje"
+#: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4
+#, python-format
+msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
+msgid_plural "Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/snippets/generated_status/review_pure_name.html:8
+#, python-format
+msgid "Review of \"%(book_title)s\": %(review_title)s"
+msgstr ""
 
 #: bookwyrm/templates/snippets/goal_card.html:23
 #, python-format
@@ -1731,25 +2094,6 @@ msgstr "Privacidad de publicación"
 msgid "Followers"
 msgstr "Seguidores"
 
-#: bookwyrm/templates/snippets/progress_update.html:6
-msgid "Progress:"
-msgstr "Progreso:"
-
-#: bookwyrm/templates/snippets/progress_update.html:16
-#: bookwyrm/templates/snippets/readthrough_form.html:22
-msgid "pages"
-msgstr "páginas"
-
-#: bookwyrm/templates/snippets/progress_update.html:17
-#: bookwyrm/templates/snippets/readthrough_form.html:23
-msgid "percent"
-msgstr "por ciento"
-
-#: bookwyrm/templates/snippets/progress_update.html:25
-#, python-format
-msgid "of %(pages)s pages"
-msgstr "de %(pages)s páginas"
-
 #: bookwyrm/templates/snippets/rate_action.html:4
 msgid "Leave a rating"
 msgstr "Da una calificación"
@@ -1892,6 +2236,13 @@ msgstr "Retirar del estante"
 msgid "Finish \"<em>%(book_title)s</em>\""
 msgstr "Terminar \"<em>%(book_title)s</em>\""
 
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:33
+#, fuzzy
+#| msgid "Updates"
+msgid "Update progress"
+msgstr "Actualizaciones"
+
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5
 msgid "More shelves"
 msgstr "Más estantes"
@@ -2117,6 +2468,20 @@ msgstr[1] "%(counter)s seguidores"
 msgid "%(counter)s following"
 msgstr "%(counter)s siguiendo"
 
+#: bookwyrm/views/password.py:32
+#, fuzzy
+#| msgid "A user with that username already exists."
+msgid "No user with that email address was found."
+msgstr "Ya existe un usuario con ese nombre."
+
+#: bookwyrm/views/password.py:41
+#, python-format
+msgid "A password reset link sent to %s"
+msgstr ""
+
+#~ msgid "Send follow request"
+#~ msgstr "Envia solicitud de seguidor"
+
 #, fuzzy
 #~| msgid "All messages"
 #~ msgid "Messages"
@@ -2132,7 +2497,7 @@ msgstr "%(counter)s siguiendo"
 #~ msgid "Enter a number."
 #~ msgstr "Número de serie:"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "%(value)s is not a valid remote_id"
 #~ msgid "Value %(value)r is not a valid choice."
 #~ msgstr "%(value)s no es un remote_id válido"
@@ -2167,7 +2532,7 @@ msgstr "%(counter)s siguiendo"
 #~ msgid "Positive integer"
 #~ msgstr "No invitaciónes activas"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "%(value)s is not a valid username"
 #~ msgid "“%(value)s� is not a valid UUID."
 #~ msgstr "%(value)s no es un usuario válido"
@@ -2192,7 +2557,7 @@ msgstr "%(counter)s siguiendo"
 #~ msgid "The submitted file is empty."
 #~ msgstr "Este estante está vacio."
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "%(value)s is not a valid username"
 #~ msgid "“%(pk)s� is not a valid value."
 #~ msgstr "%(value)s no es un usuario válido"
@@ -2240,7 +2605,7 @@ msgstr "%(counter)s siguiendo"
 #~ msgid "September"
 #~ msgstr "Número de serie:"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "No books found matching the query \"%(query)s\""
 #~ msgid "No %(verbose_name)s found matching the query"
 #~ msgstr "No se encontró ningún libro correspondiente a la búsqueda: \"%(query)s\""
diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index 0a96b5131dadfb37d2ee2116ce73110d2e1bdc8f..99a9b6cc588edc6458a2cebe23fef38d4b31d76d 100644
GIT binary patch
delta 7168
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
DJ@NEt

delta 7252
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
Xz`O6X+2!*}X1bRbHLmWM|B2sUe-s$l

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 5e58018f..66ee8cf1 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 11:41-0700\n"
+"POT-Creation-Date: 2021-03-28 22:42+0000\n"
 "PO-Revision-Date: 2021-03-02 12:37+0100\n"
 "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -18,75 +18,78 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/forms.py:203
+#: bookwyrm/forms.py:213
+msgid "A user with this email already exists."
+msgstr ""
+
+#: bookwyrm/forms.py:227
 msgid "One Day"
 msgstr ""
 
-#: bookwyrm/forms.py:204
+#: bookwyrm/forms.py:228
 msgid "One Week"
 msgstr ""
 
-#: bookwyrm/forms.py:205
+#: bookwyrm/forms.py:229
 msgid "One Month"
 msgstr ""
 
-#: bookwyrm/forms.py:206
+#: bookwyrm/forms.py:230
 msgid "Does Not Expire"
 msgstr ""
 
-#: bookwyrm/forms.py:211
+#: bookwyrm/forms.py:235
 #, python-format
 msgid "%(count)d uses"
 msgstr ""
 
-#: bookwyrm/forms.py:214
+#: bookwyrm/forms.py:238
 #, fuzzy
 #| msgid "Unlisted"
 msgid "Unlimited"
 msgstr "Non listé"
 
-#: bookwyrm/models/fields.py:24
+#: bookwyrm/models/fields.py:25
 #, python-format
 msgid "%(value)s is not a valid remote_id"
 msgstr ""
 
-#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
+#: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:47
 #, python-format
 msgid "%(value)s is not a valid username"
 msgstr ""
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:152
+#: bookwyrm/models/fields.py:170 bookwyrm/templates/layout.html:157
 #, fuzzy
 #| msgid "Username:"
 msgid "username"
 msgstr "Nom d’utilisateur :"
 
-#: bookwyrm/models/fields.py:170
+#: bookwyrm/models/fields.py:175
 msgid "A user with that username already exists."
 msgstr ""
 
-#: bookwyrm/settings.py:142
+#: bookwyrm/settings.py:148
 msgid "English"
 msgstr ""
 
-#: bookwyrm/settings.py:143
+#: bookwyrm/settings.py:149
 msgid "German"
 msgstr ""
 
-#: bookwyrm/settings.py:144
+#: bookwyrm/settings.py:150
 msgid "Spanish"
 msgstr ""
 
-#: bookwyrm/settings.py:145
+#: bookwyrm/settings.py:151
 msgid "French"
 msgstr ""
 
-#: bookwyrm/settings.py:146
+#: bookwyrm/settings.py:152
 msgid "Simplified Chinese"
 msgstr ""
 
 #: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
-#: bookwyrm/templates/edit_author.html:5
 msgid "Edit Author"
 msgstr "Modifier l’auteur ou autrice"
 
@@ -182,11 +185,11 @@ msgstr "Description :"
 #: bookwyrm/templates/book/book.html:121
 #: bookwyrm/templates/book/edit_book.html:225
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:56
-#: bookwyrm/templates/settings/site.html:89
-#: bookwyrm/templates/snippets/progress_update.html:21
+#: bookwyrm/templates/preferences/edit_user.html:68
+#: bookwyrm/templates/settings/site.html:93
 #: bookwyrm/templates/snippets/readthrough.html:64
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
 msgid "Save"
 msgstr "Enregistrer"
@@ -200,6 +203,7 @@ msgstr "Enregistrer"
 #: bookwyrm/templates/snippets/goal_form.html:32
 #: bookwyrm/templates/snippets/readthrough.html:65
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
 msgid "Cancel"
@@ -460,12 +464,124 @@ msgid "Openlibrary key:"
 msgstr "Clé Openlibrary :"
 
 #: bookwyrm/templates/components/inline_form.html:8
-#: bookwyrm/templates/feed/feed_layout.html:54
+#: bookwyrm/templates/feed/feed_layout.html:57
 #, fuzzy
 #| msgid "Closed"
 msgid "Close"
 msgstr "Fermer"
 
+#: bookwyrm/templates/directory.html:6 bookwyrm/templates/directory.html:11
+#: bookwyrm/templates/layout.html:97
+msgid "Directory"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:19
+msgid "Make your profile discoverable to other BookWyrm users."
+msgstr ""
+
+#: bookwyrm/templates/directory.html:26
+#, fuzzy, python-format
+#| msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
+msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
+msgstr "Vous pouvez définir ou changer vore défi lecture à n’importe quel moment depuis votre <a href=\"%(path)s\">profil</a>"
+
+#: bookwyrm/templates/directory.html:31
+#: bookwyrm/templates/snippets/goal_card.html:22
+msgid "Dismiss message"
+msgstr "Rejeter le message"
+
+#: bookwyrm/templates/directory.html:44
+#, fuzzy
+#| msgid "Show less"
+msgid "Show filters"
+msgstr "Replier"
+
+#: bookwyrm/templates/directory.html:46
+msgid "Hide filters"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:55
+#, fuzzy
+#| msgid "User Activity"
+msgid "User type"
+msgstr "Activité du compte"
+
+#: bookwyrm/templates/directory.html:58
+#, fuzzy
+#| msgid "Blocked users"
+msgid "BookWyrm users"
+msgstr "Comptes bloqués"
+
+#: bookwyrm/templates/directory.html:62
+msgid "All known users"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:68
+#, fuzzy
+#| msgid "Comment"
+msgid "Community"
+msgstr "Commentaire"
+
+#: bookwyrm/templates/directory.html:71
+#, fuzzy
+#| msgid "Blocked users"
+msgid "Local users"
+msgstr "Comptes bloqués"
+
+#: bookwyrm/templates/directory.html:75
+#, fuzzy
+#| msgid "Federated"
+msgid "Federated community"
+msgstr "Fédéré"
+
+#: bookwyrm/templates/directory.html:81
+msgid "Order by"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:84
+#, fuzzy
+#| msgid "Suggest"
+msgid "Suggested"
+msgstr "Suggérer"
+
+#: bookwyrm/templates/directory.html:85
+msgid "Recently active"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:91
+msgid "Apply filters"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:94
+#, fuzzy
+#| msgid "Clear search"
+msgid "Clear filters"
+msgstr "Vider la requête"
+
+#: bookwyrm/templates/directory.html:128
+#, fuzzy
+#| msgid "followed you"
+msgid "follower you follow"
+msgid_plural "followers you follow"
+msgstr[0] "s’est abonné(e)"
+msgstr[1] "s’est abonné(e)"
+
+#: bookwyrm/templates/directory.html:135
+#, fuzzy
+#| msgid "Your shelves"
+msgid "book on your shelves"
+msgid_plural "books on your shelves"
+msgstr[0] "Vos étagères"
+msgstr[1] "Vos étagères"
+
+#: bookwyrm/templates/directory.html:143
+msgid "posts"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:149
+msgid "last active"
+msgstr ""
+
 #: bookwyrm/templates/discover/about.html:7
 #, fuzzy, python-format
 #| msgid "Join %(name)s"
@@ -507,15 +623,41 @@ msgstr "Anti‑commercial"
 msgid "Join %(name)s"
 msgstr "Rejoignez %(name)s"
 
-#: bookwyrm/templates/discover/landing_layout.html:49
+#: bookwyrm/templates/discover/landing_layout.html:51
 #: bookwyrm/templates/login.html:48
 msgid "This instance is closed"
 msgstr "Cette instance est fermée"
 
-#: bookwyrm/templates/discover/landing_layout.html:55
+#: bookwyrm/templates/discover/landing_layout.html:57
+msgid "Thank you! Your request has been received."
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:60
+msgid "Request an Invitation"
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:64
+#: bookwyrm/templates/password_reset_request.html:18
+#: bookwyrm/templates/preferences/edit_user.html:38
+#: bookwyrm/templates/snippets/register_form.html:13
+msgid "Email address:"
+msgstr "Adresse email :"
+
+#: bookwyrm/templates/discover/landing_layout.html:70
+#: bookwyrm/templates/moderation/report_modal.html:31
+msgid "Submit"
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:79
 msgid "Your Account"
 msgstr "Votre compte"
 
+#: bookwyrm/templates/edit_author.html:5
+#, fuzzy
+#| msgid "Edit Author"
+msgid "Edit Author:"
+msgstr "Modifier l’auteur ou autrice"
+
 #: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
 #: bookwyrm/templates/user/create_shelf_form.html:13
 #: bookwyrm/templates/user/edit_shelf_form.html:14
@@ -561,6 +703,72 @@ msgstr "Éditions de %(book_title)s"
 msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 msgstr "Éditions de <a href=\"%(work_path)s\">« %(work_title)s »</a>"
 
+#: bookwyrm/templates/email/html_layout.html:15
+#: bookwyrm/templates/email/text_layout.html:2
+msgid "Hi there,"
+msgstr ""
+
+#: bookwyrm/templates/email/html_layout.html:21
+#, python-format
+msgid "BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/email/html_layout.html:23
+msgid "Email preference"
+msgstr ""
+
+#: bookwyrm/templates/email/invite/html_content.html:6
+#: bookwyrm/templates/email/invite/subject.html:2
+#, fuzzy, python-format
+#| msgid "Join %(name)s"
+msgid "You're invited to join %(site_name)s!"
+msgstr "À propos de %(name)s"
+
+#: bookwyrm/templates/email/invite/html_content.html:9
+msgid "Join Now"
+msgstr ""
+
+#: bookwyrm/templates/email/invite/html_content.html:15
+#, python-format
+msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
+msgstr ""
+
+#: bookwyrm/templates/email/invite/text_content.html:4
+#, python-format
+msgid "You're invited to join %(site_name)s! Click the link below to create an account."
+msgstr ""
+
+#: bookwyrm/templates/email/invite/text_content.html:8
+#, fuzzy
+#| msgid "More about this site"
+msgid "Learn more about this instance:"
+msgstr "En savoir plus sur ce site"
+
+#: bookwyrm/templates/email/password_reset/html_content.html:6
+#: bookwyrm/templates/email/password_reset/text_content.html:4
+#, python-format
+msgid "You requested to reset your %(site_name)s password. Click the link below to set a new password and log in to your account."
+msgstr ""
+
+#: bookwyrm/templates/email/password_reset/html_content.html:9
+#: bookwyrm/templates/password_reset.html:4
+#: bookwyrm/templates/password_reset.html:10
+#: bookwyrm/templates/password_reset_request.html:4
+#: bookwyrm/templates/password_reset_request.html:10
+msgid "Reset Password"
+msgstr "Changez le mot de passe"
+
+#: bookwyrm/templates/email/password_reset/html_content.html:13
+#: bookwyrm/templates/email/password_reset/text_content.html:8
+msgid "If you didn't request to reset your password, you can ignore this email."
+msgstr ""
+
+#: bookwyrm/templates/email/password_reset/subject.html:2
+#, fuzzy, python-format
+#| msgid "Join %(name)s"
+msgid "Reset your %(site_name)s password"
+msgstr "À propos de %(name)s"
+
 #: bookwyrm/templates/error.html:4
 msgid "Oops!"
 msgstr "Oups !"
@@ -591,27 +799,61 @@ msgstr "Tous les messages"
 msgid "You have no messages right now."
 msgstr "Vous n’avez aucun message pour l’instant."
 
-#: bookwyrm/templates/feed/feed.html:6
-#, python-format
-msgid "%(tab_title)s Timeline"
+#: bookwyrm/templates/feed/feed.html:9
+msgid "Home Timeline"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:11
+#, fuzzy
+#| msgid "%(tab_title)s Timeline"
+msgid "Local Timeline"
 msgstr "%(tab_title)s — Fil d’actualité"
 
-#: bookwyrm/templates/feed/feed.html:10 bookwyrm/views/feed.py:33
+#: bookwyrm/templates/feed/feed.html:13
+#, fuzzy
+#| msgid "Federated Servers"
+msgid "Federated Timeline"
+msgstr "Serveurs fédérés"
+
+#: bookwyrm/templates/feed/feed.html:19
 msgid "Home"
 msgstr "Accueil"
 
-#: bookwyrm/templates/feed/feed.html:13 bookwyrm/views/feed.py:38
+#: bookwyrm/templates/feed/feed.html:22
 msgid "Local"
 msgstr "Local"
 
-#: bookwyrm/templates/feed/feed.html:16 bookwyrm/views/feed.py:43
+#: bookwyrm/templates/feed/feed.html:25
 msgid "Federated"
 msgstr "Fédéré"
 
-#: bookwyrm/templates/feed/feed.html:32
+#: bookwyrm/templates/feed/feed.html:33
+#, python-format
+msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:48
 msgid "There aren't any activities right now! Try following a user to get started"
 msgstr "Aucune activité pour l’instant ! Abonnez‑vous à quelqu’un pour commencer"
 
+#: bookwyrm/templates/feed/feed.html:56
+msgid "Who to follow"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:69
+#, python-format
+msgid "%(mutuals)s follower you follow"
+msgid_plural "%(mutuals)s followers you follow"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/feed/feed.html:72
+#, python-format
+msgid "%(shared_books)s book on your shelves"
+msgid_plural "%(shared_books)s books on your shelves"
+msgstr[0] ""
+msgstr[1] ""
+
 #: bookwyrm/templates/feed/feed_layout.html:5
 #, fuzzy
 #| msgid "Updated:"
@@ -646,7 +888,7 @@ msgstr "Commencer la lecture"
 msgid "Read"
 msgstr "Lu"
 
-#: bookwyrm/templates/feed/feed_layout.html:76 bookwyrm/templates/goal.html:26
+#: bookwyrm/templates/feed/feed_layout.html:74 bookwyrm/templates/goal.html:26
 #: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
 msgid "%(year)s Reading Goal"
@@ -842,71 +1084,73 @@ msgstr "Fil d’actualité"
 msgid "Profile"
 msgstr "Profil"
 
-#: bookwyrm/templates/layout.html:97
+#: bookwyrm/templates/layout.html:107
 #, fuzzy
 #| msgid "Instance Settings"
 msgid "Settings"
 msgstr "Paramètres de l’instance"
 
-#: bookwyrm/templates/layout.html:111
-#: bookwyrm/templates/settings/admin_layout.html:19
+#: bookwyrm/templates/layout.html:116
+#: bookwyrm/templates/settings/admin_layout.html:20
+#: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
+#: bookwyrm/templates/settings/manage_invites.html:15
 msgid "Invites"
 msgstr "Invitations"
 
-#: bookwyrm/templates/layout.html:118
+#: bookwyrm/templates/layout.html:123
 msgid "Admin"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:125
+#: bookwyrm/templates/layout.html:130
 msgid "Log out"
 msgstr "Se déconnecter"
 
-#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
+#: bookwyrm/templates/layout.html:138 bookwyrm/templates/layout.html:139
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:10
 msgid "Notifications"
 msgstr "Notifications"
 
-#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155
+#: bookwyrm/templates/layout.html:156 bookwyrm/templates/layout.html:160
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "Nom d’utilisateur :"
 
-#: bookwyrm/templates/layout.html:156
+#: bookwyrm/templates/layout.html:161
 #, fuzzy
 #| msgid "Password:"
 msgid "password"
 msgstr "Mot de passe :"
 
-#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:162 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr "Mot de passe oublié ?"
 
-#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:165 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "Se connecter"
 
-#: bookwyrm/templates/layout.html:168
+#: bookwyrm/templates/layout.html:173
 msgid "Join"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:191
+#: bookwyrm/templates/layout.html:196
 msgid "About this server"
 msgstr "À propos de ce serveur"
 
-#: bookwyrm/templates/layout.html:195
+#: bookwyrm/templates/layout.html:200
 msgid "Contact site admin"
 msgstr "Contacter l’administrateur du site"
 
-#: bookwyrm/templates/layout.html:202
+#: bookwyrm/templates/layout.html:207
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:206
+#: bookwyrm/templates/layout.html:211
 msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "Bookwyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports de bogues via <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
@@ -1106,7 +1350,7 @@ msgstr ""
 
 #: bookwyrm/templates/moderation/report.html:54
 #: bookwyrm/templates/snippets/create_status.html:12
-#: bookwyrm/templates/snippets/create_status_form.html:44
+#: bookwyrm/templates/snippets/create_status_form.html:52
 msgid "Comment"
 msgstr "Commentaire"
 
@@ -1141,10 +1385,6 @@ msgstr ""
 msgid "More info about this report:"
 msgstr "En savoir plus sur ce site"
 
-#: bookwyrm/templates/moderation/report_modal.html:31
-msgid "Submit"
-msgstr ""
-
 #: bookwyrm/templates/moderation/report_preview.html:13
 msgid "No notes provided"
 msgstr ""
@@ -1165,7 +1405,7 @@ msgstr ""
 
 #: bookwyrm/templates/moderation/reports.html:4
 #: bookwyrm/templates/moderation/reports.html:5
-#: bookwyrm/templates/settings/admin_layout.html:23
+#: bookwyrm/templates/settings/admin_layout.html:24
 #, fuzzy
 #| msgid "Recent Imports"
 msgid "Reports"
@@ -1301,29 +1541,16 @@ msgstr ""
 msgid "You're all caught up!"
 msgstr "Aucune nouvelle notification !"
 
-#: bookwyrm/templates/password_reset.html:4
-#: bookwyrm/templates/password_reset.html:10
-#: bookwyrm/templates/password_reset_request.html:4
-#: bookwyrm/templates/password_reset_request.html:10
-msgid "Reset Password"
-msgstr "Changez le mot de passe"
-
 #: bookwyrm/templates/password_reset.html:23
 #: bookwyrm/templates/preferences/change_password.html:18
 msgid "Confirm password:"
 msgstr "Confirmez le mot de passe :"
 
-#: bookwyrm/templates/password_reset_request.html:12
+#: bookwyrm/templates/password_reset_request.html:14
 msgid "A link to reset your password will be sent to your email address"
 msgstr "Un lien pour changer votre mot de passe sera envoyé à votre addresse email"
 
-#: bookwyrm/templates/password_reset_request.html:16
-#: bookwyrm/templates/preferences/edit_user.html:38
-#: bookwyrm/templates/snippets/register_form.html:13
-msgid "Email address:"
-msgstr "Adresse email :"
-
-#: bookwyrm/templates/password_reset_request.html:23
+#: bookwyrm/templates/password_reset_request.html:28
 msgid "Reset password"
 msgstr "Changer de mot de passe"
 
@@ -1373,6 +1600,19 @@ msgstr ""
 msgid "Manually approve followers:"
 msgstr "Autoriser les abonnements manuellement :"
 
+#: bookwyrm/templates/preferences/edit_user.html:58
+msgid "Show this account in suggested users:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:62
+#, python-format
+msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:65
+msgid "Preferred Timezone: "
+msgstr ""
+
 #: bookwyrm/templates/preferences/preferences_layout.html:11
 msgid "Account"
 msgstr "Compte"
@@ -1415,16 +1655,16 @@ msgstr "Administration"
 msgid "Manage Users"
 msgstr "Gérer les comptes"
 
-#: bookwyrm/templates/settings/admin_layout.html:27
+#: bookwyrm/templates/settings/admin_layout.html:28
 #: bookwyrm/templates/settings/federation.html:4
 msgid "Federated Servers"
 msgstr "Serveurs fédérés"
 
-#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/admin_layout.html:33
 msgid "Instance Settings"
 msgstr "Paramètres de l’instance"
 
-#: bookwyrm/templates/settings/admin_layout.html:36
+#: bookwyrm/templates/settings/admin_layout.html:37
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 #, fuzzy
@@ -1432,22 +1672,22 @@ msgstr "Paramètres de l’instance"
 msgid "Site Settings"
 msgstr "Paramètres du site"
 
-#: bookwyrm/templates/settings/admin_layout.html:39
+#: bookwyrm/templates/settings/admin_layout.html:40
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr "Information sur l’instance"
 
-#: bookwyrm/templates/settings/admin_layout.html:40
+#: bookwyrm/templates/settings/admin_layout.html:41
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr "Images"
 
-#: bookwyrm/templates/settings/admin_layout.html:41
+#: bookwyrm/templates/settings/admin_layout.html:42
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr "Contenu du pied de page"
 
-#: bookwyrm/templates/settings/admin_layout.html:42
+#: bookwyrm/templates/settings/admin_layout.html:43
 #: bookwyrm/templates/settings/site.html:77
 msgid "Registration"
 msgstr "Enregistrement"
@@ -1461,42 +1701,114 @@ msgid "Software"
 msgstr "Logiciel"
 
 #: bookwyrm/templates/settings/federation.html:12
+#: bookwyrm/templates/settings/manage_invite_requests.html:33
 msgid "Status"
 msgstr "Statut"
 
-#: bookwyrm/templates/settings/manage_invites.html:7
+#: bookwyrm/templates/settings/manage_invite_requests.html:4
+#: bookwyrm/templates/settings/manage_invite_requests.html:11
+#: bookwyrm/templates/settings/manage_invite_requests.html:25
+#: bookwyrm/templates/settings/manage_invites.html:11
+#, fuzzy
+#| msgid "Invites"
+msgid "Invite Requests"
+msgstr "Invitations"
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:23
+msgid "Ignored Invite Requests"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:31
+msgid "Date"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:32
+msgid "Email"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:34
+#, fuzzy
+#| msgid "Notifications"
+msgid "Action"
+msgstr "Notifications"
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:37
+#, fuzzy
+#| msgid "Follow Requests"
+msgid "No requests"
+msgstr "Demandes d’abonnement"
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:45
+#, fuzzy
+#| msgid "Accept"
+msgid "Accepted"
+msgstr "Accepter"
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:47
+msgid "Sent"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:49
+msgid "Requested"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:57
+msgid "Send invite"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:59
+msgid "Re-send invite"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:70
+msgid "Ignore"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:72
+msgid "Un-gnore"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:83
+msgid "Back to pending requests"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:85
+msgid "View ignored requests"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:21
 msgid "Generate New Invite"
 msgstr "Générer une nouvelle invitation"
 
-#: bookwyrm/templates/settings/manage_invites.html:13
+#: bookwyrm/templates/settings/manage_invites.html:27
 msgid "Expiry:"
 msgstr "Expiration :"
 
-#: bookwyrm/templates/settings/manage_invites.html:19
+#: bookwyrm/templates/settings/manage_invites.html:33
 msgid "Use limit:"
 msgstr "Limiter à :"
 
-#: bookwyrm/templates/settings/manage_invites.html:26
+#: bookwyrm/templates/settings/manage_invites.html:40
 msgid "Create Invite"
 msgstr "Créer une invitation"
 
-#: bookwyrm/templates/settings/manage_invites.html:33
+#: bookwyrm/templates/settings/manage_invites.html:47
 msgid "Link"
 msgstr "Lien"
 
-#: bookwyrm/templates/settings/manage_invites.html:34
+#: bookwyrm/templates/settings/manage_invites.html:48
 msgid "Expires"
 msgstr "Expiration"
 
-#: bookwyrm/templates/settings/manage_invites.html:35
+#: bookwyrm/templates/settings/manage_invites.html:49
 msgid "Max uses"
 msgstr "Nombre maximum d’utilisations"
 
-#: bookwyrm/templates/settings/manage_invites.html:36
+#: bookwyrm/templates/settings/manage_invites.html:50
 msgid "Times used"
 msgstr "Nombre de fois utilisée"
 
-#: bookwyrm/templates/settings/manage_invites.html:39
+#: bookwyrm/templates/settings/manage_invites.html:53
 msgid "No active invites"
 msgstr "Aucune invitation active"
 
@@ -1549,6 +1861,12 @@ msgid "Allow registration:"
 msgstr "Autoriser l’enregistrement :"
 
 #: bookwyrm/templates/settings/site.html:83
+#, fuzzy
+#| msgid "Follow Requests"
+msgid "Allow invite requests:"
+msgstr "Demandes d’abonnement"
+
+#: bookwyrm/templates/settings/site.html:87
 msgid "Registration closed text:"
 msgstr "Texte affiché lorsque les enregistrements sont clos :"
 
@@ -1593,29 +1911,68 @@ msgstr "Critique"
 msgid "Quote"
 msgstr "Citation"
 
-#: bookwyrm/templates/snippets/create_status_form.html:21
+#: bookwyrm/templates/snippets/create_status_form.html:18
+msgid "Comment:"
+msgstr "Commentaire :"
+
+#: bookwyrm/templates/snippets/create_status_form.html:20
+#, fuzzy
+#| msgid "Quote"
+msgid "Quote:"
+msgstr "Citation"
+
+#: bookwyrm/templates/snippets/create_status_form.html:22
+#, fuzzy
+#| msgid "Review"
+msgid "Review:"
+msgstr "Critique"
+
+#: bookwyrm/templates/snippets/create_status_form.html:29
 #: bookwyrm/templates/snippets/shelf.html:17
 msgid "Rating"
 msgstr "Note"
 
-#: bookwyrm/templates/snippets/create_status_form.html:23
+#: bookwyrm/templates/snippets/create_status_form.html:31
 #: bookwyrm/templates/snippets/rate_action.html:14
 #: bookwyrm/templates/snippets/stars.html:3
 msgid "No rating"
 msgstr "Aucune note"
 
-#: bookwyrm/templates/snippets/create_status_form.html:54
+#: bookwyrm/templates/snippets/create_status_form.html:64
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
+msgid "Progress:"
+msgstr "Progression :"
+
+#: bookwyrm/templates/snippets/create_status_form.html:71
+#: bookwyrm/templates/snippets/readthrough_form.html:22
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
+msgid "pages"
+msgstr "pages"
+
+#: bookwyrm/templates/snippets/create_status_form.html:72
+#: bookwyrm/templates/snippets/readthrough_form.html:23
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
+msgid "percent"
+msgstr "pourcent"
+
+#: bookwyrm/templates/snippets/create_status_form.html:77
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
+#, python-format
+msgid "of %(pages)s pages"
+msgstr "sur %(pages)s pages"
+
+#: bookwyrm/templates/snippets/create_status_form.html:89
 msgid "Include spoiler alert"
 msgstr "Afficher une alerte spoiler"
 
-#: bookwyrm/templates/snippets/create_status_form.html:60
+#: bookwyrm/templates/snippets/create_status_form.html:95
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:19
 msgid "Private"
 msgstr "Privé"
 
-#: bookwyrm/templates/snippets/create_status_form.html:67
+#: bookwyrm/templates/snippets/create_status_form.html:102
 msgid "Post"
 msgstr "Publier"
 
@@ -1645,21 +2002,17 @@ msgstr "Ajouter le statut aux favoris"
 msgid "Un-like status"
 msgstr "Supprimer le statut des favoris"
 
-#: bookwyrm/templates/snippets/follow_button.html:13
-msgid "Send follow request"
-msgstr "Envoyer une demande d’abonnement"
-
-#: bookwyrm/templates/snippets/follow_button.html:15
+#: bookwyrm/templates/snippets/follow_button.html:12
 msgid "Follow"
 msgstr "S’abonner"
 
-#: bookwyrm/templates/snippets/follow_button.html:22
+#: bookwyrm/templates/snippets/follow_button.html:18
 #, fuzzy
 #| msgid "Send follow request"
 msgid "Undo follow request"
 msgstr "Envoyer une demande d’abonnement"
 
-#: bookwyrm/templates/snippets/follow_button.html:24
+#: bookwyrm/templates/snippets/follow_button.html:20
 msgid "Unfollow"
 msgstr "Se désabonner"
 
@@ -1677,14 +2030,22 @@ msgstr[1] "souhaite lire %(counter)s livres en %(year)s"
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
 #, fuzzy, python-format
 #| msgid "<a href=\"%(path)s\">%(title)s</a> by "
-msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(rating)s star"
-msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(rating)s stars"
+msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
+msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
 msgstr[0] "<a href=\"%(path)s\">%(title)s</a> par "
 msgstr[1] "<a href=\"%(path)s\">%(title)s</a> par "
 
-#: bookwyrm/templates/snippets/goal_card.html:22
-msgid "Dismiss message"
-msgstr "Rejeter le message"
+#: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4
+#, python-format
+msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
+msgid_plural "Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/snippets/generated_status/review_pure_name.html:8
+#, python-format
+msgid "Review of \"%(book_title)s\": %(review_title)s"
+msgstr ""
 
 #: bookwyrm/templates/snippets/goal_card.html:23
 #, python-format
@@ -1766,25 +2127,6 @@ msgstr "Confidentialité du statut"
 msgid "Followers"
 msgstr "Abonnements"
 
-#: bookwyrm/templates/snippets/progress_update.html:6
-msgid "Progress:"
-msgstr "Progression :"
-
-#: bookwyrm/templates/snippets/progress_update.html:16
-#: bookwyrm/templates/snippets/readthrough_form.html:22
-msgid "pages"
-msgstr "pages"
-
-#: bookwyrm/templates/snippets/progress_update.html:17
-#: bookwyrm/templates/snippets/readthrough_form.html:23
-msgid "percent"
-msgstr "pourcent"
-
-#: bookwyrm/templates/snippets/progress_update.html:25
-#, python-format
-msgid "of %(pages)s pages"
-msgstr "sur %(pages)s pages"
-
 #: bookwyrm/templates/snippets/rate_action.html:4
 msgid "Leave a rating"
 msgstr "Laisser une note"
@@ -1929,6 +2271,13 @@ msgstr "Enlever de l’étagère"
 msgid "Finish \"<em>%(book_title)s</em>\""
 msgstr "Terminer « <em>%(book_title)s</em> »"
 
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:33
+#, fuzzy
+#| msgid "Updated:"
+msgid "Update progress"
+msgstr "Mises à jour"
+
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5
 msgid "More shelves"
 msgstr "Plus d’étagères"
@@ -2160,6 +2509,18 @@ msgstr[1] "%(username)s n’a pas d’abonné(e)s"
 msgid "%(counter)s following"
 msgstr "%(counter)s abonnements"
 
+#: bookwyrm/views/password.py:32
+msgid "No user with that email address was found."
+msgstr ""
+
+#: bookwyrm/views/password.py:41
+#, python-format
+msgid "A password reset link sent to %s"
+msgstr ""
+
+#~ msgid "Send follow request"
+#~ msgstr "Envoyer une demande d’abonnement"
+
 #, fuzzy
 #~| msgid "All messages"
 #~ msgid "Messages"
@@ -2268,7 +2629,7 @@ msgstr "%(counter)s abonnements"
 #~ msgid "September"
 #~ msgstr "Numéro dans la série :"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "No books found matching the query \"%(query)s\""
 #~ msgid "No %(verbose_name)s found matching the query"
 #~ msgstr "Aucun livre trouvé pour la requête « %(query)s »"
@@ -2308,11 +2669,5 @@ msgstr "%(counter)s abonnements"
 #~ msgid "Change password"
 #~ msgstr "Changer le mot de passe"
 
-#~ msgid "Blocked users"
-#~ msgstr "Comptes bloqués"
-
-#~ msgid "Comment:"
-#~ msgstr "Commentaire :"
-
 #~ msgid "%(year)s reading goal"
 #~ msgstr "Défi lecture pour %(year)s"
diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
index 9f83e170da5dc194e47c05a445012b5b47ecc85e..62c4cd964f8c11bc2d7d7c194ca333dec11d6d49 100644
GIT binary patch
delta 9714
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
VcrGnDr11HX6Ur2RGrCvce*wDNCU*b;

delta 9995
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

diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index aad277e0..83f128e9 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-19 11:41-0700\n"
+"POT-Creation-Date: 2021-03-28 22:42+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"
@@ -18,71 +18,76 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: bookwyrm/forms.py:203
+#: bookwyrm/forms.py:213
+#, fuzzy
+#| msgid "A user with that username already exists."
+msgid "A user with this email already exists."
+msgstr "已�存在使用该用户�的用户。"
+
+#: bookwyrm/forms.py:227
 msgid "One Day"
 msgstr "一天"
 
-#: bookwyrm/forms.py:204
+#: bookwyrm/forms.py:228
 msgid "One Week"
 msgstr "一周"
 
-#: bookwyrm/forms.py:205
+#: bookwyrm/forms.py:229
 msgid "One Month"
 msgstr "一个月"
 
-#: bookwyrm/forms.py:206
+#: bookwyrm/forms.py:230
 msgid "Does Not Expire"
 msgstr "永�失效"
 
-#: bookwyrm/forms.py:211
+#: bookwyrm/forms.py:235
 #, python-format
 msgid "%(count)d uses"
 msgstr "%(count)d 次使用"
 
-#: bookwyrm/forms.py:214
+#: bookwyrm/forms.py:238
 msgid "Unlimited"
 msgstr "���"
 
-#: bookwyrm/models/fields.py:24
+#: bookwyrm/models/fields.py:25
 #, python-format
 msgid "%(value)s is not a valid remote_id"
 msgstr "%(value)s �是有效的 remote_id"
 
-#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
+#: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:47
 #, python-format
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s �是有效的用户�"
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:152
+#: bookwyrm/models/fields.py:170 bookwyrm/templates/layout.html:157
 msgid "username"
 msgstr "用户�"
 
-#: bookwyrm/models/fields.py:170
+#: bookwyrm/models/fields.py:175
 msgid "A user with that username already exists."
 msgstr "已�存在使用该用户�的用户。"
 
-#: bookwyrm/settings.py:142
+#: bookwyrm/settings.py:148
 msgid "English"
 msgstr "English（英语）"
 
-#: bookwyrm/settings.py:143
+#: bookwyrm/settings.py:149
 msgid "German"
 msgstr "Deutsch（德语）"
 
-#: bookwyrm/settings.py:144
+#: bookwyrm/settings.py:150
 msgid "Spanish"
 msgstr "Español（西�牙语）"
 
-#: bookwyrm/settings.py:145
+#: bookwyrm/settings.py:151
 msgid "French"
 msgstr "Français（法语）"
 
-#: bookwyrm/settings.py:146
+#: bookwyrm/settings.py:152
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
 #: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
-#: bookwyrm/templates/edit_author.html:5
 msgid "Edit Author"
 msgstr "编辑作者"
 
@@ -172,11 +177,11 @@ msgstr "�述:"
 #: bookwyrm/templates/book/book.html:121
 #: bookwyrm/templates/book/edit_book.html:225
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:56
-#: bookwyrm/templates/settings/site.html:89
-#: bookwyrm/templates/snippets/progress_update.html:21
+#: bookwyrm/templates/preferences/edit_user.html:68
+#: bookwyrm/templates/settings/site.html:93
 #: bookwyrm/templates/snippets/readthrough.html:64
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
 msgid "Save"
 msgstr "�存"
@@ -190,6 +195,7 @@ msgstr "�存"
 #: bookwyrm/templates/snippets/goal_form.html:32
 #: bookwyrm/templates/snippets/readthrough.html:65
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
 msgid "Cancel"
@@ -430,10 +436,118 @@ msgid "Openlibrary key:"
 msgstr "Openlibrary key:"
 
 #: bookwyrm/templates/components/inline_form.html:8
-#: bookwyrm/templates/feed/feed_layout.html:54
+#: bookwyrm/templates/feed/feed_layout.html:57
 msgid "Close"
 msgstr "关闭"
 
+#: bookwyrm/templates/directory.html:6 bookwyrm/templates/directory.html:11
+#: bookwyrm/templates/layout.html:97
+msgid "Directory"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:19
+msgid "Make your profile discoverable to other BookWyrm users."
+msgstr ""
+
+#: bookwyrm/templates/directory.html:26
+#, fuzzy, python-format
+#| msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
+msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
+msgstr "你�以在任何时候从你的<a href=\"%(path)s\">个人资料页�</a> 中设置或改�你的阅读目标"
+
+#: bookwyrm/templates/directory.html:31
+#: bookwyrm/templates/snippets/goal_card.html:22
+msgid "Dismiss message"
+msgstr "�散消�"
+
+#: bookwyrm/templates/directory.html:44
+#, fuzzy
+#| msgid "Show less"
+msgid "Show filters"
+msgstr "显示更少"
+
+#: bookwyrm/templates/directory.html:46
+msgid "Hide filters"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:55
+#, fuzzy
+#| msgid "User Activity"
+msgid "User type"
+msgstr "用户活动"
+
+#: bookwyrm/templates/directory.html:58
+msgid "BookWyrm users"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:62
+msgid "All known users"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:68
+#, fuzzy
+#| msgid "Comment"
+msgid "Community"
+msgstr "评论"
+
+#: bookwyrm/templates/directory.html:71
+#, fuzzy
+#| msgid "Max uses"
+msgid "Local users"
+msgstr "最大使用次数"
+
+#: bookwyrm/templates/directory.html:75
+#, fuzzy
+#| msgid "Federated"
+msgid "Federated community"
+msgstr "跨站"
+
+#: bookwyrm/templates/directory.html:81
+msgid "Order by"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:84
+#, fuzzy
+#| msgid "Suggest"
+msgid "Suggested"
+msgstr "推�"
+
+#: bookwyrm/templates/directory.html:85
+msgid "Recently active"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:91
+msgid "Apply filters"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:94
+#, fuzzy
+#| msgid "Clear search"
+msgid "Clear filters"
+msgstr "清除�索"
+
+#: bookwyrm/templates/directory.html:128
+#, fuzzy
+#| msgid "followed you"
+msgid "follower you follow"
+msgid_plural "followers you follow"
+msgstr[0] "关注了你"
+
+#: bookwyrm/templates/directory.html:135
+#, fuzzy
+#| msgid "Your shelves"
+msgid "book on your shelves"
+msgid_plural "books on your shelves"
+msgstr[0] "你的书架"
+
+#: bookwyrm/templates/directory.html:143
+msgid "posts"
+msgstr ""
+
+#: bookwyrm/templates/directory.html:149
+msgid "last active"
+msgstr ""
+
 #: bookwyrm/templates/discover/about.html:7
 #, python-format
 msgid "About %(site_name)s"
@@ -474,15 +588,41 @@ msgstr "��业"
 msgid "Join %(name)s"
 msgstr "加入 %(name)s"
 
-#: bookwyrm/templates/discover/landing_layout.html:49
+#: bookwyrm/templates/discover/landing_layout.html:51
 #: bookwyrm/templates/login.html:48
 msgid "This instance is closed"
 msgstr "本实例�开放。"
 
-#: bookwyrm/templates/discover/landing_layout.html:55
+#: bookwyrm/templates/discover/landing_layout.html:57
+msgid "Thank you! Your request has been received."
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:60
+msgid "Request an Invitation"
+msgstr ""
+
+#: bookwyrm/templates/discover/landing_layout.html:64
+#: bookwyrm/templates/password_reset_request.html:18
+#: bookwyrm/templates/preferences/edit_user.html:38
+#: bookwyrm/templates/snippets/register_form.html:13
+msgid "Email address:"
+msgstr "邮箱地�:"
+
+#: bookwyrm/templates/discover/landing_layout.html:70
+#: bookwyrm/templates/moderation/report_modal.html:31
+msgid "Submit"
+msgstr "�交"
+
+#: bookwyrm/templates/discover/landing_layout.html:79
 msgid "Your Account"
 msgstr "你的��"
 
+#: bookwyrm/templates/edit_author.html:5
+#, fuzzy
+#| msgid "Edit Author"
+msgid "Edit Author:"
+msgstr "编辑作者"
+
 #: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
 #: bookwyrm/templates/user/create_shelf_form.html:13
 #: bookwyrm/templates/user/edit_shelf_form.html:14
@@ -527,6 +667,74 @@ msgstr "%(book_title)s 的�版本"
 msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 msgstr "<a href=\"%(work_path)s\">\"%(work_title)s\"</a> 的�版本"
 
+#: bookwyrm/templates/email/html_layout.html:15
+#: bookwyrm/templates/email/text_layout.html:2
+msgid "Hi there,"
+msgstr ""
+
+#: bookwyrm/templates/email/html_layout.html:21
+#, python-format
+msgid "BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a>"
+msgstr ""
+
+#: bookwyrm/templates/email/html_layout.html:23
+msgid "Email preference"
+msgstr ""
+
+#: bookwyrm/templates/email/invite/html_content.html:6
+#: bookwyrm/templates/email/invite/subject.html:2
+#, fuzzy, python-format
+#| msgid "About %(site_name)s"
+msgid "You're invited to join %(site_name)s!"
+msgstr "关于 %(site_name)s"
+
+#: bookwyrm/templates/email/invite/html_content.html:9
+#, fuzzy
+#| msgid "Join"
+msgid "Join Now"
+msgstr "加入"
+
+#: bookwyrm/templates/email/invite/html_content.html:15
+#, python-format
+msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
+msgstr ""
+
+#: bookwyrm/templates/email/invite/text_content.html:4
+#, python-format
+msgid "You're invited to join %(site_name)s! Click the link below to create an account."
+msgstr ""
+
+#: bookwyrm/templates/email/invite/text_content.html:8
+#, fuzzy
+#| msgid "More about this site"
+msgid "Learn more about this instance:"
+msgstr "关于本站点的更多"
+
+#: bookwyrm/templates/email/password_reset/html_content.html:6
+#: bookwyrm/templates/email/password_reset/text_content.html:4
+#, python-format
+msgid "You requested to reset your %(site_name)s password. Click the link below to set a new password and log in to your account."
+msgstr ""
+
+#: bookwyrm/templates/email/password_reset/html_content.html:9
+#: bookwyrm/templates/password_reset.html:4
+#: bookwyrm/templates/password_reset.html:10
+#: bookwyrm/templates/password_reset_request.html:4
+#: bookwyrm/templates/password_reset_request.html:10
+msgid "Reset Password"
+msgstr "�设密�"
+
+#: bookwyrm/templates/email/password_reset/html_content.html:13
+#: bookwyrm/templates/email/password_reset/text_content.html:8
+msgid "If you didn't request to reset your password, you can ignore this email."
+msgstr ""
+
+#: bookwyrm/templates/email/password_reset/subject.html:2
+#, fuzzy, python-format
+#| msgid "About %(site_name)s"
+msgid "Reset your %(site_name)s password"
+msgstr "关于 %(site_name)s"
+
 #: bookwyrm/templates/error.html:4
 msgid "Oops!"
 msgstr "哎呀�"
@@ -557,27 +765,59 @@ msgstr "所有消�"
 msgid "You have no messages right now."
 msgstr "你现在没有消�。"
 
-#: bookwyrm/templates/feed/feed.html:6
-#, python-format
-msgid "%(tab_title)s Timeline"
+#: bookwyrm/templates/feed/feed.html:9
+msgid "Home Timeline"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:11
+#, fuzzy
+#| msgid "%(tab_title)s Timeline"
+msgid "Local Timeline"
 msgstr "%(tab_title)s 时间线"
 
-#: bookwyrm/templates/feed/feed.html:10 bookwyrm/views/feed.py:33
+#: bookwyrm/templates/feed/feed.html:13
+#, fuzzy
+#| msgid "Federated Servers"
+msgid "Federated Timeline"
+msgstr "互�的�务器"
+
+#: bookwyrm/templates/feed/feed.html:19
 msgid "Home"
 msgstr "主页"
 
-#: bookwyrm/templates/feed/feed.html:13 bookwyrm/views/feed.py:38
+#: bookwyrm/templates/feed/feed.html:22
 msgid "Local"
 msgstr "本站"
 
-#: bookwyrm/templates/feed/feed.html:16 bookwyrm/views/feed.py:43
+#: bookwyrm/templates/feed/feed.html:25
 msgid "Federated"
 msgstr "跨站"
 
-#: bookwyrm/templates/feed/feed.html:32
+#: bookwyrm/templates/feed/feed.html:33
+#, python-format
+msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:48
 msgid "There aren't any activities right now! Try following a user to get started"
 msgstr "现在还没有任何活动��试�从关注一个用户开始�"
 
+#: bookwyrm/templates/feed/feed.html:56
+msgid "Who to follow"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed.html:69
+#, python-format
+msgid "%(mutuals)s follower you follow"
+msgid_plural "%(mutuals)s followers you follow"
+msgstr[0] ""
+
+#: bookwyrm/templates/feed/feed.html:72
+#, python-format
+msgid "%(shared_books)s book on your shelves"
+msgid_plural "%(shared_books)s books on your shelves"
+msgstr[0] ""
+
 #: bookwyrm/templates/feed/feed_layout.html:5
 msgid "Updates"
 msgstr "æ›´æ–°"
@@ -606,7 +846,7 @@ msgstr "在读"
 msgid "Read"
 msgstr "读过"
 
-#: bookwyrm/templates/feed/feed_layout.html:76 bookwyrm/templates/goal.html:26
+#: bookwyrm/templates/feed/feed_layout.html:74 bookwyrm/templates/goal.html:26
 #: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
 msgid "%(year)s Reading Goal"
@@ -798,67 +1038,69 @@ msgstr "动�"
 msgid "Profile"
 msgstr "个人资料"
 
-#: bookwyrm/templates/layout.html:97
+#: bookwyrm/templates/layout.html:107
 msgid "Settings"
 msgstr "设置"
 
-#: bookwyrm/templates/layout.html:111
-#: bookwyrm/templates/settings/admin_layout.html:19
+#: bookwyrm/templates/layout.html:116
+#: bookwyrm/templates/settings/admin_layout.html:20
+#: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
+#: bookwyrm/templates/settings/manage_invites.html:15
 msgid "Invites"
 msgstr "邀请"
 
-#: bookwyrm/templates/layout.html:118
+#: bookwyrm/templates/layout.html:123
 msgid "Admin"
 msgstr "管�员"
 
-#: bookwyrm/templates/layout.html:125
+#: bookwyrm/templates/layout.html:130
 msgid "Log out"
 msgstr "登出"
 
-#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
+#: bookwyrm/templates/layout.html:138 bookwyrm/templates/layout.html:139
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:10
 msgid "Notifications"
 msgstr "通知"
 
-#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155
+#: bookwyrm/templates/layout.html:156 bookwyrm/templates/layout.html:160
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "用户�:"
 
-#: bookwyrm/templates/layout.html:156
+#: bookwyrm/templates/layout.html:161
 msgid "password"
 msgstr "密�"
 
-#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:162 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr "忘记了密�？"
 
-#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:165 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "登录"
 
-#: bookwyrm/templates/layout.html:168
+#: bookwyrm/templates/layout.html:173
 msgid "Join"
 msgstr "加入"
 
-#: bookwyrm/templates/layout.html:191
+#: bookwyrm/templates/layout.html:196
 msgid "About this server"
 msgstr "关于本�务器"
 
-#: bookwyrm/templates/layout.html:195
+#: bookwyrm/templates/layout.html:200
 msgid "Contact site admin"
 msgstr "�系站点管�员"
 
-#: bookwyrm/templates/layout.html:202
+#: bookwyrm/templates/layout.html:207
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr "在 <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a> 上支� %(site_name)s"
 
-#: bookwyrm/templates/layout.html:206
+#: bookwyrm/templates/layout.html:211
 msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm 是开�软件。你�以在 <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> 贡献或报告问题。"
 
@@ -1050,7 +1292,7 @@ msgstr "监察员评论"
 
 #: bookwyrm/templates/moderation/report.html:54
 #: bookwyrm/templates/snippets/create_status.html:12
-#: bookwyrm/templates/snippets/create_status_form.html:44
+#: bookwyrm/templates/snippets/create_status_form.html:52
 msgid "Comment"
 msgstr "评论"
 
@@ -1080,10 +1322,6 @@ msgstr "本报告会被��至 %(site_name)s 的监察员以�查。"
 msgid "More info about this report:"
 msgstr "关于本报告的更多信�"
 
-#: bookwyrm/templates/moderation/report_modal.html:31
-msgid "Submit"
-msgstr "�交"
-
 #: bookwyrm/templates/moderation/report_preview.html:13
 msgid "No notes provided"
 msgstr "没有�供摘记"
@@ -1103,7 +1341,7 @@ msgstr "已解决"
 
 #: bookwyrm/templates/moderation/reports.html:4
 #: bookwyrm/templates/moderation/reports.html:5
-#: bookwyrm/templates/settings/admin_layout.html:23
+#: bookwyrm/templates/settings/admin_layout.html:24
 msgid "Reports"
 msgstr "报告"
 
@@ -1235,29 +1473,16 @@ msgstr "有新的 <a href=\"%(path)s\">报告</a> 需�仲�。"
 msgid "You're all caught up!"
 msgstr "你什么也没错过�"
 
-#: bookwyrm/templates/password_reset.html:4
-#: bookwyrm/templates/password_reset.html:10
-#: bookwyrm/templates/password_reset_request.html:4
-#: bookwyrm/templates/password_reset_request.html:10
-msgid "Reset Password"
-msgstr "�设密�"
-
 #: bookwyrm/templates/password_reset.html:23
 #: bookwyrm/templates/preferences/change_password.html:18
 msgid "Confirm password:"
 msgstr "确认密�:"
 
-#: bookwyrm/templates/password_reset_request.html:12
+#: bookwyrm/templates/password_reset_request.html:14
 msgid "A link to reset your password will be sent to your email address"
 msgstr "�设你的密�的链接将会被��到你的邮箱地�"
 
-#: bookwyrm/templates/password_reset_request.html:16
-#: bookwyrm/templates/preferences/edit_user.html:38
-#: bookwyrm/templates/snippets/register_form.html:13
-msgid "Email address:"
-msgstr "邮箱地�:"
-
-#: bookwyrm/templates/password_reset_request.html:23
+#: bookwyrm/templates/password_reset_request.html:28
 msgid "Reset password"
 msgstr "�设密�"
 
@@ -1307,6 +1532,19 @@ msgstr "在消��中显示设置阅读目标的�示:"
 msgid "Manually approve followers:"
 msgstr "手动批准关注者:"
 
+#: bookwyrm/templates/preferences/edit_user.html:58
+msgid "Show this account in suggested users:"
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:62
+#, python-format
+msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
+msgstr ""
+
+#: bookwyrm/templates/preferences/edit_user.html:65
+msgid "Preferred Timezone: "
+msgstr ""
+
 #: bookwyrm/templates/preferences/preferences_layout.html:11
 msgid "Account"
 msgstr "��"
@@ -1349,37 +1587,37 @@ msgstr "管�"
 msgid "Manage Users"
 msgstr "管�用户"
 
-#: bookwyrm/templates/settings/admin_layout.html:27
+#: bookwyrm/templates/settings/admin_layout.html:28
 #: bookwyrm/templates/settings/federation.html:4
 msgid "Federated Servers"
 msgstr "互�的�务器"
 
-#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/admin_layout.html:33
 msgid "Instance Settings"
 msgstr "实例设置"
 
-#: bookwyrm/templates/settings/admin_layout.html:36
+#: bookwyrm/templates/settings/admin_layout.html:37
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr "站点设置"
 
-#: bookwyrm/templates/settings/admin_layout.html:39
+#: bookwyrm/templates/settings/admin_layout.html:40
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr "实例信�"
 
-#: bookwyrm/templates/settings/admin_layout.html:40
+#: bookwyrm/templates/settings/admin_layout.html:41
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr "图�"
 
-#: bookwyrm/templates/settings/admin_layout.html:41
+#: bookwyrm/templates/settings/admin_layout.html:42
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr "页脚内容"
 
-#: bookwyrm/templates/settings/admin_layout.html:42
+#: bookwyrm/templates/settings/admin_layout.html:43
 #: bookwyrm/templates/settings/site.html:77
 msgid "Registration"
 msgstr "注册"
@@ -1393,42 +1631,116 @@ msgid "Software"
 msgstr "软件"
 
 #: bookwyrm/templates/settings/federation.html:12
+#: bookwyrm/templates/settings/manage_invite_requests.html:33
 msgid "Status"
 msgstr "状�"
 
-#: bookwyrm/templates/settings/manage_invites.html:7
+#: bookwyrm/templates/settings/manage_invite_requests.html:4
+#: bookwyrm/templates/settings/manage_invite_requests.html:11
+#: bookwyrm/templates/settings/manage_invite_requests.html:25
+#: bookwyrm/templates/settings/manage_invites.html:11
+#, fuzzy
+#| msgid "Invites"
+msgid "Invite Requests"
+msgstr "邀请"
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:23
+msgid "Ignored Invite Requests"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:31
+msgid "Date"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:32
+msgid "Email"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:34
+#, fuzzy
+#| msgid "Actions"
+msgid "Action"
+msgstr "动作"
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:37
+#, fuzzy
+#| msgid "Follow Requests"
+msgid "No requests"
+msgstr "关注请求"
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:45
+#, fuzzy
+#| msgid "Accept"
+msgid "Accepted"
+msgstr "接�"
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:47
+msgid "Sent"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:49
+msgid "Requested"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:57
+msgid "Send invite"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:59
+msgid "Re-send invite"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:70
+msgid "Ignore"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:72
+msgid "Un-gnore"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:83
+#, fuzzy
+#| msgid "Back to reports"
+msgid "Back to pending requests"
+msgstr "回到报告"
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:85
+msgid "View ignored requests"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invites.html:21
 msgid "Generate New Invite"
 msgstr "生�新的邀请"
 
-#: bookwyrm/templates/settings/manage_invites.html:13
+#: bookwyrm/templates/settings/manage_invites.html:27
 msgid "Expiry:"
 msgstr "过期:"
 
-#: bookwyrm/templates/settings/manage_invites.html:19
+#: bookwyrm/templates/settings/manage_invites.html:33
 msgid "Use limit:"
 msgstr "使用�制:"
 
-#: bookwyrm/templates/settings/manage_invites.html:26
+#: bookwyrm/templates/settings/manage_invites.html:40
 msgid "Create Invite"
 msgstr "创建邀请"
 
-#: bookwyrm/templates/settings/manage_invites.html:33
+#: bookwyrm/templates/settings/manage_invites.html:47
 msgid "Link"
 msgstr "链接"
 
-#: bookwyrm/templates/settings/manage_invites.html:34
+#: bookwyrm/templates/settings/manage_invites.html:48
 msgid "Expires"
 msgstr "过期"
 
-#: bookwyrm/templates/settings/manage_invites.html:35
+#: bookwyrm/templates/settings/manage_invites.html:49
 msgid "Max uses"
 msgstr "最大使用次数"
 
-#: bookwyrm/templates/settings/manage_invites.html:36
+#: bookwyrm/templates/settings/manage_invites.html:50
 msgid "Times used"
 msgstr "已使用次数"
 
-#: bookwyrm/templates/settings/manage_invites.html:39
+#: bookwyrm/templates/settings/manage_invites.html:53
 msgid "No active invites"
 msgstr "无有效的邀请"
 
@@ -1481,6 +1793,12 @@ msgid "Allow registration:"
 msgstr "�许注册:"
 
 #: bookwyrm/templates/settings/site.html:83
+#, fuzzy
+#| msgid "Follow Requests"
+msgid "Allow invite requests:"
+msgstr "关注请求"
+
+#: bookwyrm/templates/settings/site.html:87
 msgid "Registration closed text:"
 msgstr "注册关闭文字:"
 
@@ -1525,29 +1843,70 @@ msgstr "书评"
 msgid "Quote"
 msgstr "引用"
 
-#: bookwyrm/templates/snippets/create_status_form.html:21
+#: bookwyrm/templates/snippets/create_status_form.html:18
+#, fuzzy
+#| msgid "Comment"
+msgid "Comment:"
+msgstr "评论"
+
+#: bookwyrm/templates/snippets/create_status_form.html:20
+#, fuzzy
+#| msgid "Quote"
+msgid "Quote:"
+msgstr "引用"
+
+#: bookwyrm/templates/snippets/create_status_form.html:22
+#, fuzzy
+#| msgid "Review"
+msgid "Review:"
+msgstr "书评"
+
+#: bookwyrm/templates/snippets/create_status_form.html:29
 #: bookwyrm/templates/snippets/shelf.html:17
 msgid "Rating"
 msgstr "评价"
 
-#: bookwyrm/templates/snippets/create_status_form.html:23
+#: bookwyrm/templates/snippets/create_status_form.html:31
 #: bookwyrm/templates/snippets/rate_action.html:14
 #: bookwyrm/templates/snippets/stars.html:3
 msgid "No rating"
 msgstr "没有评价"
 
-#: bookwyrm/templates/snippets/create_status_form.html:54
+#: bookwyrm/templates/snippets/create_status_form.html:64
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
+msgid "Progress:"
+msgstr "进度:"
+
+#: bookwyrm/templates/snippets/create_status_form.html:71
+#: bookwyrm/templates/snippets/readthrough_form.html:22
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
+msgid "pages"
+msgstr "页数"
+
+#: bookwyrm/templates/snippets/create_status_form.html:72
+#: bookwyrm/templates/snippets/readthrough_form.html:23
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
+msgid "percent"
+msgstr "百分比"
+
+#: bookwyrm/templates/snippets/create_status_form.html:77
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
+#, python-format
+msgid "of %(pages)s pages"
+msgstr "全书 %(pages)s 页"
+
+#: bookwyrm/templates/snippets/create_status_form.html:89
 msgid "Include spoiler alert"
 msgstr "加入剧�警告"
 
-#: bookwyrm/templates/snippets/create_status_form.html:60
+#: bookwyrm/templates/snippets/create_status_form.html:95
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:19
 msgid "Private"
 msgstr "�密"
 
-#: bookwyrm/templates/snippets/create_status_form.html:67
+#: bookwyrm/templates/snippets/create_status_form.html:102
 msgid "Post"
 msgstr "�布"
 
@@ -1577,19 +1936,15 @@ msgstr "喜欢状�"
 msgid "Un-like status"
 msgstr "�消喜欢状�"
 
-#: bookwyrm/templates/snippets/follow_button.html:13
-msgid "Send follow request"
-msgstr "��关注请求"
-
-#: bookwyrm/templates/snippets/follow_button.html:15
+#: bookwyrm/templates/snippets/follow_button.html:12
 msgid "Follow"
 msgstr "关注"
 
-#: bookwyrm/templates/snippets/follow_button.html:22
+#: bookwyrm/templates/snippets/follow_button.html:18
 msgid "Undo follow request"
 msgstr "撤回关注请求"
 
-#: bookwyrm/templates/snippets/follow_button.html:24
+#: bookwyrm/templates/snippets/follow_button.html:20
 msgid "Unfollow"
 msgstr "�消关注"
 
@@ -1604,14 +1959,23 @@ msgid_plural "set a goal to read %(counter)s books in %(year)s"
 msgstr[0] "设定了在 %(year)s 内�读 %(counter)s 本书的目标"
 
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
-#, python-format
-msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(rating)s star"
-msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(rating)s stars"
+#, fuzzy, python-format
+#| msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(rating)s star"
+#| msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(rating)s stars"
+msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
+msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
 msgstr[0] "为 <em><a href=\"%(path)s\">%(title)s</a></em> 打了分: %(rating)s 星"
 
-#: bookwyrm/templates/snippets/goal_card.html:22
-msgid "Dismiss message"
-msgstr "�散消�"
+#: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4
+#, python-format
+msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
+msgid_plural "Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
+msgstr[0] ""
+
+#: bookwyrm/templates/snippets/generated_status/review_pure_name.html:8
+#, python-format
+msgid "Review of \"%(book_title)s\": %(review_title)s"
+msgstr ""
 
 #: bookwyrm/templates/snippets/goal_card.html:23
 #, python-format
@@ -1693,25 +2057,6 @@ msgstr "�文��"
 msgid "Followers"
 msgstr "关注者"
 
-#: bookwyrm/templates/snippets/progress_update.html:6
-msgid "Progress:"
-msgstr "进度:"
-
-#: bookwyrm/templates/snippets/progress_update.html:16
-#: bookwyrm/templates/snippets/readthrough_form.html:22
-msgid "pages"
-msgstr "页数"
-
-#: bookwyrm/templates/snippets/progress_update.html:17
-#: bookwyrm/templates/snippets/readthrough_form.html:23
-msgid "percent"
-msgstr "百分比"
-
-#: bookwyrm/templates/snippets/progress_update.html:25
-#, python-format
-msgid "of %(pages)s pages"
-msgstr "全书 %(pages)s 页"
-
 #: bookwyrm/templates/snippets/rate_action.html:4
 msgid "Leave a rating"
 msgstr "留下评价"
@@ -1850,6 +2195,13 @@ msgstr "�下书架"
 msgid "Finish \"<em>%(book_title)s</em>\""
 msgstr "完� \"<em>%(book_title)s</em>\""
 
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:33
+#, fuzzy
+#| msgid "Updates"
+msgid "Update progress"
+msgstr "æ›´æ–°"
+
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5
 msgid "More shelves"
 msgstr "更多书架"
@@ -2070,6 +2422,20 @@ msgstr[0] "%(counter)s 个关注者"
 msgid "%(counter)s following"
 msgstr "关注� %(counter)s 人"
 
+#: bookwyrm/views/password.py:32
+#, fuzzy
+#| msgid "A user with that username already exists."
+msgid "No user with that email address was found."
+msgstr "已�存在使用该用户�的用户。"
+
+#: bookwyrm/views/password.py:41
+#, python-format
+msgid "A password reset link sent to %s"
+msgstr ""
+
+#~ msgid "Send follow request"
+#~ msgstr "��关注请求"
+
 #, fuzzy
 #~| msgid "All messages"
 #~ msgid "Messages"
@@ -2178,7 +2544,7 @@ msgstr "关注� %(counter)s 人"
 #~ msgid "September"
 #~ msgstr "系列编�:"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "No books found matching the query \"%(query)s\""
 #~ msgid "No %(verbose_name)s found matching the query"
 #~ msgstr "没有符� \"%(query)s\" 请求的书目"
diff --git a/requirements.txt b/requirements.txt
index 6126bf9c..16561da5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,6 +12,7 @@ redis==3.4.1
 requests==2.22.0
 responses==0.10.14
 django-rename-app==0.1.2
+pytz>=2021.1
 
 # Dev
 black==20.8b1

From 12f6c2abb268b24c5f83f29f7f495f8ed2c9ec56 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Mar 2021 17:53:52 -0700
Subject: [PATCH 0490/1285] Don't erase entire stream when new status is added

omg
---
 bookwyrm/activitystreams.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 6fa36700..caa2d83a 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -110,7 +110,7 @@ class ActivityStream(ABC):
                 Q(id=status.user.id)  # if the user is the post's author
                 | Q(following=status.user)  # if the user is following the author
             )
-        return audience
+        return audience.distinct()
 
     def stream_statuses(self, user):  # pylint: disable=no-self-use
         """ given a user, what statuses should they see on this stream """
@@ -131,7 +131,7 @@ class HomeStream(ActivityStream):
         return audience.filter(
             Q(id=status.user.id)  # if the user is the post's author
             | Q(following=status.user)  # if the user is following the author
-        )
+        ).distinct()
 
     def stream_statuses(self, user):
         return privacy_filter(

From 224c7e4f0e3def6ca9b6b741bd8429ba8c10efb8 Mon Sep 17 00:00:00 2001
From: Pablo Barton <pablo.barton@gmail.com>
Date: Sun, 28 Mar 2021 21:23:32 -0400
Subject: [PATCH 0491/1285] consistency in style for bulma

---
 bookwyrm/templates/preferences/edit_user.html | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/preferences/edit_user.html b/bookwyrm/templates/preferences/edit_user.html
index 1edde6e3..597a8ef0 100644
--- a/bookwyrm/templates/preferences/edit_user.html
+++ b/bookwyrm/templates/preferences/edit_user.html
@@ -61,10 +61,12 @@
         {% url 'directory' as path %}
         <p class="help">{% blocktrans %}Your account will show up in the <a href="{{ path }}">directory</a>, and may be recommended to other BookWyrm users.{% endblocktrans %}</p>
     </div>
-    <div>
-        <label class="dropdown label" for="id_preferred_timezone">{% trans "Preferred Timezone: " %}</label>
-        {{ form.preferred_timezone }}
+    <div class="block">
+        <label class="label" for="id_preferred_timezone">{% trans "Preferred Timezone: " %}</label>
+        <div class="select">
+            {{ form.preferred_timezone }}
+        </div>
     </div>
-    <button class="button is-primary" type="submit">{% trans "Save" %}</button>
+    <div class="block"><button class="button is-primary" type="submit">{% trans "Save" %}</button></div>
 </form>
 {% endblock %}

From 621c0ea15afa336776ca31fe120ca4fd08018dc9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 28 Mar 2021 18:53:49 -0700
Subject: [PATCH 0492/1285] Fixes password reset

---
 bookwyrm/views/password.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/views/password.py b/bookwyrm/views/password.py
index 2926b9d7..67010974 100644
--- a/bookwyrm/views/password.py
+++ b/bookwyrm/views/password.py
@@ -56,7 +56,7 @@ class PasswordReset(View):
         except models.PasswordReset.DoesNotExist:
             raise PermissionDenied
 
-        return TemplateResponse(request, "password_reset.html")
+        return TemplateResponse(request, "password_reset.html", {"code": code})
 
     def post(self, request, code):
         """ allow a user to change their password through an emailed token """

From 765e6b542ff9782509b2caa7c17e41823c804050 Mon Sep 17 00:00:00 2001
From: Pablo Barton <pablo.barton@gmail.com>
Date: Mon, 29 Mar 2021 08:20:35 -0400
Subject: [PATCH 0493/1285] adding middleware and use in readthrough template

---
 bookwyrm/settings.py                         |  1 +
 bookwyrm/templates/snippets/readthrough.html |  5 +++--
 bookwyrm/timezone_middleware.py              | 17 +++++++++++++++++
 bookwyrm/views/reading.py                    |  1 -
 4 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 bookwyrm/timezone_middleware.py

diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index b615fa29..e671f07c 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -66,6 +66,7 @@ MIDDLEWARE = [
     "django.middleware.common.CommonMiddleware",
     "django.middleware.csrf.CsrfViewMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "bookwyrm.timezone_middleware.TimezoneMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]
diff --git a/bookwyrm/templates/snippets/readthrough.html b/bookwyrm/templates/snippets/readthrough.html
index 82f6a088..3e694f61 100644
--- a/bookwyrm/templates/snippets/readthrough.html
+++ b/bookwyrm/templates/snippets/readthrough.html
@@ -1,5 +1,6 @@
 {% load i18n %}
 {% load humanize %}
+{% load tz %}
 <div class="content block">
     <div id="hide-edit-readthrough-{{ readthrough.id }}">
         <div class="columns">
@@ -8,7 +9,7 @@
                 </dl>
                 <ul>
                     {% if readthrough.finish_date or readthrough.progress %}
-                    <li>{% if readthrough.finish_date %} {{ readthrough.finish_date | naturalday }}: {% trans "finished" %} {% else %}{% if readthrough.progress_mode == 'PG' %}on page {{ readthrough.progress }}{% if book.pages %} of {{ book.pages }}{% endif %}
+                    <li>{% if readthrough.finish_date %} {{ readthrough.finish_date | localtime | naturalday }}: {% trans "finished" %} {% else %}{% if readthrough.progress_mode == 'PG' %}on page {{ readthrough.progress }}{% if book.pages %} of {{ book.pages }}{% endif %}
                         {% else %}{{ readthrough.progress }}%{% endif %}{% endif %}
                         {% if readthrough.progress %}
                         {% trans "Show all updates" as button_text %}
@@ -37,7 +38,7 @@
                         {% endif %}
                     </li>
                     {% endif %}
-                    <li>{{ readthrough.start_date | naturalday }}: {% trans "started" %}</li>
+                    <li>{{ readthrough.start_date | localtime | naturalday }}: {% trans "started" %}</li>
                 </ul>
             </div>
             <div class="column is-narrow">
diff --git a/bookwyrm/timezone_middleware.py b/bookwyrm/timezone_middleware.py
new file mode 100644
index 00000000..633d6835
--- /dev/null
+++ b/bookwyrm/timezone_middleware.py
@@ -0,0 +1,17 @@
+import pytz
+
+from django.utils import timezone
+
+
+class TimezoneMiddleware:
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request):
+        if request.user.is_authenticated:
+            timezone.activate(pytz.timezone(request.user.preferred_timezone))
+        else:
+            timezone.activate(pytz.utc)
+        response = self.get_response(request)
+        timezone.deactivate()
+        return response
diff --git a/bookwyrm/views/reading.py b/bookwyrm/views/reading.py
index 27e95855..59acdf6c 100644
--- a/bookwyrm/views/reading.py
+++ b/bookwyrm/views/reading.py
@@ -7,7 +7,6 @@ from dateutil.parser import ParserError
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponseBadRequest, HttpResponseNotFound
 from django.shortcuts import get_object_or_404, redirect
-from django.utils import timezone
 from django.views.decorators.http import require_POST
 
 from bookwyrm import models

From b58ed244b00cc649188faa62a4543b81b1b84746 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 29 Mar 2021 08:19:17 -0700
Subject: [PATCH 0494/1285] Preserve request.GET params in pagination

---
 bookwyrm/templates/snippets/pagination.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/snippets/pagination.html b/bookwyrm/templates/snippets/pagination.html
index 2ac10557..17418e8c 100644
--- a/bookwyrm/templates/snippets/pagination.html
+++ b/bookwyrm/templates/snippets/pagination.html
@@ -2,7 +2,7 @@
 <nav class="pagination" aria-label="pagination">
     {% if page.has_previous %}
     <p class="pagination-previous">
-        <a href="{{ path }}?page={{ page.previous_page_number }}{{ anchor }}">
+    <a href="{{ path }}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number }}{{ anchor }}">
             <span class="icon icon-arrow-left"></span>
             {% trans "Previous" %}
         </a>
@@ -11,7 +11,7 @@
 
     {% if page.has_next %}
     <p class="pagination-next">
-    <a href="{{ path }}?page={{ page.next_page_number }}{{ anchor }}">
+    <a href="{{ path }}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number }}{{ anchor }}">
             {% trans "Next" %}
             <span class="icon icon-arrow-right"></span>
         </a>

From f63b6fb32544e1e14f70152a56f78217825629e6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 29 Mar 2021 08:33:12 -0700
Subject: [PATCH 0495/1285] Fixes sending invite emails

Corrects the email sender and avoids integrity error on saves
---
 bookwyrm/emailing.py           | 6 ++++--
 bookwyrm/models/site.py        | 2 +-
 bookwyrm/settings.py           | 1 +
 bookwyrm/templates/layout.html | 6 +++---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/emailing.py b/bookwyrm/emailing.py
index 47ac59df..1804254b 100644
--- a/bookwyrm/emailing.py
+++ b/bookwyrm/emailing.py
@@ -2,7 +2,7 @@
 from django.core.mail import EmailMultiAlternatives
 from django.template.loader import get_template
 
-from bookwyrm import models
+from bookwyrm import models, settings
 from bookwyrm.tasks import app
 from bookwyrm.settings import DOMAIN
 
@@ -59,6 +59,8 @@ def format_email(email_name, data):
 @app.task
 def send_email(recipient, subject, html_content, text_content):
     """ use a task to send the email """
-    email = EmailMultiAlternatives(subject, text_content, None, [recipient])
+    email = EmailMultiAlternatives(
+        subject, text_content, settings.DEFAULT_FROM_EMAIL, [recipient]
+    )
     email.attach_alternative(html_content, "text/html")
     email.send()
diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py
index 2c8d2553..c3c1d8a4 100644
--- a/bookwyrm/models/site.py
+++ b/bookwyrm/models/site.py
@@ -83,7 +83,7 @@ class InviteRequest(BookWyrmModel):
 
     def save(self, *args, **kwargs):
         """ don't create a request for a registered email """
-        if User.objects.filter(email=self.email).exists():
+        if not self.id and User.objects.filter(email=self.email).exists():
             raise IntegrityError()
         super().save(*args, **kwargs)
 
diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index b615fa29..4f2dfa83 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -25,6 +25,7 @@ EMAIL_PORT = env("EMAIL_PORT", 587)
 EMAIL_HOST_USER = env("EMAIL_HOST_USER")
 EMAIL_HOST_PASSWORD = env("EMAIL_HOST_PASSWORD")
 EMAIL_USE_TLS = env("EMAIL_USE_TLS", True)
+DEFAULT_FROM_EMAIL = "admin@{:s}".format(env("DOMAIN"))
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 4f657358..f0f04b84 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -107,7 +107,7 @@
                             {% trans 'Settings' %}
                         </a>
                     </li>
-                    {% if perms.bookwyrm.create_invites or perms.bookwyrm.edit_instance_settings%}
+                    {% if perms.bookwyrm.create_invites or perms.moderate_users %}
                     <li class="navbar-divider" role="presentation"></li>
                     {% endif %}
                     {% if perms.bookwyrm.create_invites %}
@@ -117,9 +117,9 @@
                         </a>
                     </li>
                     {% endif %}
-                    {% if perms.bookwyrm.edit_instance_settings %}
+                    {% if perms.bookwyrm.moderate_users %}
                     <li>
-                        <a href="{% url 'settings-reports' %}" class="navbar-item">
+                        <a href="{% url 'settings-users' %}" class="navbar-item">
                             {% trans 'Admin' %}
                         </a>
                     </li>

From 7c9518afa6614a276de6fd762d8c1eb065ce7d38 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 29 Mar 2021 10:21:48 -0700
Subject: [PATCH 0496/1285] Adds info to editions page

---
 bookwyrm/templates/book/book.html           | 19 +-----------
 bookwyrm/templates/book/editions.html       | 33 +++++++++++++++++++++
 bookwyrm/templates/book/publisher_info.html | 24 +++++++++++++++
 bookwyrm/templates/editions.html            | 14 ---------
 bookwyrm/views/books.py                     |  2 +-
 5 files changed, 59 insertions(+), 33 deletions(-)
 create mode 100644 bookwyrm/templates/book/editions.html
 create mode 100644 bookwyrm/templates/book/publisher_info.html
 delete mode 100644 bookwyrm/templates/editions.html

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index aef8fba1..95cf86ad 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -76,24 +76,7 @@
                     {% endif %}
                 </dl>
 
-                <p>
-                    {% if book.physical_format and not book.pages %}
-                    {{ book.physical_format | title }}
-                    {% elif book.physical_format and book.pages %}
-                    {% blocktrans with format=book.physical_format|title pages=book.pages %}{{ format }}, {{ pages }} pages{% endblocktrans %}
-                    {% elif book.pages %}
-                    {% blocktrans with pages=book.pages %}{{ pages }} pages{% endblocktrans %}
-                    {% endif %}
-                </p>
-                <p>
-                    {% if book.published_date and book.publishers %}
-                    {% blocktrans with date=book.published_date|date:'M jS Y' publisher=book.publishers|join:', ' %}Published {{ date }} by {{ publisher }}.{% endblocktrans %}
-                    {% elif book.published_date %}
-                    {% blocktrans with date=book.published_date|date:'M jS Y' %}Published {{ date }}{% endblocktrans %}
-                    {% elif book.publishers %}
-                    {% blocktrans with publisher=book.publishers|join:', ' %}Published by {{ publisher }}.{% endblocktrans %}
-                    {% endif %}
-                </p>
+                {% include 'book/publisher_info.html' with book=book %}
 
                 {% if book.openlibrary_key %}
                 <p><a href="https://openlibrary.org/books/{{ book.openlibrary_key }}" target="_blank" rel="noopener">{% trans "View on OpenLibrary" %}</a></p>
diff --git a/bookwyrm/templates/book/editions.html b/bookwyrm/templates/book/editions.html
new file mode 100644
index 00000000..b77dc1a6
--- /dev/null
+++ b/bookwyrm/templates/book/editions.html
@@ -0,0 +1,33 @@
+{% extends 'layout.html' %}
+{% load i18n %}
+{% load bookwyrm_tags %}
+
+{% block title %}{% blocktrans with book_title=work.title %}Editions of {{ book_title }}{% endblocktrans %}{% endblock %}
+
+{% block content %}
+<div class="block">
+    <h1 class="title">{% blocktrans with work_path=work.local_path work_title=work.title %}Editions of <a href="{{ work_path }}">"{{ work_title }}"</a>{% endblocktrans %}</h1>
+
+    {% for book in editions %}
+    <div class="columns">
+        <div class="column is-2">
+            <a href="/book/{{ book.id }}">
+                {% include 'snippets/book_cover.html' with book=book size="medium" %}
+            </a>
+        </div>
+        <div class="column is-7">
+            <h2 class="title is-5">
+                <a href="/book/{{ book.id }}" class="has-text-black">
+                    {{ book.title }}
+                </a>
+            </h2>
+            {% include 'book/publisher_info.html' with book=book %}
+        </div>
+        <div class="column is-3">
+            {% include 'snippets/shelve_button/shelve_button.html' with book=book switch_mode=True %}
+        </div>
+    </div>
+    {% endfor %}
+</div>
+{% endblock %}
+
diff --git a/bookwyrm/templates/book/publisher_info.html b/bookwyrm/templates/book/publisher_info.html
new file mode 100644
index 00000000..0ab35401
--- /dev/null
+++ b/bookwyrm/templates/book/publisher_info.html
@@ -0,0 +1,24 @@
+{% load i18n %}
+<p>
+    {% if book.physical_format and not book.pages %}
+    {{ book.physical_format | title }}
+    {% elif book.physical_format and book.pages %}
+    {% blocktrans with format=book.physical_format|title pages=book.pages %}{{ format }}, {{ pages }} pages{% endblocktrans %}
+    {% elif book.pages %}
+    {% blocktrans with pages=book.pages %}{{ pages }} pages{% endblocktrans %}
+    {% endif %}
+</p>
+{% if book.languages %}
+<p>
+    {% blocktrans with languages=book.languages|join:", " %}{{ languages }} language{% endblocktrans %}
+</p>
+{% endif %}
+<p>
+    {% if book.published_date and book.publishers %}
+    {% blocktrans with date=book.published_date|date:'M jS Y' publisher=book.publishers|join:', ' %}Published {{ date }} by {{ publisher }}.{% endblocktrans %}
+    {% elif book.published_date %}
+    {% blocktrans with date=book.published_date|date:'M jS Y' %}Published {{ date }}{% endblocktrans %}
+    {% elif book.publishers %}
+    {% blocktrans with publisher=book.publishers|join:', ' %}Published by {{ publisher }}.{% endblocktrans %}
+    {% endif %}
+</p>
diff --git a/bookwyrm/templates/editions.html b/bookwyrm/templates/editions.html
deleted file mode 100644
index f8319757..00000000
--- a/bookwyrm/templates/editions.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends 'layout.html' %}
-{% load i18n %}
-{% load bookwyrm_tags %}
-
-{% block title %}{% blocktrans with book_title=work.title %}Editions of {{ book_title }}{% endblocktrans %}{% endblock %}
-
-{% block content %}
-<div class="block">
-    <h1 class="title">{% blocktrans with work_path=work.local_path work_title=work.title %}Editions of <a href="{{ work_path }}">"{{ work_title }}"</a>{% endblocktrans %}</h1>
-
-    {% include 'snippets/book_tiles.html' with books=editions %}
-</div>
-{% endblock %}
-
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index cabc3223..5c8eab4c 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -257,7 +257,7 @@ class Editions(View):
             "editions": work.editions.order_by("-edition_rank").all(),
             "work": work,
         }
-        return TemplateResponse(request, "editions.html", data)
+        return TemplateResponse(request, "book/editions.html", data)
 
 
 @login_required

From b13e8d75cdb126ca05e19f037537ea39ef3932ca Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 29 Mar 2021 10:39:13 -0700
Subject: [PATCH 0497/1285] Introduces filters snippets

---
 .../templates/directory/community_filter.html | 14 +++++
 .../templates/{ => directory}/directory.html  | 59 +------------------
 bookwyrm/templates/directory/filters.html     |  7 +++
 bookwyrm/templates/directory/sort_filter.html | 12 ++++
 .../templates/directory/user_type_filter.html | 14 +++++
 .../snippets/filters_panel/filter_field.html  |  6 ++
 .../snippets/filters_panel/filters_panel.html | 25 ++++++++
 bookwyrm/views/directory.py                   |  2 +-
 8 files changed, 80 insertions(+), 59 deletions(-)
 create mode 100644 bookwyrm/templates/directory/community_filter.html
 rename bookwyrm/templates/{ => directory}/directory.html (56%)
 create mode 100644 bookwyrm/templates/directory/filters.html
 create mode 100644 bookwyrm/templates/directory/sort_filter.html
 create mode 100644 bookwyrm/templates/directory/user_type_filter.html
 create mode 100644 bookwyrm/templates/snippets/filters_panel/filter_field.html
 create mode 100644 bookwyrm/templates/snippets/filters_panel/filters_panel.html

diff --git a/bookwyrm/templates/directory/community_filter.html b/bookwyrm/templates/directory/community_filter.html
new file mode 100644
index 00000000..bd0ba778
--- /dev/null
+++ b/bookwyrm/templates/directory/community_filter.html
@@ -0,0 +1,14 @@
+{% extends 'snippets/filters_panel/filter_field.html' %}
+{% load i18n %}
+
+{% block filter %}
+<legend class="label">{% trans "Community" %}</legend>
+<label class="is-block">
+    <input type="radio" class="radio" name="scope" value="local" {% if request.GET.scope == "local" %}checked{% endif %}>
+    {% trans "Local users" %}
+</label>
+<label class="is-block">
+    <input type="radio" class="radio" name="scope" value="federated" {% if not request.GET.sort or request.GET.scope == "federated" %}checked{% endif %}>
+    {% trans "Federated community" %}
+</label>
+{% endblock %}
diff --git a/bookwyrm/templates/directory.html b/bookwyrm/templates/directory/directory.html
similarity index 56%
rename from bookwyrm/templates/directory.html
rename to bookwyrm/templates/directory/directory.html
index 3d47e26b..7413f67d 100644
--- a/bookwyrm/templates/directory.html
+++ b/bookwyrm/templates/directory/directory.html
@@ -36,64 +36,7 @@
 </div></div>
 {% endif %}
 
-<div class="notification content">
-    <h2 class="columns is-mobile mb-0">
-        <span class="column pb-0">Filters</span>
-
-        <span class="column is-narrow pb-0">
-            {% trans "Show filters" as text %}
-            {% include 'snippets/toggle/open_button.html' with text=text controls_text="filters" icon="arrow-down" class="is-small" focus="filters" %}
-            {% trans "Hide filters" as text %}
-            {% include 'snippets/toggle/close_button.html' with text=text controls_text="filters" icon="x" class="is-small" %}
-        </span>
-    </h2>
-
-    <form class="hidden mt-3" id="filters" method-"get" action="{% url 'directory' %}" tabindex="0">
-        <div class="columns">
-            <div class="column is-flex">
-                <div class="box is-flex-grow-1">
-                    <legend class="label">{% trans "User type" %}</legend>
-                    <label class="is-block">
-                        <input type="radio" class="radio" name="software" value="bookwyrm" {% if not request.GET.sort or  request.GET.software == 'bookwyrm' %}checked{% endif %}>
-                        {% trans "BookWyrm users" %}
-                    </label>
-                    <label class="is-block">
-                        <input type="radio" class="radio" name="software" value="all" {% if request.GET.software == 'all' %}checked{% endif %}>
-                        {% trans "All known users" %}
-                    </label>
-                </div>
-            </div>
-            <div class="column is-flex">
-                <div class="box is-flex-grow-1">
-                    <legend class="label">{% trans "Community" %}</legend>
-                    <label class="is-block">
-                        <input type="radio" class="radio" name="scope" value="local" {% if request.GET.scope == "local" %}checked{% endif %}>
-                        {% trans "Local users" %}
-                    </label>
-                    <label class="is-block">
-                        <input type="radio" class="radio" name="scope" value="federated" {% if not request.GET.sort or request.GET.scope == "federated" %}checked{% endif %}>
-                        {% trans "Federated community" %}
-                    </label>
-                </div>
-            </div>
-            <div class="column is-flex">
-                <div class="box is-flex-grow-1">
-                    <label class="label" for="id_sort">{% trans "Order by" %}</label>
-                    <div class="select">
-                        <select name="sort" id="id_sort">
-                            <option value="suggested" {% if not request.GET.sort or request.GET.sort == "suggested" %}checked{% endif %}>{% trans "Suggested" %}</option>
-                            <option value="recent" {% if request.GET.sort == "suggested" %}checked{% endif %}>{% trans "Recently active" %}</option>
-                        </select>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <button class="button is-primary">{% trans "Apply filters" %}</button>
-    </form>
-    {% if request.GET %}
-    <a class="help" href="{% url 'directory' %}">{% trans "Clear filters" %}</a>
-    {% endif %}
-</div>
+{% include 'directory/filters.html' %}
 
 <div class="columns is-multiline">
     {% for user in users %}
diff --git a/bookwyrm/templates/directory/filters.html b/bookwyrm/templates/directory/filters.html
new file mode 100644
index 00000000..c6bbe157
--- /dev/null
+++ b/bookwyrm/templates/directory/filters.html
@@ -0,0 +1,7 @@
+{% extends 'snippets/filters_panel/filters_panel.html' %}
+
+{% block filter_fields %}
+{% include 'directory/user_type_filter.html' %}
+{% include 'directory/community_filter.html' %}
+{% include 'directory/sort_filter.html' %}
+{% endblock %}
diff --git a/bookwyrm/templates/directory/sort_filter.html b/bookwyrm/templates/directory/sort_filter.html
new file mode 100644
index 00000000..82b561fb
--- /dev/null
+++ b/bookwyrm/templates/directory/sort_filter.html
@@ -0,0 +1,12 @@
+{% extends 'snippets/filters_panel/filter_field.html' %}
+{% load i18n %}
+
+{% block filter %}
+<label class="label" for="id_sort">{% trans "Order by" %}</label>
+<div class="select">
+    <select name="sort" id="id_sort">
+        <option value="suggested" {% if not request.GET.sort or request.GET.sort == "suggested" %}checked{% endif %}>{% trans "Suggested" %}</option>
+        <option value="recent" {% if request.GET.sort == "suggested" %}checked{% endif %}>{% trans "Recently active" %}</option>
+    </select>
+</div>
+{% endblock %}
diff --git a/bookwyrm/templates/directory/user_type_filter.html b/bookwyrm/templates/directory/user_type_filter.html
new file mode 100644
index 00000000..b5961c82
--- /dev/null
+++ b/bookwyrm/templates/directory/user_type_filter.html
@@ -0,0 +1,14 @@
+{% extends 'snippets/filters_panel/filter_field.html' %}
+{% load i18n %}
+
+{% block filter %}
+<legend class="label">{% trans "User type" %}</legend>
+<label class="is-block">
+    <input type="radio" class="radio" name="software" value="bookwyrm" {% if not request.GET.sort or  request.GET.software == 'bookwyrm' %}checked{% endif %}>
+    {% trans "BookWyrm users" %}
+</label>
+<label class="is-block">
+    <input type="radio" class="radio" name="software" value="all" {% if request.GET.software == 'all' %}checked{% endif %}>
+    {% trans "All known users" %}
+</label>
+{% endblock %}
diff --git a/bookwyrm/templates/snippets/filters_panel/filter_field.html b/bookwyrm/templates/snippets/filters_panel/filter_field.html
new file mode 100644
index 00000000..0a8daaa1
--- /dev/null
+++ b/bookwyrm/templates/snippets/filters_panel/filter_field.html
@@ -0,0 +1,6 @@
+<div class="column is-flex">
+    <div class="box is-flex-grow-1">
+        {% block filter %}
+        {% endblock %}
+    </div>
+</div>
diff --git a/bookwyrm/templates/snippets/filters_panel/filters_panel.html b/bookwyrm/templates/snippets/filters_panel/filters_panel.html
new file mode 100644
index 00000000..185f5bc4
--- /dev/null
+++ b/bookwyrm/templates/snippets/filters_panel/filters_panel.html
@@ -0,0 +1,25 @@
+{% load i18n %}
+<div class="notification content">
+    <h2 class="columns is-mobile mb-0">
+        <span class="column pb-0">Filters</span>
+
+        <span class="column is-narrow pb-0">
+            {% trans "Show filters" as text %}
+            {% include 'snippets/toggle/open_button.html' with text=text controls_text="filters" icon="arrow-down" class="is-small" focus="filters" %}
+            {% trans "Hide filters" as text %}
+            {% include 'snippets/toggle/close_button.html' with text=text controls_text="filters" icon="x" class="is-small" %}
+        </span>
+    </h2>
+
+    <form class="hidden mt-3" id="filters" method-"get" action="{{ request.path }}" tabindex="0">
+        <div class="columns">
+            {% block filter_fields %}
+            {% endblock %}
+        </div>
+        <button class="button is-primary">{% trans "Apply filters" %}</button>
+    </form>
+
+    {% if request.GET %}
+    <a class="help" href="{{ request.path }}">{% trans "Clear filters" %}</a>
+    {% endif %}
+</div>
diff --git a/bookwyrm/views/directory.py b/bookwyrm/views/directory.py
index c57b47f7..b329eede 100644
--- a/bookwyrm/views/directory.py
+++ b/bookwyrm/views/directory.py
@@ -41,7 +41,7 @@ class Directory(View):
         data = {
             "users": paginated.page(page),
         }
-        return TemplateResponse(request, "directory.html", data)
+        return TemplateResponse(request, "directory/directory.html", data)
 
     def post(self, request):
         """ join the directory """

From 769ba6466c84654ed6fc0fb82a79b3a223e3ddf2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 29 Mar 2021 10:58:35 -0700
Subject: [PATCH 0498/1285] Adds filters ui to editions page

---
 bookwyrm/templates/book/edition_filters.html |  6 ++++++
 bookwyrm/templates/book/editions.html        |  5 ++++-
 bookwyrm/templates/book/format_filter.html   | 13 +++++++++++++
 bookwyrm/templates/book/language_filter.html | 13 +++++++++++++
 bookwyrm/views/books.py                      |  6 +++++-
 5 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 bookwyrm/templates/book/edition_filters.html
 create mode 100644 bookwyrm/templates/book/format_filter.html
 create mode 100644 bookwyrm/templates/book/language_filter.html

diff --git a/bookwyrm/templates/book/edition_filters.html b/bookwyrm/templates/book/edition_filters.html
new file mode 100644
index 00000000..a55b72af
--- /dev/null
+++ b/bookwyrm/templates/book/edition_filters.html
@@ -0,0 +1,6 @@
+{% extends 'snippets/filters_panel/filters_panel.html' %}
+
+{% block filter_fields %}
+{% include 'book/language_filter.html' %}
+{% include 'book/format_filter.html' %}
+{% endblock %}
diff --git a/bookwyrm/templates/book/editions.html b/bookwyrm/templates/book/editions.html
index b77dc1a6..7290cce9 100644
--- a/bookwyrm/templates/book/editions.html
+++ b/bookwyrm/templates/book/editions.html
@@ -7,7 +7,11 @@
 {% block content %}
 <div class="block">
     <h1 class="title">{% blocktrans with work_path=work.local_path work_title=work.title %}Editions of <a href="{{ work_path }}">"{{ work_title }}"</a>{% endblocktrans %}</h1>
+</div>
 
+{% include 'book/edition_filters.html' %}
+
+<div class="block">
     {% for book in editions %}
     <div class="columns">
         <div class="column is-2">
@@ -30,4 +34,3 @@
     {% endfor %}
 </div>
 {% endblock %}
-
diff --git a/bookwyrm/templates/book/format_filter.html b/bookwyrm/templates/book/format_filter.html
new file mode 100644
index 00000000..7bd8f6c7
--- /dev/null
+++ b/bookwyrm/templates/book/format_filter.html
@@ -0,0 +1,13 @@
+{% extends 'snippets/filters_panel/filter_field.html' %}
+{% load i18n %}
+
+{% block filter %}
+<label class="label is-block" for="id_format">{% trans "Format:" %}</label>
+<div class="select">
+    <select id="format" name="format">
+        {% for format in formats %}{% if format %}
+        <option value="{{ format }}">{{ format|title }}</option>
+        {% endif %}{% endfor %}
+    </select>
+</div>
+{% endblock %}
diff --git a/bookwyrm/templates/book/language_filter.html b/bookwyrm/templates/book/language_filter.html
new file mode 100644
index 00000000..fc21d5e2
--- /dev/null
+++ b/bookwyrm/templates/book/language_filter.html
@@ -0,0 +1,13 @@
+{% extends 'snippets/filters_panel/filter_field.html' %}
+{% load i18n %}
+
+{% block filter %}
+<label class="label is-block" for="id_language">{% trans "Language:" %}</label>
+<div class="select">
+    <select id="language" name="language">
+        {% for language in languages %}
+        <option value="{{ language }}">{{ language }}</option>
+        {% endfor %}
+    </select>
+</div>
+{% endblock %}
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 5c8eab4c..6d10e131 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -252,10 +252,14 @@ class Editions(View):
 
         if is_api_request(request):
             return ActivitypubResponse(work.to_edition_list(**request.GET))
+        editions = work.editions.order_by("-edition_rank").all()
+        languages = set(sum([e.languages for e in editions], []))
 
         data = {
-            "editions": work.editions.order_by("-edition_rank").all(),
+            "editions": editions,
             "work": work,
+            "languages": languages,
+            "formats": set(e.physical_format.lower() for e in editions),
         }
         return TemplateResponse(request, "book/editions.html", data)
 

From 9c798a4feba0f172823a72d3f13a9c535f254490 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 29 Mar 2021 11:13:23 -0700
Subject: [PATCH 0499/1285] Filter editions

---
 bookwyrm/templates/book/format_filter.html   | 5 ++++-
 bookwyrm/templates/book/language_filter.html | 5 ++++-
 bookwyrm/views/books.py                      | 9 ++++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/book/format_filter.html b/bookwyrm/templates/book/format_filter.html
index 7bd8f6c7..05275528 100644
--- a/bookwyrm/templates/book/format_filter.html
+++ b/bookwyrm/templates/book/format_filter.html
@@ -5,8 +5,11 @@
 <label class="label is-block" for="id_format">{% trans "Format:" %}</label>
 <div class="select">
     <select id="format" name="format">
+        <option value="">{% trans "Any" %}</option>
         {% for format in formats %}{% if format %}
-        <option value="{{ format }}">{{ format|title }}</option>
+        <option value="{{ format }}" {% if request.GET.format == format %}selected{% endif %}>
+            {{ format|title }}
+        </option>
         {% endif %}{% endfor %}
     </select>
 </div>
diff --git a/bookwyrm/templates/book/language_filter.html b/bookwyrm/templates/book/language_filter.html
index fc21d5e2..c6798a9b 100644
--- a/bookwyrm/templates/book/language_filter.html
+++ b/bookwyrm/templates/book/language_filter.html
@@ -5,8 +5,11 @@
 <label class="label is-block" for="id_language">{% trans "Language:" %}</label>
 <div class="select">
     <select id="language" name="language">
+        <option value="">{% trans "Any" %}</option>
         {% for language in languages %}
-        <option value="{{ language }}">{{ language }}</option>
+        <option value="{{ language }}" {% if request.GET.language == language %}selected{% endif %}>
+            {{ language }}
+        </option>
         {% endfor %}
     </select>
 </div>
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 6d10e131..8434cec0 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -252,11 +252,18 @@ class Editions(View):
 
         if is_api_request(request):
             return ActivitypubResponse(work.to_edition_list(**request.GET))
+        filters = {}
+
+        if request.GET.get("language"):
+            filters["languages__contains"] = [request.GET.get("language")]
+        if request.GET.get("format"):
+            filters["physical_format__iexact"] = request.GET.get("format")
+
         editions = work.editions.order_by("-edition_rank").all()
         languages = set(sum([e.languages for e in editions], []))
 
         data = {
-            "editions": editions,
+            "editions": editions.filter(**filters).all(),
             "work": work,
             "languages": languages,
             "formats": set(e.physical_format.lower() for e in editions),

From f8a321c74d6cad8059586021da184dcccc1c70e9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 29 Mar 2021 11:16:34 -0700
Subject: [PATCH 0500/1285] Fixes labels

Good bot
---
 bookwyrm/templates/book/format_filter.html   | 2 +-
 bookwyrm/templates/book/language_filter.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/book/format_filter.html b/bookwyrm/templates/book/format_filter.html
index 05275528..c722b24f 100644
--- a/bookwyrm/templates/book/format_filter.html
+++ b/bookwyrm/templates/book/format_filter.html
@@ -4,7 +4,7 @@
 {% block filter %}
 <label class="label is-block" for="id_format">{% trans "Format:" %}</label>
 <div class="select">
-    <select id="format" name="format">
+    <select id="id_format" name="format">
         <option value="">{% trans "Any" %}</option>
         {% for format in formats %}{% if format %}
         <option value="{{ format }}" {% if request.GET.format == format %}selected{% endif %}>
diff --git a/bookwyrm/templates/book/language_filter.html b/bookwyrm/templates/book/language_filter.html
index c6798a9b..d9051fd8 100644
--- a/bookwyrm/templates/book/language_filter.html
+++ b/bookwyrm/templates/book/language_filter.html
@@ -4,7 +4,7 @@
 {% block filter %}
 <label class="label is-block" for="id_language">{% trans "Language:" %}</label>
 <div class="select">
-    <select id="language" name="language">
+    <select id="id_language" name="language">
         <option value="">{% trans "Any" %}</option>
         {% for language in languages %}
         <option value="{{ language }}" {% if request.GET.language == language %}selected{% endif %}>

From 0a4e755516892ab84b86956e7ae27058aa213ab8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 29 Mar 2021 11:27:51 -0700
Subject: [PATCH 0501/1285] Fixes setting lower() on NoneType

---
 bookwyrm/views/books.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 8434cec0..02cbd1e2 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -266,7 +266,7 @@ class Editions(View):
             "editions": editions.filter(**filters).all(),
             "work": work,
             "languages": languages,
-            "formats": set(e.physical_format.lower() for e in editions),
+            "formats": set(e.physical_format.lower() for e in editions if e),
         }
         return TemplateResponse(request, "book/editions.html", data)
 

From f6ad069f74fa79725ccb5a75a3e8e76fac7dcf4d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 29 Mar 2021 11:38:14 -0700
Subject: [PATCH 0502/1285] Fixes tests

---
 bookwyrm/views/books.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 02cbd1e2..895c7ec9 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -266,7 +266,9 @@ class Editions(View):
             "editions": editions.filter(**filters).all(),
             "work": work,
             "languages": languages,
-            "formats": set(e.physical_format.lower() for e in editions if e),
+            "formats": set(
+                e.physical_format.lower() for e in editions if e.physical_format
+            ),
         }
         return TemplateResponse(request, "book/editions.html", data)
 

From e9f202b9e05ca6bfe8649f1f88cb64904fe5ce6b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 29 Mar 2021 11:48:19 -0700
Subject: [PATCH 0503/1285] Paginate shelf page

Also removes some fields from the table
---
 bookwyrm/templates/snippets/shelf.html | 73 --------------------------
 bookwyrm/templates/user/shelf.html     | 72 ++++++++++++++++++++++++-
 bookwyrm/views/shelf.py                | 14 +++--
 3 files changed, 82 insertions(+), 77 deletions(-)
 delete mode 100644 bookwyrm/templates/snippets/shelf.html

diff --git a/bookwyrm/templates/snippets/shelf.html b/bookwyrm/templates/snippets/shelf.html
deleted file mode 100644
index 8cae29e6..00000000
--- a/bookwyrm/templates/snippets/shelf.html
+++ /dev/null
@@ -1,73 +0,0 @@
-{% load humanize %}
-{% load i18n %}
-{% load bookwyrm_tags %}
-{% if books|length > 0 %}
-<div class="scroll-x">
-<table class="table is-striped is-fullwidth">
-
-<tr class="book-preview">
-    <th>{% trans "Cover" %}</th>
-    <th>{% trans "Title" %}</th>
-    <th>{% trans "Author" %}</th>
-    <th>{% trans "Published" %}</th>
-    <th>{% trans "Shelved" %}</th>
-    <th>{% trans "Started" %}</th>
-    <th>{% trans "Finished" %}</th>
-    <th>{% trans "External links" %}</th>{% if ratings %}
-    <th>{% trans "Rating" %}</th>{% endif %}
-</tr>
-{% for book in books %}
-<tr class="book-preview">
-    <td>
-        <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book size="small" %}</a>
-    </td>
-    <td>
-        <a href="{{ book.local_path }}">{{ book.title }}</a>
-    </td>
-    <td>
-        {{ book.authors.first.name }}
-    </td>
-    <td>
-        {% if book.first_published_date %}{{ book.first_published_date }}{% endif %}
-    </td>
-    <td>
-        {{ book.created_date | naturalday }}
-    </td>
-    {% latest_read_through book user as read_through %}
-    <td>
-        {{ read_through.start_date | naturalday |default_if_none:""}}
-    </td>
-    <td>
-        {{ read_through.finish_date | naturalday |default_if_none:""}}
-    </td>
-    <td>
-        <a href="https://openlibrary.org/book/{{ book.openlibrary_key }}" target="_blank">{% trans "OpenLibrary" %}</a>
-    </td>
-    {% if ratings %}
-    <td>
-        {% include 'snippets/stars.html' with rating=ratings|dict_key:book.id %}
-    </td>
-    {% endif %}
-    {% if shelf.user == request.user %}
-    <td>
-        {% include 'snippets/shelf_selector.html' with current=shelf %}
-    </td>
-    {% endif %}
-</tr>
-{% endfor %}
-</table>
-</div>
-{% else %}
-<p>{% trans "This shelf is empty." %}</p>
-{% if shelf.editable %}
-<form name="delete-shelf" action="/delete-shelf/{{ shelf.id }}" method="post">
-    {% csrf_token %}
-    <input type="hidden" name="user" value="{{ request.user.id }}">
-    <button class="button is-danger is-light" type="submit">
-        {% trans "Delete shelf" %}
-    </button>
-</form>
-{% endif %}
-
-{% endif %}
-
diff --git a/bookwyrm/templates/user/shelf.html b/bookwyrm/templates/user/shelf.html
index 189d2856..4c60258c 100644
--- a/bookwyrm/templates/user/shelf.html
+++ b/bookwyrm/templates/user/shelf.html
@@ -1,5 +1,6 @@
 {% extends 'user/user_layout.html' %}
 {% load bookwyrm_tags %}
+{% load humanize %}
 {% load i18n %}
 
 {% block header %}
@@ -63,7 +64,76 @@
 
 <div class="block">
     <div>
-        {% include 'snippets/shelf.html' with shelf=shelf books=books ratings=ratings %}
+        {% if books|length > 0 %}
+        <div class="scroll-x">
+        <table class="table is-striped is-fullwidth">
+
+        <tr class="book-preview">
+            <th>{% trans "Cover" %}</th>
+            <th>{% trans "Title" %}</th>
+            <th>{% trans "Author" %}</th>
+            <th>{% trans "Shelved" %}</th>
+            <th>{% trans "Started" %}</th>
+            <th>{% trans "Finished" %}</th>
+            {% if ratings %}<th>{% trans "Rating" %}</th>{% endif %}
+            {% if shelf.user == request.user %}
+            <th aria-hidden="true"></th>
+            {% endif %}
+        </tr>
+        {% for book in books %}
+        {% with book=book.book %}
+        <tr class="book-preview">
+            <td>
+                <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book size="small" %}</a>
+            </td>
+            <td>
+                <a href="{{ book.local_path }}">{{ book.title }}</a>
+            </td>
+            <td>
+                {% include 'snippets/authors.html' %}
+            </td>
+            <td>
+                {{ book.created_date | naturalday }}
+            </td>
+            {% latest_read_through book user as read_through %}
+            <td>
+                {{ read_through.start_date | naturalday |default_if_none:""}}
+            </td>
+            <td>
+                {{ read_through.finish_date | naturalday |default_if_none:""}}
+            </td>
+            {% if ratings %}
+            <td>
+                {% include 'snippets/stars.html' with rating=ratings|dict_key:book.id %}
+            </td>
+            {% endif %}
+            {% if shelf.user == request.user %}
+            <td>
+                {% include 'snippets/shelf_selector.html' with current=shelf %}
+            </td>
+            {% endif %}
+        </tr>
+        {% endwith %}
+        {% endfor %}
+        </table>
+        </div>
+        {% else %}
+        <p>{% trans "This shelf is empty." %}</p>
+        {% if shelf.editable %}
+        <form name="delete-shelf" action="/delete-shelf/{{ shelf.id }}" method="post">
+            {% csrf_token %}
+            <input type="hidden" name="user" value="{{ request.user.id }}">
+            <button class="button is-danger is-light" type="submit">
+                {% trans "Delete shelf" %}
+            </button>
+        </form>
+        {% endif %}
+
+        {% endif %}
+
     </div>
 </div>
+<div>
+    {% include 'snippets/pagination.html' with page=books path=request.path %}
+</div>
 {% endblock %}
diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index 6256eac7..87c40ce6 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -1,5 +1,6 @@
 """ shelf views"""
 from django.contrib.auth.decorators import login_required
+from django.core.paginator import Paginator
 from django.http import HttpResponseBadRequest, HttpResponseNotFound
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
@@ -9,6 +10,7 @@ from django.views.decorators.http import require_POST
 
 from bookwyrm import forms, models
 from bookwyrm.activitypub import ActivitypubResponse
+from bookwyrm.settings import PAGE_LENGTH
 from .helpers import is_api_request, get_edition, get_user_from_username
 from .helpers import handle_reading_status
 
@@ -24,6 +26,11 @@ class Shelf(View):
         except models.User.DoesNotExist:
             return HttpResponseNotFound()
 
+        try:
+            page = int(request.GET.get("page", 1))
+        except ValueError:
+            page = 1
+
         if shelf_identifier:
             shelf = user.shelf_set.get(identifier=shelf_identifier)
         else:
@@ -49,10 +56,11 @@ class Shelf(View):
         if is_api_request(request):
             return ActivitypubResponse(shelf.to_activity(**request.GET))
 
-        books = (
+        paginated = Paginator(
             models.ShelfBook.objects.filter(user=user, shelf=shelf)
             .order_by("-updated_date")
-            .all()
+            .all(),
+            PAGE_LENGTH,
         )
 
         data = {
@@ -60,7 +68,7 @@ class Shelf(View):
             "is_self": is_self,
             "shelves": shelves.all(),
             "shelf": shelf,
-            "books": [b.book for b in books],
+            "books": paginated.page(page),
         }
 
         return TemplateResponse(request, "user/shelf.html", data)

From 04ca6de96863c03830506efe356d807c9e152fe9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 29 Mar 2021 12:13:05 -0700
Subject: [PATCH 0504/1285] Paginates editions page

---
 bookwyrm/templates/book/editions.html | 4 ++++
 bookwyrm/views/books.py               | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/book/editions.html b/bookwyrm/templates/book/editions.html
index 7290cce9..91259465 100644
--- a/bookwyrm/templates/book/editions.html
+++ b/bookwyrm/templates/book/editions.html
@@ -33,4 +33,8 @@
     </div>
     {% endfor %}
 </div>
+
+<div>
+    {% include 'snippets/pagination.html' with page=editions path=request.path %}
+</div>
 {% endblock %}
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 895c7ec9..632cb2ad 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -250,6 +250,11 @@ class Editions(View):
         """ list of editions of a book """
         work = get_object_or_404(models.Work, id=book_id)
 
+        try:
+            page = int(request.GET.get("page", 1))
+        except ValueError:
+            page = 1
+
         if is_api_request(request):
             return ActivitypubResponse(work.to_edition_list(**request.GET))
         filters = {}
@@ -262,8 +267,9 @@ class Editions(View):
         editions = work.editions.order_by("-edition_rank").all()
         languages = set(sum([e.languages for e in editions], []))
 
+        paginated = Paginator(editions.filter(**filters).all(), PAGE_LENGTH)
         data = {
-            "editions": editions.filter(**filters).all(),
+            "editions": paginated.page(page),
             "work": work,
             "languages": languages,
             "formats": set(

From 794b47d119f7a9b5c8ce1bfe429969628df41614 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 29 Mar 2021 12:27:12 -0700
Subject: [PATCH 0505/1285] Unshelve option in shelve button menu

---
 .../snippets/shelve_button/shelve_button.html   |  2 +-
 .../shelve_button/shelve_button_options.html    | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button.html b/bookwyrm/templates/snippets/shelve_button/shelve_button.html
index 586d7d9d..dc07fb64 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button.html
@@ -3,6 +3,7 @@
 
 {% with book.id|uuid as uuid %}
 {% active_shelf book as active_shelf %}
+{% latest_read_through book request.user as readthrough %}
 <div class="field has-addons mb-0">
     {% if switch_mode and active_shelf.book != book %}
     <div class="control">
@@ -20,7 +21,6 @@
 
 {% include 'snippets/shelve_button/start_reading_modal.html' with book=active_shelf.book controls_text="start-reading" controls_uid=uuid %}
 
-{% latest_read_through book request.user as readthrough %}
 {% include 'snippets/shelve_button/finish_reading_modal.html' with book=active_shelf.book controls_text="finish-reading" controls_uid=uuid readthrough=readthrough %}
 
 {% include 'snippets/shelve_button/progress_update_modal.html' with book=shelf_book.book controls_text="progress-update" controls_uid=uuid readthrough=readthrough %}
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
index 56783b2c..a002917f 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
@@ -28,6 +28,8 @@
 {% if dropdown %}</li>{% endif %}
 {% endfor %}
 {% if dropdown %}
+
+{% if readthrough and active_shelf.shelf.identifier != 'read' %}
 <li role="menuitem">
     <div class="dropdown-item pt-0 pb-0">
         {% trans "Update progress" as button_text %}
@@ -35,3 +37,18 @@
     </div>
 </li>
 {% endif %}
+
+{% if active_shelf.shelf %}
+<li role="menuitem">
+    <div class="dropdown-item pt-0 pb-0">
+        <form  name="shelve" action="/unshelve/" method="post">
+            {% csrf_token %}
+            <input type="hidden" name="book" value="{{ active_shelf.book.id }}">
+            <input type="hidden" name="shelf" value="{{ active_shelf.shelf.id }}">
+            <button class="button is-fullwidth is-small is-danger is-light" type="submit">{% trans "Unshelve" %}</button>
+        </form>
+    </div>
+</li>
+{% endif %}
+
+{% endif %}

From c284a5e4091b816e52595365513d5fa69f769428 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 29 Mar 2021 13:07:22 -0700
Subject: [PATCH 0506/1285] Fixes error sending dm

---
 bookwyrm/activitystreams.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index caa2d83a..d811aa49 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -128,6 +128,8 @@ class HomeStream(ActivityStream):
 
     def stream_users(self, status):
         audience = super().stream_users(status)
+        if not audience:
+            return []
         return audience.filter(
             Q(id=status.user.id)  # if the user is the post's author
             | Q(following=status.user)  # if the user is following the author

From 84dfa696955398971df40e88e6f0439eddb9d4c1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 29 Mar 2021 13:28:30 -0700
Subject: [PATCH 0507/1285] Fixes invite flow

---
 bookwyrm/views/invite.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/invite.py
index 106afe65..49b5c91b 100644
--- a/bookwyrm/views/invite.py
+++ b/bookwyrm/views/invite.py
@@ -111,13 +111,13 @@ class ManageInviteRequests(View):
         invite_request = get_object_or_404(
             models.InviteRequest, id=request.POST.get("invite-request")
         )
-        # allows re-sending invites
-        invite_request.invite, _ = models.SiteInvite.objects.get_or_create(
-            use_limit=1,
-            user=request.user,
-        )
-
-        invite_request.save()
+        # only create a new invite if one doesn't exist already (resending)
+        if not invite_request.invite:
+            invite_request.invite = models.SiteInvite.objects.create(
+                use_limit=1,
+                user=request.user,
+            )
+            invite_request.save()
         emailing.invite_email(invite_request)
         return redirect("settings-invite-requests")
 

From 3be420944eee1bcacc80c89c22a2c7cf51c5dc7c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 29 Mar 2021 13:51:06 -0700
Subject: [PATCH 0508/1285] Fixes display of dms pagination

---
 bookwyrm/templates/feed/direct_messages.html | 1 -
 bookwyrm/views/feed.py                       | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/feed/direct_messages.html b/bookwyrm/templates/feed/direct_messages.html
index 2c28a79b..f097fd9f 100644
--- a/bookwyrm/templates/feed/direct_messages.html
+++ b/bookwyrm/templates/feed/direct_messages.html
@@ -27,7 +27,6 @@
     </div>
     {% endfor %}
 
-    {% include 'snippets/pagination.html' with page=activities path="direct-messages" %}
 </section>
 
 {% endblock %}
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index d068834a..f96072d6 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -87,7 +87,9 @@ class DirectMessage(View):
         if user:
             queryset = queryset.filter(Q(user=user) | Q(mention_users=user))
 
-        activities = privacy_filter(request.user, queryset, privacy_levels=["direct"])
+        activities = privacy_filter(
+            request.user, queryset, privacy_levels=["direct"]
+        ).order_by('-published_date')
 
         paginated = Paginator(activities, PAGE_LENGTH)
         activity_page = paginated.page(page)

From 662ddf44b910fbdc92ca7dca03757bba12692f88 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 29 Mar 2021 14:05:58 -0700
Subject: [PATCH 0509/1285] Avoid error when request Accept header is not set

---
 bookwyrm/tests/views/test_helpers.py | 5 +++++
 bookwyrm/views/helpers.py            | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py
index 2d100f7b..a9dadcad 100644
--- a/bookwyrm/tests/views/test_helpers.py
+++ b/bookwyrm/tests/views/test_helpers.py
@@ -84,6 +84,11 @@ class ViewsHelpers(TestCase):
         request.headers = {"Accept": "Praise"}
         self.assertFalse(views.helpers.is_api_request(request))
 
+    def test_is_api_request_no_headers(self, _):
+        """ should it return html or json """
+        request = self.factory.get("/path")
+        self.assertFalse(views.helpers.is_api_request(request))
+
     def test_is_bookwyrm_request(self, _):
         """ checks if a request came from a bookwyrm instance """
         request = self.factory.get("", {"q": "Test Book"})
diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index 52b5818f..006c6494 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -21,7 +21,7 @@ def get_user_from_username(viewer, username):
 
 def is_api_request(request):
     """ check whether a request is asking for html or data """
-    return "json" in request.headers.get("Accept") or request.path[-5:] == ".json"
+    return "json" in request.headers.get("Accept", "") or request.path[-5:] == ".json"
 
 
 def is_bookwyrm_request(request):

From 4115edad6eac840569d76335b8b865f0bebd3b70 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 29 Mar 2021 14:12:15 -0700
Subject: [PATCH 0510/1285] Adds robots.txt

---
 bookwyrm/templates/robots.txt | 5 +++++
 bookwyrm/urls.py              | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 bookwyrm/templates/robots.txt

diff --git a/bookwyrm/templates/robots.txt b/bookwyrm/templates/robots.txt
new file mode 100644
index 00000000..dc7b6bcb
--- /dev/null
+++ b/bookwyrm/templates/robots.txt
@@ -0,0 +1,5 @@
+# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
+
+User-agent: *
+Disallow: /static/js/
+Disallow: /static/css/
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index a2250c48..f5c13a4b 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -2,7 +2,7 @@
 from django.conf.urls.static import static
 from django.contrib import admin
 from django.urls import path, re_path
-
+from django.views.generic.base import TemplateView
 
 from bookwyrm import settings, views
 from bookwyrm.utils import regex
@@ -27,6 +27,10 @@ handler404 = "bookwyrm.views.not_found_page"
 handler500 = "bookwyrm.views.server_error_page"
 urlpatterns = [
     path("admin/", admin.site.urls),
+    path(
+        "robots.txt",
+        TemplateView.as_view(template_name="robots.txt", content_type="text/plain"),
+    ),
     # federation endpoints
     re_path(r"^inbox/?$", views.Inbox.as_view()),
     re_path(r"%s/inbox/?$" % local_user_path, views.Inbox.as_view()),

From 2722050ee2933f40b1113b65928d57458bbc6839 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 29 Mar 2021 14:20:51 -0700
Subject: [PATCH 0511/1285] Python formatting

---
 bookwyrm/views/feed.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index f96072d6..eb4e370e 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -89,7 +89,7 @@ class DirectMessage(View):
 
         activities = privacy_filter(
             request.user, queryset, privacy_levels=["direct"]
-        ).order_by('-published_date')
+        ).order_by("-published_date")
 
         paginated = Paginator(activities, PAGE_LENGTH)
         activity_page = paginated.page(page)

From 6bf3d9dcd88a1a28210e943dab74a6a49f21be47 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 29 Mar 2021 14:36:24 -0700
Subject: [PATCH 0512/1285] Adds hosts-meta path

---
 bookwyrm/templates/host_meta.xml | 5 +++++
 bookwyrm/urls.py                 | 5 +++--
 bookwyrm/views/__init__.py       | 2 +-
 bookwyrm/views/wellknown.py      | 7 +++++++
 4 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 bookwyrm/templates/host_meta.xml

diff --git a/bookwyrm/templates/host_meta.xml b/bookwyrm/templates/host_meta.xml
new file mode 100644
index 00000000..4fe8bcec
--- /dev/null
+++ b/bookwyrm/templates/host_meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
+  <Link rel="lrdd" template="https://{{ DOMAIN }}/.well-known/webfinger?resource={uri}"/>
+</XRD>
+
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index f5c13a4b..5d8bc5e9 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -35,8 +35,9 @@ urlpatterns = [
     re_path(r"^inbox/?$", views.Inbox.as_view()),
     re_path(r"%s/inbox/?$" % local_user_path, views.Inbox.as_view()),
     re_path(r"%s/outbox/?$" % local_user_path, views.Outbox.as_view()),
-    re_path(r"^.well-known/webfinger/?$", views.webfinger),
-    re_path(r"^.well-known/nodeinfo/?$", views.nodeinfo_pointer),
+    re_path(r"^\.well-known/webfinger/?$", views.webfinger),
+    re_path(r"^\.well-known/nodeinfo/?$", views.nodeinfo_pointer),
+    re_path(r"^\.well-known/host-meta/?$", views.host_meta),
     re_path(r"^nodeinfo/2\.0/?$", views.nodeinfo),
     re_path(r"^api/v1/instance/?$", views.instance_info),
     re_path(r"^api/v1/instance/peers/?$", views.peers),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 6ec79c1c..dc71d359 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -36,4 +36,4 @@ from .tag import Tag, AddTag, RemoveTag
 from .updates import get_notification_count, get_unread_status_count
 from .user import User, EditUser, Followers, Following
 from .user_admin import UserAdmin
-from .wellknown import webfinger, nodeinfo_pointer, nodeinfo, instance_info, peers
+from .wellknown import *
diff --git a/bookwyrm/views/wellknown.py b/bookwyrm/views/wellknown.py
index 127c7491..178d558e 100644
--- a/bookwyrm/views/wellknown.py
+++ b/bookwyrm/views/wellknown.py
@@ -3,6 +3,7 @@
 from dateutil.relativedelta import relativedelta
 from django.http import HttpResponseNotFound
 from django.http import JsonResponse
+from django.template.response import TemplateResponse
 from django.utils import timezone
 from django.views.decorators.http import require_GET
 
@@ -118,3 +119,9 @@ def peers(_):
     """ list of federated servers this instance connects with """
     names = models.FederatedServer.objects.values_list("server_name", flat=True)
     return JsonResponse(list(names), safe=False)
+
+
+@require_GET
+def host_meta(request):
+    """ meta of the host """
+    return TemplateResponse(request, "host_meta.xml", {"DOMAIN": DOMAIN})

From 4b445c3242e316c4614f0cda973d8c9d3f862ba7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 29 Mar 2021 14:55:23 -0700
Subject: [PATCH 0513/1285] Fixes indentation on host-meta xml

---
 bookwyrm/templates/host_meta.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/host_meta.xml b/bookwyrm/templates/host_meta.xml
index 4fe8bcec..d510ba71 100644
--- a/bookwyrm/templates/host_meta.xml
+++ b/bookwyrm/templates/host_meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
-  <Link rel="lrdd" template="https://{{ DOMAIN }}/.well-known/webfinger?resource={uri}"/>
+    <Link rel="lrdd" template="https://{{ DOMAIN }}/.well-known/webfinger?resource={uri}"/>
 </XRD>
 

From 28f07f772994363a8fbb68fcbb2f2596f9f3ddd5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 29 Mar 2021 18:47:21 -0700
Subject: [PATCH 0514/1285] Fixes error pages

---
 bookwyrm/templates/{notfound.html => 404.html} |  0
 bookwyrm/templates/{error.html => 500.html}    |  0
 bookwyrm/templates/directory/directory.html    |  4 ++--
 bookwyrm/urls.py                               |  2 --
 bookwyrm/views/error.py                        | 12 ------------
 5 files changed, 2 insertions(+), 16 deletions(-)
 rename bookwyrm/templates/{notfound.html => 404.html} (100%)
 rename bookwyrm/templates/{error.html => 500.html} (100%)
 delete mode 100644 bookwyrm/views/error.py

diff --git a/bookwyrm/templates/notfound.html b/bookwyrm/templates/404.html
similarity index 100%
rename from bookwyrm/templates/notfound.html
rename to bookwyrm/templates/404.html
diff --git a/bookwyrm/templates/error.html b/bookwyrm/templates/500.html
similarity index 100%
rename from bookwyrm/templates/error.html
rename to bookwyrm/templates/500.html
diff --git a/bookwyrm/templates/directory/directory.html b/bookwyrm/templates/directory/directory.html
index 7413f67d..430e8539 100644
--- a/bookwyrm/templates/directory/directory.html
+++ b/bookwyrm/templates/directory/directory.html
@@ -44,9 +44,9 @@
         <div class="card block">
             <div class="card-content">
                 <div class="media">
-                    <span class="media-left">
+                    <a href="{{ user.local_path }}" class="media-left">
                         {% include 'snippets/avatar.html' with user=user large=True %}
-                    </span>
+                    </a>
                     <div class="media-content">
                         <a href="{{ user.local_path }}" class="is-block mb-2">
                             <span class="title is-4 is-block">{{ user.display_name }}</span>
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 5d8bc5e9..33c4aaad 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -23,8 +23,6 @@ status_path = r"%s/(%s)/(?P<status_id>\d+)" % (user_path, "|".join(status_types)
 
 book_path = r"^book/(?P<book_id>\d+)"
 
-handler404 = "bookwyrm.views.not_found_page"
-handler500 = "bookwyrm.views.server_error_page"
 urlpatterns = [
     path("admin/", admin.site.urls),
     path(
diff --git a/bookwyrm/views/error.py b/bookwyrm/views/error.py
deleted file mode 100644
index 9bd94ca3..00000000
--- a/bookwyrm/views/error.py
+++ /dev/null
@@ -1,12 +0,0 @@
-""" something has gone amiss """
-from django.template.response import TemplateResponse
-
-
-def server_error_page(request):
-    """ 500 errors """
-    return TemplateResponse(request, "error.html", status=500)
-
-
-def not_found_page(request, _):
-    """ 404s """
-    return TemplateResponse(request, "notfound.html", status=404)

From 4b325fedee43c1f77251ef8a4230fa02a8dc6ae6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 29 Mar 2021 18:51:35 -0700
Subject: [PATCH 0515/1285] Removes error views from init

---
 bookwyrm/views/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index dc71d359..693a7744 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -5,7 +5,6 @@ from .block import Block, unblock
 from .books import Book, EditBook, ConfirmEditBook, Editions
 from .books import upload_cover, add_description, switch_edition, resolve_book
 from .directory import Directory
-from .error import not_found_page, server_error_page
 from .federation import Federation, FederatedServer
 from .feed import DirectMessage, Feed, Replies, Status
 from .follow import follow, unfollow

From a54014f693735cb637df86e5b07b5e7e55079bee Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 30 Mar 2021 08:43:38 -0700
Subject: [PATCH 0516/1285] Fixes import retry

---
 bookwyrm/goodreads_import.py        | 14 ++++++++------
 bookwyrm/importer.py                |  6 +++++-
 bookwyrm/librarything_import.py     | 28 ++++++++++++++--------------
 bookwyrm/tests/views/test_import.py |  3 +++
 bookwyrm/views/import_data.py       |  6 ++++--
 5 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/bookwyrm/goodreads_import.py b/bookwyrm/goodreads_import.py
index fb4e8e0f..298fd7cf 100644
--- a/bookwyrm/goodreads_import.py
+++ b/bookwyrm/goodreads_import.py
@@ -1,14 +1,16 @@
 """ handle reading a csv from goodreads """
 from bookwyrm.importer import Importer
 
-# GoodReads is the default importer, thus Importer follows its structure. For a more complete example of overriding see librarything_import.py
-
 
 class GoodreadsImporter(Importer):
+    """ GoodReads is the default importer, thus Importer follows its structure.
+    For a more complete example of overriding see librarything_import.py """
+
     service = "GoodReads"
 
-    def parse_fields(self, data):
-        data.update({"import_source": self.service})
+    def parse_fields(self, entry):
+        """ handle the specific fields in goodreads csvs """
+        entry.update({"import_source": self.service})
         # add missing 'Date Started' field
-        data.update({"Date Started": None})
-        return data
+        entry.update({"Date Started": None})
+        return entry
diff --git a/bookwyrm/importer.py b/bookwyrm/importer.py
index 2fbb3430..4ab7ba8c 100644
--- a/bookwyrm/importer.py
+++ b/bookwyrm/importer.py
@@ -10,6 +10,8 @@ logger = logging.getLogger(__name__)
 
 
 class Importer:
+    """ Generic class for csv data import from an outside service """
+
     service = "Unknown"
     delimiter = ","
     encoding = "UTF-8"
@@ -29,10 +31,12 @@ class Importer:
             self.save_item(job, index, entry)
         return job
 
-    def save_item(self, job, index, data):
+    def save_item(self, job, index, data):# pylint: disable=no-self-use
+        """ creates and saves an import item """
         ImportItem(job=job, index=index, data=data).save()
 
     def parse_fields(self, entry):
+        """ updates csv data with additional info """
         entry.update({"import_source": self.service})
         return entry
 
diff --git a/bookwyrm/librarything_import.py b/bookwyrm/librarything_import.py
index b3dd9d56..6389eeed 100644
--- a/bookwyrm/librarything_import.py
+++ b/bookwyrm/librarything_import.py
@@ -1,35 +1,35 @@
 """ handle reading a csv from librarything """
-import csv
 import re
 import math
 
-from bookwyrm import models
-from bookwyrm.models import ImportItem
 from bookwyrm.importer import Importer
 
 
 class LibrarythingImporter(Importer):
+    """ csv downloads from librarything """
+
     service = "LibraryThing"
     delimiter = "\t"
     encoding = "ISO-8859-1"
     # mandatory_fields : fields matching the book title and author
     mandatory_fields = ["Title", "Primary Author"]
 
-    def parse_fields(self, initial):
+    def parse_fields(self, entry):
+        """ custom parsing for librarything """
         data = {}
         data["import_source"] = self.service
-        data["Book Id"] = initial["Book Id"]
-        data["Title"] = initial["Title"]
-        data["Author"] = initial["Primary Author"]
-        data["ISBN13"] = initial["ISBN"]
-        data["My Review"] = initial["Review"]
-        if initial["Rating"]:
-            data["My Rating"] = math.ceil(float(initial["Rating"]))
+        data["Book Id"] = entry["Book Id"]
+        data["Title"] = entry["Title"]
+        data["Author"] = entry["Primary Author"]
+        data["ISBN13"] = entry["ISBN"]
+        data["My Review"] = entry["Review"]
+        if entry["Rating"]:
+            data["My Rating"] = math.ceil(float(entry["Rating"]))
         else:
             data["My Rating"] = ""
-        data["Date Added"] = re.sub("\[|\]", "", initial["Entry Date"])
-        data["Date Started"] = re.sub("\[|\]", "", initial["Date Started"])
-        data["Date Read"] = re.sub("\[|\]", "", initial["Date Read"])
+        data["Date Added"] = re.sub(r"\[|\]", "", entry["Entry Date"])
+        data["Date Started"] = re.sub(r"\[|\]", "", entry["Date Started"])
+        data["Date Read"] = re.sub(r"\[|\]", "", entry["Date Read"])
 
         data["Exclusive Shelf"] = None
         if data["Date Read"]:
diff --git a/bookwyrm/tests/views/test_import.py b/bookwyrm/tests/views/test_import.py
index b98b2516..df785535 100644
--- a/bookwyrm/tests/views/test_import.py
+++ b/bookwyrm/tests/views/test_import.py
@@ -45,3 +45,6 @@ class ImportViews(TestCase):
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
+
+    def test_retry_import(self):
+        """ retry failed items """
diff --git a/bookwyrm/views/import_data.py b/bookwyrm/views/import_data.py
index 8f9ea27f..dadc91d6 100644
--- a/bookwyrm/views/import_data.py
+++ b/bookwyrm/views/import_data.py
@@ -10,6 +10,7 @@ from django.utils.decorators import method_decorator
 from django.views import View
 
 from bookwyrm import forms, goodreads_import, librarything_import, models
+from bookwyrm.importer import Importer
 from bookwyrm.tasks import app
 
 # pylint: disable= no-self-use
@@ -89,10 +90,11 @@ class ImportStatus(View):
         for item in request.POST.getlist("import_item"):
             items.append(get_object_or_404(models.ImportItem, id=item))
 
-        job = goodreads_import.create_retry_job(
+        importer = Importer()
+        job = importer.create_retry_job(
             request.user,
             job,
             items,
         )
-        goodreads_import.start_import(job)
+        importer.start_import(job)
         return redirect("/import/%d" % job.id)

From 1f0c4f86c2af92273c177bafc89d44ce3617a053 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 30 Mar 2021 08:46:22 -0700
Subject: [PATCH 0517/1285] Python formatting

---
 bookwyrm/goodreads_import.py | 4 ++--
 bookwyrm/importer.py         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/goodreads_import.py b/bookwyrm/goodreads_import.py
index 298fd7cf..b439993a 100644
--- a/bookwyrm/goodreads_import.py
+++ b/bookwyrm/goodreads_import.py
@@ -3,8 +3,8 @@ from bookwyrm.importer import Importer
 
 
 class GoodreadsImporter(Importer):
-    """ GoodReads is the default importer, thus Importer follows its structure.
-    For a more complete example of overriding see librarything_import.py """
+    """GoodReads is the default importer, thus Importer follows its structure.
+    For a more complete example of overriding see librarything_import.py"""
 
     service = "GoodReads"
 
diff --git a/bookwyrm/importer.py b/bookwyrm/importer.py
index 4ab7ba8c..ddbfa304 100644
--- a/bookwyrm/importer.py
+++ b/bookwyrm/importer.py
@@ -31,7 +31,7 @@ class Importer:
             self.save_item(job, index, entry)
         return job
 
-    def save_item(self, job, index, data):# pylint: disable=no-self-use
+    def save_item(self, job, index, data):  # pylint: disable=no-self-use
         """ creates and saves an import item """
         ImportItem(job=job, index=index, data=data).save()
 

From 754ccaedd6d9c2e348116b041f6d9226f4ecd805 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 30 Mar 2021 08:56:25 -0700
Subject: [PATCH 0518/1285] Move importers into module

---
 bookwyrm/importers/__init__.py                            | 5 +++++
 bookwyrm/{ => importers}/goodreads_import.py              | 2 +-
 bookwyrm/{ => importers}/importer.py                      | 0
 bookwyrm/{ => importers}/librarything_import.py           | 2 +-
 bookwyrm/tests/importers/__init__.py                      | 1 +
 bookwyrm/tests/{ => importers}/test_goodreads_import.py   | 4 ++--
 .../tests/{ => importers}/test_librarything_import.py     | 4 ++--
 bookwyrm/views/import_data.py                             | 8 ++++----
 8 files changed, 16 insertions(+), 10 deletions(-)
 create mode 100644 bookwyrm/importers/__init__.py
 rename bookwyrm/{ => importers}/goodreads_import.py (93%)
 rename bookwyrm/{ => importers}/importer.py (100%)
 rename bookwyrm/{ => importers}/librarything_import.py (97%)
 create mode 100644 bookwyrm/tests/importers/__init__.py
 rename bookwyrm/tests/{ => importers}/test_goodreads_import.py (99%)
 rename bookwyrm/tests/{ => importers}/test_librarything_import.py (99%)

diff --git a/bookwyrm/importers/__init__.py b/bookwyrm/importers/__init__.py
new file mode 100644
index 00000000..f13672e0
--- /dev/null
+++ b/bookwyrm/importers/__init__.py
@@ -0,0 +1,5 @@
+""" import classes """
+
+from .importer import Importer
+from .goodreads_import import GoodreadsImporter
+from .librarything_import import LibrarythingImporter
diff --git a/bookwyrm/goodreads_import.py b/bookwyrm/importers/goodreads_import.py
similarity index 93%
rename from bookwyrm/goodreads_import.py
rename to bookwyrm/importers/goodreads_import.py
index b439993a..0b126c14 100644
--- a/bookwyrm/goodreads_import.py
+++ b/bookwyrm/importers/goodreads_import.py
@@ -1,5 +1,5 @@
 """ handle reading a csv from goodreads """
-from bookwyrm.importer import Importer
+from . import Importer
 
 
 class GoodreadsImporter(Importer):
diff --git a/bookwyrm/importer.py b/bookwyrm/importers/importer.py
similarity index 100%
rename from bookwyrm/importer.py
rename to bookwyrm/importers/importer.py
diff --git a/bookwyrm/librarything_import.py b/bookwyrm/importers/librarything_import.py
similarity index 97%
rename from bookwyrm/librarything_import.py
rename to bookwyrm/importers/librarything_import.py
index 6389eeed..3755cb1a 100644
--- a/bookwyrm/librarything_import.py
+++ b/bookwyrm/importers/librarything_import.py
@@ -2,7 +2,7 @@
 import re
 import math
 
-from bookwyrm.importer import Importer
+from . import Importer
 
 
 class LibrarythingImporter(Importer):
diff --git a/bookwyrm/tests/importers/__init__.py b/bookwyrm/tests/importers/__init__.py
new file mode 100644
index 00000000..b6e690fd
--- /dev/null
+++ b/bookwyrm/tests/importers/__init__.py
@@ -0,0 +1 @@
+from . import *
diff --git a/bookwyrm/tests/test_goodreads_import.py b/bookwyrm/tests/importers/test_goodreads_import.py
similarity index 99%
rename from bookwyrm/tests/test_goodreads_import.py
rename to bookwyrm/tests/importers/test_goodreads_import.py
index c06b49fc..83773e3c 100644
--- a/bookwyrm/tests/test_goodreads_import.py
+++ b/bookwyrm/tests/importers/test_goodreads_import.py
@@ -7,8 +7,8 @@ from unittest.mock import patch
 from django.test import TestCase
 import responses
 
-from bookwyrm import models, importer
-from bookwyrm.goodreads_import import GoodreadsImporter
+from bookwyrm import models
+from bookwyrm.importers import importer, GoodreadsImporter
 from bookwyrm.settings import DOMAIN
 
 
diff --git a/bookwyrm/tests/test_librarything_import.py b/bookwyrm/tests/importers/test_librarything_import.py
similarity index 99%
rename from bookwyrm/tests/test_librarything_import.py
rename to bookwyrm/tests/importers/test_librarything_import.py
index 54b8b422..8baa305f 100644
--- a/bookwyrm/tests/test_librarything_import.py
+++ b/bookwyrm/tests/importers/test_librarything_import.py
@@ -6,8 +6,8 @@ from unittest.mock import patch
 from django.test import TestCase
 import responses
 
-from bookwyrm import models, importer
-from bookwyrm.librarything_import import LibrarythingImporter
+from bookwyrm import models
+from bookwyrm.importers import importer, LibrarythingImporter
 from bookwyrm.settings import DOMAIN
 
 
diff --git a/bookwyrm/views/import_data.py b/bookwyrm/views/import_data.py
index dadc91d6..5bdbe915 100644
--- a/bookwyrm/views/import_data.py
+++ b/bookwyrm/views/import_data.py
@@ -9,8 +9,8 @@ from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
 
-from bookwyrm import forms, goodreads_import, librarything_import, models
-from bookwyrm.importer import Importer
+from bookwyrm import forms, models
+from bookwyrm.importers import Importer, LibrarythingImporter, GoodreadsImporter
 from bookwyrm.tasks import app
 
 # pylint: disable= no-self-use
@@ -41,10 +41,10 @@ class Import(View):
 
             importer = None
             if source == "LibraryThing":
-                importer = librarything_import.LibrarythingImporter()
+                importer = LibrarythingImporter()
             else:
                 # Default : GoodReads
-                importer = goodreads_import.GoodreadsImporter()
+                importer = GoodreadsImporter()
 
             try:
                 job = importer.create_job(

From c64fc79431ebb5a1c25afbb49edd51dc2d5d3fec Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 30 Mar 2021 09:04:11 -0700
Subject: [PATCH 0519/1285] Updates goodreads tests

---
 .../tests/importers/test_goodreads_import.py  | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/bookwyrm/tests/importers/test_goodreads_import.py b/bookwyrm/tests/importers/test_goodreads_import.py
index 83773e3c..6e9caaf4 100644
--- a/bookwyrm/tests/importers/test_goodreads_import.py
+++ b/bookwyrm/tests/importers/test_goodreads_import.py
@@ -8,7 +8,8 @@ from django.test import TestCase
 import responses
 
 from bookwyrm import models
-from bookwyrm.importers import importer, GoodreadsImporter
+from bookwyrm.importers import GoodreadsImporter
+from bookwyrm.importers.importer import import_data, handle_imported_book
 from bookwyrm.settings import DOMAIN
 
 
@@ -18,7 +19,7 @@ class GoodreadsImport(TestCase):
     def setUp(self):
         """ use a test csv """
         self.importer = GoodreadsImporter()
-        datafile = pathlib.Path(__file__).parent.joinpath("data/goodreads.csv")
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/goodreads.csv")
         self.csv = open(datafile, "r", encoding=self.importer.encoding)
         self.user = models.User.objects.create_user(
             "mouse", "mouse@mouse.mouse", "password", local=True
@@ -81,7 +82,7 @@ class GoodreadsImport(TestCase):
         import_job = self.importer.create_job(self.user, self.csv, False, "unlisted")
         MockTask = namedtuple("Task", ("id"))
         mock_task = MockTask(7)
-        with patch("bookwyrm.importer.import_data.delay") as start:
+        with patch("bookwyrm.importers.importer.import_data.delay") as start:
             start.return_value = mock_task
             self.importer.start_import(import_job)
         import_job.refresh_from_db()
@@ -97,8 +98,8 @@ class GoodreadsImport(TestCase):
             "bookwyrm.models.import_job.ImportItem.get_book_from_isbn"
         ) as resolve:
             resolve.return_value = book
-            with patch("bookwyrm.importer.handle_imported_book"):
-                importer.import_data(self.importer.service, import_job.id)
+            with patch("bookwyrm.importers.importer.handle_imported_book"):
+                import_data(self.importer.service, import_job.id)
 
         import_item = models.ImportItem.objects.get(job=import_job, index=0)
         self.assertEqual(import_item.book.id, book.id)
@@ -109,7 +110,7 @@ class GoodreadsImport(TestCase):
         self.assertIsNone(shelf.books.first())
 
         import_job = models.ImportJob.objects.create(user=self.user)
-        datafile = pathlib.Path(__file__).parent.joinpath("data/goodreads.csv")
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/goodreads.csv")
         csv_file = open(datafile, "r")
         for index, entry in enumerate(list(csv.DictReader(csv_file))):
             entry = self.importer.parse_fields(entry)
@@ -119,7 +120,7 @@ class GoodreadsImport(TestCase):
             break
 
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            importer.handle_imported_book(
+            handle_imported_book(
                 self.importer.service, self.user, import_item, False, "public"
             )
 
@@ -143,7 +144,7 @@ class GoodreadsImport(TestCase):
             models.ShelfBook.objects.create(shelf=shelf, user=self.user, book=self.book)
 
         import_job = models.ImportJob.objects.create(user=self.user)
-        datafile = pathlib.Path(__file__).parent.joinpath("data/goodreads.csv")
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/goodreads.csv")
         csv_file = open(datafile, "r")
         for index, entry in enumerate(list(csv.DictReader(csv_file))):
             entry = self.importer.parse_fields(entry)
@@ -153,7 +154,7 @@ class GoodreadsImport(TestCase):
             break
 
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            importer.handle_imported_book(
+            handle_imported_book(
                 self.importer.service, self.user, import_item, False, "public"
             )
 
@@ -173,7 +174,7 @@ class GoodreadsImport(TestCase):
         """ re-importing books """
         shelf = self.user.shelf_set.filter(identifier="read").first()
         import_job = models.ImportJob.objects.create(user=self.user)
-        datafile = pathlib.Path(__file__).parent.joinpath("data/goodreads.csv")
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/goodreads.csv")
         csv_file = open(datafile, "r")
         for index, entry in enumerate(list(csv.DictReader(csv_file))):
             entry = self.importer.parse_fields(entry)
@@ -183,10 +184,10 @@ class GoodreadsImport(TestCase):
             break
 
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            importer.handle_imported_book(
+            handle_imported_book(
                 self.importer.service, self.user, import_item, False, "public"
             )
-            importer.handle_imported_book(
+            handle_imported_book(
                 self.importer.service, self.user, import_item, False, "public"
             )
 
@@ -207,7 +208,7 @@ class GoodreadsImport(TestCase):
     def test_handle_imported_book_review(self, _):
         """ goodreads review import """
         import_job = models.ImportJob.objects.create(user=self.user)
-        datafile = pathlib.Path(__file__).parent.joinpath("data/goodreads.csv")
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/goodreads.csv")
         csv_file = open(datafile, "r")
         entry = list(csv.DictReader(csv_file))[2]
         entry = self.importer.parse_fields(entry)
@@ -216,7 +217,7 @@ class GoodreadsImport(TestCase):
         )
 
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            importer.handle_imported_book(
+            handle_imported_book(
                 self.importer.service, self.user, import_item, True, "unlisted"
             )
         review = models.Review.objects.get(book=self.book, user=self.user)
@@ -230,7 +231,7 @@ class GoodreadsImport(TestCase):
     def test_handle_imported_book_reviews_disabled(self):
         """ goodreads review import """
         import_job = models.ImportJob.objects.create(user=self.user)
-        datafile = pathlib.Path(__file__).parent.joinpath("data/goodreads.csv")
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/goodreads.csv")
         csv_file = open(datafile, "r")
         entry = list(csv.DictReader(csv_file))[2]
         entry = self.importer.parse_fields(entry)
@@ -239,7 +240,7 @@ class GoodreadsImport(TestCase):
         )
 
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            importer.handle_imported_book(
+            handle_imported_book(
                 self.importer.service, self.user, import_item, False, "unlisted"
             )
         self.assertFalse(

From 5deb7d8bba7bca7664e78a0ab1cc3e05fb586f3c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 30 Mar 2021 09:13:41 -0700
Subject: [PATCH 0520/1285] Updates librarthing importer tests

---
 .../importers/test_librarything_import.py     | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/bookwyrm/tests/importers/test_librarything_import.py b/bookwyrm/tests/importers/test_librarything_import.py
index 8baa305f..5e1d778e 100644
--- a/bookwyrm/tests/importers/test_librarything_import.py
+++ b/bookwyrm/tests/importers/test_librarything_import.py
@@ -7,7 +7,8 @@ from django.test import TestCase
 import responses
 
 from bookwyrm import models
-from bookwyrm.importers import importer, LibrarythingImporter
+from bookwyrm.importers import LibrarythingImporter
+from bookwyrm.importers.importer import import_data, handle_imported_book
 from bookwyrm.settings import DOMAIN
 
 
@@ -17,7 +18,7 @@ class LibrarythingImport(TestCase):
     def setUp(self):
         """ use a test tsv """
         self.importer = LibrarythingImporter()
-        datafile = pathlib.Path(__file__).parent.joinpath("data/librarything.tsv")
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/librarything.tsv")
 
         # Librarything generates latin encoded exports...
         self.csv = open(datafile, "r", encoding=self.importer.encoding)
@@ -87,8 +88,8 @@ class LibrarythingImport(TestCase):
             "bookwyrm.models.import_job.ImportItem.get_book_from_isbn"
         ) as resolve:
             resolve.return_value = book
-            with patch("bookwyrm.importer.handle_imported_book"):
-                importer.import_data(self.importer.service, import_job.id)
+            with patch("bookwyrm.importers.importer.handle_imported_book"):
+                import_data(self.importer.service, import_job.id)
 
         import_item = models.ImportItem.objects.get(job=import_job, index=0)
         self.assertEqual(import_item.book.id, book.id)
@@ -99,7 +100,7 @@ class LibrarythingImport(TestCase):
         self.assertIsNone(shelf.books.first())
 
         import_job = models.ImportJob.objects.create(user=self.user)
-        datafile = pathlib.Path(__file__).parent.joinpath("data/librarything.tsv")
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/librarything.tsv")
         csv_file = open(datafile, "r", encoding=self.importer.encoding)
         for index, entry in enumerate(
             list(csv.DictReader(csv_file, delimiter=self.importer.delimiter))
@@ -111,7 +112,7 @@ class LibrarythingImport(TestCase):
             break
 
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            importer.handle_imported_book(
+            handle_imported_book(
                 self.importer.service, self.user, import_item, False, "public"
             )
 
@@ -135,7 +136,7 @@ class LibrarythingImport(TestCase):
             models.ShelfBook.objects.create(shelf=shelf, user=self.user, book=self.book)
 
         import_job = models.ImportJob.objects.create(user=self.user)
-        datafile = pathlib.Path(__file__).parent.joinpath("data/librarything.tsv")
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/librarything.tsv")
         csv_file = open(datafile, "r", encoding=self.importer.encoding)
         for index, entry in enumerate(
             list(csv.DictReader(csv_file, delimiter=self.importer.delimiter))
@@ -147,7 +148,7 @@ class LibrarythingImport(TestCase):
             break
 
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            importer.handle_imported_book(
+            handle_imported_book(
                 self.importer.service, self.user, import_item, False, "public"
             )
 
@@ -167,7 +168,7 @@ class LibrarythingImport(TestCase):
         """ re-importing books """
         shelf = self.user.shelf_set.filter(identifier="read").first()
         import_job = models.ImportJob.objects.create(user=self.user)
-        datafile = pathlib.Path(__file__).parent.joinpath("data/librarything.tsv")
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/librarything.tsv")
         csv_file = open(datafile, "r", encoding=self.importer.encoding)
         for index, entry in enumerate(
             list(csv.DictReader(csv_file, delimiter=self.importer.delimiter))
@@ -179,10 +180,10 @@ class LibrarythingImport(TestCase):
             break
 
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            importer.handle_imported_book(
+            handle_imported_book(
                 self.importer.service, self.user, import_item, False, "public"
             )
-            importer.handle_imported_book(
+            handle_imported_book(
                 self.importer.service, self.user, import_item, False, "public"
             )
 
@@ -203,7 +204,7 @@ class LibrarythingImport(TestCase):
     def test_handle_imported_book_review(self, _):
         """ librarything review import """
         import_job = models.ImportJob.objects.create(user=self.user)
-        datafile = pathlib.Path(__file__).parent.joinpath("data/librarything.tsv")
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/librarything.tsv")
         csv_file = open(datafile, "r", encoding=self.importer.encoding)
         entry = list(csv.DictReader(csv_file, delimiter=self.importer.delimiter))[0]
         entry = self.importer.parse_fields(entry)
@@ -212,7 +213,7 @@ class LibrarythingImport(TestCase):
         )
 
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            importer.handle_imported_book(
+            handle_imported_book(
                 self.importer.service, self.user, import_item, True, "unlisted"
             )
         review = models.Review.objects.get(book=self.book, user=self.user)
@@ -226,7 +227,7 @@ class LibrarythingImport(TestCase):
     def test_handle_imported_book_reviews_disabled(self):
         """ librarything review import """
         import_job = models.ImportJob.objects.create(user=self.user)
-        datafile = pathlib.Path(__file__).parent.joinpath("data/librarything.tsv")
+        datafile = pathlib.Path(__file__).parent.joinpath("../data/librarything.tsv")
         csv_file = open(datafile, "r", encoding=self.importer.encoding)
         entry = list(csv.DictReader(csv_file, delimiter=self.importer.delimiter))[2]
         entry = self.importer.parse_fields(entry)
@@ -235,7 +236,7 @@ class LibrarythingImport(TestCase):
         )
 
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            importer.handle_imported_book(
+            handle_imported_book(
                 self.importer.service, self.user, import_item, False, "unlisted"
             )
         self.assertFalse(

From 59ebcc62ee35cbda36a49d9969936ea95592df94 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 30 Mar 2021 09:24:23 -0700
Subject: [PATCH 0521/1285] Adds import retry test

---
 bookwyrm/tests/views/test_import.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/bookwyrm/tests/views/test_import.py b/bookwyrm/tests/views/test_import.py
index df785535..dc23f789 100644
--- a/bookwyrm/tests/views/test_import.py
+++ b/bookwyrm/tests/views/test_import.py
@@ -48,3 +48,20 @@ class ImportViews(TestCase):
 
     def test_retry_import(self):
         """ retry failed items """
+        view = views.ImportStatus.as_view()
+        import_job = models.ImportJob.objects.create(
+            user=self.local_user,
+            privacy="unlisted"
+        )
+        request = self.factory.post("")
+        request.user = self.local_user
+
+        with patch("bookwyrm.importers.Importer.start_import"):
+            view(request, import_job.id)
+
+        self.assertEqual(models.ImportJob.objects.count(), 2)
+        retry_job = models.ImportJob.objects.last()
+
+        self.assertTrue(retry_job.retry)
+        self.assertEqual(retry_job.user, self.local_user)
+        self.assertEqual(retry_job.privacy, "unlisted")

From 047e827382e264bdafcd0c5fedc4248442f8f345 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 30 Mar 2021 09:30:25 -0700
Subject: [PATCH 0522/1285] Cleans up markup on import page

---
 bookwyrm/templates/import.html | 57 +++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 25 deletions(-)

diff --git a/bookwyrm/templates/import.html b/bookwyrm/templates/import.html
index 99ff5c42..a5405131 100644
--- a/bookwyrm/templates/import.html
+++ b/bookwyrm/templates/import.html
@@ -7,36 +7,43 @@
 {% block content %}
 <div class="block">
     <h1 class="title">{% trans "Import Books" %}</h1>
-    <form name="import" action="/import" method="post" enctype="multipart/form-data">
+    <form class="box" name="import" action="/import" method="post" enctype="multipart/form-data">
         {% csrf_token %}
 
-        <label class="label" for="source">
-            <p>{% trans "Data source" %}</p>
-        <div class="select {{ class }}">
-            <select name="source" id="source">
-                <option value="GoodReads" {% if current == 'GoodReads' %}selected{% endif %}>
-                    GoodReads
-                </option>
-                <option value="LibraryThing" {% if current == 'LibraryThing' %}selected{% endif %}>
-                    LibraryThing
-                </option>
-            </select>
+        <div class="columns">
+        <div class="column is-half">
+            <label class="label" for="source">
+                {% trans "Data source:" %}
+            </label>
+            <div class="select block">
+                <select name="source" id="source">
+                    <option value="GoodReads" {% if current == 'GoodReads' %}selected{% endif %}>
+                        GoodReads (CSV)
+                    </option>
+                    <option value="LibraryThing" {% if current == 'LibraryThing' %}selected{% endif %}>
+                        LibraryThing (TSV)
+                    </option>
+                </select>
+            </div>
+            <div class="field">
+                <label class="label" for="id_csv_field">{% trans "Data file:" %}</label>
+                {{ import_form.csv_file }}
+            </div>
         </div>
-        </label>
 
-        <div class="field">
-            {{ import_form.as_p }}
+        <div class="column is-half">
+            <div class="field">
+                <label class="label">
+                    <input type="checkbox" name="include_reviews" checked> {% trans "Include reviews" %}
+                </label>
+            </div>
+            <div class="field">
+                <label class="label">
+                    <p>{% trans "Privacy setting for imported reviews:" %}</p>
+                    {% include 'snippets/privacy_select.html' with no_label=True %}
+                </label>
+            </div>
         </div>
-        <div class="field">
-            <label class="label">
-                <input type="checkbox" name="include_reviews" checked> {% trans "Include reviews" %}
-            </label>
-        </div>
-        <div class="field">
-            <label class="label">
-                <p>{% trans "Privacy setting for imported reviews:" %}</p>
-                {% include 'snippets/privacy_select.html' with no_label=True %}
-            </label>
         </div>
         <button class="button is-primary" type="submit">{% trans "Import" %}</button>
     </form>

From b16f95c8cd9995b7a2cf8f440d9d597686ad9b04 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 30 Mar 2021 09:50:51 -0700
Subject: [PATCH 0523/1285] Python formatting

---
 bookwyrm/tests/views/test_import.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bookwyrm/tests/views/test_import.py b/bookwyrm/tests/views/test_import.py
index dc23f789..4de2cfb9 100644
--- a/bookwyrm/tests/views/test_import.py
+++ b/bookwyrm/tests/views/test_import.py
@@ -50,8 +50,7 @@ class ImportViews(TestCase):
         """ retry failed items """
         view = views.ImportStatus.as_view()
         import_job = models.ImportJob.objects.create(
-            user=self.local_user,
-            privacy="unlisted"
+            user=self.local_user, privacy="unlisted"
         )
         request = self.factory.post("")
         request.user = self.local_user

From 9b949d9845ecd3cd521a4bc51b9164adda29cf57 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 30 Mar 2021 10:19:51 -0700
Subject: [PATCH 0524/1285] Merges display of lists to show all

Rather than separating out "your lists"
---
 bookwyrm/templates/lists/list_items.html |  8 +++++++-
 bookwyrm/templates/lists/lists.html      | 26 ++++++++----------------
 bookwyrm/views/list.py                   | 16 ++++++---------
 3 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/bookwyrm/templates/lists/list_items.html b/bookwyrm/templates/lists/list_items.html
index 04e7f014..3e3e8bf4 100644
--- a/bookwyrm/templates/lists/list_items.html
+++ b/bookwyrm/templates/lists/list_items.html
@@ -14,7 +14,13 @@
                 {% endfor %}
             </div>
             <div class="card-content is-flex-grow-0">
-                {% if list.description %}{{ list.description | to_markdown | safe | truncatewords_html:20 }}{% endif %}
+                <div {% if list.description %}title="{{ list.description }}"{% endif %}>
+                {% if list.description %}
+                    {{ list.description|to_markdown|safe|truncatechars_html:30 }}
+                {% else %}
+                &nbsp;
+                {% endif %}
+                </div>
                 <p class="subtitle help">
                     {% include 'lists/created_text.html' with list=list %}
                 </p>
diff --git a/bookwyrm/templates/lists/lists.html b/bookwyrm/templates/lists/lists.html
index f7ab020a..a9258305 100644
--- a/bookwyrm/templates/lists/lists.html
+++ b/bookwyrm/templates/lists/lists.html
@@ -1,17 +1,19 @@
 {% extends 'layout.html' %}
+{% load bookwyrm_tags %}
 {% load i18n %}
 
 {% block title %}{% trans "Lists" %}{% endblock %}
 
 {% block content %}
 
-<header class="block">
-    <h1 class="title">{% trans "Lists" %}</h1>
-</header>
-{% if request.user.is_authenticated and not lists.has_previous %}
 <header class="block columns is-mobile">
     <div class="column">
-        <h2 class="title">{% trans "Your lists" %}</h2>
+        <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>
+            {% endif %}
+        </h1>
     </div>
     <div class="column is-narrow">
         {% trans "Create List" as button_text %}
@@ -23,23 +25,11 @@
     {% include 'lists/create_form.html' with controls_text="create-list" %}
 </div>
 
-<section class="block content">
-    {% if request.user.list_set.exists %}
-    {% include 'lists/list_items.html' with lists=request.user.list_set.all|slice:4 %}
-    {% endif %}
-
-    {% if request.user.list_set.count > 4 %}
-    <a href="{% url 'user-lists' request.user.localname %}">{% blocktrans with size=request.user.list_set.count %}See all {{ size }} lists{% endblocktrans %}</a>
-    {% endif %}
-</section>
-{% endif %}
-
-
 {% if lists %}
 <section class="block content">
-    <h2 class="title">{% trans "Recent Lists" %}</h2>
     {% include 'lists/list_items.html' with lists=lists %}
 </section>
+
 <div>
     {% include 'snippets/pagination.html' with page=lists path=path %}
 </div>
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index 91475d48..5c88e189 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -27,17 +27,13 @@ class Lists(View):
         except ValueError:
             page = 1
 
-        user = request.user if request.user.is_authenticated else None
         # hide lists with no approved books
-        lists = (
-            models.List.objects.filter(
-                ~Q(user=user),
-            )
-            .annotate(item_count=Count("listitem", filter=Q(listitem__approved=True)))
-            .filter(item_count__gt=0)
-            .distinct()
-            .all()
-        )
+        lists = models.List.objects.annotate(
+            item_count=Count("listitem", filter=Q(listitem__approved=True))
+        ).filter(
+            item_count__gt=0
+        ).distinct().all()
+
         lists = privacy_filter(
             request.user, lists, privacy_levels=["public", "followers"]
         )

From f7b0a282a7b756d2f180f76d30359442af463a84 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 30 Mar 2021 10:28:50 -0700
Subject: [PATCH 0525/1285] Set updated date on list when item is added

---
 bookwyrm/models/list.py | 5 +++++
 bookwyrm/views/list.py  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index a05325f3..880c4122 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -1,6 +1,7 @@
 """ make a list of books!! """
 from django.apps import apps
 from django.db import models
+from django.utils import timezone
 
 from bookwyrm import activitypub
 from bookwyrm.settings import DOMAIN
@@ -79,6 +80,10 @@ class ListItem(CollectionItemMixin, BookWyrmModel):
         """ create a notification too """
         created = not bool(self.id)
         super().save(*args, **kwargs)
+        # tick the updated date on the parent list
+        self.book_list.updated_date = timezone.now()
+        self.book_list.save(broadcast=False)
+
         list_owner = self.book_list.user
         # create a notification if somoene ELSE added to a local user's list
         if created and list_owner.local and list_owner != self.user:
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index 5c88e189..75ee72ba 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -32,7 +32,7 @@ class Lists(View):
             item_count=Count("listitem", filter=Q(listitem__approved=True))
         ).filter(
             item_count__gt=0
-        ).distinct().all()
+        ).order_by("-updated_date").distinct().all()
 
         lists = privacy_filter(
             request.user, lists, privacy_levels=["public", "followers"]

From daea57f91c4df4e9ad885325953f437ca763880f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 30 Mar 2021 10:31:23 -0700
Subject: [PATCH 0526/1285] Updates python formatting

---
 bookwyrm/views/list.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index 75ee72ba..7724cd13 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -28,11 +28,15 @@ class Lists(View):
             page = 1
 
         # hide lists with no approved books
-        lists = models.List.objects.annotate(
-            item_count=Count("listitem", filter=Q(listitem__approved=True))
-        ).filter(
-            item_count__gt=0
-        ).order_by("-updated_date").distinct().all()
+        lists = (
+            models.List.objects.annotate(
+                item_count=Count("listitem", filter=Q(listitem__approved=True))
+            )
+            .filter(item_count__gt=0)
+            .order_by("-updated_date")
+            .distinct()
+            .all()
+        )
 
         lists = privacy_filter(
             request.user, lists, privacy_levels=["public", "followers"]

From 0365a57307aee22b2ddbeb56a0ff2fa932ec9f6c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 30 Mar 2021 10:46:02 -0700
Subject: [PATCH 0527/1285] Handle invalid status urls with 404

---
 bookwyrm/tests/views/test_feed.py | 12 ++++++++++++
 bookwyrm/views/feed.py            |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/tests/views/test_feed.py b/bookwyrm/tests/views/test_feed.py
index 1ff99573..dd38a3eb 100644
--- a/bookwyrm/tests/views/test_feed.py
+++ b/bookwyrm/tests/views/test_feed.py
@@ -66,6 +66,18 @@ class FeedViews(TestCase):
         self.assertIsInstance(result, ActivitypubResponse)
         self.assertEqual(result.status_code, 200)
 
+    def test_status_page_not_found(self, *_):
+        """ there are so many views, this just makes sure it LOADS """
+        view = views.Status.as_view()
+
+        request = self.factory.get("")
+        request.user = self.local_user
+        with patch("bookwyrm.views.feed.is_api_request") as is_api:
+            is_api.return_value = False
+            result = view(request, "mouse", 12345)
+
+        self.assertEqual(result.status_code, 404)
+
     def test_status_page_with_image(self, *_):
         """ there are so many views, this just makes sure it LOADS """
         view = views.Status.as_view()
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index eb4e370e..9f56dae5 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -115,7 +115,7 @@ class Status(View):
             status = models.Status.objects.select_subclasses().get(
                 id=status_id, deleted=False
             )
-        except ValueError:
+        except (ValueError, models.Status.DoesNotExist):
             return HttpResponseNotFound()
 
         # the url should have the poster's username in it

From cc01105bf00b86508a1487e0a182e8a3e2152333 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Wed, 31 Mar 2021 16:15:30 +0200
Subject: [PATCH 0528/1285] Add linter for CSS files:

- Add Github Action.
- Update .gitignore.
- Add .stylelintignore for vendor related files.
- Fix format.css to match rules (includes hacks with @todo).
---
 .github/workflows/linters-frontend.yaml |   24 +
 .gitignore                              |    3 +
 .stylelintignore                        |    2 +
 .stylelintrc.js                         |   17 +
 bookwyrm/static/css/format.css          |  104 +-
 package.json                            |    7 +
 yarn.lock                               | 1897 +++++++++++++++++++++++
 7 files changed, 2020 insertions(+), 34 deletions(-)
 create mode 100644 .github/workflows/linters-frontend.yaml
 create mode 100644 .stylelintignore
 create mode 100644 .stylelintrc.js
 create mode 100644 package.json
 create mode 100644 yarn.lock

diff --git a/.github/workflows/linters-frontend.yaml b/.github/workflows/linters-frontend.yaml
new file mode 100644
index 00000000..47c3da0d
--- /dev/null
+++ b/.github/workflows/linters-frontend.yaml
@@ -0,0 +1,24 @@
+# @url https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
+name: Frontend Linters
+
+on:
+  push:
+    branches: [ main, ci ]
+    paths:
+      - 'static/**'
+  pull_request:
+    branches: [ main, ci ]
+
+jobs:
+  linters:
+    name: linters
+    runs-on: ubuntu-20.04
+
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+
+      - name: stylelinter
+        uses: actions-hub/stylelint@v1.1.3
+        env:
+          PATTERN: "*.css"
diff --git a/.gitignore b/.gitignore
index 00dd239d..71fa61bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,6 @@
 
 #PyCharm
 .idea
+
+#Node tools
+/node_modules/
diff --git a/.stylelintignore b/.stylelintignore
new file mode 100644
index 00000000..f456cb22
--- /dev/null
+++ b/.stylelintignore
@@ -0,0 +1,2 @@
+bookwyrm/static/css/bulma.*.css*
+bookwyrm/static/css/icons.css
diff --git a/.stylelintrc.js b/.stylelintrc.js
new file mode 100644
index 00000000..eadc4a89
--- /dev/null
+++ b/.stylelintrc.js
@@ -0,0 +1,17 @@
+/* global module */
+
+module.exports = {
+    "extends": "stylelint-config-standard",
+
+    "plugins": [
+        "stylelint-order"
+    ],
+
+    "rules": {
+        "order/order": [
+            "custom-properties",
+            "declarations"
+        ],
+        "indentation": 4
+    }
+};
diff --git a/bookwyrm/static/css/format.css b/bookwyrm/static/css/format.css
index 0956517d..65fd56ab 100644
--- a/bookwyrm/static/css/format.css
+++ b/bookwyrm/static/css/format.css
@@ -7,6 +7,7 @@ html {
 .image {
     overflow: hidden;
 }
+
 .navbar .logo {
     max-height: 50px;
 }
@@ -21,25 +22,33 @@ html {
 }
 
 /* --- SHELVING --- */
+
+/** @todo Replace icons with SVG symbols.
+    @see https://www.youtube.com/watch?v=9xXBYcWgCHA */
 .shelf-option:disabled > *::after {
-    font-family: "icomoon";
+    font-family: "icomoon"; /* stylelint-disable font-family-no-missing-generic-family-keyword */
     content: "\e918";
     margin-left: 0.5em;
 }
 
 /* --- TOGGLES --- */
-.toggle-button[aria-pressed=true], .toggle-button[aria-pressed=true]:hover {
+.toggle-button[aria-pressed=true],
+.toggle-button[aria-pressed=true]:hover {
     background-color: hsl(171, 100%, 41%);
     color: white;
 }
-.hide-active[aria-pressed=true], .hide-inactive[aria-pressed=false] {
+
+.hide-active[aria-pressed=true],
+.hide-inactive[aria-pressed=false] {
     display: none;
 }
 
 .hidden {
     display: none !important;
 }
-.hidden.transition-y, .hidden.transition-x {
+
+.hidden.transition-y,
+.hidden.transition-x {
     display: block !important;
     visibility: hidden !important;
     height: 0;
@@ -47,18 +56,22 @@ html {
     margin: 0;
     padding: 0;
 }
+
 .transition-y {
     transition-property: height, margin-top, margin-bottom, padding-top, padding-bottom;
     transition-duration: 0.5s;
     transition-timing-function: ease;
 }
+
 .transition-x {
     transition-property: width, margin-left, margin-right, padding-left, padding-right;
     transition-duration: 0.5s;
     transition-timing-function: ease;
 }
+
 @media (prefers-reduced-motion: reduce) {
-    .transition-x, .transition-y {
+    .transition-x,
+    .transition-y {
         transition-duration: 0.001ms !important;
     }
 }
@@ -71,36 +84,46 @@ html {
     margin: 0;
     display: inline;
 }
-.rate-stars:hover .icon:before {
+
+.rate-stars:hover .icon::before {
     content: '\e9d9';
 }
-.rate-stars form:hover ~ form .icon:before{
+
+.rate-stars form:hover ~ form .icon::before {
     content: '\e9d7';
 }
 
-/* stars in a review form */
-.form-rate-stars:hover .icon:before {
+/** stars in a review form
+ *
+ * @todo Simplify the logic for those icons.
+ */
+.form-rate-stars input + .icon.icon::before {
     content: '\e9d9';
 }
-.form-rate-stars input + .icon:before {
+
+.form-rate-stars:hover .icon.icon::before {
     content: '\e9d9';
 }
-.form-rate-stars input:checked + .icon:before {
+
+.form-rate-stars input:checked + .icon.icon::before {
     content: '\e9d9';
 }
-.form-rate-stars input:checked + * ~ .icon:before {
-    content: '\e9d7';
-}
-.form-rate-stars:hover label.icon:before {
-    content: '\e9d9';
-}
-.form-rate-stars label.icon:hover:before {
-    content: '\e9d9';
-}
-.form-rate-stars label.icon:hover ~ label.icon:before{
+
+.form-rate-stars input:checked + * ~ .icon.icon::before {
     content: '\e9d7';
 }
 
+.form-rate-stars:hover label.icon.icon::before {
+    content: '\e9d9';
+}
+
+.form-rate-stars label.icon:hover::before {
+    content: '\e9d9';
+}
+
+.form-rate-stars label.icon:hover ~ label.icon.icon::before {
+    content: '\e9d7';
+}
 
 /* --- BOOK COVERS --- */
 .cover-container {
@@ -108,46 +131,46 @@ html {
     width: max-content;
     max-width: 250px;
 }
+
 .cover-container.is-large {
     height: max-content;
     max-width: 330px;
 }
+
 .cover-container.is-large img {
     max-height: 500px;
     height: auto;
 }
+
 .cover-container.is-medium {
     height: 150px;
 }
+
 .cover-container.is-small {
     height: 100px;
 }
+
 @media only screen and (max-width: 768px) {
     .cover-container {
         height: 200px;
         width: max-content;
     }
+
     .cover-container.is-medium {
         height: 100px;
     }
 }
 
-.cover-container.is-medium .no-cover div {
-    font-size: 0.9em;
-    padding: 0.3em;
-}
-.cover-container.is-small .no-cover div {
-    font-size: 0.7em;
-    padding: 0.1em;
-}
 .book-cover {
     height: 100%;
     object-fit: scale-down;
 }
+
 .no-cover {
     position: relative;
     white-space: normal;
 }
+
 .no-cover div {
     position: absolute;
     padding: 1em;
@@ -157,38 +180,51 @@ html {
     text-align: center;
 }
 
+.cover-container.is-medium .no-cover div {
+    font-size: 0.9em;
+    padding: 0.3em;
+}
+
+.cover-container.is-small .no-cover div {
+    font-size: 0.7em;
+    padding: 0.1em;
+}
 
 /* --- AVATAR --- */
 .avatar {
     vertical-align: middle;
     display: inline;
 }
+
 .is-32x32 {
     min-width: 32px;
     min-height: 32px;
 }
+
 .is-96x96 {
     min-width: 96px;
     min-height: 96px;
 }
 
-
-
 /* --- QUOTES --- */
 .quote blockquote {
     position: relative;
     padding-left: 2em;
 }
-.quote blockquote:before, .quote blockquote:after {
+
+.quote blockquote::before,
+.quote blockquote::after {
     font-family: 'icomoon';
     position: absolute;
 }
-.quote blockquote:before {
+
+.quote blockquote::before {
     content: "\e906";
     top: 0;
     left: 0;
 }
-.quote blockquote:after {
+
+.quote blockquote::after {
     content: "\e905";
     right: 0;
 }
diff --git a/package.json b/package.json
new file mode 100644
index 00000000..a662cdaf
--- /dev/null
+++ b/package.json
@@ -0,0 +1,7 @@
+{
+  "devDependencies": {
+    "stylelint": "^13.12.0",
+    "stylelint-config-standard": "^21.0.0",
+    "stylelint-order": "^4.1.0"
+  }
+}
diff --git a/yarn.lock b/yarn.lock
new file mode 100644
index 00000000..74d1318d
--- /dev/null
+++ b/yarn.lock
@@ -0,0 +1,1897 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
+  integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==
+  dependencies:
+    "@babel/highlight" "^7.12.13"
+
+"@babel/compat-data@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.12.tgz#a8a5ccac19c200f9dd49624cac6e19d7be1236a1"
+  integrity sha512-3eJJ841uKxeV8dcN/2yGEUy+RfgQspPEgQat85umsE1rotuquQ2AbIub4S6j7c50a2d+4myc+zSlnXeIHrOnhQ==
+
+"@babel/core@>=7.9.0":
+  version "7.13.14"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.14.tgz#8e46ebbaca460a63497c797e574038ab04ae6d06"
+  integrity sha512-wZso/vyF4ki0l0znlgM4inxbdrUvCb+cVz8grxDq+6C9k6qbqoIJteQOKicaKjCipU3ISV+XedCqpL2RJJVehA==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@babel/generator" "^7.13.9"
+    "@babel/helper-compilation-targets" "^7.13.13"
+    "@babel/helper-module-transforms" "^7.13.14"
+    "@babel/helpers" "^7.13.10"
+    "@babel/parser" "^7.13.13"
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.13.13"
+    "@babel/types" "^7.13.14"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.1.2"
+    semver "^6.3.0"
+    source-map "^0.5.0"
+
+"@babel/generator@^7.13.9":
+  version "7.13.9"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.9.tgz#3a7aa96f9efb8e2be42d38d80e2ceb4c64d8de39"
+  integrity sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==
+  dependencies:
+    "@babel/types" "^7.13.0"
+    jsesc "^2.5.1"
+    source-map "^0.5.0"
+
+"@babel/helper-compilation-targets@^7.13.13":
+  version "7.13.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.13.tgz#2b2972a0926474853f41e4adbc69338f520600e5"
+  integrity sha512-q1kcdHNZehBwD9jYPh3WyXcsFERi39X4I59I3NadciWtNDyZ6x+GboOxncFK0kXlKIv6BJm5acncehXWUjWQMQ==
+  dependencies:
+    "@babel/compat-data" "^7.13.12"
+    "@babel/helper-validator-option" "^7.12.17"
+    browserslist "^4.14.5"
+    semver "^6.3.0"
+
+"@babel/helper-function-name@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"
+  integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==
+  dependencies:
+    "@babel/helper-get-function-arity" "^7.12.13"
+    "@babel/template" "^7.12.13"
+    "@babel/types" "^7.12.13"
+
+"@babel/helper-get-function-arity@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583"
+  integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==
+  dependencies:
+    "@babel/types" "^7.12.13"
+
+"@babel/helper-member-expression-to-functions@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz#dfe368f26d426a07299d8d6513821768216e6d72"
+  integrity sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==
+  dependencies:
+    "@babel/types" "^7.13.12"
+
+"@babel/helper-module-imports@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977"
+  integrity sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==
+  dependencies:
+    "@babel/types" "^7.13.12"
+
+"@babel/helper-module-transforms@^7.13.14":
+  version "7.13.14"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.14.tgz#e600652ba48ccb1641775413cb32cfa4e8b495ef"
+  integrity sha512-QuU/OJ0iAOSIatyVZmfqB0lbkVP0kDRiKj34xy+QNsnVZi/PA6BoSoreeqnxxa9EHFAIL0R9XOaAR/G9WlIy5g==
+  dependencies:
+    "@babel/helper-module-imports" "^7.13.12"
+    "@babel/helper-replace-supers" "^7.13.12"
+    "@babel/helper-simple-access" "^7.13.12"
+    "@babel/helper-split-export-declaration" "^7.12.13"
+    "@babel/helper-validator-identifier" "^7.12.11"
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.13.13"
+    "@babel/types" "^7.13.14"
+
+"@babel/helper-optimise-call-expression@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea"
+  integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==
+  dependencies:
+    "@babel/types" "^7.12.13"
+
+"@babel/helper-replace-supers@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz#6442f4c1ad912502481a564a7386de0c77ff3804"
+  integrity sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.13.12"
+    "@babel/helper-optimise-call-expression" "^7.12.13"
+    "@babel/traverse" "^7.13.0"
+    "@babel/types" "^7.13.12"
+
+"@babel/helper-simple-access@^7.13.12":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz#dd6c538afb61819d205a012c31792a39c7a5eaf6"
+  integrity sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==
+  dependencies:
+    "@babel/types" "^7.13.12"
+
+"@babel/helper-split-export-declaration@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05"
+  integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==
+  dependencies:
+    "@babel/types" "^7.12.13"
+
+"@babel/helper-validator-identifier@^7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
+  integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
+
+"@babel/helper-validator-option@^7.12.17":
+  version "7.12.17"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"
+  integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==
+
+"@babel/helpers@^7.13.10":
+  version "7.13.10"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.10.tgz#fd8e2ba7488533cdeac45cc158e9ebca5e3c7df8"
+  integrity sha512-4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ==
+  dependencies:
+    "@babel/template" "^7.12.13"
+    "@babel/traverse" "^7.13.0"
+    "@babel/types" "^7.13.0"
+
+"@babel/highlight@^7.12.13":
+  version "7.13.10"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.10.tgz#a8b2a66148f5b27d666b15d81774347a731d52d1"
+  integrity sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.12.11"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
+"@babel/parser@^7.12.13", "@babel/parser@^7.13.13":
+  version "7.13.13"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.13.tgz#42f03862f4aed50461e543270916b47dd501f0df"
+  integrity sha512-OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw==
+
+"@babel/template@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327"
+  integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@babel/parser" "^7.12.13"
+    "@babel/types" "^7.12.13"
+
+"@babel/traverse@^7.13.0", "@babel/traverse@^7.13.13":
+  version "7.13.13"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.13.tgz#39aa9c21aab69f74d948a486dd28a2dbdbf5114d"
+  integrity sha512-CblEcwmXKR6eP43oQGG++0QMTtCjAsa3frUuzHoiIJWpaIIi8dwMyEFUJoXRLxagGqCK+jALRwIO+o3R9p/uUg==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@babel/generator" "^7.13.9"
+    "@babel/helper-function-name" "^7.12.13"
+    "@babel/helper-split-export-declaration" "^7.12.13"
+    "@babel/parser" "^7.13.13"
+    "@babel/types" "^7.13.13"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
+"@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.13", "@babel/types@^7.13.14":
+  version "7.13.14"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.14.tgz#c35a4abb15c7cd45a2746d78ab328e362cbace0d"
+  integrity sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.12.11"
+    lodash "^4.17.19"
+    to-fast-properties "^2.0.0"
+
+"@nodelib/fs.scandir@2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"
+  integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==
+  dependencies:
+    "@nodelib/fs.stat" "2.0.4"
+    run-parallel "^1.1.9"
+
+"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655"
+  integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==
+
+"@nodelib/fs.walk@^1.2.3":
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063"
+  integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.4"
+    fastq "^1.6.0"
+
+"@stylelint/postcss-css-in-js@^0.37.2":
+  version "0.37.2"
+  resolved "https://registry.yarnpkg.com/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz#7e5a84ad181f4234a2480803422a47b8749af3d2"
+  integrity sha512-nEhsFoJurt8oUmieT8qy4nk81WRHmJynmVwn/Vts08PL9fhgIsMhk1GId5yAN643OzqEEb5S/6At2TZW7pqPDA==
+  dependencies:
+    "@babel/core" ">=7.9.0"
+
+"@stylelint/postcss-markdown@^0.36.2":
+  version "0.36.2"
+  resolved "https://registry.yarnpkg.com/@stylelint/postcss-markdown/-/postcss-markdown-0.36.2.tgz#0a540c4692f8dcdfc13c8e352c17e7bfee2bb391"
+  integrity sha512-2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ==
+  dependencies:
+    remark "^13.0.0"
+    unist-util-find-all-after "^3.0.2"
+
+"@types/mdast@^3.0.0":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.3.tgz#2d7d671b1cd1ea3deb306ea75036c2a0407d2deb"
+  integrity sha512-SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw==
+  dependencies:
+    "@types/unist" "*"
+
+"@types/minimist@^1.2.0":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256"
+  integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==
+
+"@types/normalize-package-data@^2.4.0":
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
+  integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
+
+"@types/parse-json@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
+  integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
+
+"@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
+  integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==
+
+ajv@^8.0.1:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.0.2.tgz#1396e27f208ed56dd5638ab5a251edeb1c91d402"
+  integrity sha512-V0HGxJd0PiDF0ecHYIesTOqfd1gJguwQUOYfMfAWnRsWQEXfc5ifbUFhD3Wjc+O+y7VAqL+g07prq9gHQ/JOZQ==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
+    uri-js "^4.2.2"
+
+ansi-regex@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
+  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+
+ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+  dependencies:
+    color-convert "^1.9.0"
+
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
+
+arrify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
+
+astral-regex@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
+  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
+
+autoprefixer@^9.8.6:
+  version "9.8.6"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f"
+  integrity sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==
+  dependencies:
+    browserslist "^4.12.0"
+    caniuse-lite "^1.0.30001109"
+    colorette "^1.2.1"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^7.0.32"
+    postcss-value-parser "^4.1.0"
+
+bail@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776"
+  integrity sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==
+
+balanced-match@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+braces@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
+browserslist@^4.12.0, browserslist@^4.14.5:
+  version "4.16.3"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz#340aa46940d7db878748567c5dea24a48ddf3717"
+  integrity sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==
+  dependencies:
+    caniuse-lite "^1.0.30001181"
+    colorette "^1.2.1"
+    electron-to-chromium "^1.3.649"
+    escalade "^3.1.1"
+    node-releases "^1.1.70"
+
+call-bind@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+  dependencies:
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.2"
+
+callsites@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
+
+camelcase-keys@^6.2.2:
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"
+  integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==
+  dependencies:
+    camelcase "^5.3.1"
+    map-obj "^4.0.0"
+    quick-lru "^4.0.1"
+
+camelcase@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
+
+caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001181:
+  version "1.0.30001205"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001205.tgz#d79bf6a6fb13196b4bb46e5143a22ca0242e0ef8"
+  integrity sha512-TL1GrS5V6LElbitPazidkBMD9sa448bQDDLrumDqaggmKFcuU2JW1wTOHJPukAcOMtEmLcmDJEzfRrf+GjM0Og==
+
+chalk@^2.0.0, chalk@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+chalk@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
+  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+character-entities-legacy@^1.0.0:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1"
+  integrity sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==
+
+character-entities@^1.0.0:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b"
+  integrity sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==
+
+character-reference-invalid@^1.0.0:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560"
+  integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==
+
+clone-regexp@^2.1.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-2.2.0.tgz#7d65e00885cd8796405c35a737e7a86b7429e36f"
+  integrity sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==
+  dependencies:
+    is-regexp "^2.0.0"
+
+color-convert@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+  dependencies:
+    color-name "1.1.3"
+
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+colorette@^1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
+  integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+
+convert-source-map@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
+  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
+  dependencies:
+    safe-buffer "~5.1.1"
+
+cosmiconfig@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3"
+  integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==
+  dependencies:
+    "@types/parse-json" "^4.0.0"
+    import-fresh "^3.2.1"
+    parse-json "^5.0.0"
+    path-type "^4.0.0"
+    yaml "^1.10.0"
+
+cssesc@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
+  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
+
+debug@^4.0.0, debug@^4.1.0, debug@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
+  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
+  dependencies:
+    ms "2.1.2"
+
+decamelize-keys@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
+  integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=
+  dependencies:
+    decamelize "^1.1.0"
+    map-obj "^1.0.0"
+
+decamelize@^1.1.0, decamelize@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
+  dependencies:
+    path-type "^4.0.0"
+
+dom-serializer@0:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
+  integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==
+  dependencies:
+    domelementtype "^2.0.1"
+    entities "^2.0.0"
+
+domelementtype@1, domelementtype@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
+  integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
+
+domelementtype@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.1.0.tgz#a851c080a6d1c3d94344aed151d99f669edf585e"
+  integrity sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==
+
+domhandler@^2.3.0:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
+  integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==
+  dependencies:
+    domelementtype "1"
+
+domutils@^1.5.1:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
+  integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
+  dependencies:
+    dom-serializer "0"
+    domelementtype "1"
+
+electron-to-chromium@^1.3.649:
+  version "1.3.703"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.703.tgz#6d9b9a75c42a40775f5930329e642b22b227317f"
+  integrity sha512-SVBVhNB+4zPL+rvtWLw7PZQkw/Eqj1HQZs22xtcqW36+xoifzEOEEDEpkxSMfB6RFeSIOcG00w6z5mSqLr1Y6w==
+
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
+entities@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
+  integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
+
+entities@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
+  integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
+
+error-ex@^1.3.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
+  dependencies:
+    is-arrayish "^0.2.1"
+
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+
+escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+
+execall@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/execall/-/execall-2.0.0.tgz#16a06b5fe5099df7d00be5d9c06eecded1663b45"
+  integrity sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==
+  dependencies:
+    clone-regexp "^2.1.0"
+
+extend@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
+fast-deep-equal@^3.1.1:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
+
+fast-glob@^3.1.1, fast-glob@^3.2.5:
+  version "3.2.5"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661"
+  integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.0"
+    merge2 "^1.3.0"
+    micromatch "^4.0.2"
+    picomatch "^2.2.1"
+
+fastest-levenshtein@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2"
+  integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==
+
+fastq@^1.6.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz#bb9fb955a07130a918eb63c1f5161cc32a5d0858"
+  integrity sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==
+  dependencies:
+    reusify "^1.0.4"
+
+file-entry-cache@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
+  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
+  dependencies:
+    flat-cache "^3.0.4"
+
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
+find-up@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
+flat-cache@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
+  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
+  dependencies:
+    flatted "^3.1.0"
+    rimraf "^3.0.2"
+
+flatted@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469"
+  integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+
+function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+
+gensync@^1.0.0-beta.2:
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
+  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
+
+get-intrinsic@^1.0.2:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
+  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+
+get-stdin@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"
+  integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==
+
+glob-parent@^5.1.0:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
+glob@^7.1.3:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+global-modules@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
+  integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==
+  dependencies:
+    global-prefix "^3.0.0"
+
+global-prefix@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97"
+  integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==
+  dependencies:
+    ini "^1.3.5"
+    kind-of "^6.0.2"
+    which "^1.3.1"
+
+globals@^11.1.0:
+  version "11.12.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
+
+globby@^11.0.2:
+  version "11.0.3"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb"
+  integrity sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==
+  dependencies:
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.1.1"
+    ignore "^5.1.4"
+    merge2 "^1.3.0"
+    slash "^3.0.0"
+
+globjoin@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43"
+  integrity sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=
+
+gonzales-pe@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/gonzales-pe/-/gonzales-pe-4.3.0.tgz#fe9dec5f3c557eead09ff868c65826be54d067b3"
+  integrity sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==
+  dependencies:
+    minimist "^1.2.5"
+
+hard-rejection@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
+  integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
+has-symbols@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
+  integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
+
+has@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+  dependencies:
+    function-bind "^1.1.1"
+
+hosted-git-info@^2.1.4:
+  version "2.8.8"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
+  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
+
+hosted-git-info@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961"
+  integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==
+  dependencies:
+    lru-cache "^6.0.0"
+
+html-tags@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140"
+  integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==
+
+htmlparser2@^3.10.0:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
+  integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
+  dependencies:
+    domelementtype "^1.3.1"
+    domhandler "^2.3.0"
+    domutils "^1.5.1"
+    entities "^1.1.1"
+    inherits "^2.0.1"
+    readable-stream "^3.1.1"
+
+ignore@^5.1.4, ignore@^5.1.8:
+  version "5.1.8"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
+  integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
+
+import-fresh@^3.2.1:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
+  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
+  dependencies:
+    parent-module "^1.0.0"
+    resolve-from "^4.0.0"
+
+import-lazy@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153"
+  integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==
+
+imurmurhash@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+
+indent-string@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
+  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
+
+indexes-of@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
+  integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@^2.0.1, inherits@^2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+ini@^1.3.5:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
+
+is-alphabetical@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d"
+  integrity sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==
+
+is-alphanumerical@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz#7eb9a2431f855f6b1ef1a78e326df515696c4dbf"
+  integrity sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==
+  dependencies:
+    is-alphabetical "^1.0.0"
+    is-decimal "^1.0.0"
+
+is-arrayish@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
+
+is-boolean-object@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz#e2aaad3a3a8fca34c28f6eee135b156ed2587ff0"
+  integrity sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==
+  dependencies:
+    call-bind "^1.0.0"
+
+is-buffer@^2.0.0:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
+  integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
+
+is-core-module@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
+  integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
+  dependencies:
+    has "^1.0.3"
+
+is-decimal@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5"
+  integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==
+
+is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
+is-glob@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-hexadecimal@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7"
+  integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==
+
+is-number-object@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197"
+  integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
+is-plain-obj@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
+
+is-plain-obj@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
+  integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
+
+is-regexp@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-2.1.0.tgz#cd734a56864e23b956bf4e7c66c396a4c0b22c2d"
+  integrity sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==
+
+is-string@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
+  integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==
+
+is-typedarray@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
+
+is-unicode-supported@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
+  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+
+js-tokens@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
+
+jsesc@^2.5.1:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
+
+json-parse-even-better-errors@^2.3.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
+  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
+
+json-schema-traverse@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
+  integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
+
+json5@^2.1.2:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
+  integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
+  dependencies:
+    minimist "^1.2.5"
+
+kind-of@^6.0.2, kind-of@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
+
+known-css-properties@^0.21.0:
+  version "0.21.0"
+  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.21.0.tgz#15fbd0bbb83447f3ce09d8af247ed47c68ede80d"
+  integrity sha512-sZLUnTqimCkvkgRS+kbPlYW5o8q5w1cu+uIisKpEWkj31I8mx8kNG162DwRav8Zirkva6N5uoFsm9kzK4mUXjw==
+
+lines-and-columns@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
+  integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
+
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+  dependencies:
+    p-locate "^4.1.0"
+
+lodash.clonedeep@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
+
+lodash.flatten@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
+  integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=
+
+lodash.truncate@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
+  integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
+
+lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+
+log-symbols@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
+  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
+  dependencies:
+    chalk "^4.1.0"
+    is-unicode-supported "^0.1.0"
+
+longest-streak@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.4.tgz#b8599957da5b5dab64dee3fe316fa774597d90e4"
+  integrity sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==
+
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
+map-obj@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
+
+map-obj@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.2.0.tgz#0e8bc823e2aaca8a0942567d12ed14f389eec153"
+  integrity sha512-NAq0fCmZYGz9UFEQyndp7sisrow4GroyGeKluyKC/chuITZsPyOyC1UJZPJlVFImhXdROIP5xqouRLThT3BbpQ==
+
+mathml-tag-names@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
+  integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
+
+mdast-util-from-markdown@^0.8.0:
+  version "0.8.5"
+  resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz#d1ef2ca42bc377ecb0463a987910dae89bd9a28c"
+  integrity sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==
+  dependencies:
+    "@types/mdast" "^3.0.0"
+    mdast-util-to-string "^2.0.0"
+    micromark "~2.11.0"
+    parse-entities "^2.0.0"
+    unist-util-stringify-position "^2.0.0"
+
+mdast-util-to-markdown@^0.6.0:
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz#b33f67ca820d69e6cc527a93d4039249b504bebe"
+  integrity sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    longest-streak "^2.0.0"
+    mdast-util-to-string "^2.0.0"
+    parse-entities "^2.0.0"
+    repeat-string "^1.0.0"
+    zwitch "^1.0.0"
+
+mdast-util-to-string@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b"
+  integrity sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==
+
+meow@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz#cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364"
+  integrity sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==
+  dependencies:
+    "@types/minimist" "^1.2.0"
+    camelcase-keys "^6.2.2"
+    decamelize "^1.2.0"
+    decamelize-keys "^1.1.0"
+    hard-rejection "^2.1.0"
+    minimist-options "4.1.0"
+    normalize-package-data "^3.0.0"
+    read-pkg-up "^7.0.1"
+    redent "^3.0.0"
+    trim-newlines "^3.0.0"
+    type-fest "^0.18.0"
+    yargs-parser "^20.2.3"
+
+merge2@^1.3.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
+
+micromark@~2.11.0:
+  version "2.11.4"
+  resolved "https://registry.yarnpkg.com/micromark/-/micromark-2.11.4.tgz#d13436138eea826383e822449c9a5c50ee44665a"
+  integrity sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==
+  dependencies:
+    debug "^4.0.0"
+    parse-entities "^2.0.0"
+
+micromatch@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
+  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.0.5"
+
+min-indent@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
+  integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
+
+minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist-options@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
+  integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==
+  dependencies:
+    arrify "^1.0.1"
+    is-plain-obj "^1.1.0"
+    kind-of "^6.0.3"
+
+minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+node-releases@^1.1.70:
+  version "1.1.71"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"
+  integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==
+
+normalize-package-data@^2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
+  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
+  dependencies:
+    hosted-git-info "^2.1.4"
+    resolve "^1.10.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+
+normalize-package-data@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.2.tgz#cae5c410ae2434f9a6c1baa65d5bc3b9366c8699"
+  integrity sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==
+  dependencies:
+    hosted-git-info "^4.0.1"
+    resolve "^1.20.0"
+    semver "^7.3.4"
+    validate-npm-package-license "^3.0.1"
+
+normalize-range@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+  integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
+
+normalize-selector@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03"
+  integrity sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=
+
+num2fraction@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
+  integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
+
+once@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  dependencies:
+    wrappy "1"
+
+p-limit@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
+  dependencies:
+    p-try "^2.0.0"
+
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  dependencies:
+    p-limit "^2.2.0"
+
+p-try@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+
+parent-module@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
+  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
+  dependencies:
+    callsites "^3.0.0"
+
+parse-entities@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-2.0.0.tgz#53c6eb5b9314a1f4ec99fa0fdf7ce01ecda0cbe8"
+  integrity sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==
+  dependencies:
+    character-entities "^1.0.0"
+    character-entities-legacy "^1.0.0"
+    character-reference-invalid "^1.0.0"
+    is-alphanumerical "^1.0.0"
+    is-decimal "^1.0.0"
+    is-hexadecimal "^1.0.0"
+
+parse-json@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
+  integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    error-ex "^1.3.1"
+    json-parse-even-better-errors "^2.3.0"
+    lines-and-columns "^1.1.6"
+
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+
+path-parse@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+
+path-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
+
+picomatch@^2.0.5, picomatch@^2.2.1:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
+  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
+
+postcss-html@^0.36.0:
+  version "0.36.0"
+  resolved "https://registry.yarnpkg.com/postcss-html/-/postcss-html-0.36.0.tgz#b40913f94eaacc2453fd30a1327ad6ee1f88b204"
+  integrity sha512-HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw==
+  dependencies:
+    htmlparser2 "^3.10.0"
+
+postcss-less@^3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-3.1.4.tgz#369f58642b5928ef898ffbc1a6e93c958304c5ad"
+  integrity sha512-7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA==
+  dependencies:
+    postcss "^7.0.14"
+
+postcss-media-query-parser@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244"
+  integrity sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=
+
+postcss-resolve-nested-selector@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e"
+  integrity sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=
+
+postcss-safe-parser@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz#a6d4e48f0f37d9f7c11b2a581bf00f8ba4870b96"
+  integrity sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==
+  dependencies:
+    postcss "^7.0.26"
+
+postcss-sass@^0.4.4:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/postcss-sass/-/postcss-sass-0.4.4.tgz#91f0f3447b45ce373227a98b61f8d8f0785285a3"
+  integrity sha512-BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg==
+  dependencies:
+    gonzales-pe "^4.3.0"
+    postcss "^7.0.21"
+
+postcss-scss@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-2.1.1.tgz#ec3a75fa29a55e016b90bf3269026c53c1d2b383"
+  integrity sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==
+  dependencies:
+    postcss "^7.0.6"
+
+postcss-selector-parser@^6.0.4:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz#56075a1380a04604c38b063ea7767a129af5c2b3"
+  integrity sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==
+  dependencies:
+    cssesc "^3.0.0"
+    indexes-of "^1.0.1"
+    uniq "^1.0.1"
+    util-deprecate "^1.0.2"
+
+postcss-sorting@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-sorting/-/postcss-sorting-5.0.1.tgz#10d5d0059eea8334dacc820c0121864035bc3f11"
+  integrity sha512-Y9fUFkIhfrm6i0Ta3n+89j56EFqaNRdUKqXyRp6kvTcSXnmgEjaVowCXH+JBe9+YKWqd4nc28r2sgwnzJalccA==
+  dependencies:
+    lodash "^4.17.14"
+    postcss "^7.0.17"
+
+postcss-syntax@^0.36.2:
+  version "0.36.2"
+  resolved "https://registry.yarnpkg.com/postcss-syntax/-/postcss-syntax-0.36.2.tgz#f08578c7d95834574e5593a82dfbfa8afae3b51c"
+  integrity sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==
+
+postcss-value-parser@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
+  integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
+
+postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.31, postcss@^7.0.32, postcss@^7.0.35, postcss@^7.0.6:
+  version "7.0.35"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24"
+  integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
+punycode@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+
+queue-microtask@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
+
+quick-lru@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
+  integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
+
+read-pkg-up@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507"
+  integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==
+  dependencies:
+    find-up "^4.1.0"
+    read-pkg "^5.2.0"
+    type-fest "^0.8.1"
+
+read-pkg@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
+  integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==
+  dependencies:
+    "@types/normalize-package-data" "^2.4.0"
+    normalize-package-data "^2.5.0"
+    parse-json "^5.0.0"
+    type-fest "^0.6.0"
+
+readable-stream@^3.1.1:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+  dependencies:
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
+
+redent@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
+  integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==
+  dependencies:
+    indent-string "^4.0.0"
+    strip-indent "^3.0.0"
+
+remark-parse@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-9.0.0.tgz#4d20a299665880e4f4af5d90b7c7b8a935853640"
+  integrity sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==
+  dependencies:
+    mdast-util-from-markdown "^0.8.0"
+
+remark-stringify@^9.0.0:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-9.0.1.tgz#576d06e910548b0a7191a71f27b33f1218862894"
+  integrity sha512-mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg==
+  dependencies:
+    mdast-util-to-markdown "^0.6.0"
+
+remark@^13.0.0:
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/remark/-/remark-13.0.0.tgz#d15d9bf71a402f40287ebe36067b66d54868e425"
+  integrity sha512-HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA==
+  dependencies:
+    remark-parse "^9.0.0"
+    remark-stringify "^9.0.0"
+    unified "^9.1.0"
+
+repeat-string@^1.0.0:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
+
+require-from-string@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
+  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
+
+resolve-from@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
+
+resolve-from@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
+
+resolve@^1.10.0, resolve@^1.20.0:
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
+  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
+  dependencies:
+    is-core-module "^2.2.0"
+    path-parse "^1.0.6"
+
+reusify@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+
+rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
+run-parallel@^1.1.9:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
+  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
+  dependencies:
+    queue-microtask "^1.2.2"
+
+safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
+safe-buffer@~5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
+"semver@2 || 3 || 4 || 5":
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
+semver@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+
+semver@^7.3.4:
+  version "7.3.5"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
+  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
+  dependencies:
+    lru-cache "^6.0.0"
+
+signal-exit@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
+  integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
+
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
+slice-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
+  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
+  dependencies:
+    ansi-styles "^4.0.0"
+    astral-regex "^2.0.0"
+    is-fullwidth-code-point "^3.0.0"
+
+source-map@^0.5.0:
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+
+source-map@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+spdx-correct@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
+  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
+  dependencies:
+    spdx-expression-parse "^3.0.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-exceptions@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
+  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
+
+spdx-expression-parse@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
+  dependencies:
+    spdx-exceptions "^2.1.0"
+    spdx-license-ids "^3.0.0"
+
+spdx-license-ids@^3.0.0:
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
+  integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
+
+specificity@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.4.1.tgz#aab5e645012db08ba182e151165738d00887b019"
+  integrity sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==
+
+string-width@^4.2.0, string-width@^4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"
+  integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.0"
+
+string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
+strip-ansi@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
+  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+  dependencies:
+    ansi-regex "^5.0.0"
+
+strip-indent@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
+  integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==
+  dependencies:
+    min-indent "^1.0.0"
+
+style-search@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
+  integrity sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=
+
+stylelint-config-recommended@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-4.0.0.tgz#665a0034065e6704d5032ba51bf4efa37d328ef9"
+  integrity sha512-sgna89Ng+25Hr9kmmaIxpGWt2LStVm1xf1807PdcWasiPDaOTkOHRL61sINw0twky7QMzafCGToGDnHT/kTHtQ==
+
+stylelint-config-standard@^21.0.0:
+  version "21.0.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-21.0.0.tgz#4942cfa27301eb6702fa8fc46a44da35d1a5cfd7"
+  integrity sha512-Yf6mx5oYEbQQJxWuW7X3t1gcxqbUx52qC9SMS3saC2ruOVYEyqmr5zSW6k3wXflDjjFrPhar3kp68ugRopmlzg==
+  dependencies:
+    stylelint-config-recommended "^4.0.0"
+
+stylelint-order@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/stylelint-order/-/stylelint-order-4.1.0.tgz#692d05b7d0c235ac66fcf5ea1d9e5f08a76747f6"
+  integrity sha512-sVTikaDvMqg2aJjh4r48jsdfmqLT+nqB1MOsaBnvM3OwLx4S+WXcsxsgk5w18h/OZoxZCxuyXMh61iBHcj9Qiw==
+  dependencies:
+    lodash "^4.17.15"
+    postcss "^7.0.31"
+    postcss-sorting "^5.0.1"
+
+stylelint@^13.12.0:
+  version "13.12.0"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-13.12.0.tgz#cceb922be0d0c7b7b6926271eea2b90cb924733e"
+  integrity sha512-P8O1xDy41B7O7iXaSlW+UuFbE5+ZWQDb61ndGDxKIt36fMH50DtlQTbwLpFLf8DikceTAb3r6nPrRv30wBlzXw==
+  dependencies:
+    "@stylelint/postcss-css-in-js" "^0.37.2"
+    "@stylelint/postcss-markdown" "^0.36.2"
+    autoprefixer "^9.8.6"
+    balanced-match "^1.0.0"
+    chalk "^4.1.0"
+    cosmiconfig "^7.0.0"
+    debug "^4.3.1"
+    execall "^2.0.0"
+    fast-glob "^3.2.5"
+    fastest-levenshtein "^1.0.12"
+    file-entry-cache "^6.0.1"
+    get-stdin "^8.0.0"
+    global-modules "^2.0.0"
+    globby "^11.0.2"
+    globjoin "^0.1.4"
+    html-tags "^3.1.0"
+    ignore "^5.1.8"
+    import-lazy "^4.0.0"
+    imurmurhash "^0.1.4"
+    known-css-properties "^0.21.0"
+    lodash "^4.17.21"
+    log-symbols "^4.0.0"
+    mathml-tag-names "^2.1.3"
+    meow "^9.0.0"
+    micromatch "^4.0.2"
+    normalize-selector "^0.2.0"
+    postcss "^7.0.35"
+    postcss-html "^0.36.0"
+    postcss-less "^3.1.4"
+    postcss-media-query-parser "^0.2.3"
+    postcss-resolve-nested-selector "^0.1.1"
+    postcss-safe-parser "^4.0.2"
+    postcss-sass "^0.4.4"
+    postcss-scss "^2.1.1"
+    postcss-selector-parser "^6.0.4"
+    postcss-syntax "^0.36.2"
+    postcss-value-parser "^4.1.0"
+    resolve-from "^5.0.0"
+    slash "^3.0.0"
+    specificity "^0.4.1"
+    string-width "^4.2.2"
+    strip-ansi "^6.0.0"
+    style-search "^0.1.0"
+    sugarss "^2.0.0"
+    svg-tags "^1.0.0"
+    table "^6.0.7"
+    v8-compile-cache "^2.2.0"
+    write-file-atomic "^3.0.3"
+
+sugarss@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-2.0.0.tgz#ddd76e0124b297d40bf3cca31c8b22ecb43bc61d"
+  integrity sha512-WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ==
+  dependencies:
+    postcss "^7.0.2"
+
+supports-color@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+  dependencies:
+    has-flag "^3.0.0"
+
+supports-color@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
+  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
+  dependencies:
+    has-flag "^3.0.0"
+
+supports-color@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+  dependencies:
+    has-flag "^4.0.0"
+
+svg-tags@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
+  integrity sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=
+
+table@^6.0.7:
+  version "6.0.9"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.0.9.tgz#790a12bf1e09b87b30e60419bafd6a1fd85536fb"
+  integrity sha512-F3cLs9a3hL1Z7N4+EkSscsel3z55XT950AvB05bwayrNg5T1/gykXtigioTAjbltvbMSJvvhFCbnf6mX+ntnJQ==
+  dependencies:
+    ajv "^8.0.1"
+    is-boolean-object "^1.1.0"
+    is-number-object "^1.0.4"
+    is-string "^1.0.5"
+    lodash.clonedeep "^4.5.0"
+    lodash.flatten "^4.4.0"
+    lodash.truncate "^4.4.2"
+    slice-ansi "^4.0.0"
+    string-width "^4.2.0"
+
+to-fast-properties@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
+
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
+trim-newlines@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.0.tgz#79726304a6a898aa8373427298d54c2ee8b1cb30"
+  integrity sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==
+
+trough@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
+  integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==
+
+type-fest@^0.18.0:
+  version "0.18.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
+  integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==
+
+type-fest@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
+  integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==
+
+type-fest@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
+  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
+
+typedarray-to-buffer@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
+  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
+  dependencies:
+    is-typedarray "^1.0.0"
+
+unified@^9.1.0:
+  version "9.2.1"
+  resolved "https://registry.yarnpkg.com/unified/-/unified-9.2.1.tgz#ae18d5674c114021bfdbdf73865ca60f410215a3"
+  integrity sha512-juWjuI8Z4xFg8pJbnEZ41b5xjGUWGHqXALmBZ3FC3WX0PIx1CZBIIJ6mXbYMcf6Yw4Fi0rFUTA1cdz/BglbOhA==
+  dependencies:
+    bail "^1.0.0"
+    extend "^3.0.0"
+    is-buffer "^2.0.0"
+    is-plain-obj "^2.0.0"
+    trough "^1.0.0"
+    vfile "^4.0.0"
+
+uniq@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
+  integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
+
+unist-util-find-all-after@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz#fdfecd14c5b7aea5e9ef38d5e0d5f774eeb561f6"
+  integrity sha512-xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ==
+  dependencies:
+    unist-util-is "^4.0.0"
+
+unist-util-is@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.1.0.tgz#976e5f462a7a5de73d94b706bac1b90671b57797"
+  integrity sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==
+
+unist-util-stringify-position@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da"
+  integrity sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==
+  dependencies:
+    "@types/unist" "^2.0.2"
+
+uri-js@^4.2.2:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
+  dependencies:
+    punycode "^2.1.0"
+
+util-deprecate@^1.0.1, util-deprecate@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+
+v8-compile-cache@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
+  integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
+
+validate-npm-package-license@^3.0.1:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
+  dependencies:
+    spdx-correct "^3.0.0"
+    spdx-expression-parse "^3.0.0"
+
+vfile-message@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a"
+  integrity sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    unist-util-stringify-position "^2.0.0"
+
+vfile@^4.0.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.2.1.tgz#03f1dce28fc625c625bc6514350fbdb00fa9e624"
+  integrity sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==
+  dependencies:
+    "@types/unist" "^2.0.0"
+    is-buffer "^2.0.0"
+    unist-util-stringify-position "^2.0.0"
+    vfile-message "^2.0.0"
+
+which@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  dependencies:
+    isexe "^2.0.0"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+
+write-file-atomic@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
+  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
+  dependencies:
+    imurmurhash "^0.1.4"
+    is-typedarray "^1.0.0"
+    signal-exit "^3.0.2"
+    typedarray-to-buffer "^3.1.5"
+
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
+yaml@^1.10.0:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
+  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
+
+yargs-parser@^20.2.3:
+  version "20.2.7"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a"
+  integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==
+
+zwitch@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920"
+  integrity sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==

From 40c7bde7ecbfbdd964bcf9400cb398138f10daa5 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Wed, 31 Mar 2021 16:25:44 +0200
Subject: [PATCH 0529/1285] Ommit package.json and yarn.lock for .editorconfig.

---
 .editorconfig | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index c03185f9..58ba190d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -29,3 +29,8 @@ trim_trailing_whitespace = false
 [*.{yml,yaml}]
 indent_size = 2
 max_line_length = off
+
+[{package.json,yarn.lock}]
+indent_size = unset
+indent_style = unset
+max_line_length = unset

From 53f03457cc5432d209e17fe6d1534c62ad32cddb Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Wed, 31 Mar 2021 17:07:28 +0200
Subject: [PATCH 0530/1285] Add linter for JS files with basic recommended
 rules:

- Add Github Action.
- Fix JS files to match rules; mostly `globals` and `exported`.
---
 .eslintrc.js                            |  10 +
 .github/workflows/linters-frontend.yaml |   6 +
 bookwyrm/static/js/check_all.js         |   2 +-
 bookwyrm/static/js/localstorage.js      |   3 +
 bookwyrm/static/js/shared.js            |   4 +-
 bookwyrm/static/js/tabs.js              |   2 +
 package.json                            |   1 +
 yarn.lock                               | 359 +++++++++++++++++++++++-
 8 files changed, 376 insertions(+), 11 deletions(-)
 create mode 100644 .eslintrc.js

diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 00000000..d39859f1
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,10 @@
+/* global module */
+
+module.exports = {
+    "env": {
+        "browser": true,
+        "es6": true
+    },
+
+    "extends": "eslint:recommended"
+};
diff --git a/.github/workflows/linters-frontend.yaml b/.github/workflows/linters-frontend.yaml
index 47c3da0d..711f5d88 100644
--- a/.github/workflows/linters-frontend.yaml
+++ b/.github/workflows/linters-frontend.yaml
@@ -22,3 +22,9 @@ jobs:
         uses: actions-hub/stylelint@v1.1.3
         env:
           PATTERN: "*.css"
+
+      - name: Run ESLint
+        uses: stefanoeb/eslint-action@1.0.2
+        with:
+          files:
+            - 'bookwyrm/static/js/**'
diff --git a/bookwyrm/static/js/check_all.js b/bookwyrm/static/js/check_all.js
index ea2300ce..07d30a68 100644
--- a/bookwyrm/static/js/check_all.js
+++ b/bookwyrm/static/js/check_all.js
@@ -1,4 +1,4 @@
-// Toggle all checkboxes.
+/* exported toggleAllCheckboxes */
 
 /**
  * Toggle all descendant checkboxes of a target.
diff --git a/bookwyrm/static/js/localstorage.js b/bookwyrm/static/js/localstorage.js
index b63c4392..aa79ee30 100644
--- a/bookwyrm/static/js/localstorage.js
+++ b/bookwyrm/static/js/localstorage.js
@@ -1,3 +1,6 @@
+/* exported updateDisplay */
+/* globals addRemoveClass */
+
 // set javascript listeners
 function updateDisplay(e) {
     // used in set reading goal
diff --git a/bookwyrm/static/js/shared.js b/bookwyrm/static/js/shared.js
index 1f26aba6..7a198619 100644
--- a/bookwyrm/static/js/shared.js
+++ b/bookwyrm/static/js/shared.js
@@ -1,3 +1,5 @@
+/* globals setDisplay TabGroup toggleAllCheckboxes updateDisplay */
+
 // set up javascript listeners
 window.onload = function() {
     // buttons that display or hide content
@@ -93,7 +95,7 @@ function toggleAction(e) {
 
     // show/hide container
     var container = document.getElementById('hide-' + targetId);
-    if (!!container) {
+    if (container) {
         addRemoveClass(container, 'hidden', pressed);
     }
 
diff --git a/bookwyrm/static/js/tabs.js b/bookwyrm/static/js/tabs.js
index 59c07251..f9568b29 100644
--- a/bookwyrm/static/js/tabs.js
+++ b/bookwyrm/static/js/tabs.js
@@ -1,3 +1,5 @@
+/* exported TabGroup */
+
 /*
 * The content below is licensed according to the W3C Software License at
 * https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document
diff --git a/package.json b/package.json
index a662cdaf..8059255d 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,6 @@
 {
   "devDependencies": {
+    "eslint": "^7.23.0",
     "stylelint": "^13.12.0",
     "stylelint-config-standard": "^21.0.0",
     "stylelint-order": "^4.1.0"
diff --git a/yarn.lock b/yarn.lock
index 74d1318d..de4e0107 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,13 @@
 # yarn lockfile v1
 
 
+"@babel/code-frame@7.12.11":
+  version "7.12.11"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
+  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
+  dependencies:
+    "@babel/highlight" "^7.10.4"
+
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
@@ -148,7 +155,7 @@
     "@babel/traverse" "^7.13.0"
     "@babel/types" "^7.13.0"
 
-"@babel/highlight@^7.12.13":
+"@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13":
   version "7.13.10"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.10.tgz#a8b2a66148f5b27d666b15d81774347a731d52d1"
   integrity sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==
@@ -194,6 +201,21 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
+"@eslint/eslintrc@^0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547"
+  integrity sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog==
+  dependencies:
+    ajv "^6.12.4"
+    debug "^4.1.1"
+    espree "^7.3.0"
+    globals "^12.1.0"
+    ignore "^4.0.6"
+    import-fresh "^3.2.1"
+    js-yaml "^3.13.1"
+    minimatch "^3.0.4"
+    strip-json-comments "^3.1.1"
+
 "@nodelib/fs.scandir@2.1.4":
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"
@@ -257,6 +279,26 @@
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
   integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==
 
+acorn-jsx@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
+  integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
+
+acorn@^7.4.0:
+  version "7.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
+  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
+
+ajv@^6.10.0, ajv@^6.12.4:
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 ajv@^8.0.1:
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.0.2.tgz#1396e27f208ed56dd5638ab5a251edeb1c91d402"
@@ -267,6 +309,11 @@ ajv@^8.0.1:
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
+ansi-colors@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
+  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
+
 ansi-regex@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
@@ -286,6 +333,13 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   dependencies:
     color-convert "^2.0.1"
 
+argparse@^1.0.7:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
+  dependencies:
+    sprintf-js "~1.0.2"
+
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
@@ -391,7 +445,7 @@ chalk@^2.0.0, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.1.0:
+chalk@^4.0.0, chalk@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
   integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
@@ -473,12 +527,21 @@ cosmiconfig@^7.0.0:
     path-type "^4.0.0"
     yaml "^1.10.0"
 
+cross-spawn@^7.0.2:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
 cssesc@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
-debug@^4.0.0, debug@^4.1.0, debug@^4.3.1:
+debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
   integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
@@ -498,6 +561,11 @@ decamelize@^1.1.0, decamelize@^1.2.0:
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
+deep-is@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+  integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
+
 dir-glob@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
@@ -505,6 +573,13 @@ dir-glob@^3.0.1:
   dependencies:
     path-type "^4.0.0"
 
+doctrine@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
+  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
+  dependencies:
+    esutils "^2.0.2"
+
 dom-serializer@0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
@@ -548,6 +623,13 @@ emoji-regex@^8.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
+enquirer@^2.3.5:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
+  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
+  dependencies:
+    ansi-colors "^4.1.1"
+
 entities@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
@@ -575,6 +657,117 @@ escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
+eslint-scope@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
+  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^4.1.1"
+
+eslint-utils@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
+  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
+  dependencies:
+    eslint-visitor-keys "^1.1.0"
+
+eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
+  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
+
+eslint-visitor-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
+  integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
+
+eslint@^7.23.0:
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.23.0.tgz#8d029d252f6e8cf45894b4bee08f5493f8e94325"
+  integrity sha512-kqvNVbdkjzpFy0XOszNwjkKzZ+6TcwCQ/h+ozlcIWwaimBBuhlQ4nN6kbiM2L+OjDcznkTJxzYfRFH92sx4a0Q==
+  dependencies:
+    "@babel/code-frame" "7.12.11"
+    "@eslint/eslintrc" "^0.4.0"
+    ajv "^6.10.0"
+    chalk "^4.0.0"
+    cross-spawn "^7.0.2"
+    debug "^4.0.1"
+    doctrine "^3.0.0"
+    enquirer "^2.3.5"
+    eslint-scope "^5.1.1"
+    eslint-utils "^2.1.0"
+    eslint-visitor-keys "^2.0.0"
+    espree "^7.3.1"
+    esquery "^1.4.0"
+    esutils "^2.0.2"
+    file-entry-cache "^6.0.1"
+    functional-red-black-tree "^1.0.1"
+    glob-parent "^5.0.0"
+    globals "^13.6.0"
+    ignore "^4.0.6"
+    import-fresh "^3.0.0"
+    imurmurhash "^0.1.4"
+    is-glob "^4.0.0"
+    js-yaml "^3.13.1"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.4.1"
+    lodash "^4.17.21"
+    minimatch "^3.0.4"
+    natural-compare "^1.4.0"
+    optionator "^0.9.1"
+    progress "^2.0.0"
+    regexpp "^3.1.0"
+    semver "^7.2.1"
+    strip-ansi "^6.0.0"
+    strip-json-comments "^3.1.0"
+    table "^6.0.4"
+    text-table "^0.2.0"
+    v8-compile-cache "^2.0.3"
+
+espree@^7.3.0, espree@^7.3.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
+  integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
+  dependencies:
+    acorn "^7.4.0"
+    acorn-jsx "^5.3.1"
+    eslint-visitor-keys "^1.3.0"
+
+esprima@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+
+esquery@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
+  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
+  dependencies:
+    estraverse "^5.1.0"
+
+esrecurse@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
+  dependencies:
+    estraverse "^5.2.0"
+
+estraverse@^4.1.1:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
+
+estraverse@^5.1.0, estraverse@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
+  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
+
+esutils@^2.0.2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
+
 execall@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/execall/-/execall-2.0.0.tgz#16a06b5fe5099df7d00be5d9c06eecded1663b45"
@@ -604,6 +797,16 @@ fast-glob@^3.1.1, fast-glob@^3.2.5:
     micromatch "^4.0.2"
     picomatch "^2.2.1"
 
+fast-json-stable-stringify@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+
+fast-levenshtein@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+
 fastest-levenshtein@^1.0.12:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2"
@@ -661,6 +864,11 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
+functional-red-black-tree@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
+  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
+
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
@@ -680,7 +888,7 @@ get-stdin@^8.0.0:
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"
   integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==
 
-glob-parent@^5.1.0:
+glob-parent@^5.0.0, glob-parent@^5.1.0:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
@@ -720,6 +928,20 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
+globals@^12.1.0:
+  version "12.4.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8"
+  integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==
+  dependencies:
+    type-fest "^0.8.1"
+
+globals@^13.6.0:
+  version "13.7.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.7.0.tgz#aed3bcefd80ad3ec0f0be2cf0c895110c0591795"
+  integrity sha512-Aipsz6ZKRxa/xQkZhNg0qIWXT6x6rD46f6x/PCnBomlttdIyAPak4YD9jTmKpZ72uROSMU87qJtcgpgHaVchiA==
+  dependencies:
+    type-fest "^0.20.2"
+
 globby@^11.0.2:
   version "11.0.3"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb"
@@ -800,12 +1022,17 @@ htmlparser2@^3.10.0:
     inherits "^2.0.1"
     readable-stream "^3.1.1"
 
+ignore@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
+  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
+
 ignore@^5.1.4, ignore@^5.1.8:
   version "5.1.8"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
   integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
 
-import-fresh@^3.2.1:
+import-fresh@^3.0.0, import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
@@ -903,7 +1130,7 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
-is-glob@^4.0.1:
+is-glob@^4.0.0, is-glob@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
   integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
@@ -965,6 +1192,14 @@ js-tokens@^4.0.0:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
+js-yaml@^3.13.1:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
 jsesc@^2.5.1:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
@@ -975,11 +1210,21 @@ json-parse-even-better-errors@^2.3.0:
   resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
 
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+
 json-schema-traverse@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
   integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
 
+json-stable-stringify-without-jsonify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+
 json5@^2.1.2:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
@@ -997,6 +1242,14 @@ known-css-properties@^0.21.0:
   resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.21.0.tgz#15fbd0bbb83447f3ce09d8af247ed47c68ede80d"
   integrity sha512-sZLUnTqimCkvkgRS+kbPlYW5o8q5w1cu+uIisKpEWkj31I8mx8kNG162DwRav8Zirkva6N5uoFsm9kzK4mUXjw==
 
+levn@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
+  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
+  dependencies:
+    prelude-ls "^1.2.1"
+    type-check "~0.4.0"
+
 lines-and-columns@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
@@ -1162,6 +1415,11 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
+natural-compare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+
 node-releases@^1.1.70:
   version "1.1.71"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"
@@ -1209,6 +1467,18 @@ once@^1.3.0:
   dependencies:
     wrappy "1"
 
+optionator@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
+  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+  dependencies:
+    deep-is "^0.1.3"
+    fast-levenshtein "^2.0.6"
+    levn "^0.4.1"
+    prelude-ls "^1.2.1"
+    type-check "^0.4.0"
+    word-wrap "^1.2.3"
+
 p-limit@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
@@ -1267,6 +1537,11 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
+path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
 path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
@@ -1365,6 +1640,16 @@ postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
+prelude-ls@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
+  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
+
+progress@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
+  integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
+
 punycode@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
@@ -1416,6 +1701,11 @@ redent@^3.0.0:
     indent-string "^4.0.0"
     strip-indent "^3.0.0"
 
+regexpp@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
+  integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
+
 remark-parse@^9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-9.0.0.tgz#4d20a299665880e4f4af5d90b7c7b8a935853640"
@@ -1506,13 +1796,25 @@ semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.3.4:
+semver@^7.2.1, semver@^7.3.4:
   version "7.3.5"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
   integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
   dependencies:
     lru-cache "^6.0.0"
 
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
+
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
 signal-exit@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
@@ -1573,6 +1875,11 @@ specificity@^0.4.1:
   resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.4.1.tgz#aab5e645012db08ba182e151165738d00887b019"
   integrity sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==
 
+sprintf-js@~1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
+
 string-width@^4.2.0, string-width@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"
@@ -1603,6 +1910,11 @@ strip-indent@^3.0.0:
   dependencies:
     min-indent "^1.0.0"
 
+strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
+
 style-search@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
@@ -1716,7 +2028,7 @@ svg-tags@^1.0.0:
   resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
   integrity sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=
 
-table@^6.0.7:
+table@^6.0.4, table@^6.0.7:
   version "6.0.9"
   resolved "https://registry.yarnpkg.com/table/-/table-6.0.9.tgz#790a12bf1e09b87b30e60419bafd6a1fd85536fb"
   integrity sha512-F3cLs9a3hL1Z7N4+EkSscsel3z55XT950AvB05bwayrNg5T1/gykXtigioTAjbltvbMSJvvhFCbnf6mX+ntnJQ==
@@ -1731,6 +2043,11 @@ table@^6.0.7:
     slice-ansi "^4.0.0"
     string-width "^4.2.0"
 
+text-table@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
+
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
@@ -1753,11 +2070,23 @@ trough@^1.0.0:
   resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
   integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==
 
+type-check@^0.4.0, type-check@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
+  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
+  dependencies:
+    prelude-ls "^1.2.1"
+
 type-fest@^0.18.0:
   version "0.18.1"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f"
   integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==
 
+type-fest@^0.20.2:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
+  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
+
 type-fest@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
@@ -1823,7 +2152,7 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2:
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
-v8-compile-cache@^2.2.0:
+v8-compile-cache@^2.0.3, v8-compile-cache@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
@@ -1861,6 +2190,18 @@ which@^1.3.1:
   dependencies:
     isexe "^2.0.0"
 
+which@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
+word-wrap@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"

From 99fd5c4e170e4dd53b5b6111d9bf588321224da3 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Wed, 31 Mar 2021 17:59:52 +0200
Subject: [PATCH 0531/1285] Tweak Github Actions:

- Rename some jobs for consistency.
- Add workflows path to trigger lint when updating workflows.
- Simplify frontend actions to speed up process and reduce dependencies.
---
 .github/workflows/linters-frontend.yaml | 21 ++++++++++-----------
 .github/workflows/linters-global.yaml   |  6 +++---
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/linters-frontend.yaml b/.github/workflows/linters-frontend.yaml
index 711f5d88..978bbbbe 100644
--- a/.github/workflows/linters-frontend.yaml
+++ b/.github/workflows/linters-frontend.yaml
@@ -1,30 +1,29 @@
 # @url https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
-name: Frontend Linters
+name: Lint Frontend
 
 on:
   push:
     branches: [ main, ci ]
     paths:
+      - '.github/workflows/**'
       - 'static/**'
   pull_request:
     branches: [ main, ci ]
 
 jobs:
-  linters:
-    name: linters
+  lint:
+    name: Lint with stylelint and ESLint.
     runs-on: ubuntu-20.04
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
 
-      - name: stylelinter
-        uses: actions-hub/stylelint@v1.1.3
-        env:
-          PATTERN: "*.css"
+      - name: Install modules
+        run: yarn
+
+      - name: Run stylelint
+        run: yarn stylelint **/static/**/*.css --report-needless-disables --report-invalid-scope-disables
 
       - name: Run ESLint
-        uses: stefanoeb/eslint-action@1.0.2
-        with:
-          files:
-            - 'bookwyrm/static/js/**'
+        run: yarn eslint . --ext .js,.jsx,.ts,.tsx
diff --git a/.github/workflows/linters-global.yaml b/.github/workflows/linters-global.yaml
index 291125c7..81893970 100644
--- a/.github/workflows/linters-global.yaml
+++ b/.github/workflows/linters-global.yaml
@@ -1,5 +1,5 @@
 # @url https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
-name: Lint Project
+name: Lint project globally
 
 on:
   push:
@@ -8,8 +8,8 @@ on:
     branches: [ main, ci ]
 
 jobs:
-  linters:
-    name: linters
+  lint:
+    name: Lint with EditorConfig.
     runs-on: ubuntu-20.04
 
     # Steps represent a sequence of tasks that will be executed as part of the job

From 54ae4d9e4429e7b80466c029b06241035ea69b22 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Wed, 31 Mar 2021 18:02:11 +0200
Subject: [PATCH 0532/1285] Rename some Github Actions files for consistency.

---
 .github/workflows/{linters-frontend.yaml => lint-frontend.yaml} | 0
 .github/workflows/{linters-global.yaml => lint-global.yaml}     | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename .github/workflows/{linters-frontend.yaml => lint-frontend.yaml} (100%)
 rename .github/workflows/{linters-global.yaml => lint-global.yaml} (100%)

diff --git a/.github/workflows/linters-frontend.yaml b/.github/workflows/lint-frontend.yaml
similarity index 100%
rename from .github/workflows/linters-frontend.yaml
rename to .github/workflows/lint-frontend.yaml
diff --git a/.github/workflows/linters-global.yaml b/.github/workflows/lint-global.yaml
similarity index 100%
rename from .github/workflows/linters-global.yaml
rename to .github/workflows/lint-global.yaml

From 83e4ec00f917df41909bf50ea6d825c8dccac6d2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 31 Mar 2021 09:22:23 -0700
Subject: [PATCH 0533/1285] Renames "shelves" in the UI to "books"

Still haven't figure out the create/edit wording tho
---
 bookwyrm/templates/layout.html                         |  2 +-
 bookwyrm/templates/snippets/shelf_selector.html        |  4 ++--
 .../snippets/shelve_button/shelve_button_options.html  |  2 +-
 bookwyrm/templates/user/shelf.html                     | 10 +++++-----
 bookwyrm/templates/user/user.html                      |  8 +++++---
 bookwyrm/templates/user/user_layout.html               |  2 +-
 6 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index f0f04b84..0937fcc3 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -55,7 +55,7 @@
         <div class="navbar-start">
             {% if request.user.is_authenticated %}
             <a href="{% url 'user-shelves' request.user.localname %}" class="navbar-item">
-                {% trans "Your shelves" %}
+                {% trans "Your books" %}
             </a>
             <a href="/#feed" class="navbar-item">
                 {% trans "Feed" %}
diff --git a/bookwyrm/templates/snippets/shelf_selector.html b/bookwyrm/templates/snippets/shelf_selector.html
index 47ea73a0..1bc448ec 100644
--- a/bookwyrm/templates/snippets/shelf_selector.html
+++ b/bookwyrm/templates/snippets/shelf_selector.html
@@ -1,7 +1,7 @@
 {% extends 'components/dropdown.html' %}
 {% load i18n %}
 {% block dropdown-trigger %}
-<span>{% trans "Change shelf" %}</span>
+<span>{% trans "Move book" %}</span>
 <span class="icon icon-arrow-down" aria-hidden="true"></span>
 {% endblock %}
 
@@ -25,7 +25,7 @@
         {% csrf_token %}
         <input type="hidden" name="book" value="{{ book.id }}">
         <input type="hidden" name="shelf" value="{{ current.id }}">
-        <button class="button is-fullwidth is-small is-danger is-light" type="submit">{% trans "Unshelve" %}</button>
+        <button class="button is-fullwidth is-small is-danger is-light" type="submit">{% trans "Remove" %}</button>
     </form>
 </li>
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
index a002917f..058bfc12 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
@@ -45,7 +45,7 @@
             {% csrf_token %}
             <input type="hidden" name="book" value="{{ active_shelf.book.id }}">
             <input type="hidden" name="shelf" value="{{ active_shelf.shelf.id }}">
-            <button class="button is-fullwidth is-small is-danger is-light" type="submit">{% trans "Unshelve" %}</button>
+            <button class="button is-fullwidth is-small is-danger is-light" type="submit">{% blocktrans with name=active_shelf.shelf.name %}Remove from {{ name }}{% endblocktrans %}</button>
         </form>
     </div>
 </li>
diff --git a/bookwyrm/templates/user/shelf.html b/bookwyrm/templates/user/shelf.html
index 4c60258c..9e045572 100644
--- a/bookwyrm/templates/user/shelf.html
+++ b/bookwyrm/templates/user/shelf.html
@@ -3,14 +3,14 @@
 {% load humanize %}
 {% load i18n %}
 
+{% block title %}
+{% include 'user/books_header.html' %}
+{% endblock %}
+
 {% block header %}
 <header class="columns">
     <h1 class="title">
-        {% if is_self %}
-        {% trans "Your Shelves" %}
-        {% else %}
-        {% blocktrans with username=user.display_name %}{{ username }}: Shelves{% endblocktrans %}
-        {% endif %}
+        {% include 'user/books_header.html' %}
     </h1>
 </header>
 {% endblock %}
diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index 52a91561..2b996872 100644
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -23,12 +23,14 @@
 {% block panel %}
 {% if user.bookwyrm_user %}
 <div class="block">
-    <h2 class="title">{% trans "Shelves" %}</h2>
+    <h2 class="title">
+        {% include 'user/books_header.html' %}
+    </h2>
     <div class="columns">
         {% for shelf in shelves %}
         <div class="column is-narrow">
             <h3>{{ shelf.name }}
-                {% if shelf.size > 3 %}<small>(<a href="{{ shelf.local_path }}">{% blocktrans with size=shelf.size %}See all {{ size }}{% endblocktrans %}</a>)</small>{% endif %}</h3>
+                {% if shelf.size > 3 %}<small>(<a href="{{ shelf.local_path }}">{% blocktrans with size=shelf.size %}View all {{ size }}{% endblocktrans %}</a>)</small>{% endif %}</h3>
             <div class="is-mobile field is-grouped">
             {% for book in shelf.books %}
             <div class="control">
@@ -41,7 +43,7 @@
         </div>
         {% endfor %}
     </div>
-    <small><a href="{{ user.local_path }}/shelves">{% blocktrans %}See all {{ shelf_count }} shelves{% endblocktrans %}</a></small>
+    <small><a href="{{ user.local_path }}/shelves">{% trans "View all books" %}</a></small>
 </div>
 {% endif %}
 
diff --git a/bookwyrm/templates/user/user_layout.html b/bookwyrm/templates/user/user_layout.html
index d60db2a0..c40b9e77 100644
--- a/bookwyrm/templates/user/user_layout.html
+++ b/bookwyrm/templates/user/user_layout.html
@@ -65,7 +65,7 @@
         {% if user.shelf_set.exists %}
         {% url 'user-shelves' user|username as url %}
         <li{% if url in request.path %} class="is-active"{% endif %}>
-            <a href="{{ url }}">{% trans "Shelves" %}</a>
+            <a href="{{ url }}">{% trans "Books" %}</a>
         </li>
         {% endif %}
     </ul>

From 5dc23682a2ce8df50380a0a05b3d9fdf349b2a72 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 31 Mar 2021 09:22:54 -0700
Subject: [PATCH 0534/1285] Updates locale files

---
 locale/de_DE/LC_MESSAGES/django.mo | Bin 26471 -> 25779 bytes
 locale/de_DE/LC_MESSAGES/django.po | 765 +++++++++++++++++-----------
 locale/en_US/LC_MESSAGES/django.po | 654 ++++++++++++++----------
 locale/es/LC_MESSAGES/django.mo    | Bin 27102 -> 26264 bytes
 locale/es/LC_MESSAGES/django.po    | 768 +++++++++++++++++-----------
 locale/fr_FR/LC_MESSAGES/django.mo | Bin 25097 -> 24333 bytes
 locale/fr_FR/LC_MESSAGES/django.po | 783 ++++++++++++++++++-----------
 locale/zh_CN/LC_MESSAGES/django.mo | Bin 30138 -> 29373 bytes
 locale/zh_CN/LC_MESSAGES/django.po | 768 +++++++++++++++++-----------
 9 files changed, 2293 insertions(+), 1445 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo
index cee809a37a853ef2da916d11d3d3135f02a1fe7d..dca726855f8f9060958660f8ab5bae1e36db3fd9 100644
GIT binary patch
delta 7878
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

delta 8571
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
P$7Wk-yWd>ax!r#Q2NL#9

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 6d98fa0b..ac095694 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-28 22:42+0000\n"
+"POT-Creation-Date: 2021-03-31 09:22-0700\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"
@@ -51,44 +51,64 @@ msgstr "%(count)d Benutzungen"
 msgid "Unlimited"
 msgstr "Ungelistet"
 
-#: bookwyrm/models/fields.py:25
+#: bookwyrm/models/fields.py:24
 #, python-format
 msgid "%(value)s is not a valid remote_id"
 msgstr "%(value)s ist keine gültige remote_id"
 
-#: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:47
+#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
 #, python-format
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s ist kein gültiger Username"
 
-#: bookwyrm/models/fields.py:170 bookwyrm/templates/layout.html:157
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:157
 msgid "username"
 msgstr "Username"
 
-#: bookwyrm/models/fields.py:175
+#: bookwyrm/models/fields.py:170
 msgid "A user with that username already exists."
 msgstr "Dieser Benutzename ist bereits vergeben."
 
-#: bookwyrm/settings.py:148
+#: bookwyrm/settings.py:150
 msgid "English"
 msgstr "Englisch"
 
-#: bookwyrm/settings.py:149
+#: bookwyrm/settings.py:151
 msgid "German"
 msgstr "Deutsch"
 
-#: bookwyrm/settings.py:150
+#: bookwyrm/settings.py:152
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: bookwyrm/settings.py:151
+#: bookwyrm/settings.py:153
 msgid "French"
 msgstr "Französisch"
 
-#: bookwyrm/settings.py:152
+#: bookwyrm/settings.py:154
 msgid "Simplified Chinese"
 msgstr "Vereinfachtes Chinesisch"
 
+#: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8
+msgid "Not Found"
+msgstr "Nicht gefunden"
+
+#: bookwyrm/templates/404.html:9
+msgid "The page you requested doesn't seem to exist!"
+msgstr "Die Seite die du angefordert hast scheint nicht zu existieren!"
+
+#: bookwyrm/templates/500.html:4
+msgid "Oops!"
+msgstr "Ups!"
+
+#: bookwyrm/templates/500.html:8
+msgid "Server Error"
+msgstr ""
+
+#: bookwyrm/templates/500.html:9
+msgid "Something went wrong! Sorry about that."
+msgstr "Etwas lief schief. Entschuldigung!"
+
 #: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
 msgid "Edit Author"
 msgstr "Autor*in editieren"
@@ -112,92 +132,66 @@ msgstr "von"
 msgid "Edit Book"
 msgstr "Buch editieren"
 
-#: bookwyrm/templates/book/book.html:45
+#: bookwyrm/templates/book/book.html:49
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "Cover hinzufügen"
 
-#: bookwyrm/templates/book/book.html:55
+#: bookwyrm/templates/book/book.html:59
 msgid "ISBN:"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:62
+#: bookwyrm/templates/book/book.html:66
 #: bookwyrm/templates/book/edit_book.html:211
 msgid "OCLC Number:"
 msgstr "OCLC Nummer:"
 
-#: bookwyrm/templates/book/book.html:69
+#: bookwyrm/templates/book/book.html:73
 #: bookwyrm/templates/book/edit_book.html:215
 msgid "ASIN:"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:79
-#, python-format
-msgid "%(format)s, %(pages)s pages"
-msgstr "%(format)s, %(pages)s Seiten"
-
-#: bookwyrm/templates/book/book.html:81
-#, python-format
-msgid "%(pages)s pages"
-msgstr "%(pages)s Seiten"
-
-#: bookwyrm/templates/book/book.html:86
-#, python-format
-msgid "Published %(date)s by %(publisher)s."
-msgstr "Am %(date)s von %(publisher)s veröffentlicht."
-
-#: bookwyrm/templates/book/book.html:88
-#, fuzzy, python-format
-#| msgid "Published date:"
-msgid "Published %(date)s"
-msgstr "Veröffentlichungsdatum:"
-
-#: bookwyrm/templates/book/book.html:90
-#, python-format
-msgid "Published by %(publisher)s."
-msgstr "Veröffentlicht von %(publisher)s."
-
-#: bookwyrm/templates/book/book.html:95
+#: bookwyrm/templates/book/book.html:82
 msgid "View on OpenLibrary"
 msgstr "In OpenLibrary ansehen"
 
-#: bookwyrm/templates/book/book.html:104
+#: bookwyrm/templates/book/book.html:91
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s Bewertung)"
 msgstr[1] "(%(review_count)s Bewertungen)"
 
-#: bookwyrm/templates/book/book.html:110
+#: bookwyrm/templates/book/book.html:97
 msgid "Add Description"
 msgstr "Beschreibung hinzufügen"
 
-#: bookwyrm/templates/book/book.html:117
+#: bookwyrm/templates/book/book.html:104
 #: bookwyrm/templates/book/edit_book.html:101
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: bookwyrm/templates/book/book.html:121
+#: bookwyrm/templates/book/book.html:108
 #: bookwyrm/templates/book/edit_book.html:225
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:68
+#: bookwyrm/templates/preferences/edit_user.html:70
 #: bookwyrm/templates/settings/site.html:93
-#: bookwyrm/templates/snippets/readthrough.html:64
+#: bookwyrm/templates/snippets/readthrough.html:65
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
 msgid "Save"
 msgstr "Speichern"
 
-#: bookwyrm/templates/book/book.html:122 bookwyrm/templates/book/book.html:171
+#: bookwyrm/templates/book/book.html:109 bookwyrm/templates/book/book.html:158
 #: bookwyrm/templates/book/cover_modal.html:32
 #: bookwyrm/templates/book/edit_book.html:226
 #: bookwyrm/templates/edit_author.html:79
 #: bookwyrm/templates/moderation/report_modal.html:32
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/readthrough.html:65
+#: bookwyrm/templates/snippets/readthrough.html:66
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
@@ -205,77 +199,77 @@ msgstr "Speichern"
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: bookwyrm/templates/book/book.html:131
+#: bookwyrm/templates/book/book.html:118
 #, fuzzy, python-format
 #| msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s\">%(title)s</a> von"
 
-#: bookwyrm/templates/book/book.html:139
+#: bookwyrm/templates/book/book.html:126
 #, fuzzy, python-format
 #| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/book/book.html:145
+#: bookwyrm/templates/book/book.html:132
 #, fuzzy, python-format
 #| msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr "hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> zu deiner Liste \"<a href=\"%(list_path)s\">%(list_name)s</a>\" Hinzugefügt"
 
-#: bookwyrm/templates/book/book.html:154
+#: bookwyrm/templates/book/book.html:141
 msgid "Your reading activity"
 msgstr "Deine Leseaktivität"
 
-#: bookwyrm/templates/book/book.html:156
+#: bookwyrm/templates/book/book.html:143
 msgid "Add read dates"
 msgstr "Lesedaten hinzufügen"
 
-#: bookwyrm/templates/book/book.html:161
+#: bookwyrm/templates/book/book.html:148
 msgid "You don't have any reading activity for this book."
 msgstr "Du hast keine Leseaktivität für dieses Buch."
 
-#: bookwyrm/templates/book/book.html:168
+#: bookwyrm/templates/book/book.html:155
 msgid "Create"
 msgstr "Erstellen"
 
-#: bookwyrm/templates/book/book.html:190
+#: bookwyrm/templates/book/book.html:177
 msgid "Tags"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:194
+#: bookwyrm/templates/book/book.html:181
 #: bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr "Tag hinzufügen"
 
-#: bookwyrm/templates/book/book.html:211
+#: bookwyrm/templates/book/book.html:198
 msgid "Subjects"
 msgstr "Themen"
 
-#: bookwyrm/templates/book/book.html:222
+#: bookwyrm/templates/book/book.html:209
 msgid "Places"
 msgstr "Orte"
 
-#: bookwyrm/templates/book/book.html:233 bookwyrm/templates/layout.html:64
-#: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
+#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listen"
 
-#: bookwyrm/templates/book/book.html:244
+#: bookwyrm/templates/book/book.html:231
 #, fuzzy
 #| msgid "Go to list"
 msgid "Add to list"
 msgstr "Zur Liste"
 
-#: bookwyrm/templates/book/book.html:254
+#: bookwyrm/templates/book/book.html:241
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:90
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: bookwyrm/templates/book/book.html:282
+#: bookwyrm/templates/book/book.html:269
 msgid "rated it"
 msgstr "bewertet"
 
@@ -424,7 +418,7 @@ msgid "John Doe, Jane Smith"
 msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:155
-#: bookwyrm/templates/snippets/shelf.html:9
+#: bookwyrm/templates/user/shelf.html:72
 msgid "Cover"
 msgstr ""
 
@@ -433,6 +427,7 @@ msgid "Physical Properties"
 msgstr "Physikalische Eigenschaften"
 
 #: bookwyrm/templates/book/edit_book.html:183
+#: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr ""
 
@@ -457,98 +452,102 @@ msgstr ""
 msgid "Openlibrary key:"
 msgstr ""
 
+#: bookwyrm/templates/book/editions.html:5
+#, python-format
+msgid "Editions of %(book_title)s"
+msgstr "Editionen von  %(book_title)s"
+
+#: bookwyrm/templates/book/editions.html:9
+#, python-format
+msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+msgstr "Editionen von <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+
+#: bookwyrm/templates/book/format_filter.html:8
+#: bookwyrm/templates/book/language_filter.html:8
+msgid "Any"
+msgstr ""
+
+#: bookwyrm/templates/book/language_filter.html:5
+msgid "Language:"
+msgstr ""
+
+#: bookwyrm/templates/book/publisher_info.html:6
+#, python-format
+msgid "%(format)s, %(pages)s pages"
+msgstr "%(format)s, %(pages)s Seiten"
+
+#: bookwyrm/templates/book/publisher_info.html:8
+#, python-format
+msgid "%(pages)s pages"
+msgstr "%(pages)s Seiten"
+
+#: bookwyrm/templates/book/publisher_info.html:13
+#, fuzzy, python-format
+#| msgid "%(pages)s pages"
+msgid "%(languages)s language"
+msgstr "%(pages)s Seiten"
+
+#: bookwyrm/templates/book/publisher_info.html:18
+#, python-format
+msgid "Published %(date)s by %(publisher)s."
+msgstr "Am %(date)s von %(publisher)s veröffentlicht."
+
+#: bookwyrm/templates/book/publisher_info.html:20
+#, fuzzy, python-format
+#| msgid "Published date:"
+msgid "Published %(date)s"
+msgstr "Veröffentlichungsdatum:"
+
+#: bookwyrm/templates/book/publisher_info.html:22
+#, python-format
+msgid "Published by %(publisher)s."
+msgstr "Veröffentlicht von %(publisher)s."
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/feed/feed_layout.html:57
 msgid "Close"
 msgstr "Schließen"
 
-#: bookwyrm/templates/directory.html:6 bookwyrm/templates/directory.html:11
-#: bookwyrm/templates/layout.html:97
-msgid "Directory"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:19
-msgid "Make your profile discoverable to other BookWyrm users."
-msgstr ""
-
-#: bookwyrm/templates/directory.html:26
-#, fuzzy, python-format
-#| msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
-msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
-msgstr "Du kannst dein Leseziel jederzeit auf deiner <a href=\"%(path)s\">Profilseite</a> setzen oder ändern."
-
-#: bookwyrm/templates/directory.html:31
-#: bookwyrm/templates/snippets/goal_card.html:22
-msgid "Dismiss message"
-msgstr "Nachricht verwerfen"
-
-#: bookwyrm/templates/directory.html:44
-#, fuzzy
-#| msgid "Show less"
-msgid "Show filters"
-msgstr "Weniger anzeigen"
-
-#: bookwyrm/templates/directory.html:46
-msgid "Hide filters"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:55
-#, fuzzy
-#| msgid "User Activity"
-msgid "User type"
-msgstr "Nutzer*innenaktivität"
-
-#: bookwyrm/templates/directory.html:58
-msgid "BookWyrm users"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:62
-msgid "All known users"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:68
+#: bookwyrm/templates/directory/community_filter.html:5
 #, fuzzy
 #| msgid "Comment"
 msgid "Community"
 msgstr "Kommentieren"
 
-#: bookwyrm/templates/directory.html:71
+#: bookwyrm/templates/directory/community_filter.html:8
 #, fuzzy
 #| msgid "Max uses"
 msgid "Local users"
 msgstr "Maximale Benutzungen"
 
-#: bookwyrm/templates/directory.html:75
+#: bookwyrm/templates/directory/community_filter.html:12
 #, fuzzy
 #| msgid "Federated"
 msgid "Federated community"
 msgstr "Föderiert"
 
-#: bookwyrm/templates/directory.html:81
-msgid "Order by"
+#: bookwyrm/templates/directory/directory.html:6
+#: bookwyrm/templates/directory/directory.html:11
+#: bookwyrm/templates/layout.html:97
+msgid "Directory"
 msgstr ""
 
-#: bookwyrm/templates/directory.html:84
-#, fuzzy
-#| msgid "Suggest"
-msgid "Suggested"
-msgstr "Vorschlagen"
-
-#: bookwyrm/templates/directory.html:85
-msgid "Recently active"
+#: bookwyrm/templates/directory/directory.html:19
+msgid "Make your profile discoverable to other BookWyrm users."
 msgstr ""
 
-#: bookwyrm/templates/directory.html:91
-msgid "Apply filters"
-msgstr ""
+#: bookwyrm/templates/directory/directory.html:26
+#, fuzzy, python-format
+#| msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
+msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
+msgstr "Du kannst dein Leseziel jederzeit auf deiner <a href=\"%(path)s\">Profilseite</a> setzen oder ändern."
 
-#: bookwyrm/templates/directory.html:94
-#, fuzzy
-#| msgid "Clear search"
-msgid "Clear filters"
-msgstr "Suche leeren"
+#: bookwyrm/templates/directory/directory.html:31
+#: bookwyrm/templates/snippets/goal_card.html:22
+msgid "Dismiss message"
+msgstr "Nachricht verwerfen"
 
-#: bookwyrm/templates/directory.html:128
+#: bookwyrm/templates/directory/directory.html:71
 #, fuzzy
 #| msgid "followed you"
 msgid "follower you follow"
@@ -556,7 +555,7 @@ msgid_plural "followers you follow"
 msgstr[0] "folgt dir"
 msgstr[1] "folgt dir"
 
-#: bookwyrm/templates/directory.html:135
+#: bookwyrm/templates/directory/directory.html:78
 #, fuzzy
 #| msgid "Your shelves"
 msgid "book on your shelves"
@@ -564,14 +563,42 @@ msgid_plural "books on your shelves"
 msgstr[0] "Deine Regale"
 msgstr[1] "Deine Regale"
 
-#: bookwyrm/templates/directory.html:143
+#: bookwyrm/templates/directory/directory.html:86
 msgid "posts"
 msgstr ""
 
-#: bookwyrm/templates/directory.html:149
+#: bookwyrm/templates/directory/directory.html:92
 msgid "last active"
 msgstr ""
 
+#: bookwyrm/templates/directory/sort_filter.html:5
+msgid "Order by"
+msgstr ""
+
+#: bookwyrm/templates/directory/sort_filter.html:8
+#, fuzzy
+#| msgid "Suggest"
+msgid "Suggested"
+msgstr "Vorschlagen"
+
+#: bookwyrm/templates/directory/sort_filter.html:9
+msgid "Recently active"
+msgstr ""
+
+#: bookwyrm/templates/directory/user_type_filter.html:5
+#, fuzzy
+#| msgid "User Activity"
+msgid "User type"
+msgstr "Nutzer*innenaktivität"
+
+#: bookwyrm/templates/directory/user_type_filter.html:8
+msgid "BookWyrm users"
+msgstr ""
+
+#: bookwyrm/templates/directory/user_type_filter.html:12
+msgid "All known users"
+msgstr ""
+
 #: bookwyrm/templates/discover/about.html:7
 #, python-format
 msgid "About %(site_name)s"
@@ -681,16 +708,6 @@ msgstr ""
 msgid "Goodreads key:"
 msgstr ""
 
-#: bookwyrm/templates/editions.html:5
-#, python-format
-msgid "Editions of %(book_title)s"
-msgstr "Editionen von  %(book_title)s"
-
-#: bookwyrm/templates/editions.html:9
-#, python-format
-msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
-msgstr "Editionen von <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
-
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
@@ -757,18 +774,6 @@ msgstr ""
 msgid "Reset your %(site_name)s password"
 msgstr "Ãœber %(site_name)s"
 
-#: bookwyrm/templates/error.html:4
-msgid "Oops!"
-msgstr "Ups!"
-
-#: bookwyrm/templates/error.html:8
-msgid "Server Error"
-msgstr ""
-
-#: bookwyrm/templates/error.html:9
-msgid "Something went wrong! Sorry about that."
-msgstr "Etwas lief schief. Entschuldigung!"
-
 #: bookwyrm/templates/feed/direct_messages.html:8
 #, python-format
 msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
@@ -845,6 +850,8 @@ msgid "Updates"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:11
+#: bookwyrm/templates/layout.html:58
+#: bookwyrm/templates/user/books_header.html:3
 msgid "Your books"
 msgstr "Deine Bücher"
 
@@ -853,14 +860,14 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr "Hier sind noch keine Bücher! Versuche nach Büchern zu suchen um loszulegen"
 
 #: bookwyrm/templates/feed/feed_layout.html:23
-#: bookwyrm/templates/user/shelf.html:24
+#: bookwyrm/templates/user/shelf.html:25
 #, fuzzy
 #| msgid "Read"
 msgid "To Read"
 msgstr "Auf der Leseliste"
 
 #: bookwyrm/templates/feed/feed_layout.html:24
-#: bookwyrm/templates/user/shelf.html:24
+#: bookwyrm/templates/user/shelf.html:25
 #, fuzzy
 #| msgid "Start reading"
 msgid "Currently Reading"
@@ -868,7 +875,7 @@ msgstr "Gerade lesend"
 
 #: bookwyrm/templates/feed/feed_layout.html:25
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-#: bookwyrm/templates/user/shelf.html:24
+#: bookwyrm/templates/user/shelf.html:25
 msgid "Read"
 msgstr "Gelesen"
 
@@ -913,27 +920,33 @@ msgstr "%(username)ss %(year)s Bücher"
 msgid "Import Books"
 msgstr "Bücher importieren"
 
-#: bookwyrm/templates/import.html:14
-msgid "Data source"
+#: bookwyrm/templates/import.html:16
+#, fuzzy
+#| msgid "Data source"
+msgid "Data source:"
 msgstr "Datenquelle"
 
-#: bookwyrm/templates/import.html:32
+#: bookwyrm/templates/import.html:29
+msgid "Data file:"
+msgstr ""
+
+#: bookwyrm/templates/import.html:37
 msgid "Include reviews"
 msgstr "Bewertungen importieren"
 
-#: bookwyrm/templates/import.html:37
+#: bookwyrm/templates/import.html:42
 msgid "Privacy setting for imported reviews:"
 msgstr "Datenschutzeinstellung für importierte Bewertungen"
 
-#: bookwyrm/templates/import.html:41
+#: bookwyrm/templates/import.html:48
 msgid "Import"
 msgstr "Importieren"
 
-#: bookwyrm/templates/import.html:46
+#: bookwyrm/templates/import.html:53
 msgid "Recent Imports"
 msgstr "Aktuelle Importe"
 
-#: bookwyrm/templates/import.html:48
+#: bookwyrm/templates/import.html:55
 msgid "No recent imports"
 msgstr "Keine aktuellen Importe"
 
@@ -990,12 +1003,12 @@ msgstr "Buch"
 
 #: bookwyrm/templates/import_status.html:115
 #: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/snippets/shelf.html:10
+#: bookwyrm/templates/user/shelf.html:73
 msgid "Title"
 msgstr "Titel"
 
 #: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/snippets/shelf.html:11
+#: bookwyrm/templates/user/shelf.html:74
 msgid "Author"
 msgstr "Autor*in"
 
@@ -1051,10 +1064,6 @@ msgstr "Suche"
 msgid "Main navigation menu"
 msgstr "Navigationshauptmenü"
 
-#: bookwyrm/templates/layout.html:58
-msgid "Your shelves"
-msgstr "Deine Regale"
-
 #: bookwyrm/templates/layout.html:61
 msgid "Feed"
 msgstr ""
@@ -1069,7 +1078,7 @@ msgid "Settings"
 msgstr "Einstellungen"
 
 #: bookwyrm/templates/layout.html:116
-#: bookwyrm/templates/settings/admin_layout.html:20
+#: bookwyrm/templates/settings/admin_layout.html:24
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
 #: bookwyrm/templates/settings/manage_invites.html:15
@@ -1131,7 +1140,7 @@ msgid "BookWyrm is open source software. You can contribute or report issues on
 msgstr "BookWyrm ist open source Software. Du kannst dich auf <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> beteiligen oder etwas melden."
 
 #: bookwyrm/templates/lists/create_form.html:5
-#: bookwyrm/templates/lists/lists.html:17
+#: bookwyrm/templates/lists/lists.html:19
 msgid "Create List"
 msgstr "Liste erstellen"
 
@@ -1197,7 +1206,7 @@ msgid "Anyone can suggest books, subject to your approval"
 msgstr "Alle können Bücher vorschlagen, du kannst diese bestätigen"
 
 #: bookwyrm/templates/lists/form.html:31
-#: bookwyrm/templates/moderation/reports.html:11
+#: bookwyrm/templates/moderation/reports.html:24
 msgid "Open"
 msgstr "Offen"
 
@@ -1216,6 +1225,7 @@ msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/lists/list.html:41
+#: bookwyrm/templates/snippets/shelf_selector.html:28
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -1252,20 +1262,6 @@ msgstr "Keine Bücher gefunden"
 msgid "Suggest"
 msgstr "Vorschlagen"
 
-#: bookwyrm/templates/lists/lists.html:14
-msgid "Your lists"
-msgstr "Deine Listen"
-
-#: bookwyrm/templates/lists/lists.html:32
-#, fuzzy, python-format
-#| msgid "See all %(size)s"
-msgid "See all %(size)s lists"
-msgstr "Alle %(size)s anzeigen"
-
-#: bookwyrm/templates/lists/lists.html:40
-msgid "Recent Lists"
-msgstr "Aktuelle Listen"
-
 #: bookwyrm/templates/login.html:4
 msgid "Login"
 msgstr ""
@@ -1379,27 +1375,37 @@ msgstr "Wiedereröffnen"
 msgid "Resolve"
 msgstr "Lösen"
 
-#: bookwyrm/templates/moderation/reports.html:4
-#: bookwyrm/templates/moderation/reports.html:5
-#: bookwyrm/templates/settings/admin_layout.html:24
+#: bookwyrm/templates/moderation/reports.html:6
+#, fuzzy, python-format
+#| msgid "Lists: %(username)s"
+msgid "Reports: %(server_name)s"
+msgstr "Listen: %(username)s"
+
+#: bookwyrm/templates/moderation/reports.html:8
+#: bookwyrm/templates/moderation/reports.html:16
+#: bookwyrm/templates/settings/admin_layout.html:28
 #, fuzzy
 #| msgid "Recent Imports"
 msgid "Reports"
 msgstr "Aktuelle Importe"
 
-#: bookwyrm/templates/moderation/reports.html:14
+#: bookwyrm/templates/moderation/reports.html:13
+#, fuzzy, python-format
+#| msgid "Lists: %(username)s"
+msgid "Reports: <small>%(server_name)s</small>"
+msgstr "Listen: %(username)s"
+
+#: bookwyrm/templates/moderation/reports.html:27
 #, fuzzy
 #| msgid "Shelved"
 msgid "Resolved"
 msgstr "Ins Regal gestellt"
 
-#: bookwyrm/templates/notfound.html:4 bookwyrm/templates/notfound.html:8
-msgid "Not Found"
-msgstr "Nicht gefunden"
-
-#: bookwyrm/templates/notfound.html:9
-msgid "The page you requested doesn't seem to exist!"
-msgstr "Die Seite die du angefordert hast scheint nicht zu existieren!"
+#: bookwyrm/templates/moderation/reports.html:34
+#, fuzzy
+#| msgid "No books found"
+msgid "No reports found."
+msgstr "Keine Bücher gefunden"
 
 #: bookwyrm/templates/notifications.html:14
 msgid "Delete notifications"
@@ -1631,51 +1637,129 @@ msgstr ""
 msgid "Manage Users"
 msgstr "Nutzer*innen verwalten"
 
-#: bookwyrm/templates/settings/admin_layout.html:28
-#: bookwyrm/templates/settings/federation.html:4
+#: bookwyrm/templates/settings/admin_layout.html:19
+#: bookwyrm/templates/settings/user_admin.html:3
+#: bookwyrm/templates/settings/user_admin.html:10
+msgid "Users"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/federation.html:3
+#: bookwyrm/templates/settings/federation.html:5
 msgid "Federated Servers"
 msgstr "Föderierende Server"
 
-#: bookwyrm/templates/settings/admin_layout.html:33
+#: bookwyrm/templates/settings/admin_layout.html:37
 msgid "Instance Settings"
 msgstr "Instanzeinstellungen"
 
-#: bookwyrm/templates/settings/admin_layout.html:37
+#: bookwyrm/templates/settings/admin_layout.html:41
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr "Seiteneinstellungen"
 
-#: bookwyrm/templates/settings/admin_layout.html:40
+#: bookwyrm/templates/settings/admin_layout.html:44
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr "Instanzinformationen"
 
-#: bookwyrm/templates/settings/admin_layout.html:41
+#: bookwyrm/templates/settings/admin_layout.html:45
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr "Bilder"
 
-#: bookwyrm/templates/settings/admin_layout.html:42
+#: bookwyrm/templates/settings/admin_layout.html:46
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr "Inhalt des Footers"
 
-#: bookwyrm/templates/settings/admin_layout.html:43
+#: bookwyrm/templates/settings/admin_layout.html:47
 #: bookwyrm/templates/settings/site.html:77
 msgid "Registration"
 msgstr "Registrierung"
 
-#: bookwyrm/templates/settings/federation.html:10
+#: bookwyrm/templates/settings/federated_server.html:7
+#, fuzzy
+#| msgid "Back to reports"
+msgid "Back to server list"
+msgstr "Zurück zu den Meldungen"
+
+#: bookwyrm/templates/settings/federated_server.html:12
+msgid "Details"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:15
+msgid "Software:"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:19
+#, fuzzy
+#| msgid "Description:"
+msgid "Version:"
+msgstr "Beschreibung:"
+
+#: bookwyrm/templates/settings/federated_server.html:23
+#, fuzzy
+#| msgid "Import Status"
+msgid "Status:"
+msgstr "Importstatus"
+
+#: bookwyrm/templates/settings/federated_server.html:30
+#: bookwyrm/templates/user/user_layout.html:50
+msgid "Activity"
+msgstr "Aktivität"
+
+#: bookwyrm/templates/settings/federated_server.html:33
+msgid "Users:"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:36
+#: bookwyrm/templates/settings/federated_server.html:43
+msgid "View all"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:40
+#, fuzzy
+#| msgid "Recent Imports"
+msgid "Reports:"
+msgstr "Aktuelle Importe"
+
+#: bookwyrm/templates/settings/federated_server.html:47
+#, fuzzy
+#| msgid "followed you"
+msgid "Followed by us:"
+msgstr "folgt dir"
+
+#: bookwyrm/templates/settings/federated_server.html:53
+#, fuzzy
+#| msgid "followed you"
+msgid "Followed by them:"
+msgstr "folgt dir"
+
+#: bookwyrm/templates/settings/federated_server.html:59
+#, fuzzy
+#| msgid "Blocked Users"
+msgid "Blocked by us:"
+msgstr "Blockierte Nutzer*innen"
+
+#: bookwyrm/templates/settings/federation.html:13
 msgid "Server name"
 msgstr "Servername"
 
-#: bookwyrm/templates/settings/federation.html:11
+#: bookwyrm/templates/settings/federation.html:17
+#, fuzzy
+#| msgid "Federated"
+msgid "Date federated"
+msgstr "Föderiert"
+
+#: bookwyrm/templates/settings/federation.html:21
 msgid "Software"
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:12
+#: bookwyrm/templates/settings/federation.html:24
 #: bookwyrm/templates/settings/manage_invite_requests.html:33
+#: bookwyrm/templates/settings/user_admin.html:32
 msgid "Status"
 msgstr ""
 
@@ -1846,6 +1930,47 @@ msgstr "Folgeanfragen"
 msgid "Registration closed text:"
 msgstr "Registrierungen geschlossen text"
 
+#: bookwyrm/templates/settings/user_admin.html:7
+#, python-format
+msgid "Users: <small>%(server_name)s</small>"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:20
+#, fuzzy
+#| msgid "username"
+msgid "Username"
+msgstr "Username"
+
+#: bookwyrm/templates/settings/user_admin.html:24
+#, fuzzy
+#| msgid "Added:"
+msgid "Date Added"
+msgstr "Hinzugefügt:"
+
+#: bookwyrm/templates/settings/user_admin.html:28
+msgid "Last Active"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:36
+#, fuzzy
+#| msgid "Remove"
+msgid "Remote server"
+msgstr "Entfernen"
+
+#: bookwyrm/templates/settings/user_admin.html:45
+#, fuzzy
+#| msgid "Activity"
+msgid "Active"
+msgstr "Aktivität"
+
+#: bookwyrm/templates/settings/user_admin.html:45
+msgid "Inactive"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:50
+msgid "Not set"
+msgstr ""
+
 #: bookwyrm/templates/snippets/block_button.html:5
 msgid "Block"
 msgstr ""
@@ -1906,7 +2031,7 @@ msgid "Review:"
 msgstr "Bewerten"
 
 #: bookwyrm/templates/snippets/create_status_form.html:29
-#: bookwyrm/templates/snippets/shelf.html:17
+#: bookwyrm/templates/user/shelf.html:78
 msgid "Rating"
 msgstr ""
 
@@ -1980,6 +2105,26 @@ msgstr "Status favorisieren"
 msgid "Un-like status"
 msgstr "Favorisieren zurücknehmen"
 
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:7
+#, fuzzy
+#| msgid "Show less"
+msgid "Show filters"
+msgstr "Weniger anzeigen"
+
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:9
+msgid "Hide filters"
+msgstr ""
+
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:19
+msgid "Apply filters"
+msgstr ""
+
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:23
+#, fuzzy
+#| msgid "Clear search"
+msgid "Clear filters"
+msgstr "Suche leeren"
+
 #: bookwyrm/templates/snippets/follow_button.html:12
 msgid "Follow"
 msgstr "Folgen"
@@ -2113,32 +2258,32 @@ msgstr "Raten"
 msgid "Rate"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:7
+#: bookwyrm/templates/snippets/readthrough.html:8
 msgid "Progress Updates:"
 msgstr "Fortschrittsupdates:"
 
-#: bookwyrm/templates/snippets/readthrough.html:11
+#: bookwyrm/templates/snippets/readthrough.html:12
 msgid "finished"
 msgstr "Abgeschlossen"
 
-#: bookwyrm/templates/snippets/readthrough.html:14
+#: bookwyrm/templates/snippets/readthrough.html:15
 msgid "Show all updates"
 msgstr "Zeige alle Updates"
 
-#: bookwyrm/templates/snippets/readthrough.html:30
+#: bookwyrm/templates/snippets/readthrough.html:31
 msgid "Delete this progress update"
 msgstr "Dieses Fortschrittsupdate löschen"
 
-#: bookwyrm/templates/snippets/readthrough.html:40
+#: bookwyrm/templates/snippets/readthrough.html:41
 msgid "started"
 msgstr "Angefangen"
 
-#: bookwyrm/templates/snippets/readthrough.html:46
-#: bookwyrm/templates/snippets/readthrough.html:60
+#: bookwyrm/templates/snippets/readthrough.html:47
+#: bookwyrm/templates/snippets/readthrough.html:61
 msgid "Edit read dates"
 msgstr "Lesedaten bearbeiten"
 
-#: bookwyrm/templates/snippets/readthrough.html:50
+#: bookwyrm/templates/snippets/readthrough.html:51
 msgid "Delete these read dates"
 msgstr "Diese Lesedaten löschen"
 
@@ -2202,45 +2347,11 @@ msgstr "von %(author)s"
 msgid "Import book"
 msgstr "Buch importieren"
 
-#: bookwyrm/templates/snippets/shelf.html:12
-msgid "Published"
-msgstr "Veröffentlicht"
-
-#: bookwyrm/templates/snippets/shelf.html:13
-msgid "Shelved"
-msgstr "Ins Regal gestellt"
-
-#: bookwyrm/templates/snippets/shelf.html:14
-msgid "Started"
-msgstr "Gestartet"
-
-#: bookwyrm/templates/snippets/shelf.html:15
-msgid "Finished"
-msgstr "Abgeschlossen"
-
-#: bookwyrm/templates/snippets/shelf.html:16
-msgid "External links"
-msgstr "Eterne Links"
-
-#: bookwyrm/templates/snippets/shelf.html:44
-msgid "OpenLibrary"
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelf.html:61
-msgid "This shelf is empty."
-msgstr "Dieses Regal ist leer."
-
-#: bookwyrm/templates/snippets/shelf.html:67
-msgid "Delete shelf"
-msgstr "Regal löschen"
-
 #: bookwyrm/templates/snippets/shelf_selector.html:4
-msgid "Change shelf"
-msgstr "Regal wechseln"
-
-#: bookwyrm/templates/snippets/shelf_selector.html:27
-msgid "Unshelve"
-msgstr "Vom Regal nehmen"
+#, fuzzy
+#| msgid "Your books"
+msgid "Move book"
+msgstr "Deine Bücher"
 
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
 #, python-format
@@ -2248,7 +2359,7 @@ msgid "Finish \"<em>%(book_title)s</em>\""
 msgstr "\"<em>%(book_title)s</em>\" abschließen"
 
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:33
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:35
 #, fuzzy
 #| msgid "Progress"
 msgid "Update progress"
@@ -2271,6 +2382,12 @@ msgstr "Lesen abschließen"
 msgid "Want to read"
 msgstr "Auf Leseliste setzen"
 
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:48
+#, fuzzy, python-format
+#| msgid "Lists: %(username)s"
+msgid "Remove from %(name)s"
+msgstr "Listen: %(username)s"
+
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
 #, python-format
 msgid "Start \"<em>%(book_title)s</em>\""
@@ -2343,6 +2460,18 @@ msgstr "Mehr Optionen"
 msgid "Switch to this edition"
 msgstr "Zu dieser Edition wechseln"
 
+#: bookwyrm/templates/snippets/table-sort-header.html:6
+#, fuzzy
+#| msgid "Started reading"
+msgid "Sorted asccending"
+msgstr "Zu lesen angefangen"
+
+#: bookwyrm/templates/snippets/table-sort-header.html:10
+#, fuzzy
+#| msgid "Started reading"
+msgid "Sorted descending"
+msgstr "Zu lesen angefangen"
+
 #: bookwyrm/templates/snippets/tag.html:14
 msgid "Remove tag"
 msgstr "Tag entfernen"
@@ -2352,6 +2481,12 @@ msgstr "Tag entfernen"
 msgid "Books tagged \"%(tag.name)s\""
 msgstr "Mit \"%(tag.name)s\" markierte Bücher"
 
+#: bookwyrm/templates/user/books_header.html:5
+#, fuzzy, python-format
+#| msgid "%(username)s's %(year)s Books"
+msgid "%(username)s's books"
+msgstr "%(username)ss %(year)s Bücher"
+
 #: bookwyrm/templates/user/create_shelf_form.html:5
 #: bookwyrm/templates/user/create_shelf_form.html:22
 msgid "Create Shelf"
@@ -2397,56 +2532,62 @@ msgstr "Listen: %(username)s"
 msgid "Create list"
 msgstr "Liste Erstellen"
 
-#: bookwyrm/templates/user/shelf.html:9
-msgid "Your Shelves"
-msgstr "Deine Regale"
-
-#: bookwyrm/templates/user/shelf.html:11
-#, python-format
-msgid "%(username)s: Shelves"
-msgstr "%(username)s: Regale"
-
-#: bookwyrm/templates/user/shelf.html:33
+#: bookwyrm/templates/user/shelf.html:34
 msgid "Create shelf"
 msgstr "Regal erstellen"
 
-#: bookwyrm/templates/user/shelf.html:54
+#: bookwyrm/templates/user/shelf.html:55
 msgid "Edit shelf"
 msgstr "Regal bearbeiten"
 
+#: bookwyrm/templates/user/shelf.html:75
+msgid "Shelved"
+msgstr "Ins Regal gestellt"
+
+#: bookwyrm/templates/user/shelf.html:76
+msgid "Started"
+msgstr "Gestartet"
+
+#: bookwyrm/templates/user/shelf.html:77
+msgid "Finished"
+msgstr "Abgeschlossen"
+
+#: bookwyrm/templates/user/shelf.html:121
+msgid "This shelf is empty."
+msgstr "Dieses Regal ist leer."
+
+#: bookwyrm/templates/user/shelf.html:127
+msgid "Delete shelf"
+msgstr "Regal löschen"
+
 #: bookwyrm/templates/user/user.html:15
 msgid "Edit profile"
 msgstr "Profil bearbeiten"
 
-#: bookwyrm/templates/user/user.html:26
-#: bookwyrm/templates/user/user_layout.html:68
-msgid "Shelves"
-msgstr "Regale"
-
-#: bookwyrm/templates/user/user.html:31
-#, python-format
-msgid "See all %(size)s"
+#: bookwyrm/templates/user/user.html:33
+#, fuzzy, python-format
+#| msgid "See all %(size)s"
+msgid "View all %(size)s"
 msgstr "Alle %(size)s anzeigen"
 
-#: bookwyrm/templates/user/user.html:44
-#, python-format
-msgid "See all %(shelf_count)s shelves"
-msgstr "Alle %(shelf_count)s Regale anzeigen"
+#: bookwyrm/templates/user/user.html:46
+msgid "View all books"
+msgstr ""
 
-#: bookwyrm/templates/user/user.html:56
+#: bookwyrm/templates/user/user.html:58
 #, python-format
 msgid "Set a reading goal for %(year)s"
 msgstr "Leseziel für %(year)s setzen"
 
-#: bookwyrm/templates/user/user.html:62
+#: bookwyrm/templates/user/user.html:64
 msgid "User Activity"
 msgstr "Nutzer*innenaktivität"
 
-#: bookwyrm/templates/user/user.html:65
+#: bookwyrm/templates/user/user.html:67
 msgid "RSS feed"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:76
+#: bookwyrm/templates/user/user.html:78
 msgid "No activities yet!"
 msgstr "Noch keine Aktivitäten!"
 
@@ -2454,14 +2595,16 @@ msgstr "Noch keine Aktivitäten!"
 msgid "Follow Requests"
 msgstr "Folgeanfragen"
 
-#: bookwyrm/templates/user/user_layout.html:50
-msgid "Activity"
-msgstr "Aktivität"
-
 #: bookwyrm/templates/user/user_layout.html:56
 msgid "Reading Goal"
 msgstr "Leseziel"
 
+#: bookwyrm/templates/user/user_layout.html:68
+#, fuzzy
+#| msgid "Book"
+msgid "Books"
+msgstr "Buch"
+
 #: bookwyrm/templates/user/user_preview.html:13
 #, python-format
 msgid "Joined %(date)s"
@@ -2490,6 +2633,46 @@ msgstr "Dieser Benutzename ist bereits vergeben."
 msgid "A password reset link sent to %s"
 msgstr ""
 
+#~ msgid "Your shelves"
+#~ msgstr "Deine Regale"
+
+#~ msgid "Your lists"
+#~ msgstr "Deine Listen"
+
+#, fuzzy, python-format
+#~| msgid "See all %(size)s"
+#~ msgid "See all %(size)s lists"
+#~ msgstr "Alle %(size)s anzeigen"
+
+#~ msgid "Recent Lists"
+#~ msgstr "Aktuelle Listen"
+
+#~ msgid "Published"
+#~ msgstr "Veröffentlicht"
+
+#~ msgid "External links"
+#~ msgstr "Eterne Links"
+
+#~ msgid "Change shelf"
+#~ msgstr "Regal wechseln"
+
+#~ msgid "Unshelve"
+#~ msgstr "Vom Regal nehmen"
+
+#~ msgid "Your Shelves"
+#~ msgstr "Deine Regale"
+
+#, python-format
+#~ msgid "%(username)s: Shelves"
+#~ msgstr "%(username)s: Regale"
+
+#~ msgid "Shelves"
+#~ msgstr "Regale"
+
+#, python-format
+#~ msgid "See all %(shelf_count)s shelves"
+#~ msgstr "Alle %(shelf_count)s Regale anzeigen"
+
 #~ msgid "Send follow request"
 #~ msgstr "Folgeanfrage senden"
 
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index e6256a7f..190a5b1a 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-28 22:42+0000\n"
+"POT-Creation-Date: 2021-03-31 09:22-0700\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"
@@ -47,44 +47,64 @@ msgstr ""
 msgid "Unlimited"
 msgstr ""
 
-#: bookwyrm/models/fields.py:25
+#: bookwyrm/models/fields.py:24
 #, python-format
 msgid "%(value)s is not a valid remote_id"
 msgstr ""
 
-#: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:47
+#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
 #, python-format
 msgid "%(value)s is not a valid username"
 msgstr ""
 
-#: bookwyrm/models/fields.py:170 bookwyrm/templates/layout.html:157
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:157
 msgid "username"
 msgstr ""
 
-#: bookwyrm/models/fields.py:175
+#: bookwyrm/models/fields.py:170
 msgid "A user with that username already exists."
 msgstr ""
 
-#: bookwyrm/settings.py:148
+#: bookwyrm/settings.py:150
 msgid "English"
 msgstr ""
 
-#: bookwyrm/settings.py:149
+#: bookwyrm/settings.py:151
 msgid "German"
 msgstr ""
 
-#: bookwyrm/settings.py:150
+#: bookwyrm/settings.py:152
 msgid "Spanish"
 msgstr ""
 
-#: bookwyrm/settings.py:151
+#: bookwyrm/settings.py:153
 msgid "French"
 msgstr ""
 
-#: bookwyrm/settings.py:152
+#: bookwyrm/settings.py:154
 msgid "Simplified Chinese"
 msgstr ""
 
+#: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8
+msgid "Not Found"
+msgstr ""
+
+#: bookwyrm/templates/404.html:9
+msgid "The page you requested doesn't seem to exist!"
+msgstr ""
+
+#: bookwyrm/templates/500.html:4
+msgid "Oops!"
+msgstr ""
+
+#: bookwyrm/templates/500.html:8
+msgid "Server Error"
+msgstr ""
+
+#: bookwyrm/templates/500.html:9
+msgid "Something went wrong! Sorry about that."
+msgstr ""
+
 #: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
 msgid "Edit Author"
 msgstr ""
@@ -108,91 +128,66 @@ msgstr ""
 msgid "Edit Book"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:45
+#: bookwyrm/templates/book/book.html:49
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:55
+#: bookwyrm/templates/book/book.html:59
 msgid "ISBN:"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:62
+#: bookwyrm/templates/book/book.html:66
 #: bookwyrm/templates/book/edit_book.html:211
 msgid "OCLC Number:"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:69
+#: bookwyrm/templates/book/book.html:73
 #: bookwyrm/templates/book/edit_book.html:215
 msgid "ASIN:"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:79
-#, python-format
-msgid "%(format)s, %(pages)s pages"
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:81
-#, python-format
-msgid "%(pages)s pages"
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:86
-#, python-format
-msgid "Published %(date)s by %(publisher)s."
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:88
-#, python-format
-msgid "Published %(date)s"
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:90
-#, python-format
-msgid "Published by %(publisher)s."
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:95
+#: bookwyrm/templates/book/book.html:82
 msgid "View on OpenLibrary"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:104
+#: bookwyrm/templates/book/book.html:91
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/book/book.html:110
+#: bookwyrm/templates/book/book.html:97
 msgid "Add Description"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:117
+#: bookwyrm/templates/book/book.html:104
 #: bookwyrm/templates/book/edit_book.html:101
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:121
+#: bookwyrm/templates/book/book.html:108
 #: bookwyrm/templates/book/edit_book.html:225
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:68
+#: bookwyrm/templates/preferences/edit_user.html:70
 #: bookwyrm/templates/settings/site.html:93
-#: bookwyrm/templates/snippets/readthrough.html:64
+#: bookwyrm/templates/snippets/readthrough.html:65
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
 msgid "Save"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:122 bookwyrm/templates/book/book.html:171
+#: bookwyrm/templates/book/book.html:109 bookwyrm/templates/book/book.html:158
 #: bookwyrm/templates/book/cover_modal.html:32
 #: bookwyrm/templates/book/edit_book.html:226
 #: bookwyrm/templates/edit_author.html:79
 #: bookwyrm/templates/moderation/report_modal.html:32
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/readthrough.html:65
+#: bookwyrm/templates/snippets/readthrough.html:66
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
@@ -200,72 +195,72 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:131
+#: bookwyrm/templates/book/book.html:118
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:139
+#: bookwyrm/templates/book/book.html:126
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:145
+#: bookwyrm/templates/book/book.html:132
 #, python-format
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:154
+#: bookwyrm/templates/book/book.html:141
 msgid "Your reading activity"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:156
+#: bookwyrm/templates/book/book.html:143
 msgid "Add read dates"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:161
+#: bookwyrm/templates/book/book.html:148
 msgid "You don't have any reading activity for this book."
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:168
+#: bookwyrm/templates/book/book.html:155
 msgid "Create"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:190
+#: bookwyrm/templates/book/book.html:177
 msgid "Tags"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:194
+#: bookwyrm/templates/book/book.html:181
 #: bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:211
+#: bookwyrm/templates/book/book.html:198
 msgid "Subjects"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:222
+#: bookwyrm/templates/book/book.html:209
 msgid "Places"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:233 bookwyrm/templates/layout.html:64
-#: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
+#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:244
+#: bookwyrm/templates/book/book.html:231
 msgid "Add to list"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:254
+#: bookwyrm/templates/book/book.html:241
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:90
 msgid "Add"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:282
+#: bookwyrm/templates/book/book.html:269
 msgid "rated it"
 msgstr ""
 
@@ -401,7 +396,7 @@ msgid "John Doe, Jane Smith"
 msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:155
-#: bookwyrm/templates/snippets/shelf.html:9
+#: bookwyrm/templates/user/shelf.html:72
 msgid "Cover"
 msgstr ""
 
@@ -410,6 +405,7 @@ msgid "Physical Properties"
 msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:183
+#: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr ""
 
@@ -434,102 +430,136 @@ msgstr ""
 msgid "Openlibrary key:"
 msgstr ""
 
+#: bookwyrm/templates/book/editions.html:5
+#, python-format
+msgid "Editions of %(book_title)s"
+msgstr ""
+
+#: bookwyrm/templates/book/editions.html:9
+#, python-format
+msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+msgstr ""
+
+#: bookwyrm/templates/book/format_filter.html:8
+#: bookwyrm/templates/book/language_filter.html:8
+msgid "Any"
+msgstr ""
+
+#: bookwyrm/templates/book/language_filter.html:5
+msgid "Language:"
+msgstr ""
+
+#: bookwyrm/templates/book/publisher_info.html:6
+#, python-format
+msgid "%(format)s, %(pages)s pages"
+msgstr ""
+
+#: bookwyrm/templates/book/publisher_info.html:8
+#, python-format
+msgid "%(pages)s pages"
+msgstr ""
+
+#: bookwyrm/templates/book/publisher_info.html:13
+#, python-format
+msgid "%(languages)s language"
+msgstr ""
+
+#: bookwyrm/templates/book/publisher_info.html:18
+#, python-format
+msgid "Published %(date)s by %(publisher)s."
+msgstr ""
+
+#: bookwyrm/templates/book/publisher_info.html:20
+#, python-format
+msgid "Published %(date)s"
+msgstr ""
+
+#: bookwyrm/templates/book/publisher_info.html:22
+#, python-format
+msgid "Published by %(publisher)s."
+msgstr ""
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/feed/feed_layout.html:57
 msgid "Close"
 msgstr ""
 
-#: bookwyrm/templates/directory.html:6 bookwyrm/templates/directory.html:11
+#: bookwyrm/templates/directory/community_filter.html:5
+msgid "Community"
+msgstr ""
+
+#: bookwyrm/templates/directory/community_filter.html:8
+msgid "Local users"
+msgstr ""
+
+#: bookwyrm/templates/directory/community_filter.html:12
+msgid "Federated community"
+msgstr ""
+
+#: bookwyrm/templates/directory/directory.html:6
+#: bookwyrm/templates/directory/directory.html:11
 #: bookwyrm/templates/layout.html:97
 msgid "Directory"
 msgstr ""
 
-#: bookwyrm/templates/directory.html:19
+#: bookwyrm/templates/directory/directory.html:19
 msgid "Make your profile discoverable to other BookWyrm users."
 msgstr ""
 
-#: bookwyrm/templates/directory.html:26
+#: bookwyrm/templates/directory/directory.html:26
 #, python-format
 msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
 msgstr ""
 
-#: bookwyrm/templates/directory.html:31
+#: bookwyrm/templates/directory/directory.html:31
 #: bookwyrm/templates/snippets/goal_card.html:22
 msgid "Dismiss message"
 msgstr ""
 
-#: bookwyrm/templates/directory.html:44
-msgid "Show filters"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:46
-msgid "Hide filters"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:55
-msgid "User type"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:58
-msgid "BookWyrm users"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:62
-msgid "All known users"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:68
-msgid "Community"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:71
-msgid "Local users"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:75
-msgid "Federated community"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:81
-msgid "Order by"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:84
-msgid "Suggested"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:85
-msgid "Recently active"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:91
-msgid "Apply filters"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:94
-msgid "Clear filters"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:128
+#: bookwyrm/templates/directory/directory.html:71
 msgid "follower you follow"
 msgid_plural "followers you follow"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/directory.html:135
+#: bookwyrm/templates/directory/directory.html:78
 msgid "book on your shelves"
 msgid_plural "books on your shelves"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/directory.html:143
+#: bookwyrm/templates/directory/directory.html:86
 msgid "posts"
 msgstr ""
 
-#: bookwyrm/templates/directory.html:149
+#: bookwyrm/templates/directory/directory.html:92
 msgid "last active"
 msgstr ""
 
+#: bookwyrm/templates/directory/sort_filter.html:5
+msgid "Order by"
+msgstr ""
+
+#: bookwyrm/templates/directory/sort_filter.html:8
+msgid "Suggested"
+msgstr ""
+
+#: bookwyrm/templates/directory/sort_filter.html:9
+msgid "Recently active"
+msgstr ""
+
+#: bookwyrm/templates/directory/user_type_filter.html:5
+msgid "User type"
+msgstr ""
+
+#: bookwyrm/templates/directory/user_type_filter.html:8
+msgid "BookWyrm users"
+msgstr ""
+
+#: bookwyrm/templates/directory/user_type_filter.html:12
+msgid "All known users"
+msgstr ""
+
 #: bookwyrm/templates/discover/about.html:7
 #, python-format
 msgid "About %(site_name)s"
@@ -637,16 +667,6 @@ msgstr ""
 msgid "Goodreads key:"
 msgstr ""
 
-#: bookwyrm/templates/editions.html:5
-#, python-format
-msgid "Editions of %(book_title)s"
-msgstr ""
-
-#: bookwyrm/templates/editions.html:9
-#, python-format
-msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
-msgstr ""
-
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
@@ -709,18 +729,6 @@ msgstr ""
 msgid "Reset your %(site_name)s password"
 msgstr ""
 
-#: bookwyrm/templates/error.html:4
-msgid "Oops!"
-msgstr ""
-
-#: bookwyrm/templates/error.html:8
-msgid "Server Error"
-msgstr ""
-
-#: bookwyrm/templates/error.html:9
-msgid "Something went wrong! Sorry about that."
-msgstr ""
-
 #: bookwyrm/templates/feed/direct_messages.html:8
 #, python-format
 msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
@@ -795,6 +803,8 @@ msgid "Updates"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:11
+#: bookwyrm/templates/layout.html:58
+#: bookwyrm/templates/user/books_header.html:3
 msgid "Your books"
 msgstr ""
 
@@ -803,18 +813,18 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:23
-#: bookwyrm/templates/user/shelf.html:24
+#: bookwyrm/templates/user/shelf.html:25
 msgid "To Read"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:24
-#: bookwyrm/templates/user/shelf.html:24
+#: bookwyrm/templates/user/shelf.html:25
 msgid "Currently Reading"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:25
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-#: bookwyrm/templates/user/shelf.html:24
+#: bookwyrm/templates/user/shelf.html:25
 msgid "Read"
 msgstr ""
 
@@ -859,27 +869,31 @@ msgstr ""
 msgid "Import Books"
 msgstr ""
 
-#: bookwyrm/templates/import.html:14
-msgid "Data source"
+#: bookwyrm/templates/import.html:16
+msgid "Data source:"
 msgstr ""
 
-#: bookwyrm/templates/import.html:32
-msgid "Include reviews"
+#: bookwyrm/templates/import.html:29
+msgid "Data file:"
 msgstr ""
 
 #: bookwyrm/templates/import.html:37
+msgid "Include reviews"
+msgstr ""
+
+#: bookwyrm/templates/import.html:42
 msgid "Privacy setting for imported reviews:"
 msgstr ""
 
-#: bookwyrm/templates/import.html:41
+#: bookwyrm/templates/import.html:48
 msgid "Import"
 msgstr ""
 
-#: bookwyrm/templates/import.html:46
+#: bookwyrm/templates/import.html:53
 msgid "Recent Imports"
 msgstr ""
 
-#: bookwyrm/templates/import.html:48
+#: bookwyrm/templates/import.html:55
 msgid "No recent imports"
 msgstr ""
 
@@ -936,12 +950,12 @@ msgstr ""
 
 #: bookwyrm/templates/import_status.html:115
 #: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/snippets/shelf.html:10
+#: bookwyrm/templates/user/shelf.html:73
 msgid "Title"
 msgstr ""
 
 #: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/snippets/shelf.html:11
+#: bookwyrm/templates/user/shelf.html:74
 msgid "Author"
 msgstr ""
 
@@ -997,10 +1011,6 @@ msgstr ""
 msgid "Main navigation menu"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:58
-msgid "Your shelves"
-msgstr ""
-
 #: bookwyrm/templates/layout.html:61
 msgid "Feed"
 msgstr ""
@@ -1015,7 +1025,7 @@ msgid "Settings"
 msgstr ""
 
 #: bookwyrm/templates/layout.html:116
-#: bookwyrm/templates/settings/admin_layout.html:20
+#: bookwyrm/templates/settings/admin_layout.html:24
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
 #: bookwyrm/templates/settings/manage_invites.html:15
@@ -1077,7 +1087,7 @@ msgid "BookWyrm is open source software. You can contribute or report issues on
 msgstr ""
 
 #: bookwyrm/templates/lists/create_form.html:5
-#: bookwyrm/templates/lists/lists.html:17
+#: bookwyrm/templates/lists/lists.html:19
 msgid "Create List"
 msgstr ""
 
@@ -1141,7 +1151,7 @@ msgid "Anyone can suggest books, subject to your approval"
 msgstr ""
 
 #: bookwyrm/templates/lists/form.html:31
-#: bookwyrm/templates/moderation/reports.html:11
+#: bookwyrm/templates/moderation/reports.html:24
 msgid "Open"
 msgstr ""
 
@@ -1159,6 +1169,7 @@ msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr ""
 
 #: bookwyrm/templates/lists/list.html:41
+#: bookwyrm/templates/snippets/shelf_selector.html:28
 msgid "Remove"
 msgstr ""
 
@@ -1195,19 +1206,6 @@ msgstr ""
 msgid "Suggest"
 msgstr ""
 
-#: bookwyrm/templates/lists/lists.html:14
-msgid "Your lists"
-msgstr ""
-
-#: bookwyrm/templates/lists/lists.html:32
-#, python-format
-msgid "See all %(size)s lists"
-msgstr ""
-
-#: bookwyrm/templates/lists/lists.html:40
-msgid "Recent Lists"
-msgstr ""
-
 #: bookwyrm/templates/login.html:4
 msgid "Login"
 msgstr ""
@@ -1311,22 +1309,28 @@ msgstr ""
 msgid "Resolve"
 msgstr ""
 
-#: bookwyrm/templates/moderation/reports.html:4
-#: bookwyrm/templates/moderation/reports.html:5
-#: bookwyrm/templates/settings/admin_layout.html:24
+#: bookwyrm/templates/moderation/reports.html:6
+#, python-format
+msgid "Reports: %(server_name)s"
+msgstr ""
+
+#: bookwyrm/templates/moderation/reports.html:8
+#: bookwyrm/templates/moderation/reports.html:16
+#: bookwyrm/templates/settings/admin_layout.html:28
 msgid "Reports"
 msgstr ""
 
-#: bookwyrm/templates/moderation/reports.html:14
+#: bookwyrm/templates/moderation/reports.html:13
+#, python-format
+msgid "Reports: <small>%(server_name)s</small>"
+msgstr ""
+
+#: bookwyrm/templates/moderation/reports.html:27
 msgid "Resolved"
 msgstr ""
 
-#: bookwyrm/templates/notfound.html:4 bookwyrm/templates/notfound.html:8
-msgid "Not Found"
-msgstr ""
-
-#: bookwyrm/templates/notfound.html:9
-msgid "The page you requested doesn't seem to exist!"
+#: bookwyrm/templates/moderation/reports.html:34
+msgid "No reports found."
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:14
@@ -1559,51 +1563,113 @@ msgstr ""
 msgid "Manage Users"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:28
-#: bookwyrm/templates/settings/federation.html:4
+#: bookwyrm/templates/settings/admin_layout.html:19
+#: bookwyrm/templates/settings/user_admin.html:3
+#: bookwyrm/templates/settings/user_admin.html:10
+msgid "Users"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/federation.html:3
+#: bookwyrm/templates/settings/federation.html:5
 msgid "Federated Servers"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:33
+#: bookwyrm/templates/settings/admin_layout.html:37
 msgid "Instance Settings"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:37
+#: bookwyrm/templates/settings/admin_layout.html:41
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:40
+#: bookwyrm/templates/settings/admin_layout.html:44
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:41
+#: bookwyrm/templates/settings/admin_layout.html:45
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:42
+#: bookwyrm/templates/settings/admin_layout.html:46
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:43
+#: bookwyrm/templates/settings/admin_layout.html:47
 #: bookwyrm/templates/settings/site.html:77
 msgid "Registration"
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:10
+#: bookwyrm/templates/settings/federated_server.html:7
+msgid "Back to server list"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:12
+msgid "Details"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:15
+msgid "Software:"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:19
+msgid "Version:"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:23
+msgid "Status:"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:30
+#: bookwyrm/templates/user/user_layout.html:50
+msgid "Activity"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:33
+msgid "Users:"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:36
+#: bookwyrm/templates/settings/federated_server.html:43
+msgid "View all"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:40
+msgid "Reports:"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:47
+msgid "Followed by us:"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:53
+msgid "Followed by them:"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:59
+msgid "Blocked by us:"
+msgstr ""
+
+#: bookwyrm/templates/settings/federation.html:13
 msgid "Server name"
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:11
+#: bookwyrm/templates/settings/federation.html:17
+msgid "Date federated"
+msgstr ""
+
+#: bookwyrm/templates/settings/federation.html:21
 msgid "Software"
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:12
+#: bookwyrm/templates/settings/federation.html:24
 #: bookwyrm/templates/settings/manage_invite_requests.html:33
+#: bookwyrm/templates/settings/user_admin.html:32
 msgid "Status"
 msgstr ""
 
@@ -1762,6 +1828,39 @@ msgstr ""
 msgid "Registration closed text:"
 msgstr ""
 
+#: bookwyrm/templates/settings/user_admin.html:7
+#, python-format
+msgid "Users: <small>%(server_name)s</small>"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:20
+msgid "Username"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:24
+msgid "Date Added"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:28
+msgid "Last Active"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:36
+msgid "Remote server"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:45
+msgid "Active"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:45
+msgid "Inactive"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:50
+msgid "Not set"
+msgstr ""
+
 #: bookwyrm/templates/snippets/block_button.html:5
 msgid "Block"
 msgstr ""
@@ -1816,7 +1915,7 @@ msgid "Review:"
 msgstr ""
 
 #: bookwyrm/templates/snippets/create_status_form.html:29
-#: bookwyrm/templates/snippets/shelf.html:17
+#: bookwyrm/templates/user/shelf.html:78
 msgid "Rating"
 msgstr ""
 
@@ -1890,6 +1989,22 @@ msgstr ""
 msgid "Un-like status"
 msgstr ""
 
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:7
+msgid "Show filters"
+msgstr ""
+
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:9
+msgid "Hide filters"
+msgstr ""
+
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:19
+msgid "Apply filters"
+msgstr ""
+
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:23
+msgid "Clear filters"
+msgstr ""
+
 #: bookwyrm/templates/snippets/follow_button.html:12
 msgid "Follow"
 msgstr ""
@@ -2020,32 +2135,32 @@ msgstr ""
 msgid "Rate"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:7
+#: bookwyrm/templates/snippets/readthrough.html:8
 msgid "Progress Updates:"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:11
+#: bookwyrm/templates/snippets/readthrough.html:12
 msgid "finished"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:14
+#: bookwyrm/templates/snippets/readthrough.html:15
 msgid "Show all updates"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:30
+#: bookwyrm/templates/snippets/readthrough.html:31
 msgid "Delete this progress update"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:40
+#: bookwyrm/templates/snippets/readthrough.html:41
 msgid "started"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:46
-#: bookwyrm/templates/snippets/readthrough.html:60
+#: bookwyrm/templates/snippets/readthrough.html:47
+#: bookwyrm/templates/snippets/readthrough.html:61
 msgid "Edit read dates"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:50
+#: bookwyrm/templates/snippets/readthrough.html:51
 msgid "Delete these read dates"
 msgstr ""
 
@@ -2105,44 +2220,8 @@ msgstr ""
 msgid "Import book"
 msgstr ""
 
-#: bookwyrm/templates/snippets/shelf.html:12
-msgid "Published"
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelf.html:13
-msgid "Shelved"
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelf.html:14
-msgid "Started"
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelf.html:15
-msgid "Finished"
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelf.html:16
-msgid "External links"
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelf.html:44
-msgid "OpenLibrary"
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelf.html:61
-msgid "This shelf is empty."
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelf.html:67
-msgid "Delete shelf"
-msgstr ""
-
 #: bookwyrm/templates/snippets/shelf_selector.html:4
-msgid "Change shelf"
-msgstr ""
-
-#: bookwyrm/templates/snippets/shelf_selector.html:27
-msgid "Unshelve"
+msgid "Move book"
 msgstr ""
 
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
@@ -2151,7 +2230,7 @@ msgid "Finish \"<em>%(book_title)s</em>\""
 msgstr ""
 
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:33
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:35
 msgid "Update progress"
 msgstr ""
 
@@ -2172,6 +2251,11 @@ msgstr ""
 msgid "Want to read"
 msgstr ""
 
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:48
+#, python-format
+msgid "Remove from %(name)s"
+msgstr ""
+
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
 #, python-format
 msgid "Start \"<em>%(book_title)s</em>\""
@@ -2240,6 +2324,14 @@ msgstr ""
 msgid "Switch to this edition"
 msgstr ""
 
+#: bookwyrm/templates/snippets/table-sort-header.html:6
+msgid "Sorted asccending"
+msgstr ""
+
+#: bookwyrm/templates/snippets/table-sort-header.html:10
+msgid "Sorted descending"
+msgstr ""
+
 #: bookwyrm/templates/snippets/tag.html:14
 msgid "Remove tag"
 msgstr ""
@@ -2249,6 +2341,11 @@ msgstr ""
 msgid "Books tagged \"%(tag.name)s\""
 msgstr ""
 
+#: bookwyrm/templates/user/books_header.html:5
+#, python-format
+msgid "%(username)s's books"
+msgstr ""
+
 #: bookwyrm/templates/user/create_shelf_form.html:5
 #: bookwyrm/templates/user/create_shelf_form.html:22
 msgid "Create Shelf"
@@ -2294,56 +2391,61 @@ msgstr ""
 msgid "Create list"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:9
-msgid "Your Shelves"
-msgstr ""
-
-#: bookwyrm/templates/user/shelf.html:11
-#, python-format
-msgid "%(username)s: Shelves"
-msgstr ""
-
-#: bookwyrm/templates/user/shelf.html:33
+#: bookwyrm/templates/user/shelf.html:34
 msgid "Create shelf"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:54
+#: bookwyrm/templates/user/shelf.html:55
 msgid "Edit shelf"
 msgstr ""
 
+#: bookwyrm/templates/user/shelf.html:75
+msgid "Shelved"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf.html:76
+msgid "Started"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf.html:77
+msgid "Finished"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf.html:121
+msgid "This shelf is empty."
+msgstr ""
+
+#: bookwyrm/templates/user/shelf.html:127
+msgid "Delete shelf"
+msgstr ""
+
 #: bookwyrm/templates/user/user.html:15
 msgid "Edit profile"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:26
-#: bookwyrm/templates/user/user_layout.html:68
-msgid "Shelves"
-msgstr ""
-
-#: bookwyrm/templates/user/user.html:31
+#: bookwyrm/templates/user/user.html:33
 #, python-format
-msgid "See all %(size)s"
+msgid "View all %(size)s"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:44
-#, python-format
-msgid "See all %(shelf_count)s shelves"
+#: bookwyrm/templates/user/user.html:46
+msgid "View all books"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:56
+#: bookwyrm/templates/user/user.html:58
 #, python-format
 msgid "Set a reading goal for %(year)s"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:62
+#: bookwyrm/templates/user/user.html:64
 msgid "User Activity"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:65
+#: bookwyrm/templates/user/user.html:67
 msgid "RSS feed"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:76
+#: bookwyrm/templates/user/user.html:78
 msgid "No activities yet!"
 msgstr ""
 
@@ -2351,14 +2453,14 @@ msgstr ""
 msgid "Follow Requests"
 msgstr ""
 
-#: bookwyrm/templates/user/user_layout.html:50
-msgid "Activity"
-msgstr ""
-
 #: bookwyrm/templates/user/user_layout.html:56
 msgid "Reading Goal"
 msgstr ""
 
+#: bookwyrm/templates/user/user_layout.html:68
+msgid "Books"
+msgstr ""
+
 #: bookwyrm/templates/user/user_preview.html:13
 #, python-format
 msgid "Joined %(date)s"
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index a0e975bfd6c5cf6cfbb0e2831935875c92417082..d578461948d43624e25f7e9966839a1d4a159e9c 100644
GIT binary patch
delta 8334
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

delta 9139
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

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 729048eb..7e53903e 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-28 22:42+0000\n"
+"POT-Creation-Date: 2021-03-31 09:22-0700\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -49,44 +49,64 @@ msgstr "%(count)d usos"
 msgid "Unlimited"
 msgstr "Sin límite"
 
-#: bookwyrm/models/fields.py:25
+#: bookwyrm/models/fields.py:24
 #, python-format
 msgid "%(value)s is not a valid remote_id"
 msgstr "%(value)s no es un remote_id válido"
 
-#: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:47
+#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
 #, python-format
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s no es un usuario válido"
 
-#: bookwyrm/models/fields.py:170 bookwyrm/templates/layout.html:157
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:157
 msgid "username"
 msgstr "nombre de usuario"
 
-#: bookwyrm/models/fields.py:175
+#: bookwyrm/models/fields.py:170
 msgid "A user with that username already exists."
 msgstr "Ya existe un usuario con ese nombre."
 
-#: bookwyrm/settings.py:148
+#: bookwyrm/settings.py:150
 msgid "English"
 msgstr "Inglés"
 
-#: bookwyrm/settings.py:149
+#: bookwyrm/settings.py:151
 msgid "German"
 msgstr "Aléman"
 
-#: bookwyrm/settings.py:150
+#: bookwyrm/settings.py:152
 msgid "Spanish"
 msgstr "Español"
 
-#: bookwyrm/settings.py:151
+#: bookwyrm/settings.py:153
 msgid "French"
 msgstr "Francés"
 
-#: bookwyrm/settings.py:152
+#: bookwyrm/settings.py:154
 msgid "Simplified Chinese"
 msgstr "Chino simplificado"
 
+#: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8
+msgid "Not Found"
+msgstr "No encontrado"
+
+#: bookwyrm/templates/404.html:9
+msgid "The page you requested doesn't seem to exist!"
+msgstr "¡Parece que la página solicitada no existe!"
+
+#: bookwyrm/templates/500.html:4
+msgid "Oops!"
+msgstr "¡Úps!"
+
+#: bookwyrm/templates/500.html:8
+msgid "Server Error"
+msgstr "Error de servidor"
+
+#: bookwyrm/templates/500.html:9
+msgid "Something went wrong! Sorry about that."
+msgstr "¡Algo salió mal! Disculpa."
+
 #: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
 msgid "Edit Author"
 msgstr "Editar Autor/Autora"
@@ -110,92 +130,66 @@ msgstr "por"
 msgid "Edit Book"
 msgstr "Editar Libro"
 
-#: bookwyrm/templates/book/book.html:45
+#: bookwyrm/templates/book/book.html:49
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "Agregar portada"
 
-#: bookwyrm/templates/book/book.html:55
+#: bookwyrm/templates/book/book.html:59
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: bookwyrm/templates/book/book.html:62
+#: bookwyrm/templates/book/book.html:66
 #: bookwyrm/templates/book/edit_book.html:211
 msgid "OCLC Number:"
 msgstr "Número OCLC:"
 
-#: bookwyrm/templates/book/book.html:69
+#: bookwyrm/templates/book/book.html:73
 #: bookwyrm/templates/book/edit_book.html:215
 msgid "ASIN:"
 msgstr "ASIN:"
 
-#: bookwyrm/templates/book/book.html:79
-#, python-format
-msgid "%(format)s, %(pages)s pages"
-msgstr "%(format)s, %(pages)s páginas"
-
-#: bookwyrm/templates/book/book.html:81
-#, python-format
-msgid "%(pages)s pages"
-msgstr "%(pages)s páginas"
-
-#: bookwyrm/templates/book/book.html:86
-#, python-format
-msgid "Published %(date)s by %(publisher)s."
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:88
-#, fuzzy, python-format
-#| msgid "Published date:"
-msgid "Published %(date)s"
-msgstr "Fecha de publicación:"
-
-#: bookwyrm/templates/book/book.html:90
-#, python-format
-msgid "Published by %(publisher)s."
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:95
+#: bookwyrm/templates/book/book.html:82
 msgid "View on OpenLibrary"
 msgstr "Ver en OpenLibrary"
 
-#: bookwyrm/templates/book/book.html:104
+#: bookwyrm/templates/book/book.html:91
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s reseña)"
 msgstr[1] "(%(review_count)s reseñas)"
 
-#: bookwyrm/templates/book/book.html:110
+#: bookwyrm/templates/book/book.html:97
 msgid "Add Description"
 msgstr "Agregar descripción"
 
-#: bookwyrm/templates/book/book.html:117
+#: bookwyrm/templates/book/book.html:104
 #: bookwyrm/templates/book/edit_book.html:101
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Descripción:"
 
-#: bookwyrm/templates/book/book.html:121
+#: bookwyrm/templates/book/book.html:108
 #: bookwyrm/templates/book/edit_book.html:225
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:68
+#: bookwyrm/templates/preferences/edit_user.html:70
 #: bookwyrm/templates/settings/site.html:93
-#: bookwyrm/templates/snippets/readthrough.html:64
+#: bookwyrm/templates/snippets/readthrough.html:65
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
 msgid "Save"
 msgstr "Guardar"
 
-#: bookwyrm/templates/book/book.html:122 bookwyrm/templates/book/book.html:171
+#: bookwyrm/templates/book/book.html:109 bookwyrm/templates/book/book.html:158
 #: bookwyrm/templates/book/cover_modal.html:32
 #: bookwyrm/templates/book/edit_book.html:226
 #: bookwyrm/templates/edit_author.html:79
 #: bookwyrm/templates/moderation/report_modal.html:32
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/readthrough.html:65
+#: bookwyrm/templates/snippets/readthrough.html:66
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
@@ -203,74 +197,74 @@ msgstr "Guardar"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: bookwyrm/templates/book/book.html:131
+#: bookwyrm/templates/book/book.html:118
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s/editions\">%(count)s ediciones</a>"
 
-#: bookwyrm/templates/book/book.html:139
+#: bookwyrm/templates/book/book.html:126
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "Esta edición está en tu <a href=\"%(path)s\">%(shelf_name)s</a> estante."
 
-#: bookwyrm/templates/book/book.html:145
+#: bookwyrm/templates/book/book.html:132
 #, python-format
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr "Una <a href=\"%(book_path)s\">edición diferente</a> de este libro está en tu <a href=\"%(shelf_path)s\">%(shelf_name)s</a> estante."
 
-#: bookwyrm/templates/book/book.html:154
+#: bookwyrm/templates/book/book.html:141
 msgid "Your reading activity"
 msgstr "Tu actividad de lectura"
 
-#: bookwyrm/templates/book/book.html:156
+#: bookwyrm/templates/book/book.html:143
 msgid "Add read dates"
 msgstr "Agregar fechas de lectura"
 
-#: bookwyrm/templates/book/book.html:161
+#: bookwyrm/templates/book/book.html:148
 msgid "You don't have any reading activity for this book."
 msgstr "No tienes ninguna actividad de lectura para este libro."
 
-#: bookwyrm/templates/book/book.html:168
+#: bookwyrm/templates/book/book.html:155
 msgid "Create"
 msgstr "Crear"
 
-#: bookwyrm/templates/book/book.html:190
+#: bookwyrm/templates/book/book.html:177
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: bookwyrm/templates/book/book.html:194
+#: bookwyrm/templates/book/book.html:181
 #: bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr "Agregar etiqueta"
 
-#: bookwyrm/templates/book/book.html:211
+#: bookwyrm/templates/book/book.html:198
 msgid "Subjects"
 msgstr "Sujetos"
 
-#: bookwyrm/templates/book/book.html:222
+#: bookwyrm/templates/book/book.html:209
 msgid "Places"
 msgstr "Lugares"
 
-#: bookwyrm/templates/book/book.html:233 bookwyrm/templates/layout.html:64
-#: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
+#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listas"
 
-#: bookwyrm/templates/book/book.html:244
+#: bookwyrm/templates/book/book.html:231
 #, fuzzy
 #| msgid "Go to list"
 msgid "Add to list"
 msgstr "Irse a lista"
 
-#: bookwyrm/templates/book/book.html:254
+#: bookwyrm/templates/book/book.html:241
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:90
 msgid "Add"
 msgstr "Agregar"
 
-#: bookwyrm/templates/book/book.html:282
+#: bookwyrm/templates/book/book.html:269
 msgid "rated it"
 msgstr "lo calificó con"
 
@@ -419,7 +413,7 @@ msgid "John Doe, Jane Smith"
 msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:155
-#: bookwyrm/templates/snippets/shelf.html:9
+#: bookwyrm/templates/user/shelf.html:72
 msgid "Cover"
 msgstr "Portada:"
 
@@ -428,6 +422,7 @@ msgid "Physical Properties"
 msgstr "Propiedades físicas:"
 
 #: bookwyrm/templates/book/edit_book.html:183
+#: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "Formato:"
 
@@ -452,98 +447,102 @@ msgstr "ISBN 10:"
 msgid "Openlibrary key:"
 msgstr "Clave OpenLibrary:"
 
+#: bookwyrm/templates/book/editions.html:5
+#, python-format
+msgid "Editions of %(book_title)s"
+msgstr "Ediciones de %(book_title)s"
+
+#: bookwyrm/templates/book/editions.html:9
+#, python-format
+msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+msgstr "Ediciones de <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+
+#: bookwyrm/templates/book/format_filter.html:8
+#: bookwyrm/templates/book/language_filter.html:8
+msgid "Any"
+msgstr ""
+
+#: bookwyrm/templates/book/language_filter.html:5
+msgid "Language:"
+msgstr ""
+
+#: bookwyrm/templates/book/publisher_info.html:6
+#, python-format
+msgid "%(format)s, %(pages)s pages"
+msgstr "%(format)s, %(pages)s páginas"
+
+#: bookwyrm/templates/book/publisher_info.html:8
+#, python-format
+msgid "%(pages)s pages"
+msgstr "%(pages)s páginas"
+
+#: bookwyrm/templates/book/publisher_info.html:13
+#, fuzzy, python-format
+#| msgid "%(pages)s pages"
+msgid "%(languages)s language"
+msgstr "%(pages)s páginas"
+
+#: bookwyrm/templates/book/publisher_info.html:18
+#, python-format
+msgid "Published %(date)s by %(publisher)s."
+msgstr ""
+
+#: bookwyrm/templates/book/publisher_info.html:20
+#, fuzzy, python-format
+#| msgid "Published date:"
+msgid "Published %(date)s"
+msgstr "Fecha de publicación:"
+
+#: bookwyrm/templates/book/publisher_info.html:22
+#, python-format
+msgid "Published by %(publisher)s."
+msgstr ""
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/feed/feed_layout.html:57
 msgid "Close"
 msgstr "Cerrar"
 
-#: bookwyrm/templates/directory.html:6 bookwyrm/templates/directory.html:11
-#: bookwyrm/templates/layout.html:97
-msgid "Directory"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:19
-msgid "Make your profile discoverable to other BookWyrm users."
-msgstr ""
-
-#: bookwyrm/templates/directory.html:26
-#, fuzzy, python-format
-#| msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
-msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
-msgstr "Puedes establecer o cambiar tu meta de lectura en cualquier momento que desees desde tu <a href=\"%(path)s\">perfil</a>"
-
-#: bookwyrm/templates/directory.html:31
-#: bookwyrm/templates/snippets/goal_card.html:22
-msgid "Dismiss message"
-msgstr "Desechar mensaje"
-
-#: bookwyrm/templates/directory.html:44
-#, fuzzy
-#| msgid "Show less"
-msgid "Show filters"
-msgstr "Mostrar menos"
-
-#: bookwyrm/templates/directory.html:46
-msgid "Hide filters"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:55
-#, fuzzy
-#| msgid "User Activity"
-msgid "User type"
-msgstr "Actividad de usuario"
-
-#: bookwyrm/templates/directory.html:58
-msgid "BookWyrm users"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:62
-msgid "All known users"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:68
+#: bookwyrm/templates/directory/community_filter.html:5
 #, fuzzy
 #| msgid "Comment"
 msgid "Community"
 msgstr "Comentario"
 
-#: bookwyrm/templates/directory.html:71
+#: bookwyrm/templates/directory/community_filter.html:8
 #, fuzzy
 #| msgid "Max uses"
 msgid "Local users"
 msgstr "Número máximo de usos"
 
-#: bookwyrm/templates/directory.html:75
+#: bookwyrm/templates/directory/community_filter.html:12
 #, fuzzy
 #| msgid "Federated"
 msgid "Federated community"
 msgstr "Federalizado"
 
-#: bookwyrm/templates/directory.html:81
-msgid "Order by"
+#: bookwyrm/templates/directory/directory.html:6
+#: bookwyrm/templates/directory/directory.html:11
+#: bookwyrm/templates/layout.html:97
+msgid "Directory"
 msgstr ""
 
-#: bookwyrm/templates/directory.html:84
-#, fuzzy
-#| msgid "Suggest"
-msgid "Suggested"
-msgstr "Sugerir"
-
-#: bookwyrm/templates/directory.html:85
-msgid "Recently active"
+#: bookwyrm/templates/directory/directory.html:19
+msgid "Make your profile discoverable to other BookWyrm users."
 msgstr ""
 
-#: bookwyrm/templates/directory.html:91
-msgid "Apply filters"
-msgstr ""
+#: bookwyrm/templates/directory/directory.html:26
+#, fuzzy, python-format
+#| msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
+msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
+msgstr "Puedes establecer o cambiar tu meta de lectura en cualquier momento que desees desde tu <a href=\"%(path)s\">perfil</a>"
 
-#: bookwyrm/templates/directory.html:94
-#, fuzzy
-#| msgid "Clear search"
-msgid "Clear filters"
-msgstr "Borrar búsqueda"
+#: bookwyrm/templates/directory/directory.html:31
+#: bookwyrm/templates/snippets/goal_card.html:22
+msgid "Dismiss message"
+msgstr "Desechar mensaje"
 
-#: bookwyrm/templates/directory.html:128
+#: bookwyrm/templates/directory/directory.html:71
 #, fuzzy
 #| msgid "followed you"
 msgid "follower you follow"
@@ -551,7 +550,7 @@ msgid_plural "followers you follow"
 msgstr[0] "te siguió"
 msgstr[1] "te siguió"
 
-#: bookwyrm/templates/directory.html:135
+#: bookwyrm/templates/directory/directory.html:78
 #, fuzzy
 #| msgid "Your shelves"
 msgid "book on your shelves"
@@ -559,14 +558,42 @@ msgid_plural "books on your shelves"
 msgstr[0] "Tus estantes"
 msgstr[1] "Tus estantes"
 
-#: bookwyrm/templates/directory.html:143
+#: bookwyrm/templates/directory/directory.html:86
 msgid "posts"
 msgstr ""
 
-#: bookwyrm/templates/directory.html:149
+#: bookwyrm/templates/directory/directory.html:92
 msgid "last active"
 msgstr ""
 
+#: bookwyrm/templates/directory/sort_filter.html:5
+msgid "Order by"
+msgstr ""
+
+#: bookwyrm/templates/directory/sort_filter.html:8
+#, fuzzy
+#| msgid "Suggest"
+msgid "Suggested"
+msgstr "Sugerir"
+
+#: bookwyrm/templates/directory/sort_filter.html:9
+msgid "Recently active"
+msgstr ""
+
+#: bookwyrm/templates/directory/user_type_filter.html:5
+#, fuzzy
+#| msgid "User Activity"
+msgid "User type"
+msgstr "Actividad de usuario"
+
+#: bookwyrm/templates/directory/user_type_filter.html:8
+msgid "BookWyrm users"
+msgstr ""
+
+#: bookwyrm/templates/directory/user_type_filter.html:12
+msgid "All known users"
+msgstr ""
+
 #: bookwyrm/templates/discover/about.html:7
 #, python-format
 msgid "About %(site_name)s"
@@ -676,16 +703,6 @@ msgstr "Clave Librarything:"
 msgid "Goodreads key:"
 msgstr "Clave Goodreads:"
 
-#: bookwyrm/templates/editions.html:5
-#, python-format
-msgid "Editions of %(book_title)s"
-msgstr "Ediciones de %(book_title)s"
-
-#: bookwyrm/templates/editions.html:9
-#, python-format
-msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
-msgstr "Ediciones de <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
-
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
@@ -752,18 +769,6 @@ msgstr ""
 msgid "Reset your %(site_name)s password"
 msgstr "Sobre %(site_name)s"
 
-#: bookwyrm/templates/error.html:4
-msgid "Oops!"
-msgstr "¡Úps!"
-
-#: bookwyrm/templates/error.html:8
-msgid "Server Error"
-msgstr "Error de servidor"
-
-#: bookwyrm/templates/error.html:9
-msgid "Something went wrong! Sorry about that."
-msgstr "¡Algo salió mal! Disculpa."
-
 #: bookwyrm/templates/feed/direct_messages.html:8
 #, python-format
 msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
@@ -842,6 +847,8 @@ msgid "Updates"
 msgstr "Actualizaciones"
 
 #: bookwyrm/templates/feed/feed_layout.html:11
+#: bookwyrm/templates/layout.html:58
+#: bookwyrm/templates/user/books_header.html:3
 msgid "Your books"
 msgstr "Tus libros"
 
@@ -850,18 +857,18 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr "¡No hay ningún libro aqui ahorita! Busca a un libro para empezar"
 
 #: bookwyrm/templates/feed/feed_layout.html:23
-#: bookwyrm/templates/user/shelf.html:24
+#: bookwyrm/templates/user/shelf.html:25
 msgid "To Read"
 msgstr "Para leer"
 
 #: bookwyrm/templates/feed/feed_layout.html:24
-#: bookwyrm/templates/user/shelf.html:24
+#: bookwyrm/templates/user/shelf.html:25
 msgid "Currently Reading"
 msgstr "Leyendo actualmente"
 
 #: bookwyrm/templates/feed/feed_layout.html:25
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-#: bookwyrm/templates/user/shelf.html:24
+#: bookwyrm/templates/user/shelf.html:25
 msgid "Read"
 msgstr "Leer"
 
@@ -906,27 +913,33 @@ msgstr "Los libros de %(username)s para %(year)s"
 msgid "Import Books"
 msgstr "Importar libros"
 
-#: bookwyrm/templates/import.html:14
-msgid "Data source"
+#: bookwyrm/templates/import.html:16
+#, fuzzy
+#| msgid "Data source"
+msgid "Data source:"
 msgstr "Fuente de datos"
 
-#: bookwyrm/templates/import.html:32
+#: bookwyrm/templates/import.html:29
+msgid "Data file:"
+msgstr ""
+
+#: bookwyrm/templates/import.html:37
 msgid "Include reviews"
 msgstr "Incluir reseñas"
 
-#: bookwyrm/templates/import.html:37
+#: bookwyrm/templates/import.html:42
 msgid "Privacy setting for imported reviews:"
 msgstr "Configuración de privacidad para las reseñas importadas:"
 
-#: bookwyrm/templates/import.html:41
+#: bookwyrm/templates/import.html:48
 msgid "Import"
 msgstr "Importar"
 
-#: bookwyrm/templates/import.html:46
+#: bookwyrm/templates/import.html:53
 msgid "Recent Imports"
 msgstr "Importaciones recientes"
 
-#: bookwyrm/templates/import.html:48
+#: bookwyrm/templates/import.html:55
 msgid "No recent imports"
 msgstr "No hay ninguna importación reciente"
 
@@ -983,12 +996,12 @@ msgstr "Libro"
 
 #: bookwyrm/templates/import_status.html:115
 #: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/snippets/shelf.html:10
+#: bookwyrm/templates/user/shelf.html:73
 msgid "Title"
 msgstr "Título"
 
 #: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/snippets/shelf.html:11
+#: bookwyrm/templates/user/shelf.html:74
 msgid "Author"
 msgstr "Autor/Autora"
 
@@ -1044,10 +1057,6 @@ msgstr "Buscar"
 msgid "Main navigation menu"
 msgstr "Menú de navigación central"
 
-#: bookwyrm/templates/layout.html:58
-msgid "Your shelves"
-msgstr "Tus estantes"
-
 #: bookwyrm/templates/layout.html:61
 msgid "Feed"
 msgstr "Actividad"
@@ -1062,7 +1071,7 @@ msgid "Settings"
 msgstr "Configuración"
 
 #: bookwyrm/templates/layout.html:116
-#: bookwyrm/templates/settings/admin_layout.html:20
+#: bookwyrm/templates/settings/admin_layout.html:24
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
 #: bookwyrm/templates/settings/manage_invites.html:15
@@ -1124,7 +1133,7 @@ msgid "BookWyrm is open source software. You can contribute or report issues on
 msgstr "BookWyrm es software de código abierto. Puedes contribuir o reportar problemas en <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
 #: bookwyrm/templates/lists/create_form.html:5
-#: bookwyrm/templates/lists/lists.html:17
+#: bookwyrm/templates/lists/lists.html:19
 msgid "Create List"
 msgstr "Crear lista"
 
@@ -1190,7 +1199,7 @@ msgid "Anyone can suggest books, subject to your approval"
 msgstr "Cualquier usuario puede sugerir libros, en cuanto lo hayas aprobado"
 
 #: bookwyrm/templates/lists/form.html:31
-#: bookwyrm/templates/moderation/reports.html:11
+#: bookwyrm/templates/moderation/reports.html:24
 msgid "Open"
 msgstr "Abierto"
 
@@ -1208,6 +1217,7 @@ msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "Agregado por <a href=\"%(user_path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/lists/list.html:41
+#: bookwyrm/templates/snippets/shelf_selector.html:28
 msgid "Remove"
 msgstr "Quitar"
 
@@ -1244,19 +1254,6 @@ msgstr "No se encontró ningún libro"
 msgid "Suggest"
 msgstr "Sugerir"
 
-#: bookwyrm/templates/lists/lists.html:14
-msgid "Your lists"
-msgstr "Tus listas"
-
-#: bookwyrm/templates/lists/lists.html:32
-#, python-format
-msgid "See all %(size)s lists"
-msgstr "Ver las %(size)s listas"
-
-#: bookwyrm/templates/lists/lists.html:40
-msgid "Recent Lists"
-msgstr "Listas recientes"
-
 #: bookwyrm/templates/login.html:4
 msgid "Login"
 msgstr "Iniciar sesión"
@@ -1370,27 +1367,37 @@ msgstr ""
 msgid "Resolve"
 msgstr ""
 
-#: bookwyrm/templates/moderation/reports.html:4
-#: bookwyrm/templates/moderation/reports.html:5
-#: bookwyrm/templates/settings/admin_layout.html:24
+#: bookwyrm/templates/moderation/reports.html:6
+#, fuzzy, python-format
+#| msgid "Lists: %(username)s"
+msgid "Reports: %(server_name)s"
+msgstr "Listas: %(username)s"
+
+#: bookwyrm/templates/moderation/reports.html:8
+#: bookwyrm/templates/moderation/reports.html:16
+#: bookwyrm/templates/settings/admin_layout.html:28
 #, fuzzy
 #| msgid "Recent Imports"
 msgid "Reports"
 msgstr "Importaciones recientes"
 
-#: bookwyrm/templates/moderation/reports.html:14
+#: bookwyrm/templates/moderation/reports.html:13
+#, fuzzy, python-format
+#| msgid "Lists: %(username)s"
+msgid "Reports: <small>%(server_name)s</small>"
+msgstr "Listas: %(username)s"
+
+#: bookwyrm/templates/moderation/reports.html:27
 #, fuzzy
 #| msgid "Shelved"
 msgid "Resolved"
 msgstr "Archivado"
 
-#: bookwyrm/templates/notfound.html:4 bookwyrm/templates/notfound.html:8
-msgid "Not Found"
-msgstr "No encontrado"
-
-#: bookwyrm/templates/notfound.html:9
-msgid "The page you requested doesn't seem to exist!"
-msgstr "¡Parece que la página solicitada no existe!"
+#: bookwyrm/templates/moderation/reports.html:34
+#, fuzzy
+#| msgid "No books found"
+msgid "No reports found."
+msgstr "No se encontró ningún libro"
 
 #: bookwyrm/templates/notifications.html:14
 msgid "Delete notifications"
@@ -1622,51 +1629,131 @@ msgstr "Adminstración"
 msgid "Manage Users"
 msgstr "Administrar usuarios"
 
-#: bookwyrm/templates/settings/admin_layout.html:28
-#: bookwyrm/templates/settings/federation.html:4
+#: bookwyrm/templates/settings/admin_layout.html:19
+#: bookwyrm/templates/settings/user_admin.html:3
+#: bookwyrm/templates/settings/user_admin.html:10
+msgid "Users"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/federation.html:3
+#: bookwyrm/templates/settings/federation.html:5
 msgid "Federated Servers"
 msgstr "Servidores federalizados"
 
-#: bookwyrm/templates/settings/admin_layout.html:33
+#: bookwyrm/templates/settings/admin_layout.html:37
 msgid "Instance Settings"
 msgstr "Configuración de instancia"
 
-#: bookwyrm/templates/settings/admin_layout.html:37
+#: bookwyrm/templates/settings/admin_layout.html:41
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr "Configuración de sitio"
 
-#: bookwyrm/templates/settings/admin_layout.html:40
+#: bookwyrm/templates/settings/admin_layout.html:44
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr "Información de instancia"
 
-#: bookwyrm/templates/settings/admin_layout.html:41
+#: bookwyrm/templates/settings/admin_layout.html:45
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr "Imagenes"
 
-#: bookwyrm/templates/settings/admin_layout.html:42
+#: bookwyrm/templates/settings/admin_layout.html:46
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr "Contenido del pie de página"
 
-#: bookwyrm/templates/settings/admin_layout.html:43
+#: bookwyrm/templates/settings/admin_layout.html:47
 #: bookwyrm/templates/settings/site.html:77
 msgid "Registration"
 msgstr "Registración"
 
-#: bookwyrm/templates/settings/federation.html:10
+#: bookwyrm/templates/settings/federated_server.html:7
+msgid "Back to server list"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:12
+msgid "Details"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:15
+#, fuzzy
+#| msgid "Software"
+msgid "Software:"
+msgstr "Software"
+
+#: bookwyrm/templates/settings/federated_server.html:19
+#, fuzzy
+#| msgid "Description:"
+msgid "Version:"
+msgstr "Descripción:"
+
+#: bookwyrm/templates/settings/federated_server.html:23
+#, fuzzy
+#| msgid "Status"
+msgid "Status:"
+msgstr "Status"
+
+#: bookwyrm/templates/settings/federated_server.html:30
+#: bookwyrm/templates/user/user_layout.html:50
+msgid "Activity"
+msgstr "Actividad"
+
+#: bookwyrm/templates/settings/federated_server.html:33
+#, fuzzy
+#| msgid "Username:"
+msgid "Users:"
+msgstr "Nombre de usuario:"
+
+#: bookwyrm/templates/settings/federated_server.html:36
+#: bookwyrm/templates/settings/federated_server.html:43
+msgid "View all"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:40
+#, fuzzy
+#| msgid "Recent Imports"
+msgid "Reports:"
+msgstr "Importaciones recientes"
+
+#: bookwyrm/templates/settings/federated_server.html:47
+#, fuzzy
+#| msgid "followed you"
+msgid "Followed by us:"
+msgstr "te siguió"
+
+#: bookwyrm/templates/settings/federated_server.html:53
+#, fuzzy
+#| msgid "followed you"
+msgid "Followed by them:"
+msgstr "te siguió"
+
+#: bookwyrm/templates/settings/federated_server.html:59
+#, fuzzy
+#| msgid "Blocked Users"
+msgid "Blocked by us:"
+msgstr "Usuarios bloqueados"
+
+#: bookwyrm/templates/settings/federation.html:13
 msgid "Server name"
 msgstr "Nombre de servidor"
 
-#: bookwyrm/templates/settings/federation.html:11
+#: bookwyrm/templates/settings/federation.html:17
+#, fuzzy
+#| msgid "Federated"
+msgid "Date federated"
+msgstr "Federalizado"
+
+#: bookwyrm/templates/settings/federation.html:21
 msgid "Software"
 msgstr "Software"
 
-#: bookwyrm/templates/settings/federation.html:12
+#: bookwyrm/templates/settings/federation.html:24
 #: bookwyrm/templates/settings/manage_invite_requests.html:33
+#: bookwyrm/templates/settings/user_admin.html:32
 msgid "Status"
 msgstr "Status"
 
@@ -1835,6 +1922,47 @@ msgstr "Solicitudes de seguidor"
 msgid "Registration closed text:"
 msgstr "Texto de registración cerrada:"
 
+#: bookwyrm/templates/settings/user_admin.html:7
+#, python-format
+msgid "Users: <small>%(server_name)s</small>"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:20
+#, fuzzy
+#| msgid "Username:"
+msgid "Username"
+msgstr "Nombre de usuario:"
+
+#: bookwyrm/templates/settings/user_admin.html:24
+#, fuzzy
+#| msgid "Added:"
+msgid "Date Added"
+msgstr "Agregado:"
+
+#: bookwyrm/templates/settings/user_admin.html:28
+msgid "Last Active"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:36
+#, fuzzy
+#| msgid "Remove"
+msgid "Remote server"
+msgstr "Quitar"
+
+#: bookwyrm/templates/settings/user_admin.html:45
+#, fuzzy
+#| msgid "Activity"
+msgid "Active"
+msgstr "Actividad"
+
+#: bookwyrm/templates/settings/user_admin.html:45
+msgid "Inactive"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:50
+msgid "Not set"
+msgstr ""
+
 #: bookwyrm/templates/snippets/block_button.html:5
 msgid "Block"
 msgstr "Bloquear"
@@ -1895,7 +2023,7 @@ msgid "Review:"
 msgstr "Reseña"
 
 #: bookwyrm/templates/snippets/create_status_form.html:29
-#: bookwyrm/templates/snippets/shelf.html:17
+#: bookwyrm/templates/user/shelf.html:78
 msgid "Rating"
 msgstr "Calificación"
 
@@ -1969,6 +2097,26 @@ msgstr "Me gusta status"
 msgid "Un-like status"
 msgstr "Quitar me gusta de status"
 
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:7
+#, fuzzy
+#| msgid "Show less"
+msgid "Show filters"
+msgstr "Mostrar menos"
+
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:9
+msgid "Hide filters"
+msgstr ""
+
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:19
+msgid "Apply filters"
+msgstr ""
+
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:23
+#, fuzzy
+#| msgid "Clear search"
+msgid "Clear filters"
+msgstr "Borrar búsqueda"
+
 #: bookwyrm/templates/snippets/follow_button.html:12
 msgid "Follow"
 msgstr "Seguir"
@@ -2102,32 +2250,32 @@ msgstr "Da una calificación"
 msgid "Rate"
 msgstr "Calificar"
 
-#: bookwyrm/templates/snippets/readthrough.html:7
+#: bookwyrm/templates/snippets/readthrough.html:8
 msgid "Progress Updates:"
 msgstr "Actualizaciones de progreso:"
 
-#: bookwyrm/templates/snippets/readthrough.html:11
+#: bookwyrm/templates/snippets/readthrough.html:12
 msgid "finished"
 msgstr "terminado"
 
-#: bookwyrm/templates/snippets/readthrough.html:14
+#: bookwyrm/templates/snippets/readthrough.html:15
 msgid "Show all updates"
 msgstr "Mostrar todas las actualizaciones"
 
-#: bookwyrm/templates/snippets/readthrough.html:30
+#: bookwyrm/templates/snippets/readthrough.html:31
 msgid "Delete this progress update"
 msgstr "Eliminar esta actualización de progreso"
 
-#: bookwyrm/templates/snippets/readthrough.html:40
+#: bookwyrm/templates/snippets/readthrough.html:41
 msgid "started"
 msgstr "empezado"
 
-#: bookwyrm/templates/snippets/readthrough.html:46
-#: bookwyrm/templates/snippets/readthrough.html:60
+#: bookwyrm/templates/snippets/readthrough.html:47
+#: bookwyrm/templates/snippets/readthrough.html:61
 msgid "Edit read dates"
 msgstr "Editar fechas de lectura"
 
-#: bookwyrm/templates/snippets/readthrough.html:50
+#: bookwyrm/templates/snippets/readthrough.html:51
 msgid "Delete these read dates"
 msgstr "Eliminar estas fechas de lectura"
 
@@ -2191,45 +2339,11 @@ msgstr "por %(author)s"
 msgid "Import book"
 msgstr "Importar libro"
 
-#: bookwyrm/templates/snippets/shelf.html:12
-msgid "Published"
-msgstr "Publicado"
-
-#: bookwyrm/templates/snippets/shelf.html:13
-msgid "Shelved"
-msgstr "Archivado"
-
-#: bookwyrm/templates/snippets/shelf.html:14
-msgid "Started"
-msgstr "Empezado"
-
-#: bookwyrm/templates/snippets/shelf.html:15
-msgid "Finished"
-msgstr "Terminado"
-
-#: bookwyrm/templates/snippets/shelf.html:16
-msgid "External links"
-msgstr "Enlaces externos"
-
-#: bookwyrm/templates/snippets/shelf.html:44
-msgid "OpenLibrary"
-msgstr "OpenLibrary"
-
-#: bookwyrm/templates/snippets/shelf.html:61
-msgid "This shelf is empty."
-msgstr "Este estante está vacio."
-
-#: bookwyrm/templates/snippets/shelf.html:67
-msgid "Delete shelf"
-msgstr "Eliminar estante"
-
 #: bookwyrm/templates/snippets/shelf_selector.html:4
-msgid "Change shelf"
-msgstr "Cambiar estante"
-
-#: bookwyrm/templates/snippets/shelf_selector.html:27
-msgid "Unshelve"
-msgstr "Retirar del estante"
+#, fuzzy
+#| msgid "Your books"
+msgid "Move book"
+msgstr "Tus libros"
 
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
 #, python-format
@@ -2237,7 +2351,7 @@ msgid "Finish \"<em>%(book_title)s</em>\""
 msgstr "Terminar \"<em>%(book_title)s</em>\""
 
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:33
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:35
 #, fuzzy
 #| msgid "Updates"
 msgid "Update progress"
@@ -2260,6 +2374,12 @@ msgstr "Terminar de leer"
 msgid "Want to read"
 msgstr "Quiero leer"
 
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:48
+#, fuzzy, python-format
+#| msgid "Lists: %(username)s"
+msgid "Remove from %(name)s"
+msgstr "Listas: %(username)s"
+
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
 #, python-format
 msgid "Start \"<em>%(book_title)s</em>\""
@@ -2332,6 +2452,18 @@ msgstr "Más opciones"
 msgid "Switch to this edition"
 msgstr "Cambiar a esta edición"
 
+#: bookwyrm/templates/snippets/table-sort-header.html:6
+#, fuzzy
+#| msgid "Started reading"
+msgid "Sorted asccending"
+msgstr "Lectura se empezó"
+
+#: bookwyrm/templates/snippets/table-sort-header.html:10
+#, fuzzy
+#| msgid "Started reading"
+msgid "Sorted descending"
+msgstr "Lectura se empezó"
+
 #: bookwyrm/templates/snippets/tag.html:14
 msgid "Remove tag"
 msgstr "Eliminar etiqueta"
@@ -2341,6 +2473,12 @@ msgstr "Eliminar etiqueta"
 msgid "Books tagged \"%(tag.name)s\""
 msgstr "Libros etiquetados con \"%(tag.name)s\""
 
+#: bookwyrm/templates/user/books_header.html:5
+#, fuzzy, python-format
+#| msgid "%(username)s's %(year)s Books"
+msgid "%(username)s's books"
+msgstr "Los libros de %(username)s para %(year)s"
+
 #: bookwyrm/templates/user/create_shelf_form.html:5
 #: bookwyrm/templates/user/create_shelf_form.html:22
 msgid "Create Shelf"
@@ -2386,56 +2524,62 @@ msgstr "Listas: %(username)s"
 msgid "Create list"
 msgstr "Crear lista"
 
-#: bookwyrm/templates/user/shelf.html:9
-msgid "Your Shelves"
-msgstr "Tus estantes"
-
-#: bookwyrm/templates/user/shelf.html:11
-#, python-format
-msgid "%(username)s: Shelves"
-msgstr "%(username)s: Estantes"
-
-#: bookwyrm/templates/user/shelf.html:33
+#: bookwyrm/templates/user/shelf.html:34
 msgid "Create shelf"
 msgstr "Crear estante"
 
-#: bookwyrm/templates/user/shelf.html:54
+#: bookwyrm/templates/user/shelf.html:55
 msgid "Edit shelf"
 msgstr "Editar estante"
 
+#: bookwyrm/templates/user/shelf.html:75
+msgid "Shelved"
+msgstr "Archivado"
+
+#: bookwyrm/templates/user/shelf.html:76
+msgid "Started"
+msgstr "Empezado"
+
+#: bookwyrm/templates/user/shelf.html:77
+msgid "Finished"
+msgstr "Terminado"
+
+#: bookwyrm/templates/user/shelf.html:121
+msgid "This shelf is empty."
+msgstr "Este estante está vacio."
+
+#: bookwyrm/templates/user/shelf.html:127
+msgid "Delete shelf"
+msgstr "Eliminar estante"
+
 #: bookwyrm/templates/user/user.html:15
 msgid "Edit profile"
 msgstr "Editar perfil"
 
-#: bookwyrm/templates/user/user.html:26
-#: bookwyrm/templates/user/user_layout.html:68
-msgid "Shelves"
-msgstr "Estantes"
-
-#: bookwyrm/templates/user/user.html:31
-#, python-format
-msgid "See all %(size)s"
+#: bookwyrm/templates/user/user.html:33
+#, fuzzy, python-format
+#| msgid "See all %(size)s"
+msgid "View all %(size)s"
 msgstr "Ver %(size)s"
 
-#: bookwyrm/templates/user/user.html:44
-#, python-format
-msgid "See all %(shelf_count)s shelves"
-msgstr "Ver los %(shelf_count)s estantes"
+#: bookwyrm/templates/user/user.html:46
+msgid "View all books"
+msgstr ""
 
-#: bookwyrm/templates/user/user.html:56
+#: bookwyrm/templates/user/user.html:58
 #, python-format
 msgid "Set a reading goal for %(year)s"
 msgstr "Establecer una meta de lectura para %(year)s"
 
-#: bookwyrm/templates/user/user.html:62
+#: bookwyrm/templates/user/user.html:64
 msgid "User Activity"
 msgstr "Actividad de usuario"
 
-#: bookwyrm/templates/user/user.html:65
+#: bookwyrm/templates/user/user.html:67
 msgid "RSS feed"
 msgstr "Feed RSS"
 
-#: bookwyrm/templates/user/user.html:76
+#: bookwyrm/templates/user/user.html:78
 msgid "No activities yet!"
 msgstr "¡Aún no actividades!"
 
@@ -2443,14 +2587,16 @@ msgstr "¡Aún no actividades!"
 msgid "Follow Requests"
 msgstr "Solicitudes de seguidor"
 
-#: bookwyrm/templates/user/user_layout.html:50
-msgid "Activity"
-msgstr "Actividad"
-
 #: bookwyrm/templates/user/user_layout.html:56
 msgid "Reading Goal"
 msgstr "Meta de lectura"
 
+#: bookwyrm/templates/user/user_layout.html:68
+#, fuzzy
+#| msgid "Book"
+msgid "Books"
+msgstr "Libro"
+
 #: bookwyrm/templates/user/user_preview.html:13
 #, python-format
 msgid "Joined %(date)s"
@@ -2479,6 +2625,48 @@ msgstr "Ya existe un usuario con ese nombre."
 msgid "A password reset link sent to %s"
 msgstr ""
 
+#~ msgid "Your shelves"
+#~ msgstr "Tus estantes"
+
+#~ msgid "Your lists"
+#~ msgstr "Tus listas"
+
+#, python-format
+#~ msgid "See all %(size)s lists"
+#~ msgstr "Ver las %(size)s listas"
+
+#~ msgid "Recent Lists"
+#~ msgstr "Listas recientes"
+
+#~ msgid "Published"
+#~ msgstr "Publicado"
+
+#~ msgid "External links"
+#~ msgstr "Enlaces externos"
+
+#~ msgid "OpenLibrary"
+#~ msgstr "OpenLibrary"
+
+#~ msgid "Change shelf"
+#~ msgstr "Cambiar estante"
+
+#~ msgid "Unshelve"
+#~ msgstr "Retirar del estante"
+
+#~ msgid "Your Shelves"
+#~ msgstr "Tus estantes"
+
+#, python-format
+#~ msgid "%(username)s: Shelves"
+#~ msgstr "%(username)s: Estantes"
+
+#~ msgid "Shelves"
+#~ msgstr "Estantes"
+
+#, python-format
+#~ msgid "See all %(shelf_count)s shelves"
+#~ msgstr "Ver los %(shelf_count)s estantes"
+
 #~ msgid "Send follow request"
 #~ msgstr "Envia solicitud de seguidor"
 
diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index 99a9b6cc588edc6458a2cebe23fef38d4b31d76d..f3f76f03d44d10c2e6c6ab3168a0e93704ab8ade 100644
GIT binary patch
delta 7514
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

delta 8156
zcmZYD3tZLZ9mnziQIY#aydfeU1Q8HWR5I|2ig^b?AvG_cN2Tas95id@(JnSiYm2lf
zGqWvq=FFJOZO&F^Tg$dGSIwD~o6g*tOS7`e+~<4#KR5T<^LqVwKhN`j{?G0I{Qscq
z4|vwT;t8HeY`4K7&GR@;3Z_Im&IihOQLW=V+QV@I*n;<9Y^vjQ#%An~JFqJrLz+0}
zaT+G{bev4|q1vxAw_-QS`;hyB&Ji*hRGh^IjQ6?*(NFmtR^psA#~F#wV;Ek*4tNRM
zV{|Xa3CBc?z+`NT=@^N9%mP%qA=sYrozY}ssF;9pSZ(En*pYI;>hDFyayH@s+=uGu
zZ>R}ez(oAY>SNO#ryb?aW-_w5PEXVV`eH2OI|bHY1SU`(gKKa)YK6zKJN^ST(I~b{
z19ruDOhwh_n?vmSIJ;hk>US<`!b?y)v>bz~SWQL)t;KA79JP`|sF}Wp8t??h;wjWh
zE}#a!jJiLjw_Bfzs?S07KiKL=m=jU`RQG28)v=F?PFRn+akVvg0Fx+hLhZm_yZ#nt
zQa*v&fiMc!VrSHVQ&9C)sDT!uCftNN3#-igGTDC(_%Ibw_!O%AEUJT_S^aCM0gj^1
zNNgW>pcFF$RiA4PL2dB_)PR+!9h!~pumQc;6eOdD8&J<^GwOBOjqULeY9fbG9UVsv
zblS=nt$Z1EUtE?uu?$qdxu`>2h+5!y)Q(I;^%JZm!+~{fLCx%8jKCIiD~3_tiJH(J
zb02D_UPN_x7`4U6P%Ax+n)sKf_dSAx6@k4_^?i{E2c02g)WKBLjOL;`@VgD1RTxfr
zBdXnIR0q%EEZlG9q#XDDEY$sjQ4<=ETG({EJ`=T|x{y5o1~OXNQq({ztij!=4(_w^
zM${qQgj)F?)S*0pn)osEW7JB&G(COY`=U_y^)z!aOz(dY8LeytYNnG>E2u!dh6_*w
z+=_f%oi&(;KeY1O7)kj&>b`GK6N}4r+vlLJk4KGDi7{A%!F)1)GTM?SP!o6>_1bO6
zXnYBEINw0+)Cp9Fr%)Z9Lk;{b>afK#JGDzk^_PP&*v}k_+M)4zJb$gMf(kv;8swFB
zZb3bYN6aTtH*7-<^c-peFQW!JY~{C6{k)G_&?l(-E}$mz4XV9|RjVA4Z|{FB6|qz#
zqh^|gaad^OG3Hd%X`X{>zZ})!8jQmAsDU5FINWURLha;!RQuncCh&XhzbcMm9R3OQ
zjL)K08rjbsusimoT!?xU(@_I1L~Z#ksQd3h?cBqtg=|6%yaR8>y{LZD`@1_698E?y
zOfsio0_7V}TYR&5E9yJ38rA*>sI7e#``}*W+&S-~CK6fTK8hsNfLW;f##wzivhe12
zBVvOZX9;EXcRT7sb{DFB3u>pILM>=Fs@;C8KZF|ZZPcGECs7N&glZSYuWIdd9Ohw1
zoPZ_fx&fR){Q>hX75W3{9O^ZX8R+hC8tReeqMp<MRL4aakE2i%sIdAP^F}j(n)nJU
zuSGq%hfoW9VxXPDom6Ni_F+eS88h)6R0rRpb|h+$+b$6`ffOvqT%3b<AZu`rqjo;N
z(B08~sP?6(9hi<oa7&Pk1~`tI*~eD?%*vi?-1->o%=NCQ_IaqCDMn3fBu>V0I0ZLa
z`4nnG0|&b+UWmHC2{rNHYReqKGAh#fRm<d^0BWnZqi)!P)9`@VvB>??a4}Nl?8ijB
zh?-bLu{*Ii)T8Tys_%j7H{CVp<XVG5?8b$mI1j5(D|-PadiZ6Bt0_kh<rT;E*cCH}
z@mCxU$7EcBz43mmz&)s!qup@#%iQ0bgc+PaXEB)^8mvd%xDS`(32egZ5w3@^nsUiV
z-dJowt>iRnBIm3eUgEAe0d=Ojq85^d+M#Uhf<rNm@tsOCdTna4C;D{(AHWXy1bT6|
zmEXi{$|rFw#*A_YszkM)jao<p>P&4wJ%TN$iEKlirQI0%8}tyF1S;M@J);xW;4i4H
z{tES0G>>*W-iBJq8>kLHMD4&CRL9O3cOqR-*RxRl_s33Hf?9CZ81`SUMJ*NDsz&UA
zD{wGAh8cJSwURGTD``{e4it&%xF@RP{#GtEtE_$zs{a+JiLXH|sHK$s*H-Vc2K!OJ
zzF$SH=%h9L3VTtGW54yGDnLzq3i4@i=Ab6>5b^>zPoq};K5D>IcKu6Cr5t&kyF*z)
z%M_y;PC^}yxmI3=8gQ-EKZ87W=a;BweHpbg9mcr}NiqAPR#=SM>M5ulm}&J3P~!!c
zlhNtFA0zOmsI7bv)9@&&gU?Yr(q_C{PR1n4nW#_c2-Nk-R_{YiY$b-_T2y}zq9(ov
zdDKDYAQ{c%Bh1CmFdWk+xC3RIg&0A73AV=xR-TGl=}gr3!;c!^yQm31X0~E)%7;<?
zoX0MD|Gy@qXP!9G-RgYQN+zP}=c8WBAV%Yps0r^xwL5^d_zvpX7V&Y=S-2kcHq@aG
zbr9R(6R3W-VtdAS4v^6n9l{uV9d)?g!$>@X>hL^j=56`VtHT)7L~<|(hoJ^sj5<Rr
zQ4`;QvA7rYg*=Gr?*s<5b?3-v%iHpsLt7S&8Ysicd8n-$i)vqwxws0i#a)<>r!g8k
z^NU0)OhY~MVVH+=QP<aFEVh)f|C-4*DtNV>eW-!IMNO!Ex%=&oL)}=6I-FxsJ2MLt
z(1%`JhT4HgP&=>-wX?6F`ui<v2acd7_DMPWA44X7s=M+O)azD=nsEi{u&pxhMNQ-Z
zjK{~!AKCSvqXv2jbv9l@E$AcjENVg*P-o#%kW3pg|3Ynvr@}qG@u&gPP%A0G1RRHP
zI0Loyi%~oAl(`etZm*SJMNQ;Q^9<@f{kM)L7Azv86^*irDX1H&u|GCo2i$@>-Opn>
zzGd|nF_CikH23vOMs4vRjKVV1BbkYs_!3--LF@z0MKYRkkLm6s$Vc6H9qRN}ptiIT
zHRIb+hwm=b4n1e}zq0z*u#o!CQ4`Cpa(8e9_N82f+Oa#av)=!8Wb}-;nmbSvdJfg_
zCG3Q+TlqsPpG7^g%cwIHTkZaiNX87x!%%NQE$aT2sD(A7p8aMV!}!kAWJ>W2@_3y5
z>)kC}jXI^9FbNNs@1hRTKT#9>9M!Qi!#%vwsGZ9~ZTUFV^=eGQTGS!`4hFS_kCIWt
z?bs1tK<&uu*cFeUR&W*z@G|PYf|>3FO3aC<9hr{faXv1`T{svsXSr|H9Q0CNH;etx
zQUfX`<2$IG$hg7X(i>4TzZEsXJFWbEa}y?0zs;_{jGFjcsI&4OvZ>BT$T@Y2X1lJ(
zYg9j*{a43HbKJL}5Bew%#2RcdzeataX3upy-ikV0J5lWpAY(Y*d9HWhNXo}hJKCK_
zdSv}j6Dvd=>fu4lj77bMQ&7)nCaPfovvCFTn4M=(&-^la@KNG(f>$Y&=2EFgGh7!*
z3td7#{rvP26NxT%J*ap2TSBRt%4hLCVm$d#)=1Zs22pNLXyzXf;pBB-+u=~6Kk*FZ
z9mMlQ8s&qyi%{Yl7fL!KO1wBhXB?RWL|+<Tof@pL7FQ8PTragYQz-w2I7?ieZlZ9W
zm`OXGgP#zGh~E)PPr5jF;Ths1z5gSu(+Je*o`SF9DB?~+N$>afLOJ)xRNCktB}xN{
zvE;wO?p8NX_2lQ{j|sj-p>#Vxw-NfX&g1%D8Q&RgH{DJC55$%97MbBhs$Ez84+*_W
z)2O>m6(k+749fj*0&x$~$?nnbmVHDwVk2>csNmW=xP=JnOVpOwNnA;fk<oiUhlZI}
znS;fY2N0dfC!<odseJBL`6gA6ZXw<$_+&VXi1oz%gwo&j^0ncnD&iCsFEp1Vchr_R
zmDW`*`55wBaT4B$zaVOerw9*qO4D&Wmf#;lHT(w;eus#o?pOF3@iCzn^-AK)<UDAF
zIK0lIBS9J(`sx1YNe9EoE+#G!dI5(~SC7XCy_j=}GU{@OC}K6`hl$g~n}pH`q6hJ3
z;s)AGCNjwL)pM>V|1OU4F#aoKZY3fJrF<?b{Xjp+*TFS7gUC`Hshap{DCd4^eB{Ry
zUF}}|O8b%squj^pCYV$^f6)(8v%7x&PNmR`2Kz(R{2s(#5<RW_A&wzlCiW6*2&E;&
zMWUAY6LFb%no!Co^r63?!d2<<tMb9`Qs_eLCO#z+i4#OeCR2#zcn7B798ARHsMN_N
z^lzlUkxwDgh>?WSkBA|(e+U~@Vd*(MO1!2|(jGFKiLZ&V!~)_<`WKljI{3mWlFdhO
zHuc%Kf*4G`7yg`3`aTg&^rK$sbz-FD`;w0(|1*3ebQ;KPAd(2B1Zx;@i%t*9d6pM%
zTYeBeKxA{hgWY47LVVKvY3Gi?0<Kh2_F9W&<a=BGu=2!8VgNCl_=+ed))80Ii)1zt
zlZd56H}3y6o+Fh0Nkmfj4=g9HC0dBgEAJQi(69P?F^PupHi2oBuOqG@eoM5q`uoT$
z>2#h9<v0v>&5EJFw(_j*S}fwia=Vy{9YXnm{6%DqhEUOJ4Q|FL%ZoB1opz&fR_pAP
zOP<7~0birP=4M}Zpx9fv*jK;I*IJSKV7utWHU33DZ-APGtsnGi?}@5us__OImNw4!
zwf;H%q$jR)d6Vv}_tw|>Zwj=&()<3f@JV&GjWvz8wNB`p;At+;y)k0G&)?*oR2OL8
zoBMIT&s$Sp@9mux>U8e>hNb?d>_BLUWxjw@>HE+1y4#sf^W%A+hG{;5*0uTF+J^ge
z8?)O|u(HiaccuYn1{3nuHZ<I1+4{OblVuxyH4Ezei@Y`So9dR;HQna6bvp^P77h9$
zynFAg|E~Vzs@=ujgKL{=79HH)$e8_x?hR{hD36RjxvJ&h4!64XWJ#kZu`;v?-UUAI
zf(F0;;0_vBj&5!fH>u9&4|si{ZK3W|sV5@3Y>Cf*Wm8T~Uf~HZUs_vVcW_7Zys}kc
z>`Rlc^=R4Mp2Dhzx<+rkFYtf6b7g2Y=;}719crzfTH=YiYR->TbZD1U>aX`L^EGOI
r^;gZ^*Sf7Lrfur~^cUdSEn~5Ct!$vF`Gpy&aVq?`S?kdmMPdI2q4Lc5

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 66ee8cf1..6c6ecb40 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-28 22:42+0000\n"
+"POT-Creation-Date: 2021-03-31 09:22-0700\n"
 "PO-Revision-Date: 2021-03-02 12:37+0100\n"
 "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -49,46 +49,66 @@ msgstr ""
 msgid "Unlimited"
 msgstr "Non listé"
 
-#: bookwyrm/models/fields.py:25
+#: bookwyrm/models/fields.py:24
 #, python-format
 msgid "%(value)s is not a valid remote_id"
 msgstr ""
 
-#: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:47
+#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
 #, python-format
 msgid "%(value)s is not a valid username"
 msgstr ""
 
-#: bookwyrm/models/fields.py:170 bookwyrm/templates/layout.html:157
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:157
 #, fuzzy
 #| msgid "Username:"
 msgid "username"
 msgstr "Nom d’utilisateur :"
 
-#: bookwyrm/models/fields.py:175
+#: bookwyrm/models/fields.py:170
 msgid "A user with that username already exists."
 msgstr ""
 
-#: bookwyrm/settings.py:148
+#: bookwyrm/settings.py:150
 msgid "English"
 msgstr ""
 
-#: bookwyrm/settings.py:149
+#: bookwyrm/settings.py:151
 msgid "German"
 msgstr ""
 
-#: bookwyrm/settings.py:150
+#: bookwyrm/settings.py:152
 msgid "Spanish"
 msgstr ""
 
-#: bookwyrm/settings.py:151
+#: bookwyrm/settings.py:153
 msgid "French"
 msgstr ""
 
-#: bookwyrm/settings.py:152
+#: bookwyrm/settings.py:154
 msgid "Simplified Chinese"
 msgstr ""
 
+#: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8
+msgid "Not Found"
+msgstr "Introuvable"
+
+#: bookwyrm/templates/404.html:9
+msgid "The page you requested doesn't seem to exist!"
+msgstr "Il semblerait que la page que vous avez demandée n’existe pas !"
+
+#: bookwyrm/templates/500.html:4
+msgid "Oops!"
+msgstr "Oups !"
+
+#: bookwyrm/templates/500.html:8
+msgid "Server Error"
+msgstr "Erreur côté serveur"
+
+#: bookwyrm/templates/500.html:9
+msgid "Something went wrong! Sorry about that."
+msgstr "Une erreur s’est produite ; désolé !"
+
 #: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
 msgid "Edit Author"
 msgstr "Modifier l’auteur ou autrice"
@@ -112,96 +132,68 @@ msgstr ""
 msgid "Edit Book"
 msgstr "Modifier le livre"
 
-#: bookwyrm/templates/book/book.html:45
+#: bookwyrm/templates/book/book.html:49
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "Ajouter une couverture"
 
-#: bookwyrm/templates/book/book.html:55
+#: bookwyrm/templates/book/book.html:59
 msgid "ISBN:"
 msgstr "ISBN :"
 
-#: bookwyrm/templates/book/book.html:62
+#: bookwyrm/templates/book/book.html:66
 #: bookwyrm/templates/book/edit_book.html:211
 msgid "OCLC Number:"
 msgstr "Numéro OCLC :"
 
-#: bookwyrm/templates/book/book.html:69
+#: bookwyrm/templates/book/book.html:73
 #: bookwyrm/templates/book/edit_book.html:215
 msgid "ASIN:"
 msgstr "ASIN :"
 
-#: bookwyrm/templates/book/book.html:79
-#, fuzzy, python-format
-#| msgid "of %(book.pages)s pages"
-msgid "%(format)s, %(pages)s pages"
-msgstr "sur %(book.pages)s pages"
-
-#: bookwyrm/templates/book/book.html:81
-#, fuzzy, python-format
-#| msgid "of %(book.pages)s pages"
-msgid "%(pages)s pages"
-msgstr "sur %(book.pages)s pages"
-
-#: bookwyrm/templates/book/book.html:86
-#, python-format
-msgid "Published %(date)s by %(publisher)s."
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:88
-#, fuzzy, python-format
-#| msgid "Published date:"
-msgid "Published %(date)s"
-msgstr "Date de publication :"
-
-#: bookwyrm/templates/book/book.html:90
-#, python-format
-msgid "Published by %(publisher)s."
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:95
+#: bookwyrm/templates/book/book.html:82
 msgid "View on OpenLibrary"
 msgstr "Voir sur OpenLibrary"
 
-#: bookwyrm/templates/book/book.html:104
+#: bookwyrm/templates/book/book.html:91
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/book/book.html:110
+#: bookwyrm/templates/book/book.html:97
 #, fuzzy
 #| msgid "Description:"
 msgid "Add Description"
 msgstr "Ajouter une description"
 
-#: bookwyrm/templates/book/book.html:117
+#: bookwyrm/templates/book/book.html:104
 #: bookwyrm/templates/book/edit_book.html:101
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Description :"
 
-#: bookwyrm/templates/book/book.html:121
+#: bookwyrm/templates/book/book.html:108
 #: bookwyrm/templates/book/edit_book.html:225
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:68
+#: bookwyrm/templates/preferences/edit_user.html:70
 #: bookwyrm/templates/settings/site.html:93
-#: bookwyrm/templates/snippets/readthrough.html:64
+#: bookwyrm/templates/snippets/readthrough.html:65
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
 msgid "Save"
 msgstr "Enregistrer"
 
-#: bookwyrm/templates/book/book.html:122 bookwyrm/templates/book/book.html:171
+#: bookwyrm/templates/book/book.html:109 bookwyrm/templates/book/book.html:158
 #: bookwyrm/templates/book/cover_modal.html:32
 #: bookwyrm/templates/book/edit_book.html:226
 #: bookwyrm/templates/edit_author.html:79
 #: bookwyrm/templates/moderation/report_modal.html:32
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/readthrough.html:65
+#: bookwyrm/templates/snippets/readthrough.html:66
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
@@ -209,79 +201,79 @@ msgstr "Enregistrer"
 msgid "Cancel"
 msgstr "Annuler"
 
-#: bookwyrm/templates/book/book.html:131
+#: bookwyrm/templates/book/book.html:118
 #, fuzzy, python-format
 #| msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s\">%(title)s</a> par "
 
-#: bookwyrm/templates/book/book.html:139
+#: bookwyrm/templates/book/book.html:126
 #, fuzzy, python-format
 #| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/book/book.html:145
+#: bookwyrm/templates/book/book.html:132
 #, fuzzy, python-format
 #| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr " a ajouté <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre liste « <a href=\"%(list_path)s\">%(list_name)s</a> »"
 
-#: bookwyrm/templates/book/book.html:154
+#: bookwyrm/templates/book/book.html:141
 msgid "Your reading activity"
 msgstr "Votre activité de lecture"
 
-#: bookwyrm/templates/book/book.html:156
+#: bookwyrm/templates/book/book.html:143
 #, fuzzy
 #| msgid "Edit read dates"
 msgid "Add read dates"
 msgstr "Ajouter des dates de lecture"
 
-#: bookwyrm/templates/book/book.html:161
+#: bookwyrm/templates/book/book.html:148
 msgid "You don't have any reading activity for this book."
 msgstr "Vous n’avez aucune activité de lecture pour ce livre"
 
-#: bookwyrm/templates/book/book.html:168
+#: bookwyrm/templates/book/book.html:155
 msgid "Create"
 msgstr "Créer"
 
-#: bookwyrm/templates/book/book.html:190
+#: bookwyrm/templates/book/book.html:177
 msgid "Tags"
 msgstr "Tags"
 
-#: bookwyrm/templates/book/book.html:194
+#: bookwyrm/templates/book/book.html:181
 #: bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr "Ajouter un tag"
 
-#: bookwyrm/templates/book/book.html:211
+#: bookwyrm/templates/book/book.html:198
 msgid "Subjects"
 msgstr "Sujets"
 
-#: bookwyrm/templates/book/book.html:222
+#: bookwyrm/templates/book/book.html:209
 msgid "Places"
 msgstr "Lieux"
 
-#: bookwyrm/templates/book/book.html:233 bookwyrm/templates/layout.html:64
-#: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
+#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listes"
 
-#: bookwyrm/templates/book/book.html:244
+#: bookwyrm/templates/book/book.html:231
 #, fuzzy
 #| msgid "Go to list"
 msgid "Add to list"
 msgstr "Aller à la liste"
 
-#: bookwyrm/templates/book/book.html:254
+#: bookwyrm/templates/book/book.html:241
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:90
 msgid "Add"
 msgstr "Ajouter"
 
-#: bookwyrm/templates/book/book.html:282
+#: bookwyrm/templates/book/book.html:269
 msgid "rated it"
 msgstr "l’a noté"
 
@@ -430,7 +422,7 @@ msgid "John Doe, Jane Smith"
 msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:155
-#: bookwyrm/templates/snippets/shelf.html:9
+#: bookwyrm/templates/user/shelf.html:72
 msgid "Cover"
 msgstr "Couverture"
 
@@ -439,6 +431,7 @@ msgid "Physical Properties"
 msgstr "Propriétés physiques"
 
 #: bookwyrm/templates/book/edit_book.html:183
+#: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "Format :"
 
@@ -463,6 +456,60 @@ msgstr "ISBN 10 :"
 msgid "Openlibrary key:"
 msgstr "Clé Openlibrary :"
 
+#: bookwyrm/templates/book/editions.html:5
+#, fuzzy, python-format
+#| msgid "Finish \"<em>%(book_title)s</em>\""
+msgid "Editions of %(book_title)s"
+msgstr "Éditions de %(book_title)s"
+
+#: bookwyrm/templates/book/editions.html:9
+#, python-format
+msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+msgstr "Éditions de <a href=\"%(work_path)s\">« %(work_title)s »</a>"
+
+#: bookwyrm/templates/book/format_filter.html:8
+#: bookwyrm/templates/book/language_filter.html:8
+msgid "Any"
+msgstr ""
+
+#: bookwyrm/templates/book/language_filter.html:5
+msgid "Language:"
+msgstr ""
+
+#: bookwyrm/templates/book/publisher_info.html:6
+#, fuzzy, python-format
+#| msgid "of %(book.pages)s pages"
+msgid "%(format)s, %(pages)s pages"
+msgstr "sur %(book.pages)s pages"
+
+#: bookwyrm/templates/book/publisher_info.html:8
+#, fuzzy, python-format
+#| msgid "of %(book.pages)s pages"
+msgid "%(pages)s pages"
+msgstr "sur %(book.pages)s pages"
+
+#: bookwyrm/templates/book/publisher_info.html:13
+#, fuzzy, python-format
+#| msgid "of %(book.pages)s pages"
+msgid "%(languages)s language"
+msgstr "sur %(book.pages)s pages"
+
+#: bookwyrm/templates/book/publisher_info.html:18
+#, python-format
+msgid "Published %(date)s by %(publisher)s."
+msgstr ""
+
+#: bookwyrm/templates/book/publisher_info.html:20
+#, fuzzy, python-format
+#| msgid "Published date:"
+msgid "Published %(date)s"
+msgstr "Date de publication :"
+
+#: bookwyrm/templates/book/publisher_info.html:22
+#, python-format
+msgid "Published by %(publisher)s."
+msgstr ""
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/feed/feed_layout.html:57
 #, fuzzy
@@ -470,95 +517,46 @@ msgstr "Clé Openlibrary :"
 msgid "Close"
 msgstr "Fermer"
 
-#: bookwyrm/templates/directory.html:6 bookwyrm/templates/directory.html:11
-#: bookwyrm/templates/layout.html:97
-msgid "Directory"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:19
-msgid "Make your profile discoverable to other BookWyrm users."
-msgstr ""
-
-#: bookwyrm/templates/directory.html:26
-#, fuzzy, python-format
-#| msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
-msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
-msgstr "Vous pouvez définir ou changer vore défi lecture à n’importe quel moment depuis votre <a href=\"%(path)s\">profil</a>"
-
-#: bookwyrm/templates/directory.html:31
-#: bookwyrm/templates/snippets/goal_card.html:22
-msgid "Dismiss message"
-msgstr "Rejeter le message"
-
-#: bookwyrm/templates/directory.html:44
-#, fuzzy
-#| msgid "Show less"
-msgid "Show filters"
-msgstr "Replier"
-
-#: bookwyrm/templates/directory.html:46
-msgid "Hide filters"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:55
-#, fuzzy
-#| msgid "User Activity"
-msgid "User type"
-msgstr "Activité du compte"
-
-#: bookwyrm/templates/directory.html:58
-#, fuzzy
-#| msgid "Blocked users"
-msgid "BookWyrm users"
-msgstr "Comptes bloqués"
-
-#: bookwyrm/templates/directory.html:62
-msgid "All known users"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:68
+#: bookwyrm/templates/directory/community_filter.html:5
 #, fuzzy
 #| msgid "Comment"
 msgid "Community"
 msgstr "Commentaire"
 
-#: bookwyrm/templates/directory.html:71
+#: bookwyrm/templates/directory/community_filter.html:8
 #, fuzzy
 #| msgid "Blocked users"
 msgid "Local users"
 msgstr "Comptes bloqués"
 
-#: bookwyrm/templates/directory.html:75
+#: bookwyrm/templates/directory/community_filter.html:12
 #, fuzzy
 #| msgid "Federated"
 msgid "Federated community"
 msgstr "Fédéré"
 
-#: bookwyrm/templates/directory.html:81
-msgid "Order by"
+#: bookwyrm/templates/directory/directory.html:6
+#: bookwyrm/templates/directory/directory.html:11
+#: bookwyrm/templates/layout.html:97
+msgid "Directory"
 msgstr ""
 
-#: bookwyrm/templates/directory.html:84
-#, fuzzy
-#| msgid "Suggest"
-msgid "Suggested"
-msgstr "Suggérer"
-
-#: bookwyrm/templates/directory.html:85
-msgid "Recently active"
+#: bookwyrm/templates/directory/directory.html:19
+msgid "Make your profile discoverable to other BookWyrm users."
 msgstr ""
 
-#: bookwyrm/templates/directory.html:91
-msgid "Apply filters"
-msgstr ""
+#: bookwyrm/templates/directory/directory.html:26
+#, fuzzy, python-format
+#| msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
+msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
+msgstr "Vous pouvez définir ou changer vore défi lecture à n’importe quel moment depuis votre <a href=\"%(path)s\">profil</a>"
 
-#: bookwyrm/templates/directory.html:94
-#, fuzzy
-#| msgid "Clear search"
-msgid "Clear filters"
-msgstr "Vider la requête"
+#: bookwyrm/templates/directory/directory.html:31
+#: bookwyrm/templates/snippets/goal_card.html:22
+msgid "Dismiss message"
+msgstr "Rejeter le message"
 
-#: bookwyrm/templates/directory.html:128
+#: bookwyrm/templates/directory/directory.html:71
 #, fuzzy
 #| msgid "followed you"
 msgid "follower you follow"
@@ -566,7 +564,7 @@ msgid_plural "followers you follow"
 msgstr[0] "s’est abonné(e)"
 msgstr[1] "s’est abonné(e)"
 
-#: bookwyrm/templates/directory.html:135
+#: bookwyrm/templates/directory/directory.html:78
 #, fuzzy
 #| msgid "Your shelves"
 msgid "book on your shelves"
@@ -574,14 +572,44 @@ msgid_plural "books on your shelves"
 msgstr[0] "Vos étagères"
 msgstr[1] "Vos étagères"
 
-#: bookwyrm/templates/directory.html:143
+#: bookwyrm/templates/directory/directory.html:86
 msgid "posts"
 msgstr ""
 
-#: bookwyrm/templates/directory.html:149
+#: bookwyrm/templates/directory/directory.html:92
 msgid "last active"
 msgstr ""
 
+#: bookwyrm/templates/directory/sort_filter.html:5
+msgid "Order by"
+msgstr ""
+
+#: bookwyrm/templates/directory/sort_filter.html:8
+#, fuzzy
+#| msgid "Suggest"
+msgid "Suggested"
+msgstr "Suggérer"
+
+#: bookwyrm/templates/directory/sort_filter.html:9
+msgid "Recently active"
+msgstr ""
+
+#: bookwyrm/templates/directory/user_type_filter.html:5
+#, fuzzy
+#| msgid "User Activity"
+msgid "User type"
+msgstr "Activité du compte"
+
+#: bookwyrm/templates/directory/user_type_filter.html:8
+#, fuzzy
+#| msgid "Blocked users"
+msgid "BookWyrm users"
+msgstr "Comptes bloqués"
+
+#: bookwyrm/templates/directory/user_type_filter.html:12
+msgid "All known users"
+msgstr ""
+
 #: bookwyrm/templates/discover/about.html:7
 #, fuzzy, python-format
 #| msgid "Join %(name)s"
@@ -692,17 +720,6 @@ msgstr "Clé Librarything :"
 msgid "Goodreads key:"
 msgstr "Clé Goodreads :"
 
-#: bookwyrm/templates/editions.html:5
-#, fuzzy, python-format
-#| msgid "Finish \"<em>%(book_title)s</em>\""
-msgid "Editions of %(book_title)s"
-msgstr "Éditions de %(book_title)s"
-
-#: bookwyrm/templates/editions.html:9
-#, python-format
-msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
-msgstr "Éditions de <a href=\"%(work_path)s\">« %(work_title)s »</a>"
-
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
@@ -769,18 +786,6 @@ msgstr ""
 msgid "Reset your %(site_name)s password"
 msgstr "À propos de %(name)s"
 
-#: bookwyrm/templates/error.html:4
-msgid "Oops!"
-msgstr "Oups !"
-
-#: bookwyrm/templates/error.html:8
-msgid "Server Error"
-msgstr "Erreur côté serveur"
-
-#: bookwyrm/templates/error.html:9
-msgid "Something went wrong! Sorry about that."
-msgstr "Une erreur s’est produite ; désolé !"
-
 #: bookwyrm/templates/feed/direct_messages.html:8
 #, python-format
 msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
@@ -861,6 +866,8 @@ msgid "Updates"
 msgstr "Mises à jour"
 
 #: bookwyrm/templates/feed/feed_layout.html:11
+#: bookwyrm/templates/layout.html:58
+#: bookwyrm/templates/user/books_header.html:3
 msgid "Your books"
 msgstr "Vos livres"
 
@@ -869,14 +876,14 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr "Aucun livre ici pour l’instant ! Cherchez un livre pour commencer"
 
 #: bookwyrm/templates/feed/feed_layout.html:23
-#: bookwyrm/templates/user/shelf.html:24
+#: bookwyrm/templates/user/shelf.html:25
 #, fuzzy
 #| msgid "Read"
 msgid "To Read"
 msgstr "Lu"
 
 #: bookwyrm/templates/feed/feed_layout.html:24
-#: bookwyrm/templates/user/shelf.html:24
+#: bookwyrm/templates/user/shelf.html:25
 #, fuzzy
 #| msgid "Started reading"
 msgid "Currently Reading"
@@ -884,7 +891,7 @@ msgstr "Commencer la lecture"
 
 #: bookwyrm/templates/feed/feed_layout.html:25
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-#: bookwyrm/templates/user/shelf.html:24
+#: bookwyrm/templates/user/shelf.html:25
 msgid "Read"
 msgstr "Lu"
 
@@ -933,27 +940,33 @@ msgstr "Livres de %(username)s en %(year)s"
 msgid "Import Books"
 msgstr "Importer des livres"
 
-#: bookwyrm/templates/import.html:14
-msgid "Data source"
+#: bookwyrm/templates/import.html:16
+#, fuzzy
+#| msgid "Data source"
+msgid "Data source:"
 msgstr "Source de données"
 
-#: bookwyrm/templates/import.html:32
+#: bookwyrm/templates/import.html:29
+msgid "Data file:"
+msgstr ""
+
+#: bookwyrm/templates/import.html:37
 msgid "Include reviews"
 msgstr "Importer les critiques"
 
-#: bookwyrm/templates/import.html:37
+#: bookwyrm/templates/import.html:42
 msgid "Privacy setting for imported reviews:"
 msgstr "Confidentialité des critiques importées :"
 
-#: bookwyrm/templates/import.html:41
+#: bookwyrm/templates/import.html:48
 msgid "Import"
 msgstr "Importer"
 
-#: bookwyrm/templates/import.html:46
+#: bookwyrm/templates/import.html:53
 msgid "Recent Imports"
 msgstr "Importations récentes"
 
-#: bookwyrm/templates/import.html:48
+#: bookwyrm/templates/import.html:55
 msgid "No recent imports"
 msgstr "Aucune importation récente"
 
@@ -1010,12 +1023,12 @@ msgstr "Livre"
 
 #: bookwyrm/templates/import_status.html:115
 #: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/snippets/shelf.html:10
+#: bookwyrm/templates/user/shelf.html:73
 msgid "Title"
 msgstr "Titre"
 
 #: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/snippets/shelf.html:11
+#: bookwyrm/templates/user/shelf.html:74
 msgid "Author"
 msgstr "Auteur ou autrice"
 
@@ -1071,10 +1084,6 @@ msgstr "Chercher"
 msgid "Main navigation menu"
 msgstr "Menu de navigation principal "
 
-#: bookwyrm/templates/layout.html:58
-msgid "Your shelves"
-msgstr "Vos étagères"
-
 #: bookwyrm/templates/layout.html:61
 msgid "Feed"
 msgstr "Fil d’actualité"
@@ -1091,7 +1100,7 @@ msgid "Settings"
 msgstr "Paramètres de l’instance"
 
 #: bookwyrm/templates/layout.html:116
-#: bookwyrm/templates/settings/admin_layout.html:20
+#: bookwyrm/templates/settings/admin_layout.html:24
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
 #: bookwyrm/templates/settings/manage_invites.html:15
@@ -1155,7 +1164,7 @@ msgid "BookWyrm is open source software. You can contribute or report issues on
 msgstr "Bookwyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports de bogues via <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
 #: bookwyrm/templates/lists/create_form.html:5
-#: bookwyrm/templates/lists/lists.html:17
+#: bookwyrm/templates/lists/lists.html:19
 msgid "Create List"
 msgstr "Créer une liste"
 
@@ -1221,7 +1230,7 @@ msgid "Anyone can suggest books, subject to your approval"
 msgstr "N’importe qui peut suggérer des livres, soumis à votre approbation"
 
 #: bookwyrm/templates/lists/form.html:31
-#: bookwyrm/templates/moderation/reports.html:11
+#: bookwyrm/templates/moderation/reports.html:24
 msgid "Open"
 msgstr "Ouverte"
 
@@ -1240,6 +1249,7 @@ msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/lists/list.html:41
+#: bookwyrm/templates/snippets/shelf_selector.html:28
 msgid "Remove"
 msgstr "Supprimer"
 
@@ -1276,20 +1286,6 @@ msgstr "Aucun livre trouvé"
 msgid "Suggest"
 msgstr "Suggérer"
 
-#: bookwyrm/templates/lists/lists.html:14
-msgid "Your lists"
-msgstr "Vos listes"
-
-#: bookwyrm/templates/lists/lists.html:32
-#, fuzzy, python-format
-#| msgid "See all %(size)s"
-msgid "See all %(size)s lists"
-msgstr "Voir les %(size)s"
-
-#: bookwyrm/templates/lists/lists.html:40
-msgid "Recent Lists"
-msgstr "Listes récentes"
-
 #: bookwyrm/templates/login.html:4
 msgid "Login"
 msgstr "Connexion"
@@ -1403,27 +1399,37 @@ msgstr ""
 msgid "Resolve"
 msgstr ""
 
-#: bookwyrm/templates/moderation/reports.html:4
-#: bookwyrm/templates/moderation/reports.html:5
-#: bookwyrm/templates/settings/admin_layout.html:24
+#: bookwyrm/templates/moderation/reports.html:6
+#, fuzzy, python-format
+#| msgid "Join %(name)s"
+msgid "Reports: %(server_name)s"
+msgstr "Listes : %(username)s"
+
+#: bookwyrm/templates/moderation/reports.html:8
+#: bookwyrm/templates/moderation/reports.html:16
+#: bookwyrm/templates/settings/admin_layout.html:28
 #, fuzzy
 #| msgid "Recent Imports"
 msgid "Reports"
 msgstr "Importations récentes"
 
-#: bookwyrm/templates/moderation/reports.html:14
+#: bookwyrm/templates/moderation/reports.html:13
+#, fuzzy, python-format
+#| msgid "Join %(name)s"
+msgid "Reports: <small>%(server_name)s</small>"
+msgstr "Listes : %(username)s"
+
+#: bookwyrm/templates/moderation/reports.html:27
 #, fuzzy
 #| msgid "Shelved"
 msgid "Resolved"
 msgstr "Ajouté à une étagère"
 
-#: bookwyrm/templates/notfound.html:4 bookwyrm/templates/notfound.html:8
-msgid "Not Found"
-msgstr "Introuvable"
-
-#: bookwyrm/templates/notfound.html:9
-msgid "The page you requested doesn't seem to exist!"
-msgstr "Il semblerait que la page que vous avez demandée n’existe pas !"
+#: bookwyrm/templates/moderation/reports.html:34
+#, fuzzy
+#| msgid "No books found"
+msgid "No reports found."
+msgstr "Aucun livre trouvé"
 
 #: bookwyrm/templates/notifications.html:14
 msgid "Delete notifications"
@@ -1655,16 +1661,23 @@ msgstr "Administration"
 msgid "Manage Users"
 msgstr "Gérer les comptes"
 
-#: bookwyrm/templates/settings/admin_layout.html:28
-#: bookwyrm/templates/settings/federation.html:4
+#: bookwyrm/templates/settings/admin_layout.html:19
+#: bookwyrm/templates/settings/user_admin.html:3
+#: bookwyrm/templates/settings/user_admin.html:10
+msgid "Users"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/federation.html:3
+#: bookwyrm/templates/settings/federation.html:5
 msgid "Federated Servers"
 msgstr "Serveurs fédérés"
 
-#: bookwyrm/templates/settings/admin_layout.html:33
+#: bookwyrm/templates/settings/admin_layout.html:37
 msgid "Instance Settings"
 msgstr "Paramètres de l’instance"
 
-#: bookwyrm/templates/settings/admin_layout.html:37
+#: bookwyrm/templates/settings/admin_layout.html:41
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 #, fuzzy
@@ -1672,36 +1685,109 @@ msgstr "Paramètres de l’instance"
 msgid "Site Settings"
 msgstr "Paramètres du site"
 
-#: bookwyrm/templates/settings/admin_layout.html:40
+#: bookwyrm/templates/settings/admin_layout.html:44
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr "Information sur l’instance"
 
-#: bookwyrm/templates/settings/admin_layout.html:41
+#: bookwyrm/templates/settings/admin_layout.html:45
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr "Images"
 
-#: bookwyrm/templates/settings/admin_layout.html:42
+#: bookwyrm/templates/settings/admin_layout.html:46
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr "Contenu du pied de page"
 
-#: bookwyrm/templates/settings/admin_layout.html:43
+#: bookwyrm/templates/settings/admin_layout.html:47
 #: bookwyrm/templates/settings/site.html:77
 msgid "Registration"
 msgstr "Enregistrement"
 
-#: bookwyrm/templates/settings/federation.html:10
+#: bookwyrm/templates/settings/federated_server.html:7
+msgid "Back to server list"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:12
+msgid "Details"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:15
+#, fuzzy
+#| msgid "Software"
+msgid "Software:"
+msgstr "Logiciel"
+
+#: bookwyrm/templates/settings/federated_server.html:19
+#, fuzzy
+#| msgid "Description:"
+msgid "Version:"
+msgstr "Description :"
+
+#: bookwyrm/templates/settings/federated_server.html:23
+#, fuzzy
+#| msgid "Status"
+msgid "Status:"
+msgstr "Statut"
+
+#: bookwyrm/templates/settings/federated_server.html:30
+#: bookwyrm/templates/user/user_layout.html:50
+msgid "Activity"
+msgstr "Activité"
+
+#: bookwyrm/templates/settings/federated_server.html:33
+#, fuzzy
+#| msgid "Username:"
+msgid "Users:"
+msgstr "Nom d’utilisateur :"
+
+#: bookwyrm/templates/settings/federated_server.html:36
+#: bookwyrm/templates/settings/federated_server.html:43
+msgid "View all"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:40
+#, fuzzy
+#| msgid "Recent Imports"
+msgid "Reports:"
+msgstr "Importations récentes"
+
+#: bookwyrm/templates/settings/federated_server.html:47
+#, fuzzy
+#| msgid "followed you"
+msgid "Followed by us:"
+msgstr "s’est abonné(e)"
+
+#: bookwyrm/templates/settings/federated_server.html:53
+#, fuzzy
+#| msgid "followed you"
+msgid "Followed by them:"
+msgstr "s’est abonné(e)"
+
+#: bookwyrm/templates/settings/federated_server.html:59
+#, fuzzy
+#| msgid "Blocked Users"
+msgid "Blocked by us:"
+msgstr "Comptes bloqués"
+
+#: bookwyrm/templates/settings/federation.html:13
 msgid "Server name"
 msgstr "Nom du serveur"
 
-#: bookwyrm/templates/settings/federation.html:11
+#: bookwyrm/templates/settings/federation.html:17
+#, fuzzy
+#| msgid "Federated"
+msgid "Date federated"
+msgstr "Fédéré"
+
+#: bookwyrm/templates/settings/federation.html:21
 msgid "Software"
 msgstr "Logiciel"
 
-#: bookwyrm/templates/settings/federation.html:12
+#: bookwyrm/templates/settings/federation.html:24
 #: bookwyrm/templates/settings/manage_invite_requests.html:33
+#: bookwyrm/templates/settings/user_admin.html:32
 msgid "Status"
 msgstr "Statut"
 
@@ -1870,6 +1956,47 @@ msgstr "Demandes d’abonnement"
 msgid "Registration closed text:"
 msgstr "Texte affiché lorsque les enregistrements sont clos :"
 
+#: bookwyrm/templates/settings/user_admin.html:7
+#, python-format
+msgid "Users: <small>%(server_name)s</small>"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:20
+#, fuzzy
+#| msgid "Username:"
+msgid "Username"
+msgstr "Nom d’utilisateur :"
+
+#: bookwyrm/templates/settings/user_admin.html:24
+#, fuzzy
+#| msgid "added"
+msgid "Date Added"
+msgstr "a ajouté"
+
+#: bookwyrm/templates/settings/user_admin.html:28
+msgid "Last Active"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:36
+#, fuzzy
+#| msgid "Remove"
+msgid "Remote server"
+msgstr "Supprimer"
+
+#: bookwyrm/templates/settings/user_admin.html:45
+#, fuzzy
+#| msgid "Activity"
+msgid "Active"
+msgstr "Activité"
+
+#: bookwyrm/templates/settings/user_admin.html:45
+msgid "Inactive"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:50
+msgid "Not set"
+msgstr ""
+
 #: bookwyrm/templates/snippets/block_button.html:5
 msgid "Block"
 msgstr "Bloquer"
@@ -1928,7 +2055,7 @@ msgid "Review:"
 msgstr "Critique"
 
 #: bookwyrm/templates/snippets/create_status_form.html:29
-#: bookwyrm/templates/snippets/shelf.html:17
+#: bookwyrm/templates/user/shelf.html:78
 msgid "Rating"
 msgstr "Note"
 
@@ -2002,6 +2129,26 @@ msgstr "Ajouter le statut aux favoris"
 msgid "Un-like status"
 msgstr "Supprimer le statut des favoris"
 
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:7
+#, fuzzy
+#| msgid "Show less"
+msgid "Show filters"
+msgstr "Replier"
+
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:9
+msgid "Hide filters"
+msgstr ""
+
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:19
+msgid "Apply filters"
+msgstr ""
+
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:23
+#, fuzzy
+#| msgid "Clear search"
+msgid "Clear filters"
+msgstr "Vider la requête"
+
 #: bookwyrm/templates/snippets/follow_button.html:12
 msgid "Follow"
 msgstr "S’abonner"
@@ -2135,32 +2282,32 @@ msgstr "Laisser une note"
 msgid "Rate"
 msgstr "Noter"
 
-#: bookwyrm/templates/snippets/readthrough.html:7
+#: bookwyrm/templates/snippets/readthrough.html:8
 msgid "Progress Updates:"
 msgstr "Progression :"
 
-#: bookwyrm/templates/snippets/readthrough.html:11
+#: bookwyrm/templates/snippets/readthrough.html:12
 msgid "finished"
 msgstr "terminé"
 
-#: bookwyrm/templates/snippets/readthrough.html:14
+#: bookwyrm/templates/snippets/readthrough.html:15
 msgid "Show all updates"
 msgstr "Montrer toutes les progressions"
 
-#: bookwyrm/templates/snippets/readthrough.html:30
+#: bookwyrm/templates/snippets/readthrough.html:31
 msgid "Delete this progress update"
 msgstr "Supprimer cette mise à jour"
 
-#: bookwyrm/templates/snippets/readthrough.html:40
+#: bookwyrm/templates/snippets/readthrough.html:41
 msgid "started"
 msgstr "commencé"
 
-#: bookwyrm/templates/snippets/readthrough.html:46
-#: bookwyrm/templates/snippets/readthrough.html:60
+#: bookwyrm/templates/snippets/readthrough.html:47
+#: bookwyrm/templates/snippets/readthrough.html:61
 msgid "Edit read dates"
 msgstr "Modifier les date de lecture"
 
-#: bookwyrm/templates/snippets/readthrough.html:50
+#: bookwyrm/templates/snippets/readthrough.html:51
 #, fuzzy
 #| msgid "Delete these read dates?"
 msgid "Delete these read dates"
@@ -2226,45 +2373,11 @@ msgstr "par %(author)s"
 msgid "Import book"
 msgstr "Importer le livre"
 
-#: bookwyrm/templates/snippets/shelf.html:12
-msgid "Published"
-msgstr "Publié"
-
-#: bookwyrm/templates/snippets/shelf.html:13
-msgid "Shelved"
-msgstr "Ajouté à une étagère"
-
-#: bookwyrm/templates/snippets/shelf.html:14
-msgid "Started"
-msgstr "Commencé"
-
-#: bookwyrm/templates/snippets/shelf.html:15
-msgid "Finished"
-msgstr "Terminé"
-
-#: bookwyrm/templates/snippets/shelf.html:16
-msgid "External links"
-msgstr "Liens externes"
-
-#: bookwyrm/templates/snippets/shelf.html:44
-msgid "OpenLibrary"
-msgstr "OpenLibrary"
-
-#: bookwyrm/templates/snippets/shelf.html:61
-msgid "This shelf is empty."
-msgstr "Cette étagère est vide"
-
-#: bookwyrm/templates/snippets/shelf.html:67
-msgid "Delete shelf"
-msgstr "Supprimer l’étagère"
-
 #: bookwyrm/templates/snippets/shelf_selector.html:4
-msgid "Change shelf"
-msgstr "Changer d’étagère"
-
-#: bookwyrm/templates/snippets/shelf_selector.html:27
-msgid "Unshelve"
-msgstr "Enlever de l’étagère"
+#, fuzzy
+#| msgid "Your books"
+msgid "Move book"
+msgstr "Vos livres"
 
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
 #, python-format
@@ -2272,7 +2385,7 @@ msgid "Finish \"<em>%(book_title)s</em>\""
 msgstr "Terminer « <em>%(book_title)s</em> »"
 
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:33
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:35
 #, fuzzy
 #| msgid "Updated:"
 msgid "Update progress"
@@ -2299,6 +2412,12 @@ msgstr "Terminer la lecture"
 msgid "Want to read"
 msgstr "Je veux le lire"
 
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:48
+#, fuzzy, python-format
+#| msgid "Join %(name)s"
+msgid "Remove from %(name)s"
+msgstr "Listes : %(username)s"
+
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
 #, python-format
 msgid "Start \"<em>%(book_title)s</em>\""
@@ -2371,6 +2490,18 @@ msgstr "Plus d’options"
 msgid "Switch to this edition"
 msgstr "Changer vers cette édition"
 
+#: bookwyrm/templates/snippets/table-sort-header.html:6
+#, fuzzy
+#| msgid "Started reading"
+msgid "Sorted asccending"
+msgstr "Lecture commencée le"
+
+#: bookwyrm/templates/snippets/table-sort-header.html:10
+#, fuzzy
+#| msgid "Started reading"
+msgid "Sorted descending"
+msgstr "Lecture commencée le"
+
 #: bookwyrm/templates/snippets/tag.html:14
 msgid "Remove tag"
 msgstr "Supprimer le tag"
@@ -2380,6 +2511,12 @@ msgstr "Supprimer le tag"
 msgid "Books tagged \"%(tag.name)s\""
 msgstr "Livres tagués « %(tag.name)s »"
 
+#: bookwyrm/templates/user/books_header.html:5
+#, fuzzy, python-format
+#| msgid "%(username)s has no followers"
+msgid "%(username)s's books"
+msgstr "Livres de %(username)s en %(year)s"
+
 #: bookwyrm/templates/user/create_shelf_form.html:5
 #: bookwyrm/templates/user/create_shelf_form.html:22
 msgid "Create Shelf"
@@ -2426,56 +2563,62 @@ msgstr "Listes : %(username)s"
 msgid "Create list"
 msgstr "Créer une liste"
 
-#: bookwyrm/templates/user/shelf.html:9
-msgid "Your Shelves"
-msgstr "Vos étagères"
-
-#: bookwyrm/templates/user/shelf.html:11
-#, python-format
-msgid "%(username)s: Shelves"
-msgstr "%(username)s : Étagères"
-
-#: bookwyrm/templates/user/shelf.html:33
+#: bookwyrm/templates/user/shelf.html:34
 msgid "Create shelf"
 msgstr "Créer l’étagère"
 
-#: bookwyrm/templates/user/shelf.html:54
+#: bookwyrm/templates/user/shelf.html:55
 msgid "Edit shelf"
 msgstr "Modifier l’étagère"
 
+#: bookwyrm/templates/user/shelf.html:75
+msgid "Shelved"
+msgstr "Ajouté à une étagère"
+
+#: bookwyrm/templates/user/shelf.html:76
+msgid "Started"
+msgstr "Commencé"
+
+#: bookwyrm/templates/user/shelf.html:77
+msgid "Finished"
+msgstr "Terminé"
+
+#: bookwyrm/templates/user/shelf.html:121
+msgid "This shelf is empty."
+msgstr "Cette étagère est vide"
+
+#: bookwyrm/templates/user/shelf.html:127
+msgid "Delete shelf"
+msgstr "Supprimer l’étagère"
+
 #: bookwyrm/templates/user/user.html:15
 msgid "Edit profile"
 msgstr "Modifier le profil"
 
-#: bookwyrm/templates/user/user.html:26
-#: bookwyrm/templates/user/user_layout.html:68
-msgid "Shelves"
-msgstr "Étagères"
-
-#: bookwyrm/templates/user/user.html:31
-#, python-format
-msgid "See all %(size)s"
+#: bookwyrm/templates/user/user.html:33
+#, fuzzy, python-format
+#| msgid "See all %(size)s"
+msgid "View all %(size)s"
 msgstr "Voir les %(size)s"
 
-#: bookwyrm/templates/user/user.html:44
-#, python-format
-msgid "See all %(shelf_count)s shelves"
-msgstr "Voir les %(shelf_count)s étagères"
+#: bookwyrm/templates/user/user.html:46
+msgid "View all books"
+msgstr ""
 
-#: bookwyrm/templates/user/user.html:56
+#: bookwyrm/templates/user/user.html:58
 #, python-format
 msgid "Set a reading goal for %(year)s"
 msgstr "Définir un défi lecture pour %(year)s"
 
-#: bookwyrm/templates/user/user.html:62
+#: bookwyrm/templates/user/user.html:64
 msgid "User Activity"
 msgstr "Activité du compte"
 
-#: bookwyrm/templates/user/user.html:65
+#: bookwyrm/templates/user/user.html:67
 msgid "RSS feed"
 msgstr "Flux RSS"
 
-#: bookwyrm/templates/user/user.html:76
+#: bookwyrm/templates/user/user.html:78
 msgid "No activities yet!"
 msgstr "Aucune activité pour l’instant !"
 
@@ -2483,14 +2626,16 @@ msgstr "Aucune activité pour l’instant !"
 msgid "Follow Requests"
 msgstr "Demandes d’abonnement"
 
-#: bookwyrm/templates/user/user_layout.html:50
-msgid "Activity"
-msgstr "Activité"
-
 #: bookwyrm/templates/user/user_layout.html:56
 msgid "Reading Goal"
 msgstr "Défi lecture"
 
+#: bookwyrm/templates/user/user_layout.html:68
+#, fuzzy
+#| msgid "Book"
+msgid "Books"
+msgstr "Livre"
+
 #: bookwyrm/templates/user/user_preview.html:13
 #, python-format
 msgid "Joined %(date)s"
@@ -2518,6 +2663,49 @@ msgstr ""
 msgid "A password reset link sent to %s"
 msgstr ""
 
+#~ msgid "Your shelves"
+#~ msgstr "Vos étagères"
+
+#~ msgid "Your lists"
+#~ msgstr "Vos listes"
+
+#, fuzzy, python-format
+#~| msgid "See all %(size)s"
+#~ msgid "See all %(size)s lists"
+#~ msgstr "Voir les %(size)s"
+
+#~ msgid "Recent Lists"
+#~ msgstr "Listes récentes"
+
+#~ msgid "Published"
+#~ msgstr "Publié"
+
+#~ msgid "External links"
+#~ msgstr "Liens externes"
+
+#~ msgid "OpenLibrary"
+#~ msgstr "OpenLibrary"
+
+#~ msgid "Change shelf"
+#~ msgstr "Changer d’étagère"
+
+#~ msgid "Unshelve"
+#~ msgstr "Enlever de l’étagère"
+
+#~ msgid "Your Shelves"
+#~ msgstr "Vos étagères"
+
+#, python-format
+#~ msgid "%(username)s: Shelves"
+#~ msgstr "%(username)s : Étagères"
+
+#~ msgid "Shelves"
+#~ msgstr "Étagères"
+
+#, python-format
+#~ msgid "See all %(shelf_count)s shelves"
+#~ msgstr "Voir les %(shelf_count)s étagères"
+
 #~ msgid "Send follow request"
 #~ msgstr "Envoyer une demande d’abonnement"
 
@@ -2660,9 +2848,6 @@ msgstr ""
 #~ msgid "Added by"
 #~ msgstr "Ajouté par"
 
-#~ msgid "added"
-#~ msgstr "a ajouté"
-
 #~ msgid "suggested adding"
 #~ msgstr "a suggéré l’ajout de"
 
diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
index 62c4cd964f8c11bc2d7d7c194ca333dec11d6d49..819542795f872411dcea455b2aa44f520118794a 100644
GIT binary patch
delta 9564
zcmZA634Bgh8prXQh!7-*EkTJb*4XzgNX1r4LM^dxkyt`dOL1$fQq_vuLMUpj{Z&=e
zQW>32TT8WC?J%YbwYFNzR1Nd{zxT;}%$!f3e9v>vz2}^J?vk`Ucq8D$p90)V;Xz9s
z%H9CSDUI7h9j8;E<1{a&R>v7p(Q(FO3eLrg7=}YCIZic9$6}a;I>m>z@iZ1hC)#mJ
zKp}hvt6+DGNB(i0Ro3wlmZ#$~mcv|?y@4xXBzZHek3CQWE<o1etjD_eF{a@|GqsB2
zj3NIP6R|^8$C-***a{<9eFNrqdQ+jzc>{Cf2UrA;VqrXo!T1yA!JFn?%uD_Vb7Ai4
zj#B_bQ0>Jr1k0j!qN?RhP&*ihd6?fxppqZ^U>zKens5bbL2FS1Z$zEA*Ye}2g`TqZ
z?@>E<2el(bYIqBdM~&A7!?6eIxDn{;iWX3j85o3_s1>iZd>7^?--lYzG2}6EPFnw$
zScv=rzJk|LJ2x)IdnRUM0rIt|g=|NS?~7so)p3Fb4SdE9IBy4BL=AikwZO+_a7}N5
zFf$5u3+tk;urF%7G}MF>F%+kvE@S~}-eon}f30+bb-ZUC$FV8xr;vY~kXqbFY>Zk+
zFVuMhu^^_S2A+kQXc21S)mRiape8(E{eM9{#OGWp5mauVUY{V|9UT~j(HMgTu{$=#
zp{NC9S^GxRgzs5?0`)qcLoMhU>LI*mJ~2ah&@_)*gi1atQPxl$HDP0GZ;vI(6HyBo
zgJHNCwUGVh5%Z+=pF+I_7f}nif`#!{)H4>y6B?!WKMxfRSOs-LBP@iiP*>6owUx=J
zg^fWCI0JRwtClafd>!h%-KYhgM4f*MHU3wqx8{<+o%{bA745(usI3gD=M5Z=`XH4<
zt@v5g03FN()I*kpnqZJQ0=2bi=zr+Y|Ind!U>WK{wqT^*{{vJs@E6wc9qI~hpauxw
zv!^R9h#H^_s=qes3gc1la~G_PW3ec%KrMU+YMi~OiH~6to<Ua)H5zymG)GO)3AN&W
zr~y)}e+=r1r(+SEjYV;}wQoo5#9q|GKCt%VsPR6w{2c1M3;O<Qt8UYvr~gmXm6mAe
z8I9VR24+hPCvS%upbzSoRvK!Yh2~1sLN}qVd^_qw4x%pbC~BOu4cUK9_#+Kv@OO;C
z@J8Omtx)Y9P$!N+J$zFwpMzS+GSmgUi#q;e^gs2e1^kLy;A7Oz<mXjVe-W38uJ9SG
ziP5N)_du;U2_tYI>aCc9+TsPM0T!bsScO{PR@ALIggWjtYMk?^1$<}zjGEWIM@2jE
z81*cKHgTLv_zY^Lab_pf35lqQ`l1#v1~t)S)Rwwf5i?Lb@;++ZbEvoM2h;`LM#giU
zyHvEof1?Hp<h!ehLr^CcM)j9NT|qSJitAb48g&6(EboVr<f*9R=Ag#Sz-U~FTF5cX
z&HT=%cEDMzK*u+zd-@1#Vc}-p6}Lt$ED<$fl9_7lQ&2lJ6aDWyYT{+63&^s3J?i|e
zSjPYUQ_+@wjavCN)CzMo_wHpFRwXZwI`KKwLXuEBG6Xf@SR9Shuq<9jEht|L&mySv
zN~4~ois<SdHlQM7QD3|csApgl>Vyo`z0E{z=?>Juhp;kcV|BcVIzFPMx6mlmEv$uF
zP%P^F0jT3fw`Biyz(g9fRdZ20un;xDCTrh?THt<bKZeD~KS2%j57fX{Q9E)Eb$(zh
zf8Jq!RR1v44vxp-I4jomwr(X2I$<N~UhTvf^kGN*r&*&FzX!-CVF^5pdRD$f?a(zW
zjgPPmMz;3)`=V~?IMmZW4Ryh@Tq?SP`KSdfM(s!@YNgvy@AC)N|2b+W&Rc#Nb;Z{#
zzmFR43F?aTunJ9F43$Trj<1Ot$8APM6SPG=guPL($w<_J8K?o*qE6V1THqe+ipQ}(
zhR1n-bdJNa<nN$vQ8w!MZ&5pW9W`GAwvp%DbvjVdL~~Iq%`mf218hNU*%8!2vavIM
zhF!2^TQ5(+y5#R;AYMmZ@h#N&f1(zgH{P>1KCkzG8<qNWJVf1sTJ5|O8e@0zwq_<K
zlK+ByES<Ra-aVg&xyj!^oxc?G;2I3ZO{o4Im=}GRgom*=^E(k8_)UiC=I5vbtFT`h
zpbqM-Xp93f0X2aSb=)Cr6u{2lRPsli`0C-L=e(_cgc0P0*fxz*)r><|SKg0GC}v<O
zd>i!?AI4#L0V`oF`&|Ktne(wc`3}^rI%8fz|670+X^(u~`%bjPdgQ}#JZ5VDRSDz9
z$XTc@zmJo#Q#U5XY~(km6O`cnOJ{S`mL_9S9F5^P3$<fQ&DG`xbDOybLpkn10{gFr
z<0K98oO#*2h2gY6v^+G?dzwpPJ=&{bKJ1TrJ5sO^jz=wI4r<)jP!p~|9k&T%aJNgP
z9+gX|6T-QC8HpMw3d>;~YfnVo`#zQrMoo}n?JuGxnqmD5QLo<;%QslQ4X4xY9;Bjs
z*SLpwFT0=y9EV!S49n-58P>iQ{a0e`yHOK=X#Jm>U!ZpIg7x3TGUN}jnBM=$7rcpT
znGI13Xkm6VdzwSdapnxvv+)|%#1p88?l;s0l<4VM1~qOa)I#g}bMAjDJD{^2(A^wl
zjzPUXFQHcc7P4~3hq@J?px&CZs0nYO7IN3}3cb9EtDz=tWO-XGq4z(*8dA+k<{Wb|
zY75s`zQ^(-=2>h15w(yz*aSoQ)u##DVG-<sT3`xl;bYO&mQ1Fi56N6RU=eD<rIv5O
zDDqvX<IkY({YBKnbrm(y1Jne$`I_mt0;uC6Ew5nKHe2-J{%fL+G-yTrP+L0;HPB0_
z{#mFiSc)2WD{8|17>3!XD?f)i?-$es-8Y}0z886uy#6q=SdzW}rD@Q>Rn3N|3F6Fd
zsD%tbT~Rvf_-WQY-}2SwR&zgUoD-;poyBPU24nDvOGQ@@)7LwoIciJeP*<FYe9oO@
z)c3%Lnm8Nv>-wzaKcFV~6*b`l%X9bhzK{j5IPK+7$2B(HSgXXFolygHN8OUas0F2>
zCZ38KXr8sNF?XVN=m=_u&RY9-7(spm_4Wku$AZSG;ORQGsc51Ws84BI)C#+z2JC63
zn$uCgbl$`&=tB+ocWb|fI<LS0ue~fPuYp=fEb5Ee3(M>G|5PekaTaRg&6e-9{D9?0
zE&l}Taoibe4;tv57lx&1FNV5Rbx;@9#_Wh%NCIlX!=y_kor)%Q%~wzdypDPsGEx1z
zQSI-eZc#RB!Y@$$w^9A~EDs#y9T$RHND0(&Wl_&oG`iZtrc^Z05Y)gf>Q=mtI$;HB
zfVGxyHg}>Xe9!#I+D}`49yQ(%mft}=OOH|Gh7D%_wUT0ky@sl0ZH%V95o&_|);`iq
zNBto(1$BNF>XW+%wZ)fF6a0=k|Dl;@h<B@tnq`Kt|2m)w4LYHL+1!jn^>;+=P*2Op
zqi)U1sPmRtdltr!Z$n-AH>jPvg1YkC=3`7C4|9ile=ZL~O*9iV;3CvRxfFFpYps8;
zc@(vv&#(^uj5@F6FmIf4W=&LkGpvkl%v3B%?q*QYN_U`EcnG8LQ`CZPq89Rp_2(My
z4Oj%Vu#%R?nDtT5PBYYb@u+dTTK_=QxXGTbGl7b>XeRQ}a^|BJbj7@jnkX>YJFyrB
zlb1KEVrBB$*dBXfTU=*eMct~H5#IYBhuXQm{+#<inMy1Ti%|!jMXmTMYN7|22OnD=
zoZ>Ac6#YA3#+a?FKM_MXZ=jiK?GsQtG!ujM{x77WD_&x*Lv7J6)C7l7C!9uodcQ?|
z$?jk@=1cXCuY+1}OUv7$-i`!J#Nn8R2Qdb#jpY7opk7quIMkIdz$DB>O?V%*L!qO*
zi8`Bo%w*I;C!iKE4?}Pf^5><q!n|d+8O@tU`|{De|2pAw8npFaqE5Vy-S94IfcP<9
zz6y2XE!1%pxSRqQgT1h+xx~DQO=xdB*845!qUL+cTs4;c*FfuOklW4u<}uVx{LPFW
z=jF4^OIVQprs>|m9Z?TgH*AKZQR8kkeHcLQ@*_X7MwMDLw8R0#CL)$-MVrb(>WM@(
z>c12JBI1d$v^B+D#0KiWpzifJ>L24Ef=zO^6M=+EKl(}$D*1>NgxiCL##DOY^8`EY
z{6@S<y(0d9=}CKG8ownzAgU8tv~|T-h{Z%sc_F8Qd7rA+;`pk>>Hz)zwW4iPSxd(|
zgvt*@F4c*Ng#IVx9@1`vN)-7{?2J+PfZ%UX|Nm&*McbRy^)1LLldUoxSJ0oGGr#V!
zik|YB#5y|l&Z|5}%p_NN)htV04`xoOXYFI~b*nEhdvVZpBAL7sQJdiJQD+L#NY}rS
z=wk=Zrmj+!{IOScW?0`|@<{5@c$k=F?JwYZtA9j$TdTi8eXG@}I<HW_uL|WTQIBxL
zlu;r)oHlksSMwO{Ul5Oo_SP0;(&W6OAC$SYb+`6ySc$eW7)^Xl{T?yc`j_Fm1fP4?
zscDU^%{o|zgPU6ZHg%P%9?nYhCHjXGg~%&m4J?U4*p8S_v><X3g=pu^a|+`WB8|Gr
zYXRDSN;?{x5dnlsM<U!`(-OV%9_T-_T)~m}1pgr7sgFaI;Y1kuYq%1hCG;IoX+gc9
zSM~qg!q4w>23N~79FQ9;V<*gqDjkT{{u;lgY5SCVeN4d_#DtvVu#45VU?8!GC`xQ6
zUM8L{Ka#l5^CO0sMQk8)$|w%rN}^vJ<%yF-9FbH0q*8%nrr}Ux8F7esx=f`%iFnZ(
z%TwP&<do8S|AWcO5NXztL0#W;mG6j1Vly#}&|fSc5*s--j~#!Wyg0Ftm_}O#>_Xfo
zROWd&4e4u4tRna~b1Ursc&d|WRQZxPNDLuL&~_95LgbV?R7TT&3iXSq0rg~DMO34{
z9#!fSO~_S>5p#(IC6w1aoRPR%_y2FiK4Kf8veQmnLwx{I&~o+hH^_fW8)`-9drLw6
zIB|*iiBLI0MA*4C@Llpb#IHncLdF05O`>xF$sjwpoWINaQQGRo>AOoklvrYI`*D-i
z+v6J?(-7-oOKVS{u2R5M{WMXI{BzB}l*(r`Od$S2EFs^G&58F3l`}*WVj!V%f|x{H
zAX07Muc)g`^>F6XKGy1@IeCa3JIw5>_x~212Z(Qo%EZfrN;n5qC-@gvX9WK2Z{>bc
zPo;j1c#(QHBBwm05=UNz=uiBcJd>zMJ(zg9^d`^k@}tC4t)EcuPb{ZBFY&DPy@WN1
ze-aak+4SYdqC`jPD(8r$L=|G7wf&vCN(T95f9-#NxSQ?3dAOFo8`l3e`9<n=iRsiw
zVV3n}lBW|r$QNS_F^5=39zyJ<K9o>dPIM*)6VK7+!?VPz1f`~Pm7ghe{1q3eiL!$j
zVgrQYc%qeZ-`q;m1AP%yz7O{0skJM>_fhSnKwph|yMldJo8%8z@~G+8zRS%v1^7<2
zC>P*+&@wy7mmPN?u+-qRw2|YT-f0ulqtb^B8k#aDIcm_52`Mk8Oqk+39Dgcg$%(Ed
zeEYlJ3HI&lnGxVi?A<-kw=d~%@RDhR?<|=#<eG2n(0KvAUc*BId?S*-3i5Rv^(e6T
j)m1y4A3uEiYUZ44E9U;Z>(G^bhkjbH#Wy>xQSg5N!h<#v

delta 10295
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
IpAi@MFNbI~7ytkO

diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index 83f128e9..2f547f10 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-28 22:42+0000\n"
+"POT-Creation-Date: 2021-03-31 09:22-0700\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"
@@ -49,44 +49,64 @@ msgstr "%(count)d 次使用"
 msgid "Unlimited"
 msgstr "���"
 
-#: bookwyrm/models/fields.py:25
+#: bookwyrm/models/fields.py:24
 #, python-format
 msgid "%(value)s is not a valid remote_id"
 msgstr "%(value)s �是有效的 remote_id"
 
-#: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:47
+#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
 #, python-format
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s �是有效的用户�"
 
-#: bookwyrm/models/fields.py:170 bookwyrm/templates/layout.html:157
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:157
 msgid "username"
 msgstr "用户�"
 
-#: bookwyrm/models/fields.py:175
+#: bookwyrm/models/fields.py:170
 msgid "A user with that username already exists."
 msgstr "已�存在使用该用户�的用户。"
 
-#: bookwyrm/settings.py:148
+#: bookwyrm/settings.py:150
 msgid "English"
 msgstr "English（英语）"
 
-#: bookwyrm/settings.py:149
+#: bookwyrm/settings.py:151
 msgid "German"
 msgstr "Deutsch（德语）"
 
-#: bookwyrm/settings.py:150
+#: bookwyrm/settings.py:152
 msgid "Spanish"
 msgstr "Español（西�牙语）"
 
-#: bookwyrm/settings.py:151
+#: bookwyrm/settings.py:153
 msgid "French"
 msgstr "Français（法语）"
 
-#: bookwyrm/settings.py:152
+#: bookwyrm/settings.py:154
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
+#: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8
+msgid "Not Found"
+msgstr "未找到"
+
+#: bookwyrm/templates/404.html:9
+msgid "The page you requested doesn't seem to exist!"
+msgstr "你请求的页�似乎并�存在�"
+
+#: bookwyrm/templates/500.html:4
+msgid "Oops!"
+msgstr "哎呀�"
+
+#: bookwyrm/templates/500.html:8
+msgid "Server Error"
+msgstr "�务器错误"
+
+#: bookwyrm/templates/500.html:9
+msgid "Something went wrong! Sorry about that."
+msgstr "�些东西出错了�对�起啦。"
+
 #: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
 msgid "Edit Author"
 msgstr "编辑作者"
@@ -110,90 +130,65 @@ msgstr "作者"
 msgid "Edit Book"
 msgstr "编辑书目"
 
-#: bookwyrm/templates/book/book.html:45
+#: bookwyrm/templates/book/book.html:49
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "添加��"
 
-#: bookwyrm/templates/book/book.html:55
+#: bookwyrm/templates/book/book.html:59
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: bookwyrm/templates/book/book.html:62
+#: bookwyrm/templates/book/book.html:66
 #: bookwyrm/templates/book/edit_book.html:211
 msgid "OCLC Number:"
 msgstr "OCLC �:"
 
-#: bookwyrm/templates/book/book.html:69
+#: bookwyrm/templates/book/book.html:73
 #: bookwyrm/templates/book/edit_book.html:215
 msgid "ASIN:"
 msgstr "ASIN:"
 
-#: bookwyrm/templates/book/book.html:79
-#, python-format
-msgid "%(format)s, %(pages)s pages"
-msgstr "%(format)s, %(pages)s 页"
-
-#: bookwyrm/templates/book/book.html:81
-#, python-format
-msgid "%(pages)s pages"
-msgstr "%(pages)s 页"
-
-#: bookwyrm/templates/book/book.html:86
-#, python-format
-msgid "Published %(date)s by %(publisher)s."
-msgstr "在 %(date)s 由 %(publisher)s 出版。"
-
-#: bookwyrm/templates/book/book.html:88
-#, python-format
-msgid "Published %(date)s"
-msgstr "于 %(date)s 出版"
-
-#: bookwyrm/templates/book/book.html:90
-#, python-format
-msgid "Published by %(publisher)s."
-msgstr "由 %(publisher)s 出版。"
-
-#: bookwyrm/templates/book/book.html:95
+#: bookwyrm/templates/book/book.html:82
 msgid "View on OpenLibrary"
 msgstr "在 OpenLibrary 查看"
 
-#: bookwyrm/templates/book/book.html:104
+#: bookwyrm/templates/book/book.html:91
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s 则书评)"
 
-#: bookwyrm/templates/book/book.html:110
+#: bookwyrm/templates/book/book.html:97
 msgid "Add Description"
 msgstr "添加�述"
 
-#: bookwyrm/templates/book/book.html:117
+#: bookwyrm/templates/book/book.html:104
 #: bookwyrm/templates/book/edit_book.html:101
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "�述:"
 
-#: bookwyrm/templates/book/book.html:121
+#: bookwyrm/templates/book/book.html:108
 #: bookwyrm/templates/book/edit_book.html:225
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:68
+#: bookwyrm/templates/preferences/edit_user.html:70
 #: bookwyrm/templates/settings/site.html:93
-#: bookwyrm/templates/snippets/readthrough.html:64
+#: bookwyrm/templates/snippets/readthrough.html:65
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
 msgid "Save"
 msgstr "�存"
 
-#: bookwyrm/templates/book/book.html:122 bookwyrm/templates/book/book.html:171
+#: bookwyrm/templates/book/book.html:109 bookwyrm/templates/book/book.html:158
 #: bookwyrm/templates/book/cover_modal.html:32
 #: bookwyrm/templates/book/edit_book.html:226
 #: bookwyrm/templates/edit_author.html:79
 #: bookwyrm/templates/moderation/report_modal.html:32
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/readthrough.html:65
+#: bookwyrm/templates/snippets/readthrough.html:66
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
@@ -201,72 +196,72 @@ msgstr "�存"
 msgid "Cancel"
 msgstr "�消"
 
-#: bookwyrm/templates/book/book.html:131
+#: bookwyrm/templates/book/book.html:118
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s/editions\">%(count)s 个版本</a>"
 
-#: bookwyrm/templates/book/book.html:139
+#: bookwyrm/templates/book/book.html:126
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "此版本在你的 <a href=\"%(path)s\">%(shelf_name)s</a> 书架上。"
 
-#: bookwyrm/templates/book/book.html:145
+#: bookwyrm/templates/book/book.html:132
 #, python-format
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr "本书的 <a href=\"%(book_path)s\">�一个版本</a> 在你的 <a href=\"%(shelf_path)s\">%(shelf_name)s</a> 书架上。"
 
-#: bookwyrm/templates/book/book.html:154
+#: bookwyrm/templates/book/book.html:141
 msgid "Your reading activity"
 msgstr "你的阅读活动"
 
-#: bookwyrm/templates/book/book.html:156
+#: bookwyrm/templates/book/book.html:143
 msgid "Add read dates"
 msgstr "添加阅读日期"
 
-#: bookwyrm/templates/book/book.html:161
+#: bookwyrm/templates/book/book.html:148
 msgid "You don't have any reading activity for this book."
 msgstr "你还没有任何这本书的阅读活动。"
 
-#: bookwyrm/templates/book/book.html:168
+#: bookwyrm/templates/book/book.html:155
 msgid "Create"
 msgstr "创建"
 
-#: bookwyrm/templates/book/book.html:190
+#: bookwyrm/templates/book/book.html:177
 msgid "Tags"
 msgstr "标签"
 
-#: bookwyrm/templates/book/book.html:194
+#: bookwyrm/templates/book/book.html:181
 #: bookwyrm/templates/snippets/tag.html:18
 msgid "Add tag"
 msgstr "添加标签"
 
-#: bookwyrm/templates/book/book.html:211
+#: bookwyrm/templates/book/book.html:198
 msgid "Subjects"
 msgstr "主题"
 
-#: bookwyrm/templates/book/book.html:222
+#: bookwyrm/templates/book/book.html:209
 msgid "Places"
 msgstr "地点"
 
-#: bookwyrm/templates/book/book.html:233 bookwyrm/templates/layout.html:64
-#: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
+#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "列表"
 
-#: bookwyrm/templates/book/book.html:244
+#: bookwyrm/templates/book/book.html:231
 msgid "Add to list"
 msgstr "添加到列表"
 
-#: bookwyrm/templates/book/book.html:254
+#: bookwyrm/templates/book/book.html:241
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:90
 msgid "Add"
 msgstr "添加"
 
-#: bookwyrm/templates/book/book.html:282
+#: bookwyrm/templates/book/book.html:269
 msgid "rated it"
 msgstr "评价了"
 
@@ -402,7 +397,7 @@ msgid "John Doe, Jane Smith"
 msgstr "张三, �四"
 
 #: bookwyrm/templates/book/edit_book.html:155
-#: bookwyrm/templates/snippets/shelf.html:9
+#: bookwyrm/templates/user/shelf.html:72
 msgid "Cover"
 msgstr "��"
 
@@ -411,6 +406,7 @@ msgid "Physical Properties"
 msgstr "实体性质"
 
 #: bookwyrm/templates/book/edit_book.html:183
+#: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "格�:"
 
@@ -435,119 +431,150 @@ msgstr "ISBN 10:"
 msgid "Openlibrary key:"
 msgstr "Openlibrary key:"
 
+#: bookwyrm/templates/book/editions.html:5
+#, python-format
+msgid "Editions of %(book_title)s"
+msgstr "%(book_title)s 的�版本"
+
+#: bookwyrm/templates/book/editions.html:9
+#, python-format
+msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
+msgstr "<a href=\"%(work_path)s\">\"%(work_title)s\"</a> 的�版本"
+
+#: bookwyrm/templates/book/format_filter.html:8
+#: bookwyrm/templates/book/language_filter.html:8
+msgid "Any"
+msgstr ""
+
+#: bookwyrm/templates/book/language_filter.html:5
+msgid "Language:"
+msgstr ""
+
+#: bookwyrm/templates/book/publisher_info.html:6
+#, python-format
+msgid "%(format)s, %(pages)s pages"
+msgstr "%(format)s, %(pages)s 页"
+
+#: bookwyrm/templates/book/publisher_info.html:8
+#, python-format
+msgid "%(pages)s pages"
+msgstr "%(pages)s 页"
+
+#: bookwyrm/templates/book/publisher_info.html:13
+#, fuzzy, python-format
+#| msgid "%(pages)s pages"
+msgid "%(languages)s language"
+msgstr "%(pages)s 页"
+
+#: bookwyrm/templates/book/publisher_info.html:18
+#, python-format
+msgid "Published %(date)s by %(publisher)s."
+msgstr "在 %(date)s 由 %(publisher)s 出版。"
+
+#: bookwyrm/templates/book/publisher_info.html:20
+#, python-format
+msgid "Published %(date)s"
+msgstr "于 %(date)s 出版"
+
+#: bookwyrm/templates/book/publisher_info.html:22
+#, python-format
+msgid "Published by %(publisher)s."
+msgstr "由 %(publisher)s 出版。"
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/feed/feed_layout.html:57
 msgid "Close"
 msgstr "关闭"
 
-#: bookwyrm/templates/directory.html:6 bookwyrm/templates/directory.html:11
-#: bookwyrm/templates/layout.html:97
-msgid "Directory"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:19
-msgid "Make your profile discoverable to other BookWyrm users."
-msgstr ""
-
-#: bookwyrm/templates/directory.html:26
-#, fuzzy, python-format
-#| msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
-msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
-msgstr "你�以在任何时候从你的<a href=\"%(path)s\">个人资料页�</a> 中设置或改�你的阅读目标"
-
-#: bookwyrm/templates/directory.html:31
-#: bookwyrm/templates/snippets/goal_card.html:22
-msgid "Dismiss message"
-msgstr "�散消�"
-
-#: bookwyrm/templates/directory.html:44
-#, fuzzy
-#| msgid "Show less"
-msgid "Show filters"
-msgstr "显示更少"
-
-#: bookwyrm/templates/directory.html:46
-msgid "Hide filters"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:55
-#, fuzzy
-#| msgid "User Activity"
-msgid "User type"
-msgstr "用户活动"
-
-#: bookwyrm/templates/directory.html:58
-msgid "BookWyrm users"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:62
-msgid "All known users"
-msgstr ""
-
-#: bookwyrm/templates/directory.html:68
+#: bookwyrm/templates/directory/community_filter.html:5
 #, fuzzy
 #| msgid "Comment"
 msgid "Community"
 msgstr "评论"
 
-#: bookwyrm/templates/directory.html:71
+#: bookwyrm/templates/directory/community_filter.html:8
 #, fuzzy
 #| msgid "Max uses"
 msgid "Local users"
 msgstr "最大使用次数"
 
-#: bookwyrm/templates/directory.html:75
+#: bookwyrm/templates/directory/community_filter.html:12
 #, fuzzy
 #| msgid "Federated"
 msgid "Federated community"
 msgstr "跨站"
 
-#: bookwyrm/templates/directory.html:81
-msgid "Order by"
+#: bookwyrm/templates/directory/directory.html:6
+#: bookwyrm/templates/directory/directory.html:11
+#: bookwyrm/templates/layout.html:97
+msgid "Directory"
 msgstr ""
 
-#: bookwyrm/templates/directory.html:84
-#, fuzzy
-#| msgid "Suggest"
-msgid "Suggested"
-msgstr "推�"
-
-#: bookwyrm/templates/directory.html:85
-msgid "Recently active"
+#: bookwyrm/templates/directory/directory.html:19
+msgid "Make your profile discoverable to other BookWyrm users."
 msgstr ""
 
-#: bookwyrm/templates/directory.html:91
-msgid "Apply filters"
-msgstr ""
+#: bookwyrm/templates/directory/directory.html:26
+#, fuzzy, python-format
+#| msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
+msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
+msgstr "你�以在任何时候从你的<a href=\"%(path)s\">个人资料页�</a> 中设置或改�你的阅读目标"
 
-#: bookwyrm/templates/directory.html:94
-#, fuzzy
-#| msgid "Clear search"
-msgid "Clear filters"
-msgstr "清除�索"
+#: bookwyrm/templates/directory/directory.html:31
+#: bookwyrm/templates/snippets/goal_card.html:22
+msgid "Dismiss message"
+msgstr "�散消�"
 
-#: bookwyrm/templates/directory.html:128
+#: bookwyrm/templates/directory/directory.html:71
 #, fuzzy
 #| msgid "followed you"
 msgid "follower you follow"
 msgid_plural "followers you follow"
 msgstr[0] "关注了你"
 
-#: bookwyrm/templates/directory.html:135
+#: bookwyrm/templates/directory/directory.html:78
 #, fuzzy
 #| msgid "Your shelves"
 msgid "book on your shelves"
 msgid_plural "books on your shelves"
 msgstr[0] "你的书架"
 
-#: bookwyrm/templates/directory.html:143
+#: bookwyrm/templates/directory/directory.html:86
 msgid "posts"
 msgstr ""
 
-#: bookwyrm/templates/directory.html:149
+#: bookwyrm/templates/directory/directory.html:92
 msgid "last active"
 msgstr ""
 
+#: bookwyrm/templates/directory/sort_filter.html:5
+msgid "Order by"
+msgstr ""
+
+#: bookwyrm/templates/directory/sort_filter.html:8
+#, fuzzy
+#| msgid "Suggest"
+msgid "Suggested"
+msgstr "推�"
+
+#: bookwyrm/templates/directory/sort_filter.html:9
+msgid "Recently active"
+msgstr ""
+
+#: bookwyrm/templates/directory/user_type_filter.html:5
+#, fuzzy
+#| msgid "User Activity"
+msgid "User type"
+msgstr "用户活动"
+
+#: bookwyrm/templates/directory/user_type_filter.html:8
+msgid "BookWyrm users"
+msgstr ""
+
+#: bookwyrm/templates/directory/user_type_filter.html:12
+msgid "All known users"
+msgstr ""
+
 #: bookwyrm/templates/discover/about.html:7
 #, python-format
 msgid "About %(site_name)s"
@@ -657,16 +684,6 @@ msgstr "Librarything key:"
 msgid "Goodreads key:"
 msgstr "Goodreads key:"
 
-#: bookwyrm/templates/editions.html:5
-#, python-format
-msgid "Editions of %(book_title)s"
-msgstr "%(book_title)s 的�版本"
-
-#: bookwyrm/templates/editions.html:9
-#, python-format
-msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
-msgstr "<a href=\"%(work_path)s\">\"%(work_title)s\"</a> 的�版本"
-
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
@@ -735,18 +752,6 @@ msgstr ""
 msgid "Reset your %(site_name)s password"
 msgstr "关于 %(site_name)s"
 
-#: bookwyrm/templates/error.html:4
-msgid "Oops!"
-msgstr "哎呀�"
-
-#: bookwyrm/templates/error.html:8
-msgid "Server Error"
-msgstr "�务器错误"
-
-#: bookwyrm/templates/error.html:9
-msgid "Something went wrong! Sorry about that."
-msgstr "�些东西出错了�对�起啦。"
-
 #: bookwyrm/templates/feed/direct_messages.html:8
 #, python-format
 msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
@@ -823,6 +828,8 @@ msgid "Updates"
 msgstr "æ›´æ–°"
 
 #: bookwyrm/templates/feed/feed_layout.html:11
+#: bookwyrm/templates/layout.html:58
+#: bookwyrm/templates/user/books_header.html:3
 msgid "Your books"
 msgstr "你的书目"
 
@@ -831,18 +838,18 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr "现在这里还没有任何书目��试�从�索�本书开始�"
 
 #: bookwyrm/templates/feed/feed_layout.html:23
-#: bookwyrm/templates/user/shelf.html:24
+#: bookwyrm/templates/user/shelf.html:25
 msgid "To Read"
 msgstr "想读"
 
 #: bookwyrm/templates/feed/feed_layout.html:24
-#: bookwyrm/templates/user/shelf.html:24
+#: bookwyrm/templates/user/shelf.html:25
 msgid "Currently Reading"
 msgstr "在读"
 
 #: bookwyrm/templates/feed/feed_layout.html:25
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-#: bookwyrm/templates/user/shelf.html:24
+#: bookwyrm/templates/user/shelf.html:25
 msgid "Read"
 msgstr "读过"
 
@@ -887,27 +894,33 @@ msgstr "%(username)s 在 %(year)s 的书目"
 msgid "Import Books"
 msgstr "导入书目"
 
-#: bookwyrm/templates/import.html:14
-msgid "Data source"
+#: bookwyrm/templates/import.html:16
+#, fuzzy
+#| msgid "Data source"
+msgid "Data source:"
 msgstr "数���"
 
-#: bookwyrm/templates/import.html:32
+#: bookwyrm/templates/import.html:29
+msgid "Data file:"
+msgstr ""
+
+#: bookwyrm/templates/import.html:37
 msgid "Include reviews"
 msgstr "纳入书评"
 
-#: bookwyrm/templates/import.html:37
+#: bookwyrm/templates/import.html:42
 msgid "Privacy setting for imported reviews:"
 msgstr "导入书评的��设定"
 
-#: bookwyrm/templates/import.html:41
+#: bookwyrm/templates/import.html:48
 msgid "Import"
 msgstr "导入"
 
-#: bookwyrm/templates/import.html:46
+#: bookwyrm/templates/import.html:53
 msgid "Recent Imports"
 msgstr "最近的导入"
 
-#: bookwyrm/templates/import.html:48
+#: bookwyrm/templates/import.html:55
 msgid "No recent imports"
 msgstr "无最近的导入"
 
@@ -964,12 +977,12 @@ msgstr "书目"
 
 #: bookwyrm/templates/import_status.html:115
 #: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/snippets/shelf.html:10
+#: bookwyrm/templates/user/shelf.html:73
 msgid "Title"
 msgstr "标题"
 
 #: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/snippets/shelf.html:11
+#: bookwyrm/templates/user/shelf.html:74
 msgid "Author"
 msgstr "作者"
 
@@ -1025,10 +1038,6 @@ msgstr "�索"
 msgid "Main navigation menu"
 msgstr "主导航��"
 
-#: bookwyrm/templates/layout.html:58
-msgid "Your shelves"
-msgstr "你的书架"
-
 #: bookwyrm/templates/layout.html:61
 msgid "Feed"
 msgstr "动�"
@@ -1043,7 +1052,7 @@ msgid "Settings"
 msgstr "设置"
 
 #: bookwyrm/templates/layout.html:116
-#: bookwyrm/templates/settings/admin_layout.html:20
+#: bookwyrm/templates/settings/admin_layout.html:24
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
 #: bookwyrm/templates/settings/manage_invites.html:15
@@ -1105,7 +1114,7 @@ msgid "BookWyrm is open source software. You can contribute or report issues on
 msgstr "BookWyrm 是开�软件。你�以在 <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> 贡献或报告问题。"
 
 #: bookwyrm/templates/lists/create_form.html:5
-#: bookwyrm/templates/lists/lists.html:17
+#: bookwyrm/templates/lists/lists.html:19
 msgid "Create List"
 msgstr "创建列表"
 
@@ -1169,7 +1178,7 @@ msgid "Anyone can suggest books, subject to your approval"
 msgstr "任何人都�以推�书目�主题让你批准"
 
 #: bookwyrm/templates/lists/form.html:31
-#: bookwyrm/templates/moderation/reports.html:11
+#: bookwyrm/templates/moderation/reports.html:24
 msgid "Open"
 msgstr "开放"
 
@@ -1187,6 +1196,7 @@ msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "由 <a href=\"%(user_path)s\">%(username)s</a> 添加"
 
 #: bookwyrm/templates/lists/list.html:41
+#: bookwyrm/templates/snippets/shelf_selector.html:28
 msgid "Remove"
 msgstr "移除"
 
@@ -1223,19 +1233,6 @@ msgstr "没有找到书目"
 msgid "Suggest"
 msgstr "推�"
 
-#: bookwyrm/templates/lists/lists.html:14
-msgid "Your lists"
-msgstr "你的列表"
-
-#: bookwyrm/templates/lists/lists.html:32
-#, python-format
-msgid "See all %(size)s lists"
-msgstr "查看所有 %(size)s 个列表"
-
-#: bookwyrm/templates/lists/lists.html:40
-msgid "Recent Lists"
-msgstr "最近的列表"
-
 #: bookwyrm/templates/login.html:4
 msgid "Login"
 msgstr "登录"
@@ -1339,23 +1336,33 @@ msgstr "�新开�"
 msgid "Resolve"
 msgstr "已解决"
 
-#: bookwyrm/templates/moderation/reports.html:4
-#: bookwyrm/templates/moderation/reports.html:5
-#: bookwyrm/templates/settings/admin_layout.html:24
+#: bookwyrm/templates/moderation/reports.html:6
+#, fuzzy, python-format
+#| msgid "Report @%(username)s"
+msgid "Reports: %(server_name)s"
+msgstr "报告 %(username)s"
+
+#: bookwyrm/templates/moderation/reports.html:8
+#: bookwyrm/templates/moderation/reports.html:16
+#: bookwyrm/templates/settings/admin_layout.html:28
 msgid "Reports"
 msgstr "报告"
 
-#: bookwyrm/templates/moderation/reports.html:14
+#: bookwyrm/templates/moderation/reports.html:13
+#, fuzzy, python-format
+#| msgid "Report @%(username)s"
+msgid "Reports: <small>%(server_name)s</small>"
+msgstr "报告 %(username)s"
+
+#: bookwyrm/templates/moderation/reports.html:27
 msgid "Resolved"
 msgstr "已解决"
 
-#: bookwyrm/templates/notfound.html:4 bookwyrm/templates/notfound.html:8
-msgid "Not Found"
-msgstr "未找到"
-
-#: bookwyrm/templates/notfound.html:9
-msgid "The page you requested doesn't seem to exist!"
-msgstr "你请求的页�似乎并�存在�"
+#: bookwyrm/templates/moderation/reports.html:34
+#, fuzzy
+#| msgid "No books found"
+msgid "No reports found."
+msgstr "没有找到书目"
 
 #: bookwyrm/templates/notifications.html:14
 msgid "Delete notifications"
@@ -1587,51 +1594,133 @@ msgstr "管�"
 msgid "Manage Users"
 msgstr "管�用户"
 
-#: bookwyrm/templates/settings/admin_layout.html:28
-#: bookwyrm/templates/settings/federation.html:4
+#: bookwyrm/templates/settings/admin_layout.html:19
+#: bookwyrm/templates/settings/user_admin.html:3
+#: bookwyrm/templates/settings/user_admin.html:10
+msgid "Users"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/federation.html:3
+#: bookwyrm/templates/settings/federation.html:5
 msgid "Federated Servers"
 msgstr "互�的�务器"
 
-#: bookwyrm/templates/settings/admin_layout.html:33
+#: bookwyrm/templates/settings/admin_layout.html:37
 msgid "Instance Settings"
 msgstr "实例设置"
 
-#: bookwyrm/templates/settings/admin_layout.html:37
+#: bookwyrm/templates/settings/admin_layout.html:41
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr "站点设置"
 
-#: bookwyrm/templates/settings/admin_layout.html:40
+#: bookwyrm/templates/settings/admin_layout.html:44
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr "实例信�"
 
-#: bookwyrm/templates/settings/admin_layout.html:41
+#: bookwyrm/templates/settings/admin_layout.html:45
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr "图�"
 
-#: bookwyrm/templates/settings/admin_layout.html:42
+#: bookwyrm/templates/settings/admin_layout.html:46
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr "页脚内容"
 
-#: bookwyrm/templates/settings/admin_layout.html:43
+#: bookwyrm/templates/settings/admin_layout.html:47
 #: bookwyrm/templates/settings/site.html:77
 msgid "Registration"
 msgstr "注册"
 
-#: bookwyrm/templates/settings/federation.html:10
+#: bookwyrm/templates/settings/federated_server.html:7
+#, fuzzy
+#| msgid "Back to reports"
+msgid "Back to server list"
+msgstr "回到报告"
+
+#: bookwyrm/templates/settings/federated_server.html:12
+msgid "Details"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:15
+#, fuzzy
+#| msgid "Software"
+msgid "Software:"
+msgstr "软件"
+
+#: bookwyrm/templates/settings/federated_server.html:19
+#, fuzzy
+#| msgid "Description:"
+msgid "Version:"
+msgstr "�述:"
+
+#: bookwyrm/templates/settings/federated_server.html:23
+#, fuzzy
+#| msgid "Status"
+msgid "Status:"
+msgstr "状�"
+
+#: bookwyrm/templates/settings/federated_server.html:30
+#: bookwyrm/templates/user/user_layout.html:50
+msgid "Activity"
+msgstr "活动"
+
+#: bookwyrm/templates/settings/federated_server.html:33
+#, fuzzy
+#| msgid "Username:"
+msgid "Users:"
+msgstr "用户�:"
+
+#: bookwyrm/templates/settings/federated_server.html:36
+#: bookwyrm/templates/settings/federated_server.html:43
+msgid "View all"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:40
+#, fuzzy
+#| msgid "Reports"
+msgid "Reports:"
+msgstr "报告"
+
+#: bookwyrm/templates/settings/federated_server.html:47
+#, fuzzy
+#| msgid "followed you"
+msgid "Followed by us:"
+msgstr "关注了你"
+
+#: bookwyrm/templates/settings/federated_server.html:53
+#, fuzzy
+#| msgid "followed you"
+msgid "Followed by them:"
+msgstr "关注了你"
+
+#: bookwyrm/templates/settings/federated_server.html:59
+#, fuzzy
+#| msgid "Blocked Users"
+msgid "Blocked by us:"
+msgstr "�蔽的用户"
+
+#: bookwyrm/templates/settings/federation.html:13
 msgid "Server name"
 msgstr "�务器�称"
 
-#: bookwyrm/templates/settings/federation.html:11
+#: bookwyrm/templates/settings/federation.html:17
+#, fuzzy
+#| msgid "Federated"
+msgid "Date federated"
+msgstr "跨站"
+
+#: bookwyrm/templates/settings/federation.html:21
 msgid "Software"
 msgstr "软件"
 
-#: bookwyrm/templates/settings/federation.html:12
+#: bookwyrm/templates/settings/federation.html:24
 #: bookwyrm/templates/settings/manage_invite_requests.html:33
+#: bookwyrm/templates/settings/user_admin.html:32
 msgid "Status"
 msgstr "状�"
 
@@ -1802,6 +1891,47 @@ msgstr "关注请求"
 msgid "Registration closed text:"
 msgstr "注册关闭文字:"
 
+#: bookwyrm/templates/settings/user_admin.html:7
+#, python-format
+msgid "Users: <small>%(server_name)s</small>"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:20
+#, fuzzy
+#| msgid "Username:"
+msgid "Username"
+msgstr "用户�:"
+
+#: bookwyrm/templates/settings/user_admin.html:24
+#, fuzzy
+#| msgid "Added:"
+msgid "Date Added"
+msgstr "添加了:"
+
+#: bookwyrm/templates/settings/user_admin.html:28
+msgid "Last Active"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:36
+#, fuzzy
+#| msgid "Remove"
+msgid "Remote server"
+msgstr "移除"
+
+#: bookwyrm/templates/settings/user_admin.html:45
+#, fuzzy
+#| msgid "Activity"
+msgid "Active"
+msgstr "活动"
+
+#: bookwyrm/templates/settings/user_admin.html:45
+msgid "Inactive"
+msgstr ""
+
+#: bookwyrm/templates/settings/user_admin.html:50
+msgid "Not set"
+msgstr ""
+
 #: bookwyrm/templates/snippets/block_button.html:5
 msgid "Block"
 msgstr "�蔽"
@@ -1862,7 +1992,7 @@ msgid "Review:"
 msgstr "书评"
 
 #: bookwyrm/templates/snippets/create_status_form.html:29
-#: bookwyrm/templates/snippets/shelf.html:17
+#: bookwyrm/templates/user/shelf.html:78
 msgid "Rating"
 msgstr "评价"
 
@@ -1936,6 +2066,26 @@ msgstr "喜欢状�"
 msgid "Un-like status"
 msgstr "�消喜欢状�"
 
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:7
+#, fuzzy
+#| msgid "Show less"
+msgid "Show filters"
+msgstr "显示更少"
+
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:9
+msgid "Hide filters"
+msgstr ""
+
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:19
+msgid "Apply filters"
+msgstr ""
+
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:23
+#, fuzzy
+#| msgid "Clear search"
+msgid "Clear filters"
+msgstr "清除�索"
+
 #: bookwyrm/templates/snippets/follow_button.html:12
 msgid "Follow"
 msgstr "关注"
@@ -2065,32 +2215,32 @@ msgstr "留下评价"
 msgid "Rate"
 msgstr "评价"
 
-#: bookwyrm/templates/snippets/readthrough.html:7
+#: bookwyrm/templates/snippets/readthrough.html:8
 msgid "Progress Updates:"
 msgstr "进度更新:"
 
-#: bookwyrm/templates/snippets/readthrough.html:11
+#: bookwyrm/templates/snippets/readthrough.html:12
 msgid "finished"
 msgstr "已完�"
 
-#: bookwyrm/templates/snippets/readthrough.html:14
+#: bookwyrm/templates/snippets/readthrough.html:15
 msgid "Show all updates"
 msgstr "显示所有更新"
 
-#: bookwyrm/templates/snippets/readthrough.html:30
+#: bookwyrm/templates/snippets/readthrough.html:31
 msgid "Delete this progress update"
 msgstr "删除此进度更新"
 
-#: bookwyrm/templates/snippets/readthrough.html:40
+#: bookwyrm/templates/snippets/readthrough.html:41
 msgid "started"
 msgstr "已开始"
 
-#: bookwyrm/templates/snippets/readthrough.html:46
-#: bookwyrm/templates/snippets/readthrough.html:60
+#: bookwyrm/templates/snippets/readthrough.html:47
+#: bookwyrm/templates/snippets/readthrough.html:61
 msgid "Edit read dates"
 msgstr "编辑阅读日期"
 
-#: bookwyrm/templates/snippets/readthrough.html:50
+#: bookwyrm/templates/snippets/readthrough.html:51
 msgid "Delete these read dates"
 msgstr "删除这些阅读日期"
 
@@ -2150,45 +2300,11 @@ msgstr "由 %(author)s 所著"
 msgid "Import book"
 msgstr "导入书目"
 
-#: bookwyrm/templates/snippets/shelf.html:12
-msgid "Published"
-msgstr "已出版"
-
-#: bookwyrm/templates/snippets/shelf.html:13
-msgid "Shelved"
-msgstr "已上架"
-
-#: bookwyrm/templates/snippets/shelf.html:14
-msgid "Started"
-msgstr "已开始"
-
-#: bookwyrm/templates/snippets/shelf.html:15
-msgid "Finished"
-msgstr "已完�"
-
-#: bookwyrm/templates/snippets/shelf.html:16
-msgid "External links"
-msgstr "外部链接"
-
-#: bookwyrm/templates/snippets/shelf.html:44
-msgid "OpenLibrary"
-msgstr "OpenLibrary"
-
-#: bookwyrm/templates/snippets/shelf.html:61
-msgid "This shelf is empty."
-msgstr "此书架是空的。"
-
-#: bookwyrm/templates/snippets/shelf.html:67
-msgid "Delete shelf"
-msgstr "删除书架"
-
 #: bookwyrm/templates/snippets/shelf_selector.html:4
-msgid "Change shelf"
-msgstr "更�书架"
-
-#: bookwyrm/templates/snippets/shelf_selector.html:27
-msgid "Unshelve"
-msgstr "�下书架"
+#, fuzzy
+#| msgid "Your books"
+msgid "Move book"
+msgstr "你的书目"
 
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
 #, python-format
@@ -2196,7 +2312,7 @@ msgid "Finish \"<em>%(book_title)s</em>\""
 msgstr "完� \"<em>%(book_title)s</em>\""
 
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:33
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:35
 #, fuzzy
 #| msgid "Updates"
 msgid "Update progress"
@@ -2219,6 +2335,12 @@ msgstr "完�阅读"
 msgid "Want to read"
 msgstr "想�阅读"
 
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:48
+#, fuzzy, python-format
+#| msgid "Report @%(username)s"
+msgid "Remove from %(name)s"
+msgstr "报告 %(username)s"
+
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
 #, python-format
 msgid "Start \"<em>%(book_title)s</em>\""
@@ -2287,6 +2409,18 @@ msgstr "更多选项"
 msgid "Switch to this edition"
 msgstr "切�到此版本"
 
+#: bookwyrm/templates/snippets/table-sort-header.html:6
+#, fuzzy
+#| msgid "Started reading"
+msgid "Sorted asccending"
+msgstr "已开始阅读"
+
+#: bookwyrm/templates/snippets/table-sort-header.html:10
+#, fuzzy
+#| msgid "Started reading"
+msgid "Sorted descending"
+msgstr "已开始阅读"
+
 #: bookwyrm/templates/snippets/tag.html:14
 msgid "Remove tag"
 msgstr "移除标签"
@@ -2296,6 +2430,12 @@ msgstr "移除标签"
 msgid "Books tagged \"%(tag.name)s\""
 msgstr "标有 \"%(tag.name)s\" 标签的书"
 
+#: bookwyrm/templates/user/books_header.html:5
+#, fuzzy, python-format
+#| msgid "%(username)s's %(year)s Books"
+msgid "%(username)s's books"
+msgstr "%(username)s 在 %(year)s 的书目"
+
 #: bookwyrm/templates/user/create_shelf_form.html:5
 #: bookwyrm/templates/user/create_shelf_form.html:22
 msgid "Create Shelf"
@@ -2341,56 +2481,62 @@ msgstr "列表: %(username)s"
 msgid "Create list"
 msgstr "创建列表"
 
-#: bookwyrm/templates/user/shelf.html:9
-msgid "Your Shelves"
-msgstr "你的书架"
-
-#: bookwyrm/templates/user/shelf.html:11
-#, python-format
-msgid "%(username)s: Shelves"
-msgstr "%(username)s: 书架"
-
-#: bookwyrm/templates/user/shelf.html:33
+#: bookwyrm/templates/user/shelf.html:34
 msgid "Create shelf"
 msgstr "创建书架"
 
-#: bookwyrm/templates/user/shelf.html:54
+#: bookwyrm/templates/user/shelf.html:55
 msgid "Edit shelf"
 msgstr "编辑书架"
 
+#: bookwyrm/templates/user/shelf.html:75
+msgid "Shelved"
+msgstr "已上架"
+
+#: bookwyrm/templates/user/shelf.html:76
+msgid "Started"
+msgstr "已开始"
+
+#: bookwyrm/templates/user/shelf.html:77
+msgid "Finished"
+msgstr "已完�"
+
+#: bookwyrm/templates/user/shelf.html:121
+msgid "This shelf is empty."
+msgstr "此书架是空的。"
+
+#: bookwyrm/templates/user/shelf.html:127
+msgid "Delete shelf"
+msgstr "删除书架"
+
 #: bookwyrm/templates/user/user.html:15
 msgid "Edit profile"
 msgstr "编辑个人资料"
 
-#: bookwyrm/templates/user/user.html:26
-#: bookwyrm/templates/user/user_layout.html:68
-msgid "Shelves"
-msgstr "书架"
-
-#: bookwyrm/templates/user/user.html:31
-#, python-format
-msgid "See all %(size)s"
+#: bookwyrm/templates/user/user.html:33
+#, fuzzy, python-format
+#| msgid "See all %(size)s"
+msgid "View all %(size)s"
 msgstr "查看所有 %(size)s 本"
 
-#: bookwyrm/templates/user/user.html:44
-#, python-format
-msgid "See all %(shelf_count)s shelves"
-msgstr "查看所有 %(shelf_count)s 个书架"
+#: bookwyrm/templates/user/user.html:46
+msgid "View all books"
+msgstr ""
 
-#: bookwyrm/templates/user/user.html:56
+#: bookwyrm/templates/user/user.html:58
 #, python-format
 msgid "Set a reading goal for %(year)s"
 msgstr "设定 %(year)s 的阅读目标"
 
-#: bookwyrm/templates/user/user.html:62
+#: bookwyrm/templates/user/user.html:64
 msgid "User Activity"
 msgstr "用户活动"
 
-#: bookwyrm/templates/user/user.html:65
+#: bookwyrm/templates/user/user.html:67
 msgid "RSS feed"
 msgstr "RSS �"
 
-#: bookwyrm/templates/user/user.html:76
+#: bookwyrm/templates/user/user.html:78
 msgid "No activities yet!"
 msgstr "还没有活动�"
 
@@ -2398,14 +2544,16 @@ msgstr "还没有活动�"
 msgid "Follow Requests"
 msgstr "关注请求"
 
-#: bookwyrm/templates/user/user_layout.html:50
-msgid "Activity"
-msgstr "活动"
-
 #: bookwyrm/templates/user/user_layout.html:56
 msgid "Reading Goal"
 msgstr "阅读目标"
 
+#: bookwyrm/templates/user/user_layout.html:68
+#, fuzzy
+#| msgid "Book"
+msgid "Books"
+msgstr "书目"
+
 #: bookwyrm/templates/user/user_preview.html:13
 #, python-format
 msgid "Joined %(date)s"
@@ -2433,6 +2581,48 @@ msgstr "已�存在使用该用户�的用户。"
 msgid "A password reset link sent to %s"
 msgstr ""
 
+#~ msgid "Your shelves"
+#~ msgstr "你的书架"
+
+#~ msgid "Your lists"
+#~ msgstr "你的列表"
+
+#, python-format
+#~ msgid "See all %(size)s lists"
+#~ msgstr "查看所有 %(size)s 个列表"
+
+#~ msgid "Recent Lists"
+#~ msgstr "最近的列表"
+
+#~ msgid "Published"
+#~ msgstr "已出版"
+
+#~ msgid "External links"
+#~ msgstr "外部链接"
+
+#~ msgid "OpenLibrary"
+#~ msgstr "OpenLibrary"
+
+#~ msgid "Change shelf"
+#~ msgstr "更�书架"
+
+#~ msgid "Unshelve"
+#~ msgstr "�下书架"
+
+#~ msgid "Your Shelves"
+#~ msgstr "你的书架"
+
+#, python-format
+#~ msgid "%(username)s: Shelves"
+#~ msgstr "%(username)s: 书架"
+
+#~ msgid "Shelves"
+#~ msgstr "书架"
+
+#, python-format
+#~ msgid "See all %(shelf_count)s shelves"
+#~ msgstr "查看所有 %(shelf_count)s 个书架"
+
 #~ msgid "Send follow request"
 #~ msgstr "��关注请求"
 

From 4a490d25a836b48fdc37a784d781e9da77e31a18 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 31 Mar 2021 09:34:16 -0700
Subject: [PATCH 0535/1285] CHanges urls from shelves to books

---
 bookwyrm/templates/user/user_layout.html |  2 +-
 bookwyrm/urls.py                         | 46 ++++++++++++------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/bookwyrm/templates/user/user_layout.html b/bookwyrm/templates/user/user_layout.html
index c40b9e77..90a2e607 100644
--- a/bookwyrm/templates/user/user_layout.html
+++ b/bookwyrm/templates/user/user_layout.html
@@ -42,7 +42,7 @@
     {% endif %}
 </div>
 {% with user|username as username %}
-{% if 'user/'|add:username|add:'/shelf' not in request.path  and 'user/'|add:username|add:'/shelves' not in request.path %}
+{% if 'user/'|add:username|add:'/books' not in request.path %}
 <nav class="tabs">
     <ul>
         {% url 'user-feed' user|username as url %}
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 33c4aaad..51638b8a 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -138,16 +138,8 @@ urlpatterns = [
         views.Following.as_view(),
         name="user-following",
     ),
-    re_path(r"%s/shelves/?$" % user_path, views.user_shelves_page, name="user-shelves"),
-    re_path(r"%s/lists/?$" % user_path, views.UserLists.as_view(), name="user-lists"),
-    # goals
-    re_path(
-        r"%s/goal/(?P<year>\d{4})/?$" % user_path,
-        views.Goal.as_view(),
-        name="user-goal",
-    ),
-    re_path(r"^hide-goal/?$", views.hide_goal, name="hide-goal"),
     # lists
+    re_path(r"%s/lists/?$" % user_path, views.UserLists.as_view(), name="user-lists"),
     re_path(r"^list/?$", views.Lists.as_view(), name="lists"),
     re_path(r"^list/(?P<list_id>\d+)(.json)?/?$", views.List.as_view(), name="list"),
     re_path(r"^list/add-book/?$", views.list.add_book, name="list-add-book"),
@@ -159,6 +151,28 @@ urlpatterns = [
     re_path(
         r"^list/(?P<list_id>\d+)/curate/?$", views.Curate.as_view(), name="list-curate"
     ),
+    # shelf
+    re_path(r"%s/books/?$" % user_path, views.user_shelves_page, name="user-shelves"),
+    re_path(
+        r"^%s/books/(?P<shelf_identifier>[\w-]+)(.json)?/?$" % user_path,
+        views.Shelf.as_view(),
+        name="shelf",
+    ),
+    re_path(
+        r"^%s/books/(?P<shelf_identifier>[\w-]+)(.json)?/?$" % local_user_path,
+        views.Shelf.as_view(),
+    ),
+    re_path(r"^create-shelf/?$", views.create_shelf, name="shelf-create"),
+    re_path(r"^delete-shelf/(?P<shelf_id>\d+)?$", views.delete_shelf),
+    re_path(r"^shelve/?$", views.shelve),
+    re_path(r"^unshelve/?$", views.unshelve),
+    # goals
+    re_path(
+        r"%s/goal/(?P<year>\d{4})/?$" % user_path,
+        views.Goal.as_view(),
+        name="user-goal",
+    ),
+    re_path(r"^hide-goal/?$", views.hide_goal, name="hide-goal"),
     # preferences
     re_path(r"^preferences/profile/?$", views.EditUser.as_view(), name="prefs-profile"),
     re_path(r"^preferences/password/?$", views.ChangePassword.as_view()),
@@ -199,20 +213,6 @@ urlpatterns = [
     re_path(r"^tag/(?P<tag_id>.+)/?$", views.Tag.as_view()),
     re_path(r"^tag/?$", views.AddTag.as_view()),
     re_path(r"^untag/?$", views.RemoveTag.as_view()),
-    # shelf
-    re_path(
-        r"^%s/shelf/(?P<shelf_identifier>[\w-]+)(.json)?/?$" % user_path,
-        views.Shelf.as_view(),
-        name="shelf",
-    ),
-    re_path(
-        r"^%s/shelf/(?P<shelf_identifier>[\w-]+)(.json)?/?$" % local_user_path,
-        views.Shelf.as_view(),
-    ),
-    re_path(r"^create-shelf/?$", views.create_shelf, name="shelf-create"),
-    re_path(r"^delete-shelf/(?P<shelf_id>\d+)?$", views.delete_shelf),
-    re_path(r"^shelve/?$", views.shelve),
-    re_path(r"^unshelve/?$", views.unshelve),
     # reading progress
     re_path(r"^edit-readthrough/?$", views.edit_readthrough, name="edit-readthrough"),
     re_path(r"^delete-readthrough/?$", views.delete_readthrough),

From f8ce9b0956b0cf1fee6b20bd54513f6c3bce538d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 31 Mar 2021 09:50:16 -0700
Subject: [PATCH 0536/1285] Backwards compatibility with "shelf" urls

---
 bookwyrm/models/shelf.py                 | 2 +-
 bookwyrm/templates/user/shelf.html       | 2 +-
 bookwyrm/templates/user/user_layout.html | 2 +-
 bookwyrm/urls.py                         | 5 +++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/models/shelf.py b/bookwyrm/models/shelf.py
index 739c0599..515bb161 100644
--- a/bookwyrm/models/shelf.py
+++ b/bookwyrm/models/shelf.py
@@ -49,7 +49,7 @@ class Shelf(OrderedCollectionMixin, BookWyrmModel):
     def get_remote_id(self):
         """ shelf identifier instead of id """
         base_path = self.user.remote_id
-        return "%s/shelf/%s" % (base_path, self.identifier)
+        return "%s/books/%s" % (base_path, self.identifier)
 
     class Meta:
         """ user/shelf unqiueness """
diff --git a/bookwyrm/templates/user/shelf.html b/bookwyrm/templates/user/shelf.html
index 9e045572..5173da07 100644
--- a/bookwyrm/templates/user/shelf.html
+++ b/bookwyrm/templates/user/shelf.html
@@ -22,7 +22,7 @@
             <ul>
             {% for shelf_tab in shelves %}
             <li class="{% if shelf_tab.identifier == shelf.identifier %}is-active{% endif %}">
-                <a href="/user/{{ user | username }}/shelf/{{ shelf_tab.identifier }}"{% if shelf_tab.identifier == shelf.identifier %} aria-current="page"{% endif %}>{% if shelf_tab.identifier == 'to-read' %}{% trans "To Read" %}{% elif shelf_tab.identifier == 'reading' %}{% trans "Currently Reading" %}{% elif shelf_tab.identifier == 'read' %}{% trans "Read" %}{% else %}{{ shelf_tab.name }}{% endif %}</a>
+                <a href="{{ shelf_tab.local_path }}"{% if shelf_tab.identifier == shelf.identifier %} aria-current="page"{% endif %}>{% if shelf_tab.identifier == 'to-read' %}{% trans "To Read" %}{% elif shelf_tab.identifier == 'reading' %}{% trans "Currently Reading" %}{% elif shelf_tab.identifier == 'read' %}{% trans "Read" %}{% else %}{{ shelf_tab.name }}{% endif %}</a>
                 </li>
             {% endfor %}
             </ul>
diff --git a/bookwyrm/templates/user/user_layout.html b/bookwyrm/templates/user/user_layout.html
index 90a2e607..0c3e94e3 100644
--- a/bookwyrm/templates/user/user_layout.html
+++ b/bookwyrm/templates/user/user_layout.html
@@ -42,7 +42,7 @@
     {% endif %}
 </div>
 {% with user|username as username %}
-{% if 'user/'|add:username|add:'/books' not in request.path %}
+{% if 'user/'|add:username|add:'/books' not in request.path and 'user/'|add:username|add:'/shelf' not in request.path %}
 <nav class="tabs">
     <ul>
         {% url 'user-feed' user|username as url %}
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 51638b8a..c5f2f542 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -154,13 +154,14 @@ urlpatterns = [
     # shelf
     re_path(r"%s/books/?$" % user_path, views.user_shelves_page, name="user-shelves"),
     re_path(
-        r"^%s/books/(?P<shelf_identifier>[\w-]+)(.json)?/?$" % user_path,
+        r"^%s/(helf|books)/(?P<shelf_identifier>[\w-]+)(.json)?/?$" % user_path,
         views.Shelf.as_view(),
         name="shelf",
     ),
     re_path(
-        r"^%s/books/(?P<shelf_identifier>[\w-]+)(.json)?/?$" % local_user_path,
+        r"^%s/(books|shelf)/(?P<shelf_identifier>[\w-]+)(.json)?/?$" % local_user_path,
         views.Shelf.as_view(),
+        name="shelf"
     ),
     re_path(r"^create-shelf/?$", views.create_shelf, name="shelf-create"),
     re_path(r"^delete-shelf/(?P<shelf_id>\d+)?$", views.delete_shelf),

From ab78da735ff2b8865e4d6f27ff5d233237adf844 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 31 Mar 2021 09:50:40 -0700
Subject: [PATCH 0537/1285] Adds books page header snippet

---
 bookwyrm/templates/user/books_header.html | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 bookwyrm/templates/user/books_header.html

diff --git a/bookwyrm/templates/user/books_header.html b/bookwyrm/templates/user/books_header.html
new file mode 100644
index 00000000..8fea84c7
--- /dev/null
+++ b/bookwyrm/templates/user/books_header.html
@@ -0,0 +1,6 @@
+{% load i18n %}
+{% if is_self %}
+{% trans "Your books" %}
+{% else %}
+{% blocktrans with username=user.display_name %}{{ username }}'s books{% endblocktrans %}
+{% endif %}

From e81de08e7f66137cb5c53b1140801514fbf885fd Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 31 Mar 2021 09:54:52 -0700
Subject: [PATCH 0538/1285] Missed a url

---
 bookwyrm/templates/user/user.html | 3 ++-
 bookwyrm/urls.py                  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index 2b996872..a54664ce 100644
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -1,5 +1,6 @@
 {% extends 'user/user_layout.html' %}
 {% load i18n %}
+{% load bookwyrm_tags %}
 
 {% block title %}{{ user.display_name }}{% endblock %}
 
@@ -43,7 +44,7 @@
         </div>
         {% endfor %}
     </div>
-    <small><a href="{{ user.local_path }}/shelves">{% trans "View all books" %}</a></small>
+    <small><a href="{% url 'user-shelves' user|username %}">{% trans "View all books" %}</a></small>
 </div>
 {% endif %}
 
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index c5f2f542..cd7a4e41 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -161,7 +161,7 @@ urlpatterns = [
     re_path(
         r"^%s/(books|shelf)/(?P<shelf_identifier>[\w-]+)(.json)?/?$" % local_user_path,
         views.Shelf.as_view(),
-        name="shelf"
+        name="shelf",
     ),
     re_path(r"^create-shelf/?$", views.create_shelf, name="shelf-create"),
     re_path(r"^delete-shelf/(?P<shelf_id>\d+)?$", views.delete_shelf),

From 2fd917a6cc8bbeb359da7abb1ab8067b0f82f90a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 31 Mar 2021 10:24:23 -0700
Subject: [PATCH 0539/1285] Updates test

---
 bookwyrm/tests/models/test_shelf_model.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/tests/models/test_shelf_model.py b/bookwyrm/tests/models/test_shelf_model.py
index 3bbb9890..ebda0499 100644
--- a/bookwyrm/tests/models/test_shelf_model.py
+++ b/bookwyrm/tests/models/test_shelf_model.py
@@ -27,7 +27,7 @@ class Shelf(TestCase):
         shelf = models.Shelf.objects.create(
             name="Test Shelf", identifier="test-shelf", user=self.local_user
         )
-        expected_id = "https://%s/user/mouse/shelf/test-shelf" % settings.DOMAIN
+        expected_id = "https://%s/user/mouse/books/test-shelf" % settings.DOMAIN
         self.assertEqual(shelf.get_remote_id(), expected_id)
         models.Shelf.broadcast = real_broadcast
 

From a670c8d366edc833cfb0926fe49b947e8550d2d2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 31 Mar 2021 10:23:20 -0700
Subject: [PATCH 0540/1285] Adds "all books" view"

---
 bookwyrm/templates/user/shelf.html |  9 +++---
 bookwyrm/urls.py                   |  4 +--
 bookwyrm/views/__init__.py         |  2 +-
 bookwyrm/views/shelf.py            | 46 ++++++++++++------------------
 4 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/bookwyrm/templates/user/shelf.html b/bookwyrm/templates/user/shelf.html
index 5173da07..cc4d8d37 100644
--- a/bookwyrm/templates/user/shelf.html
+++ b/bookwyrm/templates/user/shelf.html
@@ -20,10 +20,13 @@
     <div class="column">
         <div class="tabs">
             <ul>
+            <li class="{% if shelf.identifier == 'all' %}is-active{% endif %}">
+                <a href="{% url 'user-shelves' user|username %}"{% if shelf.identifier == 'all' %} aria-current="page"{% endif %}>{% trans "All books" %}</a>
+            </li>
             {% for shelf_tab in shelves %}
             <li class="{% if shelf_tab.identifier == shelf.identifier %}is-active{% endif %}">
                 <a href="{{ shelf_tab.local_path }}"{% if shelf_tab.identifier == shelf.identifier %} aria-current="page"{% endif %}>{% if shelf_tab.identifier == 'to-read' %}{% trans "To Read" %}{% elif shelf_tab.identifier == 'reading' %}{% trans "Currently Reading" %}{% elif shelf_tab.identifier == 'read' %}{% trans "Read" %}{% else %}{{ shelf_tab.name }}{% endif %}</a>
-                </li>
+            </li>
             {% endfor %}
             </ul>
         </div>
@@ -81,7 +84,6 @@
             {% endif %}
         </tr>
         {% for book in books %}
-        {% with book=book.book %}
         <tr class="book-preview">
             <td>
                 <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book size="small" %}</a>
@@ -113,13 +115,12 @@
             </td>
             {% endif %}
         </tr>
-        {% endwith %}
         {% endfor %}
         </table>
         </div>
         {% else %}
         <p>{% trans "This shelf is empty." %}</p>
-        {% if shelf.editable %}
+        {% if shelf.id and shelf.editable %}
         <form name="delete-shelf" action="/delete-shelf/{{ shelf.id }}" method="post">
             {% csrf_token %}
             <input type="hidden" name="user" value="{{ request.user.id }}">
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index cd7a4e41..27fb678f 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -151,8 +151,8 @@ urlpatterns = [
     re_path(
         r"^list/(?P<list_id>\d+)/curate/?$", views.Curate.as_view(), name="list-curate"
     ),
-    # shelf
-    re_path(r"%s/books/?$" % user_path, views.user_shelves_page, name="user-shelves"),
+    # Uyser books
+    re_path(r"%s/books/?$" % user_path, views.Shelf.as_view(), name="user-shelves"),
     re_path(
         r"^%s/(helf|books)/(?P<shelf_identifier>[\w-]+)(.json)?/?$" % user_path,
         views.Shelf.as_view(),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 693a7744..fead2a32 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -27,7 +27,7 @@ from .rss_feed import RssFeed
 from .password import PasswordResetRequest, PasswordReset, ChangePassword
 from .search import Search
 from .shelf import Shelf
-from .shelf import user_shelves_page, create_shelf, delete_shelf
+from .shelf import create_shelf, delete_shelf
 from .shelf import shelve, unshelve
 from .site import Site
 from .status import CreateStatus, DeleteStatus
diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index 75d915cd..ad1128e2 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -1,4 +1,6 @@
 """ shelf views"""
+from collections import namedtuple
+
 from django.db import IntegrityError
 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
@@ -6,6 +8,7 @@ from django.http import HttpResponseBadRequest, HttpResponseNotFound
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
+from django.utils.translation import gettext as _
 from django.views import View
 from django.views.decorators.http import require_POST
 
@@ -13,14 +16,14 @@ from bookwyrm import forms, models
 from bookwyrm.activitypub import ActivitypubResponse
 from bookwyrm.settings import PAGE_LENGTH
 from .helpers import is_api_request, get_edition, get_user_from_username
-from .helpers import handle_reading_status
+from .helpers import handle_reading_status, privacy_filter, object_visible_to_user
 
 
 # pylint: disable= no-self-use
 class Shelf(View):
     """ shelf page """
 
-    def get(self, request, username, shelf_identifier):
+    def get(self, request, username, shelf_identifier=None):
         """ display a shelf """
         try:
             user = get_user_from_username(request.user, username)
@@ -32,35 +35,28 @@ class Shelf(View):
         except ValueError:
             page = 1
 
+        shelves = privacy_filter(request.user, user.shelf_set)
+
+        # get the shelf and make sure the logged in user should be able to see it
         if shelf_identifier:
             shelf = user.shelf_set.get(identifier=shelf_identifier)
+            if not object_visible_to_user(request.user, shelf):
+                return HttpResponseNotFound()
+        # this is a constructed "all books" view, with a fake "shelf" obj
         else:
-            shelf = user.shelf_set.first()
+            FakeShelf = namedtuple("Shelf", ("identifier", "name", "user", "books"))
+            books = models.Edition.objects.filter(
+                shelfbook__shelf__in=shelves.all()
+            ).distinct()
+            shelf = FakeShelf("all", _("All books"), user, books)
 
         is_self = request.user == user
 
-        shelves = user.shelf_set
-        if not is_self:
-            follower = user.followers.filter(id=request.user.id).exists()
-            # make sure the user has permission to view the shelf
-            if shelf.privacy == "direct" or (
-                shelf.privacy == "followers" and not follower
-            ):
-                return HttpResponseNotFound()
-
-            # only show other shelves that should be visible
-            if follower:
-                shelves = shelves.filter(privacy__in=["public", "followers"])
-            else:
-                shelves = shelves.filter(privacy="public")
-
         if is_api_request(request):
             return ActivitypubResponse(shelf.to_activity(**request.GET))
 
         paginated = Paginator(
-            models.ShelfBook.objects.filter(user=user, shelf=shelf)
-            .order_by("-updated_date")
-            .all(),
+            shelf.books.order_by("-updated_date").all(),
             PAGE_LENGTH,
         )
 
@@ -95,11 +91,6 @@ class Shelf(View):
         return redirect(shelf.local_path)
 
 
-def user_shelves_page(request, username):
-    """ default shelf """
-    return Shelf.as_view()(request, username, None)
-
-
 @login_required
 @require_POST
 def create_shelf(request):
@@ -176,7 +167,8 @@ def shelve(request):
             models.ShelfBook.objects.create(
                 book=book, shelf=desired_shelf, user=request.user
             )
-        # The book is already on this shelf. Might be good to alert, or reject the action?
+        # The book is already on this shelf.
+        # Might be good to alert, or reject the action?
         except IntegrityError:
             pass
     return redirect(request.headers.get("Referer", "/"))

From f89e94b0c02fe82378e00f354b29b4eed942274b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 31 Mar 2021 10:32:50 -0700
Subject: [PATCH 0541/1285] Adds privacy to fake shelf

---
 bookwyrm/views/shelf.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index ad1128e2..971eb858 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -44,11 +44,13 @@ class Shelf(View):
                 return HttpResponseNotFound()
         # this is a constructed "all books" view, with a fake "shelf" obj
         else:
-            FakeShelf = namedtuple("Shelf", ("identifier", "name", "user", "books"))
+            FakeShelf = namedtuple(
+                "Shelf", ("identifier", "name", "user", "books", "privacy")
+            )
             books = models.Edition.objects.filter(
                 shelfbook__shelf__in=shelves.all()
             ).distinct()
-            shelf = FakeShelf("all", _("All books"), user, books)
+            shelf = FakeShelf("all", _("All books"), user, books, "public")
 
         is_self = request.user == user
 

From ad2b938b4c43b6abf2fb9d93d2c3e7ed3d9e33bb Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 31 Mar 2021 10:36:10 -0700
Subject: [PATCH 0542/1285] Removes edit button from all books view

---
 bookwyrm/templates/user/shelf.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/user/shelf.html b/bookwyrm/templates/user/shelf.html
index cc4d8d37..8d23dce4 100644
--- a/bookwyrm/templates/user/shelf.html
+++ b/bookwyrm/templates/user/shelf.html
@@ -53,7 +53,7 @@
             </span>
         </h2>
     </div>
-    {% if is_self %}
+    {% if is_self and shelf.id %}
     <div class="column is-narrow">
         {% trans "Edit shelf" as button_text %}
         {% include 'snippets/toggle/open_button.html' with text=button_text icon="pencil" controls_text="edit-shelf-form" focus="edit-shelf-form-header" %}

From d0a26090d1803847328bb516ab24e709eba2fdb5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 31 Mar 2021 10:37:09 -0700
Subject: [PATCH 0543/1285] Updates locales

---
 locale/de_DE/LC_MESSAGES/django.po | 53 +++++++++++++++++-------------
 locale/en_US/LC_MESSAGES/django.po | 51 +++++++++++++++-------------
 locale/es/LC_MESSAGES/django.po    | 53 +++++++++++++++++-------------
 locale/fr_FR/LC_MESSAGES/django.po | 53 +++++++++++++++++-------------
 locale/zh_CN/LC_MESSAGES/django.po | 53 +++++++++++++++++-------------
 5 files changed, 148 insertions(+), 115 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index ac095694..adec1421 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-31 09:22-0700\n"
+"POT-Creation-Date: 2021-03-31 10:36-0700\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"
@@ -418,7 +418,7 @@ msgid "John Doe, Jane Smith"
 msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:155
-#: bookwyrm/templates/user/shelf.html:72
+#: bookwyrm/templates/user/shelf.html:75
 msgid "Cover"
 msgstr ""
 
@@ -860,14 +860,14 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr "Hier sind noch keine Bücher! Versuche nach Büchern zu suchen um loszulegen"
 
 #: bookwyrm/templates/feed/feed_layout.html:23
-#: bookwyrm/templates/user/shelf.html:25
+#: bookwyrm/templates/user/shelf.html:28
 #, fuzzy
 #| msgid "Read"
 msgid "To Read"
 msgstr "Auf der Leseliste"
 
 #: bookwyrm/templates/feed/feed_layout.html:24
-#: bookwyrm/templates/user/shelf.html:25
+#: bookwyrm/templates/user/shelf.html:28
 #, fuzzy
 #| msgid "Start reading"
 msgid "Currently Reading"
@@ -875,7 +875,7 @@ msgstr "Gerade lesend"
 
 #: bookwyrm/templates/feed/feed_layout.html:25
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-#: bookwyrm/templates/user/shelf.html:25
+#: bookwyrm/templates/user/shelf.html:28
 msgid "Read"
 msgstr "Gelesen"
 
@@ -1003,12 +1003,12 @@ msgstr "Buch"
 
 #: bookwyrm/templates/import_status.html:115
 #: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/user/shelf.html:73
+#: bookwyrm/templates/user/shelf.html:76
 msgid "Title"
 msgstr "Titel"
 
 #: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/user/shelf.html:74
+#: bookwyrm/templates/user/shelf.html:77
 msgid "Author"
 msgstr "Autor*in"
 
@@ -2031,7 +2031,7 @@ msgid "Review:"
 msgstr "Bewerten"
 
 #: bookwyrm/templates/snippets/create_status_form.html:29
-#: bookwyrm/templates/user/shelf.html:78
+#: bookwyrm/templates/user/shelf.html:81
 msgid "Rating"
 msgstr ""
 
@@ -2501,7 +2501,8 @@ msgid "Update shelf"
 msgstr "Regal aktualisieren"
 
 #: bookwyrm/templates/user/followers.html:7
-#: bookwyrm/templates/user/following.html:7 bookwyrm/templates/user/user.html:9
+#: bookwyrm/templates/user/following.html:7
+#: bookwyrm/templates/user/user.html:10
 msgid "User Profile"
 msgstr "Benutzerprofil"
 
@@ -2532,62 +2533,68 @@ msgstr "Listen: %(username)s"
 msgid "Create list"
 msgstr "Liste Erstellen"
 
-#: bookwyrm/templates/user/shelf.html:34
+#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:53
+#, fuzzy
+#| msgid "books"
+msgid "All books"
+msgstr "Bücher"
+
+#: bookwyrm/templates/user/shelf.html:37
 msgid "Create shelf"
 msgstr "Regal erstellen"
 
-#: bookwyrm/templates/user/shelf.html:55
+#: bookwyrm/templates/user/shelf.html:58
 msgid "Edit shelf"
 msgstr "Regal bearbeiten"
 
-#: bookwyrm/templates/user/shelf.html:75
+#: bookwyrm/templates/user/shelf.html:78
 msgid "Shelved"
 msgstr "Ins Regal gestellt"
 
-#: bookwyrm/templates/user/shelf.html:76
+#: bookwyrm/templates/user/shelf.html:79
 msgid "Started"
 msgstr "Gestartet"
 
-#: bookwyrm/templates/user/shelf.html:77
+#: bookwyrm/templates/user/shelf.html:80
 msgid "Finished"
 msgstr "Abgeschlossen"
 
-#: bookwyrm/templates/user/shelf.html:121
+#: bookwyrm/templates/user/shelf.html:122
 msgid "This shelf is empty."
 msgstr "Dieses Regal ist leer."
 
-#: bookwyrm/templates/user/shelf.html:127
+#: bookwyrm/templates/user/shelf.html:128
 msgid "Delete shelf"
 msgstr "Regal löschen"
 
-#: bookwyrm/templates/user/user.html:15
+#: bookwyrm/templates/user/user.html:16
 msgid "Edit profile"
 msgstr "Profil bearbeiten"
 
-#: bookwyrm/templates/user/user.html:33
+#: bookwyrm/templates/user/user.html:34
 #, fuzzy, python-format
 #| msgid "See all %(size)s"
 msgid "View all %(size)s"
 msgstr "Alle %(size)s anzeigen"
 
-#: bookwyrm/templates/user/user.html:46
+#: bookwyrm/templates/user/user.html:47
 msgid "View all books"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:58
+#: bookwyrm/templates/user/user.html:59
 #, python-format
 msgid "Set a reading goal for %(year)s"
 msgstr "Leseziel für %(year)s setzen"
 
-#: bookwyrm/templates/user/user.html:64
+#: bookwyrm/templates/user/user.html:65
 msgid "User Activity"
 msgstr "Nutzer*innenaktivität"
 
-#: bookwyrm/templates/user/user.html:67
+#: bookwyrm/templates/user/user.html:68
 msgid "RSS feed"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:78
+#: bookwyrm/templates/user/user.html:79
 msgid "No activities yet!"
 msgstr "Noch keine Aktivitäten!"
 
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index 190a5b1a..ff161897 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-31 09:22-0700\n"
+"POT-Creation-Date: 2021-03-31 10:36-0700\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"
@@ -396,7 +396,7 @@ msgid "John Doe, Jane Smith"
 msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:155
-#: bookwyrm/templates/user/shelf.html:72
+#: bookwyrm/templates/user/shelf.html:75
 msgid "Cover"
 msgstr ""
 
@@ -813,18 +813,18 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:23
-#: bookwyrm/templates/user/shelf.html:25
+#: bookwyrm/templates/user/shelf.html:28
 msgid "To Read"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:24
-#: bookwyrm/templates/user/shelf.html:25
+#: bookwyrm/templates/user/shelf.html:28
 msgid "Currently Reading"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:25
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-#: bookwyrm/templates/user/shelf.html:25
+#: bookwyrm/templates/user/shelf.html:28
 msgid "Read"
 msgstr ""
 
@@ -950,12 +950,12 @@ msgstr ""
 
 #: bookwyrm/templates/import_status.html:115
 #: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/user/shelf.html:73
+#: bookwyrm/templates/user/shelf.html:76
 msgid "Title"
 msgstr ""
 
 #: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/user/shelf.html:74
+#: bookwyrm/templates/user/shelf.html:77
 msgid "Author"
 msgstr ""
 
@@ -1915,7 +1915,7 @@ msgid "Review:"
 msgstr ""
 
 #: bookwyrm/templates/snippets/create_status_form.html:29
-#: bookwyrm/templates/user/shelf.html:78
+#: bookwyrm/templates/user/shelf.html:81
 msgid "Rating"
 msgstr ""
 
@@ -2360,7 +2360,8 @@ msgid "Update shelf"
 msgstr ""
 
 #: bookwyrm/templates/user/followers.html:7
-#: bookwyrm/templates/user/following.html:7 bookwyrm/templates/user/user.html:9
+#: bookwyrm/templates/user/following.html:7
+#: bookwyrm/templates/user/user.html:10
 msgid "User Profile"
 msgstr ""
 
@@ -2391,61 +2392,65 @@ msgstr ""
 msgid "Create list"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:34
+#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:53
+msgid "All books"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf.html:37
 msgid "Create shelf"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:55
+#: bookwyrm/templates/user/shelf.html:58
 msgid "Edit shelf"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:75
+#: bookwyrm/templates/user/shelf.html:78
 msgid "Shelved"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:76
+#: bookwyrm/templates/user/shelf.html:79
 msgid "Started"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:77
+#: bookwyrm/templates/user/shelf.html:80
 msgid "Finished"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:121
+#: bookwyrm/templates/user/shelf.html:122
 msgid "This shelf is empty."
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:127
+#: bookwyrm/templates/user/shelf.html:128
 msgid "Delete shelf"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:15
+#: bookwyrm/templates/user/user.html:16
 msgid "Edit profile"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:33
+#: bookwyrm/templates/user/user.html:34
 #, python-format
 msgid "View all %(size)s"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:46
+#: bookwyrm/templates/user/user.html:47
 msgid "View all books"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:58
+#: bookwyrm/templates/user/user.html:59
 #, python-format
 msgid "Set a reading goal for %(year)s"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:64
+#: bookwyrm/templates/user/user.html:65
 msgid "User Activity"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:67
+#: bookwyrm/templates/user/user.html:68
 msgid "RSS feed"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:78
+#: bookwyrm/templates/user/user.html:79
 msgid "No activities yet!"
 msgstr ""
 
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 7e53903e..922efe4c 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-31 09:22-0700\n"
+"POT-Creation-Date: 2021-03-31 10:36-0700\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -413,7 +413,7 @@ msgid "John Doe, Jane Smith"
 msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:155
-#: bookwyrm/templates/user/shelf.html:72
+#: bookwyrm/templates/user/shelf.html:75
 msgid "Cover"
 msgstr "Portada:"
 
@@ -857,18 +857,18 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr "¡No hay ningún libro aqui ahorita! Busca a un libro para empezar"
 
 #: bookwyrm/templates/feed/feed_layout.html:23
-#: bookwyrm/templates/user/shelf.html:25
+#: bookwyrm/templates/user/shelf.html:28
 msgid "To Read"
 msgstr "Para leer"
 
 #: bookwyrm/templates/feed/feed_layout.html:24
-#: bookwyrm/templates/user/shelf.html:25
+#: bookwyrm/templates/user/shelf.html:28
 msgid "Currently Reading"
 msgstr "Leyendo actualmente"
 
 #: bookwyrm/templates/feed/feed_layout.html:25
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-#: bookwyrm/templates/user/shelf.html:25
+#: bookwyrm/templates/user/shelf.html:28
 msgid "Read"
 msgstr "Leer"
 
@@ -996,12 +996,12 @@ msgstr "Libro"
 
 #: bookwyrm/templates/import_status.html:115
 #: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/user/shelf.html:73
+#: bookwyrm/templates/user/shelf.html:76
 msgid "Title"
 msgstr "Título"
 
 #: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/user/shelf.html:74
+#: bookwyrm/templates/user/shelf.html:77
 msgid "Author"
 msgstr "Autor/Autora"
 
@@ -2023,7 +2023,7 @@ msgid "Review:"
 msgstr "Reseña"
 
 #: bookwyrm/templates/snippets/create_status_form.html:29
-#: bookwyrm/templates/user/shelf.html:78
+#: bookwyrm/templates/user/shelf.html:81
 msgid "Rating"
 msgstr "Calificación"
 
@@ -2493,7 +2493,8 @@ msgid "Update shelf"
 msgstr "Actualizar estante"
 
 #: bookwyrm/templates/user/followers.html:7
-#: bookwyrm/templates/user/following.html:7 bookwyrm/templates/user/user.html:9
+#: bookwyrm/templates/user/following.html:7
+#: bookwyrm/templates/user/user.html:10
 msgid "User Profile"
 msgstr "Perfil de usuario"
 
@@ -2524,62 +2525,68 @@ msgstr "Listas: %(username)s"
 msgid "Create list"
 msgstr "Crear lista"
 
-#: bookwyrm/templates/user/shelf.html:34
+#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:53
+#, fuzzy
+#| msgid "books"
+msgid "All books"
+msgstr "libros"
+
+#: bookwyrm/templates/user/shelf.html:37
 msgid "Create shelf"
 msgstr "Crear estante"
 
-#: bookwyrm/templates/user/shelf.html:55
+#: bookwyrm/templates/user/shelf.html:58
 msgid "Edit shelf"
 msgstr "Editar estante"
 
-#: bookwyrm/templates/user/shelf.html:75
+#: bookwyrm/templates/user/shelf.html:78
 msgid "Shelved"
 msgstr "Archivado"
 
-#: bookwyrm/templates/user/shelf.html:76
+#: bookwyrm/templates/user/shelf.html:79
 msgid "Started"
 msgstr "Empezado"
 
-#: bookwyrm/templates/user/shelf.html:77
+#: bookwyrm/templates/user/shelf.html:80
 msgid "Finished"
 msgstr "Terminado"
 
-#: bookwyrm/templates/user/shelf.html:121
+#: bookwyrm/templates/user/shelf.html:122
 msgid "This shelf is empty."
 msgstr "Este estante está vacio."
 
-#: bookwyrm/templates/user/shelf.html:127
+#: bookwyrm/templates/user/shelf.html:128
 msgid "Delete shelf"
 msgstr "Eliminar estante"
 
-#: bookwyrm/templates/user/user.html:15
+#: bookwyrm/templates/user/user.html:16
 msgid "Edit profile"
 msgstr "Editar perfil"
 
-#: bookwyrm/templates/user/user.html:33
+#: bookwyrm/templates/user/user.html:34
 #, fuzzy, python-format
 #| msgid "See all %(size)s"
 msgid "View all %(size)s"
 msgstr "Ver %(size)s"
 
-#: bookwyrm/templates/user/user.html:46
+#: bookwyrm/templates/user/user.html:47
 msgid "View all books"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:58
+#: bookwyrm/templates/user/user.html:59
 #, python-format
 msgid "Set a reading goal for %(year)s"
 msgstr "Establecer una meta de lectura para %(year)s"
 
-#: bookwyrm/templates/user/user.html:64
+#: bookwyrm/templates/user/user.html:65
 msgid "User Activity"
 msgstr "Actividad de usuario"
 
-#: bookwyrm/templates/user/user.html:67
+#: bookwyrm/templates/user/user.html:68
 msgid "RSS feed"
 msgstr "Feed RSS"
 
-#: bookwyrm/templates/user/user.html:78
+#: bookwyrm/templates/user/user.html:79
 msgid "No activities yet!"
 msgstr "¡Aún no actividades!"
 
diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 6c6ecb40..7677b0ed 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-31 09:22-0700\n"
+"POT-Creation-Date: 2021-03-31 10:36-0700\n"
 "PO-Revision-Date: 2021-03-02 12:37+0100\n"
 "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -422,7 +422,7 @@ msgid "John Doe, Jane Smith"
 msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:155
-#: bookwyrm/templates/user/shelf.html:72
+#: bookwyrm/templates/user/shelf.html:75
 msgid "Cover"
 msgstr "Couverture"
 
@@ -876,14 +876,14 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr "Aucun livre ici pour l’instant ! Cherchez un livre pour commencer"
 
 #: bookwyrm/templates/feed/feed_layout.html:23
-#: bookwyrm/templates/user/shelf.html:25
+#: bookwyrm/templates/user/shelf.html:28
 #, fuzzy
 #| msgid "Read"
 msgid "To Read"
 msgstr "Lu"
 
 #: bookwyrm/templates/feed/feed_layout.html:24
-#: bookwyrm/templates/user/shelf.html:25
+#: bookwyrm/templates/user/shelf.html:28
 #, fuzzy
 #| msgid "Started reading"
 msgid "Currently Reading"
@@ -891,7 +891,7 @@ msgstr "Commencer la lecture"
 
 #: bookwyrm/templates/feed/feed_layout.html:25
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-#: bookwyrm/templates/user/shelf.html:25
+#: bookwyrm/templates/user/shelf.html:28
 msgid "Read"
 msgstr "Lu"
 
@@ -1023,12 +1023,12 @@ msgstr "Livre"
 
 #: bookwyrm/templates/import_status.html:115
 #: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/user/shelf.html:73
+#: bookwyrm/templates/user/shelf.html:76
 msgid "Title"
 msgstr "Titre"
 
 #: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/user/shelf.html:74
+#: bookwyrm/templates/user/shelf.html:77
 msgid "Author"
 msgstr "Auteur ou autrice"
 
@@ -2055,7 +2055,7 @@ msgid "Review:"
 msgstr "Critique"
 
 #: bookwyrm/templates/snippets/create_status_form.html:29
-#: bookwyrm/templates/user/shelf.html:78
+#: bookwyrm/templates/user/shelf.html:81
 msgid "Rating"
 msgstr "Note"
 
@@ -2531,7 +2531,8 @@ msgid "Update shelf"
 msgstr "Mettre l’étagère à jour"
 
 #: bookwyrm/templates/user/followers.html:7
-#: bookwyrm/templates/user/following.html:7 bookwyrm/templates/user/user.html:9
+#: bookwyrm/templates/user/following.html:7
+#: bookwyrm/templates/user/user.html:10
 msgid "User Profile"
 msgstr "Profil"
 
@@ -2563,62 +2564,68 @@ msgstr "Listes : %(username)s"
 msgid "Create list"
 msgstr "Créer une liste"
 
-#: bookwyrm/templates/user/shelf.html:34
+#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:53
+#, fuzzy
+#| msgid "books"
+msgid "All books"
+msgstr "livres"
+
+#: bookwyrm/templates/user/shelf.html:37
 msgid "Create shelf"
 msgstr "Créer l’étagère"
 
-#: bookwyrm/templates/user/shelf.html:55
+#: bookwyrm/templates/user/shelf.html:58
 msgid "Edit shelf"
 msgstr "Modifier l’étagère"
 
-#: bookwyrm/templates/user/shelf.html:75
+#: bookwyrm/templates/user/shelf.html:78
 msgid "Shelved"
 msgstr "Ajouté à une étagère"
 
-#: bookwyrm/templates/user/shelf.html:76
+#: bookwyrm/templates/user/shelf.html:79
 msgid "Started"
 msgstr "Commencé"
 
-#: bookwyrm/templates/user/shelf.html:77
+#: bookwyrm/templates/user/shelf.html:80
 msgid "Finished"
 msgstr "Terminé"
 
-#: bookwyrm/templates/user/shelf.html:121
+#: bookwyrm/templates/user/shelf.html:122
 msgid "This shelf is empty."
 msgstr "Cette étagère est vide"
 
-#: bookwyrm/templates/user/shelf.html:127
+#: bookwyrm/templates/user/shelf.html:128
 msgid "Delete shelf"
 msgstr "Supprimer l’étagère"
 
-#: bookwyrm/templates/user/user.html:15
+#: bookwyrm/templates/user/user.html:16
 msgid "Edit profile"
 msgstr "Modifier le profil"
 
-#: bookwyrm/templates/user/user.html:33
+#: bookwyrm/templates/user/user.html:34
 #, fuzzy, python-format
 #| msgid "See all %(size)s"
 msgid "View all %(size)s"
 msgstr "Voir les %(size)s"
 
-#: bookwyrm/templates/user/user.html:46
+#: bookwyrm/templates/user/user.html:47
 msgid "View all books"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:58
+#: bookwyrm/templates/user/user.html:59
 #, python-format
 msgid "Set a reading goal for %(year)s"
 msgstr "Définir un défi lecture pour %(year)s"
 
-#: bookwyrm/templates/user/user.html:64
+#: bookwyrm/templates/user/user.html:65
 msgid "User Activity"
 msgstr "Activité du compte"
 
-#: bookwyrm/templates/user/user.html:67
+#: bookwyrm/templates/user/user.html:68
 msgid "RSS feed"
 msgstr "Flux RSS"
 
-#: bookwyrm/templates/user/user.html:78
+#: bookwyrm/templates/user/user.html:79
 msgid "No activities yet!"
 msgstr "Aucune activité pour l’instant !"
 
diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index 2f547f10..8680ab96 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-31 09:22-0700\n"
+"POT-Creation-Date: 2021-03-31 10:36-0700\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"
@@ -397,7 +397,7 @@ msgid "John Doe, Jane Smith"
 msgstr "张三, �四"
 
 #: bookwyrm/templates/book/edit_book.html:155
-#: bookwyrm/templates/user/shelf.html:72
+#: bookwyrm/templates/user/shelf.html:75
 msgid "Cover"
 msgstr "��"
 
@@ -838,18 +838,18 @@ msgid "There are no books here right now! Try searching for a book to get starte
 msgstr "现在这里还没有任何书目��试�从�索�本书开始�"
 
 #: bookwyrm/templates/feed/feed_layout.html:23
-#: bookwyrm/templates/user/shelf.html:25
+#: bookwyrm/templates/user/shelf.html:28
 msgid "To Read"
 msgstr "想读"
 
 #: bookwyrm/templates/feed/feed_layout.html:24
-#: bookwyrm/templates/user/shelf.html:25
+#: bookwyrm/templates/user/shelf.html:28
 msgid "Currently Reading"
 msgstr "在读"
 
 #: bookwyrm/templates/feed/feed_layout.html:25
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-#: bookwyrm/templates/user/shelf.html:25
+#: bookwyrm/templates/user/shelf.html:28
 msgid "Read"
 msgstr "读过"
 
@@ -977,12 +977,12 @@ msgstr "书目"
 
 #: bookwyrm/templates/import_status.html:115
 #: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/user/shelf.html:73
+#: bookwyrm/templates/user/shelf.html:76
 msgid "Title"
 msgstr "标题"
 
 #: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/user/shelf.html:74
+#: bookwyrm/templates/user/shelf.html:77
 msgid "Author"
 msgstr "作者"
 
@@ -1992,7 +1992,7 @@ msgid "Review:"
 msgstr "书评"
 
 #: bookwyrm/templates/snippets/create_status_form.html:29
-#: bookwyrm/templates/user/shelf.html:78
+#: bookwyrm/templates/user/shelf.html:81
 msgid "Rating"
 msgstr "评价"
 
@@ -2450,7 +2450,8 @@ msgid "Update shelf"
 msgstr "更新书架"
 
 #: bookwyrm/templates/user/followers.html:7
-#: bookwyrm/templates/user/following.html:7 bookwyrm/templates/user/user.html:9
+#: bookwyrm/templates/user/following.html:7
+#: bookwyrm/templates/user/user.html:10
 msgid "User Profile"
 msgstr "用户个人资料"
 
@@ -2481,62 +2482,68 @@ msgstr "列表: %(username)s"
 msgid "Create list"
 msgstr "创建列表"
 
-#: bookwyrm/templates/user/shelf.html:34
+#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:53
+#, fuzzy
+#| msgid "books"
+msgid "All books"
+msgstr "书目"
+
+#: bookwyrm/templates/user/shelf.html:37
 msgid "Create shelf"
 msgstr "创建书架"
 
-#: bookwyrm/templates/user/shelf.html:55
+#: bookwyrm/templates/user/shelf.html:58
 msgid "Edit shelf"
 msgstr "编辑书架"
 
-#: bookwyrm/templates/user/shelf.html:75
+#: bookwyrm/templates/user/shelf.html:78
 msgid "Shelved"
 msgstr "已上架"
 
-#: bookwyrm/templates/user/shelf.html:76
+#: bookwyrm/templates/user/shelf.html:79
 msgid "Started"
 msgstr "已开始"
 
-#: bookwyrm/templates/user/shelf.html:77
+#: bookwyrm/templates/user/shelf.html:80
 msgid "Finished"
 msgstr "已完�"
 
-#: bookwyrm/templates/user/shelf.html:121
+#: bookwyrm/templates/user/shelf.html:122
 msgid "This shelf is empty."
 msgstr "此书架是空的。"
 
-#: bookwyrm/templates/user/shelf.html:127
+#: bookwyrm/templates/user/shelf.html:128
 msgid "Delete shelf"
 msgstr "删除书架"
 
-#: bookwyrm/templates/user/user.html:15
+#: bookwyrm/templates/user/user.html:16
 msgid "Edit profile"
 msgstr "编辑个人资料"
 
-#: bookwyrm/templates/user/user.html:33
+#: bookwyrm/templates/user/user.html:34
 #, fuzzy, python-format
 #| msgid "See all %(size)s"
 msgid "View all %(size)s"
 msgstr "查看所有 %(size)s 本"
 
-#: bookwyrm/templates/user/user.html:46
+#: bookwyrm/templates/user/user.html:47
 msgid "View all books"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:58
+#: bookwyrm/templates/user/user.html:59
 #, python-format
 msgid "Set a reading goal for %(year)s"
 msgstr "设定 %(year)s 的阅读目标"
 
-#: bookwyrm/templates/user/user.html:64
+#: bookwyrm/templates/user/user.html:65
 msgid "User Activity"
 msgstr "用户活动"
 
-#: bookwyrm/templates/user/user.html:67
+#: bookwyrm/templates/user/user.html:68
 msgid "RSS feed"
 msgstr "RSS �"
 
-#: bookwyrm/templates/user/user.html:78
+#: bookwyrm/templates/user/user.html:79
 msgid "No activities yet!"
 msgstr "还没有活动�"
 

From 32bd426999ade39129c4b998a6ed581d2c3d5fd8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 31 Mar 2021 11:04:20 -0700
Subject: [PATCH 0544/1285] Fixes shelf remote ids

---
 bookwyrm/models/shelf.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/models/shelf.py b/bookwyrm/models/shelf.py
index 515bb161..3209da5d 100644
--- a/bookwyrm/models/shelf.py
+++ b/bookwyrm/models/shelf.py
@@ -37,9 +37,13 @@ class Shelf(OrderedCollectionMixin, BookWyrmModel):
         """ set the identifier """
         super().save(*args, **kwargs)
         if not self.identifier:
-            slug = re.sub(r"[^\w]", "", self.name).lower()
-            self.identifier = "%s-%d" % (slug, self.id)
-            super().save(*args, **kwargs)
+            self.identifier = self.get_identifier()
+            super().save(*args, **kwargs, broadcast=False)
+
+    def get_identifier(self):
+        """ custom-shelf-123 for the url """
+        slug = re.sub(r"[^\w]", "", self.name).lower()
+        return "{:s}-{:d}".format(slug, self.id)
 
     @property
     def collection_queryset(self):
@@ -49,7 +53,8 @@ class Shelf(OrderedCollectionMixin, BookWyrmModel):
     def get_remote_id(self):
         """ shelf identifier instead of id """
         base_path = self.user.remote_id
-        return "%s/books/%s" % (base_path, self.identifier)
+        identifier = self.identifier or self.get_identifier()
+        return "%s/books/%s" % (base_path, identifier)
 
     class Meta:
         """ user/shelf unqiueness """

From 1a787fd218fc42723dd4501c4e3f1606a469fe37 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 31 Mar 2021 11:11:15 -0700
Subject: [PATCH 0545/1285] Soft removal of tags feature

---
 bookwyrm/templates/book/book.html | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index 95cf86ad..3931ea5b 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -165,32 +165,11 @@
                 {% include 'snippets/readthrough.html' with readthrough=readthrough %}
                 {% endfor %}
             </section>
-            {% endif %}
 
-            {% if request.user.is_authenticated %}
             <section class="box">
                 {% include 'snippets/create_status.html' with book=book hide_cover=True %}
             </section>
-
-            <section class="block">
-                <form name="tag" action="/tag/" method="post">
-                    <label for="tags" class="is-3">{% trans "Tags" %}</label>
-                    {% csrf_token %}
-                    <input type="hidden" name="book" value="{{ book.id }}">
-                    <input id="tags" class="input" type="text" name="name">
-                    <button class="button" type="submit">{% trans "Add tag" %}</button>
-                </form>
-            </section>
             {% endif %}
-
-            <div class="block">
-                <div class="field is-grouped is-grouped-multiline">
-                {% for tag in tags %}
-                    {% include 'snippets/tag.html' with book=book tag=tag user_tags=user_tags %}
-                {% endfor %}
-                </div>
-            </div>
-
         </div>
         <div class="column is-one-fifth">
             {% if book.subjects %}

From e78982b4c7f70ff495c1bd338e972c7403651f70 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 31 Mar 2021 11:42:57 -0700
Subject: [PATCH 0546/1285] Simplifies reading goal progress covers view

---
 bookwyrm/templates/goal.html                | 8 +++-----
 bookwyrm/templates/snippets/book_cover.html | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/templates/goal.html b/bookwyrm/templates/goal.html
index 5e967f41..fef1438b 100644
--- a/bookwyrm/templates/goal.html
+++ b/bookwyrm/templates/goal.html
@@ -55,11 +55,9 @@
     </h2>
     <div class="columns is-multiline">
         {% for book in goal.books %}
-        <div class="column is-narrow">
-            <div class="box">
-                <a href="{{ book.book.local_path }}">
-                    {% include 'discover/small-book.html' with book=book.book rating=goal.ratings %}
-                </a>
+        <div class="column is-one-fifth">
+            <div class="is-clipped">
+                <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book.book %}</a>
             </div>
         </div>
         {% endfor %}
diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index 92137853..0dbc3672 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -1,7 +1,7 @@
 {% load bookwyrm_tags %}
 <div class="cover-container is-{{ size }}">
 {% if book.cover %}
-<img class="book-cover" src="/images/{{ book.cover }}" alt="{{ book.alt_text }}">
+<img class="book-cover" src="/images/{{ book.cover }}" alt="{{ book.alt_text }}" title="{{ book.alt_text }}">
 {% else %}
     <div class="no-cover book-cover">
         <img class="book-cover" src="/static/images/no_cover.jpg" alt="No cover">

From daf2fd1667b76522d6db0f3534bb83adf8f6a18f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 31 Mar 2021 11:57:39 -0700
Subject: [PATCH 0547/1285] Perform webfinger search on all username syntaxes

---
 bookwyrm/views/search.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py
index 80969d31..18bf1d40 100644
--- a/bookwyrm/views/search.py
+++ b/bookwyrm/views/search.py
@@ -31,7 +31,7 @@ class Search(View):
             return JsonResponse([r.json() for r in book_results], safe=False)
 
         # use webfinger for mastodon style account@domain.com username
-        if re.match(r"\B%s" % regex.full_username, query):
+        if re.match(regex.full_username, query):
             handle_remote_webfinger(query)
 
         # do a  user search

From 66b7a3d193af9927fe7f2801f61039c54f2019d9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 31 Mar 2021 12:03:58 -0700
Subject: [PATCH 0548/1285] Avoids error on empty search query

---
 bookwyrm/connectors/connector_manager.py | 2 ++
 bookwyrm/views/search.py                 | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/connectors/connector_manager.py b/bookwyrm/connectors/connector_manager.py
index 3ed25ceb..853609de 100644
--- a/bookwyrm/connectors/connector_manager.py
+++ b/bookwyrm/connectors/connector_manager.py
@@ -15,6 +15,8 @@ class ConnectorException(HTTPError):
 
 def search(query, min_confidence=0.1):
     """ find books based on arbitary keywords """
+    if not query:
+        return []
     results = []
 
     # Have we got a ISBN ?
diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py
index 18bf1d40..28f393c8 100644
--- a/bookwyrm/views/search.py
+++ b/bookwyrm/views/search.py
@@ -31,7 +31,7 @@ class Search(View):
             return JsonResponse([r.json() for r in book_results], safe=False)
 
         # use webfinger for mastodon style account@domain.com username
-        if re.match(regex.full_username, query):
+        if query and re.match(regex.full_username, query):
             handle_remote_webfinger(query)
 
         # do a  user search
@@ -73,6 +73,6 @@ class Search(View):
             "book_results": book_results,
             "user_results": user_results,
             "list_results": list_results,
-            "query": query,
+            "query": query or "",
         }
         return TemplateResponse(request, "search_results.html", data)

From 7483cb59192a216ff8951f2d18f361b39d314427 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 31 Mar 2021 13:56:26 -0700
Subject: [PATCH 0549/1285] Adds getting started find books view

---
 bookwyrm/static/css/format.css            |  4 +
 bookwyrm/templates/get_started/books.html | 98 +++++++++++++++++++++++
 bookwyrm/urls.py                          |  2 +
 bookwyrm/views/__init__.py                |  1 +
 bookwyrm/views/get_started.py             | 35 ++++++++
 5 files changed, 140 insertions(+)
 create mode 100644 bookwyrm/templates/get_started/books.html
 create mode 100644 bookwyrm/views/get_started.py

diff --git a/bookwyrm/static/css/format.css b/bookwyrm/static/css/format.css
index 65fd56ab..e3ae1ce7 100644
--- a/bookwyrm/static/css/format.css
+++ b/bookwyrm/static/css/format.css
@@ -21,6 +21,10 @@ html {
     overflow-x: auto;
 }
 
+.modal-card.is-fullwidth {
+    min-width: 75% !important;
+}
+
 /* --- SHELVING --- */
 
 /** @todo Replace icons with SVG symbols.
diff --git a/bookwyrm/templates/get_started/books.html b/bookwyrm/templates/get_started/books.html
new file mode 100644
index 00000000..7ead0710
--- /dev/null
+++ b/bookwyrm/templates/get_started/books.html
@@ -0,0 +1,98 @@
+{% extends 'layout.html' %}
+{% load i18n %}
+{% load bookwyrm_tags %}
+{% load humanize %}
+
+{% block title %}{% trans "Welcome" %}{% endblock %}
+
+{% block content %}
+{% with site_name=site.name %}
+<div class="modal is-active" role="dialog" aria-modal="true">
+    <div class="modal-background"></div>
+    <div class="modal-card is-fullwidth">
+        <header class="modal-card-head">
+            <h1 class="modal-card-title">
+                {% trans "Getting Started" %}
+            </h1>
+            <button class="delete" aria-label="close"></button>
+        </header>
+        <section class="modal-card-body">
+            <div class="block">
+                <h2 class="title is-4">{% trans "What are you reading?" %}</h2>
+                <form class="field has-addons" method="get" action="{% url 'get-started' %}">
+                    <div class="control">
+                        <input type="text" name="query" value="{{ request.GET.query }}" class="input" placeholder="{% trans 'Search for a book' %}" aria-lable="{% trans 'Search for a book' %}">
+                        {% if request.GET.query and not book_results %}
+                        <p class="help">{% blocktrans %}Sorry, books were found. You can add books when you start using {{ site_name }}{% endblocktrans %}</p>
+                        {% endif %}
+                    </div>
+                    <div class="control">
+                        <button class="button" type="submit">
+                            <span class="icon icon-search" title="{% trans 'Search' %}">
+                                <span class="is-sr-only">{% trans "Search" %}</span>
+                            </span>
+                        </button>
+                    </div>
+                </form>
+            </div>
+
+            <form class="block">
+                <h3 class="title is-5">{% trans "Suggested Books" %}</h3>
+                <div class="columns scroll-x">
+                    {% if book_results %}
+                    <div class="column is-narrow content">
+                        <p class="help mb-0">Search results</p>
+                        <div class="columns">
+                            {% for book in book_results %}
+                            <div class="column is-narrow is-clipped">
+                                {% include 'snippets/book_cover.html' with book=book %}
+                                <div class="select is-small">
+                                    <select>
+                                        <option>-</option>
+                                        {% for shelf in request.user.shelf_set.all %}
+                                        <option>{{ shelf.name }}</option>
+                                        {% endfor %}
+                                    </select>
+                                </div>
+                            </div>
+                            {% endfor %}
+                        </div>
+                    </div>
+                    {% endif %}
+                    <div class="column is-narrow content">
+                        <p class="help mb-0">
+                            {% blocktrans %}Popular on {{ site_name }}{% endblocktrans %}
+                        </p>
+                        <div class="columns">
+                            {% for book in popular_books %}
+                            <div class="column is-narrow is-clipped">
+                                {% include 'snippets/book_cover.html' with book=book %}
+                                <div class="select is-small">
+                                    <select>
+                                        <option>-</option>
+                                        {% for shelf in request.user.shelf_set.all %}
+                                        <option>{{ shelf.name }}</option>
+                                        {% endfor %}
+                                    </select>
+                                </div>
+                            </div>
+                            {% endfor %}
+                        </div>
+                    </div>
+                </div>
+                <button type="submit" class="button is-primary">{% trans "Save" %}</button>
+            </form>
+        </section>
+
+        <footer class="modal-card-foot is-flex is-justify-content-flex-end">
+            <button class="button">
+                <span>{% trans "Skip this step" %}</span>
+                <span class="icon icon-arrow-right" aria-hidden="true"></span>
+            </button>
+        </footer>
+    </div>
+    <a href="/" class="modal-close is-large" aria-label="close"></a>
+</div>
+{% endwith %}
+{% endblock %}
+
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 27fb678f..6d14beeb 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -109,6 +109,8 @@ urlpatterns = [
     re_path(r"^discover/?$", views.Discover.as_view()),
     re_path(r"^notifications/?$", views.Notifications.as_view()),
     re_path(r"^directory/?", views.Directory.as_view(), name="directory"),
+    # Get started
+    re_path(r"^get-started/?$", views.GetStarted.as_view(), name="get-started"),
     # feeds
     re_path(r"^(?P<tab>home|local|federated)/?$", views.Feed.as_view()),
     re_path(
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index fead2a32..9ea5ebeb 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -9,6 +9,7 @@ from .federation import Federation, FederatedServer
 from .feed import DirectMessage, Feed, Replies, Status
 from .follow import follow, unfollow
 from .follow import accept_follow_request, delete_follow_request
+from .get_started import GetStarted
 from .goal import Goal, hide_goal
 from .import_data import Import, ImportStatus
 from .inbox import Inbox
diff --git a/bookwyrm/views/get_started.py b/bookwyrm/views/get_started.py
new file mode 100644
index 00000000..7db45806
--- /dev/null
+++ b/bookwyrm/views/get_started.py
@@ -0,0 +1,35 @@
+""" Helping new users figure out the lay of the land """
+from django.contrib.auth.decorators import login_required
+from django.db.models import Count
+from django.template.response import TemplateResponse
+from django.utils.decorators import method_decorator
+from django.views import View
+
+from bookwyrm import models
+from bookwyrm.connectors import connector_manager
+
+
+# pylint: disable= no-self-use
+@method_decorator(login_required, name="dispatch")
+class GetStarted(View):
+    """ a book! this is the stuff """
+
+    def get(self, request):
+        """ info about a book """
+        query = request.GET.get('query')
+        book_results = []
+        if query:
+            book_results = connector_manager.local_search(query, raw=True)[:5]
+        if len(book_results) < 5:
+            popular_books = models.Edition.objects.exclude(
+                parent_work__in=[b.parent_work for b in book_results],
+            ).annotate(
+                Count("shelfbook")
+            ).order_by("-shelfbook__count")[: 5 - len(book_results)]
+
+
+        data = {
+            "book_results": book_results,
+            "popular_books": popular_books,
+        }
+        return TemplateResponse(request, "get_started/books.html", data)

From 59c54e05917fbe61490bd4fbab13e38501067658 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 31 Mar 2021 13:59:33 -0700
Subject: [PATCH 0550/1285] Creates get strated layout

---
 bookwyrm/templates/get_started/books.html  | 151 +++++++++------------
 bookwyrm/templates/get_started/layout.html |  33 +++++
 2 files changed, 95 insertions(+), 89 deletions(-)
 create mode 100644 bookwyrm/templates/get_started/layout.html

diff --git a/bookwyrm/templates/get_started/books.html b/bookwyrm/templates/get_started/books.html
index 7ead0710..cbb208f8 100644
--- a/bookwyrm/templates/get_started/books.html
+++ b/bookwyrm/templates/get_started/books.html
@@ -1,98 +1,71 @@
-{% extends 'layout.html' %}
+{% extends 'get_started/layout.html' %}
 {% load i18n %}
-{% load bookwyrm_tags %}
-{% load humanize %}
 
-{% block title %}{% trans "Welcome" %}{% endblock %}
+{% block panel %}
+<div class="block">
+    <h2 class="title is-4">{% trans "What are you reading?" %}</h2>
+    <form class="field has-addons" method="get" action="{% url 'get-started' %}">
+        <div class="control">
+            <input type="text" name="query" value="{{ request.GET.query }}" class="input" placeholder="{% trans 'Search for a book' %}" aria-lable="{% trans 'Search for a book' %}">
+            {% if request.GET.query and not book_results %}
+            <p class="help">{% blocktrans %}Sorry, books were found. You can add books when you start using {{ site_name }}{% endblocktrans %}</p>
+            {% endif %}
+        </div>
+        <div class="control">
+            <button class="button" type="submit">
+                <span class="icon icon-search" title="{% trans 'Search' %}">
+                    <span class="is-sr-only">{% trans "Search" %}</span>
+                </span>
+            </button>
+        </div>
+    </form>
+</div>
 
-{% block content %}
-{% with site_name=site.name %}
-<div class="modal is-active" role="dialog" aria-modal="true">
-    <div class="modal-background"></div>
-    <div class="modal-card is-fullwidth">
-        <header class="modal-card-head">
-            <h1 class="modal-card-title">
-                {% trans "Getting Started" %}
-            </h1>
-            <button class="delete" aria-label="close"></button>
-        </header>
-        <section class="modal-card-body">
-            <div class="block">
-                <h2 class="title is-4">{% trans "What are you reading?" %}</h2>
-                <form class="field has-addons" method="get" action="{% url 'get-started' %}">
-                    <div class="control">
-                        <input type="text" name="query" value="{{ request.GET.query }}" class="input" placeholder="{% trans 'Search for a book' %}" aria-lable="{% trans 'Search for a book' %}">
-                        {% if request.GET.query and not book_results %}
-                        <p class="help">{% blocktrans %}Sorry, books were found. You can add books when you start using {{ site_name }}{% endblocktrans %}</p>
-                        {% endif %}
-                    </div>
-                    <div class="control">
-                        <button class="button" type="submit">
-                            <span class="icon icon-search" title="{% trans 'Search' %}">
-                                <span class="is-sr-only">{% trans "Search" %}</span>
-                            </span>
-                        </button>
-                    </div>
-                </form>
-            </div>
-
-            <form class="block">
-                <h3 class="title is-5">{% trans "Suggested Books" %}</h3>
-                <div class="columns scroll-x">
-                    {% if book_results %}
-                    <div class="column is-narrow content">
-                        <p class="help mb-0">Search results</p>
-                        <div class="columns">
-                            {% for book in book_results %}
-                            <div class="column is-narrow is-clipped">
-                                {% include 'snippets/book_cover.html' with book=book %}
-                                <div class="select is-small">
-                                    <select>
-                                        <option>-</option>
-                                        {% for shelf in request.user.shelf_set.all %}
-                                        <option>{{ shelf.name }}</option>
-                                        {% endfor %}
-                                    </select>
-                                </div>
-                            </div>
+<form class="block">
+    <h3 class="title is-5">{% trans "Suggested Books" %}</h3>
+    <div class="columns scroll-x">
+        {% if book_results %}
+        <div class="column is-narrow content">
+            <p class="help mb-0">Search results</p>
+            <div class="columns">
+                {% for book in book_results %}
+                <div class="column is-narrow is-clipped">
+                    {% include 'snippets/book_cover.html' with book=book %}
+                    <div class="select is-small">
+                        <select>
+                            <option>-</option>
+                            {% for shelf in request.user.shelf_set.all %}
+                            <option>{{ shelf.name }}</option>
                             {% endfor %}
-                        </div>
-                    </div>
-                    {% endif %}
-                    <div class="column is-narrow content">
-                        <p class="help mb-0">
-                            {% blocktrans %}Popular on {{ site_name }}{% endblocktrans %}
-                        </p>
-                        <div class="columns">
-                            {% for book in popular_books %}
-                            <div class="column is-narrow is-clipped">
-                                {% include 'snippets/book_cover.html' with book=book %}
-                                <div class="select is-small">
-                                    <select>
-                                        <option>-</option>
-                                        {% for shelf in request.user.shelf_set.all %}
-                                        <option>{{ shelf.name }}</option>
-                                        {% endfor %}
-                                    </select>
-                                </div>
-                            </div>
-                            {% endfor %}
-                        </div>
+                        </select>
                     </div>
                 </div>
-                <button type="submit" class="button is-primary">{% trans "Save" %}</button>
-            </form>
-        </section>
-
-        <footer class="modal-card-foot is-flex is-justify-content-flex-end">
-            <button class="button">
-                <span>{% trans "Skip this step" %}</span>
-                <span class="icon icon-arrow-right" aria-hidden="true"></span>
-            </button>
-        </footer>
+                {% endfor %}
+            </div>
+        </div>
+        {% endif %}
+        <div class="column is-narrow content">
+            <p class="help mb-0">
+                {% blocktrans %}Popular on {{ site_name }}{% endblocktrans %}
+            </p>
+            <div class="columns">
+                {% for book in popular_books %}
+                <div class="column is-narrow is-clipped">
+                    {% include 'snippets/book_cover.html' with book=book %}
+                    <div class="select is-small">
+                        <select>
+                            <option>-</option>
+                            {% for shelf in request.user.shelf_set.all %}
+                            <option>{{ shelf.name }}</option>
+                            {% endfor %}
+                        </select>
+                    </div>
+                </div>
+                {% endfor %}
+            </div>
+        </div>
     </div>
-    <a href="/" class="modal-close is-large" aria-label="close"></a>
-</div>
-{% endwith %}
+    <button type="submit" class="button is-primary">{% trans "Save" %}</button>
+</form>
 {% endblock %}
 
diff --git a/bookwyrm/templates/get_started/layout.html b/bookwyrm/templates/get_started/layout.html
new file mode 100644
index 00000000..eeb01bbe
--- /dev/null
+++ b/bookwyrm/templates/get_started/layout.html
@@ -0,0 +1,33 @@
+{% extends 'layout.html' %}
+{% load i18n %}
+
+{% block title %}{% trans "Welcome" %}{% endblock %}
+
+{% block content %}
+{% with site_name=site.name %}
+<div class="modal is-active" role="dialog" aria-modal="true">
+    <div class="modal-background"></div>
+    <div class="modal-card is-fullwidth">
+        <header class="modal-card-head">
+            <h1 class="modal-card-title">
+                {% trans "Getting Started" %}
+            </h1>
+            <button class="delete" aria-label="close"></button>
+        </header>
+        <section class="modal-card-body">
+            {% block panel %}{% endblock %}
+        </section>
+
+        <footer class="modal-card-foot is-flex is-justify-content-flex-end">
+            <a href="{{ next }}" class="button">
+                <span>{% trans "Skip this step" %}</span>
+                <span class="icon icon-arrow-right" aria-hidden="true"></span>
+            </a>
+        </footer>
+    </div>
+    <a href="/" class="modal-close is-large" aria-label="close"></a>
+</div>
+{% endwith %}
+{% endblock %}
+
+

From 13e153412e1afacfbd44fe8ee3911b048c388c19 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 31 Mar 2021 14:53:00 -0700
Subject: [PATCH 0551/1285] Adds profile and user get started views

---
 bookwyrm/templates/feed/feed.html            | 22 +------
 bookwyrm/templates/feed/suggested_users.html | 25 ++++++++
 bookwyrm/templates/get_started/books.html    |  2 +-
 bookwyrm/templates/get_started/layout.html   |  4 +-
 bookwyrm/templates/get_started/profile.html  | 58 +++++++++++++++++++
 bookwyrm/templates/get_started/users.html    | 11 ++++
 bookwyrm/urls.py                             | 16 ++++-
 bookwyrm/views/__init__.py                   |  2 +-
 bookwyrm/views/get_started.py                | 61 ++++++++++++++++----
 9 files changed, 165 insertions(+), 36 deletions(-)
 create mode 100644 bookwyrm/templates/feed/suggested_users.html
 create mode 100644 bookwyrm/templates/get_started/profile.html
 create mode 100644 bookwyrm/templates/get_started/users.html

diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html
index 3f9d36f7..e49b4c13 100644
--- a/bookwyrm/templates/feed/feed.html
+++ b/bookwyrm/templates/feed/feed.html
@@ -54,27 +54,7 @@
 {# suggested users on the first page, two statuses down #}
 <section class="block">
     <h2 class="title is-5">{% trans "Who to follow" %}</h2>
-    <div class="columns is-mobile scroll-x mb-0">
-        {% for user in suggested_users %}
-        <div class="column is-flex">
-            <div class="box has-text-centered is-shadowless has-background-white-bis m-0">
-                <a href="{{ user.local_path }}" class="has-text-black">
-                    {% include 'snippets/avatar.html' with user=user large=True %}
-                    <span title="{{ user.display_name }}" class="is-block is-6 has-text-weight-bold">{{ user.display_name|truncatechars:10 }}</span>
-                    <span title="@{{ user|username }}" class="is-block pb-3">@{{ user|username|truncatechars:8 }}</span>
-                </a>
-                {% include 'snippets/follow_button.html' with user=user minimal=True %}
-                {% if user.mutuals %}
-                <p class="help">
-                {% blocktrans with mutuals=user.mutuals|intcomma count counter=user.mutuals %}{{ mutuals }} follower you follow{% plural %}{{ mutuals }} followers you follow{% endblocktrans %}
-                </p>
-                {% elif user.shared_books %}
-                <p class="help">{% blocktrans with shared_books=user.shared_books|intcomma count counter=user.shared_books %}{{ shared_books }} book on your shelves{% plural %}{{ shared_books }} books on your shelves{% endblocktrans %}</p>
-                {% endif %}
-            </div>
-        </div>
-        {% endfor %}
-    </div>
+    {% include 'feed/suggested_users.html' with suggested_users=suggested_users %}
     <a class="help" href="{% url 'directory' %}">View directory <span class="icon icon-arrow-right"></a>
 </section>
 {% endif %}
diff --git a/bookwyrm/templates/feed/suggested_users.html b/bookwyrm/templates/feed/suggested_users.html
new file mode 100644
index 00000000..f66662e8
--- /dev/null
+++ b/bookwyrm/templates/feed/suggested_users.html
@@ -0,0 +1,25 @@
+{% load i18n %}
+{% load bookwyrm_tags %}
+{% load humanize %}
+<div class="columns is-mobile scroll-x mb-0">
+    {% for user in suggested_users %}
+    <div class="column is-flex">
+        <div class="box has-text-centered is-shadowless has-background-white-bis m-0">
+            <a href="{{ user.local_path }}" class="has-text-black">
+                {% include 'snippets/avatar.html' with user=user large=True %}
+                <span title="{{ user.display_name }}" class="is-block is-6 has-text-weight-bold">{{ user.display_name|truncatechars:10 }}</span>
+                <span title="@{{ user|username }}" class="is-block pb-3">@{{ user|username|truncatechars:8 }}</span>
+            </a>
+            {% include 'snippets/follow_button.html' with user=user minimal=True %}
+            {% if user.mutuals %}
+            <p class="help">
+            {% blocktrans with mutuals=user.mutuals|intcomma count counter=user.mutuals %}{{ mutuals }} follower you follow{% plural %}{{ mutuals }} followers you follow{% endblocktrans %}
+            </p>
+            {% elif user.shared_books %}
+            <p class="help">{% blocktrans with shared_books=user.shared_books|intcomma count counter=user.shared_books %}{{ shared_books }} book on your shelves{% plural %}{{ shared_books }} books on your shelves{% endblocktrans %}</p>
+            {% endif %}
+        </div>
+    </div>
+    {% endfor %}
+</div>
+
diff --git a/bookwyrm/templates/get_started/books.html b/bookwyrm/templates/get_started/books.html
index cbb208f8..eb10f4ed 100644
--- a/bookwyrm/templates/get_started/books.html
+++ b/bookwyrm/templates/get_started/books.html
@@ -4,7 +4,7 @@
 {% block panel %}
 <div class="block">
     <h2 class="title is-4">{% trans "What are you reading?" %}</h2>
-    <form class="field has-addons" method="get" action="{% url 'get-started' %}">
+    <form class="field has-addons" method="get" action="{% url 'get-started-books' %}">
         <div class="control">
             <input type="text" name="query" value="{{ request.GET.query }}" class="input" placeholder="{% trans 'Search for a book' %}" aria-lable="{% trans 'Search for a book' %}">
             {% if request.GET.query and not book_results %}
diff --git a/bookwyrm/templates/get_started/layout.html b/bookwyrm/templates/get_started/layout.html
index eeb01bbe..b6d373fd 100644
--- a/bookwyrm/templates/get_started/layout.html
+++ b/bookwyrm/templates/get_started/layout.html
@@ -19,10 +19,12 @@
         </section>
 
         <footer class="modal-card-foot is-flex is-justify-content-flex-end">
-            <a href="{{ next }}" class="button">
+            {% if next %}
+            <a href="{% url next %}" class="button">
                 <span>{% trans "Skip this step" %}</span>
                 <span class="icon icon-arrow-right" aria-hidden="true"></span>
             </a>
+            {% endif %}
         </footer>
     </div>
     <a href="/" class="modal-close is-large" aria-label="close"></a>
diff --git a/bookwyrm/templates/get_started/profile.html b/bookwyrm/templates/get_started/profile.html
new file mode 100644
index 00000000..7ee43c08
--- /dev/null
+++ b/bookwyrm/templates/get_started/profile.html
@@ -0,0 +1,58 @@
+{% extends 'get_started/layout.html' %}
+{% load i18n %}
+
+{% block panel %}
+<div class="block">
+    <h2 class="title is-4">{% trans "A little bit about you" %}</h2>
+    {% if form.non_field_errors %}
+    <p class="notification is-danger">{{ form.non_field_errors }}</p>
+    {% endif %}
+    <form name="edit-profile" action="{% url 'get-started-profile' %}" method="post" enctype="multipart/form-data">
+        {% csrf_token %}
+        <div class="columns">
+            <div class="column is-two-thirds">
+                <div class="block">
+                    <label class="label" for="id_name">{% trans "Display name:" %}</label>
+                    <input type="text" name="name" maxlength="100" class="input" id="id_name" placeholder="{{ user.localname }}" value="{% if request.user.name %}{{ request.user.name }}{% endif %}">
+                    {% for error in form.name.errors %}
+                    <p class="help is-danger">{{ error | escape }}</p>
+                    {% endfor %}
+                </div>
+                <div class="block">
+                    <label class="label" for="id_summary">{% trans "Summary:" %}</label>
+                    <textarea name="summary" cols="None" rows="None" class="textarea" id="id_summary" placeholder="{% trans 'A little bit about you' %}" value="{{ request.user.summary }}"></textarea>
+                    {% for error in form.summary.errors %}
+                    <p class="help is-danger">{{ error | escape }}</p>
+                    {% endfor %}
+                </div>
+            </div>
+
+            <div class="column is-one-third">
+                <div class="block">
+                    <label class="label" for="id_avatar">{% trans "Avatar:" %}</label>
+                    {{ form.avatar }}
+                    {% for error in form.avatar.errors %}
+                    <p class="help is-danger">{{ error | escape }}</p>
+                    {% endfor %}
+                </div>
+            </div>
+        </div>
+        <div class="block">
+            <label class="checkbox label" for="id_manually_approves_followers">
+                {% trans "Manually approve followers:" %}
+                {{ form.manually_approves_followers }}
+            </label>
+        </div>
+        <div class="block">
+            <label class="checkbox label" for="id_discoverable">
+                {% trans "Show this account in suggested users:" %}
+                <input type="checkbox" name="discoverable" class="checkbox" id="id_discoverable" checked>
+            </label>
+            {% url 'directory' as path %}
+            <p class="help">{% trans "Your account will show up in the directory, and may be recommended to other BookWyrm users." %}</p>
+        </div>
+        <div class="block"><button class="button is-primary" type="submit">{% trans "Save" %}</button></div>
+    </form>
+</div>
+{% endblock %}
+
diff --git a/bookwyrm/templates/get_started/users.html b/bookwyrm/templates/get_started/users.html
new file mode 100644
index 00000000..14c04e63
--- /dev/null
+++ b/bookwyrm/templates/get_started/users.html
@@ -0,0 +1,11 @@
+{% extends 'get_started/layout.html' %}
+{% load i18n %}
+
+{% block panel %}
+<div class="block">
+    <h2 class="title is-4">{% trans "Who to follow" %}</h2>
+
+    {% include 'feed/suggested_users.html' with suggested_users=suggested_users %}
+</div>
+{% endblock %}
+
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 6d14beeb..ef8b3212 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -110,7 +110,21 @@ urlpatterns = [
     re_path(r"^notifications/?$", views.Notifications.as_view()),
     re_path(r"^directory/?", views.Directory.as_view(), name="directory"),
     # Get started
-    re_path(r"^get-started/?$", views.GetStarted.as_view(), name="get-started"),
+    re_path(
+        r"^get-started/?$",
+        views.GetStartedProfile.as_view(),
+        name="get-started-profile",
+    ),
+    re_path(
+        r"^get-started/books/?$",
+        views.GetStartedBooks.as_view(),
+        name="get-started-books",
+    ),
+    re_path(
+        r"^get-started/users/?$",
+        views.GetStartedUsers.as_view(),
+        name="get-started-users",
+    ),
     # feeds
     re_path(r"^(?P<tab>home|local|federated)/?$", views.Feed.as_view()),
     re_path(
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 9ea5ebeb..22e6071c 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -9,7 +9,7 @@ from .federation import Federation, FederatedServer
 from .feed import DirectMessage, Feed, Replies, Status
 from .follow import follow, unfollow
 from .follow import accept_follow_request, delete_follow_request
-from .get_started import GetStarted
+from .get_started import GetStartedBooks, GetStartedProfile, GetStartedUsers
 from .goal import Goal, hide_goal
 from .import_data import Import, ImportStatus
 from .inbox import Inbox
diff --git a/bookwyrm/views/get_started.py b/bookwyrm/views/get_started.py
index 7db45806..f133e335 100644
--- a/bookwyrm/views/get_started.py
+++ b/bookwyrm/views/get_started.py
@@ -1,35 +1,74 @@
 """ Helping new users figure out the lay of the land """
 from django.contrib.auth.decorators import login_required
-from django.db.models import Count
+from django.db.models import Count, Q
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
 
-from bookwyrm import models
+from bookwyrm import forms, models
 from bookwyrm.connectors import connector_manager
+from .helpers import get_suggested_users
 
 
 # pylint: disable= no-self-use
 @method_decorator(login_required, name="dispatch")
-class GetStarted(View):
-    """ a book! this is the stuff """
+class GetStartedProfile(View):
+    """ tell us about yourself """
+
+    def get(self, request):
+        """ basic profile info """
+        data = {
+            "form": forms.EditUserForm(instance=request.user),
+            "next": "get-started-books",
+        }
+        return TemplateResponse(request, "get_started/profile.html", data)
+
+
+@method_decorator(login_required, name="dispatch")
+class GetStartedBooks(View):
+    """ name a book, any book, we gotta start somewhere """
 
     def get(self, request):
         """ info about a book """
-        query = request.GET.get('query')
+        query = request.GET.get("query")
         book_results = []
         if query:
             book_results = connector_manager.local_search(query, raw=True)[:5]
         if len(book_results) < 5:
-            popular_books = models.Edition.objects.exclude(
-                parent_work__in=[b.parent_work for b in book_results],
-            ).annotate(
-                Count("shelfbook")
-            ).order_by("-shelfbook__count")[: 5 - len(book_results)]
-
+            popular_books = (
+                models.Edition.objects.exclude(
+                    parent_work__in=[b.parent_work for b in book_results],
+                )
+                .annotate(Count("shelfbook"))
+                .order_by("-shelfbook__count")[: 5 - len(book_results)]
+            )
 
         data = {
             "book_results": book_results,
             "popular_books": popular_books,
+            "next": "get-started-users",
         }
         return TemplateResponse(request, "get_started/books.html", data)
+
+
+@method_decorator(login_required, name="dispatch")
+class GetStartedUsers(View):
+    """ find friends """
+
+    def get(self, request):
+        """ basic profile info """
+        suggested_users = (
+            get_suggested_users(
+                request.user,
+                ~Q(id=request.user.id),
+                ~Q(followers=request.user),
+                bookwyrm_user=True,
+            )
+            .order_by("shared_books", "-mutuals", "-last_active_date")
+            .all()[:5]
+        )
+        data = {
+            "suggested_users": suggested_users,
+            "next": "get-started-profile",
+        }
+        return TemplateResponse(request, "get_started/users.html", data)

From c7863ec8f0ef1375eef8a23907f17a5e279f3f55 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 31 Mar 2021 15:00:49 -0700
Subject: [PATCH 0552/1285] Fixes re-shelving books from all books view

---
 bookwyrm/templates/snippets/shelf_selector.html | 2 +-
 bookwyrm/templates/user/shelf.html              | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/snippets/shelf_selector.html b/bookwyrm/templates/snippets/shelf_selector.html
index 1bc448ec..edc291e0 100644
--- a/bookwyrm/templates/snippets/shelf_selector.html
+++ b/bookwyrm/templates/snippets/shelf_selector.html
@@ -12,7 +12,7 @@
     <form class="dropdown-item pt-0 pb-0" name="shelve" action="/shelve/" method="post">
         {% csrf_token %}
         <input type="hidden" name="book" value="{{ book.id }}">
-        <input type="hidden" name="change-shelf-from" value={{ current.identifier }}>
+        <input type="hidden" name="change-shelf-from" value="{{ current.identifier }}">
         <input type="hidden" name="shelf" value="{{ shelf.identifier }}">
         <button class="button is-fullwidth is-small" type="submit">{{ shelf.name }}</button>
     </form>
diff --git a/bookwyrm/templates/user/shelf.html b/bookwyrm/templates/user/shelf.html
index 8d23dce4..d1de6e00 100644
--- a/bookwyrm/templates/user/shelf.html
+++ b/bookwyrm/templates/user/shelf.html
@@ -111,7 +111,12 @@
             {% endif %}
             {% if shelf.user == request.user %}
             <td>
-                {% include 'snippets/shelf_selector.html' with current=shelf %}
+                {% if not shelf.id %}
+                {% active_shelf book as current %}
+                {% include 'snippets/shelf_selector.html' with current=current.shelf class="is-small" %}
+                {% else %}
+                {% include 'snippets/shelf_selector.html' with current=shelf class="is-small" %}
+                {% endif %}
             </td>
             {% endif %}
         </tr>

From 210cf4a7024823c1d503897df6afed52e3744be1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 31 Mar 2021 15:03:07 -0700
Subject: [PATCH 0553/1285] Fixes shelf redirects

---
 bookwyrm/views/shelf.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index 971eb858..88982b26 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -102,7 +102,7 @@ def create_shelf(request):
         return redirect(request.headers.get("Referer", "/"))
 
     shelf = form.save()
-    return redirect("/user/%s/shelf/%s" % (request.user.localname, shelf.identifier))
+    return redirect(shelf.local_path)
 
 
 @login_required
@@ -114,7 +114,7 @@ def delete_shelf(request, shelf_id):
         return HttpResponseBadRequest()
 
     shelf.delete()
-    return redirect("/user/%s/shelves" % request.user.localname)
+    return redirect("user-shelves", request.user.localname)
 
 
 @login_required

From f2f700c7b8edeb3ab05acd7e7c487742cf567227 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 31 Mar 2021 15:39:28 -0700
Subject: [PATCH 0554/1285] Adds error messaging for invalid cover urls

---
 bookwyrm/templates/book/book.html | 3 +++
 bookwyrm/views/books.py           | 9 +++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index 3931ea5b..b91cebba 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -49,6 +49,9 @@
                 {% trans "Add cover" as button_text %}
                 {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="add-cover" controls_uid=book.id focus="modal-title-add-cover" class="is-small" %}
                 {% include 'book/cover_modal.html' with book=book controls_text="add-cover" controls_uid=book.id %}
+                {% if request.GET.cover_error %}
+                <p class="help is-danger">{% trans "Failed to load cover" %}</p>
+                {% endif %}
             </div>
             {% endif %}
 
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 632cb2ad..58886cad 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -289,18 +289,19 @@ def upload_cover(request, book_id):
     url = request.POST.get("cover-url")
     if url:
         image = set_cover_from_url(url)
-        book.cover.save(*image)
+        if image:
+            book.cover.save(*image)
 
-        return redirect("/book/%d" % book.id)
+        return redirect("{:s}?cover_error=True".format(book.local_path))
 
     form = forms.CoverForm(request.POST, request.FILES, instance=book)
     if not form.is_valid() or not form.files.get("cover"):
-        return redirect("/book/%d" % book.id)
+        return redirect(book.local_path)
 
     book.cover = form.files["cover"]
     book.save()
 
-    return redirect("/book/%s" % book.id)
+    return redirect(book.local_path)
 
 
 def set_cover_from_url(url):

From fd6c1973cfdca5733dae2519d5e16d4d92a34a35 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 07:24:56 -0700
Subject: [PATCH 0555/1285] Shelf page 500s where it should 404

---
 bookwyrm/views/shelf.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index 88982b26..41d1f135 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -39,7 +39,10 @@ class Shelf(View):
 
         # get the shelf and make sure the logged in user should be able to see it
         if shelf_identifier:
-            shelf = user.shelf_set.get(identifier=shelf_identifier)
+            try:
+                shelf = user.shelf_set.get(identifier=shelf_identifier)
+            except models.Shelf.DoesNotExist:
+                return HttpResponseNotFound()
             if not object_visible_to_user(request.user, shelf):
                 return HttpResponseNotFound()
         # this is a constructed "all books" view, with a fake "shelf" obj

From 47204812193eb8e3efd891afb67dac419f03090e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 08:02:42 -0700
Subject: [PATCH 0556/1285] Fixes accessibility bugs

---
 bookwyrm/templates/get_started/books.html  | 28 ++++------------------
 bookwyrm/templates/get_started/layout.html |  4 ++--
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/bookwyrm/templates/get_started/books.html b/bookwyrm/templates/get_started/books.html
index eb10f4ed..110bced2 100644
--- a/bookwyrm/templates/get_started/books.html
+++ b/bookwyrm/templates/get_started/books.html
@@ -6,7 +6,7 @@
     <h2 class="title is-4">{% trans "What are you reading?" %}</h2>
     <form class="field has-addons" method="get" action="{% url 'get-started-books' %}">
         <div class="control">
-            <input type="text" name="query" value="{{ request.GET.query }}" class="input" placeholder="{% trans 'Search for a book' %}" aria-lable="{% trans 'Search for a book' %}">
+            <input type="text" name="query" value="{{ request.GET.query }}" class="input" placeholder="{% trans 'Search for a book' %}" aria-label="{% trans 'Search for a book' %}">
             {% if request.GET.query and not book_results %}
             <p class="help">{% blocktrans %}Sorry, books were found. You can add books when you start using {{ site_name }}{% endblocktrans %}</p>
             {% endif %}
@@ -21,7 +21,7 @@
     </form>
 </div>
 
-<form class="block">
+<form class="block" name="add-books" method="post" action="{% url 'get-started-books' %}">
     <h3 class="title is-5">{% trans "Suggested Books" %}</h3>
     <div class="columns scroll-x">
         {% if book_results %}
@@ -29,17 +29,7 @@
             <p class="help mb-0">Search results</p>
             <div class="columns">
                 {% for book in book_results %}
-                <div class="column is-narrow is-clipped">
-                    {% include 'snippets/book_cover.html' with book=book %}
-                    <div class="select is-small">
-                        <select>
-                            <option>-</option>
-                            {% for shelf in request.user.shelf_set.all %}
-                            <option>{{ shelf.name }}</option>
-                            {% endfor %}
-                        </select>
-                    </div>
-                </div>
+                {% include 'get_started/book_preview.html' %}
                 {% endfor %}
             </div>
         </div>
@@ -50,17 +40,7 @@
             </p>
             <div class="columns">
                 {% for book in popular_books %}
-                <div class="column is-narrow is-clipped">
-                    {% include 'snippets/book_cover.html' with book=book %}
-                    <div class="select is-small">
-                        <select>
-                            <option>-</option>
-                            {% for shelf in request.user.shelf_set.all %}
-                            <option>{{ shelf.name }}</option>
-                            {% endfor %}
-                        </select>
-                    </div>
-                </div>
+                {% include 'get_started/book_preview.html' %}
                 {% endfor %}
             </div>
         </div>
diff --git a/bookwyrm/templates/get_started/layout.html b/bookwyrm/templates/get_started/layout.html
index b6d373fd..18da2fb3 100644
--- a/bookwyrm/templates/get_started/layout.html
+++ b/bookwyrm/templates/get_started/layout.html
@@ -5,11 +5,11 @@
 
 {% block content %}
 {% with site_name=site.name %}
-<div class="modal is-active" role="dialog" aria-modal="true">
+<div class="modal is-active" role="dialog" aria-modal="true" aria-labelledby="get-started-header">
     <div class="modal-background"></div>
     <div class="modal-card is-fullwidth">
         <header class="modal-card-head">
-            <h1 class="modal-card-title">
+            <h1 class="modal-card-title" id="get-started-header">
                 {% trans "Getting Started" %}
             </h1>
             <button class="delete" aria-label="close"></button>

From d5d4582ed1b52edc2b702686f1ec12d10bf88979 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 08:12:38 -0700
Subject: [PATCH 0557/1285] Only show unshelved books

---
 bookwyrm/views/get_started.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/views/get_started.py b/bookwyrm/views/get_started.py
index f133e335..a6fd7a72 100644
--- a/bookwyrm/views/get_started.py
+++ b/bookwyrm/views/get_started.py
@@ -37,7 +37,15 @@ class GetStartedBooks(View):
         if len(book_results) < 5:
             popular_books = (
                 models.Edition.objects.exclude(
-                    parent_work__in=[b.parent_work for b in book_results],
+                    # exclude already shelved
+                    Q(
+                        parent_work__in=[
+                            b.book.parent_work
+                            for b in request.user.shelfbook_set.distinct().all()
+                        ]
+                    )
+                    |  # - or if it's already in search results
+                    Q(parent_work__in=[b.parent_work for b in book_results])
                 )
                 .annotate(Count("shelfbook"))
                 .order_by("-shelfbook__count")[: 5 - len(book_results)]

From c9fdec33c43d9bc9e483beaec188ec38efed75b5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 08:20:43 -0700
Subject: [PATCH 0558/1285] Display tweaks

---
 bookwyrm/templates/get_started/book_preview.html | 14 ++++++++++++++
 bookwyrm/templates/get_started/books.html        |  2 +-
 bookwyrm/templates/get_started/layout.html       |  2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 bookwyrm/templates/get_started/book_preview.html

diff --git a/bookwyrm/templates/get_started/book_preview.html b/bookwyrm/templates/get_started/book_preview.html
new file mode 100644
index 00000000..b65236be
--- /dev/null
+++ b/bookwyrm/templates/get_started/book_preview.html
@@ -0,0 +1,14 @@
+{% load i18n %}
+<div class="column is-narrow is-clipped has-text-centered">
+    {% include 'snippets/book_cover.html' with book=book %}
+    <label class="label" for="id_shelve_{{ book.id }}">
+    <div class="select is-small">
+        <select name="{{ book.id }}" aria-label="{% blocktrans with book_title=book.title %}Have you read {{ book_title }}?{% endblocktrans %}">
+            <option value="">-</option>
+            {% for shelf in request.user.shelf_set.all %}
+            <option value="{{ shelf.id }}">{{ shelf.name }}</option>
+            {% endfor %}
+        </select>
+    </div>
+</div>
+
diff --git a/bookwyrm/templates/get_started/books.html b/bookwyrm/templates/get_started/books.html
index 110bced2..3f40550c 100644
--- a/bookwyrm/templates/get_started/books.html
+++ b/bookwyrm/templates/get_started/books.html
@@ -45,7 +45,7 @@
             </div>
         </div>
     </div>
-    <button type="submit" class="button is-primary">{% trans "Save" %}</button>
+    <button type="submit" class="button is-primary">{% trans "Save &amp; continue" %}</button>
 </form>
 {% endblock %}
 
diff --git a/bookwyrm/templates/get_started/layout.html b/bookwyrm/templates/get_started/layout.html
index 18da2fb3..17fc5a9b 100644
--- a/bookwyrm/templates/get_started/layout.html
+++ b/bookwyrm/templates/get_started/layout.html
@@ -12,7 +12,7 @@
             <h1 class="modal-card-title" id="get-started-header">
                 {% trans "Getting Started" %}
             </h1>
-            <button class="delete" aria-label="close"></button>
+            <a href="/" class="delete" aria-label="close"></a>
         </header>
         <section class="modal-card-body">
             {% block panel %}{% endblock %}

From 31b7d267a4faa4a9468bf99256b5d2dcdb31de9c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 08:20:57 -0700
Subject: [PATCH 0559/1285] Adds initial view tests

---
 bookwyrm/tests/views/test_get_started.py | 67 ++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 bookwyrm/tests/views/test_get_started.py

diff --git a/bookwyrm/tests/views/test_get_started.py b/bookwyrm/tests/views/test_get_started.py
new file mode 100644
index 00000000..2b0dd751
--- /dev/null
+++ b/bookwyrm/tests/views/test_get_started.py
@@ -0,0 +1,67 @@
+""" test for app action functionality """
+from django.template.response import TemplateResponse
+from django.test import TestCase
+from django.test.client import RequestFactory
+
+from bookwyrm import models
+from bookwyrm import views
+
+
+class GetStartedViews(TestCase):
+    """ helping new users get oriented """
+
+    def setUp(self):
+        """ we need basic test data and mocks """
+        self.factory = RequestFactory()
+        self.local_user = models.User.objects.create_user(
+            "mouse@local.com",
+            "mouse@mouse.mouse",
+            "password",
+            local=True,
+            localname="mouse",
+        )
+        self.book = models.Edition.objects.create(
+            parent_work=models.Work.objects.create(title="hi"),
+            title="Example Edition",
+            remote_id="https://example.com/book/1",
+        )
+        models.SiteSettings.objects.create()
+
+    def test_profile_view(self):
+        """ there are so many views, this just makes sure it LOADS """
+        view = views.GetStartedProfile.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+
+        result = view(request)
+
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+
+    def test_profile_view_post(self):
+        """ save basic user details """
+
+    def test_books_view(self):
+        """ there are so many views, this just makes sure it LOADS """
+        view = views.GetStartedBooks.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+
+        result = view(request)
+
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+
+    def test_users_view(self):
+        """ there are so many views, this just makes sure it LOADS """
+        view = views.GetStartedUsers.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+
+        result = view(request)
+
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)

From e2388d8f673de2013a27ad3c91333699a9eaa93c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 08:32:06 -0700
Subject: [PATCH 0560/1285] Makes user profile view editable

---
 bookwyrm/forms.py                        | 13 +++++++++++
 bookwyrm/tests/views/test_get_started.py | 19 ++++++++++++++--
 bookwyrm/views/get_started.py            | 15 +++++++++++-
 bookwyrm/views/user.py                   | 29 ++++++++++++++----------
 4 files changed, 61 insertions(+), 15 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index c0f4a923..1477234f 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -137,6 +137,19 @@ class EditUserForm(CustomForm):
         help_texts = {f: None for f in fields}
 
 
+class LimitedEditUserForm(CustomForm):
+    class Meta:
+        model = models.User
+        fields = [
+            "avatar",
+            "name",
+            "summary",
+            "manually_approves_followers",
+            "discoverable",
+        ]
+        help_texts = {f: None for f in fields}
+
+
 class TagForm(CustomForm):
     class Meta:
         model = models.Tag
diff --git a/bookwyrm/tests/views/test_get_started.py b/bookwyrm/tests/views/test_get_started.py
index 2b0dd751..11896f30 100644
--- a/bookwyrm/tests/views/test_get_started.py
+++ b/bookwyrm/tests/views/test_get_started.py
@@ -1,10 +1,10 @@
 """ test for app action functionality """
+from unittest.mock import patch
 from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
 
-from bookwyrm import models
-from bookwyrm import views
+from bookwyrm import forms, models, views
 
 
 class GetStartedViews(TestCase):
@@ -41,6 +41,21 @@ class GetStartedViews(TestCase):
 
     def test_profile_view_post(self):
         """ save basic user details """
+        view = views.GetStartedProfile.as_view()
+        form = forms.LimitedEditUserForm(instance=self.local_user)
+        form.data["name"] = "New Name"
+        form.data["discoverable"] = "True"
+        request = self.factory.post("", form.data)
+        request.user = self.local_user
+
+        self.assertIsNone(self.local_user.name)
+        with patch(
+            "bookwyrm.models.activitypub_mixin.broadcast_task.delay"
+        ) as delay_mock:
+            view(request)
+            self.assertEqual(delay_mock.call_count, 1)
+        self.assertEqual(self.local_user.name, "New Name")
+        self.assertTrue(self.local_user.discoverable)
 
     def test_books_view(self):
         """ there are so many views, this just makes sure it LOADS """
diff --git a/bookwyrm/views/get_started.py b/bookwyrm/views/get_started.py
index a6fd7a72..7bf236c8 100644
--- a/bookwyrm/views/get_started.py
+++ b/bookwyrm/views/get_started.py
@@ -1,6 +1,7 @@
 """ Helping new users figure out the lay of the land """
 from django.contrib.auth.decorators import login_required
 from django.db.models import Count, Q
+from django.shortcuts import redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
@@ -8,6 +9,7 @@ from django.views import View
 from bookwyrm import forms, models
 from bookwyrm.connectors import connector_manager
 from .helpers import get_suggested_users
+from .user import save_user_form
 
 
 # pylint: disable= no-self-use
@@ -18,11 +20,22 @@ class GetStartedProfile(View):
     def get(self, request):
         """ basic profile info """
         data = {
-            "form": forms.EditUserForm(instance=request.user),
+            "form": forms.LimitedEditUserForm(instance=request.user),
             "next": "get-started-books",
         }
         return TemplateResponse(request, "get_started/profile.html", data)
 
+    def post(self, request):
+        """ update your profile """
+        form = forms.LimitedEditUserForm(
+            request.POST, request.FILES, instance=request.user
+        )
+        if not form.is_valid():
+            data = {"form": form, "next": "get-started-books"}
+            return TemplateResponse(request, "get_started/profile.html", data)
+        save_user_form(form)
+        return redirect('get-started-books')
+
 
 @method_decorator(login_required, name="dispatch")
 class GetStartedBooks(View):
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index b8e3a86d..cce921be 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -163,21 +163,26 @@ class EditUser(View):
             data = {"form": form, "user": request.user}
             return TemplateResponse(request, "preferences/edit_user.html", data)
 
-        user = form.save(commit=False)
-
-        if "avatar" in form.files:
-            # crop and resize avatar upload
-            image = Image.open(form.files["avatar"])
-            image = crop_avatar(image)
-
-            # set the name to a hash
-            extension = form.files["avatar"].name.split(".")[-1]
-            filename = "%s.%s" % (uuid4(), extension)
-            user.avatar.save(filename, image, save=False)
-        user.save()
+        save_user_form(form)
 
         return redirect(user.local_path)
 
+def save_user_form(form):
+    """ special handling for the user form """
+    user = form.save(commit=False)
+
+    if "avatar" in form.files:
+        # crop and resize avatar upload
+        image = Image.open(form.files["avatar"])
+        image = crop_avatar(image)
+
+        # set the name to a hash
+        extension = form.files["avatar"].name.split(".")[-1]
+        filename = "%s.%s" % (uuid4(), extension)
+        user.avatar.save(filename, image, save=False)
+    user.save()
+    return user
+
 
 def crop_avatar(image):
     """ reduce the size and make an avatar square """

From ed127f4e07fa303253ef4d922ba7c4804554b348 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 09:02:48 -0700
Subject: [PATCH 0561/1285] Save and continue from get started books view

---
 bookwyrm/templates/get_started/books.html | 10 +++++--
 bookwyrm/tests/views/test_get_started.py  | 33 +++++++++++++++++++++
 bookwyrm/views/get_started.py             | 36 +++++++++++++++++++----
 bookwyrm/views/user.py                    |  1 +
 4 files changed, 72 insertions(+), 8 deletions(-)

diff --git a/bookwyrm/templates/get_started/books.html b/bookwyrm/templates/get_started/books.html
index 3f40550c..9e2e422c 100644
--- a/bookwyrm/templates/get_started/books.html
+++ b/bookwyrm/templates/get_started/books.html
@@ -22,8 +22,9 @@
 </div>
 
 <form class="block" name="add-books" method="post" action="{% url 'get-started-books' %}">
+    {% csrf_token %}
     <h3 class="title is-5">{% trans "Suggested Books" %}</h3>
-    <div class="columns scroll-x">
+    <fieldset name="books" class="columns scroll-x">
         {% if book_results %}
         <div class="column is-narrow content">
             <p class="help mb-0">Search results</p>
@@ -34,6 +35,7 @@
             </div>
         </div>
         {% endif %}
+        {% if popular_books %}
         <div class="column is-narrow content">
             <p class="help mb-0">
                 {% blocktrans %}Popular on {{ site_name }}{% endblocktrans %}
@@ -44,7 +46,11 @@
                 {% endfor %}
             </div>
         </div>
-    </div>
+        {% endif %}
+        {% if not book_results and not popular_books %}
+        <p><em>{% trans "No books found" %}</em></p>
+        {% endif %}
+    </fieldset>
     <button type="submit" class="button is-primary">{% trans "Save &amp; continue" %}</button>
 </form>
 {% endblock %}
diff --git a/bookwyrm/tests/views/test_get_started.py b/bookwyrm/tests/views/test_get_started.py
index 11896f30..89cc5a26 100644
--- a/bookwyrm/tests/views/test_get_started.py
+++ b/bookwyrm/tests/views/test_get_started.py
@@ -25,6 +25,9 @@ class GetStartedViews(TestCase):
             title="Example Edition",
             remote_id="https://example.com/book/1",
         )
+        models.Connector.objects.create(
+            identifier="self", connector_file="self_connector", local=True
+        )
         models.SiteSettings.objects.create()
 
     def test_profile_view(self):
@@ -69,6 +72,36 @@ class GetStartedViews(TestCase):
         result.render()
         self.assertEqual(result.status_code, 200)
 
+    def test_books_view_with_query(self):
+        """ there are so many views, this just makes sure it LOADS """
+        view = views.GetStartedBooks.as_view()
+        request = self.factory.get("?query=Example")
+        request.user = self.local_user
+
+        result = view(request)
+
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+
+    def test_books_view_post(self):
+        """ shelve some books """
+        view = views.GetStartedBooks.as_view()
+        data = {self.book.id: self.local_user.shelf_set.first().id}
+        request = self.factory.post("", data)
+        request.user = self.local_user
+
+        self.assertFalse(self.local_user.shelfbook_set.exists())
+        with patch(
+            "bookwyrm.models.activitypub_mixin.broadcast_task.delay"
+        ) as delay_mock:
+            view(request)
+            self.assertEqual(delay_mock.call_count, 1)
+
+        shelfbook = self.local_user.shelfbook_set.first()
+        self.assertEqual(shelfbook.book, self.book)
+        self.assertEqual(shelfbook.user, self.local_user)
+
     def test_users_view(self):
         """ there are so many views, this just makes sure it LOADS """
         view = views.GetStartedUsers.as_view()
diff --git a/bookwyrm/views/get_started.py b/bookwyrm/views/get_started.py
index 7bf236c8..fba01840 100644
--- a/bookwyrm/views/get_started.py
+++ b/bookwyrm/views/get_started.py
@@ -1,7 +1,10 @@
 """ Helping new users figure out the lay of the land """
+import re
+
 from django.contrib.auth.decorators import login_required
 from django.db.models import Count, Q
-from django.shortcuts import redirect
+from django.http import HttpResponseNotFound
+from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
@@ -17,11 +20,13 @@ from .user import save_user_form
 class GetStartedProfile(View):
     """ tell us about yourself """
 
+    next_view = "get-started-books"
+
     def get(self, request):
         """ basic profile info """
         data = {
             "form": forms.LimitedEditUserForm(instance=request.user),
-            "next": "get-started-books",
+            "next": self.next_view,
         }
         return TemplateResponse(request, "get_started/profile.html", data)
 
@@ -34,13 +39,15 @@ class GetStartedProfile(View):
             data = {"form": form, "next": "get-started-books"}
             return TemplateResponse(request, "get_started/profile.html", data)
         save_user_form(form)
-        return redirect('get-started-books')
+        return redirect(self.next_view)
 
 
 @method_decorator(login_required, name="dispatch")
 class GetStartedBooks(View):
     """ name a book, any book, we gotta start somewhere """
 
+    next_view = "get-started-users"
+
     def get(self, request):
         """ info about a book """
         query = request.GET.get("query")
@@ -57,8 +64,9 @@ class GetStartedBooks(View):
                             for b in request.user.shelfbook_set.distinct().all()
                         ]
                     )
-                    |  # - or if it's already in search results
-                    Q(parent_work__in=[b.parent_work for b in book_results])
+                    | Q(  # and exclude if it's already in search results
+                        parent_work__in=[b.parent_work for b in book_results]
+                    )
                 )
                 .annotate(Count("shelfbook"))
                 .order_by("-shelfbook__count")[: 5 - len(book_results)]
@@ -67,10 +75,26 @@ class GetStartedBooks(View):
         data = {
             "book_results": book_results,
             "popular_books": popular_books,
-            "next": "get-started-users",
+            "next": self.next_view,
         }
         return TemplateResponse(request, "get_started/books.html", data)
 
+    def post(self, request):
+        """ shelve some books """
+        shelve_actions = [
+            (k, v)
+            for k, v in request.POST.items()
+            if re.match(r"\d+", k) and re.match(r"\d+", v)
+        ]
+        for (book_id, shelf_id) in shelve_actions:
+            book = get_object_or_404(models.Edition, id=book_id)
+            shelf = get_object_or_404(models.Shelf, id=shelf_id)
+            if shelf.user != request.user:
+                # hmmmmm
+                return HttpResponseNotFound()
+            models.ShelfBook.objects.create(book=book, shelf=shelf, user=request.user)
+        return redirect(self.next_view)
+
 
 @method_decorator(login_required, name="dispatch")
 class GetStartedUsers(View):
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index cce921be..fbc41358 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -167,6 +167,7 @@ class EditUser(View):
 
         return redirect(user.local_path)
 
+
 def save_user_form(form):
     """ special handling for the user form """
     user = form.save(commit=False)

From 5c10bdab7c2f67bbae133aeb695fe696bc09d69c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 09:22:43 -0700
Subject: [PATCH 0562/1285] Adds breadcrumbs

---
 bookwyrm/templates/get_started/layout.html | 18 +++++++++++++++++-
 bookwyrm/urls.py                           |  2 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/get_started/layout.html b/bookwyrm/templates/get_started/layout.html
index 17fc5a9b..4d79dd0e 100644
--- a/bookwyrm/templates/get_started/layout.html
+++ b/bookwyrm/templates/get_started/layout.html
@@ -18,7 +18,23 @@
             {% block panel %}{% endblock %}
         </section>
 
-        <footer class="modal-card-foot is-flex is-justify-content-flex-end">
+        <footer class="modal-card-foot is-flex is-justify-content-space-between">
+            <nav class="breadcrumb mb-0" aria-label="breadcrumbs">
+                <ul>
+                    {% url 'get-started-profile' as url %}
+                    <li {% if request.path in url %}class="is-active"{% endif %}>
+                        <a {% if request.path in url %}aria-current="page"{% endif %} href="{{ url }}">{% trans "Create profile" %}</a>
+                    </li>
+                    {% url 'get-started-books' as url %}
+                    <li {% if request.path in url %}class="is-active"{% endif %}>
+                        <a {% if request.path in url %}aria-current="page"{% endif %} href="{{ url }}">{% trans "Add books" %}</a>
+                    </li>
+                    {% url 'get-started-users' as url %}
+                    <li {% if request.path in url %}class="is-active"{% endif %}>
+                        <a {% if request.path in url %}aria-current="page"{% endif %} href="{{ url }}">{% trans "Find friends" %}</a>
+                    </li>
+                </ul>
+            </nav>
             {% if next %}
             <a href="{% url next %}" class="button">
                 <span>{% trans "Skip this step" %}</span>
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index ef8b3212..2b874eb9 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -111,7 +111,7 @@ urlpatterns = [
     re_path(r"^directory/?", views.Directory.as_view(), name="directory"),
     # Get started
     re_path(
-        r"^get-started/?$",
+        r"^get-started/profile/?$",
         views.GetStartedProfile.as_view(),
         name="get-started-profile",
     ),

From 776f1768d92a06ebcd3869529eb35756444a1745 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 09:30:15 -0700
Subject: [PATCH 0563/1285] Updates get started users template

---
 bookwyrm/templates/get_started/layout.html  |  2 ++
 bookwyrm/templates/get_started/profile.html |  2 +-
 bookwyrm/templates/get_started/users.html   | 17 +++++++++++++++++
 bookwyrm/views/get_started.py               |  1 -
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/get_started/layout.html b/bookwyrm/templates/get_started/layout.html
index 4d79dd0e..db8bce55 100644
--- a/bookwyrm/templates/get_started/layout.html
+++ b/bookwyrm/templates/get_started/layout.html
@@ -40,6 +40,8 @@
                 <span>{% trans "Skip this step" %}</span>
                 <span class="icon icon-arrow-right" aria-hidden="true"></span>
             </a>
+            {% else %}
+            <a href="/" class="button is-primary">{% trans "Finish" %}</a>
             {% endif %}
         </footer>
     </div>
diff --git a/bookwyrm/templates/get_started/profile.html b/bookwyrm/templates/get_started/profile.html
index 7ee43c08..9c31957f 100644
--- a/bookwyrm/templates/get_started/profile.html
+++ b/bookwyrm/templates/get_started/profile.html
@@ -51,7 +51,7 @@
             {% url 'directory' as path %}
             <p class="help">{% trans "Your account will show up in the directory, and may be recommended to other BookWyrm users." %}</p>
         </div>
-        <div class="block"><button class="button is-primary" type="submit">{% trans "Save" %}</button></div>
+        <div class="block"><button class="button is-primary" type="submit">{% trans "Save &amp; continue" %}</button></div>
     </form>
 </div>
 {% endblock %}
diff --git a/bookwyrm/templates/get_started/users.html b/bookwyrm/templates/get_started/users.html
index 14c04e63..28ab1913 100644
--- a/bookwyrm/templates/get_started/users.html
+++ b/bookwyrm/templates/get_started/users.html
@@ -5,6 +5,23 @@
 <div class="block">
     <h2 class="title is-4">{% trans "Who to follow" %}</h2>
 
+    <p class="subtitle is-6">You can follow users on other BookWyrm instances and federated services like Mastodon.</p>
+    <form class="field has-addons" method="get" action="{% url 'get-started-users' %}">
+        <div class="control">
+            <input type="text" name="query" value="{{ request.GET.query }}" class="input" placeholder="{% trans 'Search for a user' %}" aria-label="{% trans 'Search for a user' %}">
+            {% if request.GET.query and not user_results %}
+            <p class="help">{% trans "Sorry, no users were found" %}</p>
+            {% endif %}
+        </div>
+        <div class="control">
+            <button class="button" type="submit">
+                <span class="icon icon-search" title="{% trans 'Search' %}">
+                    <span class="is-sr-only">{% trans "Search" %}</span>
+                </span>
+            </button>
+        </div>
+    </form>
+
     {% include 'feed/suggested_users.html' with suggested_users=suggested_users %}
 </div>
 {% endblock %}
diff --git a/bookwyrm/views/get_started.py b/bookwyrm/views/get_started.py
index fba01840..184cfc3d 100644
--- a/bookwyrm/views/get_started.py
+++ b/bookwyrm/views/get_started.py
@@ -114,6 +114,5 @@ class GetStartedUsers(View):
         )
         data = {
             "suggested_users": suggested_users,
-            "next": "get-started-profile",
         }
         return TemplateResponse(request, "get_started/users.html", data)

From fa17d9018f6f5ef90b8eafb328c082e178a7cf79 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 09:39:05 -0700
Subject: [PATCH 0564/1285] Adds user search to get started view

---
 bookwyrm/views/get_started.py | 37 ++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/views/get_started.py b/bookwyrm/views/get_started.py
index 184cfc3d..f8e0cd03 100644
--- a/bookwyrm/views/get_started.py
+++ b/bookwyrm/views/get_started.py
@@ -2,6 +2,8 @@
 import re
 
 from django.contrib.auth.decorators import login_required
+from django.contrib.postgres.search import TrigramSimilarity
+from django.db.models.functions import Greatest
 from django.db.models import Count, Q
 from django.http import HttpResponseNotFound
 from django.shortcuts import get_object_or_404, redirect
@@ -102,17 +104,34 @@ class GetStartedUsers(View):
 
     def get(self, request):
         """ basic profile info """
-        suggested_users = (
-            get_suggested_users(
-                request.user,
-                ~Q(id=request.user.id),
-                ~Q(followers=request.user),
-                bookwyrm_user=True,
+        query = request.GET.get("query")
+        user_results = (
+            models.User.viewer_aware_objects(request.user)
+            .annotate(
+                similarity=Greatest(
+                    TrigramSimilarity("username", query),
+                    TrigramSimilarity("localname", query),
+                )
             )
-            .order_by("shared_books", "-mutuals", "-last_active_date")
-            .all()[:5]
+            .filter(
+                similarity__gt=0.5,
+            )
+            .order_by("-similarity")[:5]
         )
+
+        if user_results.count() < 5:
+            suggested_users = (
+                get_suggested_users(
+                    request.user,
+                    ~Q(id=request.user.id),
+                    ~Q(followers=request.user),
+                    ~Q(id__in=user_results),
+                    bookwyrm_user=True,
+                )
+                .order_by("shared_books", "-mutuals", "-last_active_date")
+                .all()[:5 - user_results.count()]
+            )
         data = {
-            "suggested_users": suggested_users,
+            "suggested_users": list(user_results) + list(suggested_users),
         }
         return TemplateResponse(request, "get_started/users.html", data)

From 19c2c7f67c64aa5f6c731b74abc90d5eb192ddca Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 09:39:57 -0700
Subject: [PATCH 0565/1285] test get started user view with query

---
 bookwyrm/tests/views/test_get_started.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/bookwyrm/tests/views/test_get_started.py b/bookwyrm/tests/views/test_get_started.py
index 89cc5a26..71eb4060 100644
--- a/bookwyrm/tests/views/test_get_started.py
+++ b/bookwyrm/tests/views/test_get_started.py
@@ -113,3 +113,15 @@ class GetStartedViews(TestCase):
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
+
+    def test_users_view_with_query(self):
+        """ there are so many views, this just makes sure it LOADS """
+        view = views.GetStartedUsers.as_view()
+        request = self.factory.get("?query=rat")
+        request.user = self.local_user
+
+        result = view(request)
+
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)

From bb5aec18f12132618e237443b9d794f9a0dc9325 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 09:46:18 -0700
Subject: [PATCH 0566/1285] Cleans up ui navigation

---
 bookwyrm/templates/get_started/book_preview.html | 2 +-
 bookwyrm/templates/get_started/layout.html       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/get_started/book_preview.html b/bookwyrm/templates/get_started/book_preview.html
index b65236be..04d0c424 100644
--- a/bookwyrm/templates/get_started/book_preview.html
+++ b/bookwyrm/templates/get_started/book_preview.html
@@ -4,7 +4,7 @@
     <label class="label" for="id_shelve_{{ book.id }}">
     <div class="select is-small">
         <select name="{{ book.id }}" aria-label="{% blocktrans with book_title=book.title %}Have you read {{ book_title }}?{% endblocktrans %}">
-            <option value="">-</option>
+            <option disabled selected value>Add to your books</option>
             {% for shelf in request.user.shelf_set.all %}
             <option value="{{ shelf.id }}">{{ shelf.name }}</option>
             {% endfor %}
diff --git a/bookwyrm/templates/get_started/layout.html b/bookwyrm/templates/get_started/layout.html
index db8bce55..862588f4 100644
--- a/bookwyrm/templates/get_started/layout.html
+++ b/bookwyrm/templates/get_started/layout.html
@@ -12,7 +12,7 @@
             <h1 class="modal-card-title" id="get-started-header">
                 {% trans "Getting Started" %}
             </h1>
-            <a href="/" class="delete" aria-label="close"></a>
+            <a href="/" class="delete" aria-label="{% trans 'Close' %}"></a>
         </header>
         <section class="modal-card-body">
             {% block panel %}{% endblock %}
@@ -45,7 +45,7 @@
             {% endif %}
         </footer>
     </div>
-    <a href="/" class="modal-close is-large" aria-label="close"></a>
+    <a href="/" class="modal-close is-large" aria-label="{% trans 'Close' %}"></a>
 </div>
 {% endwith %}
 {% endblock %}

From ac8e68ce2c5a2ec9f6cd24de868d2f45bffc0160 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 09:48:13 -0700
Subject: [PATCH 0567/1285] Python formatting

---
 bookwyrm/views/get_started.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/views/get_started.py b/bookwyrm/views/get_started.py
index f8e0cd03..e64333df 100644
--- a/bookwyrm/views/get_started.py
+++ b/bookwyrm/views/get_started.py
@@ -129,7 +129,7 @@ class GetStartedUsers(View):
                     bookwyrm_user=True,
                 )
                 .order_by("shared_books", "-mutuals", "-last_active_date")
-                .all()[:5 - user_results.count()]
+                .all()[: 5 - user_results.count()]
             )
         data = {
             "suggested_users": list(user_results) + list(suggested_users),

From 1e75674f7b5ba454902c737e79875021c69dd7f4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 09:57:50 -0700
Subject: [PATCH 0568/1285] Fixes user view

---
 bookwyrm/views/user.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index fbc41358..aba804d8 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -163,7 +163,7 @@ class EditUser(View):
             data = {"form": form, "user": request.user}
             return TemplateResponse(request, "preferences/edit_user.html", data)
 
-        save_user_form(form)
+        user = save_user_form(form)
 
         return redirect(user.local_path)
 

From f949d08034543f59e4c2c19e994f853c28cd81bd Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 12:23:13 -0700
Subject: [PATCH 0569/1285] Wording consistency and locales compiled for
 getting started views

---
 bookwyrm/templates/get_started/books.html   |   2 +-
 bookwyrm/templates/get_started/layout.html  |   2 +-
 bookwyrm/templates/get_started/profile.html |   2 +-
 bookwyrm/templates/get_started/users.html   |   2 +-
 locale/de_DE/LC_MESSAGES/django.po          | 306 ++++++++++++-------
 locale/en_US/LC_MESSAGES/django.po          | 281 +++++++++++-------
 locale/es/LC_MESSAGES/django.mo             | Bin 26264 -> 26233 bytes
 locale/es/LC_MESSAGES/django.po             | 309 +++++++++++++-------
 locale/fr_FR/LC_MESSAGES/django.mo          | Bin 24333 -> 24275 bytes
 locale/fr_FR/LC_MESSAGES/django.po          | 309 +++++++++++++-------
 locale/zh_CN/LC_MESSAGES/django.mo          | Bin 29373 -> 29305 bytes
 locale/zh_CN/LC_MESSAGES/django.po          | 305 ++++++++++++-------
 12 files changed, 1016 insertions(+), 502 deletions(-)

diff --git a/bookwyrm/templates/get_started/books.html b/bookwyrm/templates/get_started/books.html
index 9e2e422c..06f87c3a 100644
--- a/bookwyrm/templates/get_started/books.html
+++ b/bookwyrm/templates/get_started/books.html
@@ -8,7 +8,7 @@
         <div class="control">
             <input type="text" name="query" value="{{ request.GET.query }}" class="input" placeholder="{% trans 'Search for a book' %}" aria-label="{% trans 'Search for a book' %}">
             {% if request.GET.query and not book_results %}
-            <p class="help">{% blocktrans %}Sorry, books were found. You can add books when you start using {{ site_name }}{% endblocktrans %}</p>
+            <p class="help">{% blocktrans with query=request.GET.query %}No books found for "{{ query }}"{% endblocktrans %}. {% blocktrans %}You can add books when you start using {{ site_name }}.{% endblocktrans %}</p>
             {% endif %}
         </div>
         <div class="control">
diff --git a/bookwyrm/templates/get_started/layout.html b/bookwyrm/templates/get_started/layout.html
index 862588f4..0e80a502 100644
--- a/bookwyrm/templates/get_started/layout.html
+++ b/bookwyrm/templates/get_started/layout.html
@@ -23,7 +23,7 @@
                 <ul>
                     {% url 'get-started-profile' as url %}
                     <li {% if request.path in url %}class="is-active"{% endif %}>
-                        <a {% if request.path in url %}aria-current="page"{% endif %} href="{{ url }}">{% trans "Create profile" %}</a>
+                        <a {% if request.path in url %}aria-current="page"{% endif %} href="{{ url }}">{% trans "Create your profile" %}</a>
                     </li>
                     {% url 'get-started-books' as url %}
                     <li {% if request.path in url %}class="is-active"{% endif %}>
diff --git a/bookwyrm/templates/get_started/profile.html b/bookwyrm/templates/get_started/profile.html
index 9c31957f..b26bd915 100644
--- a/bookwyrm/templates/get_started/profile.html
+++ b/bookwyrm/templates/get_started/profile.html
@@ -3,7 +3,7 @@
 
 {% block panel %}
 <div class="block">
-    <h2 class="title is-4">{% trans "A little bit about you" %}</h2>
+    <h2 class="title is-4">{% trans "Create your profile" %}</h2>
     {% if form.non_field_errors %}
     <p class="notification is-danger">{{ form.non_field_errors }}</p>
     {% endif %}
diff --git a/bookwyrm/templates/get_started/users.html b/bookwyrm/templates/get_started/users.html
index 28ab1913..259f06d3 100644
--- a/bookwyrm/templates/get_started/users.html
+++ b/bookwyrm/templates/get_started/users.html
@@ -10,7 +10,7 @@
         <div class="control">
             <input type="text" name="query" value="{{ request.GET.query }}" class="input" placeholder="{% trans 'Search for a user' %}" aria-label="{% trans 'Search for a user' %}">
             {% if request.GET.query and not user_results %}
-            <p class="help">{% trans "Sorry, no users were found" %}</p>
+            <p class="help">{% blocktrans with query=request.GET.query %}No users found for "{{ query }}"{% endblocktrans %}</p>
             {% endif %}
         </div>
         <div class="control">
diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index adec1421..7b418998 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-31 10:36-0700\n"
+"POT-Creation-Date: 2021-04-01 12:22-0700\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"
@@ -18,34 +18,34 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/forms.py:213
+#: bookwyrm/forms.py:226
 #, fuzzy
 #| msgid "A user with that username already exists."
 msgid "A user with this email already exists."
 msgstr "Dieser Benutzename ist bereits vergeben."
 
-#: bookwyrm/forms.py:227
+#: bookwyrm/forms.py:240
 msgid "One Day"
 msgstr "Ein Tag"
 
-#: bookwyrm/forms.py:228
+#: bookwyrm/forms.py:241
 msgid "One Week"
 msgstr "Eine Woche"
 
-#: bookwyrm/forms.py:229
+#: bookwyrm/forms.py:242
 msgid "One Month"
 msgstr "Ein Monat"
 
-#: bookwyrm/forms.py:230
+#: bookwyrm/forms.py:243
 msgid "Does Not Expire"
 msgstr "Läuft nicht aus"
 
-#: bookwyrm/forms.py:235
+#: bookwyrm/forms.py:248
 #, python-format
 msgid "%(count)d uses"
 msgstr "%(count)d Benutzungen"
 
-#: bookwyrm/forms.py:238
+#: bookwyrm/forms.py:251
 #, fuzzy
 #| msgid "Unlisted"
 msgid "Unlimited"
@@ -137,42 +137,48 @@ msgstr "Buch editieren"
 msgid "Add cover"
 msgstr "Cover hinzufügen"
 
-#: bookwyrm/templates/book/book.html:59
+#: bookwyrm/templates/book/book.html:53
+#, fuzzy
+#| msgid "Failed to load"
+msgid "Failed to load cover"
+msgstr "Laden fehlgeschlagen"
+
+#: bookwyrm/templates/book/book.html:62
 msgid "ISBN:"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:66
+#: bookwyrm/templates/book/book.html:69
 #: bookwyrm/templates/book/edit_book.html:211
 msgid "OCLC Number:"
 msgstr "OCLC Nummer:"
 
-#: bookwyrm/templates/book/book.html:73
+#: bookwyrm/templates/book/book.html:76
 #: bookwyrm/templates/book/edit_book.html:215
 msgid "ASIN:"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:82
+#: bookwyrm/templates/book/book.html:85
 msgid "View on OpenLibrary"
 msgstr "In OpenLibrary ansehen"
 
-#: bookwyrm/templates/book/book.html:91
+#: bookwyrm/templates/book/book.html:94
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s Bewertung)"
 msgstr[1] "(%(review_count)s Bewertungen)"
 
-#: bookwyrm/templates/book/book.html:97
+#: bookwyrm/templates/book/book.html:100
 msgid "Add Description"
 msgstr "Beschreibung hinzufügen"
 
-#: bookwyrm/templates/book/book.html:104
+#: bookwyrm/templates/book/book.html:107
 #: bookwyrm/templates/book/edit_book.html:101
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: bookwyrm/templates/book/book.html:108
+#: bookwyrm/templates/book/book.html:111
 #: bookwyrm/templates/book/edit_book.html:225
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
@@ -184,7 +190,7 @@ msgstr "Beschreibung:"
 msgid "Save"
 msgstr "Speichern"
 
-#: bookwyrm/templates/book/book.html:109 bookwyrm/templates/book/book.html:158
+#: bookwyrm/templates/book/book.html:112 bookwyrm/templates/book/book.html:161
 #: bookwyrm/templates/book/cover_modal.html:32
 #: bookwyrm/templates/book/edit_book.html:226
 #: bookwyrm/templates/edit_author.html:79
@@ -199,77 +205,68 @@ msgstr "Speichern"
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: bookwyrm/templates/book/book.html:118
+#: bookwyrm/templates/book/book.html:121
 #, fuzzy, python-format
 #| msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s\">%(title)s</a> von"
 
-#: bookwyrm/templates/book/book.html:126
+#: bookwyrm/templates/book/book.html:129
 #, fuzzy, python-format
 #| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/book/book.html:132
+#: bookwyrm/templates/book/book.html:135
 #, fuzzy, python-format
 #| msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr "hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> zu deiner Liste \"<a href=\"%(list_path)s\">%(list_name)s</a>\" Hinzugefügt"
 
-#: bookwyrm/templates/book/book.html:141
+#: bookwyrm/templates/book/book.html:144
 msgid "Your reading activity"
 msgstr "Deine Leseaktivität"
 
-#: bookwyrm/templates/book/book.html:143
+#: bookwyrm/templates/book/book.html:146
 msgid "Add read dates"
 msgstr "Lesedaten hinzufügen"
 
-#: bookwyrm/templates/book/book.html:148
+#: bookwyrm/templates/book/book.html:151
 msgid "You don't have any reading activity for this book."
 msgstr "Du hast keine Leseaktivität für dieses Buch."
 
-#: bookwyrm/templates/book/book.html:155
+#: bookwyrm/templates/book/book.html:158
 msgid "Create"
 msgstr "Erstellen"
 
-#: bookwyrm/templates/book/book.html:177
-msgid "Tags"
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:181
-#: bookwyrm/templates/snippets/tag.html:18
-msgid "Add tag"
-msgstr "Tag hinzufügen"
-
-#: bookwyrm/templates/book/book.html:198
+#: bookwyrm/templates/book/book.html:180
 msgid "Subjects"
 msgstr "Themen"
 
-#: bookwyrm/templates/book/book.html:209
+#: bookwyrm/templates/book/book.html:191
 msgid "Places"
 msgstr "Orte"
 
-#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book/book.html:202 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listen"
 
-#: bookwyrm/templates/book/book.html:231
+#: bookwyrm/templates/book/book.html:213
 #, fuzzy
 #| msgid "Go to list"
 msgid "Add to list"
 msgstr "Zur Liste"
 
-#: bookwyrm/templates/book/book.html:241
+#: bookwyrm/templates/book/book.html:223
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:90
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: bookwyrm/templates/book/book.html:269
+#: bookwyrm/templates/book/book.html:251
 msgid "rated it"
 msgstr "bewertet"
 
@@ -505,6 +502,8 @@ msgstr "Veröffentlicht von %(publisher)s."
 
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/feed/feed_layout.html:57
+#: bookwyrm/templates/get_started/layout.html:15
+#: bookwyrm/templates/get_started/layout.html:48
 msgid "Close"
 msgstr "Schließen"
 
@@ -619,6 +618,7 @@ msgid "Recent Books"
 msgstr "Aktive Bücher"
 
 #: bookwyrm/templates/discover/landing_layout.html:5
+#: bookwyrm/templates/get_started/layout.html:4
 msgid "Welcome"
 msgstr "Willkommen"
 
@@ -828,23 +828,10 @@ msgid "There aren't any activities right now! Try following a user to get starte
 msgstr "Hier sind noch keine Aktivitäten! Folge anderen, um loszulegen"
 
 #: bookwyrm/templates/feed/feed.html:56
+#: bookwyrm/templates/get_started/users.html:6
 msgid "Who to follow"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:69
-#, python-format
-msgid "%(mutuals)s follower you follow"
-msgid_plural "%(mutuals)s followers you follow"
-msgstr[0] ""
-msgstr[1] ""
-
-#: bookwyrm/templates/feed/feed.html:72
-#, python-format
-msgid "%(shared_books)s book on your shelves"
-msgid_plural "%(shared_books)s books on your shelves"
-msgstr[0] ""
-msgstr[1] ""
-
 #: bookwyrm/templates/feed/feed_layout.html:5
 msgid "Updates"
 msgstr ""
@@ -885,6 +872,160 @@ msgstr "Gelesen"
 msgid "%(year)s Reading Goal"
 msgstr "%(year)s Leseziel"
 
+#: bookwyrm/templates/feed/suggested_users.html:16
+#, python-format
+msgid "%(mutuals)s follower you follow"
+msgid_plural "%(mutuals)s followers you follow"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/feed/suggested_users.html:19
+#, python-format
+msgid "%(shared_books)s book on your shelves"
+msgid_plural "%(shared_books)s books on your shelves"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/get_started/book_preview.html:6
+#, fuzzy, python-format
+#| msgid "Want to Read \"<em>%(book_title)s</em>\""
+msgid "Have you read %(book_title)s?"
+msgstr "\"<em>%(book_title)s</em>\" auf Leseliste setzen"
+
+#: bookwyrm/templates/get_started/books.html:6
+#, fuzzy
+#| msgid "Started reading"
+msgid "What are you reading?"
+msgstr "Zu lesen angefangen"
+
+#: bookwyrm/templates/get_started/books.html:9
+#: bookwyrm/templates/lists/list.html:58
+msgid "Search for a book"
+msgstr "Nach einem Buch suchen"
+
+#: bookwyrm/templates/get_started/books.html:11
+#: bookwyrm/templates/isbn_search_results.html:17
+#: bookwyrm/templates/search_results.html:17
+#, python-format
+msgid "No books found for \"%(query)s\""
+msgstr "Keine Bücher für \"%(query)s\" gefunden"
+
+#: bookwyrm/templates/get_started/books.html:11
+#, python-format
+msgid "You can add books when you start using %(site_name)s."
+msgstr ""
+
+#: bookwyrm/templates/get_started/books.html:16
+#: bookwyrm/templates/get_started/books.html:17
+#: bookwyrm/templates/get_started/users.html:18
+#: bookwyrm/templates/get_started/users.html:19
+#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
+#: bookwyrm/templates/lists/list.html:62
+msgid "Search"
+msgstr "Suche"
+
+#: bookwyrm/templates/get_started/books.html:26
+#, fuzzy
+#| msgid "Suggest Books"
+msgid "Suggested Books"
+msgstr "Bücher vorschlagen"
+
+#: bookwyrm/templates/get_started/books.html:41
+#, fuzzy, python-format
+#| msgid "About %(site_name)s"
+msgid "Popular on %(site_name)s"
+msgstr "Ãœber %(site_name)s"
+
+#: bookwyrm/templates/get_started/books.html:51
+#: bookwyrm/templates/lists/list.html:75
+msgid "No books found"
+msgstr "Keine Bücher gefunden"
+
+#: bookwyrm/templates/get_started/books.html:54
+#: bookwyrm/templates/get_started/profile.html:54
+msgid "Save &amp; continue"
+msgstr ""
+
+#: bookwyrm/templates/get_started/layout.html:13
+#, fuzzy
+#| msgid "Started"
+msgid "Getting Started"
+msgstr "Gestartet"
+
+#: bookwyrm/templates/get_started/layout.html:26
+#: bookwyrm/templates/get_started/profile.html:6
+#, fuzzy
+#| msgid "User Profile"
+msgid "Create your profile"
+msgstr "Benutzerprofil"
+
+#: bookwyrm/templates/get_started/layout.html:30
+#, fuzzy
+#| msgid "Add Books"
+msgid "Add books"
+msgstr "Bücher hinzufügen"
+
+#: bookwyrm/templates/get_started/layout.html:34
+#, fuzzy
+#| msgid "Friendly"
+msgid "Find friends"
+msgstr "Freundlich"
+
+#: bookwyrm/templates/get_started/layout.html:40
+msgid "Skip this step"
+msgstr ""
+
+#: bookwyrm/templates/get_started/layout.html:44
+#, fuzzy
+#| msgid "Finished"
+msgid "Finish"
+msgstr "Abgeschlossen"
+
+#: bookwyrm/templates/get_started/profile.html:15
+#: bookwyrm/templates/preferences/edit_user.html:24
+msgid "Display name:"
+msgstr "Displayname:"
+
+#: bookwyrm/templates/get_started/profile.html:22
+#: bookwyrm/templates/preferences/edit_user.html:31
+msgid "Summary:"
+msgstr "Bio:"
+
+#: bookwyrm/templates/get_started/profile.html:23
+msgid "A little bit about you"
+msgstr ""
+
+#: bookwyrm/templates/get_started/profile.html:32
+#: bookwyrm/templates/preferences/edit_user.html:17
+msgid "Avatar:"
+msgstr ""
+
+#: bookwyrm/templates/get_started/profile.html:42
+#: bookwyrm/templates/preferences/edit_user.html:52
+msgid "Manually approve followers:"
+msgstr "Folgende manuell bestätigen"
+
+#: bookwyrm/templates/get_started/profile.html:48
+#: bookwyrm/templates/preferences/edit_user.html:58
+msgid "Show this account in suggested users:"
+msgstr ""
+
+#: bookwyrm/templates/get_started/profile.html:52
+msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users."
+msgstr ""
+
+#: bookwyrm/templates/get_started/users.html:11
+#, fuzzy
+#| msgid "Search for a book or user"
+msgid "Search for a user"
+msgstr "Suche nach Buch oder Benutzer*in"
+
+#: bookwyrm/templates/get_started/users.html:13
+#: bookwyrm/templates/search_results.html:76
+#, python-format
+msgid "No users found for \"%(query)s\""
+msgstr "Keine Nutzer*innen für \"%(query)s\" gefunden"
+
 #: bookwyrm/templates/goal.html:7
 #, python-format
 msgid "%(year)s Reading Progress"
@@ -1045,21 +1186,10 @@ msgstr "Suchergebnisse für \"%(query)s\""
 msgid "Matching Books"
 msgstr "Passende Bücher"
 
-#: bookwyrm/templates/isbn_search_results.html:17
-#: bookwyrm/templates/search_results.html:17
-#, python-format
-msgid "No books found for \"%(query)s\""
-msgstr "Keine Bücher für \"%(query)s\" gefunden"
-
 #: bookwyrm/templates/layout.html:33
 msgid "Search for a book or user"
 msgstr "Suche nach Buch oder Benutzer*in"
 
-#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
-#: bookwyrm/templates/lists/list.html:62
-msgid "Search"
-msgstr "Suche"
-
 #: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48
 msgid "Main navigation menu"
 msgstr "Navigationshauptmenü"
@@ -1237,10 +1367,6 @@ msgstr "Bücher hinzufügen"
 msgid "Suggest Books"
 msgstr "Bücher vorschlagen"
 
-#: bookwyrm/templates/lists/list.html:58
-msgid "Search for a book"
-msgstr "Nach einem Buch suchen"
-
 #: bookwyrm/templates/lists/list.html:63
 msgid "search"
 msgstr "suchen"
@@ -1254,10 +1380,6 @@ msgstr "Suche leeren"
 msgid "No books found matching the query \"%(query)s\""
 msgstr "Keine passenden Bücher zu \"%(query)s\" gefunden"
 
-#: bookwyrm/templates/lists/list.html:75
-msgid "No books found"
-msgstr "Keine Bücher gefunden"
-
 #: bookwyrm/templates/lists/list.html:90
 msgid "Suggest"
 msgstr "Vorschlagen"
@@ -1562,30 +1684,10 @@ msgstr "Neues Passwort:"
 msgid "Edit Profile"
 msgstr "Profil bearbeiten:"
 
-#: bookwyrm/templates/preferences/edit_user.html:17
-msgid "Avatar:"
-msgstr ""
-
-#: bookwyrm/templates/preferences/edit_user.html:24
-msgid "Display name:"
-msgstr "Displayname:"
-
-#: bookwyrm/templates/preferences/edit_user.html:31
-msgid "Summary:"
-msgstr "Bio:"
-
 #: bookwyrm/templates/preferences/edit_user.html:46
 msgid "Show set reading goal prompt in feed:"
 msgstr "Angegebenes Leseziel im Feed anzeigen."
 
-#: bookwyrm/templates/preferences/edit_user.html:52
-msgid "Manually approve followers:"
-msgstr "Folgende manuell bestätigen"
-
-#: bookwyrm/templates/preferences/edit_user.html:58
-msgid "Show this account in suggested users:"
-msgstr ""
-
 #: bookwyrm/templates/preferences/edit_user.html:62
 #, python-format
 msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
@@ -1619,11 +1721,6 @@ msgstr "Ergebnisse aus anderen Katalogen ausblenden"
 msgid "Matching Users"
 msgstr "Passende Nutzer*innen"
 
-#: bookwyrm/templates/search_results.html:76
-#, python-format
-msgid "No users found for \"%(query)s\""
-msgstr "Keine Nutzer*innen für \"%(query)s\" gefunden"
-
 #: bookwyrm/templates/search_results.html:93
 #, python-format
 msgid "No lists found for \"%(query)s\""
@@ -2476,6 +2573,10 @@ msgstr "Zu lesen angefangen"
 msgid "Remove tag"
 msgstr "Tag entfernen"
 
+#: bookwyrm/templates/snippets/tag.html:18
+msgid "Add tag"
+msgstr "Tag hinzufügen"
+
 #: bookwyrm/templates/tag.html:9
 #, python-format
 msgid "Books tagged \"%(tag.name)s\""
@@ -2533,7 +2634,7 @@ msgstr "Listen: %(username)s"
 msgid "Create list"
 msgstr "Liste Erstellen"
 
-#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:53
+#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:56
 #, fuzzy
 #| msgid "books"
 msgid "All books"
@@ -2559,11 +2660,11 @@ msgstr "Gestartet"
 msgid "Finished"
 msgstr "Abgeschlossen"
 
-#: bookwyrm/templates/user/shelf.html:122
+#: bookwyrm/templates/user/shelf.html:127
 msgid "This shelf is empty."
 msgstr "Dieses Regal ist leer."
 
-#: bookwyrm/templates/user/shelf.html:128
+#: bookwyrm/templates/user/shelf.html:133
 msgid "Delete shelf"
 msgstr "Regal löschen"
 
@@ -2640,6 +2741,11 @@ msgstr "Dieser Benutzename ist bereits vergeben."
 msgid "A password reset link sent to %s"
 msgstr ""
 
+#, fuzzy, python-format
+#~| msgid "No users found for \"%(query)s\""
+#~ msgid "No users were found for \"%(query)s\""
+#~ msgstr "Keine Nutzer*innen für \"%(query)s\" gefunden"
+
 #~ msgid "Your shelves"
 #~ msgstr "Deine Regale"
 
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index ff161897..c605c877 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-31 10:36-0700\n"
+"POT-Creation-Date: 2021-04-01 12:22-0700\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"
@@ -18,32 +18,32 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/forms.py:213
+#: bookwyrm/forms.py:226
 msgid "A user with this email already exists."
 msgstr ""
 
-#: bookwyrm/forms.py:227
+#: bookwyrm/forms.py:240
 msgid "One Day"
 msgstr ""
 
-#: bookwyrm/forms.py:228
+#: bookwyrm/forms.py:241
 msgid "One Week"
 msgstr ""
 
-#: bookwyrm/forms.py:229
+#: bookwyrm/forms.py:242
 msgid "One Month"
 msgstr ""
 
-#: bookwyrm/forms.py:230
+#: bookwyrm/forms.py:243
 msgid "Does Not Expire"
 msgstr ""
 
-#: bookwyrm/forms.py:235
+#: bookwyrm/forms.py:248
 #, python-format
 msgid "%(count)d uses"
 msgstr ""
 
-#: bookwyrm/forms.py:238
+#: bookwyrm/forms.py:251
 msgid "Unlimited"
 msgstr ""
 
@@ -133,42 +133,46 @@ msgstr ""
 msgid "Add cover"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:59
+#: bookwyrm/templates/book/book.html:53
+msgid "Failed to load cover"
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:62
 msgid "ISBN:"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:66
+#: bookwyrm/templates/book/book.html:69
 #: bookwyrm/templates/book/edit_book.html:211
 msgid "OCLC Number:"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:73
+#: bookwyrm/templates/book/book.html:76
 #: bookwyrm/templates/book/edit_book.html:215
 msgid "ASIN:"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:82
+#: bookwyrm/templates/book/book.html:85
 msgid "View on OpenLibrary"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:91
+#: bookwyrm/templates/book/book.html:94
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/book/book.html:97
+#: bookwyrm/templates/book/book.html:100
 msgid "Add Description"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:104
+#: bookwyrm/templates/book/book.html:107
 #: bookwyrm/templates/book/edit_book.html:101
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:108
+#: bookwyrm/templates/book/book.html:111
 #: bookwyrm/templates/book/edit_book.html:225
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
@@ -180,7 +184,7 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:109 bookwyrm/templates/book/book.html:158
+#: bookwyrm/templates/book/book.html:112 bookwyrm/templates/book/book.html:161
 #: bookwyrm/templates/book/cover_modal.html:32
 #: bookwyrm/templates/book/edit_book.html:226
 #: bookwyrm/templates/edit_author.html:79
@@ -195,72 +199,63 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:118
+#: bookwyrm/templates/book/book.html:121
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:126
+#: bookwyrm/templates/book/book.html:129
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:132
+#: bookwyrm/templates/book/book.html:135
 #, python-format
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:141
+#: bookwyrm/templates/book/book.html:144
 msgid "Your reading activity"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:143
+#: bookwyrm/templates/book/book.html:146
 msgid "Add read dates"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:148
+#: bookwyrm/templates/book/book.html:151
 msgid "You don't have any reading activity for this book."
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:155
+#: bookwyrm/templates/book/book.html:158
 msgid "Create"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:177
-msgid "Tags"
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:181
-#: bookwyrm/templates/snippets/tag.html:18
-msgid "Add tag"
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:198
+#: bookwyrm/templates/book/book.html:180
 msgid "Subjects"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:209
+#: bookwyrm/templates/book/book.html:191
 msgid "Places"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book/book.html:202 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:231
+#: bookwyrm/templates/book/book.html:213
 msgid "Add to list"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:241
+#: bookwyrm/templates/book/book.html:223
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:90
 msgid "Add"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:269
+#: bookwyrm/templates/book/book.html:251
 msgid "rated it"
 msgstr ""
 
@@ -481,6 +476,8 @@ msgstr ""
 
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/feed/feed_layout.html:57
+#: bookwyrm/templates/get_started/layout.html:15
+#: bookwyrm/templates/get_started/layout.html:48
 msgid "Close"
 msgstr ""
 
@@ -580,6 +577,7 @@ msgid "Recent Books"
 msgstr ""
 
 #: bookwyrm/templates/discover/landing_layout.html:5
+#: bookwyrm/templates/get_started/layout.html:4
 msgid "Welcome"
 msgstr ""
 
@@ -781,23 +779,10 @@ msgid "There aren't any activities right now! Try following a user to get starte
 msgstr ""
 
 #: bookwyrm/templates/feed/feed.html:56
+#: bookwyrm/templates/get_started/users.html:6
 msgid "Who to follow"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:69
-#, python-format
-msgid "%(mutuals)s follower you follow"
-msgid_plural "%(mutuals)s followers you follow"
-msgstr[0] ""
-msgstr[1] ""
-
-#: bookwyrm/templates/feed/feed.html:72
-#, python-format
-msgid "%(shared_books)s book on your shelves"
-msgid_plural "%(shared_books)s books on your shelves"
-msgstr[0] ""
-msgstr[1] ""
-
 #: bookwyrm/templates/feed/feed_layout.html:5
 msgid "Updates"
 msgstr ""
@@ -834,6 +819,142 @@ msgstr ""
 msgid "%(year)s Reading Goal"
 msgstr ""
 
+#: bookwyrm/templates/feed/suggested_users.html:16
+#, python-format
+msgid "%(mutuals)s follower you follow"
+msgid_plural "%(mutuals)s followers you follow"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/feed/suggested_users.html:19
+#, python-format
+msgid "%(shared_books)s book on your shelves"
+msgid_plural "%(shared_books)s books on your shelves"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/get_started/book_preview.html:6
+#, python-format
+msgid "Have you read %(book_title)s?"
+msgstr ""
+
+#: bookwyrm/templates/get_started/books.html:6
+msgid "What are you reading?"
+msgstr ""
+
+#: bookwyrm/templates/get_started/books.html:9
+#: bookwyrm/templates/lists/list.html:58
+msgid "Search for a book"
+msgstr ""
+
+#: bookwyrm/templates/get_started/books.html:11
+#: bookwyrm/templates/isbn_search_results.html:17
+#: bookwyrm/templates/search_results.html:17
+#, python-format
+msgid "No books found for \"%(query)s\""
+msgstr ""
+
+#: bookwyrm/templates/get_started/books.html:11
+#, python-format
+msgid "You can add books when you start using %(site_name)s."
+msgstr ""
+
+#: bookwyrm/templates/get_started/books.html:16
+#: bookwyrm/templates/get_started/books.html:17
+#: bookwyrm/templates/get_started/users.html:18
+#: bookwyrm/templates/get_started/users.html:19
+#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
+#: bookwyrm/templates/lists/list.html:62
+msgid "Search"
+msgstr ""
+
+#: bookwyrm/templates/get_started/books.html:26
+msgid "Suggested Books"
+msgstr ""
+
+#: bookwyrm/templates/get_started/books.html:41
+#, python-format
+msgid "Popular on %(site_name)s"
+msgstr ""
+
+#: bookwyrm/templates/get_started/books.html:51
+#: bookwyrm/templates/lists/list.html:75
+msgid "No books found"
+msgstr ""
+
+#: bookwyrm/templates/get_started/books.html:54
+#: bookwyrm/templates/get_started/profile.html:54
+msgid "Save &amp; continue"
+msgstr ""
+
+#: bookwyrm/templates/get_started/layout.html:13
+msgid "Getting Started"
+msgstr ""
+
+#: bookwyrm/templates/get_started/layout.html:26
+#: bookwyrm/templates/get_started/profile.html:6
+msgid "Create your profile"
+msgstr ""
+
+#: bookwyrm/templates/get_started/layout.html:30
+msgid "Add books"
+msgstr ""
+
+#: bookwyrm/templates/get_started/layout.html:34
+msgid "Find friends"
+msgstr ""
+
+#: bookwyrm/templates/get_started/layout.html:40
+msgid "Skip this step"
+msgstr ""
+
+#: bookwyrm/templates/get_started/layout.html:44
+msgid "Finish"
+msgstr ""
+
+#: bookwyrm/templates/get_started/profile.html:15
+#: bookwyrm/templates/preferences/edit_user.html:24
+msgid "Display name:"
+msgstr ""
+
+#: bookwyrm/templates/get_started/profile.html:22
+#: bookwyrm/templates/preferences/edit_user.html:31
+msgid "Summary:"
+msgstr ""
+
+#: bookwyrm/templates/get_started/profile.html:23
+msgid "A little bit about you"
+msgstr ""
+
+#: bookwyrm/templates/get_started/profile.html:32
+#: bookwyrm/templates/preferences/edit_user.html:17
+msgid "Avatar:"
+msgstr ""
+
+#: bookwyrm/templates/get_started/profile.html:42
+#: bookwyrm/templates/preferences/edit_user.html:52
+msgid "Manually approve followers:"
+msgstr ""
+
+#: bookwyrm/templates/get_started/profile.html:48
+#: bookwyrm/templates/preferences/edit_user.html:58
+msgid "Show this account in suggested users:"
+msgstr ""
+
+#: bookwyrm/templates/get_started/profile.html:52
+msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users."
+msgstr ""
+
+#: bookwyrm/templates/get_started/users.html:11
+msgid "Search for a user"
+msgstr ""
+
+#: bookwyrm/templates/get_started/users.html:13
+#: bookwyrm/templates/search_results.html:76
+#, python-format
+msgid "No users found for \"%(query)s\""
+msgstr ""
+
 #: bookwyrm/templates/goal.html:7
 #, python-format
 msgid "%(year)s Reading Progress"
@@ -992,21 +1113,10 @@ msgstr ""
 msgid "Matching Books"
 msgstr ""
 
-#: bookwyrm/templates/isbn_search_results.html:17
-#: bookwyrm/templates/search_results.html:17
-#, python-format
-msgid "No books found for \"%(query)s\""
-msgstr ""
-
 #: bookwyrm/templates/layout.html:33
 msgid "Search for a book or user"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
-#: bookwyrm/templates/lists/list.html:62
-msgid "Search"
-msgstr ""
-
 #: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48
 msgid "Main navigation menu"
 msgstr ""
@@ -1181,10 +1291,6 @@ msgstr ""
 msgid "Suggest Books"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:58
-msgid "Search for a book"
-msgstr ""
-
 #: bookwyrm/templates/lists/list.html:63
 msgid "search"
 msgstr ""
@@ -1198,10 +1304,6 @@ msgstr ""
 msgid "No books found matching the query \"%(query)s\""
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:75
-msgid "No books found"
-msgstr ""
-
 #: bookwyrm/templates/lists/list.html:90
 msgid "Suggest"
 msgstr ""
@@ -1488,30 +1590,10 @@ msgstr ""
 msgid "Edit Profile"
 msgstr ""
 
-#: bookwyrm/templates/preferences/edit_user.html:17
-msgid "Avatar:"
-msgstr ""
-
-#: bookwyrm/templates/preferences/edit_user.html:24
-msgid "Display name:"
-msgstr ""
-
-#: bookwyrm/templates/preferences/edit_user.html:31
-msgid "Summary:"
-msgstr ""
-
 #: bookwyrm/templates/preferences/edit_user.html:46
 msgid "Show set reading goal prompt in feed:"
 msgstr ""
 
-#: bookwyrm/templates/preferences/edit_user.html:52
-msgid "Manually approve followers:"
-msgstr ""
-
-#: bookwyrm/templates/preferences/edit_user.html:58
-msgid "Show this account in suggested users:"
-msgstr ""
-
 #: bookwyrm/templates/preferences/edit_user.html:62
 #, python-format
 msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
@@ -1545,11 +1627,6 @@ msgstr ""
 msgid "Matching Users"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:76
-#, python-format
-msgid "No users found for \"%(query)s\""
-msgstr ""
-
 #: bookwyrm/templates/search_results.html:93
 #, python-format
 msgid "No lists found for \"%(query)s\""
@@ -2336,6 +2413,10 @@ msgstr ""
 msgid "Remove tag"
 msgstr ""
 
+#: bookwyrm/templates/snippets/tag.html:18
+msgid "Add tag"
+msgstr ""
+
 #: bookwyrm/templates/tag.html:9
 #, python-format
 msgid "Books tagged \"%(tag.name)s\""
@@ -2392,7 +2473,7 @@ msgstr ""
 msgid "Create list"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:53
+#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:56
 msgid "All books"
 msgstr ""
 
@@ -2416,11 +2497,11 @@ msgstr ""
 msgid "Finished"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:122
+#: bookwyrm/templates/user/shelf.html:127
 msgid "This shelf is empty."
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:128
+#: bookwyrm/templates/user/shelf.html:133
 msgid "Delete shelf"
 msgstr ""
 
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index d578461948d43624e25f7e9966839a1d4a159e9c..ea8eac7ee0281b38a66473d3814a646fc9fda0e3 100644
GIT binary patch
delta 6879
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

delta 6909
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
RbN<4z%F>G310_cT{tHky6HNdB

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 922efe4c..136d3cfe 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-31 10:36-0700\n"
+"POT-Creation-Date: 2021-04-01 12:22-0700\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,34 +18,34 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/forms.py:213
+#: bookwyrm/forms.py:226
 #, fuzzy
 #| msgid "A user with that username already exists."
 msgid "A user with this email already exists."
 msgstr "Ya existe un usuario con ese nombre."
 
-#: bookwyrm/forms.py:227
+#: bookwyrm/forms.py:240
 msgid "One Day"
 msgstr "Un día"
 
-#: bookwyrm/forms.py:228
+#: bookwyrm/forms.py:241
 msgid "One Week"
 msgstr "Una semana"
 
-#: bookwyrm/forms.py:229
+#: bookwyrm/forms.py:242
 msgid "One Month"
 msgstr "Un mes"
 
-#: bookwyrm/forms.py:230
+#: bookwyrm/forms.py:243
 msgid "Does Not Expire"
 msgstr "Nunca se vence"
 
-#: bookwyrm/forms.py:235
+#: bookwyrm/forms.py:248
 #, python-format
 msgid "%(count)d uses"
 msgstr "%(count)d usos"
 
-#: bookwyrm/forms.py:238
+#: bookwyrm/forms.py:251
 msgid "Unlimited"
 msgstr "Sin límite"
 
@@ -135,42 +135,48 @@ msgstr "Editar Libro"
 msgid "Add cover"
 msgstr "Agregar portada"
 
-#: bookwyrm/templates/book/book.html:59
+#: bookwyrm/templates/book/book.html:53
+#, fuzzy
+#| msgid "Failed to load"
+msgid "Failed to load cover"
+msgstr "Se falló a cargar"
+
+#: bookwyrm/templates/book/book.html:62
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: bookwyrm/templates/book/book.html:66
+#: bookwyrm/templates/book/book.html:69
 #: bookwyrm/templates/book/edit_book.html:211
 msgid "OCLC Number:"
 msgstr "Número OCLC:"
 
-#: bookwyrm/templates/book/book.html:73
+#: bookwyrm/templates/book/book.html:76
 #: bookwyrm/templates/book/edit_book.html:215
 msgid "ASIN:"
 msgstr "ASIN:"
 
-#: bookwyrm/templates/book/book.html:82
+#: bookwyrm/templates/book/book.html:85
 msgid "View on OpenLibrary"
 msgstr "Ver en OpenLibrary"
 
-#: bookwyrm/templates/book/book.html:91
+#: bookwyrm/templates/book/book.html:94
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s reseña)"
 msgstr[1] "(%(review_count)s reseñas)"
 
-#: bookwyrm/templates/book/book.html:97
+#: bookwyrm/templates/book/book.html:100
 msgid "Add Description"
 msgstr "Agregar descripción"
 
-#: bookwyrm/templates/book/book.html:104
+#: bookwyrm/templates/book/book.html:107
 #: bookwyrm/templates/book/edit_book.html:101
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Descripción:"
 
-#: bookwyrm/templates/book/book.html:108
+#: bookwyrm/templates/book/book.html:111
 #: bookwyrm/templates/book/edit_book.html:225
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
@@ -182,7 +188,7 @@ msgstr "Descripción:"
 msgid "Save"
 msgstr "Guardar"
 
-#: bookwyrm/templates/book/book.html:109 bookwyrm/templates/book/book.html:158
+#: bookwyrm/templates/book/book.html:112 bookwyrm/templates/book/book.html:161
 #: bookwyrm/templates/book/cover_modal.html:32
 #: bookwyrm/templates/book/edit_book.html:226
 #: bookwyrm/templates/edit_author.html:79
@@ -197,74 +203,65 @@ msgstr "Guardar"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: bookwyrm/templates/book/book.html:118
+#: bookwyrm/templates/book/book.html:121
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s/editions\">%(count)s ediciones</a>"
 
-#: bookwyrm/templates/book/book.html:126
+#: bookwyrm/templates/book/book.html:129
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "Esta edición está en tu <a href=\"%(path)s\">%(shelf_name)s</a> estante."
 
-#: bookwyrm/templates/book/book.html:132
+#: bookwyrm/templates/book/book.html:135
 #, python-format
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr "Una <a href=\"%(book_path)s\">edición diferente</a> de este libro está en tu <a href=\"%(shelf_path)s\">%(shelf_name)s</a> estante."
 
-#: bookwyrm/templates/book/book.html:141
+#: bookwyrm/templates/book/book.html:144
 msgid "Your reading activity"
 msgstr "Tu actividad de lectura"
 
-#: bookwyrm/templates/book/book.html:143
+#: bookwyrm/templates/book/book.html:146
 msgid "Add read dates"
 msgstr "Agregar fechas de lectura"
 
-#: bookwyrm/templates/book/book.html:148
+#: bookwyrm/templates/book/book.html:151
 msgid "You don't have any reading activity for this book."
 msgstr "No tienes ninguna actividad de lectura para este libro."
 
-#: bookwyrm/templates/book/book.html:155
+#: bookwyrm/templates/book/book.html:158
 msgid "Create"
 msgstr "Crear"
 
-#: bookwyrm/templates/book/book.html:177
-msgid "Tags"
-msgstr "Etiquetas"
-
-#: bookwyrm/templates/book/book.html:181
-#: bookwyrm/templates/snippets/tag.html:18
-msgid "Add tag"
-msgstr "Agregar etiqueta"
-
-#: bookwyrm/templates/book/book.html:198
+#: bookwyrm/templates/book/book.html:180
 msgid "Subjects"
 msgstr "Sujetos"
 
-#: bookwyrm/templates/book/book.html:209
+#: bookwyrm/templates/book/book.html:191
 msgid "Places"
 msgstr "Lugares"
 
-#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book/book.html:202 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listas"
 
-#: bookwyrm/templates/book/book.html:231
+#: bookwyrm/templates/book/book.html:213
 #, fuzzy
 #| msgid "Go to list"
 msgid "Add to list"
 msgstr "Irse a lista"
 
-#: bookwyrm/templates/book/book.html:241
+#: bookwyrm/templates/book/book.html:223
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:90
 msgid "Add"
 msgstr "Agregar"
 
-#: bookwyrm/templates/book/book.html:269
+#: bookwyrm/templates/book/book.html:251
 msgid "rated it"
 msgstr "lo calificó con"
 
@@ -500,6 +497,8 @@ msgstr ""
 
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/feed/feed_layout.html:57
+#: bookwyrm/templates/get_started/layout.html:15
+#: bookwyrm/templates/get_started/layout.html:48
 msgid "Close"
 msgstr "Cerrar"
 
@@ -614,6 +613,7 @@ msgid "Recent Books"
 msgstr "Libros recientes"
 
 #: bookwyrm/templates/discover/landing_layout.html:5
+#: bookwyrm/templates/get_started/layout.html:4
 msgid "Welcome"
 msgstr "Bienvenidos"
 
@@ -825,23 +825,10 @@ msgid "There aren't any activities right now! Try following a user to get starte
 msgstr "¡No hay actividades en este momento! Sigue a otro usuario para empezar"
 
 #: bookwyrm/templates/feed/feed.html:56
+#: bookwyrm/templates/get_started/users.html:6
 msgid "Who to follow"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:69
-#, python-format
-msgid "%(mutuals)s follower you follow"
-msgid_plural "%(mutuals)s followers you follow"
-msgstr[0] ""
-msgstr[1] ""
-
-#: bookwyrm/templates/feed/feed.html:72
-#, python-format
-msgid "%(shared_books)s book on your shelves"
-msgid_plural "%(shared_books)s books on your shelves"
-msgstr[0] ""
-msgstr[1] ""
-
 #: bookwyrm/templates/feed/feed_layout.html:5
 msgid "Updates"
 msgstr "Actualizaciones"
@@ -878,6 +865,160 @@ msgstr "Leer"
 msgid "%(year)s Reading Goal"
 msgstr "%(year)s Meta de lectura"
 
+#: bookwyrm/templates/feed/suggested_users.html:16
+#, python-format
+msgid "%(mutuals)s follower you follow"
+msgid_plural "%(mutuals)s followers you follow"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/feed/suggested_users.html:19
+#, python-format
+msgid "%(shared_books)s book on your shelves"
+msgid_plural "%(shared_books)s books on your shelves"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/get_started/book_preview.html:6
+#, fuzzy, python-format
+#| msgid "Want to Read \"<em>%(book_title)s</em>\""
+msgid "Have you read %(book_title)s?"
+msgstr "Quiero leer \"<em>%(book_title)s</em>\""
+
+#: bookwyrm/templates/get_started/books.html:6
+#, fuzzy
+#| msgid "Started reading"
+msgid "What are you reading?"
+msgstr "Lectura se empezó"
+
+#: bookwyrm/templates/get_started/books.html:9
+#: bookwyrm/templates/lists/list.html:58
+msgid "Search for a book"
+msgstr "Buscar libros"
+
+#: bookwyrm/templates/get_started/books.html:11
+#: bookwyrm/templates/isbn_search_results.html:17
+#: bookwyrm/templates/search_results.html:17
+#, python-format
+msgid "No books found for \"%(query)s\""
+msgstr "No se encontró ningún libro correspondiente a \"%(query)s\""
+
+#: bookwyrm/templates/get_started/books.html:11
+#, python-format
+msgid "You can add books when you start using %(site_name)s."
+msgstr ""
+
+#: bookwyrm/templates/get_started/books.html:16
+#: bookwyrm/templates/get_started/books.html:17
+#: bookwyrm/templates/get_started/users.html:18
+#: bookwyrm/templates/get_started/users.html:19
+#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
+#: bookwyrm/templates/lists/list.html:62
+msgid "Search"
+msgstr "Buscar"
+
+#: bookwyrm/templates/get_started/books.html:26
+#, fuzzy
+#| msgid "Suggest Books"
+msgid "Suggested Books"
+msgstr "Sugerir libros"
+
+#: bookwyrm/templates/get_started/books.html:41
+#, fuzzy, python-format
+#| msgid "About %(site_name)s"
+msgid "Popular on %(site_name)s"
+msgstr "Sobre %(site_name)s"
+
+#: bookwyrm/templates/get_started/books.html:51
+#: bookwyrm/templates/lists/list.html:75
+msgid "No books found"
+msgstr "No se encontró ningún libro"
+
+#: bookwyrm/templates/get_started/books.html:54
+#: bookwyrm/templates/get_started/profile.html:54
+msgid "Save &amp; continue"
+msgstr ""
+
+#: bookwyrm/templates/get_started/layout.html:13
+#, fuzzy
+#| msgid "Started"
+msgid "Getting Started"
+msgstr "Empezado"
+
+#: bookwyrm/templates/get_started/layout.html:26
+#: bookwyrm/templates/get_started/profile.html:6
+#, fuzzy
+#| msgid "User Profile"
+msgid "Create your profile"
+msgstr "Perfil de usuario"
+
+#: bookwyrm/templates/get_started/layout.html:30
+#, fuzzy
+#| msgid "Add Books"
+msgid "Add books"
+msgstr "Agregar libros"
+
+#: bookwyrm/templates/get_started/layout.html:34
+#, fuzzy
+#| msgid "Friendly"
+msgid "Find friends"
+msgstr "Amigable"
+
+#: bookwyrm/templates/get_started/layout.html:40
+msgid "Skip this step"
+msgstr ""
+
+#: bookwyrm/templates/get_started/layout.html:44
+#, fuzzy
+#| msgid "Finished"
+msgid "Finish"
+msgstr "Terminado"
+
+#: bookwyrm/templates/get_started/profile.html:15
+#: bookwyrm/templates/preferences/edit_user.html:24
+msgid "Display name:"
+msgstr "Nombre de visualización:"
+
+#: bookwyrm/templates/get_started/profile.html:22
+#: bookwyrm/templates/preferences/edit_user.html:31
+msgid "Summary:"
+msgstr "Resumen:"
+
+#: bookwyrm/templates/get_started/profile.html:23
+msgid "A little bit about you"
+msgstr ""
+
+#: bookwyrm/templates/get_started/profile.html:32
+#: bookwyrm/templates/preferences/edit_user.html:17
+msgid "Avatar:"
+msgstr "Avatar:"
+
+#: bookwyrm/templates/get_started/profile.html:42
+#: bookwyrm/templates/preferences/edit_user.html:52
+msgid "Manually approve followers:"
+msgstr "Aprobar seguidores a mano:"
+
+#: bookwyrm/templates/get_started/profile.html:48
+#: bookwyrm/templates/preferences/edit_user.html:58
+msgid "Show this account in suggested users:"
+msgstr ""
+
+#: bookwyrm/templates/get_started/profile.html:52
+msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users."
+msgstr ""
+
+#: bookwyrm/templates/get_started/users.html:11
+#, fuzzy
+#| msgid "Search for a book or user"
+msgid "Search for a user"
+msgstr "Buscar un libro o un usuario"
+
+#: bookwyrm/templates/get_started/users.html:13
+#: bookwyrm/templates/search_results.html:76
+#, python-format
+msgid "No users found for \"%(query)s\""
+msgstr "No se encontró ningún usuario correspondiente a \"%(query)s\""
+
 #: bookwyrm/templates/goal.html:7
 #, python-format
 msgid "%(year)s Reading Progress"
@@ -1038,21 +1179,10 @@ msgstr "Resultados de búsqueda por \"%(query)s\""
 msgid "Matching Books"
 msgstr "Libros correspondientes"
 
-#: bookwyrm/templates/isbn_search_results.html:17
-#: bookwyrm/templates/search_results.html:17
-#, python-format
-msgid "No books found for \"%(query)s\""
-msgstr "No se encontró ningún libro correspondiente a \"%(query)s\""
-
 #: bookwyrm/templates/layout.html:33
 msgid "Search for a book or user"
 msgstr "Buscar un libro o un usuario"
 
-#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
-#: bookwyrm/templates/lists/list.html:62
-msgid "Search"
-msgstr "Buscar"
-
 #: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48
 msgid "Main navigation menu"
 msgstr "Menú de navigación central"
@@ -1229,10 +1359,6 @@ msgstr "Agregar libros"
 msgid "Suggest Books"
 msgstr "Sugerir libros"
 
-#: bookwyrm/templates/lists/list.html:58
-msgid "Search for a book"
-msgstr "Buscar libros"
-
 #: bookwyrm/templates/lists/list.html:63
 msgid "search"
 msgstr "buscar"
@@ -1246,10 +1372,6 @@ msgstr "Borrar búsqueda"
 msgid "No books found matching the query \"%(query)s\""
 msgstr "No se encontró ningún libro correspondiente a la búsqueda: \"%(query)s\""
 
-#: bookwyrm/templates/lists/list.html:75
-msgid "No books found"
-msgstr "No se encontró ningún libro"
-
 #: bookwyrm/templates/lists/list.html:90
 msgid "Suggest"
 msgstr "Sugerir"
@@ -1554,30 +1676,10 @@ msgstr "Nueva contraseña:"
 msgid "Edit Profile"
 msgstr "Editar perfil"
 
-#: bookwyrm/templates/preferences/edit_user.html:17
-msgid "Avatar:"
-msgstr "Avatar:"
-
-#: bookwyrm/templates/preferences/edit_user.html:24
-msgid "Display name:"
-msgstr "Nombre de visualización:"
-
-#: bookwyrm/templates/preferences/edit_user.html:31
-msgid "Summary:"
-msgstr "Resumen:"
-
 #: bookwyrm/templates/preferences/edit_user.html:46
 msgid "Show set reading goal prompt in feed:"
 msgstr ""
 
-#: bookwyrm/templates/preferences/edit_user.html:52
-msgid "Manually approve followers:"
-msgstr "Aprobar seguidores a mano:"
-
-#: bookwyrm/templates/preferences/edit_user.html:58
-msgid "Show this account in suggested users:"
-msgstr ""
-
 #: bookwyrm/templates/preferences/edit_user.html:62
 #, python-format
 msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
@@ -1611,11 +1713,6 @@ msgstr "Ocultar resultados de otros catálogos"
 msgid "Matching Users"
 msgstr "Usuarios correspondientes"
 
-#: bookwyrm/templates/search_results.html:76
-#, python-format
-msgid "No users found for \"%(query)s\""
-msgstr "No se encontró ningún usuario correspondiente a \"%(query)s\""
-
 #: bookwyrm/templates/search_results.html:93
 #, python-format
 msgid "No lists found for \"%(query)s\""
@@ -2468,6 +2565,10 @@ msgstr "Lectura se empezó"
 msgid "Remove tag"
 msgstr "Eliminar etiqueta"
 
+#: bookwyrm/templates/snippets/tag.html:18
+msgid "Add tag"
+msgstr "Agregar etiqueta"
+
 #: bookwyrm/templates/tag.html:9
 #, python-format
 msgid "Books tagged \"%(tag.name)s\""
@@ -2525,7 +2626,7 @@ msgstr "Listas: %(username)s"
 msgid "Create list"
 msgstr "Crear lista"
 
-#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:53
+#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:56
 #, fuzzy
 #| msgid "books"
 msgid "All books"
@@ -2551,11 +2652,11 @@ msgstr "Empezado"
 msgid "Finished"
 msgstr "Terminado"
 
-#: bookwyrm/templates/user/shelf.html:122
+#: bookwyrm/templates/user/shelf.html:127
 msgid "This shelf is empty."
 msgstr "Este estante está vacio."
 
-#: bookwyrm/templates/user/shelf.html:128
+#: bookwyrm/templates/user/shelf.html:133
 msgid "Delete shelf"
 msgstr "Eliminar estante"
 
@@ -2632,6 +2733,14 @@ msgstr "Ya existe un usuario con ese nombre."
 msgid "A password reset link sent to %s"
 msgstr ""
 
+#, fuzzy, python-format
+#~| msgid "No users found for \"%(query)s\""
+#~ msgid "No users were found for \"%(query)s\""
+#~ msgstr "No se encontró ningún usuario correspondiente a \"%(query)s\""
+
+#~ msgid "Tags"
+#~ msgstr "Etiquetas"
+
 #~ msgid "Your shelves"
 #~ msgstr "Tus estantes"
 
diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index f3f76f03d44d10c2e6c6ab3168a0e93704ab8ade..1a23164b13ec0e2a61b8747e91f5213950bab658 100644
GIT binary patch
delta 7292
zcmYk>3w+P@9>?*o*##SRF^1WOZ7$o~wz-Tkb7yWNL{`#8xtziZ$v<kkup<YDT51g^
zLe!iTxvX#~Cv;I%QgM#zxQEKE*ZcqbIFEi0pFKa{@9+2f-hSWT&s6dDN}q14<U1A_
zxWsV`uH;-SuB_%<1$k<;YMpCE<rHj<MYsxeDy0GEuq)QV$;cn~96yHQYD~uKsOuBs
zoU4mjsOyJfqH{hsf#fe#EHo>{J2#2)!#D(wV-98{I2VM47=e#rFcxD7F2*YO5?01l
zSQXcp<*4hnq3+v_Vf63zlhmN%h`++QQy4}05~{vxL+AM8V))Spvrr99L^V{1kvP-p
z7hoXerRGZ*O8HgP1lD79EZ2GZcNHYzxCiIr7pNH)G;*#!K7?U7AJyRtSQAUFexucI
zv-(}A_C7-m^dxF!PFwjhs{I@2Yeo{@*qcEXYJ~k!9SuQ^bR=p9<4^;cifUlC)i1L8
zS5O_Uv-(Y_`*)(+`xtBC=csmmYRvlUf-6+SU=TY(Gmb-DkcG+E3pL|O*dAx0I@)aY
zJ5cQ$Kn?U8)U*H5yohS=I<miAwIr_`oy7X9;YL*GL>p8G*{Em#2&$tZv)JmFpq6wc
zs-yL&71@k|xDONXW7KtLQIF(T)Z0*%S!qS$eIyz{GOD4rsE%{2JkZLwqi!6B8qh3M
z!*fxabpdJuD^M%(2CAL+kjLykLJjN;>b{Gn?;1%E6+unB5rvwOs3oh5YA_kKv>B+G
z=AZ_ik9x1~Mm0Rs>WfeVUV^%REowmTqVC`8o%gw;Bq3CsLtXeQs^Q?K&W*y_sPbe~
z19MOfEJO`x1!`s+?EEIwgg!9$VKC(bsD2Jx{V@#H`+veJ&Y^baWz@_=c{Q{dV^AGu
znBA}n<$QA#>b`qW_f0qFq6V@EHL({^1APrOfpr+E_kTNyIyi)U1l@5=!<$x4Ywqoh
zJk*WDPy-u>y8bCUzXH|KdelI+Vhh}h8psvY0Is9nwty7gf9=ZpBwC_WtcvNVhO$u|
z_Csy5(WvVlMm01I)zRbTbEuVBikeU<>d|e$B;0{|1SieYDXhP4xI~3Ix`7%%c&gV?
zJyZh?Q8Q?by1pH106C}u^{{dthEX1jnm~b-C!hv2-OA6PHtmvB)?XKHph698!)mw-
z)!_lujh~w*FqHB|)b%$}0|`#^%Au(1BT<j0A!=eds1EZ{?N30h=%YRo-7pWeG%sQp
zmZ3V@fD>^m#$&S<-U{?VU7wG7gd<TaH{L8nz4t!Ub!DiPdmWo#IkMQ!_Z3MEl8~0(
zQrAXxl#IHur_~QY&A0&7(7mV*Cs}zK>V2P$x^F2~$5&7jT93MKi`9RC^y_nnNNRK9
zIBLdMP#0Ei<-G-A*q3saS%mrp;vn+7h&zRP{eoJ1OIr{1=#o$aPC>QT25VwR)P(!_
z>v{eo?SiqWkxsDkbkwt&gPKXPoi9Pnd^PGBzJ<xS$IhQdt-$Z7>jL<tK^=$TAdJNV
zoQQ4c-|Z*SlHWuvVSKuGLndnGJ+LD_j~d{9)WD9ICs6mDMa?`Y!y7;-_NN?$18|I$
zHzHlR8|c%_T4#C<cR`IX&s>fJDW5^Eb)DOKOF0EKkeN6XpEZx+5X$N8yuU@C#z@LL
zQ3LxFwK7LgkLJ5}Jb#@yMTMTx8S{!=pudat+JxX;*bvpg9PC$#Up8?z<-;AETZSXD
zyuEQAS$$WPWvhoBF$srZKF&n#{sSFZ|N10XsYt{+ot$fqolrO2kJGRir($rn=VLgW
z@;S`I-krS(EWtXIU$*kwsG06S?S(z42^>VN%$Gir+9W@tc4a^p?=6Tx?TH4c`fQBA
zJWRj>EBmk+<%QT2x1xX3<#^YJp(YZC+B4lz0~&}Lh;JB4G)aL~OvP}@Gf|JG7<GOT
zYKhli6y|odB}L6-CaS>&s1;a>8t?|IuRyiC4{PC3<aPJCvm|;wuA)XBn(O^TA{yBS
zE*<q~#-nENJZc6dsDYKC8h!`W@IEUaGtXMR>*lo|jha9_)}VivZYOe4dm#@sgK?+}
zpTI`A7-MlWYQUdiI-WocAf~%>>_gWKwGv}dD>EK-eip{z0@TX9A?e@kB+-SRp!UK^
zD_=u(ShI&$pNcG!>xOEe2(=<hQG28eHQ+Z<U((&E6+LA2U!nRri`wJ?Y#5(jyEGCl
zU0ZC3{ZI`|M6JYhD=)+t%F9vTjkoRmF020<HK0ovgszv@UNCCFO|b!Hp$0Od7wex&
zGM<VMT!!kn)Le%e;5!(M6;|Ghn&~0b_u(X}gPW)UM)dY<j!Bfeq1t%>wZfB8kNVl(
ztiP6c6&0H4`*z|e##6qG8c^*%-iRBauFJ%`u|MjWZbUuf1E@`T95vI+7>Kp{dL7n9
zO(YYwLY;gh`jqCPHq}6^ig%(Kd;qK93{-<pqL%JeY>t~y9e#_N*(KD#!}@uTC>8Yu
z%tEzy8*1h5!w~e%AkmV|L3LDO<&~(V+lIQ~2h^jwg6%Pp&t3~0jiERnwWP~XduS7;
z;bA);*xwsaIBFnq$o}@ZmL%$UDr!WJV+t0bHszbB71@Kj@gOGPcc_^M4De<igIdy-
zsCF_@GtWj1Xat7g4Ag|5##p`or6g%oY(qVppUn%Xnf-=(G(iJBqfyr-q4q*5Y69KO
z{-}WrLp}RDFaXD3b-V|)Stnyn`gc!}=-DmC8n_m<#9L4^zi3`Ztw6{iuRaDffJSB(
z>b`u`faaklu-M9_sO#5YE381DMsk5fyEt&Lx49alUaPjKB^-p+a6D?sA3+UtJ{DpL
zHo=H|Z-5<8OWYT=8ONd?$&=_G7^YHQoX`5#B&o0yhwQ{r%%nbKh&P~Y)Cvtk?T!0U
zE3*hSpyjAXQf_X+aLN^^>pns4rLV1g-pW^pu>N``;X}R65r_KLr(hxuK<(-&SPK`R
zR$?Wxd))@?fxjSQc3HQ1D^`r!bgNM-@uB$xYHwUa4J^Pn%xf?V^&zT*TCxn(5)ZZW
zW9|GT)QZis^CcKX`E}F^Y)3ug-B=61!Pa;IbzkCeuj35U*O^2s&>Q>UFr0>^*beKC
z@ZOHWm_XTwO?4jo<37|1)VbYT!O^G{deAIH?V%@711v%9fik2EpIb}9<8YNndJf07
zl-HtG;Cs|AK9Bd}bsU3ZM|ti>J&GoGcnwd$NXmt%>z+aWxSz~kqxt6;<&_wv_x~h`
zp2=^hk=;b?)+z;_;iv(`U<@XruFJ+|*b`X<_Ymrt?!!vRhtGd3GT$_{YC6)nXe|Bv
ze{Va6WyIUW8-yCZL3~7XAtJaqk*J}TIU3*!FLmFVt?gVk<!th0_^O@jPkAkQij^Ni
z?Hl#)))Pep6L$lx5mNuL((FL}IPxlXzA^b_JGTba&|xbJUI;h;PvyUpZzGx#|0M>|
z&U3nLIfa&ljwgsGi3UV6(bGEnf?TiRZbC<A;=Dieer$k?!~m{uPv|=zj5Dw*>Xp{9
zlX#b?Ox-&44_p6`7(lv<*iPu#>u68BNNCd~5Q~XPL>6(CsKkA<FbTU#B7poSEF`*<
zXP{m~ZRB>8b^MixCiFV`m#r%&J|~aGr&VdkGx)XTX`K6tTwk>%#6O8o2py}4nM5<|
z;G`-!rh2&PxQQqxHWK<z{kIO^H)LCg@x<Lkh@Je9ypHAj$aO>zO{nWc1o~^df0%Bz
zygKzYiI*v#CTfxQA*PV)-PiFJ@iXxO!5isw`$_I0RugTAkBQre%0wJD>u78$*DI#u
z6(WoJ-~A<ikmo=YK8RuXBmVj5OQHIoDn@Gk<EiM&#e9eUf1I-{ka`{O6A6~*k`E!`
zDZhlB@d)bZXxF59MgPwe{QL(I!?|8Kn|PFHMLE=GH&FH;ZLOSv-Ko*HyEbu#xR1C-
zbRcdWzmoK@LOwRM`|FUmAzxtU24hRg!!Z|o5rfF}Iro1q!F{G59Q8S=<8@*JQ9!gM
zbo8)uy~!UV{zdd7t`l`RcK~bSr}!UYA@Lre;~fwG?+T~9od5nq5@07pInj-%O9T<O
zj^-qDiSLN#i5A3J;wW+JSW1#f>>wT|?j#x#DGX>2zCh@>K#cKcJpXq7gunT)5f|P%
zI+5g1egJ<V^2lTH5^?L;YDsg>McchG)TI(PiDc>qVk<&NQ_9bJssHCZ`gi{$CKHjI
z%(O=SM!6pOYxoqQBb_*|grkC(LxgipJ#2wph*0uw*ayEPQpu|k6UlW1kw1d}CQ1qI
zDgXa|OT@cW;CR@>9mF4qQA9Q33Q<Dn=uJa9;ym2_<}}=E`EOW-_}-Nl#C{u9p4+M{
LvHZuOiPio9M&siL

delta 7350
zcmYk=3w+P@9>?+DvKwPpcV^43W}CTeGaGHPVM3clh)jyJj=Ms)zb)#-p?j?p4i2GY
zNuq@!(mFaVS|XPUNs=yz6zBEc@AH2={2u%4`Tc%>zu))w{eHgR-+zDhZ}VBW-N$n@
z-1m8hqu9rB+TyxKj#EQ9r<qzEXAF(gu@vWF9qQD`NXJRTsn`NnAU{quze?~+jK`FA
z?)4?uih3F9`neeEI38y)g~>GRFgr&%&Lrx~aR`P+J5DZ+LqA-FVfY&Q<2DSyT^NXa
zu>sa$Lp*36M_qRob>9VS%=4W;DFoBd@J2N_PD_lyI8=KU^5gX5R~IZpb+iQ4(JBnb
zb=LkK`cmIx?!_SLpP?pj1e@S-o#*+^FBC%YB0h!z?cEtJ!Zy^Gp$4`U^}reo!CGto
z+S<=r`*~D<zA^4Vo1rojY4vzi22;_~fkG|?&7cf5!iP~0dK5L%`KTFGq6V@O)xid9
z|G?TmMP=r&wVy!U|1+w;tJoC%Sa|i*I+pzFf&>~`VmfNZgY1GbjHf;mHRGk&9oM5C
zbjsS#q58Ro8fcR^ckNr5F{lToAp6_tVfFkt@~@7I?ZjBr116%@{uR`NHksS3eK#tl
zpQAR}5mZJ_p)X#>XuOKLE{a)bNfJ?SPZs*)U=IZiU?{4idr%LaVs)KY{Rz~Km8b!&
zM|J!*YO}tFn%RC-CXS-+`w`g=&K1<a+9kO6#h9LC3VxhOM}N#Vd!tg;AJySdRBFee
zW;z8m@Cwv>{S0bA>#ThfYQVcu_kV>N&}r2Dm)!Fnr%|FiqiEEHiKvb<a3mI3eFdt6
zH&GqzKn-X=YG%jm{0Y>AelstlCUy-2(4QTz^T8OT_rIw%M5A_RJZk3IsLj|9_26;l
zbPS|kVJ<-3_Z;fJwdUKX2YrB=SPg2R2T&6@jNy9!f1;oV_$0AD7>X&_$?Bu9A@zq)
zH$H|MSf!nR%g*mdJ?IE(AZIWYFQEpK(9s=03hHg^f*$S40Th&?J5Ue03)Rs?)B_(x
zZL)=^>z1QtvIg~_*Uf5FX7->aREt{5V;G0$P)pD(*)=km{Og7|8uXx4)Bti(4=O};
zP=uO6DeC(1r~yntU3Z_=AHv4e%TW_pWc9_U0j;(A7SyKQolO39;V~N2(OGPS=TQ&5
zhPu%&#kDC0QIA1g-w8F446A3OuJ4Un$|BUnrl1~Jf$D!TDx<4C6m-M8sMLInjd369
zLC0_+p1~*_p6X^`HtPBc)Dq4|W$tBj73#gOLS45HmAONhfX9*5a6Cbs+yP{wQeA+0
z&`{Kk_gniTs2MLpb@V*yflIBv2KBygK;5?oo8YIY2^~S*_k*?nhQa##?~~>@%{dW@
znsEZ^!mg;)<{*=I@~{vmo7Jc<5`LZCFD{X&*RTgF#e-2xI07~BF{pmWV+c;cV7>oy
z?8K91C2GXWt-c=B;bzo~cG~$`R0fWq*76j_;}tvKo-Yf^L?_gBnWzWn;jLJNqj|ow
zf&xE|Pgghf-B774LETV>n)w5mjk{3;^y%gfEZA&?x-S+r^B$-H<l;c=hlB71tDi)V
z9^5tEo!LF8j%T1oSZ?ma!PH|i9EW?H>8Mn$L0!KAOK`gxk?DSQn}GUjx)sCm0%~A^
zG-_bM-O0b!ra28d5sB(J#!N<?Pe;8zIXDJ~qB_`&1AO@Fhvn3Rdhn@;3$X>plP*@n
z>4mLv3dZ3AEXEDl<X^9WZ;tzsnuf8|Z^0y-in?Jj&cdBI1G9U&zJbH2$MxbKd>A!>
zk5L2IZ}l^%iJV96g)68D_<3$}Q_}>S(-4ik7EUJWZ79GfEVlM(7)HGuqw!g*zl9yB
ze~1P6GuCgqT=)7s)I^4$HuG%MfIM?4Xe0};89r<EwHQi$18Qk@qRxMWO7T&Qz?pfL
zQq&r6K=ro^m4Use0iUq;i>Q9DVpF~UA-&z1#-et68fxUZ$iE?+Ld?VosHItkn!#?=
z3~EsWJAmr=EYh)a)#?#9yX~>4_H<PLg&3jtzl4HPKEY1R#5UB+Q8QSAn&~ENk2Tm9
ze?$$qVISTgY=s)YK+M9?s7zF%GPBIiZ^U-gcVQUMcaE!o7f=@l<hy&JHLBhj^}s&X
zUW#PTnT5Kq8kLc~sEHgv4fs3M9{K|{WB&rTJrvb%EP9eCWKz(s9g9lQy?7(eL3OYK
zm5KFM{}5YJ--r4{JY(lCTYFevcR)$#$N6+rf7z%3k3uc&<i6xzBUwm8GA_da`~>yj
zI`bRU0MDX7UbOmOsG0irb3Y$iqaM%=HNXP%PK={I3j=W}>TO%ykNj(`x6_~$A41La
zcT{^wfA{t4h#JrU)PRSft}DZ_Sb<v8lc+u5Tj*}eW~iBVL|^QW>UR)oB4r*5O3_r*
zN9jz|rkaZl@i|n7OED0uP#tbT4de?<!qcd?py>d2W=R-DJrA`+rKnH9$*BJ3qcZ1t
znL+@CDpblgqaIXi^@FI?{ffGwB_DHIs$}er!!Z?~!64j$n&Bs?H9w6h7{p&7ozFrI
zC?6S!#~DI_jqi*@J$Nl@KyPA4tVV6h?@$@Jf|`NfAomlnIcnyas5Kpk%IG*$KV_(y
zPeTo8AvVS;Y^nEuD+R569j4%~sI`gaPo7LbjXV{#G(F5h)cFypy-<ppz-+SuHIN0U
zwSO9Kz!$IyzJ&Gf|7r>$G`xeFK@A4u*QgYqL(M$#R@W}54CGjSAZh@^%*m+x9!Cx6
zebfYMtX_w@{wR9VC|snV*CwIJ-Njj`&2>BK&+fgb6wbp&xD1u@*H8o9f%jo8CSXCa
zJHSb(J>@}d#!A$ZY{B}06_fvD8fs_=!Hagne~7!uLNJ~791O>4s0__R?Ty8#%zT6z
z&_2|Xd~cq^Q0f;^*9DZgdnpW6k1t{UwYk!0(3<3<HpdXuXZ;wA#Ya)QdJQ(kU8qbP
zM6K-!)FwWS`Ivf}`vqeLDsy{Ko9|mxMtq05MtUe{lVqSql!NNH0JSNLP^p`QO7$W;
zzr@b3L1k{Yov*_P>L*Z{xP)5kYuFT940FE`C8O^1jHaLmPcmnrGEss3@hO~zhcFX|
z-0r?53ox4cJD8~RI1n2QcQa6g%H)fv39U4%P#LL42Iz6>C}=YrMxNoEM3&3xIl}d6
z%uqWj18qmTySXFYO+6D!afx{iwG^dyxc$C@+B;RK>vkePPV6Yj`j=D4rQs+lby1_;
zCFzP9SQcv6_BIPquTwF$#L=khW?~1NgCxUw6_wcrck)#obu^}+*$>9kIGN|yZ;WUf
zk|?*p_4p5>hG<E>fY?pB3ogMGL;&Tj7=t>#CY1jF65d1EdfF->T&Mry-ADa-B99nH
zcp|KWHdJ)<p+40uI@iqWsj^B(uG0nzvwAA^zE+N>tjvrd_7J;>DB67SR$PU4c<SHV
zcdRxI|4Hz9RR1p?HLoUKAb7JJUvBmu=O}C^61)xgGw}@ZlC?d6%CL^^#GizguD|v3
zxXw<eA)N+ox+6qSqMXp74-XwVobTio>wmw@?<a|yXkU&Ki5wz|@E)I9VFTuJT?4D%
zKskxf@v%ntFww&ro}k=@a$8~`kx#ujp+oQUdE%lfc68&KZB|alO~h|RfVJrrEG6_|
z_Ag>Fp(C67GKl)@yg@@(;xKWF@E#o~Bzr5kkvKqvbEEgjr2GSwJY0$?cpQ(}1<k2%
zvGPg`qJ9!TB)a?X{8<zNY5WD-5!WBDQHdjNkzDg{)MrE%asBZ<mH!Z*S>t!851ku`
z4~X{M+nMkq?xXHK-q!s6X-uW%FQNxAh}cZrMHCS`iFRC*iQZ$Kw}8(PlZZ&JiM*~o
zma;x_7g^guvnSVev+{oB|3Tt^)=-Tdi9})wF@Tsuq!BL?JBZnYjuXVI#G}OB#3w`y
z@g}i=(9wv8&BZXhnHW{y>i+r?`2QETasgg(i}k<#_&tboW!Rf2qMSyA67kgUCA>!;
zD>UKURV#miYlxv%e->{e&RE^x{pThfmx$kq4%Cy0E^6e+Aja31NGI*RD9^LHm%g<3
zQ_xUrjj!WO?*(QH%(n7l*jejeN8v3Ziw<=BNc1Nb60K+pl*Emc3yGU4e?xeWJFIX8
zKeF;8cn@(WF`T$e%ph*ze(#Y&;gHt92~j|dCUo?^?jqHDS^aO6^}ijzVg+#%v5Xi&
z6cgU#D+)e#&q&JO+KGJH8WQhQ?~1phXRVzaYl>jIxwUyeZGRBq#Jj{<;wfS;(SU3I
zjt>#BcKzp+6DT*tXd;(rOGFS8i21}(qLUBbO$Jl=iFl8wBy=SDY)ox?ETTc__~{#i
Q(pJX$mZ-G8B(Bl_0l3QRpa1{>

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 7677b0ed..db5adfd7 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-31 10:36-0700\n"
+"POT-Creation-Date: 2021-04-01 12:22-0700\n"
 "PO-Revision-Date: 2021-03-02 12:37+0100\n"
 "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -18,32 +18,32 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/forms.py:213
+#: bookwyrm/forms.py:226
 msgid "A user with this email already exists."
 msgstr ""
 
-#: bookwyrm/forms.py:227
+#: bookwyrm/forms.py:240
 msgid "One Day"
 msgstr ""
 
-#: bookwyrm/forms.py:228
+#: bookwyrm/forms.py:241
 msgid "One Week"
 msgstr ""
 
-#: bookwyrm/forms.py:229
+#: bookwyrm/forms.py:242
 msgid "One Month"
 msgstr ""
 
-#: bookwyrm/forms.py:230
+#: bookwyrm/forms.py:243
 msgid "Does Not Expire"
 msgstr ""
 
-#: bookwyrm/forms.py:235
+#: bookwyrm/forms.py:248
 #, python-format
 msgid "%(count)d uses"
 msgstr ""
 
-#: bookwyrm/forms.py:238
+#: bookwyrm/forms.py:251
 #, fuzzy
 #| msgid "Unlisted"
 msgid "Unlimited"
@@ -137,44 +137,50 @@ msgstr "Modifier le livre"
 msgid "Add cover"
 msgstr "Ajouter une couverture"
 
-#: bookwyrm/templates/book/book.html:59
+#: bookwyrm/templates/book/book.html:53
+#, fuzzy
+#| msgid "Failed to load"
+msgid "Failed to load cover"
+msgstr "Items non importés"
+
+#: bookwyrm/templates/book/book.html:62
 msgid "ISBN:"
 msgstr "ISBN :"
 
-#: bookwyrm/templates/book/book.html:66
+#: bookwyrm/templates/book/book.html:69
 #: bookwyrm/templates/book/edit_book.html:211
 msgid "OCLC Number:"
 msgstr "Numéro OCLC :"
 
-#: bookwyrm/templates/book/book.html:73
+#: bookwyrm/templates/book/book.html:76
 #: bookwyrm/templates/book/edit_book.html:215
 msgid "ASIN:"
 msgstr "ASIN :"
 
-#: bookwyrm/templates/book/book.html:82
+#: bookwyrm/templates/book/book.html:85
 msgid "View on OpenLibrary"
 msgstr "Voir sur OpenLibrary"
 
-#: bookwyrm/templates/book/book.html:91
+#: bookwyrm/templates/book/book.html:94
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/book/book.html:97
+#: bookwyrm/templates/book/book.html:100
 #, fuzzy
 #| msgid "Description:"
 msgid "Add Description"
 msgstr "Ajouter une description"
 
-#: bookwyrm/templates/book/book.html:104
+#: bookwyrm/templates/book/book.html:107
 #: bookwyrm/templates/book/edit_book.html:101
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Description :"
 
-#: bookwyrm/templates/book/book.html:108
+#: bookwyrm/templates/book/book.html:111
 #: bookwyrm/templates/book/edit_book.html:225
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
@@ -186,7 +192,7 @@ msgstr "Description :"
 msgid "Save"
 msgstr "Enregistrer"
 
-#: bookwyrm/templates/book/book.html:109 bookwyrm/templates/book/book.html:158
+#: bookwyrm/templates/book/book.html:112 bookwyrm/templates/book/book.html:161
 #: bookwyrm/templates/book/cover_modal.html:32
 #: bookwyrm/templates/book/edit_book.html:226
 #: bookwyrm/templates/edit_author.html:79
@@ -201,79 +207,70 @@ msgstr "Enregistrer"
 msgid "Cancel"
 msgstr "Annuler"
 
-#: bookwyrm/templates/book/book.html:118
+#: bookwyrm/templates/book/book.html:121
 #, fuzzy, python-format
 #| msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s\">%(title)s</a> par "
 
-#: bookwyrm/templates/book/book.html:126
+#: bookwyrm/templates/book/book.html:129
 #, fuzzy, python-format
 #| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/book/book.html:132
+#: bookwyrm/templates/book/book.html:135
 #, fuzzy, python-format
 #| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr " a ajouté <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre liste « <a href=\"%(list_path)s\">%(list_name)s</a> »"
 
-#: bookwyrm/templates/book/book.html:141
+#: bookwyrm/templates/book/book.html:144
 msgid "Your reading activity"
 msgstr "Votre activité de lecture"
 
-#: bookwyrm/templates/book/book.html:143
+#: bookwyrm/templates/book/book.html:146
 #, fuzzy
 #| msgid "Edit read dates"
 msgid "Add read dates"
 msgstr "Ajouter des dates de lecture"
 
-#: bookwyrm/templates/book/book.html:148
+#: bookwyrm/templates/book/book.html:151
 msgid "You don't have any reading activity for this book."
 msgstr "Vous n’avez aucune activité de lecture pour ce livre"
 
-#: bookwyrm/templates/book/book.html:155
+#: bookwyrm/templates/book/book.html:158
 msgid "Create"
 msgstr "Créer"
 
-#: bookwyrm/templates/book/book.html:177
-msgid "Tags"
-msgstr "Tags"
-
-#: bookwyrm/templates/book/book.html:181
-#: bookwyrm/templates/snippets/tag.html:18
-msgid "Add tag"
-msgstr "Ajouter un tag"
-
-#: bookwyrm/templates/book/book.html:198
+#: bookwyrm/templates/book/book.html:180
 msgid "Subjects"
 msgstr "Sujets"
 
-#: bookwyrm/templates/book/book.html:209
+#: bookwyrm/templates/book/book.html:191
 msgid "Places"
 msgstr "Lieux"
 
-#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book/book.html:202 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listes"
 
-#: bookwyrm/templates/book/book.html:231
+#: bookwyrm/templates/book/book.html:213
 #, fuzzy
 #| msgid "Go to list"
 msgid "Add to list"
 msgstr "Aller à la liste"
 
-#: bookwyrm/templates/book/book.html:241
+#: bookwyrm/templates/book/book.html:223
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:90
 msgid "Add"
 msgstr "Ajouter"
 
-#: bookwyrm/templates/book/book.html:269
+#: bookwyrm/templates/book/book.html:251
 msgid "rated it"
 msgstr "l’a noté"
 
@@ -512,6 +509,8 @@ msgstr ""
 
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/feed/feed_layout.html:57
+#: bookwyrm/templates/get_started/layout.html:15
+#: bookwyrm/templates/get_started/layout.html:48
 #, fuzzy
 #| msgid "Closed"
 msgid "Close"
@@ -631,6 +630,7 @@ msgid "Recent Books"
 msgstr "Livres récents"
 
 #: bookwyrm/templates/discover/landing_layout.html:5
+#: bookwyrm/templates/get_started/layout.html:4
 msgid "Welcome"
 msgstr "Bienvenue"
 
@@ -842,23 +842,10 @@ msgid "There aren't any activities right now! Try following a user to get starte
 msgstr "Aucune activité pour l’instant ! Abonnez‑vous à quelqu’un pour commencer"
 
 #: bookwyrm/templates/feed/feed.html:56
+#: bookwyrm/templates/get_started/users.html:6
 msgid "Who to follow"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:69
-#, python-format
-msgid "%(mutuals)s follower you follow"
-msgid_plural "%(mutuals)s followers you follow"
-msgstr[0] ""
-msgstr[1] ""
-
-#: bookwyrm/templates/feed/feed.html:72
-#, python-format
-msgid "%(shared_books)s book on your shelves"
-msgid_plural "%(shared_books)s books on your shelves"
-msgstr[0] ""
-msgstr[1] ""
-
 #: bookwyrm/templates/feed/feed_layout.html:5
 #, fuzzy
 #| msgid "Updated:"
@@ -901,6 +888,160 @@ msgstr "Lu"
 msgid "%(year)s Reading Goal"
 msgstr "Défi lecture pour %(year)s"
 
+#: bookwyrm/templates/feed/suggested_users.html:16
+#, python-format
+msgid "%(mutuals)s follower you follow"
+msgid_plural "%(mutuals)s followers you follow"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/feed/suggested_users.html:19
+#, python-format
+msgid "%(shared_books)s book on your shelves"
+msgid_plural "%(shared_books)s books on your shelves"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/get_started/book_preview.html:6
+#, fuzzy, python-format
+#| msgid "Want to Read \"<em>%(book_title)s</em>\""
+msgid "Have you read %(book_title)s?"
+msgstr "A envie de lire « <em>%(book_title)s</em> »"
+
+#: bookwyrm/templates/get_started/books.html:6
+#, fuzzy
+#| msgid "Started reading"
+msgid "What are you reading?"
+msgstr "Lecture commencée le"
+
+#: bookwyrm/templates/get_started/books.html:9
+#: bookwyrm/templates/lists/list.html:58
+msgid "Search for a book"
+msgstr "Chercher un livre"
+
+#: bookwyrm/templates/get_started/books.html:11
+#: bookwyrm/templates/isbn_search_results.html:17
+#: bookwyrm/templates/search_results.html:17
+#, python-format
+msgid "No books found for \"%(query)s\""
+msgstr "Aucun livre trouvé pour « %(query)s »"
+
+#: bookwyrm/templates/get_started/books.html:11
+#, python-format
+msgid "You can add books when you start using %(site_name)s."
+msgstr ""
+
+#: bookwyrm/templates/get_started/books.html:16
+#: bookwyrm/templates/get_started/books.html:17
+#: bookwyrm/templates/get_started/users.html:18
+#: bookwyrm/templates/get_started/users.html:19
+#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
+#: bookwyrm/templates/lists/list.html:62
+msgid "Search"
+msgstr "Chercher"
+
+#: bookwyrm/templates/get_started/books.html:26
+#, fuzzy
+#| msgid "Suggest Books"
+msgid "Suggested Books"
+msgstr "Suggérer des livres"
+
+#: bookwyrm/templates/get_started/books.html:41
+#, fuzzy, python-format
+#| msgid "Join %(name)s"
+msgid "Popular on %(site_name)s"
+msgstr "À propos de %(name)s"
+
+#: bookwyrm/templates/get_started/books.html:51
+#: bookwyrm/templates/lists/list.html:75
+msgid "No books found"
+msgstr "Aucun livre trouvé"
+
+#: bookwyrm/templates/get_started/books.html:54
+#: bookwyrm/templates/get_started/profile.html:54
+msgid "Save &amp; continue"
+msgstr ""
+
+#: bookwyrm/templates/get_started/layout.html:13
+#, fuzzy
+#| msgid "Started"
+msgid "Getting Started"
+msgstr "Commencé"
+
+#: bookwyrm/templates/get_started/layout.html:26
+#: bookwyrm/templates/get_started/profile.html:6
+#, fuzzy
+#| msgid "User Profile"
+msgid "Create your profile"
+msgstr "Profil"
+
+#: bookwyrm/templates/get_started/layout.html:30
+#, fuzzy
+#| msgid "Add Books"
+msgid "Add books"
+msgstr "Ajouter des livres"
+
+#: bookwyrm/templates/get_started/layout.html:34
+#, fuzzy
+#| msgid "Friendly"
+msgid "Find friends"
+msgstr "Sympa"
+
+#: bookwyrm/templates/get_started/layout.html:40
+msgid "Skip this step"
+msgstr ""
+
+#: bookwyrm/templates/get_started/layout.html:44
+#, fuzzy
+#| msgid "Finished"
+msgid "Finish"
+msgstr "Terminé"
+
+#: bookwyrm/templates/get_started/profile.html:15
+#: bookwyrm/templates/preferences/edit_user.html:24
+msgid "Display name:"
+msgstr "Nom affiché :"
+
+#: bookwyrm/templates/get_started/profile.html:22
+#: bookwyrm/templates/preferences/edit_user.html:31
+msgid "Summary:"
+msgstr "Résumé :"
+
+#: bookwyrm/templates/get_started/profile.html:23
+msgid "A little bit about you"
+msgstr ""
+
+#: bookwyrm/templates/get_started/profile.html:32
+#: bookwyrm/templates/preferences/edit_user.html:17
+msgid "Avatar:"
+msgstr "Avatar :"
+
+#: bookwyrm/templates/get_started/profile.html:42
+#: bookwyrm/templates/preferences/edit_user.html:52
+msgid "Manually approve followers:"
+msgstr "Autoriser les abonnements manuellement :"
+
+#: bookwyrm/templates/get_started/profile.html:48
+#: bookwyrm/templates/preferences/edit_user.html:58
+msgid "Show this account in suggested users:"
+msgstr ""
+
+#: bookwyrm/templates/get_started/profile.html:52
+msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users."
+msgstr ""
+
+#: bookwyrm/templates/get_started/users.html:11
+#, fuzzy
+#| msgid "Search for a book or user"
+msgid "Search for a user"
+msgstr "Chercher un livre ou un compte"
+
+#: bookwyrm/templates/get_started/users.html:13
+#: bookwyrm/templates/search_results.html:76
+#, python-format
+msgid "No users found for \"%(query)s\""
+msgstr "Aucun compte trouvé pour « %(query)s »"
+
 #: bookwyrm/templates/goal.html:7
 #, python-format
 msgid "%(year)s Reading Progress"
@@ -1065,21 +1206,10 @@ msgstr "Résultats de recherche pour « %(query)s »"
 msgid "Matching Books"
 msgstr "Livres correspondants"
 
-#: bookwyrm/templates/isbn_search_results.html:17
-#: bookwyrm/templates/search_results.html:17
-#, python-format
-msgid "No books found for \"%(query)s\""
-msgstr "Aucun livre trouvé pour « %(query)s »"
-
 #: bookwyrm/templates/layout.html:33
 msgid "Search for a book or user"
 msgstr "Chercher un livre ou un compte"
 
-#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
-#: bookwyrm/templates/lists/list.html:62
-msgid "Search"
-msgstr "Chercher"
-
 #: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48
 msgid "Main navigation menu"
 msgstr "Menu de navigation principal "
@@ -1261,10 +1391,6 @@ msgstr "Ajouter des livres"
 msgid "Suggest Books"
 msgstr "Suggérer des livres"
 
-#: bookwyrm/templates/lists/list.html:58
-msgid "Search for a book"
-msgstr "Chercher un livre"
-
 #: bookwyrm/templates/lists/list.html:63
 msgid "search"
 msgstr "Chercher"
@@ -1278,10 +1404,6 @@ msgstr "Vider la requête"
 msgid "No books found matching the query \"%(query)s\""
 msgstr "Aucun livre trouvé pour la requête « %(query)s »"
 
-#: bookwyrm/templates/lists/list.html:75
-msgid "No books found"
-msgstr "Aucun livre trouvé"
-
 #: bookwyrm/templates/lists/list.html:90
 msgid "Suggest"
 msgstr "Suggérer"
@@ -1586,30 +1708,10 @@ msgstr "Nouveau mot de passe :"
 msgid "Edit Profile"
 msgstr "Modifier le profil"
 
-#: bookwyrm/templates/preferences/edit_user.html:17
-msgid "Avatar:"
-msgstr "Avatar :"
-
-#: bookwyrm/templates/preferences/edit_user.html:24
-msgid "Display name:"
-msgstr "Nom affiché :"
-
-#: bookwyrm/templates/preferences/edit_user.html:31
-msgid "Summary:"
-msgstr "Résumé :"
-
 #: bookwyrm/templates/preferences/edit_user.html:46
 msgid "Show set reading goal prompt in feed:"
 msgstr ""
 
-#: bookwyrm/templates/preferences/edit_user.html:52
-msgid "Manually approve followers:"
-msgstr "Autoriser les abonnements manuellement :"
-
-#: bookwyrm/templates/preferences/edit_user.html:58
-msgid "Show this account in suggested users:"
-msgstr ""
-
 #: bookwyrm/templates/preferences/edit_user.html:62
 #, python-format
 msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
@@ -1643,11 +1745,6 @@ msgstr "Masquer les résultats d’autres catalogues"
 msgid "Matching Users"
 msgstr "Comptes correspondants"
 
-#: bookwyrm/templates/search_results.html:76
-#, python-format
-msgid "No users found for \"%(query)s\""
-msgstr "Aucun compte trouvé pour « %(query)s »"
-
 #: bookwyrm/templates/search_results.html:93
 #, python-format
 msgid "No lists found for \"%(query)s\""
@@ -2506,6 +2603,10 @@ msgstr "Lecture commencée le"
 msgid "Remove tag"
 msgstr "Supprimer le tag"
 
+#: bookwyrm/templates/snippets/tag.html:18
+msgid "Add tag"
+msgstr "Ajouter un tag"
+
 #: bookwyrm/templates/tag.html:9
 #, python-format
 msgid "Books tagged \"%(tag.name)s\""
@@ -2564,7 +2665,7 @@ msgstr "Listes : %(username)s"
 msgid "Create list"
 msgstr "Créer une liste"
 
-#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:53
+#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:56
 #, fuzzy
 #| msgid "books"
 msgid "All books"
@@ -2590,11 +2691,11 @@ msgstr "Commencé"
 msgid "Finished"
 msgstr "Terminé"
 
-#: bookwyrm/templates/user/shelf.html:122
+#: bookwyrm/templates/user/shelf.html:127
 msgid "This shelf is empty."
 msgstr "Cette étagère est vide"
 
-#: bookwyrm/templates/user/shelf.html:128
+#: bookwyrm/templates/user/shelf.html:133
 msgid "Delete shelf"
 msgstr "Supprimer l’étagère"
 
@@ -2670,6 +2771,14 @@ msgstr ""
 msgid "A password reset link sent to %s"
 msgstr ""
 
+#, fuzzy, python-format
+#~| msgid "No users found for \"%(query)s\""
+#~ msgid "No users were found for \"%(query)s\""
+#~ msgstr "Aucun compte trouvé pour « %(query)s »"
+
+#~ msgid "Tags"
+#~ msgstr "Tags"
+
 #~ msgid "Your shelves"
 #~ msgstr "Vos étagères"
 
diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
index 819542795f872411dcea455b2aa44f520118794a..3fe34104efbb6b6c4305cf3dd4c6ca9656766dde 100644
GIT binary patch
delta 9365
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
Om_9fDK=S0()&2uhU);0+

delta 9408
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

diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index 8680ab96..fc255684 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-31 10:36-0700\n"
+"POT-Creation-Date: 2021-04-01 12:22-0700\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"
@@ -18,34 +18,34 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: bookwyrm/forms.py:213
+#: bookwyrm/forms.py:226
 #, fuzzy
 #| msgid "A user with that username already exists."
 msgid "A user with this email already exists."
 msgstr "已�存在使用该用户�的用户。"
 
-#: bookwyrm/forms.py:227
+#: bookwyrm/forms.py:240
 msgid "One Day"
 msgstr "一天"
 
-#: bookwyrm/forms.py:228
+#: bookwyrm/forms.py:241
 msgid "One Week"
 msgstr "一周"
 
-#: bookwyrm/forms.py:229
+#: bookwyrm/forms.py:242
 msgid "One Month"
 msgstr "一个月"
 
-#: bookwyrm/forms.py:230
+#: bookwyrm/forms.py:243
 msgid "Does Not Expire"
 msgstr "永�失效"
 
-#: bookwyrm/forms.py:235
+#: bookwyrm/forms.py:248
 #, python-format
 msgid "%(count)d uses"
 msgstr "%(count)d 次使用"
 
-#: bookwyrm/forms.py:238
+#: bookwyrm/forms.py:251
 msgid "Unlimited"
 msgstr "���"
 
@@ -135,41 +135,47 @@ msgstr "编辑书目"
 msgid "Add cover"
 msgstr "添加��"
 
-#: bookwyrm/templates/book/book.html:59
+#: bookwyrm/templates/book/book.html:53
+#, fuzzy
+#| msgid "Failed to load"
+msgid "Failed to load cover"
+msgstr "加载失败"
+
+#: bookwyrm/templates/book/book.html:62
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: bookwyrm/templates/book/book.html:66
+#: bookwyrm/templates/book/book.html:69
 #: bookwyrm/templates/book/edit_book.html:211
 msgid "OCLC Number:"
 msgstr "OCLC �:"
 
-#: bookwyrm/templates/book/book.html:73
+#: bookwyrm/templates/book/book.html:76
 #: bookwyrm/templates/book/edit_book.html:215
 msgid "ASIN:"
 msgstr "ASIN:"
 
-#: bookwyrm/templates/book/book.html:82
+#: bookwyrm/templates/book/book.html:85
 msgid "View on OpenLibrary"
 msgstr "在 OpenLibrary 查看"
 
-#: bookwyrm/templates/book/book.html:91
+#: bookwyrm/templates/book/book.html:94
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s 则书评)"
 
-#: bookwyrm/templates/book/book.html:97
+#: bookwyrm/templates/book/book.html:100
 msgid "Add Description"
 msgstr "添加�述"
 
-#: bookwyrm/templates/book/book.html:104
+#: bookwyrm/templates/book/book.html:107
 #: bookwyrm/templates/book/edit_book.html:101
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "�述:"
 
-#: bookwyrm/templates/book/book.html:108
+#: bookwyrm/templates/book/book.html:111
 #: bookwyrm/templates/book/edit_book.html:225
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
@@ -181,7 +187,7 @@ msgstr "�述:"
 msgid "Save"
 msgstr "�存"
 
-#: bookwyrm/templates/book/book.html:109 bookwyrm/templates/book/book.html:158
+#: bookwyrm/templates/book/book.html:112 bookwyrm/templates/book/book.html:161
 #: bookwyrm/templates/book/cover_modal.html:32
 #: bookwyrm/templates/book/edit_book.html:226
 #: bookwyrm/templates/edit_author.html:79
@@ -196,72 +202,63 @@ msgstr "�存"
 msgid "Cancel"
 msgstr "�消"
 
-#: bookwyrm/templates/book/book.html:118
+#: bookwyrm/templates/book/book.html:121
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s/editions\">%(count)s 个版本</a>"
 
-#: bookwyrm/templates/book/book.html:126
+#: bookwyrm/templates/book/book.html:129
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "此版本在你的 <a href=\"%(path)s\">%(shelf_name)s</a> 书架上。"
 
-#: bookwyrm/templates/book/book.html:132
+#: bookwyrm/templates/book/book.html:135
 #, python-format
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr "本书的 <a href=\"%(book_path)s\">�一个版本</a> 在你的 <a href=\"%(shelf_path)s\">%(shelf_name)s</a> 书架上。"
 
-#: bookwyrm/templates/book/book.html:141
+#: bookwyrm/templates/book/book.html:144
 msgid "Your reading activity"
 msgstr "你的阅读活动"
 
-#: bookwyrm/templates/book/book.html:143
+#: bookwyrm/templates/book/book.html:146
 msgid "Add read dates"
 msgstr "添加阅读日期"
 
-#: bookwyrm/templates/book/book.html:148
+#: bookwyrm/templates/book/book.html:151
 msgid "You don't have any reading activity for this book."
 msgstr "你还没有任何这本书的阅读活动。"
 
-#: bookwyrm/templates/book/book.html:155
+#: bookwyrm/templates/book/book.html:158
 msgid "Create"
 msgstr "创建"
 
-#: bookwyrm/templates/book/book.html:177
-msgid "Tags"
-msgstr "标签"
-
-#: bookwyrm/templates/book/book.html:181
-#: bookwyrm/templates/snippets/tag.html:18
-msgid "Add tag"
-msgstr "添加标签"
-
-#: bookwyrm/templates/book/book.html:198
+#: bookwyrm/templates/book/book.html:180
 msgid "Subjects"
 msgstr "主题"
 
-#: bookwyrm/templates/book/book.html:209
+#: bookwyrm/templates/book/book.html:191
 msgid "Places"
 msgstr "地点"
 
-#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book/book.html:202 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "列表"
 
-#: bookwyrm/templates/book/book.html:231
+#: bookwyrm/templates/book/book.html:213
 msgid "Add to list"
 msgstr "添加到列表"
 
-#: bookwyrm/templates/book/book.html:241
+#: bookwyrm/templates/book/book.html:223
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:90
 msgid "Add"
 msgstr "添加"
 
-#: bookwyrm/templates/book/book.html:269
+#: bookwyrm/templates/book/book.html:251
 msgid "rated it"
 msgstr "评价了"
 
@@ -483,6 +480,8 @@ msgstr "由 %(publisher)s 出版。"
 
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/feed/feed_layout.html:57
+#: bookwyrm/templates/get_started/layout.html:15
+#: bookwyrm/templates/get_started/layout.html:48
 msgid "Close"
 msgstr "关闭"
 
@@ -595,6 +594,7 @@ msgid "Recent Books"
 msgstr "最近书目"
 
 #: bookwyrm/templates/discover/landing_layout.html:5
+#: bookwyrm/templates/get_started/layout.html:4
 msgid "Welcome"
 msgstr "欢迎"
 
@@ -808,21 +808,10 @@ msgid "There aren't any activities right now! Try following a user to get starte
 msgstr "现在还没有任何活动��试�从关注一个用户开始�"
 
 #: bookwyrm/templates/feed/feed.html:56
+#: bookwyrm/templates/get_started/users.html:6
 msgid "Who to follow"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:69
-#, python-format
-msgid "%(mutuals)s follower you follow"
-msgid_plural "%(mutuals)s followers you follow"
-msgstr[0] ""
-
-#: bookwyrm/templates/feed/feed.html:72
-#, python-format
-msgid "%(shared_books)s book on your shelves"
-msgid_plural "%(shared_books)s books on your shelves"
-msgstr[0] ""
-
 #: bookwyrm/templates/feed/feed_layout.html:5
 msgid "Updates"
 msgstr "æ›´æ–°"
@@ -859,6 +848,158 @@ msgstr "读过"
 msgid "%(year)s Reading Goal"
 msgstr "%(year)s 阅读目标"
 
+#: bookwyrm/templates/feed/suggested_users.html:16
+#, python-format
+msgid "%(mutuals)s follower you follow"
+msgid_plural "%(mutuals)s followers you follow"
+msgstr[0] ""
+
+#: bookwyrm/templates/feed/suggested_users.html:19
+#, python-format
+msgid "%(shared_books)s book on your shelves"
+msgid_plural "%(shared_books)s books on your shelves"
+msgstr[0] ""
+
+#: bookwyrm/templates/get_started/book_preview.html:6
+#, fuzzy, python-format
+#| msgid "Want to Read \"<em>%(book_title)s</em>\""
+msgid "Have you read %(book_title)s?"
+msgstr "想�阅读 \"<em>%(book_title)s</em>\""
+
+#: bookwyrm/templates/get_started/books.html:6
+#, fuzzy
+#| msgid "Started reading"
+msgid "What are you reading?"
+msgstr "已开始阅读"
+
+#: bookwyrm/templates/get_started/books.html:9
+#: bookwyrm/templates/lists/list.html:58
+msgid "Search for a book"
+msgstr "�索书目"
+
+#: bookwyrm/templates/get_started/books.html:11
+#: bookwyrm/templates/isbn_search_results.html:17
+#: bookwyrm/templates/search_results.html:17
+#, python-format
+msgid "No books found for \"%(query)s\""
+msgstr "没有找到 \"%(query)s\" 的书目"
+
+#: bookwyrm/templates/get_started/books.html:11
+#, python-format
+msgid "You can add books when you start using %(site_name)s."
+msgstr ""
+
+#: bookwyrm/templates/get_started/books.html:16
+#: bookwyrm/templates/get_started/books.html:17
+#: bookwyrm/templates/get_started/users.html:18
+#: bookwyrm/templates/get_started/users.html:19
+#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
+#: bookwyrm/templates/lists/list.html:62
+msgid "Search"
+msgstr "�索"
+
+#: bookwyrm/templates/get_started/books.html:26
+#, fuzzy
+#| msgid "Suggest Books"
+msgid "Suggested Books"
+msgstr "推�书目"
+
+#: bookwyrm/templates/get_started/books.html:41
+#, fuzzy, python-format
+#| msgid "About %(site_name)s"
+msgid "Popular on %(site_name)s"
+msgstr "关于 %(site_name)s"
+
+#: bookwyrm/templates/get_started/books.html:51
+#: bookwyrm/templates/lists/list.html:75
+msgid "No books found"
+msgstr "没有找到书目"
+
+#: bookwyrm/templates/get_started/books.html:54
+#: bookwyrm/templates/get_started/profile.html:54
+msgid "Save &amp; continue"
+msgstr ""
+
+#: bookwyrm/templates/get_started/layout.html:13
+#, fuzzy
+#| msgid "Started"
+msgid "Getting Started"
+msgstr "已开始"
+
+#: bookwyrm/templates/get_started/layout.html:26
+#: bookwyrm/templates/get_started/profile.html:6
+#, fuzzy
+#| msgid "View user profile"
+msgid "Create your profile"
+msgstr "查看用户个人资料"
+
+#: bookwyrm/templates/get_started/layout.html:30
+#, fuzzy
+#| msgid "Add Books"
+msgid "Add books"
+msgstr "添加书目"
+
+#: bookwyrm/templates/get_started/layout.html:34
+#, fuzzy
+#| msgid "Friendly"
+msgid "Find friends"
+msgstr "�好"
+
+#: bookwyrm/templates/get_started/layout.html:40
+msgid "Skip this step"
+msgstr ""
+
+#: bookwyrm/templates/get_started/layout.html:44
+#, fuzzy
+#| msgid "Finished"
+msgid "Finish"
+msgstr "已完�"
+
+#: bookwyrm/templates/get_started/profile.html:15
+#: bookwyrm/templates/preferences/edit_user.html:24
+msgid "Display name:"
+msgstr "显示�称:"
+
+#: bookwyrm/templates/get_started/profile.html:22
+#: bookwyrm/templates/preferences/edit_user.html:31
+msgid "Summary:"
+msgstr "概�:"
+
+#: bookwyrm/templates/get_started/profile.html:23
+msgid "A little bit about you"
+msgstr ""
+
+#: bookwyrm/templates/get_started/profile.html:32
+#: bookwyrm/templates/preferences/edit_user.html:17
+msgid "Avatar:"
+msgstr "头�:"
+
+#: bookwyrm/templates/get_started/profile.html:42
+#: bookwyrm/templates/preferences/edit_user.html:52
+msgid "Manually approve followers:"
+msgstr "手动批准关注者:"
+
+#: bookwyrm/templates/get_started/profile.html:48
+#: bookwyrm/templates/preferences/edit_user.html:58
+msgid "Show this account in suggested users:"
+msgstr ""
+
+#: bookwyrm/templates/get_started/profile.html:52
+msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users."
+msgstr ""
+
+#: bookwyrm/templates/get_started/users.html:11
+#, fuzzy
+#| msgid "Search for a book or user"
+msgid "Search for a user"
+msgstr "�索书目或用户"
+
+#: bookwyrm/templates/get_started/users.html:13
+#: bookwyrm/templates/search_results.html:76
+#, python-format
+msgid "No users found for \"%(query)s\""
+msgstr "没有找到 \"%(query)s\" 的用户"
+
 #: bookwyrm/templates/goal.html:7
 #, python-format
 msgid "%(year)s Reading Progress"
@@ -1019,21 +1160,10 @@ msgstr "\"%(query)s\" 的�索结果"
 msgid "Matching Books"
 msgstr "匹�的书目"
 
-#: bookwyrm/templates/isbn_search_results.html:17
-#: bookwyrm/templates/search_results.html:17
-#, python-format
-msgid "No books found for \"%(query)s\""
-msgstr "没有找到 \"%(query)s\" 的书目"
-
 #: bookwyrm/templates/layout.html:33
 msgid "Search for a book or user"
 msgstr "�索书目或用户"
 
-#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
-#: bookwyrm/templates/lists/list.html:62
-msgid "Search"
-msgstr "�索"
-
 #: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48
 msgid "Main navigation menu"
 msgstr "主导航��"
@@ -1208,10 +1338,6 @@ msgstr "添加书目"
 msgid "Suggest Books"
 msgstr "推�书目"
 
-#: bookwyrm/templates/lists/list.html:58
-msgid "Search for a book"
-msgstr "�索书目"
-
 #: bookwyrm/templates/lists/list.html:63
 msgid "search"
 msgstr "�索"
@@ -1225,10 +1351,6 @@ msgstr "清除�索"
 msgid "No books found matching the query \"%(query)s\""
 msgstr "没有符� \"%(query)s\" 请求的书目"
 
-#: bookwyrm/templates/lists/list.html:75
-msgid "No books found"
-msgstr "没有找到书目"
-
 #: bookwyrm/templates/lists/list.html:90
 msgid "Suggest"
 msgstr "推�"
@@ -1519,30 +1641,10 @@ msgstr "新密�:"
 msgid "Edit Profile"
 msgstr "编辑个人资料"
 
-#: bookwyrm/templates/preferences/edit_user.html:17
-msgid "Avatar:"
-msgstr "头�:"
-
-#: bookwyrm/templates/preferences/edit_user.html:24
-msgid "Display name:"
-msgstr "显示�称:"
-
-#: bookwyrm/templates/preferences/edit_user.html:31
-msgid "Summary:"
-msgstr "概�:"
-
 #: bookwyrm/templates/preferences/edit_user.html:46
 msgid "Show set reading goal prompt in feed:"
 msgstr "在消��中显示设置阅读目标的�示:"
 
-#: bookwyrm/templates/preferences/edit_user.html:52
-msgid "Manually approve followers:"
-msgstr "手动批准关注者:"
-
-#: bookwyrm/templates/preferences/edit_user.html:58
-msgid "Show this account in suggested users:"
-msgstr ""
-
 #: bookwyrm/templates/preferences/edit_user.html:62
 #, python-format
 msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
@@ -1576,11 +1678,6 @@ msgstr "��其它类别的结果"
 msgid "Matching Users"
 msgstr "匹�的用户"
 
-#: bookwyrm/templates/search_results.html:76
-#, python-format
-msgid "No users found for \"%(query)s\""
-msgstr "没有找到 \"%(query)s\" 的用户"
-
 #: bookwyrm/templates/search_results.html:93
 #, python-format
 msgid "No lists found for \"%(query)s\""
@@ -2425,6 +2522,10 @@ msgstr "已开始阅读"
 msgid "Remove tag"
 msgstr "移除标签"
 
+#: bookwyrm/templates/snippets/tag.html:18
+msgid "Add tag"
+msgstr "添加标签"
+
 #: bookwyrm/templates/tag.html:9
 #, python-format
 msgid "Books tagged \"%(tag.name)s\""
@@ -2482,7 +2583,7 @@ msgstr "列表: %(username)s"
 msgid "Create list"
 msgstr "创建列表"
 
-#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:53
+#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:56
 #, fuzzy
 #| msgid "books"
 msgid "All books"
@@ -2508,11 +2609,11 @@ msgstr "已开始"
 msgid "Finished"
 msgstr "已完�"
 
-#: bookwyrm/templates/user/shelf.html:122
+#: bookwyrm/templates/user/shelf.html:127
 msgid "This shelf is empty."
 msgstr "此书架是空的。"
 
-#: bookwyrm/templates/user/shelf.html:128
+#: bookwyrm/templates/user/shelf.html:133
 msgid "Delete shelf"
 msgstr "删除书架"
 
@@ -2588,6 +2689,14 @@ msgstr "已�存在使用该用户�的用户。"
 msgid "A password reset link sent to %s"
 msgstr ""
 
+#, fuzzy, python-format
+#~| msgid "No users found for \"%(query)s\""
+#~ msgid "No users were found for \"%(query)s\""
+#~ msgstr "没有找到 \"%(query)s\" 的用户"
+
+#~ msgid "Tags"
+#~ msgstr "标签"
+
 #~ msgid "Your shelves"
 #~ msgstr "你的书架"
 

From bd0c0ff2a2f348c4585e734194837e6d5cc0c50b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 12:46:38 -0700
Subject: [PATCH 0570/1285] Changes the header copy

---
 bookwyrm/templates/get_started/layout.html | 6 +++++-
 bookwyrm/views/authentication.py           | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/get_started/layout.html b/bookwyrm/templates/get_started/layout.html
index 0e80a502..63c04289 100644
--- a/bookwyrm/templates/get_started/layout.html
+++ b/bookwyrm/templates/get_started/layout.html
@@ -9,8 +9,12 @@
     <div class="modal-background"></div>
     <div class="modal-card is-fullwidth">
         <header class="modal-card-head">
+            <img class="image logo mr-2" src="{% if site.logo_small %}/images/{{ site.logo_small }}{% else %}/static/images/logo-small.png{% endif %}" aria-hidden="true">
             <h1 class="modal-card-title" id="get-started-header">
-                {% trans "Getting Started" %}
+                {% blocktrans %}Welcome to {{ site_name }}!{% endblocktrans %}
+                <span class="subtitle is-block">
+                    {% trans "These are some first steps to get you started." %}
+                </span>
             </h1>
             <a href="/" class="delete" aria-label="{% trans 'Close' %}"></a>
         </header>
diff --git a/bookwyrm/views/authentication.py b/bookwyrm/views/authentication.py
index a9147556..eef5c79f 100644
--- a/bookwyrm/views/authentication.py
+++ b/bookwyrm/views/authentication.py
@@ -111,7 +111,7 @@ class Register(View):
             invite.save()
 
         login(request, user)
-        return redirect("/")
+        return redirect("get-started-profile")
 
 
 @method_decorator(login_required, name="dispatch")

From b17caa84cd4643a14ce0551d25c95cdaac1678a7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 12:54:00 -0700
Subject: [PATCH 0571/1285] Fixes form default value in get started profile
 view

---
 bookwyrm/templates/get_started/profile.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/get_started/profile.html b/bookwyrm/templates/get_started/profile.html
index b26bd915..90cdb410 100644
--- a/bookwyrm/templates/get_started/profile.html
+++ b/bookwyrm/templates/get_started/profile.html
@@ -20,7 +20,7 @@
                 </div>
                 <div class="block">
                     <label class="label" for="id_summary">{% trans "Summary:" %}</label>
-                    <textarea name="summary" cols="None" rows="None" class="textarea" id="id_summary" placeholder="{% trans 'A little bit about you' %}" value="{{ request.user.summary }}"></textarea>
+                    <textarea name="summary" cols="None" rows="None" class="textarea" id="id_summary" placeholder="{% trans 'A little bit about you' %}">{% if request.user.summary %}{{ request.user.summary }}{% endif %}</textarea>
                     {% for error in form.summary.errors %}
                     <p class="help is-danger">{{ error | escape }}</p>
                     {% endfor %}
@@ -46,7 +46,7 @@
         <div class="block">
             <label class="checkbox label" for="id_discoverable">
                 {% trans "Show this account in suggested users:" %}
-                <input type="checkbox" name="discoverable" class="checkbox" id="id_discoverable" checked>
+                <input type="checkbox" name="discoverable" class="checkbox" id="id_discoverable" value="{{ request.user.discoverable }}">
             </label>
             {% url 'directory' as path %}
             <p class="help">{% trans "Your account will show up in the directory, and may be recommended to other BookWyrm users." %}</p>

From 6541de4ba12d09f61aac94d71b83c8dae6cf1bf8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 13:02:41 -0700
Subject: [PATCH 0572/1285] Keep book view columns in mobile

---
 bookwyrm/templates/get_started/books.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/get_started/books.html b/bookwyrm/templates/get_started/books.html
index 06f87c3a..ae265122 100644
--- a/bookwyrm/templates/get_started/books.html
+++ b/bookwyrm/templates/get_started/books.html
@@ -24,11 +24,11 @@
 <form class="block" name="add-books" method="post" action="{% url 'get-started-books' %}">
     {% csrf_token %}
     <h3 class="title is-5">{% trans "Suggested Books" %}</h3>
-    <fieldset name="books" class="columns scroll-x">
+    <fieldset name="books" class="columns scroll-x is-mobile">
         {% if book_results %}
         <div class="column is-narrow content">
             <p class="help mb-0">Search results</p>
-            <div class="columns">
+            <div class="columns is-mobile">
                 {% for book in book_results %}
                 {% include 'get_started/book_preview.html' %}
                 {% endfor %}
@@ -40,7 +40,7 @@
             <p class="help mb-0">
                 {% blocktrans %}Popular on {{ site_name }}{% endblocktrans %}
             </p>
-            <div class="columns">
+            <div class="columns is-mobile">
                 {% for book in popular_books %}
                 {% include 'get_started/book_preview.html' %}
                 {% endfor %}

From a952d59eb80cc18f96bb8a3e8a9916ccc311abe8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 13:14:23 -0700
Subject: [PATCH 0573/1285] Fixes translation on modal close labels

---
 bookwyrm/templates/components/modal.html |  6 ++--
 locale/de_DE/LC_MESSAGES/django.po       | 36 +++++++++++++++---------
 locale/en_US/LC_MESSAGES/django.po       | 26 ++++++++++-------
 locale/es/LC_MESSAGES/django.po          | 36 +++++++++++++++---------
 locale/fr_FR/LC_MESSAGES/django.po       | 36 +++++++++++++++---------
 locale/zh_CN/LC_MESSAGES/django.po       | 36 +++++++++++++++---------
 6 files changed, 112 insertions(+), 64 deletions(-)

diff --git a/bookwyrm/templates/components/modal.html b/bookwyrm/templates/components/modal.html
index 9ffbc2b3..3c366954 100644
--- a/bookwyrm/templates/components/modal.html
+++ b/bookwyrm/templates/components/modal.html
@@ -1,3 +1,4 @@
+{% load i18n %}
 <div
     role="dialog"
     class="modal hidden"
@@ -7,12 +8,13 @@
 >
     {# @todo Implement focus traps to prevent tabbing out of the modal. #}
     <div class="modal-background"></div>
+    {% trans "Close" as label %}
     <div class="modal-card">
         <header class="modal-card-head" tabindex="0" id="modal-title-{{ controls_text }}-{{ controls_uid }}">
             <h2 class="modal-card-title" id="modal-card-title-{{ controls_text }}-{{ controls_uid }}">
                 {% block modal-title %}{% endblock %}
             </h2>
-            {% include 'snippets/toggle/toggle_button.html' with label="close" class="delete" nonbutton=True %}
+            {% include 'snippets/toggle/toggle_button.html' with label=label class="delete" nonbutton=True %}
         </header>
         {% block modal-form-open %}{% endblock %}
         {% if not no_body %}
@@ -25,6 +27,6 @@
         </footer>
         {% block modal-form-close %}{% endblock %}
     </div>
-    {% include 'snippets/toggle/toggle_button.html' with label="close" class="modal-close is-large" nonbutton=True %}
+    {% include 'snippets/toggle/toggle_button.html' with label=label class="modal-close is-large" nonbutton=True %}
 </div>
 
diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 7b418998..87e77637 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-01 12:22-0700\n"
+"POT-Creation-Date: 2021-04-01 13:14-0700\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"
@@ -501,9 +501,10 @@ msgid "Published by %(publisher)s."
 msgstr "Veröffentlicht von %(publisher)s."
 
 #: bookwyrm/templates/components/inline_form.html:8
+#: bookwyrm/templates/components/modal.html:11
 #: bookwyrm/templates/feed/feed_layout.html:57
-#: bookwyrm/templates/get_started/layout.html:15
-#: bookwyrm/templates/get_started/layout.html:48
+#: bookwyrm/templates/get_started/layout.html:19
+#: bookwyrm/templates/get_started/layout.html:52
 msgid "Close"
 msgstr "Schließen"
 
@@ -946,36 +947,40 @@ msgstr "Keine Bücher gefunden"
 msgid "Save &amp; continue"
 msgstr ""
 
-#: bookwyrm/templates/get_started/layout.html:13
-#, fuzzy
-#| msgid "Started"
-msgid "Getting Started"
-msgstr "Gestartet"
+#: bookwyrm/templates/get_started/layout.html:14
+#, fuzzy, python-format
+#| msgid "About %(site_name)s"
+msgid "Welcome to %(site_name)s!"
+msgstr "Ãœber %(site_name)s"
 
-#: bookwyrm/templates/get_started/layout.html:26
+#: bookwyrm/templates/get_started/layout.html:16
+msgid "These are some first steps to get you started."
+msgstr ""
+
+#: bookwyrm/templates/get_started/layout.html:30
 #: bookwyrm/templates/get_started/profile.html:6
 #, fuzzy
 #| msgid "User Profile"
 msgid "Create your profile"
 msgstr "Benutzerprofil"
 
-#: bookwyrm/templates/get_started/layout.html:30
+#: bookwyrm/templates/get_started/layout.html:34
 #, fuzzy
 #| msgid "Add Books"
 msgid "Add books"
 msgstr "Bücher hinzufügen"
 
-#: bookwyrm/templates/get_started/layout.html:34
+#: bookwyrm/templates/get_started/layout.html:38
 #, fuzzy
 #| msgid "Friendly"
 msgid "Find friends"
 msgstr "Freundlich"
 
-#: bookwyrm/templates/get_started/layout.html:40
+#: bookwyrm/templates/get_started/layout.html:44
 msgid "Skip this step"
 msgstr ""
 
-#: bookwyrm/templates/get_started/layout.html:44
+#: bookwyrm/templates/get_started/layout.html:48
 #, fuzzy
 #| msgid "Finished"
 msgid "Finish"
@@ -2741,6 +2746,11 @@ msgstr "Dieser Benutzename ist bereits vergeben."
 msgid "A password reset link sent to %s"
 msgstr ""
 
+#, fuzzy
+#~| msgid "Started"
+#~ msgid "Getting Started"
+#~ msgstr "Gestartet"
+
 #, fuzzy, python-format
 #~| msgid "No users found for \"%(query)s\""
 #~ msgid "No users were found for \"%(query)s\""
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index c605c877..ab28a394 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-01 12:22-0700\n"
+"POT-Creation-Date: 2021-04-01 13:14-0700\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"
@@ -475,9 +475,10 @@ msgid "Published by %(publisher)s."
 msgstr ""
 
 #: bookwyrm/templates/components/inline_form.html:8
+#: bookwyrm/templates/components/modal.html:11
 #: bookwyrm/templates/feed/feed_layout.html:57
-#: bookwyrm/templates/get_started/layout.html:15
-#: bookwyrm/templates/get_started/layout.html:48
+#: bookwyrm/templates/get_started/layout.html:19
+#: bookwyrm/templates/get_started/layout.html:52
 msgid "Close"
 msgstr ""
 
@@ -887,28 +888,33 @@ msgstr ""
 msgid "Save &amp; continue"
 msgstr ""
 
-#: bookwyrm/templates/get_started/layout.html:13
-msgid "Getting Started"
+#: bookwyrm/templates/get_started/layout.html:14
+#, python-format
+msgid "Welcome to %(site_name)s!"
 msgstr ""
 
-#: bookwyrm/templates/get_started/layout.html:26
+#: bookwyrm/templates/get_started/layout.html:16
+msgid "These are some first steps to get you started."
+msgstr ""
+
+#: bookwyrm/templates/get_started/layout.html:30
 #: bookwyrm/templates/get_started/profile.html:6
 msgid "Create your profile"
 msgstr ""
 
-#: bookwyrm/templates/get_started/layout.html:30
+#: bookwyrm/templates/get_started/layout.html:34
 msgid "Add books"
 msgstr ""
 
-#: bookwyrm/templates/get_started/layout.html:34
+#: bookwyrm/templates/get_started/layout.html:38
 msgid "Find friends"
 msgstr ""
 
-#: bookwyrm/templates/get_started/layout.html:40
+#: bookwyrm/templates/get_started/layout.html:44
 msgid "Skip this step"
 msgstr ""
 
-#: bookwyrm/templates/get_started/layout.html:44
+#: bookwyrm/templates/get_started/layout.html:48
 msgid "Finish"
 msgstr ""
 
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 136d3cfe..c0fef650 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-01 12:22-0700\n"
+"POT-Creation-Date: 2021-04-01 13:14-0700\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -496,9 +496,10 @@ msgid "Published by %(publisher)s."
 msgstr ""
 
 #: bookwyrm/templates/components/inline_form.html:8
+#: bookwyrm/templates/components/modal.html:11
 #: bookwyrm/templates/feed/feed_layout.html:57
-#: bookwyrm/templates/get_started/layout.html:15
-#: bookwyrm/templates/get_started/layout.html:48
+#: bookwyrm/templates/get_started/layout.html:19
+#: bookwyrm/templates/get_started/layout.html:52
 msgid "Close"
 msgstr "Cerrar"
 
@@ -939,36 +940,40 @@ msgstr "No se encontró ningún libro"
 msgid "Save &amp; continue"
 msgstr ""
 
-#: bookwyrm/templates/get_started/layout.html:13
-#, fuzzy
-#| msgid "Started"
-msgid "Getting Started"
-msgstr "Empezado"
+#: bookwyrm/templates/get_started/layout.html:14
+#, fuzzy, python-format
+#| msgid "About %(site_name)s"
+msgid "Welcome to %(site_name)s!"
+msgstr "Sobre %(site_name)s"
 
-#: bookwyrm/templates/get_started/layout.html:26
+#: bookwyrm/templates/get_started/layout.html:16
+msgid "These are some first steps to get you started."
+msgstr ""
+
+#: bookwyrm/templates/get_started/layout.html:30
 #: bookwyrm/templates/get_started/profile.html:6
 #, fuzzy
 #| msgid "User Profile"
 msgid "Create your profile"
 msgstr "Perfil de usuario"
 
-#: bookwyrm/templates/get_started/layout.html:30
+#: bookwyrm/templates/get_started/layout.html:34
 #, fuzzy
 #| msgid "Add Books"
 msgid "Add books"
 msgstr "Agregar libros"
 
-#: bookwyrm/templates/get_started/layout.html:34
+#: bookwyrm/templates/get_started/layout.html:38
 #, fuzzy
 #| msgid "Friendly"
 msgid "Find friends"
 msgstr "Amigable"
 
-#: bookwyrm/templates/get_started/layout.html:40
+#: bookwyrm/templates/get_started/layout.html:44
 msgid "Skip this step"
 msgstr ""
 
-#: bookwyrm/templates/get_started/layout.html:44
+#: bookwyrm/templates/get_started/layout.html:48
 #, fuzzy
 #| msgid "Finished"
 msgid "Finish"
@@ -2733,6 +2738,11 @@ msgstr "Ya existe un usuario con ese nombre."
 msgid "A password reset link sent to %s"
 msgstr ""
 
+#, fuzzy
+#~| msgid "Started"
+#~ msgid "Getting Started"
+#~ msgstr "Empezado"
+
 #, fuzzy, python-format
 #~| msgid "No users found for \"%(query)s\""
 #~ msgid "No users were found for \"%(query)s\""
diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index db5adfd7..05ba96bb 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-01 12:22-0700\n"
+"POT-Creation-Date: 2021-04-01 13:14-0700\n"
 "PO-Revision-Date: 2021-03-02 12:37+0100\n"
 "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
@@ -508,9 +508,10 @@ msgid "Published by %(publisher)s."
 msgstr ""
 
 #: bookwyrm/templates/components/inline_form.html:8
+#: bookwyrm/templates/components/modal.html:11
 #: bookwyrm/templates/feed/feed_layout.html:57
-#: bookwyrm/templates/get_started/layout.html:15
-#: bookwyrm/templates/get_started/layout.html:48
+#: bookwyrm/templates/get_started/layout.html:19
+#: bookwyrm/templates/get_started/layout.html:52
 #, fuzzy
 #| msgid "Closed"
 msgid "Close"
@@ -962,36 +963,40 @@ msgstr "Aucun livre trouvé"
 msgid "Save &amp; continue"
 msgstr ""
 
-#: bookwyrm/templates/get_started/layout.html:13
-#, fuzzy
-#| msgid "Started"
-msgid "Getting Started"
-msgstr "Commencé"
+#: bookwyrm/templates/get_started/layout.html:14
+#, fuzzy, python-format
+#| msgid "Join %(name)s"
+msgid "Welcome to %(site_name)s!"
+msgstr "À propos de %(name)s"
 
-#: bookwyrm/templates/get_started/layout.html:26
+#: bookwyrm/templates/get_started/layout.html:16
+msgid "These are some first steps to get you started."
+msgstr ""
+
+#: bookwyrm/templates/get_started/layout.html:30
 #: bookwyrm/templates/get_started/profile.html:6
 #, fuzzy
 #| msgid "User Profile"
 msgid "Create your profile"
 msgstr "Profil"
 
-#: bookwyrm/templates/get_started/layout.html:30
+#: bookwyrm/templates/get_started/layout.html:34
 #, fuzzy
 #| msgid "Add Books"
 msgid "Add books"
 msgstr "Ajouter des livres"
 
-#: bookwyrm/templates/get_started/layout.html:34
+#: bookwyrm/templates/get_started/layout.html:38
 #, fuzzy
 #| msgid "Friendly"
 msgid "Find friends"
 msgstr "Sympa"
 
-#: bookwyrm/templates/get_started/layout.html:40
+#: bookwyrm/templates/get_started/layout.html:44
 msgid "Skip this step"
 msgstr ""
 
-#: bookwyrm/templates/get_started/layout.html:44
+#: bookwyrm/templates/get_started/layout.html:48
 #, fuzzy
 #| msgid "Finished"
 msgid "Finish"
@@ -2771,6 +2776,11 @@ msgstr ""
 msgid "A password reset link sent to %s"
 msgstr ""
 
+#, fuzzy
+#~| msgid "Started"
+#~ msgid "Getting Started"
+#~ msgstr "Commencé"
+
 #, fuzzy, python-format
 #~| msgid "No users found for \"%(query)s\""
 #~ msgid "No users were found for \"%(query)s\""
diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index fc255684..b05b8d27 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-01 12:22-0700\n"
+"POT-Creation-Date: 2021-04-01 13:14-0700\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"
@@ -479,9 +479,10 @@ msgid "Published by %(publisher)s."
 msgstr "由 %(publisher)s 出版。"
 
 #: bookwyrm/templates/components/inline_form.html:8
+#: bookwyrm/templates/components/modal.html:11
 #: bookwyrm/templates/feed/feed_layout.html:57
-#: bookwyrm/templates/get_started/layout.html:15
-#: bookwyrm/templates/get_started/layout.html:48
+#: bookwyrm/templates/get_started/layout.html:19
+#: bookwyrm/templates/get_started/layout.html:52
 msgid "Close"
 msgstr "关闭"
 
@@ -920,36 +921,40 @@ msgstr "没有找到书目"
 msgid "Save &amp; continue"
 msgstr ""
 
-#: bookwyrm/templates/get_started/layout.html:13
-#, fuzzy
-#| msgid "Started"
-msgid "Getting Started"
-msgstr "已开始"
+#: bookwyrm/templates/get_started/layout.html:14
+#, fuzzy, python-format
+#| msgid "About %(site_name)s"
+msgid "Welcome to %(site_name)s!"
+msgstr "关于 %(site_name)s"
 
-#: bookwyrm/templates/get_started/layout.html:26
+#: bookwyrm/templates/get_started/layout.html:16
+msgid "These are some first steps to get you started."
+msgstr ""
+
+#: bookwyrm/templates/get_started/layout.html:30
 #: bookwyrm/templates/get_started/profile.html:6
 #, fuzzy
 #| msgid "View user profile"
 msgid "Create your profile"
 msgstr "查看用户个人资料"
 
-#: bookwyrm/templates/get_started/layout.html:30
+#: bookwyrm/templates/get_started/layout.html:34
 #, fuzzy
 #| msgid "Add Books"
 msgid "Add books"
 msgstr "添加书目"
 
-#: bookwyrm/templates/get_started/layout.html:34
+#: bookwyrm/templates/get_started/layout.html:38
 #, fuzzy
 #| msgid "Friendly"
 msgid "Find friends"
 msgstr "�好"
 
-#: bookwyrm/templates/get_started/layout.html:40
+#: bookwyrm/templates/get_started/layout.html:44
 msgid "Skip this step"
 msgstr ""
 
-#: bookwyrm/templates/get_started/layout.html:44
+#: bookwyrm/templates/get_started/layout.html:48
 #, fuzzy
 #| msgid "Finished"
 msgid "Finish"
@@ -2689,6 +2694,11 @@ msgstr "已�存在使用该用户�的用户。"
 msgid "A password reset link sent to %s"
 msgstr ""
 
+#, fuzzy
+#~| msgid "Started"
+#~ msgid "Getting Started"
+#~ msgstr "已开始"
+
 #, fuzzy, python-format
 #~| msgid "No users found for \"%(query)s\""
 #~ msgid "No users were found for \"%(query)s\""

From b5e98e0bdf360fe1b3df769e2f64f3a8965c798d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 13:41:08 -0700
Subject: [PATCH 0574/1285] Make invite requests sort-able

---
 .../templates/settings/manage_invite_requests.html    | 11 +++++++++--
 bookwyrm/views/invite.py                              |  8 +++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/settings/manage_invite_requests.html b/bookwyrm/templates/settings/manage_invite_requests.html
index 7a7088d9..76c1a609 100644
--- a/bookwyrm/templates/settings/manage_invite_requests.html
+++ b/bookwyrm/templates/settings/manage_invite_requests.html
@@ -27,10 +27,17 @@
     </h2>
 
     <table class="table is-striped">
+        {% url 'settings-invite-requests' as url %}
         <tr>
-            <th>{% trans "Date" %}</th>
+            <th>
+                {% trans "Date" as text %}
+                {% include 'snippets/table-sort-header.html' with field="created_date" sort=sort text=text %}
+            </th>
             <th>{% trans "Email" %}</th>
-            <th>{% trans "Status" %}</th>
+            <th>
+                {% trans "Status" as text %}
+                {% include 'snippets/table-sort-header.html' with field="invite__times_used" sort=sort text=text %}
+            </th>
             <th>{% trans "Action" %}</th>
         </tr>
         {% if not requests %}
diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/invite.py
index 49b5c91b..a99a7de0 100644
--- a/bookwyrm/views/invite.py
+++ b/bookwyrm/views/invite.py
@@ -92,9 +92,14 @@ class ManageInviteRequests(View):
         except ValueError:
             page = 1
 
+        sort = request.GET.get("sort")
+        sort_fields = ["created_date", "invite__times_used"]
+        if not sort in sort_fields + ["-{:s}".format(f) for f in sort_fields]:
+            sort = "-created_date"
+
         paginated = Paginator(
             models.InviteRequest.objects.filter(ignored=ignored).order_by(
-                "-created_date"
+                sort
             ),
             PAGE_LENGTH,
         )
@@ -103,6 +108,7 @@ class ManageInviteRequests(View):
             "ignored": ignored,
             "count": paginated.count,
             "requests": paginated.page(page),
+            "sort": sort,
         }
         return TemplateResponse(request, "settings/manage_invite_requests.html", data)
 

From 8039917b891ffffc2aa60ecc9adda6439c17a82a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 13:55:10 -0700
Subject: [PATCH 0575/1285] Preserve get params on invite send

---
 .../templates/settings/manage_invite_requests.html  |  2 +-
 bookwyrm/views/invite.py                            | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/templates/settings/manage_invite_requests.html b/bookwyrm/templates/settings/manage_invite_requests.html
index 76c1a609..23c64002 100644
--- a/bookwyrm/templates/settings/manage_invite_requests.html
+++ b/bookwyrm/templates/settings/manage_invite_requests.html
@@ -57,7 +57,7 @@
                 {% endif %}
             </td>
             <td class="field is-grouped">
-                <form name="send-invite" method="post" action="{% url 'settings-invite-requests' %}">
+                <form name="send-invite" method="post">
                     {% csrf_token %}
                     <input type="hidden" name="invite-request" value="{{ req.id }}">
                     {% if not req.invite %}
diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/invite.py
index a99a7de0..1f5492c6 100644
--- a/bookwyrm/views/invite.py
+++ b/bookwyrm/views/invite.py
@@ -1,9 +1,12 @@
 """ invites when registration is closed """
+from urllib.parse import urlencode
+
 from django.contrib.auth.decorators import login_required, permission_required
 from django.core.paginator import Paginator
 from django.http import HttpResponseBadRequest
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
+from django.urls import reverse
 from django.utils.decorators import method_decorator
 from django.views import View
 from django.views.decorators.http import require_POST
@@ -98,9 +101,7 @@ class ManageInviteRequests(View):
             sort = "-created_date"
 
         paginated = Paginator(
-            models.InviteRequest.objects.filter(ignored=ignored).order_by(
-                sort
-            ),
+            models.InviteRequest.objects.filter(ignored=ignored).order_by(sort),
             PAGE_LENGTH,
         )
 
@@ -125,7 +126,11 @@ class ManageInviteRequests(View):
             )
             invite_request.save()
         emailing.invite_email(invite_request)
-        return redirect("settings-invite-requests")
+        return redirect(
+            "{:s}?{:s}".format(
+                reverse("settings-invite-requests"), urlencode(request.GET.dict())
+            )
+        )
 
 
 class InviteRequest(View):

From b62989b5a8c68b21da13dffdd4deb97466ff463d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 14:14:17 -0700
Subject: [PATCH 0576/1285] Adds invite request filters

---
 .../settings/manage_invite_requests.html      |  2 ++
 bookwyrm/views/invite.py                      | 25 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/settings/manage_invite_requests.html b/bookwyrm/templates/settings/manage_invite_requests.html
index 23c64002..03ddd210 100644
--- a/bookwyrm/templates/settings/manage_invite_requests.html
+++ b/bookwyrm/templates/settings/manage_invite_requests.html
@@ -26,6 +26,8 @@
         {% endif %} ({{ count }})
     </h2>
 
+    {% include 'settings/invite_request_filters.html' %}
+
     <table class="table is-striped">
         {% url 'settings-invite-requests' as url %}
         <tr>
diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/invite.py
index 1f5492c6..0be48675 100644
--- a/bookwyrm/views/invite.py
+++ b/bookwyrm/views/invite.py
@@ -1,8 +1,11 @@
 """ invites when registration is closed """
+from functools import reduce
+import operator
 from urllib.parse import urlencode
 
 from django.contrib.auth.decorators import login_required, permission_required
 from django.core.paginator import Paginator
+from django.db.models import Q
 from django.http import HttpResponseBadRequest
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
@@ -100,8 +103,28 @@ class ManageInviteRequests(View):
         if not sort in sort_fields + ["-{:s}".format(f) for f in sort_fields]:
             sort = "-created_date"
 
+        requests = models.InviteRequest.objects.filter(ignored=ignored).order_by(sort)
+
+        status_filters = [
+            s
+            for s in request.GET.getlist("status")
+            if s in ["requested", "sent", "accepted"]
+        ]
+
+        filters = []
+        if "requested" in status_filters:
+            filters.append({"invite__isnull": True})
+        if "sent" in status_filters:
+            filters.append({"invite__isnull": False})
+        if "accepted" in status_filters:
+            filters.append({"invite__isnull": False, "invite__times_used__gte": 1})
+
+        requests = requests.filter(
+            reduce(operator.or_, (Q(**f) for f in filters))
+        ).distinct()
+
         paginated = Paginator(
-            models.InviteRequest.objects.filter(ignored=ignored).order_by(sort),
+            requests,
             PAGE_LENGTH,
         )
 

From fc31b3e0b054cbba19e661986716ae30577fcec7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 14:22:01 -0700
Subject: [PATCH 0577/1285] Fixes invite requests page with no filters

---
 bookwyrm/views/invite.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/invite.py
index 0be48675..665f98ce 100644
--- a/bookwyrm/views/invite.py
+++ b/bookwyrm/views/invite.py
@@ -119,9 +119,10 @@ class ManageInviteRequests(View):
         if "accepted" in status_filters:
             filters.append({"invite__isnull": False, "invite__times_used__gte": 1})
 
-        requests = requests.filter(
-            reduce(operator.or_, (Q(**f) for f in filters))
-        ).distinct()
+        if filters:
+            requests = requests.filter(
+                reduce(operator.or_, (Q(**f) for f in filters))
+            ).distinct()
 
         paginated = Paginator(
             requests,

From ec8eb01a0fbcac04ffc3b2576d8fcb5a007f0b4e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 14:36:18 -0700
Subject: [PATCH 0578/1285] Adds missing templates

---
 .../settings/invite_request_filters.html      |  6 ++++++
 .../templates/settings/status_filter.html     | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 bookwyrm/templates/settings/invite_request_filters.html
 create mode 100644 bookwyrm/templates/settings/status_filter.html

diff --git a/bookwyrm/templates/settings/invite_request_filters.html b/bookwyrm/templates/settings/invite_request_filters.html
new file mode 100644
index 00000000..c55cc069
--- /dev/null
+++ b/bookwyrm/templates/settings/invite_request_filters.html
@@ -0,0 +1,6 @@
+{% extends 'snippets/filters_panel/filters_panel.html' %}
+
+{% block filter_fields %}
+{% include 'settings/status_filter.html' %}
+{% endblock %}
+
diff --git a/bookwyrm/templates/settings/status_filter.html b/bookwyrm/templates/settings/status_filter.html
new file mode 100644
index 00000000..08df29f5
--- /dev/null
+++ b/bookwyrm/templates/settings/status_filter.html
@@ -0,0 +1,19 @@
+{% extends 'snippets/filters_panel/filter_field.html' %}
+{% load i18n %}
+
+{% block filter %}
+<legend class="label">{% trans "Status" %}</legend>
+<label class="is-block">
+    <input type="checkbox" class="checkbox" name="status" value="requested" {% if not request.GET.status or "requested" in request.GET.status %}checked{% endif %}>
+    {% trans "Requested" %}
+</label>
+<label class="is-block">
+    <input type="checkbox" class="checkbox" name="status" value="sent" {% if not request.GET.status or "sent" in request.GET.status %}checked{% endif %}>
+    {% trans "Sent" %}
+</label>
+<label class="is-block">
+    <input type="checkbox" class="checkbox" name="status" value="accepted" {% if not request.GET.status or "accepted" in request.GET.status %}checked{% endif %}>
+    {% trans "Accepted" %}
+</label>
+{% endblock %}
+

From 8ea60c66a3a0c13830ab59fbd6802a7a0308acc9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 17:02:45 -0700
Subject: [PATCH 0579/1285] Create connectors to federated bookwyrm servers

This got messed up when I refactored how connectors work! Poor
bookwyrm.social doesn't have a wyrms.de connector, but this will fix
that.
---
 bookwyrm/connectors/connector_manager.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/connectors/connector_manager.py b/bookwyrm/connectors/connector_manager.py
index 853609de..caf6bcbe 100644
--- a/bookwyrm/connectors/connector_manager.py
+++ b/bookwyrm/connectors/connector_manager.py
@@ -3,6 +3,9 @@ import importlib
 import re
 from urllib.parse import urlparse
 
+from django.dispatch import receiver
+from django.db.models import signals
+
 from requests import HTTPError
 
 from bookwyrm import models
@@ -44,6 +47,7 @@ def search(query, min_confidence=0.1):
             except (HTTPError, ConnectorException):
                 continue
 
+        # if the search results look the same, ignore them
         result_set = [r for r in result_set if dedup_slug(r) not in result_index]
         # `|=` concats two sets. WE ARE GETTING FANCY HERE
         result_index |= set(dedup_slug(r) for r in result_set)
@@ -85,7 +89,7 @@ def get_connectors():
 
 
 def get_or_create_connector(remote_id):
-    """ get the connector related to the author's server """
+    """ get the connector related to the object's server """
     url = urlparse(remote_id)
     identifier = url.netloc
     if not identifier:
@@ -122,3 +126,11 @@ def load_connector(connector_info):
         "bookwyrm.connectors.%s" % connector_info.connector_file
     )
     return connector.Connector(connector_info.identifier)
+
+
+@receiver(signals.post_save, sender="bookwyrm.FederatedServer")
+# pylint: disable=unused-argument
+def create_connector(sender, instance, created, *args, **kwargs):
+    """ create a connector to an external bookwyrm server """
+    if instance.application_type == "bookwyrm":
+        get_or_create_connector("https://{:s}".format(instance.server_name))

From 634509a7f308cbaebf20ed3a349ac5062f0b0d2c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 17:19:29 -0700
Subject: [PATCH 0580/1285] Associate users with their invites

---
 .../migrations/0060_siteinvite_invitees.py    | 21 +++++++++++++++++++
 bookwyrm/models/site.py                       |  1 +
 bookwyrm/views/authentication.py              |  1 +
 3 files changed, 23 insertions(+)
 create mode 100644 bookwyrm/migrations/0060_siteinvite_invitees.py

diff --git a/bookwyrm/migrations/0060_siteinvite_invitees.py b/bookwyrm/migrations/0060_siteinvite_invitees.py
new file mode 100644
index 00000000..acd00977
--- /dev/null
+++ b/bookwyrm/migrations/0060_siteinvite_invitees.py
@@ -0,0 +1,21 @@
+# Generated by Django 3.1.6 on 2021-04-02 00:14
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0059_user_preferred_timezone"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="siteinvite",
+            name="invitees",
+            field=models.ManyToManyField(
+                related_name="invitees", to=settings.AUTH_USER_MODEL
+            ),
+        ),
+    ]
diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py
index c3c1d8a4..1eb31869 100644
--- a/bookwyrm/models/site.py
+++ b/bookwyrm/models/site.py
@@ -58,6 +58,7 @@ class SiteInvite(models.Model):
     use_limit = models.IntegerField(blank=True, null=True)
     times_used = models.IntegerField(default=0)
     user = models.ForeignKey(User, on_delete=models.CASCADE)
+    invitees = models.ManyToManyField(User, related_name="invitees")
 
     def valid(self):
         """ make sure it hasn't expired or been used """
diff --git a/bookwyrm/views/authentication.py b/bookwyrm/views/authentication.py
index eef5c79f..22689a28 100644
--- a/bookwyrm/views/authentication.py
+++ b/bookwyrm/views/authentication.py
@@ -108,6 +108,7 @@ class Register(View):
         )
         if invite:
             invite.times_used += 1
+            invite.invitees.add(user)
             invite.save()
 
         login(request, user)

From 62bd744b69ae7294d00c8e76c64ab25bcb7f2758 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 17:38:53 -0700
Subject: [PATCH 0581/1285] Sort and filter mutually respect each other

---
 bookwyrm/templates/snippets/filters_panel/filters_panel.html | 5 ++++-
 bookwyrm/templates/snippets/table-sort-header.html           | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/snippets/filters_panel/filters_panel.html b/bookwyrm/templates/snippets/filters_panel/filters_panel.html
index 185f5bc4..8c178860 100644
--- a/bookwyrm/templates/snippets/filters_panel/filters_panel.html
+++ b/bookwyrm/templates/snippets/filters_panel/filters_panel.html
@@ -11,7 +11,10 @@
         </span>
     </h2>
 
-    <form class="hidden mt-3" id="filters" method-"get" action="{{ request.path }}" tabindex="0">
+    <form class="hidden mt-3" id="filters" method="get" action="{{ request.path }}" tabindex="0">
+        {% if sort %}
+        <input type="hidden" name="sort" value="{{ sort }}">
+        {% endif %}
         <div class="columns">
             {% block filter_fields %}
             {% endblock %}
diff --git a/bookwyrm/templates/snippets/table-sort-header.html b/bookwyrm/templates/snippets/table-sort-header.html
index ae54f415..f016b4e2 100644
--- a/bookwyrm/templates/snippets/table-sort-header.html
+++ b/bookwyrm/templates/snippets/table-sort-header.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-<a href="{{ url }}?sort={% if sort == field %}-{% endif %}{{ field }}">
+<a href="{{ url }}?sort={% if sort == field %}-{% endif %}{{ field }}{% for k, v in request.GET.items %}{% if k != "sort" %}&{{ k }}={{ v }}{% endif %}{% endfor %}">
     {{ text }}
     {% if sort == field %}
     <span class="icon icon-arrow-up">

From b9bff315625c42d64109e84583c3011192e2c459 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 18:00:39 -0700
Subject: [PATCH 0582/1285] Show accepter in invite request view

---
 .../templates/settings/manage_invite_requests.html    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/settings/manage_invite_requests.html b/bookwyrm/templates/settings/manage_invite_requests.html
index 03ddd210..f28118bf 100644
--- a/bookwyrm/templates/settings/manage_invite_requests.html
+++ b/bookwyrm/templates/settings/manage_invite_requests.html
@@ -59,6 +59,8 @@
                 {% endif %}
             </td>
             <td class="field is-grouped">
+                {# no invite OR invite not yet used #}
+                {% if not req.invite.times_used %}
                 <form name="send-invite" method="post">
                     {% csrf_token %}
                     <input type="hidden" name="invite-request" value="{{ req.id }}">
@@ -68,9 +70,16 @@
                     <button type="submit" class="button is-link is-light is-small">{% trans "Re-send invite" %}</button>
                     {% endif %}
                 </form>
+                {% endif %}
 
+                {# invite created but not used #}
                 {% if req.invite and not req.invite.times_used %}
                 {# <button class="button is-danger is-light is-small">{% trans "Revoke invite" %}</button> #}
+                {% elif req.invite %}
+                {# accepted #}
+                {% if req.invite.invitees.exists %}
+                <a href="{{ req.invite.invitees.first.local_path }}">@{{ req.invite.invitees.first.localname }}</a>
+                {% endif %}
                 {% else %}
                 <form name="ignore-request" method="post" action="{% url 'settings-invite-requests-ignore' %}">
                     {% csrf_token %}
@@ -78,7 +87,7 @@
                     {% if not req.ignored %}
                     <button type="submit" class="button is-danger is-light is-small">{% trans "Ignore" %}</button>
                     {% else %}
-                    <button type="submit" class="button is-danger is-light is-small">{% trans "Un-gnore" %}</button>
+                    <button type="submit" class="button is-danger is-light is-small">{% trans "Un-ignore" %}</button>
                     {% endif %}
                 </form>
                 {% endif %}

From 642c41353e7e4c43d2fc4ce0240b9c7f1ccba4df Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 19:25:37 -0700
Subject: [PATCH 0583/1285] Removes redundant link to profile from dropdown

---
 bookwyrm/templates/layout.html | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 0937fcc3..80eb386a 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -87,11 +87,6 @@
                             {% trans "Direct Messages" %}
                         </a>
                     </li>
-                    <li>
-                        <a href="{{ request.user.local_path }}" class="navbar-item">
-                            {% trans 'Profile' %}
-                        </a>
-                    </li>
                     <li>
                         <a href="{% url 'directory' %}" class="navbar-item">
                             {% trans 'Directory' %}

From 97192d3296ca0a948dc5aebd57ec45fdbecd8e35 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 19:33:46 -0700
Subject: [PATCH 0584/1285] Changes orientation of move book menu on shelf page

---
 bookwyrm/templates/user/shelf.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bookwyrm/templates/user/shelf.html b/bookwyrm/templates/user/shelf.html
index d1de6e00..0732327b 100644
--- a/bookwyrm/templates/user/shelf.html
+++ b/bookwyrm/templates/user/shelf.html
@@ -111,12 +111,14 @@
             {% endif %}
             {% if shelf.user == request.user %}
             <td>
+                {% with right=True %}
                 {% if not shelf.id %}
                 {% active_shelf book as current %}
                 {% include 'snippets/shelf_selector.html' with current=current.shelf class="is-small" %}
                 {% else %}
                 {% include 'snippets/shelf_selector.html' with current=shelf class="is-small" %}
                 {% endif %}
+                {% endwith %}
             </td>
             {% endif %}
         </tr>

From 265c2f8d9d6103dfe500ba165cbec4c296643783 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 19:41:01 -0700
Subject: [PATCH 0585/1285] Show current shelf in move menu

---
 bookwyrm/templates/snippets/shelf_selector.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/bookwyrm/templates/snippets/shelf_selector.html b/bookwyrm/templates/snippets/shelf_selector.html
index edc291e0..0be4465f 100644
--- a/bookwyrm/templates/snippets/shelf_selector.html
+++ b/bookwyrm/templates/snippets/shelf_selector.html
@@ -7,17 +7,15 @@
 
 {% block dropdown-list %}
 {% for shelf in request.user.shelf_set.all %}
-{% if shelf.identifier != current.identifier %}
 <li role="menuitem">
     <form class="dropdown-item pt-0 pb-0" name="shelve" action="/shelve/" method="post">
         {% csrf_token %}
         <input type="hidden" name="book" value="{{ book.id }}">
         <input type="hidden" name="change-shelf-from" value="{{ current.identifier }}">
         <input type="hidden" name="shelf" value="{{ shelf.identifier }}">
-        <button class="button is-fullwidth is-small" type="submit">{{ shelf.name }}</button>
+        <button class="button is-fullwidth is-small shelf-option" type="submit" {% if shelf.identifier == current.identifier %}disabled{% endif %}><span>{{ shelf.name }}</span></button>
     </form>
 </li>
-{% endif %}
 {% endfor %}
 <li class="navbar-divider" role="presentation"></li>
 <li>

From 15711bdae2f99d48dadd7e3d87a6610f6f1c1183 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 19:45:38 -0700
Subject: [PATCH 0586/1285] Fixes display of empty cell in invites table

---
 bookwyrm/templates/settings/manage_invite_requests.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bookwyrm/templates/settings/manage_invite_requests.html b/bookwyrm/templates/settings/manage_invite_requests.html
index f28118bf..63730893 100644
--- a/bookwyrm/templates/settings/manage_invite_requests.html
+++ b/bookwyrm/templates/settings/manage_invite_requests.html
@@ -79,6 +79,8 @@
                 {# accepted #}
                 {% if req.invite.invitees.exists %}
                 <a href="{{ req.invite.invitees.first.local_path }}">@{{ req.invite.invitees.first.localname }}</a>
+                {% else %}
+                &nbsp;
                 {% endif %}
                 {% else %}
                 <form name="ignore-request" method="post" action="{% url 'settings-invite-requests-ignore' %}">

From 732c7a190bca578a02872dccf41da5685baae764 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 19:51:29 -0700
Subject: [PATCH 0587/1285] Don't show pending folloq requests in suggestions

---
 bookwyrm/views/feed.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index 9f56dae5..a1040d54 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -39,6 +39,7 @@ class Feed(View):
                 request.user,
                 ~Q(id=request.user.id),
                 ~Q(followers=request.user),
+                ~Q(follower_requests=request.user),
                 bookwyrm_user=True,
             )
             .order_by("-mutuals", "-last_active_date")

From 7121b74a6e1d7af2f9204c7d55769330b5a5b38d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 19:56:53 -0700
Subject: [PATCH 0588/1285] Helper for suggested users panel

---
 bookwyrm/views/directory.py   |  4 ++--
 bookwyrm/views/feed.py        | 12 +-----------
 bookwyrm/views/get_started.py | 13 ++-----------
 bookwyrm/views/helpers.py     | 16 +++++++++++++++-
 4 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/bookwyrm/views/directory.py b/bookwyrm/views/directory.py
index b329eede..9504734e 100644
--- a/bookwyrm/views/directory.py
+++ b/bookwyrm/views/directory.py
@@ -6,7 +6,7 @@ from django.template.response import TemplateResponse
 from django.views import View
 from django.utils.decorators import method_decorator
 
-from .helpers import get_suggested_users
+from .helpers import get_annotated_users
 
 # pylint: disable=no-self-use
 @method_decorator(login_required, name="dispatch")
@@ -29,7 +29,7 @@ class Directory(View):
         if scope == "local":
             filters["local"] = True
 
-        users = get_suggested_users(request.user, **filters)
+        users = get_annotated_users(request.user, **filters)
         sort = request.GET.get("sort")
         if sort == "recent":
             users = users.order_by("-last_active_date")
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index a1040d54..e4be50e3 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -34,17 +34,7 @@ class Feed(View):
 
         paginated = Paginator(activities, PAGE_LENGTH)
 
-        suggested_users = (
-            get_suggested_users(
-                request.user,
-                ~Q(id=request.user.id),
-                ~Q(followers=request.user),
-                ~Q(follower_requests=request.user),
-                bookwyrm_user=True,
-            )
-            .order_by("-mutuals", "-last_active_date")
-            .all()[:5]
-        )
+        suggested_users = get_suggested_users(request.user)
 
         data = {
             **feed_page_data(request.user),
diff --git a/bookwyrm/views/get_started.py b/bookwyrm/views/get_started.py
index e64333df..e542c00b 100644
--- a/bookwyrm/views/get_started.py
+++ b/bookwyrm/views/get_started.py
@@ -120,17 +120,8 @@ class GetStartedUsers(View):
         )
 
         if user_results.count() < 5:
-            suggested_users = (
-                get_suggested_users(
-                    request.user,
-                    ~Q(id=request.user.id),
-                    ~Q(followers=request.user),
-                    ~Q(id__in=user_results),
-                    bookwyrm_user=True,
-                )
-                .order_by("shared_books", "-mutuals", "-last_active_date")
-                .all()[: 5 - user_results.count()]
-            )
+            suggested_users = get_suggested_users(request.user)
+
         data = {
             "suggested_users": list(user_results) + list(suggested_users),
         }
diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index 006c6494..738936b0 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -192,7 +192,21 @@ def get_discover_books():
     )
 
 
-def get_suggested_users(user, *args, **kwargs):
+def get_suggested_users(user):
+    """ bookwyrm users you don't already know """
+    return (
+        get_annotated_users(
+            user,
+            ~Q(id=user.id),
+            ~Q(followers=user),
+            ~Q(follower_requests=user),
+            bookwyrm_user=True,
+        )
+        .order_by("-mutuals", "-last_active_date")
+        .all()[:5]
+    )
+
+def get_annotated_users(user, *args, **kwargs):
     """ Users, annotated with things they have in common """
     return (
         models.User.objects.filter(discoverable=True, is_active=True, *args, **kwargs)

From 34a32032c9a315193ff6b7e0e1530ac5c5285c68 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 20:01:09 -0700
Subject: [PATCH 0589/1285] Align suggested users when there are fewer than 5

---
 bookwyrm/templates/feed/suggested_users.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/feed/suggested_users.html b/bookwyrm/templates/feed/suggested_users.html
index f66662e8..721ba3d9 100644
--- a/bookwyrm/templates/feed/suggested_users.html
+++ b/bookwyrm/templates/feed/suggested_users.html
@@ -3,7 +3,7 @@
 {% load humanize %}
 <div class="columns is-mobile scroll-x mb-0">
     {% for user in suggested_users %}
-    <div class="column is-flex">
+    <div class="column is-flex is-flex-grow-0">
         <div class="box has-text-centered is-shadowless has-background-white-bis m-0">
             <a href="{{ user.local_path }}" class="has-text-black">
                 {% include 'snippets/avatar.html' with user=user large=True %}

From fdfbf2974440d5604f13f09b3ac92daa1635c88b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 20:22:42 -0700
Subject: [PATCH 0590/1285] i18n for "page x of y"

---
 bookwyrm/templates/snippets/page_text.html   |  7 +++++++
 bookwyrm/templates/snippets/readthrough.html | 16 +++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 bookwyrm/templates/snippets/page_text.html

diff --git a/bookwyrm/templates/snippets/page_text.html b/bookwyrm/templates/snippets/page_text.html
new file mode 100644
index 00000000..dc7a6a33
--- /dev/null
+++ b/bookwyrm/templates/snippets/page_text.html
@@ -0,0 +1,7 @@
+{% load humanize %}
+{% load i18n %}
+{% if total_pages %}
+{% blocktrans with page=page|intcomma total_pages=total_pages|intcomma %}page {{ page }} of {{ total_pages }}{% endblocktrans %}
+{% else %}
+{% blocktrans with page=page|intcomma %}page {{ page }}{% endblocktrans %}
+{% endif %}
diff --git a/bookwyrm/templates/snippets/readthrough.html b/bookwyrm/templates/snippets/readthrough.html
index 3e694f61..76611862 100644
--- a/bookwyrm/templates/snippets/readthrough.html
+++ b/bookwyrm/templates/snippets/readthrough.html
@@ -9,8 +9,18 @@
                 </dl>
                 <ul>
                     {% if readthrough.finish_date or readthrough.progress %}
-                    <li>{% if readthrough.finish_date %} {{ readthrough.finish_date | localtime | naturalday }}: {% trans "finished" %} {% else %}{% if readthrough.progress_mode == 'PG' %}on page {{ readthrough.progress }}{% if book.pages %} of {{ book.pages }}{% endif %}
-                        {% else %}{{ readthrough.progress }}%{% endif %}{% endif %}
+                    <li>
+                        {% if readthrough.finish_date %}
+                        {{ readthrough.finish_date | localtime | naturalday }}: {% trans "finished" %}
+                        {% else %}
+
+                        {% if readthrough.progress_mode == 'PG' %}
+                        {% include 'snippets/page_text.html' with page=readthrough.progress total_pages=book.pages %}
+                        {% else %}
+                        {{ readthrough.progress }}%
+                        {% endif %}
+                        {% endif %}
+
                         {% if readthrough.progress %}
                         {% trans "Show all updates" as button_text %}
                         {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="updates" controls_uid=readthrough.id class="is-small" %}
@@ -21,7 +31,7 @@
                                     {% csrf_token %}
                                     {{ progress_update.created_date | naturalday }}:
                                     {% if progress_update.mode == 'PG' %}
-                                    page {{ progress_update.progress }} of {{ book.pages }}
+                                    {% include 'snippets/page_text.html' with page=progress_update.progress total_pages=book.pages %}
                                     {% else %}
                                     {{ progress_update.progress }}%
                                     {% endif %}

From 86b519b844ab139ea95817622702fc1fda0d5602 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 20:28:08 -0700
Subject: [PATCH 0591/1285] Uses translates pages snippet for progress note on
 statuses

---
 bookwyrm/templates/snippets/status/status_header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html
index dc112f4d..818c7237 100644
--- a/bookwyrm/templates/snippets/status/status_header.html
+++ b/bookwyrm/templates/snippets/status/status_header.html
@@ -38,6 +38,6 @@
 
 {% if status.progress %}
 <p class="help">
-    ({% if status.progress_mode == 'PG' %}page {{ status.progress }}{%else %}{{ status.progress }}%{% endif %})
+({% if status.progress_mode == 'PG' %}{% include 'snippets/page_text.html' with page=status.progress total_pages=status.book.pages %}{% else %}{{ status.progress }}%{% endif %})
 </p>
 {% endif %}

From de16dd75c6223fe8b20e67096b2490e7efcb4450 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 20:30:50 -0700
Subject: [PATCH 0592/1285] Python formatting

---
 bookwyrm/views/helpers.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index 738936b0..75c5da8f 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -206,6 +206,7 @@ def get_suggested_users(user):
         .all()[:5]
     )
 
+
 def get_annotated_users(user, *args, **kwargs):
     """ Users, annotated with things they have in common """
     return (

From 29792080a9fd983d407617fe5a284e8d2894d8c9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 1 Apr 2021 20:40:28 -0700
Subject: [PATCH 0593/1285] Don't create notifications when deleting statuses

---
 bookwyrm/models/status.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index 8038e3ee..360288e9 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -71,6 +71,7 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
 
         if self.deleted:
             notification_model.objects.filter(related_status=self).delete()
+            return
 
         if (
             self.reply_parent

From e84a07430c3179722370df205167b4b41ae53ec4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 2 Apr 2021 07:11:35 -0700
Subject: [PATCH 0594/1285] Fixes books get started view error

---
 bookwyrm/views/get_started.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/views/get_started.py b/bookwyrm/views/get_started.py
index e64333df..9d7600ee 100644
--- a/bookwyrm/views/get_started.py
+++ b/bookwyrm/views/get_started.py
@@ -53,7 +53,7 @@ class GetStartedBooks(View):
     def get(self, request):
         """ info about a book """
         query = request.GET.get("query")
-        book_results = []
+        book_results = popular_books = []
         if query:
             book_results = connector_manager.local_search(query, raw=True)[:5]
         if len(book_results) < 5:

From ae1ebecc76947606d7c0eef312b55aadffb18f26 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 2 Apr 2021 07:31:11 -0700
Subject: [PATCH 0595/1285] Fixes tests for suggested/annotated users

---
 bookwyrm/tests/views/test_helpers.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py
index a9dadcad..c646b4b4 100644
--- a/bookwyrm/tests/views/test_helpers.py
+++ b/bookwyrm/tests/views/test_helpers.py
@@ -247,7 +247,7 @@ class ViewsHelpers(TestCase):
         )
         self.assertFalse(views.helpers.object_visible_to_user(self.local_user, obj))
 
-    def test_get_suggested_users(self, _):
+    def test_get_annotated_users(self, _):
         """ list of people you might know """
         user_1 = models.User.objects.create_user(
             "nutria@local.com",
@@ -279,7 +279,7 @@ class ViewsHelpers(TestCase):
                 user=user_1, book=self.book, shelf=user_1.shelf_set.first()
             )
 
-        result = views.helpers.get_suggested_users(self.local_user)
+        result = views.helpers.get_annotated_users(self.local_user)
         self.assertEqual(result.count(), 3)
         self.assertTrue(user_1 in result)
         self.assertFalse(user_2 in result)
@@ -294,7 +294,7 @@ class ViewsHelpers(TestCase):
         self.assertEqual(remote_user_annotated.mutuals, 0)
         self.assertEqual(remote_user_annotated.shared_books, 0)
 
-    def test_get_suggested_users_counts(self, _):
+    def test_get_annotated_users_counts(self, _):
         """ correct counting for multiple shared attributed """
         user_1 = models.User.objects.create_user(
             "nutria@local.com",
@@ -330,7 +330,7 @@ class ViewsHelpers(TestCase):
                     user=user_1, book=book, shelf=user_1.shelf_set.first()
                 )
 
-        result = views.helpers.get_suggested_users(
+        result = views.helpers.get_annotated_users(
             self.local_user,
             ~Q(id=self.local_user.id),
             ~Q(followers=self.local_user),

From 2174ea11ececa262e62fc141d8655120a6daff93 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 2 Apr 2021 07:33:36 -0700
Subject: [PATCH 0596/1285] Makes user to_activity serializer args consistent

---
 bookwyrm/models/user.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 5ef0934c..f951ee45 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -182,10 +182,10 @@ class User(OrderedCollectionPageMixin, AbstractUser):
             **kwargs
         )
 
-    def to_activity(self):
+    def to_activity(self, **kwargs):
         """override default AP serializer to add context object
         idk if this is the best way to go about this"""
-        activity_object = super().to_activity()
+        activity_object = super().to_activity(**kwargs)
         activity_object["@context"] = [
             "https://www.w3.org/ns/activitystreams",
             "https://w3id.org/security/v1",
@@ -293,10 +293,10 @@ class KeyPair(ActivitypubMixin, BookWyrmModel):
             self.private_key, self.public_key = create_key_pair()
         return super().save(*args, **kwargs)
 
-    def to_activity(self):
+    def to_activity(self, **kwargs):
         """override default AP serializer to add context object
         idk if this is the best way to go about this"""
-        activity_object = super().to_activity()
+        activity_object = super().to_activity(**kwargs)
         del activity_object["@context"]
         del activity_object["type"]
         return activity_object

From 45d229d712f36704d39a7a1af5b1f19523466d10 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 2 Apr 2021 07:35:56 -0700
Subject: [PATCH 0597/1285] Makes outbox an optional field on the user table

---
 bookwyrm/activitypub/person.py                |  2 +-
 .../migrations/0061_auto_20210402_1435.py     | 24 +++++++++++++++++++
 bookwyrm/models/user.py                       |  4 ++--
 3 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 bookwyrm/migrations/0061_auto_20210402_1435.py

diff --git a/bookwyrm/activitypub/person.py b/bookwyrm/activitypub/person.py
index dafd1910..ed2ae80b 100644
--- a/bookwyrm/activitypub/person.py
+++ b/bookwyrm/activitypub/person.py
@@ -21,9 +21,9 @@ class Person(ActivityObject):
 
     preferredUsername: str
     inbox: str
-    outbox: str
     followers: str
     publicKey: PublicKey
+    outbox: str = None
     endpoints: Dict = None
     name: str = None
     summary: str = None
diff --git a/bookwyrm/migrations/0061_auto_20210402_1435.py b/bookwyrm/migrations/0061_auto_20210402_1435.py
new file mode 100644
index 00000000..a6899aa3
--- /dev/null
+++ b/bookwyrm/migrations/0061_auto_20210402_1435.py
@@ -0,0 +1,24 @@
+# Generated by Django 3.1.6 on 2021-04-02 14:35
+
+import bookwyrm.models.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0060_siteinvite_invitees"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="user",
+            name="outbox",
+            field=bookwyrm.models.fields.RemoteIdField(
+                max_length=255,
+                null=True,
+                unique=True,
+                validators=[bookwyrm.models.fields.validate_remote_id],
+            ),
+        ),
+    ]
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index f951ee45..33dedc9e 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -50,7 +50,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
         null=True,
         blank=True,
     )
-    outbox = fields.RemoteIdField(unique=True)
+    outbox = fields.RemoteIdField(unique=True, null=True)
     summary = fields.HtmlField(null=True, blank=True)
     local = models.BooleanField(default=False)
     bookwyrm_user = fields.BooleanField(default=True)
@@ -360,7 +360,7 @@ def set_remote_server(user_id):
     actor_parts = urlparse(user.remote_id)
     user.federated_server = get_or_create_remote_server(actor_parts.netloc)
     user.save(broadcast=False)
-    if user.bookwyrm_user:
+    if user.bookwyrm_user and user.outbox:
         get_remote_reviews.delay(user.outbox)
 
 

From 9c8ce5f77d052f03c684b65545701c6d4b492fe6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 2 Apr 2021 07:38:37 -0700
Subject: [PATCH 0598/1285] Makes followers an optional AP field

---
 bookwyrm/activitypub/person.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/activitypub/person.py b/bookwyrm/activitypub/person.py
index ed2ae80b..4ab9f08e 100644
--- a/bookwyrm/activitypub/person.py
+++ b/bookwyrm/activitypub/person.py
@@ -21,8 +21,8 @@ class Person(ActivityObject):
 
     preferredUsername: str
     inbox: str
-    followers: str
     publicKey: PublicKey
+    followers: str = None
     outbox: str = None
     endpoints: Dict = None
     name: str = None

From bb9e49c8fa5f60a1a82b2b28268c1db908a180bf Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 2 Apr 2021 09:54:32 -0700
Subject: [PATCH 0599/1285] Show disabled placeholders in pagination

---
 bookwyrm/templates/snippets/pagination.html | 24 +++++++--------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/bookwyrm/templates/snippets/pagination.html b/bookwyrm/templates/snippets/pagination.html
index 17418e8c..252be29e 100644
--- a/bookwyrm/templates/snippets/pagination.html
+++ b/bookwyrm/templates/snippets/pagination.html
@@ -1,20 +1,12 @@
 {% load i18n %}
 <nav class="pagination" aria-label="pagination">
-    {% if page.has_previous %}
-    <p class="pagination-previous">
-    <a href="{{ path }}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number }}{{ anchor }}">
-            <span class="icon icon-arrow-left"></span>
-            {% trans "Previous" %}
-        </a>
-    </p>
-    {% endif %}
+    <a class="pagination-previous" {% if page.has_previous %}href="{{ path }}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number }}{{ anchor }}" {% else %}disabled{% endif %}>
+        <span class="icon icon-arrow-left"></span>
+        {% trans "Previous" %}
+    </a>
 
-    {% if page.has_next %}
-    <p class="pagination-next">
-    <a href="{{ path }}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number }}{{ anchor }}">
-            {% trans "Next" %}
-            <span class="icon icon-arrow-right"></span>
-        </a>
-    </p>
-    {% endif %}
+    <a class="pagination-next" {% if page.has_next %}href="{{ path }}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number }}{{ anchor }}"{% else %} disabled{% endif %}>
+        {% trans "Next" %}
+        <span class="icon icon-arrow-right"></span>
+    </a>
 </nav>

From 1d525d49cb5a4cb3b258e7fea7c1e97e47fff46f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 2 Apr 2021 10:44:30 -0700
Subject: [PATCH 0600/1285] Use sorted set for activitystreams

---
 bookwyrm/activitystreams.py | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index d811aa49..a7fa1637 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -23,15 +23,23 @@ class ActivityStream(ABC):
         """ the redis key for this user's unread count for this stream """
         return "{}-unread".format(self.stream_id(user))
 
+    def get_value(self, status):  # pylint: disable=no-self-use
+        """ the status id and the rank (ie, published date) """
+        return {status.id: status.published_date.timestamp()}
+
     def add_status(self, status):
         """ add a status to users' feeds """
+        value = self.get_value(status)
         # we want to do this as a bulk operation, hence "pipeline"
         pipeline = r.pipeline()
         for user in self.stream_users(status):
             # add the status to the feed
-            pipeline.lpush(self.stream_id(user), status.id)
-            pipeline.ltrim(self.stream_id(user), 0, settings.MAX_STREAM_LENGTH)
-
+            pipeline.zadd(self.stream_id(user), value)
+            pipeline.zremrangebyrank(
+                self.stream_id(user),
+                settings.MAX_STREAM_LENGTH,
+                -1
+            )
             # add to the unread status count
             pipeline.incr(self.unread_id(user))
         # and go!
@@ -48,7 +56,12 @@ class ActivityStream(ABC):
         """ add a user's statuses to another user's feed """
         pipeline = r.pipeline()
         for status in user.status_set.all()[: settings.MAX_STREAM_LENGTH]:
-            pipeline.lpush(self.stream_id(viewer), status.id)
+            pipeline.zadd(self.stream_id(viewer), self.get_value(status))
+        pipeline.zremrangebyrank(
+            self.stream_id(user),
+            settings.MAX_STREAM_LENGTH,
+            -1
+        )
         pipeline.execute()
 
     def remove_user_statuses(self, viewer, user):
@@ -63,7 +76,7 @@ class ActivityStream(ABC):
         # clear unreads for this feed
         r.set(self.unread_id(user), 0)
 
-        statuses = r.lrange(self.stream_id(user), 0, -1)
+        statuses = r.zrevrange(self.stream_id(user), 0, -1)
         return (
             models.Status.objects.select_subclasses()
             .filter(id__in=statuses)
@@ -81,7 +94,13 @@ class ActivityStream(ABC):
 
         stream_id = self.stream_id(user)
         for status in statuses.all()[: settings.MAX_STREAM_LENGTH]:
-            pipeline.lpush(stream_id, status.id)
+            pipeline.zadd(stream_id, self.get_value(status))
+
+        pipeline.zremrangebyrank(
+            stream_id,
+            settings.MAX_STREAM_LENGTH,
+            -1
+        )
         pipeline.execute()
 
     def stream_users(self, status):  # pylint: disable=no-self-use

From c0f7cbc5f0f07c26ec7367b190089e8114fc5fed Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 2 Apr 2021 11:20:56 -0700
Subject: [PATCH 0601/1285] Consistent wording in bw-dev command

---
 bw-dev | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bw-dev b/bw-dev
index b6406f2c..b9c4b2a1 100755
--- a/bw-dev
+++ b/bw-dev
@@ -109,7 +109,7 @@ case "$CMD" in
     black)
         makeitblack
         ;;
-    populate_feeds)
+    populate_streams)
         execweb python manage.py populate_streams
         ;;
     *)

From 880323e838988ee7c760303d1958938d297a6549 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 2 Apr 2021 17:18:04 -0700
Subject: [PATCH 0602/1285] Python format

---
 bookwyrm/activitystreams.py | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index a7fa1637..0be90fc6 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -36,9 +36,7 @@ class ActivityStream(ABC):
             # add the status to the feed
             pipeline.zadd(self.stream_id(user), value)
             pipeline.zremrangebyrank(
-                self.stream_id(user),
-                settings.MAX_STREAM_LENGTH,
-                -1
+                self.stream_id(user), settings.MAX_STREAM_LENGTH, -1
             )
             # add to the unread status count
             pipeline.incr(self.unread_id(user))
@@ -57,11 +55,7 @@ class ActivityStream(ABC):
         pipeline = r.pipeline()
         for status in user.status_set.all()[: settings.MAX_STREAM_LENGTH]:
             pipeline.zadd(self.stream_id(viewer), self.get_value(status))
-        pipeline.zremrangebyrank(
-            self.stream_id(user),
-            settings.MAX_STREAM_LENGTH,
-            -1
-        )
+        pipeline.zremrangebyrank(self.stream_id(user), settings.MAX_STREAM_LENGTH, -1)
         pipeline.execute()
 
     def remove_user_statuses(self, viewer, user):
@@ -96,11 +90,7 @@ class ActivityStream(ABC):
         for status in statuses.all()[: settings.MAX_STREAM_LENGTH]:
             pipeline.zadd(stream_id, self.get_value(status))
 
-        pipeline.zremrangebyrank(
-            stream_id,
-            settings.MAX_STREAM_LENGTH,
-            -1
-        )
+        pipeline.zremrangebyrank(stream_id, settings.MAX_STREAM_LENGTH, -1)
         pipeline.execute()
 
     def stream_users(self, status):  # pylint: disable=no-self-use

From 24925dae82e69088d36805524dbd6b36a8b8104f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 2 Apr 2021 17:18:42 -0700
Subject: [PATCH 0603/1285] Temporary fix while issues with Black's release
 tags get resolved

https://github.com/psf/black/issues/2079
---
 .github/workflows/black.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml
index afa9cf2b..5fc849d6 100644
--- a/.github/workflows/black.yml
+++ b/.github/workflows/black.yml
@@ -8,6 +8,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
-      - uses: psf/black@stable
+      - uses: psf/black@20.8b1
         with:
           args: ". --check -l 80 -S"

From a91352499102df487cc9ed66425d35bf7534032d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 3 Apr 2021 10:56:53 -0700
Subject: [PATCH 0604/1285] Fixes redis call so tests don't fail

---
 bookwyrm/activitystreams.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 0be90fc6..419e20c0 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -90,7 +90,9 @@ class ActivityStream(ABC):
         for status in statuses.all()[: settings.MAX_STREAM_LENGTH]:
             pipeline.zadd(stream_id, self.get_value(status))
 
-        pipeline.zremrangebyrank(stream_id, settings.MAX_STREAM_LENGTH, -1)
+        # only trim the stream if statuses were added
+        if statuses.exists():
+            pipeline.zremrangebyrank(stream_id, settings.MAX_STREAM_LENGTH, -1)
         pipeline.execute()
 
     def stream_users(self, status):  # pylint: disable=no-self-use
@@ -280,7 +282,7 @@ def add_statuses_on_unblock(sender, instance, *args, **kwargs):
 
 @receiver(signals.post_save, sender=models.User)
 # pylint: disable=unused-argument
-def populate_feed_on_account_create(sender, instance, created, *args, **kwargs):
+def populate_streams_on_account_create(sender, instance, created, *args, **kwargs):
     """ build a user's feeds when they join """
     if not created or not instance.local:
         return

From 44e87c01ab6c8daebfd7d8e929d8250c47165bc9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 3 Apr 2021 11:07:08 -0700
Subject: [PATCH 0605/1285] Another place where redis may be called
 unnecessarily

---
 bookwyrm/activitystreams.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 419e20c0..689d396b 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -53,9 +53,11 @@ class ActivityStream(ABC):
     def add_user_statuses(self, viewer, user):
         """ add a user's statuses to another user's feed """
         pipeline = r.pipeline()
-        for status in user.status_set.all()[: settings.MAX_STREAM_LENGTH]:
+        statuses = user.status_set.all()[: settings.MAX_STREAM_LENGTH]
+        for status in statuses:
             pipeline.zadd(self.stream_id(viewer), self.get_value(status))
-        pipeline.zremrangebyrank(self.stream_id(user), settings.MAX_STREAM_LENGTH, -1)
+        if statuses:
+            pipeline.zremrangebyrank(self.stream_id(user), settings.MAX_STREAM_LENGTH, -1)
         pipeline.execute()
 
     def remove_user_statuses(self, viewer, user):

From b9514ec81fa20c35b20417a4b5e0f20d391f511f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 3 Apr 2021 11:11:29 -0700
Subject: [PATCH 0606/1285] Python formatting

---
 bookwyrm/activitystreams.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 689d396b..d9236ec9 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -57,7 +57,9 @@ class ActivityStream(ABC):
         for status in statuses:
             pipeline.zadd(self.stream_id(viewer), self.get_value(status))
         if statuses:
-            pipeline.zremrangebyrank(self.stream_id(user), settings.MAX_STREAM_LENGTH, -1)
+            pipeline.zremrangebyrank(
+                self.stream_id(user), settings.MAX_STREAM_LENGTH, -1
+            )
         pipeline.execute()
 
     def remove_user_statuses(self, viewer, user):

From 8faec714bb0a373c8f1295508b86c18f2fe3607a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 3 Apr 2021 11:39:29 -0700
Subject: [PATCH 0607/1285] Safely return unread count when key is unset

---
 bookwyrm/activitystreams.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index d9236ec9..094cbafd 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -83,7 +83,7 @@ class ActivityStream(ABC):
 
     def get_unread_count(self, user):
         """ get the unread status count for this user's feed """
-        return int(r.get(self.unread_id(user)))
+        return int(r.get(self.unread_id(user)) or 0)
 
     def populate_stream(self, user):
         """ go from zero to a timeline """

From 3cb91098e6b9ceacbcb51f3f3588f00360524680 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 3 Apr 2021 11:54:15 -0700
Subject: [PATCH 0608/1285] Valid html solution to disabling pagination links

---
 bookwyrm/static/css/format.css              | 11 +++++++++++
 bookwyrm/templates/snippets/pagination.html |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/static/css/format.css b/bookwyrm/static/css/format.css
index e3ae1ce7..522c23f7 100644
--- a/bookwyrm/static/css/format.css
+++ b/bookwyrm/static/css/format.css
@@ -25,6 +25,17 @@ html {
     min-width: 75% !important;
 }
 
+
+/* --- "disabled" for non-buttons --- */
+.is-disabled {
+    background-color: #dbdbdb;
+    border-color: #dbdbdb;
+    box-shadow: none;
+    color: #7a7a7a;
+    opacity: .5;
+    cursor: not-allowed;
+}
+
 /* --- SHELVING --- */
 
 /** @todo Replace icons with SVG symbols.
diff --git a/bookwyrm/templates/snippets/pagination.html b/bookwyrm/templates/snippets/pagination.html
index 252be29e..a11bbbb4 100644
--- a/bookwyrm/templates/snippets/pagination.html
+++ b/bookwyrm/templates/snippets/pagination.html
@@ -1,11 +1,11 @@
 {% load i18n %}
 <nav class="pagination" aria-label="pagination">
-    <a class="pagination-previous" {% if page.has_previous %}href="{{ path }}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number }}{{ anchor }}" {% else %}disabled{% endif %}>
+    <a class="pagination-previous {% if not page.has_previous %}is-disabled{% endif %}" {% if page.has_previous %}href="{{ path }}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number }}{{ anchor }}"{% endif %}>
         <span class="icon icon-arrow-left"></span>
         {% trans "Previous" %}
     </a>
 
-    <a class="pagination-next" {% if page.has_next %}href="{{ path }}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number }}{{ anchor }}"{% else %} disabled{% endif %}>
+    <a class="pagination-next {% if not page.has_next %}is-disabled{% endif %}" {% if page.has_next %}href="{{ path }}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number }}{{ anchor }}"{% endif %}>
         {% trans "Next" %}
         <span class="icon icon-arrow-right"></span>
     </a>

From 8d7527dee3eb817edd9e286f3af88a1059c93a9b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 3 Apr 2021 11:59:14 -0700
Subject: [PATCH 0609/1285] CSS linter fixes

---
 bookwyrm/static/css/format.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bookwyrm/static/css/format.css b/bookwyrm/static/css/format.css
index 522c23f7..1ca09d31 100644
--- a/bookwyrm/static/css/format.css
+++ b/bookwyrm/static/css/format.css
@@ -25,14 +25,13 @@ html {
     min-width: 75% !important;
 }
 
-
 /* --- "disabled" for non-buttons --- */
 .is-disabled {
     background-color: #dbdbdb;
     border-color: #dbdbdb;
     box-shadow: none;
     color: #7a7a7a;
-    opacity: .5;
+    opacity: 0.5;
     cursor: not-allowed;
 }
 

From 3ffe8a2ffbdf09770d557e1e0c7acef521dc3af7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 3 Apr 2021 12:10:21 -0700
Subject: [PATCH 0610/1285] Uses date input type for publication date fields

---
 bookwyrm/templates/book/edit_book.html | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html
index d7c84235..a9ce651e 100644
--- a/bookwyrm/templates/book/edit_book.html
+++ b/bookwyrm/templates/book/edit_book.html
@@ -122,12 +122,18 @@
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
 
-                <p class="mb-2"><label class="label" for="id_first_published_date">{% trans "First published date:" %}</label> {{ form.first_published_date }} </p>
+                <p class="mb-2">
+                    <label class="label" for="id_first_published_date">{% trans "First published date:" %}</label>
+                    <input type="date" name="first_published_date" class="input" id="id_first_published_date"{% if book.first_published_date %} value="{{ book.first_published_date|date:'Y-m-d' }}"{% endif %}>
+                </p>
                 {% for error in form.first_published_date.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
 
-                <p class="mb-2"><label class="label" for="id_published_date">{% trans "Published date:" %}</label> {{ form.published_date }} </p>
+                <p class="mb-2">
+                    <label class="label" for="id_published_date">{% trans "Published date:" %}</label>
+                    <input type="date" name="published_date" class="input" id="id_published_date"{% if book.published_date %} value="{{ book.published_date|date:'Y-m-d' }}"{% endif %}>
+                </p>
                 {% for error in form.published_date.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}

From c5b24893309e270ac2e1a2857253e0e804f7ef5a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 3 Apr 2021 12:30:18 -0700
Subject: [PATCH 0611/1285] Adds start of redraft view

---
 bookwyrm/status.py       |  8 --------
 bookwyrm/views/status.py | 29 +++++++++++++++++++++++++++--
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/bookwyrm/status.py b/bookwyrm/status.py
index 7f075741..793bd742 100644
--- a/bookwyrm/status.py
+++ b/bookwyrm/status.py
@@ -1,18 +1,10 @@
 """ Handle user activity """
 from django.db import transaction
-from django.utils import timezone
 
 from bookwyrm import models
 from bookwyrm.sanitize_html import InputHtmlParser
 
 
-def delete_status(status):
-    """ replace the status with a tombstone """
-    status.deleted = True
-    status.deleted_date = timezone.now()
-    status.save()
-
-
 def create_generated_note(user, content, mention_books=None, privacy="public"):
     """ a note created by the app about user activity """
     # sanitize input html
diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py
index fb548690..f86dc49d 100644
--- a/bookwyrm/views/status.py
+++ b/bookwyrm/views/status.py
@@ -3,6 +3,7 @@ import re
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponseBadRequest
 from django.shortcuts import get_object_or_404, redirect
+from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
 from markdown import markdown
@@ -10,8 +11,8 @@ from markdown import markdown
 from bookwyrm import forms, models
 from bookwyrm.sanitize_html import InputHtmlParser
 from bookwyrm.settings import DOMAIN
-from bookwyrm.status import delete_status
 from bookwyrm.utils import regex
+from .feed import feed_page_data
 from .helpers import handle_remote_webfinger
 from .reading import edit_readthrough
 
@@ -72,6 +73,7 @@ class CreateStatus(View):
         return redirect(request.headers.get("Referer", "/"))
 
 
+@method_decorator(login_required, name="dispatch")
 class DeleteStatus(View):
     """ tombstone that bad boy """
 
@@ -84,10 +86,33 @@ class DeleteStatus(View):
             return HttpResponseBadRequest()
 
         # perform deletion
-        delete_status(status)
+        status.delete()
         return redirect(request.headers.get("Referer", "/"))
 
 
+@method_decorator(login_required, name="dispatch")
+class DeleteAndRedraft(View):
+    """ delete a status but let the user re-create it """
+
+    def post(self, request, status_id):
+        """ delete and tombstone a status """
+        status = get_object_or_404(models.Status, id=status_id)
+
+        # don't let people delete other people's statuses
+        if status.user != request.user and not request.user.has_perm("moderate_post"):
+            return HttpResponseBadRequest()
+
+        # TODO: get the correct form (maybe a generic form)
+        redraft_form = forms.StatusForm(instance=status)
+
+        # perform deletion
+        status.delete()
+        data = feed_page_data(request.user)
+        # TODO: set up the correct edit state
+        data['redraft_form'] = redraft_form
+        return TemplateResponse(request, 'feed/feed.html')
+
+
 def find_mentions(content):
     """ detect @mentions in raw status content """
     if not content:

From 8711a2eba51f9ef2b9e655e4d5701cabe5d7c82c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 3 Apr 2021 12:31:28 -0700
Subject: [PATCH 0612/1285] Adds url path

---
 bookwyrm/urls.py           | 1 +
 bookwyrm/views/__init__.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 2b874eb9..8e583a58 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -202,6 +202,7 @@ urlpatterns = [
     re_path(r"%s/replies(.json)?/?$" % status_path, views.Replies.as_view()),
     re_path(r"^post/(?P<status_type>\w+)/?$", views.CreateStatus.as_view()),
     re_path(r"^delete-status/(?P<status_id>\d+)/?$", views.DeleteStatus.as_view()),
+    re_path(r"^redraft-status/(?P<status_id>\d+)/?$", views.DeleteAndRedraft.as_view()),
     # interact
     re_path(r"^favorite/(?P<status_id>\d+)/?$", views.Favorite.as_view()),
     re_path(r"^unfavorite/(?P<status_id>\d+)/?$", views.Unfavorite.as_view()),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 22e6071c..d053e971 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -31,7 +31,7 @@ from .shelf import Shelf
 from .shelf import create_shelf, delete_shelf
 from .shelf import shelve, unshelve
 from .site import Site
-from .status import CreateStatus, DeleteStatus
+from .status import CreateStatus, DeleteStatus, DeleteAndRedraft
 from .tag import Tag, AddTag, RemoveTag
 from .updates import get_notification_count, get_unread_status_count
 from .user import User, EditUser, Followers, Following

From fb900d58cdeb866290d4804a49903c9a27638358 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 3 Apr 2021 12:38:12 -0700
Subject: [PATCH 0613/1285] Names status urls

---
 bookwyrm/urls.py         | 26 ++++++++++++++++++++------
 bookwyrm/views/status.py |  4 ++--
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 8e583a58..828d46bf 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -197,12 +197,26 @@ urlpatterns = [
     re_path(r"^block/(?P<user_id>\d+)/?$", views.Block.as_view()),
     re_path(r"^unblock/(?P<user_id>\d+)/?$", views.unblock),
     # statuses
-    re_path(r"%s(.json)?/?$" % status_path, views.Status.as_view()),
-    re_path(r"%s/activity/?$" % status_path, views.Status.as_view()),
-    re_path(r"%s/replies(.json)?/?$" % status_path, views.Replies.as_view()),
-    re_path(r"^post/(?P<status_type>\w+)/?$", views.CreateStatus.as_view()),
-    re_path(r"^delete-status/(?P<status_id>\d+)/?$", views.DeleteStatus.as_view()),
-    re_path(r"^redraft-status/(?P<status_id>\d+)/?$", views.DeleteAndRedraft.as_view()),
+    re_path(r"%s(.json)?/?$" % status_path, views.Status.as_view(), name="status"),
+    re_path(r"%s/activity/?$" % status_path, views.Status.as_view(), name="status"),
+    re_path(
+        r"%s/replies(.json)?/?$" % status_path, views.Replies.as_view(), name="replies"
+    ),
+    re_path(
+        r"^post/(?P<status_type>\w+)/?$",
+        views.CreateStatus.as_view(),
+        name="create-status",
+    ),
+    re_path(
+        r"^delete-status/(?P<status_id>\d+)/?$",
+        views.DeleteStatus.as_view(),
+        name="delete-status",
+    ),
+    re_path(
+        r"^redraft-status/(?P<status_id>\d+)/?$",
+        views.DeleteAndRedraft.as_view(),
+        name="redraft",
+    ),
     # interact
     re_path(r"^favorite/(?P<status_id>\d+)/?$", views.Favorite.as_view()),
     re_path(r"^unfavorite/(?P<status_id>\d+)/?$", views.Unfavorite.as_view()),
diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py
index f86dc49d..b68b7339 100644
--- a/bookwyrm/views/status.py
+++ b/bookwyrm/views/status.py
@@ -109,8 +109,8 @@ class DeleteAndRedraft(View):
         status.delete()
         data = feed_page_data(request.user)
         # TODO: set up the correct edit state
-        data['redraft_form'] = redraft_form
-        return TemplateResponse(request, 'feed/feed.html')
+        data["redraft_form"] = redraft_form
+        return TemplateResponse(request, "feed/feed.html")
 
 
 def find_mentions(content):

From 029913de32756101b16aa45034cd450b1a292a4a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 3 Apr 2021 13:06:36 -0700
Subject: [PATCH 0614/1285] Logic for rendering a particular compose tab
 server-side

---
 .../templates/snippets/create_status.html     | 44 +++++++++++++++----
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/templates/snippets/create_status.html b/bookwyrm/templates/snippets/create_status.html
index 76357986..7dee4b70 100644
--- a/bookwyrm/templates/snippets/create_status.html
+++ b/bookwyrm/templates/snippets/create_status.html
@@ -2,36 +2,62 @@
 {% load i18n %}
 {% load bookwyrm_tags %}
 
+{% with status_type=request.GET.status_type %}
 <div class="tab-group">
     <div class="tabs is-boxed" role="tablist">
         <ul>
-            <li class="is-active">
-                <a href="#review-{{ book.id }}" id="tab-review-{{ book.id }}" role="tab" aria-selected="true" aria-controls="review-{{ book.id }}" data-category="tab-option-{{ book.id }}">{% trans "Review" %}</a>
+            <li class="{% if status_type == 'review' or not status_type %}is-active{% endif %}">
+                <a
+                    href="{{ request.path }}?status_type=review&book={{ book.id }}"
+                    id="tab-review-{{ book.id }}"
+                    role="tab"
+                    aria-selected="{% if status_type == 'review' or not status_type %}true{% else %}false{% endif %}"
+                    aria-controls="review-{{ book.id }}"
+                    data-category="tab-option-{{ book.id }}">
+                    {% trans "Review" %}
+                </a>
             </li>
-            <li>
-                <a href="#comment-{{ book.id}}" id="tab-comment-{{ book.id }}" role="tab" aria-selected="false" aria-controls="comment-{{ book.id}}" data-category="tab-option-{{ book.id }}">{% trans "Comment" %}</a>
+            <li class="{% if status_type == 'comment' %}is-active{% endif %}">
+                <a
+                    href="{{ request.path }}?status_type=comment&book={{ book.id}}"
+                    id="tab-comment-{{ book.id }}"
+                    role="tab"
+                    aria-selected="{% if status_type == 'comment' %}true{% else %}false{% endif %}"
+                    aria-controls="comment-{{ book.id}}"
+                    data-category="tab-option-{{ book.id }}">
+                    {% trans "Comment" %}
+                </a>
             </li>
-            <li>
-                <a href="#quote-{{ book.id }}" id="tab-quote-{{ book.id }}" role="tab" aria-selected="false" aria-controls="quote-{{ book.id }}" data-category="tab-option-{{ book.id }}">{% trans "Quote" %}</a>
+            <li class="{% if status_type == 'quote' %}is-active{% endif %}">
+                <a
+                    href="{{ request.path }}?status_type=quote&book={{ book.id }}"
+                    id="tab-quote-{{ book.id }}"
+                    role="tab"
+                    aria-selected="{% if status_type == 'quote' %}true{% else %}false{% endif %}"
+                    aria-controls="quote-{{ book.id }}"
+                    data-category="tab-option-{{ book.id }}">
+                    {% trans "Quote" %}
+                </a>
             </li>
         </ul>
     </div>
 
-    <div class="tab-option-{{ book.id }}" id="review-{{ book.id }}" role="tabpanel" aria-labelledby="tab-review-{{ book.id }}">
+    <div class="tab-option-{{ book.id }}" id="review-{{ book.id }}" role="tabpanel" aria-labelledby="tab-review-{{ book.id }}" {% if status_type and status_type != "review" %}hidden{% endif %}>
         {% with 0|uuid as uuid %}
         {% include 'snippets/create_status_form.html' with type='review' %}
         {% endwith %}
     </div>
 
-    <div class="tab-option-{{ book.id }}" id="comment-{{ book.id }}" role="tabpanel" aria-labelledby="tab-comment-{{ book.id }}" hidden>
+    <div class="tab-option-{{ book.id }}" id="comment-{{ book.id }}" role="tabpanel" aria-labelledby="tab-comment-{{ book.id }}" {% if status_type != "comment" %}hidden{% endif %}>
         {% with 0|uuid as uuid %}
         {% include 'snippets/create_status_form.html' with type="comment" placeholder="Some thoughts on '"|add:book.title|add:"'" %}
         {% endwith %}
     </div>
 
-    <div class="tab-option-{{ book.id }}" id="quote-{{ book.id }}" role="tabpanel" aria-labelledby="tab-quote-{{ book.id }}" hidden>
+    <div class="tab-option-{{ book.id }}" id="quote-{{ book.id }}" role="tabpanel" aria-labelledby="tab-quote-{{ book.id }}" {% if status_type != "quote" %}hidden{% endif %}>
         {% with 0|uuid as uuid %}
         {% include 'snippets/create_status_form.html' with type="quotation" placeholder="An excerpt from '"|add:book.title|add:"'" %}
         {% endwith %}
     </div>
 </div>
+{% endwith %}

From dae31459e47027a14eda21d0617fc0eb811abadc Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 3 Apr 2021 13:53:04 -0700
Subject: [PATCH 0615/1285] Show correct book when url param is provided

---
 bookwyrm/templates/feed/feed_layout.html | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/feed/feed_layout.html b/bookwyrm/templates/feed/feed_layout.html
index 6ed696a1..9afd5e60 100644
--- a/bookwyrm/templates/feed/feed_layout.html
+++ b/bookwyrm/templates/feed/feed_layout.html
@@ -12,6 +12,7 @@
         {% if not suggested_books %}
         <p>{% trans "There are no books here right now! Try searching for a book to get started" %}</p>
         {% else %}
+        {% with active_book=request.GET.book %}
         <div class="tab-group">
             <div class="tabs is-small">
                 <ul role="tablist">
@@ -28,8 +29,14 @@
                         <div class="tabs is-small is-toggle">
                             <ul>
                                 {% for book in shelf.books %}
-                                <li{% if shelf_counter == 1 and forloop.first %} class="is-active"{% endif %}>
-                                    <a href="#book-{{ book.id }}" id="tab-book-{{ book.id }}" role="tab" aria-label="{{ book.title }}" aria-selected="{% if shelf_counter == 1 and forloop.first %}true{% else %}false{% endif %}" aria-controls="book-{{ book.id }}">
+                                <li class="{% if active_book == book.id|stringformat:'d' %}is-active{% elif not active_book and shelf_counter == 1 and forloop.first %}is-active{% endif %}">
+                                    <a
+                                        href="{{ request.path }}?book={{ book.id }}"
+                                        id="tab-book-{{ book.id }}"
+                                        role="tab"
+                                        aria-label="{{ book.title }}"
+                                        aria-selected="{% if active_book == book.id|stringformat:'d' %}true{% elif shelf_counter == 1 and forloop.first %}true{% else %}false{% endif %}"
+                                        aria-controls="book-{{ book.id }}">
                                         {% include 'snippets/book_cover.html' with book=book size="medium" %}
                                     </a>
                                 </li>
@@ -45,7 +52,13 @@
             {% for shelf in suggested_books %}
             {% with shelf_counter=forloop.counter %}
             {% for book in shelf.books %}
-            <div class="suggested-tabs card" role="tabpanel" id="book-{{ book.id }}"{% if shelf_counter != 1 or not forloop.first %} hidden{% endif %} aria-labelledby="tab-book-{{ book.id }}">
+            <div
+                class="suggested-tabs card"
+                role="tabpanel"
+                id="book-{{ book.id }}"
+                {% if active_book and active_book == book.id|stringformat:'d' %}{% elif not active_book and shelf_counter == 1 and forloop.first %}{% else %} hidden{% endif %}
+                aria-labelledby="tab-book-{{ book.id }}">
+
                 <div class="card-header">
                     <div class="card-header-title">
                         <div>
@@ -66,6 +79,7 @@
             {% endwith %}
             {% endfor %}
         </div>
+        {% endwith %}
         {% endif %}
 
         {% if goal %}

From 4cf9bca5aa535fd50b6bb23a6229697629eda1de Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 3 Apr 2021 14:32:34 -0700
Subject: [PATCH 0616/1285] Adds compose view

---
 bookwyrm/templates/compose.html | 30 ++++++++++++++++++++++++++++++
 bookwyrm/urls.py                |  5 +++++
 bookwyrm/views/status.py        | 16 ++++++++++------
 3 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 bookwyrm/templates/compose.html

diff --git a/bookwyrm/templates/compose.html b/bookwyrm/templates/compose.html
new file mode 100644
index 00000000..a6da73e6
--- /dev/null
+++ b/bookwyrm/templates/compose.html
@@ -0,0 +1,30 @@
+{% extends 'layout.html' %}
+{% load i18n %}
+{% load bookwyrm_tags %}
+
+{% block title %}{% trans "Compose status" %}{% endblock %}
+{% block content %}
+<header class="block content">
+    <h1>{% trans "Compose status" %}</h1>
+</header>
+
+<div class="box columns">
+    {% if book %}
+    <div class="column is-one-third">
+        <div class="block">
+            <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book  %}</a>
+        </div>
+        <h3 class="title is-6">{% include 'snippets/book_titleby.html' with book=book %}</h3>
+    </div>
+    {% endif %}
+    <div class="column is-two-thirds">
+        {% if not form %}
+        {% include 'snippets/create_status.html' %}
+        {% else %}
+        {% include 'snippets/create_status_form.html' %}
+        {% endif %}
+    </div>
+</div>
+
+{% endblock %}
+
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 828d46bf..46398806 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -202,6 +202,11 @@ urlpatterns = [
     re_path(
         r"%s/replies(.json)?/?$" % status_path, views.Replies.as_view(), name="replies"
     ),
+    re_path(
+        r"^post/?$",
+        views.CreateStatus.as_view(),
+        name="create-status",
+    ),
     re_path(
         r"^post/(?P<status_type>\w+)/?$",
         views.CreateStatus.as_view(),
diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py
index b68b7339..10b9ebf8 100644
--- a/bookwyrm/views/status.py
+++ b/bookwyrm/views/status.py
@@ -12,7 +12,6 @@ from bookwyrm import forms, models
 from bookwyrm.sanitize_html import InputHtmlParser
 from bookwyrm.settings import DOMAIN
 from bookwyrm.utils import regex
-from .feed import feed_page_data
 from .helpers import handle_remote_webfinger
 from .reading import edit_readthrough
 
@@ -22,6 +21,12 @@ from .reading import edit_readthrough
 class CreateStatus(View):
     """ the view for *posting* """
 
+    def get(self, request):
+        """ compose view (used for delete-and-redraft """
+        book = get_object_or_404(models.Edition, id=request.GET.get("book"))
+        data = {"book": book}
+        return TemplateResponse(request, "compose.html", data)
+
     def post(self, request, status_type):
         """ create  status of whatever type """
         status_type = status_type[0].upper() + status_type[1:]
@@ -103,14 +108,13 @@ class DeleteAndRedraft(View):
             return HttpResponseBadRequest()
 
         # TODO: get the correct form (maybe a generic form)
-        redraft_form = forms.StatusForm(instance=status)
+        data = {"form": forms.StatusForm(instance=status)}
+        if hasattr(status, "book"):
+            data["book"] = status.book
 
         # perform deletion
         status.delete()
-        data = feed_page_data(request.user)
-        # TODO: set up the correct edit state
-        data["redraft_form"] = redraft_form
-        return TemplateResponse(request, "feed/feed.html")
+        return TemplateResponse(request, "compose.html", data)
 
 
 def find_mentions(content):

From 2a4fc8fb9a97eef3fbbb24ba191d054044072f3e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 3 Apr 2021 14:55:13 -0700
Subject: [PATCH 0617/1285] Adds model-to-form helper for statuses

---
 bookwyrm/forms.py                                  | 14 ++++++++++++++
 .../templates/snippets/status/status_options.html  |  8 ++++++++
 bookwyrm/views/status.py                           |  4 ++--
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 1477234f..855edf1e 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -121,6 +121,20 @@ class StatusForm(CustomForm):
         fields = ["user", "content", "content_warning", "sensitive", "privacy"]
 
 
+def get_form_from_status(status):
+    """ form-ify a status (for delete and redraft) """
+    if isinstance(status, models.Review):
+        return ReviewForm(instance=status)
+    if isinstance(status, models.Comment):
+        return CommentForm(instance=status)
+    if isinstance(status, models.Quotation):
+        return QuotationForm(instance=status)
+    if status.reply_parent:
+        return ReplyForm(instance=status)
+    else:
+        return StatusForm(instance=status)
+
+
 class EditUserForm(CustomForm):
     class Meta:
         model = models.User
diff --git a/bookwyrm/templates/snippets/status/status_options.html b/bookwyrm/templates/snippets/status/status_options.html
index 6f0ca2e6..7cc74f07 100644
--- a/bookwyrm/templates/snippets/status/status_options.html
+++ b/bookwyrm/templates/snippets/status/status_options.html
@@ -19,6 +19,14 @@
         </button>
     </form>
 </li>
+<li role="menuitem">
+    <form class="dropdown-item pt-0 pb-0" name="delete-{{status.id}}" action="{% url 'redraft' status.id %}" method="post">
+        {% csrf_token %}
+        <button class="button is-danger is-light is-fullwidth is-small" type="submit">
+            {% trans "Delete & re-draft" %}
+        </button>
+    </form>
+</li>
 {% else %}
 {# things you can do to other people's statuses #}
 <li role="menuitem">
diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py
index 10b9ebf8..1b4f8977 100644
--- a/bookwyrm/views/status.py
+++ b/bookwyrm/views/status.py
@@ -107,8 +107,8 @@ class DeleteAndRedraft(View):
         if status.user != request.user and not request.user.has_perm("moderate_post"):
             return HttpResponseBadRequest()
 
-        # TODO: get the correct form (maybe a generic form)
-        data = {"form": forms.StatusForm(instance=status)}
+
+        data = {"form": forms.get_form_from_status(status)}
         if hasattr(status, "book"):
             data["book"] = status.book
 

From 3dee60e9e53b243627af82cf95ce5993c4036dd9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 3 Apr 2021 14:56:56 -0700
Subject: [PATCH 0618/1285] Uses correct redis remove activity type

---
 bookwyrm/activitystreams.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 094cbafd..94ba23bc 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -47,7 +47,7 @@ class ActivityStream(ABC):
         """ remove a status from all feeds """
         pipeline = r.pipeline()
         for user in self.stream_users(status):
-            pipeline.lrem(self.stream_id(user), -1, status.id)
+            pipeline.zrem(self.stream_id(user), -1, status.id)
         pipeline.execute()
 
     def add_user_statuses(self, viewer, user):

From ffb7f8f7ce03e414013d6ec9ffb144277fb16d3c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 3 Apr 2021 15:47:47 -0700
Subject: [PATCH 0619/1285] Populate redraft form

---
 bookwyrm/forms.py                             | 14 ---------
 bookwyrm/templates/compose.html               |  7 +++--
 .../snippets/content_warning_field.html       | 11 +++++--
 .../snippets/create_status_form.html          | 29 +++++++++++--------
 .../snippets/status/status_options.html       |  2 ++
 bookwyrm/views/status.py                      | 20 +++++++++----
 6 files changed, 46 insertions(+), 37 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 855edf1e..1477234f 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -121,20 +121,6 @@ class StatusForm(CustomForm):
         fields = ["user", "content", "content_warning", "sensitive", "privacy"]
 
 
-def get_form_from_status(status):
-    """ form-ify a status (for delete and redraft) """
-    if isinstance(status, models.Review):
-        return ReviewForm(instance=status)
-    if isinstance(status, models.Comment):
-        return CommentForm(instance=status)
-    if isinstance(status, models.Quotation):
-        return QuotationForm(instance=status)
-    if status.reply_parent:
-        return ReplyForm(instance=status)
-    else:
-        return StatusForm(instance=status)
-
-
 class EditUserForm(CustomForm):
     class Meta:
         model = models.User
diff --git a/bookwyrm/templates/compose.html b/bookwyrm/templates/compose.html
index a6da73e6..7c5d8933 100644
--- a/bookwyrm/templates/compose.html
+++ b/bookwyrm/templates/compose.html
@@ -8,6 +8,7 @@
     <h1>{% trans "Compose status" %}</h1>
 </header>
 
+{% with 0|uuid as uuid %}
 <div class="box columns">
     {% if book %}
     <div class="column is-one-third">
@@ -18,13 +19,13 @@
     </div>
     {% endif %}
     <div class="column is-two-thirds">
-        {% if not form %}
+        {% if not draft %}
         {% include 'snippets/create_status.html' %}
         {% else %}
         {% include 'snippets/create_status_form.html' %}
         {% endif %}
     </div>
 </div>
-
+{{ form.ap_p }}
+{% endwith %}
 {% endblock %}
-
diff --git a/bookwyrm/templates/snippets/content_warning_field.html b/bookwyrm/templates/snippets/content_warning_field.html
index c90138e9..b645a29c 100644
--- a/bookwyrm/templates/snippets/content_warning_field.html
+++ b/bookwyrm/templates/snippets/content_warning_field.html
@@ -1,5 +1,12 @@
 {% load i18n %}
-<div class="control{% if not parent_status.content_warning %} hidden{% endif %}" id="spoilers-{{ uuid }}">
+<div class="control{% if not parent_status.content_warning and not draft.content_warning %} hidden{% endif %}" id="spoilers-{{ uuid }}">
     <label class="is-sr-only" for="id_content_warning-{{ uuid }}">{% trans "Spoiler alert:" %}</label>
-    <input type="text" name="content_warning" maxlength="255" class="input" id="id_content_warning-{{ uuid }}" placeholder="{% trans 'Spoilers ahead!' %}"{% if parent_status.content_warning %} value="{{ parent_status.content_warning }}"{% endif %}>
+    <input
+        type="text"
+        name="content_warning"
+        maxlength="255"
+        class="input"
+        id="id_content_warning-{{ uuid }}"
+        placeholder="{% trans 'Spoilers ahead!' %}"
+        value="{% firstof draft.content_warning parent_status.content_warning '' %}">
 </div>
diff --git a/bookwyrm/templates/snippets/create_status_form.html b/bookwyrm/templates/snippets/create_status_form.html
index c70a0e58..7f5573e1 100644
--- a/bookwyrm/templates/snippets/create_status_form.html
+++ b/bookwyrm/templates/snippets/create_status_form.html
@@ -4,11 +4,11 @@
     {% csrf_token %}
     <input type="hidden" name="book" value="{{ book.id }}">
     <input type="hidden" name="user" value="{{ request.user.id }}">
-    <input type="hidden" name="reply_parent" value="{{ reply_parent.id }}">
+    <input type="hidden" name="reply_parent" value="{% firstof draft.reply_parent.id reply_parent.id %}">
     {% if type == 'review' %}
     <div class="control">
         <label class="label" for="id_name_{{ book.id }}_{{ type }}">{% trans "Title" %}:</label>
-        <input type="text" name="name" maxlength="255" class="input" required="" id="id_name_{{ book.id }}_{{ type }}" placeholder="My {{ type }} of '{{ book.title }}'">
+        <input type="text" name="name" maxlength="255" class="input" required="" id="id_name_{{ book.id }}_{{ type }}" placeholder="My {{ type }} of '{{ book.title }}'" value="{% firstof draft.name ''%}">
     </div>
     {% endif %}
     <div class="control">
@@ -29,9 +29,9 @@
             <legend class="is-sr-only">{% trans "Rating" %}</legend>
             <div class="field is-grouped stars form-rate-stars">
                 <label class="is-sr-only" for="no-rating-{{ book.id }}">{% trans "No rating" %}</label>
-                <input class="is-sr-only" type="radio" name="rating" value="" id="no-rating-{{ book.id }}" checked>
+                <input class="is-sr-only" type="radio" name="rating" value="" id="no-rating-{{ book.id }}" {% if not draft or not draft.rating %}checked{% endif %}>
                 {% for i in '12345'|make_list %}
-                <input class="is-sr-only" id="book{{book.id}}-star-{{ forloop.counter }}" type="radio" name="rating" value="{{ forloop.counter }}">
+                <input class="is-sr-only" id="book{{book.id}}-star-{{ forloop.counter }}" type="radio" name="rating" value="{{ forloop.counter }}" {% if draft and draft.rating == forloop.counter %}checked{% endif %}>
                 <label class="icon icon-star-empty" for="book{{book.id}}-star-{{ forloop.counter }}">
                     <span class="is-sr-only">{{ forloop.counter }} star{{ forloop.counter | pluralize }}</span>
                 </label>
@@ -41,17 +41,17 @@
         {% endif %}
 
         {% if type == 'quotation' %}
-        <textarea name="quote" class="textarea" id="id_quote_{{ book.id }}_{{ type }}" placeholder="{{ placeholder }}" required></textarea>
+        <textarea name="quote" class="textarea" id="id_quote_{{ book.id }}_{{ type }}" placeholder="{{ placeholder }}" required>{{ draft.quote|default:'' }}</textarea>
         {% else %}
         {% include 'snippets/content_warning_field.html' with parent_status=status %}
-        <textarea name="content" class="textarea" id="id_content_{{ type }}-{{ book.id }}{{reply_parent.id}}" placeholder="{{ placeholder }}" {% if type == 'reply' %} aria-label="Reply"{% endif %} required>{% if reply_parent %}{{ reply_parent|mentions:request.user }}{% endif %}{% if mentions %}@{{ mentions|username }} {% endif %}</textarea>
+        <textarea name="content" class="textarea" id="id_content_{{ type }}-{{ book.id }}{{reply_parent.id}}" placeholder="{{ placeholder }}" {% if type == 'reply' %} aria-label="Reply"{% endif %} required>{% if reply_parent %}{{ reply_parent|mentions:request.user }}{% endif %}{% if mentions %}@{{ mentions|username }} {% endif %}{{ draft.content|default:'' }}</textarea>
         {% endif %}
     </div>
     {% if type == 'quotation' %}
     <div class="control">
         <label class="label" for="id_content_quote-{{ book.id }}">{% trans "Comment" %}:</label>
         {% include 'snippets/content_warning_field.html' with parent_status=status %}
-        <textarea name="content" class="textarea is-small" id="id_content_quote-{{ book.id }}"></textarea>
+        <textarea name="content" class="textarea is-small" id="id_content_quote-{{ book.id }}">{{ draft.content|default:'' }}</textarea>
     </div>
     {% elif type == 'comment' %}
     <div class="control">
@@ -64,12 +64,12 @@
             <label class="label" for="progress-{{ uuid }}">{% trans "Progress:" %}</label>
             <div class="field has-addons mb-0">
                 <div class="control">
-                    <input aria-label="{% if readthrough.progress_mode == 'PG' %}Current page{% else %}Percent read{% endif %}" class="input" type="number" min="0" name="progress" size="3" value="{{ readthrough.progress|default:'' }}" id="progress-{{ uuid }}">
+                    <input aria-label="{% if draft.progress_mode == 'PG' or readthrough.progress_mode == 'PG' %}Current page{% else %}Percent read{% endif %}" class="input" type="number" min="0" name="progress" size="3" value="{% firstof draft.progress readthrough.progress '' %}" id="progress-{{ uuid }}">
                 </div>
                 <div class="control select">
                     <select name="progress_mode" aria-label="Progress mode">
-                        <option value="PG" {% if readthrough.progress_mode == 'PG' %}selected{% endif %}>{% trans "pages" %}</option>
-                        <option value="PCT" {% if readthrough.progress_mode == 'PCT' %}selected{% endif %}>{% trans "percent" %}</option>
+                        <option value="PG" {% if draft.progress_mode == 'PG' or readthrough.progress_mode == 'PG' %}selected{% endif %}>{% trans "pages" %}</option>
+                        <option value="PCT" {% if draft.progress_mode == 'PCT' or readthrough.progress_mode == 'PCT' %}selected{% endif %}>{% trans "percent" %}</option>
                     </select>
                 </div>
             </div>
@@ -81,20 +81,25 @@
         {% endif %}
     </div>
     {% endif %}
-    <input type="checkbox" class="hidden" name="sensitive" id="id_show_spoilers-{{ uuid }}" {% if status.content_warning %}checked{% endif %} aria-hidden="true">
+    <input type="checkbox" class="hidden" name="sensitive" id="id_show_spoilers-{{ uuid }}" {% if draft.content_warning or status.content_warning %}checked{% endif %} aria-hidden="{% if draft.content_warning or status.content_warning %}true{% else %}false{% endif %}">
     {# bottom bar #}
     <div class="columns pt-1">
         <div class="field has-addons column">
             <div class="control">
                 {% trans "Include spoiler alert" as button_text %}
-                {% include 'snippets/toggle/toggle_button.html' with text=button_text icon="warning is-size-4" controls_text="spoilers" controls_uid=uuid focus="id_content_warning" checkbox="id_show_spoilers" class="toggle-button" pressed=status.content_warning %}
+                {% firstof draft.content_warning status.content_warning as pressed %}
+                {% include 'snippets/toggle/toggle_button.html' with text=button_text icon="warning is-size-4" controls_text="spoilers" controls_uid=uuid focus="id_content_warning" checkbox="id_show_spoilers" class="toggle-button" pressed=pressed %}
             </div>
             <div class="control">
             {% if type == 'direct' %}
                 <input type="hidden" name="privacy" value="direct">
                 <button type="button" class="button" aria-label="Privacy" disabled>{% trans "Private" %}</button>
             {% else %}
+                {% if draft %}
+                {% include 'snippets/privacy_select.html' with current=draft.privacy %}
+                {% else %}
                 {% include 'snippets/privacy_select.html' with current=reply_parent.privacy %}
+                {% endif %}
             {% endif %}
             </div>
         </div>
diff --git a/bookwyrm/templates/snippets/status/status_options.html b/bookwyrm/templates/snippets/status/status_options.html
index 7cc74f07..c476bfbf 100644
--- a/bookwyrm/templates/snippets/status/status_options.html
+++ b/bookwyrm/templates/snippets/status/status_options.html
@@ -19,6 +19,7 @@
         </button>
     </form>
 </li>
+{% if status.status_type != 'GeneratedNote' %}
 <li role="menuitem">
     <form class="dropdown-item pt-0 pb-0" name="delete-{{status.id}}" action="{% url 'redraft' status.id %}" method="post">
         {% csrf_token %}
@@ -27,6 +28,7 @@
         </button>
     </form>
 </li>
+{% endif %}
 {% else %}
 {# things you can do to other people's statuses #}
 <li role="menuitem">
diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py
index 1b4f8977..b224c1a9 100644
--- a/bookwyrm/views/status.py
+++ b/bookwyrm/views/status.py
@@ -75,7 +75,7 @@ class CreateStatus(View):
         # update a readthorugh, if needed
         edit_readthrough(request)
 
-        return redirect(request.headers.get("Referer", "/"))
+        return redirect("/")
 
 
 @method_decorator(login_required, name="dispatch")
@@ -101,16 +101,24 @@ class DeleteAndRedraft(View):
 
     def post(self, request, status_id):
         """ delete and tombstone a status """
-        status = get_object_or_404(models.Status, id=status_id)
-
-        # don't let people delete other people's statuses
-        if status.user != request.user and not request.user.has_perm("moderate_post"):
+        status = get_object_or_404(
+            models.Status.objects.select_subclasses(), id=status_id
+        )
+        if isinstance(status, models.GeneratedNote):
             return HttpResponseBadRequest()
 
+        # don't let people redraft other people's statuses
+        if status.user != request.user:
+            return HttpResponseBadRequest()
 
-        data = {"form": forms.get_form_from_status(status)}
+        data = {
+            "draft": status,
+            "type": status.status_type.lower(),
+        }
         if hasattr(status, "book"):
             data["book"] = status.book
+        elif status.mention_books:
+            data["book"] = status.mention_books.first()
 
         # perform deletion
         status.delete()

From d5643047e10c946107814ba376cf83c3706f6266 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 3 Apr 2021 15:49:27 -0700
Subject: [PATCH 0620/1285] hidden checkbox should always be hidden

---
 bookwyrm/templates/snippets/create_status_form.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/create_status_form.html b/bookwyrm/templates/snippets/create_status_form.html
index 7f5573e1..4888ebe3 100644
--- a/bookwyrm/templates/snippets/create_status_form.html
+++ b/bookwyrm/templates/snippets/create_status_form.html
@@ -81,7 +81,7 @@
         {% endif %}
     </div>
     {% endif %}
-    <input type="checkbox" class="hidden" name="sensitive" id="id_show_spoilers-{{ uuid }}" {% if draft.content_warning or status.content_warning %}checked{% endif %} aria-hidden="{% if draft.content_warning or status.content_warning %}true{% else %}false{% endif %}">
+    <input type="checkbox" class="hidden" name="sensitive" id="id_show_spoilers-{{ uuid }}" {% if draft.content_warning or status.content_warning %}checked{% endif %} aria-hidden="true">
     {# bottom bar #}
     <div class="columns pt-1">
         <div class="field has-addons column">

From 74ca54d8d63fff02e4fca6fab4b9051d4196dbd9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 3 Apr 2021 20:55:44 -0700
Subject: [PATCH 0621/1285] Fixes goal page book link

---
 bookwyrm/templates/goal.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/goal.html b/bookwyrm/templates/goal.html
index fef1438b..1e10144f 100644
--- a/bookwyrm/templates/goal.html
+++ b/bookwyrm/templates/goal.html
@@ -57,7 +57,7 @@
         {% for book in goal.books %}
         <div class="column is-one-fifth">
             <div class="is-clipped">
-                <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book.book %}</a>
+                <a href="{{ book.book.local_path }}">{% include 'snippets/book_cover.html' with book=book.book %}</a>
             </div>
         </div>
         {% endfor %}

From cfb0d0954b7d450a0e7e27de97ab03a1da32a322 Mon Sep 17 00:00:00 2001
From: GuDzpoz <GuDzpoz@live.com>
Date: Sun, 4 Apr 2021 12:20:16 +0800
Subject: [PATCH 0622/1285] Updated Simplified Chinese translation

---
 locale/zh_CN/LC_MESSAGES/django.mo | Bin 29305 -> 38410 bytes
 locale/zh_CN/LC_MESSAGES/django.po | 520 +++++++++++------------------
 2 files changed, 203 insertions(+), 317 deletions(-)

diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
index 3fe34104efbb6b6c4305cf3dd4c6ca9656766dde..bdfaaef855d82416fa6673b122350d5b1cdde240 100644
GIT binary patch
literal 38410
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

delta 10310
zcmZ|UcX(Ds+Q;z|N&pEx^cElxTId7_QbHGy5;|E*AP-0&g(QT|Lnt92O$R}$Ac~;$
z2m*q<c12y5^_4}zwIu;|?dV!qb-%xyo9o*5kM~^O`OG~tXJ*cvk}SLKaEV_ELV|y<
zTIw;6<3xz()x)PMcwSry&ud**wVu~5((^L0J+8*5u_Cr=>Uk|O7OP_bb;@FFhug3c
zzJ)dM8rH{eaWqzJ=6U=V^rrJu4ePKm9>hlY4r<`9ur`*A^1M!1A2nb+vKB8HJK!cv
z!&l4>%{?!b{7D>zRa$u7A`D<}{1iJgzt@P%pzMvq(wKwQa1B<$ofwKounazLp2xD}
zuVG1i55w?^)&CvKk>5n^#CMj5wDNbbJeFa8uMUOs*cjVm8`OkTQ45-h8aM^D^@}WD
zi(2SbtA7@?b7xUIavincimm<eYG76J`lx>GFsKgk6y!uKh0{<go@x1fEKj}!wV*uY
zG4VE9`!1|Zz7KQpBx>inMf=ah5DX)qiMp^X)cA{|*?%=WOoax1+&b*B4o{;7K80G~
z8|I%;6I?ZKp>E-?s4I+Y<B!(`HDM2|fc;Px5|5g9avSzv1I@OErPi<(W2xVY{O4Wa
zM?>`5`U{Cbo!1<7C9$Z12csq$i<&qI!*Moh!sXV!0re2?3{t2?As_Ynyo>613!CAO
zSPAR#PIblBsGSI)>Qhh?F17q&)LXL?wV)HIhwy^=rg;T5Pw+a0`zYM9iaV%*^(3mk
zGS<Pms0GAeMNC62WSN<3ZnXBTsJG*3)B=uT6+DA_#x7xm-v7%KG~l<W6aK);Se8dv
zS5h0bm2FWAi$M)I0CnC7%codA3w7QC)B-o6&fkg}e>du_IZ#~B{Xa)RSNbw)E8j&8
z{1NJdbQ`teu#Wx!Rm?i5hqei7f)-{w)Yf*v;)f24A3Cf;{bbaIq+@Np|H~<8Wjm~4
zKk5qdQ3Je<TF~E60~A^N&!{V`$Y)XSa}A8buBeA@Dr({LP~$8@O`L}b_&5et@dE`-
zP^z;(K{eEho1zA2k7|!WU2%V`hC?tMr&xU!Y9|(<7M5f6Yf<BEvV14%ynXuqYO79D
zp{M^<)I^_{U!!*BH#0QGf4?iC255}>rPT#B&S*0cwa`@5m1m(YWCdym*I-rL9>e}?
z!oyTFz!xzZKSE7hwu@h11$AOO)Wg@u@}a1OOh#QmCTg5bSp3wZ7H|f&z&B7k^S-rT
z4^q%Xh1dqaMy<R)@0wQJ1Z!b))LRjU+TwWB1QSpbOh+wnF6!2-MD^Q-8fOn`0sGD4
zsCk1IC};=XKs^f|U{fqat+aeM-)g86>Y^r!L@gi&HBoQWmJY;7oQT?yAZpy5sJHAn
z)CHbK#tVAqDQJbSqXxQ!n)nLp#1F0gHtGt#MqTk;%ggbd)&<l+wKv7u*a6jVC~Dk^
z*bEa<3(3RM%<nntupOJwuorbtU&FTeA?k|Db@vxm7d2rMvxC*gp?2s2EPmfn6Hi86
zV8HTZ)cJF<LGk-fK@&WITKNgo3g1E9%d6M||A9I&{C<BSO;A_d3N>L@Ou>HG5Kp2O
z^jGsbYG(^j&(fC|)II!-f-KX+|Ke3aJp-LkCrm`$+i9pRorfBDB}U<TY=zIG`hSXA
z=q=PO{0X(7GClqCqfq@i_hkRop$8S(ss~X!Fd8*Ms@2a&EpVCD=V5j7M^FPjgId@z
z)Q((0oqq`@;QQ7d-OFECcdSAE;9fz0>k_HZ2`Lzj**F-VGQYuo<gvZ|-`hddGqMe}
zGl#JrUc^3l1J&Lz&cBtNP)~g?)P?p(EqrK@f+ik~+KEZ1txG}O`z6-C8MOo3E#Hs2
z(!-XYMGg20Y9}tCo}p`&e}U@%9crB4QR4^8vRplU^-!-z8&t<Jr~#*;PDn;AFbhZE
zDx8cTU<d5f*T2UzQMYCds{d}(P98x`_%rexdtq!R^8~#?6tvPY=2X-Gvr$`?gIdTM
zd=NL`F#Oo^*8TkjEW#4hA3^QFanyypgj(=BX1xKPH=H~LJL&zuKtZ?Qd(;VcaWs}4
z=sO8Vk)K39ieBg-|DN~4(&X`|^T(qWnuwt|3)P;EWicBQFo=36uj54K_c}j70XL&M
z{u4F852&}{E>6Yj?4u^gM)g~UT|(FyTtt3x2)6}ehx%K65o?jZj~eGoGn8%YL>_@b
zZPgeGb#XfCDGp))cVSa3!G1Tv=H^grOrDOqRn9zw#cu&dQhx)ZFogZ?h%GP^Cz)4<
zv;V5-&kfR+pTz}OaU`z_u0ehwdT(M&`~$V6E#v*ys~zg~>yO&8@#YkBhM8h!VFmgv
z#xPtP&;F~h)hhOz$FVB)7cBn^RwDlxbtPZneb{J}|8}&-%H%Pqg$zWEI}9~p0+z#B
z7>$|O5%&ct=!6f<8>oT4z()9k)z@Hqbnok<`Zq;Q(Aw&|p(cv6_Ti`nkF|V;<tez7
z`lYB_7raYB_p-_uf51+t3F0gtWR9`=X;^$ER-cKQc)7K2G#|sN)bFzPW7vTF0#?Tx
z$UH&sd%xiQg1RDatZxOgju~ZkGUHIs#xQJyxu}Qk6zT##GCxC&dkeMDA1yCAPW`z5
zl_{u0O*7JLk9vK2qE<c*weoD#tyqtGYqp>!JdRq(3ziq5#{CL4@voMb9q<1Rsg7ZK
z|D#pFSaYB`8nuOqmS<U>V{WnfXHW}y9=qXRP!rzASEd@)LM^a0YT+GG^L59dJ|u&z
z!${PG<1L?!5#$-D6CCQ^??pXa&!Q$ehnnCmRKLrpem5*HGVhrB+G(B&6WM>QD1r)Y
zZFAH>J*`83)D?_J4Lk=m;X<s4Yfx9d6?NW8)CHY2UqO8@-m&&8<~7uKpXmFm!k1R@
z3u=PU1mAGfN*klDs57d6FRLGF`4n@Gxezr@E^1+0uo>>eXnX~A0pA9#!yl+E4gHgU
z#Wj%6xz`f)J;+8)yaub_7RwKyCdfxkc+T>-Fr54{*1!U*ziXD5<ewKTXNAhB0cxUd
zNmJB<qEQp~Kn*n5>J!bms2$2d?a&sh--ETtkD}h5H&NphnRk$R*nj?t(5JL4>Po7i
z2CQR7o4rvVs!`Y+vrz*+VfBYm=Uuk?&n^E3wU821{4Z)<)Hpq`oaUcOK@%qzSMYba
z<%=y}VflLONIz%wZ(98otV{hh)UEmfwS%Rn`c^<KtU7AJ&CSjj8l<9+3itr3!wA&d
zFbP$kiK<_Ox<zYH6F!D&KY?mLWBKc-e($0d@)4@v=cu>oHfjfd!=MIgmgt|*2X!k(
zpiW3Y4KU5}WOFWR!Ug7PtAEt;?WhGDu>5({v-C1*+$*SsTuWsCRq>@Y+`(q#zoI5+
zG|fMujoBIXhsgb?0j8opxml<!-j5pZH0t~d<|Wj_`8V@3tN-UT_FpIbOojZz44v)|
zPyw|=bu5oT-I~6r{u8WzDn^s1pssu;YUd82uKa}gGRBi%!G;(aO!6n{hZ=AsYNg{*
zS2WGq=b0-|3)+P3@j29aA6t8Y`JL7Oj#0Fi=I=QfjdgGgYN5e&3R>YZjKGbktviNV
z$a!mj12xfA)WSZt{9E%U)U)$D>b!C@{Bf(H&TE1ix24$y*`c7<j{+YhZzyU-hs+mH
z6TOZ)@fwC=A?ixL#6cK7lfVCPlDQvsi*BRd`#(@SR_h@@?}WX`AH?c<|2I(34(vxw
zkdI~XoaL{e7VtJ|L08S&=D)4I(k%bV>zU0^=e0xaOb^ufgHRVbTr$5miGn)LMoq8)
zb;84_PwrOKl^nrl_y(%~SEvDhwLB!*e=92DDC!$y8fIfO7NN!opY0os#sB^{fI<Qd
zV^I^HL~YUAsENwW@vUJtK`pc$Y5{$*91ceQob*PUhs@uxGxeiV{QhfEw`g+;`>zuZ
zP{E(}-f`3bB~tx-9O}eFsD7Vd7~aP5_%Cxfm#O?9cEgZ#|F>Uv)B;DC<51&FHXll7
z|5cG;6-!V%k!yZ#_MGe2??62(|3VEMn&CfO6|g&b3)FZ4GYvz?bu1yS5xO-^sC<O@
zMECz8>k&<v4e$n#$K$<YBzapBJ>_F5zl3$|oTqW9b)1Uz$aM?*V<(~m<-ZcciJjz;
zgpRVf8-u+myg)%u{Jn#ZQ}O>h(H@<h&;}3O>wpccz5?ZbR@Q5lMY$s}ocM<PaYDzx
ziRsimS)BPl+K1@<vm-#`Q<VQk9Hgw{17ZeccDwkfLU{(I=GLBOs&PBf+48>sRsS*d
zeTip@j>H4B#S(8)UKhgrvq^@L==hQNkoc8oOdOz%*V~(i1-O<dO$;P2#J7nqL@x0F
zaqsvC1wD|>iIT)}`s=t4bFHlWyL;CkPUR7z1eHIih2sRVm?%#yC3FlTP8XN_A164c
zl;ywU8uGn(mbgRQJ2q0ENc5(nA;wulFoI+S34e}x_0>S=3BRBCU!sV3jyfGrntCOV
zT3Mg&M~GqMLE=8j4TxLBmqa#E!TKhdD{&?D9RBs+Pel${2V6o_By{W~wp+O>E+^kc
z{C`JR`W&LM9A3w-tmC7&$jXsejrMx@u<pN(nN)-je5kyIgsM*wuMq<Y9W9CaL?8O;
zxa?E>k4x#)eQNnM%Izrkw0`4o2r-B_Nd0lE&!=4H-u<sZ<z8#hIJ+tHzeS4wx+#Yd
z#27-yA=*Cji{56;Bi38q%M{g#g*N6Gy!&5mH!1%@1gq0<o5Cpk1E0aNxQ3`mJWD>B
zNT$4s2&23XA0u>J@$u&4&%`@KDt%fLIz|%Hi20Uh;663@N6>3Tg}(VZ22=hEZpP9?
zWy<UEq8d5$uU+j39jmY*wzB*S%2O%tAzr2YE)hd{1Tl;9`-G0MK3*^Ciy!q^*g+Dd
z3K!R+TCf(SpGdwXT2kIb<PqJ;C*xeA1aa@EN?{K9gIEXq-D|+_i8DlZ>SqyOQ*KQ>
zLHQ|S0&$*v2%+P7J$%P0gb}-lr-@KH9Yq}v6E}$Wh$n~?+WrS8VmG2Z@fNv`4U~2K
zoyej5Ct?v1T3pMEZBD^z#7tt6-ib%)bb+KN(Sq`4xSE(uWRmOXL_A1&DN%|zM}C;d
zBB~HNDpOyZXyT{EKO6D08F85Ulem>QMx+w~qWI-YQ-NbYopd~I#`x*~`MJQd1p4%$
zJdfBz{MqX7(SyQZVv3D5+ZsN{UDR#CR3bRe8k$kLnpj~c48>&PW!jU77l~-{wM3$w
zBNmYBD1%Xc(K~{#6TeyB*!naj-$%JNcJ<qWUQH@$k+dQ*hy>ydq8rhJwhh>V(6Pk^
z+G?uq72+yUiMo<RCgpHqBe9G)M%`lKpOkeprM!*s6nYzXNRCTH+u};T<hZH0mfM2Q
zSUH~h36#fMzhyYU+Qehz&da~rW_F0%-fn{H)&7iY+o5KDlMd5LmP`%IcPF}syZp`#
z-JQ-YT;G_^VQKSHv%I+JS+mkoGu_UZKJI2rUfGmDW@h5dK&Cs`CCa_uWsHmII=M_n
zAU!Q3E7QHzHOl?owSmj-w!&429qrO$d%2fm-*x-CKjG%z|DucSG1r~yk>Kk0JXtOx
zF)1m7!D8JvJzKgqy_%K?B)QGKg06k<-L7O@lzVhuEq5kviR;lP&7JSF!1d^x9G00C
z5lEVq6-bJhw$OF$x5&NM?|v88|FjDkaK}|0Slf*q80VfCxXtw%G|U|s6ydH9`ggtf
zQKKSe1OiE3d}3BWKW3%Q^x^~2Y3YGfw`=flcXx0X*Lz5Nmpf#u%N^R#y*ac|$x(^f
z?$rkaE_PVM{N!OZLfnSo6I|Gc7G=_AWX(^^2)HpL#=6TR7P=85=eVmQPrCg0*YXdH
z>J;J%M)!4H#tbi=nwS!Zb#=xjx$|Q)+=+2V+=t_%%47#3G6IQ7Y<3No+rFiHX+nzo
zbz($*|Adt#@_SAm7E(3SOHa(qoS&AF<fR8PrUz29^536wu9Ul!G{sE_yqDi&#=?^B
z@~m!dOmevEnOwsyNsb9Sv$=573tr*6g9R6MxvR;8UG(fd4T?_Z73CcB3RmacI(nuk
z|6pP6`dF`U(}sfcIR$5SxX3xv-L^TCLW|ZtUHHg4*CM4&je@fWZtgtl`4sJ4bL&_x
z<GLFuL6?y_)qS2C>sqCqEqQax2`(VgMW$!E57H02yt(o2v$+XwaK_~_g}aUy?p_}2
zI%T$Z3o@HjVogQMbG*W%>x=R>M>KXh2{qmKnL}J4>ztc1uL-xgwyT((;#OoQxPN3X
zahda{Rw~-Hym0fzo9DOQdg+mZbLZT=1xsC}h234=!dLUhFDe^S_12Tm`K!LUW7W-d
zr<uT=TRg&rFWKqNFX`v%E^Xz;E&aN&?tIay9Pie#RRu4;aF5$-HWY0=UU;54j=8@s
z8|I>eQ7$Ri-0cnSayypSaUU*k9$Ij5cj1x8-S(W()e2W1yuExa8~4cV<vBN>$tk$F
zFF$fcr4ZM5<uv!s%EqNH94mP7w7YNBNH=fQMpu6IXt!|nDK{neg|MO{Pu*ObSG4PJ
z;jV-3%0uDqV)wH7bJjEsaeMLxxbN~3N)>M25bJ(iJI5Vdm*dVqeAIokzNO3DaM^`y
zs+-?-)5#L<r$>9{uY9y#NX^^(P8B_N+$%hmdvkA&cXRtog?YI}$F}7E?5dXd4|-Fk
AhX4Qo

diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index b05b8d27..a95135d1 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-01 13:14-0700\n"
+"POT-Creation-Date: 2021-04-04 04:17+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"
@@ -19,10 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: bookwyrm/forms.py:226
-#, fuzzy
-#| msgid "A user with that username already exists."
 msgid "A user with this email already exists."
-msgstr "已�存在使用该用户�的用户。"
+msgstr "已�存在使用该邮箱的用户。"
 
 #: bookwyrm/forms.py:240
 msgid "One Day"
@@ -59,7 +57,7 @@ msgstr "%(value)s �是有效的 remote_id"
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s �是有效的用户�"
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:157
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:152
 msgid "username"
 msgstr "用户�"
 
@@ -136,10 +134,8 @@ msgid "Add cover"
 msgstr "添加��"
 
 #: bookwyrm/templates/book/book.html:53
-#, fuzzy
-#| msgid "Failed to load"
 msgid "Failed to load cover"
-msgstr "加载失败"
+msgstr "加载��失败"
 
 #: bookwyrm/templates/book/book.html:62
 msgid "ISBN:"
@@ -180,7 +176,7 @@ msgstr "�述:"
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
 #: bookwyrm/templates/settings/site.html:93
-#: bookwyrm/templates/snippets/readthrough.html:65
+#: bookwyrm/templates/snippets/readthrough.html:75
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
@@ -194,7 +190,7 @@ msgstr "�存"
 #: bookwyrm/templates/moderation/report_modal.html:32
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/readthrough.html:66
+#: bookwyrm/templates/snippets/readthrough.html:76
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
@@ -441,11 +437,11 @@ msgstr "<a href=\"%(work_path)s\">\"%(work_title)s\"</a> 的�版本"
 #: bookwyrm/templates/book/format_filter.html:8
 #: bookwyrm/templates/book/language_filter.html:8
 msgid "Any"
-msgstr ""
+msgstr "所有"
 
 #: bookwyrm/templates/book/language_filter.html:5
 msgid "Language:"
-msgstr ""
+msgstr "语言:"
 
 #: bookwyrm/templates/book/publisher_info.html:6
 #, python-format
@@ -458,10 +454,9 @@ msgid "%(pages)s pages"
 msgstr "%(pages)s 页"
 
 #: bookwyrm/templates/book/publisher_info.html:13
-#, fuzzy, python-format
-#| msgid "%(pages)s pages"
+#, python-format
 msgid "%(languages)s language"
-msgstr "%(pages)s 页"
+msgstr "%(languages)s 语言"
 
 #: bookwyrm/templates/book/publisher_info.html:18
 #, python-format
@@ -487,38 +482,31 @@ msgid "Close"
 msgstr "关闭"
 
 #: bookwyrm/templates/directory/community_filter.html:5
-#, fuzzy
-#| msgid "Comment"
 msgid "Community"
-msgstr "评论"
+msgstr "社区"
 
 #: bookwyrm/templates/directory/community_filter.html:8
-#, fuzzy
-#| msgid "Max uses"
 msgid "Local users"
-msgstr "最大使用次数"
+msgstr "本地用户"
 
 #: bookwyrm/templates/directory/community_filter.html:12
-#, fuzzy
-#| msgid "Federated"
 msgid "Federated community"
-msgstr "跨站"
+msgstr "跨站社区"
 
 #: bookwyrm/templates/directory/directory.html:6
 #: bookwyrm/templates/directory/directory.html:11
-#: bookwyrm/templates/layout.html:97
+#: bookwyrm/templates/layout.html:92
 msgid "Directory"
-msgstr ""
+msgstr "目录"
 
 #: bookwyrm/templates/directory/directory.html:19
 msgid "Make your profile discoverable to other BookWyrm users."
-msgstr ""
+msgstr "使你的个人资料�以被其它 BookWyrm 用户�现。"
 
 #: bookwyrm/templates/directory/directory.html:26
-#, fuzzy, python-format
-#| msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
+#, python-format
 msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
-msgstr "你�以在任何时候从你的<a href=\"%(path)s\">个人资料页�</a> 中设置或改�你的阅读目标"
+msgstr "你�以在任何时候从你的 <a href=\"%(path)s\">个人资料设定</a> 中退出。"
 
 #: bookwyrm/templates/directory/directory.html:31
 #: bookwyrm/templates/snippets/goal_card.html:22
@@ -526,54 +514,46 @@ msgid "Dismiss message"
 msgstr "�散消�"
 
 #: bookwyrm/templates/directory/directory.html:71
-#, fuzzy
-#| msgid "followed you"
 msgid "follower you follow"
 msgid_plural "followers you follow"
-msgstr[0] "关注了你"
+msgstr[0] "你关注的关注者"
 
 #: bookwyrm/templates/directory/directory.html:78
-#, fuzzy
-#| msgid "Your shelves"
 msgid "book on your shelves"
 msgid_plural "books on your shelves"
-msgstr[0] "你的书架"
+msgstr[0] "你书架上的书"
 
 #: bookwyrm/templates/directory/directory.html:86
 msgid "posts"
-msgstr ""
+msgstr "�文"
 
 #: bookwyrm/templates/directory/directory.html:92
 msgid "last active"
-msgstr ""
+msgstr "最�活跃"
 
 #: bookwyrm/templates/directory/sort_filter.html:5
 msgid "Order by"
-msgstr ""
+msgstr "排列顺�"
 
 #: bookwyrm/templates/directory/sort_filter.html:8
-#, fuzzy
-#| msgid "Suggest"
 msgid "Suggested"
-msgstr "推�"
+msgstr "�推�"
 
 #: bookwyrm/templates/directory/sort_filter.html:9
 msgid "Recently active"
-msgstr ""
+msgstr "最近活跃"
 
 #: bookwyrm/templates/directory/user_type_filter.html:5
-#, fuzzy
-#| msgid "User Activity"
 msgid "User type"
-msgstr "用户活动"
+msgstr "用户类型"
 
 #: bookwyrm/templates/directory/user_type_filter.html:8
 msgid "BookWyrm users"
-msgstr ""
+msgstr "BookWyrm 用户"
 
 #: bookwyrm/templates/directory/user_type_filter.html:12
 msgid "All known users"
-msgstr ""
+msgstr "所有已知用户"
 
 #: bookwyrm/templates/discover/about.html:7
 #, python-format
@@ -623,11 +603,11 @@ msgstr "本实例�开放。"
 
 #: bookwyrm/templates/discover/landing_layout.html:57
 msgid "Thank you! Your request has been received."
-msgstr ""
+msgstr "谢谢你�我们已��到了你的请求。"
 
 #: bookwyrm/templates/discover/landing_layout.html:60
 msgid "Request an Invitation"
-msgstr ""
+msgstr "请求邀请"
 
 #: bookwyrm/templates/discover/landing_layout.html:64
 #: bookwyrm/templates/password_reset_request.html:18
@@ -646,10 +626,8 @@ msgid "Your Account"
 msgstr "你的��"
 
 #: bookwyrm/templates/edit_author.html:5
-#, fuzzy
-#| msgid "Edit Author"
 msgid "Edit Author:"
-msgstr "编辑作者"
+msgstr "编辑作者:"
 
 #: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
 #: bookwyrm/templates/user/create_shelf_form.html:13
@@ -688,51 +666,46 @@ msgstr "Goodreads key:"
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
-msgstr ""
+msgstr "你好呀，"
 
 #: bookwyrm/templates/email/html_layout.html:21
 #, python-format
 msgid "BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a>"
-msgstr ""
+msgstr "�于 <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a> 的 BookWyrm"
 
 #: bookwyrm/templates/email/html_layout.html:23
 msgid "Email preference"
-msgstr ""
+msgstr "邮箱�好"
 
 #: bookwyrm/templates/email/invite/html_content.html:6
 #: bookwyrm/templates/email/invite/subject.html:2
-#, fuzzy, python-format
-#| msgid "About %(site_name)s"
+#, python-format
 msgid "You're invited to join %(site_name)s!"
-msgstr "关于 %(site_name)s"
+msgstr "你�邀请加入 %(site_name)s�"
 
 #: bookwyrm/templates/email/invite/html_content.html:9
-#, fuzzy
-#| msgid "Join"
 msgid "Join Now"
-msgstr "加入"
+msgstr "立�加入"
 
 #: bookwyrm/templates/email/invite/html_content.html:15
 #, python-format
 msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
-msgstr ""
+msgstr "了解更多 <a href=\"https://%(domain)s%(about_path)s\">有关本实例的信�</a>。"
 
 #: bookwyrm/templates/email/invite/text_content.html:4
 #, python-format
 msgid "You're invited to join %(site_name)s! Click the link below to create an account."
-msgstr ""
+msgstr "你�邀请加入 %(site_name)s�点击下�的连接�创建��。"
 
 #: bookwyrm/templates/email/invite/text_content.html:8
-#, fuzzy
-#| msgid "More about this site"
 msgid "Learn more about this instance:"
-msgstr "关于本站点的更多"
+msgstr "了解更多有关本实例的信�:"
 
 #: bookwyrm/templates/email/password_reset/html_content.html:6
 #: bookwyrm/templates/email/password_reset/text_content.html:4
 #, python-format
 msgid "You requested to reset your %(site_name)s password. Click the link below to set a new password and log in to your account."
-msgstr ""
+msgstr "你请求�置你在 %(site_name)s 的密�。点击下�的链接�设置新密�并登录你的��。"
 
 #: bookwyrm/templates/email/password_reset/html_content.html:9
 #: bookwyrm/templates/password_reset.html:4
@@ -745,13 +718,12 @@ msgstr "�设密�"
 #: bookwyrm/templates/email/password_reset/html_content.html:13
 #: bookwyrm/templates/email/password_reset/text_content.html:8
 msgid "If you didn't request to reset your password, you can ignore this email."
-msgstr ""
+msgstr "如果你没有请求�设密�，你�以忽略这�邮件。"
 
 #: bookwyrm/templates/email/password_reset/subject.html:2
-#, fuzzy, python-format
-#| msgid "About %(site_name)s"
+#, python-format
 msgid "Reset your %(site_name)s password"
-msgstr "关于 %(site_name)s"
+msgstr "�置你在 %(site_name)s 的密�"
 
 #: bookwyrm/templates/feed/direct_messages.html:8
 #, python-format
@@ -773,19 +745,15 @@ msgstr "你现在没有消�。"
 
 #: bookwyrm/templates/feed/feed.html:9
 msgid "Home Timeline"
-msgstr ""
+msgstr "主页时间线"
 
 #: bookwyrm/templates/feed/feed.html:11
-#, fuzzy
-#| msgid "%(tab_title)s Timeline"
 msgid "Local Timeline"
-msgstr "%(tab_title)s 时间线"
+msgstr "本地时间线"
 
 #: bookwyrm/templates/feed/feed.html:13
-#, fuzzy
-#| msgid "Federated Servers"
 msgid "Federated Timeline"
-msgstr "互�的�务器"
+msgstr "跨站时间线"
 
 #: bookwyrm/templates/feed/feed.html:19
 msgid "Home"
@@ -802,7 +770,7 @@ msgstr "跨站"
 #: bookwyrm/templates/feed/feed.html:33
 #, python-format
 msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
-msgstr ""
+msgstr "加载 <span data-poll=\"stream/%(tab)s\">0</span> �未读状�"
 
 #: bookwyrm/templates/feed/feed.html:48
 msgid "There aren't any activities right now! Try following a user to get started"
@@ -811,7 +779,7 @@ msgstr "现在还没有任何活动��试�从关注一个用户开始�"
 #: bookwyrm/templates/feed/feed.html:56
 #: bookwyrm/templates/get_started/users.html:6
 msgid "Who to follow"
-msgstr ""
+msgstr "�以关注的人"
 
 #: bookwyrm/templates/feed/feed_layout.html:5
 msgid "Updates"
@@ -853,25 +821,22 @@ msgstr "%(year)s 阅读目标"
 #, python-format
 msgid "%(mutuals)s follower you follow"
 msgid_plural "%(mutuals)s followers you follow"
-msgstr[0] ""
+msgstr[0] "%(mutuals)s 个你也关注的关注者"
 
 #: bookwyrm/templates/feed/suggested_users.html:19
 #, python-format
 msgid "%(shared_books)s book on your shelves"
 msgid_plural "%(shared_books)s books on your shelves"
-msgstr[0] ""
+msgstr[0] "%(shared_books)s 本在你书架上也有的书"
 
 #: bookwyrm/templates/get_started/book_preview.html:6
-#, fuzzy, python-format
-#| msgid "Want to Read \"<em>%(book_title)s</em>\""
+#, python-format
 msgid "Have you read %(book_title)s?"
-msgstr "想�阅读 \"<em>%(book_title)s</em>\""
+msgstr "你读过 %(book_title)s 了�？"
 
 #: bookwyrm/templates/get_started/books.html:6
-#, fuzzy
-#| msgid "Started reading"
 msgid "What are you reading?"
-msgstr "已开始阅读"
+msgstr "你在阅读什么？"
 
 #: bookwyrm/templates/get_started/books.html:9
 #: bookwyrm/templates/lists/list.html:58
@@ -888,7 +853,7 @@ msgstr "没有找到 \"%(query)s\" 的书目"
 #: bookwyrm/templates/get_started/books.html:11
 #, python-format
 msgid "You can add books when you start using %(site_name)s."
-msgstr ""
+msgstr "你�以在开始使用 %(site_name)s �添加书目。"
 
 #: bookwyrm/templates/get_started/books.html:16
 #: bookwyrm/templates/get_started/books.html:17
@@ -900,16 +865,13 @@ msgid "Search"
 msgstr "�索"
 
 #: bookwyrm/templates/get_started/books.html:26
-#, fuzzy
-#| msgid "Suggest Books"
 msgid "Suggested Books"
-msgstr "推�书目"
+msgstr "推�的书目"
 
 #: bookwyrm/templates/get_started/books.html:41
-#, fuzzy, python-format
-#| msgid "About %(site_name)s"
+#, python-format
 msgid "Popular on %(site_name)s"
-msgstr "关于 %(site_name)s"
+msgstr "%(site_name)s 上的热门"
 
 #: bookwyrm/templates/get_started/books.html:51
 #: bookwyrm/templates/lists/list.html:75
@@ -919,46 +881,37 @@ msgstr "没有找到书目"
 #: bookwyrm/templates/get_started/books.html:54
 #: bookwyrm/templates/get_started/profile.html:54
 msgid "Save &amp; continue"
-msgstr ""
+msgstr "�存 &amp; 继续"
 
 #: bookwyrm/templates/get_started/layout.html:14
-#, fuzzy, python-format
-#| msgid "About %(site_name)s"
+#, python-format
 msgid "Welcome to %(site_name)s!"
-msgstr "关于 %(site_name)s"
+msgstr "欢迎�到 %(site_name)s�"
 
 #: bookwyrm/templates/get_started/layout.html:16
 msgid "These are some first steps to get you started."
-msgstr ""
+msgstr "这些最�的步骤�以帮助你入门。"
 
 #: bookwyrm/templates/get_started/layout.html:30
 #: bookwyrm/templates/get_started/profile.html:6
-#, fuzzy
-#| msgid "View user profile"
 msgid "Create your profile"
-msgstr "查看用户个人资料"
+msgstr "创建你的个人资料"
 
 #: bookwyrm/templates/get_started/layout.html:34
-#, fuzzy
-#| msgid "Add Books"
 msgid "Add books"
 msgstr "添加书目"
 
 #: bookwyrm/templates/get_started/layout.html:38
-#, fuzzy
-#| msgid "Friendly"
 msgid "Find friends"
-msgstr "�好"
+msgstr "寻找�好"
 
 #: bookwyrm/templates/get_started/layout.html:44
 msgid "Skip this step"
-msgstr ""
+msgstr "跳过此步骤"
 
 #: bookwyrm/templates/get_started/layout.html:48
-#, fuzzy
-#| msgid "Finished"
 msgid "Finish"
-msgstr "已完�"
+msgstr "完�"
 
 #: bookwyrm/templates/get_started/profile.html:15
 #: bookwyrm/templates/preferences/edit_user.html:24
@@ -972,7 +925,7 @@ msgstr "概�:"
 
 #: bookwyrm/templates/get_started/profile.html:23
 msgid "A little bit about you"
-msgstr ""
+msgstr "少许关于你的信�"
 
 #: bookwyrm/templates/get_started/profile.html:32
 #: bookwyrm/templates/preferences/edit_user.html:17
@@ -987,17 +940,15 @@ msgstr "手动批准关注者:"
 #: bookwyrm/templates/get_started/profile.html:48
 #: bookwyrm/templates/preferences/edit_user.html:58
 msgid "Show this account in suggested users:"
-msgstr ""
+msgstr "在推�的用户中显示此��:"
 
 #: bookwyrm/templates/get_started/profile.html:52
 msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users."
-msgstr ""
+msgstr "你的��会显示在目录中，并且�能会�其它 BookWyrm 用户推�。"
 
 #: bookwyrm/templates/get_started/users.html:11
-#, fuzzy
-#| msgid "Search for a book or user"
 msgid "Search for a user"
-msgstr "�索书目或用户"
+msgstr "�索用户"
 
 #: bookwyrm/templates/get_started/users.html:13
 #: bookwyrm/templates/search_results.html:76
@@ -1036,19 +987,17 @@ msgid "%(username)s's %(year)s Books"
 msgstr "%(username)s 在 %(year)s 的书目"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/layout.html:102
+#: bookwyrm/templates/layout.html:97
 msgid "Import Books"
 msgstr "导入书目"
 
 #: bookwyrm/templates/import.html:16
-#, fuzzy
-#| msgid "Data source"
 msgid "Data source:"
-msgstr "数���"
+msgstr "数���:"
 
 #: bookwyrm/templates/import.html:29
 msgid "Data file:"
-msgstr ""
+msgstr "数�文件:"
 
 #: bookwyrm/templates/import.html:37
 msgid "Include reviews"
@@ -1177,16 +1126,11 @@ msgstr "主导航��"
 msgid "Feed"
 msgstr "动�"
 
-#: bookwyrm/templates/layout.html:92
-#: bookwyrm/templates/preferences/preferences_layout.html:14
-msgid "Profile"
-msgstr "个人资料"
-
-#: bookwyrm/templates/layout.html:107
+#: bookwyrm/templates/layout.html:102
 msgid "Settings"
 msgstr "设置"
 
-#: bookwyrm/templates/layout.html:116
+#: bookwyrm/templates/layout.html:111
 #: bookwyrm/templates/settings/admin_layout.html:24
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
@@ -1194,57 +1138,57 @@ msgstr "设置"
 msgid "Invites"
 msgstr "邀请"
 
-#: bookwyrm/templates/layout.html:123
+#: bookwyrm/templates/layout.html:118
 msgid "Admin"
 msgstr "管�员"
 
-#: bookwyrm/templates/layout.html:130
+#: bookwyrm/templates/layout.html:125
 msgid "Log out"
 msgstr "登出"
 
-#: bookwyrm/templates/layout.html:138 bookwyrm/templates/layout.html:139
+#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:10
 msgid "Notifications"
 msgstr "通知"
 
-#: bookwyrm/templates/layout.html:156 bookwyrm/templates/layout.html:160
+#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "用户�:"
 
-#: bookwyrm/templates/layout.html:161
+#: bookwyrm/templates/layout.html:156
 msgid "password"
 msgstr "密�"
 
-#: bookwyrm/templates/layout.html:162 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr "忘记了密�？"
 
-#: bookwyrm/templates/layout.html:165 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "登录"
 
-#: bookwyrm/templates/layout.html:173
+#: bookwyrm/templates/layout.html:168
 msgid "Join"
 msgstr "加入"
 
-#: bookwyrm/templates/layout.html:196
+#: bookwyrm/templates/layout.html:191
 msgid "About this server"
 msgstr "关于本�务器"
 
-#: bookwyrm/templates/layout.html:200
+#: bookwyrm/templates/layout.html:195
 msgid "Contact site admin"
 msgstr "�系站点管�员"
 
-#: bookwyrm/templates/layout.html:207
+#: bookwyrm/templates/layout.html:202
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr "在 <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a> 上支� %(site_name)s"
 
-#: bookwyrm/templates/layout.html:211
+#: bookwyrm/templates/layout.html:206
 msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm 是开�软件。你�以在 <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> 贡献或报告问题。"
 
@@ -1331,7 +1275,7 @@ msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "由 <a href=\"%(user_path)s\">%(username)s</a> 添加"
 
 #: bookwyrm/templates/lists/list.html:41
-#: bookwyrm/templates/snippets/shelf_selector.html:28
+#: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr "移除"
 
@@ -1464,10 +1408,9 @@ msgid "Resolve"
 msgstr "已解决"
 
 #: bookwyrm/templates/moderation/reports.html:6
-#, fuzzy, python-format
-#| msgid "Report @%(username)s"
+#, python-format
 msgid "Reports: %(server_name)s"
-msgstr "报告 %(username)s"
+msgstr "报告: %(server_name)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
 #: bookwyrm/templates/moderation/reports.html:16
@@ -1476,20 +1419,17 @@ msgid "Reports"
 msgstr "报告"
 
 #: bookwyrm/templates/moderation/reports.html:13
-#, fuzzy, python-format
-#| msgid "Report @%(username)s"
+#, python-format
 msgid "Reports: <small>%(server_name)s</small>"
-msgstr "报告 %(username)s"
+msgstr "报告: <small>%(server_name)s</small>"
 
 #: bookwyrm/templates/moderation/reports.html:27
 msgid "Resolved"
 msgstr "已解决"
 
 #: bookwyrm/templates/moderation/reports.html:34
-#, fuzzy
-#| msgid "No books found"
 msgid "No reports found."
-msgstr "没有找到书目"
+msgstr "没有找到报告"
 
 #: bookwyrm/templates/notifications.html:14
 msgid "Delete notifications"
@@ -1653,16 +1593,20 @@ msgstr "在消��中显示设置阅读目标的�示:"
 #: bookwyrm/templates/preferences/edit_user.html:62
 #, python-format
 msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
-msgstr ""
+msgstr "你的��会显示在 <a href=\"%(path)s\">目录</a> 中，并�能�其它 BookWyrm 用户推�。"
 
 #: bookwyrm/templates/preferences/edit_user.html:65
 msgid "Preferred Timezone: "
-msgstr ""
+msgstr "�好的时区:"
 
 #: bookwyrm/templates/preferences/preferences_layout.html:11
 msgid "Account"
 msgstr "��"
 
+#: bookwyrm/templates/preferences/preferences_layout.html:14
+msgid "Profile"
+msgstr "个人资料"
+
 #: bookwyrm/templates/preferences/preferences_layout.html:20
 msgid "Relationships"
 msgstr "关系"
@@ -1700,7 +1644,7 @@ msgstr "管�用户"
 #: bookwyrm/templates/settings/user_admin.html:3
 #: bookwyrm/templates/settings/user_admin.html:10
 msgid "Users"
-msgstr ""
+msgstr "用户"
 
 #: bookwyrm/templates/settings/admin_layout.html:32
 #: bookwyrm/templates/settings/federation.html:3
@@ -1739,32 +1683,24 @@ msgid "Registration"
 msgstr "注册"
 
 #: bookwyrm/templates/settings/federated_server.html:7
-#, fuzzy
-#| msgid "Back to reports"
 msgid "Back to server list"
-msgstr "回到报告"
+msgstr "回到�务器列表"
 
 #: bookwyrm/templates/settings/federated_server.html:12
 msgid "Details"
-msgstr ""
+msgstr "详细"
 
 #: bookwyrm/templates/settings/federated_server.html:15
-#, fuzzy
-#| msgid "Software"
 msgid "Software:"
-msgstr "软件"
+msgstr "软件:"
 
 #: bookwyrm/templates/settings/federated_server.html:19
-#, fuzzy
-#| msgid "Description:"
 msgid "Version:"
-msgstr "�述:"
+msgstr "版本:"
 
 #: bookwyrm/templates/settings/federated_server.html:23
-#, fuzzy
-#| msgid "Status"
 msgid "Status:"
-msgstr "状�"
+msgstr "状�:"
 
 #: bookwyrm/templates/settings/federated_server.html:30
 #: bookwyrm/templates/user/user_layout.html:50
@@ -1772,56 +1708,45 @@ msgid "Activity"
 msgstr "活动"
 
 #: bookwyrm/templates/settings/federated_server.html:33
-#, fuzzy
-#| msgid "Username:"
 msgid "Users:"
-msgstr "用户�:"
+msgstr "用户:"
 
 #: bookwyrm/templates/settings/federated_server.html:36
 #: bookwyrm/templates/settings/federated_server.html:43
 msgid "View all"
-msgstr ""
+msgstr "查看全部"
 
 #: bookwyrm/templates/settings/federated_server.html:40
-#, fuzzy
-#| msgid "Reports"
 msgid "Reports:"
-msgstr "报告"
+msgstr "报告:"
 
 #: bookwyrm/templates/settings/federated_server.html:47
-#, fuzzy
-#| msgid "followed you"
 msgid "Followed by us:"
-msgstr "关注了你"
+msgstr "我们关注了的:"
 
 #: bookwyrm/templates/settings/federated_server.html:53
-#, fuzzy
-#| msgid "followed you"
 msgid "Followed by them:"
-msgstr "关注了你"
+msgstr "TA 们关注了的:"
 
 #: bookwyrm/templates/settings/federated_server.html:59
-#, fuzzy
-#| msgid "Blocked Users"
 msgid "Blocked by us:"
-msgstr "�蔽的用户"
+msgstr "我们所�蔽的:"
 
 #: bookwyrm/templates/settings/federation.html:13
 msgid "Server name"
 msgstr "�务器�称"
 
 #: bookwyrm/templates/settings/federation.html:17
-#, fuzzy
-#| msgid "Federated"
 msgid "Date federated"
-msgstr "跨站"
+msgstr "跨站日期"
 
 #: bookwyrm/templates/settings/federation.html:21
 msgid "Software"
 msgstr "软件"
 
 #: bookwyrm/templates/settings/federation.html:24
-#: bookwyrm/templates/settings/manage_invite_requests.html:33
+#: bookwyrm/templates/settings/manage_invite_requests.html:40
+#: bookwyrm/templates/settings/status_filter.html:5
 #: bookwyrm/templates/settings/user_admin.html:32
 msgid "Status"
 msgstr "状�"
@@ -1830,74 +1755,67 @@ msgstr "状�"
 #: bookwyrm/templates/settings/manage_invite_requests.html:11
 #: bookwyrm/templates/settings/manage_invite_requests.html:25
 #: bookwyrm/templates/settings/manage_invites.html:11
-#, fuzzy
-#| msgid "Invites"
 msgid "Invite Requests"
-msgstr "邀请"
+msgstr "邀请请求"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:23
 msgid "Ignored Invite Requests"
-msgstr ""
+msgstr "已忽略的邀请请求"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:31
+#: bookwyrm/templates/settings/manage_invite_requests.html:35
 msgid "Date"
-msgstr ""
+msgstr "日期"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:32
+#: bookwyrm/templates/settings/manage_invite_requests.html:38
 msgid "Email"
-msgstr ""
+msgstr "邮箱"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:34
-#, fuzzy
-#| msgid "Actions"
+#: bookwyrm/templates/settings/manage_invite_requests.html:43
 msgid "Action"
 msgstr "动作"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:37
-#, fuzzy
-#| msgid "Follow Requests"
+#: bookwyrm/templates/settings/manage_invite_requests.html:46
 msgid "No requests"
-msgstr "关注请求"
+msgstr "没有请求"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:45
-#, fuzzy
-#| msgid "Accept"
+#: bookwyrm/templates/settings/manage_invite_requests.html:54
+#: bookwyrm/templates/settings/status_filter.html:16
 msgid "Accepted"
-msgstr "接�"
+msgstr "已接�"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:47
+#: bookwyrm/templates/settings/manage_invite_requests.html:56
+#: bookwyrm/templates/settings/status_filter.html:12
 msgid "Sent"
-msgstr ""
+msgstr "已��"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:49
+#: bookwyrm/templates/settings/manage_invite_requests.html:58
+#: bookwyrm/templates/settings/status_filter.html:8
 msgid "Requested"
-msgstr ""
+msgstr "已请求"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:57
+#: bookwyrm/templates/settings/manage_invite_requests.html:68
 msgid "Send invite"
-msgstr ""
-
-#: bookwyrm/templates/settings/manage_invite_requests.html:59
-msgid "Re-send invite"
-msgstr ""
+msgstr "��请求"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:70
+msgid "Re-send invite"
+msgstr "�新��请求"
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:90
 msgid "Ignore"
-msgstr ""
+msgstr "忽略"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:72
-msgid "Un-gnore"
-msgstr ""
+#: bookwyrm/templates/settings/manage_invite_requests.html:92
+msgid "Un-ignore"
+msgstr "�消忽略"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:83
-#, fuzzy
-#| msgid "Back to reports"
+#: bookwyrm/templates/settings/manage_invite_requests.html:103
 msgid "Back to pending requests"
-msgstr "回到报告"
+msgstr "回到待处�的请求"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:85
+#: bookwyrm/templates/settings/manage_invite_requests.html:105
 msgid "View ignored requests"
-msgstr ""
+msgstr "查看忽略的请求"
 
 #: bookwyrm/templates/settings/manage_invites.html:21
 msgid "Generate New Invite"
@@ -1984,10 +1902,8 @@ msgid "Allow registration:"
 msgstr "�许注册:"
 
 #: bookwyrm/templates/settings/site.html:83
-#, fuzzy
-#| msgid "Follow Requests"
 msgid "Allow invite requests:"
-msgstr "关注请求"
+msgstr "�许请求邀请:"
 
 #: bookwyrm/templates/settings/site.html:87
 msgid "Registration closed text:"
@@ -1996,43 +1912,35 @@ msgstr "注册关闭文字:"
 #: bookwyrm/templates/settings/user_admin.html:7
 #, python-format
 msgid "Users: <small>%(server_name)s</small>"
-msgstr ""
+msgstr "用户: <small>%(server_name)s</small>"
 
 #: bookwyrm/templates/settings/user_admin.html:20
-#, fuzzy
-#| msgid "Username:"
 msgid "Username"
-msgstr "用户�:"
+msgstr "用户�"
 
 #: bookwyrm/templates/settings/user_admin.html:24
-#, fuzzy
-#| msgid "Added:"
 msgid "Date Added"
-msgstr "添加了:"
+msgstr "添加日期:"
 
 #: bookwyrm/templates/settings/user_admin.html:28
 msgid "Last Active"
-msgstr ""
+msgstr "最�或缺"
 
 #: bookwyrm/templates/settings/user_admin.html:36
-#, fuzzy
-#| msgid "Remove"
 msgid "Remote server"
-msgstr "移除"
+msgstr "移除�务器"
 
 #: bookwyrm/templates/settings/user_admin.html:45
-#, fuzzy
-#| msgid "Activity"
 msgid "Active"
-msgstr "活动"
+msgstr "活跃"
 
 #: bookwyrm/templates/settings/user_admin.html:45
 msgid "Inactive"
-msgstr ""
+msgstr "�用"
 
 #: bookwyrm/templates/settings/user_admin.html:50
 msgid "Not set"
-msgstr ""
+msgstr "未设置"
 
 #: bookwyrm/templates/snippets/block_button.html:5
 msgid "Block"
@@ -2076,22 +1984,16 @@ msgid "Quote"
 msgstr "引用"
 
 #: bookwyrm/templates/snippets/create_status_form.html:18
-#, fuzzy
-#| msgid "Comment"
 msgid "Comment:"
-msgstr "评论"
+msgstr "评论:"
 
 #: bookwyrm/templates/snippets/create_status_form.html:20
-#, fuzzy
-#| msgid "Quote"
 msgid "Quote:"
-msgstr "引用"
+msgstr "引用:"
 
 #: bookwyrm/templates/snippets/create_status_form.html:22
-#, fuzzy
-#| msgid "Review"
 msgid "Review:"
-msgstr "书评"
+msgstr "书评:"
 
 #: bookwyrm/templates/snippets/create_status_form.html:29
 #: bookwyrm/templates/user/shelf.html:81
@@ -2169,24 +2071,20 @@ msgid "Un-like status"
 msgstr "�消喜欢状�"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:7
-#, fuzzy
-#| msgid "Show less"
 msgid "Show filters"
-msgstr "显示更少"
+msgstr "显示过滤器"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:9
 msgid "Hide filters"
-msgstr ""
+msgstr "��过滤器"
 
-#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:19
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:22
 msgid "Apply filters"
-msgstr ""
+msgstr "应用过滤器"
 
-#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:23
-#, fuzzy
-#| msgid "Clear search"
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:26
 msgid "Clear filters"
-msgstr "清除�索"
+msgstr "清除过滤器"
 
 #: bookwyrm/templates/snippets/follow_button.html:12
 msgid "Follow"
@@ -2211,23 +2109,21 @@ msgid_plural "set a goal to read %(counter)s books in %(year)s"
 msgstr[0] "设定了在 %(year)s 内�读 %(counter)s 本书的目标"
 
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
-#, fuzzy, python-format
-#| msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(rating)s star"
-#| msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(rating)s stars"
+#, python-format
 msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
 msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
-msgstr[0] "为 <em><a href=\"%(path)s\">%(title)s</a></em> 打了分: %(rating)s 星"
+msgstr[0] "为 <em><a href=\"%(path)s\">%(title)s</a></em> 打了分: %(display_rating)s 星"
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4
 #, python-format
 msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
 msgid_plural "Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
-msgstr[0] ""
+msgstr[0] "\"%(book_title)s\" 的书评（%(display_rating)s 星）: %(review_title)s"
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:8
 #, python-format
 msgid "Review of \"%(book_title)s\": %(review_title)s"
-msgstr ""
+msgstr "\"%(book_title)s\" 的书评: %(review_title)s"
 
 #: bookwyrm/templates/snippets/goal_card.html:23
 #, python-format
@@ -2276,11 +2172,21 @@ msgstr "你已�阅读了 <a href=\"%(path)s\">%(goal_count)s 本书中的 %(re
 msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
 msgstr "%(username)s 已�阅读了 <a href=\"%(path)s\">%(goal_count)s 本书中的 %(read_count)s 本</a>。"
 
-#: bookwyrm/templates/snippets/pagination.html:7
+#: bookwyrm/templates/snippets/page_text.html:4
+#, python-format
+msgid "page %(page)s of %(total_pages)s"
+msgstr "%(total_pages)s 页中的第 %(page)s 页"
+
+#: bookwyrm/templates/snippets/page_text.html:6
+#, python-format
+msgid "page %(page)s"
+msgstr "第 %(page)s 页"
+
+#: bookwyrm/templates/snippets/pagination.html:5
 msgid "Previous"
 msgstr "往�"
 
-#: bookwyrm/templates/snippets/pagination.html:15
+#: bookwyrm/templates/snippets/pagination.html:9
 msgid "Next"
 msgstr "往�"
 
@@ -2321,28 +2227,28 @@ msgstr "评价"
 msgid "Progress Updates:"
 msgstr "进度更新:"
 
-#: bookwyrm/templates/snippets/readthrough.html:12
+#: bookwyrm/templates/snippets/readthrough.html:14
 msgid "finished"
 msgstr "已完�"
 
-#: bookwyrm/templates/snippets/readthrough.html:15
+#: bookwyrm/templates/snippets/readthrough.html:25
 msgid "Show all updates"
 msgstr "显示所有更新"
 
-#: bookwyrm/templates/snippets/readthrough.html:31
+#: bookwyrm/templates/snippets/readthrough.html:41
 msgid "Delete this progress update"
 msgstr "删除此进度更新"
 
-#: bookwyrm/templates/snippets/readthrough.html:41
+#: bookwyrm/templates/snippets/readthrough.html:51
 msgid "started"
 msgstr "已开始"
 
-#: bookwyrm/templates/snippets/readthrough.html:47
-#: bookwyrm/templates/snippets/readthrough.html:61
+#: bookwyrm/templates/snippets/readthrough.html:57
+#: bookwyrm/templates/snippets/readthrough.html:71
 msgid "Edit read dates"
 msgstr "编辑阅读日期"
 
-#: bookwyrm/templates/snippets/readthrough.html:51
+#: bookwyrm/templates/snippets/readthrough.html:61
 msgid "Delete these read dates"
 msgstr "删除这些阅读日期"
 
@@ -2403,10 +2309,8 @@ msgid "Import book"
 msgstr "导入书目"
 
 #: bookwyrm/templates/snippets/shelf_selector.html:4
-#, fuzzy
-#| msgid "Your books"
 msgid "Move book"
-msgstr "你的书目"
+msgstr "移动书目"
 
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
 #, python-format
@@ -2415,10 +2319,8 @@ msgstr "完� \"<em>%(book_title)s</em>\""
 
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:35
-#, fuzzy
-#| msgid "Updates"
 msgid "Update progress"
-msgstr "æ›´æ–°"
+msgstr "更新进度"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5
 msgid "More shelves"
@@ -2438,10 +2340,9 @@ msgid "Want to read"
 msgstr "想�阅读"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:48
-#, fuzzy, python-format
-#| msgid "Report @%(username)s"
+#, python-format
 msgid "Remove from %(name)s"
-msgstr "报告 %(username)s"
+msgstr "从 %(name)s 移除"
 
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
 #, python-format
@@ -2512,16 +2413,12 @@ msgid "Switch to this edition"
 msgstr "切�到此版本"
 
 #: bookwyrm/templates/snippets/table-sort-header.html:6
-#, fuzzy
-#| msgid "Started reading"
 msgid "Sorted asccending"
-msgstr "已开始阅读"
+msgstr "��排�"
 
 #: bookwyrm/templates/snippets/table-sort-header.html:10
-#, fuzzy
-#| msgid "Started reading"
 msgid "Sorted descending"
-msgstr "已开始阅读"
+msgstr "��排�"
 
 #: bookwyrm/templates/snippets/tag.html:14
 msgid "Remove tag"
@@ -2537,10 +2434,9 @@ msgid "Books tagged \"%(tag.name)s\""
 msgstr "标有 \"%(tag.name)s\" 标签的书"
 
 #: bookwyrm/templates/user/books_header.html:5
-#, fuzzy, python-format
-#| msgid "%(username)s's %(year)s Books"
+#, python-format
 msgid "%(username)s's books"
-msgstr "%(username)s 在 %(year)s 的书目"
+msgstr "%(username)s 的书目"
 
 #: bookwyrm/templates/user/create_shelf_form.html:5
 #: bookwyrm/templates/user/create_shelf_form.html:22
@@ -2589,10 +2485,8 @@ msgid "Create list"
 msgstr "创建列表"
 
 #: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:56
-#, fuzzy
-#| msgid "books"
 msgid "All books"
-msgstr "书目"
+msgstr "所有书目"
 
 #: bookwyrm/templates/user/shelf.html:37
 msgid "Create shelf"
@@ -2614,11 +2508,11 @@ msgstr "已开始"
 msgid "Finished"
 msgstr "已完�"
 
-#: bookwyrm/templates/user/shelf.html:127
+#: bookwyrm/templates/user/shelf.html:129
 msgid "This shelf is empty."
 msgstr "此书架是空的。"
 
-#: bookwyrm/templates/user/shelf.html:133
+#: bookwyrm/templates/user/shelf.html:135
 msgid "Delete shelf"
 msgstr "删除书架"
 
@@ -2627,14 +2521,13 @@ msgid "Edit profile"
 msgstr "编辑个人资料"
 
 #: bookwyrm/templates/user/user.html:34
-#, fuzzy, python-format
-#| msgid "See all %(size)s"
+#, python-format
 msgid "View all %(size)s"
 msgstr "查看所有 %(size)s 本"
 
 #: bookwyrm/templates/user/user.html:47
 msgid "View all books"
-msgstr ""
+msgstr "查看所有书目"
 
 #: bookwyrm/templates/user/user.html:59
 #, python-format
@@ -2662,8 +2555,6 @@ msgid "Reading Goal"
 msgstr "阅读目标"
 
 #: bookwyrm/templates/user/user_layout.html:68
-#, fuzzy
-#| msgid "Book"
 msgid "Books"
 msgstr "书目"
 
@@ -2684,22 +2575,20 @@ msgid "%(counter)s following"
 msgstr "关注� %(counter)s 人"
 
 #: bookwyrm/views/password.py:32
-#, fuzzy
-#| msgid "A user with that username already exists."
 msgid "No user with that email address was found."
-msgstr "已�存在使用该用户�的用户。"
+msgstr "没有找到使用该邮箱的用户。"
 
 #: bookwyrm/views/password.py:41
 #, python-format
 msgid "A password reset link sent to %s"
-msgstr ""
+msgstr "密��置连接已��给 %s"
 
 #, fuzzy
 #~| msgid "Started"
 #~ msgid "Getting Started"
 #~ msgstr "已开始"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "No users found for \"%(query)s\""
 #~ msgid "No users were found for \"%(query)s\""
 #~ msgstr "没有找到 \"%(query)s\" 的用户"
@@ -2713,7 +2602,6 @@ msgstr ""
 #~ msgid "Your lists"
 #~ msgstr "你的列表"
 
-#, python-format
 #~ msgid "See all %(size)s lists"
 #~ msgstr "查看所有 %(size)s 个列表"
 
@@ -2738,14 +2626,12 @@ msgstr ""
 #~ msgid "Your Shelves"
 #~ msgstr "你的书架"
 
-#, python-format
 #~ msgid "%(username)s: Shelves"
 #~ msgstr "%(username)s: 书架"
 
 #~ msgid "Shelves"
 #~ msgstr "书架"
 
-#, python-format
 #~ msgid "See all %(shelf_count)s shelves"
 #~ msgstr "查看所有 %(shelf_count)s 个书架"
 

From 1e4cc68faec0d448e4fe492e71bd3a0ab1b8ea64 Mon Sep 17 00:00:00 2001
From: GuDzpoz <GuDzpoz@live.com>
Date: Sun, 4 Apr 2021 12:37:40 +0800
Subject: [PATCH 0623/1285] Contextual fixes

---
 locale/zh_CN/LC_MESSAGES/django.mo | Bin 38410 -> 38419 bytes
 locale/zh_CN/LC_MESSAGES/django.po |   6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
index bdfaaef855d82416fa6673b122350d5b1cdde240..912802b7dc0d8837bad0ed86853da5e3b397ef84 100644
GIT binary patch
delta 3111
zcmXZedrVh#7{~D=3Wj2Wgh(z#5yZ@}yjP}XOs3(LyiA>%u2C~HL-Phd@`^}Fl9Dx;
zEsM(gWtz)r(^jq3oLOcr&7tDdrshn$*y#P?eExcUpXYmf&U4NWE!!GZxixC%Gs%&-
zAPAZi20?4Q7h7Q}#^6J!`JR}FgKR#=5*K)Wu8r7oY{UFUY>rzo3HPGT{nqox3xi1G
z!52vAqQ6iDM9-rbOvFyu2{oUCDs&9C$LCN77CXNJ?;&1qYcQI)7N5dxsP#9n9p0H2
z2@~=2Lz7V#rP^+`AF8k%I~MhX(@~u$#KuBU`&W2=o#PMfZhIJY-gglvPNNREgqe5^
zyJOO8VJC*5=EtBqFcEdp3#eB!ABSTZs^up=e-`73ui|*Tiy4@|Alx5W#2|shDknCg
zF8T;n;Wo#g<9)<Our2=V{54cTf1(PCUKs9gV^eGz>bx$f0(&F-BEbL#14!hd4p@V_
z;GJ+mu)`ikwfq>W<#o>gj_ru=Vk#yr3eV|f2ip;-izi_VoPjaiAIxT;gXh^&`yT4!
z+m2ay997^y&Np8i?t2iGAK-YHo#Ol)RDng<1vg+vJcOONKRCxgPt<ftXe-n!NOqj+
zILmRi<Nnx_b%UHQbiNqdlV5>)_wS<$+>PqMVf!^k8e8fGb@n={fV+4<HZ2O{RMbHk
zn1qj_F39!#M9)t{z3Z1yg)H`bmFH_5Zz-bxTDY5pD*M6{-=MzgW2n}jM;#Pb93Gs7
zdWU^bg$_pT&$XkRpMWFDPj$Ql^#J=&4}P?m{ws0P3(kAN6;xq&97nTGUwIp^*L%~&
z*{DMMI39*tH`?)Z%p@*Aty_z_?*q^8jCimg)0sGgT3Ck<<84%>871L`{ZLOj5R-8z
z>Vm1LgIA)yrAo)u_EYRkem`pdR~xBkpp7?BPxK$=Vzbxz`;U333m2j0m!b+>?YJ7X
ze>3V8?Q;A*>Ki%j_y#tf@3`60#(j|>fq^PY#qOAeYW+CW#WPVYon@Ec7~*p5fWM&%
zXh2;Mw=9ekQJqUe?eFRQ5IYLn>-Rr}!6PhKi2BpG1$EGI)WN6hMbtqzJs-6^EHD<k
zkWaAvQTwLb*{EO9V$_3eK%KK0)3`s_%Rn1`vUOf?9aTsJsuM9Q!Y8^HmG5Y?P``$3
zR3{%pUGTK$^HJwd@_d2k=VIf(|4SL@g0(mqt5B8RvQaC;i{nuTrK1YyfjzJ<ssjb6
zZ>Iut@E6o8?XW70^HASJCF(EYC#&ecKAIy=oW+5}cf7D~Y4{|07(;#vHpiKcXQ2vu
z74@!599KHtWcN7#6{<rg?3q&fuLCZ5!7WrPo2(8mj6-!I(RM_w&qiJNgyWGIOFS91
z|9Mowub>KEfSFk0xE6KJjtGMk1_x0Go<z0iGU{K!22`usmW2moqc)C1T`&V5z!y>b
zN>S(3pw{g|{ag>>So{I|W9FJ5n1GRK3|?k%0QIiAmWLOPN9E@@K8O0K{>F5SeIp2l
zVRxK_3s43Bh<b%rF%G-E8QKpEh;#5++#cp5L9?}C#R;}E>dE?IEIx_(m}{%;P3%p6
zXhpcb2-Sh*sD1C^Xxxn2f7|i!x59nZ7^~m^2?nb44C;U@j)Qgl(@NY5)v6J;)&`Yf
zD<`7<XH<#t_%U|H1E>c%Z?B*V`@`|Sif59DdOMtmvu#l=O|whvDcfs(_$n$;7i>cP
zifZw3Jc_!g!N%@MNxwX*<@WOW(u(@3eV42D?rBjN(>m_LXJz#@`<zKx_GOcn2TLy2
Mu5sex@{EN40S&{(fdBvi

delta 3102
zcmXZedrX#P7{~DkQ1n$1Bo*|XVH|ZSYK*p2)G^4Wsd#Q4b7iTmF#|(IeGCsEqN1WU
z-QMhAnvs&Pr6sQZur&{9OB<^!q?B}sYi1f{Ti+k|_1EXVuKRFZ&;2|vy0bR2vNp2r
z*#tk}d0s@Z=fz@IjKLsA<3Q|&L-7&JF(;$;EwuSUbCtOX<C))$o$v$fg&(8N{o3X)
z7JGjC!A&Go=r2?Qk;^=<JH}x$CZXnYQH@T*AkIe}SZet)>`c7F+=m^B-@{xyj9TA{
ziFj|B?-DVuJA0xE1<e6wHmb2)vjFvk^H4Xj6x$m??Ju+WZ5F>{9yRMx=biN}(SSPO
zI;LX_4#xNrcN1e!^OI0FFauTSCDf}a!tq#+y7J35{}aX$-^7{NhG{r?x!doTFz7*I
zy(M;|3cZW!@UX=vu_y5t*c-1{z6I6LT~tGnE8PBAv$xp~bzUl}!6%S?zBimf4vBH7
z11eAjcDV&!tyzz{@(ZXdZ?ya^OeAi@M=^e-J7<_V${dd>{2X?{=P{c4-YX1r@N4D<
z^G(#p_aP3zi>L-4SiVE4+n0gL54U)%Im_~|q8eO@8MqT4!&8_{eeY)mdLnO?vkU4K
z^t3o=ahk=0EPfKRSeIk@rIs(nAo()XyAPonJc_!3dh-nW?N@3G8qM3N2HLPMdaGR=
zL>-ijy>JMsK)%h-u=%;DcfADF$a0&nvH5)#A6m`*YvEB6>g=>le1-a|FQBge8tS0H
z8h3CS>K$gG8Xbk&pKngE{B)c|evZYps0Rq69{kHS+`kf+ZNW8L@H?updlpBsPG5Pf
ztxrM~9)xN%%i^)9brUU~hv~!%QR}Ku_4eERN4^b?V+s?ePzxI|6aPeYn!MH(%tk%w
zNKC*yRDn6DgV&+HrD}`!ng=nJ{BhL$52pVc18r<YJ<&h-3`V@c)8RN&!4lNGk7{tE
z#d}fv-$uQnBNm@SeIpGPw_^MG7Dtq|@AJLx4AfB&2V)xQ>ZhU#FF;-CVsiyfA>M>Z
zcoo&aLsWslI(J?i>gM{Q_76s_%Q44cP{03~42CgLg!<EX0CmuL)Q0cOM$|#KZT=yu
z!Kn4_ciq*@LhYMvE<*i^mZ2W38g)(x`%~XL!ay4?p>E=;EoeqHavxRbKhzU-+~D$w
zW)kYxkdE3v3{_x+&5uW&KgH(f+x%kmHL-$$3T(tVxE0lDi`j-M+-ajbs4uFq3>=D?
zn1S<A-%dH^<F}|++PmDvd8luq67?5xe>wNBkLEK=e2=4v@7Ti33il*=7)^c}cEZ^f
zzkqsxC8!2VEUvV8k9pYgr%^X_&b(5={p)~VY(Wd^D*r|mjN0UGqKlb`TAz+8m}T+P
z7$BaC+CLYye-WzTLQKaJi$kb$-uD^wVGu?g_zmicuA%-FypOu7m`Zm*I%?wtRDoI8
z4;P^J`KWVtq1GKj{aio6sdyHj!hW0imk|A#3<??4q25*hDpznKD*v*@4XBUm4@^OC
z3x69R6=!21s^RmfSNJP-!{n{bA-ITmBu>WzF7JE)GEm2zw>g8TC(FbDX5%y*ZPu8#
zFq{0SYPY@^bpxfSecN#|?nCWwwK#XX+gF1D{r=A}P^VW=2Q*py0LKt_*x{}!-wc@#
zP*+*7)BVq=661*9!hu+adXOK@CRAfLExxPxMG|c`5mn<B#GtM;!7MT_nUC*suc91P
zU=Qk76v7esIjYco(+l@WxmD2l#IYMks+udR!!gCtv4I;Wj$J=l*&O;boV4ytgeL3P
O-Z;29d}n=HkN*J}1;9uE

diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index a95135d1..30f1039a 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -2498,15 +2498,15 @@ msgstr "编辑书架"
 
 #: bookwyrm/templates/user/shelf.html:78
 msgid "Shelved"
-msgstr "已上架"
+msgstr "上架时间"
 
 #: bookwyrm/templates/user/shelf.html:79
 msgid "Started"
-msgstr "已开始"
+msgstr "开始时间"
 
 #: bookwyrm/templates/user/shelf.html:80
 msgid "Finished"
-msgstr "已完�"
+msgstr "完�时间"
 
 #: bookwyrm/templates/user/shelf.html:129
 msgid "This shelf is empty."

From 02ef930f65cf66deee79fc5bbe7837a3b235fc16 Mon Sep 17 00:00:00 2001
From: GuDzpoz <GuDzpoz@live.com>
Date: Sun, 4 Apr 2021 12:41:12 +0800
Subject: [PATCH 0624/1285] Contextual fixes

---
 locale/zh_CN/LC_MESSAGES/django.mo | Bin 38419 -> 38419 bytes
 locale/zh_CN/LC_MESSAGES/django.po |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
index 912802b7dc0d8837bad0ed86853da5e3b397ef84..019000e2a74794ac764fb9313da0e56c4fa59479 100644
GIT binary patch
delta 21
dcmbQdhH3H|rVZx(Y|rMbd9riaX50R2Yyfg(3d;Zh

delta 21
dcmbQdhH3H|rVZx(Y)^JBdp>*JX50R2Yyfhw3e5lj

diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index 30f1039a..85187207 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/LC_MESSAGES/django.po
@@ -2136,7 +2136,7 @@ msgstr "阅读目标:"
 
 #: bookwyrm/templates/snippets/goal_form.html:14
 msgid "books"
-msgstr "书目"
+msgstr "本书"
 
 #: bookwyrm/templates/snippets/goal_form.html:19
 msgid "Goal privacy:"

From 485b0fa0f316de04a23ec3a749272dca02bc41b9 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sun, 4 Apr 2021 15:08:42 +0200
Subject: [PATCH 0625/1285] Simplify rating form:

- Create a snippet to regroup similar code.
- Reduce and document tricky logic of CSS.
- Add i18n strings.
---
 bookwyrm/static/css/format.css                |  50 ++----
 .../snippets/create_status_form.html          |  12 +-
 .../templates/snippets/form_rate_stars.html   |  54 ++++++
 bookwyrm/templates/snippets/rate_action.html  |  12 +-
 bookwyrm/templates/snippets/stars.html        |  25 ++-
 locale/fr_FR/LC_MESSAGES/django.mo            | Bin 24275 -> 24395 bytes
 locale/fr_FR/LC_MESSAGES/django.po            | 168 ++++++++++--------
 7 files changed, 189 insertions(+), 132 deletions(-)
 create mode 100644 bookwyrm/templates/snippets/form_rate_stars.html

diff --git a/bookwyrm/static/css/format.css b/bookwyrm/static/css/format.css
index e3ae1ce7..ccd7277d 100644
--- a/bookwyrm/static/css/format.css
+++ b/bookwyrm/static/css/format.css
@@ -80,52 +80,34 @@ html {
     }
 }
 
-/* --- STARS --- */
-.rate-stars button.icon {
-    background: none;
-    border: none;
-    padding: 0;
-    margin: 0;
-    display: inline;
+/** Stars in a review form
+ *
+ * Specificity makes hovering taking over checked inputs.
+ *
+ * \e9d9: filled star
+ * \e9d7: empty star;
+ ******************************************************************************/
+
+.form-rate-stars {
+    width: max-content;
 }
 
-.rate-stars:hover .icon::before {
+/* All stars are visually filled by default. */
+.form-rate-stars .icon::before {
     content: '\e9d9';
 }
 
-.rate-stars form:hover ~ form .icon::before {
+/* Icons directly following inputs that follow the checked input are emptied. */
+.form-rate-stars input:checked ~ input + .icon::before {
     content: '\e9d7';
 }
 
-/** stars in a review form
- *
- * @todo Simplify the logic for those icons.
- */
-.form-rate-stars input + .icon.icon::before {
-    content: '\e9d9';
-}
-
+/* When a label is hovered, repeat the fill-all-then-empty-following pattern. */
 .form-rate-stars:hover .icon.icon::before {
     content: '\e9d9';
 }
 
-.form-rate-stars input:checked + .icon.icon::before {
-    content: '\e9d9';
-}
-
-.form-rate-stars input:checked + * ~ .icon.icon::before {
-    content: '\e9d7';
-}
-
-.form-rate-stars:hover label.icon.icon::before {
-    content: '\e9d9';
-}
-
-.form-rate-stars label.icon:hover::before {
-    content: '\e9d9';
-}
-
-.form-rate-stars label.icon:hover ~ label.icon.icon::before {
+.form-rate-stars .icon:hover ~ .icon::before {
     content: '\e9d7';
 }
 
diff --git a/bookwyrm/templates/snippets/create_status_form.html b/bookwyrm/templates/snippets/create_status_form.html
index c70a0e58..091a2c6b 100644
--- a/bookwyrm/templates/snippets/create_status_form.html
+++ b/bookwyrm/templates/snippets/create_status_form.html
@@ -27,16 +27,8 @@
         {% if type == 'review' %}
         <fieldset>
             <legend class="is-sr-only">{% trans "Rating" %}</legend>
-            <div class="field is-grouped stars form-rate-stars">
-                <label class="is-sr-only" for="no-rating-{{ book.id }}">{% trans "No rating" %}</label>
-                <input class="is-sr-only" type="radio" name="rating" value="" id="no-rating-{{ book.id }}" checked>
-                {% for i in '12345'|make_list %}
-                <input class="is-sr-only" id="book{{book.id}}-star-{{ forloop.counter }}" type="radio" name="rating" value="{{ forloop.counter }}">
-                <label class="icon icon-star-empty" for="book{{book.id}}-star-{{ forloop.counter }}">
-                    <span class="is-sr-only">{{ forloop.counter }} star{{ forloop.counter | pluralize }}</span>
-                </label>
-                {% endfor %}
-            </div>
+
+            {% include 'snippets/form_rate_stars.html' with book=book type=type|default:'summary' %}
         </fieldset>
         {% endif %}
 
diff --git a/bookwyrm/templates/snippets/form_rate_stars.html b/bookwyrm/templates/snippets/form_rate_stars.html
new file mode 100644
index 00000000..25544739
--- /dev/null
+++ b/bookwyrm/templates/snippets/form_rate_stars.html
@@ -0,0 +1,54 @@
+{% spaceless %}
+{% load i18n %}
+{% load bookwyrm_tags %}
+
+<div class="
+    field is-grouped
+    stars form-rate-stars
+    {% if classes %}{{classes}}{% endif%}
+">
+    <input
+        id="{{ type|slugify }}-{{ book.id }}-no-rating"
+        class="is-sr-only"
+        type="radio"
+        name="rating"
+        value="0"
+        {% if book|user_rating:user == 0 %}checked{% endif %}
+    >
+
+    <label class="is-sr-only" for="{{ type|slugify }}-{{ book.id }}-no-rating">
+        {% trans "No rating" %}
+    </label>
+
+    {% for i in '12345'|make_list %}
+        <input
+            id="{{ type|slugify }}-book{{ book.id }}-star-{{ forloop.counter }}"
+            class="is-sr-only"
+            type="radio"
+            name="rating"
+            value="{{ forloop.counter }}"
+            {% if book|user_rating:user == forloop.counter %}checked{% endif %}
+        />
+
+        <label
+            class="
+                icon
+                {% if forloop.counter <= book|user_rating:user %}
+                icon-star-full
+                {% else %}
+                icon-star-empty
+                {% endif %}
+            "
+            for="{{ type|slugify }}-book{{ book.id }}-star-{{ forloop.counter }}"
+        >
+            <span class="is-sr-only">
+                {% blocktranslate trimmed count rating=forloop.counter %}
+                    {{ rating }} star
+                {% plural %}
+                    {{ rating }} stars
+                {% endblocktranslate %}
+            </span>
+        </label>
+    {% endfor %}
+</div>
+{% endspaceless %}
diff --git a/bookwyrm/templates/snippets/rate_action.html b/bookwyrm/templates/snippets/rate_action.html
index 447a1c9b..47662147 100644
--- a/bookwyrm/templates/snippets/rate_action.html
+++ b/bookwyrm/templates/snippets/rate_action.html
@@ -8,18 +8,8 @@
         <input type="hidden" name="user" value="{{ request.user.id }}">
         <input type="hidden" name="book" value="{{ book.id }}">
         <input type="hidden" name="privacy" value="public">
-        <input type="hidden" name="rating" value="{{ forloop.counter }}">
 
-        <div class="field is-grouped stars form-rate-stars mb-1 has-text-warning-dark">
-            <label class="is-sr-only" for="rating-no-rating-{{ book.id }}">{% trans "No rating" %}</label>
-            <input class="is-sr-only" type="radio" name="rating" value="" id="rating-no-rating-{{ book.id }}" checked>
-            {% for i in '12345'|make_list %}
-            <input class="is-sr-only" id="rating-book{{book.id}}-star-{{ forloop.counter }}" type="radio" name="rating" value="{{ forloop.counter }}" {% if book|user_rating:user == forloop.counter %}checked{% endif %}>
-            <label class="icon icon-star-empty" for="rating-book{{book.id}}-star-{{ forloop.counter }}">
-                <span class="is-sr-only">{{ forloop.counter }} star{{ forloop.counter | pluralize }}</span>
-            </label>
-            {% endfor %}
-        </div>
+        {% include 'snippets/form_rate_stars.html' with book=book classes='mb-1 has-text-warning-dark' %}
 
         <div class="field has-addons hidden">
             <div class="control">
diff --git a/bookwyrm/templates/snippets/stars.html b/bookwyrm/templates/snippets/stars.html
index f336a562..2b40a9e3 100644
--- a/bookwyrm/templates/snippets/stars.html
+++ b/bookwyrm/templates/snippets/stars.html
@@ -1,8 +1,27 @@
+{% spaceless %}
 {% load i18n %}
+
 <p class="stars">
-<span class="is-sr-only">{% if rating %}{{ rating|floatformat }} star{{ rating|floatformat | pluralize }}{% else %}{% trans "No rating" %}{% endif %}</span>
-    {% for i in '12345'|make_list %}
-    <span class="icon is-small mr-1 icon-star-{% if rating >= forloop.counter %}full{% elif rating|floatformat:0 >= forloop.counter|floatformat:0 %}half{% else %}empty{% endif %}" aria-hidden="true">
+    <span class="is-sr-only">
+        {% if rating %}
+            {% blocktranslate trimmed with rating=rating|floatformat count counter=rating|length %}
+                {{ rating }} star
+            {% plural %}
+                {{ rating }} stars
+            {% endblocktranslate %}
+        {% else %}
+            {% trans "No rating" %}
+        {% endif %}
     </span>
+
+    {% for i in '12345'|make_list %}
+        <span
+            class="
+                icon is-small mr-1
+                icon-star-{% if rating >= forloop.counter %}full{% elif rating|floatformat:0 >= forloop.counter|floatformat:0 %}half{% else %}empty{% endif %}
+            "
+            aria-hidden="true"
+        ></span>
     {% endfor %}
 </p>
+{% endspaceless %}
diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index 1a23164b13ec0e2a61b8747e91f5213950bab658..bae2cccfacb0d3e15078b395dd3b49b0c75cd72b 100644
GIT binary patch
delta 7425
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
XZ;u;2bi|`~UuI3E>+f$hrS^XSmeBh=

delta 7308
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

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 05ba96bb..b167dea2 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-01 13:14-0700\n"
-"PO-Revision-Date: 2021-03-02 12:37+0100\n"
+"POT-Creation-Date: 2021-04-04 13:04+0000\n"
+"PO-Revision-Date: 2021-04-04 14:43+0100\n"
 "Last-Translator: Fabien Basmaison <contact@arkhi.org>\n"
 "Language-Team: Mouse Reeve <LL@li.org>\n"
 "Language: fr_FR\n"
@@ -59,7 +59,7 @@ msgstr ""
 msgid "%(value)s is not a valid username"
 msgstr ""
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:157
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:152
 #, fuzzy
 #| msgid "Username:"
 msgid "username"
@@ -185,7 +185,7 @@ msgstr "Description :"
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
 #: bookwyrm/templates/settings/site.html:93
-#: bookwyrm/templates/snippets/readthrough.html:65
+#: bookwyrm/templates/snippets/readthrough.html:75
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
@@ -199,7 +199,7 @@ msgstr "Enregistrer"
 #: bookwyrm/templates/moderation/report_modal.html:32
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/readthrough.html:66
+#: bookwyrm/templates/snippets/readthrough.html:76
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
@@ -537,7 +537,7 @@ msgstr "Fédéré"
 
 #: bookwyrm/templates/directory/directory.html:6
 #: bookwyrm/templates/directory/directory.html:11
-#: bookwyrm/templates/layout.html:97
+#: bookwyrm/templates/layout.html:92
 msgid "Directory"
 msgstr ""
 
@@ -1082,7 +1082,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "Livres de %(username)s en %(year)s"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/layout.html:102
+#: bookwyrm/templates/layout.html:97
 msgid "Import Books"
 msgstr "Importer des livres"
 
@@ -1223,18 +1223,13 @@ msgstr "Menu de navigation principal "
 msgid "Feed"
 msgstr "Fil d’actualité"
 
-#: bookwyrm/templates/layout.html:92
-#: bookwyrm/templates/preferences/preferences_layout.html:14
-msgid "Profile"
-msgstr "Profil"
-
-#: bookwyrm/templates/layout.html:107
+#: bookwyrm/templates/layout.html:102
 #, fuzzy
 #| msgid "Instance Settings"
 msgid "Settings"
 msgstr "Paramètres de l’instance"
 
-#: bookwyrm/templates/layout.html:116
+#: bookwyrm/templates/layout.html:111
 #: bookwyrm/templates/settings/admin_layout.html:24
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
@@ -1242,59 +1237,59 @@ msgstr "Paramètres de l’instance"
 msgid "Invites"
 msgstr "Invitations"
 
-#: bookwyrm/templates/layout.html:123
+#: bookwyrm/templates/layout.html:118
 msgid "Admin"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:130
+#: bookwyrm/templates/layout.html:125
 msgid "Log out"
 msgstr "Se déconnecter"
 
-#: bookwyrm/templates/layout.html:138 bookwyrm/templates/layout.html:139
+#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:10
 msgid "Notifications"
 msgstr "Notifications"
 
-#: bookwyrm/templates/layout.html:156 bookwyrm/templates/layout.html:160
+#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "Nom d’utilisateur :"
 
-#: bookwyrm/templates/layout.html:161
+#: bookwyrm/templates/layout.html:156
 #, fuzzy
 #| msgid "Password:"
 msgid "password"
 msgstr "Mot de passe :"
 
-#: bookwyrm/templates/layout.html:162 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr "Mot de passe oublié ?"
 
-#: bookwyrm/templates/layout.html:165 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "Se connecter"
 
-#: bookwyrm/templates/layout.html:173
+#: bookwyrm/templates/layout.html:168
 msgid "Join"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:196
+#: bookwyrm/templates/layout.html:191
 msgid "About this server"
 msgstr "À propos de ce serveur"
 
-#: bookwyrm/templates/layout.html:200
+#: bookwyrm/templates/layout.html:195
 msgid "Contact site admin"
 msgstr "Contacter l’administrateur du site"
 
-#: bookwyrm/templates/layout.html:207
+#: bookwyrm/templates/layout.html:202
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:211
+#: bookwyrm/templates/layout.html:206
 msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "Bookwyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports de bogues via <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
@@ -1384,7 +1379,7 @@ msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/lists/list.html:41
-#: bookwyrm/templates/snippets/shelf_selector.html:28
+#: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr "Supprimer"
 
@@ -1473,7 +1468,7 @@ msgstr ""
 
 #: bookwyrm/templates/moderation/report.html:54
 #: bookwyrm/templates/snippets/create_status.html:12
-#: bookwyrm/templates/snippets/create_status_form.html:52
+#: bookwyrm/templates/snippets/create_status_form.html:44
 msgid "Comment"
 msgstr "Commentaire"
 
@@ -1730,6 +1725,10 @@ msgstr ""
 msgid "Account"
 msgstr "Compte"
 
+#: bookwyrm/templates/preferences/preferences_layout.html:14
+msgid "Profile"
+msgstr "Profil"
+
 #: bookwyrm/templates/preferences/preferences_layout.html:20
 msgid "Relationships"
 msgstr "Relations"
@@ -1888,7 +1887,8 @@ msgid "Software"
 msgstr "Logiciel"
 
 #: bookwyrm/templates/settings/federation.html:24
-#: bookwyrm/templates/settings/manage_invite_requests.html:33
+#: bookwyrm/templates/settings/manage_invite_requests.html:40
+#: bookwyrm/templates/settings/status_filter.html:5
 #: bookwyrm/templates/settings/user_admin.html:32
 msgid "Status"
 msgstr "Statut"
@@ -1906,61 +1906,64 @@ msgstr "Invitations"
 msgid "Ignored Invite Requests"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:31
+#: bookwyrm/templates/settings/manage_invite_requests.html:35
 msgid "Date"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:32
+#: bookwyrm/templates/settings/manage_invite_requests.html:38
 msgid "Email"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:34
+#: bookwyrm/templates/settings/manage_invite_requests.html:43
 #, fuzzy
 #| msgid "Notifications"
 msgid "Action"
 msgstr "Notifications"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:37
+#: bookwyrm/templates/settings/manage_invite_requests.html:46
 #, fuzzy
 #| msgid "Follow Requests"
 msgid "No requests"
 msgstr "Demandes d’abonnement"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:45
+#: bookwyrm/templates/settings/manage_invite_requests.html:54
+#: bookwyrm/templates/settings/status_filter.html:16
 #, fuzzy
 #| msgid "Accept"
 msgid "Accepted"
 msgstr "Accepter"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:47
+#: bookwyrm/templates/settings/manage_invite_requests.html:56
+#: bookwyrm/templates/settings/status_filter.html:12
 msgid "Sent"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:49
+#: bookwyrm/templates/settings/manage_invite_requests.html:58
+#: bookwyrm/templates/settings/status_filter.html:8
 msgid "Requested"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:57
+#: bookwyrm/templates/settings/manage_invite_requests.html:68
 msgid "Send invite"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:59
+#: bookwyrm/templates/settings/manage_invite_requests.html:70
 msgid "Re-send invite"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:70
+#: bookwyrm/templates/settings/manage_invite_requests.html:90
 msgid "Ignore"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:72
-msgid "Un-gnore"
+#: bookwyrm/templates/settings/manage_invite_requests.html:92
+msgid "Un-ignore"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:83
+#: bookwyrm/templates/settings/manage_invite_requests.html:103
 msgid "Back to pending requests"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:85
+#: bookwyrm/templates/settings/manage_invite_requests.html:105
 msgid "View ignored requests"
 msgstr ""
 
@@ -2161,47 +2164,41 @@ msgstr "Critique"
 msgid "Rating"
 msgstr "Note"
 
-#: bookwyrm/templates/snippets/create_status_form.html:31
-#: bookwyrm/templates/snippets/rate_action.html:14
-#: bookwyrm/templates/snippets/stars.html:3
-msgid "No rating"
-msgstr "Aucune note"
-
-#: bookwyrm/templates/snippets/create_status_form.html:64
+#: bookwyrm/templates/snippets/create_status_form.html:56
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
 msgid "Progress:"
 msgstr "Progression :"
 
-#: bookwyrm/templates/snippets/create_status_form.html:71
+#: bookwyrm/templates/snippets/create_status_form.html:63
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr "pages"
 
-#: bookwyrm/templates/snippets/create_status_form.html:72
+#: bookwyrm/templates/snippets/create_status_form.html:64
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr "pourcent"
 
-#: bookwyrm/templates/snippets/create_status_form.html:77
+#: bookwyrm/templates/snippets/create_status_form.html:69
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "sur %(pages)s pages"
 
-#: bookwyrm/templates/snippets/create_status_form.html:89
+#: bookwyrm/templates/snippets/create_status_form.html:81
 msgid "Include spoiler alert"
 msgstr "Afficher une alerte spoiler"
 
-#: bookwyrm/templates/snippets/create_status_form.html:95
+#: bookwyrm/templates/snippets/create_status_form.html:87
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:19
 msgid "Private"
 msgstr "Privé"
 
-#: bookwyrm/templates/snippets/create_status_form.html:102
+#: bookwyrm/templates/snippets/create_status_form.html:94
 msgid "Post"
 msgstr "Publier"
 
@@ -2241,11 +2238,11 @@ msgstr "Replier"
 msgid "Hide filters"
 msgstr ""
 
-#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:19
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:22
 msgid "Apply filters"
 msgstr ""
 
-#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:23
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:26
 #, fuzzy
 #| msgid "Clear search"
 msgid "Clear filters"
@@ -2269,6 +2266,19 @@ msgstr "Se désabonner"
 msgid "Accept"
 msgstr "Accepter"
 
+#: bookwyrm/templates/snippets/form_rate_stars.html:20
+#: bookwyrm/templates/snippets/stars.html:13
+msgid "No rating"
+msgstr "Aucune note"
+
+#: bookwyrm/templates/snippets/form_rate_stars.html:45
+#: bookwyrm/templates/snippets/stars.html:7
+#, python-format
+msgid "%(rating)s star"
+msgid_plural "%(rating)s stars"
+msgstr[0] "%(rating)s étoile"
+msgstr[1] "%(rating)s étoiles"
+
 #: bookwyrm/templates/snippets/generated_status/goal.html:1
 #, python-format
 msgid "set a goal to read %(counter)s book in %(year)s"
@@ -2343,11 +2353,23 @@ msgstr "Vous avez lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s livr
 msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
 msgstr "%(username)s a lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s livres</a>."
 
-#: bookwyrm/templates/snippets/pagination.html:7
+#: bookwyrm/templates/snippets/page_text.html:4
+#, fuzzy, python-format
+#| msgid "of %(pages)s pages"
+msgid "page %(page)s of %(total_pages)s"
+msgstr "sur %(pages)s pages"
+
+#: bookwyrm/templates/snippets/page_text.html:6
+#, fuzzy, python-format
+#| msgid "of %(book.pages)s pages"
+msgid "page %(page)s"
+msgstr "sur %(book.pages)s pages"
+
+#: bookwyrm/templates/snippets/pagination.html:5
 msgid "Previous"
 msgstr "Précédente"
 
-#: bookwyrm/templates/snippets/pagination.html:15
+#: bookwyrm/templates/snippets/pagination.html:9
 msgid "Next"
 msgstr "Suivante"
 
@@ -2380,7 +2402,7 @@ msgstr "Abonnements"
 msgid "Leave a rating"
 msgstr "Laisser une note"
 
-#: bookwyrm/templates/snippets/rate_action.html:29
+#: bookwyrm/templates/snippets/rate_action.html:19
 msgid "Rate"
 msgstr "Noter"
 
@@ -2388,28 +2410,28 @@ msgstr "Noter"
 msgid "Progress Updates:"
 msgstr "Progression :"
 
-#: bookwyrm/templates/snippets/readthrough.html:12
+#: bookwyrm/templates/snippets/readthrough.html:14
 msgid "finished"
 msgstr "terminé"
 
-#: bookwyrm/templates/snippets/readthrough.html:15
+#: bookwyrm/templates/snippets/readthrough.html:25
 msgid "Show all updates"
 msgstr "Montrer toutes les progressions"
 
-#: bookwyrm/templates/snippets/readthrough.html:31
+#: bookwyrm/templates/snippets/readthrough.html:41
 msgid "Delete this progress update"
 msgstr "Supprimer cette mise à jour"
 
-#: bookwyrm/templates/snippets/readthrough.html:41
+#: bookwyrm/templates/snippets/readthrough.html:51
 msgid "started"
 msgstr "commencé"
 
-#: bookwyrm/templates/snippets/readthrough.html:47
-#: bookwyrm/templates/snippets/readthrough.html:61
+#: bookwyrm/templates/snippets/readthrough.html:57
+#: bookwyrm/templates/snippets/readthrough.html:71
 msgid "Edit read dates"
 msgstr "Modifier les date de lecture"
 
-#: bookwyrm/templates/snippets/readthrough.html:51
+#: bookwyrm/templates/snippets/readthrough.html:61
 #, fuzzy
 #| msgid "Delete these read dates?"
 msgid "Delete these read dates"
@@ -2696,11 +2718,11 @@ msgstr "Commencé"
 msgid "Finished"
 msgstr "Terminé"
 
-#: bookwyrm/templates/user/shelf.html:127
+#: bookwyrm/templates/user/shelf.html:129
 msgid "This shelf is empty."
 msgstr "Cette étagère est vide"
 
-#: bookwyrm/templates/user/shelf.html:133
+#: bookwyrm/templates/user/shelf.html:135
 msgid "Delete shelf"
 msgstr "Supprimer l’étagère"
 
@@ -2781,7 +2803,7 @@ msgstr ""
 #~ msgid "Getting Started"
 #~ msgstr "Commencé"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "No users found for \"%(query)s\""
 #~ msgid "No users were found for \"%(query)s\""
 #~ msgstr "Aucun compte trouvé pour « %(query)s »"
@@ -2795,7 +2817,7 @@ msgstr ""
 #~ msgid "Your lists"
 #~ msgstr "Vos listes"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "See all %(size)s"
 #~ msgid "See all %(size)s lists"
 #~ msgstr "Voir les %(size)s"
@@ -2821,14 +2843,12 @@ msgstr ""
 #~ msgid "Your Shelves"
 #~ msgstr "Vos étagères"
 
-#, python-format
 #~ msgid "%(username)s: Shelves"
 #~ msgstr "%(username)s : Étagères"
 
 #~ msgid "Shelves"
 #~ msgstr "Étagères"
 
-#, python-format
 #~ msgid "See all %(shelf_count)s shelves"
 #~ msgstr "Voir les %(shelf_count)s étagères"
 

From b3535d9a902ee20c5c407b0c185421d78b091ad2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 4 Apr 2021 08:42:01 -0700
Subject: [PATCH 0626/1285] Hides disabled pagination links for screenreaders

---
 bookwyrm/templates/snippets/pagination.html | 22 +++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/snippets/pagination.html b/bookwyrm/templates/snippets/pagination.html
index a11bbbb4..3b33ca62 100644
--- a/bookwyrm/templates/snippets/pagination.html
+++ b/bookwyrm/templates/snippets/pagination.html
@@ -1,12 +1,26 @@
 {% load i18n %}
 <nav class="pagination" aria-label="pagination">
-    <a class="pagination-previous {% if not page.has_previous %}is-disabled{% endif %}" {% if page.has_previous %}href="{{ path }}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number }}{{ anchor }}"{% endif %}>
-        <span class="icon icon-arrow-left"></span>
+    <a
+        class="pagination-previous {% if not page.has_previous %}is-disabled{% endif %}"
+        {% if page.has_previous %}
+        href="{{ path }}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number }}{{ anchor }}"
+        {% else %}
+        aria-hidden="true"
+        {% endif %}>
+
+        <span class="icon icon-arrow-left" aria-hidden="true"></span>
         {% trans "Previous" %}
     </a>
 
-    <a class="pagination-next {% if not page.has_next %}is-disabled{% endif %}" {% if page.has_next %}href="{{ path }}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number }}{{ anchor }}"{% endif %}>
+    <a
+        class="pagination-next {% if not page.has_next %}is-disabled{% endif %}"
+        {% if page.has_next %}
+        href="{{ path }}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number }}{{ anchor }}"
+        {% else %}
+        aria-hidden="true"
+        {% endif %}>
+
         {% trans "Next" %}
-        <span class="icon icon-arrow-right"></span>
+        <span class="icon icon-arrow-right" aria-hidden="true"></span>
     </a>
 </nav>

From 521f917d014f2495547502101b367547d05cb956 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 4 Apr 2021 09:05:21 -0700
Subject: [PATCH 0627/1285] Pass existing rating to stars form element as
 variable

---
 bookwyrm/templates/snippets/form_rate_stars.html | 6 +++---
 bookwyrm/templates/snippets/rate_action.html     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/snippets/form_rate_stars.html b/bookwyrm/templates/snippets/form_rate_stars.html
index 25544739..3abebac0 100644
--- a/bookwyrm/templates/snippets/form_rate_stars.html
+++ b/bookwyrm/templates/snippets/form_rate_stars.html
@@ -13,7 +13,7 @@
         type="radio"
         name="rating"
         value="0"
-        {% if book|user_rating:user == 0 %}checked{% endif %}
+        {% if default_rating == 0 or not default_rating %}checked{% endif %}
     >
 
     <label class="is-sr-only" for="{{ type|slugify }}-{{ book.id }}-no-rating">
@@ -27,13 +27,13 @@
             type="radio"
             name="rating"
             value="{{ forloop.counter }}"
-            {% if book|user_rating:user == forloop.counter %}checked{% endif %}
+            {% if default_rating == forloop.counter %}checked{% endif %}
         />
 
         <label
             class="
                 icon
-                {% if forloop.counter <= book|user_rating:user %}
+                {% if forloop.counter <= default_rating %}
                 icon-star-full
                 {% else %}
                 icon-star-empty
diff --git a/bookwyrm/templates/snippets/rate_action.html b/bookwyrm/templates/snippets/rate_action.html
index 47662147..9fee692d 100644
--- a/bookwyrm/templates/snippets/rate_action.html
+++ b/bookwyrm/templates/snippets/rate_action.html
@@ -9,7 +9,7 @@
         <input type="hidden" name="book" value="{{ book.id }}">
         <input type="hidden" name="privacy" value="public">
 
-        {% include 'snippets/form_rate_stars.html' with book=book classes='mb-1 has-text-warning-dark' %}
+        {% include 'snippets/form_rate_stars.html' with book=book classes='mb-1 has-text-warning-dark' default_rating=book|user_rating:request.user %}
 
         <div class="field has-addons hidden">
             <div class="control">

From 936d68f0edcf1a463f38214c28215cb20744aaa0 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 4 Apr 2021 09:08:44 -0700
Subject: [PATCH 0628/1285] Don't allow delete and redraft of ratings

---
 bookwyrm/templates/snippets/status/status_options.html | 2 +-
 bookwyrm/views/status.py                               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/snippets/status/status_options.html b/bookwyrm/templates/snippets/status/status_options.html
index c476bfbf..a76cbc39 100644
--- a/bookwyrm/templates/snippets/status/status_options.html
+++ b/bookwyrm/templates/snippets/status/status_options.html
@@ -19,7 +19,7 @@
         </button>
     </form>
 </li>
-{% if status.status_type != 'GeneratedNote' %}
+{% if status.status_type != 'GeneratedNote' and status.status_type != 'Rating' %}
 <li role="menuitem">
     <form class="dropdown-item pt-0 pb-0" name="delete-{{status.id}}" action="{% url 'redraft' status.id %}" method="post">
         {% csrf_token %}
diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py
index b224c1a9..7ab88f28 100644
--- a/bookwyrm/views/status.py
+++ b/bookwyrm/views/status.py
@@ -104,7 +104,7 @@ class DeleteAndRedraft(View):
         status = get_object_or_404(
             models.Status.objects.select_subclasses(), id=status_id
         )
-        if isinstance(status, models.GeneratedNote):
+        if isinstance(status, (models.GeneratedNote, models.Rating)):
             return HttpResponseBadRequest()
 
         # don't let people redraft other people's statuses

From be8c3b7904d6010aa9ccc0211d625b981463ffb8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 4 Apr 2021 09:18:52 -0700
Subject: [PATCH 0629/1285] Handles delete and redraft replies

---
 bookwyrm/templates/compose.html                     | 5 ++++-
 bookwyrm/templates/snippets/status/status_body.html | 3 ++-
 bookwyrm/views/status.py                            | 8 ++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/compose.html b/bookwyrm/templates/compose.html
index 7c5d8933..9b0549ed 100644
--- a/bookwyrm/templates/compose.html
+++ b/bookwyrm/templates/compose.html
@@ -19,6 +19,10 @@
     </div>
     {% endif %}
     <div class="column is-two-thirds">
+        {% if draft.reply_parent %}
+        {% include 'snippets/status/status.html' with status=draft.reply_parent no_interact=True %}
+        {% endif %}
+
         {% if not draft %}
         {% include 'snippets/create_status.html' %}
         {% else %}
@@ -26,6 +30,5 @@
         {% endif %}
     </div>
 </div>
-{{ form.ap_p }}
 {% endwith %}
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/status/status_body.html b/bookwyrm/templates/snippets/status/status_body.html
index a7e8e884..4bbb4afa 100644
--- a/bookwyrm/templates/snippets/status/status_body.html
+++ b/bookwyrm/templates/snippets/status/status_body.html
@@ -27,7 +27,8 @@
             {% trans "Delete status" %}
         </button>
     </form>
-
+    {% elif no_interact %}
+    {# nothing here #}
     {% elif request.user.is_authenticated %}
     <div class="field has-addons">
         <div class="control">
diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py
index 7ab88f28..d8a3605d 100644
--- a/bookwyrm/views/status.py
+++ b/bookwyrm/views/status.py
@@ -104,16 +104,20 @@ class DeleteAndRedraft(View):
         status = get_object_or_404(
             models.Status.objects.select_subclasses(), id=status_id
         )
-        if isinstance(status, (models.GeneratedNote, models.Rating)):
+        if isinstance(status, (models.GeneratedNote, models.ReviewRating)):
             return HttpResponseBadRequest()
 
         # don't let people redraft other people's statuses
         if status.user != request.user:
             return HttpResponseBadRequest()
 
+        status_type = status.status_type.lower()
+        if status.reply_parent:
+            status_type = 'reply'
+
         data = {
             "draft": status,
-            "type": status.status_type.lower(),
+            "type": status_type,
         }
         if hasattr(status, "book"):
             data["book"] = status.book

From ff3631cbe3c8921074512a2d32e7843764476c6e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 4 Apr 2021 09:24:17 -0700
Subject: [PATCH 0630/1285] Python formatting

---
 bookwyrm/views/status.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py
index d8a3605d..f0119e0e 100644
--- a/bookwyrm/views/status.py
+++ b/bookwyrm/views/status.py
@@ -113,7 +113,7 @@ class DeleteAndRedraft(View):
 
         status_type = status.status_type.lower()
         if status.reply_parent:
-            status_type = 'reply'
+            status_type = "reply"
 
         data = {
             "draft": status,

From 467748e2c818acdee452bd8d7c964bcdfd012f1e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 4 Apr 2021 09:45:25 -0700
Subject: [PATCH 0631/1285] Adds delete and redraft tests

---
 bookwyrm/tests/views/test_status.py | 56 +++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py
index 5dc0e49a..e7fc62d5 100644
--- a/bookwyrm/tests/views/test_status.py
+++ b/bookwyrm/tests/views/test_status.py
@@ -40,6 +40,7 @@ class StatusViews(TestCase):
             remote_id="https://example.com/book/1",
             parent_work=work,
         )
+        models.SiteSettings.objects.create()
 
     def test_handle_status(self, _):
         """ create a status """
@@ -166,6 +167,61 @@ class StatusViews(TestCase):
         self.assertFalse(self.remote_user in reply.mention_users.all())
         self.assertTrue(self.local_user in reply.mention_users.all())
 
+    def test_delete_and_redraft(self, _):
+        """ delete and re-draft a status """
+        view = views.DeleteAndRedraft.as_view()
+        request = self.factory.post("")
+        request.user = self.local_user
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+            status = models.Comment.objects.create(
+                content="hi", book=self.book, user=self.local_user
+            )
+
+        with patch("bookwyrm.activitystreams.ActivityStream.remove_status") as mock:
+            result = view(request, status.id)
+            self.assertTrue(mock.called)
+        result.render()
+
+        # make sure it was deleted
+        status.refresh_from_db()
+        self.assertTrue(status.deleted)
+
+    def test_delete_and_redraft_invalid_status_type_rating(self, _):
+        """ you can't redraft generated statuses """
+        view = views.DeleteAndRedraft.as_view()
+        request = self.factory.post("")
+        request.user = self.local_user
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+            status = models.ReviewRating.objects.create(
+                book=self.book, rating=2.0, user=self.local_user
+            )
+
+        with patch("bookwyrm.activitystreams.ActivityStream.remove_status") as mock:
+            result = view(request, status.id)
+            self.assertFalse(mock.called)
+        self.assertEqual(result.status_code, 400)
+
+        status.refresh_from_db()
+        self.assertFalse(status.deleted)
+
+    def test_delete_and_redraft_invalid_status_type_generated_note(self, _):
+        """ you can't redraft generated statuses """
+        view = views.DeleteAndRedraft.as_view()
+        request = self.factory.post("")
+        request.user = self.local_user
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+            status = models.GeneratedNote.objects.create(
+                content="hi", user=self.local_user
+            )
+
+        with patch("bookwyrm.activitystreams.ActivityStream.remove_status") as mock:
+            result = view(request, status.id)
+            self.assertFalse(mock.called)
+        self.assertEqual(result.status_code, 400)
+
+        status.refresh_from_db()
+        self.assertFalse(status.deleted)
+
     def test_find_mentions(self, _):
         """ detect and look up @ mentions of users """
         user = models.User.objects.create_user(

From 03ba01a790c7235c84b3019410bcb5132cabdc45 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 4 Apr 2021 10:36:28 -0700
Subject: [PATCH 0632/1285] Expands filtering and sorting on invite requests
 page

---
 bookwyrm/templates/settings/manage_invite_requests.html | 9 +++++++--
 bookwyrm/views/invite.py                                | 8 ++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/settings/manage_invite_requests.html b/bookwyrm/templates/settings/manage_invite_requests.html
index 63730893..bbe3beb7 100644
--- a/bookwyrm/templates/settings/manage_invite_requests.html
+++ b/bookwyrm/templates/settings/manage_invite_requests.html
@@ -28,13 +28,17 @@
 
     {% include 'settings/invite_request_filters.html' %}
 
-    <table class="table is-striped">
+    <table class="table is-striped is-fullwidth">
         {% url 'settings-invite-requests' as url %}
         <tr>
             <th>
-                {% trans "Date" as text %}
+                {% trans "Date requested" as text %}
                 {% include 'snippets/table-sort-header.html' with field="created_date" sort=sort text=text %}
             </th>
+            <th>
+                {% trans "Date accepted" as text %}
+                {% include 'snippets/table-sort-header.html' with field="invite__invitees__created_date" sort=sort text=text %}
+            </th>
             <th>{% trans "Email" %}</th>
             <th>
                 {% trans "Status" as text %}
@@ -48,6 +52,7 @@
         {% for req in requests %}
         <tr>
             <td>{{ req.created_date | naturaltime }}</td>
+            <td>{{ req.invite.invitees.first.created_date | naturaltime }}</td>
             <td>{{ req.email }}</td>
             <td>
                 {% if req.invite.times_used %}
diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/invite.py
index 665f98ce..61f031ef 100644
--- a/bookwyrm/views/invite.py
+++ b/bookwyrm/views/invite.py
@@ -99,7 +99,11 @@ class ManageInviteRequests(View):
             page = 1
 
         sort = request.GET.get("sort")
-        sort_fields = ["created_date", "invite__times_used"]
+        sort_fields = [
+            "created_date",
+            "invite__times_used",
+            "invite__invitees__created_date",
+        ]
         if not sort in sort_fields + ["-{:s}".format(f) for f in sort_fields]:
             sort = "-created_date"
 
@@ -115,7 +119,7 @@ class ManageInviteRequests(View):
         if "requested" in status_filters:
             filters.append({"invite__isnull": True})
         if "sent" in status_filters:
-            filters.append({"invite__isnull": False})
+            filters.append({"invite__isnull": False, "invite__times_used": 0})
         if "accepted" in status_filters:
             filters.append({"invite__isnull": False, "invite__times_used__gte": 1})
 

From b6aa36960c80bfdb7abd5a4471e93029d7147ad3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 4 Apr 2021 10:38:40 -0700
Subject: [PATCH 0633/1285] Separates button grouping from td element

---
 bookwyrm/templates/settings/manage_invite_requests.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/settings/manage_invite_requests.html b/bookwyrm/templates/settings/manage_invite_requests.html
index bbe3beb7..5b7315f9 100644
--- a/bookwyrm/templates/settings/manage_invite_requests.html
+++ b/bookwyrm/templates/settings/manage_invite_requests.html
@@ -63,7 +63,7 @@
                 {% trans "Requested" %}
                 {% endif %}
             </td>
-            <td class="field is-grouped">
+            <td><div class="field is-grouped">
                 {# no invite OR invite not yet used #}
                 {% if not req.invite.times_used %}
                 <form name="send-invite" method="post">
@@ -98,7 +98,7 @@
                     {% endif %}
                 </form>
                 {% endif %}
-            </td>
+            </div></td>
         </tr>
         {% endfor %}
     </table>

From 593e4358169ee3532ec78463a5f4af9d8a143224 Mon Sep 17 00:00:00 2001
From: Pablo Barton <pablo.barton@gmail.com>
Date: Sun, 4 Apr 2021 16:22:36 -0400
Subject: [PATCH 0634/1285] 772 Use gettext_lazy for form classes

---
 bookwyrm/forms.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 1477234f..1a114e05 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -6,7 +6,7 @@ from django import forms
 from django.forms import ModelForm, PasswordInput, widgets
 from django.forms.widgets import Textarea
 from django.utils import timezone
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 
 from bookwyrm import models
 

From 940e841502647fab3d903a5e2d440f7bae79947e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 4 Apr 2021 20:57:30 -0700
Subject: [PATCH 0635/1285] Fixes trimming streams

---
 bookwyrm/activitystreams.py | 8 +++++---
 bookwyrm/settings.py        | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 94ba23bc..279079c8 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -36,7 +36,7 @@ class ActivityStream(ABC):
             # add the status to the feed
             pipeline.zadd(self.stream_id(user), value)
             pipeline.zremrangebyrank(
-                self.stream_id(user), settings.MAX_STREAM_LENGTH, -1
+                self.stream_id(user), 0, -1 * settings.MAX_STREAM_LENGTH
             )
             # add to the unread status count
             pipeline.incr(self.unread_id(user))
@@ -58,7 +58,7 @@ class ActivityStream(ABC):
             pipeline.zadd(self.stream_id(viewer), self.get_value(status))
         if statuses:
             pipeline.zremrangebyrank(
-                self.stream_id(user), settings.MAX_STREAM_LENGTH, -1
+                self.stream_id(user), 0, -1 * settings.MAX_STREAM_LENGTH
             )
         pipeline.execute()
 
@@ -96,7 +96,9 @@ class ActivityStream(ABC):
 
         # only trim the stream if statuses were added
         if statuses.exists():
-            pipeline.zremrangebyrank(stream_id, settings.MAX_STREAM_LENGTH, -1)
+            pipeline.zremrangebyrank(
+                self.stream_id(user), 0, -1 * settings.MAX_STREAM_LENGTH
+            )
         pipeline.execute()
 
     def stream_users(self, status):  # pylint: disable=no-self-use
diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 845f81c4..9d1d0b85 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -98,7 +98,7 @@ WSGI_APPLICATION = "bookwyrm.wsgi.application"
 REDIS_ACTIVITY_HOST = env("REDIS_ACTIVITY_HOST", "localhost")
 REDIS_ACTIVITY_PORT = env("REDIS_ACTIVITY_PORT", 6379)
 
-MAX_STREAM_LENGTH = int(env("MAX_STREAM_LENGTH", 200))
+MAX_STREAM_LENGTH = 3  # int(env("MAX_STREAM_LENGTH", 200))
 STREAMS = ["home", "local", "federated"]
 
 # Database

From d25c68f8875ff0fab6121b7f2bc915c5d40f4928 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 4 Apr 2021 21:01:52 -0700
Subject: [PATCH 0636/1285] Restores stream length settings

---
 bookwyrm/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 9d1d0b85..845f81c4 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -98,7 +98,7 @@ WSGI_APPLICATION = "bookwyrm.wsgi.application"
 REDIS_ACTIVITY_HOST = env("REDIS_ACTIVITY_HOST", "localhost")
 REDIS_ACTIVITY_PORT = env("REDIS_ACTIVITY_PORT", 6379)
 
-MAX_STREAM_LENGTH = 3  # int(env("MAX_STREAM_LENGTH", 200))
+MAX_STREAM_LENGTH = int(env("MAX_STREAM_LENGTH", 200))
 STREAMS = ["home", "local", "federated"]
 
 # Database

From 5d3f00a5372906caf407d6b61c34914d24213420 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Mon, 5 Apr 2021 12:46:34 +0200
Subject: [PATCH 0637/1285] [l10n] Add and update i18n strings for French:

- Fix typo in English.
- Add translations for missing strings.
- Update translations for fuzzy strings.
---
 .../templates/snippets/table-sort-header.html |   2 +-
 locale/de_DE/LC_MESSAGES/django.po            |   2 +-
 locale/en_US/LC_MESSAGES/django.po            |   2 +-
 locale/es/LC_MESSAGES/django.po               |   2 +-
 locale/fr_FR/LC_MESSAGES/django.mo            | Bin 24395 -> 42813 bytes
 locale/fr_FR/LC_MESSAGES/django.po            | 738 ++++++++----------
 locale/zh_CN/LC_MESSAGES/django.mo            | Bin 38419 -> 38418 bytes
 locale/zh_CN/LC_MESSAGES/django.po            |   2 +-
 8 files changed, 342 insertions(+), 406 deletions(-)

diff --git a/bookwyrm/templates/snippets/table-sort-header.html b/bookwyrm/templates/snippets/table-sort-header.html
index f016b4e2..2f20b929 100644
--- a/bookwyrm/templates/snippets/table-sort-header.html
+++ b/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">
diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 87e77637..962b9736 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/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
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index ab28a394..a8720f17 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/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
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index c0fef650..64921d5e 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/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
diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index bae2cccfacb0d3e15078b395dd3b49b0c75cd72b..09e90f22c801bc681e5dfda3c171b81a4da45afc 100644
GIT binary patch
literal 42813
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

delta 8940
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
ZAJuNHmti>7uFo&o3j1x^T=TPE{4a%+Tgm_c

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index b167dea2..c765cb89 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-04 13:04+0000\n"
-"PO-Revision-Date: 2021-04-04 14:43+0100\n"
+"POT-Creation-Date: 2021-04-05 07:29+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"
 "Language: fr_FR\n"
@@ -20,74 +20,72 @@ msgstr ""
 
 #: bookwyrm/forms.py:226
 msgid "A user with this email already exists."
-msgstr ""
+msgstr "Cet email est déjà associé à un compte."
 
 #: bookwyrm/forms.py:240
 msgid "One Day"
-msgstr ""
+msgstr "Un jour"
 
 #: bookwyrm/forms.py:241
 msgid "One Week"
-msgstr ""
+msgstr "Une semaine"
 
 #: bookwyrm/forms.py:242
 msgid "One Month"
-msgstr ""
+msgstr "Un mois"
 
 #: bookwyrm/forms.py:243
 msgid "Does Not Expire"
-msgstr ""
+msgstr "Sans expiration"
 
 #: bookwyrm/forms.py:248
 #, python-format
 msgid "%(count)d uses"
-msgstr ""
+msgstr "%(count)d utilisations"
 
 #: bookwyrm/forms.py:251
-#, fuzzy
 #| msgid "Unlisted"
 msgid "Unlimited"
-msgstr "Non listé"
+msgstr "Sans limite"
 
 #: bookwyrm/models/fields.py:24
 #, python-format
 msgid "%(value)s is not a valid remote_id"
-msgstr ""
+msgstr "%(value)s n’est pas une remote_id valide."
 
 #: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
 #, python-format
 msgid "%(value)s is not a valid username"
-msgstr ""
+msgstr "%(value)s n’est pas un nom de compte valide."
 
 #: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:152
-#, fuzzy
 #| msgid "Username:"
 msgid "username"
-msgstr "Nom d’utilisateur :"
+msgstr "nom du compte :"
 
 #: bookwyrm/models/fields.py:170
 msgid "A user with that username already exists."
-msgstr ""
+msgstr "Ce nom est déjà associé à un compte."
 
 #: bookwyrm/settings.py:150
 msgid "English"
-msgstr ""
+msgstr "English"
 
 #: bookwyrm/settings.py:151
 msgid "German"
-msgstr ""
+msgstr "Deutsch"
 
 #: bookwyrm/settings.py:152
 msgid "Spanish"
-msgstr ""
+msgstr "Español"
 
 #: bookwyrm/settings.py:153
 msgid "French"
-msgstr ""
+msgstr "Français"
 
 #: bookwyrm/settings.py:154
 msgid "Simplified Chinese"
-msgstr ""
+msgstr "简化字"
 
 #: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8
 msgid "Not Found"
@@ -126,7 +124,7 @@ msgstr "Livres par %(name)s"
 #: bookwyrm/templates/discover/large-book.html:12
 #: bookwyrm/templates/discover/small-book.html:9
 msgid "by"
-msgstr ""
+msgstr "par"
 
 #: bookwyrm/templates/book/book.html:29 bookwyrm/templates/book/book.html:30
 msgid "Edit Book"
@@ -138,22 +136,21 @@ msgid "Add cover"
 msgstr "Ajouter une couverture"
 
 #: bookwyrm/templates/book/book.html:53
-#, fuzzy
 #| msgid "Failed to load"
 msgid "Failed to load cover"
-msgstr "Items non importés"
+msgstr "La couverture n’a pu être chargée"
 
 #: bookwyrm/templates/book/book.html:62
 msgid "ISBN:"
 msgstr "ISBN :"
 
 #: bookwyrm/templates/book/book.html:69
-#: bookwyrm/templates/book/edit_book.html:211
+#: bookwyrm/templates/book/edit_book.html:217
 msgid "OCLC Number:"
 msgstr "Numéro OCLC :"
 
 #: bookwyrm/templates/book/book.html:76
-#: bookwyrm/templates/book/edit_book.html:215
+#: bookwyrm/templates/book/edit_book.html:221
 msgid "ASIN:"
 msgstr "ASIN :"
 
@@ -165,11 +162,10 @@ msgstr "Voir sur OpenLibrary"
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "(%(review_count)s critique)"
+msgstr[1] "(%(review_count)s critiques)"
 
 #: bookwyrm/templates/book/book.html:100
-#, fuzzy
 #| msgid "Description:"
 msgid "Add Description"
 msgstr "Ajouter une description"
@@ -181,7 +177,7 @@ msgid "Description:"
 msgstr "Description :"
 
 #: bookwyrm/templates/book/book.html:111
-#: bookwyrm/templates/book/edit_book.html:225
+#: bookwyrm/templates/book/edit_book.html:231
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
 #: bookwyrm/templates/settings/site.html:93
@@ -194,7 +190,7 @@ msgstr "Enregistrer"
 
 #: bookwyrm/templates/book/book.html:112 bookwyrm/templates/book/book.html:161
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:226
+#: bookwyrm/templates/book/edit_book.html:232
 #: bookwyrm/templates/edit_author.html:79
 #: bookwyrm/templates/moderation/report_modal.html:32
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
@@ -208,29 +204,28 @@ msgid "Cancel"
 msgstr "Annuler"
 
 #: bookwyrm/templates/book/book.html:121
-#, fuzzy, python-format
+#, python-format
 #| msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
-msgstr "<a href=\"%(path)s\">%(title)s</a> par "
+msgstr "<a href=\"%(path)s/editions\">%(count)s éditions</a>"
 
 #: bookwyrm/templates/book/book.html:129
-#, fuzzy, python-format
+#, python-format
 #| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
-msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
+msgstr "Cette édition est sur votre étagère <a href=\"%(path)s\">%(shelf_name)s</a>."
 
 #: bookwyrm/templates/book/book.html:135
-#, fuzzy, python-format
+#, python-format
 #| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
-msgstr " a ajouté <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre liste « <a href=\"%(list_path)s\">%(list_name)s</a> »"
+msgstr "Une <a href=\"%(book_path)s\">édition différente</a> de ce livre existe sur votre étagère <a href=\"%(shelf_path)s\">%(shelf_name)s</a>."
 
 #: bookwyrm/templates/book/book.html:144
 msgid "Your reading activity"
 msgstr "Votre activité de lecture"
 
 #: bookwyrm/templates/book/book.html:146
-#, fuzzy
 #| msgid "Edit read dates"
 msgid "Add read dates"
 msgstr "Ajouter des dates de lecture"
@@ -259,10 +254,9 @@ msgid "Lists"
 msgstr "Listes"
 
 #: bookwyrm/templates/book/book.html:213
-#, fuzzy
 #| msgid "Go to list"
 msgid "Add to list"
-msgstr "Aller à la liste"
+msgstr "Ajouter à la liste"
 
 #: bookwyrm/templates/book/book.html:223
 #: bookwyrm/templates/book/cover_modal.html:31
@@ -275,30 +269,28 @@ msgid "rated it"
 msgstr "l’a noté"
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:163
-#, fuzzy
+#: bookwyrm/templates/book/edit_book.html:169
 #| msgid "Add cover"
 msgid "Upload cover:"
-msgstr "Ajouter une couverture"
+msgstr "Charger une couverture :"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:169
+#: bookwyrm/templates/book/edit_book.html:175
 msgid "Load cover from url:"
-msgstr ""
+msgstr "Charger la couverture depuis une URL :"
 
 #: bookwyrm/templates/book/edit_book.html:5
 #: bookwyrm/templates/book/edit_book.html:11
-#, fuzzy, python-format
+#, python-format
 #| msgid "Finish \"<em>%(book_title)s</em>\""
 msgid "Edit \"%(book_title)s\""
-msgstr "Éditions de %(book_title)s"
+msgstr "Modifier « %(book_title)s »"
 
 #: bookwyrm/templates/book/edit_book.html:5
 #: bookwyrm/templates/book/edit_book.html:13
-#, fuzzy
 #| msgid "Add Books"
 msgid "Add Book"
-msgstr "Ajouter des livres"
+msgstr "Ajouter un livre"
 
 #: bookwyrm/templates/book/edit_book.html:18
 #: bookwyrm/templates/edit_author.html:13
@@ -317,35 +309,35 @@ msgstr "Dernière modification par :"
 
 #: bookwyrm/templates/book/edit_book.html:40
 msgid "Confirm Book Info"
-msgstr ""
+msgstr "Confirmer les informations de ce livre"
 
 #: bookwyrm/templates/book/edit_book.html:47
 #, python-format
 msgid "Is \"%(name)s\" an existing author?"
-msgstr ""
+msgstr "Est‑ce que l’auteur ou l’autrice « %(name)s » existe déjà ?"
 
 #: bookwyrm/templates/book/edit_book.html:52
-#, fuzzy, python-format
+#, python-format
 #| msgid "Start \"<em>%(book_title)s</em>\""
 msgid "Author of <em>%(book_title)s</em>"
 msgstr "Commencer « <em>%(book_title)s</em> »"
 
 #: bookwyrm/templates/book/edit_book.html:55
 msgid "This is a new author"
-msgstr ""
+msgstr "Il s’agit d’un nouvel auteur ou d’une nouvelle autrice."
 
 #: bookwyrm/templates/book/edit_book.html:61
 #, python-format
 msgid "Creating a new author: %(name)s"
-msgstr ""
+msgstr "Création d’un nouvel auteur ou d’une nouvelle autrice : %(name)s"
 
 #: bookwyrm/templates/book/edit_book.html:67
 msgid "Is this an edition of an existing work?"
-msgstr ""
+msgstr "Est‑ce l’édition d’un ouvrage existant ?"
 
 #: bookwyrm/templates/book/edit_book.html:71
 msgid "This is a new work"
-msgstr ""
+msgstr "Il s’agit d’un nouvel ouvrage."
 
 #: bookwyrm/templates/book/edit_book.html:77
 #: bookwyrm/templates/password_reset.html:30
@@ -379,82 +371,79 @@ msgid "Series number:"
 msgstr "Numéro dans la série :"
 
 #: bookwyrm/templates/book/edit_book.html:117
-#, fuzzy
 #| msgid "Published"
 msgid "Publisher:"
-msgstr "Publié"
+msgstr "Éditeur :"
 
 #: bookwyrm/templates/book/edit_book.html:119
 msgid "Separate multiple publishers with commas."
-msgstr ""
+msgstr "Séparez plusieurs éditeurs par une virgule."
 
-#: bookwyrm/templates/book/edit_book.html:125
+#: bookwyrm/templates/book/edit_book.html:126
 msgid "First published date:"
 msgstr "Première date de publication :"
 
-#: bookwyrm/templates/book/edit_book.html:130
+#: bookwyrm/templates/book/edit_book.html:134
 msgid "Published date:"
 msgstr "Date de publication :"
 
-#: bookwyrm/templates/book/edit_book.html:137
-#, fuzzy
+#: bookwyrm/templates/book/edit_book.html:143
 #| msgid "Author"
 msgid "Authors"
-msgstr "Auteur ou autrice"
-
-#: bookwyrm/templates/book/edit_book.html:143
-#, fuzzy, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
-msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
-msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
-
-#: bookwyrm/templates/book/edit_book.html:148
-#, fuzzy
-#| msgid "Edit Author"
-msgid "Add Authors:"
-msgstr "Modifier l’auteur ou autrice"
+msgstr "Auteurs ou autrices"
 
 #: bookwyrm/templates/book/edit_book.html:149
-msgid "John Doe, Jane Smith"
-msgstr ""
+#, python-format
+#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
+msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
+msgstr "Supprimer <a href=\"%(path)s\">%(name)s</a>"
+
+#: bookwyrm/templates/book/edit_book.html:154
+#| msgid "Edit Author"
+msgid "Add Authors:"
+msgstr "Ajouter des auteurs ou autrices :"
 
 #: bookwyrm/templates/book/edit_book.html:155
+msgid "John Doe, Jane Smith"
+msgstr "Claude Dupont, Dominique Durand"
+
+#: bookwyrm/templates/book/edit_book.html:161
 #: bookwyrm/templates/user/shelf.html:75
 msgid "Cover"
 msgstr "Couverture"
 
-#: bookwyrm/templates/book/edit_book.html:182
+#: bookwyrm/templates/book/edit_book.html:188
 msgid "Physical Properties"
 msgstr "Propriétés physiques"
 
-#: bookwyrm/templates/book/edit_book.html:183
+#: bookwyrm/templates/book/edit_book.html:189
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "Format :"
 
-#: bookwyrm/templates/book/edit_book.html:191
+#: bookwyrm/templates/book/edit_book.html:197
 msgid "Pages:"
 msgstr "Pages :"
 
-#: bookwyrm/templates/book/edit_book.html:198
+#: bookwyrm/templates/book/edit_book.html:204
 msgid "Book Identifiers"
 msgstr "Identifiants du livre"
 
-#: bookwyrm/templates/book/edit_book.html:199
+#: bookwyrm/templates/book/edit_book.html:205
 msgid "ISBN 13:"
 msgstr "ISBN 13 :"
 
-#: bookwyrm/templates/book/edit_book.html:203
+#: bookwyrm/templates/book/edit_book.html:209
 msgid "ISBN 10:"
 msgstr "ISBN 10 :"
 
-#: bookwyrm/templates/book/edit_book.html:207
+#: bookwyrm/templates/book/edit_book.html:213
 #: bookwyrm/templates/edit_author.html:59
 msgid "Openlibrary key:"
 msgstr "Clé Openlibrary :"
 
 #: bookwyrm/templates/book/editions.html:5
-#, fuzzy, python-format
+#, python-format
 #| msgid "Finish \"<em>%(book_title)s</em>\""
 msgid "Editions of %(book_title)s"
 msgstr "Éditions de %(book_title)s"
@@ -467,89 +456,90 @@ msgstr "Éditions de <a href=\"%(work_path)s\">« %(work_title)s »</a>"
 #: bookwyrm/templates/book/format_filter.html:8
 #: bookwyrm/templates/book/language_filter.html:8
 msgid "Any"
-msgstr ""
+msgstr "Tou(te)s"
 
 #: bookwyrm/templates/book/language_filter.html:5
 msgid "Language:"
-msgstr ""
+msgstr "Langue :"
 
 #: bookwyrm/templates/book/publisher_info.html:6
-#, fuzzy, python-format
+#, python-format
 #| msgid "of %(book.pages)s pages"
 msgid "%(format)s, %(pages)s pages"
-msgstr "sur %(book.pages)s pages"
+msgstr "%(format)s, %(pages)s pages"
 
 #: bookwyrm/templates/book/publisher_info.html:8
-#, fuzzy, python-format
+#, python-format
 #| msgid "of %(book.pages)s pages"
 msgid "%(pages)s pages"
-msgstr "sur %(book.pages)s pages"
+msgstr "%(pages)s pages"
 
 #: bookwyrm/templates/book/publisher_info.html:13
-#, fuzzy, python-format
+#, python-format
 #| msgid "of %(book.pages)s pages"
 msgid "%(languages)s language"
-msgstr "sur %(book.pages)s pages"
+msgstr "%(languages)s langues"
 
 #: bookwyrm/templates/book/publisher_info.html:18
 #, python-format
 msgid "Published %(date)s by %(publisher)s."
-msgstr ""
+msgstr "Publié %(date)s par %(publisher)s."
 
 #: bookwyrm/templates/book/publisher_info.html:20
-#, fuzzy, python-format
+#, python-format
 #| msgid "Published date:"
 msgid "Published %(date)s"
-msgstr "Date de publication :"
+msgstr "Publié %(date)s"
 
 #: bookwyrm/templates/book/publisher_info.html:22
 #, python-format
 msgid "Published by %(publisher)s."
-msgstr ""
+msgstr "Publié par %(publisher)s."
 
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
-#: bookwyrm/templates/feed/feed_layout.html:57
+#: bookwyrm/templates/feed/feed_layout.html:70
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
-#, fuzzy
 #| msgid "Closed"
 msgid "Close"
 msgstr "Fermer"
 
+#: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8
+#| msgid "Boost status"
+msgid "Compose status"
+msgstr "Rédiger un statut"
+
 #: bookwyrm/templates/directory/community_filter.html:5
-#, fuzzy
 #| msgid "Comment"
 msgid "Community"
-msgstr "Commentaire"
+msgstr "Communauté"
 
 #: bookwyrm/templates/directory/community_filter.html:8
-#, fuzzy
 #| msgid "Blocked users"
 msgid "Local users"
-msgstr "Comptes bloqués"
+msgstr "Comptes locaux"
 
 #: bookwyrm/templates/directory/community_filter.html:12
-#, fuzzy
 #| msgid "Federated"
 msgid "Federated community"
-msgstr "Fédéré"
+msgstr "Communauté fédérée"
 
 #: bookwyrm/templates/directory/directory.html:6
 #: bookwyrm/templates/directory/directory.html:11
 #: bookwyrm/templates/layout.html:92
 msgid "Directory"
-msgstr ""
+msgstr "Répertoire"
 
 #: bookwyrm/templates/directory/directory.html:19
 msgid "Make your profile discoverable to other BookWyrm users."
-msgstr ""
+msgstr "Autoriser d’autres utilisateurs ou utilisatrices de BookWyrm à découvrir votre profil."
 
 #: bookwyrm/templates/directory/directory.html:26
-#, fuzzy, python-format
+#, python-format
 #| msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
 msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
-msgstr "Vous pouvez définir ou changer vore défi lecture à n’importe quel moment depuis votre <a href=\"%(path)s\">profil</a>"
+msgstr "Vous pouvez décider de ne plus y figurer à n’importe quel moment depuis vos <a href=\"%(path)s\">paramètres de profil.</a>"
 
 #: bookwyrm/templates/directory/directory.html:31
 #: bookwyrm/templates/snippets/goal_card.html:22
@@ -557,64 +547,59 @@ msgid "Dismiss message"
 msgstr "Rejeter le message"
 
 #: bookwyrm/templates/directory/directory.html:71
-#, fuzzy
 #| msgid "followed you"
 msgid "follower you follow"
 msgid_plural "followers you follow"
-msgstr[0] "s’est abonné(e)"
-msgstr[1] "s’est abonné(e)"
+msgstr[0] "compte auquel vous êtes abonné(e)"
+msgstr[1] "comptes auxquels vous êtes abonné(e)"
 
 #: bookwyrm/templates/directory/directory.html:78
-#, fuzzy
 #| msgid "Your shelves"
 msgid "book on your shelves"
 msgid_plural "books on your shelves"
-msgstr[0] "Vos étagères"
-msgstr[1] "Vos étagères"
+msgstr[0] "livre sur vos étagères"
+msgstr[1] "livres sur vos étagères"
 
 #: bookwyrm/templates/directory/directory.html:86
 msgid "posts"
-msgstr ""
+msgstr "publications"
 
 #: bookwyrm/templates/directory/directory.html:92
 msgid "last active"
-msgstr ""
+msgstr "dernière activité"
 
 #: bookwyrm/templates/directory/sort_filter.html:5
 msgid "Order by"
-msgstr ""
+msgstr "Trier par"
 
 #: bookwyrm/templates/directory/sort_filter.html:8
-#, fuzzy
 #| msgid "Suggest"
 msgid "Suggested"
-msgstr "Suggérer"
+msgstr "Suggéré"
 
 #: bookwyrm/templates/directory/sort_filter.html:9
 msgid "Recently active"
-msgstr ""
+msgstr "Actif récemment"
 
 #: bookwyrm/templates/directory/user_type_filter.html:5
-#, fuzzy
 #| msgid "User Activity"
 msgid "User type"
-msgstr "Activité du compte"
+msgstr "Type de compte"
 
 #: bookwyrm/templates/directory/user_type_filter.html:8
-#, fuzzy
 #| msgid "Blocked users"
 msgid "BookWyrm users"
-msgstr "Comptes bloqués"
+msgstr "Comptes BookWyrm"
 
 #: bookwyrm/templates/directory/user_type_filter.html:12
 msgid "All known users"
-msgstr ""
+msgstr "Tous les comptes connus"
 
 #: bookwyrm/templates/discover/about.html:7
-#, fuzzy, python-format
+#, python-format
 #| msgid "Join %(name)s"
 msgid "About %(site_name)s"
-msgstr "À propos de %(name)s"
+msgstr "À propos de %(site_name)s"
 
 #: bookwyrm/templates/discover/about.html:10
 #: bookwyrm/templates/discover/about.html:20
@@ -659,11 +644,11 @@ msgstr "Cette instance est fermée"
 
 #: bookwyrm/templates/discover/landing_layout.html:57
 msgid "Thank you! Your request has been received."
-msgstr ""
+msgstr "Merci ! Votre demande a bien été reçue."
 
 #: bookwyrm/templates/discover/landing_layout.html:60
 msgid "Request an Invitation"
-msgstr ""
+msgstr "Demander une invitation"
 
 #: bookwyrm/templates/discover/landing_layout.html:64
 #: bookwyrm/templates/password_reset_request.html:18
@@ -675,17 +660,16 @@ msgstr "Adresse email :"
 #: bookwyrm/templates/discover/landing_layout.html:70
 #: bookwyrm/templates/moderation/report_modal.html:31
 msgid "Submit"
-msgstr ""
+msgstr "Valider"
 
 #: bookwyrm/templates/discover/landing_layout.html:79
 msgid "Your Account"
 msgstr "Votre compte"
 
 #: bookwyrm/templates/edit_author.html:5
-#, fuzzy
 #| msgid "Edit Author"
 msgid "Edit Author:"
-msgstr "Modifier l’auteur ou autrice"
+msgstr "Modifier l’auteur ou l’autrice :"
 
 #: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
 #: bookwyrm/templates/user/create_shelf_form.html:13
@@ -724,49 +708,48 @@ msgstr "Clé Goodreads :"
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
-msgstr ""
+msgstr "Bien le bonjour,"
 
 #: bookwyrm/templates/email/html_layout.html:21
 #, python-format
 msgid "BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a>"
-msgstr ""
+msgstr "BookWyrm, hébergé par <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a>"
 
 #: bookwyrm/templates/email/html_layout.html:23
 msgid "Email preference"
-msgstr ""
+msgstr "Paramètres d’email"
 
 #: bookwyrm/templates/email/invite/html_content.html:6
 #: bookwyrm/templates/email/invite/subject.html:2
-#, fuzzy, python-format
+#, python-format
 #| msgid "Join %(name)s"
 msgid "You're invited to join %(site_name)s!"
-msgstr "À propos de %(name)s"
+msgstr "Vous avez reçu une invitation à rejoindre %(site_name)s !"
 
 #: bookwyrm/templates/email/invite/html_content.html:9
 msgid "Join Now"
-msgstr ""
+msgstr "S’enregistrer maintenant"
 
 #: bookwyrm/templates/email/invite/html_content.html:15
 #, python-format
 msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
-msgstr ""
+msgstr "En savoir plus sur <a href=\"https://%(domain)s%(about_path)s\">cette instance</a>."
 
 #: bookwyrm/templates/email/invite/text_content.html:4
 #, python-format
 msgid "You're invited to join %(site_name)s! Click the link below to create an account."
-msgstr ""
+msgstr "Vous avez reçu une invitation à rejoindre %(site_name)s ! Cliquez le lien suivant pour créer un compte."
 
 #: bookwyrm/templates/email/invite/text_content.html:8
-#, fuzzy
 #| msgid "More about this site"
 msgid "Learn more about this instance:"
-msgstr "En savoir plus sur ce site"
+msgstr "En savoir plus sur cete instance :"
 
 #: bookwyrm/templates/email/password_reset/html_content.html:6
 #: bookwyrm/templates/email/password_reset/text_content.html:4
 #, python-format
 msgid "You requested to reset your %(site_name)s password. Click the link below to set a new password and log in to your account."
-msgstr ""
+msgstr "Une demande de réinitialisation de votre mot de passe sur <i>%(site_name)s</i> a été initialisée. Cliquez le lien suivant pour définir un nouveau mot de passe et vous connecter à votre compte."
 
 #: bookwyrm/templates/email/password_reset/html_content.html:9
 #: bookwyrm/templates/password_reset.html:4
@@ -779,13 +762,13 @@ msgstr "Changez le mot de passe"
 #: bookwyrm/templates/email/password_reset/html_content.html:13
 #: bookwyrm/templates/email/password_reset/text_content.html:8
 msgid "If you didn't request to reset your password, you can ignore this email."
-msgstr ""
+msgstr "Si vous n’avez pas demandé la réinitialisation de votre mot de passe, vous pouvez ignorer cet email."
 
 #: bookwyrm/templates/email/password_reset/subject.html:2
-#, fuzzy, python-format
+#, python-format
 #| msgid "Join %(name)s"
 msgid "Reset your %(site_name)s password"
-msgstr "À propos de %(name)s"
+msgstr "Réinitialiser votre mot de passe sur %(site_name)s"
 
 #: bookwyrm/templates/feed/direct_messages.html:8
 #, python-format
@@ -807,19 +790,17 @@ msgstr "Vous n’avez aucun message pour l’instant."
 
 #: bookwyrm/templates/feed/feed.html:9
 msgid "Home Timeline"
-msgstr ""
+msgstr "Mon fil d’actualité"
 
 #: bookwyrm/templates/feed/feed.html:11
-#, fuzzy
 #| msgid "%(tab_title)s Timeline"
 msgid "Local Timeline"
-msgstr "%(tab_title)s — Fil d’actualité"
+msgstr "Fil d’actualité local"
 
 #: bookwyrm/templates/feed/feed.html:13
-#, fuzzy
 #| msgid "Federated Servers"
 msgid "Federated Timeline"
-msgstr "Serveurs fédérés"
+msgstr "Fil d’actualité des instances fédérées"
 
 #: bookwyrm/templates/feed/feed.html:19
 msgid "Home"
@@ -836,7 +817,7 @@ msgstr "Fédéré"
 #: bookwyrm/templates/feed/feed.html:33
 #, python-format
 msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
-msgstr ""
+msgstr "charger le(s) <span data-poll=\"stream/%(tab)s\">0</span> statut(s) non lu(s)"
 
 #: bookwyrm/templates/feed/feed.html:48
 msgid "There aren't any activities right now! Try following a user to get started"
@@ -845,10 +826,9 @@ msgstr "Aucune activité pour l’instant ! Abonnez‑vous à quelqu’un pour
 #: bookwyrm/templates/feed/feed.html:56
 #: bookwyrm/templates/get_started/users.html:6
 msgid "Who to follow"
-msgstr ""
+msgstr "À qui s’abonner"
 
 #: bookwyrm/templates/feed/feed_layout.html:5
-#, fuzzy
 #| msgid "Updated:"
 msgid "Updates"
 msgstr "Mises à jour"
@@ -863,27 +843,25 @@ msgstr "Vos livres"
 msgid "There are no books here right now! Try searching for a book to get started"
 msgstr "Aucun livre ici pour l’instant ! Cherchez un livre pour commencer"
 
-#: bookwyrm/templates/feed/feed_layout.html:23
-#: bookwyrm/templates/user/shelf.html:28
-#, fuzzy
-#| msgid "Read"
-msgid "To Read"
-msgstr "Lu"
-
 #: bookwyrm/templates/feed/feed_layout.html:24
 #: bookwyrm/templates/user/shelf.html:28
-#, fuzzy
-#| msgid "Started reading"
-msgid "Currently Reading"
-msgstr "Commencer la lecture"
+#| msgid "Read"
+msgid "To Read"
+msgstr "À lire"
 
 #: bookwyrm/templates/feed/feed_layout.html:25
+#: bookwyrm/templates/user/shelf.html:28
+#| msgid "Started reading"
+msgid "Currently Reading"
+msgstr "En train de lire"
+
+#: bookwyrm/templates/feed/feed_layout.html:26
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
 #: bookwyrm/templates/user/shelf.html:28
 msgid "Read"
 msgstr "Lu"
 
-#: bookwyrm/templates/feed/feed_layout.html:74 bookwyrm/templates/goal.html:26
+#: bookwyrm/templates/feed/feed_layout.html:88 bookwyrm/templates/goal.html:26
 #: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
 msgid "%(year)s Reading Goal"
@@ -893,27 +871,26 @@ msgstr "Défi lecture pour %(year)s"
 #, python-format
 msgid "%(mutuals)s follower you follow"
 msgid_plural "%(mutuals)s followers you follow"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(mutuals)s abonnement auxquel vous êtes abonné(e)"
+msgstr[1] "%(mutuals)s abonnements auxquels vous êtes abonné(e)"
 
 #: bookwyrm/templates/feed/suggested_users.html:19
 #, python-format
 msgid "%(shared_books)s book on your shelves"
 msgid_plural "%(shared_books)s books on your shelves"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(shared_books)s livre sur vos étagères"
+msgstr[1] "%(shared_books)s livres sur vos étagères"
 
 #: bookwyrm/templates/get_started/book_preview.html:6
-#, fuzzy, python-format
+#, python-format
 #| msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgid "Have you read %(book_title)s?"
-msgstr "A envie de lire « <em>%(book_title)s</em> »"
+msgstr "Avez‑vous lu « <em>%(book_title)s</em> » ?"
 
 #: bookwyrm/templates/get_started/books.html:6
-#, fuzzy
 #| msgid "Started reading"
 msgid "What are you reading?"
-msgstr "Lecture commencée le"
+msgstr "Que lisez‑vous ?"
 
 #: bookwyrm/templates/get_started/books.html:9
 #: bookwyrm/templates/lists/list.html:58
@@ -930,7 +907,7 @@ msgstr "Aucun livre trouvé pour « %(query)s »"
 #: bookwyrm/templates/get_started/books.html:11
 #, python-format
 msgid "You can add books when you start using %(site_name)s."
-msgstr ""
+msgstr "Vous pourrez ajouter des livres lorsque vous commencerez à utiliser %(site_name)s."
 
 #: bookwyrm/templates/get_started/books.html:16
 #: bookwyrm/templates/get_started/books.html:17
@@ -942,16 +919,15 @@ msgid "Search"
 msgstr "Chercher"
 
 #: bookwyrm/templates/get_started/books.html:26
-#, fuzzy
 #| msgid "Suggest Books"
 msgid "Suggested Books"
 msgstr "Suggérer des livres"
 
 #: bookwyrm/templates/get_started/books.html:41
-#, fuzzy, python-format
+#, python-format
 #| msgid "Join %(name)s"
 msgid "Popular on %(site_name)s"
-msgstr "À propos de %(name)s"
+msgstr "Populaire sur %(site_name)s"
 
 #: bookwyrm/templates/get_started/books.html:51
 #: bookwyrm/templates/lists/list.html:75
@@ -961,46 +937,42 @@ msgstr "Aucun livre trouvé"
 #: bookwyrm/templates/get_started/books.html:54
 #: bookwyrm/templates/get_started/profile.html:54
 msgid "Save &amp; continue"
-msgstr ""
+msgstr "Enregistrer &amp; continuer"
 
 #: bookwyrm/templates/get_started/layout.html:14
-#, fuzzy, python-format
+#, python-format
 #| msgid "Join %(name)s"
 msgid "Welcome to %(site_name)s!"
-msgstr "À propos de %(name)s"
+msgstr "Bienvenu(e) sur %(site_name)s !"
 
 #: bookwyrm/templates/get_started/layout.html:16
 msgid "These are some first steps to get you started."
-msgstr ""
+msgstr "Voici quelques étapes pour commencer votre profil."
 
 #: bookwyrm/templates/get_started/layout.html:30
 #: bookwyrm/templates/get_started/profile.html:6
-#, fuzzy
 #| msgid "User Profile"
 msgid "Create your profile"
-msgstr "Profil"
+msgstr "Créez votre profil"
 
 #: bookwyrm/templates/get_started/layout.html:34
-#, fuzzy
 #| msgid "Add Books"
 msgid "Add books"
-msgstr "Ajouter des livres"
+msgstr "Ajoutez des livres"
 
 #: bookwyrm/templates/get_started/layout.html:38
-#, fuzzy
 #| msgid "Friendly"
 msgid "Find friends"
-msgstr "Sympa"
+msgstr "Établissez des contacts"
 
 #: bookwyrm/templates/get_started/layout.html:44
 msgid "Skip this step"
-msgstr ""
+msgstr "Passer cette étape"
 
 #: bookwyrm/templates/get_started/layout.html:48
-#, fuzzy
 #| msgid "Finished"
 msgid "Finish"
-msgstr "Terminé"
+msgstr "Terminer"
 
 #: bookwyrm/templates/get_started/profile.html:15
 #: bookwyrm/templates/preferences/edit_user.html:24
@@ -1014,7 +986,7 @@ msgstr "Résumé :"
 
 #: bookwyrm/templates/get_started/profile.html:23
 msgid "A little bit about you"
-msgstr ""
+msgstr "Parlez‑nous de vous"
 
 #: bookwyrm/templates/get_started/profile.html:32
 #: bookwyrm/templates/preferences/edit_user.html:17
@@ -1029,17 +1001,16 @@ msgstr "Autoriser les abonnements manuellement :"
 #: bookwyrm/templates/get_started/profile.html:48
 #: bookwyrm/templates/preferences/edit_user.html:58
 msgid "Show this account in suggested users:"
-msgstr ""
+msgstr "Afficher ce compte dans ceux suggérés :"
 
 #: bookwyrm/templates/get_started/profile.html:52
 msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users."
-msgstr ""
+msgstr "Votre compte sera listé dans le répertoire et pourra être recommandé à d’autres utilisateurs ou utilisatrices de BookWyrm."
 
 #: bookwyrm/templates/get_started/users.html:11
-#, fuzzy
 #| msgid "Search for a book or user"
 msgid "Search for a user"
-msgstr "Chercher un livre ou un compte"
+msgstr "Chercher un compte"
 
 #: bookwyrm/templates/get_started/users.html:13
 #: bookwyrm/templates/search_results.html:76
@@ -1053,7 +1024,6 @@ msgid "%(year)s Reading Progress"
 msgstr "Progression de lecture pour %(year)s"
 
 #: bookwyrm/templates/goal.html:11
-#, fuzzy
 #| msgid "Edit Book"
 msgid "Edit Goal"
 msgstr "Modifier le défi"
@@ -1070,13 +1040,13 @@ msgid "%(name)s hasn't set a reading goal for %(year)s."
 msgstr "%(name)s n’a aucun défi lecture pour %(year)s."
 
 #: bookwyrm/templates/goal.html:51
-#, fuzzy, python-format
+#, python-format
 #| msgid "Your books"
 msgid "Your %(year)s Books"
 msgstr "Vos livres en %(year)s"
 
 #: bookwyrm/templates/goal.html:53
-#, fuzzy, python-format
+#, python-format
 #| msgid "%(username)s has no followers"
 msgid "%(username)s's %(year)s Books"
 msgstr "Livres de %(username)s en %(year)s"
@@ -1087,14 +1057,13 @@ msgid "Import Books"
 msgstr "Importer des livres"
 
 #: bookwyrm/templates/import.html:16
-#, fuzzy
 #| msgid "Data source"
 msgid "Data source:"
-msgstr "Source de données"
+msgstr "Source de données :"
 
 #: bookwyrm/templates/import.html:29
 msgid "Data file:"
-msgstr ""
+msgstr "Fichier de données :"
 
 #: bookwyrm/templates/import.html:37
 msgid "Include reviews"
@@ -1224,10 +1193,9 @@ msgid "Feed"
 msgstr "Fil d’actualité"
 
 #: bookwyrm/templates/layout.html:102
-#, fuzzy
 #| msgid "Instance Settings"
 msgid "Settings"
-msgstr "Paramètres de l’instance"
+msgstr "Paramètres"
 
 #: bookwyrm/templates/layout.html:111
 #: bookwyrm/templates/settings/admin_layout.html:24
@@ -1239,7 +1207,7 @@ msgstr "Invitations"
 
 #: bookwyrm/templates/layout.html:118
 msgid "Admin"
-msgstr ""
+msgstr "Admin"
 
 #: bookwyrm/templates/layout.html:125
 msgid "Log out"
@@ -1255,13 +1223,12 @@ msgstr "Notifications"
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
-msgstr "Nom d’utilisateur :"
+msgstr "Nom du compte :"
 
 #: bookwyrm/templates/layout.html:156
-#, fuzzy
 #| msgid "Password:"
 msgid "password"
-msgstr "Mot de passe :"
+msgstr "Mot de passe"
 
 #: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
@@ -1274,7 +1241,7 @@ msgstr "Se connecter"
 
 #: bookwyrm/templates/layout.html:168
 msgid "Join"
-msgstr ""
+msgstr "Rejoindre"
 
 #: bookwyrm/templates/layout.html:191
 msgid "About this server"
@@ -1287,11 +1254,11 @@ msgstr "Contacter l’administrateur du site"
 #: bookwyrm/templates/layout.html:202
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
-msgstr ""
+msgstr "Soutenez %(site_name)s avec <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 
 #: bookwyrm/templates/layout.html:206
 msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
-msgstr "Bookwyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports de bogues via <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgstr "BookWyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports de bogues via <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
 #: bookwyrm/templates/lists/create_form.html:5
 #: bookwyrm/templates/lists/lists.html:19
@@ -1299,16 +1266,16 @@ msgid "Create List"
 msgstr "Créer une liste"
 
 #: bookwyrm/templates/lists/created_text.html:5
-#, fuzzy, python-format
+#, python-format
 #| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "Created and curated by <a href=\"%(path)s\">%(username)s</a>"
-msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
+msgstr "Créée et modérée par <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/lists/created_text.html:7
-#, fuzzy, python-format
+#, python-format
 #| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
-msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
+msgstr "Créée par <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/lists/curate.html:6
 msgid "Pending Books"
@@ -1349,7 +1316,7 @@ msgstr "Fermée"
 
 #: bookwyrm/templates/lists/form.html:22
 msgid "Only you can add and remove books to this list"
-msgstr "Vous seul(e) pouvez ajouter ou supprimer des livres dans cette liste"
+msgstr "Vous seul(e) pouvez ajouter ou retirer des livres dans cette liste"
 
 #: bookwyrm/templates/lists/form.html:26
 msgid "Curated"
@@ -1373,10 +1340,10 @@ msgid "This list is currently empty"
 msgstr "Cette liste est vide actuellement"
 
 #: bookwyrm/templates/lists/list.html:35
-#, fuzzy, python-format
+#, python-format
 #| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
-msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
+msgstr "Ajoutée par <a href=\"%(user_path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/lists/list.html:41
 #: bookwyrm/templates/snippets/shelf_selector.html:26
@@ -1430,128 +1397,121 @@ msgstr "En savoir plus sur ce site"
 #: bookwyrm/templates/moderation/report_preview.html:6
 #, python-format
 msgid "Report #%(report_id)s: %(username)s"
-msgstr ""
+msgstr "Signalement #%(report_id)s : %(username)s"
 
 #: bookwyrm/templates/moderation/report.html:10
 msgid "Back to reports"
-msgstr ""
+msgstr "Retour aux signalements"
 
 #: bookwyrm/templates/moderation/report.html:18
-#, fuzzy
 #| msgid "Notifications"
 msgid "Actions"
-msgstr "Notifications"
+msgstr "Actions"
 
 #: bookwyrm/templates/moderation/report.html:19
-#, fuzzy
 #| msgid "User Profile"
 msgid "View user profile"
-msgstr "Profil"
+msgstr "Voir le profil"
 
 #: bookwyrm/templates/moderation/report.html:22
-#: bookwyrm/templates/snippets/status/status_options.html:25
+#: bookwyrm/templates/snippets/status/status_options.html:35
 #: bookwyrm/templates/snippets/user_options.html:13
 msgid "Send direct message"
 msgstr "Envoyer un message direct"
 
 #: bookwyrm/templates/moderation/report.html:27
 msgid "Deactivate user"
-msgstr ""
+msgstr "Désactiver le compte"
 
 #: bookwyrm/templates/moderation/report.html:29
 msgid "Reactivate user"
-msgstr ""
+msgstr "Réactiver le compte"
 
 #: bookwyrm/templates/moderation/report.html:36
 msgid "Moderator Comments"
-msgstr ""
+msgstr "Commentaires de l’équipe de modération"
 
 #: bookwyrm/templates/moderation/report.html:54
-#: bookwyrm/templates/snippets/create_status.html:12
+#: bookwyrm/templates/snippets/create_status.html:28
 #: bookwyrm/templates/snippets/create_status_form.html:44
 msgid "Comment"
 msgstr "Commentaire"
 
 #: bookwyrm/templates/moderation/report.html:59
-#, fuzzy
 #| msgid "Delete status"
 msgid "Reported statuses"
-msgstr "Supprimer le statut"
+msgstr "Statuts signalés"
 
 #: bookwyrm/templates/moderation/report.html:61
 msgid "No statuses reported"
-msgstr ""
+msgstr "Aucun statut signalé"
 
 #: bookwyrm/templates/moderation/report.html:67
 msgid "Statuses has been deleted"
-msgstr ""
+msgstr "Les statuts ont été supprimés"
 
 #: bookwyrm/templates/moderation/report_modal.html:6
-#, fuzzy, python-format
+#, python-format
 #| msgid "Join %(name)s"
 msgid "Report @%(username)s"
-msgstr "Listes : %(username)s"
+msgstr "Signaler @%(username)s"
 
 #: bookwyrm/templates/moderation/report_modal.html:21
 #, python-format
 msgid "This report will be sent to %(site_name)s's moderators for review."
-msgstr ""
+msgstr "Ce signalement sera envoyé à l’équipe de modération de %(site_name)s pour traitement."
 
 #: bookwyrm/templates/moderation/report_modal.html:22
-#, fuzzy
 #| msgid "More about this site"
 msgid "More info about this report:"
-msgstr "En savoir plus sur ce site"
+msgstr "En savoir plus sur ce signalement :"
 
 #: bookwyrm/templates/moderation/report_preview.html:13
 msgid "No notes provided"
-msgstr ""
+msgstr "Aucune note fournie"
 
 #: bookwyrm/templates/moderation/report_preview.html:20
-#, fuzzy, python-format
+#, python-format
 #| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "Reported by <a href=\"%(path)s\">%(username)s</a>"
-msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
+msgstr "Signalé par <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/moderation/report_preview.html:30
 msgid "Re-open"
-msgstr ""
+msgstr "Réouvrir"
 
 #: bookwyrm/templates/moderation/report_preview.html:32
 msgid "Resolve"
-msgstr ""
+msgstr "Résoudre"
 
 #: bookwyrm/templates/moderation/reports.html:6
-#, fuzzy, python-format
+#, python-format
 #| msgid "Join %(name)s"
 msgid "Reports: %(server_name)s"
-msgstr "Listes : %(username)s"
+msgstr "Signalements : %(server_name)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
 #: bookwyrm/templates/moderation/reports.html:16
 #: bookwyrm/templates/settings/admin_layout.html:28
-#, fuzzy
 #| msgid "Recent Imports"
 msgid "Reports"
-msgstr "Importations récentes"
+msgstr "Signalements"
 
 #: bookwyrm/templates/moderation/reports.html:13
-#, fuzzy, python-format
+#, python-format
 #| msgid "Join %(name)s"
 msgid "Reports: <small>%(server_name)s</small>"
-msgstr "Listes : %(username)s"
+msgstr "Signalements: <small>%(server_name)s</small>"
 
 #: bookwyrm/templates/moderation/reports.html:27
-#, fuzzy
 #| msgid "Shelved"
 msgid "Resolved"
-msgstr "Ajouté à une étagère"
+msgstr "Résolus"
 
 #: bookwyrm/templates/moderation/reports.html:34
-#, fuzzy
 #| msgid "No books found"
 msgid "No reports found."
-msgstr "Aucun livre trouvé"
+msgstr "Aucun signalement trouvé."
 
 #: bookwyrm/templates/notifications.html:14
 msgid "Delete notifications"
@@ -1663,7 +1623,7 @@ msgstr "Votre <a href=\"/import/%(related_id)s\">importation</a> est terminée."
 #: bookwyrm/templates/notifications.html:113
 #, python-format
 msgid "A new <a href=\"%(path)s\">report</a> needs moderation."
-msgstr ""
+msgstr "Un nouveau <a href=\"%(path)s\">signalement</a> a besoin d’être traité."
 
 #: bookwyrm/templates/notifications.html:139
 msgid "You're all caught up!"
@@ -1710,16 +1670,16 @@ msgstr "Modifier le profil"
 
 #: bookwyrm/templates/preferences/edit_user.html:46
 msgid "Show set reading goal prompt in feed:"
-msgstr ""
+msgstr "Afficher le message pour définir un défi lecture dans le fil d’actualité :"
 
 #: bookwyrm/templates/preferences/edit_user.html:62
 #, python-format
 msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
-msgstr ""
+msgstr "Votre compte sera listé dans le <a href=\"%(path)s\">répertoire</a> et pourra être recommandé à d’autres utilisateurs ou utilisatrices de BookWyrm."
 
 #: bookwyrm/templates/preferences/edit_user.html:65
 msgid "Preferred Timezone: "
-msgstr ""
+msgstr "Fuseau horaire préféré"
 
 #: bookwyrm/templates/preferences/preferences_layout.html:11
 msgid "Account"
@@ -1766,7 +1726,7 @@ msgstr "Gérer les comptes"
 #: bookwyrm/templates/settings/user_admin.html:3
 #: bookwyrm/templates/settings/user_admin.html:10
 msgid "Users"
-msgstr ""
+msgstr "Comptes"
 
 #: bookwyrm/templates/settings/admin_layout.html:32
 #: bookwyrm/templates/settings/federation.html:3
@@ -1781,7 +1741,6 @@ msgstr "Paramètres de l’instance"
 #: bookwyrm/templates/settings/admin_layout.html:41
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
-#, fuzzy
 #| msgid "Instance Settings"
 msgid "Site Settings"
 msgstr "Paramètres du site"
@@ -1808,29 +1767,26 @@ msgstr "Enregistrement"
 
 #: bookwyrm/templates/settings/federated_server.html:7
 msgid "Back to server list"
-msgstr ""
+msgstr "Retour à la liste des serveurs"
 
 #: bookwyrm/templates/settings/federated_server.html:12
 msgid "Details"
-msgstr ""
+msgstr "Détails"
 
 #: bookwyrm/templates/settings/federated_server.html:15
-#, fuzzy
 #| msgid "Software"
 msgid "Software:"
-msgstr "Logiciel"
+msgstr "Logiciel :"
 
 #: bookwyrm/templates/settings/federated_server.html:19
-#, fuzzy
 #| msgid "Description:"
 msgid "Version:"
 msgstr "Description :"
 
 #: bookwyrm/templates/settings/federated_server.html:23
-#, fuzzy
 #| msgid "Status"
 msgid "Status:"
-msgstr "Statut"
+msgstr "Statut :"
 
 #: bookwyrm/templates/settings/federated_server.html:30
 #: bookwyrm/templates/user/user_layout.html:50
@@ -1838,56 +1794,50 @@ msgid "Activity"
 msgstr "Activité"
 
 #: bookwyrm/templates/settings/federated_server.html:33
-#, fuzzy
 #| msgid "Username:"
 msgid "Users:"
-msgstr "Nom d’utilisateur :"
+msgstr "Comptes :"
 
 #: bookwyrm/templates/settings/federated_server.html:36
 #: bookwyrm/templates/settings/federated_server.html:43
 msgid "View all"
-msgstr ""
+msgstr "Voir tous"
 
 #: bookwyrm/templates/settings/federated_server.html:40
-#, fuzzy
 #| msgid "Recent Imports"
 msgid "Reports:"
-msgstr "Importations récentes"
+msgstr "Signalements :"
 
 #: bookwyrm/templates/settings/federated_server.html:47
-#, fuzzy
 #| msgid "followed you"
 msgid "Followed by us:"
-msgstr "s’est abonné(e)"
+msgstr "Suivi par nous :"
 
 #: bookwyrm/templates/settings/federated_server.html:53
-#, fuzzy
 #| msgid "followed you"
 msgid "Followed by them:"
-msgstr "s’est abonné(e)"
+msgstr "Suivi par eux :"
 
 #: bookwyrm/templates/settings/federated_server.html:59
-#, fuzzy
 #| msgid "Blocked Users"
 msgid "Blocked by us:"
-msgstr "Comptes bloqués"
+msgstr "Bloqués par nous :"
 
 #: bookwyrm/templates/settings/federation.html:13
 msgid "Server name"
 msgstr "Nom du serveur"
 
 #: bookwyrm/templates/settings/federation.html:17
-#, fuzzy
 #| msgid "Federated"
 msgid "Date federated"
-msgstr "Fédéré"
+msgstr "Date de fédération"
 
 #: bookwyrm/templates/settings/federation.html:21
 msgid "Software"
 msgstr "Logiciel"
 
 #: bookwyrm/templates/settings/federation.html:24
-#: bookwyrm/templates/settings/manage_invite_requests.html:40
+#: bookwyrm/templates/settings/manage_invite_requests.html:44
 #: bookwyrm/templates/settings/status_filter.html:5
 #: bookwyrm/templates/settings/user_admin.html:32
 msgid "Status"
@@ -1897,75 +1847,77 @@ msgstr "Statut"
 #: bookwyrm/templates/settings/manage_invite_requests.html:11
 #: bookwyrm/templates/settings/manage_invite_requests.html:25
 #: bookwyrm/templates/settings/manage_invites.html:11
-#, fuzzy
 #| msgid "Invites"
 msgid "Invite Requests"
 msgstr "Invitations"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:23
 msgid "Ignored Invite Requests"
-msgstr ""
+msgstr "Invitations ignorées"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:35
-msgid "Date"
-msgstr ""
+#| msgid "Federated"
+msgid "Date requested"
+msgstr "Date d’envoi"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:38
+#: bookwyrm/templates/settings/manage_invite_requests.html:39
+#| msgid "Accept"
+msgid "Date accepted"
+msgstr "Date de validation"
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:42
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:43
-#, fuzzy
+#: bookwyrm/templates/settings/manage_invite_requests.html:47
 #| msgid "Notifications"
 msgid "Action"
-msgstr "Notifications"
+msgstr "Action"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:46
-#, fuzzy
+#: bookwyrm/templates/settings/manage_invite_requests.html:50
 #| msgid "Follow Requests"
 msgid "No requests"
-msgstr "Demandes d’abonnement"
+msgstr "Aucune demande"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:54
+#: bookwyrm/templates/settings/manage_invite_requests.html:59
 #: bookwyrm/templates/settings/status_filter.html:16
-#, fuzzy
 #| msgid "Accept"
 msgid "Accepted"
-msgstr "Accepter"
+msgstr "Accepté(e)s"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:56
+#: bookwyrm/templates/settings/manage_invite_requests.html:61
 #: bookwyrm/templates/settings/status_filter.html:12
 msgid "Sent"
-msgstr ""
+msgstr "Envoyé(e)s"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:58
+#: bookwyrm/templates/settings/manage_invite_requests.html:63
 #: bookwyrm/templates/settings/status_filter.html:8
 msgid "Requested"
-msgstr ""
+msgstr "Demandé(e)s"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:68
+#: bookwyrm/templates/settings/manage_invite_requests.html:73
 msgid "Send invite"
-msgstr ""
+msgstr "Envoyer l’invitation"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:70
+#: bookwyrm/templates/settings/manage_invite_requests.html:75
 msgid "Re-send invite"
-msgstr ""
+msgstr "Envoyer l’invitation de nouveau"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:90
+#: bookwyrm/templates/settings/manage_invite_requests.html:95
 msgid "Ignore"
-msgstr ""
+msgstr "Ignorer"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:92
+#: bookwyrm/templates/settings/manage_invite_requests.html:97
 msgid "Un-ignore"
-msgstr ""
+msgstr "Ne plus ignorer"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:103
+#: bookwyrm/templates/settings/manage_invite_requests.html:108
 msgid "Back to pending requests"
-msgstr ""
+msgstr "Retour aux demandes en attente"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:105
+#: bookwyrm/templates/settings/manage_invite_requests.html:110
 msgid "View ignored requests"
-msgstr ""
+msgstr "Voir les demandes ignorées"
 
 #: bookwyrm/templates/settings/manage_invites.html:21
 msgid "Generate New Invite"
@@ -2052,10 +2004,9 @@ msgid "Allow registration:"
 msgstr "Autoriser l’enregistrement :"
 
 #: bookwyrm/templates/settings/site.html:83
-#, fuzzy
 #| msgid "Follow Requests"
 msgid "Allow invite requests:"
-msgstr "Demandes d’abonnement"
+msgstr "Autoriser les demandes d’invitation :"
 
 #: bookwyrm/templates/settings/site.html:87
 msgid "Registration closed text:"
@@ -2064,43 +2015,39 @@ msgstr "Texte affiché lorsque les enregistrements sont clos :"
 #: bookwyrm/templates/settings/user_admin.html:7
 #, python-format
 msgid "Users: <small>%(server_name)s</small>"
-msgstr ""
+msgstr "Comptes : <small>%(server_name)s</small>"
 
 #: bookwyrm/templates/settings/user_admin.html:20
-#, fuzzy
 #| msgid "Username:"
 msgid "Username"
-msgstr "Nom d’utilisateur :"
+msgstr "Nom du compte"
 
 #: bookwyrm/templates/settings/user_admin.html:24
-#, fuzzy
 #| msgid "added"
 msgid "Date Added"
-msgstr "a ajouté"
+msgstr "Date d’ajout"
 
 #: bookwyrm/templates/settings/user_admin.html:28
 msgid "Last Active"
-msgstr ""
+msgstr "Dernière activité"
 
 #: bookwyrm/templates/settings/user_admin.html:36
-#, fuzzy
 #| msgid "Remove"
 msgid "Remote server"
-msgstr "Supprimer"
+msgstr "Serveur distant"
 
 #: bookwyrm/templates/settings/user_admin.html:45
-#, fuzzy
 #| msgid "Activity"
 msgid "Active"
-msgstr "Activité"
+msgstr "Actif"
 
 #: bookwyrm/templates/settings/user_admin.html:45
 msgid "Inactive"
-msgstr ""
+msgstr "Inactif"
 
 #: bookwyrm/templates/settings/user_admin.html:50
 msgid "Not set"
-msgstr ""
+msgstr "Non défini"
 
 #: bookwyrm/templates/snippets/block_button.html:5
 msgid "Block"
@@ -2117,8 +2064,8 @@ msgstr "<a href=\"%(path)s\">%(title)s</a> par "
 
 #: bookwyrm/templates/snippets/boost_button.html:8
 #: bookwyrm/templates/snippets/boost_button.html:9
-#: bookwyrm/templates/snippets/status/status_body.html:51
 #: bookwyrm/templates/snippets/status/status_body.html:52
+#: bookwyrm/templates/snippets/status/status_body.html:53
 msgid "Boost status"
 msgstr "Partager le statut"
 
@@ -2131,15 +2078,15 @@ msgstr "Annuler le partage du statut"
 msgid "Spoiler alert:"
 msgstr "Alerte Spoiler :"
 
-#: bookwyrm/templates/snippets/content_warning_field.html:4
+#: bookwyrm/templates/snippets/content_warning_field.html:10
 msgid "Spoilers ahead!"
 msgstr "Attention spoilers !"
 
-#: bookwyrm/templates/snippets/create_status.html:9
+#: bookwyrm/templates/snippets/create_status.html:17
 msgid "Review"
 msgstr "Critique"
 
-#: bookwyrm/templates/snippets/create_status.html:15
+#: bookwyrm/templates/snippets/create_status.html:39
 msgid "Quote"
 msgstr "Citation"
 
@@ -2148,16 +2095,14 @@ msgid "Comment:"
 msgstr "Commentaire :"
 
 #: bookwyrm/templates/snippets/create_status_form.html:20
-#, fuzzy
 #| msgid "Quote"
 msgid "Quote:"
-msgstr "Citation"
+msgstr "Citation :"
 
 #: bookwyrm/templates/snippets/create_status_form.html:22
-#, fuzzy
 #| msgid "Review"
 msgid "Review:"
-msgstr "Critique"
+msgstr "Critique :"
 
 #: bookwyrm/templates/snippets/create_status_form.html:29
 #: bookwyrm/templates/user/shelf.html:81
@@ -2191,14 +2136,14 @@ msgstr "sur %(pages)s pages"
 msgid "Include spoiler alert"
 msgstr "Afficher une alerte spoiler"
 
-#: bookwyrm/templates/snippets/create_status_form.html:87
+#: bookwyrm/templates/snippets/create_status_form.html:88
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:19
 msgid "Private"
 msgstr "Privé"
 
-#: bookwyrm/templates/snippets/create_status_form.html:94
+#: bookwyrm/templates/snippets/create_status_form.html:99
 msgid "Post"
 msgstr "Publier"
 
@@ -2218,45 +2163,42 @@ msgstr "Supprimer"
 
 #: bookwyrm/templates/snippets/fav_button.html:7
 #: bookwyrm/templates/snippets/fav_button.html:8
-#: bookwyrm/templates/snippets/status/status_body.html:55
 #: bookwyrm/templates/snippets/status/status_body.html:56
+#: bookwyrm/templates/snippets/status/status_body.html:57
 msgid "Like status"
 msgstr "Ajouter le statut aux favoris"
 
 #: bookwyrm/templates/snippets/fav_button.html:15
 #: bookwyrm/templates/snippets/fav_button.html:16
 msgid "Un-like status"
-msgstr "Supprimer le statut des favoris"
+msgstr "Retirer le statut des favoris"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:7
-#, fuzzy
 #| msgid "Show less"
 msgid "Show filters"
-msgstr "Replier"
+msgstr "Afficher les filtres"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:9
 msgid "Hide filters"
-msgstr ""
+msgstr "Masquer les filtres"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:22
 msgid "Apply filters"
-msgstr ""
+msgstr "Appliquer les filtres"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:26
-#, fuzzy
 #| msgid "Clear search"
 msgid "Clear filters"
-msgstr "Vider la requête"
+msgstr "Annuler les filtres"
 
 #: bookwyrm/templates/snippets/follow_button.html:12
 msgid "Follow"
 msgstr "S’abonner"
 
 #: bookwyrm/templates/snippets/follow_button.html:18
-#, fuzzy
 #| msgid "Send follow request"
 msgid "Undo follow request"
-msgstr "Envoyer une demande d’abonnement"
+msgstr "Annuler la demande d’abonnement"
 
 #: bookwyrm/templates/snippets/follow_button.html:20
 msgid "Unfollow"
@@ -2287,29 +2229,29 @@ msgstr[0] "souhaite lire %(counter)s livre en %(year)s"
 msgstr[1] "souhaite lire %(counter)s livres en %(year)s"
 
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
-#, fuzzy, python-format
+#, python-format
 #| msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
 msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
-msgstr[0] "<a href=\"%(path)s\">%(title)s</a> par "
-msgstr[1] "<a href=\"%(path)s\">%(title)s</a> par "
+msgstr[0] "A noté <a href=\"%(path)s\">%(title)s</a> : %(display_rating)s star"
+msgstr[1] "A noté <a href=\"%(path)s\">%(title)s</a> : %(display_rating)s stars"
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4
 #, python-format
 msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
 msgid_plural "Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Critique de « %(book_title)s » (%(display_rating)s star): %(review_title)s"
+msgstr[1] "Critique de « %(book_title)s » (%(display_rating)s stars) : %(review_title)s"
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:8
 #, python-format
 msgid "Review of \"%(book_title)s\": %(review_title)s"
-msgstr ""
+msgstr "Critique de « %(book_title)s » : %(review_title)s"
 
 #: bookwyrm/templates/snippets/goal_card.html:23
 #, python-format
 msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
-msgstr "Vous pouvez définir ou changer vore défi lecture à n’importe quel moment depuis votre <a href=\"%(path)s\">profil</a>"
+msgstr "Vous pouvez définir ou changer votre défi lecture à n’importe quel moment depuis votre <a href=\"%(path)s\">profil</a>"
 
 #: bookwyrm/templates/snippets/goal_form.html:9
 msgid "Reading goal:"
@@ -2354,22 +2296,22 @@ msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count
 msgstr "%(username)s a lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s livres</a>."
 
 #: bookwyrm/templates/snippets/page_text.html:4
-#, fuzzy, python-format
+#, python-format
 #| msgid "of %(pages)s pages"
 msgid "page %(page)s of %(total_pages)s"
-msgstr "sur %(pages)s pages"
+msgstr "page %(page)s sur %(total_pages)s pages"
 
 #: bookwyrm/templates/snippets/page_text.html:6
-#, fuzzy, python-format
+#, python-format
 #| msgid "of %(book.pages)s pages"
 msgid "page %(page)s"
-msgstr "sur %(book.pages)s pages"
+msgstr "page %(page)s"
 
-#: bookwyrm/templates/snippets/pagination.html:5
+#: bookwyrm/templates/snippets/pagination.html:12
 msgid "Previous"
 msgstr "Précédente"
 
-#: bookwyrm/templates/snippets/pagination.html:9
+#: bookwyrm/templates/snippets/pagination.html:23
 msgid "Next"
 msgstr "Suivante"
 
@@ -2432,7 +2374,6 @@ msgid "Edit read dates"
 msgstr "Modifier les date de lecture"
 
 #: bookwyrm/templates/snippets/readthrough.html:61
-#, fuzzy
 #| msgid "Delete these read dates?"
 msgid "Delete these read dates"
 msgstr "Supprimer ces dates de lecture"
@@ -2457,10 +2398,9 @@ msgid "Sign Up"
 msgstr "S’enregistrer"
 
 #: bookwyrm/templates/snippets/report_button.html:5
-#, fuzzy
 #| msgid "Import"
 msgid "Report"
-msgstr "Importer"
+msgstr "Signaler"
 
 #: bookwyrm/templates/snippets/rss_title.html:5
 #: bookwyrm/templates/snippets/status/status_header.html:11
@@ -2483,10 +2423,9 @@ msgid "quoted"
 msgstr "a cité"
 
 #: bookwyrm/templates/snippets/search_result_text.html:10
-#, fuzzy
 #| msgid "Add cover"
 msgid "No cover"
-msgstr "Ajouter une couverture"
+msgstr "Aucune couverture"
 
 #: bookwyrm/templates/snippets/search_result_text.html:22
 #, python-format
@@ -2498,10 +2437,9 @@ msgid "Import book"
 msgstr "Importer le livre"
 
 #: bookwyrm/templates/snippets/shelf_selector.html:4
-#, fuzzy
 #| msgid "Your books"
 msgid "Move book"
-msgstr "Vos livres"
+msgstr "Déplacer le livre"
 
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
 #, python-format
@@ -2510,23 +2448,20 @@ msgstr "Terminer « <em>%(book_title)s</em> »"
 
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:35
-#, fuzzy
 #| msgid "Updated:"
 msgid "Update progress"
-msgstr "Mises à jour"
+msgstr "Progression de la mise à jour"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5
 msgid "More shelves"
 msgstr "Plus d’étagères"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:8
-#, fuzzy
 #| msgid "Started reading"
 msgid "Start reading"
 msgstr "Commencer la lecture"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
-#, fuzzy
 #| msgid "Finished reading"
 msgid "Finish reading"
 msgstr "Terminer la lecture"
@@ -2537,10 +2472,10 @@ msgid "Want to read"
 msgstr "Je veux le lire"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:48
-#, fuzzy, python-format
+#, python-format
 #| msgid "Join %(name)s"
 msgid "Remove from %(name)s"
-msgstr "Listes : %(username)s"
+msgstr "Retirer de %(name)s"
 
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
 #, python-format
@@ -2561,9 +2496,9 @@ msgstr "partagé"
 msgid "Delete status"
 msgstr "Supprimer le statut"
 
-#: bookwyrm/templates/snippets/status/status_body.html:34
-#: bookwyrm/templates/snippets/status/status_body.html:47
+#: bookwyrm/templates/snippets/status/status_body.html:35
 #: bookwyrm/templates/snippets/status/status_body.html:48
+#: bookwyrm/templates/snippets/status/status_body.html:49
 msgid "Reply"
 msgstr "Répondre"
 
@@ -2582,49 +2517,52 @@ msgid "Open image in new window"
 msgstr "Ouvrir l’image dans une nouvelle fenêtre"
 
 #: bookwyrm/templates/snippets/status/status_header.html:22
-#, fuzzy, python-format
+#, python-format
 #| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">review</a>"
-msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
+msgstr "a répondu à la <a href=\"%(status_path)s\">critique</a> de <a href=\"%(user_path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/snippets/status/status_header.html:24
-#, fuzzy, python-format
+#, python-format
 #| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">comment</a>"
-msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">statut</a>"
+msgstr "a répondu au <a href=\"%(status_path)s\">commentaire</a> de <a href=\"%(user_path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/snippets/status/status_header.html:26
-#, fuzzy, python-format
+#, python-format
 #| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">quote</a>"
-msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">statut</a>"
+msgstr "a répondu à la <a href=\"%(status_path)s\">citation</a> de <a href=\"%(user_path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/snippets/status/status_header.html:28
-#, fuzzy, python-format
+#, python-format
 #| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
-msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">statut</a>"
+msgstr "a répondu au <a href=\"%(status_path)s\">statut</a> de <a href=\"%(user_path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/snippets/status/status_options.html:7
 #: bookwyrm/templates/snippets/user_options.html:7
 msgid "More options"
 msgstr "Plus d’options"
 
+#: bookwyrm/templates/snippets/status/status_options.html:27
+#| msgid "Delete these read dates?"
+msgid "Delete & re-draft"
+msgstr "Supprimer & recommencer la rédaction"
+
 #: bookwyrm/templates/snippets/switch_edition_button.html:5
 msgid "Switch to this edition"
 msgstr "Changer vers cette édition"
 
 #: bookwyrm/templates/snippets/table-sort-header.html:6
-#, fuzzy
 #| msgid "Started reading"
-msgid "Sorted asccending"
-msgstr "Lecture commencée le"
+msgid "Sorted ascending"
+msgstr "Trié par ordre croissant"
 
 #: bookwyrm/templates/snippets/table-sort-header.html:10
-#, fuzzy
 #| msgid "Started reading"
 msgid "Sorted descending"
-msgstr "Lecture commencée le"
+msgstr "Trié par ordre décroissant"
 
 #: bookwyrm/templates/snippets/tag.html:14
 msgid "Remove tag"
@@ -2640,10 +2578,10 @@ msgid "Books tagged \"%(tag.name)s\""
 msgstr "Livres tagués « %(tag.name)s »"
 
 #: bookwyrm/templates/user/books_header.html:5
-#, fuzzy, python-format
+#, python-format
 #| msgid "%(username)s has no followers"
 msgid "%(username)s's books"
-msgstr "Livres de %(username)s en %(year)s"
+msgstr "Livres de %(username)s"
 
 #: bookwyrm/templates/user/create_shelf_form.html:5
 #: bookwyrm/templates/user/create_shelf_form.html:22
@@ -2683,7 +2621,7 @@ msgid "Your Lists"
 msgstr "Vos listes"
 
 #: bookwyrm/templates/user/lists.html:11
-#, fuzzy, python-format
+#, python-format
 #| msgid "Join %(name)s"
 msgid "Lists: %(username)s"
 msgstr "Listes : %(username)s"
@@ -2693,10 +2631,9 @@ msgid "Create list"
 msgstr "Créer une liste"
 
 #: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:56
-#, fuzzy
 #| msgid "books"
 msgid "All books"
-msgstr "livres"
+msgstr "Tous les livres"
 
 #: bookwyrm/templates/user/shelf.html:37
 msgid "Create shelf"
@@ -2731,14 +2668,14 @@ msgid "Edit profile"
 msgstr "Modifier le profil"
 
 #: bookwyrm/templates/user/user.html:34
-#, fuzzy, python-format
+#, python-format
 #| msgid "See all %(size)s"
 msgid "View all %(size)s"
 msgstr "Voir les %(size)s"
 
 #: bookwyrm/templates/user/user.html:47
 msgid "View all books"
-msgstr ""
+msgstr "Voir tous les livres"
 
 #: bookwyrm/templates/user/user.html:59
 #, python-format
@@ -2766,10 +2703,9 @@ msgid "Reading Goal"
 msgstr "Défi lecture"
 
 #: bookwyrm/templates/user/user_layout.html:68
-#, fuzzy
 #| msgid "Book"
 msgid "Books"
-msgstr "Livre"
+msgstr "Livres"
 
 #: bookwyrm/templates/user/user_preview.html:13
 #, python-format
@@ -2777,12 +2713,12 @@ msgid "Joined %(date)s"
 msgstr "Enregistré(e) %(date)s"
 
 #: bookwyrm/templates/user/user_preview.html:15
-#, fuzzy, python-format
+#, python-format
 #| msgid "%(username)s has no followers"
 msgid "%(counter)s follower"
 msgid_plural "%(counter)s followers"
-msgstr[0] "%(username)s n’a pas d’abonné(e)"
-msgstr[1] "%(username)s n’a pas d’abonné(e)s"
+msgstr[0] "%(counter)s abonnement"
+msgstr[1] "%(counter)s abonnements"
 
 #: bookwyrm/templates/user/user_preview.html:16
 #, python-format
@@ -2791,12 +2727,12 @@ msgstr "%(counter)s abonnements"
 
 #: bookwyrm/views/password.py:32
 msgid "No user with that email address was found."
-msgstr ""
+msgstr "Aucun compte avec cette adresse email n’a été trouvé."
 
 #: bookwyrm/views/password.py:41
 #, python-format
 msgid "A password reset link sent to %s"
-msgstr ""
+msgstr "Un lien de réinitialisation a été envoyé à %s."
 
 #, fuzzy
 #~| msgid "Started"
diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
index 019000e2a74794ac764fb9313da0e56c4fa59479..07b8d63ca2e7a940d4feb0d0a94892b7a708e8b5 100644
GIT binary patch
delta 5717
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
LllSZ$lGEq^<8A~w

delta 5717
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
KNlC`=^#23P+5!Fm

diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index 85187207..66a26636 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/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

From 125915f1b3bdc134c4bb54bf8a3ff19649605359 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Mon, 5 Apr 2021 12:53:20 +0200
Subject: [PATCH 0638/1285] [l10n] Add missing i18n string to template.

---
 bookwyrm/templates/lists/lists.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/lists/lists.html b/bookwyrm/templates/lists/lists.html
index a9258305..27e56f11 100644
--- a/bookwyrm/templates/lists/lists.html
+++ b/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>

From 6971c9b133af3d4ebc6f32c62535f6e330457d34 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Mon, 5 Apr 2021 16:16:05 +0200
Subject: [PATCH 0639/1285] [assets] Move toggleAllCheckboxes code to its own
 file.

---
 bookwyrm/static/js/check_all.js | 29 ++++++++++++++++++-----------
 bookwyrm/static/js/shared.js    |  9 +--------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/bookwyrm/static/js/check_all.js b/bookwyrm/static/js/check_all.js
index 07d30a68..72c83e3e 100644
--- a/bookwyrm/static/js/check_all.js
+++ b/bookwyrm/static/js/check_all.js
@@ -1,17 +1,24 @@
-/* exported toggleAllCheckboxes */
-
 /**
  * Toggle all descendant checkboxes of a target.
  *
- * Use `data-target="ID_OF_TARGET"` on the node being listened to.
- *
- * @param  {Event} event - change Event
- * @return {undefined}
+ * Use `data-target="ID_OF_TARGET"` on the node on which the event is listened
+ * to (checkbox, button, link…), where_ID_OF_TARGET_ should be the ID of an
+ * ancestor for the checkboxes.
  */
-function toggleAllCheckboxes(event) {
-    const mainCheckbox = event.target;
+(function() {
+    'use strict';
+
+    function toggleAllCheckboxes(event) {
+        const mainCheckbox = event.target;
+
+        document
+            .querySelectorAll(`#${mainCheckbox.dataset.target} [type="checkbox"]`)
+            .forEach(checkbox => {checkbox.checked = mainCheckbox.checked;});
+    }
 
     document
-        .querySelectorAll(`#${mainCheckbox.dataset.target} [type="checkbox"]`)
-        .forEach(checkbox => {checkbox.checked = mainCheckbox.checked;});
-}
+        .querySelectorAll('[data-action="toggle-all"]')
+        .forEach(input => {
+            input.addEventListener('change', toggleAllCheckboxes);
+        });
+})();
diff --git a/bookwyrm/static/js/shared.js b/bookwyrm/static/js/shared.js
index 7a198619..5ca3d7d7 100644
--- a/bookwyrm/static/js/shared.js
+++ b/bookwyrm/static/js/shared.js
@@ -1,4 +1,4 @@
-/* globals setDisplay TabGroup toggleAllCheckboxes updateDisplay */
+/* globals setDisplay TabGroup updateDisplay */
 
 // set up javascript listeners
 window.onload = function() {
@@ -36,13 +36,6 @@ window.onload = function() {
     // update localstorage
     Array.from(document.getElementsByClassName('set-display'))
         .forEach(t => t.onclick = updateDisplay);
-
-    // Toggle all checkboxes.
-    document
-        .querySelectorAll('[data-action="toggle-all"]')
-        .forEach(input => {
-            input.addEventListener('change', toggleAllCheckboxes);
-        });
 };
 
 function back(e) {

From 5aea7343b40f53aad7a512d6da80b7300d3498a0 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Mon, 5 Apr 2021 16:16:48 +0200
Subject: [PATCH 0640/1285] [assets] Rename some files for consistency.

---
 bookwyrm/static/css/{format.css => bookwyrm.css} | 0
 bookwyrm/static/js/{shared.js => bookwyrm.js}    | 0
 bookwyrm/templates/layout.html                   | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename bookwyrm/static/css/{format.css => bookwyrm.css} (100%)
 rename bookwyrm/static/js/{shared.js => bookwyrm.js} (100%)

diff --git a/bookwyrm/static/css/format.css b/bookwyrm/static/css/bookwyrm.css
similarity index 100%
rename from bookwyrm/static/css/format.css
rename to bookwyrm/static/css/bookwyrm.css
diff --git a/bookwyrm/static/js/shared.js b/bookwyrm/static/js/bookwyrm.js
similarity index 100%
rename from bookwyrm/static/js/shared.js
rename to bookwyrm/static/js/bookwyrm.js
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 80eb386a..ccc52a50 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -6,8 +6,8 @@
     <title>{% block title %}BookWyrm{% endblock %} | {{ site.name }}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link type="text/css" rel="stylesheet" href="/static/css/bulma.min.css">
-    <link type="text/css" rel="stylesheet" href="/static/css/format.css">
     <link type="text/css" rel="stylesheet" href="/static/css/icons.css">
+    <link type="text/css" rel="stylesheet" href="/static/css/bookwyrm.css">
 
     <link rel="shortcut icon" type="image/x-icon" href="{% if site.favicon %}/images/{{ site.favicon }}{% else %}/static/images/favicon.ico{% endif %}">
 
@@ -212,7 +212,7 @@
 <script>
     var csrf_token = '{{ csrf_token }}';
 </script>
-<script src="/static/js/shared.js"></script>
+<script src="/static/js/bookwyrm.js"></script>
 {% block scripts %}{% endblock %}
 </body>
 </html>

From cbed5e331b02b95f09ee6aab7d703ce2b896d558 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Mon, 5 Apr 2021 16:17:11 +0200
Subject: [PATCH 0641/1285] [assets] Move some frontend assets to _vendor_
 directories:

This simplifies linting of files we have no grasp on, and clarifies responsibilities.

- Add .eslintignore.
- Restrict linting to bookwyrm/static.
---
 .eslintignore                                  | 1 +
 .github/workflows/lint-frontend.yaml           | 6 ++++--
 .stylelintignore                               | 3 +--
 bookwyrm/static/css/{ => vendor}/bulma.css.map | 0
 bookwyrm/static/css/{ => vendor}/bulma.min.css | 0
 bookwyrm/static/css/{ => vendor}/icons.css     | 0
 bookwyrm/static/js/{ => vendor}/tabs.js        | 0
 bookwyrm/templates/book/book.html              | 2 +-
 bookwyrm/templates/feed/feed_layout.html       | 2 +-
 bookwyrm/templates/layout.html                 | 6 +++---
 10 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 .eslintignore
 rename bookwyrm/static/css/{ => vendor}/bulma.css.map (100%)
 rename bookwyrm/static/css/{ => vendor}/bulma.min.css (100%)
 rename bookwyrm/static/css/{ => vendor}/icons.css (100%)
 rename bookwyrm/static/js/{ => vendor}/tabs.js (100%)

diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 00000000..b2cd33f8
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1 @@
+**/vendor/**
diff --git a/.github/workflows/lint-frontend.yaml b/.github/workflows/lint-frontend.yaml
index 978bbbbe..4c5e8823 100644
--- a/.github/workflows/lint-frontend.yaml
+++ b/.github/workflows/lint-frontend.yaml
@@ -22,8 +22,10 @@ jobs:
       - name: Install modules
         run: yarn
 
+      # See .stylelintignore for files that are not linted.
       - name: Run stylelint
-        run: yarn stylelint **/static/**/*.css --report-needless-disables --report-invalid-scope-disables
+        run: yarn stylelint bookwyrm/static/**/*.css --report-needless-disables --report-invalid-scope-disables
 
+      # See .eslintignore for files that are not linted.
       - name: Run ESLint
-        run: yarn eslint . --ext .js,.jsx,.ts,.tsx
+        run: yarn eslint bookwyrm/static --ext .js,.jsx,.ts,.tsx
diff --git a/.stylelintignore b/.stylelintignore
index f456cb22..b2cd33f8 100644
--- a/.stylelintignore
+++ b/.stylelintignore
@@ -1,2 +1 @@
-bookwyrm/static/css/bulma.*.css*
-bookwyrm/static/css/icons.css
+**/vendor/**
diff --git a/bookwyrm/static/css/bulma.css.map b/bookwyrm/static/css/vendor/bulma.css.map
similarity index 100%
rename from bookwyrm/static/css/bulma.css.map
rename to bookwyrm/static/css/vendor/bulma.css.map
diff --git a/bookwyrm/static/css/bulma.min.css b/bookwyrm/static/css/vendor/bulma.min.css
similarity index 100%
rename from bookwyrm/static/css/bulma.min.css
rename to bookwyrm/static/css/vendor/bulma.min.css
diff --git a/bookwyrm/static/css/icons.css b/bookwyrm/static/css/vendor/icons.css
similarity index 100%
rename from bookwyrm/static/css/icons.css
rename to bookwyrm/static/css/vendor/icons.css
diff --git a/bookwyrm/static/js/tabs.js b/bookwyrm/static/js/vendor/tabs.js
similarity index 100%
rename from bookwyrm/static/js/tabs.js
rename to bookwyrm/static/js/vendor/tabs.js
diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index b91cebba..a7887c61 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -267,5 +267,5 @@
 {% endblock %}
 
 {% block scripts %}
-<script src="/static/js/tabs.js"></script>
+<script src="/static/js/vendor/tabs.js"></script>
 {% endblock %}
diff --git a/bookwyrm/templates/feed/feed_layout.html b/bookwyrm/templates/feed/feed_layout.html
index 9afd5e60..edbab016 100644
--- a/bookwyrm/templates/feed/feed_layout.html
+++ b/bookwyrm/templates/feed/feed_layout.html
@@ -104,5 +104,5 @@
 {% endblock %}
 
 {% block scripts %}
-<script src="/static/js/tabs.js"></script>
+<script src="/static/js/vendor/tabs.js"></script>
 {% endblock %}
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index ccc52a50..c1ff1276 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -5,9 +5,9 @@
 <head>
     <title>{% block title %}BookWyrm{% endblock %} | {{ site.name }}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link type="text/css" rel="stylesheet" href="/static/css/bulma.min.css">
-    <link type="text/css" rel="stylesheet" href="/static/css/icons.css">
-    <link type="text/css" rel="stylesheet" href="/static/css/bookwyrm.css">
+    <link rel="stylesheet" href="/static/css/vendor/bulma.min.css">
+    <link rel="stylesheet" href="/static/css/vendor/icons.css">
+    <link rel="stylesheet" href="/static/css/bookwyrm.css">
 
     <link rel="shortcut icon" type="image/x-icon" href="{% if site.favicon %}/images/{{ site.favicon }}{% else %}/static/images/favicon.ico{% endif %}">
 

From 27e47b0a35999972de72abff340a6778f2269649 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Mon, 5 Apr 2021 16:35:09 +0200
Subject: [PATCH 0642/1285] [lint] Update context for linting frontend files:

- Lint files when pushing on the _frontend_ branch.
- Lint files when eslint or stylelint config files are updated.
- Use _strict_ parsing of JS files by default. This should make the JS linting test to fail.
---
 .eslintrc.js                         | 6 +++++-
 .github/workflows/lint-frontend.yaml | 6 ++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index d39859f1..b5f3c311 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -6,5 +6,9 @@ module.exports = {
         "es6": true
     },
 
-    "extends": "eslint:recommended"
+    "extends": "eslint:recommended",
+
+    "rules": {
+        "strict": "error"
+    }
 };
diff --git a/.github/workflows/lint-frontend.yaml b/.github/workflows/lint-frontend.yaml
index 4c5e8823..f370d83b 100644
--- a/.github/workflows/lint-frontend.yaml
+++ b/.github/workflows/lint-frontend.yaml
@@ -3,12 +3,14 @@ name: Lint Frontend
 
 on:
   push:
-    branches: [ main, ci ]
+    branches: [ main, ci, frontend ]
     paths:
       - '.github/workflows/**'
       - 'static/**'
+      - '.eslintrc'
+      - '.stylelintrc'
   pull_request:
-    branches: [ main, ci ]
+    branches: [ main, ci, frontend ]
 
 jobs:
   lint:

From 964b47ea972e6484542603fb255049e04a45bbfe Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Mon, 5 Apr 2021 16:46:30 +0200
Subject: [PATCH 0643/1285] [assets] Fix path for icomoon font.

---
 bookwyrm/static/css/vendor/icons.css | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/static/css/vendor/icons.css b/bookwyrm/static/css/vendor/icons.css
index 9915ecd1..c6dbad1d 100644
--- a/bookwyrm/static/css/vendor/icons.css
+++ b/bookwyrm/static/css/vendor/icons.css
@@ -1,10 +1,10 @@
 @font-face {
     font-family: 'icomoon';
-    src:  url('fonts/icomoon.eot?n5x55');
-    src:  url('fonts/icomoon.eot?n5x55#iefix') format('embedded-opentype'),
-        url('fonts/icomoon.ttf?n5x55') format('truetype'),
-        url('fonts/icomoon.woff?n5x55') format('woff'),
-        url('fonts/icomoon.svg?n5x55#icomoon') format('svg');
+    src:  url('../fonts/icomoon.eot?n5x55');
+    src:  url('../fonts/icomoon.eot?n5x55#iefix') format('embedded-opentype'),
+        url('../fonts/icomoon.ttf?n5x55') format('truetype'),
+        url('../fonts/icomoon.woff?n5x55') format('woff'),
+        url('../fonts/icomoon.svg?n5x55#icomoon') format('svg');
     font-weight: normal;
     font-style: normal;
     font-display: block;

From 21ba05b4a5fd8862bb17f6283f50f441efc87e14 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Mon, 5 Apr 2021 18:29:01 +0200
Subject: [PATCH 0644/1285] Added wyrms.de

---
 instances.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/instances.md b/instances.md
index 1c8b282b..570328b5 100644
--- a/instances.md
+++ b/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 | � | 

From 04f459a2dff559d8e7edcd2cf96c684fff1eecd2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 5 Apr 2021 10:17:01 -0700
Subject: [PATCH 0645/1285] Fixes creting invites

---
 bookwyrm/forms.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 1a114e05..b159a89e 100644
--- a/bookwyrm/forms.py
+++ b/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=[

From bd8858830ac89c497235f2389bf0f8ea8b63afee Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 5 Apr 2021 11:05:37 -0700
Subject: [PATCH 0646/1285] Created generic redis class for activitstreams

---
 bookwyrm/activitystreams.py | 114 +++++++++++++-----------------------
 bookwyrm/redis_store.py     |  91 ++++++++++++++++++++++++++++
 bookwyrm/views/feed.py      |   1 -
 3 files changed, 133 insertions(+), 73 deletions(-)
 create mode 100644 bookwyrm/redis_store.py

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 279079c8..8d1e8301 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -1,18 +1,13 @@
 """ access the activity streams stored in redis """
-from abc import ABC
 from django.dispatch import receiver
 from django.db.models import signals, Q
-import redis
 
-from bookwyrm import models, settings
+from bookwyrm import models
+from bookwyrm.redis_store import RedisStore, r
 from bookwyrm.views.helpers import privacy_filter
 
-r = redis.Redis(
-    host=settings.REDIS_ACTIVITY_HOST, port=settings.REDIS_ACTIVITY_PORT, db=0
-)
 
-
-class ActivityStream(ABC):
+class ActivityStream(RedisStore):
     """ a category of activity stream (like home, local, federated) """
 
     def stream_id(self, user):
@@ -23,58 +18,38 @@ class ActivityStream(ABC):
         """ the redis key for this user's unread count for this stream """
         return "{}-unread".format(self.stream_id(user))
 
-    def get_value(self, status):  # pylint: disable=no-self-use
-        """ the status id and the rank (ie, published date) """
-        return {status.id: status.published_date.timestamp()}
+    def get_rank(self, obj):  # pylint: disable=no-self-use
+        """ the sort rank of a status, which is published date """
+        return obj.published_date.timestamp()
 
     def add_status(self, status):
         """ add a status to users' feeds """
-        value = self.get_value(status)
-        # we want to do this as a bulk operation, hence "pipeline"
-        pipeline = r.pipeline()
-        for user in self.stream_users(status):
-            # add the status to the feed
-            pipeline.zadd(self.stream_id(user), value)
-            pipeline.zremrangebyrank(
-                self.stream_id(user), 0, -1 * settings.MAX_STREAM_LENGTH
-            )
+        # the pipeline contains all the addp-to-stream activities
+        pipeline = self.add_object_to_related_stores(status, execute=False)
+
+        for user in self.get_audience(status):
             # add to the unread status count
             pipeline.incr(self.unread_id(user))
-        # and go!
-        pipeline.execute()
 
-    def remove_status(self, status):
-        """ remove a status from all feeds """
-        pipeline = r.pipeline()
-        for user in self.stream_users(status):
-            pipeline.zrem(self.stream_id(user), -1, status.id)
+        # and go!
         pipeline.execute()
 
     def add_user_statuses(self, viewer, user):
         """ add a user's statuses to another user's feed """
-        pipeline = r.pipeline()
-        statuses = user.status_set.all()[: settings.MAX_STREAM_LENGTH]
-        for status in statuses:
-            pipeline.zadd(self.stream_id(viewer), self.get_value(status))
-        if statuses:
-            pipeline.zremrangebyrank(
-                self.stream_id(user), 0, -1 * settings.MAX_STREAM_LENGTH
-            )
-        pipeline.execute()
+        statuses = privacy_filter(viewer, user.status_set.all())
+        self.bulk_add_objects_to_store(statuses, self.stream_id(viewer))
 
     def remove_user_statuses(self, viewer, user):
         """ remove a user's status from another user's feed """
-        pipeline = r.pipeline()
-        for status in user.status_set.all()[: settings.MAX_STREAM_LENGTH]:
-            pipeline.lrem(self.stream_id(viewer), -1, status.id)
-        pipeline.execute()
+        statuses = user.status_set.all()
+        self.bulk_remove_objects_from_store(statuses, self.stream_id(viewer))
 
     def get_activity_stream(self, user):
-        """ load the ids for statuses to be displayed """
+        """ load the statuses to be displayed """
         # clear unreads for this feed
         r.set(self.unread_id(user), 0)
 
-        statuses = r.zrevrange(self.stream_id(user), 0, -1)
+        statuses = super().get_store(self.stream_id(user))
         return (
             models.Status.objects.select_subclasses()
             .filter(id__in=statuses)
@@ -85,23 +60,11 @@ class ActivityStream(ABC):
         """ get the unread status count for this user's feed """
         return int(r.get(self.unread_id(user)) or 0)
 
-    def populate_stream(self, user):
+    def populate_streamse(self, user):
         """ go from zero to a timeline """
-        pipeline = r.pipeline()
-        statuses = self.stream_statuses(user)
+        super().populate_store(self.stream_id(user))
 
-        stream_id = self.stream_id(user)
-        for status in statuses.all()[: settings.MAX_STREAM_LENGTH]:
-            pipeline.zadd(stream_id, self.get_value(status))
-
-        # only trim the stream if statuses were added
-        if statuses.exists():
-            pipeline.zremrangebyrank(
-                self.stream_id(user), 0, -1 * settings.MAX_STREAM_LENGTH
-            )
-        pipeline.execute()
-
-    def stream_users(self, status):  # pylint: disable=no-self-use
+    def get_audience(self, status):  # pylint: disable=no-self-use
         """ given a status, what users should see it """
         # direct messages don't appeard in feeds, direct comments/reviews/etc do
         if status.privacy == "direct" and status.status_type == "Note":
@@ -129,7 +92,10 @@ class ActivityStream(ABC):
             )
         return audience.distinct()
 
-    def stream_statuses(self, user):  # pylint: disable=no-self-use
+    def get_stores_for_object(self, obj):
+        return [self.stream_id(u) for u in self.get_audience(obj)]
+
+    def get_statuses_for_user(self, user):  # pylint: disable=no-self-use
         """ given a user, what statuses should they see on this stream """
         return privacy_filter(
             user,
@@ -137,14 +103,18 @@ class ActivityStream(ABC):
             privacy_levels=["public", "unlisted", "followers"],
         )
 
+    def get_objects_for_store(self, store):
+        user = models.User.objects.get(id=store.split('-')[0])
+        return self.get_statuses_for_user(user)
+
 
 class HomeStream(ActivityStream):
     """ users you follow """
 
     key = "home"
 
-    def stream_users(self, status):
-        audience = super().stream_users(status)
+    def get_audience(self, status):
+        audience = super().get_audience(status)
         if not audience:
             return []
         return audience.filter(
@@ -152,7 +122,7 @@ class HomeStream(ActivityStream):
             | Q(following=status.user)  # if the user is following the author
         ).distinct()
 
-    def stream_statuses(self, user):
+    def get_statuses_for_user(self, user):
         return privacy_filter(
             user,
             models.Status.objects.select_subclasses(),
@@ -166,13 +136,13 @@ class LocalStream(ActivityStream):
 
     key = "local"
 
-    def stream_users(self, status):
+    def get_audience(self, status):
         # this stream wants no part in non-public statuses
         if status.privacy != "public" or not status.user.local:
             return []
-        return super().stream_users(status)
+        return super().get_audience(status)
 
-    def stream_statuses(self, user):
+    def get_statuses_for_user(self, user):
         # all public statuses by a local user
         return privacy_filter(
             user,
@@ -186,13 +156,13 @@ class FederatedStream(ActivityStream):
 
     key = "federated"
 
-    def stream_users(self, status):
+    def get_audience(self, status):
         # this stream wants no part in non-public statuses
         if status.privacy != "public":
             return []
-        return super().stream_users(status)
+        return super().get_audience(status)
 
-    def stream_statuses(self, user):
+    def get_statuses_for_user(self, user):
         return privacy_filter(
             user,
             models.Status.objects.select_subclasses(),
@@ -217,7 +187,7 @@ def add_status_on_create(sender, instance, created, *args, **kwargs):
 
     if instance.deleted:
         for stream in streams.values():
-            stream.remove_status(instance)
+            stream.remove_object_from_related_stores(instance)
         return
 
     if not created:
@@ -234,7 +204,7 @@ def remove_boost_on_delete(sender, instance, *args, **kwargs):
     """ boosts are deleted """
     # we're only interested in new statuses
     for stream in streams.values():
-        stream.remove_status(instance)
+        stream.remove_object_from_related_stores(instance)
 
 
 @receiver(signals.post_save, sender=models.UserFollows)
@@ -248,7 +218,7 @@ def add_statuses_on_follow(sender, instance, created, *args, **kwargs):
 
 @receiver(signals.post_delete, sender=models.UserFollows)
 # pylint: disable=unused-argument
-def remove_statuses_on_unfollow(sender, instance, *args, **kwargs):
+def remove_objectes_on_unfollow(sender, instance, *args, **kwargs):
     """ remove statuses from a feed on unfollow """
     if not instance.user_subject.local:
         return
@@ -257,7 +227,7 @@ def remove_statuses_on_unfollow(sender, instance, *args, **kwargs):
 
 @receiver(signals.post_save, sender=models.UserBlocks)
 # pylint: disable=unused-argument
-def remove_statuses_on_block(sender, instance, *args, **kwargs):
+def remove_objectes_on_block(sender, instance, *args, **kwargs):
     """ remove statuses from all feeds on block """
     # blocks apply ot all feeds
     if instance.user_subject.local:
@@ -294,4 +264,4 @@ def populate_streams_on_account_create(sender, instance, created, *args, **kwarg
         return
 
     for stream in streams.values():
-        stream.populate_stream(instance)
+        stream.populate_streams(instance)
diff --git a/bookwyrm/redis_store.py b/bookwyrm/redis_store.py
new file mode 100644
index 00000000..8255fcbd
--- /dev/null
+++ b/bookwyrm/redis_store.py
@@ -0,0 +1,91 @@
+""" access the activity stores stored in redis """
+from abc import ABC, abstractmethod
+import redis
+
+from bookwyrm import settings
+
+r = redis.Redis(
+    host=settings.REDIS_ACTIVITY_HOST, port=settings.REDIS_ACTIVITY_PORT, db=0
+)
+
+
+class RedisStore(ABC):
+    """ sets of ranked, related objects, like statuses for a user's feed """
+    max_length = settings.MAX_STREAM_LENGTH
+
+    def get_value(self, obj):
+        """ the object and rank """
+        return {obj.id: self.get_rank(obj)}
+
+    def add_object_to_related_stores(self, obj, execute=True):
+        """ add an object to all suitable stores """
+        value = self.get_value(obj)
+        # we want to do this as a bulk operation, hence "pipeline"
+        pipeline = r.pipeline()
+        for store in self.get_stores_for_object(obj):
+            # add the status to the feed
+            pipeline.zadd(store, value)
+            # trim the store
+            pipeline.zremrangebyrank(
+                store, 0, -1 * self.max_length
+            )
+        if not execute:
+            return pipeline
+        # and go!
+        return pipeline.execute()
+
+    def remove_object_from_related_stores(self, obj):
+        """ remove an object from all stores """
+        pipeline = r.pipeline()
+        for store in self.get_stores_for_object(obj):
+            pipeline.zrem(store, -1, obj.id)
+        pipeline.execute()
+
+    def bulk_add_objects_to_store(self, objs, store):
+        """ add a list of objects to a given store """
+        pipeline = r.pipeline()
+        for obj in objs[:self.max_length]:
+            pipeline.zadd(store, self.get_value(obj))
+        if objs:
+            pipeline.zremrangebyrank(
+                store, 0, -1 * self.max_length
+            )
+        pipeline.execute()
+
+    def bulk_remove_objects_from_store(self, objs, store):
+        """ remoev a list of objects from a given store """
+        pipeline = r.pipeline()
+        for obj in objs[:self.max_length]:
+            pipeline.zrem(store, -1, obj.id)
+        pipeline.execute()
+
+    def get_store(self, store):  # pylint: disable=no-self-use
+        """ load the values in a store """
+        return r.zrevrange(store, 0, -1)
+
+    def populate_store(self, store):
+        """ go from zero to a store """
+        pipeline = r.pipeline()
+        queryset = self.get_objects_for_store(store)
+
+        for obj in queryset[:self.max_length]:
+            pipeline.zadd(store, self.get_value(obj))
+
+        # only trim the store if objects were added
+        if queryset.exists():
+            pipeline.zremrangebyrank(
+                store, 0, -1 * self.max_length
+            )
+        pipeline.execute()
+
+    @abstractmethod
+    def get_objects_for_store(self, store):
+        """ a queryset of what should go in a store, used for populating it """
+
+    @abstractmethod
+    def get_stores_for_object(self, obj):
+        """ the stores that an object belongs in """
+
+    @abstractmethod
+    def get_rank(self, obj):
+        """ how to rank an object """
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index e4be50e3..cda11586 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -31,7 +31,6 @@ class Feed(View):
             tab = "home"
 
         activities = activitystreams.streams[tab].get_activity_stream(request.user)
-
         paginated = Paginator(activities, PAGE_LENGTH)
 
         suggested_users = get_suggested_users(request.user)

From 0bbaf0a562b9e2f3521a1e096ade9f509659fb8f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 5 Apr 2021 11:10:26 -0700
Subject: [PATCH 0647/1285] Python formatting

---
 bookwyrm/activitystreams.py |  2 +-
 bookwyrm/redis_store.py     | 19 +++++++------------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 8d1e8301..3a815322 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -104,7 +104,7 @@ class ActivityStream(RedisStore):
         )
 
     def get_objects_for_store(self, store):
-        user = models.User.objects.get(id=store.split('-')[0])
+        user = models.User.objects.get(id=store.split("-")[0])
         return self.get_statuses_for_user(user)
 
 
diff --git a/bookwyrm/redis_store.py b/bookwyrm/redis_store.py
index 8255fcbd..4236d6df 100644
--- a/bookwyrm/redis_store.py
+++ b/bookwyrm/redis_store.py
@@ -11,6 +11,7 @@ r = redis.Redis(
 
 class RedisStore(ABC):
     """ sets of ranked, related objects, like statuses for a user's feed """
+
     max_length = settings.MAX_STREAM_LENGTH
 
     def get_value(self, obj):
@@ -26,9 +27,7 @@ class RedisStore(ABC):
             # add the status to the feed
             pipeline.zadd(store, value)
             # trim the store
-            pipeline.zremrangebyrank(
-                store, 0, -1 * self.max_length
-            )
+            pipeline.zremrangebyrank(store, 0, -1 * self.max_length)
         if not execute:
             return pipeline
         # and go!
@@ -44,18 +43,16 @@ class RedisStore(ABC):
     def bulk_add_objects_to_store(self, objs, store):
         """ add a list of objects to a given store """
         pipeline = r.pipeline()
-        for obj in objs[:self.max_length]:
+        for obj in objs[: self.max_length]:
             pipeline.zadd(store, self.get_value(obj))
         if objs:
-            pipeline.zremrangebyrank(
-                store, 0, -1 * self.max_length
-            )
+            pipeline.zremrangebyrank(store, 0, -1 * self.max_length)
         pipeline.execute()
 
     def bulk_remove_objects_from_store(self, objs, store):
         """ remoev a list of objects from a given store """
         pipeline = r.pipeline()
-        for obj in objs[:self.max_length]:
+        for obj in objs[: self.max_length]:
             pipeline.zrem(store, -1, obj.id)
         pipeline.execute()
 
@@ -68,14 +65,12 @@ class RedisStore(ABC):
         pipeline = r.pipeline()
         queryset = self.get_objects_for_store(store)
 
-        for obj in queryset[:self.max_length]:
+        for obj in queryset[: self.max_length]:
             pipeline.zadd(store, self.get_value(obj))
 
         # only trim the store if objects were added
         if queryset.exists():
-            pipeline.zremrangebyrank(
-                store, 0, -1 * self.max_length
-            )
+            pipeline.zremrangebyrank(store, 0, -1 * self.max_length)
         pipeline.execute()
 
     @abstractmethod

From cd56abcb0833986885ec063585f7203eaaa00b21 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 5 Apr 2021 12:11:49 -0700
Subject: [PATCH 0648/1285] Maintain signal names

---
 bookwyrm/activitystreams.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 3a815322..fc50ef7b 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -218,7 +218,7 @@ def add_statuses_on_follow(sender, instance, created, *args, **kwargs):
 
 @receiver(signals.post_delete, sender=models.UserFollows)
 # pylint: disable=unused-argument
-def remove_objectes_on_unfollow(sender, instance, *args, **kwargs):
+def remove_statuses_on_unfollow(sender, instance, *args, **kwargs):
     """ remove statuses from a feed on unfollow """
     if not instance.user_subject.local:
         return
@@ -227,7 +227,7 @@ def remove_objectes_on_unfollow(sender, instance, *args, **kwargs):
 
 @receiver(signals.post_save, sender=models.UserBlocks)
 # pylint: disable=unused-argument
-def remove_objectes_on_block(sender, instance, *args, **kwargs):
+def remove_statuses_on_block(sender, instance, *args, **kwargs):
     """ remove statuses from all feeds on block """
     # blocks apply ot all feeds
     if instance.user_subject.local:

From 04b9704187d4a46885cc5a09baf31165282ea1da Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 5 Apr 2021 13:13:56 -0700
Subject: [PATCH 0649/1285] typo fix

---
 bookwyrm/activitystreams.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index fc50ef7b..2db6cc20 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -60,7 +60,7 @@ class ActivityStream(RedisStore):
         """ get the unread status count for this user's feed """
         return int(r.get(self.unread_id(user)) or 0)
 
-    def populate_streamse(self, user):
+    def populate_streams(self, user):
         """ go from zero to a timeline """
         super().populate_store(self.stream_id(user))
 

From 56330d448b12d7a029b51019e5766050a7b476bb Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 5 Apr 2021 14:08:24 -0700
Subject: [PATCH 0650/1285] Changes remove status redis mock

---
 bookwyrm/tests/models/test_status_model.py |  4 +++-
 bookwyrm/tests/test_templatetags.py        |  4 +++-
 bookwyrm/tests/views/test_inbox.py         |  6 +++---
 bookwyrm/tests/views/test_interaction.py   |  2 +-
 bookwyrm/tests/views/test_status.py        | 16 +++++++++++-----
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py
index 208bf3ab..4263c457 100644
--- a/bookwyrm/tests/models/test_status_model.py
+++ b/bookwyrm/tests/models/test_status_model.py
@@ -116,7 +116,9 @@ class Status(TestCase):
 
     def test_status_to_activity_tombstone(self, *_):
         """ subclass of the base model version with a "pure" serializer """
-        with patch("bookwyrm.activitystreams.ActivityStream.remove_status"):
+        with patch(
+            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
+        ):
             status = models.Status.objects.create(
                 content="test content",
                 user=self.local_user,
diff --git a/bookwyrm/tests/test_templatetags.py b/bookwyrm/tests/test_templatetags.py
index 61136c2e..b4dc517f 100644
--- a/bookwyrm/tests/test_templatetags.py
+++ b/bookwyrm/tests/test_templatetags.py
@@ -85,7 +85,9 @@ class TemplateTags(TestCase):
             second_child = models.Status.objects.create(
                 reply_parent=parent, user=self.user, content="hi"
             )
-            with patch("bookwyrm.activitystreams.ActivityStream.remove_status"):
+            with patch(
+                "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
+            ):
                 third_child = models.Status.objects.create(
                     reply_parent=parent,
                     user=self.user,
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index 37cf00dd..935909e1 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -444,7 +444,7 @@ class Inbox(TestCase):
             "object": {"id": self.status.remote_id, "type": "Tombstone"},
         }
         with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_status"
+            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
         ) as redis_mock:
             views.inbox.activity_task(activity)
             self.assertTrue(redis_mock.called)
@@ -477,7 +477,7 @@ class Inbox(TestCase):
             "object": {"id": self.status.remote_id, "type": "Tombstone"},
         }
         with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_status"
+            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
         ) as redis_mock:
             views.inbox.activity_task(activity)
             self.assertTrue(redis_mock.called)
@@ -616,7 +616,7 @@ class Inbox(TestCase):
             },
         }
         with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_status"
+            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
         ) as redis_mock:
             views.inbox.activity_task(activity)
             self.assertTrue(redis_mock.called)
diff --git a/bookwyrm/tests/views/test_interaction.py b/bookwyrm/tests/views/test_interaction.py
index 297eeb73..8d2c63ff 100644
--- a/bookwyrm/tests/views/test_interaction.py
+++ b/bookwyrm/tests/views/test_interaction.py
@@ -164,7 +164,7 @@ class InteractionViews(TestCase):
         self.assertEqual(models.Boost.objects.count(), 1)
         self.assertEqual(models.Notification.objects.count(), 1)
         with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_status"
+            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
         ) as redis_mock:
             view(request, status.id)
             self.assertTrue(redis_mock.called)
diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py
index e7fc62d5..5eb13b6b 100644
--- a/bookwyrm/tests/views/test_status.py
+++ b/bookwyrm/tests/views/test_status.py
@@ -177,7 +177,9 @@ class StatusViews(TestCase):
                 content="hi", book=self.book, user=self.local_user
             )
 
-        with patch("bookwyrm.activitystreams.ActivityStream.remove_status") as mock:
+        with patch(
+            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
+        ) as mock:
             result = view(request, status.id)
             self.assertTrue(mock.called)
         result.render()
@@ -196,7 +198,9 @@ class StatusViews(TestCase):
                 book=self.book, rating=2.0, user=self.local_user
             )
 
-        with patch("bookwyrm.activitystreams.ActivityStream.remove_status") as mock:
+        with patch(
+            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
+        ) as mock:
             result = view(request, status.id)
             self.assertFalse(mock.called)
         self.assertEqual(result.status_code, 400)
@@ -214,7 +218,9 @@ class StatusViews(TestCase):
                 content="hi", user=self.local_user
             )
 
-        with patch("bookwyrm.activitystreams.ActivityStream.remove_status") as mock:
+        with patch(
+            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
+        ) as mock:
             result = view(request, status.id)
             self.assertFalse(mock.called)
         self.assertEqual(result.status_code, 400)
@@ -316,7 +322,7 @@ class StatusViews(TestCase):
         request.user = self.local_user
 
         with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_status"
+            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
         ) as redis_mock:
             view(request, status.id)
             self.assertTrue(redis_mock.called)
@@ -351,7 +357,7 @@ class StatusViews(TestCase):
         request.user.is_superuser = True
 
         with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_status"
+            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
         ) as redis_mock:
             view(request, status.id)
             self.assertTrue(redis_mock.called)

From 6a3c01a67f3fc7fd932469bc1bf82377952043be Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 5 Apr 2021 14:17:45 -0700
Subject: [PATCH 0651/1285] stream_users function has been renamed

---
 bookwyrm/tests/test_activitystreams.py | 58 +++++++++++++-------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/bookwyrm/tests/test_activitystreams.py b/bookwyrm/tests/test_activitystreams.py
index 88ca4693..b4efeba3 100644
--- a/bookwyrm/tests/test_activitystreams.py
+++ b/bookwyrm/tests/test_activitystreams.py
@@ -47,18 +47,18 @@ class Activitystreams(TestCase):
             "{}-test-unread".format(self.local_user.id),
         )
 
-    def test_abstractstream_stream_users(self, *_):
+    def test_abstractstream_get_audience(self, *_):
         """ get a list of users that should see a status """
         status = models.Status.objects.create(
             user=self.remote_user, content="hi", privacy="public"
         )
-        users = self.test_stream.stream_users(status)
+        users = self.test_stream.get_audience(status)
         # remote users don't have feeds
         self.assertFalse(self.remote_user in users)
         self.assertTrue(self.local_user in users)
         self.assertTrue(self.another_user in users)
 
-    def test_abstractstream_stream_users_direct(self, *_):
+    def test_abstractstream_get_audience_direct(self, *_):
         """ get a list of users that should see a status """
         status = models.Status.objects.create(
             user=self.remote_user,
@@ -66,7 +66,7 @@ class Activitystreams(TestCase):
             privacy="direct",
         )
         status.mention_users.add(self.local_user)
-        users = self.test_stream.stream_users(status)
+        users = self.test_stream.get_audience(status)
         self.assertEqual(users, [])
 
         status = models.Comment.objects.create(
@@ -76,22 +76,22 @@ class Activitystreams(TestCase):
             book=self.book,
         )
         status.mention_users.add(self.local_user)
-        users = self.test_stream.stream_users(status)
+        users = self.test_stream.get_audience(status)
         self.assertTrue(self.local_user in users)
         self.assertFalse(self.another_user in users)
         self.assertFalse(self.remote_user in users)
 
-    def test_abstractstream_stream_users_followers_remote_user(self, *_):
+    def test_abstractstream_get_audience_followers_remote_user(self, *_):
         """ get a list of users that should see a status """
         status = models.Status.objects.create(
             user=self.remote_user,
             content="hi",
             privacy="followers",
         )
-        users = self.test_stream.stream_users(status)
+        users = self.test_stream.get_audience(status)
         self.assertFalse(users.exists())
 
-    def test_abstractstream_stream_users_followers_self(self, *_):
+    def test_abstractstream_get_audience_followers_self(self, *_):
         """ get a list of users that should see a status """
         status = models.Comment.objects.create(
             user=self.local_user,
@@ -99,12 +99,12 @@ class Activitystreams(TestCase):
             privacy="direct",
             book=self.book,
         )
-        users = self.test_stream.stream_users(status)
+        users = self.test_stream.get_audience(status)
         self.assertTrue(self.local_user in users)
         self.assertFalse(self.another_user in users)
         self.assertFalse(self.remote_user in users)
 
-    def test_abstractstream_stream_users_followers_with_mention(self, *_):
+    def test_abstractstream_get_audience_followers_with_mention(self, *_):
         """ get a list of users that should see a status """
         status = models.Comment.objects.create(
             user=self.remote_user,
@@ -114,12 +114,12 @@ class Activitystreams(TestCase):
         )
         status.mention_users.add(self.local_user)
 
-        users = self.test_stream.stream_users(status)
+        users = self.test_stream.get_audience(status)
         self.assertTrue(self.local_user in users)
         self.assertFalse(self.another_user in users)
         self.assertFalse(self.remote_user in users)
 
-    def test_abstractstream_stream_users_followers_with_relationship(self, *_):
+    def test_abstractstream_get_audience_followers_with_relationship(self, *_):
         """ get a list of users that should see a status """
         self.remote_user.followers.add(self.local_user)
         status = models.Comment.objects.create(
@@ -128,77 +128,77 @@ class Activitystreams(TestCase):
             privacy="direct",
             book=self.book,
         )
-        users = self.test_stream.stream_users(status)
+        users = self.test_stream.get_audience(status)
         self.assertFalse(self.local_user in users)
         self.assertFalse(self.another_user in users)
         self.assertFalse(self.remote_user in users)
 
-    def test_homestream_stream_users(self, *_):
+    def test_homestream_get_audience(self, *_):
         """ get a list of users that should see a status """
         status = models.Status.objects.create(
             user=self.remote_user, content="hi", privacy="public"
         )
-        users = activitystreams.HomeStream().stream_users(status)
+        users = activitystreams.HomeStream().get_audience(status)
         self.assertFalse(users.exists())
 
-    def test_homestream_stream_users_with_mentions(self, *_):
+    def test_homestream_get_audience_with_mentions(self, *_):
         """ get a list of users that should see a status """
         status = models.Status.objects.create(
             user=self.remote_user, content="hi", privacy="public"
         )
         status.mention_users.add(self.local_user)
-        users = activitystreams.HomeStream().stream_users(status)
+        users = activitystreams.HomeStream().get_audience(status)
         self.assertFalse(self.local_user in users)
         self.assertFalse(self.another_user in users)
 
-    def test_homestream_stream_users_with_relationship(self, *_):
+    def test_homestream_get_audience_with_relationship(self, *_):
         """ get a list of users that should see a status """
         self.remote_user.followers.add(self.local_user)
         status = models.Status.objects.create(
             user=self.remote_user, content="hi", privacy="public"
         )
-        users = activitystreams.HomeStream().stream_users(status)
+        users = activitystreams.HomeStream().get_audience(status)
         self.assertTrue(self.local_user in users)
         self.assertFalse(self.another_user in users)
 
-    def test_localstream_stream_users_remote_status(self, *_):
+    def test_localstream_get_audience_remote_status(self, *_):
         """ get a list of users that should see a status """
         status = models.Status.objects.create(
             user=self.remote_user, content="hi", privacy="public"
         )
-        users = activitystreams.LocalStream().stream_users(status)
+        users = activitystreams.LocalStream().get_audience(status)
         self.assertEqual(users, [])
 
-    def test_localstream_stream_users_local_status(self, *_):
+    def test_localstream_get_audience_local_status(self, *_):
         """ get a list of users that should see a status """
         status = models.Status.objects.create(
             user=self.local_user, content="hi", privacy="public"
         )
-        users = activitystreams.LocalStream().stream_users(status)
+        users = activitystreams.LocalStream().get_audience(status)
         self.assertTrue(self.local_user in users)
         self.assertTrue(self.another_user in users)
 
-    def test_localstream_stream_users_unlisted(self, *_):
+    def test_localstream_get_audience_unlisted(self, *_):
         """ get a list of users that should see a status """
         status = models.Status.objects.create(
             user=self.local_user, content="hi", privacy="unlisted"
         )
-        users = activitystreams.LocalStream().stream_users(status)
+        users = activitystreams.LocalStream().get_audience(status)
         self.assertEqual(users, [])
 
-    def test_federatedstream_stream_users(self, *_):
+    def test_federatedstream_get_audience(self, *_):
         """ get a list of users that should see a status """
         status = models.Status.objects.create(
             user=self.remote_user, content="hi", privacy="public"
         )
-        users = activitystreams.FederatedStream().stream_users(status)
+        users = activitystreams.FederatedStream().get_audience(status)
         self.assertTrue(self.local_user in users)
         self.assertTrue(self.another_user in users)
 
-    def test_federatedstream_stream_users_unlisted(self, *_):
+    def test_federatedstream_get_audience_unlisted(self, *_):
         """ get a list of users that should see a status """
         status = models.Status.objects.create(
             user=self.remote_user, content="hi", privacy="unlisted"
         )
-        users = activitystreams.FederatedStream().stream_users(status)
+        users = activitystreams.FederatedStream().get_audience(status)
         self.assertEqual(users, [])

From 1901f7e6cb2f1111ba1a8754adcde0c8636c5c36 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 5 Apr 2021 15:16:21 -0700
Subject: [PATCH 0652/1285] Check if incoming domains are blocked

---
 bookwyrm/models/federated_server.py | 19 ++++++++++---
 bookwyrm/views/inbox.py             | 44 +++++++++++++++++++++++++++--
 2 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/models/federated_server.py b/bookwyrm/models/federated_server.py
index 8f7d903e..d7dc5d96 100644
--- a/bookwyrm/models/federated_server.py
+++ b/bookwyrm/models/federated_server.py
@@ -2,16 +2,27 @@
 from django.db import models
 from .base_model import BookWyrmModel
 
+FederationStatus = models.TextChoices(
+    "Status",
+    [
+        "federated",
+        "blocked",
+    ],
+)
+
 
 class FederatedServer(BookWyrmModel):
     """ store which servers we federate with """
 
     server_name = models.CharField(max_length=255, unique=True)
-    # federated, blocked, whatever else
-    status = models.CharField(max_length=255, default="federated")
+    status = models.CharField(
+        max_length=255, default="federated", choices=FederationStatus.choices
+    )
     # is it mastodon, bookwyrm, etc
     application_type = models.CharField(max_length=255, null=True)
     application_version = models.CharField(max_length=255, null=True)
 
-
-# TODO: blocked servers
+    def block(self):
+        """ block a server """
+        self.status = "blocked"
+        self.save()
diff --git a/bookwyrm/views/inbox.py b/bookwyrm/views/inbox.py
index 34bd2e1c..a4ae1e99 100644
--- a/bookwyrm/views/inbox.py
+++ b/bookwyrm/views/inbox.py
@@ -1,9 +1,10 @@
 """ incoming activities """
 import json
-from urllib.parse import urldefrag
+import re
+from urllib.parse import urldefrag, urlparse
 
-from django.http import HttpResponse
-from django.http import HttpResponseBadRequest, HttpResponseNotFound
+from django.http import HttpResponse, HttpResponseNotFound
+from django.http import HttpResponseBadRequest, HttpResponseForbidden
 from django.utils.decorators import method_decorator
 from django.views import View
 from django.views.decorators.csrf import csrf_exempt
@@ -12,6 +13,7 @@ import requests
 from bookwyrm import activitypub, models
 from bookwyrm.tasks import app
 from bookwyrm.signatures import Signature
+from bookwyrm.utils import regex
 
 
 @method_decorator(csrf_exempt, name="dispatch")
@@ -21,6 +23,10 @@ class Inbox(View):
 
     def post(self, request, username=None):
         """ only works as POST request """
+        # first check if this server is on our shitlist
+        if is_blocked_user_agent(request):
+            return HttpResponseForbidden()
+
         # make sure the user's inbox even exists
         if username:
             try:
@@ -34,6 +40,10 @@ class Inbox(View):
         except json.decoder.JSONDecodeError:
             return HttpResponseBadRequest()
 
+        # let's be extra sure we didn't block this domain
+        if is_blocked_activity(activity_json):
+            return HttpResponseForbidden()
+
         if (
             not "object" in activity_json
             or not "type" in activity_json
@@ -54,6 +64,34 @@ class Inbox(View):
         return HttpResponse()
 
 
+def is_blocked_user_agent(request):
+    """ check if a request is from a blocked server based on user agent """
+    # check user agent
+    user_agent = request.headers.get("User-Agent")
+    domain = re.match(regex.domain, user_agent)
+    if not domain:
+        # idk, we'll try again later with the actor
+        return False
+    return is_blocked(domain)
+
+
+def is_blocked_activity(activity_json):
+    """ get the sender out of activity json and check if it's blocked """
+    actor = activity_json.get("actor")
+    if not actor:
+        # well I guess it's not even a valid activity so who knows
+        return False
+    url = urlparse(actor)
+    return is_blocked(url.netloc)
+
+
+def is_blocked(domain):
+    """ is this domain blocked? """
+    return models.FederatedServer.object.filter(
+        server_name=domain, status="blocked"
+    ).exists()
+
+
 @app.task
 def activity_task(activity_json):
     """ do something with this json we think is legit """

From e4fe47b53865fde8c404a78674fb8f2499b602d4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 5 Apr 2021 15:26:53 -0700
Subject: [PATCH 0653/1285] Default blocks in initdb

---
 bookwyrm/management/commands/initdb.py            | 13 ++++++++++++-
 bookwyrm/templates/settings/federated_server.html |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/management/commands/initdb.py b/bookwyrm/management/commands/initdb.py
index d6101c87..a86a1652 100644
--- a/bookwyrm/management/commands/initdb.py
+++ b/bookwyrm/management/commands/initdb.py
@@ -2,7 +2,7 @@ from django.core.management.base import BaseCommand, CommandError
 from django.contrib.auth.models import Group, Permission
 from django.contrib.contenttypes.models import ContentType
 
-from bookwyrm.models import Connector, SiteSettings, User
+from bookwyrm.models import Connector, FederatedServer, SiteSettings, User
 from bookwyrm.settings import DOMAIN
 
 
@@ -107,6 +107,16 @@ def init_connectors():
     )
 
 
+def init_federated_servers():
+    """ big no to nazis """
+    built_in_blocks = ["gab.ai", "gab.com"]
+    for server in built_in_blocks:
+        FederatedServer.objects.create(
+            server_name=server,
+            status="blocked",
+        )
+
+
 def init_settings():
     SiteSettings.objects.create()
 
@@ -118,4 +128,5 @@ class Command(BaseCommand):
         init_groups()
         init_permissions()
         init_connectors()
+        init_federated_servers()
         init_settings()
diff --git a/bookwyrm/templates/settings/federated_server.html b/bookwyrm/templates/settings/federated_server.html
index 13715bfb..edab3139 100644
--- a/bookwyrm/templates/settings/federated_server.html
+++ b/bookwyrm/templates/settings/federated_server.html
@@ -21,7 +21,7 @@
         </div>
         <div class="is-flex">
             <dt>{% trans "Status:" %}</dt>
-            <dd>Federated</dd>
+            <dd>{{ server.status }}</dd>
         </div>
     </dl>
 </section>

From ad543f46c1728a4ec573462eeab4646b88f7a34d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 5 Apr 2021 15:38:32 -0700
Subject: [PATCH 0654/1285] Adds block and unblock functionality

---
 .../templates/settings/federated_server.html     | 16 ++++++++++++++++
 bookwyrm/views/federation.py                     |  9 ++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/settings/federated_server.html b/bookwyrm/templates/settings/federated_server.html
index edab3139..147d6514 100644
--- a/bookwyrm/templates/settings/federated_server.html
+++ b/bookwyrm/templates/settings/federated_server.html
@@ -4,6 +4,10 @@
 
 {% block header %}
 {{ server.server_name }}
+
+{% if server.status == "blocked" %}<span class="icon icon-x has-text-danger is-size-5" title="{% trans 'Blocked' %}"><span class="is-sr-only">{% trans "Blocked" %}</span></span>
+{% endif %}
+
 <a href="{% url 'settings-federation' %}" class="has-text-weight-normal help">{% trans "Back to server list" %}</a>
 {% endblock %}
 
@@ -64,5 +68,17 @@
     </dl>
 </section>
 
+<section class="block content">
+    <h2 class="title is-4">{% trans "Actions" %}</h2>
+    <form class="block" method="post" action="{% url 'settings-federated-server' server.id %}">
+        {% csrf_token %}
+        {% if server.status != 'blocked' %}
+        <button class="button is-danger">{% trans "Block" %}</button>
+        {% else %}
+        <button class="button">{% trans "Un-block" %}</button>
+        {% endif %}
+    </form>
+</section>
+
 {% endblock %}
 
diff --git a/bookwyrm/views/federation.py b/bookwyrm/views/federation.py
index 464a207c..0405ebf5 100644
--- a/bookwyrm/views/federation.py
+++ b/bookwyrm/views/federation.py
@@ -1,7 +1,7 @@
 """ manage federated servers """
 from django.contrib.auth.decorators import login_required, permission_required
 from django.core.paginator import Paginator
-from django.shortcuts import get_object_or_404
+from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
@@ -61,3 +61,10 @@ class FederatedServer(View):
             ),
         }
         return TemplateResponse(request, "settings/federated_server.html", data)
+
+    def post(self, request, server):  # pylint: disable=unused-argument
+        """ (un)block a server """
+        server = get_object_or_404(models.FederatedServer, id=server)
+        server.status = "blocked" if server.status == "federated" else "federated"
+        server.save()
+        return redirect("settings-federated-server", server.id)

From 194fcb8055b229843b2449f8dd8cc649e7ec45d7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 5 Apr 2021 15:54:20 -0700
Subject: [PATCH 0655/1285] Adds migration for federated server table statuses

---
 .../migrations/0062_auto_20210405_2249.py     | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 bookwyrm/migrations/0062_auto_20210405_2249.py

diff --git a/bookwyrm/migrations/0062_auto_20210405_2249.py b/bookwyrm/migrations/0062_auto_20210405_2249.py
new file mode 100644
index 00000000..8229bf7c
--- /dev/null
+++ b/bookwyrm/migrations/0062_auto_20210405_2249.py
@@ -0,0 +1,22 @@
+# Generated by Django 3.1.6 on 2021-04-05 22:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0061_auto_20210402_1435"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="federatedserver",
+            name="status",
+            field=models.CharField(
+                choices=[("federated", "Federated"), ("blocked", "Blocked")],
+                default="federated",
+                max_length=255,
+            ),
+        ),
+    ]

From 34b790a0864cf153100a8f6388cc5d9598bde4f2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 5 Apr 2021 15:54:33 -0700
Subject: [PATCH 0656/1285] Adds tests for blocked server checks

---
 bookwyrm/tests/views/test_inbox.py | 25 +++++++++++++++++++++++++
 bookwyrm/views/inbox.py            |  2 ++
 2 files changed, 27 insertions(+)

diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index 37cf00dd..889fdc32 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -6,6 +6,7 @@ from unittest.mock import patch
 
 from django.http import HttpResponseNotAllowed, HttpResponseNotFound
 from django.test import TestCase, Client
+from django.test.client import RequestFactory
 import responses
 
 from bookwyrm import models, views
@@ -18,6 +19,7 @@ class Inbox(TestCase):
     def setUp(self):
         """ basic user and book data """
         self.client = Client()
+        self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@example.com",
             "mouse@mouse.com",
@@ -936,3 +938,26 @@ class Inbox(TestCase):
             views.inbox.activity_task(activity)
             self.assertTrue(redis_mock.called)
         self.assertFalse(models.UserBlocks.objects.exists())
+
+    def test_is_blocked_user_agent(self):
+        """ check for blocked servers """
+        request = self.factory.post(
+            "",
+            HTTP_USER_AGENT="http.rb/4.4.1 (Mastodon/3.3.0; +https://mastodon.social/)",
+        )
+        self.assertFalse(views.inbox.is_blocked_user_agent(request))
+
+        models.FederatedServer.objects.create(
+            server_name="mastodon.social", status="blocked"
+        )
+        self.assertTrue(views.inbox.is_blocked_user_agent(request))
+
+    def test_is_blocked_activity(self):
+        """ check for blocked servers """
+        activity = {"actor": "https://mastodon.social/user/whaatever/else"}
+        self.assertFalse(views.inbox.is_blocked_user_agent(activity))
+
+        models.FederatedServer.objects.create(
+            server_name="mastodon.social", status="blocked"
+        )
+        self.assertTrue(views.inbox.is_blocked_user_agent(activity))
diff --git a/bookwyrm/views/inbox.py b/bookwyrm/views/inbox.py
index a4ae1e99..9e5aa019 100644
--- a/bookwyrm/views/inbox.py
+++ b/bookwyrm/views/inbox.py
@@ -68,6 +68,8 @@ def is_blocked_user_agent(request):
     """ check if a request is from a blocked server based on user agent """
     # check user agent
     user_agent = request.headers.get("User-Agent")
+    if not user_agent:
+        return False
     domain = re.match(regex.domain, user_agent)
     if not domain:
         # idk, we'll try again later with the actor

From a4b892dfadfe915c0dc2185682fe652e1a7661f2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 5 Apr 2021 16:47:48 -0700
Subject: [PATCH 0657/1285] Fixes domain block tests

---
 bookwyrm/tests/views/test_federation.py | 16 ++++++++++++++++
 bookwyrm/tests/views/test_inbox.py      |  4 ++--
 bookwyrm/views/inbox.py                 |  5 +++--
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/tests/views/test_federation.py b/bookwyrm/tests/views/test_federation.py
index a60ea432..874e277c 100644
--- a/bookwyrm/tests/views/test_federation.py
+++ b/bookwyrm/tests/views/test_federation.py
@@ -44,3 +44,19 @@ class FederationViews(TestCase):
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
+
+    def test_server_page_post(self):
+        """ block and unblock a server """
+        server = models.FederatedServer.objects.create(server_name="hi.there.com")
+        self.assertEqual(server.status, "federated")
+
+        view = views.FederatedServer.as_view()
+        request = self.factory.post("")
+        request.user = self.local_user
+        request.user.is_superuser = True
+
+        view(request, server.id)
+        self.assertEqual(server.status, "blocked")
+
+        view(request, server.id)
+        self.assertEqual(server.status, "federated")
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index 889fdc32..f15b99f1 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -955,9 +955,9 @@ class Inbox(TestCase):
     def test_is_blocked_activity(self):
         """ check for blocked servers """
         activity = {"actor": "https://mastodon.social/user/whaatever/else"}
-        self.assertFalse(views.inbox.is_blocked_user_agent(activity))
+        self.assertFalse(views.inbox.is_blocked_activity(activity))
 
         models.FederatedServer.objects.create(
             server_name="mastodon.social", status="blocked"
         )
-        self.assertTrue(views.inbox.is_blocked_user_agent(activity))
+        self.assertTrue(views.inbox.is_blocked_activity(activity))
diff --git a/bookwyrm/views/inbox.py b/bookwyrm/views/inbox.py
index 9e5aa019..387efe9f 100644
--- a/bookwyrm/views/inbox.py
+++ b/bookwyrm/views/inbox.py
@@ -70,7 +70,8 @@ def is_blocked_user_agent(request):
     user_agent = request.headers.get("User-Agent")
     if not user_agent:
         return False
-    domain = re.match(regex.domain, user_agent)
+    url = re.search(r"+https?://{:s}/?".format(regex.domain), user_agent)
+    domain = urlparse(url).netloc
     if not domain:
         # idk, we'll try again later with the actor
         return False
@@ -89,7 +90,7 @@ def is_blocked_activity(activity_json):
 
 def is_blocked(domain):
     """ is this domain blocked? """
-    return models.FederatedServer.object.filter(
+    return models.FederatedServer.objects.filter(
         server_name=domain, status="blocked"
     ).exists()
 

From fb72db7507459829956b3ade89144912246980ec Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 5 Apr 2021 16:50:36 -0700
Subject: [PATCH 0658/1285] Fixes federation view tests

---
 bookwyrm/tests/views/test_federation.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bookwyrm/tests/views/test_federation.py b/bookwyrm/tests/views/test_federation.py
index 874e277c..3783417c 100644
--- a/bookwyrm/tests/views/test_federation.py
+++ b/bookwyrm/tests/views/test_federation.py
@@ -56,7 +56,9 @@ class FederationViews(TestCase):
         request.user.is_superuser = True
 
         view(request, server.id)
+        server.refresh_from_db()
         self.assertEqual(server.status, "blocked")
 
         view(request, server.id)
+        server.refresh_from_db()
         self.assertEqual(server.status, "federated")

From 2e245f84be846e967a1488aeb7f8b4ffe66408e0 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 5 Apr 2021 18:02:24 -0700
Subject: [PATCH 0659/1285] Adds test for loading remote boosted statuses

---
 bookwyrm/tests/views/test_inbox.py | 50 ++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index 37cf00dd..6973f981 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -572,6 +572,56 @@ class Inbox(TestCase):
         self.assertEqual(notification.user, self.local_user)
         self.assertEqual(notification.related_status, self.status)
 
+    @responses.activate
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_handle_boost_remote_status(self, redis_mock):
+        """ boost a status """
+        work = models.Work.objects.create(title="work title")
+        book = models.Edition.objects.create(
+            title="Test",
+            remote_id="https://bookwyrm.social/book/37292",
+            parent_work=work,
+        )
+        self.assertEqual(models.Notification.objects.count(), 0)
+        activity = {
+            "type": "Announce",
+            "id": "%s/boost" % self.status.remote_id,
+            "actor": self.remote_user.remote_id,
+            "object": "https://remote.com/status/1",
+            "to": ["https://www.w3.org/ns/activitystreams#public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "published": "Mon, 25 May 2020 19:31:20 GMT",
+        }
+        responses.add(
+            responses.GET,
+            "https://remote.com/status/1",
+            json={
+                "id": "https://remote.com/status/1",
+                "type": "Comment",
+                "published": "2021-04-05T18:04:59.735190+00:00",
+                "attributedTo": self.remote_user.remote_id,
+                "content": "<p>a comment</p>",
+                "to": ["https://www.w3.org/ns/activitystreams#Public"],
+                "cc": ["https://b875df3d118b.ngrok.io/user/mouse/followers"],
+                "inReplyTo": "",
+                "inReplyToBook": book.remote_id,
+                "summary": "",
+                "tag": [],
+                "sensitive": False,
+                "@context": "https://www.w3.org/ns/activitystreams"
+            }
+        )
+
+        with patch("bookwyrm.models.status.Status.ignore_activity") as discarder:
+            discarder.return_value = False
+            views.inbox.activity_task(activity)
+            self.assertTrue(redis_mock.called)
+
+        boost = models.Boost.objects.get()
+        self.assertEqual(boost.boosted_status.remote_id, "https://remote.com/status/1")
+        self.assertEqual(boost.boosted_status.comment.status_type, "Comment")
+        self.assertEqual(boost.boosted_status.comment.book, book)
+
     @responses.activate
     def test_handle_discarded_boost(self):
         """ test a boost of a mastodon status that will be discarded """

From a39cd670eff52d27a4145cb134a63d9726d7405d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 5 Apr 2021 18:05:06 -0700
Subject: [PATCH 0660/1285] Fixes boosted remote statuses coming in as Notes

---
 bookwyrm/activitypub/base_activity.py | 3 ++-
 bookwyrm/tests/views/test_inbox.py    | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index 768eb208..452f61e0 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -265,7 +265,8 @@ def resolve_remote_id(
             "Could not connect to host for remote_id in: %s" % (remote_id)
         )
     # determine the model implicitly, if not provided
-    if not model:
+    # or if it's a model with subclasses like Status, check again
+    if not model or hasattr(model.objects, "select_subclasses"):
         model = get_model_from_type(data.get("type"))
 
     # check for existing items with shared unique identifiers
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
index 6973f981..f44a79c6 100644
--- a/bookwyrm/tests/views/test_inbox.py
+++ b/bookwyrm/tests/views/test_inbox.py
@@ -608,8 +608,8 @@ class Inbox(TestCase):
                 "summary": "",
                 "tag": [],
                 "sensitive": False,
-                "@context": "https://www.w3.org/ns/activitystreams"
-            }
+                "@context": "https://www.w3.org/ns/activitystreams",
+            },
         )
 
         with patch("bookwyrm.models.status.Status.ignore_activity") as discarder:

From 6b0a3ce4b1833d82b6529563567be6be7a6d18cd Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Tue, 6 Apr 2021 09:06:12 +0200
Subject: [PATCH 0661/1285] [assets] Move localStorage chunks of code to their
 own file:

This should prevent a sync issue with updateDisplay not always being loaded on time.
---
 bookwyrm/static/js/bookwyrm.js     | 10 +---------
 bookwyrm/static/js/localstorage.js |  8 ++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index 5ca3d7d7..a4149c6f 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -1,4 +1,4 @@
-/* globals setDisplay TabGroup updateDisplay */
+/* globals TabGroup */
 
 // set up javascript listeners
 window.onload = function() {
@@ -28,14 +28,6 @@ window.onload = function() {
 
     Array.from(document.getElementsByClassName('tab-group'))
         .forEach(t => new TabGroup(t));
-
-    // display based on localstorage vars
-    document.querySelectorAll('[data-hide]')
-        .forEach(t => setDisplay(t));
-
-    // update localstorage
-    Array.from(document.getElementsByClassName('set-display'))
-        .forEach(t => t.onclick = updateDisplay);
 };
 
 function back(e) {
diff --git a/bookwyrm/static/js/localstorage.js b/bookwyrm/static/js/localstorage.js
index aa79ee30..5104b44a 100644
--- a/bookwyrm/static/js/localstorage.js
+++ b/bookwyrm/static/js/localstorage.js
@@ -18,3 +18,11 @@ function setDisplay(el) {
     var value = window.localStorage.getItem(key);
     addRemoveClass(el, 'hidden', value);
 }
+
+// display based on localstorage vars
+document.querySelectorAll('[data-hide]')
+    .forEach(t => setDisplay(t));
+
+// update localstorage
+Array.from(document.getElementsByClassName('set-display'))
+    .forEach(t => t.onclick = updateDisplay);

From f6c3e581b95c2f1b3acbf62b9595fc9b9def1618 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Tue, 6 Apr 2021 09:11:27 +0200
Subject: [PATCH 0662/1285] =?UTF-8?q?[assets]=20Replace=20`Array.from(docu?=
 =?UTF-8?q?ment.getElementsByClassName(=E2=80=A6))`=20by=20`querySelectorA?=
 =?UTF-8?q?ll(=E2=80=A6)`.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bookwyrm/static/js/bookwyrm.js     | 10 ++++++----
 bookwyrm/static/js/localstorage.js |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index a4149c6f..7d542747 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -7,11 +7,11 @@ window.onload = function() {
         .forEach(t => t.onclick = toggleAction);
 
     // javascript interactions (boost/fav)
-    Array.from(document.getElementsByClassName('interaction'))
+    document.querySelectorAll('.interaction')
         .forEach(t => t.onsubmit = interact);
 
     // handle aria settings on menus
-    Array.from(document.getElementsByClassName('pulldown-menu'))
+    document.querySelectorAll('.pulldown-menu')
         .forEach(t => t.onclick = toggleMenu);
 
     // hidden submit button in a form
@@ -26,7 +26,7 @@ window.onload = function() {
     document.querySelectorAll('[data-back]')
         .forEach(t => t.onclick = back);
 
-    Array.from(document.getElementsByClassName('tab-group'))
+    document.querySelectorAll('.tab-group')
         .forEach(t => new TabGroup(t));
 };
 
@@ -103,7 +103,9 @@ function interact(e) {
     e.preventDefault();
     ajaxPost(e.target);
     var identifier = e.target.getAttribute('data-id');
-    Array.from(document.getElementsByClassName(identifier))
+    // @todo This should be `querySelector`, unless there are duplicated IDs,
+    //       which is a problem in itself.
+    document.querySelectorAll(`#${identifier}`)
         .forEach(t => addRemoveClass(t, 'hidden', t.className.indexOf('hidden') == -1));
 }
 
diff --git a/bookwyrm/static/js/localstorage.js b/bookwyrm/static/js/localstorage.js
index 5104b44a..514d8748 100644
--- a/bookwyrm/static/js/localstorage.js
+++ b/bookwyrm/static/js/localstorage.js
@@ -24,5 +24,5 @@ document.querySelectorAll('[data-hide]')
     .forEach(t => setDisplay(t));
 
 // update localstorage
-Array.from(document.getElementsByClassName('set-display'))
+document.querySelectorAll('.set-display')
     .forEach(t => t.onclick = updateDisplay);

From f430363be0c55a8275d3e91e098c75b3f2cb94d9 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Tue, 6 Apr 2021 09:11:56 +0200
Subject: [PATCH 0663/1285] [assets] Simplify a function expression.

---
 bookwyrm/static/js/check_all.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/static/js/check_all.js b/bookwyrm/static/js/check_all.js
index 72c83e3e..de067f78 100644
--- a/bookwyrm/static/js/check_all.js
+++ b/bookwyrm/static/js/check_all.js
@@ -13,7 +13,7 @@
 
         document
             .querySelectorAll(`#${mainCheckbox.dataset.target} [type="checkbox"]`)
-            .forEach(checkbox => {checkbox.checked = mainCheckbox.checked;});
+            .forEach(checkbox => checkbox.checked = mainCheckbox.checked);
     }
 
     document

From 2f2f7db0865972401ea6a092bb82c3032007d19f Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Tue, 6 Apr 2021 09:44:59 +0200
Subject: [PATCH 0664/1285] [assets] Use classes for JS files:

- Classes strictly parse code implicitly.
- Fix previously updated code.
---
 bookwyrm/static/js/bookwyrm.js     | 304 +++++++++++++++--------------
 bookwyrm/static/js/localstorage.js |  54 ++---
 2 files changed, 187 insertions(+), 171 deletions(-)

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index 7d542747..0ac33e0f 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -1,156 +1,168 @@
+/* exported BookWyrm */
 /* globals TabGroup */
 
-// set up javascript listeners
-window.onload = function() {
-    // buttons that display or hide content
-    document.querySelectorAll('[data-controls]')
-        .forEach(t => t.onclick = toggleAction);
-
-    // javascript interactions (boost/fav)
-    document.querySelectorAll('.interaction')
-        .forEach(t => t.onsubmit = interact);
-
-    // handle aria settings on menus
-    document.querySelectorAll('.pulldown-menu')
-        .forEach(t => t.onclick = toggleMenu);
-
-    // hidden submit button in a form
-    document.querySelectorAll('.hidden-form input')
-        .forEach(t => t.onchange = revealForm);
-
-    // polling
-    document.querySelectorAll('[data-poll]')
-        .forEach(el => polling(el));
-
-    // browser back behavior
-    document.querySelectorAll('[data-back]')
-        .forEach(t => t.onclick = back);
-
-    document.querySelectorAll('.tab-group')
-        .forEach(t => new TabGroup(t));
-};
-
-function back(e) {
-    e.preventDefault();
-    history.back();
-}
-
-function polling(el, delay) {
-    delay = delay || 10000;
-    delay += (Math.random() * 1000);
-    setTimeout(function() {
-        fetch('/api/updates/' + el.getAttribute('data-poll'))
-            .then(response => response.json())
-            .then(data => updateCountElement(el, data));
-        polling(el, delay * 1.25);
-    }, delay, el);
-}
-
-function updateCountElement(el, data) {
-    const currentCount = el.innerText;
-    const count = data.count;
-    if (count != currentCount) {
-        addRemoveClass(el.closest('[data-poll-wrapper]'), 'hidden', count < 1);
-        el.innerText = count;
-    }
-}
-
-
-function revealForm(e) {
-    var hidden = e.currentTarget.closest('.hidden-form').getElementsByClassName('hidden')[0];
-    if (hidden) {
-        removeClass(hidden, 'hidden');
-    }
-}
-
-
-function toggleAction(e) {
-    var el = e.currentTarget;
-    var pressed = el.getAttribute('aria-pressed') == 'false';
-
-    var targetId = el.getAttribute('data-controls');
-    document.querySelectorAll('[data-controls="' + targetId + '"]')
-        .forEach(t => t.setAttribute('aria-pressed', (t.getAttribute('aria-pressed') == 'false')));
-
-    if (targetId) {
-        var target = document.getElementById(targetId);
-        addRemoveClass(target, 'hidden', !pressed);
-        addRemoveClass(target, 'is-active', pressed);
+let BookWyrm = new class {
+    constructor() {
+        this.initOnLoad();
+        this.initEventListeners();
     }
 
-    // show/hide container
-    var container = document.getElementById('hide-' + targetId);
-    if (container) {
-        addRemoveClass(container, 'hidden', pressed);
+    initEventListeners() {
+        // buttons that display or hide content
+        document.querySelectorAll('[data-controls]')
+            .forEach(t => t.onclick = this.toggleAction.bind(this));
+
+        // javascript interactions (boost/fav)
+        document.querySelectorAll('.interaction')
+            .forEach(t => t.onsubmit = this.interact.bind(this));
+
+        // handle aria settings on menus
+        document.querySelectorAll('.pulldown-menu')
+            .forEach(t => t.onclick = this.toggleMenu.bind(this));
+
+        // hidden submit button in a form
+        document.querySelectorAll('.hidden-form input')
+            .forEach(t => t.onchange = this.revealForm.bind(this));
+
+        // polling
+        document.querySelectorAll('[data-poll]')
+            .forEach(el => this.polling(el));
+
+        // browser back behavior
+        document.querySelectorAll('[data-back]')
+            .forEach(t => t.onclick = this.back);
     }
 
-    // set checkbox, if appropriate
-    var checkbox = el.getAttribute('data-controls-checkbox');
-    if (checkbox) {
-        document.getElementById(checkbox).checked = !!pressed;
+    initOnLoad(){
+        // set up javascript listeners
+        window.onload = function() {
+            document.querySelectorAll('.tab-group')
+                .forEach(t => new TabGroup(t));
+        };
     }
 
-    // set focus, if appropriate
-    var focus = el.getAttribute('data-focus-target');
-    if (focus) {
-        var focusEl = document.getElementById(focus);
-        focusEl.focus();
-        setTimeout(function(){ focusEl.selectionStart = focusEl.selectionEnd = 10000; }, 0);
+    back(e) {
+        e.preventDefault();
+        history.back();
+    }
+
+    polling(el, delay) {
+        let poller = this;
+        delay = delay || 10000;
+        delay += (Math.random() * 1000);
+        setTimeout(function() {
+            fetch('/api/updates/' + el.getAttribute('data-poll'))
+                .then(response => response.json())
+                .then(data => poller.updateCountElement(el, data));
+            poller.polling(el, delay * 1.25);
+        }, delay, el);
+    }
+
+    updateCountElement(el, data) {
+        const currentCount = el.innerText;
+        const count = data.count;
+        if (count != currentCount) {
+            this.addRemoveClass(el.closest('[data-poll-wrapper]'), 'hidden', count < 1);
+            el.innerText = count;
+        }
+    }
+
+    revealForm(e) {
+        var hidden = e.currentTarget.closest('.hidden-form').getElementsByClassName('hidden')[0];
+        if (hidden) {
+            this.removeClass(hidden, 'hidden');
+        }
+    }
+
+    toggleAction(e) {
+        var el = e.currentTarget;
+        var pressed = el.getAttribute('aria-pressed') == 'false';
+
+        var targetId = el.getAttribute('data-controls');
+        document.querySelectorAll('[data-controls="' + targetId + '"]')
+            .forEach(t => t.setAttribute('aria-pressed', (t.getAttribute('aria-pressed') == 'false')));
+
+        if (targetId) {
+            var target = document.getElementById(targetId);
+            this.addRemoveClass(target, 'hidden', !pressed);
+            this.addRemoveClass(target, 'is-active', pressed);
+        }
+
+        // show/hide container
+        var container = document.getElementById('hide-' + targetId);
+        if (container) {
+            this.addRemoveClass(container, 'hidden', pressed);
+        }
+
+        // set checkbox, if appropriate
+        var checkbox = el.getAttribute('data-controls-checkbox');
+        if (checkbox) {
+            document.getElementById(checkbox).checked = !!pressed;
+        }
+
+        // set focus, if appropriate
+        var focus = el.getAttribute('data-focus-target');
+        if (focus) {
+            var focusEl = document.getElementById(focus);
+            focusEl.focus();
+            setTimeout(function(){ focusEl.selectionStart = focusEl.selectionEnd = 10000; }, 0);
+        }
+    }
+
+    // @todo Only update status if the promise is successful.
+    interact(e) {
+        e.preventDefault();
+        this.ajaxPost(e.target);
+        var identifier = e.target.getAttribute('data-id');
+
+        // @todo This probably should be done with IDs.
+        document.querySelectorAll(`.${identifier}`)
+            .forEach(t => this.addRemoveClass(t, 'hidden', t.className.indexOf('hidden') == -1));
+    }
+
+    toggleMenu(e) {
+        var el = e.currentTarget;
+        var expanded = el.getAttribute('aria-expanded') == 'false';
+        el.setAttribute('aria-expanded', expanded);
+        var targetId = el.getAttribute('data-controls');
+        if (targetId) {
+            var target = document.getElementById(targetId);
+            this.addRemoveClass(target, 'is-active', expanded);
+        }
+    }
+
+    ajaxPost(form) {
+        fetch(form.action, {
+            method : "POST",
+            body: new FormData(form)
+        });
+    }
+
+    addRemoveClass(el, classname, bool) {
+        if (bool) {
+            this.addClass(el, classname);
+        } else {
+            this.removeClass(el, classname);
+        }
+    }
+
+    addClass(el, classname) {
+        var classes = el.className.split(' ');
+        if (classes.indexOf(classname) > -1) {
+            return;
+        }
+        el.className = classes.concat(classname).join(' ');
+    }
+
+    removeClass(el, className) {
+        var classes = [];
+        if (el.className) {
+            classes = el.className.split(' ');
+        }
+        const idx = classes.indexOf(className);
+        if (idx > -1) {
+            classes.splice(idx, 1);
+        }
+        el.className = classes.join(' ');
     }
 }
-
-function interact(e) {
-    e.preventDefault();
-    ajaxPost(e.target);
-    var identifier = e.target.getAttribute('data-id');
-    // @todo This should be `querySelector`, unless there are duplicated IDs,
-    //       which is a problem in itself.
-    document.querySelectorAll(`#${identifier}`)
-        .forEach(t => addRemoveClass(t, 'hidden', t.className.indexOf('hidden') == -1));
-}
-
-function toggleMenu(e) {
-    var el = e.currentTarget;
-    var expanded = el.getAttribute('aria-expanded') == 'false';
-    el.setAttribute('aria-expanded', expanded);
-    var targetId = el.getAttribute('data-controls');
-    if (targetId) {
-        var target = document.getElementById(targetId);
-        addRemoveClass(target, 'is-active', expanded);
-    }
-}
-
-function ajaxPost(form) {
-    fetch(form.action, {
-        method : "POST",
-        body: new FormData(form)
-    });
-}
-
-function addRemoveClass(el, classname, bool) {
-    if (bool) {
-        addClass(el, classname);
-    } else {
-        removeClass(el, classname);
-    }
-}
-
-function addClass(el, classname) {
-    var classes = el.className.split(' ');
-    if (classes.indexOf(classname) > -1) {
-        return;
-    }
-    el.className = classes.concat(classname).join(' ');
-}
-
-function removeClass(el, className) {
-    var classes = [];
-    if (el.className) {
-        classes = el.className.split(' ');
-    }
-    const idx = classes.indexOf(className);
-    if (idx > -1) {
-        classes.splice(idx, 1);
-    }
-    el.className = classes.join(' ');
-}
diff --git a/bookwyrm/static/js/localstorage.js b/bookwyrm/static/js/localstorage.js
index 514d8748..b8ef02cd 100644
--- a/bookwyrm/static/js/localstorage.js
+++ b/bookwyrm/static/js/localstorage.js
@@ -1,28 +1,32 @@
-/* exported updateDisplay */
-/* globals addRemoveClass */
+/* exported LocalStorageTools */
+/* globals BookWyrm */
 
-// set javascript listeners
-function updateDisplay(e) {
-    // used in set reading goal
-    var key = e.target.getAttribute('data-id');
-    var value = e.target.getAttribute('data-value');
-    window.localStorage.setItem(key, value);
+let LocalStorageTools = new class {
+    constructor() {
+        // display based on localstorage vars
+        document.querySelectorAll('[data-hide]')
+            .forEach(t => this.setDisplay(t));
 
-    document.querySelectorAll('[data-hide="' + key + '"]')
-        .forEach(t => setDisplay(t));
+        // update localstorage
+        document.querySelectorAll('.set-display')
+            .forEach(t => t.onclick = this.updateDisplay.bind(this));
+    }
+
+    // set javascript listeners
+    updateDisplay(e) {
+        // used in set reading goal
+        var key = e.target.getAttribute('data-id');
+        var value = e.target.getAttribute('data-value');
+        window.localStorage.setItem(key, value);
+
+        document.querySelectorAll('[data-hide="' + key + '"]')
+            .forEach(t => this.setDisplay(t));
+    }
+
+    setDisplay(el) {
+        // used in set reading goal
+        var key = el.getAttribute('data-hide');
+        var value = window.localStorage.getItem(key);
+        BookWyrm.addRemoveClass(el, 'hidden', value);
+    }
 }
-
-function setDisplay(el) {
-    // used in set reading goal
-    var key = el.getAttribute('data-hide');
-    var value = window.localStorage.getItem(key);
-    addRemoveClass(el, 'hidden', value);
-}
-
-// display based on localstorage vars
-document.querySelectorAll('[data-hide]')
-    .forEach(t => setDisplay(t));
-
-// update localstorage
-document.querySelectorAll('.set-display')
-    .forEach(t => t.onclick = updateDisplay);

From 991d897ac75ddbd0122d61d175ba0f34380cf53a Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Tue, 6 Apr 2021 09:57:52 +0200
Subject: [PATCH 0665/1285] [assets] Listen to events as soon as possible.

---
 bookwyrm/static/js/bookwyrm.js | 38 ++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index 0ac33e0f..ceab5176 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -3,42 +3,50 @@
 
 let BookWyrm = new class {
     constructor() {
-        this.initOnLoad();
+        this.initOnDOMLoaded();
+        this.initReccuringTasks();
         this.initEventListeners();
     }
 
     initEventListeners() {
         // buttons that display or hide content
         document.querySelectorAll('[data-controls]')
-            .forEach(t => t.onclick = this.toggleAction.bind(this));
+            .forEach(button => button.onclick = this.toggleAction.bind(this));
 
         // javascript interactions (boost/fav)
         document.querySelectorAll('.interaction')
-            .forEach(t => t.onsubmit = this.interact.bind(this));
+            .forEach(button => button.onsubmit = this.interact.bind(this));
 
         // handle aria settings on menus
         document.querySelectorAll('.pulldown-menu')
-            .forEach(t => t.onclick = this.toggleMenu.bind(this));
+            .forEach(button => button.onclick = this.toggleMenu.bind(this));
 
         // hidden submit button in a form
         document.querySelectorAll('.hidden-form input')
-            .forEach(t => t.onchange = this.revealForm.bind(this));
-
-        // polling
-        document.querySelectorAll('[data-poll]')
-            .forEach(el => this.polling(el));
+            .forEach(button => button.onchange = this.revealForm.bind(this));
 
         // browser back behavior
         document.querySelectorAll('[data-back]')
-            .forEach(t => t.onclick = this.back);
+            .forEach(button => button.onclick = this.back);
     }
 
-    initOnLoad(){
-        // set up javascript listeners
-        window.onload = function() {
+    /**
+     * Execute code once the DOM is loaded.
+     */
+    initOnDOMLoaded() {
+        window.addEventListener('DOMContentLoaded', function() {
             document.querySelectorAll('.tab-group')
-                .forEach(t => new TabGroup(t));
-        };
+                .forEach(tabs => new TabGroup(tabs));
+        });
+    }
+
+    /**
+     * Execute recurring tasks.
+     */
+    initReccuringTasks() {
+        // Polling
+        document.querySelectorAll('[data-poll]')
+            .forEach(liveArea => this.polling(liveArea));
     }
 
     back(e) {

From 70c652d5657dffbb971c3c13cfe301eeab7303a8 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Tue, 6 Apr 2021 10:42:52 +0200
Subject: [PATCH 0666/1285] [assets] Add rules to ESLint:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Fix long line.
- Enforce a few stylistic habits:

    - Avoid some potential dangerous constructs.
    - `arrow-spacing`: Use at least one space around arrows.
    - `keyword-spacing`: Use at least one space around keywords (if, else, for…).
    - `no-multiple-empty-lines`: Only use one empty line between code.
	- `no-var`: Use `let` or `const` instead of `var`:
    - `padded-blocks`: Do not pad blocks.
    - `padding-line-between-statements`: Use empty lines between some statements.
    - `space-before-blocks`: Use at least one space before the opening brace of a block.
---
 .eslintrc.js                       | 60 +++++++++++++++++++++++++++++-
 bookwyrm/static/js/bookwyrm.js     | 58 ++++++++++++++++++++---------
 bookwyrm/static/js/localstorage.js | 10 +++--
 3 files changed, 105 insertions(+), 23 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index b5f3c311..5a247a43 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -9,6 +9,64 @@ module.exports = {
     "extends": "eslint:recommended",
 
     "rules": {
-        "strict": "error"
+        // Possible Errors
+        "no-async-promise-executor": "error",
+        "no-await-in-loop": "error",
+        "no-class-assign": "error",
+        "no-confusing-arrow": "error",
+        "no-const-assign": "error",
+        "no-dupe-class-members": "error",
+        "no-duplicate-imports": "error",
+        "no-template-curly-in-string": "error",
+        "no-useless-computed-key": "error",
+        "no-useless-constructor": "error",
+        "no-useless-rename": "error",
+        "require-atomic-updates": "error",
+
+        // Best practices
+        "strict": "error",
+        "no-var": "error",
+
+        // Stylistic Issues
+        "arrow-spacing": "error",
+        "keyword-spacing": "error",
+        "no-multiple-empty-lines": [
+            "error",
+            {
+                "max": 1,
+            },
+        ],
+        "padded-blocks": [
+            "error",
+            "never",
+        ],
+        "padding-line-between-statements": [
+            "error",
+            {
+                // always before return
+                "blankLine": "always",
+                "prev": "*",
+                "next": "return",
+            },
+            {
+                // always before block-like expressions
+                "blankLine": "always",
+                "prev": "*",
+                "next": "block-like",
+            },
+            {
+                // always after variable declaration
+                "blankLine": "always",
+                "prev": [ "const", "let", "var" ],
+                "next": "*",
+            },
+            {
+                // not necessary between variable declaration
+                "blankLine": "any",
+                "prev": [ "const", "let", "var" ],
+                "next": [ "const", "let", "var" ],
+            },
+        ],
+        "space-before-blocks": "error",
     }
 };
diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index ceab5176..3df49ae5 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -56,8 +56,10 @@ let BookWyrm = new class {
 
     polling(el, delay) {
         let poller = this;
+
         delay = delay || 10000;
         delay += (Math.random() * 1000);
+
         setTimeout(function() {
             fetch('/api/updates/' + el.getAttribute('data-poll'))
                 .then(response => response.json())
@@ -69,6 +71,7 @@ let BookWyrm = new class {
     updateCountElement(el, data) {
         const currentCount = el.innerText;
         const count = data.count;
+
         if (count != currentCount) {
             this.addRemoveClass(el.closest('[data-poll-wrapper]'), 'hidden', count < 1);
             el.innerText = count;
@@ -76,52 +79,62 @@ let BookWyrm = new class {
     }
 
     revealForm(e) {
-        var hidden = e.currentTarget.closest('.hidden-form').getElementsByClassName('hidden')[0];
+        let hidden = e.currentTarget.closest('.hidden-form').getElementsByClassName('hidden')[0];
+
         if (hidden) {
             this.removeClass(hidden, 'hidden');
         }
     }
 
     toggleAction(e) {
-        var el = e.currentTarget;
-        var pressed = el.getAttribute('aria-pressed') == 'false';
+        let el = e.currentTarget;
+        let pressed = el.getAttribute('aria-pressed') == 'false';
+        let targetId = el.getAttribute('data-controls');
 
-        var targetId = el.getAttribute('data-controls');
         document.querySelectorAll('[data-controls="' + targetId + '"]')
-            .forEach(t => t.setAttribute('aria-pressed', (t.getAttribute('aria-pressed') == 'false')));
+            .forEach(t => {
+                t.setAttribute('aria-pressed', (t.getAttribute('aria-pressed') == 'false'))
+            });
 
         if (targetId) {
-            var target = document.getElementById(targetId);
+            let target = document.getElementById(targetId);
+
             this.addRemoveClass(target, 'hidden', !pressed);
             this.addRemoveClass(target, 'is-active', pressed);
         }
 
         // show/hide container
-        var container = document.getElementById('hide-' + targetId);
+        let container = document.getElementById('hide-' + targetId);
+
         if (container) {
             this.addRemoveClass(container, 'hidden', pressed);
         }
 
         // set checkbox, if appropriate
-        var checkbox = el.getAttribute('data-controls-checkbox');
+        let checkbox = el.getAttribute('data-controls-checkbox');
+
         if (checkbox) {
             document.getElementById(checkbox).checked = !!pressed;
         }
 
         // set focus, if appropriate
-        var focus = el.getAttribute('data-focus-target');
+        let focus = el.getAttribute('data-focus-target');
+
         if (focus) {
-            var focusEl = document.getElementById(focus);
+            let focusEl = document.getElementById(focus);
+
             focusEl.focus();
-            setTimeout(function(){ focusEl.selectionStart = focusEl.selectionEnd = 10000; }, 0);
+            setTimeout(function() { focusEl.selectionStart = focusEl.selectionEnd = 10000; }, 0);
         }
     }
 
     // @todo Only update status if the promise is successful.
     interact(e) {
         e.preventDefault();
+
+        let identifier = e.target.getAttribute('data-id');
+
         this.ajaxPost(e.target);
-        var identifier = e.target.getAttribute('data-id');
 
         // @todo This probably should be done with IDs.
         document.querySelectorAll(`.${identifier}`)
@@ -129,12 +142,15 @@ let BookWyrm = new class {
     }
 
     toggleMenu(e) {
-        var el = e.currentTarget;
-        var expanded = el.getAttribute('aria-expanded') == 'false';
+        let el = e.currentTarget;
+        let expanded = el.getAttribute('aria-expanded') == 'false';
+        let targetId = el.getAttribute('data-controls');
+
         el.setAttribute('aria-expanded', expanded);
-        var targetId = el.getAttribute('data-controls');
+
         if (targetId) {
-            var target = document.getElementById(targetId);
+            let target = document.getElementById(targetId);
+
             this.addRemoveClass(target, 'is-active', expanded);
         }
     }
@@ -155,22 +171,28 @@ let BookWyrm = new class {
     }
 
     addClass(el, classname) {
-        var classes = el.className.split(' ');
+        let classes = el.className.split(' ');
+
         if (classes.indexOf(classname) > -1) {
             return;
         }
+
         el.className = classes.concat(classname).join(' ');
     }
 
     removeClass(el, className) {
-        var classes = [];
+        let classes = [];
+
         if (el.className) {
             classes = el.className.split(' ');
         }
+
         const idx = classes.indexOf(className);
+
         if (idx > -1) {
             classes.splice(idx, 1);
         }
+
         el.className = classes.join(' ');
     }
 }
diff --git a/bookwyrm/static/js/localstorage.js b/bookwyrm/static/js/localstorage.js
index b8ef02cd..08b83162 100644
--- a/bookwyrm/static/js/localstorage.js
+++ b/bookwyrm/static/js/localstorage.js
@@ -15,8 +15,9 @@ let LocalStorageTools = new class {
     // set javascript listeners
     updateDisplay(e) {
         // used in set reading goal
-        var key = e.target.getAttribute('data-id');
-        var value = e.target.getAttribute('data-value');
+        let key = e.target.getAttribute('data-id');
+        let value = e.target.getAttribute('data-value');
+
         window.localStorage.setItem(key, value);
 
         document.querySelectorAll('[data-hide="' + key + '"]')
@@ -25,8 +26,9 @@ let LocalStorageTools = new class {
 
     setDisplay(el) {
         // used in set reading goal
-        var key = el.getAttribute('data-hide');
-        var value = window.localStorage.getItem(key);
+        let key = el.getAttribute('data-hide');
+        let value = window.localStorage.getItem(key);
+
         BookWyrm.addRemoveClass(el, 'hidden', value);
     }
 }

From 7e49b3cb26bf55d2114567cfd043c84410782fbe Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Tue, 6 Apr 2021 11:19:44 +0200
Subject: [PATCH 0667/1285] [assets] Simplify addRemoveClass function.

---
 bookwyrm/static/js/bookwyrm.js | 46 ++++++++++------------------------
 1 file changed, 13 insertions(+), 33 deletions(-)

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index 3df49ae5..0ba4b7c2 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -81,9 +81,7 @@ let BookWyrm = new class {
     revealForm(e) {
         let hidden = e.currentTarget.closest('.hidden-form').getElementsByClassName('hidden')[0];
 
-        if (hidden) {
-            this.removeClass(hidden, 'hidden');
-        }
+        this.addRemoveClass(hidden, 'hidden', !hidden);
     }
 
     toggleAction(e) {
@@ -162,37 +160,19 @@ let BookWyrm = new class {
         });
     }
 
-    addRemoveClass(el, classname, bool) {
-        if (bool) {
-            this.addClass(el, classname);
+    /**
+     * Add or remove a class based on a boolean condition.
+     *
+     * @param  {object}  node      - DOM node to change class on
+     * @param  {string}  classname - Name of the class
+     * @param  {boolean} add       - Add?
+     * @return {undefined}
+     */
+    addRemoveClass(node, classname, add) {
+        if (add) {
+            node.classList.add(classname);
         } else {
-            this.removeClass(el, classname);
+            node.classList.remove(classname);
         }
     }
-
-    addClass(el, classname) {
-        let classes = el.className.split(' ');
-
-        if (classes.indexOf(classname) > -1) {
-            return;
-        }
-
-        el.className = classes.concat(classname).join(' ');
-    }
-
-    removeClass(el, className) {
-        let classes = [];
-
-        if (el.className) {
-            classes = el.className.split(' ');
-        }
-
-        const idx = classes.indexOf(className);
-
-        if (idx > -1) {
-            classes.splice(idx, 1);
-        }
-
-        el.className = classes.join(' ');
-    }
 }

From 62fe2ef600e340747e5bbec65cabcc24bc20596d Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Tue, 6 Apr 2021 11:37:23 +0200
Subject: [PATCH 0668/1285] [assets] Replace inline events with
 `addEventListener`; this breaks sliding menu.

---
 bookwyrm/static/js/bookwyrm.js     | 10 +++++-----
 bookwyrm/static/js/localstorage.js |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index 0ba4b7c2..6be1d4fb 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -11,23 +11,23 @@ let BookWyrm = new class {
     initEventListeners() {
         // buttons that display or hide content
         document.querySelectorAll('[data-controls]')
-            .forEach(button => button.onclick = this.toggleAction.bind(this));
+            .forEach(button => button.addEventListener('click', this.toggleAction.bind(this)));
 
         // javascript interactions (boost/fav)
         document.querySelectorAll('.interaction')
-            .forEach(button => button.onsubmit = this.interact.bind(this));
+            .forEach(button => button.addEventListener('submit', this.interact.bind(this)));
 
         // handle aria settings on menus
         document.querySelectorAll('.pulldown-menu')
-            .forEach(button => button.onclick = this.toggleMenu.bind(this));
+            .forEach(button => button.addEventListener('click', this.toggleMenu.bind(this)));
 
         // hidden submit button in a form
         document.querySelectorAll('.hidden-form input')
-            .forEach(button => button.onchange = this.revealForm.bind(this));
+            .forEach(button => button.addEventListener('change', this.revealForm.bind(this)));
 
         // browser back behavior
         document.querySelectorAll('[data-back]')
-            .forEach(button => button.onclick = this.back);
+            .forEach(button => button.addEventListener('click', this.back));
     }
 
     /**
diff --git a/bookwyrm/static/js/localstorage.js b/bookwyrm/static/js/localstorage.js
index 08b83162..17adf2bf 100644
--- a/bookwyrm/static/js/localstorage.js
+++ b/bookwyrm/static/js/localstorage.js
@@ -9,7 +9,7 @@ let LocalStorageTools = new class {
 
         // update localstorage
         document.querySelectorAll('.set-display')
-            .forEach(t => t.onclick = this.updateDisplay.bind(this));
+            .forEach(t => t.addEventListener('click', this.updateDisplay.bind(this)));
     }
 
     // set javascript listeners

From d6ee136c109dc3ed013c6e736673553428cf097a Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Tue, 6 Apr 2021 11:54:45 +0200
Subject: [PATCH 0669/1285] [assets] Allow to run `./bw-dev collectstatic`
 every time a change occurs in bookwyrm/static.

---
 README.md    |  2 ++
 package.json |  6 +++++-
 yarn.lock    | 22 +++++++++++++++++++++-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e798fedf..91225a56 100644
--- a/README.md
+++ b/README.md
@@ -116,6 +116,8 @@ If you edit the CSS or JavaScript, you will need to run Django's `collectstatic`
 ./bw-dev collectstatic
 ```
 
+If you have [installed yarn](https://yarnpkg.com/getting-started/install), you can run `yarn watch:static` to automatically run the previous script every time a change occurs in _bookwyrm/static_ directory.
+
 ### Working with translations and locale files
 Text in the html files are wrapped in translation tags (`{% trans %}` and `{% blocktrans %}`), and Django generates locale files for all the strings in which you can add translations for the text. You can find existing translations in the `locale/` directory.
 
diff --git a/package.json b/package.json
index 8059255d..b7abe434 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,12 @@
 {
+  "scripts": {
+    "watch:static": "yarn watch \"./bw-dev collectstatic\" bookwyrm/static/**"
+  },
   "devDependencies": {
     "eslint": "^7.23.0",
     "stylelint": "^13.12.0",
     "stylelint-config-standard": "^21.0.0",
-    "stylelint-order": "^4.1.0"
+    "stylelint-order": "^4.1.0",
+    "watch": "^1.0.2"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index de4e0107..c1a1c181 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -768,6 +768,13 @@ esutils@^2.0.2:
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
+exec-sh@^0.2.0:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.2.tgz#2a5e7ffcbd7d0ba2755bdecb16e5a427dfbdec36"
+  integrity sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==
+  dependencies:
+    merge "^1.2.0"
+
 execall@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/execall/-/execall-2.0.0.tgz#16a06b5fe5099df7d00be5d9c06eecded1663b45"
@@ -1368,6 +1375,11 @@ merge2@^1.3.0:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
+merge@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
+  integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
+
 micromark@~2.11.0:
   version "2.11.4"
   resolved "https://registry.yarnpkg.com/micromark/-/micromark-2.11.4.tgz#d13436138eea826383e822449c9a5c50ee44665a"
@@ -1405,7 +1417,7 @@ minimist-options@4.1.0:
     is-plain-obj "^1.1.0"
     kind-of "^6.0.3"
 
-minimist@^1.2.5:
+minimist@^1.2.0, minimist@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
@@ -2183,6 +2195,14 @@ vfile@^4.0.0:
     unist-util-stringify-position "^2.0.0"
     vfile-message "^2.0.0"
 
+watch@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/watch/-/watch-1.0.2.tgz#340a717bde765726fa0aa07d721e0147a551df0c"
+  integrity sha1-NApxe952Vyb6CqB9ch4BR6VR3ww=
+  dependencies:
+    exec-sh "^0.2.0"
+    minimist "^1.2.0"
+
 which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"

From 5d3d00f6946dd6c88c8e0f086fcdd1125b98abfe Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Tue, 6 Apr 2021 15:36:34 +0200
Subject: [PATCH 0670/1285] [assets] Use `dataset` + use expressive names for
 some variables.

---
 bookwyrm/static/js/bookwyrm.js     | 34 ++++++++++++++++--------------
 bookwyrm/static/js/localstorage.js |  6 +++---
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index 6be1d4fb..a434d36a 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -54,18 +54,18 @@ let BookWyrm = new class {
         history.back();
     }
 
-    polling(el, delay) {
+    polling(counter, delay) {
         let poller = this;
 
         delay = delay || 10000;
         delay += (Math.random() * 1000);
 
         setTimeout(function() {
-            fetch('/api/updates/' + el.getAttribute('data-poll'))
+            fetch('/api/updates/' + counter.dataset.poll)
                 .then(response => response.json())
-                .then(data => poller.updateCountElement(el, data));
-            poller.polling(el, delay * 1.25);
-        }, delay, el);
+                .then(data => poller.updateCountElement(counter, data));
+            poller.polling(counter, delay * 1.25);
+        }, delay, counter);
     }
 
     updateCountElement(el, data) {
@@ -84,15 +84,17 @@ let BookWyrm = new class {
         this.addRemoveClass(hidden, 'hidden', !hidden);
     }
 
-    toggleAction(e) {
-        let el = e.currentTarget;
-        let pressed = el.getAttribute('aria-pressed') == 'false';
-        let targetId = el.getAttribute('data-controls');
+    toggleAction(event) {
+        let trigger = event.currentTarget;
+        let pressed = trigger.getAttribute('aria-pressed') == 'false';
+        let targetId = trigger.dataset.controls;
 
+        // Un‑press all triggers controlling the same target.
         document.querySelectorAll('[data-controls="' + targetId + '"]')
-            .forEach(t => {
-                t.setAttribute('aria-pressed', (t.getAttribute('aria-pressed') == 'false'))
-            });
+            .forEach(triggers => triggers.setAttribute(
+                'aria-pressed',
+                (triggers.getAttribute('aria-pressed') == 'false'))
+            );
 
         if (targetId) {
             let target = document.getElementById(targetId);
@@ -109,14 +111,14 @@ let BookWyrm = new class {
         }
 
         // set checkbox, if appropriate
-        let checkbox = el.getAttribute('data-controls-checkbox');
+        let checkbox = trigger.dataset['controls-checkbox'];
 
         if (checkbox) {
             document.getElementById(checkbox).checked = !!pressed;
         }
 
         // set focus, if appropriate
-        let focus = el.getAttribute('data-focus-target');
+        let focus = trigger.dataset['focus-target'];
 
         if (focus) {
             let focusEl = document.getElementById(focus);
@@ -130,7 +132,7 @@ let BookWyrm = new class {
     interact(e) {
         e.preventDefault();
 
-        let identifier = e.target.getAttribute('data-id');
+        let identifier = e.target.dataset.id;
 
         this.ajaxPost(e.target);
 
@@ -142,7 +144,7 @@ let BookWyrm = new class {
     toggleMenu(e) {
         let el = e.currentTarget;
         let expanded = el.getAttribute('aria-expanded') == 'false';
-        let targetId = el.getAttribute('data-controls');
+        let targetId = el.dataset.controls;
 
         el.setAttribute('aria-expanded', expanded);
 
diff --git a/bookwyrm/static/js/localstorage.js b/bookwyrm/static/js/localstorage.js
index 17adf2bf..5d978c2f 100644
--- a/bookwyrm/static/js/localstorage.js
+++ b/bookwyrm/static/js/localstorage.js
@@ -15,8 +15,8 @@ let LocalStorageTools = new class {
     // set javascript listeners
     updateDisplay(e) {
         // used in set reading goal
-        let key = e.target.getAttribute('data-id');
-        let value = e.target.getAttribute('data-value');
+        let key = e.target.dataset.id;
+        let value = e.target.dataset.value;
 
         window.localStorage.setItem(key, value);
 
@@ -26,7 +26,7 @@ let LocalStorageTools = new class {
 
     setDisplay(el) {
         // used in set reading goal
-        let key = el.getAttribute('data-hide');
+        let key = el.dataset.hide;
         let value = window.localStorage.getItem(key);
 
         BookWyrm.addRemoveClass(el, 'hidden', value);

From 52d2f0e3318c7fb4071e99e270e40982333b1a8d Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Tue, 6 Apr 2021 16:17:20 +0200
Subject: [PATCH 0671/1285] [assets] Document functions and variables:

- Use expressive names for variables.
- Add docblocks for each function.
- Add ESLint rules for comments.
---
 .eslintrc.js                       |  18 +++++
 bookwyrm/static/js/bookwyrm.js     | 120 ++++++++++++++++++++++-------
 bookwyrm/static/js/localstorage.js |  31 +++++---
 3 files changed, 132 insertions(+), 37 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 5a247a43..b65fe988 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -29,7 +29,25 @@ module.exports = {
 
         // Stylistic Issues
         "arrow-spacing": "error",
+        "capitalized-comments": [
+            "warn",
+            "always",
+            {
+                "ignoreConsecutiveComments": true
+            },
+        ],
         "keyword-spacing": "error",
+        "lines-around-comment": [
+            "error",
+            {
+                "beforeBlockComment": true,
+                "beforeLineComment": true,
+                "allowBlockStart": true,
+                "allowClassStart": true,
+                "allowObjectStart": true,
+                "allowArrayStart": true,
+            },
+        ],
         "no-multiple-empty-lines": [
             "error",
             {
diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index a434d36a..63947aaa 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -49,13 +49,28 @@ let BookWyrm = new class {
             .forEach(liveArea => this.polling(liveArea));
     }
 
-    back(e) {
-        e.preventDefault();
+    /**
+     * Go back in browser history.
+     *
+     * @param  {Event} event
+     *
+     * @return {undefined}
+     */
+    back(event) {
+        event.preventDefault();
         history.back();
     }
 
+    /**
+     * Update a counter with recurring requests to the API
+     *
+     * @param  {Object} counter - DOM node
+     * @param  {int}    delay   - frequency for polling in ms
+     *
+     * @return {undefined}
+     */
     polling(counter, delay) {
-        let poller = this;
+        const bookwyrm = this;
 
         delay = delay || 10000;
         delay += (Math.random() * 1000);
@@ -63,27 +78,51 @@ let BookWyrm = new class {
         setTimeout(function() {
             fetch('/api/updates/' + counter.dataset.poll)
                 .then(response => response.json())
-                .then(data => poller.updateCountElement(counter, data));
-            poller.polling(counter, delay * 1.25);
+                .then(data => bookwyrm.updateCountElement(counter, data));
+
+            bookwyrm.polling(counter, delay * 1.25);
         }, delay, counter);
     }
 
-    updateCountElement(el, data) {
-        const currentCount = el.innerText;
+    /**
+     * Update a counter.
+     *
+     * @param  {object} counter - DOM node
+     * @param  {object} data    - json formatted response from a fetch
+     *
+     * @return {undefined}
+     */
+    updateCountElement(counter, data) {
+        const currentCount = counter.innerText;
         const count = data.count;
 
         if (count != currentCount) {
-            this.addRemoveClass(el.closest('[data-poll-wrapper]'), 'hidden', count < 1);
-            el.innerText = count;
+            this.addRemoveClass(counter.closest('[data-poll-wrapper]'), 'hidden', count < 1);
+            counter.innerText = count;
         }
     }
 
-    revealForm(e) {
-        let hidden = e.currentTarget.closest('.hidden-form').getElementsByClassName('hidden')[0];
+    /**
+     * Toggle form.
+     *
+     * @param  {Event} event
+     *
+     * @return {undefined}
+     */
+    revealForm(event) {
+        let trigger = event.currentTarget;
+        let hidden = trigger.closest('.hidden-form').querySelectorAll('.hidden')[0];
 
         this.addRemoveClass(hidden, 'hidden', !hidden);
     }
 
+    /**
+     * Execute actions on targets based on triggers.
+     *
+     * @param  {Event} event
+     *
+     * @return {undefined}
+     */
     toggleAction(event) {
         let trigger = event.currentTarget;
         let pressed = trigger.getAttribute('aria-pressed') == 'false';
@@ -103,21 +142,21 @@ let BookWyrm = new class {
             this.addRemoveClass(target, 'is-active', pressed);
         }
 
-        // show/hide container
+        // Show/hide container.
         let container = document.getElementById('hide-' + targetId);
 
         if (container) {
             this.addRemoveClass(container, 'hidden', pressed);
         }
 
-        // set checkbox, if appropriate
+        // Check checkbox, if appropriate.
         let checkbox = trigger.dataset['controls-checkbox'];
 
         if (checkbox) {
             document.getElementById(checkbox).checked = !!pressed;
         }
 
-        // set focus, if appropriate
+        // Set focus, if appropriate.
         let focus = trigger.dataset['focus-target'];
 
         if (focus) {
@@ -128,25 +167,45 @@ let BookWyrm = new class {
         }
     }
 
-    // @todo Only update status if the promise is successful.
-    interact(e) {
-        e.preventDefault();
+    /**
+     * Make a request and update the UI accordingly.
+     * This function is used for boosts and favourites.
+     *
+     * @todo Only update status if the promise is successful.
+     *
+     * @param  {Event} event
+     *
+     * @return {undefined}
+     */
+    interact(event) {
+        event.preventDefault();
 
-        let identifier = e.target.dataset.id;
-
-        this.ajaxPost(e.target);
+        this.ajaxPost(event.target);
 
         // @todo This probably should be done with IDs.
-        document.querySelectorAll(`.${identifier}`)
-            .forEach(t => this.addRemoveClass(t, 'hidden', t.className.indexOf('hidden') == -1));
+        document.querySelectorAll(`.${event.target.dataset.id}`)
+            .forEach(node => this.addRemoveClass(
+                node,
+                'hidden',
+                node.className.indexOf('hidden') == -1
+            ));
     }
 
-    toggleMenu(e) {
-        let el = e.currentTarget;
-        let expanded = el.getAttribute('aria-expanded') == 'false';
-        let targetId = el.dataset.controls;
+    /**
+     * Handle ARIA states on toggled menus.
+     *
+     * @note This function seems to be redundant and conflicts with toggleAction.
+     *
+     * @param  {Event} event
+     *
+     * @return {undefined}
+     */
+    toggleMenu(event) {
+        let trigger = event.currentTarget;
+        let expanded = trigger.getAttribute('aria-expanded') == 'false';
+        let targetId = trigger.dataset.controls;
 
-        el.setAttribute('aria-expanded', expanded);
+        trigger.setAttribute('aria-expanded', expanded);
 
         if (targetId) {
             let target = document.getElementById(targetId);
@@ -155,6 +214,13 @@ let BookWyrm = new class {
         }
     }
 
+    /**
+     * Submit a form using POST.
+     *
+     * @param  {object} form - Form to be submitted
+     *
+     * @return {undefined}
+     */
     ajaxPost(form) {
         fetch(form.action, {
             method : "POST",
diff --git a/bookwyrm/static/js/localstorage.js b/bookwyrm/static/js/localstorage.js
index 5d978c2f..eccac347 100644
--- a/bookwyrm/static/js/localstorage.js
+++ b/bookwyrm/static/js/localstorage.js
@@ -3,32 +3,43 @@
 
 let LocalStorageTools = new class {
     constructor() {
-        // display based on localstorage vars
         document.querySelectorAll('[data-hide]')
             .forEach(t => this.setDisplay(t));
 
-        // update localstorage
         document.querySelectorAll('.set-display')
             .forEach(t => t.addEventListener('click', this.updateDisplay.bind(this)));
     }
 
-    // set javascript listeners
-    updateDisplay(e) {
+    /**
+     * Update localStorage, then display content based on keys in localStorage.
+     *
+     * @param  {Event} event
+     *
+     * @return {undefined}
+     */
+    updateDisplay(event) {
         // used in set reading goal
-        let key = e.target.dataset.id;
-        let value = e.target.dataset.value;
+        let key = event.target.dataset.id;
+        let value = event.target.dataset.value;
 
         window.localStorage.setItem(key, value);
 
         document.querySelectorAll('[data-hide="' + key + '"]')
-            .forEach(t => this.setDisplay(t));
+            .forEach(node => this.setDisplay(node));
     }
 
-    setDisplay(el) {
+    /**
+     * Toggle display of a DOM node based on its value in the localStorage.
+     *
+     * @param {object} node - DOM node to toggle.
+     *
+     * @return {undefined}
+     */
+    setDisplay(node) {
         // used in set reading goal
-        let key = el.dataset.hide;
+        let key = node.dataset.hide;
         let value = window.localStorage.getItem(key);
 
-        BookWyrm.addRemoveClass(el, 'hidden', value);
+        BookWyrm.addRemoveClass(node, 'hidden', value);
     }
 }

From a21f954fb1e90a99a915273de994ce7a5936f79b Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Tue, 6 Apr 2021 16:29:58 +0200
Subject: [PATCH 0672/1285] Remove redundant `class` attribute and format
 template.

---
 bookwyrm/templates/components/dropdown.html | 27 ++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/components/dropdown.html b/bookwyrm/templates/components/dropdown.html
index 72582ddc..734d6276 100644
--- a/bookwyrm/templates/components/dropdown.html
+++ b/bookwyrm/templates/components/dropdown.html
@@ -1,13 +1,34 @@
+{% spaceless %}
 {% load bookwyrm_tags %}
+
 {% with 0|uuid as uuid %}
-<div class="dropdown control{% if right %} is-right{% endif %}" id="menu-{{ uuid }}">
-    <button type="button" class="button dropdown-trigger pulldown-menu {{ class }}" aria-expanded="false" class="pulldown-menu" aria-haspopup="true" aria-controls="menu-options-{{ uuid }}" data-controls="menu-{{ uuid }}">
+<div
+    id="menu-{{ uuid }}"
+    class="
+        dropdown control
+        {% if right %}is-right{% endif %}
+    "
+>
+    <button
+        class="button dropdown-trigger pulldown-menu {{ class }}"
+        type="button"
+        aria-expanded="false"
+        aria-haspopup="true"
+        aria-controls="menu-options-{{ uuid }}"
+        data-controls="menu-{{ uuid }}"
+    >
         {% block dropdown-trigger %}{% endblock %}
     </button>
+
     <div class="dropdown-menu">
-        <ul class="dropdown-content" role="menu" id="menu-options-{{ uuid }}">
+        <ul
+            id="menu-options-{{ uuid }}"
+            class="dropdown-content"
+            role="menu"
+        >
             {% block dropdown-list %}{% endblock %}
         </ul>
     </div>
 </div>
 {% endwith %}
+{% endspaceless %}

From fd66ff1861fbaaef572122c5d2636cb1e9ba067f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 6 Apr 2021 07:53:34 -0700
Subject: [PATCH 0673/1285] Small tweaks to commends and super() calls

---
 bookwyrm/activitystreams.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 2db6cc20..949ae9da 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -19,12 +19,12 @@ class ActivityStream(RedisStore):
         return "{}-unread".format(self.stream_id(user))
 
     def get_rank(self, obj):  # pylint: disable=no-self-use
-        """ the sort rank of a status, which is published date """
+        """ statuses are sorted by date published """
         return obj.published_date.timestamp()
 
     def add_status(self, status):
         """ add a status to users' feeds """
-        # the pipeline contains all the addp-to-stream activities
+        # the pipeline contains all the add-to-stream activities
         pipeline = self.add_object_to_related_stores(status, execute=False)
 
         for user in self.get_audience(status):
@@ -36,11 +36,13 @@ class ActivityStream(RedisStore):
 
     def add_user_statuses(self, viewer, user):
         """ add a user's statuses to another user's feed """
+        # only add the statuses that the viewer should be able to see (ie, not dms)
         statuses = privacy_filter(viewer, user.status_set.all())
         self.bulk_add_objects_to_store(statuses, self.stream_id(viewer))
 
     def remove_user_statuses(self, viewer, user):
         """ remove a user's status from another user's feed """
+        # remove all so that followers only statuses are removed
         statuses = user.status_set.all()
         self.bulk_remove_objects_from_store(statuses, self.stream_id(viewer))
 
@@ -49,7 +51,7 @@ class ActivityStream(RedisStore):
         # clear unreads for this feed
         r.set(self.unread_id(user), 0)
 
-        statuses = super().get_store(self.stream_id(user))
+        statuses = self.get_store(self.stream_id(user))
         return (
             models.Status.objects.select_subclasses()
             .filter(id__in=statuses)
@@ -62,7 +64,7 @@ class ActivityStream(RedisStore):
 
     def populate_streams(self, user):
         """ go from zero to a timeline """
-        super().populate_store(self.stream_id(user))
+        self.populate_store(self.stream_id(user))
 
     def get_audience(self, status):  # pylint: disable=no-self-use
         """ given a status, what users should see it """

From 9d95f54aa23ebc684255ba301cc8391333b61860 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Tue, 6 Apr 2021 17:48:56 +0200
Subject: [PATCH 0674/1285] [assets] Refactor `toggleAction` and `toggleMenu` a
 bit.

---
 bookwyrm/static/js/bookwyrm.js | 102 ++++++++++++++++++++++++---------
 1 file changed, 74 insertions(+), 28 deletions(-)

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index 63947aaa..0ec14336 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -9,25 +9,29 @@ let BookWyrm = new class {
     }
 
     initEventListeners() {
-        // buttons that display or hide content
         document.querySelectorAll('[data-controls]')
-            .forEach(button => button.addEventListener('click', this.toggleAction.bind(this)));
+            .forEach(button => button.addEventListener(
+                'click',
+                this.toggleAction.bind(this))
+            );
 
-        // javascript interactions (boost/fav)
         document.querySelectorAll('.interaction')
-            .forEach(button => button.addEventListener('submit', this.interact.bind(this)));
+            .forEach(button => button.addEventListener(
+                'submit',
+                this.interact.bind(this))
+            );
 
-        // handle aria settings on menus
-        document.querySelectorAll('.pulldown-menu')
-            .forEach(button => button.addEventListener('click', this.toggleMenu.bind(this)));
-
-        // hidden submit button in a form
         document.querySelectorAll('.hidden-form input')
-            .forEach(button => button.addEventListener('change', this.revealForm.bind(this)));
+            .forEach(button => button.addEventListener(
+                'change',
+                this.revealForm.bind(this))
+            );
 
-        // browser back behavior
         document.querySelectorAll('[data-back]')
-            .forEach(button => button.addEventListener('click', this.back));
+            .forEach(button => button.addEventListener(
+                'click',
+                this.back)
+            );
     }
 
     /**
@@ -125,45 +129,48 @@ let BookWyrm = new class {
      */
     toggleAction(event) {
         let trigger = event.currentTarget;
-        let pressed = trigger.getAttribute('aria-pressed') == 'false';
+        let pressed = trigger.getAttribute('aria-pressed') === 'false';
         let targetId = trigger.dataset.controls;
 
-        // Un‑press all triggers controlling the same target.
+        // Toggle pressed status on all triggers controlling the same target.
         document.querySelectorAll('[data-controls="' + targetId + '"]')
-            .forEach(triggers => triggers.setAttribute(
+            .forEach(otherTrigger => otherTrigger.setAttribute(
                 'aria-pressed',
-                (triggers.getAttribute('aria-pressed') == 'false'))
-            );
+                otherTrigger.getAttribute('aria-pressed') === 'false'
+            ));
 
-        if (targetId) {
+        // @todo Find a better way to handle the exception.
+        if (targetId && ! trigger.classList.contains('pulldown-menu')) {
             let target = document.getElementById(targetId);
 
             this.addRemoveClass(target, 'hidden', !pressed);
             this.addRemoveClass(target, 'is-active', pressed);
         }
 
+        // Show/hide pulldown-menus.
+        if (trigger.classList.contains('pulldown-menu')) {
+            this.toggleMenu(trigger, targetId);
+        }
+
         // Show/hide container.
         let container = document.getElementById('hide-' + targetId);
 
         if (container) {
-            this.addRemoveClass(container, 'hidden', pressed);
+            this.toggleContainer(container, pressed);
         }
 
         // Check checkbox, if appropriate.
         let checkbox = trigger.dataset['controls-checkbox'];
 
         if (checkbox) {
-            document.getElementById(checkbox).checked = !!pressed;
+            this.toggleCheckbox(checkbox, pressed);
         }
 
         // Set focus, if appropriate.
         let focus = trigger.dataset['focus-target'];
 
         if (focus) {
-            let focusEl = document.getElementById(focus);
-
-            focusEl.focus();
-            setTimeout(function() { focusEl.selectionStart = focusEl.selectionEnd = 10000; }, 0);
+            this.toggleFocus(focus);
         }
     }
 
@@ -192,7 +199,7 @@ let BookWyrm = new class {
     }
 
     /**
-     * Handle ARIA states on toggled menus.
+     * Show or hide menus.
      *
      * @note This function seems to be redundant and conflicts with toggleAction.
      *
@@ -200,10 +207,8 @@ let BookWyrm = new class {
      *
      * @return {undefined}
      */
-    toggleMenu(event) {
-        let trigger = event.currentTarget;
+    toggleMenu(trigger, targetId) {
         let expanded = trigger.getAttribute('aria-expanded') == 'false';
-        let targetId = trigger.dataset.controls;
 
         trigger.setAttribute('aria-expanded', expanded);
 
@@ -214,6 +219,47 @@ let BookWyrm = new class {
         }
     }
 
+    /**
+     * Show or hide generic containers.
+     *
+     * @param  {object}  container - DOM node
+     * @param  {boolean} pressed   - Is the trigger pressed?
+     *
+     * @return {undefined}
+     */
+    toggleContainer(container, pressed) {
+        this.addRemoveClass(container, 'hidden', pressed);
+    }
+
+    /**
+     * Check or uncheck a checbox.
+     *
+     * @param  {object}  checkbox - DOM node
+     * @param  {boolean} pressed  - Is the trigger pressed?
+     *
+     * @return {undefined}
+     */
+    toggleCheckbox(checkbox, pressed) {
+        document.getElementById(checkbox).checked = !!pressed;
+    }
+
+    /**
+     * Give the focus to an element.
+     *
+     * @param  {string} nodeId - ID of the DOM node to focus (button, link…)
+     *
+     * @return {undefined}
+     */
+    toggleFocus(nodeId) {
+        let node = document.getElementById(nodeId);
+
+        node.focus();
+
+        setTimeout(function() {
+            node.selectionStart = node.selectionEnd = 10000;
+        }, 0);
+    }
+
     /**
      * Submit a form using POST.
      *

From 44040201f9d28ea5ea78dfd847d2c72dafcef038 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Tue, 6 Apr 2021 17:57:39 +0200
Subject: [PATCH 0675/1285] [assets] Move interact function.

---
 bookwyrm/static/js/bookwyrm.js | 48 +++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index 0ec14336..b3959e30 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -174,30 +174,6 @@ let BookWyrm = new class {
         }
     }
 
-    /**
-     * Make a request and update the UI accordingly.
-     * This function is used for boosts and favourites.
-     *
-     * @todo Only update status if the promise is successful.
-     *
-     * @param  {Event} event
-     *
-     * @return {undefined}
-     */
-    interact(event) {
-        event.preventDefault();
-
-        this.ajaxPost(event.target);
-
-        // @todo This probably should be done with IDs.
-        document.querySelectorAll(`.${event.target.dataset.id}`)
-            .forEach(node => this.addRemoveClass(
-                node,
-                'hidden',
-                node.className.indexOf('hidden') == -1
-            ));
-    }
-
     /**
      * Show or hide menus.
      *
@@ -260,6 +236,30 @@ let BookWyrm = new class {
         }, 0);
     }
 
+    /**
+     * Make a request and update the UI accordingly.
+     * This function is used for boosts and favourites.
+     *
+     * @todo Only update status if the promise is successful.
+     *
+     * @param  {Event} event
+     *
+     * @return {undefined}
+     */
+    interact(event) {
+        event.preventDefault();
+
+        this.ajaxPost(event.target);
+
+        // @todo This probably should be done with IDs.
+        document.querySelectorAll(`.${event.target.dataset.id}`)
+            .forEach(node => this.addRemoveClass(
+                node,
+                'hidden',
+                node.className.indexOf('hidden') == -1
+            ));
+    }
+
     /**
      * Submit a form using POST.
      *

From f30d05acfc7ada811a5a9421de4245c5266c7144 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 6 Apr 2021 10:40:13 -0700
Subject: [PATCH 0676/1285] Update connector model to add new connector

---
 bookwyrm/connectors/settings.py               |  2 +-
 .../migrations/0062_auto_20210406_1731.py     | 22 +++++++++++++++++++
 bookwyrm/models/connector.py                  | 10 ---------
 3 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 bookwyrm/migrations/0062_auto_20210406_1731.py

diff --git a/bookwyrm/connectors/settings.py b/bookwyrm/connectors/settings.py
index f1674cf7..4cc98da7 100644
--- a/bookwyrm/connectors/settings.py
+++ b/bookwyrm/connectors/settings.py
@@ -1,3 +1,3 @@
 """ settings book data connectors """
 
-CONNECTORS = ["openlibrary", "self_connector", "bookwyrm_connector"]
+CONNECTORS = ["openlibrary", "inventaire", "self_connector", "bookwyrm_connector"]
diff --git a/bookwyrm/migrations/0062_auto_20210406_1731.py b/bookwyrm/migrations/0062_auto_20210406_1731.py
new file mode 100644
index 00000000..9ff26af3
--- /dev/null
+++ b/bookwyrm/migrations/0062_auto_20210406_1731.py
@@ -0,0 +1,22 @@
+# Generated by Django 3.1.6 on 2021-04-06 17:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0061_auto_20210402_1435'),
+    ]
+
+    operations = [
+        migrations.RemoveConstraint(
+            model_name='connector',
+            name='connector_file_valid',
+        ),
+        migrations.AlterField(
+            model_name='connector',
+            name='connector_file',
+            field=models.CharField(choices=[('openlibrary', 'Openlibrary'), ('inventaire', 'Inventaire'), ('self_connector', 'Self Connector'), ('bookwyrm_connector', 'Bookwyrm Connector')], max_length=255),
+        ),
+    ]
diff --git a/bookwyrm/models/connector.py b/bookwyrm/models/connector.py
index 11bdbee2..9f9af8ae 100644
--- a/bookwyrm/models/connector.py
+++ b/bookwyrm/models/connector.py
@@ -31,16 +31,6 @@ class Connector(BookWyrmModel):
     # when to reset the query count back to 0 (ie, after 1 day)
     query_count_expiry = models.DateTimeField(auto_now_add=True, blank=True)
 
-    class Meta:
-        """ check that there's code to actually use this connector """
-
-        constraints = [
-            models.CheckConstraint(
-                check=models.Q(connector_file__in=ConnectorFiles),
-                name="connector_file_valid",
-            )
-        ]
-
     def __str__(self):
         return "{} ({})".format(
             self.identifier,

From 295842badd51676aaeb177fea97b6efd0c59680a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 6 Apr 2021 10:40:39 -0700
Subject: [PATCH 0677/1285] Adds inventaire id to book data model

---
 bookwyrm/activitypub/book.py | 14 ++++++++------
 bookwyrm/models/book.py      |  3 +++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/activitypub/book.py b/bookwyrm/activitypub/book.py
index 7e552b0a..8ff1df82 100644
--- a/bookwyrm/activitypub/book.py
+++ b/bookwyrm/activitypub/book.py
@@ -24,9 +24,10 @@ class Book(ActivityObject):
     firstPublishedDate: str = ""
     publishedDate: str = ""
 
-    openlibraryKey: str = ""
-    librarythingKey: str = ""
-    goodreadsKey: str = ""
+    openlibraryKey: str = None
+    inventiareId: str = None
+    librarythingKey: str = None
+    goodreadsKey: str = None
 
     cover: Image = None
     type: str = "Book"
@@ -68,8 +69,9 @@ class Author(ActivityObject):
     died: str = None
     aliases: List[str] = field(default_factory=lambda: [])
     bio: str = ""
-    openlibraryKey: str = ""
-    librarythingKey: str = ""
-    goodreadsKey: str = ""
+    openlibraryKey: str = None
+    inventiareId: str = None
+    librarythingKey: str = None
+    goodreadsKey: str = None
     wikipediaLink: str = ""
     type: str = "Author"
diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index 3204c603..ccbec9eb 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -19,6 +19,9 @@ class BookDataModel(ObjectMixin, BookWyrmModel):
     openlibrary_key = fields.CharField(
         max_length=255, blank=True, null=True, deduplication_field=True
     )
+    inventaire_id = fields.CharField(
+        max_length=255, blank=True, null=True, deduplication_field=True
+    )
     librarything_key = fields.CharField(
         max_length=255, blank=True, null=True, deduplication_field=True
     )

From d482c66ad4dff9152d52d257242e6d7fea178c52 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 6 Apr 2021 11:58:07 -0700
Subject: [PATCH 0678/1285] Adds inventaire connector stub

And changes formatters to accept the key as well as value
---
 bookwyrm/connectors/abstract_connector.py |  2 +-
 bookwyrm/connectors/inventaire.py         | 84 +++++++++++++++++++++++
 bookwyrm/connectors/openlibrary.py        | 14 ++--
 3 files changed, 92 insertions(+), 8 deletions(-)
 create mode 100644 bookwyrm/connectors/inventaire.py

diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index 00b5c5c9..bbbedd70 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -296,6 +296,6 @@ class Mapping:
         if not value:
             return None
         try:
-            return self.formatter(value)
+            return self.formatter(value, self.remote_field)
         except:  # pylint: disable=bare-except
             return None
diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
new file mode 100644
index 00000000..714508ab
--- /dev/null
+++ b/bookwyrm/connectors/inventaire.py
@@ -0,0 +1,84 @@
+""" inventaire data connector """
+from bookwyrm import models
+from .abstract_connector import AbstractConnector, SearchResult, Mapping
+from .abstract_connector import get_data
+from .connector_manager import ConnectorException
+
+
+class Connector(AbstractConnector):
+    """ instantiate a connector for OL """
+
+    def __init__(self, identifier):
+        super().__init__(identifier)
+
+        self.book_mappings = [
+            Mapping("title", remote_field="wdt:P1476", formatter=get_claim),
+            Mapping("id", remote_field="id"),
+            Mapping("cover", remote_field="image", formatter=self.get_cover_url),
+            Mapping("isbn13", remote_field="wdt:P212", formatter=get_claim),
+            Mapping("isbn10", remote_field="wdt:P957", formatter=get_claim),
+            Mapping("languages", remote_field="wdt:P407", formatter=get_language),
+            Mapping("publishers", remote_field="wdt:P123", formatter=resolve_key),
+            Mapping("publishedDate", remote_field="wdt:P577", formatter=get_claim),
+            Mapping("pages", remote_field="wdt:P1104", formatter=get_claim),
+            Mapping("goodreadsKey", remote_field="wdt:P2969", formatter=get_claim),
+        ]
+
+    def parse_search_data(self, data):
+        return data.get('results')
+
+    def format_search_result(self, search_result):
+        images = search_result.get("image")
+        cover = "{:s}/img/entities/{:s}".format(
+            self.covers_url, images[0]
+        ) if images else None
+        return SearchResult(
+            title=search_result.get("label"),
+            key="{:s}{:s}".format(self.books_url, search_result.get("uri")),
+            cover=cover,
+            connector=self,
+        )
+
+    def parse_isbn_search_data(self, data):
+        """ boop doop """
+
+    def format_isbn_search_result(self, search_result):
+        """ beep bloop """
+
+    def is_work_data(self, data):
+        return True
+
+    def get_edition_from_work_data(self, data):
+        return {}
+
+    def get_work_from_edition_data(self, data):
+        # P629
+        return {}
+
+    def get_authors_from_data(self, data):
+        return []
+
+    def expand_book_data(self, book):
+        return
+
+    def get_cover_url(self, cover_blob, *_):
+        """ format the relative cover url into an absolute one:
+        {"url": "/img/entities/e794783f01b9d4f897a1ea9820b96e00d346994f"}
+        """
+        cover_id = cover_blob[0].get("url")
+        if not cover_id:
+            return None
+        return "%s%s" % (self.covers_url, cover_id)
+
+
+def get_claim(data, claim_key):
+    """ all the metadata is in a "claims" dict with a buncha wikidata keys """
+    return data.get('claims', {}).get(claim_key)
+
+def get_language(wikidata_key, *_):
+    """ who here speaks "wd:Q150" """
+    return wikidata_key  # TODO
+
+def resolve_key(wikidata_key, *_):
+    """ cool, it's "wd:Q3156592" now what the heck does that mean """
+    return wikidata_key  # TODO
diff --git a/bookwyrm/connectors/openlibrary.py b/bookwyrm/connectors/openlibrary.py
index 9be0266c..34357726 100644
--- a/bookwyrm/connectors/openlibrary.py
+++ b/bookwyrm/connectors/openlibrary.py
@@ -14,8 +14,8 @@ class Connector(AbstractConnector):
     def __init__(self, identifier):
         super().__init__(identifier)
 
-        get_first = lambda a: a[0]
-        get_remote_id = lambda a: self.base_url + a
+        get_first = lambda a, *args: a[0]
+        get_remote_id = lambda a, *args: self.base_url + a
         self.book_mappings = [
             Mapping("title"),
             Mapping("id", remote_field="key", formatter=get_remote_id),
@@ -95,7 +95,7 @@ class Connector(AbstractConnector):
             url = "%s%s" % (self.base_url, author_id)
             yield self.get_or_create_author(url)
 
-    def get_cover_url(self, cover_blob, size="L"):
+    def get_cover_url(self, cover_blob, *_, size="L"):
         """ ask openlibrary for the cover """
         if not cover_blob:
             return None
@@ -181,19 +181,19 @@ def ignore_edition(edition_data):
     return True
 
 
-def get_description(description_blob):
+def get_description(description_blob, *_):
     """ descriptions can be a string or a dict """
     if isinstance(description_blob, dict):
         return description_blob.get("value")
     return description_blob
 
 
-def get_openlibrary_key(key):
+def get_openlibrary_key(key, *_):
     """ convert /books/OL27320736M into OL27320736M """
     return key.split("/")[-1]
 
 
-def get_languages(language_blob):
+def get_languages(language_blob, *_):
     """ /language/eng -> English """
     langs = []
     for lang in language_blob:
@@ -201,7 +201,7 @@ def get_languages(language_blob):
     return langs
 
 
-def pick_default_edition(options):
+def pick_default_edition(options, *_):
     """ favor physical copies with covers in english """
     if not options:
         return None

From fba44206ac129addcf9f0b0077c0e65b835b79a2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 6 Apr 2021 12:17:58 -0700
Subject: [PATCH 0679/1285] Adds separate view and load links for book search
 results

---
 bookwyrm/activitypub/book.py                        | 4 ++--
 bookwyrm/connectors/abstract_connector.py           | 3 ++-
 bookwyrm/connectors/inventaire.py                   | 5 ++++-
 bookwyrm/templates/snippets/search_result_text.html | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/activitypub/book.py b/bookwyrm/activitypub/book.py
index 8ff1df82..7a427927 100644
--- a/bookwyrm/activitypub/book.py
+++ b/bookwyrm/activitypub/book.py
@@ -25,7 +25,7 @@ class Book(ActivityObject):
     publishedDate: str = ""
 
     openlibraryKey: str = None
-    inventiareId: str = None
+    inventaireId: str = None
     librarythingKey: str = None
     goodreadsKey: str = None
 
@@ -70,7 +70,7 @@ class Author(ActivityObject):
     aliases: List[str] = field(default_factory=lambda: [])
     bio: str = ""
     openlibraryKey: str = None
-    inventiareId: str = None
+    inventaireId: str = None
     librarythingKey: str = None
     goodreadsKey: str = None
     wikipediaLink: str = ""
diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index bbbedd70..378f23f7 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -263,6 +263,7 @@ class SearchResult:
     title: str
     key: str
     connector: object
+    view_link: str = None
     author: str = None
     year: str = None
     cover: str = None
@@ -284,7 +285,7 @@ class Mapping:
     """ associate a local database field with a field in an external dataset """
 
     def __init__(self, local_field, remote_field=None, formatter=None):
-        noop = lambda x: x
+        noop = lambda x, *_: x
 
         self.local_field = local_field
         self.remote_field = remote_field or local_field
diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index 714508ab..748259eb 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -11,9 +11,11 @@ class Connector(AbstractConnector):
     def __init__(self, identifier):
         super().__init__(identifier)
 
+        get_remote_id = lambda a, *args: self.base_url + a
         self.book_mappings = [
             Mapping("title", remote_field="wdt:P1476", formatter=get_claim),
-            Mapping("id", remote_field="id"),
+            Mapping("id", remote_field="key", formatter=get_remote_id),
+            Mapping("inventaireId", remote_field="id"),
             Mapping("cover", remote_field="image", formatter=self.get_cover_url),
             Mapping("isbn13", remote_field="wdt:P212", formatter=get_claim),
             Mapping("isbn10", remote_field="wdt:P957", formatter=get_claim),
@@ -35,6 +37,7 @@ class Connector(AbstractConnector):
         return SearchResult(
             title=search_result.get("label"),
             key="{:s}{:s}".format(self.books_url, search_result.get("uri")),
+            view_link="{:s}{:s}".format(self.base_url, search_result.get("uri")),
             cover=cover,
             connector=self,
         )
diff --git a/bookwyrm/templates/snippets/search_result_text.html b/bookwyrm/templates/snippets/search_result_text.html
index 059b8e7e..2f6ba503 100644
--- a/bookwyrm/templates/snippets/search_result_text.html
+++ b/bookwyrm/templates/snippets/search_result_text.html
@@ -16,7 +16,7 @@
     <div class="column">
         <p>
             <strong>
-                <a href="{{ result.key }}"{% if remote_result %} rel=�noopener� target="_blank"{% endif %}>{{ result.title }}</a>
+                <a href="{{ result.view_link|default:result.key }}"{% if remote_result %} rel=�noopener� target="_blank"{% endif %}>{{ result.title }}</a>
             </strong>
             {% if result.author %}
             {% blocktrans with author=result.author %}by {{ author }}{% endblocktrans %}{% endif %}{% if result.year %} ({{ result.year }})

From 22ebe60c0abb2badaf0d354190eee125d5278514 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 6 Apr 2021 12:29:06 -0700
Subject: [PATCH 0680/1285] Use custom data extractor for inventaire connector

---
 bookwyrm/connectors/abstract_connector.py | 16 ++++++++++++----
 bookwyrm/connectors/inventaire.py         |  9 ++++++---
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index 378f23f7..8007bb1a 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -44,7 +44,7 @@ class AbstractMinimalConnector(ABC):
         if min_confidence:
             params["min_confidence"] = min_confidence
 
-        data = get_data(
+        data = self.get_search_data(
             "%s%s" % (self.search_url, query),
             params=params,
         )
@@ -57,7 +57,7 @@ class AbstractMinimalConnector(ABC):
     def isbn_search(self, query):
         """ isbn search """
         params = {}
-        data = get_data(
+        data = self.get_search_data(
             "%s%s" % (self.isbn_search_url, query),
             params=params,
         )
@@ -117,7 +117,7 @@ class AbstractConnector(AbstractMinimalConnector):
             return existing
 
         # load the json
-        data = get_data(remote_id)
+        data = self.get_book_data(remote_id)
         mapped_data = dict_from_mappings(data, self.book_mappings)
         if self.is_work_data(data):
             try:
@@ -150,6 +150,14 @@ class AbstractConnector(AbstractMinimalConnector):
         load_more_data.delay(self.connector.id, work.id)
         return edition
 
+    def get_book_data(self, remote_id):
+        """ this allows connectors to override the default behavior """
+        return get_data(remote_id)
+
+    def get_search_data(self, remote_id):
+        """ this allows connectors to override the default behavior """
+        return get_data(remote_id)
+
     def create_edition_from_data(self, work, edition_data):
         """ if we already have the work, we're ready """
         mapped_data = dict_from_mappings(edition_data, self.book_mappings)
@@ -176,7 +184,7 @@ class AbstractConnector(AbstractMinimalConnector):
         if existing:
             return existing
 
-        data = get_data(remote_id)
+        data = self.get_book_data(remote_id)
 
         mapped_data = dict_from_mappings(data, self.author_mappings)
         activity = activitypub.Author(**mapped_data)
diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index 748259eb..72ed8221 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -1,8 +1,6 @@
 """ inventaire data connector """
-from bookwyrm import models
 from .abstract_connector import AbstractConnector, SearchResult, Mapping
 from .abstract_connector import get_data
-from .connector_manager import ConnectorException
 
 
 class Connector(AbstractConnector):
@@ -26,6 +24,11 @@ class Connector(AbstractConnector):
             Mapping("goodreadsKey", remote_field="wdt:P2969", formatter=get_claim),
         ]
 
+    def get_book_data(self, remote_id):
+        data = get_data(remote_id)
+        extracted = list(data.get("entities").values())
+        return extracted[0] if extracted else {}
+
     def parse_search_data(self, data):
         return data.get('results')
 
@@ -49,7 +52,7 @@ class Connector(AbstractConnector):
         """ beep bloop """
 
     def is_work_data(self, data):
-        return True
+        return data.get("type") == "work"
 
     def get_edition_from_work_data(self, data):
         return {}

From 5149c7e8c2da5766ba16c1b033e39d3da3844a3d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 6 Apr 2021 13:03:22 -0700
Subject: [PATCH 0681/1285] Expands mappings for inventaire/wikidata properties

---
 bookwyrm/connectors/inventaire.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index 72ed8221..b3c49772 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -9,11 +9,14 @@ class Connector(AbstractConnector):
     def __init__(self, identifier):
         super().__init__(identifier)
 
-        get_remote_id = lambda a, *args: self.base_url + a
+        get_remote_id = lambda a, *args: self.books_url + a
+        get_remote_id_list = lambda a, *_: [get_remote_id(v) for v in a]
         self.book_mappings = [
             Mapping("title", remote_field="wdt:P1476", formatter=get_claim),
-            Mapping("id", remote_field="key", formatter=get_remote_id),
-            Mapping("inventaireId", remote_field="id"),
+            Mapping("subtitle", remote_field="wdt:P1680", formatter=get_claim),
+            Mapping("id", remote_field="uri", formatter=get_remote_id),
+            Mapping("authors", remote_field="wdt:P50", formatter=get_remote_id_list),
+            Mapping("inventaireId", remote_field="uri"),
             Mapping("cover", remote_field="image", formatter=self.get_cover_url),
             Mapping("isbn13", remote_field="wdt:P212", formatter=get_claim),
             Mapping("isbn10", remote_field="wdt:P957", formatter=get_claim),
@@ -22,7 +25,14 @@ class Connector(AbstractConnector):
             Mapping("publishedDate", remote_field="wdt:P577", formatter=get_claim),
             Mapping("pages", remote_field="wdt:P1104", formatter=get_claim),
             Mapping("goodreadsKey", remote_field="wdt:P2969", formatter=get_claim),
+            Mapping("openlibraryKey", remote_field="wdt:P648", formatter=get_claim),
+            Mapping("subjectPlaces", remote_field="wdt:P840", formatter=resolve_key),
+            Mapping("subjects", remote_field="wdt:P921", formatter=resolve_key),
+            Mapping("librarythingKey", remote_field="wdt:P1085", formatter=get_claim),
+            Mapping("oclcNumber", remote_field="wdt:P5331", formatter=get_claim),
+            Mapping("asin", remote_field="wdt:P5749", formatter=get_claim),
         ]
+        # TODO: P136: genre, P268 bnf id, P674 characters, P950 bne
 
     def get_book_data(self, remote_id):
         data = get_data(remote_id)

From 1f99710dcdc17b5f7fb42ecfa8676da3d9e2c3e7 Mon Sep 17 00:00:00 2001
From: tofuwabohu <mail@lapete.de>
Date: Tue, 6 Apr 2021 22:36:24 +0200
Subject: [PATCH 0682/1285] Links to own user in menu

---
 bookwyrm/templates/layout.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 80eb386a..0f100f2c 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -70,7 +70,7 @@
         {% if request.user.is_authenticated %}
             <div class="navbar-item has-dropdown is-hoverable">
                 <a
-                    href="{{ user.local_path }}"
+                    href="{{ request.user.local_path }}"
                     class="navbar-link pulldown-menu"
                     role="button"
                     aria-expanded="false"

From 3158701075bf1328be9d7c5851afdf0ed1b63edf Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 6 Apr 2021 13:39:10 -0700
Subject: [PATCH 0683/1285] Gets editions for works

---
 bookwyrm/connectors/inventaire.py | 33 ++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index b3c49772..9987079e 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -1,6 +1,7 @@
 """ inventaire data connector """
 from .abstract_connector import AbstractConnector, SearchResult, Mapping
 from .abstract_connector import get_data
+from .connector_manager import ConnectorException
 
 
 class Connector(AbstractConnector):
@@ -9,12 +10,11 @@ class Connector(AbstractConnector):
     def __init__(self, identifier):
         super().__init__(identifier)
 
-        get_remote_id = lambda a, *args: self.books_url + a
-        get_remote_id_list = lambda a, *_: [get_remote_id(v) for v in a]
+        get_remote_id_list = lambda a, *_: [self.get_remote_id(v) for v in a]
         self.book_mappings = [
             Mapping("title", remote_field="wdt:P1476", formatter=get_claim),
             Mapping("subtitle", remote_field="wdt:P1680", formatter=get_claim),
-            Mapping("id", remote_field="uri", formatter=get_remote_id),
+            Mapping("id", remote_field="uri", formatter=self.get_remote_id),
             Mapping("authors", remote_field="wdt:P50", formatter=get_remote_id_list),
             Mapping("inventaireId", remote_field="uri"),
             Mapping("cover", remote_field="image", formatter=self.get_cover_url),
@@ -34,6 +34,10 @@ class Connector(AbstractConnector):
         ]
         # TODO: P136: genre, P268 bnf id, P674 characters, P950 bne
 
+    def get_remote_id(self, value, *_):
+        """ convert an id/uri into a url """
+        return '{:s}?action=by-uris&uris={:s}'.format(self.books_url, value)
+
     def get_book_data(self, remote_id):
         data = get_data(remote_id)
         extracted = list(data.get("entities").values())
@@ -49,7 +53,9 @@ class Connector(AbstractConnector):
         ) if images else None
         return SearchResult(
             title=search_result.get("label"),
-            key="{:s}{:s}".format(self.books_url, search_result.get("uri")),
+            key="{:s}?action=by-uris&uris={:s}".format(
+                self.books_url, search_result.get("uri")
+            ),
             view_link="{:s}{:s}".format(self.base_url, search_result.get("uri")),
             cover=cover,
             connector=self,
@@ -65,11 +71,24 @@ class Connector(AbstractConnector):
         return data.get("type") == "work"
 
     def get_edition_from_work_data(self, data):
-        return {}
+        value = data.get("uri")
+        url = "{:s}?action=reverse-claims&property=P629&value={:s}".format(
+            self.books_url, value
+        )
+        data = get_data(url)
+        try:
+            uri = data["uris"][0]
+        except KeyError:
+            raise ConnectorException("Invalid book data")
+        return self.get_book_data(self.get_remote_id(uri))
 
     def get_work_from_edition_data(self, data):
-        # P629
-        return {}
+        try:
+            uri = data["claims"]["wdt:P629"]
+        except KeyError:
+            raise ConnectorException("Invalid book data")
+        return self.get_book_data(self.get_remote_id(uri))
+
 
     def get_authors_from_data(self, data):
         return []

From e594cd0a3619015091c654ab85de9ba85ab14a07 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 6 Apr 2021 13:53:58 -0700
Subject: [PATCH 0684/1285] Load simple fields from inventaire

---
 bookwyrm/connectors/inventaire.py | 64 +++++++++++++++++--------------
 1 file changed, 36 insertions(+), 28 deletions(-)

diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index 9987079e..1ff834bf 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -10,47 +10,59 @@ class Connector(AbstractConnector):
     def __init__(self, identifier):
         super().__init__(identifier)
 
+        get_first = lambda a, *args: a[0]
         get_remote_id_list = lambda a, *_: [self.get_remote_id(v) for v in a]
         self.book_mappings = [
-            Mapping("title", remote_field="wdt:P1476", formatter=get_claim),
-            Mapping("subtitle", remote_field="wdt:P1680", formatter=get_claim),
+            Mapping("title", remote_field="wdt:P1476", formatter=get_first),
+            Mapping("subtitle", remote_field="wdt:P1680", formatter=get_first),
             Mapping("id", remote_field="uri", formatter=self.get_remote_id),
-            Mapping("authors", remote_field="wdt:P50", formatter=get_remote_id_list),
+            # Mapping("authors", remote_field="wdt:P50", formatter=get_remote_id_list),
             Mapping("inventaireId", remote_field="uri"),
             Mapping("cover", remote_field="image", formatter=self.get_cover_url),
-            Mapping("isbn13", remote_field="wdt:P212", formatter=get_claim),
-            Mapping("isbn10", remote_field="wdt:P957", formatter=get_claim),
-            Mapping("languages", remote_field="wdt:P407", formatter=get_language),
-            Mapping("publishers", remote_field="wdt:P123", formatter=resolve_key),
-            Mapping("publishedDate", remote_field="wdt:P577", formatter=get_claim),
-            Mapping("pages", remote_field="wdt:P1104", formatter=get_claim),
-            Mapping("goodreadsKey", remote_field="wdt:P2969", formatter=get_claim),
-            Mapping("openlibraryKey", remote_field="wdt:P648", formatter=get_claim),
-            Mapping("subjectPlaces", remote_field="wdt:P840", formatter=resolve_key),
-            Mapping("subjects", remote_field="wdt:P921", formatter=resolve_key),
-            Mapping("librarythingKey", remote_field="wdt:P1085", formatter=get_claim),
-            Mapping("oclcNumber", remote_field="wdt:P5331", formatter=get_claim),
-            Mapping("asin", remote_field="wdt:P5749", formatter=get_claim),
+            Mapping("isbn13", remote_field="wdt:P212", formatter=get_first),
+            Mapping("isbn10", remote_field="wdt:P957", formatter=get_first),
+            # Mapping("languages", remote_field="wdt:P407", formatter=get_language),
+            # Mapping("publishers", remote_field="wdt:P123", formatter=resolve_key),
+            Mapping("publishedDate", remote_field="wdt:P577", formatter=get_first),
+            Mapping("pages", remote_field="wdt:P1104", formatter=get_first),
+            Mapping("goodreadsKey", remote_field="wdt:P2969", formatter=get_first),
+            Mapping("openlibraryKey", remote_field="wdt:P648", formatter=get_first),
+            # Mapping("subjectPlaces", remote_field="wdt:P840", formatter=resolve_key),
+            # Mapping("subjects", remote_field="wdt:P921", formatter=resolve_key),
+            Mapping("librarythingKey", remote_field="wdt:P1085", formatter=get_first),
+            Mapping("oclcNumber", remote_field="wdt:P5331", formatter=get_first),
+            Mapping("asin", remote_field="wdt:P5749", formatter=get_first),
         ]
         # TODO: P136: genre, P268 bnf id, P674 characters, P950 bne
 
     def get_remote_id(self, value, *_):
         """ convert an id/uri into a url """
-        return '{:s}?action=by-uris&uris={:s}'.format(self.books_url, value)
+        return "{:s}?action=by-uris&uris={:s}".format(self.books_url, value)
 
     def get_book_data(self, remote_id):
         data = get_data(remote_id)
         extracted = list(data.get("entities").values())
-        return extracted[0] if extracted else {}
+        try:
+            data = extracted[0]
+        except KeyError:
+            raise ConnectorException("Invalid book data")
+        # flatten the data so that images, uri, and claims are on the same level
+        return {
+            **data.get("claims"),
+            "uri": data.get("uri"),
+            "image": data.get("image"),
+        }
 
     def parse_search_data(self, data):
-        return data.get('results')
+        return data.get("results")
 
     def format_search_result(self, search_result):
         images = search_result.get("image")
-        cover = "{:s}/img/entities/{:s}".format(
-            self.covers_url, images[0]
-        ) if images else None
+        cover = (
+            "{:s}/img/entities/{:s}".format(self.covers_url, images[0])
+            if images
+            else None
+        )
         return SearchResult(
             title=search_result.get("label"),
             key="{:s}?action=by-uris&uris={:s}".format(
@@ -89,7 +101,6 @@ class Connector(AbstractConnector):
             raise ConnectorException("Invalid book data")
         return self.get_book_data(self.get_remote_id(uri))
 
-
     def get_authors_from_data(self, data):
         return []
 
@@ -97,7 +108,7 @@ class Connector(AbstractConnector):
         return
 
     def get_cover_url(self, cover_blob, *_):
-        """ format the relative cover url into an absolute one:
+        """format the relative cover url into an absolute one:
         {"url": "/img/entities/e794783f01b9d4f897a1ea9820b96e00d346994f"}
         """
         cover_id = cover_blob[0].get("url")
@@ -106,14 +117,11 @@ class Connector(AbstractConnector):
         return "%s%s" % (self.covers_url, cover_id)
 
 
-def get_claim(data, claim_key):
-    """ all the metadata is in a "claims" dict with a buncha wikidata keys """
-    return data.get('claims', {}).get(claim_key)
-
 def get_language(wikidata_key, *_):
     """ who here speaks "wd:Q150" """
     return wikidata_key  # TODO
 
+
 def resolve_key(wikidata_key, *_):
     """ cool, it's "wd:Q3156592" now what the heck does that mean """
     return wikidata_key  # TODO

From bfdcf611e7966ea54d051a313115c40cf35eb40b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 6 Apr 2021 13:54:20 -0700
Subject: [PATCH 0685/1285] Adds inventaire identifier to book data fields

---
 .../migrations/0062_auto_20210406_1731.py     | 20 +++++++++----
 .../migrations/0063_auto_20210406_1738.py     | 28 +++++++++++++++++++
 2 files changed, 42 insertions(+), 6 deletions(-)
 create mode 100644 bookwyrm/migrations/0063_auto_20210406_1738.py

diff --git a/bookwyrm/migrations/0062_auto_20210406_1731.py b/bookwyrm/migrations/0062_auto_20210406_1731.py
index 9ff26af3..5db176ec 100644
--- a/bookwyrm/migrations/0062_auto_20210406_1731.py
+++ b/bookwyrm/migrations/0062_auto_20210406_1731.py
@@ -6,17 +6,25 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0061_auto_20210402_1435'),
+        ("bookwyrm", "0061_auto_20210402_1435"),
     ]
 
     operations = [
         migrations.RemoveConstraint(
-            model_name='connector',
-            name='connector_file_valid',
+            model_name="connector",
+            name="connector_file_valid",
         ),
         migrations.AlterField(
-            model_name='connector',
-            name='connector_file',
-            field=models.CharField(choices=[('openlibrary', 'Openlibrary'), ('inventaire', 'Inventaire'), ('self_connector', 'Self Connector'), ('bookwyrm_connector', 'Bookwyrm Connector')], max_length=255),
+            model_name="connector",
+            name="connector_file",
+            field=models.CharField(
+                choices=[
+                    ("openlibrary", "Openlibrary"),
+                    ("inventaire", "Inventaire"),
+                    ("self_connector", "Self Connector"),
+                    ("bookwyrm_connector", "Bookwyrm Connector"),
+                ],
+                max_length=255,
+            ),
         ),
     ]
diff --git a/bookwyrm/migrations/0063_auto_20210406_1738.py b/bookwyrm/migrations/0063_auto_20210406_1738.py
new file mode 100644
index 00000000..c9f07b3c
--- /dev/null
+++ b/bookwyrm/migrations/0063_auto_20210406_1738.py
@@ -0,0 +1,28 @@
+# Generated by Django 3.1.6 on 2021-04-06 17:38
+
+import bookwyrm.models.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0062_auto_20210406_1731"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="author",
+            name="inventaire_id",
+            field=bookwyrm.models.fields.CharField(
+                blank=True, max_length=255, null=True
+            ),
+        ),
+        migrations.AddField(
+            model_name="book",
+            name="inventaire_id",
+            field=bookwyrm.models.fields.CharField(
+                blank=True, max_length=255, null=True
+            ),
+        ),
+    ]

From 502f29082c04cc652e94090a7d8a0720576b585c Mon Sep 17 00:00:00 2001
From: n2no1 <7995366-n2no1@users.noreply.gitlab.com>
Date: Tue, 6 Apr 2021 19:57:57 -0400
Subject: [PATCH 0686/1285] check the form for initial date values if the book
 has none

---
 bookwyrm/templates/book/edit_book.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html
index a9ce651e..8cf6f31c 100644
--- a/bookwyrm/templates/book/edit_book.html
+++ b/bookwyrm/templates/book/edit_book.html
@@ -124,7 +124,7 @@
 
                 <p class="mb-2">
                     <label class="label" for="id_first_published_date">{% trans "First published date:" %}</label>
-                    <input type="date" name="first_published_date" class="input" id="id_first_published_date"{% if book.first_published_date %} value="{{ book.first_published_date|date:'Y-m-d' }}"{% endif %}>
+                    <input type="date" name="first_published_date" class="input" id="id_first_published_date"{% if book.first_published_date %} value="{{ book.first_published_date|date:'Y-m-d' }}"{% elif form.first_published_date.value %} value="{{ form.first_published_date.value }}"{% endif %}>
                 </p>
                 {% for error in form.first_published_date.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
@@ -132,7 +132,7 @@
 
                 <p class="mb-2">
                     <label class="label" for="id_published_date">{% trans "Published date:" %}</label>
-                    <input type="date" name="published_date" class="input" id="id_published_date"{% if book.published_date %} value="{{ book.published_date|date:'Y-m-d' }}"{% endif %}>
+                    <input type="date" name="published_date" class="input" id="id_published_date"{% if book.published_date %} value="{{ book.published_date|date:'Y-m-d' }}"{% elif form.published_date.value %} value="{{ form.first_published_date.value }}"{% endif %}>
                 </p>
                 {% for error in form.published_date.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>

From 82c2f2eeb1b0d8a9fa1133c2bd1c626214dfa1d0 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 6 Apr 2021 17:46:06 -0700
Subject: [PATCH 0687/1285] Adds more author identifier fields

---
 bookwyrm/connectors/abstract_connector.py     |  8 +--
 bookwyrm/connectors/inventaire.py             | 47 ++++++++++++------
 bookwyrm/connectors/openlibrary.py            | 10 ++--
 .../migrations/0063_auto_20210406_1738.py     | 28 -----------
 .../migrations/0063_auto_20210407_0045.py     | 49 +++++++++++++++++++
 bookwyrm/models/author.py                     |  9 ++++
 bookwyrm/models/book.py                       |  3 ++
 7 files changed, 103 insertions(+), 51 deletions(-)
 delete mode 100644 bookwyrm/migrations/0063_auto_20210406_1738.py
 create mode 100644 bookwyrm/migrations/0063_auto_20210407_0045.py

diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index 8007bb1a..f66cca7f 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -150,11 +150,11 @@ class AbstractConnector(AbstractMinimalConnector):
         load_more_data.delay(self.connector.id, work.id)
         return edition
 
-    def get_book_data(self, remote_id):
+    def get_book_data(self, remote_id):  # pylint: disable=no-self-use
         """ this allows connectors to override the default behavior """
         return get_data(remote_id)
 
-    def get_search_data(self, remote_id):
+    def get_search_data(self, remote_id):  # pylint: disable=no-self-use
         """ this allows connectors to override the default behavior """
         return get_data(remote_id)
 
@@ -293,7 +293,7 @@ class Mapping:
     """ associate a local database field with a field in an external dataset """
 
     def __init__(self, local_field, remote_field=None, formatter=None):
-        noop = lambda x, *_: x
+        noop = lambda x: x
 
         self.local_field = local_field
         self.remote_field = remote_field or local_field
@@ -305,6 +305,6 @@ class Mapping:
         if not value:
             return None
         try:
-            return self.formatter(value, self.remote_field)
+            return self.formatter(value)
         except:  # pylint: disable=bare-except
             return None
diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index 1ff834bf..6eff6508 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -10,32 +10,45 @@ class Connector(AbstractConnector):
     def __init__(self, identifier):
         super().__init__(identifier)
 
-        get_first = lambda a, *args: a[0]
-        get_remote_id_list = lambda a, *_: [self.get_remote_id(v) for v in a]
+        get_first = lambda a: a[0]
+        shared_mappings = [
+            Mapping("id", remote_field="uri", formatter=self.get_remote_id),
+            Mapping("bnfId", remote_field="wdt:P268", formatter=get_first),
+            Mapping("oclcNumber", remote_field="wdt:P5331", formatter=get_first),
+            Mapping("openlibraryKey", remote_field="wdt:P648", formatter=get_first),
+        ]
         self.book_mappings = [
             Mapping("title", remote_field="wdt:P1476", formatter=get_first),
             Mapping("subtitle", remote_field="wdt:P1680", formatter=get_first),
-            Mapping("id", remote_field="uri", formatter=self.get_remote_id),
-            # Mapping("authors", remote_field="wdt:P50", formatter=get_remote_id_list),
             Mapping("inventaireId", remote_field="uri"),
             Mapping("cover", remote_field="image", formatter=self.get_cover_url),
             Mapping("isbn13", remote_field="wdt:P212", formatter=get_first),
             Mapping("isbn10", remote_field="wdt:P957", formatter=get_first),
+            Mapping("goodreadsKey", remote_field="wdt:P2969", formatter=get_first),
+            Mapping("librarythingKey", remote_field="wdt:P1085", formatter=get_first),
             # Mapping("languages", remote_field="wdt:P407", formatter=get_language),
             # Mapping("publishers", remote_field="wdt:P123", formatter=resolve_key),
             Mapping("publishedDate", remote_field="wdt:P577", formatter=get_first),
             Mapping("pages", remote_field="wdt:P1104", formatter=get_first),
-            Mapping("goodreadsKey", remote_field="wdt:P2969", formatter=get_first),
-            Mapping("openlibraryKey", remote_field="wdt:P648", formatter=get_first),
             # Mapping("subjectPlaces", remote_field="wdt:P840", formatter=resolve_key),
             # Mapping("subjects", remote_field="wdt:P921", formatter=resolve_key),
-            Mapping("librarythingKey", remote_field="wdt:P1085", formatter=get_first),
-            Mapping("oclcNumber", remote_field="wdt:P5331", formatter=get_first),
             Mapping("asin", remote_field="wdt:P5749", formatter=get_first),
-        ]
-        # TODO: P136: genre, P268 bnf id, P674 characters, P950 bne
+        ] + shared_mappings
+        # TODO: P136: genre, P674 characters, P950 bne
 
-    def get_remote_id(self, value, *_):
+        self.author_mappings = [
+            Mapping("id", remote_field="uri", formatter=self.get_remote_id),
+            Mapping("name", remote_field="label", formatter=get_language_code),
+            Mapping("goodreadsKey", remote_field="wdt:P2963", formatter=get_first),
+            Mapping("isni", remote_field="wdt:P213", formatter=get_first),
+            Mapping("viafId", remote_field="wdt:P214", formatter=get_first),
+            Mapping("gutenberg_id", remote_field="wdt:P1938", formatter=get_first),
+            Mapping("born", remote_field="wdt:P569", formatter=get_first),
+            Mapping("died", remote_field="wdt:P570", formatter=get_first),
+        ] + shared_mappings
+
+
+    def get_remote_id(self, value):
         """ convert an id/uri into a url """
         return "{:s}?action=by-uris&uris={:s}".format(self.books_url, value)
 
@@ -102,7 +115,9 @@ class Connector(AbstractConnector):
         return self.get_book_data(self.get_remote_id(uri))
 
     def get_authors_from_data(self, data):
-        return []
+        authors = data.get("wdt:P50")
+        for author in authors:
+            yield self.get_or_create_author(self.get_remote_id(author))
 
     def expand_book_data(self, book):
         return
@@ -117,11 +132,15 @@ class Connector(AbstractConnector):
         return "%s%s" % (self.covers_url, cover_id)
 
 
-def get_language(wikidata_key, *_):
+def get_language(wikidata_key):
     """ who here speaks "wd:Q150" """
     return wikidata_key  # TODO
 
 
-def resolve_key(wikidata_key, *_):
+def resolve_key(wikidata_key):
     """ cool, it's "wd:Q3156592" now what the heck does that mean """
     return wikidata_key  # TODO
+
+def get_language_code(options, code="en"):
+    """ when there are a bunch of translation but we need a single field """
+    return options.get(code)
diff --git a/bookwyrm/connectors/openlibrary.py b/bookwyrm/connectors/openlibrary.py
index 34357726..466bf1e5 100644
--- a/bookwyrm/connectors/openlibrary.py
+++ b/bookwyrm/connectors/openlibrary.py
@@ -95,7 +95,7 @@ class Connector(AbstractConnector):
             url = "%s%s" % (self.base_url, author_id)
             yield self.get_or_create_author(url)
 
-    def get_cover_url(self, cover_blob, *_, size="L"):
+    def get_cover_url(self, cover_blob, size="L"):
         """ ask openlibrary for the cover """
         if not cover_blob:
             return None
@@ -181,19 +181,19 @@ def ignore_edition(edition_data):
     return True
 
 
-def get_description(description_blob, *_):
+def get_description(description_blob):
     """ descriptions can be a string or a dict """
     if isinstance(description_blob, dict):
         return description_blob.get("value")
     return description_blob
 
 
-def get_openlibrary_key(key, *_):
+def get_openlibrary_key(key):
     """ convert /books/OL27320736M into OL27320736M """
     return key.split("/")[-1]
 
 
-def get_languages(language_blob, *_):
+def get_languages(language_blob):
     """ /language/eng -> English """
     langs = []
     for lang in language_blob:
@@ -201,7 +201,7 @@ def get_languages(language_blob, *_):
     return langs
 
 
-def pick_default_edition(options, *_):
+def pick_default_edition(options):
     """ favor physical copies with covers in english """
     if not options:
         return None
diff --git a/bookwyrm/migrations/0063_auto_20210406_1738.py b/bookwyrm/migrations/0063_auto_20210406_1738.py
deleted file mode 100644
index c9f07b3c..00000000
--- a/bookwyrm/migrations/0063_auto_20210406_1738.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Generated by Django 3.1.6 on 2021-04-06 17:38
-
-import bookwyrm.models.fields
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookwyrm", "0062_auto_20210406_1731"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="author",
-            name="inventaire_id",
-            field=bookwyrm.models.fields.CharField(
-                blank=True, max_length=255, null=True
-            ),
-        ),
-        migrations.AddField(
-            model_name="book",
-            name="inventaire_id",
-            field=bookwyrm.models.fields.CharField(
-                blank=True, max_length=255, null=True
-            ),
-        ),
-    ]
diff --git a/bookwyrm/migrations/0063_auto_20210407_0045.py b/bookwyrm/migrations/0063_auto_20210407_0045.py
new file mode 100644
index 00000000..2543193b
--- /dev/null
+++ b/bookwyrm/migrations/0063_auto_20210407_0045.py
@@ -0,0 +1,49 @@
+# Generated by Django 3.1.6 on 2021-04-07 00:45
+
+import bookwyrm.models.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0062_auto_20210406_1731'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='author',
+            name='bnf_id',
+            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='author',
+            name='gutenberg_id',
+            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='author',
+            name='inventaire_id',
+            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='author',
+            name='isni',
+            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='author',
+            name='viaf_id',
+            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='book',
+            name='bnf_id',
+            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AddField(
+            model_name='book',
+            name='inventaire_id',
+            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+        ),
+    ]
diff --git a/bookwyrm/models/author.py b/bookwyrm/models/author.py
index 4c5fe6c8..f7740b1d 100644
--- a/bookwyrm/models/author.py
+++ b/bookwyrm/models/author.py
@@ -14,6 +14,15 @@ class Author(BookDataModel):
     wikipedia_link = fields.CharField(
         max_length=255, blank=True, null=True, deduplication_field=True
     )
+    isni = fields.CharField(
+        max_length=255, blank=True, null=True, deduplication_field=True
+    )
+    viaf_id = fields.CharField(
+        max_length=255, blank=True, null=True, deduplication_field=True
+    )
+    gutenberg_id = fields.CharField(
+        max_length=255, blank=True, null=True, deduplication_field=True
+    )
     # idk probably other keys would be useful here?
     born = fields.DateTimeField(blank=True, null=True)
     died = fields.DateTimeField(blank=True, null=True)
diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index ccbec9eb..94bbe330 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -28,6 +28,9 @@ class BookDataModel(ObjectMixin, BookWyrmModel):
     goodreads_key = fields.CharField(
         max_length=255, blank=True, null=True, deduplication_field=True
     )
+    bnf_id = fields.CharField(  # Bibliothèque nationale de France
+        max_length=255, blank=True, null=True, deduplication_field=True
+    )
 
     last_edited_by = models.ForeignKey("User", on_delete=models.PROTECT, null=True)
 

From 0941c50c6913d94430d03525396df1b9dca75d3d Mon Sep 17 00:00:00 2001
From: n2no1 <7995366-n2no1@users.noreply.gitlab.com>
Date: Tue, 6 Apr 2021 20:43:37 -0400
Subject: [PATCH 0688/1285] ensure that the book edit confirmation receives
 initial date data as a datetime

---
 bookwyrm/templates/book/edit_book.html | 4 ++--
 bookwyrm/views/books.py                | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html
index 8cf6f31c..0cde8dff 100644
--- a/bookwyrm/templates/book/edit_book.html
+++ b/bookwyrm/templates/book/edit_book.html
@@ -124,7 +124,7 @@
 
                 <p class="mb-2">
                     <label class="label" for="id_first_published_date">{% trans "First published date:" %}</label>
-                    <input type="date" name="first_published_date" class="input" id="id_first_published_date"{% if book.first_published_date %} value="{{ book.first_published_date|date:'Y-m-d' }}"{% elif form.first_published_date.value %} value="{{ form.first_published_date.value }}"{% endif %}>
+                    <input type="date" name="first_published_date" class="input" id="id_first_published_date"{% if form.first_published_date.value %} value="{{ form.first_published_date.value|date:'Y-m-d' }}"{% endif %}>
                 </p>
                 {% for error in form.first_published_date.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
@@ -132,7 +132,7 @@
 
                 <p class="mb-2">
                     <label class="label" for="id_published_date">{% trans "Published date:" %}</label>
-                    <input type="date" name="published_date" class="input" id="id_published_date"{% if book.published_date %} value="{{ book.published_date|date:'Y-m-d' }}"{% elif form.published_date.value %} value="{{ form.first_published_date.value }}"{% endif %}>
+                    <input type="date" name="published_date" class="input" id="id_published_date"{% if form.published_date.value %} value="{{ form.published_date.value|date:'Y-m-d'}}"{% endif %}>
                 </p>
                 {% for error in form.published_date.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 58886cad..e982a7d3 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -1,4 +1,5 @@
 """ the good stuff! the books! """
+from datetime import datetime
 from uuid import uuid4
 
 from django.contrib.auth.decorators import login_required, permission_required
@@ -172,6 +173,12 @@ class EditBook(View):
             data["confirm_mode"] = True
             # this isn't preserved because it isn't part of the form obj
             data["remove_authors"] = request.POST.getlist("remove_authors")
+            # we have to make sure the dates are passed in as datetime, they're currently a string
+            # QueryDicts are immutable, we need to copy
+            formcopy = data["form"].data.copy()
+            formcopy["first_published_date"] = datetime.strptime(formcopy["first_published_date"], "%Y-%m-%d")
+            formcopy["published_date"] = datetime.strptime(formcopy["published_date"], "%Y-%m-%d")
+            data["form"].data = formcopy
             return TemplateResponse(request, "book/edit_book.html", data)
 
         remove_authors = request.POST.getlist("remove_authors")

From 4112862924abedb0362649b4592405b99837371c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 6 Apr 2021 18:00:54 -0700
Subject: [PATCH 0689/1285] Fixes search data and new activitypub fields

---
 bookwyrm/activitypub/book.py              | 26 +++++++++++++----------
 bookwyrm/connectors/abstract_connector.py |  8 +++----
 bookwyrm/connectors/inventaire.py         |  7 +++---
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/bookwyrm/activitypub/book.py b/bookwyrm/activitypub/book.py
index 7a427927..17e5b686 100644
--- a/bookwyrm/activitypub/book.py
+++ b/bookwyrm/activitypub/book.py
@@ -7,7 +7,17 @@ from .image import Image
 
 
 @dataclass(init=False)
-class Book(ActivityObject):
+class BookData(ActivityObject):
+    """ shared fields for all book data and authors"""
+    openlibraryKey: str = None
+    inventaireId: str = None
+    librarythingKey: str = None
+    goodreadsKey: str = None
+    bnfId: str = None
+
+
+@dataclass(init=False)
+class Book(BookData):
     """ serializes an edition or work, abstract """
 
     title: str
@@ -24,11 +34,6 @@ class Book(ActivityObject):
     firstPublishedDate: str = ""
     publishedDate: str = ""
 
-    openlibraryKey: str = None
-    inventaireId: str = None
-    librarythingKey: str = None
-    goodreadsKey: str = None
-
     cover: Image = None
     type: str = "Book"
 
@@ -61,17 +66,16 @@ class Work(Book):
 
 
 @dataclass(init=False)
-class Author(ActivityObject):
+class Author(BookData):
     """ author of a book """
 
     name: str
+    isni: str = None
+    viafId: str = None
+    gutenbergId: str = None
     born: str = None
     died: str = None
     aliases: List[str] = field(default_factory=lambda: [])
     bio: str = ""
-    openlibraryKey: str = None
-    inventaireId: str = None
-    librarythingKey: str = None
-    goodreadsKey: str = None
     wikipediaLink: str = ""
     type: str = "Author"
diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index f66cca7f..43cd6aad 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -68,6 +68,10 @@ class AbstractMinimalConnector(ABC):
             results.append(self.format_isbn_search_result(doc))
         return results
 
+    def get_search_data(self, remote_id, **kwargs):  # pylint: disable=no-self-use
+        """ this allows connectors to override the default behavior """
+        return get_data(remote_id, **kwargs)
+
     @abstractmethod
     def get_or_create_book(self, remote_id):
         """ pull up a book record by whatever means possible """
@@ -154,10 +158,6 @@ class AbstractConnector(AbstractMinimalConnector):
         """ this allows connectors to override the default behavior """
         return get_data(remote_id)
 
-    def get_search_data(self, remote_id):  # pylint: disable=no-self-use
-        """ this allows connectors to override the default behavior """
-        return get_data(remote_id)
-
     def create_edition_from_data(self, work, edition_data):
         """ if we already have the work, we're ready """
         mapped_data = dict_from_mappings(edition_data, self.book_mappings)
diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index 6eff6508..a16bb0fd 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -14,7 +14,6 @@ class Connector(AbstractConnector):
         shared_mappings = [
             Mapping("id", remote_field="uri", formatter=self.get_remote_id),
             Mapping("bnfId", remote_field="wdt:P268", formatter=get_first),
-            Mapping("oclcNumber", remote_field="wdt:P5331", formatter=get_first),
             Mapping("openlibraryKey", remote_field="wdt:P648", formatter=get_first),
         ]
         self.book_mappings = [
@@ -24,6 +23,7 @@ class Connector(AbstractConnector):
             Mapping("cover", remote_field="image", formatter=self.get_cover_url),
             Mapping("isbn13", remote_field="wdt:P212", formatter=get_first),
             Mapping("isbn10", remote_field="wdt:P957", formatter=get_first),
+            Mapping("oclcNumber", remote_field="wdt:P5331", formatter=get_first),
             Mapping("goodreadsKey", remote_field="wdt:P2969", formatter=get_first),
             Mapping("librarythingKey", remote_field="wdt:P1085", formatter=get_first),
             # Mapping("languages", remote_field="wdt:P407", formatter=get_language),
@@ -38,7 +38,7 @@ class Connector(AbstractConnector):
 
         self.author_mappings = [
             Mapping("id", remote_field="uri", formatter=self.get_remote_id),
-            Mapping("name", remote_field="label", formatter=get_language_code),
+            Mapping("name", remote_field="labels", formatter=get_language_code),
             Mapping("goodreadsKey", remote_field="wdt:P2963", formatter=get_first),
             Mapping("isni", remote_field="wdt:P213", formatter=get_first),
             Mapping("viafId", remote_field="wdt:P214", formatter=get_first),
@@ -62,8 +62,7 @@ class Connector(AbstractConnector):
         # flatten the data so that images, uri, and claims are on the same level
         return {
             **data.get("claims"),
-            "uri": data.get("uri"),
-            "image": data.get("image"),
+            **{k: data.get(k) for k in ["uri", "image", "labels"]},
         }
 
     def parse_search_data(self, data):

From 51e16fba97b459eb110294628653db298aa8489c Mon Sep 17 00:00:00 2001
From: n2no1 <7995366-n2no1@users.noreply.gitlab.com>
Date: Tue, 6 Apr 2021 20:49:19 -0400
Subject: [PATCH 0690/1285] run black, add a try/catch around the formcopy fix

---
 bookwyrm/views/books.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index e982a7d3..02f61ea7 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -176,8 +176,18 @@ class EditBook(View):
             # we have to make sure the dates are passed in as datetime, they're currently a string
             # QueryDicts are immutable, we need to copy
             formcopy = data["form"].data.copy()
-            formcopy["first_published_date"] = datetime.strptime(formcopy["first_published_date"], "%Y-%m-%d")
-            formcopy["published_date"] = datetime.strptime(formcopy["published_date"], "%Y-%m-%d")
+            try:
+                formcopy["first_published_date"] = datetime.strptime(
+                    formcopy["first_published_date"], "%Y-%m-%d"
+                )
+            except MultiValueDictKeyError:
+                pass
+            try:
+                formcopy["published_date"] = datetime.strptime(
+                    formcopy["published_date"], "%Y-%m-%d"
+                )
+            except MultiValueDictKeyError:
+                pass
             data["form"].data = formcopy
             return TemplateResponse(request, "book/edit_book.html", data)
 

From f21aca1211a10b9efc66469c4bb8bad023bf7da0 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 6 Apr 2021 18:10:42 -0700
Subject: [PATCH 0691/1285] Load remote keys

---
 bookwyrm/connectors/inventaire.py | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index a16bb0fd..4be0dd5c 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -26,12 +26,14 @@ class Connector(AbstractConnector):
             Mapping("oclcNumber", remote_field="wdt:P5331", formatter=get_first),
             Mapping("goodreadsKey", remote_field="wdt:P2969", formatter=get_first),
             Mapping("librarythingKey", remote_field="wdt:P1085", formatter=get_first),
-            # Mapping("languages", remote_field="wdt:P407", formatter=get_language),
-            # Mapping("publishers", remote_field="wdt:P123", formatter=resolve_key),
+            Mapping("languages", remote_field="wdt:P407", formatter=self.resolve_keys),
+            Mapping("publishers", remote_field="wdt:P123", formatter=self.resolve_keys),
             Mapping("publishedDate", remote_field="wdt:P577", formatter=get_first),
             Mapping("pages", remote_field="wdt:P1104", formatter=get_first),
-            # Mapping("subjectPlaces", remote_field="wdt:P840", formatter=resolve_key),
-            # Mapping("subjects", remote_field="wdt:P921", formatter=resolve_key),
+            Mapping(
+                "subjectPlaces", remote_field="wdt:P840", formatter=self.resolve_keys
+            ),
+            Mapping("subjects", remote_field="wdt:P921", formatter=self.resolve_keys),
             Mapping("asin", remote_field="wdt:P5749", formatter=get_first),
         ] + shared_mappings
         # TODO: P136: genre, P674 characters, P950 bne
@@ -130,15 +132,17 @@ class Connector(AbstractConnector):
             return None
         return "%s%s" % (self.covers_url, cover_id)
 
+    def resolve_keys(self, keys):
+        """ cool, it's "wd:Q3156592" now what the heck does that mean """
+        results = []
+        for uri in keys:
+            try:
+                data = self.get_book_data(self.get_remote_id(uri))
+            except ConnectorException:
+                continue
+            results.append(get_language_code(data.get("labels")))
+        return results
 
-def get_language(wikidata_key):
-    """ who here speaks "wd:Q150" """
-    return wikidata_key  # TODO
-
-
-def resolve_key(wikidata_key):
-    """ cool, it's "wd:Q3156592" now what the heck does that mean """
-    return wikidata_key  # TODO
 
 def get_language_code(options, code="en"):
     """ when there are a bunch of translation but we need a single field """

From ac27111f0555fbd96ec95503d5434b05be53ee32 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 6 Apr 2021 18:13:33 -0700
Subject: [PATCH 0692/1285] Adds inventaire to default connector list

---
 bookwyrm/management/commands/initdb.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/bookwyrm/management/commands/initdb.py b/bookwyrm/management/commands/initdb.py
index d6101c87..45c81089 100644
--- a/bookwyrm/management/commands/initdb.py
+++ b/bookwyrm/management/commands/initdb.py
@@ -94,6 +94,18 @@ def init_connectors():
         priority=2,
     )
 
+    Connector.objects.create(
+        identifier="inventaire.io",
+        name="Inventaire",
+        connector_file="inventaire",
+        base_url="https://inventaire.io/entity/",
+        books_url="https://inventaire.io/api/entities",
+        covers_url="https://inventaire.io",
+        search_url="https://inventaire.io/api/search?types=works&types=works&search=",
+        isbn_search_url="https://inventaire.io/api/entities?action=by-uris&uris=isbn%3A",
+        priority=3,
+    )
+
     Connector.objects.create(
         identifier="openlibrary.org",
         name="OpenLibrary",

From fec3d63e4623f7a47526d1648cd0232f1ef6c531 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 6 Apr 2021 18:17:33 -0700
Subject: [PATCH 0693/1285] Python formatting

---
 bookwyrm/activitypub/book.py                  |  1 +
 bookwyrm/connectors/inventaire.py             |  1 -
 .../migrations/0063_auto_20210407_0045.py     | 58 ++++++++++++-------
 3 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/bookwyrm/activitypub/book.py b/bookwyrm/activitypub/book.py
index 17e5b686..ca4d69da 100644
--- a/bookwyrm/activitypub/book.py
+++ b/bookwyrm/activitypub/book.py
@@ -9,6 +9,7 @@ from .image import Image
 @dataclass(init=False)
 class BookData(ActivityObject):
     """ shared fields for all book data and authors"""
+
     openlibraryKey: str = None
     inventaireId: str = None
     librarythingKey: str = None
diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index 4be0dd5c..2a4569b3 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -49,7 +49,6 @@ class Connector(AbstractConnector):
             Mapping("died", remote_field="wdt:P570", formatter=get_first),
         ] + shared_mappings
 
-
     def get_remote_id(self, value):
         """ convert an id/uri into a url """
         return "{:s}?action=by-uris&uris={:s}".format(self.books_url, value)
diff --git a/bookwyrm/migrations/0063_auto_20210407_0045.py b/bookwyrm/migrations/0063_auto_20210407_0045.py
index 2543193b..cd87dd97 100644
--- a/bookwyrm/migrations/0063_auto_20210407_0045.py
+++ b/bookwyrm/migrations/0063_auto_20210407_0045.py
@@ -7,43 +7,57 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0062_auto_20210406_1731'),
+        ("bookwyrm", "0062_auto_20210406_1731"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='author',
-            name='bnf_id',
-            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+            model_name="author",
+            name="bnf_id",
+            field=bookwyrm.models.fields.CharField(
+                blank=True, max_length=255, null=True
+            ),
         ),
         migrations.AddField(
-            model_name='author',
-            name='gutenberg_id',
-            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+            model_name="author",
+            name="gutenberg_id",
+            field=bookwyrm.models.fields.CharField(
+                blank=True, max_length=255, null=True
+            ),
         ),
         migrations.AddField(
-            model_name='author',
-            name='inventaire_id',
-            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+            model_name="author",
+            name="inventaire_id",
+            field=bookwyrm.models.fields.CharField(
+                blank=True, max_length=255, null=True
+            ),
         ),
         migrations.AddField(
-            model_name='author',
-            name='isni',
-            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+            model_name="author",
+            name="isni",
+            field=bookwyrm.models.fields.CharField(
+                blank=True, max_length=255, null=True
+            ),
         ),
         migrations.AddField(
-            model_name='author',
-            name='viaf_id',
-            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+            model_name="author",
+            name="viaf_id",
+            field=bookwyrm.models.fields.CharField(
+                blank=True, max_length=255, null=True
+            ),
         ),
         migrations.AddField(
-            model_name='book',
-            name='bnf_id',
-            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+            model_name="book",
+            name="bnf_id",
+            field=bookwyrm.models.fields.CharField(
+                blank=True, max_length=255, null=True
+            ),
         ),
         migrations.AddField(
-            model_name='book',
-            name='inventaire_id',
-            field=bookwyrm.models.fields.CharField(blank=True, max_length=255, null=True),
+            model_name="book",
+            name="inventaire_id",
+            field=bookwyrm.models.fields.CharField(
+                blank=True, max_length=255, null=True
+            ),
         ),
     ]

From 29e7659b76ec094f9bb3ff8659e97cdf01346080 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 6 Apr 2021 18:34:55 -0700
Subject: [PATCH 0694/1285] Expand inventaire book data

---
 bookwyrm/connectors/inventaire.py | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index 2a4569b3..465268b2 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -1,4 +1,5 @@
 """ inventaire data connector """
+from bookwyrm import models
 from .abstract_connector import AbstractConnector, SearchResult, Mapping
 from .abstract_connector import get_data
 from .connector_manager import ConnectorException
@@ -95,12 +96,15 @@ class Connector(AbstractConnector):
     def is_work_data(self, data):
         return data.get("type") == "work"
 
-    def get_edition_from_work_data(self, data):
-        value = data.get("uri")
+    def load_edition_data(self, work_uri):
+        """ get a list of editions for a work """
         url = "{:s}?action=reverse-claims&property=P629&value={:s}".format(
-            self.books_url, value
+            self.books_url, work_uri
         )
-        data = get_data(url)
+        return get_data(url)
+
+    def get_edition_from_work_data(self, data):
+        data = self.load_edition_data(data.get("uri"))
         try:
             uri = data["uris"][0]
         except KeyError:
@@ -120,7 +124,20 @@ class Connector(AbstractConnector):
             yield self.get_or_create_author(self.get_remote_id(author))
 
     def expand_book_data(self, book):
-        return
+        work = book
+        # go from the edition to the work, if necessary
+        if isinstance(book, models.Edition):
+            work = book.parent_work
+
+        try:
+            edition_options = self.load_edition_data(work.inventaire_id)
+        except ConnectorException:
+            # who knows, man
+            return
+
+        for edition_uri in edition_options.get("uris"):
+            remote_id = self.get_remote_id(edition_uri)
+            self.get_or_create_book(remote_id)
 
     def get_cover_url(self, cover_blob, *_):
         """format the relative cover url into an absolute one:

From 31146b00e47052e450eb93ca2559aaa33cfbdc5c Mon Sep 17 00:00:00 2001
From: n2no1 <7995366-n2no1@users.noreply.gitlab.com>
Date: Tue, 6 Apr 2021 21:40:11 -0400
Subject: [PATCH 0695/1285] import MultiValueDictKeyError to catch with
 formcopy

---
 bookwyrm/views/books.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 02f61ea7..2e48942b 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -11,6 +11,7 @@ from django.db.models import Avg, Q
 from django.http import HttpResponseBadRequest, HttpResponseNotFound
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
+from django.utils.datastructures import MultiValueDictKeyError
 from django.utils.decorators import method_decorator
 from django.views import View
 from django.views.decorators.http import require_POST

From 922428cab760ba324619eb64dd2a89bfe352d15c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 6 Apr 2021 18:51:43 -0700
Subject: [PATCH 0696/1285] Fixes error in reverse path

---
 bookwyrm/connectors/inventaire.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index 465268b2..594fe810 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -98,7 +98,7 @@ class Connector(AbstractConnector):
 
     def load_edition_data(self, work_uri):
         """ get a list of editions for a work """
-        url = "{:s}?action=reverse-claims&property=P629&value={:s}".format(
+        url = "{:s}?action=reverse-claims&property=wdt:P629&value={:s}".format(
             self.books_url, work_uri
         )
         return get_data(url)
@@ -119,7 +119,7 @@ class Connector(AbstractConnector):
         return self.get_book_data(self.get_remote_id(uri))
 
     def get_authors_from_data(self, data):
-        authors = data.get("wdt:P50")
+        authors = data.get("wdt:P50", [])
         for author in authors:
             yield self.get_or_create_author(self.get_remote_id(author))
 

From 1c05107f2bf322505b1962fc245de1071da15d0f Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Wed, 7 Apr 2021 07:53:30 +0200
Subject: [PATCH 0697/1285] [assets] Tweak comments.

---
 bookwyrm/static/js/bookwyrm.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index b3959e30..f36df109 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -177,8 +177,6 @@ let BookWyrm = new class {
     /**
      * Show or hide menus.
      *
-     * @note This function seems to be redundant and conflicts with toggleAction.
-     *
      * @param  {Event} event
      *
      * @return {undefined}
@@ -222,6 +220,9 @@ let BookWyrm = new class {
     /**
      * Give the focus to an element.
      *
+     * This is useful with modals: the focus needs to go back to the element that
+     * was focused before opening the modal.
+     *
      * @param  {string} nodeId - ID of the DOM node to focus (button, link…)
      *
      * @return {undefined}

From 5d569e89266d4d6b97134e6abc9ecb71986d9b3d Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Wed, 7 Apr 2021 09:24:34 +0200
Subject: [PATCH 0698/1285] [assets] Only update status if the promise is
 successful:

- Use promises in `ajaxPost` and `interact`.
- Add some animations in CSS.
---
 bookwyrm/static/css/bookwyrm.css | 28 ++++++++++++++++++
 bookwyrm/static/js/bookwyrm.js   | 51 ++++++++++++++++++++++++--------
 2 files changed, 67 insertions(+), 12 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index a01aff82..980b4c4a 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -224,3 +224,31 @@ html {
     content: "\e905";
     right: 0;
 }
+
+/** Animations and transitions
+ ******************************************************************************/
+
+@keyframes beating {
+    0% { font-size: 100%; }
+    25% { font-size: 125%; }
+    100% { font-size: 75%; }
+}
+
+@keyframes turning {
+    from { transform: rotateZ(0deg); }
+    to { transform: rotateZ(360deg); }
+}
+
+.is-processing .icon-heart::before {
+    animation: beating 0.5s infinite alternate ease-in-out;
+}
+
+.is-processing .icon-boost::before {
+    animation: turning 0.5s infinite ease-in-out;
+}
+
+@media (prefers-reduced-motion: reduce) {
+    .is-processing .icon::before {
+        animation-duration: 1.5s;
+    }
+}
diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index f36df109..0531b4d7 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -241,8 +241,6 @@ let BookWyrm = new class {
      * Make a request and update the UI accordingly.
      * This function is used for boosts and favourites.
      *
-     * @todo Only update status if the promise is successful.
-     *
      * @param  {Event} event
      *
      * @return {undefined}
@@ -250,15 +248,44 @@ let BookWyrm = new class {
     interact(event) {
         event.preventDefault();
 
-        this.ajaxPost(event.target);
+        const bookwyrm = this;
 
-        // @todo This probably should be done with IDs.
-        document.querySelectorAll(`.${event.target.dataset.id}`)
-            .forEach(node => this.addRemoveClass(
-                node,
-                'hidden',
-                node.className.indexOf('hidden') == -1
-            ));
+        let allTriggers = document.querySelectorAll(`.${event.target.dataset.id}`);
+
+        // Change icon to show ongoing activity on the current UI.
+        allTriggers.forEach(node => bookwyrm.addRemoveClass(
+            node,
+            'is-processing',
+            true
+        ));
+
+        this.ajaxPost(event.target)
+            .finally(() => {
+                // Change icon to remove ongoing activity on the current UI.
+                allTriggers.forEach(node => bookwyrm.addRemoveClass(
+                    node,
+                    'is-processing',
+                    false
+                ));
+            })
+            .then(function() {
+                allTriggers.forEach(node => bookwyrm.addRemoveClass(
+                    node,
+                    'hidden',
+                    node.className.indexOf('hidden') == -1
+                ));
+            })
+            .catch(error => {
+                // @todo Display a notification in the UI instead.
+                //       For now, the absence of change will be enough.
+                console.warn('Request failed:', error);
+
+                allTriggers.forEach(node => bookwyrm.addRemoveClass(
+                    node,
+                    'has-error',
+                    node.className.indexOf('hidden') == -1
+                ));
+            });
     }
 
     /**
@@ -266,10 +293,10 @@ let BookWyrm = new class {
      *
      * @param  {object} form - Form to be submitted
      *
-     * @return {undefined}
+     * @return {Promise}
      */
     ajaxPost(form) {
-        fetch(form.action, {
+        return fetch(form.action, {
             method : "POST",
             body: new FormData(form)
         });

From 54805afb51a50bef8c1293652512fac41d000fc8 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Wed, 7 Apr 2021 10:37:11 +0200
Subject: [PATCH 0699/1285] [assets] Tweak JSDoc.

---
 bookwyrm/static/js/bookwyrm.js     | 16 ++--------------
 bookwyrm/static/js/check_all.js    | 24 +++++++++++++++++-------
 bookwyrm/static/js/localstorage.js |  2 --
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index 0531b4d7..dacb8091 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -57,7 +57,6 @@ let BookWyrm = new class {
      * Go back in browser history.
      *
      * @param  {Event} event
-     *
      * @return {undefined}
      */
     back(event) {
@@ -67,10 +66,10 @@ let BookWyrm = new class {
 
     /**
      * Update a counter with recurring requests to the API
+     * The delay is slightly randomized and increased on each cycle.
      *
      * @param  {Object} counter - DOM node
      * @param  {int}    delay   - frequency for polling in ms
-     *
      * @return {undefined}
      */
     polling(counter, delay) {
@@ -93,7 +92,6 @@ let BookWyrm = new class {
      *
      * @param  {object} counter - DOM node
      * @param  {object} data    - json formatted response from a fetch
-     *
      * @return {undefined}
      */
     updateCountElement(counter, data) {
@@ -110,7 +108,6 @@ let BookWyrm = new class {
      * Toggle form.
      *
      * @param  {Event} event
-     *
      * @return {undefined}
      */
     revealForm(event) {
@@ -124,7 +121,6 @@ let BookWyrm = new class {
      * Execute actions on targets based on triggers.
      *
      * @param  {Event} event
-     *
      * @return {undefined}
      */
     toggleAction(event) {
@@ -178,7 +174,6 @@ let BookWyrm = new class {
      * Show or hide menus.
      *
      * @param  {Event} event
-     *
      * @return {undefined}
      */
     toggleMenu(trigger, targetId) {
@@ -198,7 +193,6 @@ let BookWyrm = new class {
      *
      * @param  {object}  container - DOM node
      * @param  {boolean} pressed   - Is the trigger pressed?
-     *
      * @return {undefined}
      */
     toggleContainer(container, pressed) {
@@ -210,7 +204,6 @@ let BookWyrm = new class {
      *
      * @param  {object}  checkbox - DOM node
      * @param  {boolean} pressed  - Is the trigger pressed?
-     *
      * @return {undefined}
      */
     toggleCheckbox(checkbox, pressed) {
@@ -219,12 +212,9 @@ let BookWyrm = new class {
 
     /**
      * Give the focus to an element.
-     *
-     * This is useful with modals: the focus needs to go back to the element that
-     * was focused before opening the modal.
+     * Only move the focus based on user interactions.
      *
      * @param  {string} nodeId - ID of the DOM node to focus (button, link…)
-     *
      * @return {undefined}
      */
     toggleFocus(nodeId) {
@@ -242,7 +232,6 @@ let BookWyrm = new class {
      * This function is used for boosts and favourites.
      *
      * @param  {Event} event
-     *
      * @return {undefined}
      */
     interact(event) {
@@ -292,7 +281,6 @@ let BookWyrm = new class {
      * Submit a form using POST.
      *
      * @param  {object} form - Form to be submitted
-     *
      * @return {Promise}
      */
     ajaxPost(form) {
diff --git a/bookwyrm/static/js/check_all.js b/bookwyrm/static/js/check_all.js
index de067f78..fd29f2cd 100644
--- a/bookwyrm/static/js/check_all.js
+++ b/bookwyrm/static/js/check_all.js
@@ -1,13 +1,23 @@
-/**
- * Toggle all descendant checkboxes of a target.
- *
- * Use `data-target="ID_OF_TARGET"` on the node on which the event is listened
- * to (checkbox, button, link…), where_ID_OF_TARGET_ should be the ID of an
- * ancestor for the checkboxes.
- */
+
 (function() {
     'use strict';
 
+    /**
+     * Toggle all descendant checkboxes of a target.
+     *
+     * Use `data-target="ID_OF_TARGET"` on the node on which the event is listened
+     * to (checkbox, button, link…), where_ID_OF_TARGET_ should be the ID of an
+     * ancestor for the checkboxes.
+     *
+     * @example
+     * <input
+     *     type="checkbox"
+     *     data-action="toggle-all"
+     *     data-target="failed-imports"
+     * >
+     * @param  {Event} event
+     * @return {undefined}
+     */
     function toggleAllCheckboxes(event) {
         const mainCheckbox = event.target;
 
diff --git a/bookwyrm/static/js/localstorage.js b/bookwyrm/static/js/localstorage.js
index eccac347..e724cb01 100644
--- a/bookwyrm/static/js/localstorage.js
+++ b/bookwyrm/static/js/localstorage.js
@@ -14,7 +14,6 @@ let LocalStorageTools = new class {
      * Update localStorage, then display content based on keys in localStorage.
      *
      * @param  {Event} event
-     *
      * @return {undefined}
      */
     updateDisplay(event) {
@@ -32,7 +31,6 @@ let LocalStorageTools = new class {
      * Toggle display of a DOM node based on its value in the localStorage.
      *
      * @param {object} node - DOM node to toggle.
-     *
      * @return {undefined}
      */
     setDisplay(node) {

From f2a2b410a116a82be0803515d35839fc8ff36adf Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Wed, 7 Apr 2021 10:49:52 +0200
Subject: [PATCH 0700/1285] [assets] Add comment to mention replacing font
 icons with SVG.

---
 bookwyrm/static/css/vendor/icons.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bookwyrm/static/css/vendor/icons.css b/bookwyrm/static/css/vendor/icons.css
index c6dbad1d..c78af145 100644
--- a/bookwyrm/static/css/vendor/icons.css
+++ b/bookwyrm/static/css/vendor/icons.css
@@ -1,3 +1,6 @@
+
+/** @todo Replace icons with SVG symbols.
+    @see https://www.youtube.com/watch?v=9xXBYcWgCHA */
 @font-face {
     font-family: 'icomoon';
     src:  url('../fonts/icomoon.eot?n5x55');

From 4cea7be77155cc549f3ba47402a2f83b91092c37 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 7 Apr 2021 07:46:15 -0700
Subject: [PATCH 0701/1285] Gets black back on stable tag

---
 .github/workflows/black.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml
index 5fc849d6..afa9cf2b 100644
--- a/.github/workflows/black.yml
+++ b/.github/workflows/black.yml
@@ -8,6 +8,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
-      - uses: psf/black@20.8b1
+      - uses: psf/black@stable
         with:
           args: ". --check -l 80 -S"

From f11d64f984c23d0c867b9f5c1e18544fb12aeafc Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 7 Apr 2021 08:09:47 -0700
Subject: [PATCH 0702/1285] Handle all connector errors in search

---
 bookwyrm/connectors/connector_manager.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/connectors/connector_manager.py b/bookwyrm/connectors/connector_manager.py
index caf6bcbe..bf3c749d 100644
--- a/bookwyrm/connectors/connector_manager.py
+++ b/bookwyrm/connectors/connector_manager.py
@@ -1,5 +1,6 @@
 """ interface with whatever connectors the app has """
 import importlib
+import logging
 import re
 from urllib.parse import urlparse
 
@@ -11,6 +12,8 @@ from requests import HTTPError
 from bookwyrm import models
 from bookwyrm.tasks import app
 
+logger = logging.getLogger(__name__)
+
 
 class ConnectorException(HTTPError):
     """ when the connector can't do what was asked """
@@ -44,7 +47,9 @@ def search(query, min_confidence=0.1):
         if result_set in (None, []):
             try:
                 result_set = connector.search(query, min_confidence=min_confidence)
-            except (HTTPError, ConnectorException):
+            except Exception as e:  # pylint: disable=broad-except
+                # we don't want *any* error to crash the whole search page
+                logger.exception(e)
                 continue
 
         # if the search results look the same, ignore them

From f77088b9646de170efd6ace8ba3d7d97bb702a9c Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Wed, 7 Apr 2021 17:31:00 +0200
Subject: [PATCH 0703/1285] [assets] Remove redundant class already provided by
 bulma:

Replace all classes `hidden` with `is-hidden` in templates, CSS and JS.
---
 bookwyrm/static/css/bookwyrm.css              | 28 +++++++++----------
 bookwyrm/static/js/bookwyrm.js                | 16 +++++------
 bookwyrm/static/js/localstorage.js            |  2 +-
 bookwyrm/templates/book/book.html             |  4 +--
 .../templates/components/inline_form.html     |  2 +-
 bookwyrm/templates/components/modal.html      |  2 +-
 bookwyrm/templates/feed/feed.html             |  2 +-
 bookwyrm/templates/goal.html                  |  2 +-
 bookwyrm/templates/layout.html                |  2 +-
 bookwyrm/templates/search_results.html        |  2 +-
 bookwyrm/templates/snippets/boost_button.html |  4 +--
 .../snippets/content_warning_field.html       |  2 +-
 .../snippets/create_status_form.html          |  2 +-
 bookwyrm/templates/snippets/fav_button.html   |  4 +--
 .../snippets/filters_panel/filters_panel.html |  2 +-
 .../templates/snippets/follow_button.html     |  4 +--
 bookwyrm/templates/snippets/rate_action.html  |  2 +-
 bookwyrm/templates/snippets/readthrough.html  |  4 +--
 .../shelve_button/shelve_button_options.html  |  2 +-
 .../snippets/status/status_body.html          |  2 +-
 .../snippets/status/status_content.html       |  2 +-
 bookwyrm/templates/snippets/trimmed_text.html |  2 +-
 bookwyrm/templates/user/lists.html            |  2 +-
 23 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 980b4c4a..59961cac 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -25,16 +25,6 @@ html {
     min-width: 75% !important;
 }
 
-/* --- "disabled" for non-buttons --- */
-.is-disabled {
-    background-color: #dbdbdb;
-    border-color: #dbdbdb;
-    box-shadow: none;
-    color: #7a7a7a;
-    opacity: 0.5;
-    cursor: not-allowed;
-}
-
 /* --- SHELVING --- */
 
 /** @todo Replace icons with SVG symbols.
@@ -57,10 +47,6 @@ html {
     display: none;
 }
 
-.hidden {
-    display: none !important;
-}
-
 .hidden.transition-y,
 .hidden.transition-x {
     display: block !important;
@@ -252,3 +238,17 @@ html {
         animation-duration: 1.5s;
     }
 }
+
+/* States
+ ******************************************************************************/
+
+/* "disabled" for non-buttons */
+
+.is-disabled {
+    background-color: #dbdbdb;
+    border-color: #dbdbdb;
+    box-shadow: none;
+    color: #7a7a7a;
+    opacity: 0.5;
+    cursor: not-allowed;
+}
diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index dacb8091..0393b4cc 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -99,7 +99,7 @@ let BookWyrm = new class {
         const count = data.count;
 
         if (count != currentCount) {
-            this.addRemoveClass(counter.closest('[data-poll-wrapper]'), 'hidden', count < 1);
+            this.addRemoveClass(counter.closest('[data-poll-wrapper]'), 'is-hidden', count < 1);
             counter.innerText = count;
         }
     }
@@ -112,9 +112,9 @@ let BookWyrm = new class {
      */
     revealForm(event) {
         let trigger = event.currentTarget;
-        let hidden = trigger.closest('.hidden-form').querySelectorAll('.hidden')[0];
+        let hidden = trigger.closest('.hidden-form').querySelectorAll('.is-hidden')[0];
 
-        this.addRemoveClass(hidden, 'hidden', !hidden);
+        this.addRemoveClass(hidden, 'is-hidden', !hidden);
     }
 
     /**
@@ -139,7 +139,7 @@ let BookWyrm = new class {
         if (targetId && ! trigger.classList.contains('pulldown-menu')) {
             let target = document.getElementById(targetId);
 
-            this.addRemoveClass(target, 'hidden', !pressed);
+            this.addRemoveClass(target, 'is-hidden', !pressed);
             this.addRemoveClass(target, 'is-active', pressed);
         }
 
@@ -196,7 +196,7 @@ let BookWyrm = new class {
      * @return {undefined}
      */
     toggleContainer(container, pressed) {
-        this.addRemoveClass(container, 'hidden', pressed);
+        this.addRemoveClass(container, 'is-hidden', pressed);
     }
 
     /**
@@ -260,8 +260,8 @@ let BookWyrm = new class {
             .then(function() {
                 allTriggers.forEach(node => bookwyrm.addRemoveClass(
                     node,
-                    'hidden',
-                    node.className.indexOf('hidden') == -1
+                    'is-hidden',
+                    node.className.indexOf('is-hidden') == -1
                 ));
             })
             .catch(error => {
@@ -272,7 +272,7 @@ let BookWyrm = new class {
                 allTriggers.forEach(node => bookwyrm.addRemoveClass(
                     node,
                     'has-error',
-                    node.className.indexOf('hidden') == -1
+                    node.className.indexOf('is-hidden') == -1
                 ));
             });
     }
diff --git a/bookwyrm/static/js/localstorage.js b/bookwyrm/static/js/localstorage.js
index e724cb01..05955779 100644
--- a/bookwyrm/static/js/localstorage.js
+++ b/bookwyrm/static/js/localstorage.js
@@ -38,6 +38,6 @@ let LocalStorageTools = new class {
         let key = node.dataset.hide;
         let value = window.localStorage.getItem(key);
 
-        BookWyrm.addRemoveClass(node, 'hidden', value);
+        BookWyrm.addRemoveClass(node, 'is-hidden', value);
     }
 }
diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index a7887c61..9f9e53e7 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -100,7 +100,7 @@
                 {% trans 'Add Description' as button_text %}
                 {% include 'snippets/toggle/open_button.html' with text=button_text controls_text="add-description" controls_uid=book.id focus="id_description" hide_active=True id="hide-description" %}
 
-                <div class="box hidden" id="add-description-{{ book.id }}">
+                <div class="box is-hidden" id="add-description-{{ book.id }}">
                     <form name="add-description" method="POST" action="/add-description/{{ book.id }}">
                         {% csrf_token %}
                         <p class="fields is-grouped">
@@ -150,7 +150,7 @@
                 {% if not readthroughs.exists %}
                 <p>{% trans "You don't have any reading activity for this book." %}</p>
                 {% endif %}
-                <section class="hidden box" id="add-readthrough">
+                <section class="is-hidden box" id="add-readthrough">
                     <form name="add-readthrough" action="/create-readthrough" method="post">
                         {% include 'snippets/readthrough_form.html' with readthrough=None %}
                         <div class="field is-grouped">
diff --git a/bookwyrm/templates/components/inline_form.html b/bookwyrm/templates/components/inline_form.html
index 40915a92..0b2c1300 100644
--- a/bookwyrm/templates/components/inline_form.html
+++ b/bookwyrm/templates/components/inline_form.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-<section class="card hidden {{ class }}" id="{{ controls_text }}{% if controls_uid %}-{{ controls_uid }}{% endif %}">
+<section class="card is-hidden {{ class }}" id="{{ controls_text }}{% if controls_uid %}-{{ controls_uid }}{% endif %}">
     <header class="card-header has-background-white-ter">
         <h2 class="card-header-title" tabindex="0" id="{{ controls_text }}{% if controls_uid %}-{{ controls_uid }}{% endif %}-header">
             {% block header %}{% endblock %}
diff --git a/bookwyrm/templates/components/modal.html b/bookwyrm/templates/components/modal.html
index 3c366954..0a05f951 100644
--- a/bookwyrm/templates/components/modal.html
+++ b/bookwyrm/templates/components/modal.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 <div
     role="dialog"
-    class="modal hidden"
+    class="modal is-hidden"
     id="{{ controls_text }}-{{ controls_uid }}"
     aria-labelledby="modal-card-title-{{ controls_text }}-{{ controls_uid }}"
     aria-modal="true"
diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html
index e49b4c13..f106b4ce 100644
--- a/bookwyrm/templates/feed/feed.html
+++ b/bookwyrm/templates/feed/feed.html
@@ -29,7 +29,7 @@
 
 {# announcements and system messages #}
 {% if not activities.number > 1 %}
-<a href="{{ request.path }}" class="transition-y hidden notification is-primary is-block" data-poll-wrapper>
+<a href="{{ request.path }}" class="transition-y is-hidden notification is-primary is-block" data-poll-wrapper>
     {% blocktrans %}load <span data-poll="stream/{{ tab }}">0</span> unread status(es){% endblocktrans %}
 </a>
 
diff --git a/bookwyrm/templates/goal.html b/bookwyrm/templates/goal.html
index 1e10144f..035eccf8 100644
--- a/bookwyrm/templates/goal.html
+++ b/bookwyrm/templates/goal.html
@@ -20,7 +20,7 @@
     {% if user == request.user %}
     <div class="block">
         {% now 'Y' as year %}
-        <section class="card {% if goal %}hidden{% endif %}" id="show-edit-goal">
+        <section class="card {% if goal %}is-hidden{% endif %}" id="show-edit-goal">
             <header class="card-header">
                 <h2 class="card-header-title has-background-primary has-text-white" tabindex="0" id="edit-form-header">
                     <span class="icon icon-book is-size-3 mr-2" aria-hidden="true"></span> {% blocktrans %}{{ year }} Reading Goal{% endblocktrans %}
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 606b72c7..7dc74d88 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -134,7 +134,7 @@
                             <span class="is-sr-only">{% trans "Notifications" %}</span>
                         </span>
                     </span>
-                    <span class="{% if not request.user|notification_count %}hidden {% endif %}tag is-danger is-medium transition-x" data-poll-wrapper>
+                    <span class="{% if not request.user|notification_count %}is-hidden {% endif %}tag is-danger is-medium transition-x" data-poll-wrapper>
                         <span data-poll="notifications">{{ request.user | notification_count }}</span>
                     </span>
                 </a>
diff --git a/bookwyrm/templates/search_results.html b/bookwyrm/templates/search_results.html
index 6444cc18..4c9c23da 100644
--- a/bookwyrm/templates/search_results.html
+++ b/bookwyrm/templates/search_results.html
@@ -37,7 +37,7 @@
         </div>
         {% endif %}
 
-        <div class="{% if local_results.results %}hidden{% endif %}" id="more-results">
+        <div class="{% if local_results.results %}is-hidden{% endif %}" id="more-results">
             {% for result_set in book_results|slice:"1:" %}
             {% if result_set.results %}
             <section class="block">
diff --git a/bookwyrm/templates/snippets/boost_button.html b/bookwyrm/templates/snippets/boost_button.html
index 3bc1b601..e590c58d 100644
--- a/bookwyrm/templates/snippets/boost_button.html
+++ b/bookwyrm/templates/snippets/boost_button.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% with status.id|uuid as uuid %}
-<form name="boost" action="/boost/{{ status.id }}" method="post" class="interaction boost-{{ status.id }}-{{ uuid }} {% if request.user|boosted:status  %}hidden{% endif %}" data-id="boost-{{ status.id }}-{{ uuid }}">
+<form name="boost" action="/boost/{{ status.id }}" method="post" class="interaction boost-{{ status.id }}-{{ uuid }} {% if request.user|boosted:status  %}is-hidden{% endif %}" data-id="boost-{{ status.id }}-{{ uuid }}">
     {% csrf_token %}
     <button class="button is-small" type="submit" {% if not status.boostable %}disabled{% endif %}>
         <span class="icon icon-boost" title="{% trans 'Boost status' %}">
@@ -10,7 +10,7 @@
         </span>
     </button>
 </form>
-<form name="unboost" action="/unboost/{{ status.id }}" method="post" class="interaction boost-{{ status.id }}-{{ uuid }} active {% if not request.user|boosted:status %}hidden{% endif %}" data-id="boost-{{ status.id }}-{{ uuid }}">
+<form name="unboost" action="/unboost/{{ status.id }}" method="post" class="interaction boost-{{ status.id }}-{{ uuid }} active {% if not request.user|boosted:status %}is-hidden{% endif %}" data-id="boost-{{ status.id }}-{{ uuid }}">
     {% csrf_token %}
     <button class="button is-small is-primary" type="submit">
         <span class="icon icon-boost" title="{% trans 'Un-boost status' %}">
diff --git a/bookwyrm/templates/snippets/content_warning_field.html b/bookwyrm/templates/snippets/content_warning_field.html
index b645a29c..51c2649b 100644
--- a/bookwyrm/templates/snippets/content_warning_field.html
+++ b/bookwyrm/templates/snippets/content_warning_field.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-<div class="control{% if not parent_status.content_warning and not draft.content_warning %} hidden{% endif %}" id="spoilers-{{ uuid }}">
+<div class="control{% if not parent_status.content_warning and not draft.content_warning %} is-hidden{% endif %}" id="spoilers-{{ uuid }}">
     <label class="is-sr-only" for="id_content_warning-{{ uuid }}">{% trans "Spoiler alert:" %}</label>
     <input
         type="text"
diff --git a/bookwyrm/templates/snippets/create_status_form.html b/bookwyrm/templates/snippets/create_status_form.html
index 66579ff8..57e36d96 100644
--- a/bookwyrm/templates/snippets/create_status_form.html
+++ b/bookwyrm/templates/snippets/create_status_form.html
@@ -73,7 +73,7 @@
         {% endif %}
     </div>
     {% endif %}
-    <input type="checkbox" class="hidden" name="sensitive" id="id_show_spoilers-{{ uuid }}" {% if draft.content_warning or status.content_warning %}checked{% endif %} aria-hidden="true">
+    <input type="checkbox" class="is-hidden" name="sensitive" id="id_show_spoilers-{{ uuid }}" {% if draft.content_warning or status.content_warning %}checked{% endif %} aria-hidden="true">
     {# bottom bar #}
     <div class="columns pt-1">
         <div class="field has-addons column">
diff --git a/bookwyrm/templates/snippets/fav_button.html b/bookwyrm/templates/snippets/fav_button.html
index 5d74f655..adb3d033 100644
--- a/bookwyrm/templates/snippets/fav_button.html
+++ b/bookwyrm/templates/snippets/fav_button.html
@@ -1,7 +1,7 @@
 {% load bookwyrm_tags %}
 {% load i18n %}
 {% with status.id|uuid as uuid %}
-<form name="favorite" action="/favorite/{{ status.id }}" method="POST" class="interaction fav-{{ status.id }}-{{ uuid }} {% if request.user|liked:status %}hidden{% endif %}" data-id="fav-{{ status.id }}-{{ uuid }}">
+<form name="favorite" action="/favorite/{{ status.id }}" method="POST" class="interaction fav-{{ status.id }}-{{ uuid }} {% if request.user|liked:status %}is-hidden{% endif %}" data-id="fav-{{ status.id }}-{{ uuid }}">
     {% csrf_token %}
     <button class="button is-small" type="submit">
         <span class="icon icon-heart" title="{% trans 'Like status' %}">
@@ -9,7 +9,7 @@
         </span>
     </button>
 </form>
-<form name="unfavorite" action="/unfavorite/{{ status.id }}" method="POST" class="interaction fav-{{ status.id }}-{{ uuid }} active {% if not request.user|liked:status %}hidden{% endif %}" data-id="fav-{{ status.id }}-{{ uuid }}">
+<form name="unfavorite" action="/unfavorite/{{ status.id }}" method="POST" class="interaction fav-{{ status.id }}-{{ uuid }} active {% if not request.user|liked:status %}is-hidden{% endif %}" data-id="fav-{{ status.id }}-{{ uuid }}">
     {% csrf_token %}
     <button class="button is-primary is-small" type="submit">
         <span class="icon icon-heart" title="{% trans 'Un-like status' %}">
diff --git a/bookwyrm/templates/snippets/filters_panel/filters_panel.html b/bookwyrm/templates/snippets/filters_panel/filters_panel.html
index 8c178860..d9cf2852 100644
--- a/bookwyrm/templates/snippets/filters_panel/filters_panel.html
+++ b/bookwyrm/templates/snippets/filters_panel/filters_panel.html
@@ -11,7 +11,7 @@
         </span>
     </h2>
 
-    <form class="hidden mt-3" id="filters" method="get" action="{{ request.path }}" tabindex="0">
+    <form class="is-hidden mt-3" id="filters" method="get" action="{{ request.path }}" tabindex="0">
         {% if sort %}
         <input type="hidden" name="sort" value="{{ sort }}">
         {% endif %}
diff --git a/bookwyrm/templates/snippets/follow_button.html b/bookwyrm/templates/snippets/follow_button.html
index 962d4d34..495bc3e9 100644
--- a/bookwyrm/templates/snippets/follow_button.html
+++ b/bookwyrm/templates/snippets/follow_button.html
@@ -6,12 +6,12 @@
 
 <div class="field{% if not minimal %} has-addons{% else %} mb-0{% endif %}">
     <div class="control">
-        <form action="{% url 'follow' %}" method="POST" class="interaction follow-{{ user.id }} {% if request.user in user.followers.all or request.user in user.follower_requests.all %}hidden{%endif %}" data-id="follow-{{ user.id }}">
+        <form action="{% url 'follow' %}" method="POST" class="interaction follow-{{ user.id }} {% if request.user in user.followers.all or request.user in user.follower_requests.all %}is-hidden{%endif %}" data-id="follow-{{ user.id }}">
             {% csrf_token %}
             <input type="hidden" name="user" value="{{ user.username }}">
             <button class="button is-small{% if not minimal %} is-link{% endif %}" type="submit">{% trans "Follow" %}</button>
         </form>
-        <form action="{% url 'unfollow' %}" method="POST" class="interaction follow-{{ user.id }} {% if not request.user in user.followers.all and not request.user in user.follower_requests.all %}hidden{%endif %}" data-id="follow-{{ user.id }}">
+        <form action="{% url 'unfollow' %}" method="POST" class="interaction follow-{{ user.id }} {% if not request.user in user.followers.all and not request.user in user.follower_requests.all %}is-hidden{%endif %}" data-id="follow-{{ user.id }}">
             {% csrf_token %}
             <input type="hidden" name="user" value="{{ user.username }}">
             {% if user.manually_approves_followers and request.user not in user.followers.all %}
diff --git a/bookwyrm/templates/snippets/rate_action.html b/bookwyrm/templates/snippets/rate_action.html
index 9fee692d..711c3b3e 100644
--- a/bookwyrm/templates/snippets/rate_action.html
+++ b/bookwyrm/templates/snippets/rate_action.html
@@ -11,7 +11,7 @@
 
         {% include 'snippets/form_rate_stars.html' with book=book classes='mb-1 has-text-warning-dark' default_rating=book|user_rating:request.user %}
 
-        <div class="field has-addons hidden">
+        <div class="field has-addons is-hidden">
             <div class="control">
                 {% include 'snippets/privacy_select.html' with class="is-small" %}
             </div>
diff --git a/bookwyrm/templates/snippets/readthrough.html b/bookwyrm/templates/snippets/readthrough.html
index 76611862..a240a821 100644
--- a/bookwyrm/templates/snippets/readthrough.html
+++ b/bookwyrm/templates/snippets/readthrough.html
@@ -24,7 +24,7 @@
                         {% if readthrough.progress %}
                         {% trans "Show all updates" as button_text %}
                         {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="updates" controls_uid=readthrough.id class="is-small" %}
-                        <ul id="updates-{{ readthrough.id }}" class="hidden">
+                        <ul id="updates-{{ readthrough.id }}" class="is-hidden">
                             {% for progress_update in readthrough.progress_updates %}
                             <li>
                                 <form name="delete-update" action="/delete-progressupdate" method="POST">
@@ -67,7 +67,7 @@
     </div>
 </div>
 
-<div class="box hidden" id="edit-readthrough-{{ readthrough.id }}" tabindex="0">
+<div class="box is-hidden" id="edit-readthrough-{{ readthrough.id }}" tabindex="0">
     <h3 class="title is-5">{% trans "Edit read dates" %}</h3>
     <form name="edit-readthrough" action="/edit-readthrough" method="post">
         {% include 'snippets/readthrough_form.html' with readthrough=readthrough %}
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
index 058bfc12..2a1b99e1 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
@@ -3,7 +3,7 @@
 {% for shelf in shelves %}
 {% comparison_bool shelf.identifier active_shelf.shelf.identifier as is_current %}
 {% if dropdown %}<li role="menuitem">{% endif %}
-    <div class="{% if dropdown %}dropdown-item pt-0 pb-0{% elif active_shelf.shelf.identifier|next_shelf != shelf.identifier %}hidden{% endif %}">
+    <div class="{% if dropdown %}dropdown-item pt-0 pb-0{% elif active_shelf.shelf.identifier|next_shelf != shelf.identifier %}is-hidden{% endif %}">
     {% if shelf.identifier == 'reading' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
         {% trans "Start reading" as button_text %}
         {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="start-reading" controls_uid=button_uuid focus="modal-title-start-reading" disabled=is_current %}
diff --git a/bookwyrm/templates/snippets/status/status_body.html b/bookwyrm/templates/snippets/status/status_body.html
index 4bbb4afa..ffa71d5e 100644
--- a/bookwyrm/templates/snippets/status/status_body.html
+++ b/bookwyrm/templates/snippets/status/status_body.html
@@ -78,7 +78,7 @@
 {% block card-bonus %}
 {% if request.user.is_authenticated and not moderation_mode %}
 {% with status.id|uuid as uuid %}
-<section class="hidden" id="show-comment-{{ status.id }}">
+<section class="is-hidden" id="show-comment-{{ status.id }}">
     <div class="card-footer">
         <div class="card-footer-item">
             {% include 'snippets/create_status_form.html' with reply_parent=status type="reply" %}
diff --git a/bookwyrm/templates/snippets/status/status_content.html b/bookwyrm/templates/snippets/status/status_content.html
index 43cdc5d2..df562c48 100644
--- a/bookwyrm/templates/snippets/status/status_content.html
+++ b/bookwyrm/templates/snippets/status/status_content.html
@@ -20,7 +20,7 @@
     </div>
     {% endif %}
 
-    <div{% if status.content_warning %} class="hidden" id="show-status-cw-{{ status.id }}"{% endif %}>
+    <div{% if status.content_warning %} class="is-hidden" id="show-status-cw-{{ status.id }}"{% endif %}>
         {% if status.content_warning %}
         {% trans "Show less" as button_text %}
         {% include 'snippets/toggle/close_button.html' with text=button_text class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
diff --git a/bookwyrm/templates/snippets/trimmed_text.html b/bookwyrm/templates/snippets/trimmed_text.html
index f91fe19b..07c8b1e6 100644
--- a/bookwyrm/templates/snippets/trimmed_text.html
+++ b/bookwyrm/templates/snippets/trimmed_text.html
@@ -17,7 +17,7 @@
         </div>
     </div>
 </div>
-<div id="full-{{ uuid }}" class="hidden">
+<div id="full-{{ uuid }}" class="is-hidden">
     <div class="content">
         <div dir="auto">{{ full }}</div>
 
diff --git a/bookwyrm/templates/user/lists.html b/bookwyrm/templates/user/lists.html
index 85c7cc8c..b2fd9eef 100644
--- a/bookwyrm/templates/user/lists.html
+++ b/bookwyrm/templates/user/lists.html
@@ -24,7 +24,7 @@
 
 {% block panel %}
 <section class="block content">
-    <form name="create-list" method="post" action="{% url 'lists' %}" class="box hidden" id="create-list">
+    <form name="create-list" method="post" action="{% url 'lists' %}" class="box is-hidden" id="create-list">
         <header class="columns">
             <h3 class="title column">{% trans "Create list" %}</h3>
             <div class="column is-narrow">

From 2a0924027b0301f836c4f0576f90d50d23dd7592 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Wed, 7 Apr 2021 17:33:28 +0200
Subject: [PATCH 0704/1285] [css] Use more visible comments to split blocks.

---
 bookwyrm/static/css/bookwyrm.css | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 59961cac..ae4d53d6 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -3,7 +3,6 @@ html {
     scroll-padding-top: 20%;
 }
 
-/* --- --- */
 .image {
     overflow: hidden;
 }
@@ -25,7 +24,8 @@ html {
     min-width: 75% !important;
 }
 
-/* --- SHELVING --- */
+/** Shelving
+ ******************************************************************************/
 
 /** @todo Replace icons with SVG symbols.
     @see https://www.youtube.com/watch?v=9xXBYcWgCHA */
@@ -35,7 +35,9 @@ html {
     margin-left: 0.5em;
 }
 
-/* --- TOGGLES --- */
+/** Toggles
+ ******************************************************************************/
+
 .toggle-button[aria-pressed=true],
 .toggle-button[aria-pressed=true]:hover {
     background-color: hsl(171, 100%, 41%);
@@ -107,7 +109,9 @@ html {
     content: '\e9d7';
 }
 
-/* --- BOOK COVERS --- */
+/** Book covers
+ ******************************************************************************/
+
 .cover-container {
     height: 250px;
     width: max-content;
@@ -172,7 +176,9 @@ html {
     padding: 0.1em;
 }
 
-/* --- AVATAR --- */
+/** Avatars
+ ******************************************************************************/
+
 .avatar {
     vertical-align: middle;
     display: inline;
@@ -188,7 +194,9 @@ html {
     min-height: 96px;
 }
 
-/* --- QUOTES --- */
+/** Quotes
+ ******************************************************************************/
+
 .quote blockquote {
     position: relative;
     padding-left: 2em;

From 45006afdf32707fd16f4492c5efb72030cafe4ab Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 7 Apr 2021 08:50:50 -0700
Subject: [PATCH 0705/1285] Remove character limit on some book fields

---
 bookwyrm/models/book.py                |  6 +++---
 bookwyrm/templates/book/edit_book.html | 10 ++++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index 3204c603..a6824c0a 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -53,14 +53,14 @@ class Book(BookDataModel):
     connector = models.ForeignKey("Connector", on_delete=models.PROTECT, null=True)
 
     # book/work metadata
-    title = fields.CharField(max_length=255)
+    title = fields.TextField(max_length=255)
     sort_title = fields.CharField(max_length=255, blank=True, null=True)
-    subtitle = fields.CharField(max_length=255, blank=True, null=True)
+    subtitle = fields.TextField(max_length=255, blank=True, null=True)
     description = fields.HtmlField(blank=True, null=True)
     languages = fields.ArrayField(
         models.CharField(max_length=255), blank=True, default=list
     )
-    series = fields.CharField(max_length=255, blank=True, null=True)
+    series = fields.TextField(max_length=255, blank=True, null=True)
     series_number = fields.CharField(max_length=255, blank=True, null=True)
     subjects = fields.ArrayField(
         models.CharField(max_length=255), blank=True, null=True, default=list
diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html
index a9ce651e..15202d80 100644
--- a/bookwyrm/templates/book/edit_book.html
+++ b/bookwyrm/templates/book/edit_book.html
@@ -88,12 +88,18 @@
         <div class="column is-half">
             <section class="block">
                 <h2 class="title is-4">{% trans "Metadata" %}</h2>
-                <p class="mb-2"><label class="label" for="id_title">{% trans "Title:" %}</label> {{ form.title }} </p>
+                <p class="mb-2">
+                    <label class="label" for="id_title">{% trans "Title:" %}</label>
+                    <input type="text" name="title" value="{{ form.title.value }}" maxlength="255" class="input" required="" id="id_title">
+                </p>
                 {% for error in form.title.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
 
-                <p class="mb-2"><label class="label" for="id_subtitle">{% trans "Subtitle:" %}</label> {{ form.subtitle }} </p>
+                <p class="mb-2">
+                    <label class="label" for="id_subtitle">{% trans "Subtitle:" %}</label>
+                    <input type="text" name="subtitle" value="{{ form.subtitle.value }}" maxlength="255" class="input" required="" id="id_subtitle">
+                </p>
                 {% for error in form.subtitle.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}

From 63d37c281d59d26f1c83a13a6d62c3977a78e847 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 7 Apr 2021 08:59:33 -0700
Subject: [PATCH 0706/1285] Handle invalid authors when importing books

---
 bookwyrm/connectors/abstract_connector.py | 6 +++++-
 bookwyrm/connectors/openlibrary.py        | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index 00b5c5c9..2483cc62 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -179,7 +179,11 @@ class AbstractConnector(AbstractMinimalConnector):
         data = get_data(remote_id)
 
         mapped_data = dict_from_mappings(data, self.author_mappings)
-        activity = activitypub.Author(**mapped_data)
+        try:
+            activity = activitypub.Author(**mapped_data)
+        except activitypub.ActivitySerializerError:
+            return None
+
         # this will dedupe
         return activity.to_model(model=models.Author)
 
diff --git a/bookwyrm/connectors/openlibrary.py b/bookwyrm/connectors/openlibrary.py
index 9be0266c..8ee738eb 100644
--- a/bookwyrm/connectors/openlibrary.py
+++ b/bookwyrm/connectors/openlibrary.py
@@ -93,7 +93,10 @@ class Connector(AbstractConnector):
             # this id is "/authors/OL1234567A"
             author_id = author_blob["key"]
             url = "%s%s" % (self.base_url, author_id)
-            yield self.get_or_create_author(url)
+            author = self.get_or_create_author(url)
+            if not author:
+                continue
+            yield author
 
     def get_cover_url(self, cover_blob, size="L"):
         """ ask openlibrary for the cover """

From 514afdc12d6c42053e10ba08ea106682773ca93b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 7 Apr 2021 09:02:39 -0700
Subject: [PATCH 0707/1285] Use run instead of exec for bw-dev web commands

The issue I had with this initially was the `clean` part, not the `run`
part
---
 bw-dev | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/bw-dev b/bw-dev
index b9c4b2a1..42fb4a2e 100755
--- a/bw-dev
+++ b/bw-dev
@@ -19,7 +19,6 @@ function clean {
 
 function runweb {
     docker-compose run --rm web "$@"
-    clean
 }
 
 function execdb {
@@ -64,17 +63,16 @@ case "$CMD" in
         clean
         ;;
     makemigrations)
-        execweb python manage.py makemigrations "$@"
+        runweb python manage.py makemigrations "$@"
         ;;
     migrate)
-        execweb python manage.py rename_app fedireads bookwyrm
-        execweb python manage.py migrate "$@"
+        runweb python manage.py migrate "$@"
         ;;
     bash)
-        execweb bash
+        runweb bash
         ;;
     shell)
-        execweb python manage.py shell
+        runweb python manage.py shell
         ;;
     dbshell)
         execdb psql -U ${POSTGRES_USER} ${POSTGRES_DB}
@@ -83,22 +81,19 @@ case "$CMD" in
         docker-compose restart celery_worker
         ;;
     test)
-        execweb coverage run --source='.' --omit="*/test*,celerywyrm*,bookwyrm/migrations/*" manage.py test "$@"
+        runweb coverage run --source='.' --omit="*/test*,celerywyrm*,bookwyrm/migrations/*" manage.py test "$@"
         ;;
     pytest)
-        execweb pytest --no-cov-on-fail "$@"
-        ;;
-    test_report)
-        execweb coverage report
+        runweb pytest --no-cov-on-fail "$@"
         ;;
     collectstatic)
-        execweb python manage.py collectstatic --no-input
+        runweb python manage.py collectstatic --no-input
         ;;
     makemessages)
-        execweb django-admin makemessages --no-wrap --ignore=venv3 $@
+        runweb django-admin makemessages --no-wrap --ignore=venv3 $@
         ;;
     compilemessages)
-        execweb django-admin compilemessages --ignore venv3 $@
+        runweb django-admin compilemessages --ignore venv3 $@
         ;;
     build)
         docker-compose build
@@ -110,7 +105,7 @@ case "$CMD" in
         makeitblack
         ;;
     populate_streams)
-        execweb python manage.py populate_streams
+        runweb python manage.py populate_streams
         ;;
     *)
         echo "Unrecognised command. Try: build, clean, up, initdb, resetdb, makemigrations, migrate, bash, shell, dbshell, restart_celery, test, pytest, test_report, black, populate_feeds"

From be0cabc41520a6992bd4b425c0ee8a6abb19f828 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Wed, 7 Apr 2021 18:07:32 +0200
Subject: [PATCH 0708/1285] [css] Improve quotes.

---
 bookwyrm/static/css/bookwyrm.css              | 28 +++++++++++++++----
 .../snippets/status/status_content.html       |  2 +-
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index ae4d53d6..8c4acc86 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -194,27 +194,43 @@ html {
     min-height: 96px;
 }
 
-/** Quotes
+/** Statuses: Quotes
+ *
+ * \e906: icon-quote-open
+ * \e905: icon-quote-close
+ *
+ * The `content` class on the blockquote allows to apply styles to markdown
+ * generated HTML in the quote: https://bulma.io/documentation/elements/content/
+ *
+ * ```html
+ * <div class="quote block">
+ *     <blockquote dir="auto" class="content mb-2">
+ *         User generated quote in markdown…
+ *     </blockquote>
+ *
+ *     <p> — <a…>Book Title</a> by <a…class="author">Author</a></p>
+ * </div>
+ * ```
  ******************************************************************************/
 
-.quote blockquote {
+.quote > blockquote {
     position: relative;
     padding-left: 2em;
 }
 
-.quote blockquote::before,
-.quote blockquote::after {
+.quote > blockquote::before,
+.quote > blockquote::after {
     font-family: 'icomoon';
     position: absolute;
 }
 
-.quote blockquote::before {
+.quote > blockquote::before {
     content: "\e906";
     top: 0;
     left: 0;
 }
 
-.quote blockquote::after {
+.quote > blockquote::after {
     content: "\e905";
     right: 0;
 }
diff --git a/bookwyrm/templates/snippets/status/status_content.html b/bookwyrm/templates/snippets/status/status_content.html
index df562c48..94c420cb 100644
--- a/bookwyrm/templates/snippets/status/status_content.html
+++ b/bookwyrm/templates/snippets/status/status_content.html
@@ -28,7 +28,7 @@
 
         {% if status.quote %}
         <div class="quote block">
-            <blockquote dir="auto" class="mb-2">{{ status.quote | safe }}</blockquote>
+            <blockquote dir="auto" class="content mb-2">{{ status.quote | safe }}</blockquote>
 
             <p> &mdash; {% include 'snippets/book_titleby.html' with book=status.book %}</p>
         </div>

From e3d01c6736b233ca59126ed3b6b6a1b467c85865 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 7 Apr 2021 09:17:04 -0700
Subject: [PATCH 0709/1285] Gracefully handle errors in webfinger during search

---
 bookwyrm/views/helpers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index 75c5da8f..41e6a608 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -138,7 +138,7 @@ def handle_remote_webfinger(query):
                     user = activitypub.resolve_remote_id(
                         link["href"], model=models.User
                     )
-                except KeyError:
+                except (KeyError, activitypub.ActivitySerializerError):
                     return None
     return user
 

From ef12b077dd9e81ebd2c57fb07ed69146577a7751 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 7 Apr 2021 10:32:16 -0700
Subject: [PATCH 0710/1285] Adds following field to actor serialization

---
 bookwyrm/activitypub/person.py       |  1 +
 bookwyrm/models/activitypub_mixin.py | 19 +++++++++++++++++--
 bookwyrm/models/user.py              |  6 ++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/activitypub/person.py b/bookwyrm/activitypub/person.py
index 4ab9f08e..9231bd95 100644
--- a/bookwyrm/activitypub/person.py
+++ b/bookwyrm/activitypub/person.py
@@ -23,6 +23,7 @@ class Person(ActivityObject):
     inbox: str
     publicKey: PublicKey
     followers: str = None
+    following: str = None
     outbox: str = None
     endpoints: Dict = None
     name: str = None
diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index a253207a..1c4a274c 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -1,5 +1,6 @@
 """ activitypub model functionality """
 from base64 import b64encode
+from collections import namedtuple
 from functools import reduce
 import json
 import operator
@@ -25,6 +26,15 @@ from bookwyrm.models.fields import ImageField, ManyToManyField
 logger = logging.getLogger(__name__)
 # I tried to separate these classes into mutliple files but I kept getting
 # circular import errors so I gave up. I'm sure it could be done though!
+
+PropertyField = namedtuple("PropertyField", ("set_activity_from_field"))
+
+
+def set_activity_from_property_field(activity, obj, field):
+    """ assign a model property value to the activity json """
+    activity[field[1]] = getattr(obj, field[0])
+
+
 class ActivitypubMixin:
     """ add this mixin for models that are AP serializable """
 
@@ -52,6 +62,11 @@ class ActivitypubMixin:
         self.activity_fields = (
             self.image_fields + self.many_to_many_fields + self.simple_fields
         )
+        if hasattr(self, "property_fields"):
+            self.activity_fields += [
+                PropertyField(lambda a, o: set_activity_from_property_field(a, o, f))
+                for f in self.property_fields
+            ]
 
         # these are separate to avoid infinite recursion issues
         self.deserialize_reverse_fields = (
@@ -430,7 +445,7 @@ def generate_activity(obj):
         ) in obj.serialize_reverse_fields:
             related_field = getattr(obj, model_field_name)
             activity[activity_field_name] = unfurl_related_field(
-                related_field, sort_field
+                related_field, sort_field=sort_field
             )
 
     if not activity.get("id"):
@@ -440,7 +455,7 @@ def generate_activity(obj):
 
 def unfurl_related_field(related_field, sort_field=None):
     """ load reverse lookups (like public key owner or Status attachment """
-    if hasattr(related_field, "all"):
+    if sort_field and hasattr(related_field, "all"):
         return [
             unfurl_related_field(i) for i in related_field.order_by(sort_field).all()
         ]
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 33dedc9e..dcc4162e 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -112,6 +112,12 @@ class User(OrderedCollectionPageMixin, AbstractUser):
     )
 
     name_field = "username"
+    property_fields = [("following_link", "following")]
+
+    @property
+    def following_link(self):
+        """ just how to find out the following info """
+        return "{:s}/following".format(self.remote_id)
 
     @property
     def alt_text(self):

From 7c5f078682b128eef96fe52398fa27b695959f1a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 7 Apr 2021 10:33:56 -0700
Subject: [PATCH 0711/1285] Adds missing migration for #898

---
 .../migrations/0062_auto_20210407_1545.py     | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 bookwyrm/migrations/0062_auto_20210407_1545.py

diff --git a/bookwyrm/migrations/0062_auto_20210407_1545.py b/bookwyrm/migrations/0062_auto_20210407_1545.py
new file mode 100644
index 00000000..3a156637
--- /dev/null
+++ b/bookwyrm/migrations/0062_auto_20210407_1545.py
@@ -0,0 +1,33 @@
+# Generated by Django 3.1.6 on 2021-04-07 15:45
+
+import bookwyrm.models.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0061_auto_20210402_1435"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="book",
+            name="series",
+            field=bookwyrm.models.fields.TextField(
+                blank=True, max_length=255, null=True
+            ),
+        ),
+        migrations.AlterField(
+            model_name="book",
+            name="subtitle",
+            field=bookwyrm.models.fields.TextField(
+                blank=True, max_length=255, null=True
+            ),
+        ),
+        migrations.AlterField(
+            model_name="book",
+            name="title",
+            field=bookwyrm.models.fields.TextField(max_length=255),
+        ),
+    ]

From 954958b6f98a66638e567d5403e036c9339f11a1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 7 Apr 2021 10:54:00 -0700
Subject: [PATCH 0712/1285] Handle arbitrary errors in isbn search

---
 bookwyrm/connectors/connector_manager.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/connectors/connector_manager.py b/bookwyrm/connectors/connector_manager.py
index bf3c749d..53198c0a 100644
--- a/bookwyrm/connectors/connector_manager.py
+++ b/bookwyrm/connectors/connector_manager.py
@@ -40,8 +40,9 @@ def search(query, min_confidence=0.1):
             else:
                 try:
                     result_set = connector.isbn_search(isbn)
-                except (HTTPError, ConnectorException):
-                    pass
+                except Exception as e:  # pylint: disable=broad-except
+                    logger.exception(e)
+                    continue
 
         # if no isbn search or results, we fallback to generic search
         if result_set in (None, []):

From 5427790c4e14a03bc8d57377560f17d0fd9c2f3b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 7 Apr 2021 11:02:56 -0700
Subject: [PATCH 0713/1285] Safer serialization of shelve and unshelve
 activities

---
 bookwyrm/models/activitypub_mixin.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index a253207a..a4f4f353 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -370,7 +370,7 @@ class CollectionItemMixin(ActivitypubMixin):
         object_field = getattr(self, self.object_field)
         collection_field = getattr(self, self.collection_field)
         return activitypub.Add(
-            id=self.remote_id,
+            id=self.get_remote_id(),
             actor=self.user.remote_id,
             object=object_field,
             target=collection_field.remote_id,
@@ -381,7 +381,7 @@ class CollectionItemMixin(ActivitypubMixin):
         object_field = getattr(self, self.object_field)
         collection_field = getattr(self, self.collection_field)
         return activitypub.Remove(
-            id=self.remote_id,
+            id=self.get_remote_id(),
             actor=self.user.remote_id,
             object=object_field,
             target=collection_field.remote_id,

From ac86c194d4550903e73414f4ad7ad9d93b21c5a8 Mon Sep 17 00:00:00 2001
From: n2no1 <7995366-n2no1@users.noreply.gitlab.com>
Date: Wed, 7 Apr 2021 14:11:13 -0400
Subject: [PATCH 0714/1285] move from strptime to dateutil for parsing date
 inputs

---
 bookwyrm/views/books.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 2e48942b..b1b2d065 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -2,6 +2,7 @@
 from datetime import datetime
 from uuid import uuid4
 
+from dateutil.parser import parse as dateparse
 from django.contrib.auth.decorators import login_required, permission_required
 from django.contrib.postgres.search import SearchRank, SearchVector
 from django.core.files.base import ContentFile
@@ -178,15 +179,13 @@ class EditBook(View):
             # QueryDicts are immutable, we need to copy
             formcopy = data["form"].data.copy()
             try:
-                formcopy["first_published_date"] = datetime.strptime(
-                    formcopy["first_published_date"], "%Y-%m-%d"
+                formcopy["first_published_date"] = dateparse(
+                    formcopy["first_published_date"]
                 )
             except MultiValueDictKeyError:
                 pass
             try:
-                formcopy["published_date"] = datetime.strptime(
-                    formcopy["published_date"], "%Y-%m-%d"
-                )
+                formcopy["published_date"] = dateparse(formcopy["published_date"])
             except MultiValueDictKeyError:
                 pass
             data["form"].data = formcopy

From e3e28973f1cc8b98c1d374e4f0986928bf0ee9e6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 7 Apr 2021 11:24:09 -0700
Subject: [PATCH 0715/1285] Adds merge migration

---
 bookwyrm/migrations/0063_merge_20210407_1823.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 bookwyrm/migrations/0063_merge_20210407_1823.py

diff --git a/bookwyrm/migrations/0063_merge_20210407_1823.py b/bookwyrm/migrations/0063_merge_20210407_1823.py
new file mode 100644
index 00000000..97f9e671
--- /dev/null
+++ b/bookwyrm/migrations/0063_merge_20210407_1823.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.1.6 on 2021-04-07 18:23
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0062_auto_20210405_2249'),
+        ('bookwyrm', '0062_auto_20210407_1545'),
+    ]
+
+    operations = [
+    ]

From 8261fbf86ae77f2eeb015047a2519eb9da7e685e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 7 Apr 2021 11:28:31 -0700
Subject: [PATCH 0716/1285] Updates federated server model with notes field

Also makes it more editable, and changes the status types
---
 .../migrations/0062_auto_20210405_2249.py     | 22 -----------
 .../migrations/0063_auto_20210407_1827.py     | 37 +++++++++++++++++++
 .../migrations/0063_merge_20210407_1823.py    | 14 -------
 bookwyrm/models/federated_server.py           |  5 ++-
 4 files changed, 40 insertions(+), 38 deletions(-)
 delete mode 100644 bookwyrm/migrations/0062_auto_20210405_2249.py
 create mode 100644 bookwyrm/migrations/0063_auto_20210407_1827.py
 delete mode 100644 bookwyrm/migrations/0063_merge_20210407_1823.py

diff --git a/bookwyrm/migrations/0062_auto_20210405_2249.py b/bookwyrm/migrations/0062_auto_20210405_2249.py
deleted file mode 100644
index 8229bf7c..00000000
--- a/bookwyrm/migrations/0062_auto_20210405_2249.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Generated by Django 3.1.6 on 2021-04-05 22:49
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookwyrm", "0061_auto_20210402_1435"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="federatedserver",
-            name="status",
-            field=models.CharField(
-                choices=[("federated", "Federated"), ("blocked", "Blocked")],
-                default="federated",
-                max_length=255,
-            ),
-        ),
-    ]
diff --git a/bookwyrm/migrations/0063_auto_20210407_1827.py b/bookwyrm/migrations/0063_auto_20210407_1827.py
new file mode 100644
index 00000000..0bd0f2ae
--- /dev/null
+++ b/bookwyrm/migrations/0063_auto_20210407_1827.py
@@ -0,0 +1,37 @@
+# Generated by Django 3.1.6 on 2021-04-07 18:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0062_auto_20210407_1545"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="federatedserver",
+            name="notes",
+            field=models.TextField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name="federatedserver",
+            name="application_type",
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name="federatedserver",
+            name="application_version",
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name="federatedserver",
+            name="status",
+            field=models.CharField(
+                choices=[("federated", "Federated"), ("blocked", "Blocked")],
+                default="federated",
+                max_length=255,
+            ),
+        ),
+    ]
diff --git a/bookwyrm/migrations/0063_merge_20210407_1823.py b/bookwyrm/migrations/0063_merge_20210407_1823.py
deleted file mode 100644
index 97f9e671..00000000
--- a/bookwyrm/migrations/0063_merge_20210407_1823.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Generated by Django 3.1.6 on 2021-04-07 18:23
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('bookwyrm', '0062_auto_20210405_2249'),
-        ('bookwyrm', '0062_auto_20210407_1545'),
-    ]
-
-    operations = [
-    ]
diff --git a/bookwyrm/models/federated_server.py b/bookwyrm/models/federated_server.py
index d7dc5d96..ea9920a0 100644
--- a/bookwyrm/models/federated_server.py
+++ b/bookwyrm/models/federated_server.py
@@ -19,8 +19,9 @@ class FederatedServer(BookWyrmModel):
         max_length=255, default="federated", choices=FederationStatus.choices
     )
     # is it mastodon, bookwyrm, etc
-    application_type = models.CharField(max_length=255, null=True)
-    application_version = models.CharField(max_length=255, null=True)
+    application_type = models.CharField(max_length=255, null=True, blank=True)
+    application_version = models.CharField(max_length=255, null=True, blank=True)
+    notes = models.TextField(null=True, blank=True)
 
     def block(self):
         """ block a server """

From 74549956c2ce9bfdfe18477384f747fbee10c33d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 7 Apr 2021 11:52:13 -0700
Subject: [PATCH 0717/1285] Adds edit server form

---
 bookwyrm/forms.py                                |  6 ++++++
 bookwyrm/templates/settings/add_server_form.html | 15 +++++++++++++++
 bookwyrm/templates/settings/admin_layout.html    |  9 ++++++++-
 bookwyrm/templates/settings/federation.html      |  9 +++++++++
 bookwyrm/views/federation.py                     |  4 ++--
 5 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 bookwyrm/templates/settings/add_server_form.html

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index b159a89e..55bb6650 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -281,3 +281,9 @@ class ReportForm(CustomForm):
     class Meta:
         model = models.Report
         fields = ["user", "reporter", "statuses", "note"]
+
+
+class ServerForm(CustomForm):
+    class Meta:
+        model = models.FederatedServer
+        exclude = []
diff --git a/bookwyrm/templates/settings/add_server_form.html b/bookwyrm/templates/settings/add_server_form.html
new file mode 100644
index 00000000..a16aac2d
--- /dev/null
+++ b/bookwyrm/templates/settings/add_server_form.html
@@ -0,0 +1,15 @@
+{% extends 'components/inline_form.html' %}
+{% load i18n %}
+
+{% block header %}
+{% trans "Add server" %}
+{% endblock %}
+
+{% block form %}
+<form>
+    {% csrf_token %}
+    {{ form.as_p }}
+    <button type="submit" class="button is-primary">{% trans "Save" %}</button>
+</form>
+{% endblock %}
+
diff --git a/bookwyrm/templates/settings/admin_layout.html b/bookwyrm/templates/settings/admin_layout.html
index 9340da9e..4f71a228 100644
--- a/bookwyrm/templates/settings/admin_layout.html
+++ b/bookwyrm/templates/settings/admin_layout.html
@@ -6,7 +6,14 @@
 {% block content %}
 
 <header class="block column is-offset-one-quarter pl-1">
-    <h1 class="title">{% block header %}{% endblock %}</h1>
+    <div class="columns is-mobile">
+        <div class="column">
+            <h1 class="title">{% block header %}{% endblock %}</h1>
+        </div>
+        <div class="column is-narrow">
+            {% block edit-button %}{% endblock %}
+        </div>
+    </div>
 </header>
 
 <div class="block columns">
diff --git a/bookwyrm/templates/settings/federation.html b/bookwyrm/templates/settings/federation.html
index 696d7a20..1106bc12 100644
--- a/bookwyrm/templates/settings/federation.html
+++ b/bookwyrm/templates/settings/federation.html
@@ -4,8 +4,17 @@
 
 {% block header %}{% trans "Federated Servers" %}{% endblock %}
 
+{% block edit-button %}
+{% trans "Add server" as button_text %}
+{% include 'snippets/toggle/open_button.html' with controls_text="add-server" icon="plus" text=button_text focus="add-server-header" %}
+{% endblock%}
+
 {% block panel %}
 
+<div class="block">
+    {% include 'settings/add_server_form.html' with controls_text="add-server" %}
+</div>
+
 <table class="table is-striped">
     <tr>
         {% url 'settings-federation' as url %}
diff --git a/bookwyrm/views/federation.py b/bookwyrm/views/federation.py
index 0405ebf5..96962768 100644
--- a/bookwyrm/views/federation.py
+++ b/bookwyrm/views/federation.py
@@ -6,7 +6,7 @@ from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
 
-from bookwyrm import models
+from bookwyrm import forms, models
 from bookwyrm.settings import PAGE_LENGTH
 
 
@@ -34,7 +34,7 @@ class Federation(View):
             servers = servers.order_by(sort)
 
         paginated = Paginator(servers, PAGE_LENGTH)
-        data = {"servers": paginated.page(page), "sort": sort}
+        data = {"servers": paginated.page(page), "sort": sort, "form": forms.ServerForm}
         return TemplateResponse(request, "settings/federation.html", data)
 
 

From d383e8a61e1097535d88d573ebba5843e65e9d50 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 7 Apr 2021 12:11:01 -0700
Subject: [PATCH 0718/1285] Cleans up add server form

---
 bookwyrm/forms.py                             |  2 +-
 .../templates/settings/add_server_form.html   |  4 +-
 bookwyrm/templates/settings/server_form.html  | 39 +++++++++++++++++++
 3 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 bookwyrm/templates/settings/server_form.html

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 55bb6650..7c41323c 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -286,4 +286,4 @@ class ReportForm(CustomForm):
 class ServerForm(CustomForm):
     class Meta:
         model = models.FederatedServer
-        exclude = []
+        exclude = ["remote_id"]
diff --git a/bookwyrm/templates/settings/add_server_form.html b/bookwyrm/templates/settings/add_server_form.html
index a16aac2d..ffb43043 100644
--- a/bookwyrm/templates/settings/add_server_form.html
+++ b/bookwyrm/templates/settings/add_server_form.html
@@ -7,9 +7,7 @@
 
 {% block form %}
 <form>
-    {% csrf_token %}
-    {{ form.as_p }}
-    <button type="submit" class="button is-primary">{% trans "Save" %}</button>
+    {% include 'settings/server_form.html' %}
 </form>
 {% endblock %}
 
diff --git a/bookwyrm/templates/settings/server_form.html b/bookwyrm/templates/settings/server_form.html
new file mode 100644
index 00000000..4b9f6ef0
--- /dev/null
+++ b/bookwyrm/templates/settings/server_form.html
@@ -0,0 +1,39 @@
+{% load i18n %}
+
+{% csrf_token %}
+
+<div class="columns">
+    <div class="column is-half">
+        <p>
+            <label class="label" for="id_server_name">{% trans "Instance:" %}</label>
+            <input type="text" name="server_name" maxlength="255" class="input" required="" id="id_server_name" value="{{ form.server_name.value|default:'' }}" placeholder="domain.com">
+        </p>
+        <p>
+            <label class="label" for="id_status">{% trans "Status:" %}</label>
+            <div class="select">
+                <select name="status" class="" id="id_status">
+                    <option value="federated" {% if form.status.value == "federated" or not form.status.value %}selected=""{% endif %}>Federated</option>
+                    <option value="blocked" {% if form.status.value == "blocked" %}selected{% endif %}>Blocked</option>
+                </select>
+            </div>
+        </p>
+    </div>
+    <div class="column is-half">
+        <p>
+            <label class="label" for="id_application_type">{% trans "Software:" %}</label>
+            <input type="text" name="application_type" maxlength="255" class="input" id="id_application_type" value="{{ form.application_type.value|default:'' }}">
+        </p>
+        <p>
+            <label class="label" for="id_application_version">{% trans "Version:" %}</label>
+            <input type="text" name="application_version" maxlength="255" class="input" id="id_application_version" value="{{ form.application_version.value|default:'' }}">
+        </p>
+    </div>
+</div>
+<p>
+    <label class="label" for="id_notes">{% trans "Notes:" %}</label>
+    <textarea name="notes" cols="None" rows="None" class="textarea" id="id_notes">
+        {{ form.notes.value|default:'' }}
+    </textarea>
+</p>
+
+<button type="submit" class="button is-primary">{% trans "Save" %}</button>

From ddab9af564c8fc9542ea4e5228d3c93d796a2870 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 7 Apr 2021 13:06:29 -0700
Subject: [PATCH 0719/1285] Functional add server form

---
 .../templates/settings/add_server_form.html   | 13 --------
 bookwyrm/templates/settings/edit_server.html  | 16 ++++++++++
 bookwyrm/templates/settings/federation.html   | 14 ++++----
 bookwyrm/templates/settings/server_form.html  | 32 ++++++++++++-------
 bookwyrm/urls.py                              |  5 +++
 bookwyrm/views/__init__.py                    |  2 +-
 bookwyrm/views/federation.py                  | 23 ++++++++++++-
 7 files changed, 70 insertions(+), 35 deletions(-)
 delete mode 100644 bookwyrm/templates/settings/add_server_form.html
 create mode 100644 bookwyrm/templates/settings/edit_server.html

diff --git a/bookwyrm/templates/settings/add_server_form.html b/bookwyrm/templates/settings/add_server_form.html
deleted file mode 100644
index ffb43043..00000000
--- a/bookwyrm/templates/settings/add_server_form.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends 'components/inline_form.html' %}
-{% load i18n %}
-
-{% block header %}
-{% trans "Add server" %}
-{% endblock %}
-
-{% block form %}
-<form>
-    {% include 'settings/server_form.html' %}
-</form>
-{% endblock %}
-
diff --git a/bookwyrm/templates/settings/edit_server.html b/bookwyrm/templates/settings/edit_server.html
new file mode 100644
index 00000000..6510222d
--- /dev/null
+++ b/bookwyrm/templates/settings/edit_server.html
@@ -0,0 +1,16 @@
+{% extends 'settings/admin_layout.html' %}
+{% load i18n %}
+{% block title %}{% trans "Add server" %}{% endblock %}
+
+{% block header %}
+{% if form.server_name.value %}{{ form.server_name.value }}{% else %}{% trans "Add server" %}{% endif %}
+<a href="{% url 'settings-federation' %}" class="has-text-weight-normal help">{% trans "Back to server list" %}</a>
+{% endblock %}
+
+{% block panel %}
+
+<form method="POST" action="{% url 'settings-edit-federated-server' %}">
+    {% include 'settings/server_form.html' %}
+</form>
+
+{% endblock %}
diff --git a/bookwyrm/templates/settings/federation.html b/bookwyrm/templates/settings/federation.html
index 1106bc12..da5ed084 100644
--- a/bookwyrm/templates/settings/federation.html
+++ b/bookwyrm/templates/settings/federation.html
@@ -5,16 +5,14 @@
 {% block header %}{% trans "Federated Servers" %}{% endblock %}
 
 {% block edit-button %}
-{% trans "Add server" as button_text %}
-{% include 'snippets/toggle/open_button.html' with controls_text="add-server" icon="plus" text=button_text focus="add-server-header" %}
-{% endblock%}
+<a href="{% url 'settings-edit-federated-server' %}">
+    <span class="icon icon-plus" title="{% trans 'Add server' %}">
+        <span class="is-sr-only">{% trans "Add server" %}</span>
+    </span>
+</a>
+{% endblock %}
 
 {% block panel %}
-
-<div class="block">
-    {% include 'settings/add_server_form.html' with controls_text="add-server" %}
-</div>
-
 <table class="table is-striped">
     <tr>
         {% url 'settings-federation' as url %}
diff --git a/bookwyrm/templates/settings/server_form.html b/bookwyrm/templates/settings/server_form.html
index 4b9f6ef0..b86c3d03 100644
--- a/bookwyrm/templates/settings/server_form.html
+++ b/bookwyrm/templates/settings/server_form.html
@@ -1,32 +1,40 @@
 {% load i18n %}
 
 {% csrf_token %}
-
 <div class="columns">
     <div class="column is-half">
-        <p>
+        <div>
             <label class="label" for="id_server_name">{% trans "Instance:" %}</label>
-            <input type="text" name="server_name" maxlength="255" class="input" required="" id="id_server_name" value="{{ form.server_name.value|default:'' }}" placeholder="domain.com">
-        </p>
-        <p>
+            <input type="text" name="server_name" maxlength="255" class="input" required id="id_server_name" value="{{ form.server_name.value|default:'' }}" placeholder="domain.com">
+            {% for error in form.server_name.errors %}
+            <p class="help is-danger">{{ error | escape }}</p>
+            {% endfor %}
+        </div>
+        <div>
             <label class="label" for="id_status">{% trans "Status:" %}</label>
             <div class="select">
                 <select name="status" class="" id="id_status">
-                    <option value="federated" {% if form.status.value == "federated" or not form.status.value %}selected=""{% endif %}>Federated</option>
-                    <option value="blocked" {% if form.status.value == "blocked" %}selected{% endif %}>Blocked</option>
+                    <option value="federated" {% if form.status.value == "federated" or not form.status.value %}selected=""{% endif %}>{% trans "Federated" %}</option>
+                    <option value="blocked" {% if form.status.value == "blocked" %}selected{% endif %}>{% trans "Blocked" %}</option>
                 </select>
             </div>
-        </p>
+        </div>
     </div>
     <div class="column is-half">
-        <p>
+        <div>
             <label class="label" for="id_application_type">{% trans "Software:" %}</label>
             <input type="text" name="application_type" maxlength="255" class="input" id="id_application_type" value="{{ form.application_type.value|default:'' }}">
-        </p>
-        <p>
+            {% for error in form.application_type.errors %}
+            <p class="help is-danger">{{ error | escape }}</p>
+            {% endfor %}
+        </div>
+        <div>
             <label class="label" for="id_application_version">{% trans "Version:" %}</label>
             <input type="text" name="application_version" maxlength="255" class="input" id="id_application_version" value="{{ form.application_version.value|default:'' }}">
-        </p>
+            {% for error in form.application_version.errors %}
+            <p class="help is-danger">{{ error | escape }}</p>
+            {% endfor %}
+        </div>
     </div>
 </div>
 <p>
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 46398806..35856a4d 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -68,6 +68,11 @@ urlpatterns = [
         views.FederatedServer.as_view(),
         name="settings-federated-server",
     ),
+    re_path(
+        r"^settings/federation/edit/?$",
+        views.EditFederatedServer.as_view(),
+        name="settings-edit-federated-server",
+    ),
     re_path(
         r"^settings/invites/?$", views.ManageInvites.as_view(), name="settings-invites"
     ),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index d053e971..404c2f31 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -5,7 +5,7 @@ from .block import Block, unblock
 from .books import Book, EditBook, ConfirmEditBook, Editions
 from .books import upload_cover, add_description, switch_edition, resolve_book
 from .directory import Directory
-from .federation import Federation, FederatedServer
+from .federation import Federation, FederatedServer, EditFederatedServer
 from .feed import DirectMessage, Feed, Replies, Status
 from .follow import follow, unfollow
 from .follow import accept_follow_request, delete_follow_request
diff --git a/bookwyrm/views/federation.py b/bookwyrm/views/federation.py
index 96962768..bb33c5af 100644
--- a/bookwyrm/views/federation.py
+++ b/bookwyrm/views/federation.py
@@ -34,10 +34,31 @@ class Federation(View):
             servers = servers.order_by(sort)
 
         paginated = Paginator(servers, PAGE_LENGTH)
-        data = {"servers": paginated.page(page), "sort": sort, "form": forms.ServerForm}
+
+        data = {
+            "servers": paginated.page(page), "sort": sort, "form": forms.ServerForm()
+        }
         return TemplateResponse(request, "settings/federation.html", data)
 
 
+class EditFederatedServer(View):
+    """ manually add a server """
+
+    def get(self, request):
+        """ add server form """
+        data = {"form": forms.ServerForm()}
+        return TemplateResponse(request, "settings/edit_server.html", data)
+
+    def post(self, request):
+        """ add a server from the admin panel """
+        form = forms.ServerForm(request.POST)
+        if not form.is_valid():
+            data = {"form": form}
+            return TemplateResponse(request, "settings/edit_server.html", data)
+        server = form.save()
+        return redirect("settings-federated-server", server.id)
+
+
 @method_decorator(login_required, name="dispatch")
 @method_decorator(
     permission_required("bookwyrm.control_federation", raise_exception=True),

From 855647453717ac54b1c281997d68b4785464ea15 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 7 Apr 2021 13:17:51 -0700
Subject: [PATCH 0720/1285] Add and edit servers

---
 bookwyrm/templates/settings/edit_server.html  | 48 +++++++++++++++++--
 .../templates/settings/federated_server.html  |  8 ++++
 bookwyrm/templates/settings/server_form.html  | 47 ------------------
 bookwyrm/urls.py                              |  5 ++
 bookwyrm/views/federation.py                  | 15 ++++--
 5 files changed, 68 insertions(+), 55 deletions(-)
 delete mode 100644 bookwyrm/templates/settings/server_form.html

diff --git a/bookwyrm/templates/settings/edit_server.html b/bookwyrm/templates/settings/edit_server.html
index 6510222d..dc0de7e8 100644
--- a/bookwyrm/templates/settings/edit_server.html
+++ b/bookwyrm/templates/settings/edit_server.html
@@ -3,14 +3,56 @@
 {% block title %}{% trans "Add server" %}{% endblock %}
 
 {% block header %}
-{% if form.server_name.value %}{{ form.server_name.value }}{% else %}{% trans "Add server" %}{% endif %}
+{% if server %}{{ server.server_name }}{% else %}{% trans "Add server" %}{% endif %}
 <a href="{% url 'settings-federation' %}" class="has-text-weight-normal help">{% trans "Back to server list" %}</a>
 {% endblock %}
 
 {% block panel %}
 
-<form method="POST" action="{% url 'settings-edit-federated-server' %}">
-    {% include 'settings/server_form.html' %}
+<form method="POST" action="{% url 'settings-edit-federated-server' server.id %}">
+    {% csrf_token %}
+    <div class="columns">
+        <div class="column is-half">
+            <div>
+                <label class="label" for="id_server_name">{% trans "Instance:" %}</label>
+                <input type="text" name="server_name" maxlength="255" class="input" required id="id_server_name" value="{{ form.server_name.value|default:'' }}" placeholder="domain.com">
+                {% for error in form.server_name.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+            </div>
+            <div>
+                <label class="label" for="id_status">{% trans "Status:" %}</label>
+                <div class="select">
+                    <select name="status" class="" id="id_status">
+                        <option value="federated" {% if form.status.value == "federated" or not form.status.value %}selected=""{% endif %}>{% trans "Federated" %}</option>
+                        <option value="blocked" {% if form.status.value == "blocked" %}selected{% endif %}>{% trans "Blocked" %}</option>
+                    </select>
+                </div>
+            </div>
+        </div>
+        <div class="column is-half">
+            <div>
+                <label class="label" for="id_application_type">{% trans "Software:" %}</label>
+                <input type="text" name="application_type" maxlength="255" class="input" id="id_application_type" value="{{ form.application_type.value|default:'' }}">
+                {% for error in form.application_type.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+            </div>
+            <div>
+                <label class="label" for="id_application_version">{% trans "Version:" %}</label>
+                <input type="text" name="application_version" maxlength="255" class="input" id="id_application_version" value="{{ form.application_version.value|default:'' }}">
+                {% for error in form.application_version.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+            </div>
+        </div>
+    </div>
+    <p>
+        <label class="label" for="id_notes">{% trans "Notes:" %}</label>
+        <textarea name="notes" cols="None" rows="None" class="textarea" id="id_notes">{{ form.notes.value|default:'' }}</textarea>
+    </p>
+
+    <button type="submit" class="button is-primary">{% trans "Save" %}</button>
 </form>
 
 {% endblock %}
diff --git a/bookwyrm/templates/settings/federated_server.html b/bookwyrm/templates/settings/federated_server.html
index 147d6514..5b41ea79 100644
--- a/bookwyrm/templates/settings/federated_server.html
+++ b/bookwyrm/templates/settings/federated_server.html
@@ -11,6 +11,14 @@
 <a href="{% url 'settings-federation' %}" class="has-text-weight-normal help">{% trans "Back to server list" %}</a>
 {% endblock %}
 
+{% block edit-button %}
+<a href="{% url 'settings-edit-federated-server' server.id %}">
+    <span class="icon icon-pencil" title="{% trans 'Edit server' %}">
+        <span class="is-sr-only">{% trans "Edit server" %}</span>
+    </span>
+</a>
+{% endblock %}
+
 {% block panel %}
 <section class="block content">
     <h2 class="title is-4">{% trans "Details" %}</h2>
diff --git a/bookwyrm/templates/settings/server_form.html b/bookwyrm/templates/settings/server_form.html
deleted file mode 100644
index b86c3d03..00000000
--- a/bookwyrm/templates/settings/server_form.html
+++ /dev/null
@@ -1,47 +0,0 @@
-{% load i18n %}
-
-{% csrf_token %}
-<div class="columns">
-    <div class="column is-half">
-        <div>
-            <label class="label" for="id_server_name">{% trans "Instance:" %}</label>
-            <input type="text" name="server_name" maxlength="255" class="input" required id="id_server_name" value="{{ form.server_name.value|default:'' }}" placeholder="domain.com">
-            {% for error in form.server_name.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
-        </div>
-        <div>
-            <label class="label" for="id_status">{% trans "Status:" %}</label>
-            <div class="select">
-                <select name="status" class="" id="id_status">
-                    <option value="federated" {% if form.status.value == "federated" or not form.status.value %}selected=""{% endif %}>{% trans "Federated" %}</option>
-                    <option value="blocked" {% if form.status.value == "blocked" %}selected{% endif %}>{% trans "Blocked" %}</option>
-                </select>
-            </div>
-        </div>
-    </div>
-    <div class="column is-half">
-        <div>
-            <label class="label" for="id_application_type">{% trans "Software:" %}</label>
-            <input type="text" name="application_type" maxlength="255" class="input" id="id_application_type" value="{{ form.application_type.value|default:'' }}">
-            {% for error in form.application_type.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
-        </div>
-        <div>
-            <label class="label" for="id_application_version">{% trans "Version:" %}</label>
-            <input type="text" name="application_version" maxlength="255" class="input" id="id_application_version" value="{{ form.application_version.value|default:'' }}">
-            {% for error in form.application_version.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
-        </div>
-    </div>
-</div>
-<p>
-    <label class="label" for="id_notes">{% trans "Notes:" %}</label>
-    <textarea name="notes" cols="None" rows="None" class="textarea" id="id_notes">
-        {{ form.notes.value|default:'' }}
-    </textarea>
-</p>
-
-<button type="submit" class="button is-primary">{% trans "Save" %}</button>
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 35856a4d..4cf6fd52 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -73,6 +73,11 @@ urlpatterns = [
         views.EditFederatedServer.as_view(),
         name="settings-edit-federated-server",
     ),
+    re_path(
+        r"^settings/federation/edit/(?P<server>\d+)?$",
+        views.EditFederatedServer.as_view(),
+        name="settings-edit-federated-server",
+    ),
     re_path(
         r"^settings/invites/?$", views.ManageInvites.as_view(), name="settings-invites"
     ),
diff --git a/bookwyrm/views/federation.py b/bookwyrm/views/federation.py
index bb33c5af..09f5040d 100644
--- a/bookwyrm/views/federation.py
+++ b/bookwyrm/views/federation.py
@@ -44,16 +44,21 @@ class Federation(View):
 class EditFederatedServer(View):
     """ manually add a server """
 
-    def get(self, request):
+    def get(self, request, server=None):
         """ add server form """
-        data = {"form": forms.ServerForm()}
+        if server:
+            server = get_object_or_404(models.FederatedServer, id=server)
+        data = {"form": forms.ServerForm(instance=server), "server": server}
         return TemplateResponse(request, "settings/edit_server.html", data)
 
-    def post(self, request):
+    def post(self, request, server=None):
         """ add a server from the admin panel """
-        form = forms.ServerForm(request.POST)
+        if server:
+            server = get_object_or_404(models.FederatedServer, id=server)
+
+        form = forms.ServerForm(request.POST, instance=server)
         if not form.is_valid():
-            data = {"form": form}
+            data = {"form": form, "server": server}
             return TemplateResponse(request, "settings/edit_server.html", data)
         server = form.save()
         return redirect("settings-federated-server", server.id)

From 839ac061b7c1a9aa3f4a3c348126cf7657d62c2c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 7 Apr 2021 13:21:46 -0700
Subject: [PATCH 0721/1285] Show notes

---
 .../templates/settings/federated_server.html  | 111 ++++++++++--------
 1 file changed, 59 insertions(+), 52 deletions(-)

diff --git a/bookwyrm/templates/settings/federated_server.html b/bookwyrm/templates/settings/federated_server.html
index 5b41ea79..0f18f6ac 100644
--- a/bookwyrm/templates/settings/federated_server.html
+++ b/bookwyrm/templates/settings/federated_server.html
@@ -20,60 +20,67 @@
 {% endblock %}
 
 {% block panel %}
-<section class="block content">
-    <h2 class="title is-4">{% trans "Details" %}</h2>
-    <dl>
-        <div class="is-flex">
-            <dt>{% trans "Software:" %}</dt>
-            <dd>{{ server.application_type }}</dd>
-        </div>
-        <div class="is-flex">
-            <dt>{% trans "Version:" %}</dt>
-            <dd>{{ server.application_version }}</dd>
-        </div>
-        <div class="is-flex">
-            <dt>{% trans "Status:" %}</dt>
-            <dd>{{ server.status }}</dd>
-        </div>
-    </dl>
-</section>
+<div class="columns">
+    <section class="column is-half content">
+        <h2 class="title is-4">{% trans "Details" %}</h2>
+        <dl>
+            <div class="is-flex">
+                <dt>{% trans "Software:" %}</dt>
+                <dd>{{ server.application_type }}</dd>
+            </div>
+            <div class="is-flex">
+                <dt>{% trans "Version:" %}</dt>
+                <dd>{{ server.application_version }}</dd>
+            </div>
+            <div class="is-flex">
+                <dt>{% trans "Status:" %}</dt>
+                <dd>{{ server.status }}</dd>
+            </div>
+        </dl>
+    </section>
+
+    <section class="column is-half content">
+        <h2 class="title is-4">{% trans "Activity" %}</h2>
+        <dl>
+            <div class="is-flex">
+                <dt>{% trans "Users:" %}</dt>
+                <dd>
+                    {{ users.count }}
+                    {% if server.user_set.count %}(<a href="{% url 'settings-users' %}?server={{ server.id }}">{% trans "View all" %}</a>){% endif %}
+                </dd>
+            </div>
+            <div class="is-flex">
+                <dt>{% trans "Reports:" %}</dt>
+                <dd>
+                    {{ reports.count }}
+                    {% if reports.count %}(<a href="{% url 'settings-reports' %}?server={{ server.id }}">{% trans "View all" %}</a>){% endif %}
+                </dd>
+            </div>
+            <div class="is-flex">
+                <dt>{% trans "Followed by us:" %}</dt>
+                <dd>
+                    {{ followed_by_us.count }}
+                </dd>
+            </div>
+            <div class="is-flex">
+                <dt>{% trans "Followed by them:" %}</dt>
+                <dd>
+                    {{ followed_by_them.count }}
+                </dd>
+            </div>
+            <div class="is-flex">
+                <dt>{% trans "Blocked by us:" %}</dt>
+                <dd>
+                    {{ blocked_by_us.count }}
+                </dd>
+            </div>
+        </dl>
+    </section>
+</div>
 
 <section class="block content">
-    <h2 class="title is-4">{% trans "Activity" %}</h2>
-    <dl>
-        <div class="is-flex">
-            <dt>{% trans "Users:" %}</dt>
-            <dd>
-                {{ users.count }}
-                {% if server.user_set.count %}(<a href="{% url 'settings-users' %}?server={{ server.id }}">{% trans "View all" %}</a>){% endif %}
-            </dd>
-        </div>
-        <div class="is-flex">
-            <dt>{% trans "Reports:" %}</dt>
-            <dd>
-                {{ reports.count }}
-                {% if reports.count %}(<a href="{% url 'settings-reports' %}?server={{ server.id }}">{% trans "View all" %}</a>){% endif %}
-            </dd>
-        </div>
-        <div class="is-flex">
-            <dt>{% trans "Followed by us:" %}</dt>
-            <dd>
-                {{ followed_by_us.count }}
-            </dd>
-        </div>
-        <div class="is-flex">
-            <dt>{% trans "Followed by them:" %}</dt>
-            <dd>
-                {{ followed_by_them.count }}
-            </dd>
-        </div>
-        <div class="is-flex">
-            <dt>{% trans "Blocked by us:" %}</dt>
-            <dd>
-                {{ blocked_by_us.count }}
-            </dd>
-        </div>
-    </dl>
+    <h2 class="title is-4">{% trans "Notes" %}</h2>
+    <p>{{ server.notes }}</p>
 </section>
 
 <section class="block content">

From ddba61f1385aea16592a254627a5172aaa88ffac Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 7 Apr 2021 16:50:12 -0700
Subject: [PATCH 0722/1285] Block all/unblock all users on server block

---
 bookwyrm/templates/settings/federated_server.html |  2 ++
 bookwyrm/views/federation.py                      | 11 ++++++++++-
 bookwyrm/views/inbox.py                           |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/settings/federated_server.html b/bookwyrm/templates/settings/federated_server.html
index 0f18f6ac..520ab5dc 100644
--- a/bookwyrm/templates/settings/federated_server.html
+++ b/bookwyrm/templates/settings/federated_server.html
@@ -89,8 +89,10 @@
         {% csrf_token %}
         {% if server.status != 'blocked' %}
         <button class="button is-danger">{% trans "Block" %}</button>
+        <p class="help">{% trans "All users from this instance will be deactivated." %}</p>
         {% else %}
         <button class="button">{% trans "Un-block" %}</button>
+        <p class="help">{% trans "All users from this instance will be re-activated." %}</p>
         {% endif %}
     </form>
 </section>
diff --git a/bookwyrm/views/federation.py b/bookwyrm/views/federation.py
index 09f5040d..83bed32d 100644
--- a/bookwyrm/views/federation.py
+++ b/bookwyrm/views/federation.py
@@ -36,7 +36,9 @@ class Federation(View):
         paginated = Paginator(servers, PAGE_LENGTH)
 
         data = {
-            "servers": paginated.page(page), "sort": sort, "form": forms.ServerForm()
+            "servers": paginated.page(page),
+            "sort": sort,
+            "form": forms.ServerForm(),
         }
         return TemplateResponse(request, "settings/federation.html", data)
 
@@ -93,4 +95,11 @@ class FederatedServer(View):
         server = get_object_or_404(models.FederatedServer, id=server)
         server.status = "blocked" if server.status == "federated" else "federated"
         server.save()
+
+        # TODO: there needs to be differentiation between types of deactivated users
+        if server.status == "blocked":
+            server.user_set.update(is_active=False)
+        else:
+            server.user_set.update(is_active=True)
+
         return redirect("settings-federated-server", server.id)
diff --git a/bookwyrm/views/inbox.py b/bookwyrm/views/inbox.py
index 387efe9f..7997bd5c 100644
--- a/bookwyrm/views/inbox.py
+++ b/bookwyrm/views/inbox.py
@@ -70,7 +70,7 @@ def is_blocked_user_agent(request):
     user_agent = request.headers.get("User-Agent")
     if not user_agent:
         return False
-    url = re.search(r"+https?://{:s}/?".format(regex.domain), user_agent)
+    url = re.search(r"https?://{:s}/?".format(regex.domain), user_agent).group()
     domain = urlparse(url).netloc
     if not domain:
         # idk, we'll try again later with the actor

From 89af144105c74d413bf1b87aeced7b5f34bb442a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 7 Apr 2021 18:38:26 -0700
Subject: [PATCH 0723/1285] Avoid showing "None" for title and subtitle fields

---
 bookwyrm/templates/book/edit_book.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html
index 963b2b75..1da7c3f7 100644
--- a/bookwyrm/templates/book/edit_book.html
+++ b/bookwyrm/templates/book/edit_book.html
@@ -90,7 +90,7 @@
                 <h2 class="title is-4">{% trans "Metadata" %}</h2>
                 <p class="mb-2">
                     <label class="label" for="id_title">{% trans "Title:" %}</label>
-                    <input type="text" name="title" value="{{ form.title.value }}" maxlength="255" class="input" required="" id="id_title">
+                    <input type="text" name="title" value="{{ form.title.value|default:'' }}" maxlength="255" class="input" required="" id="id_title">
                 </p>
                 {% for error in form.title.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
@@ -98,7 +98,7 @@
 
                 <p class="mb-2">
                     <label class="label" for="id_subtitle">{% trans "Subtitle:" %}</label>
-                    <input type="text" name="subtitle" value="{{ form.subtitle.value }}" maxlength="255" class="input" required="" id="id_subtitle">
+                    <input type="text" name="subtitle" value="{{ form.subtitle.value|default:'' }}" maxlength="255" class="input" required="" id="id_subtitle">
                 </p>
                 {% for error in form.subtitle.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>

From 83bd417878a0aa7729f27459a0927352ab4edff1 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Thu, 8 Apr 2021 11:08:13 +0200
Subject: [PATCH 0724/1285] [assets] Update interactions code:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit should address https://github.com/mouse-reeve/bookwyrm/pull/883#discussion_r609381969.

- Disable the button being used to submit the form.
- Rename variables based on @mouse-reeve’s explanations. Thanks! :sparkles:
---
 bookwyrm/static/js/bookwyrm.js | 42 ++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index 0393b4cc..b01d7fe2 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -229,7 +229,7 @@ let BookWyrm = new class {
 
     /**
      * Make a request and update the UI accordingly.
-     * This function is used for boosts and favourites.
+     * This function is used for boosts, favourites, follows and unfollows.
      *
      * @param  {Event} event
      * @return {undefined}
@@ -238,30 +238,32 @@ let BookWyrm = new class {
         event.preventDefault();
 
         const bookwyrm = this;
-
-        let allTriggers = document.querySelectorAll(`.${event.target.dataset.id}`);
+        const trigger = event.submitter;
+        const target = event.currentTarget;
+        const forms = document.querySelectorAll(`.${target.dataset.id}`);
 
         // Change icon to show ongoing activity on the current UI.
-        allTriggers.forEach(node => bookwyrm.addRemoveClass(
-            node,
-            'is-processing',
-            true
-        ));
+        // Disable the element used to submit the form to prevent duplicated requests.
+        // @todo Ideally, disable all potential ways to submit this specific form.
+        forms.forEach(form => {
+            bookwyrm.addRemoveClass(form, 'is-processing', true);
+            trigger.setAttribute('disabled', null);
+        });
 
-        this.ajaxPost(event.target)
+        this.ajaxPost(target)
             .finally(() => {
                 // Change icon to remove ongoing activity on the current UI.
-                allTriggers.forEach(node => bookwyrm.addRemoveClass(
-                    node,
-                    'is-processing',
-                    false
-                ));
+                // Enable back the element used to submit the form.
+                forms.forEach(form => {
+                    bookwyrm.addRemoveClass(form, 'is-processing', false);
+                    trigger.removeAttribute('disabled');
+                });
             })
             .then(function() {
-                allTriggers.forEach(node => bookwyrm.addRemoveClass(
-                    node,
+                forms.forEach(form => bookwyrm.addRemoveClass(
+                    form,
                     'is-hidden',
-                    node.className.indexOf('is-hidden') == -1
+                    form.className.indexOf('is-hidden') == -1
                 ));
             })
             .catch(error => {
@@ -269,10 +271,10 @@ let BookWyrm = new class {
                 //       For now, the absence of change will be enough.
                 console.warn('Request failed:', error);
 
-                allTriggers.forEach(node => bookwyrm.addRemoveClass(
-                    node,
+                forms.forEach(form => bookwyrm.addRemoveClass(
+                    form,
                     'has-error',
-                    node.className.indexOf('is-hidden') == -1
+                    form.className.indexOf('is-hidden') == -1
                 ));
             });
     }

From 2f90b4ce66d8000ca66ff041d992e66faf760e26 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Thu, 8 Apr 2021 11:37:14 +0200
Subject: [PATCH 0725/1285] [assets] Fix broken actions for focus and checkbox:

This commit should address the following two comments:

- https://github.com/mouse-reeve/bookwyrm/pull/883#discussion_r609172258
- https://github.com/mouse-reeve/bookwyrm/pull/883#discussion_r609174513
---
 bookwyrm/static/js/bookwyrm.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index b01d7fe2..63f10561 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -156,14 +156,14 @@ let BookWyrm = new class {
         }
 
         // Check checkbox, if appropriate.
-        let checkbox = trigger.dataset['controls-checkbox'];
+        let checkbox = trigger.dataset.controlsCheckbox;
 
         if (checkbox) {
             this.toggleCheckbox(checkbox, pressed);
         }
 
         // Set focus, if appropriate.
-        let focus = trigger.dataset['focus-target'];
+        let focus = trigger.dataset.focusTarget;
 
         if (focus) {
             this.toggleFocus(focus);

From b92ff9752dd93822c5a019c8f0b119b02c069987 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Thu, 8 Apr 2021 17:37:29 +0200
Subject: [PATCH 0726/1285] [assets] Remove UI and behaviours for interactions:

This commit addresses https://github.com/mouse-reeve/bookwyrm/pull/883#discussion_r609739553.
---
 bookwyrm/static/css/bookwyrm.css | 28 ------------------
 bookwyrm/static/js/bookwyrm.js   | 49 ++++++++------------------------
 2 files changed, 12 insertions(+), 65 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 8c4acc86..c7451a3f 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -235,34 +235,6 @@ html {
     right: 0;
 }
 
-/** Animations and transitions
- ******************************************************************************/
-
-@keyframes beating {
-    0% { font-size: 100%; }
-    25% { font-size: 125%; }
-    100% { font-size: 75%; }
-}
-
-@keyframes turning {
-    from { transform: rotateZ(0deg); }
-    to { transform: rotateZ(360deg); }
-}
-
-.is-processing .icon-heart::before {
-    animation: beating 0.5s infinite alternate ease-in-out;
-}
-
-.is-processing .icon-boost::before {
-    animation: turning 0.5s infinite ease-in-out;
-}
-
-@media (prefers-reduced-motion: reduce) {
-    .is-processing .icon::before {
-        animation-duration: 1.5s;
-    }
-}
-
 /* States
  ******************************************************************************/
 
diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index 63f10561..485daf15 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -238,45 +238,20 @@ let BookWyrm = new class {
         event.preventDefault();
 
         const bookwyrm = this;
-        const trigger = event.submitter;
-        const target = event.currentTarget;
-        const forms = document.querySelectorAll(`.${target.dataset.id}`);
+        const form = event.currentTarget;
+        const relatedforms = document.querySelectorAll(`.${form.dataset.id}`);
 
-        // Change icon to show ongoing activity on the current UI.
-        // Disable the element used to submit the form to prevent duplicated requests.
-        // @todo Ideally, disable all potential ways to submit this specific form.
-        forms.forEach(form => {
-            bookwyrm.addRemoveClass(form, 'is-processing', true);
-            trigger.setAttribute('disabled', null);
+        // Toggle class on all related forms.
+        relatedforms.forEach(relatedForm => bookwyrm.addRemoveClass(
+            relatedForm,
+            'is-hidden',
+            relatedForm.className.indexOf('is-hidden') == -1
+        ));
+
+        this.ajaxPost(form).catch(error => {
+            // @todo Display a notification in the UI instead.
+            console.warn('Request failed:', error);
         });
-
-        this.ajaxPost(target)
-            .finally(() => {
-                // Change icon to remove ongoing activity on the current UI.
-                // Enable back the element used to submit the form.
-                forms.forEach(form => {
-                    bookwyrm.addRemoveClass(form, 'is-processing', false);
-                    trigger.removeAttribute('disabled');
-                });
-            })
-            .then(function() {
-                forms.forEach(form => bookwyrm.addRemoveClass(
-                    form,
-                    'is-hidden',
-                    form.className.indexOf('is-hidden') == -1
-                ));
-            })
-            .catch(error => {
-                // @todo Display a notification in the UI instead.
-                //       For now, the absence of change will be enough.
-                console.warn('Request failed:', error);
-
-                forms.forEach(form => bookwyrm.addRemoveClass(
-                    form,
-                    'has-error',
-                    form.className.indexOf('is-hidden') == -1
-                ));
-            });
     }
 
     /**

From 779377bd0cf1bdf92dd74bafd08f00b252a7a812 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 8 Apr 2021 08:59:07 -0700
Subject: [PATCH 0727/1285] Makes localname case insensitive

---
 .../migrations/0063_auto_20210408_1556.py     | 27 +++++++++++++++++++
 bookwyrm/models/user.py                       |  3 ++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 bookwyrm/migrations/0063_auto_20210408_1556.py

diff --git a/bookwyrm/migrations/0063_auto_20210408_1556.py b/bookwyrm/migrations/0063_auto_20210408_1556.py
new file mode 100644
index 00000000..750997fb
--- /dev/null
+++ b/bookwyrm/migrations/0063_auto_20210408_1556.py
@@ -0,0 +1,27 @@
+# Generated by Django 3.1.6 on 2021-04-08 15:56
+
+import bookwyrm.models.fields
+import django.contrib.postgres.fields.citext
+import django.contrib.postgres.operations
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0062_auto_20210407_1545"),
+    ]
+
+    operations = [
+        django.contrib.postgres.operations.CITextExtension(),
+        migrations.AlterField(
+            model_name="user",
+            name="localname",
+            field=django.contrib.postgres.fields.citext.CICharField(
+                max_length=255,
+                null=True,
+                unique=True,
+                validators=[bookwyrm.models.fields.validate_localname],
+            ),
+        ),
+    ]
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index dcc4162e..c519f76c 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -4,6 +4,7 @@ from urllib.parse import urlparse
 
 from django.apps import apps
 from django.contrib.auth.models import AbstractUser, Group
+from django.contrib.postgres.fields import CICharField
 from django.core.validators import MinValueValidator
 from django.db import models
 from django.utils import timezone
@@ -54,7 +55,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
     summary = fields.HtmlField(null=True, blank=True)
     local = models.BooleanField(default=False)
     bookwyrm_user = fields.BooleanField(default=True)
-    localname = models.CharField(
+    localname = CICharField(
         max_length=255,
         null=True,
         unique=True,

From 0de1b8d0c39c85ffa015f1d8d6824685b38286ad Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 8 Apr 2021 09:59:21 -0700
Subject: [PATCH 0728/1285] Case insensitive remote user search

---
 bookwyrm/tests/views/test_helpers.py | 3 +++
 bookwyrm/views/helpers.py            | 2 +-
 bookwyrm/views/search.py             | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py
index c646b4b4..7d2bc42c 100644
--- a/bookwyrm/tests/views/test_helpers.py
+++ b/bookwyrm/tests/views/test_helpers.py
@@ -112,6 +112,9 @@ class ViewsHelpers(TestCase):
         result = views.helpers.handle_remote_webfinger("mouse@local.com")
         self.assertEqual(result, self.local_user)
 
+        result = views.helpers.handle_remote_webfinger("mOuSe@loCal.cOm")
+        self.assertEqual(result, self.local_user)
+
     @responses.activate
     def test_load_user(self, _):
         """ find a remote user using webfinger """
diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index 41e6a608..2b6501ff 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -124,7 +124,7 @@ def handle_remote_webfinger(query):
         return None
 
     try:
-        user = models.User.objects.get(username=query)
+        user = models.User.objects.get(username__iexact=query)
     except models.User.DoesNotExist:
         url = "https://%s/.well-known/webfinger?resource=acct:%s" % (domain, query)
         try:
diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py
index 28f393c8..9e7df9f4 100644
--- a/bookwyrm/views/search.py
+++ b/bookwyrm/views/search.py
@@ -34,7 +34,7 @@ class Search(View):
         if query and re.match(regex.full_username, query):
             handle_remote_webfinger(query)
 
-        # do a  user search
+        # do a user search
         user_results = (
             models.User.viewer_aware_objects(request.user)
             .annotate(

From 29f5b1512aab7c2c5b1f3bd417e3d44b25cd4379 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Apr 2021 18:47:59 +0000
Subject: [PATCH 0729/1285] Bump django from 3.1.6 to 3.1.8

Bumps [django](https://github.com/django/django) from 3.1.6 to 3.1.8.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.1.6...3.1.8)

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 16561da5..6b7d82d3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 celery==4.4.2
-Django==3.1.6
+Django==3.1.8
 django-model-utils==4.0.0
 environs==7.2.0
 flower==0.9.4

From 9894b777b6bc1678a33ff78d980364fc02c54915 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 8 Apr 2021 11:18:32 -0700
Subject: [PATCH 0730/1285] Separates inbox tests into multiple files

---
 bookwyrm/tests/views/inbox/__init__.py        |   1 +
 bookwyrm/tests/views/inbox/test_inbox.py      |  99 ++
 bookwyrm/tests/views/inbox/test_inbox_add.py  | 157 +++
 .../tests/views/inbox/test_inbox_announce.py  | 191 ++++
 .../tests/views/inbox/test_inbox_block.py     |  99 ++
 .../tests/views/inbox/test_inbox_create.py    | 151 +++
 .../tests/views/inbox/test_inbox_delete.py    | 107 ++
 .../tests/views/inbox/test_inbox_follow.py    | 206 ++++
 bookwyrm/tests/views/inbox/test_inbox_like.py | 111 ++
 .../tests/views/inbox/test_inbox_remove.py    |  62 ++
 .../tests/views/inbox/test_inbox_update.py    | 150 +++
 bookwyrm/tests/views/test_inbox.py            | 988 ------------------
 12 files changed, 1334 insertions(+), 988 deletions(-)
 create mode 100644 bookwyrm/tests/views/inbox/__init__.py
 create mode 100644 bookwyrm/tests/views/inbox/test_inbox.py
 create mode 100644 bookwyrm/tests/views/inbox/test_inbox_add.py
 create mode 100644 bookwyrm/tests/views/inbox/test_inbox_announce.py
 create mode 100644 bookwyrm/tests/views/inbox/test_inbox_block.py
 create mode 100644 bookwyrm/tests/views/inbox/test_inbox_create.py
 create mode 100644 bookwyrm/tests/views/inbox/test_inbox_delete.py
 create mode 100644 bookwyrm/tests/views/inbox/test_inbox_follow.py
 create mode 100644 bookwyrm/tests/views/inbox/test_inbox_like.py
 create mode 100644 bookwyrm/tests/views/inbox/test_inbox_remove.py
 create mode 100644 bookwyrm/tests/views/inbox/test_inbox_update.py
 delete mode 100644 bookwyrm/tests/views/test_inbox.py

diff --git a/bookwyrm/tests/views/inbox/__init__.py b/bookwyrm/tests/views/inbox/__init__.py
new file mode 100644
index 00000000..b6e690fd
--- /dev/null
+++ b/bookwyrm/tests/views/inbox/__init__.py
@@ -0,0 +1 @@
+from . import *
diff --git a/bookwyrm/tests/views/inbox/test_inbox.py b/bookwyrm/tests/views/inbox/test_inbox.py
new file mode 100644
index 00000000..992394a9
--- /dev/null
+++ b/bookwyrm/tests/views/inbox/test_inbox.py
@@ -0,0 +1,99 @@
+""" tests incoming activities"""
+import json
+from unittest.mock import patch
+
+from django.http import HttpResponseNotAllowed, HttpResponseNotFound
+from django.test import TestCase, Client
+
+from bookwyrm import models
+
+
+# pylint: disable=too-many-public-methods
+class Inbox(TestCase):
+    """ readthrough tests """
+
+    def setUp(self):
+        """ basic user and book data """
+        self.client = Client()
+        self.create_json = {
+            "id": "hi",
+            "type": "Create",
+            "actor": "hi",
+            "to": ["https://www.w3.org/ns/activitystreams#public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "object": {},
+        }
+        models.SiteSettings.objects.create()
+
+    def test_inbox_invalid_get(self):
+        """ shouldn't try to handle if the user is not found """
+        result = self.client.get("/inbox", content_type="application/json")
+        self.assertIsInstance(result, HttpResponseNotAllowed)
+
+    def test_inbox_invalid_user(self):
+        """ shouldn't try to handle if the user is not found """
+        result = self.client.post(
+            "/user/bleh/inbox",
+            '{"type": "Test", "object": "exists"}',
+            content_type="application/json",
+        )
+        self.assertIsInstance(result, HttpResponseNotFound)
+
+    def test_inbox_invalid_bad_signature(self):
+        """ bad request for invalid signature """
+        with patch("bookwyrm.views.inbox.has_valid_signature") as mock_valid:
+            mock_valid.return_value = False
+            result = self.client.post(
+                "/user/mouse/inbox",
+                '{"type": "Announce", "object": "exists"}',
+                content_type="application/json",
+            )
+            self.assertEqual(result.status_code, 401)
+
+    def test_inbox_invalid_bad_signature_delete(self):
+        """ invalid signature for Delete is okay though """
+        with patch("bookwyrm.views.inbox.has_valid_signature") as mock_valid:
+            mock_valid.return_value = False
+            result = self.client.post(
+                "/user/mouse/inbox",
+                '{"type": "Delete", "object": "exists"}',
+                content_type="application/json",
+            )
+            self.assertEqual(result.status_code, 200)
+
+    def test_inbox_unknown_type(self):
+        """ never heard of that activity type, don't have a handler for it """
+        with patch("bookwyrm.views.inbox.has_valid_signature") as mock_valid:
+            result = self.client.post(
+                "/inbox",
+                '{"type": "Fish", "object": "exists"}',
+                content_type="application/json",
+            )
+            mock_valid.return_value = True
+            self.assertIsInstance(result, HttpResponseNotFound)
+
+    def test_inbox_success(self):
+        """ a known type, for which we start a task """
+        activity = self.create_json
+        activity["object"] = {
+            "id": "https://example.com/list/22",
+            "type": "BookList",
+            "totalItems": 1,
+            "first": "https://example.com/list/22?page=1",
+            "last": "https://example.com/list/22?page=1",
+            "name": "Test List",
+            "owner": "https://example.com/user/mouse",
+            "to": ["https://www.w3.org/ns/activitystreams#Public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "summary": "summary text",
+            "curation": "curated",
+            "@context": "https://www.w3.org/ns/activitystreams",
+        }
+        with patch("bookwyrm.views.inbox.has_valid_signature") as mock_valid:
+            mock_valid.return_value = True
+
+            with patch("bookwyrm.views.inbox.activity_task.delay"):
+                result = self.client.post(
+                    "/inbox", json.dumps(activity), content_type="application/json"
+                )
+        self.assertEqual(result.status_code, 200)
diff --git a/bookwyrm/tests/views/inbox/test_inbox_add.py b/bookwyrm/tests/views/inbox/test_inbox_add.py
new file mode 100644
index 00000000..c22691ad
--- /dev/null
+++ b/bookwyrm/tests/views/inbox/test_inbox_add.py
@@ -0,0 +1,157 @@
+""" tests incoming activities"""
+from unittest.mock import patch
+
+from django.test import TestCase
+import responses
+
+from bookwyrm import models, views
+
+
+# pylint: disable=too-many-public-methods
+class InboxActivities(TestCase):
+    """ inbox tests """
+
+    def setUp(self):
+        """ basic user and book data """
+        self.local_user = models.User.objects.create_user(
+            "mouse@example.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+        )
+        self.local_user.remote_id = "https://example.com/user/mouse"
+        self.local_user.save(broadcast=False)
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            self.remote_user = models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
+
+        models.SiteSettings.objects.create()
+
+
+    def test_handle_add_book_to_shelf(self):
+        """ shelving a book """
+        work = models.Work.objects.create(title="work title")
+        book = models.Edition.objects.create(
+            title="Test",
+            remote_id="https://bookwyrm.social/book/37292",
+            parent_work=work,
+        )
+        shelf = models.Shelf.objects.create(user=self.remote_user, name="Test Shelf")
+        shelf.remote_id = "https://bookwyrm.social/user/mouse/shelf/to-read"
+        shelf.save()
+
+        activity = {
+            "id": "https://bookwyrm.social/shelfbook/6189#add",
+            "type": "Add",
+            "actor": "https://example.com/users/rat",
+            "object": {
+                "type": "Edition",
+                "title": "Test Title",
+                "work": work.remote_id,
+                "id": "https://bookwyrm.social/book/37292",
+            },
+            "target": "https://bookwyrm.social/user/mouse/shelf/to-read",
+            "@context": "https://www.w3.org/ns/activitystreams",
+        }
+        views.inbox.activity_task(activity)
+        self.assertEqual(shelf.books.first(), book)
+
+    @responses.activate
+    def test_handle_add_book_to_list(self):
+        """ listing a book """
+        work = models.Work.objects.create(title="work title")
+        book = models.Edition.objects.create(
+            title="Test",
+            remote_id="https://bookwyrm.social/book/37292",
+            parent_work=work,
+        )
+
+        responses.add(
+            responses.GET,
+            "https://bookwyrm.social/user/mouse/list/to-read",
+            json={
+                "id": "https://example.com/list/22",
+                "type": "BookList",
+                "totalItems": 1,
+                "first": "https://example.com/list/22?page=1",
+                "last": "https://example.com/list/22?page=1",
+                "name": "Test List",
+                "owner": "https://example.com/user/mouse",
+                "to": ["https://www.w3.org/ns/activitystreams#Public"],
+                "cc": ["https://example.com/user/mouse/followers"],
+                "summary": "summary text",
+                "curation": "curated",
+                "@context": "https://www.w3.org/ns/activitystreams",
+            },
+        )
+
+        activity = {
+            "id": "https://bookwyrm.social/listbook/6189#add",
+            "type": "Add",
+            "actor": "https://example.com/users/rat",
+            "object": {
+                "type": "Edition",
+                "title": "Test Title",
+                "work": work.remote_id,
+                "id": "https://bookwyrm.social/book/37292",
+            },
+            "target": "https://bookwyrm.social/user/mouse/list/to-read",
+            "@context": "https://www.w3.org/ns/activitystreams",
+        }
+        views.inbox.activity_task(activity)
+
+        booklist = models.List.objects.get()
+        self.assertEqual(booklist.name, "Test List")
+        self.assertEqual(booklist.books.first(), book)
+
+    @responses.activate
+    def test_handle_tag_book(self):
+        """ listing a book """
+        work = models.Work.objects.create(title="work title")
+        book = models.Edition.objects.create(
+            title="Test",
+            remote_id="https://bookwyrm.social/book/37292",
+            parent_work=work,
+        )
+
+        responses.add(
+            responses.GET,
+            "https://www.example.com/tag/cool-tag",
+            json={
+                "id": "https://1b1a78582461.ngrok.io/tag/tag",
+                "type": "OrderedCollection",
+                "totalItems": 0,
+                "first": "https://1b1a78582461.ngrok.io/tag/tag?page=1",
+                "last": "https://1b1a78582461.ngrok.io/tag/tag?page=1",
+                "name": "cool tag",
+                "@context": "https://www.w3.org/ns/activitystreams",
+            },
+        )
+
+        activity = {
+            "id": "https://bookwyrm.social/listbook/6189#add",
+            "type": "Add",
+            "actor": "https://example.com/users/rat",
+            "object": {
+                "type": "Edition",
+                "title": "Test Title",
+                "work": work.remote_id,
+                "id": "https://bookwyrm.social/book/37292",
+            },
+            "target": "https://www.example.com/tag/cool-tag",
+            "@context": "https://www.w3.org/ns/activitystreams",
+        }
+        views.inbox.activity_task(activity)
+
+        tag = models.Tag.objects.get()
+        self.assertFalse(models.List.objects.exists())
+        self.assertEqual(tag.name, "cool tag")
+        self.assertEqual(tag.books.first(), book)
diff --git a/bookwyrm/tests/views/inbox/test_inbox_announce.py b/bookwyrm/tests/views/inbox/test_inbox_announce.py
new file mode 100644
index 00000000..e08d0f5f
--- /dev/null
+++ b/bookwyrm/tests/views/inbox/test_inbox_announce.py
@@ -0,0 +1,191 @@
+""" tests incoming activities"""
+from unittest.mock import patch
+
+from django.test import TestCase
+import responses
+
+from bookwyrm import models, views
+
+
+# pylint: disable=too-many-public-methods
+class InboxActivities(TestCase):
+    """ inbox tests """
+
+    def setUp(self):
+        """ basic user and book data """
+        self.local_user = models.User.objects.create_user(
+            "mouse@example.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+        )
+        self.local_user.remote_id = "https://example.com/user/mouse"
+        self.local_user.save(broadcast=False)
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            self.remote_user = models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+                self.status = models.Status.objects.create(
+                    user=self.local_user,
+                    content="Test status",
+                    remote_id="https://example.com/status/1",
+                )
+
+        self.create_json = {
+            "id": "hi",
+            "type": "Create",
+            "actor": "hi",
+            "to": ["https://www.w3.org/ns/activitystreams#public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "object": {},
+        }
+        models.SiteSettings.objects.create()
+
+
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_handle_boost(self, _):
+        """ boost a status """
+        self.assertEqual(models.Notification.objects.count(), 0)
+        activity = {
+            "type": "Announce",
+            "id": "%s/boost" % self.status.remote_id,
+            "actor": self.remote_user.remote_id,
+            "object": self.status.remote_id,
+            "to": ["https://www.w3.org/ns/activitystreams#public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "published": "Mon, 25 May 2020 19:31:20 GMT",
+        }
+        with patch("bookwyrm.models.status.Status.ignore_activity") as discarder:
+            discarder.return_value = False
+            views.inbox.activity_task(activity)
+        boost = models.Boost.objects.get()
+        self.assertEqual(boost.boosted_status, self.status)
+        notification = models.Notification.objects.get()
+        self.assertEqual(notification.user, self.local_user)
+        self.assertEqual(notification.related_status, self.status)
+
+    @responses.activate
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_handle_boost_remote_status(self, redis_mock):
+        """ boost a status """
+        work = models.Work.objects.create(title="work title")
+        book = models.Edition.objects.create(
+            title="Test",
+            remote_id="https://bookwyrm.social/book/37292",
+            parent_work=work,
+        )
+        self.assertEqual(models.Notification.objects.count(), 0)
+        activity = {
+            "type": "Announce",
+            "id": "%s/boost" % self.status.remote_id,
+            "actor": self.remote_user.remote_id,
+            "object": "https://remote.com/status/1",
+            "to": ["https://www.w3.org/ns/activitystreams#public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "published": "Mon, 25 May 2020 19:31:20 GMT",
+        }
+        responses.add(
+            responses.GET,
+            "https://remote.com/status/1",
+            json={
+                "id": "https://remote.com/status/1",
+                "type": "Comment",
+                "published": "2021-04-05T18:04:59.735190+00:00",
+                "attributedTo": self.remote_user.remote_id,
+                "content": "<p>a comment</p>",
+                "to": ["https://www.w3.org/ns/activitystreams#Public"],
+                "cc": ["https://b875df3d118b.ngrok.io/user/mouse/followers"],
+                "inReplyTo": "",
+                "inReplyToBook": book.remote_id,
+                "summary": "",
+                "tag": [],
+                "sensitive": False,
+                "@context": "https://www.w3.org/ns/activitystreams",
+            },
+        )
+
+        with patch("bookwyrm.models.status.Status.ignore_activity") as discarder:
+            discarder.return_value = False
+            views.inbox.activity_task(activity)
+            self.assertTrue(redis_mock.called)
+
+        boost = models.Boost.objects.get()
+        self.assertEqual(boost.boosted_status.remote_id, "https://remote.com/status/1")
+        self.assertEqual(boost.boosted_status.comment.status_type, "Comment")
+        self.assertEqual(boost.boosted_status.comment.book, book)
+
+    @responses.activate
+    def test_handle_discarded_boost(self):
+        """ test a boost of a mastodon status that will be discarded """
+        status = models.Status(
+            content="hi",
+            user=self.remote_user,
+        )
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+            status.save(broadcast=False)
+        activity = {
+            "type": "Announce",
+            "id": "http://www.faraway.com/boost/12",
+            "actor": self.remote_user.remote_id,
+            "object": status.remote_id,
+        }
+        responses.add(
+            responses.GET, status.remote_id, json=status.to_activity(), status=200
+        )
+        views.inbox.activity_task(activity)
+        self.assertEqual(models.Boost.objects.count(), 0)
+
+    def test_handle_unboost(self):
+        """ undo a boost """
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+            boost = models.Boost.objects.create(
+                boosted_status=self.status, user=self.remote_user
+            )
+        activity = {
+            "type": "Undo",
+            "actor": "hi",
+            "id": "bleh",
+            "to": ["https://www.w3.org/ns/activitystreams#public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "object": {
+                "type": "Announce",
+                "id": boost.remote_id,
+                "actor": self.remote_user.remote_id,
+                "object": self.status.remote_id,
+                "to": ["https://www.w3.org/ns/activitystreams#public"],
+                "cc": ["https://example.com/user/mouse/followers"],
+                "published": "Mon, 25 May 2020 19:31:20 GMT",
+            },
+        }
+        with patch(
+            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
+        ) as redis_mock:
+            views.inbox.activity_task(activity)
+            self.assertTrue(redis_mock.called)
+        self.assertFalse(models.Boost.objects.exists())
+
+    def test_handle_unboost_unknown_boost(self):
+        """ undo a boost """
+        activity = {
+            "type": "Undo",
+            "actor": "hi",
+            "id": "bleh",
+            "to": ["https://www.w3.org/ns/activitystreams#public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "object": {
+                "type": "Announce",
+                "id": "http://fake.com/unknown/boost",
+                "actor": self.remote_user.remote_id,
+                "object": self.status.remote_id,
+            },
+        }
+        views.inbox.activity_task(activity)
diff --git a/bookwyrm/tests/views/inbox/test_inbox_block.py b/bookwyrm/tests/views/inbox/test_inbox_block.py
new file mode 100644
index 00000000..5f6fcb37
--- /dev/null
+++ b/bookwyrm/tests/views/inbox/test_inbox_block.py
@@ -0,0 +1,99 @@
+""" tests incoming activities"""
+from unittest.mock import patch
+
+from django.test import TestCase
+
+from bookwyrm import models, views
+
+
+# pylint: disable=too-many-public-methods
+class InboxBlock(TestCase):
+    """ inbox tests """
+
+    def setUp(self):
+        """ basic user and book data """
+        self.local_user = models.User.objects.create_user(
+            "mouse@example.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+        )
+        self.local_user.remote_id = "https://example.com/user/mouse"
+        self.local_user.save(broadcast=False)
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            self.remote_user = models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
+
+        models.SiteSettings.objects.create()
+
+
+    def test_handle_blocks(self):
+        """ create a "block" database entry from an activity """
+        self.local_user.followers.add(self.remote_user)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            models.UserFollowRequest.objects.create(
+                user_subject=self.local_user, user_object=self.remote_user
+            )
+        self.assertTrue(models.UserFollows.objects.exists())
+        self.assertTrue(models.UserFollowRequest.objects.exists())
+
+        activity = {
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "id": "https://example.com/9e1f41ac-9ddd-4159",
+            "type": "Block",
+            "actor": "https://example.com/users/rat",
+            "object": "https://example.com/user/mouse",
+        }
+
+        with patch(
+            "bookwyrm.activitystreams.ActivityStream.remove_user_statuses"
+        ) as redis_mock:
+            views.inbox.activity_task(activity)
+            self.assertTrue(redis_mock.called)
+        views.inbox.activity_task(activity)
+        block = models.UserBlocks.objects.get()
+        self.assertEqual(block.user_subject, self.remote_user)
+        self.assertEqual(block.user_object, self.local_user)
+        self.assertEqual(block.remote_id, "https://example.com/9e1f41ac-9ddd-4159")
+
+        self.assertFalse(models.UserFollows.objects.exists())
+        self.assertFalse(models.UserFollowRequest.objects.exists())
+
+    def test_handle_unblock(self):
+        """ unblock a user """
+        self.remote_user.blocks.add(self.local_user)
+
+        block = models.UserBlocks.objects.get()
+        block.remote_id = "https://example.com/9e1f41ac-9ddd-4159"
+        block.save()
+
+        self.assertEqual(block.user_subject, self.remote_user)
+        self.assertEqual(block.user_object, self.local_user)
+        activity = {
+            "type": "Undo",
+            "actor": "hi",
+            "id": "bleh",
+            "to": ["https://www.w3.org/ns/activitystreams#public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "object": {
+                "@context": "https://www.w3.org/ns/activitystreams",
+                "id": "https://example.com/9e1f41ac-9ddd-4159",
+                "type": "Block",
+                "actor": "https://example.com/users/rat",
+                "object": "https://example.com/user/mouse",
+            },
+        }
+        with patch(
+            "bookwyrm.activitystreams.ActivityStream.add_user_statuses"
+        ) as redis_mock:
+            views.inbox.activity_task(activity)
+            self.assertTrue(redis_mock.called)
+        self.assertFalse(models.UserBlocks.objects.exists())
diff --git a/bookwyrm/tests/views/inbox/test_inbox_create.py b/bookwyrm/tests/views/inbox/test_inbox_create.py
new file mode 100644
index 00000000..ed8a777f
--- /dev/null
+++ b/bookwyrm/tests/views/inbox/test_inbox_create.py
@@ -0,0 +1,151 @@
+""" tests incoming activities"""
+import json
+import pathlib
+from unittest.mock import patch
+
+from django.test import TestCase
+
+from bookwyrm import models, views
+
+
+# pylint: disable=too-many-public-methods
+class InboxActivities(TestCase):
+    """ readthrough tests """
+
+    def setUp(self):
+        """ basic user and book data """
+        self.local_user = models.User.objects.create_user(
+            "mouse@example.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+        )
+        self.local_user.remote_id = "https://example.com/user/mouse"
+        self.local_user.save(broadcast=False)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+                self.status = models.Status.objects.create(
+                    user=self.local_user,
+                    content="Test status",
+                    remote_id="https://example.com/status/1",
+                )
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+           models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
+
+        self.create_json = {
+            "id": "hi",
+            "type": "Create",
+            "actor": "hi",
+            "to": ["https://www.w3.org/ns/activitystreams#public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "object": {},
+        }
+        models.SiteSettings.objects.create()
+
+    def test_handle_create_status(self):
+        """ the "it justs works" mode """
+        self.assertEqual(models.Status.objects.count(), 1)
+
+        datafile = pathlib.Path(__file__).parent.joinpath(
+            "../../data/ap_quotation.json"
+        )
+        status_data = json.loads(datafile.read_bytes())
+        models.Edition.objects.create(
+            title="Test Book", remote_id="https://example.com/book/1"
+        )
+        activity = self.create_json
+        activity["object"] = status_data
+
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
+            views.inbox.activity_task(activity)
+            self.assertTrue(redis_mock.called)
+
+        status = models.Quotation.objects.get()
+        self.assertEqual(
+            status.remote_id, "https://example.com/user/mouse/quotation/13"
+        )
+        self.assertEqual(status.quote, "quote body")
+        self.assertEqual(status.content, "commentary")
+        self.assertEqual(status.user, self.local_user)
+        self.assertEqual(models.Status.objects.count(), 2)
+
+        # while we're here, lets ensure we avoid dupes
+        views.inbox.activity_task(activity)
+        self.assertEqual(models.Status.objects.count(), 2)
+
+    def test_handle_create_status_remote_note_with_mention(self):
+        """ should only create it under the right circumstances """
+        self.assertEqual(models.Status.objects.count(), 1)
+        self.assertFalse(
+            models.Notification.objects.filter(user=self.local_user).exists()
+        )
+
+        datafile = pathlib.Path(__file__).parent.joinpath("../../data/ap_note.json")
+        status_data = json.loads(datafile.read_bytes())
+        activity = self.create_json
+        activity["object"] = status_data
+
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
+            views.inbox.activity_task(activity)
+            self.assertTrue(redis_mock.called)
+        status = models.Status.objects.last()
+        self.assertEqual(status.content, "test content in note")
+        self.assertEqual(status.mention_users.first(), self.local_user)
+        self.assertTrue(
+            models.Notification.objects.filter(user=self.local_user).exists()
+        )
+        self.assertEqual(models.Notification.objects.get().notification_type, "MENTION")
+
+    def test_handle_create_status_remote_note_with_reply(self):
+        """ should only create it under the right circumstances """
+        self.assertEqual(models.Status.objects.count(), 1)
+        self.assertFalse(models.Notification.objects.filter(user=self.local_user))
+
+        datafile = pathlib.Path(__file__).parent.joinpath("../../data/ap_note.json")
+        status_data = json.loads(datafile.read_bytes())
+        del status_data["tag"]
+        status_data["inReplyTo"] = self.status.remote_id
+        activity = self.create_json
+        activity["object"] = status_data
+
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
+            views.inbox.activity_task(activity)
+            self.assertTrue(redis_mock.called)
+        status = models.Status.objects.last()
+        self.assertEqual(status.content, "test content in note")
+        self.assertEqual(status.reply_parent, self.status)
+        self.assertTrue(models.Notification.objects.filter(user=self.local_user))
+        self.assertEqual(models.Notification.objects.get().notification_type, "REPLY")
+
+    def test_handle_create_list(self):
+        """ a new list """
+        activity = self.create_json
+        activity["object"] = {
+            "id": "https://example.com/list/22",
+            "type": "BookList",
+            "totalItems": 1,
+            "first": "https://example.com/list/22?page=1",
+            "last": "https://example.com/list/22?page=1",
+            "name": "Test List",
+            "owner": "https://example.com/user/mouse",
+            "to": ["https://www.w3.org/ns/activitystreams#Public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "summary": "summary text",
+            "curation": "curated",
+            "@context": "https://www.w3.org/ns/activitystreams",
+        }
+        views.inbox.activity_task(activity)
+        book_list = models.List.objects.get()
+        self.assertEqual(book_list.name, "Test List")
+        self.assertEqual(book_list.curation, "curated")
+        self.assertEqual(book_list.description, "summary text")
+        self.assertEqual(book_list.remote_id, "https://example.com/list/22")
diff --git a/bookwyrm/tests/views/inbox/test_inbox_delete.py b/bookwyrm/tests/views/inbox/test_inbox_delete.py
new file mode 100644
index 00000000..7d97a251
--- /dev/null
+++ b/bookwyrm/tests/views/inbox/test_inbox_delete.py
@@ -0,0 +1,107 @@
+""" tests incoming activities"""
+from datetime import datetime
+from unittest.mock import patch
+
+from django.test import TestCase
+
+from bookwyrm import models, views
+
+
+# pylint: disable=too-many-public-methods
+class InboxActivities(TestCase):
+    """ inbox tests """
+
+    def setUp(self):
+        """ basic user and book data """
+        self.local_user = models.User.objects.create_user(
+            "mouse@example.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+        )
+        self.local_user.remote_id = "https://example.com/user/mouse"
+        self.local_user.save(broadcast=False)
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            self.remote_user = models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+            self.status = models.Status.objects.create(
+                user=self.remote_user,
+                content="Test status",
+                remote_id="https://example.com/status/1",
+            )
+
+        self.create_json = {
+            "id": "hi",
+            "type": "Create",
+            "actor": "hi",
+            "to": ["https://www.w3.org/ns/activitystreams#public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "object": {},
+        }
+        models.SiteSettings.objects.create()
+
+
+    def test_handle_delete_status(self):
+        """ remove a status """
+        self.assertFalse(self.status.deleted)
+        activity = {
+            "type": "Delete",
+            "to": ["https://www.w3.org/ns/activitystreams#Public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "id": "%s/activity" % self.status.remote_id,
+            "actor": self.remote_user.remote_id,
+            "object": {"id": self.status.remote_id, "type": "Tombstone"},
+        }
+        with patch(
+            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
+        ) as redis_mock:
+            views.inbox.activity_task(activity)
+            self.assertTrue(redis_mock.called)
+        # deletion doens't remove the status, it turns it into a tombstone
+        status = models.Status.objects.get()
+        self.assertTrue(status.deleted)
+        self.assertIsInstance(status.deleted_date, datetime)
+
+    def test_handle_delete_status_notifications(self):
+        """ remove a status with related notifications """
+        models.Notification.objects.create(
+            related_status=self.status,
+            user=self.local_user,
+            notification_type="MENTION",
+        )
+        # this one is innocent, don't delete it
+        notif = models.Notification.objects.create(
+            user=self.local_user, notification_type="MENTION"
+        )
+        self.assertFalse(self.status.deleted)
+        self.assertEqual(models.Notification.objects.count(), 2)
+        activity = {
+            "type": "Delete",
+            "to": ["https://www.w3.org/ns/activitystreams#Public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "id": "%s/activity" % self.status.remote_id,
+            "actor": self.remote_user.remote_id,
+            "object": {"id": self.status.remote_id, "type": "Tombstone"},
+        }
+        with patch(
+            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
+        ) as redis_mock:
+            views.inbox.activity_task(activity)
+            self.assertTrue(redis_mock.called)
+        # deletion doens't remove the status, it turns it into a tombstone
+        status = models.Status.objects.get()
+        self.assertTrue(status.deleted)
+        self.assertIsInstance(status.deleted_date, datetime)
+
+        # notifications should be truly deleted
+        self.assertEqual(models.Notification.objects.count(), 1)
+        self.assertEqual(models.Notification.objects.get(), notif)
diff --git a/bookwyrm/tests/views/inbox/test_inbox_follow.py b/bookwyrm/tests/views/inbox/test_inbox_follow.py
new file mode 100644
index 00000000..58b577d1
--- /dev/null
+++ b/bookwyrm/tests/views/inbox/test_inbox_follow.py
@@ -0,0 +1,206 @@
+""" tests incoming activities"""
+from unittest.mock import patch
+
+from django.test import TestCase
+
+from bookwyrm import models, views
+
+
+# pylint: disable=too-many-public-methods
+class InboxRelationships(TestCase):
+    """ inbox tests """
+
+    def setUp(self):
+        """ basic user and book data """
+        self.local_user = models.User.objects.create_user(
+            "mouse@example.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+        )
+        self.local_user.remote_id = "https://example.com/user/mouse"
+        self.local_user.save(broadcast=False)
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            self.remote_user = models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
+
+        models.SiteSettings.objects.create()
+
+
+    def test_handle_follow(self):
+        """ remote user wants to follow local user """
+        activity = {
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "id": "https://example.com/users/rat/follows/123",
+            "type": "Follow",
+            "actor": "https://example.com/users/rat",
+            "object": "https://example.com/user/mouse",
+        }
+
+        self.assertFalse(models.UserFollowRequest.objects.exists())
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
+            views.inbox.activity_task(activity)
+            self.assertEqual(mock.call_count, 1)
+
+        # notification created
+        notification = models.Notification.objects.get()
+        self.assertEqual(notification.user, self.local_user)
+        self.assertEqual(notification.notification_type, "FOLLOW")
+
+        # the request should have been deleted
+        self.assertFalse(models.UserFollowRequest.objects.exists())
+
+        # the follow relationship should exist
+        follow = models.UserFollows.objects.get(user_object=self.local_user)
+        self.assertEqual(follow.user_subject, self.remote_user)
+
+    def test_handle_follow_manually_approved(self):
+        """ needs approval before following """
+        activity = {
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "id": "https://example.com/users/rat/follows/123",
+            "type": "Follow",
+            "actor": "https://example.com/users/rat",
+            "object": "https://example.com/user/mouse",
+        }
+
+        self.local_user.manually_approves_followers = True
+        self.local_user.save(broadcast=False)
+
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            views.inbox.activity_task(activity)
+
+        # notification created
+        notification = models.Notification.objects.get()
+        self.assertEqual(notification.user, self.local_user)
+        self.assertEqual(notification.notification_type, "FOLLOW_REQUEST")
+
+        # the request should exist
+        request = models.UserFollowRequest.objects.get()
+        self.assertEqual(request.user_subject, self.remote_user)
+        self.assertEqual(request.user_object, self.local_user)
+
+        # the follow relationship should not exist
+        follow = models.UserFollows.objects.all()
+        self.assertEqual(list(follow), [])
+
+    def test_handle_undo_follow_request(self):
+        """ the requester cancels a follow request """
+        self.local_user.manually_approves_followers = True
+        self.local_user.save(broadcast=False)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            request = models.UserFollowRequest.objects.create(
+                user_subject=self.remote_user, user_object=self.local_user
+            )
+        self.assertTrue(self.local_user.follower_requests.exists())
+
+        activity = {
+            "type": "Undo",
+            "id": "bleh",
+            "to": ["https://www.w3.org/ns/activitystreams#Public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "actor": self.remote_user.remote_id,
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "object": {
+                "@context": "https://www.w3.org/ns/activitystreams",
+                "id": request.remote_id,
+                "type": "Follow",
+                "actor": "https://example.com/users/rat",
+                "object": "https://example.com/user/mouse",
+            },
+        }
+
+        views.inbox.activity_task(activity)
+
+        self.assertFalse(self.local_user.follower_requests.exists())
+
+    def test_handle_unfollow(self):
+        """ remove a relationship """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            rel = models.UserFollows.objects.create(
+                user_subject=self.remote_user, user_object=self.local_user
+            )
+        activity = {
+            "type": "Undo",
+            "id": "bleh",
+            "to": ["https://www.w3.org/ns/activitystreams#Public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "actor": self.remote_user.remote_id,
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "object": {
+                "id": rel.remote_id,
+                "type": "Follow",
+                "actor": "https://example.com/users/rat",
+                "object": "https://example.com/user/mouse",
+            },
+        }
+        self.assertEqual(self.remote_user, self.local_user.followers.first())
+
+        views.inbox.activity_task(activity)
+        self.assertIsNone(self.local_user.followers.first())
+
+    def test_handle_follow_accept(self):
+        """ a remote user approved a follow request from local """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            rel = models.UserFollowRequest.objects.create(
+                user_subject=self.local_user, user_object=self.remote_user
+            )
+        activity = {
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "id": "https://example.com/users/rat/follows/123#accepts",
+            "type": "Accept",
+            "actor": "https://example.com/users/rat",
+            "object": {
+                "id": rel.remote_id,
+                "type": "Follow",
+                "actor": "https://example.com/user/mouse",
+                "object": "https://example.com/users/rat",
+            },
+        }
+
+        self.assertEqual(models.UserFollowRequest.objects.count(), 1)
+
+        views.inbox.activity_task(activity)
+
+        # request should be deleted
+        self.assertEqual(models.UserFollowRequest.objects.count(), 0)
+
+        # relationship should be created
+        follows = self.remote_user.followers
+        self.assertEqual(follows.count(), 1)
+        self.assertEqual(follows.first(), self.local_user)
+
+    def test_handle_follow_reject(self):
+        """ turn down a follow request """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            rel = models.UserFollowRequest.objects.create(
+                user_subject=self.local_user, user_object=self.remote_user
+            )
+        activity = {
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "id": "https://example.com/users/rat/follows/123#accepts",
+            "type": "Reject",
+            "actor": "https://example.com/users/rat",
+            "object": {
+                "id": rel.remote_id,
+                "type": "Follow",
+                "actor": "https://example.com/user/mouse",
+                "object": "https://example.com/users/rat",
+            },
+        }
+
+        self.assertEqual(models.UserFollowRequest.objects.count(), 1)
+
+        views.inbox.activity_task(activity)
+
+        # request should be deleted
+        self.assertFalse(models.UserFollowRequest.objects.exists())
+        self.assertFalse(self.remote_user.followers.exists())
diff --git a/bookwyrm/tests/views/inbox/test_inbox_like.py b/bookwyrm/tests/views/inbox/test_inbox_like.py
new file mode 100644
index 00000000..d569a9ca
--- /dev/null
+++ b/bookwyrm/tests/views/inbox/test_inbox_like.py
@@ -0,0 +1,111 @@
+""" tests incoming activities"""
+from unittest.mock import patch
+
+from django.test import TestCase
+
+from bookwyrm import models, views
+
+
+# pylint: disable=too-many-public-methods
+class InboxActivities(TestCase):
+    """ inbox tests """
+
+    def setUp(self):
+        """ basic user and book data """
+        self.local_user = models.User.objects.create_user(
+            "mouse@example.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+        )
+        self.local_user.remote_id = "https://example.com/user/mouse"
+        self.local_user.save(broadcast=False)
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            self.remote_user = models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+                self.status = models.Status.objects.create(
+                    user=self.local_user,
+                    content="Test status",
+                    remote_id="https://example.com/status/1",
+                )
+
+        self.create_json = {
+            "id": "hi",
+            "type": "Create",
+            "actor": "hi",
+            "to": ["https://www.w3.org/ns/activitystreams#public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "object": {},
+        }
+        models.SiteSettings.objects.create()
+
+
+    def test_handle_favorite(self):
+        """ fav a status """
+        activity = {
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "id": "https://example.com/fav/1",
+            "actor": "https://example.com/users/rat",
+            "type": "Like",
+            "published": "Mon, 25 May 2020 19:31:20 GMT",
+            "object": self.status.remote_id,
+        }
+
+        views.inbox.activity_task(activity)
+
+        fav = models.Favorite.objects.get(remote_id="https://example.com/fav/1")
+        self.assertEqual(fav.status, self.status)
+        self.assertEqual(fav.remote_id, "https://example.com/fav/1")
+        self.assertEqual(fav.user, self.remote_user)
+
+    def test_ignore_favorite(self):
+        """ don't try to save an unknown status """
+        activity = {
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "id": "https://example.com/fav/1",
+            "actor": "https://example.com/users/rat",
+            "type": "Like",
+            "published": "Mon, 25 May 2020 19:31:20 GMT",
+            "object": "https://unknown.status/not-found",
+        }
+
+        views.inbox.activity_task(activity)
+
+        self.assertFalse(models.Favorite.objects.exists())
+
+    def test_handle_unfavorite(self):
+        """ fav a status """
+        activity = {
+            "id": "https://example.com/fav/1#undo",
+            "type": "Undo",
+            "to": ["https://www.w3.org/ns/activitystreams#Public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "actor": self.remote_user.remote_id,
+            "object": {
+                "@context": "https://www.w3.org/ns/activitystreams",
+                "id": "https://example.com/fav/1",
+                "actor": "https://example.com/users/rat",
+                "type": "Like",
+                "published": "Mon, 25 May 2020 19:31:20 GMT",
+                "object": self.status.remote_id,
+            },
+        }
+        models.Favorite.objects.create(
+            status=self.status,
+            user=self.remote_user,
+            remote_id="https://example.com/fav/1",
+        )
+        self.assertEqual(models.Favorite.objects.count(), 1)
+
+        views.inbox.activity_task(activity)
+        self.assertEqual(models.Favorite.objects.count(), 0)
diff --git a/bookwyrm/tests/views/inbox/test_inbox_remove.py b/bookwyrm/tests/views/inbox/test_inbox_remove.py
new file mode 100644
index 00000000..d875abda
--- /dev/null
+++ b/bookwyrm/tests/views/inbox/test_inbox_remove.py
@@ -0,0 +1,62 @@
+""" tests incoming activities"""
+from unittest.mock import patch
+
+from django.test import TestCase
+
+from bookwyrm import models, views
+
+
+# pylint: disable=too-many-public-methods
+class InboxActivities(TestCase):
+    """ inbox tests """
+
+    def setUp(self):
+        """ basic user and book data """
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            self.remote_user = models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
+
+        models.SiteSettings.objects.create()
+
+
+    def test_handle_unshelve_book(self):
+        """ remove a book from a shelf """
+        work = models.Work.objects.create(title="work title")
+        book = models.Edition.objects.create(
+            title="Test",
+            remote_id="https://bookwyrm.social/book/37292",
+            parent_work=work,
+        )
+        shelf = models.Shelf.objects.create(user=self.remote_user, name="Test Shelf")
+        shelf.remote_id = "https://bookwyrm.social/user/mouse/shelf/to-read"
+        shelf.save()
+
+        shelfbook = models.ShelfBook.objects.create(
+            user=self.remote_user, shelf=shelf, book=book
+        )
+
+        self.assertEqual(shelf.books.first(), book)
+        self.assertEqual(shelf.books.count(), 1)
+
+        activity = {
+            "id": shelfbook.remote_id,
+            "type": "Remove",
+            "actor": "https://example.com/users/rat",
+            "object": {
+                "type": "Edition",
+                "title": "Test Title",
+                "work": work.remote_id,
+                "id": "https://bookwyrm.social/book/37292",
+            },
+            "target": "https://bookwyrm.social/user/mouse/shelf/to-read",
+            "@context": "https://www.w3.org/ns/activitystreams",
+        }
+        views.inbox.activity_task(activity)
+        self.assertFalse(shelf.books.exists())
diff --git a/bookwyrm/tests/views/inbox/test_inbox_update.py b/bookwyrm/tests/views/inbox/test_inbox_update.py
new file mode 100644
index 00000000..9d4c3cca
--- /dev/null
+++ b/bookwyrm/tests/views/inbox/test_inbox_update.py
@@ -0,0 +1,150 @@
+""" tests incoming activities"""
+import json
+import pathlib
+from unittest.mock import patch
+
+from django.test import TestCase
+
+from bookwyrm import models, views
+
+
+# pylint: disable=too-many-public-methods
+class InboxUpdate(TestCase):
+    """ inbox tests """
+
+    def setUp(self):
+        """ basic user and book data """
+        self.local_user = models.User.objects.create_user(
+            "mouse@example.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+        )
+        self.local_user.remote_id = "https://example.com/user/mouse"
+        self.local_user.save(broadcast=False)
+
+        self.create_json = {
+            "id": "hi",
+            "type": "Create",
+            "actor": "hi",
+            "to": ["https://www.w3.org/ns/activitystreams#public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "object": {},
+        }
+        models.SiteSettings.objects.create()
+
+
+    def test_handle_update_list(self):
+        """ a new list """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            book_list = models.List.objects.create(
+                name="hi", remote_id="https://example.com/list/22", user=self.local_user
+            )
+        activity = {
+            "type": "Update",
+            "to": [],
+            "cc": [],
+            "actor": "hi",
+            "id": "sdkjf",
+            "object": {
+                "id": "https://example.com/list/22",
+                "type": "BookList",
+                "totalItems": 1,
+                "first": "https://example.com/list/22?page=1",
+                "last": "https://example.com/list/22?page=1",
+                "name": "Test List",
+                "owner": "https://example.com/user/mouse",
+                "to": ["https://www.w3.org/ns/activitystreams#Public"],
+                "cc": ["https://example.com/user/mouse/followers"],
+                "summary": "summary text",
+                "curation": "curated",
+                "@context": "https://www.w3.org/ns/activitystreams",
+            },
+        }
+        views.inbox.activity_task(activity)
+        book_list.refresh_from_db()
+        self.assertEqual(book_list.name, "Test List")
+        self.assertEqual(book_list.curation, "curated")
+        self.assertEqual(book_list.description, "summary text")
+        self.assertEqual(book_list.remote_id, "https://example.com/list/22")
+
+    def test_handle_update_user(self):
+        """ update an existing user """
+        # we only do this with remote users
+        self.local_user.local = False
+        self.local_user.save()
+
+        datafile = pathlib.Path(__file__).parent.joinpath("../../data/ap_user.json")
+        userdata = json.loads(datafile.read_bytes())
+        del userdata["icon"]
+        self.assertIsNone(self.local_user.name)
+        views.inbox.activity_task(
+            {
+                "type": "Update",
+                "to": [],
+                "cc": [],
+                "actor": "hi",
+                "id": "sdkjf",
+                "object": userdata,
+            }
+        )
+        user = models.User.objects.get(id=self.local_user.id)
+        self.assertEqual(user.name, "MOUSE?? MOUSE!!")
+        self.assertEqual(user.username, "mouse@example.com")
+        self.assertEqual(user.localname, "mouse")
+        self.assertTrue(user.discoverable)
+
+    def test_handle_update_edition(self):
+        """ update an existing edition """
+        datafile = pathlib.Path(__file__).parent.joinpath("../../data/bw_edition.json")
+        bookdata = json.loads(datafile.read_bytes())
+
+        models.Work.objects.create(
+            title="Test Work", remote_id="https://bookwyrm.social/book/5988"
+        )
+        book = models.Edition.objects.create(
+            title="Test Book", remote_id="https://bookwyrm.social/book/5989"
+        )
+
+        del bookdata["authors"]
+        self.assertEqual(book.title, "Test Book")
+
+        with patch("bookwyrm.activitypub.base_activity.set_related_field.delay"):
+            views.inbox.activity_task(
+                {
+                    "type": "Update",
+                    "to": [],
+                    "cc": [],
+                    "actor": "hi",
+                    "id": "sdkjf",
+                    "object": bookdata,
+                }
+            )
+        book = models.Edition.objects.get(id=book.id)
+        self.assertEqual(book.title, "Piranesi")
+
+    def test_handle_update_work(self):
+        """ update an existing edition """
+        datafile = pathlib.Path(__file__).parent.joinpath("../../data/bw_work.json")
+        bookdata = json.loads(datafile.read_bytes())
+
+        book = models.Work.objects.create(
+            title="Test Book", remote_id="https://bookwyrm.social/book/5988"
+        )
+
+        del bookdata["authors"]
+        self.assertEqual(book.title, "Test Book")
+        with patch("bookwyrm.activitypub.base_activity.set_related_field.delay"):
+            views.inbox.activity_task(
+                {
+                    "type": "Update",
+                    "to": [],
+                    "cc": [],
+                    "actor": "hi",
+                    "id": "sdkjf",
+                    "object": bookdata,
+                }
+            )
+        book = models.Work.objects.get(id=book.id)
+        self.assertEqual(book.title, "Piranesi")
diff --git a/bookwyrm/tests/views/test_inbox.py b/bookwyrm/tests/views/test_inbox.py
deleted file mode 100644
index 44a29a92..00000000
--- a/bookwyrm/tests/views/test_inbox.py
+++ /dev/null
@@ -1,988 +0,0 @@
-""" tests incoming activities"""
-from datetime import datetime
-import json
-import pathlib
-from unittest.mock import patch
-
-from django.http import HttpResponseNotAllowed, HttpResponseNotFound
-from django.test import TestCase, Client
-import responses
-
-from bookwyrm import models, views
-
-
-# pylint: disable=too-many-public-methods
-class Inbox(TestCase):
-    """ readthrough tests """
-
-    def setUp(self):
-        """ basic user and book data """
-        self.client = Client()
-        self.local_user = models.User.objects.create_user(
-            "mouse@example.com",
-            "mouse@mouse.com",
-            "mouseword",
-            local=True,
-            localname="mouse",
-        )
-        self.local_user.remote_id = "https://example.com/user/mouse"
-        self.local_user.save(broadcast=False)
-        with patch("bookwyrm.models.user.set_remote_server.delay"):
-            self.remote_user = models.User.objects.create_user(
-                "rat",
-                "rat@rat.com",
-                "ratword",
-                local=False,
-                remote_id="https://example.com/users/rat",
-                inbox="https://example.com/users/rat/inbox",
-                outbox="https://example.com/users/rat/outbox",
-            )
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
-                self.status = models.Status.objects.create(
-                    user=self.local_user,
-                    content="Test status",
-                    remote_id="https://example.com/status/1",
-                )
-
-        self.create_json = {
-            "id": "hi",
-            "type": "Create",
-            "actor": "hi",
-            "to": ["https://www.w3.org/ns/activitystreams#public"],
-            "cc": ["https://example.com/user/mouse/followers"],
-            "object": {},
-        }
-        models.SiteSettings.objects.create()
-
-    def test_inbox_invalid_get(self):
-        """ shouldn't try to handle if the user is not found """
-        result = self.client.get("/inbox", content_type="application/json")
-        self.assertIsInstance(result, HttpResponseNotAllowed)
-
-    def test_inbox_invalid_user(self):
-        """ shouldn't try to handle if the user is not found """
-        result = self.client.post(
-            "/user/bleh/inbox",
-            '{"type": "Test", "object": "exists"}',
-            content_type="application/json",
-        )
-        self.assertIsInstance(result, HttpResponseNotFound)
-
-    def test_inbox_invalid_bad_signature(self):
-        """ bad request for invalid signature """
-        with patch("bookwyrm.views.inbox.has_valid_signature") as mock_valid:
-            mock_valid.return_value = False
-            result = self.client.post(
-                "/user/mouse/inbox",
-                '{"type": "Announce", "object": "exists"}',
-                content_type="application/json",
-            )
-            self.assertEqual(result.status_code, 401)
-
-    def test_inbox_invalid_bad_signature_delete(self):
-        """ invalid signature for Delete is okay though """
-        with patch("bookwyrm.views.inbox.has_valid_signature") as mock_valid:
-            mock_valid.return_value = False
-            result = self.client.post(
-                "/user/mouse/inbox",
-                '{"type": "Delete", "object": "exists"}',
-                content_type="application/json",
-            )
-            self.assertEqual(result.status_code, 200)
-
-    def test_inbox_unknown_type(self):
-        """ never heard of that activity type, don't have a handler for it """
-        with patch("bookwyrm.views.inbox.has_valid_signature") as mock_valid:
-            result = self.client.post(
-                "/inbox",
-                '{"type": "Fish", "object": "exists"}',
-                content_type="application/json",
-            )
-            mock_valid.return_value = True
-            self.assertIsInstance(result, HttpResponseNotFound)
-
-    def test_inbox_success(self):
-        """ a known type, for which we start a task """
-        activity = self.create_json
-        activity["object"] = {
-            "id": "https://example.com/list/22",
-            "type": "BookList",
-            "totalItems": 1,
-            "first": "https://example.com/list/22?page=1",
-            "last": "https://example.com/list/22?page=1",
-            "name": "Test List",
-            "owner": "https://example.com/user/mouse",
-            "to": ["https://www.w3.org/ns/activitystreams#Public"],
-            "cc": ["https://example.com/user/mouse/followers"],
-            "summary": "summary text",
-            "curation": "curated",
-            "@context": "https://www.w3.org/ns/activitystreams",
-        }
-        with patch("bookwyrm.views.inbox.has_valid_signature") as mock_valid:
-            mock_valid.return_value = True
-
-            with patch("bookwyrm.views.inbox.activity_task.delay"):
-                result = self.client.post(
-                    "/inbox", json.dumps(activity), content_type="application/json"
-                )
-        self.assertEqual(result.status_code, 200)
-
-    def test_handle_create_status(self):
-        """ the "it justs works" mode """
-        self.assertEqual(models.Status.objects.count(), 1)
-
-        datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_quotation.json")
-        status_data = json.loads(datafile.read_bytes())
-        models.Edition.objects.create(
-            title="Test Book", remote_id="https://example.com/book/1"
-        )
-        activity = self.create_json
-        activity["object"] = status_data
-
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
-            views.inbox.activity_task(activity)
-            self.assertTrue(redis_mock.called)
-
-        status = models.Quotation.objects.get()
-        self.assertEqual(
-            status.remote_id, "https://example.com/user/mouse/quotation/13"
-        )
-        self.assertEqual(status.quote, "quote body")
-        self.assertEqual(status.content, "commentary")
-        self.assertEqual(status.user, self.local_user)
-        self.assertEqual(models.Status.objects.count(), 2)
-
-        # while we're here, lets ensure we avoid dupes
-        views.inbox.activity_task(activity)
-        self.assertEqual(models.Status.objects.count(), 2)
-
-    def test_handle_create_status_remote_note_with_mention(self):
-        """ should only create it under the right circumstances """
-        self.assertEqual(models.Status.objects.count(), 1)
-        self.assertFalse(
-            models.Notification.objects.filter(user=self.local_user).exists()
-        )
-
-        datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_note.json")
-        status_data = json.loads(datafile.read_bytes())
-        activity = self.create_json
-        activity["object"] = status_data
-
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
-            views.inbox.activity_task(activity)
-            self.assertTrue(redis_mock.called)
-        status = models.Status.objects.last()
-        self.assertEqual(status.content, "test content in note")
-        self.assertEqual(status.mention_users.first(), self.local_user)
-        self.assertTrue(
-            models.Notification.objects.filter(user=self.local_user).exists()
-        )
-        self.assertEqual(models.Notification.objects.get().notification_type, "MENTION")
-
-    def test_handle_create_status_remote_note_with_reply(self):
-        """ should only create it under the right circumstances """
-        self.assertEqual(models.Status.objects.count(), 1)
-        self.assertFalse(models.Notification.objects.filter(user=self.local_user))
-
-        datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_note.json")
-        status_data = json.loads(datafile.read_bytes())
-        del status_data["tag"]
-        status_data["inReplyTo"] = self.status.remote_id
-        activity = self.create_json
-        activity["object"] = status_data
-
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
-            views.inbox.activity_task(activity)
-            self.assertTrue(redis_mock.called)
-        status = models.Status.objects.last()
-        self.assertEqual(status.content, "test content in note")
-        self.assertEqual(status.reply_parent, self.status)
-        self.assertTrue(models.Notification.objects.filter(user=self.local_user))
-        self.assertEqual(models.Notification.objects.get().notification_type, "REPLY")
-
-    def test_handle_create_list(self):
-        """ a new list """
-        activity = self.create_json
-        activity["object"] = {
-            "id": "https://example.com/list/22",
-            "type": "BookList",
-            "totalItems": 1,
-            "first": "https://example.com/list/22?page=1",
-            "last": "https://example.com/list/22?page=1",
-            "name": "Test List",
-            "owner": "https://example.com/user/mouse",
-            "to": ["https://www.w3.org/ns/activitystreams#Public"],
-            "cc": ["https://example.com/user/mouse/followers"],
-            "summary": "summary text",
-            "curation": "curated",
-            "@context": "https://www.w3.org/ns/activitystreams",
-        }
-        views.inbox.activity_task(activity)
-        book_list = models.List.objects.get()
-        self.assertEqual(book_list.name, "Test List")
-        self.assertEqual(book_list.curation, "curated")
-        self.assertEqual(book_list.description, "summary text")
-        self.assertEqual(book_list.remote_id, "https://example.com/list/22")
-
-    def test_handle_follow(self):
-        """ remote user wants to follow local user """
-        activity = {
-            "@context": "https://www.w3.org/ns/activitystreams",
-            "id": "https://example.com/users/rat/follows/123",
-            "type": "Follow",
-            "actor": "https://example.com/users/rat",
-            "object": "https://example.com/user/mouse",
-        }
-
-        self.assertFalse(models.UserFollowRequest.objects.exists())
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
-            views.inbox.activity_task(activity)
-            self.assertEqual(mock.call_count, 1)
-
-        # notification created
-        notification = models.Notification.objects.get()
-        self.assertEqual(notification.user, self.local_user)
-        self.assertEqual(notification.notification_type, "FOLLOW")
-
-        # the request should have been deleted
-        self.assertFalse(models.UserFollowRequest.objects.exists())
-
-        # the follow relationship should exist
-        follow = models.UserFollows.objects.get(user_object=self.local_user)
-        self.assertEqual(follow.user_subject, self.remote_user)
-
-    def test_handle_follow_manually_approved(self):
-        """ needs approval before following """
-        activity = {
-            "@context": "https://www.w3.org/ns/activitystreams",
-            "id": "https://example.com/users/rat/follows/123",
-            "type": "Follow",
-            "actor": "https://example.com/users/rat",
-            "object": "https://example.com/user/mouse",
-        }
-
-        self.local_user.manually_approves_followers = True
-        self.local_user.save(broadcast=False)
-
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            views.inbox.activity_task(activity)
-
-        # notification created
-        notification = models.Notification.objects.get()
-        self.assertEqual(notification.user, self.local_user)
-        self.assertEqual(notification.notification_type, "FOLLOW_REQUEST")
-
-        # the request should exist
-        request = models.UserFollowRequest.objects.get()
-        self.assertEqual(request.user_subject, self.remote_user)
-        self.assertEqual(request.user_object, self.local_user)
-
-        # the follow relationship should not exist
-        follow = models.UserFollows.objects.all()
-        self.assertEqual(list(follow), [])
-
-    def test_handle_undo_follow_request(self):
-        """ the requester cancels a follow request """
-        self.local_user.manually_approves_followers = True
-        self.local_user.save(broadcast=False)
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            request = models.UserFollowRequest.objects.create(
-                user_subject=self.remote_user, user_object=self.local_user
-            )
-        self.assertTrue(self.local_user.follower_requests.exists())
-
-        activity = {
-            "type": "Undo",
-            "id": "bleh",
-            "to": ["https://www.w3.org/ns/activitystreams#Public"],
-            "cc": ["https://example.com/user/mouse/followers"],
-            "actor": self.remote_user.remote_id,
-            "@context": "https://www.w3.org/ns/activitystreams",
-            "object": {
-                "@context": "https://www.w3.org/ns/activitystreams",
-                "id": request.remote_id,
-                "type": "Follow",
-                "actor": "https://example.com/users/rat",
-                "object": "https://example.com/user/mouse",
-            },
-        }
-
-        views.inbox.activity_task(activity)
-
-        self.assertFalse(self.local_user.follower_requests.exists())
-
-    def test_handle_unfollow(self):
-        """ remove a relationship """
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            rel = models.UserFollows.objects.create(
-                user_subject=self.remote_user, user_object=self.local_user
-            )
-        activity = {
-            "type": "Undo",
-            "id": "bleh",
-            "to": ["https://www.w3.org/ns/activitystreams#Public"],
-            "cc": ["https://example.com/user/mouse/followers"],
-            "actor": self.remote_user.remote_id,
-            "@context": "https://www.w3.org/ns/activitystreams",
-            "object": {
-                "id": rel.remote_id,
-                "type": "Follow",
-                "actor": "https://example.com/users/rat",
-                "object": "https://example.com/user/mouse",
-            },
-        }
-        self.assertEqual(self.remote_user, self.local_user.followers.first())
-
-        views.inbox.activity_task(activity)
-        self.assertIsNone(self.local_user.followers.first())
-
-    def test_handle_follow_accept(self):
-        """ a remote user approved a follow request from local """
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            rel = models.UserFollowRequest.objects.create(
-                user_subject=self.local_user, user_object=self.remote_user
-            )
-        activity = {
-            "@context": "https://www.w3.org/ns/activitystreams",
-            "id": "https://example.com/users/rat/follows/123#accepts",
-            "type": "Accept",
-            "actor": "https://example.com/users/rat",
-            "object": {
-                "id": rel.remote_id,
-                "type": "Follow",
-                "actor": "https://example.com/user/mouse",
-                "object": "https://example.com/users/rat",
-            },
-        }
-
-        self.assertEqual(models.UserFollowRequest.objects.count(), 1)
-
-        views.inbox.activity_task(activity)
-
-        # request should be deleted
-        self.assertEqual(models.UserFollowRequest.objects.count(), 0)
-
-        # relationship should be created
-        follows = self.remote_user.followers
-        self.assertEqual(follows.count(), 1)
-        self.assertEqual(follows.first(), self.local_user)
-
-    def test_handle_follow_reject(self):
-        """ turn down a follow request """
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            rel = models.UserFollowRequest.objects.create(
-                user_subject=self.local_user, user_object=self.remote_user
-            )
-        activity = {
-            "@context": "https://www.w3.org/ns/activitystreams",
-            "id": "https://example.com/users/rat/follows/123#accepts",
-            "type": "Reject",
-            "actor": "https://example.com/users/rat",
-            "object": {
-                "id": rel.remote_id,
-                "type": "Follow",
-                "actor": "https://example.com/user/mouse",
-                "object": "https://example.com/users/rat",
-            },
-        }
-
-        self.assertEqual(models.UserFollowRequest.objects.count(), 1)
-
-        views.inbox.activity_task(activity)
-
-        # request should be deleted
-        self.assertFalse(models.UserFollowRequest.objects.exists())
-        self.assertFalse(self.remote_user.followers.exists())
-
-    def test_handle_update_list(self):
-        """ a new list """
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            book_list = models.List.objects.create(
-                name="hi", remote_id="https://example.com/list/22", user=self.local_user
-            )
-        activity = {
-            "type": "Update",
-            "to": [],
-            "cc": [],
-            "actor": "hi",
-            "id": "sdkjf",
-            "object": {
-                "id": "https://example.com/list/22",
-                "type": "BookList",
-                "totalItems": 1,
-                "first": "https://example.com/list/22?page=1",
-                "last": "https://example.com/list/22?page=1",
-                "name": "Test List",
-                "owner": "https://example.com/user/mouse",
-                "to": ["https://www.w3.org/ns/activitystreams#Public"],
-                "cc": ["https://example.com/user/mouse/followers"],
-                "summary": "summary text",
-                "curation": "curated",
-                "@context": "https://www.w3.org/ns/activitystreams",
-            },
-        }
-        views.inbox.activity_task(activity)
-        book_list.refresh_from_db()
-        self.assertEqual(book_list.name, "Test List")
-        self.assertEqual(book_list.curation, "curated")
-        self.assertEqual(book_list.description, "summary text")
-        self.assertEqual(book_list.remote_id, "https://example.com/list/22")
-
-    def test_handle_delete_status(self):
-        """ remove a status """
-        self.status.user = self.remote_user
-        self.status.save(broadcast=False)
-
-        self.assertFalse(self.status.deleted)
-        activity = {
-            "type": "Delete",
-            "to": ["https://www.w3.org/ns/activitystreams#Public"],
-            "cc": ["https://example.com/user/mouse/followers"],
-            "id": "%s/activity" % self.status.remote_id,
-            "actor": self.remote_user.remote_id,
-            "object": {"id": self.status.remote_id, "type": "Tombstone"},
-        }
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
-        ) as redis_mock:
-            views.inbox.activity_task(activity)
-            self.assertTrue(redis_mock.called)
-        # deletion doens't remove the status, it turns it into a tombstone
-        status = models.Status.objects.get()
-        self.assertTrue(status.deleted)
-        self.assertIsInstance(status.deleted_date, datetime)
-
-    def test_handle_delete_status_notifications(self):
-        """ remove a status with related notifications """
-        self.status.user = self.remote_user
-        self.status.save(broadcast=False)
-        models.Notification.objects.create(
-            related_status=self.status,
-            user=self.local_user,
-            notification_type="MENTION",
-        )
-        # this one is innocent, don't delete it
-        notif = models.Notification.objects.create(
-            user=self.local_user, notification_type="MENTION"
-        )
-        self.assertFalse(self.status.deleted)
-        self.assertEqual(models.Notification.objects.count(), 2)
-        activity = {
-            "type": "Delete",
-            "to": ["https://www.w3.org/ns/activitystreams#Public"],
-            "cc": ["https://example.com/user/mouse/followers"],
-            "id": "%s/activity" % self.status.remote_id,
-            "actor": self.remote_user.remote_id,
-            "object": {"id": self.status.remote_id, "type": "Tombstone"},
-        }
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
-        ) as redis_mock:
-            views.inbox.activity_task(activity)
-            self.assertTrue(redis_mock.called)
-        # deletion doens't remove the status, it turns it into a tombstone
-        status = models.Status.objects.get()
-        self.assertTrue(status.deleted)
-        self.assertIsInstance(status.deleted_date, datetime)
-
-        # notifications should be truly deleted
-        self.assertEqual(models.Notification.objects.count(), 1)
-        self.assertEqual(models.Notification.objects.get(), notif)
-
-    def test_handle_favorite(self):
-        """ fav a status """
-        activity = {
-            "@context": "https://www.w3.org/ns/activitystreams",
-            "id": "https://example.com/fav/1",
-            "actor": "https://example.com/users/rat",
-            "type": "Like",
-            "published": "Mon, 25 May 2020 19:31:20 GMT",
-            "object": self.status.remote_id,
-        }
-
-        views.inbox.activity_task(activity)
-
-        fav = models.Favorite.objects.get(remote_id="https://example.com/fav/1")
-        self.assertEqual(fav.status, self.status)
-        self.assertEqual(fav.remote_id, "https://example.com/fav/1")
-        self.assertEqual(fav.user, self.remote_user)
-
-    def test_ignore_favorite(self):
-        """ don't try to save an unknown status """
-        activity = {
-            "@context": "https://www.w3.org/ns/activitystreams",
-            "id": "https://example.com/fav/1",
-            "actor": "https://example.com/users/rat",
-            "type": "Like",
-            "published": "Mon, 25 May 2020 19:31:20 GMT",
-            "object": "https://unknown.status/not-found",
-        }
-
-        views.inbox.activity_task(activity)
-
-        self.assertFalse(models.Favorite.objects.exists())
-
-    def test_handle_unfavorite(self):
-        """ fav a status """
-        activity = {
-            "id": "https://example.com/fav/1#undo",
-            "type": "Undo",
-            "to": ["https://www.w3.org/ns/activitystreams#Public"],
-            "cc": ["https://example.com/user/mouse/followers"],
-            "actor": self.remote_user.remote_id,
-            "object": {
-                "@context": "https://www.w3.org/ns/activitystreams",
-                "id": "https://example.com/fav/1",
-                "actor": "https://example.com/users/rat",
-                "type": "Like",
-                "published": "Mon, 25 May 2020 19:31:20 GMT",
-                "object": self.status.remote_id,
-            },
-        }
-        models.Favorite.objects.create(
-            status=self.status,
-            user=self.remote_user,
-            remote_id="https://example.com/fav/1",
-        )
-        self.assertEqual(models.Favorite.objects.count(), 1)
-
-        views.inbox.activity_task(activity)
-        self.assertEqual(models.Favorite.objects.count(), 0)
-
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
-    def test_handle_boost(self, _):
-        """ boost a status """
-        self.assertEqual(models.Notification.objects.count(), 0)
-        activity = {
-            "type": "Announce",
-            "id": "%s/boost" % self.status.remote_id,
-            "actor": self.remote_user.remote_id,
-            "object": self.status.remote_id,
-            "to": ["https://www.w3.org/ns/activitystreams#public"],
-            "cc": ["https://example.com/user/mouse/followers"],
-            "published": "Mon, 25 May 2020 19:31:20 GMT",
-        }
-        with patch("bookwyrm.models.status.Status.ignore_activity") as discarder:
-            discarder.return_value = False
-            views.inbox.activity_task(activity)
-        boost = models.Boost.objects.get()
-        self.assertEqual(boost.boosted_status, self.status)
-        notification = models.Notification.objects.get()
-        self.assertEqual(notification.user, self.local_user)
-        self.assertEqual(notification.related_status, self.status)
-
-    @responses.activate
-    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
-    def test_handle_boost_remote_status(self, redis_mock):
-        """ boost a status """
-        work = models.Work.objects.create(title="work title")
-        book = models.Edition.objects.create(
-            title="Test",
-            remote_id="https://bookwyrm.social/book/37292",
-            parent_work=work,
-        )
-        self.assertEqual(models.Notification.objects.count(), 0)
-        activity = {
-            "type": "Announce",
-            "id": "%s/boost" % self.status.remote_id,
-            "actor": self.remote_user.remote_id,
-            "object": "https://remote.com/status/1",
-            "to": ["https://www.w3.org/ns/activitystreams#public"],
-            "cc": ["https://example.com/user/mouse/followers"],
-            "published": "Mon, 25 May 2020 19:31:20 GMT",
-        }
-        responses.add(
-            responses.GET,
-            "https://remote.com/status/1",
-            json={
-                "id": "https://remote.com/status/1",
-                "type": "Comment",
-                "published": "2021-04-05T18:04:59.735190+00:00",
-                "attributedTo": self.remote_user.remote_id,
-                "content": "<p>a comment</p>",
-                "to": ["https://www.w3.org/ns/activitystreams#Public"],
-                "cc": ["https://b875df3d118b.ngrok.io/user/mouse/followers"],
-                "inReplyTo": "",
-                "inReplyToBook": book.remote_id,
-                "summary": "",
-                "tag": [],
-                "sensitive": False,
-                "@context": "https://www.w3.org/ns/activitystreams",
-            },
-        )
-
-        with patch("bookwyrm.models.status.Status.ignore_activity") as discarder:
-            discarder.return_value = False
-            views.inbox.activity_task(activity)
-            self.assertTrue(redis_mock.called)
-
-        boost = models.Boost.objects.get()
-        self.assertEqual(boost.boosted_status.remote_id, "https://remote.com/status/1")
-        self.assertEqual(boost.boosted_status.comment.status_type, "Comment")
-        self.assertEqual(boost.boosted_status.comment.book, book)
-
-    @responses.activate
-    def test_handle_discarded_boost(self):
-        """ test a boost of a mastodon status that will be discarded """
-        status = models.Status(
-            content="hi",
-            user=self.remote_user,
-        )
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
-            status.save(broadcast=False)
-        activity = {
-            "type": "Announce",
-            "id": "http://www.faraway.com/boost/12",
-            "actor": self.remote_user.remote_id,
-            "object": status.remote_id,
-        }
-        responses.add(
-            responses.GET, status.remote_id, json=status.to_activity(), status=200
-        )
-        views.inbox.activity_task(activity)
-        self.assertEqual(models.Boost.objects.count(), 0)
-
-    def test_handle_unboost(self):
-        """ undo a boost """
-        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
-            boost = models.Boost.objects.create(
-                boosted_status=self.status, user=self.remote_user
-            )
-        activity = {
-            "type": "Undo",
-            "actor": "hi",
-            "id": "bleh",
-            "to": ["https://www.w3.org/ns/activitystreams#public"],
-            "cc": ["https://example.com/user/mouse/followers"],
-            "object": {
-                "type": "Announce",
-                "id": boost.remote_id,
-                "actor": self.remote_user.remote_id,
-                "object": self.status.remote_id,
-                "to": ["https://www.w3.org/ns/activitystreams#public"],
-                "cc": ["https://example.com/user/mouse/followers"],
-                "published": "Mon, 25 May 2020 19:31:20 GMT",
-            },
-        }
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
-        ) as redis_mock:
-            views.inbox.activity_task(activity)
-            self.assertTrue(redis_mock.called)
-        self.assertFalse(models.Boost.objects.exists())
-
-    def test_handle_unboost_unknown_boost(self):
-        """ undo a boost """
-        activity = {
-            "type": "Undo",
-            "actor": "hi",
-            "id": "bleh",
-            "to": ["https://www.w3.org/ns/activitystreams#public"],
-            "cc": ["https://example.com/user/mouse/followers"],
-            "object": {
-                "type": "Announce",
-                "id": "http://fake.com/unknown/boost",
-                "actor": self.remote_user.remote_id,
-                "object": self.status.remote_id,
-            },
-        }
-        views.inbox.activity_task(activity)
-
-    def test_handle_add_book_to_shelf(self):
-        """ shelving a book """
-        work = models.Work.objects.create(title="work title")
-        book = models.Edition.objects.create(
-            title="Test",
-            remote_id="https://bookwyrm.social/book/37292",
-            parent_work=work,
-        )
-        shelf = models.Shelf.objects.create(user=self.remote_user, name="Test Shelf")
-        shelf.remote_id = "https://bookwyrm.social/user/mouse/shelf/to-read"
-        shelf.save()
-
-        activity = {
-            "id": "https://bookwyrm.social/shelfbook/6189#add",
-            "type": "Add",
-            "actor": "https://example.com/users/rat",
-            "object": {
-                "type": "Edition",
-                "title": "Test Title",
-                "work": work.remote_id,
-                "id": "https://bookwyrm.social/book/37292",
-            },
-            "target": "https://bookwyrm.social/user/mouse/shelf/to-read",
-            "@context": "https://www.w3.org/ns/activitystreams",
-        }
-        views.inbox.activity_task(activity)
-        self.assertEqual(shelf.books.first(), book)
-
-    def test_handle_unshelve_book(self):
-        """ remove a book from a shelf """
-        work = models.Work.objects.create(title="work title")
-        book = models.Edition.objects.create(
-            title="Test",
-            remote_id="https://bookwyrm.social/book/37292",
-            parent_work=work,
-        )
-        shelf = models.Shelf.objects.create(user=self.remote_user, name="Test Shelf")
-        shelf.remote_id = "https://bookwyrm.social/user/mouse/shelf/to-read"
-        shelf.save()
-
-        shelfbook = models.ShelfBook.objects.create(
-            user=self.remote_user, shelf=shelf, book=book
-        )
-
-        self.assertEqual(shelf.books.first(), book)
-        self.assertEqual(shelf.books.count(), 1)
-
-        activity = {
-            "id": shelfbook.remote_id,
-            "type": "Remove",
-            "actor": "https://example.com/users/rat",
-            "object": {
-                "type": "Edition",
-                "title": "Test Title",
-                "work": work.remote_id,
-                "id": "https://bookwyrm.social/book/37292",
-            },
-            "target": "https://bookwyrm.social/user/mouse/shelf/to-read",
-            "@context": "https://www.w3.org/ns/activitystreams",
-        }
-        views.inbox.activity_task(activity)
-        self.assertFalse(shelf.books.exists())
-
-    @responses.activate
-    def test_handle_add_book_to_list(self):
-        """ listing a book """
-        work = models.Work.objects.create(title="work title")
-        book = models.Edition.objects.create(
-            title="Test",
-            remote_id="https://bookwyrm.social/book/37292",
-            parent_work=work,
-        )
-
-        responses.add(
-            responses.GET,
-            "https://bookwyrm.social/user/mouse/list/to-read",
-            json={
-                "id": "https://example.com/list/22",
-                "type": "BookList",
-                "totalItems": 1,
-                "first": "https://example.com/list/22?page=1",
-                "last": "https://example.com/list/22?page=1",
-                "name": "Test List",
-                "owner": "https://example.com/user/mouse",
-                "to": ["https://www.w3.org/ns/activitystreams#Public"],
-                "cc": ["https://example.com/user/mouse/followers"],
-                "summary": "summary text",
-                "curation": "curated",
-                "@context": "https://www.w3.org/ns/activitystreams",
-            },
-        )
-
-        activity = {
-            "id": "https://bookwyrm.social/listbook/6189#add",
-            "type": "Add",
-            "actor": "https://example.com/users/rat",
-            "object": {
-                "type": "Edition",
-                "title": "Test Title",
-                "work": work.remote_id,
-                "id": "https://bookwyrm.social/book/37292",
-            },
-            "target": "https://bookwyrm.social/user/mouse/list/to-read",
-            "@context": "https://www.w3.org/ns/activitystreams",
-        }
-        views.inbox.activity_task(activity)
-
-        booklist = models.List.objects.get()
-        self.assertEqual(booklist.name, "Test List")
-        self.assertEqual(booklist.books.first(), book)
-
-    @responses.activate
-    def test_handle_tag_book(self):
-        """ listing a book """
-        work = models.Work.objects.create(title="work title")
-        book = models.Edition.objects.create(
-            title="Test",
-            remote_id="https://bookwyrm.social/book/37292",
-            parent_work=work,
-        )
-
-        responses.add(
-            responses.GET,
-            "https://www.example.com/tag/cool-tag",
-            json={
-                "id": "https://1b1a78582461.ngrok.io/tag/tag",
-                "type": "OrderedCollection",
-                "totalItems": 0,
-                "first": "https://1b1a78582461.ngrok.io/tag/tag?page=1",
-                "last": "https://1b1a78582461.ngrok.io/tag/tag?page=1",
-                "name": "cool tag",
-                "@context": "https://www.w3.org/ns/activitystreams",
-            },
-        )
-
-        activity = {
-            "id": "https://bookwyrm.social/listbook/6189#add",
-            "type": "Add",
-            "actor": "https://example.com/users/rat",
-            "object": {
-                "type": "Edition",
-                "title": "Test Title",
-                "work": work.remote_id,
-                "id": "https://bookwyrm.social/book/37292",
-            },
-            "target": "https://www.example.com/tag/cool-tag",
-            "@context": "https://www.w3.org/ns/activitystreams",
-        }
-        views.inbox.activity_task(activity)
-
-        tag = models.Tag.objects.get()
-        self.assertFalse(models.List.objects.exists())
-        self.assertEqual(tag.name, "cool tag")
-        self.assertEqual(tag.books.first(), book)
-
-    def test_handle_update_user(self):
-        """ update an existing user """
-        # we only do this with remote users
-        self.local_user.local = False
-        self.local_user.save()
-
-        datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json")
-        userdata = json.loads(datafile.read_bytes())
-        del userdata["icon"]
-        self.assertIsNone(self.local_user.name)
-        views.inbox.activity_task(
-            {
-                "type": "Update",
-                "to": [],
-                "cc": [],
-                "actor": "hi",
-                "id": "sdkjf",
-                "object": userdata,
-            }
-        )
-        user = models.User.objects.get(id=self.local_user.id)
-        self.assertEqual(user.name, "MOUSE?? MOUSE!!")
-        self.assertEqual(user.username, "mouse@example.com")
-        self.assertEqual(user.localname, "mouse")
-        self.assertTrue(user.discoverable)
-
-    def test_handle_update_edition(self):
-        """ update an existing edition """
-        datafile = pathlib.Path(__file__).parent.joinpath("../data/bw_edition.json")
-        bookdata = json.loads(datafile.read_bytes())
-
-        models.Work.objects.create(
-            title="Test Work", remote_id="https://bookwyrm.social/book/5988"
-        )
-        book = models.Edition.objects.create(
-            title="Test Book", remote_id="https://bookwyrm.social/book/5989"
-        )
-
-        del bookdata["authors"]
-        self.assertEqual(book.title, "Test Book")
-
-        with patch("bookwyrm.activitypub.base_activity.set_related_field.delay"):
-            views.inbox.activity_task(
-                {
-                    "type": "Update",
-                    "to": [],
-                    "cc": [],
-                    "actor": "hi",
-                    "id": "sdkjf",
-                    "object": bookdata,
-                }
-            )
-        book = models.Edition.objects.get(id=book.id)
-        self.assertEqual(book.title, "Piranesi")
-
-    def test_handle_update_work(self):
-        """ update an existing edition """
-        datafile = pathlib.Path(__file__).parent.joinpath("../data/bw_work.json")
-        bookdata = json.loads(datafile.read_bytes())
-
-        book = models.Work.objects.create(
-            title="Test Book", remote_id="https://bookwyrm.social/book/5988"
-        )
-
-        del bookdata["authors"]
-        self.assertEqual(book.title, "Test Book")
-        with patch("bookwyrm.activitypub.base_activity.set_related_field.delay"):
-            views.inbox.activity_task(
-                {
-                    "type": "Update",
-                    "to": [],
-                    "cc": [],
-                    "actor": "hi",
-                    "id": "sdkjf",
-                    "object": bookdata,
-                }
-            )
-        book = models.Work.objects.get(id=book.id)
-        self.assertEqual(book.title, "Piranesi")
-
-    def test_handle_blocks(self):
-        """ create a "block" database entry from an activity """
-        self.local_user.followers.add(self.remote_user)
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            models.UserFollowRequest.objects.create(
-                user_subject=self.local_user, user_object=self.remote_user
-            )
-        self.assertTrue(models.UserFollows.objects.exists())
-        self.assertTrue(models.UserFollowRequest.objects.exists())
-
-        activity = {
-            "@context": "https://www.w3.org/ns/activitystreams",
-            "id": "https://example.com/9e1f41ac-9ddd-4159",
-            "type": "Block",
-            "actor": "https://example.com/users/rat",
-            "object": "https://example.com/user/mouse",
-        }
-
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.remove_user_statuses"
-        ) as redis_mock:
-            views.inbox.activity_task(activity)
-            self.assertTrue(redis_mock.called)
-        views.inbox.activity_task(activity)
-        block = models.UserBlocks.objects.get()
-        self.assertEqual(block.user_subject, self.remote_user)
-        self.assertEqual(block.user_object, self.local_user)
-        self.assertEqual(block.remote_id, "https://example.com/9e1f41ac-9ddd-4159")
-
-        self.assertFalse(models.UserFollows.objects.exists())
-        self.assertFalse(models.UserFollowRequest.objects.exists())
-
-    def test_handle_unblock(self):
-        """ unblock a user """
-        self.remote_user.blocks.add(self.local_user)
-
-        block = models.UserBlocks.objects.get()
-        block.remote_id = "https://example.com/9e1f41ac-9ddd-4159"
-        block.save()
-
-        self.assertEqual(block.user_subject, self.remote_user)
-        self.assertEqual(block.user_object, self.local_user)
-        activity = {
-            "type": "Undo",
-            "actor": "hi",
-            "id": "bleh",
-            "to": ["https://www.w3.org/ns/activitystreams#public"],
-            "cc": ["https://example.com/user/mouse/followers"],
-            "object": {
-                "@context": "https://www.w3.org/ns/activitystreams",
-                "id": "https://example.com/9e1f41ac-9ddd-4159",
-                "type": "Block",
-                "actor": "https://example.com/users/rat",
-                "object": "https://example.com/user/mouse",
-            },
-        }
-        with patch(
-            "bookwyrm.activitystreams.ActivityStream.add_user_statuses"
-        ) as redis_mock:
-            views.inbox.activity_task(activity)
-            self.assertTrue(redis_mock.called)
-        self.assertFalse(models.UserBlocks.objects.exists())

From 94764160cc08d09794fe5ccddaa85c6811b766d6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 8 Apr 2021 12:15:47 -0700
Subject: [PATCH 0731/1285] Whitespace fixes

---
 bookwyrm/tests/views/inbox/test_inbox_add.py      | 1 -
 bookwyrm/tests/views/inbox/test_inbox_announce.py | 1 -
 bookwyrm/tests/views/inbox/test_inbox_block.py    | 1 -
 bookwyrm/tests/views/inbox/test_inbox_create.py   | 2 +-
 bookwyrm/tests/views/inbox/test_inbox_delete.py   | 1 -
 bookwyrm/tests/views/inbox/test_inbox_follow.py   | 1 -
 bookwyrm/tests/views/inbox/test_inbox_like.py     | 1 -
 bookwyrm/tests/views/inbox/test_inbox_remove.py   | 1 -
 bookwyrm/tests/views/inbox/test_inbox_update.py   | 1 -
 9 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/bookwyrm/tests/views/inbox/test_inbox_add.py b/bookwyrm/tests/views/inbox/test_inbox_add.py
index c22691ad..638d56d7 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_add.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_add.py
@@ -35,7 +35,6 @@ class InboxActivities(TestCase):
 
         models.SiteSettings.objects.create()
 
-
     def test_handle_add_book_to_shelf(self):
         """ shelving a book """
         work = models.Work.objects.create(title="work title")
diff --git a/bookwyrm/tests/views/inbox/test_inbox_announce.py b/bookwyrm/tests/views/inbox/test_inbox_announce.py
index e08d0f5f..a730045a 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_announce.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_announce.py
@@ -50,7 +50,6 @@ class InboxActivities(TestCase):
         }
         models.SiteSettings.objects.create()
 
-
     @patch("bookwyrm.activitystreams.ActivityStream.add_status")
     def test_handle_boost(self, _):
         """ boost a status """
diff --git a/bookwyrm/tests/views/inbox/test_inbox_block.py b/bookwyrm/tests/views/inbox/test_inbox_block.py
index 5f6fcb37..e686c6b7 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_block.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_block.py
@@ -34,7 +34,6 @@ class InboxBlock(TestCase):
 
         models.SiteSettings.objects.create()
 
-
     def test_handle_blocks(self):
         """ create a "block" database entry from an activity """
         self.local_user.followers.add(self.remote_user)
diff --git a/bookwyrm/tests/views/inbox/test_inbox_create.py b/bookwyrm/tests/views/inbox/test_inbox_create.py
index ed8a777f..437f6ffc 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_create.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_create.py
@@ -31,7 +31,7 @@ class InboxActivities(TestCase):
                     remote_id="https://example.com/status/1",
                 )
         with patch("bookwyrm.models.user.set_remote_server.delay"):
-           models.User.objects.create_user(
+            models.User.objects.create_user(
                 "rat",
                 "rat@rat.com",
                 "ratword",
diff --git a/bookwyrm/tests/views/inbox/test_inbox_delete.py b/bookwyrm/tests/views/inbox/test_inbox_delete.py
index 7d97a251..65a75426 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_delete.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_delete.py
@@ -49,7 +49,6 @@ class InboxActivities(TestCase):
         }
         models.SiteSettings.objects.create()
 
-
     def test_handle_delete_status(self):
         """ remove a status """
         self.assertFalse(self.status.deleted)
diff --git a/bookwyrm/tests/views/inbox/test_inbox_follow.py b/bookwyrm/tests/views/inbox/test_inbox_follow.py
index 58b577d1..c549c31b 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_follow.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_follow.py
@@ -34,7 +34,6 @@ class InboxRelationships(TestCase):
 
         models.SiteSettings.objects.create()
 
-
     def test_handle_follow(self):
         """ remote user wants to follow local user """
         activity = {
diff --git a/bookwyrm/tests/views/inbox/test_inbox_like.py b/bookwyrm/tests/views/inbox/test_inbox_like.py
index d569a9ca..05105b75 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_like.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_like.py
@@ -49,7 +49,6 @@ class InboxActivities(TestCase):
         }
         models.SiteSettings.objects.create()
 
-
     def test_handle_favorite(self):
         """ fav a status """
         activity = {
diff --git a/bookwyrm/tests/views/inbox/test_inbox_remove.py b/bookwyrm/tests/views/inbox/test_inbox_remove.py
index d875abda..b3e42bbd 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_remove.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_remove.py
@@ -25,7 +25,6 @@ class InboxActivities(TestCase):
 
         models.SiteSettings.objects.create()
 
-
     def test_handle_unshelve_book(self):
         """ remove a book from a shelf """
         work = models.Work.objects.create(title="work title")
diff --git a/bookwyrm/tests/views/inbox/test_inbox_update.py b/bookwyrm/tests/views/inbox/test_inbox_update.py
index 9d4c3cca..012343e7 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_update.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_update.py
@@ -34,7 +34,6 @@ class InboxUpdate(TestCase):
         }
         models.SiteSettings.objects.create()
 
-
     def test_handle_update_list(self):
         """ a new list """
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):

From 45926eed347c91788486331fbbc54e31779d0865 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 8 Apr 2021 13:33:24 -0700
Subject: [PATCH 0732/1285] Adds necessary user to inbox tests

---
 bookwyrm/tests/views/inbox/test_inbox.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/bookwyrm/tests/views/inbox/test_inbox.py b/bookwyrm/tests/views/inbox/test_inbox.py
index 992394a9..12d7a736 100644
--- a/bookwyrm/tests/views/inbox/test_inbox.py
+++ b/bookwyrm/tests/views/inbox/test_inbox.py
@@ -15,6 +15,15 @@ class Inbox(TestCase):
     def setUp(self):
         """ basic user and book data """
         self.client = Client()
+        local_user = models.User.objects.create_user(
+            "mouse@example.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+        )
+        local_user.remote_id = "https://example.com/user/mouse"
+        local_user.save(broadcast=False)
         self.create_json = {
             "id": "hi",
             "type": "Create",

From 6617cede375f335e9722b09d69afa0a3b666f716 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 8 Apr 2021 14:15:58 -0700
Subject: [PATCH 0733/1285] Loudly throw errors in inbox task

---
 bookwyrm/views/inbox.py | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/views/inbox.py b/bookwyrm/views/inbox.py
index 34bd2e1c..8c645159 100644
--- a/bookwyrm/views/inbox.py
+++ b/bookwyrm/views/inbox.py
@@ -58,18 +58,11 @@ class Inbox(View):
 def activity_task(activity_json):
     """ do something with this json we think is legit """
     # lets see if the activitypub module can make sense of this json
-    try:
-        activity = activitypub.parse(activity_json)
-    except activitypub.ActivitySerializerError:
-        return
+    activity = activitypub.parse(activity_json)
 
     # cool that worked, now we should do the action described by the type
     # (create, update, delete, etc)
-    try:
-        activity.action()
-    except activitypub.ActivitySerializerError:
-        # this is raised if the activity is discarded
-        return
+    activity.action()
 
 
 def has_valid_signature(request, activity):

From 98161b9041ce807194670db10f3427d9577e1aa9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 8 Apr 2021 14:16:34 -0700
Subject: [PATCH 0734/1285] Use CollectionItem objects

---
 bookwyrm/activitypub/__init__.py           |  1 +
 bookwyrm/activitypub/ordered_collection.py | 24 ++++++++++++++++++++++
 bookwyrm/activitypub/verbs.py              | 12 ++++-------
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/bookwyrm/activitypub/__init__.py b/bookwyrm/activitypub/__init__.py
index 35b786f7..c67c5dca 100644
--- a/bookwyrm/activitypub/__init__.py
+++ b/bookwyrm/activitypub/__init__.py
@@ -10,6 +10,7 @@ from .note import Note, GeneratedNote, Article, Comment, Quotation
 from .note import Review, Rating
 from .note import Tombstone
 from .ordered_collection import OrderedCollection, OrderedCollectionPage
+from .ordered_collection import CollectionItem, ListItem, ShelfItem
 from .ordered_collection import BookList, Shelf
 from .person import Person, PublicKey
 from .response import ActivitypubResponse
diff --git a/bookwyrm/activitypub/ordered_collection.py b/bookwyrm/activitypub/ordered_collection.py
index 6da60832..135c50d3 100644
--- a/bookwyrm/activitypub/ordered_collection.py
+++ b/bookwyrm/activitypub/ordered_collection.py
@@ -50,3 +50,27 @@ class OrderedCollectionPage(ActivityObject):
     next: str = None
     prev: str = None
     type: str = "OrderedCollectionPage"
+
+
+@dataclass(init=False)
+class CollectionItem(ActivityObject):
+    """ an item in a collection """
+    actor: str
+    type: str = "CollectionItem"
+
+
+@dataclass(init=False)
+class ListItem(CollectionItem):
+    """ a book on a list """
+    book: str
+    notes: str = None
+    approved: bool = True
+    order: int = None
+    type: str = "ListItem"
+
+
+@dataclass(init=False)
+class ShelfItem(CollectionItem):
+    """ a book on a list """
+    book: str
+    type: str = "ShelfItem"
diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index 3686b3f3..a56eb2fe 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -4,7 +4,7 @@ from typing import List
 from django.apps import apps
 
 from .base_activity import ActivityObject, Signature, resolve_remote_id
-from .book import Edition
+from .ordered_collection import CollectionItem
 
 
 @dataclass(init=False)
@@ -141,12 +141,9 @@ class Reject(Verb):
 class Add(Verb):
     """Add activity """
 
-    target: str
-    object: Edition
+    target: ActivityObject
+    object: CollectionItem
     type: str = "Add"
-    notes: str = None
-    order: int = 0
-    approved: bool = True
 
     def action(self):
         """ add obj to collection """
@@ -159,10 +156,9 @@ class Add(Verb):
 
 
 @dataclass(init=False)
-class Remove(Verb):
+class Remove(Add):
     """Remove activity """
 
-    target: ActivityObject
     type: str = "Remove"
 
     def action(self):

From 31077a97900691b1104767e41c427d662ecedf7d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 8 Apr 2021 14:17:29 -0700
Subject: [PATCH 0735/1285] Update ordered collection classes to use
 CollectionItem

---
 bookwyrm/models/activitypub_mixin.py | 22 ++++++++++------------
 bookwyrm/models/list.py              |  3 +--
 bookwyrm/models/shelf.py             |  5 ++---
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index 8dce42e4..9b104456 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -64,6 +64,7 @@ class ActivitypubMixin:
         )
         if hasattr(self, "property_fields"):
             self.activity_fields += [
+                # pylint: disable=cell-var-from-loop
                 PropertyField(lambda a, o: set_activity_from_property_field(a, o, f))
                 for f in self.property_fields
             ]
@@ -356,8 +357,7 @@ class OrderedCollectionMixin(OrderedCollectionPageMixin):
 class CollectionItemMixin(ActivitypubMixin):
     """ for items that are part of an (Ordered)Collection """
 
-    activity_serializer = activitypub.Add
-    object_field = collection_field = None
+    activity_serializer = activitypub.CollectionItem
 
     def save(self, *args, broadcast=True, **kwargs):
         """ broadcast updated """
@@ -370,35 +370,33 @@ class CollectionItemMixin(ActivitypubMixin):
             return
 
         # adding an obj to the collection
-        activity = self.to_add_activity()
+        activity = self.to_add_activity(self.user)
         self.broadcast(activity, self.user)
 
     def delete(self, *args, **kwargs):
         """ broadcast a remove activity """
-        activity = self.to_remove_activity()
+        activity = self.to_remove_activity(self.user)
         super().delete(*args, **kwargs)
         if self.user.local:
             self.broadcast(activity, self.user)
 
-    def to_add_activity(self):
+    def to_add_activity(self, user):
         """ AP for shelving a book"""
-        object_field = getattr(self, self.object_field)
         collection_field = getattr(self, self.collection_field)
         return activitypub.Add(
             id=self.get_remote_id(),
-            actor=self.user.remote_id,
-            object=object_field,
+            actor=user.remote_id,
+            object=self.to_activity_dataclass(),
             target=collection_field.remote_id,
         ).serialize()
 
-    def to_remove_activity(self):
+    def to_remove_activity(self, user):
         """ AP for un-shelving a book"""
-        object_field = getattr(self, self.object_field)
         collection_field = getattr(self, self.collection_field)
         return activitypub.Remove(
             id=self.get_remote_id(),
-            actor=self.user.remote_id,
-            object=object_field,
+            actor=user.remote_id,
+            object=self.to_activity_dataclass(),
             target=collection_field.remote_id,
         ).serialize()
 
diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index 880c4122..b90eafe3 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -72,8 +72,7 @@ class ListItem(CollectionItemMixin, BookWyrmModel):
     order = fields.IntegerField(blank=True, null=True)
     endorsement = models.ManyToManyField("User", related_name="endorsers")
 
-    activity_serializer = activitypub.Add
-    object_field = "book"
+    activity_serializer = activitypub.ListItem
     collection_field = "book_list"
 
     def save(self, *args, **kwargs):
diff --git a/bookwyrm/models/shelf.py b/bookwyrm/models/shelf.py
index 3209da5d..8a7095d0 100644
--- a/bookwyrm/models/shelf.py
+++ b/bookwyrm/models/shelf.py
@@ -32,6 +32,7 @@ class Shelf(OrderedCollectionMixin, BookWyrmModel):
     )
 
     activity_serializer = activitypub.Shelf
+    collection_field = "shelf"
 
     def save(self, *args, **kwargs):
         """ set the identifier """
@@ -75,9 +76,7 @@ class ShelfBook(CollectionItemMixin, BookWyrmModel):
         "User", on_delete=models.PROTECT, activitypub_field="actor"
     )
 
-    activity_serializer = activitypub.Add
-    object_field = "book"
-    collection_field = "shelf"
+    activity_serializer = activitypub.ShelfItem
 
     def save(self, *args, **kwargs):
         if not self.user:

From af58455ae9ea6af1bf82d1da786facf7114f0604 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 8 Apr 2021 14:20:16 -0700
Subject: [PATCH 0736/1285] Updates mock paradigm in lists tests

---
 bookwyrm/tests/views/test_list.py | 175 +++++++++++++-----------------
 1 file changed, 74 insertions(+), 101 deletions(-)

diff --git a/bookwyrm/tests/views/test_list.py b/bookwyrm/tests/views/test_list.py
index c2c75453..04e8aabe 100644
--- a/bookwyrm/tests/views/test_list.py
+++ b/bookwyrm/tests/views/test_list.py
@@ -1,4 +1,5 @@
 """ test for app action functionality """
+import json
 from unittest.mock import patch
 
 from django.contrib.auth.models import AnonymousUser
@@ -71,16 +72,6 @@ class ListViews(TestCase):
 
     def test_lists_create(self):
         """ create list view """
-        real_broadcast = models.List.broadcast
-
-        def mock_broadcast(_, activity, user, **kwargs):
-            """ ok """
-            self.assertEqual(user.remote_id, self.local_user.remote_id)
-            self.assertEqual(activity["type"], "Create")
-            self.assertEqual(activity["actor"], self.local_user.remote_id)
-
-        models.List.broadcast = mock_broadcast
-
         view = views.Lists.as_view()
         request = self.factory.post(
             "",
@@ -93,13 +84,19 @@ class ListViews(TestCase):
             },
         )
         request.user = self.local_user
-        result = view(request)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
+            result = view(request)
+
+            self.assertEqual(mock.call_count, 1)
+            activity = json.loads(mock.call_args_list[1][0][1])
+            self.assertEqual(activity["type"], "Create")
+            self.assertEqual(activity["actor"], self.local_user.remote_id)
+
         self.assertEqual(result.status_code, 302)
         new_list = models.List.objects.filter(name="A list").get()
         self.assertEqual(new_list.description, "wow")
         self.assertEqual(new_list.privacy, "unlisted")
         self.assertEqual(new_list.curation, "open")
-        models.List.broadcast = real_broadcast
 
     def test_list_page(self):
         """ there are so many views, this just makes sure it LOADS """
@@ -138,17 +135,6 @@ class ListViews(TestCase):
 
     def test_list_edit(self):
         """ edit a list """
-        real_broadcast = models.List.broadcast
-
-        def mock_broadcast(_, activity, user, **kwargs):
-            """ ok """
-            self.assertEqual(user.remote_id, self.local_user.remote_id)
-            self.assertEqual(activity["type"], "Update")
-            self.assertEqual(activity["actor"], self.local_user.remote_id)
-            self.assertEqual(activity["object"]["id"], self.list.remote_id)
-
-        models.List.broadcast = mock_broadcast
-
         view = views.List.as_view()
         request = self.factory.post(
             "",
@@ -162,7 +148,15 @@ class ListViews(TestCase):
         )
         request.user = self.local_user
 
-        result = view(request, self.list.id)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
+            result = view(request, self.list.id)
+
+            self.assertEqual(mock.call_count, 1)
+            activity = json.loads(mock.call_args_list[1][0][1])
+            self.assertEqual(activity["type"], "Update")
+            self.assertEqual(activity["actor"], self.local_user.remote_id)
+            self.assertEqual(activity["object"]["id"], self.list.remote_id)
+
         self.assertEqual(result.status_code, 302)
 
         self.list.refresh_from_db()
@@ -170,7 +164,6 @@ class ListViews(TestCase):
         self.assertEqual(self.list.description, "wow")
         self.assertEqual(self.list.privacy, "direct")
         self.assertEqual(self.list.curation, "curated")
-        models.List.broadcast = real_broadcast
 
     def test_curate_page(self):
         """ there are so many views, this just makes sure it LOADS """
@@ -194,17 +187,6 @@ class ListViews(TestCase):
 
     def test_curate_approve(self):
         """ approve a pending item """
-        real_broadcast = models.List.broadcast
-
-        def mock_broadcast(_, activity, user, **kwargs):
-            """ ok """
-            self.assertEqual(user.remote_id, self.local_user.remote_id)
-            self.assertEqual(activity["type"], "Add")
-            self.assertEqual(activity["actor"], self.local_user.remote_id)
-            self.assertEqual(activity["target"], self.list.remote_id)
-
-        models.ListItem.broadcast = mock_broadcast
-
         view = views.Curate.as_view()
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             pending = models.ListItem.objects.create(
@@ -223,12 +205,19 @@ class ListViews(TestCase):
         )
         request.user = self.local_user
 
-        view(request, self.list.id)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
+            view(request, self.list.id)
+
+            self.assertEqual(mock.call_count, 1)
+            activity = json.loads(mock.call_args_list[1][0][1])
+            self.assertEqual(activity["type"], "Add")
+            self.assertEqual(activity["actor"], self.local_user.remote_id)
+            self.assertEqual(activity["target"], self.list.remote_id)
+
         pending.refresh_from_db()
         self.assertEqual(self.list.books.count(), 1)
         self.assertEqual(self.list.listitem_set.first(), pending)
         self.assertTrue(pending.approved)
-        models.ListItem.broadcast = real_broadcast
 
     def test_curate_reject(self):
         """ approve a pending item """
@@ -250,23 +239,15 @@ class ListViews(TestCase):
         )
         request.user = self.local_user
 
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
             view(request, self.list.id)
+            self.assertEqual(mock.call_count, 1)
+            #activity = json.loads(mock.call_args_list[1][0][1])
         self.assertFalse(self.list.books.exists())
         self.assertFalse(models.ListItem.objects.exists())
 
     def test_add_book(self):
         """ put a book on a list """
-        real_broadcast = models.List.broadcast
-
-        def mock_broadcast(_, activity, user):
-            """ ok """
-            self.assertEqual(user.remote_id, self.local_user.remote_id)
-            self.assertEqual(activity["type"], "Add")
-            self.assertEqual(activity["actor"], self.local_user.remote_id)
-            self.assertEqual(activity["target"], self.list.remote_id)
-
-        models.ListItem.broadcast = mock_broadcast
         request = self.factory.post(
             "",
             {
@@ -276,25 +257,21 @@ class ListViews(TestCase):
         )
         request.user = self.local_user
 
-        views.list.add_book(request)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
+            views.list.add_book(request)
+            self.assertEqual(mock.call_count, 1)
+            activity = json.loads(mock.call_args_list[1][0][1])
+            self.assertEqual(activity["type"], "Add")
+            self.assertEqual(activity["actor"], self.local_user.remote_id)
+            self.assertEqual(activity["target"], self.list.remote_id)
+
         item = self.list.listitem_set.get()
         self.assertEqual(item.book, self.book)
         self.assertEqual(item.user, self.local_user)
         self.assertTrue(item.approved)
-        models.ListItem.broadcast = real_broadcast
 
     def test_add_book_outsider(self):
         """ put a book on a list """
-        real_broadcast = models.List.broadcast
-
-        def mock_broadcast(_, activity, user):
-            """ ok """
-            self.assertEqual(user.remote_id, self.rat.remote_id)
-            self.assertEqual(activity["type"], "Add")
-            self.assertEqual(activity["actor"], self.rat.remote_id)
-            self.assertEqual(activity["target"], self.list.remote_id)
-
-        models.ListItem.broadcast = mock_broadcast
         self.list.curation = "open"
         self.list.save(broadcast=False)
         request = self.factory.post(
@@ -306,26 +283,21 @@ class ListViews(TestCase):
         )
         request.user = self.rat
 
-        views.list.add_book(request)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
+            views.list.add_book(request)
+            self.assertEqual(mock.call_count, 1)
+            activity = json.loads(mock.call_args_list[1][0][1])
+            self.assertEqual(activity["type"], "Add")
+            self.assertEqual(activity["actor"], self.rat.remote_id)
+            self.assertEqual(activity["target"], self.list.remote_id)
+
         item = self.list.listitem_set.get()
         self.assertEqual(item.book, self.book)
         self.assertEqual(item.user, self.rat)
         self.assertTrue(item.approved)
-        models.ListItem.broadcast = real_broadcast
 
     def test_add_book_pending(self):
         """ put a book on a list awaiting approval """
-        real_broadcast = models.List.broadcast
-
-        def mock_broadcast(_, activity, user):
-            """ ok """
-            self.assertEqual(user.remote_id, self.rat.remote_id)
-            self.assertEqual(activity["type"], "Add")
-            self.assertEqual(activity["actor"], self.rat.remote_id)
-            self.assertEqual(activity["target"], self.list.remote_id)
-            self.assertEqual(activity["object"]["id"], self.book.remote_id)
-
-        models.ListItem.broadcast = mock_broadcast
         self.list.curation = "curated"
         self.list.save(broadcast=False)
         request = self.factory.post(
@@ -337,26 +309,21 @@ class ListViews(TestCase):
         )
         request.user = self.rat
 
-        views.list.add_book(request)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
+            views.list.add_book(request)
+            self.assertEqual(mock.call_count, 1)
+            activity = json.loads(mock.call_args_list[1][0][1])
+            self.assertEqual(activity["type"], "Add")
+            self.assertEqual(activity["actor"], self.rat.remote_id)
+            self.assertEqual(activity["target"], self.list.remote_id)
+            self.assertEqual(activity["object"]["id"], self.book.remote_id)
         item = self.list.listitem_set.get()
         self.assertEqual(item.book, self.book)
         self.assertEqual(item.user, self.rat)
         self.assertFalse(item.approved)
-        models.ListItem.broadcast = real_broadcast
 
     def test_add_book_self_curated(self):
         """ put a book on a list automatically approved """
-        real_broadcast = models.ListItem.broadcast
-
-        def mock_broadcast(_, activity, user):
-            """ ok """
-            self.assertEqual(user.remote_id, self.local_user.remote_id)
-            self.assertEqual(activity["type"], "Add")
-            self.assertEqual(activity["actor"], self.local_user.remote_id)
-            self.assertEqual(activity["target"], self.list.remote_id)
-
-        models.ListItem.broadcast = mock_broadcast
-
         self.list.curation = "curated"
         self.list.save(broadcast=False)
         request = self.factory.post(
@@ -368,16 +335,21 @@ class ListViews(TestCase):
         )
         request.user = self.local_user
 
-        views.list.add_book(request)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
+            views.list.add_book(request)
+            self.assertEqual(mock.call_count, 1)
+            activity = json.loads(mock.call_args_list[1][0][1])
+            self.assertEqual(activity["type"], "Add")
+            self.assertEqual(activity["actor"], self.local_user.remote_id)
+            self.assertEqual(activity["target"], self.list.remote_id)
+
         item = self.list.listitem_set.get()
         self.assertEqual(item.book, self.book)
         self.assertEqual(item.user, self.local_user)
         self.assertTrue(item.approved)
-        models.ListItem.broadcast = real_broadcast
 
     def test_remove_book(self):
         """ take an item off a list """
-        real_broadcast = models.ListItem.broadcast
 
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             item = models.ListItem.objects.create(
@@ -387,14 +359,6 @@ class ListViews(TestCase):
             )
         self.assertTrue(self.list.listitem_set.exists())
 
-        def mock_broadcast(_, activity, user):
-            """ ok """
-            self.assertEqual(user.remote_id, self.local_user.remote_id)
-            self.assertEqual(activity["type"], "Remove")
-            self.assertEqual(activity["actor"], self.local_user.remote_id)
-            self.assertEqual(activity["target"], self.list.remote_id)
-
-        models.ListItem.broadcast = mock_broadcast
         request = self.factory.post(
             "",
             {
@@ -403,10 +367,15 @@ class ListViews(TestCase):
         )
         request.user = self.local_user
 
-        views.list.remove_book(request, self.list.id)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
+            views.list.remove_book(request, self.list.id)
+            self.assertEqual(mock.call_count, 1)
+            activity = json.loads(mock.call_args_list[1][0][1])
+            self.assertEqual(activity["type"], "Remove")
+            self.assertEqual(activity["actor"], self.local_user.remote_id)
+            self.assertEqual(activity["target"], self.list.remote_id)
 
         self.assertFalse(self.list.listitem_set.exists())
-        models.ListItem.broadcast = real_broadcast
 
     def test_remove_book_unauthorized(self):
         """ take an item off a list """
@@ -425,6 +394,10 @@ class ListViews(TestCase):
         )
         request.user = self.rat
 
-        views.list.remove_book(request, self.list.id)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
+            views.list.remove_book(request, self.list.id)
+            self.assertEqual(mock.call_count, 1)
+            activity = json.loads(mock.call_args_list[1][0][1])
+            self.assertEqual(activity["type"], "Remove")
 
         self.assertTrue(self.list.listitem_set.exists())

From e550f8cde61459793ec4f7846761df5b10e3e4c7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 8 Apr 2021 14:47:38 -0700
Subject: [PATCH 0737/1285] Fixes list item fields and broadcast updates

---
 bookwyrm/models/activitypub_mixin.py | 9 ++++-----
 bookwyrm/models/list.py              | 6 +++---
 bookwyrm/models/shelf.py             | 8 ++++----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index 9b104456..41940fdf 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -361,12 +361,11 @@ class CollectionItemMixin(ActivitypubMixin):
 
     def save(self, *args, broadcast=True, **kwargs):
         """ broadcast updated """
-        created = not bool(self.id)
         # first off, we want to save normally no matter what
         super().save(*args, **kwargs)
 
-        # these shouldn't be edited, only created and deleted
-        if not broadcast or not created or not self.user.local:
+        # list items can be updateda, normally you would only broadcast on created
+        if not broadcast or not self.user.local:
             return
 
         # adding an obj to the collection
@@ -384,7 +383,7 @@ class CollectionItemMixin(ActivitypubMixin):
         """ AP for shelving a book"""
         collection_field = getattr(self, self.collection_field)
         return activitypub.Add(
-            id=self.get_remote_id(),
+            id="{:s}#add".format(collection_field.remote_id),
             actor=user.remote_id,
             object=self.to_activity_dataclass(),
             target=collection_field.remote_id,
@@ -394,7 +393,7 @@ class CollectionItemMixin(ActivitypubMixin):
         """ AP for un-shelving a book"""
         collection_field = getattr(self, self.collection_field)
         return activitypub.Remove(
-            id=self.get_remote_id(),
+            id="{:s}#remove".format(collection_field.remote_id),
             actor=user.remote_id,
             object=self.to_activity_dataclass(),
             target=collection_field.remote_id,
diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index b90eafe3..057c2a69 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -59,10 +59,10 @@ class ListItem(CollectionItemMixin, BookWyrmModel):
     """ ok """
 
     book = fields.ForeignKey(
-        "Edition", on_delete=models.PROTECT, activitypub_field="object"
+        "Edition", on_delete=models.PROTECT, activitypub_field="book"
     )
-    book_list = fields.ForeignKey(
-        "List", on_delete=models.CASCADE, activitypub_field="target"
+    book_list = models.ForeignKey(
+        "List", on_delete=models.CASCADE
     )
     user = fields.ForeignKey(
         "User", on_delete=models.PROTECT, activitypub_field="actor"
diff --git a/bookwyrm/models/shelf.py b/bookwyrm/models/shelf.py
index 8a7095d0..22582859 100644
--- a/bookwyrm/models/shelf.py
+++ b/bookwyrm/models/shelf.py
@@ -32,7 +32,6 @@ class Shelf(OrderedCollectionMixin, BookWyrmModel):
     )
 
     activity_serializer = activitypub.Shelf
-    collection_field = "shelf"
 
     def save(self, *args, **kwargs):
         """ set the identifier """
@@ -67,16 +66,17 @@ class ShelfBook(CollectionItemMixin, BookWyrmModel):
     """ many to many join table for books and shelves """
 
     book = fields.ForeignKey(
-        "Edition", on_delete=models.PROTECT, activitypub_field="object"
+        "Edition", on_delete=models.PROTECT, activitypub_field="book"
     )
-    shelf = fields.ForeignKey(
-        "Shelf", on_delete=models.PROTECT, activitypub_field="target"
+    shelf = models.ForeignKey(
+        "Shelf", on_delete=models.PROTECT
     )
     user = fields.ForeignKey(
         "User", on_delete=models.PROTECT, activitypub_field="actor"
     )
 
     activity_serializer = activitypub.ShelfItem
+    collection_field = "shelf"
 
     def save(self, *args, **kwargs):
         if not self.user:

From 1f930ba8211994beb26ad95d8dbaf7e968513522 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 8 Apr 2021 14:51:52 -0700
Subject: [PATCH 0738/1285] Updates list view tests

---
 bookwyrm/tests/views/test_list.py | 72 +++++++++++++------------------
 1 file changed, 31 insertions(+), 41 deletions(-)

diff --git a/bookwyrm/tests/views/test_list.py b/bookwyrm/tests/views/test_list.py
index 04e8aabe..0a851bf0 100644
--- a/bookwyrm/tests/views/test_list.py
+++ b/bookwyrm/tests/views/test_list.py
@@ -87,10 +87,10 @@ class ListViews(TestCase):
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
             result = view(request)
 
-            self.assertEqual(mock.call_count, 1)
-            activity = json.loads(mock.call_args_list[1][0][1])
-            self.assertEqual(activity["type"], "Create")
-            self.assertEqual(activity["actor"], self.local_user.remote_id)
+        self.assertEqual(mock.call_count, 1)
+        activity = json.loads(mock.call_args[0][1])
+        self.assertEqual(activity["type"], "Create")
+        self.assertEqual(activity["actor"], self.local_user.remote_id)
 
         self.assertEqual(result.status_code, 302)
         new_list = models.List.objects.filter(name="A list").get()
@@ -151,11 +151,11 @@ class ListViews(TestCase):
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
             result = view(request, self.list.id)
 
-            self.assertEqual(mock.call_count, 1)
-            activity = json.loads(mock.call_args_list[1][0][1])
-            self.assertEqual(activity["type"], "Update")
-            self.assertEqual(activity["actor"], self.local_user.remote_id)
-            self.assertEqual(activity["object"]["id"], self.list.remote_id)
+        self.assertEqual(mock.call_count, 1)
+        activity = json.loads(mock.call_args[0][1])
+        self.assertEqual(activity["type"], "Update")
+        self.assertEqual(activity["actor"], self.local_user.remote_id)
+        self.assertEqual(activity["object"]["id"], self.list.remote_id)
 
         self.assertEqual(result.status_code, 302)
 
@@ -208,11 +208,11 @@ class ListViews(TestCase):
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
             view(request, self.list.id)
 
-            self.assertEqual(mock.call_count, 1)
-            activity = json.loads(mock.call_args_list[1][0][1])
-            self.assertEqual(activity["type"], "Add")
-            self.assertEqual(activity["actor"], self.local_user.remote_id)
-            self.assertEqual(activity["target"], self.list.remote_id)
+        self.assertEqual(mock.call_count, 1)
+        activity = json.loads(mock.call_args[0][1])
+        self.assertEqual(activity["type"], "Add")
+        self.assertEqual(activity["actor"], self.local_user.remote_id)
+        self.assertEqual(activity["target"], self.list.remote_id)
 
         pending.refresh_from_db()
         self.assertEqual(self.list.books.count(), 1)
@@ -239,10 +239,8 @@ class ListViews(TestCase):
         )
         request.user = self.local_user
 
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
-            view(request, self.list.id)
-            self.assertEqual(mock.call_count, 1)
-            #activity = json.loads(mock.call_args_list[1][0][1])
+        view(request, self.list.id)
+
         self.assertFalse(self.list.books.exists())
         self.assertFalse(models.ListItem.objects.exists())
 
@@ -260,7 +258,7 @@ class ListViews(TestCase):
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
             views.list.add_book(request)
             self.assertEqual(mock.call_count, 1)
-            activity = json.loads(mock.call_args_list[1][0][1])
+            activity = json.loads(mock.call_args[0][1])
             self.assertEqual(activity["type"], "Add")
             self.assertEqual(activity["actor"], self.local_user.remote_id)
             self.assertEqual(activity["target"], self.list.remote_id)
@@ -286,7 +284,7 @@ class ListViews(TestCase):
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
             views.list.add_book(request)
             self.assertEqual(mock.call_count, 1)
-            activity = json.loads(mock.call_args_list[1][0][1])
+            activity = json.loads(mock.call_args[0][1])
             self.assertEqual(activity["type"], "Add")
             self.assertEqual(activity["actor"], self.rat.remote_id)
             self.assertEqual(activity["target"], self.list.remote_id)
@@ -311,13 +309,17 @@ class ListViews(TestCase):
 
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
             views.list.add_book(request)
-            self.assertEqual(mock.call_count, 1)
-            activity = json.loads(mock.call_args_list[1][0][1])
-            self.assertEqual(activity["type"], "Add")
-            self.assertEqual(activity["actor"], self.rat.remote_id)
-            self.assertEqual(activity["target"], self.list.remote_id)
-            self.assertEqual(activity["object"]["id"], self.book.remote_id)
+
+        self.assertEqual(mock.call_count, 1)
+        activity = json.loads(mock.call_args[0][1])
+
+        self.assertEqual(activity["type"], "Add")
+        self.assertEqual(activity["actor"], self.rat.remote_id)
+        self.assertEqual(activity["target"], self.list.remote_id)
+
         item = self.list.listitem_set.get()
+        self.assertEqual(activity["object"]["id"], item.remote_id)
+
         self.assertEqual(item.book, self.book)
         self.assertEqual(item.user, self.rat)
         self.assertFalse(item.approved)
@@ -338,7 +340,7 @@ class ListViews(TestCase):
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
             views.list.add_book(request)
             self.assertEqual(mock.call_count, 1)
-            activity = json.loads(mock.call_args_list[1][0][1])
+            activity = json.loads(mock.call_args[0][1])
             self.assertEqual(activity["type"], "Add")
             self.assertEqual(activity["actor"], self.local_user.remote_id)
             self.assertEqual(activity["target"], self.list.remote_id)
@@ -367,14 +369,7 @@ class ListViews(TestCase):
         )
         request.user = self.local_user
 
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
-            views.list.remove_book(request, self.list.id)
-            self.assertEqual(mock.call_count, 1)
-            activity = json.loads(mock.call_args_list[1][0][1])
-            self.assertEqual(activity["type"], "Remove")
-            self.assertEqual(activity["actor"], self.local_user.remote_id)
-            self.assertEqual(activity["target"], self.list.remote_id)
-
+        views.list.remove_book(request, self.list.id)
         self.assertFalse(self.list.listitem_set.exists())
 
     def test_remove_book_unauthorized(self):
@@ -394,10 +389,5 @@ class ListViews(TestCase):
         )
         request.user = self.rat
 
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
-            views.list.remove_book(request, self.list.id)
-            self.assertEqual(mock.call_count, 1)
-            activity = json.loads(mock.call_args_list[1][0][1])
-            self.assertEqual(activity["type"], "Remove")
-
+        views.list.remove_book(request, self.list.id)
         self.assertTrue(self.list.listitem_set.exists())

From b1491c2ac69822b00a524f9c8d2a5801834b2ba3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 8 Apr 2021 14:53:45 -0700
Subject: [PATCH 0739/1285] Adds privacy and recipient details to list items

---
 bookwyrm/models/activitypub_mixin.py | 14 ++++++
 bookwyrm/models/list.py              |  4 +-
 bookwyrm/models/shelf.py             |  4 +-
 bookwyrm/tests/models/test_list.py   | 64 +++++++++++++++++++---------
 4 files changed, 59 insertions(+), 27 deletions(-)

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index 41940fdf..714dc485 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -359,6 +359,20 @@ class CollectionItemMixin(ActivitypubMixin):
 
     activity_serializer = activitypub.CollectionItem
 
+    @property
+    def privacy(self):
+        """ inherit the privacy of the list, or direct if pending """
+        collection_field = getattr(self, self.collection_field)
+        if self.approved:
+            return collection_field.privacy
+        return "direct"
+
+    @property
+    def recipients(self):
+        """ the owner of the list is a direct recipient """
+        collection_field = getattr(self, self.collection_field)
+        return [collection_field.user]
+
     def save(self, *args, broadcast=True, **kwargs):
         """ broadcast updated """
         # first off, we want to save normally no matter what
diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index 057c2a69..4d6b53cd 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -61,9 +61,7 @@ class ListItem(CollectionItemMixin, BookWyrmModel):
     book = fields.ForeignKey(
         "Edition", on_delete=models.PROTECT, activitypub_field="book"
     )
-    book_list = models.ForeignKey(
-        "List", on_delete=models.CASCADE
-    )
+    book_list = models.ForeignKey("List", on_delete=models.CASCADE)
     user = fields.ForeignKey(
         "User", on_delete=models.PROTECT, activitypub_field="actor"
     )
diff --git a/bookwyrm/models/shelf.py b/bookwyrm/models/shelf.py
index 22582859..5bbb84b9 100644
--- a/bookwyrm/models/shelf.py
+++ b/bookwyrm/models/shelf.py
@@ -68,9 +68,7 @@ class ShelfBook(CollectionItemMixin, BookWyrmModel):
     book = fields.ForeignKey(
         "Edition", on_delete=models.PROTECT, activitypub_field="book"
     )
-    shelf = models.ForeignKey(
-        "Shelf", on_delete=models.PROTECT
-    )
+    shelf = models.ForeignKey("Shelf", on_delete=models.PROTECT)
     user = fields.ForeignKey(
         "User", on_delete=models.PROTECT, activitypub_field="actor"
     )
diff --git a/bookwyrm/tests/models/test_list.py b/bookwyrm/tests/models/test_list.py
index 6bc4b796..f6ed0c96 100644
--- a/bookwyrm/tests/models/test_list.py
+++ b/bookwyrm/tests/models/test_list.py
@@ -11,45 +11,67 @@ class List(TestCase):
 
     def setUp(self):
         """ look, a list """
-        self.user = models.User.objects.create_user(
+        self.local_user = models.User.objects.create_user(
             "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
         )
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            self.list = models.List.objects.create(name="Test List", user=self.user)
+        work = models.Work.objects.create(title="hello")
+        self.book = models.Edition.objects.create(title="hi", parent_work=work)
 
     def test_remote_id(self, _):
         """ shelves use custom remote ids """
-        expected_id = "https://%s/list/%d" % (settings.DOMAIN, self.list.id)
-        self.assertEqual(self.list.get_remote_id(), expected_id)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            book_list = models.List.objects.create(
+                name="Test List", user=self.local_user
+            )
+        expected_id = "https://%s/list/%d" % (settings.DOMAIN, book_list.id)
+        self.assertEqual(book_list.get_remote_id(), expected_id)
 
     def test_to_activity(self, _):
         """ jsonify it """
-        activity_json = self.list.to_activity()
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            book_list = models.List.objects.create(
+                name="Test List", user=self.local_user
+            )
+        activity_json = book_list.to_activity()
         self.assertIsInstance(activity_json, dict)
-        self.assertEqual(activity_json["id"], self.list.remote_id)
+        self.assertEqual(activity_json["id"], book_list.remote_id)
         self.assertEqual(activity_json["totalItems"], 0)
         self.assertEqual(activity_json["type"], "BookList")
         self.assertEqual(activity_json["name"], "Test List")
-        self.assertEqual(activity_json["owner"], self.user.remote_id)
+        self.assertEqual(activity_json["owner"], self.local_user.remote_id)
 
     def test_list_item(self, _):
         """ a list entry """
-        work = models.Work.objects.create(title="hello")
-        book = models.Edition.objects.create(title="hi", parent_work=work)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            book_list = models.List.objects.create(
+                name="Test List", user=self.local_user, privacy="unlisted"
+            )
+
         item = models.ListItem.objects.create(
-            book_list=self.list,
-            book=book,
-            user=self.user,
+            book_list=book_list,
+            book=self.book,
+            user=self.local_user,
         )
 
         self.assertTrue(item.approved)
+        self.assertEqual(item.privacy, "unlisted")
+        self.assertEqual(item.recipients, [self.local_user])
 
-        add_activity = item.to_add_activity()
-        self.assertEqual(add_activity["actor"], self.user.remote_id)
-        self.assertEqual(add_activity["object"]["id"], book.remote_id)
-        self.assertEqual(add_activity["target"], self.list.remote_id)
+    def test_list_item_pending(self, _):
+        """ a list entry """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            book_list = models.List.objects.create(
+                name="Test List", user=self.local_user
+            )
 
-        remove_activity = item.to_remove_activity()
-        self.assertEqual(remove_activity["actor"], self.user.remote_id)
-        self.assertEqual(remove_activity["object"]["id"], book.remote_id)
-        self.assertEqual(remove_activity["target"], self.list.remote_id)
+        item = models.ListItem.objects.create(
+            book_list=book_list,
+            book=self.book,
+            user=self.local_user,
+            approved=False
+        )
+
+        self.assertFalse(item.approved)
+        self.assertEqual(item.book_list.privacy, "public")
+        self.assertEqual(item.privacy, "direct")
+        self.assertEqual(item.recipients, [self.local_user])

From ee6f37d7d28d7b4aceb7868e137d337d700db8b9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 8 Apr 2021 15:11:16 -0700
Subject: [PATCH 0740/1285] python formatting

---
 bookwyrm/activitypub/ordered_collection.py    |  3 ++
 .../migrations/0064_auto_20210408_2208.py     | 28 +++++++++++++++++++
 bookwyrm/tests/models/test_list.py            |  5 +---
 3 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 bookwyrm/migrations/0064_auto_20210408_2208.py

diff --git a/bookwyrm/activitypub/ordered_collection.py b/bookwyrm/activitypub/ordered_collection.py
index 135c50d3..650f6a40 100644
--- a/bookwyrm/activitypub/ordered_collection.py
+++ b/bookwyrm/activitypub/ordered_collection.py
@@ -55,6 +55,7 @@ class OrderedCollectionPage(ActivityObject):
 @dataclass(init=False)
 class CollectionItem(ActivityObject):
     """ an item in a collection """
+
     actor: str
     type: str = "CollectionItem"
 
@@ -62,6 +63,7 @@ class CollectionItem(ActivityObject):
 @dataclass(init=False)
 class ListItem(CollectionItem):
     """ a book on a list """
+
     book: str
     notes: str = None
     approved: bool = True
@@ -72,5 +74,6 @@ class ListItem(CollectionItem):
 @dataclass(init=False)
 class ShelfItem(CollectionItem):
     """ a book on a list """
+
     book: str
     type: str = "ShelfItem"
diff --git a/bookwyrm/migrations/0064_auto_20210408_2208.py b/bookwyrm/migrations/0064_auto_20210408_2208.py
new file mode 100644
index 00000000..84a1a128
--- /dev/null
+++ b/bookwyrm/migrations/0064_auto_20210408_2208.py
@@ -0,0 +1,28 @@
+# Generated by Django 3.1.6 on 2021-04-08 22:08
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0063_auto_20210408_1556"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="listitem",
+            name="book_list",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE, to="bookwyrm.list"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="shelfbook",
+            name="shelf",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT, to="bookwyrm.shelf"
+            ),
+        ),
+    ]
diff --git a/bookwyrm/tests/models/test_list.py b/bookwyrm/tests/models/test_list.py
index f6ed0c96..48f918a0 100644
--- a/bookwyrm/tests/models/test_list.py
+++ b/bookwyrm/tests/models/test_list.py
@@ -65,10 +65,7 @@ class List(TestCase):
             )
 
         item = models.ListItem.objects.create(
-            book_list=book_list,
-            book=self.book,
-            user=self.local_user,
-            approved=False
+            book_list=book_list, book=self.book, user=self.local_user, approved=False
         )
 
         self.assertFalse(item.approved)

From 43f0d4e6037dca9ee82e531ad16ae69dc0337756 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 8 Apr 2021 15:16:49 -0700
Subject: [PATCH 0741/1285] Adds activity tests to shelf views tests

---
 bookwyrm/tests/views/test_shelf.py | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/tests/views/test_shelf.py b/bookwyrm/tests/views/test_shelf.py
index a308fe56..7ab01562 100644
--- a/bookwyrm/tests/views/test_shelf.py
+++ b/bookwyrm/tests/views/test_shelf.py
@@ -1,4 +1,5 @@
 """ test for app action functionality """
+import json
 from unittest.mock import patch
 from django.template.response import TemplateResponse
 from django.test import TestCase
@@ -120,8 +121,15 @@ class ShelfViews(TestCase):
             "", {"book": self.book.id, "shelf": self.shelf.identifier}
         )
         request.user = self.local_user
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
             views.shelve(request)
+
+        self.assertEqual(mock.call_count, 1)
+        activity = json.loads(mock.call_args[0][1])
+        self.assertEqual(activity["type"], "Add")
+
+        item = models.ShelfBook.objects.get()
+        self.assertEqual(activity["object"]["id"], item.remote_id)
         # make sure the book is on the shelf
         self.assertEqual(self.shelf.books.get(), self.book)
 
@@ -170,10 +178,15 @@ class ShelfViews(TestCase):
             models.ShelfBook.objects.create(
                 book=self.book, user=self.local_user, shelf=self.shelf
             )
+        item = models.ShelfBook.objects.get()
+
         self.shelf.save()
         self.assertEqual(self.shelf.books.count(), 1)
         request = self.factory.post("", {"book": self.book.id, "shelf": self.shelf.id})
         request.user = self.local_user
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
             views.unshelve(request)
+        activity = json.loads(mock.call_args[0][1])
+        self.assertEqual(activity["type"], "Remove")
+        self.assertEqual(activity["object"]["id"], item.remote_id)
         self.assertEqual(self.shelf.books.count(), 0)

From 24685187e87f6af0daeaa058e2dcd2f7de3c5081 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 8 Apr 2021 15:22:06 -0700
Subject: [PATCH 0742/1285] Updates collection item add/remove handlers

---
 bookwyrm/activitypub/verbs.py | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index a56eb2fe..3a7910cf 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -145,15 +145,6 @@ class Add(Verb):
     object: CollectionItem
     type: str = "Add"
 
-    def action(self):
-        """ add obj to collection """
-        target = resolve_remote_id(self.target, refresh=False)
-        # we want to get the related field that isn't the book, this is janky af sorry
-        model = [t for t in type(target)._meta.related_objects if t.name != "edition"][
-            0
-        ].related_model
-        self.to_model(model=model)
-
 
 @dataclass(init=False)
 class Remove(Add):
@@ -163,11 +154,7 @@ class Remove(Add):
 
     def action(self):
         """ find and remove the activity object """
-        target = resolve_remote_id(self.target, refresh=False)
-        model = [t for t in type(target)._meta.related_objects if t.name != "edition"][
-            0
-        ].related_model
-        obj = self.to_model(model=model, save=False, allow_create=False)
+        obj = self.object.to_model(model=model, save=False, allow_create=False)
         obj.delete()
 
 

From a7375c4c139cff2866fe7e8df68dfa39cd7c2a11 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 8 Apr 2021 15:23:56 -0700
Subject: [PATCH 0743/1285] Adds remove list item test and updates add/create
 tests

---
 bookwyrm/tests/views/inbox/test_inbox_add.py  |  9 +--
 .../tests/views/inbox/test_inbox_create.py    |  2 +-
 .../tests/views/inbox/test_inbox_remove.py    | 62 +++++++++++++++----
 3 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/bookwyrm/tests/views/inbox/test_inbox_add.py b/bookwyrm/tests/views/inbox/test_inbox_add.py
index 638d56d7..1f396caf 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_add.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_add.py
@@ -97,10 +97,9 @@ class InboxActivities(TestCase):
             "type": "Add",
             "actor": "https://example.com/users/rat",
             "object": {
-                "type": "Edition",
-                "title": "Test Title",
-                "work": work.remote_id,
-                "id": "https://bookwyrm.social/book/37292",
+                "type": "ListItem",
+                "book": self.edition.remote_id,
+                "id": "https://bookwyrm.social/listbook/6189",
             },
             "target": "https://bookwyrm.social/user/mouse/list/to-read",
             "@context": "https://www.w3.org/ns/activitystreams",
@@ -108,8 +107,10 @@ class InboxActivities(TestCase):
         views.inbox.activity_task(activity)
 
         booklist = models.List.objects.get()
+        listitem = models.ListItem.objects.get()
         self.assertEqual(booklist.name, "Test List")
         self.assertEqual(booklist.books.first(), book)
+        self.assertEqual(listitem.remote_id, "https://bookwyrm.social/listbook/6189")
 
     @responses.activate
     def test_handle_tag_book(self):
diff --git a/bookwyrm/tests/views/inbox/test_inbox_create.py b/bookwyrm/tests/views/inbox/test_inbox_create.py
index 437f6ffc..f8ed6a84 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_create.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_create.py
@@ -9,7 +9,7 @@ from bookwyrm import models, views
 
 
 # pylint: disable=too-many-public-methods
-class InboxActivities(TestCase):
+class InboxCreate(TestCase):
     """ readthrough tests """
 
     def setUp(self):
diff --git a/bookwyrm/tests/views/inbox/test_inbox_remove.py b/bookwyrm/tests/views/inbox/test_inbox_remove.py
index b3e42bbd..778f5077 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_remove.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_remove.py
@@ -7,11 +7,20 @@ from bookwyrm import models, views
 
 
 # pylint: disable=too-many-public-methods
-class InboxActivities(TestCase):
+class InboxRemove(TestCase):
     """ inbox tests """
 
     def setUp(self):
         """ basic user and book data """
+        self.local_user = models.User.objects.create_user(
+            "mouse@example.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+        )
+        self.local_user.remote_id = "https://example.com/user/mouse"
+        self.local_user.save(broadcast=False)
         with patch("bookwyrm.models.user.set_remote_server.delay"):
             self.remote_user = models.User.objects.create_user(
                 "rat",
@@ -22,26 +31,26 @@ class InboxActivities(TestCase):
                 inbox="https://example.com/users/rat/inbox",
                 outbox="https://example.com/users/rat/outbox",
             )
+        self.work = models.Work.objects.create(title="work title")
+        self.book = models.Edition.objects.create(
+            title="Test",
+            remote_id="https://bookwyrm.social/book/37292",
+            parent_work=self.work,
+        )
 
         models.SiteSettings.objects.create()
 
     def test_handle_unshelve_book(self):
         """ remove a book from a shelf """
-        work = models.Work.objects.create(title="work title")
-        book = models.Edition.objects.create(
-            title="Test",
-            remote_id="https://bookwyrm.social/book/37292",
-            parent_work=work,
-        )
         shelf = models.Shelf.objects.create(user=self.remote_user, name="Test Shelf")
         shelf.remote_id = "https://bookwyrm.social/user/mouse/shelf/to-read"
         shelf.save()
 
         shelfbook = models.ShelfBook.objects.create(
-            user=self.remote_user, shelf=shelf, book=book
+            user=self.remote_user, shelf=shelf, book=self.book
         )
 
-        self.assertEqual(shelf.books.first(), book)
+        self.assertEqual(shelf.books.first(), self.book)
         self.assertEqual(shelf.books.count(), 1)
 
         activity = {
@@ -51,11 +60,42 @@ class InboxActivities(TestCase):
             "object": {
                 "type": "Edition",
                 "title": "Test Title",
-                "work": work.remote_id,
-                "id": "https://bookwyrm.social/book/37292",
+                "work": self.work.remote_id,
+                "id": "https//bookwyrm.social/book/37292",
             },
             "target": "https://bookwyrm.social/user/mouse/shelf/to-read",
             "@context": "https://www.w3.org/ns/activitystreams",
         }
         views.inbox.activity_task(activity)
         self.assertFalse(shelf.books.exists())
+
+    def test_handle_remove_book_from_list(self):
+        """ listing a book """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            booklist = models.List.objects.create(
+                name="test list",
+                user=self.local_user,
+            )
+            listitem = models.ListItem.objects.create(
+                user=self.local_user,
+                book=self.book,
+                book_list=booklist,
+            )
+        self.assertEqual(booklist.books.count(), 1)
+
+        activity = {
+            "id": listitem.remote_id,
+            "type": "Remove",
+            "actor": "https://example.com/users/rat",
+            "object": {
+                "type": "Edition",
+                "title": "Test Title",
+                "work": self.work.remote_id,
+                "id": "https://bookwyrm.social/book/37292",
+            },
+            "target": booklist.remote_id,
+            "@context": "https://www.w3.org/ns/activitystreams",
+        }
+        views.inbox.activity_task(activity)
+
+        self.assertEqual(booklist.books.count(), 0)

From ddd05a68cfb94cccf1cb5a5150f03f0961df15f3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 8 Apr 2021 15:40:02 -0700
Subject: [PATCH 0744/1285] Resolve and assign target collection for collection
 items

---
 bookwyrm/activitypub/verbs.py                |  9 ++-
 bookwyrm/tests/views/inbox/test_inbox_add.py | 79 ++++----------------
 2 files changed, 22 insertions(+), 66 deletions(-)

diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index 3a7910cf..c3c84ee5 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -145,6 +145,13 @@ class Add(Verb):
     object: CollectionItem
     type: str = "Add"
 
+    def action(self):
+        """ figure out the target to assign the item to a collection  """
+        target = resolve_remote_id(self.target)
+        item = self.object.to_model(save=False)
+        setattr(item, item.collection_field, target)
+        item.save()
+
 
 @dataclass(init=False)
 class Remove(Add):
@@ -154,7 +161,7 @@ class Remove(Add):
 
     def action(self):
         """ find and remove the activity object """
-        obj = self.object.to_model(model=model, save=False, allow_create=False)
+        obj = self.object.to_model(save=False, allow_create=False)
         obj.delete()
 
 
diff --git a/bookwyrm/tests/views/inbox/test_inbox_add.py b/bookwyrm/tests/views/inbox/test_inbox_add.py
index 1f396caf..f494efa6 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_add.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_add.py
@@ -8,7 +8,7 @@ from bookwyrm import models, views
 
 
 # pylint: disable=too-many-public-methods
-class InboxActivities(TestCase):
+class InboxAdd(TestCase):
     """ inbox tests """
 
     def setUp(self):
@@ -32,17 +32,17 @@ class InboxActivities(TestCase):
                 inbox="https://example.com/users/rat/inbox",
                 outbox="https://example.com/users/rat/outbox",
             )
+        work = models.Work.objects.create(title="work title")
+        self.book = models.Edition.objects.create(
+            title="Test",
+            remote_id="https://bookwyrm.social/book/37292",
+            parent_work=work,
+        )
 
         models.SiteSettings.objects.create()
 
     def test_handle_add_book_to_shelf(self):
         """ shelving a book """
-        work = models.Work.objects.create(title="work title")
-        book = models.Edition.objects.create(
-            title="Test",
-            remote_id="https://bookwyrm.social/book/37292",
-            parent_work=work,
-        )
         shelf = models.Shelf.objects.create(user=self.remote_user, name="Test Shelf")
         shelf.remote_id = "https://bookwyrm.social/user/mouse/shelf/to-read"
         shelf.save()
@@ -52,27 +52,19 @@ class InboxActivities(TestCase):
             "type": "Add",
             "actor": "https://example.com/users/rat",
             "object": {
-                "type": "Edition",
-                "title": "Test Title",
-                "work": work.remote_id,
-                "id": "https://bookwyrm.social/book/37292",
+                "type": "ShelfItem",
+                "book": self.book.remote_id,
+                "id": "https://bookwyrm.social/listbook/6189",
             },
             "target": "https://bookwyrm.social/user/mouse/shelf/to-read",
             "@context": "https://www.w3.org/ns/activitystreams",
         }
         views.inbox.activity_task(activity)
-        self.assertEqual(shelf.books.first(), book)
+        self.assertEqual(shelf.books.first(), self.book)
 
     @responses.activate
     def test_handle_add_book_to_list(self):
         """ listing a book """
-        work = models.Work.objects.create(title="work title")
-        book = models.Edition.objects.create(
-            title="Test",
-            remote_id="https://bookwyrm.social/book/37292",
-            parent_work=work,
-        )
-
         responses.add(
             responses.GET,
             "https://bookwyrm.social/user/mouse/list/to-read",
@@ -97,8 +89,9 @@ class InboxActivities(TestCase):
             "type": "Add",
             "actor": "https://example.com/users/rat",
             "object": {
+                "actor": self.local_user.remote_id,
                 "type": "ListItem",
-                "book": self.edition.remote_id,
+                "book": self.book.remote_id,
                 "id": "https://bookwyrm.social/listbook/6189",
             },
             "target": "https://bookwyrm.social/user/mouse/list/to-read",
@@ -109,49 +102,5 @@ class InboxActivities(TestCase):
         booklist = models.List.objects.get()
         listitem = models.ListItem.objects.get()
         self.assertEqual(booklist.name, "Test List")
-        self.assertEqual(booklist.books.first(), book)
+        self.assertEqual(booklist.books.first(), self.book)
         self.assertEqual(listitem.remote_id, "https://bookwyrm.social/listbook/6189")
-
-    @responses.activate
-    def test_handle_tag_book(self):
-        """ listing a book """
-        work = models.Work.objects.create(title="work title")
-        book = models.Edition.objects.create(
-            title="Test",
-            remote_id="https://bookwyrm.social/book/37292",
-            parent_work=work,
-        )
-
-        responses.add(
-            responses.GET,
-            "https://www.example.com/tag/cool-tag",
-            json={
-                "id": "https://1b1a78582461.ngrok.io/tag/tag",
-                "type": "OrderedCollection",
-                "totalItems": 0,
-                "first": "https://1b1a78582461.ngrok.io/tag/tag?page=1",
-                "last": "https://1b1a78582461.ngrok.io/tag/tag?page=1",
-                "name": "cool tag",
-                "@context": "https://www.w3.org/ns/activitystreams",
-            },
-        )
-
-        activity = {
-            "id": "https://bookwyrm.social/listbook/6189#add",
-            "type": "Add",
-            "actor": "https://example.com/users/rat",
-            "object": {
-                "type": "Edition",
-                "title": "Test Title",
-                "work": work.remote_id,
-                "id": "https://bookwyrm.social/book/37292",
-            },
-            "target": "https://www.example.com/tag/cool-tag",
-            "@context": "https://www.w3.org/ns/activitystreams",
-        }
-        views.inbox.activity_task(activity)
-
-        tag = models.Tag.objects.get()
-        self.assertFalse(models.List.objects.exists())
-        self.assertEqual(tag.name, "cool tag")
-        self.assertEqual(tag.books.first(), book)

From 6310532ddfdd9839d3ec7fcb5178d2b4e047f9ae Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 8 Apr 2021 15:43:19 -0700
Subject: [PATCH 0745/1285] Updates inbox add tests

---
 bookwyrm/tests/views/inbox/test_inbox_add.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bookwyrm/tests/views/inbox/test_inbox_add.py b/bookwyrm/tests/views/inbox/test_inbox_add.py
index f494efa6..65d18860 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_add.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_add.py
@@ -52,6 +52,7 @@ class InboxAdd(TestCase):
             "type": "Add",
             "actor": "https://example.com/users/rat",
             "object": {
+                "actor": self.local_user.remote_id,
                 "type": "ShelfItem",
                 "book": self.book.remote_id,
                 "id": "https://bookwyrm.social/listbook/6189",

From 32bf5107556562c537acbf1920a89c476db28f5d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 8 Apr 2021 15:46:06 -0700
Subject: [PATCH 0746/1285] Updates inbox remove tests

---
 bookwyrm/tests/views/inbox/test_inbox_remove.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/bookwyrm/tests/views/inbox/test_inbox_remove.py b/bookwyrm/tests/views/inbox/test_inbox_remove.py
index 778f5077..e19ea11b 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_remove.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_remove.py
@@ -58,10 +58,10 @@ class InboxRemove(TestCase):
             "type": "Remove",
             "actor": "https://example.com/users/rat",
             "object": {
-                "type": "Edition",
-                "title": "Test Title",
-                "work": self.work.remote_id,
-                "id": "https//bookwyrm.social/book/37292",
+                "actor": self.local_user.remote_id,
+                "type": "ShelfItem",
+                "book": self.book.remote_id,
+                "id": shelfbook.remote_id,
             },
             "target": "https://bookwyrm.social/user/mouse/shelf/to-read",
             "@context": "https://www.w3.org/ns/activitystreams",
@@ -88,10 +88,10 @@ class InboxRemove(TestCase):
             "type": "Remove",
             "actor": "https://example.com/users/rat",
             "object": {
-                "type": "Edition",
-                "title": "Test Title",
-                "work": self.work.remote_id,
-                "id": "https://bookwyrm.social/book/37292",
+                "actor": self.local_user.remote_id,
+                "type": "ListItem",
+                "book": self.book.remote_id,
+                "id": listitem.remote_id,
             },
             "target": booklist.remote_id,
             "@context": "https://www.w3.org/ns/activitystreams",

From 37aacee9c6819d75573d04be68711ca96ce7d306 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 8 Apr 2021 15:50:21 -0700
Subject: [PATCH 0747/1285] Fixes actors in inbox add/remove tests

---
 bookwyrm/tests/views/inbox/test_inbox_add.py    | 12 ++++++------
 bookwyrm/tests/views/inbox/test_inbox_remove.py |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bookwyrm/tests/views/inbox/test_inbox_add.py b/bookwyrm/tests/views/inbox/test_inbox_add.py
index 65d18860..b2b65338 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_add.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_add.py
@@ -13,15 +13,15 @@ class InboxAdd(TestCase):
 
     def setUp(self):
         """ basic user and book data """
-        self.local_user = models.User.objects.create_user(
+        local_user = models.User.objects.create_user(
             "mouse@example.com",
             "mouse@mouse.com",
             "mouseword",
             local=True,
             localname="mouse",
         )
-        self.local_user.remote_id = "https://example.com/user/mouse"
-        self.local_user.save(broadcast=False)
+        local_user.remote_id = "https://example.com/user/mouse"
+        local_user.save(broadcast=False)
         with patch("bookwyrm.models.user.set_remote_server.delay"):
             self.remote_user = models.User.objects.create_user(
                 "rat",
@@ -52,10 +52,10 @@ class InboxAdd(TestCase):
             "type": "Add",
             "actor": "https://example.com/users/rat",
             "object": {
-                "actor": self.local_user.remote_id,
+                "actor": self.remote_user.remote_id,
                 "type": "ShelfItem",
                 "book": self.book.remote_id,
-                "id": "https://bookwyrm.social/listbook/6189",
+                "id": "https://bookwyrm.social/shelfbook/6189",
             },
             "target": "https://bookwyrm.social/user/mouse/shelf/to-read",
             "@context": "https://www.w3.org/ns/activitystreams",
@@ -90,7 +90,7 @@ class InboxAdd(TestCase):
             "type": "Add",
             "actor": "https://example.com/users/rat",
             "object": {
-                "actor": self.local_user.remote_id,
+                "actor": self.remote_user.remote_id,
                 "type": "ListItem",
                 "book": self.book.remote_id,
                 "id": "https://bookwyrm.social/listbook/6189",
diff --git a/bookwyrm/tests/views/inbox/test_inbox_remove.py b/bookwyrm/tests/views/inbox/test_inbox_remove.py
index e19ea11b..a17154d1 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_remove.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_remove.py
@@ -58,7 +58,7 @@ class InboxRemove(TestCase):
             "type": "Remove",
             "actor": "https://example.com/users/rat",
             "object": {
-                "actor": self.local_user.remote_id,
+                "actor": self.remote_user.remote_id,
                 "type": "ShelfItem",
                 "book": self.book.remote_id,
                 "id": shelfbook.remote_id,
@@ -88,7 +88,7 @@ class InboxRemove(TestCase):
             "type": "Remove",
             "actor": "https://example.com/users/rat",
             "object": {
-                "actor": self.local_user.remote_id,
+                "actor": self.remote_user.remote_id,
                 "type": "ListItem",
                 "book": self.book.remote_id,
                 "id": listitem.remote_id,

From fdf5113143fa3ac9fac806f5547e0a03b8c63e3b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 8 Apr 2021 16:00:57 -0700
Subject: [PATCH 0748/1285] Removes tag code

---
 bookwyrm/models/__init__.py      |   2 -
 bookwyrm/models/tag.py           |  63 ----------------
 bookwyrm/tests/views/test_tag.py | 119 -------------------------------
 bookwyrm/urls.py                 |   5 --
 bookwyrm/views/__init__.py       |   1 -
 bookwyrm/views/tag.py            |  73 -------------------
 6 files changed, 263 deletions(-)
 delete mode 100644 bookwyrm/models/tag.py
 delete mode 100644 bookwyrm/tests/views/test_tag.py
 delete mode 100644 bookwyrm/views/tag.py

diff --git a/bookwyrm/models/__init__.py b/bookwyrm/models/__init__.py
index 35e32c2c..2a25a525 100644
--- a/bookwyrm/models/__init__.py
+++ b/bookwyrm/models/__init__.py
@@ -17,8 +17,6 @@ from .favorite import Favorite
 from .notification import Notification
 from .readthrough import ReadThrough, ProgressUpdate, ProgressMode
 
-from .tag import Tag, UserTag
-
 from .user import User, KeyPair, AnnualGoal
 from .relationship import UserFollows, UserFollowRequest, UserBlocks
 from .report import Report, ReportComment
diff --git a/bookwyrm/models/tag.py b/bookwyrm/models/tag.py
deleted file mode 100644
index 2c45b8f9..00000000
--- a/bookwyrm/models/tag.py
+++ /dev/null
@@ -1,63 +0,0 @@
-""" models for storing different kinds of Activities """
-import urllib.parse
-
-from django.apps import apps
-from django.db import models
-
-from bookwyrm import activitypub
-from bookwyrm.settings import DOMAIN
-from .activitypub_mixin import CollectionItemMixin, OrderedCollectionMixin
-from .base_model import BookWyrmModel
-from . import fields
-
-
-class Tag(OrderedCollectionMixin, BookWyrmModel):
-    """ freeform tags for books """
-
-    name = fields.CharField(max_length=100, unique=True)
-    identifier = models.CharField(max_length=100)
-
-    @property
-    def books(self):
-        """ count of books associated with this tag """
-        edition_model = apps.get_model("bookwyrm.Edition", require_ready=True)
-        return (
-            edition_model.objects.filter(usertag__tag__identifier=self.identifier)
-            .order_by("-created_date")
-            .distinct()
-        )
-
-    collection_queryset = books
-
-    def get_remote_id(self):
-        """ tag should use identifier not id in remote_id """
-        base_path = "https://%s" % DOMAIN
-        return "%s/tag/%s" % (base_path, self.identifier)
-
-    def save(self, *args, **kwargs):
-        """ create a url-safe lookup key for the tag """
-        if not self.id:
-            # add identifiers to new tags
-            self.identifier = urllib.parse.quote_plus(self.name)
-        super().save(*args, **kwargs)
-
-
-class UserTag(CollectionItemMixin, BookWyrmModel):
-    """ an instance of a tag on a book by a user """
-
-    user = fields.ForeignKey(
-        "User", on_delete=models.PROTECT, activitypub_field="actor"
-    )
-    book = fields.ForeignKey(
-        "Edition", on_delete=models.PROTECT, activitypub_field="object"
-    )
-    tag = fields.ForeignKey("Tag", on_delete=models.PROTECT, activitypub_field="target")
-
-    activity_serializer = activitypub.Add
-    object_field = "book"
-    collection_field = "tag"
-
-    class Meta:
-        """ unqiueness constraint """
-
-        unique_together = ("user", "book", "tag")
diff --git a/bookwyrm/tests/views/test_tag.py b/bookwyrm/tests/views/test_tag.py
deleted file mode 100644
index 6ad6ab25..00000000
--- a/bookwyrm/tests/views/test_tag.py
+++ /dev/null
@@ -1,119 +0,0 @@
-""" test for app action functionality """
-from unittest.mock import patch
-from django.contrib.auth.models import Group, Permission
-from django.contrib.contenttypes.models import ContentType
-from django.template.response import TemplateResponse
-from django.test import TestCase
-from django.test.client import RequestFactory
-
-from bookwyrm import models, views
-from bookwyrm.activitypub import ActivitypubResponse
-
-
-class TagViews(TestCase):
-    """ tag views"""
-
-    def setUp(self):
-        """ we need basic test data and mocks """
-        self.factory = RequestFactory()
-        self.local_user = models.User.objects.create_user(
-            "mouse@local.com",
-            "mouse@mouse.com",
-            "mouseword",
-            local=True,
-            localname="mouse",
-            remote_id="https://example.com/users/mouse",
-        )
-        self.group = Group.objects.create(name="editor")
-        self.group.permissions.add(
-            Permission.objects.create(
-                name="edit_book",
-                codename="edit_book",
-                content_type=ContentType.objects.get_for_model(models.User),
-            ).id
-        )
-        self.work = models.Work.objects.create(title="Test Work")
-        self.book = models.Edition.objects.create(
-            title="Example Edition",
-            remote_id="https://example.com/book/1",
-            parent_work=self.work,
-        )
-        models.SiteSettings.objects.create()
-
-    def test_tag_page(self):
-        """ there are so many views, this just makes sure it LOADS """
-        view = views.Tag.as_view()
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            tag = models.Tag.objects.create(name="hi there")
-            models.UserTag.objects.create(tag=tag, user=self.local_user, book=self.book)
-        request = self.factory.get("")
-        with patch("bookwyrm.views.tag.is_api_request") as is_api:
-            is_api.return_value = False
-            result = view(request, tag.identifier)
-        self.assertIsInstance(result, TemplateResponse)
-        result.render()
-        self.assertEqual(result.status_code, 200)
-
-        request = self.factory.get("")
-        with patch("bookwyrm.views.tag.is_api_request") as is_api:
-            is_api.return_value = True
-            result = view(request, tag.identifier)
-        self.assertIsInstance(result, ActivitypubResponse)
-        self.assertEqual(result.status_code, 200)
-
-    def test_tag_page_activitypub_page(self):
-        """ there are so many views, this just makes sure it LOADS """
-        view = views.Tag.as_view()
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            tag = models.Tag.objects.create(name="hi there")
-            models.UserTag.objects.create(tag=tag, user=self.local_user, book=self.book)
-        request = self.factory.get("", {"page": 1})
-        with patch("bookwyrm.views.tag.is_api_request") as is_api:
-            is_api.return_value = True
-            result = view(request, tag.identifier)
-        self.assertIsInstance(result, ActivitypubResponse)
-        self.assertEqual(result.status_code, 200)
-
-    def test_tag(self):
-        """ add a tag to a book """
-        view = views.AddTag.as_view()
-        request = self.factory.post(
-            "",
-            {
-                "name": "A Tag!?",
-                "book": self.book.id,
-            },
-        )
-        request.user = self.local_user
-
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            view(request)
-
-        tag = models.Tag.objects.get()
-        user_tag = models.UserTag.objects.get()
-        self.assertEqual(tag.name, "A Tag!?")
-        self.assertEqual(tag.identifier, "A+Tag%21%3F")
-        self.assertEqual(user_tag.user, self.local_user)
-        self.assertEqual(user_tag.book, self.book)
-
-    def test_untag(self):
-        """ remove a tag from a book """
-        view = views.RemoveTag.as_view()
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            tag = models.Tag.objects.create(name="A Tag!?")
-            models.UserTag.objects.create(user=self.local_user, book=self.book, tag=tag)
-        request = self.factory.post(
-            "",
-            {
-                "user": self.local_user.id,
-                "book": self.book.id,
-                "name": tag.name,
-            },
-        )
-        request.user = self.local_user
-
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            view(request)
-
-        self.assertTrue(models.Tag.objects.filter(name="A Tag!?").exists())
-        self.assertFalse(models.UserTag.objects.exists())
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 46398806..0e48ef90 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -245,11 +245,6 @@ urlpatterns = [
     # author
     re_path(r"^author/(?P<author_id>\d+)(.json)?/?$", views.Author.as_view()),
     re_path(r"^author/(?P<author_id>\d+)/edit/?$", views.EditAuthor.as_view()),
-    # tags
-    re_path(r"^tag/(?P<tag_id>.+)\.json/?$", views.Tag.as_view()),
-    re_path(r"^tag/(?P<tag_id>.+)/?$", views.Tag.as_view()),
-    re_path(r"^tag/?$", views.AddTag.as_view()),
-    re_path(r"^untag/?$", views.RemoveTag.as_view()),
     # reading progress
     re_path(r"^edit-readthrough/?$", views.edit_readthrough, name="edit-readthrough"),
     re_path(r"^delete-readthrough/?$", views.delete_readthrough),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index d053e971..d73a79ed 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -32,7 +32,6 @@ from .shelf import create_shelf, delete_shelf
 from .shelf import shelve, unshelve
 from .site import Site
 from .status import CreateStatus, DeleteStatus, DeleteAndRedraft
-from .tag import Tag, AddTag, RemoveTag
 from .updates import get_notification_count, get_unread_status_count
 from .user import User, EditUser, Followers, Following
 from .user_admin import UserAdmin
diff --git a/bookwyrm/views/tag.py b/bookwyrm/views/tag.py
deleted file mode 100644
index a6bdf05a..00000000
--- a/bookwyrm/views/tag.py
+++ /dev/null
@@ -1,73 +0,0 @@
-""" tagging views"""
-from django.contrib.auth.decorators import login_required
-from django.shortcuts import get_object_or_404, redirect
-from django.template.response import TemplateResponse
-from django.utils.decorators import method_decorator
-from django.views import View
-
-from bookwyrm import models
-from bookwyrm.activitypub import ActivitypubResponse
-from .helpers import is_api_request
-
-
-# pylint: disable= no-self-use
-class Tag(View):
-    """ tag page """
-
-    def get(self, request, tag_id):
-        """ see books related to a tag """
-        tag_obj = get_object_or_404(models.Tag, identifier=tag_id)
-
-        if is_api_request(request):
-            return ActivitypubResponse(tag_obj.to_activity(**request.GET))
-
-        books = models.Edition.objects.filter(
-            usertag__tag__identifier=tag_id
-        ).distinct()
-        data = {
-            "books": books,
-            "tag": tag_obj,
-        }
-        return TemplateResponse(request, "tag.html", data)
-
-
-@method_decorator(login_required, name="dispatch")
-class AddTag(View):
-    """ add a tag to a book """
-
-    def post(self, request):
-        """ tag a book """
-        # I'm not using a form here because sometimes "name" is sent as a hidden
-        # field which doesn't validate
-        name = request.POST.get("name")
-        book_id = request.POST.get("book")
-        book = get_object_or_404(models.Edition, id=book_id)
-        tag_obj, _ = models.Tag.objects.get_or_create(
-            name=name,
-        )
-        models.UserTag.objects.get_or_create(
-            user=request.user,
-            book=book,
-            tag=tag_obj,
-        )
-
-        return redirect("/book/%s" % book_id)
-
-
-@method_decorator(login_required, name="dispatch")
-class RemoveTag(View):
-    """ remove a user's tag from a book """
-
-    def post(self, request):
-        """ untag a book """
-        name = request.POST.get("name")
-        tag_obj = get_object_or_404(models.Tag, name=name)
-        book_id = request.POST.get("book")
-        book = get_object_or_404(models.Edition, id=book_id)
-
-        user_tag = get_object_or_404(
-            models.UserTag, tag=tag_obj, book=book, user=request.user
-        )
-        user_tag.delete()
-
-        return redirect("/book/%s" % book_id)

From 27664e323ad911aea89328a9dd60a3c41f6e88a9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 8 Apr 2021 16:08:35 -0700
Subject: [PATCH 0749/1285] Fixes edit book form throwing error on empty dates

---
 bookwyrm/templates/book/edit_book.html | 2 +-
 bookwyrm/views/books.py                | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html
index 1da7c3f7..af5d4d69 100644
--- a/bookwyrm/templates/book/edit_book.html
+++ b/bookwyrm/templates/book/edit_book.html
@@ -98,7 +98,7 @@
 
                 <p class="mb-2">
                     <label class="label" for="id_subtitle">{% trans "Subtitle:" %}</label>
-                    <input type="text" name="subtitle" value="{{ form.subtitle.value|default:'' }}" maxlength="255" class="input" required="" id="id_subtitle">
+                    <input type="text" name="subtitle" value="{{ form.subtitle.value|default:'' }}" maxlength="255" class="input" id="id_subtitle">
                 </p>
                 {% for error in form.subtitle.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index b1b2d065..731fc24c 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -1,5 +1,4 @@
 """ the good stuff! the books! """
-from datetime import datetime
 from uuid import uuid4
 
 from dateutil.parser import parse as dateparse
@@ -175,18 +174,18 @@ class EditBook(View):
             data["confirm_mode"] = True
             # this isn't preserved because it isn't part of the form obj
             data["remove_authors"] = request.POST.getlist("remove_authors")
-            # we have to make sure the dates are passed in as datetime, they're currently a string
+            # make sure the dates are passed in as datetime, they're currently a string
             # QueryDicts are immutable, we need to copy
             formcopy = data["form"].data.copy()
             try:
                 formcopy["first_published_date"] = dateparse(
                     formcopy["first_published_date"]
                 )
-            except MultiValueDictKeyError:
+            except (MultiValueDictKeyError, ValueError):
                 pass
             try:
                 formcopy["published_date"] = dateparse(formcopy["published_date"])
-            except MultiValueDictKeyError:
+            except (MultiValueDictKeyError, ValueError):
                 pass
             data["form"].data = formcopy
             return TemplateResponse(request, "book/edit_book.html", data)

From 5cbf7bbc7151b5051d6e7faf4fc165a6b8a21d0a Mon Sep 17 00:00:00 2001
From: D Anzorge <d.anzorge@gmail.com>
Date: Fri, 9 Apr 2021 04:53:18 +0200
Subject: [PATCH 0750/1285] Ensure EMAIL_USE_TLS is read as a bool

---
 bookwyrm/settings.py   | 2 +-
 celerywyrm/settings.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 845f81c4..52dbc2b2 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -24,7 +24,7 @@ EMAIL_HOST = env("EMAIL_HOST")
 EMAIL_PORT = env("EMAIL_PORT", 587)
 EMAIL_HOST_USER = env("EMAIL_HOST_USER")
 EMAIL_HOST_PASSWORD = env("EMAIL_HOST_PASSWORD")
-EMAIL_USE_TLS = env("EMAIL_USE_TLS", True)
+EMAIL_USE_TLS = env.bool("EMAIL_USE_TLS", True)
 DEFAULT_FROM_EMAIL = "admin@{:s}".format(env("DOMAIN"))
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
diff --git a/celerywyrm/settings.py b/celerywyrm/settings.py
index 7591163b..7947cb1c 100644
--- a/celerywyrm/settings.py
+++ b/celerywyrm/settings.py
@@ -20,7 +20,7 @@ EMAIL_HOST = env("EMAIL_HOST")
 EMAIL_PORT = env("EMAIL_PORT")
 EMAIL_HOST_USER = env("EMAIL_HOST_USER")
 EMAIL_HOST_PASSWORD = env("EMAIL_HOST_PASSWORD")
-EMAIL_USE_TLS = env("EMAIL_USE_TLS")
+EMAIL_USE_TLS = env.bool("EMAIL_USE_TLS")
 
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)

From af6cab2e3fe9012c4d1dd2cc293e090e772b4dbb Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 8 Apr 2021 20:03:29 -0700
Subject: [PATCH 0751/1285] Don't reutnr an error when discarding activity
 objects

---
 bookwyrm/activitypub/base_activity.py             | 2 +-
 bookwyrm/tests/views/inbox/test_inbox_announce.py | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index 452f61e0..3d922b47 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -111,7 +111,7 @@ class ActivityObject:
             and hasattr(model, "ignore_activity")
             and model.ignore_activity(self)
         ):
-            raise ActivitySerializerError()
+            return None
 
         # check for an existing instance
         instance = instance or model.find_existing(self.serialize())
diff --git a/bookwyrm/tests/views/inbox/test_inbox_announce.py b/bookwyrm/tests/views/inbox/test_inbox_announce.py
index a730045a..95b70b5c 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_announce.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_announce.py
@@ -136,6 +136,9 @@ class InboxActivities(TestCase):
             "id": "http://www.faraway.com/boost/12",
             "actor": self.remote_user.remote_id,
             "object": status.remote_id,
+            "to": ["https://www.w3.org/ns/activitystreams#public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "published": "Mon, 25 May 2020 19:31:20 GMT",
         }
         responses.add(
             responses.GET, status.remote_id, json=status.to_activity(), status=200

From c149003d89072f65adf3041373dc3a69704f197e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 8 Apr 2021 20:34:22 -0700
Subject: [PATCH 0752/1285] Fixes fields on unknown boost test

---
 bookwyrm/tests/views/inbox/test_inbox_announce.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bookwyrm/tests/views/inbox/test_inbox_announce.py b/bookwyrm/tests/views/inbox/test_inbox_announce.py
index 95b70b5c..954d4e64 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_announce.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_announce.py
@@ -188,6 +188,7 @@ class InboxActivities(TestCase):
                 "id": "http://fake.com/unknown/boost",
                 "actor": self.remote_user.remote_id,
                 "object": self.status.remote_id,
+                "published": "Mon, 25 May 2020 19:31:20 GMT",
             },
         }
         views.inbox.activity_task(activity)

From 14b0b978a32582a1080371d4f56602b222c6a49c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 8 Apr 2021 20:58:15 -0700
Subject: [PATCH 0753/1285] Updates shelf models tests

---
 bookwyrm/tests/models/test_shelf_model.py | 125 ++++++++--------------
 1 file changed, 46 insertions(+), 79 deletions(-)

diff --git a/bookwyrm/tests/models/test_shelf_model.py b/bookwyrm/tests/models/test_shelf_model.py
index ebda0499..45ae1fa1 100644
--- a/bookwyrm/tests/models/test_shelf_model.py
+++ b/bookwyrm/tests/models/test_shelf_model.py
@@ -1,4 +1,6 @@
 """ testing models """
+import json
+from unittest.mock import patch
 from django.test import TestCase
 
 from bookwyrm import models, settings
@@ -18,30 +20,19 @@ class Shelf(TestCase):
 
     def test_remote_id(self):
         """ shelves use custom remote ids """
-        real_broadcast = models.Shelf.broadcast
-
-        def broadcast_mock(_, activity, user, **kwargs):
-            """ nah """
-
-        models.Shelf.broadcast = broadcast_mock
-        shelf = models.Shelf.objects.create(
-            name="Test Shelf", identifier="test-shelf", user=self.local_user
-        )
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            shelf = models.Shelf.objects.create(
+                name="Test Shelf", identifier="test-shelf", user=self.local_user
+            )
         expected_id = "https://%s/user/mouse/books/test-shelf" % settings.DOMAIN
         self.assertEqual(shelf.get_remote_id(), expected_id)
-        models.Shelf.broadcast = real_broadcast
 
     def test_to_activity(self):
         """ jsonify it """
-        real_broadcast = models.Shelf.broadcast
-
-        def empty_mock(_, activity, user, **kwargs):
-            """ nah """
-
-        models.Shelf.broadcast = empty_mock
-        shelf = models.Shelf.objects.create(
-            name="Test Shelf", identifier="test-shelf", user=self.local_user
-        )
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            shelf = models.Shelf.objects.create(
+                name="Test Shelf", identifier="test-shelf", user=self.local_user
+            )
         activity_json = shelf.to_activity()
         self.assertIsInstance(activity_json, dict)
         self.assertEqual(activity_json["id"], shelf.remote_id)
@@ -49,77 +40,53 @@ class Shelf(TestCase):
         self.assertEqual(activity_json["type"], "Shelf")
         self.assertEqual(activity_json["name"], "Test Shelf")
         self.assertEqual(activity_json["owner"], self.local_user.remote_id)
-        models.Shelf.broadcast = real_broadcast
 
     def test_create_update_shelf(self):
         """ create and broadcast shelf creation """
-        real_broadcast = models.Shelf.broadcast
 
-        def create_mock(_, activity, user, **kwargs):
-            """ ok """
-            self.assertEqual(user.remote_id, self.local_user.remote_id)
-            self.assertEqual(activity["type"], "Create")
-            self.assertEqual(activity["actor"], self.local_user.remote_id)
-            self.assertEqual(activity["object"]["name"], "Test Shelf")
-
-        models.Shelf.broadcast = create_mock
-
-        shelf = models.Shelf.objects.create(
-            name="Test Shelf", identifier="test-shelf", user=self.local_user
-        )
-
-        def update_mock(_, activity, user, **kwargs):
-            """ ok """
-            self.assertEqual(user.remote_id, self.local_user.remote_id)
-            self.assertEqual(activity["type"], "Update")
-            self.assertEqual(activity["actor"], self.local_user.remote_id)
-            self.assertEqual(activity["object"]["name"], "arthur russel")
-
-        models.Shelf.broadcast = update_mock
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
+            shelf = models.Shelf.objects.create(
+                name="Test Shelf", identifier="test-shelf", user=self.local_user
+            )
+        activity = json.loads(mock.call_args[0][1])
+        self.assertEqual(activity["type"], "Create")
+        self.assertEqual(activity["actor"], self.local_user.remote_id)
+        self.assertEqual(activity["object"]["name"], "Test Shelf")
 
         shelf.name = "arthur russel"
-        shelf.save()
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
+            shelf.save()
+        activity = json.loads(mock.call_args[0][1])
+        self.assertEqual(activity["type"], "Update")
+        self.assertEqual(activity["actor"], self.local_user.remote_id)
+        self.assertEqual(activity["object"]["name"], "arthur russel")
         self.assertEqual(shelf.name, "arthur russel")
-        models.Shelf.broadcast = real_broadcast
 
     def test_shelve(self):
         """ create and broadcast shelf creation """
-        real_broadcast = models.Shelf.broadcast
-        real_shelfbook_broadcast = models.ShelfBook.broadcast
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            shelf = models.Shelf.objects.create(
+                name="Test Shelf", identifier="test-shelf", user=self.local_user
+            )
 
-        def add_mock(_, activity, user, **kwargs):
-            """ ok """
-            self.assertEqual(user.remote_id, self.local_user.remote_id)
-            self.assertEqual(activity["type"], "Add")
-            self.assertEqual(activity["actor"], self.local_user.remote_id)
-            self.assertEqual(activity["object"]["id"], self.book.remote_id)
-            self.assertEqual(activity["target"], shelf.remote_id)
-
-        def remove_mock(_, activity, user, **kwargs):
-            """ ok """
-            self.assertEqual(user.remote_id, self.local_user.remote_id)
-            self.assertEqual(activity["type"], "Remove")
-            self.assertEqual(activity["actor"], self.local_user.remote_id)
-            self.assertEqual(activity["object"]["id"], self.book.remote_id)
-            self.assertEqual(activity["target"], shelf.remote_id)
-
-        def empty_mock(_, activity, user, **kwargs):
-            """ nah """
-
-        models.Shelf.broadcast = empty_mock
-        shelf = models.Shelf.objects.create(
-            name="Test Shelf", identifier="test-shelf", user=self.local_user
-        )
-
-        models.ShelfBook.broadcast = add_mock
-        shelf_book = models.ShelfBook.objects.create(
-            shelf=shelf, user=self.local_user, book=self.book
-        )
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
+            shelf_book = models.ShelfBook.objects.create(
+                shelf=shelf, user=self.local_user, book=self.book
+            )
+        self.assertEqual(mock.call_count, 1)
+        activity = json.loads(mock.call_args[0][1])
+        self.assertEqual(activity["type"], "Add")
+        self.assertEqual(activity["actor"], self.local_user.remote_id)
+        self.assertEqual(activity["object"]["id"], shelf_book.remote_id)
+        self.assertEqual(activity["target"], shelf.remote_id)
         self.assertEqual(shelf.books.first(), self.book)
 
-        models.ShelfBook.broadcast = remove_mock
-        shelf_book.delete()
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
+            shelf_book.delete()
+        self.assertEqual(mock.call_count, 1)
+        activity = json.loads(mock.call_args[0][1])
+        self.assertEqual(activity["type"], "Remove")
+        self.assertEqual(activity["actor"], self.local_user.remote_id)
+        self.assertEqual(activity["object"]["id"], shelf_book.remote_id)
+        self.assertEqual(activity["target"], shelf.remote_id)
         self.assertFalse(shelf.books.exists())
-
-        models.ShelfBook.broadcast = real_shelfbook_broadcast
-        models.Shelf.broadcast = real_broadcast

From a52729daaef316f0d675f0323df0e685261fbf4b Mon Sep 17 00:00:00 2001
From: tofuwabohu <mail@lapete.de>
Date: Fri, 9 Apr 2021 13:28:58 +0200
Subject: [PATCH 0754/1285] adds SSL params

---
 bookwyrm/settings.py   | 1 +
 celerywyrm/settings.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 52dbc2b2..146d4fff 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -25,6 +25,7 @@ EMAIL_PORT = env("EMAIL_PORT", 587)
 EMAIL_HOST_USER = env("EMAIL_HOST_USER")
 EMAIL_HOST_PASSWORD = env("EMAIL_HOST_PASSWORD")
 EMAIL_USE_TLS = env.bool("EMAIL_USE_TLS", True)
+EMAIL_USE_SSL = env.bool("EMAIL_USE_SSL", False)
 DEFAULT_FROM_EMAIL = "admin@{:s}".format(env("DOMAIN"))
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
diff --git a/celerywyrm/settings.py b/celerywyrm/settings.py
index 7947cb1c..a9f46f08 100644
--- a/celerywyrm/settings.py
+++ b/celerywyrm/settings.py
@@ -21,6 +21,7 @@ EMAIL_PORT = env("EMAIL_PORT")
 EMAIL_HOST_USER = env("EMAIL_HOST_USER")
 EMAIL_HOST_PASSWORD = env("EMAIL_HOST_PASSWORD")
 EMAIL_USE_TLS = env.bool("EMAIL_USE_TLS")
+EMAIL_USE_SSL = env.bool("EMAIL_USE_SSL")
 
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)

From 8bd73df26be3e1e2e8524bffef8b6ddc85e01d4c Mon Sep 17 00:00:00 2001
From: tofuwabohu <mail@lapete.de>
Date: Fri, 9 Apr 2021 13:37:35 +0200
Subject: [PATCH 0755/1285] Sets SSL to false per default for tests

---
 .env.example | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.env.example b/.env.example
index cf3705af..2397a5b1 100644
--- a/.env.example
+++ b/.env.example
@@ -36,3 +36,4 @@ EMAIL_PORT=587
 EMAIL_HOST_USER=mail@your.domain.here
 EMAIL_HOST_PASSWORD=emailpassword123
 EMAIL_USE_TLS=true
+EMAIL_USE_SSL=false

From 890346f51b8ffa32f486d306340713b6ed9aa20c Mon Sep 17 00:00:00 2001
From: tofuwabohu <mail@lapete.de>
Date: Fri, 9 Apr 2021 18:56:21 +0200
Subject: [PATCH 0756/1285] Adds default value in celerywyrm

---
 celerywyrm/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/celerywyrm/settings.py b/celerywyrm/settings.py
index a9f46f08..952fe5b1 100644
--- a/celerywyrm/settings.py
+++ b/celerywyrm/settings.py
@@ -21,7 +21,7 @@ EMAIL_PORT = env("EMAIL_PORT")
 EMAIL_HOST_USER = env("EMAIL_HOST_USER")
 EMAIL_HOST_PASSWORD = env("EMAIL_HOST_PASSWORD")
 EMAIL_USE_TLS = env.bool("EMAIL_USE_TLS")
-EMAIL_USE_SSL = env.bool("EMAIL_USE_SSL")
+EMAIL_USE_SSL = env.bool("EMAIL_USE_SSL", False)
 
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)

From dc425f379e5addd122bc990a86362acc31d628af Mon Sep 17 00:00:00 2001
From: n2no1 <7995366-n2no1@users.noreply.gitlab.com>
Date: Fri, 9 Apr 2021 17:44:44 -0400
Subject: [PATCH 0757/1285] remove duplicated install instructions in README.md

---
 README.md | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/README.md b/README.md
index e798fedf..dc3af920 100644
--- a/README.md
+++ b/README.md
@@ -156,24 +156,6 @@ The `production` branch of BookWyrm contains a number of tools not on the `main`
 
 Instructions for running BookWyrm in production:
 
-- Get the application code:
-    `git clone git@github.com:mouse-reeve/bookwyrm.git`
-- Switch to the `production` branch
-    `git checkout production`
-- Create your environment variables file
-    `cp .env.example .env`
-    - Add your domain, email address, SMTP credentials
-    - Set a secure redis password and secret key
-    - Set a secure database password for postgres
-- Update your nginx configuration in `nginx/default.conf`
-    - Replace `your-domain.com` with your domain name
-- Run the application (this should also set up a Certbot ssl cert for your domain) with
-    `docker-compose up --build`, and make sure all the images build successfully
-- When docker has built successfully, stop the process with `CTRL-C`
-- Comment out the `command: certonly...` line in `docker-compose.yml`
-- Run docker-compose in the background with: `docker-compose up -d`
-- Initialize the database with: `./bw-dev initdb`
-- Set up schedule backups with cron that runs that `docker-compose exec db pg_dump -U <databasename>` and saves the backup to a safe location
 - Get the application code:
     `git clone git@github.com:mouse-reeve/bookwyrm.git`
 - Switch to the `production` branch

From 4c4801e2dad9c03734469a59e7be48518a211581 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Fri, 9 Apr 2021 23:57:49 +0200
Subject: [PATCH 0758/1285] Add structured data to Book (#84).

---
 bookwyrm/templates/book/book.html             | 145 +++++----
 bookwyrm/templates/book/publisher_info.html   |  81 +++--
 bookwyrm/templates/snippets/authors.html      |  19 +-
 bookwyrm/templates/snippets/book_cover.html   |  34 ++-
 .../snippets/status/status_content.html       | 165 +++++++---
 .../snippets/status/status_header.html        |  18 +-
 bookwyrm/templates/snippets/trimmed_text.html |  75 +++--
 locale/fr_FR/LC_MESSAGES/django.po            | 289 ++++++------------
 8 files changed, 460 insertions(+), 366 deletions(-)

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index b91cebba..4d978d7e 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -6,24 +6,36 @@
 {% block title %}{{ book.title }}{% endblock %}
 
 {% block content %}
-<div class="block">
+{% with user_authenticated=request.user.is_authenticated can_edit_book=perms.bookwyrm.edit_book %}
+<div class="block" itemscope itemtype="https://schema.org/Book">
     <div class="columns is-mobile">
         <div class="column">
             <h1 class="title">
-                {{ book.title }}{% if book.subtitle %}:
-                <small>{{ book.subtitle }}</small>{% endif %}
+                <span itemprop="name">
+                    {{ book.title }}{% if book.subtitle %}:
+                        <small>{{ book.subtitle }}</small>
+                    {% endif %}
+                </span>
+
                 {% if book.series %}
-                <small class="has-text-grey-dark">({{ book.series }}{% if book.series_number %} #{{ book.series_number }}{% endif %})</small><br>
+                    <meta itemprop="isPartOf" content="{{ book.series }}">
+                    <meta itemprop="volumeNumber" content="{{ book.series_number }}">
+
+                    <small class="has-text-grey-dark">
+                        ({{ book.series }}
+                        {% if book.series_number %} #{{ book.series_number }}{% endif %})
+                    </small>
+                    <br>
                 {% endif %}
             </h1>
             {% if book.authors %}
             <h2 class="subtitle">
-                {% trans "by" %} {% include 'snippets/authors.html' with book=book %}
+            {% trans "by" %} {% include 'snippets/authors.html' with book=book %}
             </h2>
             {% endif %}
         </div>
 
-        {% if request.user.is_authenticated and perms.bookwyrm.edit_book %}
+        {% if user_authenticated and can_edit_book %}
         <div class="column is-narrow">
             <a href="{{ book.id }}/edit">
                 <span class="icon icon-pencil" title="{% trans "Edit Book" %}">
@@ -44,7 +56,7 @@
                 {% include 'snippets/shelve_button/shelve_button.html' %}
             </div>
 
-            {% if request.user.is_authenticated and not book.cover %}
+            {% if user_authenticated and not book.cover %}
             <div class="block">
                 {% trans "Add cover" as button_text %}
                 {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="add-cover" controls_uid=book.id focus="modal-title-add-cover" class="is-small" %}
@@ -60,7 +72,7 @@
                     {% if book.isbn_13 %}
                     <div class="is-flex is-justify-content-space-between is-align-items-center">
                         <dt>{% trans "ISBN:" %}</dt>
-                        <dd>{{ book.isbn_13 }}</dd>
+                        <dd itemprop="isbn">{{ book.isbn_13 }}</dd>
                     </div>
                     {% endif %}
 
@@ -89,14 +101,31 @@
 
         <div class="column is-three-fifths">
             <div class="block">
-                <h3 class="field is-grouped">
+                <h3
+                    class="field is-grouped"
+                    itemprop="aggregateRating"
+                    itemscope
+                    itemtype="https://schema.org/AggregateRating"
+                >
+                    <meta itemprop="ratingValue" content="{{ rating|floatformat }}">
+                    {# @todo Is it possible to not hard-code the value? #}
+                    <meta itemprop="bestRating" content="5">
+                    <meta itemprop="reviewCount" content="{{ review_count }}">
+
                     {% include 'snippets/stars.html' with rating=rating %}
-                    {% blocktrans count counter=review_count %}({{ review_count }} review){% plural %}({{ review_count }} reviews){% endblocktrans %}
+
+                    {% blocktrans count counter=review_count trimmed %}
+                        ({{ review_count }} review)
+                    {% plural %}
+                        ({{ review_count }} reviews)
+                    {% endblocktrans %}
                 </h3>
 
-                {% include 'snippets/trimmed_text.html' with full=book|book_description %}
+                {% with full=book|book_description itemprop='abstract' %}
+                    {% include 'snippets/trimmed_text.html' %}
+                {% endwith %}
 
-                {% if request.user.is_authenticated and perms.bookwyrm.edit_book and not book|book_description %}
+                {% if user_authenticated and can_edit_book and not book|book_description %}
                 {% trans 'Add Description' as button_text %}
                 {% include 'snippets/toggle/open_button.html' with text=button_text controls_text="add-description" controls_uid=book.id focus="id_description" hide_active=True id="hide-description" %}
 
@@ -138,7 +167,7 @@
                 {% endfor %}
             </div>
 
-            {% if request.user.is_authenticated %}
+            {% if user_authenticated %}
             <section class="block">
                 <header class="columns">
                     <h2 class="column title is-5 mb-1">{% trans "Your reading activity" %}</h2>
@@ -176,14 +205,15 @@
         </div>
         <div class="column is-one-fifth">
             {% if book.subjects %}
-            <section class="content block">
-                <h2 class="title is-5">{% trans "Subjects" %}</h2>
-                <ul>
-                {% for subject in book.subjects %}
-                    <li>{{ subject }}</li>
-                {% endfor %}
-                </ul>
-            </section>
+                <section class="content block">
+                    <h2 class="title is-5">{% trans "Subjects" %}</h2>
+
+                    <ul>
+                        {% for subject in book.subjects %}
+                            <li itemprop="about">{{ subject }}</li>
+                        {% endfor %}
+                    </ul>
+                </section>
             {% endif %}
 
             {% if book.subject_places %}
@@ -229,41 +259,54 @@
             {% endif %}
         </div>
     </div>
-</div>
 
-<div class="block" id="reviews">
-    {% for review in reviews %}
-    <div class="block">
-        {% include 'snippets/status/status.html' with status=review hide_book=True depth=1 %}
-    </div>
-    {% endfor %}
-
-    <div class="block is-flex is-flex-wrap-wrap">
-        {% for rating in ratings %}
-        <div class="block mr-5">
-            <div class="media">
-                <div class="media-left">{% include 'snippets/avatar.html' with user=rating.user %}</div>
-                <div class="media-content">
-                    <div>
-                        <a href="{{ rating.user.local_path }}">{{ rating.user.display_name }}</a>
-                    </div>
-                    <div class="is-flex">
-                        <p class="mr-1">{% trans "rated it" %}</p>
-                        {% include 'snippets/stars.html' with rating=rating.rating %}
-                    </div>
-                    <div>
-                        <a href="{{ rating.remote_id }}">{{ rating.published_date | naturaltime }}</a>
-                    </div>
-                </div>
+    <div class="block" id="reviews">
+        {% for review in reviews %}
+            <div
+                class="block"
+                itemprop="review"
+                itemscope
+                itemtype="https://schema.org/Review"
+            >
+                {% with status=review hide_book=True depth=1 %}
+                    {% include 'snippets/status/status.html' %}
+                {% endwith %}
             </div>
-        </div>
         {% endfor %}
-    </div>
-    <div class="block">
-        {% include 'snippets/pagination.html' with page=reviews path=book.local_path anchor="#reviews" %}
+
+        <div class="block is-flex is-flex-wrap-wrap">
+            {% for rating in ratings %}
+                {% with user=rating.user %}
+                    <div class="block mr-5">
+                        <div class="media">
+                            <div class="media-left">
+                                {% include 'snippets/avatar.html' %}
+                            </div>
+
+                            <div class="media-content">
+                                <div>
+                                    <a href="{{ user.local_path }}">{{ user.display_name }}</a>
+                                </div>
+                                <div class="is-flex">
+                                    <p class="mr-1">{% trans "rated it" %}</p>
+
+                                    {% include 'snippets/stars.html' with rating=rating.rating %}
+                                </div>
+                                <div>
+                                    <a href="{{ rating.remote_id }}">{{ rating.published_date | naturaltime }}</a>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                {% endwith %}
+            {% endfor %}
+        </div>
+        <div class="block">
+            {% include 'snippets/pagination.html' with page=reviews path=book.local_path anchor="#reviews" %}
+        </div>
     </div>
 </div>
-
+{% endwith %}
 {% endblock %}
 
 {% block scripts %}
diff --git a/bookwyrm/templates/book/publisher_info.html b/bookwyrm/templates/book/publisher_info.html
index 0ab35401..8a8f050e 100644
--- a/bookwyrm/templates/book/publisher_info.html
+++ b/bookwyrm/templates/book/publisher_info.html
@@ -1,24 +1,71 @@
+{% spaceless %}
+
 {% load i18n %}
+
 <p>
-    {% if book.physical_format and not book.pages %}
-    {{ book.physical_format | title }}
-    {% elif book.physical_format and book.pages %}
-    {% blocktrans with format=book.physical_format|title pages=book.pages %}{{ format }}, {{ pages }} pages{% endblocktrans %}
-    {% elif book.pages %}
-    {% blocktrans with pages=book.pages %}{{ pages }} pages{% endblocktrans %}
-    {% endif %}
+    {% with format=book.physical_format pages=book.pages %}
+        {% if format %}
+            {% comment %}
+                @todo The bookFormat property is limited to a list of values
+                      whereas the book edition is free text.
+                @see https://schema.org/bookFormat
+            {% endcomment %}
+            <meta itemprop="bookFormat" content="{{ format }}">
+        {% endif %}
+
+        {% if pages %}
+            <meta itemprop="numberOfPages" content="{{ pages }}">
+        {% endif %}
+
+        {% if format and not pages %}
+            {% blocktrans %}{{ format }}{% endblocktrans %}
+        {% elif format and pages %}
+            {% blocktrans %}{{ format }}, {{ pages }} pages{% endblocktrans %}
+        {% elif pages %}
+            {% blocktrans %}{{ pages }} pages{% endblocktrans %}
+        {% endif %}
+    {% endwith %}
 </p>
+
 {% if book.languages %}
-<p>
-    {% blocktrans with languages=book.languages|join:", " %}{{ languages }} language{% endblocktrans %}
-</p>
+    {% for language in book.languages %}
+        <meta itemprop="inLanguage" content="{{ language }}">
+    {% endfor %}
+
+    <p>
+        {% with languages=book.languages|join:", " %}
+            {% blocktrans %}{{ languages }} language{% endblocktrans %}
+        {% endwith %}
+    </p>
 {% endif %}
+
 <p>
-    {% if book.published_date and book.publishers %}
-    {% blocktrans with date=book.published_date|date:'M jS Y' publisher=book.publishers|join:', ' %}Published {{ date }} by {{ publisher }}.{% endblocktrans %}
-    {% elif book.published_date %}
-    {% blocktrans with date=book.published_date|date:'M jS Y' %}Published {{ date }}{% endblocktrans %}
-    {% elif book.publishers %}
-    {% blocktrans with publisher=book.publishers|join:', ' %}Published by {{ publisher }}.{% endblocktrans %}
-    {% endif %}
+    {% with date=book.published_date|date:'M jS Y' publisher=book.publishers|join:', ' %}
+        {% if date or book.first_published_date %}
+            <meta
+                itemprop="datePublished"
+                content="{{ book.first_published_date|default:book.published_date|date:'Y-m-d' }}"
+            >
+        {% endif %}
+
+        {% comment %}
+            @todo The publisher property needs to be an Organization or a Person.
+                  We’ll be using Thing which is the more generic ancestor.
+            @see https://schema.org/Publisher
+        {% endcomment %}
+        {% if book.publishers %}
+            {% for publisher in book.publishers %}
+                <meta itemprop="publisher" content="{{ publisher }}">
+            {% endfor %}
+        {% endif %}
+
+        {% if date and publisher %}
+            {% blocktrans %}Published {{ date }} by {{ publisher }}.{% endblocktrans %}
+        {% elif date %}
+            {% blocktrans %}Published {{ date }}{% endblocktrans %}
+        {% elif publisher %}
+            {% blocktrans %}Published by {{ publisher }}.{% endblocktrans %}
+        {% endif %}
+    {% endwith %}
 </p>
+{% endspaceless %}
diff --git a/bookwyrm/templates/snippets/authors.html b/bookwyrm/templates/snippets/authors.html
index dd94b471..5470c9f7 100644
--- a/bookwyrm/templates/snippets/authors.html
+++ b/bookwyrm/templates/snippets/authors.html
@@ -1 +1,18 @@
-{% for author in book.authors.all %}<a href="/author/{{ author.id }}" class="author">{{ author.name }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}
+{% spaceless %}
+{% comment %}
+    @todo The author property needs to be an Organization or a Person. We’ll be
+          using Thing which is the more generic ancestor.
+    @see https://schema.org/Author
+{% endcomment %}
+{% for author in book.authors.all %}
+    <a
+        href="/author/{{ author.id }}"
+        class="author"
+        itemprop="author"
+        itemscope
+        itemtype="https://schema.org/Thing"
+    ><span
+        itemprop="name"
+    >{{ author.name }}<span></a>{% if not forloop.last %}, {% endif %}
+{% endfor %}
+{% endspaceless %}
diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index 0dbc3672..ce47819e 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -1,13 +1,29 @@
+{% spaceless %}
+
 {% load bookwyrm_tags %}
+{% load i18n %}
+
 <div class="cover-container is-{{ size }}">
-{% if book.cover %}
-<img class="book-cover" src="/images/{{ book.cover }}" alt="{{ book.alt_text }}" title="{{ book.alt_text }}">
-{% else %}
-    <div class="no-cover book-cover">
-        <img class="book-cover" src="/static/images/no_cover.jpg" alt="No cover">
-        <div>
-            <p>{{ book.alt_text }}</p>
+    {% if book.cover %}
+        <img
+            class="book-cover"
+            src="/images/{{ book.cover }}"
+            alt="{{ book.alt_text }}"
+            title="{{ book.alt_text }}"
+            itemprop="thumbnailUrl"
+        >
+    {% else %}
+        <div class="no-cover book-cover">
+            <img
+                class="book-cover"
+                src="/static/images/no_cover.jpg"
+                alt="{% trans "No cover" %}"
+            >
+
+            <div>
+                <p>{{ book.alt_text }}</p>
+            </div>
         </div>
-    </div>
-{% endif %}
+    {% endif %}
 </div>
+{% endspaceless %}
diff --git a/bookwyrm/templates/snippets/status/status_content.html b/bookwyrm/templates/snippets/status/status_content.html
index 43cdc5d2..499c31ad 100644
--- a/bookwyrm/templates/snippets/status/status_content.html
+++ b/bookwyrm/templates/snippets/status/status_content.html
@@ -1,68 +1,137 @@
+{% spaceless %}
+
 {% load bookwyrm_tags %}
 {% load i18n %}
-<div class="block">
-    {% if status.status_type == 'Review' or status.status_type == 'Rating' %}
-    <div>
-        {% if status.name %}
-        <h3 class="title is-5 has-subtitle" dir="auto">
-            {{ status.name|escape }}
-        </h3>
-        {% endif %}
-        {% include 'snippets/stars.html' with rating=status.rating %}
-    </div>
+
+{% with status_type=status.status_type %}
+<div
+    class="block"
+
+    {% if status_type == 'Review' %}
+        {% firstof "reviewBody" as body_prop %}
+        {% firstof 'itemprop="reviewRating" itemscope itemtype="https://schema.org/Rating"' as rating_type %}
+    {% endif %}
+
+    {% if status_type == 'Rating' %}
+        itemprop="rating"
+        itemtype="https://schema.org/Rating"
+    {% endif %}
+>
+    {% if status_type == 'Review' or status_type == 'Rating' %}
+        <div>
+            {% if status.name %}
+                <h3
+                    class="title is-5 has-subtitle"
+                    dir="auto"
+                    itemprop="name"
+                >
+                    {{ status.name|escape }}
+                </h3>
+            {% endif %}
+
+            <span
+                class="is-sr-only"
+                {{ rating_type }}
+            >
+                <meta itemprop="ratingValue" content="{{ status.rating|floatformat }}">
+
+                {% if status_type == 'Rating' %}
+                    {# @todo Is it possible to not hard-code the value? #}
+                    <meta itemprop="bestRating" content="5">
+                {% endif %}
+            </span>
+
+            {% include 'snippets/stars.html' with rating=status.rating %}
+        </div>
     {% endif %}
 
     {% if status.content_warning %}
-    <div>
-        <p>{{ status.content_warning }}</p>
-        {% trans "Show more" as button_text %}
-        {% include 'snippets/toggle/open_button.html' with text=button_text class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
-    </div>
+        <div>
+            <p>{{ status.content_warning }}</p>
+
+            {% trans "Show more" as button_text %}
+
+            {% with text=button_text class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
+                {% include 'snippets/toggle/open_button.html' %}
+            {% endwith %}
+        </div>
     {% endif %}
 
-    <div{% if status.content_warning %} class="hidden" id="show-status-cw-{{ status.id }}"{% endif %}>
+    <div
         {% if status.content_warning %}
-        {% trans "Show less" as button_text %}
-        {% include 'snippets/toggle/close_button.html' with text=button_text class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
+            id="show-status-cw-{{ status.id }}"
+            class="hidden"
+        {% endif %}
+    >
+        {% if status.content_warning %}
+            {% trans "Show less" as button_text %}
+
+            {% with text=button_text class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
+                {% include 'snippets/toggle/close_button.html' %}
+            {% endwith %}
         {% endif %}
 
         {% if status.quote %}
-        <div class="quote block">
-            <blockquote dir="auto" class="mb-2">{{ status.quote | safe }}</blockquote>
+            <div class="quote block">
+                <blockquote dir="auto" class="mb-2">{{ status.quote | safe }}</blockquote>
 
-            <p> &mdash; {% include 'snippets/book_titleby.html' with book=status.book %}</p>
-        </div>
-        {% endif %}
-
-        {% if status.content and status.status_type != 'GeneratedNote' and status.status_type != 'Announce' %}
-        {% include 'snippets/trimmed_text.html' with full=status.content|safe no_trim=status.content_warning %}
-        {% endif %}
-        {% if status.attachments.exists %}
-        <div class="block">
-            <div class="columns">
-                {% for attachment in status.attachments.all %}
-                <div class="column is-narrow">
-                    <figure class="image is-128x128">
-                        <a href="/images/{{ attachment.image }}" target="_blank" aria-label="{% trans 'Open image in new window' %}">
-                            <img src="/images/{{ attachment.image }}"{% if attachment.caption %} alt="{{ attachment.caption }}" title="{{ attachment.caption }}"{% endif %}>
-                        </a>
-                    </figure>
-                </div>
-                {% endfor %}
+                <p> &mdash; {% include 'snippets/book_titleby.html' with book=status.book %}</p>
+            </div>
+        {% endif %}
+
+        {% if status.content and status_type != 'GeneratedNote' and status_type != 'Announce' %}
+            {% with full=status.content|safe no_trim=status.content_warning itemprop=body_prop %}
+                {% include 'snippets/trimmed_text.html' %}
+            {% endwith %}
+        {% endif %}
+
+        {% if status.attachments.exists %}
+            <div class="block">
+                <div class="columns">
+                    {% for attachment in status.attachments.all %}
+                        <div class="column is-narrow">
+                            <figure class="image is-128x128">
+                                <a
+                                    href="/images/{{ attachment.image }}"
+                                    target="_blank"
+                                    aria-label="{% trans 'Open image in new window' %}"
+                                >
+                                    <img
+                                        src="/images/{{ attachment.image }}"
+
+                                        {% if attachment.caption %}
+                                            alt="{{ attachment.caption }}"
+                                            title="{{ attachment.caption }}"
+                                        {% endif %}
+                                    >
+                                </a>
+                            </figure>
+                        </div>
+                    {% endfor %}
+                </div>
             </div>
-        </div>
         {% endif %}
     </div>
 </div>
 
 {% if not hide_book %}
-{% if status.book or status.mention_books.count %}
-<div class="{% if status.status_type != 'GeneratedNote' %}box has-background-white-bis{% endif %}">
-    {% if status.book %}
-    {% include 'snippets/status/book_preview.html' with book=status.book %}
-    {% elif status.mention_books.count %}
-    {% include 'snippets/status/book_preview.html' with book=status.mention_books.first %}
+    {% if status.book or status.mention_books.count %}
+        <div
+            {% if status_type != 'GeneratedNote' %}
+                class="box has-background-white-bis"
+            {% endif %}
+        >
+            {% if status.book %}
+                {% with book=status.book %}
+                    {% include 'snippets/status/book_preview.html' %}
+                {% endwith %}
+            {% elif status.mention_books.count %}
+                {% with book=status.mention_books.first %}
+                    {% include 'snippets/status/book_preview.html' %}
+                {% endwith %}
+            {% endif %}
+        </div>
     {% endif %}
-</div>
-{% endif %}
 {% endif %}
+{% endwith %}
+{% endspaceless %}
diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html
index 818c7237..6493bd54 100644
--- a/bookwyrm/templates/snippets/status/status_header.html
+++ b/bookwyrm/templates/snippets/status/status_header.html
@@ -1,9 +1,19 @@
 {% load bookwyrm_tags %}
 {% load i18n %}
-<a href="{{ status.user.local_path }}">
-{% include 'snippets/avatar.html' with user=status.user ariaHide="true" %}
-{{ status.user.display_name }}
-</a>
+<span
+    itemprop="author"
+    itemscope
+    itemtype="https://schema.org/Person"
+>
+    <a
+        href="{{ status.user.local_path }}"
+        itemprop="url"
+    >
+        {% include 'snippets/avatar.html' with user=status.user ariaHide="true" %}
+
+        <span itemprop="name">{{ status.user.display_name }}</span>
+    </a>
+</span>
 
 {% if status.status_type == 'GeneratedNote' %}
     {{ status.content | safe }}
diff --git a/bookwyrm/templates/snippets/trimmed_text.html b/bookwyrm/templates/snippets/trimmed_text.html
index f91fe19b..4b103176 100644
--- a/bookwyrm/templates/snippets/trimmed_text.html
+++ b/bookwyrm/templates/snippets/trimmed_text.html
@@ -1,40 +1,49 @@
+{% spaceless %}
 {% load bookwyrm_tags %}
 {% load i18n %}
 
 {% with 0|uuid as uuid %}
-{% if full %}
-{% with full|to_markdown|safe as full %}
+    {% if full %}
+        {% with full|to_markdown|safe as full %}
+            {% with full|to_markdown|safe|truncatewords_html:60 as trimmed %}
+                {% if not no_trim and trimmed != full %}
+                    <div id="hide-full-{{ uuid }}">
+                        <div class="content" id="trimmed-{{ uuid }}">
+                            <div dir="auto">{{ trimmed }}</div>
 
-{% with full|to_markdown|safe|truncatewords_html:60 as trimmed %}
-{% if not no_trim and trimmed != full %}
-<div id="hide-full-{{ uuid }}">
-    <div class="content" id="trimmed-{{ uuid }}">
-        <div dir="auto">{{ trimmed }}</div>
+                            <div>
+                                {% trans "Show more" as button_text %}
+                                {% include 'snippets/toggle/open_button.html' with text=button_text controls_text="full" controls_uid=uuid class="is-small" %}
+                            </div>
+                        </div>
+                    </div>
+                    <div id="full-{{ uuid }}" class="hidden">
+                        <div class="content">
+                            <div
+                                dir="auto"
+                                {% if itemprop %}itemprop="{{ itemprop }}{% endif %}"
+                            >
+                                {{ full }}
+                            </div>
 
-        <div>
-            {% trans "Show more" as button_text %}
-            {% include 'snippets/toggle/open_button.html' with text=button_text controls_text="full" controls_uid=uuid class="is-small" %}
-        </div>
-    </div>
-</div>
-<div id="full-{{ uuid }}" class="hidden">
-    <div class="content">
-        <div dir="auto">{{ full }}</div>
-
-        <div>
-            {% trans "Show less" as button_text %}
-            {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="full" controls_uid=uuid class="is-small" %}
-        </div>
-    </div>
-</div>
-{% else %}
-<div class="content">
-    <div dir="auto">{{ full }}</div>
-</div>
-{% endif %}
+                            <div>
+                                {% trans "Show less" as button_text %}
+                                {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="full" controls_uid=uuid class="is-small" %}
+                            </div>
+                        </div>
+                    </div>
+                    {% else %}
+                    <div class="content">
+                        <div
+                            dir="auto"
+                            {% if itemprop %}itemprop="{{ itemprop }}{% endif %}"
+                        >
+                            {{ full }}
+                        </div>
+                    </div>
+                {% endif %}
+            {% endwith %}
+        {% endwith %}
+    {% endif %}
 {% endwith %}
-
-{% endwith %}
-{% endif %}
-{% endwith %}
-
+{% endspaceless %}
diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index c765cb89..c05a9f7a 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-05 07:29+0000\n"
+"POT-Creation-Date: 2021-04-09 21:53+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"
@@ -44,7 +44,6 @@ msgid "%(count)d uses"
 msgstr "%(count)d utilisations"
 
 #: bookwyrm/forms.py:251
-#| msgid "Unlisted"
 msgid "Unlimited"
 msgstr "Sans limite"
 
@@ -59,7 +58,6 @@ msgid "%(value)s is not a valid username"
 msgstr "%(value)s n’est pas un nom de compte valide."
 
 #: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:152
-#| msgid "Username:"
 msgid "username"
 msgstr "nom du compte :"
 
@@ -120,64 +118,62 @@ msgstr "Wikipedia"
 msgid "Books by %(name)s"
 msgstr "Livres par %(name)s"
 
-#: bookwyrm/templates/book/book.html:21
+#: bookwyrm/templates/book/book.html:33
 #: bookwyrm/templates/discover/large-book.html:12
 #: bookwyrm/templates/discover/small-book.html:9
 msgid "by"
 msgstr "par"
 
-#: bookwyrm/templates/book/book.html:29 bookwyrm/templates/book/book.html:30
+#: bookwyrm/templates/book/book.html:41 bookwyrm/templates/book/book.html:42
 msgid "Edit Book"
 msgstr "Modifier le livre"
 
-#: bookwyrm/templates/book/book.html:49
+#: bookwyrm/templates/book/book.html:61
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "Ajouter une couverture"
 
-#: bookwyrm/templates/book/book.html:53
-#| msgid "Failed to load"
+#: bookwyrm/templates/book/book.html:65
 msgid "Failed to load cover"
 msgstr "La couverture n’a pu être chargée"
 
-#: bookwyrm/templates/book/book.html:62
+#: bookwyrm/templates/book/book.html:74
 msgid "ISBN:"
 msgstr "ISBN :"
 
-#: bookwyrm/templates/book/book.html:69
-#: bookwyrm/templates/book/edit_book.html:217
+#: bookwyrm/templates/book/book.html:81
+#: bookwyrm/templates/book/edit_book.html:223
 msgid "OCLC Number:"
 msgstr "Numéro OCLC :"
 
-#: bookwyrm/templates/book/book.html:76
-#: bookwyrm/templates/book/edit_book.html:221
+#: bookwyrm/templates/book/book.html:88
+#: bookwyrm/templates/book/edit_book.html:227
 msgid "ASIN:"
 msgstr "ASIN :"
 
-#: bookwyrm/templates/book/book.html:85
+#: bookwyrm/templates/book/book.html:97
 msgid "View on OpenLibrary"
 msgstr "Voir sur OpenLibrary"
 
-#: bookwyrm/templates/book/book.html:94
+#: bookwyrm/templates/book/book.html:117
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s critique)"
 msgstr[1] "(%(review_count)s critiques)"
 
-#: bookwyrm/templates/book/book.html:100
-#| msgid "Description:"
+#: bookwyrm/templates/book/book.html:129
 msgid "Add Description"
 msgstr "Ajouter une description"
 
-#: bookwyrm/templates/book/book.html:107
-#: bookwyrm/templates/book/edit_book.html:101
+#: bookwyrm/templates/book/book.html:136
+#: bookwyrm/templates/book/edit_book.html:107
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Description :"
 
-#: bookwyrm/templates/book/book.html:111
-#: bookwyrm/templates/book/edit_book.html:231
+#: bookwyrm/templates/book/book.html:140
+#: bookwyrm/templates/book/edit_book.html:237
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
 #: bookwyrm/templates/settings/site.html:93
@@ -188,9 +184,9 @@ msgstr "Description :"
 msgid "Save"
 msgstr "Enregistrer"
 
-#: bookwyrm/templates/book/book.html:112 bookwyrm/templates/book/book.html:161
+#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:232
+#: bookwyrm/templates/book/edit_book.html:238
 #: bookwyrm/templates/edit_author.html:79
 #: bookwyrm/templates/moderation/report_modal.html:32
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
@@ -203,92 +199,84 @@ msgstr "Enregistrer"
 msgid "Cancel"
 msgstr "Annuler"
 
-#: bookwyrm/templates/book/book.html:121
+#: bookwyrm/templates/book/book.html:150
 #, python-format
-#| msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s/editions\">%(count)s éditions</a>"
 
-#: bookwyrm/templates/book/book.html:129
+#: bookwyrm/templates/book/book.html:158
 #, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "Cette édition est sur votre étagère <a href=\"%(path)s\">%(shelf_name)s</a>."
 
-#: bookwyrm/templates/book/book.html:135
+#: bookwyrm/templates/book/book.html:164
 #, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">%(preview_name)s</a>"
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr "Une <a href=\"%(book_path)s\">édition différente</a> de ce livre existe sur votre étagère <a href=\"%(shelf_path)s\">%(shelf_name)s</a>."
 
-#: bookwyrm/templates/book/book.html:144
+#: bookwyrm/templates/book/book.html:173
 msgid "Your reading activity"
 msgstr "Votre activité de lecture"
 
-#: bookwyrm/templates/book/book.html:146
-#| msgid "Edit read dates"
+#: bookwyrm/templates/book/book.html:175
 msgid "Add read dates"
 msgstr "Ajouter des dates de lecture"
 
-#: bookwyrm/templates/book/book.html:151
+#: bookwyrm/templates/book/book.html:180
 msgid "You don't have any reading activity for this book."
 msgstr "Vous n’avez aucune activité de lecture pour ce livre"
 
-#: bookwyrm/templates/book/book.html:158
+#: bookwyrm/templates/book/book.html:187
 msgid "Create"
 msgstr "Créer"
 
-#: bookwyrm/templates/book/book.html:180
+#: bookwyrm/templates/book/book.html:209
 msgid "Subjects"
 msgstr "Sujets"
 
-#: bookwyrm/templates/book/book.html:191
+#: bookwyrm/templates/book/book.html:221
 msgid "Places"
 msgstr "Lieux"
 
-#: bookwyrm/templates/book/book.html:202 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book/book.html:232 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listes"
 
-#: bookwyrm/templates/book/book.html:213
-#| msgid "Go to list"
+#: bookwyrm/templates/book/book.html:243
 msgid "Add to list"
 msgstr "Ajouter à la liste"
 
-#: bookwyrm/templates/book/book.html:223
+#: bookwyrm/templates/book/book.html:253
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:90
 msgid "Add"
 msgstr "Ajouter"
 
-#: bookwyrm/templates/book/book.html:251
+#: bookwyrm/templates/book/book.html:291
 msgid "rated it"
 msgstr "l’a noté"
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:169
-#| msgid "Add cover"
+#: bookwyrm/templates/book/edit_book.html:175
 msgid "Upload cover:"
 msgstr "Charger une couverture :"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:175
+#: bookwyrm/templates/book/edit_book.html:181
 msgid "Load cover from url:"
 msgstr "Charger la couverture depuis une URL :"
 
 #: bookwyrm/templates/book/edit_book.html:5
 #: bookwyrm/templates/book/edit_book.html:11
 #, python-format
-#| msgid "Finish \"<em>%(book_title)s</em>\""
 msgid "Edit \"%(book_title)s\""
 msgstr "Modifier « %(book_title)s »"
 
 #: bookwyrm/templates/book/edit_book.html:5
 #: bookwyrm/templates/book/edit_book.html:13
-#| msgid "Add Books"
 msgid "Add Book"
 msgstr "Ajouter un livre"
 
@@ -318,7 +306,6 @@ msgstr "Est‑ce que l’auteur ou l’autrice « %(name)s » existe déjà
 
 #: bookwyrm/templates/book/edit_book.html:52
 #, python-format
-#| msgid "Start \"<em>%(book_title)s</em>\""
 msgid "Author of <em>%(book_title)s</em>"
 msgstr "Commencer « <em>%(book_title)s</em> »"
 
@@ -354,97 +341,92 @@ msgstr "Retour"
 msgid "Metadata"
 msgstr "Métadonnées"
 
-#: bookwyrm/templates/book/edit_book.html:91
+#: bookwyrm/templates/book/edit_book.html:92
 msgid "Title:"
 msgstr "Titre :"
 
-#: bookwyrm/templates/book/edit_book.html:96
+#: bookwyrm/templates/book/edit_book.html:100
 msgid "Subtitle:"
 msgstr "Sous‑titre :"
 
-#: bookwyrm/templates/book/edit_book.html:106
+#: bookwyrm/templates/book/edit_book.html:112
 msgid "Series:"
 msgstr "Série :"
 
-#: bookwyrm/templates/book/edit_book.html:111
+#: bookwyrm/templates/book/edit_book.html:117
 msgid "Series number:"
 msgstr "Numéro dans la série :"
 
-#: bookwyrm/templates/book/edit_book.html:117
-#| msgid "Published"
+#: bookwyrm/templates/book/edit_book.html:123
 msgid "Publisher:"
 msgstr "Éditeur :"
 
-#: bookwyrm/templates/book/edit_book.html:119
+#: bookwyrm/templates/book/edit_book.html:125
 msgid "Separate multiple publishers with commas."
 msgstr "Séparez plusieurs éditeurs par une virgule."
 
-#: bookwyrm/templates/book/edit_book.html:126
+#: bookwyrm/templates/book/edit_book.html:132
 msgid "First published date:"
 msgstr "Première date de publication :"
 
-#: bookwyrm/templates/book/edit_book.html:134
+#: bookwyrm/templates/book/edit_book.html:140
 msgid "Published date:"
 msgstr "Date de publication :"
 
-#: bookwyrm/templates/book/edit_book.html:143
-#| msgid "Author"
+#: bookwyrm/templates/book/edit_book.html:149
 msgid "Authors"
 msgstr "Auteurs ou autrices"
 
-#: bookwyrm/templates/book/edit_book.html:149
+#: bookwyrm/templates/book/edit_book.html:155
 #, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
 msgstr "Supprimer <a href=\"%(path)s\">%(name)s</a>"
 
-#: bookwyrm/templates/book/edit_book.html:154
-#| msgid "Edit Author"
+#: bookwyrm/templates/book/edit_book.html:160
 msgid "Add Authors:"
 msgstr "Ajouter des auteurs ou autrices :"
 
-#: bookwyrm/templates/book/edit_book.html:155
+#: bookwyrm/templates/book/edit_book.html:161
 msgid "John Doe, Jane Smith"
 msgstr "Claude Dupont, Dominique Durand"
 
-#: bookwyrm/templates/book/edit_book.html:161
+#: bookwyrm/templates/book/edit_book.html:167
 #: bookwyrm/templates/user/shelf.html:75
 msgid "Cover"
 msgstr "Couverture"
 
-#: bookwyrm/templates/book/edit_book.html:188
+#: bookwyrm/templates/book/edit_book.html:194
 msgid "Physical Properties"
 msgstr "Propriétés physiques"
 
-#: bookwyrm/templates/book/edit_book.html:189
+#: bookwyrm/templates/book/edit_book.html:195
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "Format :"
 
-#: bookwyrm/templates/book/edit_book.html:197
+#: bookwyrm/templates/book/edit_book.html:203
 msgid "Pages:"
 msgstr "Pages :"
 
-#: bookwyrm/templates/book/edit_book.html:204
+#: bookwyrm/templates/book/edit_book.html:210
 msgid "Book Identifiers"
 msgstr "Identifiants du livre"
 
-#: bookwyrm/templates/book/edit_book.html:205
+#: bookwyrm/templates/book/edit_book.html:211
 msgid "ISBN 13:"
 msgstr "ISBN 13 :"
 
-#: bookwyrm/templates/book/edit_book.html:209
+#: bookwyrm/templates/book/edit_book.html:215
 msgid "ISBN 10:"
 msgstr "ISBN 10 :"
 
-#: bookwyrm/templates/book/edit_book.html:213
+#: bookwyrm/templates/book/edit_book.html:219
 #: bookwyrm/templates/edit_author.html:59
 msgid "Openlibrary key:"
 msgstr "Clé Openlibrary :"
 
 #: bookwyrm/templates/book/editions.html:5
 #, python-format
-#| msgid "Finish \"<em>%(book_title)s</em>\""
 msgid "Editions of %(book_title)s"
 msgstr "Éditions de %(book_title)s"
 
@@ -462,36 +444,37 @@ msgstr "Tou(te)s"
 msgid "Language:"
 msgstr "Langue :"
 
-#: bookwyrm/templates/book/publisher_info.html:6
+#: bookwyrm/templates/book/publisher_info.html:22
+#, python-format
+msgid "%(format)s"
+msgstr "%(format)s"
+
+#: bookwyrm/templates/book/publisher_info.html:24
 #, python-format
-#| msgid "of %(book.pages)s pages"
 msgid "%(format)s, %(pages)s pages"
 msgstr "%(format)s, %(pages)s pages"
 
-#: bookwyrm/templates/book/publisher_info.html:8
+#: bookwyrm/templates/book/publisher_info.html:26
 #, python-format
-#| msgid "of %(book.pages)s pages"
 msgid "%(pages)s pages"
 msgstr "%(pages)s pages"
 
-#: bookwyrm/templates/book/publisher_info.html:13
+#: bookwyrm/templates/book/publisher_info.html:38
 #, python-format
-#| msgid "of %(book.pages)s pages"
 msgid "%(languages)s language"
 msgstr "%(languages)s langues"
 
-#: bookwyrm/templates/book/publisher_info.html:18
+#: bookwyrm/templates/book/publisher_info.html:65
 #, python-format
 msgid "Published %(date)s by %(publisher)s."
 msgstr "Publié %(date)s par %(publisher)s."
 
-#: bookwyrm/templates/book/publisher_info.html:20
+#: bookwyrm/templates/book/publisher_info.html:67
 #, python-format
-#| msgid "Published date:"
 msgid "Published %(date)s"
 msgstr "Publié %(date)s"
 
-#: bookwyrm/templates/book/publisher_info.html:22
+#: bookwyrm/templates/book/publisher_info.html:69
 #, python-format
 msgid "Published by %(publisher)s."
 msgstr "Publié par %(publisher)s."
@@ -501,27 +484,22 @@ msgstr "Publié par %(publisher)s."
 #: bookwyrm/templates/feed/feed_layout.html:70
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
-#| msgid "Closed"
 msgid "Close"
 msgstr "Fermer"
 
 #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8
-#| msgid "Boost status"
 msgid "Compose status"
 msgstr "Rédiger un statut"
 
 #: bookwyrm/templates/directory/community_filter.html:5
-#| msgid "Comment"
 msgid "Community"
 msgstr "Communauté"
 
 #: bookwyrm/templates/directory/community_filter.html:8
-#| msgid "Blocked users"
 msgid "Local users"
 msgstr "Comptes locaux"
 
 #: bookwyrm/templates/directory/community_filter.html:12
-#| msgid "Federated"
 msgid "Federated community"
 msgstr "Communauté fédérée"
 
@@ -537,7 +515,6 @@ msgstr "Autoriser d’autres utilisateurs ou utilisatrices de BookWyrm à décou
 
 #: bookwyrm/templates/directory/directory.html:26
 #, python-format
-#| msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
 msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
 msgstr "Vous pouvez décider de ne plus y figurer à n’importe quel moment depuis vos <a href=\"%(path)s\">paramètres de profil.</a>"
 
@@ -547,14 +524,12 @@ msgid "Dismiss message"
 msgstr "Rejeter le message"
 
 #: bookwyrm/templates/directory/directory.html:71
-#| msgid "followed you"
 msgid "follower you follow"
 msgid_plural "followers you follow"
 msgstr[0] "compte auquel vous êtes abonné(e)"
 msgstr[1] "comptes auxquels vous êtes abonné(e)"
 
 #: bookwyrm/templates/directory/directory.html:78
-#| msgid "Your shelves"
 msgid "book on your shelves"
 msgid_plural "books on your shelves"
 msgstr[0] "livre sur vos étagères"
@@ -573,7 +548,6 @@ msgid "Order by"
 msgstr "Trier par"
 
 #: bookwyrm/templates/directory/sort_filter.html:8
-#| msgid "Suggest"
 msgid "Suggested"
 msgstr "Suggéré"
 
@@ -582,12 +556,10 @@ msgid "Recently active"
 msgstr "Actif récemment"
 
 #: bookwyrm/templates/directory/user_type_filter.html:5
-#| msgid "User Activity"
 msgid "User type"
 msgstr "Type de compte"
 
 #: bookwyrm/templates/directory/user_type_filter.html:8
-#| msgid "Blocked users"
 msgid "BookWyrm users"
 msgstr "Comptes BookWyrm"
 
@@ -597,7 +569,6 @@ msgstr "Tous les comptes connus"
 
 #: bookwyrm/templates/discover/about.html:7
 #, python-format
-#| msgid "Join %(name)s"
 msgid "About %(site_name)s"
 msgstr "À propos de %(site_name)s"
 
@@ -667,7 +638,6 @@ msgid "Your Account"
 msgstr "Votre compte"
 
 #: bookwyrm/templates/edit_author.html:5
-#| msgid "Edit Author"
 msgid "Edit Author:"
 msgstr "Modifier l’auteur ou l’autrice :"
 
@@ -722,7 +692,6 @@ msgstr "Paramètres d’email"
 #: bookwyrm/templates/email/invite/html_content.html:6
 #: bookwyrm/templates/email/invite/subject.html:2
 #, python-format
-#| msgid "Join %(name)s"
 msgid "You're invited to join %(site_name)s!"
 msgstr "Vous avez reçu une invitation à rejoindre %(site_name)s !"
 
@@ -741,7 +710,6 @@ msgid "You're invited to join %(site_name)s! Click the link below to create an a
 msgstr "Vous avez reçu une invitation à rejoindre %(site_name)s ! Cliquez le lien suivant pour créer un compte."
 
 #: bookwyrm/templates/email/invite/text_content.html:8
-#| msgid "More about this site"
 msgid "Learn more about this instance:"
 msgstr "En savoir plus sur cete instance :"
 
@@ -766,7 +734,6 @@ msgstr "Si vous n’avez pas demandé la réinitialisation de votre mot de passe
 
 #: bookwyrm/templates/email/password_reset/subject.html:2
 #, python-format
-#| msgid "Join %(name)s"
 msgid "Reset your %(site_name)s password"
 msgstr "Réinitialiser votre mot de passe sur %(site_name)s"
 
@@ -793,12 +760,10 @@ msgid "Home Timeline"
 msgstr "Mon fil d’actualité"
 
 #: bookwyrm/templates/feed/feed.html:11
-#| msgid "%(tab_title)s Timeline"
 msgid "Local Timeline"
 msgstr "Fil d’actualité local"
 
 #: bookwyrm/templates/feed/feed.html:13
-#| msgid "Federated Servers"
 msgid "Federated Timeline"
 msgstr "Fil d’actualité des instances fédérées"
 
@@ -829,7 +794,6 @@ msgid "Who to follow"
 msgstr "À qui s’abonner"
 
 #: bookwyrm/templates/feed/feed_layout.html:5
-#| msgid "Updated:"
 msgid "Updates"
 msgstr "Mises à jour"
 
@@ -845,13 +809,11 @@ msgstr "Aucun livre ici pour l’instant ! Cherchez un livre pour commencer"
 
 #: bookwyrm/templates/feed/feed_layout.html:24
 #: bookwyrm/templates/user/shelf.html:28
-#| msgid "Read"
 msgid "To Read"
 msgstr "À lire"
 
 #: bookwyrm/templates/feed/feed_layout.html:25
 #: bookwyrm/templates/user/shelf.html:28
-#| msgid "Started reading"
 msgid "Currently Reading"
 msgstr "En train de lire"
 
@@ -883,12 +845,10 @@ msgstr[1] "%(shared_books)s livres sur vos étagères"
 
 #: bookwyrm/templates/get_started/book_preview.html:6
 #, python-format
-#| msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgid "Have you read %(book_title)s?"
 msgstr "Avez‑vous lu « <em>%(book_title)s</em> » ?"
 
 #: bookwyrm/templates/get_started/books.html:6
-#| msgid "Started reading"
 msgid "What are you reading?"
 msgstr "Que lisez‑vous ?"
 
@@ -919,13 +879,11 @@ msgid "Search"
 msgstr "Chercher"
 
 #: bookwyrm/templates/get_started/books.html:26
-#| msgid "Suggest Books"
 msgid "Suggested Books"
 msgstr "Suggérer des livres"
 
 #: bookwyrm/templates/get_started/books.html:41
 #, python-format
-#| msgid "Join %(name)s"
 msgid "Popular on %(site_name)s"
 msgstr "Populaire sur %(site_name)s"
 
@@ -941,7 +899,6 @@ msgstr "Enregistrer &amp; continuer"
 
 #: bookwyrm/templates/get_started/layout.html:14
 #, python-format
-#| msgid "Join %(name)s"
 msgid "Welcome to %(site_name)s!"
 msgstr "Bienvenu(e) sur %(site_name)s !"
 
@@ -951,17 +908,14 @@ msgstr "Voici quelques étapes pour commencer votre profil."
 
 #: bookwyrm/templates/get_started/layout.html:30
 #: bookwyrm/templates/get_started/profile.html:6
-#| msgid "User Profile"
 msgid "Create your profile"
 msgstr "Créez votre profil"
 
 #: bookwyrm/templates/get_started/layout.html:34
-#| msgid "Add Books"
 msgid "Add books"
 msgstr "Ajoutez des livres"
 
 #: bookwyrm/templates/get_started/layout.html:38
-#| msgid "Friendly"
 msgid "Find friends"
 msgstr "Établissez des contacts"
 
@@ -970,7 +924,6 @@ msgid "Skip this step"
 msgstr "Passer cette étape"
 
 #: bookwyrm/templates/get_started/layout.html:48
-#| msgid "Finished"
 msgid "Finish"
 msgstr "Terminer"
 
@@ -1008,7 +961,6 @@ msgid "Your account will show up in the directory, and may be recommended to oth
 msgstr "Votre compte sera listé dans le répertoire et pourra être recommandé à d’autres utilisateurs ou utilisatrices de BookWyrm."
 
 #: bookwyrm/templates/get_started/users.html:11
-#| msgid "Search for a book or user"
 msgid "Search for a user"
 msgstr "Chercher un compte"
 
@@ -1024,7 +976,6 @@ msgid "%(year)s Reading Progress"
 msgstr "Progression de lecture pour %(year)s"
 
 #: bookwyrm/templates/goal.html:11
-#| msgid "Edit Book"
 msgid "Edit Goal"
 msgstr "Modifier le défi"
 
@@ -1041,13 +992,11 @@ msgstr "%(name)s n’a aucun défi lecture pour %(year)s."
 
 #: bookwyrm/templates/goal.html:51
 #, python-format
-#| msgid "Your books"
 msgid "Your %(year)s Books"
 msgstr "Vos livres en %(year)s"
 
 #: bookwyrm/templates/goal.html:53
 #, python-format
-#| msgid "%(username)s has no followers"
 msgid "%(username)s's %(year)s Books"
 msgstr "Livres de %(username)s en %(year)s"
 
@@ -1057,7 +1006,6 @@ msgid "Import Books"
 msgstr "Importer des livres"
 
 #: bookwyrm/templates/import.html:16
-#| msgid "Data source"
 msgid "Data source:"
 msgstr "Source de données :"
 
@@ -1193,7 +1141,6 @@ msgid "Feed"
 msgstr "Fil d’actualité"
 
 #: bookwyrm/templates/layout.html:102
-#| msgid "Instance Settings"
 msgid "Settings"
 msgstr "Paramètres"
 
@@ -1226,7 +1173,6 @@ msgid "Username:"
 msgstr "Nom du compte :"
 
 #: bookwyrm/templates/layout.html:156
-#| msgid "Password:"
 msgid "password"
 msgstr "Mot de passe"
 
@@ -1267,13 +1213,11 @@ msgstr "Créer une liste"
 
 #: bookwyrm/templates/lists/created_text.html:5
 #, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "Created and curated by <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Créée et modérée par <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/lists/created_text.html:7
 #, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Créée par <a href=\"%(path)s\">%(username)s</a>"
 
@@ -1341,7 +1285,6 @@ msgstr "Cette liste est vide actuellement"
 
 #: bookwyrm/templates/lists/list.html:35
 #, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "Ajoutée par <a href=\"%(user_path)s\">%(username)s</a>"
 
@@ -1375,6 +1318,10 @@ msgstr "Aucun livre trouvé pour la requête « %(query)s »"
 msgid "Suggest"
 msgstr "Suggérer"
 
+#: bookwyrm/templates/lists/lists.html:14 bookwyrm/templates/user/lists.html:9
+msgid "Your Lists"
+msgstr "Vos listes"
+
 #: bookwyrm/templates/login.html:4
 msgid "Login"
 msgstr "Connexion"
@@ -1404,12 +1351,10 @@ msgid "Back to reports"
 msgstr "Retour aux signalements"
 
 #: bookwyrm/templates/moderation/report.html:18
-#| msgid "Notifications"
 msgid "Actions"
 msgstr "Actions"
 
 #: bookwyrm/templates/moderation/report.html:19
-#| msgid "User Profile"
 msgid "View user profile"
 msgstr "Voir le profil"
 
@@ -1438,7 +1383,6 @@ msgid "Comment"
 msgstr "Commentaire"
 
 #: bookwyrm/templates/moderation/report.html:59
-#| msgid "Delete status"
 msgid "Reported statuses"
 msgstr "Statuts signalés"
 
@@ -1452,7 +1396,6 @@ msgstr "Les statuts ont été supprimés"
 
 #: bookwyrm/templates/moderation/report_modal.html:6
 #, python-format
-#| msgid "Join %(name)s"
 msgid "Report @%(username)s"
 msgstr "Signaler @%(username)s"
 
@@ -1462,7 +1405,6 @@ msgid "This report will be sent to %(site_name)s's moderators for review."
 msgstr "Ce signalement sera envoyé à l’équipe de modération de %(site_name)s pour traitement."
 
 #: bookwyrm/templates/moderation/report_modal.html:22
-#| msgid "More about this site"
 msgid "More info about this report:"
 msgstr "En savoir plus sur ce signalement :"
 
@@ -1472,7 +1414,6 @@ msgstr "Aucune note fournie"
 
 #: bookwyrm/templates/moderation/report_preview.html:20
 #, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "Reported by <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Signalé par <a href=\"%(path)s\">%(username)s</a>"
 
@@ -1486,30 +1427,25 @@ msgstr "Résoudre"
 
 #: bookwyrm/templates/moderation/reports.html:6
 #, python-format
-#| msgid "Join %(name)s"
 msgid "Reports: %(server_name)s"
 msgstr "Signalements : %(server_name)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
 #: bookwyrm/templates/moderation/reports.html:16
 #: bookwyrm/templates/settings/admin_layout.html:28
-#| msgid "Recent Imports"
 msgid "Reports"
 msgstr "Signalements"
 
 #: bookwyrm/templates/moderation/reports.html:13
 #, python-format
-#| msgid "Join %(name)s"
 msgid "Reports: <small>%(server_name)s</small>"
 msgstr "Signalements: <small>%(server_name)s</small>"
 
 #: bookwyrm/templates/moderation/reports.html:27
-#| msgid "Shelved"
 msgid "Resolved"
 msgstr "Résolus"
 
 #: bookwyrm/templates/moderation/reports.html:34
-#| msgid "No books found"
 msgid "No reports found."
 msgstr "Aucun signalement trouvé."
 
@@ -1741,7 +1677,6 @@ msgstr "Paramètres de l’instance"
 #: bookwyrm/templates/settings/admin_layout.html:41
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
-#| msgid "Instance Settings"
 msgid "Site Settings"
 msgstr "Paramètres du site"
 
@@ -1774,17 +1709,14 @@ msgid "Details"
 msgstr "Détails"
 
 #: bookwyrm/templates/settings/federated_server.html:15
-#| msgid "Software"
 msgid "Software:"
 msgstr "Logiciel :"
 
 #: bookwyrm/templates/settings/federated_server.html:19
-#| msgid "Description:"
 msgid "Version:"
 msgstr "Description :"
 
 #: bookwyrm/templates/settings/federated_server.html:23
-#| msgid "Status"
 msgid "Status:"
 msgstr "Statut :"
 
@@ -1794,7 +1726,6 @@ msgid "Activity"
 msgstr "Activité"
 
 #: bookwyrm/templates/settings/federated_server.html:33
-#| msgid "Username:"
 msgid "Users:"
 msgstr "Comptes :"
 
@@ -1804,22 +1735,18 @@ msgid "View all"
 msgstr "Voir tous"
 
 #: bookwyrm/templates/settings/federated_server.html:40
-#| msgid "Recent Imports"
 msgid "Reports:"
 msgstr "Signalements :"
 
 #: bookwyrm/templates/settings/federated_server.html:47
-#| msgid "followed you"
 msgid "Followed by us:"
 msgstr "Suivi par nous :"
 
 #: bookwyrm/templates/settings/federated_server.html:53
-#| msgid "followed you"
 msgid "Followed by them:"
 msgstr "Suivi par eux :"
 
 #: bookwyrm/templates/settings/federated_server.html:59
-#| msgid "Blocked Users"
 msgid "Blocked by us:"
 msgstr "Bloqués par nous :"
 
@@ -1828,7 +1755,6 @@ msgid "Server name"
 msgstr "Nom du serveur"
 
 #: bookwyrm/templates/settings/federation.html:17
-#| msgid "Federated"
 msgid "Date federated"
 msgstr "Date de fédération"
 
@@ -1847,7 +1773,6 @@ msgstr "Statut"
 #: bookwyrm/templates/settings/manage_invite_requests.html:11
 #: bookwyrm/templates/settings/manage_invite_requests.html:25
 #: bookwyrm/templates/settings/manage_invites.html:11
-#| msgid "Invites"
 msgid "Invite Requests"
 msgstr "Invitations"
 
@@ -1856,12 +1781,10 @@ msgid "Ignored Invite Requests"
 msgstr "Invitations ignorées"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:35
-#| msgid "Federated"
 msgid "Date requested"
 msgstr "Date d’envoi"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:39
-#| msgid "Accept"
 msgid "Date accepted"
 msgstr "Date de validation"
 
@@ -1870,18 +1793,15 @@ msgid "Email"
 msgstr "Email"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:47
-#| msgid "Notifications"
 msgid "Action"
 msgstr "Action"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:50
-#| msgid "Follow Requests"
 msgid "No requests"
 msgstr "Aucune demande"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:59
 #: bookwyrm/templates/settings/status_filter.html:16
-#| msgid "Accept"
 msgid "Accepted"
 msgstr "Accepté(e)s"
 
@@ -2004,7 +1924,6 @@ msgid "Allow registration:"
 msgstr "Autoriser l’enregistrement :"
 
 #: bookwyrm/templates/settings/site.html:83
-#| msgid "Follow Requests"
 msgid "Allow invite requests:"
 msgstr "Autoriser les demandes d’invitation :"
 
@@ -2018,12 +1937,10 @@ msgid "Users: <small>%(server_name)s</small>"
 msgstr "Comptes : <small>%(server_name)s</small>"
 
 #: bookwyrm/templates/settings/user_admin.html:20
-#| msgid "Username:"
 msgid "Username"
 msgstr "Nom du compte"
 
 #: bookwyrm/templates/settings/user_admin.html:24
-#| msgid "added"
 msgid "Date Added"
 msgstr "Date d’ajout"
 
@@ -2032,12 +1949,10 @@ msgid "Last Active"
 msgstr "Dernière activité"
 
 #: bookwyrm/templates/settings/user_admin.html:36
-#| msgid "Remove"
 msgid "Remote server"
 msgstr "Serveur distant"
 
 #: bookwyrm/templates/settings/user_admin.html:45
-#| msgid "Activity"
 msgid "Active"
 msgstr "Actif"
 
@@ -2057,6 +1972,11 @@ msgstr "Bloquer"
 msgid "Un-block"
 msgstr "Débloquer"
 
+#: bookwyrm/templates/snippets/book_cover.html:20
+#: bookwyrm/templates/snippets/search_result_text.html:10
+msgid "No cover"
+msgstr "Aucune couverture"
+
 #: bookwyrm/templates/snippets/book_titleby.html:3
 #, python-format
 msgid "<a href=\"%(path)s\">%(title)s</a> by "
@@ -2095,12 +2015,10 @@ msgid "Comment:"
 msgstr "Commentaire :"
 
 #: bookwyrm/templates/snippets/create_status_form.html:20
-#| msgid "Quote"
 msgid "Quote:"
 msgstr "Citation :"
 
 #: bookwyrm/templates/snippets/create_status_form.html:22
-#| msgid "Review"
 msgid "Review:"
 msgstr "Critique :"
 
@@ -2174,7 +2092,6 @@ msgid "Un-like status"
 msgstr "Retirer le statut des favoris"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:7
-#| msgid "Show less"
 msgid "Show filters"
 msgstr "Afficher les filtres"
 
@@ -2187,7 +2104,6 @@ msgid "Apply filters"
 msgstr "Appliquer les filtres"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:26
-#| msgid "Clear search"
 msgid "Clear filters"
 msgstr "Annuler les filtres"
 
@@ -2196,7 +2112,6 @@ msgid "Follow"
 msgstr "S’abonner"
 
 #: bookwyrm/templates/snippets/follow_button.html:18
-#| msgid "Send follow request"
 msgid "Undo follow request"
 msgstr "Annuler la demande d’abonnement"
 
@@ -2230,7 +2145,6 @@ msgstr[1] "souhaite lire %(counter)s livres en %(year)s"
 
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
 #, python-format
-#| msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
 msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
 msgstr[0] "A noté <a href=\"%(path)s\">%(title)s</a> : %(display_rating)s star"
@@ -2297,13 +2211,11 @@ msgstr "%(username)s a lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s
 
 #: bookwyrm/templates/snippets/page_text.html:4
 #, python-format
-#| msgid "of %(pages)s pages"
 msgid "page %(page)s of %(total_pages)s"
 msgstr "page %(page)s sur %(total_pages)s pages"
 
 #: bookwyrm/templates/snippets/page_text.html:6
 #, python-format
-#| msgid "of %(book.pages)s pages"
 msgid "page %(page)s"
 msgstr "page %(page)s"
 
@@ -2374,7 +2286,6 @@ msgid "Edit read dates"
 msgstr "Modifier les date de lecture"
 
 #: bookwyrm/templates/snippets/readthrough.html:61
-#| msgid "Delete these read dates?"
 msgid "Delete these read dates"
 msgstr "Supprimer ces dates de lecture"
 
@@ -2398,35 +2309,29 @@ msgid "Sign Up"
 msgstr "S’enregistrer"
 
 #: bookwyrm/templates/snippets/report_button.html:5
-#| msgid "Import"
 msgid "Report"
 msgstr "Signaler"
 
 #: bookwyrm/templates/snippets/rss_title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:11
+#: bookwyrm/templates/snippets/status/status_header.html:21
 msgid "rated"
 msgstr "a noté"
 
 #: bookwyrm/templates/snippets/rss_title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:13
+#: bookwyrm/templates/snippets/status/status_header.html:23
 msgid "reviewed"
 msgstr "a écrit une critique de"
 
 #: bookwyrm/templates/snippets/rss_title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:15
+#: bookwyrm/templates/snippets/status/status_header.html:25
 msgid "commented on"
 msgstr "a commenté"
 
 #: bookwyrm/templates/snippets/rss_title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:17
+#: bookwyrm/templates/snippets/status/status_header.html:27
 msgid "quoted"
 msgstr "a cité"
 
-#: bookwyrm/templates/snippets/search_result_text.html:10
-#| msgid "Add cover"
-msgid "No cover"
-msgstr "Aucune couverture"
-
 #: bookwyrm/templates/snippets/search_result_text.html:22
 #, python-format
 msgid "by %(author)s"
@@ -2437,7 +2342,6 @@ msgid "Import book"
 msgstr "Importer le livre"
 
 #: bookwyrm/templates/snippets/shelf_selector.html:4
-#| msgid "Your books"
 msgid "Move book"
 msgstr "Déplacer le livre"
 
@@ -2448,7 +2352,6 @@ msgstr "Terminer « <em>%(book_title)s</em> »"
 
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:35
-#| msgid "Updated:"
 msgid "Update progress"
 msgstr "Progression de la mise à jour"
 
@@ -2457,12 +2360,10 @@ msgid "More shelves"
 msgstr "Plus d’étagères"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:8
-#| msgid "Started reading"
 msgid "Start reading"
 msgstr "Commencer la lecture"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
-#| msgid "Finished reading"
 msgid "Finish reading"
 msgstr "Terminer la lecture"
 
@@ -2473,7 +2374,6 @@ msgstr "Je veux le lire"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:48
 #, python-format
-#| msgid "Join %(name)s"
 msgid "Remove from %(name)s"
 msgstr "Retirer de %(name)s"
 
@@ -2502,41 +2402,37 @@ msgstr "Supprimer le statut"
 msgid "Reply"
 msgstr "Répondre"
 
-#: bookwyrm/templates/snippets/status/status_content.html:18
+#: bookwyrm/templates/snippets/status/status_content.html:52
 #: bookwyrm/templates/snippets/trimmed_text.html:15
 msgid "Show more"
 msgstr "Déplier"
 
-#: bookwyrm/templates/snippets/status/status_content.html:25
-#: bookwyrm/templates/snippets/trimmed_text.html:25
+#: bookwyrm/templates/snippets/status/status_content.html:67
+#: bookwyrm/templates/snippets/trimmed_text.html:30
 msgid "Show less"
 msgstr "Replier"
 
-#: bookwyrm/templates/snippets/status/status_content.html:46
+#: bookwyrm/templates/snippets/status/status_content.html:97
 msgid "Open image in new window"
 msgstr "Ouvrir l’image dans une nouvelle fenêtre"
 
-#: bookwyrm/templates/snippets/status/status_header.html:22
+#: bookwyrm/templates/snippets/status/status_header.html:32
 #, python-format
-#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
 msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">review</a>"
 msgstr "a répondu à la <a href=\"%(status_path)s\">critique</a> de <a href=\"%(user_path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/snippets/status/status_header.html:24
+#: bookwyrm/templates/snippets/status/status_header.html:34
 #, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">comment</a>"
 msgstr "a répondu au <a href=\"%(status_path)s\">commentaire</a> de <a href=\"%(user_path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/snippets/status/status_header.html:26
+#: bookwyrm/templates/snippets/status/status_header.html:36
 #, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">quote</a>"
 msgstr "a répondu à la <a href=\"%(status_path)s\">citation</a> de <a href=\"%(user_path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/snippets/status/status_header.html:28
+#: bookwyrm/templates/snippets/status/status_header.html:38
 #, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
 msgstr "a répondu au <a href=\"%(status_path)s\">statut</a> de <a href=\"%(user_path)s\">%(username)s</a>"
 
@@ -2546,7 +2442,6 @@ msgid "More options"
 msgstr "Plus d’options"
 
 #: bookwyrm/templates/snippets/status/status_options.html:27
-#| msgid "Delete these read dates?"
 msgid "Delete & re-draft"
 msgstr "Supprimer & recommencer la rédaction"
 
@@ -2555,12 +2450,10 @@ msgid "Switch to this edition"
 msgstr "Changer vers cette édition"
 
 #: bookwyrm/templates/snippets/table-sort-header.html:6
-#| msgid "Started reading"
 msgid "Sorted ascending"
 msgstr "Trié par ordre croissant"
 
 #: bookwyrm/templates/snippets/table-sort-header.html:10
-#| msgid "Started reading"
 msgid "Sorted descending"
 msgstr "Trié par ordre décroissant"
 
@@ -2579,7 +2472,6 @@ msgstr "Livres tagués « %(tag.name)s »"
 
 #: bookwyrm/templates/user/books_header.html:5
 #, python-format
-#| msgid "%(username)s has no followers"
 msgid "%(username)s's books"
 msgstr "Livres de %(username)s"
 
@@ -2616,13 +2508,8 @@ msgstr "Abonné(e) à"
 msgid "%(username)s isn't following any users"
 msgstr "%(username)s n’est abonné(e) à personne"
 
-#: bookwyrm/templates/user/lists.html:9
-msgid "Your Lists"
-msgstr "Vos listes"
-
 #: bookwyrm/templates/user/lists.html:11
 #, python-format
-#| msgid "Join %(name)s"
 msgid "Lists: %(username)s"
 msgstr "Listes : %(username)s"
 
@@ -2631,7 +2518,6 @@ msgid "Create list"
 msgstr "Créer une liste"
 
 #: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:56
-#| msgid "books"
 msgid "All books"
 msgstr "Tous les livres"
 
@@ -2669,7 +2555,6 @@ msgstr "Modifier le profil"
 
 #: bookwyrm/templates/user/user.html:34
 #, python-format
-#| msgid "See all %(size)s"
 msgid "View all %(size)s"
 msgstr "Voir les %(size)s"
 
@@ -2703,7 +2588,6 @@ msgid "Reading Goal"
 msgstr "Défi lecture"
 
 #: bookwyrm/templates/user/user_layout.html:68
-#| msgid "Book"
 msgid "Books"
 msgstr "Livres"
 
@@ -2714,7 +2598,6 @@ msgstr "Enregistré(e) %(date)s"
 
 #: bookwyrm/templates/user/user_preview.html:15
 #, python-format
-#| msgid "%(username)s has no followers"
 msgid "%(counter)s follower"
 msgid_plural "%(counter)s followers"
 msgstr[0] "%(counter)s abonnement"

From 37e48988b1bfee0e4971af25b6ed02a5f44d97f5 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sat, 10 Apr 2021 00:07:01 +0200
Subject: [PATCH 0759/1285] =?UTF-8?q?Don=E2=80=99t=20use=20linebreak=20in?=
 =?UTF-8?q?=20DTL=20block=20comments.=20(might=20break=20the=20linter=20on?=
 =?UTF-8?q?=20the=20length=20of=20line)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bookwyrm/templates/book/publisher_info.html | 6 ++----
 bookwyrm/templates/snippets/authors.html    | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/templates/book/publisher_info.html b/bookwyrm/templates/book/publisher_info.html
index 8a8f050e..a16332c5 100644
--- a/bookwyrm/templates/book/publisher_info.html
+++ b/bookwyrm/templates/book/publisher_info.html
@@ -6,8 +6,7 @@
     {% with format=book.physical_format pages=book.pages %}
         {% if format %}
             {% comment %}
-                @todo The bookFormat property is limited to a list of values
-                      whereas the book edition is free text.
+                @todo The bookFormat property is limited to a list of values whereas the book edition is free text.
                 @see https://schema.org/bookFormat
             {% endcomment %}
             <meta itemprop="bookFormat" content="{{ format }}">
@@ -49,8 +48,7 @@
         {% endif %}
 
         {% comment %}
-            @todo The publisher property needs to be an Organization or a Person.
-                  We’ll be using Thing which is the more generic ancestor.
+            @todo The publisher property needs to be an Organization or a Person. We’ll be using Thing which is the more generic ancestor.
             @see https://schema.org/Publisher
         {% endcomment %}
         {% if book.publishers %}
diff --git a/bookwyrm/templates/snippets/authors.html b/bookwyrm/templates/snippets/authors.html
index 5470c9f7..9459b0fe 100644
--- a/bookwyrm/templates/snippets/authors.html
+++ b/bookwyrm/templates/snippets/authors.html
@@ -1,7 +1,6 @@
 {% spaceless %}
 {% comment %}
-    @todo The author property needs to be an Organization or a Person. We’ll be
-          using Thing which is the more generic ancestor.
+    @todo The author property needs to be an Organization or a Person. We’ll be using Thing which is the more generic ancestor.
     @see https://schema.org/Author
 {% endcomment %}
 {% for author in book.authors.all %}

From cca7c9a98af224f5999175dc111a9c9b05da73e4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 10 Apr 2021 09:35:03 -0700
Subject: [PATCH 0760/1285] Adds merge migrations

---
 bookwyrm/migrations/0064_merge_20210410_1633.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 bookwyrm/migrations/0064_merge_20210410_1633.py

diff --git a/bookwyrm/migrations/0064_merge_20210410_1633.py b/bookwyrm/migrations/0064_merge_20210410_1633.py
new file mode 100644
index 00000000..77ad541e
--- /dev/null
+++ b/bookwyrm/migrations/0064_merge_20210410_1633.py
@@ -0,0 +1,13 @@
+# Generated by Django 3.1.8 on 2021-04-10 16:33
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0063_auto_20210408_1556"),
+        ("bookwyrm", "0063_auto_20210407_1827"),
+    ]
+
+    operations = []

From c4bca42f642197602fef85f191982bc1c659998d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 10 Apr 2021 09:52:11 -0700
Subject: [PATCH 0761/1285] Adds test for edit view GET request

---
 bookwyrm/tests/views/test_federation.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/bookwyrm/tests/views/test_federation.py b/bookwyrm/tests/views/test_federation.py
index 3783417c..591bb62a 100644
--- a/bookwyrm/tests/views/test_federation.py
+++ b/bookwyrm/tests/views/test_federation.py
@@ -62,3 +62,23 @@ class FederationViews(TestCase):
         view(request, server.id)
         server.refresh_from_db()
         self.assertEqual(server.status, "federated")
+
+    def test_edit_view_get(self):
+        """ there are so many views, this just makes sure it LOADS """
+        # create mode
+        view = views.EditFederatedServer.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+        request.user.is_superuser = True
+
+        result = view(request, server=None)
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+
+        # edit mode
+        server = models.FederatedServer.objects.create(server_name="hi.there.com")
+        result = view(request, server=server.id)
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)

From d076162aa629598caea8324cb5a9118b7e679e66 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 10 Apr 2021 10:09:36 -0700
Subject: [PATCH 0762/1285] Remove edit server mode

It just doesn't really make sense
---
 bookwyrm/templates/settings/edit_server.html  |  4 +-
 .../templates/settings/federated_server.html  |  8 ----
 bookwyrm/templates/settings/federation.html   |  2 +-
 bookwyrm/tests/views/test_federation.py       | 42 +++++++++++++++----
 bookwyrm/urls.py                              | 11 ++---
 bookwyrm/views/__init__.py                    |  2 +-
 bookwyrm/views/federation.py                  | 22 ++++------
 7 files changed, 49 insertions(+), 42 deletions(-)

diff --git a/bookwyrm/templates/settings/edit_server.html b/bookwyrm/templates/settings/edit_server.html
index dc0de7e8..6ae22789 100644
--- a/bookwyrm/templates/settings/edit_server.html
+++ b/bookwyrm/templates/settings/edit_server.html
@@ -3,13 +3,13 @@
 {% block title %}{% trans "Add server" %}{% endblock %}
 
 {% block header %}
-{% if server %}{{ server.server_name }}{% else %}{% trans "Add server" %}{% endif %}
+{% trans "Add server" %}
 <a href="{% url 'settings-federation' %}" class="has-text-weight-normal help">{% trans "Back to server list" %}</a>
 {% endblock %}
 
 {% block panel %}
 
-<form method="POST" action="{% url 'settings-edit-federated-server' server.id %}">
+<form method="POST" action="{% url 'settings-add-federated-server' %}">
     {% csrf_token %}
     <div class="columns">
         <div class="column is-half">
diff --git a/bookwyrm/templates/settings/federated_server.html b/bookwyrm/templates/settings/federated_server.html
index 520ab5dc..37baa4dc 100644
--- a/bookwyrm/templates/settings/federated_server.html
+++ b/bookwyrm/templates/settings/federated_server.html
@@ -11,14 +11,6 @@
 <a href="{% url 'settings-federation' %}" class="has-text-weight-normal help">{% trans "Back to server list" %}</a>
 {% endblock %}
 
-{% block edit-button %}
-<a href="{% url 'settings-edit-federated-server' server.id %}">
-    <span class="icon icon-pencil" title="{% trans 'Edit server' %}">
-        <span class="is-sr-only">{% trans "Edit server" %}</span>
-    </span>
-</a>
-{% endblock %}
-
 {% block panel %}
 <div class="columns">
     <section class="column is-half content">
diff --git a/bookwyrm/templates/settings/federation.html b/bookwyrm/templates/settings/federation.html
index da5ed084..99afb541 100644
--- a/bookwyrm/templates/settings/federation.html
+++ b/bookwyrm/templates/settings/federation.html
@@ -5,7 +5,7 @@
 {% block header %}{% trans "Federated Servers" %}{% endblock %}
 
 {% block edit-button %}
-<a href="{% url 'settings-edit-federated-server' %}">
+<a href="{% url 'settings-add-federated-server' %}">
     <span class="icon icon-plus" title="{% trans 'Add server' %}">
         <span class="is-sr-only">{% trans "Add server" %}</span>
     </span>
diff --git a/bookwyrm/tests/views/test_federation.py b/bookwyrm/tests/views/test_federation.py
index 591bb62a..01504ddb 100644
--- a/bookwyrm/tests/views/test_federation.py
+++ b/bookwyrm/tests/views/test_federation.py
@@ -1,9 +1,10 @@
 """ test for app action functionality """
+from unittest.mock import patch
 from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
 
-from bookwyrm import models, views
+from bookwyrm import forms, models, views
 
 
 class FederationViews(TestCase):
@@ -19,6 +20,16 @@ class FederationViews(TestCase):
             local=True,
             localname="mouse",
         )
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            self.remote_user = models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
         models.SiteSettings.objects.create()
 
     def test_federation_page(self):
@@ -48,6 +59,9 @@ class FederationViews(TestCase):
     def test_server_page_post(self):
         """ block and unblock a server """
         server = models.FederatedServer.objects.create(server_name="hi.there.com")
+        self.remote_user.federated_server = server
+        self.remote_user.save()
+
         self.assertEqual(server.status, "federated")
 
         view = views.FederatedServer.as_view()
@@ -63,10 +77,10 @@ class FederationViews(TestCase):
         server.refresh_from_db()
         self.assertEqual(server.status, "federated")
 
-    def test_edit_view_get(self):
+    def test_add_view_get(self):
         """ there are so many views, this just makes sure it LOADS """
         # create mode
-        view = views.EditFederatedServer.as_view()
+        view = views.AddFederatedServer.as_view()
         request = self.factory.get("")
         request.user = self.local_user
         request.user.is_superuser = True
@@ -76,9 +90,19 @@ class FederationViews(TestCase):
         result.render()
         self.assertEqual(result.status_code, 200)
 
-        # edit mode
-        server = models.FederatedServer.objects.create(server_name="hi.there.com")
-        result = view(request, server=server.id)
-        self.assertIsInstance(result, TemplateResponse)
-        result.render()
-        self.assertEqual(result.status_code, 200)
+    def test_add_view_post_create(self):
+        """ create or edit a server """
+        form = forms.ServerForm()
+        form.data["server_name"] = "remote.server"
+        form.data["software"] = "coolsoft"
+
+        view = views.AddFederatedServer.as_view()
+        request = self.factory.post("", form.data)
+        request.user = self.local_user
+        request.user.is_superuser = True
+
+        view(request, server=None)
+        server = models.FederatedServer.objects.get()
+        self.assertEqual(server.server_name, "remote.server")
+        self.assertEqual(server.software, "coolsoft")
+        self.assertEqual(server.status, "federated")
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 4cf6fd52..398caade 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -69,14 +69,9 @@ urlpatterns = [
         name="settings-federated-server",
     ),
     re_path(
-        r"^settings/federation/edit/?$",
-        views.EditFederatedServer.as_view(),
-        name="settings-edit-federated-server",
-    ),
-    re_path(
-        r"^settings/federation/edit/(?P<server>\d+)?$",
-        views.EditFederatedServer.as_view(),
-        name="settings-edit-federated-server",
+        r"^settings/federation/add/?$",
+        views.AddFederatedServer.as_view(),
+        name="settings-add-federated-server",
     ),
     re_path(
         r"^settings/invites/?$", views.ManageInvites.as_view(), name="settings-invites"
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 404c2f31..de001b31 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -5,7 +5,7 @@ from .block import Block, unblock
 from .books import Book, EditBook, ConfirmEditBook, Editions
 from .books import upload_cover, add_description, switch_edition, resolve_book
 from .directory import Directory
-from .federation import Federation, FederatedServer, EditFederatedServer
+from .federation import Federation, FederatedServer, AddFederatedServer
 from .feed import DirectMessage, Feed, Replies, Status
 from .follow import follow, unfollow
 from .follow import accept_follow_request, delete_follow_request
diff --git a/bookwyrm/views/federation.py b/bookwyrm/views/federation.py
index 83bed32d..e4ade554 100644
--- a/bookwyrm/views/federation.py
+++ b/bookwyrm/views/federation.py
@@ -30,8 +30,9 @@ class Federation(View):
 
         sort = request.GET.get("sort")
         sort_fields = ["created_date", "application_type", "server_name"]
-        if sort in sort_fields + ["-{:s}".format(f) for f in sort_fields]:
-            servers = servers.order_by(sort)
+        if not sort in sort_fields + ["-{:s}".format(f) for f in sort_fields]:
+            sort = "created_date"
+        servers = servers.order_by(sort)
 
         paginated = Paginator(servers, PAGE_LENGTH)
 
@@ -43,24 +44,19 @@ class Federation(View):
         return TemplateResponse(request, "settings/federation.html", data)
 
 
-class EditFederatedServer(View):
+class AddFederatedServer(View):
     """ manually add a server """
 
-    def get(self, request, server=None):
+    def get(self, request):
         """ add server form """
-        if server:
-            server = get_object_or_404(models.FederatedServer, id=server)
-        data = {"form": forms.ServerForm(instance=server), "server": server}
+        data = {"form": forms.ServerForm()}
         return TemplateResponse(request, "settings/edit_server.html", data)
 
-    def post(self, request, server=None):
+    def post(self, request):
         """ add a server from the admin panel """
-        if server:
-            server = get_object_or_404(models.FederatedServer, id=server)
-
-        form = forms.ServerForm(request.POST, instance=server)
+        form = forms.ServerForm(request.POST)
         if not form.is_valid():
-            data = {"form": form, "server": server}
+            data = {"form": form}
             return TemplateResponse(request, "settings/edit_server.html", data)
         server = form.save()
         return redirect("settings-federated-server", server.id)

From 81bc25b01281e1678689c3373fdd0ea51b3b75c6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 10 Apr 2021 10:24:09 -0700
Subject: [PATCH 0763/1285] Fixes create test

---
 bookwyrm/tests/views/test_federation.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/tests/views/test_federation.py b/bookwyrm/tests/views/test_federation.py
index 01504ddb..53e5b10f 100644
--- a/bookwyrm/tests/views/test_federation.py
+++ b/bookwyrm/tests/views/test_federation.py
@@ -85,24 +85,25 @@ class FederationViews(TestCase):
         request.user = self.local_user
         request.user.is_superuser = True
 
-        result = view(request, server=None)
+        result = view(request)
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
 
     def test_add_view_post_create(self):
-        """ create or edit a server """
+        """ create a server entry """
         form = forms.ServerForm()
         form.data["server_name"] = "remote.server"
-        form.data["software"] = "coolsoft"
+        form.data["application_type"] = "coolsoft"
+        form.data["status"] = "blocked"
 
         view = views.AddFederatedServer.as_view()
         request = self.factory.post("", form.data)
         request.user = self.local_user
         request.user.is_superuser = True
 
-        view(request, server=None)
+        view(request)
         server = models.FederatedServer.objects.get()
         self.assertEqual(server.server_name, "remote.server")
-        self.assertEqual(server.software, "coolsoft")
-        self.assertEqual(server.status, "federated")
+        self.assertEqual(server.application_type, "coolsoft")
+        self.assertEqual(server.status, "blocked")

From 2741aa55be3084e78af5a934fa823fed8fbd38c8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 10 Apr 2021 10:37:28 -0700
Subject: [PATCH 0764/1285] Makes blocking it's own view

---
 bookwyrm/models/federated_server.py               | 11 +++++++++++
 bookwyrm/templates/settings/federated_server.html | 10 +++++++---
 bookwyrm/views/federation.py                      | 12 ++----------
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/bookwyrm/models/federated_server.py b/bookwyrm/models/federated_server.py
index ea9920a0..7283cdd8 100644
--- a/bookwyrm/models/federated_server.py
+++ b/bookwyrm/models/federated_server.py
@@ -27,3 +27,14 @@ class FederatedServer(BookWyrmModel):
         """ block a server """
         self.status = "blocked"
         self.save()
+
+        # deactivate all associated users
+        self.user_set.update(is_active=False)
+
+    def unblock(self):
+        """ unblock a server """
+        self.status = "federated"
+        self.save()
+
+        # TODO: only reactivate users as appropriate
+        self.user_set.update(is_active=True)
diff --git a/bookwyrm/templates/settings/federated_server.html b/bookwyrm/templates/settings/federated_server.html
index 37baa4dc..31e0ffb9 100644
--- a/bookwyrm/templates/settings/federated_server.html
+++ b/bookwyrm/templates/settings/federated_server.html
@@ -77,16 +77,20 @@
 
 <section class="block content">
     <h2 class="title is-4">{% trans "Actions" %}</h2>
+    {% if server.status != 'blocked' %}
     <form class="block" method="post" action="{% url 'settings-federated-server' server.id %}">
         {% csrf_token %}
-        {% if server.status != 'blocked' %}
         <button class="button is-danger">{% trans "Block" %}</button>
         <p class="help">{% trans "All users from this instance will be deactivated." %}</p>
-        {% else %}
+    </form>
+    {% else %}
+    {% comment %}
+    <form class="block" method="post" action="{% url 'settings-federated-server-unblock' server.id %}">
         <button class="button">{% trans "Un-block" %}</button>
         <p class="help">{% trans "All users from this instance will be re-activated." %}</p>
-        {% endif %}
     </form>
+    {% endcomment %}
+    {% endif %}
 </section>
 
 {% endblock %}
diff --git a/bookwyrm/views/federation.py b/bookwyrm/views/federation.py
index e4ade554..067fa0d7 100644
--- a/bookwyrm/views/federation.py
+++ b/bookwyrm/views/federation.py
@@ -87,15 +87,7 @@ class FederatedServer(View):
         return TemplateResponse(request, "settings/federated_server.html", data)
 
     def post(self, request, server):  # pylint: disable=unused-argument
-        """ (un)block a server """
+        """ block a server """
         server = get_object_or_404(models.FederatedServer, id=server)
-        server.status = "blocked" if server.status == "federated" else "federated"
-        server.save()
-
-        # TODO: there needs to be differentiation between types of deactivated users
-        if server.status == "blocked":
-            server.user_set.update(is_active=False)
-        else:
-            server.user_set.update(is_active=True)
-
+        server.block()
         return redirect("settings-federated-server", server.id)

From e016006ade7c5d0a335a2e6a34961142e61fbcda Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sat, 10 Apr 2021 19:50:36 +0200
Subject: [PATCH 0765/1285] [css] Rename all classes consistently: :shamed:

This commit addresses https://github.com/mouse-reeve/bookwyrm/pull/883#pullrequestreview-632930445.
---
 bookwyrm/static/css/bookwyrm.css | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index c7451a3f..e4bca203 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -49,8 +49,8 @@ html {
     display: none;
 }
 
-.hidden.transition-y,
-.hidden.transition-x {
+.transition-x.is-hidden,
+.transition-y.is-hidden {
     display: block !important;
     visibility: hidden !important;
     height: 0;
@@ -59,16 +59,18 @@ html {
     padding: 0;
 }
 
+.transition-x,
 .transition-y {
-    transition-property: height, margin-top, margin-bottom, padding-top, padding-bottom;
     transition-duration: 0.5s;
     transition-timing-function: ease;
 }
 
 .transition-x {
     transition-property: width, margin-left, margin-right, padding-left, padding-right;
-    transition-duration: 0.5s;
-    transition-timing-function: ease;
+}
+
+.transition-y {
+    transition-property: height, margin-top, margin-bottom, padding-top, padding-bottom;
 }
 
 @media (prefers-reduced-motion: reduce) {

From 7b60626661b24e527f360931ab19bd39638f671d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 10 Apr 2021 10:51:45 -0700
Subject: [PATCH 0766/1285] Updates block unit test

---
 bookwyrm/tests/views/test_federation.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/tests/views/test_federation.py b/bookwyrm/tests/views/test_federation.py
index 53e5b10f..38da37d3 100644
--- a/bookwyrm/tests/views/test_federation.py
+++ b/bookwyrm/tests/views/test_federation.py
@@ -57,7 +57,7 @@ class FederationViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_server_page_post(self):
-        """ block and unblock a server """
+        """ block a server """
         server = models.FederatedServer.objects.create(server_name="hi.there.com")
         self.remote_user.federated_server = server
         self.remote_user.save()
@@ -71,11 +71,10 @@ class FederationViews(TestCase):
 
         view(request, server.id)
         server.refresh_from_db()
+        self.remote_user.refresh_from_db()
         self.assertEqual(server.status, "blocked")
-
-        view(request, server.id)
-        server.refresh_from_db()
-        self.assertEqual(server.status, "federated")
+        # and the user was deactivated
+        self.assertFalse(self.remote_user.is_active)
 
     def test_add_view_get(self):
         """ there are so many views, this just makes sure it LOADS """

From d5fbdacc0243db94e87bc0fb4dd5f7435e6dc118 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 10 Apr 2021 11:06:28 -0700
Subject: [PATCH 0767/1285] Adds unblock view

---
 .../templates/settings/federated_server.html  |  3 +--
 bookwyrm/tests/views/test_federation.py       | 23 ++++++++++++++++++-
 bookwyrm/urls.py                              |  5 ++++
 bookwyrm/views/__init__.py                    |  2 +-
 bookwyrm/views/federation.py                  | 12 ++++++++++
 5 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/settings/federated_server.html b/bookwyrm/templates/settings/federated_server.html
index 31e0ffb9..249d7106 100644
--- a/bookwyrm/templates/settings/federated_server.html
+++ b/bookwyrm/templates/settings/federated_server.html
@@ -84,12 +84,11 @@
         <p class="help">{% trans "All users from this instance will be deactivated." %}</p>
     </form>
     {% else %}
-    {% comment %}
     <form class="block" method="post" action="{% url 'settings-federated-server-unblock' server.id %}">
+        {% csrf_token %}
         <button class="button">{% trans "Un-block" %}</button>
         <p class="help">{% trans "All users from this instance will be re-activated." %}</p>
     </form>
-    {% endcomment %}
     {% endif %}
 </section>
 
diff --git a/bookwyrm/tests/views/test_federation.py b/bookwyrm/tests/views/test_federation.py
index 38da37d3..fdafcad0 100644
--- a/bookwyrm/tests/views/test_federation.py
+++ b/bookwyrm/tests/views/test_federation.py
@@ -56,7 +56,7 @@ class FederationViews(TestCase):
         result.render()
         self.assertEqual(result.status_code, 200)
 
-    def test_server_page_post(self):
+    def test_server_page_block(self):
         """ block a server """
         server = models.FederatedServer.objects.create(server_name="hi.there.com")
         self.remote_user.federated_server = server
@@ -76,6 +76,27 @@ class FederationViews(TestCase):
         # and the user was deactivated
         self.assertFalse(self.remote_user.is_active)
 
+    def test_server_page_unblock(self):
+        """ unblock a server """
+        server = models.FederatedServer.objects.create(
+            server_name="hi.there.com", status="blocked"
+        )
+        self.remote_user.federated_server = server
+        self.remote_user.is_active = False
+        self.remote_user.save()
+
+        request = self.factory.post("")
+        request.user = self.local_user
+        request.user.is_superuser = True
+
+        views.federation.unblock_server(request, server.id)
+        server.refresh_from_db()
+        self.remote_user.refresh_from_db()
+        self.assertEqual(server.status, "federated")
+        # and the user was re-activated
+        self.assertTrue(self.remote_user.is_active)
+
+
     def test_add_view_get(self):
         """ there are so many views, this just makes sure it LOADS """
         # create mode
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 398caade..f2d43a13 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -68,6 +68,11 @@ urlpatterns = [
         views.FederatedServer.as_view(),
         name="settings-federated-server",
     ),
+    re_path(
+        r"^settings/federation/(?P<server>\d+)/unblock?$",
+        views.federation.unblock_server,
+        name="settings-federated-server-unblock",
+    ),
     re_path(
         r"^settings/federation/add/?$",
         views.AddFederatedServer.as_view(),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index de001b31..2dc7a1c6 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -5,7 +5,7 @@ from .block import Block, unblock
 from .books import Book, EditBook, ConfirmEditBook, Editions
 from .books import upload_cover, add_description, switch_edition, resolve_book
 from .directory import Directory
-from .federation import Federation, FederatedServer, AddFederatedServer
+from .federation import Federation, FederatedServer, AddFederatedServer, unblock_server
 from .feed import DirectMessage, Feed, Replies, Status
 from .follow import follow, unfollow
 from .follow import accept_follow_request, delete_follow_request
diff --git a/bookwyrm/views/federation.py b/bookwyrm/views/federation.py
index 067fa0d7..8a21c5a5 100644
--- a/bookwyrm/views/federation.py
+++ b/bookwyrm/views/federation.py
@@ -5,6 +5,7 @@ from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
+from django.views.decorators.http import require_POST
 
 from bookwyrm import forms, models
 from bookwyrm.settings import PAGE_LENGTH
@@ -91,3 +92,14 @@ class FederatedServer(View):
         server = get_object_or_404(models.FederatedServer, id=server)
         server.block()
         return redirect("settings-federated-server", server.id)
+
+
+@login_required
+@require_POST
+@permission_required("bookwyrm.control_federation", raise_exception=True)
+# pylint: disable=unused-argument
+def unblock_server(request, server):
+    """ unblock a server """
+    server = get_object_or_404(models.FederatedServer, id=server)
+    server.unblock()
+    return redirect("settings-federated-server", server.id)

From 8797b3d240fef9fa9431a96a51d269c20c7c1f5a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 10 Apr 2021 11:07:59 -0700
Subject: [PATCH 0768/1285] Python formatting

---
 bookwyrm/tests/views/test_federation.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bookwyrm/tests/views/test_federation.py b/bookwyrm/tests/views/test_federation.py
index fdafcad0..1ba18143 100644
--- a/bookwyrm/tests/views/test_federation.py
+++ b/bookwyrm/tests/views/test_federation.py
@@ -96,7 +96,6 @@ class FederationViews(TestCase):
         # and the user was re-activated
         self.assertTrue(self.remote_user.is_active)
 
-
     def test_add_view_get(self):
         """ there are so many views, this just makes sure it LOADS """
         # create mode

From 0caeb3ac3366e9acc4f480f725ff69ae72ba6303 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 10 Apr 2021 11:18:22 -0700
Subject: [PATCH 0769/1285] fixes inbox tests

---
 bookwyrm/tests/views/inbox/test_inbox.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/tests/views/inbox/test_inbox.py b/bookwyrm/tests/views/inbox/test_inbox.py
index deba6e69..50fb1ecc 100644
--- a/bookwyrm/tests/views/inbox/test_inbox.py
+++ b/bookwyrm/tests/views/inbox/test_inbox.py
@@ -6,7 +6,7 @@ from django.http import HttpResponseNotAllowed, HttpResponseNotFound
 from django.test import TestCase, Client
 from django.test.client import RequestFactory
 
-from bookwyrm import models
+from bookwyrm import models, views
 
 
 # pylint: disable=too-many-public-methods

From 1903812b1daa611a4475228aa10a7a4eae5e8d39 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 10 Apr 2021 11:38:57 -0700
Subject: [PATCH 0770/1285] Class method for checking if urls are blocked

---
 bookwyrm/connectors/abstract_connector.py |  6 ++++++
 bookwyrm/models/federated_server.py       |  8 ++++++++
 bookwyrm/views/inbox.py                   | 18 +++---------------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index 2483cc62..2fe5d825 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -219,6 +219,12 @@ def dict_from_mappings(data, mappings):
 
 def get_data(url, params=None):
     """ wrapper for request.get """
+    # check if the url is blocked
+    if models.FederatedServer.is_blocked(url):
+        raise ConnectorException(
+            "Attempting to load data from blocked url: {:s}".format(url)
+        )
+
     try:
         resp = requests.get(
             url,
diff --git a/bookwyrm/models/federated_server.py b/bookwyrm/models/federated_server.py
index 7283cdd8..d2b82355 100644
--- a/bookwyrm/models/federated_server.py
+++ b/bookwyrm/models/federated_server.py
@@ -1,4 +1,5 @@
 """ connections to external ActivityPub servers """
+from urllib.parse import urlparse
 from django.db import models
 from .base_model import BookWyrmModel
 
@@ -38,3 +39,10 @@ class FederatedServer(BookWyrmModel):
 
         # TODO: only reactivate users as appropriate
         self.user_set.update(is_active=True)
+
+    @classmethod
+    def is_blocked(cls, url):
+        """ look up if a domain is blocked """
+        url = urlparse(url)
+        domain = url.netloc
+        return cls.objects.filter(server_name=domain, status="blocked").exists()
diff --git a/bookwyrm/views/inbox.py b/bookwyrm/views/inbox.py
index 7997bd5c..99f9c556 100644
--- a/bookwyrm/views/inbox.py
+++ b/bookwyrm/views/inbox.py
@@ -1,7 +1,7 @@
 """ incoming activities """
 import json
 import re
-from urllib.parse import urldefrag, urlparse
+from urllib.parse import urldefrag
 
 from django.http import HttpResponse, HttpResponseNotFound
 from django.http import HttpResponseBadRequest, HttpResponseForbidden
@@ -71,11 +71,7 @@ def is_blocked_user_agent(request):
     if not user_agent:
         return False
     url = re.search(r"https?://{:s}/?".format(regex.domain), user_agent).group()
-    domain = urlparse(url).netloc
-    if not domain:
-        # idk, we'll try again later with the actor
-        return False
-    return is_blocked(domain)
+    return models.FederatedServer.is_blocked(url)
 
 
 def is_blocked_activity(activity_json):
@@ -84,15 +80,7 @@ def is_blocked_activity(activity_json):
     if not actor:
         # well I guess it's not even a valid activity so who knows
         return False
-    url = urlparse(actor)
-    return is_blocked(url.netloc)
-
-
-def is_blocked(domain):
-    """ is this domain blocked? """
-    return models.FederatedServer.objects.filter(
-        server_name=domain, status="blocked"
-    ).exists()
+    return models.FederatedServer.is_blocked(actor)
 
 
 @app.task

From 89d3c3e82b86a47709c0bf669695ed0ff82ba3ab Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 10 Apr 2021 11:49:45 -0700
Subject: [PATCH 0771/1285] Tests searching for users on blocked servers

---
 bookwyrm/tests/views/test_helpers.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py
index 7d2bc42c..27d03832 100644
--- a/bookwyrm/tests/views/test_helpers.py
+++ b/bookwyrm/tests/views/test_helpers.py
@@ -146,6 +146,15 @@ class ViewsHelpers(TestCase):
             self.assertIsInstance(result, models.User)
             self.assertEqual(result.username, "mouse@example.com")
 
+    def test_user_on_blocked_server(self, _):
+        """ find a remote user using webfinger """
+        models.FederatedServer.objects.create(
+            server_name="example.com", status="blocked"
+        )
+
+        result = views.helpers.handle_remote_webfinger("@mouse@example.com")
+        self.assertIsNone(result)
+
     def test_handle_reading_status_to_read(self, _):
         """ posts shelve activities """
         shelf = self.local_user.shelf_set.get(identifier="to-read")

From fea298a1de5977cf9895f3bf73b5ba204cd85230 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 10 Apr 2021 16:08:10 -0700
Subject: [PATCH 0772/1285] Run tests in verbose mode

---
 .github/workflows/django-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/django-tests.yml b/.github/workflows/django-tests.yml
index 3ce368ec..ab0b0cdb 100644
--- a/.github/workflows/django-tests.yml
+++ b/.github/workflows/django-tests.yml
@@ -65,4 +65,4 @@ jobs:
         EMAIL_HOST_PASSWORD: ""
         EMAIL_USE_TLS: true
       run: |
-        python manage.py test
+        python manage.py test -v 2

From b2939014172800d030621868805b5c5b907430c6 Mon Sep 17 00:00:00 2001
From: n2no1 <7995366-n2no1@users.noreply.gitlab.com>
Date: Sat, 10 Apr 2021 20:18:57 -0400
Subject: [PATCH 0773/1285] add regression tests for published dates not being
 saved

closes #894
---
 bookwyrm/tests/views/test_book.py | 33 +++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index ade6131d..a0fa0367 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -47,6 +47,39 @@ class BookViews(TestCase):
         )
         models.SiteSettings.objects.create()
 
+    def test_date_regression(self):
+        """ensure that creating a new book actually saves the published date fields
+
+        this was initially a regression due to using a custom date picker tag
+        """
+        first_published_date = "2021-04-20"
+        published_date = "2022-04-20"
+        self.local_user.groups.add(self.group)
+        view = views.EditBook.as_view()
+        form = forms.EditionForm(
+            {
+                "title": "New Title",
+                "last_edited_by": self.local_user.id,
+                "first_published_date": first_published_date,
+                "published_date": published_date,
+            }
+        )
+        request = self.factory.post("", form.data)
+        request.user = self.local_user
+
+        with patch("bookwyrm.connectors.connector_manager.local_search"):
+            result = view(request)
+        result.render()
+
+        self.assertContains(
+            result,
+            f'<input type="date" name="first_published_date" class="input" id="id_first_published_date" value="{first_published_date}">',
+        )
+        self.assertContains(
+            result,
+            f'<input type="date" name="published_date" class="input" id="id_published_date" value="{published_date}">',
+        )
+
     def test_book_page(self):
         """ there are so many views, this just makes sure it LOADS """
         view = views.Book.as_view()

From 98ff66cd16daa440d5b6b88b30a9b7d9e1b42d22 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 10 Apr 2021 18:15:13 -0700
Subject: [PATCH 0774/1285] Don't broadcast curation rejects

---
 bookwyrm/models/activitypub_mixin.py | 4 ++--
 bookwyrm/views/list.py               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index 714dc485..d0ab829d 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -386,11 +386,11 @@ class CollectionItemMixin(ActivitypubMixin):
         activity = self.to_add_activity(self.user)
         self.broadcast(activity, self.user)
 
-    def delete(self, *args, **kwargs):
+    def delete(self, *args, broadcast=True, **kwargs):
         """ broadcast a remove activity """
         activity = self.to_remove_activity(self.user)
         super().delete(*args, **kwargs)
-        if self.user.local:
+        if self.user.local and broadcast:
             self.broadcast(activity, self.user)
 
     def to_add_activity(self, user):
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index 7724cd13..adf9840d 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -168,7 +168,7 @@ class Curate(View):
             suggestion.approved = True
             suggestion.save()
         else:
-            suggestion.delete()
+            suggestion.delete(broadcast=False)
         return redirect("list-curate", book_list.id)
 
 

From fc0992ea7cf2f134fb2099f0f386b9edadc784e9 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sun, 11 Apr 2021 14:41:14 +0200
Subject: [PATCH 0775/1285] Use URL on Mastodon profiles in list of instances.

The links to the Mastodon profiles currently default to `mailto:` when parsed by Markdown.
---
 instances.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/instances.md b/instances.md
index 570328b5..91d21f5a 100644
--- a/instances.md
+++ b/instances.md
@@ -1,5 +1,5 @@
 
 | 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 | � | 
+| bookwyrm.social | http://bookwyrm.social/ | mousereeve@riseup.net / [@tripofmice@friend.camp](https://friend.camp/@tripofmice) | � |
+| wyrms.de | https://wyrms.de/ | wyrms@tofuwabo.hu / [@tofuwabohu@subversive.zone](https://subversive.zone/@tofuwabohu) | � | 

From 6d76782ee188e5d3b89ef9ffb469941d519a3ec2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 11 Apr 2021 09:00:44 -0700
Subject: [PATCH 0776/1285] Mocks list item remove test

---
 bookwyrm/tests/views/test_list.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/tests/views/test_list.py b/bookwyrm/tests/views/test_list.py
index 0a851bf0..d669307c 100644
--- a/bookwyrm/tests/views/test_list.py
+++ b/bookwyrm/tests/views/test_list.py
@@ -369,7 +369,8 @@ class ListViews(TestCase):
         )
         request.user = self.local_user
 
-        views.list.remove_book(request, self.list.id)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            views.list.remove_book(request, self.list.id)
         self.assertFalse(self.list.listitem_set.exists())
 
     def test_remove_book_unauthorized(self):

From 26f16cf5a46680a52cea9d6e615312572223ea2f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 11 Apr 2021 09:09:13 -0700
Subject: [PATCH 0777/1285] Limit broadcast with viewer-aware users

Removes inactive or blocked users
---
 bookwyrm/models/activitypub_mixin.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index 8dce42e4..efe14f97 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -64,6 +64,7 @@ class ActivitypubMixin:
         )
         if hasattr(self, "property_fields"):
             self.activity_fields += [
+                # pylint: disable=cell-var-from-loop
                 PropertyField(lambda a, o: set_activity_from_property_field(a, o, f))
                 for f in self.property_fields
             ]
@@ -152,7 +153,7 @@ class ActivitypubMixin:
         # unless it's a dm, all the followers should receive the activity
         if privacy != "direct":
             # we will send this out to a subset of all remote users
-            queryset = user_model.objects.filter(
+            queryset = user_model.viewer_aware_objects(user).filter(
                 local=False,
             )
             # filter users first by whether they're using the desired software

From b6a7871b045c5592c5ed48286ed8a12f9e5c20fa Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 11 Apr 2021 09:26:12 -0700
Subject: [PATCH 0778/1285] Makes visibility evaluator a model function

---
 bookwyrm/models/activitypub_mixin.py          | 30 ++++++++++
 .../tests/models/test_activitypub_mixin.py    | 60 +++++++++++++++++++
 bookwyrm/tests/views/test_helpers.py          | 60 -------------------
 bookwyrm/views/feed.py                        |  4 +-
 bookwyrm/views/goal.py                        |  4 +-
 bookwyrm/views/helpers.py                     | 24 --------
 bookwyrm/views/list.py                        |  6 +-
 bookwyrm/views/shelf.py                       |  4 +-
 bookwyrm/views/user.py                        |  4 +-
 9 files changed, 101 insertions(+), 95 deletions(-)

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index efe14f97..2a5878d5 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -83,6 +83,36 @@ class ActivitypubMixin:
 
         super().__init__(*args, **kwargs)
 
+    def visible_to_user(self, viewer):
+        """ is a user authorized to view an object? """
+        # make sure this is an object with privacy owned by a user
+        if not hasattr(self, "user") or not hasattr(self, "privacy"):
+            return None
+
+        # viewer can't see it if the object's owner blocked them
+        if viewer in self.user.blocks.all():
+            return False
+
+        # you can see your own posts and any public or unlisted posts
+        if viewer == self.user or self.privacy in ["public", "unlisted"]:
+            return True
+
+        # you can see the followers only posts of people you follow
+        if (
+            self.privacy == "followers"
+            and self.user.followers.filter(id=viewer.id).first()
+        ):
+            return True
+
+        # you can see dms you are tagged in
+        if hasattr(self, "mention_users"):
+            if (
+                self.privacy == "direct"
+                and self.mention_users.filter(id=viewer.id).first()
+            ):
+                return True
+        return False
+
     @classmethod
     def find_existing_by_remote_id(cls, remote_id):
         """ look up a remote id in the db """
diff --git a/bookwyrm/tests/models/test_activitypub_mixin.py b/bookwyrm/tests/models/test_activitypub_mixin.py
index 0d1acd97..4e4e9c9f 100644
--- a/bookwyrm/tests/models/test_activitypub_mixin.py
+++ b/bookwyrm/tests/models/test_activitypub_mixin.py
@@ -44,6 +44,66 @@ class ActivitypubMixins(TestCase):
             "published": "2020-12-04T17:52:22.623807+00:00",
         }
 
+    def test_object_visible_to_user(self, _):
+        """ does a user have permission to view an object """
+        obj = models.Status.objects.create(
+            content="hi", user=self.remote_user, privacy="public"
+        )
+        self.assertTrue(obj.visible_to_user(self.local_user))
+
+        obj = models.Shelf.objects.create(
+            name="test", user=self.remote_user, privacy="unlisted"
+        )
+        self.assertTrue(obj.visible_to_user(self.local_user))
+
+        obj = models.Status.objects.create(
+            content="hi", user=self.remote_user, privacy="followers"
+        )
+        self.assertFalse(obj.visible_to_user(self.local_user))
+
+        obj = models.Status.objects.create(
+            content="hi", user=self.remote_user, privacy="direct"
+        )
+        self.assertFalse(obj.visible_to_user(self.local_user))
+
+        obj = models.Status.objects.create(
+            content="hi", user=self.remote_user, privacy="direct"
+        )
+        obj.mention_users.add(self.local_user)
+        self.assertTrue(obj.visible_to_user(self.local_user))
+
+    def test_object_visible_to_user_follower(self, _):
+        """ what you can see if you follow a user """
+        self.remote_user.followers.add(self.local_user)
+        obj = models.Status.objects.create(
+            content="hi", user=self.remote_user, privacy="followers"
+        )
+        self.assertTrue(obj.visible_to_user(self.local_user))
+
+        obj = models.Status.objects.create(
+            content="hi", user=self.remote_user, privacy="direct"
+        )
+        self.assertFalse(obj.visible_to_user(self.local_user))
+
+        obj = models.Status.objects.create(
+            content="hi", user=self.remote_user, privacy="direct"
+        )
+        obj.mention_users.add(self.local_user)
+        self.assertTrue(obj.visible_to_user(self.local_user))
+
+    def test_object_visible_to_user_blocked(self, _):
+        """ you can't see it if they block you """
+        self.remote_user.blocks.add(self.local_user)
+        obj = models.Status.objects.create(
+            content="hi", user=self.remote_user, privacy="public"
+        )
+        self.assertFalse(obj.visible_to_user(self.local_user))
+
+        obj = models.Shelf.objects.create(
+            name="test", user=self.remote_user, privacy="unlisted"
+        )
+        self.assertFalse(obj.visible_to_user(self.local_user))
+
     # ActivitypubMixin
     def test_to_activity(self, _):
         """ model to ActivityPub json """
diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py
index 27d03832..2e5ed82d 100644
--- a/bookwyrm/tests/views/test_helpers.py
+++ b/bookwyrm/tests/views/test_helpers.py
@@ -199,66 +199,6 @@ class ViewsHelpers(TestCase):
             )
         self.assertFalse(models.GeneratedNote.objects.exists())
 
-    def test_object_visible_to_user(self, _):
-        """ does a user have permission to view an object """
-        obj = models.Status.objects.create(
-            content="hi", user=self.remote_user, privacy="public"
-        )
-        self.assertTrue(views.helpers.object_visible_to_user(self.local_user, obj))
-
-        obj = models.Shelf.objects.create(
-            name="test", user=self.remote_user, privacy="unlisted"
-        )
-        self.assertTrue(views.helpers.object_visible_to_user(self.local_user, obj))
-
-        obj = models.Status.objects.create(
-            content="hi", user=self.remote_user, privacy="followers"
-        )
-        self.assertFalse(views.helpers.object_visible_to_user(self.local_user, obj))
-
-        obj = models.Status.objects.create(
-            content="hi", user=self.remote_user, privacy="direct"
-        )
-        self.assertFalse(views.helpers.object_visible_to_user(self.local_user, obj))
-
-        obj = models.Status.objects.create(
-            content="hi", user=self.remote_user, privacy="direct"
-        )
-        obj.mention_users.add(self.local_user)
-        self.assertTrue(views.helpers.object_visible_to_user(self.local_user, obj))
-
-    def test_object_visible_to_user_follower(self, _):
-        """ what you can see if you follow a user """
-        self.remote_user.followers.add(self.local_user)
-        obj = models.Status.objects.create(
-            content="hi", user=self.remote_user, privacy="followers"
-        )
-        self.assertTrue(views.helpers.object_visible_to_user(self.local_user, obj))
-
-        obj = models.Status.objects.create(
-            content="hi", user=self.remote_user, privacy="direct"
-        )
-        self.assertFalse(views.helpers.object_visible_to_user(self.local_user, obj))
-
-        obj = models.Status.objects.create(
-            content="hi", user=self.remote_user, privacy="direct"
-        )
-        obj.mention_users.add(self.local_user)
-        self.assertTrue(views.helpers.object_visible_to_user(self.local_user, obj))
-
-    def test_object_visible_to_user_blocked(self, _):
-        """ you can't see it if they block you """
-        self.remote_user.blocks.add(self.local_user)
-        obj = models.Status.objects.create(
-            content="hi", user=self.remote_user, privacy="public"
-        )
-        self.assertFalse(views.helpers.object_visible_to_user(self.local_user, obj))
-
-        obj = models.Shelf.objects.create(
-            name="test", user=self.remote_user, privacy="unlisted"
-        )
-        self.assertFalse(views.helpers.object_visible_to_user(self.local_user, obj))
-
     def test_get_annotated_users(self, _):
         """ list of people you might know """
         user_1 = models.User.objects.create_user(
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index cda11586..d5e64434 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -12,7 +12,7 @@ from bookwyrm import activitystreams, forms, models
 from bookwyrm.activitypub import ActivitypubResponse
 from bookwyrm.settings import PAGE_LENGTH, STREAMS
 from .helpers import get_user_from_username, privacy_filter, get_suggested_users
-from .helpers import is_api_request, is_bookwyrm_request, object_visible_to_user
+from .helpers import is_api_request, is_bookwyrm_request
 
 
 # pylint: disable= no-self-use
@@ -113,7 +113,7 @@ class Status(View):
             return HttpResponseNotFound()
 
         # make sure the user is authorized to see the status
-        if not object_visible_to_user(request.user, status):
+        if not status.visible_to_user(request.user):
             return HttpResponseNotFound()
 
         if is_api_request(request):
diff --git a/bookwyrm/views/goal.py b/bookwyrm/views/goal.py
index 9c4e117c..1627d3da 100644
--- a/bookwyrm/views/goal.py
+++ b/bookwyrm/views/goal.py
@@ -10,7 +10,7 @@ from django.views.decorators.http import require_POST
 
 from bookwyrm import forms, models
 from bookwyrm.status import create_generated_note
-from .helpers import get_user_from_username, object_visible_to_user
+from .helpers import get_user_from_username
 
 
 # pylint: disable= no-self-use
@@ -26,7 +26,7 @@ class Goal(View):
         if not goal and user != request.user:
             return HttpResponseNotFound()
 
-        if goal and not object_visible_to_user(request.user, goal):
+        if goal and not goal.visible_to_user(request.user):
             return HttpResponseNotFound()
 
         data = {
diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index 2b6501ff..57c33437 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -32,30 +32,6 @@ def is_bookwyrm_request(request):
     return True
 
 
-def object_visible_to_user(viewer, obj):
-    """ is a user authorized to view an object? """
-    if not obj:
-        return False
-
-    # viewer can't see it if the object's owner blocked them
-    if viewer in obj.user.blocks.all():
-        return False
-
-    # you can see your own posts and any public or unlisted posts
-    if viewer == obj.user or obj.privacy in ["public", "unlisted"]:
-        return True
-
-    # you can see the followers only posts of people you follow
-    if obj.privacy == "followers" and obj.user.followers.filter(id=viewer.id).first():
-        return True
-
-    # you can see dms you are tagged in
-    if isinstance(obj, models.Status):
-        if obj.privacy == "direct" and obj.mention_users.filter(id=viewer.id).first():
-            return True
-    return False
-
-
 def privacy_filter(viewer, queryset, privacy_levels=None, following_only=False):
     """ filter objects that have "user" and "privacy" fields """
     privacy_levels = privacy_levels or ["public", "unlisted", "followers", "direct"]
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index 7724cd13..cafc40b1 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -13,7 +13,7 @@ from django.views.decorators.http import require_POST
 from bookwyrm import forms, models
 from bookwyrm.activitypub import ActivitypubResponse
 from bookwyrm.connectors import connector_manager
-from .helpers import is_api_request, object_visible_to_user, privacy_filter
+from .helpers import is_api_request, privacy_filter
 from .helpers import get_user_from_username
 
 # pylint: disable=no-self-use
@@ -92,7 +92,7 @@ class List(View):
     def get(self, request, list_id):
         """ display a book list """
         book_list = get_object_or_404(models.List, id=list_id)
-        if not object_visible_to_user(request.user, book_list):
+        if not book_list.visible_to_user(request.user):
             return HttpResponseNotFound()
 
         if is_api_request(request):
@@ -176,7 +176,7 @@ class Curate(View):
 def add_book(request):
     """ put a book on a list """
     book_list = get_object_or_404(models.List, id=request.POST.get("list"))
-    if not object_visible_to_user(request.user, book_list):
+    if not book_list.visible_to_user(request.user):
         return HttpResponseNotFound()
 
     book = get_object_or_404(models.Edition, id=request.POST.get("book"))
diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index 41d1f135..88899949 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -16,7 +16,7 @@ from bookwyrm import forms, models
 from bookwyrm.activitypub import ActivitypubResponse
 from bookwyrm.settings import PAGE_LENGTH
 from .helpers import is_api_request, get_edition, get_user_from_username
-from .helpers import handle_reading_status, privacy_filter, object_visible_to_user
+from .helpers import handle_reading_status, privacy_filter
 
 
 # pylint: disable= no-self-use
@@ -43,7 +43,7 @@ class Shelf(View):
                 shelf = user.shelf_set.get(identifier=shelf_identifier)
             except models.Shelf.DoesNotExist:
                 return HttpResponseNotFound()
-            if not object_visible_to_user(request.user, shelf):
+            if not shelf.visible_to_user(request.user):
                 return HttpResponseNotFound()
         # this is a constructed "all books" view, with a fake "shelf" obj
         else:
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index aba804d8..d2c9c2eb 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -17,7 +17,7 @@ from bookwyrm import forms, models
 from bookwyrm.activitypub import ActivitypubResponse
 from bookwyrm.settings import PAGE_LENGTH
 from .helpers import get_user_from_username, is_api_request
-from .helpers import is_blocked, privacy_filter, object_visible_to_user
+from .helpers import is_blocked, privacy_filter
 
 
 # pylint: disable= no-self-use
@@ -80,7 +80,7 @@ class User(View):
         goal = models.AnnualGoal.objects.filter(
             user=user, year=timezone.now().year
         ).first()
-        if not object_visible_to_user(request.user, goal):
+        if not goal.visible_to_user(request.user):
             goal = None
         data = {
             "user": user,

From 274ddeed85305d6712b4e9707a75c8801376df01 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 11 Apr 2021 09:34:28 -0700
Subject: [PATCH 0779/1285] Removes verbose flag on unit tests

---
 .github/workflows/django-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/django-tests.yml b/.github/workflows/django-tests.yml
index ab0b0cdb..3ce368ec 100644
--- a/.github/workflows/django-tests.yml
+++ b/.github/workflows/django-tests.yml
@@ -65,4 +65,4 @@ jobs:
         EMAIL_HOST_PASSWORD: ""
         EMAIL_USE_TLS: true
       run: |
-        python manage.py test -v 2
+        python manage.py test

From edf3fad54d9674ab9901f7fe3b520ce24463c844 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 11 Apr 2021 09:42:55 -0700
Subject: [PATCH 0780/1285] Make sure user is available when testing blocks

---
 bookwyrm/models/user.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index c519f76c..c244d4ae 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -138,7 +138,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
     def viewer_aware_objects(cls, viewer):
         """ the user queryset filtered for the context of the logged in user """
         queryset = cls.objects.filter(is_active=True)
-        if viewer.is_authenticated:
+        if viewer and viewer.is_authenticated:
             queryset = queryset.exclude(blocks=viewer)
         return queryset
 

From 787022826e0a543c7db8ee7c29ebed3ab4cd8a22 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 11 Apr 2021 18:57:14 +0200
Subject: [PATCH 0781/1285] Puts Installation and Contributing instruction in
 their own files.

---
 CONTRIBUTING.md |  16 +++
 INSTALLATION.md | 213 ++++++++++++++++++++++++++++++++++
 README.md       | 296 +++++-------------------------------------------
 3 files changed, 259 insertions(+), 266 deletions(-)
 create mode 100644 CONTRIBUTING.md
 create mode 100644 INSTALLATION.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000..5e300376
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,16 @@
+# Contributing
+There are many ways you can contribute to this project, regardless of your level of technical expertise.
+
+## Feedback and feature requests
+Please feel encouraged and welcome to point out bugs, suggestions, feature requests, and ideas for how things ought to work using [GitHub issues](https://github.com/mouse-reeve/bookwyrm/issues).
+
+## Code contributions
+Code contributions are gladly welcomed! If you're not sure where to start, take a look at the ["Good first issue"](https://github.com/mouse-reeve/bookwyrm/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) tag. Because BookWyrm is a small project, there isn't a lot of formal structure, but there is a huge capacity for one-on-one support, which can look like asking questions as you go, pair programming, video chats, et cetera, so please feel free to reach out.
+
+If you have questions about the project or contributing, you can set up a video call during BookWyrm ["office hours"](https://calendly.com/mouse-reeve/30min).
+
+## Translation
+Do you speak a language besides English? BookWyrm needs localization! If you're comfortable using git and want to get into the code, there are [instructions](#working-with-translations-and-locale-files) on how to create and edit localization files. If you feel more comfortable working in a regular text editor and would prefer not to run the application, get in touch directly and we can figure out a system, like emailing a text file, that works best.
+
+## Financial Support
+BookWyrm is an ad-free passion project with no intentions of seeking out venture funding or corporate financial relationships. If you want to help keep the project going, you can donate to the [Patreon](https://www.patreon.com/bookwyrm), or make a one time gift via [PayPal](https://paypal.me/oulipo).
\ No newline at end of file
diff --git a/INSTALLATION.md b/INSTALLATION.md
new file mode 100644
index 00000000..c290d059
--- /dev/null
+++ b/INSTALLATION.md
@@ -0,0 +1,213 @@
+# Installation instructions
+
+## Setting up the developer environment
+
+Set up the environment file:
+
+``` bash
+cp .env.example .env
+```
+
+For most testing, you'll want to use ngrok. Remember to set the DOMAIN in `.env` to your ngrok domain.
+
+You'll have to install the Docker and docker-compose. When you're ready, run:
+
+```bash
+docker-compose build
+docker-compose run --rm web python manage.py migrate
+docker-compose run --rm web python manage.py initdb
+docker-compose up
+```
+
+Once the build is complete, you can access the instance at `localhost:1333`
+
+### Editing static files
+If you edit the CSS or JavaScript, you will need to run Django's `collectstatic` command in order for your changes to have effect. You can do this by running:
+``` bash
+./bw-dev collectstatic
+```
+
+### Working with translations and locale files
+Text in the html files are wrapped in translation tags (`{% trans %}` and `{% blocktrans %}`), and Django generates locale files for all the strings in which you can add translations for the text. You can find existing translations in the `locale/` directory.
+
+The application's language is set by a request header sent by your browser to the application, so to change the language of the application, you can change the default language requested by your browser.
+
+#### Adding a locale
+To start translation into a language which is currently supported, run the django-admin `makemessages` command with the language code for the language you want to add (like `de` for German, or `en-gb` for British English):
+``` bash
+./bw-dev makemessages -l <language code>
+```
+
+#### Editing a locale
+When you have a locale file, open the `django.po` in the directory for the language (for example, if you were adding German, `locale/de/LC_MESSAGES/django.po`. All the the text in the application will be shown in paired strings, with `msgid` as the original text, and `msgstr` as the translation (by default, this is set to an empty string, and will display the original text).
+
+Add your translations to the `msgstr` strings. As the messages in the application are updated, `gettext` will sometimes add best-guess fuzzy matched options for those translations. When a message is marked as fuzzy, it will not be used in the application, so be sure to remove it when you translate that line.
+
+When you're done, compile the locale by running:
+
+``` bash
+./bw-dev compilemessages
+```
+
+You can add the `-l <language code>` to only compile one language. When you refresh the application, you should see your translations at work.
+
+## Installing in Production
+
+This project is still young and isn't, at the moment, very stable, so please proceed with caution when running in production.
+
+### Server setup
+ - Get a domain name and set up DNS for your server
+ - Set your server up with appropriate firewalls for running a web application (this instruction set is tested against Ubuntu 20.04)
+ - Set up an email service (such as mailgun) and the appropriate SMTP/DNS settings
+ - Install Docker and docker-compose
+
+### Install and configure BookWyrm
+
+The `production` branch of BookWyrm contains a number of tools not on the `main` branch that are suited for running in production, such as `docker-compose` changes to update the default commands or configuration of containers, and individual changes to container config to enable things like SSL or regular backups.
+
+Instructions for running BookWyrm in production:
+
+ - Get the application code:
+  `git clone git@github.com:mouse-reeve/bookwyrm.git`
+ - Switch to the `production` branch
+  `git checkout production`
+ - Create your environment variables file
+  `cp .env.example .env`
+   - Add your domain, email address, SMTP credentials
+   - Set a secure redis password and secret key
+   - Set a secure database password for postgres
+ - Update your nginx configuration in `nginx/default.conf`
+   - Replace `your-domain.com` with your domain name
+   - If you aren't using the `www` subdomain, remove the www.your-domain.com version of the domain from the `server_name` in the first server block in `nginx/default.conf` and remove the `-d www.${DOMAIN}` flag at the end of the `certbot` command in `docker-compose.yml`.
+   - If you are running another web-server on your host machine, you will need to follow the [reverse-proxy instructions](#running-bookwyrm-behind-a-reverse-proxy)
+ - Run the application (this should also set up a Certbot ssl cert for your domain) with
+  `docker-compose up --build`, and make sure all the images build successfully
+    - If you are running other services on your host machine, you may run into errors where services fail when attempting to bind to a port.
+    See the [troubleshooting guide](#port-conflicts) for advice on resolving this.
+ - When docker has built successfully, stop the process with `CTRL-C`
+ - Comment out the `command: certonly...` line in `docker-compose.yml`, and uncomment the following line (`command: renew ...`) so that the certificate will be automatically renewed.
+ - Uncomment the https redirect and `server` block in `nginx/default.conf` (lines 17-48).
+ - Run docker-compose in the background with: `docker-compose up -d`
+ - Initialize the database with: `./bw-dev initdb`
+
+Congrats! You did it, go to your domain and enjoy the fruits of your labors.
+
+### Configure your instance
+ - Register a user account in the application UI
+ - Make your account a superuser (warning: do *not* use django's `createsuperuser` command)
+   - On your server, open the django shell
+    `./bw-dev shell`
+   - Load your user and make it a superuser
+    ```python
+    from bookwyrm import models
+    user = models.User.objects.get(id=1)
+    user.is_staff = True
+    user.is_superuser = True
+    user.save()
+    ```
+   - Go to the site settings (`/settings/site-settings` on your domain) and configure your instance name, description, code of conduct, and toggle whether registration is open on your instance
+
+
+## Book data
+The application is set up to share book and author data between instances, and get book data from arbitrary outside sources. Right now, the only connector is to OpenLibrary, but other connectors could be written.
+
+There are three concepts in the book data model:
+ - `Book`, an abstract, high-level concept that could mean either a `Work` or an `Edition`. No data is saved as a `Book`, it serves as shared model for `Work` and `Edition`
+ - `Work`, the theoretical umbrella concept of a book that encompasses every edition of the book, and
+ - `Edition`, a concrete, actually published version of a book
+
+Whenever a user interacts with a book, they are interacting with a specific edition. Every work has a default edition, but the user can select other editions. Reviews aggregated for all editions of a work when you view an edition's page.
+
+### Backups
+
+BookWyrm's db service dumps a backup copy of its database to its `/backups` directory daily at midnight UTC.
+Backups are named `backup__%Y-%m-%d.sql`.
+
+The db service has an optional script for periodically pruning the backups directory so that all recent daily backups are kept, but for older backups, only weekly or monthly backups are kept.
+To enable this script:
+ - Uncomment the final line in `postgres-docker/cronfile`
+ - rebuild your instance `docker-compose up --build`
+
+You can copy backups from the backups volume to your host machine with `docker cp`:
+ - Run `docker-compose ps` to confirm the db service's full name (it's probably `bookwyrm_db_1`.
+ - Run `docker cp <container_name>:/backups <host machine path>`
+
+### Port Conflicts
+
+BookWyrm has multiple services that run on their default ports.
+This means that, depending on what else you are running on your host machine, you may run into errors when building or running BookWyrm when attempts to bind to those ports fail.
+
+If this occurs, you will need to change your configuration to run services on different ports.
+This may require one or more changes the following files:
+ - `docker-compose.yml`
+ - `nginx/default.conf`
+ - `.env` (You create this file yourself during setup)
+
+E.g., If you need Redis to run on a different port:
+ - In `docker-compose.yml`:
+    - In `services` -> `redis` -> `command`, add `--port YOUR_PORT` to the command
+    - In `services` -> `redis` -> `ports`, change `6379:6379` to your port
+ - In `.env`, update `REDIS_PORT`
+
+If you are already running a web-server on your machine, you will need to set up a reverse-proxy.
+
+#### Running BookWyrm Behind a Reverse-Proxy
+
+If you are running another web-server on your machine, you should have it handle proxying web requests to BookWyrm.
+
+The default BookWyrm configuration already has an nginx server that proxies requests to the django app that handles SSL and directly serves static files.
+The static files are stored in a Docker volume that several BookWyrm services access, so it is not recommended to remove this server completely.
+
+To run BookWyrm behind a reverse-proxy, make the following changes:
+ - In `nginx/default.conf`:
+    - Comment out the two default servers
+    - Uncomment the server labeled Reverse-Proxy server
+    - Replace `your-domain.com` with your domain name
+ - In `docker-compose.yml`:
+    - In `services` -> `nginx` -> `ports`, comment out the default ports and add `- 8001:8001`
+    - In `services` -> `nginx` -> `volumes`, comment out the two volumes that begin `./certbot/`
+    - In `services`, comment out the `certbot` service
+
+At this point, you can follow, the [setup](#server-setup) instructions as listed.
+Once docker is running, you can access your BookWyrm instance at `http://localhost:8001` (**NOTE:** your server is not accessible over `https`).
+
+Steps for setting up a reverse-proxy are server dependent.
+
+##### Nginx
+
+Before you can set up nginx, you will need to locate your nginx configuration directory, which is dependent on your platform and how you installed nginx.
+See [nginx's guide](http://nginx.org/en/docs/beginners_guide.html) for details.
+
+To set up your server:
+ - In you `nginx.conf` file, ensure that `include servers/*;` isn't commented out.
+ - In your nginx `servers` directory, create a new file named after your domain containing the following information:
+   ```nginx
+   server {
+      server_name your-domain.com www.your-domain.com;
+
+      location / {
+          proxy_pass http://localhost:8000;
+          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          proxy_set_header Host $host;
+      }
+
+      location /images/ {
+          proxy_pass http://localhost:8001;
+          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          proxy_set_header Host $host;
+      }
+
+      location /static/ {
+          proxy_pass http://localhost:8001;
+          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+          proxy_set_header Host $host;
+      }
+
+      listen [::]:80 ssl;
+      listen 80 ssl;
+   }
+   ```
+ - run `sudo certbot run --nginx --email YOUR_EMAIL -d your-domain.com -d www.your-domain.com`
+ - restart nginx
+
+If everything worked correctly, your BookWyrm instance should now be externally accessible.
\ No newline at end of file
diff --git a/README.md b/README.md
index 6dad4178..8a842fa4 100644
--- a/README.md
+++ b/README.md
@@ -6,32 +6,21 @@ Social reading and reviewing, decentralized with ActivityPub
 - [Joining BookWyrm](#joining-bookwyrm)
 - [Contributing](#contributing)
 - [About BookWyrm](#about-bookwyrm)
-    - [What it is and isn't](#what-it-is-and-isnt)
-    - [The role of federation](#the-role-of-federation)
-    - [Features](#features)
-- [Setting up the developer environment](#setting-up-the-developer-environment)
-- [Installing in Production](#installing-in-production)
-- [Book data](#book-data)
+   - [What it is and isn't](#what-it-is-and-isnt)
+   - [The role of federation](#the-role-of-federation)
+   - [Features](#features)
+ - [Setting up the developer environment](#setting-up-the-developer-environment)
+ - [Installing in Production](#installing-in-production)
+ - [Book data](#book-data)
 
 ## Joining BookWyrm
 BookWyrm is still a young piece of software, and isn't at the level of stability and feature-richness that you'd find in a production-ready application. But it does what it says on the box! If you'd like to join an instance, you can check out the [instances](https://github.com/mouse-reeve/bookwyrm/blob/main/instances.md) list.
 
+You can request an invite to https://bookwyrm.social by [email](mailto:mousereeve@riseup.net), [Mastodon direct message](https://friend.camp/@tripofmice), or [Twitter direct message](https://twitter.com/tripofmice).
+
+
 ## Contributing
-There are many ways you can contribute to this project, regardless of your level of technical expertise.
-
-### Feedback and feature requests
-Please feel encouraged and welcome to point out bugs, suggestions, feature requests, and ideas for how things ought to work using [GitHub issues](https://github.com/mouse-reeve/bookwyrm/issues).
-
-### Code contributions
-Code contributions are gladly welcomed! If you're not sure where to start, take a look at the ["Good first issue"](https://github.com/mouse-reeve/bookwyrm/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) tag. Because BookWyrm is a small project, there isn't a lot of formal structure, but there is a huge capacity for one-on-one support, which can look like asking questions as you go, pair programming, video chats, et cetera, so please feel free to reach out.
-
-If you have questions about the project or contributing, you can set up a video call during BookWyrm ["office hours"](https://calendly.com/mouse-reeve/30min).
-
-### Translation
-Do you speak a language besides English? BookWyrm needs localization! If you're comfortable using git and want to get into the code, there are [instructions](#working-with-translations-and-locale-files) on how to create and edit localization files. If you feel more comfortable working in a regular text editor and would prefer not to run the application, get in touch directly and we can figure out a system, like emailing a text file, that works best.
-
-### Financial Support
-BookWyrm is an ad-free passion project with no intentions of seeking out venture funding or corporate financial relationships. If you want to help keep the project going, you can donate to the [Patreon](https://www.patreon.com/bookwyrm), or make a one time gift via [PayPal](https://paypal.me/oulipo).
+See [contributing](https://github.com/mouse-reeve/bookwyrm/blob/main/README.md) for code, translation or monetary contributions.
 
 ## About BookWyrm
 ### What it is and isn't
@@ -44,275 +33,50 @@ Federation makes it possible to have small, self-determining communities, in con
 
 ### Features
 Since the project is still in its early stages, the features are growing every day, and there is plenty of room for suggestions and ideas. Open an [issue](https://github.com/mouse-reeve/bookwyrm/issues) to get the conversation going!
-- Posting about books
+ - Posting about books
     - Compose reviews, with or without ratings, which are aggregated in the book page
     - Compose other kinds of statuses about books, such as:
-        - Comments on a book
-        - Quotes or excerpts
+     - Comments on a book
+     - Quotes or excerpts
     - Reply to statuses
     - View aggregate reviews of a book across connected BookWyrm instances
     - Differentiate local and federated reviews and rating in your activity feed
-- Track reading activity
+ - Track reading activity
     - Shelve books on default "to-read," "currently reading," and "read" shelves
     - Create custom shelves
     - Store started reading/finished reading dates, as well as progress updates along the way
     - Update followers about reading activity (optionally, and with granular privacy controls)
     - Create lists of books which can be open to submissions from anyone, curated, or only edited by the creator
-- Federation with ActivityPub
+ - Federation with ActivityPub
     - Broadcast and receive user statuses and activity
     - Share book data between instances to create a networked database of metadata
     - Identify shared books across instances and aggregate related content
     - Follow and interact with users across BookWyrm instances
     - Inter-operate with non-BookWyrm ActivityPub services (currently, Mastodon is supported)
-- Granular privacy controls
+ - Granular privacy controls
     - Private, followers-only, and public privacy levels for posting, shelves, and lists
     - Option for users to manually approve followers
     - Allow blocking and flagging for moderation
 
 ### The Tech Stack
 Web backend
-- [Django](https://www.djangoproject.com/) web server
-- [PostgreSQL](https://www.postgresql.org/) database
-- [ActivityPub](http://activitypub.rocks/) federation
-- [Celery](http://celeryproject.org/) task queuing
-- [Redis](https://redis.io/) task backend
-- [Redis (again)](https://redis.io/) activity stream manager
+ - [Django](https://www.djangoproject.com/) web server
+ - [PostgreSQL](https://www.postgresql.org/) database
+ - [ActivityPub](http://activitypub.rocks/) federation
+ - [Celery](http://celeryproject.org/) task queuing
+ - [Redis](https://redis.io/) task backend
 
 Front end
-- Django templates
-- [Bulma.io](https://bulma.io/) css framework
-- Vanilla JavaScript, in moderation
+ - Django templates
+ - [Bulma.io](https://bulma.io/) css framework
+ - Vanilla JavaScript, in moderation
 
 Deployment
-- [Docker](https://www.docker.com/) and docker-compose
-- [Gunicorn](https://gunicorn.org/) web runner
-- [Flower](https://github.com/mher/flower) celery monitoring
-- [Nginx](https://nginx.org/en/) HTTP server
+ - [Docker](https://www.docker.com/) and docker-compose
+ - [Gunicorn](https://gunicorn.org/) web runner
+ - [Flower](https://github.com/mher/flower) celery monitoring
+ - [Nginx](https://nginx.org/en/) HTTP server
 
-## Setting up the developer environment
+## Set up Bookwyrm
 
-Set up the environment file:
-
-``` bash
-cp .env.example .env
-```
-
-For most testing, you'll want to use ngrok. Remember to set the DOMAIN in `.env` to your ngrok domain.
-
-You'll have to install the Docker and docker-compose. When you're ready, run:
-
-```bash
-docker-compose build
-docker-compose run --rm web python manage.py migrate
-docker-compose run --rm web python manage.py initdb
-docker-compose up
-```
-
-Once the build is complete, you can access the instance at `localhost:1333`
-
-### Editing static files
-If you edit the CSS or JavaScript, you will need to run Django's `collectstatic` command in order for your changes to have effect. You can do this by running:
-``` bash
-./bw-dev collectstatic
-```
-
-If you have [installed yarn](https://yarnpkg.com/getting-started/install), you can run `yarn watch:static` to automatically run the previous script every time a change occurs in _bookwyrm/static_ directory.
-
-### Working with translations and locale files
-Text in the html files are wrapped in translation tags (`{% trans %}` and `{% blocktrans %}`), and Django generates locale files for all the strings in which you can add translations for the text. You can find existing translations in the `locale/` directory.
-
-The application's language is set by a request header sent by your browser to the application, so to change the language of the application, you can change the default language requested by your browser.
-
-#### Adding a locale
-To start translation into a language which is currently supported, run the django-admin `makemessages` command with the language code for the language you want to add (like `de` for German, or `en-gb` for British English):
-``` bash
-./bw-dev makemessages -l <language code>
-```
-
-#### Editing a locale
-When you have a locale file, open the `django.po` in the directory for the language (for example, if you were adding German, `locale/de/LC_MESSAGES/django.po`. All the the text in the application will be shown in paired strings, with `msgid` as the original text, and `msgstr` as the translation (by default, this is set to an empty string, and will display the original text).
-
-Add your translations to the `msgstr` strings. As the messages in the application are updated, `gettext` will sometimes add best-guess fuzzy matched options for those translations. When a message is marked as fuzzy, it will not be used in the application, so be sure to remove it when you translate that line.
-
-When you're done, compile the locale by running:
-
-``` bash
-./bw-dev compilemessages
-```
-
-You can add the `-l <language code>` to only compile one language. When you refresh the application, you should see your translations at work.
-
-## Installing in Production
-
-This project is still young and isn't, at the moment, very stable, so please proceed with caution when running in production.
-
-### Server setup
-- Get a domain name and set up DNS for your server
-- Set your server up with appropriate firewalls for running a web application (this instruction set is tested against Ubuntu 20.04)
-- Set up an email service (such as mailgun) and the appropriate SMTP/DNS settings
-- Install Docker and docker-compose
-
-### Install and configure BookWyrm
-
-The `production` branch of BookWyrm contains a number of tools not on the `main` branch that are suited for running in production, such as `docker-compose` changes to update the default commands or configuration of containers, and individual changes to container config to enable things like SSL or regular backups.
-
-Instructions for running BookWyrm in production:
-
-- Get the application code:
-    `git clone git@github.com:mouse-reeve/bookwyrm.git`
-- Switch to the `production` branch
-    `git checkout production`
-- Create your environment variables file
-    `cp .env.example .env`
-    - Add your domain, email address, SMTP credentials
-    - Set a secure redis password and secret key
-    - Set a secure database password for postgres
-- Update your nginx configuration in `nginx/default.conf`
-    - Replace `your-domain.com` with your domain name
-    - If you aren't using the `www` subdomain, remove the www.your-domain.com version of the domain from the `server_name` in the first server block in `nginx/default.conf` and remove the `-d www.${DOMAIN}` flag at the end of the `certbot` command in `docker-compose.yml`.
-    - If you are running another web-server on your host machine, you will need to follow the [reverse-proxy instructions](#running-bookwyrm-behind-a-reverse-proxy)
-- Run the application (this should also set up a Certbot ssl cert for your domain) with
-    `docker-compose up --build`, and make sure all the images build successfully
-    - If you are running other services on your host machine, you may run into errors where services fail when attempting to bind to a port.
-    See the [troubleshooting guide](#port-conflicts) for advice on resolving this.
-- When docker has built successfully, stop the process with `CTRL-C`
-- Comment out the `command: certonly...` line in `docker-compose.yml`, and uncomment the following line (`command: renew ...`) so that the certificate will be automatically renewed.
-- Uncomment the https redirect and `server` block in `nginx/default.conf` (lines 17-48).
-- Run docker-compose in the background with: `docker-compose up -d`
-- Initialize the database with: `./bw-dev initdb`
-
-Congrats! You did it, go to your domain and enjoy the fruits of your labors.
-
-### Configure your instance
-- Register a user account in the application UI
-- Make your account a superuser (warning: do *not* use django's `createsuperuser` command)
-    - On your server, open the django shell
-    `./bw-dev shell`
-    - Load your user and make it a superuser
-    ```python
-    from bookwyrm import models
-    user = models.User.objects.get(id=1)
-    user.is_staff = True
-    user.is_superuser = True
-    user.save()
-    ```
-    - Go to the site settings (`/settings/site-settings` on your domain) and configure your instance name, description, code of conduct, and toggle whether registration is open on your instance
-
-### Backups
-
-BookWyrm's db service dumps a backup copy of its database to its `/backups` directory daily at midnight UTC.
-Backups are named `backup__%Y-%m-%d.sql`.
-
-The db service has an optional script for periodically pruning the backups directory so that all recent daily backups are kept, but for older backups, only weekly or monthly backups are kept.
-To enable this script:
-- Uncomment the final line in `postgres-docker/cronfile`
-- rebuild your instance `docker-compose up --build`
-
-You can copy backups from the backups volume to your host machine with `docker cp`:
-- Run `docker-compose ps` to confirm the db service's full name (it's probably `bookwyrm_db_1`.
-- Run `docker cp <container_name>:/backups <host machine path>`
-
-### Updating your instance
-
-When there are changes available in the production branch, you can install and get them running on your instance using the command `./bw-dev update`. This does a number of things:
-- `git pull` gets the updated code from the git repository. If there are conflicts, you may need to run `git pull` separately and resolve the conflicts before trying the `./bw-dev update` script again.
-- `docker-compose build` rebuilds the images, which ensures that the correct packages are installed. This step takes a long time and is only needed when the dependencies (including pip `requirements.txt` packages) have changed, so you can comment it out if you want a quicker update path and don't mind un-commenting it as needed.
-- `docker-compose exec web python manage.py migrate` runs the database migrations in Django
-- `docker-compose exec web python manage.py collectstatic --no-input` loads any updated static files (such as the JavaScript and CSS)
-- `docker-compose restart` reloads the docker containers
-
-### Re-building activity streams
-
-If something goes awry with user timelines, and you want to re-create them en mass, there's a management command for that:
-`docker-compose run --rm web python manage.py rebuild_feeds`
-
-### Port Conflicts
-
-BookWyrm has multiple services that run on their default ports.
-This means that, depending on what else you are running on your host machine, you may run into errors when building or running BookWyrm when attempts to bind to those ports fail.
-
-If this occurs, you will need to change your configuration to run services on different ports.
-This may require one or more changes the following files:
-- `docker-compose.yml`
-- `nginx/default.conf`
-- `.env` (You create this file yourself during setup)
-
-E.g., If you need Redis to run on a different port:
-- In `docker-compose.yml`:
-    - In `services` -> `redis` -> `command`, add `--port YOUR_PORT` to the command
-    - In `services` -> `redis` -> `ports`, change `6379:6379` to your port
-- In `.env`, update `REDIS_PORT`
-
-If you are already running a web-server on your machine, you will need to set up a reverse-proxy.
-
-#### Running BookWyrm Behind a Reverse-Proxy
-
-If you are running another web-server on your machine, you should have it handle proxying web requests to BookWyrm.
-
-The default BookWyrm configuration already has an nginx server that proxies requests to the django app that handles SSL and directly serves static files.
-The static files are stored in a Docker volume that several BookWyrm services access, so it is not recommended to remove this server completely.
-
-To run BookWyrm behind a reverse-proxy, make the following changes:
-- In `nginx/default.conf`:
-    - Comment out the two default servers
-    - Uncomment the server labeled Reverse-Proxy server
-    - Replace `your-domain.com` with your domain name
-- In `docker-compose.yml`:
-    - In `services` -> `nginx` -> `ports`, comment out the default ports and add `- 8001:8001`
-    - In `services` -> `nginx` -> `volumes`, comment out the two volumes that begin `./certbot/`
-    - In `services`, comment out the `certbot` service
-
-At this point, you can follow, the [setup](#server-setup) instructions as listed.
-Once docker is running, you can access your BookWyrm instance at `http://localhost:8001` (**NOTE:** your server is not accessible over `https`).
-
-Steps for setting up a reverse-proxy are server dependent.
-
-##### Nginx
-
-Before you can set up nginx, you will need to locate your nginx configuration directory, which is dependent on your platform and how you installed nginx.
-See [nginx's guide](http://nginx.org/en/docs/beginners_guide.html) for details.
-
-To set up your server:
-- In you `nginx.conf` file, ensure that `include servers/*;` isn't commented out.
-- In your nginx `servers` directory, create a new file named after your domain containing the following information:
-    ```nginx
-    server {
-        server_name your-domain.com www.your-domain.com;
-
-        location / {
-            proxy_pass http://localhost:8000;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header Host $host;
-        }
-
-        location /images/ {
-            proxy_pass http://localhost:8001;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header Host $host;
-        }
-
-        location /static/ {
-            proxy_pass http://localhost:8001;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header Host $host;
-        }
-
-        listen [::]:80 ssl;
-        listen 80 ssl;
-    }
-    ```
-- run `sudo certbot run --nginx --email YOUR_EMAIL -d your-domain.com -d www.your-domain.com`
-- restart nginx
-
-If everything worked correctly, your BookWyrm instance should now be externally accessible.
-
-
-## Book data
-The application is set up to share book and author data between instances, and get book data from arbitrary outside sources. Right now, the only connector is to OpenLibrary, but other connectors could be written.
-
-There are three concepts in the book data model:
-- `Book`, an abstract, high-level concept that could mean either a `Work` or an `Edition`. No data is saved as a `Book`, it serves as shared model for `Work` and `Edition`
-- `Work`, the theoretical umbrella concept of a book that encompasses every edition of the book, and
-- `Edition`, a concrete, actually published version of a book
-
-Whenever a user interacts with a book, they are interacting with a specific edition. Every work has a default edition, but the user can select other editions. Reviews aggregated for all editions of a work when you view an edition's page.
+See the [installation instructions](https://github.com/mouse-reeve/bookwyrm/blob/main/INSTALLATION.md) on how to set up Bookwyrm in developer environment or production.
\ No newline at end of file

From b552634a878b9e1fee4237a0815ad109a58cab0d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 11 Apr 2021 09:58:03 -0700
Subject: [PATCH 0782/1285] Make sure goal exists before checking perms

---
 bookwyrm/views/user.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index d2c9c2eb..d666f064 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -80,7 +80,7 @@ class User(View):
         goal = models.AnnualGoal.objects.filter(
             user=user, year=timezone.now().year
         ).first()
-        if not goal.visible_to_user(request.user):
+        if goal and not goal.visible_to_user(request.user):
             goal = None
         data = {
             "user": user,

From a681065a2be447373ac5abbc50da20e1b95319c2 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 11 Apr 2021 18:58:30 +0200
Subject: [PATCH 0783/1285] Fixes link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8a842fa4..33345007 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ You can request an invite to https://bookwyrm.social by [email](mailto:mousereev
 
 
 ## Contributing
-See [contributing](https://github.com/mouse-reeve/bookwyrm/blob/main/README.md) for code, translation or monetary contributions.
+See [contributing](https://github.com/mouse-reeve/bookwyrm/blob/main/CONTRIBUTING.md) for code, translation or monetary contributions.
 
 ## About BookWyrm
 ### What it is and isn't

From 6a408e6252e4255574e200fcaed6ce5bb36188e8 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 11 Apr 2021 19:03:16 +0200
Subject: [PATCH 0784/1285] Adds final newlines

---
 CONTRIBUTING.md | 2 +-
 README.md       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5e300376..b73bdd6f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -13,4 +13,4 @@ If you have questions about the project or contributing, you can set up a video
 Do you speak a language besides English? BookWyrm needs localization! If you're comfortable using git and want to get into the code, there are [instructions](#working-with-translations-and-locale-files) on how to create and edit localization files. If you feel more comfortable working in a regular text editor and would prefer not to run the application, get in touch directly and we can figure out a system, like emailing a text file, that works best.
 
 ## Financial Support
-BookWyrm is an ad-free passion project with no intentions of seeking out venture funding or corporate financial relationships. If you want to help keep the project going, you can donate to the [Patreon](https://www.patreon.com/bookwyrm), or make a one time gift via [PayPal](https://paypal.me/oulipo).
\ No newline at end of file
+BookWyrm is an ad-free passion project with no intentions of seeking out venture funding or corporate financial relationships. If you want to help keep the project going, you can donate to the [Patreon](https://www.patreon.com/bookwyrm), or make a one time gift via [PayPal](https://paypal.me/oulipo).
diff --git a/README.md b/README.md
index 33345007..b4c35800 100644
--- a/README.md
+++ b/README.md
@@ -79,4 +79,4 @@ Deployment
 
 ## Set up Bookwyrm
 
-See the [installation instructions](https://github.com/mouse-reeve/bookwyrm/blob/main/INSTALLATION.md) on how to set up Bookwyrm in developer environment or production.
\ No newline at end of file
+See the [installation instructions](https://github.com/mouse-reeve/bookwyrm/blob/main/INSTALLATION.md) on how to set up Bookwyrm in developer environment or production.

From 96d15d3d57f469128160835a9fa63fcf70ed3e1c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 11 Apr 2021 10:05:36 -0700
Subject: [PATCH 0785/1285] Adds merge migration

---
 bookwyrm/migrations/0065_merge_20210411_1702.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 bookwyrm/migrations/0065_merge_20210411_1702.py

diff --git a/bookwyrm/migrations/0065_merge_20210411_1702.py b/bookwyrm/migrations/0065_merge_20210411_1702.py
new file mode 100644
index 00000000..2bdc425d
--- /dev/null
+++ b/bookwyrm/migrations/0065_merge_20210411_1702.py
@@ -0,0 +1,13 @@
+# Generated by Django 3.1.8 on 2021-04-11 17:02
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0064_auto_20210408_2208"),
+        ("bookwyrm", "0064_merge_20210410_1633"),
+    ]
+
+    operations = []

From d38efa9a9d0aac0b966a128fe3b522d6741fc1dc Mon Sep 17 00:00:00 2001
From: Pablo Barton <pablo.barton@gmail.com>
Date: Tue, 30 Mar 2021 09:28:13 -0400
Subject: [PATCH 0786/1285] Easier to deploy by avoiding merge conflicts in
 production

---
 .env.example => .env.dev.example    | 13 +++++-
 .env.prod.example                   | 50 ++++++++++++++++++++
 .gitignore                          |  3 ++
 README.md                           | 40 ++++++++++------
 bookwyrm/settings.py                |  1 +
 certbot.sh                          | 19 ++++++++
 docker-compose.yml                  |  2 +
 nginx/{default.conf => development} |  0
 nginx/production                    | 72 +++++++++++++++++++++++++++++
 9 files changed, 186 insertions(+), 14 deletions(-)
 rename .env.example => .env.dev.example (75%)
 create mode 100644 .env.prod.example
 create mode 100644 certbot.sh
 rename nginx/{default.conf => development} (100%)
 create mode 100644 nginx/production

diff --git a/.env.example b/.env.dev.example
similarity index 75%
rename from .env.example
rename to .env.dev.example
index 2397a5b1..5e605d74 100644
--- a/.env.example
+++ b/.env.dev.example
@@ -5,6 +5,7 @@ SECRET_KEY="7(2w1sedok=aznpq)ta1mc4i%4h=xx@hxwx*o57ctsuml0x%fr"
 DEBUG=true
 
 DOMAIN=your.domain.here
+#EMAIL=your@email.here
 
 ## Leave unset to allow all hosts
 # ALLOWED_HOSTS="localhost,127.0.0.1,[::1]"
@@ -26,14 +27,24 @@ POSTGRES_HOST=db
 MAX_STREAM_LENGTH=200
 REDIS_ACTIVITY_HOST=redis_activity
 REDIS_ACTIVITY_PORT=6379
+#REDIS_ACTIVITY_PASSWORD=redispassword345
 
-# Celery config with redis broker
+# Redis as celery broker
+#REDIS_BROKER_PORT=6379
+#REDIS_BROKER_PASSWORD=redispassword123
 CELERY_BROKER=redis://redis_broker:6379/0
 CELERY_RESULT_BACKEND=redis://redis_broker:6379/0
 
+FLOWER_PORT=8888
+#FLOWER_USER=mouse
+#FLOWER_PASSWORD=changeme
+
 EMAIL_HOST="smtp.mailgun.org"
 EMAIL_PORT=587
 EMAIL_HOST_USER=mail@your.domain.here
 EMAIL_HOST_PASSWORD=emailpassword123
 EMAIL_USE_TLS=true
 EMAIL_USE_SSL=false
+
+# Set this to true when initializing certbot for domain, false when not
+CERTBOT_INIT=false
diff --git a/.env.prod.example b/.env.prod.example
new file mode 100644
index 00000000..0013bf9d
--- /dev/null
+++ b/.env.prod.example
@@ -0,0 +1,50 @@
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY="7(2w1sedok=aznpq)ta1mc4i%4h=xx@hxwx*o57ctsuml0x%fr"
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG=false
+
+DOMAIN=your.domain.here
+EMAIL=your@email.here
+
+## Leave unset to allow all hosts
+# ALLOWED_HOSTS="localhost,127.0.0.1,[::1]"
+
+OL_URL=https://openlibrary.org
+
+## Database backend to use.
+## Default is postgres, sqlite is for dev quickstart only (NOT production!!!)
+BOOKWYRM_DATABASE_BACKEND=postgres
+
+MEDIA_ROOT=images/
+
+POSTGRES_PASSWORD=securedbpassword123
+POSTGRES_USER=fedireads
+POSTGRES_DB=fedireads
+POSTGRES_HOST=db
+
+# Redis activity stream manager
+MAX_STREAM_LENGTH=200
+REDIS_ACTIVITY_HOST=redis_activity
+REDIS_ACTIVITY_PORT=6379
+REDIS_ACTIVITY_PASSWORD=redispassword345
+
+# Redis as celery broker
+REDIS_BROKER_PORT=6379
+REDIS_BROKER_PASSWORD=redispassword123
+CELERY_BROKER=redis://:${REDIS_BROKER_PASSWORD}@redis_broker:${REDIS_BROKER_PORT}/0
+CELERY_RESULT_BACKEND=redis://:${REDIS_BROKER_PASSWORD}@redis_broker:${REDIS_BROKER_PORT}/0
+
+FLOWER_PORT=8888
+FLOWER_USER=mouse
+FLOWER_PASSWORD=changeme
+
+EMAIL_HOST="smtp.mailgun.org"
+EMAIL_PORT=587
+EMAIL_HOST_USER=mail@your.domain.here
+EMAIL_HOST_PASSWORD=emailpassword123
+EMAIL_USE_TLS=true
+EMAIL_USE_SSL=false
+
+# Set this to true when initializing certbot for domain, false when not
+CERTBOT_INIT=false
diff --git a/.gitignore b/.gitignore
index 71fa61bf..cf88e987 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,6 @@
 
 #Node tools
 /node_modules/
+
+#nginx
+nginx/default.conf
diff --git a/README.md b/README.md
index 6dad4178..c11de3dc 100644
--- a/README.md
+++ b/README.md
@@ -91,10 +91,15 @@ Deployment
 
 ## Setting up the developer environment
 
-Set up the environment file:
+Set up the development environment file:
 
 ``` bash
-cp .env.example .env
+cp .env.dev.example .env
+```
+
+Set up nginx for development `nginx/default.conf`:
+``` bash
+cp nginx/development nginx/default.conf
 ```
 
 For most testing, you'll want to use ngrok. Remember to set the DOMAIN in `.env` to your ngrok domain.
@@ -108,7 +113,7 @@ docker-compose run --rm web python manage.py initdb
 docker-compose up
 ```
 
-Once the build is complete, you can access the instance at `localhost:1333`
+Once the build is complete, you can access the instance at `http://localhost:1333`
 
 ### Editing static files
 If you edit the CSS or JavaScript, you will need to run Django's `collectstatic` command in order for your changes to have effect. You can do this by running:
@@ -160,26 +165,35 @@ Instructions for running BookWyrm in production:
 
 - Get the application code:
     `git clone git@github.com:mouse-reeve/bookwyrm.git`
-- Switch to the `production` branch
+- Switch to the `production` branch:
     `git checkout production`
-- Create your environment variables file
-    `cp .env.example .env`
-    - Add your domain, email address, SMTP credentials
-    - Set a secure redis password and secret key
-    - Set a secure database password for postgres
+- Create your environment variables file, `cp .env.prod.example .env`, and update the following:
+    - `SECRET_KEY` | A difficult to guess, secret string of characers
+    - `DOMAIN` | Your web domain
+    - `EMAIL` | Email address to be used for certbot domain verification
+    - `POSTGRES_PASSWORD` | Set a secure password for the database
+    - `REDIS_ACTIVITY_PASSWORD` | Set a secure password for Redis Activity subsystem
+    - `REDIS_BROKER_PASSWORD` | Set a secure password for Redis queue broker subsystem
+    - `FLOWER_USER` | Your own username for accessing Flower queue monitor
+    - `FLOWER_PASSWORD` | Your own secure password for accessing Flower queue monitor
 - Update your nginx configuration in `nginx/default.conf`
     - Replace `your-domain.com` with your domain name
-    - If you aren't using the `www` subdomain, remove the www.your-domain.com version of the domain from the `server_name` in the first server block in `nginx/default.conf` and remove the `-d www.${DOMAIN}` flag at the end of the `certbot` command in `docker-compose.yml`.
-    - If you are running another web-server on your host machine, you will need to follow the [reverse-proxy instructions](#running-bookwyrm-behind-a-reverse-proxy)
+- Configure nginx
+    - Make a copy of the production template config and set it for use in nginx `cp nginx/production nginx/default.conf`
+    - Update `nginx/default.conf`:
+        - Replace `your-domain.com` with your domain name
+        - If you aren't using the `www` subdomain, remove the www.your-domain.com version of the domain from the `server_name` in the first server block in `nginx/default.conf` and remove the `-d www.${DOMAIN}` flag at the end of the `certbot` command in `docker-compose.yml`.
+        - If you are running another web-server on your host machine, you will need to follow the [reverse-proxy instructions](#running-bookwyrm-behind-a-reverse-proxy)
+- If you need to initialize your certbot for your domain, set `CERTBOT_INIT=true` in your `.env` file
 - Run the application (this should also set up a Certbot ssl cert for your domain) with
     `docker-compose up --build`, and make sure all the images build successfully
     - If you are running other services on your host machine, you may run into errors where services fail when attempting to bind to a port.
     See the [troubleshooting guide](#port-conflicts) for advice on resolving this.
 - When docker has built successfully, stop the process with `CTRL-C`
-- Comment out the `command: certonly...` line in `docker-compose.yml`, and uncomment the following line (`command: renew ...`) so that the certificate will be automatically renewed.
-- Uncomment the https redirect and `server` block in `nginx/default.conf` (lines 17-48).
+- If you set `CERTBOT_INIT=true` earlier, set it now as `CERTBOT_INIT=false` so that certbot runs in renew mode
 - Run docker-compose in the background with: `docker-compose up -d`
 - Initialize the database with: `./bw-dev initdb`
+- Set up schedule backups with cron that runs that `docker-compose exec db pg_dump -U <databasename>` and saves the backup to a safe location
 
 Congrats! You did it, go to your domain and enjoy the fruits of your labors.
 
diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 146d4fff..ded119f8 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -98,6 +98,7 @@ WSGI_APPLICATION = "bookwyrm.wsgi.application"
 # redis/activity streams settings
 REDIS_ACTIVITY_HOST = env("REDIS_ACTIVITY_HOST", "localhost")
 REDIS_ACTIVITY_PORT = env("REDIS_ACTIVITY_PORT", 6379)
+REDIS_ACTIVITY_PASSWORD = env("REDIS_ACTIVITY_PASSWORD", None)
 
 MAX_STREAM_LENGTH = int(env("MAX_STREAM_LENGTH", 200))
 STREAMS = ["home", "local", "federated"]
diff --git a/certbot.sh b/certbot.sh
new file mode 100644
index 00000000..6d2c3cd9
--- /dev/null
+++ b/certbot.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+source .env;
+
+if [ "$CERTBOT_INIT" = "true" ]
+then
+    certonly \
+    --webroot \
+    --webroot-path=/var/www/certbot \
+    --email ${EMAIL} \
+    --agree-tos \
+    --no-eff-email \
+    -d ${DOMAIN} \
+    -d www.${DOMAIN}
+else
+    renew \
+    --webroot \
+    --webroot-path \
+    /var/www/certbot
+fi
diff --git a/docker-compose.yml b/docker-compose.yml
index 3ee9037f..60816cc0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,6 +20,8 @@ services:
       - pgdata:/var/lib/postgresql/data
     networks:
       - main
+    ports:
+      - 5432:5432
   web:
     build: .
     env_file: .env
diff --git a/nginx/default.conf b/nginx/development
similarity index 100%
rename from nginx/default.conf
rename to nginx/development
diff --git a/nginx/production b/nginx/production
new file mode 100644
index 00000000..c5d83cbf
--- /dev/null
+++ b/nginx/production
@@ -0,0 +1,72 @@
+upstream web {
+    server web:8000;
+}
+
+server {
+    listen [::]:80;
+    listen 80;
+
+    server_name your-domain.com www.your-domain.com;
+
+    location ~ /.well-known/acme-challenge {
+        allow all;
+        root /var/www/certbot;
+    }
+
+#     # redirect http to https
+#     return 301 https://your-domain.com$request_uri;
+# }
+#
+# server {
+#     listen [::]:443 ssl http2;
+#     listen 443 ssl http2;
+#
+#     server_name your-domain.com;
+#
+#     # SSL code
+#     ssl_certificate /etc/nginx/ssl/live/your-domain.com/fullchain.pem;
+#     ssl_certificate_key /etc/nginx/ssl/live/your-domain.com/privkey.pem;
+#
+#     location ~ /.well-known/acme-challenge {
+#         allow all;
+#         root /var/www/certbot;
+#     }
+#
+#     location / {
+#         proxy_pass http://web;
+#         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+#         proxy_set_header Host $host;
+#         proxy_redirect off;
+#     }
+#
+#     location /images/ {
+#         alias /app/images/;
+#     }
+#
+#     location /static/ {
+#         alias /app/static/;
+#     }
+}
+
+# Reverse-Proxy server
+# server {
+#     listen [::]:8001;
+#     listen 8001;
+
+#     server_name your-domain.com www.your-domain.com;
+
+#     location / {
+#         proxy_pass http://web;
+#         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+#         proxy_set_header Host $host;
+#         proxy_redirect off;
+#     }
+
+#     location /images/ {
+#         alias /app/images/;
+#     }
+
+#     location /static/ {
+#         alias /app/static/;
+#     }
+# }

From 659986771f3ffde3c360754ce356dbcffa420cfe Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 11 Apr 2021 10:36:40 -0700
Subject: [PATCH 0787/1285] Edit notes on federated servers

---
 .../templates/settings/federated_server.html  | 26 ++++++++++++++++---
 bookwyrm/tests/views/test_federation.py       |  2 +-
 bookwyrm/urls.py                              |  5 ++++
 bookwyrm/views/__init__.py                    |  3 ++-
 bookwyrm/views/federation.py                  | 16 ++++++++++--
 5 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/templates/settings/federated_server.html b/bookwyrm/templates/settings/federated_server.html
index 249d7106..6996557d 100644
--- a/bookwyrm/templates/settings/federated_server.html
+++ b/bookwyrm/templates/settings/federated_server.html
@@ -71,14 +71,34 @@
 </div>
 
 <section class="block content">
-    <h2 class="title is-4">{% trans "Notes" %}</h2>
-    <p>{{ server.notes }}</p>
+    <header class="columns is-mobile">
+        <div class="column">
+            <h2 class="title is-4 mb-0">{% trans "Notes" %}</h2>
+        </div>
+        <div class="column is-narrow">
+            {% trans "Edit" as button_text %}
+            {% include 'snippets/toggle/open_button.html' with text=button_text icon="pencil" controls_text="edit-notes" %}
+        </div>
+    </header>
+    {% if server.notes %}
+    <p id="hide-edit-notes">{{ server.notes }}</p>
+    {% endif %}
+    <form class="box is-hidden" method="POST" action="{% url 'settings-federated-server' server.id %}" id="edit-notes">
+        {% csrf_token %}
+        <p>
+            <label class="is-sr-only" for="id_notes">Notes:</label>
+            <textarea name="notes" cols="None" rows="None" class="textarea" id="id_notes">{{ server.notes|default:"" }}</textarea>
+        </p>
+        <button type="submit" class="button is-primary">{% trans "Save" %}</button>
+        {% trans "Cancel" as button_text %}
+        {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="edit-notes" %}
+    </form>
 </section>
 
 <section class="block content">
     <h2 class="title is-4">{% trans "Actions" %}</h2>
     {% if server.status != 'blocked' %}
-    <form class="block" method="post" action="{% url 'settings-federated-server' server.id %}">
+    <form class="block" method="post" action="{% url 'settings-federated-server-block' server.id %}">
         {% csrf_token %}
         <button class="button is-danger">{% trans "Block" %}</button>
         <p class="help">{% trans "All users from this instance will be deactivated." %}</p>
diff --git a/bookwyrm/tests/views/test_federation.py b/bookwyrm/tests/views/test_federation.py
index 1ba18143..b31aaf09 100644
--- a/bookwyrm/tests/views/test_federation.py
+++ b/bookwyrm/tests/views/test_federation.py
@@ -64,7 +64,7 @@ class FederationViews(TestCase):
 
         self.assertEqual(server.status, "federated")
 
-        view = views.FederatedServer.as_view()
+        view = views.federation.block_server
         request = self.factory.post("")
         request.user = self.local_user
         request.user.is_superuser = True
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index f2d43a13..c5c52800 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -68,6 +68,11 @@ urlpatterns = [
         views.FederatedServer.as_view(),
         name="settings-federated-server",
     ),
+    re_path(
+        r"^settings/federation/(?P<server>\d+)/block?$",
+        views.federation.block_server,
+        name="settings-federated-server-block",
+    ),
     re_path(
         r"^settings/federation/(?P<server>\d+)/unblock?$",
         views.federation.unblock_server,
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 2dc7a1c6..d7bc4e13 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -5,7 +5,8 @@ from .block import Block, unblock
 from .books import Book, EditBook, ConfirmEditBook, Editions
 from .books import upload_cover, add_description, switch_edition, resolve_book
 from .directory import Directory
-from .federation import Federation, FederatedServer, AddFederatedServer, unblock_server
+from .federation import Federation, FederatedServer, AddFederatedServer
+from .federation import block_server, unblock_server
 from .feed import DirectMessage, Feed, Replies, Status
 from .follow import follow, unfollow
 from .follow import accept_follow_request, delete_follow_request
diff --git a/bookwyrm/views/federation.py b/bookwyrm/views/federation.py
index 8a21c5a5..f34f7d19 100644
--- a/bookwyrm/views/federation.py
+++ b/bookwyrm/views/federation.py
@@ -88,12 +88,24 @@ class FederatedServer(View):
         return TemplateResponse(request, "settings/federated_server.html", data)
 
     def post(self, request, server):  # pylint: disable=unused-argument
-        """ block a server """
+        """ update note """
         server = get_object_or_404(models.FederatedServer, id=server)
-        server.block()
+        server.notes = request.POST.get("notes")
+        server.save()
         return redirect("settings-federated-server", server.id)
 
 
+@login_required
+@require_POST
+@permission_required("bookwyrm.control_federation", raise_exception=True)
+# pylint: disable=unused-argument
+def block_server(request, server):
+    """ block a server """
+    server = get_object_or_404(models.FederatedServer, id=server)
+    server.block()
+    return redirect("settings-federated-server", server.id)
+
+
 @login_required
 @require_POST
 @permission_required("bookwyrm.control_federation", raise_exception=True)

From db4519b2e13be98f665c1d97efb9fce006f3bd9c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 11 Apr 2021 10:45:08 -0700
Subject: [PATCH 0788/1285] Fixes visible_to_user check for non-federated objs

why did this cause a problem _now_??
---
 bookwyrm/models/activitypub_mixin.py          | 30 ----------
 bookwyrm/models/base_model.py                 | 30 ++++++++++
 .../tests/models/test_activitypub_mixin.py    | 60 -------------------
 bookwyrm/tests/models/test_base_model.py      | 60 +++++++++++++++++++
 4 files changed, 90 insertions(+), 90 deletions(-)

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index ec4c89df..ce16460e 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -83,36 +83,6 @@ class ActivitypubMixin:
 
         super().__init__(*args, **kwargs)
 
-    def visible_to_user(self, viewer):
-        """ is a user authorized to view an object? """
-        # make sure this is an object with privacy owned by a user
-        if not hasattr(self, "user") or not hasattr(self, "privacy"):
-            return None
-
-        # viewer can't see it if the object's owner blocked them
-        if viewer in self.user.blocks.all():
-            return False
-
-        # you can see your own posts and any public or unlisted posts
-        if viewer == self.user or self.privacy in ["public", "unlisted"]:
-            return True
-
-        # you can see the followers only posts of people you follow
-        if (
-            self.privacy == "followers"
-            and self.user.followers.filter(id=viewer.id).first()
-        ):
-            return True
-
-        # you can see dms you are tagged in
-        if hasattr(self, "mention_users"):
-            if (
-                self.privacy == "direct"
-                and self.mention_users.filter(id=viewer.id).first()
-            ):
-                return True
-        return False
-
     @classmethod
     def find_existing_by_remote_id(cls, remote_id):
         """ look up a remote id in the db """
diff --git a/bookwyrm/models/base_model.py b/bookwyrm/models/base_model.py
index cb2fc851..261c9686 100644
--- a/bookwyrm/models/base_model.py
+++ b/bookwyrm/models/base_model.py
@@ -31,6 +31,36 @@ class BookWyrmModel(models.Model):
         """ how to link to this object in the local app """
         return self.get_remote_id().replace("https://%s" % DOMAIN, "")
 
+    def visible_to_user(self, viewer):
+        """ is a user authorized to view an object? """
+        # make sure this is an object with privacy owned by a user
+        if not hasattr(self, "user") or not hasattr(self, "privacy"):
+            return None
+
+        # viewer can't see it if the object's owner blocked them
+        if viewer in self.user.blocks.all():
+            return False
+
+        # you can see your own posts and any public or unlisted posts
+        if viewer == self.user or self.privacy in ["public", "unlisted"]:
+            return True
+
+        # you can see the followers only posts of people you follow
+        if (
+            self.privacy == "followers"
+            and self.user.followers.filter(id=viewer.id).first()
+        ):
+            return True
+
+        # you can see dms you are tagged in
+        if hasattr(self, "mention_users"):
+            if (
+                self.privacy == "direct"
+                and self.mention_users.filter(id=viewer.id).first()
+            ):
+                return True
+        return False
+
 
 @receiver(models.signals.post_save)
 # pylint: disable=unused-argument
diff --git a/bookwyrm/tests/models/test_activitypub_mixin.py b/bookwyrm/tests/models/test_activitypub_mixin.py
index 4e4e9c9f..0d1acd97 100644
--- a/bookwyrm/tests/models/test_activitypub_mixin.py
+++ b/bookwyrm/tests/models/test_activitypub_mixin.py
@@ -44,66 +44,6 @@ class ActivitypubMixins(TestCase):
             "published": "2020-12-04T17:52:22.623807+00:00",
         }
 
-    def test_object_visible_to_user(self, _):
-        """ does a user have permission to view an object """
-        obj = models.Status.objects.create(
-            content="hi", user=self.remote_user, privacy="public"
-        )
-        self.assertTrue(obj.visible_to_user(self.local_user))
-
-        obj = models.Shelf.objects.create(
-            name="test", user=self.remote_user, privacy="unlisted"
-        )
-        self.assertTrue(obj.visible_to_user(self.local_user))
-
-        obj = models.Status.objects.create(
-            content="hi", user=self.remote_user, privacy="followers"
-        )
-        self.assertFalse(obj.visible_to_user(self.local_user))
-
-        obj = models.Status.objects.create(
-            content="hi", user=self.remote_user, privacy="direct"
-        )
-        self.assertFalse(obj.visible_to_user(self.local_user))
-
-        obj = models.Status.objects.create(
-            content="hi", user=self.remote_user, privacy="direct"
-        )
-        obj.mention_users.add(self.local_user)
-        self.assertTrue(obj.visible_to_user(self.local_user))
-
-    def test_object_visible_to_user_follower(self, _):
-        """ what you can see if you follow a user """
-        self.remote_user.followers.add(self.local_user)
-        obj = models.Status.objects.create(
-            content="hi", user=self.remote_user, privacy="followers"
-        )
-        self.assertTrue(obj.visible_to_user(self.local_user))
-
-        obj = models.Status.objects.create(
-            content="hi", user=self.remote_user, privacy="direct"
-        )
-        self.assertFalse(obj.visible_to_user(self.local_user))
-
-        obj = models.Status.objects.create(
-            content="hi", user=self.remote_user, privacy="direct"
-        )
-        obj.mention_users.add(self.local_user)
-        self.assertTrue(obj.visible_to_user(self.local_user))
-
-    def test_object_visible_to_user_blocked(self, _):
-        """ you can't see it if they block you """
-        self.remote_user.blocks.add(self.local_user)
-        obj = models.Status.objects.create(
-            content="hi", user=self.remote_user, privacy="public"
-        )
-        self.assertFalse(obj.visible_to_user(self.local_user))
-
-        obj = models.Shelf.objects.create(
-            name="test", user=self.remote_user, privacy="unlisted"
-        )
-        self.assertFalse(obj.visible_to_user(self.local_user))
-
     # ActivitypubMixin
     def test_to_activity(self, _):
         """ model to ActivityPub json """
diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py
index 25a2e7ee..30335b1c 100644
--- a/bookwyrm/tests/models/test_base_model.py
+++ b/bookwyrm/tests/models/test_base_model.py
@@ -42,3 +42,63 @@ class BaseModel(TestCase):
         instance.remote_id = None
         base_model.set_remote_id(None, instance, False)
         self.assertIsNone(instance.remote_id)
+
+    def test_object_visible_to_user(self, _):
+        """ does a user have permission to view an object """
+        obj = models.Status.objects.create(
+            content="hi", user=self.remote_user, privacy="public"
+        )
+        self.assertTrue(obj.visible_to_user(self.local_user))
+
+        obj = models.Shelf.objects.create(
+            name="test", user=self.remote_user, privacy="unlisted"
+        )
+        self.assertTrue(obj.visible_to_user(self.local_user))
+
+        obj = models.Status.objects.create(
+            content="hi", user=self.remote_user, privacy="followers"
+        )
+        self.assertFalse(obj.visible_to_user(self.local_user))
+
+        obj = models.Status.objects.create(
+            content="hi", user=self.remote_user, privacy="direct"
+        )
+        self.assertFalse(obj.visible_to_user(self.local_user))
+
+        obj = models.Status.objects.create(
+            content="hi", user=self.remote_user, privacy="direct"
+        )
+        obj.mention_users.add(self.local_user)
+        self.assertTrue(obj.visible_to_user(self.local_user))
+
+    def test_object_visible_to_user_follower(self, _):
+        """ what you can see if you follow a user """
+        self.remote_user.followers.add(self.local_user)
+        obj = models.Status.objects.create(
+            content="hi", user=self.remote_user, privacy="followers"
+        )
+        self.assertTrue(obj.visible_to_user(self.local_user))
+
+        obj = models.Status.objects.create(
+            content="hi", user=self.remote_user, privacy="direct"
+        )
+        self.assertFalse(obj.visible_to_user(self.local_user))
+
+        obj = models.Status.objects.create(
+            content="hi", user=self.remote_user, privacy="direct"
+        )
+        obj.mention_users.add(self.local_user)
+        self.assertTrue(obj.visible_to_user(self.local_user))
+
+    def test_object_visible_to_user_blocked(self, _):
+        """ you can't see it if they block you """
+        self.remote_user.blocks.add(self.local_user)
+        obj = models.Status.objects.create(
+            content="hi", user=self.remote_user, privacy="public"
+        )
+        self.assertFalse(obj.visible_to_user(self.local_user))
+
+        obj = models.Shelf.objects.create(
+            name="test", user=self.remote_user, privacy="unlisted"
+        )
+        self.assertFalse(obj.visible_to_user(self.local_user))

From 08586e348c3733321898cfa23dceba1e52f916a3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 11 Apr 2021 10:55:13 -0700
Subject: [PATCH 0789/1285] Adds users to base model mock

---
 bookwyrm/tests/models/test_base_model.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py
index 30335b1c..a7d705df 100644
--- a/bookwyrm/tests/models/test_base_model.py
+++ b/bookwyrm/tests/models/test_base_model.py
@@ -1,4 +1,5 @@
 """ testing models """
+from unittest.mock import patch
 from django.test import TestCase
 
 from bookwyrm import models
@@ -9,6 +10,22 @@ from bookwyrm.settings import DOMAIN
 class BaseModel(TestCase):
     """ functionality shared across models """
 
+    def setUp(self):
+        """ shared data """
+        self.local_user = models.User.objects.create_user(
+            "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse"
+        )
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            self.remote_user = models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
+
     def test_remote_id(self):
         """ these should be generated """
         instance = base_model.BookWyrmModel()

From c8812c48c1eb2a5266d88afcaec9e7e994c9debf Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 11 Apr 2021 11:58:00 -0700
Subject: [PATCH 0790/1285] Use local user in test

---
 bookwyrm/tests/models/test_base_model.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py
index a7d705df..bbc6c488 100644
--- a/bookwyrm/tests/models/test_base_model.py
+++ b/bookwyrm/tests/models/test_base_model.py
@@ -35,11 +35,8 @@ class BaseModel(TestCase):
 
     def test_remote_id_with_user(self):
         """ format of remote id when there's a user object """
-        user = models.User.objects.create_user(
-            "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse"
-        )
         instance = base_model.BookWyrmModel()
-        instance.user = user
+        instance.user = self.local_user
         instance.id = 1
         expected = instance.get_remote_id()
         self.assertEqual(expected, "https://%s/user/mouse/bookwyrmmodel/1" % DOMAIN)

From 8f3601d4cdfb0ea6a1dcd2f34250711ffd19c1b1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 12 Apr 2021 06:44:50 -0700
Subject: [PATCH 0791/1285] Adds redis mocks to base model tests

---
 bookwyrm/tests/models/test_base_model.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py
index bbc6c488..442f98ca 100644
--- a/bookwyrm/tests/models/test_base_model.py
+++ b/bookwyrm/tests/models/test_base_model.py
@@ -57,6 +57,7 @@ class BaseModel(TestCase):
         base_model.set_remote_id(None, instance, False)
         self.assertIsNone(instance.remote_id)
 
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
     def test_object_visible_to_user(self, _):
         """ does a user have permission to view an object """
         obj = models.Status.objects.create(
@@ -85,6 +86,7 @@ class BaseModel(TestCase):
         obj.mention_users.add(self.local_user)
         self.assertTrue(obj.visible_to_user(self.local_user))
 
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
     def test_object_visible_to_user_follower(self, _):
         """ what you can see if you follow a user """
         self.remote_user.followers.add(self.local_user)
@@ -104,6 +106,7 @@ class BaseModel(TestCase):
         obj.mention_users.add(self.local_user)
         self.assertTrue(obj.visible_to_user(self.local_user))
 
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
     def test_object_visible_to_user_blocked(self, _):
         """ you can't see it if they block you """
         self.remote_user.blocks.add(self.local_user)

From 92e9ff6cff26ac76b20932aa4f45f203b7127406 Mon Sep 17 00:00:00 2001
From: n2no1 <7995366-n2no1@users.noreply.gitlab.com>
Date: Mon, 12 Apr 2021 11:56:26 -0400
Subject: [PATCH 0792/1285] update links in README and
 {bookwyrm,celerywyrm}/settings.py files

the link to celery's homepage has been dead for at least several months
activitypub.rocks now supports tls (yay!)
the links to django's docs were for older versions of django than what bookwyrm uses
---
 README.md              | 4 ++--
 bookwyrm/settings.py   | 2 +-
 celerywyrm/settings.py | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 6dad4178..f70dd2ad 100644
--- a/README.md
+++ b/README.md
@@ -73,8 +73,8 @@ Since the project is still in its early stages, the features are growing every d
 Web backend
 - [Django](https://www.djangoproject.com/) web server
 - [PostgreSQL](https://www.postgresql.org/) database
-- [ActivityPub](http://activitypub.rocks/) federation
-- [Celery](http://celeryproject.org/) task queuing
+- [ActivityPub](https://activitypub.rocks/) federation
+- [Celery](https://docs.celeryproject.org/) task queuing
 - [Redis](https://redis.io/) task backend
 - [Redis (again)](https://redis.io/) activity stream manager
 
diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 146d4fff..73159c71 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -166,7 +166,7 @@ USE_TZ = True
 
 
 # Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/2.0/howto/static-files/
+# https://docs.djangoproject.com/en/3.1/howto/static-files/
 
 PROJECT_DIR = os.path.dirname(os.path.abspath(__file__))
 STATIC_URL = "/static/"
diff --git a/celerywyrm/settings.py b/celerywyrm/settings.py
index 952fe5b1..cd5b00ba 100644
--- a/celerywyrm/settings.py
+++ b/celerywyrm/settings.py
@@ -149,7 +149,7 @@ USE_TZ = True
 
 
 # Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/3.0/howto/static-files/
+# https://docs.djangoproject.com/en/3.1/howto/static-files/
 
 STATIC_URL = "/static/"
 STATIC_ROOT = os.path.join(BASE_DIR, env("STATIC_ROOT", "static"))

From 93fe0910348aa58beac6b26944b7bb4f9fc523c1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 12 Apr 2021 09:51:10 -0700
Subject: [PATCH 0793/1285] Adds field for user deactivation reason

---
 .../0066_user_deactivation_reason.py           | 18 ++++++++++++++++++
 bookwyrm/models/user.py                        | 13 +++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 bookwyrm/migrations/0066_user_deactivation_reason.py

diff --git a/bookwyrm/migrations/0066_user_deactivation_reason.py b/bookwyrm/migrations/0066_user_deactivation_reason.py
new file mode 100644
index 00000000..292f8306
--- /dev/null
+++ b/bookwyrm/migrations/0066_user_deactivation_reason.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.1.8 on 2021-04-12 15:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0065_merge_20210411_1702'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='deactivation_reason',
+            field=models.CharField(blank=True, choices=[('self_deletion', 'Self Deletion'), ('moderator_deletion', 'Moderator Deletion'), ('domain_block', 'Domain Block')], max_length=255, null=True),
+        ),
+    ]
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index c244d4ae..15ceb19b 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -24,6 +24,16 @@ from .federated_server import FederatedServer
 from . import fields, Review
 
 
+DeactivationReason = models.TextChoices(
+    "DeactivationReason",
+    [
+        "self_deletion",
+        "moderator_deletion",
+        "domain_block",
+    ],
+)
+
+
 class User(OrderedCollectionPageMixin, AbstractUser):
     """ a user who wants to read books """
 
@@ -111,6 +121,9 @@ class User(OrderedCollectionPageMixin, AbstractUser):
         default=str(pytz.utc),
         max_length=255,
     )
+    deactivation_reason = models.CharField(
+        max_length=255, choices=DeactivationReason.choices, null=True, blank=True
+    )
 
     name_field = "username"
     property_fields = [("following_link", "following")]

From 878b3c6fe8d6add1982a8725e44e2937345c5435 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 12 Apr 2021 10:13:38 -0700
Subject: [PATCH 0794/1285] Only reactivate appropriate users when undoing
 domain block

---
 .../0066_user_deactivation_reason.py          | 17 +++--
 bookwyrm/models/federated_server.py           |  9 ++-
 .../tests/models/test_federated_server.py     | 67 +++++++++++++++++++
 3 files changed, 86 insertions(+), 7 deletions(-)
 create mode 100644 bookwyrm/tests/models/test_federated_server.py

diff --git a/bookwyrm/migrations/0066_user_deactivation_reason.py b/bookwyrm/migrations/0066_user_deactivation_reason.py
index 292f8306..bb3173a7 100644
--- a/bookwyrm/migrations/0066_user_deactivation_reason.py
+++ b/bookwyrm/migrations/0066_user_deactivation_reason.py
@@ -6,13 +6,22 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0065_merge_20210411_1702'),
+        ("bookwyrm", "0065_merge_20210411_1702"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='user',
-            name='deactivation_reason',
-            field=models.CharField(blank=True, choices=[('self_deletion', 'Self Deletion'), ('moderator_deletion', 'Moderator Deletion'), ('domain_block', 'Domain Block')], max_length=255, null=True),
+            model_name="user",
+            name="deactivation_reason",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("self_deletion", "Self Deletion"),
+                    ("moderator_deletion", "Moderator Deletion"),
+                    ("domain_block", "Domain Block"),
+                ],
+                max_length=255,
+                null=True,
+            ),
         ),
     ]
diff --git a/bookwyrm/models/federated_server.py b/bookwyrm/models/federated_server.py
index d2b82355..aa2b2f6a 100644
--- a/bookwyrm/models/federated_server.py
+++ b/bookwyrm/models/federated_server.py
@@ -30,15 +30,18 @@ class FederatedServer(BookWyrmModel):
         self.save()
 
         # deactivate all associated users
-        self.user_set.update(is_active=False)
+        self.user_set.filter(is_active=True).update(
+            is_active=False, deactivation_reason="domain_block"
+        )
 
     def unblock(self):
         """ unblock a server """
         self.status = "federated"
         self.save()
 
-        # TODO: only reactivate users as appropriate
-        self.user_set.update(is_active=True)
+        self.user_set.filter(deactivation_reason="domain_block").update(
+            is_active=True, deactivation_reason=None
+        )
 
     @classmethod
     def is_blocked(cls, url):
diff --git a/bookwyrm/tests/models/test_federated_server.py b/bookwyrm/tests/models/test_federated_server.py
new file mode 100644
index 00000000..4e9e8b68
--- /dev/null
+++ b/bookwyrm/tests/models/test_federated_server.py
@@ -0,0 +1,67 @@
+""" testing models """
+from unittest.mock import patch
+from django.test import TestCase
+
+from bookwyrm import models
+
+
+class FederatedServer(TestCase):
+    """ federate server management """
+
+    def setUp(self):
+        """ we'll need a user """
+        self.server = models.FederatedServer.objects.create(server_name="test.server")
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            self.remote_user = models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                federated_server=self.server,
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
+            self.inactive_remote_user = models.User.objects.create_user(
+                "nutria",
+                "nutria@nutria.com",
+                "nutriaword",
+                federated_server=self.server,
+                local=False,
+                remote_id="https://example.com/users/nutria",
+                inbox="https://example.com/users/nutria/inbox",
+                outbox="https://example.com/users/nutria/outbox",
+                is_active=False,
+                deactivation_reason="self_deletion",
+            )
+
+    def test_block_unblock(self):
+        """ block a server and all users on it """
+        self.assertEqual(self.server.status, "federated")
+        self.assertTrue(self.remote_user.is_active)
+        self.assertFalse(self.inactive_remote_user.is_active)
+
+        self.server.block()
+
+        self.assertEqual(self.server.status, "blocked")
+        self.remote_user.refresh_from_db()
+        self.assertFalse(self.remote_user.is_active)
+        self.assertEqual(self.remote_user.deactivation_reason, "domain_block")
+
+        self.inactive_remote_user.refresh_from_db()
+        self.assertFalse(self.inactive_remote_user.is_active)
+        self.assertEqual(self.inactive_remote_user.deactivation_reason, "self_deletion")
+
+        # UNBLOCK
+        self.server.unblock()
+
+        self.assertEqual(self.server.status, "federated")
+        # user blocked in deactivation is reactivated
+        self.remote_user.refresh_from_db()
+        self.assertTrue(self.remote_user.is_active)
+        self.assertIsNone(self.remote_user.deactivation_reason)
+
+        # deleted user remains deleted
+        self.inactive_remote_user.refresh_from_db()
+        self.assertFalse(self.inactive_remote_user.is_active)
+        self.assertEqual(self.inactive_remote_user.deactivation_reason, "self_deletion")

From bb352439d34d96344af6acd277e77cc0c69e50c3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 12 Apr 2021 10:27:29 -0700
Subject: [PATCH 0795/1285] Fixes views test for federation unblock

---
 bookwyrm/tests/views/test_federation.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bookwyrm/tests/views/test_federation.py b/bookwyrm/tests/views/test_federation.py
index b31aaf09..4dc5d048 100644
--- a/bookwyrm/tests/views/test_federation.py
+++ b/bookwyrm/tests/views/test_federation.py
@@ -83,6 +83,7 @@ class FederationViews(TestCase):
         )
         self.remote_user.federated_server = server
         self.remote_user.is_active = False
+        self.remote_user.deactivation_reason = "domain_block"
         self.remote_user.save()
 
         request = self.factory.post("")

From 90b1315ae5a4fece21cc8cee17599bdd0d2b9bbf Mon Sep 17 00:00:00 2001
From: tofuwabohu <mail@lapete.de>
Date: Mon, 12 Apr 2021 20:17:58 +0200
Subject: [PATCH 0796/1285] Apply merge changes to INSTALLATION instructions
 too

---
 INSTALLATION.md | 180 +++++++++++++++++++++++++++---------------------
 1 file changed, 100 insertions(+), 80 deletions(-)

diff --git a/INSTALLATION.md b/INSTALLATION.md
index c290d059..3495bdf3 100644
--- a/INSTALLATION.md
+++ b/INSTALLATION.md
@@ -1,11 +1,17 @@
 # Installation instructions
 
+
 ## Setting up the developer environment
 
-Set up the environment file:
+Set up the development environment file:
 
 ``` bash
-cp .env.example .env
+cp .env.dev.example .env
+```
+
+Set up nginx for development `nginx/default.conf`:
+``` bash
+cp nginx/development nginx/default.conf
 ```
 
 For most testing, you'll want to use ngrok. Remember to set the DOMAIN in `.env` to your ngrok domain.
@@ -19,7 +25,7 @@ docker-compose run --rm web python manage.py initdb
 docker-compose up
 ```
 
-Once the build is complete, you can access the instance at `localhost:1333`
+Once the build is complete, you can access the instance at `http://localhost:1333`
 
 ### Editing static files
 If you edit the CSS or JavaScript, you will need to run Django's `collectstatic` command in order for your changes to have effect. You can do this by running:
@@ -27,6 +33,8 @@ If you edit the CSS or JavaScript, you will need to run Django's `collectstatic`
 ./bw-dev collectstatic
 ```
 
+If you have [installed yarn](https://yarnpkg.com/getting-started/install), you can run `yarn watch:static` to automatically run the previous script every time a change occurs in _bookwyrm/static_ directory.
+
 ### Working with translations and locale files
 Text in the html files are wrapped in translation tags (`{% trans %}` and `{% blocktrans %}`), and Django generates locale files for all the strings in which you can add translations for the text. You can find existing translations in the `locale/` directory.
 
@@ -56,10 +64,10 @@ You can add the `-l <language code>` to only compile one language. When you refr
 This project is still young and isn't, at the moment, very stable, so please proceed with caution when running in production.
 
 ### Server setup
- - Get a domain name and set up DNS for your server
- - Set your server up with appropriate firewalls for running a web application (this instruction set is tested against Ubuntu 20.04)
- - Set up an email service (such as mailgun) and the appropriate SMTP/DNS settings
- - Install Docker and docker-compose
+- Get a domain name and set up DNS for your server
+- Set your server up with appropriate firewalls for running a web application (this instruction set is tested against Ubuntu 20.04)
+- Set up an email service (such as mailgun) and the appropriate SMTP/DNS settings
+- Install Docker and docker-compose
 
 ### Install and configure BookWyrm
 
@@ -67,37 +75,46 @@ The `production` branch of BookWyrm contains a number of tools not on the `main`
 
 Instructions for running BookWyrm in production:
 
- - Get the application code:
-  `git clone git@github.com:mouse-reeve/bookwyrm.git`
- - Switch to the `production` branch
-  `git checkout production`
- - Create your environment variables file
-  `cp .env.example .env`
-   - Add your domain, email address, SMTP credentials
-   - Set a secure redis password and secret key
-   - Set a secure database password for postgres
- - Update your nginx configuration in `nginx/default.conf`
-   - Replace `your-domain.com` with your domain name
-   - If you aren't using the `www` subdomain, remove the www.your-domain.com version of the domain from the `server_name` in the first server block in `nginx/default.conf` and remove the `-d www.${DOMAIN}` flag at the end of the `certbot` command in `docker-compose.yml`.
-   - If you are running another web-server on your host machine, you will need to follow the [reverse-proxy instructions](#running-bookwyrm-behind-a-reverse-proxy)
- - Run the application (this should also set up a Certbot ssl cert for your domain) with
-  `docker-compose up --build`, and make sure all the images build successfully
+- Get the application code:
+    `git clone git@github.com:mouse-reeve/bookwyrm.git`
+- Switch to the `production` branch:
+    `git checkout production`
+- Create your environment variables file, `cp .env.prod.example .env`, and update the following:
+    - `SECRET_KEY` | A difficult to guess, secret string of characers
+    - `DOMAIN` | Your web domain
+    - `EMAIL` | Email address to be used for certbot domain verification
+    - `POSTGRES_PASSWORD` | Set a secure password for the database
+    - `REDIS_ACTIVITY_PASSWORD` | Set a secure password for Redis Activity subsystem
+    - `REDIS_BROKER_PASSWORD` | Set a secure password for Redis queue broker subsystem
+    - `FLOWER_USER` | Your own username for accessing Flower queue monitor
+    - `FLOWER_PASSWORD` | Your own secure password for accessing Flower queue monitor
+- Update your nginx configuration in `nginx/default.conf`
+    - Replace `your-domain.com` with your domain name
+- Configure nginx
+    - Make a copy of the production template config and set it for use in nginx `cp nginx/production nginx/default.conf`
+    - Update `nginx/default.conf`:
+        - Replace `your-domain.com` with your domain name
+        - If you aren't using the `www` subdomain, remove the www.your-domain.com version of the domain from the `server_name` in the first server block in `nginx/default.conf` and remove the `-d www.${DOMAIN}` flag at the end of the `certbot` command in `docker-compose.yml`.
+        - If you are running another web-server on your host machine, you will need to follow the [reverse-proxy instructions](#running-bookwyrm-behind-a-reverse-proxy)
+- If you need to initialize your certbot for your domain, set `CERTBOT_INIT=true` in your `.env` file
+- Run the application (this should also set up a Certbot ssl cert for your domain) with
+    `docker-compose up --build`, and make sure all the images build successfully
     - If you are running other services on your host machine, you may run into errors where services fail when attempting to bind to a port.
     See the [troubleshooting guide](#port-conflicts) for advice on resolving this.
- - When docker has built successfully, stop the process with `CTRL-C`
- - Comment out the `command: certonly...` line in `docker-compose.yml`, and uncomment the following line (`command: renew ...`) so that the certificate will be automatically renewed.
- - Uncomment the https redirect and `server` block in `nginx/default.conf` (lines 17-48).
- - Run docker-compose in the background with: `docker-compose up -d`
- - Initialize the database with: `./bw-dev initdb`
+- When docker has built successfully, stop the process with `CTRL-C`
+- If you set `CERTBOT_INIT=true` earlier, set it now as `CERTBOT_INIT=false` so that certbot runs in renew mode
+- Run docker-compose in the background with: `docker-compose up -d`
+- Initialize the database with: `./bw-dev initdb`
+- Set up schedule backups with cron that runs that `docker-compose exec db pg_dump -U <databasename>` and saves the backup to a safe location
 
 Congrats! You did it, go to your domain and enjoy the fruits of your labors.
 
 ### Configure your instance
- - Register a user account in the application UI
- - Make your account a superuser (warning: do *not* use django's `createsuperuser` command)
-   - On your server, open the django shell
+- Register a user account in the application UI
+- Make your account a superuser (warning: do *not* use django's `createsuperuser` command)
+    - On your server, open the django shell
     `./bw-dev shell`
-   - Load your user and make it a superuser
+    - Load your user and make it a superuser
     ```python
     from bookwyrm import models
     user = models.User.objects.get(id=1)
@@ -105,18 +122,7 @@ Congrats! You did it, go to your domain and enjoy the fruits of your labors.
     user.is_superuser = True
     user.save()
     ```
-   - Go to the site settings (`/settings/site-settings` on your domain) and configure your instance name, description, code of conduct, and toggle whether registration is open on your instance
-
-
-## Book data
-The application is set up to share book and author data between instances, and get book data from arbitrary outside sources. Right now, the only connector is to OpenLibrary, but other connectors could be written.
-
-There are three concepts in the book data model:
- - `Book`, an abstract, high-level concept that could mean either a `Work` or an `Edition`. No data is saved as a `Book`, it serves as shared model for `Work` and `Edition`
- - `Work`, the theoretical umbrella concept of a book that encompasses every edition of the book, and
- - `Edition`, a concrete, actually published version of a book
-
-Whenever a user interacts with a book, they are interacting with a specific edition. Every work has a default edition, but the user can select other editions. Reviews aggregated for all editions of a work when you view an edition's page.
+    - Go to the site settings (`/settings/site-settings` on your domain) and configure your instance name, description, code of conduct, and toggle whether registration is open on your instance
 
 ### Backups
 
@@ -125,12 +131,26 @@ Backups are named `backup__%Y-%m-%d.sql`.
 
 The db service has an optional script for periodically pruning the backups directory so that all recent daily backups are kept, but for older backups, only weekly or monthly backups are kept.
 To enable this script:
- - Uncomment the final line in `postgres-docker/cronfile`
- - rebuild your instance `docker-compose up --build`
+- Uncomment the final line in `postgres-docker/cronfile`
+- rebuild your instance `docker-compose up --build`
 
 You can copy backups from the backups volume to your host machine with `docker cp`:
- - Run `docker-compose ps` to confirm the db service's full name (it's probably `bookwyrm_db_1`.
- - Run `docker cp <container_name>:/backups <host machine path>`
+- Run `docker-compose ps` to confirm the db service's full name (it's probably `bookwyrm_db_1`.
+- Run `docker cp <container_name>:/backups <host machine path>`
+
+### Updating your instance
+
+When there are changes available in the production branch, you can install and get them running on your instance using the command `./bw-dev update`. This does a number of things:
+- `git pull` gets the updated code from the git repository. If there are conflicts, you may need to run `git pull` separately and resolve the conflicts before trying the `./bw-dev update` script again.
+- `docker-compose build` rebuilds the images, which ensures that the correct packages are installed. This step takes a long time and is only needed when the dependencies (including pip `requirements.txt` packages) have changed, so you can comment it out if you want a quicker update path and don't mind un-commenting it as needed.
+- `docker-compose exec web python manage.py migrate` runs the database migrations in Django
+- `docker-compose exec web python manage.py collectstatic --no-input` loads any updated static files (such as the JavaScript and CSS)
+- `docker-compose restart` reloads the docker containers
+
+### Re-building activity streams
+
+If something goes awry with user timelines, and you want to re-create them en mass, there's a management command for that:
+`docker-compose run --rm web python manage.py rebuild_feeds`
 
 ### Port Conflicts
 
@@ -139,15 +159,15 @@ This means that, depending on what else you are running on your host machine, yo
 
 If this occurs, you will need to change your configuration to run services on different ports.
 This may require one or more changes the following files:
- - `docker-compose.yml`
- - `nginx/default.conf`
- - `.env` (You create this file yourself during setup)
+- `docker-compose.yml`
+- `nginx/default.conf`
+- `.env` (You create this file yourself during setup)
 
 E.g., If you need Redis to run on a different port:
- - In `docker-compose.yml`:
+- In `docker-compose.yml`:
     - In `services` -> `redis` -> `command`, add `--port YOUR_PORT` to the command
     - In `services` -> `redis` -> `ports`, change `6379:6379` to your port
- - In `.env`, update `REDIS_PORT`
+- In `.env`, update `REDIS_PORT`
 
 If you are already running a web-server on your machine, you will need to set up a reverse-proxy.
 
@@ -159,11 +179,11 @@ The default BookWyrm configuration already has an nginx server that proxies requ
 The static files are stored in a Docker volume that several BookWyrm services access, so it is not recommended to remove this server completely.
 
 To run BookWyrm behind a reverse-proxy, make the following changes:
- - In `nginx/default.conf`:
+- In `nginx/default.conf`:
     - Comment out the two default servers
     - Uncomment the server labeled Reverse-Proxy server
     - Replace `your-domain.com` with your domain name
- - In `docker-compose.yml`:
+- In `docker-compose.yml`:
     - In `services` -> `nginx` -> `ports`, comment out the default ports and add `- 8001:8001`
     - In `services` -> `nginx` -> `volumes`, comment out the two volumes that begin `./certbot/`
     - In `services`, comment out the `certbot` service
@@ -179,35 +199,35 @@ Before you can set up nginx, you will need to locate your nginx configuration di
 See [nginx's guide](http://nginx.org/en/docs/beginners_guide.html) for details.
 
 To set up your server:
- - In you `nginx.conf` file, ensure that `include servers/*;` isn't commented out.
- - In your nginx `servers` directory, create a new file named after your domain containing the following information:
-   ```nginx
-   server {
-      server_name your-domain.com www.your-domain.com;
+- In you `nginx.conf` file, ensure that `include servers/*;` isn't commented out.
+- In your nginx `servers` directory, create a new file named after your domain containing the following information:
+    ```nginx
+    server {
+        server_name your-domain.com www.your-domain.com;
 
-      location / {
-          proxy_pass http://localhost:8000;
-          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-          proxy_set_header Host $host;
-      }
+        location / {
+            proxy_pass http://localhost:8000;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header Host $host;
+        }
 
-      location /images/ {
-          proxy_pass http://localhost:8001;
-          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-          proxy_set_header Host $host;
-      }
+        location /images/ {
+            proxy_pass http://localhost:8001;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header Host $host;
+        }
 
-      location /static/ {
-          proxy_pass http://localhost:8001;
-          proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-          proxy_set_header Host $host;
-      }
+        location /static/ {
+            proxy_pass http://localhost:8001;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header Host $host;
+        }
 
-      listen [::]:80 ssl;
-      listen 80 ssl;
-   }
-   ```
- - run `sudo certbot run --nginx --email YOUR_EMAIL -d your-domain.com -d www.your-domain.com`
- - restart nginx
+        listen [::]:80 ssl;
+        listen 80 ssl;
+    }
+    ```
+- run `sudo certbot run --nginx --email YOUR_EMAIL -d your-domain.com -d www.your-domain.com`
+- restart nginx
 
 If everything worked correctly, your BookWyrm instance should now be externally accessible.
\ No newline at end of file

From 14d5609002862a0785edb49e735889c793d369d3 Mon Sep 17 00:00:00 2001
From: tofuwabohu <mail@lapete.de>
Date: Mon, 12 Apr 2021 20:44:55 +0200
Subject: [PATCH 0797/1285] Indentation in md

---
 INSTALLATION.md |  2 +-
 README.md       | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/INSTALLATION.md b/INSTALLATION.md
index 3495bdf3..e3c7192b 100644
--- a/INSTALLATION.md
+++ b/INSTALLATION.md
@@ -230,4 +230,4 @@ To set up your server:
 - run `sudo certbot run --nginx --email YOUR_EMAIL -d your-domain.com -d www.your-domain.com`
 - restart nginx
 
-If everything worked correctly, your BookWyrm instance should now be externally accessible.
\ No newline at end of file
+If everything worked correctly, your BookWyrm instance should now be externally accessible.
diff --git a/README.md b/README.md
index 91a9aaaf..670d8b23 100644
--- a/README.md
+++ b/README.md
@@ -6,11 +6,11 @@ Social reading and reviewing, decentralized with ActivityPub
 - [Joining BookWyrm](#joining-bookwyrm)
 - [Contributing](#contributing)
 - [About BookWyrm](#about-bookwyrm)
-   - [What it is and isn't](#what-it-is-and-isnt)
-   - [The role of federation](#the-role-of-federation)
-   - [Features](#features)
- - [Book data](#book-data)
- - [Set up Bookwyrm](#set-up-bookwyrm)
+    - [What it is and isn't](#what-it-is-and-isnt)
+    - [The role of federation](#the-role-of-federation)
+    - [Features](#features)
+- [Book data](#book-data)
+- [Set up Bookwyrm](#set-up-bookwyrm)
 
 ## Joining BookWyrm
 BookWyrm is still a young piece of software, and isn't at the level of stability and feature-richness that you'd find in a production-ready application. But it does what it says on the box! If you'd like to join an instance, you can check out the [instances](https://github.com/mouse-reeve/bookwyrm/blob/main/instances.md) list.
@@ -67,9 +67,9 @@ Web backend
 - [Redis (again)](https://redis.io/) activity stream manager
 
 Front end
- - Django templates
- - [Bulma.io](https://bulma.io/) css framework
- - Vanilla JavaScript, in moderation
+- Django templates
+- [Bulma.io](https://bulma.io/) css framework
+- Vanilla JavaScript, in moderation
 
 Deployment
 - [Docker](https://www.docker.com/) and docker-compose

From 901e7f69d436e66de2e664c645c9521e7bbbe9d1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 12 Apr 2021 14:23:51 -0700
Subject: [PATCH 0798/1285] Allow admins to upload domain blocklists

Fixes #804
---
 bookwyrm/templates/import.html                |  2 +-
 bookwyrm/templates/settings/edit_server.html  | 17 ++++-
 .../templates/settings/federated_server.html  |  3 +-
 bookwyrm/templates/settings/federation.html   |  2 +-
 .../templates/settings/server_blocklist.html  | 67 +++++++++++++++++++
 bookwyrm/urls.py                              |  5 ++
 bookwyrm/views/__init__.py                    |  3 +-
 bookwyrm/views/federation.py                  | 35 ++++++++++
 8 files changed, 128 insertions(+), 6 deletions(-)
 create mode 100644 bookwyrm/templates/settings/server_blocklist.html

diff --git a/bookwyrm/templates/import.html b/bookwyrm/templates/import.html
index a5405131..239b6914 100644
--- a/bookwyrm/templates/import.html
+++ b/bookwyrm/templates/import.html
@@ -26,7 +26,7 @@
                 </select>
             </div>
             <div class="field">
-                <label class="label" for="id_csv_field">{% trans "Data file:" %}</label>
+                <label class="label" for="id_csv_file">{% trans "Data file:" %}</label>
                 {{ import_form.csv_file }}
             </div>
         </div>
diff --git a/bookwyrm/templates/settings/edit_server.html b/bookwyrm/templates/settings/edit_server.html
index 6ae22789..c5702c84 100644
--- a/bookwyrm/templates/settings/edit_server.html
+++ b/bookwyrm/templates/settings/edit_server.html
@@ -9,6 +9,19 @@
 
 {% block panel %}
 
+<div class="tabs">
+    <ul>
+        {% url 'settings-import-blocklist' as url %}
+        <li {% if url in request.path %}class="is-active" aria-current="page"{% endif %}>
+            <a href="{{ url }}">{% trans "Import block list" %}</a>
+        </li>
+        {% url 'settings-add-federated-server' as url %}
+        <li {% if url in request.path %}class="is-active" aria-current="page"{% endif %}>
+            <a href="{{ url }}">{% trans "Add server" %}</a>
+        </li>
+    </ul>
+</div>
+
 <form method="POST" action="{% url 'settings-add-federated-server' %}">
     {% csrf_token %}
     <div class="columns">
@@ -24,8 +37,8 @@
                 <label class="label" for="id_status">{% trans "Status:" %}</label>
                 <div class="select">
                     <select name="status" class="" id="id_status">
-                        <option value="federated" {% if form.status.value == "federated" or not form.status.value %}selected=""{% endif %}>{% trans "Federated" %}</option>
-                        <option value="blocked" {% if form.status.value == "blocked" %}selected{% endif %}>{% trans "Blocked" %}</option>
+                        <option value="federated" {% if form.status.value == "federated" %}selected=""{% endif %}>{% trans "Federated" %}</option>
+                        <option value="blocked" {% if form.status.value == "blocked" or not form.status.value %}selected{% endif %}>{% trans "Blocked" %}</option>
                     </select>
                 </div>
             </div>
diff --git a/bookwyrm/templates/settings/federated_server.html b/bookwyrm/templates/settings/federated_server.html
index 6996557d..14b78af0 100644
--- a/bookwyrm/templates/settings/federated_server.html
+++ b/bookwyrm/templates/settings/federated_server.html
@@ -1,6 +1,7 @@
 {% extends 'settings/admin_layout.html' %}
 {% block title %}{{ server.server_name }}{% endblock %}
 {% load i18n %}
+{% load bookwyrm_tags %}
 
 {% block header %}
 {{ server.server_name }}
@@ -81,7 +82,7 @@
         </div>
     </header>
     {% if server.notes %}
-    <p id="hide-edit-notes">{{ server.notes }}</p>
+    <p id="hide-edit-notes">{{ server.notes|to_markdown|safe }}</p>
     {% endif %}
     <form class="box is-hidden" method="POST" action="{% url 'settings-federated-server' server.id %}" id="edit-notes">
         {% csrf_token %}
diff --git a/bookwyrm/templates/settings/federation.html b/bookwyrm/templates/settings/federation.html
index 99afb541..9eb0f8b1 100644
--- a/bookwyrm/templates/settings/federation.html
+++ b/bookwyrm/templates/settings/federation.html
@@ -5,7 +5,7 @@
 {% block header %}{% trans "Federated Servers" %}{% endblock %}
 
 {% block edit-button %}
-<a href="{% url 'settings-add-federated-server' %}">
+<a href="{% url 'settings-import-blocklist' %}">
     <span class="icon icon-plus" title="{% trans 'Add server' %}">
         <span class="is-sr-only">{% trans "Add server" %}</span>
     </span>
diff --git a/bookwyrm/templates/settings/server_blocklist.html b/bookwyrm/templates/settings/server_blocklist.html
new file mode 100644
index 00000000..0de49acd
--- /dev/null
+++ b/bookwyrm/templates/settings/server_blocklist.html
@@ -0,0 +1,67 @@
+{% extends 'settings/admin_layout.html' %}
+{% load i18n %}
+{% block title %}{% trans "Add server" %}{% endblock %}
+
+{% block header %}
+{% trans "Import Blocklist" %}
+<a href="{% url 'settings-federation' %}" class="has-text-weight-normal help">{% trans "Back to server list" %}</a>
+{% endblock %}
+
+{% block panel %}
+
+<div class="tabs">
+    <ul>
+        {% url 'settings-import-blocklist' as url %}
+        <li {% if url in request.path %}class="is-active" aria-current="page"{% endif %}>
+            <a href="{{ url }}">{% trans "Import block list" %}</a>
+        </li>
+        {% url 'settings-add-federated-server' as url %}
+        <li {% if url in request.path %}class="is-active" aria-current="page"{% endif %}>
+            <a href="{{ url }}">{% trans "Add server" %}</a>
+        </li>
+    </ul>
+</div>
+
+{% if succeeded and not failed %}
+<p class="notification is-primary">{% trans "Success!" %}</p>
+{% elif succeeded or failed %}
+<div class="block content">
+    {% if succeeded %}
+    <p>{% trans "Successfully blocked:" %} {{ succeeded }}</p>
+    {% endif %}
+    <p>{% trans "Failed:" %}</p>
+    <ul>
+        {% for item in failed %}
+        <li>
+            <pre>
+{{ item }}
+</pre>
+        </li>
+        {% endfor %}
+    </ul>
+</div>
+{% endif %}
+
+<form method="POST" action="{% url 'settings-import-blocklist' %}" enctype="multipart/form-data">
+    {% csrf_token %}
+    <div class="field">
+        <label class="label" for="id_file">JSON data:</label>
+        <aside class="help">
+            Expects a json file in the format provided by <a href="https://fediblock.org/" target="_blank" rel=�noopener�>FediBlock</a>, with a list of entries that have <code>instance</code> and <code>url</code> fields. For example:
+            <pre>
+[
+    {
+        "instance": "example.server.com",
+        "url": "https://link.to.more/info"
+    },
+    ...
+]
+</pre>
+        </aside>
+        <input type="file" name="json_file" required="" id="id_file">
+    </div>
+
+    <button type="submit" class="button is-primary">{% trans "Import" %}</button>
+</form>
+
+{% endblock %}
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index c5c52800..cf3f877b 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -83,6 +83,11 @@ urlpatterns = [
         views.AddFederatedServer.as_view(),
         name="settings-add-federated-server",
     ),
+    re_path(
+        r"^settings/federation/import/?$",
+        views.ImportServerBlocklist.as_view(),
+        name="settings-import-blocklist",
+    ),
     re_path(
         r"^settings/invites/?$", views.ManageInvites.as_view(), name="settings-invites"
     ),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index d7bc4e13..9f8463b4 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -5,7 +5,8 @@ from .block import Block, unblock
 from .books import Book, EditBook, ConfirmEditBook, Editions
 from .books import upload_cover, add_description, switch_edition, resolve_book
 from .directory import Directory
-from .federation import Federation, FederatedServer, AddFederatedServer
+from .federation import Federation, FederatedServer
+from .federation import AddFederatedServer, ImportServerBlocklist
 from .federation import block_server, unblock_server
 from .feed import DirectMessage, Feed, Replies, Status
 from .follow import follow, unfollow
diff --git a/bookwyrm/views/federation.py b/bookwyrm/views/federation.py
index f34f7d19..b9a7fa85 100644
--- a/bookwyrm/views/federation.py
+++ b/bookwyrm/views/federation.py
@@ -1,6 +1,8 @@
 """ manage federated servers """
+import json
 from django.contrib.auth.decorators import login_required, permission_required
 from django.core.paginator import Paginator
+from django.db import transaction
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
@@ -63,6 +65,39 @@ class AddFederatedServer(View):
         return redirect("settings-federated-server", server.id)
 
 
+class ImportServerBlocklist(View):
+    """ manually add a server """
+
+    def get(self, request):
+        """ add server form """
+        return TemplateResponse(request, "settings/server_blocklist.html")
+
+    def post(self, request):
+        """ add a server from the admin panel """
+        json_data = json.load(
+            request.FILES["json_file"]
+        )
+        failed = []
+        success_count = 0
+        for item in json_data:
+            server_name = item.get("instance")
+            if not server_name:
+                failed.append(item)
+                continue
+            info_link = item.get("url")
+
+            with transaction.atomic():
+                server, _ = models.FederatedServer.objects.get_or_create(
+                    server_name=server_name,
+                )
+                server.notes = info_link
+                server.save()
+                server.block()
+            success_count += 1
+        data = {"failed": failed, "succeeded": success_count}
+        return TemplateResponse(request, "settings/server_blocklist.html", data)
+
+
 @method_decorator(login_required, name="dispatch")
 @method_decorator(
     permission_required("bookwyrm.control_federation", raise_exception=True),

From a907dfdce7744aeb1bef046acfd17ab67c5e7f88 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 12 Apr 2021 15:08:10 -0700
Subject: [PATCH 0799/1285] Adds tests for block lists

---
 bookwyrm/tests/views/test_federation.py | 37 +++++++++++++++++++++++++
 bookwyrm/views/federation.py            |  5 ++++
 2 files changed, 42 insertions(+)

diff --git a/bookwyrm/tests/views/test_federation.py b/bookwyrm/tests/views/test_federation.py
index 4dc5d048..b56c2581 100644
--- a/bookwyrm/tests/views/test_federation.py
+++ b/bookwyrm/tests/views/test_federation.py
@@ -1,5 +1,7 @@
 """ test for app action functionality """
+import json
 from unittest.mock import patch
+from django.core.files.uploadedfile import SimpleUploadedFile
 from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
@@ -127,3 +129,38 @@ class FederationViews(TestCase):
         self.assertEqual(server.server_name, "remote.server")
         self.assertEqual(server.application_type, "coolsoft")
         self.assertEqual(server.status, "blocked")
+
+    def test_import_blocklist(self):
+        """ load a json file with a list of servers to block """
+        server = models.FederatedServer.objects.create(server_name="hi.there.com")
+        self.remote_user.federated_server = server
+        self.remote_user.save()
+
+        data = [
+            {"instance": "server.name", "url": "https://explanation.url"},  # new server
+            {"instance": "hi.there.com", "url": "https://explanation.url"},  # existing
+            {"a": "b"},  # invalid
+        ]
+        json.dump(data, open("file.json", "w"))
+
+        view = views.ImportServerBlocklist.as_view()
+        request = self.factory.post(
+            "", {
+                "json_file": SimpleUploadedFile(
+                    "file.json", open("file.json", "rb").read()
+                )
+            }
+        )
+        request.user = self.local_user
+        request.user.is_superuser = True
+
+        view(request)
+        server.refresh_from_db()
+        self.remote_user.refresh_from_db()
+
+        self.assertEqual(models.FederatedServer.objects.count(), 2)
+        self.assertEqual(server.status, "blocked")
+        self.assertFalse(self.remote_user.is_active)
+        created = models.FederatedServer.objects.get(server_name="server.name")
+        self.assertEqual(created.status, "blocked")
+        self.assertEqual(created.notes, "https://explanation.url")
diff --git a/bookwyrm/views/federation.py b/bookwyrm/views/federation.py
index b9a7fa85..25cd212b 100644
--- a/bookwyrm/views/federation.py
+++ b/bookwyrm/views/federation.py
@@ -65,6 +65,11 @@ class AddFederatedServer(View):
         return redirect("settings-federated-server", server.id)
 
 
+@method_decorator(login_required, name="dispatch")
+@method_decorator(
+    permission_required("bookwyrm.control_federation", raise_exception=True),
+    name="dispatch",
+)
 class ImportServerBlocklist(View):
     """ manually add a server """
 

From 822e2e1a931f53a64372be6c8557db180aeaf802 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 12 Apr 2021 15:09:50 -0700
Subject: [PATCH 0800/1285] Python formatting

---
 bookwyrm/tests/views/test_federation.py | 5 +++--
 bookwyrm/views/federation.py            | 4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/tests/views/test_federation.py b/bookwyrm/tests/views/test_federation.py
index b56c2581..2afdd6d3 100644
--- a/bookwyrm/tests/views/test_federation.py
+++ b/bookwyrm/tests/views/test_federation.py
@@ -145,11 +145,12 @@ class FederationViews(TestCase):
 
         view = views.ImportServerBlocklist.as_view()
         request = self.factory.post(
-            "", {
+            "",
+            {
                 "json_file": SimpleUploadedFile(
                     "file.json", open("file.json", "rb").read()
                 )
-            }
+            },
         )
         request.user = self.local_user
         request.user.is_superuser = True
diff --git a/bookwyrm/views/federation.py b/bookwyrm/views/federation.py
index 25cd212b..db54cd7a 100644
--- a/bookwyrm/views/federation.py
+++ b/bookwyrm/views/federation.py
@@ -79,9 +79,7 @@ class ImportServerBlocklist(View):
 
     def post(self, request):
         """ add a server from the admin panel """
-        json_data = json.load(
-            request.FILES["json_file"]
-        )
+        json_data = json.load(request.FILES["json_file"])
         failed = []
         success_count = 0
         for item in json_data:

From ba48fcd6f776b907e3b152fb7982ad009d08f8f7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 12 Apr 2021 15:11:01 -0700
Subject: [PATCH 0801/1285] Fixes markdown formatting

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 670d8b23..ffdf42de 100644
--- a/README.md
+++ b/README.md
@@ -32,27 +32,27 @@ Federation makes it possible to have small, self-determining communities, in con
 
 ### Features
 Since the project is still in its early stages, the features are growing every day, and there is plenty of room for suggestions and ideas. Open an [issue](https://github.com/mouse-reeve/bookwyrm/issues) to get the conversation going!
- - Posting about books
+- Posting about books
     - Compose reviews, with or without ratings, which are aggregated in the book page
     - Compose other kinds of statuses about books, such as:
-     - Comments on a book
-     - Quotes or excerpts
+        - Comments on a book
+        - Quotes or excerpts
     - Reply to statuses
     - View aggregate reviews of a book across connected BookWyrm instances
     - Differentiate local and federated reviews and rating in your activity feed
- - Track reading activity
+- Track reading activity
     - Shelve books on default "to-read," "currently reading," and "read" shelves
     - Create custom shelves
     - Store started reading/finished reading dates, as well as progress updates along the way
     - Update followers about reading activity (optionally, and with granular privacy controls)
     - Create lists of books which can be open to submissions from anyone, curated, or only edited by the creator
- - Federation with ActivityPub
+- Federation with ActivityPub
     - Broadcast and receive user statuses and activity
     - Share book data between instances to create a networked database of metadata
     - Identify shared books across instances and aggregate related content
     - Follow and interact with users across BookWyrm instances
     - Inter-operate with non-BookWyrm ActivityPub services (currently, Mastodon is supported)
- - Granular privacy controls
+- Granular privacy controls
     - Private, followers-only, and public privacy levels for posting, shelves, and lists
     - Option for users to manually approve followers
     - Allow blocking and flagging for moderation

From 43581d75bccebe187611e2161aeda01822e5e8c3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 13 Apr 2021 10:26:46 -0700
Subject: [PATCH 0802/1285] Updates README for new docs website

---
 CONTRIBUTING.md |  16 ----
 INSTALLATION.md | 233 ------------------------------------------------
 README.md       |  10 +--
 instances.md    |   5 --
 4 files changed, 5 insertions(+), 259 deletions(-)
 delete mode 100644 CONTRIBUTING.md
 delete mode 100644 INSTALLATION.md
 delete mode 100644 instances.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index b73bdd6f..00000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Contributing
-There are many ways you can contribute to this project, regardless of your level of technical expertise.
-
-## Feedback and feature requests
-Please feel encouraged and welcome to point out bugs, suggestions, feature requests, and ideas for how things ought to work using [GitHub issues](https://github.com/mouse-reeve/bookwyrm/issues).
-
-## Code contributions
-Code contributions are gladly welcomed! If you're not sure where to start, take a look at the ["Good first issue"](https://github.com/mouse-reeve/bookwyrm/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) tag. Because BookWyrm is a small project, there isn't a lot of formal structure, but there is a huge capacity for one-on-one support, which can look like asking questions as you go, pair programming, video chats, et cetera, so please feel free to reach out.
-
-If you have questions about the project or contributing, you can set up a video call during BookWyrm ["office hours"](https://calendly.com/mouse-reeve/30min).
-
-## Translation
-Do you speak a language besides English? BookWyrm needs localization! If you're comfortable using git and want to get into the code, there are [instructions](#working-with-translations-and-locale-files) on how to create and edit localization files. If you feel more comfortable working in a regular text editor and would prefer not to run the application, get in touch directly and we can figure out a system, like emailing a text file, that works best.
-
-## Financial Support
-BookWyrm is an ad-free passion project with no intentions of seeking out venture funding or corporate financial relationships. If you want to help keep the project going, you can donate to the [Patreon](https://www.patreon.com/bookwyrm), or make a one time gift via [PayPal](https://paypal.me/oulipo).
diff --git a/INSTALLATION.md b/INSTALLATION.md
deleted file mode 100644
index e3c7192b..00000000
--- a/INSTALLATION.md
+++ /dev/null
@@ -1,233 +0,0 @@
-# Installation instructions
-
-
-## Setting up the developer environment
-
-Set up the development environment file:
-
-``` bash
-cp .env.dev.example .env
-```
-
-Set up nginx for development `nginx/default.conf`:
-``` bash
-cp nginx/development nginx/default.conf
-```
-
-For most testing, you'll want to use ngrok. Remember to set the DOMAIN in `.env` to your ngrok domain.
-
-You'll have to install the Docker and docker-compose. When you're ready, run:
-
-```bash
-docker-compose build
-docker-compose run --rm web python manage.py migrate
-docker-compose run --rm web python manage.py initdb
-docker-compose up
-```
-
-Once the build is complete, you can access the instance at `http://localhost:1333`
-
-### Editing static files
-If you edit the CSS or JavaScript, you will need to run Django's `collectstatic` command in order for your changes to have effect. You can do this by running:
-``` bash
-./bw-dev collectstatic
-```
-
-If you have [installed yarn](https://yarnpkg.com/getting-started/install), you can run `yarn watch:static` to automatically run the previous script every time a change occurs in _bookwyrm/static_ directory.
-
-### Working with translations and locale files
-Text in the html files are wrapped in translation tags (`{% trans %}` and `{% blocktrans %}`), and Django generates locale files for all the strings in which you can add translations for the text. You can find existing translations in the `locale/` directory.
-
-The application's language is set by a request header sent by your browser to the application, so to change the language of the application, you can change the default language requested by your browser.
-
-#### Adding a locale
-To start translation into a language which is currently supported, run the django-admin `makemessages` command with the language code for the language you want to add (like `de` for German, or `en-gb` for British English):
-``` bash
-./bw-dev makemessages -l <language code>
-```
-
-#### Editing a locale
-When you have a locale file, open the `django.po` in the directory for the language (for example, if you were adding German, `locale/de/LC_MESSAGES/django.po`. All the the text in the application will be shown in paired strings, with `msgid` as the original text, and `msgstr` as the translation (by default, this is set to an empty string, and will display the original text).
-
-Add your translations to the `msgstr` strings. As the messages in the application are updated, `gettext` will sometimes add best-guess fuzzy matched options for those translations. When a message is marked as fuzzy, it will not be used in the application, so be sure to remove it when you translate that line.
-
-When you're done, compile the locale by running:
-
-``` bash
-./bw-dev compilemessages
-```
-
-You can add the `-l <language code>` to only compile one language. When you refresh the application, you should see your translations at work.
-
-## Installing in Production
-
-This project is still young and isn't, at the moment, very stable, so please proceed with caution when running in production.
-
-### Server setup
-- Get a domain name and set up DNS for your server
-- Set your server up with appropriate firewalls for running a web application (this instruction set is tested against Ubuntu 20.04)
-- Set up an email service (such as mailgun) and the appropriate SMTP/DNS settings
-- Install Docker and docker-compose
-
-### Install and configure BookWyrm
-
-The `production` branch of BookWyrm contains a number of tools not on the `main` branch that are suited for running in production, such as `docker-compose` changes to update the default commands or configuration of containers, and individual changes to container config to enable things like SSL or regular backups.
-
-Instructions for running BookWyrm in production:
-
-- Get the application code:
-    `git clone git@github.com:mouse-reeve/bookwyrm.git`
-- Switch to the `production` branch:
-    `git checkout production`
-- Create your environment variables file, `cp .env.prod.example .env`, and update the following:
-    - `SECRET_KEY` | A difficult to guess, secret string of characers
-    - `DOMAIN` | Your web domain
-    - `EMAIL` | Email address to be used for certbot domain verification
-    - `POSTGRES_PASSWORD` | Set a secure password for the database
-    - `REDIS_ACTIVITY_PASSWORD` | Set a secure password for Redis Activity subsystem
-    - `REDIS_BROKER_PASSWORD` | Set a secure password for Redis queue broker subsystem
-    - `FLOWER_USER` | Your own username for accessing Flower queue monitor
-    - `FLOWER_PASSWORD` | Your own secure password for accessing Flower queue monitor
-- Update your nginx configuration in `nginx/default.conf`
-    - Replace `your-domain.com` with your domain name
-- Configure nginx
-    - Make a copy of the production template config and set it for use in nginx `cp nginx/production nginx/default.conf`
-    - Update `nginx/default.conf`:
-        - Replace `your-domain.com` with your domain name
-        - If you aren't using the `www` subdomain, remove the www.your-domain.com version of the domain from the `server_name` in the first server block in `nginx/default.conf` and remove the `-d www.${DOMAIN}` flag at the end of the `certbot` command in `docker-compose.yml`.
-        - If you are running another web-server on your host machine, you will need to follow the [reverse-proxy instructions](#running-bookwyrm-behind-a-reverse-proxy)
-- If you need to initialize your certbot for your domain, set `CERTBOT_INIT=true` in your `.env` file
-- Run the application (this should also set up a Certbot ssl cert for your domain) with
-    `docker-compose up --build`, and make sure all the images build successfully
-    - If you are running other services on your host machine, you may run into errors where services fail when attempting to bind to a port.
-    See the [troubleshooting guide](#port-conflicts) for advice on resolving this.
-- When docker has built successfully, stop the process with `CTRL-C`
-- If you set `CERTBOT_INIT=true` earlier, set it now as `CERTBOT_INIT=false` so that certbot runs in renew mode
-- Run docker-compose in the background with: `docker-compose up -d`
-- Initialize the database with: `./bw-dev initdb`
-- Set up schedule backups with cron that runs that `docker-compose exec db pg_dump -U <databasename>` and saves the backup to a safe location
-
-Congrats! You did it, go to your domain and enjoy the fruits of your labors.
-
-### Configure your instance
-- Register a user account in the application UI
-- Make your account a superuser (warning: do *not* use django's `createsuperuser` command)
-    - On your server, open the django shell
-    `./bw-dev shell`
-    - Load your user and make it a superuser
-    ```python
-    from bookwyrm import models
-    user = models.User.objects.get(id=1)
-    user.is_staff = True
-    user.is_superuser = True
-    user.save()
-    ```
-    - Go to the site settings (`/settings/site-settings` on your domain) and configure your instance name, description, code of conduct, and toggle whether registration is open on your instance
-
-### Backups
-
-BookWyrm's db service dumps a backup copy of its database to its `/backups` directory daily at midnight UTC.
-Backups are named `backup__%Y-%m-%d.sql`.
-
-The db service has an optional script for periodically pruning the backups directory so that all recent daily backups are kept, but for older backups, only weekly or monthly backups are kept.
-To enable this script:
-- Uncomment the final line in `postgres-docker/cronfile`
-- rebuild your instance `docker-compose up --build`
-
-You can copy backups from the backups volume to your host machine with `docker cp`:
-- Run `docker-compose ps` to confirm the db service's full name (it's probably `bookwyrm_db_1`.
-- Run `docker cp <container_name>:/backups <host machine path>`
-
-### Updating your instance
-
-When there are changes available in the production branch, you can install and get them running on your instance using the command `./bw-dev update`. This does a number of things:
-- `git pull` gets the updated code from the git repository. If there are conflicts, you may need to run `git pull` separately and resolve the conflicts before trying the `./bw-dev update` script again.
-- `docker-compose build` rebuilds the images, which ensures that the correct packages are installed. This step takes a long time and is only needed when the dependencies (including pip `requirements.txt` packages) have changed, so you can comment it out if you want a quicker update path and don't mind un-commenting it as needed.
-- `docker-compose exec web python manage.py migrate` runs the database migrations in Django
-- `docker-compose exec web python manage.py collectstatic --no-input` loads any updated static files (such as the JavaScript and CSS)
-- `docker-compose restart` reloads the docker containers
-
-### Re-building activity streams
-
-If something goes awry with user timelines, and you want to re-create them en mass, there's a management command for that:
-`docker-compose run --rm web python manage.py rebuild_feeds`
-
-### Port Conflicts
-
-BookWyrm has multiple services that run on their default ports.
-This means that, depending on what else you are running on your host machine, you may run into errors when building or running BookWyrm when attempts to bind to those ports fail.
-
-If this occurs, you will need to change your configuration to run services on different ports.
-This may require one or more changes the following files:
-- `docker-compose.yml`
-- `nginx/default.conf`
-- `.env` (You create this file yourself during setup)
-
-E.g., If you need Redis to run on a different port:
-- In `docker-compose.yml`:
-    - In `services` -> `redis` -> `command`, add `--port YOUR_PORT` to the command
-    - In `services` -> `redis` -> `ports`, change `6379:6379` to your port
-- In `.env`, update `REDIS_PORT`
-
-If you are already running a web-server on your machine, you will need to set up a reverse-proxy.
-
-#### Running BookWyrm Behind a Reverse-Proxy
-
-If you are running another web-server on your machine, you should have it handle proxying web requests to BookWyrm.
-
-The default BookWyrm configuration already has an nginx server that proxies requests to the django app that handles SSL and directly serves static files.
-The static files are stored in a Docker volume that several BookWyrm services access, so it is not recommended to remove this server completely.
-
-To run BookWyrm behind a reverse-proxy, make the following changes:
-- In `nginx/default.conf`:
-    - Comment out the two default servers
-    - Uncomment the server labeled Reverse-Proxy server
-    - Replace `your-domain.com` with your domain name
-- In `docker-compose.yml`:
-    - In `services` -> `nginx` -> `ports`, comment out the default ports and add `- 8001:8001`
-    - In `services` -> `nginx` -> `volumes`, comment out the two volumes that begin `./certbot/`
-    - In `services`, comment out the `certbot` service
-
-At this point, you can follow, the [setup](#server-setup) instructions as listed.
-Once docker is running, you can access your BookWyrm instance at `http://localhost:8001` (**NOTE:** your server is not accessible over `https`).
-
-Steps for setting up a reverse-proxy are server dependent.
-
-##### Nginx
-
-Before you can set up nginx, you will need to locate your nginx configuration directory, which is dependent on your platform and how you installed nginx.
-See [nginx's guide](http://nginx.org/en/docs/beginners_guide.html) for details.
-
-To set up your server:
-- In you `nginx.conf` file, ensure that `include servers/*;` isn't commented out.
-- In your nginx `servers` directory, create a new file named after your domain containing the following information:
-    ```nginx
-    server {
-        server_name your-domain.com www.your-domain.com;
-
-        location / {
-            proxy_pass http://localhost:8000;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header Host $host;
-        }
-
-        location /images/ {
-            proxy_pass http://localhost:8001;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header Host $host;
-        }
-
-        location /static/ {
-            proxy_pass http://localhost:8001;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header Host $host;
-        }
-
-        listen [::]:80 ssl;
-        listen 80 ssl;
-    }
-    ```
-- run `sudo certbot run --nginx --email YOUR_EMAIL -d your-domain.com -d www.your-domain.com`
-- restart nginx
-
-If everything worked correctly, your BookWyrm instance should now be externally accessible.
diff --git a/README.md b/README.md
index ffdf42de..90d3ad46 100644
--- a/README.md
+++ b/README.md
@@ -13,13 +13,13 @@ Social reading and reviewing, decentralized with ActivityPub
 - [Set up Bookwyrm](#set-up-bookwyrm)
 
 ## Joining BookWyrm
-BookWyrm is still a young piece of software, and isn't at the level of stability and feature-richness that you'd find in a production-ready application. But it does what it says on the box! If you'd like to join an instance, you can check out the [instances](https://github.com/mouse-reeve/bookwyrm/blob/main/instances.md) list.
+BookWyrm is still a young piece of software, and isn't at the level of stability and feature-richness that you'd find in a production-ready application. But it does what it says on the box! If you'd like to join an instance, you can check out the [instances](https://docs.joinbookwyrm.com/instances.html) list.
 
-You can request an invite to https://bookwyrm.social by [email](mailto:mousereeve@riseup.net), [Mastodon direct message](https://friend.camp/@tripofmice), or [Twitter direct message](https://twitter.com/tripofmice).
+You can request an invite by entering your email address at https://bookwyrm.social.
 
 
 ## Contributing
-See [contributing](https://github.com/mouse-reeve/bookwyrm/blob/main/CONTRIBUTING.md) for code, translation or monetary contributions.
+See [contributing](https://docs.joinbookwyrm.com/contributing.html) for code, translation or monetary contributions.
 
 ## About BookWyrm
 ### What it is and isn't
@@ -31,7 +31,7 @@ BookWyrm is built on [ActivityPub](http://activitypub.rocks/). With ActivityPub,
 Federation makes it possible to have small, self-determining communities, in contrast to the monolithic service you find on GoodReads or Twitter. An instance can be focused on a particular interest, be just for a group of friends, or anything else that brings people together. Each community can choose which other instances they want to federate with, and moderate and run their community autonomously. Check out https://runyourown.social/ to get a sense of the philosophy and logistics behind small, high-trust social networks.
 
 ### Features
-Since the project is still in its early stages, the features are growing every day, and there is plenty of room for suggestions and ideas. Open an [issue](https://github.com/mouse-reeve/bookwyrm/issues) to get the conversation going!
+Since the project is still in its early stages, the features are growing every day, and there is plenty of room for suggestions and ideas. Open an [issue](https://github.com/bookwyrm-social/bookwyrm/issues) to get the conversation going!
 - Posting about books
     - Compose reviews, with or without ratings, which are aggregated in the book page
     - Compose other kinds of statuses about books, such as:
@@ -82,4 +82,4 @@ Deployment
 The application is set up to share book and author data between instances, and get book data from arbitrary outside sources. Right now, the only connector is to OpenLibrary, but other connectors could be written.
 
 ## Set up Bookwyrm
-See the [installation instructions](https://github.com/mouse-reeve/bookwyrm/blob/main/INSTALLATION.md) on how to set up Bookwyrm in developer environment or production.
+See the [installation instructions](https://docs.joinbookwyrm.com/developer-environment.html) on how to set up Bookwyrm in developer environment or production.
diff --git a/instances.md b/instances.md
deleted file mode 100644
index 91d21f5a..00000000
--- a/instances.md
+++ /dev/null
@@ -1,5 +0,0 @@
-
-| name | url | admin contact | open registration |
-| :--- | :-- | :------------ | :---------------- |
-| bookwyrm.social | http://bookwyrm.social/ | mousereeve@riseup.net / [@tripofmice@friend.camp](https://friend.camp/@tripofmice) | � |
-| wyrms.de | https://wyrms.de/ | wyrms@tofuwabo.hu / [@tofuwabohu@subversive.zone](https://subversive.zone/@tofuwabohu) | � | 

From e589396be2e8fcd7efd482cc3f6e7090493a6d36 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 13 Apr 2021 12:15:14 -0700
Subject: [PATCH 0803/1285] Fixes links from readme to docs

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 90d3ad46..3b0c2e8b 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ You can request an invite by entering your email address at https://bookwyrm.soc
 
 
 ## Contributing
-See [contributing](https://docs.joinbookwyrm.com/contributing.html) for code, translation or monetary contributions.
+See [contributing](https://docs.joinbookwyrm.com/how-to-contribute.html) for code, translation or monetary contributions.
 
 ## About BookWyrm
 ### What it is and isn't
@@ -82,4 +82,4 @@ Deployment
 The application is set up to share book and author data between instances, and get book data from arbitrary outside sources. Right now, the only connector is to OpenLibrary, but other connectors could be written.
 
 ## Set up Bookwyrm
-See the [installation instructions](https://docs.joinbookwyrm.com/developer-environment.html) on how to set up Bookwyrm in developer environment or production.
+The documentation website has instruction on how to set up Bookwyrm in [developer environment](https://docs.joinbookwyrm.com/developer-environment.html) or [production](https://docs.joinbookwyrm.com/installing-in-production.html).

From df258859fef9909026a506e6bceaece9797ab6ac Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 13 Apr 2021 12:16:19 -0700
Subject: [PATCH 0804/1285] more links

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3b0c2e8b..5aa92763 100644
--- a/README.md
+++ b/README.md
@@ -82,4 +82,4 @@ Deployment
 The application is set up to share book and author data between instances, and get book data from arbitrary outside sources. Right now, the only connector is to OpenLibrary, but other connectors could be written.
 
 ## Set up Bookwyrm
-The documentation website has instruction on how to set up Bookwyrm in [developer environment](https://docs.joinbookwyrm.com/developer-environment.html) or [production](https://docs.joinbookwyrm.com/installing-in-production.html).
+The [documentation website](https://docs.joinbookwyrm.com/) has instruction on how to set up Bookwyrm in [developer environment](https://docs.joinbookwyrm.com/developer-environment.html) or [production](https://docs.joinbookwyrm.com/installing-in-production.html).

From 3c82d05b3bafe9f5d825c38f43b317c5b43fc5c2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 13 Apr 2021 12:17:07 -0700
Subject: [PATCH 0805/1285] wording fix

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5aa92763..161f91b9 100644
--- a/README.md
+++ b/README.md
@@ -82,4 +82,4 @@ Deployment
 The application is set up to share book and author data between instances, and get book data from arbitrary outside sources. Right now, the only connector is to OpenLibrary, but other connectors could be written.
 
 ## Set up Bookwyrm
-The [documentation website](https://docs.joinbookwyrm.com/) has instruction on how to set up Bookwyrm in [developer environment](https://docs.joinbookwyrm.com/developer-environment.html) or [production](https://docs.joinbookwyrm.com/installing-in-production.html).
+The [documentation website](https://docs.joinbookwyrm.com/) has instruction on how to set up Bookwyrm in a [developer environment](https://docs.joinbookwyrm.com/developer-environment.html) or [production](https://docs.joinbookwyrm.com/installing-in-production.html).

From e8d1c04712947a98ba4e43b5dd8759c14d24fcd5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 13 Apr 2021 18:04:54 -0700
Subject: [PATCH 0806/1285] Fixes logic error in checking sender

---
 bookwyrm/views/inbox.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/views/inbox.py b/bookwyrm/views/inbox.py
index d1b75997..4771fe2d 100644
--- a/bookwyrm/views/inbox.py
+++ b/bookwyrm/views/inbox.py
@@ -70,7 +70,10 @@ def is_blocked_user_agent(request):
     user_agent = request.headers.get("User-Agent")
     if not user_agent:
         return False
-    url = re.search(r"https?://{:s}/?".format(regex.domain), user_agent).group()
+    url = re.search(r"https?://{:s}/?".format(regex.domain), user_agent)
+    if not url:
+        return False
+    url = url.groups()
     return models.FederatedServer.is_blocked(url)
 
 

From 00c6b7e6e00d1543d99e2c932c7d8f6815cab4f6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 13 Apr 2021 18:26:54 -0700
Subject: [PATCH 0807/1285] Fixes regex group

---
 bookwyrm/views/inbox.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/views/inbox.py b/bookwyrm/views/inbox.py
index 4771fe2d..a8eb4851 100644
--- a/bookwyrm/views/inbox.py
+++ b/bookwyrm/views/inbox.py
@@ -73,7 +73,7 @@ def is_blocked_user_agent(request):
     url = re.search(r"https?://{:s}/?".format(regex.domain), user_agent)
     if not url:
         return False
-    url = url.groups()
+    url = url.group()
     return models.FederatedServer.is_blocked(url)
 
 

From 74573b5355b28d8d191440a0a181a36074dd1981 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 14 Apr 2021 20:07:51 +0200
Subject: [PATCH 0808/1285] Restrict list creation form to authenticated users

When visiting the `/list` route on an instance while unauthenticated, the button to toggle the List creation form is shown. This PR aims to hide the button to unauthenticated visitors.
---
 bookwyrm/templates/lists/lists.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bookwyrm/templates/lists/lists.html b/bookwyrm/templates/lists/lists.html
index 27e56f11..c7d789d0 100644
--- a/bookwyrm/templates/lists/lists.html
+++ b/bookwyrm/templates/lists/lists.html
@@ -15,10 +15,12 @@
             {% endif %}
         </h1>
     </div>
+    {% if request.user.is_authenticated %}
     <div class="column is-narrow">
         {% trans "Create List" as button_text %}
         {% include 'snippets/toggle/open_button.html' with controls_text="create-list" icon="plus" text=button_text focus="create-list-header" %}
     </div>
+    {% endif %}
 </header>
 
 <div class="block">

From 88d37736eea7d07580e1b9826416125b9a9a7728 Mon Sep 17 00:00:00 2001
From: Pablo Barton <pablo.barton@gmail.com>
Date: Wed, 14 Apr 2021 21:57:34 -0400
Subject: [PATCH 0809/1285] 902 using get_page for Paginator instead of page

---
 bookwyrm/models/activitypub_mixin.py | 2 +-
 bookwyrm/views/books.py              | 4 ++--
 bookwyrm/views/directory.py          | 2 +-
 bookwyrm/views/federation.py         | 2 +-
 bookwyrm/views/feed.py               | 4 ++--
 bookwyrm/views/invite.py             | 4 ++--
 bookwyrm/views/list.py               | 4 ++--
 bookwyrm/views/shelf.py              | 2 +-
 bookwyrm/views/user.py               | 2 +-
 bookwyrm/views/user_admin.py         | 2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index ce16460e..719debff 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -524,7 +524,7 @@ def to_ordered_collection_page(
     """ serialize and pagiante a queryset """
     paginated = Paginator(queryset, PAGE_LENGTH)
 
-    activity_page = paginated.page(page)
+    activity_page = paginated.get_page(page)
     if id_only:
         items = [s.remote_id for s in activity_page.object_list]
     else:
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 731fc24c..c3ac4f49 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -60,7 +60,7 @@ class Book(View):
         paginated = Paginator(
             reviews.exclude(Q(content__isnull=True) | Q(content="")), PAGE_LENGTH
         )
-        reviews_page = paginated.page(page)
+        reviews_page = paginated.get_page(page)
 
         user_tags = readthroughs = user_shelves = other_edition_shelves = []
         if request.user.is_authenticated:
@@ -285,7 +285,7 @@ class Editions(View):
 
         paginated = Paginator(editions.filter(**filters).all(), PAGE_LENGTH)
         data = {
-            "editions": paginated.page(page),
+            "editions": paginated.get_page(page),
             "work": work,
             "languages": languages,
             "formats": set(
diff --git a/bookwyrm/views/directory.py b/bookwyrm/views/directory.py
index 9504734e..2565f4ec 100644
--- a/bookwyrm/views/directory.py
+++ b/bookwyrm/views/directory.py
@@ -39,7 +39,7 @@ class Directory(View):
         paginated = Paginator(users, 12)
 
         data = {
-            "users": paginated.page(page),
+            "users": paginated.get_page(page),
         }
         return TemplateResponse(request, "directory/directory.html", data)
 
diff --git a/bookwyrm/views/federation.py b/bookwyrm/views/federation.py
index db54cd7a..3803e92e 100644
--- a/bookwyrm/views/federation.py
+++ b/bookwyrm/views/federation.py
@@ -40,7 +40,7 @@ class Federation(View):
         paginated = Paginator(servers, PAGE_LENGTH)
 
         data = {
-            "servers": paginated.page(page),
+            "servers": paginated.get_page(page),
             "sort": sort,
             "form": forms.ServerForm(),
         }
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index d5e64434..1286d797 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -39,7 +39,7 @@ class Feed(View):
             **feed_page_data(request.user),
             **{
                 "user": request.user,
-                "activities": paginated.page(page),
+                "activities": paginated.get_page(page),
                 "suggested_users": suggested_users,
                 "tab": tab,
                 "goal_form": forms.GoalForm(),
@@ -82,7 +82,7 @@ class DirectMessage(View):
         ).order_by("-published_date")
 
         paginated = Paginator(activities, PAGE_LENGTH)
-        activity_page = paginated.page(page)
+        activity_page = paginated.get_page(page)
         data = {
             **feed_page_data(request.user),
             **{
diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/invite.py
index 61f031ef..03b31b7b 100644
--- a/bookwyrm/views/invite.py
+++ b/bookwyrm/views/invite.py
@@ -43,7 +43,7 @@ class ManageInvites(View):
         )
 
         data = {
-            "invites": paginated.page(page),
+            "invites": paginated.get_page(page),
             "form": forms.CreateInviteForm(),
         }
         return TemplateResponse(request, "settings/manage_invites.html", data)
@@ -136,7 +136,7 @@ class ManageInviteRequests(View):
         data = {
             "ignored": ignored,
             "count": paginated.count,
-            "requests": paginated.page(page),
+            "requests": paginated.get_page(page),
             "sort": sort,
         }
         return TemplateResponse(request, "settings/manage_invite_requests.html", data)
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index 3d85280d..27e36dc5 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -44,7 +44,7 @@ class Lists(View):
 
         paginated = Paginator(lists, 12)
         data = {
-            "lists": paginated.page(page),
+            "lists": paginated.get_page(page),
             "list_form": forms.ListForm(),
             "path": "/list",
         }
@@ -79,7 +79,7 @@ class UserLists(View):
         data = {
             "user": user,
             "is_self": request.user.id == user.id,
-            "lists": paginated.page(page),
+            "lists": paginated.get_page(page),
             "list_form": forms.ListForm(),
             "path": user.local_path + "/lists",
         }
diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index 88899949..740439db 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -70,7 +70,7 @@ class Shelf(View):
             "is_self": is_self,
             "shelves": shelves.all(),
             "shelf": shelf,
-            "books": paginated.page(page),
+            "books": paginated.get_page(page),
         }
 
         return TemplateResponse(request, "user/shelf.html", data)
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index d666f064..26117a92 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -87,7 +87,7 @@ class User(View):
             "is_self": is_self,
             "shelves": shelf_preview,
             "shelf_count": shelves.count(),
-            "activities": paginated.page(page),
+            "activities": paginated.get_page(page),
             "goal": goal,
         }
 
diff --git a/bookwyrm/views/user_admin.py b/bookwyrm/views/user_admin.py
index a8c155a1..1eb6089f 100644
--- a/bookwyrm/views/user_admin.py
+++ b/bookwyrm/views/user_admin.py
@@ -46,5 +46,5 @@ class UserAdmin(View):
             users = users.order_by(sort)
 
         paginated = Paginator(users, PAGE_LENGTH)
-        data = {"users": paginated.page(page), "sort": sort, "server": server}
+        data = {"users": paginated.get_page(page), "sort": sort, "server": server}
         return TemplateResponse(request, "settings/user_admin.html", data)

From adaaf8da679420de879c023af473b444d021f135 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 15 Apr 2021 10:29:56 -0700
Subject: [PATCH 0810/1285] Fixes typo in populate streams command

---
 bookwyrm/management/commands/populate_streams.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/management/commands/populate_streams.py b/bookwyrm/management/commands/populate_streams.py
index 06ca5f07..4cd2036a 100644
--- a/bookwyrm/management/commands/populate_streams.py
+++ b/bookwyrm/management/commands/populate_streams.py
@@ -17,7 +17,7 @@ def populate_streams():
     )
     for user in users:
         for stream in activitystreams.streams.values():
-            stream.populate_stream(user)
+            stream.populate_streams(user)
 
 
 class Command(BaseCommand):

From 71390f17359fc65ec693ecc181a78dd219dfe35c Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Thu, 15 Apr 2021 21:51:14 +0200
Subject: [PATCH 0811/1285] Set body height

---
 bookwyrm/static/css/bookwyrm.css |   6 +
 bookwyrm/templates/layout.html   | 298 ++++++++++++++++---------------
 2 files changed, 157 insertions(+), 147 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index e4bca203..67eb1eba 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -3,6 +3,12 @@ html {
     scroll-padding-top: 20%;
 }
 
+body {
+    min-height: 100vh;
+    display: flex;
+    flex-direction: column;
+}
+
 .image {
     overflow: hidden;
 }
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 7dc74d88..4ce7a7f8 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -22,165 +22,169 @@
     <meta name="twitter:image:alt" content="BookWyrm Logo">
 </head>
 <body>
-<nav class="navbar container" aria-label="main navigation">
-    <div class="navbar-brand">
-        <a class="navbar-item" href="/">
-            <img class="image logo" src="{% if site.logo_small %}/images/{{ site.logo_small }}{% else %}/static/images/logo-small.png{% endif %}" alt="Home page">
-        </a>
-        <form class="navbar-item column" action="/search/">
-            <div class="field has-addons">
-                <div class="control">
-                    <input aria-label="{% trans 'Search for a book or user' %}" id="search-input" class="input" type="text" name="q" placeholder="{% trans 'Search for a book or user' %}" value="{{ query }}">
-                </div>
-                <div class="control">
-                    <button class="button" type="submit">
-                        <span class="icon icon-search" title="{% trans 'Search' %}">
-                            <span class="is-sr-only">{% trans "Search" %}</span>
-                        </span>
-                    </button>
-                </div>
-            </div>
-        </form>
-
-        <div role="button" tabindex="0" class="navbar-burger pulldown-menu" data-controls="main-nav" aria-expanded="false">
-            <div class="navbar-item mt-3">
-                <div class="icon icon-dots-three-vertical" title="{% trans 'Main navigation menu' %}">
-                    <span class="is-sr-only">{% trans "Main navigation menu" %}</span>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="navbar-menu" id="main-nav">
-        <div class="navbar-start">
-            {% if request.user.is_authenticated %}
-            <a href="{% url 'user-shelves' request.user.localname %}" class="navbar-item">
-                {% trans "Your books" %}
+<nav class="navbar" aria-label="main navigation">
+    <div class="container">
+        <div class="navbar-brand">
+            <a class="navbar-item" href="/">
+                <img class="image logo" src="{% if site.logo_small %}/images/{{ site.logo_small }}{% else %}/static/images/logo-small.png{% endif %}" alt="Home page">
             </a>
-            <a href="/#feed" class="navbar-item">
-                {% trans "Feed" %}
-            </a>
-            <a href="{% url 'lists' %}" class="navbar-item">
-                {% trans "Lists" %}
-            </a>
-            {% endif %}
-        </div>
-
-        <div class="navbar-end">
-        {% if request.user.is_authenticated %}
-            <div class="navbar-item has-dropdown is-hoverable">
-                <a
-                    href="{{ request.user.local_path }}"
-                    class="navbar-link pulldown-menu"
-                    role="button"
-                    aria-expanded="false"
-                    tabindex="0"
-                    aria-haspopup="true"
-                    aria-controls="navbar-dropdown"
-                >
-                    {% include 'snippets/avatar.html' with user=request.user %}
-                    <span class="ml-2">{{ request.user.display_name }}</span>
-                </a>
-                <ul class="navbar-dropdown" id="navbar-dropdown">
-                    <li>
-                        <a href="{% url 'direct-messages' %}" class="navbar-item">
-                            {% trans "Direct Messages" %}
-                        </a>
-                    </li>
-                    <li>
-                        <a href="{% url 'directory' %}" class="navbar-item">
-                            {% trans 'Directory' %}
-                        </a>
-                    </li>
-                    <li>
-                        <a href="/import" class="navbar-item">
-                            {% trans 'Import Books' %}
-                        </a>
-                    </li>
-                    <li>
-                        <a href="/preferences/profile" class="navbar-item">
-                            {% trans 'Settings' %}
-                        </a>
-                    </li>
-                    {% if perms.bookwyrm.create_invites or perms.moderate_users %}
-                    <li class="navbar-divider" role="presentation"></li>
-                    {% endif %}
-                    {% if perms.bookwyrm.create_invites %}
-                    <li>
-                        <a href="{% url 'settings-invite-requests' %}" class="navbar-item">
-                            {% trans 'Invites' %}
-                        </a>
-                    </li>
-                    {% endif %}
-                    {% if perms.bookwyrm.moderate_users %}
-                    <li>
-                        <a href="{% url 'settings-users' %}" class="navbar-item">
-                            {% trans 'Admin' %}
-                        </a>
-                    </li>
-                    {% endif %}
-                    <li class="navbar-divider" role="presentation"></li>
-                    <li>
-                        <a href="/logout" class="navbar-item">
-                            {% trans 'Log out' %}
-                        </a>
-                    </li>
-                </ul>
-            </div>
-            <div class="navbar-item">
-                <a href="/notifications" class="tags has-addons">
-                    <span class="tag is-medium">
-                        <span class="icon icon-bell" title="{% trans 'Notifications' %}">
-                            <span class="is-sr-only">{% trans "Notifications" %}</span>
-                        </span>
-                    </span>
-                    <span class="{% if not request.user|notification_count %}is-hidden {% endif %}tag is-danger is-medium transition-x" data-poll-wrapper>
-                        <span data-poll="notifications">{{ request.user | notification_count }}</span>
-                    </span>
-                </a>
-            </div>
-            {% else %}
-            <div class="navbar-item">
-                {% if request.path != '/login' and request.path != '/login/' %}
-                <div class="columns">
-                    <div class="column">
-                        <form name="login" method="post" action="/login">
-                            {% csrf_token %}
-                            <div class="columns is-variable is-1">
-                                <div class="column">
-                                    <label class="is-sr-only" for="id_localname">{% trans "Username:" %}</label>
-                                    <input type="text" name="localname" maxlength="150" class="input" required="" id="id_localname" placeholder="{% trans 'username' %}">
-                                </div>
-                                <div class="column">
-                                    <label class="is-sr-only" for="id_password">{% trans "Username:" %}</label>
-                                    <input type="password" name="password" maxlength="128" class="input" required="" id="id_password" placeholder="{% trans 'password' %}">
-                                    <p class="help"><a href="/password-reset">{% trans "Forgot your password?" %}</a></p>
-                                </div>
-                                <div class="column is-narrow">
-                                    <button class="button is-primary" type="submit">{% trans "Log in" %}</button>
-                                </div>
-                            </div>
-                        </form>
+            <form class="navbar-item column" action="/search/">
+                <div class="field has-addons">
+                    <div class="control">
+                        <input aria-label="{% trans 'Search for a book or user' %}" id="search-input" class="input" type="text" name="q" placeholder="{% trans 'Search for a book or user' %}" value="{{ query }}">
                     </div>
-                    {% if site.allow_registration and request.path != '' and request.path != '/' %}
-                    <div class="column is-narrow">
-                        <a href="/" class="button is-link">
-                            {% trans "Join" %}
-                        </a>
+                    <div class="control">
+                        <button class="button" type="submit">
+                            <span class="icon icon-search" title="{% trans 'Search' %}">
+                                <span class="is-sr-only">{% trans "Search" %}</span>
+                            </span>
+                        </button>
+                    </div>
+                </div>
+            </form>
+
+            <div role="button" tabindex="0" class="navbar-burger pulldown-menu" data-controls="main-nav" aria-expanded="false">
+                <div class="navbar-item mt-3">
+                    <div class="icon icon-dots-three-vertical" title="{% trans 'Main navigation menu' %}">
+                        <span class="is-sr-only">{% trans "Main navigation menu" %}</span>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="navbar-menu" id="main-nav">
+            <div class="navbar-start">
+                {% if request.user.is_authenticated %}
+                <a href="{% url 'user-shelves' request.user.localname %}" class="navbar-item">
+                    {% trans "Your books" %}
+                </a>
+                <a href="/#feed" class="navbar-item">
+                    {% trans "Feed" %}
+                </a>
+                <a href="{% url 'lists' %}" class="navbar-item">
+                    {% trans "Lists" %}
+                </a>
+                {% endif %}
+            </div>
+
+            <div class="navbar-end">
+            {% if request.user.is_authenticated %}
+                <div class="navbar-item has-dropdown is-hoverable">
+                    <a
+                        href="{{ request.user.local_path }}"
+                        class="navbar-link pulldown-menu"
+                        role="button"
+                        aria-expanded="false"
+                        tabindex="0"
+                        aria-haspopup="true"
+                        aria-controls="navbar-dropdown"
+                    >
+                        {% include 'snippets/avatar.html' with user=request.user %}
+                        <span class="ml-2">{{ request.user.display_name }}</span>
+                    </a>
+                    <ul class="navbar-dropdown" id="navbar-dropdown">
+                        <li>
+                            <a href="{% url 'direct-messages' %}" class="navbar-item">
+                                {% trans "Direct Messages" %}
+                            </a>
+                        </li>
+                        <li>
+                            <a href="{% url 'directory' %}" class="navbar-item">
+                                {% trans 'Directory' %}
+                            </a>
+                        </li>
+                        <li>
+                            <a href="/import" class="navbar-item">
+                                {% trans 'Import Books' %}
+                            </a>
+                        </li>
+                        <li>
+                            <a href="/preferences/profile" class="navbar-item">
+                                {% trans 'Settings' %}
+                            </a>
+                        </li>
+                        {% if perms.bookwyrm.create_invites or perms.moderate_users %}
+                        <li class="navbar-divider" role="presentation"></li>
+                        {% endif %}
+                        {% if perms.bookwyrm.create_invites %}
+                        <li>
+                            <a href="{% url 'settings-invite-requests' %}" class="navbar-item">
+                                {% trans 'Invites' %}
+                            </a>
+                        </li>
+                        {% endif %}
+                        {% if perms.bookwyrm.moderate_users %}
+                        <li>
+                            <a href="{% url 'settings-users' %}" class="navbar-item">
+                                {% trans 'Admin' %}
+                            </a>
+                        </li>
+                        {% endif %}
+                        <li class="navbar-divider" role="presentation"></li>
+                        <li>
+                            <a href="/logout" class="navbar-item">
+                                {% trans 'Log out' %}
+                            </a>
+                        </li>
+                    </ul>
+                </div>
+                <div class="navbar-item">
+                    <a href="/notifications" class="tags has-addons">
+                        <span class="tag is-medium">
+                            <span class="icon icon-bell" title="{% trans 'Notifications' %}">
+                                <span class="is-sr-only">{% trans "Notifications" %}</span>
+                            </span>
+                        </span>
+                        <span class="{% if not request.user|notification_count %}is-hidden {% endif %}tag is-danger is-medium transition-x" data-poll-wrapper>
+                            <span data-poll="notifications">{{ request.user | notification_count }}</span>
+                        </span>
+                    </a>
+                </div>
+                {% else %}
+                <div class="navbar-item">
+                    {% if request.path != '/login' and request.path != '/login/' %}
+                    <div class="columns">
+                        <div class="column">
+                            <form name="login" method="post" action="/login">
+                                {% csrf_token %}
+                                <div class="columns is-variable is-1">
+                                    <div class="column">
+                                        <label class="is-sr-only" for="id_localname">{% trans "Username:" %}</label>
+                                        <input type="text" name="localname" maxlength="150" class="input" required="" id="id_localname" placeholder="{% trans 'username' %}">
+                                    </div>
+                                    <div class="column">
+                                        <label class="is-sr-only" for="id_password">{% trans "Username:" %}</label>
+                                        <input type="password" name="password" maxlength="128" class="input" required="" id="id_password" placeholder="{% trans 'password' %}">
+                                        <p class="help"><a href="/password-reset">{% trans "Forgot your password?" %}</a></p>
+                                    </div>
+                                    <div class="column is-narrow">
+                                        <button class="button is-primary" type="submit">{% trans "Log in" %}</button>
+                                    </div>
+                                </div>
+                            </form>
+                        </div>
+                        {% if site.allow_registration and request.path != '' and request.path != '/' %}
+                        <div class="column is-narrow">
+                            <a href="/" class="button is-link">
+                                {% trans "Join" %}
+                            </a>
+                        </div>
+                        {% endif %}
                     </div>
                     {% endif %}
                 </div>
                 {% endif %}
             </div>
-            {% endif %}
         </div>
     </div>
 </nav>
 
 
-<div class="section container">
-    {% block content %}
-    {% endblock %}
+<div class="section is-flex-grow-1">
+    <div class="container">
+        {% block content %}
+        {% endblock %}
+    </div>
 </div>
 
 <footer class="footer">

From cda5be65f82a0f6f5a92633fe812190289470f2a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 15 Apr 2021 14:55:08 -0700
Subject: [PATCH 0812/1285] Persistence for redis images

---
 docker-compose.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 60816cc0..9324b224 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,20 +40,26 @@ services:
       - 8000:8000
   redis_activity:
     image: redis
+    command: ["redis-server", "--appendonly", "yes"]
     env_file: .env
     ports:
       - 6378:6378
     networks:
       - main
     restart: on-failure
+    volumes:
+      - redis_activity_data:/data
   redis_broker:
     image: redis
+    command: ["redis-server", "--appendonly", "yes"]
     env_file: .env
     ports:
       - 6379:6379
     networks:
       - main
     restart: on-failure
+    volumes:
+      - redis_broker_data:/data
   celery_worker:
     env_file: .env
     build: .
@@ -86,5 +92,7 @@ volumes:
   pgdata:
   static_volume:
   media_volume:
+  redis_broker_data:
+  redis_activity_data:
 networks:
   main:

From 9176a2b9eeb1afb367d6f4762fe500220e47699f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 15 Apr 2021 15:51:49 -0700
Subject: [PATCH 0813/1285] Fixes bug that causes recusive broadcasts

---
 bookwyrm/models/activitypub_mixin.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index 719debff..c6ba249c 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -359,6 +359,10 @@ class CollectionItemMixin(ActivitypubMixin):
 
     activity_serializer = activitypub.CollectionItem
 
+    def broadcast(self, activity, sender, software="bookwyrm"):
+        """ only send book collection updates to other bookwyrm instances """
+        super().broadcast(activity, sender, software=software)
+
     @property
     def privacy(self):
         """ inherit the privacy of the list, or direct if pending """
@@ -371,6 +375,9 @@ class CollectionItemMixin(ActivitypubMixin):
     def recipients(self):
         """ the owner of the list is a direct recipient """
         collection_field = getattr(self, self.collection_field)
+        if collection_field.user.local:
+            # don't broadcast to yourself
+            return []
         return [collection_field.user]
 
     def save(self, *args, broadcast=True, **kwargs):

From 25b82fd2b042eebc4f959a06f93f8addf71fbcbf Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 15 Apr 2021 16:09:59 -0700
Subject: [PATCH 0814/1285] Updates test

---
 bookwyrm/tests/models/test_list.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/tests/models/test_list.py b/bookwyrm/tests/models/test_list.py
index 48f918a0..d99e5465 100644
--- a/bookwyrm/tests/models/test_list.py
+++ b/bookwyrm/tests/models/test_list.py
@@ -55,7 +55,7 @@ class List(TestCase):
 
         self.assertTrue(item.approved)
         self.assertEqual(item.privacy, "unlisted")
-        self.assertEqual(item.recipients, [self.local_user])
+        self.assertEqual(item.recipients, [])
 
     def test_list_item_pending(self, _):
         """ a list entry """
@@ -71,4 +71,4 @@ class List(TestCase):
         self.assertFalse(item.approved)
         self.assertEqual(item.book_list.privacy, "public")
         self.assertEqual(item.privacy, "direct")
-        self.assertEqual(item.recipients, [self.local_user])
+        self.assertEqual(item.recipients, [])

From addcc59d7fa9eef940c26cd91669abc357730b12 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 15 Apr 2021 16:21:54 -0700
Subject: [PATCH 0815/1285] Makes cc fields optional

Plus a bit of cleanup in comments and to: fields
---
 bookwyrm/activitypub/verbs.py | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index c3c84ee5..f79afdca 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -1,4 +1,4 @@
-""" undo wrapper activity """
+""" activities that do things """
 from dataclasses import dataclass, field
 from typing import List
 from django.apps import apps
@@ -9,14 +9,13 @@ from .ordered_collection import CollectionItem
 
 @dataclass(init=False)
 class Verb(ActivityObject):
-    """generic fields for activities - maybe an unecessary level of
-    abstraction but w/e"""
+    """generic fields for activities """
 
     actor: str
     object: ActivityObject
 
     def action(self):
-        """ usually we just want to save, this can be overridden as needed """
+        """ usually we just want to update and save """
         self.object.to_model()
 
 
@@ -24,8 +23,8 @@ class Verb(ActivityObject):
 class Create(Verb):
     """ Create activity """
 
-    to: List
-    cc: List
+    to: List[str]
+    cc: List[str] = field(default_factory=lambda: [])
     signature: Signature = None
     type: str = "Create"
 
@@ -34,8 +33,8 @@ class Create(Verb):
 class Delete(Verb):
     """ Create activity """
 
-    to: List
-    cc: List
+    to: List[str]
+    cc: List[str] = field(default_factory=lambda: [])
     type: str = "Delete"
 
     def action(self):
@@ -48,7 +47,7 @@ class Delete(Verb):
 class Update(Verb):
     """ Update activity """
 
-    to: List
+    to: List[str]
     type: str = "Update"
 
     def action(self):

From 2f493336adf73df6aa344c33732532d90e6e2719 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 15 Apr 2021 16:24:05 -0700
Subject: [PATCH 0816/1285] Don't try to delete nonexistant objects

---
 bookwyrm/activitypub/verbs.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index f79afdca..23032a87 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -40,7 +40,9 @@ class Delete(Verb):
     def action(self):
         """ find and delete the activity object """
         obj = self.object.to_model(save=False, allow_create=False)
-        obj.delete()
+        if obj:
+            obj.delete()
+        # if we can't find it, we don't need to delete it because we don't have it
 
 
 @dataclass(init=False)

From 220fb926c927d0d7ab4ee02d6a6032fac9c3edfb Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 15 Apr 2021 16:35:04 -0700
Subject: [PATCH 0817/1285] Rename Image to Document

---
 bookwyrm/activitypub/__init__.py | 2 +-
 bookwyrm/activitypub/book.py     | 4 ++--
 bookwyrm/activitypub/image.py    | 2 +-
 bookwyrm/activitypub/note.py     | 4 ++--
 bookwyrm/activitypub/person.py   | 4 ++--
 bookwyrm/models/attachment.py    | 2 +-
 bookwyrm/models/fields.py        | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bookwyrm/activitypub/__init__.py b/bookwyrm/activitypub/__init__.py
index c67c5dca..71658455 100644
--- a/bookwyrm/activitypub/__init__.py
+++ b/bookwyrm/activitypub/__init__.py
@@ -5,7 +5,7 @@ import sys
 from .base_activity import ActivityEncoder, Signature, naive_parse
 from .base_activity import Link, Mention
 from .base_activity import ActivitySerializerError, resolve_remote_id
-from .image import Image
+from .image import Document
 from .note import Note, GeneratedNote, Article, Comment, Quotation
 from .note import Review, Rating
 from .note import Tombstone
diff --git a/bookwyrm/activitypub/book.py b/bookwyrm/activitypub/book.py
index 7e552b0a..7615adcf 100644
--- a/bookwyrm/activitypub/book.py
+++ b/bookwyrm/activitypub/book.py
@@ -3,7 +3,7 @@ from dataclasses import dataclass, field
 from typing import List
 
 from .base_activity import ActivityObject
-from .image import Image
+from .image import Document
 
 
 @dataclass(init=False)
@@ -28,7 +28,7 @@ class Book(ActivityObject):
     librarythingKey: str = ""
     goodreadsKey: str = ""
 
-    cover: Image = None
+    cover: Document = None
     type: str = "Book"
 
 
diff --git a/bookwyrm/activitypub/image.py b/bookwyrm/activitypub/image.py
index 931de977..42598422 100644
--- a/bookwyrm/activitypub/image.py
+++ b/bookwyrm/activitypub/image.py
@@ -4,7 +4,7 @@ from .base_activity import ActivityObject
 
 
 @dataclass(init=False)
-class Image(ActivityObject):
+class Document(ActivityObject):
     """ image block """
 
     url: str
diff --git a/bookwyrm/activitypub/note.py b/bookwyrm/activitypub/note.py
index a739eafa..e1a42958 100644
--- a/bookwyrm/activitypub/note.py
+++ b/bookwyrm/activitypub/note.py
@@ -4,7 +4,7 @@ from typing import Dict, List
 from django.apps import apps
 
 from .base_activity import ActivityObject, Link
-from .image import Image
+from .image import Document
 
 
 @dataclass(init=False)
@@ -32,7 +32,7 @@ class Note(ActivityObject):
     inReplyTo: str = ""
     summary: str = ""
     tag: List[Link] = field(default_factory=lambda: [])
-    attachment: List[Image] = field(default_factory=lambda: [])
+    attachment: List[Document] = field(default_factory=lambda: [])
     sensitive: bool = False
     type: str = "Note"
 
diff --git a/bookwyrm/activitypub/person.py b/bookwyrm/activitypub/person.py
index 9231bd95..550fc7bd 100644
--- a/bookwyrm/activitypub/person.py
+++ b/bookwyrm/activitypub/person.py
@@ -3,7 +3,7 @@ from dataclasses import dataclass, field
 from typing import Dict
 
 from .base_activity import ActivityObject
-from .image import Image
+from .image import Document
 
 
 @dataclass(init=False)
@@ -28,7 +28,7 @@ class Person(ActivityObject):
     endpoints: Dict = None
     name: str = None
     summary: str = None
-    icon: Image = field(default_factory=lambda: {})
+    icon: Document = field(default_factory=lambda: {})
     bookwyrmUser: bool = False
     manuallyApprovesFollowers: str = False
     discoverable: str = False
diff --git a/bookwyrm/models/attachment.py b/bookwyrm/models/attachment.py
index 8d2238a1..eaeca11e 100644
--- a/bookwyrm/models/attachment.py
+++ b/bookwyrm/models/attachment.py
@@ -33,4 +33,4 @@ class Image(Attachment):
     )
     caption = fields.TextField(null=True, blank=True, activitypub_field="name")
 
-    activity_serializer = activitypub.Image
+    activity_serializer = activitypub.Document
diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py
index e034d59e..2aefae51 100644
--- a/bookwyrm/models/fields.py
+++ b/bookwyrm/models/fields.py
@@ -336,7 +336,7 @@ def image_serializer(value, alt):
     else:
         return None
     url = "https://%s%s" % (DOMAIN, url)
-    return activitypub.Image(url=url, name=alt)
+    return activitypub.Document(url=url, name=alt)
 
 
 class ImageField(ActivitypubFieldMixin, models.ImageField):

From da453f8056246bd2e71a81e25a1bac9576fe003b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 15 Apr 2021 17:43:27 -0700
Subject: [PATCH 0818/1285] Adds test for populate streams management command

---
 bookwyrm/tests/management/__init__.py         |  1 +
 .../tests/management/test_populate_streams.py | 42 +++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 bookwyrm/tests/management/__init__.py
 create mode 100644 bookwyrm/tests/management/test_populate_streams.py

diff --git a/bookwyrm/tests/management/__init__.py b/bookwyrm/tests/management/__init__.py
new file mode 100644
index 00000000..b6e690fd
--- /dev/null
+++ b/bookwyrm/tests/management/__init__.py
@@ -0,0 +1 @@
+from . import *
diff --git a/bookwyrm/tests/management/test_populate_streams.py b/bookwyrm/tests/management/test_populate_streams.py
new file mode 100644
index 00000000..caebbbe9
--- /dev/null
+++ b/bookwyrm/tests/management/test_populate_streams.py
@@ -0,0 +1,42 @@
+""" test populating user streams """
+from unittest.mock import patch
+from django.test import TestCase
+
+from bookwyrm import models
+from bookwyrm.management.commands.populate_streams import populate_streams
+
+
+@patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
+class Activitystreams(TestCase):
+    """ using redis to build activity streams """
+
+    def setUp(self):
+        """ we need some stuff """
+        self.local_user = models.User.objects.create_user(
+            "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse"
+        )
+        self.another_user = models.User.objects.create_user(
+            "nutria", "nutria@nutria.nutria", "password", local=True, localname="nutria"
+        )
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            self.remote_user = models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
+        self.book = models.Edition.objects.create(title="test book")
+
+    def test_activitystream_class_ids(self, _):
+        """ the abstract base class for stream objects """
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
+            models.Comment.objects.create(
+                user=self.local_user, content="hi", book=self.book
+            )
+
+        with patch("bookwyrm.activitystreams.ActivityStream.populate_store") as redis_mock:
+            populate_streams()
+        self.assertEqual(redis_mock.call_count, 6)  # 2 users x 3 streams

From 80ea45971122082beae489704bc155595f72b108 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 15 Apr 2021 17:48:43 -0700
Subject: [PATCH 0819/1285] Suitable test name and comment

---
 bookwyrm/tests/management/test_populate_streams.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/tests/management/test_populate_streams.py b/bookwyrm/tests/management/test_populate_streams.py
index caebbbe9..6a9b6b8a 100644
--- a/bookwyrm/tests/management/test_populate_streams.py
+++ b/bookwyrm/tests/management/test_populate_streams.py
@@ -30,13 +30,15 @@ class Activitystreams(TestCase):
             )
         self.book = models.Edition.objects.create(title="test book")
 
-    def test_activitystream_class_ids(self, _):
-        """ the abstract base class for stream objects """
+    def test_populate_streams(self, _):
+        """ make sure the function on the redis manager gets called """
         with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
             models.Comment.objects.create(
                 user=self.local_user, content="hi", book=self.book
             )
 
-        with patch("bookwyrm.activitystreams.ActivityStream.populate_store") as redis_mock:
+        with patch(
+            "bookwyrm.activitystreams.ActivityStream.populate_store"
+        ) as redis_mock:
             populate_streams()
         self.assertEqual(redis_mock.call_count, 6)  # 2 users x 3 streams

From caa261f4bfff8f8fdedaccb463e71fb554106a2f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 16 Apr 2021 15:12:38 -0700
Subject: [PATCH 0820/1285] Gracefully handle expect, unsupported activities

---
 bookwyrm/activitypub/base_activity.py         |  6 +++-
 bookwyrm/activitypub/verbs.py                 |  6 +++-
 .../tests/views/inbox/test_inbox_create.py    | 29 ++++++++++++++++---
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index 3d922b47..dd2795bb 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -52,10 +52,14 @@ def naive_parse(activity_objects, activity_json, serializer=None):
         if activity_json.get("publicKeyPem"):
             # ugh
             activity_json["type"] = "PublicKey"
+
+        activity_type = activity_json.get("type")
         try:
-            activity_type = activity_json["type"]
             serializer = activity_objects[activity_type]
         except KeyError as e:
+            # we know this exists and that we can't handle it
+            if activity_type in ["Question"]:
+                return None
             raise ActivitySerializerError(e)
 
     return serializer(activity_objects=activity_objects, **activity_json)
diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index 23032a87..400939d0 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -16,7 +16,11 @@ class Verb(ActivityObject):
 
     def action(self):
         """ usually we just want to update and save """
-        self.object.to_model()
+        obj = self.object
+        # it may return None if the object is invalid in an expected way
+        # ie, Question type
+        if obj:
+            obj.to_model()
 
 
 @dataclass(init=False)
diff --git a/bookwyrm/tests/views/inbox/test_inbox_create.py b/bookwyrm/tests/views/inbox/test_inbox_create.py
index f8ed6a84..16c674e0 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_create.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_create.py
@@ -6,6 +6,7 @@ from unittest.mock import patch
 from django.test import TestCase
 
 from bookwyrm import models, views
+from bookwyrm.activitypub import ActivitySerializerError
 
 
 # pylint: disable=too-many-public-methods
@@ -51,7 +52,7 @@ class InboxCreate(TestCase):
         }
         models.SiteSettings.objects.create()
 
-    def test_handle_create_status(self):
+    def test_create_status(self):
         """ the "it justs works" mode """
         self.assertEqual(models.Status.objects.count(), 1)
 
@@ -82,7 +83,7 @@ class InboxCreate(TestCase):
         views.inbox.activity_task(activity)
         self.assertEqual(models.Status.objects.count(), 2)
 
-    def test_handle_create_status_remote_note_with_mention(self):
+    def test_create_status_remote_note_with_mention(self):
         """ should only create it under the right circumstances """
         self.assertEqual(models.Status.objects.count(), 1)
         self.assertFalse(
@@ -105,7 +106,7 @@ class InboxCreate(TestCase):
         )
         self.assertEqual(models.Notification.objects.get().notification_type, "MENTION")
 
-    def test_handle_create_status_remote_note_with_reply(self):
+    def test_create_status_remote_note_with_reply(self):
         """ should only create it under the right circumstances """
         self.assertEqual(models.Status.objects.count(), 1)
         self.assertFalse(models.Notification.objects.filter(user=self.local_user))
@@ -126,7 +127,7 @@ class InboxCreate(TestCase):
         self.assertTrue(models.Notification.objects.filter(user=self.local_user))
         self.assertEqual(models.Notification.objects.get().notification_type, "REPLY")
 
-    def test_handle_create_list(self):
+    def test_create_list(self):
         """ a new list """
         activity = self.create_json
         activity["object"] = {
@@ -149,3 +150,23 @@ class InboxCreate(TestCase):
         self.assertEqual(book_list.curation, "curated")
         self.assertEqual(book_list.description, "summary text")
         self.assertEqual(book_list.remote_id, "https://example.com/list/22")
+
+    def test_create_unsupported_type(self):
+        """ ignore activities we know we can't handle """
+        activity = self.create_json
+        activity["object"] = {
+            "id": "https://example.com/status/887",
+            "type": "Question",
+        }
+        # just observer how it doesn't throw an error
+        views.inbox.activity_task(activity)
+
+    def test_create_unknown_type(self):
+        """ ignore activities we know we've never heard of """
+        activity = self.create_json
+        activity["object"] = {
+            "id": "https://example.com/status/887",
+            "type": "Threnody",
+        }
+        with self.assertRaises(ActivitySerializerError):
+            views.inbox.activity_task(activity)

From bd294cce837c9611aa727e838851daa4bab76c1a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 16 Apr 2021 15:17:55 -0700
Subject: [PATCH 0821/1285] Check if obj exists for updates

---
 bookwyrm/activitypub/verbs.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index 400939d0..442e3858 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -58,7 +58,9 @@ class Update(Verb):
 
     def action(self):
         """ update a model instance from the dataclass """
-        self.object.to_model(allow_create=False)
+        obj = self.object
+        if obj:
+            self.object.to_model(allow_create=False)
 
 
 @dataclass(init=False)

From f6824268edac8a7bb86ca5c81afe9f284c40e67b Mon Sep 17 00:00:00 2001
From: Pablo Barton <pablo.barton@gmail.com>
Date: Thu, 8 Apr 2021 12:05:21 -0400
Subject: [PATCH 0822/1285] 584 sorting of lists

---
 bookwyrm/forms.py                             |   19 +-
 .../0067_denullify_list_item_order.py         |   30 +
 .../0068_ordering_for_list_items.py           |   23 +
 bookwyrm/models/list.py                       |    8 +-
 bookwyrm/templates/lists/list.html            |   35 +-
 .../snippets/booklist-pagination.html         |   58 +
 bookwyrm/tests/models/test_list.py            |    7 +-
 bookwyrm/tests/views/inbox/test_inbox_add.py  |    1 +
 .../tests/views/inbox/test_inbox_remove.py    |    1 +
 bookwyrm/tests/views/test_list.py             |  158 +-
 bookwyrm/urls.py                              |    5 +
 bookwyrm/views/list.py                        |  156 +-
 locale/es/LC_MESSAGES/django.mo               |  Bin 26233 -> 26563 bytes
 locale/es/LC_MESSAGES/django.po               | 1840 ++++++++++++++---
 14 files changed, 2048 insertions(+), 293 deletions(-)
 create mode 100644 bookwyrm/migrations/0067_denullify_list_item_order.py
 create mode 100644 bookwyrm/migrations/0068_ordering_for_list_items.py
 create mode 100644 bookwyrm/templates/snippets/booklist-pagination.html

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 7c41323c..80b28310 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -3,7 +3,7 @@ import datetime
 from collections import defaultdict
 
 from django import forms
-from django.forms import ModelForm, PasswordInput, widgets
+from django.forms import ModelForm, PasswordInput, widgets, ChoiceField
 from django.forms.widgets import Textarea
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
@@ -287,3 +287,20 @@ class ServerForm(CustomForm):
     class Meta:
         model = models.FederatedServer
         exclude = ["remote_id"]
+
+
+class SortListForm(forms.Form):
+    sort_by = ChoiceField(
+        choices=(
+            ("order", _("List Order")),
+            ("title", _("Book Title")),
+            ("rating", _("Rating")),
+        ),
+        label=_("Sort By"),
+    )
+    direction = ChoiceField(
+        choices=(
+            ("ascending", _("Ascending")),
+            ("descending", _("Descending")),
+        ),
+    )
diff --git a/bookwyrm/migrations/0067_denullify_list_item_order.py b/bookwyrm/migrations/0067_denullify_list_item_order.py
new file mode 100644
index 00000000..51e28371
--- /dev/null
+++ b/bookwyrm/migrations/0067_denullify_list_item_order.py
@@ -0,0 +1,30 @@
+from django.db import migrations
+
+
+def forwards_func(apps, schema_editor):
+    # Set all values for ListItem.order
+    BookList = apps.get_model("bookwyrm", "List")
+    db_alias = schema_editor.connection.alias
+    for book_list in BookList.objects.using(db_alias).all():
+        for i, item in enumerate(book_list.listitem_set.order_by("id"), 1):
+            item.order = i
+            item.save()
+
+
+def reverse_func(apps, schema_editor):
+    # null all values for ListItem.order
+    BookList = apps.get_model("bookwyrm", "List")
+    db_alias = schema_editor.connection.alias
+    for book_list in BookList.objects.using(db_alias).all():
+        for item in book_list.listitem_set.order_by("id"):
+            item.order = None
+            item.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0066_user_deactivation_reason"),
+    ]
+
+    operations = [migrations.RunPython(forwards_func, reverse_func)]
diff --git a/bookwyrm/migrations/0068_ordering_for_list_items.py b/bookwyrm/migrations/0068_ordering_for_list_items.py
new file mode 100644
index 00000000..fa64f13c
--- /dev/null
+++ b/bookwyrm/migrations/0068_ordering_for_list_items.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.1.6 on 2021-04-08 16:15
+
+import bookwyrm.models.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0067_denullify_list_item_order"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="listitem",
+            name="order",
+            field=bookwyrm.models.fields.IntegerField(),
+        ),
+        migrations.AlterUniqueTogether(
+            name="listitem",
+            unique_together={("order", "book_list"), ("book", "book_list")},
+        ),
+    ]
diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index 4d6b53cd..7e6de106 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -67,7 +67,7 @@ class ListItem(CollectionItemMixin, BookWyrmModel):
     )
     notes = fields.TextField(blank=True, null=True)
     approved = models.BooleanField(default=True)
-    order = fields.IntegerField(blank=True, null=True)
+    order = fields.IntegerField()
     endorsement = models.ManyToManyField("User", related_name="endorsers")
 
     activity_serializer = activitypub.ListItem
@@ -93,7 +93,7 @@ class ListItem(CollectionItemMixin, BookWyrmModel):
             )
 
     class Meta:
-        """ an opinionated constraint! you can't put a book on a list twice """
-
-        unique_together = ("book", "book_list")
+        # A book may only be placed into a list once, and each order in the list may be used only
+        # once
+        unique_together = (("book", "book_list"), ("order", "book_list"))
         ordering = ("-created_date",)
diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index ace8aa63..3d338097 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -13,10 +13,11 @@
 
 <div class="columns mt-3">
     <section class="column is-three-quarters">
-        {% if not items.exists %}
+        {% include "snippets/booklist-pagination.html" with page=items %}
+        {% if not items.object_list.exists %}
         <p>{% trans "This list is currently empty" %}</p>
         {% else %}
-        <ol>
+        <ol start="{{ items.start_index }}">
         {% for item in items %}
             <li class="block pb-3">
                 <div class="card">
@@ -40,6 +41,16 @@
                             <input type="hidden" name="item" value="{{ item.id }}">
                             <button type="submit" class="button is-small is-danger">{% trans "Remove" %}</button>
                         </form>
+                    </div>
+                    <div class="card-footer has-background-white-bis">
+                        <div>
+                            <form name="set-position" method="post" action="{% url 'list-set-book-position' item.id %}" class="card-footer-item">
+                                {% csrf_token %}
+                                <label for="input-list-position" class="is-sr-only">{% trans "List position" %}</label>
+                                <input id="input-list-position" class="input" type="number" min="1" name="position" value="{{ item.order }}">
+                                <button type="submit" class="button is-small is-info">{% trans "List position" %}</button>
+                            </form>
+                        </div>
                         {% endif %}
                     </div>
                 </div>
@@ -49,8 +60,24 @@
         {% endif %}
     </section>
 
-    {% if request.user.is_authenticated and not list.curation == 'closed' or request.user == list.user %}
     <section class="column is-one-quarter content">
+        <h2>{% trans "Sort List" %}</h2>
+        <form name="sort" action="{% url 'list' list.id %}" method="GET" class="block">
+            <label class="label" for="id_sort_by">{% trans "Sort By" %}</label>
+            <div class="select is-fullwidth">
+                {{ sort_form.sort_by }}
+            </div>
+            <label class="label" for="id_direction">{% trans "Direction" %}</label>
+            <div class="select is-fullwidth">
+                {{ sort_form.direction }}
+            </div>
+            <div>
+                <button class="button is-primary is-fullwidth" type="submit">
+                    {% trans "Sort List" %}
+                </button>
+            </div>
+        </form>
+    {% if request.user.is_authenticated and not list.curation == 'closed' or request.user == list.user %}
         <h2>{% if list.curation == 'open' or request.user == list.user %}{% trans "Add Books" %}{% else %}{% trans "Suggest Books" %}{% endif %}</h2>
         <form name="search" action="{% url 'list' list.id %}" method="GET" class="block">
             <div class="field has-addons">
@@ -93,7 +120,7 @@
         </div>
         {% endif %}
         {% endfor %}
-    </section>
     {% endif %}
+    </section>
 </div>
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/booklist-pagination.html b/bookwyrm/templates/snippets/booklist-pagination.html
new file mode 100644
index 00000000..69fae52e
--- /dev/null
+++ b/bookwyrm/templates/snippets/booklist-pagination.html
@@ -0,0 +1,58 @@
+{% load i18n %}
+{% if page.has_other_pages %}
+<nav class="pagination is-small" aria-label="pagination">
+    <a
+        class="pagination-previous {% if not page.has_previous %}is-disabled{% endif %}"
+        {% if page.has_previous %}
+        href="{{ path }}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number }}{{ anchor }}"
+        {% else %}
+        aria-hidden="true"
+        {% endif %}>
+
+        <span class="icon icon-arrow-left" aria-hidden="true"></span>
+        {% trans "Previous" %}
+    </a>
+    <a
+        class="pagination-next {% if not page.has_next %}is-disabled{% endif %}"
+        {% if page.has_next %}
+        href="{{ path }}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number }}{{ anchor }}"
+        {% else %}
+        aria-hidden="true"
+        {% endif %}>
+
+        {% trans "Next" %}
+        <span class="icon icon-arrow-right" aria-hidden="true"></span>
+    </a>
+    <ul class="pagination-list">
+        {% if page.number == 2 %}
+            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number }}{{ anchor }}">{{ page.previous_page_number }}</a>
+        {% elif page.number == 3 %}
+            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number|add:-1 }}{{ anchor }}">{{ page.previous_page_number|add:-1 }}</a>
+            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number }}{{ anchor }}">{{ page.previous_page_number }}</a>
+        {% elif page.number == 4 %}
+            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number|add:-2 }}{{ anchor }}">{{ page.previous_page_number|add:-2 }}</a>
+            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number|add:-1 }}{{ anchor }}">{{ page.previous_page_number|add:-1 }}</a>
+            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number }}{{ anchor }}">{{ page.previous_page_number }}</a>
+        {% elif page.number > 4 %}
+            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page=1{{ anchor }}">1</a>
+            <span class="pagination-ellipsis">&hellip;</span>
+            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number }}{{ anchor }}">{{ page.previous_page_number }}</a>
+        {% endif %}
+    <a class="pagination-link is-link" disabled href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.number }}{{ anchor }}">{{ page.number }}</a>
+        {% if page.number|add:1 == page.paginator.num_pages %}
+            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number }}{{ anchor }}">{{ page.next_page_number }}</a>
+        {% elif page.number|add:2 == page.paginator.num_pages %}
+            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number }}{{ anchor }}">{{ page.next_page_number }}</a>
+            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number|add:1 }}{{ anchor }}">{{ page.next_page_number|add:1 }}</a>
+        {% elif page.number|add:3 == page.paginator.num_pages %}
+            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number }}{{ anchor }}">{{ page.next_page_number }}</a>
+            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number|add:1 }}{{ anchor }}">{{ page.next_page_number|add:1 }}</a>
+            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number|add:2 }}{{ anchor }}">{{ page.next_page_number|add:2 }}</a>
+        {% elif page.number|add:3 < page.paginator.num_pages %}
+            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number }}{{ anchor }}">{{ page.next_page_number }}</a>
+            <span class="pagination-ellipsis">&hellip;</span>
+            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ items.paginator.num_pages }}{{ anchor }}">{{ items.paginator.num_pages }}</a>
+        {% endif %}
+    </ul>
+</nav>
+{% endif %}
diff --git a/bookwyrm/tests/models/test_list.py b/bookwyrm/tests/models/test_list.py
index d99e5465..4e3460a9 100644
--- a/bookwyrm/tests/models/test_list.py
+++ b/bookwyrm/tests/models/test_list.py
@@ -51,6 +51,7 @@ class List(TestCase):
             book_list=book_list,
             book=self.book,
             user=self.local_user,
+            order=1,
         )
 
         self.assertTrue(item.approved)
@@ -65,7 +66,11 @@ class List(TestCase):
             )
 
         item = models.ListItem.objects.create(
-            book_list=book_list, book=self.book, user=self.local_user, approved=False
+            book_list=book_list,
+            book=self.book,
+            user=self.local_user,
+            approved=False,
+            order=1,
         )
 
         self.assertFalse(item.approved)
diff --git a/bookwyrm/tests/views/inbox/test_inbox_add.py b/bookwyrm/tests/views/inbox/test_inbox_add.py
index b2b65338..a5c629a8 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_add.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_add.py
@@ -94,6 +94,7 @@ class InboxAdd(TestCase):
                 "type": "ListItem",
                 "book": self.book.remote_id,
                 "id": "https://bookwyrm.social/listbook/6189",
+                "order": 1,
             },
             "target": "https://bookwyrm.social/user/mouse/list/to-read",
             "@context": "https://www.w3.org/ns/activitystreams",
diff --git a/bookwyrm/tests/views/inbox/test_inbox_remove.py b/bookwyrm/tests/views/inbox/test_inbox_remove.py
index a17154d1..8ac8740a 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_remove.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_remove.py
@@ -80,6 +80,7 @@ class InboxRemove(TestCase):
                 user=self.local_user,
                 book=self.book,
                 book_list=booklist,
+                order=1,
             )
         self.assertEqual(booklist.books.count(), 1)
 
diff --git a/bookwyrm/tests/views/test_list.py b/bookwyrm/tests/views/test_list.py
index d669307c..0b4339fc 100644
--- a/bookwyrm/tests/views/test_list.py
+++ b/bookwyrm/tests/views/test_list.py
@@ -39,6 +39,18 @@ class ListViews(TestCase):
             remote_id="https://example.com/book/1",
             parent_work=work,
         )
+        work_two = models.Work.objects.create(title="Labori")
+        self.book_two = models.Edition.objects.create(
+            title="Example Edition 2",
+            remote_id="https://example.com/book/2",
+            parent_work=work_two,
+        )
+        work_three = models.Work.objects.create(title="Trabajar")
+        self.book_three = models.Edition.objects.create(
+            title="Example Edition 3",
+            remote_id="https://example.com/book/3",
+            parent_work=work_three,
+        )
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             self.list = models.List.objects.create(
                 name="Test List", user=self.local_user
@@ -194,6 +206,7 @@ class ListViews(TestCase):
                 user=self.local_user,
                 book=self.book,
                 approved=False,
+                order=1,
             )
 
         request = self.factory.post(
@@ -228,6 +241,7 @@ class ListViews(TestCase):
                 user=self.local_user,
                 book=self.book,
                 approved=False,
+                order=1,
             )
 
         request = self.factory.post(
@@ -268,6 +282,145 @@ class ListViews(TestCase):
         self.assertEqual(item.user, self.local_user)
         self.assertTrue(item.approved)
 
+    def test_add_two_books(self):
+        """
+        Putting two books on the list. The first should have an order value of
+        1 and the second should have an order value of 2.
+        """
+        request_one = self.factory.post(
+            "",
+            {
+                "book": self.book.id,
+                "list": self.list.id,
+            },
+        )
+        request_one.user = self.local_user
+
+        request_two = self.factory.post(
+            "",
+            {
+                "book": self.book_two.id,
+                "list": self.list.id,
+            },
+        )
+        request_two.user = self.local_user
+        views.list.add_book(request_one)
+        views.list.add_book(request_two)
+
+        items = self.list.listitem_set.order_by("order").all()
+        self.assertEqual(items[0].book, self.book)
+        self.assertEqual(items[1].book, self.book_two)
+        self.assertEqual(items[0].order, 1)
+        self.assertEqual(items[1].order, 2)
+
+    def test_add_three_books_and_remove_second(self):
+        """
+        Put three books on a list and then remove the one in the middle. The
+        ordering of the list should adjust to not have a gap.
+        """
+        request_one = self.factory.post(
+            "",
+            {
+                "book": self.book.id,
+                "list": self.list.id,
+            },
+        )
+        request_one.user = self.local_user
+
+        request_two = self.factory.post(
+            "",
+            {
+                "book": self.book_two.id,
+                "list": self.list.id,
+            },
+        )
+        request_two.user = self.local_user
+
+        request_three = self.factory.post(
+            "",
+            {
+                "book": self.book_three.id,
+                "list": self.list.id,
+            },
+        )
+        request_three.user = self.local_user
+
+        views.list.add_book(request_one)
+        views.list.add_book(request_two)
+        views.list.add_book(request_three)
+
+        items = self.list.listitem_set.order_by("order").all()
+        self.assertEqual(items[0].book, self.book)
+        self.assertEqual(items[1].book, self.book_two)
+        self.assertEqual(items[2].book, self.book_three)
+        self.assertEqual(items[0].order, 1)
+        self.assertEqual(items[1].order, 2)
+        self.assertEqual(items[2].order, 3)
+
+        remove_request = self.factory.post("", {"item": items[1].id})
+        remove_request.user = self.local_user
+        views.list.remove_book(remove_request, self.list.id)
+        items = self.list.listitem_set.order_by("order").all()
+        self.assertEqual(items[0].book, self.book)
+        self.assertEqual(items[1].book, self.book_three)
+        self.assertEqual(items[0].order, 1)
+        self.assertEqual(items[1].order, 2)
+
+    def test_add_three_books_and_move_last_to_first(self):
+        """
+        Put three books on the list and move the last book to the first
+        position.
+        """
+        request_one = self.factory.post(
+            "",
+            {
+                "book": self.book.id,
+                "list": self.list.id,
+            },
+        )
+        request_one.user = self.local_user
+
+        request_two = self.factory.post(
+            "",
+            {
+                "book": self.book_two.id,
+                "list": self.list.id,
+            },
+        )
+        request_two.user = self.local_user
+
+        request_three = self.factory.post(
+            "",
+            {
+                "book": self.book_three.id,
+                "list": self.list.id,
+            },
+        )
+        request_three.user = self.local_user
+
+        views.list.add_book(request_one)
+        views.list.add_book(request_two)
+        views.list.add_book(request_three)
+
+        items = self.list.listitem_set.order_by("order").all()
+        self.assertEqual(items[0].book, self.book)
+        self.assertEqual(items[1].book, self.book_two)
+        self.assertEqual(items[2].book, self.book_three)
+        self.assertEqual(items[0].order, 1)
+        self.assertEqual(items[1].order, 2)
+        self.assertEqual(items[2].order, 3)
+
+        set_position_request = self.factory.post("", {"position": 1})
+        set_position_request.user = self.local_user
+        views.list.set_book_position(set_position_request, items[2].id)
+        items = self.list.listitem_set.order_by("order").all()
+        self.assertEqual(items[0].book, self.book_three)
+        self.assertEqual(items[1].book, self.book)
+        self.assertEqual(items[2].book, self.book_two)
+        self.assertEqual(items[0].order, 1)
+        self.assertEqual(items[1].order, 2)
+        self.assertEqual(items[2].order, 3)
+
     def test_add_book_outsider(self):
         """ put a book on a list """
         self.list.curation = "open"
@@ -358,6 +511,7 @@ class ListViews(TestCase):
                 book_list=self.list,
                 user=self.local_user,
                 book=self.book,
+                order=1,
             )
         self.assertTrue(self.list.listitem_set.exists())
 
@@ -377,9 +531,7 @@ class ListViews(TestCase):
         """ take an item off a list """
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             item = models.ListItem.objects.create(
-                book_list=self.list,
-                user=self.local_user,
-                book=self.book,
+                book_list=self.list, user=self.local_user, book=self.book, order=1
             )
         self.assertTrue(self.list.listitem_set.exists())
         request = self.factory.post(
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index cf3f877b..9e280f3e 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -184,6 +184,11 @@ urlpatterns = [
         views.list.remove_book,
         name="list-remove-book",
     ),
+    re_path(
+        r"^list-item/(?P<list_item_id>\d+)/set-position$",
+        views.list.set_book_position,
+        name="list-set-book-position",
+    ),
     re_path(
         r"^list/(?P<list_id>\d+)/curate/?$", views.Curate.as_view(), name="list-curate"
     ),
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index 27e36dc5..c7311bf1 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -1,8 +1,9 @@
 """ book list views"""
 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
-from django.db import IntegrityError
-from django.db.models import Count, Q
+from django.db import IntegrityError, transaction
+from django.db.models import Avg, Count, Q, Max
+from django.db.models.functions import Coalesce
 from django.http import HttpResponseNotFound, HttpResponseBadRequest
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
@@ -16,6 +17,7 @@ from bookwyrm.connectors import connector_manager
 from .helpers import is_api_request, privacy_filter
 from .helpers import get_user_from_username
 
+
 # pylint: disable=no-self-use
 class Lists(View):
     """ book list page """
@@ -35,7 +37,6 @@ class Lists(View):
             .filter(item_count__gt=0)
             .order_by("-updated_date")
             .distinct()
-            .all()
         )
 
         lists = privacy_filter(
@@ -100,6 +101,43 @@ class List(View):
 
         query = request.GET.get("q")
         suggestions = None
+
+        # sort_by shall be "order" unless a valid alternative is given
+        sort_by = request.GET.get("sort_by", "order")
+        if sort_by not in ("order", "title", "rating"):
+            sort_by = "order"
+
+        # direction shall be "ascending" unless a valid alternative is given
+        direction = request.GET.get("direction", "ascending")
+        if direction not in ("ascending", "descending"):
+            direction = "ascending"
+
+        page = request.GET.get("page", 1)
+
+        if sort_by == "order":
+            directional_sort_by = "order"
+            if direction == "descending":
+                directional_sort_by = "-" + directional_sort_by
+            items = book_list.listitem_set.filter(approved=True).order_by(
+                directional_sort_by
+            )
+        elif sort_by == "title":
+            directional_sort_by = "book__title"
+            if direction == "descending":
+                directional_sort_by = "-" + directional_sort_by
+            items = book_list.listitem_set.filter(approved=True).order_by(
+                directional_sort_by
+            )
+        elif sort_by == "rating":
+            directional_sort_by = "average_rating"
+            if direction == "descending":
+                directional_sort_by = "-" + directional_sort_by
+            items = book_list.listitem_set.annotate(
+                average_rating=Avg(Coalesce("book__review__rating", 0))
+            ).order_by(directional_sort_by)
+
+        paginated = Paginator(items, 25)
+
         if query and request.user.is_authenticated:
             # search for books
             suggestions = connector_manager.local_search(query, raw=True)
@@ -119,11 +157,14 @@ class List(View):
 
         data = {
             "list": book_list,
-            "items": book_list.listitem_set.filter(approved=True),
+            "items": paginated.get_page(page),
             "pending_count": book_list.listitem_set.filter(approved=False).count(),
             "suggested_books": suggestions,
             "list_form": forms.ListForm(instance=book_list),
             "query": query or "",
+            "sort_form": forms.SortListForm(
+                {"direction": direction, "sort_by": sort_by}
+            ),
         }
         return TemplateResponse(request, "lists/list.html", data)
 
@@ -168,7 +209,9 @@ class Curate(View):
             suggestion.approved = True
             suggestion.save()
         else:
+            deleted_order = suggestion.order
             suggestion.delete(broadcast=False)
+            normalize_book_list_ordering(book_list.id, start=deleted_order)
         return redirect("list-curate", book_list.id)
 
 
@@ -179,6 +222,8 @@ def add_book(request):
     if not book_list.visible_to_user(request.user):
         return HttpResponseNotFound()
 
+    order_max = book_list.listitem_set.aggregate(Max("order"))["order__max"] or 0
+
     book = get_object_or_404(models.Edition, id=request.POST.get("book"))
     # do you have permission to add to the list?
     try:
@@ -188,6 +233,7 @@ def add_book(request):
                 book=book,
                 book_list=book_list,
                 user=request.user,
+                order=order_max + 1,
             )
         elif book_list.curation == "curated":
             # make a pending entry
@@ -196,6 +242,7 @@ def add_book(request):
                 book=book,
                 book_list=book_list,
                 user=request.user,
+                order=order_max + 1,
             )
         else:
             # you can't add to this list, what were you THINKING
@@ -209,12 +256,101 @@ def add_book(request):
 
 @require_POST
 def remove_book(request, list_id):
-    """ put a book on a list """
-    book_list = get_object_or_404(models.List, id=list_id)
-    item = get_object_or_404(models.ListItem, id=request.POST.get("item"))
+    """ remove a book from a list """
+    with transaction.atomic():
+        book_list = get_object_or_404(models.List, id=list_id)
+        item = get_object_or_404(models.ListItem, id=request.POST.get("item"))
 
-    if not book_list.user == request.user and not item.user == request.user:
-        return HttpResponseNotFound()
+        if not book_list.user == request.user and not item.user == request.user:
+            return HttpResponseNotFound()
 
-    item.delete()
+        deleted_order = item.order
+        item.delete()
+    normalize_book_list_ordering(book_list.id, start=deleted_order)
     return redirect("list", list_id)
+
+
+@require_POST
+def set_book_position(request, list_item_id):
+    """
+    Action for when the list user manually specifies a list position, takes special care with the unique ordering per list
+    """
+    with transaction.atomic():
+        list_item = get_object_or_404(models.ListItem, id=list_item_id)
+        try:
+            int_position = int(request.POST.get("position"))
+        except ValueError:
+            return HttpResponseBadRequest(
+                "bad value for position. should be an integer"
+            )
+
+        if int_position < 1:
+            return HttpResponseBadRequest("position cannot be less than 1")
+
+        book_list = list_item.book_list
+        order_max = book_list.listitem_set.aggregate(Max("order"))["order__max"]
+
+        if int_position > order_max:
+            int_position = order_max
+
+        if request.user not in (book_list.user, list_item.user):
+            return HttpResponseNotFound()
+
+        original_order = list_item.order
+        if original_order == int_position:
+            return
+        elif original_order > int_position:
+            list_item.order = -1
+            list_item.save()
+            increment_order_in_reverse(book_list.id, int_position, original_order)
+        else:
+            list_item.order = -1
+            list_item.save()
+            decrement_order(book_list.id, original_order, int_position)
+
+        list_item.order = int_position
+        list_item.save()
+
+    return redirect("list", book_list.id)
+
+
+@transaction.atomic
+def increment_order_in_reverse(book_list_id, start, end):
+    try:
+        book_list = models.List.objects.get(id=book_list_id)
+    except models.List.DoesNotExist:
+        return
+    items = book_list.listitem_set.filter(order__gte=start, order__lt=end).order_by(
+        "-order"
+    )
+    for item in items:
+        item.order += 1
+        item.save()
+
+
+@transaction.atomic
+def decrement_order(book_list_id, start, end):
+    try:
+        book_list = models.List.objects.get(id=book_list_id)
+    except models.List.DoesNotExist:
+        return
+    items = book_list.listitem_set.filter(order__gt=start, order__lte=end).order_by(
+        "order"
+    )
+    for item in items:
+        item.order -= 1
+        item.save()
+
+
+@transaction.atomic
+def normalize_book_list_ordering(book_list_id, start=0, add_offset=0):
+    try:
+        book_list = models.List.objects.get(id=book_list_id)
+    except models.List.DoesNotExist:
+        return
+    items = book_list.listitem_set.filter(order__gt=start).order_by("order")
+    for i, item in enumerate(items, start):
+        effective_order = i + add_offset
+        if item.order != effective_order:
+            item.order = effective_order
+            item.save()
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index ea8eac7ee0281b38a66473d3814a646fc9fda0e3..d42d8394517c6921e9ae059a8a9affcf6fac1a68 100644
GIT binary patch
delta 8531
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
RF?ODD^Z(v6VQ^sZ{{ap^qoe=;

delta 8260
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

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 64921d5e..159e806a 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-01 13:14-0700\n"
+"POT-Creation-Date: 2021-04-11 01:59+0000\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -49,6 +49,34 @@ msgstr "%(count)d usos"
 msgid "Unlimited"
 msgstr "Sin límite"
 
+#: bookwyrm/forms.py:289
+msgid "List Order"
+msgstr "Orden de la lista"
+
+#: bookwyrm/forms.py:290
+#| msgid "Title"
+msgid "Book Title"
+msgstr "Título"
+
+#: bookwyrm/forms.py:291 bookwyrm/templates/snippets/create_status_form.html:29
+#: bookwyrm/templates/user/shelf.html:81
+msgid "Rating"
+msgstr "Calificación"
+
+#: bookwyrm/forms.py:293 bookwyrm/templates/lists/list.html:105
+msgid "Sort By"
+msgstr "Ordenar por"
+
+#: bookwyrm/forms.py:297
+#| msgid "Started reading"
+msgid "Ascending"
+msgstr "Ascendente"
+
+#: bookwyrm/forms.py:298
+#| msgid "Started reading"
+msgid "Descending"
+msgstr "Descendente"
+
 #: bookwyrm/models/fields.py:24
 #, python-format
 msgid "%(value)s is not a valid remote_id"
@@ -59,7 +87,7 @@ msgstr "%(value)s no es un remote_id válido"
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s no es un usuario válido"
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:157
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:152
 msgid "username"
 msgstr "nombre de usuario"
 
@@ -146,12 +174,12 @@ msgid "ISBN:"
 msgstr "ISBN:"
 
 #: bookwyrm/templates/book/book.html:69
-#: bookwyrm/templates/book/edit_book.html:211
+#: bookwyrm/templates/book/edit_book.html:223
 msgid "OCLC Number:"
 msgstr "Número OCLC:"
 
 #: bookwyrm/templates/book/book.html:76
-#: bookwyrm/templates/book/edit_book.html:215
+#: bookwyrm/templates/book/edit_book.html:227
 msgid "ASIN:"
 msgstr "ASIN:"
 
@@ -171,17 +199,17 @@ msgid "Add Description"
 msgstr "Agregar descripción"
 
 #: bookwyrm/templates/book/book.html:107
-#: bookwyrm/templates/book/edit_book.html:101
+#: bookwyrm/templates/book/edit_book.html:107
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Descripción:"
 
 #: bookwyrm/templates/book/book.html:111
-#: bookwyrm/templates/book/edit_book.html:225
+#: bookwyrm/templates/book/edit_book.html:237
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
 #: bookwyrm/templates/settings/site.html:93
-#: bookwyrm/templates/snippets/readthrough.html:65
+#: bookwyrm/templates/snippets/readthrough.html:75
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
@@ -190,12 +218,12 @@ msgstr "Guardar"
 
 #: bookwyrm/templates/book/book.html:112 bookwyrm/templates/book/book.html:161
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:226
+#: bookwyrm/templates/book/edit_book.html:238
 #: bookwyrm/templates/edit_author.html:79
 #: bookwyrm/templates/moderation/report_modal.html:32
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/readthrough.html:66
+#: bookwyrm/templates/snippets/readthrough.html:76
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
@@ -257,7 +285,7 @@ msgstr "Irse a lista"
 
 #: bookwyrm/templates/book/book.html:223
 #: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:90
+#: bookwyrm/templates/lists/list.html:156
 msgid "Add"
 msgstr "Agregar"
 
@@ -266,14 +294,14 @@ msgid "rated it"
 msgstr "lo calificó con"
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:163
+#: bookwyrm/templates/book/edit_book.html:175
 #, fuzzy
 #| msgid "Add cover"
 msgid "Upload cover:"
 msgstr "Agregar portada"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:169
+#: bookwyrm/templates/book/edit_book.html:181
 msgid "Load cover from url:"
 msgstr ""
 
@@ -353,93 +381,93 @@ msgstr "Volver"
 msgid "Metadata"
 msgstr "Metadatos"
 
-#: bookwyrm/templates/book/edit_book.html:91
+#: bookwyrm/templates/book/edit_book.html:92
 msgid "Title:"
 msgstr "Título:"
 
-#: bookwyrm/templates/book/edit_book.html:96
+#: bookwyrm/templates/book/edit_book.html:100
 msgid "Subtitle:"
 msgstr "Subtítulo:"
 
-#: bookwyrm/templates/book/edit_book.html:106
+#: bookwyrm/templates/book/edit_book.html:112
 msgid "Series:"
 msgstr "Serie:"
 
-#: bookwyrm/templates/book/edit_book.html:111
+#: bookwyrm/templates/book/edit_book.html:117
 msgid "Series number:"
 msgstr "Número de serie:"
 
-#: bookwyrm/templates/book/edit_book.html:117
+#: bookwyrm/templates/book/edit_book.html:123
 #, fuzzy
 #| msgid "Published"
 msgid "Publisher:"
 msgstr "Publicado"
 
-#: bookwyrm/templates/book/edit_book.html:119
+#: bookwyrm/templates/book/edit_book.html:125
 msgid "Separate multiple publishers with commas."
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:125
+#: bookwyrm/templates/book/edit_book.html:132
 msgid "First published date:"
 msgstr "Fecha de primera publicación:"
 
-#: bookwyrm/templates/book/edit_book.html:130
+#: bookwyrm/templates/book/edit_book.html:140
 msgid "Published date:"
 msgstr "Fecha de publicación:"
 
-#: bookwyrm/templates/book/edit_book.html:137
+#: bookwyrm/templates/book/edit_book.html:149
 #, fuzzy
 #| msgid "Author"
 msgid "Authors"
 msgstr "Autor/Autora"
 
-#: bookwyrm/templates/book/edit_book.html:143
+#: bookwyrm/templates/book/edit_book.html:155
 #, fuzzy, python-format
 #| msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
 msgstr "Agregado por <a href=\"%(user_path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/book/edit_book.html:148
+#: bookwyrm/templates/book/edit_book.html:160
 #, fuzzy
 #| msgid "Edit Author"
 msgid "Add Authors:"
 msgstr "Editar Autor/Autora"
 
-#: bookwyrm/templates/book/edit_book.html:149
+#: bookwyrm/templates/book/edit_book.html:161
 msgid "John Doe, Jane Smith"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:155
+#: bookwyrm/templates/book/edit_book.html:167
 #: bookwyrm/templates/user/shelf.html:75
 msgid "Cover"
 msgstr "Portada:"
 
-#: bookwyrm/templates/book/edit_book.html:182
+#: bookwyrm/templates/book/edit_book.html:194
 msgid "Physical Properties"
 msgstr "Propiedades físicas:"
 
-#: bookwyrm/templates/book/edit_book.html:183
+#: bookwyrm/templates/book/edit_book.html:195
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "Formato:"
 
-#: bookwyrm/templates/book/edit_book.html:191
+#: bookwyrm/templates/book/edit_book.html:203
 msgid "Pages:"
 msgstr "Páginas:"
 
-#: bookwyrm/templates/book/edit_book.html:198
+#: bookwyrm/templates/book/edit_book.html:210
 msgid "Book Identifiers"
 msgstr "Identificadores de libro"
 
-#: bookwyrm/templates/book/edit_book.html:199
+#: bookwyrm/templates/book/edit_book.html:211
 msgid "ISBN 13:"
 msgstr "ISBN 13:"
 
-#: bookwyrm/templates/book/edit_book.html:203
+#: bookwyrm/templates/book/edit_book.html:215
 msgid "ISBN 10:"
 msgstr "ISBN 10:"
 
-#: bookwyrm/templates/book/edit_book.html:207
+#: bookwyrm/templates/book/edit_book.html:219
 #: bookwyrm/templates/edit_author.html:59
 msgid "Openlibrary key:"
 msgstr "Clave OpenLibrary:"
@@ -497,12 +525,18 @@ msgstr ""
 
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
-#: bookwyrm/templates/feed/feed_layout.html:57
+#: bookwyrm/templates/feed/feed_layout.html:70
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
 msgid "Close"
 msgstr "Cerrar"
 
+#: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8
+#, fuzzy
+#| msgid "Boost status"
+msgid "Compose status"
+msgstr "Status de respaldo"
+
 #: bookwyrm/templates/directory/community_filter.html:5
 #, fuzzy
 #| msgid "Comment"
@@ -523,7 +557,7 @@ msgstr "Federalizado"
 
 #: bookwyrm/templates/directory/directory.html:6
 #: bookwyrm/templates/directory/directory.html:11
-#: bookwyrm/templates/layout.html:97
+#: bookwyrm/templates/layout.html:92
 msgid "Directory"
 msgstr ""
 
@@ -844,23 +878,23 @@ msgstr "Tus libros"
 msgid "There are no books here right now! Try searching for a book to get started"
 msgstr "¡No hay ningún libro aqui ahorita! Busca a un libro para empezar"
 
-#: bookwyrm/templates/feed/feed_layout.html:23
+#: bookwyrm/templates/feed/feed_layout.html:24
 #: bookwyrm/templates/user/shelf.html:28
 msgid "To Read"
 msgstr "Para leer"
 
-#: bookwyrm/templates/feed/feed_layout.html:24
+#: bookwyrm/templates/feed/feed_layout.html:25
 #: bookwyrm/templates/user/shelf.html:28
 msgid "Currently Reading"
 msgstr "Leyendo actualmente"
 
-#: bookwyrm/templates/feed/feed_layout.html:25
+#: bookwyrm/templates/feed/feed_layout.html:26
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
 #: bookwyrm/templates/user/shelf.html:28
 msgid "Read"
 msgstr "Leer"
 
-#: bookwyrm/templates/feed/feed_layout.html:74 bookwyrm/templates/goal.html:26
+#: bookwyrm/templates/feed/feed_layout.html:88 bookwyrm/templates/goal.html:26
 #: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
 msgid "%(year)s Reading Goal"
@@ -893,7 +927,7 @@ msgid "What are you reading?"
 msgstr "Lectura se empezó"
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:58
+#: bookwyrm/templates/lists/list.html:124
 msgid "Search for a book"
 msgstr "Buscar libros"
 
@@ -914,7 +948,7 @@ msgstr ""
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
 #: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
-#: bookwyrm/templates/lists/list.html:62
+#: bookwyrm/templates/lists/list.html:128
 msgid "Search"
 msgstr "Buscar"
 
@@ -931,7 +965,7 @@ msgid "Popular on %(site_name)s"
 msgstr "Sobre %(site_name)s"
 
 #: bookwyrm/templates/get_started/books.html:51
-#: bookwyrm/templates/lists/list.html:75
+#: bookwyrm/templates/lists/list.html:141
 msgid "No books found"
 msgstr "No se encontró ningún libro"
 
@@ -1055,7 +1089,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "Los libros de %(username)s para %(year)s"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/layout.html:102
+#: bookwyrm/templates/layout.html:97
 msgid "Import Books"
 msgstr "Importar libros"
 
@@ -1196,16 +1230,11 @@ msgstr "Menú de navigación central"
 msgid "Feed"
 msgstr "Actividad"
 
-#: bookwyrm/templates/layout.html:92
-#: bookwyrm/templates/preferences/preferences_layout.html:14
-msgid "Profile"
-msgstr "Perfil"
-
-#: bookwyrm/templates/layout.html:107
+#: bookwyrm/templates/layout.html:102
 msgid "Settings"
 msgstr "Configuración"
 
-#: bookwyrm/templates/layout.html:116
+#: bookwyrm/templates/layout.html:111
 #: bookwyrm/templates/settings/admin_layout.html:24
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
@@ -1213,57 +1242,57 @@ msgstr "Configuración"
 msgid "Invites"
 msgstr "Invitaciones"
 
-#: bookwyrm/templates/layout.html:123
+#: bookwyrm/templates/layout.html:118
 msgid "Admin"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:130
+#: bookwyrm/templates/layout.html:125
 msgid "Log out"
 msgstr "Cerrar sesión"
 
-#: bookwyrm/templates/layout.html:138 bookwyrm/templates/layout.html:139
+#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:10
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: bookwyrm/templates/layout.html:156 bookwyrm/templates/layout.html:160
+#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "Nombre de usuario:"
 
-#: bookwyrm/templates/layout.html:161
+#: bookwyrm/templates/layout.html:156
 msgid "password"
 msgstr "contraseña"
 
-#: bookwyrm/templates/layout.html:162 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr "¿Olvidaste tu contraseña?"
 
-#: bookwyrm/templates/layout.html:165 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "Iniciar sesión"
 
-#: bookwyrm/templates/layout.html:173
+#: bookwyrm/templates/layout.html:168
 msgid "Join"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:196
+#: bookwyrm/templates/layout.html:191
 msgid "About this server"
 msgstr "Sobre este servidor"
 
-#: bookwyrm/templates/layout.html:200
+#: bookwyrm/templates/layout.html:195
 msgid "Contact site admin"
 msgstr "Contactarse con administradores del sitio"
 
-#: bookwyrm/templates/layout.html:207
+#: bookwyrm/templates/layout.html:202
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:211
+#: bookwyrm/templates/layout.html:206
 msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm es software de código abierto. Puedes contribuir o reportar problemas en <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
@@ -1342,45 +1371,74 @@ msgstr "Abierto"
 msgid "Anyone can add books to this list"
 msgstr "Cualquer usuario puede agregar libros a esta lista"
 
-#: bookwyrm/templates/lists/list.html:17
+#: bookwyrm/templates/lists/list.html:19
+#: bookwyrm/templates/snippets/pagination.html:12
+msgid "Previous"
+msgstr "Anterior"
+
+#: bookwyrm/templates/lists/list.html:22
+#: bookwyrm/templates/snippets/pagination.html:23
+msgid "Next"
+msgstr "Siguiente"
+
+#: bookwyrm/templates/lists/list.html:58
 msgid "This list is currently empty"
 msgstr "Esta lista está vacia"
 
-#: bookwyrm/templates/lists/list.html:35
+#: bookwyrm/templates/lists/list.html:76
 #, python-format
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "Agregado por <a href=\"%(user_path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/lists/list.html:41
-#: bookwyrm/templates/snippets/shelf_selector.html:28
+#: bookwyrm/templates/lists/list.html:82
+#: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr "Quitar"
 
-#: bookwyrm/templates/lists/list.html:54
+#: bookwyrm/templates/lists/list.html:90
+msgid "Set list position"
+msgstr "Apunta indice"
+
+#: bookwyrm/templates/lists/list.html:103
+#: bookwyrm/templates/lists/list.html:115
+msgid "Sort List"
+msgstr "Ordena la lista"
+
+#: bookwyrm/templates/lists/list.html:109
+#, fuzzy
+#| msgid "List curation:"
+msgid "Direction"
+msgstr "Enumerar lista de comisariado:"
+
+#: bookwyrm/templates/lists/list.html:120
 msgid "Add Books"
 msgstr "Agregar libros"
 
-#: bookwyrm/templates/lists/list.html:54
+#: bookwyrm/templates/lists/list.html:120
 msgid "Suggest Books"
 msgstr "Sugerir libros"
 
-#: bookwyrm/templates/lists/list.html:63
+#: bookwyrm/templates/lists/list.html:129
 msgid "search"
 msgstr "buscar"
 
-#: bookwyrm/templates/lists/list.html:69
+#: bookwyrm/templates/lists/list.html:135
 msgid "Clear search"
 msgstr "Borrar búsqueda"
 
-#: bookwyrm/templates/lists/list.html:74
+#: bookwyrm/templates/lists/list.html:140
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
 msgstr "No se encontró ningún libro correspondiente a la búsqueda: \"%(query)s\""
 
-#: bookwyrm/templates/lists/list.html:90
+#: bookwyrm/templates/lists/list.html:156
 msgid "Suggest"
 msgstr "Sugerir"
 
+#: bookwyrm/templates/lists/lists.html:14 bookwyrm/templates/user/lists.html:9
+msgid "Your Lists"
+msgstr "Tus listas"
+
 #: bookwyrm/templates/login.html:4
 msgid "Login"
 msgstr "Iniciar sesión"
@@ -1422,7 +1480,7 @@ msgid "View user profile"
 msgstr "Perfil de usuario"
 
 #: bookwyrm/templates/moderation/report.html:22
-#: bookwyrm/templates/snippets/status/status_options.html:25
+#: bookwyrm/templates/snippets/status/status_options.html:35
 #: bookwyrm/templates/snippets/user_options.html:13
 msgid "Send direct message"
 msgstr "Enviar mensaje directo"
@@ -1440,8 +1498,8 @@ msgid "Moderator Comments"
 msgstr ""
 
 #: bookwyrm/templates/moderation/report.html:54
-#: bookwyrm/templates/snippets/create_status.html:12
-#: bookwyrm/templates/snippets/create_status_form.html:52
+#: bookwyrm/templates/snippets/create_status.html:28
+#: bookwyrm/templates/snippets/create_status_form.html:44
 msgid "Comment"
 msgstr "Comentario"
 
@@ -1698,6 +1756,10 @@ msgstr "Huso horario preferido"
 msgid "Account"
 msgstr "Cuenta"
 
+#: bookwyrm/templates/preferences/preferences_layout.html:14
+msgid "Profile"
+msgstr "Perfil"
+
 #: bookwyrm/templates/preferences/preferences_layout.html:20
 msgid "Relationships"
 msgstr "Relaciones"
@@ -1854,7 +1916,8 @@ msgid "Software"
 msgstr "Software"
 
 #: bookwyrm/templates/settings/federation.html:24
-#: bookwyrm/templates/settings/manage_invite_requests.html:33
+#: bookwyrm/templates/settings/manage_invite_requests.html:44
+#: bookwyrm/templates/settings/status_filter.html:5
 #: bookwyrm/templates/settings/user_admin.html:32
 msgid "Status"
 msgstr "Status"
@@ -1872,61 +1935,72 @@ msgstr "Invitaciones"
 msgid "Ignored Invite Requests"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:31
-msgid "Date"
-msgstr ""
+#: bookwyrm/templates/settings/manage_invite_requests.html:35
+#, fuzzy
+#| msgid "Federated"
+msgid "Date requested"
+msgstr "Federalizado"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:32
+#: bookwyrm/templates/settings/manage_invite_requests.html:39
+#, fuzzy
+#| msgid "Accept"
+msgid "Date accepted"
+msgstr "Aceptar"
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:42
 msgid "Email"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:34
+#: bookwyrm/templates/settings/manage_invite_requests.html:47
 #, fuzzy
 #| msgid "Notifications"
 msgid "Action"
 msgstr "Notificaciones"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:37
+#: bookwyrm/templates/settings/manage_invite_requests.html:50
 #, fuzzy
 #| msgid "Follow Requests"
 msgid "No requests"
 msgstr "Solicitudes de seguidor"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:45
+#: bookwyrm/templates/settings/manage_invite_requests.html:59
+#: bookwyrm/templates/settings/status_filter.html:16
 #, fuzzy
 #| msgid "Accept"
 msgid "Accepted"
 msgstr "Aceptar"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:47
+#: bookwyrm/templates/settings/manage_invite_requests.html:61
+#: bookwyrm/templates/settings/status_filter.html:12
 msgid "Sent"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:49
+#: bookwyrm/templates/settings/manage_invite_requests.html:63
+#: bookwyrm/templates/settings/status_filter.html:8
 msgid "Requested"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:57
+#: bookwyrm/templates/settings/manage_invite_requests.html:73
 msgid "Send invite"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:59
+#: bookwyrm/templates/settings/manage_invite_requests.html:75
 msgid "Re-send invite"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:70
+#: bookwyrm/templates/settings/manage_invite_requests.html:95
 msgid "Ignore"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:72
-msgid "Un-gnore"
+#: bookwyrm/templates/settings/manage_invite_requests.html:97
+msgid "Un-ignore"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:83
+#: bookwyrm/templates/settings/manage_invite_requests.html:108
 msgid "Back to pending requests"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:85
+#: bookwyrm/templates/settings/manage_invite_requests.html:110
 msgid "View ignored requests"
 msgstr ""
 
@@ -2080,8 +2154,8 @@ msgstr "<a href=\"%(path)s\">%(title)s</a> por "
 
 #: bookwyrm/templates/snippets/boost_button.html:8
 #: bookwyrm/templates/snippets/boost_button.html:9
-#: bookwyrm/templates/snippets/status/status_body.html:51
 #: bookwyrm/templates/snippets/status/status_body.html:52
+#: bookwyrm/templates/snippets/status/status_body.html:53
 msgid "Boost status"
 msgstr "Status de respaldo"
 
@@ -2094,15 +2168,15 @@ msgstr "Status de des-respaldo"
 msgid "Spoiler alert:"
 msgstr "Alerta de spoiler:"
 
-#: bookwyrm/templates/snippets/content_warning_field.html:4
+#: bookwyrm/templates/snippets/content_warning_field.html:10
 msgid "Spoilers ahead!"
 msgstr "¡Advertencia, ya vienen spoilers!"
 
-#: bookwyrm/templates/snippets/create_status.html:9
+#: bookwyrm/templates/snippets/create_status.html:17
 msgid "Review"
 msgstr "Reseña"
 
-#: bookwyrm/templates/snippets/create_status.html:15
+#: bookwyrm/templates/snippets/create_status.html:39
 msgid "Quote"
 msgstr "Cita"
 
@@ -2124,52 +2198,41 @@ msgstr "Cita"
 msgid "Review:"
 msgstr "Reseña"
 
-#: bookwyrm/templates/snippets/create_status_form.html:29
-#: bookwyrm/templates/user/shelf.html:81
-msgid "Rating"
-msgstr "Calificación"
-
-#: bookwyrm/templates/snippets/create_status_form.html:31
-#: bookwyrm/templates/snippets/rate_action.html:14
-#: bookwyrm/templates/snippets/stars.html:3
-msgid "No rating"
-msgstr "No calificación"
-
-#: bookwyrm/templates/snippets/create_status_form.html:64
+#: bookwyrm/templates/snippets/create_status_form.html:56
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
 msgid "Progress:"
 msgstr "Progreso:"
 
-#: bookwyrm/templates/snippets/create_status_form.html:71
+#: bookwyrm/templates/snippets/create_status_form.html:63
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr "páginas"
 
-#: bookwyrm/templates/snippets/create_status_form.html:72
+#: bookwyrm/templates/snippets/create_status_form.html:64
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr "por ciento"
 
-#: bookwyrm/templates/snippets/create_status_form.html:77
+#: bookwyrm/templates/snippets/create_status_form.html:69
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "de %(pages)s páginas"
 
-#: bookwyrm/templates/snippets/create_status_form.html:89
+#: bookwyrm/templates/snippets/create_status_form.html:81
 msgid "Include spoiler alert"
 msgstr "Incluir alerta de spoiler"
 
-#: bookwyrm/templates/snippets/create_status_form.html:95
+#: bookwyrm/templates/snippets/create_status_form.html:88
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:19
 msgid "Private"
 msgstr "Privada"
 
-#: bookwyrm/templates/snippets/create_status_form.html:102
+#: bookwyrm/templates/snippets/create_status_form.html:99
 msgid "Post"
 msgstr "Compartir"
 
@@ -2184,13 +2247,14 @@ msgstr "Estás eliminando esta lectura y sus %(count)s actualizaciones de progre
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
 #: bookwyrm/templates/snippets/follow_request_buttons.html:13
+#: venv/lib/python3.8/site-packages/django/forms/formsets.py:391
 msgid "Delete"
 msgstr "Eliminar"
 
 #: bookwyrm/templates/snippets/fav_button.html:7
 #: bookwyrm/templates/snippets/fav_button.html:8
-#: bookwyrm/templates/snippets/status/status_body.html:55
 #: bookwyrm/templates/snippets/status/status_body.html:56
+#: bookwyrm/templates/snippets/status/status_body.html:57
 msgid "Like status"
 msgstr "Me gusta status"
 
@@ -2209,11 +2273,11 @@ msgstr "Mostrar menos"
 msgid "Hide filters"
 msgstr ""
 
-#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:19
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:22
 msgid "Apply filters"
 msgstr ""
 
-#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:23
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:26
 #, fuzzy
 #| msgid "Clear search"
 msgid "Clear filters"
@@ -2237,6 +2301,19 @@ msgstr "Dejar de seguir"
 msgid "Accept"
 msgstr "Aceptar"
 
+#: bookwyrm/templates/snippets/form_rate_stars.html:20
+#: bookwyrm/templates/snippets/stars.html:13
+msgid "No rating"
+msgstr "No calificación"
+
+#: bookwyrm/templates/snippets/form_rate_stars.html:45
+#: bookwyrm/templates/snippets/stars.html:7
+#, python-format
+msgid "%(rating)s star"
+msgid_plural "%(rating)s stars"
+msgstr[0] ""
+msgstr[1] ""
+
 #: bookwyrm/templates/snippets/generated_status/goal.html:1
 #, python-format
 msgid "set a goal to read %(counter)s book in %(year)s"
@@ -2311,13 +2388,17 @@ msgstr "Has leído <a href=\"%(path)s\">%(read_count)s de %(goal_count)s libros<
 msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
 msgstr "%(username)s ha leído <a href=\"%(path)s\">%(read_count)s de %(goal_count)s libros</a>."
 
-#: bookwyrm/templates/snippets/pagination.html:7
-msgid "Previous"
-msgstr "Anterior"
+#: bookwyrm/templates/snippets/page_text.html:4
+#, fuzzy, python-format
+#| msgid "of %(pages)s pages"
+msgid "page %(page)s of %(total_pages)s"
+msgstr "de %(pages)s páginas"
 
-#: bookwyrm/templates/snippets/pagination.html:15
-msgid "Next"
-msgstr "Siguiente"
+#: bookwyrm/templates/snippets/page_text.html:6
+#, fuzzy, python-format
+#| msgid "%(pages)s pages"
+msgid "page %(page)s"
+msgstr "%(pages)s páginas"
 
 #: bookwyrm/templates/snippets/privacy-icons.html:3
 #: bookwyrm/templates/snippets/privacy-icons.html:4
@@ -2348,7 +2429,7 @@ msgstr "Seguidores"
 msgid "Leave a rating"
 msgstr "Da una calificación"
 
-#: bookwyrm/templates/snippets/rate_action.html:29
+#: bookwyrm/templates/snippets/rate_action.html:19
 msgid "Rate"
 msgstr "Calificar"
 
@@ -2356,28 +2437,28 @@ msgstr "Calificar"
 msgid "Progress Updates:"
 msgstr "Actualizaciones de progreso:"
 
-#: bookwyrm/templates/snippets/readthrough.html:12
+#: bookwyrm/templates/snippets/readthrough.html:14
 msgid "finished"
 msgstr "terminado"
 
-#: bookwyrm/templates/snippets/readthrough.html:15
+#: bookwyrm/templates/snippets/readthrough.html:25
 msgid "Show all updates"
 msgstr "Mostrar todas las actualizaciones"
 
-#: bookwyrm/templates/snippets/readthrough.html:31
+#: bookwyrm/templates/snippets/readthrough.html:41
 msgid "Delete this progress update"
 msgstr "Eliminar esta actualización de progreso"
 
-#: bookwyrm/templates/snippets/readthrough.html:41
+#: bookwyrm/templates/snippets/readthrough.html:51
 msgid "started"
 msgstr "empezado"
 
-#: bookwyrm/templates/snippets/readthrough.html:47
-#: bookwyrm/templates/snippets/readthrough.html:61
+#: bookwyrm/templates/snippets/readthrough.html:57
+#: bookwyrm/templates/snippets/readthrough.html:71
 msgid "Edit read dates"
 msgstr "Editar fechas de lectura"
 
-#: bookwyrm/templates/snippets/readthrough.html:51
+#: bookwyrm/templates/snippets/readthrough.html:61
 msgid "Delete these read dates"
 msgstr "Eliminar estas fechas de lectura"
 
@@ -2501,9 +2582,9 @@ msgstr "respaldó"
 msgid "Delete status"
 msgstr "Eliminar status"
 
-#: bookwyrm/templates/snippets/status/status_body.html:34
-#: bookwyrm/templates/snippets/status/status_body.html:47
+#: bookwyrm/templates/snippets/status/status_body.html:35
 #: bookwyrm/templates/snippets/status/status_body.html:48
+#: bookwyrm/templates/snippets/status/status_body.html:49
 msgid "Reply"
 msgstr "Respuesta"
 
@@ -2550,6 +2631,12 @@ msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path
 msgid "More options"
 msgstr "Más opciones"
 
+#: bookwyrm/templates/snippets/status/status_options.html:27
+#, fuzzy
+#| msgid "Delete these read dates"
+msgid "Delete & re-draft"
+msgstr "Eliminar estas fechas de lectura"
+
 #: bookwyrm/templates/snippets/switch_edition_button.html:5
 msgid "Switch to this edition"
 msgstr "Cambiar a esta edición"
@@ -2618,10 +2705,6 @@ msgstr "Siguiendo"
 msgid "%(username)s isn't following any users"
 msgstr "%(username)s no sigue a nadie"
 
-#: bookwyrm/templates/user/lists.html:9
-msgid "Your Lists"
-msgstr "Tus listas"
-
 #: bookwyrm/templates/user/lists.html:11
 #, python-format
 msgid "Lists: %(username)s"
@@ -2657,11 +2740,11 @@ msgstr "Empezado"
 msgid "Finished"
 msgstr "Terminado"
 
-#: bookwyrm/templates/user/shelf.html:127
+#: bookwyrm/templates/user/shelf.html:129
 msgid "This shelf is empty."
 msgstr "Este estante está vacio."
 
-#: bookwyrm/templates/user/shelf.html:133
+#: bookwyrm/templates/user/shelf.html:135
 msgid "Delete shelf"
 msgstr "Eliminar estante"
 
@@ -2738,12 +2821,1360 @@ msgstr "Ya existe un usuario con ese nombre."
 msgid "A password reset link sent to %s"
 msgstr ""
 
+#: venv/lib/python3.8/site-packages/_pytest/config/argparsing.py:442
+#, python-format
+msgid "ambiguous option: %(option)s could match %(matches)s"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/contrib/messages/apps.py:7
+#, fuzzy
+#| msgid "All messages"
+msgid "Messages"
+msgstr "Todos los mensajes"
+
+#: venv/lib/python3.8/site-packages/django/contrib/sitemaps/apps.py:7
+msgid "Site Maps"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/contrib/staticfiles/apps.py:9
+msgid "Static Files"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/contrib/syndication/apps.py:7
+msgid "Syndication"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/core/paginator.py:48
+msgid "That page number is not an integer"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/core/paginator.py:50
+msgid "That page number is less than 1"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/core/paginator.py:55
+msgid "That page contains no results"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/core/validators.py:20
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid value."
+msgstr "Dirección de correo electrónico:"
+
+#: venv/lib/python3.8/site-packages/django/core/validators.py:91
+#: venv/lib/python3.8/site-packages/django/forms/fields.py:671
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid URL."
+msgstr "Dirección de correo electrónico:"
+
+#: venv/lib/python3.8/site-packages/django/core/validators.py:145
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid integer."
+msgstr "Dirección de correo electrónico:"
+
+#: venv/lib/python3.8/site-packages/django/core/validators.py:156
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid email address."
+msgstr "Dirección de correo electrónico:"
+
+#. Translators: "letters" means latin letters: a-z and A-Z.
+#: venv/lib/python3.8/site-packages/django/core/validators.py:230
+msgid "Enter a valid “slug� consisting of letters, numbers, underscores or hyphens."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/core/validators.py:237
+msgid "Enter a valid “slug� consisting of Unicode letters, numbers, underscores, or hyphens."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/core/validators.py:246
+#: venv/lib/python3.8/site-packages/django/core/validators.py:266
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid IPv4 address."
+msgstr "Dirección de correo electrónico:"
+
+#: venv/lib/python3.8/site-packages/django/core/validators.py:251
+#: venv/lib/python3.8/site-packages/django/core/validators.py:267
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid IPv6 address."
+msgstr "Dirección de correo electrónico:"
+
+#: venv/lib/python3.8/site-packages/django/core/validators.py:261
+#: venv/lib/python3.8/site-packages/django/core/validators.py:265
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Dirección de correo electrónico:"
+
+#: venv/lib/python3.8/site-packages/django/core/validators.py:295
+msgid "Enter only digits separated by commas."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/core/validators.py:301
+#, python-format
+msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/core/validators.py:334
+#, python-format
+msgid "Ensure this value is less than or equal to %(limit_value)s."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/core/validators.py:343
+#, python-format
+msgid "Ensure this value is greater than or equal to %(limit_value)s."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/core/validators.py:353
+#, python-format
+msgid "Ensure this value has at least %(limit_value)d character (it has %(show_value)d)."
+msgid_plural "Ensure this value has at least %(limit_value)d characters (it has %(show_value)d)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.8/site-packages/django/core/validators.py:368
+#, python-format
+msgid "Ensure this value has at most %(limit_value)d character (it has %(show_value)d)."
+msgid_plural "Ensure this value has at most %(limit_value)d characters (it has %(show_value)d)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.8/site-packages/django/core/validators.py:387
+#: venv/lib/python3.8/site-packages/django/forms/fields.py:292
+#: venv/lib/python3.8/site-packages/django/forms/fields.py:327
+#, fuzzy
+#| msgid "Series number:"
+msgid "Enter a number."
+msgstr "Número de serie:"
+
+#: venv/lib/python3.8/site-packages/django/core/validators.py:389
+#, python-format
+msgid "Ensure that there are no more than %(max)s digit in total."
+msgid_plural "Ensure that there are no more than %(max)s digits in total."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.8/site-packages/django/core/validators.py:394
+#, python-format
+msgid "Ensure that there are no more than %(max)s decimal place."
+msgid_plural "Ensure that there are no more than %(max)s decimal places."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.8/site-packages/django/core/validators.py:399
+#, python-format
+msgid "Ensure that there are no more than %(max)s digit before the decimal point."
+msgid_plural "Ensure that there are no more than %(max)s digits before the decimal point."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.8/site-packages/django/core/validators.py:461
+#, python-format
+msgid "File extension “%(extension)s� is not allowed. Allowed extensions are: %(allowed_extensions)s."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/core/validators.py:513
+msgid "Null characters are not allowed."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/base.py:1190
+#: venv/lib/python3.8/site-packages/django/forms/models.py:760
+msgid "and"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/base.py:1192
+#, fuzzy, python-format
+#| msgid "A user with that username already exists."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr "Ya existe un usuario con ese nombre."
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:100
+#, fuzzy, python-format
+#| msgid "%(value)s is not a valid remote_id"
+msgid "Value %(value)r is not a valid choice."
+msgstr "%(value)s no es un remote_id válido"
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:101
+#, fuzzy
+#| msgid "This shelf is empty."
+msgid "This field cannot be null."
+msgstr "Este estante está vacio."
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:102
+msgid "This field cannot be blank."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:103
+#, fuzzy, python-format
+#| msgid "A user with that username already exists."
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "Ya existe un usuario con ese nombre."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:107
+#, python-format
+msgid "%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:126
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:939
+#, python-format
+msgid "“%(value)s� value must be either True or False."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:940
+#, python-format
+msgid "“%(value)s� value must be either True, False, or None."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:942
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:983
+#, python-format
+msgid "String (up to %(max_length)s)"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1047
+#, fuzzy
+#| msgid "No active invites"
+msgid "Comma-separated integers"
+msgstr "No invitaciónes activas"
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1096
+#, python-format
+msgid "“%(value)s� value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1098
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1241
+#, python-format
+msgid "“%(value)s� value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1101
+msgid "Date (without time)"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1239
+#, python-format
+msgid "“%(value)s� value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ] format."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1243
+#, python-format
+msgid "“%(value)s� value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but it is an invalid date/time."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1247
+msgid "Date (with time)"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1395
+#, fuzzy, python-format
+#| msgid "%(value)s is not a valid username"
+msgid "“%(value)s� value must be a decimal number."
+msgstr "%(value)s no es un usuario válido"
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1397
+#, fuzzy
+#| msgid "Series number:"
+msgid "Decimal number"
+msgstr "Número de serie:"
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1536
+#, python-format
+msgid "“%(value)s� value has an invalid format. It must be in [DD] [[HH:]MM:]ss[.uuuuuu] format."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1539
+#, fuzzy
+#| msgid "List curation:"
+msgid "Duration"
+msgstr "Enumerar lista de comisariado:"
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1589
+#, fuzzy
+#| msgid "Email address:"
+msgid "Email address"
+msgstr "Dirección de correo electrónico:"
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1612
+msgid "File path"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1678
+#, fuzzy, python-format
+#| msgid "%(value)s is not a valid username"
+msgid "“%(value)s� value must be a float."
+msgstr "%(value)s no es un usuario válido"
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1680
+msgid "Floating point number"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1718
+#, python-format
+msgid "“%(value)s� value must be an integer."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1720
+msgid "Integer"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1803
+#, fuzzy
+#| msgid "No active invites"
+msgid "Big (8 byte) integer"
+msgstr "No invitaciónes activas"
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1819
+#, fuzzy
+#| msgid "Email address:"
+msgid "IPv4 address"
+msgstr "Dirección de correo electrónico:"
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1850
+#, fuzzy
+#| msgid "Email address:"
+msgid "IP address"
+msgstr "Dirección de correo electrónico:"
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1930
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1931
+#, python-format
+msgid "“%(value)s� value must be either None, True or False."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1933
+msgid "Boolean (Either True, False or None)"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1976
+#, fuzzy
+#| msgid "No active invites"
+msgid "Positive big integer"
+msgstr "No invitaciónes activas"
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1989
+#, fuzzy
+#| msgid "No active invites"
+msgid "Positive integer"
+msgstr "No invitaciónes activas"
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2002
+#, fuzzy
+#| msgid "No active invites"
+msgid "Positive small integer"
+msgstr "No invitaciónes activas"
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2016
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2048
+msgid "Small integer"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2055
+msgid "Text"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2083
+#, python-format
+msgid "“%(value)s� value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2085
+#, python-format
+msgid "“%(value)s� value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid time."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2088
+msgid "Time"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2214
+msgid "URL"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2236
+msgid "Raw binary data"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2301
+#, fuzzy, python-format
+#| msgid "%(value)s is not a valid username"
+msgid "“%(value)s� is not a valid UUID."
+msgstr "%(value)s no es un usuario válido"
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2303
+msgid "Universally unique identifier"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/files.py:231
+msgid "File"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/files.py:379
+#, fuzzy
+#| msgid "Images"
+msgid "Image"
+msgstr "Imagenes"
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/json.py:18
+msgid "A JSON object"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/json.py:20
+msgid "Value must be valid JSON."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/related.py:790
+#, python-format
+msgid "%(model)s instance with %(field)s %(value)r does not exist."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/related.py:792
+msgid "Foreign Key (type determined by related field)"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/related.py:1045
+#, fuzzy
+#| msgid "Relationships"
+msgid "One-to-one relationship"
+msgstr "Relaciones"
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/related.py:1099
+#, fuzzy, python-format
+#| msgid "Relationships"
+msgid "%(from)s-%(to)s relationship"
+msgstr "Relaciones"
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/related.py:1100
+#, fuzzy, python-format
+#| msgid "Relationships"
+msgid "%(from)s-%(to)s relationships"
+msgstr "Relaciones"
+
+#: venv/lib/python3.8/site-packages/django/db/models/fields/related.py:1142
+#, fuzzy
+#| msgid "Relationships"
+msgid "Many-to-many relationship"
+msgstr "Relaciones"
+
+#. Translators: If found as last label character, these punctuation
+#. characters will prevent the default label_suffix to be appended to the label
+#: venv/lib/python3.8/site-packages/django/forms/boundfield.py:150
+msgid ":?.!"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/forms/fields.py:54
+#, fuzzy
+#| msgid "This shelf is empty."
+msgid "This field is required."
+msgstr "Este estante está vacio."
+
+#: venv/lib/python3.8/site-packages/django/forms/fields.py:247
+#, fuzzy
+#| msgid "Series number:"
+msgid "Enter a whole number."
+msgstr "Número de serie:"
+
+#: venv/lib/python3.8/site-packages/django/forms/fields.py:398
+#: venv/lib/python3.8/site-packages/django/forms/fields.py:1139
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid date."
+msgstr "Dirección de correo electrónico:"
+
+#: venv/lib/python3.8/site-packages/django/forms/fields.py:422
+#: venv/lib/python3.8/site-packages/django/forms/fields.py:1140
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid time."
+msgstr "Dirección de correo electrónico:"
+
+#: venv/lib/python3.8/site-packages/django/forms/fields.py:450
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid date/time."
+msgstr "Dirección de correo electrónico:"
+
+#: venv/lib/python3.8/site-packages/django/forms/fields.py:484
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid duration."
+msgstr "Dirección de correo electrónico:"
+
+#: venv/lib/python3.8/site-packages/django/forms/fields.py:485
+#, python-brace-format
+msgid "The number of days must be between {min_days} and {max_days}."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/forms/fields.py:545
+msgid "No file was submitted. Check the encoding type on the form."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/forms/fields.py:546
+msgid "No file was submitted."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/forms/fields.py:547
+#, fuzzy
+#| msgid "This shelf is empty."
+msgid "The submitted file is empty."
+msgstr "Este estante está vacio."
+
+#: venv/lib/python3.8/site-packages/django/forms/fields.py:549
+#, python-format
+msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
+msgid_plural "Ensure this filename has at most %(max)d characters (it has %(length)d)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.8/site-packages/django/forms/fields.py:552
+msgid "Please either submit a file or check the clear checkbox, not both."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/forms/fields.py:613
+msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/forms/fields.py:775
+#: venv/lib/python3.8/site-packages/django/forms/fields.py:865
+#: venv/lib/python3.8/site-packages/django/forms/models.py:1296
+#, python-format
+msgid "Select a valid choice. %(value)s is not one of the available choices."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/forms/fields.py:866
+#: venv/lib/python3.8/site-packages/django/forms/fields.py:981
+#: venv/lib/python3.8/site-packages/django/forms/models.py:1295
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a list of values."
+msgstr "Dirección de correo electrónico:"
+
+#: venv/lib/python3.8/site-packages/django/forms/fields.py:982
+msgid "Enter a complete value."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/forms/fields.py:1198
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid UUID."
+msgstr "Dirección de correo electrónico:"
+
+#: venv/lib/python3.8/site-packages/django/forms/fields.py:1228
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid JSON."
+msgstr "Dirección de correo electrónico:"
+
+#. Translators: This is the default suffix added to form field labels
+#: venv/lib/python3.8/site-packages/django/forms/forms.py:78
+msgid ":"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/forms/forms.py:205
+#, python-format
+msgid "(Hidden field %(name)s) %(error)s"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/forms/formsets.py:93
+msgid "ManagementForm data is missing or has been tampered with"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/forms/formsets.py:345
+#, python-format
+msgid "Please submit %d or fewer forms."
+msgid_plural "Please submit %d or fewer forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.8/site-packages/django/forms/formsets.py:352
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.8/site-packages/django/forms/formsets.py:379
+#: venv/lib/python3.8/site-packages/django/forms/formsets.py:386
+msgid "Order"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/forms/models.py:755
+#, python-format
+msgid "Please correct the duplicate data for %(field)s."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/forms/models.py:759
+#, python-format
+msgid "Please correct the duplicate data for %(field)s, which must be unique."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/forms/models.py:765
+#, python-format
+msgid "Please correct the duplicate data for %(field_name)s which must be unique for the %(lookup)s in %(date_field)s."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/forms/models.py:774
+msgid "Please correct the duplicate values below."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/forms/models.py:1096
+msgid "The inline value did not match the parent instance."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/forms/models.py:1180
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/forms/models.py:1298
+#, fuzzy, python-format
+#| msgid "%(value)s is not a valid username"
+msgid "“%(pk)s� is not a valid value."
+msgstr "%(value)s no es un usuario válido"
+
+#: venv/lib/python3.8/site-packages/django/forms/utils.py:167
+#, python-format
+msgid "%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it may be ambiguous or it may not exist."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/forms/widgets.py:398
+msgid "Clear"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/forms/widgets.py:399
+#, fuzzy
+#| msgid "Currently Reading"
+msgid "Currently"
+msgstr "Leyendo actualmente"
+
+#: venv/lib/python3.8/site-packages/django/forms/widgets.py:400
+#, fuzzy
+#| msgid "Change shelf"
+msgid "Change"
+msgstr "Cambiar estante"
+
+#: venv/lib/python3.8/site-packages/django/forms/widgets.py:709
+msgid "Unknown"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/forms/widgets.py:710
+msgid "Yes"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/forms/widgets.py:711
+msgid "No"
+msgstr ""
+
+#. Translators: Please do not add spaces around commas.
+#: venv/lib/python3.8/site-packages/django/template/defaultfilters.py:790
+msgid "yes,no,maybe"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/template/defaultfilters.py:819
+#: venv/lib/python3.8/site-packages/django/template/defaultfilters.py:836
+#, python-format
+msgid "%(size)d byte"
+msgid_plural "%(size)d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.8/site-packages/django/template/defaultfilters.py:838
+#, python-format
+msgid "%s KB"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/template/defaultfilters.py:840
+#, python-format
+msgid "%s MB"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/template/defaultfilters.py:842
+#, python-format
+msgid "%s GB"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/template/defaultfilters.py:844
+#, python-format
+msgid "%s TB"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/template/defaultfilters.py:846
+#, python-format
+msgid "%s PB"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dateformat.py:65
+msgid "p.m."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dateformat.py:66
+msgid "a.m."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dateformat.py:71
+msgid "PM"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dateformat.py:72
+msgid "AM"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dateformat.py:149
+msgid "midnight"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dateformat.py:151
+msgid "noon"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:6
+#: venv/lib/python3.8/site-packages/tornado/locale.py:295
+msgid "Monday"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:6
+#: venv/lib/python3.8/site-packages/tornado/locale.py:296
+msgid "Tuesday"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:6
+#: venv/lib/python3.8/site-packages/tornado/locale.py:297
+msgid "Wednesday"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:6
+#: venv/lib/python3.8/site-packages/tornado/locale.py:298
+msgid "Thursday"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:6
+#: venv/lib/python3.8/site-packages/tornado/locale.py:299
+msgid "Friday"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:7
+#: venv/lib/python3.8/site-packages/tornado/locale.py:300
+msgid "Saturday"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:7
+#: venv/lib/python3.8/site-packages/tornado/locale.py:301
+msgid "Sunday"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:10
+msgid "Mon"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:10
+msgid "Tue"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:10
+msgid "Wed"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:10
+msgid "Thu"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:10
+msgid "Fri"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:11
+#, fuzzy
+#| msgid "Status"
+msgid "Sat"
+msgstr "Status"
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:11
+msgid "Sun"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv/lib/python3.8/site-packages/tornado/locale.py:281
+msgid "January"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv/lib/python3.8/site-packages/tornado/locale.py:282
+msgid "February"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv/lib/python3.8/site-packages/tornado/locale.py:283
+#, fuzzy
+#| msgid "Search"
+msgid "March"
+msgstr "Buscar"
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv/lib/python3.8/site-packages/tornado/locale.py:284
+msgid "April"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv/lib/python3.8/site-packages/tornado/locale.py:285
+msgid "May"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv/lib/python3.8/site-packages/tornado/locale.py:286
+msgid "June"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:15
+#: venv/lib/python3.8/site-packages/tornado/locale.py:287
+msgid "July"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:15
+#: venv/lib/python3.8/site-packages/tornado/locale.py:288
+msgid "August"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:15
+#: venv/lib/python3.8/site-packages/tornado/locale.py:289
+#, fuzzy
+#| msgid "Series number:"
+msgid "September"
+msgstr "Número de serie:"
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:15
+#: venv/lib/python3.8/site-packages/tornado/locale.py:290
+msgid "October"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:15
+#: venv/lib/python3.8/site-packages/tornado/locale.py:291
+msgid "November"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:16
+#: venv/lib/python3.8/site-packages/tornado/locale.py:292
+#, fuzzy
+#| msgid "Series number:"
+msgid "December"
+msgstr "Número de serie:"
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "jan"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "feb"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "mar"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "apr"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "may"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "jun"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "jul"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "aug"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "sep"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "oct"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "nov"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "dec"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:23
+msgctxt "abbrev. month"
+msgid "Jan."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:24
+msgctxt "abbrev. month"
+msgid "Feb."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:25
+#, fuzzy
+#| msgid "Search"
+msgctxt "abbrev. month"
+msgid "March"
+msgstr "Buscar"
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:26
+msgctxt "abbrev. month"
+msgid "April"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:27
+msgctxt "abbrev. month"
+msgid "May"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:28
+msgctxt "abbrev. month"
+msgid "June"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:29
+msgctxt "abbrev. month"
+msgid "July"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:30
+msgctxt "abbrev. month"
+msgid "Aug."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:31
+msgctxt "abbrev. month"
+msgid "Sept."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:32
+msgctxt "abbrev. month"
+msgid "Oct."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:33
+msgctxt "abbrev. month"
+msgid "Nov."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:34
+msgctxt "abbrev. month"
+msgid "Dec."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:37
+msgctxt "alt. month"
+msgid "January"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:38
+msgctxt "alt. month"
+msgid "February"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:39
+#, fuzzy
+#| msgid "Search"
+msgctxt "alt. month"
+msgid "March"
+msgstr "Buscar"
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:40
+msgctxt "alt. month"
+msgid "April"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:41
+msgctxt "alt. month"
+msgid "May"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:42
+msgctxt "alt. month"
+msgid "June"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:43
+msgctxt "alt. month"
+msgid "July"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:44
+msgctxt "alt. month"
+msgid "August"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:45
+#, fuzzy
+#| msgid "Series number:"
+msgctxt "alt. month"
+msgid "September"
+msgstr "Número de serie:"
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:46
+msgctxt "alt. month"
+msgid "October"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:47
+msgctxt "alt. month"
+msgid "November"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/dates.py:48
+#, fuzzy
+#| msgid "Series number:"
+msgctxt "alt. month"
+msgid "December"
+msgstr "Número de serie:"
+
+#: venv/lib/python3.8/site-packages/django/utils/ipv6.py:8
+#, fuzzy
+#| msgid "Email address:"
+msgid "This is not a valid IPv6 address."
+msgstr "Dirección de correo electrónico:"
+
+#: venv/lib/python3.8/site-packages/django/utils/text.py:70
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s…"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/text.py:236
+msgid "or"
+msgstr ""
+
+#. Translators: This string is used as a separator between list elements
+#: venv/lib/python3.8/site-packages/django/utils/text.py:255
+#: venv/lib/python3.8/site-packages/django/utils/timesince.py:83
+msgid ", "
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/utils/timesince.py:9
+#, python-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.8/site-packages/django/utils/timesince.py:10
+#, python-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.8/site-packages/django/utils/timesince.py:11
+#, python-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.8/site-packages/django/utils/timesince.py:12
+#, python-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.8/site-packages/django/utils/timesince.py:13
+#, python-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.8/site-packages/django/utils/timesince.py:14
+#, python-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv/lib/python3.8/site-packages/django/views/csrf.py:110
+msgid "Forbidden"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/views/csrf.py:111
+msgid "CSRF verification failed. Request aborted."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/views/csrf.py:115
+msgid "You are seeing this message because this HTTPS site requires a “Referer header� to be sent by your Web browser, but none was sent. This header is required for security reasons, to ensure that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/views/csrf.py:120
+msgid "If you have configured your browser to disable “Referer� headers, please re-enable them, at least for this site, or for HTTPS connections, or for “same-origin� requests."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/views/csrf.py:124
+msgid "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or including the “Referrer-Policy: no-referrer� header, please remove them. The CSRF protection requires the “Referer� header to do strict referer checking. If you’re concerned about privacy, use alternatives like <a rel=\"noreferrer\" …> for links to third-party sites."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/views/csrf.py:132
+msgid "You are seeing this message because this site requires a CSRF cookie when submitting forms. This cookie is required for security reasons, to ensure that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/views/csrf.py:137
+msgid "If you have configured your browser to disable cookies, please re-enable them, at least for this site, or for “same-origin� requests."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/views/csrf.py:142
+msgid "More information is available with DEBUG=True."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/views/generic/dates.py:41
+msgid "No year specified"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/views/generic/dates.py:61
+#: venv/lib/python3.8/site-packages/django/views/generic/dates.py:111
+#: venv/lib/python3.8/site-packages/django/views/generic/dates.py:208
+msgid "Date out of range"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/views/generic/dates.py:90
+msgid "No month specified"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/views/generic/dates.py:142
+msgid "No day specified"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/views/generic/dates.py:188
+msgid "No week specified"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/views/generic/dates.py:338
+#: venv/lib/python3.8/site-packages/django/views/generic/dates.py:367
+#, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/views/generic/dates.py:589
+#, python-format
+msgid "Future %(verbose_name_plural)s not available because %(class_name)s.allow_future is False."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/views/generic/dates.py:623
+#, python-format
+msgid "Invalid date string “%(datestr)s� given format “%(format)s�"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/views/generic/detail.py:54
+#, fuzzy, python-format
+#| msgid "No books found matching the query \"%(query)s\""
+msgid "No %(verbose_name)s found matching the query"
+msgstr "No se encontró ningún libro correspondiente a la búsqueda: \"%(query)s\""
+
+#: venv/lib/python3.8/site-packages/django/views/generic/list.py:67
+msgid "Page is not “last�, nor can it be converted to an int."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/views/generic/list.py:72
+#, python-format
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/views/generic/list.py:154
+#, python-format
+msgid "Empty list and “%(class_name)s.allow_empty� is False."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/views/static.py:40
+msgid "Directory indexes are not allowed here."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/views/static.py:42
+#, fuzzy, python-format
+#| msgid "%(value)s is not a valid username"
+msgid "“%(path)s� does not exist"
+msgstr "%(value)s no es un usuario válido"
+
+#: venv/lib/python3.8/site-packages/django/views/static.py:80
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:7
+msgid "Django: the Web framework for perfectionists with deadlines."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:346
+#, python-format
+msgid "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:368
+msgid "The install worked successfully! Congratulations!"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:369
+#, python-format
+msgid "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener\">DEBUG=True</a> is in your settings file and you have not configured any URLs."
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:384
+msgid "Django Documentation"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:385
+msgid "Topics, references, &amp; how-to’s"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:396
+msgid "Tutorial: A Polling App"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:397
+msgid "Get started with Django"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:408
+#, fuzzy
+#| msgid "Comment"
+msgid "Django Community"
+msgstr "Comentario"
+
+#: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:409
+msgid "Connect, get help, or contribute"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/kombu/transport/qpid.py:1301
+#, python-format
+msgid "Attempting to connect to qpid with SASL mechanism %s"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/kombu/transport/qpid.py:1306
+#, python-format
+msgid "Connected to qpid with SASL mechanism %s"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/kombu/transport/qpid.py:1324
+#, python-format
+msgid "Unable to connect to qpid with SASL mechanism %s"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/tornado/locale.py:371
+msgid "1 second ago"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/tornado/locale.py:377
+msgid "1 minute ago"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/tornado/locale.py:382
+msgid "1 hour ago"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/tornado/locale.py:385
+#, python-format
+msgid "%(time)s"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/tornado/locale.py:387
+msgid "yesterday"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/tornado/locale.py:387
+#, python-format
+msgid "yesterday at %(time)s"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/tornado/locale.py:389
+#, python-format
+msgid "%(weekday)s"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/tornado/locale.py:389
+#, python-format
+msgid "%(weekday)s at %(time)s"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/tornado/locale.py:392
+#: venv/lib/python3.8/site-packages/tornado/locale.py:445
+#, python-format
+msgid "%(month_name)s %(day)s"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/tornado/locale.py:394
+#, python-format
+msgid "%(month_name)s %(day)s at %(time)s"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/tornado/locale.py:399
+#, python-format
+msgid "%(month_name)s %(day)s, %(year)s"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/tornado/locale.py:401
+#, python-format
+msgid "%(month_name)s %(day)s, %(year)s at %(time)s"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/tornado/locale.py:439
+#, python-format
+msgid "%(weekday)s, %(month_name)s %(day)s"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/tornado/locale.py:462
+#, python-format
+msgid "%(commas)s and %(last)s"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/tornado/test/locale_test.py:68
+msgctxt "law"
+msgid "right"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/tornado/test/locale_test.py:69
+msgctxt "good"
+msgid "right"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/tornado/test/locale_test.py:71
+#: venv/lib/python3.8/site-packages/tornado/test/locale_test.py:74
+msgctxt "organization"
+msgid "club"
+msgstr ""
+
+#: venv/lib/python3.8/site-packages/tornado/test/locale_test.py:76
+#: venv/lib/python3.8/site-packages/tornado/test/locale_test.py:77
+msgctxt "stick"
+msgid "club"
+msgstr ""
+
 #, fuzzy
 #~| msgid "Started"
 #~ msgid "Getting Started"
 #~ msgstr "Empezado"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "No users found for \"%(query)s\""
 #~ msgid "No users were found for \"%(query)s\""
 #~ msgstr "No se encontró ningún usuario correspondiente a \"%(query)s\""
@@ -2757,7 +4188,6 @@ msgstr ""
 #~ msgid "Your lists"
 #~ msgstr "Tus listas"
 
-#, python-format
 #~ msgid "See all %(size)s lists"
 #~ msgstr "Ver las %(size)s listas"
 
@@ -2782,148 +4212,18 @@ msgstr ""
 #~ msgid "Your Shelves"
 #~ msgstr "Tus estantes"
 
-#, python-format
 #~ msgid "%(username)s: Shelves"
 #~ msgstr "%(username)s: Estantes"
 
 #~ msgid "Shelves"
 #~ msgstr "Estantes"
 
-#, python-format
 #~ msgid "See all %(shelf_count)s shelves"
 #~ msgstr "Ver los %(shelf_count)s estantes"
 
 #~ msgid "Send follow request"
 #~ msgstr "Envia solicitud de seguidor"
 
-#, fuzzy
-#~| msgid "All messages"
-#~ msgid "Messages"
-#~ msgstr "Todos los mensajes"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "Enter a valid email address."
-#~ msgstr "Dirección de correo electrónico:"
-
-#, fuzzy
-#~| msgid "Series number:"
-#~ msgid "Enter a number."
-#~ msgstr "Número de serie:"
-
-#, fuzzy
-#~| msgid "%(value)s is not a valid remote_id"
-#~ msgid "Value %(value)r is not a valid choice."
-#~ msgstr "%(value)s no es un remote_id válido"
-
-#, fuzzy
-#~| msgid "Series number:"
-#~ msgid "Decimal number"
-#~ msgstr "Número de serie:"
-
-#, fuzzy
-#~| msgid "List curation:"
-#~ msgid "Duration"
-#~ msgstr "Enumerar lista de comisariado:"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "Email address"
-#~ msgstr "Dirección de correo electrónico:"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "IPv4 address"
-#~ msgstr "Dirección de correo electrónico:"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "IP address"
-#~ msgstr "Dirección de correo electrónico:"
-
-#, fuzzy
-#~| msgid "No active invites"
-#~ msgid "Positive integer"
-#~ msgstr "No invitaciónes activas"
-
-#, fuzzy
-#~| msgid "%(value)s is not a valid username"
-#~ msgid "“%(value)s� is not a valid UUID."
-#~ msgstr "%(value)s no es un usuario válido"
-
-#, fuzzy
-#~| msgid "Images"
-#~ msgid "Image"
-#~ msgstr "Imagenes"
-
-#, fuzzy
-#~| msgid "Relationships"
-#~ msgid "One-to-one relationship"
-#~ msgstr "Relaciones"
-
-#, fuzzy
-#~| msgid "This shelf is empty."
-#~ msgid "This field is required."
-#~ msgstr "Este estante está vacio."
-
-#, fuzzy
-#~| msgid "This shelf is empty."
-#~ msgid "The submitted file is empty."
-#~ msgstr "Este estante está vacio."
-
-#, fuzzy
-#~| msgid "%(value)s is not a valid username"
-#~ msgid "“%(pk)s� is not a valid value."
-#~ msgstr "%(value)s no es un usuario válido"
-
-#, fuzzy
-#~| msgid "Currently Reading"
-#~ msgid "Currently"
-#~ msgstr "Leyendo actualmente"
-
-#, fuzzy
-#~| msgid "Change shelf"
-#~ msgid "Change"
-#~ msgstr "Cambiar estante"
-
-#, fuzzy
-#~| msgid "Status"
-#~ msgid "Sat"
-#~ msgstr "Status"
-
-#, fuzzy
-#~| msgid "Search"
-#~ msgid "March"
-#~ msgstr "Buscar"
-
-#, fuzzy
-#~| msgid "Series number:"
-#~ msgid "September"
-#~ msgstr "Número de serie:"
-
-#, fuzzy
-#~| msgid "Search"
-#~ msgctxt "abbrev. month"
-#~ msgid "March"
-#~ msgstr "Buscar"
-
-#, fuzzy
-#~| msgid "Search"
-#~ msgctxt "alt. month"
-#~ msgid "March"
-#~ msgstr "Buscar"
-
-#, fuzzy
-#~| msgid "Series number:"
-#~ msgctxt "alt. month"
-#~ msgid "September"
-#~ msgstr "Número de serie:"
-
-#, fuzzy
-#~| msgid "No books found matching the query \"%(query)s\""
-#~ msgid "No %(verbose_name)s found matching the query"
-#~ msgstr "No se encontró ningún libro correspondiente a la búsqueda: \"%(query)s\""
-
 #~ msgid "Announcements"
 #~ msgstr "Anuncios"
 

From b2b5ee5a224a71591ab44eed916dc614aff313e0 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sat, 17 Apr 2021 12:39:57 +0200
Subject: [PATCH 0823/1285] [lint] Tweak editorconfig and frontend lint:

- Ignore computer generated files when linting.
- Include .mo files for consistency.
- Use multiline yaml syntax for `run` commands.
---
 .editorconfig                        |  9 +++++++--
 .github/workflows/lint-frontend.yaml | 11 ++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 58ba190d..bad9b712 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -20,9 +20,10 @@ block_comment_end = */
 [{bw-dev,fr-dev,LICENSE}]
 max_line_length = off
 
-[*.{csv,json,html,md,po,py,svg,tsv}]
+[*.{csv,json,html,md,mo,po,py,svg,tsv}]
 max_line_length = off
 
+# `  ` at the end of a line is a line-break in markdown
 [*.{md,markdown}]
 trim_trailing_whitespace = false
 
@@ -30,7 +31,11 @@ trim_trailing_whitespace = false
 indent_size = 2
 max_line_length = off
 
-[{package.json,yarn.lock}]
+# Computer generated files
+[{package.json,*.lock}]
 indent_size = unset
 indent_style = unset
 max_line_length = unset
+
+[*.mo]
+insert_final_newline = unset
diff --git a/.github/workflows/lint-frontend.yaml b/.github/workflows/lint-frontend.yaml
index f370d83b..54cac04d 100644
--- a/.github/workflows/lint-frontend.yaml
+++ b/.github/workflows/lint-frontend.yaml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it.
       - uses: actions/checkout@v2
 
       - name: Install modules
@@ -26,8 +26,13 @@ jobs:
 
       # See .stylelintignore for files that are not linted.
       - name: Run stylelint
-        run: yarn stylelint bookwyrm/static/**/*.css --report-needless-disables --report-invalid-scope-disables
+        run: >
+          yarn stylelint bookwyrm/static/**/*.css \
+            --report-needless-disables \
+            --report-invalid-scope-disables
 
       # See .eslintignore for files that are not linted.
       - name: Run ESLint
-        run: yarn eslint bookwyrm/static --ext .js,.jsx,.ts,.tsx
+        run: >
+          yarn eslint bookwyrm/static \
+            --ext .js,.jsx,.ts,.tsx

From 01cfa9dde97d51a448c4fadc54aa9ef7d0397295 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 17 Apr 2021 10:12:50 -0700
Subject: [PATCH 0825/1285] Show more info on report page about user and
 instance

---
 bookwyrm/templates/moderation/report.html | 56 ++++++++++++++++++++++-
 1 file changed, 55 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/moderation/report.html b/bookwyrm/templates/moderation/report.html
index a231c41c..1cadd28d 100644
--- a/bookwyrm/templates/moderation/report.html
+++ b/bookwyrm/templates/moderation/report.html
@@ -1,5 +1,6 @@
 {% extends 'settings/admin_layout.html' %}
 {% load i18n %}
+{% load bookwyrm_tags %}
 {% load humanize %}
 
 {% block title %}{% blocktrans with report_id=report.id username=report.user.username %}Report #{{ report_id }}: {{ username }}{% endblocktrans %}{% endblock %}
@@ -14,9 +15,62 @@
     {% include 'moderation/report_preview.html' with report=report %}
 </div>
 
+<div class="block columns">
+    <div class="column is-flex is-flex-direction-column">
+        <h4 class="title is-4">{% trans "User details" %}</h4>
+        <div class="box is-flex-grow-1">
+            {% include 'user/user_preview.html' with user=report.user %}
+            {% if report.user.summary %}
+            <div class="box content has-background-white-ter is-shadowless">
+                {{ report.user.summary | to_markdown | safe }}
+            </div>
+            {% endif %}
+
+            <p class="mt-2"><a href="{{ report.user.local_path }}">{% trans "View user profile" %}</a></p>
+        </div>
+    </div>
+    {% if not report.user.local %}
+    {% with server=report.user.federated_server %}
+    <div class="column is-half is-flex is-flex-direction-column">
+        <h4 class="title is-4">{% trans "Instance details" %}</h4>
+        <div class="box content is-flex-grow-1">
+            {% if server %}
+            <h5>{{ server.server_name }}</h5>
+            <dl>
+                <div class="is-flex">
+                    <dt>{% trans "Software:" %}</dt>
+                    <dd>{{ server.application_type }}</dd>
+                </div>
+                <div class="is-flex">
+                    <dt>{% trans "Version:" %}</dt>
+                    <dd>{{ server.application_version }}</dd>
+                </div>
+                <div class="is-flex">
+                    <dt>{% trans "Status:" %}</dt>
+                    <dd>{{ server.status }}</dd>
+                </div>
+            </dl>
+            {% if server.notes %}
+            <h5>{% trans "Notes" %}</h5>
+            <div class="box content has-background-white-ter is-shadowless">
+                {{ server.notes }}
+            </div>
+            {% endif %}
+
+            <p>
+                <a href="{% url 'settings-federated-server' server.id %}">{% trans "View instance" %}</a>
+            </p>
+            {% else %}
+            <em>{% trans "Not set" %}</em>
+            {% endif %}
+        </div>
+    </div>
+    {% endwith %}
+    {% endif %}
+</div>
+
 <div class="block content">
     <h3>{% trans "Actions" %}</h3>
-    <p><a href="{{ report.user.local_path }}">{% trans "View user profile" %}</a></p>
     <div class="is-flex">
         <p class="mr-1">
             <a class="button" href="{% url 'direct-messages-user' report.user.username %}">{% trans "Send direct message" %}</a>

From e0c16b21e950fee1812b436daf640fed9595b7b5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 17 Apr 2021 10:28:03 -0700
Subject: [PATCH 0826/1285] Fixes form for reporting users

---
 bookwyrm/templates/moderation/report_modal.html | 2 ++
 bookwyrm/templates/snippets/user_options.html   | 2 +-
 bookwyrm/views/reports.py                       | 3 +--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/moderation/report_modal.html b/bookwyrm/templates/moderation/report_modal.html
index ce8408ee..0d6504ab 100644
--- a/bookwyrm/templates/moderation/report_modal.html
+++ b/bookwyrm/templates/moderation/report_modal.html
@@ -15,7 +15,9 @@
 {% csrf_token %}
 <input type="hidden" name="reporter" value="{{ reporter.id }}">
 <input type="hidden" name="user" value="{{ user.id }}">
+{% if status %}
 <input type="hidden" name="statuses" value="{{ status.id }}">
+{% endif %}
 
 <section class="content">
     <p>{% blocktrans with site_name=site.name %}This report will be sent to {{ site_name }}'s moderators for review.{% endblocktrans %}</p>
diff --git a/bookwyrm/templates/snippets/user_options.html b/bookwyrm/templates/snippets/user_options.html
index 585417c7..ec772e54 100644
--- a/bookwyrm/templates/snippets/user_options.html
+++ b/bookwyrm/templates/snippets/user_options.html
@@ -13,7 +13,7 @@
     <a href="/direct-messages/{{ user|username }}" class="button is-fullwidth is-small">{% trans "Send direct message" %}</a>
 </li>
 <li role="menuitem">
-    {% include 'snippets/report_button.html' with user=status.user class="is-fullwidth" %}
+    {% include 'snippets/report_button.html' with user=user class="is-fullwidth" %}
 </li>
 <li role="menuitem">
     {% include 'snippets/block_button.html' with user=user class="is-fullwidth" %}
diff --git a/bookwyrm/views/reports.py b/bookwyrm/views/reports.py
index cb1a62ff..f2566494 100644
--- a/bookwyrm/views/reports.py
+++ b/bookwyrm/views/reports.py
@@ -98,8 +98,7 @@ def make_report(request):
     """ a user reports something """
     form = forms.ReportForm(request.POST)
     if not form.is_valid():
-        print(form.errors)
-        return redirect(request.headers.get("Referer", "/"))
+        raise ValueError(form.errors)
 
     form.save()
     return redirect(request.headers.get("Referer", "/"))

From 10cf189312acca32ba3cb84aa4bc83065e111868 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 17 Apr 2021 10:56:26 -0700
Subject: [PATCH 0827/1285] Filter reports and users by server name and
 username

---
 bookwyrm/templates/moderation/reports.html         |  3 +++
 bookwyrm/templates/settings/federated_server.html  |  4 ++--
 bookwyrm/templates/settings/server_filter.html     |  7 +++++++
 bookwyrm/templates/settings/user_admin.html        |  2 ++
 .../templates/settings/user_admin_filters.html     |  6 ++++++
 bookwyrm/templates/settings/username_filter.html   |  8 ++++++++
 bookwyrm/views/federation.py                       |  2 +-
 bookwyrm/views/reports.py                          |  6 ++++--
 bookwyrm/views/user_admin.py                       | 14 ++++++++++----
 9 files changed, 43 insertions(+), 9 deletions(-)
 create mode 100644 bookwyrm/templates/settings/server_filter.html
 create mode 100644 bookwyrm/templates/settings/user_admin_filters.html
 create mode 100644 bookwyrm/templates/settings/username_filter.html

diff --git a/bookwyrm/templates/moderation/reports.html b/bookwyrm/templates/moderation/reports.html
index f486711f..72cadae5 100644
--- a/bookwyrm/templates/moderation/reports.html
+++ b/bookwyrm/templates/moderation/reports.html
@@ -8,6 +8,7 @@
 {% trans "Reports" %}
 {% endif %}
 {% endblock %}
+
 {% block header %}
 {% if server %}
 {% blocktrans with server_name=server.server_name %}Reports: <small>{{ server_name }}</small>{% endblocktrans %}
@@ -29,6 +30,8 @@
     </ul>
 </div>
 
+{% include 'settings/user_admin_filters.html' %}
+
 <div class="block">
     {% if not reports %}
     <em>{% trans "No reports found." %}</em>
diff --git a/bookwyrm/templates/settings/federated_server.html b/bookwyrm/templates/settings/federated_server.html
index 14b78af0..386433f3 100644
--- a/bookwyrm/templates/settings/federated_server.html
+++ b/bookwyrm/templates/settings/federated_server.html
@@ -39,14 +39,14 @@
                 <dt>{% trans "Users:" %}</dt>
                 <dd>
                     {{ users.count }}
-                    {% if server.user_set.count %}(<a href="{% url 'settings-users' %}?server={{ server.id }}">{% trans "View all" %}</a>){% endif %}
+                    {% if server.user_set.count %}(<a href="{% url 'settings-users' %}?server={{ server.server_name }}">{% trans "View all" %}</a>){% endif %}
                 </dd>
             </div>
             <div class="is-flex">
                 <dt>{% trans "Reports:" %}</dt>
                 <dd>
                     {{ reports.count }}
-                    {% if reports.count %}(<a href="{% url 'settings-reports' %}?server={{ server.id }}">{% trans "View all" %}</a>){% endif %}
+                    {% if reports.count %}(<a href="{% url 'settings-reports' %}?server={{ server.server_name }}">{% trans "View all" %}</a>){% endif %}
                 </dd>
             </div>
             <div class="is-flex">
diff --git a/bookwyrm/templates/settings/server_filter.html b/bookwyrm/templates/settings/server_filter.html
new file mode 100644
index 00000000..fd8760cc
--- /dev/null
+++ b/bookwyrm/templates/settings/server_filter.html
@@ -0,0 +1,7 @@
+{% extends 'snippets/filters_panel/filter_field.html' %}
+{% load i18n %}
+
+{% block filter %}
+<label class="label" for="id_server">{% trans "Server name" %}</label>
+<input type="text" class="input" name="server" value="{{ request.GET.server|default:'' }}" id="id_server" placeholder="example.server.com">
+{% endblock %}
diff --git a/bookwyrm/templates/settings/user_admin.html b/bookwyrm/templates/settings/user_admin.html
index bb0534e0..a96d37f5 100644
--- a/bookwyrm/templates/settings/user_admin.html
+++ b/bookwyrm/templates/settings/user_admin.html
@@ -13,6 +13,8 @@
 
 {% block panel %}
 
+{% include 'settings/user_admin_filters.html' %}
+
 <table class="table is-striped">
     <tr>
         {% url 'settings-users' as url %}
diff --git a/bookwyrm/templates/settings/user_admin_filters.html b/bookwyrm/templates/settings/user_admin_filters.html
new file mode 100644
index 00000000..a7b5c8aa
--- /dev/null
+++ b/bookwyrm/templates/settings/user_admin_filters.html
@@ -0,0 +1,6 @@
+{% extends 'snippets/filters_panel/filters_panel.html' %}
+
+{% block filter_fields %}
+{% include 'settings/server_filter.html' %}
+{% include 'settings/username_filter.html' %}
+{% endblock %}
diff --git a/bookwyrm/templates/settings/username_filter.html b/bookwyrm/templates/settings/username_filter.html
new file mode 100644
index 00000000..d7da033a
--- /dev/null
+++ b/bookwyrm/templates/settings/username_filter.html
@@ -0,0 +1,8 @@
+{% extends 'snippets/filters_panel/filter_field.html' %}
+{% load i18n %}
+
+{% block filter %}
+<label class="label" for="id_username">{% trans "Username" %}</label>
+<input type="text" class="input" name="username" value="{{ request.GET.username|default:'' }}" id="id_username" placeholder="user@domain.com">
+{% endblock %}
+
diff --git a/bookwyrm/views/federation.py b/bookwyrm/views/federation.py
index 3803e92e..8712c463 100644
--- a/bookwyrm/views/federation.py
+++ b/bookwyrm/views/federation.py
@@ -29,7 +29,7 @@ class Federation(View):
         except ValueError:
             page = 1
 
-        servers = models.FederatedServer.objects.all()
+        servers = models.FederatedServer.objects
 
         sort = request.GET.get("sort")
         sort_fields = ["created_date", "application_type", "server_name"]
diff --git a/bookwyrm/views/reports.py b/bookwyrm/views/reports.py
index cb1a62ff..b6c87c50 100644
--- a/bookwyrm/views/reports.py
+++ b/bookwyrm/views/reports.py
@@ -29,8 +29,10 @@ class Reports(View):
         resolved = request.GET.get("resolved") == "true"
         server = request.GET.get("server")
         if server:
-            server = get_object_or_404(models.FederatedServer, id=server)
-            filters["user__federated_server"] = server
+            filters["user__federated_server__server_name"] = server
+        username = request.GET.get("username")
+        if username:
+            filters["user__username__icontains"] = username
         filters["resolved"] = resolved
         data = {
             "resolved": resolved,
diff --git a/bookwyrm/views/user_admin.py b/bookwyrm/views/user_admin.py
index 1eb6089f..dd430f35 100644
--- a/bookwyrm/views/user_admin.py
+++ b/bookwyrm/views/user_admin.py
@@ -1,7 +1,6 @@
 """ manage user """
 from django.contrib.auth.decorators import login_required, permission_required
 from django.core.paginator import Paginator
-from django.shortcuts import get_object_or_404
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
@@ -29,10 +28,14 @@ class UserAdmin(View):
         filters = {}
         server = request.GET.get("server")
         if server:
-            server = get_object_or_404(models.FederatedServer, id=server)
+            server = models.FederatedServer.objects.filter(server_name=server).first()
             filters["federated_server"] = server
+            filters["federated_server__isnull"] = False
+        username = request.GET.get("username")
+        if username:
+            filters["username__icontains"] = username
 
-        users = models.User.objects.filter(**filters).all()
+        users = models.User.objects.filter(**filters)
 
         sort = request.GET.get("sort", "-created_date")
         sort_fields = [
@@ -46,5 +49,8 @@ class UserAdmin(View):
             users = users.order_by(sort)
 
         paginated = Paginator(users, PAGE_LENGTH)
-        data = {"users": paginated.get_page(page), "sort": sort, "server": server}
+        data = {
+            "users": paginated.get_page(page),
+            "sort": sort, "server": server,
+        }
         return TemplateResponse(request, "settings/user_admin.html", data)

From 6433aa23b26f4f4197ab071e2b94c7f20afd8986 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 17 Apr 2021 11:09:48 -0700
Subject: [PATCH 0828/1285] Python formatting

---
 bookwyrm/views/user_admin.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/views/user_admin.py b/bookwyrm/views/user_admin.py
index dd430f35..cc3ff841 100644
--- a/bookwyrm/views/user_admin.py
+++ b/bookwyrm/views/user_admin.py
@@ -51,6 +51,7 @@ class UserAdmin(View):
         paginated = Paginator(users, PAGE_LENGTH)
         data = {
             "users": paginated.get_page(page),
-            "sort": sort, "server": server,
+            "sort": sort,
+            "server": server,
         }
         return TemplateResponse(request, "settings/user_admin.html", data)

From 7c85b554cf7c24ed4468bc7b59f34ef3fa47abaa Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 17 Apr 2021 11:47:48 -0700
Subject: [PATCH 0829/1285] Handle both Image and Document types

---
 bookwyrm/activitypub/__init__.py | 2 +-
 bookwyrm/activitypub/image.py    | 7 ++++++-
 bookwyrm/activitypub/person.py   | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/activitypub/__init__.py b/bookwyrm/activitypub/__init__.py
index 71658455..d363fbd5 100644
--- a/bookwyrm/activitypub/__init__.py
+++ b/bookwyrm/activitypub/__init__.py
@@ -5,7 +5,7 @@ import sys
 from .base_activity import ActivityEncoder, Signature, naive_parse
 from .base_activity import Link, Mention
 from .base_activity import ActivitySerializerError, resolve_remote_id
-from .image import Document
+from .image import Document, Image
 from .note import Note, GeneratedNote, Article, Comment, Quotation
 from .note import Review, Rating
 from .note import Tombstone
diff --git a/bookwyrm/activitypub/image.py b/bookwyrm/activitypub/image.py
index 42598422..863388a7 100644
--- a/bookwyrm/activitypub/image.py
+++ b/bookwyrm/activitypub/image.py
@@ -5,9 +5,14 @@ from .base_activity import ActivityObject
 
 @dataclass(init=False)
 class Document(ActivityObject):
-    """ image block """
+    """ a document """
 
     url: str
     name: str = ""
     type: str = "Document"
     id: str = None
+
+@dataclass(init=False)
+class Image(Document):
+    """ an image """
+    type: str = "Image"
diff --git a/bookwyrm/activitypub/person.py b/bookwyrm/activitypub/person.py
index 550fc7bd..9231bd95 100644
--- a/bookwyrm/activitypub/person.py
+++ b/bookwyrm/activitypub/person.py
@@ -3,7 +3,7 @@ from dataclasses import dataclass, field
 from typing import Dict
 
 from .base_activity import ActivityObject
-from .image import Document
+from .image import Image
 
 
 @dataclass(init=False)
@@ -28,7 +28,7 @@ class Person(ActivityObject):
     endpoints: Dict = None
     name: str = None
     summary: str = None
-    icon: Document = field(default_factory=lambda: {})
+    icon: Image = field(default_factory=lambda: {})
     bookwyrmUser: bool = False
     manuallyApprovesFollowers: str = False
     discoverable: str = False

From 21fcd5c854ad5b9cb37a6cee14e14b34894b80f0 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sat, 17 Apr 2021 20:49:27 +0200
Subject: [PATCH 0830/1285] [editorconfig] Regroup computer generated rules.

---
 .editorconfig | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index bad9b712..d102bc5a 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -20,7 +20,7 @@ block_comment_end = */
 [{bw-dev,fr-dev,LICENSE}]
 max_line_length = off
 
-[*.{csv,json,html,md,mo,po,py,svg,tsv}]
+[*.{csv,json,html,md,po,py,svg,tsv}]
 max_line_length = off
 
 # `  ` at the end of a line is a line-break in markdown
@@ -32,10 +32,8 @@ indent_size = 2
 max_line_length = off
 
 # Computer generated files
-[{package.json,*.lock}]
+[{package.json,*.lock,*.mo}]
 indent_size = unset
 indent_style = unset
 max_line_length = unset
-
-[*.mo]
 insert_final_newline = unset

From 020e6f74ef3f96976fa75189f38214bc62108e1e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 17 Apr 2021 11:57:06 -0700
Subject: [PATCH 0831/1285] Python formatting

---
 bookwyrm/activitypub/image.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bookwyrm/activitypub/image.py b/bookwyrm/activitypub/image.py
index 863388a7..a7120ce4 100644
--- a/bookwyrm/activitypub/image.py
+++ b/bookwyrm/activitypub/image.py
@@ -12,7 +12,9 @@ class Document(ActivityObject):
     type: str = "Document"
     id: str = None
 
+
 @dataclass(init=False)
 class Image(Document):
     """ an image """
+
     type: str = "Image"

From 5df2ac676b50c2304d0d8765e2c379471d7731f5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 17 Apr 2021 12:39:16 -0700
Subject: [PATCH 0832/1285] Fixes error on deletion requests for unknown users

---
 bookwyrm/activitypub/verbs.py                 | 21 ++++++----
 .../tests/views/inbox/test_inbox_delete.py    | 40 ++++++++++++++++++-
 2 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index 442e3858..c2cbfea3 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -16,11 +16,10 @@ class Verb(ActivityObject):
 
     def action(self):
         """ usually we just want to update and save """
-        obj = self.object
-        # it may return None if the object is invalid in an expected way
+        # self.object may return None if the object is invalid in an expected way
         # ie, Question type
-        if obj:
-            obj.to_model()
+        if self.object:
+            self.object.to_model()
 
 
 @dataclass(init=False)
@@ -43,7 +42,16 @@ class Delete(Verb):
 
     def action(self):
         """ find and delete the activity object """
-        obj = self.object.to_model(save=False, allow_create=False)
+        if not self.object:
+            return
+
+        if isinstance(self.object, str):
+            # Deleted users are passed as strings. Not wild about this fix
+            model = apps.get_model("bookwyrm.User")
+            obj = model.find_existing_by_remote_id(self.object)
+        else:
+            obj = self.object.to_model(save=False, allow_create=False)
+
         if obj:
             obj.delete()
         # if we can't find it, we don't need to delete it because we don't have it
@@ -58,8 +66,7 @@ class Update(Verb):
 
     def action(self):
         """ update a model instance from the dataclass """
-        obj = self.object
-        if obj:
+        if self.object:
             self.object.to_model(allow_create=False)
 
 
diff --git a/bookwyrm/tests/views/inbox/test_inbox_delete.py b/bookwyrm/tests/views/inbox/test_inbox_delete.py
index 65a75426..51c59015 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_delete.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_delete.py
@@ -49,7 +49,7 @@ class InboxActivities(TestCase):
         }
         models.SiteSettings.objects.create()
 
-    def test_handle_delete_status(self):
+    def test_delete_status(self):
         """ remove a status """
         self.assertFalse(self.status.deleted)
         activity = {
@@ -70,7 +70,7 @@ class InboxActivities(TestCase):
         self.assertTrue(status.deleted)
         self.assertIsInstance(status.deleted_date, datetime)
 
-    def test_handle_delete_status_notifications(self):
+    def test_delete_status_notifications(self):
         """ remove a status with related notifications """
         models.Notification.objects.create(
             related_status=self.status,
@@ -104,3 +104,39 @@ class InboxActivities(TestCase):
         # notifications should be truly deleted
         self.assertEqual(models.Notification.objects.count(), 1)
         self.assertEqual(models.Notification.objects.get(), notif)
+
+    def test_delete_user(self):
+        """ delete a user """
+        self.assertTrue(
+            models.User.objects.get(username="rat@example.com").is_active
+        )
+        activity = {
+            '@context': 'https://www.w3.org/ns/activitystreams',
+            'id': 'https://example.com/users/test-user#delete',
+            'type': 'Delete',
+            'actor': 'https://example.com/users/test-user',
+            'to': ['https://www.w3.org/ns/activitystreams#Public'],
+            'object': 'https://example.com/users/test-user',
+        }
+
+        views.inbox.activity_task(activity)
+        self.assertFalse(
+            models.User.objects.get(username="rat@example.com").is_active
+        )
+
+
+    def test_delete_user_unknown(self):
+        """ don't worry about it if we don't know the user """
+        self.assertEqual(models.User.objects.filter(is_active=True).count(), 2)
+        activity = {
+            '@context': 'https://www.w3.org/ns/activitystreams',
+            'id': 'https://example.com/users/test-user#delete',
+            'type': 'Delete',
+            'actor': 'https://example.com/users/test-user',
+            'to': ['https://www.w3.org/ns/activitystreams#Public'],
+            'object': 'https://example.com/users/test-user',
+        }
+
+        # nothing happens.
+        views.inbox.activity_task(activity)
+        self.assertEqual(models.User.objects.filter(is_active=True).count(), 2)

From 5b7f2007e8f30c080d25f378cd0062fe04e67114 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 17 Apr 2021 12:51:36 -0700
Subject: [PATCH 0833/1285] Broadcast user deletions

---
 bookwyrm/models/activitypub_mixin.py            | 2 +-
 bookwyrm/models/user.py                         | 6 ++++++
 bookwyrm/tests/views/inbox/test_inbox_delete.py | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index c6ba249c..efdf9a47 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -241,7 +241,7 @@ class ObjectMixin(ActivitypubMixin):
             return
 
         # is this a deletion?
-        if hasattr(self, "deleted") and self.deleted:
+        if (hasattr(self, "deleted") and self.deleted) or hasattr(self, "is_active") and not self.is_active:
             activity = self.to_delete_activity(user)
         else:
             activity = self.to_update_activity(user)
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 15ceb19b..d0a8a34f 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -283,6 +283,12 @@ class User(OrderedCollectionPageMixin, AbstractUser):
                 editable=False,
             ).save(broadcast=False)
 
+    def delete(self, *args, **kwargs):
+        """ deactivate rather than delete a user """
+        self.is_active = False
+        # skip the logic in this class's save()
+        super().save(*args, **kwargs)
+
     @property
     def local_path(self):
         """ this model doesn't inherit bookwyrm model, so here we are """
diff --git a/bookwyrm/tests/views/inbox/test_inbox_delete.py b/bookwyrm/tests/views/inbox/test_inbox_delete.py
index 51c59015..88ef288e 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_delete.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_delete.py
@@ -116,7 +116,7 @@ class InboxActivities(TestCase):
             'type': 'Delete',
             'actor': 'https://example.com/users/test-user',
             'to': ['https://www.w3.org/ns/activitystreams#Public'],
-            'object': 'https://example.com/users/test-user',
+            'object': self.remote_user.remote_id,
         }
 
         views.inbox.activity_task(activity)

From ebdbdc8790ff12417548ec5dea09b92f46610ad8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 17 Apr 2021 13:19:23 -0700
Subject: [PATCH 0834/1285] Broadcast deletions

---
 bookwyrm/models/activitypub_mixin.py          |  6 +++-
 bookwyrm/models/user.py                       |  6 ++++
 bookwyrm/tests/models/test_user_model.py      | 15 +++++++++
 .../tests/views/inbox/test_inbox_delete.py    | 33 ++++++++-----------
 4 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index efdf9a47..26ad7115 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -241,7 +241,11 @@ class ObjectMixin(ActivitypubMixin):
             return
 
         # is this a deletion?
-        if (hasattr(self, "deleted") and self.deleted) or hasattr(self, "is_active") and not self.is_active:
+        if (
+            (hasattr(self, "deleted") and self.deleted)
+            or hasattr(self, "is_active")
+            and not self.is_active
+        ):
             activity = self.to_delete_activity(user)
         else:
             activity = self.to_update_activity(user)
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index d0a8a34f..b26b3b00 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -289,6 +289,12 @@ class User(OrderedCollectionPageMixin, AbstractUser):
         # skip the logic in this class's save()
         super().save(*args, **kwargs)
 
+    def to_activity(self, *args, **kwargs):
+        """ return a remote_id only if the user is inactive """
+        if not self.is_active:
+            return self.remote_id
+        return super().to_activity_dataclass(*args, **kwargs)
+
     @property
     def local_path(self):
         """ this model doesn't inherit bookwyrm model, so here we are """
diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py
index bd5255ce..883ef669 100644
--- a/bookwyrm/tests/models/test_user_model.py
+++ b/bookwyrm/tests/models/test_user_model.py
@@ -1,4 +1,5 @@
 """ testing models """
+import json
 from unittest.mock import patch
 from django.test import TestCase
 import responses
@@ -152,3 +153,17 @@ class User(TestCase):
         self.assertEqual(server.server_name, DOMAIN)
         self.assertIsNone(server.application_type)
         self.assertIsNone(server.application_version)
+
+    def test_delete_user(self):
+        """ deactivate a user """
+        self.assertTrue(self.user.is_active)
+        with patch(
+            "bookwyrm.models.activitypub_mixin.broadcast_task.delay"
+        ) as broadcast_mock:
+            self.user.delete()
+
+        self.assertEqual(broadcast_mock.call_count, 1)
+        activity = json.loads(broadcast_mock.call_args[0][1])
+        self.assertEqual(activity["type"], "Delete")
+        self.assertEqual(activity["object"], self.user.remote_id)
+        self.assertFalse(self.user.is_active)
diff --git a/bookwyrm/tests/views/inbox/test_inbox_delete.py b/bookwyrm/tests/views/inbox/test_inbox_delete.py
index 88ef288e..03598b88 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_delete.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_delete.py
@@ -107,34 +107,29 @@ class InboxActivities(TestCase):
 
     def test_delete_user(self):
         """ delete a user """
-        self.assertTrue(
-            models.User.objects.get(username="rat@example.com").is_active
-        )
+        self.assertTrue(models.User.objects.get(username="rat@example.com").is_active)
         activity = {
-            '@context': 'https://www.w3.org/ns/activitystreams',
-            'id': 'https://example.com/users/test-user#delete',
-            'type': 'Delete',
-            'actor': 'https://example.com/users/test-user',
-            'to': ['https://www.w3.org/ns/activitystreams#Public'],
-            'object': self.remote_user.remote_id,
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "id": "https://example.com/users/test-user#delete",
+            "type": "Delete",
+            "actor": "https://example.com/users/test-user",
+            "to": ["https://www.w3.org/ns/activitystreams#Public"],
+            "object": self.remote_user.remote_id,
         }
 
         views.inbox.activity_task(activity)
-        self.assertFalse(
-            models.User.objects.get(username="rat@example.com").is_active
-        )
-
+        self.assertFalse(models.User.objects.get(username="rat@example.com").is_active)
 
     def test_delete_user_unknown(self):
         """ don't worry about it if we don't know the user """
         self.assertEqual(models.User.objects.filter(is_active=True).count(), 2)
         activity = {
-            '@context': 'https://www.w3.org/ns/activitystreams',
-            'id': 'https://example.com/users/test-user#delete',
-            'type': 'Delete',
-            'actor': 'https://example.com/users/test-user',
-            'to': ['https://www.w3.org/ns/activitystreams#Public'],
-            'object': 'https://example.com/users/test-user',
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "id": "https://example.com/users/test-user#delete",
+            "type": "Delete",
+            "actor": "https://example.com/users/test-user",
+            "to": ["https://www.w3.org/ns/activitystreams#Public"],
+            "object": "https://example.com/users/test-user",
         }
 
         # nothing happens.

From 44528eaa09057d1d53e1177e03b563b2cb135799 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 17 Apr 2021 13:31:37 -0700
Subject: [PATCH 0835/1285] Don't double-override to_activity

---
 bookwyrm/models/user.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index b26b3b00..9585a4c4 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -205,6 +205,9 @@ class User(OrderedCollectionPageMixin, AbstractUser):
     def to_activity(self, **kwargs):
         """override default AP serializer to add context object
         idk if this is the best way to go about this"""
+        if not self.is_active:
+            return self.remote_id
+
         activity_object = super().to_activity(**kwargs)
         activity_object["@context"] = [
             "https://www.w3.org/ns/activitystreams",
@@ -289,12 +292,6 @@ class User(OrderedCollectionPageMixin, AbstractUser):
         # skip the logic in this class's save()
         super().save(*args, **kwargs)
 
-    def to_activity(self, *args, **kwargs):
-        """ return a remote_id only if the user is inactive """
-        if not self.is_active:
-            return self.remote_id
-        return super().to_activity_dataclass(*args, **kwargs)
-
     @property
     def local_path(self):
         """ this model doesn't inherit bookwyrm model, so here we are """

From 8421a2e83258b20642c3e3dab6dec5253bb71366 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 17 Apr 2021 15:14:23 -0700
Subject: [PATCH 0836/1285] Clarifies logic in if statement

---
 bookwyrm/models/activitypub_mixin.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index 26ad7115..ce6245b2 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -241,10 +241,8 @@ class ObjectMixin(ActivitypubMixin):
             return
 
         # is this a deletion?
-        if (
-            (hasattr(self, "deleted") and self.deleted)
-            or hasattr(self, "is_active")
-            and not self.is_active
+        if (hasattr(self, "deleted") and self.deleted) or (
+            hasattr(self, "is_active") and not self.is_active
         ):
             activity = self.to_delete_activity(user)
         else:

From 02e6602a0bba359f0160133c24c37a19c657a916 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 17 Apr 2021 17:55:22 -0700
Subject: [PATCH 0837/1285] Reject statuses from deactivated remote users

---
 bookwyrm/models/activitypub_mixin.py          |  6 ++--
 bookwyrm/models/user.py                       |  5 ++++
 bookwyrm/tests/views/inbox/test_inbox.py      | 29 +++++++++++++++++++
 .../tests/views/inbox/test_inbox_create.py    |  2 +-
 bookwyrm/views/inbox.py                       |  6 ++++
 5 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index ce6245b2..f687e96c 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -193,7 +193,7 @@ class ObjectMixin(ActivitypubMixin):
     def save(self, *args, created=None, **kwargs):
         """ broadcast created/updated/deleted objects as appropriate """
         broadcast = kwargs.get("broadcast", True)
-        # this bonus kwarg woul cause an error in the base save method
+        # this bonus kwarg would cause an error in the base save method
         if "broadcast" in kwargs:
             del kwargs["broadcast"]
 
@@ -241,9 +241,7 @@ class ObjectMixin(ActivitypubMixin):
             return
 
         # is this a deletion?
-        if (hasattr(self, "deleted") and self.deleted) or (
-            hasattr(self, "is_active") and not self.is_active
-        ):
+        if hasattr(self, "deleted") and self.deleted:
             activity = self.to_delete_activity(user)
         else:
             activity = self.to_update_activity(user)
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 9585a4c4..0f98c82d 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -145,6 +145,11 @@ class User(OrderedCollectionPageMixin, AbstractUser):
             return self.name
         return self.localname or self.username
 
+    @property
+    def deleted(self):
+        """ for consistent naming """
+        return not self.is_active
+
     activity_serializer = activitypub.Person
 
     @classmethod
diff --git a/bookwyrm/tests/views/inbox/test_inbox.py b/bookwyrm/tests/views/inbox/test_inbox.py
index 50fb1ecc..c39a3fd2 100644
--- a/bookwyrm/tests/views/inbox/test_inbox.py
+++ b/bookwyrm/tests/views/inbox/test_inbox.py
@@ -1,5 +1,6 @@
 """ tests incoming activities"""
 import json
+import pathlib
 from unittest.mock import patch
 
 from django.http import HttpResponseNotAllowed, HttpResponseNotFound
@@ -26,6 +27,16 @@ class Inbox(TestCase):
         )
         local_user.remote_id = "https://example.com/user/mouse"
         local_user.save(broadcast=False)
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            self.remote_user = models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
         self.create_json = {
             "id": "hi",
             "type": "Create",
@@ -131,3 +142,21 @@ class Inbox(TestCase):
             server_name="mastodon.social", status="blocked"
         )
         self.assertTrue(views.inbox.is_blocked_activity(activity))
+
+    def test_create_by_deactivated_user(self):
+        """ don't let deactivated users post """
+        self.remote_user.delete(broadcast=False)
+        self.assertTrue(self.remote_user.deleted)
+        datafile = pathlib.Path(__file__).parent.joinpath("../../data/ap_note.json")
+        status_data = json.loads(datafile.read_bytes())
+        activity = self.create_json
+        activity["actor"] = self.remote_user.remote_id
+        activity["object"] = status_data
+
+        with patch("bookwyrm.views.inbox.has_valid_signature") as mock_valid:
+            mock_valid.return_value = True
+
+            result = self.client.post(
+                "/inbox", json.dumps(activity), content_type="application/json"
+            )
+        self.assertEqual(result.status_code, 403)
diff --git a/bookwyrm/tests/views/inbox/test_inbox_create.py b/bookwyrm/tests/views/inbox/test_inbox_create.py
index 16c674e0..3d2ce1c0 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_create.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_create.py
@@ -32,7 +32,7 @@ class InboxCreate(TestCase):
                     remote_id="https://example.com/status/1",
                 )
         with patch("bookwyrm.models.user.set_remote_server.delay"):
-            models.User.objects.create_user(
+            self.remote_user = models.User.objects.create_user(
                 "rat",
                 "rat@rat.com",
                 "ratword",
diff --git a/bookwyrm/views/inbox.py b/bookwyrm/views/inbox.py
index a8eb4851..c701956d 100644
--- a/bookwyrm/views/inbox.py
+++ b/bookwyrm/views/inbox.py
@@ -80,6 +80,12 @@ def is_blocked_user_agent(request):
 def is_blocked_activity(activity_json):
     """ get the sender out of activity json and check if it's blocked """
     actor = activity_json.get("actor")
+
+    # check if the user is banned/deleted
+    existing = models.User.find_existing_by_remote_id(actor)
+    if existing and existing.deleted:
+        return True
+
     if not actor:
         # well I guess it's not even a valid activity so who knows
         return False

From 2914eea281395c51319b73b38902dbb15b1e12fe Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 17 Apr 2021 18:23:33 -0700
Subject: [PATCH 0838/1285] Catch user not found errors in feed

---
 bookwyrm/views/feed.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index 1286d797..cd279282 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -105,7 +105,7 @@ class Status(View):
             status = models.Status.objects.select_subclasses().get(
                 id=status_id, deleted=False
             )
-        except (ValueError, models.Status.DoesNotExist):
+        except (ValueError, models.Status.DoesNotExist, models.User.DoesNotExist):
             return HttpResponseNotFound()
 
         # the url should have the poster's username in it

From 903118417667a21fe687d56da2f4e2f5d0b5f1be Mon Sep 17 00:00:00 2001
From: Pablo Barton <pablo.barton@gmail.com>
Date: Sat, 17 Apr 2021 21:31:38 -0400
Subject: [PATCH 0839/1285] addressing some review

---
 bookwyrm/templates/lists/list.html            |  2 +-
 .../snippets/booklist-pagination.html         | 64 +++++++++----------
 bookwyrm/tests/views/test_list.py             | 19 +++---
 bookwyrm/views/list.py                        | 42 +++++++-----
 4 files changed, 69 insertions(+), 58 deletions(-)

diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index 3d338097..c9464c85 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -13,7 +13,6 @@
 
 <div class="columns mt-3">
     <section class="column is-three-quarters">
-        {% include "snippets/booklist-pagination.html" with page=items %}
         {% if not items.object_list.exists %}
         <p>{% trans "This list is currently empty" %}</p>
         {% else %}
@@ -58,6 +57,7 @@
         {% endfor %}
         </ol>
         {% endif %}
+        {% include "snippets/booklist-pagination.html" with page=items %}
     </section>
 
     <section class="column is-one-quarter content">
diff --git a/bookwyrm/templates/snippets/booklist-pagination.html b/bookwyrm/templates/snippets/booklist-pagination.html
index 69fae52e..161c743c 100644
--- a/bookwyrm/templates/snippets/booklist-pagination.html
+++ b/bookwyrm/templates/snippets/booklist-pagination.html
@@ -1,6 +1,37 @@
 {% load i18n %}
 {% if page.has_other_pages %}
-<nav class="pagination is-small" aria-label="pagination">
+<nav class="pagination is-centered" aria-label="pagination">
+    <ul class="pagination-list">
+        {% if page.number == 2 %}
+            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number }}{{ anchor }}">{{ page.previous_page_number }}</a></li>
+        {% elif page.number == 3 %}
+            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number|add:-1 }}{{ anchor }}">{{ page.previous_page_number|add:-1 }}</a></li>
+            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number }}{{ anchor }}">{{ page.previous_page_number }}</a></li>
+        {% elif page.number == 4 %}
+            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number|add:-2 }}{{ anchor }}">{{ page.previous_page_number|add:-2 }}</a></li>
+            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number|add:-1 }}{{ anchor }}">{{ page.previous_page_number|add:-1 }}</a></li>
+            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number }}{{ anchor }}">{{ page.previous_page_number }}</a></li>
+        {% elif page.number > 4 %}
+            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page=1{{ anchor }}">1</a></li>
+            <span class="pagination-ellipsis">&hellip;</span>
+            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number }}{{ anchor }}">{{ page.previous_page_number }}</a></li>
+        {% endif %}
+    <li><a class="pagination-link is-link" disabled href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.number }}{{ anchor }}">{{ page.number }}</a></li>
+        {% if page.number|add:1 == page.paginator.num_pages %}
+            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number }}{{ anchor }}">{{ page.next_page_number }}</a></li>
+        {% elif page.number|add:2 == page.paginator.num_pages %}
+            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number }}{{ anchor }}">{{ page.next_page_number }}</a></li>
+            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number|add:1 }}{{ anchor }}">{{ page.next_page_number|add:1 }}</a></li>
+        {% elif page.number|add:3 == page.paginator.num_pages %}
+            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number }}{{ anchor }}">{{ page.next_page_number }}</a></li>
+            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number|add:1 }}{{ anchor }}">{{ page.next_page_number|add:1 }}</a></li>
+            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number|add:2 }}{{ anchor }}">{{ page.next_page_number|add:2 }}</a></li>
+        {% elif page.number|add:3 < page.paginator.num_pages %}
+            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number }}{{ anchor }}">{{ page.next_page_number }}</a></li>
+            <span class="pagination-ellipsis">&hellip;</span>
+            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ items.paginator.num_pages }}{{ anchor }}">{{ items.paginator.num_pages }}</a></li>
+        {% endif %}
+    </ul>
     <a
         class="pagination-previous {% if not page.has_previous %}is-disabled{% endif %}"
         {% if page.has_previous %}
@@ -23,36 +54,5 @@
         {% trans "Next" %}
         <span class="icon icon-arrow-right" aria-hidden="true"></span>
     </a>
-    <ul class="pagination-list">
-        {% if page.number == 2 %}
-            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number }}{{ anchor }}">{{ page.previous_page_number }}</a>
-        {% elif page.number == 3 %}
-            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number|add:-1 }}{{ anchor }}">{{ page.previous_page_number|add:-1 }}</a>
-            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number }}{{ anchor }}">{{ page.previous_page_number }}</a>
-        {% elif page.number == 4 %}
-            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number|add:-2 }}{{ anchor }}">{{ page.previous_page_number|add:-2 }}</a>
-            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number|add:-1 }}{{ anchor }}">{{ page.previous_page_number|add:-1 }}</a>
-            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number }}{{ anchor }}">{{ page.previous_page_number }}</a>
-        {% elif page.number > 4 %}
-            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page=1{{ anchor }}">1</a>
-            <span class="pagination-ellipsis">&hellip;</span>
-            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number }}{{ anchor }}">{{ page.previous_page_number }}</a>
-        {% endif %}
-    <a class="pagination-link is-link" disabled href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.number }}{{ anchor }}">{{ page.number }}</a>
-        {% if page.number|add:1 == page.paginator.num_pages %}
-            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number }}{{ anchor }}">{{ page.next_page_number }}</a>
-        {% elif page.number|add:2 == page.paginator.num_pages %}
-            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number }}{{ anchor }}">{{ page.next_page_number }}</a>
-            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number|add:1 }}{{ anchor }}">{{ page.next_page_number|add:1 }}</a>
-        {% elif page.number|add:3 == page.paginator.num_pages %}
-            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number }}{{ anchor }}">{{ page.next_page_number }}</a>
-            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number|add:1 }}{{ anchor }}">{{ page.next_page_number|add:1 }}</a>
-            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number|add:2 }}{{ anchor }}">{{ page.next_page_number|add:2 }}</a>
-        {% elif page.number|add:3 < page.paginator.num_pages %}
-            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number }}{{ anchor }}">{{ page.next_page_number }}</a>
-            <span class="pagination-ellipsis">&hellip;</span>
-            <a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ items.paginator.num_pages }}{{ anchor }}">{{ items.paginator.num_pages }}</a>
-        {% endif %}
-    </ul>
 </nav>
 {% endif %}
diff --git a/bookwyrm/tests/views/test_list.py b/bookwyrm/tests/views/test_list.py
index 0b4339fc..446169ab 100644
--- a/bookwyrm/tests/views/test_list.py
+++ b/bookwyrm/tests/views/test_list.py
@@ -304,8 +304,9 @@ class ListViews(TestCase):
             },
         )
         request_two.user = self.local_user
-        views.list.add_book(request_one)
-        views.list.add_book(request_two)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            views.list.add_book(request_one)
+            views.list.add_book(request_two)
 
         items = self.list.listitem_set.order_by("order").all()
         self.assertEqual(items[0].book, self.book)
@@ -345,9 +346,10 @@ class ListViews(TestCase):
         )
         request_three.user = self.local_user
 
-        views.list.add_book(request_one)
-        views.list.add_book(request_two)
-        views.list.add_book(request_three)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            views.list.add_book(request_one)
+            views.list.add_book(request_two)
+            views.list.add_book(request_three)
 
         items = self.list.listitem_set.order_by("order").all()
         self.assertEqual(items[0].book, self.book)
@@ -398,9 +400,10 @@ class ListViews(TestCase):
         )
         request_three.user = self.local_user
 
-        views.list.add_book(request_one)
-        views.list.add_book(request_two)
-        views.list.add_book(request_three)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            views.list.add_book(request_one)
+            views.list.add_book(request_two)
+            views.list.add_book(request_three)
 
         items = self.list.listitem_set.order_by("order").all()
         self.assertEqual(items[0].book, self.book)
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index c7311bf1..9a32168a 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -114,29 +114,37 @@ class List(View):
 
         page = request.GET.get("page", 1)
 
+        internal_sort_by = {
+            "order": "order",
+            "title": "book__title",
+            "rating": "average_rating",
+        }
+        directional_sort_by = internal_sort_by[sort_by]
+        if direction == "descending":
+            directional_sort_by = "-" + directional_sort_by
+
         if sort_by == "order":
-            directional_sort_by = "order"
-            if direction == "descending":
-                directional_sort_by = "-" + directional_sort_by
-            items = book_list.listitem_set.filter(approved=True).order_by(
-                directional_sort_by
+            items = (
+                book_list.listitem_set
+                .filter(approved=True)
+                .order_by(directional_sort_by)
             )
         elif sort_by == "title":
-            directional_sort_by = "book__title"
-            if direction == "descending":
-                directional_sort_by = "-" + directional_sort_by
-            items = book_list.listitem_set.filter(approved=True).order_by(
-                directional_sort_by
+            items = (
+                book_list.listitem_set
+                .filter(approved=True)
+                .order_by(
+                directional_sort_by)
             )
         elif sort_by == "rating":
-            directional_sort_by = "average_rating"
-            if direction == "descending":
-                directional_sort_by = "-" + directional_sort_by
-            items = book_list.listitem_set.annotate(
-                average_rating=Avg(Coalesce("book__review__rating", 0))
-            ).order_by(directional_sort_by)
+            items = (
+                book_list.listitem_set
+                .annotate(average_rating=Avg(Coalesce("book__review__rating", 0)))
+                .filter(approved=True)
+                .order_by(directional_sort_by)
+            )
 
-        paginated = Paginator(items, 25)
+        paginated = Paginator(items, 2)
 
         if query and request.user.is_authenticated:
             # search for books

From 602c8c83ba5689191266a55d9c0161d6cbad21f6 Mon Sep 17 00:00:00 2001
From: Pablo Barton <pablo.barton@gmail.com>
Date: Sat, 17 Apr 2021 22:09:00 -0400
Subject: [PATCH 0840/1285] black

---
 bookwyrm/tests/views/test_list.py |  6 ++++--
 bookwyrm/views/list.py            | 20 ++++++++------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/bookwyrm/tests/views/test_list.py b/bookwyrm/tests/views/test_list.py
index 446169ab..a2bd0674 100644
--- a/bookwyrm/tests/views/test_list.py
+++ b/bookwyrm/tests/views/test_list.py
@@ -361,7 +361,8 @@ class ListViews(TestCase):
 
         remove_request = self.factory.post("", {"item": items[1].id})
         remove_request.user = self.local_user
-        views.list.remove_book(remove_request, self.list.id)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            views.list.remove_book(remove_request, self.list.id)
         items = self.list.listitem_set.order_by("order").all()
         self.assertEqual(items[0].book, self.book)
         self.assertEqual(items[1].book, self.book_three)
@@ -415,7 +416,8 @@ class ListViews(TestCase):
 
         set_position_request = self.factory.post("", {"position": 1})
         set_position_request.user = self.local_user
-        views.list.set_book_position(set_position_request, items[2].id)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            views.list.set_book_position(set_position_request, items[2].id)
         items = self.list.listitem_set.order_by("order").all()
         self.assertEqual(items[0].book, self.book_three)
         self.assertEqual(items[1].book, self.book)
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index 9a32168a..a295806b 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -124,27 +124,23 @@ class List(View):
             directional_sort_by = "-" + directional_sort_by
 
         if sort_by == "order":
-            items = (
-                book_list.listitem_set
-                .filter(approved=True)
-                .order_by(directional_sort_by)
+            items = book_list.listitem_set.filter(approved=True).order_by(
+                directional_sort_by
             )
         elif sort_by == "title":
-            items = (
-                book_list.listitem_set
-                .filter(approved=True)
-                .order_by(
-                directional_sort_by)
+            items = book_list.listitem_set.filter(approved=True).order_by(
+                directional_sort_by
             )
         elif sort_by == "rating":
             items = (
-                book_list.listitem_set
-                .annotate(average_rating=Avg(Coalesce("book__review__rating", 0)))
+                book_list.listitem_set.annotate(
+                    average_rating=Avg(Coalesce("book__review__rating", 0))
+                )
                 .filter(approved=True)
                 .order_by(directional_sort_by)
             )
 
-        paginated = Paginator(items, 2)
+        paginated = Paginator(items, 25)
 
         if query and request.user.is_authenticated:
             # search for books

From 66c72c8b41fb489aee28cd62ccefef00ba98d81d Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sun, 18 Apr 2021 15:59:02 +0200
Subject: [PATCH 0841/1285] Add book identifiers to list of Editions:

- Add template for identifiers.
- Remove `space-between` that adds too much space on narrow views.
- Apply the `content` class only on publisher infos to avoid applying automatic styles to the description list.
---
 bookwyrm/templates/book/book.html             | 29 +++++--------------
 bookwyrm/templates/book/book_identifiers.html | 27 +++++++++++++++++
 bookwyrm/templates/book/editions.html         | 13 ++++++++-
 3 files changed, 46 insertions(+), 23 deletions(-)
 create mode 100644 bookwyrm/templates/book/book_identifiers.html

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index d263e0e0..f1aaaf51 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -67,31 +67,16 @@
             </div>
             {% endif %}
 
-            <section class="content is-clipped">
-                <dl>
-                    {% if book.isbn_13 %}
-                    <div class="is-flex is-justify-content-space-between is-align-items-center">
-                        <dt>{% trans "ISBN:" %}</dt>
-                        <dd itemprop="isbn">{{ book.isbn_13 }}</dd>
+            <section class="is-clipped">
+                {% with book=book %}
+                    <div class="content">
+                        {% include 'book/publisher_info.html' %}
                     </div>
-                    {% endif %}
 
-                    {% if book.oclc_number %}
-                    <div class="is-flex is-justify-content-space-between is-align-items-center">
-                        <dt>{% trans "OCLC Number:" %}</dt>
-                        <dd>{{ book.oclc_number }}</dd>
+                    <div class="my-3">
+                        {% include 'book/book_identifiers.html' %}
                     </div>
-                    {% endif %}
-
-                    {% if book.asin %}
-                    <div class="is-flex is-justify-content-space-between is-align-items-center">
-                        <dt>{% trans "ASIN:" %}</dt>
-                        <dd>{{ book.asin }}</dd>
-                    </div>
-                    {% endif %}
-                </dl>
-
-                {% include 'book/publisher_info.html' with book=book %}
+                {% endwith %}
 
                 {% if book.openlibrary_key %}
                 <p><a href="https://openlibrary.org/books/{{ book.openlibrary_key }}" target="_blank" rel="noopener">{% trans "View on OpenLibrary" %}</a></p>
diff --git a/bookwyrm/templates/book/book_identifiers.html b/bookwyrm/templates/book/book_identifiers.html
new file mode 100644
index 00000000..d71ea409
--- /dev/null
+++ b/bookwyrm/templates/book/book_identifiers.html
@@ -0,0 +1,27 @@
+{% spaceless %}
+
+{% load i18n %}
+
+<dl>
+    {% if book.isbn_13 %}
+        <div class="is-flex">
+            <dt class="mr-1">{% trans "ISBN:" %}</dt>
+            <dd itemprop="isbn">{{ book.isbn_13 }}</dd>
+        </div>
+    {% endif %}
+
+    {% if book.oclc_number %}
+        <div class="is-flex">
+            <dt class="mr-1">{% trans "OCLC Number:" %}</dt>
+            <dd>{{ book.oclc_number }}</dd>
+        </div>
+    {% endif %}
+
+    {% if book.asin %}
+        <div class="is-flex">
+            <dt class="mr-1">{% trans "ASIN:" %}</dt>
+            <dd>{{ book.asin }}</dd>
+        </div>
+    {% endif %}
+</dl>
+{% endspaceless %}
diff --git a/bookwyrm/templates/book/editions.html b/bookwyrm/templates/book/editions.html
index 91259465..339e835f 100644
--- a/bookwyrm/templates/book/editions.html
+++ b/bookwyrm/templates/book/editions.html
@@ -25,7 +25,18 @@
                     {{ book.title }}
                 </a>
             </h2>
-            {% include 'book/publisher_info.html' with book=book %}
+
+            {% with book=book %}
+                <div class="columns is-multiline">
+                    <div class="column is-half content">
+                        {% include 'book/publisher_info.html' %}
+                    </div>
+
+                    <div class="column is-half ">
+                        {% include 'book/book_identifiers.html' %}
+                    </div>
+                </div>
+            {% endwith %}
         </div>
         <div class="column is-3">
             {% include 'snippets/shelve_button/shelve_button.html' with book=book switch_mode=True %}

From 3d0de5bea8c367ebe47e38157f23abbc38532f5b Mon Sep 17 00:00:00 2001
From: Pablo Barton <pablo.barton@gmail.com>
Date: Sun, 18 Apr 2021 11:15:42 -0400
Subject: [PATCH 0842/1285] approving list items puts them at the end of the
 list

---
 bookwyrm/views/list.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index a295806b..b5d8c682 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -4,7 +4,7 @@ from django.core.paginator import Paginator
 from django.db import IntegrityError, transaction
 from django.db.models import Avg, Count, Q, Max
 from django.db.models.functions import Coalesce
-from django.http import HttpResponseNotFound, HttpResponseBadRequest
+from django.http import HttpResponseNotFound, HttpResponseBadRequest, HttpResponse
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
@@ -211,7 +211,13 @@ class Curate(View):
         approved = request.POST.get("approved") == "true"
         if approved:
             suggestion.approved = True
+            current_order = suggestion.order
+            order_max = (
+                book_list.listitem_set.aggregate(Max("order"))["order__max"] or 0
+            ) + 1
+            suggestion.order = order_max
             suggestion.save()
+            normalize_book_list_ordering(book_list.id, start=current_order)
         else:
             deleted_order = suggestion.order
             suggestion.delete(broadcast=False)
@@ -302,7 +308,7 @@ def set_book_position(request, list_item_id):
 
         original_order = list_item.order
         if original_order == int_position:
-            return
+            return HttpResponse(status=204)
         elif original_order > int_position:
             list_item.order = -1
             list_item.save()

From afd1cdc2a8296c630b0dca1f852a1975ed78fd33 Mon Sep 17 00:00:00 2001
From: Pablo Barton <pablo.barton@gmail.com>
Date: Sun, 18 Apr 2021 11:52:22 -0400
Subject: [PATCH 0843/1285] adjust test

---
 bookwyrm/tests/views/test_list.py | 2 +-
 bookwyrm/views/list.py            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/tests/views/test_list.py b/bookwyrm/tests/views/test_list.py
index a2bd0674..02581939 100644
--- a/bookwyrm/tests/views/test_list.py
+++ b/bookwyrm/tests/views/test_list.py
@@ -221,7 +221,7 @@ class ListViews(TestCase):
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
             view(request, self.list.id)
 
-        self.assertEqual(mock.call_count, 1)
+        self.assertEqual(mock.call_count, 2)
         activity = json.loads(mock.call_args[0][1])
         self.assertEqual(activity["type"], "Add")
         self.assertEqual(activity["actor"], self.local_user.remote_id)
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index b5d8c682..2f01410d 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -357,7 +357,7 @@ def normalize_book_list_ordering(book_list_id, start=0, add_offset=0):
     try:
         book_list = models.List.objects.get(id=book_list_id)
     except models.List.DoesNotExist:
-        return
+        return HttpResponseNotFound()
     items = book_list.listitem_set.filter(order__gt=start).order_by("order")
     for i, item in enumerate(items, start):
         effective_order = i + add_offset

From 7a2731aef4c7182875056b19b5f57bc4372bd502 Mon Sep 17 00:00:00 2001
From: D Anzorge <d.anzorge@gmail.com>
Date: Sun, 18 Apr 2021 16:30:01 +0200
Subject: [PATCH 0844/1285] Use object ids with our instance base path for
 follow accept/reject

---
 bookwyrm/models/relationship.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/models/relationship.py b/bookwyrm/models/relationship.py
index 998d7bed..927c8740 100644
--- a/bookwyrm/models/relationship.py
+++ b/bookwyrm/models/relationship.py
@@ -50,11 +50,10 @@ class UserRelationship(BookWyrmModel):
             ),
         ]
 
-    def get_remote_id(self, status=None):  # pylint: disable=arguments-differ
+    def get_remote_id(self):
         """ use shelf identifier in remote_id """
-        status = status or "follows"
         base_path = self.user_subject.remote_id
-        return "%s#%s/%d" % (base_path, status, self.id)
+        return "%s#follows/%d" % (base_path, self.id)
 
 
 class UserFollows(ActivityMixin, UserRelationship):
@@ -138,12 +137,18 @@ class UserFollowRequest(ActivitypubMixin, UserRelationship):
                 notification_type=notification_type,
             )
 
+    def get_accept_reject_id(self, status):
+        """ get id for sending an accept or reject of a local user """
+
+        base_path = self.user_object.remote_id
+        return "%s#%s/%d" % (base_path, status, self.id)
+
     def accept(self):
         """ turn this request into the real deal"""
         user = self.user_object
         if not self.user_subject.local:
             activity = activitypub.Accept(
-                id=self.get_remote_id(status="accepts"),
+                id=self.get_accept_reject_id(status="accepts"),
                 actor=self.user_object.remote_id,
                 object=self.to_activity(),
             ).serialize()
@@ -156,7 +161,7 @@ class UserFollowRequest(ActivitypubMixin, UserRelationship):
         """ generate a Reject for this follow request """
         if self.user_object.local:
             activity = activitypub.Reject(
-                id=self.get_remote_id(status="rejects"),
+                id=self.get_accept_reject_id(status="rejects"),
                 actor=self.user_object.remote_id,
                 object=self.to_activity(),
             ).serialize()

From 415d6c4e3f485009b3803777fb633ed4215b56c4 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sun, 18 Apr 2021 18:24:32 +0200
Subject: [PATCH 0845/1285] Remove spacing between publisher info blocks.

---
 bookwyrm/templates/book/editions.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/book/editions.html b/bookwyrm/templates/book/editions.html
index 339e835f..70f067f7 100644
--- a/bookwyrm/templates/book/editions.html
+++ b/bookwyrm/templates/book/editions.html
@@ -28,7 +28,7 @@
 
             {% with book=book %}
                 <div class="columns is-multiline">
-                    <div class="column is-half content">
+                    <div class="column is-half">
                         {% include 'book/publisher_info.html' %}
                     </div>
 

From d1c582493d8a319f24a1cabcc943e35da0eb7d4a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 18 Apr 2021 09:26:27 -0700
Subject: [PATCH 0846/1285] Update to django 3.2

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 6b7d82d3..0bcc8599 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 celery==4.4.2
-Django==3.1.8
+Django==3.2.0
 django-model-utils==4.0.0
 environs==7.2.0
 flower==0.9.4

From fa75438070e6b9e800eafe76a82d8737f972278b Mon Sep 17 00:00:00 2001
From: Pablo Barton <pablo.barton@gmail.com>
Date: Sun, 18 Apr 2021 14:46:28 -0400
Subject: [PATCH 0847/1285] per review, removing custom pagination for booklist
 and handling all pending books at the end of the list

---
 bookwyrm/templates/lists/list.html            |   2 +-
 .../snippets/booklist-pagination.html         |  58 ---------
 bookwyrm/tests/views/test_list.py             | 118 ++++++++++++++++++
 bookwyrm/views/list.py                        |  49 +++++---
 4 files changed, 154 insertions(+), 73 deletions(-)
 delete mode 100644 bookwyrm/templates/snippets/booklist-pagination.html

diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index c9464c85..2f0e7d67 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -57,7 +57,7 @@
         {% endfor %}
         </ol>
         {% endif %}
-        {% include "snippets/booklist-pagination.html" with page=items %}
+        {% include "snippets/pagination.html" with page=items %}
     </section>
 
     <section class="column is-one-quarter content">
diff --git a/bookwyrm/templates/snippets/booklist-pagination.html b/bookwyrm/templates/snippets/booklist-pagination.html
deleted file mode 100644
index 161c743c..00000000
--- a/bookwyrm/templates/snippets/booklist-pagination.html
+++ /dev/null
@@ -1,58 +0,0 @@
-{% load i18n %}
-{% if page.has_other_pages %}
-<nav class="pagination is-centered" aria-label="pagination">
-    <ul class="pagination-list">
-        {% if page.number == 2 %}
-            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number }}{{ anchor }}">{{ page.previous_page_number }}</a></li>
-        {% elif page.number == 3 %}
-            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number|add:-1 }}{{ anchor }}">{{ page.previous_page_number|add:-1 }}</a></li>
-            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number }}{{ anchor }}">{{ page.previous_page_number }}</a></li>
-        {% elif page.number == 4 %}
-            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number|add:-2 }}{{ anchor }}">{{ page.previous_page_number|add:-2 }}</a></li>
-            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number|add:-1 }}{{ anchor }}">{{ page.previous_page_number|add:-1 }}</a></li>
-            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number }}{{ anchor }}">{{ page.previous_page_number }}</a></li>
-        {% elif page.number > 4 %}
-            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page=1{{ anchor }}">1</a></li>
-            <span class="pagination-ellipsis">&hellip;</span>
-            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number }}{{ anchor }}">{{ page.previous_page_number }}</a></li>
-        {% endif %}
-    <li><a class="pagination-link is-link" disabled href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.number }}{{ anchor }}">{{ page.number }}</a></li>
-        {% if page.number|add:1 == page.paginator.num_pages %}
-            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number }}{{ anchor }}">{{ page.next_page_number }}</a></li>
-        {% elif page.number|add:2 == page.paginator.num_pages %}
-            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number }}{{ anchor }}">{{ page.next_page_number }}</a></li>
-            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number|add:1 }}{{ anchor }}">{{ page.next_page_number|add:1 }}</a></li>
-        {% elif page.number|add:3 == page.paginator.num_pages %}
-            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number }}{{ anchor }}">{{ page.next_page_number }}</a></li>
-            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number|add:1 }}{{ anchor }}">{{ page.next_page_number|add:1 }}</a></li>
-            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number|add:2 }}{{ anchor }}">{{ page.next_page_number|add:2 }}</a></li>
-        {% elif page.number|add:3 < page.paginator.num_pages %}
-            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number }}{{ anchor }}">{{ page.next_page_number }}</a></li>
-            <span class="pagination-ellipsis">&hellip;</span>
-            <li><a class="pagination-link" href="{% url 'list' list.id %}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ items.paginator.num_pages }}{{ anchor }}">{{ items.paginator.num_pages }}</a></li>
-        {% endif %}
-    </ul>
-    <a
-        class="pagination-previous {% if not page.has_previous %}is-disabled{% endif %}"
-        {% if page.has_previous %}
-        href="{{ path }}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.previous_page_number }}{{ anchor }}"
-        {% else %}
-        aria-hidden="true"
-        {% endif %}>
-
-        <span class="icon icon-arrow-left" aria-hidden="true"></span>
-        {% trans "Previous" %}
-    </a>
-    <a
-        class="pagination-next {% if not page.has_next %}is-disabled{% endif %}"
-        {% if page.has_next %}
-        href="{{ path }}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ page.next_page_number }}{{ anchor }}"
-        {% else %}
-        aria-hidden="true"
-        {% endif %}>
-
-        {% trans "Next" %}
-        <span class="icon icon-arrow-right" aria-hidden="true"></span>
-    </a>
-</nav>
-{% endif %}
diff --git a/bookwyrm/tests/views/test_list.py b/bookwyrm/tests/views/test_list.py
index 02581939..215f3e61 100644
--- a/bookwyrm/tests/views/test_list.py
+++ b/bookwyrm/tests/views/test_list.py
@@ -51,6 +51,13 @@ class ListViews(TestCase):
             remote_id="https://example.com/book/3",
             parent_work=work_three,
         )
+        work_four = models.Work.objects.create(title="Travailler")
+        self.book_four = models.Edition.objects.create(
+            title="Example Edition 4",
+            remote_id="https://example.com/book/4",
+            parent_work=work_four,
+        )
+
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             self.list = models.List.objects.create(
                 name="Test List", user=self.local_user
@@ -369,6 +376,117 @@ class ListViews(TestCase):
         self.assertEqual(items[0].order, 1)
         self.assertEqual(items[1].order, 2)
 
+    def test_adding_book_with_a_pending_book(self):
+        """
+        When a list contains any pending books, the pending books should have
+        be at the end of the list by order. If a book is added while a book is
+        pending, its order should precede the pending books.
+        """
+        request = self.factory.post(
+            "",
+            {
+                "book": self.book_three.id,
+                "list": self.list.id,
+            },
+        )
+        request.user = self.local_user
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            models.ListItem.objects.create(
+                book_list=self.list,
+                user=self.local_user,
+                book=self.book,
+                approved=True,
+                order=1,
+            )
+            models.ListItem.objects.create(
+                book_list=self.list,
+                user=self.rat,
+                book=self.book_two,
+                approved=False,
+                order=2,
+            )
+            views.list.add_book(request)
+
+        items = self.list.listitem_set.order_by("order").all()
+        self.assertEqual(items[0].book, self.book)
+        self.assertEqual(items[0].order, 1)
+        self.assertTrue(items[0].approved)
+
+        self.assertEqual(items[1].book, self.book_three)
+        self.assertEqual(items[1].order, 2)
+        self.assertTrue(items[1].approved)
+
+        self.assertEqual(items[2].book, self.book_two)
+        self.assertEqual(items[2].order, 3)
+        self.assertFalse(items[2].approved)
+
+    def test_approving_one_pending_book_from_multiple(self):
+        """
+        When a list contains any pending books, the pending books should have
+        be at the end of the list by order. If a pending book is approved, then
+        its order should be at the end of the approved books and before the
+        remaining pending books.
+        """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            models.ListItem.objects.create(
+                book_list=self.list,
+                user=self.local_user,
+                book=self.book,
+                approved=True,
+                order=1,
+            )
+            models.ListItem.objects.create(
+                book_list=self.list,
+                user=self.local_user,
+                book=self.book_two,
+                approved=True,
+                order=2,
+            )
+            models.ListItem.objects.create(
+                book_list=self.list,
+                user=self.rat,
+                book=self.book_three,
+                approved=False,
+                order=3,
+            )
+            to_be_approved = models.ListItem.objects.create(
+                book_list=self.list,
+                user=self.rat,
+                book=self.book_four,
+                approved=False,
+                order=4,
+            )
+
+        view = views.Curate.as_view()
+        request = self.factory.post(
+            "",
+            {
+                "item": to_be_approved.id,
+                "approved": "true",
+            },
+        )
+        request.user = self.local_user
+
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            view(request, self.list.id)
+
+        items = self.list.listitem_set.order_by("order").all()
+        self.assertEqual(items[0].book, self.book)
+        self.assertEqual(items[0].order, 1)
+        self.assertTrue(items[0].approved)
+
+        self.assertEqual(items[1].book, self.book_two)
+        self.assertEqual(items[1].order, 2)
+        self.assertTrue(items[1].approved)
+
+        self.assertEqual(items[2].book, self.book_four)
+        self.assertEqual(items[2].order, 3)
+        self.assertTrue(items[2].approved)
+
+        self.assertEqual(items[3].book, self.book_three)
+        self.assertEqual(items[3].order, 4)
+        self.assertFalse(items[3].approved)
+
     def test_add_three_books_and_move_last_to_first(self):
         """
         Put three books on the list and move the last book to the first
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index 2f01410d..7fb4979c 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -1,4 +1,6 @@
 """ book list views"""
+from typing import Optional
+
 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
 from django.db import IntegrityError, transaction
@@ -140,7 +142,7 @@ class List(View):
                 .order_by(directional_sort_by)
             )
 
-        paginated = Paginator(items, 25)
+        paginated = Paginator(items, 12)
 
         if query and request.user.is_authenticated:
             # search for books
@@ -210,14 +212,17 @@ class Curate(View):
         suggestion = get_object_or_404(models.ListItem, id=request.POST.get("item"))
         approved = request.POST.get("approved") == "true"
         if approved:
+            # update the book and set it to be the last in the order of approved books, before any pending books
             suggestion.approved = True
-            current_order = suggestion.order
             order_max = (
-                book_list.listitem_set.aggregate(Max("order"))["order__max"] or 0
+                book_list.listitem_set.filter(approved=True).aggregate(Max("order"))[
+                    "order__max"
+                ]
+                or 0
             ) + 1
             suggestion.order = order_max
+            increment_order_in_reverse(book_list.id, order_max)
             suggestion.save()
-            normalize_book_list_ordering(book_list.id, start=current_order)
         else:
             deleted_order = suggestion.order
             suggestion.delete(broadcast=False)
@@ -232,13 +237,17 @@ def add_book(request):
     if not book_list.visible_to_user(request.user):
         return HttpResponseNotFound()
 
-    order_max = book_list.listitem_set.aggregate(Max("order"))["order__max"] or 0
-
     book = get_object_or_404(models.Edition, id=request.POST.get("book"))
     # do you have permission to add to the list?
     try:
         if request.user == book_list.user or book_list.curation == "open":
-            # go ahead and add it
+            # add the book at the latest order of approved books, before any pending books
+            order_max = (
+                book_list.listitem_set.filter(approved=True).aggregate(Max("order"))[
+                    "order__max"
+                ]
+            ) or 0
+            increment_order_in_reverse(book_list.id, order_max + 1)
             models.ListItem.objects.create(
                 book=book,
                 book_list=book_list,
@@ -246,7 +255,10 @@ def add_book(request):
                 order=order_max + 1,
             )
         elif book_list.curation == "curated":
-            # make a pending entry
+            # make a pending entry at the end of the list
+            order_max = (
+                book_list.listitem_set.aggregate(Max("order"))["order__max"]
+            ) or 0
             models.ListItem.objects.create(
                 approved=False,
                 book=book,
@@ -283,7 +295,8 @@ def remove_book(request, list_id):
 @require_POST
 def set_book_position(request, list_item_id):
     """
-    Action for when the list user manually specifies a list position, takes special care with the unique ordering per list
+    Action for when the list user manually specifies a list position, takes
+    special care with the unique ordering per list.
     """
     with transaction.atomic():
         list_item = get_object_or_404(models.ListItem, id=list_item_id)
@@ -298,7 +311,12 @@ def set_book_position(request, list_item_id):
             return HttpResponseBadRequest("position cannot be less than 1")
 
         book_list = list_item.book_list
-        order_max = book_list.listitem_set.aggregate(Max("order"))["order__max"]
+
+        # the max position to which a book may be set is the highest order for
+        # books which are approved
+        order_max = book_list.listitem_set.filter(approved=True).aggregate(
+            Max("order")
+        )["order__max"]
 
         if int_position > order_max:
             int_position = order_max
@@ -325,14 +343,17 @@ def set_book_position(request, list_item_id):
 
 
 @transaction.atomic
-def increment_order_in_reverse(book_list_id, start, end):
+def increment_order_in_reverse(
+    book_list_id: int, start: int, end: Optional[int] = None
+):
     try:
         book_list = models.List.objects.get(id=book_list_id)
     except models.List.DoesNotExist:
         return
-    items = book_list.listitem_set.filter(order__gte=start, order__lt=end).order_by(
-        "-order"
-    )
+    items = book_list.listitem_set.filter(order__gte=start)
+    if end is not None:
+        items = items.filter(order__lt=end)
+    items = items.order_by("-order")
     for item in items:
         item.order += 1
         item.save()

From 77775d9bf8133183d578eb51f89e35c102b81fc7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 19 Apr 2021 14:47:59 -0700
Subject: [PATCH 0848/1285] Remove superfluous calls to `all()`

---
 bookwyrm/models/list.py                | 2 +-
 bookwyrm/models/shelf.py               | 2 +-
 bookwyrm/templatetags/bookwyrm_tags.py | 3 +--
 bookwyrm/views/feed.py                 | 2 +-
 bookwyrm/views/list.py                 | 2 +-
 bookwyrm/views/shelf.py                | 2 +-
 bookwyrm/views/user.py                 | 2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index 7e6de106..639f8402 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -47,7 +47,7 @@ class List(OrderedCollectionMixin, BookWyrmModel):
     @property
     def collection_queryset(self):
         """ list of books for this shelf, overrides OrderedCollectionMixin  """
-        return self.books.filter(listitem__approved=True).all().order_by("listitem")
+        return self.books.filter(listitem__approved=True).order_by("listitem")
 
     class Meta:
         """ default sorting """
diff --git a/bookwyrm/models/shelf.py b/bookwyrm/models/shelf.py
index 5bbb84b9..d37668dd 100644
--- a/bookwyrm/models/shelf.py
+++ b/bookwyrm/models/shelf.py
@@ -48,7 +48,7 @@ class Shelf(OrderedCollectionMixin, BookWyrmModel):
     @property
     def collection_queryset(self):
         """ list of books for this shelf, overrides OrderedCollectionMixin  """
-        return self.books.all().order_by("shelfbook")
+        return self.books.order_by("shelfbook")
 
     def get_remote_id(self):
         """ shelf identifier instead of id """
diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index 775c6190..bc526ba1 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -67,8 +67,7 @@ def get_replies(status):
             reply_parent=status,
             deleted=False,
         )
-        .select_subclasses()
-        .all()[:10]
+        .select_subclasses()[:10]
     )
 
 
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index cd279282..1b66b494 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -174,7 +174,7 @@ def get_suggested_books(user, max_books=5):
         )
         shelf = user.shelf_set.get(identifier=preset)
 
-        shelf_books = shelf.shelfbook_set.order_by("-updated_date").all()[:limit]
+        shelf_books = shelf.shelfbook_set.order_by("-updated_date")[:limit]
         if not shelf_books:
             continue
         shelf_preview = {
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index 7fb4979c..ff20d991 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -75,7 +75,7 @@ class UserLists(View):
         except ValueError:
             page = 1
         user = get_user_from_username(request.user, username)
-        lists = models.List.objects.filter(user=user).all()
+        lists = models.List.objects.filter(user=user)
         lists = privacy_filter(request.user, lists)
         paginated = Paginator(lists, 12)
 
diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index 740439db..2ec9e69f 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -61,7 +61,7 @@ class Shelf(View):
             return ActivitypubResponse(shelf.to_activity(**request.GET))
 
         paginated = Paginator(
-            shelf.books.order_by("-updated_date").all(),
+            shelf.books.order_by("-updated_date"),
             PAGE_LENGTH,
         )
 
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index 26117a92..e24db01e 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -64,7 +64,7 @@ class User(View):
                 {
                     "name": user_shelf.name,
                     "local_path": user_shelf.local_path,
-                    "books": user_shelf.books.all()[:3],
+                    "books": user_shelf.books[:3],
                     "size": user_shelf.books.count(),
                 }
             )

From 91aa6fa95f508713ddb8715dd8933b233bbc9b1e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 19 Apr 2021 15:01:20 -0700
Subject: [PATCH 0849/1285] Remove unneeded page checking logic

---
 bookwyrm/views/books.py      | 14 ++------------
 bookwyrm/views/directory.py  |  8 +-------
 bookwyrm/views/federation.py |  7 +------
 bookwyrm/views/feed.py       | 15 ++-------------
 bookwyrm/views/invite.py     | 14 ++------------
 bookwyrm/views/list.py       | 29 +++++++++++------------------
 bookwyrm/views/reading.py    |  1 +
 bookwyrm/views/shelf.py      |  7 +------
 bookwyrm/views/user.py       |  7 +------
 bookwyrm/views/user_admin.py |  7 +------
 10 files changed, 23 insertions(+), 86 deletions(-)

diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index c3ac4f49..2a47c0d2 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -30,11 +30,6 @@ class Book(View):
 
     def get(self, request, book_id):
         """ info about a book """
-        try:
-            page = int(request.GET.get("page", 1))
-        except ValueError:
-            page = 1
-
         try:
             book = models.Book.objects.select_subclasses().get(id=book_id)
         except models.Book.DoesNotExist:
@@ -60,7 +55,7 @@ class Book(View):
         paginated = Paginator(
             reviews.exclude(Q(content__isnull=True) | Q(content="")), PAGE_LENGTH
         )
-        reviews_page = paginated.get_page(page)
+        reviews_page = paginated.get_page(request.GET.get("page"))
 
         user_tags = readthroughs = user_shelves = other_edition_shelves = []
         if request.user.is_authenticated:
@@ -266,11 +261,6 @@ class Editions(View):
         """ list of editions of a book """
         work = get_object_or_404(models.Work, id=book_id)
 
-        try:
-            page = int(request.GET.get("page", 1))
-        except ValueError:
-            page = 1
-
         if is_api_request(request):
             return ActivitypubResponse(work.to_edition_list(**request.GET))
         filters = {}
@@ -285,7 +275,7 @@ class Editions(View):
 
         paginated = Paginator(editions.filter(**filters).all(), PAGE_LENGTH)
         data = {
-            "editions": paginated.get_page(page),
+            "editions": paginated.get_page(request.GET.get("page")),
             "work": work,
             "languages": languages,
             "formats": set(
diff --git a/bookwyrm/views/directory.py b/bookwyrm/views/directory.py
index 2565f4ec..7919dac0 100644
--- a/bookwyrm/views/directory.py
+++ b/bookwyrm/views/directory.py
@@ -15,12 +15,6 @@ class Directory(View):
 
     def get(self, request):
         """ lets see your cute faces """
-        try:
-            page = int(request.GET.get("page", 1))
-        except ValueError:
-            page = 1
-
-        # filters
         filters = {}
         software = request.GET.get("software")
         if not software or software == "bookwyrm":
@@ -39,7 +33,7 @@ class Directory(View):
         paginated = Paginator(users, 12)
 
         data = {
-            "users": paginated.get_page(page),
+            "users": paginated.get_page(request.GET.get("page")),
         }
         return TemplateResponse(request, "directory/directory.html", data)
 
diff --git a/bookwyrm/views/federation.py b/bookwyrm/views/federation.py
index 8712c463..1acacf8f 100644
--- a/bookwyrm/views/federation.py
+++ b/bookwyrm/views/federation.py
@@ -24,11 +24,6 @@ class Federation(View):
 
     def get(self, request):
         """ list of servers """
-        try:
-            page = int(request.GET.get("page", 1))
-        except ValueError:
-            page = 1
-
         servers = models.FederatedServer.objects
 
         sort = request.GET.get("sort")
@@ -40,7 +35,7 @@ class Federation(View):
         paginated = Paginator(servers, PAGE_LENGTH)
 
         data = {
-            "servers": paginated.get_page(page),
+            "servers": paginated.get_page(request.GET.get("page")),
             "sort": sort,
             "form": forms.ServerForm(),
         }
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index 1b66b494..118473d0 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -22,11 +22,6 @@ class Feed(View):
 
     def get(self, request, tab):
         """ user's homepage with activity feed """
-        try:
-            page = int(request.GET.get("page", 1))
-        except ValueError:
-            page = 1
-
         if not tab in STREAMS:
             tab = "home"
 
@@ -39,7 +34,7 @@ class Feed(View):
             **feed_page_data(request.user),
             **{
                 "user": request.user,
-                "activities": paginated.get_page(page),
+                "activities": paginated.get_page(request.GET.get("page")),
                 "suggested_users": suggested_users,
                 "tab": tab,
                 "goal_form": forms.GoalForm(),
@@ -55,11 +50,6 @@ class DirectMessage(View):
 
     def get(self, request, username=None):
         """ like a feed but for dms only """
-        try:
-            page = int(request.GET.get("page", 1))
-        except ValueError:
-            page = 1
-
         # remove fancy subclasses of status, keep just good ol' notes
         queryset = models.Status.objects.filter(
             review__isnull=True,
@@ -82,13 +72,12 @@ class DirectMessage(View):
         ).order_by("-published_date")
 
         paginated = Paginator(activities, PAGE_LENGTH)
-        activity_page = paginated.get_page(page)
         data = {
             **feed_page_data(request.user),
             **{
                 "user": request.user,
                 "partner": user,
-                "activities": activity_page,
+                "activities": paginated.get_page(request.GET.get("page")),
                 "path": "/direct-messages",
             },
         }
diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/invite.py
index 03b31b7b..cbb189b5 100644
--- a/bookwyrm/views/invite.py
+++ b/bookwyrm/views/invite.py
@@ -30,11 +30,6 @@ class ManageInvites(View):
 
     def get(self, request):
         """ invite management page """
-        try:
-            page = int(request.GET.get("page", 1))
-        except ValueError:
-            page = 1
-
         paginated = Paginator(
             models.SiteInvite.objects.filter(user=request.user).order_by(
                 "-created_date"
@@ -43,7 +38,7 @@ class ManageInvites(View):
         )
 
         data = {
-            "invites": paginated.get_page(page),
+            "invites": paginated.get_page(request.GET.get("page")),
             "form": forms.CreateInviteForm(),
         }
         return TemplateResponse(request, "settings/manage_invites.html", data)
@@ -93,11 +88,6 @@ class ManageInviteRequests(View):
     def get(self, request):
         """ view a list of requests """
         ignored = request.GET.get("ignored", False)
-        try:
-            page = int(request.GET.get("page", 1))
-        except ValueError:
-            page = 1
-
         sort = request.GET.get("sort")
         sort_fields = [
             "created_date",
@@ -136,7 +126,7 @@ class ManageInviteRequests(View):
         data = {
             "ignored": ignored,
             "count": paginated.count,
-            "requests": paginated.get_page(page),
+            "requests": paginated.get_page(request.GET.get("page")),
             "sort": sort,
         }
         return TemplateResponse(request, "settings/manage_invite_requests.html", data)
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index ff20d991..a2cf7afe 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -26,11 +26,6 @@ class Lists(View):
 
     def get(self, request):
         """ display a book list """
-        try:
-            page = int(request.GET.get("page", 1))
-        except ValueError:
-            page = 1
-
         # hide lists with no approved books
         lists = (
             models.List.objects.annotate(
@@ -47,7 +42,7 @@ class Lists(View):
 
         paginated = Paginator(lists, 12)
         data = {
-            "lists": paginated.get_page(page),
+            "lists": paginated.get_page(request.GET.get("page")),
             "list_form": forms.ListForm(),
             "path": "/list",
         }
@@ -70,10 +65,6 @@ class UserLists(View):
 
     def get(self, request, username):
         """ display a book list """
-        try:
-            page = int(request.GET.get("page", 1))
-        except ValueError:
-            page = 1
         user = get_user_from_username(request.user, username)
         lists = models.List.objects.filter(user=user)
         lists = privacy_filter(request.user, lists)
@@ -82,7 +73,7 @@ class UserLists(View):
         data = {
             "user": user,
             "is_self": request.user.id == user.id,
-            "lists": paginated.get_page(page),
+            "lists": paginated.get_page(request.GET.get("page")),
             "list_form": forms.ListForm(),
             "path": user.local_path + "/lists",
         }
@@ -114,8 +105,6 @@ class List(View):
         if direction not in ("ascending", "descending"):
             direction = "ascending"
 
-        page = request.GET.get("page", 1)
-
         internal_sort_by = {
             "order": "order",
             "title": "book__title",
@@ -163,7 +152,7 @@ class List(View):
 
         data = {
             "list": book_list,
-            "items": paginated.get_page(page),
+            "items": paginated.get_page(request.GET.get("page")),
             "pending_count": book_list.listitem_set.filter(approved=False).count(),
             "suggested_books": suggestions,
             "list_form": forms.ListForm(instance=book_list),
@@ -212,7 +201,8 @@ class Curate(View):
         suggestion = get_object_or_404(models.ListItem, id=request.POST.get("item"))
         approved = request.POST.get("approved") == "true"
         if approved:
-            # update the book and set it to be the last in the order of approved books, before any pending books
+            # update the book and set it to be the last in the order of approved books,
+            # before any pending books
             suggestion.approved = True
             order_max = (
                 book_list.listitem_set.filter(approved=True).aggregate(Max("order"))[
@@ -241,7 +231,7 @@ def add_book(request):
     # do you have permission to add to the list?
     try:
         if request.user == book_list.user or book_list.curation == "open":
-            # add the book at the latest order of approved books, before any pending books
+            # add the book at the latest order of approved books, before pending books
             order_max = (
                 book_list.listitem_set.filter(approved=True).aggregate(Max("order"))[
                     "order__max"
@@ -327,7 +317,7 @@ def set_book_position(request, list_item_id):
         original_order = list_item.order
         if original_order == int_position:
             return HttpResponse(status=204)
-        elif original_order > int_position:
+        if original_order > int_position:
             list_item.order = -1
             list_item.save()
             increment_order_in_reverse(book_list.id, int_position, original_order)
@@ -346,6 +336,7 @@ def set_book_position(request, list_item_id):
 def increment_order_in_reverse(
     book_list_id: int, start: int, end: Optional[int] = None
 ):
+    """ increase the order nu,ber for every item in a list """
     try:
         book_list = models.List.objects.get(id=book_list_id)
     except models.List.DoesNotExist:
@@ -361,6 +352,7 @@ def increment_order_in_reverse(
 
 @transaction.atomic
 def decrement_order(book_list_id, start, end):
+    """ decrement the order value for every item in a list """
     try:
         book_list = models.List.objects.get(id=book_list_id)
     except models.List.DoesNotExist:
@@ -375,10 +367,11 @@ def decrement_order(book_list_id, start, end):
 
 @transaction.atomic
 def normalize_book_list_ordering(book_list_id, start=0, add_offset=0):
+    """ gives each book in a list the proper sequential order number """
     try:
         book_list = models.List.objects.get(id=book_list_id)
     except models.List.DoesNotExist:
-        return HttpResponseNotFound()
+        return
     items = book_list.listitem_set.filter(order__gt=start).order_by("order")
     for i, item in enumerate(items, start):
         effective_order = i + add_offset
diff --git a/bookwyrm/views/reading.py b/bookwyrm/views/reading.py
index b780dd2f..f2d5b2c2 100644
--- a/bookwyrm/views/reading.py
+++ b/bookwyrm/views/reading.py
@@ -145,6 +145,7 @@ def create_readthrough(request):
 
 
 def load_date_in_user_tz_as_utc(date_str: str, user: models.User) -> datetime:
+    """ ensures that data is stored consistently in the UTC timezone """
     user_tz = dateutil.tz.gettz(user.preferred_timezone)
     start_date = dateutil.parser.parse(date_str, ignoretz=True)
     return start_date.replace(tzinfo=user_tz).astimezone(dateutil.tz.UTC)
diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index 2ec9e69f..446bedba 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -30,11 +30,6 @@ class Shelf(View):
         except models.User.DoesNotExist:
             return HttpResponseNotFound()
 
-        try:
-            page = int(request.GET.get("page", 1))
-        except ValueError:
-            page = 1
-
         shelves = privacy_filter(request.user, user.shelf_set)
 
         # get the shelf and make sure the logged in user should be able to see it
@@ -70,7 +65,7 @@ class Shelf(View):
             "is_self": is_self,
             "shelves": shelves.all(),
             "shelf": shelf,
-            "books": paginated.get_page(page),
+            "books": paginated.get_page(request.GET.get("page")),
         }
 
         return TemplateResponse(request, "user/shelf.html", data)
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index e24db01e..9c79a77c 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -40,11 +40,6 @@ class User(View):
             return ActivitypubResponse(user.to_activity())
         # otherwise we're at a UI view
 
-        try:
-            page = int(request.GET.get("page", 1))
-        except ValueError:
-            page = 1
-
         shelf_preview = []
 
         # only show other shelves that should be visible
@@ -87,7 +82,7 @@ class User(View):
             "is_self": is_self,
             "shelves": shelf_preview,
             "shelf_count": shelves.count(),
-            "activities": paginated.get_page(page),
+            "activities": paginated.get_page(request.GET.get("page", 1)),
             "goal": goal,
         }
 
diff --git a/bookwyrm/views/user_admin.py b/bookwyrm/views/user_admin.py
index cc3ff841..c0d097d7 100644
--- a/bookwyrm/views/user_admin.py
+++ b/bookwyrm/views/user_admin.py
@@ -20,11 +20,6 @@ class UserAdmin(View):
 
     def get(self, request):
         """ list of users """
-        try:
-            page = int(request.GET.get("page", 1))
-        except ValueError:
-            page = 1
-
         filters = {}
         server = request.GET.get("server")
         if server:
@@ -50,7 +45,7 @@ class UserAdmin(View):
 
         paginated = Paginator(users, PAGE_LENGTH)
         data = {
-            "users": paginated.get_page(page),
+            "users": paginated.get_page(request.GET.get("page")),
             "sort": sort,
             "server": server,
         }

From 0947b79fb1e02d3aa2e4b686a25480a06e8b7bbb Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 19 Apr 2021 15:06:33 -0700
Subject: [PATCH 0850/1285] Python formatting

---
 bookwyrm/templatetags/bookwyrm_tags.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index bc526ba1..52054ada 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -62,13 +62,10 @@ def get_notification_count(user):
 def get_replies(status):
     """ get all direct replies to a status """
     # TODO: this limit could cause problems
-    return (
-        models.Status.objects.filter(
-            reply_parent=status,
-            deleted=False,
-        )
-        .select_subclasses()[:10]
-    )
+    return models.Status.objects.filter(
+        reply_parent=status,
+        deleted=False,
+    ).select_subclasses()[:10]
 
 
 @register.filter(name="parent")

From 788e282dce34b4f35e143376add194c9af41f7c9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 19 Apr 2021 15:12:36 -0700
Subject: [PATCH 0851/1285] Moves user admin pages into their own directory

---
 bookwyrm/templates/moderation/reports.html                    | 2 +-
 .../templates/{settings => user_admin}/server_filter.html     | 0
 bookwyrm/templates/{settings => user_admin}/user_admin.html   | 2 +-
 .../{settings => user_admin}/user_admin_filters.html          | 4 ++--
 .../templates/{settings => user_admin}/username_filter.html   | 0
 bookwyrm/views/user_admin.py                                  | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename bookwyrm/templates/{settings => user_admin}/server_filter.html (100%)
 rename bookwyrm/templates/{settings => user_admin}/user_admin.html (97%)
 rename bookwyrm/templates/{settings => user_admin}/user_admin_filters.html (51%)
 rename bookwyrm/templates/{settings => user_admin}/username_filter.html (100%)

diff --git a/bookwyrm/templates/moderation/reports.html b/bookwyrm/templates/moderation/reports.html
index 72cadae5..f9d9d99b 100644
--- a/bookwyrm/templates/moderation/reports.html
+++ b/bookwyrm/templates/moderation/reports.html
@@ -30,7 +30,7 @@
     </ul>
 </div>
 
-{% include 'settings/user_admin_filters.html' %}
+{% include 'user_admin/user_admin_filters.html' %}
 
 <div class="block">
     {% if not reports %}
diff --git a/bookwyrm/templates/settings/server_filter.html b/bookwyrm/templates/user_admin/server_filter.html
similarity index 100%
rename from bookwyrm/templates/settings/server_filter.html
rename to bookwyrm/templates/user_admin/server_filter.html
diff --git a/bookwyrm/templates/settings/user_admin.html b/bookwyrm/templates/user_admin/user_admin.html
similarity index 97%
rename from bookwyrm/templates/settings/user_admin.html
rename to bookwyrm/templates/user_admin/user_admin.html
index a96d37f5..554fbdd3 100644
--- a/bookwyrm/templates/settings/user_admin.html
+++ b/bookwyrm/templates/user_admin/user_admin.html
@@ -13,7 +13,7 @@
 
 {% block panel %}
 
-{% include 'settings/user_admin_filters.html' %}
+{% include 'user_admin/user_admin_filters.html' %}
 
 <table class="table is-striped">
     <tr>
diff --git a/bookwyrm/templates/settings/user_admin_filters.html b/bookwyrm/templates/user_admin/user_admin_filters.html
similarity index 51%
rename from bookwyrm/templates/settings/user_admin_filters.html
rename to bookwyrm/templates/user_admin/user_admin_filters.html
index a7b5c8aa..57e017e5 100644
--- a/bookwyrm/templates/settings/user_admin_filters.html
+++ b/bookwyrm/templates/user_admin/user_admin_filters.html
@@ -1,6 +1,6 @@
 {% extends 'snippets/filters_panel/filters_panel.html' %}
 
 {% block filter_fields %}
-{% include 'settings/server_filter.html' %}
-{% include 'settings/username_filter.html' %}
+{% include 'user_admin/server_filter.html' %}
+{% include 'user_admin/username_filter.html' %}
 {% endblock %}
diff --git a/bookwyrm/templates/settings/username_filter.html b/bookwyrm/templates/user_admin/username_filter.html
similarity index 100%
rename from bookwyrm/templates/settings/username_filter.html
rename to bookwyrm/templates/user_admin/username_filter.html
diff --git a/bookwyrm/views/user_admin.py b/bookwyrm/views/user_admin.py
index cc3ff841..8b4704d0 100644
--- a/bookwyrm/views/user_admin.py
+++ b/bookwyrm/views/user_admin.py
@@ -54,4 +54,4 @@ class UserAdmin(View):
             "sort": sort,
             "server": server,
         }
-        return TemplateResponse(request, "settings/user_admin.html", data)
+        return TemplateResponse(request, "user_admin/user_admin.html", data)

From 0dd8b339910708eaf82d342fc13ff39dd096705f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 19 Apr 2021 15:19:55 -0700
Subject: [PATCH 0852/1285] Moves user admin templates into snippets

---
 bookwyrm/templates/moderation/report.html     | 71 +------------------
 bookwyrm/templates/user_admin/user.html       | 19 +++++
 bookwyrm/templates/user_admin/user_info.html  | 56 +++++++++++++++
 .../user_admin/user_moderation_actions.html   | 17 +++++
 4 files changed, 94 insertions(+), 69 deletions(-)
 create mode 100644 bookwyrm/templates/user_admin/user.html
 create mode 100644 bookwyrm/templates/user_admin/user_info.html
 create mode 100644 bookwyrm/templates/user_admin/user_moderation_actions.html

diff --git a/bookwyrm/templates/moderation/report.html b/bookwyrm/templates/moderation/report.html
index 1cadd28d..a078fe45 100644
--- a/bookwyrm/templates/moderation/report.html
+++ b/bookwyrm/templates/moderation/report.html
@@ -15,76 +15,9 @@
     {% include 'moderation/report_preview.html' with report=report %}
 </div>
 
-<div class="block columns">
-    <div class="column is-flex is-flex-direction-column">
-        <h4 class="title is-4">{% trans "User details" %}</h4>
-        <div class="box is-flex-grow-1">
-            {% include 'user/user_preview.html' with user=report.user %}
-            {% if report.user.summary %}
-            <div class="box content has-background-white-ter is-shadowless">
-                {{ report.user.summary | to_markdown | safe }}
-            </div>
-            {% endif %}
+{% include 'user_admin/user_info.html' with user=report.user %}
 
-            <p class="mt-2"><a href="{{ report.user.local_path }}">{% trans "View user profile" %}</a></p>
-        </div>
-    </div>
-    {% if not report.user.local %}
-    {% with server=report.user.federated_server %}
-    <div class="column is-half is-flex is-flex-direction-column">
-        <h4 class="title is-4">{% trans "Instance details" %}</h4>
-        <div class="box content is-flex-grow-1">
-            {% if server %}
-            <h5>{{ server.server_name }}</h5>
-            <dl>
-                <div class="is-flex">
-                    <dt>{% trans "Software:" %}</dt>
-                    <dd>{{ server.application_type }}</dd>
-                </div>
-                <div class="is-flex">
-                    <dt>{% trans "Version:" %}</dt>
-                    <dd>{{ server.application_version }}</dd>
-                </div>
-                <div class="is-flex">
-                    <dt>{% trans "Status:" %}</dt>
-                    <dd>{{ server.status }}</dd>
-                </div>
-            </dl>
-            {% if server.notes %}
-            <h5>{% trans "Notes" %}</h5>
-            <div class="box content has-background-white-ter is-shadowless">
-                {{ server.notes }}
-            </div>
-            {% endif %}
-
-            <p>
-                <a href="{% url 'settings-federated-server' server.id %}">{% trans "View instance" %}</a>
-            </p>
-            {% else %}
-            <em>{% trans "Not set" %}</em>
-            {% endif %}
-        </div>
-    </div>
-    {% endwith %}
-    {% endif %}
-</div>
-
-<div class="block content">
-    <h3>{% trans "Actions" %}</h3>
-    <div class="is-flex">
-        <p class="mr-1">
-            <a class="button" href="{% url 'direct-messages-user' report.user.username %}">{% trans "Send direct message" %}</a>
-        </p>
-        <form name="deactivate" method="post" action="{% url 'settings-report-deactivate' report.id  %}">
-            {% csrf_token %}
-            {% if report.user.is_active %}
-            <button type="submit" class="button is-danger is-light">{% trans "Deactivate user" %}</button>
-            {% else %}
-            <button class="button">{% trans "Reactivate user" %}</button>
-            {% endif %}
-        </form>
-    </div>
-</div>
+{% include 'user_admin/user_moderation_actions.html' with user=report.user %}
 
 <div class="block">
     <h3 class="title is-4">{% trans "Moderator Comments" %}</h3>
diff --git a/bookwyrm/templates/user_admin/user.html b/bookwyrm/templates/user_admin/user.html
new file mode 100644
index 00000000..7bb6abfa
--- /dev/null
+++ b/bookwyrm/templates/user_admin/user.html
@@ -0,0 +1,19 @@
+{% extends 'settings/admin_layout.html' %}
+{% load i18n %}
+{% load bookwyrm_tags %}
+{% load humanize %}
+
+{% block title %}{{ username }}{% endblock %}
+{% block header %}{{ username }}{% endblock %}
+
+{% block panel %}
+<div class="block">
+    <a href="{% url 'settings-reports' %}">{% trans "Back to reports" %}</a>
+</div>
+
+{% include 'user_admin/user_info.html' with user=user %}
+
+{% include 'user_admin/user_moderation_actions.html' with user=user %}
+
+{% endblock %}
+
diff --git a/bookwyrm/templates/user_admin/user_info.html b/bookwyrm/templates/user_admin/user_info.html
new file mode 100644
index 00000000..e5f5d580
--- /dev/null
+++ b/bookwyrm/templates/user_admin/user_info.html
@@ -0,0 +1,56 @@
+{% load i18n %}
+{% load bookwyrm_tags %}
+<div class="block columns">
+    <div class="column is-flex is-flex-direction-column">
+        <h4 class="title is-4">{% trans "User details" %}</h4>
+        <div class="box is-flex-grow-1">
+            {% include 'user/user_preview.html' with user=user %}
+            {% if user.summary %}
+            <div class="box content has-background-white-ter is-shadowless">
+                {{ user.summary | to_markdown | safe }}
+            </div>
+            {% endif %}
+
+            <p class="mt-2"><a href="{{ user.local_path }}">{% trans "View user profile" %}</a></p>
+        </div>
+    </div>
+    {% if not user.local %}
+    {% with server=user.federated_server %}
+    <div class="column is-half is-flex is-flex-direction-column">
+        <h4 class="title is-4">{% trans "Instance details" %}</h4>
+        <div class="box content is-flex-grow-1">
+            {% if server %}
+            <h5>{{ server.server_name }}</h5>
+            <dl>
+                <div class="is-flex">
+                    <dt>{% trans "Software:" %}</dt>
+                    <dd>{{ server.application_type }}</dd>
+                </div>
+                <div class="is-flex">
+                    <dt>{% trans "Version:" %}</dt>
+                    <dd>{{ server.application_version }}</dd>
+                </div>
+                <div class="is-flex">
+                    <dt>{% trans "Status:" %}</dt>
+                    <dd>{{ server.status }}</dd>
+                </div>
+            </dl>
+            {% if server.notes %}
+            <h5>{% trans "Notes" %}</h5>
+            <div class="box content has-background-white-ter is-shadowless">
+                {{ server.notes }}
+            </div>
+            {% endif %}
+
+            <p>
+                <a href="{% url 'settings-federated-server' server.id %}">{% trans "View instance" %}</a>
+            </p>
+            {% else %}
+            <em>{% trans "Not set" %}</em>
+            {% endif %}
+        </div>
+    </div>
+    {% endwith %}
+    {% endif %}
+</div>
+
diff --git a/bookwyrm/templates/user_admin/user_moderation_actions.html b/bookwyrm/templates/user_admin/user_moderation_actions.html
new file mode 100644
index 00000000..41010994
--- /dev/null
+++ b/bookwyrm/templates/user_admin/user_moderation_actions.html
@@ -0,0 +1,17 @@
+{% load i18n %}
+<div class="block content">
+    <h3>{% trans "Actions" %}</h3>
+    <div class="is-flex">
+        <p class="mr-1">
+            <a class="button" href="{% url 'direct-messages-user' user.username %}">{% trans "Send direct message" %}</a>
+        </p>
+        <form name="deactivate" method="post" action="{% url 'settings-report-deactivate' report.id  %}">
+            {% csrf_token %}
+            {% if user.is_active %}
+            <button type="submit" class="button is-danger is-light">{% trans "Deactivate user" %}</button>
+            {% else %}
+            <button class="button">{% trans "Reactivate user" %}</button>
+            {% endif %}
+        </form>
+    </div>
+</div>

From 1542866b6c9e07393ca03067c27475a807155f90 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 19 Apr 2021 15:40:51 -0700
Subject: [PATCH 0853/1285] Adds user admin view

---
 bookwyrm/templates/user_admin/user.html          |  2 +-
 bookwyrm/templates/user_admin/user_admin.html    |  2 +-
 .../user_admin/user_moderation_actions.html      |  2 +-
 bookwyrm/urls.py                                 | 13 ++++++++++---
 bookwyrm/views/__init__.py                       |  2 +-
 bookwyrm/views/user_admin.py                     | 16 +++++++++++++++-
 6 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/bookwyrm/templates/user_admin/user.html b/bookwyrm/templates/user_admin/user.html
index 7bb6abfa..a33c7110 100644
--- a/bookwyrm/templates/user_admin/user.html
+++ b/bookwyrm/templates/user_admin/user.html
@@ -8,7 +8,7 @@
 
 {% block panel %}
 <div class="block">
-    <a href="{% url 'settings-reports' %}">{% trans "Back to reports" %}</a>
+    <a href="{% url 'settings-users' %}">{% trans "Back to users" %}</a>
 </div>
 
 {% include 'user_admin/user_info.html' with user=user %}
diff --git a/bookwyrm/templates/user_admin/user_admin.html b/bookwyrm/templates/user_admin/user_admin.html
index 554fbdd3..2ab526a9 100644
--- a/bookwyrm/templates/user_admin/user_admin.html
+++ b/bookwyrm/templates/user_admin/user_admin.html
@@ -41,7 +41,7 @@
     </tr>
     {% for user in users %}
     <tr>
-        <td>{{ user.username }}</td>
+        <td><a href="{% url 'settings-user' user.id %}">{{ user.username }}</a></td>
         <td>{{ user.created_date }}</td>
         <td>{{ user.last_active_date }}</td>
         <td>{% if user.is_active %}{% trans "Active" %}{% else %}{% trans "Inactive" %}{% endif %}</td>
diff --git a/bookwyrm/templates/user_admin/user_moderation_actions.html b/bookwyrm/templates/user_admin/user_moderation_actions.html
index 41010994..043ef386 100644
--- a/bookwyrm/templates/user_admin/user_moderation_actions.html
+++ b/bookwyrm/templates/user_admin/user_moderation_actions.html
@@ -5,7 +5,7 @@
         <p class="mr-1">
             <a class="button" href="{% url 'direct-messages-user' user.username %}">{% trans "Send direct message" %}</a>
         </p>
-        <form name="deactivate" method="post" action="{% url 'settings-report-deactivate' report.id  %}">
+        <form name="deactivate" method="post" action="">
             {% csrf_token %}
             {% if user.is_active %}
             <button type="submit" class="button is-danger is-light">{% trans "Deactivate user" %}</button>
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 9e280f3e..5768ee01 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -51,13 +51,20 @@ urlpatterns = [
         r"^password-reset/(?P<code>[A-Za-z0-9]+)/?$", views.PasswordReset.as_view()
     ),
     # admin
-    re_path(r"^settings/site-settings", views.Site.as_view(), name="settings-site"),
+    re_path(r"^settings/site-settings/?$", views.Site.as_view(), name="settings-site"),
     re_path(
-        r"^settings/email-preview",
+        r"^settings/email-preview/?$",
         views.site.email_preview,
         name="settings-email-preview",
     ),
-    re_path(r"^settings/users", views.UserAdmin.as_view(), name="settings-users"),
+    re_path(
+        r"^settings/users/?$", views.UserAdminList.as_view(), name="settings-users"
+    ),
+    re_path(
+        r"^settings/users/(?P<user>\d+)/?$",
+        views.UserAdmin.as_view(),
+        name="settings-user"
+    ),
     re_path(
         r"^settings/federation/?$",
         views.Federation.as_view(),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 9f8463b4..7714bbda 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -37,5 +37,5 @@ from .status import CreateStatus, DeleteStatus, DeleteAndRedraft
 from .tag import Tag, AddTag, RemoveTag
 from .updates import get_notification_count, get_unread_status_count
 from .user import User, EditUser, Followers, Following
-from .user_admin import UserAdmin
+from .user_admin import UserAdmin, UserAdminList
 from .wellknown import *
diff --git a/bookwyrm/views/user_admin.py b/bookwyrm/views/user_admin.py
index 8b4704d0..895c1464 100644
--- a/bookwyrm/views/user_admin.py
+++ b/bookwyrm/views/user_admin.py
@@ -1,6 +1,7 @@
 """ manage user """
 from django.contrib.auth.decorators import login_required, permission_required
 from django.core.paginator import Paginator
+from django.shortcuts import get_object_or_404
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
@@ -15,7 +16,7 @@ from bookwyrm.settings import PAGE_LENGTH
     permission_required("bookwyrm.moderate_users", raise_exception=True),
     name="dispatch",
 )
-class UserAdmin(View):
+class UserAdminList(View):
     """ admin view of users on this server """
 
     def get(self, request):
@@ -55,3 +56,16 @@ class UserAdmin(View):
             "server": server,
         }
         return TemplateResponse(request, "user_admin/user_admin.html", data)
+
+@method_decorator(login_required, name="dispatch")
+@method_decorator(
+    permission_required("bookwyrm.moderate_users", raise_exception=True),
+    name="dispatch",
+)
+class UserAdmin(View):
+    """ moderate an individual user """
+
+    def get(self, request, user):
+        """ user view """
+        user = get_object_or_404(models.User, id=user)
+        return TemplateResponse(request, "user_admin/user.html", {"user": user})

From da19089d34ffb374b8c09a0f2c0917e722aa7dbe Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 19 Apr 2021 15:51:39 -0700
Subject: [PATCH 0854/1285] Changes language from "deactivate" to "suspend"

---
 .../templates/user_admin/user_moderation_actions.html |  6 +++---
 bookwyrm/urls.py                                      |  8 ++++----
 bookwyrm/views/__init__.py                            |  2 +-
 bookwyrm/views/reports.py                             | 11 ++++++-----
 bookwyrm/views/user_admin.py                          |  1 +
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/bookwyrm/templates/user_admin/user_moderation_actions.html b/bookwyrm/templates/user_admin/user_moderation_actions.html
index 043ef386..311cbb4b 100644
--- a/bookwyrm/templates/user_admin/user_moderation_actions.html
+++ b/bookwyrm/templates/user_admin/user_moderation_actions.html
@@ -5,12 +5,12 @@
         <p class="mr-1">
             <a class="button" href="{% url 'direct-messages-user' user.username %}">{% trans "Send direct message" %}</a>
         </p>
-        <form name="deactivate" method="post" action="">
+        <form name="suspend" method="post" action="{% url 'settings-report-suspend' user.id  %}">
             {% csrf_token %}
             {% if user.is_active %}
-            <button type="submit" class="button is-danger is-light">{% trans "Deactivate user" %}</button>
+            <button type="submit" class="button is-danger is-light">{% trans "Suspend user" %}</button>
             {% else %}
-            <button class="button">{% trans "Reactivate user" %}</button>
+            <button class="button">{% trans "Un-suspend user" %}</button>
             {% endif %}
         </form>
     </div>
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 5768ee01..8c5266a6 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -63,7 +63,7 @@ urlpatterns = [
     re_path(
         r"^settings/users/(?P<user>\d+)/?$",
         views.UserAdmin.as_view(),
-        name="settings-user"
+        name="settings-user",
     ),
     re_path(
         r"^settings/federation/?$",
@@ -120,9 +120,9 @@ urlpatterns = [
         name="settings-report",
     ),
     re_path(
-        r"^settings/reports/(?P<report_id>\d+)/deactivate/?$",
-        views.deactivate_user,
-        name="settings-report-deactivate",
+        r"^settings/reports/(?P<user_id>\d+)/suspend/?$",
+        views.suspend_user,
+        name="settings-report-suspend",
     ),
     re_path(
         r"^settings/reports/(?P<report_id>\d+)/resolve/?$",
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 7714bbda..c0f35ba8 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -25,7 +25,7 @@ from .notifications import Notifications
 from .outbox import Outbox
 from .reading import edit_readthrough, create_readthrough, delete_readthrough
 from .reading import start_reading, finish_reading, delete_progressupdate
-from .reports import Report, Reports, make_report, resolve_report, deactivate_user
+from .reports import Report, Reports, make_report, resolve_report, suspend_user
 from .rss_feed import RssFeed
 from .password import PasswordResetRequest, PasswordReset, ChangePassword
 from .search import Search
diff --git a/bookwyrm/views/reports.py b/bookwyrm/views/reports.py
index 3dd53cb9..07eb9b97 100644
--- a/bookwyrm/views/reports.py
+++ b/bookwyrm/views/reports.py
@@ -74,12 +74,13 @@ class Report(View):
 
 @login_required
 @permission_required("bookwyrm_moderate_user")
-def deactivate_user(_, report_id):
+def suspend_user(_, user_id):
     """ mark an account as inactive """
-    report = get_object_or_404(models.Report, id=report_id)
-    report.user.is_active = not report.user.is_active
-    report.user.save()
-    return redirect("settings-report", report.id)
+    user = get_object_or_404(models.User, id=user_id)
+    user.is_active = not user.is_active
+    # this isn't a full deletion, so we don't want to tell the world
+    user.save(broadcast=False)
+    return redirect("settings-user", user.id)
 
 
 @login_required
diff --git a/bookwyrm/views/user_admin.py b/bookwyrm/views/user_admin.py
index 895c1464..0aea74ed 100644
--- a/bookwyrm/views/user_admin.py
+++ b/bookwyrm/views/user_admin.py
@@ -57,6 +57,7 @@ class UserAdminList(View):
         }
         return TemplateResponse(request, "user_admin/user_admin.html", data)
 
+
 @method_decorator(login_required, name="dispatch")
 @method_decorator(
     permission_required("bookwyrm.moderate_users", raise_exception=True),

From 35cb3fa8fce6644a7653edc43e980bffeb71df69 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 19 Apr 2021 16:08:01 -0700
Subject: [PATCH 0855/1285] Updates tests

---
 bookwyrm/templates/user_admin/user.html |  4 ++--
 bookwyrm/tests/views/test_reports.py    | 10 +++-------
 bookwyrm/tests/views/test_user_admin.py | 15 +++++++++++++--
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/bookwyrm/templates/user_admin/user.html b/bookwyrm/templates/user_admin/user.html
index a33c7110..46390650 100644
--- a/bookwyrm/templates/user_admin/user.html
+++ b/bookwyrm/templates/user_admin/user.html
@@ -3,8 +3,8 @@
 {% load bookwyrm_tags %}
 {% load humanize %}
 
-{% block title %}{{ username }}{% endblock %}
-{% block header %}{{ username }}{% endblock %}
+{% block title %}{{ user.username }}{% endblock %}
+{% block header %}{{ user.username }}{% endblock %}
 
 {% block panel %}
 <div class="block">
diff --git a/bookwyrm/tests/views/test_reports.py b/bookwyrm/tests/views/test_reports.py
index 1c56067a..55f81570 100644
--- a/bookwyrm/tests/views/test_reports.py
+++ b/bookwyrm/tests/views/test_reports.py
@@ -1,5 +1,4 @@
 """ test for app action functionality """
-from unittest.mock import patch
 from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
@@ -115,22 +114,19 @@ class ReportViews(TestCase):
         report.refresh_from_db()
         self.assertFalse(report.resolved)
 
-    def test_deactivate_user(self):
+    def test_suspend_user(self):
         """ toggle whether a user is able to log in """
         self.assertTrue(self.rat.is_active)
-        report = models.Report.objects.create(reporter=self.local_user, user=self.rat)
         request = self.factory.post("")
         request.user = self.local_user
         request.user.is_superuser = True
 
         # de-activate
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            views.deactivate_user(request, report.id)
+        views.suspend_user(request, self.local_user.id)
         self.rat.refresh_from_db()
         self.assertFalse(self.rat.is_active)
 
         # re-activate
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            views.deactivate_user(request, report.id)
+        views.suspend_user(request, self.local_user.id)
         self.rat.refresh_from_db()
         self.assertTrue(self.rat.is_active)
diff --git a/bookwyrm/tests/views/test_user_admin.py b/bookwyrm/tests/views/test_user_admin.py
index dd20c1b6..4bb83812 100644
--- a/bookwyrm/tests/views/test_user_admin.py
+++ b/bookwyrm/tests/views/test_user_admin.py
@@ -21,9 +21,9 @@ class UserAdminViews(TestCase):
         )
         models.SiteSettings.objects.create()
 
-    def test_user_admin_page(self):
+    def test_user_admin_list_page(self):
         """ there are so many views, this just makes sure it LOADS """
-        view = views.UserAdmin.as_view()
+        view = views.UserAdminList.as_view()
         request = self.factory.get("")
         request.user = self.local_user
         request.user.is_superuser = True
@@ -31,3 +31,14 @@ class UserAdminViews(TestCase):
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
+
+    def test_user_admin_page(self):
+        """ there are so many views, this just makes sure it LOADS """
+        view = views.UserAdmin.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+        request.user.is_superuser = True
+        result = view(request, self.local_user)
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)

From 70a819951ef922c97d4a3f23ff8e970404e07b44 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 19 Apr 2021 16:18:29 -0700
Subject: [PATCH 0856/1285] Fixes localization weirdness with dates

---
 bookwyrm/templates/book/publisher_info.html   |  2 +-
 .../snippets/status/status_body.html          |  2 +-
 bookwyrm/templatetags/bookwyrm_tags.py        | 22 -------------------
 3 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/bookwyrm/templates/book/publisher_info.html b/bookwyrm/templates/book/publisher_info.html
index a16332c5..ca9265c5 100644
--- a/bookwyrm/templates/book/publisher_info.html
+++ b/bookwyrm/templates/book/publisher_info.html
@@ -39,7 +39,7 @@
 {% endif %}
 
 <p>
-    {% with date=book.published_date|date:'M jS Y' publisher=book.publishers|join:', ' %}
+    {% with date=book.published_date|date:'M j Y' publisher=book.publishers|join:', ' %}
         {% if date or book.first_published_date %}
             <meta
                 itemprop="datePublished"
diff --git a/bookwyrm/templates/snippets/status/status_body.html b/bookwyrm/templates/snippets/status/status_body.html
index ffa71d5e..0eff4ea9 100644
--- a/bookwyrm/templates/snippets/status/status_body.html
+++ b/bookwyrm/templates/snippets/status/status_body.html
@@ -65,7 +65,7 @@
 </div>
 
 <div class="card-footer-item">
-    <a href="{{ status.remote_id }}">{{ status.published_date | post_date }}</a>
+    <a href="{{ status.remote_id }}">{{ status.published_date|timesince }}</a>
 </div>
 {% if not moderation_mode %}
 <div class="card-footer-item">
diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index 775c6190..33cf35c9 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -133,28 +133,6 @@ def get_uuid(identifier):
     return "%s%s" % (identifier, uuid4())
 
 
-@register.filter(name="post_date")
-def time_since(date):
-    """ concise time ago function """
-    if not isinstance(date, datetime):
-        return ""
-    now = timezone.now()
-
-    if date < (now - relativedelta(weeks=1)):
-        formatter = "%b %-d"
-        if date.year != now.year:
-            formatter += " %Y"
-        return date.strftime(formatter)
-    delta = relativedelta(now, date)
-    if delta.days:
-        return "%dd" % delta.days
-    if delta.hours:
-        return "%dh" % delta.hours
-    if delta.minutes:
-        return "%dm" % delta.minutes
-    return "%ds" % delta.seconds
-
-
 @register.filter(name="to_markdown")
 def get_markdown(content):
     """ convert markdown to html """

From 6a50c021ce62361f87a402b39f8aaeec31606fd8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 19 Apr 2021 16:30:15 -0700
Subject: [PATCH 0857/1285] Try naturalday for published date

---
 bookwyrm/templates/book/publisher_info.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/book/publisher_info.html b/bookwyrm/templates/book/publisher_info.html
index ca9265c5..b7975a62 100644
--- a/bookwyrm/templates/book/publisher_info.html
+++ b/bookwyrm/templates/book/publisher_info.html
@@ -1,6 +1,7 @@
 {% spaceless %}
 
 {% load i18n %}
+{% load humanize %}
 
 <p>
     {% with format=book.physical_format pages=book.pages %}
@@ -39,7 +40,7 @@
 {% endif %}
 
 <p>
-    {% with date=book.published_date|date:'M j Y' publisher=book.publishers|join:', ' %}
+    {% with date=book.published_date|naturalday publisher=book.publishers|join:', ' %}
         {% if date or book.first_published_date %}
             <meta
                 itemprop="datePublished"

From 11aa8baa5352d6610c470c20c55fca0af7010b50 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 19 Apr 2021 16:33:28 -0700
Subject: [PATCH 0858/1285] Fixes tests and notifications page

---
 bookwyrm/templates/notifications.html |  2 +-
 bookwyrm/tests/test_templatetags.py   | 30 ---------------------------
 2 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html
index 7c694d78..ba0a25cd 100644
--- a/bookwyrm/templates/notifications.html
+++ b/bookwyrm/templates/notifications.html
@@ -123,7 +123,7 @@
                                 {% include 'snippets/status_preview.html' with status=related_status %}
                             </div>
                             <div class="column is-narrow {% if notification.notification_type == 'REPLY' or notification.notification_type == 'MENTION' %}has-text-black{% else %}has-text-grey-dark{% endif %}">
-                                {{ related_status.published_date | post_date }}
+                                {{ related_status.published_date|timesince }}
                                 {% include 'snippets/privacy-icons.html' with item=related_status %}
                             </div>
                         </div>
diff --git a/bookwyrm/tests/test_templatetags.py b/bookwyrm/tests/test_templatetags.py
index b4dc517f..2fadb978 100644
--- a/bookwyrm/tests/test_templatetags.py
+++ b/bookwyrm/tests/test_templatetags.py
@@ -181,36 +181,6 @@ class TemplateTags(TestCase):
         uuid = bookwyrm_tags.get_uuid("hi")
         self.assertTrue(re.match(r"hi[A-Za-z0-9\-]", uuid))
 
-    def test_time_since(self, _):
-        """ ultraconcise timestamps """
-        self.assertEqual(bookwyrm_tags.time_since("bleh"), "")
-
-        now = timezone.now()
-        self.assertEqual(bookwyrm_tags.time_since(now), "0s")
-
-        seconds_ago = now - relativedelta(seconds=4)
-        self.assertEqual(bookwyrm_tags.time_since(seconds_ago), "4s")
-
-        minutes_ago = now - relativedelta(minutes=8)
-        self.assertEqual(bookwyrm_tags.time_since(minutes_ago), "8m")
-
-        hours_ago = now - relativedelta(hours=9)
-        self.assertEqual(bookwyrm_tags.time_since(hours_ago), "9h")
-
-        days_ago = now - relativedelta(days=3)
-        self.assertEqual(bookwyrm_tags.time_since(days_ago), "3d")
-
-        # I am not going to figure out how to mock dates tonight.
-        months_ago = now - relativedelta(months=5)
-        self.assertTrue(
-            re.match(r"[A-Z][a-z]{2} \d?\d", bookwyrm_tags.time_since(months_ago))
-        )
-
-        years_ago = now - relativedelta(years=10)
-        self.assertTrue(
-            re.match(r"[A-Z][a-z]{2} \d?\d \d{4}", bookwyrm_tags.time_since(years_ago))
-        )
-
     def test_get_markdown(self, _):
         """ mardown format data """
         result = bookwyrm_tags.get_markdown("_hi_")

From e1d24577d458ad883cac49ee4543537eae5971e9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 19 Apr 2021 16:42:51 -0700
Subject: [PATCH 0859/1285] Fixes tests (again)

---
 bookwyrm/tests/views/test_reports.py    | 4 ++--
 bookwyrm/tests/views/test_user_admin.py | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/tests/views/test_reports.py b/bookwyrm/tests/views/test_reports.py
index 55f81570..bce19993 100644
--- a/bookwyrm/tests/views/test_reports.py
+++ b/bookwyrm/tests/views/test_reports.py
@@ -122,11 +122,11 @@ class ReportViews(TestCase):
         request.user.is_superuser = True
 
         # de-activate
-        views.suspend_user(request, self.local_user.id)
+        views.suspend_user(request, self.rat.id)
         self.rat.refresh_from_db()
         self.assertFalse(self.rat.is_active)
 
         # re-activate
-        views.suspend_user(request, self.local_user.id)
+        views.suspend_user(request, self.rat.id)
         self.rat.refresh_from_db()
         self.assertTrue(self.rat.is_active)
diff --git a/bookwyrm/tests/views/test_user_admin.py b/bookwyrm/tests/views/test_user_admin.py
index 4bb83812..1884d000 100644
--- a/bookwyrm/tests/views/test_user_admin.py
+++ b/bookwyrm/tests/views/test_user_admin.py
@@ -38,7 +38,9 @@ class UserAdminViews(TestCase):
         request = self.factory.get("")
         request.user = self.local_user
         request.user.is_superuser = True
-        result = view(request, self.local_user)
+
+        result = view(request, self.local_user.id)
+
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)

From 0a37b4665ca19f8bf9d722e51e1c9a4559e5bb3f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 19 Apr 2021 17:16:14 -0700
Subject: [PATCH 0860/1285] Adds control for moderator to set user group

---
 bookwyrm/forms.py                             |  5 ++++
 .../user_admin/user_moderation_actions.html   | 25 +++++++++++++++++++
 bookwyrm/views/user_admin.py                  | 14 +++++++++--
 3 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 80b28310..ac5bd027 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -149,6 +149,11 @@ class LimitedEditUserForm(CustomForm):
         ]
         help_texts = {f: None for f in fields}
 
+class UserGroupForm(CustomForm):
+    class Meta:
+        model = models.User
+        fields = ["groups"]
+
 
 class TagForm(CustomForm):
     class Meta:
diff --git a/bookwyrm/templates/user_admin/user_moderation_actions.html b/bookwyrm/templates/user_admin/user_moderation_actions.html
index 311cbb4b..816e787a 100644
--- a/bookwyrm/templates/user_admin/user_moderation_actions.html
+++ b/bookwyrm/templates/user_admin/user_moderation_actions.html
@@ -14,4 +14,29 @@
             {% endif %}
         </form>
     </div>
+    {% if user.local %}
+    <div>
+        <form name="permission" method="post" action="{% url 'settings-user' user.id %}">
+            {% csrf_token %}
+            <label class="label" for="id_user_group">{% trans "Access level:" %}</label>
+            {% if group_form.non_field_errors %}
+            {{ group_form.non_field_errors }}
+            {% endif %}
+            {% with group=user.groups.first %}
+            <div class="select">
+                <select name="groups" id="id_user_group">
+                    {% for value, name in group_form.fields.groups.choices %}
+                    <option value="{{ value }}" {% if name == group.name %}selected{% endif %}>{{ name|title }}</option>
+                    {% endfor %}
+                    <option value="" {% if not group %}selected{% endif %}>User</option>
+                </select>
+            </div>
+            {% for error in group_form.groups.errors %}
+            <p class="help is-danger">{{ error | escape }}</p>
+            {% endfor %}
+            {% endwith %}
+            <button class="button">{% trans "Save" %}</button>
+        </form>
+    </div>
+    {% endif %}
 </div>
diff --git a/bookwyrm/views/user_admin.py b/bookwyrm/views/user_admin.py
index 0aea74ed..3ea7016a 100644
--- a/bookwyrm/views/user_admin.py
+++ b/bookwyrm/views/user_admin.py
@@ -6,7 +6,7 @@ from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
 
-from bookwyrm import models
+from bookwyrm import forms, models
 from bookwyrm.settings import PAGE_LENGTH
 
 
@@ -69,4 +69,14 @@ class UserAdmin(View):
     def get(self, request, user):
         """ user view """
         user = get_object_or_404(models.User, id=user)
-        return TemplateResponse(request, "user_admin/user.html", {"user": user})
+        data = {"user": user, "group_form": forms.UserGroupForm()}
+        return TemplateResponse(request, "user_admin/user.html", data)
+
+    def post(self, request, user):
+        """ update user group """
+        user = get_object_or_404(models.User, id=user)
+        form = forms.UserGroupForm(request.POST, instance=user)
+        if form.is_valid():
+            form.save()
+        data = {"user": user, "group_form": form}
+        return TemplateResponse(request, "user_admin/user.html", data)

From 63509c954da2192058abb2cfcb88f9009fcbc9fc Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 19 Apr 2021 18:12:55 -0700
Subject: [PATCH 0861/1285] Adds test for changing user group

---
 bookwyrm/forms.py                       |  1 +
 bookwyrm/tests/views/test_user_admin.py | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index ac5bd027..1f1f1a3b 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -149,6 +149,7 @@ class LimitedEditUserForm(CustomForm):
         ]
         help_texts = {f: None for f in fields}
 
+
 class UserGroupForm(CustomForm):
     class Meta:
         model = models.User
diff --git a/bookwyrm/tests/views/test_user_admin.py b/bookwyrm/tests/views/test_user_admin.py
index 1884d000..4e1e106d 100644
--- a/bookwyrm/tests/views/test_user_admin.py
+++ b/bookwyrm/tests/views/test_user_admin.py
@@ -1,4 +1,5 @@
 """ test for app action functionality """
+from django.contrib.auth.models import Group
 from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
@@ -44,3 +45,24 @@ class UserAdminViews(TestCase):
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
+
+    def test_user_admin_page_post(self):
+        """ set the user's group """
+        group = Group.objects.create(name="editor")
+        self.assertEqual(
+            list(self.local_user.groups.values_list("name", flat=True)), []
+        )
+
+        view = views.UserAdmin.as_view()
+        request = self.factory.post("", {"groups": [group.id]})
+        request.user = self.local_user
+        request.user.is_superuser = True
+
+        result = view(request, self.local_user.id)
+
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+
+        self.assertEqual(
+            list(self.local_user.groups.values_list("name", flat=True)), ["editor"]
+        )

From 2c013b677bb8a947840f1a7de38803cff1badcc1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 19 Apr 2021 20:01:29 -0700
Subject: [PATCH 0862/1285] Patch broadcast in test

---
 bookwyrm/tests/views/test_user_admin.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/tests/views/test_user_admin.py b/bookwyrm/tests/views/test_user_admin.py
index 4e1e106d..b1e9d639 100644
--- a/bookwyrm/tests/views/test_user_admin.py
+++ b/bookwyrm/tests/views/test_user_admin.py
@@ -1,4 +1,5 @@
 """ test for app action functionality """
+from unittest.mock import patch
 from django.contrib.auth.models import Group
 from django.template.response import TemplateResponse
 from django.test import TestCase
@@ -58,7 +59,8 @@ class UserAdminViews(TestCase):
         request.user = self.local_user
         request.user.is_superuser = True
 
-        result = view(request, self.local_user.id)
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            result = view(request, self.local_user.id)
 
         self.assertIsInstance(result, TemplateResponse)
         result.render()

From 978760475f5140f61f8f3dd7c3a7a0b454fa412c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 20 Apr 2021 09:54:02 -0700
Subject: [PATCH 0863/1285] More compact display of statuses

---
 .../snippets/status/book_preview.html         |  14 --
 .../snippets/status/content_status.html       | 126 ++++++++++++++++
 .../snippets/status/generated_status.html     |  43 ++++++
 .../templates/snippets/status/layout.html     |  86 +++++++++++
 .../snippets/status/status_body.html          |  89 +-----------
 .../snippets/status/status_content.html       | 137 ------------------
 6 files changed, 261 insertions(+), 234 deletions(-)
 delete mode 100644 bookwyrm/templates/snippets/status/book_preview.html
 create mode 100644 bookwyrm/templates/snippets/status/content_status.html
 create mode 100644 bookwyrm/templates/snippets/status/generated_status.html
 create mode 100644 bookwyrm/templates/snippets/status/layout.html
 delete mode 100644 bookwyrm/templates/snippets/status/status_content.html

diff --git a/bookwyrm/templates/snippets/status/book_preview.html b/bookwyrm/templates/snippets/status/book_preview.html
deleted file mode 100644
index 920b9f53..00000000
--- a/bookwyrm/templates/snippets/status/book_preview.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% load bookwyrm_tags %}
-<div class="columns">
-    <div class="column is-narrow">
-        <div>
-            <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book %}</a>
-            {% include 'snippets/stars.html' with rating=book|rating:request.user %}
-            {% include 'snippets/shelve_button/shelve_button.html' with book=book %}
-        </div>
-    </div>
-    <div class="column">
-        <h3 class="title is-6">{% include 'snippets/book_titleby.html' with book=book %}</h3>
-        {% include 'snippets/trimmed_text.html' with full=book|book_description %}
-    </div>
-</div>
diff --git a/bookwyrm/templates/snippets/status/content_status.html b/bookwyrm/templates/snippets/status/content_status.html
new file mode 100644
index 00000000..05662098
--- /dev/null
+++ b/bookwyrm/templates/snippets/status/content_status.html
@@ -0,0 +1,126 @@
+{% spaceless %}
+
+{% load bookwyrm_tags %}
+{% load i18n %}
+
+{% with status_type=status.status_type %}
+<div
+    class="block"
+    {% firstof "reviewBody" as body_prop %}
+    {% firstof 'itemprop="reviewRating" itemscope itemtype="https://schema.org/Rating"' as rating_type %}
+
+    itemprop="rating"
+    itemtype="https://schema.org/Rating"
+>
+
+    <div class="columns">
+    {% if not hide_book %}
+    {% with book=status.book|default:status.mention_books.first %}
+    <div class="column is-narrow">
+        <div>
+            <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book %}</a>
+            {% include 'snippets/stars.html' with rating=book|rating:request.user %}
+            {% include 'snippets/shelve_button/shelve_button.html' with book=book %}
+        </div>
+    </div>
+    {% endwith %}
+    {% endif %}
+
+    <article class="column">
+        {% if status_type == 'Review' %}
+        <header class="mb-2">
+            <h3
+                class="title is-5 has-subtitle"
+                dir="auto"
+                itemprop="name"
+            >
+                {{ status.name|escape }}
+            </h3>
+
+            <h4 class="subtitle is-6">
+                <span
+                    class="is-hidden"
+                    {{ rating_type }}
+                >
+                    <meta itemprop="ratingValue" content="{{ status.rating|floatformat }}">
+
+                    {# @todo Is it possible to not hard-code the value? #}
+                    <meta itemprop="bestRating" content="5">
+                </span>
+                {% include 'snippets/stars.html' with rating=status.rating %}
+            </h4>
+        </header>
+        {% endif %}
+
+        {% if status.content_warning %}
+            <div>
+                <p>{{ status.content_warning }}</p>
+
+                {% trans "Show more" as button_text %}
+
+                {% with text=button_text class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
+                    {% include 'snippets/toggle/open_button.html' %}
+                {% endwith %}
+            </div>
+        {% endif %}
+
+        <div
+            {% if status.content_warning %}
+                id="show-status-cw-{{ status.id }}"
+                class="is-hidden"
+            {% endif %}
+        >
+            {% if status.content_warning %}
+                {% trans "Show less" as button_text %}
+
+                {% with text=button_text class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
+                    {% include 'snippets/toggle/close_button.html' %}
+                {% endwith %}
+            {% endif %}
+
+            {% if status.quote %}
+                <div class="quote block">
+                    <blockquote dir="auto" class="content mb-2">{{ status.quote | safe }}</blockquote>
+
+                    <p> &mdash; {% include 'snippets/book_titleby.html' with book=status.book %}</p>
+                </div>
+            {% endif %}
+
+            {% if status.content and status_type != 'GeneratedNote' and status_type != 'Announce' %}
+                {% with full=status.content|safe no_trim=status.content_warning itemprop=body_prop %}
+                    {% include 'snippets/trimmed_text.html' %}
+                {% endwith %}
+            {% endif %}
+
+            {% if status.attachments.exists %}
+                <div class="block">
+                    <div class="columns">
+                        {% for attachment in status.attachments.all %}
+                            <div class="column is-narrow">
+                                <figure class="image is-128x128">
+                                    <a
+                                        href="/images/{{ attachment.image }}"
+                                        target="_blank"
+                                        aria-label="{% trans 'Open image in new window' %}"
+                                    >
+                                        <img
+                                            src="/images/{{ attachment.image }}"
+
+                                            {% if attachment.caption %}
+                                                alt="{{ attachment.caption }}"
+                                                title="{{ attachment.caption }}"
+                                            {% endif %}
+                                        >
+                                    </a>
+                                </figure>
+                            </div>
+                        {% endfor %}
+                    </div>
+                </div>
+            {% endif %}
+        </div>
+    </article>
+</div>
+
+{% endwith %}
+{% endspaceless %}
diff --git a/bookwyrm/templates/snippets/status/generated_status.html b/bookwyrm/templates/snippets/status/generated_status.html
new file mode 100644
index 00000000..f4186cd1
--- /dev/null
+++ b/bookwyrm/templates/snippets/status/generated_status.html
@@ -0,0 +1,43 @@
+{% spaceless %}
+
+{% load bookwyrm_tags %}
+{% load i18n %}
+
+{% if status_type == 'Rating' %}
+<div
+    class="block"
+        {% firstof 'itemprop="reviewRating" itemscope itemtype="https://schema.org/Rating"' as rating_type %}
+        itemprop="rating"
+        itemtype="https://schema.org/Rating"
+>
+    <div>
+        <span class="is-sr-only" {{ rating_type }}>
+            <meta itemprop="ratingValue" content="{{ status.rating|floatformat }}">
+
+                {# @todo Is it possible to not hard-code the value? #}
+                <meta itemprop="bestRating" content="5">
+        </span>
+
+        {% include 'snippets/stars.html' with rating=status.rating %}
+    </div>
+</div>
+{% endif %}
+
+{% if not hide_book %}
+{% with book=status.book|default:status.mention_books.first %}
+<div class="columns">
+    <div class="column is-narrow">
+        <div>
+            <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book size="small" %}</a>
+        </div>
+    </div>
+    <div class="column">
+        <h3 class="title is-6 mb-1">{% include 'snippets/book_titleby.html' with book=book %}</h3>
+        <p>{{ book|book_description|default:""|truncatewords_html:20 }}</p>
+        {% include 'snippets/shelve_button/shelve_button.html' with book=book %}
+    </div>
+</div>
+{% endwith %}
+{% endif %}
+
+{% endspaceless %}
diff --git a/bookwyrm/templates/snippets/status/layout.html b/bookwyrm/templates/snippets/status/layout.html
new file mode 100644
index 00000000..5b6c0c78
--- /dev/null
+++ b/bookwyrm/templates/snippets/status/layout.html
@@ -0,0 +1,86 @@
+{% extends 'components/card.html' %}
+{% load i18n %}
+
+{% load bookwyrm_tags %}
+{% load humanize %}
+
+{% block card-header %}
+    <h3 class="card-header-title has-background-white-ter is-block">
+        {% include 'snippets/status/status_header.html' with status=status %}
+    </h3>
+{% endblock %}
+
+{% block card-content %}{% endblock %}
+
+{% block card-footer %}
+<div class="card-footer-item">
+    {% if moderation_mode and perms.bookwyrm.moderate_post %}
+
+    {# moderation options #}
+    <form class="dropdown-item pt-0 pb-0" name="delete-{{status.id}}" action="/delete-status/{{ status.id }}" method="post">
+        {% csrf_token %}
+        <button class="button is-danger is-light" type="submit">
+            {% trans "Delete status" %}
+        </button>
+    </form>
+    {% elif no_interact %}
+    {# nothing here #}
+    {% elif request.user.is_authenticated %}
+    <div class="field has-addons">
+        <div class="control">
+            {% trans "Reply" as button_text %}
+            {% include 'snippets/toggle/toggle_button.html' with controls_text="show-comment" controls_uid=status.id text=button_text icon="comment" class="is-small toggle-button" focus="id_content_reply" %}
+        </div>
+        <div class="control">
+            {% include 'snippets/boost_button.html' with status=status %}
+        </div>
+        <div class="control">
+            {% include 'snippets/fav_button.html' with status=status %}
+        </div>
+    </div>
+
+    {% else %}
+    <a href="/login">
+        <span class="icon icon-comment" title="{% trans 'Reply' %}">
+            <span class="is-sr-only">{% trans "Reply" %}</span>
+        </span>
+
+        <span class="icon icon-boost" title="{% trans 'Boost status' %}">
+            <span class="is-sr-only">{% trans "Boost status" %}</span>
+        </span>
+
+        <span class="icon icon-heart" title="{% trans 'Like status' %}">
+            <span class="is-sr-only">{% trans "Like status" %}</span>
+        </span>
+    </a>
+    {% endif %}
+</div>
+
+<div class="card-footer-item">
+    {% include 'snippets/privacy-icons.html' with item=status %}
+</div>
+
+<div class="card-footer-item">
+    <a href="{{ status.remote_id }}">{{ status.published_date | post_date }}</a>
+</div>
+{% if not moderation_mode %}
+<div class="card-footer-item">
+    {% include 'snippets/status/status_options.html' with class="is-small" right=True %}
+</div>
+{% endif %}
+{% endblock %}
+
+
+{% block card-bonus %}
+{% if request.user.is_authenticated and not moderation_mode %}
+{% with status.id|uuid as uuid %}
+<section class="is-hidden" id="show-comment-{{ status.id }}">
+    <div class="card-footer">
+        <div class="card-footer-item">
+            {% include 'snippets/create_status_form.html' with reply_parent=status type="reply" %}
+        </div>
+    </div>
+</section>
+{% endwith %}
+{% endif %}
+{% endblock %}
diff --git a/bookwyrm/templates/snippets/status/status_body.html b/bookwyrm/templates/snippets/status/status_body.html
index ffa71d5e..58d3fbf4 100644
--- a/bookwyrm/templates/snippets/status/status_body.html
+++ b/bookwyrm/templates/snippets/status/status_body.html
@@ -1,90 +1,13 @@
-{% extends 'components/card.html' %}
-{% load i18n %}
-
-{% load bookwyrm_tags %}
-{% load humanize %}
-
-{% block card-header %}
-    <h3 class="card-header-title has-background-white-ter is-block">
-        {% include 'snippets/status/status_header.html' with status=status %}
-    </h3>
-{% endblock %}
-
+{% extends 'snippets/status/layout.html' %}
 
 {% block card-content %}
-    {% include 'snippets/status/status_content.html' with status=status %}
-{% endblock %}
+{% with status_type=status.status_type %}
 
-
-{% block card-footer %}
-<div class="card-footer-item">
-    {% if moderation_mode and perms.bookwyrm.moderate_post %}
-
-    {# moderation options #}
-    <form class="dropdown-item pt-0 pb-0" name="delete-{{status.id}}" action="/delete-status/{{ status.id }}" method="post">
-        {% csrf_token %}
-        <button class="button is-danger is-light" type="submit">
-            {% trans "Delete status" %}
-        </button>
-    </form>
-    {% elif no_interact %}
-    {# nothing here #}
-    {% elif request.user.is_authenticated %}
-    <div class="field has-addons">
-        <div class="control">
-            {% trans "Reply" as button_text %}
-            {% include 'snippets/toggle/toggle_button.html' with controls_text="show-comment" controls_uid=status.id text=button_text icon="comment" class="is-small toggle-button" focus="id_content_reply" %}
-        </div>
-        <div class="control">
-            {% include 'snippets/boost_button.html' with status=status %}
-        </div>
-        <div class="control">
-            {% include 'snippets/fav_button.html' with status=status %}
-        </div>
-    </div>
-
-    {% else %}
-    <a href="/login">
-        <span class="icon icon-comment" title="{% trans 'Reply' %}">
-            <span class="is-sr-only">{% trans "Reply" %}</span>
-        </span>
-
-        <span class="icon icon-boost" title="{% trans 'Boost status' %}">
-            <span class="is-sr-only">{% trans "Boost status" %}</span>
-        </span>
-
-        <span class="icon icon-heart" title="{% trans 'Like status' %}">
-            <span class="is-sr-only">{% trans "Like status" %}</span>
-        </span>
-    </a>
-    {% endif %}
-</div>
-
-<div class="card-footer-item">
-    {% include 'snippets/privacy-icons.html' with item=status %}
-</div>
-
-<div class="card-footer-item">
-    <a href="{{ status.remote_id }}">{{ status.published_date | post_date }}</a>
-</div>
-{% if not moderation_mode %}
-<div class="card-footer-item">
-    {% include 'snippets/status/status_options.html' with class="is-small" right=True %}
-</div>
+{% if status_type == 'GeneratedNote' or status_type == 'Rating' %}
+    {% include 'snippets/status/generated_status.html' with status=status %}
+{% else %}
+    {% include 'snippets/status/content_status.html' with status=status %}
 {% endif %}
-{% endblock %}
 
-
-{% block card-bonus %}
-{% if request.user.is_authenticated and not moderation_mode %}
-{% with status.id|uuid as uuid %}
-<section class="is-hidden" id="show-comment-{{ status.id }}">
-    <div class="card-footer">
-        <div class="card-footer-item">
-            {% include 'snippets/create_status_form.html' with reply_parent=status type="reply" %}
-        </div>
-    </div>
-</section>
 {% endwith %}
-{% endif %}
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/status/status_content.html b/bookwyrm/templates/snippets/status/status_content.html
deleted file mode 100644
index 402c4aab..00000000
--- a/bookwyrm/templates/snippets/status/status_content.html
+++ /dev/null
@@ -1,137 +0,0 @@
-{% spaceless %}
-
-{% load bookwyrm_tags %}
-{% load i18n %}
-
-{% with status_type=status.status_type %}
-<div
-    class="block"
-
-    {% if status_type == 'Review' %}
-        {% firstof "reviewBody" as body_prop %}
-        {% firstof 'itemprop="reviewRating" itemscope itemtype="https://schema.org/Rating"' as rating_type %}
-    {% endif %}
-
-    {% if status_type == 'Rating' %}
-        itemprop="rating"
-        itemtype="https://schema.org/Rating"
-    {% endif %}
->
-    {% if status_type == 'Review' or status_type == 'Rating' %}
-        <div>
-            {% if status.name %}
-                <h3
-                    class="title is-5 has-subtitle"
-                    dir="auto"
-                    itemprop="name"
-                >
-                    {{ status.name|escape }}
-                </h3>
-            {% endif %}
-
-            <span
-                class="is-sr-only"
-                {{ rating_type }}
-            >
-                <meta itemprop="ratingValue" content="{{ status.rating|floatformat }}">
-
-                {% if status_type == 'Rating' %}
-                    {# @todo Is it possible to not hard-code the value? #}
-                    <meta itemprop="bestRating" content="5">
-                {% endif %}
-            </span>
-
-            {% include 'snippets/stars.html' with rating=status.rating %}
-        </div>
-    {% endif %}
-
-    {% if status.content_warning %}
-        <div>
-            <p>{{ status.content_warning }}</p>
-
-            {% trans "Show more" as button_text %}
-
-            {% with text=button_text class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
-                {% include 'snippets/toggle/open_button.html' %}
-            {% endwith %}
-        </div>
-    {% endif %}
-
-    <div
-        {% if status.content_warning %}
-            id="show-status-cw-{{ status.id }}"
-            class="is-hidden"
-        {% endif %}
-    >
-        {% if status.content_warning %}
-            {% trans "Show less" as button_text %}
-
-            {% with text=button_text class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
-                {% include 'snippets/toggle/close_button.html' %}
-            {% endwith %}
-        {% endif %}
-
-        {% if status.quote %}
-            <div class="quote block">
-                <blockquote dir="auto" class="content mb-2">{{ status.quote | safe }}</blockquote>
-
-                <p> &mdash; {% include 'snippets/book_titleby.html' with book=status.book %}</p>
-            </div>
-        {% endif %}
-
-        {% if status.content and status_type != 'GeneratedNote' and status_type != 'Announce' %}
-            {% with full=status.content|safe no_trim=status.content_warning itemprop=body_prop %}
-                {% include 'snippets/trimmed_text.html' %}
-            {% endwith %}
-        {% endif %}
-
-        {% if status.attachments.exists %}
-            <div class="block">
-                <div class="columns">
-                    {% for attachment in status.attachments.all %}
-                        <div class="column is-narrow">
-                            <figure class="image is-128x128">
-                                <a
-                                    href="/images/{{ attachment.image }}"
-                                    target="_blank"
-                                    aria-label="{% trans 'Open image in new window' %}"
-                                >
-                                    <img
-                                        src="/images/{{ attachment.image }}"
-
-                                        {% if attachment.caption %}
-                                            alt="{{ attachment.caption }}"
-                                            title="{{ attachment.caption }}"
-                                        {% endif %}
-                                    >
-                                </a>
-                            </figure>
-                        </div>
-                    {% endfor %}
-                </div>
-            </div>
-        {% endif %}
-    </div>
-</div>
-
-{% if not hide_book %}
-    {% if status.book or status.mention_books.count %}
-        <div
-            {% if status_type != 'GeneratedNote' %}
-                class="box has-background-white-bis"
-            {% endif %}
-        >
-            {% if status.book %}
-                {% with book=status.book %}
-                    {% include 'snippets/status/book_preview.html' %}
-                {% endwith %}
-            {% elif status.mention_books.count %}
-                {% with book=status.mention_books.first %}
-                    {% include 'snippets/status/book_preview.html' %}
-                {% endwith %}
-            {% endif %}
-        </div>
-    {% endif %}
-{% endif %}
-{% endwith %}
-{% endspaceless %}

From 07dbc4c6c042d9ce5b96106dd2f366d8c295d7a0 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 20 Apr 2021 09:56:01 -0700
Subject: [PATCH 0864/1285] Much longer "full" version of trimmed text

---
 bookwyrm/templates/snippets/trimmed_text.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/trimmed_text.html b/bookwyrm/templates/snippets/trimmed_text.html
index e1728b8f..31c72eca 100644
--- a/bookwyrm/templates/snippets/trimmed_text.html
+++ b/bookwyrm/templates/snippets/trimmed_text.html
@@ -5,7 +5,7 @@
 {% with 0|uuid as uuid %}
     {% if full %}
         {% with full|to_markdown|safe as full %}
-            {% with full|to_markdown|safe|truncatewords_html:60 as trimmed %}
+            {% with full|to_markdown|safe|truncatewords_html:150 as trimmed %}
                 {% if not no_trim and trimmed != full %}
                     <div id="hide-full-{{ uuid }}">
                         <div class="content" id="trimmed-{{ uuid }}">

From 9e5ebf9807b58b1eb4cd160e8071933fa0b7ea1b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 20 Apr 2021 11:06:14 -0700
Subject: [PATCH 0865/1285] Move stars into header for ratings

---
 bookwyrm/templates/snippets/stars.html        |   4 +-
 .../snippets/status/content_status.html       | 190 +++++++++---------
 .../snippets/status/generated_status.html     |  22 +-
 .../snippets/status/status_header.html        |  23 ++-
 4 files changed, 120 insertions(+), 119 deletions(-)

diff --git a/bookwyrm/templates/snippets/stars.html b/bookwyrm/templates/snippets/stars.html
index 2b40a9e3..ac049f25 100644
--- a/bookwyrm/templates/snippets/stars.html
+++ b/bookwyrm/templates/snippets/stars.html
@@ -1,7 +1,7 @@
 {% spaceless %}
 {% load i18n %}
 
-<p class="stars">
+<span class="stars">
     <span class="is-sr-only">
         {% if rating %}
             {% blocktranslate trimmed with rating=rating|floatformat count counter=rating|length %}
@@ -23,5 +23,5 @@
             aria-hidden="true"
         ></span>
     {% endfor %}
-</p>
+</span>
 {% endspaceless %}
diff --git a/bookwyrm/templates/snippets/status/content_status.html b/bookwyrm/templates/snippets/status/content_status.html
index 05662098..44c52c83 100644
--- a/bookwyrm/templates/snippets/status/content_status.html
+++ b/bookwyrm/templates/snippets/status/content_status.html
@@ -6,120 +6,122 @@
 {% with status_type=status.status_type %}
 <div
     class="block"
-    {% firstof "reviewBody" as body_prop %}
-    {% firstof 'itemprop="reviewRating" itemscope itemtype="https://schema.org/Rating"' as rating_type %}
-
-    itemprop="rating"
-    itemtype="https://schema.org/Rating"
+    {% if status_type == "Review" %}
+        itemprop="rating"
+        itemtype="https://schema.org/Rating"
+    {% endif %}
 >
 
     <div class="columns">
-    {% if not hide_book %}
-    {% with book=status.book|default:status.mention_books.first %}
-    <div class="column is-narrow">
-        <div>
+        {% if not hide_book %}
+        {% with book=status.book|default:status.mention_books.first %}
+        <div class="column is-narrow is-hidden-mobile">
             <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book %}</a>
             {% include 'snippets/stars.html' with rating=book|rating:request.user %}
             {% include 'snippets/shelve_button/shelve_button.html' with book=book %}
         </div>
-    </div>
-    {% endwith %}
-    {% endif %}
+        {% endwith %}
+        {% endif %}
 
-    <article class="column">
-        {% if status_type == 'Review' %}
-        <header class="mb-2">
-            <h3
-                class="title is-5 has-subtitle"
-                dir="auto"
-                itemprop="name"
-            >
-                {{ status.name|escape }}
-            </h3>
-
-            <h4 class="subtitle is-6">
-                <span
-                    class="is-hidden"
-                    {{ rating_type }}
+        <article class="column">
+            {% if status_type == 'Review' %}
+            <header class="mb-2">
+                <h3
+                    class="title is-5 has-subtitle"
+                    dir="auto"
+                    itemprop="name"
                 >
-                    <meta itemprop="ratingValue" content="{{ status.rating|floatformat }}">
+                    {{ status.name|escape }}
+                </h3>
 
-                    {# @todo Is it possible to not hard-code the value? #}
-                    <meta itemprop="bestRating" content="5">
-                </span>
-                {% include 'snippets/stars.html' with rating=status.rating %}
-            </h4>
-        </header>
-        {% endif %}
+                <h4 class="subtitle is-6">
+                    <span
+                        class="is-hidden"
+                        {% if status_type == "Review" %}
+                            itemprop="reviewRating"
+                            itemscope
+                            itemtype="https://schema.org/Rating"
+                        {% endif %}
+                    >
+                        <meta itemprop="ratingValue" content="{{ status.rating|floatformat }}">
 
-        {% if status.content_warning %}
-            <div>
-                <p>{{ status.content_warning }}</p>
-
-                {% trans "Show more" as button_text %}
-
-                {% with text=button_text class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
-                    {% include 'snippets/toggle/open_button.html' %}
-                {% endwith %}
-            </div>
-        {% endif %}
-
-        <div
-            {% if status.content_warning %}
-                id="show-status-cw-{{ status.id }}"
-                class="is-hidden"
-            {% endif %}
-        >
-            {% if status.content_warning %}
-                {% trans "Show less" as button_text %}
-
-                {% with text=button_text class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
-                    {% include 'snippets/toggle/close_button.html' %}
-                {% endwith %}
+                        {# @todo Is it possible to not hard-code the value? #}
+                        <meta itemprop="bestRating" content="5">
+                    </span>
+                    {% include 'snippets/stars.html' with rating=status.rating %}
+                </h4>
+            </header>
             {% endif %}
 
-            {% if status.quote %}
-                <div class="quote block">
-                    <blockquote dir="auto" class="content mb-2">{{ status.quote | safe }}</blockquote>
+            {% if status.content_warning %}
+                <div>
+                    <p>{{ status.content_warning }}</p>
 
-                    <p> &mdash; {% include 'snippets/book_titleby.html' with book=status.book %}</p>
+                    {% trans "Show more" as button_text %}
+
+                    {% with text=button_text class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
+                        {% include 'snippets/toggle/open_button.html' %}
+                    {% endwith %}
                 </div>
             {% endif %}
 
-            {% if status.content and status_type != 'GeneratedNote' and status_type != 'Announce' %}
-                {% with full=status.content|safe no_trim=status.content_warning itemprop=body_prop %}
-                    {% include 'snippets/trimmed_text.html' %}
-                {% endwith %}
-            {% endif %}
+            <div
+                {% if status.content_warning %}
+                    id="show-status-cw-{{ status.id }}"
+                    class="is-hidden"
+                {% endif %}
+            >
+                {% if status.content_warning %}
+                    {% trans "Show less" as button_text %}
 
-            {% if status.attachments.exists %}
-                <div class="block">
-                    <div class="columns">
-                        {% for attachment in status.attachments.all %}
-                            <div class="column is-narrow">
-                                <figure class="image is-128x128">
-                                    <a
-                                        href="/images/{{ attachment.image }}"
-                                        target="_blank"
-                                        aria-label="{% trans 'Open image in new window' %}"
-                                    >
-                                        <img
-                                            src="/images/{{ attachment.image }}"
+                    {% with text=button_text class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
+                        {% include 'snippets/toggle/close_button.html' %}
+                    {% endwith %}
+                {% endif %}
 
-                                            {% if attachment.caption %}
-                                                alt="{{ attachment.caption }}"
-                                                title="{{ attachment.caption }}"
-                                            {% endif %}
-                                        >
-                                    </a>
-                                </figure>
-                            </div>
-                        {% endfor %}
+                {% if status.quote %}
+                    <div class="quote block">
+                        <blockquote dir="auto" class="content mb-2">{{ status.quote | safe }}</blockquote>
+
+                        <p> &mdash; {% include 'snippets/book_titleby.html' with book=status.book %}</p>
                     </div>
-                </div>
-            {% endif %}
-        </div>
-    </article>
+                {% endif %}
+
+                {% if status.content and status_type != 'GeneratedNote' and status_type != 'Announce' %}
+                    {% with full=status.content|safe no_trim=status.content_warning itemprop="reviewBody" %}
+                        {% include 'snippets/trimmed_text.html' %}
+                    {% endwith %}
+                {% endif %}
+
+                {% if status.attachments.exists %}
+                    <div class="block">
+                        <div class="columns">
+                            {% for attachment in status.attachments.all %}
+                                <div class="column is-narrow">
+                                    <figure class="image is-128x128">
+                                        <a
+                                            href="/images/{{ attachment.image }}"
+                                            target="_blank"
+                                            aria-label="{% trans 'Open image in new window' %}"
+                                        >
+                                            <img
+                                                src="/images/{{ attachment.image }}"
+
+                                                {% if attachment.caption %}
+                                                    alt="{{ attachment.caption }}"
+                                                    title="{{ attachment.caption }}"
+                                                {% endif %}
+                                            >
+                                        </a>
+                                    </figure>
+                                </div>
+                            {% endfor %}
+                        </div>
+                    </div>
+                {% endif %}
+            </div>
+        </article>
+    </div>
 </div>
 
 {% endwith %}
diff --git a/bookwyrm/templates/snippets/status/generated_status.html b/bookwyrm/templates/snippets/status/generated_status.html
index f4186cd1..f3bbae44 100644
--- a/bookwyrm/templates/snippets/status/generated_status.html
+++ b/bookwyrm/templates/snippets/status/generated_status.html
@@ -3,29 +3,9 @@
 {% load bookwyrm_tags %}
 {% load i18n %}
 
-{% if status_type == 'Rating' %}
-<div
-    class="block"
-        {% firstof 'itemprop="reviewRating" itemscope itemtype="https://schema.org/Rating"' as rating_type %}
-        itemprop="rating"
-        itemtype="https://schema.org/Rating"
->
-    <div>
-        <span class="is-sr-only" {{ rating_type }}>
-            <meta itemprop="ratingValue" content="{{ status.rating|floatformat }}">
-
-                {# @todo Is it possible to not hard-code the value? #}
-                <meta itemprop="bestRating" content="5">
-        </span>
-
-        {% include 'snippets/stars.html' with rating=status.rating %}
-    </div>
-</div>
-{% endif %}
-
 {% if not hide_book %}
 {% with book=status.book|default:status.mention_books.first %}
-<div class="columns">
+<div class="columns is-mobile">
     <div class="column is-narrow">
         <div>
             <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book size="small" %}</a>
diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html
index 6493bd54..0fa74ddd 100644
--- a/bookwyrm/templates/snippets/status/status_header.html
+++ b/bookwyrm/templates/snippets/status/status_header.html
@@ -40,10 +40,29 @@
 
     {% endwith %}
 {% endif %}
+
 {% if status.book %}
-<a href="/book/{{ status.book.id }}">{{ status.book.title }}</a>
+    {% if status.status_type == 'GeneratedNote' or status.status_type == 'Rating' %}
+        <a href="/book/{{ status.book.id }}">{{ status.book.title }}</a>{% if status.status_type == 'Rating' %}:
+        <span
+            itemprop="reviewRating"
+            itemscope
+            itemtype="https://schema.org/Rating"
+        >
+        <span class="is-hidden" {{ rating_type }}>
+            <meta itemprop="ratingValue" content="{{ status.rating|floatformat }}">
+
+                {# @todo Is it possible to not hard-code the value? #}
+                <meta itemprop="bestRating" content="5">
+        </span>
+
+        {% include 'snippets/stars.html' with rating=status.rating %}
+        {% endif %}
+    {% else %}
+        {% include 'snippets/book_titleby.html' with book=status.book %}
+    {% endif %}
 {% elif status.mention_books %}
-<a href="/book/{{ status.mention_books.first.id }}">{{ status.mention_books.first.title }}</a>
+    <a href="/book/{{ status.mention_books.first.id }}">{{ status.mention_books.first.title }}</a>
 {% endif %}
 
 {% if status.progress %}

From cbccb0725213a4a87b3d01e27088469abd5111b2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 20 Apr 2021 11:18:59 -0700
Subject: [PATCH 0866/1285] Fixes display of replies

---
 bookwyrm/templates/snippets/status/content_status.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bookwyrm/templates/snippets/status/content_status.html b/bookwyrm/templates/snippets/status/content_status.html
index 44c52c83..5021ee06 100644
--- a/bookwyrm/templates/snippets/status/content_status.html
+++ b/bookwyrm/templates/snippets/status/content_status.html
@@ -15,11 +15,13 @@
     <div class="columns">
         {% if not hide_book %}
         {% with book=status.book|default:status.mention_books.first %}
+        {% if book %}
         <div class="column is-narrow is-hidden-mobile">
             <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book %}</a>
             {% include 'snippets/stars.html' with rating=book|rating:request.user %}
             {% include 'snippets/shelve_button/shelve_button.html' with book=book %}
         </div>
+        {% endif %}
         {% endwith %}
         {% endif %}
 

From b22d1863c965db115d35580ceb2f5752cd6d21cb Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 20 Apr 2021 12:31:45 -0700
Subject: [PATCH 0867/1285] More robust user page test and bug fix

---
 bookwyrm/tests/views/test_user.py | 8 ++++++++
 bookwyrm/views/books.py           | 4 ++--
 bookwyrm/views/user.py            | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py
index 055edae2..7518b2bf 100644
--- a/bookwyrm/tests/views/test_user.py
+++ b/bookwyrm/tests/views/test_user.py
@@ -30,6 +30,14 @@ class UserViews(TestCase):
         self.rat = models.User.objects.create_user(
             "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat"
         )
+        self.book = models.Edition.objects.create(title="test")
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            models.ShelfBook.objects.create(
+                book=self.book,
+                user=self.local_user,
+                shelf=self.local_user.shelf_set.first(),
+            )
+
         models.SiteSettings.objects.create()
         self.anonymous_user = AnonymousUser
         self.anonymous_user.is_authenticated = False
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 2a47c0d2..0c61d1a2 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -270,10 +270,10 @@ class Editions(View):
         if request.GET.get("format"):
             filters["physical_format__iexact"] = request.GET.get("format")
 
-        editions = work.editions.order_by("-edition_rank").all()
+        editions = work.editions.order_by("-edition_rank")
         languages = set(sum([e.languages for e in editions], []))
 
-        paginated = Paginator(editions.filter(**filters).all(), PAGE_LENGTH)
+        paginated = Paginator(editions.filter(**filters), PAGE_LENGTH)
         data = {
             "editions": paginated.get_page(request.GET.get("page")),
             "work": work,
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index 9c79a77c..02db5971 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -59,7 +59,7 @@ class User(View):
                 {
                     "name": user_shelf.name,
                     "local_path": user_shelf.local_path,
-                    "books": user_shelf.books[:3],
+                    "books": user_shelf.books.all()[:3],
                     "size": user_shelf.books.count(),
                 }
             )

From d47bbde651d8b3d7e7250f67dfb76bbf809e2b1d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 20 Apr 2021 13:02:43 -0700
Subject: [PATCH 0868/1285] Only one row of footer on list items

---
 bookwyrm/templates/lists/list.html | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index 2f0e7d67..a9f8e5c0 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -30,26 +30,32 @@
                             {% include 'snippets/shelve_button/shelve_button.html' with book=item.book %}
                         </div>
                     </div>
-                    <div class="card-footer has-background-white-bis">
+                    <div class="card-footer has-background-white-bis is-align-items-baseline">
                         <div class="card-footer-item">
+                            <div>
                             <p>{% blocktrans with username=item.user.display_name user_path=user.local_path %}Added by <a href="{{ user_path }}">{{ username }}</a>{% endblocktrans %}</p>
+                            </div>
                         </div>
                         {% if list.user == request.user or list.curation == 'open' and item.user == request.user %}
+                        <div class="card-footer-item">
+                            <form name="set-position" method="post" action="{% url 'list-set-book-position' item.id %}">
+                                <div class="field has-addons mb-0">
+                                    {% csrf_token %}
+                                    <div class="control">
+                                        <input id="input-list-position" class="input is-small" type="number" min="1" name="position" value="{{ item.order }}">
+                                    </div>
+                                    <div class="control">
+                                        <button type="submit" class="button is-info is-small is-tablet">{% trans "Set" %}</button>
+                                    </div>
+                                </div>
+                                <label for="input-list-position" class="help">{% trans "List position" %}</label>
+                            </form>
+                        </div>
                         <form name="add-book" method="post" action="{% url 'list-remove-book' list.id %}" class="card-footer-item">
                             {% csrf_token %}
                             <input type="hidden" name="item" value="{{ item.id }}">
                             <button type="submit" class="button is-small is-danger">{% trans "Remove" %}</button>
                         </form>
-                    </div>
-                    <div class="card-footer has-background-white-bis">
-                        <div>
-                            <form name="set-position" method="post" action="{% url 'list-set-book-position' item.id %}" class="card-footer-item">
-                                {% csrf_token %}
-                                <label for="input-list-position" class="is-sr-only">{% trans "List position" %}</label>
-                                <input id="input-list-position" class="input" type="number" min="1" name="position" value="{{ item.order }}">
-                                <button type="submit" class="button is-small is-info">{% trans "List position" %}</button>
-                            </form>
-                        </div>
                         {% endif %}
                     </div>
                 </div>

From 7012f95d6d5623c60b4355869c8774825722a99f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 20 Apr 2021 13:07:55 -0700
Subject: [PATCH 0869/1285] Use input instead of textarea for series

---
 bookwyrm/templates/book/edit_book.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html
index af5d4d69..1702cf5d 100644
--- a/bookwyrm/templates/book/edit_book.html
+++ b/bookwyrm/templates/book/edit_book.html
@@ -109,7 +109,10 @@
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
 
-                <p class="mb-2"><label class="label" for="id_series">{% trans "Series:" %}</label> {{ form.series }} </p>
+                <p class="mb-2">
+                    <label class="label" for="id_series">{% trans "Series:" %}</label>
+                    <input type="text" class="input" name="series" id="id_series" value="{{ form.series.value|default:'' }}">
+                </p>
                 {% for error in form.series.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}

From c07dcb54580738599833986140c8cea1310504de Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 20 Apr 2021 13:38:25 -0700
Subject: [PATCH 0870/1285] Remove spaceless templatetags that cause rendering
 issues in statuses

---
 bookwyrm/templates/snippets/status/status_content.html | 3 ---
 bookwyrm/templates/snippets/trimmed_text.html          | 2 --
 2 files changed, 5 deletions(-)

diff --git a/bookwyrm/templates/snippets/status/status_content.html b/bookwyrm/templates/snippets/status/status_content.html
index 402c4aab..fd3c7ee7 100644
--- a/bookwyrm/templates/snippets/status/status_content.html
+++ b/bookwyrm/templates/snippets/status/status_content.html
@@ -1,5 +1,3 @@
-{% spaceless %}
-
 {% load bookwyrm_tags %}
 {% load i18n %}
 
@@ -134,4 +132,3 @@
     {% endif %}
 {% endif %}
 {% endwith %}
-{% endspaceless %}
diff --git a/bookwyrm/templates/snippets/trimmed_text.html b/bookwyrm/templates/snippets/trimmed_text.html
index e1728b8f..6a3fa007 100644
--- a/bookwyrm/templates/snippets/trimmed_text.html
+++ b/bookwyrm/templates/snippets/trimmed_text.html
@@ -1,4 +1,3 @@
-{% spaceless %}
 {% load bookwyrm_tags %}
 {% load i18n %}
 
@@ -46,4 +45,3 @@
         {% endwith %}
     {% endif %}
 {% endwith %}
-{% endspaceless %}

From 5fc1e3f2feae807ae84594d6b3e8b193f6fa01e7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 20 Apr 2021 13:50:05 -0700
Subject: [PATCH 0871/1285] Fixes merge regression for localized timestamps

---
 bookwyrm/templates/snippets/status/layout.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bookwyrm/templates/snippets/status/layout.html b/bookwyrm/templates/snippets/status/layout.html
index 5b6c0c78..00e15857 100644
--- a/bookwyrm/templates/snippets/status/layout.html
+++ b/bookwyrm/templates/snippets/status/layout.html
@@ -1,6 +1,5 @@
 {% extends 'components/card.html' %}
 {% load i18n %}
-
 {% load bookwyrm_tags %}
 {% load humanize %}
 
@@ -61,7 +60,7 @@
 </div>
 
 <div class="card-footer-item">
-    <a href="{{ status.remote_id }}">{{ status.published_date | post_date }}</a>
+    <a href="{{ status.remote_id }}">{{ status.published_date|timesince }}</a>
 </div>
 {% if not moderation_mode %}
 <div class="card-footer-item">

From f4abd7b7979220540672c0b0de2cb9a9aac6322a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 20 Apr 2021 13:50:53 -0700
Subject: [PATCH 0872/1285] Linter fix

---
 bookwyrm/templates/snippets/status/status_body.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/status/status_body.html b/bookwyrm/templates/snippets/status/status_body.html
index 18f7876e..2c8a0e04 100644
--- a/bookwyrm/templates/snippets/status/status_body.html
+++ b/bookwyrm/templates/snippets/status/status_body.html
@@ -10,4 +10,5 @@
 {% endif %}
 
 {% endwith %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+

From 914f617689f56ed81b4fd0681812d65772422c81 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 20 Apr 2021 14:06:45 -0700
Subject: [PATCH 0873/1285] Cleans up imports

---
 bookwyrm/templatetags/bookwyrm_tags.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index 5d981909..69e762ce 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -1,11 +1,8 @@
 """ template filters """
 from uuid import uuid4
-from datetime import datetime
 
-from dateutil.relativedelta import relativedelta
 from django import template
 from django.db.models import Avg
-from django.utils import timezone
 
 from bookwyrm import models, views
 from bookwyrm.views.status import to_markdown

From 58aeb72afa6f28ead18888d47438e0704a424e23 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 21 Apr 2021 17:23:48 +0200
Subject: [PATCH 0874/1285] Move card footer container inside the card-footer
 component

---
 bookwyrm/templates/components/card.html       |  6 +--
 .../templates/moderation/report_preview.html  | 38 ++++++++++---------
 bookwyrm/templates/snippets/goal_card.html    | 12 +++---
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/bookwyrm/templates/components/card.html b/bookwyrm/templates/components/card.html
index f1104893..7dc3e1b0 100644
--- a/bookwyrm/templates/components/card.html
+++ b/bookwyrm/templates/components/card.html
@@ -11,10 +11,8 @@
     </section>
     {% endif %}
 
-    <footer class="card-footer has-background-white-bis">
-        {% block card-footer %}
-        {% endblock %}
-    </footer>
+    {% block card-footer %}
+    {% endblock %}
 
     {% block card-bonus %}
     {% endblock %}
diff --git a/bookwyrm/templates/moderation/report_preview.html b/bookwyrm/templates/moderation/report_preview.html
index 363783d5..936c04b8 100644
--- a/bookwyrm/templates/moderation/report_preview.html
+++ b/bookwyrm/templates/moderation/report_preview.html
@@ -16,22 +16,24 @@
 {% endblock %}
 
 {% block card-footer %}
-<div class="card-footer-item">
-    <p>{% blocktrans with username=report.reporter.display_name path=report.reporter.local_path %}Reported by <a href="{{ path }}">{{ username }}</a>{% endblocktrans %}</p>
-</div>
-<div class="card-footer-item">
-    {{ report.created_date | naturaltime }}
-</div>
-<div class="card-footer-item">
-    <form name="resolve" method="post" action="{% url 'settings-report-resolve' report.id %}">
-        {% csrf_token %}
-        <button class="button" type="submit">
-            {% if report.resolved %}
-            {% trans "Re-open" %}
-            {% else %}
-            {% trans "Resolve" %}
-            {% endif %}
-        </button>
-    </form>
-</div>
+<footer class="card-footer has-background-white-bis">
+    <div class="card-footer-item">
+        <p>{% blocktrans with username=report.reporter.display_name path=report.reporter.local_path %}Reported by <a href="{{ path }}">{{ username }}</a>{% endblocktrans %}</p>
+    </div>
+    <div class="card-footer-item">
+        {{ report.created_date | naturaltime }}
+    </div>
+    <div class="card-footer-item">
+        <form name="resolve" method="post" action="{% url 'settings-report-resolve' report.id %}">
+            {% csrf_token %}
+            <button class="button" type="submit">
+                {% if report.resolved %}
+                {% trans "Re-open" %}
+                {% else %}
+                {% trans "Resolve" %}
+                {% endif %}
+            </button>
+        </form>
+    </div>
+</footer>
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/goal_card.html b/bookwyrm/templates/snippets/goal_card.html
index 329fea54..5014b81c 100644
--- a/bookwyrm/templates/snippets/goal_card.html
+++ b/bookwyrm/templates/snippets/goal_card.html
@@ -17,9 +17,11 @@
 {% endblock %}
 
 {% block card-footer %}
-<form class="card-footer-item is-flex-direction-column" method="post" action="{% url 'hide-goal' %}">
-    {% csrf_token %}
-    <button type="submit" class="button is-danger is-light is-block set-display" >{% trans "Dismiss message" %}</button>
-    <p class="help">{% blocktrans with path=request.user.local_path %}You can set or change your reading goal any time from your <a href="{{ path }}">profile page</a>{% endblocktrans %}</p>
-</form>
+<footer class="card-footer has-background-white-bis">
+    <form class="card-footer-item is-flex-direction-column" method="post" action="{% url 'hide-goal' %}">
+        {% csrf_token %}
+        <button type="submit" class="button is-danger is-light is-block set-display" >{% trans "Dismiss message" %}</button>
+        <p class="help">{% blocktrans with path=request.user.local_path %}You can set or change your reading goal any time from your <a href="{{ path }}">profile page</a>{% endblocktrans %}</p>
+    </form>
+</footer>
 {% endblock %}

From 13957c2f4424187c9af786d6fa98dfe6560d6143 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 21 Apr 2021 17:32:35 +0200
Subject: [PATCH 0875/1285] Move footer some items to header

- Header elements are now enclosed in a media layout
- Footer elements are not in a card-footer anymore
---
 .../templates/snippets/status/layout.html     |  15 +-
 .../snippets/status/status_header.html        | 142 ++++++++++--------
 2 files changed, 81 insertions(+), 76 deletions(-)

diff --git a/bookwyrm/templates/snippets/status/layout.html b/bookwyrm/templates/snippets/status/layout.html
index 5b6c0c78..9c9d8fc1 100644
--- a/bookwyrm/templates/snippets/status/layout.html
+++ b/bookwyrm/templates/snippets/status/layout.html
@@ -13,7 +13,7 @@
 {% block card-content %}{% endblock %}
 
 {% block card-footer %}
-<div class="card-footer-item">
+<div class="card-content pt-0">
     {% if moderation_mode and perms.bookwyrm.moderate_post %}
 
     {# moderation options #}
@@ -55,19 +55,6 @@
     </a>
     {% endif %}
 </div>
-
-<div class="card-footer-item">
-    {% include 'snippets/privacy-icons.html' with item=status %}
-</div>
-
-<div class="card-footer-item">
-    <a href="{{ status.remote_id }}">{{ status.published_date | post_date }}</a>
-</div>
-{% if not moderation_mode %}
-<div class="card-footer-item">
-    {% include 'snippets/status/status_options.html' with class="is-small" right=True %}
-</div>
-{% endif %}
 {% endblock %}
 
 
diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html
index 0fa74ddd..e9d10c25 100644
--- a/bookwyrm/templates/snippets/status/status_header.html
+++ b/bookwyrm/templates/snippets/status/status_header.html
@@ -1,72 +1,90 @@
 {% load bookwyrm_tags %}
 {% load i18n %}
-<span
-    itemprop="author"
-    itemscope
-    itemtype="https://schema.org/Person"
->
-    <a
-        href="{{ status.user.local_path }}"
-        itemprop="url"
-    >
-        {% include 'snippets/avatar.html' with user=status.user ariaHide="true" %}
 
-        <span itemprop="name">{{ status.user.display_name }}</span>
-    </a>
-</span>
+<div class="media">
+    <figure class="media-left">
+        <a class="image is-48x48" href="{{ status.user.local_path }}">
+            {% include 'snippets/avatar.html' with user=status.user ariaHide="true" medium="true" %}
+        </a>    
+    </figure>
 
-{% if status.status_type == 'GeneratedNote' %}
-    {{ status.content | safe }}
-{% elif status.status_type == 'Rating' %}
-    {% trans "rated" %}
-{% elif status.status_type == 'Review' %}
-    {% trans "reviewed" %}
-{% elif status.status_type == 'Comment' %}
-    {% trans "commented on" %}
-{% elif status.status_type == 'Quotation' %}
-    {% trans "quoted" %}
-{% elif status.reply_parent %}
-    {% with parent_status=status|parent %}
-
-    {% if parent_status.status_type == 'Review' %}
-    {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to <a href="{{ user_path }}">{{ username}}'s</a> <a href="{{ status_path }}">review</a>{% endblocktrans %}
-    {% elif parent_status.status_type == 'Comment' %}
-    {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to <a href="{{ user_path }}">{{ username}}'s</a> <a href="{{ status_path }}">comment</a>{% endblocktrans %}
-    {% elif parent_status.status_type == 'Quotation' %}
-    {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to <a href="{{ user_path }}">{{ username}}'s</a> <a href="{{ status_path }}">quote</a>{% endblocktrans %}
-    {% else %}
-    {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to <a href="{{ user_path }}">{{ username}}'s</a> <a href="{{ status_path }}">status</a>{% endblocktrans %}
-    {% endif %}
-
-    {% endwith %}
-{% endif %}
-
-{% if status.book %}
-    {% if status.status_type == 'GeneratedNote' or status.status_type == 'Rating' %}
-        <a href="/book/{{ status.book.id }}">{{ status.book.title }}</a>{% if status.status_type == 'Rating' %}:
+    <div class="media-content">
+        <p class="is-size-7">
+            <a href="{{ status.remote_id }}">{{ status.published_date | post_date }}</a>
+            {% include 'snippets/privacy-icons.html' with item=status %}
+        </p>
         <span
-            itemprop="reviewRating"
+            itemprop="author"
             itemscope
-            itemtype="https://schema.org/Rating"
+            itemtype="https://schema.org/Person"
         >
-        <span class="is-hidden" {{ rating_type }}>
-            <meta itemprop="ratingValue" content="{{ status.rating|floatformat }}">
-
-                {# @todo Is it possible to not hard-code the value? #}
-                <meta itemprop="bestRating" content="5">
+            <a
+                href="{{ status.user.local_path }}"
+                itemprop="url"
+            >
+                <span itemprop="name">{{ status.user.display_name }}</span>
+            </a>
         </span>
 
-        {% include 'snippets/stars.html' with rating=status.rating %}
-        {% endif %}
-    {% else %}
-        {% include 'snippets/book_titleby.html' with book=status.book %}
-    {% endif %}
-{% elif status.mention_books %}
-    <a href="/book/{{ status.mention_books.first.id }}">{{ status.mention_books.first.title }}</a>
-{% endif %}
+        {% if status.status_type == 'GeneratedNote' %}
+            {{ status.content | safe }}
+        {% elif status.status_type == 'Rating' %}
+            {% trans "rated" %}
+        {% elif status.status_type == 'Review' %}
+            {% trans "reviewed" %}
+        {% elif status.status_type == 'Comment' %}
+            {% trans "commented on" %}
+        {% elif status.status_type == 'Quotation' %}
+            {% trans "quoted" %}
+        {% elif status.reply_parent %}
+            {% with parent_status=status|parent %}
+
+            {% if parent_status.status_type == 'Review' %}
+            {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to <a href="{{ user_path }}">{{ username}}'s</a> <a href="{{ status_path }}">review</a>{% endblocktrans %}
+            {% elif parent_status.status_type == 'Comment' %}
+            {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to <a href="{{ user_path }}">{{ username}}'s</a> <a href="{{ status_path }}">comment</a>{% endblocktrans %}
+            {% elif parent_status.status_type == 'Quotation' %}
+            {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to <a href="{{ user_path }}">{{ username}}'s</a> <a href="{{ status_path }}">quote</a>{% endblocktrans %}
+            {% else %}
+            {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to <a href="{{ user_path }}">{{ username}}'s</a> <a href="{{ status_path }}">status</a>{% endblocktrans %}
+            {% endif %}
+
+            {% endwith %}
+        {% endif %}
+
+        {% if status.book %}
+            {% if status.status_type == 'GeneratedNote' or status.status_type == 'Rating' %}
+                <a href="/book/{{ status.book.id }}">{{ status.book.title }}</a>{% if status.status_type == 'Rating' %}:
+                <span
+                    itemprop="reviewRating"
+                    itemscope
+                    itemtype="https://schema.org/Rating"
+                >
+                <span class="is-hidden" {{ rating_type }}>
+                    <meta itemprop="ratingValue" content="{{ status.rating|floatformat }}">
+
+                        {# @todo Is it possible to not hard-code the value? #}
+                        <meta itemprop="bestRating" content="5">
+                </span>
+
+                {% include 'snippets/stars.html' with rating=status.rating %}
+                {% endif %}
+            {% else %}
+                {% include 'snippets/book_titleby.html' with book=status.book %}
+            {% endif %}
+        {% elif status.mention_books %}
+            <a href="/book/{{ status.mention_books.first.id }}">{{ status.mention_books.first.title }}</a>
+        {% endif %}
+
+        {% if status.progress %}
+        <p class="help">
+        ({% if status.progress_mode == 'PG' %}
+            {% include 'snippets/page_text.html' with page=status.progress total_pages=status.book.pages %}
+        {% else %}
+            {{ status.progress }}%
+        {% endif %})
+        </p>
+        {% endif %}
+    </div>
+</div>
 
-{% if status.progress %}
-<p class="help">
-({% if status.progress_mode == 'PG' %}{% include 'snippets/page_text.html' with page=status.progress total_pages=status.book.pages %}{% else %}{{ status.progress }}%{% endif %})
-</p>
-{% endif %}

From f7adaee0ed4fc9b812c21f487bcfe9c4d418f291 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 21 Apr 2021 17:35:55 +0200
Subject: [PATCH 0876/1285] Verbosify buttons

---
 bookwyrm/templates/snippets/boost_button.html | 14 ++++++-------
 bookwyrm/templates/snippets/fav_button.html   | 11 +++++-----
 .../templates/snippets/status/layout.html     | 21 ++++++++++++-------
 .../snippets/status/status_options.html       |  5 ++---
 .../snippets/toggle/toggle_button.html        |  3 +++
 5 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/bookwyrm/templates/snippets/boost_button.html b/bookwyrm/templates/snippets/boost_button.html
index e590c58d..27a6196a 100644
--- a/bookwyrm/templates/snippets/boost_button.html
+++ b/bookwyrm/templates/snippets/boost_button.html
@@ -4,18 +4,16 @@
 {% with status.id|uuid as uuid %}
 <form name="boost" action="/boost/{{ status.id }}" method="post" class="interaction boost-{{ status.id }}-{{ uuid }} {% if request.user|boosted:status  %}is-hidden{% endif %}" data-id="boost-{{ status.id }}-{{ uuid }}">
     {% csrf_token %}
-    <button class="button is-small" type="submit" {% if not status.boostable %}disabled{% endif %}>
-        <span class="icon icon-boost" title="{% trans 'Boost status' %}">
-            <span class="is-sr-only">{% trans "Boost status" %}</span>
-        </span>
+    <button class="button is-small is-white" type="submit" {% if not status.boostable %}disabled{% endif %}>
+        <span class="icon icon-boost" title="{% trans 'Boost status' %}"></span>
+        <span>{% trans "Boost status" %}</span>
     </button>
 </form>
 <form name="unboost" action="/unboost/{{ status.id }}" method="post" class="interaction boost-{{ status.id }}-{{ uuid }} active {% if not request.user|boosted:status %}is-hidden{% endif %}" data-id="boost-{{ status.id }}-{{ uuid }}">
     {% csrf_token %}
-    <button class="button is-small is-primary" type="submit">
-        <span class="icon icon-boost" title="{% trans 'Un-boost status' %}">
-            <span class="is-sr-only">{% trans "Un-boost status" %}</span>
-        </span>
+    <button class="button is-small is-white" type="submit">
+        <span class="icon icon-boost has-text-primary" title="{% trans 'Un-boost status' %}"></span>
+        <span>{% trans "Un-boost status" %}</span>
     </button>
 </form>
 {% endwith %}
diff --git a/bookwyrm/templates/snippets/fav_button.html b/bookwyrm/templates/snippets/fav_button.html
index adb3d033..da6e6661 100644
--- a/bookwyrm/templates/snippets/fav_button.html
+++ b/bookwyrm/templates/snippets/fav_button.html
@@ -3,18 +3,17 @@
 {% with status.id|uuid as uuid %}
 <form name="favorite" action="/favorite/{{ status.id }}" method="POST" class="interaction fav-{{ status.id }}-{{ uuid }} {% if request.user|liked:status %}is-hidden{% endif %}" data-id="fav-{{ status.id }}-{{ uuid }}">
     {% csrf_token %}
-    <button class="button is-small" type="submit">
+    <button class="button is-small is-white" type="submit">
         <span class="icon icon-heart" title="{% trans 'Like status' %}">
-            <span class="is-sr-only">{% trans "Like status" %}</span>
         </span>
+        <span>{% trans "Like status" %}</span>
     </button>
 </form>
 <form name="unfavorite" action="/unfavorite/{{ status.id }}" method="POST" class="interaction fav-{{ status.id }}-{{ uuid }} active {% if not request.user|liked:status %}is-hidden{% endif %}" data-id="fav-{{ status.id }}-{{ uuid }}">
     {% csrf_token %}
-    <button class="button is-primary is-small" type="submit">
-        <span class="icon icon-heart" title="{% trans 'Un-like status' %}">
-            <span class="is-sr-only">{% trans "Un-like status" %}</span>
-        </span>
+    <button class="button is-white is-small" type="submit">
+        <span class="icon icon-heart has-text-primary" title="{% trans 'Un-like status' %}"></span>
+        <span>{% trans "Un-like status" %}</span>
     </button>
 </form>
 {% endwith %}
diff --git a/bookwyrm/templates/snippets/status/layout.html b/bookwyrm/templates/snippets/status/layout.html
index 9c9d8fc1..f132f594 100644
--- a/bookwyrm/templates/snippets/status/layout.html
+++ b/bookwyrm/templates/snippets/status/layout.html
@@ -26,30 +26,35 @@
     {% elif no_interact %}
     {# nothing here #}
     {% elif request.user.is_authenticated %}
-    <div class="field has-addons">
-        <div class="control">
+    <div class="is-flex">
+        <div>
             {% trans "Reply" as button_text %}
-            {% include 'snippets/toggle/toggle_button.html' with controls_text="show-comment" controls_uid=status.id text=button_text icon="comment" class="is-small toggle-button" focus="id_content_reply" %}
+            {% include 'snippets/toggle/toggle_button.html' with controls_text="show-comment" controls_uid=status.id text=button_text icon_with_text="comment" class="is-small is-white toggle-button" focus="id_content_reply" %}
         </div>
-        <div class="control">
+        <div class="ml-3">
             {% include 'snippets/boost_button.html' with status=status %}
         </div>
-        <div class="control">
+        <div class="ml-3">
             {% include 'snippets/fav_button.html' with status=status %}
         </div>
+        {% if not moderation_mode %}
+        <div class="ml-3">
+            {% include 'snippets/status/status_options.html' with class="is-small is-white" right=True %}
+        </div>
+        {% endif %}
     </div>
 
     {% else %}
     <a href="/login">
-        <span class="icon icon-comment" title="{% trans 'Reply' %}">
+        <span class="icon icon-comment is-small" title="{% trans 'Reply' %}">
             <span class="is-sr-only">{% trans "Reply" %}</span>
         </span>
 
-        <span class="icon icon-boost" title="{% trans 'Boost status' %}">
+        <span class="icon icon-boost is-small ml-4" title="{% trans 'Boost status' %}">
             <span class="is-sr-only">{% trans "Boost status" %}</span>
         </span>
 
-        <span class="icon icon-heart" title="{% trans 'Like status' %}">
+        <span class="icon icon-heart is-small ml-4" title="{% trans 'Like status' %}">
             <span class="is-sr-only">{% trans "Like status" %}</span>
         </span>
     </a>
diff --git a/bookwyrm/templates/snippets/status/status_options.html b/bookwyrm/templates/snippets/status/status_options.html
index a76cbc39..16d49b3d 100644
--- a/bookwyrm/templates/snippets/status/status_options.html
+++ b/bookwyrm/templates/snippets/status/status_options.html
@@ -3,9 +3,8 @@
 {% load bookwyrm_tags %}
 
 {% block dropdown-trigger %}
-<span class="icon icon-dots-three">
-    <span class="is-sr-only">{% trans "More options" %}</span>
-</span>
+<span class="icon icon-dots-three"></span>
+<span>{% trans "More options" %}</span>
 {% endblock %}
 
 {% block dropdown-list %}
diff --git a/bookwyrm/templates/snippets/toggle/toggle_button.html b/bookwyrm/templates/snippets/toggle/toggle_button.html
index fe1823f1..d5a8f3dc 100644
--- a/bookwyrm/templates/snippets/toggle/toggle_button.html
+++ b/bookwyrm/templates/snippets/toggle/toggle_button.html
@@ -13,6 +13,9 @@
     <span class="icon icon-{{ icon }}" title="{{ text }}">
         <span class="is-sr-only">{{ text }}</span>
     </span>
+    {% elif icon_with_text %}
+    <span class="icon icon-{{ icon_with_text }}" aria-hidden></span>
+    <span>{{ text }}</span>
     {% else %}
     <span>{{ text }}</span>
     {% endif %}

From f01b7fbd1516262b1c6eaf9c1cc57f459840ca7f Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 21 Apr 2021 18:34:04 +0200
Subject: [PATCH 0877/1285] Design and a11y fixes on Create Status forms

- Use `field` CSS class to better respect Bulma styles
- Fix buggy `id` on content field, causing a11y problems
- Fix progress control & select styles
- Various small style fixes
---
 .../snippets/create_status_form.html          | 58 ++++++++++++-------
 1 file changed, 37 insertions(+), 21 deletions(-)

diff --git a/bookwyrm/templates/snippets/create_status_form.html b/bookwyrm/templates/snippets/create_status_form.html
index 57e36d96..a74230ad 100644
--- a/bookwyrm/templates/snippets/create_status_form.html
+++ b/bookwyrm/templates/snippets/create_status_form.html
@@ -6,14 +6,16 @@
     <input type="hidden" name="user" value="{{ request.user.id }}">
     <input type="hidden" name="reply_parent" value="{% firstof draft.reply_parent.id reply_parent.id %}">
     {% if type == 'review' %}
-    <div class="control">
+    <div class="field">
         <label class="label" for="id_name_{{ book.id }}_{{ type }}">{% trans "Title" %}:</label>
-        <input type="text" name="name" maxlength="255" class="input" required="" id="id_name_{{ book.id }}_{{ type }}" placeholder="My {{ type }} of '{{ book.title }}'" value="{% firstof draft.name ''%}">
+        <div class="control">
+            <input type="text" name="name" maxlength="255" class="input" required="" id="id_name_{{ book.id }}_{{ type }}" placeholder="My {{ type }} of '{{ book.title }}'" value="{% firstof draft.name ''%}">
+        </div>
     </div>
     {% endif %}
-    <div class="control">
+    <div class="field">
         {% if type != 'reply' and type != 'direct'  %}
-        <label class="label" for="id_{% if type == 'quotation' %}quote{% else %}content{% endif %}_{{ book.id }}_{{ type }}">
+        <label class="label{% if type == 'review' %} mb-0{% endif %}" for="id_{% if type == 'quotation' %}quote{% else %}content{% endif %}_{{ book.id }}_{{ type }}">
             {% if type == 'comment' %}
             {% trans "Comment:" %}
             {% elif type == 'quotation' %}
@@ -25,28 +27,37 @@
         {% endif %}
 
         {% if type == 'review' %}
-        <fieldset>
+        <fieldset class="mb-1">
             <legend class="is-sr-only">{% trans "Rating" %}</legend>
 
             {% include 'snippets/form_rate_stars.html' with book=book type=type|default:'summary' default_rating=draft.rating %}
         </fieldset>
         {% endif %}
 
-        {% if type == 'quotation' %}
-        <textarea name="quote" class="textarea" id="id_quote_{{ book.id }}_{{ type }}" placeholder="{{ placeholder }}" required>{{ draft.quote|default:'' }}</textarea>
-        {% else %}
-        {% include 'snippets/content_warning_field.html' with parent_status=status %}
-        <textarea name="content" class="textarea" id="id_content_{{ type }}-{{ book.id }}{{reply_parent.id}}" placeholder="{{ placeholder }}" {% if type == 'reply' %} aria-label="Reply"{% endif %} required>{% if reply_parent %}{{ reply_parent|mentions:request.user }}{% endif %}{% if mentions %}@{{ mentions|username }} {% endif %}{{ draft.content|default:'' }}</textarea>
-        {% endif %}
+        <div class="control">
+            {% if type == 'quotation' %}
+            <textarea name="quote" class="textarea" id="id_quote_{{ book.id }}_{{ type }}" placeholder="{{ placeholder }}" required>{{ draft.quote|default:'' }}</textarea>
+            {% elif type == 'reply' %}
+            {% include 'snippets/content_warning_field.html' with parent_status=status %}
+            <textarea name="content" class="textarea" id="id_content_{{ type }}-{{ book.id }}{{reply_parent.id}}" placeholder="{{ placeholder }}" aria-label="{% trans 'Reply' %}" required>{% if reply_parent %}{{ reply_parent|mentions:request.user }}{% endif %}{% if mentions %}@{{ mentions|username }} {% endif %}{{ draft.content|default:'' }}</textarea>
+            {% else %}
+            {% include 'snippets/content_warning_field.html' with parent_status=status %}
+            <textarea name="content" class="textarea" id="id_content_{{ book.id }}_{{ type }}" placeholder="{{ placeholder }}" required>{{ draft.content|default:'' }}</textarea>
+            {% endif %}
+        </div>
     </div>
+
+    {# Supplemental fields #}
     {% if type == 'quotation' %}
-    <div class="control">
+    <div class="field">
         <label class="label" for="id_content_quote-{{ book.id }}">{% trans "Comment" %}:</label>
         {% include 'snippets/content_warning_field.html' with parent_status=status %}
-        <textarea name="content" class="textarea is-small" id="id_content_quote-{{ book.id }}">{{ draft.content|default:'' }}</textarea>
+        <div class="control">
+            <textarea name="content" class="textarea" rows="3" id="id_content_quote-{{ book.id }}">{{ draft.content|default:'' }}</textarea>
+        </div>
     </div>
     {% elif type == 'comment' %}
-    <div class="control">
+    <div>
         {% active_shelf book as active_shelf %}
         {% if active_shelf.shelf.identifier == 'reading' and book.latest_readthrough %}
 
@@ -58,11 +69,13 @@
                 <div class="control">
                     <input aria-label="{% if draft.progress_mode == 'PG' or readthrough.progress_mode == 'PG' %}Current page{% else %}Percent read{% endif %}" class="input" type="number" min="0" name="progress" size="3" value="{% firstof draft.progress readthrough.progress '' %}" id="progress-{{ uuid }}">
                 </div>
-                <div class="control select">
-                    <select name="progress_mode" aria-label="Progress mode">
-                        <option value="PG" {% if draft.progress_mode == 'PG' or readthrough.progress_mode == 'PG' %}selected{% endif %}>{% trans "pages" %}</option>
-                        <option value="PCT" {% if draft.progress_mode == 'PCT' or readthrough.progress_mode == 'PCT' %}selected{% endif %}>{% trans "percent" %}</option>
-                    </select>
+                <div class="control">
+                    <div class="select">
+                        <select name="progress_mode" aria-label="Progress mode">
+                            <option value="PG" {% if draft.progress_mode == 'PG' or readthrough.progress_mode == 'PG' %}selected{% endif %}>{% trans "pages" %}</option>
+                            <option value="PCT" {% if draft.progress_mode == 'PCT' or readthrough.progress_mode == 'PCT' %}selected{% endif %}>{% trans "percent" %}</option>
+                        </select>
+                    </div>
                 </div>
             </div>
             {% if readthrough.progress_mode == 'PG' and book.pages %}
@@ -73,9 +86,12 @@
         {% endif %}
     </div>
     {% endif %}
-    <input type="checkbox" class="is-hidden" name="sensitive" id="id_show_spoilers-{{ uuid }}" {% if draft.content_warning or status.content_warning %}checked{% endif %} aria-hidden="true">
+
+
     {# bottom bar #}
-    <div class="columns pt-1">
+    <input type="checkbox" class="is-hidden" name="sensitive" id="id_show_spoilers-{{ uuid }}" {% if draft.content_warning or status.content_warning %}checked{% endif %} aria-hidden="true">
+    
+    <div class="columns mt-1">
         <div class="field has-addons column">
             <div class="control">
                 {% trans "Include spoiler alert" as button_text %}

From 544dbda4ada69c08c30b56431fddaea997b44f2b Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 21 Apr 2021 19:35:50 +0200
Subject: [PATCH 0878/1285] Move menu item styles to menu item

---
 .../templates/snippets/shelf_selector.html    | 10 +++----
 .../shelve_button/shelve_button_options.html  | 28 ++++++++-----------
 .../snippets/status/status_options.html       | 14 +++++-----
 3 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/bookwyrm/templates/snippets/shelf_selector.html b/bookwyrm/templates/snippets/shelf_selector.html
index 0be4465f..832a414b 100644
--- a/bookwyrm/templates/snippets/shelf_selector.html
+++ b/bookwyrm/templates/snippets/shelf_selector.html
@@ -7,8 +7,8 @@
 
 {% block dropdown-list %}
 {% for shelf in request.user.shelf_set.all %}
-<li role="menuitem">
-    <form class="dropdown-item pt-0 pb-0" name="shelve" action="/shelve/" method="post">
+<li role="menuitem" class="dropdown-item p-0">
+    <form name="shelve" action="/shelve/" method="post">
         {% csrf_token %}
         <input type="hidden" name="book" value="{{ book.id }}">
         <input type="hidden" name="change-shelf-from" value="{{ current.identifier }}">
@@ -17,9 +17,9 @@
     </form>
 </li>
 {% endfor %}
-<li class="navbar-divider" role="presentation"></li>
-<li>
-    <form class="dropdown-item pt-0 pb-0" name="shelve" action="/unshelve/" method="post">
+<li class="navbar-divider" role="separator"></li>
+<li role="menuitem" class="dropdown-item p-0">
+    <form name="shelve" action="/unshelve/" method="post">
         {% csrf_token %}
         <input type="hidden" name="book" value="{{ book.id }}">
         <input type="hidden" name="shelf" value="{{ current.id }}">
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
index 2a1b99e1..baeb0ff6 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
@@ -2,8 +2,8 @@
 {% load i18n %}
 {% for shelf in shelves %}
 {% comparison_bool shelf.identifier active_shelf.shelf.identifier as is_current %}
-{% if dropdown %}<li role="menuitem">{% endif %}
-    <div class="{% if dropdown %}dropdown-item pt-0 pb-0{% elif active_shelf.shelf.identifier|next_shelf != shelf.identifier %}is-hidden{% endif %}">
+{% if dropdown %}<li role="menuitem" class="dropdown-item p-0">{% endif %}
+    <div class="{% if active_shelf.shelf.identifier|next_shelf != shelf.identifier %}is-hidden{% endif %}">
     {% if shelf.identifier == 'reading' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
         {% trans "Start reading" as button_text %}
         {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="start-reading" controls_uid=button_uuid focus="modal-title-start-reading" disabled=is_current %}
@@ -30,24 +30,20 @@
 {% if dropdown %}
 
 {% if readthrough and active_shelf.shelf.identifier != 'read' %}
-<li role="menuitem">
-    <div class="dropdown-item pt-0 pb-0">
-        {% trans "Update progress" as button_text %}
-        {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="progress-update" controls_uid=button_uuid focus="modal-title-progress-update" %}
-    </div>
+<li role="menuitem" class="dropdown-item p-0">
+    {% trans "Update progress" as button_text %}
+    {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="progress-update" controls_uid=button_uuid focus="modal-title-progress-update" %}
 </li>
 {% endif %}
 
 {% if active_shelf.shelf %}
-<li role="menuitem">
-    <div class="dropdown-item pt-0 pb-0">
-        <form  name="shelve" action="/unshelve/" method="post">
-            {% csrf_token %}
-            <input type="hidden" name="book" value="{{ active_shelf.book.id }}">
-            <input type="hidden" name="shelf" value="{{ active_shelf.shelf.id }}">
-            <button class="button is-fullwidth is-small is-danger is-light" type="submit">{% blocktrans with name=active_shelf.shelf.name %}Remove from {{ name }}{% endblocktrans %}</button>
-        </form>
-    </div>
+<li role="menuitem" class="dropdown-item p-0">
+    <form  name="shelve" action="/unshelve/" method="post">
+        {% csrf_token %}
+        <input type="hidden" name="book" value="{{ active_shelf.book.id }}">
+        <input type="hidden" name="shelf" value="{{ active_shelf.shelf.id }}">
+        <button class="button is-fullwidth is-small{% if dropdown %} is-radiusless{% endif %} is-danger is-light" type="submit">{% blocktrans with name=active_shelf.shelf.name %}Remove from {{ name }}{% endblocktrans %}</button>
+    </form>
 </li>
 {% endif %}
 
diff --git a/bookwyrm/templates/snippets/status/status_options.html b/bookwyrm/templates/snippets/status/status_options.html
index a76cbc39..a327b43d 100644
--- a/bookwyrm/templates/snippets/status/status_options.html
+++ b/bookwyrm/templates/snippets/status/status_options.html
@@ -11,8 +11,8 @@
 {% block dropdown-list %}
 {% if status.user == request.user %}
 {# things you can do to your own statuses #}
-<li role="menuitem">
-    <form class="dropdown-item pt-0 pb-0" name="delete-{{status.id}}" action="/delete-status/{{ status.id }}" method="post">
+<li role="menuitem" class="dropdown-item p-0">
+    <form name="delete-{{status.id}}" action="/delete-status/{{ status.id }}" method="post">
         {% csrf_token %}
         <button class="button is-danger is-light is-fullwidth is-small" type="submit">
             {% trans "Delete status" %}
@@ -20,8 +20,8 @@
     </form>
 </li>
 {% if status.status_type != 'GeneratedNote' and status.status_type != 'Rating' %}
-<li role="menuitem">
-    <form class="dropdown-item pt-0 pb-0" name="delete-{{status.id}}" action="{% url 'redraft' status.id %}" method="post">
+<li role="menuitem" class="dropdown-item p-0">
+    <form class="" name="delete-{{status.id}}" action="{% url 'redraft' status.id %}" method="post">
         {% csrf_token %}
         <button class="button is-danger is-light is-fullwidth is-small" type="submit">
             {% trans "Delete & re-draft" %}
@@ -31,13 +31,13 @@
 {% endif %}
 {% else %}
 {# things you can do to other people's statuses #}
-<li role="menuitem">
+<li role="menuitem" class="dropdown-item p-0">
     <a href="{% url 'direct-messages-user' status.user|username %}" class="button is-small is-fullwidth">{% trans "Send direct message" %}</a>
 </li>
-<li role="menuitem">
+<li role="menuitem" class="dropdown-item p-0">
     {% include 'snippets/report_button.html' with user=status.user status=status %}
 </li>
-<li role="menuitem">
+<li role="menuitem" class="dropdown-item p-0">
     {% include 'snippets/block_button.html' with user=status.user class="is-fullwidth" %}
 </li>
 {% endif %}

From df72061c57ade2f28c2249e5003e6f0c77c99387 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 21 Apr 2021 19:36:11 +0200
Subject: [PATCH 0879/1285] Improve menu action styles

---
 bookwyrm/templates/snippets/shelf_selector.html               | 4 ++--
 .../snippets/shelve_button/shelve_button_dropdown.html        | 2 +-
 bookwyrm/templates/snippets/status/status_options.html        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/templates/snippets/shelf_selector.html b/bookwyrm/templates/snippets/shelf_selector.html
index 832a414b..0036a4e9 100644
--- a/bookwyrm/templates/snippets/shelf_selector.html
+++ b/bookwyrm/templates/snippets/shelf_selector.html
@@ -13,7 +13,7 @@
         <input type="hidden" name="book" value="{{ book.id }}">
         <input type="hidden" name="change-shelf-from" value="{{ current.identifier }}">
         <input type="hidden" name="shelf" value="{{ shelf.identifier }}">
-        <button class="button is-fullwidth is-small shelf-option" type="submit" {% if shelf.identifier == current.identifier %}disabled{% endif %}><span>{{ shelf.name }}</span></button>
+        <button class="button is-fullwidth is-small shelf-option is-radiusless is-white" type="submit" {% if shelf.identifier == current.identifier %}disabled{% endif %}><span>{{ shelf.name }}</span></button>
     </form>
 </li>
 {% endfor %}
@@ -23,7 +23,7 @@
         {% csrf_token %}
         <input type="hidden" name="book" value="{{ book.id }}">
         <input type="hidden" name="shelf" value="{{ current.id }}">
-        <button class="button is-fullwidth is-small is-danger is-light" type="submit">{% trans "Remove" %}</button>
+        <button class="button is-fullwidth is-small is-radiusless is-danger is-light" type="submit">{% trans "Remove" %}</button>
     </form>
 </li>
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html
index c3f325bf..4439bfc2 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html
@@ -7,5 +7,5 @@
 {% endblock %}
 
 {% block dropdown-list %}
-{% include 'snippets/shelve_button/shelve_button_options.html' with active_shelf=active_shelf shelves=request.user.shelf_set.all dropdown=True class="shelf-option is-fullwidth is-small" %}
+{% include 'snippets/shelve_button/shelve_button_options.html' with active_shelf=active_shelf shelves=request.user.shelf_set.all dropdown=True class="shelf-option is-fullwidth is-small is-radiusless is-white" %}
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/status/status_options.html b/bookwyrm/templates/snippets/status/status_options.html
index a327b43d..1dbca910 100644
--- a/bookwyrm/templates/snippets/status/status_options.html
+++ b/bookwyrm/templates/snippets/status/status_options.html
@@ -14,7 +14,7 @@
 <li role="menuitem" class="dropdown-item p-0">
     <form name="delete-{{status.id}}" action="/delete-status/{{ status.id }}" method="post">
         {% csrf_token %}
-        <button class="button is-danger is-light is-fullwidth is-small" type="submit">
+        <button class="button is-radiusless is-danger is-light is-fullwidth is-small" type="submit">
             {% trans "Delete status" %}
         </button>
     </form>
@@ -23,7 +23,7 @@
 <li role="menuitem" class="dropdown-item p-0">
     <form class="" name="delete-{{status.id}}" action="{% url 'redraft' status.id %}" method="post">
         {% csrf_token %}
-        <button class="button is-danger is-light is-fullwidth is-small" type="submit">
+        <button class="button is-radiusless is-danger is-light is-fullwidth is-small" type="submit">
             {% trans "Delete & re-draft" %}
         </button>
     </form>

From c86800be01e166471147bc9b3d6813c67f5aacf7 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 21 Apr 2021 19:36:59 +0200
Subject: [PATCH 0880/1285] Remove padding and add radius to menu

Without padding, the children's lack of radius mask the radius. Using is-clipped helps clip with the parent's radius
---
 bookwyrm/templates/components/dropdown.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/components/dropdown.html b/bookwyrm/templates/components/dropdown.html
index 734d6276..96dce823 100644
--- a/bookwyrm/templates/components/dropdown.html
+++ b/bookwyrm/templates/components/dropdown.html
@@ -23,7 +23,7 @@
     <div class="dropdown-menu">
         <ul
             id="menu-options-{{ uuid }}"
-            class="dropdown-content"
+            class="dropdown-content p-0 is-clipped"
             role="menu"
         >
             {% block dropdown-list %}{% endblock %}

From 2987029a7dc7ab299ee43c4ae154d589022b358f Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 21 Apr 2021 19:37:12 +0200
Subject: [PATCH 0881/1285] Remove useless style on non-dropdown element

---
 bookwyrm/templates/snippets/status/layout.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/status/layout.html b/bookwyrm/templates/snippets/status/layout.html
index 00e15857..1bf184f9 100644
--- a/bookwyrm/templates/snippets/status/layout.html
+++ b/bookwyrm/templates/snippets/status/layout.html
@@ -16,7 +16,7 @@
     {% if moderation_mode and perms.bookwyrm.moderate_post %}
 
     {# moderation options #}
-    <form class="dropdown-item pt-0 pb-0" name="delete-{{status.id}}" action="/delete-status/{{ status.id }}" method="post">
+    <form name="delete-{{status.id}}" action="/delete-status/{{ status.id }}" method="post">
         {% csrf_token %}
         <button class="button is-danger is-light" type="submit">
             {% trans "Delete status" %}

From 482774f1e1a59190d0a1e7af0270906a29e92e13 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 21 Apr 2021 21:25:37 +0200
Subject: [PATCH 0882/1285] Add mobile styles for book preview table

---
 bookwyrm/static/css/bookwyrm.css   |  38 ++++++++++
 bookwyrm/templates/user/shelf.html | 115 +++++++++++++++--------------
 2 files changed, 97 insertions(+), 56 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 67eb1eba..a8a29fa2 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -256,3 +256,41 @@ body {
     opacity: 0.5;
     cursor: not-allowed;
 }
+
+/* Book preview table
+ ******************************************************************************/
+
+@media only screen and (max-width: 768px) {
+    table.is-mobile, table.is-mobile tbody {
+        display: block;
+    }
+    table.is-mobile tr {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: space-between;
+        border-top: 1px solid #dbdbdb;
+    }
+    table.is-mobile td {
+        display: block;
+        box-sizing: border-box;
+        flex: 1 0 100%;
+        order: 2;
+        border-bottom: 0;
+    }
+    table.is-mobile td.book-preview-top-row {
+        order: 1;
+        flex-basis: auto;
+    }
+    table.is-mobile td[data-title]:not(:empty)::before {
+        content: attr(data-title);
+        display: block;
+        font-size: .75em;
+        font-weight: bold;
+    }
+    table.is-mobile td:empty {
+        padding: 0;
+    }
+    table.is-mobile th, table.is-mobile thead {
+        display: none;
+    }
+}
diff --git a/bookwyrm/templates/user/shelf.html b/bookwyrm/templates/user/shelf.html
index 0732327b..947e9f70 100644
--- a/bookwyrm/templates/user/shelf.html
+++ b/bookwyrm/templates/user/shelf.html
@@ -68,63 +68,66 @@
 <div class="block">
     <div>
         {% if books|length > 0 %}
-        <div class="scroll-x">
-        <table class="table is-striped is-fullwidth">
-
-        <tr class="book-preview">
-            <th>{% trans "Cover" %}</th>
-            <th>{% trans "Title" %}</th>
-            <th>{% trans "Author" %}</th>
-            <th>{% trans "Shelved" %}</th>
-            <th>{% trans "Started" %}</th>
-            <th>{% trans "Finished" %}</th>
-            {% if ratings %}<th>{% trans "Rating" %}</th>{% endif %}
-            {% if shelf.user == request.user %}
-            <th aria-hidden="true"></th>
-            {% endif %}
-        </tr>
-        {% for book in books %}
-        <tr class="book-preview">
-            <td>
-                <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book size="small" %}</a>
-            </td>
-            <td>
-                <a href="{{ book.local_path }}">{{ book.title }}</a>
-            </td>
-            <td>
-                {% include 'snippets/authors.html' %}
-            </td>
-            <td>
-                {{ book.created_date | naturalday }}
-            </td>
-            {% latest_read_through book user as read_through %}
-            <td>
-                {{ read_through.start_date | naturalday |default_if_none:""}}
-            </td>
-            <td>
-                {{ read_through.finish_date | naturalday |default_if_none:""}}
-            </td>
-            {% if ratings %}
-            <td>
-                {% include 'snippets/stars.html' with rating=ratings|dict_key:book.id %}
-            </td>
-            {% endif %}
-            {% if shelf.user == request.user %}
-            <td>
-                {% with right=True %}
-                {% if not shelf.id %}
-                {% active_shelf book as current %}
-                {% include 'snippets/shelf_selector.html' with current=current.shelf class="is-small" %}
-                {% else %}
-                {% include 'snippets/shelf_selector.html' with current=shelf class="is-small" %}
-                {% endif %}
-                {% endwith %}
-            </td>
-            {% endif %}
-        </tr>
-        {% endfor %}
+        <table class="table is-striped is-fullwidth is-mobile">
+            <thead>
+                <tr>
+                    <th>{% trans "Cover" %}</th>
+                    <th>{% trans "Title" %}</th>
+                    <th>{% trans "Author" %}</th>
+                    <th>{% trans "Shelved" %}</th>
+                    <th>{% trans "Started" %}</th>
+                    <th>{% trans "Finished" %}</th>
+                    {% if ratings %}<th>{% trans "Rating" %}</th>{% endif %}
+                    {% if shelf.user == request.user %}
+                    <th aria-hidden="true"></th>
+                    {% endif %}
+                </tr>
+            </thead>
+            <tbody>
+                {% for book in books %}
+                {% spaceless %}
+                <tr class="book-preview">
+                    <td class="book-preview-top-row">
+                        <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book size="small" %}</a>
+                    </td>
+                    <td data-title="{% trans "Title" %}">
+                        <a href="{{ book.local_path }}">{{ book.title }}</a>
+                    </td>
+                    <td data-title="{% trans "Author" %}">
+                        {% include 'snippets/authors.html' %}
+                    </td>
+                    <td data-title="{% trans "Shelved" %}">
+                        {{ book.created_date | naturalday }}
+                    </td>
+                    {% latest_read_through book user as read_through %}
+                    <td data-title="{% trans "Started" %}">
+                        {{ read_through.start_date | naturalday |default_if_none:""}}
+                    </td>
+                    <td data-title="{% trans "Finished" %}">
+                        {{ read_through.finish_date | naturalday |default_if_none:""}}
+                    </td>
+                    {% if ratings %}
+                    <td data-title="{% trans "Rating" %}">
+                        {% include 'snippets/stars.html' with rating=ratings|dict_key:book.id %}
+                    </td>
+                    {% endif %}
+                    {% if shelf.user == request.user %}
+                    <td class="book-preview-top-row has-text-right">
+                        {% with right=True %}
+                        {% if not shelf.id %}
+                        {% active_shelf book as current %}
+                        {% include 'snippets/shelf_selector.html' with current=current.shelf class="is-small" %}
+                        {% else %}
+                        {% include 'snippets/shelf_selector.html' with current=shelf class="is-small" %}
+                        {% endif %}
+                        {% endwith %}
+                    </td>
+                    {% endif %}
+                </tr>
+                {% endspaceless %}
+                {% endfor %} 
+            </tbody>
         </table>
-        </div>
         {% else %}
         <p>{% trans "This shelf is empty." %}</p>
         {% if shelf.id and shelf.editable %}

From 2ae9085e55e8bdd25c3660560e95b4a97e3d6a3e Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 21 Apr 2021 21:26:20 +0200
Subject: [PATCH 0883/1285] Vertically align cells in desktop view

---
 bookwyrm/static/css/bookwyrm.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index a8a29fa2..5b5b3258 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -260,6 +260,10 @@ body {
 /* Book preview table
  ******************************************************************************/
 
+.book-preview td {
+    vertical-align: middle;
+}
+
 @media only screen and (max-width: 768px) {
     table.is-mobile, table.is-mobile tbody {
         display: block;

From e4836bd9b3321c79e1496cad1c9e6b6af4ed9791 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 21 Apr 2021 21:29:28 +0200
Subject: [PATCH 0884/1285] Fix for lint

---
 bookwyrm/static/css/bookwyrm.css | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 5b5b3258..c019f996 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -265,15 +265,18 @@ body {
 }
 
 @media only screen and (max-width: 768px) {
-    table.is-mobile, table.is-mobile tbody {
+    table.is-mobile,
+    table.is-mobile tbody {
         display: block;
     }
+
     table.is-mobile tr {
         display: flex;
         flex-wrap: wrap;
         justify-content: space-between;
         border-top: 1px solid #dbdbdb;
     }
+
     table.is-mobile td {
         display: block;
         box-sizing: border-box;
@@ -281,20 +284,25 @@ body {
         order: 2;
         border-bottom: 0;
     }
+
     table.is-mobile td.book-preview-top-row {
         order: 1;
         flex-basis: auto;
     }
+
     table.is-mobile td[data-title]:not(:empty)::before {
         content: attr(data-title);
         display: block;
-        font-size: .75em;
+        font-size: 0.75em;
         font-weight: bold;
     }
+
     table.is-mobile td:empty {
         padding: 0;
     }
-    table.is-mobile th, table.is-mobile thead {
+
+    table.is-mobile th,
+    table.is-mobile thead {
         display: none;
     }
 }

From 265c38e877ae907dc64caa26e2c680a51e78a8b1 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 21 Apr 2021 21:31:58 +0200
Subject: [PATCH 0885/1285] Update direct message button style

---
 bookwyrm/templates/snippets/status/status_options.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/status/status_options.html b/bookwyrm/templates/snippets/status/status_options.html
index 1dbca910..0749e1c2 100644
--- a/bookwyrm/templates/snippets/status/status_options.html
+++ b/bookwyrm/templates/snippets/status/status_options.html
@@ -32,7 +32,9 @@
 {% else %}
 {# things you can do to other people's statuses #}
 <li role="menuitem" class="dropdown-item p-0">
-    <a href="{% url 'direct-messages-user' status.user|username %}" class="button is-small is-fullwidth">{% trans "Send direct message" %}</a>
+    <a href="{% url 'direct-messages-user' status.user|username %}" class="button is-small is-white is-radiusless is-fullwidth">
+        {% trans "Send direct message" %}
+    </a>
 </li>
 <li role="menuitem" class="dropdown-item p-0">
     {% include 'snippets/report_button.html' with user=status.user status=status %}

From 720109564d82bab2cd3d15326cf4835849329b8b Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 21 Apr 2021 21:35:42 +0200
Subject: [PATCH 0886/1285] Fix condition

---
 .../templates/snippets/shelve_button/shelve_button_options.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
index baeb0ff6..1eaa2463 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
@@ -3,7 +3,7 @@
 {% for shelf in shelves %}
 {% comparison_bool shelf.identifier active_shelf.shelf.identifier as is_current %}
 {% if dropdown %}<li role="menuitem" class="dropdown-item p-0">{% endif %}
-    <div class="{% if active_shelf.shelf.identifier|next_shelf != shelf.identifier %}is-hidden{% endif %}">
+    <div class="{% if not dropdown and active_shelf.shelf.identifier|next_shelf != shelf.identifier %}is-hidden{% endif %}">
     {% if shelf.identifier == 'reading' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
         {% trans "Start reading" as button_text %}
         {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="start-reading" controls_uid=button_uuid focus="modal-title-start-reading" disabled=is_current %}

From 17436b665759714543f52ef46471b991d7578e81 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 21 Apr 2021 21:48:19 +0200
Subject: [PATCH 0887/1285] Header fixes

---
 .../snippets/status/status_header.html        | 154 +++++++++---------
 1 file changed, 80 insertions(+), 74 deletions(-)

diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html
index e9d10c25..27bce0ca 100644
--- a/bookwyrm/templates/snippets/status/status_header.html
+++ b/bookwyrm/templates/snippets/status/status_header.html
@@ -1,5 +1,6 @@
 {% load bookwyrm_tags %}
 {% load i18n %}
+{% load humanize %}
 
 <div class="media">
     <figure class="media-left">
@@ -9,82 +10,87 @@
     </figure>
 
     <div class="media-content">
-        <p class="is-size-7">
-            <a href="{{ status.remote_id }}">{{ status.published_date | post_date }}</a>
+        <p>
+            <span
+                itemprop="author"
+                itemscope
+                itemtype="https://schema.org/Person"
+            >
+                <a
+                    href="{{ status.user.local_path }}"
+                    itemprop="url"
+                >
+                    <span itemprop="name">{{ status.user.display_name }}</span>
+                </a>
+            </span>
+
+            {% if status.status_type == 'GeneratedNote' %}
+                {{ status.content | safe }}
+            {% elif status.status_type == 'Rating' %}
+                {% trans "rated" %}
+            {% elif status.status_type == 'Review' %}
+                {% trans "reviewed" %}
+            {% elif status.status_type == 'Comment' %}
+                {% trans "commented on" %}
+            {% elif status.status_type == 'Quotation' %}
+                {% trans "quoted" %}
+            {% elif status.reply_parent %}
+                {% with parent_status=status|parent %}
+
+                {% if parent_status.status_type == 'Review' %}
+                {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to <a href="{{ user_path }}">{{ username}}'s</a> <a href="{{ status_path }}">review</a>{% endblocktrans %}
+                {% elif parent_status.status_type == 'Comment' %}
+                {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to <a href="{{ user_path }}">{{ username}}'s</a> <a href="{{ status_path }}">comment</a>{% endblocktrans %}
+                {% elif parent_status.status_type == 'Quotation' %}
+                {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to <a href="{{ user_path }}">{{ username}}'s</a> <a href="{{ status_path }}">quote</a>{% endblocktrans %}
+                {% else %}
+                {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to <a href="{{ user_path }}">{{ username}}'s</a> <a href="{{ status_path }}">status</a>{% endblocktrans %}
+                {% endif %}
+
+                {% endwith %}
+            {% endif %}
+
+            {% if status.book %}
+                {% if status.status_type == 'GeneratedNote' or status.status_type == 'Rating' %}
+                    <a href="/book/{{ status.book.id }}">{{ status.book.title }}</a>{% if status.status_type == 'Rating' %}:
+                    <span
+                        itemprop="reviewRating"
+                        itemscope
+                        itemtype="https://schema.org/Rating"
+                    >
+                    <span class="is-hidden" {{ rating_type }}>
+                        <meta itemprop="ratingValue" content="{{ status.rating|floatformat }}">
+
+                            {# @todo Is it possible to not hard-code the value? #}
+                            <meta itemprop="bestRating" content="5">
+                    </span>
+
+                    {% include 'snippets/stars.html' with rating=status.rating %}
+                    {% endif %}
+                {% else %}
+                    {% include 'snippets/book_titleby.html' with book=status.book %}
+                {% endif %}
+            {% elif status.mention_books %}
+                <a href="/book/{{ status.mention_books.first.id }}">
+                    {{ status.mention_books.first.title }}
+                </a>
+            {% endif %}
+        </p>
+        <p class="is-size-7 is-flex is-align-items-center">
+            <a href="{{ status.remote_id }}">{{ status.published_date|timesince }}</a>
+            {% if status.progress %}
+            <span class="help">
+            {% spaceless %}
+            ({% if status.progress_mode == 'PG' %}
+                {% include 'snippets/page_text.html' with page=status.progress total_pages=status.book.pages %}
+            {% else %}
+                {{ status.progress }}%
+            {% endif %})
+            {% endspaceless %}
+            </span>
+            {% endif %}
             {% include 'snippets/privacy-icons.html' with item=status %}
         </p>
-        <span
-            itemprop="author"
-            itemscope
-            itemtype="https://schema.org/Person"
-        >
-            <a
-                href="{{ status.user.local_path }}"
-                itemprop="url"
-            >
-                <span itemprop="name">{{ status.user.display_name }}</span>
-            </a>
-        </span>
-
-        {% if status.status_type == 'GeneratedNote' %}
-            {{ status.content | safe }}
-        {% elif status.status_type == 'Rating' %}
-            {% trans "rated" %}
-        {% elif status.status_type == 'Review' %}
-            {% trans "reviewed" %}
-        {% elif status.status_type == 'Comment' %}
-            {% trans "commented on" %}
-        {% elif status.status_type == 'Quotation' %}
-            {% trans "quoted" %}
-        {% elif status.reply_parent %}
-            {% with parent_status=status|parent %}
-
-            {% if parent_status.status_type == 'Review' %}
-            {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to <a href="{{ user_path }}">{{ username}}'s</a> <a href="{{ status_path }}">review</a>{% endblocktrans %}
-            {% elif parent_status.status_type == 'Comment' %}
-            {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to <a href="{{ user_path }}">{{ username}}'s</a> <a href="{{ status_path }}">comment</a>{% endblocktrans %}
-            {% elif parent_status.status_type == 'Quotation' %}
-            {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to <a href="{{ user_path }}">{{ username}}'s</a> <a href="{{ status_path }}">quote</a>{% endblocktrans %}
-            {% else %}
-            {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to <a href="{{ user_path }}">{{ username}}'s</a> <a href="{{ status_path }}">status</a>{% endblocktrans %}
-            {% endif %}
-
-            {% endwith %}
-        {% endif %}
-
-        {% if status.book %}
-            {% if status.status_type == 'GeneratedNote' or status.status_type == 'Rating' %}
-                <a href="/book/{{ status.book.id }}">{{ status.book.title }}</a>{% if status.status_type == 'Rating' %}:
-                <span
-                    itemprop="reviewRating"
-                    itemscope
-                    itemtype="https://schema.org/Rating"
-                >
-                <span class="is-hidden" {{ rating_type }}>
-                    <meta itemprop="ratingValue" content="{{ status.rating|floatformat }}">
-
-                        {# @todo Is it possible to not hard-code the value? #}
-                        <meta itemprop="bestRating" content="5">
-                </span>
-
-                {% include 'snippets/stars.html' with rating=status.rating %}
-                {% endif %}
-            {% else %}
-                {% include 'snippets/book_titleby.html' with book=status.book %}
-            {% endif %}
-        {% elif status.mention_books %}
-            <a href="/book/{{ status.mention_books.first.id }}">{{ status.mention_books.first.title }}</a>
-        {% endif %}
-
-        {% if status.progress %}
-        <p class="help">
-        ({% if status.progress_mode == 'PG' %}
-            {% include 'snippets/page_text.html' with page=status.progress total_pages=status.book.pages %}
-        {% else %}
-            {{ status.progress }}%
-        {% endif %})
-        </p>
-        {% endif %}
     </div>
 </div>
 

From 53b47aa2649965589a9b435d46aa1fea8ee454e8 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 21 Apr 2021 21:48:31 +0200
Subject: [PATCH 0888/1285] Revert "Move card footer container inside the
 card-footer component"

This reverts commit 58aeb72afa6f28ead18888d47438e0704a424e23.
---
 bookwyrm/templates/components/card.html       |  6 ++-
 .../templates/moderation/report_preview.html  | 38 +++++++++----------
 bookwyrm/templates/snippets/goal_card.html    | 12 +++---
 3 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/bookwyrm/templates/components/card.html b/bookwyrm/templates/components/card.html
index 7dc3e1b0..f1104893 100644
--- a/bookwyrm/templates/components/card.html
+++ b/bookwyrm/templates/components/card.html
@@ -11,8 +11,10 @@
     </section>
     {% endif %}
 
-    {% block card-footer %}
-    {% endblock %}
+    <footer class="card-footer has-background-white-bis">
+        {% block card-footer %}
+        {% endblock %}
+    </footer>
 
     {% block card-bonus %}
     {% endblock %}
diff --git a/bookwyrm/templates/moderation/report_preview.html b/bookwyrm/templates/moderation/report_preview.html
index 936c04b8..363783d5 100644
--- a/bookwyrm/templates/moderation/report_preview.html
+++ b/bookwyrm/templates/moderation/report_preview.html
@@ -16,24 +16,22 @@
 {% endblock %}
 
 {% block card-footer %}
-<footer class="card-footer has-background-white-bis">
-    <div class="card-footer-item">
-        <p>{% blocktrans with username=report.reporter.display_name path=report.reporter.local_path %}Reported by <a href="{{ path }}">{{ username }}</a>{% endblocktrans %}</p>
-    </div>
-    <div class="card-footer-item">
-        {{ report.created_date | naturaltime }}
-    </div>
-    <div class="card-footer-item">
-        <form name="resolve" method="post" action="{% url 'settings-report-resolve' report.id %}">
-            {% csrf_token %}
-            <button class="button" type="submit">
-                {% if report.resolved %}
-                {% trans "Re-open" %}
-                {% else %}
-                {% trans "Resolve" %}
-                {% endif %}
-            </button>
-        </form>
-    </div>
-</footer>
+<div class="card-footer-item">
+    <p>{% blocktrans with username=report.reporter.display_name path=report.reporter.local_path %}Reported by <a href="{{ path }}">{{ username }}</a>{% endblocktrans %}</p>
+</div>
+<div class="card-footer-item">
+    {{ report.created_date | naturaltime }}
+</div>
+<div class="card-footer-item">
+    <form name="resolve" method="post" action="{% url 'settings-report-resolve' report.id %}">
+        {% csrf_token %}
+        <button class="button" type="submit">
+            {% if report.resolved %}
+            {% trans "Re-open" %}
+            {% else %}
+            {% trans "Resolve" %}
+            {% endif %}
+        </button>
+    </form>
+</div>
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/goal_card.html b/bookwyrm/templates/snippets/goal_card.html
index 5014b81c..329fea54 100644
--- a/bookwyrm/templates/snippets/goal_card.html
+++ b/bookwyrm/templates/snippets/goal_card.html
@@ -17,11 +17,9 @@
 {% endblock %}
 
 {% block card-footer %}
-<footer class="card-footer has-background-white-bis">
-    <form class="card-footer-item is-flex-direction-column" method="post" action="{% url 'hide-goal' %}">
-        {% csrf_token %}
-        <button type="submit" class="button is-danger is-light is-block set-display" >{% trans "Dismiss message" %}</button>
-        <p class="help">{% blocktrans with path=request.user.local_path %}You can set or change your reading goal any time from your <a href="{{ path }}">profile page</a>{% endblocktrans %}</p>
-    </form>
-</footer>
+<form class="card-footer-item is-flex-direction-column" method="post" action="{% url 'hide-goal' %}">
+    {% csrf_token %}
+    <button type="submit" class="button is-danger is-light is-block set-display" >{% trans "Dismiss message" %}</button>
+    <p class="help">{% blocktrans with path=request.user.local_path %}You can set or change your reading goal any time from your <a href="{{ path }}">profile page</a>{% endblocktrans %}</p>
+</form>
 {% endblock %}

From 415a12cf787682bbf8b0590ccf14c46415e081f2 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 21 Apr 2021 22:30:52 +0200
Subject: [PATCH 0889/1285] Move H3 tag

---
 bookwyrm/templates/snippets/status/layout.html        | 6 +++---
 bookwyrm/templates/snippets/status/status_header.html | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/templates/snippets/status/layout.html b/bookwyrm/templates/snippets/status/layout.html
index 68feb897..7ef269af 100644
--- a/bookwyrm/templates/snippets/status/layout.html
+++ b/bookwyrm/templates/snippets/status/layout.html
@@ -4,9 +4,9 @@
 {% load humanize %}
 
 {% block card-header %}
-    <h3 class="card-header-title has-background-white-ter is-block">
-        {% include 'snippets/status/status_header.html' with status=status %}
-    </h3>
+<div class="card-header-title has-background-white-ter is-block">
+    {% include 'snippets/status/status_header.html' with status=status %}
+</div>
 {% endblock %}
 
 {% block card-content %}{% endblock %}
diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html
index 27bce0ca..ca8b599c 100644
--- a/bookwyrm/templates/snippets/status/status_header.html
+++ b/bookwyrm/templates/snippets/status/status_header.html
@@ -10,7 +10,7 @@
     </figure>
 
     <div class="media-content">
-        <p>
+        <h3 class="has-text-weight-bold">
             <span
                 itemprop="author"
                 itemscope
@@ -75,7 +75,7 @@
                     {{ status.mention_books.first.title }}
                 </a>
             {% endif %}
-        </p>
+        </h3>
         <p class="is-size-7 is-flex is-align-items-center">
             <a href="{{ status.remote_id }}">{{ status.published_date|timesince }}</a>
             {% if status.progress %}

From b1fea9845810db0503afcd36e55fb4a4032eacd3 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 21 Apr 2021 22:31:27 +0200
Subject: [PATCH 0890/1285] Use one card-footer-item per footer button

---
 .../templates/snippets/status/layout.html     | 49 +++++++++----------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/bookwyrm/templates/snippets/status/layout.html b/bookwyrm/templates/snippets/status/layout.html
index 7ef269af..28bfe621 100644
--- a/bookwyrm/templates/snippets/status/layout.html
+++ b/bookwyrm/templates/snippets/status/layout.html
@@ -12,8 +12,8 @@
 {% block card-content %}{% endblock %}
 
 {% block card-footer %}
-<div class="card-content pt-0">
-    {% if moderation_mode and perms.bookwyrm.moderate_post %}
+{% if moderation_mode and perms.bookwyrm.moderate_post %}
+<div class="card-footer-item">
 
     {# moderation options #}
     <form class="dropdown-item pt-0 pb-0" name="delete-{{status.id}}" action="/delete-status/{{ status.id }}" method="post">
@@ -22,28 +22,28 @@
             {% trans "Delete status" %}
         </button>
     </form>
-    {% elif no_interact %}
-    {# nothing here #}
-    {% elif request.user.is_authenticated %}
-    <div class="is-flex">
-        <div>
-            {% trans "Reply" as button_text %}
-            {% include 'snippets/toggle/toggle_button.html' with controls_text="show-comment" controls_uid=status.id text=button_text icon_with_text="comment" class="is-small is-white toggle-button" focus="id_content_reply" %}
-        </div>
-        <div class="ml-3">
-            {% include 'snippets/boost_button.html' with status=status %}
-        </div>
-        <div class="ml-3">
-            {% include 'snippets/fav_button.html' with status=status %}
-        </div>
-        {% if not moderation_mode %}
-        <div class="ml-3">
-            {% include 'snippets/status/status_options.html' with class="is-small is-white" right=True %}
-        </div>
-        {% endif %}
-    </div>
+</div>
+{% elif no_interact %}
+{# nothing here #}
+{% elif request.user.is_authenticated %}
+<div class="card-footer-item">
+    {% trans "Reply" as button_text %}
+    {% include 'snippets/toggle/toggle_button.html' with controls_text="show-comment" controls_uid=status.id text=button_text icon_with_text="comment" class="is-small is-light is-transparent toggle-button" focus="id_content_reply" %}
+</div>
+<div class="card-footer-item">
+    {% include 'snippets/boost_button.html' with status=status %}
+</div>
+<div class="card-footer-item">
+    {% include 'snippets/fav_button.html' with status=status %}
+</div>
+{% if not moderation_mode %}
+<div class="card-footer-item">
+    {% include 'snippets/status/status_options.html' with class="is-small is-light is-transparent" right=True %}
+</div>
+{% endif %}
 
-    {% else %}
+{% else %}
+<div class="card-footer-item">
     <a href="/login">
         <span class="icon icon-comment is-small" title="{% trans 'Reply' %}">
             <span class="is-sr-only">{% trans "Reply" %}</span>
@@ -57,11 +57,10 @@
             <span class="is-sr-only">{% trans "Like status" %}</span>
         </span>
     </a>
-    {% endif %}
 </div>
+{% endif %}
 {% endblock %}
 
-
 {% block card-bonus %}
 {% if request.user.is_authenticated and not moderation_mode %}
 {% with status.id|uuid as uuid %}

From 0b0a283e641db55c231bb1afc5a2bef776de2f2b Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 21 Apr 2021 22:32:14 +0200
Subject: [PATCH 0891/1285] Fix buttons styles

---
 bookwyrm/static/css/bookwyrm.css              | 24 +++++++++++++++++++
 bookwyrm/templates/snippets/boost_button.html | 12 +++++-----
 bookwyrm/templates/snippets/fav_button.html   | 12 +++++-----
 .../snippets/status/status_options.html       |  4 ++--
 .../snippets/toggle/toggle_button.html        |  6 ++---
 5 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 67eb1eba..0d790e2a 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -30,6 +30,30 @@ body {
     min-width: 75% !important;
 }
 
+/** Utils
+ ******************************************************************************/
+
+@media only screen and (max-width: 768px) {
+     .is-sr-only-mobile {
+        border: none !important;
+        clip: rect(0,0,0,0) !important;
+        height: .01em !important;
+        overflow: hidden !important;
+        padding: 0 !important;
+        position: absolute !important;
+        white-space: nowrap !important;
+        width: .01em !important;
+    }
+
+    .m-0-mobile {
+        margin: 0 !important;
+    }
+}
+
+.button.is-transparent {
+    background-color: transparent;
+}
+
 /** Shelving
  ******************************************************************************/
 
diff --git a/bookwyrm/templates/snippets/boost_button.html b/bookwyrm/templates/snippets/boost_button.html
index 27a6196a..3a01fc82 100644
--- a/bookwyrm/templates/snippets/boost_button.html
+++ b/bookwyrm/templates/snippets/boost_button.html
@@ -4,16 +4,16 @@
 {% with status.id|uuid as uuid %}
 <form name="boost" action="/boost/{{ status.id }}" method="post" class="interaction boost-{{ status.id }}-{{ uuid }} {% if request.user|boosted:status  %}is-hidden{% endif %}" data-id="boost-{{ status.id }}-{{ uuid }}">
     {% csrf_token %}
-    <button class="button is-small is-white" type="submit" {% if not status.boostable %}disabled{% endif %}>
-        <span class="icon icon-boost" title="{% trans 'Boost status' %}"></span>
-        <span>{% trans "Boost status" %}</span>
+    <button class="button is-small is-light is-transparent" type="submit" {% if not status.boostable %}disabled{% endif %}>
+        <span class="icon icon-boost m-0-mobile" title="{% trans 'Boost' %}"></span>
+        <span class="is-sr-only-mobile">{% trans "Boost" %}</span>
     </button>
 </form>
 <form name="unboost" action="/unboost/{{ status.id }}" method="post" class="interaction boost-{{ status.id }}-{{ uuid }} active {% if not request.user|boosted:status %}is-hidden{% endif %}" data-id="boost-{{ status.id }}-{{ uuid }}">
     {% csrf_token %}
-    <button class="button is-small is-white" type="submit">
-        <span class="icon icon-boost has-text-primary" title="{% trans 'Un-boost status' %}"></span>
-        <span>{% trans "Un-boost status" %}</span>
+    <button class="button is-small is-light is-transparent" type="submit">
+        <span class="icon icon-boost has-text-primary m-0-mobile" title="{% trans 'Un-boost' %}"></span>
+        <span class="is-sr-only-mobile">{% trans "Un-boost" %}</span>
     </button>
 </form>
 {% endwith %}
diff --git a/bookwyrm/templates/snippets/fav_button.html b/bookwyrm/templates/snippets/fav_button.html
index da6e6661..cd22822a 100644
--- a/bookwyrm/templates/snippets/fav_button.html
+++ b/bookwyrm/templates/snippets/fav_button.html
@@ -3,17 +3,17 @@
 {% with status.id|uuid as uuid %}
 <form name="favorite" action="/favorite/{{ status.id }}" method="POST" class="interaction fav-{{ status.id }}-{{ uuid }} {% if request.user|liked:status %}is-hidden{% endif %}" data-id="fav-{{ status.id }}-{{ uuid }}">
     {% csrf_token %}
-    <button class="button is-small is-white" type="submit">
-        <span class="icon icon-heart" title="{% trans 'Like status' %}">
+    <button class="button is-small is-light is-transparent" type="submit">
+        <span class="icon icon-heart m-0-mobile" title="{% trans 'Like' %}">
         </span>
-        <span>{% trans "Like status" %}</span>
+        <span class="is-sr-only-mobile">{% trans "Like" %}</span>
     </button>
 </form>
 <form name="unfavorite" action="/unfavorite/{{ status.id }}" method="POST" class="interaction fav-{{ status.id }}-{{ uuid }} active {% if not request.user|liked:status %}is-hidden{% endif %}" data-id="fav-{{ status.id }}-{{ uuid }}">
     {% csrf_token %}
-    <button class="button is-white is-small" type="submit">
-        <span class="icon icon-heart has-text-primary" title="{% trans 'Un-like status' %}"></span>
-        <span>{% trans "Un-like status" %}</span>
+    <button class="button is-light is-transparent is-small" type="submit">
+        <span class="icon icon-heart has-text-primary m-0-mobile" title="{% trans 'Un-like' %}"></span>
+        <span class="is-sr-only-mobile">{% trans "Un-like" %}</span>
     </button>
 </form>
 {% endwith %}
diff --git a/bookwyrm/templates/snippets/status/status_options.html b/bookwyrm/templates/snippets/status/status_options.html
index 16d49b3d..763d09b8 100644
--- a/bookwyrm/templates/snippets/status/status_options.html
+++ b/bookwyrm/templates/snippets/status/status_options.html
@@ -3,8 +3,8 @@
 {% load bookwyrm_tags %}
 
 {% block dropdown-trigger %}
-<span class="icon icon-dots-three"></span>
-<span>{% trans "More options" %}</span>
+<span class="icon icon-dots-three m-0-mobile"></span>
+<span class="is-sr-only-mobile">{% trans "More options" %}</span>
 {% endblock %}
 
 {% block dropdown-list %}
diff --git a/bookwyrm/templates/snippets/toggle/toggle_button.html b/bookwyrm/templates/snippets/toggle/toggle_button.html
index d5a8f3dc..410f823b 100644
--- a/bookwyrm/templates/snippets/toggle/toggle_button.html
+++ b/bookwyrm/templates/snippets/toggle/toggle_button.html
@@ -10,12 +10,12 @@
     >
 
     {% if icon %}
-    <span class="icon icon-{{ icon }}" title="{{ text }}">
+    <span class="icon icon-{{ icon }} m-0-mobile" title="{{ text }}">
         <span class="is-sr-only">{{ text }}</span>
     </span>
     {% elif icon_with_text %}
-    <span class="icon icon-{{ icon_with_text }}" aria-hidden></span>
-    <span>{{ text }}</span>
+    <span class="icon icon-{{ icon_with_text }} m-0-mobile" title="{{ text }}"></span>
+    <span class="is-sr-only-mobile">{{ text }}</span>
     {% else %}
     <span>{{ text }}</span>
     {% endif %}

From 7a5ea31ee757bc13e4cf76a90b44b1a4825c0ce7 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 21 Apr 2021 22:32:26 +0200
Subject: [PATCH 0892/1285] Fix progress display in title

---
 .../templates/snippets/status/status_header.html     | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html
index ca8b599c..b833b92c 100644
--- a/bookwyrm/templates/snippets/status/status_header.html
+++ b/bookwyrm/templates/snippets/status/status_header.html
@@ -79,14 +79,12 @@
         <p class="is-size-7 is-flex is-align-items-center">
             <a href="{{ status.remote_id }}">{{ status.published_date|timesince }}</a>
             {% if status.progress %}
-            <span class="help">
-            {% spaceless %}
-            ({% if status.progress_mode == 'PG' %}
-                {% include 'snippets/page_text.html' with page=status.progress total_pages=status.book.pages %}
+            <span class="ml-1">
+            {% if status.progress_mode == 'PG' %}
+                ({% include 'snippets/page_text.html' with page=status.progress total_pages=status.book.pages %})
             {% else %}
-                {{ status.progress }}%
-            {% endif %})
-            {% endspaceless %}
+                ({{ status.progress }}%)
+            {% endif %}
             </span>
             {% endif %}
             {% include 'snippets/privacy-icons.html' with item=status %}

From 2749e6ad9566d059a76bb78505944efcac6d428f Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 21 Apr 2021 22:36:07 +0200
Subject: [PATCH 0893/1285] Fix CSS for linter

---
 bookwyrm/static/css/bookwyrm.css | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 0d790e2a..74fe76ae 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -34,15 +34,15 @@ body {
  ******************************************************************************/
 
 @media only screen and (max-width: 768px) {
-     .is-sr-only-mobile {
+    .is-sr-only-mobile {
         border: none !important;
-        clip: rect(0,0,0,0) !important;
-        height: .01em !important;
+        clip: rect(0, 0, 0, 0) !important;
+        height: 0.01em !important;
         overflow: hidden !important;
         padding: 0 !important;
         position: absolute !important;
         white-space: nowrap !important;
-        width: .01em !important;
+        width: 0.01em !important;
     }
 
     .m-0-mobile {

From 1472f7d919e61df07ad958566cbb42e168cbc0c0 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 22 Apr 2021 06:58:21 -0700
Subject: [PATCH 0894/1285] Restores markdown rendering in book description
 previews

---
 bookwyrm/templates/snippets/status/generated_status.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/status/generated_status.html b/bookwyrm/templates/snippets/status/generated_status.html
index f3bbae44..cb65a6f2 100644
--- a/bookwyrm/templates/snippets/status/generated_status.html
+++ b/bookwyrm/templates/snippets/status/generated_status.html
@@ -13,7 +13,7 @@
     </div>
     <div class="column">
         <h3 class="title is-6 mb-1">{% include 'snippets/book_titleby.html' with book=book %}</h3>
-        <p>{{ book|book_description|default:""|truncatewords_html:20 }}</p>
+        <p>{{ book|book_description|to_markdown|default:""|safe|truncatewords_html:20 }}</p>
         {% include 'snippets/shelve_button/shelve_button.html' with book=book %}
     </div>
 </div>

From ae5e7447312727169cde797ecbfc04a1c889e6ad Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 22 Apr 2021 07:29:09 -0700
Subject: [PATCH 0895/1285] Save last edited by user

---
 bookwyrm/activitypub/book.py         | 1 +
 bookwyrm/models/activitypub_mixin.py | 6 +++---
 bookwyrm/models/book.py              | 6 +++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/activitypub/book.py b/bookwyrm/activitypub/book.py
index 7615adcf..538fa571 100644
--- a/bookwyrm/activitypub/book.py
+++ b/bookwyrm/activitypub/book.py
@@ -11,6 +11,7 @@ class Book(ActivityObject):
     """ serializes an edition or work, abstract """
 
     title: str
+    lastEditedBy: str = None
     sortTitle: str = ""
     subtitle: str = ""
     description: str = ""
diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index f687e96c..71e02082 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -148,14 +148,14 @@ class ActivitypubMixin:
         mentions = self.recipients if hasattr(self, "recipients") else []
 
         # we always send activities to explicitly mentioned users' inboxes
-        recipients = [u.inbox for u in mentions or []]
+        recipients = [u.inbox for u in mentions or [] if not u.local]
 
         # unless it's a dm, all the followers should receive the activity
         if privacy != "direct":
             # we will send this out to a subset of all remote users
             queryset = user_model.viewer_aware_objects(user).filter(
                 local=False,
-            )
+            ).distinct()
             # filter users first by whether they're using the desired software
             # this lets us send book updates only to other bw servers
             if software:
@@ -175,7 +175,7 @@ class ActivitypubMixin:
                 "inbox", flat=True
             )
             recipients += list(shared_inboxes) + list(inboxes)
-        return recipients
+        return list(set(recipients))
 
     def to_activity_dataclass(self):
         """ convert from a model to an activity """
diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index a6824c0a..5280c7aa 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -26,7 +26,11 @@ class BookDataModel(ObjectMixin, BookWyrmModel):
         max_length=255, blank=True, null=True, deduplication_field=True
     )
 
-    last_edited_by = models.ForeignKey("User", on_delete=models.PROTECT, null=True)
+    last_edited_by = fields.ForeignKey(
+        "User",
+        on_delete=models.PROTECT,
+        null=True,
+    )
 
     class Meta:
         """ can't initialize this model, that wouldn't make sense """

From c405580e8e2b28b4738d1140d99e5b8ffbf0b0dd Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 22 Apr 2021 07:37:12 -0700
Subject: [PATCH 0896/1285] Updates edition federation test

---
 bookwyrm/tests/data/bw_edition.json            |  1 +
 .../tests/views/inbox/test_inbox_update.py     | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/tests/data/bw_edition.json b/bookwyrm/tests/data/bw_edition.json
index 0cc17d29..6194e409 100644
--- a/bookwyrm/tests/data/bw_edition.json
+++ b/bookwyrm/tests/data/bw_edition.json
@@ -1,5 +1,6 @@
 {
     "id": "https://bookwyrm.social/book/5989",
+    "lastEditedBy": "https://example.com/users/rat",
     "type": "Edition",
     "authors": [
         "https://bookwyrm.social/author/417"
diff --git a/bookwyrm/tests/views/inbox/test_inbox_update.py b/bookwyrm/tests/views/inbox/test_inbox_update.py
index 012343e7..114eae23 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_update.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_update.py
@@ -23,6 +23,16 @@ class InboxUpdate(TestCase):
         )
         self.local_user.remote_id = "https://example.com/user/mouse"
         self.local_user.save(broadcast=False)
+        with patch("bookwyrm.models.user.set_remote_server.delay"):
+            self.remote_user = models.User.objects.create_user(
+                "rat",
+                "rat@rat.com",
+                "ratword",
+                local=False,
+                remote_id="https://example.com/users/rat",
+                inbox="https://example.com/users/rat/inbox",
+                outbox="https://example.com/users/rat/outbox",
+            )
 
         self.create_json = {
             "id": "hi",
@@ -34,7 +44,7 @@ class InboxUpdate(TestCase):
         }
         models.SiteSettings.objects.create()
 
-    def test_handle_update_list(self):
+    def test_update_list(self):
         """ a new list """
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             book_list = models.List.objects.create(
@@ -68,7 +78,7 @@ class InboxUpdate(TestCase):
         self.assertEqual(book_list.description, "summary text")
         self.assertEqual(book_list.remote_id, "https://example.com/list/22")
 
-    def test_handle_update_user(self):
+    def test_update_user(self):
         """ update an existing user """
         # we only do this with remote users
         self.local_user.local = False
@@ -94,7 +104,7 @@ class InboxUpdate(TestCase):
         self.assertEqual(user.localname, "mouse")
         self.assertTrue(user.discoverable)
 
-    def test_handle_update_edition(self):
+    def test_update_edition(self):
         """ update an existing edition """
         datafile = pathlib.Path(__file__).parent.joinpath("../../data/bw_edition.json")
         bookdata = json.loads(datafile.read_bytes())
@@ -123,7 +133,7 @@ class InboxUpdate(TestCase):
         book = models.Edition.objects.get(id=book.id)
         self.assertEqual(book.title, "Piranesi")
 
-    def test_handle_update_work(self):
+    def test_update_work(self):
         """ update an existing edition """
         datafile = pathlib.Path(__file__).parent.joinpath("../../data/bw_work.json")
         bookdata = json.loads(datafile.read_bytes())

From db09ca43312fbbfafcda1d792db130cb358f2548 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 22 Apr 2021 07:51:06 -0700
Subject: [PATCH 0897/1285] Adds last edited by to author

---
 bookwyrm/activitypub/book.py         |  1 +
 bookwyrm/models/activitypub_mixin.py | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/activitypub/book.py b/bookwyrm/activitypub/book.py
index 538fa571..c5b896e3 100644
--- a/bookwyrm/activitypub/book.py
+++ b/bookwyrm/activitypub/book.py
@@ -65,6 +65,7 @@ class Author(ActivityObject):
     """ author of a book """
 
     name: str
+    lastEditedBy: str = None
     born: str = None
     died: str = None
     aliases: List[str] = field(default_factory=lambda: [])
diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index 71e02082..82a45ac8 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -153,9 +153,13 @@ class ActivitypubMixin:
         # unless it's a dm, all the followers should receive the activity
         if privacy != "direct":
             # we will send this out to a subset of all remote users
-            queryset = user_model.viewer_aware_objects(user).filter(
-                local=False,
-            ).distinct()
+            queryset = (
+                user_model.viewer_aware_objects(user)
+                .filter(
+                    local=False,
+                )
+                .distinct()
+            )
             # filter users first by whether they're using the desired software
             # this lets us send book updates only to other bw servers
             if software:

From dd0aa7a12394fec47d37c7999f30e6e566d17d19 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 22 Apr 2021 08:08:03 -0700
Subject: [PATCH 0898/1285] Test that remote user is being set on books

---
 bookwyrm/tests/views/inbox/test_inbox_update.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bookwyrm/tests/views/inbox/test_inbox_update.py b/bookwyrm/tests/views/inbox/test_inbox_update.py
index 114eae23..fbd37738 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_update.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_update.py
@@ -132,6 +132,7 @@ class InboxUpdate(TestCase):
             )
         book = models.Edition.objects.get(id=book.id)
         self.assertEqual(book.title, "Piranesi")
+        self.assertEqual(book.last_edited_by, self.remote_user)
 
     def test_update_work(self):
         """ update an existing edition """

From d5b27e2202d806f52460e83c28d2d6ea49aa2ac7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 22 Apr 2021 08:31:32 -0700
Subject: [PATCH 0899/1285] Test re-following a user

---
 .../tests/views/inbox/test_inbox_follow.py    | 42 ++++++++++++++++---
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/tests/views/inbox/test_inbox_follow.py b/bookwyrm/tests/views/inbox/test_inbox_follow.py
index c549c31b..b0177cb8 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_follow.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_follow.py
@@ -1,4 +1,5 @@
 """ tests incoming activities"""
+import json
 from unittest.mock import patch
 
 from django.test import TestCase
@@ -34,7 +35,7 @@ class InboxRelationships(TestCase):
 
         models.SiteSettings.objects.create()
 
-    def test_handle_follow(self):
+    def test_follow(self):
         """ remote user wants to follow local user """
         activity = {
             "@context": "https://www.w3.org/ns/activitystreams",
@@ -48,6 +49,8 @@ class InboxRelationships(TestCase):
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
             views.inbox.activity_task(activity)
             self.assertEqual(mock.call_count, 1)
+            response_activity = json.loads(mock.call_args[0][1])
+            self.assertEqual(response_activity["type"], "Accept")
 
         # notification created
         notification = models.Notification.objects.get()
@@ -61,7 +64,34 @@ class InboxRelationships(TestCase):
         follow = models.UserFollows.objects.get(user_object=self.local_user)
         self.assertEqual(follow.user_subject, self.remote_user)
 
-    def test_handle_follow_manually_approved(self):
+    def test_follow_duplicate(self):
+        """ remote user wants to follow local user twice """
+        activity = {
+            "@context": "https://www.w3.org/ns/activitystreams",
+            "id": "https://example.com/users/rat/follows/123",
+            "type": "Follow",
+            "actor": "https://example.com/users/rat",
+            "object": "https://example.com/user/mouse",
+        }
+
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            views.inbox.activity_task(activity)
+
+        # the follow relationship should exist
+        follow = models.UserFollows.objects.get(user_object=self.local_user)
+        self.assertEqual(follow.user_subject, self.remote_user)
+
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
+            views.inbox.activity_task(activity)
+            self.assertEqual(mock.call_count, 1)
+            response_activity = json.loads(mock.call_args[0][1])
+            self.assertEqual(response_activity["type"], "Accept")
+
+        # the follow relationship should STILL exist
+        follow = models.UserFollows.objects.get(user_object=self.local_user)
+        self.assertEqual(follow.user_subject, self.remote_user)
+
+    def test_follow_manually_approved(self):
         """ needs approval before following """
         activity = {
             "@context": "https://www.w3.org/ns/activitystreams",
@@ -91,7 +121,7 @@ class InboxRelationships(TestCase):
         follow = models.UserFollows.objects.all()
         self.assertEqual(list(follow), [])
 
-    def test_handle_undo_follow_request(self):
+    def test_undo_follow_request(self):
         """ the requester cancels a follow request """
         self.local_user.manually_approves_followers = True
         self.local_user.save(broadcast=False)
@@ -121,7 +151,7 @@ class InboxRelationships(TestCase):
 
         self.assertFalse(self.local_user.follower_requests.exists())
 
-    def test_handle_unfollow(self):
+    def test_unfollow(self):
         """ remove a relationship """
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             rel = models.UserFollows.objects.create(
@@ -146,7 +176,7 @@ class InboxRelationships(TestCase):
         views.inbox.activity_task(activity)
         self.assertIsNone(self.local_user.followers.first())
 
-    def test_handle_follow_accept(self):
+    def test_follow_accept(self):
         """ a remote user approved a follow request from local """
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             rel = models.UserFollowRequest.objects.create(
@@ -177,7 +207,7 @@ class InboxRelationships(TestCase):
         self.assertEqual(follows.count(), 1)
         self.assertEqual(follows.first(), self.local_user)
 
-    def test_handle_follow_reject(self):
+    def test_follow_reject(self):
         """ turn down a follow request """
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             rel = models.UserFollowRequest.objects.create(

From 6b84e53ddde07d68f293393a42158911a90c3686 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 22 Apr 2021 08:40:32 -0700
Subject: [PATCH 0900/1285] Send accepts to duplicate follow requests

---
 bookwyrm/models/relationship.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/models/relationship.py b/bookwyrm/models/relationship.py
index 927c8740..3f849597 100644
--- a/bookwyrm/models/relationship.py
+++ b/bookwyrm/models/relationship.py
@@ -101,12 +101,15 @@ class UserFollowRequest(ActivitypubMixin, UserRelationship):
 
     def save(self, *args, broadcast=True, **kwargs):
         """ make sure the follow or block relationship doesn't already exist """
-        # don't create a request if a follow already exists
+        # if there's a request for a follow that already exists, accept it
+        # without changing the local database state
         if UserFollows.objects.filter(
             user_subject=self.user_subject,
             user_object=self.user_object,
         ).exists():
-            raise IntegrityError()
+            self.accept(broadcast_only=True)
+            return
+
         # blocking in either direction is a no-go
         if UserBlocks.objects.filter(
             Q(
@@ -141,9 +144,9 @@ class UserFollowRequest(ActivitypubMixin, UserRelationship):
         """ get id for sending an accept or reject of a local user """
 
         base_path = self.user_object.remote_id
-        return "%s#%s/%d" % (base_path, status, self.id)
+        return "%s#%s/%d" % (base_path, status, self.id or 0)
 
-    def accept(self):
+    def accept(self, broadcast_only=False):
         """ turn this request into the real deal"""
         user = self.user_object
         if not self.user_subject.local:
@@ -153,6 +156,9 @@ class UserFollowRequest(ActivitypubMixin, UserRelationship):
                 object=self.to_activity(),
             ).serialize()
             self.broadcast(activity, user)
+        if broadcast_only:
+            return
+
         with transaction.atomic():
             UserFollows.from_request(self)
             self.delete()

From c7daf27baf06b24c9f4104b3114645419c917598 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 22 Apr 2021 09:06:26 -0700
Subject: [PATCH 0901/1285] Adds migration for last edited by field

---
 .../migrations/0069_auto_20210422_1604.py     | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 bookwyrm/migrations/0069_auto_20210422_1604.py

diff --git a/bookwyrm/migrations/0069_auto_20210422_1604.py b/bookwyrm/migrations/0069_auto_20210422_1604.py
new file mode 100644
index 00000000..6591e7b9
--- /dev/null
+++ b/bookwyrm/migrations/0069_auto_20210422_1604.py
@@ -0,0 +1,34 @@
+# Generated by Django 3.1.8 on 2021-04-22 16:04
+
+import bookwyrm.models.fields
+from django.conf import settings
+from django.db import migrations
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0068_ordering_for_list_items"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="author",
+            name="last_edited_by",
+            field=bookwyrm.models.fields.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="book",
+            name="last_edited_by",
+            field=bookwyrm.models.fields.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+    ]

From e9dc63e296a926e9e510b780eb9742127898ca33 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 22 Apr 2021 09:25:12 -0700
Subject: [PATCH 0902/1285] Only remove objects that are known

---
 bookwyrm/activitypub/verbs.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index c2cbfea3..090beea5 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -176,7 +176,8 @@ class Remove(Add):
     def action(self):
         """ find and remove the activity object """
         obj = self.object.to_model(save=False, allow_create=False)
-        obj.delete()
+        if obj:
+            obj.delete()
 
 
 @dataclass(init=False)

From cfa424ca59d0d52c832ad4b0011bfda1df07741a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 22 Apr 2021 09:37:24 -0700
Subject: [PATCH 0903/1285] Fixes nondeterministic test outcome

---
 bookwyrm/tests/models/test_activitypub_mixin.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/tests/models/test_activitypub_mixin.py b/bookwyrm/tests/models/test_activitypub_mixin.py
index 0d1acd97..e172ede9 100644
--- a/bookwyrm/tests/models/test_activitypub_mixin.py
+++ b/bookwyrm/tests/models/test_activitypub_mixin.py
@@ -155,8 +155,8 @@ class ActivitypubMixins(TestCase):
 
         recipients = ActivitypubMixin.get_recipients(mock_self)
         self.assertEqual(len(recipients), 2)
-        self.assertEqual(recipients[0], another_remote_user.inbox)
-        self.assertEqual(recipients[1], self.remote_user.inbox)
+        self.assertTrue(another_remote_user.inbox in recipients)
+        self.assertTrue(self.remote_user.inbox in recipients)
 
     def test_get_recipients_direct(self, _):
         """ determines the recipients for a user's object broadcast """

From a797b68558a9a8245a17a22ac54dba93ad6bd470 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 22 Apr 2021 10:22:37 -0700
Subject: [PATCH 0904/1285] Adds test that replicates follower deletion bug

---
 .../tests/views/inbox/test_inbox_update.py    | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/tests/views/inbox/test_inbox_update.py b/bookwyrm/tests/views/inbox/test_inbox_update.py
index fbd37738..5681ec88 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_update.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_update.py
@@ -80,14 +80,22 @@ class InboxUpdate(TestCase):
 
     def test_update_user(self):
         """ update an existing user """
-        # we only do this with remote users
-        self.local_user.local = False
-        self.local_user.save()
+        models.UserFollows.objects.create(
+            user_subject=self.local_user,
+            user_object=self.remote_user,
+        )
+        models.UserFollows.objects.create(
+            user_subject=self.remote_user,
+            user_object=self.local_user,
+        )
+        self.assertTrue(self.remote_user in self.local_user.followers.all())
+        self.assertTrue(self.local_user in self.remote_user.followers.all())
 
-        datafile = pathlib.Path(__file__).parent.joinpath("../../data/ap_user.json")
+        datafile = pathlib.Path(__file__).parent.joinpath("../../data/ap_user_rat.json")
         userdata = json.loads(datafile.read_bytes())
         del userdata["icon"]
-        self.assertIsNone(self.local_user.name)
+        self.assertIsNone(self.remote_user.name)
+        self.assertFalse(self.remote_user.discoverable)
         views.inbox.activity_task(
             {
                 "type": "Update",
@@ -98,12 +106,15 @@ class InboxUpdate(TestCase):
                 "object": userdata,
             }
         )
-        user = models.User.objects.get(id=self.local_user.id)
-        self.assertEqual(user.name, "MOUSE?? MOUSE!!")
-        self.assertEqual(user.username, "mouse@example.com")
-        self.assertEqual(user.localname, "mouse")
+        user = models.User.objects.get(id=self.remote_user.id)
+        self.assertEqual(user.name, "RAT???")
+        self.assertEqual(user.username, "rat@example.com")
         self.assertTrue(user.discoverable)
 
+        # make sure relationships aren't disrupted
+        self.assertTrue(self.remote_user in self.local_user.followers.all())
+        self.assertTrue(self.local_user in self.remote_user.followers.all())
+
     def test_update_edition(self):
         """ update an existing edition """
         datafile = pathlib.Path(__file__).parent.joinpath("../../data/bw_edition.json")

From 3ed822b9ea4339d8ab096bf6bad02d753d09878a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 22 Apr 2021 10:28:10 -0700
Subject: [PATCH 0905/1285] Don't erase follows on update

---
 bookwyrm/models/fields.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py
index 2aefae51..336ee4a1 100644
--- a/bookwyrm/models/fields.py
+++ b/bookwyrm/models/fields.py
@@ -275,9 +275,12 @@ class ManyToManyField(ActivitypubFieldMixin, models.ManyToManyField):
         return [i.remote_id for i in value.all()]
 
     def field_from_activity(self, value):
-        items = []
         if value is None or value is MISSING:
-            return []
+            return None
+        if not isinstance(value, list):
+            # TODO
+            return None
+        items = []
         for remote_id in value:
             try:
                 validate_remote_id(remote_id)

From c4555852625e505fc14a817e403abb42a2e750c4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 22 Apr 2021 10:30:00 -0700
Subject: [PATCH 0906/1285] Adds missing data file

---
 bookwyrm/models/fields.py            |  2 +-
 bookwyrm/tests/data/ap_user_rat.json | 39 ++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 bookwyrm/tests/data/ap_user_rat.json

diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py
index 336ee4a1..a1b2035b 100644
--- a/bookwyrm/models/fields.py
+++ b/bookwyrm/models/fields.py
@@ -278,7 +278,7 @@ class ManyToManyField(ActivitypubFieldMixin, models.ManyToManyField):
         if value is None or value is MISSING:
             return None
         if not isinstance(value, list):
-            # TODO
+            # If this is a link, we currently aren't doing anything with it
             return None
         items = []
         for remote_id in value:
diff --git a/bookwyrm/tests/data/ap_user_rat.json b/bookwyrm/tests/data/ap_user_rat.json
new file mode 100644
index 00000000..0e36f1c6
--- /dev/null
+++ b/bookwyrm/tests/data/ap_user_rat.json
@@ -0,0 +1,39 @@
+{
+    "@context": [
+        "https://www.w3.org/ns/activitystreams",
+        "https://w3id.org/security/v1",
+        {
+            "manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
+            "schema": "http://schema.org#",
+            "PropertyValue": "schema:PropertyValue",
+            "value": "schema:value"
+        }
+    ],
+    "id": "https://example.com/users/rat",
+    "type": "Person",
+    "preferredUsername": "rat",
+    "name": "RAT???",
+    "inbox": "https://example.com/users/rat/inbox",
+    "outbox": "https://example.com/users/rat/outbox",
+    "followers": "https://example.com/users/rat/followers",
+    "following": "https://example.com/users/rat/following",
+    "summary": "",
+    "publicKey": {
+        "id": "https://example.com/users/rat/#main-key",
+        "owner": "https://example.com/users/rat",
+        "publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC6QisDrjOQvkRo/MqNmSYPwqtt\nCxg/8rCW+9jKbFUKvqjTeKVotEE85122v/DCvobCCdfQuYIFdVMk+dB1xJ0iPGPg\nyU79QHY22NdV9mFKA2qtXVVxb5cxpA4PlwOHM6PM/k8B+H09OUrop2aPUAYwy+vg\n+MXyz8bAXrIS1kq6fQIDAQAB\n-----END PUBLIC KEY-----"
+    },
+    "endpoints": {
+        "sharedInbox": "https://example.com/inbox"
+    },
+    "bookwyrmUser": true,
+    "manuallyApprovesFollowers": false,
+    "discoverable": true,
+    "devices": "https://friend.camp/users/tripofmice/collections/devices",
+    "tag": [],
+    "icon": {
+        "type": "Image",
+        "mediaType": "image/png",
+        "url": "https://example.com/images/avatars/AL-2-crop-50.png"
+    }
+}

From 00e6d0524f527d09ffa3d1c040111968b0861171 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Thu, 22 Apr 2021 20:41:58 +0200
Subject: [PATCH 0907/1285] Accessibility: add language to `lang` attr on
 `html` tag

I only use the first subtag of the language string given by `get_language()`, because `get_language()` returns an all-lowercase string, and I don't know if it'll be considered valid by browsers.
---
 bookwyrm/templates/layout.html         | 2 +-
 bookwyrm/templatetags/bookwyrm_tags.py | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 4ce7a7f8..84482cdf 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -1,7 +1,7 @@
 {% load bookwyrm_tags %}
 {% load i18n %}
 <!DOCTYPE html>
-<html lang="en">
+<html lang="{% get_lang %}">
 <head>
     <title>{% block title %}BookWyrm{% endblock %} | {{ site.name }}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index 69e762ce..f1bd025d 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -1,7 +1,7 @@
 """ template filters """
 from uuid import uuid4
 
-from django import template
+from django import template, utils
 from django.db.models import Avg
 
 from bookwyrm import models, views
@@ -217,3 +217,10 @@ def active_read_through(book, user):
 def comparison_bool(str1, str2):
     """ idk why I need to write a tag for this, it reutrns a bool """
     return str1 == str2
+
+
+@register.simple_tag(takes_context=False)
+def get_lang():
+    """ get current language, strip to the first two letters """
+    language = utils.translation.get_language()
+    return language[0:language.find('-')]

From ebf20de10e9dfab157d7924e6a249539dccc3830 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Thu, 22 Apr 2021 20:45:16 +0200
Subject: [PATCH 0908/1285] linter linter go away

---
 bookwyrm/templatetags/bookwyrm_tags.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index f1bd025d..30bb1d3f 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -223,4 +223,4 @@ def comparison_bool(str1, str2):
 def get_lang():
     """ get current language, strip to the first two letters """
     language = utils.translation.get_language()
-    return language[0:language.find('-')]
+    return language[0 : language.find('-')]

From 15241e38074ff7f6f66c55abbadcabd801ad80a7 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Thu, 22 Apr 2021 20:48:06 +0200
Subject: [PATCH 0909/1285] =?UTF-8?q?=E2=80=A6=E2=80=A6=E2=80=A6=20come=20?=
 =?UTF-8?q?back=20another=20day?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bookwyrm/templatetags/bookwyrm_tags.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index 30bb1d3f..08713bee 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -223,4 +223,5 @@ def comparison_bool(str1, str2):
 def get_lang():
     """ get current language, strip to the first two letters """
     language = utils.translation.get_language()
-    return language[0 : language.find('-')]
+    return language[0 : language.find("-")]
+

From 6c89eb1b650a0c1c8a9c70ddccf08f898d0ad2d6 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Thu, 22 Apr 2021 20:48:25 +0200
Subject: [PATCH 0910/1285] Update bookwyrm_tags.py

---
 bookwyrm/templatetags/bookwyrm_tags.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index 08713bee..649a0dfa 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -224,4 +224,3 @@ def get_lang():
     """ get current language, strip to the first two letters """
     language = utils.translation.get_language()
     return language[0 : language.find("-")]
-

From 15c7a1dc8225c3140231a6a1d602df6a785b6f62 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Thu, 22 Apr 2021 20:57:24 +0200
Subject: [PATCH 0911/1285] Update bookwyrm.css

---
 bookwyrm/static/css/bookwyrm.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 74fe76ae..fe7617bc 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -30,7 +30,7 @@ body {
     min-width: 75% !important;
 }
 
-/** Utils
+/** Utilities not covered by Bulma
  ******************************************************************************/
 
 @media only screen and (max-width: 768px) {

From c6e8161a9f73205a095459542dbd5650babd2077 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 22 Apr 2021 13:08:22 -0700
Subject: [PATCH 0912/1285] Removes scroll padding

---
 bookwyrm/static/css/bookwyrm.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 67eb1eba..b4abd690 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -1,6 +1,5 @@
 html {
     scroll-behavior: smooth;
-    scroll-padding-top: 20%;
 }
 
 body {

From 6915b195cef1d34d0e68e25a621850610382d36c Mon Sep 17 00:00:00 2001
From: reese <reesedporter@gmail.com>
Date: Tue, 20 Apr 2021 18:22:24 -0500
Subject: [PATCH 0913/1285] translated some strings

---
 bookwyrm/templates/moderation/report.html |   2 +-
 locale/es/LC_MESSAGES/django.po           | 166 +++++++++++-----------
 2 files changed, 81 insertions(+), 87 deletions(-)

diff --git a/bookwyrm/templates/moderation/report.html b/bookwyrm/templates/moderation/report.html
index a078fe45..934799e3 100644
--- a/bookwyrm/templates/moderation/report.html
+++ b/bookwyrm/templates/moderation/report.html
@@ -51,7 +51,7 @@
         {% for status in report.statuses.select_subclasses.all %}
         <li>
             {% if status.deleted %}
-            <em>{% trans "Statuses has been deleted" %}</em>
+            <em>{% trans "Status has been deleted" %}</em>
             {% else %}
             {% include 'snippets/status/status.html' with status=status moderation_mode=True %}
             {% endif %}
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 159e806a..ecc37932 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -298,12 +298,12 @@ msgstr "lo calificó con"
 #, fuzzy
 #| msgid "Add cover"
 msgid "Upload cover:"
-msgstr "Agregar portada"
+msgstr "Agregar portada:"
 
 #: bookwyrm/templates/book/cover_modal.html:23
 #: bookwyrm/templates/book/edit_book.html:181
 msgid "Load cover from url:"
-msgstr ""
+msgstr "Agregar portada de url:"
 
 #: bookwyrm/templates/book/edit_book.html:5
 #: bookwyrm/templates/book/edit_book.html:11
@@ -336,12 +336,12 @@ msgstr "Editado más recientemente por:"
 
 #: bookwyrm/templates/book/edit_book.html:40
 msgid "Confirm Book Info"
-msgstr ""
+msgstr "Confirmar información de libro"
 
 #: bookwyrm/templates/book/edit_book.html:47
 #, python-format
 msgid "Is \"%(name)s\" an existing author?"
-msgstr ""
+msgstr "¿Es \"%(name)s\" un autor ya existente?"
 
 #: bookwyrm/templates/book/edit_book.html:52
 #, fuzzy, python-format
@@ -351,20 +351,20 @@ msgstr "Empezar \"<em>%(book_title)s</em>\""
 
 #: bookwyrm/templates/book/edit_book.html:55
 msgid "This is a new author"
-msgstr ""
+msgstr "Este es un autor nuevo"
 
 #: bookwyrm/templates/book/edit_book.html:61
 #, python-format
 msgid "Creating a new author: %(name)s"
-msgstr ""
+msgstr "Creando un autor nuevo: %(name)s"
 
 #: bookwyrm/templates/book/edit_book.html:67
 msgid "Is this an edition of an existing work?"
-msgstr ""
+msgstr "¿Es esta una edición de una obra ya existente?"
 
 #: bookwyrm/templates/book/edit_book.html:71
 msgid "This is a new work"
-msgstr ""
+msgstr "Esta es una obra nueva"
 
 #: bookwyrm/templates/book/edit_book.html:77
 #: bookwyrm/templates/password_reset.html:30
@@ -405,7 +405,7 @@ msgstr "Publicado"
 
 #: bookwyrm/templates/book/edit_book.html:125
 msgid "Separate multiple publishers with commas."
-msgstr ""
+msgstr "Separar varios editores con comas."
 
 #: bookwyrm/templates/book/edit_book.html:132
 msgid "First published date:"
@@ -435,7 +435,7 @@ msgstr "Editar Autor/Autora"
 
 #: bookwyrm/templates/book/edit_book.html:161
 msgid "John Doe, Jane Smith"
-msgstr ""
+msgstr "Juan Nadie, Natalia Natalia"
 
 #: bookwyrm/templates/book/edit_book.html:167
 #: bookwyrm/templates/user/shelf.html:75
@@ -485,11 +485,11 @@ msgstr "Ediciones de <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 #: bookwyrm/templates/book/format_filter.html:8
 #: bookwyrm/templates/book/language_filter.html:8
 msgid "Any"
-msgstr ""
+msgstr "Cualquier"
 
 #: bookwyrm/templates/book/language_filter.html:5
 msgid "Language:"
-msgstr ""
+msgstr "Idioma:"
 
 #: bookwyrm/templates/book/publisher_info.html:6
 #, python-format
@@ -510,7 +510,7 @@ msgstr "%(pages)s páginas"
 #: bookwyrm/templates/book/publisher_info.html:18
 #, python-format
 msgid "Published %(date)s by %(publisher)s."
-msgstr ""
+msgstr "Publicado %(date)s por %(publisher)s."
 
 #: bookwyrm/templates/book/publisher_info.html:20
 #, fuzzy, python-format
@@ -521,7 +521,7 @@ msgstr "Fecha de publicación:"
 #: bookwyrm/templates/book/publisher_info.html:22
 #, python-format
 msgid "Published by %(publisher)s."
-msgstr ""
+msgstr "Publicado por %(publisher)s."
 
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
@@ -559,11 +559,11 @@ msgstr "Federalizado"
 #: bookwyrm/templates/directory/directory.html:11
 #: bookwyrm/templates/layout.html:92
 msgid "Directory"
-msgstr ""
+msgstr "Directorio"
 
 #: bookwyrm/templates/directory/directory.html:19
 msgid "Make your profile discoverable to other BookWyrm users."
-msgstr ""
+msgstr "Haz que tu perfil sea reconocible a otros usarios de BookWyrm."
 
 #: bookwyrm/templates/directory/directory.html:26
 #, fuzzy, python-format
@@ -594,15 +594,15 @@ msgstr[1] "Tus estantes"
 
 #: bookwyrm/templates/directory/directory.html:86
 msgid "posts"
-msgstr ""
+msgstr "publicaciones"
 
 #: bookwyrm/templates/directory/directory.html:92
 msgid "last active"
-msgstr ""
+msgstr "actividad reciente"
 
 #: bookwyrm/templates/directory/sort_filter.html:5
 msgid "Order by"
-msgstr ""
+msgstr "Ordenar por"
 
 #: bookwyrm/templates/directory/sort_filter.html:8
 #, fuzzy
@@ -612,7 +612,7 @@ msgstr "Sugerir"
 
 #: bookwyrm/templates/directory/sort_filter.html:9
 msgid "Recently active"
-msgstr ""
+msgstr "Activ@ recientemente"
 
 #: bookwyrm/templates/directory/user_type_filter.html:5
 #, fuzzy
@@ -622,11 +622,11 @@ msgstr "Actividad de usuario"
 
 #: bookwyrm/templates/directory/user_type_filter.html:8
 msgid "BookWyrm users"
-msgstr ""
+msgstr "Usuarios de BookWyrm"
 
 #: bookwyrm/templates/directory/user_type_filter.html:12
 msgid "All known users"
-msgstr ""
+msgstr "Todos los usuarios conocidos"
 
 #: bookwyrm/templates/discover/about.html:7
 #, python-format
@@ -676,11 +676,11 @@ msgstr "Esta instancia está cerrada."
 
 #: bookwyrm/templates/discover/landing_layout.html:57
 msgid "Thank you! Your request has been received."
-msgstr ""
+msgstr "¡Gracias! Tu solicitación ha sido recibido."
 
 #: bookwyrm/templates/discover/landing_layout.html:60
 msgid "Request an Invitation"
-msgstr ""
+msgstr "Solicitar una invitación"
 
 #: bookwyrm/templates/discover/landing_layout.html:64
 #: bookwyrm/templates/password_reset_request.html:18
@@ -692,7 +692,7 @@ msgstr "Dirección de correo electrónico:"
 #: bookwyrm/templates/discover/landing_layout.html:70
 #: bookwyrm/templates/moderation/report_modal.html:31
 msgid "Submit"
-msgstr ""
+msgstr "Enviar"
 
 #: bookwyrm/templates/discover/landing_layout.html:79
 msgid "Your Account"
@@ -741,16 +741,16 @@ msgstr "Clave Goodreads:"
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
-msgstr ""
+msgstr "Hola, "
 
 #: bookwyrm/templates/email/html_layout.html:21
 #, python-format
 msgid "BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a>"
-msgstr ""
+msgstr "BookWyrm alojado en <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a>"
 
 #: bookwyrm/templates/email/html_layout.html:23
 msgid "Email preference"
-msgstr ""
+msgstr "Preferencia de correo electrónico"
 
 #: bookwyrm/templates/email/invite/html_content.html:6
 #: bookwyrm/templates/email/invite/subject.html:2
@@ -761,17 +761,17 @@ msgstr "Sobre %(site_name)s"
 
 #: bookwyrm/templates/email/invite/html_content.html:9
 msgid "Join Now"
-msgstr ""
+msgstr "Únete ahora"
 
 #: bookwyrm/templates/email/invite/html_content.html:15
 #, python-format
 msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
-msgstr ""
+msgstr "Aprenda más <a href=\"https://%(domain)s%(about_path)s\">sobre esta instancia</a>."
 
 #: bookwyrm/templates/email/invite/text_content.html:4
 #, python-format
 msgid "You're invited to join %(site_name)s! Click the link below to create an account."
-msgstr ""
+msgstr "Estás invitado a unirte con %(site_name)s! Haz clic en el enlace debajo para crear una cuenta."
 
 #: bookwyrm/templates/email/invite/text_content.html:8
 #, fuzzy
@@ -783,7 +783,7 @@ msgstr "Más sobre este sitio"
 #: bookwyrm/templates/email/password_reset/text_content.html:4
 #, python-format
 msgid "You requested to reset your %(site_name)s password. Click the link below to set a new password and log in to your account."
-msgstr ""
+msgstr "Tú solicitaste reestablecer tu %(site_name)s contraseña. Haz clic en el enlace debajo para establecer una nueva contraseña e ingresar a tu cuenta."
 
 #: bookwyrm/templates/email/password_reset/html_content.html:9
 #: bookwyrm/templates/password_reset.html:4
@@ -796,7 +796,7 @@ msgstr "Restablecer contraseña"
 #: bookwyrm/templates/email/password_reset/html_content.html:13
 #: bookwyrm/templates/email/password_reset/text_content.html:8
 msgid "If you didn't request to reset your password, you can ignore this email."
-msgstr ""
+msgstr "Si no solicitaste reestablecer tu contraseña, puedes ignorar este mensaje."
 
 #: bookwyrm/templates/email/password_reset/subject.html:2
 #, fuzzy, python-format
@@ -824,19 +824,15 @@ msgstr "No tienes ningún mensaje en este momento."
 
 #: bookwyrm/templates/feed/feed.html:9
 msgid "Home Timeline"
-msgstr ""
+msgstr "Línea temporal de hogar"
 
 #: bookwyrm/templates/feed/feed.html:11
-#, fuzzy
-#| msgid "%(tab_title)s Timeline"
 msgid "Local Timeline"
-msgstr "%(tab_title)s Línea temporal"
+msgstr "Línea temporal local"
 
 #: bookwyrm/templates/feed/feed.html:13
-#, fuzzy
-#| msgid "Federated Servers"
 msgid "Federated Timeline"
-msgstr "Servidores federalizados"
+msgstr "Línea temporal federalizado"
 
 #: bookwyrm/templates/feed/feed.html:19
 msgid "Home"
@@ -853,16 +849,16 @@ msgstr "Federalizado"
 #: bookwyrm/templates/feed/feed.html:33
 #, python-format
 msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
-msgstr ""
+msgstr "cargar <span data-poll=\"stream/%(tab)s\">0</span> status(es) no leídos"
 
 #: bookwyrm/templates/feed/feed.html:48
 msgid "There aren't any activities right now! Try following a user to get started"
-msgstr "¡No hay actividades en este momento! Sigue a otro usuario para empezar"
+msgstr "¡No hay actividad ahora mismo! Sigue a otro usuario para empezar"
 
 #: bookwyrm/templates/feed/feed.html:56
 #: bookwyrm/templates/get_started/users.html:6
 msgid "Who to follow"
-msgstr ""
+msgstr "A quién seguir"
 
 #: bookwyrm/templates/feed/feed_layout.html:5
 msgid "Updates"
@@ -941,7 +937,7 @@ msgstr "No se encontró ningún libro correspondiente a \"%(query)s\""
 #: bookwyrm/templates/get_started/books.html:11
 #, python-format
 msgid "You can add books when you start using %(site_name)s."
-msgstr ""
+msgstr "Puedes agregar libros cuando comiences a usar %(site_name)s."
 
 #: bookwyrm/templates/get_started/books.html:16
 #: bookwyrm/templates/get_started/books.html:17
@@ -972,7 +968,7 @@ msgstr "No se encontró ningún libro"
 #: bookwyrm/templates/get_started/books.html:54
 #: bookwyrm/templates/get_started/profile.html:54
 msgid "Save &amp; continue"
-msgstr ""
+msgstr "Guardar &amp; continuar"
 
 #: bookwyrm/templates/get_started/layout.html:14
 #, fuzzy, python-format
@@ -982,7 +978,7 @@ msgstr "Sobre %(site_name)s"
 
 #: bookwyrm/templates/get_started/layout.html:16
 msgid "These are some first steps to get you started."
-msgstr ""
+msgstr "Estos son unos primeros pasos para empezar."
 
 #: bookwyrm/templates/get_started/layout.html:30
 #: bookwyrm/templates/get_started/profile.html:6
@@ -1005,7 +1001,7 @@ msgstr "Amigable"
 
 #: bookwyrm/templates/get_started/layout.html:44
 msgid "Skip this step"
-msgstr ""
+msgstr "Saltar este paso"
 
 #: bookwyrm/templates/get_started/layout.html:48
 #, fuzzy
@@ -1025,7 +1021,7 @@ msgstr "Resumen:"
 
 #: bookwyrm/templates/get_started/profile.html:23
 msgid "A little bit about you"
-msgstr ""
+msgstr "Un poco sobre ti"
 
 #: bookwyrm/templates/get_started/profile.html:32
 #: bookwyrm/templates/preferences/edit_user.html:17
@@ -1040,11 +1036,11 @@ msgstr "Aprobar seguidores a mano:"
 #: bookwyrm/templates/get_started/profile.html:48
 #: bookwyrm/templates/preferences/edit_user.html:58
 msgid "Show this account in suggested users:"
-msgstr ""
+msgstr "Mostrar esta cuenta en los usuarios sugeridos:"
 
 #: bookwyrm/templates/get_started/profile.html:52
 msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users."
-msgstr ""
+msgstr "Tu cuenta se aparecerá en el directorio, y puede ser recomendado a otros usuarios de BookWyrm."
 
 #: bookwyrm/templates/get_started/users.html:11
 #, fuzzy
@@ -1101,7 +1097,7 @@ msgstr "Fuente de datos"
 
 #: bookwyrm/templates/import.html:29
 msgid "Data file:"
-msgstr ""
+msgstr "Archivo de datos:"
 
 #: bookwyrm/templates/import.html:37
 msgid "Include reviews"
@@ -1155,7 +1151,7 @@ msgstr "Se falló a cargar"
 #: bookwyrm/templates/import_status.html:44
 #, python-format
 msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
-msgstr ""
+msgstr "Saltar al final de la lista para seleccionar los %(failed_count)s artículos que no se pudieron importar."
 
 #: bookwyrm/templates/import_status.html:79
 msgid "Select all"
@@ -1244,7 +1240,7 @@ msgstr "Invitaciones"
 
 #: bookwyrm/templates/layout.html:118
 msgid "Admin"
-msgstr ""
+msgstr "Admin"
 
 #: bookwyrm/templates/layout.html:125
 msgid "Log out"
@@ -1277,7 +1273,7 @@ msgstr "Iniciar sesión"
 
 #: bookwyrm/templates/layout.html:168
 msgid "Join"
-msgstr ""
+msgstr "Unirse"
 
 #: bookwyrm/templates/layout.html:191
 msgid "About this server"
@@ -1290,7 +1286,7 @@ msgstr "Contactarse con administradores del sitio"
 #: bookwyrm/templates/layout.html:202
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
-msgstr ""
+msgstr "Apoyar %(site_name)s en <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 
 #: bookwyrm/templates/layout.html:206
 msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
@@ -1461,11 +1457,11 @@ msgstr "Más sobre este sitio"
 #: bookwyrm/templates/moderation/report_preview.html:6
 #, python-format
 msgid "Report #%(report_id)s: %(username)s"
-msgstr ""
+msgstr "Reportar #%(report_id)s: %(username)s"
 
 #: bookwyrm/templates/moderation/report.html:10
 msgid "Back to reports"
-msgstr ""
+msgstr "Volver a los informes"
 
 #: bookwyrm/templates/moderation/report.html:18
 #, fuzzy
@@ -1487,15 +1483,15 @@ msgstr "Enviar mensaje directo"
 
 #: bookwyrm/templates/moderation/report.html:27
 msgid "Deactivate user"
-msgstr ""
+msgstr "Desactivar usuario"
 
 #: bookwyrm/templates/moderation/report.html:29
 msgid "Reactivate user"
-msgstr ""
+msgstr "Reactivar usuario"
 
 #: bookwyrm/templates/moderation/report.html:36
 msgid "Moderator Comments"
-msgstr ""
+msgstr "Comentarios de moderador"
 
 #: bookwyrm/templates/moderation/report.html:54
 #: bookwyrm/templates/snippets/create_status.html:28
@@ -1511,11 +1507,11 @@ msgstr "Eliminar status"
 
 #: bookwyrm/templates/moderation/report.html:61
 msgid "No statuses reported"
-msgstr ""
+msgstr "Ningún estatus reportado"
 
 #: bookwyrm/templates/moderation/report.html:67
-msgid "Statuses has been deleted"
-msgstr ""
+msgid "Status has been deleted"
+msgstr "Status ha sido eliminado"
 
 #: bookwyrm/templates/moderation/report_modal.html:6
 #, fuzzy, python-format
@@ -1526,7 +1522,7 @@ msgstr "Listas: %(username)s"
 #: bookwyrm/templates/moderation/report_modal.html:21
 #, python-format
 msgid "This report will be sent to %(site_name)s's moderators for review."
-msgstr ""
+msgstr "Este informe se enviará a los moderadores de %(site_name)s para la revisión."
 
 #: bookwyrm/templates/moderation/report_modal.html:22
 #, fuzzy
@@ -1536,7 +1532,7 @@ msgstr "Más sobre este sitio"
 
 #: bookwyrm/templates/moderation/report_preview.html:13
 msgid "No notes provided"
-msgstr ""
+msgstr "No se proporcionó notas"
 
 #: bookwyrm/templates/moderation/report_preview.html:20
 #, fuzzy, python-format
@@ -1546,11 +1542,11 @@ msgstr "Agregado por <a href=\"%(user_path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/moderation/report_preview.html:30
 msgid "Re-open"
-msgstr ""
+msgstr "Reabrir"
 
 #: bookwyrm/templates/moderation/report_preview.html:32
 msgid "Resolve"
-msgstr ""
+msgstr "Resolver"
 
 #: bookwyrm/templates/moderation/reports.html:6
 #, fuzzy, python-format
@@ -1694,7 +1690,7 @@ msgstr "Tu <a href=\"/import/%(related_id)s\">importación</a> ha terminado."
 #: bookwyrm/templates/notifications.html:113
 #, python-format
 msgid "A new <a href=\"%(path)s\">report</a> needs moderation."
-msgstr ""
+msgstr "Un <a href=\"%(path)s\">informe</a> nuevo se requiere moderación."
 
 #: bookwyrm/templates/notifications.html:139
 msgid "You're all caught up!"
@@ -1741,12 +1737,12 @@ msgstr "Editar perfil"
 
 #: bookwyrm/templates/preferences/edit_user.html:46
 msgid "Show set reading goal prompt in feed:"
-msgstr ""
+msgstr "Mostrar meta de lectura en el feed:"
 
 #: bookwyrm/templates/preferences/edit_user.html:62
 #, python-format
 msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
-msgstr ""
+msgstr "Tu cuenta se aparecerá en el <a href=\"%(path)s\">directorio</a>, y puede ser recomendado a otros usuarios de BookWyrm.""
 
 #: bookwyrm/templates/preferences/edit_user.html:65
 msgid "Preferred Timezone: "
@@ -1797,7 +1793,7 @@ msgstr "Administrar usuarios"
 #: bookwyrm/templates/settings/user_admin.html:3
 #: bookwyrm/templates/settings/user_admin.html:10
 msgid "Users"
-msgstr ""
+msgstr "Usuarios"
 
 #: bookwyrm/templates/settings/admin_layout.html:32
 #: bookwyrm/templates/settings/federation.html:3
@@ -1837,11 +1833,11 @@ msgstr "Registración"
 
 #: bookwyrm/templates/settings/federated_server.html:7
 msgid "Back to server list"
-msgstr ""
+msgstr "Volver a la lista de servidores"
 
 #: bookwyrm/templates/settings/federated_server.html:12
 msgid "Details"
-msgstr ""
+msgstr "Detalles"
 
 #: bookwyrm/templates/settings/federated_server.html:15
 #, fuzzy
@@ -1875,7 +1871,7 @@ msgstr "Nombre de usuario:"
 #: bookwyrm/templates/settings/federated_server.html:36
 #: bookwyrm/templates/settings/federated_server.html:43
 msgid "View all"
-msgstr ""
+msgstr "Ver todos"
 
 #: bookwyrm/templates/settings/federated_server.html:40
 #, fuzzy
@@ -1933,7 +1929,7 @@ msgstr "Invitaciones"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:23
 msgid "Ignored Invite Requests"
-msgstr ""
+msgstr "Solicitaciones de invitación ignoradas"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:35
 #, fuzzy
@@ -1949,7 +1945,7 @@ msgstr "Aceptar"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:42
 msgid "Email"
-msgstr ""
+msgstr "Correo electronico"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:47
 #, fuzzy
@@ -1965,40 +1961,38 @@ msgstr "Solicitudes de seguidor"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:59
 #: bookwyrm/templates/settings/status_filter.html:16
-#, fuzzy
-#| msgid "Accept"
 msgid "Accepted"
-msgstr "Aceptar"
+msgstr "Aceptado"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:61
 #: bookwyrm/templates/settings/status_filter.html:12
 msgid "Sent"
-msgstr ""
+msgstr "Enviado"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:63
 #: bookwyrm/templates/settings/status_filter.html:8
 msgid "Requested"
-msgstr ""
+msgstr "Solicitado"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:73
 msgid "Send invite"
-msgstr ""
+msgstr "Enviar invitación"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:75
 msgid "Re-send invite"
-msgstr ""
+msgstr "Re-enviar invitación"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:95
 msgid "Ignore"
-msgstr ""
+msgstr "Ignorar"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:97
 msgid "Un-ignore"
-msgstr ""
+msgstr "Des-ignorar"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:108
 msgid "Back to pending requests"
-msgstr ""
+msgstr "Volver a las solicitaciones pendientes"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:110
 msgid "View ignored requests"

From d526fdc92f34ed66713b34348ad1307b1912089e Mon Sep 17 00:00:00 2001
From: reese <reesedporter@gmail.com>
Date: Tue, 20 Apr 2021 18:39:55 -0500
Subject: [PATCH 0914/1285] more translations

---
 locale/es/LC_MESSAGES/django.po | 48 ++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index ecc37932..acefc256 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -1996,7 +1996,7 @@ msgstr "Volver a las solicitaciones pendientes"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:110
 msgid "View ignored requests"
-msgstr ""
+msgstr "Ver solicitaciones ignoradas"
 
 #: bookwyrm/templates/settings/manage_invites.html:21
 msgid "Generate New Invite"
@@ -2095,7 +2095,7 @@ msgstr "Texto de registración cerrada:"
 #: bookwyrm/templates/settings/user_admin.html:7
 #, python-format
 msgid "Users: <small>%(server_name)s</small>"
-msgstr ""
+msgstr "Usuarios <small>%(server_name)s</small>"
 
 #: bookwyrm/templates/settings/user_admin.html:20
 #, fuzzy
@@ -2111,7 +2111,7 @@ msgstr "Agregado:"
 
 #: bookwyrm/templates/settings/user_admin.html:28
 msgid "Last Active"
-msgstr ""
+msgstr "Actividad reciente"
 
 #: bookwyrm/templates/settings/user_admin.html:36
 #, fuzzy
@@ -2127,11 +2127,11 @@ msgstr "Actividad"
 
 #: bookwyrm/templates/settings/user_admin.html:45
 msgid "Inactive"
-msgstr ""
+msgstr "Inactiv@"
 
 #: bookwyrm/templates/settings/user_admin.html:50
 msgid "Not set"
-msgstr ""
+msgstr "No establecido"
 
 #: bookwyrm/templates/snippets/block_button.html:5
 msgid "Block"
@@ -2265,11 +2265,11 @@ msgstr "Mostrar menos"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:9
 msgid "Hide filters"
-msgstr ""
+msgstr "Ocultar filtros"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:22
 msgid "Apply filters"
-msgstr ""
+msgstr "Aplicar filtros"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:26
 #, fuzzy
@@ -2333,7 +2333,7 @@ msgstr[1] ""
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:8
 #, python-format
 msgid "Review of \"%(book_title)s\": %(review_title)s"
-msgstr ""
+msgstr "Reseña de \"%(book_title)s\": %(review_title)s"
 
 #: bookwyrm/templates/snippets/goal_card.html:23
 #, python-format
@@ -2754,7 +2754,7 @@ msgstr "Ver %(size)s"
 
 #: bookwyrm/templates/user/user.html:47
 msgid "View all books"
-msgstr ""
+msgstr "Ver todos los libros"
 
 #: bookwyrm/templates/user/user.html:59
 #, python-format
@@ -2813,12 +2813,12 @@ msgstr "Ya existe un usuario con ese nombre."
 #: bookwyrm/views/password.py:41
 #, python-format
 msgid "A password reset link sent to %s"
-msgstr ""
+msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 
 #: venv/lib/python3.8/site-packages/_pytest/config/argparsing.py:442
 #, python-format
 msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr ""
+msgstr "opción ambiguo: %(option)s pudiera coincidir con %(matches)s"
 
 #: venv/lib/python3.8/site-packages/django/contrib/messages/apps.py:7
 #, fuzzy
@@ -2828,27 +2828,27 @@ msgstr "Todos los mensajes"
 
 #: venv/lib/python3.8/site-packages/django/contrib/sitemaps/apps.py:7
 msgid "Site Maps"
-msgstr ""
+msgstr "Mapas de sitio"
 
 #: venv/lib/python3.8/site-packages/django/contrib/staticfiles/apps.py:9
 msgid "Static Files"
-msgstr ""
+msgstr "Archivos estáticos"
 
 #: venv/lib/python3.8/site-packages/django/contrib/syndication/apps.py:7
 msgid "Syndication"
-msgstr ""
+msgstr "Sindicación"
 
 #: venv/lib/python3.8/site-packages/django/core/paginator.py:48
 msgid "That page number is not an integer"
-msgstr ""
+msgstr "Ese numero de pagina no es un entero"
 
 #: venv/lib/python3.8/site-packages/django/core/paginator.py:50
 msgid "That page number is less than 1"
-msgstr ""
+msgstr "Ese numero de pagina es menos que uno"
 
 #: venv/lib/python3.8/site-packages/django/core/paginator.py:55
 msgid "That page contains no results"
-msgstr ""
+msgstr "Esa pagina no contiene resultados"
 
 #: venv/lib/python3.8/site-packages/django/core/validators.py:20
 #, fuzzy
@@ -2878,11 +2878,11 @@ msgstr "Dirección de correo electrónico:"
 #. Translators: "letters" means latin letters: a-z and A-Z.
 #: venv/lib/python3.8/site-packages/django/core/validators.py:230
 msgid "Enter a valid “slug� consisting of letters, numbers, underscores or hyphens."
-msgstr ""
+msgstr "Ingrese un “slug� válido que consiste de letras, numeros, guiones bajos, o guiones"
 
 #: venv/lib/python3.8/site-packages/django/core/validators.py:237
 msgid "Enter a valid “slug� consisting of Unicode letters, numbers, underscores, or hyphens."
-msgstr ""
+msgstr "Ingrese un “slug� válido que consiste de letras Unicode, numeros, guiones bajos, o guiones"
 
 #: venv/lib/python3.8/site-packages/django/core/validators.py:246
 #: venv/lib/python3.8/site-packages/django/core/validators.py:266
@@ -2907,22 +2907,22 @@ msgstr "Dirección de correo electrónico:"
 
 #: venv/lib/python3.8/site-packages/django/core/validators.py:295
 msgid "Enter only digits separated by commas."
-msgstr ""
+msgstr "Ingrese solo digitos separados por comas."
 
 #: venv/lib/python3.8/site-packages/django/core/validators.py:301
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
-msgstr ""
+msgstr "Asegura que este valor es %(limit_value)s (es %(show_value)s)."
 
 #: venv/lib/python3.8/site-packages/django/core/validators.py:334
 #, python-format
 msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr ""
+msgstr "Asegura que este valor es menor que o iguala a %(limit_value)s."
 
 #: venv/lib/python3.8/site-packages/django/core/validators.py:343
 #, python-format
 msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr ""
+msgstr "Asegura que este valor es más que o que iguala a %(limit_value)s."
 
 #: venv/lib/python3.8/site-packages/django/core/validators.py:353
 #, python-format
@@ -2970,7 +2970,7 @@ msgstr[1] ""
 #: venv/lib/python3.8/site-packages/django/core/validators.py:461
 #, python-format
 msgid "File extension “%(extension)s� is not allowed. Allowed extensions are: %(allowed_extensions)s."
-msgstr ""
+msgstr "No se permite la extensión de archivo “%(extension)s�. Extensiones permitidas son: %(allowed_extensions)s."
 
 #: venv/lib/python3.8/site-packages/django/core/validators.py:513
 msgid "Null characters are not allowed."

From ca63bd69477ea74080906f08b0acf84dfd6c009e Mon Sep 17 00:00:00 2001
From: reese <reesedporter@gmail.com>
Date: Wed, 21 Apr 2021 12:20:03 -0500
Subject: [PATCH 0915/1285] more translations

---
 locale/es/LC_MESSAGES/django.po | 333 +++++++++++++++-----------------
 1 file changed, 159 insertions(+), 174 deletions(-)

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index acefc256..22b8ffb9 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -676,7 +676,7 @@ msgstr "Esta instancia está cerrada."
 
 #: bookwyrm/templates/discover/landing_layout.html:57
 msgid "Thank you! Your request has been received."
-msgstr "¡Gracias! Tu solicitación ha sido recibido."
+msgstr "¡Gracias! Tu solicitud ha sido recibido."
 
 #: bookwyrm/templates/discover/landing_layout.html:60
 msgid "Request an Invitation"
@@ -771,7 +771,7 @@ msgstr "Aprenda más <a href=\"https://%(domain)s%(about_path)s\">sobre esta ins
 #: bookwyrm/templates/email/invite/text_content.html:4
 #, python-format
 msgid "You're invited to join %(site_name)s! Click the link below to create an account."
-msgstr "Estás invitado a unirte con %(site_name)s! Haz clic en el enlace debajo para crear una cuenta."
+msgstr "Estás invitado a unirte con %(site_name)s! Haz clic en el enlace a continuación para crear una cuenta."
 
 #: bookwyrm/templates/email/invite/text_content.html:8
 #, fuzzy
@@ -783,7 +783,7 @@ msgstr "Más sobre este sitio"
 #: bookwyrm/templates/email/password_reset/text_content.html:4
 #, python-format
 msgid "You requested to reset your %(site_name)s password. Click the link below to set a new password and log in to your account."
-msgstr "Tú solicitaste reestablecer tu %(site_name)s contraseña. Haz clic en el enlace debajo para establecer una nueva contraseña e ingresar a tu cuenta."
+msgstr "Tú solicitaste reestablecer tu %(site_name)s contraseña. Haz clic en el enlace a continuación para establecer una nueva contraseña e ingresar a tu cuenta."
 
 #: bookwyrm/templates/email/password_reset/html_content.html:9
 #: bookwyrm/templates/password_reset.html:4
@@ -1929,7 +1929,7 @@ msgstr "Invitaciones"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:23
 msgid "Ignored Invite Requests"
-msgstr "Solicitaciones de invitación ignoradas"
+msgstr "Solicitudes de invitación ignoradas"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:35
 #, fuzzy
@@ -1992,11 +1992,11 @@ msgstr "Des-ignorar"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:108
 msgid "Back to pending requests"
-msgstr "Volver a las solicitaciones pendientes"
+msgstr "Volver a las solicitudes pendientes"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:110
 msgid "View ignored requests"
-msgstr "Ver solicitaciones ignoradas"
+msgstr "Ver solicitudes ignoradas"
 
 #: bookwyrm/templates/settings/manage_invites.html:21
 msgid "Generate New Invite"
@@ -2974,12 +2974,12 @@ msgstr "No se permite la extensión de archivo “%(extension)s�. Extensiones
 
 #: venv/lib/python3.8/site-packages/django/core/validators.py:513
 msgid "Null characters are not allowed."
-msgstr ""
+msgstr "No se permiten caracteres nulos"
 
 #: venv/lib/python3.8/site-packages/django/db/models/base.py:1190
 #: venv/lib/python3.8/site-packages/django/forms/models.py:760
 msgid "and"
-msgstr ""
+msgstr "y"
 
 #: venv/lib/python3.8/site-packages/django/db/models/base.py:1192
 #, fuzzy, python-format
@@ -3001,7 +3001,7 @@ msgstr "Este estante está vacio."
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:102
 msgid "This field cannot be blank."
-msgstr ""
+msgstr "Este campo no puede ser vacio."
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:103
 #, fuzzy, python-format
@@ -3014,31 +3014,31 @@ msgstr "Ya existe un usuario con ese nombre."
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:107
 #, python-format
 msgid "%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
-msgstr ""
+msgstr "%(field_label)s deben ser unicos por %(date_field_label)s %(lookup_type)s."
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:126
 #, python-format
 msgid "Field of type: %(field_type)s"
-msgstr ""
+msgstr "Campo de tipo: %(field_type)s"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:939
 #, python-format
 msgid "“%(value)s� value must be either True or False."
-msgstr ""
+msgstr "“%(value)s� valor debe ser o verdadero o falso."
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:940
 #, python-format
 msgid "“%(value)s� value must be either True, False, or None."
-msgstr ""
+msgstr "%(value)s� valor debe ser o True, False, o None."
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:942
 msgid "Boolean (Either True or False)"
-msgstr ""
+msgstr "Booleano (O True O False)"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:983
 #, python-format
 msgid "String (up to %(max_length)s)"
-msgstr ""
+msgstr "Cadena (máximo de %(max_length)s caracteres)"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1047
 #, fuzzy
@@ -3049,31 +3049,31 @@ msgstr "No invitaciónes activas"
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1096
 #, python-format
 msgid "“%(value)s� value has an invalid date format. It must be in YYYY-MM-DD format."
-msgstr ""
+msgstr "“%(value)s� valor tiene un formato de fecha inválido. Hay que estar de formato YYYY-MM-DD."
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1098
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1241
 #, python-format
 msgid "“%(value)s� value has the correct format (YYYY-MM-DD) but it is an invalid date."
-msgstr ""
+msgstr "“%(value)s� valor tiene el formato correcto (YYYY-MM-DD) pero la fecha es invalida."
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1101
 msgid "Date (without time)"
-msgstr ""
+msgstr "Fecha (sin la hora)"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1239
 #, python-format
 msgid "“%(value)s� value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ] format."
-msgstr ""
+msgstr "“%(value)s� valor tiene un formato invalido. Debe estar en formato YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]."
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1243
 #, python-format
 msgid "“%(value)s� value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but it is an invalid date/time."
-msgstr ""
+msgstr "“%(value)s� valor tiene el formato correcto (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) pero es una fecha/hora invalida."
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1247
 msgid "Date (with time)"
-msgstr ""
+msgstr "Fecha (con la hora)"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1395
 #, fuzzy, python-format
@@ -3090,7 +3090,7 @@ msgstr "Número de serie:"
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1536
 #, python-format
 msgid "“%(value)s� value has an invalid format. It must be in [DD] [[HH:]MM:]ss[.uuuuuu] format."
-msgstr ""
+msgstr "“%(value)s� valor tiene un formato invalido. Debe estar en formato [DD] [[HH:]MM:]ss[.uuuuuu]."
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1539
 #, fuzzy
@@ -3106,7 +3106,7 @@ msgstr "Dirección de correo electrónico:"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1612
 msgid "File path"
-msgstr ""
+msgstr "Ruta de archivo"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1678
 #, fuzzy, python-format
@@ -3116,16 +3116,16 @@ msgstr "%(value)s no es un usuario válido"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1680
 msgid "Floating point number"
-msgstr ""
+msgstr "Número de coma flotante"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1718
 #, python-format
 msgid "“%(value)s� value must be an integer."
-msgstr ""
+msgstr "“%(value)s� valor debe ser un entero."
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1720
 msgid "Integer"
-msgstr ""
+msgstr "Entero"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1803
 #, fuzzy
@@ -3149,11 +3149,11 @@ msgstr "Dirección de correo electrónico:"
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1931
 #, python-format
 msgid "“%(value)s� value must be either None, True or False."
-msgstr ""
+msgstr "Valor debe ser o None, True, o False."
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1933
 msgid "Boolean (Either True, False or None)"
-msgstr ""
+msgstr "Booleano (O True, Falso, o None)"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1976
 #, fuzzy
@@ -3176,37 +3176,37 @@ msgstr "No invitaciónes activas"
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2016
 #, python-format
 msgid "Slug (up to %(max_length)s)"
-msgstr ""
+msgstr "Slug (máximo de %(max_length)s)"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2048
 msgid "Small integer"
-msgstr ""
+msgstr "Entero pequeño"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2055
 msgid "Text"
-msgstr ""
+msgstr "Texto"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2083
 #, python-format
 msgid "“%(value)s� value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
-msgstr ""
+msgstr "“%(value)s� valor tiene un formato invalido. Debe estar en formato HH:MM[:ss[.uuuuuu]]."
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2085
 #, python-format
 msgid "“%(value)s� value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid time."
-msgstr ""
+msgstr "“%(value)s� valor tiene el formato correcto (HH:MM[:ss[.uuuuuu]]) pero es una hora invalida."
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2088
 msgid "Time"
-msgstr ""
+msgstr "Tiempo"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2214
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2236
 msgid "Raw binary data"
-msgstr ""
+msgstr "Datos binarios sin procesar"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2301
 #, fuzzy, python-format
@@ -3216,11 +3216,11 @@ msgstr "%(value)s no es un usuario válido"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2303
 msgid "Universally unique identifier"
-msgstr ""
+msgstr "Identificador universalmente único"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/files.py:231
 msgid "File"
-msgstr ""
+msgstr "Archivo"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/files.py:379
 #, fuzzy
@@ -3230,20 +3230,20 @@ msgstr "Imagenes"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/json.py:18
 msgid "A JSON object"
-msgstr ""
+msgstr "Un objeto JSON"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/json.py:20
 msgid "Value must be valid JSON."
-msgstr ""
+msgstr "Valor debe ser JSON valido."
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/related.py:790
 #, python-format
 msgid "%(model)s instance with %(field)s %(value)r does not exist."
-msgstr ""
+msgstr "%(model)s instancia con %(field)s %(value)r no existe."
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/related.py:792
 msgid "Foreign Key (type determined by related field)"
-msgstr ""
+msgstr "Clave externa (tipo determinado por campo relacionado)"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/related.py:1045
 #, fuzzy
@@ -3316,15 +3316,15 @@ msgstr "Dirección de correo electrónico:"
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:485
 #, python-brace-format
 msgid "The number of days must be between {min_days} and {max_days}."
-msgstr ""
+msgstr "El número de dias debe ser entre {min_days} y {max_days}."
 
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:545
 msgid "No file was submitted. Check the encoding type on the form."
-msgstr ""
+msgstr "No se aceptó ningun archivo. Verfica el tipo de codificación en el formulario."
 
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:546
 msgid "No file was submitted."
-msgstr ""
+msgstr "No se aceptó ningun archivo."
 
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:547
 #, fuzzy
@@ -3341,18 +3341,18 @@ msgstr[1] ""
 
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:552
 msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr ""
+msgstr "Por favor, o envia un archivo o marca la casilla vacia, no los dos."
 
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:613
 msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
-msgstr ""
+msgstr "Subir una imagen valida. El archivo que subiste o no fue imagen o fue corrupto."
 
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:775
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:865
 #: venv/lib/python3.8/site-packages/django/forms/models.py:1296
 #, python-format
 msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr ""
+msgstr "Selecciona una opción valida. %(value)s no es una de las opciones disponibles."
 
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:866
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:981
@@ -3364,7 +3364,7 @@ msgstr "Dirección de correo electrónico:"
 
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:982
 msgid "Enter a complete value."
-msgstr ""
+msgstr "Ingresa un valor completo."
 
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:1198
 #, fuzzy
@@ -3381,16 +3381,16 @@ msgstr "Dirección de correo electrónico:"
 #. Translators: This is the default suffix added to form field labels
 #: venv/lib/python3.8/site-packages/django/forms/forms.py:78
 msgid ":"
-msgstr ""
+msgstr ":"
 
 #: venv/lib/python3.8/site-packages/django/forms/forms.py:205
 #, python-format
 msgid "(Hidden field %(name)s) %(error)s"
-msgstr ""
+msgstr "(Campo oculto %(name)s) %(error)s"
 
 #: venv/lib/python3.8/site-packages/django/forms/formsets.py:93
 msgid "ManagementForm data is missing or has been tampered with"
-msgstr ""
+msgstr "Datos de ManagementForm está ausento o ha sido corrompido"
 
 #: venv/lib/python3.8/site-packages/django/forms/formsets.py:345
 #, python-format
@@ -3408,35 +3408,38 @@ msgstr[1] ""
 
 #: venv/lib/python3.8/site-packages/django/forms/formsets.py:379
 #: venv/lib/python3.8/site-packages/django/forms/formsets.py:386
+#, fuzzy
+# TODO cc @mouse is this a verb or noun
 msgid "Order"
-msgstr ""
+msgstr "Pedir" # if verb 
+msgstr "Pedido" # if noun
 
 #: venv/lib/python3.8/site-packages/django/forms/models.py:755
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
-msgstr ""
+msgstr "Por favor corrige los datos duplicados en %(field)s."
 
 #: venv/lib/python3.8/site-packages/django/forms/models.py:759
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
-msgstr ""
+msgstr "Por favor corrige los datos duplicados en %(field)s, los cuales deben ser unicos."
 
 #: venv/lib/python3.8/site-packages/django/forms/models.py:765
 #, python-format
 msgid "Please correct the duplicate data for %(field_name)s which must be unique for the %(lookup)s in %(date_field)s."
-msgstr ""
+msgstr "Por favor corrige los datos duplicados en %(field_name)s los cuales deben ser unicos por el %(lookup)s en %(date_field)s."
 
 #: venv/lib/python3.8/site-packages/django/forms/models.py:774
 msgid "Please correct the duplicate values below."
-msgstr ""
+msgstr "Por favor corrige los valores duplicados a continuación."
 
 #: venv/lib/python3.8/site-packages/django/forms/models.py:1096
 msgid "The inline value did not match the parent instance."
-msgstr ""
+msgstr "El valor en línea no empareja la instancia progenitor."
 
 #: venv/lib/python3.8/site-packages/django/forms/models.py:1180
 msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr ""
+msgstr "Selecciona una opción válida. Esa opción no es una de las opciones disponibles."
 
 #: venv/lib/python3.8/site-packages/django/forms/models.py:1298
 #, fuzzy, python-format
@@ -3447,11 +3450,11 @@ msgstr "%(value)s no es un usuario válido"
 #: venv/lib/python3.8/site-packages/django/forms/utils.py:167
 #, python-format
 msgid "%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it may be ambiguous or it may not exist."
-msgstr ""
+msgstr "%(datetime)s no se pudo interpretar en la zona horaria %(current_timezone)s; puede ser ambiguo o puede que no exista."
 
 #: venv/lib/python3.8/site-packages/django/forms/widgets.py:398
 msgid "Clear"
-msgstr ""
+msgstr "Borrar"
 
 #: venv/lib/python3.8/site-packages/django/forms/widgets.py:399
 #, fuzzy
@@ -3467,20 +3470,20 @@ msgstr "Cambiar estante"
 
 #: venv/lib/python3.8/site-packages/django/forms/widgets.py:709
 msgid "Unknown"
-msgstr ""
+msgstr "Desconocido"
 
 #: venv/lib/python3.8/site-packages/django/forms/widgets.py:710
 msgid "Yes"
-msgstr ""
+msgstr "Sí"
 
 #: venv/lib/python3.8/site-packages/django/forms/widgets.py:711
 msgid "No"
-msgstr ""
+msgstr "No"
 
 #. Translators: Please do not add spaces around commas.
 #: venv/lib/python3.8/site-packages/django/template/defaultfilters.py:790
 msgid "yes,no,maybe"
-msgstr ""
+msgstr "sí,no,quizás"
 
 #: venv/lib/python3.8/site-packages/django/template/defaultfilters.py:819
 #: venv/lib/python3.8/site-packages/django/template/defaultfilters.py:836
@@ -3493,430 +3496,412 @@ msgstr[1] ""
 #: venv/lib/python3.8/site-packages/django/template/defaultfilters.py:838
 #, python-format
 msgid "%s KB"
-msgstr ""
+msgstr "%s KB"
 
 #: venv/lib/python3.8/site-packages/django/template/defaultfilters.py:840
 #, python-format
 msgid "%s MB"
-msgstr ""
+msgstr "%s MB"
 
 #: venv/lib/python3.8/site-packages/django/template/defaultfilters.py:842
 #, python-format
 msgid "%s GB"
-msgstr ""
+msgstr "%s GB"
 
 #: venv/lib/python3.8/site-packages/django/template/defaultfilters.py:844
 #, python-format
 msgid "%s TB"
-msgstr ""
+msgstr "%s TB"
 
 #: venv/lib/python3.8/site-packages/django/template/defaultfilters.py:846
 #, python-format
 msgid "%s PB"
-msgstr ""
+msgstr "%s PB"
 
 #: venv/lib/python3.8/site-packages/django/utils/dateformat.py:65
 msgid "p.m."
-msgstr ""
+msgstr "p.m."
 
 #: venv/lib/python3.8/site-packages/django/utils/dateformat.py:66
 msgid "a.m."
-msgstr ""
+msgstr "a.m."
 
 #: venv/lib/python3.8/site-packages/django/utils/dateformat.py:71
 msgid "PM"
-msgstr ""
+msgstr "PM"
 
 #: venv/lib/python3.8/site-packages/django/utils/dateformat.py:72
 msgid "AM"
-msgstr ""
+msgstr "AM"
 
 #: venv/lib/python3.8/site-packages/django/utils/dateformat.py:149
 msgid "midnight"
-msgstr ""
+msgstr "medianoche"
 
 #: venv/lib/python3.8/site-packages/django/utils/dateformat.py:151
 msgid "noon"
-msgstr ""
+msgstr "mediodia"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:6
 #: venv/lib/python3.8/site-packages/tornado/locale.py:295
 msgid "Monday"
-msgstr ""
+msgstr "Lunes"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:6
 #: venv/lib/python3.8/site-packages/tornado/locale.py:296
 msgid "Tuesday"
-msgstr ""
+msgstr "Martes"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:6
 #: venv/lib/python3.8/site-packages/tornado/locale.py:297
 msgid "Wednesday"
-msgstr ""
+msgstr "Miercoles"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:6
 #: venv/lib/python3.8/site-packages/tornado/locale.py:298
 msgid "Thursday"
-msgstr ""
+msgstr "Jueves"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:6
 #: venv/lib/python3.8/site-packages/tornado/locale.py:299
 msgid "Friday"
-msgstr ""
+msgstr "Viernes"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:7
 #: venv/lib/python3.8/site-packages/tornado/locale.py:300
 msgid "Saturday"
-msgstr ""
+msgstr "Sábado"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:7
 #: venv/lib/python3.8/site-packages/tornado/locale.py:301
 msgid "Sunday"
-msgstr ""
+msgstr "Domino"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:10
 msgid "Mon"
-msgstr ""
+msgstr "Lun"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:10
 msgid "Tue"
-msgstr ""
+msgstr "Mar"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:10
 msgid "Wed"
-msgstr ""
+msgstr "Mie"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:10
 msgid "Thu"
-msgstr ""
+msgstr "Jue"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:10
 msgid "Fri"
-msgstr ""
+msgstr "Vie"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:11
-#, fuzzy
-#| msgid "Status"
 msgid "Sat"
-msgstr "Status"
+msgstr "Sáb"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:11
 msgid "Sun"
-msgstr ""
+msgstr "Dom"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:14
 #: venv/lib/python3.8/site-packages/tornado/locale.py:281
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:14
 #: venv/lib/python3.8/site-packages/tornado/locale.py:282
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:14
 #: venv/lib/python3.8/site-packages/tornado/locale.py:283
-#, fuzzy
-#| msgid "Search"
 msgid "March"
-msgstr "Buscar"
+msgstr "Marzo"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:14
 #: venv/lib/python3.8/site-packages/tornado/locale.py:284
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:14
 #: venv/lib/python3.8/site-packages/tornado/locale.py:285
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:14
 #: venv/lib/python3.8/site-packages/tornado/locale.py:286
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:15
 #: venv/lib/python3.8/site-packages/tornado/locale.py:287
 msgid "July"
-msgstr ""
+msgstr "Julio"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:15
 #: venv/lib/python3.8/site-packages/tornado/locale.py:288
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:15
 #: venv/lib/python3.8/site-packages/tornado/locale.py:289
-#, fuzzy
-#| msgid "Series number:"
 msgid "September"
-msgstr "Número de serie:"
+msgstr "Septiembre"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:15
 #: venv/lib/python3.8/site-packages/tornado/locale.py:290
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:15
 #: venv/lib/python3.8/site-packages/tornado/locale.py:291
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:16
 #: venv/lib/python3.8/site-packages/tornado/locale.py:292
-#, fuzzy
-#| msgid "Series number:"
 msgid "December"
-msgstr "Número de serie:"
+msgstr "Diciembre"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:19
 msgid "jan"
-msgstr ""
+msgstr "ene"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:19
 msgid "feb"
-msgstr ""
+msgstr "feb"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:19
 msgid "mar"
-msgstr ""
+msgstr "mar"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:19
 msgid "apr"
-msgstr ""
+msgstr "abr"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:19
 msgid "may"
-msgstr ""
+msgstr "may"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:19
 msgid "jun"
-msgstr ""
+msgstr "jun"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:20
 msgid "jul"
-msgstr ""
+msgstr "jul"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:20
 msgid "aug"
-msgstr ""
+msgstr "ago"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:20
 msgid "sep"
-msgstr ""
+msgstr "sep"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:20
 msgid "oct"
-msgstr ""
+msgstr "oct"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:20
 msgid "nov"
-msgstr ""
+msgstr "nov"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:20
 msgid "dec"
-msgstr ""
+msgstr "dic"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:23
 msgctxt "abbrev. month"
 msgid "Jan."
-msgstr ""
+msgstr "en."
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:24
 msgctxt "abbrev. month"
 msgid "Feb."
-msgstr ""
+msgstr "feb."
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:25
-#, fuzzy
-#| msgid "Search"
 msgctxt "abbrev. month"
 msgid "March"
-msgstr "Buscar"
+msgstr "mzo."
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:26
 msgctxt "abbrev. month"
 msgid "April"
-msgstr ""
+msgstr "abr."
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:27
 msgctxt "abbrev. month"
 msgid "May"
-msgstr ""
+msgstr "my."
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:28
 msgctxt "abbrev. month"
 msgid "June"
-msgstr ""
+msgstr "jun."
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:29
 msgctxt "abbrev. month"
 msgid "July"
-msgstr ""
+msgstr "jul."
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:30
 msgctxt "abbrev. month"
 msgid "Aug."
-msgstr ""
+msgstr "agto."
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:31
 msgctxt "abbrev. month"
 msgid "Sept."
-msgstr ""
+msgstr "set."
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:32
 msgctxt "abbrev. month"
 msgid "Oct."
-msgstr ""
+msgstr "oct."
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:33
 msgctxt "abbrev. month"
 msgid "Nov."
-msgstr ""
+msgstr "nov."
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:34
 msgctxt "abbrev. month"
 msgid "Dec."
-msgstr ""
+msgstr "dic."
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:37
 msgctxt "alt. month"
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:38
 msgctxt "alt. month"
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:39
-#, fuzzy
-#| msgid "Search"
 msgctxt "alt. month"
 msgid "March"
-msgstr "Buscar"
+msgstr "Marzo"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:40
 msgctxt "alt. month"
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:41
 msgctxt "alt. month"
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:42
 msgctxt "alt. month"
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:43
 msgctxt "alt. month"
 msgid "July"
-msgstr ""
+msgstr "Julio"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:44
 msgctxt "alt. month"
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:45
-#, fuzzy
-#| msgid "Series number:"
 msgctxt "alt. month"
 msgid "September"
-msgstr "Número de serie:"
+msgstr "Septiembre"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:46
 msgctxt "alt. month"
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:47
 msgctxt "alt. month"
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
 #: venv/lib/python3.8/site-packages/django/utils/dates.py:48
-#, fuzzy
-#| msgid "Series number:"
 msgctxt "alt. month"
 msgid "December"
-msgstr "Número de serie:"
+msgstr "Diciembre"
 
 #: venv/lib/python3.8/site-packages/django/utils/ipv6.py:8
-#, fuzzy
-#| msgid "Email address:"
 msgid "This is not a valid IPv6 address."
-msgstr "Dirección de correo electrónico:"
+msgstr "Esta no es una valida dirección IPv6."
 
 #: venv/lib/python3.8/site-packages/django/utils/text.py:70
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s…"
-msgstr ""
+msgstr "%(truncated_text)s…"
 
 #: venv/lib/python3.8/site-packages/django/utils/text.py:236
 msgid "or"
-msgstr ""
+msgstr "o"
 
 #. Translators: This string is used as a separator between list elements
 #: venv/lib/python3.8/site-packages/django/utils/text.py:255
 #: venv/lib/python3.8/site-packages/django/utils/timesince.py:83
 msgid ", "
-msgstr ""
+msgstr ", "
 
 #: venv/lib/python3.8/site-packages/django/utils/timesince.py:9
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d año"
+msgstr[1] "%d años"
 
 #: venv/lib/python3.8/site-packages/django/utils/timesince.py:10
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d mes"
+msgstr[1] "%d meses"
 
 #: venv/lib/python3.8/site-packages/django/utils/timesince.py:11
 #, python-format
 msgid "%d week"
 msgid_plural "%d weeks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d semana"
+msgstr[1] "%d semanas"
 
 #: venv/lib/python3.8/site-packages/django/utils/timesince.py:12
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d día"
+msgstr[1] "%d días"
 
 #: venv/lib/python3.8/site-packages/django/utils/timesince.py:13
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d hora"
+msgstr[1] "%d horas"
 
 #: venv/lib/python3.8/site-packages/django/utils/timesince.py:14
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d minuto"
+msgstr[1] "%d minutos"
 
 #: venv/lib/python3.8/site-packages/django/views/csrf.py:110
 msgid "Forbidden"
-msgstr ""
+msgstr "Prohibido"
 
 #: venv/lib/python3.8/site-packages/django/views/csrf.py:111
 msgid "CSRF verification failed. Request aborted."
-msgstr ""
+msgstr "Se falló la verificación CSRF. Se abortó la solicitud."
 
 #: venv/lib/python3.8/site-packages/django/views/csrf.py:115
 msgid "You are seeing this message because this HTTPS site requires a “Referer header� to be sent by your Web browser, but none was sent. This header is required for security reasons, to ensure that your browser is not being hijacked by third parties."

From e6bd89e10bff0b7d1fac95c3fe94e4e8c6ed581e Mon Sep 17 00:00:00 2001
From: reese <reesedporter@gmail.com>
Date: Wed, 21 Apr 2021 14:54:27 -0500
Subject: [PATCH 0916/1285] more translations

---
 locale/es/LC_MESSAGES/django.po | 159 +++++++++++++++++---------------
 1 file changed, 84 insertions(+), 75 deletions(-)

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 22b8ffb9..5b53b3ab 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -900,15 +900,15 @@ msgstr "%(year)s Meta de lectura"
 #, python-format
 msgid "%(mutuals)s follower you follow"
 msgid_plural "%(mutuals)s followers you follow"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(mutuals)s seguidor que sigues"
+msgstr[1] "%(mutuals)s seguidores que sigues"
 
 #: bookwyrm/templates/feed/suggested_users.html:19
 #, python-format
 msgid "%(shared_books)s book on your shelves"
 msgid_plural "%(shared_books)s books on your shelves"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(shared_books)s libro en tus estantes"
+msgstr[1] "%(shared_books)s libros en tus estantes"
 
 #: bookwyrm/templates/get_started/book_preview.html:6
 #, fuzzy, python-format
@@ -2305,8 +2305,8 @@ msgstr "No calificación"
 #, python-format
 msgid "%(rating)s star"
 msgid_plural "%(rating)s stars"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(rating)s estrella"
+msgstr[1] "%(rating)s estrellas"
 
 #: bookwyrm/templates/snippets/generated_status/goal.html:1
 #, python-format
@@ -2327,8 +2327,8 @@ msgstr[1] "<a href=\"%(path)s\">%(title)s</a> por "
 #, python-format
 msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
 msgid_plural "Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Reseña de \"%(book_title)s\" (%(display_rating)s estrella): %(review_title)s"
+msgstr[1] "Reseña de \"%(book_title)s\" (%(display_rating)s estrellas): %(review_title)s"
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:8
 #, python-format
@@ -2928,15 +2928,15 @@ msgstr "Asegura que este valor es más que o que iguala a %(limit_value)s."
 #, python-format
 msgid "Ensure this value has at least %(limit_value)d character (it has %(show_value)d)."
 msgid_plural "Ensure this value has at least %(limit_value)d characters (it has %(show_value)d)."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Verifica que este valor tiene por lo menos %(limit_value)d carácter. (Tiene %(show_value)d).)"
+msgstr[1] "Verifica que este valor tiene por lo menos %(limit_value)d caracteres. (Tiene %(show_value)d).)"
 
 #: venv/lib/python3.8/site-packages/django/core/validators.py:368
 #, python-format
 msgid "Ensure this value has at most %(limit_value)d character (it has %(show_value)d)."
 msgid_plural "Ensure this value has at most %(limit_value)d characters (it has %(show_value)d)."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Verifica que este valor tiene a lo sumo %(limit_value)d carácter. (Tiene %(show_value)d).)"
+msgstr[1] "Verifica que este valor tiene a lo sumo %(limit_value)d caracteres. (Tiene %(show_value)d).)"
 
 #: venv/lib/python3.8/site-packages/django/core/validators.py:387
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:292
@@ -2950,22 +2950,23 @@ msgstr "Número de serie:"
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Verifica que no hay más que %(max)s digito en total."
+msgstr[1] "Verifica que no hay más que %(max)s digitos en total."
 
 #: venv/lib/python3.8/site-packages/django/core/validators.py:394
 #, python-format
+#                         is 
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Verifica que no hay más que %(max)s cifra decimal."
+msgstr[1] "Verifica que no hay más que %(max)s cifras decimales."
 
 #: venv/lib/python3.8/site-packages/django/core/validators.py:399
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit before the decimal point."
 msgid_plural "Ensure that there are no more than %(max)s digits before the decimal point."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Verifica que no hay más que %(max)s digito antes de la coma decimal."
+msgstr[1] "Verifica que no hay más que %(max)s digitos antes de la coma decimal."
 
 #: venv/lib/python3.8/site-packages/django/core/validators.py:461
 #, python-format
@@ -3336,8 +3337,8 @@ msgstr "Este estante está vacio."
 #, python-format
 msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
 msgid_plural "Ensure this filename has at most %(max)d characters (it has %(length)d)."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Verifica que este nombre de archivo no tiene más que %(max)d carácter. (Tiene %(length)d)."
+msgstr[1] "Verifica que este nombre de archivo no tiene más que %(max)d caracteres. (Tiene %(length)d)."
 
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:552
 msgid "Please either submit a file or check the clear checkbox, not both."
@@ -3396,15 +3397,15 @@ msgstr "Datos de ManagementForm está ausento o ha sido corrompido"
 #, python-format
 msgid "Please submit %d or fewer forms."
 msgid_plural "Please submit %d or fewer forms."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Por favor, enviar %d o menos formularios."
+msgstr[1] "Por favor, enviar %d o menos formularios."
 
 #: venv/lib/python3.8/site-packages/django/forms/formsets.py:352
 #, python-format
 msgid "Please submit %d or more forms."
 msgid_plural "Please submit %d or more forms."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Por favor, enviar %d o más formularios."
+msgstr[1] "Por favor, enviar %d o más formularios."
 
 #: venv/lib/python3.8/site-packages/django/forms/formsets.py:379
 #: venv/lib/python3.8/site-packages/django/forms/formsets.py:386
@@ -3490,8 +3491,8 @@ msgstr "sí,no,quizás"
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(size)d byte"
+msgstr[1] "%(size)d bytes"
 
 #: venv/lib/python3.8/site-packages/django/template/defaultfilters.py:838
 #, python-format
@@ -3905,65 +3906,65 @@ msgstr "Se falló la verificación CSRF. Se abortó la solicitud."
 
 #: venv/lib/python3.8/site-packages/django/views/csrf.py:115
 msgid "You are seeing this message because this HTTPS site requires a “Referer header� to be sent by your Web browser, but none was sent. This header is required for security reasons, to ensure that your browser is not being hijacked by third parties."
-msgstr ""
+msgstr "Estás viendo este mensaje porque este sitio HTTPS requiere que tu navegador Web envie un “Referer header�, pero no se la envió. Esta cabecedera se requiere por razones de seguridad, para asegurar que tu navegador no sea secuestrado por terceros."
 
 #: venv/lib/python3.8/site-packages/django/views/csrf.py:120
 msgid "If you have configured your browser to disable “Referer� headers, please re-enable them, at least for this site, or for HTTPS connections, or for “same-origin� requests."
-msgstr ""
+msgstr "Si has configurado su navegador para deshabilitar las cabecederas “Referer�, vuelva a habilitarlos, al menos para este sitio, o para conexiones HTTPS, o para solicitudes del “same-origin�. "
 
 #: venv/lib/python3.8/site-packages/django/views/csrf.py:124
 msgid "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or including the “Referrer-Policy: no-referrer� header, please remove them. The CSRF protection requires the “Referer� header to do strict referer checking. If you’re concerned about privacy, use alternatives like <a rel=\"noreferrer\" …> for links to third-party sites."
-msgstr ""
+msgstr "Si estás usando la eqtigueta <meta name=\"referrer\" content=\"no-referrer\"> o estás incluyendo la cabecedera “Referrer-Policy: no-referrer�, quitalas por favor. La protección CSRF require la cabecedera “Referer� para hacer verficación “strict referer“. Si te preocupa la privacidad, utiliza alternativas como <a rel=\"noreferrer\" …>  para sitios de terceros."
 
 #: venv/lib/python3.8/site-packages/django/views/csrf.py:132
 msgid "You are seeing this message because this site requires a CSRF cookie when submitting forms. This cookie is required for security reasons, to ensure that your browser is not being hijacked by third parties."
-msgstr ""
+msgstr "Estás viendo este mensaje porque este sitio requiere un cookie CSRF cuando se envie formularios. Este cookie se requiere por razones de seguridad, para asegurar que tu navegador no sea secuestrado por terceros."
 
 #: venv/lib/python3.8/site-packages/django/views/csrf.py:137
 msgid "If you have configured your browser to disable cookies, please re-enable them, at least for this site, or for “same-origin� requests."
-msgstr ""
+msgstr "Si has configurado su navegador para deshabilitar los cookies, vuelva a habilitarlos, al menos para este sitio, o para conexiones HTTPS, o para solicitudes del “same-origin�. "
 
 #: venv/lib/python3.8/site-packages/django/views/csrf.py:142
 msgid "More information is available with DEBUG=True."
-msgstr ""
+msgstr "Más información es disponible con DEBUG=True."
 
 #: venv/lib/python3.8/site-packages/django/views/generic/dates.py:41
 msgid "No year specified"
-msgstr ""
+msgstr "Ningun año fue especificado"
 
 #: venv/lib/python3.8/site-packages/django/views/generic/dates.py:61
 #: venv/lib/python3.8/site-packages/django/views/generic/dates.py:111
 #: venv/lib/python3.8/site-packages/django/views/generic/dates.py:208
 msgid "Date out of range"
-msgstr ""
+msgstr "Fecha fuera de rango"
 
 #: venv/lib/python3.8/site-packages/django/views/generic/dates.py:90
 msgid "No month specified"
-msgstr ""
+msgstr "Ningun mes fue especificado"
 
 #: venv/lib/python3.8/site-packages/django/views/generic/dates.py:142
 msgid "No day specified"
-msgstr ""
+msgstr "Ningun día fue especificado"
 
 #: venv/lib/python3.8/site-packages/django/views/generic/dates.py:188
 msgid "No week specified"
-msgstr ""
+msgstr "Ninguna semana fue especificado"
 
 #: venv/lib/python3.8/site-packages/django/views/generic/dates.py:338
 #: venv/lib/python3.8/site-packages/django/views/generic/dates.py:367
 #, python-format
 msgid "No %(verbose_name_plural)s available"
-msgstr ""
+msgstr "No %(verbose_name_plural)s disponible"
 
 #: venv/lib/python3.8/site-packages/django/views/generic/dates.py:589
 #, python-format
 msgid "Future %(verbose_name_plural)s not available because %(class_name)s.allow_future is False."
-msgstr ""
+msgstr "%(verbose_name_plural)s del futuro no está disponible porque %(class_name)s.allow_future es False."
 
 #: venv/lib/python3.8/site-packages/django/views/generic/dates.py:623
 #, python-format
 msgid "Invalid date string “%(datestr)s� given format “%(format)s�"
-msgstr ""
+msgstr "Cadena de fecha invalida “%(datestr)s� dado el formato “%(format)s�"
 
 #: venv/lib/python3.8/site-packages/django/views/generic/detail.py:54
 #, fuzzy, python-format
@@ -3973,21 +3974,21 @@ msgstr "No se encontró ningún libro correspondiente a la búsqueda: \"%(query)
 
 #: venv/lib/python3.8/site-packages/django/views/generic/list.py:67
 msgid "Page is not “last�, nor can it be converted to an int."
-msgstr ""
+msgstr "Página no es “last�, ni puede ser convertido en un int."
 
 #: venv/lib/python3.8/site-packages/django/views/generic/list.py:72
 #, python-format
 msgid "Invalid page (%(page_number)s): %(message)s"
-msgstr ""
+msgstr "Página invalida (%(page_number)s): %(message)s"
 
 #: venv/lib/python3.8/site-packages/django/views/generic/list.py:154
 #, python-format
 msgid "Empty list and “%(class_name)s.allow_empty� is False."
-msgstr ""
+msgstr "Lista vacia y “%(class_name)s.allow_empty� es False."
 
 #: venv/lib/python3.8/site-packages/django/views/static.py:40
 msgid "Directory indexes are not allowed here."
-msgstr ""
+msgstr "Indices directorios no se permiten aquí."
 
 #: venv/lib/python3.8/site-packages/django/views/static.py:42
 #, fuzzy, python-format
@@ -3998,41 +3999,41 @@ msgstr "%(value)s no es un usuario válido"
 #: venv/lib/python3.8/site-packages/django/views/static.py:80
 #, python-format
 msgid "Index of %(directory)s"
-msgstr ""
+msgstr "Indice de %(directory)s"
 
 #: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:7
 msgid "Django: the Web framework for perfectionists with deadlines."
-msgstr ""
+msgstr "Django: el estructura Web para perfeccionistas con fechas límites."
 
 #: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:346
 #, python-format
 msgid "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
-msgstr ""
+msgstr "Ver <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" target=\"_blank\" rel=\"noopener\">notas de lanzamiento</a> por Django %(version)s"
 
 #: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:368
 msgid "The install worked successfully! Congratulations!"
-msgstr ""
+msgstr "¡La instalación fue exitoso! ¡Felicidades!"
 
 #: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:369
 #, python-format
 msgid "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener\">DEBUG=True</a> is in your settings file and you have not configured any URLs."
-msgstr ""
+msgstr "Estás viendo esta pagina porque <a href=\"https://docs.djangoproject.com/en/%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener\">DEBUG=True</a> está en tu archivo de configuración y no has configurado ningún URL."
 
 #: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:384
 msgid "Django Documentation"
-msgstr ""
+msgstr "Documentación de Django"
 
 #: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:385
 msgid "Topics, references, &amp; how-to’s"
-msgstr ""
+msgstr "Tópicos, referencias, &amp; instrucciones paso-a-paso"
 
 #: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:396
 msgid "Tutorial: A Polling App"
-msgstr ""
+msgstr "Tutorial: Una aplicación polling"
 
 #: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:397
 msgid "Get started with Django"
-msgstr ""
+msgstr "Empezar con Django"
 
 #: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:408
 #, fuzzy
@@ -4042,111 +4043,119 @@ msgstr "Comentario"
 
 #: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:409
 msgid "Connect, get help, or contribute"
-msgstr ""
+msgstr "Conectarse, encontrar ayuda, o contribuir"
 
 #: venv/lib/python3.8/site-packages/kombu/transport/qpid.py:1301
 #, python-format
 msgid "Attempting to connect to qpid with SASL mechanism %s"
-msgstr ""
+msgstr "Intentando conectar con qpid con mecanismo SASL %s"
 
 #: venv/lib/python3.8/site-packages/kombu/transport/qpid.py:1306
 #, python-format
 msgid "Connected to qpid with SASL mechanism %s"
-msgstr ""
+msgstr "Conectado con qpid con mecanismo SASL %s"
 
 #: venv/lib/python3.8/site-packages/kombu/transport/qpid.py:1324
 #, python-format
 msgid "Unable to connect to qpid with SASL mechanism %s"
-msgstr ""
+msgstr "No se pudo conectar con qpid con mecanismo SASL %s"
 
 #: venv/lib/python3.8/site-packages/tornado/locale.py:371
 msgid "1 second ago"
-msgstr ""
+msgstr "Hace 1 segundo"
 
 #: venv/lib/python3.8/site-packages/tornado/locale.py:377
 msgid "1 minute ago"
-msgstr ""
+msgstr "Hace 1 minuto"
 
 #: venv/lib/python3.8/site-packages/tornado/locale.py:382
 msgid "1 hour ago"
-msgstr ""
+msgstr "Hace 1 hora"
 
 #: venv/lib/python3.8/site-packages/tornado/locale.py:385
 #, python-format
 msgid "%(time)s"
-msgstr ""
+msgstr "%(time)s"
 
 #: venv/lib/python3.8/site-packages/tornado/locale.py:387
 msgid "yesterday"
-msgstr ""
+msgstr "ayer"
 
 #: venv/lib/python3.8/site-packages/tornado/locale.py:387
 #, python-format
+# TODO cc @mouse this could be grammatically incorrect if the time said 1 o'clock
+# a working clock is broken twice a day!
 msgid "yesterday at %(time)s"
-msgstr ""
+msgstr "ayer a las %(time)s" 
 
 #: venv/lib/python3.8/site-packages/tornado/locale.py:389
 #, python-format
 msgid "%(weekday)s"
-msgstr ""
+msgstr "%(weekday)s"
 
 #: venv/lib/python3.8/site-packages/tornado/locale.py:389
 #, python-format
+# TODO cc @mouse this could be grammatically incorrect if the time said 1 o'clock
+# a working clock is broken twice a day!
 msgid "%(weekday)s at %(time)s"
-msgstr ""
+msgstr "%(weekday)s a las %(time)s"
 
 #: venv/lib/python3.8/site-packages/tornado/locale.py:392
 #: venv/lib/python3.8/site-packages/tornado/locale.py:445
 #, python-format
 msgid "%(month_name)s %(day)s"
-msgstr ""
+msgstr "%(day)s %(month_name)s"
 
 #: venv/lib/python3.8/site-packages/tornado/locale.py:394
 #, python-format
+# TODO cc @mouse this could be grammatically incorrect if the time said 1 o'clock
+# a working clock is broken twice a day!
 msgid "%(month_name)s %(day)s at %(time)s"
-msgstr ""
+msgstr "%(day)s %(month_name)s a las %(time)s"
 
 #: venv/lib/python3.8/site-packages/tornado/locale.py:399
 #, python-format
 msgid "%(month_name)s %(day)s, %(year)s"
-msgstr ""
+msgstr "%(day)s %(month_name)s, %(year)s"
 
 #: venv/lib/python3.8/site-packages/tornado/locale.py:401
 #, python-format
+# TODO cc @mouse this could be grammatically incorrect if the time said 1 o'clock
+# a working clock is broken twice a day!
 msgid "%(month_name)s %(day)s, %(year)s at %(time)s"
-msgstr ""
+msgstr "%(day)s %(month_name)s, %(year)s a las %(time)s"
 
 #: venv/lib/python3.8/site-packages/tornado/locale.py:439
 #, python-format
 msgid "%(weekday)s, %(month_name)s %(day)s"
-msgstr ""
+msgstr "%(weekday)s, %(day)s %(month_name)s"
 
 #: venv/lib/python3.8/site-packages/tornado/locale.py:462
 #, python-format
 msgid "%(commas)s and %(last)s"
-msgstr ""
+msgstr "%(commas)s y %(last)s"
 
 #: venv/lib/python3.8/site-packages/tornado/test/locale_test.py:68
 msgctxt "law"
 msgid "right"
-msgstr ""
+msgstr "justo"
 
 #: venv/lib/python3.8/site-packages/tornado/test/locale_test.py:69
 msgctxt "good"
 msgid "right"
-msgstr ""
+msgstr "correcto"
 
 #: venv/lib/python3.8/site-packages/tornado/test/locale_test.py:71
 #: venv/lib/python3.8/site-packages/tornado/test/locale_test.py:74
 msgctxt "organization"
 msgid "club"
-msgstr ""
+msgstr "club"
 
 #: venv/lib/python3.8/site-packages/tornado/test/locale_test.py:76
 #: venv/lib/python3.8/site-packages/tornado/test/locale_test.py:77
 msgctxt "stick"
 msgid "club"
-msgstr ""
+msgstr "garrote"
 
 #, fuzzy
 #~| msgid "Started"

From c8de7890c69b94427961a9a910c1c9efcd1b912a Mon Sep 17 00:00:00 2001
From: reese <reesedporter@gmail.com>
Date: Wed, 21 Apr 2021 15:37:59 -0500
Subject: [PATCH 0917/1285] finally finished

---
 locale/es/LC_MESSAGES/django.po | 582 ++++++++------------------------
 1 file changed, 148 insertions(+), 434 deletions(-)

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 5b53b3ab..2fbf981c 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -19,10 +19,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: bookwyrm/forms.py:226
-#, fuzzy
-#| msgid "A user with that username already exists."
 msgid "A user with this email already exists."
-msgstr "Ya existe un usuario con ese nombre."
+msgstr "Ya existe un usuario con ese correo electrónico."
 
 #: bookwyrm/forms.py:240
 msgid "One Day"
@@ -164,10 +162,8 @@ msgid "Add cover"
 msgstr "Agregar portada"
 
 #: bookwyrm/templates/book/book.html:53
-#, fuzzy
-#| msgid "Failed to load"
 msgid "Failed to load cover"
-msgstr "Se falló a cargar"
+msgstr "No se pudo cargar la portada"
 
 #: bookwyrm/templates/book/book.html:62
 msgid "ISBN:"
@@ -278,10 +274,8 @@ msgid "Lists"
 msgstr "Listas"
 
 #: bookwyrm/templates/book/book.html:213
-#, fuzzy
-#| msgid "Go to list"
 msgid "Add to list"
-msgstr "Irse a lista"
+msgstr "Agregar a lista"
 
 #: bookwyrm/templates/book/book.html:223
 #: bookwyrm/templates/book/cover_modal.html:31
@@ -295,10 +289,8 @@ msgstr "lo calificó con"
 
 #: bookwyrm/templates/book/cover_modal.html:17
 #: bookwyrm/templates/book/edit_book.html:175
-#, fuzzy
-#| msgid "Add cover"
 msgid "Upload cover:"
-msgstr "Agregar portada:"
+msgstr "Subir portada:"
 
 #: bookwyrm/templates/book/cover_modal.html:23
 #: bookwyrm/templates/book/edit_book.html:181
@@ -307,15 +299,11 @@ msgstr "Agregar portada de url:"
 
 #: bookwyrm/templates/book/edit_book.html:5
 #: bookwyrm/templates/book/edit_book.html:11
-#, fuzzy, python-format
-#| msgid "Editions of %(book_title)s"
 msgid "Edit \"%(book_title)s\""
-msgstr "Ediciones de %(book_title)s"
+msgstr "Editar \"%(book_title)s\""
 
 #: bookwyrm/templates/book/edit_book.html:5
 #: bookwyrm/templates/book/edit_book.html:13
-#, fuzzy
-#| msgid "Add Books"
 msgid "Add Book"
 msgstr "Agregar libro"
 
@@ -344,10 +332,8 @@ msgid "Is \"%(name)s\" an existing author?"
 msgstr "¿Es \"%(name)s\" un autor ya existente?"
 
 #: bookwyrm/templates/book/edit_book.html:52
-#, fuzzy, python-format
-#| msgid "Start \"<em>%(book_title)s</em>\""
 msgid "Author of <em>%(book_title)s</em>"
-msgstr "Empezar \"<em>%(book_title)s</em>\""
+msgstr "Autor de <em>%(book_title)s</em>"
 
 #: bookwyrm/templates/book/edit_book.html:55
 msgid "This is a new author"
@@ -398,10 +384,8 @@ msgid "Series number:"
 msgstr "Número de serie:"
 
 #: bookwyrm/templates/book/edit_book.html:123
-#, fuzzy
-#| msgid "Published"
 msgid "Publisher:"
-msgstr "Publicado"
+msgstr "Editorial:"
 
 #: bookwyrm/templates/book/edit_book.html:125
 msgid "Separate multiple publishers with commas."
@@ -416,22 +400,16 @@ msgid "Published date:"
 msgstr "Fecha de publicación:"
 
 #: bookwyrm/templates/book/edit_book.html:149
-#, fuzzy
-#| msgid "Author"
 msgid "Authors"
-msgstr "Autor/Autora"
+msgstr "Autores"
 
 #: bookwyrm/templates/book/edit_book.html:155
-#, fuzzy, python-format
-#| msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
-msgstr "Agregado por <a href=\"%(user_path)s\">%(username)s</a>"
+msgstr "Eliminar <a href=\"%(path)s\">%(name)s</a>"
 
 #: bookwyrm/templates/book/edit_book.html:160
-#, fuzzy
-#| msgid "Edit Author"
 msgid "Add Authors:"
-msgstr "Editar Autor/Autora"
+msgstr "Agregar Autores:"
 
 #: bookwyrm/templates/book/edit_book.html:161
 msgid "John Doe, Jane Smith"
@@ -502,10 +480,8 @@ msgid "%(pages)s pages"
 msgstr "%(pages)s páginas"
 
 #: bookwyrm/templates/book/publisher_info.html:13
-#, fuzzy, python-format
-#| msgid "%(pages)s pages"
 msgid "%(languages)s language"
-msgstr "%(pages)s páginas"
+msgstr "idioma %(languages)s"
 
 #: bookwyrm/templates/book/publisher_info.html:18
 #, python-format
@@ -513,10 +489,8 @@ msgid "Published %(date)s by %(publisher)s."
 msgstr "Publicado %(date)s por %(publisher)s."
 
 #: bookwyrm/templates/book/publisher_info.html:20
-#, fuzzy, python-format
-#| msgid "Published date:"
 msgid "Published %(date)s"
-msgstr "Fecha de publicación:"
+msgstr "Publicado %(date)s"
 
 #: bookwyrm/templates/book/publisher_info.html:22
 #, python-format
@@ -532,28 +506,20 @@ msgid "Close"
 msgstr "Cerrar"
 
 #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8
-#, fuzzy
-#| msgid "Boost status"
 msgid "Compose status"
-msgstr "Status de respaldo"
+msgstr "Componer status"
 
 #: bookwyrm/templates/directory/community_filter.html:5
-#, fuzzy
-#| msgid "Comment"
 msgid "Community"
-msgstr "Comentario"
+msgstr "Comunidad"
 
 #: bookwyrm/templates/directory/community_filter.html:8
-#, fuzzy
-#| msgid "Max uses"
 msgid "Local users"
-msgstr "Número máximo de usos"
+msgstr "Usuarios locales"
 
 #: bookwyrm/templates/directory/community_filter.html:12
-#, fuzzy
-#| msgid "Federated"
 msgid "Federated community"
-msgstr "Federalizado"
+msgstr "Comunidad federalizada"
 
 #: bookwyrm/templates/directory/directory.html:6
 #: bookwyrm/templates/directory/directory.html:11
@@ -566,10 +532,8 @@ msgid "Make your profile discoverable to other BookWyrm users."
 msgstr "Haz que tu perfil sea reconocible a otros usarios de BookWyrm."
 
 #: bookwyrm/templates/directory/directory.html:26
-#, fuzzy, python-format
-#| msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
 msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
-msgstr "Puedes establecer o cambiar tu meta de lectura en cualquier momento que desees desde tu <a href=\"%(path)s\">perfil</a>"
+msgstr "Puedes optar por no en cualquier hora en tus <a href=\"%(path)s\">configuraciones de perfil.</a>"
 
 #: bookwyrm/templates/directory/directory.html:31
 #: bookwyrm/templates/snippets/goal_card.html:22
@@ -577,20 +541,16 @@ msgid "Dismiss message"
 msgstr "Desechar mensaje"
 
 #: bookwyrm/templates/directory/directory.html:71
-#, fuzzy
-#| msgid "followed you"
 msgid "follower you follow"
 msgid_plural "followers you follow"
-msgstr[0] "te siguió"
-msgstr[1] "te siguió"
+msgstr[0] "seguidor que tu sigues"
+msgstr[1] "seguidores que tu sigues"
 
 #: bookwyrm/templates/directory/directory.html:78
-#, fuzzy
-#| msgid "Your shelves"
 msgid "book on your shelves"
 msgid_plural "books on your shelves"
-msgstr[0] "Tus estantes"
-msgstr[1] "Tus estantes"
+msgstr[0] "libro en tus estantes"
+msgstr[1] "libro en tus estantes"
 
 #: bookwyrm/templates/directory/directory.html:86
 msgid "posts"
@@ -605,20 +565,16 @@ msgid "Order by"
 msgstr "Ordenar por"
 
 #: bookwyrm/templates/directory/sort_filter.html:8
-#, fuzzy
-#| msgid "Suggest"
 msgid "Suggested"
-msgstr "Sugerir"
+msgstr "Sugerido"
 
 #: bookwyrm/templates/directory/sort_filter.html:9
 msgid "Recently active"
 msgstr "Activ@ recientemente"
 
 #: bookwyrm/templates/directory/user_type_filter.html:5
-#, fuzzy
-#| msgid "User Activity"
 msgid "User type"
-msgstr "Actividad de usuario"
+msgstr "Tipo de usuario"
 
 #: bookwyrm/templates/directory/user_type_filter.html:8
 msgid "BookWyrm users"
@@ -699,10 +655,8 @@ msgid "Your Account"
 msgstr "Tu cuenta"
 
 #: bookwyrm/templates/edit_author.html:5
-#, fuzzy
-#| msgid "Edit Author"
 msgid "Edit Author:"
-msgstr "Editar Autor/Autora"
+msgstr "Editar Autor/Autora/Autore:"
 
 #: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
 #: bookwyrm/templates/user/create_shelf_form.html:13
@@ -754,10 +708,8 @@ msgstr "Preferencia de correo electrónico"
 
 #: bookwyrm/templates/email/invite/html_content.html:6
 #: bookwyrm/templates/email/invite/subject.html:2
-#, fuzzy, python-format
-#| msgid "About %(site_name)s"
 msgid "You're invited to join %(site_name)s!"
-msgstr "Sobre %(site_name)s"
+msgstr "¡Estás invitado a unirse con %(site_name)s!"
 
 #: bookwyrm/templates/email/invite/html_content.html:9
 msgid "Join Now"
@@ -774,10 +726,8 @@ msgid "You're invited to join %(site_name)s! Click the link below to create an a
 msgstr "Estás invitado a unirte con %(site_name)s! Haz clic en el enlace a continuación para crear una cuenta."
 
 #: bookwyrm/templates/email/invite/text_content.html:8
-#, fuzzy
-#| msgid "More about this site"
 msgid "Learn more about this instance:"
-msgstr "Más sobre este sitio"
+msgstr "Aprende más sobre esta intancia:"
 
 #: bookwyrm/templates/email/password_reset/html_content.html:6
 #: bookwyrm/templates/email/password_reset/text_content.html:4
@@ -799,10 +749,8 @@ msgid "If you didn't request to reset your password, you can ignore this email."
 msgstr "Si no solicitaste reestablecer tu contraseña, puedes ignorar este mensaje."
 
 #: bookwyrm/templates/email/password_reset/subject.html:2
-#, fuzzy, python-format
-#| msgid "About %(site_name)s"
 msgid "Reset your %(site_name)s password"
-msgstr "Sobre %(site_name)s"
+msgstr "Reestablece tu contraseña de %(site_name)s"
 
 #: bookwyrm/templates/feed/direct_messages.html:8
 #, python-format
@@ -911,16 +859,12 @@ msgstr[0] "%(shared_books)s libro en tus estantes"
 msgstr[1] "%(shared_books)s libros en tus estantes"
 
 #: bookwyrm/templates/get_started/book_preview.html:6
-#, fuzzy, python-format
-#| msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgid "Have you read %(book_title)s?"
-msgstr "Quiero leer \"<em>%(book_title)s</em>\""
+msgstr "¿Has leído %(book_title)s?"
 
 #: bookwyrm/templates/get_started/books.html:6
-#, fuzzy
-#| msgid "Started reading"
 msgid "What are you reading?"
-msgstr "Lectura se empezó"
+msgstr "¿Qué estás leyendo?"
 
 #: bookwyrm/templates/get_started/books.html:9
 #: bookwyrm/templates/lists/list.html:124
@@ -949,16 +893,12 @@ msgid "Search"
 msgstr "Buscar"
 
 #: bookwyrm/templates/get_started/books.html:26
-#, fuzzy
-#| msgid "Suggest Books"
 msgid "Suggested Books"
-msgstr "Sugerir libros"
+msgstr "Libros sugeridos"
 
 #: bookwyrm/templates/get_started/books.html:41
-#, fuzzy, python-format
-#| msgid "About %(site_name)s"
 msgid "Popular on %(site_name)s"
-msgstr "Sobre %(site_name)s"
+msgstr "Popular en %(site_name)s"
 
 #: bookwyrm/templates/get_started/books.html:51
 #: bookwyrm/templates/lists/list.html:141
@@ -971,10 +911,8 @@ msgid "Save &amp; continue"
 msgstr "Guardar &amp; continuar"
 
 #: bookwyrm/templates/get_started/layout.html:14
-#, fuzzy, python-format
-#| msgid "About %(site_name)s"
 msgid "Welcome to %(site_name)s!"
-msgstr "Sobre %(site_name)s"
+msgstr "¡Bienvenido a %(site_name)s!"
 
 #: bookwyrm/templates/get_started/layout.html:16
 msgid "These are some first steps to get you started."
@@ -982,32 +920,24 @@ msgstr "Estos son unos primeros pasos para empezar."
 
 #: bookwyrm/templates/get_started/layout.html:30
 #: bookwyrm/templates/get_started/profile.html:6
-#, fuzzy
-#| msgid "User Profile"
 msgid "Create your profile"
-msgstr "Perfil de usuario"
+msgstr "Crear tu perfil"
 
 #: bookwyrm/templates/get_started/layout.html:34
-#, fuzzy
-#| msgid "Add Books"
 msgid "Add books"
 msgstr "Agregar libros"
 
 #: bookwyrm/templates/get_started/layout.html:38
-#, fuzzy
-#| msgid "Friendly"
 msgid "Find friends"
-msgstr "Amigable"
+msgstr "Encontrar amigos"
 
 #: bookwyrm/templates/get_started/layout.html:44
 msgid "Skip this step"
 msgstr "Saltar este paso"
 
 #: bookwyrm/templates/get_started/layout.html:48
-#, fuzzy
-#| msgid "Finished"
 msgid "Finish"
-msgstr "Terminado"
+msgstr "Terminar"
 
 #: bookwyrm/templates/get_started/profile.html:15
 #: bookwyrm/templates/preferences/edit_user.html:24
@@ -1043,10 +973,8 @@ msgid "Your account will show up in the directory, and may be recommended to oth
 msgstr "Tu cuenta se aparecerá en el directorio, y puede ser recomendado a otros usuarios de BookWyrm."
 
 #: bookwyrm/templates/get_started/users.html:11
-#, fuzzy
-#| msgid "Search for a book or user"
 msgid "Search for a user"
-msgstr "Buscar un libro o un usuario"
+msgstr "Buscar un usuario"
 
 #: bookwyrm/templates/get_started/users.html:13
 #: bookwyrm/templates/search_results.html:76
@@ -1090,10 +1018,8 @@ msgid "Import Books"
 msgstr "Importar libros"
 
 #: bookwyrm/templates/import.html:16
-#, fuzzy
-#| msgid "Data source"
 msgid "Data source:"
-msgstr "Fuente de datos"
+msgstr "Fuente de datos:"
 
 #: bookwyrm/templates/import.html:29
 msgid "Data file:"
@@ -1146,7 +1072,7 @@ msgstr "(¡Refresca para actualizar!)"
 
 #: bookwyrm/templates/import_status.html:35
 msgid "Failed to load"
-msgstr "Se falló a cargar"
+msgstr "No se pudo cargar"
 
 #: bookwyrm/templates/import_status.html:44
 #, python-format
@@ -1298,16 +1224,12 @@ msgid "Create List"
 msgstr "Crear lista"
 
 #: bookwyrm/templates/lists/created_text.html:5
-#, fuzzy, python-format
-#| msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgid "Created and curated by <a href=\"%(path)s\">%(username)s</a>"
-msgstr "Agregado por <a href=\"%(user_path)s\">%(username)s</a>"
+msgstr "Agregado y comisariado por <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/lists/created_text.html:7
-#, fuzzy, python-format
-#| msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
-msgstr "Agregado por <a href=\"%(user_path)s\">%(username)s</a>"
+msgstr "Creado por <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/lists/curate.html:6
 msgid "Pending Books"
@@ -1401,10 +1323,8 @@ msgid "Sort List"
 msgstr "Ordena la lista"
 
 #: bookwyrm/templates/lists/list.html:109
-#, fuzzy
-#| msgid "List curation:"
 msgid "Direction"
-msgstr "Enumerar lista de comisariado:"
+msgstr "Dirección"
 
 #: bookwyrm/templates/lists/list.html:120
 msgid "Add Books"
@@ -1464,16 +1384,12 @@ msgid "Back to reports"
 msgstr "Volver a los informes"
 
 #: bookwyrm/templates/moderation/report.html:18
-#, fuzzy
-#| msgid "Notifications"
 msgid "Actions"
-msgstr "Notificaciones"
+msgstr "Acciones"
 
 #: bookwyrm/templates/moderation/report.html:19
-#, fuzzy
-#| msgid "User Profile"
 msgid "View user profile"
-msgstr "Perfil de usuario"
+msgstr "Ver perfil de usuario"
 
 #: bookwyrm/templates/moderation/report.html:22
 #: bookwyrm/templates/snippets/status/status_options.html:35
@@ -1500,10 +1416,8 @@ msgid "Comment"
 msgstr "Comentario"
 
 #: bookwyrm/templates/moderation/report.html:59
-#, fuzzy
-#| msgid "Delete status"
 msgid "Reported statuses"
-msgstr "Eliminar status"
+msgstr "Statuses reportados"
 
 #: bookwyrm/templates/moderation/report.html:61
 msgid "No statuses reported"
@@ -1514,10 +1428,8 @@ msgid "Status has been deleted"
 msgstr "Status ha sido eliminado"
 
 #: bookwyrm/templates/moderation/report_modal.html:6
-#, fuzzy, python-format
-#| msgid "Lists: %(username)s"
 msgid "Report @%(username)s"
-msgstr "Listas: %(username)s"
+msgstr "Reportar @%(username)s"
 
 #: bookwyrm/templates/moderation/report_modal.html:21
 #, python-format
@@ -1525,20 +1437,16 @@ msgid "This report will be sent to %(site_name)s's moderators for review."
 msgstr "Este informe se enviará a los moderadores de %(site_name)s para la revisión."
 
 #: bookwyrm/templates/moderation/report_modal.html:22
-#, fuzzy
-#| msgid "More about this site"
 msgid "More info about this report:"
-msgstr "Más sobre este sitio"
+msgstr "Más información sobre este informe:"
 
 #: bookwyrm/templates/moderation/report_preview.html:13
 msgid "No notes provided"
 msgstr "No se proporcionó notas"
 
 #: bookwyrm/templates/moderation/report_preview.html:20
-#, fuzzy, python-format
-#| msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgid "Reported by <a href=\"%(path)s\">%(username)s</a>"
-msgstr "Agregado por <a href=\"%(user_path)s\">%(username)s</a>"
+msgstr "Reportado por <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/moderation/report_preview.html:30
 msgid "Re-open"
@@ -1549,36 +1457,26 @@ msgid "Resolve"
 msgstr "Resolver"
 
 #: bookwyrm/templates/moderation/reports.html:6
-#, fuzzy, python-format
-#| msgid "Lists: %(username)s"
 msgid "Reports: %(server_name)s"
-msgstr "Listas: %(username)s"
+msgstr "Informes: %(server_name)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
 #: bookwyrm/templates/moderation/reports.html:16
 #: bookwyrm/templates/settings/admin_layout.html:28
-#, fuzzy
-#| msgid "Recent Imports"
 msgid "Reports"
-msgstr "Importaciones recientes"
+msgstr "Informes"
 
 #: bookwyrm/templates/moderation/reports.html:13
-#, fuzzy, python-format
-#| msgid "Lists: %(username)s"
 msgid "Reports: <small>%(server_name)s</small>"
-msgstr "Listas: %(username)s"
+msgstr "Informes: <small>%(server_name)s</small>"
 
 #: bookwyrm/templates/moderation/reports.html:27
-#, fuzzy
-#| msgid "Shelved"
 msgid "Resolved"
-msgstr "Archivado"
+msgstr "Resuelto"
 
 #: bookwyrm/templates/moderation/reports.html:34
-#, fuzzy
-#| msgid "No books found"
 msgid "No reports found."
-msgstr "No se encontró ningún libro"
+msgstr "No se encontró ningún informe."
 
 #: bookwyrm/templates/notifications.html:14
 msgid "Delete notifications"
@@ -1840,22 +1738,16 @@ msgid "Details"
 msgstr "Detalles"
 
 #: bookwyrm/templates/settings/federated_server.html:15
-#, fuzzy
-#| msgid "Software"
 msgid "Software:"
-msgstr "Software"
+msgstr "Software:"
 
 #: bookwyrm/templates/settings/federated_server.html:19
-#, fuzzy
-#| msgid "Description:"
 msgid "Version:"
-msgstr "Descripción:"
+msgstr "Versión:"
 
 #: bookwyrm/templates/settings/federated_server.html:23
-#, fuzzy
-#| msgid "Status"
 msgid "Status:"
-msgstr "Status"
+msgstr "Status:"
 
 #: bookwyrm/templates/settings/federated_server.html:30
 #: bookwyrm/templates/user/user_layout.html:50
@@ -1863,10 +1755,8 @@ msgid "Activity"
 msgstr "Actividad"
 
 #: bookwyrm/templates/settings/federated_server.html:33
-#, fuzzy
-#| msgid "Username:"
 msgid "Users:"
-msgstr "Nombre de usuario:"
+msgstr "Usuarios:"
 
 #: bookwyrm/templates/settings/federated_server.html:36
 #: bookwyrm/templates/settings/federated_server.html:43
@@ -1874,38 +1764,28 @@ msgid "View all"
 msgstr "Ver todos"
 
 #: bookwyrm/templates/settings/federated_server.html:40
-#, fuzzy
-#| msgid "Recent Imports"
 msgid "Reports:"
-msgstr "Importaciones recientes"
+msgstr "Informes:"
 
 #: bookwyrm/templates/settings/federated_server.html:47
-#, fuzzy
-#| msgid "followed you"
 msgid "Followed by us:"
-msgstr "te siguió"
+msgstr "Seguido por nosotros:"
 
 #: bookwyrm/templates/settings/federated_server.html:53
-#, fuzzy
-#| msgid "followed you"
 msgid "Followed by them:"
-msgstr "te siguió"
+msgstr "Seguido por ellos:"
 
 #: bookwyrm/templates/settings/federated_server.html:59
-#, fuzzy
-#| msgid "Blocked Users"
 msgid "Blocked by us:"
-msgstr "Usuarios bloqueados"
+msgstr "Bloqueado por nosotros:"
 
 #: bookwyrm/templates/settings/federation.html:13
 msgid "Server name"
 msgstr "Nombre de servidor"
 
 #: bookwyrm/templates/settings/federation.html:17
-#, fuzzy
-#| msgid "Federated"
 msgid "Date federated"
-msgstr "Federalizado"
+msgstr "Fecha de federalización"
 
 #: bookwyrm/templates/settings/federation.html:21
 msgid "Software"
@@ -1922,42 +1802,32 @@ msgstr "Status"
 #: bookwyrm/templates/settings/manage_invite_requests.html:11
 #: bookwyrm/templates/settings/manage_invite_requests.html:25
 #: bookwyrm/templates/settings/manage_invites.html:11
-#, fuzzy
-#| msgid "Invites"
 msgid "Invite Requests"
-msgstr "Invitaciones"
+msgstr "Solicitudes de invitación"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:23
 msgid "Ignored Invite Requests"
 msgstr "Solicitudes de invitación ignoradas"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:35
-#, fuzzy
-#| msgid "Federated"
 msgid "Date requested"
-msgstr "Federalizado"
+msgstr "Fecha solicitada"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:39
-#, fuzzy
-#| msgid "Accept"
 msgid "Date accepted"
-msgstr "Aceptar"
+msgstr "Fecha de aceptación"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:42
 msgid "Email"
 msgstr "Correo electronico"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:47
-#, fuzzy
-#| msgid "Notifications"
 msgid "Action"
-msgstr "Notificaciones"
+msgstr "Acción"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:50
-#, fuzzy
-#| msgid "Follow Requests"
 msgid "No requests"
-msgstr "Solicitudes de seguidor"
+msgstr "No solicitudes"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:59
 #: bookwyrm/templates/settings/status_filter.html:16
@@ -2083,10 +1953,8 @@ msgid "Allow registration:"
 msgstr "Permitir registración:"
 
 #: bookwyrm/templates/settings/site.html:83
-#, fuzzy
-#| msgid "Follow Requests"
 msgid "Allow invite requests:"
-msgstr "Solicitudes de seguidor"
+msgstr "Permitir solicitudes de invitación:"
 
 #: bookwyrm/templates/settings/site.html:87
 msgid "Registration closed text:"
@@ -2098,32 +1966,24 @@ msgid "Users: <small>%(server_name)s</small>"
 msgstr "Usuarios <small>%(server_name)s</small>"
 
 #: bookwyrm/templates/settings/user_admin.html:20
-#, fuzzy
-#| msgid "Username:"
 msgid "Username"
-msgstr "Nombre de usuario:"
+msgstr "Nombre de usuario"
 
 #: bookwyrm/templates/settings/user_admin.html:24
-#, fuzzy
-#| msgid "Added:"
 msgid "Date Added"
-msgstr "Agregado:"
+msgstr "Fecha agregada"
 
 #: bookwyrm/templates/settings/user_admin.html:28
 msgid "Last Active"
 msgstr "Actividad reciente"
 
 #: bookwyrm/templates/settings/user_admin.html:36
-#, fuzzy
-#| msgid "Remove"
 msgid "Remote server"
-msgstr "Quitar"
+msgstr "Quitar servidor"
 
 #: bookwyrm/templates/settings/user_admin.html:45
-#, fuzzy
-#| msgid "Activity"
 msgid "Active"
-msgstr "Actividad"
+msgstr "Activ@"
 
 #: bookwyrm/templates/settings/user_admin.html:45
 msgid "Inactive"
@@ -2175,22 +2035,16 @@ msgid "Quote"
 msgstr "Cita"
 
 #: bookwyrm/templates/snippets/create_status_form.html:18
-#, fuzzy
-#| msgid "Comment"
 msgid "Comment:"
-msgstr "Comentario"
+msgstr "Comentario:"
 
 #: bookwyrm/templates/snippets/create_status_form.html:20
-#, fuzzy
-#| msgid "Quote"
 msgid "Quote:"
-msgstr "Cita"
+msgstr "Cita:"
 
 #: bookwyrm/templates/snippets/create_status_form.html:22
-#, fuzzy
-#| msgid "Review"
 msgid "Review:"
-msgstr "Reseña"
+msgstr "Reseña:"
 
 #: bookwyrm/templates/snippets/create_status_form.html:56
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
@@ -2258,10 +2112,8 @@ msgid "Un-like status"
 msgstr "Quitar me gusta de status"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:7
-#, fuzzy
-#| msgid "Show less"
 msgid "Show filters"
-msgstr "Mostrar menos"
+msgstr "Mostrar filtros"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:9
 msgid "Hide filters"
@@ -2272,20 +2124,16 @@ msgid "Apply filters"
 msgstr "Aplicar filtros"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:26
-#, fuzzy
-#| msgid "Clear search"
 msgid "Clear filters"
-msgstr "Borrar búsqueda"
+msgstr "Borrar filtros"
 
 #: bookwyrm/templates/snippets/follow_button.html:12
 msgid "Follow"
 msgstr "Seguir"
 
 #: bookwyrm/templates/snippets/follow_button.html:18
-#, fuzzy
-#| msgid "Send follow request"
 msgid "Undo follow request"
-msgstr "Envia solicitud de seguidor"
+msgstr "Des-enviar solicitud de seguidor"
 
 #: bookwyrm/templates/snippets/follow_button.html:20
 msgid "Unfollow"
@@ -2316,12 +2164,10 @@ msgstr[0] "estableció una meta de leer %(counter)s libro en %(year)s"
 msgstr[1] "estableció una meta de leer %(counter)s libros en %(year)s"
 
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
-#, fuzzy, python-format
-#| msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
 msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
-msgstr[0] "<a href=\"%(path)s\">%(title)s</a> por "
-msgstr[1] "<a href=\"%(path)s\">%(title)s</a> por "
+msgstr[0] "Reseño <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s estrella"
+msgstr[1] "Reseño <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s estrellas"
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4
 #, python-format
@@ -2383,16 +2229,12 @@ msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count
 msgstr "%(username)s ha leído <a href=\"%(path)s\">%(read_count)s de %(goal_count)s libros</a>."
 
 #: bookwyrm/templates/snippets/page_text.html:4
-#, fuzzy, python-format
-#| msgid "of %(pages)s pages"
 msgid "page %(page)s of %(total_pages)s"
-msgstr "de %(pages)s páginas"
+msgstr "página %(page)s de %(total_pages)s"
 
 #: bookwyrm/templates/snippets/page_text.html:6
-#, fuzzy, python-format
-#| msgid "%(pages)s pages"
 msgid "page %(page)s"
-msgstr "%(pages)s páginas"
+msgstr "página %(pages)s"
 
 #: bookwyrm/templates/snippets/privacy-icons.html:3
 #: bookwyrm/templates/snippets/privacy-icons.html:4
@@ -2476,10 +2318,8 @@ msgid "Sign Up"
 msgstr "Inscribirse"
 
 #: bookwyrm/templates/snippets/report_button.html:5
-#, fuzzy
-#| msgid "Import"
 msgid "Report"
-msgstr "Importar"
+msgstr "Reportar"
 
 #: bookwyrm/templates/snippets/rss_title.html:5
 #: bookwyrm/templates/snippets/status/status_header.html:11
@@ -2502,10 +2342,8 @@ msgid "quoted"
 msgstr "citó"
 
 #: bookwyrm/templates/snippets/search_result_text.html:10
-#, fuzzy
-#| msgid "Add cover"
 msgid "No cover"
-msgstr "Agregar portada"
+msgstr "Sin portada"
 
 #: bookwyrm/templates/snippets/search_result_text.html:22
 #, python-format
@@ -2517,10 +2355,8 @@ msgid "Import book"
 msgstr "Importar libro"
 
 #: bookwyrm/templates/snippets/shelf_selector.html:4
-#, fuzzy
-#| msgid "Your books"
 msgid "Move book"
-msgstr "Tus libros"
+msgstr "Mover libro"
 
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
 #, python-format
@@ -2529,10 +2365,8 @@ msgstr "Terminar \"<em>%(book_title)s</em>\""
 
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:35
-#, fuzzy
-#| msgid "Updates"
 msgid "Update progress"
-msgstr "Actualizaciones"
+msgstr "Progreso de actualización"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5
 msgid "More shelves"
@@ -2552,10 +2386,8 @@ msgid "Want to read"
 msgstr "Quiero leer"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:48
-#, fuzzy, python-format
-#| msgid "Lists: %(username)s"
 msgid "Remove from %(name)s"
-msgstr "Listas: %(username)s"
+msgstr "Quitar de %(name)s"
 
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
 #, python-format
@@ -2597,28 +2429,20 @@ msgid "Open image in new window"
 msgstr "Abrir imagen en una nueva ventana"
 
 #: bookwyrm/templates/snippets/status/status_header.html:22
-#, fuzzy, python-format
-#| msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">review</a>"
-msgstr "Agregado por <a href=\"%(user_path)s\">%(username)s</a>"
+msgstr "respondió a la <a href=\"%(status_path)s\">reseña</a> de <a href=\"%(user_path)s\">%(username)s</a> "
 
 #: bookwyrm/templates/snippets/status/status_header.html:24
-#, fuzzy, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">comment</a>"
-msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">status</a>"
+msgstr "respondió al <a href=\"%(status_path)s\">comentario</a> de <a href=\"%(user_path)s\">%(username)s</a> "
 
 #: bookwyrm/templates/snippets/status/status_header.html:26
-#, fuzzy, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">quote</a>"
-msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">status</a>"
+msgstr "respondió a la <a href=\"%(status_path)s\">cita</a> de <a href=\"%(user_path)s\">%(username)s</a> "
 
 #: bookwyrm/templates/snippets/status/status_header.html:28
-#, fuzzy, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
-msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">status</a>"
+msgstr "respondió al <a href=\"%(status_path)s\">status</a> de <a href=\"%(user_path)s\">%(username)s</a> "
 
 #: bookwyrm/templates/snippets/status/status_options.html:7
 #: bookwyrm/templates/snippets/user_options.html:7
@@ -2626,26 +2450,20 @@ msgid "More options"
 msgstr "Más opciones"
 
 #: bookwyrm/templates/snippets/status/status_options.html:27
-#, fuzzy
-#| msgid "Delete these read dates"
 msgid "Delete & re-draft"
-msgstr "Eliminar estas fechas de lectura"
+msgstr "Eliminar y recomponer"
 
 #: bookwyrm/templates/snippets/switch_edition_button.html:5
 msgid "Switch to this edition"
 msgstr "Cambiar a esta edición"
 
 #: bookwyrm/templates/snippets/table-sort-header.html:6
-#, fuzzy
-#| msgid "Started reading"
 msgid "Sorted ascending"
-msgstr "Lectura se empezó"
+msgstr "En orden ascendente"
 
 #: bookwyrm/templates/snippets/table-sort-header.html:10
-#, fuzzy
-#| msgid "Started reading"
 msgid "Sorted descending"
-msgstr "Lectura se empezó"
+msgstr "En orden descendente"
 
 #: bookwyrm/templates/snippets/tag.html:14
 msgid "Remove tag"
@@ -2661,10 +2479,8 @@ msgid "Books tagged \"%(tag.name)s\""
 msgstr "Libros etiquetados con \"%(tag.name)s\""
 
 #: bookwyrm/templates/user/books_header.html:5
-#, fuzzy, python-format
-#| msgid "%(username)s's %(year)s Books"
 msgid "%(username)s's books"
-msgstr "Los libros de %(username)s para %(year)s"
+msgstr "Los libros de %(username)s"
 
 #: bookwyrm/templates/user/create_shelf_form.html:5
 #: bookwyrm/templates/user/create_shelf_form.html:22
@@ -2709,10 +2525,8 @@ msgid "Create list"
 msgstr "Crear lista"
 
 #: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:56
-#, fuzzy
-#| msgid "books"
 msgid "All books"
-msgstr "libros"
+msgstr "Todos los libros"
 
 #: bookwyrm/templates/user/shelf.html:37
 msgid "Create shelf"
@@ -2747,10 +2561,8 @@ msgid "Edit profile"
 msgstr "Editar perfil"
 
 #: bookwyrm/templates/user/user.html:34
-#, fuzzy, python-format
-#| msgid "See all %(size)s"
 msgid "View all %(size)s"
-msgstr "Ver %(size)s"
+msgstr "Ver todos los %(size)s"
 
 #: bookwyrm/templates/user/user.html:47
 msgid "View all books"
@@ -2782,10 +2594,8 @@ msgid "Reading Goal"
 msgstr "Meta de lectura"
 
 #: bookwyrm/templates/user/user_layout.html:68
-#, fuzzy
-#| msgid "Book"
 msgid "Books"
-msgstr "Libro"
+msgstr "Libros"
 
 #: bookwyrm/templates/user/user_preview.html:13
 #, python-format
@@ -2805,10 +2615,8 @@ msgid "%(counter)s following"
 msgstr "%(counter)s siguiendo"
 
 #: bookwyrm/views/password.py:32
-#, fuzzy
-#| msgid "A user with that username already exists."
 msgid "No user with that email address was found."
-msgstr "Ya existe un usuario con ese nombre."
+msgstr "No se pudo encontrar un usuario con esa dirección de correo electrónico."
 
 #: bookwyrm/views/password.py:41
 #, python-format
@@ -2821,10 +2629,8 @@ msgid "ambiguous option: %(option)s could match %(matches)s"
 msgstr "opción ambiguo: %(option)s pudiera coincidir con %(matches)s"
 
 #: venv/lib/python3.8/site-packages/django/contrib/messages/apps.py:7
-#, fuzzy
-#| msgid "All messages"
 msgid "Messages"
-msgstr "Todos los mensajes"
+msgstr "Mensajes"
 
 #: venv/lib/python3.8/site-packages/django/contrib/sitemaps/apps.py:7
 msgid "Site Maps"
@@ -2851,29 +2657,21 @@ msgid "That page contains no results"
 msgstr "Esa pagina no contiene resultados"
 
 #: venv/lib/python3.8/site-packages/django/core/validators.py:20
-#, fuzzy
-#| msgid "Email address:"
 msgid "Enter a valid value."
-msgstr "Dirección de correo electrónico:"
+msgstr "Ingrese un valor válido."
 
 #: venv/lib/python3.8/site-packages/django/core/validators.py:91
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:671
-#, fuzzy
-#| msgid "Email address:"
 msgid "Enter a valid URL."
-msgstr "Dirección de correo electrónico:"
+msgstr "Ingrese una URL válida."
 
 #: venv/lib/python3.8/site-packages/django/core/validators.py:145
-#, fuzzy
-#| msgid "Email address:"
 msgid "Enter a valid integer."
-msgstr "Dirección de correo electrónico:"
+msgstr "Ingrese un entero válido."
 
 #: venv/lib/python3.8/site-packages/django/core/validators.py:156
-#, fuzzy
-#| msgid "Email address:"
 msgid "Enter a valid email address."
-msgstr "Dirección de correo electrónico:"
+msgstr "Ingrese una dirección de correo electrónico válida."
 
 #. Translators: "letters" means latin letters: a-z and A-Z.
 #: venv/lib/python3.8/site-packages/django/core/validators.py:230
@@ -2886,24 +2684,18 @@ msgstr "Ingrese un “slug� válido que consiste de letras Unicode, numeros, g
 
 #: venv/lib/python3.8/site-packages/django/core/validators.py:246
 #: venv/lib/python3.8/site-packages/django/core/validators.py:266
-#, fuzzy
-#| msgid "Email address:"
 msgid "Enter a valid IPv4 address."
-msgstr "Dirección de correo electrónico:"
+msgstr "Ingrese una dirección IPv4 válida."
 
 #: venv/lib/python3.8/site-packages/django/core/validators.py:251
 #: venv/lib/python3.8/site-packages/django/core/validators.py:267
-#, fuzzy
-#| msgid "Email address:"
 msgid "Enter a valid IPv6 address."
-msgstr "Dirección de correo electrónico:"
+msgstr "Ingrese una dirección IPv6 válida."
 
 #: venv/lib/python3.8/site-packages/django/core/validators.py:261
 #: venv/lib/python3.8/site-packages/django/core/validators.py:265
-#, fuzzy
-#| msgid "Email address:"
 msgid "Enter a valid IPv4 or IPv6 address."
-msgstr "Dirección de correo electrónico:"
+msgstr "Ingrese una dirección IPv4 o IPv6 válida."
 
 #: venv/lib/python3.8/site-packages/django/core/validators.py:295
 msgid "Enter only digits separated by commas."
@@ -2941,10 +2733,8 @@ msgstr[1] "Verifica que este valor tiene a lo sumo %(limit_value)d caracteres. (
 #: venv/lib/python3.8/site-packages/django/core/validators.py:387
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:292
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:327
-#, fuzzy
-#| msgid "Series number:"
 msgid "Enter a number."
-msgstr "Número de serie:"
+msgstr "Ingrese un número."
 
 #: venv/lib/python3.8/site-packages/django/core/validators.py:389
 #, python-format
@@ -2983,32 +2773,24 @@ msgid "and"
 msgstr "y"
 
 #: venv/lib/python3.8/site-packages/django/db/models/base.py:1192
-#, fuzzy, python-format
-#| msgid "A user with that username already exists."
 msgid "%(model_name)s with this %(field_labels)s already exists."
-msgstr "Ya existe un usuario con ese nombre."
+msgstr "Ya existe %(model_name)s con este %(field_labels)s."
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:100
-#, fuzzy, python-format
-#| msgid "%(value)s is not a valid remote_id"
 msgid "Value %(value)r is not a valid choice."
-msgstr "%(value)s no es un remote_id válido"
+msgstr "El valor %(value)s no es una opción válida."
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:101
-#, fuzzy
-#| msgid "This shelf is empty."
 msgid "This field cannot be null."
-msgstr "Este estante está vacio."
+msgstr "Este campo no puede ser nulo."
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:102
 msgid "This field cannot be blank."
 msgstr "Este campo no puede ser vacio."
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:103
-#, fuzzy, python-format
-#| msgid "A user with that username already exists."
 msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "Ya existe un usuario con ese nombre."
+msgstr "Ya existe %(model_name)s con este %(field_labels)s."
 
 #. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
 #. Eg: "Title must be unique for pub_date year"
@@ -3042,10 +2824,8 @@ msgid "String (up to %(max_length)s)"
 msgstr "Cadena (máximo de %(max_length)s caracteres)"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1047
-#, fuzzy
-#| msgid "No active invites"
 msgid "Comma-separated integers"
-msgstr "No invitaciónes activas"
+msgstr "Enteros separados por comas"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1096
 #, python-format
@@ -3077,16 +2857,12 @@ msgid "Date (with time)"
 msgstr "Fecha (con la hora)"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1395
-#, fuzzy, python-format
-#| msgid "%(value)s is not a valid username"
 msgid "“%(value)s� value must be a decimal number."
-msgstr "%(value)s no es un usuario válido"
+msgstr "El valor de “%(value)s� debe ser un número decimal."
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1397
-#, fuzzy
-#| msgid "Series number:"
 msgid "Decimal number"
-msgstr "Número de serie:"
+msgstr "Número decimal"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1536
 #, python-format
@@ -3094,24 +2870,18 @@ msgid "“%(value)s� value has an invalid format. It must be in [DD] [[HH:]MM:
 msgstr "“%(value)s� valor tiene un formato invalido. Debe estar en formato [DD] [[HH:]MM:]ss[.uuuuuu]."
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1539
-#, fuzzy
-#| msgid "List curation:"
 msgid "Duration"
-msgstr "Enumerar lista de comisariado:"
+msgstr "Duración"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1589
-#, fuzzy
-#| msgid "Email address:"
 msgid "Email address"
-msgstr "Dirección de correo electrónico:"
+msgstr "Dirección de correo electrónico"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1612
 msgid "File path"
 msgstr "Ruta de archivo"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1678
-#, fuzzy, python-format
-#| msgid "%(value)s is not a valid username"
 msgid "“%(value)s� value must be a float."
 msgstr "%(value)s no es un usuario válido"
 
@@ -3129,22 +2899,16 @@ msgid "Integer"
 msgstr "Entero"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1803
-#, fuzzy
-#| msgid "No active invites"
 msgid "Big (8 byte) integer"
-msgstr "No invitaciónes activas"
+msgstr "Entero grande (8 byte)"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1819
-#, fuzzy
-#| msgid "Email address:"
 msgid "IPv4 address"
-msgstr "Dirección de correo electrónico:"
+msgstr "Dirección IPv4"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1850
-#, fuzzy
-#| msgid "Email address:"
 msgid "IP address"
-msgstr "Dirección de correo electrónico:"
+msgstr "Dirección IP"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1930
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1931
@@ -3157,22 +2921,16 @@ msgid "Boolean (Either True, False or None)"
 msgstr "Booleano (O True, Falso, o None)"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1976
-#, fuzzy
-#| msgid "No active invites"
 msgid "Positive big integer"
-msgstr "No invitaciónes activas"
+msgstr "Entero positivo grande"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1989
-#, fuzzy
-#| msgid "No active invites"
 msgid "Positive integer"
-msgstr "No invitaciónes activas"
+msgstr "Entero positivo"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2002
-#, fuzzy
-#| msgid "No active invites"
 msgid "Positive small integer"
-msgstr "No invitaciónes activas"
+msgstr "Entero positivo pequeño "
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2016
 #, python-format
@@ -3210,10 +2968,8 @@ msgid "Raw binary data"
 msgstr "Datos binarios sin procesar"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2301
-#, fuzzy, python-format
-#| msgid "%(value)s is not a valid username"
 msgid "“%(value)s� is not a valid UUID."
-msgstr "%(value)s no es un usuario válido"
+msgstr "%(value)s no es una UUID válida."
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2303
 msgid "Universally unique identifier"
@@ -3224,10 +2980,8 @@ msgid "File"
 msgstr "Archivo"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/files.py:379
-#, fuzzy
-#| msgid "Images"
 msgid "Image"
-msgstr "Imagenes"
+msgstr "Imágen"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/json.py:18
 msgid "A JSON object"
@@ -3235,7 +2989,7 @@ msgstr "Un objeto JSON"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/json.py:20
 msgid "Value must be valid JSON."
-msgstr "Valor debe ser JSON valido."
+msgstr "Valor debe ser JSON válido."
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/related.py:790
 #, python-format
@@ -3247,28 +3001,20 @@ msgid "Foreign Key (type determined by related field)"
 msgstr "Clave externa (tipo determinado por campo relacionado)"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/related.py:1045
-#, fuzzy
-#| msgid "Relationships"
 msgid "One-to-one relationship"
-msgstr "Relaciones"
+msgstr "Relación uno-a-uno"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/related.py:1099
-#, fuzzy, python-format
-#| msgid "Relationships"
 msgid "%(from)s-%(to)s relationship"
-msgstr "Relaciones"
+msgstr "relación %(from)s-%(to)s"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/related.py:1100
-#, fuzzy, python-format
-#| msgid "Relationships"
 msgid "%(from)s-%(to)s relationships"
-msgstr "Relaciones"
+msgstr "relaciones %(from)s-%(to)s"
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/related.py:1142
-#, fuzzy
-#| msgid "Relationships"
 msgid "Many-to-many relationship"
-msgstr "Relaciones"
+msgstr "Relaciones mucho-a-mucho"
 
 #. Translators: If found as last label character, these punctuation
 #. characters will prevent the default label_suffix to be appended to the label
@@ -3277,42 +3023,30 @@ msgid ":?.!"
 msgstr ""
 
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:54
-#, fuzzy
-#| msgid "This shelf is empty."
 msgid "This field is required."
-msgstr "Este estante está vacio."
+msgstr "Este campo es requerido."
 
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:247
-#, fuzzy
-#| msgid "Series number:"
 msgid "Enter a whole number."
-msgstr "Número de serie:"
+msgstr "Ingrese un número entero."
 
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:398
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:1139
-#, fuzzy
-#| msgid "Email address:"
 msgid "Enter a valid date."
-msgstr "Dirección de correo electrónico:"
+msgstr "Ingrese una fecha válida."
 
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:422
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:1140
-#, fuzzy
-#| msgid "Email address:"
 msgid "Enter a valid time."
-msgstr "Dirección de correo electrónico:"
+msgstr "Ingrese una hora válida."
 
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:450
-#, fuzzy
-#| msgid "Email address:"
 msgid "Enter a valid date/time."
-msgstr "Dirección de correo electrónico:"
+msgstr "Ingrese una fecha/hora válida."
 
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:484
-#, fuzzy
-#| msgid "Email address:"
 msgid "Enter a valid duration."
-msgstr "Dirección de correo electrónico:"
+msgstr "Ingrese una duración válida."
 
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:485
 #, python-brace-format
@@ -3328,10 +3062,8 @@ msgid "No file was submitted."
 msgstr "No se aceptó ningun archivo."
 
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:547
-#, fuzzy
-#| msgid "This shelf is empty."
 msgid "The submitted file is empty."
-msgstr "Este estante está vacio."
+msgstr "El archivo enviado está vacio."
 
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:549
 #, python-format
@@ -3346,38 +3078,32 @@ msgstr "Por favor, o envia un archivo o marca la casilla vacia, no los dos."
 
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:613
 msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
-msgstr "Subir una imagen valida. El archivo que subiste o no fue imagen o fue corrupto."
+msgstr "Subir una imagen válida. El archivo que subiste o no fue imagen o fue corrupto."
 
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:775
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:865
 #: venv/lib/python3.8/site-packages/django/forms/models.py:1296
 #, python-format
 msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr "Selecciona una opción valida. %(value)s no es una de las opciones disponibles."
+msgstr "Selecciona una opción válida. %(value)s no es una de las opciones disponibles."
 
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:866
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:981
 #: venv/lib/python3.8/site-packages/django/forms/models.py:1295
-#, fuzzy
-#| msgid "Email address:"
 msgid "Enter a list of values."
-msgstr "Dirección de correo electrónico:"
+msgstr "Ingrese una lista de valores."
 
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:982
 msgid "Enter a complete value."
 msgstr "Ingresa un valor completo."
 
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:1198
-#, fuzzy
-#| msgid "Email address:"
 msgid "Enter a valid UUID."
-msgstr "Dirección de correo electrónico:"
+msgstr "Ingrese una UUID válida."
 
 #: venv/lib/python3.8/site-packages/django/forms/fields.py:1228
-#, fuzzy
-#| msgid "Email address:"
 msgid "Enter a valid JSON."
-msgstr "Dirección de correo electrónico:"
+msgstr "Ingrese una JSON válida."
 
 #. Translators: This is the default suffix added to form field labels
 #: venv/lib/python3.8/site-packages/django/forms/forms.py:78
@@ -3443,10 +3169,8 @@ msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr "Selecciona una opción válida. Esa opción no es una de las opciones disponibles."
 
 #: venv/lib/python3.8/site-packages/django/forms/models.py:1298
-#, fuzzy, python-format
-#| msgid "%(value)s is not a valid username"
 msgid "“%(pk)s� is not a valid value."
-msgstr "%(value)s no es un usuario válido"
+msgstr "“%(pk)s� no es un valor válido."
 
 #: venv/lib/python3.8/site-packages/django/forms/utils.py:167
 #, python-format
@@ -3458,16 +3182,12 @@ msgid "Clear"
 msgstr "Borrar"
 
 #: venv/lib/python3.8/site-packages/django/forms/widgets.py:399
-#, fuzzy
-#| msgid "Currently Reading"
 msgid "Currently"
-msgstr "Leyendo actualmente"
+msgstr "Actualmente"
 
 #: venv/lib/python3.8/site-packages/django/forms/widgets.py:400
-#, fuzzy
-#| msgid "Change shelf"
 msgid "Change"
-msgstr "Cambiar estante"
+msgstr "Cambiar"
 
 #: venv/lib/python3.8/site-packages/django/forms/widgets.py:709
 msgid "Unknown"
@@ -3836,7 +3556,7 @@ msgstr "Diciembre"
 
 #: venv/lib/python3.8/site-packages/django/utils/ipv6.py:8
 msgid "This is not a valid IPv6 address."
-msgstr "Esta no es una valida dirección IPv6."
+msgstr "Esta no es una dirección IPv6 válida."
 
 #: venv/lib/python3.8/site-packages/django/utils/text.py:70
 #, python-format
@@ -3967,10 +3687,8 @@ msgid "Invalid date string “%(datestr)s� given format “%(format)s�"
 msgstr "Cadena de fecha invalida “%(datestr)s� dado el formato “%(format)s�"
 
 #: venv/lib/python3.8/site-packages/django/views/generic/detail.py:54
-#, fuzzy, python-format
-#| msgid "No books found matching the query \"%(query)s\""
 msgid "No %(verbose_name)s found matching the query"
-msgstr "No se encontró ningún libro correspondiente a la búsqueda: \"%(query)s\""
+msgstr "No se encontró ningún %(verbose_name)s correspondiente a la búsqueda"
 
 #: venv/lib/python3.8/site-packages/django/views/generic/list.py:67
 msgid "Page is not “last�, nor can it be converted to an int."
@@ -3991,10 +3709,8 @@ msgid "Directory indexes are not allowed here."
 msgstr "Indices directorios no se permiten aquí."
 
 #: venv/lib/python3.8/site-packages/django/views/static.py:42
-#, fuzzy, python-format
-#| msgid "%(value)s is not a valid username"
 msgid "“%(path)s� does not exist"
-msgstr "%(value)s no es un usuario válido"
+msgstr "“%(path)s� no existe"
 
 #: venv/lib/python3.8/site-packages/django/views/static.py:80
 #, python-format
@@ -4036,10 +3752,8 @@ msgid "Get started with Django"
 msgstr "Empezar con Django"
 
 #: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:408
-#, fuzzy
-#| msgid "Comment"
 msgid "Django Community"
-msgstr "Comentario"
+msgstr "Comunidad Django"
 
 #: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:409
 msgid "Connect, get help, or contribute"

From 9400510b21f8105a04b4b5ac580d6854da4ac27f Mon Sep 17 00:00:00 2001
From: reese <reesedporter@gmail.com>
Date: Wed, 21 Apr 2021 15:52:44 -0500
Subject: [PATCH 0918/1285] compile messages, fix typos

---
 locale/es/LC_MESSAGES/django.mo    | Bin 26563 -> 65812 bytes
 locale/es/LC_MESSAGES/django.po    |   6 +++---
 locale/fr_FR/LC_MESSAGES/django.mo | Bin 42813 -> 42851 bytes
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index d42d8394517c6921e9ae059a8a9affcf6fac1a68..44788295d68754777a83997a986f032a60cfcc30 100644
GIT binary patch
literal 65812
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
K+HenJ-KM_*@;BW8

delta 10665
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
E0rw*bJpcdz

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 2fbf981c..62b6ac25 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -1640,7 +1640,7 @@ msgstr "Mostrar meta de lectura en el feed:"
 #: bookwyrm/templates/preferences/edit_user.html:62
 #, python-format
 msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
-msgstr "Tu cuenta se aparecerá en el <a href=\"%(path)s\">directorio</a>, y puede ser recomendado a otros usuarios de BookWyrm.""
+msgstr "Tu cuenta se aparecerá en el <a href=\"%(path)s\">directorio</a>, y puede ser recomendado a otros usuarios de BookWyrm."
 
 #: bookwyrm/templates/preferences/edit_user.html:65
 msgid "Preferred Timezone: "
@@ -2914,7 +2914,7 @@ msgstr "Dirección IP"
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1931
 #, python-format
 msgid "“%(value)s� value must be either None, True or False."
-msgstr "Valor debe ser o None, True, o False."
+msgstr "Valor “%(value)s� debe ser o None, True, o False."
 
 #: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1933
 msgid "Boolean (Either True, False or None)"
@@ -3139,7 +3139,7 @@ msgstr[1] "Por favor, enviar %d o más formularios."
 # TODO cc @mouse is this a verb or noun
 msgid "Order"
 msgstr "Pedir" # if verb 
-msgstr "Pedido" # if noun
+# msgstr "Pedido" # if noun
 
 #: venv/lib/python3.8/site-packages/django/forms/models.py:755
 #, python-format
diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index 09e90f22c801bc681e5dfda3c171b81a4da45afc..b91a542dbfb13e56f1baff5aeab3b9c4a3088116 100644
GIT binary patch
delta 12199
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
X<qlrE#>M}guy9;_{H`T^H>Ug-$oH$I

delta 12183
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
bX6&j_zJ0osWj%}U`Z_kX(ynDaPuBWB*blDr


From e4b432246a7c83cb454b32cce3e4554506dc37db Mon Sep 17 00:00:00 2001
From: reese <reesedporter@gmail.com>
Date: Thu, 22 Apr 2021 11:03:41 -0500
Subject: [PATCH 0919/1285] replace venv3 with venv, makemessages for es,
 compilemessages for es

---
 bw-dev                          |    4 +-
 locale/es/LC_MESSAGES/django.mo |  Bin 65812 -> 42569 bytes
 locale/es/LC_MESSAGES/django.po | 2776 ++++++++++++++-----------------
 3 files changed, 1265 insertions(+), 1515 deletions(-)

diff --git a/bw-dev b/bw-dev
index 42fb4a2e..c2b63bc1 100755
--- a/bw-dev
+++ b/bw-dev
@@ -90,10 +90,10 @@ case "$CMD" in
         runweb python manage.py collectstatic --no-input
         ;;
     makemessages)
-        runweb django-admin makemessages --no-wrap --ignore=venv3 $@
+        runweb django-admin makemessages --no-wrap --ignore=venv $@
         ;;
     compilemessages)
-        runweb django-admin compilemessages --ignore venv3 $@
+        runweb django-admin compilemessages --ignore venv $@
         ;;
     build)
         docker-compose build
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index 44788295d68754777a83997a986f032a60cfcc30..f0d87d7039ba2302eba8733872a4fa81b1cb94f5 100644
GIT binary patch
delta 14983
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

literal 65812
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
K+HenJ-KM_*@;BW8

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 62b6ac25..a6274f7a 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-11 01:59+0000\n"
+"POT-Creation-Date: 2021-04-22 15:55+0000\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,60 +18,57 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/forms.py:226
+#: bookwyrm/forms.py:232
 msgid "A user with this email already exists."
 msgstr "Ya existe un usuario con ese correo electrónico."
 
-#: bookwyrm/forms.py:240
+#: bookwyrm/forms.py:246
 msgid "One Day"
 msgstr "Un día"
 
-#: bookwyrm/forms.py:241
+#: bookwyrm/forms.py:247
 msgid "One Week"
 msgstr "Una semana"
 
-#: bookwyrm/forms.py:242
+#: bookwyrm/forms.py:248
 msgid "One Month"
 msgstr "Un mes"
 
-#: bookwyrm/forms.py:243
+#: bookwyrm/forms.py:249
 msgid "Does Not Expire"
 msgstr "Nunca se vence"
 
-#: bookwyrm/forms.py:248
+#: bookwyrm/forms.py:254
 #, python-format
 msgid "%(count)d uses"
 msgstr "%(count)d usos"
 
-#: bookwyrm/forms.py:251
+#: bookwyrm/forms.py:257
 msgid "Unlimited"
 msgstr "Sin límite"
 
-#: bookwyrm/forms.py:289
+#: bookwyrm/forms.py:301
 msgid "List Order"
 msgstr "Orden de la lista"
 
-#: bookwyrm/forms.py:290
-#| msgid "Title"
+#: bookwyrm/forms.py:302
 msgid "Book Title"
 msgstr "Título"
 
-#: bookwyrm/forms.py:291 bookwyrm/templates/snippets/create_status_form.html:29
+#: bookwyrm/forms.py:303 bookwyrm/templates/snippets/create_status_form.html:31
 #: bookwyrm/templates/user/shelf.html:81
 msgid "Rating"
 msgstr "Calificación"
 
-#: bookwyrm/forms.py:293 bookwyrm/templates/lists/list.html:105
+#: bookwyrm/forms.py:305 bookwyrm/templates/lists/list.html:72
 msgid "Sort By"
 msgstr "Ordenar por"
 
-#: bookwyrm/forms.py:297
-#| msgid "Started reading"
+#: bookwyrm/forms.py:309
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: bookwyrm/forms.py:298
-#| msgid "Started reading"
+#: bookwyrm/forms.py:310
 msgid "Descending"
 msgstr "Descendente"
 
@@ -85,7 +82,7 @@ msgstr "%(value)s no es un remote_id válido"
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s no es un usuario válido"
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:152
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:153
 msgid "username"
 msgstr "nombre de usuario"
 
@@ -93,23 +90,23 @@ msgstr "nombre de usuario"
 msgid "A user with that username already exists."
 msgstr "Ya existe un usuario con ese nombre."
 
-#: bookwyrm/settings.py:150
+#: bookwyrm/settings.py:152
 msgid "English"
 msgstr "Inglés"
 
-#: bookwyrm/settings.py:151
+#: bookwyrm/settings.py:153
 msgid "German"
 msgstr "Aléman"
 
-#: bookwyrm/settings.py:152
+#: bookwyrm/settings.py:154
 msgid "Spanish"
 msgstr "Español"
 
-#: bookwyrm/settings.py:153
+#: bookwyrm/settings.py:155
 msgid "French"
 msgstr "Francés"
 
-#: bookwyrm/settings.py:154
+#: bookwyrm/settings.py:156
 msgid "Simplified Chinese"
 msgstr "Chino simplificado"
 
@@ -146,77 +143,67 @@ msgstr "Wikipedia"
 msgid "Books by %(name)s"
 msgstr "Libros de %(name)s"
 
-#: bookwyrm/templates/book/book.html:21
+#: bookwyrm/templates/book/book.html:33
 #: bookwyrm/templates/discover/large-book.html:12
 #: bookwyrm/templates/discover/small-book.html:9
 msgid "by"
 msgstr "por"
 
-#: bookwyrm/templates/book/book.html:29 bookwyrm/templates/book/book.html:30
+#: bookwyrm/templates/book/book.html:41 bookwyrm/templates/book/book.html:42
 msgid "Edit Book"
 msgstr "Editar Libro"
 
-#: bookwyrm/templates/book/book.html:49
+#: bookwyrm/templates/book/book.html:61
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "Agregar portada"
 
-#: bookwyrm/templates/book/book.html:53
+#: bookwyrm/templates/book/book.html:65
 msgid "Failed to load cover"
 msgstr "No se pudo cargar la portada"
 
-#: bookwyrm/templates/book/book.html:62
-msgid "ISBN:"
-msgstr "ISBN:"
-
-#: bookwyrm/templates/book/book.html:69
-#: bookwyrm/templates/book/edit_book.html:223
-msgid "OCLC Number:"
-msgstr "Número OCLC:"
-
-#: bookwyrm/templates/book/book.html:76
-#: bookwyrm/templates/book/edit_book.html:227
-msgid "ASIN:"
-msgstr "ASIN:"
-
-#: bookwyrm/templates/book/book.html:85
+#: bookwyrm/templates/book/book.html:82
 msgid "View on OpenLibrary"
 msgstr "Ver en OpenLibrary"
 
-#: bookwyrm/templates/book/book.html:94
+#: bookwyrm/templates/book/book.html:102
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s reseña)"
 msgstr[1] "(%(review_count)s reseñas)"
 
-#: bookwyrm/templates/book/book.html:100
+#: bookwyrm/templates/book/book.html:114
 msgid "Add Description"
 msgstr "Agregar descripción"
 
-#: bookwyrm/templates/book/book.html:107
+#: bookwyrm/templates/book/book.html:121
 #: bookwyrm/templates/book/edit_book.html:107
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Descripción:"
 
-#: bookwyrm/templates/book/book.html:111
-#: bookwyrm/templates/book/edit_book.html:237
+#: bookwyrm/templates/book/book.html:125
+#: bookwyrm/templates/book/edit_book.html:240
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
+#: bookwyrm/templates/settings/edit_server.html:68
+#: bookwyrm/templates/settings/federated_server.html:93
 #: bookwyrm/templates/settings/site.html:93
 #: bookwyrm/templates/snippets/readthrough.html:75
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:38
 msgid "Save"
 msgstr "Guardar"
 
-#: bookwyrm/templates/book/book.html:112 bookwyrm/templates/book/book.html:161
+#: bookwyrm/templates/book/book.html:126 bookwyrm/templates/book/book.html:175
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:238
+#: bookwyrm/templates/book/edit_book.html:241
 #: bookwyrm/templates/edit_author.html:79
-#: bookwyrm/templates/moderation/report_modal.html:32
+#: bookwyrm/templates/moderation/report_modal.html:34
+#: bookwyrm/templates/settings/federated_server.html:94
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
 #: bookwyrm/templates/snippets/readthrough.html:76
@@ -227,78 +214,93 @@ msgstr "Guardar"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: bookwyrm/templates/book/book.html:121
+#: bookwyrm/templates/book/book.html:135
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s/editions\">%(count)s ediciones</a>"
 
-#: bookwyrm/templates/book/book.html:129
+#: bookwyrm/templates/book/book.html:143
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "Esta edición está en tu <a href=\"%(path)s\">%(shelf_name)s</a> estante."
 
-#: bookwyrm/templates/book/book.html:135
+#: bookwyrm/templates/book/book.html:149
 #, python-format
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr "Una <a href=\"%(book_path)s\">edición diferente</a> de este libro está en tu <a href=\"%(shelf_path)s\">%(shelf_name)s</a> estante."
 
-#: bookwyrm/templates/book/book.html:144
+#: bookwyrm/templates/book/book.html:158
 msgid "Your reading activity"
 msgstr "Tu actividad de lectura"
 
-#: bookwyrm/templates/book/book.html:146
+#: bookwyrm/templates/book/book.html:160
 msgid "Add read dates"
 msgstr "Agregar fechas de lectura"
 
-#: bookwyrm/templates/book/book.html:151
+#: bookwyrm/templates/book/book.html:165
 msgid "You don't have any reading activity for this book."
 msgstr "No tienes ninguna actividad de lectura para este libro."
 
-#: bookwyrm/templates/book/book.html:158
+#: bookwyrm/templates/book/book.html:172
 msgid "Create"
 msgstr "Crear"
 
-#: bookwyrm/templates/book/book.html:180
+#: bookwyrm/templates/book/book.html:194
 msgid "Subjects"
 msgstr "Sujetos"
 
-#: bookwyrm/templates/book/book.html:191
+#: bookwyrm/templates/book/book.html:206
 msgid "Places"
 msgstr "Lugares"
 
-#: bookwyrm/templates/book/book.html:202 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book/book.html:217 bookwyrm/templates/layout.html:65
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listas"
 
-#: bookwyrm/templates/book/book.html:213
+#: bookwyrm/templates/book/book.html:228
 msgid "Add to list"
 msgstr "Agregar a lista"
 
-#: bookwyrm/templates/book/book.html:223
+#: bookwyrm/templates/book/book.html:238
 #: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:156
+#: bookwyrm/templates/lists/list.html:123
 msgid "Add"
 msgstr "Agregar"
 
-#: bookwyrm/templates/book/book.html:251
+#: bookwyrm/templates/book/book.html:276
 msgid "rated it"
 msgstr "lo calificó con"
 
+#: bookwyrm/templates/book/book_identifiers.html:8
+msgid "ISBN:"
+msgstr "ISBN:"
+
+#: bookwyrm/templates/book/book_identifiers.html:15
+#: bookwyrm/templates/book/edit_book.html:226
+msgid "OCLC Number:"
+msgstr "Número OCLC:"
+
+#: bookwyrm/templates/book/book_identifiers.html:22
+#: bookwyrm/templates/book/edit_book.html:230
+msgid "ASIN:"
+msgstr "ASIN:"
+
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:175
+#: bookwyrm/templates/book/edit_book.html:178
 msgid "Upload cover:"
 msgstr "Subir portada:"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:181
+#: bookwyrm/templates/book/edit_book.html:184
 msgid "Load cover from url:"
 msgstr "Agregar portada de url:"
 
 #: bookwyrm/templates/book/edit_book.html:5
 #: bookwyrm/templates/book/edit_book.html:11
+#, python-format
 msgid "Edit \"%(book_title)s\""
 msgstr "Editar \"%(book_title)s\""
 
@@ -332,6 +334,7 @@ msgid "Is \"%(name)s\" an existing author?"
 msgstr "¿Es \"%(name)s\" un autor ya existente?"
 
 #: bookwyrm/templates/book/edit_book.html:52
+#, python-format
 msgid "Author of <em>%(book_title)s</em>"
 msgstr "Autor de <em>%(book_title)s</em>"
 
@@ -375,77 +378,78 @@ msgstr "Título:"
 msgid "Subtitle:"
 msgstr "Subtítulo:"
 
-#: bookwyrm/templates/book/edit_book.html:112
+#: bookwyrm/templates/book/edit_book.html:113
 msgid "Series:"
 msgstr "Serie:"
 
-#: bookwyrm/templates/book/edit_book.html:117
+#: bookwyrm/templates/book/edit_book.html:120
 msgid "Series number:"
 msgstr "Número de serie:"
 
-#: bookwyrm/templates/book/edit_book.html:123
+#: bookwyrm/templates/book/edit_book.html:126
 msgid "Publisher:"
 msgstr "Editorial:"
 
-#: bookwyrm/templates/book/edit_book.html:125
+#: bookwyrm/templates/book/edit_book.html:128
 msgid "Separate multiple publishers with commas."
 msgstr "Separar varios editores con comas."
 
-#: bookwyrm/templates/book/edit_book.html:132
+#: bookwyrm/templates/book/edit_book.html:135
 msgid "First published date:"
 msgstr "Fecha de primera publicación:"
 
-#: bookwyrm/templates/book/edit_book.html:140
+#: bookwyrm/templates/book/edit_book.html:143
 msgid "Published date:"
 msgstr "Fecha de publicación:"
 
-#: bookwyrm/templates/book/edit_book.html:149
+#: bookwyrm/templates/book/edit_book.html:152
 msgid "Authors"
 msgstr "Autores"
 
-#: bookwyrm/templates/book/edit_book.html:155
+#: bookwyrm/templates/book/edit_book.html:158
+#, python-format
 msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
 msgstr "Eliminar <a href=\"%(path)s\">%(name)s</a>"
 
-#: bookwyrm/templates/book/edit_book.html:160
+#: bookwyrm/templates/book/edit_book.html:163
 msgid "Add Authors:"
 msgstr "Agregar Autores:"
 
-#: bookwyrm/templates/book/edit_book.html:161
+#: bookwyrm/templates/book/edit_book.html:164
 msgid "John Doe, Jane Smith"
 msgstr "Juan Nadie, Natalia Natalia"
 
-#: bookwyrm/templates/book/edit_book.html:167
+#: bookwyrm/templates/book/edit_book.html:170
 #: bookwyrm/templates/user/shelf.html:75
 msgid "Cover"
 msgstr "Portada:"
 
-#: bookwyrm/templates/book/edit_book.html:194
+#: bookwyrm/templates/book/edit_book.html:197
 msgid "Physical Properties"
 msgstr "Propiedades físicas:"
 
-#: bookwyrm/templates/book/edit_book.html:195
+#: bookwyrm/templates/book/edit_book.html:198
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "Formato:"
 
-#: bookwyrm/templates/book/edit_book.html:203
+#: bookwyrm/templates/book/edit_book.html:206
 msgid "Pages:"
 msgstr "Páginas:"
 
-#: bookwyrm/templates/book/edit_book.html:210
+#: bookwyrm/templates/book/edit_book.html:213
 msgid "Book Identifiers"
 msgstr "Identificadores de libro"
 
-#: bookwyrm/templates/book/edit_book.html:211
+#: bookwyrm/templates/book/edit_book.html:214
 msgid "ISBN 13:"
 msgstr "ISBN 13:"
 
-#: bookwyrm/templates/book/edit_book.html:215
+#: bookwyrm/templates/book/edit_book.html:218
 msgid "ISBN 10:"
 msgstr "ISBN 10:"
 
-#: bookwyrm/templates/book/edit_book.html:219
+#: bookwyrm/templates/book/edit_book.html:222
 #: bookwyrm/templates/edit_author.html:59
 msgid "Openlibrary key:"
 msgstr "Clave OpenLibrary:"
@@ -469,30 +473,37 @@ msgstr "Cualquier"
 msgid "Language:"
 msgstr "Idioma:"
 
-#: bookwyrm/templates/book/publisher_info.html:6
+#: bookwyrm/templates/book/publisher_info.html:22
+#, python-format
+msgid "%(format)s"
+msgstr "%(format)s"
+
+#: bookwyrm/templates/book/publisher_info.html:24
 #, python-format
 msgid "%(format)s, %(pages)s pages"
 msgstr "%(format)s, %(pages)s páginas"
 
-#: bookwyrm/templates/book/publisher_info.html:8
+#: bookwyrm/templates/book/publisher_info.html:26
 #, python-format
 msgid "%(pages)s pages"
 msgstr "%(pages)s páginas"
 
-#: bookwyrm/templates/book/publisher_info.html:13
+#: bookwyrm/templates/book/publisher_info.html:38
+#, python-format
 msgid "%(languages)s language"
 msgstr "idioma %(languages)s"
 
-#: bookwyrm/templates/book/publisher_info.html:18
+#: bookwyrm/templates/book/publisher_info.html:64
 #, python-format
 msgid "Published %(date)s by %(publisher)s."
 msgstr "Publicado %(date)s por %(publisher)s."
 
-#: bookwyrm/templates/book/publisher_info.html:20
+#: bookwyrm/templates/book/publisher_info.html:66
+#, python-format
 msgid "Published %(date)s"
 msgstr "Publicado %(date)s"
 
-#: bookwyrm/templates/book/publisher_info.html:22
+#: bookwyrm/templates/book/publisher_info.html:68
 #, python-format
 msgid "Published by %(publisher)s."
 msgstr "Publicado por %(publisher)s."
@@ -523,7 +534,7 @@ msgstr "Comunidad federalizada"
 
 #: bookwyrm/templates/directory/directory.html:6
 #: bookwyrm/templates/directory/directory.html:11
-#: bookwyrm/templates/layout.html:92
+#: bookwyrm/templates/layout.html:93
 msgid "Directory"
 msgstr "Directorio"
 
@@ -532,6 +543,7 @@ msgid "Make your profile discoverable to other BookWyrm users."
 msgstr "Haz que tu perfil sea reconocible a otros usarios de BookWyrm."
 
 #: bookwyrm/templates/directory/directory.html:26
+#, python-format
 msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
 msgstr "Puedes optar por no en cualquier hora en tus <a href=\"%(path)s\">configuraciones de perfil.</a>"
 
@@ -646,7 +658,7 @@ msgid "Email address:"
 msgstr "Dirección de correo electrónico:"
 
 #: bookwyrm/templates/discover/landing_layout.html:70
-#: bookwyrm/templates/moderation/report_modal.html:31
+#: bookwyrm/templates/moderation/report_modal.html:33
 msgid "Submit"
 msgstr "Enviar"
 
@@ -708,6 +720,7 @@ msgstr "Preferencia de correo electrónico"
 
 #: bookwyrm/templates/email/invite/html_content.html:6
 #: bookwyrm/templates/email/invite/subject.html:2
+#, python-format
 msgid "You're invited to join %(site_name)s!"
 msgstr "¡Estás invitado a unirse con %(site_name)s!"
 
@@ -749,6 +762,7 @@ msgid "If you didn't request to reset your password, you can ignore this email."
 msgstr "Si no solicitaste reestablecer tu contraseña, puedes ignorar este mensaje."
 
 #: bookwyrm/templates/email/password_reset/subject.html:2
+#, python-format
 msgid "Reset your %(site_name)s password"
 msgstr "Reestablece tu contraseña de %(site_name)s"
 
@@ -758,7 +772,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Mensajes directos con <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:87
+#: bookwyrm/templates/layout.html:88
 msgid "Direct Messages"
 msgstr "Mensajes directos"
 
@@ -791,6 +805,7 @@ msgid "Local"
 msgstr "Local"
 
 #: bookwyrm/templates/feed/feed.html:25
+#: bookwyrm/templates/settings/edit_server.html:40
 msgid "Federated"
 msgstr "Federalizado"
 
@@ -813,7 +828,7 @@ msgid "Updates"
 msgstr "Actualizaciones"
 
 #: bookwyrm/templates/feed/feed_layout.html:11
-#: bookwyrm/templates/layout.html:58
+#: bookwyrm/templates/layout.html:59
 #: bookwyrm/templates/user/books_header.html:3
 msgid "Your books"
 msgstr "Tus libros"
@@ -859,6 +874,7 @@ msgstr[0] "%(shared_books)s libro en tus estantes"
 msgstr[1] "%(shared_books)s libros en tus estantes"
 
 #: bookwyrm/templates/get_started/book_preview.html:6
+#, python-format
 msgid "Have you read %(book_title)s?"
 msgstr "¿Has leído %(book_title)s?"
 
@@ -867,7 +883,7 @@ msgid "What are you reading?"
 msgstr "¿Qué estás leyendo?"
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:124
+#: bookwyrm/templates/lists/list.html:91
 msgid "Search for a book"
 msgstr "Buscar libros"
 
@@ -887,8 +903,8 @@ msgstr "Puedes agregar libros cuando comiences a usar %(site_name)s."
 #: bookwyrm/templates/get_started/books.html:17
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
-#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
-#: bookwyrm/templates/lists/list.html:128
+#: bookwyrm/templates/layout.html:38 bookwyrm/templates/layout.html:39
+#: bookwyrm/templates/lists/list.html:95
 msgid "Search"
 msgstr "Buscar"
 
@@ -897,11 +913,12 @@ msgid "Suggested Books"
 msgstr "Libros sugeridos"
 
 #: bookwyrm/templates/get_started/books.html:41
+#, python-format
 msgid "Popular on %(site_name)s"
 msgstr "Popular en %(site_name)s"
 
 #: bookwyrm/templates/get_started/books.html:51
-#: bookwyrm/templates/lists/list.html:141
+#: bookwyrm/templates/lists/list.html:108
 msgid "No books found"
 msgstr "No se encontró ningún libro"
 
@@ -911,6 +928,7 @@ msgid "Save &amp; continue"
 msgstr "Guardar &amp; continuar"
 
 #: bookwyrm/templates/get_started/layout.html:14
+#, python-format
 msgid "Welcome to %(site_name)s!"
 msgstr "¡Bienvenido a %(site_name)s!"
 
@@ -1013,7 +1031,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "Los libros de %(username)s para %(year)s"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/layout.html:97
+#: bookwyrm/templates/layout.html:98
 msgid "Import Books"
 msgstr "Importar libros"
 
@@ -1034,6 +1052,7 @@ msgid "Privacy setting for imported reviews:"
 msgstr "Configuración de privacidad para las reseñas importadas:"
 
 #: bookwyrm/templates/import.html:48
+#: bookwyrm/templates/settings/server_blocklist.html:64
 msgid "Import"
 msgstr "Importar"
 
@@ -1140,94 +1159,96 @@ msgstr "Resultados de búsqueda por \"%(query)s\""
 msgid "Matching Books"
 msgstr "Libros correspondientes"
 
-#: bookwyrm/templates/layout.html:33
+#: bookwyrm/templates/layout.html:34
 msgid "Search for a book or user"
 msgstr "Buscar un libro o un usuario"
 
-#: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48
+#: bookwyrm/templates/layout.html:48 bookwyrm/templates/layout.html:49
 msgid "Main navigation menu"
 msgstr "Menú de navigación central"
 
-#: bookwyrm/templates/layout.html:61
+#: bookwyrm/templates/layout.html:62
 msgid "Feed"
 msgstr "Actividad"
 
-#: bookwyrm/templates/layout.html:102
+#: bookwyrm/templates/layout.html:103
 msgid "Settings"
 msgstr "Configuración"
 
-#: bookwyrm/templates/layout.html:111
-#: bookwyrm/templates/settings/admin_layout.html:24
+#: bookwyrm/templates/layout.html:112
+#: bookwyrm/templates/settings/admin_layout.html:31
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
 #: bookwyrm/templates/settings/manage_invites.html:15
 msgid "Invites"
 msgstr "Invitaciones"
 
-#: bookwyrm/templates/layout.html:118
+#: bookwyrm/templates/layout.html:119
 msgid "Admin"
 msgstr "Admin"
 
-#: bookwyrm/templates/layout.html:125
+#: bookwyrm/templates/layout.html:126
 msgid "Log out"
 msgstr "Cerrar sesión"
 
-#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
+#: bookwyrm/templates/layout.html:134 bookwyrm/templates/layout.html:135
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:10
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155
+#: bookwyrm/templates/layout.html:152 bookwyrm/templates/layout.html:156
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "Nombre de usuario:"
 
-#: bookwyrm/templates/layout.html:156
+#: bookwyrm/templates/layout.html:157
 msgid "password"
 msgstr "contraseña"
 
-#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:158 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr "¿Olvidaste tu contraseña?"
 
-#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:161 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "Iniciar sesión"
 
-#: bookwyrm/templates/layout.html:168
+#: bookwyrm/templates/layout.html:169
 msgid "Join"
 msgstr "Unirse"
 
-#: bookwyrm/templates/layout.html:191
+#: bookwyrm/templates/layout.html:195
 msgid "About this server"
 msgstr "Sobre este servidor"
 
-#: bookwyrm/templates/layout.html:195
+#: bookwyrm/templates/layout.html:199
 msgid "Contact site admin"
 msgstr "Contactarse con administradores del sitio"
 
-#: bookwyrm/templates/layout.html:202
+#: bookwyrm/templates/layout.html:206
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr "Apoyar %(site_name)s en <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 
-#: bookwyrm/templates/layout.html:206
+#: bookwyrm/templates/layout.html:210
 msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm es software de código abierto. Puedes contribuir o reportar problemas en <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
 #: bookwyrm/templates/lists/create_form.html:5
-#: bookwyrm/templates/lists/lists.html:19
+#: bookwyrm/templates/lists/lists.html:20
 msgid "Create List"
 msgstr "Crear lista"
 
 #: bookwyrm/templates/lists/created_text.html:5
+#, python-format
 msgid "Created and curated by <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Agregado y comisariado por <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/lists/created_text.html:7
+#, python-format
 msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Creado por <a href=\"%(path)s\">%(username)s</a>"
 
@@ -1281,7 +1302,7 @@ msgid "Anyone can suggest books, subject to your approval"
 msgstr "Cualquier usuario puede sugerir libros, en cuanto lo hayas aprobado"
 
 #: bookwyrm/templates/lists/form.html:31
-#: bookwyrm/templates/moderation/reports.html:24
+#: bookwyrm/templates/moderation/reports.html:25
 msgid "Open"
 msgstr "Abierto"
 
@@ -1289,65 +1310,58 @@ msgstr "Abierto"
 msgid "Anyone can add books to this list"
 msgstr "Cualquer usuario puede agregar libros a esta lista"
 
-#: bookwyrm/templates/lists/list.html:19
-#: bookwyrm/templates/snippets/pagination.html:12
-msgid "Previous"
-msgstr "Anterior"
-
-#: bookwyrm/templates/lists/list.html:22
-#: bookwyrm/templates/snippets/pagination.html:23
-msgid "Next"
-msgstr "Siguiente"
-
-#: bookwyrm/templates/lists/list.html:58
+#: bookwyrm/templates/lists/list.html:17
 msgid "This list is currently empty"
 msgstr "Esta lista está vacia"
 
-#: bookwyrm/templates/lists/list.html:76
+#: bookwyrm/templates/lists/list.html:36
 #, python-format
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "Agregado por <a href=\"%(user_path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/lists/list.html:82
+#: bookwyrm/templates/lists/list.html:48
+msgid "Set"
+msgstr "Establecido"
+
+#: bookwyrm/templates/lists/list.html:51
+msgid "List position"
+msgstr "Posición"
+
+#: bookwyrm/templates/lists/list.html:57
 #: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr "Quitar"
 
-#: bookwyrm/templates/lists/list.html:90
-msgid "Set list position"
-msgstr "Apunta indice"
-
-#: bookwyrm/templates/lists/list.html:103
-#: bookwyrm/templates/lists/list.html:115
+#: bookwyrm/templates/lists/list.html:70 bookwyrm/templates/lists/list.html:82
 msgid "Sort List"
 msgstr "Ordena la lista"
 
-#: bookwyrm/templates/lists/list.html:109
+#: bookwyrm/templates/lists/list.html:76
 msgid "Direction"
 msgstr "Dirección"
 
-#: bookwyrm/templates/lists/list.html:120
+#: bookwyrm/templates/lists/list.html:87
 msgid "Add Books"
 msgstr "Agregar libros"
 
-#: bookwyrm/templates/lists/list.html:120
+#: bookwyrm/templates/lists/list.html:87
 msgid "Suggest Books"
 msgstr "Sugerir libros"
 
-#: bookwyrm/templates/lists/list.html:129
+#: bookwyrm/templates/lists/list.html:96
 msgid "search"
 msgstr "buscar"
 
-#: bookwyrm/templates/lists/list.html:135
+#: bookwyrm/templates/lists/list.html:102
 msgid "Clear search"
 msgstr "Borrar búsqueda"
 
-#: bookwyrm/templates/lists/list.html:140
+#: bookwyrm/templates/lists/list.html:107
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
 msgstr "No se encontró ningún libro correspondiente a la búsqueda: \"%(query)s\""
 
-#: bookwyrm/templates/lists/list.html:156
+#: bookwyrm/templates/lists/list.html:123
 msgid "Suggest"
 msgstr "Sugerir"
 
@@ -1372,71 +1386,50 @@ msgstr "Contactar a unx administradorx para recibir una invitación"
 msgid "More about this site"
 msgstr "Más sobre este sitio"
 
-#: bookwyrm/templates/moderation/report.html:5
 #: bookwyrm/templates/moderation/report.html:6
+#: bookwyrm/templates/moderation/report.html:7
 #: bookwyrm/templates/moderation/report_preview.html:6
 #, python-format
 msgid "Report #%(report_id)s: %(username)s"
 msgstr "Reportar #%(report_id)s: %(username)s"
 
-#: bookwyrm/templates/moderation/report.html:10
+#: bookwyrm/templates/moderation/report.html:11
 msgid "Back to reports"
 msgstr "Volver a los informes"
 
-#: bookwyrm/templates/moderation/report.html:18
-msgid "Actions"
-msgstr "Acciones"
-
-#: bookwyrm/templates/moderation/report.html:19
-msgid "View user profile"
-msgstr "Ver perfil de usuario"
-
-#: bookwyrm/templates/moderation/report.html:22
-#: bookwyrm/templates/snippets/status/status_options.html:35
-#: bookwyrm/templates/snippets/user_options.html:13
-msgid "Send direct message"
-msgstr "Enviar mensaje directo"
-
-#: bookwyrm/templates/moderation/report.html:27
-msgid "Deactivate user"
-msgstr "Desactivar usuario"
-
-#: bookwyrm/templates/moderation/report.html:29
-msgid "Reactivate user"
-msgstr "Reactivar usuario"
-
-#: bookwyrm/templates/moderation/report.html:36
+#: bookwyrm/templates/moderation/report.html:23
 msgid "Moderator Comments"
 msgstr "Comentarios de moderador"
 
-#: bookwyrm/templates/moderation/report.html:54
+#: bookwyrm/templates/moderation/report.html:41
 #: bookwyrm/templates/snippets/create_status.html:28
-#: bookwyrm/templates/snippets/create_status_form.html:44
+#: bookwyrm/templates/snippets/create_status_form.html:53
 msgid "Comment"
 msgstr "Comentario"
 
-#: bookwyrm/templates/moderation/report.html:59
+#: bookwyrm/templates/moderation/report.html:46
 msgid "Reported statuses"
 msgstr "Statuses reportados"
 
-#: bookwyrm/templates/moderation/report.html:61
+#: bookwyrm/templates/moderation/report.html:48
 msgid "No statuses reported"
 msgstr "Ningún estatus reportado"
 
-#: bookwyrm/templates/moderation/report.html:67
+#: bookwyrm/templates/moderation/report.html:54
 msgid "Status has been deleted"
 msgstr "Status ha sido eliminado"
 
 #: bookwyrm/templates/moderation/report_modal.html:6
+#, python-format
 msgid "Report @%(username)s"
 msgstr "Reportar @%(username)s"
 
-#: bookwyrm/templates/moderation/report_modal.html:21
+#: bookwyrm/templates/moderation/report_modal.html:23
 #, python-format
 msgid "This report will be sent to %(site_name)s's moderators for review."
 msgstr "Este informe se enviará a los moderadores de %(site_name)s para la revisión."
 
-#: bookwyrm/templates/moderation/report_modal.html:22
+#: bookwyrm/templates/moderation/report_modal.html:24
 msgid "More info about this report:"
 msgstr "Más información sobre este informe:"
 
@@ -1445,6 +1438,7 @@ msgid "No notes provided"
 msgstr "No se proporcionó notas"
 
 #: bookwyrm/templates/moderation/report_preview.html:20
+#, python-format
 msgid "Reported by <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Reportado por <a href=\"%(path)s\">%(username)s</a>"
 
@@ -1457,24 +1451,26 @@ msgid "Resolve"
 msgstr "Resolver"
 
 #: bookwyrm/templates/moderation/reports.html:6
+#, python-format
 msgid "Reports: %(server_name)s"
 msgstr "Informes: %(server_name)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
-#: bookwyrm/templates/moderation/reports.html:16
-#: bookwyrm/templates/settings/admin_layout.html:28
+#: bookwyrm/templates/moderation/reports.html:17
+#: bookwyrm/templates/settings/admin_layout.html:35
 msgid "Reports"
 msgstr "Informes"
 
-#: bookwyrm/templates/moderation/reports.html:13
+#: bookwyrm/templates/moderation/reports.html:14
+#, python-format
 msgid "Reports: <small>%(server_name)s</small>"
 msgstr "Informes: <small>%(server_name)s</small>"
 
-#: bookwyrm/templates/moderation/reports.html:27
+#: bookwyrm/templates/moderation/reports.html:28
 msgid "Resolved"
 msgstr "Resuelto"
 
-#: bookwyrm/templates/moderation/reports.html:34
+#: bookwyrm/templates/moderation/reports.html:37
 msgid "No reports found."
 msgstr "No se encontró ningún informe."
 
@@ -1683,118 +1679,187 @@ msgstr "No se encontró ningúna lista correspondiente a \"%(query)s\""
 msgid "Administration"
 msgstr "Adminstración"
 
-#: bookwyrm/templates/settings/admin_layout.html:15
+#: bookwyrm/templates/settings/admin_layout.html:22
 msgid "Manage Users"
 msgstr "Administrar usuarios"
 
-#: bookwyrm/templates/settings/admin_layout.html:19
-#: bookwyrm/templates/settings/user_admin.html:3
-#: bookwyrm/templates/settings/user_admin.html:10
+#: bookwyrm/templates/settings/admin_layout.html:26
+#: bookwyrm/templates/user_admin/user_admin.html:3
+#: bookwyrm/templates/user_admin/user_admin.html:10
 msgid "Users"
 msgstr "Usuarios"
 
-#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/admin_layout.html:39
 #: bookwyrm/templates/settings/federation.html:3
 #: bookwyrm/templates/settings/federation.html:5
 msgid "Federated Servers"
 msgstr "Servidores federalizados"
 
-#: bookwyrm/templates/settings/admin_layout.html:37
+#: bookwyrm/templates/settings/admin_layout.html:44
 msgid "Instance Settings"
 msgstr "Configuración de instancia"
 
-#: bookwyrm/templates/settings/admin_layout.html:41
+#: bookwyrm/templates/settings/admin_layout.html:48
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr "Configuración de sitio"
 
-#: bookwyrm/templates/settings/admin_layout.html:44
+#: bookwyrm/templates/settings/admin_layout.html:51
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr "Información de instancia"
 
-#: bookwyrm/templates/settings/admin_layout.html:45
+#: bookwyrm/templates/settings/admin_layout.html:52
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr "Imagenes"
 
-#: bookwyrm/templates/settings/admin_layout.html:46
+#: bookwyrm/templates/settings/admin_layout.html:53
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr "Contenido del pie de página"
 
-#: bookwyrm/templates/settings/admin_layout.html:47
+#: bookwyrm/templates/settings/admin_layout.html:54
 #: bookwyrm/templates/settings/site.html:77
 msgid "Registration"
 msgstr "Registración"
 
-#: bookwyrm/templates/settings/federated_server.html:7
+#: bookwyrm/templates/settings/edit_server.html:3
+#: bookwyrm/templates/settings/edit_server.html:6
+#: bookwyrm/templates/settings/edit_server.html:20
+#: bookwyrm/templates/settings/federation.html:9
+#: bookwyrm/templates/settings/federation.html:10
+#: bookwyrm/templates/settings/server_blocklist.html:3
+#: bookwyrm/templates/settings/server_blocklist.html:20
+msgid "Add server"
+msgstr "Agregar servidor"
+
+#: bookwyrm/templates/settings/edit_server.html:7
+#: bookwyrm/templates/settings/federated_server.html:12
+#: bookwyrm/templates/settings/server_blocklist.html:7
 msgid "Back to server list"
 msgstr "Volver a la lista de servidores"
 
-#: bookwyrm/templates/settings/federated_server.html:12
-msgid "Details"
-msgstr "Detalles"
+#: bookwyrm/templates/settings/edit_server.html:16
+#: bookwyrm/templates/settings/server_blocklist.html:16
+msgid "Import block list"
+msgstr "Importar lista de bloqueo"
 
-#: bookwyrm/templates/settings/federated_server.html:15
-msgid "Software:"
-msgstr "Software:"
+#: bookwyrm/templates/settings/edit_server.html:30
+msgid "Instance:"
+msgstr "Instancia:"
 
-#: bookwyrm/templates/settings/federated_server.html:19
-msgid "Version:"
-msgstr "Versión:"
-
-#: bookwyrm/templates/settings/federated_server.html:23
+#: bookwyrm/templates/settings/edit_server.html:37
+#: bookwyrm/templates/settings/federated_server.html:29
+#: bookwyrm/templates/user_admin/user_info.html:34
 msgid "Status:"
 msgstr "Status:"
 
-#: bookwyrm/templates/settings/federated_server.html:30
+#: bookwyrm/templates/settings/edit_server.html:41
+#: bookwyrm/templates/settings/federated_server.html:9
+msgid "Blocked"
+msgstr "Bloqueado"
+
+#: bookwyrm/templates/settings/edit_server.html:48
+#: bookwyrm/templates/settings/federated_server.html:21
+#: bookwyrm/templates/user_admin/user_info.html:26
+msgid "Software:"
+msgstr "Software:"
+
+#: bookwyrm/templates/settings/edit_server.html:55
+#: bookwyrm/templates/settings/federated_server.html:25
+#: bookwyrm/templates/user_admin/user_info.html:30
+msgid "Version:"
+msgstr "Versión:"
+
+#: bookwyrm/templates/settings/edit_server.html:64
+msgid "Notes:"
+msgstr "Notas:"
+
+#: bookwyrm/templates/settings/federated_server.html:18
+msgid "Details"
+msgstr "Detalles"
+
+#: bookwyrm/templates/settings/federated_server.html:36
 #: bookwyrm/templates/user/user_layout.html:50
 msgid "Activity"
 msgstr "Actividad"
 
-#: bookwyrm/templates/settings/federated_server.html:33
+#: bookwyrm/templates/settings/federated_server.html:39
 msgid "Users:"
 msgstr "Usuarios:"
 
-#: bookwyrm/templates/settings/federated_server.html:36
-#: bookwyrm/templates/settings/federated_server.html:43
+#: bookwyrm/templates/settings/federated_server.html:42
+#: bookwyrm/templates/settings/federated_server.html:49
 msgid "View all"
 msgstr "Ver todos"
 
-#: bookwyrm/templates/settings/federated_server.html:40
+#: bookwyrm/templates/settings/federated_server.html:46
 msgid "Reports:"
 msgstr "Informes:"
 
-#: bookwyrm/templates/settings/federated_server.html:47
+#: bookwyrm/templates/settings/federated_server.html:53
 msgid "Followed by us:"
 msgstr "Seguido por nosotros:"
 
-#: bookwyrm/templates/settings/federated_server.html:53
+#: bookwyrm/templates/settings/federated_server.html:59
 msgid "Followed by them:"
 msgstr "Seguido por ellos:"
 
-#: bookwyrm/templates/settings/federated_server.html:59
+#: bookwyrm/templates/settings/federated_server.html:65
 msgid "Blocked by us:"
 msgstr "Bloqueado por nosotros:"
 
-#: bookwyrm/templates/settings/federation.html:13
+#: bookwyrm/templates/settings/federated_server.html:77
+#: bookwyrm/templates/user_admin/user_info.html:39
+msgid "Notes"
+msgstr "Notas"
+
+#: bookwyrm/templates/settings/federated_server.html:80
+msgid "Edit"
+msgstr "Editar"
+
+#: bookwyrm/templates/settings/federated_server.html:100
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:3
+msgid "Actions"
+msgstr "Acciones"
+
+#: bookwyrm/templates/settings/federated_server.html:104
+#: bookwyrm/templates/snippets/block_button.html:5
+msgid "Block"
+msgstr "Bloquear"
+
+#: bookwyrm/templates/settings/federated_server.html:105
+msgid "All users from this instance will be deactivated."
+msgstr "Todos los usuarios en esta instancia serán desactivados."
+
+#: bookwyrm/templates/settings/federated_server.html:110
+#: bookwyrm/templates/snippets/block_button.html:10
+msgid "Un-block"
+msgstr "Desbloquear"
+
+#: bookwyrm/templates/settings/federated_server.html:111
+msgid "All users from this instance will be re-activated."
+msgstr "Todos los usuarios en esta instancia serán re-activados."
+
+#: bookwyrm/templates/settings/federation.html:20
+#: bookwyrm/templates/user_admin/server_filter.html:5
 msgid "Server name"
 msgstr "Nombre de servidor"
 
-#: bookwyrm/templates/settings/federation.html:17
+#: bookwyrm/templates/settings/federation.html:24
 msgid "Date federated"
 msgstr "Fecha de federalización"
 
-#: bookwyrm/templates/settings/federation.html:21
+#: bookwyrm/templates/settings/federation.html:28
 msgid "Software"
 msgstr "Software"
 
-#: bookwyrm/templates/settings/federation.html:24
+#: bookwyrm/templates/settings/federation.html:31
 #: bookwyrm/templates/settings/manage_invite_requests.html:44
 #: bookwyrm/templates/settings/status_filter.html:5
-#: bookwyrm/templates/settings/user_admin.html:32
+#: bookwyrm/templates/user_admin/user_admin.html:34
 msgid "Status"
 msgstr "Status"
 
@@ -1904,6 +1969,23 @@ msgstr "Número de usos"
 msgid "No active invites"
 msgstr "No invitaciónes activas"
 
+#: bookwyrm/templates/settings/server_blocklist.html:6
+msgid "Import Blocklist"
+msgstr "Importar lista de bloqueo"
+
+#: bookwyrm/templates/settings/server_blocklist.html:26
+#: bookwyrm/templates/snippets/goal_progress.html:5
+msgid "Success!"
+msgstr "¡Meta logrado!"
+
+#: bookwyrm/templates/settings/server_blocklist.html:30
+msgid "Successfully blocked:"
+msgstr "Se bloqueó exitosamente:"
+
+#: bookwyrm/templates/settings/server_blocklist.html:32
+msgid "Failed:"
+msgstr "Falló:"
+
 #: bookwyrm/templates/settings/site.html:15
 msgid "Instance Name:"
 msgstr "Nombre de instancia:"
@@ -1960,46 +2042,10 @@ msgstr "Permitir solicitudes de invitación:"
 msgid "Registration closed text:"
 msgstr "Texto de registración cerrada:"
 
-#: bookwyrm/templates/settings/user_admin.html:7
-#, python-format
-msgid "Users: <small>%(server_name)s</small>"
-msgstr "Usuarios <small>%(server_name)s</small>"
-
-#: bookwyrm/templates/settings/user_admin.html:20
-msgid "Username"
-msgstr "Nombre de usuario"
-
-#: bookwyrm/templates/settings/user_admin.html:24
-msgid "Date Added"
-msgstr "Fecha agregada"
-
-#: bookwyrm/templates/settings/user_admin.html:28
-msgid "Last Active"
-msgstr "Actividad reciente"
-
-#: bookwyrm/templates/settings/user_admin.html:36
-msgid "Remote server"
-msgstr "Quitar servidor"
-
-#: bookwyrm/templates/settings/user_admin.html:45
-msgid "Active"
-msgstr "Activ@"
-
-#: bookwyrm/templates/settings/user_admin.html:45
-msgid "Inactive"
-msgstr "Inactiv@"
-
-#: bookwyrm/templates/settings/user_admin.html:50
-msgid "Not set"
-msgstr "No establecido"
-
-#: bookwyrm/templates/snippets/block_button.html:5
-msgid "Block"
-msgstr "Bloquear"
-
-#: bookwyrm/templates/snippets/block_button.html:10
-msgid "Un-block"
-msgstr "Desbloquear"
+#: bookwyrm/templates/snippets/book_cover.html:20
+#: bookwyrm/templates/snippets/search_result_text.html:10
+msgid "No cover"
+msgstr "Sin portada"
 
 #: bookwyrm/templates/snippets/book_titleby.html:3
 #, python-format
@@ -2008,8 +2054,8 @@ msgstr "<a href=\"%(path)s\">%(title)s</a> por "
 
 #: bookwyrm/templates/snippets/boost_button.html:8
 #: bookwyrm/templates/snippets/boost_button.html:9
-#: bookwyrm/templates/snippets/status/status_body.html:52
-#: bookwyrm/templates/snippets/status/status_body.html:53
+#: bookwyrm/templates/snippets/status/layout.html:47
+#: bookwyrm/templates/snippets/status/layout.html:48
 msgid "Boost status"
 msgstr "Status de respaldo"
 
@@ -2034,53 +2080,60 @@ msgstr "Reseña"
 msgid "Quote"
 msgstr "Cita"
 
-#: bookwyrm/templates/snippets/create_status_form.html:18
+#: bookwyrm/templates/snippets/create_status_form.html:20
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: bookwyrm/templates/snippets/create_status_form.html:20
+#: bookwyrm/templates/snippets/create_status_form.html:22
 msgid "Quote:"
 msgstr "Cita:"
 
-#: bookwyrm/templates/snippets/create_status_form.html:22
+#: bookwyrm/templates/snippets/create_status_form.html:24
 msgid "Review:"
 msgstr "Reseña:"
 
-#: bookwyrm/templates/snippets/create_status_form.html:56
+#: bookwyrm/templates/snippets/create_status_form.html:42
+#: bookwyrm/templates/snippets/status/layout.html:30
+#: bookwyrm/templates/snippets/status/layout.html:43
+#: bookwyrm/templates/snippets/status/layout.html:44
+msgid "Reply"
+msgstr "Respuesta"
+
+#: bookwyrm/templates/snippets/create_status_form.html:67
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
 msgid "Progress:"
 msgstr "Progreso:"
 
-#: bookwyrm/templates/snippets/create_status_form.html:63
+#: bookwyrm/templates/snippets/create_status_form.html:75
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr "páginas"
 
-#: bookwyrm/templates/snippets/create_status_form.html:64
+#: bookwyrm/templates/snippets/create_status_form.html:76
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr "por ciento"
 
-#: bookwyrm/templates/snippets/create_status_form.html:69
+#: bookwyrm/templates/snippets/create_status_form.html:82
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "de %(pages)s páginas"
 
-#: bookwyrm/templates/snippets/create_status_form.html:81
+#: bookwyrm/templates/snippets/create_status_form.html:97
 msgid "Include spoiler alert"
 msgstr "Incluir alerta de spoiler"
 
-#: bookwyrm/templates/snippets/create_status_form.html:88
+#: bookwyrm/templates/snippets/create_status_form.html:104
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:19
 msgid "Private"
 msgstr "Privada"
 
-#: bookwyrm/templates/snippets/create_status_form.html:99
+#: bookwyrm/templates/snippets/create_status_form.html:115
 msgid "Post"
 msgstr "Compartir"
 
@@ -2095,14 +2148,13 @@ msgstr "Estás eliminando esta lectura y sus %(count)s actualizaciones de progre
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
 #: bookwyrm/templates/snippets/follow_request_buttons.html:13
-#: venv/lib/python3.8/site-packages/django/forms/formsets.py:391
 msgid "Delete"
 msgstr "Eliminar"
 
 #: bookwyrm/templates/snippets/fav_button.html:7
 #: bookwyrm/templates/snippets/fav_button.html:8
-#: bookwyrm/templates/snippets/status/status_body.html:56
-#: bookwyrm/templates/snippets/status/status_body.html:57
+#: bookwyrm/templates/snippets/status/layout.html:51
+#: bookwyrm/templates/snippets/status/layout.html:52
 msgid "Like status"
 msgstr "Me gusta status"
 
@@ -2164,6 +2216,7 @@ msgstr[0] "estableció una meta de leer %(counter)s libro en %(year)s"
 msgstr[1] "estableció una meta de leer %(counter)s libros en %(year)s"
 
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
+#, python-format
 msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
 msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
 msgstr[0] "Reseño <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s estrella"
@@ -2209,10 +2262,6 @@ msgstr "Compartir con tu feed"
 msgid "Set goal"
 msgstr "Establecer meta"
 
-#: bookwyrm/templates/snippets/goal_progress.html:5
-msgid "Success!"
-msgstr "¡Meta logrado!"
-
 #: bookwyrm/templates/snippets/goal_progress.html:7
 #, python-format
 msgid "%(percent)s%% complete!"
@@ -2229,6 +2278,7 @@ msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count
 msgstr "%(username)s ha leído <a href=\"%(path)s\">%(read_count)s de %(goal_count)s libros</a>."
 
 #: bookwyrm/templates/snippets/page_text.html:4
+#, python-format
 msgid "page %(page)s of %(total_pages)s"
 msgstr "página %(page)s de %(total_pages)s"
 
@@ -2236,6 +2286,14 @@ msgstr "página %(page)s de %(total_pages)s"
 msgid "page %(page)s"
 msgstr "página %(pages)s"
 
+#: bookwyrm/templates/snippets/pagination.html:12
+msgid "Previous"
+msgstr "Anterior"
+
+#: bookwyrm/templates/snippets/pagination.html:23
+msgid "Next"
+msgstr "Siguiente"
+
 #: bookwyrm/templates/snippets/privacy-icons.html:3
 #: bookwyrm/templates/snippets/privacy-icons.html:4
 #: bookwyrm/templates/snippets/privacy_select.html:10
@@ -2322,29 +2380,25 @@ msgid "Report"
 msgstr "Reportar"
 
 #: bookwyrm/templates/snippets/rss_title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:11
+#: bookwyrm/templates/snippets/status/status_header.html:21
 msgid "rated"
 msgstr "calificó"
 
 #: bookwyrm/templates/snippets/rss_title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:13
+#: bookwyrm/templates/snippets/status/status_header.html:23
 msgid "reviewed"
 msgstr "reseñó"
 
 #: bookwyrm/templates/snippets/rss_title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:15
+#: bookwyrm/templates/snippets/status/status_header.html:25
 msgid "commented on"
 msgstr "comentó en"
 
 #: bookwyrm/templates/snippets/rss_title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:17
+#: bookwyrm/templates/snippets/status/status_header.html:27
 msgid "quoted"
 msgstr "citó"
 
-#: bookwyrm/templates/snippets/search_result_text.html:10
-msgid "No cover"
-msgstr "Sin portada"
-
 #: bookwyrm/templates/snippets/search_result_text.html:22
 #, python-format
 msgid "by %(author)s"
@@ -2364,7 +2418,7 @@ msgid "Finish \"<em>%(book_title)s</em>\""
 msgstr "Terminar \"<em>%(book_title)s</em>\""
 
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:35
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:34
 msgid "Update progress"
 msgstr "Progreso de actualización"
 
@@ -2385,7 +2439,8 @@ msgstr "Terminar de leer"
 msgid "Want to read"
 msgstr "Quiero leer"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:48
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
+#, python-format
 msgid "Remove from %(name)s"
 msgstr "Quitar de %(name)s"
 
@@ -2399,48 +2454,49 @@ msgstr "Empezar \"<em>%(book_title)s</em>\""
 msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgstr "Quiero leer \"<em>%(book_title)s</em>\""
 
-#: bookwyrm/templates/snippets/status/status.html:9
-msgid "boosted"
-msgstr "respaldó"
+#: bookwyrm/templates/snippets/status/content_status.html:60
+#: bookwyrm/templates/snippets/status/status_content.html:50
+#: bookwyrm/templates/snippets/trimmed_text.html:14
+msgid "Show more"
+msgstr "Mostrar más"
 
-#: bookwyrm/templates/snippets/status/status_body.html:27
+#: bookwyrm/templates/snippets/status/content_status.html:75
+#: bookwyrm/templates/snippets/status/status_content.html:65
+#: bookwyrm/templates/snippets/trimmed_text.html:29
+msgid "Show less"
+msgstr "Mostrar menos"
+
+#: bookwyrm/templates/snippets/status/content_status.html:105
+#: bookwyrm/templates/snippets/status/status_content.html:95
+msgid "Open image in new window"
+msgstr "Abrir imagen en una nueva ventana"
+
+#: bookwyrm/templates/snippets/status/layout.html:22
 #: bookwyrm/templates/snippets/status/status_options.html:18
 msgid "Delete status"
 msgstr "Eliminar status"
 
-#: bookwyrm/templates/snippets/status/status_body.html:35
-#: bookwyrm/templates/snippets/status/status_body.html:48
-#: bookwyrm/templates/snippets/status/status_body.html:49
-msgid "Reply"
-msgstr "Respuesta"
+#: bookwyrm/templates/snippets/status/status.html:9
+msgid "boosted"
+msgstr "respaldó"
 
-#: bookwyrm/templates/snippets/status/status_content.html:18
-#: bookwyrm/templates/snippets/trimmed_text.html:15
-msgid "Show more"
-msgstr "Mostrar más"
-
-#: bookwyrm/templates/snippets/status/status_content.html:25
-#: bookwyrm/templates/snippets/trimmed_text.html:25
-msgid "Show less"
-msgstr "Mostrar menos"
-
-#: bookwyrm/templates/snippets/status/status_content.html:46
-msgid "Open image in new window"
-msgstr "Abrir imagen en una nueva ventana"
-
-#: bookwyrm/templates/snippets/status/status_header.html:22
+#: bookwyrm/templates/snippets/status/status_header.html:32
+#, python-format
 msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">review</a>"
 msgstr "respondió a la <a href=\"%(status_path)s\">reseña</a> de <a href=\"%(user_path)s\">%(username)s</a> "
 
-#: bookwyrm/templates/snippets/status/status_header.html:24
+#: bookwyrm/templates/snippets/status/status_header.html:34
+#, python-format
 msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">comment</a>"
 msgstr "respondió al <a href=\"%(status_path)s\">comentario</a> de <a href=\"%(user_path)s\">%(username)s</a> "
 
-#: bookwyrm/templates/snippets/status/status_header.html:26
+#: bookwyrm/templates/snippets/status/status_header.html:36
+#, python-format
 msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">quote</a>"
 msgstr "respondió a la <a href=\"%(status_path)s\">cita</a> de <a href=\"%(user_path)s\">%(username)s</a> "
 
-#: bookwyrm/templates/snippets/status/status_header.html:28
+#: bookwyrm/templates/snippets/status/status_header.html:38
+#, python-format
 msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
 msgstr "respondió al <a href=\"%(status_path)s\">status</a> de <a href=\"%(user_path)s\">%(username)s</a> "
 
@@ -2453,6 +2509,12 @@ msgstr "Más opciones"
 msgid "Delete & re-draft"
 msgstr "Eliminar y recomponer"
 
+#: bookwyrm/templates/snippets/status/status_options.html:36
+#: bookwyrm/templates/snippets/user_options.html:13
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:6
+msgid "Send direct message"
+msgstr "Enviar mensaje directo"
+
 #: bookwyrm/templates/snippets/switch_edition_button.html:5
 msgid "Switch to this edition"
 msgstr "Cambiar a esta edición"
@@ -2479,6 +2541,7 @@ msgid "Books tagged \"%(tag.name)s\""
 msgstr "Libros etiquetados con \"%(tag.name)s\""
 
 #: bookwyrm/templates/user/books_header.html:5
+#, python-format
 msgid "%(username)s's books"
 msgstr "Los libros de %(username)s"
 
@@ -2524,7 +2587,7 @@ msgstr "Listas: %(username)s"
 msgid "Create list"
 msgstr "Crear lista"
 
-#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:56
+#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:51
 msgid "All books"
 msgstr "Todos los libros"
 
@@ -2561,6 +2624,7 @@ msgid "Edit profile"
 msgstr "Editar perfil"
 
 #: bookwyrm/templates/user/user.html:34
+#, python-format
 msgid "View all %(size)s"
 msgstr "Ver todos los %(size)s"
 
@@ -2614,6 +2678,73 @@ msgstr[1] "%(counter)s seguidores"
 msgid "%(counter)s following"
 msgstr "%(counter)s siguiendo"
 
+#: bookwyrm/templates/user_admin/user.html:11
+msgid "Back to users"
+msgstr "Volver a usuarios"
+
+#: bookwyrm/templates/user_admin/user_admin.html:7
+#, python-format
+msgid "Users: <small>%(server_name)s</small>"
+msgstr "Usuarios <small>%(server_name)s</small>"
+
+#: bookwyrm/templates/user_admin/user_admin.html:22
+#: bookwyrm/templates/user_admin/username_filter.html:5
+msgid "Username"
+msgstr "Nombre de usuario"
+
+#: bookwyrm/templates/user_admin/user_admin.html:26
+msgid "Date Added"
+msgstr "Fecha agregada"
+
+#: bookwyrm/templates/user_admin/user_admin.html:30
+msgid "Last Active"
+msgstr "Actividad reciente"
+
+#: bookwyrm/templates/user_admin/user_admin.html:38
+msgid "Remote server"
+msgstr "Quitar servidor"
+
+#: bookwyrm/templates/user_admin/user_admin.html:47
+msgid "Active"
+msgstr "Activ@"
+
+#: bookwyrm/templates/user_admin/user_admin.html:47
+msgid "Inactive"
+msgstr "Inactiv@"
+
+#: bookwyrm/templates/user_admin/user_admin.html:52
+#: bookwyrm/templates/user_admin/user_info.html:49
+msgid "Not set"
+msgstr "No establecido"
+
+#: bookwyrm/templates/user_admin/user_info.html:5
+msgid "User details"
+msgstr "Detalles"
+
+#: bookwyrm/templates/user_admin/user_info.html:14
+msgid "View user profile"
+msgstr "Ver perfil de usuario"
+
+#: bookwyrm/templates/user_admin/user_info.html:20
+msgid "Instance details"
+msgstr "Detalles de instancia"
+
+#: bookwyrm/templates/user_admin/user_info.html:46
+msgid "View instance"
+msgstr "Ver instancia"
+
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:11
+msgid "Suspend user"
+msgstr "Suspender usuario"
+
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:13
+msgid "Un-suspend user"
+msgstr "Des-suspender usuario"
+
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:21
+msgid "Access level:"
+msgstr "Nivel de acceso:"
+
 #: bookwyrm/views/password.py:32
 msgid "No user with that email address was found."
 msgstr "No se pudo encontrar un usuario con esa dirección de correo electrónico."
@@ -2623,1253 +2754,872 @@ msgstr "No se pudo encontrar un usuario con esa dirección de correo electrónic
 msgid "A password reset link sent to %s"
 msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 
-#: venv/lib/python3.8/site-packages/_pytest/config/argparsing.py:442
-#, python-format
-msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr "opción ambiguo: %(option)s pudiera coincidir con %(matches)s"
+#~ msgid "Deactivate user"
+#~ msgstr "Desactivar usuario"
 
-#: venv/lib/python3.8/site-packages/django/contrib/messages/apps.py:7
-msgid "Messages"
-msgstr "Mensajes"
+#~ msgid "Reactivate user"
+#~ msgstr "Reactivar usuario"
 
-#: venv/lib/python3.8/site-packages/django/contrib/sitemaps/apps.py:7
-msgid "Site Maps"
-msgstr "Mapas de sitio"
+#~ msgid "ambiguous option: %(option)s could match %(matches)s"
+#~ msgstr "opción ambiguo: %(option)s pudiera coincidir con %(matches)s"
 
-#: venv/lib/python3.8/site-packages/django/contrib/staticfiles/apps.py:9
-msgid "Static Files"
-msgstr "Archivos estáticos"
+#~ msgid "Messages"
+#~ msgstr "Mensajes"
 
-#: venv/lib/python3.8/site-packages/django/contrib/syndication/apps.py:7
-msgid "Syndication"
-msgstr "Sindicación"
+#~ msgid "Site Maps"
+#~ msgstr "Mapas de sitio"
 
-#: venv/lib/python3.8/site-packages/django/core/paginator.py:48
-msgid "That page number is not an integer"
-msgstr "Ese numero de pagina no es un entero"
+#~ msgid "Static Files"
+#~ msgstr "Archivos estáticos"
 
-#: venv/lib/python3.8/site-packages/django/core/paginator.py:50
-msgid "That page number is less than 1"
-msgstr "Ese numero de pagina es menos que uno"
+#~ msgid "Syndication"
+#~ msgstr "Sindicación"
 
-#: venv/lib/python3.8/site-packages/django/core/paginator.py:55
-msgid "That page contains no results"
-msgstr "Esa pagina no contiene resultados"
+#~ msgid "That page number is not an integer"
+#~ msgstr "Ese numero de pagina no es un entero"
 
-#: venv/lib/python3.8/site-packages/django/core/validators.py:20
-msgid "Enter a valid value."
-msgstr "Ingrese un valor válido."
+#~ msgid "That page number is less than 1"
+#~ msgstr "Ese numero de pagina es menos que uno"
 
-#: venv/lib/python3.8/site-packages/django/core/validators.py:91
-#: venv/lib/python3.8/site-packages/django/forms/fields.py:671
-msgid "Enter a valid URL."
-msgstr "Ingrese una URL válida."
+#~ msgid "That page contains no results"
+#~ msgstr "Esa pagina no contiene resultados"
 
-#: venv/lib/python3.8/site-packages/django/core/validators.py:145
-msgid "Enter a valid integer."
-msgstr "Ingrese un entero válido."
+#~ msgid "Enter a valid value."
+#~ msgstr "Ingrese un valor válido."
 
-#: venv/lib/python3.8/site-packages/django/core/validators.py:156
-msgid "Enter a valid email address."
-msgstr "Ingrese una dirección de correo electrónico válida."
+#~ msgid "Enter a valid URL."
+#~ msgstr "Ingrese una URL válida."
 
-#. Translators: "letters" means latin letters: a-z and A-Z.
-#: venv/lib/python3.8/site-packages/django/core/validators.py:230
-msgid "Enter a valid “slug� consisting of letters, numbers, underscores or hyphens."
-msgstr "Ingrese un “slug� válido que consiste de letras, numeros, guiones bajos, o guiones"
+#~ msgid "Enter a valid integer."
+#~ msgstr "Ingrese un entero válido."
 
-#: venv/lib/python3.8/site-packages/django/core/validators.py:237
-msgid "Enter a valid “slug� consisting of Unicode letters, numbers, underscores, or hyphens."
-msgstr "Ingrese un “slug� válido que consiste de letras Unicode, numeros, guiones bajos, o guiones"
+#~ msgid "Enter a valid email address."
+#~ msgstr "Ingrese una dirección de correo electrónico válida."
 
-#: venv/lib/python3.8/site-packages/django/core/validators.py:246
-#: venv/lib/python3.8/site-packages/django/core/validators.py:266
-msgid "Enter a valid IPv4 address."
-msgstr "Ingrese una dirección IPv4 válida."
+#~ msgid "Enter a valid “slug� consisting of letters, numbers, underscores or hyphens."
+#~ msgstr "Ingrese un “slug� válido que consiste de letras, numeros, guiones bajos, o guiones"
 
-#: venv/lib/python3.8/site-packages/django/core/validators.py:251
-#: venv/lib/python3.8/site-packages/django/core/validators.py:267
-msgid "Enter a valid IPv6 address."
-msgstr "Ingrese una dirección IPv6 válida."
+#~ msgid "Enter a valid “slug� consisting of Unicode letters, numbers, underscores, or hyphens."
+#~ msgstr "Ingrese un “slug� válido que consiste de letras Unicode, numeros, guiones bajos, o guiones"
 
-#: venv/lib/python3.8/site-packages/django/core/validators.py:261
-#: venv/lib/python3.8/site-packages/django/core/validators.py:265
-msgid "Enter a valid IPv4 or IPv6 address."
-msgstr "Ingrese una dirección IPv4 o IPv6 válida."
+#~ msgid "Enter a valid IPv4 address."
+#~ msgstr "Ingrese una dirección IPv4 válida."
 
-#: venv/lib/python3.8/site-packages/django/core/validators.py:295
-msgid "Enter only digits separated by commas."
-msgstr "Ingrese solo digitos separados por comas."
+#~ msgid "Enter a valid IPv6 address."
+#~ msgstr "Ingrese una dirección IPv6 válida."
 
-#: venv/lib/python3.8/site-packages/django/core/validators.py:301
-#, python-format
-msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
-msgstr "Asegura que este valor es %(limit_value)s (es %(show_value)s)."
+#~ msgid "Enter a valid IPv4 or IPv6 address."
+#~ msgstr "Ingrese una dirección IPv4 o IPv6 válida."
 
-#: venv/lib/python3.8/site-packages/django/core/validators.py:334
-#, python-format
-msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr "Asegura que este valor es menor que o iguala a %(limit_value)s."
+#~ msgid "Enter only digits separated by commas."
+#~ msgstr "Ingrese solo digitos separados por comas."
 
-#: venv/lib/python3.8/site-packages/django/core/validators.py:343
-#, python-format
-msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr "Asegura que este valor es más que o que iguala a %(limit_value)s."
+#~ msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
+#~ msgstr "Asegura que este valor es %(limit_value)s (es %(show_value)s)."
 
-#: venv/lib/python3.8/site-packages/django/core/validators.py:353
-#, python-format
-msgid "Ensure this value has at least %(limit_value)d character (it has %(show_value)d)."
-msgid_plural "Ensure this value has at least %(limit_value)d characters (it has %(show_value)d)."
-msgstr[0] "Verifica que este valor tiene por lo menos %(limit_value)d carácter. (Tiene %(show_value)d).)"
-msgstr[1] "Verifica que este valor tiene por lo menos %(limit_value)d caracteres. (Tiene %(show_value)d).)"
+#~ msgid "Ensure this value is less than or equal to %(limit_value)s."
+#~ msgstr "Asegura que este valor es menor que o iguala a %(limit_value)s."
 
-#: venv/lib/python3.8/site-packages/django/core/validators.py:368
-#, python-format
-msgid "Ensure this value has at most %(limit_value)d character (it has %(show_value)d)."
-msgid_plural "Ensure this value has at most %(limit_value)d characters (it has %(show_value)d)."
-msgstr[0] "Verifica que este valor tiene a lo sumo %(limit_value)d carácter. (Tiene %(show_value)d).)"
-msgstr[1] "Verifica que este valor tiene a lo sumo %(limit_value)d caracteres. (Tiene %(show_value)d).)"
+#~ msgid "Ensure this value is greater than or equal to %(limit_value)s."
+#~ msgstr "Asegura que este valor es más que o que iguala a %(limit_value)s."
 
-#: venv/lib/python3.8/site-packages/django/core/validators.py:387
-#: venv/lib/python3.8/site-packages/django/forms/fields.py:292
-#: venv/lib/python3.8/site-packages/django/forms/fields.py:327
-msgid "Enter a number."
-msgstr "Ingrese un número."
+#~ msgid "Ensure this value has at least %(limit_value)d character (it has %(show_value)d)."
+#~ msgid_plural "Ensure this value has at least %(limit_value)d characters (it has %(show_value)d)."
+#~ msgstr[0] "Verifica que este valor tiene por lo menos %(limit_value)d carácter. (Tiene %(show_value)d).)"
+#~ msgstr[1] "Verifica que este valor tiene por lo menos %(limit_value)d caracteres. (Tiene %(show_value)d).)"
 
-#: venv/lib/python3.8/site-packages/django/core/validators.py:389
-#, python-format
-msgid "Ensure that there are no more than %(max)s digit in total."
-msgid_plural "Ensure that there are no more than %(max)s digits in total."
-msgstr[0] "Verifica que no hay más que %(max)s digito en total."
-msgstr[1] "Verifica que no hay más que %(max)s digitos en total."
+#~ msgid "Ensure this value has at most %(limit_value)d character (it has %(show_value)d)."
+#~ msgid_plural "Ensure this value has at most %(limit_value)d characters (it has %(show_value)d)."
+#~ msgstr[0] "Verifica que este valor tiene a lo sumo %(limit_value)d carácter. (Tiene %(show_value)d).)"
+#~ msgstr[1] "Verifica que este valor tiene a lo sumo %(limit_value)d caracteres. (Tiene %(show_value)d).)"
+
+#~ msgid "Enter a number."
+#~ msgstr "Ingrese un número."
+
+#~ msgid "Ensure that there are no more than %(max)s digit in total."
+#~ msgid_plural "Ensure that there are no more than %(max)s digits in total."
+#~ msgstr[0] "Verifica que no hay más que %(max)s digito en total."
+#~ msgstr[1] "Verifica que no hay más que %(max)s digitos en total."
 
-#: venv/lib/python3.8/site-packages/django/core/validators.py:394
-#, python-format
 #                         is 
-msgid "Ensure that there are no more than %(max)s decimal place."
-msgid_plural "Ensure that there are no more than %(max)s decimal places."
-msgstr[0] "Verifica que no hay más que %(max)s cifra decimal."
-msgstr[1] "Verifica que no hay más que %(max)s cifras decimales."
-
-#: venv/lib/python3.8/site-packages/django/core/validators.py:399
-#, python-format
-msgid "Ensure that there are no more than %(max)s digit before the decimal point."
-msgid_plural "Ensure that there are no more than %(max)s digits before the decimal point."
-msgstr[0] "Verifica que no hay más que %(max)s digito antes de la coma decimal."
-msgstr[1] "Verifica que no hay más que %(max)s digitos antes de la coma decimal."
-
-#: venv/lib/python3.8/site-packages/django/core/validators.py:461
-#, python-format
-msgid "File extension “%(extension)s� is not allowed. Allowed extensions are: %(allowed_extensions)s."
-msgstr "No se permite la extensión de archivo “%(extension)s�. Extensiones permitidas son: %(allowed_extensions)s."
-
-#: venv/lib/python3.8/site-packages/django/core/validators.py:513
-msgid "Null characters are not allowed."
-msgstr "No se permiten caracteres nulos"
-
-#: venv/lib/python3.8/site-packages/django/db/models/base.py:1190
-#: venv/lib/python3.8/site-packages/django/forms/models.py:760
-msgid "and"
-msgstr "y"
-
-#: venv/lib/python3.8/site-packages/django/db/models/base.py:1192
-msgid "%(model_name)s with this %(field_labels)s already exists."
-msgstr "Ya existe %(model_name)s con este %(field_labels)s."
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:100
-msgid "Value %(value)r is not a valid choice."
-msgstr "El valor %(value)s no es una opción válida."
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:101
-msgid "This field cannot be null."
-msgstr "Este campo no puede ser nulo."
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:102
-msgid "This field cannot be blank."
-msgstr "Este campo no puede ser vacio."
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:103
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "Ya existe %(model_name)s con este %(field_labels)s."
-
-#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
-#. Eg: "Title must be unique for pub_date year"
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:107
-#, python-format
-msgid "%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
-msgstr "%(field_label)s deben ser unicos por %(date_field_label)s %(lookup_type)s."
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:126
-#, python-format
-msgid "Field of type: %(field_type)s"
-msgstr "Campo de tipo: %(field_type)s"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:939
-#, python-format
-msgid "“%(value)s� value must be either True or False."
-msgstr "“%(value)s� valor debe ser o verdadero o falso."
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:940
-#, python-format
-msgid "“%(value)s� value must be either True, False, or None."
-msgstr "%(value)s� valor debe ser o True, False, o None."
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:942
-msgid "Boolean (Either True or False)"
-msgstr "Booleano (O True O False)"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:983
-#, python-format
-msgid "String (up to %(max_length)s)"
-msgstr "Cadena (máximo de %(max_length)s caracteres)"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1047
-msgid "Comma-separated integers"
-msgstr "Enteros separados por comas"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1096
-#, python-format
-msgid "“%(value)s� value has an invalid date format. It must be in YYYY-MM-DD format."
-msgstr "“%(value)s� valor tiene un formato de fecha inválido. Hay que estar de formato YYYY-MM-DD."
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1098
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1241
-#, python-format
-msgid "“%(value)s� value has the correct format (YYYY-MM-DD) but it is an invalid date."
-msgstr "“%(value)s� valor tiene el formato correcto (YYYY-MM-DD) pero la fecha es invalida."
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1101
-msgid "Date (without time)"
-msgstr "Fecha (sin la hora)"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1239
-#, python-format
-msgid "“%(value)s� value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ] format."
-msgstr "“%(value)s� valor tiene un formato invalido. Debe estar en formato YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]."
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1243
-#, python-format
-msgid "“%(value)s� value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but it is an invalid date/time."
-msgstr "“%(value)s� valor tiene el formato correcto (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) pero es una fecha/hora invalida."
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1247
-msgid "Date (with time)"
-msgstr "Fecha (con la hora)"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1395
-msgid "“%(value)s� value must be a decimal number."
-msgstr "El valor de “%(value)s� debe ser un número decimal."
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1397
-msgid "Decimal number"
-msgstr "Número decimal"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1536
-#, python-format
-msgid "“%(value)s� value has an invalid format. It must be in [DD] [[HH:]MM:]ss[.uuuuuu] format."
-msgstr "“%(value)s� valor tiene un formato invalido. Debe estar en formato [DD] [[HH:]MM:]ss[.uuuuuu]."
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1539
-msgid "Duration"
-msgstr "Duración"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1589
-msgid "Email address"
-msgstr "Dirección de correo electrónico"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1612
-msgid "File path"
-msgstr "Ruta de archivo"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1678
-msgid "“%(value)s� value must be a float."
-msgstr "%(value)s no es un usuario válido"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1680
-msgid "Floating point number"
-msgstr "Número de coma flotante"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1718
-#, python-format
-msgid "“%(value)s� value must be an integer."
-msgstr "“%(value)s� valor debe ser un entero."
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1720
-msgid "Integer"
-msgstr "Entero"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1803
-msgid "Big (8 byte) integer"
-msgstr "Entero grande (8 byte)"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1819
-msgid "IPv4 address"
-msgstr "Dirección IPv4"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1850
-msgid "IP address"
-msgstr "Dirección IP"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1930
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1931
-#, python-format
-msgid "“%(value)s� value must be either None, True or False."
-msgstr "Valor “%(value)s� debe ser o None, True, o False."
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1933
-msgid "Boolean (Either True, False or None)"
-msgstr "Booleano (O True, Falso, o None)"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1976
-msgid "Positive big integer"
-msgstr "Entero positivo grande"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1989
-msgid "Positive integer"
-msgstr "Entero positivo"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2002
-msgid "Positive small integer"
-msgstr "Entero positivo pequeño "
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2016
-#, python-format
-msgid "Slug (up to %(max_length)s)"
-msgstr "Slug (máximo de %(max_length)s)"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2048
-msgid "Small integer"
-msgstr "Entero pequeño"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2055
-msgid "Text"
-msgstr "Texto"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2083
-#, python-format
-msgid "“%(value)s� value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
-msgstr "“%(value)s� valor tiene un formato invalido. Debe estar en formato HH:MM[:ss[.uuuuuu]]."
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2085
-#, python-format
-msgid "“%(value)s� value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid time."
-msgstr "“%(value)s� valor tiene el formato correcto (HH:MM[:ss[.uuuuuu]]) pero es una hora invalida."
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2088
-msgid "Time"
-msgstr "Tiempo"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2214
-msgid "URL"
-msgstr "URL"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2236
-msgid "Raw binary data"
-msgstr "Datos binarios sin procesar"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2301
-msgid "“%(value)s� is not a valid UUID."
-msgstr "%(value)s no es una UUID válida."
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2303
-msgid "Universally unique identifier"
-msgstr "Identificador universalmente único"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/files.py:231
-msgid "File"
-msgstr "Archivo"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/files.py:379
-msgid "Image"
-msgstr "Imágen"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/json.py:18
-msgid "A JSON object"
-msgstr "Un objeto JSON"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/json.py:20
-msgid "Value must be valid JSON."
-msgstr "Valor debe ser JSON válido."
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/related.py:790
-#, python-format
-msgid "%(model)s instance with %(field)s %(value)r does not exist."
-msgstr "%(model)s instancia con %(field)s %(value)r no existe."
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/related.py:792
-msgid "Foreign Key (type determined by related field)"
-msgstr "Clave externa (tipo determinado por campo relacionado)"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/related.py:1045
-msgid "One-to-one relationship"
-msgstr "Relación uno-a-uno"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/related.py:1099
-msgid "%(from)s-%(to)s relationship"
-msgstr "relación %(from)s-%(to)s"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/related.py:1100
-msgid "%(from)s-%(to)s relationships"
-msgstr "relaciones %(from)s-%(to)s"
-
-#: venv/lib/python3.8/site-packages/django/db/models/fields/related.py:1142
-msgid "Many-to-many relationship"
-msgstr "Relaciones mucho-a-mucho"
-
-#. Translators: If found as last label character, these punctuation
-#. characters will prevent the default label_suffix to be appended to the label
-#: venv/lib/python3.8/site-packages/django/forms/boundfield.py:150
-msgid ":?.!"
-msgstr ""
-
-#: venv/lib/python3.8/site-packages/django/forms/fields.py:54
-msgid "This field is required."
-msgstr "Este campo es requerido."
-
-#: venv/lib/python3.8/site-packages/django/forms/fields.py:247
-msgid "Enter a whole number."
-msgstr "Ingrese un número entero."
-
-#: venv/lib/python3.8/site-packages/django/forms/fields.py:398
-#: venv/lib/python3.8/site-packages/django/forms/fields.py:1139
-msgid "Enter a valid date."
-msgstr "Ingrese una fecha válida."
-
-#: venv/lib/python3.8/site-packages/django/forms/fields.py:422
-#: venv/lib/python3.8/site-packages/django/forms/fields.py:1140
-msgid "Enter a valid time."
-msgstr "Ingrese una hora válida."
-
-#: venv/lib/python3.8/site-packages/django/forms/fields.py:450
-msgid "Enter a valid date/time."
-msgstr "Ingrese una fecha/hora válida."
-
-#: venv/lib/python3.8/site-packages/django/forms/fields.py:484
-msgid "Enter a valid duration."
-msgstr "Ingrese una duración válida."
-
-#: venv/lib/python3.8/site-packages/django/forms/fields.py:485
-#, python-brace-format
-msgid "The number of days must be between {min_days} and {max_days}."
-msgstr "El número de dias debe ser entre {min_days} y {max_days}."
-
-#: venv/lib/python3.8/site-packages/django/forms/fields.py:545
-msgid "No file was submitted. Check the encoding type on the form."
-msgstr "No se aceptó ningun archivo. Verfica el tipo de codificación en el formulario."
-
-#: venv/lib/python3.8/site-packages/django/forms/fields.py:546
-msgid "No file was submitted."
-msgstr "No se aceptó ningun archivo."
-
-#: venv/lib/python3.8/site-packages/django/forms/fields.py:547
-msgid "The submitted file is empty."
-msgstr "El archivo enviado está vacio."
-
-#: venv/lib/python3.8/site-packages/django/forms/fields.py:549
-#, python-format
-msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
-msgid_plural "Ensure this filename has at most %(max)d characters (it has %(length)d)."
-msgstr[0] "Verifica que este nombre de archivo no tiene más que %(max)d carácter. (Tiene %(length)d)."
-msgstr[1] "Verifica que este nombre de archivo no tiene más que %(max)d caracteres. (Tiene %(length)d)."
-
-#: venv/lib/python3.8/site-packages/django/forms/fields.py:552
-msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr "Por favor, o envia un archivo o marca la casilla vacia, no los dos."
-
-#: venv/lib/python3.8/site-packages/django/forms/fields.py:613
-msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
-msgstr "Subir una imagen válida. El archivo que subiste o no fue imagen o fue corrupto."
-
-#: venv/lib/python3.8/site-packages/django/forms/fields.py:775
-#: venv/lib/python3.8/site-packages/django/forms/fields.py:865
-#: venv/lib/python3.8/site-packages/django/forms/models.py:1296
-#, python-format
-msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr "Selecciona una opción válida. %(value)s no es una de las opciones disponibles."
-
-#: venv/lib/python3.8/site-packages/django/forms/fields.py:866
-#: venv/lib/python3.8/site-packages/django/forms/fields.py:981
-#: venv/lib/python3.8/site-packages/django/forms/models.py:1295
-msgid "Enter a list of values."
-msgstr "Ingrese una lista de valores."
-
-#: venv/lib/python3.8/site-packages/django/forms/fields.py:982
-msgid "Enter a complete value."
-msgstr "Ingresa un valor completo."
-
-#: venv/lib/python3.8/site-packages/django/forms/fields.py:1198
-msgid "Enter a valid UUID."
-msgstr "Ingrese una UUID válida."
-
-#: venv/lib/python3.8/site-packages/django/forms/fields.py:1228
-msgid "Enter a valid JSON."
-msgstr "Ingrese una JSON válida."
-
-#. Translators: This is the default suffix added to form field labels
-#: venv/lib/python3.8/site-packages/django/forms/forms.py:78
-msgid ":"
-msgstr ":"
-
-#: venv/lib/python3.8/site-packages/django/forms/forms.py:205
-#, python-format
-msgid "(Hidden field %(name)s) %(error)s"
-msgstr "(Campo oculto %(name)s) %(error)s"
-
-#: venv/lib/python3.8/site-packages/django/forms/formsets.py:93
-msgid "ManagementForm data is missing or has been tampered with"
-msgstr "Datos de ManagementForm está ausento o ha sido corrompido"
-
-#: venv/lib/python3.8/site-packages/django/forms/formsets.py:345
-#, python-format
-msgid "Please submit %d or fewer forms."
-msgid_plural "Please submit %d or fewer forms."
-msgstr[0] "Por favor, enviar %d o menos formularios."
-msgstr[1] "Por favor, enviar %d o menos formularios."
-
-#: venv/lib/python3.8/site-packages/django/forms/formsets.py:352
-#, python-format
-msgid "Please submit %d or more forms."
-msgid_plural "Please submit %d or more forms."
-msgstr[0] "Por favor, enviar %d o más formularios."
-msgstr[1] "Por favor, enviar %d o más formularios."
-
-#: venv/lib/python3.8/site-packages/django/forms/formsets.py:379
-#: venv/lib/python3.8/site-packages/django/forms/formsets.py:386
-#, fuzzy
+#~ msgid "Ensure that there are no more than %(max)s decimal place."
+#~ msgid_plural "Ensure that there are no more than %(max)s decimal places."
+#~ msgstr[0] "Verifica que no hay más que %(max)s cifra decimal."
+#~ msgstr[1] "Verifica que no hay más que %(max)s cifras decimales."
+
+#~ msgid "Ensure that there are no more than %(max)s digit before the decimal point."
+#~ msgid_plural "Ensure that there are no more than %(max)s digits before the decimal point."
+#~ msgstr[0] "Verifica que no hay más que %(max)s digito antes de la coma decimal."
+#~ msgstr[1] "Verifica que no hay más que %(max)s digitos antes de la coma decimal."
+
+#~ msgid "File extension “%(extension)s� is not allowed. Allowed extensions are: %(allowed_extensions)s."
+#~ msgstr "No se permite la extensión de archivo “%(extension)s�. Extensiones permitidas son: %(allowed_extensions)s."
+
+#~ msgid "Null characters are not allowed."
+#~ msgstr "No se permiten caracteres nulos"
+
+#~ msgid "and"
+#~ msgstr "y"
+
+#~ msgid "%(model_name)s with this %(field_labels)s already exists."
+#~ msgstr "Ya existe %(model_name)s con este %(field_labels)s."
+
+#~ msgid "Value %(value)r is not a valid choice."
+#~ msgstr "El valor %(value)s no es una opción válida."
+
+#~ msgid "This field cannot be null."
+#~ msgstr "Este campo no puede ser nulo."
+
+#~ msgid "This field cannot be blank."
+#~ msgstr "Este campo no puede ser vacio."
+
+#~ msgid "%(model_name)s with this %(field_label)s already exists."
+#~ msgstr "Ya existe %(model_name)s con este %(field_labels)s."
+
+#~ msgid "%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+#~ msgstr "%(field_label)s deben ser unicos por %(date_field_label)s %(lookup_type)s."
+
+#~ msgid "Field of type: %(field_type)s"
+#~ msgstr "Campo de tipo: %(field_type)s"
+
+#~ msgid "“%(value)s� value must be either True or False."
+#~ msgstr "“%(value)s� valor debe ser o verdadero o falso."
+
+#~ msgid "“%(value)s� value must be either True, False, or None."
+#~ msgstr "%(value)s� valor debe ser o True, False, o None."
+
+#~ msgid "Boolean (Either True or False)"
+#~ msgstr "Booleano (O True O False)"
+
+#~ msgid "String (up to %(max_length)s)"
+#~ msgstr "Cadena (máximo de %(max_length)s caracteres)"
+
+#~ msgid "Comma-separated integers"
+#~ msgstr "Enteros separados por comas"
+
+#~ msgid "“%(value)s� value has an invalid date format. It must be in YYYY-MM-DD format."
+#~ msgstr "“%(value)s� valor tiene un formato de fecha inválido. Hay que estar de formato YYYY-MM-DD."
+
+#~ msgid "“%(value)s� value has the correct format (YYYY-MM-DD) but it is an invalid date."
+#~ msgstr "“%(value)s� valor tiene el formato correcto (YYYY-MM-DD) pero la fecha es invalida."
+
+#~ msgid "Date (without time)"
+#~ msgstr "Fecha (sin la hora)"
+
+#~ msgid "“%(value)s� value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ] format."
+#~ msgstr "“%(value)s� valor tiene un formato invalido. Debe estar en formato YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]."
+
+#~ msgid "“%(value)s� value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but it is an invalid date/time."
+#~ msgstr "“%(value)s� valor tiene el formato correcto (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) pero es una fecha/hora invalida."
+
+#~ msgid "Date (with time)"
+#~ msgstr "Fecha (con la hora)"
+
+#~ msgid "“%(value)s� value must be a decimal number."
+#~ msgstr "El valor de “%(value)s� debe ser un número decimal."
+
+#~ msgid "Decimal number"
+#~ msgstr "Número decimal"
+
+#~ msgid "“%(value)s� value has an invalid format. It must be in [DD] [[HH:]MM:]ss[.uuuuuu] format."
+#~ msgstr "“%(value)s� valor tiene un formato invalido. Debe estar en formato [DD] [[HH:]MM:]ss[.uuuuuu]."
+
+#~ msgid "Duration"
+#~ msgstr "Duración"
+
+#~ msgid "Email address"
+#~ msgstr "Dirección de correo electrónico"
+
+#~ msgid "File path"
+#~ msgstr "Ruta de archivo"
+
+#~ msgid "“%(value)s� value must be a float."
+#~ msgstr "%(value)s no es un usuario válido"
+
+#~ msgid "Floating point number"
+#~ msgstr "Número de coma flotante"
+
+#~ msgid "“%(value)s� value must be an integer."
+#~ msgstr "“%(value)s� valor debe ser un entero."
+
+#~ msgid "Integer"
+#~ msgstr "Entero"
+
+#~ msgid "Big (8 byte) integer"
+#~ msgstr "Entero grande (8 byte)"
+
+#~ msgid "IPv4 address"
+#~ msgstr "Dirección IPv4"
+
+#~ msgid "IP address"
+#~ msgstr "Dirección IP"
+
+#~ msgid "“%(value)s� value must be either None, True or False."
+#~ msgstr "Valor “%(value)s� debe ser o None, True, o False."
+
+#~ msgid "Boolean (Either True, False or None)"
+#~ msgstr "Booleano (O True, Falso, o None)"
+
+#~ msgid "Positive big integer"
+#~ msgstr "Entero positivo grande"
+
+#~ msgid "Positive integer"
+#~ msgstr "Entero positivo"
+
+#~ msgid "Positive small integer"
+#~ msgstr "Entero positivo pequeño "
+
+#~ msgid "Slug (up to %(max_length)s)"
+#~ msgstr "Slug (máximo de %(max_length)s)"
+
+#~ msgid "Small integer"
+#~ msgstr "Entero pequeño"
+
+#~ msgid "Text"
+#~ msgstr "Texto"
+
+#~ msgid "“%(value)s� value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+#~ msgstr "“%(value)s� valor tiene un formato invalido. Debe estar en formato HH:MM[:ss[.uuuuuu]]."
+
+#~ msgid "“%(value)s� value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid time."
+#~ msgstr "“%(value)s� valor tiene el formato correcto (HH:MM[:ss[.uuuuuu]]) pero es una hora invalida."
+
+#~ msgid "Time"
+#~ msgstr "Tiempo"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Raw binary data"
+#~ msgstr "Datos binarios sin procesar"
+
+#~ msgid "“%(value)s� is not a valid UUID."
+#~ msgstr "%(value)s no es una UUID válida."
+
+#~ msgid "Universally unique identifier"
+#~ msgstr "Identificador universalmente único"
+
+#~ msgid "File"
+#~ msgstr "Archivo"
+
+#~ msgid "Image"
+#~ msgstr "Imágen"
+
+#~ msgid "A JSON object"
+#~ msgstr "Un objeto JSON"
+
+#~ msgid "Value must be valid JSON."
+#~ msgstr "Valor debe ser JSON válido."
+
+#~ msgid "%(model)s instance with %(field)s %(value)r does not exist."
+#~ msgstr "%(model)s instancia con %(field)s %(value)r no existe."
+
+#~ msgid "Foreign Key (type determined by related field)"
+#~ msgstr "Clave externa (tipo determinado por campo relacionado)"
+
+#~ msgid "One-to-one relationship"
+#~ msgstr "Relación uno-a-uno"
+
+#~ msgid "%(from)s-%(to)s relationship"
+#~ msgstr "relación %(from)s-%(to)s"
+
+#~ msgid "%(from)s-%(to)s relationships"
+#~ msgstr "relaciones %(from)s-%(to)s"
+
+#~ msgid "Many-to-many relationship"
+#~ msgstr "Relaciones mucho-a-mucho"
+
+#~ msgid "This field is required."
+#~ msgstr "Este campo es requerido."
+
+#~ msgid "Enter a whole number."
+#~ msgstr "Ingrese un número entero."
+
+#~ msgid "Enter a valid date."
+#~ msgstr "Ingrese una fecha válida."
+
+#~ msgid "Enter a valid time."
+#~ msgstr "Ingrese una hora válida."
+
+#~ msgid "Enter a valid date/time."
+#~ msgstr "Ingrese una fecha/hora válida."
+
+#~ msgid "Enter a valid duration."
+#~ msgstr "Ingrese una duración válida."
+
+#~ msgid "The number of days must be between {min_days} and {max_days}."
+#~ msgstr "El número de dias debe ser entre {min_days} y {max_days}."
+
+#~ msgid "No file was submitted. Check the encoding type on the form."
+#~ msgstr "No se aceptó ningun archivo. Verfica el tipo de codificación en el formulario."
+
+#~ msgid "No file was submitted."
+#~ msgstr "No se aceptó ningun archivo."
+
+#~ msgid "The submitted file is empty."
+#~ msgstr "El archivo enviado está vacio."
+
+#~ msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
+#~ msgid_plural "Ensure this filename has at most %(max)d characters (it has %(length)d)."
+#~ msgstr[0] "Verifica que este nombre de archivo no tiene más que %(max)d carácter. (Tiene %(length)d)."
+#~ msgstr[1] "Verifica que este nombre de archivo no tiene más que %(max)d caracteres. (Tiene %(length)d)."
+
+#~ msgid "Please either submit a file or check the clear checkbox, not both."
+#~ msgstr "Por favor, o envia un archivo o marca la casilla vacia, no los dos."
+
+#~ msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
+#~ msgstr "Subir una imagen válida. El archivo que subiste o no fue imagen o fue corrupto."
+
+#~ msgid "Select a valid choice. %(value)s is not one of the available choices."
+#~ msgstr "Selecciona una opción válida. %(value)s no es una de las opciones disponibles."
+
+#~ msgid "Enter a list of values."
+#~ msgstr "Ingrese una lista de valores."
+
+#~ msgid "Enter a complete value."
+#~ msgstr "Ingresa un valor completo."
+
+#~ msgid "Enter a valid UUID."
+#~ msgstr "Ingrese una UUID válida."
+
+#~ msgid "Enter a valid JSON."
+#~ msgstr "Ingrese una JSON válida."
+
+#~ msgid ":"
+#~ msgstr ":"
+
+#~ msgid "(Hidden field %(name)s) %(error)s"
+#~ msgstr "(Campo oculto %(name)s) %(error)s"
+
+#~ msgid "ManagementForm data is missing or has been tampered with"
+#~ msgstr "Datos de ManagementForm está ausento o ha sido corrompido"
+
+#~ msgid "Please submit %d or fewer forms."
+#~ msgid_plural "Please submit %d or fewer forms."
+#~ msgstr[0] "Por favor, enviar %d o menos formularios."
+#~ msgstr[1] "Por favor, enviar %d o menos formularios."
+
+#~ msgid "Please submit %d or more forms."
+#~ msgid_plural "Please submit %d or more forms."
+#~ msgstr[0] "Por favor, enviar %d o más formularios."
+#~ msgstr[1] "Por favor, enviar %d o más formularios."
+
 # TODO cc @mouse is this a verb or noun
-msgid "Order"
-msgstr "Pedir" # if verb 
+#, fuzzy
+#~ msgid "Order"
+#~ msgstr "Pedir"
+
+# if verb 
 # msgstr "Pedido" # if noun
+#~ msgid "Please correct the duplicate data for %(field)s."
+#~ msgstr "Por favor corrige los datos duplicados en %(field)s."
+
+#~ msgid "Please correct the duplicate data for %(field)s, which must be unique."
+#~ msgstr "Por favor corrige los datos duplicados en %(field)s, los cuales deben ser unicos."
+
+#~ msgid "Please correct the duplicate data for %(field_name)s which must be unique for the %(lookup)s in %(date_field)s."
+#~ msgstr "Por favor corrige los datos duplicados en %(field_name)s los cuales deben ser unicos por el %(lookup)s en %(date_field)s."
+
+#~ msgid "Please correct the duplicate values below."
+#~ msgstr "Por favor corrige los valores duplicados a continuación."
+
+#~ msgid "The inline value did not match the parent instance."
+#~ msgstr "El valor en línea no empareja la instancia progenitor."
+
+#~ msgid "Select a valid choice. That choice is not one of the available choices."
+#~ msgstr "Selecciona una opción válida. Esa opción no es una de las opciones disponibles."
+
+#~ msgid "“%(pk)s� is not a valid value."
+#~ msgstr "“%(pk)s� no es un valor válido."
+
+#~ msgid "%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it may be ambiguous or it may not exist."
+#~ msgstr "%(datetime)s no se pudo interpretar en la zona horaria %(current_timezone)s; puede ser ambiguo o puede que no exista."
+
+#~ msgid "Clear"
+#~ msgstr "Borrar"
+
+#~ msgid "Currently"
+#~ msgstr "Actualmente"
+
+#~ msgid "Change"
+#~ msgstr "Cambiar"
+
+#~ msgid "Unknown"
+#~ msgstr "Desconocido"
+
+#~ msgid "Yes"
+#~ msgstr "Sí"
+
+#~ msgid "No"
+#~ msgstr "No"
+
+#~ msgid "yes,no,maybe"
+#~ msgstr "sí,no,quizás"
+
+#~ msgid "%(size)d byte"
+#~ msgid_plural "%(size)d bytes"
+#~ msgstr[0] "%(size)d byte"
+#~ msgstr[1] "%(size)d bytes"
+
+#~ msgid "%s KB"
+#~ msgstr "%s KB"
+
+#~ msgid "%s MB"
+#~ msgstr "%s MB"
+
+#~ msgid "%s GB"
+#~ msgstr "%s GB"
+
+#~ msgid "%s TB"
+#~ msgstr "%s TB"
+
+#~ msgid "%s PB"
+#~ msgstr "%s PB"
+
+#~ msgid "p.m."
+#~ msgstr "p.m."
+
+#~ msgid "a.m."
+#~ msgstr "a.m."
+
+#~ msgid "PM"
+#~ msgstr "PM"
+
+#~ msgid "AM"
+#~ msgstr "AM"
+
+#~ msgid "midnight"
+#~ msgstr "medianoche"
+
+#~ msgid "noon"
+#~ msgstr "mediodia"
+
+#~ msgid "Monday"
+#~ msgstr "Lunes"
+
+#~ msgid "Tuesday"
+#~ msgstr "Martes"
+
+#~ msgid "Wednesday"
+#~ msgstr "Miercoles"
+
+#~ msgid "Thursday"
+#~ msgstr "Jueves"
+
+#~ msgid "Friday"
+#~ msgstr "Viernes"
+
+#~ msgid "Saturday"
+#~ msgstr "Sábado"
+
+#~ msgid "Sunday"
+#~ msgstr "Domino"
+
+#~ msgid "Mon"
+#~ msgstr "Lun"
+
+#~ msgid "Tue"
+#~ msgstr "Mar"
+
+#~ msgid "Wed"
+#~ msgstr "Mie"
+
+#~ msgid "Thu"
+#~ msgstr "Jue"
+
+#~ msgid "Fri"
+#~ msgstr "Vie"
+
+#~ msgid "Sat"
+#~ msgstr "Sáb"
+
+#~ msgid "Sun"
+#~ msgstr "Dom"
+
+#~ msgid "January"
+#~ msgstr "Enero"
+
+#~ msgid "February"
+#~ msgstr "Febrero"
+
+#~ msgid "March"
+#~ msgstr "Marzo"
+
+#~ msgid "April"
+#~ msgstr "Abril"
+
+#~ msgid "May"
+#~ msgstr "Mayo"
+
+#~ msgid "June"
+#~ msgstr "Junio"
+
+#~ msgid "July"
+#~ msgstr "Julio"
+
+#~ msgid "August"
+#~ msgstr "Agosto"
+
+#~ msgid "September"
+#~ msgstr "Septiembre"
+
+#~ msgid "October"
+#~ msgstr "Octubre"
+
+#~ msgid "November"
+#~ msgstr "Noviembre"
+
+#~ msgid "December"
+#~ msgstr "Diciembre"
+
+#~ msgid "jan"
+#~ msgstr "ene"
+
+#~ msgid "feb"
+#~ msgstr "feb"
+
+#~ msgid "mar"
+#~ msgstr "mar"
+
+#~ msgid "apr"
+#~ msgstr "abr"
+
+#~ msgid "may"
+#~ msgstr "may"
+
+#~ msgid "jun"
+#~ msgstr "jun"
+
+#~ msgid "jul"
+#~ msgstr "jul"
+
+#~ msgid "aug"
+#~ msgstr "ago"
+
+#~ msgid "sep"
+#~ msgstr "sep"
+
+#~ msgid "oct"
+#~ msgstr "oct"
+
+#~ msgid "nov"
+#~ msgstr "nov"
+
+#~ msgid "dec"
+#~ msgstr "dic"
+
+#~ msgctxt "abbrev. month"
+#~ msgid "Jan."
+#~ msgstr "en."
+
+#~ msgctxt "abbrev. month"
+#~ msgid "Feb."
+#~ msgstr "feb."
+
+#~ msgctxt "abbrev. month"
+#~ msgid "March"
+#~ msgstr "mzo."
+
+#~ msgctxt "abbrev. month"
+#~ msgid "April"
+#~ msgstr "abr."
+
+#~ msgctxt "abbrev. month"
+#~ msgid "May"
+#~ msgstr "my."
+
+#~ msgctxt "abbrev. month"
+#~ msgid "June"
+#~ msgstr "jun."
+
+#~ msgctxt "abbrev. month"
+#~ msgid "July"
+#~ msgstr "jul."
+
+#~ msgctxt "abbrev. month"
+#~ msgid "Aug."
+#~ msgstr "agto."
+
+#~ msgctxt "abbrev. month"
+#~ msgid "Sept."
+#~ msgstr "set."
+
+#~ msgctxt "abbrev. month"
+#~ msgid "Oct."
+#~ msgstr "oct."
+
+#~ msgctxt "abbrev. month"
+#~ msgid "Nov."
+#~ msgstr "nov."
+
+#~ msgctxt "abbrev. month"
+#~ msgid "Dec."
+#~ msgstr "dic."
+
+#~ msgctxt "alt. month"
+#~ msgid "January"
+#~ msgstr "Enero"
+
+#~ msgctxt "alt. month"
+#~ msgid "February"
+#~ msgstr "Febrero"
+
+#~ msgctxt "alt. month"
+#~ msgid "March"
+#~ msgstr "Marzo"
+
+#~ msgctxt "alt. month"
+#~ msgid "April"
+#~ msgstr "Abril"
+
+#~ msgctxt "alt. month"
+#~ msgid "May"
+#~ msgstr "Mayo"
+
+#~ msgctxt "alt. month"
+#~ msgid "June"
+#~ msgstr "Junio"
+
+#~ msgctxt "alt. month"
+#~ msgid "July"
+#~ msgstr "Julio"
+
+#~ msgctxt "alt. month"
+#~ msgid "August"
+#~ msgstr "Agosto"
+
+#~ msgctxt "alt. month"
+#~ msgid "September"
+#~ msgstr "Septiembre"
+
+#~ msgctxt "alt. month"
+#~ msgid "October"
+#~ msgstr "Octubre"
+
+#~ msgctxt "alt. month"
+#~ msgid "November"
+#~ msgstr "Noviembre"
+
+#~ msgctxt "alt. month"
+#~ msgid "December"
+#~ msgstr "Diciembre"
+
+#~ msgid "This is not a valid IPv6 address."
+#~ msgstr "Esta no es una dirección IPv6 válida."
+
+#~ msgctxt "String to return when truncating text"
+#~ msgid "%(truncated_text)s…"
+#~ msgstr "%(truncated_text)s…"
+
+#~ msgid "or"
+#~ msgstr "o"
+
+#~ msgid ", "
+#~ msgstr ", "
+
+#~ msgid "%d year"
+#~ msgid_plural "%d years"
+#~ msgstr[0] "%d año"
+#~ msgstr[1] "%d años"
+
+#~ msgid "%d month"
+#~ msgid_plural "%d months"
+#~ msgstr[0] "%d mes"
+#~ msgstr[1] "%d meses"
+
+#~ msgid "%d week"
+#~ msgid_plural "%d weeks"
+#~ msgstr[0] "%d semana"
+#~ msgstr[1] "%d semanas"
+
+#~ msgid "%d day"
+#~ msgid_plural "%d days"
+#~ msgstr[0] "%d día"
+#~ msgstr[1] "%d días"
+
+#~ msgid "%d hour"
+#~ msgid_plural "%d hours"
+#~ msgstr[0] "%d hora"
+#~ msgstr[1] "%d horas"
+
+#~ msgid "%d minute"
+#~ msgid_plural "%d minutes"
+#~ msgstr[0] "%d minuto"
+#~ msgstr[1] "%d minutos"
+
+#~ msgid "Forbidden"
+#~ msgstr "Prohibido"
+
+#~ msgid "CSRF verification failed. Request aborted."
+#~ msgstr "Se falló la verificación CSRF. Se abortó la solicitud."
+
+#~ msgid "You are seeing this message because this HTTPS site requires a “Referer header� to be sent by your Web browser, but none was sent. This header is required for security reasons, to ensure that your browser is not being hijacked by third parties."
+#~ msgstr "Estás viendo este mensaje porque este sitio HTTPS requiere que tu navegador Web envie un “Referer header�, pero no se la envió. Esta cabecedera se requiere por razones de seguridad, para asegurar que tu navegador no sea secuestrado por terceros."
+
+#~ msgid "If you have configured your browser to disable “Referer� headers, please re-enable them, at least for this site, or for HTTPS connections, or for “same-origin� requests."
+#~ msgstr "Si has configurado su navegador para deshabilitar las cabecederas “Referer�, vuelva a habilitarlos, al menos para este sitio, o para conexiones HTTPS, o para solicitudes del “same-origin�. "
+
+#~ msgid "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or including the “Referrer-Policy: no-referrer� header, please remove them. The CSRF protection requires the “Referer� header to do strict referer checking. If you’re concerned about privacy, use alternatives like <a rel=\"noreferrer\" …> for links to third-party sites."
+#~ msgstr "Si estás usando la eqtigueta <meta name=\"referrer\" content=\"no-referrer\"> o estás incluyendo la cabecedera “Referrer-Policy: no-referrer�, quitalas por favor. La protección CSRF require la cabecedera “Referer� para hacer verficación “strict referer“. Si te preocupa la privacidad, utiliza alternativas como <a rel=\"noreferrer\" …>  para sitios de terceros."
+
+#~ msgid "You are seeing this message because this site requires a CSRF cookie when submitting forms. This cookie is required for security reasons, to ensure that your browser is not being hijacked by third parties."
+#~ msgstr "Estás viendo este mensaje porque este sitio requiere un cookie CSRF cuando se envie formularios. Este cookie se requiere por razones de seguridad, para asegurar que tu navegador no sea secuestrado por terceros."
+
+#~ msgid "If you have configured your browser to disable cookies, please re-enable them, at least for this site, or for “same-origin� requests."
+#~ msgstr "Si has configurado su navegador para deshabilitar los cookies, vuelva a habilitarlos, al menos para este sitio, o para conexiones HTTPS, o para solicitudes del “same-origin�. "
+
+#~ msgid "More information is available with DEBUG=True."
+#~ msgstr "Más información es disponible con DEBUG=True."
+
+#~ msgid "No year specified"
+#~ msgstr "Ningun año fue especificado"
+
+#~ msgid "Date out of range"
+#~ msgstr "Fecha fuera de rango"
+
+#~ msgid "No month specified"
+#~ msgstr "Ningun mes fue especificado"
+
+#~ msgid "No day specified"
+#~ msgstr "Ningun día fue especificado"
+
+#~ msgid "No week specified"
+#~ msgstr "Ninguna semana fue especificado"
+
+#~ msgid "No %(verbose_name_plural)s available"
+#~ msgstr "No %(verbose_name_plural)s disponible"
+
+#~ msgid "Future %(verbose_name_plural)s not available because %(class_name)s.allow_future is False."
+#~ msgstr "%(verbose_name_plural)s del futuro no está disponible porque %(class_name)s.allow_future es False."
+
+#~ msgid "Invalid date string “%(datestr)s� given format “%(format)s�"
+#~ msgstr "Cadena de fecha invalida “%(datestr)s� dado el formato “%(format)s�"
+
+#~ msgid "No %(verbose_name)s found matching the query"
+#~ msgstr "No se encontró ningún %(verbose_name)s correspondiente a la búsqueda"
+
+#~ msgid "Page is not “last�, nor can it be converted to an int."
+#~ msgstr "Página no es “last�, ni puede ser convertido en un int."
+
+#~ msgid "Invalid page (%(page_number)s): %(message)s"
+#~ msgstr "Página invalida (%(page_number)s): %(message)s"
+
+#~ msgid "Empty list and “%(class_name)s.allow_empty� is False."
+#~ msgstr "Lista vacia y “%(class_name)s.allow_empty� es False."
+
+#~ msgid "Directory indexes are not allowed here."
+#~ msgstr "Indices directorios no se permiten aquí."
+
+#~ msgid "“%(path)s� does not exist"
+#~ msgstr "“%(path)s� no existe"
+
+#~ msgid "Index of %(directory)s"
+#~ msgstr "Indice de %(directory)s"
+
+#~ msgid "Django: the Web framework for perfectionists with deadlines."
+#~ msgstr "Django: el estructura Web para perfeccionistas con fechas límites."
+
+#~ msgid "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
+#~ msgstr "Ver <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" target=\"_blank\" rel=\"noopener\">notas de lanzamiento</a> por Django %(version)s"
+
+#~ msgid "The install worked successfully! Congratulations!"
+#~ msgstr "¡La instalación fue exitoso! ¡Felicidades!"
+
+#~ msgid "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener\">DEBUG=True</a> is in your settings file and you have not configured any URLs."
+#~ msgstr "Estás viendo esta pagina porque <a href=\"https://docs.djangoproject.com/en/%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener\">DEBUG=True</a> está en tu archivo de configuración y no has configurado ningún URL."
+
+#~ msgid "Django Documentation"
+#~ msgstr "Documentación de Django"
+
+#~ msgid "Topics, references, &amp; how-to’s"
+#~ msgstr "Tópicos, referencias, &amp; instrucciones paso-a-paso"
+
+#~ msgid "Tutorial: A Polling App"
+#~ msgstr "Tutorial: Una aplicación polling"
+
+#~ msgid "Get started with Django"
+#~ msgstr "Empezar con Django"
+
+#~ msgid "Django Community"
+#~ msgstr "Comunidad Django"
+
+#~ msgid "Connect, get help, or contribute"
+#~ msgstr "Conectarse, encontrar ayuda, o contribuir"
+
+#~ msgid "Attempting to connect to qpid with SASL mechanism %s"
+#~ msgstr "Intentando conectar con qpid con mecanismo SASL %s"
+
+#~ msgid "Connected to qpid with SASL mechanism %s"
+#~ msgstr "Conectado con qpid con mecanismo SASL %s"
+
+#~ msgid "Unable to connect to qpid with SASL mechanism %s"
+#~ msgstr "No se pudo conectar con qpid con mecanismo SASL %s"
+
+#~ msgid "1 second ago"
+#~ msgstr "Hace 1 segundo"
+
+#~ msgid "1 minute ago"
+#~ msgstr "Hace 1 minuto"
+
+#~ msgid "1 hour ago"
+#~ msgstr "Hace 1 hora"
+
+#~ msgid "%(time)s"
+#~ msgstr "%(time)s"
+
+#~ msgid "yesterday"
+#~ msgstr "ayer"
 
-#: venv/lib/python3.8/site-packages/django/forms/models.py:755
-#, python-format
-msgid "Please correct the duplicate data for %(field)s."
-msgstr "Por favor corrige los datos duplicados en %(field)s."
-
-#: venv/lib/python3.8/site-packages/django/forms/models.py:759
-#, python-format
-msgid "Please correct the duplicate data for %(field)s, which must be unique."
-msgstr "Por favor corrige los datos duplicados en %(field)s, los cuales deben ser unicos."
-
-#: venv/lib/python3.8/site-packages/django/forms/models.py:765
-#, python-format
-msgid "Please correct the duplicate data for %(field_name)s which must be unique for the %(lookup)s in %(date_field)s."
-msgstr "Por favor corrige los datos duplicados en %(field_name)s los cuales deben ser unicos por el %(lookup)s en %(date_field)s."
-
-#: venv/lib/python3.8/site-packages/django/forms/models.py:774
-msgid "Please correct the duplicate values below."
-msgstr "Por favor corrige los valores duplicados a continuación."
-
-#: venv/lib/python3.8/site-packages/django/forms/models.py:1096
-msgid "The inline value did not match the parent instance."
-msgstr "El valor en línea no empareja la instancia progenitor."
-
-#: venv/lib/python3.8/site-packages/django/forms/models.py:1180
-msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr "Selecciona una opción válida. Esa opción no es una de las opciones disponibles."
-
-#: venv/lib/python3.8/site-packages/django/forms/models.py:1298
-msgid "“%(pk)s� is not a valid value."
-msgstr "“%(pk)s� no es un valor válido."
-
-#: venv/lib/python3.8/site-packages/django/forms/utils.py:167
-#, python-format
-msgid "%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it may be ambiguous or it may not exist."
-msgstr "%(datetime)s no se pudo interpretar en la zona horaria %(current_timezone)s; puede ser ambiguo o puede que no exista."
-
-#: venv/lib/python3.8/site-packages/django/forms/widgets.py:398
-msgid "Clear"
-msgstr "Borrar"
-
-#: venv/lib/python3.8/site-packages/django/forms/widgets.py:399
-msgid "Currently"
-msgstr "Actualmente"
-
-#: venv/lib/python3.8/site-packages/django/forms/widgets.py:400
-msgid "Change"
-msgstr "Cambiar"
-
-#: venv/lib/python3.8/site-packages/django/forms/widgets.py:709
-msgid "Unknown"
-msgstr "Desconocido"
-
-#: venv/lib/python3.8/site-packages/django/forms/widgets.py:710
-msgid "Yes"
-msgstr "Sí"
-
-#: venv/lib/python3.8/site-packages/django/forms/widgets.py:711
-msgid "No"
-msgstr "No"
-
-#. Translators: Please do not add spaces around commas.
-#: venv/lib/python3.8/site-packages/django/template/defaultfilters.py:790
-msgid "yes,no,maybe"
-msgstr "sí,no,quizás"
-
-#: venv/lib/python3.8/site-packages/django/template/defaultfilters.py:819
-#: venv/lib/python3.8/site-packages/django/template/defaultfilters.py:836
-#, python-format
-msgid "%(size)d byte"
-msgid_plural "%(size)d bytes"
-msgstr[0] "%(size)d byte"
-msgstr[1] "%(size)d bytes"
-
-#: venv/lib/python3.8/site-packages/django/template/defaultfilters.py:838
-#, python-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: venv/lib/python3.8/site-packages/django/template/defaultfilters.py:840
-#, python-format
-msgid "%s MB"
-msgstr "%s MB"
-
-#: venv/lib/python3.8/site-packages/django/template/defaultfilters.py:842
-#, python-format
-msgid "%s GB"
-msgstr "%s GB"
-
-#: venv/lib/python3.8/site-packages/django/template/defaultfilters.py:844
-#, python-format
-msgid "%s TB"
-msgstr "%s TB"
-
-#: venv/lib/python3.8/site-packages/django/template/defaultfilters.py:846
-#, python-format
-msgid "%s PB"
-msgstr "%s PB"
-
-#: venv/lib/python3.8/site-packages/django/utils/dateformat.py:65
-msgid "p.m."
-msgstr "p.m."
-
-#: venv/lib/python3.8/site-packages/django/utils/dateformat.py:66
-msgid "a.m."
-msgstr "a.m."
-
-#: venv/lib/python3.8/site-packages/django/utils/dateformat.py:71
-msgid "PM"
-msgstr "PM"
-
-#: venv/lib/python3.8/site-packages/django/utils/dateformat.py:72
-msgid "AM"
-msgstr "AM"
-
-#: venv/lib/python3.8/site-packages/django/utils/dateformat.py:149
-msgid "midnight"
-msgstr "medianoche"
-
-#: venv/lib/python3.8/site-packages/django/utils/dateformat.py:151
-msgid "noon"
-msgstr "mediodia"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:6
-#: venv/lib/python3.8/site-packages/tornado/locale.py:295
-msgid "Monday"
-msgstr "Lunes"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:6
-#: venv/lib/python3.8/site-packages/tornado/locale.py:296
-msgid "Tuesday"
-msgstr "Martes"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:6
-#: venv/lib/python3.8/site-packages/tornado/locale.py:297
-msgid "Wednesday"
-msgstr "Miercoles"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:6
-#: venv/lib/python3.8/site-packages/tornado/locale.py:298
-msgid "Thursday"
-msgstr "Jueves"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:6
-#: venv/lib/python3.8/site-packages/tornado/locale.py:299
-msgid "Friday"
-msgstr "Viernes"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:7
-#: venv/lib/python3.8/site-packages/tornado/locale.py:300
-msgid "Saturday"
-msgstr "Sábado"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:7
-#: venv/lib/python3.8/site-packages/tornado/locale.py:301
-msgid "Sunday"
-msgstr "Domino"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:10
-msgid "Mon"
-msgstr "Lun"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:10
-msgid "Tue"
-msgstr "Mar"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:10
-msgid "Wed"
-msgstr "Mie"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:10
-msgid "Thu"
-msgstr "Jue"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:10
-msgid "Fri"
-msgstr "Vie"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:11
-msgid "Sat"
-msgstr "Sáb"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:11
-msgid "Sun"
-msgstr "Dom"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv/lib/python3.8/site-packages/tornado/locale.py:281
-msgid "January"
-msgstr "Enero"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv/lib/python3.8/site-packages/tornado/locale.py:282
-msgid "February"
-msgstr "Febrero"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv/lib/python3.8/site-packages/tornado/locale.py:283
-msgid "March"
-msgstr "Marzo"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv/lib/python3.8/site-packages/tornado/locale.py:284
-msgid "April"
-msgstr "Abril"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv/lib/python3.8/site-packages/tornado/locale.py:285
-msgid "May"
-msgstr "Mayo"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv/lib/python3.8/site-packages/tornado/locale.py:286
-msgid "June"
-msgstr "Junio"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:15
-#: venv/lib/python3.8/site-packages/tornado/locale.py:287
-msgid "July"
-msgstr "Julio"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:15
-#: venv/lib/python3.8/site-packages/tornado/locale.py:288
-msgid "August"
-msgstr "Agosto"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:15
-#: venv/lib/python3.8/site-packages/tornado/locale.py:289
-msgid "September"
-msgstr "Septiembre"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:15
-#: venv/lib/python3.8/site-packages/tornado/locale.py:290
-msgid "October"
-msgstr "Octubre"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:15
-#: venv/lib/python3.8/site-packages/tornado/locale.py:291
-msgid "November"
-msgstr "Noviembre"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:16
-#: venv/lib/python3.8/site-packages/tornado/locale.py:292
-msgid "December"
-msgstr "Diciembre"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "jan"
-msgstr "ene"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "feb"
-msgstr "feb"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "mar"
-msgstr "mar"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "apr"
-msgstr "abr"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "may"
-msgstr "may"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "jun"
-msgstr "jun"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "jul"
-msgstr "jul"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "aug"
-msgstr "ago"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "sep"
-msgstr "sep"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "oct"
-msgstr "oct"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "nov"
-msgstr "nov"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "dec"
-msgstr "dic"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:23
-msgctxt "abbrev. month"
-msgid "Jan."
-msgstr "en."
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:24
-msgctxt "abbrev. month"
-msgid "Feb."
-msgstr "feb."
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:25
-msgctxt "abbrev. month"
-msgid "March"
-msgstr "mzo."
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:26
-msgctxt "abbrev. month"
-msgid "April"
-msgstr "abr."
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:27
-msgctxt "abbrev. month"
-msgid "May"
-msgstr "my."
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:28
-msgctxt "abbrev. month"
-msgid "June"
-msgstr "jun."
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:29
-msgctxt "abbrev. month"
-msgid "July"
-msgstr "jul."
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:30
-msgctxt "abbrev. month"
-msgid "Aug."
-msgstr "agto."
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:31
-msgctxt "abbrev. month"
-msgid "Sept."
-msgstr "set."
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:32
-msgctxt "abbrev. month"
-msgid "Oct."
-msgstr "oct."
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:33
-msgctxt "abbrev. month"
-msgid "Nov."
-msgstr "nov."
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:34
-msgctxt "abbrev. month"
-msgid "Dec."
-msgstr "dic."
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:37
-msgctxt "alt. month"
-msgid "January"
-msgstr "Enero"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:38
-msgctxt "alt. month"
-msgid "February"
-msgstr "Febrero"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:39
-msgctxt "alt. month"
-msgid "March"
-msgstr "Marzo"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:40
-msgctxt "alt. month"
-msgid "April"
-msgstr "Abril"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:41
-msgctxt "alt. month"
-msgid "May"
-msgstr "Mayo"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:42
-msgctxt "alt. month"
-msgid "June"
-msgstr "Junio"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:43
-msgctxt "alt. month"
-msgid "July"
-msgstr "Julio"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:44
-msgctxt "alt. month"
-msgid "August"
-msgstr "Agosto"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:45
-msgctxt "alt. month"
-msgid "September"
-msgstr "Septiembre"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:46
-msgctxt "alt. month"
-msgid "October"
-msgstr "Octubre"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:47
-msgctxt "alt. month"
-msgid "November"
-msgstr "Noviembre"
-
-#: venv/lib/python3.8/site-packages/django/utils/dates.py:48
-msgctxt "alt. month"
-msgid "December"
-msgstr "Diciembre"
-
-#: venv/lib/python3.8/site-packages/django/utils/ipv6.py:8
-msgid "This is not a valid IPv6 address."
-msgstr "Esta no es una dirección IPv6 válida."
-
-#: venv/lib/python3.8/site-packages/django/utils/text.py:70
-#, python-format
-msgctxt "String to return when truncating text"
-msgid "%(truncated_text)s…"
-msgstr "%(truncated_text)s…"
-
-#: venv/lib/python3.8/site-packages/django/utils/text.py:236
-msgid "or"
-msgstr "o"
-
-#. Translators: This string is used as a separator between list elements
-#: venv/lib/python3.8/site-packages/django/utils/text.py:255
-#: venv/lib/python3.8/site-packages/django/utils/timesince.py:83
-msgid ", "
-msgstr ", "
-
-#: venv/lib/python3.8/site-packages/django/utils/timesince.py:9
-#, python-format
-msgid "%d year"
-msgid_plural "%d years"
-msgstr[0] "%d año"
-msgstr[1] "%d años"
-
-#: venv/lib/python3.8/site-packages/django/utils/timesince.py:10
-#, python-format
-msgid "%d month"
-msgid_plural "%d months"
-msgstr[0] "%d mes"
-msgstr[1] "%d meses"
-
-#: venv/lib/python3.8/site-packages/django/utils/timesince.py:11
-#, python-format
-msgid "%d week"
-msgid_plural "%d weeks"
-msgstr[0] "%d semana"
-msgstr[1] "%d semanas"
-
-#: venv/lib/python3.8/site-packages/django/utils/timesince.py:12
-#, python-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d día"
-msgstr[1] "%d días"
-
-#: venv/lib/python3.8/site-packages/django/utils/timesince.py:13
-#, python-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d hora"
-msgstr[1] "%d horas"
-
-#: venv/lib/python3.8/site-packages/django/utils/timesince.py:14
-#, python-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minuto"
-msgstr[1] "%d minutos"
-
-#: venv/lib/python3.8/site-packages/django/views/csrf.py:110
-msgid "Forbidden"
-msgstr "Prohibido"
-
-#: venv/lib/python3.8/site-packages/django/views/csrf.py:111
-msgid "CSRF verification failed. Request aborted."
-msgstr "Se falló la verificación CSRF. Se abortó la solicitud."
-
-#: venv/lib/python3.8/site-packages/django/views/csrf.py:115
-msgid "You are seeing this message because this HTTPS site requires a “Referer header� to be sent by your Web browser, but none was sent. This header is required for security reasons, to ensure that your browser is not being hijacked by third parties."
-msgstr "Estás viendo este mensaje porque este sitio HTTPS requiere que tu navegador Web envie un “Referer header�, pero no se la envió. Esta cabecedera se requiere por razones de seguridad, para asegurar que tu navegador no sea secuestrado por terceros."
-
-#: venv/lib/python3.8/site-packages/django/views/csrf.py:120
-msgid "If you have configured your browser to disable “Referer� headers, please re-enable them, at least for this site, or for HTTPS connections, or for “same-origin� requests."
-msgstr "Si has configurado su navegador para deshabilitar las cabecederas “Referer�, vuelva a habilitarlos, al menos para este sitio, o para conexiones HTTPS, o para solicitudes del “same-origin�. "
-
-#: venv/lib/python3.8/site-packages/django/views/csrf.py:124
-msgid "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or including the “Referrer-Policy: no-referrer� header, please remove them. The CSRF protection requires the “Referer� header to do strict referer checking. If you’re concerned about privacy, use alternatives like <a rel=\"noreferrer\" …> for links to third-party sites."
-msgstr "Si estás usando la eqtigueta <meta name=\"referrer\" content=\"no-referrer\"> o estás incluyendo la cabecedera “Referrer-Policy: no-referrer�, quitalas por favor. La protección CSRF require la cabecedera “Referer� para hacer verficación “strict referer“. Si te preocupa la privacidad, utiliza alternativas como <a rel=\"noreferrer\" …>  para sitios de terceros."
-
-#: venv/lib/python3.8/site-packages/django/views/csrf.py:132
-msgid "You are seeing this message because this site requires a CSRF cookie when submitting forms. This cookie is required for security reasons, to ensure that your browser is not being hijacked by third parties."
-msgstr "Estás viendo este mensaje porque este sitio requiere un cookie CSRF cuando se envie formularios. Este cookie se requiere por razones de seguridad, para asegurar que tu navegador no sea secuestrado por terceros."
-
-#: venv/lib/python3.8/site-packages/django/views/csrf.py:137
-msgid "If you have configured your browser to disable cookies, please re-enable them, at least for this site, or for “same-origin� requests."
-msgstr "Si has configurado su navegador para deshabilitar los cookies, vuelva a habilitarlos, al menos para este sitio, o para conexiones HTTPS, o para solicitudes del “same-origin�. "
-
-#: venv/lib/python3.8/site-packages/django/views/csrf.py:142
-msgid "More information is available with DEBUG=True."
-msgstr "Más información es disponible con DEBUG=True."
-
-#: venv/lib/python3.8/site-packages/django/views/generic/dates.py:41
-msgid "No year specified"
-msgstr "Ningun año fue especificado"
-
-#: venv/lib/python3.8/site-packages/django/views/generic/dates.py:61
-#: venv/lib/python3.8/site-packages/django/views/generic/dates.py:111
-#: venv/lib/python3.8/site-packages/django/views/generic/dates.py:208
-msgid "Date out of range"
-msgstr "Fecha fuera de rango"
-
-#: venv/lib/python3.8/site-packages/django/views/generic/dates.py:90
-msgid "No month specified"
-msgstr "Ningun mes fue especificado"
-
-#: venv/lib/python3.8/site-packages/django/views/generic/dates.py:142
-msgid "No day specified"
-msgstr "Ningun día fue especificado"
-
-#: venv/lib/python3.8/site-packages/django/views/generic/dates.py:188
-msgid "No week specified"
-msgstr "Ninguna semana fue especificado"
-
-#: venv/lib/python3.8/site-packages/django/views/generic/dates.py:338
-#: venv/lib/python3.8/site-packages/django/views/generic/dates.py:367
-#, python-format
-msgid "No %(verbose_name_plural)s available"
-msgstr "No %(verbose_name_plural)s disponible"
-
-#: venv/lib/python3.8/site-packages/django/views/generic/dates.py:589
-#, python-format
-msgid "Future %(verbose_name_plural)s not available because %(class_name)s.allow_future is False."
-msgstr "%(verbose_name_plural)s del futuro no está disponible porque %(class_name)s.allow_future es False."
-
-#: venv/lib/python3.8/site-packages/django/views/generic/dates.py:623
-#, python-format
-msgid "Invalid date string “%(datestr)s� given format “%(format)s�"
-msgstr "Cadena de fecha invalida “%(datestr)s� dado el formato “%(format)s�"
-
-#: venv/lib/python3.8/site-packages/django/views/generic/detail.py:54
-msgid "No %(verbose_name)s found matching the query"
-msgstr "No se encontró ningún %(verbose_name)s correspondiente a la búsqueda"
-
-#: venv/lib/python3.8/site-packages/django/views/generic/list.py:67
-msgid "Page is not “last�, nor can it be converted to an int."
-msgstr "Página no es “last�, ni puede ser convertido en un int."
-
-#: venv/lib/python3.8/site-packages/django/views/generic/list.py:72
-#, python-format
-msgid "Invalid page (%(page_number)s): %(message)s"
-msgstr "Página invalida (%(page_number)s): %(message)s"
-
-#: venv/lib/python3.8/site-packages/django/views/generic/list.py:154
-#, python-format
-msgid "Empty list and “%(class_name)s.allow_empty� is False."
-msgstr "Lista vacia y “%(class_name)s.allow_empty� es False."
-
-#: venv/lib/python3.8/site-packages/django/views/static.py:40
-msgid "Directory indexes are not allowed here."
-msgstr "Indices directorios no se permiten aquí."
-
-#: venv/lib/python3.8/site-packages/django/views/static.py:42
-msgid "“%(path)s� does not exist"
-msgstr "“%(path)s� no existe"
-
-#: venv/lib/python3.8/site-packages/django/views/static.py:80
-#, python-format
-msgid "Index of %(directory)s"
-msgstr "Indice de %(directory)s"
-
-#: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:7
-msgid "Django: the Web framework for perfectionists with deadlines."
-msgstr "Django: el estructura Web para perfeccionistas con fechas límites."
-
-#: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:346
-#, python-format
-msgid "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
-msgstr "Ver <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" target=\"_blank\" rel=\"noopener\">notas de lanzamiento</a> por Django %(version)s"
-
-#: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:368
-msgid "The install worked successfully! Congratulations!"
-msgstr "¡La instalación fue exitoso! ¡Felicidades!"
-
-#: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:369
-#, python-format
-msgid "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener\">DEBUG=True</a> is in your settings file and you have not configured any URLs."
-msgstr "Estás viendo esta pagina porque <a href=\"https://docs.djangoproject.com/en/%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener\">DEBUG=True</a> está en tu archivo de configuración y no has configurado ningún URL."
-
-#: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:384
-msgid "Django Documentation"
-msgstr "Documentación de Django"
-
-#: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:385
-msgid "Topics, references, &amp; how-to’s"
-msgstr "Tópicos, referencias, &amp; instrucciones paso-a-paso"
-
-#: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:396
-msgid "Tutorial: A Polling App"
-msgstr "Tutorial: Una aplicación polling"
-
-#: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:397
-msgid "Get started with Django"
-msgstr "Empezar con Django"
-
-#: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:408
-msgid "Django Community"
-msgstr "Comunidad Django"
-
-#: venv/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:409
-msgid "Connect, get help, or contribute"
-msgstr "Conectarse, encontrar ayuda, o contribuir"
-
-#: venv/lib/python3.8/site-packages/kombu/transport/qpid.py:1301
-#, python-format
-msgid "Attempting to connect to qpid with SASL mechanism %s"
-msgstr "Intentando conectar con qpid con mecanismo SASL %s"
-
-#: venv/lib/python3.8/site-packages/kombu/transport/qpid.py:1306
-#, python-format
-msgid "Connected to qpid with SASL mechanism %s"
-msgstr "Conectado con qpid con mecanismo SASL %s"
-
-#: venv/lib/python3.8/site-packages/kombu/transport/qpid.py:1324
-#, python-format
-msgid "Unable to connect to qpid with SASL mechanism %s"
-msgstr "No se pudo conectar con qpid con mecanismo SASL %s"
-
-#: venv/lib/python3.8/site-packages/tornado/locale.py:371
-msgid "1 second ago"
-msgstr "Hace 1 segundo"
-
-#: venv/lib/python3.8/site-packages/tornado/locale.py:377
-msgid "1 minute ago"
-msgstr "Hace 1 minuto"
-
-#: venv/lib/python3.8/site-packages/tornado/locale.py:382
-msgid "1 hour ago"
-msgstr "Hace 1 hora"
-
-#: venv/lib/python3.8/site-packages/tornado/locale.py:385
-#, python-format
-msgid "%(time)s"
-msgstr "%(time)s"
-
-#: venv/lib/python3.8/site-packages/tornado/locale.py:387
-msgid "yesterday"
-msgstr "ayer"
-
-#: venv/lib/python3.8/site-packages/tornado/locale.py:387
-#, python-format
 # TODO cc @mouse this could be grammatically incorrect if the time said 1 o'clock
 # a working clock is broken twice a day!
-msgid "yesterday at %(time)s"
-msgstr "ayer a las %(time)s" 
+#~ msgid "yesterday at %(time)s"
+#~ msgstr "ayer a las %(time)s"
 
-#: venv/lib/python3.8/site-packages/tornado/locale.py:389
-#, python-format
-msgid "%(weekday)s"
-msgstr "%(weekday)s"
+#~ msgid "%(weekday)s"
+#~ msgstr "%(weekday)s"
 
-#: venv/lib/python3.8/site-packages/tornado/locale.py:389
-#, python-format
 # TODO cc @mouse this could be grammatically incorrect if the time said 1 o'clock
 # a working clock is broken twice a day!
-msgid "%(weekday)s at %(time)s"
-msgstr "%(weekday)s a las %(time)s"
+#~ msgid "%(weekday)s at %(time)s"
+#~ msgstr "%(weekday)s a las %(time)s"
 
-#: venv/lib/python3.8/site-packages/tornado/locale.py:392
-#: venv/lib/python3.8/site-packages/tornado/locale.py:445
-#, python-format
-msgid "%(month_name)s %(day)s"
-msgstr "%(day)s %(month_name)s"
+#~ msgid "%(month_name)s %(day)s"
+#~ msgstr "%(day)s %(month_name)s"
 
-#: venv/lib/python3.8/site-packages/tornado/locale.py:394
-#, python-format
 # TODO cc @mouse this could be grammatically incorrect if the time said 1 o'clock
 # a working clock is broken twice a day!
-msgid "%(month_name)s %(day)s at %(time)s"
-msgstr "%(day)s %(month_name)s a las %(time)s"
+#~ msgid "%(month_name)s %(day)s at %(time)s"
+#~ msgstr "%(day)s %(month_name)s a las %(time)s"
 
-#: venv/lib/python3.8/site-packages/tornado/locale.py:399
-#, python-format
-msgid "%(month_name)s %(day)s, %(year)s"
-msgstr "%(day)s %(month_name)s, %(year)s"
+#~ msgid "%(month_name)s %(day)s, %(year)s"
+#~ msgstr "%(day)s %(month_name)s, %(year)s"
 
-#: venv/lib/python3.8/site-packages/tornado/locale.py:401
-#, python-format
 # TODO cc @mouse this could be grammatically incorrect if the time said 1 o'clock
 # a working clock is broken twice a day!
-msgid "%(month_name)s %(day)s, %(year)s at %(time)s"
-msgstr "%(day)s %(month_name)s, %(year)s a las %(time)s"
+#~ msgid "%(month_name)s %(day)s, %(year)s at %(time)s"
+#~ msgstr "%(day)s %(month_name)s, %(year)s a las %(time)s"
 
-#: venv/lib/python3.8/site-packages/tornado/locale.py:439
-#, python-format
-msgid "%(weekday)s, %(month_name)s %(day)s"
-msgstr "%(weekday)s, %(day)s %(month_name)s"
+#~ msgid "%(weekday)s, %(month_name)s %(day)s"
+#~ msgstr "%(weekday)s, %(day)s %(month_name)s"
 
-#: venv/lib/python3.8/site-packages/tornado/locale.py:462
-#, python-format
-msgid "%(commas)s and %(last)s"
-msgstr "%(commas)s y %(last)s"
+#~ msgid "%(commas)s and %(last)s"
+#~ msgstr "%(commas)s y %(last)s"
 
-#: venv/lib/python3.8/site-packages/tornado/test/locale_test.py:68
-msgctxt "law"
-msgid "right"
-msgstr "justo"
+#~ msgctxt "law"
+#~ msgid "right"
+#~ msgstr "justo"
 
-#: venv/lib/python3.8/site-packages/tornado/test/locale_test.py:69
-msgctxt "good"
-msgid "right"
-msgstr "correcto"
+#~ msgctxt "good"
+#~ msgid "right"
+#~ msgstr "correcto"
 
-#: venv/lib/python3.8/site-packages/tornado/test/locale_test.py:71
-#: venv/lib/python3.8/site-packages/tornado/test/locale_test.py:74
-msgctxt "organization"
-msgid "club"
-msgstr "club"
+#~ msgctxt "organization"
+#~ msgid "club"
+#~ msgstr "club"
 
-#: venv/lib/python3.8/site-packages/tornado/test/locale_test.py:76
-#: venv/lib/python3.8/site-packages/tornado/test/locale_test.py:77
-msgctxt "stick"
-msgid "club"
-msgstr "garrote"
+#~ msgctxt "stick"
+#~ msgid "club"
+#~ msgstr "garrote"
 
 #, fuzzy
 #~| msgid "Started"

From 648b990aab4a940004c4f1c3cea687dd2609512a Mon Sep 17 00:00:00 2001
From: reese <reesedporter@gmail.com>
Date: Thu, 22 Apr 2021 11:37:18 -0500
Subject: [PATCH 0920/1285] realized Read was in the past tense lol

---
 locale/es/LC_MESSAGES/django.mo | Bin 42569 -> 42570 bytes
 locale/es/LC_MESSAGES/django.po |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index f0d87d7039ba2302eba8733872a4fa81b1cb94f5..e2498fda1420d94d06c0a145c3132227038091f7 100644
GIT binary patch
delta 1843
zcmXZcdrVJZ9LMozB}K|Fmwu^S<A;9wAxy|}*F@xgH;QEo{Sj*x=MVmiNT>)=xot)>
zWQ=9YTw0qATl_&AHa52v{gd(jIL}|N=X=h1p6~bhp68sW%|XwagKl&UbV7_V4aLUv
z#s}!Z7VA6o692${7<R~*2poum(T_bb12umocE@cv3U^>1Jc&_w1$*E<48x{F#xWxp
zv~VFBJ8(RPA2y~hPDeeMg_^h)2Vf2=!G0TGLKV`8D!AGD0sX{XsC7n_xQ<5^G_}Mr
zCX~TKE>z%hOv11B!MG#t{o$yE$DnpN$Ho~rk~kY9uo&a95|!XKs-sU(8*D{&<OeEm
zuyfRyVGP1i69T9NGi*E`HDL{gV;*kCLL7r{us4R58WV|LRHuA66vv_NFGUr&1$$vW
z`q0_OAb~+G2Ji_gQ70;K@G*Di(dZ!#pjw%RN|cV;@lu?EyHNA5pc3Cgy~-xk8EQq%
z|Au|YZ#o&M13k;!ijz<kE=E1L9(mAgMRleSW6(jhu)<nx?_Wk0a2-{^J=B?bj(P<j
zQS-VmlKiIIaW_$4)DGiO1ti()Q*kx%Y<s^7qlm9rAEM623)H;NsITfbj>az3nev@5
zW)?2TnOKf~@|#u$=@@d7PYW|qmF8IwSWjUl*XvO`GUe_LV^KRwM0G3~^=hV}Ix!cc
zG0VoesQCrx^k-1QU<lTtTGoV`_zJaf8^+>i)T`*mr=p#DQO^%Y9lnV+o{jy8m!Ue9
ziz;ldy??-7FRP&cTCmPO(15DE5l7;48@F5kpmq{k=_VM2+Q|ge>0X3dZyjo5J5m3a
zgQyK%wcbW``cWnQ*Mjf4pq+H03J5*rCWyin#6C>LBHV~~aW}@CHfA!GU?M)obNCar
z^U^B!^w*%yz#YuRkGKFcoilC$m8ipU164pf>W}sZ_h8srV>Y3Ky8aHm_yzqKL{@zr
z0o43SxCGNsiH@Sq&Ra~z#A-fmbT%;1yW5OvQ9fp25oTZuYGUkpcj9(bf+|!Y7jZ1s
zqgvmF^RNR~;j|0<8?X%3$xoPqsWty!kz;l<P^*eD0neZgOCzeFXQ)K4QSZ17^?7|q
z74i%9+5W|B^wheYD!?toFKs-z&Rw@0)v0Rqm^foDF;I&e>;q#jx&@`&>@lK#Tk!Ur
LT{rI+ACCP89%vy7

delta 1842
zcmXZcdrXf}9LMqFhbVMIDVj_BNh*XPTIRA?(TbT|=9aL9Ho45uv*ka!5V|O$NH!zO
zZMH01W}?l8E&fQGY;0}|{ZqsH<2ir5&i8qqbH3m6J?Hmpd*ONZ!qeCv;S4gyJUD4g
z05)SFwp%+fl=wT2!XbsmjKFa?9;c!orl97pK_AS<DYzSh@f-$W1N!1a9Ez=l#xY(7
z?K}v<pBRsRMaGQ8MAV1rsEO+^46{%Pj@h^#RY(h};OEv47(?8LS|_U5bq1=SgkpzX
zF-YY>1+K<8{9->0FLB>Tq85%p?Qn^WQ!t8n8;-yeI1VdN3GSjg`V_Un4pc|Jqw;#3
zQ^rhU;D?$Jhf1)}#>uD&nK%q{a4R0dSbU2C=yTc_e+)r&%8L_mI_iA}s=%!{9CL9p
zI!75qGN{98_!O0>7nRsk>h63r1`@}iTA74Ov<$W53{1eisQC@3#CK3f*^0VD9jN(V
zF_`?Omw`Iqd&aFe7FA&y>cb7lhh{sfGly^t=A&9zZmqHJub~RKi7MbB>dv&Gj-VSg
zuMhpnZw8)q69uDoI2KhvtbLw<nZ%3j`zj0~zF~cYx*IQ1^FHBV{EgArhq_bVbF6`@
zaS@hb4Eaq5gXK7=%$NvViK;ZmT41fjG@du2cJvpu!?1F9N71N`#iNd9KB^N-F$B|X
zyc0D)51r8riWp45I@E%#sEMypt?I&X{DeA+f&5go(-746k*Lcz%f^dw6!9ulr*@(W
zJ8a(<*yp7c^j`~Ju^-$=Ro;S8*k<D%Yd>lyK9z2Q2-HqyqHgyJ)Ozbt8{32We>slY
z&~@uwRHq+T(tj=Zo(I}VFRB2a^KODbTtn=|L_C6<@Btpc&?;l*Vi8WoCs>0&P&+?W
z?cV-c)E&5oyRaKmaHVs>EuaE*Ic}i}=t2FX_2WSta?zO0n2&niiJ|xzV{iaj_3Ma3
z&7Y0wn1o7Hg1S5Ja3)4y;uz7{$UtYe1=XTl%)ld<itVV0VVB*ByHE+LP=#E@>DY*B
zeHSL<Ph5-hYq<wlit6M?oQDhQ{vVNJ_A^kcPGBTfqb^Ges-S16L~l@M+=cpieM1%U
z3-z=8gIO4G#qCrcZX<qW<2hH|b<0qls=+`r)|h$*YVm#h!L)j}pt()H-rGAo+54KB
IPZov$13EPz!T<mO

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index a6274f7a..97aa4da3 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -851,7 +851,7 @@ msgstr "Leyendo actualmente"
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
 #: bookwyrm/templates/user/shelf.html:28
 msgid "Read"
-msgstr "Leer"
+msgstr "Leido"
 
 #: bookwyrm/templates/feed/feed_layout.html:88 bookwyrm/templates/goal.html:26
 #: bookwyrm/templates/snippets/goal_card.html:6

From 9148f36719f31f21e8cee8419ea69d1c16010f16 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 22 Apr 2021 18:16:00 -0700
Subject: [PATCH 0921/1285] Fixes duplicate boosts

---
 bookwyrm/models/activitypub_mixin.py     |  6 +++++-
 bookwyrm/tests/views/test_interaction.py | 27 ++++++++++++++++--------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index 82a45ac8..2e248fbe 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -204,7 +204,11 @@ class ObjectMixin(ActivitypubMixin):
         created = created or not bool(self.id)
         # first off, we want to save normally no matter what
         super().save(*args, **kwargs)
-        if not broadcast:
+        if (
+            not broadcast
+            or hasattr(self, "status_type")
+            and self.status_type == "Announce"
+        ):
             return
 
         # this will work for objects owned by a user (lists, shelves)
diff --git a/bookwyrm/tests/views/test_interaction.py b/bookwyrm/tests/views/test_interaction.py
index 8d2c63ff..f767edfa 100644
--- a/bookwyrm/tests/views/test_interaction.py
+++ b/bookwyrm/tests/views/test_interaction.py
@@ -1,4 +1,5 @@
 """ test for app action functionality """
+import json
 from unittest.mock import patch
 from django.test import TestCase
 from django.test.client import RequestFactory
@@ -39,7 +40,7 @@ class InteractionViews(TestCase):
             parent_work=work,
         )
 
-    def test_handle_favorite(self, _):
+    def test_favorite(self, _):
         """ create and broadcast faving a status """
         view = views.Favorite.as_view()
         request = self.factory.post("")
@@ -57,7 +58,7 @@ class InteractionViews(TestCase):
         self.assertEqual(notification.user, self.local_user)
         self.assertEqual(notification.related_user, self.remote_user)
 
-    def test_handle_unfavorite(self, _):
+    def test_unfavorite(self, _):
         """ unfav a status """
         view = views.Unfavorite.as_view()
         request = self.factory.post("")
@@ -74,7 +75,7 @@ class InteractionViews(TestCase):
         self.assertEqual(models.Favorite.objects.count(), 0)
         self.assertEqual(models.Notification.objects.count(), 0)
 
-    def test_handle_boost(self, _):
+    def test_boost(self, _):
         """ boost a status """
         view = views.Boost.as_view()
         request = self.factory.post("")
@@ -85,6 +86,7 @@ class InteractionViews(TestCase):
             view(request, status.id)
 
         boost = models.Boost.objects.get()
+
         self.assertEqual(boost.boosted_status, status)
         self.assertEqual(boost.user, self.remote_user)
         self.assertEqual(boost.privacy, "public")
@@ -95,7 +97,7 @@ class InteractionViews(TestCase):
         self.assertEqual(notification.related_user, self.remote_user)
         self.assertEqual(notification.related_status, status)
 
-    def test_handle_self_boost(self, _):
+    def test_self_boost(self, _):
         """ boost your own status """
         view = views.Boost.as_view()
         request = self.factory.post("")
@@ -103,7 +105,14 @@ class InteractionViews(TestCase):
         with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
             status = models.Status.objects.create(user=self.local_user, content="hi")
 
-            view(request, status.id)
+            with patch(
+                "bookwyrm.models.activitypub_mixin.broadcast_task.delay"
+            ) as broadcast_mock:
+                view(request, status.id)
+
+        self.assertEqual(broadcast_mock.call_count, 1)
+        activity = json.loads(broadcast_mock.call_args[0][1])
+        self.assertEqual(activity["type"], "Announce")
 
         boost = models.Boost.objects.get()
         self.assertEqual(boost.boosted_status, status)
@@ -112,7 +121,7 @@ class InteractionViews(TestCase):
 
         self.assertFalse(models.Notification.objects.exists())
 
-    def test_handle_boost_unlisted(self, _):
+    def test_boost_unlisted(self, _):
         """ boost a status """
         view = views.Boost.as_view()
         request = self.factory.post("")
@@ -127,7 +136,7 @@ class InteractionViews(TestCase):
         boost = models.Boost.objects.get()
         self.assertEqual(boost.privacy, "unlisted")
 
-    def test_handle_boost_private(self, _):
+    def test_boost_private(self, _):
         """ boost a status """
         view = views.Boost.as_view()
         request = self.factory.post("")
@@ -140,7 +149,7 @@ class InteractionViews(TestCase):
             view(request, status.id)
         self.assertFalse(models.Boost.objects.exists())
 
-    def test_handle_boost_twice(self, _):
+    def test_boost_twice(self, _):
         """ boost a status """
         view = views.Boost.as_view()
         request = self.factory.post("")
@@ -152,7 +161,7 @@ class InteractionViews(TestCase):
             view(request, status.id)
         self.assertEqual(models.Boost.objects.count(), 1)
 
-    def test_handle_unboost(self, _):
+    def test_unboost(self, _):
         """ undo a boost """
         view = views.Unboost.as_view()
         request = self.factory.post("")

From a3f91d991f5e2f7ef91d4f6759b675740d5d1146 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 22 Apr 2021 18:19:42 -0700
Subject: [PATCH 0922/1285] Remove tag form

---
 bookwyrm/forms.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 1f1f1a3b..df68334e 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -156,14 +156,6 @@ class UserGroupForm(CustomForm):
         fields = ["groups"]
 
 
-class TagForm(CustomForm):
-    class Meta:
-        model = models.Tag
-        fields = ["name"]
-        help_texts = {f: None for f in fields}
-        labels = {"name": "Add a tag"}
-
-
 class CoverForm(CustomForm):
     class Meta:
         model = models.Book

From 74ccaf27facd6b3f41fcad68bba28e9112b3f26a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 22 Apr 2021 18:23:23 -0700
Subject: [PATCH 0923/1285] Tag removal migration

---
 .../migrations/0070_auto_20210423_0121.py     | 35 +++++++++++++++++++
 bookwyrm/templates/snippets/tag.html          | 23 ------------
 bookwyrm/templates/tag.html                   | 14 --------
 bookwyrm/views/books.py                       |  7 ----
 4 files changed, 35 insertions(+), 44 deletions(-)
 create mode 100644 bookwyrm/migrations/0070_auto_20210423_0121.py
 delete mode 100644 bookwyrm/templates/snippets/tag.html
 delete mode 100644 bookwyrm/templates/tag.html

diff --git a/bookwyrm/migrations/0070_auto_20210423_0121.py b/bookwyrm/migrations/0070_auto_20210423_0121.py
new file mode 100644
index 00000000..90540ae1
--- /dev/null
+++ b/bookwyrm/migrations/0070_auto_20210423_0121.py
@@ -0,0 +1,35 @@
+# Generated by Django 3.1.8 on 2021-04-23 01:21
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0069_auto_20210422_1604'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='usertag',
+            unique_together=None,
+        ),
+        migrations.RemoveField(
+            model_name='usertag',
+            name='book',
+        ),
+        migrations.RemoveField(
+            model_name='usertag',
+            name='tag',
+        ),
+        migrations.RemoveField(
+            model_name='usertag',
+            name='user',
+        ),
+        migrations.DeleteModel(
+            name='Tag',
+        ),
+        migrations.DeleteModel(
+            name='UserTag',
+        ),
+    ]
diff --git a/bookwyrm/templates/snippets/tag.html b/bookwyrm/templates/snippets/tag.html
deleted file mode 100644
index 507def72..00000000
--- a/bookwyrm/templates/snippets/tag.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{% load i18n %}
-<div class="control">
-    <form name="tag" action="/{% if tag.tag.identifier in user_tags %}untag{% else %}tag{% endif %}/" method="post">
-        {% csrf_token %}
-        <input type="hidden" name="book" value="{{ book.id }}">
-        <input type="hidden" name="name" value="{{ tag.tag.name }}">
-
-        <div class="tags has-addons">
-            <a class="tag" href="{{ tag.tag.local_path }}">
-                {{ tag.tag.name }}
-            </a>
-            {% if tag.tag.identifier in user_tags %}
-            <button class="tag is-delete" type="submit">
-                <span class="is-sr-only">{% trans "Remove tag" %}</span>
-            </button>
-            {% else %}
-            <button class="tag" type="submit">+
-                <span class="is-sr-only">{% trans "Add tag" %}</span>
-            </button>
-            {% endif %}
-        </div>
-    </form>
-</div>
diff --git a/bookwyrm/templates/tag.html b/bookwyrm/templates/tag.html
deleted file mode 100644
index b6fa6778..00000000
--- a/bookwyrm/templates/tag.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends 'layout.html' %}
-{% load i18n %}
-{% load bookwyrm_tags %}
-
-{% block title %}{{ tag.name }}{% endblock %}
-
-{% block content %}
-<div class="block">
-    <h1 class="title">{% blocktrans %}Books tagged "{{ tag.name }}"{% endblocktrans %}</h1>
-    {% include 'snippets/book_tiles.html' with books=books.all %}
-</div>
-{% endblock %}
-
-
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 0c61d1a2..34ebe0b6 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -57,12 +57,7 @@ class Book(View):
         )
         reviews_page = paginated.get_page(request.GET.get("page"))
 
-        user_tags = readthroughs = user_shelves = other_edition_shelves = []
         if request.user.is_authenticated:
-            user_tags = models.UserTag.objects.filter(
-                book=book, user=request.user
-            ).values_list("tag__identifier", flat=True)
-
             readthroughs = models.ReadThrough.objects.filter(
                 user=request.user,
                 book=book,
@@ -87,11 +82,9 @@ class Book(View):
             "review_count": reviews.count(),
             "ratings": reviews.filter(Q(content__isnull=True) | Q(content="")),
             "rating": reviews.aggregate(Avg("rating"))["rating__avg"],
-            "tags": models.UserTag.objects.filter(book=book),
             "lists": privacy_filter(
                 request.user, book.list_set.filter(listitem__approved=True)
             ),
-            "user_tags": user_tags,
             "user_shelves": user_shelves,
             "other_edition_shelves": other_edition_shelves,
             "readthroughs": readthroughs,

From f9c40aadd95e30ee852503d9cb975d7eeb7d86ff Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 22 Apr 2021 18:30:58 -0700
Subject: [PATCH 0924/1285] Python formatting

---
 .../migrations/0070_auto_20210423_0121.py     | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/bookwyrm/migrations/0070_auto_20210423_0121.py b/bookwyrm/migrations/0070_auto_20210423_0121.py
index 90540ae1..0b04c3ca 100644
--- a/bookwyrm/migrations/0070_auto_20210423_0121.py
+++ b/bookwyrm/migrations/0070_auto_20210423_0121.py
@@ -6,30 +6,30 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('bookwyrm', '0069_auto_20210422_1604'),
+        ("bookwyrm", "0069_auto_20210422_1604"),
     ]
 
     operations = [
         migrations.AlterUniqueTogether(
-            name='usertag',
+            name="usertag",
             unique_together=None,
         ),
         migrations.RemoveField(
-            model_name='usertag',
-            name='book',
+            model_name="usertag",
+            name="book",
         ),
         migrations.RemoveField(
-            model_name='usertag',
-            name='tag',
+            model_name="usertag",
+            name="tag",
         ),
         migrations.RemoveField(
-            model_name='usertag',
-            name='user',
+            model_name="usertag",
+            name="user",
         ),
         migrations.DeleteModel(
-            name='Tag',
+            name="Tag",
         ),
         migrations.DeleteModel(
-            name='UserTag',
+            name="UserTag",
         ),
     ]

From b457446f2ff69f850e927ae40e4bb025c3d9c260 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 22 Apr 2021 19:36:27 -0700
Subject: [PATCH 0925/1285] Don't save duplicate boosts

---
 bookwyrm/models/activitypub_mixin.py | 6 ++----
 bookwyrm/models/status.py            | 8 ++++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index 2e248fbe..02cfafc0 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -204,10 +204,8 @@ class ObjectMixin(ActivitypubMixin):
         created = created or not bool(self.id)
         # first off, we want to save normally no matter what
         super().save(*args, **kwargs)
-        if (
-            not broadcast
-            or hasattr(self, "status_type")
-            and self.status_type == "Announce"
+        if not broadcast or (
+            hasattr(self, "status_type") and self.status_type == "Announce"
         ):
             return
 
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index 360288e9..65bf71d2 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -351,6 +351,14 @@ class Boost(ActivityMixin, Status):
 
     def save(self, *args, **kwargs):
         """ save and notify """
+        # This constraint can't work as it would cross tables.
+        # class Meta:
+        #     unique_together = ('user', 'boosted_status')
+        if Boost.objects.filter(
+            boosted_status=self.boosted_status, user=self.user
+        ).exists():
+            return
+
         super().save(*args, **kwargs)
         if not self.boosted_status.user.local or self.boosted_status.user == self.user:
             return

From de19c7d7a6886a05e8d6761918e089ae5c8491d5 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Fri, 23 Apr 2021 18:38:33 +0200
Subject: [PATCH 0926/1285] Update status_header.html

---
 bookwyrm/templates/snippets/status/status_header.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html
index b833b92c..7b2a6f77 100644
--- a/bookwyrm/templates/snippets/status/status_header.html
+++ b/bookwyrm/templates/snippets/status/status_header.html
@@ -3,7 +3,7 @@
 {% load humanize %}
 
 <div class="media">
-    <figure class="media-left">
+    <figure class="media-left" aria-hidden="true">
         <a class="image is-48x48" href="{{ status.user.local_path }}">
             {% include 'snippets/avatar.html' with user=status.user ariaHide="true" medium="true" %}
         </a>    
@@ -16,6 +16,10 @@
                 itemscope
                 itemtype="https://schema.org/Person"
             >
+                {% if status.user.avatar %}
+                    <meta itemprop="image" content="/images/{{ status.user.avatar }}">
+                {% endif %}
+
                 <a
                     href="{{ status.user.local_path }}"
                     itemprop="url"

From 32e694032b2f4d24623da0d25db1e7744efc08c8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 23 Apr 2021 10:49:17 -0700
Subject: [PATCH 0927/1285] Fixes duplicate boost model verification

---
 bookwyrm/models/status.py                     |  2 +-
 .../tests/views/inbox/test_inbox_announce.py  | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index 65bf71d2..3784680f 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -356,7 +356,7 @@ class Boost(ActivityMixin, Status):
         #     unique_together = ('user', 'boosted_status')
         if Boost.objects.filter(
             boosted_status=self.boosted_status, user=self.user
-        ).exists():
+        ).exclude(id=self.id).exists():
             return
 
         super().save(*args, **kwargs)
diff --git a/bookwyrm/tests/views/inbox/test_inbox_announce.py b/bookwyrm/tests/views/inbox/test_inbox_announce.py
index 954d4e64..dbe4ec56 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_announce.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_announce.py
@@ -51,7 +51,7 @@ class InboxActivities(TestCase):
         models.SiteSettings.objects.create()
 
     @patch("bookwyrm.activitystreams.ActivityStream.add_status")
-    def test_handle_boost(self, _):
+    def test_boost(self, redis_mock):
         """ boost a status """
         self.assertEqual(models.Notification.objects.count(), 0)
         activity = {
@@ -66,16 +66,23 @@ class InboxActivities(TestCase):
         with patch("bookwyrm.models.status.Status.ignore_activity") as discarder:
             discarder.return_value = False
             views.inbox.activity_task(activity)
+
+        # boost added to redis activitystreams
+        self.assertTrue(redis_mock.called)
+
+        # boost created of correct status
         boost = models.Boost.objects.get()
         self.assertEqual(boost.boosted_status, self.status)
+
+        # notification sent to original poster
         notification = models.Notification.objects.get()
         self.assertEqual(notification.user, self.local_user)
         self.assertEqual(notification.related_status, self.status)
 
     @responses.activate
     @patch("bookwyrm.activitystreams.ActivityStream.add_status")
-    def test_handle_boost_remote_status(self, redis_mock):
-        """ boost a status """
+    def test_boost_remote_status(self, redis_mock):
+        """ boost a status from a remote server """
         work = models.Work.objects.create(title="work title")
         book = models.Edition.objects.create(
             title="Test",
@@ -123,7 +130,7 @@ class InboxActivities(TestCase):
         self.assertEqual(boost.boosted_status.comment.book, book)
 
     @responses.activate
-    def test_handle_discarded_boost(self):
+    def test_discarded_boost(self):
         """ test a boost of a mastodon status that will be discarded """
         status = models.Status(
             content="hi",
@@ -146,7 +153,7 @@ class InboxActivities(TestCase):
         views.inbox.activity_task(activity)
         self.assertEqual(models.Boost.objects.count(), 0)
 
-    def test_handle_unboost(self):
+    def test_unboost(self):
         """ undo a boost """
         with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
             boost = models.Boost.objects.create(
@@ -175,7 +182,7 @@ class InboxActivities(TestCase):
             self.assertTrue(redis_mock.called)
         self.assertFalse(models.Boost.objects.exists())
 
-    def test_handle_unboost_unknown_boost(self):
+    def test_unboost_unknown_boost(self):
         """ undo a boost """
         activity = {
             "type": "Undo",

From 79424f7bfb6b4315c440a95b83ec0ab5eb115f0c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 23 Apr 2021 10:56:17 -0700
Subject: [PATCH 0928/1285] Python formatting

---
 bookwyrm/models/status.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index 3784680f..0dee0b75 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -354,9 +354,11 @@ class Boost(ActivityMixin, Status):
         # This constraint can't work as it would cross tables.
         # class Meta:
         #     unique_together = ('user', 'boosted_status')
-        if Boost.objects.filter(
-            boosted_status=self.boosted_status, user=self.user
-        ).exclude(id=self.id).exists():
+        if (
+            Boost.objects.filter(boosted_status=self.boosted_status, user=self.user)
+            .exclude(id=self.id)
+            .exists()
+        ):
             return
 
         super().save(*args, **kwargs)

From c907b1ff091449b7d79c8c1a26ec594c81c6f32c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 23 Apr 2021 11:07:19 -0700
Subject: [PATCH 0929/1285] Test to replicate character encoding bug

---
 bookwyrm/tests/models/test_status_model.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py
index 4263c457..52d6608a 100644
--- a/bookwyrm/tests/models/test_status_model.py
+++ b/bookwyrm/tests/models/test_status_model.py
@@ -269,7 +269,7 @@ class Status(TestCase):
     def test_review_to_pure_activity(self, *_):
         """ subclass of the base model version with a "pure" serializer """
         status = models.Review.objects.create(
-            name="Review name",
+            name="Review's name",
             content="test content",
             rating=3.0,
             user=self.local_user,
@@ -280,7 +280,7 @@ class Status(TestCase):
         self.assertEqual(activity["type"], "Article")
         self.assertEqual(
             activity["name"],
-            'Review of "%s" (3 stars): Review name' % self.book.title,
+            'Review of "%s" (3 stars): Review\'s name' % self.book.title,
         )
         self.assertEqual(activity["content"], "test content")
         self.assertEqual(activity["attachment"][0].type, "Document")

From 607e98b33155adddea151f12bd9a938810eeb686 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 23 Apr 2021 11:53:45 -0700
Subject: [PATCH 0930/1285] Fixes character encoding error

---
 .../templates/snippets/generated_status/review_pure_name.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/snippets/generated_status/review_pure_name.html b/bookwyrm/templates/snippets/generated_status/review_pure_name.html
index 90a6936e..25960191 100644
--- a/bookwyrm/templates/snippets/generated_status/review_pure_name.html
+++ b/bookwyrm/templates/snippets/generated_status/review_pure_name.html
@@ -1,10 +1,10 @@
 {% load i18n %}
 {% if rating %}
 
-{% blocktrans with book_title=book.title display_rating=rating|floatformat:"0" review_title=name count counter=rating %}Review of "{{ book_title }}" ({{ display_rating }} star): {{ review_title }}{% plural %}Review of "{{ book_title }}" ({{ display_rating }} stars): {{ review_title }}{% endblocktrans %}
+{% blocktrans with book_title=book.title|safe display_rating=rating|floatformat:"0" review_title=name|safe count counter=rating %}Review of "{{ book_title }}" ({{ display_rating }} star): {{ review_title }}{% plural %}Review of "{{ book_title }}" ({{ display_rating }} stars): {{ review_title }}{% endblocktrans %}
 
 {% else %}
 
-{% blocktrans with book_title=book.title review_title=name %}Review of "{{ book_title }}": {{ review_title }}{% endblocktrans %}
+{% blocktrans with book_title=book.title|safe review_title=name|safe %}Review of "{{ book_title }}": {{ review_title }}{% endblocktrans %}
 
 {% endif %}

From d2b2065db8856c7e6b2b4381bfb358b6c1a41343 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 23 Apr 2021 13:32:58 -0700
Subject: [PATCH 0931/1285] Show user's book content

---
 bookwyrm/templates/book/book.html | 33 ++++++++++++++-
 bookwyrm/urls.py                  |  3 +-
 bookwyrm/views/books.py           | 67 +++++++++++++++++++------------
 3 files changed, 74 insertions(+), 29 deletions(-)

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index f1aaaf51..31c24532 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -246,7 +246,36 @@
     </div>
 
     <div class="block" id="reviews">
-        {% for review in reviews %}
+        {% if request.user.is_authenticated %}
+        <nav class="tabs">
+            <ul>
+                {% url 'book' book.id as tab_url %}
+                <li {% if tab_url == request.path %}class="is-active"{% endif %}>
+                    <a href="{{ tab_url }}">{% trans "Reviews" %}</a>
+                </li>
+                {% if user_statuses.review_count %}
+                {% url 'book-user-statuses' book.id 'review' as tab_url %}
+                <li {% if tab_url == request.path %}class="is-active"{% endif %}>
+                    <a href="{{ tab_url }}">{% trans "Your reviews" %} ({{ user_statuses.review_count }})</a>
+                </li>
+                {% endif %}
+                {% if user_statuses.comment_count %}
+                {% url 'book-user-statuses' book.id 'comment' as tab_url %}
+                <li {% if tab_url == request.path %}class="is-active"{% endif %}>
+                    <a href="{{ tab_url }}">{% trans "Your comments" %} ({{ user_statuses.comment_count }})</a>
+                </li>
+                {% endif %}
+                {% if user_statuses.quotation_count %}
+                {% url 'book-user-statuses' book.id 'quote' as tab_url %}
+                <li {% if tab_url == request.path %}class="is-active"{% endif %}>
+                    <a href="{{ tab_url }}">{% trans "Your quotes" %} ({{ user_statuses.quotation_count }})</a>
+                </li>
+                {% endif %}
+            </ul>
+        </nav>
+        {% endif %}
+
+        {% for review in statuses %}
             <div
                 class="block"
                 itemprop="review"
@@ -287,7 +316,7 @@
             {% endfor %}
         </div>
         <div class="block">
-            {% include 'snippets/pagination.html' with page=reviews path=book.local_path anchor="#reviews" %}
+            {% include 'snippets/pagination.html' with page=statuses path=book.local_path anchor="#reviews" %}
         </div>
     </div>
 </div>
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 3ad064b2..b85a81e0 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -260,7 +260,8 @@ urlpatterns = [
     re_path(r"^boost/(?P<status_id>\d+)/?$", views.Boost.as_view()),
     re_path(r"^unboost/(?P<status_id>\d+)/?$", views.Unboost.as_view()),
     # books
-    re_path(r"%s(.json)?/?$" % book_path, views.Book.as_view()),
+    re_path(r"%s(.json)?/?$" % book_path, views.Book.as_view(), name="book"),
+    re_path(r"%s/(?P<user_statuses>review|comment|quote)/?$" % book_path, views.Book.as_view(), name="book-user-statuses"),
     re_path(r"%s/edit/?$" % book_path, views.EditBook.as_view()),
     re_path(r"%s/confirm/?$" % book_path, views.ConfirmEditBook.as_view()),
     re_path(r"^create-book/?$", views.EditBook.as_view()),
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 34ebe0b6..67b3792e 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -28,7 +28,7 @@ from .helpers import is_api_request, get_edition, privacy_filter
 class Book(View):
     """ a book! this is the stuff """
 
-    def get(self, request, book_id):
+    def get(self, request, book_id, user_statuses=False):
         """ info about a book """
         try:
             book = models.Book.objects.select_subclasses().get(id=book_id)
@@ -40,22 +40,42 @@ class Book(View):
 
         if isinstance(book, models.Work):
             book = book.get_default_edition()
-        if not book:
+        if not book or not book.parent_work:
             return HttpResponseNotFound()
 
         work = book.parent_work
-        if not work:
-            return HttpResponseNotFound()
 
         # all reviews for the book
-        reviews = models.Review.objects.filter(book__in=work.editions.all())
-        reviews = privacy_filter(request.user, reviews)
+        reviews = privacy_filter(
+            request.user,
+            models.Review.objects.filter(book__in=work.editions.all())
+        )
 
         # the reviews to show
-        paginated = Paginator(
-            reviews.exclude(Q(content__isnull=True) | Q(content="")), PAGE_LENGTH
-        )
-        reviews_page = paginated.get_page(request.GET.get("page"))
+        if user_statuses and request.user.is_authenticated:
+            if user_statuses == 'review':
+                queryset = book.review_set
+            elif user_statuses == 'comment':
+                queryset = book.comment_set
+            else:
+                queryset = book.quotation_set
+            paginated = Paginator(
+                queryset.filter(user=request.user), PAGE_LENGTH
+            )
+        else:
+            paginated = Paginator(
+                reviews.exclude(Q(content__isnull=True) | Q(content="")), PAGE_LENGTH
+            )
+        data = {
+            "book": book,
+            "statuses": paginated.get_page(request.GET.get("page")),
+            "review_count": reviews.count(),
+            "ratings": reviews.filter(Q(content__isnull=True) | Q(content="")),
+            "rating": reviews.aggregate(Avg("rating"))["rating__avg"],
+            "lists": privacy_filter(
+                request.user, book.list_set.filter(listitem__approved=True)
+            ),
+        }
 
         if request.user.is_authenticated:
             readthroughs = models.ReadThrough.objects.filter(
@@ -67,29 +87,24 @@ class Book(View):
                 readthrough.progress_updates = (
                     readthrough.progressupdate_set.all().order_by("-updated_date")
                 )
+            data["readthroughs"] = readthroughs
 
-            user_shelves = models.ShelfBook.objects.filter(user=request.user, book=book)
+            data["user_shelves"] = models.ShelfBook.objects.filter(
+                user=request.user, book=book
+            )
 
-            other_edition_shelves = models.ShelfBook.objects.filter(
+            data["other_edition_shelves"] = models.ShelfBook.objects.filter(
                 ~Q(book=book),
                 user=request.user,
                 book__parent_work=book.parent_work,
             )
 
-        data = {
-            "book": book,
-            "reviews": reviews_page,
-            "review_count": reviews.count(),
-            "ratings": reviews.filter(Q(content__isnull=True) | Q(content="")),
-            "rating": reviews.aggregate(Avg("rating"))["rating__avg"],
-            "lists": privacy_filter(
-                request.user, book.list_set.filter(listitem__approved=True)
-            ),
-            "user_shelves": user_shelves,
-            "other_edition_shelves": other_edition_shelves,
-            "readthroughs": readthroughs,
-            "path": "/book/%s" % book_id,
-        }
+            data["user_statuses"] = {
+                "review_count": book.review_set.filter(user=request.user).count(),
+                "comment_count": book.comment_set.filter(user=request.user).count(),
+                "quotation_count": book.quotation_set.filter(user=request.user).count(),
+            }
+
         return TemplateResponse(request, "book/book.html", data)
 
 

From 888930f891c21b7ca6b11080e89dc9552ec8e9e1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 23 Apr 2021 13:35:12 -0700
Subject: [PATCH 0932/1285] User request path for pagination

---
 bookwyrm/templates/book/book.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index 31c24532..cfa400d6 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -316,7 +316,7 @@
             {% endfor %}
         </div>
         <div class="block">
-            {% include 'snippets/pagination.html' with page=statuses path=book.local_path anchor="#reviews" %}
+            {% include 'snippets/pagination.html' with page=statuses path=request.path anchor="#reviews" %}
         </div>
     </div>
 </div>

From 126594ec4935f1f6a863560f200371ae04c33d8e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 23 Apr 2021 13:46:22 -0700
Subject: [PATCH 0933/1285] Cleans up queryset declarations

---
 bookwyrm/templates/book/book.html |  2 +-
 bookwyrm/urls.py                  |  6 +++++-
 bookwyrm/views/books.py           | 17 +++++++----------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index cfa400d6..97f105bf 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -251,7 +251,7 @@
             <ul>
                 {% url 'book' book.id as tab_url %}
                 <li {% if tab_url == request.path %}class="is-active"{% endif %}>
-                    <a href="{{ tab_url }}">{% trans "Reviews" %}</a>
+                    <a href="{{ tab_url }}">{% trans "Reviews" %} ({{ review_count }})</a>
                 </li>
                 {% if user_statuses.review_count %}
                 {% url 'book-user-statuses' book.id 'review' as tab_url %}
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index b85a81e0..53ceeaa8 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -261,7 +261,11 @@ urlpatterns = [
     re_path(r"^unboost/(?P<status_id>\d+)/?$", views.Unboost.as_view()),
     # books
     re_path(r"%s(.json)?/?$" % book_path, views.Book.as_view(), name="book"),
-    re_path(r"%s/(?P<user_statuses>review|comment|quote)/?$" % book_path, views.Book.as_view(), name="book-user-statuses"),
+    re_path(
+        r"%s/(?P<user_statuses>review|comment|quote)/?$" % book_path,
+        views.Book.as_view(),
+        name="book-user-statuses",
+    ),
     re_path(r"%s/edit/?$" % book_path, views.EditBook.as_view()),
     re_path(r"%s/confirm/?$" % book_path, views.ConfirmEditBook.as_view()),
     re_path(r"^create-book/?$", views.EditBook.as_view()),
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 67b3792e..829408a8 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -47,25 +47,22 @@ class Book(View):
 
         # all reviews for the book
         reviews = privacy_filter(
-            request.user,
-            models.Review.objects.filter(book__in=work.editions.all())
+            request.user, models.Review.objects.filter(book__in=work.editions.all())
         )
 
         # the reviews to show
         if user_statuses and request.user.is_authenticated:
-            if user_statuses == 'review':
+            if user_statuses == "review":
                 queryset = book.review_set
-            elif user_statuses == 'comment':
+            elif user_statuses == "comment":
                 queryset = book.comment_set
             else:
                 queryset = book.quotation_set
-            paginated = Paginator(
-                queryset.filter(user=request.user), PAGE_LENGTH
-            )
+            queryset = queryset.filter(user=request.user)
         else:
-            paginated = Paginator(
-                reviews.exclude(Q(content__isnull=True) | Q(content="")), PAGE_LENGTH
-            )
+            queryset = reviews.exclude(Q(content__isnull=True) | Q(content=""))
+        paginated = Paginator(queryset, PAGE_LENGTH)
+
         data = {
             "book": book,
             "statuses": paginated.get_page(request.GET.get("page")),

From 9ba0aec6d914137e8b12b3250279f5ae2119763b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 23 Apr 2021 14:58:48 -0700
Subject: [PATCH 0934/1285] Show subtitles when titles are very short

---
 bookwyrm/templates/snippets/book_titleby.html         | 5 +++--
 bookwyrm/templates/snippets/status/status_header.html | 4 ++--
 bookwyrm/templatetags/bookwyrm_tags.py                | 8 ++++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/snippets/book_titleby.html b/bookwyrm/templates/snippets/book_titleby.html
index e561a8a3..80127fb7 100644
--- a/bookwyrm/templates/snippets/book_titleby.html
+++ b/bookwyrm/templates/snippets/book_titleby.html
@@ -1,7 +1,8 @@
 {% load i18n %}
+{% load bookwyrm_tags %}
 {% if book.authors %}
-{% blocktrans with path=book.local_path title=book.title %}<a href="{{ path }}">{{ title }}</a> by {% endblocktrans %}{% include 'snippets/authors.html' with book=book %}
+{% blocktrans with path=book.local_path title=book|title %}<a href="{{ path }}">{{ title }}</a> by {% endblocktrans %}{% include 'snippets/authors.html' with book=book %}
 {% else %}
-<a href="{{ book.local_path }}">{{ book.title }}</a>
+<a href="{{ book.local_path }}">{{ book|title }}</a>
 {% endif %}
 
diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html
index 0fa74ddd..7a04b44a 100644
--- a/bookwyrm/templates/snippets/status/status_header.html
+++ b/bookwyrm/templates/snippets/status/status_header.html
@@ -43,7 +43,7 @@
 
 {% if status.book %}
     {% if status.status_type == 'GeneratedNote' or status.status_type == 'Rating' %}
-        <a href="/book/{{ status.book.id }}">{{ status.book.title }}</a>{% if status.status_type == 'Rating' %}:
+        <a href="/book/{{ status.book.id }}">{{ status.book|title }}</a>{% if status.status_type == 'Rating' %}:
         <span
             itemprop="reviewRating"
             itemscope
@@ -62,7 +62,7 @@
         {% include 'snippets/book_titleby.html' with book=status.book %}
     {% endif %}
 {% elif status.mention_books %}
-    <a href="/book/{{ status.mention_books.first.id }}">{{ status.mention_books.first.title }}</a>
+    <a href="/book/{{ status.mention_books.first.id }}">{{ status.mention_books.first|title }}</a>
 {% endif %}
 
 {% if status.progress %}
diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index 649a0dfa..0180d1e0 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -167,6 +167,14 @@ def get_next_shelf(current_shelf):
         return "read"
     return "to-read"
 
+@register.filter(name="title")
+def get_title(book):
+    """ display the subtitle if the title is short """
+    title = book.title
+    if len(title) < 6 and book.subtitle:
+        title = "{:s}: {:s}".format(title, book.subtitle)
+    return title
+
 
 @register.simple_tag(takes_context=False)
 def related_status(notification):

From a49925916373cf9f4b791746ee6f4240ccc5b93f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 23 Apr 2021 15:01:35 -0700
Subject: [PATCH 0935/1285] Fixes python formatting

---
 bookwyrm/templatetags/bookwyrm_tags.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index 0180d1e0..2d95904f 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -167,6 +167,7 @@ def get_next_shelf(current_shelf):
         return "read"
     return "to-read"
 
+
 @register.filter(name="title")
 def get_title(book):
     """ display the subtitle if the title is short """

From 179ba241155592045b8cb9b1674d9c194c2f8a4f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 23 Apr 2021 15:29:55 -0700
Subject: [PATCH 0936/1285] Safely handle invalid book

---
 bookwyrm/templatetags/bookwyrm_tags.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index 2d95904f..bd14a410 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -171,6 +171,8 @@ def get_next_shelf(current_shelf):
 @register.filter(name="title")
 def get_title(book):
     """ display the subtitle if the title is short """
+    if not book:
+        return ""
     title = book.title
     if len(title) < 6 and book.subtitle:
         title = "{:s}: {:s}".format(title, book.subtitle)

From 7f0b3184a1e7c2482c302d907345ac0b098a6083 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sat, 24 Apr 2021 12:48:55 +0200
Subject: [PATCH 0937/1285] cover: Use book-cover as component:

- Avoid specifying context-dependent values in CSS for components. Those values can be defined by the context calling the component.
- Use `<figure>` with optional caption.
- Reduce redundant markup.
- Allow more variables to be passed to the book-cover (image path and class for the container).
- Hide the book cover to screen readers.
---
 bookwyrm/static/css/bookwyrm.css            | 26 ++++-----
 bookwyrm/templates/discover/large-book.html | 47 ++++++++++-----
 bookwyrm/templates/discover/small-book.html | 24 ++++++--
 bookwyrm/templates/snippets/book_cover.html | 63 ++++++++++++++-------
 4 files changed, 105 insertions(+), 55 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index b4abd690..71947aea 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -117,14 +117,14 @@ body {
 }
 
 /** Book covers
+ *
+ * The book cover takes the full width of its ancestor’s layout.
  ******************************************************************************/
-
 .cover-container {
-    height: 250px;
-    width: max-content;
-    max-width: 250px;
+    position: relative;
 }
 
+/*
 .cover-container.is-large {
     height: max-content;
     max-width: 330px;
@@ -153,26 +153,25 @@ body {
         height: 100px;
     }
 }
+*/
 
 .book-cover {
-    height: 100%;
-    object-fit: scale-down;
+    display: block;
+    width: 100%;
+
+    /* Usweful when stretching under-sized images. */
+    image-rendering: optimizeQuality;
 }
 
-.no-cover {
-    position: relative;
-    white-space: normal;
-}
-
-.no-cover div {
+.no-cover .cover_caption {
     position: absolute;
     padding: 1em;
     color: white;
     top: 0;
     left: 0;
-    text-align: center;
 }
 
+/*
 .cover-container.is-medium .no-cover div {
     font-size: 0.9em;
     padding: 0.3em;
@@ -182,6 +181,7 @@ body {
     font-size: 0.7em;
     padding: 0.1em;
 }
+*/
 
 /** Avatars
  ******************************************************************************/
diff --git a/bookwyrm/templates/discover/large-book.html b/bookwyrm/templates/discover/large-book.html
index 44b91b94..303d7318 100644
--- a/bookwyrm/templates/discover/large-book.html
+++ b/bookwyrm/templates/discover/large-book.html
@@ -1,19 +1,36 @@
+
 {% load bookwyrm_tags %}
 {% load i18n %}
+
 {% if book %}
-<div class="columns">
-    <div class="column is-narrow">
-        <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book size="large" %}</a>
-        {% include 'snippets/stars.html' with rating=book|rating:request.user %}
-    </div>
-    <div class="column">
-        <h3 class="title is-5"><a href="/book/{{ book.id }}">{{ book.title }}</a></h3>
-        {% if book.authors %}
-        <p class="subtitle is-5">{% trans "by" %} {% include 'snippets/authors.html' with book=book %}</p>
-        {% endif %}
-        {% if book|book_description %}
-        <blockquote class="content">{{ book|book_description|to_markdown|safe|truncatewords_html:50 }}</blockquote>
-        {% endif %}
-    </div>
-</div>
+    {% with book=book %}
+        <div class="columns">
+            <div class="column">
+                <a
+                    href="{{ book.local_path }}"
+                >{% include 'snippets/book_cover.html' with size="large" %}</a>
+
+                {% include 'snippets/stars.html' with rating=book|rating:request.user %}
+            </div>
+
+            <div class="column">
+                <h3 class="title is-5">
+                    <a href="/book/{{ book.id }}">{{ book.title }}</a>
+                </h3>
+
+                {% if book.authors %}
+                    <p class="subtitle is-5">
+                        {% trans "by" %}
+                        {% include 'snippets/authors.html' %}
+                    </p>
+                {% endif %}
+
+                {% if book|book_description %}
+                    <blockquote class="content">
+                        {{ book|book_description|to_markdown|safe|truncatewords_html:50 }}
+                    </blockquote>
+                {% endif %}
+            </div>
+        </div>
+    {% endwith %}
 {% endif %}
diff --git a/bookwyrm/templates/discover/small-book.html b/bookwyrm/templates/discover/small-book.html
index 6df27746..f80a2690 100644
--- a/bookwyrm/templates/discover/small-book.html
+++ b/bookwyrm/templates/discover/small-book.html
@@ -1,12 +1,24 @@
+
 {% load bookwyrm_tags %}
 {% load i18n %}
+
 {% if book %}
-<a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book %}</a>
-{% include 'snippets/stars.html' with rating=book|rating:request.user %}
+    {% with book=book %}
+        <a
+            href="{{ book.local_path }}"
+        >{% include 'snippets/book_cover.html' with size="small" %}</a>
 
-<h3 class="title is-6"><a href="/book/{{ book.id }}">{{ book.title }}</a></h3>
-{% if book.authors %}
-<p class="subtitle is-6">{% trans "by" %} {% include 'snippets/authors.html' with book=book %}</p>
-{% endif %}
+        {% include 'snippets/stars.html' with rating=book|rating:request.user %}
 
+        <h3 class="title is-6">
+            <a href="/book/{{ book.id }}">{{ book.title }}</a>
+        </h3>
+
+        {% if book.authors %}
+            <p class="subtitle is-6">
+                {% trans "by" %}
+                {% include 'snippets/authors.html' %}
+            </p>
+        {% endif %}
+    {% endwith %}
 {% endif %}
diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index ce47819e..f26974d2 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -3,27 +3,48 @@
 {% load bookwyrm_tags %}
 {% load i18n %}
 
-<div class="cover-container is-{{ size }}">
-    {% if book.cover %}
-        <img
-            class="book-cover"
-            src="/images/{{ book.cover }}"
-            alt="{{ book.alt_text }}"
-            title="{{ book.alt_text }}"
-            itemprop="thumbnailUrl"
-        >
-    {% else %}
-        <div class="no-cover book-cover">
-            <img
-                class="book-cover"
-                src="/static/images/no_cover.jpg"
-                alt="{% trans "No cover" %}"
-            >
+<figure
+    class="
+        cover-container
+        is-flex
+        is-align-items-center
 
-            <div>
-                <p>{{ book.alt_text }}</p>
-            </div>
-        </div>
+        {% if not book.cover %}
+            no-cover
+        {% endif %}
+
+        {% if size %}
+            is-{{ size }}
+        {% endif %}
+
+        {% if container_class %}
+            {{ container_class }}
+        {% endif %}
+    "
+    aria-hidden="true"
+
+>
+    <img
+        class="book-cover"
+
+        {% if book.cover %}
+            src="{% if img_path is None %}/images/{% else %}{{ img_path }}{% endif %}{{ book.cover }}"
+            itemprop="thumbnailUrl"
+
+            {% if book.alt_text %}
+                alt="{{ book.alt_text }}"
+                title="{{ book.alt_text }}"
+            {% endif %}
+        {% else %}
+            src="/static/images/no_cover.jpg"
+            alt="{% trans "No cover" %}"
+        {% endif %}
+    >
+
+    {% if not book.cover and book.alt_text %}
+        <figcaption class="cover_caption">
+            <p>{{ book.alt_text }}</p>
+        </figcaption>
     {% endif %}
-</div>
+</figure>
 {% endspaceless %}

From 9ea91d8e7c4b4a26d27c2023948e9240106a5b77 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sat, 24 Apr 2021 12:56:38 +0200
Subject: [PATCH 0938/1285] cover: Search layout: Reduce padding around covers.

---
 bookwyrm/templates/search_results.html        |  2 +-
 .../snippets/search_result_text.html          | 47 ++++++++++---------
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/bookwyrm/templates/search_results.html b/bookwyrm/templates/search_results.html
index 4c9c23da..cb1fae39 100644
--- a/bookwyrm/templates/search_results.html
+++ b/bookwyrm/templates/search_results.html
@@ -49,7 +49,7 @@
 
                 <ul>
                 {% for result in result_set.results %}
-                    <li class="pb-4">
+                    <li class="mb-5">
                         {% include 'snippets/search_result_text.html' with result=result remote_result=True %}
                     </li>
                 {% endfor %}
diff --git a/bookwyrm/templates/snippets/search_result_text.html b/bookwyrm/templates/snippets/search_result_text.html
index 059b8e7e..e46dbbeb 100644
--- a/bookwyrm/templates/snippets/search_result_text.html
+++ b/bookwyrm/templates/snippets/search_result_text.html
@@ -1,34 +1,39 @@
 {% load i18n %}
-<div class="columns is-mobile">
-    <div class="cover-container is-small column is-2">
-    {% if result.cover %}
-        <img src="{{ result.cover }}" class="book-cover" aria-hidden="true">
-    {% else %}
-        <div class="no-cover book-cover">
-            <img class="book-cover" src="/static/images/no_cover.jpg" aria-hidden="true">
-            <div>
-                <p>{% trans "No cover" %}</p>
-            </div>
-        </div>
-    {% endif %}
-    </div>
+<div class="columns is-mobile is-gapless">
+    {% include 'snippets/book_cover.html' with book=result container_class='column' img_path=false %}
 
-    <div class="column">
+    <div class="column is-10 ml-3">
         <p>
             <strong>
-                <a href="{{ result.key }}"{% if remote_result %} rel=�noopener� target="_blank"{% endif %}>{{ result.title }}</a>
+                <a
+                    href="{{ result.key }}"
+
+                    {% if remote_result %}
+                        rel=�noopener�
+                        target="_blank"
+                    {% endif %}
+                >{{ result.title }}</a>
             </strong>
+
             {% if result.author %}
-            {% blocktrans with author=result.author %}by {{ author }}{% endblocktrans %}{% endif %}{% if result.year %} ({{ result.year }})
+                {% blocktrans with author=result.author %}by {{ author }}{% endblocktrans %}
+            {% endif %}
+
+            {% if result.year %}
+                ({{ result.year }})
             {% endif %}
         </p>
 
         {% if remote_result %}
-        <form action="/resolve-book" method="POST">
-            {% csrf_token %}
-            <input type="hidden" name="remote_id" value="{{ result.key }}">
-            <button type="submit" class="button is-small is-link">{% trans "Import book" %}</button>
-        </form>
+            <form class="mt-1" action="/resolve-book" method="post">
+                {% csrf_token %}
+
+                <input type="hidden" name="remote_id" value="{{ result.key }}">
+
+                <button type="submit" class="button is-small is-link">
+                    {% trans "Import book" %}
+                </button>
+            </form>
         {% endif %}
     </div>
 </div>

From 32fb06c9e63cb0f46b6e196127b895d7f978f4c2 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sat, 24 Apr 2021 13:23:03 +0200
Subject: [PATCH 0939/1285] Prevent stars from wrapping on multiple lines.

---
 bookwyrm/static/css/bookwyrm.css | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index b4abd690..f2921944 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -85,6 +85,13 @@ body {
     }
 }
 
+/** Stars
+ ******************************************************************************/
+
+.stars {
+    white-space: nowrap;
+}
+
 /** Stars in a review form
  *
  * Specificity makes hovering taking over checked inputs.

From 75a69988e412f439e85229bbd3c4faa0487bee5d Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sat, 24 Apr 2021 14:24:25 +0200
Subject: [PATCH 0940/1285] cover: List:

- Reduce Padding around covers.
- Remove `content` which is applying too extensive default styles.
---
 bookwyrm/templates/lists/list.html | 70 ++++++++++++++++++------------
 1 file changed, 42 insertions(+), 28 deletions(-)

diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index a9f8e5c0..f6c6f9f5 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -18,18 +18,29 @@
         {% else %}
         <ol start="{{ items.start_index }}">
         {% for item in items %}
-            <li class="block pb-3">
+            <li class="block mb-5">
                 <div class="card">
-                    <div class="card-content columns p-0 pr-2 mb-0 is-mobile">
-                        <div class="column is-narrow pt-0 pb-0">
-                            <a href="{{ item.book.local_path }}">{% include 'snippets/book_cover.html' with book=item.book size="medium" %}</a>
+                    {% with book=item.book %}
+                        <div
+                            class="
+                                card-content p-0 mb-0
+                                columns is-mobile is-gapless
+                            "
+                        >
+                            <div class="column">
+                                <a href="{{ item.book.local_path }}" aria-hidden="true">
+                                    {% include 'snippets/book_cover.html' %}
+                                </a>
+                            </div>
+
+                            <div class="column is-9-mobile is-10-tablet ml-3">
+                                <span>{% include 'snippets/book_titleby.html' %}</span>
+                                {% include 'snippets/stars.html' with rating=item.book|rating:request.user %}
+                                {% include 'snippets/shelve_button/shelve_button.html' %}
+                            </div>
                         </div>
-                        <div class="column is-flex-direction-column is-align-items-self-start">
-                            <span>{% include 'snippets/book_titleby.html' with book=item.book %}</span>
-                            {% include 'snippets/stars.html' with rating=item.book|rating:request.user %}
-                            {% include 'snippets/shelve_button/shelve_button.html' with book=item.book %}
-                        </div>
-                    </div>
+                    {% endwith %}
+
                     <div class="card-footer has-background-white-bis is-align-items-baseline">
                         <div class="card-footer-item">
                             <div>
@@ -66,7 +77,7 @@
         {% include "snippets/pagination.html" with page=items %}
     </section>
 
-    <section class="column is-one-quarter content">
+    <section class="column is-one-quarter">
         <h2>{% trans "Sort List" %}</h2>
         <form name="sort" action="{% url 'list' list.id %}" method="GET" class="block">
             <label class="label" for="id_sort_by">{% trans "Sort By" %}</label>
@@ -108,24 +119,27 @@
         <p>{% trans "No books found" %}</p>
         {% endif %}
         {% endif %}
-        {% for book in suggested_books %}
-        {% if book %}
-        <div class="block columns is-mobile">
-            <div class="column is-narrow">
-                <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book size="small" %}</a>
-            </div>
-            <div class="column">
-                <p>{% include 'snippets/book_titleby.html' with book=book %}</p>
-                <form name="add-book" method="post" action="{% url 'list-add-book' %}">
-                    {% csrf_token %}
-                    <input type="hidden" name="book" value="{{ book.id }}">
-                    <input type="hidden" name="list" value="{{ list.id }}">
-                    <button type="submit" class="button is-small is-link">{% if list.curation == 'open' or request.user == list.user %}{% trans "Add" %}{% else %}{% trans "Suggest" %}{% endif %}</button>
-                </form>
-            </div>
-        </div>
+
+        {% if suggested_books|length > 0 %}
+            {% for book in suggested_books %}
+                <div class="columns is-mobile is-gapless">
+                    <a class="column" href="{{ book.local_path }}" aria-hidden="true">
+                        {% include 'snippets/book_cover.html' with book=book %}
+                    </a>
+
+                    <div class="column is-9-mobile is-8-tablet ml-3">
+                        <p>{% include 'snippets/book_titleby.html' with book=book %}</p>
+
+                        <form class="mt-1" name="add-book" method="post" action="{% url 'list-add-book' %}">
+                            {% csrf_token %}
+                            <input type="hidden" name="book" value="{{ book.id }}">
+                            <input type="hidden" name="list" value="{{ list.id }}">
+                            <button type="submit" class="button is-small is-link">{% if list.curation == 'open' or request.user == list.user %}{% trans "Add" %}{% else %}{% trans "Suggest" %}{% endif %}</button>
+                        </form>
+                    </div>
+                </div>
+            {% endfor %}
         {% endif %}
-        {% endfor %}
     {% endif %}
     </section>
 </div>

From 783cc6edf0470f2da21cc16c1e78f1d30c731182 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sat, 24 Apr 2021 15:49:30 +0200
Subject: [PATCH 0941/1285] cover: List curation:

- Reduce Padding around covers.
- Remove `content` which is applying too extensive default styles.
- Style headings.
- Replace table with definition list.
- Clip cover container to avoid caption overflowing.
---
 bookwyrm/templates/lists/curate.html        | 100 ++++++++++++--------
 bookwyrm/templates/snippets/book_cover.html |   1 +
 2 files changed, 62 insertions(+), 39 deletions(-)

diff --git a/bookwyrm/templates/lists/curate.html b/bookwyrm/templates/lists/curate.html
index f4ee147a..995ba161 100644
--- a/bookwyrm/templates/lists/curate.html
+++ b/bookwyrm/templates/lists/curate.html
@@ -2,49 +2,71 @@
 {% load i18n %}
 {% block panel %}
 
-<section class="content block">
-    <h2>{% trans "Pending Books" %}</h2>
-    <p><a href="{% url 'list' list.id %}">{% trans "Go to list" %}</a></p>
+<section class="block">
+    <div class="columns is-mobile is-multiline is-align-items-baseline">
+        <div class="column is-narrow">
+            <h2 class="title is-4">{% trans "Pending Books" %}</h2>
+        </div>
+
+        <p class="column is-narrow"><a href="{% url 'list' list.id %}">{% trans "Go to list" %}</a></p>
+    </div>
+
     {% if not pending.exists %}
-    <p>{% trans "You're all set!" %}</p>
+        <p>{% trans "You're all set!" %}</p>
     {% else %}
-    <table class="table is-striped">
-        <tr>
-            <th></th>
-            <th>{% trans "Book" %}</th>
-            <th>{% trans "Suggested by" %}</th>
-            <th></th>
-        </tr>
+
+    <dl>
         {% for item in pending %}
-        <tr>
-            <td>
-                <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=item.book size="small" %}</a>
-            </td>
-            <td>
-                {% include 'snippets/book_titleby.html' with book=item.book %}
-            </td>
-            <td>
-                <a href="{{ item.user.local_path }}">{{ item.user.display_name }}</a>
-            </td>
-            <td>
-                <div class="field has-addons">
-                    <form class="control" method="POST" action="{% url 'list-curate' list.id %}">
-                        {% csrf_token %}
-                        <input type="hidden" name="item" value="{{ item.id }}">
-                        <input type="hidden" name="approved" value="true">
-                        <button class="button">{% trans "Approve" %}</button>
-                    </form>
-                    <form class="control" method="POST" action="{% url 'list-curate' list.id %}">
-                        {% csrf_token %}
-                        <input type="hidden" name="item" value="{{ item.id }}">
-                        <input type="hidden" name="approved" value="false">
-                        <button class="button is-danger is-light">{% trans "Discard" %}</button>
-                    </div>
-                </form>
-            </td>
-        </tr>
+            {% with book=item.book %}
+                <div
+                    class="
+                        columns is-gapless
+                        is-vcentered is-justify-content-space-between
+                        mb-6
+                    "
+                >
+                    <dt class="column is-5-tablet is-6-desktop">
+                        <div class="columns is-mobile is-gapless is-vcentered">
+                            <a
+                                class="column"
+                                href="{{ book.local_path }}"
+                                aria-hidden="true"
+                            >
+                                {% include 'snippets/book_cover.html' with size="small" %}
+                            </a>
+
+                            <div class="column is-9-mobile is-10-tablet ml-3">
+                                {% include 'snippets/book_titleby.html' %}
+                            </div>
+                        </div>
+                    </dt>
+
+                    <dd class="column is-3-tablet is-3-desktop my-3">
+                        {% trans "Suggested by" %}
+
+                        <a href="{{ item.user.local_path }}">
+                            {{ item.user.display_name }}
+                        </a>
+                    </dd>
+
+                    <dd class="column is-narrow field has-addons">
+                        <form class="control" method="POST" action="{% url 'list-curate' list.id %}">
+                            {% csrf_token %}
+                            <input type="hidden" name="item" value="{{ item.id }}">
+                            <input type="hidden" name="approved" value="true">
+                            <button class="button">{% trans "Approve" %}</button>
+                        </form>
+                        <form class="control" method="POST" action="{% url 'list-curate' list.id %}">
+                            {% csrf_token %}
+                            <input type="hidden" name="item" value="{{ item.id }}">
+                            <input type="hidden" name="approved" value="false">
+                            <button class="button is-danger is-light">{% trans "Discard" %}</button>
+                        </form>
+                    </dd>
+                </div>
+            {% endwith %}
         {% endfor %}
-    </table>
+    </dl>
     {% endif %}
 </section>
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index f26974d2..b1166f7f 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -6,6 +6,7 @@
 <figure
     class="
         cover-container
+        is-clipped
         is-flex
         is-align-items-center
 

From 72d92343aa421616d956c3bdd6cbcd15563efba8 Mon Sep 17 00:00:00 2001
From: GuDzpoz <GuDzpoz@live.com>
Date: Sat, 24 Apr 2021 22:32:04 +0800
Subject: [PATCH 0942/1285] `zh-cn` should be `zh-hans`

---
 bookwyrm/settings.py                            |   2 +-
 locale/{zh_CN => zh_Hans}/LC_MESSAGES/django.mo | Bin
 locale/{zh_CN => zh_Hans}/LC_MESSAGES/django.po |   0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename locale/{zh_CN => zh_Hans}/LC_MESSAGES/django.mo (100%)
 rename locale/{zh_CN => zh_Hans}/LC_MESSAGES/django.po (100%)

diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 7ea8c595..fb5488e7 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -153,7 +153,7 @@ LANGUAGES = [
     ("de-de", _("German")),
     ("es", _("Spanish")),
     ("fr-fr", _("French")),
-    ("zh-cn", _("Simplified Chinese")),
+    ("zh-hans", _("Simplified Chinese")),
 ]
 
 
diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_Hans/LC_MESSAGES/django.mo
similarity index 100%
rename from locale/zh_CN/LC_MESSAGES/django.mo
rename to locale/zh_Hans/LC_MESSAGES/django.mo
diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
similarity index 100%
rename from locale/zh_CN/LC_MESSAGES/django.po
rename to locale/zh_Hans/LC_MESSAGES/django.po

From 59ed49f082549f01d691cbfbd714ed1b9ba321cf Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Sat, 24 Apr 2021 20:39:54 +0200
Subject: [PATCH 0943/1285] Update status_header.html

---
 bookwyrm/templates/snippets/status/status_header.html | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html
index 49353cbd..6d94bbe2 100644
--- a/bookwyrm/templates/snippets/status/status_header.html
+++ b/bookwyrm/templates/snippets/status/status_header.html
@@ -41,6 +41,10 @@
             {% elif status.reply_parent %}
                 {% with parent_status=status|parent %}
 
+               {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to <a href="{{ user_path }}">{{ username}}'s</a> <a href="{{ status_path }}">status</a>{% endblocktrans %}
+               {% endwith %}
+           {% endif %}
+
         {% if status.book %}
             {% if status.status_type == 'GeneratedNote' or status.status_type == 'Rating' %}
                 <a href="/book/{{ status.book.id }}">{{ status.book|title }}</a>{% if status.status_type == 'Rating' %}:
@@ -52,12 +56,9 @@
                 <span class="is-hidden" {{ rating_type }}>
                     <meta itemprop="ratingValue" content="{{ status.rating|floatformat }}">
 
-                        {% endwith %}
-                    {% endif %}
-
                     {% if status.book %}
                         {% if status.status_type == 'GeneratedNote' or status.status_type == 'Rating' %}
-                            <a href="/book/{{ status.book.id }}">{{ status.book.title }}</a>{% if status.status_type == 'Rating' %}:
+                            <a href="/book/{{ status.book.id }}">{{ status.book|title }}</a>{% if status.status_type == 'Rating' %}:
                             <span
                                 itemprop="reviewRating"
                                 itemscope

From 04e1806482f77a703a722286c8fc91d07ee13b78 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Sat, 24 Apr 2021 20:47:39 +0200
Subject: [PATCH 0944/1285] Update status_header.html

---
 .../snippets/status/status_header.html        | 94 +++++++++----------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html
index 6d94bbe2..3b46b9ce 100644
--- a/bookwyrm/templates/snippets/status/status_header.html
+++ b/bookwyrm/templates/snippets/status/status_header.html
@@ -41,54 +41,54 @@
             {% elif status.reply_parent %}
                 {% with parent_status=status|parent %}
 
-               {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to <a href="{{ user_path }}">{{ username}}'s</a> <a href="{{ status_path }}">status</a>{% endblocktrans %}
-               {% endwith %}
-           {% endif %}
-
-        {% if status.book %}
-            {% if status.status_type == 'GeneratedNote' or status.status_type == 'Rating' %}
-                <a href="/book/{{ status.book.id }}">{{ status.book|title }}</a>{% if status.status_type == 'Rating' %}:
-                <span
-                    itemprop="reviewRating"
-                    itemscope
-                    itemtype="https://schema.org/Rating"
-                >
-                <span class="is-hidden" {{ rating_type }}>
-                    <meta itemprop="ratingValue" content="{{ status.rating|floatformat }}">
-
-                    {% if status.book %}
-                        {% if status.status_type == 'GeneratedNote' or status.status_type == 'Rating' %}
-                            <a href="/book/{{ status.book.id }}">{{ status.book|title }}</a>{% if status.status_type == 'Rating' %}:
-                            <span
-                                itemprop="reviewRating"
-                                itemscope
-                                itemtype="https://schema.org/Rating"
-                            >
-                            <span class="is-hidden" {{ rating_type }}>
-                                <meta itemprop="ratingValue" content="{{ status.rating|floatformat }}">
-
-                                    {# @todo Is it possible to not hard-code the value? #}
-                                    <meta itemprop="bestRating" content="5">
-                            </span>
-
-                            {% include 'snippets/stars.html' with rating=status.rating %}
-                            {% endif %}
-                        {% else %}
-                            {% include 'snippets/book_titleby.html' with book=status.book %}
-                        {% endif %}
-                    {% elif status.mention_books %}
-                        <a href="/book/{{ status.mention_books.first.id }}">
-                            {{ status.mention_books.first.title }}
-                        </a>
-                    {% endif %}
-                {% include 'snippets/stars.html' with rating=status.rating %}
-                {% endif %}
-            {% else %}
-                {% include 'snippets/book_titleby.html' with book=status.book %}
+                {% blocktrans with username=parent_status.user.display_name user_path=parent_status.user.local_path status_path=parent_status.local_path %}replied to <a href="{{ user_path }}">{{ username}}'s</a> <a href="{{ status_path }}">status</a>{% endblocktrans %}
+                {% endwith %}
+            {% endif %}
+
+            {% if status.book %}
+                {% if status.status_type == 'GeneratedNote' or status.status_type == 'Rating' %}
+                    <a href="/book/{{ status.book.id }}">{{ status.book|title }}</a>{% if status.status_type == 'Rating' %}:
+                    <span
+                        itemprop="reviewRating"
+                        itemscope
+                        itemtype="https://schema.org/Rating"
+                    >
+                    <span class="is-hidden" {{ rating_type }}>
+                        <meta itemprop="ratingValue" content="{{ status.rating|floatformat }}">
+
+                        {% if status.book %}
+                            {% if status.status_type == 'GeneratedNote' or status.status_type == 'Rating' %}
+                                <a href="/book/{{ status.book.id }}">{{ status.book|title }}</a>{% if status.status_type == 'Rating' %}:
+                                <span
+                                    itemprop="reviewRating"
+                                    itemscope
+                                    itemtype="https://schema.org/Rating"
+                                >
+                                <span class="is-hidden" {{ rating_type }}>
+                                    <meta itemprop="ratingValue" content="{{ status.rating|floatformat }}">
+
+                                        {# @todo Is it possible to not hard-code the value? #}
+                                        <meta itemprop="bestRating" content="5">
+                                </span>
+
+                                {% include 'snippets/stars.html' with rating=status.rating %}
+                                {% endif %}
+                            {% else %}
+                                {% include 'snippets/book_titleby.html' with book=status.book %}
+                            {% endif %}
+                        {% elif status.mention_books %}
+                            <a href="/book/{{ status.mention_books.first.id }}">
+                                {{ status.mention_books.first.title }}
+                            </a>
+                        {% endif %}
+                    {% include 'snippets/stars.html' with rating=status.rating %}
+                    {% endif %}
+                {% else %}
+                    {% include 'snippets/book_titleby.html' with book=status.book %}
+                {% endif %}
+            {% elif status.mention_books %}
+                <a href="/book/{{ status.mention_books.first.id }}">{{ status.mention_books.first|title }}</a>
             {% endif %}
-        {% elif status.mention_books %}
-            <a href="/book/{{ status.mention_books.first.id }}">{{ status.mention_books.first|title }}</a>
-        {% endif %}
 
         </h3>
         <p class="is-size-7 is-flex is-align-items-center">

From eea8b4e750c89ef8d1594289e8484a9efb30683a Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sat, 24 Apr 2021 21:16:30 +0200
Subject: [PATCH 0945/1285] cover: Handle covers with specific heights:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Have an explicit contextual class on `cover-container`.
- Use more flexible, consistent and searchable variable name for passing classes to covers.
- Consistently use `'…'` with django variables.
- Give the option to not hide covers to screen readers.
- consitently give a title to the cover container if `alt_text` exists.
- [lists] Remove `.content` which is applying too extensive default styles.
---
 bookwyrm/static/css/bookwyrm.css              | 21 ++++++++++++-------
 bookwyrm/templates/book/book.html             |  2 +-
 bookwyrm/templates/book/edit_book.html        |  2 +-
 bookwyrm/templates/book/editions.html         |  2 +-
 bookwyrm/templates/discover/large-book.html   |  2 +-
 bookwyrm/templates/discover/small-book.html   |  2 +-
 bookwyrm/templates/feed/feed_layout.html      |  2 +-
 bookwyrm/templates/import_status.html         |  2 +-
 bookwyrm/templates/lists/curate.html          |  2 +-
 bookwyrm/templates/lists/list_items.html      | 18 +++++++++++-----
 bookwyrm/templates/lists/lists.html           |  2 +-
 bookwyrm/templates/snippets/book_cover.html   | 18 +++++++---------
 .../snippets/search_result_text.html          |  2 +-
 .../snippets/status/generated_status.html     |  2 +-
 bookwyrm/templates/user/shelf.html            |  2 +-
 bookwyrm/templates/user/user.html             |  2 +-
 16 files changed, 47 insertions(+), 36 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 71947aea..5ef6e61a 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -124,6 +124,14 @@ body {
     position: relative;
 }
 
+.cover-container.is-small {
+    height: 100px;
+}
+
+.cover-container.is-medium {
+    height: 150px;
+}
+
 /*
 .cover-container.is-large {
     height: max-content;
@@ -135,14 +143,6 @@ body {
     height: auto;
 }
 
-.cover-container.is-medium {
-    height: 150px;
-}
-
-.cover-container.is-small {
-    height: 100px;
-}
-
 @media only screen and (max-width: 768px) {
     .cover-container {
         height: 200px;
@@ -163,6 +163,11 @@ body {
     image-rendering: optimizeQuality;
 }
 
+[class~="has-height"] .book-cover {
+    width: auto;
+    height: 100%;
+}
+
 .no-cover .cover_caption {
     position: absolute;
     padding: 1em;
diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index f1aaaf51..28850673 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -49,7 +49,7 @@
     <div class="columns">
         <div class="column is-one-fifth">
             <div class="is-clipped">
-                {% include 'snippets/book_cover.html' with book=book size=large %}
+                {% include 'snippets/book_cover.html' with book=book cover_class='is-large' %}
                 {% include 'snippets/rate_action.html' with user=request.user book=book %}
             </div>
             <div class="mb-3">
diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html
index 1702cf5d..7f8644b4 100644
--- a/bookwyrm/templates/book/edit_book.html
+++ b/bookwyrm/templates/book/edit_book.html
@@ -170,7 +170,7 @@
             <h2 class="title is-4">{% trans "Cover" %}</h2>
             <div class="columns">
                 <div class="column is-narrow">
-                    {% include 'snippets/book_cover.html' with book=book size="small" %}
+                    {% include 'snippets/book_cover.html' with book=book cover_class='is-small' %}
                 </div>
                 <div class="column is-narrow">
                     <div class="block">
diff --git a/bookwyrm/templates/book/editions.html b/bookwyrm/templates/book/editions.html
index 70f067f7..4ec39218 100644
--- a/bookwyrm/templates/book/editions.html
+++ b/bookwyrm/templates/book/editions.html
@@ -16,7 +16,7 @@
     <div class="columns">
         <div class="column is-2">
             <a href="/book/{{ book.id }}">
-                {% include 'snippets/book_cover.html' with book=book size="medium" %}
+                {% include 'snippets/book_cover.html' with book=book cover_class='is-medium' %}
             </a>
         </div>
         <div class="column is-7">
diff --git a/bookwyrm/templates/discover/large-book.html b/bookwyrm/templates/discover/large-book.html
index 303d7318..408e20c0 100644
--- a/bookwyrm/templates/discover/large-book.html
+++ b/bookwyrm/templates/discover/large-book.html
@@ -8,7 +8,7 @@
             <div class="column">
                 <a
                     href="{{ book.local_path }}"
-                >{% include 'snippets/book_cover.html' with size="large" %}</a>
+                >{% include 'snippets/book_cover.html' with cover_class='is-large' %}</a>
 
                 {% include 'snippets/stars.html' with rating=book|rating:request.user %}
             </div>
diff --git a/bookwyrm/templates/discover/small-book.html b/bookwyrm/templates/discover/small-book.html
index f80a2690..048e5a71 100644
--- a/bookwyrm/templates/discover/small-book.html
+++ b/bookwyrm/templates/discover/small-book.html
@@ -6,7 +6,7 @@
     {% with book=book %}
         <a
             href="{{ book.local_path }}"
-        >{% include 'snippets/book_cover.html' with size="small" %}</a>
+        >{% include 'snippets/book_cover.html' with cover_class='is-small' %}</a>
 
         {% include 'snippets/stars.html' with rating=book|rating:request.user %}
 
diff --git a/bookwyrm/templates/feed/feed_layout.html b/bookwyrm/templates/feed/feed_layout.html
index edbab016..15e84a59 100644
--- a/bookwyrm/templates/feed/feed_layout.html
+++ b/bookwyrm/templates/feed/feed_layout.html
@@ -37,7 +37,7 @@
                                         aria-label="{{ book.title }}"
                                         aria-selected="{% if active_book == book.id|stringformat:'d' %}true{% elif shelf_counter == 1 and forloop.first %}true{% else %}false{% endif %}"
                                         aria-controls="book-{{ book.id }}">
-                                        {% include 'snippets/book_cover.html' with book=book size="medium" %}
+                                        {% include 'snippets/book_cover.html' with book=book cover_class='is-medium' %}
                                     </a>
                                 </li>
                                 {% endfor %}
diff --git a/bookwyrm/templates/import_status.html b/bookwyrm/templates/import_status.html
index c2985c12..d85bb7fb 100644
--- a/bookwyrm/templates/import_status.html
+++ b/bookwyrm/templates/import_status.html
@@ -125,7 +125,7 @@
             <td>
                 {% if item.book %}
                 <a href="/book/{{ item.book.id }}">
-                {% include 'snippets/book_cover.html' with book=item.book size='small' %}
+                {% include 'snippets/book_cover.html' with book=item.book cover_class='is-small' %}
                 </a>
                 {% endif %}
             </td>
diff --git a/bookwyrm/templates/lists/curate.html b/bookwyrm/templates/lists/curate.html
index 995ba161..fa6a8fb9 100644
--- a/bookwyrm/templates/lists/curate.html
+++ b/bookwyrm/templates/lists/curate.html
@@ -32,7 +32,7 @@
                                 href="{{ book.local_path }}"
                                 aria-hidden="true"
                             >
-                                {% include 'snippets/book_cover.html' with size="small" %}
+                                {% include 'snippets/book_cover.html' with cover_class='is-small' %}
                             </a>
 
                             <div class="column is-9-mobile is-10-tablet ml-3">
diff --git a/bookwyrm/templates/lists/list_items.html b/bookwyrm/templates/lists/list_items.html
index 3e3e8bf4..ddc2fff0 100644
--- a/bookwyrm/templates/lists/list_items.html
+++ b/bookwyrm/templates/lists/list_items.html
@@ -8,11 +8,19 @@
                     <a href="{{ list.local_path }}">{{ list.name }}</a> <span class="subtitle">{% include 'snippets/privacy-icons.html' with item=list %}</span>
                 </h4>
             </header>
-            <div class="card-image is-flex is-clipped">
-                {% for book in list.listitem_set.all|slice:5 %}
-                <a href="{{ book.book.local_path }}">{% include 'snippets/book_cover.html' with book=book.book size="small" %}</a>
-                {% endfor %}
-            </div>
+
+            {% with list_books=list.listitem_set.all|slice:5 %}
+                {% if list_books %}
+                    <div class="card-image columns is-mobile is-gapless is-clipped has-height">
+                        {% for book in list_books %}
+                            <a class="column is-narrow" href="{{ book.book.local_path }}">
+                                {% include 'snippets/book_cover.html' with book=book.book cover_class='is-small' aria='show' %}
+                            </a>
+                        {% endfor %}
+                    </div>
+                {% endif %}
+            {% endwith %}
+
             <div class="card-content is-flex-grow-0">
                 <div {% if list.description %}title="{{ list.description }}"{% endif %}>
                 {% if list.description %}
diff --git a/bookwyrm/templates/lists/lists.html b/bookwyrm/templates/lists/lists.html
index c7d789d0..a7a54811 100644
--- a/bookwyrm/templates/lists/lists.html
+++ b/bookwyrm/templates/lists/lists.html
@@ -28,7 +28,7 @@
 </div>
 
 {% if lists %}
-<section class="block content">
+<section class="block">
     {% include 'lists/list_items.html' with lists=lists %}
 </section>
 
diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index b1166f7f..b994343e 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -9,21 +9,20 @@
         is-clipped
         is-flex
         is-align-items-center
+        {{ cover_class }}
 
         {% if not book.cover %}
             no-cover
         {% endif %}
-
-        {% if size %}
-            is-{{ size }}
-        {% endif %}
-
-        {% if container_class %}
-            {{ container_class }}
-        {% endif %}
     "
-    aria-hidden="true"
 
+    {% if aria != "show" %}
+        aria-hidden="true"
+    {% endif %}
+
+    {% if book.alt_text %}
+        title="{{ book.alt_text }}"
+    {% endif %}
 >
     <img
         class="book-cover"
@@ -34,7 +33,6 @@
 
             {% if book.alt_text %}
                 alt="{{ book.alt_text }}"
-                title="{{ book.alt_text }}"
             {% endif %}
         {% else %}
             src="/static/images/no_cover.jpg"
diff --git a/bookwyrm/templates/snippets/search_result_text.html b/bookwyrm/templates/snippets/search_result_text.html
index e46dbbeb..e234c82c 100644
--- a/bookwyrm/templates/snippets/search_result_text.html
+++ b/bookwyrm/templates/snippets/search_result_text.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 <div class="columns is-mobile is-gapless">
-    {% include 'snippets/book_cover.html' with book=result container_class='column' img_path=false %}
+    {% include 'snippets/book_cover.html' with book=result cover_class='column' img_path=false %}
 
     <div class="column is-10 ml-3">
         <p>
diff --git a/bookwyrm/templates/snippets/status/generated_status.html b/bookwyrm/templates/snippets/status/generated_status.html
index cb65a6f2..0b673037 100644
--- a/bookwyrm/templates/snippets/status/generated_status.html
+++ b/bookwyrm/templates/snippets/status/generated_status.html
@@ -8,7 +8,7 @@
 <div class="columns is-mobile">
     <div class="column is-narrow">
         <div>
-            <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book size="small" %}</a>
+            <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book cover_class='is-small' %}</a>
         </div>
     </div>
     <div class="column">
diff --git a/bookwyrm/templates/user/shelf.html b/bookwyrm/templates/user/shelf.html
index 0732327b..d9f264ea 100644
--- a/bookwyrm/templates/user/shelf.html
+++ b/bookwyrm/templates/user/shelf.html
@@ -86,7 +86,7 @@
         {% for book in books %}
         <tr class="book-preview">
             <td>
-                <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book size="small" %}</a>
+                <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book cover_class='is-small' %}</a>
             </td>
             <td>
                 <a href="{{ book.local_path }}">{{ book.title }}</a>
diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index a54664ce..9b0c6991 100644
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -36,7 +36,7 @@
             {% for book in shelf.books %}
             <div class="control">
                 <a href="{{ book.local_path }}">
-                {% include 'snippets/book_cover.html' with book=book size="medium" %}
+                {% include 'snippets/book_cover.html' with book=book cover_class='is-medium' %}
                 </a>
             </div>
             {% endfor %}

From cf5a4ebe90573dc54af185f11469256e92f08f04 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sat, 24 Apr 2021 21:18:48 +0200
Subject: [PATCH 0946/1285] Fix typo:

Addresses https://github.com/bookwyrm-social/bookwyrm/pull/994#discussion_r619688900.
---
 bookwyrm/static/css/bookwyrm.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 5ef6e61a..27f4521d 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -159,7 +159,7 @@ body {
     display: block;
     width: 100%;
 
-    /* Usweful when stretching under-sized images. */
+    /* Useful when stretching under-sized images. */
     image-rendering: optimizeQuality;
 }
 

From bb44ede2e75511b18e7c7a2c7c5f2742c39ee0a3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 24 Apr 2021 12:56:53 -0700
Subject: [PATCH 0947/1285] Show book preview in full statuses on mobile

---
 .../snippets/status/content_status.html       |  15 +-
 .../snippets/status/status_content.html       | 134 ------------------
 2 files changed, 11 insertions(+), 138 deletions(-)
 delete mode 100644 bookwyrm/templates/snippets/status/status_content.html

diff --git a/bookwyrm/templates/snippets/status/content_status.html b/bookwyrm/templates/snippets/status/content_status.html
index 5225f04e..b2946b83 100644
--- a/bookwyrm/templates/snippets/status/content_status.html
+++ b/bookwyrm/templates/snippets/status/content_status.html
@@ -14,10 +14,17 @@
         {% if not hide_book %}
         {% with book=status.book|default:status.mention_books.first %}
         {% if book %}
-        <div class="column is-narrow is-hidden-mobile">
-            <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book %}</a>
-            {% include 'snippets/stars.html' with rating=book|rating:request.user %}
-            {% include 'snippets/shelve_button/shelve_button.html' with book=book %}
+        <div class="column is-narrow">
+            <div class="columns is-mobile">
+                <div class="column is-narrow">
+                    <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book %}</a>
+                    {% include 'snippets/stars.html' with rating=book|rating:request.user %}
+                    {% include 'snippets/shelve_button/shelve_button.html' with book=book %}
+                </div>
+                <div class="column is-hidden-tablet">
+                    <p>{{ book|book_description|to_markdown|default:""|safe|truncatewords_html:15 }}</p>
+                </div>
+            </div>
         </div>
         {% endif %}
         {% endwith %}
diff --git a/bookwyrm/templates/snippets/status/status_content.html b/bookwyrm/templates/snippets/status/status_content.html
deleted file mode 100644
index fd3c7ee7..00000000
--- a/bookwyrm/templates/snippets/status/status_content.html
+++ /dev/null
@@ -1,134 +0,0 @@
-{% load bookwyrm_tags %}
-{% load i18n %}
-
-{% with status_type=status.status_type %}
-<div
-    class="block"
-
-    {% if status_type == 'Review' %}
-        {% firstof "reviewBody" as body_prop %}
-        {% firstof 'itemprop="reviewRating" itemscope itemtype="https://schema.org/Rating"' as rating_type %}
-    {% endif %}
-
-    {% if status_type == 'Rating' %}
-        itemprop="rating"
-        itemtype="https://schema.org/Rating"
-    {% endif %}
->
-    {% if status_type == 'Review' or status_type == 'Rating' %}
-        <div>
-            {% if status.name %}
-                <h3
-                    class="title is-5 has-subtitle"
-                    dir="auto"
-                    itemprop="name"
-                >
-                    {{ status.name|escape }}
-                </h3>
-            {% endif %}
-
-            <span
-                class="is-sr-only"
-                {{ rating_type }}
-            >
-                <meta itemprop="ratingValue" content="{{ status.rating|floatformat }}">
-
-                {% if status_type == 'Rating' %}
-                    {# @todo Is it possible to not hard-code the value? #}
-                    <meta itemprop="bestRating" content="5">
-                {% endif %}
-            </span>
-
-            {% include 'snippets/stars.html' with rating=status.rating %}
-        </div>
-    {% endif %}
-
-    {% if status.content_warning %}
-        <div>
-            <p>{{ status.content_warning }}</p>
-
-            {% trans "Show more" as button_text %}
-
-            {% with text=button_text class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
-                {% include 'snippets/toggle/open_button.html' %}
-            {% endwith %}
-        </div>
-    {% endif %}
-
-    <div
-        {% if status.content_warning %}
-            id="show-status-cw-{{ status.id }}"
-            class="is-hidden"
-        {% endif %}
-    >
-        {% if status.content_warning %}
-            {% trans "Show less" as button_text %}
-
-            {% with text=button_text class="is-small" controls_text="show-status-cw" controls_uid=status.id %}
-                {% include 'snippets/toggle/close_button.html' %}
-            {% endwith %}
-        {% endif %}
-
-        {% if status.quote %}
-            <div class="quote block">
-                <blockquote dir="auto" class="content mb-2">{{ status.quote | safe }}</blockquote>
-
-                <p> &mdash; {% include 'snippets/book_titleby.html' with book=status.book %}</p>
-            </div>
-        {% endif %}
-
-        {% if status.content and status_type != 'GeneratedNote' and status_type != 'Announce' %}
-            {% with full=status.content|safe no_trim=status.content_warning itemprop=body_prop %}
-                {% include 'snippets/trimmed_text.html' %}
-            {% endwith %}
-        {% endif %}
-
-        {% if status.attachments.exists %}
-            <div class="block">
-                <div class="columns">
-                    {% for attachment in status.attachments.all %}
-                        <div class="column is-narrow">
-                            <figure class="image is-128x128">
-                                <a
-                                    href="/images/{{ attachment.image }}"
-                                    target="_blank"
-                                    aria-label="{% trans 'Open image in new window' %}"
-                                >
-                                    <img
-                                        src="/images/{{ attachment.image }}"
-
-                                        {% if attachment.caption %}
-                                            alt="{{ attachment.caption }}"
-                                            title="{{ attachment.caption }}"
-                                        {% endif %}
-                                    >
-                                </a>
-                            </figure>
-                        </div>
-                    {% endfor %}
-                </div>
-            </div>
-        {% endif %}
-    </div>
-</div>
-
-{% if not hide_book %}
-    {% if status.book or status.mention_books.count %}
-        <div
-            {% if status_type != 'GeneratedNote' %}
-                class="box has-background-white-bis"
-            {% endif %}
-        >
-            {% if status.book %}
-                {% with book=status.book %}
-                    {% include 'snippets/status/book_preview.html' %}
-                {% endwith %}
-            {% elif status.mention_books.count %}
-                {% with book=status.mention_books.first %}
-                    {% include 'snippets/status/book_preview.html' %}
-                {% endwith %}
-            {% endif %}
-        </div>
-    {% endif %}
-{% endif %}
-{% endwith %}

From 6a203f9738bea87e6a5917de99763aec812a6d48 Mon Sep 17 00:00:00 2001
From: reese <reesedporter@gmail.com>
Date: Sat, 24 Apr 2021 23:04:32 -0500
Subject: [PATCH 0948/1285] update translations

---
 locale/es/LC_MESSAGES/django.mo | Bin 42570 -> 42362 bytes
 locale/es/LC_MESSAGES/django.po |  52 +++++++++++++++-----------------
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index e2498fda1420d94d06c0a145c3132227038091f7..64baee4f2fb999e55a052d3f2f25e231cbdc0e16 100644
GIT binary patch
delta 12707
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

delta 12898
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
MtDK!Xe{t#m0W4M?p8x;=

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 97aa4da3..87f443a0 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-22 15:55+0000\n"
+"POT-Creation-Date: 2021-04-25 04:01+0000\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,57 +18,57 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/forms.py:232
+#: bookwyrm/forms.py:224
 msgid "A user with this email already exists."
 msgstr "Ya existe un usuario con ese correo electrónico."
 
-#: bookwyrm/forms.py:246
+#: bookwyrm/forms.py:238
 msgid "One Day"
 msgstr "Un día"
 
-#: bookwyrm/forms.py:247
+#: bookwyrm/forms.py:239
 msgid "One Week"
 msgstr "Una semana"
 
-#: bookwyrm/forms.py:248
+#: bookwyrm/forms.py:240
 msgid "One Month"
 msgstr "Un mes"
 
-#: bookwyrm/forms.py:249
+#: bookwyrm/forms.py:241
 msgid "Does Not Expire"
 msgstr "Nunca se vence"
 
-#: bookwyrm/forms.py:254
+#: bookwyrm/forms.py:246
 #, python-format
 msgid "%(count)d uses"
 msgstr "%(count)d usos"
 
-#: bookwyrm/forms.py:257
+#: bookwyrm/forms.py:249
 msgid "Unlimited"
 msgstr "Sin límite"
 
-#: bookwyrm/forms.py:301
+#: bookwyrm/forms.py:293
 msgid "List Order"
 msgstr "Orden de la lista"
 
-#: bookwyrm/forms.py:302
+#: bookwyrm/forms.py:294
 msgid "Book Title"
 msgstr "Título"
 
-#: bookwyrm/forms.py:303 bookwyrm/templates/snippets/create_status_form.html:31
+#: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:31
 #: bookwyrm/templates/user/shelf.html:81
 msgid "Rating"
 msgstr "Calificación"
 
-#: bookwyrm/forms.py:305 bookwyrm/templates/lists/list.html:72
+#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:72
 msgid "Sort By"
 msgstr "Ordenar por"
 
-#: bookwyrm/forms.py:309
+#: bookwyrm/forms.py:301
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: bookwyrm/forms.py:310
+#: bookwyrm/forms.py:302
 msgid "Descending"
 msgstr "Descendente"
 
@@ -2047,7 +2047,7 @@ msgstr "Texto de registración cerrada:"
 msgid "No cover"
 msgstr "Sin portada"
 
-#: bookwyrm/templates/snippets/book_titleby.html:3
+#: bookwyrm/templates/snippets/book_titleby.html:4
 #, python-format
 msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgstr "<a href=\"%(path)s\">%(title)s</a> por "
@@ -2527,19 +2527,6 @@ msgstr "En orden ascendente"
 msgid "Sorted descending"
 msgstr "En orden descendente"
 
-#: bookwyrm/templates/snippets/tag.html:14
-msgid "Remove tag"
-msgstr "Eliminar etiqueta"
-
-#: bookwyrm/templates/snippets/tag.html:18
-msgid "Add tag"
-msgstr "Agregar etiqueta"
-
-#: bookwyrm/templates/tag.html:9
-#, python-format
-msgid "Books tagged \"%(tag.name)s\""
-msgstr "Libros etiquetados con \"%(tag.name)s\""
-
 #: bookwyrm/templates/user/books_header.html:5
 #, python-format
 msgid "%(username)s's books"
@@ -2754,6 +2741,15 @@ msgstr "No se pudo encontrar un usuario con esa dirección de correo electrónic
 msgid "A password reset link sent to %s"
 msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 
+#~ msgid "Remove tag"
+#~ msgstr "Eliminar etiqueta"
+
+#~ msgid "Add tag"
+#~ msgstr "Agregar etiqueta"
+
+#~ msgid "Books tagged \"%(tag.name)s\""
+#~ msgstr "Libros etiquetados con \"%(tag.name)s\""
+
 #~ msgid "Deactivate user"
 #~ msgstr "Desactivar usuario"
 

From 61f1e07db4bf02d718d6729f591936613a97044a Mon Sep 17 00:00:00 2001
From: reese <reesedporter@gmail.com>
Date: Sat, 24 Apr 2021 23:39:46 -0500
Subject: [PATCH 0949/1285] as far as i can tell, fr-dev is literally exactly
 the same as bw-dev

---
 fr-dev | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 fr-dev

diff --git a/fr-dev b/fr-dev
deleted file mode 120000
index 9947871e..00000000
--- a/fr-dev
+++ /dev/null
@@ -1 +0,0 @@
-bw-dev
\ No newline at end of file

From 953dff90bb7c2aefda2d1a0f181f8123ddf0b3b2 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sun, 25 Apr 2021 15:37:46 +0200
Subject: [PATCH 0950/1285] cover: tweak styles:

- `optimizeQuality` > `smooth` (CSS language evolution)
- Use `auto` instead of a fixed width.
- Add exceptions for heights and apply them to some previously modified templates.
- Remove `is-large` exception.
- Widen the content column on list curation.
---
 bookwyrm/static/css/bookwyrm.css              | 88 ++++++++-----------
 bookwyrm/templates/book/book.html             |  7 +-
 bookwyrm/templates/book/edit_book.html        |  2 +-
 bookwyrm/templates/book/editions.html         |  2 +-
 bookwyrm/templates/discover/large-book.html   |  2 +-
 bookwyrm/templates/discover/small-book.html   |  2 +-
 bookwyrm/templates/feed/feed_layout.html      |  2 +-
 bookwyrm/templates/import_status.html         |  2 +-
 bookwyrm/templates/lists/curate.html          |  4 +-
 bookwyrm/templates/lists/list_items.html      |  4 +-
 bookwyrm/templates/snippets/book_cover.html   |  3 -
 .../snippets/status/generated_status.html     |  2 +-
 bookwyrm/templates/user/shelf.html            |  2 +-
 bookwyrm/templates/user/user.html             |  2 +-
 14 files changed, 55 insertions(+), 69 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 281bc7ed..a1e55ce9 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -98,7 +98,7 @@ body {
  *
  * \e9d9: filled star
  * \e9d7: empty star;
- ******************************************************************************/
+ * -------------------------------------------------------------------------- */
 
 .form-rate-stars {
     width: max-content;
@@ -125,76 +125,45 @@ body {
 
 /** Book covers
  *
- * The book cover takes the full width of its ancestor’s layout.
+ * - take the full width of their ancestor’s layout.
+ * - take whatever height they need.
+ *
+ * When assigning a height, add the `has-height` class.
  ******************************************************************************/
 .cover-container {
     position: relative;
+    overflow: hidden;
 }
 
-.cover-container.is-small {
-    height: 100px;
-}
-
-.cover-container.is-medium {
-    height: 150px;
-}
-
-/*
-.cover-container.is-large {
-    height: max-content;
-    max-width: 330px;
-}
-
-.cover-container.is-large img {
-    max-height: 500px;
-    height: auto;
-}
-
-@media only screen and (max-width: 768px) {
-    .cover-container {
-        height: 200px;
-        width: max-content;
-    }
-
-    .cover-container.is-medium {
-        height: 100px;
-    }
-}
-*/
-
+/* Book cover
+   -------------------------------------------------------------------------- */
 .book-cover {
     display: block;
-    width: 100%;
+    width: auto;
 
     /* Useful when stretching under-sized images. */
     image-rendering: optimizeQuality;
+    image-rendering: smooth;
 }
 
+/* `height: inherit` makes sure the height computed is not approximative,
+    without specifying a fixed height. */
 [class~="has-height"] .book-cover {
-    width: auto;
-    height: 100%;
+    height: inherit;
+    max-height: 100%;
 }
 
+/* Cover caption
+   -------------------------------------------------------------------------- */
 .no-cover .cover_caption {
     position: absolute;
-    padding: 1em;
+    padding: .25em;
     color: white;
     top: 0;
     left: 0;
+    font-size: 0.75em;
 }
 
-/*
-.cover-container.is-medium .no-cover div {
-    font-size: 0.9em;
-    padding: 0.3em;
-}
-
-.cover-container.is-small .no-cover div {
-    font-size: 0.7em;
-    padding: 0.1em;
-}
-*/
-
 /** Avatars
  ******************************************************************************/
 
@@ -267,3 +236,24 @@ body {
     opacity: 0.5;
     cursor: not-allowed;
 }
+
+/* Dimensions
+ ******************************************************************************/
+
+.is-h-small {
+    height: 100px !important;
+}
+
+.is-h-medium {
+    height: 150px !important;
+}
+
+@media only screen and (max-width: 768px) {
+    .is-h-small-mobile {
+        height: 100px !important;
+    }
+
+    .is-h-medium-mobile {
+        height: 150px;
+    }
+}
diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index 28850673..34558f8d 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -48,10 +48,9 @@
 
     <div class="columns">
         <div class="column is-one-fifth">
-            <div class="is-clipped">
-                {% include 'snippets/book_cover.html' with book=book cover_class='is-large' %}
-                {% include 'snippets/rate_action.html' with user=request.user book=book %}
-            </div>
+            {% include 'snippets/book_cover.html' with book=book cover_class='has-height is-h-medium-mobile' %}
+            {% include 'snippets/rate_action.html' with user=request.user book=book %}
+
             <div class="mb-3">
                 {% include 'snippets/shelve_button/shelve_button.html' %}
             </div>
diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html
index 7f8644b4..0cb1a9b1 100644
--- a/bookwyrm/templates/book/edit_book.html
+++ b/bookwyrm/templates/book/edit_book.html
@@ -170,7 +170,7 @@
             <h2 class="title is-4">{% trans "Cover" %}</h2>
             <div class="columns">
                 <div class="column is-narrow">
-                    {% include 'snippets/book_cover.html' with book=book cover_class='is-small' %}
+                    {% include 'snippets/book_cover.html' with book=book cover_class='is-h-small' %}
                 </div>
                 <div class="column is-narrow">
                     <div class="block">
diff --git a/bookwyrm/templates/book/editions.html b/bookwyrm/templates/book/editions.html
index 4ec39218..3eb66eae 100644
--- a/bookwyrm/templates/book/editions.html
+++ b/bookwyrm/templates/book/editions.html
@@ -16,7 +16,7 @@
     <div class="columns">
         <div class="column is-2">
             <a href="/book/{{ book.id }}">
-                {% include 'snippets/book_cover.html' with book=book cover_class='is-medium' %}
+                {% include 'snippets/book_cover.html' with book=book cover_class='is-h-medium' %}
             </a>
         </div>
         <div class="column is-7">
diff --git a/bookwyrm/templates/discover/large-book.html b/bookwyrm/templates/discover/large-book.html
index 408e20c0..c7b39ebb 100644
--- a/bookwyrm/templates/discover/large-book.html
+++ b/bookwyrm/templates/discover/large-book.html
@@ -8,7 +8,7 @@
             <div class="column">
                 <a
                     href="{{ book.local_path }}"
-                >{% include 'snippets/book_cover.html' with cover_class='is-large' %}</a>
+                >{% include 'snippets/book_cover.html' %}</a>
 
                 {% include 'snippets/stars.html' with rating=book|rating:request.user %}
             </div>
diff --git a/bookwyrm/templates/discover/small-book.html b/bookwyrm/templates/discover/small-book.html
index 048e5a71..c1f5f165 100644
--- a/bookwyrm/templates/discover/small-book.html
+++ b/bookwyrm/templates/discover/small-book.html
@@ -6,7 +6,7 @@
     {% with book=book %}
         <a
             href="{{ book.local_path }}"
-        >{% include 'snippets/book_cover.html' with cover_class='is-small' %}</a>
+        >{% include 'snippets/book_cover.html' with cover_class='is-h-small' %}</a>
 
         {% include 'snippets/stars.html' with rating=book|rating:request.user %}
 
diff --git a/bookwyrm/templates/feed/feed_layout.html b/bookwyrm/templates/feed/feed_layout.html
index 15e84a59..669c2aaa 100644
--- a/bookwyrm/templates/feed/feed_layout.html
+++ b/bookwyrm/templates/feed/feed_layout.html
@@ -37,7 +37,7 @@
                                         aria-label="{{ book.title }}"
                                         aria-selected="{% if active_book == book.id|stringformat:'d' %}true{% elif shelf_counter == 1 and forloop.first %}true{% else %}false{% endif %}"
                                         aria-controls="book-{{ book.id }}">
-                                        {% include 'snippets/book_cover.html' with book=book cover_class='is-medium' %}
+                                        {% include 'snippets/book_cover.html' with book=book cover_class='is-h-medium' %}
                                     </a>
                                 </li>
                                 {% endfor %}
diff --git a/bookwyrm/templates/import_status.html b/bookwyrm/templates/import_status.html
index d85bb7fb..05c811d2 100644
--- a/bookwyrm/templates/import_status.html
+++ b/bookwyrm/templates/import_status.html
@@ -125,7 +125,7 @@
             <td>
                 {% if item.book %}
                 <a href="/book/{{ item.book.id }}">
-                {% include 'snippets/book_cover.html' with book=item.book cover_class='is-small' %}
+                {% include 'snippets/book_cover.html' with book=item.book cover_class='is-h-small' %}
                 </a>
                 {% endif %}
             </td>
diff --git a/bookwyrm/templates/lists/curate.html b/bookwyrm/templates/lists/curate.html
index fa6a8fb9..529f51c3 100644
--- a/bookwyrm/templates/lists/curate.html
+++ b/bookwyrm/templates/lists/curate.html
@@ -32,10 +32,10 @@
                                 href="{{ book.local_path }}"
                                 aria-hidden="true"
                             >
-                                {% include 'snippets/book_cover.html' with cover_class='is-small' %}
+                                {% include 'snippets/book_cover.html' %}
                             </a>
 
-                            <div class="column is-9-mobile is-10-tablet ml-3">
+                            <div class="column is-10-mobile is-10-tablet ml-3">
                                 {% include 'snippets/book_titleby.html' %}
                             </div>
                         </div>
diff --git a/bookwyrm/templates/lists/list_items.html b/bookwyrm/templates/lists/list_items.html
index ddc2fff0..db6b6d60 100644
--- a/bookwyrm/templates/lists/list_items.html
+++ b/bookwyrm/templates/lists/list_items.html
@@ -11,10 +11,10 @@
 
             {% with list_books=list.listitem_set.all|slice:5 %}
                 {% if list_books %}
-                    <div class="card-image columns is-mobile is-gapless is-clipped has-height">
+                    <div class="card-image columns is-mobile is-gapless is-clipped">
                         {% for book in list_books %}
                             <a class="column is-narrow" href="{{ book.book.local_path }}">
-                                {% include 'snippets/book_cover.html' with book=book.book cover_class='is-small' aria='show' %}
+                                {% include 'snippets/book_cover.html' with book=book.book cover_class='has-height is-h-small' aria='show' %}
                             </a>
                         {% endfor %}
                     </div>
diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index b994343e..8967ff57 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -6,9 +6,6 @@
 <figure
     class="
         cover-container
-        is-clipped
-        is-flex
-        is-align-items-center
         {{ cover_class }}
 
         {% if not book.cover %}
diff --git a/bookwyrm/templates/snippets/status/generated_status.html b/bookwyrm/templates/snippets/status/generated_status.html
index 0b673037..f89f7c48 100644
--- a/bookwyrm/templates/snippets/status/generated_status.html
+++ b/bookwyrm/templates/snippets/status/generated_status.html
@@ -8,7 +8,7 @@
 <div class="columns is-mobile">
     <div class="column is-narrow">
         <div>
-            <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book cover_class='is-small' %}</a>
+            <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book cover_class='is-h-small' %}</a>
         </div>
     </div>
     <div class="column">
diff --git a/bookwyrm/templates/user/shelf.html b/bookwyrm/templates/user/shelf.html
index d9f264ea..39498a43 100644
--- a/bookwyrm/templates/user/shelf.html
+++ b/bookwyrm/templates/user/shelf.html
@@ -86,7 +86,7 @@
         {% for book in books %}
         <tr class="book-preview">
             <td>
-                <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book cover_class='is-small' %}</a>
+                <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book cover_class='is-h-small' %}</a>
             </td>
             <td>
                 <a href="{{ book.local_path }}">{{ book.title }}</a>
diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index 9b0c6991..80dac213 100644
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -36,7 +36,7 @@
             {% for book in shelf.books %}
             <div class="control">
                 <a href="{{ book.local_path }}">
-                {% include 'snippets/book_cover.html' with book=book cover_class='is-medium' %}
+                {% include 'snippets/book_cover.html' with book=book cover_class='is-h-medium' %}
                 </a>
             </div>
             {% endfor %}

From a268f339c0740b7c302eded6f3814f7b84faf4e1 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Sun, 25 Apr 2021 15:45:49 +0200
Subject: [PATCH 0951/1285] Fix linting issues.

---
 bookwyrm/static/css/bookwyrm.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index a1e55ce9..9488f0d7 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -136,7 +136,7 @@ body {
 }
 
 /* Book cover
-   -------------------------------------------------------------------------- */
+ * -------------------------------------------------------------------------- */
 .book-cover {
     display: block;
     width: auto;
@@ -154,10 +154,10 @@ body {
 }
 
 /* Cover caption
-   -------------------------------------------------------------------------- */
+ * -------------------------------------------------------------------------- */
 .no-cover .cover_caption {
     position: absolute;
-    padding: .25em;
+    padding: 0.25em;
     color: white;
     top: 0;
     left: 0;

From e92166c7f7281de1bdeb0336c3ef36d40b3447bf Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Sun, 25 Apr 2021 20:05:31 +0200
Subject: [PATCH 0952/1285] Directory: Homogenize cards heights

When the content of a profile card stretches it in height, the grid is not homogenous. This PR adds a CSS class that'll display cards as stretchable columns. The card content will be able to grow, which should always place the card footer at the bottom of the card.
---
 bookwyrm/static/css/bookwyrm.css            | 10 ++++++++++
 bookwyrm/templates/directory/directory.html |  6 +++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index cf8e8399..9e74d69f 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -53,6 +53,16 @@ body {
     background-color: transparent;
 }
 
+.card.is-stretchable {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+}
+
+.card.is-stretchable .card-content {
+    flex-grow: 1;
+}
+
 /** Shelving
  ******************************************************************************/
 
diff --git a/bookwyrm/templates/directory/directory.html b/bookwyrm/templates/directory/directory.html
index 430e8539..2fa8a5ae 100644
--- a/bookwyrm/templates/directory/directory.html
+++ b/bookwyrm/templates/directory/directory.html
@@ -41,7 +41,7 @@
 <div class="columns is-multiline">
     {% for user in users %}
     <div class="column is-one-third">
-        <div class="card block">
+        <div class="card is-stretchable">
             <div class="card-content">
                 <div class="media">
                     <a href="{{ user.local_path }}" class="media-left">
@@ -56,13 +56,13 @@
                     </div>
                 </div>
 
-                <div class="content">
+                <div>
                 {% if user.summary %}
                     {{ user.summary | to_markdown | safe | truncatechars_html:40 }}
                 {% else %}&nbsp;{% endif %}
                 </div>
             </div>
-            <footer class="card-footer content">
+            <footer class="card-footer">
                 {% if user != request.user %}
                 {% if user.mutuals %}
                 <div class="card-footer-item">

From 26cacf502c45315c3045abc82da59dd8991b1d12 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Mon, 26 Apr 2021 13:39:17 +0200
Subject: [PATCH 0953/1285] Rationalise behaviours of context, container and
 cover:

- Set minimum dimensions to avoid having to pass classes all over the place.
- Outline the container to show white on white covers properly.
- Remove extraneous code.
- Better size caption when no cover is available.
- Create Alignments, Positions and Spacings sections and move some existing dimensions.
- Update previous templates.
---
 bookwyrm/static/css/bookwyrm.css         | 99 +++++++++++++++++-------
 bookwyrm/templates/book/book.html        |  2 +-
 bookwyrm/templates/book/editions.html    | 20 ++---
 bookwyrm/templates/lists/list_items.html |  2 +-
 4 files changed, 83 insertions(+), 40 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 3841aac8..8f95cfeb 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -159,43 +159,47 @@ body {
 
 /** Book covers
  *
- * - take the full width of their ancestor’s layout.
- * - take whatever height they need.
- *
- * When assigning a height, add the `has-height` class.
+ * - The context gives the extrinsic dimensions.
+ * - .cover-container gives the intrinsic dimensions and position.
+ * - .book-cover is positioned and sized based on its container.
  ******************************************************************************/
+
 .cover-container {
+    display: flex;
     position: relative;
     overflow: hidden;
+    min-width: 80px;
+    min-height: 100px;
+    max-width: max-content;
+    outline: solid 1px #dbdbdb;
 }
 
 /* Book cover
  * -------------------------------------------------------------------------- */
+
 .book-cover {
     display: block;
-    width: auto;
+    max-width: 100%;
+    max-height: 100%;
 
     /* Useful when stretching under-sized images. */
     image-rendering: optimizeQuality;
     image-rendering: smooth;
 }
 
-/* `height: inherit` makes sure the height computed is not approximative,
-    without specifying a fixed height. */
-[class~="has-height"] .book-cover {
-    height: inherit;
-    max-height: 100%;
-}
-
 /* Cover caption
  * -------------------------------------------------------------------------- */
+
 .no-cover .cover_caption {
     position: absolute;
-    padding: 0.25em;
-    color: white;
     top: 0;
+    right: 0;
+    bottom: 0;
     left: 0;
+    padding: 0.25em;
     font-size: 0.75em;
+    color: white;
+    background-color: #002549;
 }
 
 /** Avatars
@@ -206,16 +210,6 @@ body {
     display: inline;
 }
 
-.is-32x32 {
-    min-width: 32px;
-    min-height: 32px;
-}
-
-.is-96x96 {
-    min-width: 96px;
-    min-height: 96px;
-}
-
 /** Statuses: Quotes
  *
  * \e906: icon-quote-open
@@ -274,6 +268,16 @@ body {
 /* Dimensions
  ******************************************************************************/
 
+.is-32x32 {
+    min-width: 32px !important;
+    min-height: 32px !important;
+}
+
+.is-96x96 {
+    min-width: 96px !important;
+    min-height: 96px !important;
+}
+
 .is-h-small {
     height: 100px !important;
 }
@@ -283,15 +287,54 @@ body {
 }
 
 @media only screen and (max-width: 768px) {
-    .is-h-small-mobile {
-        height: 100px !important;
-    }
-
     .is-h-medium-mobile {
         height: 150px;
     }
 }
 
+.is-min-w-none {
+    min-width: auto !important;
+}
+
+/* Alignments
+ ******************************************************************************/
+
+/* Flex item position
+ *
+ * This is for a default `flex-direction: row`.
+ * -------------------------------------------------------------------------- */
+
+.align-r {
+    justify-content: flex-end;
+}
+
+@media screen and (min-width: 769px) {
+    .align-r-tablet {
+        justify-content: flex-end;
+    }
+}
+
+/* Spacings
+ ******************************************************************************/
+
+@media screen and (max-width: 768px) {
+    .my-3-mobile {
+        margin-top: 0.75rem !important;
+        margin-bottom: 0.75rem !important;
+    }
+}
+
+@media screen and (min-width: 769px) {
+    .ml-3-tablet {
+        margin-left: 0.75rem !important;
+    }
+
+    .mx-3-tablet {
+        margin-right: 0.75rem !important;
+        margin-left: 0.75rem !important;
+    }
+}
+
 /* Book preview table
  ******************************************************************************/
 
diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index 8ab61321..23f7dac0 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -48,7 +48,7 @@
 
     <div class="columns">
         <div class="column is-one-fifth">
-            {% include 'snippets/book_cover.html' with book=book cover_class='has-height is-h-medium-mobile' %}
+            {% include 'snippets/book_cover.html' with book=book cover_class='is-h-medium-mobile' %}
             {% include 'snippets/rate_action.html' with user=request.user book=book %}
 
             <div class="mb-3">
diff --git a/bookwyrm/templates/book/editions.html b/bookwyrm/templates/book/editions.html
index 3eb66eae..009bdd66 100644
--- a/bookwyrm/templates/book/editions.html
+++ b/bookwyrm/templates/book/editions.html
@@ -13,32 +13,32 @@
 
 <div class="block">
     {% for book in editions %}
-    <div class="columns">
-        <div class="column is-2">
-            <a href="/book/{{ book.id }}">
-                {% include 'snippets/book_cover.html' with book=book cover_class='is-h-medium' %}
-            </a>
+    <div class="columns is-gapless mb-6">
+        <div class="column is-2 is-flex align-r-tablet">
+            {% include 'snippets/book_cover.html' with book=book cover_class='is-h-medium' %}
         </div>
-        <div class="column is-7">
-            <h2 class="title is-5">
+
+        <div class="column is-flex-grow-1 my-3-mobile mx-3-tablet">
+            <h2 class="title is-5 mb-1">
                 <a href="/book/{{ book.id }}" class="has-text-black">
                     {{ book.title }}
                 </a>
             </h2>
 
             {% with book=book %}
-                <div class="columns is-multiline">
+                <div class="columns is-multiline is-gapless">
                     <div class="column is-half">
                         {% include 'book/publisher_info.html' %}
                     </div>
 
-                    <div class="column is-half ">
+                    <div class="column ml-3-tablet">
                         {% include 'book/book_identifiers.html' %}
                     </div>
                 </div>
             {% endwith %}
         </div>
-        <div class="column is-3">
+
+        <div class="column is-narrow">
             {% include 'snippets/shelve_button/shelve_button.html' with book=book switch_mode=True %}
         </div>
     </div>
diff --git a/bookwyrm/templates/lists/list_items.html b/bookwyrm/templates/lists/list_items.html
index db6b6d60..f1a4938e 100644
--- a/bookwyrm/templates/lists/list_items.html
+++ b/bookwyrm/templates/lists/list_items.html
@@ -14,7 +14,7 @@
                     <div class="card-image columns is-mobile is-gapless is-clipped">
                         {% for book in list_books %}
                             <a class="column is-narrow" href="{{ book.book.local_path }}">
-                                {% include 'snippets/book_cover.html' with book=book.book cover_class='has-height is-h-small' aria='show' %}
+                                {% include 'snippets/book_cover.html' with book=book.book cover_class='is-min-w-none is-h-small' aria='show' %}
                             </a>
                         {% endfor %}
                     </div>

From b089f6c86a8697d542b32df657bd3258076078d8 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Mon, 26 Apr 2021 15:20:48 +0200
Subject: [PATCH 0954/1285] Update Bulma from v0.9.1 to v0.9.2.

---
 bookwyrm/static/css/vendor/bulma.min.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/static/css/vendor/bulma.min.css b/bookwyrm/static/css/vendor/bulma.min.css
index a807a314..ed54b7b3 100644
--- a/bookwyrm/static/css/vendor/bulma.min.css
+++ b/bookwyrm/static/css/vendor/bulma.min.css
@@ -1 +1 @@
-/*! bulma.io v0.9.1 | MIT License | github.com/jgthms/bulma */@-webkit-keyframes spinAround{from{transform:rotate(0)}to{transform:rotate(359deg)}}@keyframes spinAround{from{transform:rotate(0)}to{transform:rotate(359deg)}}.breadcrumb,.button,.delete,.file,.is-unselectable,.modal-close,.pagination-ellipsis,.pagination-link,.pagination-next,.pagination-previous,.tabs{-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.navbar-link:not(.is-arrowless)::after,.select:not(.is-multiple):not(.is-loading)::after{border:3px solid transparent;border-radius:2px;border-right:0;border-top:0;content:" ";display:block;height:.625em;margin-top:-.4375em;pointer-events:none;position:absolute;top:50%;transform:rotate(-45deg);transform-origin:center;width:.625em}.block:not(:last-child),.box:not(:last-child),.breadcrumb:not(:last-child),.content:not(:last-child),.highlight:not(:last-child),.level:not(:last-child),.message:not(:last-child),.notification:not(:last-child),.pagination:not(:last-child),.progress:not(:last-child),.subtitle:not(:last-child),.table-container:not(:last-child),.table:not(:last-child),.tabs:not(:last-child),.title:not(:last-child){margin-bottom:1.5rem}.delete,.modal-close{-moz-appearance:none;-webkit-appearance:none;background-color:rgba(10,10,10,.2);border:none;border-radius:290486px;cursor:pointer;pointer-events:auto;display:inline-block;flex-grow:0;flex-shrink:0;font-size:0;height:20px;max-height:20px;max-width:20px;min-height:20px;min-width:20px;outline:0;position:relative;vertical-align:top;width:20px}.delete::after,.delete::before,.modal-close::after,.modal-close::before{background-color:#fff;content:"";display:block;left:50%;position:absolute;top:50%;transform:translateX(-50%) translateY(-50%) rotate(45deg);transform-origin:center center}.delete::before,.modal-close::before{height:2px;width:50%}.delete::after,.modal-close::after{height:50%;width:2px}.delete:focus,.delete:hover,.modal-close:focus,.modal-close:hover{background-color:rgba(10,10,10,.3)}.delete:active,.modal-close:active{background-color:rgba(10,10,10,.4)}.is-small.delete,.is-small.modal-close{height:16px;max-height:16px;max-width:16px;min-height:16px;min-width:16px;width:16px}.is-medium.delete,.is-medium.modal-close{height:24px;max-height:24px;max-width:24px;min-height:24px;min-width:24px;width:24px}.is-large.delete,.is-large.modal-close{height:32px;max-height:32px;max-width:32px;min-height:32px;min-width:32px;width:32px}.button.is-loading::after,.control.is-loading::after,.loader,.select.is-loading::after{-webkit-animation:spinAround .5s infinite linear;animation:spinAround .5s infinite linear;border:2px solid #dbdbdb;border-radius:290486px;border-right-color:transparent;border-top-color:transparent;content:"";display:block;height:1em;position:relative;width:1em}.hero-video,.image.is-16by9 .has-ratio,.image.is-16by9 img,.image.is-1by1 .has-ratio,.image.is-1by1 img,.image.is-1by2 .has-ratio,.image.is-1by2 img,.image.is-1by3 .has-ratio,.image.is-1by3 img,.image.is-2by1 .has-ratio,.image.is-2by1 img,.image.is-2by3 .has-ratio,.image.is-2by3 img,.image.is-3by1 .has-ratio,.image.is-3by1 img,.image.is-3by2 .has-ratio,.image.is-3by2 img,.image.is-3by4 .has-ratio,.image.is-3by4 img,.image.is-3by5 .has-ratio,.image.is-3by5 img,.image.is-4by3 .has-ratio,.image.is-4by3 img,.image.is-4by5 .has-ratio,.image.is-4by5 img,.image.is-5by3 .has-ratio,.image.is-5by3 img,.image.is-5by4 .has-ratio,.image.is-5by4 img,.image.is-9by16 .has-ratio,.image.is-9by16 img,.image.is-square .has-ratio,.image.is-square img,.is-overlay,.modal,.modal-background{bottom:0;left:0;position:absolute;right:0;top:0}.button,.file-cta,.file-name,.input,.pagination-ellipsis,.pagination-link,.pagination-next,.pagination-previous,.select select,.textarea{-moz-appearance:none;-webkit-appearance:none;align-items:center;border:1px solid transparent;border-radius:4px;box-shadow:none;display:inline-flex;font-size:1rem;height:2.5em;justify-content:flex-start;line-height:1.5;padding-bottom:calc(.5em - 1px);padding-left:calc(.75em - 1px);padding-right:calc(.75em - 1px);padding-top:calc(.5em - 1px);position:relative;vertical-align:top}.button:active,.button:focus,.file-cta:active,.file-cta:focus,.file-name:active,.file-name:focus,.input:active,.input:focus,.is-active.button,.is-active.file-cta,.is-active.file-name,.is-active.input,.is-active.pagination-ellipsis,.is-active.pagination-link,.is-active.pagination-next,.is-active.pagination-previous,.is-active.textarea,.is-focused.button,.is-focused.file-cta,.is-focused.file-name,.is-focused.input,.is-focused.pagination-ellipsis,.is-focused.pagination-link,.is-focused.pagination-next,.is-focused.pagination-previous,.is-focused.textarea,.pagination-ellipsis:active,.pagination-ellipsis:focus,.pagination-link:active,.pagination-link:focus,.pagination-next:active,.pagination-next:focus,.pagination-previous:active,.pagination-previous:focus,.select select.is-active,.select select.is-focused,.select select:active,.select select:focus,.textarea:active,.textarea:focus{outline:0}.button[disabled],.file-cta[disabled],.file-name[disabled],.input[disabled],.pagination-ellipsis[disabled],.pagination-link[disabled],.pagination-next[disabled],.pagination-previous[disabled],.select fieldset[disabled] select,.select select[disabled],.textarea[disabled],fieldset[disabled] .button,fieldset[disabled] .file-cta,fieldset[disabled] .file-name,fieldset[disabled] .input,fieldset[disabled] .pagination-ellipsis,fieldset[disabled] .pagination-link,fieldset[disabled] .pagination-next,fieldset[disabled] .pagination-previous,fieldset[disabled] .select select,fieldset[disabled] .textarea{cursor:not-allowed}/*! minireset.css v0.0.6 | MIT License | github.com/jgthms/minireset.css */blockquote,body,dd,dl,dt,fieldset,figure,h1,h2,h3,h4,h5,h6,hr,html,iframe,legend,li,ol,p,pre,textarea,ul{margin:0;padding:0}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:400}ul{list-style:none}button,input,select,textarea{margin:0}html{box-sizing:border-box}*,::after,::before{box-sizing:inherit}img,video{height:auto;max-width:100%}iframe{border:0}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}td:not([align]),th:not([align]){text-align:inherit}html{background-color:#fff;font-size:16px;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;min-width:300px;overflow-x:hidden;overflow-y:scroll;text-rendering:optimizeLegibility;-webkit-text-size-adjust:100%;-moz-text-size-adjust:100%;-ms-text-size-adjust:100%;text-size-adjust:100%}article,aside,figure,footer,header,hgroup,section{display:block}body,button,input,optgroup,select,textarea{font-family:BlinkMacSystemFont,-apple-system,"Segoe UI",Roboto,Oxygen,Ubuntu,Cantarell,"Fira Sans","Droid Sans","Helvetica Neue",Helvetica,Arial,sans-serif}code,pre{-moz-osx-font-smoothing:auto;-webkit-font-smoothing:auto;font-family:monospace}body{color:#4a4a4a;font-size:1em;font-weight:400;line-height:1.5}a{color:#3273dc;cursor:pointer;text-decoration:none}a strong{color:currentColor}a:hover{color:#363636}code{background-color:#f5f5f5;color:#da1039;font-size:.875em;font-weight:400;padding:.25em .5em .25em}hr{background-color:#f5f5f5;border:none;display:block;height:2px;margin:1.5rem 0}img{height:auto;max-width:100%}input[type=checkbox],input[type=radio]{vertical-align:baseline}small{font-size:.875em}span{font-style:inherit;font-weight:inherit}strong{color:#363636;font-weight:700}fieldset{border:none}pre{-webkit-overflow-scrolling:touch;background-color:#f5f5f5;color:#4a4a4a;font-size:.875em;overflow-x:auto;padding:1.25rem 1.5rem;white-space:pre;word-wrap:normal}pre code{background-color:transparent;color:currentColor;font-size:1em;padding:0}table td,table th{vertical-align:top}table td:not([align]),table th:not([align]){text-align:inherit}table th{color:#363636}.box{background-color:#fff;border-radius:6px;box-shadow:0 .5em 1em -.125em rgba(10,10,10,.1),0 0 0 1px rgba(10,10,10,.02);color:#4a4a4a;display:block;padding:1.25rem}a.box:focus,a.box:hover{box-shadow:0 .5em 1em -.125em rgba(10,10,10,.1),0 0 0 1px #3273dc}a.box:active{box-shadow:inset 0 1px 2px rgba(10,10,10,.2),0 0 0 1px #3273dc}.button{background-color:#fff;border-color:#dbdbdb;border-width:1px;color:#363636;cursor:pointer;justify-content:center;padding-bottom:calc(.5em - 1px);padding-left:1em;padding-right:1em;padding-top:calc(.5em - 1px);text-align:center;white-space:nowrap}.button strong{color:inherit}.button .icon,.button .icon.is-large,.button .icon.is-medium,.button .icon.is-small{height:1.5em;width:1.5em}.button .icon:first-child:not(:last-child){margin-left:calc(-.5em - 1px);margin-right:.25em}.button .icon:last-child:not(:first-child){margin-left:.25em;margin-right:calc(-.5em - 1px)}.button .icon:first-child:last-child{margin-left:calc(-.5em - 1px);margin-right:calc(-.5em - 1px)}.button.is-hovered,.button:hover{border-color:#b5b5b5;color:#363636}.button.is-focused,.button:focus{border-color:#3273dc;color:#363636}.button.is-focused:not(:active),.button:focus:not(:active){box-shadow:0 0 0 .125em rgba(50,115,220,.25)}.button.is-active,.button:active{border-color:#4a4a4a;color:#363636}.button.is-text{background-color:transparent;border-color:transparent;color:#4a4a4a;text-decoration:underline}.button.is-text.is-focused,.button.is-text.is-hovered,.button.is-text:focus,.button.is-text:hover{background-color:#f5f5f5;color:#363636}.button.is-text.is-active,.button.is-text:active{background-color:#e8e8e8;color:#363636}.button.is-text[disabled],fieldset[disabled] .button.is-text{background-color:transparent;border-color:transparent;box-shadow:none}.button.is-white{background-color:#fff;border-color:transparent;color:#0a0a0a}.button.is-white.is-hovered,.button.is-white:hover{background-color:#f9f9f9;border-color:transparent;color:#0a0a0a}.button.is-white.is-focused,.button.is-white:focus{border-color:transparent;color:#0a0a0a}.button.is-white.is-focused:not(:active),.button.is-white:focus:not(:active){box-shadow:0 0 0 .125em rgba(255,255,255,.25)}.button.is-white.is-active,.button.is-white:active{background-color:#f2f2f2;border-color:transparent;color:#0a0a0a}.button.is-white[disabled],fieldset[disabled] .button.is-white{background-color:#fff;border-color:transparent;box-shadow:none}.button.is-white.is-inverted{background-color:#0a0a0a;color:#fff}.button.is-white.is-inverted.is-hovered,.button.is-white.is-inverted:hover{background-color:#000}.button.is-white.is-inverted[disabled],fieldset[disabled] .button.is-white.is-inverted{background-color:#0a0a0a;border-color:transparent;box-shadow:none;color:#fff}.button.is-white.is-loading::after{border-color:transparent transparent #0a0a0a #0a0a0a!important}.button.is-white.is-outlined{background-color:transparent;border-color:#fff;color:#fff}.button.is-white.is-outlined.is-focused,.button.is-white.is-outlined.is-hovered,.button.is-white.is-outlined:focus,.button.is-white.is-outlined:hover{background-color:#fff;border-color:#fff;color:#0a0a0a}.button.is-white.is-outlined.is-loading::after{border-color:transparent transparent #fff #fff!important}.button.is-white.is-outlined.is-loading.is-focused::after,.button.is-white.is-outlined.is-loading.is-hovered::after,.button.is-white.is-outlined.is-loading:focus::after,.button.is-white.is-outlined.is-loading:hover::after{border-color:transparent transparent #0a0a0a #0a0a0a!important}.button.is-white.is-outlined[disabled],fieldset[disabled] .button.is-white.is-outlined{background-color:transparent;border-color:#fff;box-shadow:none;color:#fff}.button.is-white.is-inverted.is-outlined{background-color:transparent;border-color:#0a0a0a;color:#0a0a0a}.button.is-white.is-inverted.is-outlined.is-focused,.button.is-white.is-inverted.is-outlined.is-hovered,.button.is-white.is-inverted.is-outlined:focus,.button.is-white.is-inverted.is-outlined:hover{background-color:#0a0a0a;color:#fff}.button.is-white.is-inverted.is-outlined.is-loading.is-focused::after,.button.is-white.is-inverted.is-outlined.is-loading.is-hovered::after,.button.is-white.is-inverted.is-outlined.is-loading:focus::after,.button.is-white.is-inverted.is-outlined.is-loading:hover::after{border-color:transparent transparent #fff #fff!important}.button.is-white.is-inverted.is-outlined[disabled],fieldset[disabled] .button.is-white.is-inverted.is-outlined{background-color:transparent;border-color:#0a0a0a;box-shadow:none;color:#0a0a0a}.button.is-black{background-color:#0a0a0a;border-color:transparent;color:#fff}.button.is-black.is-hovered,.button.is-black:hover{background-color:#040404;border-color:transparent;color:#fff}.button.is-black.is-focused,.button.is-black:focus{border-color:transparent;color:#fff}.button.is-black.is-focused:not(:active),.button.is-black:focus:not(:active){box-shadow:0 0 0 .125em rgba(10,10,10,.25)}.button.is-black.is-active,.button.is-black:active{background-color:#000;border-color:transparent;color:#fff}.button.is-black[disabled],fieldset[disabled] .button.is-black{background-color:#0a0a0a;border-color:transparent;box-shadow:none}.button.is-black.is-inverted{background-color:#fff;color:#0a0a0a}.button.is-black.is-inverted.is-hovered,.button.is-black.is-inverted:hover{background-color:#f2f2f2}.button.is-black.is-inverted[disabled],fieldset[disabled] .button.is-black.is-inverted{background-color:#fff;border-color:transparent;box-shadow:none;color:#0a0a0a}.button.is-black.is-loading::after{border-color:transparent transparent #fff #fff!important}.button.is-black.is-outlined{background-color:transparent;border-color:#0a0a0a;color:#0a0a0a}.button.is-black.is-outlined.is-focused,.button.is-black.is-outlined.is-hovered,.button.is-black.is-outlined:focus,.button.is-black.is-outlined:hover{background-color:#0a0a0a;border-color:#0a0a0a;color:#fff}.button.is-black.is-outlined.is-loading::after{border-color:transparent transparent #0a0a0a #0a0a0a!important}.button.is-black.is-outlined.is-loading.is-focused::after,.button.is-black.is-outlined.is-loading.is-hovered::after,.button.is-black.is-outlined.is-loading:focus::after,.button.is-black.is-outlined.is-loading:hover::after{border-color:transparent transparent #fff #fff!important}.button.is-black.is-outlined[disabled],fieldset[disabled] .button.is-black.is-outlined{background-color:transparent;border-color:#0a0a0a;box-shadow:none;color:#0a0a0a}.button.is-black.is-inverted.is-outlined{background-color:transparent;border-color:#fff;color:#fff}.button.is-black.is-inverted.is-outlined.is-focused,.button.is-black.is-inverted.is-outlined.is-hovered,.button.is-black.is-inverted.is-outlined:focus,.button.is-black.is-inverted.is-outlined:hover{background-color:#fff;color:#0a0a0a}.button.is-black.is-inverted.is-outlined.is-loading.is-focused::after,.button.is-black.is-inverted.is-outlined.is-loading.is-hovered::after,.button.is-black.is-inverted.is-outlined.is-loading:focus::after,.button.is-black.is-inverted.is-outlined.is-loading:hover::after{border-color:transparent transparent #0a0a0a #0a0a0a!important}.button.is-black.is-inverted.is-outlined[disabled],fieldset[disabled] .button.is-black.is-inverted.is-outlined{background-color:transparent;border-color:#fff;box-shadow:none;color:#fff}.button.is-light{background-color:#f5f5f5;border-color:transparent;color:rgba(0,0,0,.7)}.button.is-light.is-hovered,.button.is-light:hover{background-color:#eee;border-color:transparent;color:rgba(0,0,0,.7)}.button.is-light.is-focused,.button.is-light:focus{border-color:transparent;color:rgba(0,0,0,.7)}.button.is-light.is-focused:not(:active),.button.is-light:focus:not(:active){box-shadow:0 0 0 .125em rgba(245,245,245,.25)}.button.is-light.is-active,.button.is-light:active{background-color:#e8e8e8;border-color:transparent;color:rgba(0,0,0,.7)}.button.is-light[disabled],fieldset[disabled] .button.is-light{background-color:#f5f5f5;border-color:transparent;box-shadow:none}.button.is-light.is-inverted{background-color:rgba(0,0,0,.7);color:#f5f5f5}.button.is-light.is-inverted.is-hovered,.button.is-light.is-inverted:hover{background-color:rgba(0,0,0,.7)}.button.is-light.is-inverted[disabled],fieldset[disabled] .button.is-light.is-inverted{background-color:rgba(0,0,0,.7);border-color:transparent;box-shadow:none;color:#f5f5f5}.button.is-light.is-loading::after{border-color:transparent transparent rgba(0,0,0,.7) rgba(0,0,0,.7)!important}.button.is-light.is-outlined{background-color:transparent;border-color:#f5f5f5;color:#f5f5f5}.button.is-light.is-outlined.is-focused,.button.is-light.is-outlined.is-hovered,.button.is-light.is-outlined:focus,.button.is-light.is-outlined:hover{background-color:#f5f5f5;border-color:#f5f5f5;color:rgba(0,0,0,.7)}.button.is-light.is-outlined.is-loading::after{border-color:transparent transparent #f5f5f5 #f5f5f5!important}.button.is-light.is-outlined.is-loading.is-focused::after,.button.is-light.is-outlined.is-loading.is-hovered::after,.button.is-light.is-outlined.is-loading:focus::after,.button.is-light.is-outlined.is-loading:hover::after{border-color:transparent transparent rgba(0,0,0,.7) rgba(0,0,0,.7)!important}.button.is-light.is-outlined[disabled],fieldset[disabled] .button.is-light.is-outlined{background-color:transparent;border-color:#f5f5f5;box-shadow:none;color:#f5f5f5}.button.is-light.is-inverted.is-outlined{background-color:transparent;border-color:rgba(0,0,0,.7);color:rgba(0,0,0,.7)}.button.is-light.is-inverted.is-outlined.is-focused,.button.is-light.is-inverted.is-outlined.is-hovered,.button.is-light.is-inverted.is-outlined:focus,.button.is-light.is-inverted.is-outlined:hover{background-color:rgba(0,0,0,.7);color:#f5f5f5}.button.is-light.is-inverted.is-outlined.is-loading.is-focused::after,.button.is-light.is-inverted.is-outlined.is-loading.is-hovered::after,.button.is-light.is-inverted.is-outlined.is-loading:focus::after,.button.is-light.is-inverted.is-outlined.is-loading:hover::after{border-color:transparent transparent #f5f5f5 #f5f5f5!important}.button.is-light.is-inverted.is-outlined[disabled],fieldset[disabled] .button.is-light.is-inverted.is-outlined{background-color:transparent;border-color:rgba(0,0,0,.7);box-shadow:none;color:rgba(0,0,0,.7)}.button.is-dark{background-color:#363636;border-color:transparent;color:#fff}.button.is-dark.is-hovered,.button.is-dark:hover{background-color:#2f2f2f;border-color:transparent;color:#fff}.button.is-dark.is-focused,.button.is-dark:focus{border-color:transparent;color:#fff}.button.is-dark.is-focused:not(:active),.button.is-dark:focus:not(:active){box-shadow:0 0 0 .125em rgba(54,54,54,.25)}.button.is-dark.is-active,.button.is-dark:active{background-color:#292929;border-color:transparent;color:#fff}.button.is-dark[disabled],fieldset[disabled] .button.is-dark{background-color:#363636;border-color:transparent;box-shadow:none}.button.is-dark.is-inverted{background-color:#fff;color:#363636}.button.is-dark.is-inverted.is-hovered,.button.is-dark.is-inverted:hover{background-color:#f2f2f2}.button.is-dark.is-inverted[disabled],fieldset[disabled] .button.is-dark.is-inverted{background-color:#fff;border-color:transparent;box-shadow:none;color:#363636}.button.is-dark.is-loading::after{border-color:transparent transparent #fff #fff!important}.button.is-dark.is-outlined{background-color:transparent;border-color:#363636;color:#363636}.button.is-dark.is-outlined.is-focused,.button.is-dark.is-outlined.is-hovered,.button.is-dark.is-outlined:focus,.button.is-dark.is-outlined:hover{background-color:#363636;border-color:#363636;color:#fff}.button.is-dark.is-outlined.is-loading::after{border-color:transparent transparent #363636 #363636!important}.button.is-dark.is-outlined.is-loading.is-focused::after,.button.is-dark.is-outlined.is-loading.is-hovered::after,.button.is-dark.is-outlined.is-loading:focus::after,.button.is-dark.is-outlined.is-loading:hover::after{border-color:transparent transparent #fff #fff!important}.button.is-dark.is-outlined[disabled],fieldset[disabled] .button.is-dark.is-outlined{background-color:transparent;border-color:#363636;box-shadow:none;color:#363636}.button.is-dark.is-inverted.is-outlined{background-color:transparent;border-color:#fff;color:#fff}.button.is-dark.is-inverted.is-outlined.is-focused,.button.is-dark.is-inverted.is-outlined.is-hovered,.button.is-dark.is-inverted.is-outlined:focus,.button.is-dark.is-inverted.is-outlined:hover{background-color:#fff;color:#363636}.button.is-dark.is-inverted.is-outlined.is-loading.is-focused::after,.button.is-dark.is-inverted.is-outlined.is-loading.is-hovered::after,.button.is-dark.is-inverted.is-outlined.is-loading:focus::after,.button.is-dark.is-inverted.is-outlined.is-loading:hover::after{border-color:transparent transparent #363636 #363636!important}.button.is-dark.is-inverted.is-outlined[disabled],fieldset[disabled] .button.is-dark.is-inverted.is-outlined{background-color:transparent;border-color:#fff;box-shadow:none;color:#fff}.button.is-primary{background-color:#00d1b2;border-color:transparent;color:#fff}.button.is-primary.is-hovered,.button.is-primary:hover{background-color:#00c4a7;border-color:transparent;color:#fff}.button.is-primary.is-focused,.button.is-primary:focus{border-color:transparent;color:#fff}.button.is-primary.is-focused:not(:active),.button.is-primary:focus:not(:active){box-shadow:0 0 0 .125em rgba(0,209,178,.25)}.button.is-primary.is-active,.button.is-primary:active{background-color:#00b89c;border-color:transparent;color:#fff}.button.is-primary[disabled],fieldset[disabled] .button.is-primary{background-color:#00d1b2;border-color:transparent;box-shadow:none}.button.is-primary.is-inverted{background-color:#fff;color:#00d1b2}.button.is-primary.is-inverted.is-hovered,.button.is-primary.is-inverted:hover{background-color:#f2f2f2}.button.is-primary.is-inverted[disabled],fieldset[disabled] .button.is-primary.is-inverted{background-color:#fff;border-color:transparent;box-shadow:none;color:#00d1b2}.button.is-primary.is-loading::after{border-color:transparent transparent #fff #fff!important}.button.is-primary.is-outlined{background-color:transparent;border-color:#00d1b2;color:#00d1b2}.button.is-primary.is-outlined.is-focused,.button.is-primary.is-outlined.is-hovered,.button.is-primary.is-outlined:focus,.button.is-primary.is-outlined:hover{background-color:#00d1b2;border-color:#00d1b2;color:#fff}.button.is-primary.is-outlined.is-loading::after{border-color:transparent transparent #00d1b2 #00d1b2!important}.button.is-primary.is-outlined.is-loading.is-focused::after,.button.is-primary.is-outlined.is-loading.is-hovered::after,.button.is-primary.is-outlined.is-loading:focus::after,.button.is-primary.is-outlined.is-loading:hover::after{border-color:transparent transparent #fff #fff!important}.button.is-primary.is-outlined[disabled],fieldset[disabled] .button.is-primary.is-outlined{background-color:transparent;border-color:#00d1b2;box-shadow:none;color:#00d1b2}.button.is-primary.is-inverted.is-outlined{background-color:transparent;border-color:#fff;color:#fff}.button.is-primary.is-inverted.is-outlined.is-focused,.button.is-primary.is-inverted.is-outlined.is-hovered,.button.is-primary.is-inverted.is-outlined:focus,.button.is-primary.is-inverted.is-outlined:hover{background-color:#fff;color:#00d1b2}.button.is-primary.is-inverted.is-outlined.is-loading.is-focused::after,.button.is-primary.is-inverted.is-outlined.is-loading.is-hovered::after,.button.is-primary.is-inverted.is-outlined.is-loading:focus::after,.button.is-primary.is-inverted.is-outlined.is-loading:hover::after{border-color:transparent transparent #00d1b2 #00d1b2!important}.button.is-primary.is-inverted.is-outlined[disabled],fieldset[disabled] .button.is-primary.is-inverted.is-outlined{background-color:transparent;border-color:#fff;box-shadow:none;color:#fff}.button.is-primary.is-light{background-color:#ebfffc;color:#00947e}.button.is-primary.is-light.is-hovered,.button.is-primary.is-light:hover{background-color:#defffa;border-color:transparent;color:#00947e}.button.is-primary.is-light.is-active,.button.is-primary.is-light:active{background-color:#d1fff8;border-color:transparent;color:#00947e}.button.is-link{background-color:#3273dc;border-color:transparent;color:#fff}.button.is-link.is-hovered,.button.is-link:hover{background-color:#276cda;border-color:transparent;color:#fff}.button.is-link.is-focused,.button.is-link:focus{border-color:transparent;color:#fff}.button.is-link.is-focused:not(:active),.button.is-link:focus:not(:active){box-shadow:0 0 0 .125em rgba(50,115,220,.25)}.button.is-link.is-active,.button.is-link:active{background-color:#2366d1;border-color:transparent;color:#fff}.button.is-link[disabled],fieldset[disabled] .button.is-link{background-color:#3273dc;border-color:transparent;box-shadow:none}.button.is-link.is-inverted{background-color:#fff;color:#3273dc}.button.is-link.is-inverted.is-hovered,.button.is-link.is-inverted:hover{background-color:#f2f2f2}.button.is-link.is-inverted[disabled],fieldset[disabled] .button.is-link.is-inverted{background-color:#fff;border-color:transparent;box-shadow:none;color:#3273dc}.button.is-link.is-loading::after{border-color:transparent transparent #fff #fff!important}.button.is-link.is-outlined{background-color:transparent;border-color:#3273dc;color:#3273dc}.button.is-link.is-outlined.is-focused,.button.is-link.is-outlined.is-hovered,.button.is-link.is-outlined:focus,.button.is-link.is-outlined:hover{background-color:#3273dc;border-color:#3273dc;color:#fff}.button.is-link.is-outlined.is-loading::after{border-color:transparent transparent #3273dc #3273dc!important}.button.is-link.is-outlined.is-loading.is-focused::after,.button.is-link.is-outlined.is-loading.is-hovered::after,.button.is-link.is-outlined.is-loading:focus::after,.button.is-link.is-outlined.is-loading:hover::after{border-color:transparent transparent #fff #fff!important}.button.is-link.is-outlined[disabled],fieldset[disabled] .button.is-link.is-outlined{background-color:transparent;border-color:#3273dc;box-shadow:none;color:#3273dc}.button.is-link.is-inverted.is-outlined{background-color:transparent;border-color:#fff;color:#fff}.button.is-link.is-inverted.is-outlined.is-focused,.button.is-link.is-inverted.is-outlined.is-hovered,.button.is-link.is-inverted.is-outlined:focus,.button.is-link.is-inverted.is-outlined:hover{background-color:#fff;color:#3273dc}.button.is-link.is-inverted.is-outlined.is-loading.is-focused::after,.button.is-link.is-inverted.is-outlined.is-loading.is-hovered::after,.button.is-link.is-inverted.is-outlined.is-loading:focus::after,.button.is-link.is-inverted.is-outlined.is-loading:hover::after{border-color:transparent transparent #3273dc #3273dc!important}.button.is-link.is-inverted.is-outlined[disabled],fieldset[disabled] .button.is-link.is-inverted.is-outlined{background-color:transparent;border-color:#fff;box-shadow:none;color:#fff}.button.is-link.is-light{background-color:#eef3fc;color:#2160c4}.button.is-link.is-light.is-hovered,.button.is-link.is-light:hover{background-color:#e3ecfa;border-color:transparent;color:#2160c4}.button.is-link.is-light.is-active,.button.is-link.is-light:active{background-color:#d8e4f8;border-color:transparent;color:#2160c4}.button.is-info{background-color:#3298dc;border-color:transparent;color:#fff}.button.is-info.is-hovered,.button.is-info:hover{background-color:#2793da;border-color:transparent;color:#fff}.button.is-info.is-focused,.button.is-info:focus{border-color:transparent;color:#fff}.button.is-info.is-focused:not(:active),.button.is-info:focus:not(:active){box-shadow:0 0 0 .125em rgba(50,152,220,.25)}.button.is-info.is-active,.button.is-info:active{background-color:#238cd1;border-color:transparent;color:#fff}.button.is-info[disabled],fieldset[disabled] .button.is-info{background-color:#3298dc;border-color:transparent;box-shadow:none}.button.is-info.is-inverted{background-color:#fff;color:#3298dc}.button.is-info.is-inverted.is-hovered,.button.is-info.is-inverted:hover{background-color:#f2f2f2}.button.is-info.is-inverted[disabled],fieldset[disabled] .button.is-info.is-inverted{background-color:#fff;border-color:transparent;box-shadow:none;color:#3298dc}.button.is-info.is-loading::after{border-color:transparent transparent #fff #fff!important}.button.is-info.is-outlined{background-color:transparent;border-color:#3298dc;color:#3298dc}.button.is-info.is-outlined.is-focused,.button.is-info.is-outlined.is-hovered,.button.is-info.is-outlined:focus,.button.is-info.is-outlined:hover{background-color:#3298dc;border-color:#3298dc;color:#fff}.button.is-info.is-outlined.is-loading::after{border-color:transparent transparent #3298dc #3298dc!important}.button.is-info.is-outlined.is-loading.is-focused::after,.button.is-info.is-outlined.is-loading.is-hovered::after,.button.is-info.is-outlined.is-loading:focus::after,.button.is-info.is-outlined.is-loading:hover::after{border-color:transparent transparent #fff #fff!important}.button.is-info.is-outlined[disabled],fieldset[disabled] .button.is-info.is-outlined{background-color:transparent;border-color:#3298dc;box-shadow:none;color:#3298dc}.button.is-info.is-inverted.is-outlined{background-color:transparent;border-color:#fff;color:#fff}.button.is-info.is-inverted.is-outlined.is-focused,.button.is-info.is-inverted.is-outlined.is-hovered,.button.is-info.is-inverted.is-outlined:focus,.button.is-info.is-inverted.is-outlined:hover{background-color:#fff;color:#3298dc}.button.is-info.is-inverted.is-outlined.is-loading.is-focused::after,.button.is-info.is-inverted.is-outlined.is-loading.is-hovered::after,.button.is-info.is-inverted.is-outlined.is-loading:focus::after,.button.is-info.is-inverted.is-outlined.is-loading:hover::after{border-color:transparent transparent #3298dc #3298dc!important}.button.is-info.is-inverted.is-outlined[disabled],fieldset[disabled] .button.is-info.is-inverted.is-outlined{background-color:transparent;border-color:#fff;box-shadow:none;color:#fff}.button.is-info.is-light{background-color:#eef6fc;color:#1d72aa}.button.is-info.is-light.is-hovered,.button.is-info.is-light:hover{background-color:#e3f1fa;border-color:transparent;color:#1d72aa}.button.is-info.is-light.is-active,.button.is-info.is-light:active{background-color:#d8ebf8;border-color:transparent;color:#1d72aa}.button.is-success{background-color:#48c774;border-color:transparent;color:#fff}.button.is-success.is-hovered,.button.is-success:hover{background-color:#3ec46d;border-color:transparent;color:#fff}.button.is-success.is-focused,.button.is-success:focus{border-color:transparent;color:#fff}.button.is-success.is-focused:not(:active),.button.is-success:focus:not(:active){box-shadow:0 0 0 .125em rgba(72,199,116,.25)}.button.is-success.is-active,.button.is-success:active{background-color:#3abb67;border-color:transparent;color:#fff}.button.is-success[disabled],fieldset[disabled] .button.is-success{background-color:#48c774;border-color:transparent;box-shadow:none}.button.is-success.is-inverted{background-color:#fff;color:#48c774}.button.is-success.is-inverted.is-hovered,.button.is-success.is-inverted:hover{background-color:#f2f2f2}.button.is-success.is-inverted[disabled],fieldset[disabled] .button.is-success.is-inverted{background-color:#fff;border-color:transparent;box-shadow:none;color:#48c774}.button.is-success.is-loading::after{border-color:transparent transparent #fff #fff!important}.button.is-success.is-outlined{background-color:transparent;border-color:#48c774;color:#48c774}.button.is-success.is-outlined.is-focused,.button.is-success.is-outlined.is-hovered,.button.is-success.is-outlined:focus,.button.is-success.is-outlined:hover{background-color:#48c774;border-color:#48c774;color:#fff}.button.is-success.is-outlined.is-loading::after{border-color:transparent transparent #48c774 #48c774!important}.button.is-success.is-outlined.is-loading.is-focused::after,.button.is-success.is-outlined.is-loading.is-hovered::after,.button.is-success.is-outlined.is-loading:focus::after,.button.is-success.is-outlined.is-loading:hover::after{border-color:transparent transparent #fff #fff!important}.button.is-success.is-outlined[disabled],fieldset[disabled] .button.is-success.is-outlined{background-color:transparent;border-color:#48c774;box-shadow:none;color:#48c774}.button.is-success.is-inverted.is-outlined{background-color:transparent;border-color:#fff;color:#fff}.button.is-success.is-inverted.is-outlined.is-focused,.button.is-success.is-inverted.is-outlined.is-hovered,.button.is-success.is-inverted.is-outlined:focus,.button.is-success.is-inverted.is-outlined:hover{background-color:#fff;color:#48c774}.button.is-success.is-inverted.is-outlined.is-loading.is-focused::after,.button.is-success.is-inverted.is-outlined.is-loading.is-hovered::after,.button.is-success.is-inverted.is-outlined.is-loading:focus::after,.button.is-success.is-inverted.is-outlined.is-loading:hover::after{border-color:transparent transparent #48c774 #48c774!important}.button.is-success.is-inverted.is-outlined[disabled],fieldset[disabled] .button.is-success.is-inverted.is-outlined{background-color:transparent;border-color:#fff;box-shadow:none;color:#fff}.button.is-success.is-light{background-color:#effaf3;color:#257942}.button.is-success.is-light.is-hovered,.button.is-success.is-light:hover{background-color:#e6f7ec;border-color:transparent;color:#257942}.button.is-success.is-light.is-active,.button.is-success.is-light:active{background-color:#dcf4e4;border-color:transparent;color:#257942}.button.is-warning{background-color:#ffdd57;border-color:transparent;color:rgba(0,0,0,.7)}.button.is-warning.is-hovered,.button.is-warning:hover{background-color:#ffdb4a;border-color:transparent;color:rgba(0,0,0,.7)}.button.is-warning.is-focused,.button.is-warning:focus{border-color:transparent;color:rgba(0,0,0,.7)}.button.is-warning.is-focused:not(:active),.button.is-warning:focus:not(:active){box-shadow:0 0 0 .125em rgba(255,221,87,.25)}.button.is-warning.is-active,.button.is-warning:active{background-color:#ffd83d;border-color:transparent;color:rgba(0,0,0,.7)}.button.is-warning[disabled],fieldset[disabled] .button.is-warning{background-color:#ffdd57;border-color:transparent;box-shadow:none}.button.is-warning.is-inverted{background-color:rgba(0,0,0,.7);color:#ffdd57}.button.is-warning.is-inverted.is-hovered,.button.is-warning.is-inverted:hover{background-color:rgba(0,0,0,.7)}.button.is-warning.is-inverted[disabled],fieldset[disabled] .button.is-warning.is-inverted{background-color:rgba(0,0,0,.7);border-color:transparent;box-shadow:none;color:#ffdd57}.button.is-warning.is-loading::after{border-color:transparent transparent rgba(0,0,0,.7) rgba(0,0,0,.7)!important}.button.is-warning.is-outlined{background-color:transparent;border-color:#ffdd57;color:#ffdd57}.button.is-warning.is-outlined.is-focused,.button.is-warning.is-outlined.is-hovered,.button.is-warning.is-outlined:focus,.button.is-warning.is-outlined:hover{background-color:#ffdd57;border-color:#ffdd57;color:rgba(0,0,0,.7)}.button.is-warning.is-outlined.is-loading::after{border-color:transparent transparent #ffdd57 #ffdd57!important}.button.is-warning.is-outlined.is-loading.is-focused::after,.button.is-warning.is-outlined.is-loading.is-hovered::after,.button.is-warning.is-outlined.is-loading:focus::after,.button.is-warning.is-outlined.is-loading:hover::after{border-color:transparent transparent rgba(0,0,0,.7) rgba(0,0,0,.7)!important}.button.is-warning.is-outlined[disabled],fieldset[disabled] .button.is-warning.is-outlined{background-color:transparent;border-color:#ffdd57;box-shadow:none;color:#ffdd57}.button.is-warning.is-inverted.is-outlined{background-color:transparent;border-color:rgba(0,0,0,.7);color:rgba(0,0,0,.7)}.button.is-warning.is-inverted.is-outlined.is-focused,.button.is-warning.is-inverted.is-outlined.is-hovered,.button.is-warning.is-inverted.is-outlined:focus,.button.is-warning.is-inverted.is-outlined:hover{background-color:rgba(0,0,0,.7);color:#ffdd57}.button.is-warning.is-inverted.is-outlined.is-loading.is-focused::after,.button.is-warning.is-inverted.is-outlined.is-loading.is-hovered::after,.button.is-warning.is-inverted.is-outlined.is-loading:focus::after,.button.is-warning.is-inverted.is-outlined.is-loading:hover::after{border-color:transparent transparent #ffdd57 #ffdd57!important}.button.is-warning.is-inverted.is-outlined[disabled],fieldset[disabled] .button.is-warning.is-inverted.is-outlined{background-color:transparent;border-color:rgba(0,0,0,.7);box-shadow:none;color:rgba(0,0,0,.7)}.button.is-warning.is-light{background-color:#fffbeb;color:#947600}.button.is-warning.is-light.is-hovered,.button.is-warning.is-light:hover{background-color:#fff8de;border-color:transparent;color:#947600}.button.is-warning.is-light.is-active,.button.is-warning.is-light:active{background-color:#fff6d1;border-color:transparent;color:#947600}.button.is-danger{background-color:#f14668;border-color:transparent;color:#fff}.button.is-danger.is-hovered,.button.is-danger:hover{background-color:#f03a5f;border-color:transparent;color:#fff}.button.is-danger.is-focused,.button.is-danger:focus{border-color:transparent;color:#fff}.button.is-danger.is-focused:not(:active),.button.is-danger:focus:not(:active){box-shadow:0 0 0 .125em rgba(241,70,104,.25)}.button.is-danger.is-active,.button.is-danger:active{background-color:#ef2e55;border-color:transparent;color:#fff}.button.is-danger[disabled],fieldset[disabled] .button.is-danger{background-color:#f14668;border-color:transparent;box-shadow:none}.button.is-danger.is-inverted{background-color:#fff;color:#f14668}.button.is-danger.is-inverted.is-hovered,.button.is-danger.is-inverted:hover{background-color:#f2f2f2}.button.is-danger.is-inverted[disabled],fieldset[disabled] .button.is-danger.is-inverted{background-color:#fff;border-color:transparent;box-shadow:none;color:#f14668}.button.is-danger.is-loading::after{border-color:transparent transparent #fff #fff!important}.button.is-danger.is-outlined{background-color:transparent;border-color:#f14668;color:#f14668}.button.is-danger.is-outlined.is-focused,.button.is-danger.is-outlined.is-hovered,.button.is-danger.is-outlined:focus,.button.is-danger.is-outlined:hover{background-color:#f14668;border-color:#f14668;color:#fff}.button.is-danger.is-outlined.is-loading::after{border-color:transparent transparent #f14668 #f14668!important}.button.is-danger.is-outlined.is-loading.is-focused::after,.button.is-danger.is-outlined.is-loading.is-hovered::after,.button.is-danger.is-outlined.is-loading:focus::after,.button.is-danger.is-outlined.is-loading:hover::after{border-color:transparent transparent #fff #fff!important}.button.is-danger.is-outlined[disabled],fieldset[disabled] .button.is-danger.is-outlined{background-color:transparent;border-color:#f14668;box-shadow:none;color:#f14668}.button.is-danger.is-inverted.is-outlined{background-color:transparent;border-color:#fff;color:#fff}.button.is-danger.is-inverted.is-outlined.is-focused,.button.is-danger.is-inverted.is-outlined.is-hovered,.button.is-danger.is-inverted.is-outlined:focus,.button.is-danger.is-inverted.is-outlined:hover{background-color:#fff;color:#f14668}.button.is-danger.is-inverted.is-outlined.is-loading.is-focused::after,.button.is-danger.is-inverted.is-outlined.is-loading.is-hovered::after,.button.is-danger.is-inverted.is-outlined.is-loading:focus::after,.button.is-danger.is-inverted.is-outlined.is-loading:hover::after{border-color:transparent transparent #f14668 #f14668!important}.button.is-danger.is-inverted.is-outlined[disabled],fieldset[disabled] .button.is-danger.is-inverted.is-outlined{background-color:transparent;border-color:#fff;box-shadow:none;color:#fff}.button.is-danger.is-light{background-color:#feecf0;color:#cc0f35}.button.is-danger.is-light.is-hovered,.button.is-danger.is-light:hover{background-color:#fde0e6;border-color:transparent;color:#cc0f35}.button.is-danger.is-light.is-active,.button.is-danger.is-light:active{background-color:#fcd4dc;border-color:transparent;color:#cc0f35}.button.is-small{border-radius:2px;font-size:.75rem}.button.is-normal{font-size:1rem}.button.is-medium{font-size:1.25rem}.button.is-large{font-size:1.5rem}.button[disabled],fieldset[disabled] .button{background-color:#fff;border-color:#dbdbdb;box-shadow:none;opacity:.5}.button.is-fullwidth{display:flex;width:100%}.button.is-loading{color:transparent!important;pointer-events:none}.button.is-loading::after{position:absolute;left:calc(50% - (1em / 2));top:calc(50% - (1em / 2));position:absolute!important}.button.is-static{background-color:#f5f5f5;border-color:#dbdbdb;color:#7a7a7a;box-shadow:none;pointer-events:none}.button.is-rounded{border-radius:290486px;padding-left:calc(1em + .25em);padding-right:calc(1em + .25em)}.buttons{align-items:center;display:flex;flex-wrap:wrap;justify-content:flex-start}.buttons .button{margin-bottom:.5rem}.buttons .button:not(:last-child):not(.is-fullwidth){margin-right:.5rem}.buttons:last-child{margin-bottom:-.5rem}.buttons:not(:last-child){margin-bottom:1rem}.buttons.are-small .button:not(.is-normal):not(.is-medium):not(.is-large){border-radius:2px;font-size:.75rem}.buttons.are-medium .button:not(.is-small):not(.is-normal):not(.is-large){font-size:1.25rem}.buttons.are-large .button:not(.is-small):not(.is-normal):not(.is-medium){font-size:1.5rem}.buttons.has-addons .button:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.buttons.has-addons .button:not(:last-child){border-bottom-right-radius:0;border-top-right-radius:0;margin-right:-1px}.buttons.has-addons .button:last-child{margin-right:0}.buttons.has-addons .button.is-hovered,.buttons.has-addons .button:hover{z-index:2}.buttons.has-addons .button.is-active,.buttons.has-addons .button.is-focused,.buttons.has-addons .button.is-selected,.buttons.has-addons .button:active,.buttons.has-addons .button:focus{z-index:3}.buttons.has-addons .button.is-active:hover,.buttons.has-addons .button.is-focused:hover,.buttons.has-addons .button.is-selected:hover,.buttons.has-addons .button:active:hover,.buttons.has-addons .button:focus:hover{z-index:4}.buttons.has-addons .button.is-expanded{flex-grow:1;flex-shrink:1}.buttons.is-centered{justify-content:center}.buttons.is-centered:not(.has-addons) .button:not(.is-fullwidth){margin-left:.25rem;margin-right:.25rem}.buttons.is-right{justify-content:flex-end}.buttons.is-right:not(.has-addons) .button:not(.is-fullwidth){margin-left:.25rem;margin-right:.25rem}.container{flex-grow:1;margin:0 auto;position:relative;width:auto}.container.is-fluid{max-width:none!important;padding-left:32px;padding-right:32px;width:100%}@media screen and (min-width:1024px){.container{max-width:960px}}@media screen and (max-width:1215px){.container.is-widescreen:not(.is-max-desktop){max-width:1152px}}@media screen and (max-width:1407px){.container.is-fullhd:not(.is-max-desktop):not(.is-max-widescreen){max-width:1344px}}@media screen and (min-width:1216px){.container:not(.is-max-desktop){max-width:1152px}}@media screen and (min-width:1408px){.container:not(.is-max-desktop):not(.is-max-widescreen){max-width:1344px}}.content li+li{margin-top:.25em}.content blockquote:not(:last-child),.content dl:not(:last-child),.content ol:not(:last-child),.content p:not(:last-child),.content pre:not(:last-child),.content table:not(:last-child),.content ul:not(:last-child){margin-bottom:1em}.content h1,.content h2,.content h3,.content h4,.content h5,.content h6{color:#363636;font-weight:600;line-height:1.125}.content h1{font-size:2em;margin-bottom:.5em}.content h1:not(:first-child){margin-top:1em}.content h2{font-size:1.75em;margin-bottom:.5714em}.content h2:not(:first-child){margin-top:1.1428em}.content h3{font-size:1.5em;margin-bottom:.6666em}.content h3:not(:first-child){margin-top:1.3333em}.content h4{font-size:1.25em;margin-bottom:.8em}.content h5{font-size:1.125em;margin-bottom:.8888em}.content h6{font-size:1em;margin-bottom:1em}.content blockquote{background-color:#f5f5f5;border-left:5px solid #dbdbdb;padding:1.25em 1.5em}.content ol{list-style-position:outside;margin-left:2em;margin-top:1em}.content ol:not([type]){list-style-type:decimal}.content ol:not([type]).is-lower-alpha{list-style-type:lower-alpha}.content ol:not([type]).is-lower-roman{list-style-type:lower-roman}.content ol:not([type]).is-upper-alpha{list-style-type:upper-alpha}.content ol:not([type]).is-upper-roman{list-style-type:upper-roman}.content ul{list-style:disc outside;margin-left:2em;margin-top:1em}.content ul ul{list-style-type:circle;margin-top:.5em}.content ul ul ul{list-style-type:square}.content dd{margin-left:2em}.content figure{margin-left:2em;margin-right:2em;text-align:center}.content figure:not(:first-child){margin-top:2em}.content figure:not(:last-child){margin-bottom:2em}.content figure img{display:inline-block}.content figure figcaption{font-style:italic}.content pre{-webkit-overflow-scrolling:touch;overflow-x:auto;padding:1.25em 1.5em;white-space:pre;word-wrap:normal}.content sub,.content sup{font-size:75%}.content table{width:100%}.content table td,.content table th{border:1px solid #dbdbdb;border-width:0 0 1px;padding:.5em .75em;vertical-align:top}.content table th{color:#363636}.content table th:not([align]){text-align:inherit}.content table thead td,.content table thead th{border-width:0 0 2px;color:#363636}.content table tfoot td,.content table tfoot th{border-width:2px 0 0;color:#363636}.content table tbody tr:last-child td,.content table tbody tr:last-child th{border-bottom-width:0}.content .tabs li+li{margin-top:0}.content.is-small{font-size:.75rem}.content.is-medium{font-size:1.25rem}.content.is-large{font-size:1.5rem}.icon{align-items:center;display:inline-flex;justify-content:center;height:1.5rem;width:1.5rem}.icon.is-small{height:1rem;width:1rem}.icon.is-medium{height:2rem;width:2rem}.icon.is-large{height:3rem;width:3rem}.image{display:block;position:relative}.image img{display:block;height:auto;width:100%}.image img.is-rounded{border-radius:290486px}.image.is-fullwidth{width:100%}.image.is-16by9 .has-ratio,.image.is-16by9 img,.image.is-1by1 .has-ratio,.image.is-1by1 img,.image.is-1by2 .has-ratio,.image.is-1by2 img,.image.is-1by3 .has-ratio,.image.is-1by3 img,.image.is-2by1 .has-ratio,.image.is-2by1 img,.image.is-2by3 .has-ratio,.image.is-2by3 img,.image.is-3by1 .has-ratio,.image.is-3by1 img,.image.is-3by2 .has-ratio,.image.is-3by2 img,.image.is-3by4 .has-ratio,.image.is-3by4 img,.image.is-3by5 .has-ratio,.image.is-3by5 img,.image.is-4by3 .has-ratio,.image.is-4by3 img,.image.is-4by5 .has-ratio,.image.is-4by5 img,.image.is-5by3 .has-ratio,.image.is-5by3 img,.image.is-5by4 .has-ratio,.image.is-5by4 img,.image.is-9by16 .has-ratio,.image.is-9by16 img,.image.is-square .has-ratio,.image.is-square img{height:100%;width:100%}.image.is-1by1,.image.is-square{padding-top:100%}.image.is-5by4{padding-top:80%}.image.is-4by3{padding-top:75%}.image.is-3by2{padding-top:66.6666%}.image.is-5by3{padding-top:60%}.image.is-16by9{padding-top:56.25%}.image.is-2by1{padding-top:50%}.image.is-3by1{padding-top:33.3333%}.image.is-4by5{padding-top:125%}.image.is-3by4{padding-top:133.3333%}.image.is-2by3{padding-top:150%}.image.is-3by5{padding-top:166.6666%}.image.is-9by16{padding-top:177.7777%}.image.is-1by2{padding-top:200%}.image.is-1by3{padding-top:300%}.image.is-16x16{height:16px;width:16px}.image.is-24x24{height:24px;width:24px}.image.is-32x32{height:32px;width:32px}.image.is-48x48{height:48px;width:48px}.image.is-64x64{height:64px;width:64px}.image.is-96x96{height:96px;width:96px}.image.is-128x128{height:128px;width:128px}.notification{background-color:#f5f5f5;border-radius:4px;position:relative;padding:1.25rem 2.5rem 1.25rem 1.5rem}.notification a:not(.button):not(.dropdown-item){color:currentColor;text-decoration:underline}.notification strong{color:currentColor}.notification code,.notification pre{background:#fff}.notification pre code{background:0 0}.notification>.delete{right:.5rem;position:absolute;top:.5rem}.notification .content,.notification .subtitle,.notification .title{color:currentColor}.notification.is-white{background-color:#fff;color:#0a0a0a}.notification.is-black{background-color:#0a0a0a;color:#fff}.notification.is-light{background-color:#f5f5f5;color:rgba(0,0,0,.7)}.notification.is-dark{background-color:#363636;color:#fff}.notification.is-primary{background-color:#00d1b2;color:#fff}.notification.is-primary.is-light{background-color:#ebfffc;color:#00947e}.notification.is-link{background-color:#3273dc;color:#fff}.notification.is-link.is-light{background-color:#eef3fc;color:#2160c4}.notification.is-info{background-color:#3298dc;color:#fff}.notification.is-info.is-light{background-color:#eef6fc;color:#1d72aa}.notification.is-success{background-color:#48c774;color:#fff}.notification.is-success.is-light{background-color:#effaf3;color:#257942}.notification.is-warning{background-color:#ffdd57;color:rgba(0,0,0,.7)}.notification.is-warning.is-light{background-color:#fffbeb;color:#947600}.notification.is-danger{background-color:#f14668;color:#fff}.notification.is-danger.is-light{background-color:#feecf0;color:#cc0f35}.progress{-moz-appearance:none;-webkit-appearance:none;border:none;border-radius:290486px;display:block;height:1rem;overflow:hidden;padding:0;width:100%}.progress::-webkit-progress-bar{background-color:#ededed}.progress::-webkit-progress-value{background-color:#4a4a4a}.progress::-moz-progress-bar{background-color:#4a4a4a}.progress::-ms-fill{background-color:#4a4a4a;border:none}.progress.is-white::-webkit-progress-value{background-color:#fff}.progress.is-white::-moz-progress-bar{background-color:#fff}.progress.is-white::-ms-fill{background-color:#fff}.progress.is-white:indeterminate{background-image:linear-gradient(to right,#fff 30%,#ededed 30%)}.progress.is-black::-webkit-progress-value{background-color:#0a0a0a}.progress.is-black::-moz-progress-bar{background-color:#0a0a0a}.progress.is-black::-ms-fill{background-color:#0a0a0a}.progress.is-black:indeterminate{background-image:linear-gradient(to right,#0a0a0a 30%,#ededed 30%)}.progress.is-light::-webkit-progress-value{background-color:#f5f5f5}.progress.is-light::-moz-progress-bar{background-color:#f5f5f5}.progress.is-light::-ms-fill{background-color:#f5f5f5}.progress.is-light:indeterminate{background-image:linear-gradient(to right,#f5f5f5 30%,#ededed 30%)}.progress.is-dark::-webkit-progress-value{background-color:#363636}.progress.is-dark::-moz-progress-bar{background-color:#363636}.progress.is-dark::-ms-fill{background-color:#363636}.progress.is-dark:indeterminate{background-image:linear-gradient(to right,#363636 30%,#ededed 30%)}.progress.is-primary::-webkit-progress-value{background-color:#00d1b2}.progress.is-primary::-moz-progress-bar{background-color:#00d1b2}.progress.is-primary::-ms-fill{background-color:#00d1b2}.progress.is-primary:indeterminate{background-image:linear-gradient(to right,#00d1b2 30%,#ededed 30%)}.progress.is-link::-webkit-progress-value{background-color:#3273dc}.progress.is-link::-moz-progress-bar{background-color:#3273dc}.progress.is-link::-ms-fill{background-color:#3273dc}.progress.is-link:indeterminate{background-image:linear-gradient(to right,#3273dc 30%,#ededed 30%)}.progress.is-info::-webkit-progress-value{background-color:#3298dc}.progress.is-info::-moz-progress-bar{background-color:#3298dc}.progress.is-info::-ms-fill{background-color:#3298dc}.progress.is-info:indeterminate{background-image:linear-gradient(to right,#3298dc 30%,#ededed 30%)}.progress.is-success::-webkit-progress-value{background-color:#48c774}.progress.is-success::-moz-progress-bar{background-color:#48c774}.progress.is-success::-ms-fill{background-color:#48c774}.progress.is-success:indeterminate{background-image:linear-gradient(to right,#48c774 30%,#ededed 30%)}.progress.is-warning::-webkit-progress-value{background-color:#ffdd57}.progress.is-warning::-moz-progress-bar{background-color:#ffdd57}.progress.is-warning::-ms-fill{background-color:#ffdd57}.progress.is-warning:indeterminate{background-image:linear-gradient(to right,#ffdd57 30%,#ededed 30%)}.progress.is-danger::-webkit-progress-value{background-color:#f14668}.progress.is-danger::-moz-progress-bar{background-color:#f14668}.progress.is-danger::-ms-fill{background-color:#f14668}.progress.is-danger:indeterminate{background-image:linear-gradient(to right,#f14668 30%,#ededed 30%)}.progress:indeterminate{-webkit-animation-duration:1.5s;animation-duration:1.5s;-webkit-animation-iteration-count:infinite;animation-iteration-count:infinite;-webkit-animation-name:moveIndeterminate;animation-name:moveIndeterminate;-webkit-animation-timing-function:linear;animation-timing-function:linear;background-color:#ededed;background-image:linear-gradient(to right,#4a4a4a 30%,#ededed 30%);background-position:top left;background-repeat:no-repeat;background-size:150% 150%}.progress:indeterminate::-webkit-progress-bar{background-color:transparent}.progress:indeterminate::-moz-progress-bar{background-color:transparent}.progress:indeterminate::-ms-fill{animation-name:none}.progress.is-small{height:.75rem}.progress.is-medium{height:1.25rem}.progress.is-large{height:1.5rem}@-webkit-keyframes moveIndeterminate{from{background-position:200% 0}to{background-position:-200% 0}}@keyframes moveIndeterminate{from{background-position:200% 0}to{background-position:-200% 0}}.table{background-color:#fff;color:#363636}.table td,.table th{border:1px solid #dbdbdb;border-width:0 0 1px;padding:.5em .75em;vertical-align:top}.table td.is-white,.table th.is-white{background-color:#fff;border-color:#fff;color:#0a0a0a}.table td.is-black,.table th.is-black{background-color:#0a0a0a;border-color:#0a0a0a;color:#fff}.table td.is-light,.table th.is-light{background-color:#f5f5f5;border-color:#f5f5f5;color:rgba(0,0,0,.7)}.table td.is-dark,.table th.is-dark{background-color:#363636;border-color:#363636;color:#fff}.table td.is-primary,.table th.is-primary{background-color:#00d1b2;border-color:#00d1b2;color:#fff}.table td.is-link,.table th.is-link{background-color:#3273dc;border-color:#3273dc;color:#fff}.table td.is-info,.table th.is-info{background-color:#3298dc;border-color:#3298dc;color:#fff}.table td.is-success,.table th.is-success{background-color:#48c774;border-color:#48c774;color:#fff}.table td.is-warning,.table th.is-warning{background-color:#ffdd57;border-color:#ffdd57;color:rgba(0,0,0,.7)}.table td.is-danger,.table th.is-danger{background-color:#f14668;border-color:#f14668;color:#fff}.table td.is-narrow,.table th.is-narrow{white-space:nowrap;width:1%}.table td.is-selected,.table th.is-selected{background-color:#00d1b2;color:#fff}.table td.is-selected a,.table td.is-selected strong,.table th.is-selected a,.table th.is-selected strong{color:currentColor}.table td.is-vcentered,.table th.is-vcentered{vertical-align:middle}.table th{color:#363636}.table th:not([align]){text-align:inherit}.table tr.is-selected{background-color:#00d1b2;color:#fff}.table tr.is-selected a,.table tr.is-selected strong{color:currentColor}.table tr.is-selected td,.table tr.is-selected th{border-color:#fff;color:currentColor}.table thead{background-color:transparent}.table thead td,.table thead th{border-width:0 0 2px;color:#363636}.table tfoot{background-color:transparent}.table tfoot td,.table tfoot th{border-width:2px 0 0;color:#363636}.table tbody{background-color:transparent}.table tbody tr:last-child td,.table tbody tr:last-child th{border-bottom-width:0}.table.is-bordered td,.table.is-bordered th{border-width:1px}.table.is-bordered tr:last-child td,.table.is-bordered tr:last-child th{border-bottom-width:1px}.table.is-fullwidth{width:100%}.table.is-hoverable tbody tr:not(.is-selected):hover{background-color:#fafafa}.table.is-hoverable.is-striped tbody tr:not(.is-selected):hover{background-color:#fafafa}.table.is-hoverable.is-striped tbody tr:not(.is-selected):hover:nth-child(even){background-color:#f5f5f5}.table.is-narrow td,.table.is-narrow th{padding:.25em .5em}.table.is-striped tbody tr:not(.is-selected):nth-child(even){background-color:#fafafa}.table-container{-webkit-overflow-scrolling:touch;overflow:auto;overflow-y:hidden;max-width:100%}.tags{align-items:center;display:flex;flex-wrap:wrap;justify-content:flex-start}.tags .tag{margin-bottom:.5rem}.tags .tag:not(:last-child){margin-right:.5rem}.tags:last-child{margin-bottom:-.5rem}.tags:not(:last-child){margin-bottom:1rem}.tags.are-medium .tag:not(.is-normal):not(.is-large){font-size:1rem}.tags.are-large .tag:not(.is-normal):not(.is-medium){font-size:1.25rem}.tags.is-centered{justify-content:center}.tags.is-centered .tag{margin-right:.25rem;margin-left:.25rem}.tags.is-right{justify-content:flex-end}.tags.is-right .tag:not(:first-child){margin-left:.5rem}.tags.is-right .tag:not(:last-child){margin-right:0}.tags.has-addons .tag{margin-right:0}.tags.has-addons .tag:not(:first-child){margin-left:0;border-top-left-radius:0;border-bottom-left-radius:0}.tags.has-addons .tag:not(:last-child){border-top-right-radius:0;border-bottom-right-radius:0}.tag:not(body){align-items:center;background-color:#f5f5f5;border-radius:4px;color:#4a4a4a;display:inline-flex;font-size:.75rem;height:2em;justify-content:center;line-height:1.5;padding-left:.75em;padding-right:.75em;white-space:nowrap}.tag:not(body) .delete{margin-left:.25rem;margin-right:-.375rem}.tag:not(body).is-white{background-color:#fff;color:#0a0a0a}.tag:not(body).is-black{background-color:#0a0a0a;color:#fff}.tag:not(body).is-light{background-color:#f5f5f5;color:rgba(0,0,0,.7)}.tag:not(body).is-dark{background-color:#363636;color:#fff}.tag:not(body).is-primary{background-color:#00d1b2;color:#fff}.tag:not(body).is-primary.is-light{background-color:#ebfffc;color:#00947e}.tag:not(body).is-link{background-color:#3273dc;color:#fff}.tag:not(body).is-link.is-light{background-color:#eef3fc;color:#2160c4}.tag:not(body).is-info{background-color:#3298dc;color:#fff}.tag:not(body).is-info.is-light{background-color:#eef6fc;color:#1d72aa}.tag:not(body).is-success{background-color:#48c774;color:#fff}.tag:not(body).is-success.is-light{background-color:#effaf3;color:#257942}.tag:not(body).is-warning{background-color:#ffdd57;color:rgba(0,0,0,.7)}.tag:not(body).is-warning.is-light{background-color:#fffbeb;color:#947600}.tag:not(body).is-danger{background-color:#f14668;color:#fff}.tag:not(body).is-danger.is-light{background-color:#feecf0;color:#cc0f35}.tag:not(body).is-normal{font-size:.75rem}.tag:not(body).is-medium{font-size:1rem}.tag:not(body).is-large{font-size:1.25rem}.tag:not(body) .icon:first-child:not(:last-child){margin-left:-.375em;margin-right:.1875em}.tag:not(body) .icon:last-child:not(:first-child){margin-left:.1875em;margin-right:-.375em}.tag:not(body) .icon:first-child:last-child{margin-left:-.375em;margin-right:-.375em}.tag:not(body).is-delete{margin-left:1px;padding:0;position:relative;width:2em}.tag:not(body).is-delete::after,.tag:not(body).is-delete::before{background-color:currentColor;content:"";display:block;left:50%;position:absolute;top:50%;transform:translateX(-50%) translateY(-50%) rotate(45deg);transform-origin:center center}.tag:not(body).is-delete::before{height:1px;width:50%}.tag:not(body).is-delete::after{height:50%;width:1px}.tag:not(body).is-delete:focus,.tag:not(body).is-delete:hover{background-color:#e8e8e8}.tag:not(body).is-delete:active{background-color:#dbdbdb}.tag:not(body).is-rounded{border-radius:290486px}a.tag:hover{text-decoration:underline}.subtitle,.title{word-break:break-word}.subtitle em,.subtitle span,.title em,.title span{font-weight:inherit}.subtitle sub,.title sub{font-size:.75em}.subtitle sup,.title sup{font-size:.75em}.subtitle .tag,.title .tag{vertical-align:middle}.title{color:#363636;font-size:2rem;font-weight:600;line-height:1.125}.title strong{color:inherit;font-weight:inherit}.title+.highlight{margin-top:-.75rem}.title:not(.is-spaced)+.subtitle{margin-top:-1.25rem}.title.is-1{font-size:3rem}.title.is-2{font-size:2.5rem}.title.is-3{font-size:2rem}.title.is-4{font-size:1.5rem}.title.is-5{font-size:1.25rem}.title.is-6{font-size:1rem}.title.is-7{font-size:.75rem}.subtitle{color:#4a4a4a;font-size:1.25rem;font-weight:400;line-height:1.25}.subtitle strong{color:#363636;font-weight:600}.subtitle:not(.is-spaced)+.title{margin-top:-1.25rem}.subtitle.is-1{font-size:3rem}.subtitle.is-2{font-size:2.5rem}.subtitle.is-3{font-size:2rem}.subtitle.is-4{font-size:1.5rem}.subtitle.is-5{font-size:1.25rem}.subtitle.is-6{font-size:1rem}.subtitle.is-7{font-size:.75rem}.heading{display:block;font-size:11px;letter-spacing:1px;margin-bottom:5px;text-transform:uppercase}.highlight{font-weight:400;max-width:100%;overflow:hidden;padding:0}.highlight pre{overflow:auto;max-width:100%}.number{align-items:center;background-color:#f5f5f5;border-radius:290486px;display:inline-flex;font-size:1.25rem;height:2em;justify-content:center;margin-right:1.5rem;min-width:2.5em;padding:.25rem .5rem;text-align:center;vertical-align:top}.input,.select select,.textarea{background-color:#fff;border-color:#dbdbdb;border-radius:4px;color:#363636}.input::-moz-placeholder,.select select::-moz-placeholder,.textarea::-moz-placeholder{color:rgba(54,54,54,.3)}.input::-webkit-input-placeholder,.select select::-webkit-input-placeholder,.textarea::-webkit-input-placeholder{color:rgba(54,54,54,.3)}.input:-moz-placeholder,.select select:-moz-placeholder,.textarea:-moz-placeholder{color:rgba(54,54,54,.3)}.input:-ms-input-placeholder,.select select:-ms-input-placeholder,.textarea:-ms-input-placeholder{color:rgba(54,54,54,.3)}.input:hover,.is-hovered.input,.is-hovered.textarea,.select select.is-hovered,.select select:hover,.textarea:hover{border-color:#b5b5b5}.input:active,.input:focus,.is-active.input,.is-active.textarea,.is-focused.input,.is-focused.textarea,.select select.is-active,.select select.is-focused,.select select:active,.select select:focus,.textarea:active,.textarea:focus{border-color:#3273dc;box-shadow:0 0 0 .125em rgba(50,115,220,.25)}.input[disabled],.select fieldset[disabled] select,.select select[disabled],.textarea[disabled],fieldset[disabled] .input,fieldset[disabled] .select select,fieldset[disabled] .textarea{background-color:#f5f5f5;border-color:#f5f5f5;box-shadow:none;color:#7a7a7a}.input[disabled]::-moz-placeholder,.select fieldset[disabled] select::-moz-placeholder,.select select[disabled]::-moz-placeholder,.textarea[disabled]::-moz-placeholder,fieldset[disabled] .input::-moz-placeholder,fieldset[disabled] .select select::-moz-placeholder,fieldset[disabled] .textarea::-moz-placeholder{color:rgba(122,122,122,.3)}.input[disabled]::-webkit-input-placeholder,.select fieldset[disabled] select::-webkit-input-placeholder,.select select[disabled]::-webkit-input-placeholder,.textarea[disabled]::-webkit-input-placeholder,fieldset[disabled] .input::-webkit-input-placeholder,fieldset[disabled] .select select::-webkit-input-placeholder,fieldset[disabled] .textarea::-webkit-input-placeholder{color:rgba(122,122,122,.3)}.input[disabled]:-moz-placeholder,.select fieldset[disabled] select:-moz-placeholder,.select select[disabled]:-moz-placeholder,.textarea[disabled]:-moz-placeholder,fieldset[disabled] .input:-moz-placeholder,fieldset[disabled] .select select:-moz-placeholder,fieldset[disabled] .textarea:-moz-placeholder{color:rgba(122,122,122,.3)}.input[disabled]:-ms-input-placeholder,.select fieldset[disabled] select:-ms-input-placeholder,.select select[disabled]:-ms-input-placeholder,.textarea[disabled]:-ms-input-placeholder,fieldset[disabled] .input:-ms-input-placeholder,fieldset[disabled] .select select:-ms-input-placeholder,fieldset[disabled] .textarea:-ms-input-placeholder{color:rgba(122,122,122,.3)}.input,.textarea{box-shadow:inset 0 .0625em .125em rgba(10,10,10,.05);max-width:100%;width:100%}.input[readonly],.textarea[readonly]{box-shadow:none}.is-white.input,.is-white.textarea{border-color:#fff}.is-white.input:active,.is-white.input:focus,.is-white.is-active.input,.is-white.is-active.textarea,.is-white.is-focused.input,.is-white.is-focused.textarea,.is-white.textarea:active,.is-white.textarea:focus{box-shadow:0 0 0 .125em rgba(255,255,255,.25)}.is-black.input,.is-black.textarea{border-color:#0a0a0a}.is-black.input:active,.is-black.input:focus,.is-black.is-active.input,.is-black.is-active.textarea,.is-black.is-focused.input,.is-black.is-focused.textarea,.is-black.textarea:active,.is-black.textarea:focus{box-shadow:0 0 0 .125em rgba(10,10,10,.25)}.is-light.input,.is-light.textarea{border-color:#f5f5f5}.is-light.input:active,.is-light.input:focus,.is-light.is-active.input,.is-light.is-active.textarea,.is-light.is-focused.input,.is-light.is-focused.textarea,.is-light.textarea:active,.is-light.textarea:focus{box-shadow:0 0 0 .125em rgba(245,245,245,.25)}.is-dark.input,.is-dark.textarea{border-color:#363636}.is-dark.input:active,.is-dark.input:focus,.is-dark.is-active.input,.is-dark.is-active.textarea,.is-dark.is-focused.input,.is-dark.is-focused.textarea,.is-dark.textarea:active,.is-dark.textarea:focus{box-shadow:0 0 0 .125em rgba(54,54,54,.25)}.is-primary.input,.is-primary.textarea{border-color:#00d1b2}.is-primary.input:active,.is-primary.input:focus,.is-primary.is-active.input,.is-primary.is-active.textarea,.is-primary.is-focused.input,.is-primary.is-focused.textarea,.is-primary.textarea:active,.is-primary.textarea:focus{box-shadow:0 0 0 .125em rgba(0,209,178,.25)}.is-link.input,.is-link.textarea{border-color:#3273dc}.is-link.input:active,.is-link.input:focus,.is-link.is-active.input,.is-link.is-active.textarea,.is-link.is-focused.input,.is-link.is-focused.textarea,.is-link.textarea:active,.is-link.textarea:focus{box-shadow:0 0 0 .125em rgba(50,115,220,.25)}.is-info.input,.is-info.textarea{border-color:#3298dc}.is-info.input:active,.is-info.input:focus,.is-info.is-active.input,.is-info.is-active.textarea,.is-info.is-focused.input,.is-info.is-focused.textarea,.is-info.textarea:active,.is-info.textarea:focus{box-shadow:0 0 0 .125em rgba(50,152,220,.25)}.is-success.input,.is-success.textarea{border-color:#48c774}.is-success.input:active,.is-success.input:focus,.is-success.is-active.input,.is-success.is-active.textarea,.is-success.is-focused.input,.is-success.is-focused.textarea,.is-success.textarea:active,.is-success.textarea:focus{box-shadow:0 0 0 .125em rgba(72,199,116,.25)}.is-warning.input,.is-warning.textarea{border-color:#ffdd57}.is-warning.input:active,.is-warning.input:focus,.is-warning.is-active.input,.is-warning.is-active.textarea,.is-warning.is-focused.input,.is-warning.is-focused.textarea,.is-warning.textarea:active,.is-warning.textarea:focus{box-shadow:0 0 0 .125em rgba(255,221,87,.25)}.is-danger.input,.is-danger.textarea{border-color:#f14668}.is-danger.input:active,.is-danger.input:focus,.is-danger.is-active.input,.is-danger.is-active.textarea,.is-danger.is-focused.input,.is-danger.is-focused.textarea,.is-danger.textarea:active,.is-danger.textarea:focus{box-shadow:0 0 0 .125em rgba(241,70,104,.25)}.is-small.input,.is-small.textarea{border-radius:2px;font-size:.75rem}.is-medium.input,.is-medium.textarea{font-size:1.25rem}.is-large.input,.is-large.textarea{font-size:1.5rem}.is-fullwidth.input,.is-fullwidth.textarea{display:block;width:100%}.is-inline.input,.is-inline.textarea{display:inline;width:auto}.input.is-rounded{border-radius:290486px;padding-left:calc(calc(.75em - 1px) + .375em);padding-right:calc(calc(.75em - 1px) + .375em)}.input.is-static{background-color:transparent;border-color:transparent;box-shadow:none;padding-left:0;padding-right:0}.textarea{display:block;max-width:100%;min-width:100%;padding:calc(.75em - 1px);resize:vertical}.textarea:not([rows]){max-height:40em;min-height:8em}.textarea[rows]{height:initial}.textarea.has-fixed-size{resize:none}.checkbox,.radio{cursor:pointer;display:inline-block;line-height:1.25;position:relative}.checkbox input,.radio input{cursor:pointer}.checkbox:hover,.radio:hover{color:#363636}.checkbox input[disabled],.checkbox[disabled],.radio input[disabled],.radio[disabled],fieldset[disabled] .checkbox,fieldset[disabled] .radio{color:#7a7a7a;cursor:not-allowed}.radio+.radio{margin-left:.5em}.select{display:inline-block;max-width:100%;position:relative;vertical-align:top}.select:not(.is-multiple){height:2.5em}.select:not(.is-multiple):not(.is-loading)::after{border-color:#3273dc;right:1.125em;z-index:4}.select.is-rounded select{border-radius:290486px;padding-left:1em}.select select{cursor:pointer;display:block;font-size:1em;max-width:100%;outline:0}.select select::-ms-expand{display:none}.select select[disabled]:hover,fieldset[disabled] .select select:hover{border-color:#f5f5f5}.select select:not([multiple]){padding-right:2.5em}.select select[multiple]{height:auto;padding:0}.select select[multiple] option{padding:.5em 1em}.select:not(.is-multiple):not(.is-loading):hover::after{border-color:#363636}.select.is-white:not(:hover)::after{border-color:#fff}.select.is-white select{border-color:#fff}.select.is-white select.is-hovered,.select.is-white select:hover{border-color:#f2f2f2}.select.is-white select.is-active,.select.is-white select.is-focused,.select.is-white select:active,.select.is-white select:focus{box-shadow:0 0 0 .125em rgba(255,255,255,.25)}.select.is-black:not(:hover)::after{border-color:#0a0a0a}.select.is-black select{border-color:#0a0a0a}.select.is-black select.is-hovered,.select.is-black select:hover{border-color:#000}.select.is-black select.is-active,.select.is-black select.is-focused,.select.is-black select:active,.select.is-black select:focus{box-shadow:0 0 0 .125em rgba(10,10,10,.25)}.select.is-light:not(:hover)::after{border-color:#f5f5f5}.select.is-light select{border-color:#f5f5f5}.select.is-light select.is-hovered,.select.is-light select:hover{border-color:#e8e8e8}.select.is-light select.is-active,.select.is-light select.is-focused,.select.is-light select:active,.select.is-light select:focus{box-shadow:0 0 0 .125em rgba(245,245,245,.25)}.select.is-dark:not(:hover)::after{border-color:#363636}.select.is-dark select{border-color:#363636}.select.is-dark select.is-hovered,.select.is-dark select:hover{border-color:#292929}.select.is-dark select.is-active,.select.is-dark select.is-focused,.select.is-dark select:active,.select.is-dark select:focus{box-shadow:0 0 0 .125em rgba(54,54,54,.25)}.select.is-primary:not(:hover)::after{border-color:#00d1b2}.select.is-primary select{border-color:#00d1b2}.select.is-primary select.is-hovered,.select.is-primary select:hover{border-color:#00b89c}.select.is-primary select.is-active,.select.is-primary select.is-focused,.select.is-primary select:active,.select.is-primary select:focus{box-shadow:0 0 0 .125em rgba(0,209,178,.25)}.select.is-link:not(:hover)::after{border-color:#3273dc}.select.is-link select{border-color:#3273dc}.select.is-link select.is-hovered,.select.is-link select:hover{border-color:#2366d1}.select.is-link select.is-active,.select.is-link select.is-focused,.select.is-link select:active,.select.is-link select:focus{box-shadow:0 0 0 .125em rgba(50,115,220,.25)}.select.is-info:not(:hover)::after{border-color:#3298dc}.select.is-info select{border-color:#3298dc}.select.is-info select.is-hovered,.select.is-info select:hover{border-color:#238cd1}.select.is-info select.is-active,.select.is-info select.is-focused,.select.is-info select:active,.select.is-info select:focus{box-shadow:0 0 0 .125em rgba(50,152,220,.25)}.select.is-success:not(:hover)::after{border-color:#48c774}.select.is-success select{border-color:#48c774}.select.is-success select.is-hovered,.select.is-success select:hover{border-color:#3abb67}.select.is-success select.is-active,.select.is-success select.is-focused,.select.is-success select:active,.select.is-success select:focus{box-shadow:0 0 0 .125em rgba(72,199,116,.25)}.select.is-warning:not(:hover)::after{border-color:#ffdd57}.select.is-warning select{border-color:#ffdd57}.select.is-warning select.is-hovered,.select.is-warning select:hover{border-color:#ffd83d}.select.is-warning select.is-active,.select.is-warning select.is-focused,.select.is-warning select:active,.select.is-warning select:focus{box-shadow:0 0 0 .125em rgba(255,221,87,.25)}.select.is-danger:not(:hover)::after{border-color:#f14668}.select.is-danger select{border-color:#f14668}.select.is-danger select.is-hovered,.select.is-danger select:hover{border-color:#ef2e55}.select.is-danger select.is-active,.select.is-danger select.is-focused,.select.is-danger select:active,.select.is-danger select:focus{box-shadow:0 0 0 .125em rgba(241,70,104,.25)}.select.is-small{border-radius:2px;font-size:.75rem}.select.is-medium{font-size:1.25rem}.select.is-large{font-size:1.5rem}.select.is-disabled::after{border-color:#7a7a7a}.select.is-fullwidth{width:100%}.select.is-fullwidth select{width:100%}.select.is-loading::after{margin-top:0;position:absolute;right:.625em;top:.625em;transform:none}.select.is-loading.is-small:after{font-size:.75rem}.select.is-loading.is-medium:after{font-size:1.25rem}.select.is-loading.is-large:after{font-size:1.5rem}.file{align-items:stretch;display:flex;justify-content:flex-start;position:relative}.file.is-white .file-cta{background-color:#fff;border-color:transparent;color:#0a0a0a}.file.is-white.is-hovered .file-cta,.file.is-white:hover .file-cta{background-color:#f9f9f9;border-color:transparent;color:#0a0a0a}.file.is-white.is-focused .file-cta,.file.is-white:focus .file-cta{border-color:transparent;box-shadow:0 0 .5em rgba(255,255,255,.25);color:#0a0a0a}.file.is-white.is-active .file-cta,.file.is-white:active .file-cta{background-color:#f2f2f2;border-color:transparent;color:#0a0a0a}.file.is-black .file-cta{background-color:#0a0a0a;border-color:transparent;color:#fff}.file.is-black.is-hovered .file-cta,.file.is-black:hover .file-cta{background-color:#040404;border-color:transparent;color:#fff}.file.is-black.is-focused .file-cta,.file.is-black:focus .file-cta{border-color:transparent;box-shadow:0 0 .5em rgba(10,10,10,.25);color:#fff}.file.is-black.is-active .file-cta,.file.is-black:active .file-cta{background-color:#000;border-color:transparent;color:#fff}.file.is-light .file-cta{background-color:#f5f5f5;border-color:transparent;color:rgba(0,0,0,.7)}.file.is-light.is-hovered .file-cta,.file.is-light:hover .file-cta{background-color:#eee;border-color:transparent;color:rgba(0,0,0,.7)}.file.is-light.is-focused .file-cta,.file.is-light:focus .file-cta{border-color:transparent;box-shadow:0 0 .5em rgba(245,245,245,.25);color:rgba(0,0,0,.7)}.file.is-light.is-active .file-cta,.file.is-light:active .file-cta{background-color:#e8e8e8;border-color:transparent;color:rgba(0,0,0,.7)}.file.is-dark .file-cta{background-color:#363636;border-color:transparent;color:#fff}.file.is-dark.is-hovered .file-cta,.file.is-dark:hover .file-cta{background-color:#2f2f2f;border-color:transparent;color:#fff}.file.is-dark.is-focused .file-cta,.file.is-dark:focus .file-cta{border-color:transparent;box-shadow:0 0 .5em rgba(54,54,54,.25);color:#fff}.file.is-dark.is-active .file-cta,.file.is-dark:active .file-cta{background-color:#292929;border-color:transparent;color:#fff}.file.is-primary .file-cta{background-color:#00d1b2;border-color:transparent;color:#fff}.file.is-primary.is-hovered .file-cta,.file.is-primary:hover .file-cta{background-color:#00c4a7;border-color:transparent;color:#fff}.file.is-primary.is-focused .file-cta,.file.is-primary:focus .file-cta{border-color:transparent;box-shadow:0 0 .5em rgba(0,209,178,.25);color:#fff}.file.is-primary.is-active .file-cta,.file.is-primary:active .file-cta{background-color:#00b89c;border-color:transparent;color:#fff}.file.is-link .file-cta{background-color:#3273dc;border-color:transparent;color:#fff}.file.is-link.is-hovered .file-cta,.file.is-link:hover .file-cta{background-color:#276cda;border-color:transparent;color:#fff}.file.is-link.is-focused .file-cta,.file.is-link:focus .file-cta{border-color:transparent;box-shadow:0 0 .5em rgba(50,115,220,.25);color:#fff}.file.is-link.is-active .file-cta,.file.is-link:active .file-cta{background-color:#2366d1;border-color:transparent;color:#fff}.file.is-info .file-cta{background-color:#3298dc;border-color:transparent;color:#fff}.file.is-info.is-hovered .file-cta,.file.is-info:hover .file-cta{background-color:#2793da;border-color:transparent;color:#fff}.file.is-info.is-focused .file-cta,.file.is-info:focus .file-cta{border-color:transparent;box-shadow:0 0 .5em rgba(50,152,220,.25);color:#fff}.file.is-info.is-active .file-cta,.file.is-info:active .file-cta{background-color:#238cd1;border-color:transparent;color:#fff}.file.is-success .file-cta{background-color:#48c774;border-color:transparent;color:#fff}.file.is-success.is-hovered .file-cta,.file.is-success:hover .file-cta{background-color:#3ec46d;border-color:transparent;color:#fff}.file.is-success.is-focused .file-cta,.file.is-success:focus .file-cta{border-color:transparent;box-shadow:0 0 .5em rgba(72,199,116,.25);color:#fff}.file.is-success.is-active .file-cta,.file.is-success:active .file-cta{background-color:#3abb67;border-color:transparent;color:#fff}.file.is-warning .file-cta{background-color:#ffdd57;border-color:transparent;color:rgba(0,0,0,.7)}.file.is-warning.is-hovered .file-cta,.file.is-warning:hover .file-cta{background-color:#ffdb4a;border-color:transparent;color:rgba(0,0,0,.7)}.file.is-warning.is-focused .file-cta,.file.is-warning:focus .file-cta{border-color:transparent;box-shadow:0 0 .5em rgba(255,221,87,.25);color:rgba(0,0,0,.7)}.file.is-warning.is-active .file-cta,.file.is-warning:active .file-cta{background-color:#ffd83d;border-color:transparent;color:rgba(0,0,0,.7)}.file.is-danger .file-cta{background-color:#f14668;border-color:transparent;color:#fff}.file.is-danger.is-hovered .file-cta,.file.is-danger:hover .file-cta{background-color:#f03a5f;border-color:transparent;color:#fff}.file.is-danger.is-focused .file-cta,.file.is-danger:focus .file-cta{border-color:transparent;box-shadow:0 0 .5em rgba(241,70,104,.25);color:#fff}.file.is-danger.is-active .file-cta,.file.is-danger:active .file-cta{background-color:#ef2e55;border-color:transparent;color:#fff}.file.is-small{font-size:.75rem}.file.is-medium{font-size:1.25rem}.file.is-medium .file-icon .fa{font-size:21px}.file.is-large{font-size:1.5rem}.file.is-large .file-icon .fa{font-size:28px}.file.has-name .file-cta{border-bottom-right-radius:0;border-top-right-radius:0}.file.has-name .file-name{border-bottom-left-radius:0;border-top-left-radius:0}.file.has-name.is-empty .file-cta{border-radius:4px}.file.has-name.is-empty .file-name{display:none}.file.is-boxed .file-label{flex-direction:column}.file.is-boxed .file-cta{flex-direction:column;height:auto;padding:1em 3em}.file.is-boxed .file-name{border-width:0 1px 1px}.file.is-boxed .file-icon{height:1.5em;width:1.5em}.file.is-boxed .file-icon .fa{font-size:21px}.file.is-boxed.is-small .file-icon .fa{font-size:14px}.file.is-boxed.is-medium .file-icon .fa{font-size:28px}.file.is-boxed.is-large .file-icon .fa{font-size:35px}.file.is-boxed.has-name .file-cta{border-radius:4px 4px 0 0}.file.is-boxed.has-name .file-name{border-radius:0 0 4px 4px;border-width:0 1px 1px}.file.is-centered{justify-content:center}.file.is-fullwidth .file-label{width:100%}.file.is-fullwidth .file-name{flex-grow:1;max-width:none}.file.is-right{justify-content:flex-end}.file.is-right .file-cta{border-radius:0 4px 4px 0}.file.is-right .file-name{border-radius:4px 0 0 4px;border-width:1px 0 1px 1px;order:-1}.file-label{align-items:stretch;display:flex;cursor:pointer;justify-content:flex-start;overflow:hidden;position:relative}.file-label:hover .file-cta{background-color:#eee;color:#363636}.file-label:hover .file-name{border-color:#d5d5d5}.file-label:active .file-cta{background-color:#e8e8e8;color:#363636}.file-label:active .file-name{border-color:#cfcfcf}.file-input{height:100%;left:0;opacity:0;outline:0;position:absolute;top:0;width:100%}.file-cta,.file-name{border-color:#dbdbdb;border-radius:4px;font-size:1em;padding-left:1em;padding-right:1em;white-space:nowrap}.file-cta{background-color:#f5f5f5;color:#4a4a4a}.file-name{border-color:#dbdbdb;border-style:solid;border-width:1px 1px 1px 0;display:block;max-width:16em;overflow:hidden;text-align:inherit;text-overflow:ellipsis}.file-icon{align-items:center;display:flex;height:1em;justify-content:center;margin-right:.5em;width:1em}.file-icon .fa{font-size:14px}.label{color:#363636;display:block;font-size:1rem;font-weight:700}.label:not(:last-child){margin-bottom:.5em}.label.is-small{font-size:.75rem}.label.is-medium{font-size:1.25rem}.label.is-large{font-size:1.5rem}.help{display:block;font-size:.75rem;margin-top:.25rem}.help.is-white{color:#fff}.help.is-black{color:#0a0a0a}.help.is-light{color:#f5f5f5}.help.is-dark{color:#363636}.help.is-primary{color:#00d1b2}.help.is-link{color:#3273dc}.help.is-info{color:#3298dc}.help.is-success{color:#48c774}.help.is-warning{color:#ffdd57}.help.is-danger{color:#f14668}.field:not(:last-child){margin-bottom:.75rem}.field.has-addons{display:flex;justify-content:flex-start}.field.has-addons .control:not(:last-child){margin-right:-1px}.field.has-addons .control:not(:first-child):not(:last-child) .button,.field.has-addons .control:not(:first-child):not(:last-child) .input,.field.has-addons .control:not(:first-child):not(:last-child) .select select{border-radius:0}.field.has-addons .control:first-child:not(:only-child) .button,.field.has-addons .control:first-child:not(:only-child) .input,.field.has-addons .control:first-child:not(:only-child) .select select{border-bottom-right-radius:0;border-top-right-radius:0}.field.has-addons .control:last-child:not(:only-child) .button,.field.has-addons .control:last-child:not(:only-child) .input,.field.has-addons .control:last-child:not(:only-child) .select select{border-bottom-left-radius:0;border-top-left-radius:0}.field.has-addons .control .button:not([disabled]).is-hovered,.field.has-addons .control .button:not([disabled]):hover,.field.has-addons .control .input:not([disabled]).is-hovered,.field.has-addons .control .input:not([disabled]):hover,.field.has-addons .control .select select:not([disabled]).is-hovered,.field.has-addons .control .select select:not([disabled]):hover{z-index:2}.field.has-addons .control .button:not([disabled]).is-active,.field.has-addons .control .button:not([disabled]).is-focused,.field.has-addons .control .button:not([disabled]):active,.field.has-addons .control .button:not([disabled]):focus,.field.has-addons .control .input:not([disabled]).is-active,.field.has-addons .control .input:not([disabled]).is-focused,.field.has-addons .control .input:not([disabled]):active,.field.has-addons .control .input:not([disabled]):focus,.field.has-addons .control .select select:not([disabled]).is-active,.field.has-addons .control .select select:not([disabled]).is-focused,.field.has-addons .control .select select:not([disabled]):active,.field.has-addons .control .select select:not([disabled]):focus{z-index:3}.field.has-addons .control .button:not([disabled]).is-active:hover,.field.has-addons .control .button:not([disabled]).is-focused:hover,.field.has-addons .control .button:not([disabled]):active:hover,.field.has-addons .control .button:not([disabled]):focus:hover,.field.has-addons .control .input:not([disabled]).is-active:hover,.field.has-addons .control .input:not([disabled]).is-focused:hover,.field.has-addons .control .input:not([disabled]):active:hover,.field.has-addons .control .input:not([disabled]):focus:hover,.field.has-addons .control .select select:not([disabled]).is-active:hover,.field.has-addons .control .select select:not([disabled]).is-focused:hover,.field.has-addons .control .select select:not([disabled]):active:hover,.field.has-addons .control .select select:not([disabled]):focus:hover{z-index:4}.field.has-addons .control.is-expanded{flex-grow:1;flex-shrink:1}.field.has-addons.has-addons-centered{justify-content:center}.field.has-addons.has-addons-right{justify-content:flex-end}.field.has-addons.has-addons-fullwidth .control{flex-grow:1;flex-shrink:0}.field.is-grouped{display:flex;justify-content:flex-start}.field.is-grouped>.control{flex-shrink:0}.field.is-grouped>.control:not(:last-child){margin-bottom:0;margin-right:.75rem}.field.is-grouped>.control.is-expanded{flex-grow:1;flex-shrink:1}.field.is-grouped.is-grouped-centered{justify-content:center}.field.is-grouped.is-grouped-right{justify-content:flex-end}.field.is-grouped.is-grouped-multiline{flex-wrap:wrap}.field.is-grouped.is-grouped-multiline>.control:last-child,.field.is-grouped.is-grouped-multiline>.control:not(:last-child){margin-bottom:.75rem}.field.is-grouped.is-grouped-multiline:last-child{margin-bottom:-.75rem}.field.is-grouped.is-grouped-multiline:not(:last-child){margin-bottom:0}@media screen and (min-width:769px),print{.field.is-horizontal{display:flex}}.field-label .label{font-size:inherit}@media screen and (max-width:768px){.field-label{margin-bottom:.5rem}}@media screen and (min-width:769px),print{.field-label{flex-basis:0;flex-grow:1;flex-shrink:0;margin-right:1.5rem;text-align:right}.field-label.is-small{font-size:.75rem;padding-top:.375em}.field-label.is-normal{padding-top:.375em}.field-label.is-medium{font-size:1.25rem;padding-top:.375em}.field-label.is-large{font-size:1.5rem;padding-top:.375em}}.field-body .field .field{margin-bottom:0}@media screen and (min-width:769px),print{.field-body{display:flex;flex-basis:0;flex-grow:5;flex-shrink:1}.field-body .field{margin-bottom:0}.field-body>.field{flex-shrink:1}.field-body>.field:not(.is-narrow){flex-grow:1}.field-body>.field:not(:last-child){margin-right:.75rem}}.control{box-sizing:border-box;clear:both;font-size:1rem;position:relative;text-align:inherit}.control.has-icons-left .input:focus~.icon,.control.has-icons-left .select:focus~.icon,.control.has-icons-right .input:focus~.icon,.control.has-icons-right .select:focus~.icon{color:#4a4a4a}.control.has-icons-left .input.is-small~.icon,.control.has-icons-left .select.is-small~.icon,.control.has-icons-right .input.is-small~.icon,.control.has-icons-right .select.is-small~.icon{font-size:.75rem}.control.has-icons-left .input.is-medium~.icon,.control.has-icons-left .select.is-medium~.icon,.control.has-icons-right .input.is-medium~.icon,.control.has-icons-right .select.is-medium~.icon{font-size:1.25rem}.control.has-icons-left .input.is-large~.icon,.control.has-icons-left .select.is-large~.icon,.control.has-icons-right .input.is-large~.icon,.control.has-icons-right .select.is-large~.icon{font-size:1.5rem}.control.has-icons-left .icon,.control.has-icons-right .icon{color:#dbdbdb;height:2.5em;pointer-events:none;position:absolute;top:0;width:2.5em;z-index:4}.control.has-icons-left .input,.control.has-icons-left .select select{padding-left:2.5em}.control.has-icons-left .icon.is-left{left:0}.control.has-icons-right .input,.control.has-icons-right .select select{padding-right:2.5em}.control.has-icons-right .icon.is-right{right:0}.control.is-loading::after{position:absolute!important;right:.625em;top:.625em;z-index:4}.control.is-loading.is-small:after{font-size:.75rem}.control.is-loading.is-medium:after{font-size:1.25rem}.control.is-loading.is-large:after{font-size:1.5rem}.breadcrumb{font-size:1rem;white-space:nowrap}.breadcrumb a{align-items:center;color:#3273dc;display:flex;justify-content:center;padding:0 .75em}.breadcrumb a:hover{color:#363636}.breadcrumb li{align-items:center;display:flex}.breadcrumb li:first-child a{padding-left:0}.breadcrumb li.is-active a{color:#363636;cursor:default;pointer-events:none}.breadcrumb li+li::before{color:#b5b5b5;content:"\0002f"}.breadcrumb ol,.breadcrumb ul{align-items:flex-start;display:flex;flex-wrap:wrap;justify-content:flex-start}.breadcrumb .icon:first-child{margin-right:.5em}.breadcrumb .icon:last-child{margin-left:.5em}.breadcrumb.is-centered ol,.breadcrumb.is-centered ul{justify-content:center}.breadcrumb.is-right ol,.breadcrumb.is-right ul{justify-content:flex-end}.breadcrumb.is-small{font-size:.75rem}.breadcrumb.is-medium{font-size:1.25rem}.breadcrumb.is-large{font-size:1.5rem}.breadcrumb.has-arrow-separator li+li::before{content:"\02192"}.breadcrumb.has-bullet-separator li+li::before{content:"\02022"}.breadcrumb.has-dot-separator li+li::before{content:"\000b7"}.breadcrumb.has-succeeds-separator li+li::before{content:"\0227B"}.card{background-color:#fff;border-radius:.25rem;box-shadow:0 .5em 1em -.125em rgba(10,10,10,.1),0 0 0 1px rgba(10,10,10,.02);color:#4a4a4a;max-width:100%;overflow:hidden;position:relative}.card-header{background-color:transparent;align-items:stretch;box-shadow:0 .125em .25em rgba(10,10,10,.1);display:flex}.card-header-title{align-items:center;color:#363636;display:flex;flex-grow:1;font-weight:700;padding:.75rem 1rem}.card-header-title.is-centered{justify-content:center}.card-header-icon{align-items:center;cursor:pointer;display:flex;justify-content:center;padding:.75rem 1rem}.card-image{display:block;position:relative}.card-content{background-color:transparent;padding:1.5rem}.card-footer{background-color:transparent;border-top:1px solid #ededed;align-items:stretch;display:flex}.card-footer-item{align-items:center;display:flex;flex-basis:0;flex-grow:1;flex-shrink:0;justify-content:center;padding:.75rem}.card-footer-item:not(:last-child){border-right:1px solid #ededed}.card .media:not(:last-child){margin-bottom:1.5rem}.dropdown{display:inline-flex;position:relative;vertical-align:top}.dropdown.is-active .dropdown-menu,.dropdown.is-hoverable:hover .dropdown-menu{display:block}.dropdown.is-right .dropdown-menu{left:auto;right:0}.dropdown.is-up .dropdown-menu{bottom:100%;padding-bottom:4px;padding-top:initial;top:auto}.dropdown-menu{display:none;left:0;min-width:12rem;padding-top:4px;position:absolute;top:100%;z-index:20}.dropdown-content{background-color:#fff;border-radius:4px;box-shadow:0 .5em 1em -.125em rgba(10,10,10,.1),0 0 0 1px rgba(10,10,10,.02);padding-bottom:.5rem;padding-top:.5rem}.dropdown-item{color:#4a4a4a;display:block;font-size:.875rem;line-height:1.5;padding:.375rem 1rem;position:relative}a.dropdown-item,button.dropdown-item{padding-right:3rem;text-align:inherit;white-space:nowrap;width:100%}a.dropdown-item:hover,button.dropdown-item:hover{background-color:#f5f5f5;color:#0a0a0a}a.dropdown-item.is-active,button.dropdown-item.is-active{background-color:#3273dc;color:#fff}.dropdown-divider{background-color:#ededed;border:none;display:block;height:1px;margin:.5rem 0}.level{align-items:center;justify-content:space-between}.level code{border-radius:4px}.level img{display:inline-block;vertical-align:top}.level.is-mobile{display:flex}.level.is-mobile .level-left,.level.is-mobile .level-right{display:flex}.level.is-mobile .level-left+.level-right{margin-top:0}.level.is-mobile .level-item:not(:last-child){margin-bottom:0;margin-right:.75rem}.level.is-mobile .level-item:not(.is-narrow){flex-grow:1}@media screen and (min-width:769px),print{.level{display:flex}.level>.level-item:not(.is-narrow){flex-grow:1}}.level-item{align-items:center;display:flex;flex-basis:auto;flex-grow:0;flex-shrink:0;justify-content:center}.level-item .subtitle,.level-item .title{margin-bottom:0}@media screen and (max-width:768px){.level-item:not(:last-child){margin-bottom:.75rem}}.level-left,.level-right{flex-basis:auto;flex-grow:0;flex-shrink:0}.level-left .level-item.is-flexible,.level-right .level-item.is-flexible{flex-grow:1}@media screen and (min-width:769px),print{.level-left .level-item:not(:last-child),.level-right .level-item:not(:last-child){margin-right:.75rem}}.level-left{align-items:center;justify-content:flex-start}@media screen and (max-width:768px){.level-left+.level-right{margin-top:1.5rem}}@media screen and (min-width:769px),print{.level-left{display:flex}}.level-right{align-items:center;justify-content:flex-end}@media screen and (min-width:769px),print{.level-right{display:flex}}.media{align-items:flex-start;display:flex;text-align:inherit}.media .content:not(:last-child){margin-bottom:.75rem}.media .media{border-top:1px solid rgba(219,219,219,.5);display:flex;padding-top:.75rem}.media .media .content:not(:last-child),.media .media .control:not(:last-child){margin-bottom:.5rem}.media .media .media{padding-top:.5rem}.media .media .media+.media{margin-top:.5rem}.media+.media{border-top:1px solid rgba(219,219,219,.5);margin-top:1rem;padding-top:1rem}.media.is-large+.media{margin-top:1.5rem;padding-top:1.5rem}.media-left,.media-right{flex-basis:auto;flex-grow:0;flex-shrink:0}.media-left{margin-right:1rem}.media-right{margin-left:1rem}.media-content{flex-basis:auto;flex-grow:1;flex-shrink:1;text-align:inherit}@media screen and (max-width:768px){.media-content{overflow-x:auto}}.menu{font-size:1rem}.menu.is-small{font-size:.75rem}.menu.is-medium{font-size:1.25rem}.menu.is-large{font-size:1.5rem}.menu-list{line-height:1.25}.menu-list a{border-radius:2px;color:#4a4a4a;display:block;padding:.5em .75em}.menu-list a:hover{background-color:#f5f5f5;color:#363636}.menu-list a.is-active{background-color:#3273dc;color:#fff}.menu-list li ul{border-left:1px solid #dbdbdb;margin:.75em;padding-left:.75em}.menu-label{color:#7a7a7a;font-size:.75em;letter-spacing:.1em;text-transform:uppercase}.menu-label:not(:first-child){margin-top:1em}.menu-label:not(:last-child){margin-bottom:1em}.message{background-color:#f5f5f5;border-radius:4px;font-size:1rem}.message strong{color:currentColor}.message a:not(.button):not(.tag):not(.dropdown-item){color:currentColor;text-decoration:underline}.message.is-small{font-size:.75rem}.message.is-medium{font-size:1.25rem}.message.is-large{font-size:1.5rem}.message.is-white{background-color:#fff}.message.is-white .message-header{background-color:#fff;color:#0a0a0a}.message.is-white .message-body{border-color:#fff}.message.is-black{background-color:#fafafa}.message.is-black .message-header{background-color:#0a0a0a;color:#fff}.message.is-black .message-body{border-color:#0a0a0a}.message.is-light{background-color:#fafafa}.message.is-light .message-header{background-color:#f5f5f5;color:rgba(0,0,0,.7)}.message.is-light .message-body{border-color:#f5f5f5}.message.is-dark{background-color:#fafafa}.message.is-dark .message-header{background-color:#363636;color:#fff}.message.is-dark .message-body{border-color:#363636}.message.is-primary{background-color:#ebfffc}.message.is-primary .message-header{background-color:#00d1b2;color:#fff}.message.is-primary .message-body{border-color:#00d1b2;color:#00947e}.message.is-link{background-color:#eef3fc}.message.is-link .message-header{background-color:#3273dc;color:#fff}.message.is-link .message-body{border-color:#3273dc;color:#2160c4}.message.is-info{background-color:#eef6fc}.message.is-info .message-header{background-color:#3298dc;color:#fff}.message.is-info .message-body{border-color:#3298dc;color:#1d72aa}.message.is-success{background-color:#effaf3}.message.is-success .message-header{background-color:#48c774;color:#fff}.message.is-success .message-body{border-color:#48c774;color:#257942}.message.is-warning{background-color:#fffbeb}.message.is-warning .message-header{background-color:#ffdd57;color:rgba(0,0,0,.7)}.message.is-warning .message-body{border-color:#ffdd57;color:#947600}.message.is-danger{background-color:#feecf0}.message.is-danger .message-header{background-color:#f14668;color:#fff}.message.is-danger .message-body{border-color:#f14668;color:#cc0f35}.message-header{align-items:center;background-color:#4a4a4a;border-radius:4px 4px 0 0;color:#fff;display:flex;font-weight:700;justify-content:space-between;line-height:1.25;padding:.75em 1em;position:relative}.message-header .delete{flex-grow:0;flex-shrink:0;margin-left:.75em}.message-header+.message-body{border-width:0;border-top-left-radius:0;border-top-right-radius:0}.message-body{border-color:#dbdbdb;border-radius:4px;border-style:solid;border-width:0 0 0 4px;color:#4a4a4a;padding:1.25em 1.5em}.message-body code,.message-body pre{background-color:#fff}.message-body pre code{background-color:transparent}.modal{align-items:center;display:none;flex-direction:column;justify-content:center;overflow:hidden;position:fixed;z-index:40}.modal.is-active{display:flex}.modal-background{background-color:rgba(10,10,10,.86)}.modal-card,.modal-content{margin:0 20px;max-height:calc(100vh - 160px);overflow:auto;position:relative;width:100%}@media screen and (min-width:769px){.modal-card,.modal-content{margin:0 auto;max-height:calc(100vh - 40px);width:640px}}.modal-close{background:0 0;height:40px;position:fixed;right:20px;top:20px;width:40px}.modal-card{display:flex;flex-direction:column;max-height:calc(100vh - 40px);overflow:hidden;-ms-overflow-y:visible}.modal-card-foot,.modal-card-head{align-items:center;background-color:#f5f5f5;display:flex;flex-shrink:0;justify-content:flex-start;padding:20px;position:relative}.modal-card-head{border-bottom:1px solid #dbdbdb;border-top-left-radius:6px;border-top-right-radius:6px}.modal-card-title{color:#363636;flex-grow:1;flex-shrink:0;font-size:1.5rem;line-height:1}.modal-card-foot{border-bottom-left-radius:6px;border-bottom-right-radius:6px;border-top:1px solid #dbdbdb}.modal-card-foot .button:not(:last-child){margin-right:.5em}.modal-card-body{-webkit-overflow-scrolling:touch;background-color:#fff;flex-grow:1;flex-shrink:1;overflow:auto;padding:20px}.navbar{background-color:#fff;min-height:3.25rem;position:relative;z-index:30}.navbar.is-white{background-color:#fff;color:#0a0a0a}.navbar.is-white .navbar-brand .navbar-link,.navbar.is-white .navbar-brand>.navbar-item{color:#0a0a0a}.navbar.is-white .navbar-brand .navbar-link.is-active,.navbar.is-white .navbar-brand .navbar-link:focus,.navbar.is-white .navbar-brand .navbar-link:hover,.navbar.is-white .navbar-brand>a.navbar-item.is-active,.navbar.is-white .navbar-brand>a.navbar-item:focus,.navbar.is-white .navbar-brand>a.navbar-item:hover{background-color:#f2f2f2;color:#0a0a0a}.navbar.is-white .navbar-brand .navbar-link::after{border-color:#0a0a0a}.navbar.is-white .navbar-burger{color:#0a0a0a}@media screen and (min-width:1024px){.navbar.is-white .navbar-end .navbar-link,.navbar.is-white .navbar-end>.navbar-item,.navbar.is-white .navbar-start .navbar-link,.navbar.is-white .navbar-start>.navbar-item{color:#0a0a0a}.navbar.is-white .navbar-end .navbar-link.is-active,.navbar.is-white .navbar-end .navbar-link:focus,.navbar.is-white .navbar-end .navbar-link:hover,.navbar.is-white .navbar-end>a.navbar-item.is-active,.navbar.is-white .navbar-end>a.navbar-item:focus,.navbar.is-white .navbar-end>a.navbar-item:hover,.navbar.is-white .navbar-start .navbar-link.is-active,.navbar.is-white .navbar-start .navbar-link:focus,.navbar.is-white .navbar-start .navbar-link:hover,.navbar.is-white .navbar-start>a.navbar-item.is-active,.navbar.is-white .navbar-start>a.navbar-item:focus,.navbar.is-white .navbar-start>a.navbar-item:hover{background-color:#f2f2f2;color:#0a0a0a}.navbar.is-white .navbar-end .navbar-link::after,.navbar.is-white .navbar-start .navbar-link::after{border-color:#0a0a0a}.navbar.is-white .navbar-item.has-dropdown.is-active .navbar-link,.navbar.is-white .navbar-item.has-dropdown:focus .navbar-link,.navbar.is-white .navbar-item.has-dropdown:hover .navbar-link{background-color:#f2f2f2;color:#0a0a0a}.navbar.is-white .navbar-dropdown a.navbar-item.is-active{background-color:#fff;color:#0a0a0a}}.navbar.is-black{background-color:#0a0a0a;color:#fff}.navbar.is-black .navbar-brand .navbar-link,.navbar.is-black .navbar-brand>.navbar-item{color:#fff}.navbar.is-black .navbar-brand .navbar-link.is-active,.navbar.is-black .navbar-brand .navbar-link:focus,.navbar.is-black .navbar-brand .navbar-link:hover,.navbar.is-black .navbar-brand>a.navbar-item.is-active,.navbar.is-black .navbar-brand>a.navbar-item:focus,.navbar.is-black .navbar-brand>a.navbar-item:hover{background-color:#000;color:#fff}.navbar.is-black .navbar-brand .navbar-link::after{border-color:#fff}.navbar.is-black .navbar-burger{color:#fff}@media screen and (min-width:1024px){.navbar.is-black .navbar-end .navbar-link,.navbar.is-black .navbar-end>.navbar-item,.navbar.is-black .navbar-start .navbar-link,.navbar.is-black .navbar-start>.navbar-item{color:#fff}.navbar.is-black .navbar-end .navbar-link.is-active,.navbar.is-black .navbar-end .navbar-link:focus,.navbar.is-black .navbar-end .navbar-link:hover,.navbar.is-black .navbar-end>a.navbar-item.is-active,.navbar.is-black .navbar-end>a.navbar-item:focus,.navbar.is-black .navbar-end>a.navbar-item:hover,.navbar.is-black .navbar-start .navbar-link.is-active,.navbar.is-black .navbar-start .navbar-link:focus,.navbar.is-black .navbar-start .navbar-link:hover,.navbar.is-black .navbar-start>a.navbar-item.is-active,.navbar.is-black .navbar-start>a.navbar-item:focus,.navbar.is-black .navbar-start>a.navbar-item:hover{background-color:#000;color:#fff}.navbar.is-black .navbar-end .navbar-link::after,.navbar.is-black .navbar-start .navbar-link::after{border-color:#fff}.navbar.is-black .navbar-item.has-dropdown.is-active .navbar-link,.navbar.is-black .navbar-item.has-dropdown:focus .navbar-link,.navbar.is-black .navbar-item.has-dropdown:hover .navbar-link{background-color:#000;color:#fff}.navbar.is-black .navbar-dropdown a.navbar-item.is-active{background-color:#0a0a0a;color:#fff}}.navbar.is-light{background-color:#f5f5f5;color:rgba(0,0,0,.7)}.navbar.is-light .navbar-brand .navbar-link,.navbar.is-light .navbar-brand>.navbar-item{color:rgba(0,0,0,.7)}.navbar.is-light .navbar-brand .navbar-link.is-active,.navbar.is-light .navbar-brand .navbar-link:focus,.navbar.is-light .navbar-brand .navbar-link:hover,.navbar.is-light .navbar-brand>a.navbar-item.is-active,.navbar.is-light .navbar-brand>a.navbar-item:focus,.navbar.is-light .navbar-brand>a.navbar-item:hover{background-color:#e8e8e8;color:rgba(0,0,0,.7)}.navbar.is-light .navbar-brand .navbar-link::after{border-color:rgba(0,0,0,.7)}.navbar.is-light .navbar-burger{color:rgba(0,0,0,.7)}@media screen and (min-width:1024px){.navbar.is-light .navbar-end .navbar-link,.navbar.is-light .navbar-end>.navbar-item,.navbar.is-light .navbar-start .navbar-link,.navbar.is-light .navbar-start>.navbar-item{color:rgba(0,0,0,.7)}.navbar.is-light .navbar-end .navbar-link.is-active,.navbar.is-light .navbar-end .navbar-link:focus,.navbar.is-light .navbar-end .navbar-link:hover,.navbar.is-light .navbar-end>a.navbar-item.is-active,.navbar.is-light .navbar-end>a.navbar-item:focus,.navbar.is-light .navbar-end>a.navbar-item:hover,.navbar.is-light .navbar-start .navbar-link.is-active,.navbar.is-light .navbar-start .navbar-link:focus,.navbar.is-light .navbar-start .navbar-link:hover,.navbar.is-light .navbar-start>a.navbar-item.is-active,.navbar.is-light .navbar-start>a.navbar-item:focus,.navbar.is-light .navbar-start>a.navbar-item:hover{background-color:#e8e8e8;color:rgba(0,0,0,.7)}.navbar.is-light .navbar-end .navbar-link::after,.navbar.is-light .navbar-start .navbar-link::after{border-color:rgba(0,0,0,.7)}.navbar.is-light .navbar-item.has-dropdown.is-active .navbar-link,.navbar.is-light .navbar-item.has-dropdown:focus .navbar-link,.navbar.is-light .navbar-item.has-dropdown:hover .navbar-link{background-color:#e8e8e8;color:rgba(0,0,0,.7)}.navbar.is-light .navbar-dropdown a.navbar-item.is-active{background-color:#f5f5f5;color:rgba(0,0,0,.7)}}.navbar.is-dark{background-color:#363636;color:#fff}.navbar.is-dark .navbar-brand .navbar-link,.navbar.is-dark .navbar-brand>.navbar-item{color:#fff}.navbar.is-dark .navbar-brand .navbar-link.is-active,.navbar.is-dark .navbar-brand .navbar-link:focus,.navbar.is-dark .navbar-brand .navbar-link:hover,.navbar.is-dark .navbar-brand>a.navbar-item.is-active,.navbar.is-dark .navbar-brand>a.navbar-item:focus,.navbar.is-dark .navbar-brand>a.navbar-item:hover{background-color:#292929;color:#fff}.navbar.is-dark .navbar-brand .navbar-link::after{border-color:#fff}.navbar.is-dark .navbar-burger{color:#fff}@media screen and (min-width:1024px){.navbar.is-dark .navbar-end .navbar-link,.navbar.is-dark .navbar-end>.navbar-item,.navbar.is-dark .navbar-start .navbar-link,.navbar.is-dark .navbar-start>.navbar-item{color:#fff}.navbar.is-dark .navbar-end .navbar-link.is-active,.navbar.is-dark .navbar-end .navbar-link:focus,.navbar.is-dark .navbar-end .navbar-link:hover,.navbar.is-dark .navbar-end>a.navbar-item.is-active,.navbar.is-dark .navbar-end>a.navbar-item:focus,.navbar.is-dark .navbar-end>a.navbar-item:hover,.navbar.is-dark .navbar-start .navbar-link.is-active,.navbar.is-dark .navbar-start .navbar-link:focus,.navbar.is-dark .navbar-start .navbar-link:hover,.navbar.is-dark .navbar-start>a.navbar-item.is-active,.navbar.is-dark .navbar-start>a.navbar-item:focus,.navbar.is-dark .navbar-start>a.navbar-item:hover{background-color:#292929;color:#fff}.navbar.is-dark .navbar-end .navbar-link::after,.navbar.is-dark .navbar-start .navbar-link::after{border-color:#fff}.navbar.is-dark .navbar-item.has-dropdown.is-active .navbar-link,.navbar.is-dark .navbar-item.has-dropdown:focus .navbar-link,.navbar.is-dark .navbar-item.has-dropdown:hover .navbar-link{background-color:#292929;color:#fff}.navbar.is-dark .navbar-dropdown a.navbar-item.is-active{background-color:#363636;color:#fff}}.navbar.is-primary{background-color:#00d1b2;color:#fff}.navbar.is-primary .navbar-brand .navbar-link,.navbar.is-primary .navbar-brand>.navbar-item{color:#fff}.navbar.is-primary .navbar-brand .navbar-link.is-active,.navbar.is-primary .navbar-brand .navbar-link:focus,.navbar.is-primary .navbar-brand .navbar-link:hover,.navbar.is-primary .navbar-brand>a.navbar-item.is-active,.navbar.is-primary .navbar-brand>a.navbar-item:focus,.navbar.is-primary .navbar-brand>a.navbar-item:hover{background-color:#00b89c;color:#fff}.navbar.is-primary .navbar-brand .navbar-link::after{border-color:#fff}.navbar.is-primary .navbar-burger{color:#fff}@media screen and (min-width:1024px){.navbar.is-primary .navbar-end .navbar-link,.navbar.is-primary .navbar-end>.navbar-item,.navbar.is-primary .navbar-start .navbar-link,.navbar.is-primary .navbar-start>.navbar-item{color:#fff}.navbar.is-primary .navbar-end .navbar-link.is-active,.navbar.is-primary .navbar-end .navbar-link:focus,.navbar.is-primary .navbar-end .navbar-link:hover,.navbar.is-primary .navbar-end>a.navbar-item.is-active,.navbar.is-primary .navbar-end>a.navbar-item:focus,.navbar.is-primary .navbar-end>a.navbar-item:hover,.navbar.is-primary .navbar-start .navbar-link.is-active,.navbar.is-primary .navbar-start .navbar-link:focus,.navbar.is-primary .navbar-start .navbar-link:hover,.navbar.is-primary .navbar-start>a.navbar-item.is-active,.navbar.is-primary .navbar-start>a.navbar-item:focus,.navbar.is-primary .navbar-start>a.navbar-item:hover{background-color:#00b89c;color:#fff}.navbar.is-primary .navbar-end .navbar-link::after,.navbar.is-primary .navbar-start .navbar-link::after{border-color:#fff}.navbar.is-primary .navbar-item.has-dropdown.is-active .navbar-link,.navbar.is-primary .navbar-item.has-dropdown:focus .navbar-link,.navbar.is-primary .navbar-item.has-dropdown:hover .navbar-link{background-color:#00b89c;color:#fff}.navbar.is-primary .navbar-dropdown a.navbar-item.is-active{background-color:#00d1b2;color:#fff}}.navbar.is-link{background-color:#3273dc;color:#fff}.navbar.is-link .navbar-brand .navbar-link,.navbar.is-link .navbar-brand>.navbar-item{color:#fff}.navbar.is-link .navbar-brand .navbar-link.is-active,.navbar.is-link .navbar-brand .navbar-link:focus,.navbar.is-link .navbar-brand .navbar-link:hover,.navbar.is-link .navbar-brand>a.navbar-item.is-active,.navbar.is-link .navbar-brand>a.navbar-item:focus,.navbar.is-link .navbar-brand>a.navbar-item:hover{background-color:#2366d1;color:#fff}.navbar.is-link .navbar-brand .navbar-link::after{border-color:#fff}.navbar.is-link .navbar-burger{color:#fff}@media screen and (min-width:1024px){.navbar.is-link .navbar-end .navbar-link,.navbar.is-link .navbar-end>.navbar-item,.navbar.is-link .navbar-start .navbar-link,.navbar.is-link .navbar-start>.navbar-item{color:#fff}.navbar.is-link .navbar-end .navbar-link.is-active,.navbar.is-link .navbar-end .navbar-link:focus,.navbar.is-link .navbar-end .navbar-link:hover,.navbar.is-link .navbar-end>a.navbar-item.is-active,.navbar.is-link .navbar-end>a.navbar-item:focus,.navbar.is-link .navbar-end>a.navbar-item:hover,.navbar.is-link .navbar-start .navbar-link.is-active,.navbar.is-link .navbar-start .navbar-link:focus,.navbar.is-link .navbar-start .navbar-link:hover,.navbar.is-link .navbar-start>a.navbar-item.is-active,.navbar.is-link .navbar-start>a.navbar-item:focus,.navbar.is-link .navbar-start>a.navbar-item:hover{background-color:#2366d1;color:#fff}.navbar.is-link .navbar-end .navbar-link::after,.navbar.is-link .navbar-start .navbar-link::after{border-color:#fff}.navbar.is-link .navbar-item.has-dropdown.is-active .navbar-link,.navbar.is-link .navbar-item.has-dropdown:focus .navbar-link,.navbar.is-link .navbar-item.has-dropdown:hover .navbar-link{background-color:#2366d1;color:#fff}.navbar.is-link .navbar-dropdown a.navbar-item.is-active{background-color:#3273dc;color:#fff}}.navbar.is-info{background-color:#3298dc;color:#fff}.navbar.is-info .navbar-brand .navbar-link,.navbar.is-info .navbar-brand>.navbar-item{color:#fff}.navbar.is-info .navbar-brand .navbar-link.is-active,.navbar.is-info .navbar-brand .navbar-link:focus,.navbar.is-info .navbar-brand .navbar-link:hover,.navbar.is-info .navbar-brand>a.navbar-item.is-active,.navbar.is-info .navbar-brand>a.navbar-item:focus,.navbar.is-info .navbar-brand>a.navbar-item:hover{background-color:#238cd1;color:#fff}.navbar.is-info .navbar-brand .navbar-link::after{border-color:#fff}.navbar.is-info .navbar-burger{color:#fff}@media screen and (min-width:1024px){.navbar.is-info .navbar-end .navbar-link,.navbar.is-info .navbar-end>.navbar-item,.navbar.is-info .navbar-start .navbar-link,.navbar.is-info .navbar-start>.navbar-item{color:#fff}.navbar.is-info .navbar-end .navbar-link.is-active,.navbar.is-info .navbar-end .navbar-link:focus,.navbar.is-info .navbar-end .navbar-link:hover,.navbar.is-info .navbar-end>a.navbar-item.is-active,.navbar.is-info .navbar-end>a.navbar-item:focus,.navbar.is-info .navbar-end>a.navbar-item:hover,.navbar.is-info .navbar-start .navbar-link.is-active,.navbar.is-info .navbar-start .navbar-link:focus,.navbar.is-info .navbar-start .navbar-link:hover,.navbar.is-info .navbar-start>a.navbar-item.is-active,.navbar.is-info .navbar-start>a.navbar-item:focus,.navbar.is-info .navbar-start>a.navbar-item:hover{background-color:#238cd1;color:#fff}.navbar.is-info .navbar-end .navbar-link::after,.navbar.is-info .navbar-start .navbar-link::after{border-color:#fff}.navbar.is-info .navbar-item.has-dropdown.is-active .navbar-link,.navbar.is-info .navbar-item.has-dropdown:focus .navbar-link,.navbar.is-info .navbar-item.has-dropdown:hover .navbar-link{background-color:#238cd1;color:#fff}.navbar.is-info .navbar-dropdown a.navbar-item.is-active{background-color:#3298dc;color:#fff}}.navbar.is-success{background-color:#48c774;color:#fff}.navbar.is-success .navbar-brand .navbar-link,.navbar.is-success .navbar-brand>.navbar-item{color:#fff}.navbar.is-success .navbar-brand .navbar-link.is-active,.navbar.is-success .navbar-brand .navbar-link:focus,.navbar.is-success .navbar-brand .navbar-link:hover,.navbar.is-success .navbar-brand>a.navbar-item.is-active,.navbar.is-success .navbar-brand>a.navbar-item:focus,.navbar.is-success .navbar-brand>a.navbar-item:hover{background-color:#3abb67;color:#fff}.navbar.is-success .navbar-brand .navbar-link::after{border-color:#fff}.navbar.is-success .navbar-burger{color:#fff}@media screen and (min-width:1024px){.navbar.is-success .navbar-end .navbar-link,.navbar.is-success .navbar-end>.navbar-item,.navbar.is-success .navbar-start .navbar-link,.navbar.is-success .navbar-start>.navbar-item{color:#fff}.navbar.is-success .navbar-end .navbar-link.is-active,.navbar.is-success .navbar-end .navbar-link:focus,.navbar.is-success .navbar-end .navbar-link:hover,.navbar.is-success .navbar-end>a.navbar-item.is-active,.navbar.is-success .navbar-end>a.navbar-item:focus,.navbar.is-success .navbar-end>a.navbar-item:hover,.navbar.is-success .navbar-start .navbar-link.is-active,.navbar.is-success .navbar-start .navbar-link:focus,.navbar.is-success .navbar-start .navbar-link:hover,.navbar.is-success .navbar-start>a.navbar-item.is-active,.navbar.is-success .navbar-start>a.navbar-item:focus,.navbar.is-success .navbar-start>a.navbar-item:hover{background-color:#3abb67;color:#fff}.navbar.is-success .navbar-end .navbar-link::after,.navbar.is-success .navbar-start .navbar-link::after{border-color:#fff}.navbar.is-success .navbar-item.has-dropdown.is-active .navbar-link,.navbar.is-success .navbar-item.has-dropdown:focus .navbar-link,.navbar.is-success .navbar-item.has-dropdown:hover .navbar-link{background-color:#3abb67;color:#fff}.navbar.is-success .navbar-dropdown a.navbar-item.is-active{background-color:#48c774;color:#fff}}.navbar.is-warning{background-color:#ffdd57;color:rgba(0,0,0,.7)}.navbar.is-warning .navbar-brand .navbar-link,.navbar.is-warning .navbar-brand>.navbar-item{color:rgba(0,0,0,.7)}.navbar.is-warning .navbar-brand .navbar-link.is-active,.navbar.is-warning .navbar-brand .navbar-link:focus,.navbar.is-warning .navbar-brand .navbar-link:hover,.navbar.is-warning .navbar-brand>a.navbar-item.is-active,.navbar.is-warning .navbar-brand>a.navbar-item:focus,.navbar.is-warning .navbar-brand>a.navbar-item:hover{background-color:#ffd83d;color:rgba(0,0,0,.7)}.navbar.is-warning .navbar-brand .navbar-link::after{border-color:rgba(0,0,0,.7)}.navbar.is-warning .navbar-burger{color:rgba(0,0,0,.7)}@media screen and (min-width:1024px){.navbar.is-warning .navbar-end .navbar-link,.navbar.is-warning .navbar-end>.navbar-item,.navbar.is-warning .navbar-start .navbar-link,.navbar.is-warning .navbar-start>.navbar-item{color:rgba(0,0,0,.7)}.navbar.is-warning .navbar-end .navbar-link.is-active,.navbar.is-warning .navbar-end .navbar-link:focus,.navbar.is-warning .navbar-end .navbar-link:hover,.navbar.is-warning .navbar-end>a.navbar-item.is-active,.navbar.is-warning .navbar-end>a.navbar-item:focus,.navbar.is-warning .navbar-end>a.navbar-item:hover,.navbar.is-warning .navbar-start .navbar-link.is-active,.navbar.is-warning .navbar-start .navbar-link:focus,.navbar.is-warning .navbar-start .navbar-link:hover,.navbar.is-warning .navbar-start>a.navbar-item.is-active,.navbar.is-warning .navbar-start>a.navbar-item:focus,.navbar.is-warning .navbar-start>a.navbar-item:hover{background-color:#ffd83d;color:rgba(0,0,0,.7)}.navbar.is-warning .navbar-end .navbar-link::after,.navbar.is-warning .navbar-start .navbar-link::after{border-color:rgba(0,0,0,.7)}.navbar.is-warning .navbar-item.has-dropdown.is-active .navbar-link,.navbar.is-warning .navbar-item.has-dropdown:focus .navbar-link,.navbar.is-warning .navbar-item.has-dropdown:hover .navbar-link{background-color:#ffd83d;color:rgba(0,0,0,.7)}.navbar.is-warning .navbar-dropdown a.navbar-item.is-active{background-color:#ffdd57;color:rgba(0,0,0,.7)}}.navbar.is-danger{background-color:#f14668;color:#fff}.navbar.is-danger .navbar-brand .navbar-link,.navbar.is-danger .navbar-brand>.navbar-item{color:#fff}.navbar.is-danger .navbar-brand .navbar-link.is-active,.navbar.is-danger .navbar-brand .navbar-link:focus,.navbar.is-danger .navbar-brand .navbar-link:hover,.navbar.is-danger .navbar-brand>a.navbar-item.is-active,.navbar.is-danger .navbar-brand>a.navbar-item:focus,.navbar.is-danger .navbar-brand>a.navbar-item:hover{background-color:#ef2e55;color:#fff}.navbar.is-danger .navbar-brand .navbar-link::after{border-color:#fff}.navbar.is-danger .navbar-burger{color:#fff}@media screen and (min-width:1024px){.navbar.is-danger .navbar-end .navbar-link,.navbar.is-danger .navbar-end>.navbar-item,.navbar.is-danger .navbar-start .navbar-link,.navbar.is-danger .navbar-start>.navbar-item{color:#fff}.navbar.is-danger .navbar-end .navbar-link.is-active,.navbar.is-danger .navbar-end .navbar-link:focus,.navbar.is-danger .navbar-end .navbar-link:hover,.navbar.is-danger .navbar-end>a.navbar-item.is-active,.navbar.is-danger .navbar-end>a.navbar-item:focus,.navbar.is-danger .navbar-end>a.navbar-item:hover,.navbar.is-danger .navbar-start .navbar-link.is-active,.navbar.is-danger .navbar-start .navbar-link:focus,.navbar.is-danger .navbar-start .navbar-link:hover,.navbar.is-danger .navbar-start>a.navbar-item.is-active,.navbar.is-danger .navbar-start>a.navbar-item:focus,.navbar.is-danger .navbar-start>a.navbar-item:hover{background-color:#ef2e55;color:#fff}.navbar.is-danger .navbar-end .navbar-link::after,.navbar.is-danger .navbar-start .navbar-link::after{border-color:#fff}.navbar.is-danger .navbar-item.has-dropdown.is-active .navbar-link,.navbar.is-danger .navbar-item.has-dropdown:focus .navbar-link,.navbar.is-danger .navbar-item.has-dropdown:hover .navbar-link{background-color:#ef2e55;color:#fff}.navbar.is-danger .navbar-dropdown a.navbar-item.is-active{background-color:#f14668;color:#fff}}.navbar>.container{align-items:stretch;display:flex;min-height:3.25rem;width:100%}.navbar.has-shadow{box-shadow:0 2px 0 0 #f5f5f5}.navbar.is-fixed-bottom,.navbar.is-fixed-top{left:0;position:fixed;right:0;z-index:30}.navbar.is-fixed-bottom{bottom:0}.navbar.is-fixed-bottom.has-shadow{box-shadow:0 -2px 0 0 #f5f5f5}.navbar.is-fixed-top{top:0}body.has-navbar-fixed-top,html.has-navbar-fixed-top{padding-top:3.25rem}body.has-navbar-fixed-bottom,html.has-navbar-fixed-bottom{padding-bottom:3.25rem}.navbar-brand,.navbar-tabs{align-items:stretch;display:flex;flex-shrink:0;min-height:3.25rem}.navbar-brand a.navbar-item:focus,.navbar-brand a.navbar-item:hover{background-color:transparent}.navbar-tabs{-webkit-overflow-scrolling:touch;max-width:100vw;overflow-x:auto;overflow-y:hidden}.navbar-burger{color:#4a4a4a;cursor:pointer;display:block;height:3.25rem;position:relative;width:3.25rem;margin-left:auto}.navbar-burger span{background-color:currentColor;display:block;height:1px;left:calc(50% - 8px);position:absolute;transform-origin:center;transition-duration:86ms;transition-property:background-color,opacity,transform;transition-timing-function:ease-out;width:16px}.navbar-burger span:nth-child(1){top:calc(50% - 6px)}.navbar-burger span:nth-child(2){top:calc(50% - 1px)}.navbar-burger span:nth-child(3){top:calc(50% + 4px)}.navbar-burger:hover{background-color:rgba(0,0,0,.05)}.navbar-burger.is-active span:nth-child(1){transform:translateY(5px) rotate(45deg)}.navbar-burger.is-active span:nth-child(2){opacity:0}.navbar-burger.is-active span:nth-child(3){transform:translateY(-5px) rotate(-45deg)}.navbar-menu{display:none}.navbar-item,.navbar-link{color:#4a4a4a;display:block;line-height:1.5;padding:.5rem .75rem;position:relative}.navbar-item .icon:only-child,.navbar-link .icon:only-child{margin-left:-.25rem;margin-right:-.25rem}.navbar-link,a.navbar-item{cursor:pointer}.navbar-link.is-active,.navbar-link:focus,.navbar-link:focus-within,.navbar-link:hover,a.navbar-item.is-active,a.navbar-item:focus,a.navbar-item:focus-within,a.navbar-item:hover{background-color:#fafafa;color:#3273dc}.navbar-item{flex-grow:0;flex-shrink:0}.navbar-item img{max-height:1.75rem}.navbar-item.has-dropdown{padding:0}.navbar-item.is-expanded{flex-grow:1;flex-shrink:1}.navbar-item.is-tab{border-bottom:1px solid transparent;min-height:3.25rem;padding-bottom:calc(.5rem - 1px)}.navbar-item.is-tab:focus,.navbar-item.is-tab:hover{background-color:transparent;border-bottom-color:#3273dc}.navbar-item.is-tab.is-active{background-color:transparent;border-bottom-color:#3273dc;border-bottom-style:solid;border-bottom-width:3px;color:#3273dc;padding-bottom:calc(.5rem - 3px)}.navbar-content{flex-grow:1;flex-shrink:1}.navbar-link:not(.is-arrowless){padding-right:2.5em}.navbar-link:not(.is-arrowless)::after{border-color:#3273dc;margin-top:-.375em;right:1.125em}.navbar-dropdown{font-size:.875rem;padding-bottom:.5rem;padding-top:.5rem}.navbar-dropdown .navbar-item{padding-left:1.5rem;padding-right:1.5rem}.navbar-divider{background-color:#f5f5f5;border:none;display:none;height:2px;margin:.5rem 0}@media screen and (max-width:1023px){.navbar>.container{display:block}.navbar-brand .navbar-item,.navbar-tabs .navbar-item{align-items:center;display:flex}.navbar-link::after{display:none}.navbar-menu{background-color:#fff;box-shadow:0 8px 16px rgba(10,10,10,.1);padding:.5rem 0}.navbar-menu.is-active{display:block}.navbar.is-fixed-bottom-touch,.navbar.is-fixed-top-touch{left:0;position:fixed;right:0;z-index:30}.navbar.is-fixed-bottom-touch{bottom:0}.navbar.is-fixed-bottom-touch.has-shadow{box-shadow:0 -2px 3px rgba(10,10,10,.1)}.navbar.is-fixed-top-touch{top:0}.navbar.is-fixed-top .navbar-menu,.navbar.is-fixed-top-touch .navbar-menu{-webkit-overflow-scrolling:touch;max-height:calc(100vh - 3.25rem);overflow:auto}body.has-navbar-fixed-top-touch,html.has-navbar-fixed-top-touch{padding-top:3.25rem}body.has-navbar-fixed-bottom-touch,html.has-navbar-fixed-bottom-touch{padding-bottom:3.25rem}}@media screen and (min-width:1024px){.navbar,.navbar-end,.navbar-menu,.navbar-start{align-items:stretch;display:flex}.navbar{min-height:3.25rem}.navbar.is-spaced{padding:1rem 2rem}.navbar.is-spaced .navbar-end,.navbar.is-spaced .navbar-start{align-items:center}.navbar.is-spaced .navbar-link,.navbar.is-spaced a.navbar-item{border-radius:4px}.navbar.is-transparent .navbar-link.is-active,.navbar.is-transparent .navbar-link:focus,.navbar.is-transparent .navbar-link:hover,.navbar.is-transparent a.navbar-item.is-active,.navbar.is-transparent a.navbar-item:focus,.navbar.is-transparent a.navbar-item:hover{background-color:transparent!important}.navbar.is-transparent .navbar-item.has-dropdown.is-active .navbar-link,.navbar.is-transparent .navbar-item.has-dropdown.is-hoverable:focus .navbar-link,.navbar.is-transparent .navbar-item.has-dropdown.is-hoverable:focus-within .navbar-link,.navbar.is-transparent .navbar-item.has-dropdown.is-hoverable:hover .navbar-link{background-color:transparent!important}.navbar.is-transparent .navbar-dropdown a.navbar-item:focus,.navbar.is-transparent .navbar-dropdown a.navbar-item:hover{background-color:#f5f5f5;color:#0a0a0a}.navbar.is-transparent .navbar-dropdown a.navbar-item.is-active{background-color:#f5f5f5;color:#3273dc}.navbar-burger{display:none}.navbar-item,.navbar-link{align-items:center;display:flex}.navbar-item.has-dropdown{align-items:stretch}.navbar-item.has-dropdown-up .navbar-link::after{transform:rotate(135deg) translate(.25em,-.25em)}.navbar-item.has-dropdown-up .navbar-dropdown{border-bottom:2px solid #dbdbdb;border-radius:6px 6px 0 0;border-top:none;bottom:100%;box-shadow:0 -8px 8px rgba(10,10,10,.1);top:auto}.navbar-item.is-active .navbar-dropdown,.navbar-item.is-hoverable:focus .navbar-dropdown,.navbar-item.is-hoverable:focus-within .navbar-dropdown,.navbar-item.is-hoverable:hover .navbar-dropdown{display:block}.navbar-item.is-active .navbar-dropdown.is-boxed,.navbar-item.is-hoverable:focus .navbar-dropdown.is-boxed,.navbar-item.is-hoverable:focus-within .navbar-dropdown.is-boxed,.navbar-item.is-hoverable:hover .navbar-dropdown.is-boxed,.navbar.is-spaced .navbar-item.is-active .navbar-dropdown,.navbar.is-spaced .navbar-item.is-hoverable:focus .navbar-dropdown,.navbar.is-spaced .navbar-item.is-hoverable:focus-within .navbar-dropdown,.navbar.is-spaced .navbar-item.is-hoverable:hover .navbar-dropdown{opacity:1;pointer-events:auto;transform:translateY(0)}.navbar-menu{flex-grow:1;flex-shrink:0}.navbar-start{justify-content:flex-start;margin-right:auto}.navbar-end{justify-content:flex-end;margin-left:auto}.navbar-dropdown{background-color:#fff;border-bottom-left-radius:6px;border-bottom-right-radius:6px;border-top:2px solid #dbdbdb;box-shadow:0 8px 8px rgba(10,10,10,.1);display:none;font-size:.875rem;left:0;min-width:100%;position:absolute;top:100%;z-index:20}.navbar-dropdown .navbar-item{padding:.375rem 1rem;white-space:nowrap}.navbar-dropdown a.navbar-item{padding-right:3rem}.navbar-dropdown a.navbar-item:focus,.navbar-dropdown a.navbar-item:hover{background-color:#f5f5f5;color:#0a0a0a}.navbar-dropdown a.navbar-item.is-active{background-color:#f5f5f5;color:#3273dc}.navbar-dropdown.is-boxed,.navbar.is-spaced .navbar-dropdown{border-radius:6px;border-top:none;box-shadow:0 8px 8px rgba(10,10,10,.1),0 0 0 1px rgba(10,10,10,.1);display:block;opacity:0;pointer-events:none;top:calc(100% + (-4px));transform:translateY(-5px);transition-duration:86ms;transition-property:opacity,transform}.navbar-dropdown.is-right{left:auto;right:0}.navbar-divider{display:block}.container>.navbar .navbar-brand,.navbar>.container .navbar-brand{margin-left:-.75rem}.container>.navbar .navbar-menu,.navbar>.container .navbar-menu{margin-right:-.75rem}.navbar.is-fixed-bottom-desktop,.navbar.is-fixed-top-desktop{left:0;position:fixed;right:0;z-index:30}.navbar.is-fixed-bottom-desktop{bottom:0}.navbar.is-fixed-bottom-desktop.has-shadow{box-shadow:0 -2px 3px rgba(10,10,10,.1)}.navbar.is-fixed-top-desktop{top:0}body.has-navbar-fixed-top-desktop,html.has-navbar-fixed-top-desktop{padding-top:3.25rem}body.has-navbar-fixed-bottom-desktop,html.has-navbar-fixed-bottom-desktop{padding-bottom:3.25rem}body.has-spaced-navbar-fixed-top,html.has-spaced-navbar-fixed-top{padding-top:5.25rem}body.has-spaced-navbar-fixed-bottom,html.has-spaced-navbar-fixed-bottom{padding-bottom:5.25rem}.navbar-link.is-active,a.navbar-item.is-active{color:#0a0a0a}.navbar-link.is-active:not(:focus):not(:hover),a.navbar-item.is-active:not(:focus):not(:hover){background-color:transparent}.navbar-item.has-dropdown.is-active .navbar-link,.navbar-item.has-dropdown:focus .navbar-link,.navbar-item.has-dropdown:hover .navbar-link{background-color:#fafafa}}.hero.is-fullheight-with-navbar{min-height:calc(100vh - 3.25rem)}.pagination{font-size:1rem;margin:-.25rem}.pagination.is-small{font-size:.75rem}.pagination.is-medium{font-size:1.25rem}.pagination.is-large{font-size:1.5rem}.pagination.is-rounded .pagination-next,.pagination.is-rounded .pagination-previous{padding-left:1em;padding-right:1em;border-radius:290486px}.pagination.is-rounded .pagination-link{border-radius:290486px}.pagination,.pagination-list{align-items:center;display:flex;justify-content:center;text-align:center}.pagination-ellipsis,.pagination-link,.pagination-next,.pagination-previous{font-size:1em;justify-content:center;margin:.25rem;padding-left:.5em;padding-right:.5em;text-align:center}.pagination-link,.pagination-next,.pagination-previous{border-color:#dbdbdb;color:#363636;min-width:2.5em}.pagination-link:hover,.pagination-next:hover,.pagination-previous:hover{border-color:#b5b5b5;color:#363636}.pagination-link:focus,.pagination-next:focus,.pagination-previous:focus{border-color:#3273dc}.pagination-link:active,.pagination-next:active,.pagination-previous:active{box-shadow:inset 0 1px 2px rgba(10,10,10,.2)}.pagination-link[disabled],.pagination-next[disabled],.pagination-previous[disabled]{background-color:#dbdbdb;border-color:#dbdbdb;box-shadow:none;color:#7a7a7a;opacity:.5}.pagination-next,.pagination-previous{padding-left:.75em;padding-right:.75em;white-space:nowrap}.pagination-link.is-current{background-color:#3273dc;border-color:#3273dc;color:#fff}.pagination-ellipsis{color:#b5b5b5;pointer-events:none}.pagination-list{flex-wrap:wrap}@media screen and (max-width:768px){.pagination{flex-wrap:wrap}.pagination-next,.pagination-previous{flex-grow:1;flex-shrink:1}.pagination-list li{flex-grow:1;flex-shrink:1}}@media screen and (min-width:769px),print{.pagination-list{flex-grow:1;flex-shrink:1;justify-content:flex-start;order:1}.pagination-previous{order:2}.pagination-next{order:3}.pagination{justify-content:space-between}.pagination.is-centered .pagination-previous{order:1}.pagination.is-centered .pagination-list{justify-content:center;order:2}.pagination.is-centered .pagination-next{order:3}.pagination.is-right .pagination-previous{order:1}.pagination.is-right .pagination-next{order:2}.pagination.is-right .pagination-list{justify-content:flex-end;order:3}}.panel{border-radius:6px;box-shadow:0 .5em 1em -.125em rgba(10,10,10,.1),0 0 0 1px rgba(10,10,10,.02);font-size:1rem}.panel:not(:last-child){margin-bottom:1.5rem}.panel.is-white .panel-heading{background-color:#fff;color:#0a0a0a}.panel.is-white .panel-tabs a.is-active{border-bottom-color:#fff}.panel.is-white .panel-block.is-active .panel-icon{color:#fff}.panel.is-black .panel-heading{background-color:#0a0a0a;color:#fff}.panel.is-black .panel-tabs a.is-active{border-bottom-color:#0a0a0a}.panel.is-black .panel-block.is-active .panel-icon{color:#0a0a0a}.panel.is-light .panel-heading{background-color:#f5f5f5;color:rgba(0,0,0,.7)}.panel.is-light .panel-tabs a.is-active{border-bottom-color:#f5f5f5}.panel.is-light .panel-block.is-active .panel-icon{color:#f5f5f5}.panel.is-dark .panel-heading{background-color:#363636;color:#fff}.panel.is-dark .panel-tabs a.is-active{border-bottom-color:#363636}.panel.is-dark .panel-block.is-active .panel-icon{color:#363636}.panel.is-primary .panel-heading{background-color:#00d1b2;color:#fff}.panel.is-primary .panel-tabs a.is-active{border-bottom-color:#00d1b2}.panel.is-primary .panel-block.is-active .panel-icon{color:#00d1b2}.panel.is-link .panel-heading{background-color:#3273dc;color:#fff}.panel.is-link .panel-tabs a.is-active{border-bottom-color:#3273dc}.panel.is-link .panel-block.is-active .panel-icon{color:#3273dc}.panel.is-info .panel-heading{background-color:#3298dc;color:#fff}.panel.is-info .panel-tabs a.is-active{border-bottom-color:#3298dc}.panel.is-info .panel-block.is-active .panel-icon{color:#3298dc}.panel.is-success .panel-heading{background-color:#48c774;color:#fff}.panel.is-success .panel-tabs a.is-active{border-bottom-color:#48c774}.panel.is-success .panel-block.is-active .panel-icon{color:#48c774}.panel.is-warning .panel-heading{background-color:#ffdd57;color:rgba(0,0,0,.7)}.panel.is-warning .panel-tabs a.is-active{border-bottom-color:#ffdd57}.panel.is-warning .panel-block.is-active .panel-icon{color:#ffdd57}.panel.is-danger .panel-heading{background-color:#f14668;color:#fff}.panel.is-danger .panel-tabs a.is-active{border-bottom-color:#f14668}.panel.is-danger .panel-block.is-active .panel-icon{color:#f14668}.panel-block:not(:last-child),.panel-tabs:not(:last-child){border-bottom:1px solid #ededed}.panel-heading{background-color:#ededed;border-radius:6px 6px 0 0;color:#363636;font-size:1.25em;font-weight:700;line-height:1.25;padding:.75em 1em}.panel-tabs{align-items:flex-end;display:flex;font-size:.875em;justify-content:center}.panel-tabs a{border-bottom:1px solid #dbdbdb;margin-bottom:-1px;padding:.5em}.panel-tabs a.is-active{border-bottom-color:#4a4a4a;color:#363636}.panel-list a{color:#4a4a4a}.panel-list a:hover{color:#3273dc}.panel-block{align-items:center;color:#363636;display:flex;justify-content:flex-start;padding:.5em .75em}.panel-block input[type=checkbox]{margin-right:.75em}.panel-block>.control{flex-grow:1;flex-shrink:1;width:100%}.panel-block.is-wrapped{flex-wrap:wrap}.panel-block.is-active{border-left-color:#3273dc;color:#363636}.panel-block.is-active .panel-icon{color:#3273dc}.panel-block:last-child{border-bottom-left-radius:6px;border-bottom-right-radius:6px}a.panel-block,label.panel-block{cursor:pointer}a.panel-block:hover,label.panel-block:hover{background-color:#f5f5f5}.panel-icon{display:inline-block;font-size:14px;height:1em;line-height:1em;text-align:center;vertical-align:top;width:1em;color:#7a7a7a;margin-right:.75em}.panel-icon .fa{font-size:inherit;line-height:inherit}.tabs{-webkit-overflow-scrolling:touch;align-items:stretch;display:flex;font-size:1rem;justify-content:space-between;overflow:hidden;overflow-x:auto;white-space:nowrap}.tabs a{align-items:center;border-bottom-color:#dbdbdb;border-bottom-style:solid;border-bottom-width:1px;color:#4a4a4a;display:flex;justify-content:center;margin-bottom:-1px;padding:.5em 1em;vertical-align:top}.tabs a:hover{border-bottom-color:#363636;color:#363636}.tabs li{display:block}.tabs li.is-active a{border-bottom-color:#3273dc;color:#3273dc}.tabs ul{align-items:center;border-bottom-color:#dbdbdb;border-bottom-style:solid;border-bottom-width:1px;display:flex;flex-grow:1;flex-shrink:0;justify-content:flex-start}.tabs ul.is-left{padding-right:.75em}.tabs ul.is-center{flex:none;justify-content:center;padding-left:.75em;padding-right:.75em}.tabs ul.is-right{justify-content:flex-end;padding-left:.75em}.tabs .icon:first-child{margin-right:.5em}.tabs .icon:last-child{margin-left:.5em}.tabs.is-centered ul{justify-content:center}.tabs.is-right ul{justify-content:flex-end}.tabs.is-boxed a{border:1px solid transparent;border-radius:4px 4px 0 0}.tabs.is-boxed a:hover{background-color:#f5f5f5;border-bottom-color:#dbdbdb}.tabs.is-boxed li.is-active a{background-color:#fff;border-color:#dbdbdb;border-bottom-color:transparent!important}.tabs.is-fullwidth li{flex-grow:1;flex-shrink:0}.tabs.is-toggle a{border-color:#dbdbdb;border-style:solid;border-width:1px;margin-bottom:0;position:relative}.tabs.is-toggle a:hover{background-color:#f5f5f5;border-color:#b5b5b5;z-index:2}.tabs.is-toggle li+li{margin-left:-1px}.tabs.is-toggle li:first-child a{border-top-left-radius:4px;border-bottom-left-radius:4px}.tabs.is-toggle li:last-child a{border-top-right-radius:4px;border-bottom-right-radius:4px}.tabs.is-toggle li.is-active a{background-color:#3273dc;border-color:#3273dc;color:#fff;z-index:1}.tabs.is-toggle ul{border-bottom:none}.tabs.is-toggle.is-toggle-rounded li:first-child a{border-bottom-left-radius:290486px;border-top-left-radius:290486px;padding-left:1.25em}.tabs.is-toggle.is-toggle-rounded li:last-child a{border-bottom-right-radius:290486px;border-top-right-radius:290486px;padding-right:1.25em}.tabs.is-small{font-size:.75rem}.tabs.is-medium{font-size:1.25rem}.tabs.is-large{font-size:1.5rem}.column{display:block;flex-basis:0;flex-grow:1;flex-shrink:1;padding:.75rem}.columns.is-mobile>.column.is-narrow{flex:none}.columns.is-mobile>.column.is-full{flex:none;width:100%}.columns.is-mobile>.column.is-three-quarters{flex:none;width:75%}.columns.is-mobile>.column.is-two-thirds{flex:none;width:66.6666%}.columns.is-mobile>.column.is-half{flex:none;width:50%}.columns.is-mobile>.column.is-one-third{flex:none;width:33.3333%}.columns.is-mobile>.column.is-one-quarter{flex:none;width:25%}.columns.is-mobile>.column.is-one-fifth{flex:none;width:20%}.columns.is-mobile>.column.is-two-fifths{flex:none;width:40%}.columns.is-mobile>.column.is-three-fifths{flex:none;width:60%}.columns.is-mobile>.column.is-four-fifths{flex:none;width:80%}.columns.is-mobile>.column.is-offset-three-quarters{margin-left:75%}.columns.is-mobile>.column.is-offset-two-thirds{margin-left:66.6666%}.columns.is-mobile>.column.is-offset-half{margin-left:50%}.columns.is-mobile>.column.is-offset-one-third{margin-left:33.3333%}.columns.is-mobile>.column.is-offset-one-quarter{margin-left:25%}.columns.is-mobile>.column.is-offset-one-fifth{margin-left:20%}.columns.is-mobile>.column.is-offset-two-fifths{margin-left:40%}.columns.is-mobile>.column.is-offset-three-fifths{margin-left:60%}.columns.is-mobile>.column.is-offset-four-fifths{margin-left:80%}.columns.is-mobile>.column.is-0{flex:none;width:0%}.columns.is-mobile>.column.is-offset-0{margin-left:0}.columns.is-mobile>.column.is-1{flex:none;width:8.33333%}.columns.is-mobile>.column.is-offset-1{margin-left:8.33333%}.columns.is-mobile>.column.is-2{flex:none;width:16.66667%}.columns.is-mobile>.column.is-offset-2{margin-left:16.66667%}.columns.is-mobile>.column.is-3{flex:none;width:25%}.columns.is-mobile>.column.is-offset-3{margin-left:25%}.columns.is-mobile>.column.is-4{flex:none;width:33.33333%}.columns.is-mobile>.column.is-offset-4{margin-left:33.33333%}.columns.is-mobile>.column.is-5{flex:none;width:41.66667%}.columns.is-mobile>.column.is-offset-5{margin-left:41.66667%}.columns.is-mobile>.column.is-6{flex:none;width:50%}.columns.is-mobile>.column.is-offset-6{margin-left:50%}.columns.is-mobile>.column.is-7{flex:none;width:58.33333%}.columns.is-mobile>.column.is-offset-7{margin-left:58.33333%}.columns.is-mobile>.column.is-8{flex:none;width:66.66667%}.columns.is-mobile>.column.is-offset-8{margin-left:66.66667%}.columns.is-mobile>.column.is-9{flex:none;width:75%}.columns.is-mobile>.column.is-offset-9{margin-left:75%}.columns.is-mobile>.column.is-10{flex:none;width:83.33333%}.columns.is-mobile>.column.is-offset-10{margin-left:83.33333%}.columns.is-mobile>.column.is-11{flex:none;width:91.66667%}.columns.is-mobile>.column.is-offset-11{margin-left:91.66667%}.columns.is-mobile>.column.is-12{flex:none;width:100%}.columns.is-mobile>.column.is-offset-12{margin-left:100%}@media screen and (max-width:768px){.column.is-narrow-mobile{flex:none}.column.is-full-mobile{flex:none;width:100%}.column.is-three-quarters-mobile{flex:none;width:75%}.column.is-two-thirds-mobile{flex:none;width:66.6666%}.column.is-half-mobile{flex:none;width:50%}.column.is-one-third-mobile{flex:none;width:33.3333%}.column.is-one-quarter-mobile{flex:none;width:25%}.column.is-one-fifth-mobile{flex:none;width:20%}.column.is-two-fifths-mobile{flex:none;width:40%}.column.is-three-fifths-mobile{flex:none;width:60%}.column.is-four-fifths-mobile{flex:none;width:80%}.column.is-offset-three-quarters-mobile{margin-left:75%}.column.is-offset-two-thirds-mobile{margin-left:66.6666%}.column.is-offset-half-mobile{margin-left:50%}.column.is-offset-one-third-mobile{margin-left:33.3333%}.column.is-offset-one-quarter-mobile{margin-left:25%}.column.is-offset-one-fifth-mobile{margin-left:20%}.column.is-offset-two-fifths-mobile{margin-left:40%}.column.is-offset-three-fifths-mobile{margin-left:60%}.column.is-offset-four-fifths-mobile{margin-left:80%}.column.is-0-mobile{flex:none;width:0%}.column.is-offset-0-mobile{margin-left:0}.column.is-1-mobile{flex:none;width:8.33333%}.column.is-offset-1-mobile{margin-left:8.33333%}.column.is-2-mobile{flex:none;width:16.66667%}.column.is-offset-2-mobile{margin-left:16.66667%}.column.is-3-mobile{flex:none;width:25%}.column.is-offset-3-mobile{margin-left:25%}.column.is-4-mobile{flex:none;width:33.33333%}.column.is-offset-4-mobile{margin-left:33.33333%}.column.is-5-mobile{flex:none;width:41.66667%}.column.is-offset-5-mobile{margin-left:41.66667%}.column.is-6-mobile{flex:none;width:50%}.column.is-offset-6-mobile{margin-left:50%}.column.is-7-mobile{flex:none;width:58.33333%}.column.is-offset-7-mobile{margin-left:58.33333%}.column.is-8-mobile{flex:none;width:66.66667%}.column.is-offset-8-mobile{margin-left:66.66667%}.column.is-9-mobile{flex:none;width:75%}.column.is-offset-9-mobile{margin-left:75%}.column.is-10-mobile{flex:none;width:83.33333%}.column.is-offset-10-mobile{margin-left:83.33333%}.column.is-11-mobile{flex:none;width:91.66667%}.column.is-offset-11-mobile{margin-left:91.66667%}.column.is-12-mobile{flex:none;width:100%}.column.is-offset-12-mobile{margin-left:100%}}@media screen and (min-width:769px),print{.column.is-narrow,.column.is-narrow-tablet{flex:none}.column.is-full,.column.is-full-tablet{flex:none;width:100%}.column.is-three-quarters,.column.is-three-quarters-tablet{flex:none;width:75%}.column.is-two-thirds,.column.is-two-thirds-tablet{flex:none;width:66.6666%}.column.is-half,.column.is-half-tablet{flex:none;width:50%}.column.is-one-third,.column.is-one-third-tablet{flex:none;width:33.3333%}.column.is-one-quarter,.column.is-one-quarter-tablet{flex:none;width:25%}.column.is-one-fifth,.column.is-one-fifth-tablet{flex:none;width:20%}.column.is-two-fifths,.column.is-two-fifths-tablet{flex:none;width:40%}.column.is-three-fifths,.column.is-three-fifths-tablet{flex:none;width:60%}.column.is-four-fifths,.column.is-four-fifths-tablet{flex:none;width:80%}.column.is-offset-three-quarters,.column.is-offset-three-quarters-tablet{margin-left:75%}.column.is-offset-two-thirds,.column.is-offset-two-thirds-tablet{margin-left:66.6666%}.column.is-offset-half,.column.is-offset-half-tablet{margin-left:50%}.column.is-offset-one-third,.column.is-offset-one-third-tablet{margin-left:33.3333%}.column.is-offset-one-quarter,.column.is-offset-one-quarter-tablet{margin-left:25%}.column.is-offset-one-fifth,.column.is-offset-one-fifth-tablet{margin-left:20%}.column.is-offset-two-fifths,.column.is-offset-two-fifths-tablet{margin-left:40%}.column.is-offset-three-fifths,.column.is-offset-three-fifths-tablet{margin-left:60%}.column.is-offset-four-fifths,.column.is-offset-four-fifths-tablet{margin-left:80%}.column.is-0,.column.is-0-tablet{flex:none;width:0%}.column.is-offset-0,.column.is-offset-0-tablet{margin-left:0}.column.is-1,.column.is-1-tablet{flex:none;width:8.33333%}.column.is-offset-1,.column.is-offset-1-tablet{margin-left:8.33333%}.column.is-2,.column.is-2-tablet{flex:none;width:16.66667%}.column.is-offset-2,.column.is-offset-2-tablet{margin-left:16.66667%}.column.is-3,.column.is-3-tablet{flex:none;width:25%}.column.is-offset-3,.column.is-offset-3-tablet{margin-left:25%}.column.is-4,.column.is-4-tablet{flex:none;width:33.33333%}.column.is-offset-4,.column.is-offset-4-tablet{margin-left:33.33333%}.column.is-5,.column.is-5-tablet{flex:none;width:41.66667%}.column.is-offset-5,.column.is-offset-5-tablet{margin-left:41.66667%}.column.is-6,.column.is-6-tablet{flex:none;width:50%}.column.is-offset-6,.column.is-offset-6-tablet{margin-left:50%}.column.is-7,.column.is-7-tablet{flex:none;width:58.33333%}.column.is-offset-7,.column.is-offset-7-tablet{margin-left:58.33333%}.column.is-8,.column.is-8-tablet{flex:none;width:66.66667%}.column.is-offset-8,.column.is-offset-8-tablet{margin-left:66.66667%}.column.is-9,.column.is-9-tablet{flex:none;width:75%}.column.is-offset-9,.column.is-offset-9-tablet{margin-left:75%}.column.is-10,.column.is-10-tablet{flex:none;width:83.33333%}.column.is-offset-10,.column.is-offset-10-tablet{margin-left:83.33333%}.column.is-11,.column.is-11-tablet{flex:none;width:91.66667%}.column.is-offset-11,.column.is-offset-11-tablet{margin-left:91.66667%}.column.is-12,.column.is-12-tablet{flex:none;width:100%}.column.is-offset-12,.column.is-offset-12-tablet{margin-left:100%}}@media screen and (max-width:1023px){.column.is-narrow-touch{flex:none}.column.is-full-touch{flex:none;width:100%}.column.is-three-quarters-touch{flex:none;width:75%}.column.is-two-thirds-touch{flex:none;width:66.6666%}.column.is-half-touch{flex:none;width:50%}.column.is-one-third-touch{flex:none;width:33.3333%}.column.is-one-quarter-touch{flex:none;width:25%}.column.is-one-fifth-touch{flex:none;width:20%}.column.is-two-fifths-touch{flex:none;width:40%}.column.is-three-fifths-touch{flex:none;width:60%}.column.is-four-fifths-touch{flex:none;width:80%}.column.is-offset-three-quarters-touch{margin-left:75%}.column.is-offset-two-thirds-touch{margin-left:66.6666%}.column.is-offset-half-touch{margin-left:50%}.column.is-offset-one-third-touch{margin-left:33.3333%}.column.is-offset-one-quarter-touch{margin-left:25%}.column.is-offset-one-fifth-touch{margin-left:20%}.column.is-offset-two-fifths-touch{margin-left:40%}.column.is-offset-three-fifths-touch{margin-left:60%}.column.is-offset-four-fifths-touch{margin-left:80%}.column.is-0-touch{flex:none;width:0%}.column.is-offset-0-touch{margin-left:0}.column.is-1-touch{flex:none;width:8.33333%}.column.is-offset-1-touch{margin-left:8.33333%}.column.is-2-touch{flex:none;width:16.66667%}.column.is-offset-2-touch{margin-left:16.66667%}.column.is-3-touch{flex:none;width:25%}.column.is-offset-3-touch{margin-left:25%}.column.is-4-touch{flex:none;width:33.33333%}.column.is-offset-4-touch{margin-left:33.33333%}.column.is-5-touch{flex:none;width:41.66667%}.column.is-offset-5-touch{margin-left:41.66667%}.column.is-6-touch{flex:none;width:50%}.column.is-offset-6-touch{margin-left:50%}.column.is-7-touch{flex:none;width:58.33333%}.column.is-offset-7-touch{margin-left:58.33333%}.column.is-8-touch{flex:none;width:66.66667%}.column.is-offset-8-touch{margin-left:66.66667%}.column.is-9-touch{flex:none;width:75%}.column.is-offset-9-touch{margin-left:75%}.column.is-10-touch{flex:none;width:83.33333%}.column.is-offset-10-touch{margin-left:83.33333%}.column.is-11-touch{flex:none;width:91.66667%}.column.is-offset-11-touch{margin-left:91.66667%}.column.is-12-touch{flex:none;width:100%}.column.is-offset-12-touch{margin-left:100%}}@media screen and (min-width:1024px){.column.is-narrow-desktop{flex:none}.column.is-full-desktop{flex:none;width:100%}.column.is-three-quarters-desktop{flex:none;width:75%}.column.is-two-thirds-desktop{flex:none;width:66.6666%}.column.is-half-desktop{flex:none;width:50%}.column.is-one-third-desktop{flex:none;width:33.3333%}.column.is-one-quarter-desktop{flex:none;width:25%}.column.is-one-fifth-desktop{flex:none;width:20%}.column.is-two-fifths-desktop{flex:none;width:40%}.column.is-three-fifths-desktop{flex:none;width:60%}.column.is-four-fifths-desktop{flex:none;width:80%}.column.is-offset-three-quarters-desktop{margin-left:75%}.column.is-offset-two-thirds-desktop{margin-left:66.6666%}.column.is-offset-half-desktop{margin-left:50%}.column.is-offset-one-third-desktop{margin-left:33.3333%}.column.is-offset-one-quarter-desktop{margin-left:25%}.column.is-offset-one-fifth-desktop{margin-left:20%}.column.is-offset-two-fifths-desktop{margin-left:40%}.column.is-offset-three-fifths-desktop{margin-left:60%}.column.is-offset-four-fifths-desktop{margin-left:80%}.column.is-0-desktop{flex:none;width:0%}.column.is-offset-0-desktop{margin-left:0}.column.is-1-desktop{flex:none;width:8.33333%}.column.is-offset-1-desktop{margin-left:8.33333%}.column.is-2-desktop{flex:none;width:16.66667%}.column.is-offset-2-desktop{margin-left:16.66667%}.column.is-3-desktop{flex:none;width:25%}.column.is-offset-3-desktop{margin-left:25%}.column.is-4-desktop{flex:none;width:33.33333%}.column.is-offset-4-desktop{margin-left:33.33333%}.column.is-5-desktop{flex:none;width:41.66667%}.column.is-offset-5-desktop{margin-left:41.66667%}.column.is-6-desktop{flex:none;width:50%}.column.is-offset-6-desktop{margin-left:50%}.column.is-7-desktop{flex:none;width:58.33333%}.column.is-offset-7-desktop{margin-left:58.33333%}.column.is-8-desktop{flex:none;width:66.66667%}.column.is-offset-8-desktop{margin-left:66.66667%}.column.is-9-desktop{flex:none;width:75%}.column.is-offset-9-desktop{margin-left:75%}.column.is-10-desktop{flex:none;width:83.33333%}.column.is-offset-10-desktop{margin-left:83.33333%}.column.is-11-desktop{flex:none;width:91.66667%}.column.is-offset-11-desktop{margin-left:91.66667%}.column.is-12-desktop{flex:none;width:100%}.column.is-offset-12-desktop{margin-left:100%}}@media screen and (min-width:1216px){.column.is-narrow-widescreen{flex:none}.column.is-full-widescreen{flex:none;width:100%}.column.is-three-quarters-widescreen{flex:none;width:75%}.column.is-two-thirds-widescreen{flex:none;width:66.6666%}.column.is-half-widescreen{flex:none;width:50%}.column.is-one-third-widescreen{flex:none;width:33.3333%}.column.is-one-quarter-widescreen{flex:none;width:25%}.column.is-one-fifth-widescreen{flex:none;width:20%}.column.is-two-fifths-widescreen{flex:none;width:40%}.column.is-three-fifths-widescreen{flex:none;width:60%}.column.is-four-fifths-widescreen{flex:none;width:80%}.column.is-offset-three-quarters-widescreen{margin-left:75%}.column.is-offset-two-thirds-widescreen{margin-left:66.6666%}.column.is-offset-half-widescreen{margin-left:50%}.column.is-offset-one-third-widescreen{margin-left:33.3333%}.column.is-offset-one-quarter-widescreen{margin-left:25%}.column.is-offset-one-fifth-widescreen{margin-left:20%}.column.is-offset-two-fifths-widescreen{margin-left:40%}.column.is-offset-three-fifths-widescreen{margin-left:60%}.column.is-offset-four-fifths-widescreen{margin-left:80%}.column.is-0-widescreen{flex:none;width:0%}.column.is-offset-0-widescreen{margin-left:0}.column.is-1-widescreen{flex:none;width:8.33333%}.column.is-offset-1-widescreen{margin-left:8.33333%}.column.is-2-widescreen{flex:none;width:16.66667%}.column.is-offset-2-widescreen{margin-left:16.66667%}.column.is-3-widescreen{flex:none;width:25%}.column.is-offset-3-widescreen{margin-left:25%}.column.is-4-widescreen{flex:none;width:33.33333%}.column.is-offset-4-widescreen{margin-left:33.33333%}.column.is-5-widescreen{flex:none;width:41.66667%}.column.is-offset-5-widescreen{margin-left:41.66667%}.column.is-6-widescreen{flex:none;width:50%}.column.is-offset-6-widescreen{margin-left:50%}.column.is-7-widescreen{flex:none;width:58.33333%}.column.is-offset-7-widescreen{margin-left:58.33333%}.column.is-8-widescreen{flex:none;width:66.66667%}.column.is-offset-8-widescreen{margin-left:66.66667%}.column.is-9-widescreen{flex:none;width:75%}.column.is-offset-9-widescreen{margin-left:75%}.column.is-10-widescreen{flex:none;width:83.33333%}.column.is-offset-10-widescreen{margin-left:83.33333%}.column.is-11-widescreen{flex:none;width:91.66667%}.column.is-offset-11-widescreen{margin-left:91.66667%}.column.is-12-widescreen{flex:none;width:100%}.column.is-offset-12-widescreen{margin-left:100%}}@media screen and (min-width:1408px){.column.is-narrow-fullhd{flex:none}.column.is-full-fullhd{flex:none;width:100%}.column.is-three-quarters-fullhd{flex:none;width:75%}.column.is-two-thirds-fullhd{flex:none;width:66.6666%}.column.is-half-fullhd{flex:none;width:50%}.column.is-one-third-fullhd{flex:none;width:33.3333%}.column.is-one-quarter-fullhd{flex:none;width:25%}.column.is-one-fifth-fullhd{flex:none;width:20%}.column.is-two-fifths-fullhd{flex:none;width:40%}.column.is-three-fifths-fullhd{flex:none;width:60%}.column.is-four-fifths-fullhd{flex:none;width:80%}.column.is-offset-three-quarters-fullhd{margin-left:75%}.column.is-offset-two-thirds-fullhd{margin-left:66.6666%}.column.is-offset-half-fullhd{margin-left:50%}.column.is-offset-one-third-fullhd{margin-left:33.3333%}.column.is-offset-one-quarter-fullhd{margin-left:25%}.column.is-offset-one-fifth-fullhd{margin-left:20%}.column.is-offset-two-fifths-fullhd{margin-left:40%}.column.is-offset-three-fifths-fullhd{margin-left:60%}.column.is-offset-four-fifths-fullhd{margin-left:80%}.column.is-0-fullhd{flex:none;width:0%}.column.is-offset-0-fullhd{margin-left:0}.column.is-1-fullhd{flex:none;width:8.33333%}.column.is-offset-1-fullhd{margin-left:8.33333%}.column.is-2-fullhd{flex:none;width:16.66667%}.column.is-offset-2-fullhd{margin-left:16.66667%}.column.is-3-fullhd{flex:none;width:25%}.column.is-offset-3-fullhd{margin-left:25%}.column.is-4-fullhd{flex:none;width:33.33333%}.column.is-offset-4-fullhd{margin-left:33.33333%}.column.is-5-fullhd{flex:none;width:41.66667%}.column.is-offset-5-fullhd{margin-left:41.66667%}.column.is-6-fullhd{flex:none;width:50%}.column.is-offset-6-fullhd{margin-left:50%}.column.is-7-fullhd{flex:none;width:58.33333%}.column.is-offset-7-fullhd{margin-left:58.33333%}.column.is-8-fullhd{flex:none;width:66.66667%}.column.is-offset-8-fullhd{margin-left:66.66667%}.column.is-9-fullhd{flex:none;width:75%}.column.is-offset-9-fullhd{margin-left:75%}.column.is-10-fullhd{flex:none;width:83.33333%}.column.is-offset-10-fullhd{margin-left:83.33333%}.column.is-11-fullhd{flex:none;width:91.66667%}.column.is-offset-11-fullhd{margin-left:91.66667%}.column.is-12-fullhd{flex:none;width:100%}.column.is-offset-12-fullhd{margin-left:100%}}.columns{margin-left:-.75rem;margin-right:-.75rem;margin-top:-.75rem}.columns:last-child{margin-bottom:-.75rem}.columns:not(:last-child){margin-bottom:calc(1.5rem - .75rem)}.columns.is-centered{justify-content:center}.columns.is-gapless{margin-left:0;margin-right:0;margin-top:0}.columns.is-gapless>.column{margin:0;padding:0!important}.columns.is-gapless:not(:last-child){margin-bottom:1.5rem}.columns.is-gapless:last-child{margin-bottom:0}.columns.is-mobile{display:flex}.columns.is-multiline{flex-wrap:wrap}.columns.is-vcentered{align-items:center}@media screen and (min-width:769px),print{.columns:not(.is-desktop){display:flex}}@media screen and (min-width:1024px){.columns.is-desktop{display:flex}}.columns.is-variable{--columnGap:0.75rem;margin-left:calc(-1 * var(--columnGap));margin-right:calc(-1 * var(--columnGap))}.columns.is-variable .column{padding-left:var(--columnGap);padding-right:var(--columnGap)}.columns.is-variable.is-0{--columnGap:0rem}@media screen and (max-width:768px){.columns.is-variable.is-0-mobile{--columnGap:0rem}}@media screen and (min-width:769px),print{.columns.is-variable.is-0-tablet{--columnGap:0rem}}@media screen and (min-width:769px) and (max-width:1023px){.columns.is-variable.is-0-tablet-only{--columnGap:0rem}}@media screen and (max-width:1023px){.columns.is-variable.is-0-touch{--columnGap:0rem}}@media screen and (min-width:1024px){.columns.is-variable.is-0-desktop{--columnGap:0rem}}@media screen and (min-width:1024px) and (max-width:1215px){.columns.is-variable.is-0-desktop-only{--columnGap:0rem}}@media screen and (min-width:1216px){.columns.is-variable.is-0-widescreen{--columnGap:0rem}}@media screen and (min-width:1216px) and (max-width:1407px){.columns.is-variable.is-0-widescreen-only{--columnGap:0rem}}@media screen and (min-width:1408px){.columns.is-variable.is-0-fullhd{--columnGap:0rem}}.columns.is-variable.is-1{--columnGap:0.25rem}@media screen and (max-width:768px){.columns.is-variable.is-1-mobile{--columnGap:0.25rem}}@media screen and (min-width:769px),print{.columns.is-variable.is-1-tablet{--columnGap:0.25rem}}@media screen and (min-width:769px) and (max-width:1023px){.columns.is-variable.is-1-tablet-only{--columnGap:0.25rem}}@media screen and (max-width:1023px){.columns.is-variable.is-1-touch{--columnGap:0.25rem}}@media screen and (min-width:1024px){.columns.is-variable.is-1-desktop{--columnGap:0.25rem}}@media screen and (min-width:1024px) and (max-width:1215px){.columns.is-variable.is-1-desktop-only{--columnGap:0.25rem}}@media screen and (min-width:1216px){.columns.is-variable.is-1-widescreen{--columnGap:0.25rem}}@media screen and (min-width:1216px) and (max-width:1407px){.columns.is-variable.is-1-widescreen-only{--columnGap:0.25rem}}@media screen and (min-width:1408px){.columns.is-variable.is-1-fullhd{--columnGap:0.25rem}}.columns.is-variable.is-2{--columnGap:0.5rem}@media screen and (max-width:768px){.columns.is-variable.is-2-mobile{--columnGap:0.5rem}}@media screen and (min-width:769px),print{.columns.is-variable.is-2-tablet{--columnGap:0.5rem}}@media screen and (min-width:769px) and (max-width:1023px){.columns.is-variable.is-2-tablet-only{--columnGap:0.5rem}}@media screen and (max-width:1023px){.columns.is-variable.is-2-touch{--columnGap:0.5rem}}@media screen and (min-width:1024px){.columns.is-variable.is-2-desktop{--columnGap:0.5rem}}@media screen and (min-width:1024px) and (max-width:1215px){.columns.is-variable.is-2-desktop-only{--columnGap:0.5rem}}@media screen and (min-width:1216px){.columns.is-variable.is-2-widescreen{--columnGap:0.5rem}}@media screen and (min-width:1216px) and (max-width:1407px){.columns.is-variable.is-2-widescreen-only{--columnGap:0.5rem}}@media screen and (min-width:1408px){.columns.is-variable.is-2-fullhd{--columnGap:0.5rem}}.columns.is-variable.is-3{--columnGap:0.75rem}@media screen and (max-width:768px){.columns.is-variable.is-3-mobile{--columnGap:0.75rem}}@media screen and (min-width:769px),print{.columns.is-variable.is-3-tablet{--columnGap:0.75rem}}@media screen and (min-width:769px) and (max-width:1023px){.columns.is-variable.is-3-tablet-only{--columnGap:0.75rem}}@media screen and (max-width:1023px){.columns.is-variable.is-3-touch{--columnGap:0.75rem}}@media screen and (min-width:1024px){.columns.is-variable.is-3-desktop{--columnGap:0.75rem}}@media screen and (min-width:1024px) and (max-width:1215px){.columns.is-variable.is-3-desktop-only{--columnGap:0.75rem}}@media screen and (min-width:1216px){.columns.is-variable.is-3-widescreen{--columnGap:0.75rem}}@media screen and (min-width:1216px) and (max-width:1407px){.columns.is-variable.is-3-widescreen-only{--columnGap:0.75rem}}@media screen and (min-width:1408px){.columns.is-variable.is-3-fullhd{--columnGap:0.75rem}}.columns.is-variable.is-4{--columnGap:1rem}@media screen and (max-width:768px){.columns.is-variable.is-4-mobile{--columnGap:1rem}}@media screen and (min-width:769px),print{.columns.is-variable.is-4-tablet{--columnGap:1rem}}@media screen and (min-width:769px) and (max-width:1023px){.columns.is-variable.is-4-tablet-only{--columnGap:1rem}}@media screen and (max-width:1023px){.columns.is-variable.is-4-touch{--columnGap:1rem}}@media screen and (min-width:1024px){.columns.is-variable.is-4-desktop{--columnGap:1rem}}@media screen and (min-width:1024px) and (max-width:1215px){.columns.is-variable.is-4-desktop-only{--columnGap:1rem}}@media screen and (min-width:1216px){.columns.is-variable.is-4-widescreen{--columnGap:1rem}}@media screen and (min-width:1216px) and (max-width:1407px){.columns.is-variable.is-4-widescreen-only{--columnGap:1rem}}@media screen and (min-width:1408px){.columns.is-variable.is-4-fullhd{--columnGap:1rem}}.columns.is-variable.is-5{--columnGap:1.25rem}@media screen and (max-width:768px){.columns.is-variable.is-5-mobile{--columnGap:1.25rem}}@media screen and (min-width:769px),print{.columns.is-variable.is-5-tablet{--columnGap:1.25rem}}@media screen and (min-width:769px) and (max-width:1023px){.columns.is-variable.is-5-tablet-only{--columnGap:1.25rem}}@media screen and (max-width:1023px){.columns.is-variable.is-5-touch{--columnGap:1.25rem}}@media screen and (min-width:1024px){.columns.is-variable.is-5-desktop{--columnGap:1.25rem}}@media screen and (min-width:1024px) and (max-width:1215px){.columns.is-variable.is-5-desktop-only{--columnGap:1.25rem}}@media screen and (min-width:1216px){.columns.is-variable.is-5-widescreen{--columnGap:1.25rem}}@media screen and (min-width:1216px) and (max-width:1407px){.columns.is-variable.is-5-widescreen-only{--columnGap:1.25rem}}@media screen and (min-width:1408px){.columns.is-variable.is-5-fullhd{--columnGap:1.25rem}}.columns.is-variable.is-6{--columnGap:1.5rem}@media screen and (max-width:768px){.columns.is-variable.is-6-mobile{--columnGap:1.5rem}}@media screen and (min-width:769px),print{.columns.is-variable.is-6-tablet{--columnGap:1.5rem}}@media screen and (min-width:769px) and (max-width:1023px){.columns.is-variable.is-6-tablet-only{--columnGap:1.5rem}}@media screen and (max-width:1023px){.columns.is-variable.is-6-touch{--columnGap:1.5rem}}@media screen and (min-width:1024px){.columns.is-variable.is-6-desktop{--columnGap:1.5rem}}@media screen and (min-width:1024px) and (max-width:1215px){.columns.is-variable.is-6-desktop-only{--columnGap:1.5rem}}@media screen and (min-width:1216px){.columns.is-variable.is-6-widescreen{--columnGap:1.5rem}}@media screen and (min-width:1216px) and (max-width:1407px){.columns.is-variable.is-6-widescreen-only{--columnGap:1.5rem}}@media screen and (min-width:1408px){.columns.is-variable.is-6-fullhd{--columnGap:1.5rem}}.columns.is-variable.is-7{--columnGap:1.75rem}@media screen and (max-width:768px){.columns.is-variable.is-7-mobile{--columnGap:1.75rem}}@media screen and (min-width:769px),print{.columns.is-variable.is-7-tablet{--columnGap:1.75rem}}@media screen and (min-width:769px) and (max-width:1023px){.columns.is-variable.is-7-tablet-only{--columnGap:1.75rem}}@media screen and (max-width:1023px){.columns.is-variable.is-7-touch{--columnGap:1.75rem}}@media screen and (min-width:1024px){.columns.is-variable.is-7-desktop{--columnGap:1.75rem}}@media screen and (min-width:1024px) and (max-width:1215px){.columns.is-variable.is-7-desktop-only{--columnGap:1.75rem}}@media screen and (min-width:1216px){.columns.is-variable.is-7-widescreen{--columnGap:1.75rem}}@media screen and (min-width:1216px) and (max-width:1407px){.columns.is-variable.is-7-widescreen-only{--columnGap:1.75rem}}@media screen and (min-width:1408px){.columns.is-variable.is-7-fullhd{--columnGap:1.75rem}}.columns.is-variable.is-8{--columnGap:2rem}@media screen and (max-width:768px){.columns.is-variable.is-8-mobile{--columnGap:2rem}}@media screen and (min-width:769px),print{.columns.is-variable.is-8-tablet{--columnGap:2rem}}@media screen and (min-width:769px) and (max-width:1023px){.columns.is-variable.is-8-tablet-only{--columnGap:2rem}}@media screen and (max-width:1023px){.columns.is-variable.is-8-touch{--columnGap:2rem}}@media screen and (min-width:1024px){.columns.is-variable.is-8-desktop{--columnGap:2rem}}@media screen and (min-width:1024px) and (max-width:1215px){.columns.is-variable.is-8-desktop-only{--columnGap:2rem}}@media screen and (min-width:1216px){.columns.is-variable.is-8-widescreen{--columnGap:2rem}}@media screen and (min-width:1216px) and (max-width:1407px){.columns.is-variable.is-8-widescreen-only{--columnGap:2rem}}@media screen and (min-width:1408px){.columns.is-variable.is-8-fullhd{--columnGap:2rem}}.tile{align-items:stretch;display:block;flex-basis:0;flex-grow:1;flex-shrink:1;min-height:-webkit-min-content;min-height:-moz-min-content;min-height:min-content}.tile.is-ancestor{margin-left:-.75rem;margin-right:-.75rem;margin-top:-.75rem}.tile.is-ancestor:last-child{margin-bottom:-.75rem}.tile.is-ancestor:not(:last-child){margin-bottom:.75rem}.tile.is-child{margin:0!important}.tile.is-parent{padding:.75rem}.tile.is-vertical{flex-direction:column}.tile.is-vertical>.tile.is-child:not(:last-child){margin-bottom:1.5rem!important}@media screen and (min-width:769px),print{.tile:not(.is-child){display:flex}.tile.is-1{flex:none;width:8.33333%}.tile.is-2{flex:none;width:16.66667%}.tile.is-3{flex:none;width:25%}.tile.is-4{flex:none;width:33.33333%}.tile.is-5{flex:none;width:41.66667%}.tile.is-6{flex:none;width:50%}.tile.is-7{flex:none;width:58.33333%}.tile.is-8{flex:none;width:66.66667%}.tile.is-9{flex:none;width:75%}.tile.is-10{flex:none;width:83.33333%}.tile.is-11{flex:none;width:91.66667%}.tile.is-12{flex:none;width:100%}}.has-text-white{color:#fff!important}a.has-text-white:focus,a.has-text-white:hover{color:#e6e6e6!important}.has-background-white{background-color:#fff!important}.has-text-black{color:#0a0a0a!important}a.has-text-black:focus,a.has-text-black:hover{color:#000!important}.has-background-black{background-color:#0a0a0a!important}.has-text-light{color:#f5f5f5!important}a.has-text-light:focus,a.has-text-light:hover{color:#dbdbdb!important}.has-background-light{background-color:#f5f5f5!important}.has-text-dark{color:#363636!important}a.has-text-dark:focus,a.has-text-dark:hover{color:#1c1c1c!important}.has-background-dark{background-color:#363636!important}.has-text-primary{color:#00d1b2!important}a.has-text-primary:focus,a.has-text-primary:hover{color:#009e86!important}.has-background-primary{background-color:#00d1b2!important}.has-text-primary-light{color:#ebfffc!important}a.has-text-primary-light:focus,a.has-text-primary-light:hover{color:#b8fff4!important}.has-background-primary-light{background-color:#ebfffc!important}.has-text-primary-dark{color:#00947e!important}a.has-text-primary-dark:focus,a.has-text-primary-dark:hover{color:#00c7a9!important}.has-background-primary-dark{background-color:#00947e!important}.has-text-link{color:#3273dc!important}a.has-text-link:focus,a.has-text-link:hover{color:#205bbc!important}.has-background-link{background-color:#3273dc!important}.has-text-link-light{color:#eef3fc!important}a.has-text-link-light:focus,a.has-text-link-light:hover{color:#c2d5f5!important}.has-background-link-light{background-color:#eef3fc!important}.has-text-link-dark{color:#2160c4!important}a.has-text-link-dark:focus,a.has-text-link-dark:hover{color:#3b79de!important}.has-background-link-dark{background-color:#2160c4!important}.has-text-info{color:#3298dc!important}a.has-text-info:focus,a.has-text-info:hover{color:#207dbc!important}.has-background-info{background-color:#3298dc!important}.has-text-info-light{color:#eef6fc!important}a.has-text-info-light:focus,a.has-text-info-light:hover{color:#c2e0f5!important}.has-background-info-light{background-color:#eef6fc!important}.has-text-info-dark{color:#1d72aa!important}a.has-text-info-dark:focus,a.has-text-info-dark:hover{color:#248fd6!important}.has-background-info-dark{background-color:#1d72aa!important}.has-text-success{color:#48c774!important}a.has-text-success:focus,a.has-text-success:hover{color:#34a85c!important}.has-background-success{background-color:#48c774!important}.has-text-success-light{color:#effaf3!important}a.has-text-success-light:focus,a.has-text-success-light:hover{color:#c8eed6!important}.has-background-success-light{background-color:#effaf3!important}.has-text-success-dark{color:#257942!important}a.has-text-success-dark:focus,a.has-text-success-dark:hover{color:#31a058!important}.has-background-success-dark{background-color:#257942!important}.has-text-warning{color:#ffdd57!important}a.has-text-warning:focus,a.has-text-warning:hover{color:#ffd324!important}.has-background-warning{background-color:#ffdd57!important}.has-text-warning-light{color:#fffbeb!important}a.has-text-warning-light:focus,a.has-text-warning-light:hover{color:#fff1b8!important}.has-background-warning-light{background-color:#fffbeb!important}.has-text-warning-dark{color:#947600!important}a.has-text-warning-dark:focus,a.has-text-warning-dark:hover{color:#c79f00!important}.has-background-warning-dark{background-color:#947600!important}.has-text-danger{color:#f14668!important}a.has-text-danger:focus,a.has-text-danger:hover{color:#ee1742!important}.has-background-danger{background-color:#f14668!important}.has-text-danger-light{color:#feecf0!important}a.has-text-danger-light:focus,a.has-text-danger-light:hover{color:#fabdc9!important}.has-background-danger-light{background-color:#feecf0!important}.has-text-danger-dark{color:#cc0f35!important}a.has-text-danger-dark:focus,a.has-text-danger-dark:hover{color:#ee2049!important}.has-background-danger-dark{background-color:#cc0f35!important}.has-text-black-bis{color:#121212!important}.has-background-black-bis{background-color:#121212!important}.has-text-black-ter{color:#242424!important}.has-background-black-ter{background-color:#242424!important}.has-text-grey-darker{color:#363636!important}.has-background-grey-darker{background-color:#363636!important}.has-text-grey-dark{color:#4a4a4a!important}.has-background-grey-dark{background-color:#4a4a4a!important}.has-text-grey{color:#7a7a7a!important}.has-background-grey{background-color:#7a7a7a!important}.has-text-grey-light{color:#b5b5b5!important}.has-background-grey-light{background-color:#b5b5b5!important}.has-text-grey-lighter{color:#dbdbdb!important}.has-background-grey-lighter{background-color:#dbdbdb!important}.has-text-white-ter{color:#f5f5f5!important}.has-background-white-ter{background-color:#f5f5f5!important}.has-text-white-bis{color:#fafafa!important}.has-background-white-bis{background-color:#fafafa!important}.is-flex-direction-row{flex-direction:row!important}.is-flex-direction-row-reverse{flex-direction:row-reverse!important}.is-flex-direction-column{flex-direction:column!important}.is-flex-direction-column-reverse{flex-direction:column-reverse!important}.is-flex-wrap-nowrap{flex-wrap:nowrap!important}.is-flex-wrap-wrap{flex-wrap:wrap!important}.is-flex-wrap-wrap-reverse{flex-wrap:wrap-reverse!important}.is-justify-content-flex-start{justify-content:flex-start!important}.is-justify-content-flex-end{justify-content:flex-end!important}.is-justify-content-center{justify-content:center!important}.is-justify-content-space-between{justify-content:space-between!important}.is-justify-content-space-around{justify-content:space-around!important}.is-justify-content-space-evenly{justify-content:space-evenly!important}.is-justify-content-start{justify-content:start!important}.is-justify-content-end{justify-content:end!important}.is-justify-content-left{justify-content:left!important}.is-justify-content-right{justify-content:right!important}.is-align-content-flex-start{align-content:flex-start!important}.is-align-content-flex-end{align-content:flex-end!important}.is-align-content-center{align-content:center!important}.is-align-content-space-between{align-content:space-between!important}.is-align-content-space-around{align-content:space-around!important}.is-align-content-space-evenly{align-content:space-evenly!important}.is-align-content-stretch{align-content:stretch!important}.is-align-content-start{align-content:start!important}.is-align-content-end{align-content:end!important}.is-align-content-baseline{align-content:baseline!important}.is-align-items-stretch{align-items:stretch!important}.is-align-items-flex-start{align-items:flex-start!important}.is-align-items-flex-end{align-items:flex-end!important}.is-align-items-center{align-items:center!important}.is-align-items-baseline{align-items:baseline!important}.is-align-items-start{align-items:start!important}.is-align-items-end{align-items:end!important}.is-align-items-self-start{align-items:self-start!important}.is-align-items-self-end{align-items:self-end!important}.is-align-self-auto{align-self:auto!important}.is-align-self-flex-start{align-self:flex-start!important}.is-align-self-flex-end{align-self:flex-end!important}.is-align-self-center{align-self:center!important}.is-align-self-baseline{align-self:baseline!important}.is-align-self-stretch{align-self:stretch!important}.is-flex-grow-0{flex-grow:0!important}.is-flex-grow-1{flex-grow:1!important}.is-flex-grow-2{flex-grow:2!important}.is-flex-grow-3{flex-grow:3!important}.is-flex-grow-4{flex-grow:4!important}.is-flex-grow-5{flex-grow:5!important}.is-flex-shrink-0{flex-shrink:0!important}.is-flex-shrink-1{flex-shrink:1!important}.is-flex-shrink-2{flex-shrink:2!important}.is-flex-shrink-3{flex-shrink:3!important}.is-flex-shrink-4{flex-shrink:4!important}.is-flex-shrink-5{flex-shrink:5!important}.is-clearfix::after{clear:both;content:" ";display:table}.is-pulled-left{float:left!important}.is-pulled-right{float:right!important}.is-radiusless{border-radius:0!important}.is-shadowless{box-shadow:none!important}.is-clickable{cursor:pointer!important}.is-clipped{overflow:hidden!important}.is-relative{position:relative!important}.is-marginless{margin:0!important}.is-paddingless{padding:0!important}.m-0{margin:0!important}.mt-0{margin-top:0!important}.mr-0{margin-right:0!important}.mb-0{margin-bottom:0!important}.ml-0{margin-left:0!important}.mx-0{margin-left:0!important;margin-right:0!important}.my-0{margin-top:0!important;margin-bottom:0!important}.m-1{margin:.25rem!important}.mt-1{margin-top:.25rem!important}.mr-1{margin-right:.25rem!important}.mb-1{margin-bottom:.25rem!important}.ml-1{margin-left:.25rem!important}.mx-1{margin-left:.25rem!important;margin-right:.25rem!important}.my-1{margin-top:.25rem!important;margin-bottom:.25rem!important}.m-2{margin:.5rem!important}.mt-2{margin-top:.5rem!important}.mr-2{margin-right:.5rem!important}.mb-2{margin-bottom:.5rem!important}.ml-2{margin-left:.5rem!important}.mx-2{margin-left:.5rem!important;margin-right:.5rem!important}.my-2{margin-top:.5rem!important;margin-bottom:.5rem!important}.m-3{margin:.75rem!important}.mt-3{margin-top:.75rem!important}.mr-3{margin-right:.75rem!important}.mb-3{margin-bottom:.75rem!important}.ml-3{margin-left:.75rem!important}.mx-3{margin-left:.75rem!important;margin-right:.75rem!important}.my-3{margin-top:.75rem!important;margin-bottom:.75rem!important}.m-4{margin:1rem!important}.mt-4{margin-top:1rem!important}.mr-4{margin-right:1rem!important}.mb-4{margin-bottom:1rem!important}.ml-4{margin-left:1rem!important}.mx-4{margin-left:1rem!important;margin-right:1rem!important}.my-4{margin-top:1rem!important;margin-bottom:1rem!important}.m-5{margin:1.5rem!important}.mt-5{margin-top:1.5rem!important}.mr-5{margin-right:1.5rem!important}.mb-5{margin-bottom:1.5rem!important}.ml-5{margin-left:1.5rem!important}.mx-5{margin-left:1.5rem!important;margin-right:1.5rem!important}.my-5{margin-top:1.5rem!important;margin-bottom:1.5rem!important}.m-6{margin:3rem!important}.mt-6{margin-top:3rem!important}.mr-6{margin-right:3rem!important}.mb-6{margin-bottom:3rem!important}.ml-6{margin-left:3rem!important}.mx-6{margin-left:3rem!important;margin-right:3rem!important}.my-6{margin-top:3rem!important;margin-bottom:3rem!important}.p-0{padding:0!important}.pt-0{padding-top:0!important}.pr-0{padding-right:0!important}.pb-0{padding-bottom:0!important}.pl-0{padding-left:0!important}.px-0{padding-left:0!important;padding-right:0!important}.py-0{padding-top:0!important;padding-bottom:0!important}.p-1{padding:.25rem!important}.pt-1{padding-top:.25rem!important}.pr-1{padding-right:.25rem!important}.pb-1{padding-bottom:.25rem!important}.pl-1{padding-left:.25rem!important}.px-1{padding-left:.25rem!important;padding-right:.25rem!important}.py-1{padding-top:.25rem!important;padding-bottom:.25rem!important}.p-2{padding:.5rem!important}.pt-2{padding-top:.5rem!important}.pr-2{padding-right:.5rem!important}.pb-2{padding-bottom:.5rem!important}.pl-2{padding-left:.5rem!important}.px-2{padding-left:.5rem!important;padding-right:.5rem!important}.py-2{padding-top:.5rem!important;padding-bottom:.5rem!important}.p-3{padding:.75rem!important}.pt-3{padding-top:.75rem!important}.pr-3{padding-right:.75rem!important}.pb-3{padding-bottom:.75rem!important}.pl-3{padding-left:.75rem!important}.px-3{padding-left:.75rem!important;padding-right:.75rem!important}.py-3{padding-top:.75rem!important;padding-bottom:.75rem!important}.p-4{padding:1rem!important}.pt-4{padding-top:1rem!important}.pr-4{padding-right:1rem!important}.pb-4{padding-bottom:1rem!important}.pl-4{padding-left:1rem!important}.px-4{padding-left:1rem!important;padding-right:1rem!important}.py-4{padding-top:1rem!important;padding-bottom:1rem!important}.p-5{padding:1.5rem!important}.pt-5{padding-top:1.5rem!important}.pr-5{padding-right:1.5rem!important}.pb-5{padding-bottom:1.5rem!important}.pl-5{padding-left:1.5rem!important}.px-5{padding-left:1.5rem!important;padding-right:1.5rem!important}.py-5{padding-top:1.5rem!important;padding-bottom:1.5rem!important}.p-6{padding:3rem!important}.pt-6{padding-top:3rem!important}.pr-6{padding-right:3rem!important}.pb-6{padding-bottom:3rem!important}.pl-6{padding-left:3rem!important}.px-6{padding-left:3rem!important;padding-right:3rem!important}.py-6{padding-top:3rem!important;padding-bottom:3rem!important}.is-size-1{font-size:3rem!important}.is-size-2{font-size:2.5rem!important}.is-size-3{font-size:2rem!important}.is-size-4{font-size:1.5rem!important}.is-size-5{font-size:1.25rem!important}.is-size-6{font-size:1rem!important}.is-size-7{font-size:.75rem!important}@media screen and (max-width:768px){.is-size-1-mobile{font-size:3rem!important}.is-size-2-mobile{font-size:2.5rem!important}.is-size-3-mobile{font-size:2rem!important}.is-size-4-mobile{font-size:1.5rem!important}.is-size-5-mobile{font-size:1.25rem!important}.is-size-6-mobile{font-size:1rem!important}.is-size-7-mobile{font-size:.75rem!important}}@media screen and (min-width:769px),print{.is-size-1-tablet{font-size:3rem!important}.is-size-2-tablet{font-size:2.5rem!important}.is-size-3-tablet{font-size:2rem!important}.is-size-4-tablet{font-size:1.5rem!important}.is-size-5-tablet{font-size:1.25rem!important}.is-size-6-tablet{font-size:1rem!important}.is-size-7-tablet{font-size:.75rem!important}}@media screen and (max-width:1023px){.is-size-1-touch{font-size:3rem!important}.is-size-2-touch{font-size:2.5rem!important}.is-size-3-touch{font-size:2rem!important}.is-size-4-touch{font-size:1.5rem!important}.is-size-5-touch{font-size:1.25rem!important}.is-size-6-touch{font-size:1rem!important}.is-size-7-touch{font-size:.75rem!important}}@media screen and (min-width:1024px){.is-size-1-desktop{font-size:3rem!important}.is-size-2-desktop{font-size:2.5rem!important}.is-size-3-desktop{font-size:2rem!important}.is-size-4-desktop{font-size:1.5rem!important}.is-size-5-desktop{font-size:1.25rem!important}.is-size-6-desktop{font-size:1rem!important}.is-size-7-desktop{font-size:.75rem!important}}@media screen and (min-width:1216px){.is-size-1-widescreen{font-size:3rem!important}.is-size-2-widescreen{font-size:2.5rem!important}.is-size-3-widescreen{font-size:2rem!important}.is-size-4-widescreen{font-size:1.5rem!important}.is-size-5-widescreen{font-size:1.25rem!important}.is-size-6-widescreen{font-size:1rem!important}.is-size-7-widescreen{font-size:.75rem!important}}@media screen and (min-width:1408px){.is-size-1-fullhd{font-size:3rem!important}.is-size-2-fullhd{font-size:2.5rem!important}.is-size-3-fullhd{font-size:2rem!important}.is-size-4-fullhd{font-size:1.5rem!important}.is-size-5-fullhd{font-size:1.25rem!important}.is-size-6-fullhd{font-size:1rem!important}.is-size-7-fullhd{font-size:.75rem!important}}.has-text-centered{text-align:center!important}.has-text-justified{text-align:justify!important}.has-text-left{text-align:left!important}.has-text-right{text-align:right!important}@media screen and (max-width:768px){.has-text-centered-mobile{text-align:center!important}}@media screen and (min-width:769px),print{.has-text-centered-tablet{text-align:center!important}}@media screen and (min-width:769px) and (max-width:1023px){.has-text-centered-tablet-only{text-align:center!important}}@media screen and (max-width:1023px){.has-text-centered-touch{text-align:center!important}}@media screen and (min-width:1024px){.has-text-centered-desktop{text-align:center!important}}@media screen and (min-width:1024px) and (max-width:1215px){.has-text-centered-desktop-only{text-align:center!important}}@media screen and (min-width:1216px){.has-text-centered-widescreen{text-align:center!important}}@media screen and (min-width:1216px) and (max-width:1407px){.has-text-centered-widescreen-only{text-align:center!important}}@media screen and (min-width:1408px){.has-text-centered-fullhd{text-align:center!important}}@media screen and (max-width:768px){.has-text-justified-mobile{text-align:justify!important}}@media screen and (min-width:769px),print{.has-text-justified-tablet{text-align:justify!important}}@media screen and (min-width:769px) and (max-width:1023px){.has-text-justified-tablet-only{text-align:justify!important}}@media screen and (max-width:1023px){.has-text-justified-touch{text-align:justify!important}}@media screen and (min-width:1024px){.has-text-justified-desktop{text-align:justify!important}}@media screen and (min-width:1024px) and (max-width:1215px){.has-text-justified-desktop-only{text-align:justify!important}}@media screen and (min-width:1216px){.has-text-justified-widescreen{text-align:justify!important}}@media screen and (min-width:1216px) and (max-width:1407px){.has-text-justified-widescreen-only{text-align:justify!important}}@media screen and (min-width:1408px){.has-text-justified-fullhd{text-align:justify!important}}@media screen and (max-width:768px){.has-text-left-mobile{text-align:left!important}}@media screen and (min-width:769px),print{.has-text-left-tablet{text-align:left!important}}@media screen and (min-width:769px) and (max-width:1023px){.has-text-left-tablet-only{text-align:left!important}}@media screen and (max-width:1023px){.has-text-left-touch{text-align:left!important}}@media screen and (min-width:1024px){.has-text-left-desktop{text-align:left!important}}@media screen and (min-width:1024px) and (max-width:1215px){.has-text-left-desktop-only{text-align:left!important}}@media screen and (min-width:1216px){.has-text-left-widescreen{text-align:left!important}}@media screen and (min-width:1216px) and (max-width:1407px){.has-text-left-widescreen-only{text-align:left!important}}@media screen and (min-width:1408px){.has-text-left-fullhd{text-align:left!important}}@media screen and (max-width:768px){.has-text-right-mobile{text-align:right!important}}@media screen and (min-width:769px),print{.has-text-right-tablet{text-align:right!important}}@media screen and (min-width:769px) and (max-width:1023px){.has-text-right-tablet-only{text-align:right!important}}@media screen and (max-width:1023px){.has-text-right-touch{text-align:right!important}}@media screen and (min-width:1024px){.has-text-right-desktop{text-align:right!important}}@media screen and (min-width:1024px) and (max-width:1215px){.has-text-right-desktop-only{text-align:right!important}}@media screen and (min-width:1216px){.has-text-right-widescreen{text-align:right!important}}@media screen and (min-width:1216px) and (max-width:1407px){.has-text-right-widescreen-only{text-align:right!important}}@media screen and (min-width:1408px){.has-text-right-fullhd{text-align:right!important}}.is-capitalized{text-transform:capitalize!important}.is-lowercase{text-transform:lowercase!important}.is-uppercase{text-transform:uppercase!important}.is-italic{font-style:italic!important}.has-text-weight-light{font-weight:300!important}.has-text-weight-normal{font-weight:400!important}.has-text-weight-medium{font-weight:500!important}.has-text-weight-semibold{font-weight:600!important}.has-text-weight-bold{font-weight:700!important}.is-family-primary{font-family:BlinkMacSystemFont,-apple-system,"Segoe UI",Roboto,Oxygen,Ubuntu,Cantarell,"Fira Sans","Droid Sans","Helvetica Neue",Helvetica,Arial,sans-serif!important}.is-family-secondary{font-family:BlinkMacSystemFont,-apple-system,"Segoe UI",Roboto,Oxygen,Ubuntu,Cantarell,"Fira Sans","Droid Sans","Helvetica Neue",Helvetica,Arial,sans-serif!important}.is-family-sans-serif{font-family:BlinkMacSystemFont,-apple-system,"Segoe UI",Roboto,Oxygen,Ubuntu,Cantarell,"Fira Sans","Droid Sans","Helvetica Neue",Helvetica,Arial,sans-serif!important}.is-family-monospace{font-family:monospace!important}.is-family-code{font-family:monospace!important}.is-block{display:block!important}@media screen and (max-width:768px){.is-block-mobile{display:block!important}}@media screen and (min-width:769px),print{.is-block-tablet{display:block!important}}@media screen and (min-width:769px) and (max-width:1023px){.is-block-tablet-only{display:block!important}}@media screen and (max-width:1023px){.is-block-touch{display:block!important}}@media screen and (min-width:1024px){.is-block-desktop{display:block!important}}@media screen and (min-width:1024px) and (max-width:1215px){.is-block-desktop-only{display:block!important}}@media screen and (min-width:1216px){.is-block-widescreen{display:block!important}}@media screen and (min-width:1216px) and (max-width:1407px){.is-block-widescreen-only{display:block!important}}@media screen and (min-width:1408px){.is-block-fullhd{display:block!important}}.is-flex{display:flex!important}@media screen and (max-width:768px){.is-flex-mobile{display:flex!important}}@media screen and (min-width:769px),print{.is-flex-tablet{display:flex!important}}@media screen and (min-width:769px) and (max-width:1023px){.is-flex-tablet-only{display:flex!important}}@media screen and (max-width:1023px){.is-flex-touch{display:flex!important}}@media screen and (min-width:1024px){.is-flex-desktop{display:flex!important}}@media screen and (min-width:1024px) and (max-width:1215px){.is-flex-desktop-only{display:flex!important}}@media screen and (min-width:1216px){.is-flex-widescreen{display:flex!important}}@media screen and (min-width:1216px) and (max-width:1407px){.is-flex-widescreen-only{display:flex!important}}@media screen and (min-width:1408px){.is-flex-fullhd{display:flex!important}}.is-inline{display:inline!important}@media screen and (max-width:768px){.is-inline-mobile{display:inline!important}}@media screen and (min-width:769px),print{.is-inline-tablet{display:inline!important}}@media screen and (min-width:769px) and (max-width:1023px){.is-inline-tablet-only{display:inline!important}}@media screen and (max-width:1023px){.is-inline-touch{display:inline!important}}@media screen and (min-width:1024px){.is-inline-desktop{display:inline!important}}@media screen and (min-width:1024px) and (max-width:1215px){.is-inline-desktop-only{display:inline!important}}@media screen and (min-width:1216px){.is-inline-widescreen{display:inline!important}}@media screen and (min-width:1216px) and (max-width:1407px){.is-inline-widescreen-only{display:inline!important}}@media screen and (min-width:1408px){.is-inline-fullhd{display:inline!important}}.is-inline-block{display:inline-block!important}@media screen and (max-width:768px){.is-inline-block-mobile{display:inline-block!important}}@media screen and (min-width:769px),print{.is-inline-block-tablet{display:inline-block!important}}@media screen and (min-width:769px) and (max-width:1023px){.is-inline-block-tablet-only{display:inline-block!important}}@media screen and (max-width:1023px){.is-inline-block-touch{display:inline-block!important}}@media screen and (min-width:1024px){.is-inline-block-desktop{display:inline-block!important}}@media screen and (min-width:1024px) and (max-width:1215px){.is-inline-block-desktop-only{display:inline-block!important}}@media screen and (min-width:1216px){.is-inline-block-widescreen{display:inline-block!important}}@media screen and (min-width:1216px) and (max-width:1407px){.is-inline-block-widescreen-only{display:inline-block!important}}@media screen and (min-width:1408px){.is-inline-block-fullhd{display:inline-block!important}}.is-inline-flex{display:inline-flex!important}@media screen and (max-width:768px){.is-inline-flex-mobile{display:inline-flex!important}}@media screen and (min-width:769px),print{.is-inline-flex-tablet{display:inline-flex!important}}@media screen and (min-width:769px) and (max-width:1023px){.is-inline-flex-tablet-only{display:inline-flex!important}}@media screen and (max-width:1023px){.is-inline-flex-touch{display:inline-flex!important}}@media screen and (min-width:1024px){.is-inline-flex-desktop{display:inline-flex!important}}@media screen and (min-width:1024px) and (max-width:1215px){.is-inline-flex-desktop-only{display:inline-flex!important}}@media screen and (min-width:1216px){.is-inline-flex-widescreen{display:inline-flex!important}}@media screen and (min-width:1216px) and (max-width:1407px){.is-inline-flex-widescreen-only{display:inline-flex!important}}@media screen and (min-width:1408px){.is-inline-flex-fullhd{display:inline-flex!important}}.is-hidden{display:none!important}.is-sr-only{border:none!important;clip:rect(0,0,0,0)!important;height:.01em!important;overflow:hidden!important;padding:0!important;position:absolute!important;white-space:nowrap!important;width:.01em!important}@media screen and (max-width:768px){.is-hidden-mobile{display:none!important}}@media screen and (min-width:769px),print{.is-hidden-tablet{display:none!important}}@media screen and (min-width:769px) and (max-width:1023px){.is-hidden-tablet-only{display:none!important}}@media screen and (max-width:1023px){.is-hidden-touch{display:none!important}}@media screen and (min-width:1024px){.is-hidden-desktop{display:none!important}}@media screen and (min-width:1024px) and (max-width:1215px){.is-hidden-desktop-only{display:none!important}}@media screen and (min-width:1216px){.is-hidden-widescreen{display:none!important}}@media screen and (min-width:1216px) and (max-width:1407px){.is-hidden-widescreen-only{display:none!important}}@media screen and (min-width:1408px){.is-hidden-fullhd{display:none!important}}.is-invisible{visibility:hidden!important}@media screen and (max-width:768px){.is-invisible-mobile{visibility:hidden!important}}@media screen and (min-width:769px),print{.is-invisible-tablet{visibility:hidden!important}}@media screen and (min-width:769px) and (max-width:1023px){.is-invisible-tablet-only{visibility:hidden!important}}@media screen and (max-width:1023px){.is-invisible-touch{visibility:hidden!important}}@media screen and (min-width:1024px){.is-invisible-desktop{visibility:hidden!important}}@media screen and (min-width:1024px) and (max-width:1215px){.is-invisible-desktop-only{visibility:hidden!important}}@media screen and (min-width:1216px){.is-invisible-widescreen{visibility:hidden!important}}@media screen and (min-width:1216px) and (max-width:1407px){.is-invisible-widescreen-only{visibility:hidden!important}}@media screen and (min-width:1408px){.is-invisible-fullhd{visibility:hidden!important}}.hero{align-items:stretch;display:flex;flex-direction:column;justify-content:space-between}.hero .navbar{background:0 0}.hero .tabs ul{border-bottom:none}.hero.is-white{background-color:#fff;color:#0a0a0a}.hero.is-white a:not(.button):not(.dropdown-item):not(.tag):not(.pagination-link.is-current),.hero.is-white strong{color:inherit}.hero.is-white .title{color:#0a0a0a}.hero.is-white .subtitle{color:rgba(10,10,10,.9)}.hero.is-white .subtitle a:not(.button),.hero.is-white .subtitle strong{color:#0a0a0a}@media screen and (max-width:1023px){.hero.is-white .navbar-menu{background-color:#fff}}.hero.is-white .navbar-item,.hero.is-white .navbar-link{color:rgba(10,10,10,.7)}.hero.is-white .navbar-link.is-active,.hero.is-white .navbar-link:hover,.hero.is-white a.navbar-item.is-active,.hero.is-white a.navbar-item:hover{background-color:#f2f2f2;color:#0a0a0a}.hero.is-white .tabs a{color:#0a0a0a;opacity:.9}.hero.is-white .tabs a:hover{opacity:1}.hero.is-white .tabs li.is-active a{opacity:1}.hero.is-white .tabs.is-boxed a,.hero.is-white .tabs.is-toggle a{color:#0a0a0a}.hero.is-white .tabs.is-boxed a:hover,.hero.is-white .tabs.is-toggle a:hover{background-color:rgba(10,10,10,.1)}.hero.is-white .tabs.is-boxed li.is-active a,.hero.is-white .tabs.is-boxed li.is-active a:hover,.hero.is-white .tabs.is-toggle li.is-active a,.hero.is-white .tabs.is-toggle li.is-active a:hover{background-color:#0a0a0a;border-color:#0a0a0a;color:#fff}.hero.is-white.is-bold{background-image:linear-gradient(141deg,#e6e6e6 0,#fff 71%,#fff 100%)}@media screen and (max-width:768px){.hero.is-white.is-bold .navbar-menu{background-image:linear-gradient(141deg,#e6e6e6 0,#fff 71%,#fff 100%)}}.hero.is-black{background-color:#0a0a0a;color:#fff}.hero.is-black a:not(.button):not(.dropdown-item):not(.tag):not(.pagination-link.is-current),.hero.is-black strong{color:inherit}.hero.is-black .title{color:#fff}.hero.is-black .subtitle{color:rgba(255,255,255,.9)}.hero.is-black .subtitle a:not(.button),.hero.is-black .subtitle strong{color:#fff}@media screen and (max-width:1023px){.hero.is-black .navbar-menu{background-color:#0a0a0a}}.hero.is-black .navbar-item,.hero.is-black .navbar-link{color:rgba(255,255,255,.7)}.hero.is-black .navbar-link.is-active,.hero.is-black .navbar-link:hover,.hero.is-black a.navbar-item.is-active,.hero.is-black a.navbar-item:hover{background-color:#000;color:#fff}.hero.is-black .tabs a{color:#fff;opacity:.9}.hero.is-black .tabs a:hover{opacity:1}.hero.is-black .tabs li.is-active a{opacity:1}.hero.is-black .tabs.is-boxed a,.hero.is-black .tabs.is-toggle a{color:#fff}.hero.is-black .tabs.is-boxed a:hover,.hero.is-black .tabs.is-toggle a:hover{background-color:rgba(10,10,10,.1)}.hero.is-black .tabs.is-boxed li.is-active a,.hero.is-black .tabs.is-boxed li.is-active a:hover,.hero.is-black .tabs.is-toggle li.is-active a,.hero.is-black .tabs.is-toggle li.is-active a:hover{background-color:#fff;border-color:#fff;color:#0a0a0a}.hero.is-black.is-bold{background-image:linear-gradient(141deg,#000 0,#0a0a0a 71%,#181616 100%)}@media screen and (max-width:768px){.hero.is-black.is-bold .navbar-menu{background-image:linear-gradient(141deg,#000 0,#0a0a0a 71%,#181616 100%)}}.hero.is-light{background-color:#f5f5f5;color:rgba(0,0,0,.7)}.hero.is-light a:not(.button):not(.dropdown-item):not(.tag):not(.pagination-link.is-current),.hero.is-light strong{color:inherit}.hero.is-light .title{color:rgba(0,0,0,.7)}.hero.is-light .subtitle{color:rgba(0,0,0,.9)}.hero.is-light .subtitle a:not(.button),.hero.is-light .subtitle strong{color:rgba(0,0,0,.7)}@media screen and (max-width:1023px){.hero.is-light .navbar-menu{background-color:#f5f5f5}}.hero.is-light .navbar-item,.hero.is-light .navbar-link{color:rgba(0,0,0,.7)}.hero.is-light .navbar-link.is-active,.hero.is-light .navbar-link:hover,.hero.is-light a.navbar-item.is-active,.hero.is-light a.navbar-item:hover{background-color:#e8e8e8;color:rgba(0,0,0,.7)}.hero.is-light .tabs a{color:rgba(0,0,0,.7);opacity:.9}.hero.is-light .tabs a:hover{opacity:1}.hero.is-light .tabs li.is-active a{opacity:1}.hero.is-light .tabs.is-boxed a,.hero.is-light .tabs.is-toggle a{color:rgba(0,0,0,.7)}.hero.is-light .tabs.is-boxed a:hover,.hero.is-light .tabs.is-toggle a:hover{background-color:rgba(10,10,10,.1)}.hero.is-light .tabs.is-boxed li.is-active a,.hero.is-light .tabs.is-boxed li.is-active a:hover,.hero.is-light .tabs.is-toggle li.is-active a,.hero.is-light .tabs.is-toggle li.is-active a:hover{background-color:rgba(0,0,0,.7);border-color:rgba(0,0,0,.7);color:#f5f5f5}.hero.is-light.is-bold{background-image:linear-gradient(141deg,#dfd8d9 0,#f5f5f5 71%,#fff 100%)}@media screen and (max-width:768px){.hero.is-light.is-bold .navbar-menu{background-image:linear-gradient(141deg,#dfd8d9 0,#f5f5f5 71%,#fff 100%)}}.hero.is-dark{background-color:#363636;color:#fff}.hero.is-dark a:not(.button):not(.dropdown-item):not(.tag):not(.pagination-link.is-current),.hero.is-dark strong{color:inherit}.hero.is-dark .title{color:#fff}.hero.is-dark .subtitle{color:rgba(255,255,255,.9)}.hero.is-dark .subtitle a:not(.button),.hero.is-dark .subtitle strong{color:#fff}@media screen and (max-width:1023px){.hero.is-dark .navbar-menu{background-color:#363636}}.hero.is-dark .navbar-item,.hero.is-dark .navbar-link{color:rgba(255,255,255,.7)}.hero.is-dark .navbar-link.is-active,.hero.is-dark .navbar-link:hover,.hero.is-dark a.navbar-item.is-active,.hero.is-dark a.navbar-item:hover{background-color:#292929;color:#fff}.hero.is-dark .tabs a{color:#fff;opacity:.9}.hero.is-dark .tabs a:hover{opacity:1}.hero.is-dark .tabs li.is-active a{opacity:1}.hero.is-dark .tabs.is-boxed a,.hero.is-dark .tabs.is-toggle a{color:#fff}.hero.is-dark .tabs.is-boxed a:hover,.hero.is-dark .tabs.is-toggle a:hover{background-color:rgba(10,10,10,.1)}.hero.is-dark .tabs.is-boxed li.is-active a,.hero.is-dark .tabs.is-boxed li.is-active a:hover,.hero.is-dark .tabs.is-toggle li.is-active a,.hero.is-dark .tabs.is-toggle li.is-active a:hover{background-color:#fff;border-color:#fff;color:#363636}.hero.is-dark.is-bold{background-image:linear-gradient(141deg,#1f191a 0,#363636 71%,#46403f 100%)}@media screen and (max-width:768px){.hero.is-dark.is-bold .navbar-menu{background-image:linear-gradient(141deg,#1f191a 0,#363636 71%,#46403f 100%)}}.hero.is-primary{background-color:#00d1b2;color:#fff}.hero.is-primary a:not(.button):not(.dropdown-item):not(.tag):not(.pagination-link.is-current),.hero.is-primary strong{color:inherit}.hero.is-primary .title{color:#fff}.hero.is-primary .subtitle{color:rgba(255,255,255,.9)}.hero.is-primary .subtitle a:not(.button),.hero.is-primary .subtitle strong{color:#fff}@media screen and (max-width:1023px){.hero.is-primary .navbar-menu{background-color:#00d1b2}}.hero.is-primary .navbar-item,.hero.is-primary .navbar-link{color:rgba(255,255,255,.7)}.hero.is-primary .navbar-link.is-active,.hero.is-primary .navbar-link:hover,.hero.is-primary a.navbar-item.is-active,.hero.is-primary a.navbar-item:hover{background-color:#00b89c;color:#fff}.hero.is-primary .tabs a{color:#fff;opacity:.9}.hero.is-primary .tabs a:hover{opacity:1}.hero.is-primary .tabs li.is-active a{opacity:1}.hero.is-primary .tabs.is-boxed a,.hero.is-primary .tabs.is-toggle a{color:#fff}.hero.is-primary .tabs.is-boxed a:hover,.hero.is-primary .tabs.is-toggle a:hover{background-color:rgba(10,10,10,.1)}.hero.is-primary .tabs.is-boxed li.is-active a,.hero.is-primary .tabs.is-boxed li.is-active a:hover,.hero.is-primary .tabs.is-toggle li.is-active a,.hero.is-primary .tabs.is-toggle li.is-active a:hover{background-color:#fff;border-color:#fff;color:#00d1b2}.hero.is-primary.is-bold{background-image:linear-gradient(141deg,#009e6c 0,#00d1b2 71%,#00e7eb 100%)}@media screen and (max-width:768px){.hero.is-primary.is-bold .navbar-menu{background-image:linear-gradient(141deg,#009e6c 0,#00d1b2 71%,#00e7eb 100%)}}.hero.is-link{background-color:#3273dc;color:#fff}.hero.is-link a:not(.button):not(.dropdown-item):not(.tag):not(.pagination-link.is-current),.hero.is-link strong{color:inherit}.hero.is-link .title{color:#fff}.hero.is-link .subtitle{color:rgba(255,255,255,.9)}.hero.is-link .subtitle a:not(.button),.hero.is-link .subtitle strong{color:#fff}@media screen and (max-width:1023px){.hero.is-link .navbar-menu{background-color:#3273dc}}.hero.is-link .navbar-item,.hero.is-link .navbar-link{color:rgba(255,255,255,.7)}.hero.is-link .navbar-link.is-active,.hero.is-link .navbar-link:hover,.hero.is-link a.navbar-item.is-active,.hero.is-link a.navbar-item:hover{background-color:#2366d1;color:#fff}.hero.is-link .tabs a{color:#fff;opacity:.9}.hero.is-link .tabs a:hover{opacity:1}.hero.is-link .tabs li.is-active a{opacity:1}.hero.is-link .tabs.is-boxed a,.hero.is-link .tabs.is-toggle a{color:#fff}.hero.is-link .tabs.is-boxed a:hover,.hero.is-link .tabs.is-toggle a:hover{background-color:rgba(10,10,10,.1)}.hero.is-link .tabs.is-boxed li.is-active a,.hero.is-link .tabs.is-boxed li.is-active a:hover,.hero.is-link .tabs.is-toggle li.is-active a,.hero.is-link .tabs.is-toggle li.is-active a:hover{background-color:#fff;border-color:#fff;color:#3273dc}.hero.is-link.is-bold{background-image:linear-gradient(141deg,#1577c6 0,#3273dc 71%,#4366e5 100%)}@media screen and (max-width:768px){.hero.is-link.is-bold .navbar-menu{background-image:linear-gradient(141deg,#1577c6 0,#3273dc 71%,#4366e5 100%)}}.hero.is-info{background-color:#3298dc;color:#fff}.hero.is-info a:not(.button):not(.dropdown-item):not(.tag):not(.pagination-link.is-current),.hero.is-info strong{color:inherit}.hero.is-info .title{color:#fff}.hero.is-info .subtitle{color:rgba(255,255,255,.9)}.hero.is-info .subtitle a:not(.button),.hero.is-info .subtitle strong{color:#fff}@media screen and (max-width:1023px){.hero.is-info .navbar-menu{background-color:#3298dc}}.hero.is-info .navbar-item,.hero.is-info .navbar-link{color:rgba(255,255,255,.7)}.hero.is-info .navbar-link.is-active,.hero.is-info .navbar-link:hover,.hero.is-info a.navbar-item.is-active,.hero.is-info a.navbar-item:hover{background-color:#238cd1;color:#fff}.hero.is-info .tabs a{color:#fff;opacity:.9}.hero.is-info .tabs a:hover{opacity:1}.hero.is-info .tabs li.is-active a{opacity:1}.hero.is-info .tabs.is-boxed a,.hero.is-info .tabs.is-toggle a{color:#fff}.hero.is-info .tabs.is-boxed a:hover,.hero.is-info .tabs.is-toggle a:hover{background-color:rgba(10,10,10,.1)}.hero.is-info .tabs.is-boxed li.is-active a,.hero.is-info .tabs.is-boxed li.is-active a:hover,.hero.is-info .tabs.is-toggle li.is-active a,.hero.is-info .tabs.is-toggle li.is-active a:hover{background-color:#fff;border-color:#fff;color:#3298dc}.hero.is-info.is-bold{background-image:linear-gradient(141deg,#159dc6 0,#3298dc 71%,#4389e5 100%)}@media screen and (max-width:768px){.hero.is-info.is-bold .navbar-menu{background-image:linear-gradient(141deg,#159dc6 0,#3298dc 71%,#4389e5 100%)}}.hero.is-success{background-color:#48c774;color:#fff}.hero.is-success a:not(.button):not(.dropdown-item):not(.tag):not(.pagination-link.is-current),.hero.is-success strong{color:inherit}.hero.is-success .title{color:#fff}.hero.is-success .subtitle{color:rgba(255,255,255,.9)}.hero.is-success .subtitle a:not(.button),.hero.is-success .subtitle strong{color:#fff}@media screen and (max-width:1023px){.hero.is-success .navbar-menu{background-color:#48c774}}.hero.is-success .navbar-item,.hero.is-success .navbar-link{color:rgba(255,255,255,.7)}.hero.is-success .navbar-link.is-active,.hero.is-success .navbar-link:hover,.hero.is-success a.navbar-item.is-active,.hero.is-success a.navbar-item:hover{background-color:#3abb67;color:#fff}.hero.is-success .tabs a{color:#fff;opacity:.9}.hero.is-success .tabs a:hover{opacity:1}.hero.is-success .tabs li.is-active a{opacity:1}.hero.is-success .tabs.is-boxed a,.hero.is-success .tabs.is-toggle a{color:#fff}.hero.is-success .tabs.is-boxed a:hover,.hero.is-success .tabs.is-toggle a:hover{background-color:rgba(10,10,10,.1)}.hero.is-success .tabs.is-boxed li.is-active a,.hero.is-success .tabs.is-boxed li.is-active a:hover,.hero.is-success .tabs.is-toggle li.is-active a,.hero.is-success .tabs.is-toggle li.is-active a:hover{background-color:#fff;border-color:#fff;color:#48c774}.hero.is-success.is-bold{background-image:linear-gradient(141deg,#29b342 0,#48c774 71%,#56d296 100%)}@media screen and (max-width:768px){.hero.is-success.is-bold .navbar-menu{background-image:linear-gradient(141deg,#29b342 0,#48c774 71%,#56d296 100%)}}.hero.is-warning{background-color:#ffdd57;color:rgba(0,0,0,.7)}.hero.is-warning a:not(.button):not(.dropdown-item):not(.tag):not(.pagination-link.is-current),.hero.is-warning strong{color:inherit}.hero.is-warning .title{color:rgba(0,0,0,.7)}.hero.is-warning .subtitle{color:rgba(0,0,0,.9)}.hero.is-warning .subtitle a:not(.button),.hero.is-warning .subtitle strong{color:rgba(0,0,0,.7)}@media screen and (max-width:1023px){.hero.is-warning .navbar-menu{background-color:#ffdd57}}.hero.is-warning .navbar-item,.hero.is-warning .navbar-link{color:rgba(0,0,0,.7)}.hero.is-warning .navbar-link.is-active,.hero.is-warning .navbar-link:hover,.hero.is-warning a.navbar-item.is-active,.hero.is-warning a.navbar-item:hover{background-color:#ffd83d;color:rgba(0,0,0,.7)}.hero.is-warning .tabs a{color:rgba(0,0,0,.7);opacity:.9}.hero.is-warning .tabs a:hover{opacity:1}.hero.is-warning .tabs li.is-active a{opacity:1}.hero.is-warning .tabs.is-boxed a,.hero.is-warning .tabs.is-toggle a{color:rgba(0,0,0,.7)}.hero.is-warning .tabs.is-boxed a:hover,.hero.is-warning .tabs.is-toggle a:hover{background-color:rgba(10,10,10,.1)}.hero.is-warning .tabs.is-boxed li.is-active a,.hero.is-warning .tabs.is-boxed li.is-active a:hover,.hero.is-warning .tabs.is-toggle li.is-active a,.hero.is-warning .tabs.is-toggle li.is-active a:hover{background-color:rgba(0,0,0,.7);border-color:rgba(0,0,0,.7);color:#ffdd57}.hero.is-warning.is-bold{background-image:linear-gradient(141deg,#ffaf24 0,#ffdd57 71%,#fffa70 100%)}@media screen and (max-width:768px){.hero.is-warning.is-bold .navbar-menu{background-image:linear-gradient(141deg,#ffaf24 0,#ffdd57 71%,#fffa70 100%)}}.hero.is-danger{background-color:#f14668;color:#fff}.hero.is-danger a:not(.button):not(.dropdown-item):not(.tag):not(.pagination-link.is-current),.hero.is-danger strong{color:inherit}.hero.is-danger .title{color:#fff}.hero.is-danger .subtitle{color:rgba(255,255,255,.9)}.hero.is-danger .subtitle a:not(.button),.hero.is-danger .subtitle strong{color:#fff}@media screen and (max-width:1023px){.hero.is-danger .navbar-menu{background-color:#f14668}}.hero.is-danger .navbar-item,.hero.is-danger .navbar-link{color:rgba(255,255,255,.7)}.hero.is-danger .navbar-link.is-active,.hero.is-danger .navbar-link:hover,.hero.is-danger a.navbar-item.is-active,.hero.is-danger a.navbar-item:hover{background-color:#ef2e55;color:#fff}.hero.is-danger .tabs a{color:#fff;opacity:.9}.hero.is-danger .tabs a:hover{opacity:1}.hero.is-danger .tabs li.is-active a{opacity:1}.hero.is-danger .tabs.is-boxed a,.hero.is-danger .tabs.is-toggle a{color:#fff}.hero.is-danger .tabs.is-boxed a:hover,.hero.is-danger .tabs.is-toggle a:hover{background-color:rgba(10,10,10,.1)}.hero.is-danger .tabs.is-boxed li.is-active a,.hero.is-danger .tabs.is-boxed li.is-active a:hover,.hero.is-danger .tabs.is-toggle li.is-active a,.hero.is-danger .tabs.is-toggle li.is-active a:hover{background-color:#fff;border-color:#fff;color:#f14668}.hero.is-danger.is-bold{background-image:linear-gradient(141deg,#fa0a62 0,#f14668 71%,#f7595f 100%)}@media screen and (max-width:768px){.hero.is-danger.is-bold .navbar-menu{background-image:linear-gradient(141deg,#fa0a62 0,#f14668 71%,#f7595f 100%)}}.hero.is-small .hero-body{padding:1.5rem}@media screen and (min-width:769px),print{.hero.is-medium .hero-body{padding:9rem 1.5rem}}@media screen and (min-width:769px),print{.hero.is-large .hero-body{padding:18rem 1.5rem}}.hero.is-fullheight .hero-body,.hero.is-fullheight-with-navbar .hero-body,.hero.is-halfheight .hero-body{align-items:center;display:flex}.hero.is-fullheight .hero-body>.container,.hero.is-fullheight-with-navbar .hero-body>.container,.hero.is-halfheight .hero-body>.container{flex-grow:1;flex-shrink:1}.hero.is-halfheight{min-height:50vh}.hero.is-fullheight{min-height:100vh}.hero-video{overflow:hidden}.hero-video video{left:50%;min-height:100%;min-width:100%;position:absolute;top:50%;transform:translate3d(-50%,-50%,0)}.hero-video.is-transparent{opacity:.3}@media screen and (max-width:768px){.hero-video{display:none}}.hero-buttons{margin-top:1.5rem}@media screen and (max-width:768px){.hero-buttons .button{display:flex}.hero-buttons .button:not(:last-child){margin-bottom:.75rem}}@media screen and (min-width:769px),print{.hero-buttons{display:flex;justify-content:center}.hero-buttons .button:not(:last-child){margin-right:1.5rem}}.hero-foot,.hero-head{flex-grow:0;flex-shrink:0}.hero-body{flex-grow:1;flex-shrink:0;padding:3rem 1.5rem}.section{padding:3rem 1.5rem}@media screen and (min-width:1024px){.section.is-medium{padding:9rem 1.5rem}.section.is-large{padding:18rem 1.5rem}}.footer{background-color:#fafafa;padding:3rem 1.5rem 6rem}
\ No newline at end of file
+/*! bulma.io v0.9.2 | MIT License | github.com/jgthms/bulma */.button,.file-cta,.file-name,.input,.pagination-ellipsis,.pagination-link,.pagination-next,.pagination-previous,.select select,.textarea{-moz-appearance:none;-webkit-appearance:none;align-items:center;border:1px solid transparent;border-radius:4px;box-shadow:none;display:inline-flex;font-size:1rem;height:2.5em;justify-content:flex-start;line-height:1.5;padding-bottom:calc(.5em - 1px);padding-left:calc(.75em - 1px);padding-right:calc(.75em - 1px);padding-top:calc(.5em - 1px);position:relative;vertical-align:top}.button:active,.button:focus,.file-cta:active,.file-cta:focus,.file-name:active,.file-name:focus,.input:active,.input:focus,.is-active.button,.is-active.file-cta,.is-active.file-name,.is-active.input,.is-active.pagination-ellipsis,.is-active.pagination-link,.is-active.pagination-next,.is-active.pagination-previous,.is-active.textarea,.is-focused.button,.is-focused.file-cta,.is-focused.file-name,.is-focused.input,.is-focused.pagination-ellipsis,.is-focused.pagination-link,.is-focused.pagination-next,.is-focused.pagination-previous,.is-focused.textarea,.pagination-ellipsis:active,.pagination-ellipsis:focus,.pagination-link:active,.pagination-link:focus,.pagination-next:active,.pagination-next:focus,.pagination-previous:active,.pagination-previous:focus,.select select.is-active,.select select.is-focused,.select select:active,.select select:focus,.textarea:active,.textarea:focus{outline:0}.button[disabled],.file-cta[disabled],.file-name[disabled],.input[disabled],.pagination-ellipsis[disabled],.pagination-link[disabled],.pagination-next[disabled],.pagination-previous[disabled],.select fieldset[disabled] select,.select select[disabled],.textarea[disabled],fieldset[disabled] .button,fieldset[disabled] .file-cta,fieldset[disabled] .file-name,fieldset[disabled] .input,fieldset[disabled] .pagination-ellipsis,fieldset[disabled] .pagination-link,fieldset[disabled] .pagination-next,fieldset[disabled] .pagination-previous,fieldset[disabled] .select select,fieldset[disabled] .textarea{cursor:not-allowed}.breadcrumb,.button,.file,.is-unselectable,.pagination-ellipsis,.pagination-link,.pagination-next,.pagination-previous,.tabs{-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.navbar-link:not(.is-arrowless)::after,.select:not(.is-multiple):not(.is-loading)::after{border:3px solid transparent;border-radius:2px;border-right:0;border-top:0;content:" ";display:block;height:.625em;margin-top:-.4375em;pointer-events:none;position:absolute;top:50%;transform:rotate(-45deg);transform-origin:center;width:.625em}.block:not(:last-child),.box:not(:last-child),.breadcrumb:not(:last-child),.content:not(:last-child),.highlight:not(:last-child),.level:not(:last-child),.message:not(:last-child),.notification:not(:last-child),.pagination:not(:last-child),.progress:not(:last-child),.subtitle:not(:last-child),.table-container:not(:last-child),.table:not(:last-child),.tabs:not(:last-child),.title:not(:last-child){margin-bottom:1.5rem}.delete,.modal-close{-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-moz-appearance:none;-webkit-appearance:none;background-color:rgba(10,10,10,.2);border:none;border-radius:290486px;cursor:pointer;pointer-events:auto;display:inline-block;flex-grow:0;flex-shrink:0;font-size:0;height:20px;max-height:20px;max-width:20px;min-height:20px;min-width:20px;outline:0;position:relative;vertical-align:top;width:20px}.delete::after,.delete::before,.modal-close::after,.modal-close::before{background-color:#fff;content:"";display:block;left:50%;position:absolute;top:50%;transform:translateX(-50%) translateY(-50%) rotate(45deg);transform-origin:center center}.delete::before,.modal-close::before{height:2px;width:50%}.delete::after,.modal-close::after{height:50%;width:2px}.delete:focus,.delete:hover,.modal-close:focus,.modal-close:hover{background-color:rgba(10,10,10,.3)}.delete:active,.modal-close:active{background-color:rgba(10,10,10,.4)}.is-small.delete,.is-small.modal-close{height:16px;max-height:16px;max-width:16px;min-height:16px;min-width:16px;width:16px}.is-medium.delete,.is-medium.modal-close{height:24px;max-height:24px;max-width:24px;min-height:24px;min-width:24px;width:24px}.is-large.delete,.is-large.modal-close{height:32px;max-height:32px;max-width:32px;min-height:32px;min-width:32px;width:32px}.button.is-loading::after,.control.is-loading::after,.loader,.select.is-loading::after{-webkit-animation:spinAround .5s infinite linear;animation:spinAround .5s infinite linear;border:2px solid #dbdbdb;border-radius:290486px;border-right-color:transparent;border-top-color:transparent;content:"";display:block;height:1em;position:relative;width:1em}.hero-video,.image.is-16by9 .has-ratio,.image.is-16by9 img,.image.is-1by1 .has-ratio,.image.is-1by1 img,.image.is-1by2 .has-ratio,.image.is-1by2 img,.image.is-1by3 .has-ratio,.image.is-1by3 img,.image.is-2by1 .has-ratio,.image.is-2by1 img,.image.is-2by3 .has-ratio,.image.is-2by3 img,.image.is-3by1 .has-ratio,.image.is-3by1 img,.image.is-3by2 .has-ratio,.image.is-3by2 img,.image.is-3by4 .has-ratio,.image.is-3by4 img,.image.is-3by5 .has-ratio,.image.is-3by5 img,.image.is-4by3 .has-ratio,.image.is-4by3 img,.image.is-4by5 .has-ratio,.image.is-4by5 img,.image.is-5by3 .has-ratio,.image.is-5by3 img,.image.is-5by4 .has-ratio,.image.is-5by4 img,.image.is-9by16 .has-ratio,.image.is-9by16 img,.image.is-square .has-ratio,.image.is-square img,.is-overlay,.modal,.modal-background{bottom:0;left:0;position:absolute;right:0;top:0}/*! minireset.css v0.0.6 | MIT License | github.com/jgthms/minireset.css */blockquote,body,dd,dl,dt,fieldset,figure,h1,h2,h3,h4,h5,h6,hr,html,iframe,legend,li,ol,p,pre,textarea,ul{margin:0;padding:0}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:400}ul{list-style:none}button,input,select,textarea{margin:0}html{box-sizing:border-box}*,::after,::before{box-sizing:inherit}img,video{height:auto;max-width:100%}iframe{border:0}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}td:not([align]),th:not([align]){text-align:inherit}html{background-color:#fff;font-size:16px;-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;min-width:300px;overflow-x:hidden;overflow-y:scroll;text-rendering:optimizeLegibility;-webkit-text-size-adjust:100%;-moz-text-size-adjust:100%;-ms-text-size-adjust:100%;text-size-adjust:100%}article,aside,figure,footer,header,hgroup,section{display:block}body,button,input,optgroup,select,textarea{font-family:BlinkMacSystemFont,-apple-system,"Segoe UI",Roboto,Oxygen,Ubuntu,Cantarell,"Fira Sans","Droid Sans","Helvetica Neue",Helvetica,Arial,sans-serif}code,pre{-moz-osx-font-smoothing:auto;-webkit-font-smoothing:auto;font-family:monospace}body{color:#4a4a4a;font-size:1em;font-weight:400;line-height:1.5}a{color:#3273dc;cursor:pointer;text-decoration:none}a strong{color:currentColor}a:hover{color:#363636}code{background-color:#f5f5f5;color:#da1039;font-size:.875em;font-weight:400;padding:.25em .5em .25em}hr{background-color:#f5f5f5;border:none;display:block;height:2px;margin:1.5rem 0}img{height:auto;max-width:100%}input[type=checkbox],input[type=radio]{vertical-align:baseline}small{font-size:.875em}span{font-style:inherit;font-weight:inherit}strong{color:#363636;font-weight:700}fieldset{border:none}pre{-webkit-overflow-scrolling:touch;background-color:#f5f5f5;color:#4a4a4a;font-size:.875em;overflow-x:auto;padding:1.25rem 1.5rem;white-space:pre;word-wrap:normal}pre code{background-color:transparent;color:currentColor;font-size:1em;padding:0}table td,table th{vertical-align:top}table td:not([align]),table th:not([align]){text-align:inherit}table th{color:#363636}@-webkit-keyframes spinAround{from{transform:rotate(0)}to{transform:rotate(359deg)}}@keyframes spinAround{from{transform:rotate(0)}to{transform:rotate(359deg)}}.box{background-color:#fff;border-radius:6px;box-shadow:0 .5em 1em -.125em rgba(10,10,10,.1),0 0 0 1px rgba(10,10,10,.02);color:#4a4a4a;display:block;padding:1.25rem}a.box:focus,a.box:hover{box-shadow:0 .5em 1em -.125em rgba(10,10,10,.1),0 0 0 1px #3273dc}a.box:active{box-shadow:inset 0 1px 2px rgba(10,10,10,.2),0 0 0 1px #3273dc}.button{background-color:#fff;border-color:#dbdbdb;border-width:1px;color:#363636;cursor:pointer;justify-content:center;padding-bottom:calc(.5em - 1px);padding-left:1em;padding-right:1em;padding-top:calc(.5em - 1px);text-align:center;white-space:nowrap}.button strong{color:inherit}.button .icon,.button .icon.is-large,.button .icon.is-medium,.button .icon.is-small{height:1.5em;width:1.5em}.button .icon:first-child:not(:last-child){margin-left:calc(-.5em - 1px);margin-right:.25em}.button .icon:last-child:not(:first-child){margin-left:.25em;margin-right:calc(-.5em - 1px)}.button .icon:first-child:last-child{margin-left:calc(-.5em - 1px);margin-right:calc(-.5em - 1px)}.button.is-hovered,.button:hover{border-color:#b5b5b5;color:#363636}.button.is-focused,.button:focus{border-color:#3273dc;color:#363636}.button.is-focused:not(:active),.button:focus:not(:active){box-shadow:0 0 0 .125em rgba(50,115,220,.25)}.button.is-active,.button:active{border-color:#4a4a4a;color:#363636}.button.is-text{background-color:transparent;border-color:transparent;color:#4a4a4a;text-decoration:underline}.button.is-text.is-focused,.button.is-text.is-hovered,.button.is-text:focus,.button.is-text:hover{background-color:#f5f5f5;color:#363636}.button.is-text.is-active,.button.is-text:active{background-color:#e8e8e8;color:#363636}.button.is-text[disabled],fieldset[disabled] .button.is-text{background-color:transparent;border-color:transparent;box-shadow:none}.button.is-ghost{background:0 0;border-color:transparent;color:#3273dc;text-decoration:none}.button.is-ghost.is-hovered,.button.is-ghost:hover{color:#3273dc;text-decoration:underline}.button.is-white{background-color:#fff;border-color:transparent;color:#0a0a0a}.button.is-white.is-hovered,.button.is-white:hover{background-color:#f9f9f9;border-color:transparent;color:#0a0a0a}.button.is-white.is-focused,.button.is-white:focus{border-color:transparent;color:#0a0a0a}.button.is-white.is-focused:not(:active),.button.is-white:focus:not(:active){box-shadow:0 0 0 .125em rgba(255,255,255,.25)}.button.is-white.is-active,.button.is-white:active{background-color:#f2f2f2;border-color:transparent;color:#0a0a0a}.button.is-white[disabled],fieldset[disabled] .button.is-white{background-color:#fff;border-color:transparent;box-shadow:none}.button.is-white.is-inverted{background-color:#0a0a0a;color:#fff}.button.is-white.is-inverted.is-hovered,.button.is-white.is-inverted:hover{background-color:#000}.button.is-white.is-inverted[disabled],fieldset[disabled] .button.is-white.is-inverted{background-color:#0a0a0a;border-color:transparent;box-shadow:none;color:#fff}.button.is-white.is-loading::after{border-color:transparent transparent #0a0a0a #0a0a0a!important}.button.is-white.is-outlined{background-color:transparent;border-color:#fff;color:#fff}.button.is-white.is-outlined.is-focused,.button.is-white.is-outlined.is-hovered,.button.is-white.is-outlined:focus,.button.is-white.is-outlined:hover{background-color:#fff;border-color:#fff;color:#0a0a0a}.button.is-white.is-outlined.is-loading::after{border-color:transparent transparent #fff #fff!important}.button.is-white.is-outlined.is-loading.is-focused::after,.button.is-white.is-outlined.is-loading.is-hovered::after,.button.is-white.is-outlined.is-loading:focus::after,.button.is-white.is-outlined.is-loading:hover::after{border-color:transparent transparent #0a0a0a #0a0a0a!important}.button.is-white.is-outlined[disabled],fieldset[disabled] .button.is-white.is-outlined{background-color:transparent;border-color:#fff;box-shadow:none;color:#fff}.button.is-white.is-inverted.is-outlined{background-color:transparent;border-color:#0a0a0a;color:#0a0a0a}.button.is-white.is-inverted.is-outlined.is-focused,.button.is-white.is-inverted.is-outlined.is-hovered,.button.is-white.is-inverted.is-outlined:focus,.button.is-white.is-inverted.is-outlined:hover{background-color:#0a0a0a;color:#fff}.button.is-white.is-inverted.is-outlined.is-loading.is-focused::after,.button.is-white.is-inverted.is-outlined.is-loading.is-hovered::after,.button.is-white.is-inverted.is-outlined.is-loading:focus::after,.button.is-white.is-inverted.is-outlined.is-loading:hover::after{border-color:transparent transparent #fff #fff!important}.button.is-white.is-inverted.is-outlined[disabled],fieldset[disabled] .button.is-white.is-inverted.is-outlined{background-color:transparent;border-color:#0a0a0a;box-shadow:none;color:#0a0a0a}.button.is-black{background-color:#0a0a0a;border-color:transparent;color:#fff}.button.is-black.is-hovered,.button.is-black:hover{background-color:#040404;border-color:transparent;color:#fff}.button.is-black.is-focused,.button.is-black:focus{border-color:transparent;color:#fff}.button.is-black.is-focused:not(:active),.button.is-black:focus:not(:active){box-shadow:0 0 0 .125em rgba(10,10,10,.25)}.button.is-black.is-active,.button.is-black:active{background-color:#000;border-color:transparent;color:#fff}.button.is-black[disabled],fieldset[disabled] .button.is-black{background-color:#0a0a0a;border-color:transparent;box-shadow:none}.button.is-black.is-inverted{background-color:#fff;color:#0a0a0a}.button.is-black.is-inverted.is-hovered,.button.is-black.is-inverted:hover{background-color:#f2f2f2}.button.is-black.is-inverted[disabled],fieldset[disabled] .button.is-black.is-inverted{background-color:#fff;border-color:transparent;box-shadow:none;color:#0a0a0a}.button.is-black.is-loading::after{border-color:transparent transparent #fff #fff!important}.button.is-black.is-outlined{background-color:transparent;border-color:#0a0a0a;color:#0a0a0a}.button.is-black.is-outlined.is-focused,.button.is-black.is-outlined.is-hovered,.button.is-black.is-outlined:focus,.button.is-black.is-outlined:hover{background-color:#0a0a0a;border-color:#0a0a0a;color:#fff}.button.is-black.is-outlined.is-loading::after{border-color:transparent transparent #0a0a0a #0a0a0a!important}.button.is-black.is-outlined.is-loading.is-focused::after,.button.is-black.is-outlined.is-loading.is-hovered::after,.button.is-black.is-outlined.is-loading:focus::after,.button.is-black.is-outlined.is-loading:hover::after{border-color:transparent transparent #fff #fff!important}.button.is-black.is-outlined[disabled],fieldset[disabled] .button.is-black.is-outlined{background-color:transparent;border-color:#0a0a0a;box-shadow:none;color:#0a0a0a}.button.is-black.is-inverted.is-outlined{background-color:transparent;border-color:#fff;color:#fff}.button.is-black.is-inverted.is-outlined.is-focused,.button.is-black.is-inverted.is-outlined.is-hovered,.button.is-black.is-inverted.is-outlined:focus,.button.is-black.is-inverted.is-outlined:hover{background-color:#fff;color:#0a0a0a}.button.is-black.is-inverted.is-outlined.is-loading.is-focused::after,.button.is-black.is-inverted.is-outlined.is-loading.is-hovered::after,.button.is-black.is-inverted.is-outlined.is-loading:focus::after,.button.is-black.is-inverted.is-outlined.is-loading:hover::after{border-color:transparent transparent #0a0a0a #0a0a0a!important}.button.is-black.is-inverted.is-outlined[disabled],fieldset[disabled] .button.is-black.is-inverted.is-outlined{background-color:transparent;border-color:#fff;box-shadow:none;color:#fff}.button.is-light{background-color:#f5f5f5;border-color:transparent;color:rgba(0,0,0,.7)}.button.is-light.is-hovered,.button.is-light:hover{background-color:#eee;border-color:transparent;color:rgba(0,0,0,.7)}.button.is-light.is-focused,.button.is-light:focus{border-color:transparent;color:rgba(0,0,0,.7)}.button.is-light.is-focused:not(:active),.button.is-light:focus:not(:active){box-shadow:0 0 0 .125em rgba(245,245,245,.25)}.button.is-light.is-active,.button.is-light:active{background-color:#e8e8e8;border-color:transparent;color:rgba(0,0,0,.7)}.button.is-light[disabled],fieldset[disabled] .button.is-light{background-color:#f5f5f5;border-color:transparent;box-shadow:none}.button.is-light.is-inverted{background-color:rgba(0,0,0,.7);color:#f5f5f5}.button.is-light.is-inverted.is-hovered,.button.is-light.is-inverted:hover{background-color:rgba(0,0,0,.7)}.button.is-light.is-inverted[disabled],fieldset[disabled] .button.is-light.is-inverted{background-color:rgba(0,0,0,.7);border-color:transparent;box-shadow:none;color:#f5f5f5}.button.is-light.is-loading::after{border-color:transparent transparent rgba(0,0,0,.7) rgba(0,0,0,.7)!important}.button.is-light.is-outlined{background-color:transparent;border-color:#f5f5f5;color:#f5f5f5}.button.is-light.is-outlined.is-focused,.button.is-light.is-outlined.is-hovered,.button.is-light.is-outlined:focus,.button.is-light.is-outlined:hover{background-color:#f5f5f5;border-color:#f5f5f5;color:rgba(0,0,0,.7)}.button.is-light.is-outlined.is-loading::after{border-color:transparent transparent #f5f5f5 #f5f5f5!important}.button.is-light.is-outlined.is-loading.is-focused::after,.button.is-light.is-outlined.is-loading.is-hovered::after,.button.is-light.is-outlined.is-loading:focus::after,.button.is-light.is-outlined.is-loading:hover::after{border-color:transparent transparent rgba(0,0,0,.7) rgba(0,0,0,.7)!important}.button.is-light.is-outlined[disabled],fieldset[disabled] .button.is-light.is-outlined{background-color:transparent;border-color:#f5f5f5;box-shadow:none;color:#f5f5f5}.button.is-light.is-inverted.is-outlined{background-color:transparent;border-color:rgba(0,0,0,.7);color:rgba(0,0,0,.7)}.button.is-light.is-inverted.is-outlined.is-focused,.button.is-light.is-inverted.is-outlined.is-hovered,.button.is-light.is-inverted.is-outlined:focus,.button.is-light.is-inverted.is-outlined:hover{background-color:rgba(0,0,0,.7);color:#f5f5f5}.button.is-light.is-inverted.is-outlined.is-loading.is-focused::after,.button.is-light.is-inverted.is-outlined.is-loading.is-hovered::after,.button.is-light.is-inverted.is-outlined.is-loading:focus::after,.button.is-light.is-inverted.is-outlined.is-loading:hover::after{border-color:transparent transparent #f5f5f5 #f5f5f5!important}.button.is-light.is-inverted.is-outlined[disabled],fieldset[disabled] .button.is-light.is-inverted.is-outlined{background-color:transparent;border-color:rgba(0,0,0,.7);box-shadow:none;color:rgba(0,0,0,.7)}.button.is-dark{background-color:#363636;border-color:transparent;color:#fff}.button.is-dark.is-hovered,.button.is-dark:hover{background-color:#2f2f2f;border-color:transparent;color:#fff}.button.is-dark.is-focused,.button.is-dark:focus{border-color:transparent;color:#fff}.button.is-dark.is-focused:not(:active),.button.is-dark:focus:not(:active){box-shadow:0 0 0 .125em rgba(54,54,54,.25)}.button.is-dark.is-active,.button.is-dark:active{background-color:#292929;border-color:transparent;color:#fff}.button.is-dark[disabled],fieldset[disabled] .button.is-dark{background-color:#363636;border-color:transparent;box-shadow:none}.button.is-dark.is-inverted{background-color:#fff;color:#363636}.button.is-dark.is-inverted.is-hovered,.button.is-dark.is-inverted:hover{background-color:#f2f2f2}.button.is-dark.is-inverted[disabled],fieldset[disabled] .button.is-dark.is-inverted{background-color:#fff;border-color:transparent;box-shadow:none;color:#363636}.button.is-dark.is-loading::after{border-color:transparent transparent #fff #fff!important}.button.is-dark.is-outlined{background-color:transparent;border-color:#363636;color:#363636}.button.is-dark.is-outlined.is-focused,.button.is-dark.is-outlined.is-hovered,.button.is-dark.is-outlined:focus,.button.is-dark.is-outlined:hover{background-color:#363636;border-color:#363636;color:#fff}.button.is-dark.is-outlined.is-loading::after{border-color:transparent transparent #363636 #363636!important}.button.is-dark.is-outlined.is-loading.is-focused::after,.button.is-dark.is-outlined.is-loading.is-hovered::after,.button.is-dark.is-outlined.is-loading:focus::after,.button.is-dark.is-outlined.is-loading:hover::after{border-color:transparent transparent #fff #fff!important}.button.is-dark.is-outlined[disabled],fieldset[disabled] .button.is-dark.is-outlined{background-color:transparent;border-color:#363636;box-shadow:none;color:#363636}.button.is-dark.is-inverted.is-outlined{background-color:transparent;border-color:#fff;color:#fff}.button.is-dark.is-inverted.is-outlined.is-focused,.button.is-dark.is-inverted.is-outlined.is-hovered,.button.is-dark.is-inverted.is-outlined:focus,.button.is-dark.is-inverted.is-outlined:hover{background-color:#fff;color:#363636}.button.is-dark.is-inverted.is-outlined.is-loading.is-focused::after,.button.is-dark.is-inverted.is-outlined.is-loading.is-hovered::after,.button.is-dark.is-inverted.is-outlined.is-loading:focus::after,.button.is-dark.is-inverted.is-outlined.is-loading:hover::after{border-color:transparent transparent #363636 #363636!important}.button.is-dark.is-inverted.is-outlined[disabled],fieldset[disabled] .button.is-dark.is-inverted.is-outlined{background-color:transparent;border-color:#fff;box-shadow:none;color:#fff}.button.is-primary{background-color:#00d1b2;border-color:transparent;color:#fff}.button.is-primary.is-hovered,.button.is-primary:hover{background-color:#00c4a7;border-color:transparent;color:#fff}.button.is-primary.is-focused,.button.is-primary:focus{border-color:transparent;color:#fff}.button.is-primary.is-focused:not(:active),.button.is-primary:focus:not(:active){box-shadow:0 0 0 .125em rgba(0,209,178,.25)}.button.is-primary.is-active,.button.is-primary:active{background-color:#00b89c;border-color:transparent;color:#fff}.button.is-primary[disabled],fieldset[disabled] .button.is-primary{background-color:#00d1b2;border-color:transparent;box-shadow:none}.button.is-primary.is-inverted{background-color:#fff;color:#00d1b2}.button.is-primary.is-inverted.is-hovered,.button.is-primary.is-inverted:hover{background-color:#f2f2f2}.button.is-primary.is-inverted[disabled],fieldset[disabled] .button.is-primary.is-inverted{background-color:#fff;border-color:transparent;box-shadow:none;color:#00d1b2}.button.is-primary.is-loading::after{border-color:transparent transparent #fff #fff!important}.button.is-primary.is-outlined{background-color:transparent;border-color:#00d1b2;color:#00d1b2}.button.is-primary.is-outlined.is-focused,.button.is-primary.is-outlined.is-hovered,.button.is-primary.is-outlined:focus,.button.is-primary.is-outlined:hover{background-color:#00d1b2;border-color:#00d1b2;color:#fff}.button.is-primary.is-outlined.is-loading::after{border-color:transparent transparent #00d1b2 #00d1b2!important}.button.is-primary.is-outlined.is-loading.is-focused::after,.button.is-primary.is-outlined.is-loading.is-hovered::after,.button.is-primary.is-outlined.is-loading:focus::after,.button.is-primary.is-outlined.is-loading:hover::after{border-color:transparent transparent #fff #fff!important}.button.is-primary.is-outlined[disabled],fieldset[disabled] .button.is-primary.is-outlined{background-color:transparent;border-color:#00d1b2;box-shadow:none;color:#00d1b2}.button.is-primary.is-inverted.is-outlined{background-color:transparent;border-color:#fff;color:#fff}.button.is-primary.is-inverted.is-outlined.is-focused,.button.is-primary.is-inverted.is-outlined.is-hovered,.button.is-primary.is-inverted.is-outlined:focus,.button.is-primary.is-inverted.is-outlined:hover{background-color:#fff;color:#00d1b2}.button.is-primary.is-inverted.is-outlined.is-loading.is-focused::after,.button.is-primary.is-inverted.is-outlined.is-loading.is-hovered::after,.button.is-primary.is-inverted.is-outlined.is-loading:focus::after,.button.is-primary.is-inverted.is-outlined.is-loading:hover::after{border-color:transparent transparent #00d1b2 #00d1b2!important}.button.is-primary.is-inverted.is-outlined[disabled],fieldset[disabled] .button.is-primary.is-inverted.is-outlined{background-color:transparent;border-color:#fff;box-shadow:none;color:#fff}.button.is-primary.is-light{background-color:#ebfffc;color:#00947e}.button.is-primary.is-light.is-hovered,.button.is-primary.is-light:hover{background-color:#defffa;border-color:transparent;color:#00947e}.button.is-primary.is-light.is-active,.button.is-primary.is-light:active{background-color:#d1fff8;border-color:transparent;color:#00947e}.button.is-link{background-color:#3273dc;border-color:transparent;color:#fff}.button.is-link.is-hovered,.button.is-link:hover{background-color:#276cda;border-color:transparent;color:#fff}.button.is-link.is-focused,.button.is-link:focus{border-color:transparent;color:#fff}.button.is-link.is-focused:not(:active),.button.is-link:focus:not(:active){box-shadow:0 0 0 .125em rgba(50,115,220,.25)}.button.is-link.is-active,.button.is-link:active{background-color:#2366d1;border-color:transparent;color:#fff}.button.is-link[disabled],fieldset[disabled] .button.is-link{background-color:#3273dc;border-color:transparent;box-shadow:none}.button.is-link.is-inverted{background-color:#fff;color:#3273dc}.button.is-link.is-inverted.is-hovered,.button.is-link.is-inverted:hover{background-color:#f2f2f2}.button.is-link.is-inverted[disabled],fieldset[disabled] .button.is-link.is-inverted{background-color:#fff;border-color:transparent;box-shadow:none;color:#3273dc}.button.is-link.is-loading::after{border-color:transparent transparent #fff #fff!important}.button.is-link.is-outlined{background-color:transparent;border-color:#3273dc;color:#3273dc}.button.is-link.is-outlined.is-focused,.button.is-link.is-outlined.is-hovered,.button.is-link.is-outlined:focus,.button.is-link.is-outlined:hover{background-color:#3273dc;border-color:#3273dc;color:#fff}.button.is-link.is-outlined.is-loading::after{border-color:transparent transparent #3273dc #3273dc!important}.button.is-link.is-outlined.is-loading.is-focused::after,.button.is-link.is-outlined.is-loading.is-hovered::after,.button.is-link.is-outlined.is-loading:focus::after,.button.is-link.is-outlined.is-loading:hover::after{border-color:transparent transparent #fff #fff!important}.button.is-link.is-outlined[disabled],fieldset[disabled] .button.is-link.is-outlined{background-color:transparent;border-color:#3273dc;box-shadow:none;color:#3273dc}.button.is-link.is-inverted.is-outlined{background-color:transparent;border-color:#fff;color:#fff}.button.is-link.is-inverted.is-outlined.is-focused,.button.is-link.is-inverted.is-outlined.is-hovered,.button.is-link.is-inverted.is-outlined:focus,.button.is-link.is-inverted.is-outlined:hover{background-color:#fff;color:#3273dc}.button.is-link.is-inverted.is-outlined.is-loading.is-focused::after,.button.is-link.is-inverted.is-outlined.is-loading.is-hovered::after,.button.is-link.is-inverted.is-outlined.is-loading:focus::after,.button.is-link.is-inverted.is-outlined.is-loading:hover::after{border-color:transparent transparent #3273dc #3273dc!important}.button.is-link.is-inverted.is-outlined[disabled],fieldset[disabled] .button.is-link.is-inverted.is-outlined{background-color:transparent;border-color:#fff;box-shadow:none;color:#fff}.button.is-link.is-light{background-color:#eef3fc;color:#2160c4}.button.is-link.is-light.is-hovered,.button.is-link.is-light:hover{background-color:#e3ecfa;border-color:transparent;color:#2160c4}.button.is-link.is-light.is-active,.button.is-link.is-light:active{background-color:#d8e4f8;border-color:transparent;color:#2160c4}.button.is-info{background-color:#3298dc;border-color:transparent;color:#fff}.button.is-info.is-hovered,.button.is-info:hover{background-color:#2793da;border-color:transparent;color:#fff}.button.is-info.is-focused,.button.is-info:focus{border-color:transparent;color:#fff}.button.is-info.is-focused:not(:active),.button.is-info:focus:not(:active){box-shadow:0 0 0 .125em rgba(50,152,220,.25)}.button.is-info.is-active,.button.is-info:active{background-color:#238cd1;border-color:transparent;color:#fff}.button.is-info[disabled],fieldset[disabled] .button.is-info{background-color:#3298dc;border-color:transparent;box-shadow:none}.button.is-info.is-inverted{background-color:#fff;color:#3298dc}.button.is-info.is-inverted.is-hovered,.button.is-info.is-inverted:hover{background-color:#f2f2f2}.button.is-info.is-inverted[disabled],fieldset[disabled] .button.is-info.is-inverted{background-color:#fff;border-color:transparent;box-shadow:none;color:#3298dc}.button.is-info.is-loading::after{border-color:transparent transparent #fff #fff!important}.button.is-info.is-outlined{background-color:transparent;border-color:#3298dc;color:#3298dc}.button.is-info.is-outlined.is-focused,.button.is-info.is-outlined.is-hovered,.button.is-info.is-outlined:focus,.button.is-info.is-outlined:hover{background-color:#3298dc;border-color:#3298dc;color:#fff}.button.is-info.is-outlined.is-loading::after{border-color:transparent transparent #3298dc #3298dc!important}.button.is-info.is-outlined.is-loading.is-focused::after,.button.is-info.is-outlined.is-loading.is-hovered::after,.button.is-info.is-outlined.is-loading:focus::after,.button.is-info.is-outlined.is-loading:hover::after{border-color:transparent transparent #fff #fff!important}.button.is-info.is-outlined[disabled],fieldset[disabled] .button.is-info.is-outlined{background-color:transparent;border-color:#3298dc;box-shadow:none;color:#3298dc}.button.is-info.is-inverted.is-outlined{background-color:transparent;border-color:#fff;color:#fff}.button.is-info.is-inverted.is-outlined.is-focused,.button.is-info.is-inverted.is-outlined.is-hovered,.button.is-info.is-inverted.is-outlined:focus,.button.is-info.is-inverted.is-outlined:hover{background-color:#fff;color:#3298dc}.button.is-info.is-inverted.is-outlined.is-loading.is-focused::after,.button.is-info.is-inverted.is-outlined.is-loading.is-hovered::after,.button.is-info.is-inverted.is-outlined.is-loading:focus::after,.button.is-info.is-inverted.is-outlined.is-loading:hover::after{border-color:transparent transparent #3298dc #3298dc!important}.button.is-info.is-inverted.is-outlined[disabled],fieldset[disabled] .button.is-info.is-inverted.is-outlined{background-color:transparent;border-color:#fff;box-shadow:none;color:#fff}.button.is-info.is-light{background-color:#eef6fc;color:#1d72aa}.button.is-info.is-light.is-hovered,.button.is-info.is-light:hover{background-color:#e3f1fa;border-color:transparent;color:#1d72aa}.button.is-info.is-light.is-active,.button.is-info.is-light:active{background-color:#d8ebf8;border-color:transparent;color:#1d72aa}.button.is-success{background-color:#48c774;border-color:transparent;color:#fff}.button.is-success.is-hovered,.button.is-success:hover{background-color:#3ec46d;border-color:transparent;color:#fff}.button.is-success.is-focused,.button.is-success:focus{border-color:transparent;color:#fff}.button.is-success.is-focused:not(:active),.button.is-success:focus:not(:active){box-shadow:0 0 0 .125em rgba(72,199,116,.25)}.button.is-success.is-active,.button.is-success:active{background-color:#3abb67;border-color:transparent;color:#fff}.button.is-success[disabled],fieldset[disabled] .button.is-success{background-color:#48c774;border-color:transparent;box-shadow:none}.button.is-success.is-inverted{background-color:#fff;color:#48c774}.button.is-success.is-inverted.is-hovered,.button.is-success.is-inverted:hover{background-color:#f2f2f2}.button.is-success.is-inverted[disabled],fieldset[disabled] .button.is-success.is-inverted{background-color:#fff;border-color:transparent;box-shadow:none;color:#48c774}.button.is-success.is-loading::after{border-color:transparent transparent #fff #fff!important}.button.is-success.is-outlined{background-color:transparent;border-color:#48c774;color:#48c774}.button.is-success.is-outlined.is-focused,.button.is-success.is-outlined.is-hovered,.button.is-success.is-outlined:focus,.button.is-success.is-outlined:hover{background-color:#48c774;border-color:#48c774;color:#fff}.button.is-success.is-outlined.is-loading::after{border-color:transparent transparent #48c774 #48c774!important}.button.is-success.is-outlined.is-loading.is-focused::after,.button.is-success.is-outlined.is-loading.is-hovered::after,.button.is-success.is-outlined.is-loading:focus::after,.button.is-success.is-outlined.is-loading:hover::after{border-color:transparent transparent #fff #fff!important}.button.is-success.is-outlined[disabled],fieldset[disabled] .button.is-success.is-outlined{background-color:transparent;border-color:#48c774;box-shadow:none;color:#48c774}.button.is-success.is-inverted.is-outlined{background-color:transparent;border-color:#fff;color:#fff}.button.is-success.is-inverted.is-outlined.is-focused,.button.is-success.is-inverted.is-outlined.is-hovered,.button.is-success.is-inverted.is-outlined:focus,.button.is-success.is-inverted.is-outlined:hover{background-color:#fff;color:#48c774}.button.is-success.is-inverted.is-outlined.is-loading.is-focused::after,.button.is-success.is-inverted.is-outlined.is-loading.is-hovered::after,.button.is-success.is-inverted.is-outlined.is-loading:focus::after,.button.is-success.is-inverted.is-outlined.is-loading:hover::after{border-color:transparent transparent #48c774 #48c774!important}.button.is-success.is-inverted.is-outlined[disabled],fieldset[disabled] .button.is-success.is-inverted.is-outlined{background-color:transparent;border-color:#fff;box-shadow:none;color:#fff}.button.is-success.is-light{background-color:#effaf3;color:#257942}.button.is-success.is-light.is-hovered,.button.is-success.is-light:hover{background-color:#e6f7ec;border-color:transparent;color:#257942}.button.is-success.is-light.is-active,.button.is-success.is-light:active{background-color:#dcf4e4;border-color:transparent;color:#257942}.button.is-warning{background-color:#ffdd57;border-color:transparent;color:rgba(0,0,0,.7)}.button.is-warning.is-hovered,.button.is-warning:hover{background-color:#ffdb4a;border-color:transparent;color:rgba(0,0,0,.7)}.button.is-warning.is-focused,.button.is-warning:focus{border-color:transparent;color:rgba(0,0,0,.7)}.button.is-warning.is-focused:not(:active),.button.is-warning:focus:not(:active){box-shadow:0 0 0 .125em rgba(255,221,87,.25)}.button.is-warning.is-active,.button.is-warning:active{background-color:#ffd83d;border-color:transparent;color:rgba(0,0,0,.7)}.button.is-warning[disabled],fieldset[disabled] .button.is-warning{background-color:#ffdd57;border-color:transparent;box-shadow:none}.button.is-warning.is-inverted{background-color:rgba(0,0,0,.7);color:#ffdd57}.button.is-warning.is-inverted.is-hovered,.button.is-warning.is-inverted:hover{background-color:rgba(0,0,0,.7)}.button.is-warning.is-inverted[disabled],fieldset[disabled] .button.is-warning.is-inverted{background-color:rgba(0,0,0,.7);border-color:transparent;box-shadow:none;color:#ffdd57}.button.is-warning.is-loading::after{border-color:transparent transparent rgba(0,0,0,.7) rgba(0,0,0,.7)!important}.button.is-warning.is-outlined{background-color:transparent;border-color:#ffdd57;color:#ffdd57}.button.is-warning.is-outlined.is-focused,.button.is-warning.is-outlined.is-hovered,.button.is-warning.is-outlined:focus,.button.is-warning.is-outlined:hover{background-color:#ffdd57;border-color:#ffdd57;color:rgba(0,0,0,.7)}.button.is-warning.is-outlined.is-loading::after{border-color:transparent transparent #ffdd57 #ffdd57!important}.button.is-warning.is-outlined.is-loading.is-focused::after,.button.is-warning.is-outlined.is-loading.is-hovered::after,.button.is-warning.is-outlined.is-loading:focus::after,.button.is-warning.is-outlined.is-loading:hover::after{border-color:transparent transparent rgba(0,0,0,.7) rgba(0,0,0,.7)!important}.button.is-warning.is-outlined[disabled],fieldset[disabled] .button.is-warning.is-outlined{background-color:transparent;border-color:#ffdd57;box-shadow:none;color:#ffdd57}.button.is-warning.is-inverted.is-outlined{background-color:transparent;border-color:rgba(0,0,0,.7);color:rgba(0,0,0,.7)}.button.is-warning.is-inverted.is-outlined.is-focused,.button.is-warning.is-inverted.is-outlined.is-hovered,.button.is-warning.is-inverted.is-outlined:focus,.button.is-warning.is-inverted.is-outlined:hover{background-color:rgba(0,0,0,.7);color:#ffdd57}.button.is-warning.is-inverted.is-outlined.is-loading.is-focused::after,.button.is-warning.is-inverted.is-outlined.is-loading.is-hovered::after,.button.is-warning.is-inverted.is-outlined.is-loading:focus::after,.button.is-warning.is-inverted.is-outlined.is-loading:hover::after{border-color:transparent transparent #ffdd57 #ffdd57!important}.button.is-warning.is-inverted.is-outlined[disabled],fieldset[disabled] .button.is-warning.is-inverted.is-outlined{background-color:transparent;border-color:rgba(0,0,0,.7);box-shadow:none;color:rgba(0,0,0,.7)}.button.is-warning.is-light{background-color:#fffbeb;color:#947600}.button.is-warning.is-light.is-hovered,.button.is-warning.is-light:hover{background-color:#fff8de;border-color:transparent;color:#947600}.button.is-warning.is-light.is-active,.button.is-warning.is-light:active{background-color:#fff6d1;border-color:transparent;color:#947600}.button.is-danger{background-color:#f14668;border-color:transparent;color:#fff}.button.is-danger.is-hovered,.button.is-danger:hover{background-color:#f03a5f;border-color:transparent;color:#fff}.button.is-danger.is-focused,.button.is-danger:focus{border-color:transparent;color:#fff}.button.is-danger.is-focused:not(:active),.button.is-danger:focus:not(:active){box-shadow:0 0 0 .125em rgba(241,70,104,.25)}.button.is-danger.is-active,.button.is-danger:active{background-color:#ef2e55;border-color:transparent;color:#fff}.button.is-danger[disabled],fieldset[disabled] .button.is-danger{background-color:#f14668;border-color:transparent;box-shadow:none}.button.is-danger.is-inverted{background-color:#fff;color:#f14668}.button.is-danger.is-inverted.is-hovered,.button.is-danger.is-inverted:hover{background-color:#f2f2f2}.button.is-danger.is-inverted[disabled],fieldset[disabled] .button.is-danger.is-inverted{background-color:#fff;border-color:transparent;box-shadow:none;color:#f14668}.button.is-danger.is-loading::after{border-color:transparent transparent #fff #fff!important}.button.is-danger.is-outlined{background-color:transparent;border-color:#f14668;color:#f14668}.button.is-danger.is-outlined.is-focused,.button.is-danger.is-outlined.is-hovered,.button.is-danger.is-outlined:focus,.button.is-danger.is-outlined:hover{background-color:#f14668;border-color:#f14668;color:#fff}.button.is-danger.is-outlined.is-loading::after{border-color:transparent transparent #f14668 #f14668!important}.button.is-danger.is-outlined.is-loading.is-focused::after,.button.is-danger.is-outlined.is-loading.is-hovered::after,.button.is-danger.is-outlined.is-loading:focus::after,.button.is-danger.is-outlined.is-loading:hover::after{border-color:transparent transparent #fff #fff!important}.button.is-danger.is-outlined[disabled],fieldset[disabled] .button.is-danger.is-outlined{background-color:transparent;border-color:#f14668;box-shadow:none;color:#f14668}.button.is-danger.is-inverted.is-outlined{background-color:transparent;border-color:#fff;color:#fff}.button.is-danger.is-inverted.is-outlined.is-focused,.button.is-danger.is-inverted.is-outlined.is-hovered,.button.is-danger.is-inverted.is-outlined:focus,.button.is-danger.is-inverted.is-outlined:hover{background-color:#fff;color:#f14668}.button.is-danger.is-inverted.is-outlined.is-loading.is-focused::after,.button.is-danger.is-inverted.is-outlined.is-loading.is-hovered::after,.button.is-danger.is-inverted.is-outlined.is-loading:focus::after,.button.is-danger.is-inverted.is-outlined.is-loading:hover::after{border-color:transparent transparent #f14668 #f14668!important}.button.is-danger.is-inverted.is-outlined[disabled],fieldset[disabled] .button.is-danger.is-inverted.is-outlined{background-color:transparent;border-color:#fff;box-shadow:none;color:#fff}.button.is-danger.is-light{background-color:#feecf0;color:#cc0f35}.button.is-danger.is-light.is-hovered,.button.is-danger.is-light:hover{background-color:#fde0e6;border-color:transparent;color:#cc0f35}.button.is-danger.is-light.is-active,.button.is-danger.is-light:active{background-color:#fcd4dc;border-color:transparent;color:#cc0f35}.button.is-small{font-size:.75rem}.button.is-small:not(.is-rounded){border-radius:2px}.button.is-normal{font-size:1rem}.button.is-medium{font-size:1.25rem}.button.is-large{font-size:1.5rem}.button[disabled],fieldset[disabled] .button{background-color:#fff;border-color:#dbdbdb;box-shadow:none;opacity:.5}.button.is-fullwidth{display:flex;width:100%}.button.is-loading{color:transparent!important;pointer-events:none}.button.is-loading::after{position:absolute;left:calc(50% - (1em / 2));top:calc(50% - (1em / 2));position:absolute!important}.button.is-static{background-color:#f5f5f5;border-color:#dbdbdb;color:#7a7a7a;box-shadow:none;pointer-events:none}.button.is-rounded{border-radius:290486px;padding-left:calc(1em + .25em);padding-right:calc(1em + .25em)}.buttons{align-items:center;display:flex;flex-wrap:wrap;justify-content:flex-start}.buttons .button{margin-bottom:.5rem}.buttons .button:not(:last-child):not(.is-fullwidth){margin-right:.5rem}.buttons:last-child{margin-bottom:-.5rem}.buttons:not(:last-child){margin-bottom:1rem}.buttons.are-small .button:not(.is-normal):not(.is-medium):not(.is-large){font-size:.75rem}.buttons.are-small .button:not(.is-normal):not(.is-medium):not(.is-large):not(.is-rounded){border-radius:2px}.buttons.are-medium .button:not(.is-small):not(.is-normal):not(.is-large){font-size:1.25rem}.buttons.are-large .button:not(.is-small):not(.is-normal):not(.is-medium){font-size:1.5rem}.buttons.has-addons .button:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.buttons.has-addons .button:not(:last-child){border-bottom-right-radius:0;border-top-right-radius:0;margin-right:-1px}.buttons.has-addons .button:last-child{margin-right:0}.buttons.has-addons .button.is-hovered,.buttons.has-addons .button:hover{z-index:2}.buttons.has-addons .button.is-active,.buttons.has-addons .button.is-focused,.buttons.has-addons .button.is-selected,.buttons.has-addons .button:active,.buttons.has-addons .button:focus{z-index:3}.buttons.has-addons .button.is-active:hover,.buttons.has-addons .button.is-focused:hover,.buttons.has-addons .button.is-selected:hover,.buttons.has-addons .button:active:hover,.buttons.has-addons .button:focus:hover{z-index:4}.buttons.has-addons .button.is-expanded{flex-grow:1;flex-shrink:1}.buttons.is-centered{justify-content:center}.buttons.is-centered:not(.has-addons) .button:not(.is-fullwidth){margin-left:.25rem;margin-right:.25rem}.buttons.is-right{justify-content:flex-end}.buttons.is-right:not(.has-addons) .button:not(.is-fullwidth){margin-left:.25rem;margin-right:.25rem}.container{flex-grow:1;margin:0 auto;position:relative;width:auto}.container.is-fluid{max-width:none!important;padding-left:32px;padding-right:32px;width:100%}@media screen and (min-width:1024px){.container{max-width:960px}}@media screen and (max-width:1215px){.container.is-widescreen:not(.is-max-desktop){max-width:1152px}}@media screen and (max-width:1407px){.container.is-fullhd:not(.is-max-desktop):not(.is-max-widescreen){max-width:1344px}}@media screen and (min-width:1216px){.container:not(.is-max-desktop){max-width:1152px}}@media screen and (min-width:1408px){.container:not(.is-max-desktop):not(.is-max-widescreen){max-width:1344px}}.content li+li{margin-top:.25em}.content blockquote:not(:last-child),.content dl:not(:last-child),.content ol:not(:last-child),.content p:not(:last-child),.content pre:not(:last-child),.content table:not(:last-child),.content ul:not(:last-child){margin-bottom:1em}.content h1,.content h2,.content h3,.content h4,.content h5,.content h6{color:#363636;font-weight:600;line-height:1.125}.content h1{font-size:2em;margin-bottom:.5em}.content h1:not(:first-child){margin-top:1em}.content h2{font-size:1.75em;margin-bottom:.5714em}.content h2:not(:first-child){margin-top:1.1428em}.content h3{font-size:1.5em;margin-bottom:.6666em}.content h3:not(:first-child){margin-top:1.3333em}.content h4{font-size:1.25em;margin-bottom:.8em}.content h5{font-size:1.125em;margin-bottom:.8888em}.content h6{font-size:1em;margin-bottom:1em}.content blockquote{background-color:#f5f5f5;border-left:5px solid #dbdbdb;padding:1.25em 1.5em}.content ol{list-style-position:outside;margin-left:2em;margin-top:1em}.content ol:not([type]){list-style-type:decimal}.content ol:not([type]).is-lower-alpha{list-style-type:lower-alpha}.content ol:not([type]).is-lower-roman{list-style-type:lower-roman}.content ol:not([type]).is-upper-alpha{list-style-type:upper-alpha}.content ol:not([type]).is-upper-roman{list-style-type:upper-roman}.content ul{list-style:disc outside;margin-left:2em;margin-top:1em}.content ul ul{list-style-type:circle;margin-top:.5em}.content ul ul ul{list-style-type:square}.content dd{margin-left:2em}.content figure{margin-left:2em;margin-right:2em;text-align:center}.content figure:not(:first-child){margin-top:2em}.content figure:not(:last-child){margin-bottom:2em}.content figure img{display:inline-block}.content figure figcaption{font-style:italic}.content pre{-webkit-overflow-scrolling:touch;overflow-x:auto;padding:1.25em 1.5em;white-space:pre;word-wrap:normal}.content sub,.content sup{font-size:75%}.content table{width:100%}.content table td,.content table th{border:1px solid #dbdbdb;border-width:0 0 1px;padding:.5em .75em;vertical-align:top}.content table th{color:#363636}.content table th:not([align]){text-align:inherit}.content table thead td,.content table thead th{border-width:0 0 2px;color:#363636}.content table tfoot td,.content table tfoot th{border-width:2px 0 0;color:#363636}.content table tbody tr:last-child td,.content table tbody tr:last-child th{border-bottom-width:0}.content .tabs li+li{margin-top:0}.content.is-small{font-size:.75rem}.content.is-medium{font-size:1.25rem}.content.is-large{font-size:1.5rem}.icon{align-items:center;display:inline-flex;justify-content:center;height:1.5rem;width:1.5rem}.icon.is-small{height:1rem;width:1rem}.icon.is-medium{height:2rem;width:2rem}.icon.is-large{height:3rem;width:3rem}.icon-text{align-items:flex-start;color:inherit;display:inline-flex;flex-wrap:wrap;line-height:1.5rem;vertical-align:top}.icon-text .icon{flex-grow:0;flex-shrink:0}.icon-text .icon:not(:last-child){margin-right:.25em}.icon-text .icon:not(:first-child){margin-left:.25em}div.icon-text{display:flex}.image{display:block;position:relative}.image img{display:block;height:auto;width:100%}.image img.is-rounded{border-radius:290486px}.image.is-fullwidth{width:100%}.image.is-16by9 .has-ratio,.image.is-16by9 img,.image.is-1by1 .has-ratio,.image.is-1by1 img,.image.is-1by2 .has-ratio,.image.is-1by2 img,.image.is-1by3 .has-ratio,.image.is-1by3 img,.image.is-2by1 .has-ratio,.image.is-2by1 img,.image.is-2by3 .has-ratio,.image.is-2by3 img,.image.is-3by1 .has-ratio,.image.is-3by1 img,.image.is-3by2 .has-ratio,.image.is-3by2 img,.image.is-3by4 .has-ratio,.image.is-3by4 img,.image.is-3by5 .has-ratio,.image.is-3by5 img,.image.is-4by3 .has-ratio,.image.is-4by3 img,.image.is-4by5 .has-ratio,.image.is-4by5 img,.image.is-5by3 .has-ratio,.image.is-5by3 img,.image.is-5by4 .has-ratio,.image.is-5by4 img,.image.is-9by16 .has-ratio,.image.is-9by16 img,.image.is-square .has-ratio,.image.is-square img{height:100%;width:100%}.image.is-1by1,.image.is-square{padding-top:100%}.image.is-5by4{padding-top:80%}.image.is-4by3{padding-top:75%}.image.is-3by2{padding-top:66.6666%}.image.is-5by3{padding-top:60%}.image.is-16by9{padding-top:56.25%}.image.is-2by1{padding-top:50%}.image.is-3by1{padding-top:33.3333%}.image.is-4by5{padding-top:125%}.image.is-3by4{padding-top:133.3333%}.image.is-2by3{padding-top:150%}.image.is-3by5{padding-top:166.6666%}.image.is-9by16{padding-top:177.7777%}.image.is-1by2{padding-top:200%}.image.is-1by3{padding-top:300%}.image.is-16x16{height:16px;width:16px}.image.is-24x24{height:24px;width:24px}.image.is-32x32{height:32px;width:32px}.image.is-48x48{height:48px;width:48px}.image.is-64x64{height:64px;width:64px}.image.is-96x96{height:96px;width:96px}.image.is-128x128{height:128px;width:128px}.notification{background-color:#f5f5f5;border-radius:4px;position:relative;padding:1.25rem 2.5rem 1.25rem 1.5rem}.notification a:not(.button):not(.dropdown-item){color:currentColor;text-decoration:underline}.notification strong{color:currentColor}.notification code,.notification pre{background:#fff}.notification pre code{background:0 0}.notification>.delete{right:.5rem;position:absolute;top:.5rem}.notification .content,.notification .subtitle,.notification .title{color:currentColor}.notification.is-white{background-color:#fff;color:#0a0a0a}.notification.is-black{background-color:#0a0a0a;color:#fff}.notification.is-light{background-color:#f5f5f5;color:rgba(0,0,0,.7)}.notification.is-dark{background-color:#363636;color:#fff}.notification.is-primary{background-color:#00d1b2;color:#fff}.notification.is-primary.is-light{background-color:#ebfffc;color:#00947e}.notification.is-link{background-color:#3273dc;color:#fff}.notification.is-link.is-light{background-color:#eef3fc;color:#2160c4}.notification.is-info{background-color:#3298dc;color:#fff}.notification.is-info.is-light{background-color:#eef6fc;color:#1d72aa}.notification.is-success{background-color:#48c774;color:#fff}.notification.is-success.is-light{background-color:#effaf3;color:#257942}.notification.is-warning{background-color:#ffdd57;color:rgba(0,0,0,.7)}.notification.is-warning.is-light{background-color:#fffbeb;color:#947600}.notification.is-danger{background-color:#f14668;color:#fff}.notification.is-danger.is-light{background-color:#feecf0;color:#cc0f35}.progress{-moz-appearance:none;-webkit-appearance:none;border:none;border-radius:290486px;display:block;height:1rem;overflow:hidden;padding:0;width:100%}.progress::-webkit-progress-bar{background-color:#ededed}.progress::-webkit-progress-value{background-color:#4a4a4a}.progress::-moz-progress-bar{background-color:#4a4a4a}.progress::-ms-fill{background-color:#4a4a4a;border:none}.progress.is-white::-webkit-progress-value{background-color:#fff}.progress.is-white::-moz-progress-bar{background-color:#fff}.progress.is-white::-ms-fill{background-color:#fff}.progress.is-white:indeterminate{background-image:linear-gradient(to right,#fff 30%,#ededed 30%)}.progress.is-black::-webkit-progress-value{background-color:#0a0a0a}.progress.is-black::-moz-progress-bar{background-color:#0a0a0a}.progress.is-black::-ms-fill{background-color:#0a0a0a}.progress.is-black:indeterminate{background-image:linear-gradient(to right,#0a0a0a 30%,#ededed 30%)}.progress.is-light::-webkit-progress-value{background-color:#f5f5f5}.progress.is-light::-moz-progress-bar{background-color:#f5f5f5}.progress.is-light::-ms-fill{background-color:#f5f5f5}.progress.is-light:indeterminate{background-image:linear-gradient(to right,#f5f5f5 30%,#ededed 30%)}.progress.is-dark::-webkit-progress-value{background-color:#363636}.progress.is-dark::-moz-progress-bar{background-color:#363636}.progress.is-dark::-ms-fill{background-color:#363636}.progress.is-dark:indeterminate{background-image:linear-gradient(to right,#363636 30%,#ededed 30%)}.progress.is-primary::-webkit-progress-value{background-color:#00d1b2}.progress.is-primary::-moz-progress-bar{background-color:#00d1b2}.progress.is-primary::-ms-fill{background-color:#00d1b2}.progress.is-primary:indeterminate{background-image:linear-gradient(to right,#00d1b2 30%,#ededed 30%)}.progress.is-link::-webkit-progress-value{background-color:#3273dc}.progress.is-link::-moz-progress-bar{background-color:#3273dc}.progress.is-link::-ms-fill{background-color:#3273dc}.progress.is-link:indeterminate{background-image:linear-gradient(to right,#3273dc 30%,#ededed 30%)}.progress.is-info::-webkit-progress-value{background-color:#3298dc}.progress.is-info::-moz-progress-bar{background-color:#3298dc}.progress.is-info::-ms-fill{background-color:#3298dc}.progress.is-info:indeterminate{background-image:linear-gradient(to right,#3298dc 30%,#ededed 30%)}.progress.is-success::-webkit-progress-value{background-color:#48c774}.progress.is-success::-moz-progress-bar{background-color:#48c774}.progress.is-success::-ms-fill{background-color:#48c774}.progress.is-success:indeterminate{background-image:linear-gradient(to right,#48c774 30%,#ededed 30%)}.progress.is-warning::-webkit-progress-value{background-color:#ffdd57}.progress.is-warning::-moz-progress-bar{background-color:#ffdd57}.progress.is-warning::-ms-fill{background-color:#ffdd57}.progress.is-warning:indeterminate{background-image:linear-gradient(to right,#ffdd57 30%,#ededed 30%)}.progress.is-danger::-webkit-progress-value{background-color:#f14668}.progress.is-danger::-moz-progress-bar{background-color:#f14668}.progress.is-danger::-ms-fill{background-color:#f14668}.progress.is-danger:indeterminate{background-image:linear-gradient(to right,#f14668 30%,#ededed 30%)}.progress:indeterminate{-webkit-animation-duration:1.5s;animation-duration:1.5s;-webkit-animation-iteration-count:infinite;animation-iteration-count:infinite;-webkit-animation-name:moveIndeterminate;animation-name:moveIndeterminate;-webkit-animation-timing-function:linear;animation-timing-function:linear;background-color:#ededed;background-image:linear-gradient(to right,#4a4a4a 30%,#ededed 30%);background-position:top left;background-repeat:no-repeat;background-size:150% 150%}.progress:indeterminate::-webkit-progress-bar{background-color:transparent}.progress:indeterminate::-moz-progress-bar{background-color:transparent}.progress:indeterminate::-ms-fill{animation-name:none}.progress.is-small{height:.75rem}.progress.is-medium{height:1.25rem}.progress.is-large{height:1.5rem}@-webkit-keyframes moveIndeterminate{from{background-position:200% 0}to{background-position:-200% 0}}@keyframes moveIndeterminate{from{background-position:200% 0}to{background-position:-200% 0}}.table{background-color:#fff;color:#363636}.table td,.table th{border:1px solid #dbdbdb;border-width:0 0 1px;padding:.5em .75em;vertical-align:top}.table td.is-white,.table th.is-white{background-color:#fff;border-color:#fff;color:#0a0a0a}.table td.is-black,.table th.is-black{background-color:#0a0a0a;border-color:#0a0a0a;color:#fff}.table td.is-light,.table th.is-light{background-color:#f5f5f5;border-color:#f5f5f5;color:rgba(0,0,0,.7)}.table td.is-dark,.table th.is-dark{background-color:#363636;border-color:#363636;color:#fff}.table td.is-primary,.table th.is-primary{background-color:#00d1b2;border-color:#00d1b2;color:#fff}.table td.is-link,.table th.is-link{background-color:#3273dc;border-color:#3273dc;color:#fff}.table td.is-info,.table th.is-info{background-color:#3298dc;border-color:#3298dc;color:#fff}.table td.is-success,.table th.is-success{background-color:#48c774;border-color:#48c774;color:#fff}.table td.is-warning,.table th.is-warning{background-color:#ffdd57;border-color:#ffdd57;color:rgba(0,0,0,.7)}.table td.is-danger,.table th.is-danger{background-color:#f14668;border-color:#f14668;color:#fff}.table td.is-narrow,.table th.is-narrow{white-space:nowrap;width:1%}.table td.is-selected,.table th.is-selected{background-color:#00d1b2;color:#fff}.table td.is-selected a,.table td.is-selected strong,.table th.is-selected a,.table th.is-selected strong{color:currentColor}.table td.is-vcentered,.table th.is-vcentered{vertical-align:middle}.table th{color:#363636}.table th:not([align]){text-align:inherit}.table tr.is-selected{background-color:#00d1b2;color:#fff}.table tr.is-selected a,.table tr.is-selected strong{color:currentColor}.table tr.is-selected td,.table tr.is-selected th{border-color:#fff;color:currentColor}.table thead{background-color:transparent}.table thead td,.table thead th{border-width:0 0 2px;color:#363636}.table tfoot{background-color:transparent}.table tfoot td,.table tfoot th{border-width:2px 0 0;color:#363636}.table tbody{background-color:transparent}.table tbody tr:last-child td,.table tbody tr:last-child th{border-bottom-width:0}.table.is-bordered td,.table.is-bordered th{border-width:1px}.table.is-bordered tr:last-child td,.table.is-bordered tr:last-child th{border-bottom-width:1px}.table.is-fullwidth{width:100%}.table.is-hoverable tbody tr:not(.is-selected):hover{background-color:#fafafa}.table.is-hoverable.is-striped tbody tr:not(.is-selected):hover{background-color:#fafafa}.table.is-hoverable.is-striped tbody tr:not(.is-selected):hover:nth-child(even){background-color:#f5f5f5}.table.is-narrow td,.table.is-narrow th{padding:.25em .5em}.table.is-striped tbody tr:not(.is-selected):nth-child(even){background-color:#fafafa}.table-container{-webkit-overflow-scrolling:touch;overflow:auto;overflow-y:hidden;max-width:100%}.tags{align-items:center;display:flex;flex-wrap:wrap;justify-content:flex-start}.tags .tag{margin-bottom:.5rem}.tags .tag:not(:last-child){margin-right:.5rem}.tags:last-child{margin-bottom:-.5rem}.tags:not(:last-child){margin-bottom:1rem}.tags.are-medium .tag:not(.is-normal):not(.is-large){font-size:1rem}.tags.are-large .tag:not(.is-normal):not(.is-medium){font-size:1.25rem}.tags.is-centered{justify-content:center}.tags.is-centered .tag{margin-right:.25rem;margin-left:.25rem}.tags.is-right{justify-content:flex-end}.tags.is-right .tag:not(:first-child){margin-left:.5rem}.tags.is-right .tag:not(:last-child){margin-right:0}.tags.has-addons .tag{margin-right:0}.tags.has-addons .tag:not(:first-child){margin-left:0;border-top-left-radius:0;border-bottom-left-radius:0}.tags.has-addons .tag:not(:last-child){border-top-right-radius:0;border-bottom-right-radius:0}.tag:not(body){align-items:center;background-color:#f5f5f5;border-radius:4px;color:#4a4a4a;display:inline-flex;font-size:.75rem;height:2em;justify-content:center;line-height:1.5;padding-left:.75em;padding-right:.75em;white-space:nowrap}.tag:not(body) .delete{margin-left:.25rem;margin-right:-.375rem}.tag:not(body).is-white{background-color:#fff;color:#0a0a0a}.tag:not(body).is-black{background-color:#0a0a0a;color:#fff}.tag:not(body).is-light{background-color:#f5f5f5;color:rgba(0,0,0,.7)}.tag:not(body).is-dark{background-color:#363636;color:#fff}.tag:not(body).is-primary{background-color:#00d1b2;color:#fff}.tag:not(body).is-primary.is-light{background-color:#ebfffc;color:#00947e}.tag:not(body).is-link{background-color:#3273dc;color:#fff}.tag:not(body).is-link.is-light{background-color:#eef3fc;color:#2160c4}.tag:not(body).is-info{background-color:#3298dc;color:#fff}.tag:not(body).is-info.is-light{background-color:#eef6fc;color:#1d72aa}.tag:not(body).is-success{background-color:#48c774;color:#fff}.tag:not(body).is-success.is-light{background-color:#effaf3;color:#257942}.tag:not(body).is-warning{background-color:#ffdd57;color:rgba(0,0,0,.7)}.tag:not(body).is-warning.is-light{background-color:#fffbeb;color:#947600}.tag:not(body).is-danger{background-color:#f14668;color:#fff}.tag:not(body).is-danger.is-light{background-color:#feecf0;color:#cc0f35}.tag:not(body).is-normal{font-size:.75rem}.tag:not(body).is-medium{font-size:1rem}.tag:not(body).is-large{font-size:1.25rem}.tag:not(body) .icon:first-child:not(:last-child){margin-left:-.375em;margin-right:.1875em}.tag:not(body) .icon:last-child:not(:first-child){margin-left:.1875em;margin-right:-.375em}.tag:not(body) .icon:first-child:last-child{margin-left:-.375em;margin-right:-.375em}.tag:not(body).is-delete{margin-left:1px;padding:0;position:relative;width:2em}.tag:not(body).is-delete::after,.tag:not(body).is-delete::before{background-color:currentColor;content:"";display:block;left:50%;position:absolute;top:50%;transform:translateX(-50%) translateY(-50%) rotate(45deg);transform-origin:center center}.tag:not(body).is-delete::before{height:1px;width:50%}.tag:not(body).is-delete::after{height:50%;width:1px}.tag:not(body).is-delete:focus,.tag:not(body).is-delete:hover{background-color:#e8e8e8}.tag:not(body).is-delete:active{background-color:#dbdbdb}.tag:not(body).is-rounded{border-radius:290486px}a.tag:hover{text-decoration:underline}.subtitle,.title{word-break:break-word}.subtitle em,.subtitle span,.title em,.title span{font-weight:inherit}.subtitle sub,.title sub{font-size:.75em}.subtitle sup,.title sup{font-size:.75em}.subtitle .tag,.title .tag{vertical-align:middle}.title{color:#363636;font-size:2rem;font-weight:600;line-height:1.125}.title strong{color:inherit;font-weight:inherit}.title+.highlight{margin-top:-.75rem}.title:not(.is-spaced)+.subtitle{margin-top:-1.25rem}.title.is-1{font-size:3rem}.title.is-2{font-size:2.5rem}.title.is-3{font-size:2rem}.title.is-4{font-size:1.5rem}.title.is-5{font-size:1.25rem}.title.is-6{font-size:1rem}.title.is-7{font-size:.75rem}.subtitle{color:#4a4a4a;font-size:1.25rem;font-weight:400;line-height:1.25}.subtitle strong{color:#363636;font-weight:600}.subtitle:not(.is-spaced)+.title{margin-top:-1.25rem}.subtitle.is-1{font-size:3rem}.subtitle.is-2{font-size:2.5rem}.subtitle.is-3{font-size:2rem}.subtitle.is-4{font-size:1.5rem}.subtitle.is-5{font-size:1.25rem}.subtitle.is-6{font-size:1rem}.subtitle.is-7{font-size:.75rem}.heading{display:block;font-size:11px;letter-spacing:1px;margin-bottom:5px;text-transform:uppercase}.highlight{font-weight:400;max-width:100%;overflow:hidden;padding:0}.highlight pre{overflow:auto;max-width:100%}.number{align-items:center;background-color:#f5f5f5;border-radius:290486px;display:inline-flex;font-size:1.25rem;height:2em;justify-content:center;margin-right:1.5rem;min-width:2.5em;padding:.25rem .5rem;text-align:center;vertical-align:top}.input,.select select,.textarea{background-color:#fff;border-color:#dbdbdb;border-radius:4px;color:#363636}.input::-moz-placeholder,.select select::-moz-placeholder,.textarea::-moz-placeholder{color:rgba(54,54,54,.3)}.input::-webkit-input-placeholder,.select select::-webkit-input-placeholder,.textarea::-webkit-input-placeholder{color:rgba(54,54,54,.3)}.input:-moz-placeholder,.select select:-moz-placeholder,.textarea:-moz-placeholder{color:rgba(54,54,54,.3)}.input:-ms-input-placeholder,.select select:-ms-input-placeholder,.textarea:-ms-input-placeholder{color:rgba(54,54,54,.3)}.input:hover,.is-hovered.input,.is-hovered.textarea,.select select.is-hovered,.select select:hover,.textarea:hover{border-color:#b5b5b5}.input:active,.input:focus,.is-active.input,.is-active.textarea,.is-focused.input,.is-focused.textarea,.select select.is-active,.select select.is-focused,.select select:active,.select select:focus,.textarea:active,.textarea:focus{border-color:#3273dc;box-shadow:0 0 0 .125em rgba(50,115,220,.25)}.input[disabled],.select fieldset[disabled] select,.select select[disabled],.textarea[disabled],fieldset[disabled] .input,fieldset[disabled] .select select,fieldset[disabled] .textarea{background-color:#f5f5f5;border-color:#f5f5f5;box-shadow:none;color:#7a7a7a}.input[disabled]::-moz-placeholder,.select fieldset[disabled] select::-moz-placeholder,.select select[disabled]::-moz-placeholder,.textarea[disabled]::-moz-placeholder,fieldset[disabled] .input::-moz-placeholder,fieldset[disabled] .select select::-moz-placeholder,fieldset[disabled] .textarea::-moz-placeholder{color:rgba(122,122,122,.3)}.input[disabled]::-webkit-input-placeholder,.select fieldset[disabled] select::-webkit-input-placeholder,.select select[disabled]::-webkit-input-placeholder,.textarea[disabled]::-webkit-input-placeholder,fieldset[disabled] .input::-webkit-input-placeholder,fieldset[disabled] .select select::-webkit-input-placeholder,fieldset[disabled] .textarea::-webkit-input-placeholder{color:rgba(122,122,122,.3)}.input[disabled]:-moz-placeholder,.select fieldset[disabled] select:-moz-placeholder,.select select[disabled]:-moz-placeholder,.textarea[disabled]:-moz-placeholder,fieldset[disabled] .input:-moz-placeholder,fieldset[disabled] .select select:-moz-placeholder,fieldset[disabled] .textarea:-moz-placeholder{color:rgba(122,122,122,.3)}.input[disabled]:-ms-input-placeholder,.select fieldset[disabled] select:-ms-input-placeholder,.select select[disabled]:-ms-input-placeholder,.textarea[disabled]:-ms-input-placeholder,fieldset[disabled] .input:-ms-input-placeholder,fieldset[disabled] .select select:-ms-input-placeholder,fieldset[disabled] .textarea:-ms-input-placeholder{color:rgba(122,122,122,.3)}.input,.textarea{box-shadow:inset 0 .0625em .125em rgba(10,10,10,.05);max-width:100%;width:100%}.input[readonly],.textarea[readonly]{box-shadow:none}.is-white.input,.is-white.textarea{border-color:#fff}.is-white.input:active,.is-white.input:focus,.is-white.is-active.input,.is-white.is-active.textarea,.is-white.is-focused.input,.is-white.is-focused.textarea,.is-white.textarea:active,.is-white.textarea:focus{box-shadow:0 0 0 .125em rgba(255,255,255,.25)}.is-black.input,.is-black.textarea{border-color:#0a0a0a}.is-black.input:active,.is-black.input:focus,.is-black.is-active.input,.is-black.is-active.textarea,.is-black.is-focused.input,.is-black.is-focused.textarea,.is-black.textarea:active,.is-black.textarea:focus{box-shadow:0 0 0 .125em rgba(10,10,10,.25)}.is-light.input,.is-light.textarea{border-color:#f5f5f5}.is-light.input:active,.is-light.input:focus,.is-light.is-active.input,.is-light.is-active.textarea,.is-light.is-focused.input,.is-light.is-focused.textarea,.is-light.textarea:active,.is-light.textarea:focus{box-shadow:0 0 0 .125em rgba(245,245,245,.25)}.is-dark.input,.is-dark.textarea{border-color:#363636}.is-dark.input:active,.is-dark.input:focus,.is-dark.is-active.input,.is-dark.is-active.textarea,.is-dark.is-focused.input,.is-dark.is-focused.textarea,.is-dark.textarea:active,.is-dark.textarea:focus{box-shadow:0 0 0 .125em rgba(54,54,54,.25)}.is-primary.input,.is-primary.textarea{border-color:#00d1b2}.is-primary.input:active,.is-primary.input:focus,.is-primary.is-active.input,.is-primary.is-active.textarea,.is-primary.is-focused.input,.is-primary.is-focused.textarea,.is-primary.textarea:active,.is-primary.textarea:focus{box-shadow:0 0 0 .125em rgba(0,209,178,.25)}.is-link.input,.is-link.textarea{border-color:#3273dc}.is-link.input:active,.is-link.input:focus,.is-link.is-active.input,.is-link.is-active.textarea,.is-link.is-focused.input,.is-link.is-focused.textarea,.is-link.textarea:active,.is-link.textarea:focus{box-shadow:0 0 0 .125em rgba(50,115,220,.25)}.is-info.input,.is-info.textarea{border-color:#3298dc}.is-info.input:active,.is-info.input:focus,.is-info.is-active.input,.is-info.is-active.textarea,.is-info.is-focused.input,.is-info.is-focused.textarea,.is-info.textarea:active,.is-info.textarea:focus{box-shadow:0 0 0 .125em rgba(50,152,220,.25)}.is-success.input,.is-success.textarea{border-color:#48c774}.is-success.input:active,.is-success.input:focus,.is-success.is-active.input,.is-success.is-active.textarea,.is-success.is-focused.input,.is-success.is-focused.textarea,.is-success.textarea:active,.is-success.textarea:focus{box-shadow:0 0 0 .125em rgba(72,199,116,.25)}.is-warning.input,.is-warning.textarea{border-color:#ffdd57}.is-warning.input:active,.is-warning.input:focus,.is-warning.is-active.input,.is-warning.is-active.textarea,.is-warning.is-focused.input,.is-warning.is-focused.textarea,.is-warning.textarea:active,.is-warning.textarea:focus{box-shadow:0 0 0 .125em rgba(255,221,87,.25)}.is-danger.input,.is-danger.textarea{border-color:#f14668}.is-danger.input:active,.is-danger.input:focus,.is-danger.is-active.input,.is-danger.is-active.textarea,.is-danger.is-focused.input,.is-danger.is-focused.textarea,.is-danger.textarea:active,.is-danger.textarea:focus{box-shadow:0 0 0 .125em rgba(241,70,104,.25)}.is-small.input,.is-small.textarea{border-radius:2px;font-size:.75rem}.is-medium.input,.is-medium.textarea{font-size:1.25rem}.is-large.input,.is-large.textarea{font-size:1.5rem}.is-fullwidth.input,.is-fullwidth.textarea{display:block;width:100%}.is-inline.input,.is-inline.textarea{display:inline;width:auto}.input.is-rounded{border-radius:290486px;padding-left:calc(calc(.75em - 1px) + .375em);padding-right:calc(calc(.75em - 1px) + .375em)}.input.is-static{background-color:transparent;border-color:transparent;box-shadow:none;padding-left:0;padding-right:0}.textarea{display:block;max-width:100%;min-width:100%;padding:calc(.75em - 1px);resize:vertical}.textarea:not([rows]){max-height:40em;min-height:8em}.textarea[rows]{height:initial}.textarea.has-fixed-size{resize:none}.checkbox,.radio{cursor:pointer;display:inline-block;line-height:1.25;position:relative}.checkbox input,.radio input{cursor:pointer}.checkbox:hover,.radio:hover{color:#363636}.checkbox input[disabled],.checkbox[disabled],.radio input[disabled],.radio[disabled],fieldset[disabled] .checkbox,fieldset[disabled] .radio{color:#7a7a7a;cursor:not-allowed}.radio+.radio{margin-left:.5em}.select{display:inline-block;max-width:100%;position:relative;vertical-align:top}.select:not(.is-multiple){height:2.5em}.select:not(.is-multiple):not(.is-loading)::after{border-color:#3273dc;right:1.125em;z-index:4}.select.is-rounded select{border-radius:290486px;padding-left:1em}.select select{cursor:pointer;display:block;font-size:1em;max-width:100%;outline:0}.select select::-ms-expand{display:none}.select select[disabled]:hover,fieldset[disabled] .select select:hover{border-color:#f5f5f5}.select select:not([multiple]){padding-right:2.5em}.select select[multiple]{height:auto;padding:0}.select select[multiple] option{padding:.5em 1em}.select:not(.is-multiple):not(.is-loading):hover::after{border-color:#363636}.select.is-white:not(:hover)::after{border-color:#fff}.select.is-white select{border-color:#fff}.select.is-white select.is-hovered,.select.is-white select:hover{border-color:#f2f2f2}.select.is-white select.is-active,.select.is-white select.is-focused,.select.is-white select:active,.select.is-white select:focus{box-shadow:0 0 0 .125em rgba(255,255,255,.25)}.select.is-black:not(:hover)::after{border-color:#0a0a0a}.select.is-black select{border-color:#0a0a0a}.select.is-black select.is-hovered,.select.is-black select:hover{border-color:#000}.select.is-black select.is-active,.select.is-black select.is-focused,.select.is-black select:active,.select.is-black select:focus{box-shadow:0 0 0 .125em rgba(10,10,10,.25)}.select.is-light:not(:hover)::after{border-color:#f5f5f5}.select.is-light select{border-color:#f5f5f5}.select.is-light select.is-hovered,.select.is-light select:hover{border-color:#e8e8e8}.select.is-light select.is-active,.select.is-light select.is-focused,.select.is-light select:active,.select.is-light select:focus{box-shadow:0 0 0 .125em rgba(245,245,245,.25)}.select.is-dark:not(:hover)::after{border-color:#363636}.select.is-dark select{border-color:#363636}.select.is-dark select.is-hovered,.select.is-dark select:hover{border-color:#292929}.select.is-dark select.is-active,.select.is-dark select.is-focused,.select.is-dark select:active,.select.is-dark select:focus{box-shadow:0 0 0 .125em rgba(54,54,54,.25)}.select.is-primary:not(:hover)::after{border-color:#00d1b2}.select.is-primary select{border-color:#00d1b2}.select.is-primary select.is-hovered,.select.is-primary select:hover{border-color:#00b89c}.select.is-primary select.is-active,.select.is-primary select.is-focused,.select.is-primary select:active,.select.is-primary select:focus{box-shadow:0 0 0 .125em rgba(0,209,178,.25)}.select.is-link:not(:hover)::after{border-color:#3273dc}.select.is-link select{border-color:#3273dc}.select.is-link select.is-hovered,.select.is-link select:hover{border-color:#2366d1}.select.is-link select.is-active,.select.is-link select.is-focused,.select.is-link select:active,.select.is-link select:focus{box-shadow:0 0 0 .125em rgba(50,115,220,.25)}.select.is-info:not(:hover)::after{border-color:#3298dc}.select.is-info select{border-color:#3298dc}.select.is-info select.is-hovered,.select.is-info select:hover{border-color:#238cd1}.select.is-info select.is-active,.select.is-info select.is-focused,.select.is-info select:active,.select.is-info select:focus{box-shadow:0 0 0 .125em rgba(50,152,220,.25)}.select.is-success:not(:hover)::after{border-color:#48c774}.select.is-success select{border-color:#48c774}.select.is-success select.is-hovered,.select.is-success select:hover{border-color:#3abb67}.select.is-success select.is-active,.select.is-success select.is-focused,.select.is-success select:active,.select.is-success select:focus{box-shadow:0 0 0 .125em rgba(72,199,116,.25)}.select.is-warning:not(:hover)::after{border-color:#ffdd57}.select.is-warning select{border-color:#ffdd57}.select.is-warning select.is-hovered,.select.is-warning select:hover{border-color:#ffd83d}.select.is-warning select.is-active,.select.is-warning select.is-focused,.select.is-warning select:active,.select.is-warning select:focus{box-shadow:0 0 0 .125em rgba(255,221,87,.25)}.select.is-danger:not(:hover)::after{border-color:#f14668}.select.is-danger select{border-color:#f14668}.select.is-danger select.is-hovered,.select.is-danger select:hover{border-color:#ef2e55}.select.is-danger select.is-active,.select.is-danger select.is-focused,.select.is-danger select:active,.select.is-danger select:focus{box-shadow:0 0 0 .125em rgba(241,70,104,.25)}.select.is-small{border-radius:2px;font-size:.75rem}.select.is-medium{font-size:1.25rem}.select.is-large{font-size:1.5rem}.select.is-disabled::after{border-color:#7a7a7a}.select.is-fullwidth{width:100%}.select.is-fullwidth select{width:100%}.select.is-loading::after{margin-top:0;position:absolute;right:.625em;top:.625em;transform:none}.select.is-loading.is-small:after{font-size:.75rem}.select.is-loading.is-medium:after{font-size:1.25rem}.select.is-loading.is-large:after{font-size:1.5rem}.file{align-items:stretch;display:flex;justify-content:flex-start;position:relative}.file.is-white .file-cta{background-color:#fff;border-color:transparent;color:#0a0a0a}.file.is-white.is-hovered .file-cta,.file.is-white:hover .file-cta{background-color:#f9f9f9;border-color:transparent;color:#0a0a0a}.file.is-white.is-focused .file-cta,.file.is-white:focus .file-cta{border-color:transparent;box-shadow:0 0 .5em rgba(255,255,255,.25);color:#0a0a0a}.file.is-white.is-active .file-cta,.file.is-white:active .file-cta{background-color:#f2f2f2;border-color:transparent;color:#0a0a0a}.file.is-black .file-cta{background-color:#0a0a0a;border-color:transparent;color:#fff}.file.is-black.is-hovered .file-cta,.file.is-black:hover .file-cta{background-color:#040404;border-color:transparent;color:#fff}.file.is-black.is-focused .file-cta,.file.is-black:focus .file-cta{border-color:transparent;box-shadow:0 0 .5em rgba(10,10,10,.25);color:#fff}.file.is-black.is-active .file-cta,.file.is-black:active .file-cta{background-color:#000;border-color:transparent;color:#fff}.file.is-light .file-cta{background-color:#f5f5f5;border-color:transparent;color:rgba(0,0,0,.7)}.file.is-light.is-hovered .file-cta,.file.is-light:hover .file-cta{background-color:#eee;border-color:transparent;color:rgba(0,0,0,.7)}.file.is-light.is-focused .file-cta,.file.is-light:focus .file-cta{border-color:transparent;box-shadow:0 0 .5em rgba(245,245,245,.25);color:rgba(0,0,0,.7)}.file.is-light.is-active .file-cta,.file.is-light:active .file-cta{background-color:#e8e8e8;border-color:transparent;color:rgba(0,0,0,.7)}.file.is-dark .file-cta{background-color:#363636;border-color:transparent;color:#fff}.file.is-dark.is-hovered .file-cta,.file.is-dark:hover .file-cta{background-color:#2f2f2f;border-color:transparent;color:#fff}.file.is-dark.is-focused .file-cta,.file.is-dark:focus .file-cta{border-color:transparent;box-shadow:0 0 .5em rgba(54,54,54,.25);color:#fff}.file.is-dark.is-active .file-cta,.file.is-dark:active .file-cta{background-color:#292929;border-color:transparent;color:#fff}.file.is-primary .file-cta{background-color:#00d1b2;border-color:transparent;color:#fff}.file.is-primary.is-hovered .file-cta,.file.is-primary:hover .file-cta{background-color:#00c4a7;border-color:transparent;color:#fff}.file.is-primary.is-focused .file-cta,.file.is-primary:focus .file-cta{border-color:transparent;box-shadow:0 0 .5em rgba(0,209,178,.25);color:#fff}.file.is-primary.is-active .file-cta,.file.is-primary:active .file-cta{background-color:#00b89c;border-color:transparent;color:#fff}.file.is-link .file-cta{background-color:#3273dc;border-color:transparent;color:#fff}.file.is-link.is-hovered .file-cta,.file.is-link:hover .file-cta{background-color:#276cda;border-color:transparent;color:#fff}.file.is-link.is-focused .file-cta,.file.is-link:focus .file-cta{border-color:transparent;box-shadow:0 0 .5em rgba(50,115,220,.25);color:#fff}.file.is-link.is-active .file-cta,.file.is-link:active .file-cta{background-color:#2366d1;border-color:transparent;color:#fff}.file.is-info .file-cta{background-color:#3298dc;border-color:transparent;color:#fff}.file.is-info.is-hovered .file-cta,.file.is-info:hover .file-cta{background-color:#2793da;border-color:transparent;color:#fff}.file.is-info.is-focused .file-cta,.file.is-info:focus .file-cta{border-color:transparent;box-shadow:0 0 .5em rgba(50,152,220,.25);color:#fff}.file.is-info.is-active .file-cta,.file.is-info:active .file-cta{background-color:#238cd1;border-color:transparent;color:#fff}.file.is-success .file-cta{background-color:#48c774;border-color:transparent;color:#fff}.file.is-success.is-hovered .file-cta,.file.is-success:hover .file-cta{background-color:#3ec46d;border-color:transparent;color:#fff}.file.is-success.is-focused .file-cta,.file.is-success:focus .file-cta{border-color:transparent;box-shadow:0 0 .5em rgba(72,199,116,.25);color:#fff}.file.is-success.is-active .file-cta,.file.is-success:active .file-cta{background-color:#3abb67;border-color:transparent;color:#fff}.file.is-warning .file-cta{background-color:#ffdd57;border-color:transparent;color:rgba(0,0,0,.7)}.file.is-warning.is-hovered .file-cta,.file.is-warning:hover .file-cta{background-color:#ffdb4a;border-color:transparent;color:rgba(0,0,0,.7)}.file.is-warning.is-focused .file-cta,.file.is-warning:focus .file-cta{border-color:transparent;box-shadow:0 0 .5em rgba(255,221,87,.25);color:rgba(0,0,0,.7)}.file.is-warning.is-active .file-cta,.file.is-warning:active .file-cta{background-color:#ffd83d;border-color:transparent;color:rgba(0,0,0,.7)}.file.is-danger .file-cta{background-color:#f14668;border-color:transparent;color:#fff}.file.is-danger.is-hovered .file-cta,.file.is-danger:hover .file-cta{background-color:#f03a5f;border-color:transparent;color:#fff}.file.is-danger.is-focused .file-cta,.file.is-danger:focus .file-cta{border-color:transparent;box-shadow:0 0 .5em rgba(241,70,104,.25);color:#fff}.file.is-danger.is-active .file-cta,.file.is-danger:active .file-cta{background-color:#ef2e55;border-color:transparent;color:#fff}.file.is-small{font-size:.75rem}.file.is-medium{font-size:1.25rem}.file.is-medium .file-icon .fa{font-size:21px}.file.is-large{font-size:1.5rem}.file.is-large .file-icon .fa{font-size:28px}.file.has-name .file-cta{border-bottom-right-radius:0;border-top-right-radius:0}.file.has-name .file-name{border-bottom-left-radius:0;border-top-left-radius:0}.file.has-name.is-empty .file-cta{border-radius:4px}.file.has-name.is-empty .file-name{display:none}.file.is-boxed .file-label{flex-direction:column}.file.is-boxed .file-cta{flex-direction:column;height:auto;padding:1em 3em}.file.is-boxed .file-name{border-width:0 1px 1px}.file.is-boxed .file-icon{height:1.5em;width:1.5em}.file.is-boxed .file-icon .fa{font-size:21px}.file.is-boxed.is-small .file-icon .fa{font-size:14px}.file.is-boxed.is-medium .file-icon .fa{font-size:28px}.file.is-boxed.is-large .file-icon .fa{font-size:35px}.file.is-boxed.has-name .file-cta{border-radius:4px 4px 0 0}.file.is-boxed.has-name .file-name{border-radius:0 0 4px 4px;border-width:0 1px 1px}.file.is-centered{justify-content:center}.file.is-fullwidth .file-label{width:100%}.file.is-fullwidth .file-name{flex-grow:1;max-width:none}.file.is-right{justify-content:flex-end}.file.is-right .file-cta{border-radius:0 4px 4px 0}.file.is-right .file-name{border-radius:4px 0 0 4px;border-width:1px 0 1px 1px;order:-1}.file-label{align-items:stretch;display:flex;cursor:pointer;justify-content:flex-start;overflow:hidden;position:relative}.file-label:hover .file-cta{background-color:#eee;color:#363636}.file-label:hover .file-name{border-color:#d5d5d5}.file-label:active .file-cta{background-color:#e8e8e8;color:#363636}.file-label:active .file-name{border-color:#cfcfcf}.file-input{height:100%;left:0;opacity:0;outline:0;position:absolute;top:0;width:100%}.file-cta,.file-name{border-color:#dbdbdb;border-radius:4px;font-size:1em;padding-left:1em;padding-right:1em;white-space:nowrap}.file-cta{background-color:#f5f5f5;color:#4a4a4a}.file-name{border-color:#dbdbdb;border-style:solid;border-width:1px 1px 1px 0;display:block;max-width:16em;overflow:hidden;text-align:inherit;text-overflow:ellipsis}.file-icon{align-items:center;display:flex;height:1em;justify-content:center;margin-right:.5em;width:1em}.file-icon .fa{font-size:14px}.label{color:#363636;display:block;font-size:1rem;font-weight:700}.label:not(:last-child){margin-bottom:.5em}.label.is-small{font-size:.75rem}.label.is-medium{font-size:1.25rem}.label.is-large{font-size:1.5rem}.help{display:block;font-size:.75rem;margin-top:.25rem}.help.is-white{color:#fff}.help.is-black{color:#0a0a0a}.help.is-light{color:#f5f5f5}.help.is-dark{color:#363636}.help.is-primary{color:#00d1b2}.help.is-link{color:#3273dc}.help.is-info{color:#3298dc}.help.is-success{color:#48c774}.help.is-warning{color:#ffdd57}.help.is-danger{color:#f14668}.field:not(:last-child){margin-bottom:.75rem}.field.has-addons{display:flex;justify-content:flex-start}.field.has-addons .control:not(:last-child){margin-right:-1px}.field.has-addons .control:not(:first-child):not(:last-child) .button,.field.has-addons .control:not(:first-child):not(:last-child) .input,.field.has-addons .control:not(:first-child):not(:last-child) .select select{border-radius:0}.field.has-addons .control:first-child:not(:only-child) .button,.field.has-addons .control:first-child:not(:only-child) .input,.field.has-addons .control:first-child:not(:only-child) .select select{border-bottom-right-radius:0;border-top-right-radius:0}.field.has-addons .control:last-child:not(:only-child) .button,.field.has-addons .control:last-child:not(:only-child) .input,.field.has-addons .control:last-child:not(:only-child) .select select{border-bottom-left-radius:0;border-top-left-radius:0}.field.has-addons .control .button:not([disabled]).is-hovered,.field.has-addons .control .button:not([disabled]):hover,.field.has-addons .control .input:not([disabled]).is-hovered,.field.has-addons .control .input:not([disabled]):hover,.field.has-addons .control .select select:not([disabled]).is-hovered,.field.has-addons .control .select select:not([disabled]):hover{z-index:2}.field.has-addons .control .button:not([disabled]).is-active,.field.has-addons .control .button:not([disabled]).is-focused,.field.has-addons .control .button:not([disabled]):active,.field.has-addons .control .button:not([disabled]):focus,.field.has-addons .control .input:not([disabled]).is-active,.field.has-addons .control .input:not([disabled]).is-focused,.field.has-addons .control .input:not([disabled]):active,.field.has-addons .control .input:not([disabled]):focus,.field.has-addons .control .select select:not([disabled]).is-active,.field.has-addons .control .select select:not([disabled]).is-focused,.field.has-addons .control .select select:not([disabled]):active,.field.has-addons .control .select select:not([disabled]):focus{z-index:3}.field.has-addons .control .button:not([disabled]).is-active:hover,.field.has-addons .control .button:not([disabled]).is-focused:hover,.field.has-addons .control .button:not([disabled]):active:hover,.field.has-addons .control .button:not([disabled]):focus:hover,.field.has-addons .control .input:not([disabled]).is-active:hover,.field.has-addons .control .input:not([disabled]).is-focused:hover,.field.has-addons .control .input:not([disabled]):active:hover,.field.has-addons .control .input:not([disabled]):focus:hover,.field.has-addons .control .select select:not([disabled]).is-active:hover,.field.has-addons .control .select select:not([disabled]).is-focused:hover,.field.has-addons .control .select select:not([disabled]):active:hover,.field.has-addons .control .select select:not([disabled]):focus:hover{z-index:4}.field.has-addons .control.is-expanded{flex-grow:1;flex-shrink:1}.field.has-addons.has-addons-centered{justify-content:center}.field.has-addons.has-addons-right{justify-content:flex-end}.field.has-addons.has-addons-fullwidth .control{flex-grow:1;flex-shrink:0}.field.is-grouped{display:flex;justify-content:flex-start}.field.is-grouped>.control{flex-shrink:0}.field.is-grouped>.control:not(:last-child){margin-bottom:0;margin-right:.75rem}.field.is-grouped>.control.is-expanded{flex-grow:1;flex-shrink:1}.field.is-grouped.is-grouped-centered{justify-content:center}.field.is-grouped.is-grouped-right{justify-content:flex-end}.field.is-grouped.is-grouped-multiline{flex-wrap:wrap}.field.is-grouped.is-grouped-multiline>.control:last-child,.field.is-grouped.is-grouped-multiline>.control:not(:last-child){margin-bottom:.75rem}.field.is-grouped.is-grouped-multiline:last-child{margin-bottom:-.75rem}.field.is-grouped.is-grouped-multiline:not(:last-child){margin-bottom:0}@media screen and (min-width:769px),print{.field.is-horizontal{display:flex}}.field-label .label{font-size:inherit}@media screen and (max-width:768px){.field-label{margin-bottom:.5rem}}@media screen and (min-width:769px),print{.field-label{flex-basis:0;flex-grow:1;flex-shrink:0;margin-right:1.5rem;text-align:right}.field-label.is-small{font-size:.75rem;padding-top:.375em}.field-label.is-normal{padding-top:.375em}.field-label.is-medium{font-size:1.25rem;padding-top:.375em}.field-label.is-large{font-size:1.5rem;padding-top:.375em}}.field-body .field .field{margin-bottom:0}@media screen and (min-width:769px),print{.field-body{display:flex;flex-basis:0;flex-grow:5;flex-shrink:1}.field-body .field{margin-bottom:0}.field-body>.field{flex-shrink:1}.field-body>.field:not(.is-narrow){flex-grow:1}.field-body>.field:not(:last-child){margin-right:.75rem}}.control{box-sizing:border-box;clear:both;font-size:1rem;position:relative;text-align:inherit}.control.has-icons-left .input:focus~.icon,.control.has-icons-left .select:focus~.icon,.control.has-icons-right .input:focus~.icon,.control.has-icons-right .select:focus~.icon{color:#4a4a4a}.control.has-icons-left .input.is-small~.icon,.control.has-icons-left .select.is-small~.icon,.control.has-icons-right .input.is-small~.icon,.control.has-icons-right .select.is-small~.icon{font-size:.75rem}.control.has-icons-left .input.is-medium~.icon,.control.has-icons-left .select.is-medium~.icon,.control.has-icons-right .input.is-medium~.icon,.control.has-icons-right .select.is-medium~.icon{font-size:1.25rem}.control.has-icons-left .input.is-large~.icon,.control.has-icons-left .select.is-large~.icon,.control.has-icons-right .input.is-large~.icon,.control.has-icons-right .select.is-large~.icon{font-size:1.5rem}.control.has-icons-left .icon,.control.has-icons-right .icon{color:#dbdbdb;height:2.5em;pointer-events:none;position:absolute;top:0;width:2.5em;z-index:4}.control.has-icons-left .input,.control.has-icons-left .select select{padding-left:2.5em}.control.has-icons-left .icon.is-left{left:0}.control.has-icons-right .input,.control.has-icons-right .select select{padding-right:2.5em}.control.has-icons-right .icon.is-right{right:0}.control.is-loading::after{position:absolute!important;right:.625em;top:.625em;z-index:4}.control.is-loading.is-small:after{font-size:.75rem}.control.is-loading.is-medium:after{font-size:1.25rem}.control.is-loading.is-large:after{font-size:1.5rem}.breadcrumb{font-size:1rem;white-space:nowrap}.breadcrumb a{align-items:center;color:#3273dc;display:flex;justify-content:center;padding:0 .75em}.breadcrumb a:hover{color:#363636}.breadcrumb li{align-items:center;display:flex}.breadcrumb li:first-child a{padding-left:0}.breadcrumb li.is-active a{color:#363636;cursor:default;pointer-events:none}.breadcrumb li+li::before{color:#b5b5b5;content:"\0002f"}.breadcrumb ol,.breadcrumb ul{align-items:flex-start;display:flex;flex-wrap:wrap;justify-content:flex-start}.breadcrumb .icon:first-child{margin-right:.5em}.breadcrumb .icon:last-child{margin-left:.5em}.breadcrumb.is-centered ol,.breadcrumb.is-centered ul{justify-content:center}.breadcrumb.is-right ol,.breadcrumb.is-right ul{justify-content:flex-end}.breadcrumb.is-small{font-size:.75rem}.breadcrumb.is-medium{font-size:1.25rem}.breadcrumb.is-large{font-size:1.5rem}.breadcrumb.has-arrow-separator li+li::before{content:"\02192"}.breadcrumb.has-bullet-separator li+li::before{content:"\02022"}.breadcrumb.has-dot-separator li+li::before{content:"\000b7"}.breadcrumb.has-succeeds-separator li+li::before{content:"\0227B"}.card{background-color:#fff;border-radius:.25rem;box-shadow:0 .5em 1em -.125em rgba(10,10,10,.1),0 0 0 1px rgba(10,10,10,.02);color:#4a4a4a;max-width:100%;position:relative}.card-content:first-child,.card-footer:first-child,.card-header:first-child{border-top-left-radius:.25rem;border-top-right-radius:.25rem}.card-content:last-child,.card-footer:last-child,.card-header:last-child{border-bottom-left-radius:.25rem;border-bottom-right-radius:.25rem}.card-header{background-color:transparent;align-items:stretch;box-shadow:0 .125em .25em rgba(10,10,10,.1);display:flex}.card-header-title{align-items:center;color:#363636;display:flex;flex-grow:1;font-weight:700;padding:.75rem 1rem}.card-header-title.is-centered{justify-content:center}.card-header-icon{align-items:center;cursor:pointer;display:flex;justify-content:center;padding:.75rem 1rem}.card-image{display:block;position:relative}.card-image:first-child img{border-top-left-radius:.25rem;border-top-right-radius:.25rem}.card-image:last-child img{border-bottom-left-radius:.25rem;border-bottom-right-radius:.25rem}.card-content{background-color:transparent;padding:1.5rem}.card-footer{background-color:transparent;border-top:1px solid #ededed;align-items:stretch;display:flex}.card-footer-item{align-items:center;display:flex;flex-basis:0;flex-grow:1;flex-shrink:0;justify-content:center;padding:.75rem}.card-footer-item:not(:last-child){border-right:1px solid #ededed}.card .media:not(:last-child){margin-bottom:1.5rem}.dropdown{display:inline-flex;position:relative;vertical-align:top}.dropdown.is-active .dropdown-menu,.dropdown.is-hoverable:hover .dropdown-menu{display:block}.dropdown.is-right .dropdown-menu{left:auto;right:0}.dropdown.is-up .dropdown-menu{bottom:100%;padding-bottom:4px;padding-top:initial;top:auto}.dropdown-menu{display:none;left:0;min-width:12rem;padding-top:4px;position:absolute;top:100%;z-index:20}.dropdown-content{background-color:#fff;border-radius:4px;box-shadow:0 .5em 1em -.125em rgba(10,10,10,.1),0 0 0 1px rgba(10,10,10,.02);padding-bottom:.5rem;padding-top:.5rem}.dropdown-item{color:#4a4a4a;display:block;font-size:.875rem;line-height:1.5;padding:.375rem 1rem;position:relative}a.dropdown-item,button.dropdown-item{padding-right:3rem;text-align:inherit;white-space:nowrap;width:100%}a.dropdown-item:hover,button.dropdown-item:hover{background-color:#f5f5f5;color:#0a0a0a}a.dropdown-item.is-active,button.dropdown-item.is-active{background-color:#3273dc;color:#fff}.dropdown-divider{background-color:#ededed;border:none;display:block;height:1px;margin:.5rem 0}.level{align-items:center;justify-content:space-between}.level code{border-radius:4px}.level img{display:inline-block;vertical-align:top}.level.is-mobile{display:flex}.level.is-mobile .level-left,.level.is-mobile .level-right{display:flex}.level.is-mobile .level-left+.level-right{margin-top:0}.level.is-mobile .level-item:not(:last-child){margin-bottom:0;margin-right:.75rem}.level.is-mobile .level-item:not(.is-narrow){flex-grow:1}@media screen and (min-width:769px),print{.level{display:flex}.level>.level-item:not(.is-narrow){flex-grow:1}}.level-item{align-items:center;display:flex;flex-basis:auto;flex-grow:0;flex-shrink:0;justify-content:center}.level-item .subtitle,.level-item .title{margin-bottom:0}@media screen and (max-width:768px){.level-item:not(:last-child){margin-bottom:.75rem}}.level-left,.level-right{flex-basis:auto;flex-grow:0;flex-shrink:0}.level-left .level-item.is-flexible,.level-right .level-item.is-flexible{flex-grow:1}@media screen and (min-width:769px),print{.level-left .level-item:not(:last-child),.level-right .level-item:not(:last-child){margin-right:.75rem}}.level-left{align-items:center;justify-content:flex-start}@media screen and (max-width:768px){.level-left+.level-right{margin-top:1.5rem}}@media screen and (min-width:769px),print{.level-left{display:flex}}.level-right{align-items:center;justify-content:flex-end}@media screen and (min-width:769px),print{.level-right{display:flex}}.media{align-items:flex-start;display:flex;text-align:inherit}.media .content:not(:last-child){margin-bottom:.75rem}.media .media{border-top:1px solid rgba(219,219,219,.5);display:flex;padding-top:.75rem}.media .media .content:not(:last-child),.media .media .control:not(:last-child){margin-bottom:.5rem}.media .media .media{padding-top:.5rem}.media .media .media+.media{margin-top:.5rem}.media+.media{border-top:1px solid rgba(219,219,219,.5);margin-top:1rem;padding-top:1rem}.media.is-large+.media{margin-top:1.5rem;padding-top:1.5rem}.media-left,.media-right{flex-basis:auto;flex-grow:0;flex-shrink:0}.media-left{margin-right:1rem}.media-right{margin-left:1rem}.media-content{flex-basis:auto;flex-grow:1;flex-shrink:1;text-align:inherit}@media screen and (max-width:768px){.media-content{overflow-x:auto}}.menu{font-size:1rem}.menu.is-small{font-size:.75rem}.menu.is-medium{font-size:1.25rem}.menu.is-large{font-size:1.5rem}.menu-list{line-height:1.25}.menu-list a{border-radius:2px;color:#4a4a4a;display:block;padding:.5em .75em}.menu-list a:hover{background-color:#f5f5f5;color:#363636}.menu-list a.is-active{background-color:#3273dc;color:#fff}.menu-list li ul{border-left:1px solid #dbdbdb;margin:.75em;padding-left:.75em}.menu-label{color:#7a7a7a;font-size:.75em;letter-spacing:.1em;text-transform:uppercase}.menu-label:not(:first-child){margin-top:1em}.menu-label:not(:last-child){margin-bottom:1em}.message{background-color:#f5f5f5;border-radius:4px;font-size:1rem}.message strong{color:currentColor}.message a:not(.button):not(.tag):not(.dropdown-item){color:currentColor;text-decoration:underline}.message.is-small{font-size:.75rem}.message.is-medium{font-size:1.25rem}.message.is-large{font-size:1.5rem}.message.is-white{background-color:#fff}.message.is-white .message-header{background-color:#fff;color:#0a0a0a}.message.is-white .message-body{border-color:#fff}.message.is-black{background-color:#fafafa}.message.is-black .message-header{background-color:#0a0a0a;color:#fff}.message.is-black .message-body{border-color:#0a0a0a}.message.is-light{background-color:#fafafa}.message.is-light .message-header{background-color:#f5f5f5;color:rgba(0,0,0,.7)}.message.is-light .message-body{border-color:#f5f5f5}.message.is-dark{background-color:#fafafa}.message.is-dark .message-header{background-color:#363636;color:#fff}.message.is-dark .message-body{border-color:#363636}.message.is-primary{background-color:#ebfffc}.message.is-primary .message-header{background-color:#00d1b2;color:#fff}.message.is-primary .message-body{border-color:#00d1b2;color:#00947e}.message.is-link{background-color:#eef3fc}.message.is-link .message-header{background-color:#3273dc;color:#fff}.message.is-link .message-body{border-color:#3273dc;color:#2160c4}.message.is-info{background-color:#eef6fc}.message.is-info .message-header{background-color:#3298dc;color:#fff}.message.is-info .message-body{border-color:#3298dc;color:#1d72aa}.message.is-success{background-color:#effaf3}.message.is-success .message-header{background-color:#48c774;color:#fff}.message.is-success .message-body{border-color:#48c774;color:#257942}.message.is-warning{background-color:#fffbeb}.message.is-warning .message-header{background-color:#ffdd57;color:rgba(0,0,0,.7)}.message.is-warning .message-body{border-color:#ffdd57;color:#947600}.message.is-danger{background-color:#feecf0}.message.is-danger .message-header{background-color:#f14668;color:#fff}.message.is-danger .message-body{border-color:#f14668;color:#cc0f35}.message-header{align-items:center;background-color:#4a4a4a;border-radius:4px 4px 0 0;color:#fff;display:flex;font-weight:700;justify-content:space-between;line-height:1.25;padding:.75em 1em;position:relative}.message-header .delete{flex-grow:0;flex-shrink:0;margin-left:.75em}.message-header+.message-body{border-width:0;border-top-left-radius:0;border-top-right-radius:0}.message-body{border-color:#dbdbdb;border-radius:4px;border-style:solid;border-width:0 0 0 4px;color:#4a4a4a;padding:1.25em 1.5em}.message-body code,.message-body pre{background-color:#fff}.message-body pre code{background-color:transparent}.modal{align-items:center;display:none;flex-direction:column;justify-content:center;overflow:hidden;position:fixed;z-index:40}.modal.is-active{display:flex}.modal-background{background-color:rgba(10,10,10,.86)}.modal-card,.modal-content{margin:0 20px;max-height:calc(100vh - 160px);overflow:auto;position:relative;width:100%}@media screen and (min-width:769px){.modal-card,.modal-content{margin:0 auto;max-height:calc(100vh - 40px);width:640px}}.modal-close{background:0 0;height:40px;position:fixed;right:20px;top:20px;width:40px}.modal-card{display:flex;flex-direction:column;max-height:calc(100vh - 40px);overflow:hidden;-ms-overflow-y:visible}.modal-card-foot,.modal-card-head{align-items:center;background-color:#f5f5f5;display:flex;flex-shrink:0;justify-content:flex-start;padding:20px;position:relative}.modal-card-head{border-bottom:1px solid #dbdbdb;border-top-left-radius:6px;border-top-right-radius:6px}.modal-card-title{color:#363636;flex-grow:1;flex-shrink:0;font-size:1.5rem;line-height:1}.modal-card-foot{border-bottom-left-radius:6px;border-bottom-right-radius:6px;border-top:1px solid #dbdbdb}.modal-card-foot .button:not(:last-child){margin-right:.5em}.modal-card-body{-webkit-overflow-scrolling:touch;background-color:#fff;flex-grow:1;flex-shrink:1;overflow:auto;padding:20px}.navbar{background-color:#fff;min-height:3.25rem;position:relative;z-index:30}.navbar.is-white{background-color:#fff;color:#0a0a0a}.navbar.is-white .navbar-brand .navbar-link,.navbar.is-white .navbar-brand>.navbar-item{color:#0a0a0a}.navbar.is-white .navbar-brand .navbar-link.is-active,.navbar.is-white .navbar-brand .navbar-link:focus,.navbar.is-white .navbar-brand .navbar-link:hover,.navbar.is-white .navbar-brand>a.navbar-item.is-active,.navbar.is-white .navbar-brand>a.navbar-item:focus,.navbar.is-white .navbar-brand>a.navbar-item:hover{background-color:#f2f2f2;color:#0a0a0a}.navbar.is-white .navbar-brand .navbar-link::after{border-color:#0a0a0a}.navbar.is-white .navbar-burger{color:#0a0a0a}@media screen and (min-width:1024px){.navbar.is-white .navbar-end .navbar-link,.navbar.is-white .navbar-end>.navbar-item,.navbar.is-white .navbar-start .navbar-link,.navbar.is-white .navbar-start>.navbar-item{color:#0a0a0a}.navbar.is-white .navbar-end .navbar-link.is-active,.navbar.is-white .navbar-end .navbar-link:focus,.navbar.is-white .navbar-end .navbar-link:hover,.navbar.is-white .navbar-end>a.navbar-item.is-active,.navbar.is-white .navbar-end>a.navbar-item:focus,.navbar.is-white .navbar-end>a.navbar-item:hover,.navbar.is-white .navbar-start .navbar-link.is-active,.navbar.is-white .navbar-start .navbar-link:focus,.navbar.is-white .navbar-start .navbar-link:hover,.navbar.is-white .navbar-start>a.navbar-item.is-active,.navbar.is-white .navbar-start>a.navbar-item:focus,.navbar.is-white .navbar-start>a.navbar-item:hover{background-color:#f2f2f2;color:#0a0a0a}.navbar.is-white .navbar-end .navbar-link::after,.navbar.is-white .navbar-start .navbar-link::after{border-color:#0a0a0a}.navbar.is-white .navbar-item.has-dropdown.is-active .navbar-link,.navbar.is-white .navbar-item.has-dropdown:focus .navbar-link,.navbar.is-white .navbar-item.has-dropdown:hover .navbar-link{background-color:#f2f2f2;color:#0a0a0a}.navbar.is-white .navbar-dropdown a.navbar-item.is-active{background-color:#fff;color:#0a0a0a}}.navbar.is-black{background-color:#0a0a0a;color:#fff}.navbar.is-black .navbar-brand .navbar-link,.navbar.is-black .navbar-brand>.navbar-item{color:#fff}.navbar.is-black .navbar-brand .navbar-link.is-active,.navbar.is-black .navbar-brand .navbar-link:focus,.navbar.is-black .navbar-brand .navbar-link:hover,.navbar.is-black .navbar-brand>a.navbar-item.is-active,.navbar.is-black .navbar-brand>a.navbar-item:focus,.navbar.is-black .navbar-brand>a.navbar-item:hover{background-color:#000;color:#fff}.navbar.is-black .navbar-brand .navbar-link::after{border-color:#fff}.navbar.is-black .navbar-burger{color:#fff}@media screen and (min-width:1024px){.navbar.is-black .navbar-end .navbar-link,.navbar.is-black .navbar-end>.navbar-item,.navbar.is-black .navbar-start .navbar-link,.navbar.is-black .navbar-start>.navbar-item{color:#fff}.navbar.is-black .navbar-end .navbar-link.is-active,.navbar.is-black .navbar-end .navbar-link:focus,.navbar.is-black .navbar-end .navbar-link:hover,.navbar.is-black .navbar-end>a.navbar-item.is-active,.navbar.is-black .navbar-end>a.navbar-item:focus,.navbar.is-black .navbar-end>a.navbar-item:hover,.navbar.is-black .navbar-start .navbar-link.is-active,.navbar.is-black .navbar-start .navbar-link:focus,.navbar.is-black .navbar-start .navbar-link:hover,.navbar.is-black .navbar-start>a.navbar-item.is-active,.navbar.is-black .navbar-start>a.navbar-item:focus,.navbar.is-black .navbar-start>a.navbar-item:hover{background-color:#000;color:#fff}.navbar.is-black .navbar-end .navbar-link::after,.navbar.is-black .navbar-start .navbar-link::after{border-color:#fff}.navbar.is-black .navbar-item.has-dropdown.is-active .navbar-link,.navbar.is-black .navbar-item.has-dropdown:focus .navbar-link,.navbar.is-black .navbar-item.has-dropdown:hover .navbar-link{background-color:#000;color:#fff}.navbar.is-black .navbar-dropdown a.navbar-item.is-active{background-color:#0a0a0a;color:#fff}}.navbar.is-light{background-color:#f5f5f5;color:rgba(0,0,0,.7)}.navbar.is-light .navbar-brand .navbar-link,.navbar.is-light .navbar-brand>.navbar-item{color:rgba(0,0,0,.7)}.navbar.is-light .navbar-brand .navbar-link.is-active,.navbar.is-light .navbar-brand .navbar-link:focus,.navbar.is-light .navbar-brand .navbar-link:hover,.navbar.is-light .navbar-brand>a.navbar-item.is-active,.navbar.is-light .navbar-brand>a.navbar-item:focus,.navbar.is-light .navbar-brand>a.navbar-item:hover{background-color:#e8e8e8;color:rgba(0,0,0,.7)}.navbar.is-light .navbar-brand .navbar-link::after{border-color:rgba(0,0,0,.7)}.navbar.is-light .navbar-burger{color:rgba(0,0,0,.7)}@media screen and (min-width:1024px){.navbar.is-light .navbar-end .navbar-link,.navbar.is-light .navbar-end>.navbar-item,.navbar.is-light .navbar-start .navbar-link,.navbar.is-light .navbar-start>.navbar-item{color:rgba(0,0,0,.7)}.navbar.is-light .navbar-end .navbar-link.is-active,.navbar.is-light .navbar-end .navbar-link:focus,.navbar.is-light .navbar-end .navbar-link:hover,.navbar.is-light .navbar-end>a.navbar-item.is-active,.navbar.is-light .navbar-end>a.navbar-item:focus,.navbar.is-light .navbar-end>a.navbar-item:hover,.navbar.is-light .navbar-start .navbar-link.is-active,.navbar.is-light .navbar-start .navbar-link:focus,.navbar.is-light .navbar-start .navbar-link:hover,.navbar.is-light .navbar-start>a.navbar-item.is-active,.navbar.is-light .navbar-start>a.navbar-item:focus,.navbar.is-light .navbar-start>a.navbar-item:hover{background-color:#e8e8e8;color:rgba(0,0,0,.7)}.navbar.is-light .navbar-end .navbar-link::after,.navbar.is-light .navbar-start .navbar-link::after{border-color:rgba(0,0,0,.7)}.navbar.is-light .navbar-item.has-dropdown.is-active .navbar-link,.navbar.is-light .navbar-item.has-dropdown:focus .navbar-link,.navbar.is-light .navbar-item.has-dropdown:hover .navbar-link{background-color:#e8e8e8;color:rgba(0,0,0,.7)}.navbar.is-light .navbar-dropdown a.navbar-item.is-active{background-color:#f5f5f5;color:rgba(0,0,0,.7)}}.navbar.is-dark{background-color:#363636;color:#fff}.navbar.is-dark .navbar-brand .navbar-link,.navbar.is-dark .navbar-brand>.navbar-item{color:#fff}.navbar.is-dark .navbar-brand .navbar-link.is-active,.navbar.is-dark .navbar-brand .navbar-link:focus,.navbar.is-dark .navbar-brand .navbar-link:hover,.navbar.is-dark .navbar-brand>a.navbar-item.is-active,.navbar.is-dark .navbar-brand>a.navbar-item:focus,.navbar.is-dark .navbar-brand>a.navbar-item:hover{background-color:#292929;color:#fff}.navbar.is-dark .navbar-brand .navbar-link::after{border-color:#fff}.navbar.is-dark .navbar-burger{color:#fff}@media screen and (min-width:1024px){.navbar.is-dark .navbar-end .navbar-link,.navbar.is-dark .navbar-end>.navbar-item,.navbar.is-dark .navbar-start .navbar-link,.navbar.is-dark .navbar-start>.navbar-item{color:#fff}.navbar.is-dark .navbar-end .navbar-link.is-active,.navbar.is-dark .navbar-end .navbar-link:focus,.navbar.is-dark .navbar-end .navbar-link:hover,.navbar.is-dark .navbar-end>a.navbar-item.is-active,.navbar.is-dark .navbar-end>a.navbar-item:focus,.navbar.is-dark .navbar-end>a.navbar-item:hover,.navbar.is-dark .navbar-start .navbar-link.is-active,.navbar.is-dark .navbar-start .navbar-link:focus,.navbar.is-dark .navbar-start .navbar-link:hover,.navbar.is-dark .navbar-start>a.navbar-item.is-active,.navbar.is-dark .navbar-start>a.navbar-item:focus,.navbar.is-dark .navbar-start>a.navbar-item:hover{background-color:#292929;color:#fff}.navbar.is-dark .navbar-end .navbar-link::after,.navbar.is-dark .navbar-start .navbar-link::after{border-color:#fff}.navbar.is-dark .navbar-item.has-dropdown.is-active .navbar-link,.navbar.is-dark .navbar-item.has-dropdown:focus .navbar-link,.navbar.is-dark .navbar-item.has-dropdown:hover .navbar-link{background-color:#292929;color:#fff}.navbar.is-dark .navbar-dropdown a.navbar-item.is-active{background-color:#363636;color:#fff}}.navbar.is-primary{background-color:#00d1b2;color:#fff}.navbar.is-primary .navbar-brand .navbar-link,.navbar.is-primary .navbar-brand>.navbar-item{color:#fff}.navbar.is-primary .navbar-brand .navbar-link.is-active,.navbar.is-primary .navbar-brand .navbar-link:focus,.navbar.is-primary .navbar-brand .navbar-link:hover,.navbar.is-primary .navbar-brand>a.navbar-item.is-active,.navbar.is-primary .navbar-brand>a.navbar-item:focus,.navbar.is-primary .navbar-brand>a.navbar-item:hover{background-color:#00b89c;color:#fff}.navbar.is-primary .navbar-brand .navbar-link::after{border-color:#fff}.navbar.is-primary .navbar-burger{color:#fff}@media screen and (min-width:1024px){.navbar.is-primary .navbar-end .navbar-link,.navbar.is-primary .navbar-end>.navbar-item,.navbar.is-primary .navbar-start .navbar-link,.navbar.is-primary .navbar-start>.navbar-item{color:#fff}.navbar.is-primary .navbar-end .navbar-link.is-active,.navbar.is-primary .navbar-end .navbar-link:focus,.navbar.is-primary .navbar-end .navbar-link:hover,.navbar.is-primary .navbar-end>a.navbar-item.is-active,.navbar.is-primary .navbar-end>a.navbar-item:focus,.navbar.is-primary .navbar-end>a.navbar-item:hover,.navbar.is-primary .navbar-start .navbar-link.is-active,.navbar.is-primary .navbar-start .navbar-link:focus,.navbar.is-primary .navbar-start .navbar-link:hover,.navbar.is-primary .navbar-start>a.navbar-item.is-active,.navbar.is-primary .navbar-start>a.navbar-item:focus,.navbar.is-primary .navbar-start>a.navbar-item:hover{background-color:#00b89c;color:#fff}.navbar.is-primary .navbar-end .navbar-link::after,.navbar.is-primary .navbar-start .navbar-link::after{border-color:#fff}.navbar.is-primary .navbar-item.has-dropdown.is-active .navbar-link,.navbar.is-primary .navbar-item.has-dropdown:focus .navbar-link,.navbar.is-primary .navbar-item.has-dropdown:hover .navbar-link{background-color:#00b89c;color:#fff}.navbar.is-primary .navbar-dropdown a.navbar-item.is-active{background-color:#00d1b2;color:#fff}}.navbar.is-link{background-color:#3273dc;color:#fff}.navbar.is-link .navbar-brand .navbar-link,.navbar.is-link .navbar-brand>.navbar-item{color:#fff}.navbar.is-link .navbar-brand .navbar-link.is-active,.navbar.is-link .navbar-brand .navbar-link:focus,.navbar.is-link .navbar-brand .navbar-link:hover,.navbar.is-link .navbar-brand>a.navbar-item.is-active,.navbar.is-link .navbar-brand>a.navbar-item:focus,.navbar.is-link .navbar-brand>a.navbar-item:hover{background-color:#2366d1;color:#fff}.navbar.is-link .navbar-brand .navbar-link::after{border-color:#fff}.navbar.is-link .navbar-burger{color:#fff}@media screen and (min-width:1024px){.navbar.is-link .navbar-end .navbar-link,.navbar.is-link .navbar-end>.navbar-item,.navbar.is-link .navbar-start .navbar-link,.navbar.is-link .navbar-start>.navbar-item{color:#fff}.navbar.is-link .navbar-end .navbar-link.is-active,.navbar.is-link .navbar-end .navbar-link:focus,.navbar.is-link .navbar-end .navbar-link:hover,.navbar.is-link .navbar-end>a.navbar-item.is-active,.navbar.is-link .navbar-end>a.navbar-item:focus,.navbar.is-link .navbar-end>a.navbar-item:hover,.navbar.is-link .navbar-start .navbar-link.is-active,.navbar.is-link .navbar-start .navbar-link:focus,.navbar.is-link .navbar-start .navbar-link:hover,.navbar.is-link .navbar-start>a.navbar-item.is-active,.navbar.is-link .navbar-start>a.navbar-item:focus,.navbar.is-link .navbar-start>a.navbar-item:hover{background-color:#2366d1;color:#fff}.navbar.is-link .navbar-end .navbar-link::after,.navbar.is-link .navbar-start .navbar-link::after{border-color:#fff}.navbar.is-link .navbar-item.has-dropdown.is-active .navbar-link,.navbar.is-link .navbar-item.has-dropdown:focus .navbar-link,.navbar.is-link .navbar-item.has-dropdown:hover .navbar-link{background-color:#2366d1;color:#fff}.navbar.is-link .navbar-dropdown a.navbar-item.is-active{background-color:#3273dc;color:#fff}}.navbar.is-info{background-color:#3298dc;color:#fff}.navbar.is-info .navbar-brand .navbar-link,.navbar.is-info .navbar-brand>.navbar-item{color:#fff}.navbar.is-info .navbar-brand .navbar-link.is-active,.navbar.is-info .navbar-brand .navbar-link:focus,.navbar.is-info .navbar-brand .navbar-link:hover,.navbar.is-info .navbar-brand>a.navbar-item.is-active,.navbar.is-info .navbar-brand>a.navbar-item:focus,.navbar.is-info .navbar-brand>a.navbar-item:hover{background-color:#238cd1;color:#fff}.navbar.is-info .navbar-brand .navbar-link::after{border-color:#fff}.navbar.is-info .navbar-burger{color:#fff}@media screen and (min-width:1024px){.navbar.is-info .navbar-end .navbar-link,.navbar.is-info .navbar-end>.navbar-item,.navbar.is-info .navbar-start .navbar-link,.navbar.is-info .navbar-start>.navbar-item{color:#fff}.navbar.is-info .navbar-end .navbar-link.is-active,.navbar.is-info .navbar-end .navbar-link:focus,.navbar.is-info .navbar-end .navbar-link:hover,.navbar.is-info .navbar-end>a.navbar-item.is-active,.navbar.is-info .navbar-end>a.navbar-item:focus,.navbar.is-info .navbar-end>a.navbar-item:hover,.navbar.is-info .navbar-start .navbar-link.is-active,.navbar.is-info .navbar-start .navbar-link:focus,.navbar.is-info .navbar-start .navbar-link:hover,.navbar.is-info .navbar-start>a.navbar-item.is-active,.navbar.is-info .navbar-start>a.navbar-item:focus,.navbar.is-info .navbar-start>a.navbar-item:hover{background-color:#238cd1;color:#fff}.navbar.is-info .navbar-end .navbar-link::after,.navbar.is-info .navbar-start .navbar-link::after{border-color:#fff}.navbar.is-info .navbar-item.has-dropdown.is-active .navbar-link,.navbar.is-info .navbar-item.has-dropdown:focus .navbar-link,.navbar.is-info .navbar-item.has-dropdown:hover .navbar-link{background-color:#238cd1;color:#fff}.navbar.is-info .navbar-dropdown a.navbar-item.is-active{background-color:#3298dc;color:#fff}}.navbar.is-success{background-color:#48c774;color:#fff}.navbar.is-success .navbar-brand .navbar-link,.navbar.is-success .navbar-brand>.navbar-item{color:#fff}.navbar.is-success .navbar-brand .navbar-link.is-active,.navbar.is-success .navbar-brand .navbar-link:focus,.navbar.is-success .navbar-brand .navbar-link:hover,.navbar.is-success .navbar-brand>a.navbar-item.is-active,.navbar.is-success .navbar-brand>a.navbar-item:focus,.navbar.is-success .navbar-brand>a.navbar-item:hover{background-color:#3abb67;color:#fff}.navbar.is-success .navbar-brand .navbar-link::after{border-color:#fff}.navbar.is-success .navbar-burger{color:#fff}@media screen and (min-width:1024px){.navbar.is-success .navbar-end .navbar-link,.navbar.is-success .navbar-end>.navbar-item,.navbar.is-success .navbar-start .navbar-link,.navbar.is-success .navbar-start>.navbar-item{color:#fff}.navbar.is-success .navbar-end .navbar-link.is-active,.navbar.is-success .navbar-end .navbar-link:focus,.navbar.is-success .navbar-end .navbar-link:hover,.navbar.is-success .navbar-end>a.navbar-item.is-active,.navbar.is-success .navbar-end>a.navbar-item:focus,.navbar.is-success .navbar-end>a.navbar-item:hover,.navbar.is-success .navbar-start .navbar-link.is-active,.navbar.is-success .navbar-start .navbar-link:focus,.navbar.is-success .navbar-start .navbar-link:hover,.navbar.is-success .navbar-start>a.navbar-item.is-active,.navbar.is-success .navbar-start>a.navbar-item:focus,.navbar.is-success .navbar-start>a.navbar-item:hover{background-color:#3abb67;color:#fff}.navbar.is-success .navbar-end .navbar-link::after,.navbar.is-success .navbar-start .navbar-link::after{border-color:#fff}.navbar.is-success .navbar-item.has-dropdown.is-active .navbar-link,.navbar.is-success .navbar-item.has-dropdown:focus .navbar-link,.navbar.is-success .navbar-item.has-dropdown:hover .navbar-link{background-color:#3abb67;color:#fff}.navbar.is-success .navbar-dropdown a.navbar-item.is-active{background-color:#48c774;color:#fff}}.navbar.is-warning{background-color:#ffdd57;color:rgba(0,0,0,.7)}.navbar.is-warning .navbar-brand .navbar-link,.navbar.is-warning .navbar-brand>.navbar-item{color:rgba(0,0,0,.7)}.navbar.is-warning .navbar-brand .navbar-link.is-active,.navbar.is-warning .navbar-brand .navbar-link:focus,.navbar.is-warning .navbar-brand .navbar-link:hover,.navbar.is-warning .navbar-brand>a.navbar-item.is-active,.navbar.is-warning .navbar-brand>a.navbar-item:focus,.navbar.is-warning .navbar-brand>a.navbar-item:hover{background-color:#ffd83d;color:rgba(0,0,0,.7)}.navbar.is-warning .navbar-brand .navbar-link::after{border-color:rgba(0,0,0,.7)}.navbar.is-warning .navbar-burger{color:rgba(0,0,0,.7)}@media screen and (min-width:1024px){.navbar.is-warning .navbar-end .navbar-link,.navbar.is-warning .navbar-end>.navbar-item,.navbar.is-warning .navbar-start .navbar-link,.navbar.is-warning .navbar-start>.navbar-item{color:rgba(0,0,0,.7)}.navbar.is-warning .navbar-end .navbar-link.is-active,.navbar.is-warning .navbar-end .navbar-link:focus,.navbar.is-warning .navbar-end .navbar-link:hover,.navbar.is-warning .navbar-end>a.navbar-item.is-active,.navbar.is-warning .navbar-end>a.navbar-item:focus,.navbar.is-warning .navbar-end>a.navbar-item:hover,.navbar.is-warning .navbar-start .navbar-link.is-active,.navbar.is-warning .navbar-start .navbar-link:focus,.navbar.is-warning .navbar-start .navbar-link:hover,.navbar.is-warning .navbar-start>a.navbar-item.is-active,.navbar.is-warning .navbar-start>a.navbar-item:focus,.navbar.is-warning .navbar-start>a.navbar-item:hover{background-color:#ffd83d;color:rgba(0,0,0,.7)}.navbar.is-warning .navbar-end .navbar-link::after,.navbar.is-warning .navbar-start .navbar-link::after{border-color:rgba(0,0,0,.7)}.navbar.is-warning .navbar-item.has-dropdown.is-active .navbar-link,.navbar.is-warning .navbar-item.has-dropdown:focus .navbar-link,.navbar.is-warning .navbar-item.has-dropdown:hover .navbar-link{background-color:#ffd83d;color:rgba(0,0,0,.7)}.navbar.is-warning .navbar-dropdown a.navbar-item.is-active{background-color:#ffdd57;color:rgba(0,0,0,.7)}}.navbar.is-danger{background-color:#f14668;color:#fff}.navbar.is-danger .navbar-brand .navbar-link,.navbar.is-danger .navbar-brand>.navbar-item{color:#fff}.navbar.is-danger .navbar-brand .navbar-link.is-active,.navbar.is-danger .navbar-brand .navbar-link:focus,.navbar.is-danger .navbar-brand .navbar-link:hover,.navbar.is-danger .navbar-brand>a.navbar-item.is-active,.navbar.is-danger .navbar-brand>a.navbar-item:focus,.navbar.is-danger .navbar-brand>a.navbar-item:hover{background-color:#ef2e55;color:#fff}.navbar.is-danger .navbar-brand .navbar-link::after{border-color:#fff}.navbar.is-danger .navbar-burger{color:#fff}@media screen and (min-width:1024px){.navbar.is-danger .navbar-end .navbar-link,.navbar.is-danger .navbar-end>.navbar-item,.navbar.is-danger .navbar-start .navbar-link,.navbar.is-danger .navbar-start>.navbar-item{color:#fff}.navbar.is-danger .navbar-end .navbar-link.is-active,.navbar.is-danger .navbar-end .navbar-link:focus,.navbar.is-danger .navbar-end .navbar-link:hover,.navbar.is-danger .navbar-end>a.navbar-item.is-active,.navbar.is-danger .navbar-end>a.navbar-item:focus,.navbar.is-danger .navbar-end>a.navbar-item:hover,.navbar.is-danger .navbar-start .navbar-link.is-active,.navbar.is-danger .navbar-start .navbar-link:focus,.navbar.is-danger .navbar-start .navbar-link:hover,.navbar.is-danger .navbar-start>a.navbar-item.is-active,.navbar.is-danger .navbar-start>a.navbar-item:focus,.navbar.is-danger .navbar-start>a.navbar-item:hover{background-color:#ef2e55;color:#fff}.navbar.is-danger .navbar-end .navbar-link::after,.navbar.is-danger .navbar-start .navbar-link::after{border-color:#fff}.navbar.is-danger .navbar-item.has-dropdown.is-active .navbar-link,.navbar.is-danger .navbar-item.has-dropdown:focus .navbar-link,.navbar.is-danger .navbar-item.has-dropdown:hover .navbar-link{background-color:#ef2e55;color:#fff}.navbar.is-danger .navbar-dropdown a.navbar-item.is-active{background-color:#f14668;color:#fff}}.navbar>.container{align-items:stretch;display:flex;min-height:3.25rem;width:100%}.navbar.has-shadow{box-shadow:0 2px 0 0 #f5f5f5}.navbar.is-fixed-bottom,.navbar.is-fixed-top{left:0;position:fixed;right:0;z-index:30}.navbar.is-fixed-bottom{bottom:0}.navbar.is-fixed-bottom.has-shadow{box-shadow:0 -2px 0 0 #f5f5f5}.navbar.is-fixed-top{top:0}body.has-navbar-fixed-top,html.has-navbar-fixed-top{padding-top:3.25rem}body.has-navbar-fixed-bottom,html.has-navbar-fixed-bottom{padding-bottom:3.25rem}.navbar-brand,.navbar-tabs{align-items:stretch;display:flex;flex-shrink:0;min-height:3.25rem}.navbar-brand a.navbar-item:focus,.navbar-brand a.navbar-item:hover{background-color:transparent}.navbar-tabs{-webkit-overflow-scrolling:touch;max-width:100vw;overflow-x:auto;overflow-y:hidden}.navbar-burger{color:#4a4a4a;cursor:pointer;display:block;height:3.25rem;position:relative;width:3.25rem;margin-left:auto}.navbar-burger span{background-color:currentColor;display:block;height:1px;left:calc(50% - 8px);position:absolute;transform-origin:center;transition-duration:86ms;transition-property:background-color,opacity,transform;transition-timing-function:ease-out;width:16px}.navbar-burger span:nth-child(1){top:calc(50% - 6px)}.navbar-burger span:nth-child(2){top:calc(50% - 1px)}.navbar-burger span:nth-child(3){top:calc(50% + 4px)}.navbar-burger:hover{background-color:rgba(0,0,0,.05)}.navbar-burger.is-active span:nth-child(1){transform:translateY(5px) rotate(45deg)}.navbar-burger.is-active span:nth-child(2){opacity:0}.navbar-burger.is-active span:nth-child(3){transform:translateY(-5px) rotate(-45deg)}.navbar-menu{display:none}.navbar-item,.navbar-link{color:#4a4a4a;display:block;line-height:1.5;padding:.5rem .75rem;position:relative}.navbar-item .icon:only-child,.navbar-link .icon:only-child{margin-left:-.25rem;margin-right:-.25rem}.navbar-link,a.navbar-item{cursor:pointer}.navbar-link.is-active,.navbar-link:focus,.navbar-link:focus-within,.navbar-link:hover,a.navbar-item.is-active,a.navbar-item:focus,a.navbar-item:focus-within,a.navbar-item:hover{background-color:#fafafa;color:#3273dc}.navbar-item{flex-grow:0;flex-shrink:0}.navbar-item img{max-height:1.75rem}.navbar-item.has-dropdown{padding:0}.navbar-item.is-expanded{flex-grow:1;flex-shrink:1}.navbar-item.is-tab{border-bottom:1px solid transparent;min-height:3.25rem;padding-bottom:calc(.5rem - 1px)}.navbar-item.is-tab:focus,.navbar-item.is-tab:hover{background-color:transparent;border-bottom-color:#3273dc}.navbar-item.is-tab.is-active{background-color:transparent;border-bottom-color:#3273dc;border-bottom-style:solid;border-bottom-width:3px;color:#3273dc;padding-bottom:calc(.5rem - 3px)}.navbar-content{flex-grow:1;flex-shrink:1}.navbar-link:not(.is-arrowless){padding-right:2.5em}.navbar-link:not(.is-arrowless)::after{border-color:#3273dc;margin-top:-.375em;right:1.125em}.navbar-dropdown{font-size:.875rem;padding-bottom:.5rem;padding-top:.5rem}.navbar-dropdown .navbar-item{padding-left:1.5rem;padding-right:1.5rem}.navbar-divider{background-color:#f5f5f5;border:none;display:none;height:2px;margin:.5rem 0}@media screen and (max-width:1023px){.navbar>.container{display:block}.navbar-brand .navbar-item,.navbar-tabs .navbar-item{align-items:center;display:flex}.navbar-link::after{display:none}.navbar-menu{background-color:#fff;box-shadow:0 8px 16px rgba(10,10,10,.1);padding:.5rem 0}.navbar-menu.is-active{display:block}.navbar.is-fixed-bottom-touch,.navbar.is-fixed-top-touch{left:0;position:fixed;right:0;z-index:30}.navbar.is-fixed-bottom-touch{bottom:0}.navbar.is-fixed-bottom-touch.has-shadow{box-shadow:0 -2px 3px rgba(10,10,10,.1)}.navbar.is-fixed-top-touch{top:0}.navbar.is-fixed-top .navbar-menu,.navbar.is-fixed-top-touch .navbar-menu{-webkit-overflow-scrolling:touch;max-height:calc(100vh - 3.25rem);overflow:auto}body.has-navbar-fixed-top-touch,html.has-navbar-fixed-top-touch{padding-top:3.25rem}body.has-navbar-fixed-bottom-touch,html.has-navbar-fixed-bottom-touch{padding-bottom:3.25rem}}@media screen and (min-width:1024px){.navbar,.navbar-end,.navbar-menu,.navbar-start{align-items:stretch;display:flex}.navbar{min-height:3.25rem}.navbar.is-spaced{padding:1rem 2rem}.navbar.is-spaced .navbar-end,.navbar.is-spaced .navbar-start{align-items:center}.navbar.is-spaced .navbar-link,.navbar.is-spaced a.navbar-item{border-radius:4px}.navbar.is-transparent .navbar-link.is-active,.navbar.is-transparent .navbar-link:focus,.navbar.is-transparent .navbar-link:hover,.navbar.is-transparent a.navbar-item.is-active,.navbar.is-transparent a.navbar-item:focus,.navbar.is-transparent a.navbar-item:hover{background-color:transparent!important}.navbar.is-transparent .navbar-item.has-dropdown.is-active .navbar-link,.navbar.is-transparent .navbar-item.has-dropdown.is-hoverable:focus .navbar-link,.navbar.is-transparent .navbar-item.has-dropdown.is-hoverable:focus-within .navbar-link,.navbar.is-transparent .navbar-item.has-dropdown.is-hoverable:hover .navbar-link{background-color:transparent!important}.navbar.is-transparent .navbar-dropdown a.navbar-item:focus,.navbar.is-transparent .navbar-dropdown a.navbar-item:hover{background-color:#f5f5f5;color:#0a0a0a}.navbar.is-transparent .navbar-dropdown a.navbar-item.is-active{background-color:#f5f5f5;color:#3273dc}.navbar-burger{display:none}.navbar-item,.navbar-link{align-items:center;display:flex}.navbar-item.has-dropdown{align-items:stretch}.navbar-item.has-dropdown-up .navbar-link::after{transform:rotate(135deg) translate(.25em,-.25em)}.navbar-item.has-dropdown-up .navbar-dropdown{border-bottom:2px solid #dbdbdb;border-radius:6px 6px 0 0;border-top:none;bottom:100%;box-shadow:0 -8px 8px rgba(10,10,10,.1);top:auto}.navbar-item.is-active .navbar-dropdown,.navbar-item.is-hoverable:focus .navbar-dropdown,.navbar-item.is-hoverable:focus-within .navbar-dropdown,.navbar-item.is-hoverable:hover .navbar-dropdown{display:block}.navbar-item.is-active .navbar-dropdown.is-boxed,.navbar-item.is-hoverable:focus .navbar-dropdown.is-boxed,.navbar-item.is-hoverable:focus-within .navbar-dropdown.is-boxed,.navbar-item.is-hoverable:hover .navbar-dropdown.is-boxed,.navbar.is-spaced .navbar-item.is-active .navbar-dropdown,.navbar.is-spaced .navbar-item.is-hoverable:focus .navbar-dropdown,.navbar.is-spaced .navbar-item.is-hoverable:focus-within .navbar-dropdown,.navbar.is-spaced .navbar-item.is-hoverable:hover .navbar-dropdown{opacity:1;pointer-events:auto;transform:translateY(0)}.navbar-menu{flex-grow:1;flex-shrink:0}.navbar-start{justify-content:flex-start;margin-right:auto}.navbar-end{justify-content:flex-end;margin-left:auto}.navbar-dropdown{background-color:#fff;border-bottom-left-radius:6px;border-bottom-right-radius:6px;border-top:2px solid #dbdbdb;box-shadow:0 8px 8px rgba(10,10,10,.1);display:none;font-size:.875rem;left:0;min-width:100%;position:absolute;top:100%;z-index:20}.navbar-dropdown .navbar-item{padding:.375rem 1rem;white-space:nowrap}.navbar-dropdown a.navbar-item{padding-right:3rem}.navbar-dropdown a.navbar-item:focus,.navbar-dropdown a.navbar-item:hover{background-color:#f5f5f5;color:#0a0a0a}.navbar-dropdown a.navbar-item.is-active{background-color:#f5f5f5;color:#3273dc}.navbar-dropdown.is-boxed,.navbar.is-spaced .navbar-dropdown{border-radius:6px;border-top:none;box-shadow:0 8px 8px rgba(10,10,10,.1),0 0 0 1px rgba(10,10,10,.1);display:block;opacity:0;pointer-events:none;top:calc(100% + (-4px));transform:translateY(-5px);transition-duration:86ms;transition-property:opacity,transform}.navbar-dropdown.is-right{left:auto;right:0}.navbar-divider{display:block}.container>.navbar .navbar-brand,.navbar>.container .navbar-brand{margin-left:-.75rem}.container>.navbar .navbar-menu,.navbar>.container .navbar-menu{margin-right:-.75rem}.navbar.is-fixed-bottom-desktop,.navbar.is-fixed-top-desktop{left:0;position:fixed;right:0;z-index:30}.navbar.is-fixed-bottom-desktop{bottom:0}.navbar.is-fixed-bottom-desktop.has-shadow{box-shadow:0 -2px 3px rgba(10,10,10,.1)}.navbar.is-fixed-top-desktop{top:0}body.has-navbar-fixed-top-desktop,html.has-navbar-fixed-top-desktop{padding-top:3.25rem}body.has-navbar-fixed-bottom-desktop,html.has-navbar-fixed-bottom-desktop{padding-bottom:3.25rem}body.has-spaced-navbar-fixed-top,html.has-spaced-navbar-fixed-top{padding-top:5.25rem}body.has-spaced-navbar-fixed-bottom,html.has-spaced-navbar-fixed-bottom{padding-bottom:5.25rem}.navbar-link.is-active,a.navbar-item.is-active{color:#0a0a0a}.navbar-link.is-active:not(:focus):not(:hover),a.navbar-item.is-active:not(:focus):not(:hover){background-color:transparent}.navbar-item.has-dropdown.is-active .navbar-link,.navbar-item.has-dropdown:focus .navbar-link,.navbar-item.has-dropdown:hover .navbar-link{background-color:#fafafa}}.hero.is-fullheight-with-navbar{min-height:calc(100vh - 3.25rem)}.pagination{font-size:1rem;margin:-.25rem}.pagination.is-small{font-size:.75rem}.pagination.is-medium{font-size:1.25rem}.pagination.is-large{font-size:1.5rem}.pagination.is-rounded .pagination-next,.pagination.is-rounded .pagination-previous{padding-left:1em;padding-right:1em;border-radius:290486px}.pagination.is-rounded .pagination-link{border-radius:290486px}.pagination,.pagination-list{align-items:center;display:flex;justify-content:center;text-align:center}.pagination-ellipsis,.pagination-link,.pagination-next,.pagination-previous{font-size:1em;justify-content:center;margin:.25rem;padding-left:.5em;padding-right:.5em;text-align:center}.pagination-link,.pagination-next,.pagination-previous{border-color:#dbdbdb;color:#363636;min-width:2.5em}.pagination-link:hover,.pagination-next:hover,.pagination-previous:hover{border-color:#b5b5b5;color:#363636}.pagination-link:focus,.pagination-next:focus,.pagination-previous:focus{border-color:#3273dc}.pagination-link:active,.pagination-next:active,.pagination-previous:active{box-shadow:inset 0 1px 2px rgba(10,10,10,.2)}.pagination-link[disabled],.pagination-next[disabled],.pagination-previous[disabled]{background-color:#dbdbdb;border-color:#dbdbdb;box-shadow:none;color:#7a7a7a;opacity:.5}.pagination-next,.pagination-previous{padding-left:.75em;padding-right:.75em;white-space:nowrap}.pagination-link.is-current{background-color:#3273dc;border-color:#3273dc;color:#fff}.pagination-ellipsis{color:#b5b5b5;pointer-events:none}.pagination-list{flex-wrap:wrap}.pagination-list li{list-style:none}@media screen and (max-width:768px){.pagination{flex-wrap:wrap}.pagination-next,.pagination-previous{flex-grow:1;flex-shrink:1}.pagination-list li{flex-grow:1;flex-shrink:1}}@media screen and (min-width:769px),print{.pagination-list{flex-grow:1;flex-shrink:1;justify-content:flex-start;order:1}.pagination-previous{order:2}.pagination-next{order:3}.pagination{justify-content:space-between}.pagination.is-centered .pagination-previous{order:1}.pagination.is-centered .pagination-list{justify-content:center;order:2}.pagination.is-centered .pagination-next{order:3}.pagination.is-right .pagination-previous{order:1}.pagination.is-right .pagination-next{order:2}.pagination.is-right .pagination-list{justify-content:flex-end;order:3}}.panel{border-radius:6px;box-shadow:0 .5em 1em -.125em rgba(10,10,10,.1),0 0 0 1px rgba(10,10,10,.02);font-size:1rem}.panel:not(:last-child){margin-bottom:1.5rem}.panel.is-white .panel-heading{background-color:#fff;color:#0a0a0a}.panel.is-white .panel-tabs a.is-active{border-bottom-color:#fff}.panel.is-white .panel-block.is-active .panel-icon{color:#fff}.panel.is-black .panel-heading{background-color:#0a0a0a;color:#fff}.panel.is-black .panel-tabs a.is-active{border-bottom-color:#0a0a0a}.panel.is-black .panel-block.is-active .panel-icon{color:#0a0a0a}.panel.is-light .panel-heading{background-color:#f5f5f5;color:rgba(0,0,0,.7)}.panel.is-light .panel-tabs a.is-active{border-bottom-color:#f5f5f5}.panel.is-light .panel-block.is-active .panel-icon{color:#f5f5f5}.panel.is-dark .panel-heading{background-color:#363636;color:#fff}.panel.is-dark .panel-tabs a.is-active{border-bottom-color:#363636}.panel.is-dark .panel-block.is-active .panel-icon{color:#363636}.panel.is-primary .panel-heading{background-color:#00d1b2;color:#fff}.panel.is-primary .panel-tabs a.is-active{border-bottom-color:#00d1b2}.panel.is-primary .panel-block.is-active .panel-icon{color:#00d1b2}.panel.is-link .panel-heading{background-color:#3273dc;color:#fff}.panel.is-link .panel-tabs a.is-active{border-bottom-color:#3273dc}.panel.is-link .panel-block.is-active .panel-icon{color:#3273dc}.panel.is-info .panel-heading{background-color:#3298dc;color:#fff}.panel.is-info .panel-tabs a.is-active{border-bottom-color:#3298dc}.panel.is-info .panel-block.is-active .panel-icon{color:#3298dc}.panel.is-success .panel-heading{background-color:#48c774;color:#fff}.panel.is-success .panel-tabs a.is-active{border-bottom-color:#48c774}.panel.is-success .panel-block.is-active .panel-icon{color:#48c774}.panel.is-warning .panel-heading{background-color:#ffdd57;color:rgba(0,0,0,.7)}.panel.is-warning .panel-tabs a.is-active{border-bottom-color:#ffdd57}.panel.is-warning .panel-block.is-active .panel-icon{color:#ffdd57}.panel.is-danger .panel-heading{background-color:#f14668;color:#fff}.panel.is-danger .panel-tabs a.is-active{border-bottom-color:#f14668}.panel.is-danger .panel-block.is-active .panel-icon{color:#f14668}.panel-block:not(:last-child),.panel-tabs:not(:last-child){border-bottom:1px solid #ededed}.panel-heading{background-color:#ededed;border-radius:6px 6px 0 0;color:#363636;font-size:1.25em;font-weight:700;line-height:1.25;padding:.75em 1em}.panel-tabs{align-items:flex-end;display:flex;font-size:.875em;justify-content:center}.panel-tabs a{border-bottom:1px solid #dbdbdb;margin-bottom:-1px;padding:.5em}.panel-tabs a.is-active{border-bottom-color:#4a4a4a;color:#363636}.panel-list a{color:#4a4a4a}.panel-list a:hover{color:#3273dc}.panel-block{align-items:center;color:#363636;display:flex;justify-content:flex-start;padding:.5em .75em}.panel-block input[type=checkbox]{margin-right:.75em}.panel-block>.control{flex-grow:1;flex-shrink:1;width:100%}.panel-block.is-wrapped{flex-wrap:wrap}.panel-block.is-active{border-left-color:#3273dc;color:#363636}.panel-block.is-active .panel-icon{color:#3273dc}.panel-block:last-child{border-bottom-left-radius:6px;border-bottom-right-radius:6px}a.panel-block,label.panel-block{cursor:pointer}a.panel-block:hover,label.panel-block:hover{background-color:#f5f5f5}.panel-icon{display:inline-block;font-size:14px;height:1em;line-height:1em;text-align:center;vertical-align:top;width:1em;color:#7a7a7a;margin-right:.75em}.panel-icon .fa{font-size:inherit;line-height:inherit}.tabs{-webkit-overflow-scrolling:touch;align-items:stretch;display:flex;font-size:1rem;justify-content:space-between;overflow:hidden;overflow-x:auto;white-space:nowrap}.tabs a{align-items:center;border-bottom-color:#dbdbdb;border-bottom-style:solid;border-bottom-width:1px;color:#4a4a4a;display:flex;justify-content:center;margin-bottom:-1px;padding:.5em 1em;vertical-align:top}.tabs a:hover{border-bottom-color:#363636;color:#363636}.tabs li{display:block}.tabs li.is-active a{border-bottom-color:#3273dc;color:#3273dc}.tabs ul{align-items:center;border-bottom-color:#dbdbdb;border-bottom-style:solid;border-bottom-width:1px;display:flex;flex-grow:1;flex-shrink:0;justify-content:flex-start}.tabs ul.is-left{padding-right:.75em}.tabs ul.is-center{flex:none;justify-content:center;padding-left:.75em;padding-right:.75em}.tabs ul.is-right{justify-content:flex-end;padding-left:.75em}.tabs .icon:first-child{margin-right:.5em}.tabs .icon:last-child{margin-left:.5em}.tabs.is-centered ul{justify-content:center}.tabs.is-right ul{justify-content:flex-end}.tabs.is-boxed a{border:1px solid transparent;border-radius:4px 4px 0 0}.tabs.is-boxed a:hover{background-color:#f5f5f5;border-bottom-color:#dbdbdb}.tabs.is-boxed li.is-active a{background-color:#fff;border-color:#dbdbdb;border-bottom-color:transparent!important}.tabs.is-fullwidth li{flex-grow:1;flex-shrink:0}.tabs.is-toggle a{border-color:#dbdbdb;border-style:solid;border-width:1px;margin-bottom:0;position:relative}.tabs.is-toggle a:hover{background-color:#f5f5f5;border-color:#b5b5b5;z-index:2}.tabs.is-toggle li+li{margin-left:-1px}.tabs.is-toggle li:first-child a{border-top-left-radius:4px;border-bottom-left-radius:4px}.tabs.is-toggle li:last-child a{border-top-right-radius:4px;border-bottom-right-radius:4px}.tabs.is-toggle li.is-active a{background-color:#3273dc;border-color:#3273dc;color:#fff;z-index:1}.tabs.is-toggle ul{border-bottom:none}.tabs.is-toggle.is-toggle-rounded li:first-child a{border-bottom-left-radius:290486px;border-top-left-radius:290486px;padding-left:1.25em}.tabs.is-toggle.is-toggle-rounded li:last-child a{border-bottom-right-radius:290486px;border-top-right-radius:290486px;padding-right:1.25em}.tabs.is-small{font-size:.75rem}.tabs.is-medium{font-size:1.25rem}.tabs.is-large{font-size:1.5rem}.column{display:block;flex-basis:0;flex-grow:1;flex-shrink:1;padding:.75rem}.columns.is-mobile>.column.is-narrow{flex:none;width:unset}.columns.is-mobile>.column.is-full{flex:none;width:100%}.columns.is-mobile>.column.is-three-quarters{flex:none;width:75%}.columns.is-mobile>.column.is-two-thirds{flex:none;width:66.6666%}.columns.is-mobile>.column.is-half{flex:none;width:50%}.columns.is-mobile>.column.is-one-third{flex:none;width:33.3333%}.columns.is-mobile>.column.is-one-quarter{flex:none;width:25%}.columns.is-mobile>.column.is-one-fifth{flex:none;width:20%}.columns.is-mobile>.column.is-two-fifths{flex:none;width:40%}.columns.is-mobile>.column.is-three-fifths{flex:none;width:60%}.columns.is-mobile>.column.is-four-fifths{flex:none;width:80%}.columns.is-mobile>.column.is-offset-three-quarters{margin-left:75%}.columns.is-mobile>.column.is-offset-two-thirds{margin-left:66.6666%}.columns.is-mobile>.column.is-offset-half{margin-left:50%}.columns.is-mobile>.column.is-offset-one-third{margin-left:33.3333%}.columns.is-mobile>.column.is-offset-one-quarter{margin-left:25%}.columns.is-mobile>.column.is-offset-one-fifth{margin-left:20%}.columns.is-mobile>.column.is-offset-two-fifths{margin-left:40%}.columns.is-mobile>.column.is-offset-three-fifths{margin-left:60%}.columns.is-mobile>.column.is-offset-four-fifths{margin-left:80%}.columns.is-mobile>.column.is-0{flex:none;width:0%}.columns.is-mobile>.column.is-offset-0{margin-left:0}.columns.is-mobile>.column.is-1{flex:none;width:8.33333%}.columns.is-mobile>.column.is-offset-1{margin-left:8.33333%}.columns.is-mobile>.column.is-2{flex:none;width:16.66667%}.columns.is-mobile>.column.is-offset-2{margin-left:16.66667%}.columns.is-mobile>.column.is-3{flex:none;width:25%}.columns.is-mobile>.column.is-offset-3{margin-left:25%}.columns.is-mobile>.column.is-4{flex:none;width:33.33333%}.columns.is-mobile>.column.is-offset-4{margin-left:33.33333%}.columns.is-mobile>.column.is-5{flex:none;width:41.66667%}.columns.is-mobile>.column.is-offset-5{margin-left:41.66667%}.columns.is-mobile>.column.is-6{flex:none;width:50%}.columns.is-mobile>.column.is-offset-6{margin-left:50%}.columns.is-mobile>.column.is-7{flex:none;width:58.33333%}.columns.is-mobile>.column.is-offset-7{margin-left:58.33333%}.columns.is-mobile>.column.is-8{flex:none;width:66.66667%}.columns.is-mobile>.column.is-offset-8{margin-left:66.66667%}.columns.is-mobile>.column.is-9{flex:none;width:75%}.columns.is-mobile>.column.is-offset-9{margin-left:75%}.columns.is-mobile>.column.is-10{flex:none;width:83.33333%}.columns.is-mobile>.column.is-offset-10{margin-left:83.33333%}.columns.is-mobile>.column.is-11{flex:none;width:91.66667%}.columns.is-mobile>.column.is-offset-11{margin-left:91.66667%}.columns.is-mobile>.column.is-12{flex:none;width:100%}.columns.is-mobile>.column.is-offset-12{margin-left:100%}@media screen and (max-width:768px){.column.is-narrow-mobile{flex:none;width:unset}.column.is-full-mobile{flex:none;width:100%}.column.is-three-quarters-mobile{flex:none;width:75%}.column.is-two-thirds-mobile{flex:none;width:66.6666%}.column.is-half-mobile{flex:none;width:50%}.column.is-one-third-mobile{flex:none;width:33.3333%}.column.is-one-quarter-mobile{flex:none;width:25%}.column.is-one-fifth-mobile{flex:none;width:20%}.column.is-two-fifths-mobile{flex:none;width:40%}.column.is-three-fifths-mobile{flex:none;width:60%}.column.is-four-fifths-mobile{flex:none;width:80%}.column.is-offset-three-quarters-mobile{margin-left:75%}.column.is-offset-two-thirds-mobile{margin-left:66.6666%}.column.is-offset-half-mobile{margin-left:50%}.column.is-offset-one-third-mobile{margin-left:33.3333%}.column.is-offset-one-quarter-mobile{margin-left:25%}.column.is-offset-one-fifth-mobile{margin-left:20%}.column.is-offset-two-fifths-mobile{margin-left:40%}.column.is-offset-three-fifths-mobile{margin-left:60%}.column.is-offset-four-fifths-mobile{margin-left:80%}.column.is-0-mobile{flex:none;width:0%}.column.is-offset-0-mobile{margin-left:0}.column.is-1-mobile{flex:none;width:8.33333%}.column.is-offset-1-mobile{margin-left:8.33333%}.column.is-2-mobile{flex:none;width:16.66667%}.column.is-offset-2-mobile{margin-left:16.66667%}.column.is-3-mobile{flex:none;width:25%}.column.is-offset-3-mobile{margin-left:25%}.column.is-4-mobile{flex:none;width:33.33333%}.column.is-offset-4-mobile{margin-left:33.33333%}.column.is-5-mobile{flex:none;width:41.66667%}.column.is-offset-5-mobile{margin-left:41.66667%}.column.is-6-mobile{flex:none;width:50%}.column.is-offset-6-mobile{margin-left:50%}.column.is-7-mobile{flex:none;width:58.33333%}.column.is-offset-7-mobile{margin-left:58.33333%}.column.is-8-mobile{flex:none;width:66.66667%}.column.is-offset-8-mobile{margin-left:66.66667%}.column.is-9-mobile{flex:none;width:75%}.column.is-offset-9-mobile{margin-left:75%}.column.is-10-mobile{flex:none;width:83.33333%}.column.is-offset-10-mobile{margin-left:83.33333%}.column.is-11-mobile{flex:none;width:91.66667%}.column.is-offset-11-mobile{margin-left:91.66667%}.column.is-12-mobile{flex:none;width:100%}.column.is-offset-12-mobile{margin-left:100%}}@media screen and (min-width:769px),print{.column.is-narrow,.column.is-narrow-tablet{flex:none;width:unset}.column.is-full,.column.is-full-tablet{flex:none;width:100%}.column.is-three-quarters,.column.is-three-quarters-tablet{flex:none;width:75%}.column.is-two-thirds,.column.is-two-thirds-tablet{flex:none;width:66.6666%}.column.is-half,.column.is-half-tablet{flex:none;width:50%}.column.is-one-third,.column.is-one-third-tablet{flex:none;width:33.3333%}.column.is-one-quarter,.column.is-one-quarter-tablet{flex:none;width:25%}.column.is-one-fifth,.column.is-one-fifth-tablet{flex:none;width:20%}.column.is-two-fifths,.column.is-two-fifths-tablet{flex:none;width:40%}.column.is-three-fifths,.column.is-three-fifths-tablet{flex:none;width:60%}.column.is-four-fifths,.column.is-four-fifths-tablet{flex:none;width:80%}.column.is-offset-three-quarters,.column.is-offset-three-quarters-tablet{margin-left:75%}.column.is-offset-two-thirds,.column.is-offset-two-thirds-tablet{margin-left:66.6666%}.column.is-offset-half,.column.is-offset-half-tablet{margin-left:50%}.column.is-offset-one-third,.column.is-offset-one-third-tablet{margin-left:33.3333%}.column.is-offset-one-quarter,.column.is-offset-one-quarter-tablet{margin-left:25%}.column.is-offset-one-fifth,.column.is-offset-one-fifth-tablet{margin-left:20%}.column.is-offset-two-fifths,.column.is-offset-two-fifths-tablet{margin-left:40%}.column.is-offset-three-fifths,.column.is-offset-three-fifths-tablet{margin-left:60%}.column.is-offset-four-fifths,.column.is-offset-four-fifths-tablet{margin-left:80%}.column.is-0,.column.is-0-tablet{flex:none;width:0%}.column.is-offset-0,.column.is-offset-0-tablet{margin-left:0}.column.is-1,.column.is-1-tablet{flex:none;width:8.33333%}.column.is-offset-1,.column.is-offset-1-tablet{margin-left:8.33333%}.column.is-2,.column.is-2-tablet{flex:none;width:16.66667%}.column.is-offset-2,.column.is-offset-2-tablet{margin-left:16.66667%}.column.is-3,.column.is-3-tablet{flex:none;width:25%}.column.is-offset-3,.column.is-offset-3-tablet{margin-left:25%}.column.is-4,.column.is-4-tablet{flex:none;width:33.33333%}.column.is-offset-4,.column.is-offset-4-tablet{margin-left:33.33333%}.column.is-5,.column.is-5-tablet{flex:none;width:41.66667%}.column.is-offset-5,.column.is-offset-5-tablet{margin-left:41.66667%}.column.is-6,.column.is-6-tablet{flex:none;width:50%}.column.is-offset-6,.column.is-offset-6-tablet{margin-left:50%}.column.is-7,.column.is-7-tablet{flex:none;width:58.33333%}.column.is-offset-7,.column.is-offset-7-tablet{margin-left:58.33333%}.column.is-8,.column.is-8-tablet{flex:none;width:66.66667%}.column.is-offset-8,.column.is-offset-8-tablet{margin-left:66.66667%}.column.is-9,.column.is-9-tablet{flex:none;width:75%}.column.is-offset-9,.column.is-offset-9-tablet{margin-left:75%}.column.is-10,.column.is-10-tablet{flex:none;width:83.33333%}.column.is-offset-10,.column.is-offset-10-tablet{margin-left:83.33333%}.column.is-11,.column.is-11-tablet{flex:none;width:91.66667%}.column.is-offset-11,.column.is-offset-11-tablet{margin-left:91.66667%}.column.is-12,.column.is-12-tablet{flex:none;width:100%}.column.is-offset-12,.column.is-offset-12-tablet{margin-left:100%}}@media screen and (max-width:1023px){.column.is-narrow-touch{flex:none;width:unset}.column.is-full-touch{flex:none;width:100%}.column.is-three-quarters-touch{flex:none;width:75%}.column.is-two-thirds-touch{flex:none;width:66.6666%}.column.is-half-touch{flex:none;width:50%}.column.is-one-third-touch{flex:none;width:33.3333%}.column.is-one-quarter-touch{flex:none;width:25%}.column.is-one-fifth-touch{flex:none;width:20%}.column.is-two-fifths-touch{flex:none;width:40%}.column.is-three-fifths-touch{flex:none;width:60%}.column.is-four-fifths-touch{flex:none;width:80%}.column.is-offset-three-quarters-touch{margin-left:75%}.column.is-offset-two-thirds-touch{margin-left:66.6666%}.column.is-offset-half-touch{margin-left:50%}.column.is-offset-one-third-touch{margin-left:33.3333%}.column.is-offset-one-quarter-touch{margin-left:25%}.column.is-offset-one-fifth-touch{margin-left:20%}.column.is-offset-two-fifths-touch{margin-left:40%}.column.is-offset-three-fifths-touch{margin-left:60%}.column.is-offset-four-fifths-touch{margin-left:80%}.column.is-0-touch{flex:none;width:0%}.column.is-offset-0-touch{margin-left:0}.column.is-1-touch{flex:none;width:8.33333%}.column.is-offset-1-touch{margin-left:8.33333%}.column.is-2-touch{flex:none;width:16.66667%}.column.is-offset-2-touch{margin-left:16.66667%}.column.is-3-touch{flex:none;width:25%}.column.is-offset-3-touch{margin-left:25%}.column.is-4-touch{flex:none;width:33.33333%}.column.is-offset-4-touch{margin-left:33.33333%}.column.is-5-touch{flex:none;width:41.66667%}.column.is-offset-5-touch{margin-left:41.66667%}.column.is-6-touch{flex:none;width:50%}.column.is-offset-6-touch{margin-left:50%}.column.is-7-touch{flex:none;width:58.33333%}.column.is-offset-7-touch{margin-left:58.33333%}.column.is-8-touch{flex:none;width:66.66667%}.column.is-offset-8-touch{margin-left:66.66667%}.column.is-9-touch{flex:none;width:75%}.column.is-offset-9-touch{margin-left:75%}.column.is-10-touch{flex:none;width:83.33333%}.column.is-offset-10-touch{margin-left:83.33333%}.column.is-11-touch{flex:none;width:91.66667%}.column.is-offset-11-touch{margin-left:91.66667%}.column.is-12-touch{flex:none;width:100%}.column.is-offset-12-touch{margin-left:100%}}@media screen and (min-width:1024px){.column.is-narrow-desktop{flex:none;width:unset}.column.is-full-desktop{flex:none;width:100%}.column.is-three-quarters-desktop{flex:none;width:75%}.column.is-two-thirds-desktop{flex:none;width:66.6666%}.column.is-half-desktop{flex:none;width:50%}.column.is-one-third-desktop{flex:none;width:33.3333%}.column.is-one-quarter-desktop{flex:none;width:25%}.column.is-one-fifth-desktop{flex:none;width:20%}.column.is-two-fifths-desktop{flex:none;width:40%}.column.is-three-fifths-desktop{flex:none;width:60%}.column.is-four-fifths-desktop{flex:none;width:80%}.column.is-offset-three-quarters-desktop{margin-left:75%}.column.is-offset-two-thirds-desktop{margin-left:66.6666%}.column.is-offset-half-desktop{margin-left:50%}.column.is-offset-one-third-desktop{margin-left:33.3333%}.column.is-offset-one-quarter-desktop{margin-left:25%}.column.is-offset-one-fifth-desktop{margin-left:20%}.column.is-offset-two-fifths-desktop{margin-left:40%}.column.is-offset-three-fifths-desktop{margin-left:60%}.column.is-offset-four-fifths-desktop{margin-left:80%}.column.is-0-desktop{flex:none;width:0%}.column.is-offset-0-desktop{margin-left:0}.column.is-1-desktop{flex:none;width:8.33333%}.column.is-offset-1-desktop{margin-left:8.33333%}.column.is-2-desktop{flex:none;width:16.66667%}.column.is-offset-2-desktop{margin-left:16.66667%}.column.is-3-desktop{flex:none;width:25%}.column.is-offset-3-desktop{margin-left:25%}.column.is-4-desktop{flex:none;width:33.33333%}.column.is-offset-4-desktop{margin-left:33.33333%}.column.is-5-desktop{flex:none;width:41.66667%}.column.is-offset-5-desktop{margin-left:41.66667%}.column.is-6-desktop{flex:none;width:50%}.column.is-offset-6-desktop{margin-left:50%}.column.is-7-desktop{flex:none;width:58.33333%}.column.is-offset-7-desktop{margin-left:58.33333%}.column.is-8-desktop{flex:none;width:66.66667%}.column.is-offset-8-desktop{margin-left:66.66667%}.column.is-9-desktop{flex:none;width:75%}.column.is-offset-9-desktop{margin-left:75%}.column.is-10-desktop{flex:none;width:83.33333%}.column.is-offset-10-desktop{margin-left:83.33333%}.column.is-11-desktop{flex:none;width:91.66667%}.column.is-offset-11-desktop{margin-left:91.66667%}.column.is-12-desktop{flex:none;width:100%}.column.is-offset-12-desktop{margin-left:100%}}@media screen and (min-width:1216px){.column.is-narrow-widescreen{flex:none;width:unset}.column.is-full-widescreen{flex:none;width:100%}.column.is-three-quarters-widescreen{flex:none;width:75%}.column.is-two-thirds-widescreen{flex:none;width:66.6666%}.column.is-half-widescreen{flex:none;width:50%}.column.is-one-third-widescreen{flex:none;width:33.3333%}.column.is-one-quarter-widescreen{flex:none;width:25%}.column.is-one-fifth-widescreen{flex:none;width:20%}.column.is-two-fifths-widescreen{flex:none;width:40%}.column.is-three-fifths-widescreen{flex:none;width:60%}.column.is-four-fifths-widescreen{flex:none;width:80%}.column.is-offset-three-quarters-widescreen{margin-left:75%}.column.is-offset-two-thirds-widescreen{margin-left:66.6666%}.column.is-offset-half-widescreen{margin-left:50%}.column.is-offset-one-third-widescreen{margin-left:33.3333%}.column.is-offset-one-quarter-widescreen{margin-left:25%}.column.is-offset-one-fifth-widescreen{margin-left:20%}.column.is-offset-two-fifths-widescreen{margin-left:40%}.column.is-offset-three-fifths-widescreen{margin-left:60%}.column.is-offset-four-fifths-widescreen{margin-left:80%}.column.is-0-widescreen{flex:none;width:0%}.column.is-offset-0-widescreen{margin-left:0}.column.is-1-widescreen{flex:none;width:8.33333%}.column.is-offset-1-widescreen{margin-left:8.33333%}.column.is-2-widescreen{flex:none;width:16.66667%}.column.is-offset-2-widescreen{margin-left:16.66667%}.column.is-3-widescreen{flex:none;width:25%}.column.is-offset-3-widescreen{margin-left:25%}.column.is-4-widescreen{flex:none;width:33.33333%}.column.is-offset-4-widescreen{margin-left:33.33333%}.column.is-5-widescreen{flex:none;width:41.66667%}.column.is-offset-5-widescreen{margin-left:41.66667%}.column.is-6-widescreen{flex:none;width:50%}.column.is-offset-6-widescreen{margin-left:50%}.column.is-7-widescreen{flex:none;width:58.33333%}.column.is-offset-7-widescreen{margin-left:58.33333%}.column.is-8-widescreen{flex:none;width:66.66667%}.column.is-offset-8-widescreen{margin-left:66.66667%}.column.is-9-widescreen{flex:none;width:75%}.column.is-offset-9-widescreen{margin-left:75%}.column.is-10-widescreen{flex:none;width:83.33333%}.column.is-offset-10-widescreen{margin-left:83.33333%}.column.is-11-widescreen{flex:none;width:91.66667%}.column.is-offset-11-widescreen{margin-left:91.66667%}.column.is-12-widescreen{flex:none;width:100%}.column.is-offset-12-widescreen{margin-left:100%}}@media screen and (min-width:1408px){.column.is-narrow-fullhd{flex:none;width:unset}.column.is-full-fullhd{flex:none;width:100%}.column.is-three-quarters-fullhd{flex:none;width:75%}.column.is-two-thirds-fullhd{flex:none;width:66.6666%}.column.is-half-fullhd{flex:none;width:50%}.column.is-one-third-fullhd{flex:none;width:33.3333%}.column.is-one-quarter-fullhd{flex:none;width:25%}.column.is-one-fifth-fullhd{flex:none;width:20%}.column.is-two-fifths-fullhd{flex:none;width:40%}.column.is-three-fifths-fullhd{flex:none;width:60%}.column.is-four-fifths-fullhd{flex:none;width:80%}.column.is-offset-three-quarters-fullhd{margin-left:75%}.column.is-offset-two-thirds-fullhd{margin-left:66.6666%}.column.is-offset-half-fullhd{margin-left:50%}.column.is-offset-one-third-fullhd{margin-left:33.3333%}.column.is-offset-one-quarter-fullhd{margin-left:25%}.column.is-offset-one-fifth-fullhd{margin-left:20%}.column.is-offset-two-fifths-fullhd{margin-left:40%}.column.is-offset-three-fifths-fullhd{margin-left:60%}.column.is-offset-four-fifths-fullhd{margin-left:80%}.column.is-0-fullhd{flex:none;width:0%}.column.is-offset-0-fullhd{margin-left:0}.column.is-1-fullhd{flex:none;width:8.33333%}.column.is-offset-1-fullhd{margin-left:8.33333%}.column.is-2-fullhd{flex:none;width:16.66667%}.column.is-offset-2-fullhd{margin-left:16.66667%}.column.is-3-fullhd{flex:none;width:25%}.column.is-offset-3-fullhd{margin-left:25%}.column.is-4-fullhd{flex:none;width:33.33333%}.column.is-offset-4-fullhd{margin-left:33.33333%}.column.is-5-fullhd{flex:none;width:41.66667%}.column.is-offset-5-fullhd{margin-left:41.66667%}.column.is-6-fullhd{flex:none;width:50%}.column.is-offset-6-fullhd{margin-left:50%}.column.is-7-fullhd{flex:none;width:58.33333%}.column.is-offset-7-fullhd{margin-left:58.33333%}.column.is-8-fullhd{flex:none;width:66.66667%}.column.is-offset-8-fullhd{margin-left:66.66667%}.column.is-9-fullhd{flex:none;width:75%}.column.is-offset-9-fullhd{margin-left:75%}.column.is-10-fullhd{flex:none;width:83.33333%}.column.is-offset-10-fullhd{margin-left:83.33333%}.column.is-11-fullhd{flex:none;width:91.66667%}.column.is-offset-11-fullhd{margin-left:91.66667%}.column.is-12-fullhd{flex:none;width:100%}.column.is-offset-12-fullhd{margin-left:100%}}.columns{margin-left:-.75rem;margin-right:-.75rem;margin-top:-.75rem}.columns:last-child{margin-bottom:-.75rem}.columns:not(:last-child){margin-bottom:calc(1.5rem - .75rem)}.columns.is-centered{justify-content:center}.columns.is-gapless{margin-left:0;margin-right:0;margin-top:0}.columns.is-gapless>.column{margin:0;padding:0!important}.columns.is-gapless:not(:last-child){margin-bottom:1.5rem}.columns.is-gapless:last-child{margin-bottom:0}.columns.is-mobile{display:flex}.columns.is-multiline{flex-wrap:wrap}.columns.is-vcentered{align-items:center}@media screen and (min-width:769px),print{.columns:not(.is-desktop){display:flex}}@media screen and (min-width:1024px){.columns.is-desktop{display:flex}}.columns.is-variable{--columnGap:0.75rem;margin-left:calc(-1 * var(--columnGap));margin-right:calc(-1 * var(--columnGap))}.columns.is-variable>.column{padding-left:var(--columnGap);padding-right:var(--columnGap)}.columns.is-variable.is-0{--columnGap:0rem}@media screen and (max-width:768px){.columns.is-variable.is-0-mobile{--columnGap:0rem}}@media screen and (min-width:769px),print{.columns.is-variable.is-0-tablet{--columnGap:0rem}}@media screen and (min-width:769px) and (max-width:1023px){.columns.is-variable.is-0-tablet-only{--columnGap:0rem}}@media screen and (max-width:1023px){.columns.is-variable.is-0-touch{--columnGap:0rem}}@media screen and (min-width:1024px){.columns.is-variable.is-0-desktop{--columnGap:0rem}}@media screen and (min-width:1024px) and (max-width:1215px){.columns.is-variable.is-0-desktop-only{--columnGap:0rem}}@media screen and (min-width:1216px){.columns.is-variable.is-0-widescreen{--columnGap:0rem}}@media screen and (min-width:1216px) and (max-width:1407px){.columns.is-variable.is-0-widescreen-only{--columnGap:0rem}}@media screen and (min-width:1408px){.columns.is-variable.is-0-fullhd{--columnGap:0rem}}.columns.is-variable.is-1{--columnGap:0.25rem}@media screen and (max-width:768px){.columns.is-variable.is-1-mobile{--columnGap:0.25rem}}@media screen and (min-width:769px),print{.columns.is-variable.is-1-tablet{--columnGap:0.25rem}}@media screen and (min-width:769px) and (max-width:1023px){.columns.is-variable.is-1-tablet-only{--columnGap:0.25rem}}@media screen and (max-width:1023px){.columns.is-variable.is-1-touch{--columnGap:0.25rem}}@media screen and (min-width:1024px){.columns.is-variable.is-1-desktop{--columnGap:0.25rem}}@media screen and (min-width:1024px) and (max-width:1215px){.columns.is-variable.is-1-desktop-only{--columnGap:0.25rem}}@media screen and (min-width:1216px){.columns.is-variable.is-1-widescreen{--columnGap:0.25rem}}@media screen and (min-width:1216px) and (max-width:1407px){.columns.is-variable.is-1-widescreen-only{--columnGap:0.25rem}}@media screen and (min-width:1408px){.columns.is-variable.is-1-fullhd{--columnGap:0.25rem}}.columns.is-variable.is-2{--columnGap:0.5rem}@media screen and (max-width:768px){.columns.is-variable.is-2-mobile{--columnGap:0.5rem}}@media screen and (min-width:769px),print{.columns.is-variable.is-2-tablet{--columnGap:0.5rem}}@media screen and (min-width:769px) and (max-width:1023px){.columns.is-variable.is-2-tablet-only{--columnGap:0.5rem}}@media screen and (max-width:1023px){.columns.is-variable.is-2-touch{--columnGap:0.5rem}}@media screen and (min-width:1024px){.columns.is-variable.is-2-desktop{--columnGap:0.5rem}}@media screen and (min-width:1024px) and (max-width:1215px){.columns.is-variable.is-2-desktop-only{--columnGap:0.5rem}}@media screen and (min-width:1216px){.columns.is-variable.is-2-widescreen{--columnGap:0.5rem}}@media screen and (min-width:1216px) and (max-width:1407px){.columns.is-variable.is-2-widescreen-only{--columnGap:0.5rem}}@media screen and (min-width:1408px){.columns.is-variable.is-2-fullhd{--columnGap:0.5rem}}.columns.is-variable.is-3{--columnGap:0.75rem}@media screen and (max-width:768px){.columns.is-variable.is-3-mobile{--columnGap:0.75rem}}@media screen and (min-width:769px),print{.columns.is-variable.is-3-tablet{--columnGap:0.75rem}}@media screen and (min-width:769px) and (max-width:1023px){.columns.is-variable.is-3-tablet-only{--columnGap:0.75rem}}@media screen and (max-width:1023px){.columns.is-variable.is-3-touch{--columnGap:0.75rem}}@media screen and (min-width:1024px){.columns.is-variable.is-3-desktop{--columnGap:0.75rem}}@media screen and (min-width:1024px) and (max-width:1215px){.columns.is-variable.is-3-desktop-only{--columnGap:0.75rem}}@media screen and (min-width:1216px){.columns.is-variable.is-3-widescreen{--columnGap:0.75rem}}@media screen and (min-width:1216px) and (max-width:1407px){.columns.is-variable.is-3-widescreen-only{--columnGap:0.75rem}}@media screen and (min-width:1408px){.columns.is-variable.is-3-fullhd{--columnGap:0.75rem}}.columns.is-variable.is-4{--columnGap:1rem}@media screen and (max-width:768px){.columns.is-variable.is-4-mobile{--columnGap:1rem}}@media screen and (min-width:769px),print{.columns.is-variable.is-4-tablet{--columnGap:1rem}}@media screen and (min-width:769px) and (max-width:1023px){.columns.is-variable.is-4-tablet-only{--columnGap:1rem}}@media screen and (max-width:1023px){.columns.is-variable.is-4-touch{--columnGap:1rem}}@media screen and (min-width:1024px){.columns.is-variable.is-4-desktop{--columnGap:1rem}}@media screen and (min-width:1024px) and (max-width:1215px){.columns.is-variable.is-4-desktop-only{--columnGap:1rem}}@media screen and (min-width:1216px){.columns.is-variable.is-4-widescreen{--columnGap:1rem}}@media screen and (min-width:1216px) and (max-width:1407px){.columns.is-variable.is-4-widescreen-only{--columnGap:1rem}}@media screen and (min-width:1408px){.columns.is-variable.is-4-fullhd{--columnGap:1rem}}.columns.is-variable.is-5{--columnGap:1.25rem}@media screen and (max-width:768px){.columns.is-variable.is-5-mobile{--columnGap:1.25rem}}@media screen and (min-width:769px),print{.columns.is-variable.is-5-tablet{--columnGap:1.25rem}}@media screen and (min-width:769px) and (max-width:1023px){.columns.is-variable.is-5-tablet-only{--columnGap:1.25rem}}@media screen and (max-width:1023px){.columns.is-variable.is-5-touch{--columnGap:1.25rem}}@media screen and (min-width:1024px){.columns.is-variable.is-5-desktop{--columnGap:1.25rem}}@media screen and (min-width:1024px) and (max-width:1215px){.columns.is-variable.is-5-desktop-only{--columnGap:1.25rem}}@media screen and (min-width:1216px){.columns.is-variable.is-5-widescreen{--columnGap:1.25rem}}@media screen and (min-width:1216px) and (max-width:1407px){.columns.is-variable.is-5-widescreen-only{--columnGap:1.25rem}}@media screen and (min-width:1408px){.columns.is-variable.is-5-fullhd{--columnGap:1.25rem}}.columns.is-variable.is-6{--columnGap:1.5rem}@media screen and (max-width:768px){.columns.is-variable.is-6-mobile{--columnGap:1.5rem}}@media screen and (min-width:769px),print{.columns.is-variable.is-6-tablet{--columnGap:1.5rem}}@media screen and (min-width:769px) and (max-width:1023px){.columns.is-variable.is-6-tablet-only{--columnGap:1.5rem}}@media screen and (max-width:1023px){.columns.is-variable.is-6-touch{--columnGap:1.5rem}}@media screen and (min-width:1024px){.columns.is-variable.is-6-desktop{--columnGap:1.5rem}}@media screen and (min-width:1024px) and (max-width:1215px){.columns.is-variable.is-6-desktop-only{--columnGap:1.5rem}}@media screen and (min-width:1216px){.columns.is-variable.is-6-widescreen{--columnGap:1.5rem}}@media screen and (min-width:1216px) and (max-width:1407px){.columns.is-variable.is-6-widescreen-only{--columnGap:1.5rem}}@media screen and (min-width:1408px){.columns.is-variable.is-6-fullhd{--columnGap:1.5rem}}.columns.is-variable.is-7{--columnGap:1.75rem}@media screen and (max-width:768px){.columns.is-variable.is-7-mobile{--columnGap:1.75rem}}@media screen and (min-width:769px),print{.columns.is-variable.is-7-tablet{--columnGap:1.75rem}}@media screen and (min-width:769px) and (max-width:1023px){.columns.is-variable.is-7-tablet-only{--columnGap:1.75rem}}@media screen and (max-width:1023px){.columns.is-variable.is-7-touch{--columnGap:1.75rem}}@media screen and (min-width:1024px){.columns.is-variable.is-7-desktop{--columnGap:1.75rem}}@media screen and (min-width:1024px) and (max-width:1215px){.columns.is-variable.is-7-desktop-only{--columnGap:1.75rem}}@media screen and (min-width:1216px){.columns.is-variable.is-7-widescreen{--columnGap:1.75rem}}@media screen and (min-width:1216px) and (max-width:1407px){.columns.is-variable.is-7-widescreen-only{--columnGap:1.75rem}}@media screen and (min-width:1408px){.columns.is-variable.is-7-fullhd{--columnGap:1.75rem}}.columns.is-variable.is-8{--columnGap:2rem}@media screen and (max-width:768px){.columns.is-variable.is-8-mobile{--columnGap:2rem}}@media screen and (min-width:769px),print{.columns.is-variable.is-8-tablet{--columnGap:2rem}}@media screen and (min-width:769px) and (max-width:1023px){.columns.is-variable.is-8-tablet-only{--columnGap:2rem}}@media screen and (max-width:1023px){.columns.is-variable.is-8-touch{--columnGap:2rem}}@media screen and (min-width:1024px){.columns.is-variable.is-8-desktop{--columnGap:2rem}}@media screen and (min-width:1024px) and (max-width:1215px){.columns.is-variable.is-8-desktop-only{--columnGap:2rem}}@media screen and (min-width:1216px){.columns.is-variable.is-8-widescreen{--columnGap:2rem}}@media screen and (min-width:1216px) and (max-width:1407px){.columns.is-variable.is-8-widescreen-only{--columnGap:2rem}}@media screen and (min-width:1408px){.columns.is-variable.is-8-fullhd{--columnGap:2rem}}.tile{align-items:stretch;display:block;flex-basis:0;flex-grow:1;flex-shrink:1;min-height:-webkit-min-content;min-height:-moz-min-content;min-height:min-content}.tile.is-ancestor{margin-left:-.75rem;margin-right:-.75rem;margin-top:-.75rem}.tile.is-ancestor:last-child{margin-bottom:-.75rem}.tile.is-ancestor:not(:last-child){margin-bottom:.75rem}.tile.is-child{margin:0!important}.tile.is-parent{padding:.75rem}.tile.is-vertical{flex-direction:column}.tile.is-vertical>.tile.is-child:not(:last-child){margin-bottom:1.5rem!important}@media screen and (min-width:769px),print{.tile:not(.is-child){display:flex}.tile.is-1{flex:none;width:8.33333%}.tile.is-2{flex:none;width:16.66667%}.tile.is-3{flex:none;width:25%}.tile.is-4{flex:none;width:33.33333%}.tile.is-5{flex:none;width:41.66667%}.tile.is-6{flex:none;width:50%}.tile.is-7{flex:none;width:58.33333%}.tile.is-8{flex:none;width:66.66667%}.tile.is-9{flex:none;width:75%}.tile.is-10{flex:none;width:83.33333%}.tile.is-11{flex:none;width:91.66667%}.tile.is-12{flex:none;width:100%}}.has-text-white{color:#fff!important}a.has-text-white:focus,a.has-text-white:hover{color:#e6e6e6!important}.has-background-white{background-color:#fff!important}.has-text-black{color:#0a0a0a!important}a.has-text-black:focus,a.has-text-black:hover{color:#000!important}.has-background-black{background-color:#0a0a0a!important}.has-text-light{color:#f5f5f5!important}a.has-text-light:focus,a.has-text-light:hover{color:#dbdbdb!important}.has-background-light{background-color:#f5f5f5!important}.has-text-dark{color:#363636!important}a.has-text-dark:focus,a.has-text-dark:hover{color:#1c1c1c!important}.has-background-dark{background-color:#363636!important}.has-text-primary{color:#00d1b2!important}a.has-text-primary:focus,a.has-text-primary:hover{color:#009e86!important}.has-background-primary{background-color:#00d1b2!important}.has-text-primary-light{color:#ebfffc!important}a.has-text-primary-light:focus,a.has-text-primary-light:hover{color:#b8fff4!important}.has-background-primary-light{background-color:#ebfffc!important}.has-text-primary-dark{color:#00947e!important}a.has-text-primary-dark:focus,a.has-text-primary-dark:hover{color:#00c7a9!important}.has-background-primary-dark{background-color:#00947e!important}.has-text-link{color:#3273dc!important}a.has-text-link:focus,a.has-text-link:hover{color:#205bbc!important}.has-background-link{background-color:#3273dc!important}.has-text-link-light{color:#eef3fc!important}a.has-text-link-light:focus,a.has-text-link-light:hover{color:#c2d5f5!important}.has-background-link-light{background-color:#eef3fc!important}.has-text-link-dark{color:#2160c4!important}a.has-text-link-dark:focus,a.has-text-link-dark:hover{color:#3b79de!important}.has-background-link-dark{background-color:#2160c4!important}.has-text-info{color:#3298dc!important}a.has-text-info:focus,a.has-text-info:hover{color:#207dbc!important}.has-background-info{background-color:#3298dc!important}.has-text-info-light{color:#eef6fc!important}a.has-text-info-light:focus,a.has-text-info-light:hover{color:#c2e0f5!important}.has-background-info-light{background-color:#eef6fc!important}.has-text-info-dark{color:#1d72aa!important}a.has-text-info-dark:focus,a.has-text-info-dark:hover{color:#248fd6!important}.has-background-info-dark{background-color:#1d72aa!important}.has-text-success{color:#48c774!important}a.has-text-success:focus,a.has-text-success:hover{color:#34a85c!important}.has-background-success{background-color:#48c774!important}.has-text-success-light{color:#effaf3!important}a.has-text-success-light:focus,a.has-text-success-light:hover{color:#c8eed6!important}.has-background-success-light{background-color:#effaf3!important}.has-text-success-dark{color:#257942!important}a.has-text-success-dark:focus,a.has-text-success-dark:hover{color:#31a058!important}.has-background-success-dark{background-color:#257942!important}.has-text-warning{color:#ffdd57!important}a.has-text-warning:focus,a.has-text-warning:hover{color:#ffd324!important}.has-background-warning{background-color:#ffdd57!important}.has-text-warning-light{color:#fffbeb!important}a.has-text-warning-light:focus,a.has-text-warning-light:hover{color:#fff1b8!important}.has-background-warning-light{background-color:#fffbeb!important}.has-text-warning-dark{color:#947600!important}a.has-text-warning-dark:focus,a.has-text-warning-dark:hover{color:#c79f00!important}.has-background-warning-dark{background-color:#947600!important}.has-text-danger{color:#f14668!important}a.has-text-danger:focus,a.has-text-danger:hover{color:#ee1742!important}.has-background-danger{background-color:#f14668!important}.has-text-danger-light{color:#feecf0!important}a.has-text-danger-light:focus,a.has-text-danger-light:hover{color:#fabdc9!important}.has-background-danger-light{background-color:#feecf0!important}.has-text-danger-dark{color:#cc0f35!important}a.has-text-danger-dark:focus,a.has-text-danger-dark:hover{color:#ee2049!important}.has-background-danger-dark{background-color:#cc0f35!important}.has-text-black-bis{color:#121212!important}.has-background-black-bis{background-color:#121212!important}.has-text-black-ter{color:#242424!important}.has-background-black-ter{background-color:#242424!important}.has-text-grey-darker{color:#363636!important}.has-background-grey-darker{background-color:#363636!important}.has-text-grey-dark{color:#4a4a4a!important}.has-background-grey-dark{background-color:#4a4a4a!important}.has-text-grey{color:#7a7a7a!important}.has-background-grey{background-color:#7a7a7a!important}.has-text-grey-light{color:#b5b5b5!important}.has-background-grey-light{background-color:#b5b5b5!important}.has-text-grey-lighter{color:#dbdbdb!important}.has-background-grey-lighter{background-color:#dbdbdb!important}.has-text-white-ter{color:#f5f5f5!important}.has-background-white-ter{background-color:#f5f5f5!important}.has-text-white-bis{color:#fafafa!important}.has-background-white-bis{background-color:#fafafa!important}.is-flex-direction-row{flex-direction:row!important}.is-flex-direction-row-reverse{flex-direction:row-reverse!important}.is-flex-direction-column{flex-direction:column!important}.is-flex-direction-column-reverse{flex-direction:column-reverse!important}.is-flex-wrap-nowrap{flex-wrap:nowrap!important}.is-flex-wrap-wrap{flex-wrap:wrap!important}.is-flex-wrap-wrap-reverse{flex-wrap:wrap-reverse!important}.is-justify-content-flex-start{justify-content:flex-start!important}.is-justify-content-flex-end{justify-content:flex-end!important}.is-justify-content-center{justify-content:center!important}.is-justify-content-space-between{justify-content:space-between!important}.is-justify-content-space-around{justify-content:space-around!important}.is-justify-content-space-evenly{justify-content:space-evenly!important}.is-justify-content-start{justify-content:start!important}.is-justify-content-end{justify-content:end!important}.is-justify-content-left{justify-content:left!important}.is-justify-content-right{justify-content:right!important}.is-align-content-flex-start{align-content:flex-start!important}.is-align-content-flex-end{align-content:flex-end!important}.is-align-content-center{align-content:center!important}.is-align-content-space-between{align-content:space-between!important}.is-align-content-space-around{align-content:space-around!important}.is-align-content-space-evenly{align-content:space-evenly!important}.is-align-content-stretch{align-content:stretch!important}.is-align-content-start{align-content:start!important}.is-align-content-end{align-content:end!important}.is-align-content-baseline{align-content:baseline!important}.is-align-items-stretch{align-items:stretch!important}.is-align-items-flex-start{align-items:flex-start!important}.is-align-items-flex-end{align-items:flex-end!important}.is-align-items-center{align-items:center!important}.is-align-items-baseline{align-items:baseline!important}.is-align-items-start{align-items:start!important}.is-align-items-end{align-items:end!important}.is-align-items-self-start{align-items:self-start!important}.is-align-items-self-end{align-items:self-end!important}.is-align-self-auto{align-self:auto!important}.is-align-self-flex-start{align-self:flex-start!important}.is-align-self-flex-end{align-self:flex-end!important}.is-align-self-center{align-self:center!important}.is-align-self-baseline{align-self:baseline!important}.is-align-self-stretch{align-self:stretch!important}.is-flex-grow-0{flex-grow:0!important}.is-flex-grow-1{flex-grow:1!important}.is-flex-grow-2{flex-grow:2!important}.is-flex-grow-3{flex-grow:3!important}.is-flex-grow-4{flex-grow:4!important}.is-flex-grow-5{flex-grow:5!important}.is-flex-shrink-0{flex-shrink:0!important}.is-flex-shrink-1{flex-shrink:1!important}.is-flex-shrink-2{flex-shrink:2!important}.is-flex-shrink-3{flex-shrink:3!important}.is-flex-shrink-4{flex-shrink:4!important}.is-flex-shrink-5{flex-shrink:5!important}.is-clearfix::after{clear:both;content:" ";display:table}.is-pulled-left{float:left!important}.is-pulled-right{float:right!important}.is-radiusless{border-radius:0!important}.is-shadowless{box-shadow:none!important}.is-clickable{cursor:pointer!important;pointer-events:all!important}.is-clipped{overflow:hidden!important}.is-relative{position:relative!important}.is-marginless{margin:0!important}.is-paddingless{padding:0!important}.m-0{margin:0!important}.mt-0{margin-top:0!important}.mr-0{margin-right:0!important}.mb-0{margin-bottom:0!important}.ml-0{margin-left:0!important}.mx-0{margin-left:0!important;margin-right:0!important}.my-0{margin-top:0!important;margin-bottom:0!important}.m-1{margin:.25rem!important}.mt-1{margin-top:.25rem!important}.mr-1{margin-right:.25rem!important}.mb-1{margin-bottom:.25rem!important}.ml-1{margin-left:.25rem!important}.mx-1{margin-left:.25rem!important;margin-right:.25rem!important}.my-1{margin-top:.25rem!important;margin-bottom:.25rem!important}.m-2{margin:.5rem!important}.mt-2{margin-top:.5rem!important}.mr-2{margin-right:.5rem!important}.mb-2{margin-bottom:.5rem!important}.ml-2{margin-left:.5rem!important}.mx-2{margin-left:.5rem!important;margin-right:.5rem!important}.my-2{margin-top:.5rem!important;margin-bottom:.5rem!important}.m-3{margin:.75rem!important}.mt-3{margin-top:.75rem!important}.mr-3{margin-right:.75rem!important}.mb-3{margin-bottom:.75rem!important}.ml-3{margin-left:.75rem!important}.mx-3{margin-left:.75rem!important;margin-right:.75rem!important}.my-3{margin-top:.75rem!important;margin-bottom:.75rem!important}.m-4{margin:1rem!important}.mt-4{margin-top:1rem!important}.mr-4{margin-right:1rem!important}.mb-4{margin-bottom:1rem!important}.ml-4{margin-left:1rem!important}.mx-4{margin-left:1rem!important;margin-right:1rem!important}.my-4{margin-top:1rem!important;margin-bottom:1rem!important}.m-5{margin:1.5rem!important}.mt-5{margin-top:1.5rem!important}.mr-5{margin-right:1.5rem!important}.mb-5{margin-bottom:1.5rem!important}.ml-5{margin-left:1.5rem!important}.mx-5{margin-left:1.5rem!important;margin-right:1.5rem!important}.my-5{margin-top:1.5rem!important;margin-bottom:1.5rem!important}.m-6{margin:3rem!important}.mt-6{margin-top:3rem!important}.mr-6{margin-right:3rem!important}.mb-6{margin-bottom:3rem!important}.ml-6{margin-left:3rem!important}.mx-6{margin-left:3rem!important;margin-right:3rem!important}.my-6{margin-top:3rem!important;margin-bottom:3rem!important}.p-0{padding:0!important}.pt-0{padding-top:0!important}.pr-0{padding-right:0!important}.pb-0{padding-bottom:0!important}.pl-0{padding-left:0!important}.px-0{padding-left:0!important;padding-right:0!important}.py-0{padding-top:0!important;padding-bottom:0!important}.p-1{padding:.25rem!important}.pt-1{padding-top:.25rem!important}.pr-1{padding-right:.25rem!important}.pb-1{padding-bottom:.25rem!important}.pl-1{padding-left:.25rem!important}.px-1{padding-left:.25rem!important;padding-right:.25rem!important}.py-1{padding-top:.25rem!important;padding-bottom:.25rem!important}.p-2{padding:.5rem!important}.pt-2{padding-top:.5rem!important}.pr-2{padding-right:.5rem!important}.pb-2{padding-bottom:.5rem!important}.pl-2{padding-left:.5rem!important}.px-2{padding-left:.5rem!important;padding-right:.5rem!important}.py-2{padding-top:.5rem!important;padding-bottom:.5rem!important}.p-3{padding:.75rem!important}.pt-3{padding-top:.75rem!important}.pr-3{padding-right:.75rem!important}.pb-3{padding-bottom:.75rem!important}.pl-3{padding-left:.75rem!important}.px-3{padding-left:.75rem!important;padding-right:.75rem!important}.py-3{padding-top:.75rem!important;padding-bottom:.75rem!important}.p-4{padding:1rem!important}.pt-4{padding-top:1rem!important}.pr-4{padding-right:1rem!important}.pb-4{padding-bottom:1rem!important}.pl-4{padding-left:1rem!important}.px-4{padding-left:1rem!important;padding-right:1rem!important}.py-4{padding-top:1rem!important;padding-bottom:1rem!important}.p-5{padding:1.5rem!important}.pt-5{padding-top:1.5rem!important}.pr-5{padding-right:1.5rem!important}.pb-5{padding-bottom:1.5rem!important}.pl-5{padding-left:1.5rem!important}.px-5{padding-left:1.5rem!important;padding-right:1.5rem!important}.py-5{padding-top:1.5rem!important;padding-bottom:1.5rem!important}.p-6{padding:3rem!important}.pt-6{padding-top:3rem!important}.pr-6{padding-right:3rem!important}.pb-6{padding-bottom:3rem!important}.pl-6{padding-left:3rem!important}.px-6{padding-left:3rem!important;padding-right:3rem!important}.py-6{padding-top:3rem!important;padding-bottom:3rem!important}.is-size-1{font-size:3rem!important}.is-size-2{font-size:2.5rem!important}.is-size-3{font-size:2rem!important}.is-size-4{font-size:1.5rem!important}.is-size-5{font-size:1.25rem!important}.is-size-6{font-size:1rem!important}.is-size-7{font-size:.75rem!important}@media screen and (max-width:768px){.is-size-1-mobile{font-size:3rem!important}.is-size-2-mobile{font-size:2.5rem!important}.is-size-3-mobile{font-size:2rem!important}.is-size-4-mobile{font-size:1.5rem!important}.is-size-5-mobile{font-size:1.25rem!important}.is-size-6-mobile{font-size:1rem!important}.is-size-7-mobile{font-size:.75rem!important}}@media screen and (min-width:769px),print{.is-size-1-tablet{font-size:3rem!important}.is-size-2-tablet{font-size:2.5rem!important}.is-size-3-tablet{font-size:2rem!important}.is-size-4-tablet{font-size:1.5rem!important}.is-size-5-tablet{font-size:1.25rem!important}.is-size-6-tablet{font-size:1rem!important}.is-size-7-tablet{font-size:.75rem!important}}@media screen and (max-width:1023px){.is-size-1-touch{font-size:3rem!important}.is-size-2-touch{font-size:2.5rem!important}.is-size-3-touch{font-size:2rem!important}.is-size-4-touch{font-size:1.5rem!important}.is-size-5-touch{font-size:1.25rem!important}.is-size-6-touch{font-size:1rem!important}.is-size-7-touch{font-size:.75rem!important}}@media screen and (min-width:1024px){.is-size-1-desktop{font-size:3rem!important}.is-size-2-desktop{font-size:2.5rem!important}.is-size-3-desktop{font-size:2rem!important}.is-size-4-desktop{font-size:1.5rem!important}.is-size-5-desktop{font-size:1.25rem!important}.is-size-6-desktop{font-size:1rem!important}.is-size-7-desktop{font-size:.75rem!important}}@media screen and (min-width:1216px){.is-size-1-widescreen{font-size:3rem!important}.is-size-2-widescreen{font-size:2.5rem!important}.is-size-3-widescreen{font-size:2rem!important}.is-size-4-widescreen{font-size:1.5rem!important}.is-size-5-widescreen{font-size:1.25rem!important}.is-size-6-widescreen{font-size:1rem!important}.is-size-7-widescreen{font-size:.75rem!important}}@media screen and (min-width:1408px){.is-size-1-fullhd{font-size:3rem!important}.is-size-2-fullhd{font-size:2.5rem!important}.is-size-3-fullhd{font-size:2rem!important}.is-size-4-fullhd{font-size:1.5rem!important}.is-size-5-fullhd{font-size:1.25rem!important}.is-size-6-fullhd{font-size:1rem!important}.is-size-7-fullhd{font-size:.75rem!important}}.has-text-centered{text-align:center!important}.has-text-justified{text-align:justify!important}.has-text-left{text-align:left!important}.has-text-right{text-align:right!important}@media screen and (max-width:768px){.has-text-centered-mobile{text-align:center!important}}@media screen and (min-width:769px),print{.has-text-centered-tablet{text-align:center!important}}@media screen and (min-width:769px) and (max-width:1023px){.has-text-centered-tablet-only{text-align:center!important}}@media screen and (max-width:1023px){.has-text-centered-touch{text-align:center!important}}@media screen and (min-width:1024px){.has-text-centered-desktop{text-align:center!important}}@media screen and (min-width:1024px) and (max-width:1215px){.has-text-centered-desktop-only{text-align:center!important}}@media screen and (min-width:1216px){.has-text-centered-widescreen{text-align:center!important}}@media screen and (min-width:1216px) and (max-width:1407px){.has-text-centered-widescreen-only{text-align:center!important}}@media screen and (min-width:1408px){.has-text-centered-fullhd{text-align:center!important}}@media screen and (max-width:768px){.has-text-justified-mobile{text-align:justify!important}}@media screen and (min-width:769px),print{.has-text-justified-tablet{text-align:justify!important}}@media screen and (min-width:769px) and (max-width:1023px){.has-text-justified-tablet-only{text-align:justify!important}}@media screen and (max-width:1023px){.has-text-justified-touch{text-align:justify!important}}@media screen and (min-width:1024px){.has-text-justified-desktop{text-align:justify!important}}@media screen and (min-width:1024px) and (max-width:1215px){.has-text-justified-desktop-only{text-align:justify!important}}@media screen and (min-width:1216px){.has-text-justified-widescreen{text-align:justify!important}}@media screen and (min-width:1216px) and (max-width:1407px){.has-text-justified-widescreen-only{text-align:justify!important}}@media screen and (min-width:1408px){.has-text-justified-fullhd{text-align:justify!important}}@media screen and (max-width:768px){.has-text-left-mobile{text-align:left!important}}@media screen and (min-width:769px),print{.has-text-left-tablet{text-align:left!important}}@media screen and (min-width:769px) and (max-width:1023px){.has-text-left-tablet-only{text-align:left!important}}@media screen and (max-width:1023px){.has-text-left-touch{text-align:left!important}}@media screen and (min-width:1024px){.has-text-left-desktop{text-align:left!important}}@media screen and (min-width:1024px) and (max-width:1215px){.has-text-left-desktop-only{text-align:left!important}}@media screen and (min-width:1216px){.has-text-left-widescreen{text-align:left!important}}@media screen and (min-width:1216px) and (max-width:1407px){.has-text-left-widescreen-only{text-align:left!important}}@media screen and (min-width:1408px){.has-text-left-fullhd{text-align:left!important}}@media screen and (max-width:768px){.has-text-right-mobile{text-align:right!important}}@media screen and (min-width:769px),print{.has-text-right-tablet{text-align:right!important}}@media screen and (min-width:769px) and (max-width:1023px){.has-text-right-tablet-only{text-align:right!important}}@media screen and (max-width:1023px){.has-text-right-touch{text-align:right!important}}@media screen and (min-width:1024px){.has-text-right-desktop{text-align:right!important}}@media screen and (min-width:1024px) and (max-width:1215px){.has-text-right-desktop-only{text-align:right!important}}@media screen and (min-width:1216px){.has-text-right-widescreen{text-align:right!important}}@media screen and (min-width:1216px) and (max-width:1407px){.has-text-right-widescreen-only{text-align:right!important}}@media screen and (min-width:1408px){.has-text-right-fullhd{text-align:right!important}}.is-capitalized{text-transform:capitalize!important}.is-lowercase{text-transform:lowercase!important}.is-uppercase{text-transform:uppercase!important}.is-italic{font-style:italic!important}.has-text-weight-light{font-weight:300!important}.has-text-weight-normal{font-weight:400!important}.has-text-weight-medium{font-weight:500!important}.has-text-weight-semibold{font-weight:600!important}.has-text-weight-bold{font-weight:700!important}.is-family-primary{font-family:BlinkMacSystemFont,-apple-system,"Segoe UI",Roboto,Oxygen,Ubuntu,Cantarell,"Fira Sans","Droid Sans","Helvetica Neue",Helvetica,Arial,sans-serif!important}.is-family-secondary{font-family:BlinkMacSystemFont,-apple-system,"Segoe UI",Roboto,Oxygen,Ubuntu,Cantarell,"Fira Sans","Droid Sans","Helvetica Neue",Helvetica,Arial,sans-serif!important}.is-family-sans-serif{font-family:BlinkMacSystemFont,-apple-system,"Segoe UI",Roboto,Oxygen,Ubuntu,Cantarell,"Fira Sans","Droid Sans","Helvetica Neue",Helvetica,Arial,sans-serif!important}.is-family-monospace{font-family:monospace!important}.is-family-code{font-family:monospace!important}.is-block{display:block!important}@media screen and (max-width:768px){.is-block-mobile{display:block!important}}@media screen and (min-width:769px),print{.is-block-tablet{display:block!important}}@media screen and (min-width:769px) and (max-width:1023px){.is-block-tablet-only{display:block!important}}@media screen and (max-width:1023px){.is-block-touch{display:block!important}}@media screen and (min-width:1024px){.is-block-desktop{display:block!important}}@media screen and (min-width:1024px) and (max-width:1215px){.is-block-desktop-only{display:block!important}}@media screen and (min-width:1216px){.is-block-widescreen{display:block!important}}@media screen and (min-width:1216px) and (max-width:1407px){.is-block-widescreen-only{display:block!important}}@media screen and (min-width:1408px){.is-block-fullhd{display:block!important}}.is-flex{display:flex!important}@media screen and (max-width:768px){.is-flex-mobile{display:flex!important}}@media screen and (min-width:769px),print{.is-flex-tablet{display:flex!important}}@media screen and (min-width:769px) and (max-width:1023px){.is-flex-tablet-only{display:flex!important}}@media screen and (max-width:1023px){.is-flex-touch{display:flex!important}}@media screen and (min-width:1024px){.is-flex-desktop{display:flex!important}}@media screen and (min-width:1024px) and (max-width:1215px){.is-flex-desktop-only{display:flex!important}}@media screen and (min-width:1216px){.is-flex-widescreen{display:flex!important}}@media screen and (min-width:1216px) and (max-width:1407px){.is-flex-widescreen-only{display:flex!important}}@media screen and (min-width:1408px){.is-flex-fullhd{display:flex!important}}.is-inline{display:inline!important}@media screen and (max-width:768px){.is-inline-mobile{display:inline!important}}@media screen and (min-width:769px),print{.is-inline-tablet{display:inline!important}}@media screen and (min-width:769px) and (max-width:1023px){.is-inline-tablet-only{display:inline!important}}@media screen and (max-width:1023px){.is-inline-touch{display:inline!important}}@media screen and (min-width:1024px){.is-inline-desktop{display:inline!important}}@media screen and (min-width:1024px) and (max-width:1215px){.is-inline-desktop-only{display:inline!important}}@media screen and (min-width:1216px){.is-inline-widescreen{display:inline!important}}@media screen and (min-width:1216px) and (max-width:1407px){.is-inline-widescreen-only{display:inline!important}}@media screen and (min-width:1408px){.is-inline-fullhd{display:inline!important}}.is-inline-block{display:inline-block!important}@media screen and (max-width:768px){.is-inline-block-mobile{display:inline-block!important}}@media screen and (min-width:769px),print{.is-inline-block-tablet{display:inline-block!important}}@media screen and (min-width:769px) and (max-width:1023px){.is-inline-block-tablet-only{display:inline-block!important}}@media screen and (max-width:1023px){.is-inline-block-touch{display:inline-block!important}}@media screen and (min-width:1024px){.is-inline-block-desktop{display:inline-block!important}}@media screen and (min-width:1024px) and (max-width:1215px){.is-inline-block-desktop-only{display:inline-block!important}}@media screen and (min-width:1216px){.is-inline-block-widescreen{display:inline-block!important}}@media screen and (min-width:1216px) and (max-width:1407px){.is-inline-block-widescreen-only{display:inline-block!important}}@media screen and (min-width:1408px){.is-inline-block-fullhd{display:inline-block!important}}.is-inline-flex{display:inline-flex!important}@media screen and (max-width:768px){.is-inline-flex-mobile{display:inline-flex!important}}@media screen and (min-width:769px),print{.is-inline-flex-tablet{display:inline-flex!important}}@media screen and (min-width:769px) and (max-width:1023px){.is-inline-flex-tablet-only{display:inline-flex!important}}@media screen and (max-width:1023px){.is-inline-flex-touch{display:inline-flex!important}}@media screen and (min-width:1024px){.is-inline-flex-desktop{display:inline-flex!important}}@media screen and (min-width:1024px) and (max-width:1215px){.is-inline-flex-desktop-only{display:inline-flex!important}}@media screen and (min-width:1216px){.is-inline-flex-widescreen{display:inline-flex!important}}@media screen and (min-width:1216px) and (max-width:1407px){.is-inline-flex-widescreen-only{display:inline-flex!important}}@media screen and (min-width:1408px){.is-inline-flex-fullhd{display:inline-flex!important}}.is-hidden{display:none!important}.is-sr-only{border:none!important;clip:rect(0,0,0,0)!important;height:.01em!important;overflow:hidden!important;padding:0!important;position:absolute!important;white-space:nowrap!important;width:.01em!important}@media screen and (max-width:768px){.is-hidden-mobile{display:none!important}}@media screen and (min-width:769px),print{.is-hidden-tablet{display:none!important}}@media screen and (min-width:769px) and (max-width:1023px){.is-hidden-tablet-only{display:none!important}}@media screen and (max-width:1023px){.is-hidden-touch{display:none!important}}@media screen and (min-width:1024px){.is-hidden-desktop{display:none!important}}@media screen and (min-width:1024px) and (max-width:1215px){.is-hidden-desktop-only{display:none!important}}@media screen and (min-width:1216px){.is-hidden-widescreen{display:none!important}}@media screen and (min-width:1216px) and (max-width:1407px){.is-hidden-widescreen-only{display:none!important}}@media screen and (min-width:1408px){.is-hidden-fullhd{display:none!important}}.is-invisible{visibility:hidden!important}@media screen and (max-width:768px){.is-invisible-mobile{visibility:hidden!important}}@media screen and (min-width:769px),print{.is-invisible-tablet{visibility:hidden!important}}@media screen and (min-width:769px) and (max-width:1023px){.is-invisible-tablet-only{visibility:hidden!important}}@media screen and (max-width:1023px){.is-invisible-touch{visibility:hidden!important}}@media screen and (min-width:1024px){.is-invisible-desktop{visibility:hidden!important}}@media screen and (min-width:1024px) and (max-width:1215px){.is-invisible-desktop-only{visibility:hidden!important}}@media screen and (min-width:1216px){.is-invisible-widescreen{visibility:hidden!important}}@media screen and (min-width:1216px) and (max-width:1407px){.is-invisible-widescreen-only{visibility:hidden!important}}@media screen and (min-width:1408px){.is-invisible-fullhd{visibility:hidden!important}}.hero{align-items:stretch;display:flex;flex-direction:column;justify-content:space-between}.hero .navbar{background:0 0}.hero .tabs ul{border-bottom:none}.hero.is-white{background-color:#fff;color:#0a0a0a}.hero.is-white a:not(.button):not(.dropdown-item):not(.tag):not(.pagination-link.is-current),.hero.is-white strong{color:inherit}.hero.is-white .title{color:#0a0a0a}.hero.is-white .subtitle{color:rgba(10,10,10,.9)}.hero.is-white .subtitle a:not(.button),.hero.is-white .subtitle strong{color:#0a0a0a}@media screen and (max-width:1023px){.hero.is-white .navbar-menu{background-color:#fff}}.hero.is-white .navbar-item,.hero.is-white .navbar-link{color:rgba(10,10,10,.7)}.hero.is-white .navbar-link.is-active,.hero.is-white .navbar-link:hover,.hero.is-white a.navbar-item.is-active,.hero.is-white a.navbar-item:hover{background-color:#f2f2f2;color:#0a0a0a}.hero.is-white .tabs a{color:#0a0a0a;opacity:.9}.hero.is-white .tabs a:hover{opacity:1}.hero.is-white .tabs li.is-active a{opacity:1}.hero.is-white .tabs.is-boxed a,.hero.is-white .tabs.is-toggle a{color:#0a0a0a}.hero.is-white .tabs.is-boxed a:hover,.hero.is-white .tabs.is-toggle a:hover{background-color:rgba(10,10,10,.1)}.hero.is-white .tabs.is-boxed li.is-active a,.hero.is-white .tabs.is-boxed li.is-active a:hover,.hero.is-white .tabs.is-toggle li.is-active a,.hero.is-white .tabs.is-toggle li.is-active a:hover{background-color:#0a0a0a;border-color:#0a0a0a;color:#fff}.hero.is-white.is-bold{background-image:linear-gradient(141deg,#e6e6e6 0,#fff 71%,#fff 100%)}@media screen and (max-width:768px){.hero.is-white.is-bold .navbar-menu{background-image:linear-gradient(141deg,#e6e6e6 0,#fff 71%,#fff 100%)}}.hero.is-black{background-color:#0a0a0a;color:#fff}.hero.is-black a:not(.button):not(.dropdown-item):not(.tag):not(.pagination-link.is-current),.hero.is-black strong{color:inherit}.hero.is-black .title{color:#fff}.hero.is-black .subtitle{color:rgba(255,255,255,.9)}.hero.is-black .subtitle a:not(.button),.hero.is-black .subtitle strong{color:#fff}@media screen and (max-width:1023px){.hero.is-black .navbar-menu{background-color:#0a0a0a}}.hero.is-black .navbar-item,.hero.is-black .navbar-link{color:rgba(255,255,255,.7)}.hero.is-black .navbar-link.is-active,.hero.is-black .navbar-link:hover,.hero.is-black a.navbar-item.is-active,.hero.is-black a.navbar-item:hover{background-color:#000;color:#fff}.hero.is-black .tabs a{color:#fff;opacity:.9}.hero.is-black .tabs a:hover{opacity:1}.hero.is-black .tabs li.is-active a{opacity:1}.hero.is-black .tabs.is-boxed a,.hero.is-black .tabs.is-toggle a{color:#fff}.hero.is-black .tabs.is-boxed a:hover,.hero.is-black .tabs.is-toggle a:hover{background-color:rgba(10,10,10,.1)}.hero.is-black .tabs.is-boxed li.is-active a,.hero.is-black .tabs.is-boxed li.is-active a:hover,.hero.is-black .tabs.is-toggle li.is-active a,.hero.is-black .tabs.is-toggle li.is-active a:hover{background-color:#fff;border-color:#fff;color:#0a0a0a}.hero.is-black.is-bold{background-image:linear-gradient(141deg,#000 0,#0a0a0a 71%,#181616 100%)}@media screen and (max-width:768px){.hero.is-black.is-bold .navbar-menu{background-image:linear-gradient(141deg,#000 0,#0a0a0a 71%,#181616 100%)}}.hero.is-light{background-color:#f5f5f5;color:rgba(0,0,0,.7)}.hero.is-light a:not(.button):not(.dropdown-item):not(.tag):not(.pagination-link.is-current),.hero.is-light strong{color:inherit}.hero.is-light .title{color:rgba(0,0,0,.7)}.hero.is-light .subtitle{color:rgba(0,0,0,.9)}.hero.is-light .subtitle a:not(.button),.hero.is-light .subtitle strong{color:rgba(0,0,0,.7)}@media screen and (max-width:1023px){.hero.is-light .navbar-menu{background-color:#f5f5f5}}.hero.is-light .navbar-item,.hero.is-light .navbar-link{color:rgba(0,0,0,.7)}.hero.is-light .navbar-link.is-active,.hero.is-light .navbar-link:hover,.hero.is-light a.navbar-item.is-active,.hero.is-light a.navbar-item:hover{background-color:#e8e8e8;color:rgba(0,0,0,.7)}.hero.is-light .tabs a{color:rgba(0,0,0,.7);opacity:.9}.hero.is-light .tabs a:hover{opacity:1}.hero.is-light .tabs li.is-active a{opacity:1}.hero.is-light .tabs.is-boxed a,.hero.is-light .tabs.is-toggle a{color:rgba(0,0,0,.7)}.hero.is-light .tabs.is-boxed a:hover,.hero.is-light .tabs.is-toggle a:hover{background-color:rgba(10,10,10,.1)}.hero.is-light .tabs.is-boxed li.is-active a,.hero.is-light .tabs.is-boxed li.is-active a:hover,.hero.is-light .tabs.is-toggle li.is-active a,.hero.is-light .tabs.is-toggle li.is-active a:hover{background-color:rgba(0,0,0,.7);border-color:rgba(0,0,0,.7);color:#f5f5f5}.hero.is-light.is-bold{background-image:linear-gradient(141deg,#dfd8d9 0,#f5f5f5 71%,#fff 100%)}@media screen and (max-width:768px){.hero.is-light.is-bold .navbar-menu{background-image:linear-gradient(141deg,#dfd8d9 0,#f5f5f5 71%,#fff 100%)}}.hero.is-dark{background-color:#363636;color:#fff}.hero.is-dark a:not(.button):not(.dropdown-item):not(.tag):not(.pagination-link.is-current),.hero.is-dark strong{color:inherit}.hero.is-dark .title{color:#fff}.hero.is-dark .subtitle{color:rgba(255,255,255,.9)}.hero.is-dark .subtitle a:not(.button),.hero.is-dark .subtitle strong{color:#fff}@media screen and (max-width:1023px){.hero.is-dark .navbar-menu{background-color:#363636}}.hero.is-dark .navbar-item,.hero.is-dark .navbar-link{color:rgba(255,255,255,.7)}.hero.is-dark .navbar-link.is-active,.hero.is-dark .navbar-link:hover,.hero.is-dark a.navbar-item.is-active,.hero.is-dark a.navbar-item:hover{background-color:#292929;color:#fff}.hero.is-dark .tabs a{color:#fff;opacity:.9}.hero.is-dark .tabs a:hover{opacity:1}.hero.is-dark .tabs li.is-active a{opacity:1}.hero.is-dark .tabs.is-boxed a,.hero.is-dark .tabs.is-toggle a{color:#fff}.hero.is-dark .tabs.is-boxed a:hover,.hero.is-dark .tabs.is-toggle a:hover{background-color:rgba(10,10,10,.1)}.hero.is-dark .tabs.is-boxed li.is-active a,.hero.is-dark .tabs.is-boxed li.is-active a:hover,.hero.is-dark .tabs.is-toggle li.is-active a,.hero.is-dark .tabs.is-toggle li.is-active a:hover{background-color:#fff;border-color:#fff;color:#363636}.hero.is-dark.is-bold{background-image:linear-gradient(141deg,#1f191a 0,#363636 71%,#46403f 100%)}@media screen and (max-width:768px){.hero.is-dark.is-bold .navbar-menu{background-image:linear-gradient(141deg,#1f191a 0,#363636 71%,#46403f 100%)}}.hero.is-primary{background-color:#00d1b2;color:#fff}.hero.is-primary a:not(.button):not(.dropdown-item):not(.tag):not(.pagination-link.is-current),.hero.is-primary strong{color:inherit}.hero.is-primary .title{color:#fff}.hero.is-primary .subtitle{color:rgba(255,255,255,.9)}.hero.is-primary .subtitle a:not(.button),.hero.is-primary .subtitle strong{color:#fff}@media screen and (max-width:1023px){.hero.is-primary .navbar-menu{background-color:#00d1b2}}.hero.is-primary .navbar-item,.hero.is-primary .navbar-link{color:rgba(255,255,255,.7)}.hero.is-primary .navbar-link.is-active,.hero.is-primary .navbar-link:hover,.hero.is-primary a.navbar-item.is-active,.hero.is-primary a.navbar-item:hover{background-color:#00b89c;color:#fff}.hero.is-primary .tabs a{color:#fff;opacity:.9}.hero.is-primary .tabs a:hover{opacity:1}.hero.is-primary .tabs li.is-active a{opacity:1}.hero.is-primary .tabs.is-boxed a,.hero.is-primary .tabs.is-toggle a{color:#fff}.hero.is-primary .tabs.is-boxed a:hover,.hero.is-primary .tabs.is-toggle a:hover{background-color:rgba(10,10,10,.1)}.hero.is-primary .tabs.is-boxed li.is-active a,.hero.is-primary .tabs.is-boxed li.is-active a:hover,.hero.is-primary .tabs.is-toggle li.is-active a,.hero.is-primary .tabs.is-toggle li.is-active a:hover{background-color:#fff;border-color:#fff;color:#00d1b2}.hero.is-primary.is-bold{background-image:linear-gradient(141deg,#009e6c 0,#00d1b2 71%,#00e7eb 100%)}@media screen and (max-width:768px){.hero.is-primary.is-bold .navbar-menu{background-image:linear-gradient(141deg,#009e6c 0,#00d1b2 71%,#00e7eb 100%)}}.hero.is-link{background-color:#3273dc;color:#fff}.hero.is-link a:not(.button):not(.dropdown-item):not(.tag):not(.pagination-link.is-current),.hero.is-link strong{color:inherit}.hero.is-link .title{color:#fff}.hero.is-link .subtitle{color:rgba(255,255,255,.9)}.hero.is-link .subtitle a:not(.button),.hero.is-link .subtitle strong{color:#fff}@media screen and (max-width:1023px){.hero.is-link .navbar-menu{background-color:#3273dc}}.hero.is-link .navbar-item,.hero.is-link .navbar-link{color:rgba(255,255,255,.7)}.hero.is-link .navbar-link.is-active,.hero.is-link .navbar-link:hover,.hero.is-link a.navbar-item.is-active,.hero.is-link a.navbar-item:hover{background-color:#2366d1;color:#fff}.hero.is-link .tabs a{color:#fff;opacity:.9}.hero.is-link .tabs a:hover{opacity:1}.hero.is-link .tabs li.is-active a{opacity:1}.hero.is-link .tabs.is-boxed a,.hero.is-link .tabs.is-toggle a{color:#fff}.hero.is-link .tabs.is-boxed a:hover,.hero.is-link .tabs.is-toggle a:hover{background-color:rgba(10,10,10,.1)}.hero.is-link .tabs.is-boxed li.is-active a,.hero.is-link .tabs.is-boxed li.is-active a:hover,.hero.is-link .tabs.is-toggle li.is-active a,.hero.is-link .tabs.is-toggle li.is-active a:hover{background-color:#fff;border-color:#fff;color:#3273dc}.hero.is-link.is-bold{background-image:linear-gradient(141deg,#1577c6 0,#3273dc 71%,#4366e5 100%)}@media screen and (max-width:768px){.hero.is-link.is-bold .navbar-menu{background-image:linear-gradient(141deg,#1577c6 0,#3273dc 71%,#4366e5 100%)}}.hero.is-info{background-color:#3298dc;color:#fff}.hero.is-info a:not(.button):not(.dropdown-item):not(.tag):not(.pagination-link.is-current),.hero.is-info strong{color:inherit}.hero.is-info .title{color:#fff}.hero.is-info .subtitle{color:rgba(255,255,255,.9)}.hero.is-info .subtitle a:not(.button),.hero.is-info .subtitle strong{color:#fff}@media screen and (max-width:1023px){.hero.is-info .navbar-menu{background-color:#3298dc}}.hero.is-info .navbar-item,.hero.is-info .navbar-link{color:rgba(255,255,255,.7)}.hero.is-info .navbar-link.is-active,.hero.is-info .navbar-link:hover,.hero.is-info a.navbar-item.is-active,.hero.is-info a.navbar-item:hover{background-color:#238cd1;color:#fff}.hero.is-info .tabs a{color:#fff;opacity:.9}.hero.is-info .tabs a:hover{opacity:1}.hero.is-info .tabs li.is-active a{opacity:1}.hero.is-info .tabs.is-boxed a,.hero.is-info .tabs.is-toggle a{color:#fff}.hero.is-info .tabs.is-boxed a:hover,.hero.is-info .tabs.is-toggle a:hover{background-color:rgba(10,10,10,.1)}.hero.is-info .tabs.is-boxed li.is-active a,.hero.is-info .tabs.is-boxed li.is-active a:hover,.hero.is-info .tabs.is-toggle li.is-active a,.hero.is-info .tabs.is-toggle li.is-active a:hover{background-color:#fff;border-color:#fff;color:#3298dc}.hero.is-info.is-bold{background-image:linear-gradient(141deg,#159dc6 0,#3298dc 71%,#4389e5 100%)}@media screen and (max-width:768px){.hero.is-info.is-bold .navbar-menu{background-image:linear-gradient(141deg,#159dc6 0,#3298dc 71%,#4389e5 100%)}}.hero.is-success{background-color:#48c774;color:#fff}.hero.is-success a:not(.button):not(.dropdown-item):not(.tag):not(.pagination-link.is-current),.hero.is-success strong{color:inherit}.hero.is-success .title{color:#fff}.hero.is-success .subtitle{color:rgba(255,255,255,.9)}.hero.is-success .subtitle a:not(.button),.hero.is-success .subtitle strong{color:#fff}@media screen and (max-width:1023px){.hero.is-success .navbar-menu{background-color:#48c774}}.hero.is-success .navbar-item,.hero.is-success .navbar-link{color:rgba(255,255,255,.7)}.hero.is-success .navbar-link.is-active,.hero.is-success .navbar-link:hover,.hero.is-success a.navbar-item.is-active,.hero.is-success a.navbar-item:hover{background-color:#3abb67;color:#fff}.hero.is-success .tabs a{color:#fff;opacity:.9}.hero.is-success .tabs a:hover{opacity:1}.hero.is-success .tabs li.is-active a{opacity:1}.hero.is-success .tabs.is-boxed a,.hero.is-success .tabs.is-toggle a{color:#fff}.hero.is-success .tabs.is-boxed a:hover,.hero.is-success .tabs.is-toggle a:hover{background-color:rgba(10,10,10,.1)}.hero.is-success .tabs.is-boxed li.is-active a,.hero.is-success .tabs.is-boxed li.is-active a:hover,.hero.is-success .tabs.is-toggle li.is-active a,.hero.is-success .tabs.is-toggle li.is-active a:hover{background-color:#fff;border-color:#fff;color:#48c774}.hero.is-success.is-bold{background-image:linear-gradient(141deg,#29b342 0,#48c774 71%,#56d296 100%)}@media screen and (max-width:768px){.hero.is-success.is-bold .navbar-menu{background-image:linear-gradient(141deg,#29b342 0,#48c774 71%,#56d296 100%)}}.hero.is-warning{background-color:#ffdd57;color:rgba(0,0,0,.7)}.hero.is-warning a:not(.button):not(.dropdown-item):not(.tag):not(.pagination-link.is-current),.hero.is-warning strong{color:inherit}.hero.is-warning .title{color:rgba(0,0,0,.7)}.hero.is-warning .subtitle{color:rgba(0,0,0,.9)}.hero.is-warning .subtitle a:not(.button),.hero.is-warning .subtitle strong{color:rgba(0,0,0,.7)}@media screen and (max-width:1023px){.hero.is-warning .navbar-menu{background-color:#ffdd57}}.hero.is-warning .navbar-item,.hero.is-warning .navbar-link{color:rgba(0,0,0,.7)}.hero.is-warning .navbar-link.is-active,.hero.is-warning .navbar-link:hover,.hero.is-warning a.navbar-item.is-active,.hero.is-warning a.navbar-item:hover{background-color:#ffd83d;color:rgba(0,0,0,.7)}.hero.is-warning .tabs a{color:rgba(0,0,0,.7);opacity:.9}.hero.is-warning .tabs a:hover{opacity:1}.hero.is-warning .tabs li.is-active a{opacity:1}.hero.is-warning .tabs.is-boxed a,.hero.is-warning .tabs.is-toggle a{color:rgba(0,0,0,.7)}.hero.is-warning .tabs.is-boxed a:hover,.hero.is-warning .tabs.is-toggle a:hover{background-color:rgba(10,10,10,.1)}.hero.is-warning .tabs.is-boxed li.is-active a,.hero.is-warning .tabs.is-boxed li.is-active a:hover,.hero.is-warning .tabs.is-toggle li.is-active a,.hero.is-warning .tabs.is-toggle li.is-active a:hover{background-color:rgba(0,0,0,.7);border-color:rgba(0,0,0,.7);color:#ffdd57}.hero.is-warning.is-bold{background-image:linear-gradient(141deg,#ffaf24 0,#ffdd57 71%,#fffa70 100%)}@media screen and (max-width:768px){.hero.is-warning.is-bold .navbar-menu{background-image:linear-gradient(141deg,#ffaf24 0,#ffdd57 71%,#fffa70 100%)}}.hero.is-danger{background-color:#f14668;color:#fff}.hero.is-danger a:not(.button):not(.dropdown-item):not(.tag):not(.pagination-link.is-current),.hero.is-danger strong{color:inherit}.hero.is-danger .title{color:#fff}.hero.is-danger .subtitle{color:rgba(255,255,255,.9)}.hero.is-danger .subtitle a:not(.button),.hero.is-danger .subtitle strong{color:#fff}@media screen and (max-width:1023px){.hero.is-danger .navbar-menu{background-color:#f14668}}.hero.is-danger .navbar-item,.hero.is-danger .navbar-link{color:rgba(255,255,255,.7)}.hero.is-danger .navbar-link.is-active,.hero.is-danger .navbar-link:hover,.hero.is-danger a.navbar-item.is-active,.hero.is-danger a.navbar-item:hover{background-color:#ef2e55;color:#fff}.hero.is-danger .tabs a{color:#fff;opacity:.9}.hero.is-danger .tabs a:hover{opacity:1}.hero.is-danger .tabs li.is-active a{opacity:1}.hero.is-danger .tabs.is-boxed a,.hero.is-danger .tabs.is-toggle a{color:#fff}.hero.is-danger .tabs.is-boxed a:hover,.hero.is-danger .tabs.is-toggle a:hover{background-color:rgba(10,10,10,.1)}.hero.is-danger .tabs.is-boxed li.is-active a,.hero.is-danger .tabs.is-boxed li.is-active a:hover,.hero.is-danger .tabs.is-toggle li.is-active a,.hero.is-danger .tabs.is-toggle li.is-active a:hover{background-color:#fff;border-color:#fff;color:#f14668}.hero.is-danger.is-bold{background-image:linear-gradient(141deg,#fa0a62 0,#f14668 71%,#f7595f 100%)}@media screen and (max-width:768px){.hero.is-danger.is-bold .navbar-menu{background-image:linear-gradient(141deg,#fa0a62 0,#f14668 71%,#f7595f 100%)}}.hero.is-small .hero-body{padding:1.5rem}@media screen and (min-width:769px),print{.hero.is-medium .hero-body{padding:9rem 1.5rem}}@media screen and (min-width:769px),print{.hero.is-large .hero-body{padding:18rem 1.5rem}}.hero.is-fullheight .hero-body,.hero.is-fullheight-with-navbar .hero-body,.hero.is-halfheight .hero-body{align-items:center;display:flex}.hero.is-fullheight .hero-body>.container,.hero.is-fullheight-with-navbar .hero-body>.container,.hero.is-halfheight .hero-body>.container{flex-grow:1;flex-shrink:1}.hero.is-halfheight{min-height:50vh}.hero.is-fullheight{min-height:100vh}.hero-video{overflow:hidden}.hero-video video{left:50%;min-height:100%;min-width:100%;position:absolute;top:50%;transform:translate3d(-50%,-50%,0)}.hero-video.is-transparent{opacity:.3}@media screen and (max-width:768px){.hero-video{display:none}}.hero-buttons{margin-top:1.5rem}@media screen and (max-width:768px){.hero-buttons .button{display:flex}.hero-buttons .button:not(:last-child){margin-bottom:.75rem}}@media screen and (min-width:769px),print{.hero-buttons{display:flex;justify-content:center}.hero-buttons .button:not(:last-child){margin-right:1.5rem}}.hero-foot,.hero-head{flex-grow:0;flex-shrink:0}.hero-body{flex-grow:1;flex-shrink:0;padding:3rem 1.5rem}.section{padding:3rem 1.5rem}@media screen and (min-width:1024px){.section.is-medium{padding:9rem 1.5rem}.section.is-large{padding:18rem 1.5rem}}.footer{background-color:#fafafa;padding:3rem 1.5rem 6rem}

From 0cb80aeb55f531f40f493457cb78b33363091522 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 26 Apr 2021 07:24:03 -0700
Subject: [PATCH 0955/1285] Preserve search results after adding a book

---
 bookwyrm/templates/lists/list.html | 2 +-
 bookwyrm/views/list.py             | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index a9f8e5c0..80e2ba20 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -116,7 +116,7 @@
             </div>
             <div class="column">
                 <p>{% include 'snippets/book_titleby.html' with book=book %}</p>
-                <form name="add-book" method="post" action="{% url 'list-add-book' %}">
+                <form name="add-book" method="post" action="{% url 'list-add-book' %}{% if query %}?q={{ query }}{% endif %}">
                     {% csrf_token %}
                     <input type="hidden" name="book" value="{{ book.id }}">
                     <input type="hidden" name="list" value="{{ list.id }}">
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index a2cf7afe..fe7bba54 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -1,5 +1,6 @@
 """ book list views"""
 from typing import Optional
+from urllib.parse import urlencode
 
 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
@@ -9,6 +10,7 @@ from django.db.models.functions import Coalesce
 from django.http import HttpResponseNotFound, HttpResponseBadRequest, HttpResponse
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
+from django.urls import reverse
 from django.utils.decorators import method_decorator
 from django.views import View
 from django.views.decorators.http import require_POST
@@ -263,7 +265,8 @@ def add_book(request):
         # if the book is already on the list, don't flip out
         pass
 
-    return redirect("list", book_list.id)
+    path = reverse('list', args=[book_list.id])
+    return redirect("{:s}?{:s}".format(path, urlencode(request.GET)))
 
 
 @require_POST

From 0f6b5cc6be4ea11014322aa206bdc217f751405e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 26 Apr 2021 08:02:30 -0700
Subject: [PATCH 0956/1285] Filter list search results to hide already added
 books

---
 bookwyrm/connectors/connector_manager.py |  6 ++++--
 bookwyrm/connectors/self_connector.py    | 17 +++++++++--------
 bookwyrm/views/list.py                   |  8 ++++++--
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/bookwyrm/connectors/connector_manager.py b/bookwyrm/connectors/connector_manager.py
index 53198c0a..e9998906 100644
--- a/bookwyrm/connectors/connector_manager.py
+++ b/bookwyrm/connectors/connector_manager.py
@@ -67,10 +67,12 @@ def search(query, min_confidence=0.1):
     return results
 
 
-def local_search(query, min_confidence=0.1, raw=False):
+def local_search(query, min_confidence=0.1, raw=False, filters=None):
     """ only look at local search results """
     connector = load_connector(models.Connector.objects.get(local=True))
-    return connector.search(query, min_confidence=min_confidence, raw=raw)
+    return connector.search(
+        query, min_confidence=min_confidence, raw=raw, filters=filters
+    )
 
 
 def isbn_local_search(query, raw=False):
diff --git a/bookwyrm/connectors/self_connector.py b/bookwyrm/connectors/self_connector.py
index 500ffd74..66560f21 100644
--- a/bookwyrm/connectors/self_connector.py
+++ b/bookwyrm/connectors/self_connector.py
@@ -13,15 +13,16 @@ class Connector(AbstractConnector):
     """ instantiate a connector  """
 
     # pylint: disable=arguments-differ
-    def search(self, query, min_confidence=0.1, raw=False):
+    def search(self, query, min_confidence=0.1, raw=False, filters=None):
         """ search your local database """
+        filters = filters or []
         if not query:
             return []
         # first, try searching unqiue identifiers
-        results = search_identifiers(query)
+        results = search_identifiers(query, *filters)
         if not results:
             # then try searching title/author
-            results = search_title_author(query, min_confidence)
+            results = search_title_author(query, min_confidence, *filters)
         search_results = []
         for result in results:
             if raw:
@@ -98,15 +99,15 @@ class Connector(AbstractConnector):
         pass
 
 
-def search_identifiers(query):
+def search_identifiers(query, *filters):
     """ tries remote_id, isbn; defined as dedupe fields on the model """
-    filters = [
+    or_filters = [
         {f.name: query}
         for f in models.Edition._meta.get_fields()
         if hasattr(f, "deduplication_field") and f.deduplication_field
     ]
     results = models.Edition.objects.filter(
-        reduce(operator.or_, (Q(**f) for f in filters))
+        *filters, reduce(operator.or_, (Q(**f) for f in or_filters))
     ).distinct()
 
     # when there are multiple editions of the same work, pick the default.
@@ -114,7 +115,7 @@ def search_identifiers(query):
     return results.filter(parent_work__default_edition__id=F("id")) or results
 
 
-def search_title_author(query, min_confidence):
+def search_title_author(query, min_confidence, *filters):
     """ searches for title and author """
     vector = (
         SearchVector("title", weight="A")
@@ -126,7 +127,7 @@ def search_title_author(query, min_confidence):
     results = (
         models.Edition.objects.annotate(search=vector)
         .annotate(rank=SearchRank(vector, query))
-        .filter(rank__gt=min_confidence)
+        .filter(*filters, rank__gt=min_confidence)
         .order_by("-rank")
     )
 
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index fe7bba54..748f2b8b 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -137,7 +137,11 @@ class List(View):
 
         if query and request.user.is_authenticated:
             # search for books
-            suggestions = connector_manager.local_search(query, raw=True)
+            suggestions = connector_manager.local_search(
+                query,
+                raw=True,
+                filters=[~Q(parent_work__editions__in=book_list.books.all())],
+            )
         elif request.user.is_authenticated:
             # just suggest whatever books are nearby
             suggestions = request.user.shelfbook_set.filter(
@@ -265,7 +269,7 @@ def add_book(request):
         # if the book is already on the list, don't flip out
         pass
 
-    path = reverse('list', args=[book_list.id])
+    path = reverse("list", args=[book_list.id])
     return redirect("{:s}?{:s}".format(path, urlencode(request.GET)))
 
 

From 3ade2d3bb1934daa6d54838dfb73fcda81c7bf35 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 26 Apr 2021 09:15:42 -0700
Subject: [PATCH 0957/1285] New version of black, new whitespace

---
 bookwyrm/activitypub/__init__.py              |  2 +-
 bookwyrm/activitypub/base_activity.py         | 24 +++----
 bookwyrm/activitypub/book.py                  |  8 +--
 bookwyrm/activitypub/image.py                 |  4 +-
 bookwyrm/activitypub/note.py                  | 18 ++---
 bookwyrm/activitypub/ordered_collection.py    | 16 ++---
 bookwyrm/activitypub/person.py                |  4 +-
 bookwyrm/activitypub/verbs.py                 | 50 ++++++-------
 bookwyrm/activitystreams.py                   | 44 ++++++------
 bookwyrm/connectors/abstract_connector.py     | 48 ++++++-------
 bookwyrm/connectors/bookwyrm_connector.py     |  2 +-
 bookwyrm/connectors/connector_manager.py      | 20 +++---
 bookwyrm/connectors/openlibrary.py            | 20 +++---
 bookwyrm/connectors/self_connector.py         | 14 ++--
 bookwyrm/context_processors.py                |  2 +-
 bookwyrm/emailing.py                          | 10 +--
 bookwyrm/forms.py                             |  6 +-
 bookwyrm/importers/goodreads_import.py        |  2 +-
 bookwyrm/importers/importer.py                | 16 ++---
 bookwyrm/importers/librarything_import.py     |  4 +-
 .../commands/deduplicate_book_data.py         | 10 +--
 bookwyrm/management/commands/erase_streams.py |  6 +-
 bookwyrm/management/commands/initdb.py        |  2 +-
 .../management/commands/populate_streams.py   |  6 +-
 .../management/commands/remove_editions.py    |  6 +-
 bookwyrm/migrations/0046_reviewrating.py      |  4 +-
 bookwyrm/models/activitypub_mixin.py          | 70 +++++++++----------
 bookwyrm/models/attachment.py                 |  6 +-
 bookwyrm/models/author.py                     |  4 +-
 bookwyrm/models/base_model.py                 | 12 ++--
 bookwyrm/models/book.py                       | 44 ++++++------
 bookwyrm/models/connector.py                  |  4 +-
 bookwyrm/models/favorite.py                   | 10 +--
 bookwyrm/models/federated_server.py           |  8 +--
 bookwyrm/models/fields.py                     | 60 ++++++++--------
 bookwyrm/models/import_job.py                 | 36 +++++-----
 bookwyrm/models/list.py                       | 12 ++--
 bookwyrm/models/notification.py               |  6 +-
 bookwyrm/models/readthrough.py                | 12 ++--
 bookwyrm/models/relationship.py               | 32 ++++-----
 bookwyrm/models/report.py                     | 10 +--
 bookwyrm/models/shelf.py                      | 14 ++--
 bookwyrm/models/site.py                       | 24 +++----
 bookwyrm/models/status.py                     | 50 ++++++-------
 bookwyrm/models/user.py                       | 48 ++++++-------
 bookwyrm/redis_store.py                       | 22 +++---
 bookwyrm/sanitize_html.py                     | 10 +--
 bookwyrm/signatures.py                        | 16 ++---
 bookwyrm/status.py                            |  2 +-
 bookwyrm/templatetags/bookwyrm_tags.py        | 48 ++++++-------
 .../tests/activitypub/test_base_activity.py   | 26 +++----
 bookwyrm/tests/activitypub/test_quotation.py  |  8 +--
 .../connectors/test_abstract_connector.py     | 18 ++---
 .../test_abstract_minimal_connector.py        | 22 +++---
 .../connectors/test_bookwyrm_connector.py     | 10 +--
 .../connectors/test_connector_manager.py      | 18 ++---
 .../connectors/test_openlibrary_connector.py  | 40 +++++------
 .../tests/connectors/test_self_connector.py   | 10 +--
 .../tests/importers/test_goodreads_import.py  | 22 +++---
 .../importers/test_librarything_import.py     | 20 +++---
 .../tests/management/test_populate_streams.py |  6 +-
 .../tests/models/test_activitypub_mixin.py    | 54 +++++++-------
 bookwyrm/tests/models/test_base_model.py      | 16 ++---
 bookwyrm/tests/models/test_book_model.py      | 16 ++---
 .../tests/models/test_federated_server.py     |  6 +-
 bookwyrm/tests/models/test_fields.py          | 56 +++++++--------
 bookwyrm/tests/models/test_import_model.py    | 20 +++---
 bookwyrm/tests/models/test_list.py            | 12 ++--
 .../tests/models/test_readthrough_model.py    |  6 +-
 .../tests/models/test_relationship_models.py  | 16 ++---
 bookwyrm/tests/models/test_shelf_model.py     | 12 ++--
 bookwyrm/tests/models/test_status_model.py    | 58 +++++++--------
 bookwyrm/tests/models/test_user_model.py      |  4 +-
 bookwyrm/tests/test_activitystreams.py        | 36 +++++-----
 bookwyrm/tests/test_emailing.py               |  8 +--
 bookwyrm/tests/test_sanitize_html.py          | 12 ++--
 bookwyrm/tests/test_signing.py                | 20 +++---
 bookwyrm/tests/test_templatetags.py           | 40 +++++------
 bookwyrm/tests/views/inbox/test_inbox.py      | 22 +++---
 bookwyrm/tests/views/inbox/test_inbox_add.py  |  8 +--
 .../tests/views/inbox/test_inbox_announce.py  | 14 ++--
 .../tests/views/inbox/test_inbox_block.py     |  8 +--
 .../tests/views/inbox/test_inbox_create.py    | 16 ++---
 .../tests/views/inbox/test_inbox_delete.py    | 12 ++--
 .../tests/views/inbox/test_inbox_follow.py    | 18 ++---
 bookwyrm/tests/views/inbox/test_inbox_like.py | 10 +--
 .../tests/views/inbox/test_inbox_remove.py    |  8 +--
 .../tests/views/inbox/test_inbox_update.py    | 12 ++--
 bookwyrm/tests/views/test_authentication.py   | 18 ++---
 bookwyrm/tests/views/test_author.py           | 14 ++--
 bookwyrm/tests/views/test_block.py            | 10 +--
 bookwyrm/tests/views/test_book.py             | 30 ++++----
 bookwyrm/tests/views/test_directory.py        |  6 +-
 bookwyrm/tests/views/test_federation.py       | 18 ++---
 bookwyrm/tests/views/test_feed.py             | 18 ++---
 bookwyrm/tests/views/test_follow.py           | 16 ++---
 bookwyrm/tests/views/test_get_started.py      | 18 ++---
 bookwyrm/tests/views/test_goal.py             | 16 ++---
 bookwyrm/tests/views/test_helpers.py          | 32 ++++-----
 bookwyrm/tests/views/test_import.py           | 10 +--
 bookwyrm/tests/views/test_interaction.py      | 20 +++---
 bookwyrm/tests/views/test_invite.py           | 18 ++---
 bookwyrm/tests/views/test_isbn.py             |  6 +-
 bookwyrm/tests/views/test_landing.py          | 10 +--
 bookwyrm/tests/views/test_list.py             | 30 ++++----
 bookwyrm/tests/views/test_notifications.py    |  8 +--
 bookwyrm/tests/views/test_outbox.py           | 18 ++---
 bookwyrm/tests/views/test_password.py         | 22 +++---
 bookwyrm/tests/views/test_reading.py          | 16 ++---
 bookwyrm/tests/views/test_readthrough.py      |  6 +-
 bookwyrm/tests/views/test_reports.py          | 18 ++---
 bookwyrm/tests/views/test_rss_feed.py         |  6 +-
 bookwyrm/tests/views/test_search.py           | 12 ++--
 bookwyrm/tests/views/test_shelf.py            | 22 +++---
 bookwyrm/tests/views/test_status.py           | 32 ++++-----
 bookwyrm/tests/views/test_updates.py          |  8 +--
 bookwyrm/tests/views/test_user.py             | 24 +++----
 bookwyrm/tests/views/test_user_admin.py       | 10 +--
 bookwyrm/tests/views/test_wellknown.py        | 12 ++--
 bookwyrm/views/authentication.py              | 14 ++--
 bookwyrm/views/author.py                      | 10 +--
 bookwyrm/views/block.py                       |  8 +--
 bookwyrm/views/books.py                       | 28 ++++----
 bookwyrm/views/directory.py                   |  6 +-
 bookwyrm/views/federation.py                  | 26 +++----
 bookwyrm/views/feed.py                        | 20 +++---
 bookwyrm/views/follow.py                      |  8 +--
 bookwyrm/views/get_started.py                 | 16 ++---
 bookwyrm/views/goal.py                        |  8 +--
 bookwyrm/views/helpers.py                     | 22 +++---
 bookwyrm/views/import_data.py                 | 12 ++--
 bookwyrm/views/inbox.py                       | 12 ++--
 bookwyrm/views/interaction.py                 | 16 ++---
 bookwyrm/views/invite.py                      | 22 +++---
 bookwyrm/views/isbn.py                        |  4 +-
 bookwyrm/views/landing.py                     | 12 ++--
 bookwyrm/views/list.py                        | 32 ++++-----
 bookwyrm/views/notifications.py               |  6 +-
 bookwyrm/views/outbox.py                      |  4 +-
 bookwyrm/views/password.py                    | 18 ++---
 bookwyrm/views/reading.py                     | 16 ++---
 bookwyrm/views/reports.py                     | 16 ++---
 bookwyrm/views/rss_feed.py                    | 12 ++--
 bookwyrm/views/search.py                      |  4 +-
 bookwyrm/views/shelf.py                       | 16 ++---
 bookwyrm/views/site.py                        |  8 +--
 bookwyrm/views/status.py                      | 20 +++---
 bookwyrm/views/updates.py                     |  4 +-
 bookwyrm/views/user.py                        | 22 +++---
 bookwyrm/views/user_admin.py                  | 10 +--
 bookwyrm/views/wellknown.py                   | 12 ++--
 requirements.txt                              |  2 +-
 152 files changed, 1289 insertions(+), 1289 deletions(-)

diff --git a/bookwyrm/activitypub/__init__.py b/bookwyrm/activitypub/__init__.py
index d363fbd5..bfb22fa3 100644
--- a/bookwyrm/activitypub/__init__.py
+++ b/bookwyrm/activitypub/__init__.py
@@ -27,5 +27,5 @@ activity_objects = {c[0]: c[1] for c in cls_members if hasattr(c[1], "to_model")
 
 
 def parse(activity_json):
-    """ figure out what activity this is and parse it """
+    """figure out what activity this is and parse it"""
     return naive_parse(activity_objects, activity_json)
diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py
index dd2795bb..5349e1dd 100644
--- a/bookwyrm/activitypub/base_activity.py
+++ b/bookwyrm/activitypub/base_activity.py
@@ -10,11 +10,11 @@ from bookwyrm.tasks import app
 
 
 class ActivitySerializerError(ValueError):
-    """ routine problems serializing activitypub json """
+    """routine problems serializing activitypub json"""
 
 
 class ActivityEncoder(JSONEncoder):
-    """  used to convert an Activity object into json """
+    """used to convert an Activity object into json"""
 
     def default(self, o):
         return o.__dict__
@@ -22,7 +22,7 @@ class ActivityEncoder(JSONEncoder):
 
 @dataclass
 class Link:
-    """ for tagging a book in a status """
+    """for tagging a book in a status"""
 
     href: str
     name: str
@@ -31,14 +31,14 @@ class Link:
 
 @dataclass
 class Mention(Link):
-    """ a subtype of Link for mentioning an actor """
+    """a subtype of Link for mentioning an actor"""
 
     type: str = "Mention"
 
 
 @dataclass
 class Signature:
-    """ public key block """
+    """public key block"""
 
     creator: str
     created: str
@@ -47,7 +47,7 @@ class Signature:
 
 
 def naive_parse(activity_objects, activity_json, serializer=None):
-    """ this navigates circular import issues """
+    """this navigates circular import issues"""
     if not serializer:
         if activity_json.get("publicKeyPem"):
             # ugh
@@ -67,7 +67,7 @@ def naive_parse(activity_objects, activity_json, serializer=None):
 
 @dataclass(init=False)
 class ActivityObject:
-    """ actor activitypub json """
+    """actor activitypub json"""
 
     id: str
     type: str
@@ -106,7 +106,7 @@ class ActivityObject:
             setattr(self, field.name, value)
 
     def to_model(self, model=None, instance=None, allow_create=True, save=True):
-        """ convert from an activity to a model instance """
+        """convert from an activity to a model instance"""
         model = model or get_model_from_type(self.type)
 
         # only reject statuses if we're potentially creating them
@@ -181,7 +181,7 @@ class ActivityObject:
         return instance
 
     def serialize(self):
-        """ convert to dictionary with context attr """
+        """convert to dictionary with context attr"""
         data = self.__dict__.copy()
         # recursively serialize
         for (k, v) in data.items():
@@ -200,7 +200,7 @@ class ActivityObject:
 def set_related_field(
     model_name, origin_model_name, related_field_name, related_remote_id, data
 ):
-    """ load reverse related fields (editions, attachments) without blocking """
+    """load reverse related fields (editions, attachments) without blocking"""
     model = apps.get_model("bookwyrm.%s" % model_name, require_ready=True)
     origin_model = apps.get_model("bookwyrm.%s" % origin_model_name, require_ready=True)
 
@@ -236,7 +236,7 @@ def set_related_field(
 
 
 def get_model_from_type(activity_type):
-    """ given the activity, what type of model """
+    """given the activity, what type of model"""
     models = apps.get_models()
     model = [
         m
@@ -255,7 +255,7 @@ def get_model_from_type(activity_type):
 def resolve_remote_id(
     remote_id, model=None, refresh=False, save=True, get_activity=False
 ):
-    """ take a remote_id and return an instance, creating if necessary """
+    """take a remote_id and return an instance, creating if necessary"""
     if model:  # a bonus check we can do if we already know the model
         result = model.find_existing_by_remote_id(remote_id)
         if result and not refresh:
diff --git a/bookwyrm/activitypub/book.py b/bookwyrm/activitypub/book.py
index c5b896e3..f6ebf913 100644
--- a/bookwyrm/activitypub/book.py
+++ b/bookwyrm/activitypub/book.py
@@ -8,7 +8,7 @@ from .image import Document
 
 @dataclass(init=False)
 class Book(ActivityObject):
-    """ serializes an edition or work, abstract """
+    """serializes an edition or work, abstract"""
 
     title: str
     lastEditedBy: str = None
@@ -35,7 +35,7 @@ class Book(ActivityObject):
 
 @dataclass(init=False)
 class Edition(Book):
-    """ Edition instance of a book object """
+    """Edition instance of a book object"""
 
     work: str
     isbn10: str = ""
@@ -52,7 +52,7 @@ class Edition(Book):
 
 @dataclass(init=False)
 class Work(Book):
-    """ work instance of a book object """
+    """work instance of a book object"""
 
     lccn: str = ""
     defaultEdition: str = ""
@@ -62,7 +62,7 @@ class Work(Book):
 
 @dataclass(init=False)
 class Author(ActivityObject):
-    """ author of a book """
+    """author of a book"""
 
     name: str
     lastEditedBy: str = None
diff --git a/bookwyrm/activitypub/image.py b/bookwyrm/activitypub/image.py
index a7120ce4..7950faaf 100644
--- a/bookwyrm/activitypub/image.py
+++ b/bookwyrm/activitypub/image.py
@@ -5,7 +5,7 @@ from .base_activity import ActivityObject
 
 @dataclass(init=False)
 class Document(ActivityObject):
-    """ a document """
+    """a document"""
 
     url: str
     name: str = ""
@@ -15,6 +15,6 @@ class Document(ActivityObject):
 
 @dataclass(init=False)
 class Image(Document):
-    """ an image """
+    """an image"""
 
     type: str = "Image"
diff --git a/bookwyrm/activitypub/note.py b/bookwyrm/activitypub/note.py
index e1a42958..b501c3d6 100644
--- a/bookwyrm/activitypub/note.py
+++ b/bookwyrm/activitypub/note.py
@@ -9,19 +9,19 @@ from .image import Document
 
 @dataclass(init=False)
 class Tombstone(ActivityObject):
-    """ the placeholder for a deleted status """
+    """the placeholder for a deleted status"""
 
     type: str = "Tombstone"
 
     def to_model(self, *args, **kwargs):  # pylint: disable=unused-argument
-        """ this should never really get serialized, just searched for """
+        """this should never really get serialized, just searched for"""
         model = apps.get_model("bookwyrm.Status")
         return model.find_existing_by_remote_id(self.id)
 
 
 @dataclass(init=False)
 class Note(ActivityObject):
-    """ Note activity """
+    """Note activity"""
 
     published: str
     attributedTo: str
@@ -39,7 +39,7 @@ class Note(ActivityObject):
 
 @dataclass(init=False)
 class Article(Note):
-    """ what's an article except a note with more fields """
+    """what's an article except a note with more fields"""
 
     name: str
     type: str = "Article"
@@ -47,14 +47,14 @@ class Article(Note):
 
 @dataclass(init=False)
 class GeneratedNote(Note):
-    """ just a re-typed note """
+    """just a re-typed note"""
 
     type: str = "GeneratedNote"
 
 
 @dataclass(init=False)
 class Comment(Note):
-    """ like a note but with a book """
+    """like a note but with a book"""
 
     inReplyToBook: str
     type: str = "Comment"
@@ -62,7 +62,7 @@ class Comment(Note):
 
 @dataclass(init=False)
 class Quotation(Comment):
-    """ a quote and commentary on a book """
+    """a quote and commentary on a book"""
 
     quote: str
     type: str = "Quotation"
@@ -70,7 +70,7 @@ class Quotation(Comment):
 
 @dataclass(init=False)
 class Review(Comment):
-    """ a full book review """
+    """a full book review"""
 
     name: str = None
     rating: int = None
@@ -79,7 +79,7 @@ class Review(Comment):
 
 @dataclass(init=False)
 class Rating(Comment):
-    """ just a star rating """
+    """just a star rating"""
 
     rating: int
     content: str = None
diff --git a/bookwyrm/activitypub/ordered_collection.py b/bookwyrm/activitypub/ordered_collection.py
index 650f6a40..e3a83be8 100644
--- a/bookwyrm/activitypub/ordered_collection.py
+++ b/bookwyrm/activitypub/ordered_collection.py
@@ -7,7 +7,7 @@ from .base_activity import ActivityObject
 
 @dataclass(init=False)
 class OrderedCollection(ActivityObject):
-    """ structure of an ordered collection activity """
+    """structure of an ordered collection activity"""
 
     totalItems: int
     first: str
@@ -19,7 +19,7 @@ class OrderedCollection(ActivityObject):
 
 @dataclass(init=False)
 class OrderedCollectionPrivate(OrderedCollection):
-    """ an ordered collection with privacy settings """
+    """an ordered collection with privacy settings"""
 
     to: List[str] = field(default_factory=lambda: [])
     cc: List[str] = field(default_factory=lambda: [])
@@ -27,14 +27,14 @@ class OrderedCollectionPrivate(OrderedCollection):
 
 @dataclass(init=False)
 class Shelf(OrderedCollectionPrivate):
-    """ structure of an ordered collection activity """
+    """structure of an ordered collection activity"""
 
     type: str = "Shelf"
 
 
 @dataclass(init=False)
 class BookList(OrderedCollectionPrivate):
-    """ structure of an ordered collection activity """
+    """structure of an ordered collection activity"""
 
     summary: str = None
     curation: str = "closed"
@@ -43,7 +43,7 @@ class BookList(OrderedCollectionPrivate):
 
 @dataclass(init=False)
 class OrderedCollectionPage(ActivityObject):
-    """ structure of an ordered collection activity """
+    """structure of an ordered collection activity"""
 
     partOf: str
     orderedItems: List
@@ -54,7 +54,7 @@ class OrderedCollectionPage(ActivityObject):
 
 @dataclass(init=False)
 class CollectionItem(ActivityObject):
-    """ an item in a collection """
+    """an item in a collection"""
 
     actor: str
     type: str = "CollectionItem"
@@ -62,7 +62,7 @@ class CollectionItem(ActivityObject):
 
 @dataclass(init=False)
 class ListItem(CollectionItem):
-    """ a book on a list """
+    """a book on a list"""
 
     book: str
     notes: str = None
@@ -73,7 +73,7 @@ class ListItem(CollectionItem):
 
 @dataclass(init=False)
 class ShelfItem(CollectionItem):
-    """ a book on a list """
+    """a book on a list"""
 
     book: str
     type: str = "ShelfItem"
diff --git a/bookwyrm/activitypub/person.py b/bookwyrm/activitypub/person.py
index 9231bd95..d5f37946 100644
--- a/bookwyrm/activitypub/person.py
+++ b/bookwyrm/activitypub/person.py
@@ -8,7 +8,7 @@ from .image import Image
 
 @dataclass(init=False)
 class PublicKey(ActivityObject):
-    """ public key block """
+    """public key block"""
 
     owner: str
     publicKeyPem: str
@@ -17,7 +17,7 @@ class PublicKey(ActivityObject):
 
 @dataclass(init=False)
 class Person(ActivityObject):
-    """ actor activitypub json """
+    """actor activitypub json"""
 
     preferredUsername: str
     inbox: str
diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py
index 090beea5..f26936d7 100644
--- a/bookwyrm/activitypub/verbs.py
+++ b/bookwyrm/activitypub/verbs.py
@@ -9,13 +9,13 @@ from .ordered_collection import CollectionItem
 
 @dataclass(init=False)
 class Verb(ActivityObject):
-    """generic fields for activities """
+    """generic fields for activities"""
 
     actor: str
     object: ActivityObject
 
     def action(self):
-        """ usually we just want to update and save """
+        """usually we just want to update and save"""
         # self.object may return None if the object is invalid in an expected way
         # ie, Question type
         if self.object:
@@ -24,7 +24,7 @@ class Verb(ActivityObject):
 
 @dataclass(init=False)
 class Create(Verb):
-    """ Create activity """
+    """Create activity"""
 
     to: List[str]
     cc: List[str] = field(default_factory=lambda: [])
@@ -34,14 +34,14 @@ class Create(Verb):
 
 @dataclass(init=False)
 class Delete(Verb):
-    """ Create activity """
+    """Create activity"""
 
     to: List[str]
     cc: List[str] = field(default_factory=lambda: [])
     type: str = "Delete"
 
     def action(self):
-        """ find and delete the activity object """
+        """find and delete the activity object"""
         if not self.object:
             return
 
@@ -59,25 +59,25 @@ class Delete(Verb):
 
 @dataclass(init=False)
 class Update(Verb):
-    """ Update activity """
+    """Update activity"""
 
     to: List[str]
     type: str = "Update"
 
     def action(self):
-        """ update a model instance from the dataclass """
+        """update a model instance from the dataclass"""
         if self.object:
             self.object.to_model(allow_create=False)
 
 
 @dataclass(init=False)
 class Undo(Verb):
-    """ Undo an activity """
+    """Undo an activity"""
 
     type: str = "Undo"
 
     def action(self):
-        """ find and remove the activity object """
+        """find and remove the activity object"""
         if isinstance(self.object, str):
             # it may be that sometihng should be done with these, but idk what
             # this seems just to be coming from pleroma
@@ -103,64 +103,64 @@ class Undo(Verb):
 
 @dataclass(init=False)
 class Follow(Verb):
-    """ Follow activity """
+    """Follow activity"""
 
     object: str
     type: str = "Follow"
 
     def action(self):
-        """ relationship save """
+        """relationship save"""
         self.to_model()
 
 
 @dataclass(init=False)
 class Block(Verb):
-    """ Block activity """
+    """Block activity"""
 
     object: str
     type: str = "Block"
 
     def action(self):
-        """ relationship save """
+        """relationship save"""
         self.to_model()
 
 
 @dataclass(init=False)
 class Accept(Verb):
-    """ Accept activity """
+    """Accept activity"""
 
     object: Follow
     type: str = "Accept"
 
     def action(self):
-        """ find and remove the activity object """
+        """find and remove the activity object"""
         obj = self.object.to_model(save=False, allow_create=False)
         obj.accept()
 
 
 @dataclass(init=False)
 class Reject(Verb):
-    """ Reject activity """
+    """Reject activity"""
 
     object: Follow
     type: str = "Reject"
 
     def action(self):
-        """ find and remove the activity object """
+        """find and remove the activity object"""
         obj = self.object.to_model(save=False, allow_create=False)
         obj.reject()
 
 
 @dataclass(init=False)
 class Add(Verb):
-    """Add activity """
+    """Add activity"""
 
     target: ActivityObject
     object: CollectionItem
     type: str = "Add"
 
     def action(self):
-        """ figure out the target to assign the item to a collection  """
+        """figure out the target to assign the item to a collection"""
         target = resolve_remote_id(self.target)
         item = self.object.to_model(save=False)
         setattr(item, item.collection_field, target)
@@ -169,12 +169,12 @@ class Add(Verb):
 
 @dataclass(init=False)
 class Remove(Add):
-    """Remove activity """
+    """Remove activity"""
 
     type: str = "Remove"
 
     def action(self):
-        """ find and remove the activity object """
+        """find and remove the activity object"""
         obj = self.object.to_model(save=False, allow_create=False)
         if obj:
             obj.delete()
@@ -182,19 +182,19 @@ class Remove(Add):
 
 @dataclass(init=False)
 class Like(Verb):
-    """ a user faving an object """
+    """a user faving an object"""
 
     object: str
     type: str = "Like"
 
     def action(self):
-        """ like """
+        """like"""
         self.to_model()
 
 
 @dataclass(init=False)
 class Announce(Verb):
-    """ boosting a status """
+    """boosting a status"""
 
     published: str
     to: List[str] = field(default_factory=lambda: [])
@@ -203,5 +203,5 @@ class Announce(Verb):
     type: str = "Announce"
 
     def action(self):
-        """ boost """
+        """boost"""
         self.to_model()
diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 949ae9da..86321cd8 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -8,22 +8,22 @@ from bookwyrm.views.helpers import privacy_filter
 
 
 class ActivityStream(RedisStore):
-    """ a category of activity stream (like home, local, federated) """
+    """a category of activity stream (like home, local, federated)"""
 
     def stream_id(self, user):
-        """ the redis key for this user's instance of this stream """
+        """the redis key for this user's instance of this stream"""
         return "{}-{}".format(user.id, self.key)
 
     def unread_id(self, user):
-        """ the redis key for this user's unread count for this stream """
+        """the redis key for this user's unread count for this stream"""
         return "{}-unread".format(self.stream_id(user))
 
     def get_rank(self, obj):  # pylint: disable=no-self-use
-        """ statuses are sorted by date published """
+        """statuses are sorted by date published"""
         return obj.published_date.timestamp()
 
     def add_status(self, status):
-        """ add a status to users' feeds """
+        """add a status to users' feeds"""
         # the pipeline contains all the add-to-stream activities
         pipeline = self.add_object_to_related_stores(status, execute=False)
 
@@ -35,19 +35,19 @@ class ActivityStream(RedisStore):
         pipeline.execute()
 
     def add_user_statuses(self, viewer, user):
-        """ add a user's statuses to another user's feed """
+        """add a user's statuses to another user's feed"""
         # only add the statuses that the viewer should be able to see (ie, not dms)
         statuses = privacy_filter(viewer, user.status_set.all())
         self.bulk_add_objects_to_store(statuses, self.stream_id(viewer))
 
     def remove_user_statuses(self, viewer, user):
-        """ remove a user's status from another user's feed """
+        """remove a user's status from another user's feed"""
         # remove all so that followers only statuses are removed
         statuses = user.status_set.all()
         self.bulk_remove_objects_from_store(statuses, self.stream_id(viewer))
 
     def get_activity_stream(self, user):
-        """ load the statuses to be displayed """
+        """load the statuses to be displayed"""
         # clear unreads for this feed
         r.set(self.unread_id(user), 0)
 
@@ -59,15 +59,15 @@ class ActivityStream(RedisStore):
         )
 
     def get_unread_count(self, user):
-        """ get the unread status count for this user's feed """
+        """get the unread status count for this user's feed"""
         return int(r.get(self.unread_id(user)) or 0)
 
     def populate_streams(self, user):
-        """ go from zero to a timeline """
+        """go from zero to a timeline"""
         self.populate_store(self.stream_id(user))
 
     def get_audience(self, status):  # pylint: disable=no-self-use
-        """ given a status, what users should see it """
+        """given a status, what users should see it"""
         # direct messages don't appeard in feeds, direct comments/reviews/etc do
         if status.privacy == "direct" and status.status_type == "Note":
             return []
@@ -98,7 +98,7 @@ class ActivityStream(RedisStore):
         return [self.stream_id(u) for u in self.get_audience(obj)]
 
     def get_statuses_for_user(self, user):  # pylint: disable=no-self-use
-        """ given a user, what statuses should they see on this stream """
+        """given a user, what statuses should they see on this stream"""
         return privacy_filter(
             user,
             models.Status.objects.select_subclasses(),
@@ -111,7 +111,7 @@ class ActivityStream(RedisStore):
 
 
 class HomeStream(ActivityStream):
-    """ users you follow """
+    """users you follow"""
 
     key = "home"
 
@@ -134,7 +134,7 @@ class HomeStream(ActivityStream):
 
 
 class LocalStream(ActivityStream):
-    """ users you follow """
+    """users you follow"""
 
     key = "local"
 
@@ -154,7 +154,7 @@ class LocalStream(ActivityStream):
 
 
 class FederatedStream(ActivityStream):
-    """ users you follow """
+    """users you follow"""
 
     key = "federated"
 
@@ -182,7 +182,7 @@ streams = {
 @receiver(signals.post_save)
 # pylint: disable=unused-argument
 def add_status_on_create(sender, instance, created, *args, **kwargs):
-    """ add newly created statuses to activity feeds """
+    """add newly created statuses to activity feeds"""
     # we're only interested in new statuses
     if not issubclass(sender, models.Status):
         return
@@ -203,7 +203,7 @@ def add_status_on_create(sender, instance, created, *args, **kwargs):
 @receiver(signals.post_delete, sender=models.Boost)
 # pylint: disable=unused-argument
 def remove_boost_on_delete(sender, instance, *args, **kwargs):
-    """ boosts are deleted """
+    """boosts are deleted"""
     # we're only interested in new statuses
     for stream in streams.values():
         stream.remove_object_from_related_stores(instance)
@@ -212,7 +212,7 @@ def remove_boost_on_delete(sender, instance, *args, **kwargs):
 @receiver(signals.post_save, sender=models.UserFollows)
 # pylint: disable=unused-argument
 def add_statuses_on_follow(sender, instance, created, *args, **kwargs):
-    """ add a newly followed user's statuses to feeds """
+    """add a newly followed user's statuses to feeds"""
     if not created or not instance.user_subject.local:
         return
     HomeStream().add_user_statuses(instance.user_subject, instance.user_object)
@@ -221,7 +221,7 @@ def add_statuses_on_follow(sender, instance, created, *args, **kwargs):
 @receiver(signals.post_delete, sender=models.UserFollows)
 # pylint: disable=unused-argument
 def remove_statuses_on_unfollow(sender, instance, *args, **kwargs):
-    """ remove statuses from a feed on unfollow """
+    """remove statuses from a feed on unfollow"""
     if not instance.user_subject.local:
         return
     HomeStream().remove_user_statuses(instance.user_subject, instance.user_object)
@@ -230,7 +230,7 @@ def remove_statuses_on_unfollow(sender, instance, *args, **kwargs):
 @receiver(signals.post_save, sender=models.UserBlocks)
 # pylint: disable=unused-argument
 def remove_statuses_on_block(sender, instance, *args, **kwargs):
-    """ remove statuses from all feeds on block """
+    """remove statuses from all feeds on block"""
     # blocks apply ot all feeds
     if instance.user_subject.local:
         for stream in streams.values():
@@ -245,7 +245,7 @@ def remove_statuses_on_block(sender, instance, *args, **kwargs):
 @receiver(signals.post_delete, sender=models.UserBlocks)
 # pylint: disable=unused-argument
 def add_statuses_on_unblock(sender, instance, *args, **kwargs):
-    """ remove statuses from all feeds on block """
+    """remove statuses from all feeds on block"""
     public_streams = [LocalStream(), FederatedStream()]
     # add statuses back to streams with statuses from anyone
     if instance.user_subject.local:
@@ -261,7 +261,7 @@ def add_statuses_on_unblock(sender, instance, *args, **kwargs):
 @receiver(signals.post_save, sender=models.User)
 # pylint: disable=unused-argument
 def populate_streams_on_account_create(sender, instance, created, *args, **kwargs):
-    """ build a user's feeds when they join """
+    """build a user's feeds when they join"""
     if not created or not instance.local:
         return
 
diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index 2fe5d825..264b5a38 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -16,7 +16,7 @@ logger = logging.getLogger(__name__)
 
 
 class AbstractMinimalConnector(ABC):
-    """ just the bare bones, for other bookwyrm instances """
+    """just the bare bones, for other bookwyrm instances"""
 
     def __init__(self, identifier):
         # load connector settings
@@ -39,7 +39,7 @@ class AbstractMinimalConnector(ABC):
             setattr(self, field, getattr(info, field))
 
     def search(self, query, min_confidence=None):
-        """ free text search """
+        """free text search"""
         params = {}
         if min_confidence:
             params["min_confidence"] = min_confidence
@@ -55,7 +55,7 @@ class AbstractMinimalConnector(ABC):
         return results
 
     def isbn_search(self, query):
-        """ isbn search """
+        """isbn search"""
         params = {}
         data = get_data(
             "%s%s" % (self.isbn_search_url, query),
@@ -70,27 +70,27 @@ class AbstractMinimalConnector(ABC):
 
     @abstractmethod
     def get_or_create_book(self, remote_id):
-        """ pull up a book record by whatever means possible """
+        """pull up a book record by whatever means possible"""
 
     @abstractmethod
     def parse_search_data(self, data):
-        """ turn the result json from a search into a list """
+        """turn the result json from a search into a list"""
 
     @abstractmethod
     def format_search_result(self, search_result):
-        """ create a SearchResult obj from json """
+        """create a SearchResult obj from json"""
 
     @abstractmethod
     def parse_isbn_search_data(self, data):
-        """ turn the result json from a search into a list """
+        """turn the result json from a search into a list"""
 
     @abstractmethod
     def format_isbn_search_result(self, search_result):
-        """ create a SearchResult obj from json """
+        """create a SearchResult obj from json"""
 
 
 class AbstractConnector(AbstractMinimalConnector):
-    """ generic book data connector """
+    """generic book data connector"""
 
     def __init__(self, identifier):
         super().__init__(identifier)
@@ -99,14 +99,14 @@ class AbstractConnector(AbstractMinimalConnector):
         self.book_mappings = []
 
     def is_available(self):
-        """ check if you're allowed to use this connector """
+        """check if you're allowed to use this connector"""
         if self.max_query_count is not None:
             if self.connector.query_count >= self.max_query_count:
                 return False
         return True
 
     def get_or_create_book(self, remote_id):
-        """ translate arbitrary json into an Activitypub dataclass """
+        """translate arbitrary json into an Activitypub dataclass"""
         # first, check if we have the origin_id saved
         existing = models.Edition.find_existing_by_remote_id(
             remote_id
@@ -151,7 +151,7 @@ class AbstractConnector(AbstractMinimalConnector):
         return edition
 
     def create_edition_from_data(self, work, edition_data):
-        """ if we already have the work, we're ready """
+        """if we already have the work, we're ready"""
         mapped_data = dict_from_mappings(edition_data, self.book_mappings)
         mapped_data["work"] = work.remote_id
         edition_activity = activitypub.Edition(**mapped_data)
@@ -171,7 +171,7 @@ class AbstractConnector(AbstractMinimalConnector):
         return edition
 
     def get_or_create_author(self, remote_id):
-        """ load that author """
+        """load that author"""
         existing = models.Author.find_existing_by_remote_id(remote_id)
         if existing:
             return existing
@@ -189,23 +189,23 @@ class AbstractConnector(AbstractMinimalConnector):
 
     @abstractmethod
     def is_work_data(self, data):
-        """ differentiate works and editions """
+        """differentiate works and editions"""
 
     @abstractmethod
     def get_edition_from_work_data(self, data):
-        """ every work needs at least one edition """
+        """every work needs at least one edition"""
 
     @abstractmethod
     def get_work_from_edition_data(self, data):
-        """ every edition needs a work """
+        """every edition needs a work"""
 
     @abstractmethod
     def get_authors_from_data(self, data):
-        """ load author data """
+        """load author data"""
 
     @abstractmethod
     def expand_book_data(self, book):
-        """ get more info on a book """
+        """get more info on a book"""
 
 
 def dict_from_mappings(data, mappings):
@@ -218,7 +218,7 @@ def dict_from_mappings(data, mappings):
 
 
 def get_data(url, params=None):
-    """ wrapper for request.get """
+    """wrapper for request.get"""
     # check if the url is blocked
     if models.FederatedServer.is_blocked(url):
         raise ConnectorException(
@@ -250,7 +250,7 @@ def get_data(url, params=None):
 
 
 def get_image(url):
-    """ wrapper for requesting an image """
+    """wrapper for requesting an image"""
     try:
         resp = requests.get(
             url,
@@ -268,7 +268,7 @@ def get_image(url):
 
 @dataclass
 class SearchResult:
-    """ standardized search result object """
+    """standardized search result object"""
 
     title: str
     key: str
@@ -284,14 +284,14 @@ class SearchResult:
         )
 
     def json(self):
-        """ serialize a connector for json response """
+        """serialize a connector for json response"""
         serialized = asdict(self)
         del serialized["connector"]
         return serialized
 
 
 class Mapping:
-    """ associate a local database field with a field in an external dataset """
+    """associate a local database field with a field in an external dataset"""
 
     def __init__(self, local_field, remote_field=None, formatter=None):
         noop = lambda x: x
@@ -301,7 +301,7 @@ class Mapping:
         self.formatter = formatter or noop
 
     def get_value(self, data):
-        """ pull a field from incoming json and return the formatted version """
+        """pull a field from incoming json and return the formatted version"""
         value = data.get(self.remote_field)
         if not value:
             return None
diff --git a/bookwyrm/connectors/bookwyrm_connector.py b/bookwyrm/connectors/bookwyrm_connector.py
index f7869d55..640a0bca 100644
--- a/bookwyrm/connectors/bookwyrm_connector.py
+++ b/bookwyrm/connectors/bookwyrm_connector.py
@@ -4,7 +4,7 @@ from .abstract_connector import AbstractMinimalConnector, SearchResult
 
 
 class Connector(AbstractMinimalConnector):
-    """ this is basically just for search """
+    """this is basically just for search"""
 
     def get_or_create_book(self, remote_id):
         edition = activitypub.resolve_remote_id(remote_id, model=models.Edition)
diff --git a/bookwyrm/connectors/connector_manager.py b/bookwyrm/connectors/connector_manager.py
index 53198c0a..20d273e0 100644
--- a/bookwyrm/connectors/connector_manager.py
+++ b/bookwyrm/connectors/connector_manager.py
@@ -16,11 +16,11 @@ logger = logging.getLogger(__name__)
 
 
 class ConnectorException(HTTPError):
-    """ when the connector can't do what was asked """
+    """when the connector can't do what was asked"""
 
 
 def search(query, min_confidence=0.1):
-    """ find books based on arbitary keywords """
+    """find books based on arbitary keywords"""
     if not query:
         return []
     results = []
@@ -68,19 +68,19 @@ def search(query, min_confidence=0.1):
 
 
 def local_search(query, min_confidence=0.1, raw=False):
-    """ only look at local search results """
+    """only look at local search results"""
     connector = load_connector(models.Connector.objects.get(local=True))
     return connector.search(query, min_confidence=min_confidence, raw=raw)
 
 
 def isbn_local_search(query, raw=False):
-    """ only look at local search results """
+    """only look at local search results"""
     connector = load_connector(models.Connector.objects.get(local=True))
     return connector.isbn_search(query, raw=raw)
 
 
 def first_search_result(query, min_confidence=0.1):
-    """ search until you find a result that fits """
+    """search until you find a result that fits"""
     for connector in get_connectors():
         result = connector.search(query, min_confidence=min_confidence)
         if result:
@@ -89,13 +89,13 @@ def first_search_result(query, min_confidence=0.1):
 
 
 def get_connectors():
-    """ load all connectors """
+    """load all connectors"""
     for info in models.Connector.objects.order_by("priority").all():
         yield load_connector(info)
 
 
 def get_or_create_connector(remote_id):
-    """ get the connector related to the object's server """
+    """get the connector related to the object's server"""
     url = urlparse(remote_id)
     identifier = url.netloc
     if not identifier:
@@ -119,7 +119,7 @@ def get_or_create_connector(remote_id):
 
 @app.task
 def load_more_data(connector_id, book_id):
-    """ background the work of getting all 10,000 editions of LoTR """
+    """background the work of getting all 10,000 editions of LoTR"""
     connector_info = models.Connector.objects.get(id=connector_id)
     connector = load_connector(connector_info)
     book = models.Book.objects.select_subclasses().get(id=book_id)
@@ -127,7 +127,7 @@ def load_more_data(connector_id, book_id):
 
 
 def load_connector(connector_info):
-    """ instantiate the connector class """
+    """instantiate the connector class"""
     connector = importlib.import_module(
         "bookwyrm.connectors.%s" % connector_info.connector_file
     )
@@ -137,6 +137,6 @@ def load_connector(connector_info):
 @receiver(signals.post_save, sender="bookwyrm.FederatedServer")
 # pylint: disable=unused-argument
 def create_connector(sender, instance, created, *args, **kwargs):
-    """ create a connector to an external bookwyrm server """
+    """create a connector to an external bookwyrm server"""
     if instance.application_type == "bookwyrm":
         get_or_create_connector("https://{:s}".format(instance.server_name))
diff --git a/bookwyrm/connectors/openlibrary.py b/bookwyrm/connectors/openlibrary.py
index 8ee738eb..a7c30b66 100644
--- a/bookwyrm/connectors/openlibrary.py
+++ b/bookwyrm/connectors/openlibrary.py
@@ -9,7 +9,7 @@ from .openlibrary_languages import languages
 
 
 class Connector(AbstractConnector):
-    """ instantiate a connector for OL """
+    """instantiate a connector for OL"""
 
     def __init__(self, identifier):
         super().__init__(identifier)
@@ -59,7 +59,7 @@ class Connector(AbstractConnector):
         ]
 
     def get_remote_id_from_data(self, data):
-        """ format a url from an openlibrary id field """
+        """format a url from an openlibrary id field"""
         try:
             key = data["key"]
         except KeyError:
@@ -87,7 +87,7 @@ class Connector(AbstractConnector):
         return get_data(url)
 
     def get_authors_from_data(self, data):
-        """ parse author json and load or create authors """
+        """parse author json and load or create authors"""
         for author_blob in data.get("authors", []):
             author_blob = author_blob.get("author", author_blob)
             # this id is "/authors/OL1234567A"
@@ -99,7 +99,7 @@ class Connector(AbstractConnector):
             yield author
 
     def get_cover_url(self, cover_blob, size="L"):
-        """ ask openlibrary for the cover """
+        """ask openlibrary for the cover"""
         if not cover_blob:
             return None
         cover_id = cover_blob[0]
@@ -141,7 +141,7 @@ class Connector(AbstractConnector):
         )
 
     def load_edition_data(self, olkey):
-        """ query openlibrary for editions of a work """
+        """query openlibrary for editions of a work"""
         url = "%s/works/%s/editions" % (self.books_url, olkey)
         return get_data(url)
 
@@ -166,7 +166,7 @@ class Connector(AbstractConnector):
 
 
 def ignore_edition(edition_data):
-    """ don't load a million editions that have no metadata """
+    """don't load a million editions that have no metadata"""
     # an isbn, we love to see it
     if edition_data.get("isbn_13") or edition_data.get("isbn_10"):
         return False
@@ -185,19 +185,19 @@ def ignore_edition(edition_data):
 
 
 def get_description(description_blob):
-    """ descriptions can be a string or a dict """
+    """descriptions can be a string or a dict"""
     if isinstance(description_blob, dict):
         return description_blob.get("value")
     return description_blob
 
 
 def get_openlibrary_key(key):
-    """ convert /books/OL27320736M into OL27320736M """
+    """convert /books/OL27320736M into OL27320736M"""
     return key.split("/")[-1]
 
 
 def get_languages(language_blob):
-    """ /language/eng -> English """
+    """/language/eng -> English"""
     langs = []
     for lang in language_blob:
         langs.append(languages.get(lang.get("key", ""), None))
@@ -205,7 +205,7 @@ def get_languages(language_blob):
 
 
 def pick_default_edition(options):
-    """ favor physical copies with covers in english """
+    """favor physical copies with covers in english"""
     if not options:
         return None
     if len(options) == 1:
diff --git a/bookwyrm/connectors/self_connector.py b/bookwyrm/connectors/self_connector.py
index 500ffd74..22835941 100644
--- a/bookwyrm/connectors/self_connector.py
+++ b/bookwyrm/connectors/self_connector.py
@@ -10,11 +10,11 @@ from .abstract_connector import AbstractConnector, SearchResult
 
 
 class Connector(AbstractConnector):
-    """ instantiate a connector  """
+    """instantiate a connector"""
 
     # pylint: disable=arguments-differ
     def search(self, query, min_confidence=0.1, raw=False):
-        """ search your local database """
+        """search your local database"""
         if not query:
             return []
         # first, try searching unqiue identifiers
@@ -35,7 +35,7 @@ class Connector(AbstractConnector):
         return search_results
 
     def isbn_search(self, query, raw=False):
-        """ search your local database """
+        """search your local database"""
         if not query:
             return []
 
@@ -87,11 +87,11 @@ class Connector(AbstractConnector):
         return None
 
     def parse_isbn_search_data(self, data):
-        """ it's already in the right format, don't even worry about it """
+        """it's already in the right format, don't even worry about it"""
         return data
 
     def parse_search_data(self, data):
-        """ it's already in the right format, don't even worry about it """
+        """it's already in the right format, don't even worry about it"""
         return data
 
     def expand_book_data(self, book):
@@ -99,7 +99,7 @@ class Connector(AbstractConnector):
 
 
 def search_identifiers(query):
-    """ tries remote_id, isbn; defined as dedupe fields on the model """
+    """tries remote_id, isbn; defined as dedupe fields on the model"""
     filters = [
         {f.name: query}
         for f in models.Edition._meta.get_fields()
@@ -115,7 +115,7 @@ def search_identifiers(query):
 
 
 def search_title_author(query, min_confidence):
-    """ searches for title and author """
+    """searches for title and author"""
     vector = (
         SearchVector("title", weight="A")
         + SearchVector("subtitle", weight="B")
diff --git a/bookwyrm/context_processors.py b/bookwyrm/context_processors.py
index 8f79a652..f5f25186 100644
--- a/bookwyrm/context_processors.py
+++ b/bookwyrm/context_processors.py
@@ -3,5 +3,5 @@ from bookwyrm import models
 
 
 def site_settings(request):  # pylint: disable=unused-argument
-    """ include the custom info about the site """
+    """include the custom info about the site"""
     return {"site": models.SiteSettings.objects.get()}
diff --git a/bookwyrm/emailing.py b/bookwyrm/emailing.py
index 1804254b..657310b0 100644
--- a/bookwyrm/emailing.py
+++ b/bookwyrm/emailing.py
@@ -8,7 +8,7 @@ from bookwyrm.settings import DOMAIN
 
 
 def email_data():
-    """ fields every email needs """
+    """fields every email needs"""
     site = models.SiteSettings.objects.get()
     if site.logo_small:
         logo_path = "/images/{}".format(site.logo_small.url)
@@ -24,14 +24,14 @@ def email_data():
 
 
 def invite_email(invite_request):
-    """ send out an invite code """
+    """send out an invite code"""
     data = email_data()
     data["invite_link"] = invite_request.invite.link
     send_email.delay(invite_request.email, *format_email("invite", data))
 
 
 def password_reset_email(reset_code):
-    """ generate a password reset email """
+    """generate a password reset email"""
     data = email_data()
     data["reset_link"] = reset_code.link
     data["user"] = reset_code.user.display_name
@@ -39,7 +39,7 @@ def password_reset_email(reset_code):
 
 
 def format_email(email_name, data):
-    """ render the email templates """
+    """render the email templates"""
     subject = (
         get_template("email/{}/subject.html".format(email_name)).render(data).strip()
     )
@@ -58,7 +58,7 @@ def format_email(email_name, data):
 
 @app.task
 def send_email(recipient, subject, html_content, text_content):
-    """ use a task to send the email """
+    """use a task to send the email"""
     email = EmailMultiAlternatives(
         subject, text_content, settings.DEFAULT_FROM_EMAIL, [recipient]
     )
diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index df68334e..b6197f33 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -12,7 +12,7 @@ from bookwyrm import models
 
 
 class CustomForm(ModelForm):
-    """ add css classes to the forms """
+    """add css classes to the forms"""
 
     def __init__(self, *args, **kwargs):
         css_classes = defaultdict(lambda: "")
@@ -198,7 +198,7 @@ class ImportForm(forms.Form):
 
 class ExpiryWidget(widgets.Select):
     def value_from_datadict(self, data, files, name):
-        """ human-readable exiration time buckets """
+        """human-readable exiration time buckets"""
         selected_string = super().value_from_datadict(data, files, name)
 
         if selected_string == "day":
@@ -217,7 +217,7 @@ class ExpiryWidget(widgets.Select):
 
 class InviteRequestForm(CustomForm):
     def clean(self):
-        """ make sure the email isn't in use by a registered user """
+        """make sure the email isn't in use by a registered user"""
         cleaned_data = super().clean()
         email = cleaned_data.get("email")
         if email and models.User.objects.filter(email=email).exists():
diff --git a/bookwyrm/importers/goodreads_import.py b/bookwyrm/importers/goodreads_import.py
index 0b126c14..7b577ea8 100644
--- a/bookwyrm/importers/goodreads_import.py
+++ b/bookwyrm/importers/goodreads_import.py
@@ -9,7 +9,7 @@ class GoodreadsImporter(Importer):
     service = "GoodReads"
 
     def parse_fields(self, entry):
-        """ handle the specific fields in goodreads csvs """
+        """handle the specific fields in goodreads csvs"""
         entry.update({"import_source": self.service})
         # add missing 'Date Started' field
         entry.update({"Date Started": None})
diff --git a/bookwyrm/importers/importer.py b/bookwyrm/importers/importer.py
index ddbfa304..c1e41897 100644
--- a/bookwyrm/importers/importer.py
+++ b/bookwyrm/importers/importer.py
@@ -10,7 +10,7 @@ logger = logging.getLogger(__name__)
 
 
 class Importer:
-    """ Generic class for csv data import from an outside service """
+    """Generic class for csv data import from an outside service"""
 
     service = "Unknown"
     delimiter = ","
@@ -18,7 +18,7 @@ class Importer:
     mandatory_fields = ["Title", "Author"]
 
     def create_job(self, user, csv_file, include_reviews, privacy):
-        """ check over a csv and creates a database entry for the job"""
+        """check over a csv and creates a database entry for the job"""
         job = ImportJob.objects.create(
             user=user, include_reviews=include_reviews, privacy=privacy
         )
@@ -32,16 +32,16 @@ class Importer:
         return job
 
     def save_item(self, job, index, data):  # pylint: disable=no-self-use
-        """ creates and saves an import item """
+        """creates and saves an import item"""
         ImportItem(job=job, index=index, data=data).save()
 
     def parse_fields(self, entry):
-        """ updates csv data with additional info """
+        """updates csv data with additional info"""
         entry.update({"import_source": self.service})
         return entry
 
     def create_retry_job(self, user, original_job, items):
-        """ retry items that didn't import """
+        """retry items that didn't import"""
         job = ImportJob.objects.create(
             user=user,
             include_reviews=original_job.include_reviews,
@@ -53,7 +53,7 @@ class Importer:
         return job
 
     def start_import(self, job):
-        """ initalizes a csv import job """
+        """initalizes a csv import job"""
         result = import_data.delay(self.service, job.id)
         job.task_id = result.id
         job.save()
@@ -61,7 +61,7 @@ class Importer:
 
 @app.task
 def import_data(source, job_id):
-    """ does the actual lookup work in a celery task """
+    """does the actual lookup work in a celery task"""
     job = ImportJob.objects.get(id=job_id)
     try:
         for item in job.items.all():
@@ -89,7 +89,7 @@ def import_data(source, job_id):
 
 
 def handle_imported_book(source, user, item, include_reviews, privacy):
-    """ process a csv and then post about it """
+    """process a csv and then post about it"""
     if isinstance(item.book, models.Work):
         item.book = item.book.default_edition
     if not item.book:
diff --git a/bookwyrm/importers/librarything_import.py b/bookwyrm/importers/librarything_import.py
index 3755cb1a..b3175a82 100644
--- a/bookwyrm/importers/librarything_import.py
+++ b/bookwyrm/importers/librarything_import.py
@@ -6,7 +6,7 @@ from . import Importer
 
 
 class LibrarythingImporter(Importer):
-    """ csv downloads from librarything """
+    """csv downloads from librarything"""
 
     service = "LibraryThing"
     delimiter = "\t"
@@ -15,7 +15,7 @@ class LibrarythingImporter(Importer):
     mandatory_fields = ["Title", "Primary Author"]
 
     def parse_fields(self, entry):
-        """ custom parsing for librarything """
+        """custom parsing for librarything"""
         data = {}
         data["import_source"] = self.service
         data["Book Id"] = entry["Book Id"]
diff --git a/bookwyrm/management/commands/deduplicate_book_data.py b/bookwyrm/management/commands/deduplicate_book_data.py
index edd91a71..ed01a784 100644
--- a/bookwyrm/management/commands/deduplicate_book_data.py
+++ b/bookwyrm/management/commands/deduplicate_book_data.py
@@ -6,7 +6,7 @@ from bookwyrm import models
 
 
 def update_related(canonical, obj):
-    """ update all the models with fk to the object being removed """
+    """update all the models with fk to the object being removed"""
     # move related models to canonical
     related_models = [
         (r.remote_field.name, r.related_model) for r in canonical._meta.related_objects
@@ -24,7 +24,7 @@ def update_related(canonical, obj):
 
 
 def copy_data(canonical, obj):
-    """ try to get the most data possible """
+    """try to get the most data possible"""
     for data_field in obj._meta.get_fields():
         if not hasattr(data_field, "activitypub_field"):
             continue
@@ -38,7 +38,7 @@ def copy_data(canonical, obj):
 
 
 def dedupe_model(model):
-    """ combine duplicate editions and update related models """
+    """combine duplicate editions and update related models"""
     fields = model._meta.get_fields()
     dedupe_fields = [
         f for f in fields if hasattr(f, "deduplication_field") and f.deduplication_field
@@ -68,12 +68,12 @@ def dedupe_model(model):
 
 
 class Command(BaseCommand):
-    """ dedplucate allllll the book data models """
+    """dedplucate allllll the book data models"""
 
     help = "merges duplicate book data"
     # pylint: disable=no-self-use,unused-argument
     def handle(self, *args, **options):
-        """ run deudplications """
+        """run deudplications"""
         dedupe_model(models.Edition)
         dedupe_model(models.Work)
         dedupe_model(models.Author)
diff --git a/bookwyrm/management/commands/erase_streams.py b/bookwyrm/management/commands/erase_streams.py
index 042e857f..1d34b1bb 100644
--- a/bookwyrm/management/commands/erase_streams.py
+++ b/bookwyrm/management/commands/erase_streams.py
@@ -10,15 +10,15 @@ r = redis.Redis(
 
 
 def erase_streams():
-    """ throw the whole redis away """
+    """throw the whole redis away"""
     r.flushall()
 
 
 class Command(BaseCommand):
-    """ delete activity streams for all users """
+    """delete activity streams for all users"""
 
     help = "Delete all the user streams"
     # pylint: disable=no-self-use,unused-argument
     def handle(self, *args, **options):
-        """ flush all, baby """
+        """flush all, baby"""
         erase_streams()
diff --git a/bookwyrm/management/commands/initdb.py b/bookwyrm/management/commands/initdb.py
index a86a1652..0c0cc61f 100644
--- a/bookwyrm/management/commands/initdb.py
+++ b/bookwyrm/management/commands/initdb.py
@@ -108,7 +108,7 @@ def init_connectors():
 
 
 def init_federated_servers():
-    """ big no to nazis """
+    """big no to nazis"""
     built_in_blocks = ["gab.ai", "gab.com"]
     for server in built_in_blocks:
         FederatedServer.objects.create(
diff --git a/bookwyrm/management/commands/populate_streams.py b/bookwyrm/management/commands/populate_streams.py
index 4cd2036a..04f6bf6e 100644
--- a/bookwyrm/management/commands/populate_streams.py
+++ b/bookwyrm/management/commands/populate_streams.py
@@ -10,7 +10,7 @@ r = redis.Redis(
 
 
 def populate_streams():
-    """ build all the streams for all the users """
+    """build all the streams for all the users"""
     users = models.User.objects.filter(
         local=True,
         is_active=True,
@@ -21,10 +21,10 @@ def populate_streams():
 
 
 class Command(BaseCommand):
-    """ start all over with user streams """
+    """start all over with user streams"""
 
     help = "Populate streams for all users"
     # pylint: disable=no-self-use,unused-argument
     def handle(self, *args, **options):
-        """ run feed builder """
+        """run feed builder"""
         populate_streams()
diff --git a/bookwyrm/management/commands/remove_editions.py b/bookwyrm/management/commands/remove_editions.py
index 6829c6d1..9eb9b7da 100644
--- a/bookwyrm/management/commands/remove_editions.py
+++ b/bookwyrm/management/commands/remove_editions.py
@@ -5,7 +5,7 @@ from bookwyrm import models
 
 
 def remove_editions():
-    """ combine duplicate editions and update related models """
+    """combine duplicate editions and update related models"""
     # not in use
     filters = {
         "%s__isnull" % r.name: True for r in models.Edition._meta.related_objects
@@ -33,10 +33,10 @@ def remove_editions():
 
 
 class Command(BaseCommand):
-    """ dedplucate allllll the book data models """
+    """dedplucate allllll the book data models"""
 
     help = "merges duplicate book data"
     # pylint: disable=no-self-use,unused-argument
     def handle(self, *args, **options):
-        """ run deudplications """
+        """run deudplications"""
         remove_editions()
diff --git a/bookwyrm/migrations/0046_reviewrating.py b/bookwyrm/migrations/0046_reviewrating.py
index 8d149004..26f6f36a 100644
--- a/bookwyrm/migrations/0046_reviewrating.py
+++ b/bookwyrm/migrations/0046_reviewrating.py
@@ -8,7 +8,7 @@ from psycopg2.extras import execute_values
 
 
 def convert_review_rating(app_registry, schema_editor):
-    """ take rating type Reviews and convert them to ReviewRatings """
+    """take rating type Reviews and convert them to ReviewRatings"""
     db_alias = schema_editor.connection.alias
 
     reviews = (
@@ -29,7 +29,7 @@ VALUES %s""",
 
 
 def unconvert_review_rating(app_registry, schema_editor):
-    """ undo the conversion from ratings back to reviews"""
+    """undo the conversion from ratings back to reviews"""
     # All we need to do to revert this is drop the table, which Django will do
     # on its own, as long as we have a valid reverse function. So, this is a
     # no-op function so Django will do its thing
diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py
index 02cfafc0..83b4c0ab 100644
--- a/bookwyrm/models/activitypub_mixin.py
+++ b/bookwyrm/models/activitypub_mixin.py
@@ -31,18 +31,18 @@ PropertyField = namedtuple("PropertyField", ("set_activity_from_field"))
 
 
 def set_activity_from_property_field(activity, obj, field):
-    """ assign a model property value to the activity json """
+    """assign a model property value to the activity json"""
     activity[field[1]] = getattr(obj, field[0])
 
 
 class ActivitypubMixin:
-    """ add this mixin for models that are AP serializable """
+    """add this mixin for models that are AP serializable"""
 
     activity_serializer = lambda: {}
     reverse_unfurl = False
 
     def __init__(self, *args, **kwargs):
-        """ collect some info on model fields """
+        """collect some info on model fields"""
         self.image_fields = []
         self.many_to_many_fields = []
         self.simple_fields = []  # "simple"
@@ -85,7 +85,7 @@ class ActivitypubMixin:
 
     @classmethod
     def find_existing_by_remote_id(cls, remote_id):
-        """ look up a remote id in the db """
+        """look up a remote id in the db"""
         return cls.find_existing({"id": remote_id})
 
     @classmethod
@@ -126,7 +126,7 @@ class ActivitypubMixin:
         return match.first()
 
     def broadcast(self, activity, sender, software=None):
-        """ send out an activity """
+        """send out an activity"""
         broadcast_task.delay(
             sender.id,
             json.dumps(activity, cls=activitypub.ActivityEncoder),
@@ -134,7 +134,7 @@ class ActivitypubMixin:
         )
 
     def get_recipients(self, software=None):
-        """ figure out which inbox urls to post to """
+        """figure out which inbox urls to post to"""
         # first we have to figure out who should receive this activity
         privacy = self.privacy if hasattr(self, "privacy") else "public"
         # is this activity owned by a user (statuses, lists, shelves), or is it
@@ -182,20 +182,20 @@ class ActivitypubMixin:
         return list(set(recipients))
 
     def to_activity_dataclass(self):
-        """ convert from a model to an activity """
+        """convert from a model to an activity"""
         activity = generate_activity(self)
         return self.activity_serializer(**activity)
 
     def to_activity(self, **kwargs):  # pylint: disable=unused-argument
-        """ convert from a model to a json activity """
+        """convert from a model to a json activity"""
         return self.to_activity_dataclass().serialize()
 
 
 class ObjectMixin(ActivitypubMixin):
-    """ add this mixin for object models that are AP serializable """
+    """add this mixin for object models that are AP serializable"""
 
     def save(self, *args, created=None, **kwargs):
-        """ broadcast created/updated/deleted objects as appropriate """
+        """broadcast created/updated/deleted objects as appropriate"""
         broadcast = kwargs.get("broadcast", True)
         # this bonus kwarg would cause an error in the base save method
         if "broadcast" in kwargs:
@@ -254,7 +254,7 @@ class ObjectMixin(ActivitypubMixin):
         self.broadcast(activity, user)
 
     def to_create_activity(self, user, **kwargs):
-        """ returns the object wrapped in a Create activity """
+        """returns the object wrapped in a Create activity"""
         activity_object = self.to_activity_dataclass(**kwargs)
 
         signature = None
@@ -280,7 +280,7 @@ class ObjectMixin(ActivitypubMixin):
         ).serialize()
 
     def to_delete_activity(self, user):
-        """ notice of deletion """
+        """notice of deletion"""
         return activitypub.Delete(
             id=self.remote_id + "/activity",
             actor=user.remote_id,
@@ -290,7 +290,7 @@ class ObjectMixin(ActivitypubMixin):
         ).serialize()
 
     def to_update_activity(self, user):
-        """ wrapper for Updates to an activity """
+        """wrapper for Updates to an activity"""
         activity_id = "%s#update/%s" % (self.remote_id, uuid4())
         return activitypub.Update(
             id=activity_id,
@@ -306,13 +306,13 @@ class OrderedCollectionPageMixin(ObjectMixin):
 
     @property
     def collection_remote_id(self):
-        """ this can be overriden if there's a special remote id, ie outbox """
+        """this can be overriden if there's a special remote id, ie outbox"""
         return self.remote_id
 
     def to_ordered_collection(
         self, queryset, remote_id=None, page=False, collection_only=False, **kwargs
     ):
-        """ an ordered collection of whatevers """
+        """an ordered collection of whatevers"""
         if not queryset.ordered:
             raise RuntimeError("queryset must be ordered")
 
@@ -341,11 +341,11 @@ class OrderedCollectionPageMixin(ObjectMixin):
 
 
 class OrderedCollectionMixin(OrderedCollectionPageMixin):
-    """ extends activitypub models to work as ordered collections """
+    """extends activitypub models to work as ordered collections"""
 
     @property
     def collection_queryset(self):
-        """ usually an ordered collection model aggregates a different model """
+        """usually an ordered collection model aggregates a different model"""
         raise NotImplementedError("Model must define collection_queryset")
 
     activity_serializer = activitypub.OrderedCollection
@@ -354,24 +354,24 @@ class OrderedCollectionMixin(OrderedCollectionPageMixin):
         return self.to_ordered_collection(self.collection_queryset, **kwargs)
 
     def to_activity(self, **kwargs):
-        """ an ordered collection of the specified model queryset  """
+        """an ordered collection of the specified model queryset"""
         return self.to_ordered_collection(
             self.collection_queryset, **kwargs
         ).serialize()
 
 
 class CollectionItemMixin(ActivitypubMixin):
-    """ for items that are part of an (Ordered)Collection """
+    """for items that are part of an (Ordered)Collection"""
 
     activity_serializer = activitypub.CollectionItem
 
     def broadcast(self, activity, sender, software="bookwyrm"):
-        """ only send book collection updates to other bookwyrm instances """
+        """only send book collection updates to other bookwyrm instances"""
         super().broadcast(activity, sender, software=software)
 
     @property
     def privacy(self):
-        """ inherit the privacy of the list, or direct if pending """
+        """inherit the privacy of the list, or direct if pending"""
         collection_field = getattr(self, self.collection_field)
         if self.approved:
             return collection_field.privacy
@@ -379,7 +379,7 @@ class CollectionItemMixin(ActivitypubMixin):
 
     @property
     def recipients(self):
-        """ the owner of the list is a direct recipient """
+        """the owner of the list is a direct recipient"""
         collection_field = getattr(self, self.collection_field)
         if collection_field.user.local:
             # don't broadcast to yourself
@@ -387,7 +387,7 @@ class CollectionItemMixin(ActivitypubMixin):
         return [collection_field.user]
 
     def save(self, *args, broadcast=True, **kwargs):
-        """ broadcast updated """
+        """broadcast updated"""
         # first off, we want to save normally no matter what
         super().save(*args, **kwargs)
 
@@ -400,14 +400,14 @@ class CollectionItemMixin(ActivitypubMixin):
         self.broadcast(activity, self.user)
 
     def delete(self, *args, broadcast=True, **kwargs):
-        """ broadcast a remove activity """
+        """broadcast a remove activity"""
         activity = self.to_remove_activity(self.user)
         super().delete(*args, **kwargs)
         if self.user.local and broadcast:
             self.broadcast(activity, self.user)
 
     def to_add_activity(self, user):
-        """ AP for shelving a book"""
+        """AP for shelving a book"""
         collection_field = getattr(self, self.collection_field)
         return activitypub.Add(
             id="{:s}#add".format(collection_field.remote_id),
@@ -417,7 +417,7 @@ class CollectionItemMixin(ActivitypubMixin):
         ).serialize()
 
     def to_remove_activity(self, user):
-        """ AP for un-shelving a book"""
+        """AP for un-shelving a book"""
         collection_field = getattr(self, self.collection_field)
         return activitypub.Remove(
             id="{:s}#remove".format(collection_field.remote_id),
@@ -428,24 +428,24 @@ class CollectionItemMixin(ActivitypubMixin):
 
 
 class ActivityMixin(ActivitypubMixin):
-    """ add this mixin for models that are AP serializable """
+    """add this mixin for models that are AP serializable"""
 
     def save(self, *args, broadcast=True, **kwargs):
-        """ broadcast activity """
+        """broadcast activity"""
         super().save(*args, **kwargs)
         user = self.user if hasattr(self, "user") else self.user_subject
         if broadcast and user.local:
             self.broadcast(self.to_activity(), user)
 
     def delete(self, *args, broadcast=True, **kwargs):
-        """ nevermind, undo that activity """
+        """nevermind, undo that activity"""
         user = self.user if hasattr(self, "user") else self.user_subject
         if broadcast and user.local:
             self.broadcast(self.to_undo_activity(), user)
         super().delete(*args, **kwargs)
 
     def to_undo_activity(self):
-        """ undo an action """
+        """undo an action"""
         user = self.user if hasattr(self, "user") else self.user_subject
         return activitypub.Undo(
             id="%s#undo" % self.remote_id,
@@ -455,7 +455,7 @@ class ActivityMixin(ActivitypubMixin):
 
 
 def generate_activity(obj):
-    """ go through the fields on an object """
+    """go through the fields on an object"""
     activity = {}
     for field in obj.activity_fields:
         field.set_activity_from_field(activity, obj)
@@ -478,7 +478,7 @@ def generate_activity(obj):
 
 
 def unfurl_related_field(related_field, sort_field=None):
-    """ load reverse lookups (like public key owner or Status attachment """
+    """load reverse lookups (like public key owner or Status attachment"""
     if sort_field and hasattr(related_field, "all"):
         return [
             unfurl_related_field(i) for i in related_field.order_by(sort_field).all()
@@ -494,7 +494,7 @@ def unfurl_related_field(related_field, sort_field=None):
 
 @app.task
 def broadcast_task(sender_id, activity, recipients):
-    """ the celery task for broadcast """
+    """the celery task for broadcast"""
     user_model = apps.get_model("bookwyrm.User", require_ready=True)
     sender = user_model.objects.get(id=sender_id)
     for recipient in recipients:
@@ -505,7 +505,7 @@ def broadcast_task(sender_id, activity, recipients):
 
 
 def sign_and_send(sender, data, destination):
-    """ crpyto whatever and http junk """
+    """crpyto whatever and http junk"""
     now = http_date()
 
     if not sender.key_pair.private_key:
@@ -534,7 +534,7 @@ def sign_and_send(sender, data, destination):
 def to_ordered_collection_page(
     queryset, remote_id, id_only=False, page=1, pure=False, **kwargs
 ):
-    """ serialize and pagiante a queryset """
+    """serialize and pagiante a queryset"""
     paginated = Paginator(queryset, PAGE_LENGTH)
 
     activity_page = paginated.get_page(page)
diff --git a/bookwyrm/models/attachment.py b/bookwyrm/models/attachment.py
index eaeca11e..c8b2e51c 100644
--- a/bookwyrm/models/attachment.py
+++ b/bookwyrm/models/attachment.py
@@ -8,7 +8,7 @@ from . import fields
 
 
 class Attachment(ActivitypubMixin, BookWyrmModel):
-    """ an image (or, in the future, video etc) associated with a status """
+    """an image (or, in the future, video etc) associated with a status"""
 
     status = models.ForeignKey(
         "Status", on_delete=models.CASCADE, related_name="attachments", null=True
@@ -16,13 +16,13 @@ class Attachment(ActivitypubMixin, BookWyrmModel):
     reverse_unfurl = True
 
     class Meta:
-        """ one day we'll have other types of attachments besides images """
+        """one day we'll have other types of attachments besides images"""
 
         abstract = True
 
 
 class Image(Attachment):
-    """ an image attachment """
+    """an image attachment"""
 
     image = fields.ImageField(
         upload_to="status/",
diff --git a/bookwyrm/models/author.py b/bookwyrm/models/author.py
index 4c5fe6c8..b9a4b146 100644
--- a/bookwyrm/models/author.py
+++ b/bookwyrm/models/author.py
@@ -9,7 +9,7 @@ from . import fields
 
 
 class Author(BookDataModel):
-    """ basic biographic info """
+    """basic biographic info"""
 
     wikipedia_link = fields.CharField(
         max_length=255, blank=True, null=True, deduplication_field=True
@@ -24,7 +24,7 @@ class Author(BookDataModel):
     bio = fields.HtmlField(null=True, blank=True)
 
     def get_remote_id(self):
-        """ editions and works both use "book" instead of model_name """
+        """editions and works both use "book" instead of model_name"""
         return "https://%s/author/%s" % (DOMAIN, self.id)
 
     activity_serializer = activitypub.Author
diff --git a/bookwyrm/models/base_model.py b/bookwyrm/models/base_model.py
index 261c9686..e85ff733 100644
--- a/bookwyrm/models/base_model.py
+++ b/bookwyrm/models/base_model.py
@@ -7,14 +7,14 @@ from .fields import RemoteIdField
 
 
 class BookWyrmModel(models.Model):
-    """ shared fields """
+    """shared fields"""
 
     created_date = models.DateTimeField(auto_now_add=True)
     updated_date = models.DateTimeField(auto_now=True)
     remote_id = RemoteIdField(null=True, activitypub_field="id")
 
     def get_remote_id(self):
-        """ generate a url that resolves to the local object """
+        """generate a url that resolves to the local object"""
         base_path = "https://%s" % DOMAIN
         if hasattr(self, "user"):
             base_path = "%s%s" % (base_path, self.user.local_path)
@@ -22,17 +22,17 @@ class BookWyrmModel(models.Model):
         return "%s/%s/%d" % (base_path, model_name, self.id)
 
     class Meta:
-        """ this is just here to provide default fields for other models """
+        """this is just here to provide default fields for other models"""
 
         abstract = True
 
     @property
     def local_path(self):
-        """ how to link to this object in the local app """
+        """how to link to this object in the local app"""
         return self.get_remote_id().replace("https://%s" % DOMAIN, "")
 
     def visible_to_user(self, viewer):
-        """ is a user authorized to view an object? """
+        """is a user authorized to view an object?"""
         # make sure this is an object with privacy owned by a user
         if not hasattr(self, "user") or not hasattr(self, "privacy"):
             return None
@@ -65,7 +65,7 @@ class BookWyrmModel(models.Model):
 @receiver(models.signals.post_save)
 # pylint: disable=unused-argument
 def set_remote_id(sender, instance, created, *args, **kwargs):
-    """ set the remote_id after save (when the id is available) """
+    """set the remote_id after save (when the id is available)"""
     if not created or not hasattr(instance, "get_remote_id"):
         return
     if not instance.remote_id:
diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index 5280c7aa..dd098e56 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -13,7 +13,7 @@ from . import fields
 
 
 class BookDataModel(ObjectMixin, BookWyrmModel):
-    """ fields shared between editable book data (books, works, authors) """
+    """fields shared between editable book data (books, works, authors)"""
 
     origin_id = models.CharField(max_length=255, null=True, blank=True)
     openlibrary_key = fields.CharField(
@@ -33,12 +33,12 @@ class BookDataModel(ObjectMixin, BookWyrmModel):
     )
 
     class Meta:
-        """ can't initialize this model, that wouldn't make sense """
+        """can't initialize this model, that wouldn't make sense"""
 
         abstract = True
 
     def save(self, *args, **kwargs):
-        """ ensure that the remote_id is within this instance """
+        """ensure that the remote_id is within this instance"""
         if self.id:
             self.remote_id = self.get_remote_id()
         else:
@@ -47,12 +47,12 @@ class BookDataModel(ObjectMixin, BookWyrmModel):
         return super().save(*args, **kwargs)
 
     def broadcast(self, activity, sender, software="bookwyrm"):
-        """ only send book data updates to other bookwyrm instances """
+        """only send book data updates to other bookwyrm instances"""
         super().broadcast(activity, sender, software=software)
 
 
 class Book(BookDataModel):
-    """ a generic book, which can mean either an edition or a work """
+    """a generic book, which can mean either an edition or a work"""
 
     connector = models.ForeignKey("Connector", on_delete=models.PROTECT, null=True)
 
@@ -83,17 +83,17 @@ class Book(BookDataModel):
 
     @property
     def author_text(self):
-        """ format a list of authors """
+        """format a list of authors"""
         return ", ".join(a.name for a in self.authors.all())
 
     @property
     def latest_readthrough(self):
-        """ most recent readthrough activity """
+        """most recent readthrough activity"""
         return self.readthrough_set.order_by("-updated_date").first()
 
     @property
     def edition_info(self):
-        """ properties of this edition, as a string """
+        """properties of this edition, as a string"""
         items = [
             self.physical_format if hasattr(self, "physical_format") else None,
             self.languages[0] + " language"
@@ -106,20 +106,20 @@ class Book(BookDataModel):
 
     @property
     def alt_text(self):
-        """ image alt test """
+        """image alt test"""
         text = "%s" % self.title
         if self.edition_info:
             text += " (%s)" % self.edition_info
         return text
 
     def save(self, *args, **kwargs):
-        """ can't be abstract for query reasons, but you shouldn't USE it """
+        """can't be abstract for query reasons, but you shouldn't USE it"""
         if not isinstance(self, Edition) and not isinstance(self, Work):
             raise ValueError("Books should be added as Editions or Works")
         return super().save(*args, **kwargs)
 
     def get_remote_id(self):
-        """ editions and works both use "book" instead of model_name """
+        """editions and works both use "book" instead of model_name"""
         return "https://%s/book/%d" % (DOMAIN, self.id)
 
     def __repr__(self):
@@ -131,7 +131,7 @@ class Book(BookDataModel):
 
 
 class Work(OrderedCollectionPageMixin, Book):
-    """ a work (an abstract concept of a book that manifests in an edition) """
+    """a work (an abstract concept of a book that manifests in an edition)"""
 
     # library of congress catalog control number
     lccn = fields.CharField(
@@ -143,19 +143,19 @@ class Work(OrderedCollectionPageMixin, Book):
     )
 
     def save(self, *args, **kwargs):
-        """ set some fields on the edition object """
+        """set some fields on the edition object"""
         # set rank
         for edition in self.editions.all():
             edition.save()
         return super().save(*args, **kwargs)
 
     def get_default_edition(self):
-        """ in case the default edition is not set """
+        """in case the default edition is not set"""
         return self.default_edition or self.editions.order_by("-edition_rank").first()
 
     @transaction.atomic()
     def reset_default_edition(self):
-        """ sets a new default edition based on computed rank """
+        """sets a new default edition based on computed rank"""
         self.default_edition = None
         # editions are re-ranked implicitly
         self.save()
@@ -163,11 +163,11 @@ class Work(OrderedCollectionPageMixin, Book):
         self.save()
 
     def to_edition_list(self, **kwargs):
-        """ an ordered collection of editions """
+        """an ordered collection of editions"""
         return self.to_ordered_collection(
             self.editions.order_by("-edition_rank").all(),
             remote_id="%s/editions" % self.remote_id,
-            **kwargs
+            **kwargs,
         )
 
     activity_serializer = activitypub.Work
@@ -176,7 +176,7 @@ class Work(OrderedCollectionPageMixin, Book):
 
 
 class Edition(Book):
-    """ an edition of a book """
+    """an edition of a book"""
 
     # these identifiers only apply to editions, not works
     isbn_10 = fields.CharField(
@@ -215,7 +215,7 @@ class Edition(Book):
     name_field = "title"
 
     def get_rank(self, ignore_default=False):
-        """ calculate how complete the data is on this edition """
+        """calculate how complete the data is on this edition"""
         if (
             not ignore_default
             and self.parent_work
@@ -235,7 +235,7 @@ class Edition(Book):
         return rank
 
     def save(self, *args, **kwargs):
-        """ set some fields on the edition object """
+        """set some fields on the edition object"""
         # calculate isbn 10/13
         if self.isbn_13 and self.isbn_13[:3] == "978" and not self.isbn_10:
             self.isbn_10 = isbn_13_to_10(self.isbn_13)
@@ -249,7 +249,7 @@ class Edition(Book):
 
 
 def isbn_10_to_13(isbn_10):
-    """ convert an isbn 10 into an isbn 13 """
+    """convert an isbn 10 into an isbn 13"""
     isbn_10 = re.sub(r"[^0-9X]", "", isbn_10)
     # drop the last character of the isbn 10 number (the original checkdigit)
     converted = isbn_10[:9]
@@ -271,7 +271,7 @@ def isbn_10_to_13(isbn_10):
 
 
 def isbn_13_to_10(isbn_13):
-    """ convert isbn 13 to 10, if possible """
+    """convert isbn 13 to 10, if possible"""
     if isbn_13[:3] != "978":
         return None
 
diff --git a/bookwyrm/models/connector.py b/bookwyrm/models/connector.py
index 11bdbee2..6043fc02 100644
--- a/bookwyrm/models/connector.py
+++ b/bookwyrm/models/connector.py
@@ -9,7 +9,7 @@ ConnectorFiles = models.TextChoices("ConnectorFiles", CONNECTORS)
 
 
 class Connector(BookWyrmModel):
-    """ book data source connectors """
+    """book data source connectors"""
 
     identifier = models.CharField(max_length=255, unique=True)
     priority = models.IntegerField(default=2)
@@ -32,7 +32,7 @@ class Connector(BookWyrmModel):
     query_count_expiry = models.DateTimeField(auto_now_add=True, blank=True)
 
     class Meta:
-        """ check that there's code to actually use this connector """
+        """check that there's code to actually use this connector"""
 
         constraints = [
             models.CheckConstraint(
diff --git a/bookwyrm/models/favorite.py b/bookwyrm/models/favorite.py
index 7b72d175..c4518119 100644
--- a/bookwyrm/models/favorite.py
+++ b/bookwyrm/models/favorite.py
@@ -11,7 +11,7 @@ from .status import Status
 
 
 class Favorite(ActivityMixin, BookWyrmModel):
-    """ fav'ing a post """
+    """fav'ing a post"""
 
     user = fields.ForeignKey(
         "User", on_delete=models.PROTECT, activitypub_field="actor"
@@ -24,11 +24,11 @@ class Favorite(ActivityMixin, BookWyrmModel):
 
     @classmethod
     def ignore_activity(cls, activity):
-        """ don't bother with incoming favs of unknown statuses """
+        """don't bother with incoming favs of unknown statuses"""
         return not Status.objects.filter(remote_id=activity.object).exists()
 
     def save(self, *args, **kwargs):
-        """ update user active time """
+        """update user active time"""
         self.user.last_active_date = timezone.now()
         self.user.save(broadcast=False)
         super().save(*args, **kwargs)
@@ -45,7 +45,7 @@ class Favorite(ActivityMixin, BookWyrmModel):
             )
 
     def delete(self, *args, **kwargs):
-        """ delete and delete notifications """
+        """delete and delete notifications"""
         # check for notification
         if self.status.user.local:
             notification_model = apps.get_model(
@@ -62,6 +62,6 @@ class Favorite(ActivityMixin, BookWyrmModel):
         super().delete(*args, **kwargs)
 
     class Meta:
-        """ can't fav things twice """
+        """can't fav things twice"""
 
         unique_together = ("user", "status")
diff --git a/bookwyrm/models/federated_server.py b/bookwyrm/models/federated_server.py
index aa2b2f6a..7d446ca0 100644
--- a/bookwyrm/models/federated_server.py
+++ b/bookwyrm/models/federated_server.py
@@ -13,7 +13,7 @@ FederationStatus = models.TextChoices(
 
 
 class FederatedServer(BookWyrmModel):
-    """ store which servers we federate with """
+    """store which servers we federate with"""
 
     server_name = models.CharField(max_length=255, unique=True)
     status = models.CharField(
@@ -25,7 +25,7 @@ class FederatedServer(BookWyrmModel):
     notes = models.TextField(null=True, blank=True)
 
     def block(self):
-        """ block a server """
+        """block a server"""
         self.status = "blocked"
         self.save()
 
@@ -35,7 +35,7 @@ class FederatedServer(BookWyrmModel):
         )
 
     def unblock(self):
-        """ unblock a server """
+        """unblock a server"""
         self.status = "federated"
         self.save()
 
@@ -45,7 +45,7 @@ class FederatedServer(BookWyrmModel):
 
     @classmethod
     def is_blocked(cls, url):
-        """ look up if a domain is blocked """
+        """look up if a domain is blocked"""
         url = urlparse(url)
         domain = url.netloc
         return cls.objects.filter(server_name=domain, status="blocked").exists()
diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py
index a1b2035b..123b3efa 100644
--- a/bookwyrm/models/fields.py
+++ b/bookwyrm/models/fields.py
@@ -18,7 +18,7 @@ from bookwyrm.settings import DOMAIN
 
 
 def validate_remote_id(value):
-    """ make sure the remote_id looks like a url """
+    """make sure the remote_id looks like a url"""
     if not value or not re.match(r"^http.?:\/\/[^\s]+$", value):
         raise ValidationError(
             _("%(value)s is not a valid remote_id"),
@@ -27,7 +27,7 @@ def validate_remote_id(value):
 
 
 def validate_localname(value):
-    """ make sure localnames look okay """
+    """make sure localnames look okay"""
     if not re.match(r"^[A-Za-z\-_\.0-9]+$", value):
         raise ValidationError(
             _("%(value)s is not a valid username"),
@@ -36,7 +36,7 @@ def validate_localname(value):
 
 
 def validate_username(value):
-    """ make sure usernames look okay """
+    """make sure usernames look okay"""
     if not re.match(r"^[A-Za-z\-_\.0-9]+@[A-Za-z\-_\.0-9]+\.[a-z]{2,}$", value):
         raise ValidationError(
             _("%(value)s is not a valid username"),
@@ -45,7 +45,7 @@ def validate_username(value):
 
 
 class ActivitypubFieldMixin:
-    """ make a database field serializable """
+    """make a database field serializable"""
 
     def __init__(
         self,
@@ -64,7 +64,7 @@ class ActivitypubFieldMixin:
         super().__init__(*args, **kwargs)
 
     def set_field_from_activity(self, instance, data):
-        """ helper function for assinging a value to the field """
+        """helper function for assinging a value to the field"""
         try:
             value = getattr(data, self.get_activitypub_field())
         except AttributeError:
@@ -78,7 +78,7 @@ class ActivitypubFieldMixin:
         setattr(instance, self.name, formatted)
 
     def set_activity_from_field(self, activity, instance):
-        """ update the json object """
+        """update the json object"""
         value = getattr(instance, self.name)
         formatted = self.field_to_activity(value)
         if formatted is None:
@@ -94,19 +94,19 @@ class ActivitypubFieldMixin:
             activity[key] = formatted
 
     def field_to_activity(self, value):
-        """ formatter to convert a model value into activitypub """
+        """formatter to convert a model value into activitypub"""
         if hasattr(self, "activitypub_wrapper"):
             return {self.activitypub_wrapper: value}
         return value
 
     def field_from_activity(self, value):
-        """ formatter to convert activitypub into a model value """
+        """formatter to convert activitypub into a model value"""
         if value and hasattr(self, "activitypub_wrapper"):
             value = value.get(self.activitypub_wrapper)
         return value
 
     def get_activitypub_field(self):
-        """ model_field_name to activitypubFieldName """
+        """model_field_name to activitypubFieldName"""
         if self.activitypub_field:
             return self.activitypub_field
         name = self.name.split(".")[-1]
@@ -115,7 +115,7 @@ class ActivitypubFieldMixin:
 
 
 class ActivitypubRelatedFieldMixin(ActivitypubFieldMixin):
-    """ default (de)serialization for foreign key and one to one """
+    """default (de)serialization for foreign key and one to one"""
 
     def __init__(self, *args, load_remote=True, **kwargs):
         self.load_remote = load_remote
@@ -146,7 +146,7 @@ class ActivitypubRelatedFieldMixin(ActivitypubFieldMixin):
 
 
 class RemoteIdField(ActivitypubFieldMixin, models.CharField):
-    """ a url that serves as a unique identifier """
+    """a url that serves as a unique identifier"""
 
     def __init__(self, *args, max_length=255, validators=None, **kwargs):
         validators = validators or [validate_remote_id]
@@ -156,7 +156,7 @@ class RemoteIdField(ActivitypubFieldMixin, models.CharField):
 
 
 class UsernameField(ActivitypubFieldMixin, models.CharField):
-    """ activitypub-aware username field """
+    """activitypub-aware username field"""
 
     def __init__(self, activitypub_field="preferredUsername", **kwargs):
         self.activitypub_field = activitypub_field
@@ -172,7 +172,7 @@ class UsernameField(ActivitypubFieldMixin, models.CharField):
         )
 
     def deconstruct(self):
-        """ implementation of models.Field deconstruct """
+        """implementation of models.Field deconstruct"""
         name, path, args, kwargs = super().deconstruct()
         del kwargs["verbose_name"]
         del kwargs["max_length"]
@@ -191,7 +191,7 @@ PrivacyLevels = models.TextChoices(
 
 
 class PrivacyField(ActivitypubFieldMixin, models.CharField):
-    """ this maps to two differente activitypub fields """
+    """this maps to two differente activitypub fields"""
 
     public = "https://www.w3.org/ns/activitystreams#Public"
 
@@ -236,7 +236,7 @@ class PrivacyField(ActivitypubFieldMixin, models.CharField):
 
 
 class ForeignKey(ActivitypubRelatedFieldMixin, models.ForeignKey):
-    """ activitypub-aware foreign key field """
+    """activitypub-aware foreign key field"""
 
     def field_to_activity(self, value):
         if not value:
@@ -245,7 +245,7 @@ class ForeignKey(ActivitypubRelatedFieldMixin, models.ForeignKey):
 
 
 class OneToOneField(ActivitypubRelatedFieldMixin, models.OneToOneField):
-    """ activitypub-aware foreign key field """
+    """activitypub-aware foreign key field"""
 
     def field_to_activity(self, value):
         if not value:
@@ -254,14 +254,14 @@ class OneToOneField(ActivitypubRelatedFieldMixin, models.OneToOneField):
 
 
 class ManyToManyField(ActivitypubFieldMixin, models.ManyToManyField):
-    """ activitypub-aware many to many field """
+    """activitypub-aware many to many field"""
 
     def __init__(self, *args, link_only=False, **kwargs):
         self.link_only = link_only
         super().__init__(*args, **kwargs)
 
     def set_field_from_activity(self, instance, data):
-        """ helper function for assinging a value to the field """
+        """helper function for assinging a value to the field"""
         value = getattr(data, self.get_activitypub_field())
         formatted = self.field_from_activity(value)
         if formatted is None or formatted is MISSING:
@@ -293,7 +293,7 @@ class ManyToManyField(ActivitypubFieldMixin, models.ManyToManyField):
 
 
 class TagField(ManyToManyField):
-    """ special case of many to many that uses Tags """
+    """special case of many to many that uses Tags"""
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -333,7 +333,7 @@ class TagField(ManyToManyField):
 
 
 def image_serializer(value, alt):
-    """ helper for serializing images """
+    """helper for serializing images"""
     if value and hasattr(value, "url"):
         url = value.url
     else:
@@ -343,7 +343,7 @@ def image_serializer(value, alt):
 
 
 class ImageField(ActivitypubFieldMixin, models.ImageField):
-    """ activitypub-aware image field """
+    """activitypub-aware image field"""
 
     def __init__(self, *args, alt_field=None, **kwargs):
         self.alt_field = alt_field
@@ -351,7 +351,7 @@ class ImageField(ActivitypubFieldMixin, models.ImageField):
 
     # pylint: disable=arguments-differ
     def set_field_from_activity(self, instance, data, save=True):
-        """ helper function for assinging a value to the field """
+        """helper function for assinging a value to the field"""
         value = getattr(data, self.get_activitypub_field())
         formatted = self.field_from_activity(value)
         if formatted is None or formatted is MISSING:
@@ -397,7 +397,7 @@ class ImageField(ActivitypubFieldMixin, models.ImageField):
 
 
 class DateTimeField(ActivitypubFieldMixin, models.DateTimeField):
-    """ activitypub-aware datetime field """
+    """activitypub-aware datetime field"""
 
     def field_to_activity(self, value):
         if not value:
@@ -416,7 +416,7 @@ class DateTimeField(ActivitypubFieldMixin, models.DateTimeField):
 
 
 class HtmlField(ActivitypubFieldMixin, models.TextField):
-    """ a text field for storing html """
+    """a text field for storing html"""
 
     def field_from_activity(self, value):
         if not value or value == MISSING:
@@ -427,30 +427,30 @@ class HtmlField(ActivitypubFieldMixin, models.TextField):
 
 
 class ArrayField(ActivitypubFieldMixin, DjangoArrayField):
-    """ activitypub-aware array field """
+    """activitypub-aware array field"""
 
     def field_to_activity(self, value):
         return [str(i) for i in value]
 
 
 class CharField(ActivitypubFieldMixin, models.CharField):
-    """ activitypub-aware char field """
+    """activitypub-aware char field"""
 
 
 class TextField(ActivitypubFieldMixin, models.TextField):
-    """ activitypub-aware text field """
+    """activitypub-aware text field"""
 
 
 class BooleanField(ActivitypubFieldMixin, models.BooleanField):
-    """ activitypub-aware boolean field """
+    """activitypub-aware boolean field"""
 
 
 class IntegerField(ActivitypubFieldMixin, models.IntegerField):
-    """ activitypub-aware boolean field """
+    """activitypub-aware boolean field"""
 
 
 class DecimalField(ActivitypubFieldMixin, models.DecimalField):
-    """ activitypub-aware boolean field """
+    """activitypub-aware boolean field"""
 
     def field_to_activity(self, value):
         if not value:
diff --git a/bookwyrm/models/import_job.py b/bookwyrm/models/import_job.py
index 026cf7cd..1b1152ab 100644
--- a/bookwyrm/models/import_job.py
+++ b/bookwyrm/models/import_job.py
@@ -20,7 +20,7 @@ GOODREADS_SHELVES = {
 
 
 def unquote_string(text):
-    """ resolve csv quote weirdness """
+    """resolve csv quote weirdness"""
     match = re.match(r'="([^"]*)"', text)
     if match:
         return match.group(1)
@@ -28,7 +28,7 @@ def unquote_string(text):
 
 
 def construct_search_term(title, author):
-    """ formulate a query for the data connector """
+    """formulate a query for the data connector"""
     # Strip brackets (usually series title from search term)
     title = re.sub(r"\s*\([^)]*\)\s*", "", title)
     # Open library doesn't like including author initials in search term.
@@ -38,7 +38,7 @@ def construct_search_term(title, author):
 
 
 class ImportJob(models.Model):
-    """ entry for a specific request for book data import """
+    """entry for a specific request for book data import"""
 
     user = models.ForeignKey(User, on_delete=models.CASCADE)
     created_date = models.DateTimeField(default=timezone.now)
@@ -51,7 +51,7 @@ class ImportJob(models.Model):
     retry = models.BooleanField(default=False)
 
     def save(self, *args, **kwargs):
-        """ save and notify """
+        """save and notify"""
         super().save(*args, **kwargs)
         if self.complete:
             notification_model = apps.get_model(
@@ -65,7 +65,7 @@ class ImportJob(models.Model):
 
 
 class ImportItem(models.Model):
-    """ a single line of a csv being imported """
+    """a single line of a csv being imported"""
 
     job = models.ForeignKey(ImportJob, on_delete=models.CASCADE, related_name="items")
     index = models.IntegerField()
@@ -74,11 +74,11 @@ class ImportItem(models.Model):
     fail_reason = models.TextField(null=True)
 
     def resolve(self):
-        """ try various ways to lookup a book """
+        """try various ways to lookup a book"""
         self.book = self.get_book_from_isbn() or self.get_book_from_title_author()
 
     def get_book_from_isbn(self):
-        """ search by isbn """
+        """search by isbn"""
         search_result = connector_manager.first_search_result(
             self.isbn, min_confidence=0.999
         )
@@ -88,7 +88,7 @@ class ImportItem(models.Model):
         return None
 
     def get_book_from_title_author(self):
-        """ search by title and author """
+        """search by title and author"""
         search_term = construct_search_term(self.title, self.author)
         search_result = connector_manager.first_search_result(
             search_term, min_confidence=0.999
@@ -100,60 +100,60 @@ class ImportItem(models.Model):
 
     @property
     def title(self):
-        """ get the book title """
+        """get the book title"""
         return self.data["Title"]
 
     @property
     def author(self):
-        """ get the book title """
+        """get the book title"""
         return self.data["Author"]
 
     @property
     def isbn(self):
-        """ pulls out the isbn13 field from the csv line data """
+        """pulls out the isbn13 field from the csv line data"""
         return unquote_string(self.data["ISBN13"])
 
     @property
     def shelf(self):
-        """ the goodreads shelf field """
+        """the goodreads shelf field"""
         if self.data["Exclusive Shelf"]:
             return GOODREADS_SHELVES.get(self.data["Exclusive Shelf"])
         return None
 
     @property
     def review(self):
-        """ a user-written review, to be imported with the book data """
+        """a user-written review, to be imported with the book data"""
         return self.data["My Review"]
 
     @property
     def rating(self):
-        """ x/5 star rating for a book """
+        """x/5 star rating for a book"""
         return int(self.data["My Rating"])
 
     @property
     def date_added(self):
-        """ when the book was added to this dataset """
+        """when the book was added to this dataset"""
         if self.data["Date Added"]:
             return timezone.make_aware(dateutil.parser.parse(self.data["Date Added"]))
         return None
 
     @property
     def date_started(self):
-        """ when the book was started """
+        """when the book was started"""
         if "Date Started" in self.data and self.data["Date Started"]:
             return timezone.make_aware(dateutil.parser.parse(self.data["Date Started"]))
         return None
 
     @property
     def date_read(self):
-        """ the date a book was completed """
+        """the date a book was completed"""
         if self.data["Date Read"]:
             return timezone.make_aware(dateutil.parser.parse(self.data["Date Read"]))
         return None
 
     @property
     def reads(self):
-        """ formats a read through dataset for the book in this line """
+        """formats a read through dataset for the book in this line"""
         start_date = self.date_started
 
         # Goodreads special case (no 'date started' field)
diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py
index 639f8402..2a5c3382 100644
--- a/bookwyrm/models/list.py
+++ b/bookwyrm/models/list.py
@@ -21,7 +21,7 @@ CurationType = models.TextChoices(
 
 
 class List(OrderedCollectionMixin, BookWyrmModel):
-    """ a list of books """
+    """a list of books"""
 
     name = fields.CharField(max_length=100)
     user = fields.ForeignKey(
@@ -41,22 +41,22 @@ class List(OrderedCollectionMixin, BookWyrmModel):
     activity_serializer = activitypub.BookList
 
     def get_remote_id(self):
-        """ don't want the user to be in there in this case """
+        """don't want the user to be in there in this case"""
         return "https://%s/list/%d" % (DOMAIN, self.id)
 
     @property
     def collection_queryset(self):
-        """ list of books for this shelf, overrides OrderedCollectionMixin  """
+        """list of books for this shelf, overrides OrderedCollectionMixin"""
         return self.books.filter(listitem__approved=True).order_by("listitem")
 
     class Meta:
-        """ default sorting """
+        """default sorting"""
 
         ordering = ("-updated_date",)
 
 
 class ListItem(CollectionItemMixin, BookWyrmModel):
-    """ ok """
+    """ok"""
 
     book = fields.ForeignKey(
         "Edition", on_delete=models.PROTECT, activitypub_field="book"
@@ -74,7 +74,7 @@ class ListItem(CollectionItemMixin, BookWyrmModel):
     collection_field = "book_list"
 
     def save(self, *args, **kwargs):
-        """ create a notification too """
+        """create a notification too"""
         created = not bool(self.id)
         super().save(*args, **kwargs)
         # tick the updated date on the parent list
diff --git a/bookwyrm/models/notification.py b/bookwyrm/models/notification.py
index 233d635b..ff0b4e5a 100644
--- a/bookwyrm/models/notification.py
+++ b/bookwyrm/models/notification.py
@@ -10,7 +10,7 @@ NotificationType = models.TextChoices(
 
 
 class Notification(BookWyrmModel):
-    """ you've been tagged, liked, followed, etc """
+    """you've been tagged, liked, followed, etc"""
 
     user = models.ForeignKey("User", on_delete=models.CASCADE)
     related_book = models.ForeignKey("Edition", on_delete=models.CASCADE, null=True)
@@ -29,7 +29,7 @@ class Notification(BookWyrmModel):
     )
 
     def save(self, *args, **kwargs):
-        """ save, but don't make dupes """
+        """save, but don't make dupes"""
         # there's probably a better way to do this
         if self.__class__.objects.filter(
             user=self.user,
@@ -45,7 +45,7 @@ class Notification(BookWyrmModel):
         super().save(*args, **kwargs)
 
     class Meta:
-        """ checks if notifcation is in enum list for valid types """
+        """checks if notifcation is in enum list for valid types"""
 
         constraints = [
             models.CheckConstraint(
diff --git a/bookwyrm/models/readthrough.py b/bookwyrm/models/readthrough.py
index 1a5fcb0d..664daa13 100644
--- a/bookwyrm/models/readthrough.py
+++ b/bookwyrm/models/readthrough.py
@@ -7,14 +7,14 @@ from .base_model import BookWyrmModel
 
 
 class ProgressMode(models.TextChoices):
-    """ types of prgress available """
+    """types of prgress available"""
 
     PAGE = "PG", "page"
     PERCENT = "PCT", "percent"
 
 
 class ReadThrough(BookWyrmModel):
-    """ Store a read through a book in the database. """
+    """Store a read through a book in the database."""
 
     user = models.ForeignKey("User", on_delete=models.PROTECT)
     book = models.ForeignKey("Edition", on_delete=models.PROTECT)
@@ -28,13 +28,13 @@ class ReadThrough(BookWyrmModel):
     finish_date = models.DateTimeField(blank=True, null=True)
 
     def save(self, *args, **kwargs):
-        """ update user active time """
+        """update user active time"""
         self.user.last_active_date = timezone.now()
         self.user.save(broadcast=False)
         super().save(*args, **kwargs)
 
     def create_update(self):
-        """ add update to the readthrough """
+        """add update to the readthrough"""
         if self.progress:
             return self.progressupdate_set.create(
                 user=self.user, progress=self.progress, mode=self.progress_mode
@@ -43,7 +43,7 @@ class ReadThrough(BookWyrmModel):
 
 
 class ProgressUpdate(BookWyrmModel):
-    """ Store progress through a book in the database. """
+    """Store progress through a book in the database."""
 
     user = models.ForeignKey("User", on_delete=models.PROTECT)
     readthrough = models.ForeignKey("ReadThrough", on_delete=models.CASCADE)
@@ -53,7 +53,7 @@ class ProgressUpdate(BookWyrmModel):
     )
 
     def save(self, *args, **kwargs):
-        """ update user active time """
+        """update user active time"""
         self.user.last_active_date = timezone.now()
         self.user.save(broadcast=False)
         super().save(*args, **kwargs)
diff --git a/bookwyrm/models/relationship.py b/bookwyrm/models/relationship.py
index 3f849597..12f4c51a 100644
--- a/bookwyrm/models/relationship.py
+++ b/bookwyrm/models/relationship.py
@@ -11,7 +11,7 @@ from . import fields
 
 
 class UserRelationship(BookWyrmModel):
-    """ many-to-many through table for followers """
+    """many-to-many through table for followers"""
 
     user_subject = fields.ForeignKey(
         "User",
@@ -28,16 +28,16 @@ class UserRelationship(BookWyrmModel):
 
     @property
     def privacy(self):
-        """ all relationships are handled directly with the participants """
+        """all relationships are handled directly with the participants"""
         return "direct"
 
     @property
     def recipients(self):
-        """ the remote user needs to recieve direct broadcasts """
+        """the remote user needs to recieve direct broadcasts"""
         return [u for u in [self.user_subject, self.user_object] if not u.local]
 
     class Meta:
-        """ relationships should be unique """
+        """relationships should be unique"""
 
         abstract = True
         constraints = [
@@ -51,22 +51,22 @@ class UserRelationship(BookWyrmModel):
         ]
 
     def get_remote_id(self):
-        """ use shelf identifier in remote_id """
+        """use shelf identifier in remote_id"""
         base_path = self.user_subject.remote_id
         return "%s#follows/%d" % (base_path, self.id)
 
 
 class UserFollows(ActivityMixin, UserRelationship):
-    """ Following a user """
+    """Following a user"""
 
     status = "follows"
 
     def to_activity(self):  # pylint: disable=arguments-differ
-        """ overrides default to manually set serializer """
+        """overrides default to manually set serializer"""
         return activitypub.Follow(**generate_activity(self))
 
     def save(self, *args, **kwargs):
-        """ really really don't let a user follow someone who blocked them """
+        """really really don't let a user follow someone who blocked them"""
         # blocking in either direction is a no-go
         if UserBlocks.objects.filter(
             Q(
@@ -85,7 +85,7 @@ class UserFollows(ActivityMixin, UserRelationship):
 
     @classmethod
     def from_request(cls, follow_request):
-        """ converts a follow request into a follow relationship """
+        """converts a follow request into a follow relationship"""
         return cls.objects.create(
             user_subject=follow_request.user_subject,
             user_object=follow_request.user_object,
@@ -94,13 +94,13 @@ class UserFollows(ActivityMixin, UserRelationship):
 
 
 class UserFollowRequest(ActivitypubMixin, UserRelationship):
-    """ following a user requires manual or automatic confirmation """
+    """following a user requires manual or automatic confirmation"""
 
     status = "follow_request"
     activity_serializer = activitypub.Follow
 
     def save(self, *args, broadcast=True, **kwargs):
-        """ make sure the follow or block relationship doesn't already exist """
+        """make sure the follow or block relationship doesn't already exist"""
         # if there's a request for a follow that already exists, accept it
         # without changing the local database state
         if UserFollows.objects.filter(
@@ -141,13 +141,13 @@ class UserFollowRequest(ActivitypubMixin, UserRelationship):
             )
 
     def get_accept_reject_id(self, status):
-        """ get id for sending an accept or reject of a local user """
+        """get id for sending an accept or reject of a local user"""
 
         base_path = self.user_object.remote_id
         return "%s#%s/%d" % (base_path, status, self.id or 0)
 
     def accept(self, broadcast_only=False):
-        """ turn this request into the real deal"""
+        """turn this request into the real deal"""
         user = self.user_object
         if not self.user_subject.local:
             activity = activitypub.Accept(
@@ -164,7 +164,7 @@ class UserFollowRequest(ActivitypubMixin, UserRelationship):
             self.delete()
 
     def reject(self):
-        """ generate a Reject for this follow request """
+        """generate a Reject for this follow request"""
         if self.user_object.local:
             activity = activitypub.Reject(
                 id=self.get_accept_reject_id(status="rejects"),
@@ -177,13 +177,13 @@ class UserFollowRequest(ActivitypubMixin, UserRelationship):
 
 
 class UserBlocks(ActivityMixin, UserRelationship):
-    """ prevent another user from following you and seeing your posts """
+    """prevent another user from following you and seeing your posts"""
 
     status = "blocks"
     activity_serializer = activitypub.Block
 
     def save(self, *args, **kwargs):
-        """ remove follow or follow request rels after a block is created """
+        """remove follow or follow request rels after a block is created"""
         super().save(*args, **kwargs)
 
         UserFollows.objects.filter(
diff --git a/bookwyrm/models/report.py b/bookwyrm/models/report.py
index f9e8905b..7ff4c909 100644
--- a/bookwyrm/models/report.py
+++ b/bookwyrm/models/report.py
@@ -6,7 +6,7 @@ from .base_model import BookWyrmModel
 
 
 class Report(BookWyrmModel):
-    """ reported status or user """
+    """reported status or user"""
 
     reporter = models.ForeignKey(
         "User", related_name="reporter", on_delete=models.PROTECT
@@ -17,7 +17,7 @@ class Report(BookWyrmModel):
     resolved = models.BooleanField(default=False)
 
     def save(self, *args, **kwargs):
-        """ notify admins when a report is created """
+        """notify admins when a report is created"""
         super().save(*args, **kwargs)
         user_model = apps.get_model("bookwyrm.User", require_ready=True)
         # moderators and superusers should be notified
@@ -34,7 +34,7 @@ class Report(BookWyrmModel):
             )
 
     class Meta:
-        """ don't let users report themselves """
+        """don't let users report themselves"""
 
         constraints = [
             models.CheckConstraint(check=~Q(reporter=F("user")), name="self_report")
@@ -43,13 +43,13 @@ class Report(BookWyrmModel):
 
 
 class ReportComment(BookWyrmModel):
-    """ updates on a report """
+    """updates on a report"""
 
     user = models.ForeignKey("User", on_delete=models.PROTECT)
     note = models.TextField()
     report = models.ForeignKey(Report, on_delete=models.PROTECT)
 
     class Meta:
-        """ sort comments """
+        """sort comments"""
 
         ordering = ("-created_date",)
diff --git a/bookwyrm/models/shelf.py b/bookwyrm/models/shelf.py
index d37668dd..4110ae8d 100644
--- a/bookwyrm/models/shelf.py
+++ b/bookwyrm/models/shelf.py
@@ -9,7 +9,7 @@ from . import fields
 
 
 class Shelf(OrderedCollectionMixin, BookWyrmModel):
-    """ a list of books owned by a user """
+    """a list of books owned by a user"""
 
     TO_READ = "to-read"
     READING = "reading"
@@ -34,36 +34,36 @@ class Shelf(OrderedCollectionMixin, BookWyrmModel):
     activity_serializer = activitypub.Shelf
 
     def save(self, *args, **kwargs):
-        """ set the identifier """
+        """set the identifier"""
         super().save(*args, **kwargs)
         if not self.identifier:
             self.identifier = self.get_identifier()
             super().save(*args, **kwargs, broadcast=False)
 
     def get_identifier(self):
-        """ custom-shelf-123 for the url """
+        """custom-shelf-123 for the url"""
         slug = re.sub(r"[^\w]", "", self.name).lower()
         return "{:s}-{:d}".format(slug, self.id)
 
     @property
     def collection_queryset(self):
-        """ list of books for this shelf, overrides OrderedCollectionMixin  """
+        """list of books for this shelf, overrides OrderedCollectionMixin"""
         return self.books.order_by("shelfbook")
 
     def get_remote_id(self):
-        """ shelf identifier instead of id """
+        """shelf identifier instead of id"""
         base_path = self.user.remote_id
         identifier = self.identifier or self.get_identifier()
         return "%s/books/%s" % (base_path, identifier)
 
     class Meta:
-        """ user/shelf unqiueness """
+        """user/shelf unqiueness"""
 
         unique_together = ("user", "identifier")
 
 
 class ShelfBook(CollectionItemMixin, BookWyrmModel):
-    """ many to many join table for books and shelves """
+    """many to many join table for books and shelves"""
 
     book = fields.ForeignKey(
         "Edition", on_delete=models.PROTECT, activitypub_field="book"
diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py
index 1eb31869..193cffb7 100644
--- a/bookwyrm/models/site.py
+++ b/bookwyrm/models/site.py
@@ -12,7 +12,7 @@ from .user import User
 
 
 class SiteSettings(models.Model):
-    """ customized settings for this instance """
+    """customized settings for this instance"""
 
     name = models.CharField(default="BookWyrm", max_length=100)
     instance_tagline = models.CharField(
@@ -35,7 +35,7 @@ class SiteSettings(models.Model):
 
     @classmethod
     def get(cls):
-        """ gets the site settings db entry or defaults """
+        """gets the site settings db entry or defaults"""
         try:
             return cls.objects.get(id=1)
         except cls.DoesNotExist:
@@ -45,12 +45,12 @@ class SiteSettings(models.Model):
 
 
 def new_access_code():
-    """ the identifier for a user invite """
+    """the identifier for a user invite"""
     return base64.b32encode(Random.get_random_bytes(5)).decode("ascii")
 
 
 class SiteInvite(models.Model):
-    """ gives someone access to create an account on the instance """
+    """gives someone access to create an account on the instance"""
 
     created_date = models.DateTimeField(auto_now_add=True)
     code = models.CharField(max_length=32, default=new_access_code)
@@ -61,19 +61,19 @@ class SiteInvite(models.Model):
     invitees = models.ManyToManyField(User, related_name="invitees")
 
     def valid(self):
-        """ make sure it hasn't expired or been used """
+        """make sure it hasn't expired or been used"""
         return (self.expiry is None or self.expiry > timezone.now()) and (
             self.use_limit is None or self.times_used < self.use_limit
         )
 
     @property
     def link(self):
-        """ formats the invite link """
+        """formats the invite link"""
         return "https://{}/invite/{}".format(DOMAIN, self.code)
 
 
 class InviteRequest(BookWyrmModel):
-    """ prospective users can request an invite """
+    """prospective users can request an invite"""
 
     email = models.EmailField(max_length=255, unique=True)
     invite = models.ForeignKey(
@@ -83,30 +83,30 @@ class InviteRequest(BookWyrmModel):
     ignored = models.BooleanField(default=False)
 
     def save(self, *args, **kwargs):
-        """ don't create a request for a registered email """
+        """don't create a request for a registered email"""
         if not self.id and User.objects.filter(email=self.email).exists():
             raise IntegrityError()
         super().save(*args, **kwargs)
 
 
 def get_passowrd_reset_expiry():
-    """ give people a limited time to use the link """
+    """give people a limited time to use the link"""
     now = timezone.now()
     return now + datetime.timedelta(days=1)
 
 
 class PasswordReset(models.Model):
-    """ gives someone access to create an account on the instance """
+    """gives someone access to create an account on the instance"""
 
     code = models.CharField(max_length=32, default=new_access_code)
     expiry = models.DateTimeField(default=get_passowrd_reset_expiry)
     user = models.OneToOneField(User, on_delete=models.CASCADE)
 
     def valid(self):
-        """ make sure it hasn't expired or been used """
+        """make sure it hasn't expired or been used"""
         return self.expiry > timezone.now()
 
     @property
     def link(self):
-        """ formats the invite link """
+        """formats the invite link"""
         return "https://{}/password-reset/{}".format(DOMAIN, self.code)
diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py
index 0dee0b75..bd21ec56 100644
--- a/bookwyrm/models/status.py
+++ b/bookwyrm/models/status.py
@@ -19,7 +19,7 @@ from . import fields
 
 
 class Status(OrderedCollectionPageMixin, BookWyrmModel):
-    """ any post, like a reply to a review, etc """
+    """any post, like a reply to a review, etc"""
 
     user = fields.ForeignKey(
         "User", on_delete=models.PROTECT, activitypub_field="attributedTo"
@@ -59,12 +59,12 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
     deserialize_reverse_fields = [("attachments", "attachment")]
 
     class Meta:
-        """ default sorting """
+        """default sorting"""
 
         ordering = ("-published_date",)
 
     def save(self, *args, **kwargs):
-        """ save and notify """
+        """save and notify"""
         super().save(*args, **kwargs)
 
         notification_model = apps.get_model("bookwyrm.Notification", require_ready=True)
@@ -98,7 +98,7 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
             )
 
     def delete(self, *args, **kwargs):  # pylint: disable=unused-argument
-        """ "delete" a status """
+        """ "delete" a status"""
         if hasattr(self, "boosted_status"):
             # okay but if it's a boost really delete it
             super().delete(*args, **kwargs)
@@ -109,7 +109,7 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
 
     @property
     def recipients(self):
-        """ tagged users who definitely need to get this status in broadcast """
+        """tagged users who definitely need to get this status in broadcast"""
         mentions = [u for u in self.mention_users.all() if not u.local]
         if (
             hasattr(self, "reply_parent")
@@ -121,7 +121,7 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
 
     @classmethod
     def ignore_activity(cls, activity):  # pylint: disable=too-many-return-statements
-        """ keep notes if they are replies to existing statuses """
+        """keep notes if they are replies to existing statuses"""
         if activity.type == "Announce":
             try:
                 boosted = activitypub.resolve_remote_id(
@@ -163,16 +163,16 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
 
     @property
     def status_type(self):
-        """ expose the type of status for the ui using activity type """
+        """expose the type of status for the ui using activity type"""
         return self.activity_serializer.__name__
 
     @property
     def boostable(self):
-        """ you can't boost dms """
+        """you can't boost dms"""
         return self.privacy in ["unlisted", "public"]
 
     def to_replies(self, **kwargs):
-        """ helper function for loading AP serialized replies to a status """
+        """helper function for loading AP serialized replies to a status"""
         return self.to_ordered_collection(
             self.replies(self),
             remote_id="%s/replies" % self.remote_id,
@@ -181,7 +181,7 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
         ).serialize()
 
     def to_activity_dataclass(self, pure=False):  # pylint: disable=arguments-differ
-        """ return tombstone if the status is deleted """
+        """return tombstone if the status is deleted"""
         if self.deleted:
             return activitypub.Tombstone(
                 id=self.remote_id,
@@ -210,16 +210,16 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
         return activity
 
     def to_activity(self, pure=False):  # pylint: disable=arguments-differ
-        """ json serialized activitypub class """
+        """json serialized activitypub class"""
         return self.to_activity_dataclass(pure=pure).serialize()
 
 
 class GeneratedNote(Status):
-    """ these are app-generated messages about user activity """
+    """these are app-generated messages about user activity"""
 
     @property
     def pure_content(self):
-        """ indicate the book in question for mastodon (or w/e) users """
+        """indicate the book in question for mastodon (or w/e) users"""
         message = self.content
         books = ", ".join(
             '<a href="%s">"%s"</a>' % (book.remote_id, book.title)
@@ -232,7 +232,7 @@ class GeneratedNote(Status):
 
 
 class Comment(Status):
-    """ like a review but without a rating and transient """
+    """like a review but without a rating and transient"""
 
     book = fields.ForeignKey(
         "Edition", on_delete=models.PROTECT, activitypub_field="inReplyToBook"
@@ -253,7 +253,7 @@ class Comment(Status):
 
     @property
     def pure_content(self):
-        """ indicate the book in question for mastodon (or w/e) users """
+        """indicate the book in question for mastodon (or w/e) users"""
         return '%s<p>(comment on <a href="%s">"%s"</a>)</p>' % (
             self.content,
             self.book.remote_id,
@@ -265,7 +265,7 @@ class Comment(Status):
 
 
 class Quotation(Status):
-    """ like a review but without a rating and transient """
+    """like a review but without a rating and transient"""
 
     quote = fields.HtmlField()
     book = fields.ForeignKey(
@@ -274,7 +274,7 @@ class Quotation(Status):
 
     @property
     def pure_content(self):
-        """ indicate the book in question for mastodon (or w/e) users """
+        """indicate the book in question for mastodon (or w/e) users"""
         quote = re.sub(r"^<p>", '<p>"', self.quote)
         quote = re.sub(r"</p>$", '"</p>', quote)
         return '%s <p>-- <a href="%s">"%s"</a></p>%s' % (
@@ -289,7 +289,7 @@ class Quotation(Status):
 
 
 class Review(Status):
-    """ a book review """
+    """a book review"""
 
     name = fields.CharField(max_length=255, null=True)
     book = fields.ForeignKey(
@@ -306,7 +306,7 @@ class Review(Status):
 
     @property
     def pure_name(self):
-        """ clarify review names for mastodon serialization """
+        """clarify review names for mastodon serialization"""
         template = get_template("snippets/generated_status/review_pure_name.html")
         return template.render(
             {"book": self.book, "rating": self.rating, "name": self.name}
@@ -314,7 +314,7 @@ class Review(Status):
 
     @property
     def pure_content(self):
-        """ indicate the book in question for mastodon (or w/e) users """
+        """indicate the book in question for mastodon (or w/e) users"""
         return self.content
 
     activity_serializer = activitypub.Review
@@ -322,7 +322,7 @@ class Review(Status):
 
 
 class ReviewRating(Review):
-    """ a subtype of review that only contains a rating """
+    """a subtype of review that only contains a rating"""
 
     def save(self, *args, **kwargs):
         if not self.rating:
@@ -339,7 +339,7 @@ class ReviewRating(Review):
 
 
 class Boost(ActivityMixin, Status):
-    """ boost'ing a post """
+    """boost'ing a post"""
 
     boosted_status = fields.ForeignKey(
         "Status",
@@ -350,7 +350,7 @@ class Boost(ActivityMixin, Status):
     activity_serializer = activitypub.Announce
 
     def save(self, *args, **kwargs):
-        """ save and notify """
+        """save and notify"""
         # This constraint can't work as it would cross tables.
         # class Meta:
         #     unique_together = ('user', 'boosted_status')
@@ -374,7 +374,7 @@ class Boost(ActivityMixin, Status):
         )
 
     def delete(self, *args, **kwargs):
-        """ delete and un-notify """
+        """delete and un-notify"""
         notification_model = apps.get_model("bookwyrm.Notification", require_ready=True)
         notification_model.objects.filter(
             user=self.boosted_status.user,
@@ -385,7 +385,7 @@ class Boost(ActivityMixin, Status):
         super().delete(*args, **kwargs)
 
     def __init__(self, *args, **kwargs):
-        """ the user field is "actor" here instead of "attributedTo" """
+        """the user field is "actor" here instead of "attributedTo" """
         super().__init__(*args, **kwargs)
 
         reserve_fields = ["user", "boosted_status", "published_date", "privacy"]
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 0f98c82d..3efbd6ac 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -35,7 +35,7 @@ DeactivationReason = models.TextChoices(
 
 
 class User(OrderedCollectionPageMixin, AbstractUser):
-    """ a user who wants to read books """
+    """a user who wants to read books"""
 
     username = fields.UsernameField()
     email = models.EmailField(unique=True, null=True)
@@ -130,38 +130,38 @@ class User(OrderedCollectionPageMixin, AbstractUser):
 
     @property
     def following_link(self):
-        """ just how to find out the following info """
+        """just how to find out the following info"""
         return "{:s}/following".format(self.remote_id)
 
     @property
     def alt_text(self):
-        """ alt text with username """
+        """alt text with username"""
         return "avatar for %s" % (self.localname or self.username)
 
     @property
     def display_name(self):
-        """ show the cleanest version of the user's name possible """
+        """show the cleanest version of the user's name possible"""
         if self.name and self.name != "":
             return self.name
         return self.localname or self.username
 
     @property
     def deleted(self):
-        """ for consistent naming """
+        """for consistent naming"""
         return not self.is_active
 
     activity_serializer = activitypub.Person
 
     @classmethod
     def viewer_aware_objects(cls, viewer):
-        """ the user queryset filtered for the context of the logged in user """
+        """the user queryset filtered for the context of the logged in user"""
         queryset = cls.objects.filter(is_active=True)
         if viewer and viewer.is_authenticated:
             queryset = queryset.exclude(blocks=viewer)
         return queryset
 
     def to_outbox(self, filter_type=None, **kwargs):
-        """ an ordered collection of statuses """
+        """an ordered collection of statuses"""
         if filter_type:
             filter_class = apps.get_model(
                 "bookwyrm.%s" % filter_type, require_ready=True
@@ -188,7 +188,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
         ).serialize()
 
     def to_following_activity(self, **kwargs):
-        """ activitypub following list """
+        """activitypub following list"""
         remote_id = "%s/following" % self.remote_id
         return self.to_ordered_collection(
             self.following.order_by("-updated_date").all(),
@@ -198,7 +198,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
         )
 
     def to_followers_activity(self, **kwargs):
-        """ activitypub followers list """
+        """activitypub followers list"""
         remote_id = "%s/followers" % self.remote_id
         return self.to_ordered_collection(
             self.followers.order_by("-updated_date").all(),
@@ -227,7 +227,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
         return activity_object
 
     def save(self, *args, **kwargs):
-        """ populate fields for new local users """
+        """populate fields for new local users"""
         created = not bool(self.id)
         if not self.local and not re.match(regex.full_username, self.username):
             # generate a username that uses the domain (webfinger format)
@@ -292,19 +292,19 @@ class User(OrderedCollectionPageMixin, AbstractUser):
             ).save(broadcast=False)
 
     def delete(self, *args, **kwargs):
-        """ deactivate rather than delete a user """
+        """deactivate rather than delete a user"""
         self.is_active = False
         # skip the logic in this class's save()
         super().save(*args, **kwargs)
 
     @property
     def local_path(self):
-        """ this model doesn't inherit bookwyrm model, so here we are """
+        """this model doesn't inherit bookwyrm model, so here we are"""
         return "/user/%s" % (self.localname or self.username)
 
 
 class KeyPair(ActivitypubMixin, BookWyrmModel):
-    """ public and private keys for a user """
+    """public and private keys for a user"""
 
     private_key = models.TextField(blank=True, null=True)
     public_key = fields.TextField(
@@ -319,7 +319,7 @@ class KeyPair(ActivitypubMixin, BookWyrmModel):
         return "%s/#main-key" % self.owner.remote_id
 
     def save(self, *args, **kwargs):
-        """ create a key pair """
+        """create a key pair"""
         # no broadcasting happening here
         if "broadcast" in kwargs:
             del kwargs["broadcast"]
@@ -337,7 +337,7 @@ class KeyPair(ActivitypubMixin, BookWyrmModel):
 
 
 class AnnualGoal(BookWyrmModel):
-    """ set a goal for how many books you read in a year """
+    """set a goal for how many books you read in a year"""
 
     user = models.ForeignKey("User", on_delete=models.PROTECT)
     goal = models.IntegerField(validators=[MinValueValidator(1)])
@@ -347,17 +347,17 @@ class AnnualGoal(BookWyrmModel):
     )
 
     class Meta:
-        """ unqiueness constraint """
+        """unqiueness constraint"""
 
         unique_together = ("user", "year")
 
     def get_remote_id(self):
-        """ put the year in the path """
+        """put the year in the path"""
         return "%s/goal/%d" % (self.user.remote_id, self.year)
 
     @property
     def books(self):
-        """ the books you've read this year """
+        """the books you've read this year"""
         return (
             self.user.readthrough_set.filter(finish_date__year__gte=self.year)
             .order_by("-finish_date")
@@ -366,7 +366,7 @@ class AnnualGoal(BookWyrmModel):
 
     @property
     def ratings(self):
-        """ ratings for books read this year """
+        """ratings for books read this year"""
         book_ids = [r.book.id for r in self.books]
         reviews = Review.objects.filter(
             user=self.user,
@@ -376,12 +376,12 @@ class AnnualGoal(BookWyrmModel):
 
     @property
     def progress_percent(self):
-        """ how close to your goal, in percent form """
+        """how close to your goal, in percent form"""
         return int(float(self.book_count / self.goal) * 100)
 
     @property
     def book_count(self):
-        """ how many books you've read this year """
+        """how many books you've read this year"""
         return self.user.readthrough_set.filter(
             finish_date__year__gte=self.year
         ).count()
@@ -389,7 +389,7 @@ class AnnualGoal(BookWyrmModel):
 
 @app.task
 def set_remote_server(user_id):
-    """ figure out the user's remote server in the background """
+    """figure out the user's remote server in the background"""
     user = User.objects.get(id=user_id)
     actor_parts = urlparse(user.remote_id)
     user.federated_server = get_or_create_remote_server(actor_parts.netloc)
@@ -399,7 +399,7 @@ def set_remote_server(user_id):
 
 
 def get_or_create_remote_server(domain):
-    """ get info on a remote server """
+    """get info on a remote server"""
     try:
         return FederatedServer.objects.get(server_name=domain)
     except FederatedServer.DoesNotExist:
@@ -428,7 +428,7 @@ def get_or_create_remote_server(domain):
 
 @app.task
 def get_remote_reviews(outbox):
-    """ ingest reviews by a new remote bookwyrm user """
+    """ingest reviews by a new remote bookwyrm user"""
     outbox_page = outbox + "?page=true&type=Review"
     data = get_data(outbox_page)
 
diff --git a/bookwyrm/redis_store.py b/bookwyrm/redis_store.py
index 4236d6df..259bc4fd 100644
--- a/bookwyrm/redis_store.py
+++ b/bookwyrm/redis_store.py
@@ -10,16 +10,16 @@ r = redis.Redis(
 
 
 class RedisStore(ABC):
-    """ sets of ranked, related objects, like statuses for a user's feed """
+    """sets of ranked, related objects, like statuses for a user's feed"""
 
     max_length = settings.MAX_STREAM_LENGTH
 
     def get_value(self, obj):
-        """ the object and rank """
+        """the object and rank"""
         return {obj.id: self.get_rank(obj)}
 
     def add_object_to_related_stores(self, obj, execute=True):
-        """ add an object to all suitable stores """
+        """add an object to all suitable stores"""
         value = self.get_value(obj)
         # we want to do this as a bulk operation, hence "pipeline"
         pipeline = r.pipeline()
@@ -34,14 +34,14 @@ class RedisStore(ABC):
         return pipeline.execute()
 
     def remove_object_from_related_stores(self, obj):
-        """ remove an object from all stores """
+        """remove an object from all stores"""
         pipeline = r.pipeline()
         for store in self.get_stores_for_object(obj):
             pipeline.zrem(store, -1, obj.id)
         pipeline.execute()
 
     def bulk_add_objects_to_store(self, objs, store):
-        """ add a list of objects to a given store """
+        """add a list of objects to a given store"""
         pipeline = r.pipeline()
         for obj in objs[: self.max_length]:
             pipeline.zadd(store, self.get_value(obj))
@@ -50,18 +50,18 @@ class RedisStore(ABC):
         pipeline.execute()
 
     def bulk_remove_objects_from_store(self, objs, store):
-        """ remoev a list of objects from a given store """
+        """remoev a list of objects from a given store"""
         pipeline = r.pipeline()
         for obj in objs[: self.max_length]:
             pipeline.zrem(store, -1, obj.id)
         pipeline.execute()
 
     def get_store(self, store):  # pylint: disable=no-self-use
-        """ load the values in a store """
+        """load the values in a store"""
         return r.zrevrange(store, 0, -1)
 
     def populate_store(self, store):
-        """ go from zero to a store """
+        """go from zero to a store"""
         pipeline = r.pipeline()
         queryset = self.get_objects_for_store(store)
 
@@ -75,12 +75,12 @@ class RedisStore(ABC):
 
     @abstractmethod
     def get_objects_for_store(self, store):
-        """ a queryset of what should go in a store, used for populating it """
+        """a queryset of what should go in a store, used for populating it"""
 
     @abstractmethod
     def get_stores_for_object(self, obj):
-        """ the stores that an object belongs in """
+        """the stores that an object belongs in"""
 
     @abstractmethod
     def get_rank(self, obj):
-        """ how to rank an object """
+        """how to rank an object"""
diff --git a/bookwyrm/sanitize_html.py b/bookwyrm/sanitize_html.py
index 2a630f83..0be64c58 100644
--- a/bookwyrm/sanitize_html.py
+++ b/bookwyrm/sanitize_html.py
@@ -3,7 +3,7 @@ from html.parser import HTMLParser
 
 
 class InputHtmlParser(HTMLParser):  # pylint: disable=abstract-method
-    """ Removes any html that isn't allowed_tagsed from a block """
+    """Removes any html that isn't allowed_tagsed from a block"""
 
     def __init__(self):
         HTMLParser.__init__(self)
@@ -28,7 +28,7 @@ class InputHtmlParser(HTMLParser):  # pylint: disable=abstract-method
         self.allow_html = True
 
     def handle_starttag(self, tag, attrs):
-        """ check if the tag is valid """
+        """check if the tag is valid"""
         if self.allow_html and tag in self.allowed_tags:
             self.output.append(("tag", self.get_starttag_text()))
             self.tag_stack.append(tag)
@@ -36,7 +36,7 @@ class InputHtmlParser(HTMLParser):  # pylint: disable=abstract-method
             self.output.append(("data", ""))
 
     def handle_endtag(self, tag):
-        """ keep the close tag """
+        """keep the close tag"""
         if not self.allow_html or tag not in self.allowed_tags:
             self.output.append(("data", ""))
             return
@@ -51,11 +51,11 @@ class InputHtmlParser(HTMLParser):  # pylint: disable=abstract-method
         self.output.append(("tag", "</%s>" % tag))
 
     def handle_data(self, data):
-        """ extract the answer, if we're in an answer tag """
+        """extract the answer, if we're in an answer tag"""
         self.output.append(("data", data))
 
     def get_output(self):
-        """ convert the output from a list of tuples to a string """
+        """convert the output from a list of tuples to a string"""
         if self.tag_stack:
             self.allow_html = False
         if not self.allow_html:
diff --git a/bookwyrm/signatures.py b/bookwyrm/signatures.py
index 80cbfdc7..5488cf9b 100644
--- a/bookwyrm/signatures.py
+++ b/bookwyrm/signatures.py
@@ -13,7 +13,7 @@ MAX_SIGNATURE_AGE = 300
 
 
 def create_key_pair():
-    """ a new public/private key pair, used for creating new users """
+    """a new public/private key pair, used for creating new users"""
     random_generator = Random.new().read
     key = RSA.generate(1024, random_generator)
     private_key = key.export_key().decode("utf8")
@@ -23,7 +23,7 @@ def create_key_pair():
 
 
 def make_signature(sender, destination, date, digest):
-    """ uses a private key to sign an outgoing message """
+    """uses a private key to sign an outgoing message"""
     inbox_parts = urlparse(destination)
     signature_headers = [
         "(request-target): post %s" % inbox_parts.path,
@@ -44,14 +44,14 @@ def make_signature(sender, destination, date, digest):
 
 
 def make_digest(data):
-    """ creates a message digest for signing """
+    """creates a message digest for signing"""
     return "SHA-256=" + b64encode(hashlib.sha256(data.encode("utf-8")).digest()).decode(
         "utf-8"
     )
 
 
 def verify_digest(request):
-    """ checks if a digest is syntactically valid and matches the message """
+    """checks if a digest is syntactically valid and matches the message"""
     algorithm, digest = request.headers["digest"].split("=", 1)
     if algorithm == "SHA-256":
         hash_function = hashlib.sha256
@@ -66,7 +66,7 @@ def verify_digest(request):
 
 
 class Signature:
-    """ read and validate incoming signatures """
+    """read and validate incoming signatures"""
 
     def __init__(self, key_id, headers, signature):
         self.key_id = key_id
@@ -75,7 +75,7 @@ class Signature:
 
     @classmethod
     def parse(cls, request):
-        """ extract and parse a signature from an http request """
+        """extract and parse a signature from an http request"""
         signature_dict = {}
         for pair in request.headers["Signature"].split(","):
             k, v = pair.split("=", 1)
@@ -92,7 +92,7 @@ class Signature:
         return cls(key_id, headers, signature)
 
     def verify(self, public_key, request):
-        """ verify rsa signature """
+        """verify rsa signature"""
         if http_date_age(request.headers["date"]) > MAX_SIGNATURE_AGE:
             raise ValueError("Request too old: %s" % (request.headers["date"],))
         public_key = RSA.import_key(public_key)
@@ -118,7 +118,7 @@ class Signature:
 
 
 def http_date_age(datestr):
-    """ age of a signature in seconds """
+    """age of a signature in seconds"""
     parsed = datetime.datetime.strptime(datestr, "%a, %d %b %Y %H:%M:%S GMT")
     delta = datetime.datetime.utcnow() - parsed
     return delta.total_seconds()
diff --git a/bookwyrm/status.py b/bookwyrm/status.py
index 793bd742..09fbdc06 100644
--- a/bookwyrm/status.py
+++ b/bookwyrm/status.py
@@ -6,7 +6,7 @@ from bookwyrm.sanitize_html import InputHtmlParser
 
 
 def create_generated_note(user, content, mention_books=None, privacy="public"):
-    """ a note created by the app about user activity """
+    """a note created by the app about user activity"""
     # sanitize input html
     parser = InputHtmlParser()
     parser.feed(content)
diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index bd14a410..2ed0cbc2 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -13,13 +13,13 @@ register = template.Library()
 
 @register.filter(name="dict_key")
 def dict_key(d, k):
-    """ Returns the given key from a dictionary. """
+    """Returns the given key from a dictionary."""
     return d.get(k) or 0
 
 
 @register.filter(name="rating")
 def get_rating(book, user):
-    """ get the overall rating of a book """
+    """get the overall rating of a book"""
     queryset = views.helpers.privacy_filter(
         user, models.Review.objects.filter(book=book)
     )
@@ -28,7 +28,7 @@ def get_rating(book, user):
 
 @register.filter(name="user_rating")
 def get_user_rating(book, user):
-    """ get a user's rating of a book """
+    """get a user's rating of a book"""
     rating = (
         models.Review.objects.filter(
             user=user,
@@ -45,19 +45,19 @@ def get_user_rating(book, user):
 
 @register.filter(name="username")
 def get_user_identifier(user):
-    """ use localname for local users, username for remote """
+    """use localname for local users, username for remote"""
     return user.localname if user.localname else user.username
 
 
 @register.filter(name="notification_count")
 def get_notification_count(user):
-    """ how many UNREAD notifications are there """
+    """how many UNREAD notifications are there"""
     return user.notification_set.filter(read=False).count()
 
 
 @register.filter(name="replies")
 def get_replies(status):
-    """ get all direct replies to a status """
+    """get all direct replies to a status"""
     # TODO: this limit could cause problems
     return models.Status.objects.filter(
         reply_parent=status,
@@ -67,7 +67,7 @@ def get_replies(status):
 
 @register.filter(name="parent")
 def get_parent(status):
-    """ get the reply parent for a status """
+    """get the reply parent for a status"""
     return (
         models.Status.objects.filter(id=status.reply_parent_id)
         .select_subclasses()
@@ -77,7 +77,7 @@ def get_parent(status):
 
 @register.filter(name="liked")
 def get_user_liked(user, status):
-    """ did the given user fav a status? """
+    """did the given user fav a status?"""
     try:
         models.Favorite.objects.get(user=user, status=status)
         return True
@@ -87,13 +87,13 @@ def get_user_liked(user, status):
 
 @register.filter(name="boosted")
 def get_user_boosted(user, status):
-    """ did the given user fav a status? """
+    """did the given user fav a status?"""
     return user.id in status.boosters.all().values_list("user", flat=True)
 
 
 @register.filter(name="follow_request_exists")
 def follow_request_exists(user, requester):
-    """ see if there is a pending follow request for a user """
+    """see if there is a pending follow request for a user"""
     try:
         models.UserFollowRequest.objects.filter(
             user_subject=requester,
@@ -106,7 +106,7 @@ def follow_request_exists(user, requester):
 
 @register.filter(name="boosted_status")
 def get_boosted(boost):
-    """ load a boosted status. have to do this or it wont get foregin keys """
+    """load a boosted status. have to do this or it wont get foregin keys"""
     return (
         models.Status.objects.select_subclasses()
         .filter(id=boost.boosted_status.id)
@@ -116,19 +116,19 @@ def get_boosted(boost):
 
 @register.filter(name="book_description")
 def get_book_description(book):
-    """ use the work's text if the book doesn't have it """
+    """use the work's text if the book doesn't have it"""
     return book.description or book.parent_work.description
 
 
 @register.filter(name="uuid")
 def get_uuid(identifier):
-    """ for avoiding clashing ids when there are many forms """
+    """for avoiding clashing ids when there are many forms"""
     return "%s%s" % (identifier, uuid4())
 
 
 @register.filter(name="to_markdown")
 def get_markdown(content):
-    """ convert markdown to html """
+    """convert markdown to html"""
     if content:
         return to_markdown(content)
     return None
@@ -136,7 +136,7 @@ def get_markdown(content):
 
 @register.filter(name="mentions")
 def get_mentions(status, user):
-    """ people to @ in a reply: the parent and all mentions """
+    """people to @ in a reply: the parent and all mentions"""
     mentions = set([status.user] + list(status.mention_users.all()))
     return (
         " ".join("@" + get_user_identifier(m) for m in mentions if not m == user) + " "
@@ -145,7 +145,7 @@ def get_mentions(status, user):
 
 @register.filter(name="status_preview_name")
 def get_status_preview_name(obj):
-    """ text snippet with book context for a status """
+    """text snippet with book context for a status"""
     name = obj.__class__.__name__.lower()
     if name == "review":
         return "%s of <em>%s</em>" % (name, obj.book.title)
@@ -158,7 +158,7 @@ def get_status_preview_name(obj):
 
 @register.filter(name="next_shelf")
 def get_next_shelf(current_shelf):
-    """ shelf you'd use to update reading progress """
+    """shelf you'd use to update reading progress"""
     if current_shelf == "to-read":
         return "reading"
     if current_shelf == "reading":
@@ -170,7 +170,7 @@ def get_next_shelf(current_shelf):
 
 @register.filter(name="title")
 def get_title(book):
-    """ display the subtitle if the title is short """
+    """display the subtitle if the title is short"""
     if not book:
         return ""
     title = book.title
@@ -181,7 +181,7 @@ def get_title(book):
 
 @register.simple_tag(takes_context=False)
 def related_status(notification):
-    """ for notifications """
+    """for notifications"""
     if not notification.related_status:
         return None
     if hasattr(notification.related_status, "quotation"):
@@ -195,7 +195,7 @@ def related_status(notification):
 
 @register.simple_tag(takes_context=True)
 def active_shelf(context, book):
-    """ check what shelf a user has a book on, if any """
+    """check what shelf a user has a book on, if any"""
     shelf = models.ShelfBook.objects.filter(
         shelf__user=context["request"].user, book__in=book.parent_work.editions.all()
     ).first()
@@ -204,7 +204,7 @@ def active_shelf(context, book):
 
 @register.simple_tag(takes_context=False)
 def latest_read_through(book, user):
-    """ the most recent read activity """
+    """the most recent read activity"""
     return (
         models.ReadThrough.objects.filter(user=user, book=book)
         .order_by("-start_date")
@@ -214,7 +214,7 @@ def latest_read_through(book, user):
 
 @register.simple_tag(takes_context=False)
 def active_read_through(book, user):
-    """ the most recent read activity """
+    """the most recent read activity"""
     return (
         models.ReadThrough.objects.filter(
             user=user, book=book, finish_date__isnull=True
@@ -226,12 +226,12 @@ def active_read_through(book, user):
 
 @register.simple_tag(takes_context=False)
 def comparison_bool(str1, str2):
-    """ idk why I need to write a tag for this, it reutrns a bool """
+    """idk why I need to write a tag for this, it reutrns a bool"""
     return str1 == str2
 
 
 @register.simple_tag(takes_context=False)
 def get_lang():
-    """ get current language, strip to the first two letters """
+    """get current language, strip to the first two letters"""
     language = utils.translation.get_language()
     return language[0 : language.find("-")]
diff --git a/bookwyrm/tests/activitypub/test_base_activity.py b/bookwyrm/tests/activitypub/test_base_activity.py
index 8ec0b703..77844a22 100644
--- a/bookwyrm/tests/activitypub/test_base_activity.py
+++ b/bookwyrm/tests/activitypub/test_base_activity.py
@@ -21,10 +21,10 @@ from bookwyrm import models
 
 @patch("bookwyrm.activitystreams.ActivityStream.add_status")
 class BaseActivity(TestCase):
-    """ the super class for model-linked activitypub dataclasses """
+    """the super class for model-linked activitypub dataclasses"""
 
     def setUp(self):
-        """ we're probably going to re-use this so why copy/paste """
+        """we're probably going to re-use this so why copy/paste"""
         self.user = models.User.objects.create_user(
             "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
         )
@@ -45,28 +45,28 @@ class BaseActivity(TestCase):
         self.image_data = output.getvalue()
 
     def test_init(self, _):
-        """ simple successfuly init """
+        """simple successfuly init"""
         instance = ActivityObject(id="a", type="b")
         self.assertTrue(hasattr(instance, "id"))
         self.assertTrue(hasattr(instance, "type"))
 
     def test_init_missing(self, _):
-        """ init with missing required params """
+        """init with missing required params"""
         with self.assertRaises(ActivitySerializerError):
             ActivityObject()
 
     def test_init_extra_fields(self, _):
-        """ init ignoring additional fields """
+        """init ignoring additional fields"""
         instance = ActivityObject(id="a", type="b", fish="c")
         self.assertTrue(hasattr(instance, "id"))
         self.assertTrue(hasattr(instance, "type"))
 
     def test_init_default_field(self, _):
-        """ replace an existing required field with a default field """
+        """replace an existing required field with a default field"""
 
         @dataclass(init=False)
         class TestClass(ActivityObject):
-            """ test class with default field """
+            """test class with default field"""
 
             type: str = "TestObject"
 
@@ -75,7 +75,7 @@ class BaseActivity(TestCase):
         self.assertEqual(instance.type, "TestObject")
 
     def test_serialize(self, _):
-        """ simple function for converting dataclass to dict """
+        """simple function for converting dataclass to dict"""
         instance = ActivityObject(id="a", type="b")
         serialized = instance.serialize()
         self.assertIsInstance(serialized, dict)
@@ -84,7 +84,7 @@ class BaseActivity(TestCase):
 
     @responses.activate
     def test_resolve_remote_id(self, _):
-        """ look up or load remote data """
+        """look up or load remote data"""
         # existing item
         result = resolve_remote_id("http://example.com/a/b", model=models.User)
         self.assertEqual(result, self.user)
@@ -106,14 +106,14 @@ class BaseActivity(TestCase):
         self.assertEqual(result.name, "MOUSE?? MOUSE!!")
 
     def test_to_model_invalid_model(self, _):
-        """ catch mismatch between activity type and model type """
+        """catch mismatch between activity type and model type"""
         instance = ActivityObject(id="a", type="b")
         with self.assertRaises(ActivitySerializerError):
             instance.to_model(model=models.User)
 
     @responses.activate
     def test_to_model_image(self, _):
-        """ update an image field """
+        """update an image field"""
         activity = activitypub.Person(
             id=self.user.remote_id,
             name="New Name",
@@ -146,7 +146,7 @@ class BaseActivity(TestCase):
         self.assertEqual(self.user.key_pair.public_key, "hi")
 
     def test_to_model_many_to_many(self, _):
-        """ annoying that these all need special handling """
+        """annoying that these all need special handling"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             status = models.Status.objects.create(
                 content="test status",
@@ -216,7 +216,7 @@ class BaseActivity(TestCase):
 
     @responses.activate
     def test_set_related_field(self, _):
-        """ celery task to add back-references to created objects """
+        """celery task to add back-references to created objects"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             status = models.Status.objects.create(
                 content="test status",
diff --git a/bookwyrm/tests/activitypub/test_quotation.py b/bookwyrm/tests/activitypub/test_quotation.py
index 1f429dd2..c90348bc 100644
--- a/bookwyrm/tests/activitypub/test_quotation.py
+++ b/bookwyrm/tests/activitypub/test_quotation.py
@@ -8,10 +8,10 @@ from bookwyrm import activitypub, models
 
 
 class Quotation(TestCase):
-    """ we have hecka ways to create statuses """
+    """we have hecka ways to create statuses"""
 
     def setUp(self):
-        """ model objects we'll need """
+        """model objects we'll need"""
         with patch("bookwyrm.models.user.set_remote_server.delay"):
             self.user = models.User.objects.create_user(
                 "mouse",
@@ -30,7 +30,7 @@ class Quotation(TestCase):
         self.status_data = json.loads(datafile.read_bytes())
 
     def test_quotation_activity(self):
-        """ create a Quoteation ap object from json """
+        """create a Quoteation ap object from json"""
         quotation = activitypub.Quotation(**self.status_data)
 
         self.assertEqual(quotation.type, "Quotation")
@@ -41,7 +41,7 @@ class Quotation(TestCase):
         self.assertEqual(quotation.published, "2020-05-10T02:38:31.150343+00:00")
 
     def test_activity_to_model(self):
-        """ create a model instance from an activity object """
+        """create a model instance from an activity object"""
         activity = activitypub.Quotation(**self.status_data)
         quotation = activity.to_model(model=models.Quotation)
 
diff --git a/bookwyrm/tests/connectors/test_abstract_connector.py b/bookwyrm/tests/connectors/test_abstract_connector.py
index 97190c16..4497b4e5 100644
--- a/bookwyrm/tests/connectors/test_abstract_connector.py
+++ b/bookwyrm/tests/connectors/test_abstract_connector.py
@@ -10,10 +10,10 @@ from bookwyrm.settings import DOMAIN
 
 
 class AbstractConnector(TestCase):
-    """ generic code for connecting to outside data sources """
+    """generic code for connecting to outside data sources"""
 
     def setUp(self):
-        """ we need an example connector """
+        """we need an example connector"""
         self.connector_info = models.Connector.objects.create(
             identifier="example.com",
             connector_file="openlibrary",
@@ -38,7 +38,7 @@ class AbstractConnector(TestCase):
         self.edition_data = edition_data
 
         class TestConnector(abstract_connector.AbstractConnector):
-            """ nothing added here """
+            """nothing added here"""
 
             def format_search_result(self, search_result):
                 return search_result
@@ -81,18 +81,18 @@ class AbstractConnector(TestCase):
         )
 
     def test_abstract_connector_init(self):
-        """ barebones connector for search with defaults """
+        """barebones connector for search with defaults"""
         self.assertIsInstance(self.connector.book_mappings, list)
 
     def test_is_available(self):
-        """ this isn't used.... """
+        """this isn't used...."""
         self.assertTrue(self.connector.is_available())
         self.connector.max_query_count = 1
         self.connector.connector.query_count = 2
         self.assertFalse(self.connector.is_available())
 
     def test_get_or_create_book_existing(self):
-        """ find an existing book by remote/origin id """
+        """find an existing book by remote/origin id"""
         self.assertEqual(models.Book.objects.count(), 1)
         self.assertEqual(
             self.book.remote_id, "https://%s/book/%d" % (DOMAIN, self.book.id)
@@ -113,7 +113,7 @@ class AbstractConnector(TestCase):
 
     @responses.activate
     def test_get_or_create_book_deduped(self):
-        """ load remote data and deduplicate """
+        """load remote data and deduplicate"""
         responses.add(
             responses.GET, "https://example.com/book/abcd", json=self.edition_data
         )
@@ -125,7 +125,7 @@ class AbstractConnector(TestCase):
 
     @responses.activate
     def test_get_or_create_author(self):
-        """ load an author """
+        """load an author"""
         self.connector.author_mappings = [
             Mapping("id"),
             Mapping("name"),
@@ -142,7 +142,7 @@ class AbstractConnector(TestCase):
         self.assertEqual(result.origin_id, "https://www.example.com/author")
 
     def test_get_or_create_author_existing(self):
-        """ get an existing author """
+        """get an existing author"""
         author = models.Author.objects.create(name="Test Author")
         result = self.connector.get_or_create_author(author.remote_id)
         self.assertEqual(author, result)
diff --git a/bookwyrm/tests/connectors/test_abstract_minimal_connector.py b/bookwyrm/tests/connectors/test_abstract_minimal_connector.py
index fa7c85f4..bc5625c9 100644
--- a/bookwyrm/tests/connectors/test_abstract_minimal_connector.py
+++ b/bookwyrm/tests/connectors/test_abstract_minimal_connector.py
@@ -8,10 +8,10 @@ from bookwyrm.connectors.abstract_connector import Mapping, SearchResult
 
 
 class AbstractConnector(TestCase):
-    """ generic code for connecting to outside data sources """
+    """generic code for connecting to outside data sources"""
 
     def setUp(self):
-        """ we need an example connector """
+        """we need an example connector"""
         self.connector_info = models.Connector.objects.create(
             identifier="example.com",
             connector_file="openlibrary",
@@ -23,7 +23,7 @@ class AbstractConnector(TestCase):
         )
 
         class TestConnector(abstract_connector.AbstractMinimalConnector):
-            """ nothing added here """
+            """nothing added here"""
 
             def format_search_result(self, search_result):
                 return search_result
@@ -43,7 +43,7 @@ class AbstractConnector(TestCase):
         self.test_connector = TestConnector("example.com")
 
     def test_abstract_minimal_connector_init(self):
-        """ barebones connector for search with defaults """
+        """barebones connector for search with defaults"""
         connector = self.test_connector
         self.assertEqual(connector.connector, self.connector_info)
         self.assertEqual(connector.base_url, "https://example.com")
@@ -58,7 +58,7 @@ class AbstractConnector(TestCase):
 
     @responses.activate
     def test_search(self):
-        """ makes an http request to the outside service """
+        """makes an http request to the outside service"""
         responses.add(
             responses.GET,
             "https://example.com/search?q=a%20book%20title",
@@ -73,7 +73,7 @@ class AbstractConnector(TestCase):
 
     @responses.activate
     def test_search_min_confidence(self):
-        """ makes an http request to the outside service """
+        """makes an http request to the outside service"""
         responses.add(
             responses.GET,
             "https://example.com/search?q=a%20book%20title&min_confidence=1",
@@ -85,7 +85,7 @@ class AbstractConnector(TestCase):
 
     @responses.activate
     def test_isbn_search(self):
-        """ makes an http request to the outside service """
+        """makes an http request to the outside service"""
         responses.add(
             responses.GET,
             "https://example.com/isbn?q=123456",
@@ -96,7 +96,7 @@ class AbstractConnector(TestCase):
         self.assertEqual(len(results), 10)
 
     def test_search_result(self):
-        """ a class that stores info about a search result """
+        """a class that stores info about a search result"""
         result = SearchResult(
             title="Title",
             key="https://example.com/book/1",
@@ -109,21 +109,21 @@ class AbstractConnector(TestCase):
         self.assertEqual(result.title, "Title")
 
     def test_create_mapping(self):
-        """ maps remote fields for book data to bookwyrm activitypub fields """
+        """maps remote fields for book data to bookwyrm activitypub fields"""
         mapping = Mapping("isbn")
         self.assertEqual(mapping.local_field, "isbn")
         self.assertEqual(mapping.remote_field, "isbn")
         self.assertEqual(mapping.formatter("bb"), "bb")
 
     def test_create_mapping_with_remote(self):
-        """ the remote field is different than the local field """
+        """the remote field is different than the local field"""
         mapping = Mapping("isbn", remote_field="isbn13")
         self.assertEqual(mapping.local_field, "isbn")
         self.assertEqual(mapping.remote_field, "isbn13")
         self.assertEqual(mapping.formatter("bb"), "bb")
 
     def test_create_mapping_with_formatter(self):
-        """ a function is provided to modify the data """
+        """a function is provided to modify the data"""
         formatter = lambda x: "aa" + x
         mapping = Mapping("isbn", formatter=formatter)
         self.assertEqual(mapping.local_field, "isbn")
diff --git a/bookwyrm/tests/connectors/test_bookwyrm_connector.py b/bookwyrm/tests/connectors/test_bookwyrm_connector.py
index 386c1350..46ea54a9 100644
--- a/bookwyrm/tests/connectors/test_bookwyrm_connector.py
+++ b/bookwyrm/tests/connectors/test_bookwyrm_connector.py
@@ -9,10 +9,10 @@ from bookwyrm.connectors.abstract_connector import SearchResult
 
 
 class BookWyrmConnector(TestCase):
-    """ this connector doesn't do much, just search """
+    """this connector doesn't do much, just search"""
 
     def setUp(self):
-        """ create the connector """
+        """create the connector"""
         models.Connector.objects.create(
             identifier="example.com",
             connector_file="bookwyrm_connector",
@@ -24,14 +24,14 @@ class BookWyrmConnector(TestCase):
         self.connector = Connector("example.com")
 
     def test_get_or_create_book_existing(self):
-        """ load book activity """
+        """load book activity"""
         work = models.Work.objects.create(title="Test Work")
         book = models.Edition.objects.create(title="Test Edition", parent_work=work)
         result = self.connector.get_or_create_book(book.remote_id)
         self.assertEqual(book, result)
 
     def test_format_search_result(self):
-        """ create a SearchResult object from search response json """
+        """create a SearchResult object from search response json"""
         datafile = pathlib.Path(__file__).parent.joinpath("../data/bw_search.json")
         search_data = json.loads(datafile.read_bytes())
         results = self.connector.parse_search_data(search_data)
@@ -46,7 +46,7 @@ class BookWyrmConnector(TestCase):
         self.assertEqual(result.connector, self.connector)
 
     def test_format_isbn_search_result(self):
-        """ just gotta attach the connector  """
+        """just gotta attach the connector"""
         datafile = pathlib.Path(__file__).parent.joinpath("../data/bw_search.json")
         search_data = json.loads(datafile.read_bytes())
         results = self.connector.parse_isbn_search_data(search_data)
diff --git a/bookwyrm/tests/connectors/test_connector_manager.py b/bookwyrm/tests/connectors/test_connector_manager.py
index 52589323..feded616 100644
--- a/bookwyrm/tests/connectors/test_connector_manager.py
+++ b/bookwyrm/tests/connectors/test_connector_manager.py
@@ -8,10 +8,10 @@ from bookwyrm.connectors.self_connector import Connector as SelfConnector
 
 
 class ConnectorManager(TestCase):
-    """ interface between the app and various connectors """
+    """interface between the app and various connectors"""
 
     def setUp(self):
-        """ we'll need some books and a connector info entry """
+        """we'll need some books and a connector info entry"""
         self.work = models.Work.objects.create(title="Example Work")
 
         self.edition = models.Edition.objects.create(
@@ -32,7 +32,7 @@ class ConnectorManager(TestCase):
         )
 
     def test_get_or_create_connector(self):
-        """ loads a connector if the data source is known or creates one """
+        """loads a connector if the data source is known or creates one"""
         remote_id = "https://example.com/object/1"
         connector = connector_manager.get_or_create_connector(remote_id)
         self.assertIsInstance(connector, BookWyrmConnector)
@@ -43,7 +43,7 @@ class ConnectorManager(TestCase):
         self.assertEqual(connector.identifier, same_connector.identifier)
 
     def test_get_connectors(self):
-        """ load all connectors """
+        """load all connectors"""
         remote_id = "https://example.com/object/1"
         connector_manager.get_or_create_connector(remote_id)
         connectors = list(connector_manager.get_connectors())
@@ -52,7 +52,7 @@ class ConnectorManager(TestCase):
         self.assertIsInstance(connectors[1], BookWyrmConnector)
 
     def test_search(self):
-        """ search all connectors """
+        """search all connectors"""
         results = connector_manager.search("Example")
         self.assertEqual(len(results), 1)
         self.assertIsInstance(results[0]["connector"], SelfConnector)
@@ -60,7 +60,7 @@ class ConnectorManager(TestCase):
         self.assertEqual(results[0]["results"][0].title, "Example Edition")
 
     def test_search_isbn(self):
-        """ special handling if a query resembles an isbn """
+        """special handling if a query resembles an isbn"""
         results = connector_manager.search("0000000000")
         self.assertEqual(len(results), 1)
         self.assertIsInstance(results[0]["connector"], SelfConnector)
@@ -68,20 +68,20 @@ class ConnectorManager(TestCase):
         self.assertEqual(results[0]["results"][0].title, "Example Edition")
 
     def test_local_search(self):
-        """ search only the local database """
+        """search only the local database"""
         results = connector_manager.local_search("Example")
         self.assertEqual(len(results), 1)
         self.assertEqual(results[0].title, "Example Edition")
 
     def test_first_search_result(self):
-        """ only get one search result """
+        """only get one search result"""
         result = connector_manager.first_search_result("Example")
         self.assertEqual(result.title, "Example Edition")
         no_result = connector_manager.first_search_result("dkjfhg")
         self.assertIsNone(no_result)
 
     def test_load_connector(self):
-        """ load a connector object from the database entry """
+        """load a connector object from the database entry"""
         connector = connector_manager.load_connector(self.connector)
         self.assertIsInstance(connector, SelfConnector)
         self.assertEqual(connector.identifier, "test_connector")
diff --git a/bookwyrm/tests/connectors/test_openlibrary_connector.py b/bookwyrm/tests/connectors/test_openlibrary_connector.py
index 3cff4fb0..699b26ed 100644
--- a/bookwyrm/tests/connectors/test_openlibrary_connector.py
+++ b/bookwyrm/tests/connectors/test_openlibrary_connector.py
@@ -16,10 +16,10 @@ from bookwyrm.connectors.connector_manager import ConnectorException
 
 
 class Openlibrary(TestCase):
-    """ test loading data from openlibrary.org """
+    """test loading data from openlibrary.org"""
 
     def setUp(self):
-        """ creates the connector we'll use """
+        """creates the connector we'll use"""
         models.Connector.objects.create(
             identifier="openlibrary.org",
             name="OpenLibrary",
@@ -42,7 +42,7 @@ class Openlibrary(TestCase):
         self.edition_list_data = json.loads(edition_list_file.read_bytes())
 
     def test_get_remote_id_from_data(self):
-        """ format the remote id from the data """
+        """format the remote id from the data"""
         data = {"key": "/work/OL1234W"}
         result = self.connector.get_remote_id_from_data(data)
         self.assertEqual(result, "https://openlibrary.org/work/OL1234W")
@@ -51,13 +51,13 @@ class Openlibrary(TestCase):
             self.connector.get_remote_id_from_data({})
 
     def test_is_work_data(self):
-        """ detect if the loaded json is a work """
+        """detect if the loaded json is a work"""
         self.assertEqual(self.connector.is_work_data(self.work_data), True)
         self.assertEqual(self.connector.is_work_data(self.edition_data), False)
 
     @responses.activate
     def test_get_edition_from_work_data(self):
-        """ loads a list of editions """
+        """loads a list of editions"""
         data = {"key": "/work/OL1234W"}
         responses.add(
             responses.GET,
@@ -74,7 +74,7 @@ class Openlibrary(TestCase):
 
     @responses.activate
     def test_get_work_from_edition_data(self):
-        """ loads a list of editions """
+        """loads a list of editions"""
         data = {"works": [{"key": "/work/OL1234W"}]}
         responses.add(
             responses.GET,
@@ -87,7 +87,7 @@ class Openlibrary(TestCase):
 
     @responses.activate
     def test_get_authors_from_data(self):
-        """ find authors in data """
+        """find authors in data"""
         responses.add(
             responses.GET,
             "https://openlibrary.org/authors/OL382982A",
@@ -112,13 +112,13 @@ class Openlibrary(TestCase):
         self.assertEqual(result.openlibrary_key, "OL453734A")
 
     def test_get_cover_url(self):
-        """ formats a url that should contain the cover image """
+        """formats a url that should contain the cover image"""
         blob = ["image"]
         result = self.connector.get_cover_url(blob)
         self.assertEqual(result, "https://covers.openlibrary.org/b/id/image-L.jpg")
 
     def test_parse_search_result(self):
-        """ extract the results from the search json response """
+        """extract the results from the search json response"""
         datafile = pathlib.Path(__file__).parent.joinpath("../data/ol_search.json")
         search_data = json.loads(datafile.read_bytes())
         result = self.connector.parse_search_data(search_data)
@@ -126,7 +126,7 @@ class Openlibrary(TestCase):
         self.assertEqual(len(result), 2)
 
     def test_format_search_result(self):
-        """ translate json from openlibrary into SearchResult """
+        """translate json from openlibrary into SearchResult"""
         datafile = pathlib.Path(__file__).parent.joinpath("../data/ol_search.json")
         search_data = json.loads(datafile.read_bytes())
         results = self.connector.parse_search_data(search_data)
@@ -141,7 +141,7 @@ class Openlibrary(TestCase):
         self.assertEqual(result.connector, self.connector)
 
     def test_parse_isbn_search_result(self):
-        """ extract the results from the search json response """
+        """extract the results from the search json response"""
         datafile = pathlib.Path(__file__).parent.joinpath("../data/ol_isbn_search.json")
         search_data = json.loads(datafile.read_bytes())
         result = self.connector.parse_isbn_search_data(search_data)
@@ -149,7 +149,7 @@ class Openlibrary(TestCase):
         self.assertEqual(len(result), 1)
 
     def test_format_isbn_search_result(self):
-        """ translate json from openlibrary into SearchResult """
+        """translate json from openlibrary into SearchResult"""
         datafile = pathlib.Path(__file__).parent.joinpath("../data/ol_isbn_search.json")
         search_data = json.loads(datafile.read_bytes())
         results = self.connector.parse_isbn_search_data(search_data)
@@ -165,7 +165,7 @@ class Openlibrary(TestCase):
 
     @responses.activate
     def test_load_edition_data(self):
-        """ format url from key and make request """
+        """format url from key and make request"""
         key = "OL1234W"
         responses.add(
             responses.GET,
@@ -177,7 +177,7 @@ class Openlibrary(TestCase):
 
     @responses.activate
     def test_expand_book_data(self):
-        """ given a book, get more editions """
+        """given a book, get more editions"""
         work = models.Work.objects.create(title="Test Work", openlibrary_key="OL1234W")
         edition = models.Edition.objects.create(title="Test Edition", parent_work=work)
 
@@ -194,29 +194,29 @@ class Openlibrary(TestCase):
             self.connector.expand_book_data(work)
 
     def test_get_description(self):
-        """ should do some cleanup on the description data """
+        """should do some cleanup on the description data"""
         description = get_description(self.work_data["description"])
         expected = "First in the Old Kingdom/Abhorsen series."
         self.assertEqual(description, expected)
 
     def test_get_openlibrary_key(self):
-        """ extracts the uuid """
+        """extracts the uuid"""
         key = get_openlibrary_key("/books/OL27320736M")
         self.assertEqual(key, "OL27320736M")
 
     def test_get_languages(self):
-        """ looks up languages from a list """
+        """looks up languages from a list"""
         languages = get_languages(self.edition_data["languages"])
         self.assertEqual(languages, ["English"])
 
     def test_pick_default_edition(self):
-        """ detect if the loaded json is an edition """
+        """detect if the loaded json is an edition"""
         edition = pick_default_edition(self.edition_list_data["entries"])
         self.assertEqual(edition["key"], "/books/OL9788823M")
 
     @responses.activate
     def test_create_edition_from_data(self):
-        """ okay but can it actually create an edition with proper metadata """
+        """okay but can it actually create an edition with proper metadata"""
         work = models.Work.objects.create(title="Hello")
         responses.add(
             responses.GET,
@@ -240,7 +240,7 @@ class Openlibrary(TestCase):
         self.assertEqual(result.physical_format, "Hardcover")
 
     def test_ignore_edition(self):
-        """ skip editions with poor metadata """
+        """skip editions with poor metadata"""
         self.assertFalse(ignore_edition({"isbn_13": "hi"}))
         self.assertFalse(ignore_edition({"oclc_numbers": "hi"}))
         self.assertFalse(ignore_edition({"covers": "hi"}))
diff --git a/bookwyrm/tests/connectors/test_self_connector.py b/bookwyrm/tests/connectors/test_self_connector.py
index 9925f594..eee7d00c 100644
--- a/bookwyrm/tests/connectors/test_self_connector.py
+++ b/bookwyrm/tests/connectors/test_self_connector.py
@@ -9,10 +9,10 @@ from bookwyrm.settings import DOMAIN
 
 
 class SelfConnector(TestCase):
-    """ just uses local data """
+    """just uses local data"""
 
     def setUp(self):
-        """ creating the connector """
+        """creating the connector"""
         models.Connector.objects.create(
             identifier=DOMAIN,
             name="Local",
@@ -27,7 +27,7 @@ class SelfConnector(TestCase):
         self.connector = Connector(DOMAIN)
 
     def test_format_search_result(self):
-        """ create a SearchResult """
+        """create a SearchResult"""
         author = models.Author.objects.create(name="Anonymous")
         edition = models.Edition.objects.create(
             title="Edition of Example Work",
@@ -42,7 +42,7 @@ class SelfConnector(TestCase):
         self.assertEqual(result.connector, self.connector)
 
     def test_search_rank(self):
-        """ prioritize certain results """
+        """prioritize certain results"""
         author = models.Author.objects.create(name="Anonymous")
         edition = models.Edition.objects.create(
             title="Edition of Example Work",
@@ -78,7 +78,7 @@ class SelfConnector(TestCase):
         self.assertEqual(results[2].title, "Edition of Example Work")
 
     def test_search_multiple_editions(self):
-        """ it should get rid of duplicate editions for the same work """
+        """it should get rid of duplicate editions for the same work"""
         work = models.Work.objects.create(title="Work Title")
         edition_1 = models.Edition.objects.create(
             title="Edition 1 Title", parent_work=work
diff --git a/bookwyrm/tests/importers/test_goodreads_import.py b/bookwyrm/tests/importers/test_goodreads_import.py
index 6e9caaf4..0e39d5ec 100644
--- a/bookwyrm/tests/importers/test_goodreads_import.py
+++ b/bookwyrm/tests/importers/test_goodreads_import.py
@@ -14,10 +14,10 @@ from bookwyrm.settings import DOMAIN
 
 
 class GoodreadsImport(TestCase):
-    """ importing from goodreads csv """
+    """importing from goodreads csv"""
 
     def setUp(self):
-        """ use a test csv """
+        """use a test csv"""
         self.importer = GoodreadsImporter()
         datafile = pathlib.Path(__file__).parent.joinpath("../data/goodreads.csv")
         self.csv = open(datafile, "r", encoding=self.importer.encoding)
@@ -44,7 +44,7 @@ class GoodreadsImport(TestCase):
         )
 
     def test_create_job(self):
-        """ creates the import job entry and checks csv """
+        """creates the import job entry and checks csv"""
         import_job = self.importer.create_job(self.user, self.csv, False, "public")
         self.assertEqual(import_job.user, self.user)
         self.assertEqual(import_job.include_reviews, False)
@@ -60,7 +60,7 @@ class GoodreadsImport(TestCase):
         self.assertEqual(import_items[2].data["Book Id"], "28694510")
 
     def test_create_retry_job(self):
-        """ trying again with items that didn't import """
+        """trying again with items that didn't import"""
         import_job = self.importer.create_job(self.user, self.csv, False, "unlisted")
         import_items = models.ImportItem.objects.filter(job=import_job).all()[:2]
 
@@ -78,7 +78,7 @@ class GoodreadsImport(TestCase):
         self.assertEqual(retry_items[1].data["Book Id"], "52691223")
 
     def test_start_import(self):
-        """ begin loading books """
+        """begin loading books"""
         import_job = self.importer.create_job(self.user, self.csv, False, "unlisted")
         MockTask = namedtuple("Task", ("id"))
         mock_task = MockTask(7)
@@ -90,7 +90,7 @@ class GoodreadsImport(TestCase):
 
     @responses.activate
     def test_import_data(self):
-        """ resolve entry """
+        """resolve entry"""
         import_job = self.importer.create_job(self.user, self.csv, False, "unlisted")
         book = models.Edition.objects.create(title="Test Book")
 
@@ -105,7 +105,7 @@ class GoodreadsImport(TestCase):
         self.assertEqual(import_item.book.id, book.id)
 
     def test_handle_imported_book(self):
-        """ goodreads import added a book, this adds related connections """
+        """goodreads import added a book, this adds related connections"""
         shelf = self.user.shelf_set.filter(identifier="read").first()
         self.assertIsNone(shelf.books.first())
 
@@ -138,7 +138,7 @@ class GoodreadsImport(TestCase):
         self.assertEqual(readthrough.finish_date.day, 25)
 
     def test_handle_imported_book_already_shelved(self):
-        """ goodreads import added a book, this adds related connections """
+        """goodreads import added a book, this adds related connections"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             shelf = self.user.shelf_set.filter(identifier="to-read").first()
             models.ShelfBook.objects.create(shelf=shelf, user=self.user, book=self.book)
@@ -171,7 +171,7 @@ class GoodreadsImport(TestCase):
         self.assertEqual(readthrough.finish_date.day, 25)
 
     def test_handle_import_twice(self):
-        """ re-importing books """
+        """re-importing books"""
         shelf = self.user.shelf_set.filter(identifier="read").first()
         import_job = models.ImportJob.objects.create(user=self.user)
         datafile = pathlib.Path(__file__).parent.joinpath("../data/goodreads.csv")
@@ -206,7 +206,7 @@ class GoodreadsImport(TestCase):
 
     @patch("bookwyrm.activitystreams.ActivityStream.add_status")
     def test_handle_imported_book_review(self, _):
-        """ goodreads review import """
+        """goodreads review import"""
         import_job = models.ImportJob.objects.create(user=self.user)
         datafile = pathlib.Path(__file__).parent.joinpath("../data/goodreads.csv")
         csv_file = open(datafile, "r")
@@ -229,7 +229,7 @@ class GoodreadsImport(TestCase):
         self.assertEqual(review.privacy, "unlisted")
 
     def test_handle_imported_book_reviews_disabled(self):
-        """ goodreads review import """
+        """goodreads review import"""
         import_job = models.ImportJob.objects.create(user=self.user)
         datafile = pathlib.Path(__file__).parent.joinpath("../data/goodreads.csv")
         csv_file = open(datafile, "r")
diff --git a/bookwyrm/tests/importers/test_librarything_import.py b/bookwyrm/tests/importers/test_librarything_import.py
index 5e1d778e..5ae0944c 100644
--- a/bookwyrm/tests/importers/test_librarything_import.py
+++ b/bookwyrm/tests/importers/test_librarything_import.py
@@ -13,10 +13,10 @@ from bookwyrm.settings import DOMAIN
 
 
 class LibrarythingImport(TestCase):
-    """ importing from librarything tsv """
+    """importing from librarything tsv"""
 
     def setUp(self):
-        """ use a test tsv """
+        """use a test tsv"""
         self.importer = LibrarythingImporter()
         datafile = pathlib.Path(__file__).parent.joinpath("../data/librarything.tsv")
 
@@ -45,7 +45,7 @@ class LibrarythingImport(TestCase):
         )
 
     def test_create_job(self):
-        """ creates the import job entry and checks csv """
+        """creates the import job entry and checks csv"""
         import_job = self.importer.create_job(self.user, self.csv, False, "public")
         self.assertEqual(import_job.user, self.user)
         self.assertEqual(import_job.include_reviews, False)
@@ -61,7 +61,7 @@ class LibrarythingImport(TestCase):
         self.assertEqual(import_items[2].data["Book Id"], "5015399")
 
     def test_create_retry_job(self):
-        """ trying again with items that didn't import """
+        """trying again with items that didn't import"""
         import_job = self.importer.create_job(self.user, self.csv, False, "unlisted")
         import_items = models.ImportItem.objects.filter(job=import_job).all()[:2]
 
@@ -80,7 +80,7 @@ class LibrarythingImport(TestCase):
 
     @responses.activate
     def test_import_data(self):
-        """ resolve entry """
+        """resolve entry"""
         import_job = self.importer.create_job(self.user, self.csv, False, "unlisted")
         book = models.Edition.objects.create(title="Test Book")
 
@@ -95,7 +95,7 @@ class LibrarythingImport(TestCase):
         self.assertEqual(import_item.book.id, book.id)
 
     def test_handle_imported_book(self):
-        """ librarything import added a book, this adds related connections """
+        """librarything import added a book, this adds related connections"""
         shelf = self.user.shelf_set.filter(identifier="read").first()
         self.assertIsNone(shelf.books.first())
 
@@ -130,7 +130,7 @@ class LibrarythingImport(TestCase):
         self.assertEqual(readthrough.finish_date.day, 8)
 
     def test_handle_imported_book_already_shelved(self):
-        """ librarything import added a book, this adds related connections """
+        """librarything import added a book, this adds related connections"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             shelf = self.user.shelf_set.filter(identifier="to-read").first()
             models.ShelfBook.objects.create(shelf=shelf, user=self.user, book=self.book)
@@ -165,7 +165,7 @@ class LibrarythingImport(TestCase):
         self.assertEqual(readthrough.finish_date.day, 8)
 
     def test_handle_import_twice(self):
-        """ re-importing books """
+        """re-importing books"""
         shelf = self.user.shelf_set.filter(identifier="read").first()
         import_job = models.ImportJob.objects.create(user=self.user)
         datafile = pathlib.Path(__file__).parent.joinpath("../data/librarything.tsv")
@@ -202,7 +202,7 @@ class LibrarythingImport(TestCase):
 
     @patch("bookwyrm.activitystreams.ActivityStream.add_status")
     def test_handle_imported_book_review(self, _):
-        """ librarything review import """
+        """librarything review import"""
         import_job = models.ImportJob.objects.create(user=self.user)
         datafile = pathlib.Path(__file__).parent.joinpath("../data/librarything.tsv")
         csv_file = open(datafile, "r", encoding=self.importer.encoding)
@@ -225,7 +225,7 @@ class LibrarythingImport(TestCase):
         self.assertEqual(review.privacy, "unlisted")
 
     def test_handle_imported_book_reviews_disabled(self):
-        """ librarything review import """
+        """librarything review import"""
         import_job = models.ImportJob.objects.create(user=self.user)
         datafile = pathlib.Path(__file__).parent.joinpath("../data/librarything.tsv")
         csv_file = open(datafile, "r", encoding=self.importer.encoding)
diff --git a/bookwyrm/tests/management/test_populate_streams.py b/bookwyrm/tests/management/test_populate_streams.py
index 6a9b6b8a..d187c054 100644
--- a/bookwyrm/tests/management/test_populate_streams.py
+++ b/bookwyrm/tests/management/test_populate_streams.py
@@ -8,10 +8,10 @@ from bookwyrm.management.commands.populate_streams import populate_streams
 
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 class Activitystreams(TestCase):
-    """ using redis to build activity streams """
+    """using redis to build activity streams"""
 
     def setUp(self):
-        """ we need some stuff """
+        """we need some stuff"""
         self.local_user = models.User.objects.create_user(
             "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse"
         )
@@ -31,7 +31,7 @@ class Activitystreams(TestCase):
         self.book = models.Edition.objects.create(title="test book")
 
     def test_populate_streams(self, _):
-        """ make sure the function on the redis manager gets called """
+        """make sure the function on the redis manager gets called"""
         with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
             models.Comment.objects.create(
                 user=self.local_user, content="hi", book=self.book
diff --git a/bookwyrm/tests/models/test_activitypub_mixin.py b/bookwyrm/tests/models/test_activitypub_mixin.py
index e172ede9..1c0975c4 100644
--- a/bookwyrm/tests/models/test_activitypub_mixin.py
+++ b/bookwyrm/tests/models/test_activitypub_mixin.py
@@ -15,10 +15,10 @@ from bookwyrm.models.activitypub_mixin import ActivityMixin, ObjectMixin
 
 @patch("bookwyrm.activitystreams.ActivityStream.add_status")
 class ActivitypubMixins(TestCase):
-    """ functionality shared across models """
+    """functionality shared across models"""
 
     def setUp(self):
-        """ shared data """
+        """shared data"""
         self.local_user = models.User.objects.create_user(
             "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse"
         )
@@ -46,16 +46,16 @@ class ActivitypubMixins(TestCase):
 
     # ActivitypubMixin
     def test_to_activity(self, _):
-        """ model to ActivityPub json """
+        """model to ActivityPub json"""
 
         @dataclass(init=False)
         class TestActivity(ActivityObject):
-            """ real simple mock """
+            """real simple mock"""
 
             type: str = "Test"
 
         class TestModel(ActivitypubMixin, base_model.BookWyrmModel):
-            """ real simple mock model because BookWyrmModel is abstract """
+            """real simple mock model because BookWyrmModel is abstract"""
 
         instance = TestModel()
         instance.remote_id = "https://www.example.com/test"
@@ -67,7 +67,7 @@ class ActivitypubMixins(TestCase):
         self.assertEqual(activity["type"], "Test")
 
     def test_find_existing_by_remote_id(self, _):
-        """ attempt to match a remote id to an object in the db """
+        """attempt to match a remote id to an object in the db"""
         # uses a different remote id scheme
         # this isn't really part of this test directly but it's helpful to state
         book = models.Edition.objects.create(
@@ -100,7 +100,7 @@ class ActivitypubMixins(TestCase):
         result = models.Status.find_existing_by_remote_id("https://comment.net")
 
     def test_find_existing(self, _):
-        """ match a blob of data to a model """
+        """match a blob of data to a model"""
         book = models.Edition.objects.create(
             title="Test edition",
             openlibrary_key="OL1234",
@@ -110,7 +110,7 @@ class ActivitypubMixins(TestCase):
         self.assertEqual(result, book)
 
     def test_get_recipients_public_object(self, _):
-        """ determines the recipients for an object's broadcast """
+        """determines the recipients for an object's broadcast"""
         MockSelf = namedtuple("Self", ("privacy"))
         mock_self = MockSelf("public")
         recipients = ActivitypubMixin.get_recipients(mock_self)
@@ -118,7 +118,7 @@ class ActivitypubMixins(TestCase):
         self.assertEqual(recipients[0], self.remote_user.inbox)
 
     def test_get_recipients_public_user_object_no_followers(self, _):
-        """ determines the recipients for a user's object broadcast """
+        """determines the recipients for a user's object broadcast"""
         MockSelf = namedtuple("Self", ("privacy", "user"))
         mock_self = MockSelf("public", self.local_user)
 
@@ -126,7 +126,7 @@ class ActivitypubMixins(TestCase):
         self.assertEqual(len(recipients), 0)
 
     def test_get_recipients_public_user_object(self, _):
-        """ determines the recipients for a user's object broadcast """
+        """determines the recipients for a user's object broadcast"""
         MockSelf = namedtuple("Self", ("privacy", "user"))
         mock_self = MockSelf("public", self.local_user)
         self.local_user.followers.add(self.remote_user)
@@ -136,7 +136,7 @@ class ActivitypubMixins(TestCase):
         self.assertEqual(recipients[0], self.remote_user.inbox)
 
     def test_get_recipients_public_user_object_with_mention(self, _):
-        """ determines the recipients for a user's object broadcast """
+        """determines the recipients for a user's object broadcast"""
         MockSelf = namedtuple("Self", ("privacy", "user"))
         mock_self = MockSelf("public", self.local_user)
         self.local_user.followers.add(self.remote_user)
@@ -159,7 +159,7 @@ class ActivitypubMixins(TestCase):
         self.assertTrue(self.remote_user.inbox in recipients)
 
     def test_get_recipients_direct(self, _):
-        """ determines the recipients for a user's object broadcast """
+        """determines the recipients for a user's object broadcast"""
         MockSelf = namedtuple("Self", ("privacy", "user"))
         mock_self = MockSelf("public", self.local_user)
         self.local_user.followers.add(self.remote_user)
@@ -181,7 +181,7 @@ class ActivitypubMixins(TestCase):
         self.assertEqual(recipients[0], another_remote_user.inbox)
 
     def test_get_recipients_combine_inboxes(self, _):
-        """ should combine users with the same shared_inbox """
+        """should combine users with the same shared_inbox"""
         self.remote_user.shared_inbox = "http://example.com/inbox"
         self.remote_user.save(broadcast=False)
         with patch("bookwyrm.models.user.set_remote_server.delay"):
@@ -205,7 +205,7 @@ class ActivitypubMixins(TestCase):
         self.assertEqual(recipients[0], "http://example.com/inbox")
 
     def test_get_recipients_software(self, _):
-        """ should differentiate between bookwyrm and other remote users """
+        """should differentiate between bookwyrm and other remote users"""
         with patch("bookwyrm.models.user.set_remote_server.delay"):
             another_remote_user = models.User.objects.create_user(
                 "nutria",
@@ -235,13 +235,13 @@ class ActivitypubMixins(TestCase):
 
     # ObjectMixin
     def test_object_save_create(self, _):
-        """ should save uneventufully when broadcast is disabled """
+        """should save uneventufully when broadcast is disabled"""
 
         class Success(Exception):
-            """ this means we got to the right method """
+            """this means we got to the right method"""
 
         class ObjectModel(ObjectMixin, base_model.BookWyrmModel):
-            """ real simple mock model because BookWyrmModel is abstract """
+            """real simple mock model because BookWyrmModel is abstract"""
 
             user = models.fields.ForeignKey("User", on_delete=db.models.CASCADE)
 
@@ -252,7 +252,7 @@ class ActivitypubMixins(TestCase):
             def broadcast(
                 self, activity, sender, **kwargs
             ):  # pylint: disable=arguments-differ
-                """ do something """
+                """do something"""
                 raise Success()
 
             def to_create_activity(self, user):  # pylint: disable=arguments-differ
@@ -266,13 +266,13 @@ class ActivitypubMixins(TestCase):
         ObjectModel(user=None).save()
 
     def test_object_save_update(self, _):
-        """ should save uneventufully when broadcast is disabled """
+        """should save uneventufully when broadcast is disabled"""
 
         class Success(Exception):
-            """ this means we got to the right method """
+            """this means we got to the right method"""
 
         class UpdateObjectModel(ObjectMixin, base_model.BookWyrmModel):
-            """ real simple mock model because BookWyrmModel is abstract """
+            """real simple mock model because BookWyrmModel is abstract"""
 
             user = models.fields.ForeignKey("User", on_delete=db.models.CASCADE)
             last_edited_by = models.fields.ForeignKey(
@@ -292,13 +292,13 @@ class ActivitypubMixins(TestCase):
             UpdateObjectModel(id=1, last_edited_by=self.local_user).save()
 
     def test_object_save_delete(self, _):
-        """ should create delete activities when objects are deleted by flag """
+        """should create delete activities when objects are deleted by flag"""
 
         class ActivitySuccess(Exception):
-            """ this means we got to the right method """
+            """this means we got to the right method"""
 
         class DeletableObjectModel(ObjectMixin, base_model.BookWyrmModel):
-            """ real simple mock model because BookWyrmModel is abstract """
+            """real simple mock model because BookWyrmModel is abstract"""
 
             user = models.fields.ForeignKey("User", on_delete=db.models.CASCADE)
             deleted = models.fields.BooleanField()
@@ -314,7 +314,7 @@ class ActivitypubMixins(TestCase):
             DeletableObjectModel(id=1, user=self.local_user, deleted=True).save()
 
     def test_to_delete_activity(self, _):
-        """ wrapper for Delete activity """
+        """wrapper for Delete activity"""
         MockSelf = namedtuple("Self", ("remote_id", "to_activity"))
         mock_self = MockSelf(
             "https://example.com/status/1", lambda *args: self.object_mock
@@ -329,7 +329,7 @@ class ActivitypubMixins(TestCase):
         )
 
     def test_to_update_activity(self, _):
-        """ ditto above but for Update """
+        """ditto above but for Update"""
         MockSelf = namedtuple("Self", ("remote_id", "to_activity"))
         mock_self = MockSelf(
             "https://example.com/status/1", lambda *args: self.object_mock
@@ -347,7 +347,7 @@ class ActivitypubMixins(TestCase):
 
     # Activity mixin
     def test_to_undo_activity(self, _):
-        """ and again, for Undo """
+        """and again, for Undo"""
         MockSelf = namedtuple("Self", ("remote_id", "to_activity", "user"))
         mock_self = MockSelf(
             "https://example.com/status/1",
diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py
index 442f98ca..5a8350b2 100644
--- a/bookwyrm/tests/models/test_base_model.py
+++ b/bookwyrm/tests/models/test_base_model.py
@@ -8,10 +8,10 @@ from bookwyrm.settings import DOMAIN
 
 
 class BaseModel(TestCase):
-    """ functionality shared across models """
+    """functionality shared across models"""
 
     def setUp(self):
-        """ shared data """
+        """shared data"""
         self.local_user = models.User.objects.create_user(
             "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse"
         )
@@ -27,14 +27,14 @@ class BaseModel(TestCase):
             )
 
     def test_remote_id(self):
-        """ these should be generated """
+        """these should be generated"""
         instance = base_model.BookWyrmModel()
         instance.id = 1
         expected = instance.get_remote_id()
         self.assertEqual(expected, "https://%s/bookwyrmmodel/1" % DOMAIN)
 
     def test_remote_id_with_user(self):
-        """ format of remote id when there's a user object """
+        """format of remote id when there's a user object"""
         instance = base_model.BookWyrmModel()
         instance.user = self.local_user
         instance.id = 1
@@ -42,7 +42,7 @@ class BaseModel(TestCase):
         self.assertEqual(expected, "https://%s/user/mouse/bookwyrmmodel/1" % DOMAIN)
 
     def test_set_remote_id(self):
-        """ this function sets remote ids after creation """
+        """this function sets remote ids after creation"""
         # using Work because it BookWrymModel is abstract and this requires save
         # Work is a relatively not-fancy model.
         instance = models.Work.objects.create(title="work title")
@@ -59,7 +59,7 @@ class BaseModel(TestCase):
 
     @patch("bookwyrm.activitystreams.ActivityStream.add_status")
     def test_object_visible_to_user(self, _):
-        """ does a user have permission to view an object """
+        """does a user have permission to view an object"""
         obj = models.Status.objects.create(
             content="hi", user=self.remote_user, privacy="public"
         )
@@ -88,7 +88,7 @@ class BaseModel(TestCase):
 
     @patch("bookwyrm.activitystreams.ActivityStream.add_status")
     def test_object_visible_to_user_follower(self, _):
-        """ what you can see if you follow a user """
+        """what you can see if you follow a user"""
         self.remote_user.followers.add(self.local_user)
         obj = models.Status.objects.create(
             content="hi", user=self.remote_user, privacy="followers"
@@ -108,7 +108,7 @@ class BaseModel(TestCase):
 
     @patch("bookwyrm.activitystreams.ActivityStream.add_status")
     def test_object_visible_to_user_blocked(self, _):
-        """ you can't see it if they block you """
+        """you can't see it if they block you"""
         self.remote_user.blocks.add(self.local_user)
         obj = models.Status.objects.create(
             content="hi", user=self.remote_user, privacy="public"
diff --git a/bookwyrm/tests/models/test_book_model.py b/bookwyrm/tests/models/test_book_model.py
index 14ab0c57..c80cc4a8 100644
--- a/bookwyrm/tests/models/test_book_model.py
+++ b/bookwyrm/tests/models/test_book_model.py
@@ -8,10 +8,10 @@ from bookwyrm.models.book import isbn_10_to_13, isbn_13_to_10
 
 
 class Book(TestCase):
-    """ not too much going on in the books model but here we are """
+    """not too much going on in the books model but here we are"""
 
     def setUp(self):
-        """ we'll need some books """
+        """we'll need some books"""
         self.work = models.Work.objects.create(
             title="Example Work", remote_id="https://example.com/book/1"
         )
@@ -25,17 +25,17 @@ class Book(TestCase):
         )
 
     def test_remote_id(self):
-        """ fanciness with remote/origin ids """
+        """fanciness with remote/origin ids"""
         remote_id = "https://%s/book/%d" % (settings.DOMAIN, self.work.id)
         self.assertEqual(self.work.get_remote_id(), remote_id)
         self.assertEqual(self.work.remote_id, remote_id)
 
     def test_create_book(self):
-        """ you shouldn't be able to create Books (only editions and works) """
+        """you shouldn't be able to create Books (only editions and works)"""
         self.assertRaises(ValueError, models.Book.objects.create, title="Invalid Book")
 
     def test_isbn_10_to_13(self):
-        """ checksums and so on """
+        """checksums and so on"""
         isbn_10 = "178816167X"
         isbn_13 = isbn_10_to_13(isbn_10)
         self.assertEqual(isbn_13, "9781788161671")
@@ -45,7 +45,7 @@ class Book(TestCase):
         self.assertEqual(isbn_13, "9781788161671")
 
     def test_isbn_13_to_10(self):
-        """ checksums and so on """
+        """checksums and so on"""
         isbn_13 = "9781788161671"
         isbn_10 = isbn_13_to_10(isbn_13)
         self.assertEqual(isbn_10, "178816167X")
@@ -55,7 +55,7 @@ class Book(TestCase):
         self.assertEqual(isbn_10, "178816167X")
 
     def test_get_edition_info(self):
-        """ text slug about an edition """
+        """text slug about an edition"""
         book = models.Edition.objects.create(title="Test Edition")
         self.assertEqual(book.edition_info, "")
 
@@ -77,7 +77,7 @@ class Book(TestCase):
         self.assertEqual(book.alt_text, "Test Edition (worm, Glorbish language, 2020)")
 
     def test_get_rank(self):
-        """ sets the data quality index for the book """
+        """sets the data quality index for the book"""
         # basic rank
         self.assertEqual(self.first_edition.edition_rank, 0)
 
diff --git a/bookwyrm/tests/models/test_federated_server.py b/bookwyrm/tests/models/test_federated_server.py
index 4e9e8b68..43724568 100644
--- a/bookwyrm/tests/models/test_federated_server.py
+++ b/bookwyrm/tests/models/test_federated_server.py
@@ -6,10 +6,10 @@ from bookwyrm import models
 
 
 class FederatedServer(TestCase):
-    """ federate server management """
+    """federate server management"""
 
     def setUp(self):
-        """ we'll need a user """
+        """we'll need a user"""
         self.server = models.FederatedServer.objects.create(server_name="test.server")
         with patch("bookwyrm.models.user.set_remote_server.delay"):
             self.remote_user = models.User.objects.create_user(
@@ -36,7 +36,7 @@ class FederatedServer(TestCase):
             )
 
     def test_block_unblock(self):
-        """ block a server and all users on it """
+        """block a server and all users on it"""
         self.assertEqual(self.server.status, "federated")
         self.assertTrue(self.remote_user.is_active)
         self.assertFalse(self.inactive_remote_user.is_active)
diff --git a/bookwyrm/tests/models/test_fields.py b/bookwyrm/tests/models/test_fields.py
index 18bb028f..ea692b62 100644
--- a/bookwyrm/tests/models/test_fields.py
+++ b/bookwyrm/tests/models/test_fields.py
@@ -25,10 +25,10 @@ from bookwyrm.models.activitypub_mixin import ActivitypubMixin
 
 # pylint: disable=too-many-public-methods
 class ActivitypubFields(TestCase):
-    """ overwrites standard model feilds to work with activitypub """
+    """overwrites standard model feilds to work with activitypub"""
 
     def test_validate_remote_id(self):
-        """ should look like a url """
+        """should look like a url"""
         self.assertIsNone(fields.validate_remote_id("http://www.example.com"))
         self.assertIsNone(fields.validate_remote_id("https://www.example.com"))
         self.assertIsNone(fields.validate_remote_id("http://exle.com/dlg-23/x"))
@@ -45,7 +45,7 @@ class ActivitypubFields(TestCase):
         )
 
     def test_activitypub_field_mixin(self):
-        """ generic mixin with super basic to and from functionality """
+        """generic mixin with super basic to and from functionality"""
         instance = fields.ActivitypubFieldMixin()
         self.assertEqual(instance.field_to_activity("fish"), "fish")
         self.assertEqual(instance.field_from_activity("fish"), "fish")
@@ -63,11 +63,11 @@ class ActivitypubFields(TestCase):
         self.assertEqual(instance.get_activitypub_field(), "snakeCaseName")
 
     def test_set_field_from_activity(self):
-        """ setter from entire json blob """
+        """setter from entire json blob"""
 
         @dataclass
         class TestModel:
-            """ real simple mock """
+            """real simple mock"""
 
             field_name: str
 
@@ -82,11 +82,11 @@ class ActivitypubFields(TestCase):
         self.assertEqual(mock_model.field_name, "hi")
 
     def test_set_activity_from_field(self):
-        """ set json field given entire model """
+        """set json field given entire model"""
 
         @dataclass
         class TestModel:
-            """ real simple mock """
+            """real simple mock"""
 
             field_name: str
             unrelated: str
@@ -100,7 +100,7 @@ class ActivitypubFields(TestCase):
         self.assertEqual(data["fieldName"], "bip")
 
     def test_remote_id_field(self):
-        """ just sets some defaults on charfield """
+        """just sets some defaults on charfield"""
         instance = fields.RemoteIdField()
         self.assertEqual(instance.max_length, 255)
         self.assertTrue(instance.deduplication_field)
@@ -109,7 +109,7 @@ class ActivitypubFields(TestCase):
             instance.run_validators("http://www.example.com/dlfjg 23/x")
 
     def test_username_field(self):
-        """ again, just setting defaults on username field """
+        """again, just setting defaults on username field"""
         instance = fields.UsernameField()
         self.assertEqual(instance.activitypub_field, "preferredUsername")
         self.assertEqual(instance.max_length, 150)
@@ -130,7 +130,7 @@ class ActivitypubFields(TestCase):
         self.assertEqual(instance.field_to_activity("test@example.com"), "test")
 
     def test_privacy_field_defaults(self):
-        """ post privacy field's many default values """
+        """post privacy field's many default values"""
         instance = fields.PrivacyField()
         self.assertEqual(instance.max_length, 255)
         self.assertEqual(
@@ -143,11 +143,11 @@ class ActivitypubFields(TestCase):
         )
 
     def test_privacy_field_set_field_from_activity(self):
-        """ translate between to/cc fields and privacy """
+        """translate between to/cc fields and privacy"""
 
         @dataclass(init=False)
         class TestActivity(ActivityObject):
-            """ real simple mock """
+            """real simple mock"""
 
             to: List[str]
             cc: List[str]
@@ -155,7 +155,7 @@ class ActivitypubFields(TestCase):
             type: str = "Test"
 
         class TestPrivacyModel(ActivitypubMixin, BookWyrmModel):
-            """ real simple mock model because BookWyrmModel is abstract """
+            """real simple mock model because BookWyrmModel is abstract"""
 
             privacy_field = fields.PrivacyField()
             mention_users = fields.TagField(User)
@@ -187,7 +187,7 @@ class ActivitypubFields(TestCase):
     @patch("bookwyrm.models.activitypub_mixin.ObjectMixin.broadcast")
     @patch("bookwyrm.activitystreams.ActivityStream.add_status")
     def test_privacy_field_set_activity_from_field(self, *_):
-        """ translate between to/cc fields and privacy """
+        """translate between to/cc fields and privacy"""
         user = User.objects.create_user(
             "rat", "rat@rat.rat", "ratword", local=True, localname="rat"
         )
@@ -231,7 +231,7 @@ class ActivitypubFields(TestCase):
         self.assertEqual(activity["cc"], [])
 
     def test_foreign_key(self):
-        """ should be able to format a related model """
+        """should be able to format a related model"""
         instance = fields.ForeignKey("User", on_delete=models.CASCADE)
         Serializable = namedtuple("Serializable", ("to_activity", "remote_id"))
         item = Serializable(lambda: {"a": "b"}, "https://e.b/c")
@@ -240,7 +240,7 @@ class ActivitypubFields(TestCase):
 
     @responses.activate
     def test_foreign_key_from_activity_str(self):
-        """ create a new object from a foreign key """
+        """create a new object from a foreign key"""
         instance = fields.ForeignKey(User, on_delete=models.CASCADE)
         datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json")
         userdata = json.loads(datafile.read_bytes())
@@ -264,7 +264,7 @@ class ActivitypubFields(TestCase):
         self.assertEqual(value.name, "MOUSE?? MOUSE!!")
 
     def test_foreign_key_from_activity_dict(self):
-        """ test recieving activity json """
+        """test recieving activity json"""
         instance = fields.ForeignKey(User, on_delete=models.CASCADE)
         datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json")
         userdata = json.loads(datafile.read_bytes())
@@ -284,7 +284,7 @@ class ActivitypubFields(TestCase):
         # et cetera but we're not testing serializing user json
 
     def test_foreign_key_from_activity_dict_existing(self):
-        """ test receiving a dict of an existing object in the db """
+        """test receiving a dict of an existing object in the db"""
         instance = fields.ForeignKey(User, on_delete=models.CASCADE)
         datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json")
         userdata = json.loads(datafile.read_bytes())
@@ -302,7 +302,7 @@ class ActivitypubFields(TestCase):
         self.assertEqual(value, user)
 
     def test_foreign_key_from_activity_str_existing(self):
-        """ test receiving a remote id of an existing object in the db """
+        """test receiving a remote id of an existing object in the db"""
         instance = fields.ForeignKey(User, on_delete=models.CASCADE)
         user = User.objects.create_user(
             "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
@@ -315,14 +315,14 @@ class ActivitypubFields(TestCase):
         self.assertEqual(value, user)
 
     def test_one_to_one_field(self):
-        """ a gussied up foreign key """
+        """a gussied up foreign key"""
         instance = fields.OneToOneField("User", on_delete=models.CASCADE)
         Serializable = namedtuple("Serializable", ("to_activity", "remote_id"))
         item = Serializable(lambda: {"a": "b"}, "https://e.b/c")
         self.assertEqual(instance.field_to_activity(item), {"a": "b"})
 
     def test_many_to_many_field(self):
-        """ lists! """
+        """lists!"""
         instance = fields.ManyToManyField("User")
 
         Serializable = namedtuple("Serializable", ("to_activity", "remote_id"))
@@ -340,7 +340,7 @@ class ActivitypubFields(TestCase):
 
     @responses.activate
     def test_many_to_many_field_from_activity(self):
-        """ resolve related fields for a list, takes a list of remote ids """
+        """resolve related fields for a list, takes a list of remote ids"""
         instance = fields.ManyToManyField(User)
         datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json")
         userdata = json.loads(datafile.read_bytes())
@@ -360,7 +360,7 @@ class ActivitypubFields(TestCase):
         self.assertIsInstance(value[0], User)
 
     def test_tag_field(self):
-        """ a special type of many to many field """
+        """a special type of many to many field"""
         instance = fields.TagField("User")
 
         Serializable = namedtuple(
@@ -379,13 +379,13 @@ class ActivitypubFields(TestCase):
         self.assertEqual(result[0].type, "Serializable")
 
     def test_tag_field_from_activity(self):
-        """ loadin' a list of items from Links """
+        """loadin' a list of items from Links"""
         # TODO
 
     @responses.activate
     @patch("bookwyrm.models.activitypub_mixin.ObjectMixin.broadcast")
     def test_image_field(self, _):
-        """ storing images """
+        """storing images"""
         user = User.objects.create_user(
             "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
         )
@@ -423,7 +423,7 @@ class ActivitypubFields(TestCase):
         self.assertIsInstance(loaded_image[1], ContentFile)
 
     def test_datetime_field(self):
-        """ this one is pretty simple, it just has to use isoformat """
+        """this one is pretty simple, it just has to use isoformat"""
         instance = fields.DateTimeField()
         now = timezone.now()
         self.assertEqual(instance.field_to_activity(now), now.isoformat())
@@ -431,12 +431,12 @@ class ActivitypubFields(TestCase):
         self.assertEqual(instance.field_from_activity("bip"), None)
 
     def test_array_field(self):
-        """ idk why it makes them strings but probably for a good reason """
+        """idk why it makes them strings but probably for a good reason"""
         instance = fields.ArrayField(fields.IntegerField)
         self.assertEqual(instance.field_to_activity([0, 1]), ["0", "1"])
 
     def test_html_field(self):
-        """ sanitizes html, the sanitizer has its own tests """
+        """sanitizes html, the sanitizer has its own tests"""
         instance = fields.HtmlField()
         self.assertEqual(
             instance.field_from_activity("<marquee><p>hi</p></marquee>"), "<p>hi</p>"
diff --git a/bookwyrm/tests/models/test_import_model.py b/bookwyrm/tests/models/test_import_model.py
index 38c3b1ed..76a914d1 100644
--- a/bookwyrm/tests/models/test_import_model.py
+++ b/bookwyrm/tests/models/test_import_model.py
@@ -14,10 +14,10 @@ from bookwyrm.connectors.abstract_connector import SearchResult
 
 
 class ImportJob(TestCase):
-    """ this is a fancy one!!! """
+    """this is a fancy one!!!"""
 
     def setUp(self):
-        """ data is from a goodreads export of The Raven Tower """
+        """data is from a goodreads export of The Raven Tower"""
         read_data = {
             "Book Id": 39395857,
             "Title": "The Raven Tower",
@@ -72,30 +72,30 @@ class ImportJob(TestCase):
         )
 
     def test_isbn(self):
-        """ it unquotes the isbn13 field from data """
+        """it unquotes the isbn13 field from data"""
         expected = "9780356506999"
         item = models.ImportItem.objects.get(index=1)
         self.assertEqual(item.isbn, expected)
 
     def test_shelf(self):
-        """ converts to the local shelf typology """
+        """converts to the local shelf typology"""
         expected = "reading"
         self.assertEqual(self.item_1.shelf, expected)
 
     def test_date_added(self):
-        """ converts to the local shelf typology """
+        """converts to the local shelf typology"""
         expected = datetime.datetime(2019, 4, 9, 0, 0, tzinfo=timezone.utc)
         item = models.ImportItem.objects.get(index=1)
         self.assertEqual(item.date_added, expected)
 
     def test_date_read(self):
-        """ converts to the local shelf typology """
+        """converts to the local shelf typology"""
         expected = datetime.datetime(2019, 4, 12, 0, 0, tzinfo=timezone.utc)
         item = models.ImportItem.objects.get(index=2)
         self.assertEqual(item.date_read, expected)
 
     def test_currently_reading_reads(self):
-        """ infer currently reading dates where available """
+        """infer currently reading dates where available"""
         expected = [
             models.ReadThrough(
                 start_date=datetime.datetime(2019, 4, 9, 0, 0, tzinfo=timezone.utc)
@@ -106,7 +106,7 @@ class ImportJob(TestCase):
         self.assertEqual(actual.reads[0].finish_date, expected[0].finish_date)
 
     def test_read_reads(self):
-        """ infer read dates where available """
+        """infer read dates where available"""
         actual = self.item_2
         self.assertEqual(
             actual.reads[0].start_date,
@@ -118,14 +118,14 @@ class ImportJob(TestCase):
         )
 
     def test_unread_reads(self):
-        """ handle books with no read dates """
+        """handle books with no read dates"""
         expected = []
         actual = models.ImportItem.objects.get(index=3)
         self.assertEqual(actual.reads, expected)
 
     @responses.activate
     def test_get_book_from_isbn(self):
-        """ search and load books by isbn (9780356506999) """
+        """search and load books by isbn (9780356506999)"""
         connector_info = models.Connector.objects.create(
             identifier="openlibrary.org",
             name="OpenLibrary",
diff --git a/bookwyrm/tests/models/test_list.py b/bookwyrm/tests/models/test_list.py
index 4e3460a9..8f5bd497 100644
--- a/bookwyrm/tests/models/test_list.py
+++ b/bookwyrm/tests/models/test_list.py
@@ -7,10 +7,10 @@ from bookwyrm import models, settings
 
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 class List(TestCase):
-    """ some activitypub oddness ahead """
+    """some activitypub oddness ahead"""
 
     def setUp(self):
-        """ look, a list """
+        """look, a list"""
         self.local_user = models.User.objects.create_user(
             "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
         )
@@ -18,7 +18,7 @@ class List(TestCase):
         self.book = models.Edition.objects.create(title="hi", parent_work=work)
 
     def test_remote_id(self, _):
-        """ shelves use custom remote ids """
+        """shelves use custom remote ids"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             book_list = models.List.objects.create(
                 name="Test List", user=self.local_user
@@ -27,7 +27,7 @@ class List(TestCase):
         self.assertEqual(book_list.get_remote_id(), expected_id)
 
     def test_to_activity(self, _):
-        """ jsonify it """
+        """jsonify it"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             book_list = models.List.objects.create(
                 name="Test List", user=self.local_user
@@ -41,7 +41,7 @@ class List(TestCase):
         self.assertEqual(activity_json["owner"], self.local_user.remote_id)
 
     def test_list_item(self, _):
-        """ a list entry """
+        """a list entry"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             book_list = models.List.objects.create(
                 name="Test List", user=self.local_user, privacy="unlisted"
@@ -59,7 +59,7 @@ class List(TestCase):
         self.assertEqual(item.recipients, [])
 
     def test_list_item_pending(self, _):
-        """ a list entry """
+        """a list entry"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             book_list = models.List.objects.create(
                 name="Test List", user=self.local_user
diff --git a/bookwyrm/tests/models/test_readthrough_model.py b/bookwyrm/tests/models/test_readthrough_model.py
index f69e8779..93e9e654 100644
--- a/bookwyrm/tests/models/test_readthrough_model.py
+++ b/bookwyrm/tests/models/test_readthrough_model.py
@@ -6,10 +6,10 @@ from bookwyrm import models, settings
 
 
 class ReadThrough(TestCase):
-    """ some activitypub oddness ahead """
+    """some activitypub oddness ahead"""
 
     def setUp(self):
-        """ look, a shelf """
+        """look, a shelf"""
         self.user = models.User.objects.create_user(
             "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
         )
@@ -27,7 +27,7 @@ class ReadThrough(TestCase):
         )
 
     def test_progress_update(self):
-        """ Test progress updates """
+        """Test progress updates"""
         self.readthrough.create_update()  # No-op, no progress yet
         self.readthrough.progress = 10
         self.readthrough.create_update()
diff --git a/bookwyrm/tests/models/test_relationship_models.py b/bookwyrm/tests/models/test_relationship_models.py
index 0e842b21..d629b5c7 100644
--- a/bookwyrm/tests/models/test_relationship_models.py
+++ b/bookwyrm/tests/models/test_relationship_models.py
@@ -6,10 +6,10 @@ from bookwyrm import models
 
 
 class Relationship(TestCase):
-    """ following, blocking, stuff like that """
+    """following, blocking, stuff like that"""
 
     def setUp(self):
-        """ we need some users for this """
+        """we need some users for this"""
         with patch("bookwyrm.models.user.set_remote_server.delay"):
             self.remote_user = models.User.objects.create_user(
                 "rat",
@@ -27,11 +27,11 @@ class Relationship(TestCase):
         self.local_user.save(broadcast=False)
 
     def test_user_follows_from_request(self):
-        """ convert a follow request into a follow """
+        """convert a follow request into a follow"""
         real_broadcast = models.UserFollowRequest.broadcast
 
         def mock_broadcast(_, activity, user):
-            """ introspect what's being sent out """
+            """introspect what's being sent out"""
             self.assertEqual(user.remote_id, self.local_user.remote_id)
             self.assertEqual(activity["type"], "Follow")
 
@@ -54,7 +54,7 @@ class Relationship(TestCase):
         models.UserFollowRequest.broadcast = real_broadcast
 
     def test_user_follows_from_request_custom_remote_id(self):
-        """ store a specific remote id for a relationship provided by remote """
+        """store a specific remote id for a relationship provided by remote"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             request = models.UserFollowRequest.objects.create(
                 user_subject=self.local_user,
@@ -71,7 +71,7 @@ class Relationship(TestCase):
         self.assertEqual(rel.user_object, self.remote_user)
 
     def test_follow_request_activity(self):
-        """ accept a request and make it a relationship """
+        """accept a request and make it a relationship"""
         real_broadcast = models.UserFollowRequest.broadcast
 
         def mock_broadcast(_, activity, user):
@@ -88,7 +88,7 @@ class Relationship(TestCase):
         models.UserFollowRequest.broadcast = real_broadcast
 
     def test_follow_request_accept(self):
-        """ accept a request and make it a relationship """
+        """accept a request and make it a relationship"""
         real_broadcast = models.UserFollowRequest.broadcast
 
         def mock_broadcast(_, activity, user):
@@ -115,7 +115,7 @@ class Relationship(TestCase):
         models.UserFollowRequest.broadcast = real_broadcast
 
     def test_follow_request_reject(self):
-        """ accept a request and make it a relationship """
+        """accept a request and make it a relationship"""
         real_broadcast = models.UserFollowRequest.broadcast
 
         def mock_reject(_, activity, user):
diff --git a/bookwyrm/tests/models/test_shelf_model.py b/bookwyrm/tests/models/test_shelf_model.py
index 45ae1fa1..911df059 100644
--- a/bookwyrm/tests/models/test_shelf_model.py
+++ b/bookwyrm/tests/models/test_shelf_model.py
@@ -8,10 +8,10 @@ from bookwyrm import models, settings
 
 # pylint: disable=unused-argument
 class Shelf(TestCase):
-    """ some activitypub oddness ahead """
+    """some activitypub oddness ahead"""
 
     def setUp(self):
-        """ look, a shelf """
+        """look, a shelf"""
         self.local_user = models.User.objects.create_user(
             "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
         )
@@ -19,7 +19,7 @@ class Shelf(TestCase):
         self.book = models.Edition.objects.create(title="test book", parent_work=work)
 
     def test_remote_id(self):
-        """ shelves use custom remote ids """
+        """shelves use custom remote ids"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             shelf = models.Shelf.objects.create(
                 name="Test Shelf", identifier="test-shelf", user=self.local_user
@@ -28,7 +28,7 @@ class Shelf(TestCase):
         self.assertEqual(shelf.get_remote_id(), expected_id)
 
     def test_to_activity(self):
-        """ jsonify it """
+        """jsonify it"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             shelf = models.Shelf.objects.create(
                 name="Test Shelf", identifier="test-shelf", user=self.local_user
@@ -42,7 +42,7 @@ class Shelf(TestCase):
         self.assertEqual(activity_json["owner"], self.local_user.remote_id)
 
     def test_create_update_shelf(self):
-        """ create and broadcast shelf creation """
+        """create and broadcast shelf creation"""
 
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
             shelf = models.Shelf.objects.create(
@@ -63,7 +63,7 @@ class Shelf(TestCase):
         self.assertEqual(shelf.name, "arthur russel")
 
     def test_shelve(self):
-        """ create and broadcast shelf creation """
+        """create and broadcast shelf creation"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             shelf = models.Shelf.objects.create(
                 name="Test Shelf", identifier="test-shelf", user=self.local_user
diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py
index 52d6608a..4c8930bc 100644
--- a/bookwyrm/tests/models/test_status_model.py
+++ b/bookwyrm/tests/models/test_status_model.py
@@ -17,10 +17,10 @@ from bookwyrm import activitypub, models, settings
 @patch("bookwyrm.models.Status.broadcast")
 @patch("bookwyrm.activitystreams.ActivityStream.add_status")
 class Status(TestCase):
-    """ lotta types of statuses """
+    """lotta types of statuses"""
 
     def setUp(self):
-        """ useful things for creating a status """
+        """useful things for creating a status"""
         self.local_user = models.User.objects.create_user(
             "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse"
         )
@@ -46,14 +46,14 @@ class Status(TestCase):
             self.book.cover.save("test.jpg", ContentFile(output.getvalue()))
 
     def test_status_generated_fields(self, *_):
-        """ setting remote id """
+        """setting remote id"""
         status = models.Status.objects.create(content="bleh", user=self.local_user)
         expected_id = "https://%s/user/mouse/status/%d" % (settings.DOMAIN, status.id)
         self.assertEqual(status.remote_id, expected_id)
         self.assertEqual(status.privacy, "public")
 
     def test_replies(self, *_):
-        """ get a list of replies """
+        """get a list of replies"""
         parent = models.Status.objects.create(content="hi", user=self.local_user)
         child = models.Status.objects.create(
             content="hello", reply_parent=parent, user=self.local_user
@@ -72,7 +72,7 @@ class Status(TestCase):
         self.assertIsInstance(replies.last(), models.Review)
 
     def test_status_type(self, *_):
-        """ class name """
+        """class name"""
         self.assertEqual(models.Status().status_type, "Note")
         self.assertEqual(models.Review().status_type, "Review")
         self.assertEqual(models.Quotation().status_type, "Quotation")
@@ -80,14 +80,14 @@ class Status(TestCase):
         self.assertEqual(models.Boost().status_type, "Announce")
 
     def test_boostable(self, *_):
-        """ can a status be boosted, based on privacy """
+        """can a status be boosted, based on privacy"""
         self.assertTrue(models.Status(privacy="public").boostable)
         self.assertTrue(models.Status(privacy="unlisted").boostable)
         self.assertFalse(models.Status(privacy="followers").boostable)
         self.assertFalse(models.Status(privacy="direct").boostable)
 
     def test_to_replies(self, *_):
-        """ activitypub replies collection """
+        """activitypub replies collection"""
         parent = models.Status.objects.create(content="hi", user=self.local_user)
         child = models.Status.objects.create(
             content="hello", reply_parent=parent, user=self.local_user
@@ -104,7 +104,7 @@ class Status(TestCase):
         self.assertEqual(replies["totalItems"], 2)
 
     def test_status_to_activity(self, *_):
-        """ subclass of the base model version with a "pure" serializer """
+        """subclass of the base model version with a "pure" serializer"""
         status = models.Status.objects.create(
             content="test content", user=self.local_user
         )
@@ -115,7 +115,7 @@ class Status(TestCase):
         self.assertEqual(activity["sensitive"], False)
 
     def test_status_to_activity_tombstone(self, *_):
-        """ subclass of the base model version with a "pure" serializer """
+        """subclass of the base model version with a "pure" serializer"""
         with patch(
             "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores"
         ):
@@ -131,7 +131,7 @@ class Status(TestCase):
         self.assertFalse(hasattr(activity, "content"))
 
     def test_status_to_pure_activity(self, *_):
-        """ subclass of the base model version with a "pure" serializer """
+        """subclass of the base model version with a "pure" serializer"""
         status = models.Status.objects.create(
             content="test content", user=self.local_user
         )
@@ -143,7 +143,7 @@ class Status(TestCase):
         self.assertEqual(activity["attachment"], [])
 
     def test_generated_note_to_activity(self, *_):
-        """ subclass of the base model version with a "pure" serializer """
+        """subclass of the base model version with a "pure" serializer"""
         status = models.GeneratedNote.objects.create(
             content="test content", user=self.local_user
         )
@@ -157,7 +157,7 @@ class Status(TestCase):
         self.assertEqual(len(activity["tag"]), 2)
 
     def test_generated_note_to_pure_activity(self, *_):
-        """ subclass of the base model version with a "pure" serializer """
+        """subclass of the base model version with a "pure" serializer"""
         status = models.GeneratedNote.objects.create(
             content="test content", user=self.local_user
         )
@@ -181,7 +181,7 @@ class Status(TestCase):
         self.assertEqual(activity["attachment"][0].name, "Test Edition")
 
     def test_comment_to_activity(self, *_):
-        """ subclass of the base model version with a "pure" serializer """
+        """subclass of the base model version with a "pure" serializer"""
         status = models.Comment.objects.create(
             content="test content", user=self.local_user, book=self.book
         )
@@ -192,7 +192,7 @@ class Status(TestCase):
         self.assertEqual(activity["inReplyToBook"], self.book.remote_id)
 
     def test_comment_to_pure_activity(self, *_):
-        """ subclass of the base model version with a "pure" serializer """
+        """subclass of the base model version with a "pure" serializer"""
         status = models.Comment.objects.create(
             content="test content", user=self.local_user, book=self.book
         )
@@ -212,7 +212,7 @@ class Status(TestCase):
         self.assertEqual(activity["attachment"][0].name, "Test Edition")
 
     def test_quotation_to_activity(self, *_):
-        """ subclass of the base model version with a "pure" serializer """
+        """subclass of the base model version with a "pure" serializer"""
         status = models.Quotation.objects.create(
             quote="a sickening sense",
             content="test content",
@@ -227,7 +227,7 @@ class Status(TestCase):
         self.assertEqual(activity["inReplyToBook"], self.book.remote_id)
 
     def test_quotation_to_pure_activity(self, *_):
-        """ subclass of the base model version with a "pure" serializer """
+        """subclass of the base model version with a "pure" serializer"""
         status = models.Quotation.objects.create(
             quote="a sickening sense",
             content="test content",
@@ -250,7 +250,7 @@ class Status(TestCase):
         self.assertEqual(activity["attachment"][0].name, "Test Edition")
 
     def test_review_to_activity(self, *_):
-        """ subclass of the base model version with a "pure" serializer """
+        """subclass of the base model version with a "pure" serializer"""
         status = models.Review.objects.create(
             name="Review name",
             content="test content",
@@ -267,7 +267,7 @@ class Status(TestCase):
         self.assertEqual(activity["inReplyToBook"], self.book.remote_id)
 
     def test_review_to_pure_activity(self, *_):
-        """ subclass of the base model version with a "pure" serializer """
+        """subclass of the base model version with a "pure" serializer"""
         status = models.Review.objects.create(
             name="Review's name",
             content="test content",
@@ -291,7 +291,7 @@ class Status(TestCase):
         self.assertEqual(activity["attachment"][0].name, "Test Edition")
 
     def test_review_to_pure_activity_no_rating(self, *_):
-        """ subclass of the base model version with a "pure" serializer """
+        """subclass of the base model version with a "pure" serializer"""
         status = models.Review.objects.create(
             name="Review name",
             content="test content",
@@ -313,7 +313,7 @@ class Status(TestCase):
         self.assertEqual(activity["attachment"][0].name, "Test Edition")
 
     def test_reviewrating_to_pure_activity(self, *_):
-        """ subclass of the base model version with a "pure" serializer """
+        """subclass of the base model version with a "pure" serializer"""
         status = models.ReviewRating.objects.create(
             rating=3.0,
             user=self.local_user,
@@ -335,11 +335,11 @@ class Status(TestCase):
         self.assertEqual(activity["attachment"][0].name, "Test Edition")
 
     def test_favorite(self, *_):
-        """ fav a status """
+        """fav a status"""
         real_broadcast = models.Favorite.broadcast
 
         def fav_broadcast_mock(_, activity, user):
-            """ ok """
+            """ok"""
             self.assertEqual(user.remote_id, self.local_user.remote_id)
             self.assertEqual(activity["type"], "Like")
 
@@ -361,7 +361,7 @@ class Status(TestCase):
         models.Favorite.broadcast = real_broadcast
 
     def test_boost(self, *_):
-        """ boosting, this one's a bit fussy """
+        """boosting, this one's a bit fussy"""
         status = models.Status.objects.create(
             content="test content", user=self.local_user
         )
@@ -373,7 +373,7 @@ class Status(TestCase):
         self.assertEqual(activity, boost.to_activity(pure=True))
 
     def test_notification(self, *_):
-        """ a simple model """
+        """a simple model"""
         notification = models.Notification.objects.create(
             user=self.local_user, notification_type="FAVORITE"
         )
@@ -385,7 +385,7 @@ class Status(TestCase):
             )
 
     def test_create_broadcast(self, _, broadcast_mock):
-        """ should send out two verions of a status on create """
+        """should send out two verions of a status on create"""
         models.Comment.objects.create(
             content="hi", user=self.local_user, book=self.book
         )
@@ -405,7 +405,7 @@ class Status(TestCase):
         self.assertEqual(args["object"]["type"], "Comment")
 
     def test_recipients_with_mentions(self, *_):
-        """ get recipients to broadcast a status """
+        """get recipients to broadcast a status"""
         status = models.GeneratedNote.objects.create(
             content="test content", user=self.local_user
         )
@@ -414,7 +414,7 @@ class Status(TestCase):
         self.assertEqual(status.recipients, [self.remote_user])
 
     def test_recipients_with_reply_parent(self, *_):
-        """ get recipients to broadcast a status """
+        """get recipients to broadcast a status"""
         parent_status = models.GeneratedNote.objects.create(
             content="test content", user=self.remote_user
         )
@@ -425,7 +425,7 @@ class Status(TestCase):
         self.assertEqual(status.recipients, [self.remote_user])
 
     def test_recipients_with_reply_parent_and_mentions(self, *_):
-        """ get recipients to broadcast a status """
+        """get recipients to broadcast a status"""
         parent_status = models.GeneratedNote.objects.create(
             content="test content", user=self.remote_user
         )
@@ -438,7 +438,7 @@ class Status(TestCase):
 
     @responses.activate
     def test_ignore_activity_boost(self, *_):
-        """ don't bother with most remote statuses """
+        """don't bother with most remote statuses"""
         activity = activitypub.Announce(
             id="http://www.faraway.com/boost/12",
             actor=self.remote_user.remote_id,
diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py
index 883ef669..b2791379 100644
--- a/bookwyrm/tests/models/test_user_model.py
+++ b/bookwyrm/tests/models/test_user_model.py
@@ -22,7 +22,7 @@ class User(TestCase):
         )
 
     def test_computed_fields(self):
-        """ username instead of id here """
+        """username instead of id here"""
         expected_id = "https://%s/user/mouse" % DOMAIN
         self.assertEqual(self.user.remote_id, expected_id)
         self.assertEqual(self.user.username, "mouse@%s" % DOMAIN)
@@ -155,7 +155,7 @@ class User(TestCase):
         self.assertIsNone(server.application_version)
 
     def test_delete_user(self):
-        """ deactivate a user """
+        """deactivate a user"""
         self.assertTrue(self.user.is_active)
         with patch(
             "bookwyrm.models.activitypub_mixin.broadcast_task.delay"
diff --git a/bookwyrm/tests/test_activitystreams.py b/bookwyrm/tests/test_activitystreams.py
index b4efeba3..59266383 100644
--- a/bookwyrm/tests/test_activitystreams.py
+++ b/bookwyrm/tests/test_activitystreams.py
@@ -7,10 +7,10 @@ from bookwyrm import activitystreams, models
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 @patch("bookwyrm.activitystreams.ActivityStream.add_status")
 class Activitystreams(TestCase):
-    """ using redis to build activity streams """
+    """using redis to build activity streams"""
 
     def setUp(self):
-        """ use a test csv """
+        """use a test csv"""
         self.local_user = models.User.objects.create_user(
             "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse"
         )
@@ -30,14 +30,14 @@ class Activitystreams(TestCase):
         self.book = models.Edition.objects.create(title="test book")
 
         class TestStream(activitystreams.ActivityStream):
-            """ test stream, don't have to do anything here  """
+            """test stream, don't have to do anything here"""
 
             key = "test"
 
         self.test_stream = TestStream()
 
     def test_activitystream_class_ids(self, *_):
-        """ the abstract base class for stream objects """
+        """the abstract base class for stream objects"""
         self.assertEqual(
             self.test_stream.stream_id(self.local_user),
             "{}-test".format(self.local_user.id),
@@ -48,7 +48,7 @@ class Activitystreams(TestCase):
         )
 
     def test_abstractstream_get_audience(self, *_):
-        """ get a list of users that should see a status """
+        """get a list of users that should see a status"""
         status = models.Status.objects.create(
             user=self.remote_user, content="hi", privacy="public"
         )
@@ -59,7 +59,7 @@ class Activitystreams(TestCase):
         self.assertTrue(self.another_user in users)
 
     def test_abstractstream_get_audience_direct(self, *_):
-        """ get a list of users that should see a status """
+        """get a list of users that should see a status"""
         status = models.Status.objects.create(
             user=self.remote_user,
             content="hi",
@@ -82,7 +82,7 @@ class Activitystreams(TestCase):
         self.assertFalse(self.remote_user in users)
 
     def test_abstractstream_get_audience_followers_remote_user(self, *_):
-        """ get a list of users that should see a status """
+        """get a list of users that should see a status"""
         status = models.Status.objects.create(
             user=self.remote_user,
             content="hi",
@@ -92,7 +92,7 @@ class Activitystreams(TestCase):
         self.assertFalse(users.exists())
 
     def test_abstractstream_get_audience_followers_self(self, *_):
-        """ get a list of users that should see a status """
+        """get a list of users that should see a status"""
         status = models.Comment.objects.create(
             user=self.local_user,
             content="hi",
@@ -105,7 +105,7 @@ class Activitystreams(TestCase):
         self.assertFalse(self.remote_user in users)
 
     def test_abstractstream_get_audience_followers_with_mention(self, *_):
-        """ get a list of users that should see a status """
+        """get a list of users that should see a status"""
         status = models.Comment.objects.create(
             user=self.remote_user,
             content="hi",
@@ -120,7 +120,7 @@ class Activitystreams(TestCase):
         self.assertFalse(self.remote_user in users)
 
     def test_abstractstream_get_audience_followers_with_relationship(self, *_):
-        """ get a list of users that should see a status """
+        """get a list of users that should see a status"""
         self.remote_user.followers.add(self.local_user)
         status = models.Comment.objects.create(
             user=self.remote_user,
@@ -134,7 +134,7 @@ class Activitystreams(TestCase):
         self.assertFalse(self.remote_user in users)
 
     def test_homestream_get_audience(self, *_):
-        """ get a list of users that should see a status """
+        """get a list of users that should see a status"""
         status = models.Status.objects.create(
             user=self.remote_user, content="hi", privacy="public"
         )
@@ -142,7 +142,7 @@ class Activitystreams(TestCase):
         self.assertFalse(users.exists())
 
     def test_homestream_get_audience_with_mentions(self, *_):
-        """ get a list of users that should see a status """
+        """get a list of users that should see a status"""
         status = models.Status.objects.create(
             user=self.remote_user, content="hi", privacy="public"
         )
@@ -152,7 +152,7 @@ class Activitystreams(TestCase):
         self.assertFalse(self.another_user in users)
 
     def test_homestream_get_audience_with_relationship(self, *_):
-        """ get a list of users that should see a status """
+        """get a list of users that should see a status"""
         self.remote_user.followers.add(self.local_user)
         status = models.Status.objects.create(
             user=self.remote_user, content="hi", privacy="public"
@@ -162,7 +162,7 @@ class Activitystreams(TestCase):
         self.assertFalse(self.another_user in users)
 
     def test_localstream_get_audience_remote_status(self, *_):
-        """ get a list of users that should see a status """
+        """get a list of users that should see a status"""
         status = models.Status.objects.create(
             user=self.remote_user, content="hi", privacy="public"
         )
@@ -170,7 +170,7 @@ class Activitystreams(TestCase):
         self.assertEqual(users, [])
 
     def test_localstream_get_audience_local_status(self, *_):
-        """ get a list of users that should see a status """
+        """get a list of users that should see a status"""
         status = models.Status.objects.create(
             user=self.local_user, content="hi", privacy="public"
         )
@@ -179,7 +179,7 @@ class Activitystreams(TestCase):
         self.assertTrue(self.another_user in users)
 
     def test_localstream_get_audience_unlisted(self, *_):
-        """ get a list of users that should see a status """
+        """get a list of users that should see a status"""
         status = models.Status.objects.create(
             user=self.local_user, content="hi", privacy="unlisted"
         )
@@ -187,7 +187,7 @@ class Activitystreams(TestCase):
         self.assertEqual(users, [])
 
     def test_federatedstream_get_audience(self, *_):
-        """ get a list of users that should see a status """
+        """get a list of users that should see a status"""
         status = models.Status.objects.create(
             user=self.remote_user, content="hi", privacy="public"
         )
@@ -196,7 +196,7 @@ class Activitystreams(TestCase):
         self.assertTrue(self.another_user in users)
 
     def test_federatedstream_get_audience_unlisted(self, *_):
-        """ get a list of users that should see a status """
+        """get a list of users that should see a status"""
         status = models.Status.objects.create(
             user=self.remote_user, content="hi", privacy="unlisted"
         )
diff --git a/bookwyrm/tests/test_emailing.py b/bookwyrm/tests/test_emailing.py
index 5d7d4894..0f9cc365 100644
--- a/bookwyrm/tests/test_emailing.py
+++ b/bookwyrm/tests/test_emailing.py
@@ -10,10 +10,10 @@ from bookwyrm import emailing, models
 
 @patch("bookwyrm.emailing.send_email.delay")
 class Emailing(TestCase):
-    """ every response to a get request, html or json """
+    """every response to a get request, html or json"""
 
     def setUp(self):
-        """ we need basic test data and mocks """
+        """we need basic test data and mocks"""
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@local.com",
@@ -25,7 +25,7 @@ class Emailing(TestCase):
         models.SiteSettings.objects.create()
 
     def test_invite_email(self, email_mock):
-        """ load the invite email """
+        """load the invite email"""
         invite_request = models.InviteRequest.objects.create(
             email="test@email.com",
             invite=models.SiteInvite.objects.create(user=self.local_user),
@@ -40,7 +40,7 @@ class Emailing(TestCase):
         self.assertEqual(len(args), 4)
 
     def test_password_reset_email(self, email_mock):
-        """ load the password reset email """
+        """load the password reset email"""
         reset = models.PasswordReset.objects.create(user=self.local_user)
         emailing.password_reset_email(reset)
 
diff --git a/bookwyrm/tests/test_sanitize_html.py b/bookwyrm/tests/test_sanitize_html.py
index 2b3d0378..6c405348 100644
--- a/bookwyrm/tests/test_sanitize_html.py
+++ b/bookwyrm/tests/test_sanitize_html.py
@@ -5,10 +5,10 @@ from bookwyrm.sanitize_html import InputHtmlParser
 
 
 class Sanitizer(TestCase):
-    """ sanitizer tests """
+    """sanitizer tests"""
 
     def test_no_html(self):
-        """ just text """
+        """just text"""
         input_text = "no      html  "
         parser = InputHtmlParser()
         parser.feed(input_text)
@@ -16,7 +16,7 @@ class Sanitizer(TestCase):
         self.assertEqual(input_text, output)
 
     def test_valid_html(self):
-        """ leave the html untouched """
+        """leave the html untouched"""
         input_text = "<b>yes    </b> <i>html</i>"
         parser = InputHtmlParser()
         parser.feed(input_text)
@@ -24,7 +24,7 @@ class Sanitizer(TestCase):
         self.assertEqual(input_text, output)
 
     def test_valid_html_attrs(self):
-        """ and don't remove attributes """
+        """and don't remove attributes"""
         input_text = '<a href="fish.com">yes    </a> <i>html</i>'
         parser = InputHtmlParser()
         parser.feed(input_text)
@@ -32,7 +32,7 @@ class Sanitizer(TestCase):
         self.assertEqual(input_text, output)
 
     def test_invalid_html(self):
-        """ remove all html when the html is malformed """
+        """remove all html when the html is malformed"""
         input_text = "<b>yes  <i>html</i>"
         parser = InputHtmlParser()
         parser.feed(input_text)
@@ -46,7 +46,7 @@ class Sanitizer(TestCase):
         self.assertEqual("yes html   ", output)
 
     def test_disallowed_html(self):
-        """ remove disallowed html but keep allowed html """
+        """remove disallowed html but keep allowed html"""
         input_text = "<div>  yes <i>html</i></div>"
         parser = InputHtmlParser()
         parser.feed(input_text)
diff --git a/bookwyrm/tests/test_signing.py b/bookwyrm/tests/test_signing.py
index d9cc411c..758ba9bb 100644
--- a/bookwyrm/tests/test_signing.py
+++ b/bookwyrm/tests/test_signing.py
@@ -20,7 +20,7 @@ from bookwyrm.signatures import create_key_pair, make_signature, make_digest
 
 
 def get_follow_activity(follower, followee):
-    """ generates a test activity """
+    """generates a test activity"""
     return Follow(
         id="https://test.com/user/follow/id",
         actor=follower.remote_id,
@@ -33,10 +33,10 @@ Sender = namedtuple("Sender", ("remote_id", "key_pair"))
 
 
 class Signature(TestCase):
-    """ signature test """
+    """signature test"""
 
     def setUp(self):
-        """ create users and test data """
+        """create users and test data"""
         self.mouse = models.User.objects.create_user(
             "mouse@%s" % DOMAIN, "mouse@example.com", "", local=True, localname="mouse"
         )
@@ -56,7 +56,7 @@ class Signature(TestCase):
         models.SiteSettings.objects.create()
 
     def send(self, signature, now, data, digest):
-        """ test request """
+        """test request"""
         c = Client()
         return c.post(
             urlsplit(self.rat.inbox).path,
@@ -74,7 +74,7 @@ class Signature(TestCase):
     def send_test_request(  # pylint: disable=too-many-arguments
         self, sender, signer=None, send_data=None, digest=None, date=None
     ):
-        """ sends a follow request to the "rat" user """
+        """sends a follow request to the "rat" user"""
         now = date or http_date()
         data = json.dumps(get_follow_activity(sender, self.rat))
         digest = digest or make_digest(data)
@@ -84,7 +84,7 @@ class Signature(TestCase):
                 return self.send(signature, now, send_data or data, digest)
 
     def test_correct_signature(self):
-        """ this one should just work """
+        """this one should just work"""
         response = self.send_test_request(sender=self.mouse)
         self.assertEqual(response.status_code, 200)
 
@@ -96,7 +96,7 @@ class Signature(TestCase):
 
     @responses.activate
     def test_remote_signer(self):
-        """ signtures for remote users """
+        """signtures for remote users"""
         datafile = pathlib.Path(__file__).parent.joinpath("data/ap_user.json")
         data = json.loads(datafile.read_bytes())
         data["id"] = self.fake_remote.remote_id
@@ -119,7 +119,7 @@ class Signature(TestCase):
 
     @responses.activate
     def test_key_needs_refresh(self):
-        """ an out of date key should be updated and the new key work """
+        """an out of date key should be updated and the new key work"""
         datafile = pathlib.Path(__file__).parent.joinpath("data/ap_user.json")
         data = json.loads(datafile.read_bytes())
         data["id"] = self.fake_remote.remote_id
@@ -155,7 +155,7 @@ class Signature(TestCase):
 
     @responses.activate
     def test_nonexistent_signer(self):
-        """ fail when unable to look up signer """
+        """fail when unable to look up signer"""
         responses.add(
             responses.GET,
             self.fake_remote.remote_id,
@@ -177,7 +177,7 @@ class Signature(TestCase):
 
     @pytest.mark.integration
     def test_invalid_digest(self):
-        """ signature digest must be valid """
+        """signature digest must be valid"""
         with patch("bookwyrm.activitypub.resolve_remote_id"):
             response = self.send_test_request(
                 self.mouse, digest="SHA-256=AAAAAAAAAAAAAAAAAA"
diff --git a/bookwyrm/tests/test_templatetags.py b/bookwyrm/tests/test_templatetags.py
index 2fadb978..a92e887a 100644
--- a/bookwyrm/tests/test_templatetags.py
+++ b/bookwyrm/tests/test_templatetags.py
@@ -12,10 +12,10 @@ from bookwyrm.templatetags import bookwyrm_tags
 
 @patch("bookwyrm.activitystreams.ActivityStream.add_status")
 class TemplateTags(TestCase):
-    """ lotta different things here """
+    """lotta different things here"""
 
     def setUp(self):
-        """ create some filler objects """
+        """create some filler objects"""
         self.user = models.User.objects.create_user(
             "mouse@example.com",
             "mouse@mouse.mouse",
@@ -34,34 +34,34 @@ class TemplateTags(TestCase):
         self.book = models.Edition.objects.create(title="Test Book")
 
     def test_dict_key(self, _):
-        """ just getting a value out of a dict """
+        """just getting a value out of a dict"""
         test_dict = {"a": 1, "b": 3}
         self.assertEqual(bookwyrm_tags.dict_key(test_dict, "a"), 1)
         self.assertEqual(bookwyrm_tags.dict_key(test_dict, "c"), 0)
 
     def test_get_user_rating(self, _):
-        """ get a user's most recent rating of a book """
+        """get a user's most recent rating of a book"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             models.Review.objects.create(user=self.user, book=self.book, rating=3)
         self.assertEqual(bookwyrm_tags.get_user_rating(self.book, self.user), 3)
 
     def test_get_user_rating_doesnt_exist(self, _):
-        """ there is no rating available """
+        """there is no rating available"""
         self.assertEqual(bookwyrm_tags.get_user_rating(self.book, self.user), 0)
 
     def test_get_user_identifer_local(self, _):
-        """ fall back to the simplest uid available """
+        """fall back to the simplest uid available"""
         self.assertNotEqual(self.user.username, self.user.localname)
         self.assertEqual(bookwyrm_tags.get_user_identifier(self.user), "mouse")
 
     def test_get_user_identifer_remote(self, _):
-        """ for a remote user, should be their full username """
+        """for a remote user, should be their full username"""
         self.assertEqual(
             bookwyrm_tags.get_user_identifier(self.remote_user), "rat@example.com"
         )
 
     def test_get_notification_count(self, _):
-        """ just countin' """
+        """just countin'"""
         self.assertEqual(bookwyrm_tags.get_notification_count(self.user), 0)
 
         models.Notification.objects.create(user=self.user, notification_type="FAVORITE")
@@ -74,7 +74,7 @@ class TemplateTags(TestCase):
         self.assertEqual(bookwyrm_tags.get_notification_count(self.user), 2)
 
     def test_get_replies(self, _):
-        """ direct replies to a status """
+        """direct replies to a status"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             parent = models.Review.objects.create(
                 user=self.user, book=self.book, content="hi"
@@ -102,7 +102,7 @@ class TemplateTags(TestCase):
         self.assertFalse(third_child in replies)
 
     def test_get_parent(self, _):
-        """ get the reply parent of a status """
+        """get the reply parent of a status"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             parent = models.Review.objects.create(
                 user=self.user, book=self.book, content="hi"
@@ -116,7 +116,7 @@ class TemplateTags(TestCase):
         self.assertIsInstance(result, models.Review)
 
     def test_get_user_liked(self, _):
-        """ did a user like a status """
+        """did a user like a status"""
         status = models.Review.objects.create(user=self.remote_user, book=self.book)
 
         self.assertFalse(bookwyrm_tags.get_user_liked(self.user, status))
@@ -125,7 +125,7 @@ class TemplateTags(TestCase):
         self.assertTrue(bookwyrm_tags.get_user_liked(self.user, status))
 
     def test_get_user_boosted(self, _):
-        """ did a user boost a status """
+        """did a user boost a status"""
         status = models.Review.objects.create(user=self.remote_user, book=self.book)
 
         self.assertFalse(bookwyrm_tags.get_user_boosted(self.user, status))
@@ -134,7 +134,7 @@ class TemplateTags(TestCase):
         self.assertTrue(bookwyrm_tags.get_user_boosted(self.user, status))
 
     def test_follow_request_exists(self, _):
-        """ does a user want to follow """
+        """does a user want to follow"""
         self.assertFalse(
             bookwyrm_tags.follow_request_exists(self.user, self.remote_user)
         )
@@ -152,7 +152,7 @@ class TemplateTags(TestCase):
         )
 
     def test_get_boosted(self, _):
-        """ load a boosted status """
+        """load a boosted status"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             status = models.Review.objects.create(user=self.remote_user, book=self.book)
             boost = models.Boost.objects.create(user=self.user, boosted_status=status)
@@ -161,7 +161,7 @@ class TemplateTags(TestCase):
         self.assertEqual(boosted, status)
 
     def test_get_book_description(self, _):
-        """ grab it from the edition or the parent """
+        """grab it from the edition or the parent"""
         work = models.Work.objects.create(title="Test Work")
         self.book.parent_work = work
         self.book.save()
@@ -177,12 +177,12 @@ class TemplateTags(TestCase):
         self.assertEqual(bookwyrm_tags.get_book_description(self.book), "hello")
 
     def test_get_uuid(self, _):
-        """ uuid functionality """
+        """uuid functionality"""
         uuid = bookwyrm_tags.get_uuid("hi")
         self.assertTrue(re.match(r"hi[A-Za-z0-9\-]", uuid))
 
     def test_get_markdown(self, _):
-        """ mardown format data """
+        """mardown format data"""
         result = bookwyrm_tags.get_markdown("_hi_")
         self.assertEqual(result, "<p><em>hi</em></p>")
 
@@ -190,13 +190,13 @@ class TemplateTags(TestCase):
         self.assertEqual(result, "<p><em>hi</em></p>")
 
     def test_get_mentions(self, _):
-        """ list of people mentioned """
+        """list of people mentioned"""
         status = models.Status.objects.create(content="hi", user=self.remote_user)
         result = bookwyrm_tags.get_mentions(status, self.user)
         self.assertEqual(result, "@rat@example.com ")
 
     def test_get_status_preview_name(self, _):
-        """ status context string """
+        """status context string"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             status = models.Status.objects.create(content="hi", user=self.user)
             result = bookwyrm_tags.get_status_preview_name(status)
@@ -221,7 +221,7 @@ class TemplateTags(TestCase):
         self.assertEqual(result, "quotation from <em>Test Book</em>")
 
     def test_related_status(self, _):
-        """ gets the subclass model for a notification status """
+        """gets the subclass model for a notification status"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             status = models.Status.objects.create(content="hi", user=self.user)
         notification = models.Notification.objects.create(
diff --git a/bookwyrm/tests/views/inbox/test_inbox.py b/bookwyrm/tests/views/inbox/test_inbox.py
index c39a3fd2..697f4010 100644
--- a/bookwyrm/tests/views/inbox/test_inbox.py
+++ b/bookwyrm/tests/views/inbox/test_inbox.py
@@ -12,10 +12,10 @@ from bookwyrm import models, views
 
 # pylint: disable=too-many-public-methods
 class Inbox(TestCase):
-    """ readthrough tests """
+    """readthrough tests"""
 
     def setUp(self):
-        """ basic user and book data """
+        """basic user and book data"""
         self.client = Client()
         self.factory = RequestFactory()
         local_user = models.User.objects.create_user(
@@ -48,12 +48,12 @@ class Inbox(TestCase):
         models.SiteSettings.objects.create()
 
     def test_inbox_invalid_get(self):
-        """ shouldn't try to handle if the user is not found """
+        """shouldn't try to handle if the user is not found"""
         result = self.client.get("/inbox", content_type="application/json")
         self.assertIsInstance(result, HttpResponseNotAllowed)
 
     def test_inbox_invalid_user(self):
-        """ shouldn't try to handle if the user is not found """
+        """shouldn't try to handle if the user is not found"""
         result = self.client.post(
             "/user/bleh/inbox",
             '{"type": "Test", "object": "exists"}',
@@ -62,7 +62,7 @@ class Inbox(TestCase):
         self.assertIsInstance(result, HttpResponseNotFound)
 
     def test_inbox_invalid_bad_signature(self):
-        """ bad request for invalid signature """
+        """bad request for invalid signature"""
         with patch("bookwyrm.views.inbox.has_valid_signature") as mock_valid:
             mock_valid.return_value = False
             result = self.client.post(
@@ -73,7 +73,7 @@ class Inbox(TestCase):
             self.assertEqual(result.status_code, 401)
 
     def test_inbox_invalid_bad_signature_delete(self):
-        """ invalid signature for Delete is okay though """
+        """invalid signature for Delete is okay though"""
         with patch("bookwyrm.views.inbox.has_valid_signature") as mock_valid:
             mock_valid.return_value = False
             result = self.client.post(
@@ -84,7 +84,7 @@ class Inbox(TestCase):
             self.assertEqual(result.status_code, 200)
 
     def test_inbox_unknown_type(self):
-        """ never heard of that activity type, don't have a handler for it """
+        """never heard of that activity type, don't have a handler for it"""
         with patch("bookwyrm.views.inbox.has_valid_signature") as mock_valid:
             result = self.client.post(
                 "/inbox",
@@ -95,7 +95,7 @@ class Inbox(TestCase):
             self.assertIsInstance(result, HttpResponseNotFound)
 
     def test_inbox_success(self):
-        """ a known type, for which we start a task """
+        """a known type, for which we start a task"""
         activity = self.create_json
         activity["object"] = {
             "id": "https://example.com/list/22",
@@ -121,7 +121,7 @@ class Inbox(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_is_blocked_user_agent(self):
-        """ check for blocked servers """
+        """check for blocked servers"""
         request = self.factory.post(
             "",
             HTTP_USER_AGENT="http.rb/4.4.1 (Mastodon/3.3.0; +https://mastodon.social/)",
@@ -134,7 +134,7 @@ class Inbox(TestCase):
         self.assertTrue(views.inbox.is_blocked_user_agent(request))
 
     def test_is_blocked_activity(self):
-        """ check for blocked servers """
+        """check for blocked servers"""
         activity = {"actor": "https://mastodon.social/user/whaatever/else"}
         self.assertFalse(views.inbox.is_blocked_activity(activity))
 
@@ -144,7 +144,7 @@ class Inbox(TestCase):
         self.assertTrue(views.inbox.is_blocked_activity(activity))
 
     def test_create_by_deactivated_user(self):
-        """ don't let deactivated users post """
+        """don't let deactivated users post"""
         self.remote_user.delete(broadcast=False)
         self.assertTrue(self.remote_user.deleted)
         datafile = pathlib.Path(__file__).parent.joinpath("../../data/ap_note.json")
diff --git a/bookwyrm/tests/views/inbox/test_inbox_add.py b/bookwyrm/tests/views/inbox/test_inbox_add.py
index a5c629a8..9f237b6d 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_add.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_add.py
@@ -9,10 +9,10 @@ from bookwyrm import models, views
 
 # pylint: disable=too-many-public-methods
 class InboxAdd(TestCase):
-    """ inbox tests """
+    """inbox tests"""
 
     def setUp(self):
-        """ basic user and book data """
+        """basic user and book data"""
         local_user = models.User.objects.create_user(
             "mouse@example.com",
             "mouse@mouse.com",
@@ -42,7 +42,7 @@ class InboxAdd(TestCase):
         models.SiteSettings.objects.create()
 
     def test_handle_add_book_to_shelf(self):
-        """ shelving a book """
+        """shelving a book"""
         shelf = models.Shelf.objects.create(user=self.remote_user, name="Test Shelf")
         shelf.remote_id = "https://bookwyrm.social/user/mouse/shelf/to-read"
         shelf.save()
@@ -65,7 +65,7 @@ class InboxAdd(TestCase):
 
     @responses.activate
     def test_handle_add_book_to_list(self):
-        """ listing a book """
+        """listing a book"""
         responses.add(
             responses.GET,
             "https://bookwyrm.social/user/mouse/list/to-read",
diff --git a/bookwyrm/tests/views/inbox/test_inbox_announce.py b/bookwyrm/tests/views/inbox/test_inbox_announce.py
index dbe4ec56..4243dc78 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_announce.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_announce.py
@@ -9,10 +9,10 @@ from bookwyrm import models, views
 
 # pylint: disable=too-many-public-methods
 class InboxActivities(TestCase):
-    """ inbox tests """
+    """inbox tests"""
 
     def setUp(self):
-        """ basic user and book data """
+        """basic user and book data"""
         self.local_user = models.User.objects.create_user(
             "mouse@example.com",
             "mouse@mouse.com",
@@ -52,7 +52,7 @@ class InboxActivities(TestCase):
 
     @patch("bookwyrm.activitystreams.ActivityStream.add_status")
     def test_boost(self, redis_mock):
-        """ boost a status """
+        """boost a status"""
         self.assertEqual(models.Notification.objects.count(), 0)
         activity = {
             "type": "Announce",
@@ -82,7 +82,7 @@ class InboxActivities(TestCase):
     @responses.activate
     @patch("bookwyrm.activitystreams.ActivityStream.add_status")
     def test_boost_remote_status(self, redis_mock):
-        """ boost a status from a remote server """
+        """boost a status from a remote server"""
         work = models.Work.objects.create(title="work title")
         book = models.Edition.objects.create(
             title="Test",
@@ -131,7 +131,7 @@ class InboxActivities(TestCase):
 
     @responses.activate
     def test_discarded_boost(self):
-        """ test a boost of a mastodon status that will be discarded """
+        """test a boost of a mastodon status that will be discarded"""
         status = models.Status(
             content="hi",
             user=self.remote_user,
@@ -154,7 +154,7 @@ class InboxActivities(TestCase):
         self.assertEqual(models.Boost.objects.count(), 0)
 
     def test_unboost(self):
-        """ undo a boost """
+        """undo a boost"""
         with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
             boost = models.Boost.objects.create(
                 boosted_status=self.status, user=self.remote_user
@@ -183,7 +183,7 @@ class InboxActivities(TestCase):
         self.assertFalse(models.Boost.objects.exists())
 
     def test_unboost_unknown_boost(self):
-        """ undo a boost """
+        """undo a boost"""
         activity = {
             "type": "Undo",
             "actor": "hi",
diff --git a/bookwyrm/tests/views/inbox/test_inbox_block.py b/bookwyrm/tests/views/inbox/test_inbox_block.py
index e686c6b7..956cf538 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_block.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_block.py
@@ -8,10 +8,10 @@ from bookwyrm import models, views
 
 # pylint: disable=too-many-public-methods
 class InboxBlock(TestCase):
-    """ inbox tests """
+    """inbox tests"""
 
     def setUp(self):
-        """ basic user and book data """
+        """basic user and book data"""
         self.local_user = models.User.objects.create_user(
             "mouse@example.com",
             "mouse@mouse.com",
@@ -35,7 +35,7 @@ class InboxBlock(TestCase):
         models.SiteSettings.objects.create()
 
     def test_handle_blocks(self):
-        """ create a "block" database entry from an activity """
+        """create a "block" database entry from an activity"""
         self.local_user.followers.add(self.remote_user)
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             models.UserFollowRequest.objects.create(
@@ -67,7 +67,7 @@ class InboxBlock(TestCase):
         self.assertFalse(models.UserFollowRequest.objects.exists())
 
     def test_handle_unblock(self):
-        """ unblock a user """
+        """unblock a user"""
         self.remote_user.blocks.add(self.local_user)
 
         block = models.UserBlocks.objects.get()
diff --git a/bookwyrm/tests/views/inbox/test_inbox_create.py b/bookwyrm/tests/views/inbox/test_inbox_create.py
index 3d2ce1c0..e7a12024 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_create.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_create.py
@@ -11,10 +11,10 @@ from bookwyrm.activitypub import ActivitySerializerError
 
 # pylint: disable=too-many-public-methods
 class InboxCreate(TestCase):
-    """ readthrough tests """
+    """readthrough tests"""
 
     def setUp(self):
-        """ basic user and book data """
+        """basic user and book data"""
         self.local_user = models.User.objects.create_user(
             "mouse@example.com",
             "mouse@mouse.com",
@@ -53,7 +53,7 @@ class InboxCreate(TestCase):
         models.SiteSettings.objects.create()
 
     def test_create_status(self):
-        """ the "it justs works" mode """
+        """the "it justs works" mode"""
         self.assertEqual(models.Status.objects.count(), 1)
 
         datafile = pathlib.Path(__file__).parent.joinpath(
@@ -84,7 +84,7 @@ class InboxCreate(TestCase):
         self.assertEqual(models.Status.objects.count(), 2)
 
     def test_create_status_remote_note_with_mention(self):
-        """ should only create it under the right circumstances """
+        """should only create it under the right circumstances"""
         self.assertEqual(models.Status.objects.count(), 1)
         self.assertFalse(
             models.Notification.objects.filter(user=self.local_user).exists()
@@ -107,7 +107,7 @@ class InboxCreate(TestCase):
         self.assertEqual(models.Notification.objects.get().notification_type, "MENTION")
 
     def test_create_status_remote_note_with_reply(self):
-        """ should only create it under the right circumstances """
+        """should only create it under the right circumstances"""
         self.assertEqual(models.Status.objects.count(), 1)
         self.assertFalse(models.Notification.objects.filter(user=self.local_user))
 
@@ -128,7 +128,7 @@ class InboxCreate(TestCase):
         self.assertEqual(models.Notification.objects.get().notification_type, "REPLY")
 
     def test_create_list(self):
-        """ a new list """
+        """a new list"""
         activity = self.create_json
         activity["object"] = {
             "id": "https://example.com/list/22",
@@ -152,7 +152,7 @@ class InboxCreate(TestCase):
         self.assertEqual(book_list.remote_id, "https://example.com/list/22")
 
     def test_create_unsupported_type(self):
-        """ ignore activities we know we can't handle """
+        """ignore activities we know we can't handle"""
         activity = self.create_json
         activity["object"] = {
             "id": "https://example.com/status/887",
@@ -162,7 +162,7 @@ class InboxCreate(TestCase):
         views.inbox.activity_task(activity)
 
     def test_create_unknown_type(self):
-        """ ignore activities we know we've never heard of """
+        """ignore activities we know we've never heard of"""
         activity = self.create_json
         activity["object"] = {
             "id": "https://example.com/status/887",
diff --git a/bookwyrm/tests/views/inbox/test_inbox_delete.py b/bookwyrm/tests/views/inbox/test_inbox_delete.py
index 03598b88..617dcf6f 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_delete.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_delete.py
@@ -9,10 +9,10 @@ from bookwyrm import models, views
 
 # pylint: disable=too-many-public-methods
 class InboxActivities(TestCase):
-    """ inbox tests """
+    """inbox tests"""
 
     def setUp(self):
-        """ basic user and book data """
+        """basic user and book data"""
         self.local_user = models.User.objects.create_user(
             "mouse@example.com",
             "mouse@mouse.com",
@@ -50,7 +50,7 @@ class InboxActivities(TestCase):
         models.SiteSettings.objects.create()
 
     def test_delete_status(self):
-        """ remove a status """
+        """remove a status"""
         self.assertFalse(self.status.deleted)
         activity = {
             "type": "Delete",
@@ -71,7 +71,7 @@ class InboxActivities(TestCase):
         self.assertIsInstance(status.deleted_date, datetime)
 
     def test_delete_status_notifications(self):
-        """ remove a status with related notifications """
+        """remove a status with related notifications"""
         models.Notification.objects.create(
             related_status=self.status,
             user=self.local_user,
@@ -106,7 +106,7 @@ class InboxActivities(TestCase):
         self.assertEqual(models.Notification.objects.get(), notif)
 
     def test_delete_user(self):
-        """ delete a user """
+        """delete a user"""
         self.assertTrue(models.User.objects.get(username="rat@example.com").is_active)
         activity = {
             "@context": "https://www.w3.org/ns/activitystreams",
@@ -121,7 +121,7 @@ class InboxActivities(TestCase):
         self.assertFalse(models.User.objects.get(username="rat@example.com").is_active)
 
     def test_delete_user_unknown(self):
-        """ don't worry about it if we don't know the user """
+        """don't worry about it if we don't know the user"""
         self.assertEqual(models.User.objects.filter(is_active=True).count(), 2)
         activity = {
             "@context": "https://www.w3.org/ns/activitystreams",
diff --git a/bookwyrm/tests/views/inbox/test_inbox_follow.py b/bookwyrm/tests/views/inbox/test_inbox_follow.py
index b0177cb8..f5332b7a 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_follow.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_follow.py
@@ -9,10 +9,10 @@ from bookwyrm import models, views
 
 # pylint: disable=too-many-public-methods
 class InboxRelationships(TestCase):
-    """ inbox tests """
+    """inbox tests"""
 
     def setUp(self):
-        """ basic user and book data """
+        """basic user and book data"""
         self.local_user = models.User.objects.create_user(
             "mouse@example.com",
             "mouse@mouse.com",
@@ -36,7 +36,7 @@ class InboxRelationships(TestCase):
         models.SiteSettings.objects.create()
 
     def test_follow(self):
-        """ remote user wants to follow local user """
+        """remote user wants to follow local user"""
         activity = {
             "@context": "https://www.w3.org/ns/activitystreams",
             "id": "https://example.com/users/rat/follows/123",
@@ -65,7 +65,7 @@ class InboxRelationships(TestCase):
         self.assertEqual(follow.user_subject, self.remote_user)
 
     def test_follow_duplicate(self):
-        """ remote user wants to follow local user twice """
+        """remote user wants to follow local user twice"""
         activity = {
             "@context": "https://www.w3.org/ns/activitystreams",
             "id": "https://example.com/users/rat/follows/123",
@@ -92,7 +92,7 @@ class InboxRelationships(TestCase):
         self.assertEqual(follow.user_subject, self.remote_user)
 
     def test_follow_manually_approved(self):
-        """ needs approval before following """
+        """needs approval before following"""
         activity = {
             "@context": "https://www.w3.org/ns/activitystreams",
             "id": "https://example.com/users/rat/follows/123",
@@ -122,7 +122,7 @@ class InboxRelationships(TestCase):
         self.assertEqual(list(follow), [])
 
     def test_undo_follow_request(self):
-        """ the requester cancels a follow request """
+        """the requester cancels a follow request"""
         self.local_user.manually_approves_followers = True
         self.local_user.save(broadcast=False)
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
@@ -152,7 +152,7 @@ class InboxRelationships(TestCase):
         self.assertFalse(self.local_user.follower_requests.exists())
 
     def test_unfollow(self):
-        """ remove a relationship """
+        """remove a relationship"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             rel = models.UserFollows.objects.create(
                 user_subject=self.remote_user, user_object=self.local_user
@@ -177,7 +177,7 @@ class InboxRelationships(TestCase):
         self.assertIsNone(self.local_user.followers.first())
 
     def test_follow_accept(self):
-        """ a remote user approved a follow request from local """
+        """a remote user approved a follow request from local"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             rel = models.UserFollowRequest.objects.create(
                 user_subject=self.local_user, user_object=self.remote_user
@@ -208,7 +208,7 @@ class InboxRelationships(TestCase):
         self.assertEqual(follows.first(), self.local_user)
 
     def test_follow_reject(self):
-        """ turn down a follow request """
+        """turn down a follow request"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             rel = models.UserFollowRequest.objects.create(
                 user_subject=self.local_user, user_object=self.remote_user
diff --git a/bookwyrm/tests/views/inbox/test_inbox_like.py b/bookwyrm/tests/views/inbox/test_inbox_like.py
index 05105b75..a5f3a9f0 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_like.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_like.py
@@ -8,10 +8,10 @@ from bookwyrm import models, views
 
 # pylint: disable=too-many-public-methods
 class InboxActivities(TestCase):
-    """ inbox tests """
+    """inbox tests"""
 
     def setUp(self):
-        """ basic user and book data """
+        """basic user and book data"""
         self.local_user = models.User.objects.create_user(
             "mouse@example.com",
             "mouse@mouse.com",
@@ -50,7 +50,7 @@ class InboxActivities(TestCase):
         models.SiteSettings.objects.create()
 
     def test_handle_favorite(self):
-        """ fav a status """
+        """fav a status"""
         activity = {
             "@context": "https://www.w3.org/ns/activitystreams",
             "id": "https://example.com/fav/1",
@@ -68,7 +68,7 @@ class InboxActivities(TestCase):
         self.assertEqual(fav.user, self.remote_user)
 
     def test_ignore_favorite(self):
-        """ don't try to save an unknown status """
+        """don't try to save an unknown status"""
         activity = {
             "@context": "https://www.w3.org/ns/activitystreams",
             "id": "https://example.com/fav/1",
@@ -83,7 +83,7 @@ class InboxActivities(TestCase):
         self.assertFalse(models.Favorite.objects.exists())
 
     def test_handle_unfavorite(self):
-        """ fav a status """
+        """fav a status"""
         activity = {
             "id": "https://example.com/fav/1#undo",
             "type": "Undo",
diff --git a/bookwyrm/tests/views/inbox/test_inbox_remove.py b/bookwyrm/tests/views/inbox/test_inbox_remove.py
index 8ac8740a..a0c4cdcf 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_remove.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_remove.py
@@ -8,10 +8,10 @@ from bookwyrm import models, views
 
 # pylint: disable=too-many-public-methods
 class InboxRemove(TestCase):
-    """ inbox tests """
+    """inbox tests"""
 
     def setUp(self):
-        """ basic user and book data """
+        """basic user and book data"""
         self.local_user = models.User.objects.create_user(
             "mouse@example.com",
             "mouse@mouse.com",
@@ -41,7 +41,7 @@ class InboxRemove(TestCase):
         models.SiteSettings.objects.create()
 
     def test_handle_unshelve_book(self):
-        """ remove a book from a shelf """
+        """remove a book from a shelf"""
         shelf = models.Shelf.objects.create(user=self.remote_user, name="Test Shelf")
         shelf.remote_id = "https://bookwyrm.social/user/mouse/shelf/to-read"
         shelf.save()
@@ -70,7 +70,7 @@ class InboxRemove(TestCase):
         self.assertFalse(shelf.books.exists())
 
     def test_handle_remove_book_from_list(self):
-        """ listing a book """
+        """listing a book"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             booklist = models.List.objects.create(
                 name="test list",
diff --git a/bookwyrm/tests/views/inbox/test_inbox_update.py b/bookwyrm/tests/views/inbox/test_inbox_update.py
index 5681ec88..9fdc9792 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_update.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_update.py
@@ -10,10 +10,10 @@ from bookwyrm import models, views
 
 # pylint: disable=too-many-public-methods
 class InboxUpdate(TestCase):
-    """ inbox tests """
+    """inbox tests"""
 
     def setUp(self):
-        """ basic user and book data """
+        """basic user and book data"""
         self.local_user = models.User.objects.create_user(
             "mouse@example.com",
             "mouse@mouse.com",
@@ -45,7 +45,7 @@ class InboxUpdate(TestCase):
         models.SiteSettings.objects.create()
 
     def test_update_list(self):
-        """ a new list """
+        """a new list"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             book_list = models.List.objects.create(
                 name="hi", remote_id="https://example.com/list/22", user=self.local_user
@@ -79,7 +79,7 @@ class InboxUpdate(TestCase):
         self.assertEqual(book_list.remote_id, "https://example.com/list/22")
 
     def test_update_user(self):
-        """ update an existing user """
+        """update an existing user"""
         models.UserFollows.objects.create(
             user_subject=self.local_user,
             user_object=self.remote_user,
@@ -116,7 +116,7 @@ class InboxUpdate(TestCase):
         self.assertTrue(self.local_user in self.remote_user.followers.all())
 
     def test_update_edition(self):
-        """ update an existing edition """
+        """update an existing edition"""
         datafile = pathlib.Path(__file__).parent.joinpath("../../data/bw_edition.json")
         bookdata = json.loads(datafile.read_bytes())
 
@@ -146,7 +146,7 @@ class InboxUpdate(TestCase):
         self.assertEqual(book.last_edited_by, self.remote_user)
 
     def test_update_work(self):
-        """ update an existing edition """
+        """update an existing edition"""
         datafile = pathlib.Path(__file__).parent.joinpath("../../data/bw_work.json")
         bookdata = json.loads(datafile.read_bytes())
 
diff --git a/bookwyrm/tests/views/test_authentication.py b/bookwyrm/tests/views/test_authentication.py
index f6d31861..c310b0a2 100644
--- a/bookwyrm/tests/views/test_authentication.py
+++ b/bookwyrm/tests/views/test_authentication.py
@@ -14,10 +14,10 @@ from bookwyrm.settings import DOMAIN
 
 # pylint: disable=too-many-public-methods
 class AuthenticationViews(TestCase):
-    """ login and password management """
+    """login and password management"""
 
     def setUp(self):
-        """ we need basic test data and mocks """
+        """we need basic test data and mocks"""
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@local.com",
@@ -31,7 +31,7 @@ class AuthenticationViews(TestCase):
         self.settings = models.SiteSettings.objects.create(id=1)
 
     def test_login_get(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         login = views.Login.as_view()
         request = self.factory.get("")
         request.user = self.anonymous_user
@@ -47,7 +47,7 @@ class AuthenticationViews(TestCase):
         self.assertEqual(result.status_code, 302)
 
     def test_register(self):
-        """ create a user """
+        """create a user"""
         view = views.Register.as_view()
         self.assertEqual(models.User.objects.count(), 1)
         request = self.factory.post(
@@ -68,7 +68,7 @@ class AuthenticationViews(TestCase):
         self.assertEqual(nutria.local, True)
 
     def test_register_trailing_space(self):
-        """ django handles this so weirdly """
+        """django handles this so weirdly"""
         view = views.Register.as_view()
         request = self.factory.post(
             "register/",
@@ -84,7 +84,7 @@ class AuthenticationViews(TestCase):
         self.assertEqual(nutria.local, True)
 
     def test_register_invalid_email(self):
-        """ gotta have an email """
+        """gotta have an email"""
         view = views.Register.as_view()
         self.assertEqual(models.User.objects.count(), 1)
         request = self.factory.post(
@@ -95,7 +95,7 @@ class AuthenticationViews(TestCase):
         response.render()
 
     def test_register_invalid_username(self):
-        """ gotta have an email """
+        """gotta have an email"""
         view = views.Register.as_view()
         self.assertEqual(models.User.objects.count(), 1)
         request = self.factory.post(
@@ -123,7 +123,7 @@ class AuthenticationViews(TestCase):
         response.render()
 
     def test_register_closed_instance(self):
-        """ you can't just register """
+        """you can't just register"""
         view = views.Register.as_view()
         self.settings.allow_registration = False
         self.settings.save()
@@ -135,7 +135,7 @@ class AuthenticationViews(TestCase):
             view(request)
 
     def test_register_invite(self):
-        """ you can't just register """
+        """you can't just register"""
         view = views.Register.as_view()
         self.settings.allow_registration = False
         self.settings.save()
diff --git a/bookwyrm/tests/views/test_author.py b/bookwyrm/tests/views/test_author.py
index bb047b7c..5dfbc350 100644
--- a/bookwyrm/tests/views/test_author.py
+++ b/bookwyrm/tests/views/test_author.py
@@ -12,10 +12,10 @@ from bookwyrm.activitypub import ActivitypubResponse
 
 
 class AuthorViews(TestCase):
-    """ author views"""
+    """author views"""
 
     def setUp(self):
-        """ we need basic test data and mocks """
+        """we need basic test data and mocks"""
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@local.com",
@@ -42,7 +42,7 @@ class AuthorViews(TestCase):
         models.SiteSettings.objects.create()
 
     def test_author_page(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.Author.as_view()
         author = models.Author.objects.create(name="Jessica")
         request = self.factory.get("")
@@ -62,7 +62,7 @@ class AuthorViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_edit_author_page(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.EditAuthor.as_view()
         author = models.Author.objects.create(name="Test Author")
         request = self.factory.get("")
@@ -76,7 +76,7 @@ class AuthorViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_edit_author(self):
-        """ edit an author """
+        """edit an author"""
         view = views.EditAuthor.as_view()
         author = models.Author.objects.create(name="Test Author")
         self.local_user.groups.add(self.group)
@@ -93,7 +93,7 @@ class AuthorViews(TestCase):
         self.assertEqual(author.last_edited_by, self.local_user)
 
     def test_edit_author_non_editor(self):
-        """ edit an author with invalid post data"""
+        """edit an author with invalid post data"""
         view = views.EditAuthor.as_view()
         author = models.Author.objects.create(name="Test Author")
         form = forms.AuthorForm(instance=author)
@@ -108,7 +108,7 @@ class AuthorViews(TestCase):
         self.assertEqual(author.name, "Test Author")
 
     def test_edit_author_invalid_form(self):
-        """ edit an author with invalid post data"""
+        """edit an author with invalid post data"""
         view = views.EditAuthor.as_view()
         author = models.Author.objects.create(name="Test Author")
         self.local_user.groups.add(self.group)
diff --git a/bookwyrm/tests/views/test_block.py b/bookwyrm/tests/views/test_block.py
index 71583d70..0b754689 100644
--- a/bookwyrm/tests/views/test_block.py
+++ b/bookwyrm/tests/views/test_block.py
@@ -9,10 +9,10 @@ from bookwyrm import models, views
 
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 class BlockViews(TestCase):
-    """ view user and edit profile """
+    """view user and edit profile"""
 
     def setUp(self):
-        """ we need basic test data and mocks """
+        """we need basic test data and mocks"""
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@local.com",
@@ -34,7 +34,7 @@ class BlockViews(TestCase):
         models.SiteSettings.objects.create()
 
     def test_block_get(self, _):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.Block.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -44,7 +44,7 @@ class BlockViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_block_post(self, _):
-        """ create a "block" database entry from an activity """
+        """create a "block" database entry from an activity"""
         view = views.Block.as_view()
         self.local_user.followers.add(self.remote_user)
         models.UserFollowRequest.objects.create(
@@ -65,7 +65,7 @@ class BlockViews(TestCase):
         self.assertFalse(models.UserFollowRequest.objects.exists())
 
     def test_unblock(self, _):
-        """ undo a block """
+        """undo a block"""
         self.local_user.blocks.add(self.remote_user)
         request = self.factory.post("")
         request.user = self.local_user
diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index a0fa0367..dce50868 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -18,10 +18,10 @@ from bookwyrm.activitypub import ActivitypubResponse
 
 
 class BookViews(TestCase):
-    """ books books books """
+    """books books books"""
 
     def setUp(self):
-        """ we need basic test data and mocks """
+        """we need basic test data and mocks"""
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@local.com",
@@ -81,7 +81,7 @@ class BookViews(TestCase):
         )
 
     def test_book_page(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.Book.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -100,7 +100,7 @@ class BookViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_edit_book_page(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.EditBook.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -111,7 +111,7 @@ class BookViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_edit_book(self):
-        """ lets a user edit a book """
+        """lets a user edit a book"""
         view = views.EditBook.as_view()
         self.local_user.groups.add(self.group)
         form = forms.EditionForm(instance=self.book)
@@ -125,7 +125,7 @@ class BookViews(TestCase):
         self.assertEqual(self.book.title, "New Title")
 
     def test_edit_book_add_author(self):
-        """ lets a user edit a book with new authors """
+        """lets a user edit a book with new authors"""
         view = views.EditBook.as_view()
         self.local_user.groups.add(self.group)
         form = forms.EditionForm(instance=self.book)
@@ -143,7 +143,7 @@ class BookViews(TestCase):
         self.assertEqual(self.book.title, "Example Edition")
 
     def test_edit_book_add_new_author_confirm(self):
-        """ lets a user edit a book confirmed with new authors """
+        """lets a user edit a book confirmed with new authors"""
         view = views.ConfirmEditBook.as_view()
         self.local_user.groups.add(self.group)
         form = forms.EditionForm(instance=self.book)
@@ -162,7 +162,7 @@ class BookViews(TestCase):
         self.assertEqual(self.book.authors.first().name, "Sappho")
 
     def test_edit_book_remove_author(self):
-        """ remove an author from a book """
+        """remove an author from a book"""
         author = models.Author.objects.create(name="Sappho")
         self.book.authors.add(author)
         form = forms.EditionForm(instance=self.book)
@@ -182,7 +182,7 @@ class BookViews(TestCase):
         self.assertFalse(self.book.authors.exists())
 
     def test_create_book(self):
-        """ create an entirely new book and work """
+        """create an entirely new book and work"""
         view = views.ConfirmEditBook.as_view()
         self.local_user.groups.add(self.group)
         form = forms.EditionForm()
@@ -196,7 +196,7 @@ class BookViews(TestCase):
         self.assertEqual(book.parent_work.title, "New Title")
 
     def test_create_book_existing_work(self):
-        """ create an entirely new book and work """
+        """create an entirely new book and work"""
         view = views.ConfirmEditBook.as_view()
         self.local_user.groups.add(self.group)
         form = forms.EditionForm()
@@ -211,7 +211,7 @@ class BookViews(TestCase):
         self.assertEqual(book.parent_work, self.work)
 
     def test_create_book_with_author(self):
-        """ create an entirely new book and work """
+        """create an entirely new book and work"""
         view = views.ConfirmEditBook.as_view()
         self.local_user.groups.add(self.group)
         form = forms.EditionForm()
@@ -229,7 +229,7 @@ class BookViews(TestCase):
         self.assertEqual(book.authors.first(), book.parent_work.authors.first())
 
     def test_switch_edition(self):
-        """ updates user's relationships to a book """
+        """updates user's relationships to a book"""
         work = models.Work.objects.create(title="test work")
         edition1 = models.Edition.objects.create(title="first ed", parent_work=work)
         edition2 = models.Edition.objects.create(title="second ed", parent_work=work)
@@ -253,7 +253,7 @@ class BookViews(TestCase):
         self.assertEqual(models.ReadThrough.objects.get().book, edition2)
 
     def test_editions_page(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.Editions.as_view()
         request = self.factory.get("")
         with patch("bookwyrm.views.books.is_api_request") as is_api:
@@ -271,7 +271,7 @@ class BookViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_upload_cover_file(self):
-        """ add a cover via file upload """
+        """add a cover via file upload"""
         self.assertFalse(self.book.cover)
         image_file = pathlib.Path(__file__).parent.joinpath(
             "../../static/images/default_avi.jpg"
@@ -296,7 +296,7 @@ class BookViews(TestCase):
 
     @responses.activate
     def test_upload_cover_url(self):
-        """ add a cover via url """
+        """add a cover via url"""
         self.assertFalse(self.book.cover)
         image_file = pathlib.Path(__file__).parent.joinpath(
             "../../static/images/default_avi.jpg"
diff --git a/bookwyrm/tests/views/test_directory.py b/bookwyrm/tests/views/test_directory.py
index 80d9eaf7..cada50bc 100644
--- a/bookwyrm/tests/views/test_directory.py
+++ b/bookwyrm/tests/views/test_directory.py
@@ -7,10 +7,10 @@ from bookwyrm import models, views
 
 # pylint: disable=unused-argument
 class DirectoryViews(TestCase):
-    """ tag views"""
+    """tag views"""
 
     def setUp(self):
-        """ we need basic test data and mocks """
+        """we need basic test data and mocks"""
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@local.com",
@@ -32,7 +32,7 @@ class DirectoryViews(TestCase):
         models.SiteSettings.objects.create()
 
     def test_directory_page(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.Directory.as_view()
         request = self.factory.get("")
         request.user = self.local_user
diff --git a/bookwyrm/tests/views/test_federation.py b/bookwyrm/tests/views/test_federation.py
index 2afdd6d3..f17f7624 100644
--- a/bookwyrm/tests/views/test_federation.py
+++ b/bookwyrm/tests/views/test_federation.py
@@ -10,10 +10,10 @@ from bookwyrm import forms, models, views
 
 
 class FederationViews(TestCase):
-    """ every response to a get request, html or json """
+    """every response to a get request, html or json"""
 
     def setUp(self):
-        """ we need basic test data and mocks """
+        """we need basic test data and mocks"""
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@local.com",
@@ -35,7 +35,7 @@ class FederationViews(TestCase):
         models.SiteSettings.objects.create()
 
     def test_federation_page(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.Federation.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -46,7 +46,7 @@ class FederationViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_server_page(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         server = models.FederatedServer.objects.create(server_name="hi.there.com")
         view = views.FederatedServer.as_view()
         request = self.factory.get("")
@@ -59,7 +59,7 @@ class FederationViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_server_page_block(self):
-        """ block a server """
+        """block a server"""
         server = models.FederatedServer.objects.create(server_name="hi.there.com")
         self.remote_user.federated_server = server
         self.remote_user.save()
@@ -79,7 +79,7 @@ class FederationViews(TestCase):
         self.assertFalse(self.remote_user.is_active)
 
     def test_server_page_unblock(self):
-        """ unblock a server """
+        """unblock a server"""
         server = models.FederatedServer.objects.create(
             server_name="hi.there.com", status="blocked"
         )
@@ -100,7 +100,7 @@ class FederationViews(TestCase):
         self.assertTrue(self.remote_user.is_active)
 
     def test_add_view_get(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         # create mode
         view = views.AddFederatedServer.as_view()
         request = self.factory.get("")
@@ -113,7 +113,7 @@ class FederationViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_add_view_post_create(self):
-        """ create a server entry """
+        """create a server entry"""
         form = forms.ServerForm()
         form.data["server_name"] = "remote.server"
         form.data["application_type"] = "coolsoft"
@@ -131,7 +131,7 @@ class FederationViews(TestCase):
         self.assertEqual(server.status, "blocked")
 
     def test_import_blocklist(self):
-        """ load a json file with a list of servers to block """
+        """load a json file with a list of servers to block"""
         server = models.FederatedServer.objects.create(server_name="hi.there.com")
         self.remote_user.federated_server = server
         self.remote_user.save()
diff --git a/bookwyrm/tests/views/test_feed.py b/bookwyrm/tests/views/test_feed.py
index dd38a3eb..a6a3d967 100644
--- a/bookwyrm/tests/views/test_feed.py
+++ b/bookwyrm/tests/views/test_feed.py
@@ -17,10 +17,10 @@ from bookwyrm.activitypub import ActivitypubResponse
 @patch("bookwyrm.activitystreams.ActivityStream.get_activity_stream")
 @patch("bookwyrm.activitystreams.ActivityStream.add_status")
 class FeedViews(TestCase):
-    """ activity feed, statuses, dms """
+    """activity feed, statuses, dms"""
 
     def setUp(self):
-        """ we need basic test data and mocks """
+        """we need basic test data and mocks"""
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@local.com",
@@ -37,7 +37,7 @@ class FeedViews(TestCase):
         models.SiteSettings.objects.create()
 
     def test_feed(self, *_):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.Feed.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -47,7 +47,7 @@ class FeedViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_status_page(self, *_):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.Status.as_view()
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             status = models.Status.objects.create(content="hi", user=self.local_user)
@@ -67,7 +67,7 @@ class FeedViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_status_page_not_found(self, *_):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.Status.as_view()
 
         request = self.factory.get("")
@@ -79,7 +79,7 @@ class FeedViews(TestCase):
         self.assertEqual(result.status_code, 404)
 
     def test_status_page_with_image(self, *_):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.Status.as_view()
 
         image_file = pathlib.Path(__file__).parent.joinpath(
@@ -115,7 +115,7 @@ class FeedViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_replies_page(self, *_):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.Replies.as_view()
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             status = models.Status.objects.create(content="hi", user=self.local_user)
@@ -135,7 +135,7 @@ class FeedViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_direct_messages_page(self, *_):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.DirectMessage.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -145,7 +145,7 @@ class FeedViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_get_suggested_book(self, *_):
-        """ gets books the ~*~ algorithm ~*~ thinks you want to post about """
+        """gets books the ~*~ algorithm ~*~ thinks you want to post about"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             models.ShelfBook.objects.create(
                 book=self.book,
diff --git a/bookwyrm/tests/views/test_follow.py b/bookwyrm/tests/views/test_follow.py
index 6b4de05d..45e60d3c 100644
--- a/bookwyrm/tests/views/test_follow.py
+++ b/bookwyrm/tests/views/test_follow.py
@@ -11,10 +11,10 @@ from bookwyrm import models, views
 
 
 class BookViews(TestCase):
-    """ books books books """
+    """books books books"""
 
     def setUp(self):
-        """ we need basic test data and mocks """
+        """we need basic test data and mocks"""
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@local.com",
@@ -50,7 +50,7 @@ class BookViews(TestCase):
         )
 
     def test_handle_follow_remote(self):
-        """ send a follow request """
+        """send a follow request"""
         request = self.factory.post("", {"user": self.remote_user.username})
         request.user = self.local_user
         self.assertEqual(models.UserFollowRequest.objects.count(), 0)
@@ -65,7 +65,7 @@ class BookViews(TestCase):
         self.assertEqual(rel.status, "follow_request")
 
     def test_handle_follow_local_manually_approves(self):
-        """ send a follow request """
+        """send a follow request"""
         rat = models.User.objects.create_user(
             "rat@local.com",
             "rat@rat.com",
@@ -88,7 +88,7 @@ class BookViews(TestCase):
         self.assertEqual(rel.status, "follow_request")
 
     def test_handle_follow_local(self):
-        """ send a follow request """
+        """send a follow request"""
         rat = models.User.objects.create_user(
             "rat@local.com",
             "rat@rat.com",
@@ -111,7 +111,7 @@ class BookViews(TestCase):
         self.assertEqual(rel.status, "follows")
 
     def test_handle_unfollow(self):
-        """ send an unfollow """
+        """send an unfollow"""
         request = self.factory.post("", {"user": self.remote_user.username})
         request.user = self.local_user
         self.remote_user.followers.add(self.local_user)
@@ -125,7 +125,7 @@ class BookViews(TestCase):
         self.assertEqual(self.remote_user.followers.count(), 0)
 
     def test_handle_accept(self):
-        """ accept a follow request """
+        """accept a follow request"""
         self.local_user.manually_approves_followers = True
         self.local_user.save(broadcast=False)
         request = self.factory.post("", {"user": self.remote_user.username})
@@ -142,7 +142,7 @@ class BookViews(TestCase):
         self.assertEqual(self.local_user.followers.first(), self.remote_user)
 
     def test_handle_reject(self):
-        """ reject a follow request """
+        """reject a follow request"""
         self.local_user.manually_approves_followers = True
         self.local_user.save(broadcast=False)
         request = self.factory.post("", {"user": self.remote_user.username})
diff --git a/bookwyrm/tests/views/test_get_started.py b/bookwyrm/tests/views/test_get_started.py
index 71eb4060..1c55da08 100644
--- a/bookwyrm/tests/views/test_get_started.py
+++ b/bookwyrm/tests/views/test_get_started.py
@@ -8,10 +8,10 @@ from bookwyrm import forms, models, views
 
 
 class GetStartedViews(TestCase):
-    """ helping new users get oriented """
+    """helping new users get oriented"""
 
     def setUp(self):
-        """ we need basic test data and mocks """
+        """we need basic test data and mocks"""
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@local.com",
@@ -31,7 +31,7 @@ class GetStartedViews(TestCase):
         models.SiteSettings.objects.create()
 
     def test_profile_view(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.GetStartedProfile.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -43,7 +43,7 @@ class GetStartedViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_profile_view_post(self):
-        """ save basic user details """
+        """save basic user details"""
         view = views.GetStartedProfile.as_view()
         form = forms.LimitedEditUserForm(instance=self.local_user)
         form.data["name"] = "New Name"
@@ -61,7 +61,7 @@ class GetStartedViews(TestCase):
         self.assertTrue(self.local_user.discoverable)
 
     def test_books_view(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.GetStartedBooks.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -73,7 +73,7 @@ class GetStartedViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_books_view_with_query(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.GetStartedBooks.as_view()
         request = self.factory.get("?query=Example")
         request.user = self.local_user
@@ -85,7 +85,7 @@ class GetStartedViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_books_view_post(self):
-        """ shelve some books """
+        """shelve some books"""
         view = views.GetStartedBooks.as_view()
         data = {self.book.id: self.local_user.shelf_set.first().id}
         request = self.factory.post("", data)
@@ -103,7 +103,7 @@ class GetStartedViews(TestCase):
         self.assertEqual(shelfbook.user, self.local_user)
 
     def test_users_view(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.GetStartedUsers.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -115,7 +115,7 @@ class GetStartedViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_users_view_with_query(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.GetStartedUsers.as_view()
         request = self.factory.get("?query=rat")
         request.user = self.local_user
diff --git a/bookwyrm/tests/views/test_goal.py b/bookwyrm/tests/views/test_goal.py
index cbe4fe01..4e8f6ee2 100644
--- a/bookwyrm/tests/views/test_goal.py
+++ b/bookwyrm/tests/views/test_goal.py
@@ -11,10 +11,10 @@ from bookwyrm import models, views
 
 
 class GoalViews(TestCase):
-    """ viewing and creating statuses """
+    """viewing and creating statuses"""
 
     def setUp(self):
-        """ we need basic test data and mocks """
+        """we need basic test data and mocks"""
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@local.com",
@@ -41,7 +41,7 @@ class GoalViews(TestCase):
         models.SiteSettings.objects.create()
 
     def test_goal_page_no_goal(self):
-        """ view a reading goal page for another's unset goal """
+        """view a reading goal page for another's unset goal"""
         view = views.Goal.as_view()
         request = self.factory.get("")
         request.user = self.rat
@@ -50,7 +50,7 @@ class GoalViews(TestCase):
         self.assertEqual(result.status_code, 404)
 
     def test_goal_page_no_goal_self(self):
-        """ view a reading goal page for your own unset goal """
+        """view a reading goal page for your own unset goal"""
         view = views.Goal.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -60,7 +60,7 @@ class GoalViews(TestCase):
         self.assertIsInstance(result, TemplateResponse)
 
     def test_goal_page_anonymous(self):
-        """ can't view it without login """
+        """can't view it without login"""
         view = views.Goal.as_view()
         request = self.factory.get("")
         request.user = self.anonymous_user
@@ -69,7 +69,7 @@ class GoalViews(TestCase):
         self.assertEqual(result.status_code, 302)
 
     def test_goal_page_public(self):
-        """ view a user's public goal """
+        """view a user's public goal"""
         models.ReadThrough.objects.create(
             finish_date=timezone.now(),
             user=self.local_user,
@@ -91,7 +91,7 @@ class GoalViews(TestCase):
         self.assertIsInstance(result, TemplateResponse)
 
     def test_goal_page_private(self):
-        """ view a user's private goal """
+        """view a user's private goal"""
         models.AnnualGoal.objects.create(
             user=self.local_user, year=2020, goal=15, privacy="followers"
         )
@@ -104,7 +104,7 @@ class GoalViews(TestCase):
 
     @patch("bookwyrm.activitystreams.ActivityStream.add_status")
     def test_create_goal(self, _):
-        """ create a new goal """
+        """create a new goal"""
         view = views.Goal.as_view()
         request = self.factory.post(
             "",
diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py
index 2e5ed82d..e2e041e9 100644
--- a/bookwyrm/tests/views/test_helpers.py
+++ b/bookwyrm/tests/views/test_helpers.py
@@ -13,10 +13,10 @@ from bookwyrm.settings import USER_AGENT
 
 @patch("bookwyrm.activitystreams.ActivityStream.add_status")
 class ViewsHelpers(TestCase):
-    """ viewing and creating statuses """
+    """viewing and creating statuses"""
 
     def setUp(self):
-        """ we need basic test data and mocks """
+        """we need basic test data and mocks"""
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@local.com",
@@ -53,12 +53,12 @@ class ViewsHelpers(TestCase):
             )
 
     def test_get_edition(self, _):
-        """ given an edition or a work, returns an edition """
+        """given an edition or a work, returns an edition"""
         self.assertEqual(views.helpers.get_edition(self.book.id), self.book)
         self.assertEqual(views.helpers.get_edition(self.work.id), self.book)
 
     def test_get_user_from_username(self, _):
-        """ works for either localname or username """
+        """works for either localname or username"""
         self.assertEqual(
             views.helpers.get_user_from_username(self.local_user, "mouse"),
             self.local_user,
@@ -71,7 +71,7 @@ class ViewsHelpers(TestCase):
             views.helpers.get_user_from_username(self.local_user, "mojfse@example.com")
 
     def test_is_api_request(self, _):
-        """ should it return html or json """
+        """should it return html or json"""
         request = self.factory.get("/path")
         request.headers = {"Accept": "application/json"}
         self.assertTrue(views.helpers.is_api_request(request))
@@ -85,12 +85,12 @@ class ViewsHelpers(TestCase):
         self.assertFalse(views.helpers.is_api_request(request))
 
     def test_is_api_request_no_headers(self, _):
-        """ should it return html or json """
+        """should it return html or json"""
         request = self.factory.get("/path")
         self.assertFalse(views.helpers.is_api_request(request))
 
     def test_is_bookwyrm_request(self, _):
-        """ checks if a request came from a bookwyrm instance """
+        """checks if a request came from a bookwyrm instance"""
         request = self.factory.get("", {"q": "Test Book"})
         self.assertFalse(views.helpers.is_bookwyrm_request(request))
 
@@ -105,7 +105,7 @@ class ViewsHelpers(TestCase):
         self.assertTrue(views.helpers.is_bookwyrm_request(request))
 
     def test_existing_user(self, _):
-        """ simple database lookup by username """
+        """simple database lookup by username"""
         result = views.helpers.handle_remote_webfinger("@mouse@local.com")
         self.assertEqual(result, self.local_user)
 
@@ -117,7 +117,7 @@ class ViewsHelpers(TestCase):
 
     @responses.activate
     def test_load_user(self, _):
-        """ find a remote user using webfinger """
+        """find a remote user using webfinger"""
         username = "mouse@example.com"
         wellknown = {
             "subject": "acct:mouse@example.com",
@@ -147,7 +147,7 @@ class ViewsHelpers(TestCase):
             self.assertEqual(result.username, "mouse@example.com")
 
     def test_user_on_blocked_server(self, _):
-        """ find a remote user using webfinger """
+        """find a remote user using webfinger"""
         models.FederatedServer.objects.create(
             server_name="example.com", status="blocked"
         )
@@ -156,7 +156,7 @@ class ViewsHelpers(TestCase):
         self.assertIsNone(result)
 
     def test_handle_reading_status_to_read(self, _):
-        """ posts shelve activities """
+        """posts shelve activities"""
         shelf = self.local_user.shelf_set.get(identifier="to-read")
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             views.helpers.handle_reading_status(
@@ -168,7 +168,7 @@ class ViewsHelpers(TestCase):
         self.assertEqual(status.content, "wants to read")
 
     def test_handle_reading_status_reading(self, _):
-        """ posts shelve activities """
+        """posts shelve activities"""
         shelf = self.local_user.shelf_set.get(identifier="reading")
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             views.helpers.handle_reading_status(
@@ -180,7 +180,7 @@ class ViewsHelpers(TestCase):
         self.assertEqual(status.content, "started reading")
 
     def test_handle_reading_status_read(self, _):
-        """ posts shelve activities """
+        """posts shelve activities"""
         shelf = self.local_user.shelf_set.get(identifier="read")
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             views.helpers.handle_reading_status(
@@ -192,7 +192,7 @@ class ViewsHelpers(TestCase):
         self.assertEqual(status.content, "finished reading")
 
     def test_handle_reading_status_other(self, _):
-        """ posts shelve activities """
+        """posts shelve activities"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             views.helpers.handle_reading_status(
                 self.local_user, self.shelf, self.book, "public"
@@ -200,7 +200,7 @@ class ViewsHelpers(TestCase):
         self.assertFalse(models.GeneratedNote.objects.exists())
 
     def test_get_annotated_users(self, _):
-        """ list of people you might know """
+        """list of people you might know"""
         user_1 = models.User.objects.create_user(
             "nutria@local.com",
             "nutria@nutria.com",
@@ -247,7 +247,7 @@ class ViewsHelpers(TestCase):
         self.assertEqual(remote_user_annotated.shared_books, 0)
 
     def test_get_annotated_users_counts(self, _):
-        """ correct counting for multiple shared attributed """
+        """correct counting for multiple shared attributed"""
         user_1 = models.User.objects.create_user(
             "nutria@local.com",
             "nutria@nutria.com",
diff --git a/bookwyrm/tests/views/test_import.py b/bookwyrm/tests/views/test_import.py
index 4de2cfb9..22694623 100644
--- a/bookwyrm/tests/views/test_import.py
+++ b/bookwyrm/tests/views/test_import.py
@@ -9,10 +9,10 @@ from bookwyrm import views
 
 
 class ImportViews(TestCase):
-    """ goodreads import views """
+    """goodreads import views"""
 
     def setUp(self):
-        """ we need basic test data and mocks """
+        """we need basic test data and mocks"""
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@local.com",
@@ -24,7 +24,7 @@ class ImportViews(TestCase):
         models.SiteSettings.objects.create()
 
     def test_import_page(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.Import.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -34,7 +34,7 @@ class ImportViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_import_status(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.ImportStatus.as_view()
         import_job = models.ImportJob.objects.create(user=self.local_user)
         request = self.factory.get("")
@@ -47,7 +47,7 @@ class ImportViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_retry_import(self):
-        """ retry failed items """
+        """retry failed items"""
         view = views.ImportStatus.as_view()
         import_job = models.ImportJob.objects.create(
             user=self.local_user, privacy="unlisted"
diff --git a/bookwyrm/tests/views/test_interaction.py b/bookwyrm/tests/views/test_interaction.py
index f767edfa..876d6053 100644
--- a/bookwyrm/tests/views/test_interaction.py
+++ b/bookwyrm/tests/views/test_interaction.py
@@ -9,10 +9,10 @@ from bookwyrm import models, views
 
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 class InteractionViews(TestCase):
-    """ viewing and creating statuses """
+    """viewing and creating statuses"""
 
     def setUp(self):
-        """ we need basic test data and mocks """
+        """we need basic test data and mocks"""
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@local.com",
@@ -41,7 +41,7 @@ class InteractionViews(TestCase):
         )
 
     def test_favorite(self, _):
-        """ create and broadcast faving a status """
+        """create and broadcast faving a status"""
         view = views.Favorite.as_view()
         request = self.factory.post("")
         request.user = self.remote_user
@@ -59,7 +59,7 @@ class InteractionViews(TestCase):
         self.assertEqual(notification.related_user, self.remote_user)
 
     def test_unfavorite(self, _):
-        """ unfav a status """
+        """unfav a status"""
         view = views.Unfavorite.as_view()
         request = self.factory.post("")
         request.user = self.remote_user
@@ -76,7 +76,7 @@ class InteractionViews(TestCase):
         self.assertEqual(models.Notification.objects.count(), 0)
 
     def test_boost(self, _):
-        """ boost a status """
+        """boost a status"""
         view = views.Boost.as_view()
         request = self.factory.post("")
         request.user = self.remote_user
@@ -98,7 +98,7 @@ class InteractionViews(TestCase):
         self.assertEqual(notification.related_status, status)
 
     def test_self_boost(self, _):
-        """ boost your own status """
+        """boost your own status"""
         view = views.Boost.as_view()
         request = self.factory.post("")
         request.user = self.local_user
@@ -122,7 +122,7 @@ class InteractionViews(TestCase):
         self.assertFalse(models.Notification.objects.exists())
 
     def test_boost_unlisted(self, _):
-        """ boost a status """
+        """boost a status"""
         view = views.Boost.as_view()
         request = self.factory.post("")
         request.user = self.local_user
@@ -137,7 +137,7 @@ class InteractionViews(TestCase):
         self.assertEqual(boost.privacy, "unlisted")
 
     def test_boost_private(self, _):
-        """ boost a status """
+        """boost a status"""
         view = views.Boost.as_view()
         request = self.factory.post("")
         request.user = self.local_user
@@ -150,7 +150,7 @@ class InteractionViews(TestCase):
         self.assertFalse(models.Boost.objects.exists())
 
     def test_boost_twice(self, _):
-        """ boost a status """
+        """boost a status"""
         view = views.Boost.as_view()
         request = self.factory.post("")
         request.user = self.local_user
@@ -162,7 +162,7 @@ class InteractionViews(TestCase):
         self.assertEqual(models.Boost.objects.count(), 1)
 
     def test_unboost(self, _):
-        """ undo a boost """
+        """undo a boost"""
         view = views.Unboost.as_view()
         request = self.factory.post("")
         request.user = self.remote_user
diff --git a/bookwyrm/tests/views/test_invite.py b/bookwyrm/tests/views/test_invite.py
index 7bfc8fe5..7b5071b3 100644
--- a/bookwyrm/tests/views/test_invite.py
+++ b/bookwyrm/tests/views/test_invite.py
@@ -11,10 +11,10 @@ from bookwyrm import views
 
 
 class InviteViews(TestCase):
-    """ every response to a get request, html or json """
+    """every response to a get request, html or json"""
 
     def setUp(self):
-        """ we need basic test data and mocks """
+        """we need basic test data and mocks"""
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@local.com",
@@ -26,7 +26,7 @@ class InviteViews(TestCase):
         models.SiteSettings.objects.create()
 
     def test_invite_page(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.Invite.as_view()
         models.SiteInvite.objects.create(code="hi", user=self.local_user)
         request = self.factory.get("")
@@ -41,7 +41,7 @@ class InviteViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_manage_invites(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.ManageInvites.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -52,7 +52,7 @@ class InviteViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_invite_request(self):
-        """ request to join a server """
+        """request to join a server"""
         form = forms.InviteRequestForm()
         form.data["email"] = "new@user.email"
 
@@ -66,7 +66,7 @@ class InviteViews(TestCase):
         self.assertEqual(req.email, "new@user.email")
 
     def test_invite_request_email_taken(self):
-        """ request to join a server with an existing user email """
+        """request to join a server with an existing user email"""
         form = forms.InviteRequestForm()
         form.data["email"] = "mouse@mouse.mouse"
 
@@ -80,7 +80,7 @@ class InviteViews(TestCase):
         self.assertFalse(models.InviteRequest.objects.exists())
 
     def test_manage_invite_requests(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.ManageInviteRequests.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -98,7 +98,7 @@ class InviteViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_manage_invite_requests_send(self):
-        """ send an invite """
+        """send an invite"""
         req = models.InviteRequest.objects.create(email="fish@example.com")
 
         view = views.ManageInviteRequests.as_view()
@@ -113,7 +113,7 @@ class InviteViews(TestCase):
         self.assertIsNotNone(req.invite)
 
     def test_ignore_invite_request(self):
-        """ don't invite that jerk """
+        """don't invite that jerk"""
         req = models.InviteRequest.objects.create(email="fish@example.com")
 
         view = views.ignore_invite_request
diff --git a/bookwyrm/tests/views/test_isbn.py b/bookwyrm/tests/views/test_isbn.py
index 7f03a610..2aedd3ce 100644
--- a/bookwyrm/tests/views/test_isbn.py
+++ b/bookwyrm/tests/views/test_isbn.py
@@ -11,10 +11,10 @@ from bookwyrm.settings import DOMAIN
 
 
 class IsbnViews(TestCase):
-    """ tag views"""
+    """tag views"""
 
     def setUp(self):
-        """ we need basic test data and mocks """
+        """we need basic test data and mocks"""
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@local.com",
@@ -37,7 +37,7 @@ class IsbnViews(TestCase):
         models.SiteSettings.objects.create()
 
     def test_isbn_json_response(self):
-        """ searches local data only and returns book data in json format """
+        """searches local data only and returns book data in json format"""
         view = views.Isbn.as_view()
         request = self.factory.get("")
         with patch("bookwyrm.views.isbn.is_api_request") as is_api:
diff --git a/bookwyrm/tests/views/test_landing.py b/bookwyrm/tests/views/test_landing.py
index 2513fecc..864e48f7 100644
--- a/bookwyrm/tests/views/test_landing.py
+++ b/bookwyrm/tests/views/test_landing.py
@@ -10,10 +10,10 @@ from bookwyrm import views
 
 
 class LandingViews(TestCase):
-    """ pages you land on without really trying """
+    """pages you land on without really trying"""
 
     def setUp(self):
-        """ we need basic test data and mocks """
+        """we need basic test data and mocks"""
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@local.com",
@@ -27,7 +27,7 @@ class LandingViews(TestCase):
         models.SiteSettings.objects.create()
 
     def test_home_page(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.Home.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -43,7 +43,7 @@ class LandingViews(TestCase):
         result.render()
 
     def test_about_page(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.About.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -53,7 +53,7 @@ class LandingViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_discover(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.Discover.as_view()
         request = self.factory.get("")
         result = view(request)
diff --git a/bookwyrm/tests/views/test_list.py b/bookwyrm/tests/views/test_list.py
index 215f3e61..3de35b1e 100644
--- a/bookwyrm/tests/views/test_list.py
+++ b/bookwyrm/tests/views/test_list.py
@@ -12,10 +12,10 @@ from bookwyrm.activitypub import ActivitypubResponse
 
 # pylint: disable=unused-argument
 class ListViews(TestCase):
-    """ tag views"""
+    """tag views"""
 
     def setUp(self):
-        """ we need basic test data and mocks """
+        """we need basic test data and mocks"""
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@local.com",
@@ -67,7 +67,7 @@ class ListViews(TestCase):
         models.SiteSettings.objects.create()
 
     def test_lists_page(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.Lists.as_view()
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             models.List.objects.create(name="Public list", user=self.local_user)
@@ -90,7 +90,7 @@ class ListViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_lists_create(self):
-        """ create list view """
+        """create list view"""
         view = views.Lists.as_view()
         request = self.factory.post(
             "",
@@ -118,7 +118,7 @@ class ListViews(TestCase):
         self.assertEqual(new_list.curation, "open")
 
     def test_list_page(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.List.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -153,7 +153,7 @@ class ListViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_list_edit(self):
-        """ edit a list """
+        """edit a list"""
         view = views.List.as_view()
         request = self.factory.post(
             "",
@@ -185,7 +185,7 @@ class ListViews(TestCase):
         self.assertEqual(self.list.curation, "curated")
 
     def test_curate_page(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.Curate.as_view()
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             models.List.objects.create(name="Public list", user=self.local_user)
@@ -205,7 +205,7 @@ class ListViews(TestCase):
         self.assertEqual(result.status_code, 302)
 
     def test_curate_approve(self):
-        """ approve a pending item """
+        """approve a pending item"""
         view = views.Curate.as_view()
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             pending = models.ListItem.objects.create(
@@ -240,7 +240,7 @@ class ListViews(TestCase):
         self.assertTrue(pending.approved)
 
     def test_curate_reject(self):
-        """ approve a pending item """
+        """approve a pending item"""
         view = views.Curate.as_view()
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             pending = models.ListItem.objects.create(
@@ -266,7 +266,7 @@ class ListViews(TestCase):
         self.assertFalse(models.ListItem.objects.exists())
 
     def test_add_book(self):
-        """ put a book on a list """
+        """put a book on a list"""
         request = self.factory.post(
             "",
             {
@@ -545,7 +545,7 @@ class ListViews(TestCase):
         self.assertEqual(items[2].order, 3)
 
     def test_add_book_outsider(self):
-        """ put a book on a list """
+        """put a book on a list"""
         self.list.curation = "open"
         self.list.save(broadcast=False)
         request = self.factory.post(
@@ -571,7 +571,7 @@ class ListViews(TestCase):
         self.assertTrue(item.approved)
 
     def test_add_book_pending(self):
-        """ put a book on a list awaiting approval """
+        """put a book on a list awaiting approval"""
         self.list.curation = "curated"
         self.list.save(broadcast=False)
         request = self.factory.post(
@@ -601,7 +601,7 @@ class ListViews(TestCase):
         self.assertFalse(item.approved)
 
     def test_add_book_self_curated(self):
-        """ put a book on a list automatically approved """
+        """put a book on a list automatically approved"""
         self.list.curation = "curated"
         self.list.save(broadcast=False)
         request = self.factory.post(
@@ -627,7 +627,7 @@ class ListViews(TestCase):
         self.assertTrue(item.approved)
 
     def test_remove_book(self):
-        """ take an item off a list """
+        """take an item off a list"""
 
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             item = models.ListItem.objects.create(
@@ -651,7 +651,7 @@ class ListViews(TestCase):
         self.assertFalse(self.list.listitem_set.exists())
 
     def test_remove_book_unauthorized(self):
-        """ take an item off a list """
+        """take an item off a list"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             item = models.ListItem.objects.create(
                 book_list=self.list, user=self.local_user, book=self.book, order=1
diff --git a/bookwyrm/tests/views/test_notifications.py b/bookwyrm/tests/views/test_notifications.py
index 6d92485e..182753f9 100644
--- a/bookwyrm/tests/views/test_notifications.py
+++ b/bookwyrm/tests/views/test_notifications.py
@@ -8,10 +8,10 @@ from bookwyrm import views
 
 
 class NotificationViews(TestCase):
-    """ notifications """
+    """notifications"""
 
     def setUp(self):
-        """ we need basic test data and mocks """
+        """we need basic test data and mocks"""
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@local.com",
@@ -23,7 +23,7 @@ class NotificationViews(TestCase):
         models.SiteSettings.objects.create()
 
     def test_notifications_page(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.Notifications.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -33,7 +33,7 @@ class NotificationViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_clear_notifications(self):
-        """ erase notifications """
+        """erase notifications"""
         models.Notification.objects.create(
             user=self.local_user, notification_type="FAVORITE"
         )
diff --git a/bookwyrm/tests/views/test_outbox.py b/bookwyrm/tests/views/test_outbox.py
index 0bcfde69..f89258e5 100644
--- a/bookwyrm/tests/views/test_outbox.py
+++ b/bookwyrm/tests/views/test_outbox.py
@@ -13,10 +13,10 @@ from bookwyrm.settings import USER_AGENT
 # pylint: disable=too-many-public-methods
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 class OutboxView(TestCase):
-    """ sends out activities """
+    """sends out activities"""
 
     def setUp(self):
-        """ we'll need some data """
+        """we'll need some data"""
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@local.com",
@@ -34,19 +34,19 @@ class OutboxView(TestCase):
         )
 
     def test_outbox(self, _):
-        """ returns user's statuses """
+        """returns user's statuses"""
         request = self.factory.get("")
         result = views.Outbox.as_view()(request, "mouse")
         self.assertIsInstance(result, JsonResponse)
 
     def test_outbox_bad_method(self, _):
-        """ can't POST to outbox """
+        """can't POST to outbox"""
         request = self.factory.post("")
         result = views.Outbox.as_view()(request, "mouse")
         self.assertEqual(result.status_code, 405)
 
     def test_outbox_unknown_user(self, _):
-        """ should 404 for unknown and remote users """
+        """should 404 for unknown and remote users"""
         request = self.factory.post("")
         result = views.Outbox.as_view()(request, "beepboop")
         self.assertEqual(result.status_code, 405)
@@ -54,7 +54,7 @@ class OutboxView(TestCase):
         self.assertEqual(result.status_code, 405)
 
     def test_outbox_privacy(self, _):
-        """ don't show dms et cetera in outbox """
+        """don't show dms et cetera in outbox"""
         with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
             models.Status.objects.create(
                 content="PRIVATE!!", user=self.local_user, privacy="direct"
@@ -77,7 +77,7 @@ class OutboxView(TestCase):
         self.assertEqual(data["totalItems"], 2)
 
     def test_outbox_filter(self, _):
-        """ if we only care about reviews, only get reviews """
+        """if we only care about reviews, only get reviews"""
         with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
             models.Review.objects.create(
                 content="look at this",
@@ -103,7 +103,7 @@ class OutboxView(TestCase):
         self.assertEqual(data["totalItems"], 1)
 
     def test_outbox_bookwyrm_request_true(self, _):
-        """ should differentiate between bookwyrm and outside requests """
+        """should differentiate between bookwyrm and outside requests"""
         with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
             models.Review.objects.create(
                 name="hi",
@@ -121,7 +121,7 @@ class OutboxView(TestCase):
         self.assertEqual(data["orderedItems"][0]["type"], "Review")
 
     def test_outbox_bookwyrm_request_false(self, _):
-        """ should differentiate between bookwyrm and outside requests """
+        """should differentiate between bookwyrm and outside requests"""
         with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
             models.Review.objects.create(
                 name="hi",
diff --git a/bookwyrm/tests/views/test_password.py b/bookwyrm/tests/views/test_password.py
index 53a9bcbd..ec686db7 100644
--- a/bookwyrm/tests/views/test_password.py
+++ b/bookwyrm/tests/views/test_password.py
@@ -10,10 +10,10 @@ from bookwyrm import models, views
 
 
 class PasswordViews(TestCase):
-    """ view user and edit profile """
+    """view user and edit profile"""
 
     def setUp(self):
-        """ we need basic test data and mocks """
+        """we need basic test data and mocks"""
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@local.com",
@@ -27,7 +27,7 @@ class PasswordViews(TestCase):
         models.SiteSettings.objects.create(id=1)
 
     def test_password_reset_request(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.PasswordResetRequest.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -38,7 +38,7 @@ class PasswordViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_password_reset_request_post(self):
-        """ send 'em an email """
+        """send 'em an email"""
         request = self.factory.post("", {"email": "aa@bb.ccc"})
         view = views.PasswordResetRequest.as_view()
         resp = view(request)
@@ -53,7 +53,7 @@ class PasswordViews(TestCase):
         self.assertEqual(models.PasswordReset.objects.get().user, self.local_user)
 
     def test_password_reset(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.PasswordReset.as_view()
         code = models.PasswordReset.objects.create(user=self.local_user)
         request = self.factory.get("")
@@ -64,7 +64,7 @@ class PasswordViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_password_reset_post(self):
-        """ reset from code """
+        """reset from code"""
         view = views.PasswordReset.as_view()
         code = models.PasswordReset.objects.create(user=self.local_user)
         request = self.factory.post("", {"password": "hi", "confirm-password": "hi"})
@@ -74,7 +74,7 @@ class PasswordViews(TestCase):
         self.assertFalse(models.PasswordReset.objects.exists())
 
     def test_password_reset_wrong_code(self):
-        """ reset from code """
+        """reset from code"""
         view = views.PasswordReset.as_view()
         models.PasswordReset.objects.create(user=self.local_user)
         request = self.factory.post("", {"password": "hi", "confirm-password": "hi"})
@@ -83,7 +83,7 @@ class PasswordViews(TestCase):
         self.assertTrue(models.PasswordReset.objects.exists())
 
     def test_password_reset_mismatch(self):
-        """ reset from code """
+        """reset from code"""
         view = views.PasswordReset.as_view()
         code = models.PasswordReset.objects.create(user=self.local_user)
         request = self.factory.post("", {"password": "hi", "confirm-password": "hihi"})
@@ -92,7 +92,7 @@ class PasswordViews(TestCase):
         self.assertTrue(models.PasswordReset.objects.exists())
 
     def test_password_change_get(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.ChangePassword.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -103,7 +103,7 @@ class PasswordViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_password_change(self):
-        """ change password """
+        """change password"""
         view = views.ChangePassword.as_view()
         password_hash = self.local_user.password
         request = self.factory.post("", {"password": "hi", "confirm-password": "hi"})
@@ -113,7 +113,7 @@ class PasswordViews(TestCase):
         self.assertNotEqual(self.local_user.password, password_hash)
 
     def test_password_change_mismatch(self):
-        """ change password """
+        """change password"""
         view = views.ChangePassword.as_view()
         password_hash = self.local_user.password
         request = self.factory.post("", {"password": "hi", "confirm-password": "hihi"})
diff --git a/bookwyrm/tests/views/test_reading.py b/bookwyrm/tests/views/test_reading.py
index b1ae6b88..c591aa60 100644
--- a/bookwyrm/tests/views/test_reading.py
+++ b/bookwyrm/tests/views/test_reading.py
@@ -10,10 +10,10 @@ from bookwyrm import models, views
 
 @patch("bookwyrm.activitystreams.ActivityStream.add_status")
 class ReadingViews(TestCase):
-    """ viewing and creating statuses """
+    """viewing and creating statuses"""
 
     def setUp(self):
-        """ we need basic test data and mocks """
+        """we need basic test data and mocks"""
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@local.com",
@@ -41,7 +41,7 @@ class ReadingViews(TestCase):
             )
 
     def test_start_reading(self, _):
-        """ begin a book """
+        """begin a book"""
         shelf = self.local_user.shelf_set.get(identifier=models.Shelf.READING)
         self.assertFalse(shelf.books.exists())
         self.assertFalse(models.Status.objects.exists())
@@ -72,7 +72,7 @@ class ReadingViews(TestCase):
         self.assertEqual(readthrough.book, self.book)
 
     def test_start_reading_reshelf(self, _):
-        """ begin a book """
+        """begin a book"""
         to_read_shelf = self.local_user.shelf_set.get(identifier=models.Shelf.TO_READ)
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             models.ShelfBook.objects.create(
@@ -92,7 +92,7 @@ class ReadingViews(TestCase):
         self.assertEqual(shelf.books.get(), self.book)
 
     def test_finish_reading(self, _):
-        """ begin a book """
+        """begin a book"""
         shelf = self.local_user.shelf_set.get(identifier=models.Shelf.READ_FINISHED)
         self.assertFalse(shelf.books.exists())
         self.assertFalse(models.Status.objects.exists())
@@ -128,7 +128,7 @@ class ReadingViews(TestCase):
         self.assertEqual(readthrough.book, self.book)
 
     def test_edit_readthrough(self, _):
-        """ adding dates to an ongoing readthrough """
+        """adding dates to an ongoing readthrough"""
         start = timezone.make_aware(dateutil.parser.parse("2021-01-03"))
         readthrough = models.ReadThrough.objects.create(
             book=self.book, user=self.local_user, start_date=start
@@ -155,7 +155,7 @@ class ReadingViews(TestCase):
         self.assertEqual(readthrough.book, self.book)
 
     def test_delete_readthrough(self, _):
-        """ remove a readthrough """
+        """remove a readthrough"""
         readthrough = models.ReadThrough.objects.create(
             book=self.book, user=self.local_user
         )
@@ -172,7 +172,7 @@ class ReadingViews(TestCase):
         self.assertFalse(models.ReadThrough.objects.filter(id=readthrough.id).exists())
 
     def test_create_readthrough(self, _):
-        """ adding new read dates """
+        """adding new read dates"""
         request = self.factory.post(
             "",
             {
diff --git a/bookwyrm/tests/views/test_readthrough.py b/bookwyrm/tests/views/test_readthrough.py
index 5399f673..c9ebf216 100644
--- a/bookwyrm/tests/views/test_readthrough.py
+++ b/bookwyrm/tests/views/test_readthrough.py
@@ -9,10 +9,10 @@ from bookwyrm import models
 
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 class ReadThrough(TestCase):
-    """ readthrough tests """
+    """readthrough tests"""
 
     def setUp(self):
-        """ basic user and book data """
+        """basic user and book data"""
         self.client = Client()
 
         self.work = models.Work.objects.create(title="Example Work")
@@ -52,7 +52,7 @@ class ReadThrough(TestCase):
         self.assertEqual(delay_mock.call_count, 1)
 
     def test_create_progress_readthrough(self, delay_mock):
-        """ a readthrough with progress """
+        """a readthrough with progress"""
         self.assertEqual(self.edition.readthrough_set.count(), 0)
 
         self.client.post(
diff --git a/bookwyrm/tests/views/test_reports.py b/bookwyrm/tests/views/test_reports.py
index bce19993..84539489 100644
--- a/bookwyrm/tests/views/test_reports.py
+++ b/bookwyrm/tests/views/test_reports.py
@@ -7,10 +7,10 @@ from bookwyrm import forms, models, views
 
 
 class ReportViews(TestCase):
-    """ every response to a get request, html or json """
+    """every response to a get request, html or json"""
 
     def setUp(self):
-        """ we need basic test data and mocks """
+        """we need basic test data and mocks"""
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@local.com",
@@ -29,7 +29,7 @@ class ReportViews(TestCase):
         models.SiteSettings.objects.create()
 
     def test_reports_page(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.Reports.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -41,7 +41,7 @@ class ReportViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_reports_page_with_data(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.Reports.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -54,7 +54,7 @@ class ReportViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_report_page(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.Report.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -68,7 +68,7 @@ class ReportViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_report_comment(self):
-        """ comment on a report """
+        """comment on a report"""
         view = views.Report.as_view()
         request = self.factory.post("", {"note": "hi"})
         request.user = self.local_user
@@ -83,7 +83,7 @@ class ReportViews(TestCase):
         self.assertEqual(comment.report, report)
 
     def test_make_report(self):
-        """ a user reports another user """
+        """a user reports another user"""
         form = forms.ReportForm()
         form.data["reporter"] = self.local_user.id
         form.data["user"] = self.rat.id
@@ -97,7 +97,7 @@ class ReportViews(TestCase):
         self.assertEqual(report.user, self.rat)
 
     def test_resolve_report(self):
-        """ toggle report resolution status """
+        """toggle report resolution status"""
         report = models.Report.objects.create(reporter=self.local_user, user=self.rat)
         self.assertFalse(report.resolved)
         request = self.factory.post("")
@@ -115,7 +115,7 @@ class ReportViews(TestCase):
         self.assertFalse(report.resolved)
 
     def test_suspend_user(self):
-        """ toggle whether a user is able to log in """
+        """toggle whether a user is able to log in"""
         self.assertTrue(self.rat.is_active)
         request = self.factory.post("")
         request.user = self.local_user
diff --git a/bookwyrm/tests/views/test_rss_feed.py b/bookwyrm/tests/views/test_rss_feed.py
index 0230b4a9..eacb3c93 100644
--- a/bookwyrm/tests/views/test_rss_feed.py
+++ b/bookwyrm/tests/views/test_rss_feed.py
@@ -8,10 +8,10 @@ from bookwyrm.views import rss_feed
 
 
 class RssFeedView(TestCase):
-    """ rss feed behaves as expected """
+    """rss feed behaves as expected"""
 
     def setUp(self):
-        """ test data """
+        """test data"""
         self.site = models.SiteSettings.objects.create()
 
         self.user = models.User.objects.create_user(
@@ -50,7 +50,7 @@ class RssFeedView(TestCase):
 
     @patch("bookwyrm.activitystreams.ActivityStream.get_activity_stream")
     def test_rss_feed(self, _):
-        """ load an rss feed """
+        """load an rss feed"""
         view = rss_feed.RssFeed()
         request = self.factory.get("/user/rss_user/rss")
         request.user = self.user
diff --git a/bookwyrm/tests/views/test_search.py b/bookwyrm/tests/views/test_search.py
index 78c7a103..77727522 100644
--- a/bookwyrm/tests/views/test_search.py
+++ b/bookwyrm/tests/views/test_search.py
@@ -13,10 +13,10 @@ from bookwyrm.settings import DOMAIN
 
 
 class ShelfViews(TestCase):
-    """ tag views"""
+    """tag views"""
 
     def setUp(self):
-        """ we need basic test data and mocks """
+        """we need basic test data and mocks"""
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@local.com",
@@ -38,7 +38,7 @@ class ShelfViews(TestCase):
         models.SiteSettings.objects.create()
 
     def test_search_json_response(self):
-        """ searches local data only and returns book data in json format """
+        """searches local data only and returns book data in json format"""
         view = views.Search.as_view()
         # we need a connector for this, sorry
         request = self.factory.get("", {"q": "Test Book"})
@@ -53,11 +53,11 @@ class ShelfViews(TestCase):
         self.assertEqual(data[0]["key"], "https://%s/book/%d" % (DOMAIN, self.book.id))
 
     def test_search_html_response(self):
-        """ searches remote connectors """
+        """searches remote connectors"""
         view = views.Search.as_view()
 
         class TestConnector(abstract_connector.AbstractMinimalConnector):
-            """ nothing added here """
+            """nothing added here"""
 
             def format_search_result(self, search_result):
                 pass
@@ -106,7 +106,7 @@ class ShelfViews(TestCase):
         )
 
     def test_search_html_response_users(self):
-        """ searches remote connectors """
+        """searches remote connectors"""
         view = views.Search.as_view()
         request = self.factory.get("", {"q": "mouse"})
         request.user = self.local_user
diff --git a/bookwyrm/tests/views/test_shelf.py b/bookwyrm/tests/views/test_shelf.py
index 7ab01562..239b3318 100644
--- a/bookwyrm/tests/views/test_shelf.py
+++ b/bookwyrm/tests/views/test_shelf.py
@@ -11,10 +11,10 @@ from bookwyrm.activitypub import ActivitypubResponse
 
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 class ShelfViews(TestCase):
-    """ tag views"""
+    """tag views"""
 
     def setUp(self):
-        """ we need basic test data and mocks """
+        """we need basic test data and mocks"""
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@local.com",
@@ -37,7 +37,7 @@ class ShelfViews(TestCase):
         models.SiteSettings.objects.create()
 
     def test_shelf_page(self, _):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.Shelf.as_view()
         shelf = self.local_user.shelf_set.first()
         request = self.factory.get("")
@@ -64,7 +64,7 @@ class ShelfViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_edit_shelf_privacy(self, _):
-        """ set name or privacy on shelf """
+        """set name or privacy on shelf"""
         view = views.Shelf.as_view()
         shelf = self.local_user.shelf_set.get(identifier="to-read")
         self.assertEqual(shelf.privacy, "public")
@@ -84,7 +84,7 @@ class ShelfViews(TestCase):
         self.assertEqual(shelf.privacy, "unlisted")
 
     def test_edit_shelf_name(self, _):
-        """ change the name of an editable shelf """
+        """change the name of an editable shelf"""
         view = views.Shelf.as_view()
         shelf = models.Shelf.objects.create(name="Test Shelf", user=self.local_user)
         self.assertEqual(shelf.privacy, "public")
@@ -101,7 +101,7 @@ class ShelfViews(TestCase):
         self.assertEqual(shelf.identifier, "testshelf-%d" % shelf.id)
 
     def test_edit_shelf_name_not_editable(self, _):
-        """ can't change the name of an non-editable shelf """
+        """can't change the name of an non-editable shelf"""
         view = views.Shelf.as_view()
         shelf = self.local_user.shelf_set.get(identifier="to-read")
         self.assertEqual(shelf.privacy, "public")
@@ -116,7 +116,7 @@ class ShelfViews(TestCase):
         self.assertEqual(shelf.name, "To Read")
 
     def test_handle_shelve(self, _):
-        """ shelve a book """
+        """shelve a book"""
         request = self.factory.post(
             "", {"book": self.book.id, "shelf": self.shelf.identifier}
         )
@@ -134,7 +134,7 @@ class ShelfViews(TestCase):
         self.assertEqual(self.shelf.books.get(), self.book)
 
     def test_handle_shelve_to_read(self, _):
-        """ special behavior for the to-read shelf """
+        """special behavior for the to-read shelf"""
         shelf = models.Shelf.objects.get(identifier="to-read")
         request = self.factory.post(
             "", {"book": self.book.id, "shelf": shelf.identifier}
@@ -147,7 +147,7 @@ class ShelfViews(TestCase):
         self.assertEqual(shelf.books.get(), self.book)
 
     def test_handle_shelve_reading(self, _):
-        """ special behavior for the reading shelf """
+        """special behavior for the reading shelf"""
         shelf = models.Shelf.objects.get(identifier="reading")
         request = self.factory.post(
             "", {"book": self.book.id, "shelf": shelf.identifier}
@@ -160,7 +160,7 @@ class ShelfViews(TestCase):
         self.assertEqual(shelf.books.get(), self.book)
 
     def test_handle_shelve_read(self, _):
-        """ special behavior for the read shelf """
+        """special behavior for the read shelf"""
         shelf = models.Shelf.objects.get(identifier="read")
         request = self.factory.post(
             "", {"book": self.book.id, "shelf": shelf.identifier}
@@ -173,7 +173,7 @@ class ShelfViews(TestCase):
         self.assertEqual(shelf.books.get(), self.book)
 
     def test_handle_unshelve(self, _):
-        """ remove a book from a shelf """
+        """remove a book from a shelf"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             models.ShelfBook.objects.create(
                 book=self.book, user=self.local_user, shelf=self.shelf
diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py
index 5eb13b6b..6f2fd30d 100644
--- a/bookwyrm/tests/views/test_status.py
+++ b/bookwyrm/tests/views/test_status.py
@@ -10,10 +10,10 @@ from bookwyrm.settings import DOMAIN
 
 @patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay")
 class StatusViews(TestCase):
-    """ viewing and creating statuses """
+    """viewing and creating statuses"""
 
     def setUp(self):
-        """ we need basic test data and mocks """
+        """we need basic test data and mocks"""
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@local.com",
@@ -43,7 +43,7 @@ class StatusViews(TestCase):
         models.SiteSettings.objects.create()
 
     def test_handle_status(self, _):
-        """ create a status """
+        """create a status"""
         view = views.CreateStatus.as_view()
         form = forms.CommentForm(
             {
@@ -66,7 +66,7 @@ class StatusViews(TestCase):
         self.assertEqual(status.book, self.book)
 
     def test_handle_status_reply(self, _):
-        """ create a status in reply to an existing status """
+        """create a status in reply to an existing status"""
         view = views.CreateStatus.as_view()
         user = models.User.objects.create_user(
             "rat", "rat@rat.com", "password", local=True
@@ -96,7 +96,7 @@ class StatusViews(TestCase):
         self.assertEqual(models.Notification.objects.get().user, self.local_user)
 
     def test_handle_status_mentions(self, _):
-        """ @mention a user in a post """
+        """@mention a user in a post"""
         view = views.CreateStatus.as_view()
         user = models.User.objects.create_user(
             "rat@%s" % DOMAIN, "rat@rat.com", "password", local=True, localname="rat"
@@ -124,7 +124,7 @@ class StatusViews(TestCase):
         )
 
     def test_handle_status_reply_with_mentions(self, _):
-        """ reply to a post with an @mention'ed user """
+        """reply to a post with an @mention'ed user"""
         view = views.CreateStatus.as_view()
         user = models.User.objects.create_user(
             "rat", "rat@rat.com", "password", local=True, localname="rat"
@@ -168,7 +168,7 @@ class StatusViews(TestCase):
         self.assertTrue(self.local_user in reply.mention_users.all())
 
     def test_delete_and_redraft(self, _):
-        """ delete and re-draft a status """
+        """delete and re-draft a status"""
         view = views.DeleteAndRedraft.as_view()
         request = self.factory.post("")
         request.user = self.local_user
@@ -189,7 +189,7 @@ class StatusViews(TestCase):
         self.assertTrue(status.deleted)
 
     def test_delete_and_redraft_invalid_status_type_rating(self, _):
-        """ you can't redraft generated statuses """
+        """you can't redraft generated statuses"""
         view = views.DeleteAndRedraft.as_view()
         request = self.factory.post("")
         request.user = self.local_user
@@ -209,7 +209,7 @@ class StatusViews(TestCase):
         self.assertFalse(status.deleted)
 
     def test_delete_and_redraft_invalid_status_type_generated_note(self, _):
-        """ you can't redraft generated statuses """
+        """you can't redraft generated statuses"""
         view = views.DeleteAndRedraft.as_view()
         request = self.factory.post("")
         request.user = self.local_user
@@ -229,7 +229,7 @@ class StatusViews(TestCase):
         self.assertFalse(status.deleted)
 
     def test_find_mentions(self, _):
-        """ detect and look up @ mentions of users """
+        """detect and look up @ mentions of users"""
         user = models.User.objects.create_user(
             "nutria@%s" % DOMAIN,
             "nutria@nutria.com",
@@ -275,7 +275,7 @@ class StatusViews(TestCase):
         )
 
     def test_format_links(self, _):
-        """ find and format urls into a tags """
+        """find and format urls into a tags"""
         url = "http://www.fish.com/"
         self.assertEqual(
             views.status.format_links(url), '<a href="%s">www.fish.com/</a>' % url
@@ -298,7 +298,7 @@ class StatusViews(TestCase):
         )
 
     def test_to_markdown(self, _):
-        """ this is mostly handled in other places, but nonetheless """
+        """this is mostly handled in other places, but nonetheless"""
         text = "_hi_ and http://fish.com is <marquee>rad</marquee>"
         result = views.status.to_markdown(text)
         self.assertEqual(
@@ -307,13 +307,13 @@ class StatusViews(TestCase):
         )
 
     def test_to_markdown_link(self, _):
-        """ this is mostly handled in other places, but nonetheless """
+        """this is mostly handled in other places, but nonetheless"""
         text = "[hi](http://fish.com) is <marquee>rad</marquee>"
         result = views.status.to_markdown(text)
         self.assertEqual(result, '<p><a href="http://fish.com">hi</a> ' "is rad</p>")
 
     def test_handle_delete_status(self, mock):
-        """ marks a status as deleted """
+        """marks a status as deleted"""
         view = views.DeleteStatus.as_view()
         with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
             status = models.Status.objects.create(user=self.local_user, content="hi")
@@ -333,7 +333,7 @@ class StatusViews(TestCase):
         self.assertTrue(status.deleted)
 
     def test_handle_delete_status_permission_denied(self, _):
-        """ marks a status as deleted """
+        """marks a status as deleted"""
         view = views.DeleteStatus.as_view()
         with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
             status = models.Status.objects.create(user=self.local_user, content="hi")
@@ -347,7 +347,7 @@ class StatusViews(TestCase):
         self.assertFalse(status.deleted)
 
     def test_handle_delete_status_moderator(self, mock):
-        """ marks a status as deleted """
+        """marks a status as deleted"""
         view = views.DeleteStatus.as_view()
         with patch("bookwyrm.activitystreams.ActivityStream.add_status"):
             status = models.Status.objects.create(user=self.local_user, content="hi")
diff --git a/bookwyrm/tests/views/test_updates.py b/bookwyrm/tests/views/test_updates.py
index dff730e6..fb003f8d 100644
--- a/bookwyrm/tests/views/test_updates.py
+++ b/bookwyrm/tests/views/test_updates.py
@@ -10,10 +10,10 @@ from bookwyrm import models, views
 
 
 class UpdateViews(TestCase):
-    """ lets the ui check for unread notification """
+    """lets the ui check for unread notification"""
 
     def setUp(self):
-        """ we need basic test data and mocks """
+        """we need basic test data and mocks"""
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@local.com",
@@ -25,7 +25,7 @@ class UpdateViews(TestCase):
         models.SiteSettings.objects.create()
 
     def test_get_notification_count(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         request = self.factory.get("")
         request.user = self.local_user
 
@@ -43,7 +43,7 @@ class UpdateViews(TestCase):
         self.assertEqual(data["count"], 1)
 
     def test_get_unread_status_count(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         request = self.factory.get("")
         request.user = self.local_user
 
diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py
index 7518b2bf..3b431de1 100644
--- a/bookwyrm/tests/views/test_user.py
+++ b/bookwyrm/tests/views/test_user.py
@@ -15,10 +15,10 @@ from bookwyrm.activitypub import ActivitypubResponse
 
 
 class UserViews(TestCase):
-    """ view user and edit profile """
+    """view user and edit profile"""
 
     def setUp(self):
-        """ we need basic test data and mocks """
+        """we need basic test data and mocks"""
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@local.com",
@@ -43,7 +43,7 @@ class UserViews(TestCase):
         self.anonymous_user.is_authenticated = False
 
     def test_user_page(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.User.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -69,7 +69,7 @@ class UserViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_user_page_blocked(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.User.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -80,7 +80,7 @@ class UserViews(TestCase):
         self.assertEqual(result.status_code, 404)
 
     def test_followers_page(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.Followers.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -98,7 +98,7 @@ class UserViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_followers_page_blocked(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.Followers.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -109,7 +109,7 @@ class UserViews(TestCase):
         self.assertEqual(result.status_code, 404)
 
     def test_following_page(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.Following.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -127,7 +127,7 @@ class UserViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_following_page_blocked(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.Following.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -138,7 +138,7 @@ class UserViews(TestCase):
         self.assertEqual(result.status_code, 404)
 
     def test_edit_user_page(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.EditUser.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -148,7 +148,7 @@ class UserViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_edit_user(self):
-        """ use a form to update a user """
+        """use a form to update a user"""
         view = views.EditUser.as_view()
         form = forms.EditUserForm(instance=self.local_user)
         form.data["name"] = "New Name"
@@ -168,7 +168,7 @@ class UserViews(TestCase):
 
     # idk how to mock the upload form, got tired of triyng to make it work
     def test_edit_user_avatar(self):
-        """ use a form to update a user """
+        """use a form to update a user"""
         view = views.EditUser.as_view()
         form = forms.EditUserForm(instance=self.local_user)
         form.data["name"] = "New Name"
@@ -195,7 +195,7 @@ class UserViews(TestCase):
         self.assertEqual(self.local_user.avatar.height, 120)
 
     def test_crop_avatar(self):
-        """ reduce that image size """
+        """reduce that image size"""
         image_file = pathlib.Path(__file__).parent.joinpath(
             "../../static/images/no_cover.jpg"
         )
diff --git a/bookwyrm/tests/views/test_user_admin.py b/bookwyrm/tests/views/test_user_admin.py
index b1e9d639..a044a22c 100644
--- a/bookwyrm/tests/views/test_user_admin.py
+++ b/bookwyrm/tests/views/test_user_admin.py
@@ -9,10 +9,10 @@ from bookwyrm import models, views
 
 
 class UserAdminViews(TestCase):
-    """ every response to a get request, html or json """
+    """every response to a get request, html or json"""
 
     def setUp(self):
-        """ we need basic test data and mocks """
+        """we need basic test data and mocks"""
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@local.com",
@@ -24,7 +24,7 @@ class UserAdminViews(TestCase):
         models.SiteSettings.objects.create()
 
     def test_user_admin_list_page(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.UserAdminList.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -35,7 +35,7 @@ class UserAdminViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_user_admin_page(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         view = views.UserAdmin.as_view()
         request = self.factory.get("")
         request.user = self.local_user
@@ -48,7 +48,7 @@ class UserAdminViews(TestCase):
         self.assertEqual(result.status_code, 200)
 
     def test_user_admin_page_post(self):
-        """ set the user's group """
+        """set the user's group"""
         group = Group.objects.create(name="editor")
         self.assertEqual(
             list(self.local_user.groups.values_list("name", flat=True)), []
diff --git a/bookwyrm/tests/views/test_wellknown.py b/bookwyrm/tests/views/test_wellknown.py
index f408460f..244921d4 100644
--- a/bookwyrm/tests/views/test_wellknown.py
+++ b/bookwyrm/tests/views/test_wellknown.py
@@ -11,10 +11,10 @@ from bookwyrm import models, views
 
 
 class UserViews(TestCase):
-    """ view user and edit profile """
+    """view user and edit profile"""
 
     def setUp(self):
-        """ we need basic test data and mocks """
+        """we need basic test data and mocks"""
         self.factory = RequestFactory()
         self.local_user = models.User.objects.create_user(
             "mouse@local.com",
@@ -41,7 +41,7 @@ class UserViews(TestCase):
         self.anonymous_user.is_authenticated = False
 
     def test_webfinger(self):
-        """ there are so many views, this just makes sure it LOADS """
+        """there are so many views, this just makes sure it LOADS"""
         request = self.factory.get("", {"resource": "acct:mouse@local.com"})
         request.user = self.anonymous_user
 
@@ -51,7 +51,7 @@ class UserViews(TestCase):
         self.assertEqual(data["subject"], "acct:mouse@local.com")
 
     def test_nodeinfo_pointer(self):
-        """ just tells you where nodeinfo is """
+        """just tells you where nodeinfo is"""
         request = self.factory.get("")
         request.user = self.anonymous_user
 
@@ -61,7 +61,7 @@ class UserViews(TestCase):
         self.assertTrue("href" in data["links"][0])
 
     def test_nodeinfo(self):
-        """ info about the instance """
+        """info about the instance"""
         request = self.factory.get("")
         request.user = self.anonymous_user
 
@@ -73,7 +73,7 @@ class UserViews(TestCase):
         self.assertEqual(models.User.objects.count(), 3)
 
     def test_instanceinfo(self):
-        """ about the instance's user activity """
+        """about the instance's user activity"""
         request = self.factory.get("")
         request.user = self.anonymous_user
 
diff --git a/bookwyrm/views/authentication.py b/bookwyrm/views/authentication.py
index 22689a28..bfb49248 100644
--- a/bookwyrm/views/authentication.py
+++ b/bookwyrm/views/authentication.py
@@ -16,10 +16,10 @@ from bookwyrm.settings import DOMAIN
 # pylint: disable= no-self-use
 @method_decorator(csrf_exempt, name="dispatch")
 class Login(View):
-    """ authenticate an existing user """
+    """authenticate an existing user"""
 
     def get(self, request):
-        """ login page """
+        """login page"""
         if request.user.is_authenticated:
             return redirect("/")
         # sene user to the login page
@@ -30,7 +30,7 @@ class Login(View):
         return TemplateResponse(request, "login.html", data)
 
     def post(self, request):
-        """ authentication action """
+        """authentication action"""
         if request.user.is_authenticated:
             return redirect("/")
         login_form = forms.LoginForm(request.POST)
@@ -61,10 +61,10 @@ class Login(View):
 
 
 class Register(View):
-    """ register a user """
+    """register a user"""
 
     def post(self, request):
-        """ join the server """
+        """join the server"""
         if not models.SiteSettings.get().allow_registration:
             invite_code = request.POST.get("invite_code")
 
@@ -117,9 +117,9 @@ class Register(View):
 
 @method_decorator(login_required, name="dispatch")
 class Logout(View):
-    """ log out """
+    """log out"""
 
     def get(self, request):
-        """ done with this place! outa here! """
+        """done with this place! outa here!"""
         logout(request)
         return redirect("/")
diff --git a/bookwyrm/views/author.py b/bookwyrm/views/author.py
index 50a3588d..0bd7b0e0 100644
--- a/bookwyrm/views/author.py
+++ b/bookwyrm/views/author.py
@@ -13,10 +13,10 @@ from .helpers import is_api_request
 
 # pylint: disable= no-self-use
 class Author(View):
-    """ this person wrote a book """
+    """this person wrote a book"""
 
     def get(self, request, author_id):
-        """ landing page for an author """
+        """landing page for an author"""
         author = get_object_or_404(models.Author, id=author_id)
 
         if is_api_request(request):
@@ -37,16 +37,16 @@ class Author(View):
     permission_required("bookwyrm.edit_book", raise_exception=True), name="dispatch"
 )
 class EditAuthor(View):
-    """ edit author info """
+    """edit author info"""
 
     def get(self, request, author_id):
-        """ info about a book """
+        """info about a book"""
         author = get_object_or_404(models.Author, id=author_id)
         data = {"author": author, "form": forms.AuthorForm(instance=author)}
         return TemplateResponse(request, "edit_author.html", data)
 
     def post(self, request, author_id):
-        """ edit a author cool """
+        """edit a author cool"""
         author = get_object_or_404(models.Author, id=author_id)
 
         form = forms.AuthorForm(request.POST, request.FILES, instance=author)
diff --git a/bookwyrm/views/block.py b/bookwyrm/views/block.py
index 6d6a8a58..99014a93 100644
--- a/bookwyrm/views/block.py
+++ b/bookwyrm/views/block.py
@@ -12,14 +12,14 @@ from bookwyrm import models
 # pylint: disable= no-self-use
 @method_decorator(login_required, name="dispatch")
 class Block(View):
-    """ blocking users """
+    """blocking users"""
 
     def get(self, request):
-        """ list of blocked users? """
+        """list of blocked users?"""
         return TemplateResponse(request, "preferences/blocks.html")
 
     def post(self, request, user_id):
-        """ block a user """
+        """block a user"""
         to_block = get_object_or_404(models.User, id=user_id)
         models.UserBlocks.objects.create(
             user_subject=request.user, user_object=to_block
@@ -30,7 +30,7 @@ class Block(View):
 @require_POST
 @login_required
 def unblock(request, user_id):
-    """ undo a block """
+    """undo a block"""
     to_unblock = get_object_or_404(models.User, id=user_id)
     try:
         block = models.UserBlocks.objects.get(
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 829408a8..448cf992 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -26,10 +26,10 @@ from .helpers import is_api_request, get_edition, privacy_filter
 
 # pylint: disable= no-self-use
 class Book(View):
-    """ a book! this is the stuff """
+    """a book! this is the stuff"""
 
     def get(self, request, book_id, user_statuses=False):
-        """ info about a book """
+        """info about a book"""
         try:
             book = models.Book.objects.select_subclasses().get(id=book_id)
         except models.Book.DoesNotExist:
@@ -110,10 +110,10 @@ class Book(View):
     permission_required("bookwyrm.edit_book", raise_exception=True), name="dispatch"
 )
 class EditBook(View):
-    """ edit a book """
+    """edit a book"""
 
     def get(self, request, book_id=None):
-        """ info about a book """
+        """info about a book"""
         book = None
         if book_id:
             book = get_edition(book_id)
@@ -123,7 +123,7 @@ class EditBook(View):
         return TemplateResponse(request, "book/edit_book.html", data)
 
     def post(self, request, book_id=None):
-        """ edit a book cool """
+        """edit a book cool"""
         # returns None if no match is found
         book = models.Edition.objects.filter(id=book_id).first()
         form = forms.EditionForm(request.POST, request.FILES, instance=book)
@@ -209,10 +209,10 @@ class EditBook(View):
     permission_required("bookwyrm.edit_book", raise_exception=True), name="dispatch"
 )
 class ConfirmEditBook(View):
-    """ confirm edits to a book """
+    """confirm edits to a book"""
 
     def post(self, request, book_id=None):
-        """ edit a book cool """
+        """edit a book cool"""
         # returns None if no match is found
         book = models.Edition.objects.filter(id=book_id).first()
         form = forms.EditionForm(request.POST, request.FILES, instance=book)
@@ -260,10 +260,10 @@ class ConfirmEditBook(View):
 
 
 class Editions(View):
-    """ list of editions """
+    """list of editions"""
 
     def get(self, request, book_id):
-        """ list of editions of a book """
+        """list of editions of a book"""
         work = get_object_or_404(models.Work, id=book_id)
 
         if is_api_request(request):
@@ -293,7 +293,7 @@ class Editions(View):
 @login_required
 @require_POST
 def upload_cover(request, book_id):
-    """ upload a new cover """
+    """upload a new cover"""
     book = get_object_or_404(models.Edition, id=book_id)
     book.last_edited_by = request.user
 
@@ -316,7 +316,7 @@ def upload_cover(request, book_id):
 
 
 def set_cover_from_url(url):
-    """ load it from a url """
+    """load it from a url"""
     image_file = get_image(url)
     if not image_file:
         return None
@@ -329,7 +329,7 @@ def set_cover_from_url(url):
 @require_POST
 @permission_required("bookwyrm.edit_book", raise_exception=True)
 def add_description(request, book_id):
-    """ upload a new cover """
+    """upload a new cover"""
     if not request.method == "POST":
         return redirect("/")
 
@@ -346,7 +346,7 @@ def add_description(request, book_id):
 
 @require_POST
 def resolve_book(request):
-    """ figure out the local path to a book from a remote_id """
+    """figure out the local path to a book from a remote_id"""
     remote_id = request.POST.get("remote_id")
     connector = connector_manager.get_or_create_connector(remote_id)
     book = connector.get_or_create_book(remote_id)
@@ -358,7 +358,7 @@ def resolve_book(request):
 @require_POST
 @transaction.atomic
 def switch_edition(request):
-    """ switch your copy of a book to a different edition """
+    """switch your copy of a book to a different edition"""
     edition_id = request.POST.get("edition")
     new_edition = get_object_or_404(models.Edition, id=edition_id)
     shelfbooks = models.ShelfBook.objects.filter(
diff --git a/bookwyrm/views/directory.py b/bookwyrm/views/directory.py
index 7919dac0..a5786f74 100644
--- a/bookwyrm/views/directory.py
+++ b/bookwyrm/views/directory.py
@@ -11,10 +11,10 @@ from .helpers import get_annotated_users
 # pylint: disable=no-self-use
 @method_decorator(login_required, name="dispatch")
 class Directory(View):
-    """ display of known bookwyrm users """
+    """display of known bookwyrm users"""
 
     def get(self, request):
-        """ lets see your cute faces """
+        """lets see your cute faces"""
         filters = {}
         software = request.GET.get("software")
         if not software or software == "bookwyrm":
@@ -38,7 +38,7 @@ class Directory(View):
         return TemplateResponse(request, "directory/directory.html", data)
 
     def post(self, request):
-        """ join the directory """
+        """join the directory"""
         request.user.discoverable = True
         request.user.save()
         return redirect("directory")
diff --git a/bookwyrm/views/federation.py b/bookwyrm/views/federation.py
index 1acacf8f..d4a1af12 100644
--- a/bookwyrm/views/federation.py
+++ b/bookwyrm/views/federation.py
@@ -20,10 +20,10 @@ from bookwyrm.settings import PAGE_LENGTH
     name="dispatch",
 )
 class Federation(View):
-    """ what servers do we federate with """
+    """what servers do we federate with"""
 
     def get(self, request):
-        """ list of servers """
+        """list of servers"""
         servers = models.FederatedServer.objects
 
         sort = request.GET.get("sort")
@@ -43,15 +43,15 @@ class Federation(View):
 
 
 class AddFederatedServer(View):
-    """ manually add a server """
+    """manually add a server"""
 
     def get(self, request):
-        """ add server form """
+        """add server form"""
         data = {"form": forms.ServerForm()}
         return TemplateResponse(request, "settings/edit_server.html", data)
 
     def post(self, request):
-        """ add a server from the admin panel """
+        """add a server from the admin panel"""
         form = forms.ServerForm(request.POST)
         if not form.is_valid():
             data = {"form": form}
@@ -66,14 +66,14 @@ class AddFederatedServer(View):
     name="dispatch",
 )
 class ImportServerBlocklist(View):
-    """ manually add a server """
+    """manually add a server"""
 
     def get(self, request):
-        """ add server form """
+        """add server form"""
         return TemplateResponse(request, "settings/server_blocklist.html")
 
     def post(self, request):
-        """ add a server from the admin panel """
+        """add a server from the admin panel"""
         json_data = json.load(request.FILES["json_file"])
         failed = []
         success_count = 0
@@ -102,10 +102,10 @@ class ImportServerBlocklist(View):
     name="dispatch",
 )
 class FederatedServer(View):
-    """ views for handling a specific federated server """
+    """views for handling a specific federated server"""
 
     def get(self, request, server):
-        """ load a server """
+        """load a server"""
         server = get_object_or_404(models.FederatedServer, id=server)
         users = server.user_set
         data = {
@@ -121,7 +121,7 @@ class FederatedServer(View):
         return TemplateResponse(request, "settings/federated_server.html", data)
 
     def post(self, request, server):  # pylint: disable=unused-argument
-        """ update note """
+        """update note"""
         server = get_object_or_404(models.FederatedServer, id=server)
         server.notes = request.POST.get("notes")
         server.save()
@@ -133,7 +133,7 @@ class FederatedServer(View):
 @permission_required("bookwyrm.control_federation", raise_exception=True)
 # pylint: disable=unused-argument
 def block_server(request, server):
-    """ block a server """
+    """block a server"""
     server = get_object_or_404(models.FederatedServer, id=server)
     server.block()
     return redirect("settings-federated-server", server.id)
@@ -144,7 +144,7 @@ def block_server(request, server):
 @permission_required("bookwyrm.control_federation", raise_exception=True)
 # pylint: disable=unused-argument
 def unblock_server(request, server):
-    """ unblock a server """
+    """unblock a server"""
     server = get_object_or_404(models.FederatedServer, id=server)
     server.unblock()
     return redirect("settings-federated-server", server.id)
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index 118473d0..98f365ea 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -18,10 +18,10 @@ from .helpers import is_api_request, is_bookwyrm_request
 # pylint: disable= no-self-use
 @method_decorator(login_required, name="dispatch")
 class Feed(View):
-    """ activity stream """
+    """activity stream"""
 
     def get(self, request, tab):
-        """ user's homepage with activity feed """
+        """user's homepage with activity feed"""
         if not tab in STREAMS:
             tab = "home"
 
@@ -46,10 +46,10 @@ class Feed(View):
 
 @method_decorator(login_required, name="dispatch")
 class DirectMessage(View):
-    """ dm view """
+    """dm view"""
 
     def get(self, request, username=None):
-        """ like a feed but for dms only """
+        """like a feed but for dms only"""
         # remove fancy subclasses of status, keep just good ol' notes
         queryset = models.Status.objects.filter(
             review__isnull=True,
@@ -85,10 +85,10 @@ class DirectMessage(View):
 
 
 class Status(View):
-    """ get posting """
+    """get posting"""
 
     def get(self, request, username, status_id):
-        """ display a particular status (and replies, etc) """
+        """display a particular status (and replies, etc)"""
         try:
             user = get_user_from_username(request.user, username)
             status = models.Status.objects.select_subclasses().get(
@@ -120,10 +120,10 @@ class Status(View):
 
 
 class Replies(View):
-    """ replies page (a json view of status) """
+    """replies page (a json view of status)"""
 
     def get(self, request, username, status_id):
-        """ ordered collection of replies to a status """
+        """ordered collection of replies to a status"""
         # the html view is the same as Status
         if not is_api_request(request):
             status_view = Status.as_view()
@@ -138,7 +138,7 @@ class Replies(View):
 
 
 def feed_page_data(user):
-    """ info we need for every feed page """
+    """info we need for every feed page"""
     if not user.is_authenticated:
         return {}
 
@@ -151,7 +151,7 @@ def feed_page_data(user):
 
 
 def get_suggested_books(user, max_books=5):
-    """ helper to get a user's recent books """
+    """helper to get a user's recent books"""
     book_count = 0
     preset_shelves = [("reading", max_books), ("read", 2), ("to-read", max_books)]
     suggested_books = []
diff --git a/bookwyrm/views/follow.py b/bookwyrm/views/follow.py
index d9f455eb..09c2d53a 100644
--- a/bookwyrm/views/follow.py
+++ b/bookwyrm/views/follow.py
@@ -12,7 +12,7 @@ from .helpers import get_user_from_username
 @login_required
 @require_POST
 def follow(request):
-    """ follow another user, here or abroad """
+    """follow another user, here or abroad"""
     username = request.POST["user"]
     try:
         to_follow = get_user_from_username(request.user, username)
@@ -33,7 +33,7 @@ def follow(request):
 @login_required
 @require_POST
 def unfollow(request):
-    """ unfollow a user """
+    """unfollow a user"""
     username = request.POST["user"]
     try:
         to_unfollow = get_user_from_username(request.user, username)
@@ -61,7 +61,7 @@ def unfollow(request):
 @login_required
 @require_POST
 def accept_follow_request(request):
-    """ a user accepts a follow request """
+    """a user accepts a follow request"""
     username = request.POST["user"]
     try:
         requester = get_user_from_username(request.user, username)
@@ -83,7 +83,7 @@ def accept_follow_request(request):
 @login_required
 @require_POST
 def delete_follow_request(request):
-    """ a user rejects a follow request """
+    """a user rejects a follow request"""
     username = request.POST["user"]
     try:
         requester = get_user_from_username(request.user, username)
diff --git a/bookwyrm/views/get_started.py b/bookwyrm/views/get_started.py
index a21723a3..5573bf19 100644
--- a/bookwyrm/views/get_started.py
+++ b/bookwyrm/views/get_started.py
@@ -20,12 +20,12 @@ from .user import save_user_form
 # pylint: disable= no-self-use
 @method_decorator(login_required, name="dispatch")
 class GetStartedProfile(View):
-    """ tell us about yourself """
+    """tell us about yourself"""
 
     next_view = "get-started-books"
 
     def get(self, request):
-        """ basic profile info """
+        """basic profile info"""
         data = {
             "form": forms.LimitedEditUserForm(instance=request.user),
             "next": self.next_view,
@@ -33,7 +33,7 @@ class GetStartedProfile(View):
         return TemplateResponse(request, "get_started/profile.html", data)
 
     def post(self, request):
-        """ update your profile """
+        """update your profile"""
         form = forms.LimitedEditUserForm(
             request.POST, request.FILES, instance=request.user
         )
@@ -46,12 +46,12 @@ class GetStartedProfile(View):
 
 @method_decorator(login_required, name="dispatch")
 class GetStartedBooks(View):
-    """ name a book, any book, we gotta start somewhere """
+    """name a book, any book, we gotta start somewhere"""
 
     next_view = "get-started-users"
 
     def get(self, request):
-        """ info about a book """
+        """info about a book"""
         query = request.GET.get("query")
         book_results = popular_books = []
         if query:
@@ -82,7 +82,7 @@ class GetStartedBooks(View):
         return TemplateResponse(request, "get_started/books.html", data)
 
     def post(self, request):
-        """ shelve some books """
+        """shelve some books"""
         shelve_actions = [
             (k, v)
             for k, v in request.POST.items()
@@ -100,10 +100,10 @@ class GetStartedBooks(View):
 
 @method_decorator(login_required, name="dispatch")
 class GetStartedUsers(View):
-    """ find friends """
+    """find friends"""
 
     def get(self, request):
-        """ basic profile info """
+        """basic profile info"""
         query = request.GET.get("query")
         user_results = (
             models.User.viewer_aware_objects(request.user)
diff --git a/bookwyrm/views/goal.py b/bookwyrm/views/goal.py
index 1627d3da..84091fe3 100644
--- a/bookwyrm/views/goal.py
+++ b/bookwyrm/views/goal.py
@@ -16,10 +16,10 @@ from .helpers import get_user_from_username
 # pylint: disable= no-self-use
 @method_decorator(login_required, name="dispatch")
 class Goal(View):
-    """ track books for the year """
+    """track books for the year"""
 
     def get(self, request, username, year):
-        """ reading goal page """
+        """reading goal page"""
         user = get_user_from_username(request.user, username)
         year = int(year)
         goal = models.AnnualGoal.objects.filter(year=year, user=user).first()
@@ -39,7 +39,7 @@ class Goal(View):
         return TemplateResponse(request, "goal.html", data)
 
     def post(self, request, username, year):
-        """ update or create an annual goal """
+        """update or create an annual goal"""
         user = get_user_from_username(request.user, username)
         if user != request.user:
             return HttpResponseNotFound()
@@ -71,7 +71,7 @@ class Goal(View):
 @require_POST
 @login_required
 def hide_goal(request):
-    """ don't keep bugging people to set a goal """
+    """don't keep bugging people to set a goal"""
     request.user.show_goal = False
     request.user.save(broadcast=False)
     return redirect(request.headers.get("Referer", "/"))
diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index 57c33437..8a60b54c 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -11,7 +11,7 @@ from bookwyrm.utils import regex
 
 
 def get_user_from_username(viewer, username):
-    """ helper function to resolve a localname or a username to a user """
+    """helper function to resolve a localname or a username to a user"""
     # raises DoesNotExist if user is now found
     try:
         return models.User.viewer_aware_objects(viewer).get(localname=username)
@@ -20,12 +20,12 @@ def get_user_from_username(viewer, username):
 
 
 def is_api_request(request):
-    """ check whether a request is asking for html or data """
+    """check whether a request is asking for html or data"""
     return "json" in request.headers.get("Accept", "") or request.path[-5:] == ".json"
 
 
 def is_bookwyrm_request(request):
-    """ check if the request is coming from another bookwyrm instance """
+    """check if the request is coming from another bookwyrm instance"""
     user_agent = request.headers.get("User-Agent")
     if user_agent is None or re.search(regex.bookwyrm_user_agent, user_agent) is None:
         return False
@@ -33,7 +33,7 @@ def is_bookwyrm_request(request):
 
 
 def privacy_filter(viewer, queryset, privacy_levels=None, following_only=False):
-    """ filter objects that have "user" and "privacy" fields """
+    """filter objects that have "user" and "privacy" fields"""
     privacy_levels = privacy_levels or ["public", "unlisted", "followers", "direct"]
     # if there'd a deleted field, exclude deleted items
     try:
@@ -84,7 +84,7 @@ def privacy_filter(viewer, queryset, privacy_levels=None, following_only=False):
 
 
 def handle_remote_webfinger(query):
-    """ webfingerin' other servers """
+    """webfingerin' other servers"""
     user = None
 
     # usernames could be @user@domain or user@domain
@@ -120,7 +120,7 @@ def handle_remote_webfinger(query):
 
 
 def get_edition(book_id):
-    """ look up a book in the db and return an edition """
+    """look up a book in the db and return an edition"""
     book = models.Book.objects.select_subclasses().get(id=book_id)
     if isinstance(book, models.Work):
         book = book.get_default_edition()
@@ -128,7 +128,7 @@ def get_edition(book_id):
 
 
 def handle_reading_status(user, shelf, book, privacy):
-    """ post about a user reading a book """
+    """post about a user reading a book"""
     # tell the world about this cool thing that happened
     try:
         message = {
@@ -145,14 +145,14 @@ def handle_reading_status(user, shelf, book, privacy):
 
 
 def is_blocked(viewer, user):
-    """ is this viewer blocked by the user? """
+    """is this viewer blocked by the user?"""
     if viewer.is_authenticated and viewer in user.blocks.all():
         return True
     return False
 
 
 def get_discover_books():
-    """ list of books for the discover page """
+    """list of books for the discover page"""
     return list(
         set(
             models.Edition.objects.filter(
@@ -169,7 +169,7 @@ def get_discover_books():
 
 
 def get_suggested_users(user):
-    """ bookwyrm users you don't already know """
+    """bookwyrm users you don't already know"""
     return (
         get_annotated_users(
             user,
@@ -184,7 +184,7 @@ def get_suggested_users(user):
 
 
 def get_annotated_users(user, *args, **kwargs):
-    """ Users, annotated with things they have in common """
+    """Users, annotated with things they have in common"""
     return (
         models.User.objects.filter(discoverable=True, is_active=True, *args, **kwargs)
         .exclude(Q(id__in=user.blocks.all()) | Q(blocks=user))
diff --git a/bookwyrm/views/import_data.py b/bookwyrm/views/import_data.py
index 5bdbe915..a2abbc69 100644
--- a/bookwyrm/views/import_data.py
+++ b/bookwyrm/views/import_data.py
@@ -16,10 +16,10 @@ from bookwyrm.tasks import app
 # pylint: disable= no-self-use
 @method_decorator(login_required, name="dispatch")
 class Import(View):
-    """ import view """
+    """import view"""
 
     def get(self, request):
-        """ load import page """
+        """load import page"""
         return TemplateResponse(
             request,
             "import.html",
@@ -32,7 +32,7 @@ class Import(View):
         )
 
     def post(self, request):
-        """ ingest a goodreads csv """
+        """ingest a goodreads csv"""
         form = forms.ImportForm(request.POST, request.FILES)
         if form.is_valid():
             include_reviews = request.POST.get("include_reviews") == "on"
@@ -66,10 +66,10 @@ class Import(View):
 
 @method_decorator(login_required, name="dispatch")
 class ImportStatus(View):
-    """ status of an existing import """
+    """status of an existing import"""
 
     def get(self, request, job_id):
-        """ status of an import job """
+        """status of an import job"""
         job = models.ImportJob.objects.get(id=job_id)
         if job.user != request.user:
             raise PermissionDenied
@@ -84,7 +84,7 @@ class ImportStatus(View):
         )
 
     def post(self, request, job_id):
-        """ retry lines from an import """
+        """retry lines from an import"""
         job = get_object_or_404(models.ImportJob, id=job_id)
         items = []
         for item in request.POST.getlist("import_item"):
diff --git a/bookwyrm/views/inbox.py b/bookwyrm/views/inbox.py
index c701956d..a558c571 100644
--- a/bookwyrm/views/inbox.py
+++ b/bookwyrm/views/inbox.py
@@ -19,10 +19,10 @@ from bookwyrm.utils import regex
 @method_decorator(csrf_exempt, name="dispatch")
 # pylint: disable=no-self-use
 class Inbox(View):
-    """ requests sent by outside servers"""
+    """requests sent by outside servers"""
 
     def post(self, request, username=None):
-        """ only works as POST request """
+        """only works as POST request"""
         # first check if this server is on our shitlist
         if is_blocked_user_agent(request):
             return HttpResponseForbidden()
@@ -65,7 +65,7 @@ class Inbox(View):
 
 
 def is_blocked_user_agent(request):
-    """ check if a request is from a blocked server based on user agent """
+    """check if a request is from a blocked server based on user agent"""
     # check user agent
     user_agent = request.headers.get("User-Agent")
     if not user_agent:
@@ -78,7 +78,7 @@ def is_blocked_user_agent(request):
 
 
 def is_blocked_activity(activity_json):
-    """ get the sender out of activity json and check if it's blocked """
+    """get the sender out of activity json and check if it's blocked"""
     actor = activity_json.get("actor")
 
     # check if the user is banned/deleted
@@ -94,7 +94,7 @@ def is_blocked_activity(activity_json):
 
 @app.task
 def activity_task(activity_json):
-    """ do something with this json we think is legit """
+    """do something with this json we think is legit"""
     # lets see if the activitypub module can make sense of this json
     activity = activitypub.parse(activity_json)
 
@@ -104,7 +104,7 @@ def activity_task(activity_json):
 
 
 def has_valid_signature(request, activity):
-    """ verify incoming signature """
+    """verify incoming signature"""
     try:
         signature = Signature.parse(request)
 
diff --git a/bookwyrm/views/interaction.py b/bookwyrm/views/interaction.py
index e337f2ef..e138e41c 100644
--- a/bookwyrm/views/interaction.py
+++ b/bookwyrm/views/interaction.py
@@ -12,10 +12,10 @@ from bookwyrm import models
 # pylint: disable= no-self-use
 @method_decorator(login_required, name="dispatch")
 class Favorite(View):
-    """ like a status """
+    """like a status"""
 
     def post(self, request, status_id):
-        """ create a like """
+        """create a like"""
         status = models.Status.objects.get(id=status_id)
         try:
             models.Favorite.objects.create(status=status, user=request.user)
@@ -28,10 +28,10 @@ class Favorite(View):
 
 @method_decorator(login_required, name="dispatch")
 class Unfavorite(View):
-    """ take back a fav """
+    """take back a fav"""
 
     def post(self, request, status_id):
-        """ unlike a status """
+        """unlike a status"""
         status = models.Status.objects.get(id=status_id)
         try:
             favorite = models.Favorite.objects.get(status=status, user=request.user)
@@ -45,10 +45,10 @@ class Unfavorite(View):
 
 @method_decorator(login_required, name="dispatch")
 class Boost(View):
-    """ boost a status """
+    """boost a status"""
 
     def post(self, request, status_id):
-        """ boost a status """
+        """boost a status"""
         status = models.Status.objects.get(id=status_id)
         # is it boostable?
         if not status.boostable:
@@ -70,10 +70,10 @@ class Boost(View):
 
 @method_decorator(login_required, name="dispatch")
 class Unboost(View):
-    """ boost a status """
+    """boost a status"""
 
     def post(self, request, status_id):
-        """ boost a status """
+        """boost a status"""
         status = models.Status.objects.get(id=status_id)
         boost = models.Boost.objects.filter(
             boosted_status=status, user=request.user
diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/invite.py
index cbb189b5..92f930f4 100644
--- a/bookwyrm/views/invite.py
+++ b/bookwyrm/views/invite.py
@@ -26,10 +26,10 @@ from . import helpers
     name="dispatch",
 )
 class ManageInvites(View):
-    """ create invites """
+    """create invites"""
 
     def get(self, request):
-        """ invite management page """
+        """invite management page"""
         paginated = Paginator(
             models.SiteInvite.objects.filter(user=request.user).order_by(
                 "-created_date"
@@ -44,7 +44,7 @@ class ManageInvites(View):
         return TemplateResponse(request, "settings/manage_invites.html", data)
 
     def post(self, request):
-        """ creates an invite database entry """
+        """creates an invite database entry"""
         form = forms.CreateInviteForm(request.POST)
         if not form.is_valid():
             return HttpResponseBadRequest("ERRORS : %s" % (form.errors,))
@@ -64,10 +64,10 @@ class ManageInvites(View):
 
 
 class Invite(View):
-    """ use an invite to register """
+    """use an invite to register"""
 
     def get(self, request, code):
-        """ endpoint for using an invites """
+        """endpoint for using an invites"""
         if request.user.is_authenticated:
             return redirect("/")
         invite = get_object_or_404(models.SiteInvite, code=code)
@@ -83,10 +83,10 @@ class Invite(View):
 
 
 class ManageInviteRequests(View):
-    """ grant invites like the benevolent lord you are """
+    """grant invites like the benevolent lord you are"""
 
     def get(self, request):
-        """ view a list of requests """
+        """view a list of requests"""
         ignored = request.GET.get("ignored", False)
         sort = request.GET.get("sort")
         sort_fields = [
@@ -132,7 +132,7 @@ class ManageInviteRequests(View):
         return TemplateResponse(request, "settings/manage_invite_requests.html", data)
 
     def post(self, request):
-        """ send out an invite """
+        """send out an invite"""
         invite_request = get_object_or_404(
             models.InviteRequest, id=request.POST.get("invite-request")
         )
@@ -152,10 +152,10 @@ class ManageInviteRequests(View):
 
 
 class InviteRequest(View):
-    """ prospective users sign up here """
+    """prospective users sign up here"""
 
     def post(self, request):
-        """ create a request """
+        """create a request"""
         form = forms.InviteRequestForm(request.POST)
         received = False
         if form.is_valid():
@@ -172,7 +172,7 @@ class InviteRequest(View):
 
 @require_POST
 def ignore_invite_request(request):
-    """ hide an invite request """
+    """hide an invite request"""
     invite_request = get_object_or_404(
         models.InviteRequest, id=request.POST.get("invite-request")
     )
diff --git a/bookwyrm/views/isbn.py b/bookwyrm/views/isbn.py
index b7ba02dd..197088ba 100644
--- a/bookwyrm/views/isbn.py
+++ b/bookwyrm/views/isbn.py
@@ -13,10 +13,10 @@ from .helpers import is_api_request
 
 # pylint: disable= no-self-use
 class Isbn(View):
-    """ search a book by isbn """
+    """search a book by isbn"""
 
     def get(self, request, isbn):
-        """ info about a book """
+        """info about a book"""
         book_results = connector_manager.isbn_local_search(isbn)
 
         if is_api_request(request):
diff --git a/bookwyrm/views/landing.py b/bookwyrm/views/landing.py
index 407451fb..1361935e 100644
--- a/bookwyrm/views/landing.py
+++ b/bookwyrm/views/landing.py
@@ -9,18 +9,18 @@ from . import helpers
 
 # pylint: disable= no-self-use
 class About(View):
-    """ create invites """
+    """create invites"""
 
     def get(self, request):
-        """ more information about the instance """
+        """more information about the instance"""
         return TemplateResponse(request, "discover/about.html")
 
 
 class Home(View):
-    """ discover page or home feed depending on auth """
+    """discover page or home feed depending on auth"""
 
     def get(self, request):
-        """ this is the same as the feed on the home tab """
+        """this is the same as the feed on the home tab"""
         if request.user.is_authenticated:
             feed_view = Feed.as_view()
             return feed_view(request, "home")
@@ -29,10 +29,10 @@ class Home(View):
 
 
 class Discover(View):
-    """ preview of recently reviewed books """
+    """preview of recently reviewed books"""
 
     def get(self, request):
-        """ tiled book activity page """
+        """tiled book activity page"""
         data = {
             "register_form": forms.RegisterForm(),
             "request_form": forms.InviteRequestForm(),
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index a2cf7afe..992ea4f7 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -22,10 +22,10 @@ from .helpers import get_user_from_username
 
 # pylint: disable=no-self-use
 class Lists(View):
-    """ book list page """
+    """book list page"""
 
     def get(self, request):
-        """ display a book list """
+        """display a book list"""
         # hide lists with no approved books
         lists = (
             models.List.objects.annotate(
@@ -51,7 +51,7 @@ class Lists(View):
     @method_decorator(login_required, name="dispatch")
     # pylint: disable=unused-argument
     def post(self, request):
-        """ create a book_list """
+        """create a book_list"""
         form = forms.ListForm(request.POST)
         if not form.is_valid():
             return redirect("lists")
@@ -61,10 +61,10 @@ class Lists(View):
 
 
 class UserLists(View):
-    """ a user's book list page """
+    """a user's book list page"""
 
     def get(self, request, username):
-        """ display a book list """
+        """display a book list"""
         user = get_user_from_username(request.user, username)
         lists = models.List.objects.filter(user=user)
         lists = privacy_filter(request.user, lists)
@@ -81,10 +81,10 @@ class UserLists(View):
 
 
 class List(View):
-    """ book list page """
+    """book list page"""
 
     def get(self, request, list_id):
-        """ display a book list """
+        """display a book list"""
         book_list = get_object_or_404(models.List, id=list_id)
         if not book_list.visible_to_user(request.user):
             return HttpResponseNotFound()
@@ -166,7 +166,7 @@ class List(View):
     @method_decorator(login_required, name="dispatch")
     # pylint: disable=unused-argument
     def post(self, request, list_id):
-        """ edit a list """
+        """edit a list"""
         book_list = get_object_or_404(models.List, id=list_id)
         form = forms.ListForm(request.POST, instance=book_list)
         if not form.is_valid():
@@ -176,11 +176,11 @@ class List(View):
 
 
 class Curate(View):
-    """ approve or discard list suggestsions """
+    """approve or discard list suggestsions"""
 
     @method_decorator(login_required, name="dispatch")
     def get(self, request, list_id):
-        """ display a pending list """
+        """display a pending list"""
         book_list = get_object_or_404(models.List, id=list_id)
         if not book_list.user == request.user:
             # only the creater can curate the list
@@ -196,7 +196,7 @@ class Curate(View):
     @method_decorator(login_required, name="dispatch")
     # pylint: disable=unused-argument
     def post(self, request, list_id):
-        """ edit a book_list """
+        """edit a book_list"""
         book_list = get_object_or_404(models.List, id=list_id)
         suggestion = get_object_or_404(models.ListItem, id=request.POST.get("item"))
         approved = request.POST.get("approved") == "true"
@@ -222,7 +222,7 @@ class Curate(View):
 
 @require_POST
 def add_book(request):
-    """ put a book on a list """
+    """put a book on a list"""
     book_list = get_object_or_404(models.List, id=request.POST.get("list"))
     if not book_list.visible_to_user(request.user):
         return HttpResponseNotFound()
@@ -268,7 +268,7 @@ def add_book(request):
 
 @require_POST
 def remove_book(request, list_id):
-    """ remove a book from a list """
+    """remove a book from a list"""
     with transaction.atomic():
         book_list = get_object_or_404(models.List, id=list_id)
         item = get_object_or_404(models.ListItem, id=request.POST.get("item"))
@@ -336,7 +336,7 @@ def set_book_position(request, list_item_id):
 def increment_order_in_reverse(
     book_list_id: int, start: int, end: Optional[int] = None
 ):
-    """ increase the order nu,ber for every item in a list """
+    """increase the order nu,ber for every item in a list"""
     try:
         book_list = models.List.objects.get(id=book_list_id)
     except models.List.DoesNotExist:
@@ -352,7 +352,7 @@ def increment_order_in_reverse(
 
 @transaction.atomic
 def decrement_order(book_list_id, start, end):
-    """ decrement the order value for every item in a list """
+    """decrement the order value for every item in a list"""
     try:
         book_list = models.List.objects.get(id=book_list_id)
     except models.List.DoesNotExist:
@@ -367,7 +367,7 @@ def decrement_order(book_list_id, start, end):
 
 @transaction.atomic
 def normalize_book_list_ordering(book_list_id, start=0, add_offset=0):
-    """ gives each book in a list the proper sequential order number """
+    """gives each book in a list the proper sequential order number"""
     try:
         book_list = models.List.objects.get(id=book_list_id)
     except models.List.DoesNotExist:
diff --git a/bookwyrm/views/notifications.py b/bookwyrm/views/notifications.py
index 7a62ec01..e0e2102d 100644
--- a/bookwyrm/views/notifications.py
+++ b/bookwyrm/views/notifications.py
@@ -9,10 +9,10 @@ from django.views import View
 # pylint: disable= no-self-use
 @method_decorator(login_required, name="dispatch")
 class Notifications(View):
-    """ notifications view """
+    """notifications view"""
 
     def get(self, request):
-        """ people are interacting with you, get hyped """
+        """people are interacting with you, get hyped"""
         notifications = request.user.notification_set.all().order_by("-created_date")
         unread = [n.id for n in notifications.filter(read=False)]
         data = {
@@ -23,6 +23,6 @@ class Notifications(View):
         return TemplateResponse(request, "notifications.html", data)
 
     def post(self, request):
-        """ permanently delete notification for user """
+        """permanently delete notification for user"""
         request.user.notification_set.filter(read=True).delete()
         return redirect("/notifications")
diff --git a/bookwyrm/views/outbox.py b/bookwyrm/views/outbox.py
index ec6f5cd3..4bc2d2b9 100644
--- a/bookwyrm/views/outbox.py
+++ b/bookwyrm/views/outbox.py
@@ -9,10 +9,10 @@ from .helpers import is_bookwyrm_request
 
 # pylint: disable= no-self-use
 class Outbox(View):
-    """ outbox """
+    """outbox"""
 
     def get(self, request, username):
-        """ outbox for the requested user """
+        """outbox for the requested user"""
         user = get_object_or_404(models.User, localname=username)
         filter_type = request.GET.get("type")
         if filter_type not in models.status_models:
diff --git a/bookwyrm/views/password.py b/bookwyrm/views/password.py
index 67010974..933817a8 100644
--- a/bookwyrm/views/password.py
+++ b/bookwyrm/views/password.py
@@ -14,17 +14,17 @@ from bookwyrm.emailing import password_reset_email
 
 # pylint: disable= no-self-use
 class PasswordResetRequest(View):
-    """ forgot password flow """
+    """forgot password flow"""
 
     def get(self, request):
-        """ password reset page """
+        """password reset page"""
         return TemplateResponse(
             request,
             "password_reset_request.html",
         )
 
     def post(self, request):
-        """ create a password reset token """
+        """create a password reset token"""
         email = request.POST.get("email")
         try:
             user = models.User.objects.get(email=email)
@@ -43,10 +43,10 @@ class PasswordResetRequest(View):
 
 
 class PasswordReset(View):
-    """ set new password """
+    """set new password"""
 
     def get(self, request, code):
-        """ endpoint for sending invites """
+        """endpoint for sending invites"""
         if request.user.is_authenticated:
             return redirect("/")
         try:
@@ -59,7 +59,7 @@ class PasswordReset(View):
         return TemplateResponse(request, "password_reset.html", {"code": code})
 
     def post(self, request, code):
-        """ allow a user to change their password through an emailed token """
+        """allow a user to change their password through an emailed token"""
         try:
             reset_code = models.PasswordReset.objects.get(code=code)
         except models.PasswordReset.DoesNotExist:
@@ -84,15 +84,15 @@ class PasswordReset(View):
 
 @method_decorator(login_required, name="dispatch")
 class ChangePassword(View):
-    """ change password as logged in user """
+    """change password as logged in user"""
 
     def get(self, request):
-        """ change password page """
+        """change password page"""
         data = {"user": request.user}
         return TemplateResponse(request, "preferences/change_password.html", data)
 
     def post(self, request):
-        """ allow a user to change their password """
+        """allow a user to change their password"""
         new_password = request.POST.get("password")
         confirm_password = request.POST.get("confirm-password")
 
diff --git a/bookwyrm/views/reading.py b/bookwyrm/views/reading.py
index f2d5b2c2..65ca717d 100644
--- a/bookwyrm/views/reading.py
+++ b/bookwyrm/views/reading.py
@@ -18,7 +18,7 @@ from .shelf import handle_unshelve
 @login_required
 @require_POST
 def start_reading(request, book_id):
-    """ begin reading a book """
+    """begin reading a book"""
     book = get_edition(book_id)
     reading_shelf = models.Shelf.objects.filter(
         identifier=models.Shelf.READING, user=request.user
@@ -60,7 +60,7 @@ def start_reading(request, book_id):
 @login_required
 @require_POST
 def finish_reading(request, book_id):
-    """ a user completed a book, yay """
+    """a user completed a book, yay"""
     book = get_edition(book_id)
     finished_read_shelf = models.Shelf.objects.filter(
         identifier=models.Shelf.READ_FINISHED, user=request.user
@@ -101,7 +101,7 @@ def finish_reading(request, book_id):
 @login_required
 @require_POST
 def edit_readthrough(request):
-    """ can't use the form because the dates are too finnicky """
+    """can't use the form because the dates are too finnicky"""
     readthrough = update_readthrough(request, create=False)
     if not readthrough:
         return HttpResponseNotFound()
@@ -121,7 +121,7 @@ def edit_readthrough(request):
 @login_required
 @require_POST
 def delete_readthrough(request):
-    """ remove a readthrough """
+    """remove a readthrough"""
     readthrough = get_object_or_404(models.ReadThrough, id=request.POST.get("id"))
 
     # don't let people edit other people's data
@@ -135,7 +135,7 @@ def delete_readthrough(request):
 @login_required
 @require_POST
 def create_readthrough(request):
-    """ can't use the form because the dates are too finnicky """
+    """can't use the form because the dates are too finnicky"""
     book = get_object_or_404(models.Edition, id=request.POST.get("book"))
     readthrough = update_readthrough(request, create=True, book=book)
     if not readthrough:
@@ -145,14 +145,14 @@ def create_readthrough(request):
 
 
 def load_date_in_user_tz_as_utc(date_str: str, user: models.User) -> datetime:
-    """ ensures that data is stored consistently in the UTC timezone """
+    """ensures that data is stored consistently in the UTC timezone"""
     user_tz = dateutil.tz.gettz(user.preferred_timezone)
     start_date = dateutil.parser.parse(date_str, ignoretz=True)
     return start_date.replace(tzinfo=user_tz).astimezone(dateutil.tz.UTC)
 
 
 def update_readthrough(request, book=None, create=True):
-    """ updates but does not save dates on a readthrough """
+    """updates but does not save dates on a readthrough"""
     try:
         read_id = request.POST.get("id")
         if not read_id:
@@ -209,7 +209,7 @@ def update_readthrough(request, book=None, create=True):
 @login_required
 @require_POST
 def delete_progressupdate(request):
-    """ remove a progress update """
+    """remove a progress update"""
     update = get_object_or_404(models.ProgressUpdate, id=request.POST.get("id"))
 
     # don't let people edit other people's data
diff --git a/bookwyrm/views/reports.py b/bookwyrm/views/reports.py
index 07eb9b97..46c23884 100644
--- a/bookwyrm/views/reports.py
+++ b/bookwyrm/views/reports.py
@@ -20,10 +20,10 @@ from bookwyrm import forms, models
     name="dispatch",
 )
 class Reports(View):
-    """ list of reports  """
+    """list of reports"""
 
     def get(self, request):
-        """ view current reports """
+        """view current reports"""
         filters = {}
 
         resolved = request.GET.get("resolved") == "true"
@@ -52,17 +52,17 @@ class Reports(View):
     name="dispatch",
 )
 class Report(View):
-    """ view a specific report """
+    """view a specific report"""
 
     def get(self, request, report_id):
-        """ load a report """
+        """load a report"""
         data = {
             "report": get_object_or_404(models.Report, id=report_id),
         }
         return TemplateResponse(request, "moderation/report.html", data)
 
     def post(self, request, report_id):
-        """ comment on a report """
+        """comment on a report"""
         report = get_object_or_404(models.Report, id=report_id)
         models.ReportComment.objects.create(
             user=request.user,
@@ -75,7 +75,7 @@ class Report(View):
 @login_required
 @permission_required("bookwyrm_moderate_user")
 def suspend_user(_, user_id):
-    """ mark an account as inactive """
+    """mark an account as inactive"""
     user = get_object_or_404(models.User, id=user_id)
     user.is_active = not user.is_active
     # this isn't a full deletion, so we don't want to tell the world
@@ -86,7 +86,7 @@ def suspend_user(_, user_id):
 @login_required
 @permission_required("bookwyrm_moderate_post")
 def resolve_report(_, report_id):
-    """ mark a report as (un)resolved """
+    """mark a report as (un)resolved"""
     report = get_object_or_404(models.Report, id=report_id)
     report.resolved = not report.resolved
     report.save()
@@ -98,7 +98,7 @@ def resolve_report(_, report_id):
 @login_required
 @require_POST
 def make_report(request):
-    """ a user reports something """
+    """a user reports something"""
     form = forms.ReportForm(request.POST)
     if not form.is_valid():
         raise ValueError(form.errors)
diff --git a/bookwyrm/views/rss_feed.py b/bookwyrm/views/rss_feed.py
index ed3e84f4..f1678b7f 100644
--- a/bookwyrm/views/rss_feed.py
+++ b/bookwyrm/views/rss_feed.py
@@ -5,25 +5,25 @@ from .helpers import get_user_from_username, privacy_filter
 
 # pylint: disable=no-self-use, unused-argument
 class RssFeed(Feed):
-    """ serialize user's posts in rss feed """
+    """serialize user's posts in rss feed"""
 
     description_template = "snippets/rss_content.html"
     title_template = "snippets/rss_title.html"
 
     def get_object(self, request, username):
-        """ the user who's posts get serialized """
+        """the user who's posts get serialized"""
         return get_user_from_username(request.user, username)
 
     def link(self, obj):
-        """ link to the user's profile """
+        """link to the user's profile"""
         return obj.local_path
 
     def title(self, obj):
-        """ title of the rss feed entry """
+        """title of the rss feed entry"""
         return f"Status updates from {obj.display_name}"
 
     def items(self, obj):
-        """ the user's activity feed """
+        """the user's activity feed"""
         return privacy_filter(
             obj,
             obj.status_set.select_subclasses(),
@@ -31,5 +31,5 @@ class RssFeed(Feed):
         )
 
     def item_link(self, item):
-        """ link to the status """
+        """link to the status"""
         return item.local_path
diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py
index 9e7df9f4..4543b55e 100644
--- a/bookwyrm/views/search.py
+++ b/bookwyrm/views/search.py
@@ -16,10 +16,10 @@ from .helpers import handle_remote_webfinger
 
 # pylint: disable= no-self-use
 class Search(View):
-    """ search users or books """
+    """search users or books"""
 
     def get(self, request):
-        """ that search bar up top """
+        """that search bar up top"""
         query = request.GET.get("q")
         min_confidence = request.GET.get("min_confidence", 0.1)
 
diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index 446bedba..9bcf0a4a 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -21,10 +21,10 @@ from .helpers import handle_reading_status, privacy_filter
 
 # pylint: disable= no-self-use
 class Shelf(View):
-    """ shelf page """
+    """shelf page"""
 
     def get(self, request, username, shelf_identifier=None):
-        """ display a shelf """
+        """display a shelf"""
         try:
             user = get_user_from_username(request.user, username)
         except models.User.DoesNotExist:
@@ -73,7 +73,7 @@ class Shelf(View):
     @method_decorator(login_required, name="dispatch")
     # pylint: disable=unused-argument
     def post(self, request, username, shelf_identifier):
-        """ edit a shelf """
+        """edit a shelf"""
         try:
             shelf = request.user.shelf_set.get(identifier=shelf_identifier)
         except models.Shelf.DoesNotExist:
@@ -94,7 +94,7 @@ class Shelf(View):
 @login_required
 @require_POST
 def create_shelf(request):
-    """ user generated shelves """
+    """user generated shelves"""
     form = forms.ShelfForm(request.POST)
     if not form.is_valid():
         return redirect(request.headers.get("Referer", "/"))
@@ -106,7 +106,7 @@ def create_shelf(request):
 @login_required
 @require_POST
 def delete_shelf(request, shelf_id):
-    """ user generated shelves """
+    """user generated shelves"""
     shelf = get_object_or_404(models.Shelf, id=shelf_id)
     if request.user != shelf.user or not shelf.editable:
         return HttpResponseBadRequest()
@@ -118,7 +118,7 @@ def delete_shelf(request, shelf_id):
 @login_required
 @require_POST
 def shelve(request):
-    """ put a book on a user's shelf """
+    """put a book on a user's shelf"""
     book = get_edition(request.POST.get("book"))
 
     desired_shelf = models.Shelf.objects.filter(
@@ -177,7 +177,7 @@ def shelve(request):
 @login_required
 @require_POST
 def unshelve(request):
-    """ put a  on a user's shelf """
+    """put a  on a user's shelf"""
     book = models.Edition.objects.get(id=request.POST["book"])
     current_shelf = models.Shelf.objects.get(id=request.POST["shelf"])
 
@@ -187,6 +187,6 @@ def unshelve(request):
 
 # pylint: disable=unused-argument
 def handle_unshelve(book, shelf):
-    """ unshelve a book """
+    """unshelve a book"""
     row = models.ShelfBook.objects.get(book=book, shelf=shelf)
     row.delete()
diff --git a/bookwyrm/views/site.py b/bookwyrm/views/site.py
index e5897660..46bdf722 100644
--- a/bookwyrm/views/site.py
+++ b/bookwyrm/views/site.py
@@ -15,16 +15,16 @@ from bookwyrm import emailing, forms, models
     name="dispatch",
 )
 class Site(View):
-    """ manage things like the instance name """
+    """manage things like the instance name"""
 
     def get(self, request):
-        """ edit form """
+        """edit form"""
         site = models.SiteSettings.objects.get()
         data = {"site_form": forms.SiteForm(instance=site)}
         return TemplateResponse(request, "settings/site.html", data)
 
     def post(self, request):
-        """ edit the site settings """
+        """edit the site settings"""
         site = models.SiteSettings.objects.get()
         form = forms.SiteForm(request.POST, request.FILES, instance=site)
         if not form.is_valid():
@@ -38,7 +38,7 @@ class Site(View):
 @login_required
 @permission_required("bookwyrm.edit_instance_settings", raise_exception=True)
 def email_preview(request):
-    """ for development, renders and example email template """
+    """for development, renders and example email template"""
     template = request.GET.get("email")
     data = emailing.email_data()
     data["subject_path"] = "email/{}/subject.html".format(template)
diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py
index f0119e0e..2295c8cc 100644
--- a/bookwyrm/views/status.py
+++ b/bookwyrm/views/status.py
@@ -19,16 +19,16 @@ from .reading import edit_readthrough
 # pylint: disable= no-self-use
 @method_decorator(login_required, name="dispatch")
 class CreateStatus(View):
-    """ the view for *posting* """
+    """the view for *posting*"""
 
     def get(self, request):
-        """ compose view (used for delete-and-redraft """
+        """compose view (used for delete-and-redraft"""
         book = get_object_or_404(models.Edition, id=request.GET.get("book"))
         data = {"book": book}
         return TemplateResponse(request, "compose.html", data)
 
     def post(self, request, status_type):
-        """ create  status of whatever type """
+        """create  status of whatever type"""
         status_type = status_type[0].upper() + status_type[1:]
 
         try:
@@ -80,10 +80,10 @@ class CreateStatus(View):
 
 @method_decorator(login_required, name="dispatch")
 class DeleteStatus(View):
-    """ tombstone that bad boy """
+    """tombstone that bad boy"""
 
     def post(self, request, status_id):
-        """ delete and tombstone a status """
+        """delete and tombstone a status"""
         status = get_object_or_404(models.Status, id=status_id)
 
         # don't let people delete other people's statuses
@@ -97,10 +97,10 @@ class DeleteStatus(View):
 
 @method_decorator(login_required, name="dispatch")
 class DeleteAndRedraft(View):
-    """ delete a status but let the user re-create it """
+    """delete a status but let the user re-create it"""
 
     def post(self, request, status_id):
-        """ delete and tombstone a status """
+        """delete and tombstone a status"""
         status = get_object_or_404(
             models.Status.objects.select_subclasses(), id=status_id
         )
@@ -130,7 +130,7 @@ class DeleteAndRedraft(View):
 
 
 def find_mentions(content):
-    """ detect @mentions in raw status content """
+    """detect @mentions in raw status content"""
     if not content:
         return
     for match in re.finditer(regex.strict_username, content):
@@ -148,7 +148,7 @@ def find_mentions(content):
 
 
 def format_links(content):
-    """ detect and format links """
+    """detect and format links"""
     return re.sub(
         r'([^(href=")]|^|\()(https?:\/\/(%s([\w\.\-_\/+&\?=:;,])*))' % regex.domain,
         r'\g<1><a href="\g<2>">\g<3></a>',
@@ -157,7 +157,7 @@ def format_links(content):
 
 
 def to_markdown(content):
-    """ catch links and convert to markdown """
+    """catch links and convert to markdown"""
     content = markdown(content)
     content = format_links(content)
     # sanitize resulting html
diff --git a/bookwyrm/views/updates.py b/bookwyrm/views/updates.py
index cc5fc419..34902272 100644
--- a/bookwyrm/views/updates.py
+++ b/bookwyrm/views/updates.py
@@ -7,7 +7,7 @@ from bookwyrm import activitystreams
 
 @login_required
 def get_notification_count(request):
-    """ any notifications waiting? """
+    """any notifications waiting?"""
     return JsonResponse(
         {
             "count": request.user.notification_set.filter(read=False).count(),
@@ -17,7 +17,7 @@ def get_notification_count(request):
 
 @login_required
 def get_unread_status_count(request, stream="home"):
-    """ any unread statuses for this feed? """
+    """any unread statuses for this feed?"""
     stream = activitystreams.streams.get(stream)
     if not stream:
         return JsonResponse({})
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index 02db5971..05fdb606 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -22,10 +22,10 @@ from .helpers import is_blocked, privacy_filter
 
 # pylint: disable= no-self-use
 class User(View):
-    """ user profile page """
+    """user profile page"""
 
     def get(self, request, username):
-        """ profile page for a user """
+        """profile page for a user"""
         try:
             user = get_user_from_username(request.user, username)
         except models.User.DoesNotExist:
@@ -90,10 +90,10 @@ class User(View):
 
 
 class Followers(View):
-    """ list of followers view """
+    """list of followers view"""
 
     def get(self, request, username):
-        """ list of followers """
+        """list of followers"""
         try:
             user = get_user_from_username(request.user, username)
         except models.User.DoesNotExist:
@@ -115,10 +115,10 @@ class Followers(View):
 
 
 class Following(View):
-    """ list of following view """
+    """list of following view"""
 
     def get(self, request, username):
-        """ list of followers """
+        """list of followers"""
         try:
             user = get_user_from_username(request.user, username)
         except models.User.DoesNotExist:
@@ -141,10 +141,10 @@ class Following(View):
 
 @method_decorator(login_required, name="dispatch")
 class EditUser(View):
-    """ edit user view """
+    """edit user view"""
 
     def get(self, request):
-        """ edit profile page for a user """
+        """edit profile page for a user"""
         data = {
             "form": forms.EditUserForm(instance=request.user),
             "user": request.user,
@@ -152,7 +152,7 @@ class EditUser(View):
         return TemplateResponse(request, "preferences/edit_user.html", data)
 
     def post(self, request):
-        """ les get fancy with images """
+        """les get fancy with images"""
         form = forms.EditUserForm(request.POST, request.FILES, instance=request.user)
         if not form.is_valid():
             data = {"form": form, "user": request.user}
@@ -164,7 +164,7 @@ class EditUser(View):
 
 
 def save_user_form(form):
-    """ special handling for the user form """
+    """special handling for the user form"""
     user = form.save(commit=False)
 
     if "avatar" in form.files:
@@ -181,7 +181,7 @@ def save_user_form(form):
 
 
 def crop_avatar(image):
-    """ reduce the size and make an avatar square """
+    """reduce the size and make an avatar square"""
     target_size = 120
     width, height = image.size
     thumbnail_scale = (
diff --git a/bookwyrm/views/user_admin.py b/bookwyrm/views/user_admin.py
index 4537abce..9d08e930 100644
--- a/bookwyrm/views/user_admin.py
+++ b/bookwyrm/views/user_admin.py
@@ -17,10 +17,10 @@ from bookwyrm.settings import PAGE_LENGTH
     name="dispatch",
 )
 class UserAdminList(View):
-    """ admin view of users on this server """
+    """admin view of users on this server"""
 
     def get(self, request):
-        """ list of users """
+        """list of users"""
         filters = {}
         server = request.GET.get("server")
         if server:
@@ -59,16 +59,16 @@ class UserAdminList(View):
     name="dispatch",
 )
 class UserAdmin(View):
-    """ moderate an individual user """
+    """moderate an individual user"""
 
     def get(self, request, user):
-        """ user view """
+        """user view"""
         user = get_object_or_404(models.User, id=user)
         data = {"user": user, "group_form": forms.UserGroupForm()}
         return TemplateResponse(request, "user_admin/user.html", data)
 
     def post(self, request, user):
-        """ update user group """
+        """update user group"""
         user = get_object_or_404(models.User, id=user)
         form = forms.UserGroupForm(request.POST, instance=user)
         if form.is_valid():
diff --git a/bookwyrm/views/wellknown.py b/bookwyrm/views/wellknown.py
index 178d558e..2462c5a4 100644
--- a/bookwyrm/views/wellknown.py
+++ b/bookwyrm/views/wellknown.py
@@ -13,7 +13,7 @@ from bookwyrm.settings import DOMAIN, VERSION
 
 @require_GET
 def webfinger(request):
-    """ allow other servers to ask about a user """
+    """allow other servers to ask about a user"""
     resource = request.GET.get("resource")
     if not resource or not resource.startswith("acct:"):
         return HttpResponseNotFound()
@@ -40,7 +40,7 @@ def webfinger(request):
 
 @require_GET
 def nodeinfo_pointer(_):
-    """ direct servers to nodeinfo """
+    """direct servers to nodeinfo"""
     return JsonResponse(
         {
             "links": [
@@ -55,7 +55,7 @@ def nodeinfo_pointer(_):
 
 @require_GET
 def nodeinfo(_):
-    """ basic info about the server """
+    """basic info about the server"""
     status_count = models.Status.objects.filter(user__local=True).count()
     user_count = models.User.objects.filter(local=True).count()
 
@@ -90,7 +90,7 @@ def nodeinfo(_):
 
 @require_GET
 def instance_info(_):
-    """ let's talk about your cool unique instance """
+    """let's talk about your cool unique instance"""
     user_count = models.User.objects.filter(local=True).count()
     status_count = models.Status.objects.filter(user__local=True).count()
 
@@ -116,12 +116,12 @@ def instance_info(_):
 
 @require_GET
 def peers(_):
-    """ list of federated servers this instance connects with """
+    """list of federated servers this instance connects with"""
     names = models.FederatedServer.objects.values_list("server_name", flat=True)
     return JsonResponse(list(names), safe=False)
 
 
 @require_GET
 def host_meta(request):
-    """ meta of the host """
+    """meta of the host"""
     return TemplateResponse(request, "host_meta.xml", {"DOMAIN": DOMAIN})
diff --git a/requirements.txt b/requirements.txt
index 6b7d82d3..665e3253 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,7 +15,7 @@ django-rename-app==0.1.2
 pytz>=2021.1
 
 # Dev
-black==20.8b1
+black==21.4b0
 coverage==5.1
 pytest-django==4.1.0
 pytest==6.1.2

From 7fcf48e84df267da030aacae638cd6ba072ed215 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 26 Apr 2021 09:57:01 -0700
Subject: [PATCH 0958/1285] Adds success notification for adding books to lists

---
 bookwyrm/templates/lists/list.html   |   10 +
 bookwyrm/views/list.py               |    4 +-
 locale/de_DE/LC_MESSAGES/django.po   | 2894 ++++++++++++++++++++------
 locale/en_US/LC_MESSAGES/django.po   | 2412 +++++++++++++++++----
 locale/es/LC_MESSAGES/django.po      | 2764 +++++++++++++++---------
 locale/fr_FR/LC_MESSAGES/django.po   | 2726 +++++++++++++++++++-----
 locale/zh_Hans/LC_MESSAGES/django.po | 2758 +++++++++++++++++++-----
 7 files changed, 10401 insertions(+), 3167 deletions(-)

diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index 80e2ba20..641038d0 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -13,6 +13,16 @@
 
 <div class="columns mt-3">
     <section class="column is-three-quarters">
+        {% if request.GET.updated %}
+        <div class="notification is-primary">
+            {% if list.curation != "open" and request.user != list.user %}
+            {% trans "You successfully suggested a book for this list!" %}
+            {% else %}
+            {% trans "You successfully added a book to this list!" %}
+            {% endif %}
+        </div>
+        {% endif %}
+
         {% if not items.object_list.exists %}
         <p>{% trans "This list is currently empty" %}</p>
         {% else %}
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index 50bcb863..6a241ada 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -270,7 +270,9 @@ def add_book(request):
         pass
 
     path = reverse("list", args=[book_list.id])
-    return redirect("{:s}?{:s}".format(path, urlencode(request.GET)))
+    params = request.GET
+    params["updated"] = True
+    return redirect("{:s}?{:s}".format(path, urlencode(params)))
 
 
 @require_POST
diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 962b9736..7acc3f96 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-01 13:14-0700\n"
+"POT-Creation-Date: 2021-04-26 09:56-0700\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"
@@ -18,39 +18,70 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/forms.py:226
+#: bookwyrm/forms.py:224
 #, fuzzy
 #| msgid "A user with that username already exists."
 msgid "A user with this email already exists."
 msgstr "Dieser Benutzename ist bereits vergeben."
 
-#: bookwyrm/forms.py:240
+#: bookwyrm/forms.py:238
 msgid "One Day"
 msgstr "Ein Tag"
 
-#: bookwyrm/forms.py:241
+#: bookwyrm/forms.py:239
 msgid "One Week"
 msgstr "Eine Woche"
 
-#: bookwyrm/forms.py:242
+#: bookwyrm/forms.py:240
 msgid "One Month"
 msgstr "Ein Monat"
 
-#: bookwyrm/forms.py:243
+#: bookwyrm/forms.py:241
 msgid "Does Not Expire"
 msgstr "Läuft nicht aus"
 
-#: bookwyrm/forms.py:248
+#: bookwyrm/forms.py:246
 #, python-format
 msgid "%(count)d uses"
 msgstr "%(count)d Benutzungen"
 
-#: bookwyrm/forms.py:251
+#: bookwyrm/forms.py:249
 #, fuzzy
 #| msgid "Unlisted"
 msgid "Unlimited"
 msgstr "Ungelistet"
 
+#: bookwyrm/forms.py:293
+msgid "List Order"
+msgstr ""
+
+#: bookwyrm/forms.py:294
+#, fuzzy
+#| msgid "Title"
+msgid "Book Title"
+msgstr "Titel"
+
+#: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:31
+#: bookwyrm/templates/user/shelf.html:80 bookwyrm/templates/user/shelf.html:110
+msgid "Rating"
+msgstr ""
+
+#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:82
+msgid "Sort By"
+msgstr ""
+
+#: bookwyrm/forms.py:301
+#, fuzzy
+#| msgid "Started reading"
+msgid "Ascending"
+msgstr "Zu lesen angefangen"
+
+#: bookwyrm/forms.py:302
+#, fuzzy
+#| msgid "Started reading"
+msgid "Descending"
+msgstr "Zu lesen angefangen"
+
 #: bookwyrm/models/fields.py:24
 #, python-format
 msgid "%(value)s is not a valid remote_id"
@@ -61,7 +92,7 @@ msgstr "%(value)s ist keine gültige remote_id"
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s ist kein gültiger Username"
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:157
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:153
 msgid "username"
 msgstr "Username"
 
@@ -69,23 +100,23 @@ msgstr "Username"
 msgid "A user with that username already exists."
 msgstr "Dieser Benutzename ist bereits vergeben."
 
-#: bookwyrm/settings.py:150
+#: bookwyrm/settings.py:152
 msgid "English"
 msgstr "Englisch"
 
-#: bookwyrm/settings.py:151
+#: bookwyrm/settings.py:153
 msgid "German"
 msgstr "Deutsch"
 
-#: bookwyrm/settings.py:152
+#: bookwyrm/settings.py:154
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: bookwyrm/settings.py:153
+#: bookwyrm/settings.py:155
 msgid "French"
 msgstr "Französisch"
 
-#: bookwyrm/settings.py:154
+#: bookwyrm/settings.py:156
 msgid "Simplified Chinese"
 msgstr "Vereinfachtes Chinesisch"
 
@@ -122,82 +153,72 @@ msgstr ""
 msgid "Books by %(name)s"
 msgstr "Bücher von %(name)s"
 
-#: bookwyrm/templates/book/book.html:21
+#: bookwyrm/templates/book/book.html:33
 #: bookwyrm/templates/discover/large-book.html:12
 #: bookwyrm/templates/discover/small-book.html:9
 msgid "by"
 msgstr "von"
 
-#: bookwyrm/templates/book/book.html:29 bookwyrm/templates/book/book.html:30
+#: bookwyrm/templates/book/book.html:41 bookwyrm/templates/book/book.html:42
 msgid "Edit Book"
 msgstr "Buch editieren"
 
-#: bookwyrm/templates/book/book.html:49
+#: bookwyrm/templates/book/book.html:61
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "Cover hinzufügen"
 
-#: bookwyrm/templates/book/book.html:53
+#: bookwyrm/templates/book/book.html:65
 #, fuzzy
 #| msgid "Failed to load"
 msgid "Failed to load cover"
 msgstr "Laden fehlgeschlagen"
 
-#: bookwyrm/templates/book/book.html:62
-msgid "ISBN:"
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:69
-#: bookwyrm/templates/book/edit_book.html:211
-msgid "OCLC Number:"
-msgstr "OCLC Nummer:"
-
-#: bookwyrm/templates/book/book.html:76
-#: bookwyrm/templates/book/edit_book.html:215
-msgid "ASIN:"
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:85
+#: bookwyrm/templates/book/book.html:82
 msgid "View on OpenLibrary"
 msgstr "In OpenLibrary ansehen"
 
-#: bookwyrm/templates/book/book.html:94
+#: bookwyrm/templates/book/book.html:102
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s Bewertung)"
 msgstr[1] "(%(review_count)s Bewertungen)"
 
-#: bookwyrm/templates/book/book.html:100
+#: bookwyrm/templates/book/book.html:114
 msgid "Add Description"
 msgstr "Beschreibung hinzufügen"
 
-#: bookwyrm/templates/book/book.html:107
-#: bookwyrm/templates/book/edit_book.html:101
+#: bookwyrm/templates/book/book.html:121
+#: bookwyrm/templates/book/edit_book.html:107
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: bookwyrm/templates/book/book.html:111
-#: bookwyrm/templates/book/edit_book.html:225
+#: bookwyrm/templates/book/book.html:125
+#: bookwyrm/templates/book/edit_book.html:240
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
+#: bookwyrm/templates/settings/edit_server.html:68
+#: bookwyrm/templates/settings/federated_server.html:93
 #: bookwyrm/templates/settings/site.html:93
-#: bookwyrm/templates/snippets/readthrough.html:65
+#: bookwyrm/templates/snippets/readthrough.html:75
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:38
 msgid "Save"
 msgstr "Speichern"
 
-#: bookwyrm/templates/book/book.html:112 bookwyrm/templates/book/book.html:161
+#: bookwyrm/templates/book/book.html:126 bookwyrm/templates/book/book.html:175
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:226
+#: bookwyrm/templates/book/edit_book.html:241
 #: bookwyrm/templates/edit_author.html:79
-#: bookwyrm/templates/moderation/report_modal.html:32
+#: bookwyrm/templates/moderation/report_modal.html:34
+#: bookwyrm/templates/settings/federated_server.html:94
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/readthrough.html:66
+#: bookwyrm/templates/snippets/readthrough.html:76
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
@@ -205,80 +226,124 @@ msgstr "Speichern"
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: bookwyrm/templates/book/book.html:121
+#: bookwyrm/templates/book/book.html:135
 #, fuzzy, python-format
 #| msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s\">%(title)s</a> von"
 
-#: bookwyrm/templates/book/book.html:129
+#: bookwyrm/templates/book/book.html:143
 #, fuzzy, python-format
 #| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/book/book.html:135
+#: bookwyrm/templates/book/book.html:149
 #, fuzzy, python-format
-#| msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
-msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
-msgstr "hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> zu deiner Liste \"<a href=\"%(list_path)s\">%(list_name)s</a>\" Hinzugefügt"
+#| msgid ""
+#| " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
+#| "\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgid ""
+"A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a "
+"href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
+msgstr ""
+"hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> zu deiner Liste "
+"\"<a href=\"%(list_path)s\">%(list_name)s</a>\" Hinzugefügt"
 
-#: bookwyrm/templates/book/book.html:144
+#: bookwyrm/templates/book/book.html:158
 msgid "Your reading activity"
 msgstr "Deine Leseaktivität"
 
-#: bookwyrm/templates/book/book.html:146
+#: bookwyrm/templates/book/book.html:160
 msgid "Add read dates"
 msgstr "Lesedaten hinzufügen"
 
-#: bookwyrm/templates/book/book.html:151
+#: bookwyrm/templates/book/book.html:165
 msgid "You don't have any reading activity for this book."
 msgstr "Du hast keine Leseaktivität für dieses Buch."
 
-#: bookwyrm/templates/book/book.html:158
+#: bookwyrm/templates/book/book.html:172
 msgid "Create"
 msgstr "Erstellen"
 
-#: bookwyrm/templates/book/book.html:180
+#: bookwyrm/templates/book/book.html:194
 msgid "Subjects"
 msgstr "Themen"
 
-#: bookwyrm/templates/book/book.html:191
+#: bookwyrm/templates/book/book.html:206
 msgid "Places"
 msgstr "Orte"
 
-#: bookwyrm/templates/book/book.html:202 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book/book.html:217 bookwyrm/templates/layout.html:65
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listen"
 
-#: bookwyrm/templates/book/book.html:213
+#: bookwyrm/templates/book/book.html:228
 #, fuzzy
 #| msgid "Go to list"
 msgid "Add to list"
 msgstr "Zur Liste"
 
-#: bookwyrm/templates/book/book.html:223
+#: bookwyrm/templates/book/book.html:238
 #: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:90
+#: bookwyrm/templates/lists/list.html:133
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: bookwyrm/templates/book/book.html:251
+#: bookwyrm/templates/book/book.html:254
+#, fuzzy
+#| msgid "Review"
+msgid "Reviews"
+msgstr "Bewerten"
+
+#: bookwyrm/templates/book/book.html:259
+#, fuzzy
+#| msgid "Your shelves"
+msgid "Your reviews"
+msgstr "Deine Regale"
+
+#: bookwyrm/templates/book/book.html:265
+#, fuzzy
+#| msgid "Your Account"
+msgid "Your comments"
+msgstr "Dein Account"
+
+#: bookwyrm/templates/book/book.html:271
+#, fuzzy
+#| msgid "Your books"
+msgid "Your quotes"
+msgstr "Deine Bücher"
+
+#: bookwyrm/templates/book/book.html:305
 msgid "rated it"
 msgstr "bewertet"
 
+#: bookwyrm/templates/book/book_identifiers.html:8
+msgid "ISBN:"
+msgstr ""
+
+#: bookwyrm/templates/book/book_identifiers.html:15
+#: bookwyrm/templates/book/edit_book.html:226
+msgid "OCLC Number:"
+msgstr "OCLC Nummer:"
+
+#: bookwyrm/templates/book/book_identifiers.html:22
+#: bookwyrm/templates/book/edit_book.html:230
+msgid "ASIN:"
+msgstr ""
+
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:163
+#: bookwyrm/templates/book/edit_book.html:178
 #, fuzzy
 #| msgid "Add cover"
 msgid "Upload cover:"
 msgstr "Cover hinzufügen"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:169
+#: bookwyrm/templates/book/edit_book.html:184
 msgid "Load cover from url:"
 msgstr "Cover von URL laden:"
 
@@ -358,93 +423,93 @@ msgstr "Zurück"
 msgid "Metadata"
 msgstr "Metadaten"
 
-#: bookwyrm/templates/book/edit_book.html:91
+#: bookwyrm/templates/book/edit_book.html:92
 msgid "Title:"
 msgstr "Titel:"
 
-#: bookwyrm/templates/book/edit_book.html:96
+#: bookwyrm/templates/book/edit_book.html:100
 msgid "Subtitle:"
 msgstr "Untertitel:"
 
-#: bookwyrm/templates/book/edit_book.html:106
+#: bookwyrm/templates/book/edit_book.html:113
 msgid "Series:"
 msgstr "Serie:"
 
-#: bookwyrm/templates/book/edit_book.html:111
+#: bookwyrm/templates/book/edit_book.html:120
 msgid "Series number:"
 msgstr "Seriennummer:"
 
-#: bookwyrm/templates/book/edit_book.html:117
+#: bookwyrm/templates/book/edit_book.html:126
 #, fuzzy
 #| msgid "Published"
 msgid "Publisher:"
 msgstr "Veröffentlicht"
 
-#: bookwyrm/templates/book/edit_book.html:119
+#: bookwyrm/templates/book/edit_book.html:128
 msgid "Separate multiple publishers with commas."
 msgstr "Mehrere Herausgeber:innen durch Kommata trennen"
 
-#: bookwyrm/templates/book/edit_book.html:125
+#: bookwyrm/templates/book/edit_book.html:135
 msgid "First published date:"
 msgstr "Erstveröffentlichungsdatum:"
 
-#: bookwyrm/templates/book/edit_book.html:130
+#: bookwyrm/templates/book/edit_book.html:143
 msgid "Published date:"
 msgstr "Veröffentlichungsdatum:"
 
-#: bookwyrm/templates/book/edit_book.html:137
+#: bookwyrm/templates/book/edit_book.html:152
 #, fuzzy
 #| msgid "Author"
 msgid "Authors"
 msgstr "Autor*in"
 
-#: bookwyrm/templates/book/edit_book.html:143
+#: bookwyrm/templates/book/edit_book.html:158
 #, fuzzy, python-format
 #| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
 msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/book/edit_book.html:148
+#: bookwyrm/templates/book/edit_book.html:163
 #, fuzzy
 #| msgid "Edit Author"
 msgid "Add Authors:"
 msgstr "Autor*in editieren"
 
-#: bookwyrm/templates/book/edit_book.html:149
+#: bookwyrm/templates/book/edit_book.html:164
 msgid "John Doe, Jane Smith"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:155
-#: bookwyrm/templates/user/shelf.html:75
+#: bookwyrm/templates/book/edit_book.html:170
+#: bookwyrm/templates/user/shelf.html:74
 msgid "Cover"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:182
+#: bookwyrm/templates/book/edit_book.html:197
 msgid "Physical Properties"
 msgstr "Physikalische Eigenschaften"
 
-#: bookwyrm/templates/book/edit_book.html:183
+#: bookwyrm/templates/book/edit_book.html:198
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:191
+#: bookwyrm/templates/book/edit_book.html:206
 msgid "Pages:"
 msgstr "Seiten:"
 
-#: bookwyrm/templates/book/edit_book.html:198
+#: bookwyrm/templates/book/edit_book.html:213
 msgid "Book Identifiers"
 msgstr "Buchidentifikatoren"
 
-#: bookwyrm/templates/book/edit_book.html:199
+#: bookwyrm/templates/book/edit_book.html:214
 msgid "ISBN 13:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:203
+#: bookwyrm/templates/book/edit_book.html:218
 msgid "ISBN 10:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:207
+#: bookwyrm/templates/book/edit_book.html:222
 #: bookwyrm/templates/edit_author.html:59
 msgid "Openlibrary key:"
 msgstr ""
@@ -468,46 +533,57 @@ msgstr ""
 msgid "Language:"
 msgstr ""
 
-#: bookwyrm/templates/book/publisher_info.html:6
+#: bookwyrm/templates/book/publisher_info.html:22
+#, python-format
+msgid "%(format)s"
+msgstr ""
+
+#: bookwyrm/templates/book/publisher_info.html:24
 #, python-format
 msgid "%(format)s, %(pages)s pages"
 msgstr "%(format)s, %(pages)s Seiten"
 
-#: bookwyrm/templates/book/publisher_info.html:8
+#: bookwyrm/templates/book/publisher_info.html:26
 #, python-format
 msgid "%(pages)s pages"
 msgstr "%(pages)s Seiten"
 
-#: bookwyrm/templates/book/publisher_info.html:13
+#: bookwyrm/templates/book/publisher_info.html:38
 #, fuzzy, python-format
 #| msgid "%(pages)s pages"
 msgid "%(languages)s language"
 msgstr "%(pages)s Seiten"
 
-#: bookwyrm/templates/book/publisher_info.html:18
+#: bookwyrm/templates/book/publisher_info.html:64
 #, python-format
 msgid "Published %(date)s by %(publisher)s."
 msgstr "Am %(date)s von %(publisher)s veröffentlicht."
 
-#: bookwyrm/templates/book/publisher_info.html:20
+#: bookwyrm/templates/book/publisher_info.html:66
 #, fuzzy, python-format
 #| msgid "Published date:"
 msgid "Published %(date)s"
 msgstr "Veröffentlichungsdatum:"
 
-#: bookwyrm/templates/book/publisher_info.html:22
+#: bookwyrm/templates/book/publisher_info.html:68
 #, python-format
 msgid "Published by %(publisher)s."
 msgstr "Veröffentlicht von %(publisher)s."
 
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
-#: bookwyrm/templates/feed/feed_layout.html:57
+#: bookwyrm/templates/feed/feed_layout.html:70
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
 msgid "Close"
 msgstr "Schließen"
 
+#: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8
+#, fuzzy
+#| msgid "Boost status"
+msgid "Compose status"
+msgstr "Status teilen"
+
 #: bookwyrm/templates/directory/community_filter.html:5
 #, fuzzy
 #| msgid "Comment"
@@ -528,7 +604,7 @@ msgstr "Föderiert"
 
 #: bookwyrm/templates/directory/directory.html:6
 #: bookwyrm/templates/directory/directory.html:11
-#: bookwyrm/templates/layout.html:97
+#: bookwyrm/templates/layout.html:93
 msgid "Directory"
 msgstr ""
 
@@ -538,9 +614,15 @@ msgstr ""
 
 #: bookwyrm/templates/directory/directory.html:26
 #, fuzzy, python-format
-#| msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
-msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
-msgstr "Du kannst dein Leseziel jederzeit auf deiner <a href=\"%(path)s\">Profilseite</a> setzen oder ändern."
+#| msgid ""
+#| "You can set or change your reading goal any time from your <a href="
+#| "\"%(path)s\">profile page</a>"
+msgid ""
+"You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</"
+"a>"
+msgstr ""
+"Du kannst dein Leseziel jederzeit auf deiner <a href=\"%(path)s"
+"\">Profilseite</a> setzen oder ändern."
 
 #: bookwyrm/templates/directory/directory.html:31
 #: bookwyrm/templates/snippets/goal_card.html:22
@@ -661,7 +743,7 @@ msgid "Email address:"
 msgstr "E-Mail Adresse"
 
 #: bookwyrm/templates/discover/landing_layout.html:70
-#: bookwyrm/templates/moderation/report_modal.html:31
+#: bookwyrm/templates/moderation/report_modal.html:33
 msgid "Submit"
 msgstr "Absenden"
 
@@ -716,7 +798,9 @@ msgstr ""
 
 #: bookwyrm/templates/email/html_layout.html:21
 #, python-format
-msgid "BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a>"
+msgid ""
+"BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">"
+"%(site_name)s</a>"
 msgstr ""
 
 #: bookwyrm/templates/email/html_layout.html:23
@@ -736,12 +820,16 @@ msgstr ""
 
 #: bookwyrm/templates/email/invite/html_content.html:15
 #, python-format
-msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
+msgid ""
+"Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</"
+"a>."
 msgstr ""
 
 #: bookwyrm/templates/email/invite/text_content.html:4
 #, python-format
-msgid "You're invited to join %(site_name)s! Click the link below to create an account."
+msgid ""
+"You're invited to join %(site_name)s! Click the link below to create an "
+"account."
 msgstr ""
 
 #: bookwyrm/templates/email/invite/text_content.html:8
@@ -753,7 +841,9 @@ msgstr "Mehr über diese Seite"
 #: bookwyrm/templates/email/password_reset/html_content.html:6
 #: bookwyrm/templates/email/password_reset/text_content.html:4
 #, python-format
-msgid "You requested to reset your %(site_name)s password. Click the link below to set a new password and log in to your account."
+msgid ""
+"You requested to reset your %(site_name)s password. Click the link below to "
+"set a new password and log in to your account."
 msgstr ""
 
 #: bookwyrm/templates/email/password_reset/html_content.html:9
@@ -766,7 +856,8 @@ msgstr "Passwort zurücksetzen!"
 
 #: bookwyrm/templates/email/password_reset/html_content.html:13
 #: bookwyrm/templates/email/password_reset/text_content.html:8
-msgid "If you didn't request to reset your password, you can ignore this email."
+msgid ""
+"If you didn't request to reset your password, you can ignore this email."
 msgstr ""
 
 #: bookwyrm/templates/email/password_reset/subject.html:2
@@ -781,7 +872,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:87
+#: bookwyrm/templates/layout.html:88
 msgid "Direct Messages"
 msgstr "Direktnachrichten"
 
@@ -816,6 +907,7 @@ msgid "Local"
 msgstr "Lokal"
 
 #: bookwyrm/templates/feed/feed.html:25
+#: bookwyrm/templates/settings/edit_server.html:40
 msgid "Federated"
 msgstr "Föderiert"
 
@@ -825,7 +917,8 @@ msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed.html:48
-msgid "There aren't any activities right now! Try following a user to get started"
+msgid ""
+"There aren't any activities right now! Try following a user to get started"
 msgstr "Hier sind noch keine Aktivitäten! Folge anderen, um loszulegen"
 
 #: bookwyrm/templates/feed/feed.html:56
@@ -838,36 +931,38 @@ msgid "Updates"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:11
-#: bookwyrm/templates/layout.html:58
+#: bookwyrm/templates/layout.html:59
 #: bookwyrm/templates/user/books_header.html:3
 msgid "Your books"
 msgstr "Deine Bücher"
 
 #: bookwyrm/templates/feed/feed_layout.html:13
-msgid "There are no books here right now! Try searching for a book to get started"
-msgstr "Hier sind noch keine Bücher! Versuche nach Büchern zu suchen um loszulegen"
+msgid ""
+"There are no books here right now! Try searching for a book to get started"
+msgstr ""
+"Hier sind noch keine Bücher! Versuche nach Büchern zu suchen um loszulegen"
 
-#: bookwyrm/templates/feed/feed_layout.html:23
+#: bookwyrm/templates/feed/feed_layout.html:24
 #: bookwyrm/templates/user/shelf.html:28
 #, fuzzy
 #| msgid "Read"
 msgid "To Read"
 msgstr "Auf der Leseliste"
 
-#: bookwyrm/templates/feed/feed_layout.html:24
+#: bookwyrm/templates/feed/feed_layout.html:25
 #: bookwyrm/templates/user/shelf.html:28
 #, fuzzy
 #| msgid "Start reading"
 msgid "Currently Reading"
 msgstr "Gerade lesend"
 
-#: bookwyrm/templates/feed/feed_layout.html:25
+#: bookwyrm/templates/feed/feed_layout.html:26
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
 #: bookwyrm/templates/user/shelf.html:28
 msgid "Read"
 msgstr "Gelesen"
 
-#: bookwyrm/templates/feed/feed_layout.html:74 bookwyrm/templates/goal.html:26
+#: bookwyrm/templates/feed/feed_layout.html:88 bookwyrm/templates/goal.html:26
 #: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
 msgid "%(year)s Reading Goal"
@@ -900,7 +995,7 @@ msgid "What are you reading?"
 msgstr "Zu lesen angefangen"
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:58
+#: bookwyrm/templates/lists/list.html:101
 msgid "Search for a book"
 msgstr "Nach einem Buch suchen"
 
@@ -920,8 +1015,8 @@ msgstr ""
 #: bookwyrm/templates/get_started/books.html:17
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
-#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
-#: bookwyrm/templates/lists/list.html:62
+#: bookwyrm/templates/layout.html:38 bookwyrm/templates/layout.html:39
+#: bookwyrm/templates/lists/list.html:105
 msgid "Search"
 msgstr "Suche"
 
@@ -938,7 +1033,7 @@ msgid "Popular on %(site_name)s"
 msgstr "Ãœber %(site_name)s"
 
 #: bookwyrm/templates/get_started/books.html:51
-#: bookwyrm/templates/lists/list.html:75
+#: bookwyrm/templates/lists/list.html:118
 msgid "No books found"
 msgstr "Keine Bücher gefunden"
 
@@ -1016,7 +1111,9 @@ msgid "Show this account in suggested users:"
 msgstr ""
 
 #: bookwyrm/templates/get_started/profile.html:52
-msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users."
+msgid ""
+"Your account will show up in the directory, and may be recommended to other "
+"BookWyrm users."
 msgstr ""
 
 #: bookwyrm/templates/get_started/users.html:11
@@ -1043,8 +1140,12 @@ msgstr "Ziel bearbeiten"
 #: bookwyrm/templates/goal.html:30
 #: bookwyrm/templates/snippets/goal_card.html:13
 #, python-format
-msgid "Set a goal for how many books you'll finish reading in %(year)s, and track your progress throughout the year."
-msgstr "Setze dir ein Ziel, wie viele Bücher du %(year)s lesen wirst und behalte deinen Fortschritt über's Jahr im Auge."
+msgid ""
+"Set a goal for how many books you'll finish reading in %(year)s, and track "
+"your progress throughout the year."
+msgstr ""
+"Setze dir ein Ziel, wie viele Bücher du %(year)s lesen wirst und behalte "
+"deinen Fortschritt über's Jahr im Auge."
 
 #: bookwyrm/templates/goal.html:39
 #, python-format
@@ -1062,7 +1163,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "%(username)ss %(year)s Bücher"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/layout.html:102
+#: bookwyrm/templates/layout.html:98
 msgid "Import Books"
 msgstr "Bücher importieren"
 
@@ -1085,6 +1186,7 @@ msgid "Privacy setting for imported reviews:"
 msgstr "Datenschutzeinstellung für importierte Bewertungen"
 
 #: bookwyrm/templates/import.html:48
+#: bookwyrm/templates/settings/server_blocklist.html:64
 msgid "Import"
 msgstr "Importieren"
 
@@ -1127,8 +1229,12 @@ msgstr "Laden fehlgeschlagen"
 
 #: bookwyrm/templates/import_status.html:44
 #, python-format
-msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
-msgstr "Zum Ende der Liste springen, um die %(failed_count)s Einträge, deren Import fehlschlug, auszuwählen."
+msgid ""
+"Jump to the bottom of the list to select the %(failed_count)s items which "
+"failed to import."
+msgstr ""
+"Zum Ende der Liste springen, um die %(failed_count)s Einträge, deren Import "
+"fehlschlug, auszuwählen."
 
 #: bookwyrm/templates/import_status.html:79
 msgid "Select all"
@@ -1149,12 +1255,12 @@ msgstr "Buch"
 
 #: bookwyrm/templates/import_status.html:115
 #: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/user/shelf.html:76
+#: bookwyrm/templates/user/shelf.html:75 bookwyrm/templates/user/shelf.html:93
 msgid "Title"
 msgstr "Titel"
 
 #: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/user/shelf.html:77
+#: bookwyrm/templates/user/shelf.html:76 bookwyrm/templates/user/shelf.html:96
 msgid "Author"
 msgstr "Autor*in"
 
@@ -1191,91 +1297,94 @@ msgstr "Suchergebnisse für \"%(query)s\""
 msgid "Matching Books"
 msgstr "Passende Bücher"
 
-#: bookwyrm/templates/layout.html:33
+#: bookwyrm/templates/layout.html:34
 msgid "Search for a book or user"
 msgstr "Suche nach Buch oder Benutzer*in"
 
-#: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48
+#: bookwyrm/templates/layout.html:48 bookwyrm/templates/layout.html:49
 msgid "Main navigation menu"
 msgstr "Navigationshauptmenü"
 
-#: bookwyrm/templates/layout.html:61
+#: bookwyrm/templates/layout.html:62
 msgid "Feed"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:92
-#: bookwyrm/templates/preferences/preferences_layout.html:14
-msgid "Profile"
-msgstr "Profil"
-
-#: bookwyrm/templates/layout.html:107
+#: bookwyrm/templates/layout.html:103
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: bookwyrm/templates/layout.html:116
-#: bookwyrm/templates/settings/admin_layout.html:24
+#: bookwyrm/templates/layout.html:112
+#: bookwyrm/templates/settings/admin_layout.html:31
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
 #: bookwyrm/templates/settings/manage_invites.html:15
 msgid "Invites"
 msgstr "Einladungen"
 
-#: bookwyrm/templates/layout.html:123
+#: bookwyrm/templates/layout.html:119
 msgid "Admin"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:130
+#: bookwyrm/templates/layout.html:126
 msgid "Log out"
 msgstr "Abmelden"
 
-#: bookwyrm/templates/layout.html:138 bookwyrm/templates/layout.html:139
+#: bookwyrm/templates/layout.html:134 bookwyrm/templates/layout.html:135
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:10
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: bookwyrm/templates/layout.html:156 bookwyrm/templates/layout.html:160
+#: bookwyrm/templates/layout.html:152 bookwyrm/templates/layout.html:156
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:161
+#: bookwyrm/templates/layout.html:157
 msgid "password"
 msgstr "Passwort"
 
-#: bookwyrm/templates/layout.html:162 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:158 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: bookwyrm/templates/layout.html:165 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:161 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "Anmelden"
 
-#: bookwyrm/templates/layout.html:173
+#: bookwyrm/templates/layout.html:169
 msgid "Join"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:196
+#: bookwyrm/templates/layout.html:195
 msgid "About this server"
 msgstr "Ãœber diesen Server"
 
-#: bookwyrm/templates/layout.html:200
+#: bookwyrm/templates/layout.html:199
 msgid "Contact site admin"
 msgstr "Admin kontaktieren"
 
-#: bookwyrm/templates/layout.html:207
+#: bookwyrm/templates/layout.html:206
 #, python-format
-msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
-msgstr "%(site_name)s auf <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a> unterstützen"
+msgid ""
+"Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">"
+"%(support_title)s</a>"
+msgstr ""
+"%(site_name)s auf <a href=\"%(support_link)s\" target=\"_blank\">"
+"%(support_title)s</a> unterstützen"
 
-#: bookwyrm/templates/layout.html:211
-msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
-msgstr "BookWyrm ist open source Software. Du kannst dich auf <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> beteiligen oder etwas melden."
+#: bookwyrm/templates/layout.html:210
+msgid ""
+"BookWyrm is open source software. You can contribute or report issues on <a "
+"href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgstr ""
+"BookWyrm ist open source Software. Du kannst dich auf <a href=\"https://"
+"github.com/mouse-reeve/bookwyrm\">GitHub</a> beteiligen oder etwas melden."
 
 #: bookwyrm/templates/lists/create_form.html:5
-#: bookwyrm/templates/lists/lists.html:19
+#: bookwyrm/templates/lists/lists.html:20
 msgid "Create List"
 msgstr "Liste erstellen"
 
@@ -1341,7 +1450,7 @@ msgid "Anyone can suggest books, subject to your approval"
 msgstr "Alle können Bücher vorschlagen, du kannst diese bestätigen"
 
 #: bookwyrm/templates/lists/form.html:31
-#: bookwyrm/templates/moderation/reports.html:24
+#: bookwyrm/templates/moderation/reports.html:25
 msgid "Open"
 msgstr "Offen"
 
@@ -1349,46 +1458,84 @@ msgstr "Offen"
 msgid "Anyone can add books to this list"
 msgstr "Alle können Bücher hinzufügen"
 
-#: bookwyrm/templates/lists/list.html:17
+#: bookwyrm/templates/lists/list.html:19
+msgid "You successfully suggested a book for this list!"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:21
+#, fuzzy
+#| msgid "Anyone can add books to this list"
+msgid "You successfully added a book to this list!"
+msgstr "Alle können Bücher hinzufügen"
+
+#: bookwyrm/templates/lists/list.html:27
 msgid "This list is currently empty"
 msgstr "Diese Liste ist momentan leer"
 
-#: bookwyrm/templates/lists/list.html:35
+#: bookwyrm/templates/lists/list.html:46
 #, fuzzy, python-format
 #| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/lists/list.html:41
-#: bookwyrm/templates/snippets/shelf_selector.html:28
+#: bookwyrm/templates/lists/list.html:58
+#, fuzzy
+#| msgid "Started"
+msgid "Set"
+msgstr "Gestartet"
+
+#: bookwyrm/templates/lists/list.html:61
+#, fuzzy
+#| msgid "List curation:"
+msgid "List position"
+msgstr "Listenkuratierung:"
+
+#: bookwyrm/templates/lists/list.html:67
+#: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr "Entfernen"
 
-#: bookwyrm/templates/lists/list.html:54
+#: bookwyrm/templates/lists/list.html:80 bookwyrm/templates/lists/list.html:92
+#, fuzzy
+#| msgid "Your Lists"
+msgid "Sort List"
+msgstr "Deine Listen"
+
+#: bookwyrm/templates/lists/list.html:86
+#, fuzzy
+#| msgid "List curation:"
+msgid "Direction"
+msgstr "Listenkuratierung:"
+
+#: bookwyrm/templates/lists/list.html:97
 msgid "Add Books"
 msgstr "Bücher hinzufügen"
 
-#: bookwyrm/templates/lists/list.html:54
+#: bookwyrm/templates/lists/list.html:97
 msgid "Suggest Books"
 msgstr "Bücher vorschlagen"
 
-#: bookwyrm/templates/lists/list.html:63
+#: bookwyrm/templates/lists/list.html:106
 msgid "search"
 msgstr "suchen"
 
-#: bookwyrm/templates/lists/list.html:69
+#: bookwyrm/templates/lists/list.html:112
 msgid "Clear search"
 msgstr "Suche leeren"
 
-#: bookwyrm/templates/lists/list.html:74
+#: bookwyrm/templates/lists/list.html:117
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
 msgstr "Keine passenden Bücher zu \"%(query)s\" gefunden"
 
-#: bookwyrm/templates/lists/list.html:90
+#: bookwyrm/templates/lists/list.html:133
 msgid "Suggest"
 msgstr "Vorschlagen"
 
+#: bookwyrm/templates/lists/lists.html:14 bookwyrm/templates/user/lists.html:9
+msgid "Your Lists"
+msgstr "Deine Listen"
+
 #: bookwyrm/templates/login.html:4
 msgid "Login"
 msgstr ""
@@ -1406,65 +1553,41 @@ msgstr "Kontaktiere für eine Einladung eine*n Admin"
 msgid "More about this site"
 msgstr "Mehr über diese Seite"
 
-#: bookwyrm/templates/moderation/report.html:5
 #: bookwyrm/templates/moderation/report.html:6
+#: bookwyrm/templates/moderation/report.html:7
 #: bookwyrm/templates/moderation/report_preview.html:6
 #, python-format
 msgid "Report #%(report_id)s: %(username)s"
 msgstr "Meldung #%(report_id)s: %(username)s"
 
-#: bookwyrm/templates/moderation/report.html:10
+#: bookwyrm/templates/moderation/report.html:11
 msgid "Back to reports"
 msgstr "Zurück zu den Meldungen"
 
-#: bookwyrm/templates/moderation/report.html:18
-#, fuzzy
-#| msgid "Notifications"
-msgid "Actions"
-msgstr "Benachrichtigungen"
-
-#: bookwyrm/templates/moderation/report.html:19
-#, fuzzy
-#| msgid "User Profile"
-msgid "View user profile"
-msgstr "Benutzerprofil"
-
-#: bookwyrm/templates/moderation/report.html:22
-#: bookwyrm/templates/snippets/status/status_options.html:25
-#: bookwyrm/templates/snippets/user_options.html:13
-msgid "Send direct message"
-msgstr "Direktnachricht senden"
-
-#: bookwyrm/templates/moderation/report.html:27
-msgid "Deactivate user"
-msgstr "Nutzer:in deaktivieren"
-
-#: bookwyrm/templates/moderation/report.html:29
-msgid "Reactivate user"
-msgstr "Nutzer:in reaktivieren"
-
-#: bookwyrm/templates/moderation/report.html:36
+#: bookwyrm/templates/moderation/report.html:23
 msgid "Moderator Comments"
 msgstr "Moderator:innenkommentare"
 
-#: bookwyrm/templates/moderation/report.html:54
-#: bookwyrm/templates/snippets/create_status.html:12
-#: bookwyrm/templates/snippets/create_status_form.html:52
+#: bookwyrm/templates/moderation/report.html:41
+#: bookwyrm/templates/snippets/create_status.html:28
+#: bookwyrm/templates/snippets/create_status_form.html:53
 msgid "Comment"
 msgstr "Kommentieren"
 
-#: bookwyrm/templates/moderation/report.html:59
+#: bookwyrm/templates/moderation/report.html:46
 #, fuzzy
 #| msgid "Delete status"
 msgid "Reported statuses"
 msgstr "Post löschen"
 
-#: bookwyrm/templates/moderation/report.html:61
+#: bookwyrm/templates/moderation/report.html:48
 msgid "No statuses reported"
 msgstr "Keine Beiträge gemeldet"
 
-#: bookwyrm/templates/moderation/report.html:67
-msgid "Statuses has been deleted"
+#: bookwyrm/templates/moderation/report.html:54
+#, fuzzy
+#| msgid "Statuses has been deleted"
+msgid "Status has been deleted"
 msgstr "Beiträge wurden gelöscht"
 
 #: bookwyrm/templates/moderation/report_modal.html:6
@@ -1473,12 +1596,13 @@ msgstr "Beiträge wurden gelöscht"
 msgid "Report @%(username)s"
 msgstr "Listen: %(username)s"
 
-#: bookwyrm/templates/moderation/report_modal.html:21
+#: bookwyrm/templates/moderation/report_modal.html:23
 #, python-format
 msgid "This report will be sent to %(site_name)s's moderators for review."
-msgstr "Diese Meldung wird an die Moderator:innen von %(site_name)s weitergeletiet."
+msgstr ""
+"Diese Meldung wird an die Moderator:innen von %(site_name)s weitergeletiet."
 
-#: bookwyrm/templates/moderation/report_modal.html:22
+#: bookwyrm/templates/moderation/report_modal.html:24
 #, fuzzy
 #| msgid "More about this site"
 msgid "More info about this report:"
@@ -1509,26 +1633,26 @@ msgid "Reports: %(server_name)s"
 msgstr "Listen: %(username)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
-#: bookwyrm/templates/moderation/reports.html:16
-#: bookwyrm/templates/settings/admin_layout.html:28
+#: bookwyrm/templates/moderation/reports.html:17
+#: bookwyrm/templates/settings/admin_layout.html:35
 #, fuzzy
 #| msgid "Recent Imports"
 msgid "Reports"
 msgstr "Aktuelle Importe"
 
-#: bookwyrm/templates/moderation/reports.html:13
+#: bookwyrm/templates/moderation/reports.html:14
 #, fuzzy, python-format
 #| msgid "Lists: %(username)s"
 msgid "Reports: <small>%(server_name)s</small>"
 msgstr "Listen: %(username)s"
 
-#: bookwyrm/templates/moderation/reports.html:27
+#: bookwyrm/templates/moderation/reports.html:28
 #, fuzzy
 #| msgid "Shelved"
 msgid "Resolved"
 msgstr "Ins Regal gestellt"
 
-#: bookwyrm/templates/moderation/reports.html:34
+#: bookwyrm/templates/moderation/reports.html:37
 #, fuzzy
 #| msgid "No books found"
 msgid "No reports found."
@@ -1540,18 +1664,30 @@ msgstr "Benachrichtigungen löschen"
 
 #: bookwyrm/templates/notifications.html:53
 #, python-format
-msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr "hat deine <a href=\"%(related_path)s\">Bewertung von <em>%(book_title)s</em></a> favorisiert"
+msgid ""
+"favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+"hat deine <a href=\"%(related_path)s\">Bewertung von <em>%(book_title)s</"
+"em></a> favorisiert"
 
 #: bookwyrm/templates/notifications.html:55
 #, python-format
-msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
-msgstr "hat deinen <a href=\"%(related_path)s\">Kommentar zu <em>%(book_title)s</em></a> favorisiert"
+msgid ""
+"favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+"hat deinen <a href=\"%(related_path)s\">Kommentar zu <em>%(book_title)s</"
+"em></a> favorisiert"
 
 #: bookwyrm/templates/notifications.html:57
 #, python-format
-msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr " hat dein <a href=\"%(related_path)s\">Zitat aus <em>%(book_title)s</em></a> favorisiert"
+msgid ""
+"favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+" hat dein <a href=\"%(related_path)s\">Zitat aus <em>%(book_title)s</em></a> "
+"favorisiert"
 
 #: bookwyrm/templates/notifications.html:59
 #, python-format
@@ -1560,18 +1696,30 @@ msgstr "hat deinen <a href=\"%(related_path)s\">Status</a> favorisiert"
 
 #: bookwyrm/templates/notifications.html:64
 #, python-format
-msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr "hat dich in einer <a href=\"%(related_path)s\">Bewertung von <em>%(book_title)s</em></a> erwähnt"
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">review of <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+"hat dich in einer <a href=\"%(related_path)s\">Bewertung von <em>"
+"%(book_title)s</em></a> erwähnt"
 
 #: bookwyrm/templates/notifications.html:66
 #, python-format
-msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
-msgstr "hat dich in einem <a href=\"%(related_path)s\">Kommentar zu <em>%(book_title)s</em></a> erwähnt"
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">comment on <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+"hat dich in einem <a href=\"%(related_path)s\">Kommentar zu <em>"
+"%(book_title)s</em></a> erwähnt"
 
 #: bookwyrm/templates/notifications.html:68
 #, python-format
-msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr "hat dich in einem <a href=\"%(related_path)s\">Zitat von <em>%(book_title)s</em></a> erwähnt"
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">quote from <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+"hat dich in einem <a href=\"%(related_path)s\">Zitat von <em>%(book_title)s</"
+"em></a> erwähnt"
 
 #: bookwyrm/templates/notifications.html:70
 #, python-format
@@ -1580,23 +1728,39 @@ msgstr "hat dich in einem <a href=\"%(related_path)s\">Status</a> erwähnt"
 
 #: bookwyrm/templates/notifications.html:75
 #, python-format
-msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr "hat auf deine <a href=\"%(parent_path)s\">Bewertung von <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a> "
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">review of <em>%(book_title)s</em></a>"
+msgstr ""
+"hat auf deine <a href=\"%(parent_path)s\">Bewertung von <em>%(book_title)s</"
+"em></a> <a href=\"%(related_path)s\">geantwortet</a> "
 
 #: bookwyrm/templates/notifications.html:77
 #, python-format
-msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
-msgstr "hat auf deinen <a href=\"%(parent_path)s\">Kommentar zu <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a>"
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">comment on <em>%(book_title)s</em></a>"
+msgstr ""
+"hat auf deinen <a href=\"%(parent_path)s\">Kommentar zu <em>%(book_title)s</"
+"em></a> <a href=\"%(related_path)s\">geantwortet</a>"
 
 #: bookwyrm/templates/notifications.html:79
 #, python-format
-msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr "hat auf dein <a href=\"%(parent_path)s\">Zitat aus <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a>"
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">quote from <em>%(book_title)s</em></a>"
+msgstr ""
+"hat auf dein <a href=\"%(parent_path)s\">Zitat aus <em>%(book_title)s</em></"
+"a> <a href=\"%(related_path)s\">geantwortet</a>"
 
 #: bookwyrm/templates/notifications.html:81
 #, python-format
-msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
-msgstr "hat auf deinen <a href=\"%(parent_path)s\">Status</a> <a href=\"%(related_path)s\">geantwortet</a>"
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">status</a>"
+msgstr ""
+"hat auf deinen <a href=\"%(parent_path)s\">Status</a> <a href="
+"\"%(related_path)s\">geantwortet</a>"
 
 #: bookwyrm/templates/notifications.html:85
 msgid "followed you"
@@ -1608,18 +1772,30 @@ msgstr "hat dir eine Folgeanfrage geschickt"
 
 #: bookwyrm/templates/notifications.html:94
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr "hat deine <a href=\"%(related_path)s\">Bewertung von <em>%(book_title)s</em></a> geteilt"
+msgid ""
+"boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></"
+"a>"
+msgstr ""
+"hat deine <a href=\"%(related_path)s\">Bewertung von <em>%(book_title)s</"
+"em></a> geteilt"
 
 #: bookwyrm/templates/notifications.html:96
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
-msgstr "hat deinen <a href=\"%(related_path)s\">Kommentar zu<em>%(book_title)s</em></a> geteilt"
+msgid ""
+"boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></"
+"a>"
+msgstr ""
+"hat deinen <a href=\"%(related_path)s\">Kommentar zu<em>%(book_title)s</em></"
+"a> geteilt"
 
 #: bookwyrm/templates/notifications.html:98
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr "hat dein <a href=\"%(related_path)s\">Zitat aus <em>%(book_title)s</em></a> geteilt"
+msgid ""
+"boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+"hat dein <a href=\"%(related_path)s\">Zitat aus <em>%(book_title)s</em></a> "
+"geteilt"
 
 #: bookwyrm/templates/notifications.html:100
 #, python-format
@@ -1628,13 +1804,21 @@ msgstr "hat deinen <a href=\"%(related_path)s\">Status</a> geteilt"
 
 #: bookwyrm/templates/notifications.html:104
 #, python-format
-msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
-msgstr "hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> zu deiner Liste \"<a href=\"%(list_path)s\">%(list_name)s</a>\" Hinzugefügt"
+msgid ""
+" added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
+"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgstr ""
+"hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> zu deiner Liste "
+"\"<a href=\"%(list_path)s\">%(list_name)s</a>\" Hinzugefügt"
 
 #: bookwyrm/templates/notifications.html:106
 #, python-format
-msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
-msgstr "hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> für deine Liste \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\" vorgeschlagen"
+msgid ""
+" suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to "
+"your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgstr ""
+"hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> für deine Liste "
+"\"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\" vorgeschlagen"
 
 #: bookwyrm/templates/notifications.html:110
 #, python-format
@@ -1657,7 +1841,9 @@ msgstr "Passwort bestätigen:"
 
 #: bookwyrm/templates/password_reset_request.html:14
 msgid "A link to reset your password will be sent to your email address"
-msgstr "Ein Link zum Zurücksetzen deines Passworts wird an deine Mailadresse geschickt"
+msgstr ""
+"Ein Link zum Zurücksetzen deines Passworts wird an deine Mailadresse "
+"geschickt"
 
 #: bookwyrm/templates/password_reset_request.html:28
 msgid "Reset password"
@@ -1695,7 +1881,9 @@ msgstr "Angegebenes Leseziel im Feed anzeigen."
 
 #: bookwyrm/templates/preferences/edit_user.html:62
 #, python-format
-msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
+msgid ""
+"Your account will show up in the <a href=\"%(path)s\">directory</a>, and may "
+"be recommended to other BookWyrm users."
 msgstr ""
 
 #: bookwyrm/templates/preferences/edit_user.html:65
@@ -1706,6 +1894,10 @@ msgstr ""
 msgid "Account"
 msgstr ""
 
+#: bookwyrm/templates/preferences/preferences_layout.html:14
+msgid "Profile"
+msgstr "Profil"
+
 #: bookwyrm/templates/preferences/preferences_layout.html:20
 msgid "Relationships"
 msgstr "Beziehungen"
@@ -1735,133 +1927,215 @@ msgstr "Keine Liste für \"%(query)s\" gefunden"
 msgid "Administration"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:15
+#: bookwyrm/templates/settings/admin_layout.html:22
 msgid "Manage Users"
 msgstr "Nutzer*innen verwalten"
 
-#: bookwyrm/templates/settings/admin_layout.html:19
-#: bookwyrm/templates/settings/user_admin.html:3
-#: bookwyrm/templates/settings/user_admin.html:10
+#: bookwyrm/templates/settings/admin_layout.html:26
+#: bookwyrm/templates/user_admin/user_admin.html:3
+#: bookwyrm/templates/user_admin/user_admin.html:10
 msgid "Users"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/admin_layout.html:39
 #: bookwyrm/templates/settings/federation.html:3
 #: bookwyrm/templates/settings/federation.html:5
 msgid "Federated Servers"
 msgstr "Föderierende Server"
 
-#: bookwyrm/templates/settings/admin_layout.html:37
+#: bookwyrm/templates/settings/admin_layout.html:44
 msgid "Instance Settings"
 msgstr "Instanzeinstellungen"
 
-#: bookwyrm/templates/settings/admin_layout.html:41
+#: bookwyrm/templates/settings/admin_layout.html:48
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr "Seiteneinstellungen"
 
-#: bookwyrm/templates/settings/admin_layout.html:44
+#: bookwyrm/templates/settings/admin_layout.html:51
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr "Instanzinformationen"
 
-#: bookwyrm/templates/settings/admin_layout.html:45
+#: bookwyrm/templates/settings/admin_layout.html:52
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr "Bilder"
 
-#: bookwyrm/templates/settings/admin_layout.html:46
+#: bookwyrm/templates/settings/admin_layout.html:53
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr "Inhalt des Footers"
 
-#: bookwyrm/templates/settings/admin_layout.html:47
+#: bookwyrm/templates/settings/admin_layout.html:54
 #: bookwyrm/templates/settings/site.html:77
 msgid "Registration"
 msgstr "Registrierung"
 
-#: bookwyrm/templates/settings/federated_server.html:7
+#: bookwyrm/templates/settings/edit_server.html:3
+#: bookwyrm/templates/settings/edit_server.html:6
+#: bookwyrm/templates/settings/edit_server.html:20
+#: bookwyrm/templates/settings/federation.html:9
+#: bookwyrm/templates/settings/federation.html:10
+#: bookwyrm/templates/settings/server_blocklist.html:3
+#: bookwyrm/templates/settings/server_blocklist.html:20
+#, fuzzy
+#| msgid "Add cover"
+msgid "Add server"
+msgstr "Cover hinzufügen"
+
+#: bookwyrm/templates/settings/edit_server.html:7
+#: bookwyrm/templates/settings/federated_server.html:12
+#: bookwyrm/templates/settings/server_blocklist.html:7
 #, fuzzy
 #| msgid "Back to reports"
 msgid "Back to server list"
 msgstr "Zurück zu den Meldungen"
 
-#: bookwyrm/templates/settings/federated_server.html:12
-msgid "Details"
-msgstr ""
-
-#: bookwyrm/templates/settings/federated_server.html:15
-msgid "Software:"
-msgstr ""
-
-#: bookwyrm/templates/settings/federated_server.html:19
+#: bookwyrm/templates/settings/edit_server.html:16
+#: bookwyrm/templates/settings/server_blocklist.html:16
 #, fuzzy
-#| msgid "Description:"
-msgid "Version:"
-msgstr "Beschreibung:"
+#| msgid "Import book"
+msgid "Import block list"
+msgstr "Buch importieren"
 
-#: bookwyrm/templates/settings/federated_server.html:23
+#: bookwyrm/templates/settings/edit_server.html:30
+#, fuzzy
+#| msgid "Instance Name:"
+msgid "Instance:"
+msgstr "Instanzname"
+
+#: bookwyrm/templates/settings/edit_server.html:37
+#: bookwyrm/templates/settings/federated_server.html:29
+#: bookwyrm/templates/user_admin/user_info.html:34
 #, fuzzy
 #| msgid "Import Status"
 msgid "Status:"
 msgstr "Importstatus"
 
-#: bookwyrm/templates/settings/federated_server.html:30
+#: bookwyrm/templates/settings/edit_server.html:41
+#: bookwyrm/templates/settings/federated_server.html:9
+#, fuzzy
+#| msgid "Blocked Users"
+msgid "Blocked"
+msgstr "Blockierte Nutzer*innen"
+
+#: bookwyrm/templates/settings/edit_server.html:48
+#: bookwyrm/templates/settings/federated_server.html:21
+#: bookwyrm/templates/user_admin/user_info.html:26
+msgid "Software:"
+msgstr ""
+
+#: bookwyrm/templates/settings/edit_server.html:55
+#: bookwyrm/templates/settings/federated_server.html:25
+#: bookwyrm/templates/user_admin/user_info.html:30
+#, fuzzy
+#| msgid "Description:"
+msgid "Version:"
+msgstr "Beschreibung:"
+
+#: bookwyrm/templates/settings/edit_server.html:64
+msgid "Notes:"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:18
+msgid "Details"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:36
 #: bookwyrm/templates/user/user_layout.html:50
 msgid "Activity"
 msgstr "Aktivität"
 
-#: bookwyrm/templates/settings/federated_server.html:33
+#: bookwyrm/templates/settings/federated_server.html:39
 msgid "Users:"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:36
-#: bookwyrm/templates/settings/federated_server.html:43
+#: bookwyrm/templates/settings/federated_server.html:42
+#: bookwyrm/templates/settings/federated_server.html:49
 msgid "View all"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:40
+#: bookwyrm/templates/settings/federated_server.html:46
 #, fuzzy
 #| msgid "Recent Imports"
 msgid "Reports:"
 msgstr "Aktuelle Importe"
 
-#: bookwyrm/templates/settings/federated_server.html:47
+#: bookwyrm/templates/settings/federated_server.html:53
 #, fuzzy
 #| msgid "followed you"
 msgid "Followed by us:"
 msgstr "folgt dir"
 
-#: bookwyrm/templates/settings/federated_server.html:53
+#: bookwyrm/templates/settings/federated_server.html:59
 #, fuzzy
 #| msgid "followed you"
 msgid "Followed by them:"
 msgstr "folgt dir"
 
-#: bookwyrm/templates/settings/federated_server.html:59
+#: bookwyrm/templates/settings/federated_server.html:65
 #, fuzzy
 #| msgid "Blocked Users"
 msgid "Blocked by us:"
 msgstr "Blockierte Nutzer*innen"
 
-#: bookwyrm/templates/settings/federation.html:13
+#: bookwyrm/templates/settings/federated_server.html:77
+#: bookwyrm/templates/user_admin/user_info.html:39
+msgid "Notes"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:80
+#, fuzzy
+#| msgid "Edit Book"
+msgid "Edit"
+msgstr "Buch editieren"
+
+#: bookwyrm/templates/settings/federated_server.html:100
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:3
+#, fuzzy
+#| msgid "Notifications"
+msgid "Actions"
+msgstr "Benachrichtigungen"
+
+#: bookwyrm/templates/settings/federated_server.html:104
+#: bookwyrm/templates/snippets/block_button.html:5
+msgid "Block"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:105
+msgid "All users from this instance will be deactivated."
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:110
+#: bookwyrm/templates/snippets/block_button.html:10
+msgid "Un-block"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:111
+msgid "All users from this instance will be re-activated."
+msgstr ""
+
+#: bookwyrm/templates/settings/federation.html:20
+#: bookwyrm/templates/user_admin/server_filter.html:5
 msgid "Server name"
 msgstr "Servername"
 
-#: bookwyrm/templates/settings/federation.html:17
+#: bookwyrm/templates/settings/federation.html:24
 #, fuzzy
 #| msgid "Federated"
 msgid "Date federated"
 msgstr "Föderiert"
 
-#: bookwyrm/templates/settings/federation.html:21
+#: bookwyrm/templates/settings/federation.html:28
 msgid "Software"
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:24
-#: bookwyrm/templates/settings/manage_invite_requests.html:33
-#: bookwyrm/templates/settings/user_admin.html:32
+#: bookwyrm/templates/settings/federation.html:31
+#: bookwyrm/templates/settings/manage_invite_requests.html:44
+#: bookwyrm/templates/settings/status_filter.html:5
+#: bookwyrm/templates/user_admin/user_admin.html:34
 msgid "Status"
 msgstr ""
 
@@ -1878,63 +2152,74 @@ msgstr "Einladungen"
 msgid "Ignored Invite Requests"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:31
-msgid "Date"
-msgstr ""
+#: bookwyrm/templates/settings/manage_invite_requests.html:35
+#, fuzzy
+#| msgid "Federated"
+msgid "Date requested"
+msgstr "Föderiert"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:32
+#: bookwyrm/templates/settings/manage_invite_requests.html:39
+#, fuzzy
+#| msgid "Accept"
+msgid "Date accepted"
+msgstr "Annehmen"
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:42
 msgid "Email"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:34
+#: bookwyrm/templates/settings/manage_invite_requests.html:47
 #, fuzzy
 #| msgid "Notifications"
 msgid "Action"
 msgstr "Benachrichtigungen"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:37
+#: bookwyrm/templates/settings/manage_invite_requests.html:50
 #, fuzzy
 #| msgid "Follow Requests"
 msgid "No requests"
 msgstr "Folgeanfragen"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:45
+#: bookwyrm/templates/settings/manage_invite_requests.html:59
+#: bookwyrm/templates/settings/status_filter.html:16
 #, fuzzy
 #| msgid "Accept"
 msgid "Accepted"
 msgstr "Annehmen"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:47
+#: bookwyrm/templates/settings/manage_invite_requests.html:61
+#: bookwyrm/templates/settings/status_filter.html:12
 msgid "Sent"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:49
+#: bookwyrm/templates/settings/manage_invite_requests.html:63
+#: bookwyrm/templates/settings/status_filter.html:8
 msgid "Requested"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:57
+#: bookwyrm/templates/settings/manage_invite_requests.html:73
 msgid "Send invite"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:59
+#: bookwyrm/templates/settings/manage_invite_requests.html:75
 msgid "Re-send invite"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:70
+#: bookwyrm/templates/settings/manage_invite_requests.html:95
 msgid "Ignore"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:72
-msgid "Un-gnore"
+#: bookwyrm/templates/settings/manage_invite_requests.html:97
+msgid "Un-ignore"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:83
+#: bookwyrm/templates/settings/manage_invite_requests.html:108
 #, fuzzy
 #| msgid "Back to reports"
 msgid "Back to pending requests"
 msgstr "Zurück zu den Meldungen"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:85
+#: bookwyrm/templates/settings/manage_invite_requests.html:110
 msgid "View ignored requests"
 msgstr ""
 
@@ -1974,6 +2259,27 @@ msgstr "Mal benutzt"
 msgid "No active invites"
 msgstr "Keine aktiven Einladungen"
 
+#: bookwyrm/templates/settings/server_blocklist.html:6
+#, fuzzy
+#| msgid "Import Books"
+msgid "Import Blocklist"
+msgstr "Bücher importieren"
+
+#: bookwyrm/templates/settings/server_blocklist.html:26
+#: bookwyrm/templates/snippets/goal_progress.html:5
+msgid "Success!"
+msgstr "Erfolg!"
+
+#: bookwyrm/templates/settings/server_blocklist.html:30
+#, fuzzy
+#| msgid "Successfully imported"
+msgid "Successfully blocked:"
+msgstr "Erfolgreich importiert"
+
+#: bookwyrm/templates/settings/server_blocklist.html:32
+msgid "Failed:"
+msgstr ""
+
 #: bookwyrm/templates/settings/site.html:15
 msgid "Instance Name:"
 msgstr "Instanzname"
@@ -2032,152 +2338,108 @@ msgstr "Folgeanfragen"
 msgid "Registration closed text:"
 msgstr "Registrierungen geschlossen text"
 
-#: bookwyrm/templates/settings/user_admin.html:7
-#, python-format
-msgid "Users: <small>%(server_name)s</small>"
-msgstr ""
-
-#: bookwyrm/templates/settings/user_admin.html:20
+#: bookwyrm/templates/snippets/book_cover.html:20
+#: bookwyrm/templates/snippets/search_result_text.html:10
 #, fuzzy
-#| msgid "username"
-msgid "Username"
-msgstr "Username"
+#| msgid "Add cover"
+msgid "No cover"
+msgstr "Cover hinzufügen"
 
-#: bookwyrm/templates/settings/user_admin.html:24
-#, fuzzy
-#| msgid "Added:"
-msgid "Date Added"
-msgstr "Hinzugefügt:"
-
-#: bookwyrm/templates/settings/user_admin.html:28
-msgid "Last Active"
-msgstr ""
-
-#: bookwyrm/templates/settings/user_admin.html:36
-#, fuzzy
-#| msgid "Remove"
-msgid "Remote server"
-msgstr "Entfernen"
-
-#: bookwyrm/templates/settings/user_admin.html:45
-#, fuzzy
-#| msgid "Activity"
-msgid "Active"
-msgstr "Aktivität"
-
-#: bookwyrm/templates/settings/user_admin.html:45
-msgid "Inactive"
-msgstr ""
-
-#: bookwyrm/templates/settings/user_admin.html:50
-msgid "Not set"
-msgstr ""
-
-#: bookwyrm/templates/snippets/block_button.html:5
-msgid "Block"
-msgstr ""
-
-#: bookwyrm/templates/snippets/block_button.html:10
-msgid "Un-block"
-msgstr ""
-
-#: bookwyrm/templates/snippets/book_titleby.html:3
+#: bookwyrm/templates/snippets/book_titleby.html:4
 #, python-format
 msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgstr "<a href=\"%(path)s\">%(title)s</a> von "
 
 #: bookwyrm/templates/snippets/boost_button.html:8
 #: bookwyrm/templates/snippets/boost_button.html:9
-#: bookwyrm/templates/snippets/status/status_body.html:51
-#: bookwyrm/templates/snippets/status/status_body.html:52
-msgid "Boost status"
-msgstr "Status teilen"
+#, fuzzy
+#| msgid "boosted"
+msgid "Boost"
+msgstr "teilt"
 
+#: bookwyrm/templates/snippets/boost_button.html:15
 #: bookwyrm/templates/snippets/boost_button.html:16
-#: bookwyrm/templates/snippets/boost_button.html:17
-msgid "Un-boost status"
+#, fuzzy
+#| msgid "Un-boost status"
+msgid "Un-boost"
 msgstr "Teilen zurücknehmen"
 
 #: bookwyrm/templates/snippets/content_warning_field.html:3
 msgid "Spoiler alert:"
 msgstr "Spoileralarm:"
 
-#: bookwyrm/templates/snippets/content_warning_field.html:4
+#: bookwyrm/templates/snippets/content_warning_field.html:10
 msgid "Spoilers ahead!"
 msgstr "Spoileralarm!"
 
-#: bookwyrm/templates/snippets/create_status.html:9
+#: bookwyrm/templates/snippets/create_status.html:17
 msgid "Review"
 msgstr "Bewerten"
 
-#: bookwyrm/templates/snippets/create_status.html:15
+#: bookwyrm/templates/snippets/create_status.html:39
 msgid "Quote"
 msgstr "Zitieren"
 
-#: bookwyrm/templates/snippets/create_status_form.html:18
+#: bookwyrm/templates/snippets/create_status_form.html:20
 #, fuzzy
 #| msgid "Comment"
 msgid "Comment:"
 msgstr "Kommentieren"
 
-#: bookwyrm/templates/snippets/create_status_form.html:20
+#: bookwyrm/templates/snippets/create_status_form.html:22
 #, fuzzy
 #| msgid "Quote"
 msgid "Quote:"
 msgstr "Zitieren"
 
-#: bookwyrm/templates/snippets/create_status_form.html:22
+#: bookwyrm/templates/snippets/create_status_form.html:24
 #, fuzzy
 #| msgid "Review"
 msgid "Review:"
 msgstr "Bewerten"
 
-#: bookwyrm/templates/snippets/create_status_form.html:29
-#: bookwyrm/templates/user/shelf.html:81
-msgid "Rating"
-msgstr ""
+#: bookwyrm/templates/snippets/create_status_form.html:42
+#: bookwyrm/templates/snippets/status/layout.html:30
+#: bookwyrm/templates/snippets/status/layout.html:48
+#: bookwyrm/templates/snippets/status/layout.html:49
+msgid "Reply"
+msgstr "Antwort"
 
-#: bookwyrm/templates/snippets/create_status_form.html:31
-#: bookwyrm/templates/snippets/rate_action.html:14
-#: bookwyrm/templates/snippets/stars.html:3
-msgid "No rating"
-msgstr "Kein Rating"
-
-#: bookwyrm/templates/snippets/create_status_form.html:64
+#: bookwyrm/templates/snippets/create_status_form.html:67
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
 msgid "Progress:"
 msgstr "Fortschritt:"
 
-#: bookwyrm/templates/snippets/create_status_form.html:71
+#: bookwyrm/templates/snippets/create_status_form.html:75
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr "Seiten"
 
-#: bookwyrm/templates/snippets/create_status_form.html:72
+#: bookwyrm/templates/snippets/create_status_form.html:76
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr "Prozent"
 
-#: bookwyrm/templates/snippets/create_status_form.html:77
+#: bookwyrm/templates/snippets/create_status_form.html:82
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "von %(pages)s Seiten"
 
-#: bookwyrm/templates/snippets/create_status_form.html:89
+#: bookwyrm/templates/snippets/create_status_form.html:97
 msgid "Include spoiler alert"
 msgstr "Spoileralarm aktivieren"
 
-#: bookwyrm/templates/snippets/create_status_form.html:95
+#: bookwyrm/templates/snippets/create_status_form.html:104
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:19
 msgid "Private"
 msgstr "Privat"
 
-#: bookwyrm/templates/snippets/create_status_form.html:102
+#: bookwyrm/templates/snippets/create_status_form.html:115
 msgid "Post"
 msgstr "Absenden"
 
@@ -2187,24 +2449,28 @@ msgstr "Diese Lesedaten löschen?"
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
 #, python-format
-msgid "You are deleting this readthrough and its %(count)s associated progress updates."
-msgstr "Du löscht diesen Leseforschritt und %(count)s zugehörige Fortschrittsupdates."
+msgid ""
+"You are deleting this readthrough and its %(count)s associated progress "
+"updates."
+msgstr ""
+"Du löscht diesen Leseforschritt und %(count)s zugehörige Fortschrittsupdates."
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
 #: bookwyrm/templates/snippets/follow_request_buttons.html:13
+#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:391
 msgid "Delete"
 msgstr "Löschen"
 
 #: bookwyrm/templates/snippets/fav_button.html:7
-#: bookwyrm/templates/snippets/fav_button.html:8
-#: bookwyrm/templates/snippets/status/status_body.html:55
-#: bookwyrm/templates/snippets/status/status_body.html:56
-msgid "Like status"
-msgstr "Status favorisieren"
+#: bookwyrm/templates/snippets/fav_button.html:9
+msgid "Like"
+msgstr ""
 
 #: bookwyrm/templates/snippets/fav_button.html:15
 #: bookwyrm/templates/snippets/fav_button.html:16
-msgid "Un-like status"
+#, fuzzy
+#| msgid "Un-like status"
+msgid "Un-like"
 msgstr "Favorisieren zurücknehmen"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:7
@@ -2217,11 +2483,11 @@ msgstr "Weniger anzeigen"
 msgid "Hide filters"
 msgstr ""
 
-#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:19
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:22
 msgid "Apply filters"
 msgstr ""
 
-#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:23
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:26
 #, fuzzy
 #| msgid "Clear search"
 msgid "Clear filters"
@@ -2245,6 +2511,11 @@ msgstr "Entfolgen"
 msgid "Accept"
 msgstr "Annehmen"
 
+#: bookwyrm/templates/snippets/form_rate_stars.html:20
+#: bookwyrm/templates/snippets/stars.html:13
+msgid "No rating"
+msgstr "Kein Rating"
+
 #: bookwyrm/templates/snippets/generated_status/goal.html:1
 #, python-format
 msgid "set a goal to read %(counter)s book in %(year)s"
@@ -2255,15 +2526,19 @@ msgstr[1] "Setze das Ziel, %(year)s %(counter)s Bücher zu lesen"
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
 #, fuzzy, python-format
 #| msgid "<a href=\"%(path)s\">%(title)s</a> by "
-msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
-msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
+msgid ""
+"Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
+msgid_plural ""
+"Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
 msgstr[0] "<a href=\"%(path)s\">%(title)s</a> von "
 msgstr[1] "<a href=\"%(path)s\">%(title)s</a> von "
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4
 #, python-format
-msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
-msgid_plural "Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
+msgid ""
+"Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
+msgid_plural ""
+"Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -2274,8 +2549,12 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/goal_card.html:23
 #, python-format
-msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
-msgstr "Du kannst dein Leseziel jederzeit auf deiner <a href=\"%(path)s\">Profilseite</a> setzen oder ändern."
+msgid ""
+"You can set or change your reading goal any time from your <a href=\"%(path)s"
+"\">profile page</a>"
+msgstr ""
+"Du kannst dein Leseziel jederzeit auf deiner <a href=\"%(path)s"
+"\">Profilseite</a> setzen oder ändern."
 
 #: bookwyrm/templates/snippets/goal_form.html:9
 msgid "Reading goal:"
@@ -2300,10 +2579,6 @@ msgstr "Posten"
 msgid "Set goal"
 msgstr "Ziel setzen"
 
-#: bookwyrm/templates/snippets/goal_progress.html:5
-msgid "Success!"
-msgstr "Erfolg!"
-
 #: bookwyrm/templates/snippets/goal_progress.html:7
 #, python-format
 msgid "%(percent)s%% complete!"
@@ -2311,19 +2586,38 @@ msgstr "%(percent)s%% komplett!"
 
 #: bookwyrm/templates/snippets/goal_progress.html:10
 #, python-format
-msgid "You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
-msgstr "Du hast <a href=\"%(path)s\">%(read_count)s von %(goal_count)s Büchern</a> gelesen."
+msgid ""
+"You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgstr ""
+"Du hast <a href=\"%(path)s\">%(read_count)s von %(goal_count)s Büchern</a> "
+"gelesen."
 
 #: bookwyrm/templates/snippets/goal_progress.html:12
 #, python-format
-msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
-msgstr "%(username)s hat <a href=\"%(path)s\">%(read_count)s von %(goal_count)s Büchern</a> gelesen."
+msgid ""
+"%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s "
+"books</a>."
+msgstr ""
+"%(username)s hat <a href=\"%(path)s\">%(read_count)s von %(goal_count)s "
+"Büchern</a> gelesen."
 
-#: bookwyrm/templates/snippets/pagination.html:7
+#: bookwyrm/templates/snippets/page_text.html:4
+#, fuzzy, python-format
+#| msgid "of %(pages)s pages"
+msgid "page %(page)s of %(total_pages)s"
+msgstr "von %(pages)s Seiten"
+
+#: bookwyrm/templates/snippets/page_text.html:6
+#, fuzzy, python-format
+#| msgid "%(pages)s pages"
+msgid "page %(page)s"
+msgstr "%(pages)s Seiten"
+
+#: bookwyrm/templates/snippets/pagination.html:12
 msgid "Previous"
 msgstr "Zurück"
 
-#: bookwyrm/templates/snippets/pagination.html:15
+#: bookwyrm/templates/snippets/pagination.html:23
 msgid "Next"
 msgstr "Weiter"
 
@@ -2356,7 +2650,7 @@ msgstr "Folgende"
 msgid "Leave a rating"
 msgstr "Raten"
 
-#: bookwyrm/templates/snippets/rate_action.html:29
+#: bookwyrm/templates/snippets/rate_action.html:19
 msgid "Rate"
 msgstr ""
 
@@ -2364,28 +2658,28 @@ msgstr ""
 msgid "Progress Updates:"
 msgstr "Fortschrittsupdates:"
 
-#: bookwyrm/templates/snippets/readthrough.html:12
+#: bookwyrm/templates/snippets/readthrough.html:14
 msgid "finished"
 msgstr "Abgeschlossen"
 
-#: bookwyrm/templates/snippets/readthrough.html:15
+#: bookwyrm/templates/snippets/readthrough.html:25
 msgid "Show all updates"
 msgstr "Zeige alle Updates"
 
-#: bookwyrm/templates/snippets/readthrough.html:31
+#: bookwyrm/templates/snippets/readthrough.html:41
 msgid "Delete this progress update"
 msgstr "Dieses Fortschrittsupdate löschen"
 
-#: bookwyrm/templates/snippets/readthrough.html:41
+#: bookwyrm/templates/snippets/readthrough.html:51
 msgid "started"
 msgstr "Angefangen"
 
-#: bookwyrm/templates/snippets/readthrough.html:47
-#: bookwyrm/templates/snippets/readthrough.html:61
+#: bookwyrm/templates/snippets/readthrough.html:57
+#: bookwyrm/templates/snippets/readthrough.html:71
 msgid "Edit read dates"
 msgstr "Lesedaten bearbeiten"
 
-#: bookwyrm/templates/snippets/readthrough.html:51
+#: bookwyrm/templates/snippets/readthrough.html:61
 msgid "Delete these read dates"
 msgstr "Diese Lesedaten löschen"
 
@@ -2415,31 +2709,25 @@ msgid "Report"
 msgstr "Importieren"
 
 #: bookwyrm/templates/snippets/rss_title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:11
+#: bookwyrm/templates/snippets/status/status_header.html:34
 msgid "rated"
 msgstr ""
 
 #: bookwyrm/templates/snippets/rss_title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:13
+#: bookwyrm/templates/snippets/status/status_header.html:36
 msgid "reviewed"
 msgstr "bewertete"
 
 #: bookwyrm/templates/snippets/rss_title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:15
+#: bookwyrm/templates/snippets/status/status_header.html:38
 msgid "commented on"
 msgstr "kommentierte"
 
 #: bookwyrm/templates/snippets/rss_title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:17
+#: bookwyrm/templates/snippets/status/status_header.html:40
 msgid "quoted"
 msgstr "zitierte"
 
-#: bookwyrm/templates/snippets/search_result_text.html:10
-#, fuzzy
-#| msgid "Add cover"
-msgid "No cover"
-msgstr "Cover hinzufügen"
-
 #: bookwyrm/templates/snippets/search_result_text.html:22
 #, python-format
 msgid "by %(author)s"
@@ -2461,7 +2749,7 @@ msgid "Finish \"<em>%(book_title)s</em>\""
 msgstr "\"<em>%(book_title)s</em>\" abschließen"
 
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:35
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:34
 #, fuzzy
 #| msgid "Progress"
 msgid "Update progress"
@@ -2484,7 +2772,7 @@ msgstr "Lesen abschließen"
 msgid "Want to read"
 msgstr "Auf Leseliste setzen"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:48
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
 #, fuzzy, python-format
 #| msgid "Lists: %(username)s"
 msgid "Remove from %(name)s"
@@ -2500,64 +2788,68 @@ msgstr "\"<em>%(book_title)s</em>\" beginnen"
 msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgstr "\"<em>%(book_title)s</em>\" auf Leseliste setzen"
 
+#: bookwyrm/templates/snippets/status/content_status.html:67
+#: bookwyrm/templates/snippets/trimmed_text.html:14
+msgid "Show more"
+msgstr "Mehr anzeigen"
+
+#: bookwyrm/templates/snippets/status/content_status.html:82
+#: bookwyrm/templates/snippets/trimmed_text.html:29
+msgid "Show less"
+msgstr "Weniger anzeigen"
+
+#: bookwyrm/templates/snippets/status/content_status.html:112
+msgid "Open image in new window"
+msgstr "Bild in neuem Fenster öffnen"
+
+#: bookwyrm/templates/snippets/status/layout.html:22
+#: bookwyrm/templates/snippets/status/status_options.html:17
+msgid "Delete status"
+msgstr "Post löschen"
+
+#: bookwyrm/templates/snippets/status/layout.html:52
+#: bookwyrm/templates/snippets/status/layout.html:53
+msgid "Boost status"
+msgstr "Status teilen"
+
+#: bookwyrm/templates/snippets/status/layout.html:56
+#: bookwyrm/templates/snippets/status/layout.html:57
+msgid "Like status"
+msgstr "Status favorisieren"
+
 #: bookwyrm/templates/snippets/status/status.html:9
 msgid "boosted"
 msgstr "teilt"
 
-#: bookwyrm/templates/snippets/status/status_body.html:27
-#: bookwyrm/templates/snippets/status/status_options.html:18
-msgid "Delete status"
-msgstr "Post löschen"
-
-#: bookwyrm/templates/snippets/status/status_body.html:34
-#: bookwyrm/templates/snippets/status/status_body.html:47
-#: bookwyrm/templates/snippets/status/status_body.html:48
-msgid "Reply"
-msgstr "Antwort"
-
-#: bookwyrm/templates/snippets/status/status_content.html:18
-#: bookwyrm/templates/snippets/trimmed_text.html:15
-msgid "Show more"
-msgstr "Mehr anzeigen"
-
-#: bookwyrm/templates/snippets/status/status_content.html:25
-#: bookwyrm/templates/snippets/trimmed_text.html:25
-msgid "Show less"
-msgstr "Weniger anzeigen"
-
-#: bookwyrm/templates/snippets/status/status_content.html:46
-msgid "Open image in new window"
-msgstr "Bild in neuem Fenster öffnen"
-
-#: bookwyrm/templates/snippets/status/status_header.html:22
+#: bookwyrm/templates/snippets/status/status_header.html:44
 #, fuzzy, python-format
-#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
-msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">review</a>"
-msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
-
-#: bookwyrm/templates/snippets/status/status_header.html:24
-#, fuzzy, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
-msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">comment</a>"
-msgstr "hat auf deinen <a href=\"%(parent_path)s\">Status</a> geantwortet</a>"
-
-#: bookwyrm/templates/snippets/status/status_header.html:26
-#, fuzzy, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
-msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">quote</a>"
-msgstr "hat auf deinen <a href=\"%(parent_path)s\">Status</a> <a href=\"%(related_path)s\">geantwortet</a>"
-
-#: bookwyrm/templates/snippets/status/status_header.html:28
-#, fuzzy, python-format
-#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
-msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
-msgstr "hat auf deinen <a href=\"%(parent_path)s\">Status</a> <a href=\"%(related_path)s\">geantwortet</a>"
+#| msgid ""
+#| "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+#| "\">status</a>"
+msgid ""
+"replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
+"\"%(status_path)s\">status</a>"
+msgstr ""
+"hat auf deinen <a href=\"%(parent_path)s\">Status</a> <a href="
+"\"%(related_path)s\">geantwortet</a>"
 
 #: bookwyrm/templates/snippets/status/status_options.html:7
 #: bookwyrm/templates/snippets/user_options.html:7
 msgid "More options"
 msgstr "Mehr Optionen"
 
+#: bookwyrm/templates/snippets/status/status_options.html:26
+#, fuzzy
+#| msgid "Delete these read dates"
+msgid "Delete & re-draft"
+msgstr "Diese Lesedaten löschen"
+
+#: bookwyrm/templates/snippets/status/status_options.html:35
+#: bookwyrm/templates/snippets/user_options.html:13
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:6
+msgid "Send direct message"
+msgstr "Direktnachricht senden"
+
 #: bookwyrm/templates/snippets/switch_edition_button.html:5
 msgid "Switch to this edition"
 msgstr "Zu dieser Edition wechseln"
@@ -2574,19 +2866,6 @@ msgstr "Zu lesen angefangen"
 msgid "Sorted descending"
 msgstr "Zu lesen angefangen"
 
-#: bookwyrm/templates/snippets/tag.html:14
-msgid "Remove tag"
-msgstr "Tag entfernen"
-
-#: bookwyrm/templates/snippets/tag.html:18
-msgid "Add tag"
-msgstr "Tag hinzufügen"
-
-#: bookwyrm/templates/tag.html:9
-#, python-format
-msgid "Books tagged \"%(tag.name)s\""
-msgstr "Mit \"%(tag.name)s\" markierte Bücher"
-
 #: bookwyrm/templates/user/books_header.html:5
 #, fuzzy, python-format
 #| msgid "%(username)s's %(year)s Books"
@@ -2626,10 +2905,6 @@ msgstr "Folgend"
 msgid "%(username)s isn't following any users"
 msgstr "%(username)s folgt niemandem"
 
-#: bookwyrm/templates/user/lists.html:9
-msgid "Your Lists"
-msgstr "Deine Listen"
-
 #: bookwyrm/templates/user/lists.html:11
 #, python-format
 msgid "Lists: %(username)s"
@@ -2639,7 +2914,7 @@ msgstr "Listen: %(username)s"
 msgid "Create list"
 msgstr "Liste Erstellen"
 
-#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:56
+#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:51
 #, fuzzy
 #| msgid "books"
 msgid "All books"
@@ -2653,23 +2928,23 @@ msgstr "Regal erstellen"
 msgid "Edit shelf"
 msgstr "Regal bearbeiten"
 
-#: bookwyrm/templates/user/shelf.html:78
+#: bookwyrm/templates/user/shelf.html:77 bookwyrm/templates/user/shelf.html:99
 msgid "Shelved"
 msgstr "Ins Regal gestellt"
 
-#: bookwyrm/templates/user/shelf.html:79
+#: bookwyrm/templates/user/shelf.html:78 bookwyrm/templates/user/shelf.html:103
 msgid "Started"
 msgstr "Gestartet"
 
-#: bookwyrm/templates/user/shelf.html:80
+#: bookwyrm/templates/user/shelf.html:79 bookwyrm/templates/user/shelf.html:106
 msgid "Finished"
 msgstr "Abgeschlossen"
 
-#: bookwyrm/templates/user/shelf.html:127
+#: bookwyrm/templates/user/shelf.html:132
 msgid "This shelf is empty."
 msgstr "Dieses Regal ist leer."
 
-#: bookwyrm/templates/user/shelf.html:133
+#: bookwyrm/templates/user/shelf.html:138
 msgid "Delete shelf"
 msgstr "Regal löschen"
 
@@ -2735,6 +3010,87 @@ msgstr[1] "%(counter)s Folgende"
 msgid "%(counter)s following"
 msgstr "Folgt %(counter)s"
 
+#: bookwyrm/templates/user_admin/user.html:11
+#, fuzzy
+#| msgid "Back to reports"
+msgid "Back to users"
+msgstr "Zurück zu den Meldungen"
+
+#: bookwyrm/templates/user_admin/user_admin.html:7
+#, python-format
+msgid "Users: <small>%(server_name)s</small>"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_admin.html:22
+#: bookwyrm/templates/user_admin/username_filter.html:5
+#, fuzzy
+#| msgid "username"
+msgid "Username"
+msgstr "Username"
+
+#: bookwyrm/templates/user_admin/user_admin.html:26
+#, fuzzy
+#| msgid "Added:"
+msgid "Date Added"
+msgstr "Hinzugefügt:"
+
+#: bookwyrm/templates/user_admin/user_admin.html:30
+msgid "Last Active"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_admin.html:38
+#, fuzzy
+#| msgid "Remove"
+msgid "Remote server"
+msgstr "Entfernen"
+
+#: bookwyrm/templates/user_admin/user_admin.html:47
+#, fuzzy
+#| msgid "Activity"
+msgid "Active"
+msgstr "Aktivität"
+
+#: bookwyrm/templates/user_admin/user_admin.html:47
+msgid "Inactive"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_admin.html:52
+#: bookwyrm/templates/user_admin/user_info.html:49
+msgid "Not set"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_info.html:5
+msgid "User details"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_info.html:14
+#, fuzzy
+#| msgid "User Profile"
+msgid "View user profile"
+msgstr "Benutzerprofil"
+
+#: bookwyrm/templates/user_admin/user_info.html:20
+#, fuzzy
+#| msgid "Instance Settings"
+msgid "Instance details"
+msgstr "Instanzeinstellungen"
+
+#: bookwyrm/templates/user_admin/user_info.html:46
+msgid "View instance"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:11
+msgid "Suspend user"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:13
+msgid "Un-suspend user"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:21
+msgid "Access level:"
+msgstr ""
+
 #: bookwyrm/views/password.py:32
 #, fuzzy
 #| msgid "A user with that username already exists."
@@ -2746,6 +3102,1443 @@ msgstr "Dieser Benutzename ist bereits vergeben."
 msgid "A password reset link sent to %s"
 msgstr ""
 
+#: venv3/lib/python3.8/site-packages/_pytest/config/argparsing.py:442
+#, python-format
+msgid "ambiguous option: %(option)s could match %(matches)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/contrib/messages/apps.py:7
+#, fuzzy
+#| msgid "All messages"
+msgid "Messages"
+msgstr "Alle Nachrichten"
+
+#: venv3/lib/python3.8/site-packages/django/contrib/sitemaps/apps.py:7
+msgid "Site Maps"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/contrib/staticfiles/apps.py:9
+msgid "Static Files"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/contrib/syndication/apps.py:7
+msgid "Syndication"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/paginator.py:45
+msgid "That page number is not an integer"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/paginator.py:47
+msgid "That page number is less than 1"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/paginator.py:52
+msgid "That page contains no results"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:32
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid value."
+msgstr "E-Mail Adresse"
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:103
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:659
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid URL."
+msgstr "E-Mail Adresse"
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:155
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid integer."
+msgstr "E-Mail Adresse"
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:166
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid email address."
+msgstr "E-Mail Adresse"
+
+#. Translators: "letters" means latin letters: a-z and A-Z.
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:240
+msgid ""
+"Enter a valid “slug� consisting of letters, numbers, underscores or hyphens."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:247
+msgid ""
+"Enter a valid “slug� consisting of Unicode letters, numbers, underscores, or "
+"hyphens."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:256
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:276
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid IPv4 address."
+msgstr "E-Mail Adresse"
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:261
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:277
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid IPv6 address."
+msgstr "E-Mail Adresse"
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:271
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:275
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "E-Mail Adresse"
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:305
+msgid "Enter only digits separated by commas."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:311
+#, python-format
+msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:343
+#, python-format
+msgid "Ensure this value is less than or equal to %(limit_value)s."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:352
+#, python-format
+msgid "Ensure this value is greater than or equal to %(limit_value)s."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:362
+#, python-format
+msgid ""
+"Ensure this value has at least %(limit_value)d character (it has "
+"%(show_value)d)."
+msgid_plural ""
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:377
+#, python-format
+msgid ""
+"Ensure this value has at most %(limit_value)d character (it has "
+"%(show_value)d)."
+msgid_plural ""
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:396
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:291
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:326
+#, fuzzy
+#| msgid "Series number:"
+msgid "Enter a number."
+msgstr "Seriennummer:"
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:398
+#, python-format
+msgid "Ensure that there are no more than %(max)s digit in total."
+msgid_plural "Ensure that there are no more than %(max)s digits in total."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:403
+#, python-format
+msgid "Ensure that there are no more than %(max)s decimal place."
+msgid_plural "Ensure that there are no more than %(max)s decimal places."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:408
+#, python-format
+msgid ""
+"Ensure that there are no more than %(max)s digit before the decimal point."
+msgid_plural ""
+"Ensure that there are no more than %(max)s digits before the decimal point."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:470
+#, python-format
+msgid ""
+"File extension “%(extension)s� is not allowed. Allowed extensions are: "
+"%(allowed_extensions)s."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:522
+msgid "Null characters are not allowed."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/base.py:1181
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:759
+msgid "and"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/base.py:1183
+#, fuzzy, python-format
+#| msgid "A user with that username already exists."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr "Dieser Benutzename ist bereits vergeben."
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:104
+#, fuzzy, python-format
+#| msgid "%(value)s is not a valid remote_id"
+msgid "Value %(value)r is not a valid choice."
+msgstr "%(value)s ist keine gültige remote_id"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:105
+#, fuzzy
+#| msgid "This shelf is empty."
+msgid "This field cannot be null."
+msgstr "Dieses Regal ist leer."
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:106
+msgid "This field cannot be blank."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:107
+#, fuzzy, python-format
+#| msgid "A user with that username already exists."
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "Dieser Benutzename ist bereits vergeben."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:130
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:937
+#, python-format
+msgid "“%(value)s� value must be either True or False."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:938
+#, python-format
+msgid "“%(value)s� value must be either True, False, or None."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:940
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:981
+#, python-format
+msgid "String (up to %(max_length)s)"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1045
+#, fuzzy
+#| msgid "No active invites"
+msgid "Comma-separated integers"
+msgstr "Keine aktiven Einladungen"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1094
+#, python-format
+msgid ""
+"“%(value)s� value has an invalid date format. It must be in YYYY-MM-DD "
+"format."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1096
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1239
+#, python-format
+msgid ""
+"“%(value)s� value has the correct format (YYYY-MM-DD) but it is an invalid "
+"date."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1099
+msgid "Date (without time)"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1237
+#, python-format
+msgid ""
+"“%(value)s� value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1241
+#, python-format
+msgid ""
+"“%(value)s� value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"[TZ]) but it is an invalid date/time."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1245
+msgid "Date (with time)"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1393
+#, fuzzy, python-format
+#| msgid "%(value)s is not a valid username"
+msgid "“%(value)s� value must be a decimal number."
+msgstr "%(value)s ist kein gültiger Username"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1395
+#, fuzzy
+#| msgid "Series number:"
+msgid "Decimal number"
+msgstr "Seriennummer:"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1534
+#, python-format
+msgid ""
+"“%(value)s� value has an invalid format. It must be in [DD] [[HH:]MM:]ss[."
+"uuuuuu] format."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1537
+#, fuzzy
+#| msgid "List curation:"
+msgid "Duration"
+msgstr "Listenkuratierung:"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1587
+#, fuzzy
+#| msgid "Email address:"
+msgid "Email address"
+msgstr "E-Mail Adresse"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1610
+msgid "File path"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1676
+#, fuzzy, python-format
+#| msgid "%(value)s is not a valid username"
+msgid "“%(value)s� value must be a float."
+msgstr "%(value)s ist kein gültiger Username"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1678
+msgid "Floating point number"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1716
+#, python-format
+msgid "“%(value)s� value must be an integer."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1718
+msgid "Integer"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1801
+#, fuzzy
+#| msgid "No active invites"
+msgid "Big (8 byte) integer"
+msgstr "Keine aktiven Einladungen"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1817
+#, fuzzy
+#| msgid "Email address:"
+msgid "IPv4 address"
+msgstr "E-Mail Adresse"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1848
+#, fuzzy
+#| msgid "Email address:"
+msgid "IP address"
+msgstr "E-Mail Adresse"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1928
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1929
+#, python-format
+msgid "“%(value)s� value must be either None, True or False."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1931
+msgid "Boolean (Either True, False or None)"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1966
+#, fuzzy
+#| msgid "No active invites"
+msgid "Positive integer"
+msgstr "Keine aktiven Einladungen"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1979
+#, fuzzy
+#| msgid "No active invites"
+msgid "Positive small integer"
+msgstr "Keine aktiven Einladungen"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1993
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2025
+msgid "Small integer"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2032
+msgid "Text"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2060
+#, python-format
+msgid ""
+"“%(value)s� value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"format."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2062
+#, python-format
+msgid ""
+"“%(value)s� value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"invalid time."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2065
+msgid "Time"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2191
+msgid "URL"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2213
+msgid "Raw binary data"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2278
+#, fuzzy, python-format
+#| msgid "%(value)s is not a valid username"
+msgid "“%(value)s� is not a valid UUID."
+msgstr "%(value)s ist kein gültiger Username"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2280
+msgid "Universally unique identifier"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/files.py:221
+msgid "File"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/files.py:360
+#, fuzzy
+#| msgid "Images"
+msgid "Image"
+msgstr "Bilder"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:778
+#, python-format
+msgid "%(model)s instance with %(field)s %(value)r does not exist."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:780
+msgid "Foreign Key (type determined by related field)"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1012
+#, fuzzy
+#| msgid "Relationships"
+msgid "One-to-one relationship"
+msgstr "Beziehungen"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1066
+#, fuzzy, python-format
+#| msgid "Relationships"
+msgid "%(from)s-%(to)s relationship"
+msgstr "Beziehungen"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1067
+#, fuzzy, python-format
+#| msgid "Relationships"
+msgid "%(from)s-%(to)s relationships"
+msgstr "Beziehungen"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1109
+#, fuzzy
+#| msgid "Relationships"
+msgid "Many-to-many relationship"
+msgstr "Beziehungen"
+
+#. Translators: If found as last label character, these punctuation
+#. characters will prevent the default label_suffix to be appended to the label
+#: venv3/lib/python3.8/site-packages/django/forms/boundfield.py:149
+msgid ":?.!"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:53
+#, fuzzy
+#| msgid "This shelf is empty."
+msgid "This field is required."
+msgstr "Dieses Regal ist leer."
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:246
+#, fuzzy
+#| msgid "Series number:"
+msgid "Enter a whole number."
+msgstr "Seriennummer:"
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:397
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:1127
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid date."
+msgstr "E-Mail Adresse"
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:421
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:1128
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid time."
+msgstr "E-Mail Adresse"
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:443
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid date/time."
+msgstr "E-Mail Adresse"
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:472
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid duration."
+msgstr "E-Mail Adresse"
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:473
+#, python-brace-format
+msgid "The number of days must be between {min_days} and {max_days}."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:533
+msgid "No file was submitted. Check the encoding type on the form."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:534
+msgid "No file was submitted."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:535
+#, fuzzy
+#| msgid "This shelf is empty."
+msgid "The submitted file is empty."
+msgstr "Dieses Regal ist leer."
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:537
+#, python-format
+msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
+msgid_plural ""
+"Ensure this filename has at most %(max)d characters (it has %(length)d)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:540
+msgid "Please either submit a file or check the clear checkbox, not both."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:601
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:763
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:853
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:1275
+#, python-format
+msgid "Select a valid choice. %(value)s is not one of the available choices."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:854
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:969
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:1274
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a list of values."
+msgstr "E-Mail Adresse"
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:970
+msgid "Enter a complete value."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:1186
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid UUID."
+msgstr "E-Mail Adresse"
+
+#. Translators: This is the default suffix added to form field labels
+#: venv3/lib/python3.8/site-packages/django/forms/forms.py:81
+msgid ":"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/forms.py:207
+#, python-format
+msgid "(Hidden field %(name)s) %(error)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:93
+msgid "ManagementForm data is missing or has been tampered with"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:345
+#, python-format
+msgid "Please submit %d or fewer forms."
+msgid_plural "Please submit %d or fewer forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:352
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:379
+#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:386
+msgid "Order"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:754
+#, python-format
+msgid "Please correct the duplicate data for %(field)s."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:758
+#, python-format
+msgid "Please correct the duplicate data for %(field)s, which must be unique."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:764
+#, python-format
+msgid ""
+"Please correct the duplicate data for %(field_name)s which must be unique "
+"for the %(lookup)s in %(date_field)s."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:773
+msgid "Please correct the duplicate values below."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:1094
+msgid "The inline value did not match the parent instance."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:1161
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:1277
+#, fuzzy, python-format
+#| msgid "%(value)s is not a valid username"
+msgid "“%(pk)s� is not a valid value."
+msgstr "%(value)s ist kein gültiger Username"
+
+#: venv3/lib/python3.8/site-packages/django/forms/utils.py:162
+#, python-format
+msgid ""
+"%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:395
+msgid "Clear"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:396
+#, fuzzy
+#| msgid "Start reading"
+msgid "Currently"
+msgstr "Gerade lesend"
+
+#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:397
+#, fuzzy
+#| msgid "Change shelf"
+msgid "Change"
+msgstr "Regal wechseln"
+
+#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:709
+msgid "Unknown"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:710
+msgid "Yes"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:711
+msgid "No"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:788
+msgid "yes,no,maybe"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:817
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:834
+#, python-format
+msgid "%(size)d byte"
+msgid_plural "%(size)d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:836
+#, python-format
+msgid "%s KB"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:838
+#, python-format
+msgid "%s MB"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:840
+#, python-format
+msgid "%s GB"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:842
+#, python-format
+msgid "%s TB"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:844
+#, python-format
+msgid "%s PB"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:62
+msgid "p.m."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:63
+msgid "a.m."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:68
+msgid "PM"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:69
+msgid "AM"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:150
+msgid "midnight"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:152
+msgid "noon"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:295
+msgid "Monday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:296
+msgid "Tuesday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:297
+msgid "Wednesday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:298
+msgid "Thursday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:299
+msgid "Friday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:7
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:300
+msgid "Saturday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:7
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:301
+msgid "Sunday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
+msgid "Mon"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
+msgid "Tue"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
+msgid "Wed"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
+msgid "Thu"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
+msgid "Fri"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:11
+#, fuzzy
+#| msgid "Started"
+msgid "Sat"
+msgstr "Gestartet"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:11
+msgid "Sun"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:281
+msgid "January"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:282
+msgid "February"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:283
+#, fuzzy
+#| msgid "Search"
+msgid "March"
+msgstr "Suche"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:284
+msgid "April"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:285
+msgid "May"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:286
+msgid "June"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:287
+msgid "July"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:288
+msgid "August"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:289
+#, fuzzy
+#| msgid "Series number:"
+msgid "September"
+msgstr "Seriennummer:"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:290
+msgid "October"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:291
+msgid "November"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:16
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:292
+#, fuzzy
+#| msgid "Series number:"
+msgid "December"
+msgstr "Seriennummer:"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "jan"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "feb"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "mar"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "apr"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "may"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "jun"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "jul"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "aug"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "sep"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "oct"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "nov"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "dec"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:23
+msgctxt "abbrev. month"
+msgid "Jan."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:24
+msgctxt "abbrev. month"
+msgid "Feb."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:25
+#, fuzzy
+#| msgid "Search"
+msgctxt "abbrev. month"
+msgid "March"
+msgstr "Suche"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:26
+msgctxt "abbrev. month"
+msgid "April"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:27
+msgctxt "abbrev. month"
+msgid "May"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:28
+msgctxt "abbrev. month"
+msgid "June"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:29
+msgctxt "abbrev. month"
+msgid "July"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:30
+msgctxt "abbrev. month"
+msgid "Aug."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:31
+msgctxt "abbrev. month"
+msgid "Sept."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:32
+msgctxt "abbrev. month"
+msgid "Oct."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:33
+msgctxt "abbrev. month"
+msgid "Nov."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:34
+msgctxt "abbrev. month"
+msgid "Dec."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:37
+msgctxt "alt. month"
+msgid "January"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:38
+msgctxt "alt. month"
+msgid "February"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:39
+#, fuzzy
+#| msgid "Search"
+msgctxt "alt. month"
+msgid "March"
+msgstr "Suche"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:40
+msgctxt "alt. month"
+msgid "April"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:41
+msgctxt "alt. month"
+msgid "May"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:42
+msgctxt "alt. month"
+msgid "June"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:43
+msgctxt "alt. month"
+msgid "July"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:44
+msgctxt "alt. month"
+msgid "August"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:45
+#, fuzzy
+#| msgid "Series number:"
+msgctxt "alt. month"
+msgid "September"
+msgstr "Seriennummer:"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:46
+msgctxt "alt. month"
+msgid "October"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:47
+msgctxt "alt. month"
+msgid "November"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:48
+#, fuzzy
+#| msgid "Series number:"
+msgctxt "alt. month"
+msgid "December"
+msgstr "Seriennummer:"
+
+#: venv3/lib/python3.8/site-packages/django/utils/ipv6.py:8
+#, fuzzy
+#| msgid "Email address:"
+msgid "This is not a valid IPv6 address."
+msgstr "E-Mail Adresse"
+
+#: venv3/lib/python3.8/site-packages/django/utils/text.py:69
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s…"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/text.py:235
+msgid "or"
+msgstr ""
+
+#. Translators: This string is used as a separator between list elements
+#: venv3/lib/python3.8/site-packages/django/utils/text.py:254
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:83
+msgid ", "
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:9
+#, python-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:10
+#, python-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:11
+#, python-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:12
+#, python-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:13
+#, python-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:14
+#, python-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:72
+msgid "0 minutes"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:110
+msgid "Forbidden"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:111
+msgid "CSRF verification failed. Request aborted."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:115
+msgid ""
+"You are seeing this message because this HTTPS site requires a “Referer "
+"header� to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:120
+msgid ""
+"If you have configured your browser to disable “Referer� headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for “same-"
+"origin� requests."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:124
+msgid ""
+"If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
+"including the “Referrer-Policy: no-referrer� header, please remove them. The "
+"CSRF protection requires the “Referer� header to do strict referer checking. "
+"If you’re concerned about privacy, use alternatives like <a rel=\"noreferrer"
+"\" …> for links to third-party sites."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:132
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:137
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for “same-origin� requests."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:142
+msgid "More information is available with DEBUG=True."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:41
+msgid "No year specified"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:61
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:111
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:208
+msgid "Date out of range"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:90
+msgid "No month specified"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:142
+msgid "No day specified"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:188
+msgid "No week specified"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:338
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:367
+#, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:589
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:623
+#, python-format
+msgid "Invalid date string “%(datestr)s� given format “%(format)s�"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/detail.py:54
+#, fuzzy, python-format
+#| msgid "No books found matching the query \"%(query)s\""
+msgid "No %(verbose_name)s found matching the query"
+msgstr "Keine passenden Bücher zu \"%(query)s\" gefunden"
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/list.py:67
+msgid "Page is not “last�, nor can it be converted to an int."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/list.py:72
+#, python-format
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/list.py:154
+#, python-format
+msgid "Empty list and “%(class_name)s.allow_empty� is False."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/static.py:40
+msgid "Directory indexes are not allowed here."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/static.py:42
+#, fuzzy, python-format
+#| msgid "%(value)s is not a valid username"
+msgid "“%(path)s� does not exist"
+msgstr "%(value)s ist kein gültiger Username"
+
+#: venv3/lib/python3.8/site-packages/django/views/static.py:80
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:7
+msgid "Django: the Web framework for perfectionists with deadlines."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:346
+#, python-format
+msgid ""
+"View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
+"target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:368
+msgid "The install worked successfully! Congratulations!"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:369
+#, python-format
+msgid ""
+"You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
+"%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
+"\">DEBUG=True</a> is in your settings file and you have not configured any "
+"URLs."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:384
+msgid "Django Documentation"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:385
+msgid "Topics, references, &amp; how-to’s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:396
+msgid "Tutorial: A Polling App"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:397
+msgid "Get started with Django"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:408
+#, fuzzy
+#| msgid "Comment"
+msgid "Django Community"
+msgstr "Kommentieren"
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:409
+msgid "Connect, get help, or contribute"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/kombu/transport/qpid.py:1301
+#, python-format
+msgid "Attempting to connect to qpid with SASL mechanism %s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/kombu/transport/qpid.py:1306
+#, python-format
+msgid "Connected to qpid with SASL mechanism %s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/kombu/transport/qpid.py:1324
+#, python-format
+msgid "Unable to connect to qpid with SASL mechanism %s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:371
+msgid "1 second ago"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:377
+msgid "1 minute ago"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:382
+msgid "1 hour ago"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:385
+#, python-format
+msgid "%(time)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:387
+msgid "yesterday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:387
+#, python-format
+msgid "yesterday at %(time)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:389
+#, python-format
+msgid "%(weekday)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:389
+#, python-format
+msgid "%(weekday)s at %(time)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:392
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:445
+#, python-format
+msgid "%(month_name)s %(day)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:394
+#, python-format
+msgid "%(month_name)s %(day)s at %(time)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:399
+#, python-format
+msgid "%(month_name)s %(day)s, %(year)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:401
+#, python-format
+msgid "%(month_name)s %(day)s, %(year)s at %(time)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:439
+#, python-format
+msgid "%(weekday)s, %(month_name)s %(day)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:462
+#, python-format
+msgid "%(commas)s and %(last)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:68
+msgctxt "law"
+msgid "right"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:69
+msgctxt "good"
+msgid "right"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:71
+#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:74
+msgctxt "organization"
+msgid "club"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:76
+#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:77
+msgctxt "stick"
+msgid "club"
+msgstr ""
+
+#~ msgid "Deactivate user"
+#~ msgstr "Nutzer:in deaktivieren"
+
+#~ msgid "Reactivate user"
+#~ msgstr "Nutzer:in reaktivieren"
+
+#, fuzzy, python-format
+#~| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+#~ msgid ""
+#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
+#~ "\"%(status_path)s\">review</a>"
+#~ msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
+
+#, fuzzy, python-format
+#~| msgid ""
+#~| "<a href=\"%(related_path)s\">replied</a> to your <a href="
+#~| "\"%(parent_path)s\">status</a>"
+#~ msgid ""
+#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
+#~ "\"%(status_path)s\">comment</a>"
+#~ msgstr ""
+#~ "hat auf deinen <a href=\"%(parent_path)s\">Status</a> geantwortet</a>"
+
+#, fuzzy, python-format
+#~| msgid ""
+#~| "<a href=\"%(related_path)s\">replied</a> to your <a href="
+#~| "\"%(parent_path)s\">status</a>"
+#~ msgid ""
+#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
+#~ "\"%(status_path)s\">quote</a>"
+#~ msgstr ""
+#~ "hat auf deinen <a href=\"%(parent_path)s\">Status</a> <a href="
+#~ "\"%(related_path)s\">geantwortet</a>"
+
+#~ msgid "Remove tag"
+#~ msgstr "Tag entfernen"
+
+#~ msgid "Add tag"
+#~ msgstr "Tag hinzufügen"
+
+#, python-format
+#~ msgid "Books tagged \"%(tag.name)s\""
+#~ msgstr "Mit \"%(tag.name)s\" markierte Bücher"
+
 #, fuzzy
 #~| msgid "Started"
 #~ msgid "Getting Started"
@@ -2756,9 +4549,6 @@ msgstr ""
 #~ msgid "No users were found for \"%(query)s\""
 #~ msgstr "Keine Nutzer*innen für \"%(query)s\" gefunden"
 
-#~ msgid "Your shelves"
-#~ msgstr "Deine Regale"
-
 #~ msgid "Your lists"
 #~ msgstr "Deine Listen"
 
@@ -2799,134 +4589,6 @@ msgstr ""
 #~ msgid "Send follow request"
 #~ msgstr "Folgeanfrage senden"
 
-#, fuzzy
-#~| msgid "All messages"
-#~ msgid "Messages"
-#~ msgstr "Alle Nachrichten"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "Enter a valid email address."
-#~ msgstr "E-Mail Adresse"
-
-#, fuzzy
-#~| msgid "Series number:"
-#~ msgid "Enter a number."
-#~ msgstr "Seriennummer:"
-
-#, fuzzy
-#~| msgid "%(value)s is not a valid remote_id"
-#~ msgid "Value %(value)r is not a valid choice."
-#~ msgstr "%(value)s ist keine gültige remote_id"
-
-#, fuzzy
-#~| msgid "Series number:"
-#~ msgid "Decimal number"
-#~ msgstr "Seriennummer:"
-
-#, fuzzy
-#~| msgid "List curation:"
-#~ msgid "Duration"
-#~ msgstr "Listenkuratierung:"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "Email address"
-#~ msgstr "E-Mail Adresse"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "IPv4 address"
-#~ msgstr "E-Mail Adresse"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "IP address"
-#~ msgstr "E-Mail Adresse"
-
-#, fuzzy
-#~| msgid "No active invites"
-#~ msgid "Positive integer"
-#~ msgstr "Keine aktiven Einladungen"
-
-#, fuzzy
-#~| msgid "%(value)s is not a valid username"
-#~ msgid "“%(value)s� is not a valid UUID."
-#~ msgstr "%(value)s ist kein gültiger Username"
-
-#, fuzzy
-#~| msgid "Images"
-#~ msgid "Image"
-#~ msgstr "Bilder"
-
-#, fuzzy
-#~| msgid "Relationships"
-#~ msgid "One-to-one relationship"
-#~ msgstr "Beziehungen"
-
-#, fuzzy
-#~| msgid "This shelf is empty."
-#~ msgid "This field is required."
-#~ msgstr "Dieses Regal ist leer."
-
-#, fuzzy
-#~| msgid "This shelf is empty."
-#~ msgid "The submitted file is empty."
-#~ msgstr "Dieses Regal ist leer."
-
-#, fuzzy
-#~| msgid "%(value)s is not a valid username"
-#~ msgid "“%(pk)s� is not a valid value."
-#~ msgstr "%(value)s ist kein gültiger Username"
-
-#, fuzzy
-#~| msgid "Start reading"
-#~ msgid "Currently"
-#~ msgstr "Gerade lesend"
-
-#, fuzzy
-#~| msgid "Change shelf"
-#~ msgid "Change"
-#~ msgstr "Regal wechseln"
-
-#, fuzzy
-#~| msgid "Started"
-#~ msgid "Sat"
-#~ msgstr "Gestartet"
-
-#, fuzzy
-#~| msgid "Search"
-#~ msgid "March"
-#~ msgstr "Suche"
-
-#, fuzzy
-#~| msgid "Series number:"
-#~ msgid "September"
-#~ msgstr "Seriennummer:"
-
-#, fuzzy
-#~| msgid "Search"
-#~ msgctxt "abbrev. month"
-#~ msgid "March"
-#~ msgstr "Suche"
-
-#, fuzzy
-#~| msgid "Search"
-#~ msgctxt "alt. month"
-#~ msgid "March"
-#~ msgstr "Suche"
-
-#, fuzzy
-#~| msgid "Series number:"
-#~ msgctxt "alt. month"
-#~ msgid "September"
-#~ msgstr "Seriennummer:"
-
-#, fuzzy
-#~| msgid "No books found matching the query \"%(query)s\""
-#~ msgid "No %(verbose_name)s found matching the query"
-#~ msgstr "Keine passenden Bücher zu \"%(query)s\" gefunden"
-
 #~ msgid "Announcements"
 #~ msgstr "Ankündigungen"
 
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index a8720f17..6685605a 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-01 13:14-0700\n"
+"POT-Creation-Date: 2021-04-26 09:56-0700\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"
@@ -18,35 +18,60 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/forms.py:226
+#: bookwyrm/forms.py:224
 msgid "A user with this email already exists."
 msgstr ""
 
-#: bookwyrm/forms.py:240
+#: bookwyrm/forms.py:238
 msgid "One Day"
 msgstr ""
 
-#: bookwyrm/forms.py:241
+#: bookwyrm/forms.py:239
 msgid "One Week"
 msgstr ""
 
-#: bookwyrm/forms.py:242
+#: bookwyrm/forms.py:240
 msgid "One Month"
 msgstr ""
 
-#: bookwyrm/forms.py:243
+#: bookwyrm/forms.py:241
 msgid "Does Not Expire"
 msgstr ""
 
-#: bookwyrm/forms.py:248
+#: bookwyrm/forms.py:246
 #, python-format
 msgid "%(count)d uses"
 msgstr ""
 
-#: bookwyrm/forms.py:251
+#: bookwyrm/forms.py:249
 msgid "Unlimited"
 msgstr ""
 
+#: bookwyrm/forms.py:293
+msgid "List Order"
+msgstr ""
+
+#: bookwyrm/forms.py:294
+msgid "Book Title"
+msgstr ""
+
+#: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:31
+#: bookwyrm/templates/user/shelf.html:80 bookwyrm/templates/user/shelf.html:110
+msgid "Rating"
+msgstr ""
+
+#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:82
+msgid "Sort By"
+msgstr ""
+
+#: bookwyrm/forms.py:301
+msgid "Ascending"
+msgstr ""
+
+#: bookwyrm/forms.py:302
+msgid "Descending"
+msgstr ""
+
 #: bookwyrm/models/fields.py:24
 #, python-format
 msgid "%(value)s is not a valid remote_id"
@@ -57,7 +82,7 @@ msgstr ""
 msgid "%(value)s is not a valid username"
 msgstr ""
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:157
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:153
 msgid "username"
 msgstr ""
 
@@ -65,23 +90,23 @@ msgstr ""
 msgid "A user with that username already exists."
 msgstr ""
 
-#: bookwyrm/settings.py:150
+#: bookwyrm/settings.py:152
 msgid "English"
 msgstr ""
 
-#: bookwyrm/settings.py:151
+#: bookwyrm/settings.py:153
 msgid "German"
 msgstr ""
 
-#: bookwyrm/settings.py:152
+#: bookwyrm/settings.py:154
 msgid "Spanish"
 msgstr ""
 
-#: bookwyrm/settings.py:153
+#: bookwyrm/settings.py:155
 msgid "French"
 msgstr ""
 
-#: bookwyrm/settings.py:154
+#: bookwyrm/settings.py:156
 msgid "Simplified Chinese"
 msgstr ""
 
@@ -118,80 +143,70 @@ msgstr ""
 msgid "Books by %(name)s"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:21
+#: bookwyrm/templates/book/book.html:33
 #: bookwyrm/templates/discover/large-book.html:12
 #: bookwyrm/templates/discover/small-book.html:9
 msgid "by"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:29 bookwyrm/templates/book/book.html:30
+#: bookwyrm/templates/book/book.html:41 bookwyrm/templates/book/book.html:42
 msgid "Edit Book"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:49
+#: bookwyrm/templates/book/book.html:61
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:53
+#: bookwyrm/templates/book/book.html:65
 msgid "Failed to load cover"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:62
-msgid "ISBN:"
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:69
-#: bookwyrm/templates/book/edit_book.html:211
-msgid "OCLC Number:"
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:76
-#: bookwyrm/templates/book/edit_book.html:215
-msgid "ASIN:"
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:85
+#: bookwyrm/templates/book/book.html:82
 msgid "View on OpenLibrary"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:94
+#: bookwyrm/templates/book/book.html:102
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/book/book.html:100
+#: bookwyrm/templates/book/book.html:114
 msgid "Add Description"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:107
-#: bookwyrm/templates/book/edit_book.html:101
+#: bookwyrm/templates/book/book.html:121
+#: bookwyrm/templates/book/edit_book.html:107
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:111
-#: bookwyrm/templates/book/edit_book.html:225
+#: bookwyrm/templates/book/book.html:125
+#: bookwyrm/templates/book/edit_book.html:240
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
+#: bookwyrm/templates/settings/edit_server.html:68
+#: bookwyrm/templates/settings/federated_server.html:93
 #: bookwyrm/templates/settings/site.html:93
-#: bookwyrm/templates/snippets/readthrough.html:65
+#: bookwyrm/templates/snippets/readthrough.html:75
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:38
 msgid "Save"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:112 bookwyrm/templates/book/book.html:161
+#: bookwyrm/templates/book/book.html:126 bookwyrm/templates/book/book.html:175
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:226
+#: bookwyrm/templates/book/edit_book.html:241
 #: bookwyrm/templates/edit_author.html:79
-#: bookwyrm/templates/moderation/report_modal.html:32
+#: bookwyrm/templates/moderation/report_modal.html:34
+#: bookwyrm/templates/settings/federated_server.html:94
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/readthrough.html:66
+#: bookwyrm/templates/snippets/readthrough.html:76
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
@@ -199,73 +214,105 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:121
+#: bookwyrm/templates/book/book.html:135
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:129
+#: bookwyrm/templates/book/book.html:143
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:135
+#: bookwyrm/templates/book/book.html:149
 #, python-format
-msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:144
-msgid "Your reading activity"
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:146
-msgid "Add read dates"
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:151
-msgid "You don't have any reading activity for this book."
+msgid ""
+"A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a "
+"href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr ""
 
 #: bookwyrm/templates/book/book.html:158
+msgid "Your reading activity"
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:160
+msgid "Add read dates"
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:165
+msgid "You don't have any reading activity for this book."
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:172
 msgid "Create"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:180
+#: bookwyrm/templates/book/book.html:194
 msgid "Subjects"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:191
+#: bookwyrm/templates/book/book.html:206
 msgid "Places"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:202 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book/book.html:217 bookwyrm/templates/layout.html:65
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:213
+#: bookwyrm/templates/book/book.html:228
 msgid "Add to list"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:223
+#: bookwyrm/templates/book/book.html:238
 #: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:90
+#: bookwyrm/templates/lists/list.html:133
 msgid "Add"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:251
+#: bookwyrm/templates/book/book.html:254
+msgid "Reviews"
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:259
+msgid "Your reviews"
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:265
+msgid "Your comments"
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:271
+msgid "Your quotes"
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:305
 msgid "rated it"
 msgstr ""
 
+#: bookwyrm/templates/book/book_identifiers.html:8
+msgid "ISBN:"
+msgstr ""
+
+#: bookwyrm/templates/book/book_identifiers.html:15
+#: bookwyrm/templates/book/edit_book.html:226
+msgid "OCLC Number:"
+msgstr ""
+
+#: bookwyrm/templates/book/book_identifiers.html:22
+#: bookwyrm/templates/book/edit_book.html:230
+msgid "ASIN:"
+msgstr ""
+
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:163
+#: bookwyrm/templates/book/edit_book.html:178
 msgid "Upload cover:"
 msgstr ""
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:169
+#: bookwyrm/templates/book/edit_book.html:184
 msgid "Load cover from url:"
 msgstr ""
 
@@ -341,86 +388,86 @@ msgstr ""
 msgid "Metadata"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:91
+#: bookwyrm/templates/book/edit_book.html:92
 msgid "Title:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:96
+#: bookwyrm/templates/book/edit_book.html:100
 msgid "Subtitle:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:106
+#: bookwyrm/templates/book/edit_book.html:113
 msgid "Series:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:111
+#: bookwyrm/templates/book/edit_book.html:120
 msgid "Series number:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:117
+#: bookwyrm/templates/book/edit_book.html:126
 msgid "Publisher:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:119
+#: bookwyrm/templates/book/edit_book.html:128
 msgid "Separate multiple publishers with commas."
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:125
+#: bookwyrm/templates/book/edit_book.html:135
 msgid "First published date:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:130
+#: bookwyrm/templates/book/edit_book.html:143
 msgid "Published date:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:137
+#: bookwyrm/templates/book/edit_book.html:152
 msgid "Authors"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:143
+#: bookwyrm/templates/book/edit_book.html:158
 #, python-format
 msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:148
+#: bookwyrm/templates/book/edit_book.html:163
 msgid "Add Authors:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:149
+#: bookwyrm/templates/book/edit_book.html:164
 msgid "John Doe, Jane Smith"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:155
-#: bookwyrm/templates/user/shelf.html:75
+#: bookwyrm/templates/book/edit_book.html:170
+#: bookwyrm/templates/user/shelf.html:74
 msgid "Cover"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:182
+#: bookwyrm/templates/book/edit_book.html:197
 msgid "Physical Properties"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:183
+#: bookwyrm/templates/book/edit_book.html:198
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:191
+#: bookwyrm/templates/book/edit_book.html:206
 msgid "Pages:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:198
+#: bookwyrm/templates/book/edit_book.html:213
 msgid "Book Identifiers"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:199
+#: bookwyrm/templates/book/edit_book.html:214
 msgid "ISBN 13:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:203
+#: bookwyrm/templates/book/edit_book.html:218
 msgid "ISBN 10:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:207
+#: bookwyrm/templates/book/edit_book.html:222
 #: bookwyrm/templates/edit_author.html:59
 msgid "Openlibrary key:"
 msgstr ""
@@ -444,44 +491,53 @@ msgstr ""
 msgid "Language:"
 msgstr ""
 
-#: bookwyrm/templates/book/publisher_info.html:6
+#: bookwyrm/templates/book/publisher_info.html:22
+#, python-format
+msgid "%(format)s"
+msgstr ""
+
+#: bookwyrm/templates/book/publisher_info.html:24
 #, python-format
 msgid "%(format)s, %(pages)s pages"
 msgstr ""
 
-#: bookwyrm/templates/book/publisher_info.html:8
+#: bookwyrm/templates/book/publisher_info.html:26
 #, python-format
 msgid "%(pages)s pages"
 msgstr ""
 
-#: bookwyrm/templates/book/publisher_info.html:13
+#: bookwyrm/templates/book/publisher_info.html:38
 #, python-format
 msgid "%(languages)s language"
 msgstr ""
 
-#: bookwyrm/templates/book/publisher_info.html:18
+#: bookwyrm/templates/book/publisher_info.html:64
 #, python-format
 msgid "Published %(date)s by %(publisher)s."
 msgstr ""
 
-#: bookwyrm/templates/book/publisher_info.html:20
+#: bookwyrm/templates/book/publisher_info.html:66
 #, python-format
 msgid "Published %(date)s"
 msgstr ""
 
-#: bookwyrm/templates/book/publisher_info.html:22
+#: bookwyrm/templates/book/publisher_info.html:68
 #, python-format
 msgid "Published by %(publisher)s."
 msgstr ""
 
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
-#: bookwyrm/templates/feed/feed_layout.html:57
+#: bookwyrm/templates/feed/feed_layout.html:70
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
 msgid "Close"
 msgstr ""
 
+#: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8
+msgid "Compose status"
+msgstr ""
+
 #: bookwyrm/templates/directory/community_filter.html:5
 msgid "Community"
 msgstr ""
@@ -496,7 +552,7 @@ msgstr ""
 
 #: bookwyrm/templates/directory/directory.html:6
 #: bookwyrm/templates/directory/directory.html:11
-#: bookwyrm/templates/layout.html:97
+#: bookwyrm/templates/layout.html:93
 msgid "Directory"
 msgstr ""
 
@@ -506,7 +562,9 @@ msgstr ""
 
 #: bookwyrm/templates/directory/directory.html:26
 #, python-format
-msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
+msgid ""
+"You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</"
+"a>"
 msgstr ""
 
 #: bookwyrm/templates/directory/directory.html:31
@@ -620,7 +678,7 @@ msgid "Email address:"
 msgstr ""
 
 #: bookwyrm/templates/discover/landing_layout.html:70
-#: bookwyrm/templates/moderation/report_modal.html:31
+#: bookwyrm/templates/moderation/report_modal.html:33
 msgid "Submit"
 msgstr ""
 
@@ -673,7 +731,9 @@ msgstr ""
 
 #: bookwyrm/templates/email/html_layout.html:21
 #, python-format
-msgid "BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a>"
+msgid ""
+"BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">"
+"%(site_name)s</a>"
 msgstr ""
 
 #: bookwyrm/templates/email/html_layout.html:23
@@ -692,12 +752,16 @@ msgstr ""
 
 #: bookwyrm/templates/email/invite/html_content.html:15
 #, python-format
-msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
+msgid ""
+"Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</"
+"a>."
 msgstr ""
 
 #: bookwyrm/templates/email/invite/text_content.html:4
 #, python-format
-msgid "You're invited to join %(site_name)s! Click the link below to create an account."
+msgid ""
+"You're invited to join %(site_name)s! Click the link below to create an "
+"account."
 msgstr ""
 
 #: bookwyrm/templates/email/invite/text_content.html:8
@@ -707,7 +771,9 @@ msgstr ""
 #: bookwyrm/templates/email/password_reset/html_content.html:6
 #: bookwyrm/templates/email/password_reset/text_content.html:4
 #, python-format
-msgid "You requested to reset your %(site_name)s password. Click the link below to set a new password and log in to your account."
+msgid ""
+"You requested to reset your %(site_name)s password. Click the link below to "
+"set a new password and log in to your account."
 msgstr ""
 
 #: bookwyrm/templates/email/password_reset/html_content.html:9
@@ -720,7 +786,8 @@ msgstr ""
 
 #: bookwyrm/templates/email/password_reset/html_content.html:13
 #: bookwyrm/templates/email/password_reset/text_content.html:8
-msgid "If you didn't request to reset your password, you can ignore this email."
+msgid ""
+"If you didn't request to reset your password, you can ignore this email."
 msgstr ""
 
 #: bookwyrm/templates/email/password_reset/subject.html:2
@@ -734,7 +801,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr ""
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:87
+#: bookwyrm/templates/layout.html:88
 msgid "Direct Messages"
 msgstr ""
 
@@ -767,6 +834,7 @@ msgid "Local"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed.html:25
+#: bookwyrm/templates/settings/edit_server.html:40
 msgid "Federated"
 msgstr ""
 
@@ -776,7 +844,8 @@ msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed.html:48
-msgid "There aren't any activities right now! Try following a user to get started"
+msgid ""
+"There aren't any activities right now! Try following a user to get started"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed.html:56
@@ -789,32 +858,33 @@ msgid "Updates"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:11
-#: bookwyrm/templates/layout.html:58
+#: bookwyrm/templates/layout.html:59
 #: bookwyrm/templates/user/books_header.html:3
 msgid "Your books"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:13
-msgid "There are no books here right now! Try searching for a book to get started"
-msgstr ""
-
-#: bookwyrm/templates/feed/feed_layout.html:23
-#: bookwyrm/templates/user/shelf.html:28
-msgid "To Read"
+msgid ""
+"There are no books here right now! Try searching for a book to get started"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:24
 #: bookwyrm/templates/user/shelf.html:28
-msgid "Currently Reading"
+msgid "To Read"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:25
+#: bookwyrm/templates/user/shelf.html:28
+msgid "Currently Reading"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed_layout.html:26
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
 #: bookwyrm/templates/user/shelf.html:28
 msgid "Read"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed_layout.html:74 bookwyrm/templates/goal.html:26
+#: bookwyrm/templates/feed/feed_layout.html:88 bookwyrm/templates/goal.html:26
 #: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
 msgid "%(year)s Reading Goal"
@@ -844,7 +914,7 @@ msgid "What are you reading?"
 msgstr ""
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:58
+#: bookwyrm/templates/lists/list.html:101
 msgid "Search for a book"
 msgstr ""
 
@@ -864,8 +934,8 @@ msgstr ""
 #: bookwyrm/templates/get_started/books.html:17
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
-#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
-#: bookwyrm/templates/lists/list.html:62
+#: bookwyrm/templates/layout.html:38 bookwyrm/templates/layout.html:39
+#: bookwyrm/templates/lists/list.html:105
 msgid "Search"
 msgstr ""
 
@@ -879,7 +949,7 @@ msgid "Popular on %(site_name)s"
 msgstr ""
 
 #: bookwyrm/templates/get_started/books.html:51
-#: bookwyrm/templates/lists/list.html:75
+#: bookwyrm/templates/lists/list.html:118
 msgid "No books found"
 msgstr ""
 
@@ -948,7 +1018,9 @@ msgid "Show this account in suggested users:"
 msgstr ""
 
 #: bookwyrm/templates/get_started/profile.html:52
-msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users."
+msgid ""
+"Your account will show up in the directory, and may be recommended to other "
+"BookWyrm users."
 msgstr ""
 
 #: bookwyrm/templates/get_started/users.html:11
@@ -973,7 +1045,9 @@ msgstr ""
 #: bookwyrm/templates/goal.html:30
 #: bookwyrm/templates/snippets/goal_card.html:13
 #, python-format
-msgid "Set a goal for how many books you'll finish reading in %(year)s, and track your progress throughout the year."
+msgid ""
+"Set a goal for how many books you'll finish reading in %(year)s, and track "
+"your progress throughout the year."
 msgstr ""
 
 #: bookwyrm/templates/goal.html:39
@@ -992,7 +1066,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr ""
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/layout.html:102
+#: bookwyrm/templates/layout.html:98
 msgid "Import Books"
 msgstr ""
 
@@ -1013,6 +1087,7 @@ msgid "Privacy setting for imported reviews:"
 msgstr ""
 
 #: bookwyrm/templates/import.html:48
+#: bookwyrm/templates/settings/server_blocklist.html:64
 msgid "Import"
 msgstr ""
 
@@ -1055,7 +1130,9 @@ msgstr ""
 
 #: bookwyrm/templates/import_status.html:44
 #, python-format
-msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
+msgid ""
+"Jump to the bottom of the list to select the %(failed_count)s items which "
+"failed to import."
 msgstr ""
 
 #: bookwyrm/templates/import_status.html:79
@@ -1077,12 +1154,12 @@ msgstr ""
 
 #: bookwyrm/templates/import_status.html:115
 #: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/user/shelf.html:76
+#: bookwyrm/templates/user/shelf.html:75 bookwyrm/templates/user/shelf.html:93
 msgid "Title"
 msgstr ""
 
 #: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/user/shelf.html:77
+#: bookwyrm/templates/user/shelf.html:76 bookwyrm/templates/user/shelf.html:96
 msgid "Author"
 msgstr ""
 
@@ -1119,91 +1196,90 @@ msgstr ""
 msgid "Matching Books"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:33
+#: bookwyrm/templates/layout.html:34
 msgid "Search for a book or user"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48
+#: bookwyrm/templates/layout.html:48 bookwyrm/templates/layout.html:49
 msgid "Main navigation menu"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:61
+#: bookwyrm/templates/layout.html:62
 msgid "Feed"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:92
-#: bookwyrm/templates/preferences/preferences_layout.html:14
-msgid "Profile"
-msgstr ""
-
-#: bookwyrm/templates/layout.html:107
+#: bookwyrm/templates/layout.html:103
 msgid "Settings"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:116
-#: bookwyrm/templates/settings/admin_layout.html:24
+#: bookwyrm/templates/layout.html:112
+#: bookwyrm/templates/settings/admin_layout.html:31
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
 #: bookwyrm/templates/settings/manage_invites.html:15
 msgid "Invites"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:123
+#: bookwyrm/templates/layout.html:119
 msgid "Admin"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:130
+#: bookwyrm/templates/layout.html:126
 msgid "Log out"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:138 bookwyrm/templates/layout.html:139
+#: bookwyrm/templates/layout.html:134 bookwyrm/templates/layout.html:135
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:10
 msgid "Notifications"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:156 bookwyrm/templates/layout.html:160
+#: bookwyrm/templates/layout.html:152 bookwyrm/templates/layout.html:156
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:161
+#: bookwyrm/templates/layout.html:157
 msgid "password"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:162 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:158 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:165 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:161 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:173
+#: bookwyrm/templates/layout.html:169
 msgid "Join"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:196
+#: bookwyrm/templates/layout.html:195
 msgid "About this server"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:200
+#: bookwyrm/templates/layout.html:199
 msgid "Contact site admin"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:207
+#: bookwyrm/templates/layout.html:206
 #, python-format
-msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
+msgid ""
+"Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">"
+"%(support_title)s</a>"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:211
-msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+#: bookwyrm/templates/layout.html:210
+msgid ""
+"BookWyrm is open source software. You can contribute or report issues on <a "
+"href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr ""
 
 #: bookwyrm/templates/lists/create_form.html:5
-#: bookwyrm/templates/lists/lists.html:19
+#: bookwyrm/templates/lists/lists.html:20
 msgid "Create List"
 msgstr ""
 
@@ -1267,7 +1343,7 @@ msgid "Anyone can suggest books, subject to your approval"
 msgstr ""
 
 #: bookwyrm/templates/lists/form.html:31
-#: bookwyrm/templates/moderation/reports.html:24
+#: bookwyrm/templates/moderation/reports.html:25
 msgid "Open"
 msgstr ""
 
@@ -1275,45 +1351,73 @@ msgstr ""
 msgid "Anyone can add books to this list"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:17
+#: bookwyrm/templates/lists/list.html:19
+msgid "You successfully suggested a book for this list!"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:21
+msgid "You successfully added a book to this list!"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:27
 msgid "This list is currently empty"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:35
+#: bookwyrm/templates/lists/list.html:46
 #, python-format
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:41
-#: bookwyrm/templates/snippets/shelf_selector.html:28
+#: bookwyrm/templates/lists/list.html:58
+msgid "Set"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:61
+msgid "List position"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:67
+#: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:54
+#: bookwyrm/templates/lists/list.html:80 bookwyrm/templates/lists/list.html:92
+msgid "Sort List"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:86
+msgid "Direction"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:97
 msgid "Add Books"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:54
+#: bookwyrm/templates/lists/list.html:97
 msgid "Suggest Books"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:63
+#: bookwyrm/templates/lists/list.html:106
 msgid "search"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:69
+#: bookwyrm/templates/lists/list.html:112
 msgid "Clear search"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:74
+#: bookwyrm/templates/lists/list.html:117
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:90
+#: bookwyrm/templates/lists/list.html:133
 msgid "Suggest"
 msgstr ""
 
+#: bookwyrm/templates/lists/lists.html:14 bookwyrm/templates/user/lists.html:9
+msgid "Your Lists"
+msgstr ""
+
 #: bookwyrm/templates/login.html:4
 msgid "Login"
 msgstr ""
@@ -1331,59 +1435,37 @@ msgstr ""
 msgid "More about this site"
 msgstr ""
 
-#: bookwyrm/templates/moderation/report.html:5
 #: bookwyrm/templates/moderation/report.html:6
+#: bookwyrm/templates/moderation/report.html:7
 #: bookwyrm/templates/moderation/report_preview.html:6
 #, python-format
 msgid "Report #%(report_id)s: %(username)s"
 msgstr ""
 
-#: bookwyrm/templates/moderation/report.html:10
+#: bookwyrm/templates/moderation/report.html:11
 msgid "Back to reports"
 msgstr ""
 
-#: bookwyrm/templates/moderation/report.html:18
-msgid "Actions"
-msgstr ""
-
-#: bookwyrm/templates/moderation/report.html:19
-msgid "View user profile"
-msgstr ""
-
-#: bookwyrm/templates/moderation/report.html:22
-#: bookwyrm/templates/snippets/status/status_options.html:25
-#: bookwyrm/templates/snippets/user_options.html:13
-msgid "Send direct message"
-msgstr ""
-
-#: bookwyrm/templates/moderation/report.html:27
-msgid "Deactivate user"
-msgstr ""
-
-#: bookwyrm/templates/moderation/report.html:29
-msgid "Reactivate user"
-msgstr ""
-
-#: bookwyrm/templates/moderation/report.html:36
+#: bookwyrm/templates/moderation/report.html:23
 msgid "Moderator Comments"
 msgstr ""
 
-#: bookwyrm/templates/moderation/report.html:54
-#: bookwyrm/templates/snippets/create_status.html:12
-#: bookwyrm/templates/snippets/create_status_form.html:52
+#: bookwyrm/templates/moderation/report.html:41
+#: bookwyrm/templates/snippets/create_status.html:28
+#: bookwyrm/templates/snippets/create_status_form.html:53
 msgid "Comment"
 msgstr ""
 
-#: bookwyrm/templates/moderation/report.html:59
+#: bookwyrm/templates/moderation/report.html:46
 msgid "Reported statuses"
 msgstr ""
 
-#: bookwyrm/templates/moderation/report.html:61
+#: bookwyrm/templates/moderation/report.html:48
 msgid "No statuses reported"
 msgstr ""
 
-#: bookwyrm/templates/moderation/report.html:67
-msgid "Statuses has been deleted"
+#: bookwyrm/templates/moderation/report.html:54
+msgid "Status has been deleted"
 msgstr ""
 
 #: bookwyrm/templates/moderation/report_modal.html:6
@@ -1391,12 +1473,12 @@ msgstr ""
 msgid "Report @%(username)s"
 msgstr ""
 
-#: bookwyrm/templates/moderation/report_modal.html:21
+#: bookwyrm/templates/moderation/report_modal.html:23
 #, python-format
 msgid "This report will be sent to %(site_name)s's moderators for review."
 msgstr ""
 
-#: bookwyrm/templates/moderation/report_modal.html:22
+#: bookwyrm/templates/moderation/report_modal.html:24
 msgid "More info about this report:"
 msgstr ""
 
@@ -1423,21 +1505,21 @@ msgid "Reports: %(server_name)s"
 msgstr ""
 
 #: bookwyrm/templates/moderation/reports.html:8
-#: bookwyrm/templates/moderation/reports.html:16
-#: bookwyrm/templates/settings/admin_layout.html:28
+#: bookwyrm/templates/moderation/reports.html:17
+#: bookwyrm/templates/settings/admin_layout.html:35
 msgid "Reports"
 msgstr ""
 
-#: bookwyrm/templates/moderation/reports.html:13
+#: bookwyrm/templates/moderation/reports.html:14
 #, python-format
 msgid "Reports: <small>%(server_name)s</small>"
 msgstr ""
 
-#: bookwyrm/templates/moderation/reports.html:27
+#: bookwyrm/templates/moderation/reports.html:28
 msgid "Resolved"
 msgstr ""
 
-#: bookwyrm/templates/moderation/reports.html:34
+#: bookwyrm/templates/moderation/reports.html:37
 msgid "No reports found."
 msgstr ""
 
@@ -1447,17 +1529,23 @@ msgstr ""
 
 #: bookwyrm/templates/notifications.html:53
 #, python-format
-msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgid ""
+"favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</"
+"em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:55
 #, python-format
-msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
+msgid ""
+"favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</"
+"em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:57
 #, python-format
-msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgid ""
+"favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
+"em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:59
@@ -1467,17 +1555,23 @@ msgstr ""
 
 #: bookwyrm/templates/notifications.html:64
 #, python-format
-msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">review of <em>"
+"%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:66
 #, python-format
-msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">comment on <em>"
+"%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:68
 #, python-format
-msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">quote from <em>"
+"%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:70
@@ -1487,22 +1581,30 @@ msgstr ""
 
 #: bookwyrm/templates/notifications.html:75
 #, python-format
-msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">review of <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:77
 #, python-format
-msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">comment on <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:79
 #, python-format
-msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">quote from <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:81
 #, python-format
-msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">status</a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:85
@@ -1515,17 +1617,23 @@ msgstr ""
 
 #: bookwyrm/templates/notifications.html:94
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgid ""
+"boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></"
+"a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:96
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+msgid ""
+"boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></"
+"a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:98
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgid ""
+"boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
+"em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:100
@@ -1535,12 +1643,16 @@ msgstr ""
 
 #: bookwyrm/templates/notifications.html:104
 #, python-format
-msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgid ""
+" added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
+"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:106
 #, python-format
-msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgid ""
+" suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to "
+"your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:110
@@ -1602,7 +1714,9 @@ msgstr ""
 
 #: bookwyrm/templates/preferences/edit_user.html:62
 #, python-format
-msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
+msgid ""
+"Your account will show up in the <a href=\"%(path)s\">directory</a>, and may "
+"be recommended to other BookWyrm users."
 msgstr ""
 
 #: bookwyrm/templates/preferences/edit_user.html:65
@@ -1613,6 +1727,10 @@ msgstr ""
 msgid "Account"
 msgstr ""
 
+#: bookwyrm/templates/preferences/preferences_layout.html:14
+msgid "Profile"
+msgstr ""
+
 #: bookwyrm/templates/preferences/preferences_layout.html:20
 msgid "Relationships"
 msgstr ""
@@ -1642,117 +1760,187 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:15
+#: bookwyrm/templates/settings/admin_layout.html:22
 msgid "Manage Users"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:19
-#: bookwyrm/templates/settings/user_admin.html:3
-#: bookwyrm/templates/settings/user_admin.html:10
+#: bookwyrm/templates/settings/admin_layout.html:26
+#: bookwyrm/templates/user_admin/user_admin.html:3
+#: bookwyrm/templates/user_admin/user_admin.html:10
 msgid "Users"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/admin_layout.html:39
 #: bookwyrm/templates/settings/federation.html:3
 #: bookwyrm/templates/settings/federation.html:5
 msgid "Federated Servers"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:37
+#: bookwyrm/templates/settings/admin_layout.html:44
 msgid "Instance Settings"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:41
+#: bookwyrm/templates/settings/admin_layout.html:48
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:44
+#: bookwyrm/templates/settings/admin_layout.html:51
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:45
+#: bookwyrm/templates/settings/admin_layout.html:52
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:46
+#: bookwyrm/templates/settings/admin_layout.html:53
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:47
+#: bookwyrm/templates/settings/admin_layout.html:54
 #: bookwyrm/templates/settings/site.html:77
 msgid "Registration"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:7
+#: bookwyrm/templates/settings/edit_server.html:3
+#: bookwyrm/templates/settings/edit_server.html:6
+#: bookwyrm/templates/settings/edit_server.html:20
+#: bookwyrm/templates/settings/federation.html:9
+#: bookwyrm/templates/settings/federation.html:10
+#: bookwyrm/templates/settings/server_blocklist.html:3
+#: bookwyrm/templates/settings/server_blocklist.html:20
+msgid "Add server"
+msgstr ""
+
+#: bookwyrm/templates/settings/edit_server.html:7
+#: bookwyrm/templates/settings/federated_server.html:12
+#: bookwyrm/templates/settings/server_blocklist.html:7
 msgid "Back to server list"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:12
-msgid "Details"
+#: bookwyrm/templates/settings/edit_server.html:16
+#: bookwyrm/templates/settings/server_blocklist.html:16
+msgid "Import block list"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:15
-msgid "Software:"
+#: bookwyrm/templates/settings/edit_server.html:30
+msgid "Instance:"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:19
-msgid "Version:"
-msgstr ""
-
-#: bookwyrm/templates/settings/federated_server.html:23
+#: bookwyrm/templates/settings/edit_server.html:37
+#: bookwyrm/templates/settings/federated_server.html:29
+#: bookwyrm/templates/user_admin/user_info.html:34
 msgid "Status:"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:30
+#: bookwyrm/templates/settings/edit_server.html:41
+#: bookwyrm/templates/settings/federated_server.html:9
+msgid "Blocked"
+msgstr ""
+
+#: bookwyrm/templates/settings/edit_server.html:48
+#: bookwyrm/templates/settings/federated_server.html:21
+#: bookwyrm/templates/user_admin/user_info.html:26
+msgid "Software:"
+msgstr ""
+
+#: bookwyrm/templates/settings/edit_server.html:55
+#: bookwyrm/templates/settings/federated_server.html:25
+#: bookwyrm/templates/user_admin/user_info.html:30
+msgid "Version:"
+msgstr ""
+
+#: bookwyrm/templates/settings/edit_server.html:64
+msgid "Notes:"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:18
+msgid "Details"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:36
 #: bookwyrm/templates/user/user_layout.html:50
 msgid "Activity"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:33
+#: bookwyrm/templates/settings/federated_server.html:39
 msgid "Users:"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:36
-#: bookwyrm/templates/settings/federated_server.html:43
+#: bookwyrm/templates/settings/federated_server.html:42
+#: bookwyrm/templates/settings/federated_server.html:49
 msgid "View all"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:40
+#: bookwyrm/templates/settings/federated_server.html:46
 msgid "Reports:"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:47
+#: bookwyrm/templates/settings/federated_server.html:53
 msgid "Followed by us:"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:53
+#: bookwyrm/templates/settings/federated_server.html:59
 msgid "Followed by them:"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:59
+#: bookwyrm/templates/settings/federated_server.html:65
 msgid "Blocked by us:"
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:13
+#: bookwyrm/templates/settings/federated_server.html:77
+#: bookwyrm/templates/user_admin/user_info.html:39
+msgid "Notes"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:80
+msgid "Edit"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:100
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:3
+msgid "Actions"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:104
+#: bookwyrm/templates/snippets/block_button.html:5
+msgid "Block"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:105
+msgid "All users from this instance will be deactivated."
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:110
+#: bookwyrm/templates/snippets/block_button.html:10
+msgid "Un-block"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:111
+msgid "All users from this instance will be re-activated."
+msgstr ""
+
+#: bookwyrm/templates/settings/federation.html:20
+#: bookwyrm/templates/user_admin/server_filter.html:5
 msgid "Server name"
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:17
+#: bookwyrm/templates/settings/federation.html:24
 msgid "Date federated"
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:21
+#: bookwyrm/templates/settings/federation.html:28
 msgid "Software"
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:24
-#: bookwyrm/templates/settings/manage_invite_requests.html:33
-#: bookwyrm/templates/settings/user_admin.html:32
+#: bookwyrm/templates/settings/federation.html:31
+#: bookwyrm/templates/settings/manage_invite_requests.html:44
+#: bookwyrm/templates/settings/status_filter.html:5
+#: bookwyrm/templates/user_admin/user_admin.html:34
 msgid "Status"
 msgstr ""
 
@@ -1767,55 +1955,62 @@ msgstr ""
 msgid "Ignored Invite Requests"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:31
-msgid "Date"
+#: bookwyrm/templates/settings/manage_invite_requests.html:35
+msgid "Date requested"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:32
+#: bookwyrm/templates/settings/manage_invite_requests.html:39
+msgid "Date accepted"
+msgstr ""
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:42
 msgid "Email"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:34
+#: bookwyrm/templates/settings/manage_invite_requests.html:47
 msgid "Action"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:37
+#: bookwyrm/templates/settings/manage_invite_requests.html:50
 msgid "No requests"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:45
+#: bookwyrm/templates/settings/manage_invite_requests.html:59
+#: bookwyrm/templates/settings/status_filter.html:16
 msgid "Accepted"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:47
+#: bookwyrm/templates/settings/manage_invite_requests.html:61
+#: bookwyrm/templates/settings/status_filter.html:12
 msgid "Sent"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:49
+#: bookwyrm/templates/settings/manage_invite_requests.html:63
+#: bookwyrm/templates/settings/status_filter.html:8
 msgid "Requested"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:57
+#: bookwyrm/templates/settings/manage_invite_requests.html:73
 msgid "Send invite"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:59
+#: bookwyrm/templates/settings/manage_invite_requests.html:75
 msgid "Re-send invite"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:70
+#: bookwyrm/templates/settings/manage_invite_requests.html:95
 msgid "Ignore"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:72
-msgid "Un-gnore"
+#: bookwyrm/templates/settings/manage_invite_requests.html:97
+msgid "Un-ignore"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:83
+#: bookwyrm/templates/settings/manage_invite_requests.html:108
 msgid "Back to pending requests"
 msgstr ""
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:85
+#: bookwyrm/templates/settings/manage_invite_requests.html:110
 msgid "View ignored requests"
 msgstr ""
 
@@ -1855,6 +2050,23 @@ msgstr ""
 msgid "No active invites"
 msgstr ""
 
+#: bookwyrm/templates/settings/server_blocklist.html:6
+msgid "Import Blocklist"
+msgstr ""
+
+#: bookwyrm/templates/settings/server_blocklist.html:26
+#: bookwyrm/templates/snippets/goal_progress.html:5
+msgid "Success!"
+msgstr ""
+
+#: bookwyrm/templates/settings/server_blocklist.html:30
+msgid "Successfully blocked:"
+msgstr ""
+
+#: bookwyrm/templates/settings/server_blocklist.html:32
+msgid "Failed:"
+msgstr ""
+
 #: bookwyrm/templates/settings/site.html:15
 msgid "Instance Name:"
 msgstr ""
@@ -1911,138 +2123,96 @@ msgstr ""
 msgid "Registration closed text:"
 msgstr ""
 
-#: bookwyrm/templates/settings/user_admin.html:7
-#, python-format
-msgid "Users: <small>%(server_name)s</small>"
+#: bookwyrm/templates/snippets/book_cover.html:20
+#: bookwyrm/templates/snippets/search_result_text.html:10
+msgid "No cover"
 msgstr ""
 
-#: bookwyrm/templates/settings/user_admin.html:20
-msgid "Username"
-msgstr ""
-
-#: bookwyrm/templates/settings/user_admin.html:24
-msgid "Date Added"
-msgstr ""
-
-#: bookwyrm/templates/settings/user_admin.html:28
-msgid "Last Active"
-msgstr ""
-
-#: bookwyrm/templates/settings/user_admin.html:36
-msgid "Remote server"
-msgstr ""
-
-#: bookwyrm/templates/settings/user_admin.html:45
-msgid "Active"
-msgstr ""
-
-#: bookwyrm/templates/settings/user_admin.html:45
-msgid "Inactive"
-msgstr ""
-
-#: bookwyrm/templates/settings/user_admin.html:50
-msgid "Not set"
-msgstr ""
-
-#: bookwyrm/templates/snippets/block_button.html:5
-msgid "Block"
-msgstr ""
-
-#: bookwyrm/templates/snippets/block_button.html:10
-msgid "Un-block"
-msgstr ""
-
-#: bookwyrm/templates/snippets/book_titleby.html:3
+#: bookwyrm/templates/snippets/book_titleby.html:4
 #, python-format
 msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgstr ""
 
 #: bookwyrm/templates/snippets/boost_button.html:8
 #: bookwyrm/templates/snippets/boost_button.html:9
-#: bookwyrm/templates/snippets/status/status_body.html:51
-#: bookwyrm/templates/snippets/status/status_body.html:52
-msgid "Boost status"
+msgid "Boost"
 msgstr ""
 
+#: bookwyrm/templates/snippets/boost_button.html:15
 #: bookwyrm/templates/snippets/boost_button.html:16
-#: bookwyrm/templates/snippets/boost_button.html:17
-msgid "Un-boost status"
+msgid "Un-boost"
 msgstr ""
 
 #: bookwyrm/templates/snippets/content_warning_field.html:3
 msgid "Spoiler alert:"
 msgstr ""
 
-#: bookwyrm/templates/snippets/content_warning_field.html:4
+#: bookwyrm/templates/snippets/content_warning_field.html:10
 msgid "Spoilers ahead!"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status.html:9
+#: bookwyrm/templates/snippets/create_status.html:17
 msgid "Review"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status.html:15
+#: bookwyrm/templates/snippets/create_status.html:39
 msgid "Quote"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:18
+#: bookwyrm/templates/snippets/create_status_form.html:20
 msgid "Comment:"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:20
+#: bookwyrm/templates/snippets/create_status_form.html:22
 msgid "Quote:"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:22
+#: bookwyrm/templates/snippets/create_status_form.html:24
 msgid "Review:"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:29
-#: bookwyrm/templates/user/shelf.html:81
-msgid "Rating"
+#: bookwyrm/templates/snippets/create_status_form.html:42
+#: bookwyrm/templates/snippets/status/layout.html:30
+#: bookwyrm/templates/snippets/status/layout.html:48
+#: bookwyrm/templates/snippets/status/layout.html:49
+msgid "Reply"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:31
-#: bookwyrm/templates/snippets/rate_action.html:14
-#: bookwyrm/templates/snippets/stars.html:3
-msgid "No rating"
-msgstr ""
-
-#: bookwyrm/templates/snippets/create_status_form.html:64
+#: bookwyrm/templates/snippets/create_status_form.html:67
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
 msgid "Progress:"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:71
+#: bookwyrm/templates/snippets/create_status_form.html:75
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:72
+#: bookwyrm/templates/snippets/create_status_form.html:76
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:77
+#: bookwyrm/templates/snippets/create_status_form.html:82
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:89
+#: bookwyrm/templates/snippets/create_status_form.html:97
 msgid "Include spoiler alert"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:95
+#: bookwyrm/templates/snippets/create_status_form.html:104
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:19
 msgid "Private"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:102
+#: bookwyrm/templates/snippets/create_status_form.html:115
 msgid "Post"
 msgstr ""
 
@@ -2052,24 +2222,25 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
 #, python-format
-msgid "You are deleting this readthrough and its %(count)s associated progress updates."
+msgid ""
+"You are deleting this readthrough and its %(count)s associated progress "
+"updates."
 msgstr ""
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
 #: bookwyrm/templates/snippets/follow_request_buttons.html:13
+#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:391
 msgid "Delete"
 msgstr ""
 
 #: bookwyrm/templates/snippets/fav_button.html:7
-#: bookwyrm/templates/snippets/fav_button.html:8
-#: bookwyrm/templates/snippets/status/status_body.html:55
-#: bookwyrm/templates/snippets/status/status_body.html:56
-msgid "Like status"
+#: bookwyrm/templates/snippets/fav_button.html:9
+msgid "Like"
 msgstr ""
 
 #: bookwyrm/templates/snippets/fav_button.html:15
 #: bookwyrm/templates/snippets/fav_button.html:16
-msgid "Un-like status"
+msgid "Un-like"
 msgstr ""
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:7
@@ -2080,11 +2251,11 @@ msgstr ""
 msgid "Hide filters"
 msgstr ""
 
-#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:19
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:22
 msgid "Apply filters"
 msgstr ""
 
-#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:23
+#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:26
 msgid "Clear filters"
 msgstr ""
 
@@ -2104,6 +2275,11 @@ msgstr ""
 msgid "Accept"
 msgstr ""
 
+#: bookwyrm/templates/snippets/form_rate_stars.html:20
+#: bookwyrm/templates/snippets/stars.html:13
+msgid "No rating"
+msgstr ""
+
 #: bookwyrm/templates/snippets/generated_status/goal.html:1
 #, python-format
 msgid "set a goal to read %(counter)s book in %(year)s"
@@ -2113,15 +2289,19 @@ msgstr[1] ""
 
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
 #, python-format
-msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
-msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
+msgid ""
+"Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
+msgid_plural ""
+"Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
 msgstr[0] ""
 msgstr[1] ""
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4
 #, python-format
-msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
-msgid_plural "Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
+msgid ""
+"Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
+msgid_plural ""
+"Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -2132,7 +2312,9 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/goal_card.html:23
 #, python-format
-msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
+msgid ""
+"You can set or change your reading goal any time from your <a href=\"%(path)s"
+"\">profile page</a>"
 msgstr ""
 
 #: bookwyrm/templates/snippets/goal_form.html:9
@@ -2158,10 +2340,6 @@ msgstr ""
 msgid "Set goal"
 msgstr ""
 
-#: bookwyrm/templates/snippets/goal_progress.html:5
-msgid "Success!"
-msgstr ""
-
 #: bookwyrm/templates/snippets/goal_progress.html:7
 #, python-format
 msgid "%(percent)s%% complete!"
@@ -2169,19 +2347,32 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/goal_progress.html:10
 #, python-format
-msgid "You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgid ""
+"You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
 msgstr ""
 
 #: bookwyrm/templates/snippets/goal_progress.html:12
 #, python-format
-msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgid ""
+"%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s "
+"books</a>."
 msgstr ""
 
-#: bookwyrm/templates/snippets/pagination.html:7
+#: bookwyrm/templates/snippets/page_text.html:4
+#, python-format
+msgid "page %(page)s of %(total_pages)s"
+msgstr ""
+
+#: bookwyrm/templates/snippets/page_text.html:6
+#, python-format
+msgid "page %(page)s"
+msgstr ""
+
+#: bookwyrm/templates/snippets/pagination.html:12
 msgid "Previous"
 msgstr ""
 
-#: bookwyrm/templates/snippets/pagination.html:15
+#: bookwyrm/templates/snippets/pagination.html:23
 msgid "Next"
 msgstr ""
 
@@ -2214,7 +2405,7 @@ msgstr ""
 msgid "Leave a rating"
 msgstr ""
 
-#: bookwyrm/templates/snippets/rate_action.html:29
+#: bookwyrm/templates/snippets/rate_action.html:19
 msgid "Rate"
 msgstr ""
 
@@ -2222,28 +2413,28 @@ msgstr ""
 msgid "Progress Updates:"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:12
+#: bookwyrm/templates/snippets/readthrough.html:14
 msgid "finished"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:15
+#: bookwyrm/templates/snippets/readthrough.html:25
 msgid "Show all updates"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:31
+#: bookwyrm/templates/snippets/readthrough.html:41
 msgid "Delete this progress update"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:41
+#: bookwyrm/templates/snippets/readthrough.html:51
 msgid "started"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:47
-#: bookwyrm/templates/snippets/readthrough.html:61
+#: bookwyrm/templates/snippets/readthrough.html:57
+#: bookwyrm/templates/snippets/readthrough.html:71
 msgid "Edit read dates"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:51
+#: bookwyrm/templates/snippets/readthrough.html:61
 msgid "Delete these read dates"
 msgstr ""
 
@@ -2271,29 +2462,25 @@ msgid "Report"
 msgstr ""
 
 #: bookwyrm/templates/snippets/rss_title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:11
+#: bookwyrm/templates/snippets/status/status_header.html:34
 msgid "rated"
 msgstr ""
 
 #: bookwyrm/templates/snippets/rss_title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:13
+#: bookwyrm/templates/snippets/status/status_header.html:36
 msgid "reviewed"
 msgstr ""
 
 #: bookwyrm/templates/snippets/rss_title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:15
+#: bookwyrm/templates/snippets/status/status_header.html:38
 msgid "commented on"
 msgstr ""
 
 #: bookwyrm/templates/snippets/rss_title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:17
+#: bookwyrm/templates/snippets/status/status_header.html:40
 msgid "quoted"
 msgstr ""
 
-#: bookwyrm/templates/snippets/search_result_text.html:10
-msgid "No cover"
-msgstr ""
-
 #: bookwyrm/templates/snippets/search_result_text.html:22
 #, python-format
 msgid "by %(author)s"
@@ -2313,7 +2500,7 @@ msgid "Finish \"<em>%(book_title)s</em>\""
 msgstr ""
 
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:35
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:34
 msgid "Update progress"
 msgstr ""
 
@@ -2334,7 +2521,7 @@ msgstr ""
 msgid "Want to read"
 msgstr ""
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:48
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
 #, python-format
 msgid "Remove from %(name)s"
 msgstr ""
@@ -2349,53 +2536,44 @@ msgstr ""
 msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgstr ""
 
+#: bookwyrm/templates/snippets/status/content_status.html:67
+#: bookwyrm/templates/snippets/trimmed_text.html:14
+msgid "Show more"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/content_status.html:82
+#: bookwyrm/templates/snippets/trimmed_text.html:29
+msgid "Show less"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/content_status.html:112
+msgid "Open image in new window"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/layout.html:22
+#: bookwyrm/templates/snippets/status/status_options.html:17
+msgid "Delete status"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/layout.html:52
+#: bookwyrm/templates/snippets/status/layout.html:53
+msgid "Boost status"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/layout.html:56
+#: bookwyrm/templates/snippets/status/layout.html:57
+msgid "Like status"
+msgstr ""
+
 #: bookwyrm/templates/snippets/status/status.html:9
 msgid "boosted"
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/status_body.html:27
-#: bookwyrm/templates/snippets/status/status_options.html:18
-msgid "Delete status"
-msgstr ""
-
-#: bookwyrm/templates/snippets/status/status_body.html:34
-#: bookwyrm/templates/snippets/status/status_body.html:47
-#: bookwyrm/templates/snippets/status/status_body.html:48
-msgid "Reply"
-msgstr ""
-
-#: bookwyrm/templates/snippets/status/status_content.html:18
-#: bookwyrm/templates/snippets/trimmed_text.html:15
-msgid "Show more"
-msgstr ""
-
-#: bookwyrm/templates/snippets/status/status_content.html:25
-#: bookwyrm/templates/snippets/trimmed_text.html:25
-msgid "Show less"
-msgstr ""
-
-#: bookwyrm/templates/snippets/status/status_content.html:46
-msgid "Open image in new window"
-msgstr ""
-
-#: bookwyrm/templates/snippets/status/status_header.html:22
+#: bookwyrm/templates/snippets/status/status_header.html:44
 #, python-format
-msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">review</a>"
-msgstr ""
-
-#: bookwyrm/templates/snippets/status/status_header.html:24
-#, python-format
-msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">comment</a>"
-msgstr ""
-
-#: bookwyrm/templates/snippets/status/status_header.html:26
-#, python-format
-msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">quote</a>"
-msgstr ""
-
-#: bookwyrm/templates/snippets/status/status_header.html:28
-#, python-format
-msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
+msgid ""
+"replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
+"\"%(status_path)s\">status</a>"
 msgstr ""
 
 #: bookwyrm/templates/snippets/status/status_options.html:7
@@ -2403,6 +2581,16 @@ msgstr ""
 msgid "More options"
 msgstr ""
 
+#: bookwyrm/templates/snippets/status/status_options.html:26
+msgid "Delete & re-draft"
+msgstr ""
+
+#: bookwyrm/templates/snippets/status/status_options.html:35
+#: bookwyrm/templates/snippets/user_options.html:13
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:6
+msgid "Send direct message"
+msgstr ""
+
 #: bookwyrm/templates/snippets/switch_edition_button.html:5
 msgid "Switch to this edition"
 msgstr ""
@@ -2415,19 +2603,6 @@ msgstr ""
 msgid "Sorted descending"
 msgstr ""
 
-#: bookwyrm/templates/snippets/tag.html:14
-msgid "Remove tag"
-msgstr ""
-
-#: bookwyrm/templates/snippets/tag.html:18
-msgid "Add tag"
-msgstr ""
-
-#: bookwyrm/templates/tag.html:9
-#, python-format
-msgid "Books tagged \"%(tag.name)s\""
-msgstr ""
-
 #: bookwyrm/templates/user/books_header.html:5
 #, python-format
 msgid "%(username)s's books"
@@ -2466,10 +2641,6 @@ msgstr ""
 msgid "%(username)s isn't following any users"
 msgstr ""
 
-#: bookwyrm/templates/user/lists.html:9
-msgid "Your Lists"
-msgstr ""
-
 #: bookwyrm/templates/user/lists.html:11
 #, python-format
 msgid "Lists: %(username)s"
@@ -2479,7 +2650,7 @@ msgstr ""
 msgid "Create list"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:56
+#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:51
 msgid "All books"
 msgstr ""
 
@@ -2491,23 +2662,23 @@ msgstr ""
 msgid "Edit shelf"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:78
+#: bookwyrm/templates/user/shelf.html:77 bookwyrm/templates/user/shelf.html:99
 msgid "Shelved"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:79
+#: bookwyrm/templates/user/shelf.html:78 bookwyrm/templates/user/shelf.html:103
 msgid "Started"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:80
+#: bookwyrm/templates/user/shelf.html:79 bookwyrm/templates/user/shelf.html:106
 msgid "Finished"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:127
+#: bookwyrm/templates/user/shelf.html:132
 msgid "This shelf is empty."
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:133
+#: bookwyrm/templates/user/shelf.html:138
 msgid "Delete shelf"
 msgstr ""
 
@@ -2570,6 +2741,73 @@ msgstr[1] ""
 msgid "%(counter)s following"
 msgstr ""
 
+#: bookwyrm/templates/user_admin/user.html:11
+msgid "Back to users"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_admin.html:7
+#, python-format
+msgid "Users: <small>%(server_name)s</small>"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_admin.html:22
+#: bookwyrm/templates/user_admin/username_filter.html:5
+msgid "Username"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_admin.html:26
+msgid "Date Added"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_admin.html:30
+msgid "Last Active"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_admin.html:38
+msgid "Remote server"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_admin.html:47
+msgid "Active"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_admin.html:47
+msgid "Inactive"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_admin.html:52
+#: bookwyrm/templates/user_admin/user_info.html:49
+msgid "Not set"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_info.html:5
+msgid "User details"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_info.html:14
+msgid "View user profile"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_info.html:20
+msgid "Instance details"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_info.html:46
+msgid "View instance"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:11
+msgid "Suspend user"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:13
+msgid "Un-suspend user"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:21
+msgid "Access level:"
+msgstr ""
+
 #: bookwyrm/views/password.py:32
 msgid "No user with that email address was found."
 msgstr ""
@@ -2578,3 +2816,1299 @@ msgstr ""
 #, python-format
 msgid "A password reset link sent to %s"
 msgstr ""
+
+#: venv3/lib/python3.8/site-packages/_pytest/config/argparsing.py:442
+#, python-format
+msgid "ambiguous option: %(option)s could match %(matches)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/contrib/messages/apps.py:7
+msgid "Messages"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/contrib/sitemaps/apps.py:7
+msgid "Site Maps"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/contrib/staticfiles/apps.py:9
+msgid "Static Files"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/contrib/syndication/apps.py:7
+msgid "Syndication"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/paginator.py:45
+msgid "That page number is not an integer"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/paginator.py:47
+msgid "That page number is less than 1"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/paginator.py:52
+msgid "That page contains no results"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:32
+msgid "Enter a valid value."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:103
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:659
+msgid "Enter a valid URL."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:155
+msgid "Enter a valid integer."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:166
+msgid "Enter a valid email address."
+msgstr ""
+
+#. Translators: "letters" means latin letters: a-z and A-Z.
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:240
+msgid ""
+"Enter a valid “slug� consisting of letters, numbers, underscores or hyphens."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:247
+msgid ""
+"Enter a valid “slug� consisting of Unicode letters, numbers, underscores, or "
+"hyphens."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:256
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:276
+msgid "Enter a valid IPv4 address."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:261
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:277
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:271
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:275
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:305
+msgid "Enter only digits separated by commas."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:311
+#, python-format
+msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:343
+#, python-format
+msgid "Ensure this value is less than or equal to %(limit_value)s."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:352
+#, python-format
+msgid "Ensure this value is greater than or equal to %(limit_value)s."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:362
+#, python-format
+msgid ""
+"Ensure this value has at least %(limit_value)d character (it has "
+"%(show_value)d)."
+msgid_plural ""
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:377
+#, python-format
+msgid ""
+"Ensure this value has at most %(limit_value)d character (it has "
+"%(show_value)d)."
+msgid_plural ""
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:396
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:291
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:326
+msgid "Enter a number."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:398
+#, python-format
+msgid "Ensure that there are no more than %(max)s digit in total."
+msgid_plural "Ensure that there are no more than %(max)s digits in total."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:403
+#, python-format
+msgid "Ensure that there are no more than %(max)s decimal place."
+msgid_plural "Ensure that there are no more than %(max)s decimal places."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:408
+#, python-format
+msgid ""
+"Ensure that there are no more than %(max)s digit before the decimal point."
+msgid_plural ""
+"Ensure that there are no more than %(max)s digits before the decimal point."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:470
+#, python-format
+msgid ""
+"File extension “%(extension)s� is not allowed. Allowed extensions are: "
+"%(allowed_extensions)s."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:522
+msgid "Null characters are not allowed."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/base.py:1181
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:759
+msgid "and"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/base.py:1183
+#, python-format
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:104
+#, python-format
+msgid "Value %(value)r is not a valid choice."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:105
+msgid "This field cannot be null."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:106
+msgid "This field cannot be blank."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:107
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr ""
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:130
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:937
+#, python-format
+msgid "“%(value)s� value must be either True or False."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:938
+#, python-format
+msgid "“%(value)s� value must be either True, False, or None."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:940
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:981
+#, python-format
+msgid "String (up to %(max_length)s)"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1045
+msgid "Comma-separated integers"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1094
+#, python-format
+msgid ""
+"“%(value)s� value has an invalid date format. It must be in YYYY-MM-DD "
+"format."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1096
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1239
+#, python-format
+msgid ""
+"“%(value)s� value has the correct format (YYYY-MM-DD) but it is an invalid "
+"date."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1099
+msgid "Date (without time)"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1237
+#, python-format
+msgid ""
+"“%(value)s� value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1241
+#, python-format
+msgid ""
+"“%(value)s� value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"[TZ]) but it is an invalid date/time."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1245
+msgid "Date (with time)"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1393
+#, python-format
+msgid "“%(value)s� value must be a decimal number."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1395
+msgid "Decimal number"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1534
+#, python-format
+msgid ""
+"“%(value)s� value has an invalid format. It must be in [DD] [[HH:]MM:]ss[."
+"uuuuuu] format."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1537
+msgid "Duration"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1587
+msgid "Email address"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1610
+msgid "File path"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1676
+#, python-format
+msgid "“%(value)s� value must be a float."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1678
+msgid "Floating point number"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1716
+#, python-format
+msgid "“%(value)s� value must be an integer."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1718
+msgid "Integer"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1801
+msgid "Big (8 byte) integer"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1817
+msgid "IPv4 address"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1848
+msgid "IP address"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1928
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1929
+#, python-format
+msgid "“%(value)s� value must be either None, True or False."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1931
+msgid "Boolean (Either True, False or None)"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1966
+msgid "Positive integer"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1979
+msgid "Positive small integer"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1993
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2025
+msgid "Small integer"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2032
+msgid "Text"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2060
+#, python-format
+msgid ""
+"“%(value)s� value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"format."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2062
+#, python-format
+msgid ""
+"“%(value)s� value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"invalid time."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2065
+msgid "Time"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2191
+msgid "URL"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2213
+msgid "Raw binary data"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2278
+#, python-format
+msgid "“%(value)s� is not a valid UUID."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2280
+msgid "Universally unique identifier"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/files.py:221
+msgid "File"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/files.py:360
+msgid "Image"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:778
+#, python-format
+msgid "%(model)s instance with %(field)s %(value)r does not exist."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:780
+msgid "Foreign Key (type determined by related field)"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1012
+msgid "One-to-one relationship"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1066
+#, python-format
+msgid "%(from)s-%(to)s relationship"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1067
+#, python-format
+msgid "%(from)s-%(to)s relationships"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1109
+msgid "Many-to-many relationship"
+msgstr ""
+
+#. Translators: If found as last label character, these punctuation
+#. characters will prevent the default label_suffix to be appended to the label
+#: venv3/lib/python3.8/site-packages/django/forms/boundfield.py:149
+msgid ":?.!"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:53
+msgid "This field is required."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:246
+msgid "Enter a whole number."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:397
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:1127
+msgid "Enter a valid date."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:421
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:1128
+msgid "Enter a valid time."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:443
+msgid "Enter a valid date/time."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:472
+msgid "Enter a valid duration."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:473
+#, python-brace-format
+msgid "The number of days must be between {min_days} and {max_days}."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:533
+msgid "No file was submitted. Check the encoding type on the form."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:534
+msgid "No file was submitted."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:535
+msgid "The submitted file is empty."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:537
+#, python-format
+msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
+msgid_plural ""
+"Ensure this filename has at most %(max)d characters (it has %(length)d)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:540
+msgid "Please either submit a file or check the clear checkbox, not both."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:601
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:763
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:853
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:1275
+#, python-format
+msgid "Select a valid choice. %(value)s is not one of the available choices."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:854
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:969
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:1274
+msgid "Enter a list of values."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:970
+msgid "Enter a complete value."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:1186
+msgid "Enter a valid UUID."
+msgstr ""
+
+#. Translators: This is the default suffix added to form field labels
+#: venv3/lib/python3.8/site-packages/django/forms/forms.py:81
+msgid ":"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/forms.py:207
+#, python-format
+msgid "(Hidden field %(name)s) %(error)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:93
+msgid "ManagementForm data is missing or has been tampered with"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:345
+#, python-format
+msgid "Please submit %d or fewer forms."
+msgid_plural "Please submit %d or fewer forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:352
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:379
+#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:386
+msgid "Order"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:754
+#, python-format
+msgid "Please correct the duplicate data for %(field)s."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:758
+#, python-format
+msgid "Please correct the duplicate data for %(field)s, which must be unique."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:764
+#, python-format
+msgid ""
+"Please correct the duplicate data for %(field_name)s which must be unique "
+"for the %(lookup)s in %(date_field)s."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:773
+msgid "Please correct the duplicate values below."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:1094
+msgid "The inline value did not match the parent instance."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:1161
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:1277
+#, python-format
+msgid "“%(pk)s� is not a valid value."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/utils.py:162
+#, python-format
+msgid ""
+"%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:395
+msgid "Clear"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:396
+msgid "Currently"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:397
+msgid "Change"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:709
+msgid "Unknown"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:710
+msgid "Yes"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:711
+msgid "No"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:788
+msgid "yes,no,maybe"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:817
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:834
+#, python-format
+msgid "%(size)d byte"
+msgid_plural "%(size)d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:836
+#, python-format
+msgid "%s KB"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:838
+#, python-format
+msgid "%s MB"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:840
+#, python-format
+msgid "%s GB"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:842
+#, python-format
+msgid "%s TB"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:844
+#, python-format
+msgid "%s PB"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:62
+msgid "p.m."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:63
+msgid "a.m."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:68
+msgid "PM"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:69
+msgid "AM"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:150
+msgid "midnight"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:152
+msgid "noon"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:295
+msgid "Monday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:296
+msgid "Tuesday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:297
+msgid "Wednesday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:298
+msgid "Thursday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:299
+msgid "Friday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:7
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:300
+msgid "Saturday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:7
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:301
+msgid "Sunday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
+msgid "Mon"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
+msgid "Tue"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
+msgid "Wed"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
+msgid "Thu"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
+msgid "Fri"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:11
+msgid "Sat"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:11
+msgid "Sun"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:281
+msgid "January"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:282
+msgid "February"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:283
+msgid "March"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:284
+msgid "April"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:285
+msgid "May"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:286
+msgid "June"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:287
+msgid "July"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:288
+msgid "August"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:289
+msgid "September"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:290
+msgid "October"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:291
+msgid "November"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:16
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:292
+msgid "December"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "jan"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "feb"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "mar"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "apr"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "may"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "jun"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "jul"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "aug"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "sep"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "oct"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "nov"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "dec"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:23
+msgctxt "abbrev. month"
+msgid "Jan."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:24
+msgctxt "abbrev. month"
+msgid "Feb."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:25
+msgctxt "abbrev. month"
+msgid "March"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:26
+msgctxt "abbrev. month"
+msgid "April"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:27
+msgctxt "abbrev. month"
+msgid "May"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:28
+msgctxt "abbrev. month"
+msgid "June"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:29
+msgctxt "abbrev. month"
+msgid "July"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:30
+msgctxt "abbrev. month"
+msgid "Aug."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:31
+msgctxt "abbrev. month"
+msgid "Sept."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:32
+msgctxt "abbrev. month"
+msgid "Oct."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:33
+msgctxt "abbrev. month"
+msgid "Nov."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:34
+msgctxt "abbrev. month"
+msgid "Dec."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:37
+msgctxt "alt. month"
+msgid "January"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:38
+msgctxt "alt. month"
+msgid "February"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:39
+msgctxt "alt. month"
+msgid "March"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:40
+msgctxt "alt. month"
+msgid "April"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:41
+msgctxt "alt. month"
+msgid "May"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:42
+msgctxt "alt. month"
+msgid "June"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:43
+msgctxt "alt. month"
+msgid "July"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:44
+msgctxt "alt. month"
+msgid "August"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:45
+msgctxt "alt. month"
+msgid "September"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:46
+msgctxt "alt. month"
+msgid "October"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:47
+msgctxt "alt. month"
+msgid "November"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:48
+msgctxt "alt. month"
+msgid "December"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/ipv6.py:8
+msgid "This is not a valid IPv6 address."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/text.py:69
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s…"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/text.py:235
+msgid "or"
+msgstr ""
+
+#. Translators: This string is used as a separator between list elements
+#: venv3/lib/python3.8/site-packages/django/utils/text.py:254
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:83
+msgid ", "
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:9
+#, python-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:10
+#, python-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:11
+#, python-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:12
+#, python-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:13
+#, python-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:14
+#, python-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:72
+msgid "0 minutes"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:110
+msgid "Forbidden"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:111
+msgid "CSRF verification failed. Request aborted."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:115
+msgid ""
+"You are seeing this message because this HTTPS site requires a “Referer "
+"header� to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:120
+msgid ""
+"If you have configured your browser to disable “Referer� headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for “same-"
+"origin� requests."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:124
+msgid ""
+"If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
+"including the “Referrer-Policy: no-referrer� header, please remove them. The "
+"CSRF protection requires the “Referer� header to do strict referer checking. "
+"If you’re concerned about privacy, use alternatives like <a rel=\"noreferrer"
+"\" …> for links to third-party sites."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:132
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:137
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for “same-origin� requests."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:142
+msgid "More information is available with DEBUG=True."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:41
+msgid "No year specified"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:61
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:111
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:208
+msgid "Date out of range"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:90
+msgid "No month specified"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:142
+msgid "No day specified"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:188
+msgid "No week specified"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:338
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:367
+#, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:589
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:623
+#, python-format
+msgid "Invalid date string “%(datestr)s� given format “%(format)s�"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/detail.py:54
+#, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/list.py:67
+msgid "Page is not “last�, nor can it be converted to an int."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/list.py:72
+#, python-format
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/list.py:154
+#, python-format
+msgid "Empty list and “%(class_name)s.allow_empty� is False."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/static.py:40
+msgid "Directory indexes are not allowed here."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/static.py:42
+#, python-format
+msgid "“%(path)s� does not exist"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/static.py:80
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:7
+msgid "Django: the Web framework for perfectionists with deadlines."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:346
+#, python-format
+msgid ""
+"View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
+"target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:368
+msgid "The install worked successfully! Congratulations!"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:369
+#, python-format
+msgid ""
+"You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
+"%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
+"\">DEBUG=True</a> is in your settings file and you have not configured any "
+"URLs."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:384
+msgid "Django Documentation"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:385
+msgid "Topics, references, &amp; how-to’s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:396
+msgid "Tutorial: A Polling App"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:397
+msgid "Get started with Django"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:408
+msgid "Django Community"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:409
+msgid "Connect, get help, or contribute"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/kombu/transport/qpid.py:1301
+#, python-format
+msgid "Attempting to connect to qpid with SASL mechanism %s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/kombu/transport/qpid.py:1306
+#, python-format
+msgid "Connected to qpid with SASL mechanism %s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/kombu/transport/qpid.py:1324
+#, python-format
+msgid "Unable to connect to qpid with SASL mechanism %s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:371
+msgid "1 second ago"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:377
+msgid "1 minute ago"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:382
+msgid "1 hour ago"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:385
+#, python-format
+msgid "%(time)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:387
+msgid "yesterday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:387
+#, python-format
+msgid "yesterday at %(time)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:389
+#, python-format
+msgid "%(weekday)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:389
+#, python-format
+msgid "%(weekday)s at %(time)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:392
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:445
+#, python-format
+msgid "%(month_name)s %(day)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:394
+#, python-format
+msgid "%(month_name)s %(day)s at %(time)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:399
+#, python-format
+msgid "%(month_name)s %(day)s, %(year)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:401
+#, python-format
+msgid "%(month_name)s %(day)s, %(year)s at %(time)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:439
+#, python-format
+msgid "%(weekday)s, %(month_name)s %(day)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:462
+#, python-format
+msgid "%(commas)s and %(last)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:68
+msgctxt "law"
+msgid "right"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:69
+msgctxt "good"
+msgid "right"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:71
+#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:74
+msgctxt "organization"
+msgid "club"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:76
+#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:77
+msgctxt "stick"
+msgid "club"
+msgstr ""
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 87f443a0..7994ce69 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-25 04:01+0000\n"
+"POT-Creation-Date: 2021-04-26 09:56-0700\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -56,11 +56,11 @@ msgid "Book Title"
 msgstr "Título"
 
 #: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:31
-#: bookwyrm/templates/user/shelf.html:81
+#: bookwyrm/templates/user/shelf.html:80 bookwyrm/templates/user/shelf.html:110
 msgid "Rating"
 msgstr "Calificación"
 
-#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:72
+#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:82
 msgid "Sort By"
 msgstr "Ordenar por"
 
@@ -222,12 +222,17 @@ msgstr "<a href=\"%(path)s/editions\">%(count)s ediciones</a>"
 #: bookwyrm/templates/book/book.html:143
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
-msgstr "Esta edición está en tu <a href=\"%(path)s\">%(shelf_name)s</a> estante."
+msgstr ""
+"Esta edición está en tu <a href=\"%(path)s\">%(shelf_name)s</a> estante."
 
 #: bookwyrm/templates/book/book.html:149
 #, python-format
-msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
-msgstr "Una <a href=\"%(book_path)s\">edición diferente</a> de este libro está en tu <a href=\"%(shelf_path)s\">%(shelf_name)s</a> estante."
+msgid ""
+"A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a "
+"href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
+msgstr ""
+"Una <a href=\"%(book_path)s\">edición diferente</a> de este libro está en tu "
+"<a href=\"%(shelf_path)s\">%(shelf_name)s</a> estante."
 
 #: bookwyrm/templates/book/book.html:158
 msgid "Your reading activity"
@@ -266,11 +271,35 @@ msgstr "Agregar a lista"
 
 #: bookwyrm/templates/book/book.html:238
 #: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:123
+#: bookwyrm/templates/lists/list.html:133
 msgid "Add"
 msgstr "Agregar"
 
-#: bookwyrm/templates/book/book.html:276
+#: bookwyrm/templates/book/book.html:254
+#, fuzzy
+#| msgid "Review"
+msgid "Reviews"
+msgstr "Reseña"
+
+#: bookwyrm/templates/book/book.html:259
+#, fuzzy
+#| msgid "Your shelves"
+msgid "Your reviews"
+msgstr "Tus estantes"
+
+#: bookwyrm/templates/book/book.html:265
+#, fuzzy
+#| msgid "Your Account"
+msgid "Your comments"
+msgstr "Tu cuenta"
+
+#: bookwyrm/templates/book/book.html:271
+#, fuzzy
+#| msgid "Your books"
+msgid "Your quotes"
+msgstr "Tus libros"
+
+#: bookwyrm/templates/book/book.html:305
 msgid "rated it"
 msgstr "lo calificó con"
 
@@ -420,7 +449,7 @@ msgid "John Doe, Jane Smith"
 msgstr "Juan Nadie, Natalia Natalia"
 
 #: bookwyrm/templates/book/edit_book.html:170
-#: bookwyrm/templates/user/shelf.html:75
+#: bookwyrm/templates/user/shelf.html:74
 msgid "Cover"
 msgstr "Portada:"
 
@@ -544,8 +573,12 @@ msgstr "Haz que tu perfil sea reconocible a otros usarios de BookWyrm."
 
 #: bookwyrm/templates/directory/directory.html:26
 #, python-format
-msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
-msgstr "Puedes optar por no en cualquier hora en tus <a href=\"%(path)s\">configuraciones de perfil.</a>"
+msgid ""
+"You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</"
+"a>"
+msgstr ""
+"Puedes optar por no en cualquier hora en tus <a href=\"%(path)s"
+"\">configuraciones de perfil.</a>"
 
 #: bookwyrm/templates/directory/directory.html:31
 #: bookwyrm/templates/snippets/goal_card.html:22
@@ -711,8 +744,12 @@ msgstr "Hola, "
 
 #: bookwyrm/templates/email/html_layout.html:21
 #, python-format
-msgid "BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a>"
-msgstr "BookWyrm alojado en <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a>"
+msgid ""
+"BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">"
+"%(site_name)s</a>"
+msgstr ""
+"BookWyrm alojado en <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">"
+"%(site_name)s</a>"
 
 #: bookwyrm/templates/email/html_layout.html:23
 msgid "Email preference"
@@ -730,13 +767,21 @@ msgstr "Únete ahora"
 
 #: bookwyrm/templates/email/invite/html_content.html:15
 #, python-format
-msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
-msgstr "Aprenda más <a href=\"https://%(domain)s%(about_path)s\">sobre esta instancia</a>."
+msgid ""
+"Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</"
+"a>."
+msgstr ""
+"Aprenda más <a href=\"https://%(domain)s%(about_path)s\">sobre esta "
+"instancia</a>."
 
 #: bookwyrm/templates/email/invite/text_content.html:4
 #, python-format
-msgid "You're invited to join %(site_name)s! Click the link below to create an account."
-msgstr "Estás invitado a unirte con %(site_name)s! Haz clic en el enlace a continuación para crear una cuenta."
+msgid ""
+"You're invited to join %(site_name)s! Click the link below to create an "
+"account."
+msgstr ""
+"Estás invitado a unirte con %(site_name)s! Haz clic en el enlace a "
+"continuación para crear una cuenta."
 
 #: bookwyrm/templates/email/invite/text_content.html:8
 msgid "Learn more about this instance:"
@@ -745,8 +790,13 @@ msgstr "Aprende más sobre esta intancia:"
 #: bookwyrm/templates/email/password_reset/html_content.html:6
 #: bookwyrm/templates/email/password_reset/text_content.html:4
 #, python-format
-msgid "You requested to reset your %(site_name)s password. Click the link below to set a new password and log in to your account."
-msgstr "Tú solicitaste reestablecer tu %(site_name)s contraseña. Haz clic en el enlace a continuación para establecer una nueva contraseña e ingresar a tu cuenta."
+msgid ""
+"You requested to reset your %(site_name)s password. Click the link below to "
+"set a new password and log in to your account."
+msgstr ""
+"Tú solicitaste reestablecer tu %(site_name)s contraseña. Haz clic en el "
+"enlace a continuación para establecer una nueva contraseña e ingresar a tu "
+"cuenta."
 
 #: bookwyrm/templates/email/password_reset/html_content.html:9
 #: bookwyrm/templates/password_reset.html:4
@@ -758,8 +808,10 @@ msgstr "Restablecer contraseña"
 
 #: bookwyrm/templates/email/password_reset/html_content.html:13
 #: bookwyrm/templates/email/password_reset/text_content.html:8
-msgid "If you didn't request to reset your password, you can ignore this email."
-msgstr "Si no solicitaste reestablecer tu contraseña, puedes ignorar este mensaje."
+msgid ""
+"If you didn't request to reset your password, you can ignore this email."
+msgstr ""
+"Si no solicitaste reestablecer tu contraseña, puedes ignorar este mensaje."
 
 #: bookwyrm/templates/email/password_reset/subject.html:2
 #, python-format
@@ -812,10 +864,12 @@ msgstr "Federalizado"
 #: bookwyrm/templates/feed/feed.html:33
 #, python-format
 msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
-msgstr "cargar <span data-poll=\"stream/%(tab)s\">0</span> status(es) no leídos"
+msgstr ""
+"cargar <span data-poll=\"stream/%(tab)s\">0</span> status(es) no leídos"
 
 #: bookwyrm/templates/feed/feed.html:48
-msgid "There aren't any activities right now! Try following a user to get started"
+msgid ""
+"There aren't any activities right now! Try following a user to get started"
 msgstr "¡No hay actividad ahora mismo! Sigue a otro usuario para empezar"
 
 #: bookwyrm/templates/feed/feed.html:56
@@ -834,7 +888,8 @@ msgid "Your books"
 msgstr "Tus libros"
 
 #: bookwyrm/templates/feed/feed_layout.html:13
-msgid "There are no books here right now! Try searching for a book to get started"
+msgid ""
+"There are no books here right now! Try searching for a book to get started"
 msgstr "¡No hay ningún libro aqui ahorita! Busca a un libro para empezar"
 
 #: bookwyrm/templates/feed/feed_layout.html:24
@@ -883,7 +938,7 @@ msgid "What are you reading?"
 msgstr "¿Qué estás leyendo?"
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:91
+#: bookwyrm/templates/lists/list.html:101
 msgid "Search for a book"
 msgstr "Buscar libros"
 
@@ -904,7 +959,7 @@ msgstr "Puedes agregar libros cuando comiences a usar %(site_name)s."
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
 #: bookwyrm/templates/layout.html:38 bookwyrm/templates/layout.html:39
-#: bookwyrm/templates/lists/list.html:95
+#: bookwyrm/templates/lists/list.html:105
 msgid "Search"
 msgstr "Buscar"
 
@@ -918,7 +973,7 @@ msgid "Popular on %(site_name)s"
 msgstr "Popular en %(site_name)s"
 
 #: bookwyrm/templates/get_started/books.html:51
-#: bookwyrm/templates/lists/list.html:108
+#: bookwyrm/templates/lists/list.html:118
 msgid "No books found"
 msgstr "No se encontró ningún libro"
 
@@ -987,8 +1042,12 @@ msgid "Show this account in suggested users:"
 msgstr "Mostrar esta cuenta en los usuarios sugeridos:"
 
 #: bookwyrm/templates/get_started/profile.html:52
-msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users."
-msgstr "Tu cuenta se aparecerá en el directorio, y puede ser recomendado a otros usuarios de BookWyrm."
+msgid ""
+"Your account will show up in the directory, and may be recommended to other "
+"BookWyrm users."
+msgstr ""
+"Tu cuenta se aparecerá en el directorio, y puede ser recomendado a otros "
+"usuarios de BookWyrm."
 
 #: bookwyrm/templates/get_started/users.html:11
 msgid "Search for a user"
@@ -1012,8 +1071,12 @@ msgstr "Editar meta"
 #: bookwyrm/templates/goal.html:30
 #: bookwyrm/templates/snippets/goal_card.html:13
 #, python-format
-msgid "Set a goal for how many books you'll finish reading in %(year)s, and track your progress throughout the year."
-msgstr "Establece una meta para cuantos libros leerás en %(year)s, y seguir tu progreso durante el año."
+msgid ""
+"Set a goal for how many books you'll finish reading in %(year)s, and track "
+"your progress throughout the year."
+msgstr ""
+"Establece una meta para cuantos libros leerás en %(year)s, y seguir tu "
+"progreso durante el año."
 
 #: bookwyrm/templates/goal.html:39
 #, python-format
@@ -1095,8 +1158,12 @@ msgstr "No se pudo cargar"
 
 #: bookwyrm/templates/import_status.html:44
 #, python-format
-msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
-msgstr "Saltar al final de la lista para seleccionar los %(failed_count)s artículos que no se pudieron importar."
+msgid ""
+"Jump to the bottom of the list to select the %(failed_count)s items which "
+"failed to import."
+msgstr ""
+"Saltar al final de la lista para seleccionar los %(failed_count)s artículos "
+"que no se pudieron importar."
 
 #: bookwyrm/templates/import_status.html:79
 msgid "Select all"
@@ -1117,12 +1184,12 @@ msgstr "Libro"
 
 #: bookwyrm/templates/import_status.html:115
 #: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/user/shelf.html:76
+#: bookwyrm/templates/user/shelf.html:75 bookwyrm/templates/user/shelf.html:93
 msgid "Title"
 msgstr "Título"
 
 #: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/user/shelf.html:77
+#: bookwyrm/templates/user/shelf.html:76 bookwyrm/templates/user/shelf.html:96
 msgid "Author"
 msgstr "Autor/Autora"
 
@@ -1230,12 +1297,20 @@ msgstr "Contactarse con administradores del sitio"
 
 #: bookwyrm/templates/layout.html:206
 #, python-format
-msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
-msgstr "Apoyar %(site_name)s en <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
+msgid ""
+"Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">"
+"%(support_title)s</a>"
+msgstr ""
+"Apoyar %(site_name)s en <a href=\"%(support_link)s\" target=\"_blank\">"
+"%(support_title)s</a>"
 
 #: bookwyrm/templates/layout.html:210
-msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
-msgstr "BookWyrm es software de código abierto. Puedes contribuir o reportar problemas en <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgid ""
+"BookWyrm is open source software. You can contribute or report issues on <a "
+"href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgstr ""
+"BookWyrm es software de código abierto. Puedes contribuir o reportar "
+"problemas en <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
 #: bookwyrm/templates/lists/create_form.html:5
 #: bookwyrm/templates/lists/lists.html:20
@@ -1310,58 +1385,69 @@ msgstr "Abierto"
 msgid "Anyone can add books to this list"
 msgstr "Cualquer usuario puede agregar libros a esta lista"
 
-#: bookwyrm/templates/lists/list.html:17
+#: bookwyrm/templates/lists/list.html:19
+msgid "You successfully suggested a book for this list!"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:21
+#, fuzzy
+#| msgid "Anyone can add books to this list"
+msgid "You successfully added a book to this list!"
+msgstr "Cualquer usuario puede agregar libros a esta lista"
+
+#: bookwyrm/templates/lists/list.html:27
 msgid "This list is currently empty"
 msgstr "Esta lista está vacia"
 
-#: bookwyrm/templates/lists/list.html:36
+#: bookwyrm/templates/lists/list.html:46
 #, python-format
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "Agregado por <a href=\"%(user_path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/lists/list.html:48
+#: bookwyrm/templates/lists/list.html:58
 msgid "Set"
 msgstr "Establecido"
 
-#: bookwyrm/templates/lists/list.html:51
+#: bookwyrm/templates/lists/list.html:61
 msgid "List position"
 msgstr "Posición"
 
-#: bookwyrm/templates/lists/list.html:57
+#: bookwyrm/templates/lists/list.html:67
 #: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr "Quitar"
 
-#: bookwyrm/templates/lists/list.html:70 bookwyrm/templates/lists/list.html:82
+#: bookwyrm/templates/lists/list.html:80 bookwyrm/templates/lists/list.html:92
 msgid "Sort List"
 msgstr "Ordena la lista"
 
-#: bookwyrm/templates/lists/list.html:76
+#: bookwyrm/templates/lists/list.html:86
 msgid "Direction"
 msgstr "Dirección"
 
-#: bookwyrm/templates/lists/list.html:87
+#: bookwyrm/templates/lists/list.html:97
 msgid "Add Books"
 msgstr "Agregar libros"
 
-#: bookwyrm/templates/lists/list.html:87
+#: bookwyrm/templates/lists/list.html:97
 msgid "Suggest Books"
 msgstr "Sugerir libros"
 
-#: bookwyrm/templates/lists/list.html:96
+#: bookwyrm/templates/lists/list.html:106
 msgid "search"
 msgstr "buscar"
 
-#: bookwyrm/templates/lists/list.html:102
+#: bookwyrm/templates/lists/list.html:112
 msgid "Clear search"
 msgstr "Borrar búsqueda"
 
-#: bookwyrm/templates/lists/list.html:107
+#: bookwyrm/templates/lists/list.html:117
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
-msgstr "No se encontró ningún libro correspondiente a la búsqueda: \"%(query)s\""
+msgstr ""
+"No se encontró ningún libro correspondiente a la búsqueda: \"%(query)s\""
 
-#: bookwyrm/templates/lists/list.html:123
+#: bookwyrm/templates/lists/list.html:133
 msgid "Suggest"
 msgstr "Sugerir"
 
@@ -1427,7 +1513,8 @@ msgstr "Reportar @%(username)s"
 #: bookwyrm/templates/moderation/report_modal.html:23
 #, python-format
 msgid "This report will be sent to %(site_name)s's moderators for review."
-msgstr "Este informe se enviará a los moderadores de %(site_name)s para la revisión."
+msgstr ""
+"Este informe se enviará a los moderadores de %(site_name)s para la revisión."
 
 #: bookwyrm/templates/moderation/report_modal.html:24
 msgid "More info about this report:"
@@ -1480,18 +1567,29 @@ msgstr "Borrar notificaciones"
 
 #: bookwyrm/templates/notifications.html:53
 #, python-format
-msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr "le gustó tu <a href=\"%(related_path)s\">reseña de <em>%(book_title)s</em></a>"
+msgid ""
+"favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+"le gustó tu <a href=\"%(related_path)s\">reseña de <em>%(book_title)s</em></"
+"a>"
 
 #: bookwyrm/templates/notifications.html:55
 #, python-format
-msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
-msgstr "le gustó tu <a href=\"%(related_path)s\">comentario en <em>%(book_title)s</em></a>"
+msgid ""
+"favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+"le gustó tu <a href=\"%(related_path)s\">comentario en <em>%(book_title)s</"
+"em></a>"
 
 #: bookwyrm/templates/notifications.html:57
 #, python-format
-msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr "le gustó tu <a href=\"%(related_path)s\">cita de <em>%(book_title)s</em></a>"
+msgid ""
+"favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+"le gustó tu <a href=\"%(related_path)s\">cita de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:59
 #, python-format
@@ -1500,18 +1598,30 @@ msgstr "le gustó tu <a href=\"%(related_path)s\">status</a>"
 
 #: bookwyrm/templates/notifications.html:64
 #, python-format
-msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr "te mencionó en una <a href=\"%(related_path)s\">reseña de <em>%(book_title)s</em></a>"
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">review of <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+"te mencionó en una <a href=\"%(related_path)s\">reseña de <em>"
+"%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:66
 #, python-format
-msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
-msgstr "te mencionó en un <a href=\"%(related_path)s\">comentario de <em>%(book_title)s</em></a>"
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">comment on <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+"te mencionó en un <a href=\"%(related_path)s\">comentario de <em>"
+"%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:68
 #, python-format
-msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr "te mencionó en una <a href=\"%(related_path)s\">cita de <em>%(book_title)s</em></a>"
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">quote from <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+"te mencionó en una <a href=\"%(related_path)s\">cita de <em>%(book_title)s</"
+"em></a>"
 
 #: bookwyrm/templates/notifications.html:70
 #, python-format
@@ -1520,23 +1630,39 @@ msgstr "te mencionó en un <a href=\"%(related_path)s\">status</a>"
 
 #: bookwyrm/templates/notifications.html:75
 #, python-format
-msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">reseña de <em>%(book_title)s</em></a>"
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">review of <em>%(book_title)s</em></a>"
+msgstr ""
+"<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s"
+"\">reseña de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:77
 #, python-format
-msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
-msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">comentario en <em>%(book_title)s</em></a>"
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">comment on <em>%(book_title)s</em></a>"
+msgstr ""
+"<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s"
+"\">comentario en <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:79
 #, python-format
-msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">cita de <em>%(book_title)s</em></a>"
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">quote from <em>%(book_title)s</em></a>"
+msgstr ""
+"<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s"
+"\">cita de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:81
 #, python-format
-msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
-msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">status</a>"
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">status</a>"
+msgstr ""
+"<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s"
+"\">status</a>"
 
 #: bookwyrm/templates/notifications.html:85
 msgid "followed you"
@@ -1548,18 +1674,29 @@ msgstr "te quiere seguir"
 
 #: bookwyrm/templates/notifications.html:94
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr "respaldó tu <a href=\"%(related_path)s\">reseña de <em>%(book_title)s</em></a>"
+msgid ""
+"boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></"
+"a>"
+msgstr ""
+"respaldó tu <a href=\"%(related_path)s\">reseña de <em>%(book_title)s</em></"
+"a>"
 
 #: bookwyrm/templates/notifications.html:96
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
-msgstr "respaldó tu <a href=\"%(related_path)s\">comentario en<em>%(book_title)s</em></a>"
+msgid ""
+"boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></"
+"a>"
+msgstr ""
+"respaldó tu <a href=\"%(related_path)s\">comentario en<em>%(book_title)s</"
+"em></a>"
 
 #: bookwyrm/templates/notifications.html:98
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr "respaldó tu<a href=\"%(related_path)s\">cita de <em>%(book_title)s</em></a>"
+msgid ""
+"boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+"respaldó tu<a href=\"%(related_path)s\">cita de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:100
 #, python-format
@@ -1568,13 +1705,21 @@ msgstr "respaldó tu <a href=\"%(related_path)s\">status</a>"
 
 #: bookwyrm/templates/notifications.html:104
 #, python-format
-msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
-msgstr " agregó <em><a href=\"%(book_path)s\">%(book_title)s</a></em> a tu lista \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgid ""
+" added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
+"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgstr ""
+" agregó <em><a href=\"%(book_path)s\">%(book_title)s</a></em> a tu lista "
+"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 
 #: bookwyrm/templates/notifications.html:106
 #, python-format
-msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
-msgstr " sugirió agregar <em><a href=\"%(book_path)s\">%(book_title)s</a></em> a tu lista \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgid ""
+" suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to "
+"your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgstr ""
+" sugirió agregar <em><a href=\"%(book_path)s\">%(book_title)s</a></em> a tu "
+"lista \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 
 #: bookwyrm/templates/notifications.html:110
 #, python-format
@@ -1597,7 +1742,9 @@ msgstr "Confirmar contraseña:"
 
 #: bookwyrm/templates/password_reset_request.html:14
 msgid "A link to reset your password will be sent to your email address"
-msgstr "Un enlace para restablecer tu contraseña se enviará a tu dirección de correo electrónico"
+msgstr ""
+"Un enlace para restablecer tu contraseña se enviará a tu dirección de correo "
+"electrónico"
 
 #: bookwyrm/templates/password_reset_request.html:28
 msgid "Reset password"
@@ -1635,8 +1782,12 @@ msgstr "Mostrar meta de lectura en el feed:"
 
 #: bookwyrm/templates/preferences/edit_user.html:62
 #, python-format
-msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
-msgstr "Tu cuenta se aparecerá en el <a href=\"%(path)s\">directorio</a>, y puede ser recomendado a otros usuarios de BookWyrm."
+msgid ""
+"Your account will show up in the <a href=\"%(path)s\">directory</a>, and may "
+"be recommended to other BookWyrm users."
+msgstr ""
+"Tu cuenta se aparecerá en el <a href=\"%(path)s\">directorio</a>, y puede "
+"ser recomendado a otros usuarios de BookWyrm."
 
 #: bookwyrm/templates/preferences/edit_user.html:65
 msgid "Preferred Timezone: "
@@ -2054,14 +2205,16 @@ msgstr "<a href=\"%(path)s\">%(title)s</a> por "
 
 #: bookwyrm/templates/snippets/boost_button.html:8
 #: bookwyrm/templates/snippets/boost_button.html:9
-#: bookwyrm/templates/snippets/status/layout.html:47
-#: bookwyrm/templates/snippets/status/layout.html:48
-msgid "Boost status"
-msgstr "Status de respaldo"
+#, fuzzy
+#| msgid "boosted"
+msgid "Boost"
+msgstr "respaldó"
 
+#: bookwyrm/templates/snippets/boost_button.html:15
 #: bookwyrm/templates/snippets/boost_button.html:16
-#: bookwyrm/templates/snippets/boost_button.html:17
-msgid "Un-boost status"
+#, fuzzy
+#| msgid "Un-boost status"
+msgid "Un-boost"
 msgstr "Status de des-respaldo"
 
 #: bookwyrm/templates/snippets/content_warning_field.html:3
@@ -2094,8 +2247,8 @@ msgstr "Reseña:"
 
 #: bookwyrm/templates/snippets/create_status_form.html:42
 #: bookwyrm/templates/snippets/status/layout.html:30
-#: bookwyrm/templates/snippets/status/layout.html:43
-#: bookwyrm/templates/snippets/status/layout.html:44
+#: bookwyrm/templates/snippets/status/layout.html:48
+#: bookwyrm/templates/snippets/status/layout.html:49
 msgid "Reply"
 msgstr "Respuesta"
 
@@ -2143,24 +2296,29 @@ msgstr "¿Eliminar estas fechas de lectura?"
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
 #, python-format
-msgid "You are deleting this readthrough and its %(count)s associated progress updates."
-msgstr "Estás eliminando esta lectura y sus %(count)s actualizaciones de progreso asociados."
+msgid ""
+"You are deleting this readthrough and its %(count)s associated progress "
+"updates."
+msgstr ""
+"Estás eliminando esta lectura y sus %(count)s actualizaciones de progreso "
+"asociados."
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
 #: bookwyrm/templates/snippets/follow_request_buttons.html:13
+#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:391
 msgid "Delete"
 msgstr "Eliminar"
 
 #: bookwyrm/templates/snippets/fav_button.html:7
-#: bookwyrm/templates/snippets/fav_button.html:8
-#: bookwyrm/templates/snippets/status/layout.html:51
-#: bookwyrm/templates/snippets/status/layout.html:52
-msgid "Like status"
-msgstr "Me gusta status"
+#: bookwyrm/templates/snippets/fav_button.html:9
+msgid "Like"
+msgstr ""
 
 #: bookwyrm/templates/snippets/fav_button.html:15
 #: bookwyrm/templates/snippets/fav_button.html:16
-msgid "Un-like status"
+#, fuzzy
+#| msgid "Un-like status"
+msgid "Un-like"
 msgstr "Quitar me gusta de status"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:7
@@ -2200,14 +2358,6 @@ msgstr "Aceptar"
 msgid "No rating"
 msgstr "No calificación"
 
-#: bookwyrm/templates/snippets/form_rate_stars.html:45
-#: bookwyrm/templates/snippets/stars.html:7
-#, python-format
-msgid "%(rating)s star"
-msgid_plural "%(rating)s stars"
-msgstr[0] "%(rating)s estrella"
-msgstr[1] "%(rating)s estrellas"
-
 #: bookwyrm/templates/snippets/generated_status/goal.html:1
 #, python-format
 msgid "set a goal to read %(counter)s book in %(year)s"
@@ -2217,17 +2367,27 @@ msgstr[1] "estableció una meta de leer %(counter)s libros en %(year)s"
 
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
 #, python-format
-msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
-msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
-msgstr[0] "Reseño <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s estrella"
-msgstr[1] "Reseño <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s estrellas"
+msgid ""
+"Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
+msgid_plural ""
+"Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
+msgstr[0] ""
+"Reseño <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s "
+"estrella"
+msgstr[1] ""
+"Reseño <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s "
+"estrellas"
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4
 #, python-format
-msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
-msgid_plural "Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
-msgstr[0] "Reseña de \"%(book_title)s\" (%(display_rating)s estrella): %(review_title)s"
-msgstr[1] "Reseña de \"%(book_title)s\" (%(display_rating)s estrellas): %(review_title)s"
+msgid ""
+"Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
+msgid_plural ""
+"Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
+msgstr[0] ""
+"Reseña de \"%(book_title)s\" (%(display_rating)s estrella): %(review_title)s"
+msgstr[1] ""
+"Reseña de \"%(book_title)s\" (%(display_rating)s estrellas): %(review_title)s"
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:8
 #, python-format
@@ -2236,8 +2396,12 @@ msgstr "Reseña de \"%(book_title)s\": %(review_title)s"
 
 #: bookwyrm/templates/snippets/goal_card.html:23
 #, python-format
-msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
-msgstr "Puedes establecer o cambiar tu meta de lectura en cualquier momento que desees desde tu <a href=\"%(path)s\">perfil</a>"
+msgid ""
+"You can set or change your reading goal any time from your <a href=\"%(path)s"
+"\">profile page</a>"
+msgstr ""
+"Puedes establecer o cambiar tu meta de lectura en cualquier momento que "
+"desees desde tu <a href=\"%(path)s\">perfil</a>"
 
 #: bookwyrm/templates/snippets/goal_form.html:9
 msgid "Reading goal:"
@@ -2269,13 +2433,19 @@ msgstr "%(percent)s%% terminado!"
 
 #: bookwyrm/templates/snippets/goal_progress.html:10
 #, python-format
-msgid "You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
-msgstr "Has leído <a href=\"%(path)s\">%(read_count)s de %(goal_count)s libros</a>."
+msgid ""
+"You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgstr ""
+"Has leído <a href=\"%(path)s\">%(read_count)s de %(goal_count)s libros</a>."
 
 #: bookwyrm/templates/snippets/goal_progress.html:12
 #, python-format
-msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
-msgstr "%(username)s ha leído <a href=\"%(path)s\">%(read_count)s de %(goal_count)s libros</a>."
+msgid ""
+"%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s "
+"books</a>."
+msgstr ""
+"%(username)s ha leído <a href=\"%(path)s\">%(read_count)s de %(goal_count)s "
+"libros</a>."
 
 #: bookwyrm/templates/snippets/page_text.html:4
 #, python-format
@@ -2283,6 +2453,8 @@ msgid "page %(page)s of %(total_pages)s"
 msgstr "página %(page)s de %(total_pages)s"
 
 #: bookwyrm/templates/snippets/page_text.html:6
+#, fuzzy, python-format
+#| msgid "page %(page)s"
 msgid "page %(page)s"
 msgstr "página %(pages)s"
 
@@ -2380,22 +2552,22 @@ msgid "Report"
 msgstr "Reportar"
 
 #: bookwyrm/templates/snippets/rss_title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:21
+#: bookwyrm/templates/snippets/status/status_header.html:34
 msgid "rated"
 msgstr "calificó"
 
 #: bookwyrm/templates/snippets/rss_title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:23
+#: bookwyrm/templates/snippets/status/status_header.html:36
 msgid "reviewed"
 msgstr "reseñó"
 
 #: bookwyrm/templates/snippets/rss_title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:25
+#: bookwyrm/templates/snippets/status/status_header.html:38
 msgid "commented on"
 msgstr "comentó en"
 
 #: bookwyrm/templates/snippets/rss_title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:27
+#: bookwyrm/templates/snippets/status/status_header.html:40
 msgid "quoted"
 msgstr "citó"
 
@@ -2454,62 +2626,58 @@ msgstr "Empezar \"<em>%(book_title)s</em>\""
 msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgstr "Quiero leer \"<em>%(book_title)s</em>\""
 
-#: bookwyrm/templates/snippets/status/content_status.html:60
-#: bookwyrm/templates/snippets/status/status_content.html:50
+#: bookwyrm/templates/snippets/status/content_status.html:67
 #: bookwyrm/templates/snippets/trimmed_text.html:14
 msgid "Show more"
 msgstr "Mostrar más"
 
-#: bookwyrm/templates/snippets/status/content_status.html:75
-#: bookwyrm/templates/snippets/status/status_content.html:65
+#: bookwyrm/templates/snippets/status/content_status.html:82
 #: bookwyrm/templates/snippets/trimmed_text.html:29
 msgid "Show less"
 msgstr "Mostrar menos"
 
-#: bookwyrm/templates/snippets/status/content_status.html:105
-#: bookwyrm/templates/snippets/status/status_content.html:95
+#: bookwyrm/templates/snippets/status/content_status.html:112
 msgid "Open image in new window"
 msgstr "Abrir imagen en una nueva ventana"
 
 #: bookwyrm/templates/snippets/status/layout.html:22
-#: bookwyrm/templates/snippets/status/status_options.html:18
+#: bookwyrm/templates/snippets/status/status_options.html:17
 msgid "Delete status"
 msgstr "Eliminar status"
 
+#: bookwyrm/templates/snippets/status/layout.html:52
+#: bookwyrm/templates/snippets/status/layout.html:53
+msgid "Boost status"
+msgstr "Status de respaldo"
+
+#: bookwyrm/templates/snippets/status/layout.html:56
+#: bookwyrm/templates/snippets/status/layout.html:57
+msgid "Like status"
+msgstr "Me gusta status"
+
 #: bookwyrm/templates/snippets/status/status.html:9
 msgid "boosted"
 msgstr "respaldó"
 
-#: bookwyrm/templates/snippets/status/status_header.html:32
+#: bookwyrm/templates/snippets/status/status_header.html:44
 #, python-format
-msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">review</a>"
-msgstr "respondió a la <a href=\"%(status_path)s\">reseña</a> de <a href=\"%(user_path)s\">%(username)s</a> "
-
-#: bookwyrm/templates/snippets/status/status_header.html:34
-#, python-format
-msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">comment</a>"
-msgstr "respondió al <a href=\"%(status_path)s\">comentario</a> de <a href=\"%(user_path)s\">%(username)s</a> "
-
-#: bookwyrm/templates/snippets/status/status_header.html:36
-#, python-format
-msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">quote</a>"
-msgstr "respondió a la <a href=\"%(status_path)s\">cita</a> de <a href=\"%(user_path)s\">%(username)s</a> "
-
-#: bookwyrm/templates/snippets/status/status_header.html:38
-#, python-format
-msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
-msgstr "respondió al <a href=\"%(status_path)s\">status</a> de <a href=\"%(user_path)s\">%(username)s</a> "
+msgid ""
+"replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
+"\"%(status_path)s\">status</a>"
+msgstr ""
+"respondió al <a href=\"%(status_path)s\">status</a> de <a href="
+"\"%(user_path)s\">%(username)s</a> "
 
 #: bookwyrm/templates/snippets/status/status_options.html:7
 #: bookwyrm/templates/snippets/user_options.html:7
 msgid "More options"
 msgstr "Más opciones"
 
-#: bookwyrm/templates/snippets/status/status_options.html:27
+#: bookwyrm/templates/snippets/status/status_options.html:26
 msgid "Delete & re-draft"
 msgstr "Eliminar y recomponer"
 
-#: bookwyrm/templates/snippets/status/status_options.html:36
+#: bookwyrm/templates/snippets/status/status_options.html:35
 #: bookwyrm/templates/snippets/user_options.html:13
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:6
 msgid "Send direct message"
@@ -2586,23 +2754,23 @@ msgstr "Crear estante"
 msgid "Edit shelf"
 msgstr "Editar estante"
 
-#: bookwyrm/templates/user/shelf.html:78
+#: bookwyrm/templates/user/shelf.html:77 bookwyrm/templates/user/shelf.html:99
 msgid "Shelved"
 msgstr "Archivado"
 
-#: bookwyrm/templates/user/shelf.html:79
+#: bookwyrm/templates/user/shelf.html:78 bookwyrm/templates/user/shelf.html:103
 msgid "Started"
 msgstr "Empezado"
 
-#: bookwyrm/templates/user/shelf.html:80
+#: bookwyrm/templates/user/shelf.html:79 bookwyrm/templates/user/shelf.html:106
 msgid "Finished"
 msgstr "Terminado"
 
-#: bookwyrm/templates/user/shelf.html:129
+#: bookwyrm/templates/user/shelf.html:132
 msgid "This shelf is empty."
 msgstr "Este estante está vacio."
 
-#: bookwyrm/templates/user/shelf.html:135
+#: bookwyrm/templates/user/shelf.html:138
 msgid "Delete shelf"
 msgstr "Eliminar estante"
 
@@ -2734,13 +2902,1433 @@ msgstr "Nivel de acceso:"
 
 #: bookwyrm/views/password.py:32
 msgid "No user with that email address was found."
-msgstr "No se pudo encontrar un usuario con esa dirección de correo electrónico."
+msgstr ""
+"No se pudo encontrar un usuario con esa dirección de correo electrónico."
 
 #: bookwyrm/views/password.py:41
 #, python-format
 msgid "A password reset link sent to %s"
 msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 
+#: venv3/lib/python3.8/site-packages/_pytest/config/argparsing.py:442
+#, python-format
+msgid "ambiguous option: %(option)s could match %(matches)s"
+msgstr "opción ambiguo: %(option)s pudiera coincidir con %(matches)s"
+
+#: venv3/lib/python3.8/site-packages/django/contrib/messages/apps.py:7
+msgid "Messages"
+msgstr "Mensajes"
+
+#: venv3/lib/python3.8/site-packages/django/contrib/sitemaps/apps.py:7
+msgid "Site Maps"
+msgstr "Mapas de sitio"
+
+#: venv3/lib/python3.8/site-packages/django/contrib/staticfiles/apps.py:9
+msgid "Static Files"
+msgstr "Archivos estáticos"
+
+#: venv3/lib/python3.8/site-packages/django/contrib/syndication/apps.py:7
+msgid "Syndication"
+msgstr "Sindicación"
+
+#: venv3/lib/python3.8/site-packages/django/core/paginator.py:45
+msgid "That page number is not an integer"
+msgstr "Ese numero de pagina no es un entero"
+
+#: venv3/lib/python3.8/site-packages/django/core/paginator.py:47
+msgid "That page number is less than 1"
+msgstr "Ese numero de pagina es menos que uno"
+
+#: venv3/lib/python3.8/site-packages/django/core/paginator.py:52
+msgid "That page contains no results"
+msgstr "Esa pagina no contiene resultados"
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:32
+msgid "Enter a valid value."
+msgstr "Ingrese un valor válido."
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:103
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:659
+msgid "Enter a valid URL."
+msgstr "Ingrese una URL válida."
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:155
+msgid "Enter a valid integer."
+msgstr "Ingrese un entero válido."
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:166
+msgid "Enter a valid email address."
+msgstr "Ingrese una dirección de correo electrónico válida."
+
+#. Translators: "letters" means latin letters: a-z and A-Z.
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:240
+msgid ""
+"Enter a valid “slug� consisting of letters, numbers, underscores or hyphens."
+msgstr ""
+"Ingrese un “slug� válido que consiste de letras, numeros, guiones bajos, o "
+"guiones"
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:247
+msgid ""
+"Enter a valid “slug� consisting of Unicode letters, numbers, underscores, or "
+"hyphens."
+msgstr ""
+"Ingrese un “slug� válido que consiste de letras Unicode, numeros, guiones "
+"bajos, o guiones"
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:256
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:276
+msgid "Enter a valid IPv4 address."
+msgstr "Ingrese una dirección IPv4 válida."
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:261
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:277
+msgid "Enter a valid IPv6 address."
+msgstr "Ingrese una dirección IPv6 válida."
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:271
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:275
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Ingrese una dirección IPv4 o IPv6 válida."
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:305
+msgid "Enter only digits separated by commas."
+msgstr "Ingrese solo digitos separados por comas."
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:311
+#, python-format
+msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
+msgstr "Asegura que este valor es %(limit_value)s (es %(show_value)s)."
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:343
+#, python-format
+msgid "Ensure this value is less than or equal to %(limit_value)s."
+msgstr "Asegura que este valor es menor que o iguala a %(limit_value)s."
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:352
+#, python-format
+msgid "Ensure this value is greater than or equal to %(limit_value)s."
+msgstr "Asegura que este valor es más que o que iguala a %(limit_value)s."
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:362
+#, python-format
+msgid ""
+"Ensure this value has at least %(limit_value)d character (it has "
+"%(show_value)d)."
+msgid_plural ""
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr[0] ""
+"Verifica que este valor tiene por lo menos %(limit_value)d carácter. (Tiene "
+"%(show_value)d).)"
+msgstr[1] ""
+"Verifica que este valor tiene por lo menos %(limit_value)d caracteres. "
+"(Tiene %(show_value)d).)"
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:377
+#, python-format
+msgid ""
+"Ensure this value has at most %(limit_value)d character (it has "
+"%(show_value)d)."
+msgid_plural ""
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr[0] ""
+"Verifica que este valor tiene a lo sumo %(limit_value)d carácter. (Tiene "
+"%(show_value)d).)"
+msgstr[1] ""
+"Verifica que este valor tiene a lo sumo %(limit_value)d caracteres. (Tiene "
+"%(show_value)d).)"
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:396
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:291
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:326
+msgid "Enter a number."
+msgstr "Ingrese un número."
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:398
+#, python-format
+msgid "Ensure that there are no more than %(max)s digit in total."
+msgid_plural "Ensure that there are no more than %(max)s digits in total."
+msgstr[0] "Verifica que no hay más que %(max)s digito en total."
+msgstr[1] "Verifica que no hay más que %(max)s digitos en total."
+
+#                         is 
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:403
+#, python-format
+msgid "Ensure that there are no more than %(max)s decimal place."
+msgid_plural "Ensure that there are no more than %(max)s decimal places."
+msgstr[0] "Verifica que no hay más que %(max)s cifra decimal."
+msgstr[1] "Verifica que no hay más que %(max)s cifras decimales."
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:408
+#, python-format
+msgid ""
+"Ensure that there are no more than %(max)s digit before the decimal point."
+msgid_plural ""
+"Ensure that there are no more than %(max)s digits before the decimal point."
+msgstr[0] ""
+"Verifica que no hay más que %(max)s digito antes de la coma decimal."
+msgstr[1] ""
+"Verifica que no hay más que %(max)s digitos antes de la coma decimal."
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:470
+#, python-format
+msgid ""
+"File extension “%(extension)s� is not allowed. Allowed extensions are: "
+"%(allowed_extensions)s."
+msgstr ""
+"No se permite la extensión de archivo “%(extension)s�. Extensiones "
+"permitidas son: %(allowed_extensions)s."
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:522
+msgid "Null characters are not allowed."
+msgstr "No se permiten caracteres nulos"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/base.py:1181
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:759
+msgid "and"
+msgstr "y"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/base.py:1183
+#, python-format
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr "Ya existe %(model_name)s con este %(field_labels)s."
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:104
+#, python-format
+msgid "Value %(value)r is not a valid choice."
+msgstr "El valor %(value)s no es una opción válida."
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:105
+msgid "This field cannot be null."
+msgstr "Este campo no puede ser nulo."
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:106
+msgid "This field cannot be blank."
+msgstr "Este campo no puede ser vacio."
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:107
+#, fuzzy, python-format
+#| msgid "%(model_name)s with this %(field_label)s already exists."
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "Ya existe %(model_name)s con este %(field_labels)s."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+"%(field_label)s deben ser unicos por %(date_field_label)s %(lookup_type)s."
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:130
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Campo de tipo: %(field_type)s"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:937
+#, python-format
+msgid "“%(value)s� value must be either True or False."
+msgstr "“%(value)s� valor debe ser o verdadero o falso."
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:938
+#, python-format
+msgid "“%(value)s� value must be either True, False, or None."
+msgstr "%(value)s� valor debe ser o True, False, o None."
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:940
+msgid "Boolean (Either True or False)"
+msgstr "Booleano (O True O False)"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:981
+#, python-format
+msgid "String (up to %(max_length)s)"
+msgstr "Cadena (máximo de %(max_length)s caracteres)"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1045
+msgid "Comma-separated integers"
+msgstr "Enteros separados por comas"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1094
+#, python-format
+msgid ""
+"“%(value)s� value has an invalid date format. It must be in YYYY-MM-DD "
+"format."
+msgstr ""
+"“%(value)s� valor tiene un formato de fecha inválido. Hay que estar de "
+"formato YYYY-MM-DD."
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1096
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1239
+#, python-format
+msgid ""
+"“%(value)s� value has the correct format (YYYY-MM-DD) but it is an invalid "
+"date."
+msgstr ""
+"“%(value)s� valor tiene el formato correcto (YYYY-MM-DD) pero la fecha es "
+"invalida."
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1099
+msgid "Date (without time)"
+msgstr "Fecha (sin la hora)"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1237
+#, python-format
+msgid ""
+"“%(value)s� value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"“%(value)s� valor tiene un formato invalido. Debe estar en formato YYYY-MM-"
+"DD HH:MM[:ss[.uuuuuu]][TZ]."
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1241
+#, python-format
+msgid ""
+"“%(value)s� value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"[TZ]) but it is an invalid date/time."
+msgstr ""
+"“%(value)s� valor tiene el formato correcto (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"[TZ]) pero es una fecha/hora invalida."
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1245
+msgid "Date (with time)"
+msgstr "Fecha (con la hora)"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1393
+#, python-format
+msgid "“%(value)s� value must be a decimal number."
+msgstr "El valor de “%(value)s� debe ser un número decimal."
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1395
+msgid "Decimal number"
+msgstr "Número decimal"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1534
+#, python-format
+msgid ""
+"“%(value)s� value has an invalid format. It must be in [DD] [[HH:]MM:]ss[."
+"uuuuuu] format."
+msgstr ""
+"“%(value)s� valor tiene un formato invalido. Debe estar en formato [DD] "
+"[[HH:]MM:]ss[.uuuuuu]."
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1537
+msgid "Duration"
+msgstr "Duración"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1587
+msgid "Email address"
+msgstr "Dirección de correo electrónico"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1610
+msgid "File path"
+msgstr "Ruta de archivo"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1676
+#, python-format
+msgid "“%(value)s� value must be a float."
+msgstr "%(value)s no es un usuario válido"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1678
+msgid "Floating point number"
+msgstr "Número de coma flotante"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1716
+#, python-format
+msgid "“%(value)s� value must be an integer."
+msgstr "“%(value)s� valor debe ser un entero."
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1718
+msgid "Integer"
+msgstr "Entero"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1801
+msgid "Big (8 byte) integer"
+msgstr "Entero grande (8 byte)"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1817
+msgid "IPv4 address"
+msgstr "Dirección IPv4"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1848
+msgid "IP address"
+msgstr "Dirección IP"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1928
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1929
+#, python-format
+msgid "“%(value)s� value must be either None, True or False."
+msgstr "Valor “%(value)s� debe ser o None, True, o False."
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1931
+msgid "Boolean (Either True, False or None)"
+msgstr "Booleano (O True, Falso, o None)"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1966
+msgid "Positive integer"
+msgstr "Entero positivo"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1979
+msgid "Positive small integer"
+msgstr "Entero positivo pequeño "
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1993
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Slug (máximo de %(max_length)s)"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2025
+msgid "Small integer"
+msgstr "Entero pequeño"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2032
+msgid "Text"
+msgstr "Texto"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2060
+#, python-format
+msgid ""
+"“%(value)s� value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"format."
+msgstr ""
+"“%(value)s� valor tiene un formato invalido. Debe estar en formato HH:MM[:"
+"ss[.uuuuuu]]."
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2062
+#, python-format
+msgid ""
+"“%(value)s� value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"invalid time."
+msgstr ""
+"“%(value)s� valor tiene el formato correcto (HH:MM[:ss[.uuuuuu]]) pero es "
+"una hora invalida."
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2065
+msgid "Time"
+msgstr "Tiempo"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2191
+msgid "URL"
+msgstr "URL"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2213
+msgid "Raw binary data"
+msgstr "Datos binarios sin procesar"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2278
+#, python-format
+msgid "“%(value)s� is not a valid UUID."
+msgstr "%(value)s no es una UUID válida."
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2280
+msgid "Universally unique identifier"
+msgstr "Identificador universalmente único"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/files.py:221
+msgid "File"
+msgstr "Archivo"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/files.py:360
+msgid "Image"
+msgstr "Imágen"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:778
+#, python-format
+msgid "%(model)s instance with %(field)s %(value)r does not exist."
+msgstr "%(model)s instancia con %(field)s %(value)r no existe."
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:780
+msgid "Foreign Key (type determined by related field)"
+msgstr "Clave externa (tipo determinado por campo relacionado)"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1012
+msgid "One-to-one relationship"
+msgstr "Relación uno-a-uno"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1066
+#, python-format
+msgid "%(from)s-%(to)s relationship"
+msgstr "relación %(from)s-%(to)s"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1067
+#, python-format
+msgid "%(from)s-%(to)s relationships"
+msgstr "relaciones %(from)s-%(to)s"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1109
+msgid "Many-to-many relationship"
+msgstr "Relaciones mucho-a-mucho"
+
+#. Translators: If found as last label character, these punctuation
+#. characters will prevent the default label_suffix to be appended to the label
+#: venv3/lib/python3.8/site-packages/django/forms/boundfield.py:149
+msgid ":?.!"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:53
+msgid "This field is required."
+msgstr "Este campo es requerido."
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:246
+msgid "Enter a whole number."
+msgstr "Ingrese un número entero."
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:397
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:1127
+msgid "Enter a valid date."
+msgstr "Ingrese una fecha válida."
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:421
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:1128
+msgid "Enter a valid time."
+msgstr "Ingrese una hora válida."
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:443
+msgid "Enter a valid date/time."
+msgstr "Ingrese una fecha/hora válida."
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:472
+msgid "Enter a valid duration."
+msgstr "Ingrese una duración válida."
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:473
+#, python-brace-format
+msgid "The number of days must be between {min_days} and {max_days}."
+msgstr "El número de dias debe ser entre {min_days} y {max_days}."
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:533
+msgid "No file was submitted. Check the encoding type on the form."
+msgstr ""
+"No se aceptó ningun archivo. Verfica el tipo de codificación en el "
+"formulario."
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:534
+msgid "No file was submitted."
+msgstr "No se aceptó ningun archivo."
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:535
+msgid "The submitted file is empty."
+msgstr "El archivo enviado está vacio."
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:537
+#, python-format
+msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
+msgid_plural ""
+"Ensure this filename has at most %(max)d characters (it has %(length)d)."
+msgstr[0] ""
+"Verifica que este nombre de archivo no tiene más que %(max)d carácter. "
+"(Tiene %(length)d)."
+msgstr[1] ""
+"Verifica que este nombre de archivo no tiene más que %(max)d caracteres. "
+"(Tiene %(length)d)."
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:540
+msgid "Please either submit a file or check the clear checkbox, not both."
+msgstr "Por favor, o envia un archivo o marca la casilla vacia, no los dos."
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:601
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+"Subir una imagen válida. El archivo que subiste o no fue imagen o fue "
+"corrupto."
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:763
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:853
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:1275
+#, python-format
+msgid "Select a valid choice. %(value)s is not one of the available choices."
+msgstr ""
+"Selecciona una opción válida. %(value)s no es una de las opciones "
+"disponibles."
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:854
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:969
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:1274
+msgid "Enter a list of values."
+msgstr "Ingrese una lista de valores."
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:970
+msgid "Enter a complete value."
+msgstr "Ingresa un valor completo."
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:1186
+msgid "Enter a valid UUID."
+msgstr "Ingrese una UUID válida."
+
+#. Translators: This is the default suffix added to form field labels
+#: venv3/lib/python3.8/site-packages/django/forms/forms.py:81
+msgid ":"
+msgstr ":"
+
+#: venv3/lib/python3.8/site-packages/django/forms/forms.py:207
+#, python-format
+msgid "(Hidden field %(name)s) %(error)s"
+msgstr "(Campo oculto %(name)s) %(error)s"
+
+#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:93
+msgid "ManagementForm data is missing or has been tampered with"
+msgstr "Datos de ManagementForm está ausento o ha sido corrompido"
+
+#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:345
+#, python-format
+msgid "Please submit %d or fewer forms."
+msgid_plural "Please submit %d or fewer forms."
+msgstr[0] "Por favor, enviar %d o menos formularios."
+msgstr[1] "Por favor, enviar %d o menos formularios."
+
+#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:352
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] "Por favor, enviar %d o más formularios."
+msgstr[1] "Por favor, enviar %d o más formularios."
+
+# TODO cc @mouse is this a verb or noun
+#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:379
+#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:386
+#, fuzzy
+msgid "Order"
+msgstr "Pedir"
+
+# if verb 
+# msgstr "Pedido" # if noun
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:754
+#, python-format
+msgid "Please correct the duplicate data for %(field)s."
+msgstr "Por favor corrige los datos duplicados en %(field)s."
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:758
+#, python-format
+msgid "Please correct the duplicate data for %(field)s, which must be unique."
+msgstr ""
+"Por favor corrige los datos duplicados en %(field)s, los cuales deben ser "
+"unicos."
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:764
+#, python-format
+msgid ""
+"Please correct the duplicate data for %(field_name)s which must be unique "
+"for the %(lookup)s in %(date_field)s."
+msgstr ""
+"Por favor corrige los datos duplicados en %(field_name)s los cuales deben "
+"ser unicos por el %(lookup)s en %(date_field)s."
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:773
+msgid "Please correct the duplicate values below."
+msgstr "Por favor corrige los valores duplicados a continuación."
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:1094
+msgid "The inline value did not match the parent instance."
+msgstr "El valor en línea no empareja la instancia progenitor."
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:1161
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr ""
+"Selecciona una opción válida. Esa opción no es una de las opciones "
+"disponibles."
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:1277
+#, python-format
+msgid "“%(pk)s� is not a valid value."
+msgstr "“%(pk)s� no es un valor válido."
+
+#: venv3/lib/python3.8/site-packages/django/forms/utils.py:162
+#, python-format
+msgid ""
+"%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"%(datetime)s no se pudo interpretar en la zona horaria %(current_timezone)s; "
+"puede ser ambiguo o puede que no exista."
+
+#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:395
+msgid "Clear"
+msgstr "Borrar"
+
+#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:396
+msgid "Currently"
+msgstr "Actualmente"
+
+#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:397
+msgid "Change"
+msgstr "Cambiar"
+
+#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:709
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:710
+msgid "Yes"
+msgstr "Sí"
+
+#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:711
+msgid "No"
+msgstr "No"
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:788
+msgid "yes,no,maybe"
+msgstr "sí,no,quizás"
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:817
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:834
+#, python-format
+msgid "%(size)d byte"
+msgid_plural "%(size)d bytes"
+msgstr[0] "%(size)d byte"
+msgstr[1] "%(size)d bytes"
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:836
+#, python-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:838
+#, python-format
+msgid "%s MB"
+msgstr "%s MB"
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:840
+#, python-format
+msgid "%s GB"
+msgstr "%s GB"
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:842
+#, python-format
+msgid "%s TB"
+msgstr "%s TB"
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:844
+#, python-format
+msgid "%s PB"
+msgstr "%s PB"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:62
+msgid "p.m."
+msgstr "p.m."
+
+#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:63
+msgid "a.m."
+msgstr "a.m."
+
+#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:68
+msgid "PM"
+msgstr "PM"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:69
+msgid "AM"
+msgstr "AM"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:150
+msgid "midnight"
+msgstr "medianoche"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:152
+msgid "noon"
+msgstr "mediodia"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:295
+msgid "Monday"
+msgstr "Lunes"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:296
+msgid "Tuesday"
+msgstr "Martes"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:297
+msgid "Wednesday"
+msgstr "Miercoles"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:298
+msgid "Thursday"
+msgstr "Jueves"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:299
+msgid "Friday"
+msgstr "Viernes"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:7
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:300
+msgid "Saturday"
+msgstr "Sábado"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:7
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:301
+msgid "Sunday"
+msgstr "Domino"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
+msgid "Mon"
+msgstr "Lun"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
+msgid "Tue"
+msgstr "Mar"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
+msgid "Wed"
+msgstr "Mie"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
+msgid "Thu"
+msgstr "Jue"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
+msgid "Fri"
+msgstr "Vie"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:11
+msgid "Sat"
+msgstr "Sáb"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:11
+msgid "Sun"
+msgstr "Dom"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:281
+msgid "January"
+msgstr "Enero"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:282
+msgid "February"
+msgstr "Febrero"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:283
+msgid "March"
+msgstr "Marzo"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:284
+msgid "April"
+msgstr "Abril"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:285
+msgid "May"
+msgstr "Mayo"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:286
+msgid "June"
+msgstr "Junio"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:287
+msgid "July"
+msgstr "Julio"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:288
+msgid "August"
+msgstr "Agosto"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:289
+msgid "September"
+msgstr "Septiembre"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:290
+msgid "October"
+msgstr "Octubre"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:291
+msgid "November"
+msgstr "Noviembre"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:16
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:292
+msgid "December"
+msgstr "Diciembre"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "jan"
+msgstr "ene"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "feb"
+msgstr "feb"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "mar"
+msgstr "mar"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "apr"
+msgstr "abr"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "may"
+msgstr "may"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "jun"
+msgstr "jun"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "jul"
+msgstr "jul"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "aug"
+msgstr "ago"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "sep"
+msgstr "sep"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "oct"
+msgstr "oct"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "nov"
+msgstr "nov"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "dec"
+msgstr "dic"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:23
+msgctxt "abbrev. month"
+msgid "Jan."
+msgstr "en."
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:24
+msgctxt "abbrev. month"
+msgid "Feb."
+msgstr "feb."
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:25
+msgctxt "abbrev. month"
+msgid "March"
+msgstr "mzo."
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:26
+msgctxt "abbrev. month"
+msgid "April"
+msgstr "abr."
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:27
+msgctxt "abbrev. month"
+msgid "May"
+msgstr "my."
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:28
+msgctxt "abbrev. month"
+msgid "June"
+msgstr "jun."
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:29
+msgctxt "abbrev. month"
+msgid "July"
+msgstr "jul."
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:30
+msgctxt "abbrev. month"
+msgid "Aug."
+msgstr "agto."
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:31
+msgctxt "abbrev. month"
+msgid "Sept."
+msgstr "set."
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:32
+msgctxt "abbrev. month"
+msgid "Oct."
+msgstr "oct."
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:33
+msgctxt "abbrev. month"
+msgid "Nov."
+msgstr "nov."
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:34
+msgctxt "abbrev. month"
+msgid "Dec."
+msgstr "dic."
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:37
+msgctxt "alt. month"
+msgid "January"
+msgstr "Enero"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:38
+msgctxt "alt. month"
+msgid "February"
+msgstr "Febrero"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:39
+msgctxt "alt. month"
+msgid "March"
+msgstr "Marzo"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:40
+msgctxt "alt. month"
+msgid "April"
+msgstr "Abril"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:41
+msgctxt "alt. month"
+msgid "May"
+msgstr "Mayo"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:42
+msgctxt "alt. month"
+msgid "June"
+msgstr "Junio"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:43
+msgctxt "alt. month"
+msgid "July"
+msgstr "Julio"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:44
+msgctxt "alt. month"
+msgid "August"
+msgstr "Agosto"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:45
+msgctxt "alt. month"
+msgid "September"
+msgstr "Septiembre"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:46
+msgctxt "alt. month"
+msgid "October"
+msgstr "Octubre"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:47
+msgctxt "alt. month"
+msgid "November"
+msgstr "Noviembre"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:48
+msgctxt "alt. month"
+msgid "December"
+msgstr "Diciembre"
+
+#: venv3/lib/python3.8/site-packages/django/utils/ipv6.py:8
+msgid "This is not a valid IPv6 address."
+msgstr "Esta no es una dirección IPv6 válida."
+
+#: venv3/lib/python3.8/site-packages/django/utils/text.py:69
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s…"
+msgstr "%(truncated_text)s…"
+
+#: venv3/lib/python3.8/site-packages/django/utils/text.py:235
+msgid "or"
+msgstr "o"
+
+#. Translators: This string is used as a separator between list elements
+#: venv3/lib/python3.8/site-packages/django/utils/text.py:254
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:83
+msgid ", "
+msgstr ", "
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:9
+#, python-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] "%d año"
+msgstr[1] "%d años"
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:10
+#, python-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d mes"
+msgstr[1] "%d meses"
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:11
+#, python-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d semana"
+msgstr[1] "%d semanas"
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:12
+#, python-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d día"
+msgstr[1] "%d días"
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:13
+#, python-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hora"
+msgstr[1] "%d horas"
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:14
+#, python-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuto"
+msgstr[1] "%d minutos"
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:72
+#, fuzzy
+#| msgid "%d minute"
+#| msgid_plural "%d minutes"
+msgid "0 minutes"
+msgstr "%d minuto"
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:110
+msgid "Forbidden"
+msgstr "Prohibido"
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:111
+msgid "CSRF verification failed. Request aborted."
+msgstr "Se falló la verificación CSRF. Se abortó la solicitud."
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:115
+msgid ""
+"You are seeing this message because this HTTPS site requires a “Referer "
+"header� to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+"Estás viendo este mensaje porque este sitio HTTPS requiere que tu navegador "
+"Web envie un “Referer header�, pero no se la envió. Esta cabecedera se "
+"requiere por razones de seguridad, para asegurar que tu navegador no sea "
+"secuestrado por terceros."
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:120
+msgid ""
+"If you have configured your browser to disable “Referer� headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for “same-"
+"origin� requests."
+msgstr ""
+"Si has configurado su navegador para deshabilitar las cabecederas “Referer�, "
+"vuelva a habilitarlos, al menos para este sitio, o para conexiones HTTPS, o "
+"para solicitudes del “same-origin�. "
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:124
+msgid ""
+"If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
+"including the “Referrer-Policy: no-referrer� header, please remove them. The "
+"CSRF protection requires the “Referer� header to do strict referer checking. "
+"If you’re concerned about privacy, use alternatives like <a rel=\"noreferrer"
+"\" …> for links to third-party sites."
+msgstr ""
+"Si estás usando la eqtigueta <meta name=\"referrer\" content=\"no-referrer"
+"\"> o estás incluyendo la cabecedera “Referrer-Policy: no-referrer�, "
+"quitalas por favor. La protección CSRF require la cabecedera “Referer� para "
+"hacer verficación “strict referer“. Si te preocupa la privacidad, utiliza "
+"alternativas como <a rel=\"noreferrer\" …>  para sitios de terceros."
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:132
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+"Estás viendo este mensaje porque este sitio requiere un cookie CSRF cuando "
+"se envie formularios. Este cookie se requiere por razones de seguridad, para "
+"asegurar que tu navegador no sea secuestrado por terceros."
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:137
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for “same-origin� requests."
+msgstr ""
+"Si has configurado su navegador para deshabilitar los cookies, vuelva a "
+"habilitarlos, al menos para este sitio, o para conexiones HTTPS, o para "
+"solicitudes del “same-origin�. "
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:142
+msgid "More information is available with DEBUG=True."
+msgstr "Más información es disponible con DEBUG=True."
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:41
+msgid "No year specified"
+msgstr "Ningun año fue especificado"
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:61
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:111
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:208
+msgid "Date out of range"
+msgstr "Fecha fuera de rango"
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:90
+msgid "No month specified"
+msgstr "Ningun mes fue especificado"
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:142
+msgid "No day specified"
+msgstr "Ningun día fue especificado"
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:188
+msgid "No week specified"
+msgstr "Ninguna semana fue especificado"
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:338
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:367
+#, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "No %(verbose_name_plural)s disponible"
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:589
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+"%(verbose_name_plural)s del futuro no está disponible porque %(class_name)s."
+"allow_future es False."
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:623
+#, python-format
+msgid "Invalid date string “%(datestr)s� given format “%(format)s�"
+msgstr "Cadena de fecha invalida “%(datestr)s� dado el formato “%(format)s�"
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/detail.py:54
+#, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "No se encontró ningún %(verbose_name)s correspondiente a la búsqueda"
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/list.py:67
+msgid "Page is not “last�, nor can it be converted to an int."
+msgstr "Página no es “last�, ni puede ser convertido en un int."
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/list.py:72
+#, python-format
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr "Página invalida (%(page_number)s): %(message)s"
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/list.py:154
+#, python-format
+msgid "Empty list and “%(class_name)s.allow_empty� is False."
+msgstr "Lista vacia y “%(class_name)s.allow_empty� es False."
+
+#: venv3/lib/python3.8/site-packages/django/views/static.py:40
+msgid "Directory indexes are not allowed here."
+msgstr "Indices directorios no se permiten aquí."
+
+#: venv3/lib/python3.8/site-packages/django/views/static.py:42
+#, python-format
+msgid "“%(path)s� does not exist"
+msgstr "“%(path)s� no existe"
+
+#: venv3/lib/python3.8/site-packages/django/views/static.py:80
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Indice de %(directory)s"
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:7
+msgid "Django: the Web framework for perfectionists with deadlines."
+msgstr "Django: el estructura Web para perfeccionistas con fechas límites."
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:346
+#, python-format
+msgid ""
+"View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
+"target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
+msgstr ""
+"Ver <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
+"target=\"_blank\" rel=\"noopener\">notas de lanzamiento</a> por Django "
+"%(version)s"
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:368
+msgid "The install worked successfully! Congratulations!"
+msgstr "¡La instalación fue exitoso! ¡Felicidades!"
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:369
+#, python-format
+msgid ""
+"You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
+"%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
+"\">DEBUG=True</a> is in your settings file and you have not configured any "
+"URLs."
+msgstr ""
+"Estás viendo esta pagina porque <a href=\"https://docs.djangoproject.com/en/"
+"%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
+"\">DEBUG=True</a> está en tu archivo de configuración y no has configurado "
+"ningún URL."
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:384
+msgid "Django Documentation"
+msgstr "Documentación de Django"
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:385
+msgid "Topics, references, &amp; how-to’s"
+msgstr "Tópicos, referencias, &amp; instrucciones paso-a-paso"
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:396
+msgid "Tutorial: A Polling App"
+msgstr "Tutorial: Una aplicación polling"
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:397
+msgid "Get started with Django"
+msgstr "Empezar con Django"
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:408
+msgid "Django Community"
+msgstr "Comunidad Django"
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:409
+msgid "Connect, get help, or contribute"
+msgstr "Conectarse, encontrar ayuda, o contribuir"
+
+#: venv3/lib/python3.8/site-packages/kombu/transport/qpid.py:1301
+#, python-format
+msgid "Attempting to connect to qpid with SASL mechanism %s"
+msgstr "Intentando conectar con qpid con mecanismo SASL %s"
+
+#: venv3/lib/python3.8/site-packages/kombu/transport/qpid.py:1306
+#, python-format
+msgid "Connected to qpid with SASL mechanism %s"
+msgstr "Conectado con qpid con mecanismo SASL %s"
+
+#: venv3/lib/python3.8/site-packages/kombu/transport/qpid.py:1324
+#, python-format
+msgid "Unable to connect to qpid with SASL mechanism %s"
+msgstr "No se pudo conectar con qpid con mecanismo SASL %s"
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:371
+msgid "1 second ago"
+msgstr "Hace 1 segundo"
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:377
+msgid "1 minute ago"
+msgstr "Hace 1 minuto"
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:382
+msgid "1 hour ago"
+msgstr "Hace 1 hora"
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:385
+#, python-format
+msgid "%(time)s"
+msgstr "%(time)s"
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:387
+msgid "yesterday"
+msgstr "ayer"
+
+# TODO cc @mouse this could be grammatically incorrect if the time said 1 o'clock
+# a working clock is broken twice a day!
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:387
+#, python-format
+msgid "yesterday at %(time)s"
+msgstr "ayer a las %(time)s"
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:389
+#, python-format
+msgid "%(weekday)s"
+msgstr "%(weekday)s"
+
+# TODO cc @mouse this could be grammatically incorrect if the time said 1 o'clock
+# a working clock is broken twice a day!
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:389
+#, python-format
+msgid "%(weekday)s at %(time)s"
+msgstr "%(weekday)s a las %(time)s"
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:392
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:445
+#, python-format
+msgid "%(month_name)s %(day)s"
+msgstr "%(day)s %(month_name)s"
+
+# TODO cc @mouse this could be grammatically incorrect if the time said 1 o'clock
+# a working clock is broken twice a day!
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:394
+#, python-format
+msgid "%(month_name)s %(day)s at %(time)s"
+msgstr "%(day)s %(month_name)s a las %(time)s"
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:399
+#, python-format
+msgid "%(month_name)s %(day)s, %(year)s"
+msgstr "%(day)s %(month_name)s, %(year)s"
+
+# TODO cc @mouse this could be grammatically incorrect if the time said 1 o'clock
+# a working clock is broken twice a day!
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:401
+#, python-format
+msgid "%(month_name)s %(day)s, %(year)s at %(time)s"
+msgstr "%(day)s %(month_name)s, %(year)s a las %(time)s"
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:439
+#, python-format
+msgid "%(weekday)s, %(month_name)s %(day)s"
+msgstr "%(weekday)s, %(day)s %(month_name)s"
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:462
+#, python-format
+msgid "%(commas)s and %(last)s"
+msgstr "%(commas)s y %(last)s"
+
+#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:68
+msgctxt "law"
+msgid "right"
+msgstr "justo"
+
+#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:69
+msgctxt "good"
+msgid "right"
+msgstr "correcto"
+
+#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:71
+#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:74
+msgctxt "organization"
+msgid "club"
+msgstr "club"
+
+#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:76
+#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:77
+msgctxt "stick"
+msgid "club"
+msgstr "garrote"
+
+#, python-format
+#~ msgid "%(rating)s star"
+#~ msgid_plural "%(rating)s stars"
+#~ msgstr[0] "%(rating)s estrella"
+#~ msgstr[1] "%(rating)s estrellas"
+
+#, python-format
+#~ msgid ""
+#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
+#~ "\"%(status_path)s\">review</a>"
+#~ msgstr ""
+#~ "respondió a la <a href=\"%(status_path)s\">reseña</a> de <a href="
+#~ "\"%(user_path)s\">%(username)s</a> "
+
+#, python-format
+#~ msgid ""
+#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
+#~ "\"%(status_path)s\">comment</a>"
+#~ msgstr ""
+#~ "respondió al <a href=\"%(status_path)s\">comentario</a> de <a href="
+#~ "\"%(user_path)s\">%(username)s</a> "
+
+#, python-format
+#~ msgid ""
+#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
+#~ "\"%(status_path)s\">quote</a>"
+#~ msgstr ""
+#~ "respondió a la <a href=\"%(status_path)s\">cita</a> de <a href="
+#~ "\"%(user_path)s\">%(username)s</a> "
+
 #~ msgid "Remove tag"
 #~ msgstr "Eliminar etiqueta"
 
@@ -2756,867 +4344,18 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid "Reactivate user"
 #~ msgstr "Reactivar usuario"
 
-#~ msgid "ambiguous option: %(option)s could match %(matches)s"
-#~ msgstr "opción ambiguo: %(option)s pudiera coincidir con %(matches)s"
-
-#~ msgid "Messages"
-#~ msgstr "Mensajes"
-
-#~ msgid "Site Maps"
-#~ msgstr "Mapas de sitio"
-
-#~ msgid "Static Files"
-#~ msgstr "Archivos estáticos"
-
-#~ msgid "Syndication"
-#~ msgstr "Sindicación"
-
-#~ msgid "That page number is not an integer"
-#~ msgstr "Ese numero de pagina no es un entero"
-
-#~ msgid "That page number is less than 1"
-#~ msgstr "Ese numero de pagina es menos que uno"
-
-#~ msgid "That page contains no results"
-#~ msgstr "Esa pagina no contiene resultados"
-
-#~ msgid "Enter a valid value."
-#~ msgstr "Ingrese un valor válido."
-
-#~ msgid "Enter a valid URL."
-#~ msgstr "Ingrese una URL válida."
-
-#~ msgid "Enter a valid integer."
-#~ msgstr "Ingrese un entero válido."
-
-#~ msgid "Enter a valid email address."
-#~ msgstr "Ingrese una dirección de correo electrónico válida."
-
-#~ msgid "Enter a valid “slug� consisting of letters, numbers, underscores or hyphens."
-#~ msgstr "Ingrese un “slug� válido que consiste de letras, numeros, guiones bajos, o guiones"
-
-#~ msgid "Enter a valid “slug� consisting of Unicode letters, numbers, underscores, or hyphens."
-#~ msgstr "Ingrese un “slug� válido que consiste de letras Unicode, numeros, guiones bajos, o guiones"
-
-#~ msgid "Enter a valid IPv4 address."
-#~ msgstr "Ingrese una dirección IPv4 válida."
-
-#~ msgid "Enter a valid IPv6 address."
-#~ msgstr "Ingrese una dirección IPv6 válida."
-
-#~ msgid "Enter a valid IPv4 or IPv6 address."
-#~ msgstr "Ingrese una dirección IPv4 o IPv6 válida."
-
-#~ msgid "Enter only digits separated by commas."
-#~ msgstr "Ingrese solo digitos separados por comas."
-
-#~ msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
-#~ msgstr "Asegura que este valor es %(limit_value)s (es %(show_value)s)."
-
-#~ msgid "Ensure this value is less than or equal to %(limit_value)s."
-#~ msgstr "Asegura que este valor es menor que o iguala a %(limit_value)s."
-
-#~ msgid "Ensure this value is greater than or equal to %(limit_value)s."
-#~ msgstr "Asegura que este valor es más que o que iguala a %(limit_value)s."
-
-#~ msgid "Ensure this value has at least %(limit_value)d character (it has %(show_value)d)."
-#~ msgid_plural "Ensure this value has at least %(limit_value)d characters (it has %(show_value)d)."
-#~ msgstr[0] "Verifica que este valor tiene por lo menos %(limit_value)d carácter. (Tiene %(show_value)d).)"
-#~ msgstr[1] "Verifica que este valor tiene por lo menos %(limit_value)d caracteres. (Tiene %(show_value)d).)"
-
-#~ msgid "Ensure this value has at most %(limit_value)d character (it has %(show_value)d)."
-#~ msgid_plural "Ensure this value has at most %(limit_value)d characters (it has %(show_value)d)."
-#~ msgstr[0] "Verifica que este valor tiene a lo sumo %(limit_value)d carácter. (Tiene %(show_value)d).)"
-#~ msgstr[1] "Verifica que este valor tiene a lo sumo %(limit_value)d caracteres. (Tiene %(show_value)d).)"
-
-#~ msgid "Enter a number."
-#~ msgstr "Ingrese un número."
-
-#~ msgid "Ensure that there are no more than %(max)s digit in total."
-#~ msgid_plural "Ensure that there are no more than %(max)s digits in total."
-#~ msgstr[0] "Verifica que no hay más que %(max)s digito en total."
-#~ msgstr[1] "Verifica que no hay más que %(max)s digitos en total."
-
-#                         is 
-#~ msgid "Ensure that there are no more than %(max)s decimal place."
-#~ msgid_plural "Ensure that there are no more than %(max)s decimal places."
-#~ msgstr[0] "Verifica que no hay más que %(max)s cifra decimal."
-#~ msgstr[1] "Verifica que no hay más que %(max)s cifras decimales."
-
-#~ msgid "Ensure that there are no more than %(max)s digit before the decimal point."
-#~ msgid_plural "Ensure that there are no more than %(max)s digits before the decimal point."
-#~ msgstr[0] "Verifica que no hay más que %(max)s digito antes de la coma decimal."
-#~ msgstr[1] "Verifica que no hay más que %(max)s digitos antes de la coma decimal."
-
-#~ msgid "File extension “%(extension)s� is not allowed. Allowed extensions are: %(allowed_extensions)s."
-#~ msgstr "No se permite la extensión de archivo “%(extension)s�. Extensiones permitidas son: %(allowed_extensions)s."
-
-#~ msgid "Null characters are not allowed."
-#~ msgstr "No se permiten caracteres nulos"
-
-#~ msgid "and"
-#~ msgstr "y"
-
-#~ msgid "%(model_name)s with this %(field_labels)s already exists."
-#~ msgstr "Ya existe %(model_name)s con este %(field_labels)s."
-
-#~ msgid "Value %(value)r is not a valid choice."
-#~ msgstr "El valor %(value)s no es una opción válida."
-
-#~ msgid "This field cannot be null."
-#~ msgstr "Este campo no puede ser nulo."
-
-#~ msgid "This field cannot be blank."
-#~ msgstr "Este campo no puede ser vacio."
-
-#~ msgid "%(model_name)s with this %(field_label)s already exists."
-#~ msgstr "Ya existe %(model_name)s con este %(field_labels)s."
-
-#~ msgid "%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
-#~ msgstr "%(field_label)s deben ser unicos por %(date_field_label)s %(lookup_type)s."
-
-#~ msgid "Field of type: %(field_type)s"
-#~ msgstr "Campo de tipo: %(field_type)s"
-
-#~ msgid "“%(value)s� value must be either True or False."
-#~ msgstr "“%(value)s� valor debe ser o verdadero o falso."
-
-#~ msgid "“%(value)s� value must be either True, False, or None."
-#~ msgstr "%(value)s� valor debe ser o True, False, o None."
-
-#~ msgid "Boolean (Either True or False)"
-#~ msgstr "Booleano (O True O False)"
-
-#~ msgid "String (up to %(max_length)s)"
-#~ msgstr "Cadena (máximo de %(max_length)s caracteres)"
-
-#~ msgid "Comma-separated integers"
-#~ msgstr "Enteros separados por comas"
-
-#~ msgid "“%(value)s� value has an invalid date format. It must be in YYYY-MM-DD format."
-#~ msgstr "“%(value)s� valor tiene un formato de fecha inválido. Hay que estar de formato YYYY-MM-DD."
-
-#~ msgid "“%(value)s� value has the correct format (YYYY-MM-DD) but it is an invalid date."
-#~ msgstr "“%(value)s� valor tiene el formato correcto (YYYY-MM-DD) pero la fecha es invalida."
-
-#~ msgid "Date (without time)"
-#~ msgstr "Fecha (sin la hora)"
-
-#~ msgid "“%(value)s� value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ] format."
-#~ msgstr "“%(value)s� valor tiene un formato invalido. Debe estar en formato YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]."
-
-#~ msgid "“%(value)s� value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but it is an invalid date/time."
-#~ msgstr "“%(value)s� valor tiene el formato correcto (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) pero es una fecha/hora invalida."
-
-#~ msgid "Date (with time)"
-#~ msgstr "Fecha (con la hora)"
-
-#~ msgid "“%(value)s� value must be a decimal number."
-#~ msgstr "El valor de “%(value)s� debe ser un número decimal."
-
-#~ msgid "Decimal number"
-#~ msgstr "Número decimal"
-
-#~ msgid "“%(value)s� value has an invalid format. It must be in [DD] [[HH:]MM:]ss[.uuuuuu] format."
-#~ msgstr "“%(value)s� valor tiene un formato invalido. Debe estar en formato [DD] [[HH:]MM:]ss[.uuuuuu]."
-
-#~ msgid "Duration"
-#~ msgstr "Duración"
-
-#~ msgid "Email address"
-#~ msgstr "Dirección de correo electrónico"
-
-#~ msgid "File path"
-#~ msgstr "Ruta de archivo"
-
-#~ msgid "“%(value)s� value must be a float."
-#~ msgstr "%(value)s no es un usuario válido"
-
-#~ msgid "Floating point number"
-#~ msgstr "Número de coma flotante"
-
-#~ msgid "“%(value)s� value must be an integer."
-#~ msgstr "“%(value)s� valor debe ser un entero."
-
-#~ msgid "Integer"
-#~ msgstr "Entero"
-
-#~ msgid "Big (8 byte) integer"
-#~ msgstr "Entero grande (8 byte)"
-
-#~ msgid "IPv4 address"
-#~ msgstr "Dirección IPv4"
-
-#~ msgid "IP address"
-#~ msgstr "Dirección IP"
-
-#~ msgid "“%(value)s� value must be either None, True or False."
-#~ msgstr "Valor “%(value)s� debe ser o None, True, o False."
-
-#~ msgid "Boolean (Either True, False or None)"
-#~ msgstr "Booleano (O True, Falso, o None)"
-
 #~ msgid "Positive big integer"
 #~ msgstr "Entero positivo grande"
 
-#~ msgid "Positive integer"
-#~ msgstr "Entero positivo"
-
-#~ msgid "Positive small integer"
-#~ msgstr "Entero positivo pequeño "
-
-#~ msgid "Slug (up to %(max_length)s)"
-#~ msgstr "Slug (máximo de %(max_length)s)"
-
-#~ msgid "Small integer"
-#~ msgstr "Entero pequeño"
-
-#~ msgid "Text"
-#~ msgstr "Texto"
-
-#~ msgid "“%(value)s� value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
-#~ msgstr "“%(value)s� valor tiene un formato invalido. Debe estar en formato HH:MM[:ss[.uuuuuu]]."
-
-#~ msgid "“%(value)s� value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid time."
-#~ msgstr "“%(value)s� valor tiene el formato correcto (HH:MM[:ss[.uuuuuu]]) pero es una hora invalida."
-
-#~ msgid "Time"
-#~ msgstr "Tiempo"
-
-#~ msgid "URL"
-#~ msgstr "URL"
-
-#~ msgid "Raw binary data"
-#~ msgstr "Datos binarios sin procesar"
-
-#~ msgid "“%(value)s� is not a valid UUID."
-#~ msgstr "%(value)s no es una UUID válida."
-
-#~ msgid "Universally unique identifier"
-#~ msgstr "Identificador universalmente único"
-
-#~ msgid "File"
-#~ msgstr "Archivo"
-
-#~ msgid "Image"
-#~ msgstr "Imágen"
-
 #~ msgid "A JSON object"
 #~ msgstr "Un objeto JSON"
 
 #~ msgid "Value must be valid JSON."
 #~ msgstr "Valor debe ser JSON válido."
 
-#~ msgid "%(model)s instance with %(field)s %(value)r does not exist."
-#~ msgstr "%(model)s instancia con %(field)s %(value)r no existe."
-
-#~ msgid "Foreign Key (type determined by related field)"
-#~ msgstr "Clave externa (tipo determinado por campo relacionado)"
-
-#~ msgid "One-to-one relationship"
-#~ msgstr "Relación uno-a-uno"
-
-#~ msgid "%(from)s-%(to)s relationship"
-#~ msgstr "relación %(from)s-%(to)s"
-
-#~ msgid "%(from)s-%(to)s relationships"
-#~ msgstr "relaciones %(from)s-%(to)s"
-
-#~ msgid "Many-to-many relationship"
-#~ msgstr "Relaciones mucho-a-mucho"
-
-#~ msgid "This field is required."
-#~ msgstr "Este campo es requerido."
-
-#~ msgid "Enter a whole number."
-#~ msgstr "Ingrese un número entero."
-
-#~ msgid "Enter a valid date."
-#~ msgstr "Ingrese una fecha válida."
-
-#~ msgid "Enter a valid time."
-#~ msgstr "Ingrese una hora válida."
-
-#~ msgid "Enter a valid date/time."
-#~ msgstr "Ingrese una fecha/hora válida."
-
-#~ msgid "Enter a valid duration."
-#~ msgstr "Ingrese una duración válida."
-
-#~ msgid "The number of days must be between {min_days} and {max_days}."
-#~ msgstr "El número de dias debe ser entre {min_days} y {max_days}."
-
-#~ msgid "No file was submitted. Check the encoding type on the form."
-#~ msgstr "No se aceptó ningun archivo. Verfica el tipo de codificación en el formulario."
-
-#~ msgid "No file was submitted."
-#~ msgstr "No se aceptó ningun archivo."
-
-#~ msgid "The submitted file is empty."
-#~ msgstr "El archivo enviado está vacio."
-
-#~ msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
-#~ msgid_plural "Ensure this filename has at most %(max)d characters (it has %(length)d)."
-#~ msgstr[0] "Verifica que este nombre de archivo no tiene más que %(max)d carácter. (Tiene %(length)d)."
-#~ msgstr[1] "Verifica que este nombre de archivo no tiene más que %(max)d caracteres. (Tiene %(length)d)."
-
-#~ msgid "Please either submit a file or check the clear checkbox, not both."
-#~ msgstr "Por favor, o envia un archivo o marca la casilla vacia, no los dos."
-
-#~ msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
-#~ msgstr "Subir una imagen válida. El archivo que subiste o no fue imagen o fue corrupto."
-
-#~ msgid "Select a valid choice. %(value)s is not one of the available choices."
-#~ msgstr "Selecciona una opción válida. %(value)s no es una de las opciones disponibles."
-
-#~ msgid "Enter a list of values."
-#~ msgstr "Ingrese una lista de valores."
-
-#~ msgid "Enter a complete value."
-#~ msgstr "Ingresa un valor completo."
-
-#~ msgid "Enter a valid UUID."
-#~ msgstr "Ingrese una UUID válida."
-
 #~ msgid "Enter a valid JSON."
 #~ msgstr "Ingrese una JSON válida."
 
-#~ msgid ":"
-#~ msgstr ":"
-
-#~ msgid "(Hidden field %(name)s) %(error)s"
-#~ msgstr "(Campo oculto %(name)s) %(error)s"
-
-#~ msgid "ManagementForm data is missing or has been tampered with"
-#~ msgstr "Datos de ManagementForm está ausento o ha sido corrompido"
-
-#~ msgid "Please submit %d or fewer forms."
-#~ msgid_plural "Please submit %d or fewer forms."
-#~ msgstr[0] "Por favor, enviar %d o menos formularios."
-#~ msgstr[1] "Por favor, enviar %d o menos formularios."
-
-#~ msgid "Please submit %d or more forms."
-#~ msgid_plural "Please submit %d or more forms."
-#~ msgstr[0] "Por favor, enviar %d o más formularios."
-#~ msgstr[1] "Por favor, enviar %d o más formularios."
-
-# TODO cc @mouse is this a verb or noun
-#, fuzzy
-#~ msgid "Order"
-#~ msgstr "Pedir"
-
-# if verb 
-# msgstr "Pedido" # if noun
-#~ msgid "Please correct the duplicate data for %(field)s."
-#~ msgstr "Por favor corrige los datos duplicados en %(field)s."
-
-#~ msgid "Please correct the duplicate data for %(field)s, which must be unique."
-#~ msgstr "Por favor corrige los datos duplicados en %(field)s, los cuales deben ser unicos."
-
-#~ msgid "Please correct the duplicate data for %(field_name)s which must be unique for the %(lookup)s in %(date_field)s."
-#~ msgstr "Por favor corrige los datos duplicados en %(field_name)s los cuales deben ser unicos por el %(lookup)s en %(date_field)s."
-
-#~ msgid "Please correct the duplicate values below."
-#~ msgstr "Por favor corrige los valores duplicados a continuación."
-
-#~ msgid "The inline value did not match the parent instance."
-#~ msgstr "El valor en línea no empareja la instancia progenitor."
-
-#~ msgid "Select a valid choice. That choice is not one of the available choices."
-#~ msgstr "Selecciona una opción válida. Esa opción no es una de las opciones disponibles."
-
-#~ msgid "“%(pk)s� is not a valid value."
-#~ msgstr "“%(pk)s� no es un valor válido."
-
-#~ msgid "%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it may be ambiguous or it may not exist."
-#~ msgstr "%(datetime)s no se pudo interpretar en la zona horaria %(current_timezone)s; puede ser ambiguo o puede que no exista."
-
-#~ msgid "Clear"
-#~ msgstr "Borrar"
-
-#~ msgid "Currently"
-#~ msgstr "Actualmente"
-
-#~ msgid "Change"
-#~ msgstr "Cambiar"
-
-#~ msgid "Unknown"
-#~ msgstr "Desconocido"
-
-#~ msgid "Yes"
-#~ msgstr "Sí"
-
-#~ msgid "No"
-#~ msgstr "No"
-
-#~ msgid "yes,no,maybe"
-#~ msgstr "sí,no,quizás"
-
-#~ msgid "%(size)d byte"
-#~ msgid_plural "%(size)d bytes"
-#~ msgstr[0] "%(size)d byte"
-#~ msgstr[1] "%(size)d bytes"
-
-#~ msgid "%s KB"
-#~ msgstr "%s KB"
-
-#~ msgid "%s MB"
-#~ msgstr "%s MB"
-
-#~ msgid "%s GB"
-#~ msgstr "%s GB"
-
-#~ msgid "%s TB"
-#~ msgstr "%s TB"
-
-#~ msgid "%s PB"
-#~ msgstr "%s PB"
-
-#~ msgid "p.m."
-#~ msgstr "p.m."
-
-#~ msgid "a.m."
-#~ msgstr "a.m."
-
-#~ msgid "PM"
-#~ msgstr "PM"
-
-#~ msgid "AM"
-#~ msgstr "AM"
-
-#~ msgid "midnight"
-#~ msgstr "medianoche"
-
-#~ msgid "noon"
-#~ msgstr "mediodia"
-
-#~ msgid "Monday"
-#~ msgstr "Lunes"
-
-#~ msgid "Tuesday"
-#~ msgstr "Martes"
-
-#~ msgid "Wednesday"
-#~ msgstr "Miercoles"
-
-#~ msgid "Thursday"
-#~ msgstr "Jueves"
-
-#~ msgid "Friday"
-#~ msgstr "Viernes"
-
-#~ msgid "Saturday"
-#~ msgstr "Sábado"
-
-#~ msgid "Sunday"
-#~ msgstr "Domino"
-
-#~ msgid "Mon"
-#~ msgstr "Lun"
-
-#~ msgid "Tue"
-#~ msgstr "Mar"
-
-#~ msgid "Wed"
-#~ msgstr "Mie"
-
-#~ msgid "Thu"
-#~ msgstr "Jue"
-
-#~ msgid "Fri"
-#~ msgstr "Vie"
-
-#~ msgid "Sat"
-#~ msgstr "Sáb"
-
-#~ msgid "Sun"
-#~ msgstr "Dom"
-
-#~ msgid "January"
-#~ msgstr "Enero"
-
-#~ msgid "February"
-#~ msgstr "Febrero"
-
-#~ msgid "March"
-#~ msgstr "Marzo"
-
-#~ msgid "April"
-#~ msgstr "Abril"
-
-#~ msgid "May"
-#~ msgstr "Mayo"
-
-#~ msgid "June"
-#~ msgstr "Junio"
-
-#~ msgid "July"
-#~ msgstr "Julio"
-
-#~ msgid "August"
-#~ msgstr "Agosto"
-
-#~ msgid "September"
-#~ msgstr "Septiembre"
-
-#~ msgid "October"
-#~ msgstr "Octubre"
-
-#~ msgid "November"
-#~ msgstr "Noviembre"
-
-#~ msgid "December"
-#~ msgstr "Diciembre"
-
-#~ msgid "jan"
-#~ msgstr "ene"
-
-#~ msgid "feb"
-#~ msgstr "feb"
-
-#~ msgid "mar"
-#~ msgstr "mar"
-
-#~ msgid "apr"
-#~ msgstr "abr"
-
-#~ msgid "may"
-#~ msgstr "may"
-
-#~ msgid "jun"
-#~ msgstr "jun"
-
-#~ msgid "jul"
-#~ msgstr "jul"
-
-#~ msgid "aug"
-#~ msgstr "ago"
-
-#~ msgid "sep"
-#~ msgstr "sep"
-
-#~ msgid "oct"
-#~ msgstr "oct"
-
-#~ msgid "nov"
-#~ msgstr "nov"
-
-#~ msgid "dec"
-#~ msgstr "dic"
-
-#~ msgctxt "abbrev. month"
-#~ msgid "Jan."
-#~ msgstr "en."
-
-#~ msgctxt "abbrev. month"
-#~ msgid "Feb."
-#~ msgstr "feb."
-
-#~ msgctxt "abbrev. month"
-#~ msgid "March"
-#~ msgstr "mzo."
-
-#~ msgctxt "abbrev. month"
-#~ msgid "April"
-#~ msgstr "abr."
-
-#~ msgctxt "abbrev. month"
-#~ msgid "May"
-#~ msgstr "my."
-
-#~ msgctxt "abbrev. month"
-#~ msgid "June"
-#~ msgstr "jun."
-
-#~ msgctxt "abbrev. month"
-#~ msgid "July"
-#~ msgstr "jul."
-
-#~ msgctxt "abbrev. month"
-#~ msgid "Aug."
-#~ msgstr "agto."
-
-#~ msgctxt "abbrev. month"
-#~ msgid "Sept."
-#~ msgstr "set."
-
-#~ msgctxt "abbrev. month"
-#~ msgid "Oct."
-#~ msgstr "oct."
-
-#~ msgctxt "abbrev. month"
-#~ msgid "Nov."
-#~ msgstr "nov."
-
-#~ msgctxt "abbrev. month"
-#~ msgid "Dec."
-#~ msgstr "dic."
-
-#~ msgctxt "alt. month"
-#~ msgid "January"
-#~ msgstr "Enero"
-
-#~ msgctxt "alt. month"
-#~ msgid "February"
-#~ msgstr "Febrero"
-
-#~ msgctxt "alt. month"
-#~ msgid "March"
-#~ msgstr "Marzo"
-
-#~ msgctxt "alt. month"
-#~ msgid "April"
-#~ msgstr "Abril"
-
-#~ msgctxt "alt. month"
-#~ msgid "May"
-#~ msgstr "Mayo"
-
-#~ msgctxt "alt. month"
-#~ msgid "June"
-#~ msgstr "Junio"
-
-#~ msgctxt "alt. month"
-#~ msgid "July"
-#~ msgstr "Julio"
-
-#~ msgctxt "alt. month"
-#~ msgid "August"
-#~ msgstr "Agosto"
-
-#~ msgctxt "alt. month"
-#~ msgid "September"
-#~ msgstr "Septiembre"
-
-#~ msgctxt "alt. month"
-#~ msgid "October"
-#~ msgstr "Octubre"
-
-#~ msgctxt "alt. month"
-#~ msgid "November"
-#~ msgstr "Noviembre"
-
-#~ msgctxt "alt. month"
-#~ msgid "December"
-#~ msgstr "Diciembre"
-
-#~ msgid "This is not a valid IPv6 address."
-#~ msgstr "Esta no es una dirección IPv6 válida."
-
-#~ msgctxt "String to return when truncating text"
-#~ msgid "%(truncated_text)s…"
-#~ msgstr "%(truncated_text)s…"
-
-#~ msgid "or"
-#~ msgstr "o"
-
-#~ msgid ", "
-#~ msgstr ", "
-
-#~ msgid "%d year"
-#~ msgid_plural "%d years"
-#~ msgstr[0] "%d año"
-#~ msgstr[1] "%d años"
-
-#~ msgid "%d month"
-#~ msgid_plural "%d months"
-#~ msgstr[0] "%d mes"
-#~ msgstr[1] "%d meses"
-
-#~ msgid "%d week"
-#~ msgid_plural "%d weeks"
-#~ msgstr[0] "%d semana"
-#~ msgstr[1] "%d semanas"
-
-#~ msgid "%d day"
-#~ msgid_plural "%d days"
-#~ msgstr[0] "%d día"
-#~ msgstr[1] "%d días"
-
-#~ msgid "%d hour"
-#~ msgid_plural "%d hours"
-#~ msgstr[0] "%d hora"
-#~ msgstr[1] "%d horas"
-
-#~ msgid "%d minute"
-#~ msgid_plural "%d minutes"
-#~ msgstr[0] "%d minuto"
-#~ msgstr[1] "%d minutos"
-
-#~ msgid "Forbidden"
-#~ msgstr "Prohibido"
-
-#~ msgid "CSRF verification failed. Request aborted."
-#~ msgstr "Se falló la verificación CSRF. Se abortó la solicitud."
-
-#~ msgid "You are seeing this message because this HTTPS site requires a “Referer header� to be sent by your Web browser, but none was sent. This header is required for security reasons, to ensure that your browser is not being hijacked by third parties."
-#~ msgstr "Estás viendo este mensaje porque este sitio HTTPS requiere que tu navegador Web envie un “Referer header�, pero no se la envió. Esta cabecedera se requiere por razones de seguridad, para asegurar que tu navegador no sea secuestrado por terceros."
-
-#~ msgid "If you have configured your browser to disable “Referer� headers, please re-enable them, at least for this site, or for HTTPS connections, or for “same-origin� requests."
-#~ msgstr "Si has configurado su navegador para deshabilitar las cabecederas “Referer�, vuelva a habilitarlos, al menos para este sitio, o para conexiones HTTPS, o para solicitudes del “same-origin�. "
-
-#~ msgid "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or including the “Referrer-Policy: no-referrer� header, please remove them. The CSRF protection requires the “Referer� header to do strict referer checking. If you’re concerned about privacy, use alternatives like <a rel=\"noreferrer\" …> for links to third-party sites."
-#~ msgstr "Si estás usando la eqtigueta <meta name=\"referrer\" content=\"no-referrer\"> o estás incluyendo la cabecedera “Referrer-Policy: no-referrer�, quitalas por favor. La protección CSRF require la cabecedera “Referer� para hacer verficación “strict referer“. Si te preocupa la privacidad, utiliza alternativas como <a rel=\"noreferrer\" …>  para sitios de terceros."
-
-#~ msgid "You are seeing this message because this site requires a CSRF cookie when submitting forms. This cookie is required for security reasons, to ensure that your browser is not being hijacked by third parties."
-#~ msgstr "Estás viendo este mensaje porque este sitio requiere un cookie CSRF cuando se envie formularios. Este cookie se requiere por razones de seguridad, para asegurar que tu navegador no sea secuestrado por terceros."
-
-#~ msgid "If you have configured your browser to disable cookies, please re-enable them, at least for this site, or for “same-origin� requests."
-#~ msgstr "Si has configurado su navegador para deshabilitar los cookies, vuelva a habilitarlos, al menos para este sitio, o para conexiones HTTPS, o para solicitudes del “same-origin�. "
-
-#~ msgid "More information is available with DEBUG=True."
-#~ msgstr "Más información es disponible con DEBUG=True."
-
-#~ msgid "No year specified"
-#~ msgstr "Ningun año fue especificado"
-
-#~ msgid "Date out of range"
-#~ msgstr "Fecha fuera de rango"
-
-#~ msgid "No month specified"
-#~ msgstr "Ningun mes fue especificado"
-
-#~ msgid "No day specified"
-#~ msgstr "Ningun día fue especificado"
-
-#~ msgid "No week specified"
-#~ msgstr "Ninguna semana fue especificado"
-
-#~ msgid "No %(verbose_name_plural)s available"
-#~ msgstr "No %(verbose_name_plural)s disponible"
-
-#~ msgid "Future %(verbose_name_plural)s not available because %(class_name)s.allow_future is False."
-#~ msgstr "%(verbose_name_plural)s del futuro no está disponible porque %(class_name)s.allow_future es False."
-
-#~ msgid "Invalid date string “%(datestr)s� given format “%(format)s�"
-#~ msgstr "Cadena de fecha invalida “%(datestr)s� dado el formato “%(format)s�"
-
-#~ msgid "No %(verbose_name)s found matching the query"
-#~ msgstr "No se encontró ningún %(verbose_name)s correspondiente a la búsqueda"
-
-#~ msgid "Page is not “last�, nor can it be converted to an int."
-#~ msgstr "Página no es “last�, ni puede ser convertido en un int."
-
-#~ msgid "Invalid page (%(page_number)s): %(message)s"
-#~ msgstr "Página invalida (%(page_number)s): %(message)s"
-
-#~ msgid "Empty list and “%(class_name)s.allow_empty� is False."
-#~ msgstr "Lista vacia y “%(class_name)s.allow_empty� es False."
-
-#~ msgid "Directory indexes are not allowed here."
-#~ msgstr "Indices directorios no se permiten aquí."
-
-#~ msgid "“%(path)s� does not exist"
-#~ msgstr "“%(path)s� no existe"
-
-#~ msgid "Index of %(directory)s"
-#~ msgstr "Indice de %(directory)s"
-
-#~ msgid "Django: the Web framework for perfectionists with deadlines."
-#~ msgstr "Django: el estructura Web para perfeccionistas con fechas límites."
-
-#~ msgid "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
-#~ msgstr "Ver <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" target=\"_blank\" rel=\"noopener\">notas de lanzamiento</a> por Django %(version)s"
-
-#~ msgid "The install worked successfully! Congratulations!"
-#~ msgstr "¡La instalación fue exitoso! ¡Felicidades!"
-
-#~ msgid "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener\">DEBUG=True</a> is in your settings file and you have not configured any URLs."
-#~ msgstr "Estás viendo esta pagina porque <a href=\"https://docs.djangoproject.com/en/%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener\">DEBUG=True</a> está en tu archivo de configuración y no has configurado ningún URL."
-
-#~ msgid "Django Documentation"
-#~ msgstr "Documentación de Django"
-
-#~ msgid "Topics, references, &amp; how-to’s"
-#~ msgstr "Tópicos, referencias, &amp; instrucciones paso-a-paso"
-
-#~ msgid "Tutorial: A Polling App"
-#~ msgstr "Tutorial: Una aplicación polling"
-
-#~ msgid "Get started with Django"
-#~ msgstr "Empezar con Django"
-
-#~ msgid "Django Community"
-#~ msgstr "Comunidad Django"
-
-#~ msgid "Connect, get help, or contribute"
-#~ msgstr "Conectarse, encontrar ayuda, o contribuir"
-
-#~ msgid "Attempting to connect to qpid with SASL mechanism %s"
-#~ msgstr "Intentando conectar con qpid con mecanismo SASL %s"
-
-#~ msgid "Connected to qpid with SASL mechanism %s"
-#~ msgstr "Conectado con qpid con mecanismo SASL %s"
-
-#~ msgid "Unable to connect to qpid with SASL mechanism %s"
-#~ msgstr "No se pudo conectar con qpid con mecanismo SASL %s"
-
-#~ msgid "1 second ago"
-#~ msgstr "Hace 1 segundo"
-
-#~ msgid "1 minute ago"
-#~ msgstr "Hace 1 minuto"
-
-#~ msgid "1 hour ago"
-#~ msgstr "Hace 1 hora"
-
-#~ msgid "%(time)s"
-#~ msgstr "%(time)s"
-
-#~ msgid "yesterday"
-#~ msgstr "ayer"
-
-# TODO cc @mouse this could be grammatically incorrect if the time said 1 o'clock
-# a working clock is broken twice a day!
-#~ msgid "yesterday at %(time)s"
-#~ msgstr "ayer a las %(time)s"
-
-#~ msgid "%(weekday)s"
-#~ msgstr "%(weekday)s"
-
-# TODO cc @mouse this could be grammatically incorrect if the time said 1 o'clock
-# a working clock is broken twice a day!
-#~ msgid "%(weekday)s at %(time)s"
-#~ msgstr "%(weekday)s a las %(time)s"
-
-#~ msgid "%(month_name)s %(day)s"
-#~ msgstr "%(day)s %(month_name)s"
-
-# TODO cc @mouse this could be grammatically incorrect if the time said 1 o'clock
-# a working clock is broken twice a day!
-#~ msgid "%(month_name)s %(day)s at %(time)s"
-#~ msgstr "%(day)s %(month_name)s a las %(time)s"
-
-#~ msgid "%(month_name)s %(day)s, %(year)s"
-#~ msgstr "%(day)s %(month_name)s, %(year)s"
-
-# TODO cc @mouse this could be grammatically incorrect if the time said 1 o'clock
-# a working clock is broken twice a day!
-#~ msgid "%(month_name)s %(day)s, %(year)s at %(time)s"
-#~ msgstr "%(day)s %(month_name)s, %(year)s a las %(time)s"
-
-#~ msgid "%(weekday)s, %(month_name)s %(day)s"
-#~ msgstr "%(weekday)s, %(day)s %(month_name)s"
-
-#~ msgid "%(commas)s and %(last)s"
-#~ msgstr "%(commas)s y %(last)s"
-
-#~ msgctxt "law"
-#~ msgid "right"
-#~ msgstr "justo"
-
-#~ msgctxt "good"
-#~ msgid "right"
-#~ msgstr "correcto"
-
-#~ msgctxt "organization"
-#~ msgid "club"
-#~ msgstr "club"
-
-#~ msgctxt "stick"
-#~ msgid "club"
-#~ msgstr "garrote"
-
 #, fuzzy
 #~| msgid "Started"
 #~ msgid "Getting Started"
@@ -3630,9 +4369,6 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid "Tags"
 #~ msgstr "Etiquetas"
 
-#~ msgid "Your shelves"
-#~ msgstr "Tus estantes"
-
 #~ msgid "Your lists"
 #~ msgstr "Tus listas"
 
diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index c05a9f7a..ee2f7936 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-09 21:53+0000\n"
+"POT-Creation-Date: 2021-04-26 09:56-0700\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"
@@ -18,35 +18,66 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: bookwyrm/forms.py:226
+#: bookwyrm/forms.py:224
 msgid "A user with this email already exists."
 msgstr "Cet email est déjà associé à un compte."
 
-#: bookwyrm/forms.py:240
+#: bookwyrm/forms.py:238
 msgid "One Day"
 msgstr "Un jour"
 
-#: bookwyrm/forms.py:241
+#: bookwyrm/forms.py:239
 msgid "One Week"
 msgstr "Une semaine"
 
-#: bookwyrm/forms.py:242
+#: bookwyrm/forms.py:240
 msgid "One Month"
 msgstr "Un mois"
 
-#: bookwyrm/forms.py:243
+#: bookwyrm/forms.py:241
 msgid "Does Not Expire"
 msgstr "Sans expiration"
 
-#: bookwyrm/forms.py:248
+#: bookwyrm/forms.py:246
 #, python-format
 msgid "%(count)d uses"
 msgstr "%(count)d utilisations"
 
-#: bookwyrm/forms.py:251
+#: bookwyrm/forms.py:249
 msgid "Unlimited"
 msgstr "Sans limite"
 
+#: bookwyrm/forms.py:293
+msgid "List Order"
+msgstr ""
+
+#: bookwyrm/forms.py:294
+#, fuzzy
+#| msgid "Title"
+msgid "Book Title"
+msgstr "Titre"
+
+#: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:31
+#: bookwyrm/templates/user/shelf.html:80 bookwyrm/templates/user/shelf.html:110
+msgid "Rating"
+msgstr "Note"
+
+#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:82
+msgid "Sort By"
+msgstr ""
+
+#: bookwyrm/forms.py:301
+#, fuzzy
+#| msgid "Sorted ascending"
+msgid "Ascending"
+msgstr "Trié par ordre croissant"
+
+#: bookwyrm/forms.py:302
+#, fuzzy
+#| msgid "Sorted ascending"
+msgid "Descending"
+msgstr "Trié par ordre croissant"
+
 #: bookwyrm/models/fields.py:24
 #, python-format
 msgid "%(value)s is not a valid remote_id"
@@ -57,7 +88,7 @@ msgstr "%(value)s n’est pas une remote_id valide."
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s n’est pas un nom de compte valide."
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:152
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:153
 msgid "username"
 msgstr "nom du compte :"
 
@@ -65,23 +96,23 @@ msgstr "nom du compte :"
 msgid "A user with that username already exists."
 msgstr "Ce nom est déjà associé à un compte."
 
-#: bookwyrm/settings.py:150
+#: bookwyrm/settings.py:152
 msgid "English"
 msgstr "English"
 
-#: bookwyrm/settings.py:151
+#: bookwyrm/settings.py:153
 msgid "German"
 msgstr "Deutsch"
 
-#: bookwyrm/settings.py:152
+#: bookwyrm/settings.py:154
 msgid "Spanish"
 msgstr "Español"
 
-#: bookwyrm/settings.py:153
+#: bookwyrm/settings.py:155
 msgid "French"
 msgstr "Français"
 
-#: bookwyrm/settings.py:154
+#: bookwyrm/settings.py:156
 msgid "Simplified Chinese"
 msgstr "简化字"
 
@@ -137,58 +168,48 @@ msgstr "Ajouter une couverture"
 msgid "Failed to load cover"
 msgstr "La couverture n’a pu être chargée"
 
-#: bookwyrm/templates/book/book.html:74
-msgid "ISBN:"
-msgstr "ISBN :"
-
-#: bookwyrm/templates/book/book.html:81
-#: bookwyrm/templates/book/edit_book.html:223
-msgid "OCLC Number:"
-msgstr "Numéro OCLC :"
-
-#: bookwyrm/templates/book/book.html:88
-#: bookwyrm/templates/book/edit_book.html:227
-msgid "ASIN:"
-msgstr "ASIN :"
-
-#: bookwyrm/templates/book/book.html:97
+#: bookwyrm/templates/book/book.html:82
 msgid "View on OpenLibrary"
 msgstr "Voir sur OpenLibrary"
 
-#: bookwyrm/templates/book/book.html:117
+#: bookwyrm/templates/book/book.html:102
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s critique)"
 msgstr[1] "(%(review_count)s critiques)"
 
-#: bookwyrm/templates/book/book.html:129
+#: bookwyrm/templates/book/book.html:114
 msgid "Add Description"
 msgstr "Ajouter une description"
 
-#: bookwyrm/templates/book/book.html:136
+#: bookwyrm/templates/book/book.html:121
 #: bookwyrm/templates/book/edit_book.html:107
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Description :"
 
-#: bookwyrm/templates/book/book.html:140
-#: bookwyrm/templates/book/edit_book.html:237
+#: bookwyrm/templates/book/book.html:125
+#: bookwyrm/templates/book/edit_book.html:240
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
+#: bookwyrm/templates/settings/edit_server.html:68
+#: bookwyrm/templates/settings/federated_server.html:93
 #: bookwyrm/templates/settings/site.html:93
 #: bookwyrm/templates/snippets/readthrough.html:75
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:38
 msgid "Save"
 msgstr "Enregistrer"
 
-#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190
+#: bookwyrm/templates/book/book.html:126 bookwyrm/templates/book/book.html:175
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:238
+#: bookwyrm/templates/book/edit_book.html:241
 #: bookwyrm/templates/edit_author.html:79
-#: bookwyrm/templates/moderation/report_modal.html:32
+#: bookwyrm/templates/moderation/report_modal.html:34
+#: bookwyrm/templates/settings/federated_server.html:94
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
 #: bookwyrm/templates/snippets/readthrough.html:76
@@ -199,73 +220,116 @@ msgstr "Enregistrer"
 msgid "Cancel"
 msgstr "Annuler"
 
-#: bookwyrm/templates/book/book.html:150
+#: bookwyrm/templates/book/book.html:135
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s/editions\">%(count)s éditions</a>"
 
-#: bookwyrm/templates/book/book.html:158
+#: bookwyrm/templates/book/book.html:143
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
-msgstr "Cette édition est sur votre étagère <a href=\"%(path)s\">%(shelf_name)s</a>."
+msgstr ""
+"Cette édition est sur votre étagère <a href=\"%(path)s\">%(shelf_name)s</a>."
 
-#: bookwyrm/templates/book/book.html:164
+#: bookwyrm/templates/book/book.html:149
 #, python-format
-msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
-msgstr "Une <a href=\"%(book_path)s\">édition différente</a> de ce livre existe sur votre étagère <a href=\"%(shelf_path)s\">%(shelf_name)s</a>."
+msgid ""
+"A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a "
+"href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
+msgstr ""
+"Une <a href=\"%(book_path)s\">édition différente</a> de ce livre existe sur "
+"votre étagère <a href=\"%(shelf_path)s\">%(shelf_name)s</a>."
 
-#: bookwyrm/templates/book/book.html:173
+#: bookwyrm/templates/book/book.html:158
 msgid "Your reading activity"
 msgstr "Votre activité de lecture"
 
-#: bookwyrm/templates/book/book.html:175
+#: bookwyrm/templates/book/book.html:160
 msgid "Add read dates"
 msgstr "Ajouter des dates de lecture"
 
-#: bookwyrm/templates/book/book.html:180
+#: bookwyrm/templates/book/book.html:165
 msgid "You don't have any reading activity for this book."
 msgstr "Vous n’avez aucune activité de lecture pour ce livre"
 
-#: bookwyrm/templates/book/book.html:187
+#: bookwyrm/templates/book/book.html:172
 msgid "Create"
 msgstr "Créer"
 
-#: bookwyrm/templates/book/book.html:209
+#: bookwyrm/templates/book/book.html:194
 msgid "Subjects"
 msgstr "Sujets"
 
-#: bookwyrm/templates/book/book.html:221
+#: bookwyrm/templates/book/book.html:206
 msgid "Places"
 msgstr "Lieux"
 
-#: bookwyrm/templates/book/book.html:232 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book/book.html:217 bookwyrm/templates/layout.html:65
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listes"
 
-#: bookwyrm/templates/book/book.html:243
+#: bookwyrm/templates/book/book.html:228
 msgid "Add to list"
 msgstr "Ajouter à la liste"
 
-#: bookwyrm/templates/book/book.html:253
+#: bookwyrm/templates/book/book.html:238
 #: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:90
+#: bookwyrm/templates/lists/list.html:133
 msgid "Add"
 msgstr "Ajouter"
 
-#: bookwyrm/templates/book/book.html:291
+#: bookwyrm/templates/book/book.html:254
+#, fuzzy
+#| msgid "Review"
+msgid "Reviews"
+msgstr "Critique"
+
+#: bookwyrm/templates/book/book.html:259
+#, fuzzy
+#| msgid "Your shelves"
+msgid "Your reviews"
+msgstr "Vos étagères"
+
+#: bookwyrm/templates/book/book.html:265
+#, fuzzy
+#| msgid "Your Account"
+msgid "Your comments"
+msgstr "Votre compte"
+
+#: bookwyrm/templates/book/book.html:271
+#, fuzzy
+#| msgid "Your books"
+msgid "Your quotes"
+msgstr "Vos livres"
+
+#: bookwyrm/templates/book/book.html:305
 msgid "rated it"
 msgstr "l’a noté"
 
+#: bookwyrm/templates/book/book_identifiers.html:8
+msgid "ISBN:"
+msgstr "ISBN :"
+
+#: bookwyrm/templates/book/book_identifiers.html:15
+#: bookwyrm/templates/book/edit_book.html:226
+msgid "OCLC Number:"
+msgstr "Numéro OCLC :"
+
+#: bookwyrm/templates/book/book_identifiers.html:22
+#: bookwyrm/templates/book/edit_book.html:230
+msgid "ASIN:"
+msgstr "ASIN :"
+
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:175
+#: bookwyrm/templates/book/edit_book.html:178
 msgid "Upload cover:"
 msgstr "Charger une couverture :"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:181
+#: bookwyrm/templates/book/edit_book.html:184
 msgid "Load cover from url:"
 msgstr "Charger la couverture depuis une URL :"
 
@@ -349,78 +413,78 @@ msgstr "Titre :"
 msgid "Subtitle:"
 msgstr "Sous‑titre :"
 
-#: bookwyrm/templates/book/edit_book.html:112
+#: bookwyrm/templates/book/edit_book.html:113
 msgid "Series:"
 msgstr "Série :"
 
-#: bookwyrm/templates/book/edit_book.html:117
+#: bookwyrm/templates/book/edit_book.html:120
 msgid "Series number:"
 msgstr "Numéro dans la série :"
 
-#: bookwyrm/templates/book/edit_book.html:123
+#: bookwyrm/templates/book/edit_book.html:126
 msgid "Publisher:"
 msgstr "Éditeur :"
 
-#: bookwyrm/templates/book/edit_book.html:125
+#: bookwyrm/templates/book/edit_book.html:128
 msgid "Separate multiple publishers with commas."
 msgstr "Séparez plusieurs éditeurs par une virgule."
 
-#: bookwyrm/templates/book/edit_book.html:132
+#: bookwyrm/templates/book/edit_book.html:135
 msgid "First published date:"
 msgstr "Première date de publication :"
 
-#: bookwyrm/templates/book/edit_book.html:140
+#: bookwyrm/templates/book/edit_book.html:143
 msgid "Published date:"
 msgstr "Date de publication :"
 
-#: bookwyrm/templates/book/edit_book.html:149
+#: bookwyrm/templates/book/edit_book.html:152
 msgid "Authors"
 msgstr "Auteurs ou autrices"
 
-#: bookwyrm/templates/book/edit_book.html:155
+#: bookwyrm/templates/book/edit_book.html:158
 #, python-format
 msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
 msgstr "Supprimer <a href=\"%(path)s\">%(name)s</a>"
 
-#: bookwyrm/templates/book/edit_book.html:160
+#: bookwyrm/templates/book/edit_book.html:163
 msgid "Add Authors:"
 msgstr "Ajouter des auteurs ou autrices :"
 
-#: bookwyrm/templates/book/edit_book.html:161
+#: bookwyrm/templates/book/edit_book.html:164
 msgid "John Doe, Jane Smith"
 msgstr "Claude Dupont, Dominique Durand"
 
-#: bookwyrm/templates/book/edit_book.html:167
-#: bookwyrm/templates/user/shelf.html:75
+#: bookwyrm/templates/book/edit_book.html:170
+#: bookwyrm/templates/user/shelf.html:74
 msgid "Cover"
 msgstr "Couverture"
 
-#: bookwyrm/templates/book/edit_book.html:194
+#: bookwyrm/templates/book/edit_book.html:197
 msgid "Physical Properties"
 msgstr "Propriétés physiques"
 
-#: bookwyrm/templates/book/edit_book.html:195
+#: bookwyrm/templates/book/edit_book.html:198
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "Format :"
 
-#: bookwyrm/templates/book/edit_book.html:203
+#: bookwyrm/templates/book/edit_book.html:206
 msgid "Pages:"
 msgstr "Pages :"
 
-#: bookwyrm/templates/book/edit_book.html:210
+#: bookwyrm/templates/book/edit_book.html:213
 msgid "Book Identifiers"
 msgstr "Identifiants du livre"
 
-#: bookwyrm/templates/book/edit_book.html:211
+#: bookwyrm/templates/book/edit_book.html:214
 msgid "ISBN 13:"
 msgstr "ISBN 13 :"
 
-#: bookwyrm/templates/book/edit_book.html:215
+#: bookwyrm/templates/book/edit_book.html:218
 msgid "ISBN 10:"
 msgstr "ISBN 10 :"
 
-#: bookwyrm/templates/book/edit_book.html:219
+#: bookwyrm/templates/book/edit_book.html:222
 #: bookwyrm/templates/edit_author.html:59
 msgid "Openlibrary key:"
 msgstr "Clé Openlibrary :"
@@ -464,17 +528,17 @@ msgstr "%(pages)s pages"
 msgid "%(languages)s language"
 msgstr "%(languages)s langues"
 
-#: bookwyrm/templates/book/publisher_info.html:65
+#: bookwyrm/templates/book/publisher_info.html:64
 #, python-format
 msgid "Published %(date)s by %(publisher)s."
 msgstr "Publié %(date)s par %(publisher)s."
 
-#: bookwyrm/templates/book/publisher_info.html:67
+#: bookwyrm/templates/book/publisher_info.html:66
 #, python-format
 msgid "Published %(date)s"
 msgstr "Publié %(date)s"
 
-#: bookwyrm/templates/book/publisher_info.html:69
+#: bookwyrm/templates/book/publisher_info.html:68
 #, python-format
 msgid "Published by %(publisher)s."
 msgstr "Publié par %(publisher)s."
@@ -505,18 +569,24 @@ msgstr "Communauté fédérée"
 
 #: bookwyrm/templates/directory/directory.html:6
 #: bookwyrm/templates/directory/directory.html:11
-#: bookwyrm/templates/layout.html:92
+#: bookwyrm/templates/layout.html:93
 msgid "Directory"
 msgstr "Répertoire"
 
 #: bookwyrm/templates/directory/directory.html:19
 msgid "Make your profile discoverable to other BookWyrm users."
-msgstr "Autoriser d’autres utilisateurs ou utilisatrices de BookWyrm à découvrir votre profil."
+msgstr ""
+"Autoriser d’autres utilisateurs ou utilisatrices de BookWyrm à découvrir "
+"votre profil."
 
 #: bookwyrm/templates/directory/directory.html:26
 #, python-format
-msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
-msgstr "Vous pouvez décider de ne plus y figurer à n’importe quel moment depuis vos <a href=\"%(path)s\">paramètres de profil.</a>"
+msgid ""
+"You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</"
+"a>"
+msgstr ""
+"Vous pouvez décider de ne plus y figurer à n’importe quel moment depuis vos "
+"<a href=\"%(path)s\">paramètres de profil.</a>"
 
 #: bookwyrm/templates/directory/directory.html:31
 #: bookwyrm/templates/snippets/goal_card.html:22
@@ -629,7 +699,7 @@ msgid "Email address:"
 msgstr "Adresse email :"
 
 #: bookwyrm/templates/discover/landing_layout.html:70
-#: bookwyrm/templates/moderation/report_modal.html:31
+#: bookwyrm/templates/moderation/report_modal.html:33
 msgid "Submit"
 msgstr "Valider"
 
@@ -682,8 +752,12 @@ msgstr "Bien le bonjour,"
 
 #: bookwyrm/templates/email/html_layout.html:21
 #, python-format
-msgid "BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a>"
-msgstr "BookWyrm, hébergé par <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a>"
+msgid ""
+"BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">"
+"%(site_name)s</a>"
+msgstr ""
+"BookWyrm, hébergé par <a style=\"color: #3273dc;\" href=\"https://%(domain)s"
+"\">%(site_name)s</a>"
 
 #: bookwyrm/templates/email/html_layout.html:23
 msgid "Email preference"
@@ -701,13 +775,21 @@ msgstr "S’enregistrer maintenant"
 
 #: bookwyrm/templates/email/invite/html_content.html:15
 #, python-format
-msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
-msgstr "En savoir plus sur <a href=\"https://%(domain)s%(about_path)s\">cette instance</a>."
+msgid ""
+"Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</"
+"a>."
+msgstr ""
+"En savoir plus sur <a href=\"https://%(domain)s%(about_path)s\">cette "
+"instance</a>."
 
 #: bookwyrm/templates/email/invite/text_content.html:4
 #, python-format
-msgid "You're invited to join %(site_name)s! Click the link below to create an account."
-msgstr "Vous avez reçu une invitation à rejoindre %(site_name)s ! Cliquez le lien suivant pour créer un compte."
+msgid ""
+"You're invited to join %(site_name)s! Click the link below to create an "
+"account."
+msgstr ""
+"Vous avez reçu une invitation à rejoindre %(site_name)s ! Cliquez le lien "
+"suivant pour créer un compte."
 
 #: bookwyrm/templates/email/invite/text_content.html:8
 msgid "Learn more about this instance:"
@@ -716,8 +798,13 @@ msgstr "En savoir plus sur cete instance :"
 #: bookwyrm/templates/email/password_reset/html_content.html:6
 #: bookwyrm/templates/email/password_reset/text_content.html:4
 #, python-format
-msgid "You requested to reset your %(site_name)s password. Click the link below to set a new password and log in to your account."
-msgstr "Une demande de réinitialisation de votre mot de passe sur <i>%(site_name)s</i> a été initialisée. Cliquez le lien suivant pour définir un nouveau mot de passe et vous connecter à votre compte."
+msgid ""
+"You requested to reset your %(site_name)s password. Click the link below to "
+"set a new password and log in to your account."
+msgstr ""
+"Une demande de réinitialisation de votre mot de passe sur <i>%(site_name)s</"
+"i> a été initialisée. Cliquez le lien suivant pour définir un nouveau mot de "
+"passe et vous connecter à votre compte."
 
 #: bookwyrm/templates/email/password_reset/html_content.html:9
 #: bookwyrm/templates/password_reset.html:4
@@ -729,8 +816,11 @@ msgstr "Changez le mot de passe"
 
 #: bookwyrm/templates/email/password_reset/html_content.html:13
 #: bookwyrm/templates/email/password_reset/text_content.html:8
-msgid "If you didn't request to reset your password, you can ignore this email."
-msgstr "Si vous n’avez pas demandé la réinitialisation de votre mot de passe, vous pouvez ignorer cet email."
+msgid ""
+"If you didn't request to reset your password, you can ignore this email."
+msgstr ""
+"Si vous n’avez pas demandé la réinitialisation de votre mot de passe, vous "
+"pouvez ignorer cet email."
 
 #: bookwyrm/templates/email/password_reset/subject.html:2
 #, python-format
@@ -743,7 +833,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:87
+#: bookwyrm/templates/layout.html:88
 msgid "Direct Messages"
 msgstr "Messages directs"
 
@@ -776,17 +866,21 @@ msgid "Local"
 msgstr "Local"
 
 #: bookwyrm/templates/feed/feed.html:25
+#: bookwyrm/templates/settings/edit_server.html:40
 msgid "Federated"
 msgstr "Fédéré"
 
 #: bookwyrm/templates/feed/feed.html:33
 #, python-format
 msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
-msgstr "charger le(s) <span data-poll=\"stream/%(tab)s\">0</span> statut(s) non lu(s)"
+msgstr ""
+"charger le(s) <span data-poll=\"stream/%(tab)s\">0</span> statut(s) non lu(s)"
 
 #: bookwyrm/templates/feed/feed.html:48
-msgid "There aren't any activities right now! Try following a user to get started"
-msgstr "Aucune activité pour l’instant ! Abonnez‑vous à quelqu’un pour commencer"
+msgid ""
+"There aren't any activities right now! Try following a user to get started"
+msgstr ""
+"Aucune activité pour l’instant ! Abonnez‑vous à quelqu’un pour commencer"
 
 #: bookwyrm/templates/feed/feed.html:56
 #: bookwyrm/templates/get_started/users.html:6
@@ -798,13 +892,14 @@ msgid "Updates"
 msgstr "Mises à jour"
 
 #: bookwyrm/templates/feed/feed_layout.html:11
-#: bookwyrm/templates/layout.html:58
+#: bookwyrm/templates/layout.html:59
 #: bookwyrm/templates/user/books_header.html:3
 msgid "Your books"
 msgstr "Vos livres"
 
 #: bookwyrm/templates/feed/feed_layout.html:13
-msgid "There are no books here right now! Try searching for a book to get started"
+msgid ""
+"There are no books here right now! Try searching for a book to get started"
 msgstr "Aucun livre ici pour l’instant ! Cherchez un livre pour commencer"
 
 #: bookwyrm/templates/feed/feed_layout.html:24
@@ -853,7 +948,7 @@ msgid "What are you reading?"
 msgstr "Que lisez‑vous ?"
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:58
+#: bookwyrm/templates/lists/list.html:101
 msgid "Search for a book"
 msgstr "Chercher un livre"
 
@@ -867,14 +962,16 @@ msgstr "Aucun livre trouvé pour « %(query)s »"
 #: bookwyrm/templates/get_started/books.html:11
 #, python-format
 msgid "You can add books when you start using %(site_name)s."
-msgstr "Vous pourrez ajouter des livres lorsque vous commencerez à utiliser %(site_name)s."
+msgstr ""
+"Vous pourrez ajouter des livres lorsque vous commencerez à utiliser "
+"%(site_name)s."
 
 #: bookwyrm/templates/get_started/books.html:16
 #: bookwyrm/templates/get_started/books.html:17
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
-#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
-#: bookwyrm/templates/lists/list.html:62
+#: bookwyrm/templates/layout.html:38 bookwyrm/templates/layout.html:39
+#: bookwyrm/templates/lists/list.html:105
 msgid "Search"
 msgstr "Chercher"
 
@@ -888,7 +985,7 @@ msgid "Popular on %(site_name)s"
 msgstr "Populaire sur %(site_name)s"
 
 #: bookwyrm/templates/get_started/books.html:51
-#: bookwyrm/templates/lists/list.html:75
+#: bookwyrm/templates/lists/list.html:118
 msgid "No books found"
 msgstr "Aucun livre trouvé"
 
@@ -957,8 +1054,12 @@ msgid "Show this account in suggested users:"
 msgstr "Afficher ce compte dans ceux suggérés :"
 
 #: bookwyrm/templates/get_started/profile.html:52
-msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users."
-msgstr "Votre compte sera listé dans le répertoire et pourra être recommandé à d’autres utilisateurs ou utilisatrices de BookWyrm."
+msgid ""
+"Your account will show up in the directory, and may be recommended to other "
+"BookWyrm users."
+msgstr ""
+"Votre compte sera listé dans le répertoire et pourra être recommandé à "
+"d’autres utilisateurs ou utilisatrices de BookWyrm."
 
 #: bookwyrm/templates/get_started/users.html:11
 msgid "Search for a user"
@@ -982,8 +1083,12 @@ msgstr "Modifier le défi"
 #: bookwyrm/templates/goal.html:30
 #: bookwyrm/templates/snippets/goal_card.html:13
 #, python-format
-msgid "Set a goal for how many books you'll finish reading in %(year)s, and track your progress throughout the year."
-msgstr "Définissez un nombre de livre à lire comme objectif pour %(year)s, et suivezvotre progression au fil de l’année."
+msgid ""
+"Set a goal for how many books you'll finish reading in %(year)s, and track "
+"your progress throughout the year."
+msgstr ""
+"Définissez un nombre de livre à lire comme objectif pour %(year)s, et "
+"suivezvotre progression au fil de l’année."
 
 #: bookwyrm/templates/goal.html:39
 #, python-format
@@ -1001,7 +1106,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "Livres de %(username)s en %(year)s"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/layout.html:97
+#: bookwyrm/templates/layout.html:98
 msgid "Import Books"
 msgstr "Importer des livres"
 
@@ -1022,6 +1127,7 @@ msgid "Privacy setting for imported reviews:"
 msgstr "Confidentialité des critiques importées :"
 
 #: bookwyrm/templates/import.html:48
+#: bookwyrm/templates/settings/server_blocklist.html:64
 msgid "Import"
 msgstr "Importer"
 
@@ -1064,8 +1170,12 @@ msgstr "Items non importés"
 
 #: bookwyrm/templates/import_status.html:44
 #, python-format
-msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
-msgstr "Sauter en bas de liste pour sélectionner les %(failed_count)s items n’ayant pu être importés."
+msgid ""
+"Jump to the bottom of the list to select the %(failed_count)s items which "
+"failed to import."
+msgstr ""
+"Sauter en bas de liste pour sélectionner les %(failed_count)s items n’ayant "
+"pu être importés."
 
 #: bookwyrm/templates/import_status.html:79
 msgid "Select all"
@@ -1086,12 +1196,12 @@ msgstr "Livre"
 
 #: bookwyrm/templates/import_status.html:115
 #: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/user/shelf.html:76
+#: bookwyrm/templates/user/shelf.html:75 bookwyrm/templates/user/shelf.html:93
 msgid "Title"
 msgstr "Titre"
 
 #: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/user/shelf.html:77
+#: bookwyrm/templates/user/shelf.html:76 bookwyrm/templates/user/shelf.html:96
 msgid "Author"
 msgstr "Auteur ou autrice"
 
@@ -1128,86 +1238,94 @@ msgstr "Résultats de recherche pour « %(query)s »"
 msgid "Matching Books"
 msgstr "Livres correspondants"
 
-#: bookwyrm/templates/layout.html:33
+#: bookwyrm/templates/layout.html:34
 msgid "Search for a book or user"
 msgstr "Chercher un livre ou un compte"
 
-#: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48
+#: bookwyrm/templates/layout.html:48 bookwyrm/templates/layout.html:49
 msgid "Main navigation menu"
 msgstr "Menu de navigation principal "
 
-#: bookwyrm/templates/layout.html:61
+#: bookwyrm/templates/layout.html:62
 msgid "Feed"
 msgstr "Fil d’actualité"
 
-#: bookwyrm/templates/layout.html:102
+#: bookwyrm/templates/layout.html:103
 msgid "Settings"
 msgstr "Paramètres"
 
-#: bookwyrm/templates/layout.html:111
-#: bookwyrm/templates/settings/admin_layout.html:24
+#: bookwyrm/templates/layout.html:112
+#: bookwyrm/templates/settings/admin_layout.html:31
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
 #: bookwyrm/templates/settings/manage_invites.html:15
 msgid "Invites"
 msgstr "Invitations"
 
-#: bookwyrm/templates/layout.html:118
+#: bookwyrm/templates/layout.html:119
 msgid "Admin"
 msgstr "Admin"
 
-#: bookwyrm/templates/layout.html:125
+#: bookwyrm/templates/layout.html:126
 msgid "Log out"
 msgstr "Se déconnecter"
 
-#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
+#: bookwyrm/templates/layout.html:134 bookwyrm/templates/layout.html:135
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:10
 msgid "Notifications"
 msgstr "Notifications"
 
-#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155
+#: bookwyrm/templates/layout.html:152 bookwyrm/templates/layout.html:156
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "Nom du compte :"
 
-#: bookwyrm/templates/layout.html:156
+#: bookwyrm/templates/layout.html:157
 msgid "password"
 msgstr "Mot de passe"
 
-#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:158 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr "Mot de passe oublié ?"
 
-#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:161 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "Se connecter"
 
-#: bookwyrm/templates/layout.html:168
+#: bookwyrm/templates/layout.html:169
 msgid "Join"
 msgstr "Rejoindre"
 
-#: bookwyrm/templates/layout.html:191
+#: bookwyrm/templates/layout.html:195
 msgid "About this server"
 msgstr "À propos de ce serveur"
 
-#: bookwyrm/templates/layout.html:195
+#: bookwyrm/templates/layout.html:199
 msgid "Contact site admin"
 msgstr "Contacter l’administrateur du site"
 
-#: bookwyrm/templates/layout.html:202
-#, python-format
-msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
-msgstr "Soutenez %(site_name)s avec <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
-
 #: bookwyrm/templates/layout.html:206
-msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
-msgstr "BookWyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports de bogues via <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+#, python-format
+msgid ""
+"Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">"
+"%(support_title)s</a>"
+msgstr ""
+"Soutenez %(site_name)s avec <a href=\"%(support_link)s\" target=\"_blank\">"
+"%(support_title)s</a>"
+
+#: bookwyrm/templates/layout.html:210
+msgid ""
+"BookWyrm is open source software. You can contribute or report issues on <a "
+"href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgstr ""
+"BookWyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports "
+"de bogues via <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
 #: bookwyrm/templates/lists/create_form.html:5
-#: bookwyrm/templates/lists/lists.html:19
+#: bookwyrm/templates/lists/lists.html:20
 msgid "Create List"
 msgstr "Créer une liste"
 
@@ -1271,7 +1389,7 @@ msgid "Anyone can suggest books, subject to your approval"
 msgstr "N’importe qui peut suggérer des livres, soumis à votre approbation"
 
 #: bookwyrm/templates/lists/form.html:31
-#: bookwyrm/templates/moderation/reports.html:24
+#: bookwyrm/templates/moderation/reports.html:25
 msgid "Open"
 msgstr "Ouverte"
 
@@ -1279,42 +1397,76 @@ msgstr "Ouverte"
 msgid "Anyone can add books to this list"
 msgstr "N’importe qui peut suggérer des livres"
 
-#: bookwyrm/templates/lists/list.html:17
+#: bookwyrm/templates/lists/list.html:19
+msgid "You successfully suggested a book for this list!"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:21
+#, fuzzy
+#| msgid "Anyone can add books to this list"
+msgid "You successfully added a book to this list!"
+msgstr "N’importe qui peut suggérer des livres"
+
+#: bookwyrm/templates/lists/list.html:27
 msgid "This list is currently empty"
 msgstr "Cette liste est vide actuellement"
 
-#: bookwyrm/templates/lists/list.html:35
+#: bookwyrm/templates/lists/list.html:46
 #, python-format
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "Ajoutée par <a href=\"%(user_path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/lists/list.html:41
+#: bookwyrm/templates/lists/list.html:58
+#, fuzzy
+#| msgid "Sent"
+msgid "Set"
+msgstr "Envoyé(e)s"
+
+#: bookwyrm/templates/lists/list.html:61
+#, fuzzy
+#| msgid "List curation:"
+msgid "List position"
+msgstr "Modération de la liste :"
+
+#: bookwyrm/templates/lists/list.html:67
 #: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr "Supprimer"
 
-#: bookwyrm/templates/lists/list.html:54
+#: bookwyrm/templates/lists/list.html:80 bookwyrm/templates/lists/list.html:92
+#, fuzzy
+#| msgid "Your Lists"
+msgid "Sort List"
+msgstr "Vos listes"
+
+#: bookwyrm/templates/lists/list.html:86
+#, fuzzy
+#| msgid "Directory"
+msgid "Direction"
+msgstr "Répertoire"
+
+#: bookwyrm/templates/lists/list.html:97
 msgid "Add Books"
 msgstr "Ajouter des livres"
 
-#: bookwyrm/templates/lists/list.html:54
+#: bookwyrm/templates/lists/list.html:97
 msgid "Suggest Books"
 msgstr "Suggérer des livres"
 
-#: bookwyrm/templates/lists/list.html:63
+#: bookwyrm/templates/lists/list.html:106
 msgid "search"
 msgstr "Chercher"
 
-#: bookwyrm/templates/lists/list.html:69
+#: bookwyrm/templates/lists/list.html:112
 msgid "Clear search"
 msgstr "Vider la requête"
 
-#: bookwyrm/templates/lists/list.html:74
+#: bookwyrm/templates/lists/list.html:117
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
 msgstr "Aucun livre trouvé pour la requête « %(query)s »"
 
-#: bookwyrm/templates/lists/list.html:90
+#: bookwyrm/templates/lists/list.html:133
 msgid "Suggest"
 msgstr "Suggérer"
 
@@ -1339,59 +1491,39 @@ msgstr "Contacter un administrateur pour obtenir une invitation"
 msgid "More about this site"
 msgstr "En savoir plus sur ce site"
 
-#: bookwyrm/templates/moderation/report.html:5
 #: bookwyrm/templates/moderation/report.html:6
+#: bookwyrm/templates/moderation/report.html:7
 #: bookwyrm/templates/moderation/report_preview.html:6
 #, python-format
 msgid "Report #%(report_id)s: %(username)s"
 msgstr "Signalement #%(report_id)s : %(username)s"
 
-#: bookwyrm/templates/moderation/report.html:10
+#: bookwyrm/templates/moderation/report.html:11
 msgid "Back to reports"
 msgstr "Retour aux signalements"
 
-#: bookwyrm/templates/moderation/report.html:18
-msgid "Actions"
-msgstr "Actions"
-
-#: bookwyrm/templates/moderation/report.html:19
-msgid "View user profile"
-msgstr "Voir le profil"
-
-#: bookwyrm/templates/moderation/report.html:22
-#: bookwyrm/templates/snippets/status/status_options.html:35
-#: bookwyrm/templates/snippets/user_options.html:13
-msgid "Send direct message"
-msgstr "Envoyer un message direct"
-
-#: bookwyrm/templates/moderation/report.html:27
-msgid "Deactivate user"
-msgstr "Désactiver le compte"
-
-#: bookwyrm/templates/moderation/report.html:29
-msgid "Reactivate user"
-msgstr "Réactiver le compte"
-
-#: bookwyrm/templates/moderation/report.html:36
+#: bookwyrm/templates/moderation/report.html:23
 msgid "Moderator Comments"
 msgstr "Commentaires de l’équipe de modération"
 
-#: bookwyrm/templates/moderation/report.html:54
+#: bookwyrm/templates/moderation/report.html:41
 #: bookwyrm/templates/snippets/create_status.html:28
-#: bookwyrm/templates/snippets/create_status_form.html:44
+#: bookwyrm/templates/snippets/create_status_form.html:53
 msgid "Comment"
 msgstr "Commentaire"
 
-#: bookwyrm/templates/moderation/report.html:59
+#: bookwyrm/templates/moderation/report.html:46
 msgid "Reported statuses"
 msgstr "Statuts signalés"
 
-#: bookwyrm/templates/moderation/report.html:61
+#: bookwyrm/templates/moderation/report.html:48
 msgid "No statuses reported"
 msgstr "Aucun statut signalé"
 
-#: bookwyrm/templates/moderation/report.html:67
-msgid "Statuses has been deleted"
+#: bookwyrm/templates/moderation/report.html:54
+#, fuzzy
+#| msgid "Statuses has been deleted"
+msgid "Status has been deleted"
 msgstr "Les statuts ont été supprimés"
 
 #: bookwyrm/templates/moderation/report_modal.html:6
@@ -1399,12 +1531,14 @@ msgstr "Les statuts ont été supprimés"
 msgid "Report @%(username)s"
 msgstr "Signaler @%(username)s"
 
-#: bookwyrm/templates/moderation/report_modal.html:21
+#: bookwyrm/templates/moderation/report_modal.html:23
 #, python-format
 msgid "This report will be sent to %(site_name)s's moderators for review."
-msgstr "Ce signalement sera envoyé à l’équipe de modération de %(site_name)s pour traitement."
+msgstr ""
+"Ce signalement sera envoyé à l’équipe de modération de %(site_name)s pour "
+"traitement."
 
-#: bookwyrm/templates/moderation/report_modal.html:22
+#: bookwyrm/templates/moderation/report_modal.html:24
 msgid "More info about this report:"
 msgstr "En savoir plus sur ce signalement :"
 
@@ -1431,21 +1565,21 @@ msgid "Reports: %(server_name)s"
 msgstr "Signalements : %(server_name)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
-#: bookwyrm/templates/moderation/reports.html:16
-#: bookwyrm/templates/settings/admin_layout.html:28
+#: bookwyrm/templates/moderation/reports.html:17
+#: bookwyrm/templates/settings/admin_layout.html:35
 msgid "Reports"
 msgstr "Signalements"
 
-#: bookwyrm/templates/moderation/reports.html:13
+#: bookwyrm/templates/moderation/reports.html:14
 #, python-format
 msgid "Reports: <small>%(server_name)s</small>"
 msgstr "Signalements: <small>%(server_name)s</small>"
 
-#: bookwyrm/templates/moderation/reports.html:27
+#: bookwyrm/templates/moderation/reports.html:28
 msgid "Resolved"
 msgstr "Résolus"
 
-#: bookwyrm/templates/moderation/reports.html:34
+#: bookwyrm/templates/moderation/reports.html:37
 msgid "No reports found."
 msgstr "Aucun signalement trouvé."
 
@@ -1455,18 +1589,30 @@ msgstr "Supprimer les notifications"
 
 #: bookwyrm/templates/notifications.html:53
 #, python-format
-msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr "a ajouté votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a> à ses favoris"
+msgid ""
+"favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+"a ajouté votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</"
+"em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:55
 #, python-format
-msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
-msgstr "a ajouté votre <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a> à ses favoris"
+msgid ""
+"favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+"a ajouté votre <a href=\"%(related_path)s\">commentaire sur <em>"
+"%(book_title)s</em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:57
 #, python-format
-msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr "a ajouté votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a> à ses favoris"
+msgid ""
+"favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+"a ajouté votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</"
+"em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:59
 #, python-format
@@ -1475,18 +1621,30 @@ msgstr "a ajouté votre <a href=\"%(related_path)s\">statut</a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:64
 #, python-format
-msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr "vous a mentionné dans sa <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a>"
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">review of <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+"vous a mentionné dans sa <a href=\"%(related_path)s\">critique de <em>"
+"%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:66
 #, python-format
-msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
-msgstr "vous a mentionné dans son <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a>"
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">comment on <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+"vous a mentionné dans son <a href=\"%(related_path)s\">commentaire sur <em>"
+"%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:68
 #, python-format
-msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr "vous a mentionné dans sa <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a>"
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">quote from <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+"vous a mentionné dans sa <a href=\"%(related_path)s\">citation de <em>"
+"%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:70
 #, python-format
@@ -1495,23 +1653,39 @@ msgstr "vous a mentionné dans son <a href=\"%(related_path)s\">statut</a>"
 
 #: bookwyrm/templates/notifications.html:75
 #, python-format
-msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">critique de <em>%(book_title)s</em></a>"
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">review of <em>%(book_title)s</em></a>"
+msgstr ""
+"<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s"
+"\">critique de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:77
 #, python-format
-msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
-msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">commentaire sur <em>%(book_title)s</em></a>"
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">comment on <em>%(book_title)s</em></a>"
+msgstr ""
+"<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s"
+"\">commentaire sur <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:79
 #, python-format
-msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">citation de <em>%(book_title)s</em></a>"
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">quote from <em>%(book_title)s</em></a>"
+msgstr ""
+"<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s"
+"\">citation de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:81
 #, python-format
-msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
-msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">statut</a>"
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">status</a>"
+msgstr ""
+"<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s"
+"\">statut</a>"
 
 #: bookwyrm/templates/notifications.html:85
 msgid "followed you"
@@ -1523,18 +1697,30 @@ msgstr "vous a envoyé une demande d’abonnement"
 
 #: bookwyrm/templates/notifications.html:94
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr "a partagé votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a>"
+msgid ""
+"boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></"
+"a>"
+msgstr ""
+"a partagé votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</"
+"em></a>"
 
 #: bookwyrm/templates/notifications.html:96
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
-msgstr "a partagé votre <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a>"
+msgid ""
+"boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></"
+"a>"
+msgstr ""
+"a partagé votre <a href=\"%(related_path)s\">commentaire sur <em>"
+"%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:98
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr "a partagé votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a>"
+msgid ""
+"boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+"a partagé votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</"
+"em></a>"
 
 #: bookwyrm/templates/notifications.html:100
 #, python-format
@@ -1543,13 +1729,21 @@ msgstr "a partagé votre <a href=\"%(related_path)s\">statut</a>"
 
 #: bookwyrm/templates/notifications.html:104
 #, python-format
-msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
-msgstr " a ajouté <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre liste « <a href=\"%(list_path)s\">%(list_name)s</a> »"
+msgid ""
+" added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
+"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgstr ""
+" a ajouté <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre "
+"liste « <a href=\"%(list_path)s\">%(list_name)s</a> »"
 
 #: bookwyrm/templates/notifications.html:106
 #, python-format
-msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
-msgstr " a suggégré l’ajout de <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre liste « <a href=\"%(list_path)s/curate\">%(list_name)s</a> »"
+msgid ""
+" suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to "
+"your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgstr ""
+" a suggégré l’ajout de <em><a href=\"%(book_path)s\">%(book_title)s</a></em> "
+"à votre liste « <a href=\"%(list_path)s/curate\">%(list_name)s</a> »"
 
 #: bookwyrm/templates/notifications.html:110
 #, python-format
@@ -1559,7 +1753,8 @@ msgstr "Votre <a href=\"/import/%(related_id)s\">importation</a> est terminée."
 #: bookwyrm/templates/notifications.html:113
 #, python-format
 msgid "A new <a href=\"%(path)s\">report</a> needs moderation."
-msgstr "Un nouveau <a href=\"%(path)s\">signalement</a> a besoin d’être traité."
+msgstr ""
+"Un nouveau <a href=\"%(path)s\">signalement</a> a besoin d’être traité."
 
 #: bookwyrm/templates/notifications.html:139
 msgid "You're all caught up!"
@@ -1572,7 +1767,8 @@ msgstr "Confirmez le mot de passe :"
 
 #: bookwyrm/templates/password_reset_request.html:14
 msgid "A link to reset your password will be sent to your email address"
-msgstr "Un lien pour changer votre mot de passe sera envoyé à votre addresse email"
+msgstr ""
+"Un lien pour changer votre mot de passe sera envoyé à votre addresse email"
 
 #: bookwyrm/templates/password_reset_request.html:28
 msgid "Reset password"
@@ -1606,12 +1802,17 @@ msgstr "Modifier le profil"
 
 #: bookwyrm/templates/preferences/edit_user.html:46
 msgid "Show set reading goal prompt in feed:"
-msgstr "Afficher le message pour définir un défi lecture dans le fil d’actualité :"
+msgstr ""
+"Afficher le message pour définir un défi lecture dans le fil d’actualité :"
 
 #: bookwyrm/templates/preferences/edit_user.html:62
 #, python-format
-msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
-msgstr "Votre compte sera listé dans le <a href=\"%(path)s\">répertoire</a> et pourra être recommandé à d’autres utilisateurs ou utilisatrices de BookWyrm."
+msgid ""
+"Your account will show up in the <a href=\"%(path)s\">directory</a>, and may "
+"be recommended to other BookWyrm users."
+msgstr ""
+"Votre compte sera listé dans le <a href=\"%(path)s\">répertoire</a> et "
+"pourra être recommandé à d’autres utilisateurs ou utilisatrices de BookWyrm."
 
 #: bookwyrm/templates/preferences/edit_user.html:65
 msgid "Preferred Timezone: "
@@ -1654,118 +1855,197 @@ msgstr "Aucune liste trouvée pour « %(query)s »"
 msgid "Administration"
 msgstr "Administration"
 
-#: bookwyrm/templates/settings/admin_layout.html:15
+#: bookwyrm/templates/settings/admin_layout.html:22
 msgid "Manage Users"
 msgstr "Gérer les comptes"
 
-#: bookwyrm/templates/settings/admin_layout.html:19
-#: bookwyrm/templates/settings/user_admin.html:3
-#: bookwyrm/templates/settings/user_admin.html:10
+#: bookwyrm/templates/settings/admin_layout.html:26
+#: bookwyrm/templates/user_admin/user_admin.html:3
+#: bookwyrm/templates/user_admin/user_admin.html:10
 msgid "Users"
 msgstr "Comptes"
 
-#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/admin_layout.html:39
 #: bookwyrm/templates/settings/federation.html:3
 #: bookwyrm/templates/settings/federation.html:5
 msgid "Federated Servers"
 msgstr "Serveurs fédérés"
 
-#: bookwyrm/templates/settings/admin_layout.html:37
+#: bookwyrm/templates/settings/admin_layout.html:44
 msgid "Instance Settings"
 msgstr "Paramètres de l’instance"
 
-#: bookwyrm/templates/settings/admin_layout.html:41
+#: bookwyrm/templates/settings/admin_layout.html:48
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr "Paramètres du site"
 
-#: bookwyrm/templates/settings/admin_layout.html:44
+#: bookwyrm/templates/settings/admin_layout.html:51
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr "Information sur l’instance"
 
-#: bookwyrm/templates/settings/admin_layout.html:45
+#: bookwyrm/templates/settings/admin_layout.html:52
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr "Images"
 
-#: bookwyrm/templates/settings/admin_layout.html:46
+#: bookwyrm/templates/settings/admin_layout.html:53
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr "Contenu du pied de page"
 
-#: bookwyrm/templates/settings/admin_layout.html:47
+#: bookwyrm/templates/settings/admin_layout.html:54
 #: bookwyrm/templates/settings/site.html:77
 msgid "Registration"
 msgstr "Enregistrement"
 
-#: bookwyrm/templates/settings/federated_server.html:7
+#: bookwyrm/templates/settings/edit_server.html:3
+#: bookwyrm/templates/settings/edit_server.html:6
+#: bookwyrm/templates/settings/edit_server.html:20
+#: bookwyrm/templates/settings/federation.html:9
+#: bookwyrm/templates/settings/federation.html:10
+#: bookwyrm/templates/settings/server_blocklist.html:3
+#: bookwyrm/templates/settings/server_blocklist.html:20
+#, fuzzy
+#| msgid "Add cover"
+msgid "Add server"
+msgstr "Ajouter une couverture"
+
+#: bookwyrm/templates/settings/edit_server.html:7
+#: bookwyrm/templates/settings/federated_server.html:12
+#: bookwyrm/templates/settings/server_blocklist.html:7
 msgid "Back to server list"
 msgstr "Retour à la liste des serveurs"
 
-#: bookwyrm/templates/settings/federated_server.html:12
-msgid "Details"
-msgstr "Détails"
+#: bookwyrm/templates/settings/edit_server.html:16
+#: bookwyrm/templates/settings/server_blocklist.html:16
+#, fuzzy
+#| msgid "Import book"
+msgid "Import block list"
+msgstr "Importer le livre"
 
-#: bookwyrm/templates/settings/federated_server.html:15
-msgid "Software:"
-msgstr "Logiciel :"
+#: bookwyrm/templates/settings/edit_server.html:30
+#, fuzzy
+#| msgid "Instance Name:"
+msgid "Instance:"
+msgstr "Nom de l’instance :"
 
-#: bookwyrm/templates/settings/federated_server.html:19
-msgid "Version:"
-msgstr "Description :"
-
-#: bookwyrm/templates/settings/federated_server.html:23
+#: bookwyrm/templates/settings/edit_server.html:37
+#: bookwyrm/templates/settings/federated_server.html:29
+#: bookwyrm/templates/user_admin/user_info.html:34
 msgid "Status:"
 msgstr "Statut :"
 
-#: bookwyrm/templates/settings/federated_server.html:30
+#: bookwyrm/templates/settings/edit_server.html:41
+#: bookwyrm/templates/settings/federated_server.html:9
+#, fuzzy
+#| msgid "Block"
+msgid "Blocked"
+msgstr "Bloquer"
+
+#: bookwyrm/templates/settings/edit_server.html:48
+#: bookwyrm/templates/settings/federated_server.html:21
+#: bookwyrm/templates/user_admin/user_info.html:26
+msgid "Software:"
+msgstr "Logiciel :"
+
+#: bookwyrm/templates/settings/edit_server.html:55
+#: bookwyrm/templates/settings/federated_server.html:25
+#: bookwyrm/templates/user_admin/user_info.html:30
+msgid "Version:"
+msgstr "Description :"
+
+#: bookwyrm/templates/settings/edit_server.html:64
+msgid "Notes:"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:18
+msgid "Details"
+msgstr "Détails"
+
+#: bookwyrm/templates/settings/federated_server.html:36
 #: bookwyrm/templates/user/user_layout.html:50
 msgid "Activity"
 msgstr "Activité"
 
-#: bookwyrm/templates/settings/federated_server.html:33
+#: bookwyrm/templates/settings/federated_server.html:39
 msgid "Users:"
 msgstr "Comptes :"
 
-#: bookwyrm/templates/settings/federated_server.html:36
-#: bookwyrm/templates/settings/federated_server.html:43
+#: bookwyrm/templates/settings/federated_server.html:42
+#: bookwyrm/templates/settings/federated_server.html:49
 msgid "View all"
 msgstr "Voir tous"
 
-#: bookwyrm/templates/settings/federated_server.html:40
+#: bookwyrm/templates/settings/federated_server.html:46
 msgid "Reports:"
 msgstr "Signalements :"
 
-#: bookwyrm/templates/settings/federated_server.html:47
+#: bookwyrm/templates/settings/federated_server.html:53
 msgid "Followed by us:"
 msgstr "Suivi par nous :"
 
-#: bookwyrm/templates/settings/federated_server.html:53
+#: bookwyrm/templates/settings/federated_server.html:59
 msgid "Followed by them:"
 msgstr "Suivi par eux :"
 
-#: bookwyrm/templates/settings/federated_server.html:59
+#: bookwyrm/templates/settings/federated_server.html:65
 msgid "Blocked by us:"
 msgstr "Bloqués par nous :"
 
-#: bookwyrm/templates/settings/federation.html:13
+#: bookwyrm/templates/settings/federated_server.html:77
+#: bookwyrm/templates/user_admin/user_info.html:39
+msgid "Notes"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:80
+#, fuzzy
+#| msgid "Edit Book"
+msgid "Edit"
+msgstr "Modifier le livre"
+
+#: bookwyrm/templates/settings/federated_server.html:100
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:3
+msgid "Actions"
+msgstr "Actions"
+
+#: bookwyrm/templates/settings/federated_server.html:104
+#: bookwyrm/templates/snippets/block_button.html:5
+msgid "Block"
+msgstr "Bloquer"
+
+#: bookwyrm/templates/settings/federated_server.html:105
+msgid "All users from this instance will be deactivated."
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:110
+#: bookwyrm/templates/snippets/block_button.html:10
+msgid "Un-block"
+msgstr "Débloquer"
+
+#: bookwyrm/templates/settings/federated_server.html:111
+msgid "All users from this instance will be re-activated."
+msgstr ""
+
+#: bookwyrm/templates/settings/federation.html:20
+#: bookwyrm/templates/user_admin/server_filter.html:5
 msgid "Server name"
 msgstr "Nom du serveur"
 
-#: bookwyrm/templates/settings/federation.html:17
+#: bookwyrm/templates/settings/federation.html:24
 msgid "Date federated"
 msgstr "Date de fédération"
 
-#: bookwyrm/templates/settings/federation.html:21
+#: bookwyrm/templates/settings/federation.html:28
 msgid "Software"
 msgstr "Logiciel"
 
-#: bookwyrm/templates/settings/federation.html:24
+#: bookwyrm/templates/settings/federation.html:31
 #: bookwyrm/templates/settings/manage_invite_requests.html:44
 #: bookwyrm/templates/settings/status_filter.html:5
-#: bookwyrm/templates/settings/user_admin.html:32
+#: bookwyrm/templates/user_admin/user_admin.html:34
 msgid "Status"
 msgstr "Statut"
 
@@ -1875,6 +2155,27 @@ msgstr "Nombre de fois utilisée"
 msgid "No active invites"
 msgstr "Aucune invitation active"
 
+#: bookwyrm/templates/settings/server_blocklist.html:6
+#, fuzzy
+#| msgid "Import Books"
+msgid "Import Blocklist"
+msgstr "Importer des livres"
+
+#: bookwyrm/templates/settings/server_blocklist.html:26
+#: bookwyrm/templates/snippets/goal_progress.html:5
+msgid "Success!"
+msgstr "Bravo !"
+
+#: bookwyrm/templates/settings/server_blocklist.html:30
+#, fuzzy
+#| msgid "Successfully imported"
+msgid "Successfully blocked:"
+msgstr "Importation réussie"
+
+#: bookwyrm/templates/settings/server_blocklist.html:32
+msgid "Failed:"
+msgstr ""
+
 #: bookwyrm/templates/settings/site.html:15
 msgid "Instance Name:"
 msgstr "Nom de l’instance :"
@@ -1931,67 +2232,28 @@ msgstr "Autoriser les demandes d’invitation :"
 msgid "Registration closed text:"
 msgstr "Texte affiché lorsque les enregistrements sont clos :"
 
-#: bookwyrm/templates/settings/user_admin.html:7
-#, python-format
-msgid "Users: <small>%(server_name)s</small>"
-msgstr "Comptes : <small>%(server_name)s</small>"
-
-#: bookwyrm/templates/settings/user_admin.html:20
-msgid "Username"
-msgstr "Nom du compte"
-
-#: bookwyrm/templates/settings/user_admin.html:24
-msgid "Date Added"
-msgstr "Date d’ajout"
-
-#: bookwyrm/templates/settings/user_admin.html:28
-msgid "Last Active"
-msgstr "Dernière activité"
-
-#: bookwyrm/templates/settings/user_admin.html:36
-msgid "Remote server"
-msgstr "Serveur distant"
-
-#: bookwyrm/templates/settings/user_admin.html:45
-msgid "Active"
-msgstr "Actif"
-
-#: bookwyrm/templates/settings/user_admin.html:45
-msgid "Inactive"
-msgstr "Inactif"
-
-#: bookwyrm/templates/settings/user_admin.html:50
-msgid "Not set"
-msgstr "Non défini"
-
-#: bookwyrm/templates/snippets/block_button.html:5
-msgid "Block"
-msgstr "Bloquer"
-
-#: bookwyrm/templates/snippets/block_button.html:10
-msgid "Un-block"
-msgstr "Débloquer"
-
 #: bookwyrm/templates/snippets/book_cover.html:20
 #: bookwyrm/templates/snippets/search_result_text.html:10
 msgid "No cover"
 msgstr "Aucune couverture"
 
-#: bookwyrm/templates/snippets/book_titleby.html:3
+#: bookwyrm/templates/snippets/book_titleby.html:4
 #, python-format
 msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgstr "<a href=\"%(path)s\">%(title)s</a> par "
 
 #: bookwyrm/templates/snippets/boost_button.html:8
 #: bookwyrm/templates/snippets/boost_button.html:9
-#: bookwyrm/templates/snippets/status/status_body.html:52
-#: bookwyrm/templates/snippets/status/status_body.html:53
-msgid "Boost status"
-msgstr "Partager le statut"
+#, fuzzy
+#| msgid "boosted"
+msgid "Boost"
+msgstr "partagé"
 
+#: bookwyrm/templates/snippets/boost_button.html:15
 #: bookwyrm/templates/snippets/boost_button.html:16
-#: bookwyrm/templates/snippets/boost_button.html:17
-msgid "Un-boost status"
+#, fuzzy
+#| msgid "Un-boost status"
+msgid "Un-boost"
 msgstr "Annuler le partage du statut"
 
 #: bookwyrm/templates/snippets/content_warning_field.html:3
@@ -2010,58 +2272,60 @@ msgstr "Critique"
 msgid "Quote"
 msgstr "Citation"
 
-#: bookwyrm/templates/snippets/create_status_form.html:18
+#: bookwyrm/templates/snippets/create_status_form.html:20
 msgid "Comment:"
 msgstr "Commentaire :"
 
-#: bookwyrm/templates/snippets/create_status_form.html:20
+#: bookwyrm/templates/snippets/create_status_form.html:22
 msgid "Quote:"
 msgstr "Citation :"
 
-#: bookwyrm/templates/snippets/create_status_form.html:22
+#: bookwyrm/templates/snippets/create_status_form.html:24
 msgid "Review:"
 msgstr "Critique :"
 
-#: bookwyrm/templates/snippets/create_status_form.html:29
-#: bookwyrm/templates/user/shelf.html:81
-msgid "Rating"
-msgstr "Note"
+#: bookwyrm/templates/snippets/create_status_form.html:42
+#: bookwyrm/templates/snippets/status/layout.html:30
+#: bookwyrm/templates/snippets/status/layout.html:48
+#: bookwyrm/templates/snippets/status/layout.html:49
+msgid "Reply"
+msgstr "Répondre"
 
-#: bookwyrm/templates/snippets/create_status_form.html:56
+#: bookwyrm/templates/snippets/create_status_form.html:67
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
 msgid "Progress:"
 msgstr "Progression :"
 
-#: bookwyrm/templates/snippets/create_status_form.html:63
+#: bookwyrm/templates/snippets/create_status_form.html:75
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr "pages"
 
-#: bookwyrm/templates/snippets/create_status_form.html:64
+#: bookwyrm/templates/snippets/create_status_form.html:76
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr "pourcent"
 
-#: bookwyrm/templates/snippets/create_status_form.html:69
+#: bookwyrm/templates/snippets/create_status_form.html:82
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "sur %(pages)s pages"
 
-#: bookwyrm/templates/snippets/create_status_form.html:81
+#: bookwyrm/templates/snippets/create_status_form.html:97
 msgid "Include spoiler alert"
 msgstr "Afficher une alerte spoiler"
 
-#: bookwyrm/templates/snippets/create_status_form.html:88
+#: bookwyrm/templates/snippets/create_status_form.html:104
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:19
 msgid "Private"
 msgstr "Privé"
 
-#: bookwyrm/templates/snippets/create_status_form.html:99
+#: bookwyrm/templates/snippets/create_status_form.html:115
 msgid "Post"
 msgstr "Publier"
 
@@ -2071,24 +2335,27 @@ msgstr "Supprimer ces dates de lecture ?"
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
 #, python-format
-msgid "You are deleting this readthrough and its %(count)s associated progress updates."
+msgid ""
+"You are deleting this readthrough and its %(count)s associated progress "
+"updates."
 msgstr "Vous avez supprimé ce résumé et ses %(count)s progressions associées."
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
 #: bookwyrm/templates/snippets/follow_request_buttons.html:13
+#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:391
 msgid "Delete"
 msgstr "Supprimer"
 
 #: bookwyrm/templates/snippets/fav_button.html:7
-#: bookwyrm/templates/snippets/fav_button.html:8
-#: bookwyrm/templates/snippets/status/status_body.html:56
-#: bookwyrm/templates/snippets/status/status_body.html:57
-msgid "Like status"
-msgstr "Ajouter le statut aux favoris"
+#: bookwyrm/templates/snippets/fav_button.html:9
+msgid "Like"
+msgstr ""
 
 #: bookwyrm/templates/snippets/fav_button.html:15
 #: bookwyrm/templates/snippets/fav_button.html:16
-msgid "Un-like status"
+#, fuzzy
+#| msgid "Un-like status"
+msgid "Un-like"
 msgstr "Retirer le statut des favoris"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:7
@@ -2128,14 +2395,6 @@ msgstr "Accepter"
 msgid "No rating"
 msgstr "Aucune note"
 
-#: bookwyrm/templates/snippets/form_rate_stars.html:45
-#: bookwyrm/templates/snippets/stars.html:7
-#, python-format
-msgid "%(rating)s star"
-msgid_plural "%(rating)s stars"
-msgstr[0] "%(rating)s étoile"
-msgstr[1] "%(rating)s étoiles"
-
 #: bookwyrm/templates/snippets/generated_status/goal.html:1
 #, python-format
 msgid "set a goal to read %(counter)s book in %(year)s"
@@ -2145,17 +2404,24 @@ msgstr[1] "souhaite lire %(counter)s livres en %(year)s"
 
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
 #, python-format
-msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
-msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
+msgid ""
+"Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
+msgid_plural ""
+"Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
 msgstr[0] "A noté <a href=\"%(path)s\">%(title)s</a> : %(display_rating)s star"
-msgstr[1] "A noté <a href=\"%(path)s\">%(title)s</a> : %(display_rating)s stars"
+msgstr[1] ""
+"A noté <a href=\"%(path)s\">%(title)s</a> : %(display_rating)s stars"
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4
 #, python-format
-msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
-msgid_plural "Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
-msgstr[0] "Critique de « %(book_title)s » (%(display_rating)s star): %(review_title)s"
-msgstr[1] "Critique de « %(book_title)s » (%(display_rating)s stars) : %(review_title)s"
+msgid ""
+"Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
+msgid_plural ""
+"Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
+msgstr[0] ""
+"Critique de « %(book_title)s » (%(display_rating)s star): %(review_title)s"
+msgstr[1] ""
+"Critique de « %(book_title)s » (%(display_rating)s stars) : %(review_title)s"
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:8
 #, python-format
@@ -2164,8 +2430,12 @@ msgstr "Critique de « %(book_title)s » : %(review_title)s"
 
 #: bookwyrm/templates/snippets/goal_card.html:23
 #, python-format
-msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
-msgstr "Vous pouvez définir ou changer votre défi lecture à n’importe quel moment depuis votre <a href=\"%(path)s\">profil</a>"
+msgid ""
+"You can set or change your reading goal any time from your <a href=\"%(path)s"
+"\">profile page</a>"
+msgstr ""
+"Vous pouvez définir ou changer votre défi lecture à n’importe quel moment "
+"depuis votre <a href=\"%(path)s\">profil</a>"
 
 #: bookwyrm/templates/snippets/goal_form.html:9
 msgid "Reading goal:"
@@ -2190,10 +2460,6 @@ msgstr "Publier sur le fil d’actualité"
 msgid "Set goal"
 msgstr "Valider ce défi"
 
-#: bookwyrm/templates/snippets/goal_progress.html:5
-msgid "Success!"
-msgstr "Bravo !"
-
 #: bookwyrm/templates/snippets/goal_progress.html:7
 #, python-format
 msgid "%(percent)s%% complete!"
@@ -2201,13 +2467,20 @@ msgstr "%(percent)s%% terminé !"
 
 #: bookwyrm/templates/snippets/goal_progress.html:10
 #, python-format
-msgid "You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
-msgstr "Vous avez lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s livres</a>."
+msgid ""
+"You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgstr ""
+"Vous avez lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s livres</"
+"a>."
 
 #: bookwyrm/templates/snippets/goal_progress.html:12
 #, python-format
-msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
-msgstr "%(username)s a lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s livres</a>."
+msgid ""
+"%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s "
+"books</a>."
+msgstr ""
+"%(username)s a lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s "
+"livres</a>."
 
 #: bookwyrm/templates/snippets/page_text.html:4
 #, python-format
@@ -2313,22 +2586,22 @@ msgid "Report"
 msgstr "Signaler"
 
 #: bookwyrm/templates/snippets/rss_title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:21
+#: bookwyrm/templates/snippets/status/status_header.html:34
 msgid "rated"
 msgstr "a noté"
 
 #: bookwyrm/templates/snippets/rss_title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:23
+#: bookwyrm/templates/snippets/status/status_header.html:36
 msgid "reviewed"
 msgstr "a écrit une critique de"
 
 #: bookwyrm/templates/snippets/rss_title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:25
+#: bookwyrm/templates/snippets/status/status_header.html:38
 msgid "commented on"
 msgstr "a commenté"
 
 #: bookwyrm/templates/snippets/rss_title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:27
+#: bookwyrm/templates/snippets/status/status_header.html:40
 msgid "quoted"
 msgstr "a cité"
 
@@ -2351,7 +2624,7 @@ msgid "Finish \"<em>%(book_title)s</em>\""
 msgstr "Terminer « <em>%(book_title)s</em> »"
 
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:35
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:34
 msgid "Update progress"
 msgstr "Progression de la mise à jour"
 
@@ -2372,7 +2645,7 @@ msgstr "Terminer la lecture"
 msgid "Want to read"
 msgstr "Je veux le lire"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:48
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
 #, python-format
 msgid "Remove from %(name)s"
 msgstr "Retirer de %(name)s"
@@ -2387,64 +2660,63 @@ msgstr "Commencer « <em>%(book_title)s</em> »"
 msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgstr "A envie de lire « <em>%(book_title)s</em> »"
 
+#: bookwyrm/templates/snippets/status/content_status.html:67
+#: bookwyrm/templates/snippets/trimmed_text.html:14
+msgid "Show more"
+msgstr "Déplier"
+
+#: bookwyrm/templates/snippets/status/content_status.html:82
+#: bookwyrm/templates/snippets/trimmed_text.html:29
+msgid "Show less"
+msgstr "Replier"
+
+#: bookwyrm/templates/snippets/status/content_status.html:112
+msgid "Open image in new window"
+msgstr "Ouvrir l’image dans une nouvelle fenêtre"
+
+#: bookwyrm/templates/snippets/status/layout.html:22
+#: bookwyrm/templates/snippets/status/status_options.html:17
+msgid "Delete status"
+msgstr "Supprimer le statut"
+
+#: bookwyrm/templates/snippets/status/layout.html:52
+#: bookwyrm/templates/snippets/status/layout.html:53
+msgid "Boost status"
+msgstr "Partager le statut"
+
+#: bookwyrm/templates/snippets/status/layout.html:56
+#: bookwyrm/templates/snippets/status/layout.html:57
+msgid "Like status"
+msgstr "Ajouter le statut aux favoris"
+
 #: bookwyrm/templates/snippets/status/status.html:9
 msgid "boosted"
 msgstr "partagé"
 
-#: bookwyrm/templates/snippets/status/status_body.html:27
-#: bookwyrm/templates/snippets/status/status_options.html:18
-msgid "Delete status"
-msgstr "Supprimer le statut"
-
-#: bookwyrm/templates/snippets/status/status_body.html:35
-#: bookwyrm/templates/snippets/status/status_body.html:48
-#: bookwyrm/templates/snippets/status/status_body.html:49
-msgid "Reply"
-msgstr "Répondre"
-
-#: bookwyrm/templates/snippets/status/status_content.html:52
-#: bookwyrm/templates/snippets/trimmed_text.html:15
-msgid "Show more"
-msgstr "Déplier"
-
-#: bookwyrm/templates/snippets/status/status_content.html:67
-#: bookwyrm/templates/snippets/trimmed_text.html:30
-msgid "Show less"
-msgstr "Replier"
-
-#: bookwyrm/templates/snippets/status/status_content.html:97
-msgid "Open image in new window"
-msgstr "Ouvrir l’image dans une nouvelle fenêtre"
-
-#: bookwyrm/templates/snippets/status/status_header.html:32
+#: bookwyrm/templates/snippets/status/status_header.html:44
 #, python-format
-msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">review</a>"
-msgstr "a répondu à la <a href=\"%(status_path)s\">critique</a> de <a href=\"%(user_path)s\">%(username)s</a>"
-
-#: bookwyrm/templates/snippets/status/status_header.html:34
-#, python-format
-msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">comment</a>"
-msgstr "a répondu au <a href=\"%(status_path)s\">commentaire</a> de <a href=\"%(user_path)s\">%(username)s</a>"
-
-#: bookwyrm/templates/snippets/status/status_header.html:36
-#, python-format
-msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">quote</a>"
-msgstr "a répondu à la <a href=\"%(status_path)s\">citation</a> de <a href=\"%(user_path)s\">%(username)s</a>"
-
-#: bookwyrm/templates/snippets/status/status_header.html:38
-#, python-format
-msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
-msgstr "a répondu au <a href=\"%(status_path)s\">statut</a> de <a href=\"%(user_path)s\">%(username)s</a>"
+msgid ""
+"replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
+"\"%(status_path)s\">status</a>"
+msgstr ""
+"a répondu au <a href=\"%(status_path)s\">statut</a> de <a href="
+"\"%(user_path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/snippets/status/status_options.html:7
 #: bookwyrm/templates/snippets/user_options.html:7
 msgid "More options"
 msgstr "Plus d’options"
 
-#: bookwyrm/templates/snippets/status/status_options.html:27
+#: bookwyrm/templates/snippets/status/status_options.html:26
 msgid "Delete & re-draft"
 msgstr "Supprimer & recommencer la rédaction"
 
+#: bookwyrm/templates/snippets/status/status_options.html:35
+#: bookwyrm/templates/snippets/user_options.html:13
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:6
+msgid "Send direct message"
+msgstr "Envoyer un message direct"
+
 #: bookwyrm/templates/snippets/switch_edition_button.html:5
 msgid "Switch to this edition"
 msgstr "Changer vers cette édition"
@@ -2457,19 +2729,6 @@ msgstr "Trié par ordre croissant"
 msgid "Sorted descending"
 msgstr "Trié par ordre décroissant"
 
-#: bookwyrm/templates/snippets/tag.html:14
-msgid "Remove tag"
-msgstr "Supprimer le tag"
-
-#: bookwyrm/templates/snippets/tag.html:18
-msgid "Add tag"
-msgstr "Ajouter un tag"
-
-#: bookwyrm/templates/tag.html:9
-#, python-format
-msgid "Books tagged \"%(tag.name)s\""
-msgstr "Livres tagués « %(tag.name)s »"
-
 #: bookwyrm/templates/user/books_header.html:5
 #, python-format
 msgid "%(username)s's books"
@@ -2517,7 +2776,7 @@ msgstr "Listes : %(username)s"
 msgid "Create list"
 msgstr "Créer une liste"
 
-#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:56
+#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:51
 msgid "All books"
 msgstr "Tous les livres"
 
@@ -2529,23 +2788,23 @@ msgstr "Créer l’étagère"
 msgid "Edit shelf"
 msgstr "Modifier l’étagère"
 
-#: bookwyrm/templates/user/shelf.html:78
+#: bookwyrm/templates/user/shelf.html:77 bookwyrm/templates/user/shelf.html:99
 msgid "Shelved"
 msgstr "Ajouté à une étagère"
 
-#: bookwyrm/templates/user/shelf.html:79
+#: bookwyrm/templates/user/shelf.html:78 bookwyrm/templates/user/shelf.html:103
 msgid "Started"
 msgstr "Commencé"
 
-#: bookwyrm/templates/user/shelf.html:80
+#: bookwyrm/templates/user/shelf.html:79 bookwyrm/templates/user/shelf.html:106
 msgid "Finished"
 msgstr "Terminé"
 
-#: bookwyrm/templates/user/shelf.html:129
+#: bookwyrm/templates/user/shelf.html:132
 msgid "This shelf is empty."
 msgstr "Cette étagère est vide"
 
-#: bookwyrm/templates/user/shelf.html:135
+#: bookwyrm/templates/user/shelf.html:138
 msgid "Delete shelf"
 msgstr "Supprimer l’étagère"
 
@@ -2608,6 +2867,79 @@ msgstr[1] "%(counter)s abonnements"
 msgid "%(counter)s following"
 msgstr "%(counter)s abonnements"
 
+#: bookwyrm/templates/user_admin/user.html:11
+#, fuzzy
+#| msgid "Back to reports"
+msgid "Back to users"
+msgstr "Retour aux signalements"
+
+#: bookwyrm/templates/user_admin/user_admin.html:7
+#, python-format
+msgid "Users: <small>%(server_name)s</small>"
+msgstr "Comptes : <small>%(server_name)s</small>"
+
+#: bookwyrm/templates/user_admin/user_admin.html:22
+#: bookwyrm/templates/user_admin/username_filter.html:5
+msgid "Username"
+msgstr "Nom du compte"
+
+#: bookwyrm/templates/user_admin/user_admin.html:26
+msgid "Date Added"
+msgstr "Date d’ajout"
+
+#: bookwyrm/templates/user_admin/user_admin.html:30
+msgid "Last Active"
+msgstr "Dernière activité"
+
+#: bookwyrm/templates/user_admin/user_admin.html:38
+msgid "Remote server"
+msgstr "Serveur distant"
+
+#: bookwyrm/templates/user_admin/user_admin.html:47
+msgid "Active"
+msgstr "Actif"
+
+#: bookwyrm/templates/user_admin/user_admin.html:47
+msgid "Inactive"
+msgstr "Inactif"
+
+#: bookwyrm/templates/user_admin/user_admin.html:52
+#: bookwyrm/templates/user_admin/user_info.html:49
+msgid "Not set"
+msgstr "Non défini"
+
+#: bookwyrm/templates/user_admin/user_info.html:5
+#, fuzzy
+#| msgid "Details"
+msgid "User details"
+msgstr "Détails"
+
+#: bookwyrm/templates/user_admin/user_info.html:14
+msgid "View user profile"
+msgstr "Voir le profil"
+
+#: bookwyrm/templates/user_admin/user_info.html:20
+#, fuzzy
+#| msgid "Instance Settings"
+msgid "Instance details"
+msgstr "Paramètres de l’instance"
+
+#: bookwyrm/templates/user_admin/user_info.html:46
+msgid "View instance"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:11
+msgid "Suspend user"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:13
+msgid "Un-suspend user"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:21
+msgid "Access level:"
+msgstr ""
+
 #: bookwyrm/views/password.py:32
 msgid "No user with that email address was found."
 msgstr "Aucun compte avec cette adresse email n’a été trouvé."
@@ -2617,6 +2949,1444 @@ msgstr "Aucun compte avec cette adresse email n’a été trouvé."
 msgid "A password reset link sent to %s"
 msgstr "Un lien de réinitialisation a été envoyé à %s."
 
+#: venv3/lib/python3.8/site-packages/_pytest/config/argparsing.py:442
+#, python-format
+msgid "ambiguous option: %(option)s could match %(matches)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/contrib/messages/apps.py:7
+#, fuzzy
+#| msgid "All messages"
+msgid "Messages"
+msgstr "Tous les messages"
+
+#: venv3/lib/python3.8/site-packages/django/contrib/sitemaps/apps.py:7
+msgid "Site Maps"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/contrib/staticfiles/apps.py:9
+msgid "Static Files"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/contrib/syndication/apps.py:7
+msgid "Syndication"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/paginator.py:45
+msgid "That page number is not an integer"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/paginator.py:47
+msgid "That page number is less than 1"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/paginator.py:52
+msgid "That page contains no results"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:32
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid value."
+msgstr "Adresse email :"
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:103
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:659
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid URL."
+msgstr "Adresse email :"
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:155
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid integer."
+msgstr "Adresse email :"
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:166
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid email address."
+msgstr "Adresse email :"
+
+#. Translators: "letters" means latin letters: a-z and A-Z.
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:240
+msgid ""
+"Enter a valid “slug� consisting of letters, numbers, underscores or hyphens."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:247
+msgid ""
+"Enter a valid “slug� consisting of Unicode letters, numbers, underscores, or "
+"hyphens."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:256
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:276
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid IPv4 address."
+msgstr "Adresse email :"
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:261
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:277
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid IPv6 address."
+msgstr "Adresse email :"
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:271
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:275
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Adresse email :"
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:305
+msgid "Enter only digits separated by commas."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:311
+#, python-format
+msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:343
+#, python-format
+msgid "Ensure this value is less than or equal to %(limit_value)s."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:352
+#, python-format
+msgid "Ensure this value is greater than or equal to %(limit_value)s."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:362
+#, python-format
+msgid ""
+"Ensure this value has at least %(limit_value)d character (it has "
+"%(show_value)d)."
+msgid_plural ""
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:377
+#, python-format
+msgid ""
+"Ensure this value has at most %(limit_value)d character (it has "
+"%(show_value)d)."
+msgid_plural ""
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:396
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:291
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:326
+#, fuzzy
+#| msgid "Series number:"
+msgid "Enter a number."
+msgstr "Numéro dans la série :"
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:398
+#, python-format
+msgid "Ensure that there are no more than %(max)s digit in total."
+msgid_plural "Ensure that there are no more than %(max)s digits in total."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:403
+#, python-format
+msgid "Ensure that there are no more than %(max)s decimal place."
+msgid_plural "Ensure that there are no more than %(max)s decimal places."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:408
+#, python-format
+msgid ""
+"Ensure that there are no more than %(max)s digit before the decimal point."
+msgid_plural ""
+"Ensure that there are no more than %(max)s digits before the decimal point."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:470
+#, python-format
+msgid ""
+"File extension “%(extension)s� is not allowed. Allowed extensions are: "
+"%(allowed_extensions)s."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:522
+msgid "Null characters are not allowed."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/base.py:1181
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:759
+msgid "and"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/base.py:1183
+#, fuzzy, python-format
+#| msgid "A user with this email already exists."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr "Cet email est déjà associé à un compte."
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:104
+#, fuzzy, python-format
+#| msgid "%(value)s is not a valid remote_id"
+msgid "Value %(value)r is not a valid choice."
+msgstr "%(value)s n’est pas une remote_id valide."
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:105
+#, fuzzy
+#| msgid "This shelf is empty."
+msgid "This field cannot be null."
+msgstr "Cette étagère est vide"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:106
+msgid "This field cannot be blank."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:107
+#, fuzzy, python-format
+#| msgid "A user with this email already exists."
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "Cet email est déjà associé à un compte."
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:130
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:937
+#, python-format
+msgid "“%(value)s� value must be either True or False."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:938
+#, python-format
+msgid "“%(value)s� value must be either True, False, or None."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:940
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:981
+#, python-format
+msgid "String (up to %(max_length)s)"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1045
+#, fuzzy
+#| msgid "No active invites"
+msgid "Comma-separated integers"
+msgstr "Aucune invitation active"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1094
+#, python-format
+msgid ""
+"“%(value)s� value has an invalid date format. It must be in YYYY-MM-DD "
+"format."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1096
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1239
+#, python-format
+msgid ""
+"“%(value)s� value has the correct format (YYYY-MM-DD) but it is an invalid "
+"date."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1099
+msgid "Date (without time)"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1237
+#, python-format
+msgid ""
+"“%(value)s� value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1241
+#, python-format
+msgid ""
+"“%(value)s� value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"[TZ]) but it is an invalid date/time."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1245
+msgid "Date (with time)"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1393
+#, python-format
+msgid "“%(value)s� value must be a decimal number."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1395
+#, fuzzy
+#| msgid "Series number:"
+msgid "Decimal number"
+msgstr "Numéro dans la série :"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1534
+#, python-format
+msgid ""
+"“%(value)s� value has an invalid format. It must be in [DD] [[HH:]MM:]ss[."
+"uuuuuu] format."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1537
+#, fuzzy
+#| msgid "List curation:"
+msgid "Duration"
+msgstr "Modération de la liste :"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1587
+#, fuzzy
+#| msgid "Email address:"
+msgid "Email address"
+msgstr "Adresse email :"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1610
+msgid "File path"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1676
+#, python-format
+msgid "“%(value)s� value must be a float."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1678
+msgid "Floating point number"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1716
+#, python-format
+msgid "“%(value)s� value must be an integer."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1718
+msgid "Integer"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1801
+#, fuzzy
+#| msgid "No active invites"
+msgid "Big (8 byte) integer"
+msgstr "Aucune invitation active"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1817
+#, fuzzy
+#| msgid "Email address:"
+msgid "IPv4 address"
+msgstr "Adresse email :"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1848
+#, fuzzy
+#| msgid "Email address:"
+msgid "IP address"
+msgstr "Adresse email :"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1928
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1929
+#, python-format
+msgid "“%(value)s� value must be either None, True or False."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1931
+msgid "Boolean (Either True, False or None)"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1966
+#, fuzzy
+#| msgid "No active invites"
+msgid "Positive integer"
+msgstr "Aucune invitation active"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1979
+#, fuzzy
+#| msgid "No active invites"
+msgid "Positive small integer"
+msgstr "Aucune invitation active"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1993
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2025
+msgid "Small integer"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2032
+msgid "Text"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2060
+#, python-format
+msgid ""
+"“%(value)s� value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"format."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2062
+#, python-format
+msgid ""
+"“%(value)s� value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"invalid time."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2065
+msgid "Time"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2191
+msgid "URL"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2213
+msgid "Raw binary data"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2278
+#, fuzzy, python-format
+#| msgid "%(value)s is not a valid username"
+msgid "“%(value)s� is not a valid UUID."
+msgstr "%(value)s n’est pas un nom de compte valide."
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2280
+msgid "Universally unique identifier"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/files.py:221
+msgid "File"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/files.py:360
+#, fuzzy
+#| msgid "Images"
+msgid "Image"
+msgstr "Images"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:778
+#, python-format
+msgid "%(model)s instance with %(field)s %(value)r does not exist."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:780
+msgid "Foreign Key (type determined by related field)"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1012
+#, fuzzy
+#| msgid "Relationships"
+msgid "One-to-one relationship"
+msgstr "Relations"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1066
+#, fuzzy, python-format
+#| msgid "Relationships"
+msgid "%(from)s-%(to)s relationship"
+msgstr "Relations"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1067
+#, fuzzy, python-format
+#| msgid "Relationships"
+msgid "%(from)s-%(to)s relationships"
+msgstr "Relations"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1109
+#, fuzzy
+#| msgid "Relationships"
+msgid "Many-to-many relationship"
+msgstr "Relations"
+
+#. Translators: If found as last label character, these punctuation
+#. characters will prevent the default label_suffix to be appended to the label
+#: venv3/lib/python3.8/site-packages/django/forms/boundfield.py:149
+msgid ":?.!"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:53
+#, fuzzy
+#| msgid "This shelf is empty."
+msgid "This field is required."
+msgstr "Cette étagère est vide"
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:246
+#, fuzzy
+#| msgid "Series number:"
+msgid "Enter a whole number."
+msgstr "Numéro dans la série :"
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:397
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:1127
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid date."
+msgstr "Adresse email :"
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:421
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:1128
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid time."
+msgstr "Adresse email :"
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:443
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid date/time."
+msgstr "Adresse email :"
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:472
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid duration."
+msgstr "Adresse email :"
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:473
+#, python-brace-format
+msgid "The number of days must be between {min_days} and {max_days}."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:533
+msgid "No file was submitted. Check the encoding type on the form."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:534
+msgid "No file was submitted."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:535
+#, fuzzy
+#| msgid "This shelf is empty."
+msgid "The submitted file is empty."
+msgstr "Cette étagère est vide"
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:537
+#, python-format
+msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
+msgid_plural ""
+"Ensure this filename has at most %(max)d characters (it has %(length)d)."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:540
+msgid "Please either submit a file or check the clear checkbox, not both."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:601
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:763
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:853
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:1275
+#, python-format
+msgid "Select a valid choice. %(value)s is not one of the available choices."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:854
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:969
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:1274
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a list of values."
+msgstr "Adresse email :"
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:970
+msgid "Enter a complete value."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:1186
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid UUID."
+msgstr "Adresse email :"
+
+#. Translators: This is the default suffix added to form field labels
+#: venv3/lib/python3.8/site-packages/django/forms/forms.py:81
+msgid ":"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/forms.py:207
+#, python-format
+msgid "(Hidden field %(name)s) %(error)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:93
+msgid "ManagementForm data is missing or has been tampered with"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:345
+#, python-format
+msgid "Please submit %d or fewer forms."
+msgid_plural "Please submit %d or fewer forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:352
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:379
+#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:386
+#, fuzzy
+#| msgid "Order by"
+msgid "Order"
+msgstr "Trier par"
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:754
+#, python-format
+msgid "Please correct the duplicate data for %(field)s."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:758
+#, python-format
+msgid "Please correct the duplicate data for %(field)s, which must be unique."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:764
+#, python-format
+msgid ""
+"Please correct the duplicate data for %(field_name)s which must be unique "
+"for the %(lookup)s in %(date_field)s."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:773
+msgid "Please correct the duplicate values below."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:1094
+msgid "The inline value did not match the parent instance."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:1161
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:1277
+#, fuzzy, python-format
+#| msgid "%(value)s is not a valid username"
+msgid "“%(pk)s� is not a valid value."
+msgstr "%(value)s n’est pas un nom de compte valide."
+
+#: venv3/lib/python3.8/site-packages/django/forms/utils.py:162
+#, python-format
+msgid ""
+"%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:395
+msgid "Clear"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:396
+#, fuzzy
+#| msgid "Started reading"
+msgid "Currently"
+msgstr "Commencer la lecture"
+
+#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:397
+#, fuzzy
+#| msgid "Change shelf"
+msgid "Change"
+msgstr "Changer d’étagère"
+
+#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:709
+msgid "Unknown"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:710
+msgid "Yes"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:711
+msgid "No"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:788
+msgid "yes,no,maybe"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:817
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:834
+#, python-format
+msgid "%(size)d byte"
+msgid_plural "%(size)d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:836
+#, python-format
+msgid "%s KB"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:838
+#, python-format
+msgid "%s MB"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:840
+#, python-format
+msgid "%s GB"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:842
+#, python-format
+msgid "%s TB"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:844
+#, python-format
+msgid "%s PB"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:62
+msgid "p.m."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:63
+msgid "a.m."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:68
+msgid "PM"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:69
+msgid "AM"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:150
+msgid "midnight"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:152
+msgid "noon"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:295
+msgid "Monday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:296
+msgid "Tuesday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:297
+msgid "Wednesday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:298
+msgid "Thursday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:299
+msgid "Friday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:7
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:300
+msgid "Saturday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:7
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:301
+msgid "Sunday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
+msgid "Mon"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
+msgid "Tue"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
+msgid "Wed"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
+msgid "Thu"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
+msgid "Fri"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:11
+#, fuzzy
+#| msgid "Status"
+msgid "Sat"
+msgstr "Statut"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:11
+msgid "Sun"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:281
+msgid "January"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:282
+msgid "February"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:283
+#, fuzzy
+#| msgid "Search"
+msgid "March"
+msgstr "Chercher"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:284
+msgid "April"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:285
+msgid "May"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:286
+msgid "June"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:287
+msgid "July"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:288
+msgid "August"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:289
+#, fuzzy
+#| msgid "Series number:"
+msgid "September"
+msgstr "Numéro dans la série :"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:290
+msgid "October"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:291
+msgid "November"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:16
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:292
+#, fuzzy
+#| msgid "Series number:"
+msgid "December"
+msgstr "Numéro dans la série :"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "jan"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "feb"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "mar"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "apr"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "may"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "jun"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "jul"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "aug"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "sep"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "oct"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "nov"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "dec"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:23
+msgctxt "abbrev. month"
+msgid "Jan."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:24
+msgctxt "abbrev. month"
+msgid "Feb."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:25
+#, fuzzy
+#| msgid "Search"
+msgctxt "abbrev. month"
+msgid "March"
+msgstr "Chercher"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:26
+msgctxt "abbrev. month"
+msgid "April"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:27
+msgctxt "abbrev. month"
+msgid "May"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:28
+msgctxt "abbrev. month"
+msgid "June"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:29
+msgctxt "abbrev. month"
+msgid "July"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:30
+msgctxt "abbrev. month"
+msgid "Aug."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:31
+msgctxt "abbrev. month"
+msgid "Sept."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:32
+msgctxt "abbrev. month"
+msgid "Oct."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:33
+msgctxt "abbrev. month"
+msgid "Nov."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:34
+msgctxt "abbrev. month"
+msgid "Dec."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:37
+msgctxt "alt. month"
+msgid "January"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:38
+msgctxt "alt. month"
+msgid "February"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:39
+#, fuzzy
+#| msgid "Search"
+msgctxt "alt. month"
+msgid "March"
+msgstr "Chercher"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:40
+msgctxt "alt. month"
+msgid "April"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:41
+msgctxt "alt. month"
+msgid "May"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:42
+msgctxt "alt. month"
+msgid "June"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:43
+msgctxt "alt. month"
+msgid "July"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:44
+msgctxt "alt. month"
+msgid "August"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:45
+#, fuzzy
+#| msgid "Series number:"
+msgctxt "alt. month"
+msgid "September"
+msgstr "Numéro dans la série :"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:46
+msgctxt "alt. month"
+msgid "October"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:47
+msgctxt "alt. month"
+msgid "November"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:48
+#, fuzzy
+#| msgid "Series number:"
+msgctxt "alt. month"
+msgid "December"
+msgstr "Numéro dans la série :"
+
+#: venv3/lib/python3.8/site-packages/django/utils/ipv6.py:8
+#, fuzzy
+#| msgid "Email address:"
+msgid "This is not a valid IPv6 address."
+msgstr "Adresse email :"
+
+#: venv3/lib/python3.8/site-packages/django/utils/text.py:69
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s…"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/text.py:235
+msgid "or"
+msgstr ""
+
+#. Translators: This string is used as a separator between list elements
+#: venv3/lib/python3.8/site-packages/django/utils/text.py:254
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:83
+msgid ", "
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:9
+#, python-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:10
+#, python-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:11
+#, python-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:12
+#, python-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:13
+#, python-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:14
+#, python-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:72
+msgid "0 minutes"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:110
+msgid "Forbidden"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:111
+msgid "CSRF verification failed. Request aborted."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:115
+msgid ""
+"You are seeing this message because this HTTPS site requires a “Referer "
+"header� to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:120
+msgid ""
+"If you have configured your browser to disable “Referer� headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for “same-"
+"origin� requests."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:124
+msgid ""
+"If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
+"including the “Referrer-Policy: no-referrer� header, please remove them. The "
+"CSRF protection requires the “Referer� header to do strict referer checking. "
+"If you’re concerned about privacy, use alternatives like <a rel=\"noreferrer"
+"\" …> for links to third-party sites."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:132
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:137
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for “same-origin� requests."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:142
+msgid "More information is available with DEBUG=True."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:41
+msgid "No year specified"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:61
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:111
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:208
+msgid "Date out of range"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:90
+msgid "No month specified"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:142
+msgid "No day specified"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:188
+msgid "No week specified"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:338
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:367
+#, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:589
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:623
+#, python-format
+msgid "Invalid date string “%(datestr)s� given format “%(format)s�"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/detail.py:54
+#, fuzzy, python-format
+#| msgid "No books found matching the query \"%(query)s\""
+msgid "No %(verbose_name)s found matching the query"
+msgstr "Aucun livre trouvé pour la requête « %(query)s »"
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/list.py:67
+msgid "Page is not “last�, nor can it be converted to an int."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/list.py:72
+#, python-format
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/list.py:154
+#, python-format
+msgid "Empty list and “%(class_name)s.allow_empty� is False."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/static.py:40
+msgid "Directory indexes are not allowed here."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/static.py:42
+#, python-format
+msgid "“%(path)s� does not exist"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/static.py:80
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:7
+msgid "Django: the Web framework for perfectionists with deadlines."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:346
+#, python-format
+msgid ""
+"View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
+"target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:368
+msgid "The install worked successfully! Congratulations!"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:369
+#, python-format
+msgid ""
+"You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
+"%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
+"\">DEBUG=True</a> is in your settings file and you have not configured any "
+"URLs."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:384
+msgid "Django Documentation"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:385
+msgid "Topics, references, &amp; how-to’s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:396
+msgid "Tutorial: A Polling App"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:397
+msgid "Get started with Django"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:408
+#, fuzzy
+#| msgid "Community"
+msgid "Django Community"
+msgstr "Communauté"
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:409
+msgid "Connect, get help, or contribute"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/kombu/transport/qpid.py:1301
+#, python-format
+msgid "Attempting to connect to qpid with SASL mechanism %s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/kombu/transport/qpid.py:1306
+#, python-format
+msgid "Connected to qpid with SASL mechanism %s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/kombu/transport/qpid.py:1324
+#, python-format
+msgid "Unable to connect to qpid with SASL mechanism %s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:371
+msgid "1 second ago"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:377
+msgid "1 minute ago"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:382
+msgid "1 hour ago"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:385
+#, python-format
+msgid "%(time)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:387
+msgid "yesterday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:387
+#, python-format
+msgid "yesterday at %(time)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:389
+#, python-format
+msgid "%(weekday)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:389
+#, python-format
+msgid "%(weekday)s at %(time)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:392
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:445
+#, python-format
+msgid "%(month_name)s %(day)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:394
+#, python-format
+msgid "%(month_name)s %(day)s at %(time)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:399
+#, python-format
+msgid "%(month_name)s %(day)s, %(year)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:401
+#, python-format
+msgid "%(month_name)s %(day)s, %(year)s at %(time)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:439
+#, python-format
+msgid "%(weekday)s, %(month_name)s %(day)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:462
+#, python-format
+msgid "%(commas)s and %(last)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:68
+msgctxt "law"
+msgid "right"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:69
+msgctxt "good"
+msgid "right"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:71
+#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:74
+msgctxt "organization"
+msgid "club"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:76
+#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:77
+msgctxt "stick"
+msgid "club"
+msgstr ""
+
+#~ msgid "Deactivate user"
+#~ msgstr "Désactiver le compte"
+
+#~ msgid "Reactivate user"
+#~ msgstr "Réactiver le compte"
+
+#, python-format
+#~ msgid "%(rating)s star"
+#~ msgid_plural "%(rating)s stars"
+#~ msgstr[0] "%(rating)s étoile"
+#~ msgstr[1] "%(rating)s étoiles"
+
+#, python-format
+#~ msgid ""
+#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
+#~ "\"%(status_path)s\">review</a>"
+#~ msgstr ""
+#~ "a répondu à la <a href=\"%(status_path)s\">critique</a> de <a href="
+#~ "\"%(user_path)s\">%(username)s</a>"
+
+#, python-format
+#~ msgid ""
+#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
+#~ "\"%(status_path)s\">comment</a>"
+#~ msgstr ""
+#~ "a répondu au <a href=\"%(status_path)s\">commentaire</a> de <a href="
+#~ "\"%(user_path)s\">%(username)s</a>"
+
+#, python-format
+#~ msgid ""
+#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
+#~ "\"%(status_path)s\">quote</a>"
+#~ msgstr ""
+#~ "a répondu à la <a href=\"%(status_path)s\">citation</a> de <a href="
+#~ "\"%(user_path)s\">%(username)s</a>"
+
+#~ msgid "Remove tag"
+#~ msgstr "Supprimer le tag"
+
+#~ msgid "Add tag"
+#~ msgstr "Ajouter un tag"
+
+#, python-format
+#~ msgid "Books tagged \"%(tag.name)s\""
+#~ msgstr "Livres tagués « %(tag.name)s »"
+
 #, fuzzy
 #~| msgid "Started"
 #~ msgid "Getting Started"
@@ -2630,9 +4400,6 @@ msgstr "Un lien de réinitialisation a été envoyé à %s."
 #~ msgid "Tags"
 #~ msgstr "Tags"
 
-#~ msgid "Your shelves"
-#~ msgstr "Vos étagères"
-
 #~ msgid "Your lists"
 #~ msgstr "Vos listes"
 
@@ -2674,119 +4441,6 @@ msgstr "Un lien de réinitialisation a été envoyé à %s."
 #~ msgid "Send follow request"
 #~ msgstr "Envoyer une demande d’abonnement"
 
-#, fuzzy
-#~| msgid "All messages"
-#~ msgid "Messages"
-#~ msgstr "Tous les messages"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "Enter a valid email address."
-#~ msgstr "Adresse email :"
-
-#, fuzzy
-#~| msgid "Series number:"
-#~ msgid "Enter a number."
-#~ msgstr "Numéro dans la série :"
-
-#, fuzzy
-#~| msgid "Series number:"
-#~ msgid "Decimal number"
-#~ msgstr "Numéro dans la série :"
-
-#, fuzzy
-#~| msgid "List curation:"
-#~ msgid "Duration"
-#~ msgstr "Modération de la liste :"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "Email address"
-#~ msgstr "Adresse email :"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "IPv4 address"
-#~ msgstr "Adresse email :"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "IP address"
-#~ msgstr "Adresse email :"
-
-#, fuzzy
-#~| msgid "No active invites"
-#~ msgid "Positive integer"
-#~ msgstr "Aucune invitation active"
-
-#, fuzzy
-#~| msgid "Images"
-#~ msgid "Image"
-#~ msgstr "Images"
-
-#, fuzzy
-#~| msgid "Relationships"
-#~ msgid "One-to-one relationship"
-#~ msgstr "Relations"
-
-#, fuzzy
-#~| msgid "This shelf is empty."
-#~ msgid "This field is required."
-#~ msgstr "Cette étagère est vide"
-
-#, fuzzy
-#~| msgid "This shelf is empty."
-#~ msgid "The submitted file is empty."
-#~ msgstr "Cette étagère est vide"
-
-#, fuzzy
-#~| msgid "Started reading"
-#~ msgid "Currently"
-#~ msgstr "Commencer la lecture"
-
-#, fuzzy
-#~| msgid "Change shelf"
-#~ msgid "Change"
-#~ msgstr "Changer d’étagère"
-
-#, fuzzy
-#~| msgid "Status"
-#~ msgid "Sat"
-#~ msgstr "Statut"
-
-#, fuzzy
-#~| msgid "Search"
-#~ msgid "March"
-#~ msgstr "Chercher"
-
-#, fuzzy
-#~| msgid "Series number:"
-#~ msgid "September"
-#~ msgstr "Numéro dans la série :"
-
-#, fuzzy
-#~| msgid "Search"
-#~ msgctxt "abbrev. month"
-#~ msgid "March"
-#~ msgstr "Chercher"
-
-#, fuzzy
-#~| msgid "Search"
-#~ msgctxt "alt. month"
-#~ msgid "March"
-#~ msgstr "Chercher"
-
-#, fuzzy
-#~| msgid "Series number:"
-#~ msgctxt "alt. month"
-#~ msgid "September"
-#~ msgstr "Numéro dans la série :"
-
-#, fuzzy
-#~| msgid "No books found matching the query \"%(query)s\""
-#~ msgid "No %(verbose_name)s found matching the query"
-#~ msgstr "Aucun livre trouvé pour la requête « %(query)s »"
-
 #~ msgid "Announcements"
 #~ msgstr "Annonces"
 
diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
index 66a26636..789960cc 100644
--- a/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/locale/zh_Hans/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-04 04:17+0000\n"
+"POT-Creation-Date: 2021-04-26 09:56-0700\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"
@@ -18,35 +18,66 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: bookwyrm/forms.py:226
+#: bookwyrm/forms.py:224
 msgid "A user with this email already exists."
 msgstr "已�存在使用该邮箱的用户。"
 
-#: bookwyrm/forms.py:240
+#: bookwyrm/forms.py:238
 msgid "One Day"
 msgstr "一天"
 
-#: bookwyrm/forms.py:241
+#: bookwyrm/forms.py:239
 msgid "One Week"
 msgstr "一周"
 
-#: bookwyrm/forms.py:242
+#: bookwyrm/forms.py:240
 msgid "One Month"
 msgstr "一个月"
 
-#: bookwyrm/forms.py:243
+#: bookwyrm/forms.py:241
 msgid "Does Not Expire"
 msgstr "永�失效"
 
-#: bookwyrm/forms.py:248
+#: bookwyrm/forms.py:246
 #, python-format
 msgid "%(count)d uses"
 msgstr "%(count)d 次使用"
 
-#: bookwyrm/forms.py:251
+#: bookwyrm/forms.py:249
 msgid "Unlimited"
 msgstr "���"
 
+#: bookwyrm/forms.py:293
+msgid "List Order"
+msgstr ""
+
+#: bookwyrm/forms.py:294
+#, fuzzy
+#| msgid "Title"
+msgid "Book Title"
+msgstr "标题"
+
+#: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:31
+#: bookwyrm/templates/user/shelf.html:80 bookwyrm/templates/user/shelf.html:110
+msgid "Rating"
+msgstr "评价"
+
+#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:82
+msgid "Sort By"
+msgstr ""
+
+#: bookwyrm/forms.py:301
+#, fuzzy
+#| msgid "Sorted ascending"
+msgid "Ascending"
+msgstr "��排�"
+
+#: bookwyrm/forms.py:302
+#, fuzzy
+#| msgid "Sorted ascending"
+msgid "Descending"
+msgstr "��排�"
+
 #: bookwyrm/models/fields.py:24
 #, python-format
 msgid "%(value)s is not a valid remote_id"
@@ -57,7 +88,7 @@ msgstr "%(value)s �是有效的 remote_id"
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s �是有效的用户�"
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:152
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:153
 msgid "username"
 msgstr "用户�"
 
@@ -65,23 +96,23 @@ msgstr "用户�"
 msgid "A user with that username already exists."
 msgstr "已�存在使用该用户�的用户。"
 
-#: bookwyrm/settings.py:150
+#: bookwyrm/settings.py:152
 msgid "English"
 msgstr "English（英语）"
 
-#: bookwyrm/settings.py:151
+#: bookwyrm/settings.py:153
 msgid "German"
 msgstr "Deutsch（德语）"
 
-#: bookwyrm/settings.py:152
+#: bookwyrm/settings.py:154
 msgid "Spanish"
 msgstr "Español（西�牙语）"
 
-#: bookwyrm/settings.py:153
+#: bookwyrm/settings.py:155
 msgid "French"
 msgstr "Français（法语）"
 
-#: bookwyrm/settings.py:154
+#: bookwyrm/settings.py:156
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
@@ -118,76 +149,66 @@ msgstr "维基百科"
 msgid "Books by %(name)s"
 msgstr "%(name)s 所著的书"
 
-#: bookwyrm/templates/book/book.html:21
+#: bookwyrm/templates/book/book.html:33
 #: bookwyrm/templates/discover/large-book.html:12
 #: bookwyrm/templates/discover/small-book.html:9
 msgid "by"
 msgstr "作者"
 
-#: bookwyrm/templates/book/book.html:29 bookwyrm/templates/book/book.html:30
+#: bookwyrm/templates/book/book.html:41 bookwyrm/templates/book/book.html:42
 msgid "Edit Book"
 msgstr "编辑书目"
 
-#: bookwyrm/templates/book/book.html:49
+#: bookwyrm/templates/book/book.html:61
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "添加��"
 
-#: bookwyrm/templates/book/book.html:53
+#: bookwyrm/templates/book/book.html:65
 msgid "Failed to load cover"
 msgstr "加载��失败"
 
-#: bookwyrm/templates/book/book.html:62
-msgid "ISBN:"
-msgstr "ISBN:"
-
-#: bookwyrm/templates/book/book.html:69
-#: bookwyrm/templates/book/edit_book.html:211
-msgid "OCLC Number:"
-msgstr "OCLC �:"
-
-#: bookwyrm/templates/book/book.html:76
-#: bookwyrm/templates/book/edit_book.html:215
-msgid "ASIN:"
-msgstr "ASIN:"
-
-#: bookwyrm/templates/book/book.html:85
+#: bookwyrm/templates/book/book.html:82
 msgid "View on OpenLibrary"
 msgstr "在 OpenLibrary 查看"
 
-#: bookwyrm/templates/book/book.html:94
+#: bookwyrm/templates/book/book.html:102
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s 则书评)"
 
-#: bookwyrm/templates/book/book.html:100
+#: bookwyrm/templates/book/book.html:114
 msgid "Add Description"
 msgstr "添加�述"
 
-#: bookwyrm/templates/book/book.html:107
-#: bookwyrm/templates/book/edit_book.html:101
+#: bookwyrm/templates/book/book.html:121
+#: bookwyrm/templates/book/edit_book.html:107
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "�述:"
 
-#: bookwyrm/templates/book/book.html:111
-#: bookwyrm/templates/book/edit_book.html:225
+#: bookwyrm/templates/book/book.html:125
+#: bookwyrm/templates/book/edit_book.html:240
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
+#: bookwyrm/templates/settings/edit_server.html:68
+#: bookwyrm/templates/settings/federated_server.html:93
 #: bookwyrm/templates/settings/site.html:93
 #: bookwyrm/templates/snippets/readthrough.html:75
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:38
 msgid "Save"
 msgstr "�存"
 
-#: bookwyrm/templates/book/book.html:112 bookwyrm/templates/book/book.html:161
+#: bookwyrm/templates/book/book.html:126 bookwyrm/templates/book/book.html:175
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:226
+#: bookwyrm/templates/book/edit_book.html:241
 #: bookwyrm/templates/edit_author.html:79
-#: bookwyrm/templates/moderation/report_modal.html:32
+#: bookwyrm/templates/moderation/report_modal.html:34
+#: bookwyrm/templates/settings/federated_server.html:94
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
 #: bookwyrm/templates/snippets/readthrough.html:76
@@ -198,73 +219,115 @@ msgstr "�存"
 msgid "Cancel"
 msgstr "�消"
 
-#: bookwyrm/templates/book/book.html:121
+#: bookwyrm/templates/book/book.html:135
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s/editions\">%(count)s 个版本</a>"
 
-#: bookwyrm/templates/book/book.html:129
+#: bookwyrm/templates/book/book.html:143
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "此版本在你的 <a href=\"%(path)s\">%(shelf_name)s</a> 书架上。"
 
-#: bookwyrm/templates/book/book.html:135
+#: bookwyrm/templates/book/book.html:149
 #, python-format
-msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
-msgstr "本书的 <a href=\"%(book_path)s\">�一个版本</a> 在你的 <a href=\"%(shelf_path)s\">%(shelf_name)s</a> 书架上。"
+msgid ""
+"A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a "
+"href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
+msgstr ""
+"本书的 <a href=\"%(book_path)s\">�一个版本</a> 在你的 <a href="
+"\"%(shelf_path)s\">%(shelf_name)s</a> 书架上。"
 
-#: bookwyrm/templates/book/book.html:144
+#: bookwyrm/templates/book/book.html:158
 msgid "Your reading activity"
 msgstr "你的阅读活动"
 
-#: bookwyrm/templates/book/book.html:146
+#: bookwyrm/templates/book/book.html:160
 msgid "Add read dates"
 msgstr "添加阅读日期"
 
-#: bookwyrm/templates/book/book.html:151
+#: bookwyrm/templates/book/book.html:165
 msgid "You don't have any reading activity for this book."
 msgstr "你还没有任何这本书的阅读活动。"
 
-#: bookwyrm/templates/book/book.html:158
+#: bookwyrm/templates/book/book.html:172
 msgid "Create"
 msgstr "创建"
 
-#: bookwyrm/templates/book/book.html:180
+#: bookwyrm/templates/book/book.html:194
 msgid "Subjects"
 msgstr "主题"
 
-#: bookwyrm/templates/book/book.html:191
+#: bookwyrm/templates/book/book.html:206
 msgid "Places"
 msgstr "地点"
 
-#: bookwyrm/templates/book/book.html:202 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book/book.html:217 bookwyrm/templates/layout.html:65
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "列表"
 
-#: bookwyrm/templates/book/book.html:213
+#: bookwyrm/templates/book/book.html:228
 msgid "Add to list"
 msgstr "添加到列表"
 
-#: bookwyrm/templates/book/book.html:223
+#: bookwyrm/templates/book/book.html:238
 #: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:90
+#: bookwyrm/templates/lists/list.html:133
 msgid "Add"
 msgstr "添加"
 
-#: bookwyrm/templates/book/book.html:251
+#: bookwyrm/templates/book/book.html:254
+#, fuzzy
+#| msgid "Review"
+msgid "Reviews"
+msgstr "书评"
+
+#: bookwyrm/templates/book/book.html:259
+#, fuzzy
+#| msgid "Your shelves"
+msgid "Your reviews"
+msgstr "你的书架"
+
+#: bookwyrm/templates/book/book.html:265
+#, fuzzy
+#| msgid "Your Account"
+msgid "Your comments"
+msgstr "你的��"
+
+#: bookwyrm/templates/book/book.html:271
+#, fuzzy
+#| msgid "Your books"
+msgid "Your quotes"
+msgstr "你的书目"
+
+#: bookwyrm/templates/book/book.html:305
 msgid "rated it"
 msgstr "评价了"
 
+#: bookwyrm/templates/book/book_identifiers.html:8
+msgid "ISBN:"
+msgstr "ISBN:"
+
+#: bookwyrm/templates/book/book_identifiers.html:15
+#: bookwyrm/templates/book/edit_book.html:226
+msgid "OCLC Number:"
+msgstr "OCLC �:"
+
+#: bookwyrm/templates/book/book_identifiers.html:22
+#: bookwyrm/templates/book/edit_book.html:230
+msgid "ASIN:"
+msgstr "ASIN:"
+
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:163
+#: bookwyrm/templates/book/edit_book.html:178
 msgid "Upload cover:"
 msgstr "上传��:"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:169
+#: bookwyrm/templates/book/edit_book.html:184
 msgid "Load cover from url:"
 msgstr "从网�加载��:"
 
@@ -340,86 +403,86 @@ msgstr "返回"
 msgid "Metadata"
 msgstr "元数�"
 
-#: bookwyrm/templates/book/edit_book.html:91
+#: bookwyrm/templates/book/edit_book.html:92
 msgid "Title:"
 msgstr "标题:"
 
-#: bookwyrm/templates/book/edit_book.html:96
+#: bookwyrm/templates/book/edit_book.html:100
 msgid "Subtitle:"
 msgstr "副标题:"
 
-#: bookwyrm/templates/book/edit_book.html:106
+#: bookwyrm/templates/book/edit_book.html:113
 msgid "Series:"
 msgstr "系列:"
 
-#: bookwyrm/templates/book/edit_book.html:111
+#: bookwyrm/templates/book/edit_book.html:120
 msgid "Series number:"
 msgstr "系列编�:"
 
-#: bookwyrm/templates/book/edit_book.html:117
+#: bookwyrm/templates/book/edit_book.html:126
 msgid "Publisher:"
 msgstr "出版社:"
 
-#: bookwyrm/templates/book/edit_book.html:119
+#: bookwyrm/templates/book/edit_book.html:128
 msgid "Separate multiple publishers with commas."
 msgstr "请用英文逗�(,)分开多个出版社。"
 
-#: bookwyrm/templates/book/edit_book.html:125
+#: bookwyrm/templates/book/edit_book.html:135
 msgid "First published date:"
 msgstr "�版时间:"
 
-#: bookwyrm/templates/book/edit_book.html:130
+#: bookwyrm/templates/book/edit_book.html:143
 msgid "Published date:"
 msgstr "出版时间:"
 
-#: bookwyrm/templates/book/edit_book.html:137
+#: bookwyrm/templates/book/edit_book.html:152
 msgid "Authors"
 msgstr "作者"
 
-#: bookwyrm/templates/book/edit_book.html:143
+#: bookwyrm/templates/book/edit_book.html:158
 #, python-format
 msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
 msgstr "移除 <a href=\"%(path)s\">%(name)s</a>"
 
-#: bookwyrm/templates/book/edit_book.html:148
+#: bookwyrm/templates/book/edit_book.html:163
 msgid "Add Authors:"
 msgstr "添加作者:"
 
-#: bookwyrm/templates/book/edit_book.html:149
+#: bookwyrm/templates/book/edit_book.html:164
 msgid "John Doe, Jane Smith"
 msgstr "张三, �四"
 
-#: bookwyrm/templates/book/edit_book.html:155
-#: bookwyrm/templates/user/shelf.html:75
+#: bookwyrm/templates/book/edit_book.html:170
+#: bookwyrm/templates/user/shelf.html:74
 msgid "Cover"
 msgstr "��"
 
-#: bookwyrm/templates/book/edit_book.html:182
+#: bookwyrm/templates/book/edit_book.html:197
 msgid "Physical Properties"
 msgstr "实体性质"
 
-#: bookwyrm/templates/book/edit_book.html:183
+#: bookwyrm/templates/book/edit_book.html:198
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "格�:"
 
-#: bookwyrm/templates/book/edit_book.html:191
+#: bookwyrm/templates/book/edit_book.html:206
 msgid "Pages:"
 msgstr "页数:"
 
-#: bookwyrm/templates/book/edit_book.html:198
+#: bookwyrm/templates/book/edit_book.html:213
 msgid "Book Identifiers"
 msgstr "书目标识�"
 
-#: bookwyrm/templates/book/edit_book.html:199
+#: bookwyrm/templates/book/edit_book.html:214
 msgid "ISBN 13:"
 msgstr "ISBN 13:"
 
-#: bookwyrm/templates/book/edit_book.html:203
+#: bookwyrm/templates/book/edit_book.html:218
 msgid "ISBN 10:"
 msgstr "ISBN 10:"
 
-#: bookwyrm/templates/book/edit_book.html:207
+#: bookwyrm/templates/book/edit_book.html:222
 #: bookwyrm/templates/edit_author.html:59
 msgid "Openlibrary key:"
 msgstr "Openlibrary key:"
@@ -443,44 +506,55 @@ msgstr "所有"
 msgid "Language:"
 msgstr "语言:"
 
-#: bookwyrm/templates/book/publisher_info.html:6
+#: bookwyrm/templates/book/publisher_info.html:22
+#, python-format
+msgid "%(format)s"
+msgstr ""
+
+#: bookwyrm/templates/book/publisher_info.html:24
 #, python-format
 msgid "%(format)s, %(pages)s pages"
 msgstr "%(format)s, %(pages)s 页"
 
-#: bookwyrm/templates/book/publisher_info.html:8
+#: bookwyrm/templates/book/publisher_info.html:26
 #, python-format
 msgid "%(pages)s pages"
 msgstr "%(pages)s 页"
 
-#: bookwyrm/templates/book/publisher_info.html:13
+#: bookwyrm/templates/book/publisher_info.html:38
 #, python-format
 msgid "%(languages)s language"
 msgstr "%(languages)s 语言"
 
-#: bookwyrm/templates/book/publisher_info.html:18
+#: bookwyrm/templates/book/publisher_info.html:64
 #, python-format
 msgid "Published %(date)s by %(publisher)s."
 msgstr "在 %(date)s 由 %(publisher)s 出版。"
 
-#: bookwyrm/templates/book/publisher_info.html:20
+#: bookwyrm/templates/book/publisher_info.html:66
 #, python-format
 msgid "Published %(date)s"
 msgstr "于 %(date)s 出版"
 
-#: bookwyrm/templates/book/publisher_info.html:22
+#: bookwyrm/templates/book/publisher_info.html:68
 #, python-format
 msgid "Published by %(publisher)s."
 msgstr "由 %(publisher)s 出版。"
 
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
-#: bookwyrm/templates/feed/feed_layout.html:57
+#: bookwyrm/templates/feed/feed_layout.html:70
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
 msgid "Close"
 msgstr "关闭"
 
+#: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8
+#, fuzzy
+#| msgid "Boost status"
+msgid "Compose status"
+msgstr "转�状�"
+
 #: bookwyrm/templates/directory/community_filter.html:5
 msgid "Community"
 msgstr "社区"
@@ -495,7 +569,7 @@ msgstr "跨站社区"
 
 #: bookwyrm/templates/directory/directory.html:6
 #: bookwyrm/templates/directory/directory.html:11
-#: bookwyrm/templates/layout.html:92
+#: bookwyrm/templates/layout.html:93
 msgid "Directory"
 msgstr "目录"
 
@@ -505,7 +579,9 @@ msgstr "使你的个人资料�以被其它 BookWyrm 用户�现。"
 
 #: bookwyrm/templates/directory/directory.html:26
 #, python-format
-msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
+msgid ""
+"You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</"
+"a>"
 msgstr "你�以在任何时候从你的 <a href=\"%(path)s\">个人资料设定</a> 中退出。"
 
 #: bookwyrm/templates/directory/directory.html:31
@@ -617,7 +693,7 @@ msgid "Email address:"
 msgstr "邮箱地�:"
 
 #: bookwyrm/templates/discover/landing_layout.html:70
-#: bookwyrm/templates/moderation/report_modal.html:31
+#: bookwyrm/templates/moderation/report_modal.html:33
 msgid "Submit"
 msgstr "�交"
 
@@ -670,8 +746,12 @@ msgstr "你好呀，"
 
 #: bookwyrm/templates/email/html_layout.html:21
 #, python-format
-msgid "BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a>"
-msgstr "�于 <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a> 的 BookWyrm"
+msgid ""
+"BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">"
+"%(site_name)s</a>"
+msgstr ""
+"�于 <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</"
+"a> çš„ BookWyrm"
 
 #: bookwyrm/templates/email/html_layout.html:23
 msgid "Email preference"
@@ -689,12 +769,17 @@ msgstr "立�加入"
 
 #: bookwyrm/templates/email/invite/html_content.html:15
 #, python-format
-msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
-msgstr "了解更多 <a href=\"https://%(domain)s%(about_path)s\">有关本实例的信�</a>。"
+msgid ""
+"Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</"
+"a>."
+msgstr ""
+"了解更多 <a href=\"https://%(domain)s%(about_path)s\">有关本实例的信�</a>。"
 
 #: bookwyrm/templates/email/invite/text_content.html:4
 #, python-format
-msgid "You're invited to join %(site_name)s! Click the link below to create an account."
+msgid ""
+"You're invited to join %(site_name)s! Click the link below to create an "
+"account."
 msgstr "你�邀请加入 %(site_name)s�点击下�的连接�创建��。"
 
 #: bookwyrm/templates/email/invite/text_content.html:8
@@ -704,8 +789,12 @@ msgstr "了解更多有关本实例的信�:"
 #: bookwyrm/templates/email/password_reset/html_content.html:6
 #: bookwyrm/templates/email/password_reset/text_content.html:4
 #, python-format
-msgid "You requested to reset your %(site_name)s password. Click the link below to set a new password and log in to your account."
-msgstr "你请求�置你在 %(site_name)s 的密�。点击下�的链接�设置新密�并登录你的��。"
+msgid ""
+"You requested to reset your %(site_name)s password. Click the link below to "
+"set a new password and log in to your account."
+msgstr ""
+"你请求�置你在 %(site_name)s 的密�。点击下�的链接�设置新密�并登录你的�"
+"�。"
 
 #: bookwyrm/templates/email/password_reset/html_content.html:9
 #: bookwyrm/templates/password_reset.html:4
@@ -717,7 +806,8 @@ msgstr "�设密�"
 
 #: bookwyrm/templates/email/password_reset/html_content.html:13
 #: bookwyrm/templates/email/password_reset/text_content.html:8
-msgid "If you didn't request to reset your password, you can ignore this email."
+msgid ""
+"If you didn't request to reset your password, you can ignore this email."
 msgstr "如果你没有请求�设密�，你�以忽略这�邮件。"
 
 #: bookwyrm/templates/email/password_reset/subject.html:2
@@ -731,7 +821,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr "与 <a href=\"%(path)s\">%(username)s</a> �信"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:87
+#: bookwyrm/templates/layout.html:88
 msgid "Direct Messages"
 msgstr "�信"
 
@@ -764,6 +854,7 @@ msgid "Local"
 msgstr "本站"
 
 #: bookwyrm/templates/feed/feed.html:25
+#: bookwyrm/templates/settings/edit_server.html:40
 msgid "Federated"
 msgstr "跨站"
 
@@ -773,7 +864,8 @@ msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
 msgstr "加载 <span data-poll=\"stream/%(tab)s\">0</span> �未读状�"
 
 #: bookwyrm/templates/feed/feed.html:48
-msgid "There aren't any activities right now! Try following a user to get started"
+msgid ""
+"There aren't any activities right now! Try following a user to get started"
 msgstr "现在还没有任何活动��试�从关注一个用户开始�"
 
 #: bookwyrm/templates/feed/feed.html:56
@@ -786,32 +878,33 @@ msgid "Updates"
 msgstr "æ›´æ–°"
 
 #: bookwyrm/templates/feed/feed_layout.html:11
-#: bookwyrm/templates/layout.html:58
+#: bookwyrm/templates/layout.html:59
 #: bookwyrm/templates/user/books_header.html:3
 msgid "Your books"
 msgstr "你的书目"
 
 #: bookwyrm/templates/feed/feed_layout.html:13
-msgid "There are no books here right now! Try searching for a book to get started"
+msgid ""
+"There are no books here right now! Try searching for a book to get started"
 msgstr "现在这里还没有任何书目��试�从�索�本书开始�"
 
-#: bookwyrm/templates/feed/feed_layout.html:23
+#: bookwyrm/templates/feed/feed_layout.html:24
 #: bookwyrm/templates/user/shelf.html:28
 msgid "To Read"
 msgstr "想读"
 
-#: bookwyrm/templates/feed/feed_layout.html:24
+#: bookwyrm/templates/feed/feed_layout.html:25
 #: bookwyrm/templates/user/shelf.html:28
 msgid "Currently Reading"
 msgstr "在读"
 
-#: bookwyrm/templates/feed/feed_layout.html:25
+#: bookwyrm/templates/feed/feed_layout.html:26
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
 #: bookwyrm/templates/user/shelf.html:28
 msgid "Read"
 msgstr "读过"
 
-#: bookwyrm/templates/feed/feed_layout.html:74 bookwyrm/templates/goal.html:26
+#: bookwyrm/templates/feed/feed_layout.html:88 bookwyrm/templates/goal.html:26
 #: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
 msgid "%(year)s Reading Goal"
@@ -839,7 +932,7 @@ msgid "What are you reading?"
 msgstr "你在阅读什么？"
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:58
+#: bookwyrm/templates/lists/list.html:101
 msgid "Search for a book"
 msgstr "�索书目"
 
@@ -859,8 +952,8 @@ msgstr "你�以在开始使用 %(site_name)s �添加书目。"
 #: bookwyrm/templates/get_started/books.html:17
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
-#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
-#: bookwyrm/templates/lists/list.html:62
+#: bookwyrm/templates/layout.html:38 bookwyrm/templates/layout.html:39
+#: bookwyrm/templates/lists/list.html:105
 msgid "Search"
 msgstr "�索"
 
@@ -874,7 +967,7 @@ msgid "Popular on %(site_name)s"
 msgstr "%(site_name)s 上的热门"
 
 #: bookwyrm/templates/get_started/books.html:51
-#: bookwyrm/templates/lists/list.html:75
+#: bookwyrm/templates/lists/list.html:118
 msgid "No books found"
 msgstr "没有找到书目"
 
@@ -943,7 +1036,9 @@ msgid "Show this account in suggested users:"
 msgstr "在推�的用户中显示此��:"
 
 #: bookwyrm/templates/get_started/profile.html:52
-msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users."
+msgid ""
+"Your account will show up in the directory, and may be recommended to other "
+"BookWyrm users."
 msgstr "你的��会显示在目录中，并且�能会�其它 BookWyrm 用户推�。"
 
 #: bookwyrm/templates/get_started/users.html:11
@@ -968,7 +1063,9 @@ msgstr "编辑目标"
 #: bookwyrm/templates/goal.html:30
 #: bookwyrm/templates/snippets/goal_card.html:13
 #, python-format
-msgid "Set a goal for how many books you'll finish reading in %(year)s, and track your progress throughout the year."
+msgid ""
+"Set a goal for how many books you'll finish reading in %(year)s, and track "
+"your progress throughout the year."
 msgstr "设定一个 %(year)s 内�读多少书的目标，并记录你全年的进度。"
 
 #: bookwyrm/templates/goal.html:39
@@ -987,7 +1084,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "%(username)s 在 %(year)s 的书目"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/layout.html:97
+#: bookwyrm/templates/layout.html:98
 msgid "Import Books"
 msgstr "导入书目"
 
@@ -1008,6 +1105,7 @@ msgid "Privacy setting for imported reviews:"
 msgstr "导入书评的��设定"
 
 #: bookwyrm/templates/import.html:48
+#: bookwyrm/templates/settings/server_blocklist.html:64
 msgid "Import"
 msgstr "导入"
 
@@ -1050,7 +1148,9 @@ msgstr "加载失败"
 
 #: bookwyrm/templates/import_status.html:44
 #, python-format
-msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
+msgid ""
+"Jump to the bottom of the list to select the %(failed_count)s items which "
+"failed to import."
 msgstr "跳转至列表底部�选� %(failed_count)s 个导入失败的项目。"
 
 #: bookwyrm/templates/import_status.html:79
@@ -1072,12 +1172,12 @@ msgstr "书目"
 
 #: bookwyrm/templates/import_status.html:115
 #: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/user/shelf.html:76
+#: bookwyrm/templates/user/shelf.html:75 bookwyrm/templates/user/shelf.html:93
 msgid "Title"
 msgstr "标题"
 
 #: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/user/shelf.html:77
+#: bookwyrm/templates/user/shelf.html:76 bookwyrm/templates/user/shelf.html:96
 msgid "Author"
 msgstr "作者"
 
@@ -1114,86 +1214,94 @@ msgstr "\"%(query)s\" 的�索结果"
 msgid "Matching Books"
 msgstr "匹�的书目"
 
-#: bookwyrm/templates/layout.html:33
+#: bookwyrm/templates/layout.html:34
 msgid "Search for a book or user"
 msgstr "�索书目或用户"
 
-#: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48
+#: bookwyrm/templates/layout.html:48 bookwyrm/templates/layout.html:49
 msgid "Main navigation menu"
 msgstr "主导航��"
 
-#: bookwyrm/templates/layout.html:61
+#: bookwyrm/templates/layout.html:62
 msgid "Feed"
 msgstr "动�"
 
-#: bookwyrm/templates/layout.html:102
+#: bookwyrm/templates/layout.html:103
 msgid "Settings"
 msgstr "设置"
 
-#: bookwyrm/templates/layout.html:111
-#: bookwyrm/templates/settings/admin_layout.html:24
+#: bookwyrm/templates/layout.html:112
+#: bookwyrm/templates/settings/admin_layout.html:31
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
 #: bookwyrm/templates/settings/manage_invites.html:15
 msgid "Invites"
 msgstr "邀请"
 
-#: bookwyrm/templates/layout.html:118
+#: bookwyrm/templates/layout.html:119
 msgid "Admin"
 msgstr "管�员"
 
-#: bookwyrm/templates/layout.html:125
+#: bookwyrm/templates/layout.html:126
 msgid "Log out"
 msgstr "登出"
 
-#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
+#: bookwyrm/templates/layout.html:134 bookwyrm/templates/layout.html:135
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:10
 msgid "Notifications"
 msgstr "通知"
 
-#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155
+#: bookwyrm/templates/layout.html:152 bookwyrm/templates/layout.html:156
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "用户�:"
 
-#: bookwyrm/templates/layout.html:156
+#: bookwyrm/templates/layout.html:157
 msgid "password"
 msgstr "密�"
 
-#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:158 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr "忘记了密�？"
 
-#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:161 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "登录"
 
-#: bookwyrm/templates/layout.html:168
+#: bookwyrm/templates/layout.html:169
 msgid "Join"
 msgstr "加入"
 
-#: bookwyrm/templates/layout.html:191
+#: bookwyrm/templates/layout.html:195
 msgid "About this server"
 msgstr "关于本�务器"
 
-#: bookwyrm/templates/layout.html:195
+#: bookwyrm/templates/layout.html:199
 msgid "Contact site admin"
 msgstr "�系站点管�员"
 
-#: bookwyrm/templates/layout.html:202
-#, python-format
-msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
-msgstr "在 <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a> 上支� %(site_name)s"
-
 #: bookwyrm/templates/layout.html:206
-msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
-msgstr "BookWyrm 是开�软件。你�以在 <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> 贡献或报告问题。"
+#, python-format
+msgid ""
+"Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">"
+"%(support_title)s</a>"
+msgstr ""
+"在 <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a> 上支"
+"� %(site_name)s"
+
+#: bookwyrm/templates/layout.html:210
+msgid ""
+"BookWyrm is open source software. You can contribute or report issues on <a "
+"href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgstr ""
+"BookWyrm 是开�软件。你�以在 <a href=\"https://github.com/mouse-reeve/"
+"bookwyrm\">GitHub</a> 贡献或报告问题。"
 
 #: bookwyrm/templates/lists/create_form.html:5
-#: bookwyrm/templates/lists/lists.html:19
+#: bookwyrm/templates/lists/lists.html:20
 msgid "Create List"
 msgstr "创建列表"
 
@@ -1257,7 +1365,7 @@ msgid "Anyone can suggest books, subject to your approval"
 msgstr "任何人都�以推�书目�主题让你批准"
 
 #: bookwyrm/templates/lists/form.html:31
-#: bookwyrm/templates/moderation/reports.html:24
+#: bookwyrm/templates/moderation/reports.html:25
 msgid "Open"
 msgstr "开放"
 
@@ -1265,45 +1373,83 @@ msgstr "开放"
 msgid "Anyone can add books to this list"
 msgstr "任何人都�以�此列表中添加书目"
 
-#: bookwyrm/templates/lists/list.html:17
+#: bookwyrm/templates/lists/list.html:19
+msgid "You successfully suggested a book for this list!"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:21
+#, fuzzy
+#| msgid "Anyone can add books to this list"
+msgid "You successfully added a book to this list!"
+msgstr "任何人都�以�此列表中添加书目"
+
+#: bookwyrm/templates/lists/list.html:27
 msgid "This list is currently empty"
 msgstr "此列表当�是空的"
 
-#: bookwyrm/templates/lists/list.html:35
+#: bookwyrm/templates/lists/list.html:46
 #, python-format
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "由 <a href=\"%(user_path)s\">%(username)s</a> 添加"
 
-#: bookwyrm/templates/lists/list.html:41
+#: bookwyrm/templates/lists/list.html:58
+#, fuzzy
+#| msgid "Sent"
+msgid "Set"
+msgstr "已��"
+
+#: bookwyrm/templates/lists/list.html:61
+#, fuzzy
+#| msgid "List curation:"
+msgid "List position"
+msgstr "列表策展:"
+
+#: bookwyrm/templates/lists/list.html:67
 #: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr "移除"
 
-#: bookwyrm/templates/lists/list.html:54
+#: bookwyrm/templates/lists/list.html:80 bookwyrm/templates/lists/list.html:92
+#, fuzzy
+#| msgid "Your Lists"
+msgid "Sort List"
+msgstr "你的列表"
+
+#: bookwyrm/templates/lists/list.html:86
+#, fuzzy
+#| msgid "Directory"
+msgid "Direction"
+msgstr "目录"
+
+#: bookwyrm/templates/lists/list.html:97
 msgid "Add Books"
 msgstr "添加书目"
 
-#: bookwyrm/templates/lists/list.html:54
+#: bookwyrm/templates/lists/list.html:97
 msgid "Suggest Books"
 msgstr "推�书目"
 
-#: bookwyrm/templates/lists/list.html:63
+#: bookwyrm/templates/lists/list.html:106
 msgid "search"
 msgstr "�索"
 
-#: bookwyrm/templates/lists/list.html:69
+#: bookwyrm/templates/lists/list.html:112
 msgid "Clear search"
 msgstr "清除�索"
 
-#: bookwyrm/templates/lists/list.html:74
+#: bookwyrm/templates/lists/list.html:117
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
 msgstr "没有符� \"%(query)s\" 请求的书目"
 
-#: bookwyrm/templates/lists/list.html:90
+#: bookwyrm/templates/lists/list.html:133
 msgid "Suggest"
 msgstr "推�"
 
+#: bookwyrm/templates/lists/lists.html:14 bookwyrm/templates/user/lists.html:9
+msgid "Your Lists"
+msgstr "你的列表"
+
 #: bookwyrm/templates/login.html:4
 msgid "Login"
 msgstr "登录"
@@ -1321,59 +1467,39 @@ msgstr "�系管�员以�得邀请"
 msgid "More about this site"
 msgstr "关于本站点的更多"
 
-#: bookwyrm/templates/moderation/report.html:5
 #: bookwyrm/templates/moderation/report.html:6
+#: bookwyrm/templates/moderation/report.html:7
 #: bookwyrm/templates/moderation/report_preview.html:6
 #, python-format
 msgid "Report #%(report_id)s: %(username)s"
 msgstr "报告 #%(report_id)s: %(username)s"
 
-#: bookwyrm/templates/moderation/report.html:10
+#: bookwyrm/templates/moderation/report.html:11
 msgid "Back to reports"
 msgstr "回到报告"
 
-#: bookwyrm/templates/moderation/report.html:18
-msgid "Actions"
-msgstr "动作"
-
-#: bookwyrm/templates/moderation/report.html:19
-msgid "View user profile"
-msgstr "查看用户个人资料"
-
-#: bookwyrm/templates/moderation/report.html:22
-#: bookwyrm/templates/snippets/status/status_options.html:25
-#: bookwyrm/templates/snippets/user_options.html:13
-msgid "Send direct message"
-msgstr "���信"
-
-#: bookwyrm/templates/moderation/report.html:27
-msgid "Deactivate user"
-msgstr "�用用户"
-
-#: bookwyrm/templates/moderation/report.html:29
-msgid "Reactivate user"
-msgstr "�用用户"
-
-#: bookwyrm/templates/moderation/report.html:36
+#: bookwyrm/templates/moderation/report.html:23
 msgid "Moderator Comments"
 msgstr "监察员评论"
 
-#: bookwyrm/templates/moderation/report.html:54
-#: bookwyrm/templates/snippets/create_status.html:12
-#: bookwyrm/templates/snippets/create_status_form.html:52
+#: bookwyrm/templates/moderation/report.html:41
+#: bookwyrm/templates/snippets/create_status.html:28
+#: bookwyrm/templates/snippets/create_status_form.html:53
 msgid "Comment"
 msgstr "评论"
 
-#: bookwyrm/templates/moderation/report.html:59
+#: bookwyrm/templates/moderation/report.html:46
 msgid "Reported statuses"
 msgstr "被报告的状�"
 
-#: bookwyrm/templates/moderation/report.html:61
+#: bookwyrm/templates/moderation/report.html:48
 msgid "No statuses reported"
 msgstr "没有被报告的状�"
 
-#: bookwyrm/templates/moderation/report.html:67
-msgid "Statuses has been deleted"
+#: bookwyrm/templates/moderation/report.html:54
+#, fuzzy
+#| msgid "Statuses has been deleted"
+msgid "Status has been deleted"
 msgstr "状�已被删除"
 
 #: bookwyrm/templates/moderation/report_modal.html:6
@@ -1381,12 +1507,12 @@ msgstr "状�已被删除"
 msgid "Report @%(username)s"
 msgstr "报告 %(username)s"
 
-#: bookwyrm/templates/moderation/report_modal.html:21
+#: bookwyrm/templates/moderation/report_modal.html:23
 #, python-format
 msgid "This report will be sent to %(site_name)s's moderators for review."
 msgstr "本报告会被��至 %(site_name)s 的监察员以�查。"
 
-#: bookwyrm/templates/moderation/report_modal.html:22
+#: bookwyrm/templates/moderation/report_modal.html:24
 msgid "More info about this report:"
 msgstr "关于本报告的更多信�"
 
@@ -1413,21 +1539,21 @@ msgid "Reports: %(server_name)s"
 msgstr "报告: %(server_name)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
-#: bookwyrm/templates/moderation/reports.html:16
-#: bookwyrm/templates/settings/admin_layout.html:28
+#: bookwyrm/templates/moderation/reports.html:17
+#: bookwyrm/templates/settings/admin_layout.html:35
 msgid "Reports"
 msgstr "报告"
 
-#: bookwyrm/templates/moderation/reports.html:13
+#: bookwyrm/templates/moderation/reports.html:14
 #, python-format
 msgid "Reports: <small>%(server_name)s</small>"
 msgstr "报告: <small>%(server_name)s</small>"
 
-#: bookwyrm/templates/moderation/reports.html:27
+#: bookwyrm/templates/moderation/reports.html:28
 msgid "Resolved"
 msgstr "已解决"
 
-#: bookwyrm/templates/moderation/reports.html:34
+#: bookwyrm/templates/moderation/reports.html:37
 msgid "No reports found."
 msgstr "没有找到报告"
 
@@ -1437,18 +1563,27 @@ msgstr "删除通知"
 
 #: bookwyrm/templates/notifications.html:53
 #, python-format
-msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr "喜欢了你 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的书评</a>"
+msgid ""
+"favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+"喜欢了你 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的书评</a>"
 
 #: bookwyrm/templates/notifications.html:55
 #, python-format
-msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
-msgstr "喜欢了你 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的评论</a>"
+msgid ""
+"favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+"喜欢了你 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的评论</a>"
 
 #: bookwyrm/templates/notifications.html:57
 #, python-format
-msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr "喜欢了你 <a href=\"%(related_path)s\">�自 <em>%(book_title)s</em> 的引用</a>"
+msgid ""
+"favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+"喜欢了你 <a href=\"%(related_path)s\">�自 <em>%(book_title)s</em> 的引用</a>"
 
 #: bookwyrm/templates/notifications.html:59
 #, python-format
@@ -1457,18 +1592,30 @@ msgstr "喜欢了你的 <a href=\"%(related_path)s\">状�</a>"
 
 #: bookwyrm/templates/notifications.html:64
 #, python-format
-msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr "在 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的书评</a> 里�到了你"
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">review of <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+"在 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的书评</a> 里�到"
+"了你"
 
 #: bookwyrm/templates/notifications.html:66
 #, python-format
-msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
-msgstr "在 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的评论</a> 里�到了你"
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">comment on <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+"在 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的评论</a> 里�到"
+"了你"
 
 #: bookwyrm/templates/notifications.html:68
 #, python-format
-msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr "在 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的引用</a> 中�到了你"
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">quote from <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+"在 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的引用</a> 中�到"
+"了你"
 
 #: bookwyrm/templates/notifications.html:70
 #, python-format
@@ -1477,23 +1624,39 @@ msgstr "在 <a href=\"%(related_path)s\">状�</a> 中�到了你"
 
 #: bookwyrm/templates/notifications.html:75
 #, python-format
-msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr "<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">对 <em>%(book_title)s</em> 的书评</a>"
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">review of <em>%(book_title)s</em></a>"
+msgstr ""
+"<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">对 "
+"<em>%(book_title)s</em> 的书评</a>"
 
 #: bookwyrm/templates/notifications.html:77
 #, python-format
-msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
-msgstr "<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">对 <em>%(book_title)s</em> 的评论</a>"
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">comment on <em>%(book_title)s</em></a>"
+msgstr ""
+"<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">对 "
+"<em>%(book_title)s</em> 的评论</a>"
 
 #: bookwyrm/templates/notifications.html:79
 #, python-format
-msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr "<a href=\"%(related_path)s\">回�</a> 了你 <a href=\"%(parent_path)s\">对 <em>%(book_title)s</em> 中的引用</a>"
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">quote from <em>%(book_title)s</em></a>"
+msgstr ""
+"<a href=\"%(related_path)s\">回�</a> 了你 <a href=\"%(parent_path)s\">对 "
+"<em>%(book_title)s</em> 中的引用</a>"
 
 #: bookwyrm/templates/notifications.html:81
 #, python-format
-msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
-msgstr "<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">状�</a>"
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">status</a>"
+msgstr ""
+"<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">状�"
+"</a>"
 
 #: bookwyrm/templates/notifications.html:85
 msgid "followed you"
@@ -1505,18 +1668,27 @@ msgstr "�你��了关注请求"
 
 #: bookwyrm/templates/notifications.html:94
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr "转�了你的 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的书评</a>"
+msgid ""
+"boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></"
+"a>"
+msgstr ""
+"转�了你的 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的书评</a>"
 
 #: bookwyrm/templates/notifications.html:96
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
-msgstr "转�了你的 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的评论</a>"
+msgid ""
+"boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></"
+"a>"
+msgstr ""
+"转�了你的 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的评论</a>"
 
 #: bookwyrm/templates/notifications.html:98
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr "转�了你的 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的引用</a>"
+msgid ""
+"boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+"转�了你的 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的引用</a>"
 
 #: bookwyrm/templates/notifications.html:100
 #, python-format
@@ -1525,13 +1697,21 @@ msgstr "转�了你的 <a href=\"%(related_path)s\">状�</a>"
 
 #: bookwyrm/templates/notifications.html:104
 #, python-format
-msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
-msgstr " 添加了 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgid ""
+" added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
+"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgstr ""
+" 添加了 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 "
+"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 
 #: bookwyrm/templates/notifications.html:106
 #, python-format
-msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
-msgstr " 推�添加 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgid ""
+" suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to "
+"your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgstr ""
+" 推�添加 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 "
+"\"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 
 #: bookwyrm/templates/notifications.html:110
 #, python-format
@@ -1592,8 +1772,12 @@ msgstr "在消��中显示设置阅读目标的�示:"
 
 #: bookwyrm/templates/preferences/edit_user.html:62
 #, python-format
-msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
-msgstr "你的��会显示在 <a href=\"%(path)s\">目录</a> 中，并�能�其它 BookWyrm 用户推�。"
+msgid ""
+"Your account will show up in the <a href=\"%(path)s\">directory</a>, and may "
+"be recommended to other BookWyrm users."
+msgstr ""
+"你的��会显示在 <a href=\"%(path)s\">目录</a> 中，并�能�其它 BookWyrm 用户"
+"推�。"
 
 #: bookwyrm/templates/preferences/edit_user.html:65
 msgid "Preferred Timezone: "
@@ -1636,118 +1820,197 @@ msgstr "没有找到 \"%(query)s\" 的列表"
 msgid "Administration"
 msgstr "管�"
 
-#: bookwyrm/templates/settings/admin_layout.html:15
+#: bookwyrm/templates/settings/admin_layout.html:22
 msgid "Manage Users"
 msgstr "管�用户"
 
-#: bookwyrm/templates/settings/admin_layout.html:19
-#: bookwyrm/templates/settings/user_admin.html:3
-#: bookwyrm/templates/settings/user_admin.html:10
+#: bookwyrm/templates/settings/admin_layout.html:26
+#: bookwyrm/templates/user_admin/user_admin.html:3
+#: bookwyrm/templates/user_admin/user_admin.html:10
 msgid "Users"
 msgstr "用户"
 
-#: bookwyrm/templates/settings/admin_layout.html:32
+#: bookwyrm/templates/settings/admin_layout.html:39
 #: bookwyrm/templates/settings/federation.html:3
 #: bookwyrm/templates/settings/federation.html:5
 msgid "Federated Servers"
 msgstr "互�的�务器"
 
-#: bookwyrm/templates/settings/admin_layout.html:37
+#: bookwyrm/templates/settings/admin_layout.html:44
 msgid "Instance Settings"
 msgstr "实例设置"
 
-#: bookwyrm/templates/settings/admin_layout.html:41
+#: bookwyrm/templates/settings/admin_layout.html:48
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr "站点设置"
 
-#: bookwyrm/templates/settings/admin_layout.html:44
+#: bookwyrm/templates/settings/admin_layout.html:51
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr "实例信�"
 
-#: bookwyrm/templates/settings/admin_layout.html:45
+#: bookwyrm/templates/settings/admin_layout.html:52
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr "图�"
 
-#: bookwyrm/templates/settings/admin_layout.html:46
+#: bookwyrm/templates/settings/admin_layout.html:53
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr "页脚内容"
 
-#: bookwyrm/templates/settings/admin_layout.html:47
+#: bookwyrm/templates/settings/admin_layout.html:54
 #: bookwyrm/templates/settings/site.html:77
 msgid "Registration"
 msgstr "注册"
 
-#: bookwyrm/templates/settings/federated_server.html:7
+#: bookwyrm/templates/settings/edit_server.html:3
+#: bookwyrm/templates/settings/edit_server.html:6
+#: bookwyrm/templates/settings/edit_server.html:20
+#: bookwyrm/templates/settings/federation.html:9
+#: bookwyrm/templates/settings/federation.html:10
+#: bookwyrm/templates/settings/server_blocklist.html:3
+#: bookwyrm/templates/settings/server_blocklist.html:20
+#, fuzzy
+#| msgid "Add cover"
+msgid "Add server"
+msgstr "添加��"
+
+#: bookwyrm/templates/settings/edit_server.html:7
+#: bookwyrm/templates/settings/federated_server.html:12
+#: bookwyrm/templates/settings/server_blocklist.html:7
 msgid "Back to server list"
 msgstr "回到�务器列表"
 
-#: bookwyrm/templates/settings/federated_server.html:12
-msgid "Details"
-msgstr "详细"
+#: bookwyrm/templates/settings/edit_server.html:16
+#: bookwyrm/templates/settings/server_blocklist.html:16
+#, fuzzy
+#| msgid "Import book"
+msgid "Import block list"
+msgstr "导入书目"
 
-#: bookwyrm/templates/settings/federated_server.html:15
-msgid "Software:"
-msgstr "软件:"
+#: bookwyrm/templates/settings/edit_server.html:30
+#, fuzzy
+#| msgid "Instance Name:"
+msgid "Instance:"
+msgstr "实例�称"
 
-#: bookwyrm/templates/settings/federated_server.html:19
-msgid "Version:"
-msgstr "版本:"
-
-#: bookwyrm/templates/settings/federated_server.html:23
+#: bookwyrm/templates/settings/edit_server.html:37
+#: bookwyrm/templates/settings/federated_server.html:29
+#: bookwyrm/templates/user_admin/user_info.html:34
 msgid "Status:"
 msgstr "状�:"
 
-#: bookwyrm/templates/settings/federated_server.html:30
+#: bookwyrm/templates/settings/edit_server.html:41
+#: bookwyrm/templates/settings/federated_server.html:9
+#, fuzzy
+#| msgid "Block"
+msgid "Blocked"
+msgstr "�蔽"
+
+#: bookwyrm/templates/settings/edit_server.html:48
+#: bookwyrm/templates/settings/federated_server.html:21
+#: bookwyrm/templates/user_admin/user_info.html:26
+msgid "Software:"
+msgstr "软件:"
+
+#: bookwyrm/templates/settings/edit_server.html:55
+#: bookwyrm/templates/settings/federated_server.html:25
+#: bookwyrm/templates/user_admin/user_info.html:30
+msgid "Version:"
+msgstr "版本:"
+
+#: bookwyrm/templates/settings/edit_server.html:64
+msgid "Notes:"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:18
+msgid "Details"
+msgstr "详细"
+
+#: bookwyrm/templates/settings/federated_server.html:36
 #: bookwyrm/templates/user/user_layout.html:50
 msgid "Activity"
 msgstr "活动"
 
-#: bookwyrm/templates/settings/federated_server.html:33
+#: bookwyrm/templates/settings/federated_server.html:39
 msgid "Users:"
 msgstr "用户:"
 
-#: bookwyrm/templates/settings/federated_server.html:36
-#: bookwyrm/templates/settings/federated_server.html:43
+#: bookwyrm/templates/settings/federated_server.html:42
+#: bookwyrm/templates/settings/federated_server.html:49
 msgid "View all"
 msgstr "查看全部"
 
-#: bookwyrm/templates/settings/federated_server.html:40
+#: bookwyrm/templates/settings/federated_server.html:46
 msgid "Reports:"
 msgstr "报告:"
 
-#: bookwyrm/templates/settings/federated_server.html:47
+#: bookwyrm/templates/settings/federated_server.html:53
 msgid "Followed by us:"
 msgstr "我们关注了的:"
 
-#: bookwyrm/templates/settings/federated_server.html:53
+#: bookwyrm/templates/settings/federated_server.html:59
 msgid "Followed by them:"
 msgstr "TA 们关注了的:"
 
-#: bookwyrm/templates/settings/federated_server.html:59
+#: bookwyrm/templates/settings/federated_server.html:65
 msgid "Blocked by us:"
 msgstr "我们所�蔽的:"
 
-#: bookwyrm/templates/settings/federation.html:13
+#: bookwyrm/templates/settings/federated_server.html:77
+#: bookwyrm/templates/user_admin/user_info.html:39
+msgid "Notes"
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:80
+#, fuzzy
+#| msgid "Edit Book"
+msgid "Edit"
+msgstr "编辑书目"
+
+#: bookwyrm/templates/settings/federated_server.html:100
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:3
+msgid "Actions"
+msgstr "动作"
+
+#: bookwyrm/templates/settings/federated_server.html:104
+#: bookwyrm/templates/snippets/block_button.html:5
+msgid "Block"
+msgstr "�蔽"
+
+#: bookwyrm/templates/settings/federated_server.html:105
+msgid "All users from this instance will be deactivated."
+msgstr ""
+
+#: bookwyrm/templates/settings/federated_server.html:110
+#: bookwyrm/templates/snippets/block_button.html:10
+msgid "Un-block"
+msgstr "�消�蔽"
+
+#: bookwyrm/templates/settings/federated_server.html:111
+msgid "All users from this instance will be re-activated."
+msgstr ""
+
+#: bookwyrm/templates/settings/federation.html:20
+#: bookwyrm/templates/user_admin/server_filter.html:5
 msgid "Server name"
 msgstr "�务器�称"
 
-#: bookwyrm/templates/settings/federation.html:17
+#: bookwyrm/templates/settings/federation.html:24
 msgid "Date federated"
 msgstr "跨站日期"
 
-#: bookwyrm/templates/settings/federation.html:21
+#: bookwyrm/templates/settings/federation.html:28
 msgid "Software"
 msgstr "软件"
 
-#: bookwyrm/templates/settings/federation.html:24
-#: bookwyrm/templates/settings/manage_invite_requests.html:40
+#: bookwyrm/templates/settings/federation.html:31
+#: bookwyrm/templates/settings/manage_invite_requests.html:44
 #: bookwyrm/templates/settings/status_filter.html:5
-#: bookwyrm/templates/settings/user_admin.html:32
+#: bookwyrm/templates/user_admin/user_admin.html:34
 msgid "Status"
 msgstr "状�"
 
@@ -1763,57 +2026,65 @@ msgid "Ignored Invite Requests"
 msgstr "已忽略的邀请请求"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:35
-msgid "Date"
-msgstr "日期"
+#, fuzzy
+#| msgid "Date federated"
+msgid "Date requested"
+msgstr "跨站日期"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:38
+#: bookwyrm/templates/settings/manage_invite_requests.html:39
+#, fuzzy
+#| msgid "Accepted"
+msgid "Date accepted"
+msgstr "已接�"
+
+#: bookwyrm/templates/settings/manage_invite_requests.html:42
 msgid "Email"
 msgstr "邮箱"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:43
+#: bookwyrm/templates/settings/manage_invite_requests.html:47
 msgid "Action"
 msgstr "动作"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:46
+#: bookwyrm/templates/settings/manage_invite_requests.html:50
 msgid "No requests"
 msgstr "没有请求"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:54
+#: bookwyrm/templates/settings/manage_invite_requests.html:59
 #: bookwyrm/templates/settings/status_filter.html:16
 msgid "Accepted"
 msgstr "已接�"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:56
+#: bookwyrm/templates/settings/manage_invite_requests.html:61
 #: bookwyrm/templates/settings/status_filter.html:12
 msgid "Sent"
 msgstr "已��"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:58
+#: bookwyrm/templates/settings/manage_invite_requests.html:63
 #: bookwyrm/templates/settings/status_filter.html:8
 msgid "Requested"
 msgstr "已请求"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:68
+#: bookwyrm/templates/settings/manage_invite_requests.html:73
 msgid "Send invite"
 msgstr "��请求"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:70
+#: bookwyrm/templates/settings/manage_invite_requests.html:75
 msgid "Re-send invite"
 msgstr "�新��请求"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:90
+#: bookwyrm/templates/settings/manage_invite_requests.html:95
 msgid "Ignore"
 msgstr "忽略"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:92
+#: bookwyrm/templates/settings/manage_invite_requests.html:97
 msgid "Un-ignore"
 msgstr "�消忽略"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:103
+#: bookwyrm/templates/settings/manage_invite_requests.html:108
 msgid "Back to pending requests"
 msgstr "回到待处�的请求"
 
-#: bookwyrm/templates/settings/manage_invite_requests.html:105
+#: bookwyrm/templates/settings/manage_invite_requests.html:110
 msgid "View ignored requests"
 msgstr "查看忽略的请求"
 
@@ -1853,6 +2124,27 @@ msgstr "已使用次数"
 msgid "No active invites"
 msgstr "无有效的邀请"
 
+#: bookwyrm/templates/settings/server_blocklist.html:6
+#, fuzzy
+#| msgid "Import Books"
+msgid "Import Blocklist"
+msgstr "导入书目"
+
+#: bookwyrm/templates/settings/server_blocklist.html:26
+#: bookwyrm/templates/snippets/goal_progress.html:5
+msgid "Success!"
+msgstr "�功�"
+
+#: bookwyrm/templates/settings/server_blocklist.html:30
+#, fuzzy
+#| msgid "Successfully imported"
+msgid "Successfully blocked:"
+msgstr "�功导入了"
+
+#: bookwyrm/templates/settings/server_blocklist.html:32
+msgid "Failed:"
+msgstr ""
+
 #: bookwyrm/templates/settings/site.html:15
 msgid "Instance Name:"
 msgstr "实例�称"
@@ -1909,138 +2201,100 @@ msgstr "�许请求邀请:"
 msgid "Registration closed text:"
 msgstr "注册关闭文字:"
 
-#: bookwyrm/templates/settings/user_admin.html:7
-#, python-format
-msgid "Users: <small>%(server_name)s</small>"
-msgstr "用户: <small>%(server_name)s</small>"
+#: bookwyrm/templates/snippets/book_cover.html:20
+#: bookwyrm/templates/snippets/search_result_text.html:10
+msgid "No cover"
+msgstr "没有��"
 
-#: bookwyrm/templates/settings/user_admin.html:20
-msgid "Username"
-msgstr "用户�"
-
-#: bookwyrm/templates/settings/user_admin.html:24
-msgid "Date Added"
-msgstr "添加日期:"
-
-#: bookwyrm/templates/settings/user_admin.html:28
-msgid "Last Active"
-msgstr "最�或缺"
-
-#: bookwyrm/templates/settings/user_admin.html:36
-msgid "Remote server"
-msgstr "移除�务器"
-
-#: bookwyrm/templates/settings/user_admin.html:45
-msgid "Active"
-msgstr "活跃"
-
-#: bookwyrm/templates/settings/user_admin.html:45
-msgid "Inactive"
-msgstr "�用"
-
-#: bookwyrm/templates/settings/user_admin.html:50
-msgid "Not set"
-msgstr "未设置"
-
-#: bookwyrm/templates/snippets/block_button.html:5
-msgid "Block"
-msgstr "�蔽"
-
-#: bookwyrm/templates/snippets/block_button.html:10
-msgid "Un-block"
-msgstr "�消�蔽"
-
-#: bookwyrm/templates/snippets/book_titleby.html:3
+#: bookwyrm/templates/snippets/book_titleby.html:4
 #, python-format
 msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgstr "<a href=\"%(path)s\">%(title)s</a> �自"
 
 #: bookwyrm/templates/snippets/boost_button.html:8
 #: bookwyrm/templates/snippets/boost_button.html:9
-#: bookwyrm/templates/snippets/status/status_body.html:51
-#: bookwyrm/templates/snippets/status/status_body.html:52
-msgid "Boost status"
-msgstr "转�状�"
+#, fuzzy
+#| msgid "boosted"
+msgid "Boost"
+msgstr "转�了"
 
+#: bookwyrm/templates/snippets/boost_button.html:15
 #: bookwyrm/templates/snippets/boost_button.html:16
-#: bookwyrm/templates/snippets/boost_button.html:17
-msgid "Un-boost status"
+#, fuzzy
+#| msgid "Un-boost status"
+msgid "Un-boost"
 msgstr "�消转�状�"
 
 #: bookwyrm/templates/snippets/content_warning_field.html:3
 msgid "Spoiler alert:"
 msgstr "剧�警告:"
 
-#: bookwyrm/templates/snippets/content_warning_field.html:4
+#: bookwyrm/templates/snippets/content_warning_field.html:10
 msgid "Spoilers ahead!"
 msgstr "�有剧��"
 
-#: bookwyrm/templates/snippets/create_status.html:9
+#: bookwyrm/templates/snippets/create_status.html:17
 msgid "Review"
 msgstr "书评"
 
-#: bookwyrm/templates/snippets/create_status.html:15
+#: bookwyrm/templates/snippets/create_status.html:39
 msgid "Quote"
 msgstr "引用"
 
-#: bookwyrm/templates/snippets/create_status_form.html:18
+#: bookwyrm/templates/snippets/create_status_form.html:20
 msgid "Comment:"
 msgstr "评论:"
 
-#: bookwyrm/templates/snippets/create_status_form.html:20
+#: bookwyrm/templates/snippets/create_status_form.html:22
 msgid "Quote:"
 msgstr "引用:"
 
-#: bookwyrm/templates/snippets/create_status_form.html:22
+#: bookwyrm/templates/snippets/create_status_form.html:24
 msgid "Review:"
 msgstr "书评:"
 
-#: bookwyrm/templates/snippets/create_status_form.html:29
-#: bookwyrm/templates/user/shelf.html:81
-msgid "Rating"
-msgstr "评价"
+#: bookwyrm/templates/snippets/create_status_form.html:42
+#: bookwyrm/templates/snippets/status/layout.html:30
+#: bookwyrm/templates/snippets/status/layout.html:48
+#: bookwyrm/templates/snippets/status/layout.html:49
+msgid "Reply"
+msgstr "回�"
 
-#: bookwyrm/templates/snippets/create_status_form.html:31
-#: bookwyrm/templates/snippets/rate_action.html:14
-#: bookwyrm/templates/snippets/stars.html:3
-msgid "No rating"
-msgstr "没有评价"
-
-#: bookwyrm/templates/snippets/create_status_form.html:64
+#: bookwyrm/templates/snippets/create_status_form.html:67
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
 msgid "Progress:"
 msgstr "进度:"
 
-#: bookwyrm/templates/snippets/create_status_form.html:71
+#: bookwyrm/templates/snippets/create_status_form.html:75
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr "页数"
 
-#: bookwyrm/templates/snippets/create_status_form.html:72
+#: bookwyrm/templates/snippets/create_status_form.html:76
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr "百分比"
 
-#: bookwyrm/templates/snippets/create_status_form.html:77
+#: bookwyrm/templates/snippets/create_status_form.html:82
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "全书 %(pages)s 页"
 
-#: bookwyrm/templates/snippets/create_status_form.html:89
+#: bookwyrm/templates/snippets/create_status_form.html:97
 msgid "Include spoiler alert"
 msgstr "加入剧�警告"
 
-#: bookwyrm/templates/snippets/create_status_form.html:95
+#: bookwyrm/templates/snippets/create_status_form.html:104
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:19
 msgid "Private"
 msgstr "�密"
 
-#: bookwyrm/templates/snippets/create_status_form.html:102
+#: bookwyrm/templates/snippets/create_status_form.html:115
 msgid "Post"
 msgstr "�布"
 
@@ -2050,24 +2304,27 @@ msgstr "删除这些阅读日期�？"
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
 #, python-format
-msgid "You are deleting this readthrough and its %(count)s associated progress updates."
+msgid ""
+"You are deleting this readthrough and its %(count)s associated progress "
+"updates."
 msgstr "你正�删除这篇阅读�过以�与之相关的 %(count)s 次进度更新。"
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
 #: bookwyrm/templates/snippets/follow_request_buttons.html:13
+#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:391
 msgid "Delete"
 msgstr "删除"
 
 #: bookwyrm/templates/snippets/fav_button.html:7
-#: bookwyrm/templates/snippets/fav_button.html:8
-#: bookwyrm/templates/snippets/status/status_body.html:55
-#: bookwyrm/templates/snippets/status/status_body.html:56
-msgid "Like status"
-msgstr "喜欢状�"
+#: bookwyrm/templates/snippets/fav_button.html:9
+msgid "Like"
+msgstr ""
 
 #: bookwyrm/templates/snippets/fav_button.html:15
 #: bookwyrm/templates/snippets/fav_button.html:16
-msgid "Un-like status"
+#, fuzzy
+#| msgid "Un-like status"
+msgid "Un-like"
 msgstr "�消喜欢状�"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:7
@@ -2102,6 +2359,11 @@ msgstr "�消关注"
 msgid "Accept"
 msgstr "接�"
 
+#: bookwyrm/templates/snippets/form_rate_stars.html:20
+#: bookwyrm/templates/snippets/stars.html:13
+msgid "No rating"
+msgstr "没有评价"
+
 #: bookwyrm/templates/snippets/generated_status/goal.html:1
 #, python-format
 msgid "set a goal to read %(counter)s book in %(year)s"
@@ -2110,15 +2372,21 @@ msgstr[0] "设定了在 %(year)s 内�读 %(counter)s 本书的目标"
 
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
 #, python-format
-msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
-msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
-msgstr[0] "为 <em><a href=\"%(path)s\">%(title)s</a></em> 打了分: %(display_rating)s 星"
+msgid ""
+"Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
+msgid_plural ""
+"Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
+msgstr[0] ""
+"为 <em><a href=\"%(path)s\">%(title)s</a></em> 打了分: %(display_rating)s 星"
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4
 #, python-format
-msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
-msgid_plural "Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
-msgstr[0] "\"%(book_title)s\" 的书评（%(display_rating)s 星）: %(review_title)s"
+msgid ""
+"Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
+msgid_plural ""
+"Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
+msgstr[0] ""
+"\"%(book_title)s\" 的书评（%(display_rating)s 星）: %(review_title)s"
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:8
 #, python-format
@@ -2127,8 +2395,12 @@ msgstr "\"%(book_title)s\" 的书评: %(review_title)s"
 
 #: bookwyrm/templates/snippets/goal_card.html:23
 #, python-format
-msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
-msgstr "你�以在任何时候从你的<a href=\"%(path)s\">个人资料页�</a> 中设置或改�你的阅读目标"
+msgid ""
+"You can set or change your reading goal any time from your <a href=\"%(path)s"
+"\">profile page</a>"
+msgstr ""
+"你�以在任何时候从你的<a href=\"%(path)s\">个人资料页�</a> 中设置或改�你的"
+"阅读目标"
 
 #: bookwyrm/templates/snippets/goal_form.html:9
 msgid "Reading goal:"
@@ -2153,10 +2425,6 @@ msgstr "�布到消��中"
 msgid "Set goal"
 msgstr "设置目标"
 
-#: bookwyrm/templates/snippets/goal_progress.html:5
-msgid "Success!"
-msgstr "�功�"
-
 #: bookwyrm/templates/snippets/goal_progress.html:7
 #, python-format
 msgid "%(percent)s%% complete!"
@@ -2164,13 +2432,20 @@ msgstr "完�了 %(percent)s%% �"
 
 #: bookwyrm/templates/snippets/goal_progress.html:10
 #, python-format
-msgid "You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
-msgstr "你已�阅读了 <a href=\"%(path)s\">%(goal_count)s 本书中的 %(read_count)s 本</a>。"
+msgid ""
+"You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgstr ""
+"你已�阅读了 <a href=\"%(path)s\">%(goal_count)s 本书中的 %(read_count)s 本</"
+"a>。"
 
 #: bookwyrm/templates/snippets/goal_progress.html:12
 #, python-format
-msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
-msgstr "%(username)s 已�阅读了 <a href=\"%(path)s\">%(goal_count)s 本书中的 %(read_count)s 本</a>。"
+msgid ""
+"%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s "
+"books</a>."
+msgstr ""
+"%(username)s 已�阅读了 <a href=\"%(path)s\">%(goal_count)s 本书中的 "
+"%(read_count)s 本</a>。"
 
 #: bookwyrm/templates/snippets/page_text.html:4
 #, python-format
@@ -2182,11 +2457,11 @@ msgstr "%(total_pages)s 页中的第 %(page)s 页"
 msgid "page %(page)s"
 msgstr "第 %(page)s 页"
 
-#: bookwyrm/templates/snippets/pagination.html:5
+#: bookwyrm/templates/snippets/pagination.html:12
 msgid "Previous"
 msgstr "往�"
 
-#: bookwyrm/templates/snippets/pagination.html:9
+#: bookwyrm/templates/snippets/pagination.html:23
 msgid "Next"
 msgstr "往�"
 
@@ -2219,7 +2494,7 @@ msgstr "关注者"
 msgid "Leave a rating"
 msgstr "留下评价"
 
-#: bookwyrm/templates/snippets/rate_action.html:29
+#: bookwyrm/templates/snippets/rate_action.html:19
 msgid "Rate"
 msgstr "评价"
 
@@ -2276,29 +2551,25 @@ msgid "Report"
 msgstr "报告"
 
 #: bookwyrm/templates/snippets/rss_title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:11
+#: bookwyrm/templates/snippets/status/status_header.html:34
 msgid "rated"
 msgstr "评价了"
 
 #: bookwyrm/templates/snippets/rss_title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:13
+#: bookwyrm/templates/snippets/status/status_header.html:36
 msgid "reviewed"
 msgstr "写了书评给"
 
 #: bookwyrm/templates/snippets/rss_title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:15
+#: bookwyrm/templates/snippets/status/status_header.html:38
 msgid "commented on"
 msgstr "评论了"
 
 #: bookwyrm/templates/snippets/rss_title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:17
+#: bookwyrm/templates/snippets/status/status_header.html:40
 msgid "quoted"
 msgstr "引用了"
 
-#: bookwyrm/templates/snippets/search_result_text.html:10
-msgid "No cover"
-msgstr "没有��"
-
 #: bookwyrm/templates/snippets/search_result_text.html:22
 #, python-format
 msgid "by %(author)s"
@@ -2318,7 +2589,7 @@ msgid "Finish \"<em>%(book_title)s</em>\""
 msgstr "完� \"<em>%(book_title)s</em>\""
 
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:35
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:34
 msgid "Update progress"
 msgstr "更新进度"
 
@@ -2339,7 +2610,7 @@ msgstr "完�阅读"
 msgid "Want to read"
 msgstr "想�阅读"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:48
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
 #, python-format
 msgid "Remove from %(name)s"
 msgstr "从 %(name)s 移除"
@@ -2354,60 +2625,65 @@ msgstr "开始 \"<em>%(book_title)s</em>\""
 msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgstr "想�阅读 \"<em>%(book_title)s</em>\""
 
+#: bookwyrm/templates/snippets/status/content_status.html:67
+#: bookwyrm/templates/snippets/trimmed_text.html:14
+msgid "Show more"
+msgstr "显示更多"
+
+#: bookwyrm/templates/snippets/status/content_status.html:82
+#: bookwyrm/templates/snippets/trimmed_text.html:29
+msgid "Show less"
+msgstr "显示更少"
+
+#: bookwyrm/templates/snippets/status/content_status.html:112
+msgid "Open image in new window"
+msgstr "在新窗�中打开图�"
+
+#: bookwyrm/templates/snippets/status/layout.html:22
+#: bookwyrm/templates/snippets/status/status_options.html:17
+msgid "Delete status"
+msgstr "删除�文"
+
+#: bookwyrm/templates/snippets/status/layout.html:52
+#: bookwyrm/templates/snippets/status/layout.html:53
+msgid "Boost status"
+msgstr "转�状�"
+
+#: bookwyrm/templates/snippets/status/layout.html:56
+#: bookwyrm/templates/snippets/status/layout.html:57
+msgid "Like status"
+msgstr "喜欢状�"
+
 #: bookwyrm/templates/snippets/status/status.html:9
 msgid "boosted"
 msgstr "转�了"
 
-#: bookwyrm/templates/snippets/status/status_body.html:27
-#: bookwyrm/templates/snippets/status/status_options.html:18
-msgid "Delete status"
-msgstr "删除�文"
-
-#: bookwyrm/templates/snippets/status/status_body.html:34
-#: bookwyrm/templates/snippets/status/status_body.html:47
-#: bookwyrm/templates/snippets/status/status_body.html:48
-msgid "Reply"
-msgstr "回�"
-
-#: bookwyrm/templates/snippets/status/status_content.html:18
-#: bookwyrm/templates/snippets/trimmed_text.html:15
-msgid "Show more"
-msgstr "显示更多"
-
-#: bookwyrm/templates/snippets/status/status_content.html:25
-#: bookwyrm/templates/snippets/trimmed_text.html:25
-msgid "Show less"
-msgstr "显示更少"
-
-#: bookwyrm/templates/snippets/status/status_content.html:46
-msgid "Open image in new window"
-msgstr "在新窗�中打开图�"
-
-#: bookwyrm/templates/snippets/status/status_header.html:22
+#: bookwyrm/templates/snippets/status/status_header.html:44
 #, python-format
-msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">review</a>"
-msgstr "回�了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">书评</a>"
-
-#: bookwyrm/templates/snippets/status/status_header.html:24
-#, python-format
-msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">comment</a>"
-msgstr "��了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">评论</a>"
-
-#: bookwyrm/templates/snippets/status/status_header.html:26
-#, python-format
-msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">quote</a>"
-msgstr "回�了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">引用</a>"
-
-#: bookwyrm/templates/snippets/status/status_header.html:28
-#, python-format
-msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
-msgstr "回�了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">状�</a>"
+msgid ""
+"replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
+"\"%(status_path)s\">status</a>"
+msgstr ""
+"回�了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href="
+"\"%(status_path)s\">状�</a>"
 
 #: bookwyrm/templates/snippets/status/status_options.html:7
 #: bookwyrm/templates/snippets/user_options.html:7
 msgid "More options"
 msgstr "更多选项"
 
+#: bookwyrm/templates/snippets/status/status_options.html:26
+#, fuzzy
+#| msgid "Delete these read dates"
+msgid "Delete & re-draft"
+msgstr "删除这些阅读日期"
+
+#: bookwyrm/templates/snippets/status/status_options.html:35
+#: bookwyrm/templates/snippets/user_options.html:13
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:6
+msgid "Send direct message"
+msgstr "���信"
+
 #: bookwyrm/templates/snippets/switch_edition_button.html:5
 msgid "Switch to this edition"
 msgstr "切�到此版本"
@@ -2420,19 +2696,6 @@ msgstr "��排�"
 msgid "Sorted descending"
 msgstr "��排�"
 
-#: bookwyrm/templates/snippets/tag.html:14
-msgid "Remove tag"
-msgstr "移除标签"
-
-#: bookwyrm/templates/snippets/tag.html:18
-msgid "Add tag"
-msgstr "添加标签"
-
-#: bookwyrm/templates/tag.html:9
-#, python-format
-msgid "Books tagged \"%(tag.name)s\""
-msgstr "标有 \"%(tag.name)s\" 标签的书"
-
 #: bookwyrm/templates/user/books_header.html:5
 #, python-format
 msgid "%(username)s's books"
@@ -2471,10 +2734,6 @@ msgstr "正在关注"
 msgid "%(username)s isn't following any users"
 msgstr "%(username)s 没有关注任何用户"
 
-#: bookwyrm/templates/user/lists.html:9
-msgid "Your Lists"
-msgstr "你的列表"
-
 #: bookwyrm/templates/user/lists.html:11
 #, python-format
 msgid "Lists: %(username)s"
@@ -2484,7 +2743,7 @@ msgstr "列表: %(username)s"
 msgid "Create list"
 msgstr "创建列表"
 
-#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:56
+#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:51
 msgid "All books"
 msgstr "所有书目"
 
@@ -2496,23 +2755,23 @@ msgstr "创建书架"
 msgid "Edit shelf"
 msgstr "编辑书架"
 
-#: bookwyrm/templates/user/shelf.html:78
+#: bookwyrm/templates/user/shelf.html:77 bookwyrm/templates/user/shelf.html:99
 msgid "Shelved"
 msgstr "上架时间"
 
-#: bookwyrm/templates/user/shelf.html:79
+#: bookwyrm/templates/user/shelf.html:78 bookwyrm/templates/user/shelf.html:103
 msgid "Started"
 msgstr "开始时间"
 
-#: bookwyrm/templates/user/shelf.html:80
+#: bookwyrm/templates/user/shelf.html:79 bookwyrm/templates/user/shelf.html:106
 msgid "Finished"
 msgstr "完�时间"
 
-#: bookwyrm/templates/user/shelf.html:129
+#: bookwyrm/templates/user/shelf.html:132
 msgid "This shelf is empty."
 msgstr "此书架是空的。"
 
-#: bookwyrm/templates/user/shelf.html:135
+#: bookwyrm/templates/user/shelf.html:138
 msgid "Delete shelf"
 msgstr "删除书架"
 
@@ -2574,6 +2833,79 @@ msgstr[0] "%(counter)s 个关注者"
 msgid "%(counter)s following"
 msgstr "关注� %(counter)s 人"
 
+#: bookwyrm/templates/user_admin/user.html:11
+#, fuzzy
+#| msgid "Back to reports"
+msgid "Back to users"
+msgstr "回到报告"
+
+#: bookwyrm/templates/user_admin/user_admin.html:7
+#, python-format
+msgid "Users: <small>%(server_name)s</small>"
+msgstr "用户: <small>%(server_name)s</small>"
+
+#: bookwyrm/templates/user_admin/user_admin.html:22
+#: bookwyrm/templates/user_admin/username_filter.html:5
+msgid "Username"
+msgstr "用户�"
+
+#: bookwyrm/templates/user_admin/user_admin.html:26
+msgid "Date Added"
+msgstr "添加日期:"
+
+#: bookwyrm/templates/user_admin/user_admin.html:30
+msgid "Last Active"
+msgstr "最�或缺"
+
+#: bookwyrm/templates/user_admin/user_admin.html:38
+msgid "Remote server"
+msgstr "移除�务器"
+
+#: bookwyrm/templates/user_admin/user_admin.html:47
+msgid "Active"
+msgstr "活跃"
+
+#: bookwyrm/templates/user_admin/user_admin.html:47
+msgid "Inactive"
+msgstr "�用"
+
+#: bookwyrm/templates/user_admin/user_admin.html:52
+#: bookwyrm/templates/user_admin/user_info.html:49
+msgid "Not set"
+msgstr "未设置"
+
+#: bookwyrm/templates/user_admin/user_info.html:5
+#, fuzzy
+#| msgid "Details"
+msgid "User details"
+msgstr "详细"
+
+#: bookwyrm/templates/user_admin/user_info.html:14
+msgid "View user profile"
+msgstr "查看用户个人资料"
+
+#: bookwyrm/templates/user_admin/user_info.html:20
+#, fuzzy
+#| msgid "Instance Settings"
+msgid "Instance details"
+msgstr "实例设置"
+
+#: bookwyrm/templates/user_admin/user_info.html:46
+msgid "View instance"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:11
+msgid "Suspend user"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:13
+msgid "Un-suspend user"
+msgstr ""
+
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:21
+msgid "Access level:"
+msgstr ""
+
 #: bookwyrm/views/password.py:32
 msgid "No user with that email address was found."
 msgstr "没有找到使用该邮箱的用户。"
@@ -2583,6 +2915,1426 @@ msgstr "没有找到使用该邮箱的用户。"
 msgid "A password reset link sent to %s"
 msgstr "密��置连接已��给 %s"
 
+#: venv3/lib/python3.8/site-packages/_pytest/config/argparsing.py:442
+#, python-format
+msgid "ambiguous option: %(option)s could match %(matches)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/contrib/messages/apps.py:7
+#, fuzzy
+#| msgid "All messages"
+msgid "Messages"
+msgstr "所有消�"
+
+#: venv3/lib/python3.8/site-packages/django/contrib/sitemaps/apps.py:7
+msgid "Site Maps"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/contrib/staticfiles/apps.py:9
+msgid "Static Files"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/contrib/syndication/apps.py:7
+msgid "Syndication"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/paginator.py:45
+msgid "That page number is not an integer"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/paginator.py:47
+msgid "That page number is less than 1"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/paginator.py:52
+msgid "That page contains no results"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:32
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid value."
+msgstr "邮箱地�:"
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:103
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:659
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid URL."
+msgstr "邮箱地�:"
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:155
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid integer."
+msgstr "邮箱地�:"
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:166
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid email address."
+msgstr "邮箱地�:"
+
+#. Translators: "letters" means latin letters: a-z and A-Z.
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:240
+msgid ""
+"Enter a valid “slug� consisting of letters, numbers, underscores or hyphens."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:247
+msgid ""
+"Enter a valid “slug� consisting of Unicode letters, numbers, underscores, or "
+"hyphens."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:256
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:276
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid IPv4 address."
+msgstr "邮箱地�:"
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:261
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:277
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid IPv6 address."
+msgstr "邮箱地�:"
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:271
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:275
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "邮箱地�:"
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:305
+msgid "Enter only digits separated by commas."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:311
+#, python-format
+msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:343
+#, python-format
+msgid "Ensure this value is less than or equal to %(limit_value)s."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:352
+#, python-format
+msgid "Ensure this value is greater than or equal to %(limit_value)s."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:362
+#, python-format
+msgid ""
+"Ensure this value has at least %(limit_value)d character (it has "
+"%(show_value)d)."
+msgid_plural ""
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr[0] ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:377
+#, python-format
+msgid ""
+"Ensure this value has at most %(limit_value)d character (it has "
+"%(show_value)d)."
+msgid_plural ""
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
+msgstr[0] ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:396
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:291
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:326
+#, fuzzy
+#| msgid "Series number:"
+msgid "Enter a number."
+msgstr "系列编�:"
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:398
+#, python-format
+msgid "Ensure that there are no more than %(max)s digit in total."
+msgid_plural "Ensure that there are no more than %(max)s digits in total."
+msgstr[0] ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:403
+#, python-format
+msgid "Ensure that there are no more than %(max)s decimal place."
+msgid_plural "Ensure that there are no more than %(max)s decimal places."
+msgstr[0] ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:408
+#, python-format
+msgid ""
+"Ensure that there are no more than %(max)s digit before the decimal point."
+msgid_plural ""
+"Ensure that there are no more than %(max)s digits before the decimal point."
+msgstr[0] ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:470
+#, python-format
+msgid ""
+"File extension “%(extension)s� is not allowed. Allowed extensions are: "
+"%(allowed_extensions)s."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/core/validators.py:522
+msgid "Null characters are not allowed."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/base.py:1181
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:759
+msgid "and"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/base.py:1183
+#, fuzzy, python-format
+#| msgid "A user with this email already exists."
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr "已�存在使用该邮箱的用户。"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:104
+#, fuzzy, python-format
+#| msgid "%(value)s is not a valid remote_id"
+msgid "Value %(value)r is not a valid choice."
+msgstr "%(value)s �是有效的 remote_id"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:105
+#, fuzzy
+#| msgid "This shelf is empty."
+msgid "This field cannot be null."
+msgstr "此书架是空的。"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:106
+msgid "This field cannot be blank."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:107
+#, fuzzy, python-format
+#| msgid "A user with this email already exists."
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "已�存在使用该邮箱的用户。"
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:111
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:130
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:937
+#, python-format
+msgid "“%(value)s� value must be either True or False."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:938
+#, python-format
+msgid "“%(value)s� value must be either True, False, or None."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:940
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:981
+#, python-format
+msgid "String (up to %(max_length)s)"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1045
+#, fuzzy
+#| msgid "No active invites"
+msgid "Comma-separated integers"
+msgstr "无有效的邀请"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1094
+#, python-format
+msgid ""
+"“%(value)s� value has an invalid date format. It must be in YYYY-MM-DD "
+"format."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1096
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1239
+#, python-format
+msgid ""
+"“%(value)s� value has the correct format (YYYY-MM-DD) but it is an invalid "
+"date."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1099
+msgid "Date (without time)"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1237
+#, python-format
+msgid ""
+"“%(value)s� value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1241
+#, python-format
+msgid ""
+"“%(value)s� value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"[TZ]) but it is an invalid date/time."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1245
+msgid "Date (with time)"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1393
+#, python-format
+msgid "“%(value)s� value must be a decimal number."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1395
+#, fuzzy
+#| msgid "Series number:"
+msgid "Decimal number"
+msgstr "系列编�:"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1534
+#, python-format
+msgid ""
+"“%(value)s� value has an invalid format. It must be in [DD] [[HH:]MM:]ss[."
+"uuuuuu] format."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1537
+#, fuzzy
+#| msgid "List curation:"
+msgid "Duration"
+msgstr "列表策展:"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1587
+#, fuzzy
+#| msgid "Email address:"
+msgid "Email address"
+msgstr "邮箱地�:"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1610
+msgid "File path"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1676
+#, python-format
+msgid "“%(value)s� value must be a float."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1678
+msgid "Floating point number"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1716
+#, python-format
+msgid "“%(value)s� value must be an integer."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1718
+msgid "Integer"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1801
+#, fuzzy
+#| msgid "No active invites"
+msgid "Big (8 byte) integer"
+msgstr "无有效的邀请"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1817
+#, fuzzy
+#| msgid "Email address:"
+msgid "IPv4 address"
+msgstr "邮箱地�:"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1848
+#, fuzzy
+#| msgid "Email address:"
+msgid "IP address"
+msgstr "邮箱地�:"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1928
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1929
+#, python-format
+msgid "“%(value)s� value must be either None, True or False."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1931
+msgid "Boolean (Either True, False or None)"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1966
+#, fuzzy
+#| msgid "No active invites"
+msgid "Positive integer"
+msgstr "无有效的邀请"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1979
+#, fuzzy
+#| msgid "No active invites"
+msgid "Positive small integer"
+msgstr "无有效的邀请"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1993
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2025
+msgid "Small integer"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2032
+msgid "Text"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2060
+#, python-format
+msgid ""
+"“%(value)s� value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"format."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2062
+#, python-format
+msgid ""
+"“%(value)s� value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"invalid time."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2065
+msgid "Time"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2191
+msgid "URL"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2213
+msgid "Raw binary data"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2278
+#, fuzzy, python-format
+#| msgid "%(value)s is not a valid username"
+msgid "“%(value)s� is not a valid UUID."
+msgstr "%(value)s �是有效的用户�"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2280
+msgid "Universally unique identifier"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/files.py:221
+msgid "File"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/files.py:360
+#, fuzzy
+#| msgid "Images"
+msgid "Image"
+msgstr "图�"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:778
+#, python-format
+msgid "%(model)s instance with %(field)s %(value)r does not exist."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:780
+msgid "Foreign Key (type determined by related field)"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1012
+#, fuzzy
+#| msgid "Relationships"
+msgid "One-to-one relationship"
+msgstr "关系"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1066
+#, fuzzy, python-format
+#| msgid "Relationships"
+msgid "%(from)s-%(to)s relationship"
+msgstr "关系"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1067
+#, fuzzy, python-format
+#| msgid "Relationships"
+msgid "%(from)s-%(to)s relationships"
+msgstr "关系"
+
+#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1109
+#, fuzzy
+#| msgid "Relationships"
+msgid "Many-to-many relationship"
+msgstr "关系"
+
+#. Translators: If found as last label character, these punctuation
+#. characters will prevent the default label_suffix to be appended to the label
+#: venv3/lib/python3.8/site-packages/django/forms/boundfield.py:149
+msgid ":?.!"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:53
+#, fuzzy
+#| msgid "This shelf is empty."
+msgid "This field is required."
+msgstr "此书架是空的。"
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:246
+#, fuzzy
+#| msgid "Series number:"
+msgid "Enter a whole number."
+msgstr "系列编�:"
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:397
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:1127
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid date."
+msgstr "邮箱地�:"
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:421
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:1128
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid time."
+msgstr "邮箱地�:"
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:443
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid date/time."
+msgstr "邮箱地�:"
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:472
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid duration."
+msgstr "邮箱地�:"
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:473
+#, python-brace-format
+msgid "The number of days must be between {min_days} and {max_days}."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:533
+msgid "No file was submitted. Check the encoding type on the form."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:534
+msgid "No file was submitted."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:535
+#, fuzzy
+#| msgid "This shelf is empty."
+msgid "The submitted file is empty."
+msgstr "此书架是空的。"
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:537
+#, python-format
+msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
+msgid_plural ""
+"Ensure this filename has at most %(max)d characters (it has %(length)d)."
+msgstr[0] ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:540
+msgid "Please either submit a file or check the clear checkbox, not both."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:601
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:763
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:853
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:1275
+#, python-format
+msgid "Select a valid choice. %(value)s is not one of the available choices."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:854
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:969
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:1274
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a list of values."
+msgstr "邮箱地�:"
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:970
+msgid "Enter a complete value."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/fields.py:1186
+#, fuzzy
+#| msgid "Email address:"
+msgid "Enter a valid UUID."
+msgstr "邮箱地�:"
+
+#. Translators: This is the default suffix added to form field labels
+#: venv3/lib/python3.8/site-packages/django/forms/forms.py:81
+msgid ":"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/forms.py:207
+#, python-format
+msgid "(Hidden field %(name)s) %(error)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:93
+msgid "ManagementForm data is missing or has been tampered with"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:345
+#, python-format
+msgid "Please submit %d or fewer forms."
+msgid_plural "Please submit %d or fewer forms."
+msgstr[0] ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:352
+#, python-format
+msgid "Please submit %d or more forms."
+msgid_plural "Please submit %d or more forms."
+msgstr[0] ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:379
+#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:386
+#, fuzzy
+#| msgid "Order by"
+msgid "Order"
+msgstr "排列顺�"
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:754
+#, python-format
+msgid "Please correct the duplicate data for %(field)s."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:758
+#, python-format
+msgid "Please correct the duplicate data for %(field)s, which must be unique."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:764
+#, python-format
+msgid ""
+"Please correct the duplicate data for %(field_name)s which must be unique "
+"for the %(lookup)s in %(date_field)s."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:773
+msgid "Please correct the duplicate values below."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:1094
+msgid "The inline value did not match the parent instance."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:1161
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/models.py:1277
+#, fuzzy, python-format
+#| msgid "%(value)s is not a valid username"
+msgid "“%(pk)s� is not a valid value."
+msgstr "%(value)s �是有效的用户�"
+
+#: venv3/lib/python3.8/site-packages/django/forms/utils.py:162
+#, python-format
+msgid ""
+"%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:395
+msgid "Clear"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:396
+#, fuzzy
+#| msgid "Start reading"
+msgid "Currently"
+msgstr "开始阅读"
+
+#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:397
+#, fuzzy
+#| msgid "Change shelf"
+msgid "Change"
+msgstr "改�书架"
+
+#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:709
+msgid "Unknown"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:710
+msgid "Yes"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:711
+msgid "No"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:788
+msgid "yes,no,maybe"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:817
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:834
+#, python-format
+msgid "%(size)d byte"
+msgid_plural "%(size)d bytes"
+msgstr[0] ""
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:836
+#, python-format
+msgid "%s KB"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:838
+#, python-format
+msgid "%s MB"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:840
+#, python-format
+msgid "%s GB"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:842
+#, python-format
+msgid "%s TB"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:844
+#, python-format
+msgid "%s PB"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:62
+msgid "p.m."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:63
+msgid "a.m."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:68
+msgid "PM"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:69
+msgid "AM"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:150
+msgid "midnight"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:152
+msgid "noon"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:295
+msgid "Monday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:296
+msgid "Tuesday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:297
+msgid "Wednesday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:298
+msgid "Thursday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:299
+msgid "Friday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:7
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:300
+msgid "Saturday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:7
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:301
+msgid "Sunday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
+msgid "Mon"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
+msgid "Tue"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
+msgid "Wed"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
+msgid "Thu"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
+msgid "Fri"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:11
+#, fuzzy
+#| msgid "Status"
+msgid "Sat"
+msgstr "状�"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:11
+msgid "Sun"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:281
+msgid "January"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:282
+msgid "February"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:283
+#, fuzzy
+#| msgid "Search"
+msgid "March"
+msgstr "�索"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:284
+msgid "April"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:285
+msgid "May"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:286
+msgid "June"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:287
+msgid "July"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:288
+msgid "August"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:289
+#, fuzzy
+#| msgid "Series number:"
+msgid "September"
+msgstr "系列编�:"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:290
+msgid "October"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:291
+msgid "November"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:16
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:292
+#, fuzzy
+#| msgid "Series number:"
+msgid "December"
+msgstr "系列编�:"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "jan"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "feb"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "mar"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "apr"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "may"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
+msgid "jun"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "jul"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "aug"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "sep"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "oct"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "nov"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
+msgid "dec"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:23
+msgctxt "abbrev. month"
+msgid "Jan."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:24
+msgctxt "abbrev. month"
+msgid "Feb."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:25
+#, fuzzy
+#| msgid "Search"
+msgctxt "abbrev. month"
+msgid "March"
+msgstr "�索"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:26
+msgctxt "abbrev. month"
+msgid "April"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:27
+msgctxt "abbrev. month"
+msgid "May"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:28
+msgctxt "abbrev. month"
+msgid "June"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:29
+msgctxt "abbrev. month"
+msgid "July"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:30
+msgctxt "abbrev. month"
+msgid "Aug."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:31
+msgctxt "abbrev. month"
+msgid "Sept."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:32
+msgctxt "abbrev. month"
+msgid "Oct."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:33
+msgctxt "abbrev. month"
+msgid "Nov."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:34
+msgctxt "abbrev. month"
+msgid "Dec."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:37
+msgctxt "alt. month"
+msgid "January"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:38
+msgctxt "alt. month"
+msgid "February"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:39
+#, fuzzy
+#| msgid "Search"
+msgctxt "alt. month"
+msgid "March"
+msgstr "�索"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:40
+msgctxt "alt. month"
+msgid "April"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:41
+msgctxt "alt. month"
+msgid "May"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:42
+msgctxt "alt. month"
+msgid "June"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:43
+msgctxt "alt. month"
+msgid "July"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:44
+msgctxt "alt. month"
+msgid "August"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:45
+#, fuzzy
+#| msgid "Series number:"
+msgctxt "alt. month"
+msgid "September"
+msgstr "系列编�:"
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:46
+msgctxt "alt. month"
+msgid "October"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:47
+msgctxt "alt. month"
+msgid "November"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/dates.py:48
+#, fuzzy
+#| msgid "Series number:"
+msgctxt "alt. month"
+msgid "December"
+msgstr "系列编�:"
+
+#: venv3/lib/python3.8/site-packages/django/utils/ipv6.py:8
+#, fuzzy
+#| msgid "Email address:"
+msgid "This is not a valid IPv6 address."
+msgstr "邮箱地�:"
+
+#: venv3/lib/python3.8/site-packages/django/utils/text.py:69
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s…"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/text.py:235
+msgid "or"
+msgstr ""
+
+#. Translators: This string is used as a separator between list elements
+#: venv3/lib/python3.8/site-packages/django/utils/text.py:254
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:83
+msgid ", "
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:9
+#, python-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:10
+#, python-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:11
+#, python-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:12
+#, python-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:13
+#, python-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:14
+#, python-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+
+#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:72
+msgid "0 minutes"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:110
+msgid "Forbidden"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:111
+msgid "CSRF verification failed. Request aborted."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:115
+msgid ""
+"You are seeing this message because this HTTPS site requires a “Referer "
+"header� to be sent by your Web browser, but none was sent. This header is "
+"required for security reasons, to ensure that your browser is not being "
+"hijacked by third parties."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:120
+msgid ""
+"If you have configured your browser to disable “Referer� headers, please re-"
+"enable them, at least for this site, or for HTTPS connections, or for “same-"
+"origin� requests."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:124
+msgid ""
+"If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
+"including the “Referrer-Policy: no-referrer� header, please remove them. The "
+"CSRF protection requires the “Referer� header to do strict referer checking. "
+"If you’re concerned about privacy, use alternatives like <a rel=\"noreferrer"
+"\" …> for links to third-party sites."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:132
+msgid ""
+"You are seeing this message because this site requires a CSRF cookie when "
+"submitting forms. This cookie is required for security reasons, to ensure "
+"that your browser is not being hijacked by third parties."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:137
+msgid ""
+"If you have configured your browser to disable cookies, please re-enable "
+"them, at least for this site, or for “same-origin� requests."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/csrf.py:142
+msgid "More information is available with DEBUG=True."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:41
+msgid "No year specified"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:61
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:111
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:208
+msgid "Date out of range"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:90
+msgid "No month specified"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:142
+msgid "No day specified"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:188
+msgid "No week specified"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:338
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:367
+#, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:589
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:623
+#, python-format
+msgid "Invalid date string “%(datestr)s� given format “%(format)s�"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/detail.py:54
+#, fuzzy, python-format
+#| msgid "No books found matching the query \"%(query)s\""
+msgid "No %(verbose_name)s found matching the query"
+msgstr "没有符� \"%(query)s\" 请求的书目"
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/list.py:67
+msgid "Page is not “last�, nor can it be converted to an int."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/list.py:72
+#, python-format
+msgid "Invalid page (%(page_number)s): %(message)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/generic/list.py:154
+#, python-format
+msgid "Empty list and “%(class_name)s.allow_empty� is False."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/static.py:40
+msgid "Directory indexes are not allowed here."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/static.py:42
+#, python-format
+msgid "“%(path)s� does not exist"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/static.py:80
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:7
+msgid "Django: the Web framework for perfectionists with deadlines."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:346
+#, python-format
+msgid ""
+"View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
+"target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:368
+msgid "The install worked successfully! Congratulations!"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:369
+#, python-format
+msgid ""
+"You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
+"%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
+"\">DEBUG=True</a> is in your settings file and you have not configured any "
+"URLs."
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:384
+msgid "Django Documentation"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:385
+msgid "Topics, references, &amp; how-to’s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:396
+msgid "Tutorial: A Polling App"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:397
+msgid "Get started with Django"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:408
+#, fuzzy
+#| msgid "Community"
+msgid "Django Community"
+msgstr "社区"
+
+#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:409
+msgid "Connect, get help, or contribute"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/kombu/transport/qpid.py:1301
+#, python-format
+msgid "Attempting to connect to qpid with SASL mechanism %s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/kombu/transport/qpid.py:1306
+#, python-format
+msgid "Connected to qpid with SASL mechanism %s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/kombu/transport/qpid.py:1324
+#, python-format
+msgid "Unable to connect to qpid with SASL mechanism %s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:371
+msgid "1 second ago"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:377
+msgid "1 minute ago"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:382
+msgid "1 hour ago"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:385
+#, python-format
+msgid "%(time)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:387
+msgid "yesterday"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:387
+#, python-format
+msgid "yesterday at %(time)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:389
+#, python-format
+msgid "%(weekday)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:389
+#, python-format
+msgid "%(weekday)s at %(time)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:392
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:445
+#, python-format
+msgid "%(month_name)s %(day)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:394
+#, python-format
+msgid "%(month_name)s %(day)s at %(time)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:399
+#, python-format
+msgid "%(month_name)s %(day)s, %(year)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:401
+#, python-format
+msgid "%(month_name)s %(day)s, %(year)s at %(time)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:439
+#, python-format
+msgid "%(weekday)s, %(month_name)s %(day)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/locale.py:462
+#, python-format
+msgid "%(commas)s and %(last)s"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:68
+msgctxt "law"
+msgid "right"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:69
+msgctxt "good"
+msgid "right"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:71
+#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:74
+msgctxt "organization"
+msgid "club"
+msgstr ""
+
+#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:76
+#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:77
+msgctxt "stick"
+msgid "club"
+msgstr ""
+
+#~ msgid "Deactivate user"
+#~ msgstr "�用用户"
+
+#~ msgid "Reactivate user"
+#~ msgstr "�用用户"
+
+#~ msgid "Date"
+#~ msgstr "日期"
+
+#, python-format
+#~ msgid ""
+#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
+#~ "\"%(status_path)s\">review</a>"
+#~ msgstr ""
+#~ "回�了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href="
+#~ "\"%(status_path)s\">书评</a>"
+
+#, python-format
+#~ msgid ""
+#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
+#~ "\"%(status_path)s\">comment</a>"
+#~ msgstr ""
+#~ "��了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href="
+#~ "\"%(status_path)s\">评论</a>"
+
+#, python-format
+#~ msgid ""
+#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
+#~ "\"%(status_path)s\">quote</a>"
+#~ msgstr ""
+#~ "回�了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href="
+#~ "\"%(status_path)s\">引用</a>"
+
+#~ msgid "Remove tag"
+#~ msgstr "移除标签"
+
+#~ msgid "Add tag"
+#~ msgstr "添加标签"
+
+#, python-format
+#~ msgid "Books tagged \"%(tag.name)s\""
+#~ msgstr "标有 \"%(tag.name)s\" 标签的书"
+
 #, fuzzy
 #~| msgid "Started"
 #~ msgid "Getting Started"
@@ -2596,9 +4348,6 @@ msgstr "密��置连接已��给 %s"
 #~ msgid "Tags"
 #~ msgstr "标签"
 
-#~ msgid "Your shelves"
-#~ msgstr "你的书架"
-
 #~ msgid "Your lists"
 #~ msgstr "你的列表"
 
@@ -2638,119 +4387,6 @@ msgstr "密��置连接已��给 %s"
 #~ msgid "Send follow request"
 #~ msgstr "��关注请求"
 
-#, fuzzy
-#~| msgid "All messages"
-#~ msgid "Messages"
-#~ msgstr "所有消�"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "Enter a valid email address."
-#~ msgstr "邮箱地�:"
-
-#, fuzzy
-#~| msgid "Series number:"
-#~ msgid "Enter a number."
-#~ msgstr "系列编�:"
-
-#, fuzzy
-#~| msgid "Series number:"
-#~ msgid "Decimal number"
-#~ msgstr "系列编�:"
-
-#, fuzzy
-#~| msgid "List curation:"
-#~ msgid "Duration"
-#~ msgstr "列表策展:"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "Email address"
-#~ msgstr "邮箱地�:"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "IPv4 address"
-#~ msgstr "邮箱地�:"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "IP address"
-#~ msgstr "邮箱地�:"
-
-#, fuzzy
-#~| msgid "No active invites"
-#~ msgid "Positive integer"
-#~ msgstr "无有效的邀请"
-
-#, fuzzy
-#~| msgid "Images"
-#~ msgid "Image"
-#~ msgstr "图�"
-
-#, fuzzy
-#~| msgid "Relationships"
-#~ msgid "One-to-one relationship"
-#~ msgstr "关系"
-
-#, fuzzy
-#~| msgid "This shelf is empty."
-#~ msgid "This field is required."
-#~ msgstr "此书架是空的。"
-
-#, fuzzy
-#~| msgid "This shelf is empty."
-#~ msgid "The submitted file is empty."
-#~ msgstr "此书架是空的。"
-
-#, fuzzy
-#~| msgid "Start reading"
-#~ msgid "Currently"
-#~ msgstr "开始阅读"
-
-#, fuzzy
-#~| msgid "Change shelf"
-#~ msgid "Change"
-#~ msgstr "改�书架"
-
-#, fuzzy
-#~| msgid "Status"
-#~ msgid "Sat"
-#~ msgstr "状�"
-
-#, fuzzy
-#~| msgid "Search"
-#~ msgid "March"
-#~ msgstr "�索"
-
-#, fuzzy
-#~| msgid "Series number:"
-#~ msgid "September"
-#~ msgstr "系列编�:"
-
-#, fuzzy
-#~| msgid "Search"
-#~ msgctxt "abbrev. month"
-#~ msgid "March"
-#~ msgstr "�索"
-
-#, fuzzy
-#~| msgid "Search"
-#~ msgctxt "alt. month"
-#~ msgid "March"
-#~ msgstr "�索"
-
-#, fuzzy
-#~| msgid "Series number:"
-#~ msgctxt "alt. month"
-#~ msgid "September"
-#~ msgstr "系列编�:"
-
-#, fuzzy
-#~| msgid "No books found matching the query \"%(query)s\""
-#~ msgid "No %(verbose_name)s found matching the query"
-#~ msgstr "没有符� \"%(query)s\" 请求的书目"
-
 #~ msgid "Announcements"
 #~ msgstr "公告"
 

From c2ffdb8f03da3e1c6caceaa573efb9d66ec27700 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 26 Apr 2021 10:04:33 -0700
Subject: [PATCH 0959/1285] Import ratings as ratings, not reviews

---
 bookwyrm/importers/importer.py | 45 ++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/bookwyrm/importers/importer.py b/bookwyrm/importers/importer.py
index c1e41897..89c62e73 100644
--- a/bookwyrm/importers/importer.py
+++ b/bookwyrm/importers/importer.py
@@ -116,24 +116,33 @@ def handle_imported_book(source, user, item, include_reviews, privacy):
         read.save()
 
     if include_reviews and (item.rating or item.review):
-        review_title = (
-            "Review of {!r} on {!r}".format(
-                item.book.title,
-                source,
-            )
-            if item.review
-            else ""
-        )
-
         # we don't know the publication date of the review,
         # but "now" is a bad guess
         published_date_guess = item.date_read or item.date_added
-        models.Review.objects.create(
-            user=user,
-            book=item.book,
-            name=review_title,
-            content=item.review,
-            rating=item.rating,
-            published_date=published_date_guess,
-            privacy=privacy,
-        )
+        if item.review:
+            review_title = (
+                "Review of {!r} on {!r}".format(
+                    item.book.title,
+                    source,
+                )
+                if item.review
+                else ""
+            )
+            models.Review.objects.create(
+                user=user,
+                book=item.book,
+                name=review_title,
+                content=item.review,
+                rating=item.rating,
+                published_date=published_date_guess,
+                privacy=privacy,
+            )
+        else:
+            # just a rating
+            models.ReviewRating.objects.create(
+                user=user,
+                book=item.book,
+                rating=item.rating,
+                published_date=published_date_guess,
+                privacy=privacy,
+            )

From 99efe6b290dc07a117764904e41f59480d34f4b8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 26 Apr 2021 10:11:13 -0700
Subject: [PATCH 0960/1285] Limit how many notifications are loaded

---
 bookwyrm/views/notifications.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/views/notifications.py b/bookwyrm/views/notifications.py
index e0e2102d..0324f595 100644
--- a/bookwyrm/views/notifications.py
+++ b/bookwyrm/views/notifications.py
@@ -16,7 +16,7 @@ class Notifications(View):
         notifications = request.user.notification_set.all().order_by("-created_date")
         unread = [n.id for n in notifications.filter(read=False)]
         data = {
-            "notifications": notifications,
+                "notifications": notifications[:50],
             "unread": unread,
         }
         notifications.update(read=True)

From 786cf4fb977857e8e441fbcbec4ca47f430dc04f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 26 Apr 2021 10:26:27 -0700
Subject: [PATCH 0961/1285] Paginate followers/following pages

---
 bookwyrm/templates/user/followers.html | 2 ++
 bookwyrm/templates/user/following.html | 2 ++
 bookwyrm/views/notifications.py        | 2 +-
 bookwyrm/views/user.py                 | 6 ++++--
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/user/followers.html b/bookwyrm/templates/user/followers.html
index 45d87a3d..b294db90 100644
--- a/bookwyrm/templates/user/followers.html
+++ b/bookwyrm/templates/user/followers.html
@@ -29,4 +29,6 @@
     <div>{% blocktrans with username=user.display_name %}{{ username }} has no followers{% endblocktrans %}</div>
     {% endif %}
 </div>
+
+{% include 'snippets/pagination.html' with page=followers path=request.path %}
 {% endblock %}
diff --git a/bookwyrm/templates/user/following.html b/bookwyrm/templates/user/following.html
index 5904c1bb..38c01ad2 100644
--- a/bookwyrm/templates/user/following.html
+++ b/bookwyrm/templates/user/following.html
@@ -29,4 +29,6 @@
     <div>{% blocktrans with username=user|username %}{{ username }} isn't following any users{% endblocktrans %}</div>
     {% endif %}
 </div>
+
+{% include 'snippets/pagination.html' with page=following path=request.path %}
 {% endblock %}
diff --git a/bookwyrm/views/notifications.py b/bookwyrm/views/notifications.py
index 0324f595..3d08cade 100644
--- a/bookwyrm/views/notifications.py
+++ b/bookwyrm/views/notifications.py
@@ -16,7 +16,7 @@ class Notifications(View):
         notifications = request.user.notification_set.all().order_by("-created_date")
         unread = [n.id for n in notifications.filter(read=False)]
         data = {
-                "notifications": notifications[:50],
+            "notifications": notifications[:50],
             "unread": unread,
         }
         notifications.update(read=True)
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index 05fdb606..d394c1d7 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -106,10 +106,11 @@ class Followers(View):
         if is_api_request(request):
             return ActivitypubResponse(user.to_followers_activity(**request.GET))
 
+        paginated = Paginator(user.followers.all(), PAGE_LENGTH)
         data = {
             "user": user,
             "is_self": request.user.id == user.id,
-            "followers": user.followers.all(),
+            "followers": paginated.page(request.GET.get("page", 1)),
         }
         return TemplateResponse(request, "user/followers.html", data)
 
@@ -131,10 +132,11 @@ class Following(View):
         if is_api_request(request):
             return ActivitypubResponse(user.to_following_activity(**request.GET))
 
+        paginated = Paginator(user.followers.all(), PAGE_LENGTH)
         data = {
             "user": user,
             "is_self": request.user.id == user.id,
-            "following": user.following.all(),
+            "following": paginated.page(request.GET.get("page", 1)),
         }
         return TemplateResponse(request, "user/following.html", data)
 

From 8b154b69fbb40caa3e8d115fa494277136b84a0e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 26 Apr 2021 10:35:37 -0700
Subject: [PATCH 0962/1285] Fixes follower/following logic in suggested user
 annotations

---
 bookwyrm/views/helpers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index 8a60b54c..6207f63e 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -190,11 +190,11 @@ def get_annotated_users(user, *args, **kwargs):
         .exclude(Q(id__in=user.blocks.all()) | Q(blocks=user))
         .annotate(
             mutuals=Count(
-                "following",
+                "followers",
                 filter=Q(
                     ~Q(id=user.id),
                     ~Q(id__in=user.following.all()),
-                    following__in=user.following.all(),
+                    followers__in=user.following.all(),
                 ),
                 distinct=True,
             ),

From 141d1a9a17d7f9fd4c0715436e023f96f94b1ed8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 26 Apr 2021 11:22:08 -0700
Subject: [PATCH 0963/1285] Adds auto field setting to avoid hella warnings

---
 bookwyrm/settings.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index fb5488e7..57bf2873 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -34,6 +34,8 @@ LOCALE_PATHS = [
     os.path.join(BASE_DIR, "locale"),
 ]
 
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/2.0/howto/deployment/checklist/
 

From cd869dde09af75c82f741d8768c21fe4423d67f1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 26 Apr 2021 11:28:33 -0700
Subject: [PATCH 0964/1285] Fixes tests of bookwyrm abstract model

---
 bookwyrm/settings.py                     |  2 +-
 bookwyrm/tests/models/test_base_model.py | 20 +++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 57bf2873..b679e2d4 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -34,7 +34,7 @@ LOCALE_PATHS = [
     os.path.join(BASE_DIR, "locale"),
 ]
 
-DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/2.0/howto/deployment/checklist/
diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py
index 5a8350b2..41aff1fc 100644
--- a/bookwyrm/tests/models/test_base_model.py
+++ b/bookwyrm/tests/models/test_base_model.py
@@ -26,20 +26,22 @@ class BaseModel(TestCase):
                 outbox="https://example.com/users/rat/outbox",
             )
 
+        class TestModel(base_model.BookWyrmModel):
+            """ just making it not abstract """
+        self.test_model = TestModel()
+
     def test_remote_id(self):
         """these should be generated"""
-        instance = base_model.BookWyrmModel()
-        instance.id = 1
-        expected = instance.get_remote_id()
-        self.assertEqual(expected, "https://%s/bookwyrmmodel/1" % DOMAIN)
+        self.test_model.id = 1
+        expected = self.test_model.get_remote_id()
+        self.assertEqual(expected, "https://%s/testmodel/1" % DOMAIN)
 
     def test_remote_id_with_user(self):
         """format of remote id when there's a user object"""
-        instance = base_model.BookWyrmModel()
-        instance.user = self.local_user
-        instance.id = 1
-        expected = instance.get_remote_id()
-        self.assertEqual(expected, "https://%s/user/mouse/bookwyrmmodel/1" % DOMAIN)
+        self.test_model.user = self.local_user
+        self.test_model.id = 1
+        expected = self.test_model.get_remote_id()
+        self.assertEqual(expected, "https://%s/user/mouse/testmodel/1" % DOMAIN)
 
     def test_set_remote_id(self):
         """this function sets remote ids after creation"""

From df31ac9742c295f770c00c07e2e34b6c44b0981d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 26 Apr 2021 11:33:17 -0700
Subject: [PATCH 0965/1285] Show rating in statuses

---
 bookwyrm/templates/snippets/status/status_header.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html
index 3b46b9ce..b9faf64e 100644
--- a/bookwyrm/templates/snippets/status/status_header.html
+++ b/bookwyrm/templates/snippets/status/status_header.html
@@ -6,7 +6,7 @@
     <figure class="media-left" aria-hidden="true">
         <a class="image is-48x48" href="{{ status.user.local_path }}">
             {% include 'snippets/avatar.html' with user=status.user ariaHide="true" medium="true" %}
-        </a>    
+        </a>
     </figure>
 
     <div class="media-content">
@@ -47,7 +47,7 @@
 
             {% if status.book %}
                 {% if status.status_type == 'GeneratedNote' or status.status_type == 'Rating' %}
-                    <a href="/book/{{ status.book.id }}">{{ status.book|title }}</a>{% if status.status_type == 'Rating' %}:
+                    <a href="/book/{{ status.book.id }}">{{ status.book|title }}</a>{% if status.status_type == 'Rating' %}: {% include 'snippets/stars.html' with rating=status.rating %}
                     <span
                         itemprop="reviewRating"
                         itemscope
@@ -71,7 +71,6 @@
                                         <meta itemprop="bestRating" content="5">
                                 </span>
 
-                                {% include 'snippets/stars.html' with rating=status.rating %}
                                 {% endif %}
                             {% else %}
                                 {% include 'snippets/book_titleby.html' with book=status.book %}

From b16ac91b16b8c2542a50cb7b6e57445225f864ac Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 26 Apr 2021 11:34:04 -0700
Subject: [PATCH 0966/1285] Python formatting

---
 bookwyrm/tests/models/test_base_model.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py
index 41aff1fc..d500e8ea 100644
--- a/bookwyrm/tests/models/test_base_model.py
+++ b/bookwyrm/tests/models/test_base_model.py
@@ -28,6 +28,7 @@ class BaseModel(TestCase):
 
         class TestModel(base_model.BookWyrmModel):
             """ just making it not abstract """
+
         self.test_model = TestModel()
 
     def test_remote_id(self):

From ff8601f329c5b90b28ca7746071cfbb3694fdffb Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 26 Apr 2021 11:37:07 -0700
Subject: [PATCH 0967/1285] Fixes spacing for new Black release

---
 bookwyrm/tests/models/test_base_model.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py
index d500e8ea..f473085b 100644
--- a/bookwyrm/tests/models/test_base_model.py
+++ b/bookwyrm/tests/models/test_base_model.py
@@ -27,7 +27,7 @@ class BaseModel(TestCase):
             )
 
         class TestModel(base_model.BookWyrmModel):
-            """ just making it not abstract """
+            """just making it not abstract"""
 
         self.test_model = TestModel()
 

From 5bb341ba52efc6621153f7bf65a45924e87245b5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 26 Apr 2021 11:43:13 -0700
Subject: [PATCH 0968/1285] Use copy of requests GET params in list redirect

---
 bookwyrm/views/list.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index 6a241ada..89b936e9 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -270,7 +270,7 @@ def add_book(request):
         pass
 
     path = reverse("list", args=[book_list.id])
-    params = request.GET
+    params = request.GET.copy()
     params["updated"] = True
     return redirect("{:s}?{:s}".format(path, urlencode(params)))
 

From 7006f30ac8c0e4f6985de079d4834d920f5353c8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 26 Apr 2021 11:51:17 -0700
Subject: [PATCH 0969/1285] Uses unique test model name

---
 bookwyrm/tests/models/test_base_model.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py
index f473085b..ef2cd900 100644
--- a/bookwyrm/tests/models/test_base_model.py
+++ b/bookwyrm/tests/models/test_base_model.py
@@ -26,10 +26,10 @@ class BaseModel(TestCase):
                 outbox="https://example.com/users/rat/outbox",
             )
 
-        class TestModel(base_model.BookWyrmModel):
+        class BookWyrmTestModel(base_model.BookWyrmModel):
             """just making it not abstract"""
 
-        self.test_model = TestModel()
+        self.test_model = BookWyrmTestModel()
 
     def test_remote_id(self):
         """these should be generated"""

From 4deb94714cf411b9383b03a3ba294a7bb1ebb1b0 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 26 Apr 2021 13:48:54 -0700
Subject: [PATCH 0970/1285] Adds test for import rating

---
 .../tests/importers/test_goodreads_import.py  | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/bookwyrm/tests/importers/test_goodreads_import.py b/bookwyrm/tests/importers/test_goodreads_import.py
index 0e39d5ec..655567d0 100644
--- a/bookwyrm/tests/importers/test_goodreads_import.py
+++ b/bookwyrm/tests/importers/test_goodreads_import.py
@@ -228,6 +228,32 @@ class GoodreadsImport(TestCase):
         self.assertEqual(review.published_date.day, 8)
         self.assertEqual(review.privacy, "unlisted")
 
+    @patch("bookwyrm.activitystreams.ActivityStream.add_status")
+    def test_handle_imported_book_rating(self, _):
+        """goodreads rating import"""
+        import_job = models.ImportJob.objects.create(user=self.user)
+        datafile = pathlib.Path(__file__).parent.joinpath(
+            "../data/goodreads-rating.csv"
+        )
+        csv_file = open(datafile, "r")
+        entry = list(csv.DictReader(csv_file))[2]
+        entry = self.importer.parse_fields(entry)
+        import_item = models.ImportItem.objects.create(
+            job_id=import_job.id, index=0, data=entry, book=self.book
+        )
+
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            handle_imported_book(
+                self.importer.service, self.user, import_item, True, "unlisted"
+            )
+        review = models.ReviewRating.objects.get(book=self.book, user=self.user)
+        self.assertIsInstance(review, models.ReviewRating)
+        self.assertEqual(review.rating, 2)
+        self.assertEqual(review.published_date.year, 2019)
+        self.assertEqual(review.published_date.month, 7)
+        self.assertEqual(review.published_date.day, 8)
+        self.assertEqual(review.privacy, "unlisted")
+
     def test_handle_imported_book_reviews_disabled(self):
         """goodreads review import"""
         import_job = models.ImportJob.objects.create(user=self.user)

From 55eb1c45263b403f0c9b3f06fcc6607b3cca35bf Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 26 Apr 2021 13:50:43 -0700
Subject: [PATCH 0971/1285] Fixes model name

---
 bookwyrm/tests/models/test_base_model.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py
index ef2cd900..75d0444c 100644
--- a/bookwyrm/tests/models/test_base_model.py
+++ b/bookwyrm/tests/models/test_base_model.py
@@ -35,14 +35,14 @@ class BaseModel(TestCase):
         """these should be generated"""
         self.test_model.id = 1
         expected = self.test_model.get_remote_id()
-        self.assertEqual(expected, "https://%s/testmodel/1" % DOMAIN)
+        self.assertEqual(expected, "https://%s/bookwyrmtestmodel/1" % DOMAIN)
 
     def test_remote_id_with_user(self):
         """format of remote id when there's a user object"""
         self.test_model.user = self.local_user
         self.test_model.id = 1
         expected = self.test_model.get_remote_id()
-        self.assertEqual(expected, "https://%s/user/mouse/testmodel/1" % DOMAIN)
+        self.assertEqual(expected, "https://%s/user/mouse/bookwyrmtestmodel/1" % DOMAIN)
 
     def test_set_remote_id(self):
         """this function sets remote ids after creation"""

From 674c4a99dfdd043e99d60f5bddbcba0846fa5f29 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 26 Apr 2021 13:56:09 -0700
Subject: [PATCH 0972/1285] Adds missing data file

---
 bookwyrm/tests/data/goodreads-rating.csv | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 bookwyrm/tests/data/goodreads-rating.csv

diff --git a/bookwyrm/tests/data/goodreads-rating.csv b/bookwyrm/tests/data/goodreads-rating.csv
new file mode 100644
index 00000000..fec0c77d
--- /dev/null
+++ b/bookwyrm/tests/data/goodreads-rating.csv
@@ -0,0 +1,5 @@
+Book Id,Title,Author,Author l-f,Additional Authors,ISBN,ISBN13,My Rating,Average Rating,Publisher,Binding,Number of Pages,Year Published,Original Publication Year,Date Read,Date Added,Bookshelves,Bookshelves with positions,Exclusive Shelf,My Review,Spoiler,Private Notes,Read Count,Recommended For,Recommended By,Owned Copies,Original Purchase Date,Original Purchase Location,Condition,Condition Description,BCID
+42036538,Gideon the Ninth (The Locked Tomb #1),Tamsyn Muir,"Muir, Tamsyn",,"=""1250313198""","=""9781250313195""",0,4.20,Tor,Hardcover,448,2019,2019,2020/10/25,2020/10/21,,,read,,,,1,,,0,,,,,
+52691223,Subcutanean,Aaron A. Reed,"Reed, Aaron A.",,"=""""","=""""",0,4.45,,Paperback,232,2020,,2020/03/06,2020/03/05,,,read,,,,1,,,0,,,,,
+28694510,Patisserie at Home,Mélanie Dupuis,"Dupuis, Mélanie",Anne Cazor,"=""0062445316""","=""9780062445315""",2,4.60,Harper Design,Hardcover,288,2016,,,2019/07/08,,,read,,,,2,,,0,,,,,
+

From 85297426e07917c20d5d5d7fed344380af5b6608 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 26 Apr 2021 14:33:16 -0700
Subject: [PATCH 0973/1285] Adds merge migration

---
 ...63_auto_20210407_0045_0070_auto_20210423_0121.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 bookwyrm/migrations/0071_merge_0063_auto_20210407_0045_0070_auto_20210423_0121.py

diff --git a/bookwyrm/migrations/0071_merge_0063_auto_20210407_0045_0070_auto_20210423_0121.py b/bookwyrm/migrations/0071_merge_0063_auto_20210407_0045_0070_auto_20210423_0121.py
new file mode 100644
index 00000000..b6489b80
--- /dev/null
+++ b/bookwyrm/migrations/0071_merge_0063_auto_20210407_0045_0070_auto_20210423_0121.py
@@ -0,0 +1,13 @@
+# Generated by Django 3.2 on 2021-04-26 21:32
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0063_auto_20210407_0045"),
+        ("bookwyrm", "0070_auto_20210423_0121"),
+    ]
+
+    operations = []

From 7b65291a59b6f3b5f7a64360227ce41451aec5b5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 26 Apr 2021 14:43:29 -0700
Subject: [PATCH 0974/1285] Python formatting for the new Black standard

---
 bookwyrm/activitypub/book.py              |  2 +-
 bookwyrm/connectors/abstract_connector.py |  4 ++--
 bookwyrm/connectors/inventaire.py         | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bookwyrm/activitypub/book.py b/bookwyrm/activitypub/book.py
index dfe14b6f..597d7a66 100644
--- a/bookwyrm/activitypub/book.py
+++ b/bookwyrm/activitypub/book.py
@@ -8,7 +8,7 @@ from .image import Document
 
 @dataclass(init=False)
 class BookData(ActivityObject):
-    """ shared fields for all book data and authors"""
+    """shared fields for all book data and authors"""
 
     openlibraryKey: str = None
     inventaireId: str = None
diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index 14fe3cb7..fd2b2707 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -69,7 +69,7 @@ class AbstractMinimalConnector(ABC):
         return results
 
     def get_search_data(self, remote_id, **kwargs):  # pylint: disable=no-self-use
-        """ this allows connectors to override the default behavior """
+        """this allows connectors to override the default behavior"""
         return get_data(remote_id, **kwargs)
 
     @abstractmethod
@@ -155,7 +155,7 @@ class AbstractConnector(AbstractMinimalConnector):
         return edition
 
     def get_book_data(self, remote_id):  # pylint: disable=no-self-use
-        """ this allows connectors to override the default behavior """
+        """this allows connectors to override the default behavior"""
         return get_data(remote_id)
 
     def create_edition_from_data(self, work, edition_data):
diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index 594fe810..ae6fb862 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -6,7 +6,7 @@ from .connector_manager import ConnectorException
 
 
 class Connector(AbstractConnector):
-    """ instantiate a connector for OL """
+    """instantiate a connector for OL"""
 
     def __init__(self, identifier):
         super().__init__(identifier)
@@ -51,7 +51,7 @@ class Connector(AbstractConnector):
         ] + shared_mappings
 
     def get_remote_id(self, value):
-        """ convert an id/uri into a url """
+        """convert an id/uri into a url"""
         return "{:s}?action=by-uris&uris={:s}".format(self.books_url, value)
 
     def get_book_data(self, remote_id):
@@ -88,16 +88,16 @@ class Connector(AbstractConnector):
         )
 
     def parse_isbn_search_data(self, data):
-        """ boop doop """
+        """boop doop"""
 
     def format_isbn_search_result(self, search_result):
-        """ beep bloop """
+        """beep bloop"""
 
     def is_work_data(self, data):
         return data.get("type") == "work"
 
     def load_edition_data(self, work_uri):
-        """ get a list of editions for a work """
+        """get a list of editions for a work"""
         url = "{:s}?action=reverse-claims&property=wdt:P629&value={:s}".format(
             self.books_url, work_uri
         )
@@ -149,7 +149,7 @@ class Connector(AbstractConnector):
         return "%s%s" % (self.covers_url, cover_id)
 
     def resolve_keys(self, keys):
-        """ cool, it's "wd:Q3156592" now what the heck does that mean """
+        """cool, it's "wd:Q3156592" now what the heck does that mean"""
         results = []
         for uri in keys:
             try:
@@ -161,5 +161,5 @@ class Connector(AbstractConnector):
 
 
 def get_language_code(options, code="en"):
-    """ when there are a bunch of translation but we need a single field """
+    """when there are a bunch of translation but we need a single field"""
     return options.get(code)

From 8ddc292ee634af784594b307c53f02fe3fb9174e Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Tue, 27 Apr 2021 14:58:30 +0200
Subject: [PATCH 0975/1285] cover: Change the logic again:

- Work on feeds.
- Add `.is-cover` to modify the behaviours of columns.
- Only apply logic for dimensions on the cover container; too many contextual side effects otherwise.
- Add classes to dimension and align, including auto margins for flex.
- Rename classes in templates accordingly.
---
 bookwyrm/static/css/bookwyrm.css              | 243 ++++++++++++++++--
 bookwyrm/templates/book/book.html             |   2 +-
 bookwyrm/templates/book/edit_book.html        |   2 +-
 bookwyrm/templates/book/editions.html         |   8 +-
 bookwyrm/templates/discover/small-book.html   |   2 +-
 bookwyrm/templates/feed/feed_layout.html      |   2 +-
 bookwyrm/templates/import_status.html         |   2 +-
 bookwyrm/templates/lists/curate.html          |  10 +-
 bookwyrm/templates/lists/list.html            |  16 +-
 bookwyrm/templates/lists/list_items.html      |   4 +-
 .../snippets/search_result_text.html          |   4 +-
 .../snippets/status/content_status.html       |  39 +--
 .../snippets/status/generated_status.html     |  31 ++-
 bookwyrm/templates/user/user.html             |   2 +-
 14 files changed, 294 insertions(+), 73 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 8f95cfeb..4d27c2a4 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -159,19 +159,33 @@ body {
 
 /** Book covers
  *
- * - The context gives the extrinsic dimensions.
- * - .cover-container gives the intrinsic dimensions and position.
+ * - .is-cover gives the behaviour of the cover and its surrounding.
+ * - .cover-container gives the dimensions and position (for borders, image and other elements).
  * - .book-cover is positioned and sized based on its container.
+ *
+ * To have the cover with specific dimensions, specify a width or height for
+ * standard bulma’s named breapoints:
+ *
+ * is-[w|h]-[xs|s|m|l|xl]-[mobile|tablet|desktop]
  ******************************************************************************/
 
+.column.is-cover {
+    flex-grow: 0 !important;
+}
+
+.column.is-cover,
+.column.is-cover + .column {
+    flex-basis: auto !important;
+}
+
 .cover-container {
     display: flex;
+    justify-content: center;
+    align-items: center;
     position: relative;
+    width: max-content;
+    max-width: 100%;
     overflow: hidden;
-    min-width: 80px;
-    min-height: 100px;
-    max-width: max-content;
-    outline: solid 1px #dbdbdb;
 }
 
 /* Book cover
@@ -278,46 +292,231 @@ body {
     min-height: 96px !important;
 }
 
-.is-h-small {
+.is-w-auto {
+    width: auto !important;
+}
+
+.is-w-xs {
+    width: 80px !important;
+}
+
+.is-w-s {
+    width: 100px !important;
+}
+
+.is-w-m {
+    width: 150px !important;
+}
+
+.is-w-l {
+    width: 200px !important;
+}
+
+.is-h-xs {
+    height: 80px !important;
+}
+
+.is-h-s {
     height: 100px !important;
 }
 
-.is-h-medium {
+.is-h-m {
     height: 150px !important;
 }
 
+.is-h-l {
+    height: 200px !important;
+}
+
 @media only screen and (max-width: 768px) {
-    .is-h-medium-mobile {
-        height: 150px;
+    .is-w-auto-mobile {
+        width: auto !important;
+    }
+
+    .is-w-xs-mobile {
+        width: 80px !important;
+    }
+
+    .is-w-s-mobile {
+        width: 100px !important;
+    }
+
+    .is-w-m-mobile {
+        width: 150px !important;
+    }
+
+    .is-w-l-mobile {
+        width: 200px !important;
+    }
+
+    .is-h-xs-mobile {
+        height: 80px !important;
+    }
+
+    .is-h-s-mobile {
+        height: 100px !important;
+    }
+
+    .is-h-m-mobile {
+        height: 150px !important;
+    }
+
+    .is-h-l-mobile {
+        height: 200px !important;
     }
 }
 
-.is-min-w-none {
-    min-width: auto !important;
+@media only screen and (min-width: 769px) {
+    .is-w-auto-tablet {
+        width: auto !important;
+    }
+
+    .is-w-xs-tablet {
+        width: 80px !important;
+    }
+
+    .is-w-s-tablet {
+        width: 100px !important;
+    }
+
+    .is-w-m-tablet {
+        width: 150px !important;
+    }
+
+    .is-w-l-tablet {
+        width: 200px !important;
+    }
+
+    .is-h-xs-tablet {
+        height: 80px !important;
+    }
+
+    .is-h-s-tablet {
+        height: 100px !important;
+    }
+
+    .is-h-m-tablet {
+        height: 150px !important;
+    }
+
+    .is-h-l-tablet {
+        height: 200px !important;
+    }
+}
+
+@media only screen and (min-width: 1024px) {
+    .is-w-auto-desktop {
+        width: auto !important;
+    }
+
+    .is-w-xs-desktop {
+        width: 80px !important;
+    }
+
+    .is-w-s-desktop {
+        width: 100px !important;
+    }
+
+    .is-w-m-desktop {
+        width: 150px !important;
+    }
+
+    .is-w-l-desktop {
+        width: 200px !important;
+    }
+
+    .is-h-xs-desktop {
+        height: 80px !important;
+    }
+
+    .is-h-s-desktop {
+        height: 100px !important;
+    }
+
+    .is-h-m-desktop {
+        height: 150px !important;
+    }
+
+    .is-h-l-desktop {
+        height: 200px !important;
+    }
 }
 
 /* Alignments
  ******************************************************************************/
 
 /* Flex item position
- *
- * This is for a default `flex-direction: row`.
  * -------------------------------------------------------------------------- */
 
-.align-r {
-    justify-content: flex-end;
+.align {
+    display: flex !important;
+    flex-direction: row !important;
+}
+
+.align.to-c {
+    justify-content: center !important;
+}
+
+.align.to-r {
+    justify-content: flex-end !important;
+}
+
+.align.to-l {
+    justify-content: flex-start !important;
+}
+
+@media screen and (max-width: 768px) {
+    .align.to-c-mobile {
+        justify-content: center !important;
+    }
+
+    .align.to-r-mobile {
+        justify-content: flex-end !important;
+    }
+
+    .align.to-l-mobile {
+        justify-content: flex-start !important;
+    }
 }
 
 @media screen and (min-width: 769px) {
-    .align-r-tablet {
-        justify-content: flex-end;
+    .align.to-c-tablet {
+        justify-content: center !important;
+    }
+
+    .align.to-r-tablet {
+        justify-content: flex-end !important;
+    }
+
+    .align.to-l-tablet {
+        justify-content: flex-start !important;
     }
 }
 
 /* Spacings
  ******************************************************************************/
 
+.mr-auto {
+    margin-right: auto !important;
+}
+
+.ml-auto {
+    margin-left: auto !important;
+}
+
 @media screen and (max-width: 768px) {
+    .mr-auto-mobile {
+        margin-right: auto !important;
+    }
+
+    .ml-auto-mobile {
+        margin-left: auto !important;
+    }
+
+    .ml-3-mobile {
+        margin-left: 0.75rem !important;
+    }
+
     .my-3-mobile {
         margin-top: 0.75rem !important;
         margin-bottom: 0.75rem !important;
@@ -325,6 +524,14 @@ body {
 }
 
 @media screen and (min-width: 769px) {
+    .mr-auto-tablet {
+        margin-right: auto !important;
+    }
+
+    .ml-auto-tablet {
+        margin-left: auto !important;
+    }
+
     .ml-3-tablet {
         margin-left: 0.75rem !important;
     }
diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index 23f7dac0..a9932910 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -48,7 +48,7 @@
 
     <div class="columns">
         <div class="column is-one-fifth">
-            {% include 'snippets/book_cover.html' with book=book cover_class='is-h-medium-mobile' %}
+            {% include 'snippets/book_cover.html' with book=book cover_class='is-h-m-mobile' %}
             {% include 'snippets/rate_action.html' with user=request.user book=book %}
 
             <div class="mb-3">
diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html
index 0cb1a9b1..de9c9535 100644
--- a/bookwyrm/templates/book/edit_book.html
+++ b/bookwyrm/templates/book/edit_book.html
@@ -170,7 +170,7 @@
             <h2 class="title is-4">{% trans "Cover" %}</h2>
             <div class="columns">
                 <div class="column is-narrow">
-                    {% include 'snippets/book_cover.html' with book=book cover_class='is-h-small' %}
+                    {% include 'snippets/book_cover.html' with book=book cover_class='is-h-s' %}
                 </div>
                 <div class="column is-narrow">
                     <div class="block">
diff --git a/bookwyrm/templates/book/editions.html b/bookwyrm/templates/book/editions.html
index 009bdd66..dd580234 100644
--- a/bookwyrm/templates/book/editions.html
+++ b/bookwyrm/templates/book/editions.html
@@ -14,11 +14,11 @@
 <div class="block">
     {% for book in editions %}
     <div class="columns is-gapless mb-6">
-        <div class="column is-2 is-flex align-r-tablet">
-            {% include 'snippets/book_cover.html' with book=book cover_class='is-h-medium' %}
+        <div class="column is-cover">
+            {% include 'snippets/book_cover.html' with book=book cover_class='is-w-m is-h-m align to-l-mobile' %}
         </div>
 
-        <div class="column is-flex-grow-1 my-3-mobile mx-3-tablet">
+        <div class="column my-3-mobile ml-3-tablet mr-auto">
             <h2 class="title is-5 mb-1">
                 <a href="/book/{{ book.id }}" class="has-text-black">
                     {{ book.title }}
@@ -26,7 +26,7 @@
             </h2>
 
             {% with book=book %}
-                <div class="columns is-multiline is-gapless">
+                <div class="columns is-multiline is-gapless ml-3-tablet">
                     <div class="column is-half">
                         {% include 'book/publisher_info.html' %}
                     </div>
diff --git a/bookwyrm/templates/discover/small-book.html b/bookwyrm/templates/discover/small-book.html
index c1f5f165..f0e1626c 100644
--- a/bookwyrm/templates/discover/small-book.html
+++ b/bookwyrm/templates/discover/small-book.html
@@ -6,7 +6,7 @@
     {% with book=book %}
         <a
             href="{{ book.local_path }}"
-        >{% include 'snippets/book_cover.html' with cover_class='is-h-small' %}</a>
+        >{% include 'snippets/book_cover.html' with cover_class='is-h-s' %}</a>
 
         {% include 'snippets/stars.html' with rating=book|rating:request.user %}
 
diff --git a/bookwyrm/templates/feed/feed_layout.html b/bookwyrm/templates/feed/feed_layout.html
index 669c2aaa..75fc1951 100644
--- a/bookwyrm/templates/feed/feed_layout.html
+++ b/bookwyrm/templates/feed/feed_layout.html
@@ -37,7 +37,7 @@
                                         aria-label="{{ book.title }}"
                                         aria-selected="{% if active_book == book.id|stringformat:'d' %}true{% elif shelf_counter == 1 and forloop.first %}true{% else %}false{% endif %}"
                                         aria-controls="book-{{ book.id }}">
-                                        {% include 'snippets/book_cover.html' with book=book cover_class='is-h-medium' %}
+                                        {% include 'snippets/book_cover.html' with book=book cover_class='is-h-m' %}
                                     </a>
                                 </li>
                                 {% endfor %}
diff --git a/bookwyrm/templates/import_status.html b/bookwyrm/templates/import_status.html
index 05c811d2..3ce929e6 100644
--- a/bookwyrm/templates/import_status.html
+++ b/bookwyrm/templates/import_status.html
@@ -125,7 +125,7 @@
             <td>
                 {% if item.book %}
                 <a href="/book/{{ item.book.id }}">
-                {% include 'snippets/book_cover.html' with book=item.book cover_class='is-h-small' %}
+                {% include 'snippets/book_cover.html' with book=item.book cover_class='is-h-s' %}
                 </a>
                 {% endif %}
             </td>
diff --git a/bookwyrm/templates/lists/curate.html b/bookwyrm/templates/lists/curate.html
index 529f51c3..492b399b 100644
--- a/bookwyrm/templates/lists/curate.html
+++ b/bookwyrm/templates/lists/curate.html
@@ -25,23 +25,23 @@
                         mb-6
                     "
                 >
-                    <dt class="column is-5-tablet is-6-desktop">
+                    <dt class="column mr-auto">
                         <div class="columns is-mobile is-gapless is-vcentered">
                             <a
-                                class="column"
+                                class="column is-cover"
                                 href="{{ book.local_path }}"
                                 aria-hidden="true"
                             >
-                                {% include 'snippets/book_cover.html' %}
+                                {% include 'snippets/book_cover.html' with cover_class='is-w-xs-mobile is-w-s is-h-xs-mobile is-h-s' %}
                             </a>
 
-                            <div class="column is-10-mobile is-10-tablet ml-3">
+                            <div class="column ml-3">
                                 {% include 'snippets/book_titleby.html' %}
                             </div>
                         </div>
                     </dt>
 
-                    <dd class="column is-3-tablet is-3-desktop my-3">
+                    <dd class="column is-4-tablet mx-3-tablet my-3-mobile">
                         {% trans "Suggested by" %}
 
                         <a href="{{ item.user.local_path }}">
diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index 0b1b05d3..b28c469d 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -37,13 +37,13 @@
                                 columns is-mobile is-gapless
                             "
                         >
-                            <div class="column">
+                            <div class="column is-2-mobile is-cover">
                                 <a href="{{ item.book.local_path }}" aria-hidden="true">
-                                    {% include 'snippets/book_cover.html' %}
+                                    {% include 'snippets/book_cover.html' with cover_class='is-w-auto is-h-m is-h-s-mobile' %}
                                 </a>
                             </div>
 
-                            <div class="column is-9-mobile is-10-tablet ml-3">
+                            <div class="column ml-3">
                                 <span>{% include 'snippets/book_titleby.html' %}</span>
                                 {% include 'snippets/stars.html' with rating=item.book|rating:request.user %}
                                 {% include 'snippets/shelve_button/shelve_button.html' %}
@@ -133,11 +133,15 @@
         {% if suggested_books|length > 0 %}
             {% for book in suggested_books %}
                 <div class="columns is-mobile is-gapless">
-                    <a class="column" href="{{ book.local_path }}" aria-hidden="true">
-                        {% include 'snippets/book_cover.html' with book=book %}
+                    <a
+                        class="column is-cover align to-c"
+                        href="{{ book.local_path }}"
+                        aria-hidden="true"
+                    >
+                        {% include 'snippets/book_cover.html' with book=book cover_class='is-w-s-tablet is-h-xs is-h-s-mobile' %}
                     </a>
 
-                    <div class="column is-9-mobile is-8-tablet ml-3">
+                    <div class="column ml-3">
                         <p>{% include 'snippets/book_titleby.html' with book=book %}</p>
 
                         <form class="mt-1" name="add-book" method="post" action="{% url 'list-add-book' %}">
diff --git a/bookwyrm/templates/lists/list_items.html b/bookwyrm/templates/lists/list_items.html
index f1a4938e..b59e2a96 100644
--- a/bookwyrm/templates/lists/list_items.html
+++ b/bookwyrm/templates/lists/list_items.html
@@ -13,8 +13,8 @@
                 {% if list_books %}
                     <div class="card-image columns is-mobile is-gapless is-clipped">
                         {% for book in list_books %}
-                            <a class="column is-narrow" href="{{ book.book.local_path }}">
-                                {% include 'snippets/book_cover.html' with book=book.book cover_class='is-min-w-none is-h-small' aria='show' %}
+                            <a class="column is-cover" href="{{ book.book.local_path }}">
+                                {% include 'snippets/book_cover.html' with book=book.book cover_class='is-h-s' aria='show' %}
                             </a>
                         {% endfor %}
                     </div>
diff --git a/bookwyrm/templates/snippets/search_result_text.html b/bookwyrm/templates/snippets/search_result_text.html
index e234c82c..663ef865 100644
--- a/bookwyrm/templates/snippets/search_result_text.html
+++ b/bookwyrm/templates/snippets/search_result_text.html
@@ -1,6 +1,8 @@
 {% load i18n %}
 <div class="columns is-mobile is-gapless">
-    {% include 'snippets/book_cover.html' with book=result cover_class='column' img_path=false %}
+    <div class="column is-cover">
+        {% include 'snippets/book_cover.html' with book=result cover_class='is-w-xs is-h-xs' img_path=false %}
+    </div>
 
     <div class="column is-10 ml-3">
         <p>
diff --git a/bookwyrm/templates/snippets/status/content_status.html b/bookwyrm/templates/snippets/status/content_status.html
index b2946b83..31ba33b5 100644
--- a/bookwyrm/templates/snippets/status/content_status.html
+++ b/bookwyrm/templates/snippets/status/content_status.html
@@ -10,27 +10,30 @@
     {% endif %}
 >
 
-    <div class="columns">
+    <div class="columns is-gapless">
         {% if not hide_book %}
-        {% with book=status.book|default:status.mention_books.first %}
-        {% if book %}
-        <div class="column is-narrow">
-            <div class="columns is-mobile">
-                <div class="column is-narrow">
-                    <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book %}</a>
-                    {% include 'snippets/stars.html' with rating=book|rating:request.user %}
-                    {% include 'snippets/shelve_button/shelve_button.html' with book=book %}
-                </div>
-                <div class="column is-hidden-tablet">
-                    <p>{{ book|book_description|to_markdown|default:""|safe|truncatewords_html:15 }}</p>
-                </div>
-            </div>
-        </div>
-        {% endif %}
-        {% endwith %}
+            {% with book=status.book|default:status.mention_books.first %}
+                {% if book %}
+                    <div class="column is-cover">
+                        <div class="columns is-mobile is-gapless">
+                            <div class="column is-cover">
+                                <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book cover_class='is-h-xs is-h-l-tablet' %}</a>
+
+                                {% include 'snippets/stars.html' with rating=book|rating:request.user %}
+
+                                {% include 'snippets/shelve_button/shelve_button.html' with book=book %}
+                            </div>
+
+                            <div class="column ml-3-mobile is-hidden-tablet">
+                                <p>{{ book|book_description|to_markdown|default:""|safe|truncatewords_html:15 }}</p>
+                            </div>
+                        </div>
+                    </div>
+                {% endif %}
+            {% endwith %}
         {% endif %}
 
-        <article class="column">
+        <article class="column ml-3-tablet my-3-mobile">
             {% if status_type == 'Review' %}
             <header class="mb-2">
                 <h3
diff --git a/bookwyrm/templates/snippets/status/generated_status.html b/bookwyrm/templates/snippets/status/generated_status.html
index f89f7c48..919763f7 100644
--- a/bookwyrm/templates/snippets/status/generated_status.html
+++ b/bookwyrm/templates/snippets/status/generated_status.html
@@ -4,20 +4,25 @@
 {% load i18n %}
 
 {% if not hide_book %}
-{% with book=status.book|default:status.mention_books.first %}
-<div class="columns is-mobile">
-    <div class="column is-narrow">
-        <div>
-            <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book cover_class='is-h-small' %}</a>
+    {% with book=status.book|default:status.mention_books.first %}
+        <div class="columns is-mobile is-gapless">
+            <a class="column is-cover is-narrow" href="{{ book.local_path }}">
+                {% include 'snippets/book_cover.html' with book=book cover_class='is-h-xs is-h-s-tablet' %}
+            </a>
+
+            <div class="column ml-3">
+                <h3 class="title is-6 mb-1">
+                    {% include 'snippets/book_titleby.html' with book=book %}
+                </h3>
+
+                <p>
+                    {{ book|book_description|to_markdown|default:""|safe|truncatewords_html:20 }}
+                </p>
+
+                {% include 'snippets/shelve_button/shelve_button.html' with book=book %}
+            </div>
         </div>
-    </div>
-    <div class="column">
-        <h3 class="title is-6 mb-1">{% include 'snippets/book_titleby.html' with book=book %}</h3>
-        <p>{{ book|book_description|to_markdown|default:""|safe|truncatewords_html:20 }}</p>
-        {% include 'snippets/shelve_button/shelve_button.html' with book=book %}
-    </div>
-</div>
-{% endwith %}
+    {% endwith %}
 {% endif %}
 
 {% endspaceless %}
diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index 80dac213..444385fe 100644
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -36,7 +36,7 @@
             {% for book in shelf.books %}
             <div class="control">
                 <a href="{{ book.local_path }}">
-                {% include 'snippets/book_cover.html' with book=book cover_class='is-h-medium' %}
+                {% include 'snippets/book_cover.html' with book=book cover_class='is-h-m' %}
                 </a>
             </div>
             {% endfor %}

From d8b6676976f48b24dcc2873aebb8eb3143112a9e Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Tue, 27 Apr 2021 16:27:39 +0200
Subject: [PATCH 0976/1285] cover: Udpate logged out home and discover.

---
 bookwyrm/static/css/bookwyrm.css            | 44 +++++++++++++++++++++
 bookwyrm/templates/discover/large-book.html | 10 +++--
 bookwyrm/templates/discover/small-book.html |  6 +--
 3 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 4d27c2a4..98801fa1 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -167,6 +167,9 @@ body {
  * standard bulma’s named breapoints:
  *
  * is-[w|h]-[xs|s|m|l|xl]-[mobile|tablet|desktop]
+ *
+ * When using `.column.is-N`, add `.is-w-auto` to the container so that the flex
+ * calculations are not biased by the default `max-content`.
  ******************************************************************************/
 
 .column.is-cover {
@@ -280,6 +283,7 @@ body {
 }
 
 /* Dimensions
+ * @todo These could be in rem.
  ******************************************************************************/
 
 .is-32x32 {
@@ -312,6 +316,10 @@ body {
     width: 200px !important;
 }
 
+.is-w-xxl {
+    width: 500px !important;
+}
+
 .is-h-xs {
     height: 80px !important;
 }
@@ -328,6 +336,10 @@ body {
     height: 200px !important;
 }
 
+.is-h-xxl {
+    height: 500px !important;
+}
+
 @media only screen and (max-width: 768px) {
     .is-w-auto-mobile {
         width: auto !important;
@@ -349,6 +361,10 @@ body {
         width: 200px !important;
     }
 
+    .is-w-xxl-mobile {
+        width: 500px !important;
+    }
+
     .is-h-xs-mobile {
         height: 80px !important;
     }
@@ -364,6 +380,10 @@ body {
     .is-h-l-mobile {
         height: 200px !important;
     }
+
+    .is-h-xxl-mobile {
+        height: 500px !important;
+    }
 }
 
 @media only screen and (min-width: 769px) {
@@ -387,6 +407,10 @@ body {
         width: 200px !important;
     }
 
+    .is-w-xxl-tablet {
+        width: 500px !important;
+    }
+
     .is-h-xs-tablet {
         height: 80px !important;
     }
@@ -402,6 +426,10 @@ body {
     .is-h-l-tablet {
         height: 200px !important;
     }
+
+    .is-h-xxl-tablet {
+        height: 500px !important;
+    }
 }
 
 @media only screen and (min-width: 1024px) {
@@ -425,6 +453,10 @@ body {
         width: 200px !important;
     }
 
+    .is-w-xxl-desktop {
+        width: 500px !important;
+    }
+
     .is-h-xs-desktop {
         height: 80px !important;
     }
@@ -440,6 +472,10 @@ body {
     .is-h-l-desktop {
         height: 200px !important;
     }
+
+    .is-h-xxl-desktop {
+        height: 500px !important;
+    }
 }
 
 /* Alignments
@@ -461,6 +497,10 @@ body {
     justify-content: flex-end !important;
 }
 
+.align.to-b {
+    align-items: flex-end !important;
+}
+
 .align.to-l {
     justify-content: flex-start !important;
 }
@@ -513,6 +553,10 @@ body {
         margin-left: auto !important;
     }
 
+    .mt-3-mobile {
+        margin-top: 0.75rem !important;
+    }
+
     .ml-3-mobile {
         margin-left: 0.75rem !important;
     }
diff --git a/bookwyrm/templates/discover/large-book.html b/bookwyrm/templates/discover/large-book.html
index c7b39ebb..1808a0f9 100644
--- a/bookwyrm/templates/discover/large-book.html
+++ b/bookwyrm/templates/discover/large-book.html
@@ -4,16 +4,18 @@
 
 {% if book %}
     {% with book=book %}
-        <div class="columns">
-            <div class="column">
+        <div class="columns is-gapless">
+            <div class="column is-5-tablet is-cover">
                 <a
+                    class="align to-b to-l"
                     href="{{ book.local_path }}"
-                >{% include 'snippets/book_cover.html' %}</a>
+                >{% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-w-auto-tablet' %}</a>
 
                 {% include 'snippets/stars.html' with rating=book|rating:request.user %}
             </div>
 
-            <div class="column">
+
+            <div class="column mt-3-mobile ml-3-tablet">
                 <h3 class="title is-5">
                     <a href="/book/{{ book.id }}">{{ book.title }}</a>
                 </h3>
diff --git a/bookwyrm/templates/discover/small-book.html b/bookwyrm/templates/discover/small-book.html
index f0e1626c..ad7e00fb 100644
--- a/bookwyrm/templates/discover/small-book.html
+++ b/bookwyrm/templates/discover/small-book.html
@@ -4,9 +4,9 @@
 
 {% if book %}
     {% with book=book %}
-        <a
-            href="{{ book.local_path }}"
-        >{% include 'snippets/book_cover.html' with cover_class='is-h-s' %}</a>
+        <a href="{{ book.local_path }}">
+            {% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-h-l-tablet is-w-auto align to-b to-l' %}
+        </a>
 
         {% include 'snippets/stars.html' with rating=book|rating:request.user %}
 

From 8d53b7589fc448b84a8fa63fb1ee47552c06769c Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Tue, 27 Apr 2021 17:23:37 +0200
Subject: [PATCH 0977/1285] cover: Update /get-started/books:

- Remove `.content` from templates.
- Remove a stray unclosed label.
---
 .../templates/get_started/book_preview.html   |  8 +--
 bookwyrm/templates/get_started/books.html     | 63 +++++++++++--------
 2 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/bookwyrm/templates/get_started/book_preview.html b/bookwyrm/templates/get_started/book_preview.html
index 04d0c424..578fef70 100644
--- a/bookwyrm/templates/get_started/book_preview.html
+++ b/bookwyrm/templates/get_started/book_preview.html
@@ -1,8 +1,8 @@
 {% load i18n %}
-<div class="column is-narrow is-clipped has-text-centered">
-    {% include 'snippets/book_cover.html' with book=book %}
-    <label class="label" for="id_shelve_{{ book.id }}">
-    <div class="select is-small">
+<div class="column is-cover">
+    {% include 'snippets/book_cover.html' with book=book cover_class='is-h-l is-h-m-mobile' %}
+
+    <div class="select is-small mt-1 mb-3">
         <select name="{{ book.id }}" aria-label="{% blocktrans with book_title=book.title %}Have you read {{ book_title }}?{% endblocktrans %}">
             <option disabled selected value>Add to your books</option>
             {% for shelf in request.user.shelf_set.all %}
diff --git a/bookwyrm/templates/get_started/books.html b/bookwyrm/templates/get_started/books.html
index ae265122..9613508b 100644
--- a/bookwyrm/templates/get_started/books.html
+++ b/bookwyrm/templates/get_started/books.html
@@ -23,34 +23,43 @@
 
 <form class="block" name="add-books" method="post" action="{% url 'get-started-books' %}">
     {% csrf_token %}
+
     <h3 class="title is-5">{% trans "Suggested Books" %}</h3>
-    <fieldset name="books" class="columns scroll-x is-mobile">
-        {% if book_results %}
-        <div class="column is-narrow content">
-            <p class="help mb-0">Search results</p>
-            <div class="columns is-mobile">
-                {% for book in book_results %}
-                {% include 'get_started/book_preview.html' %}
-                {% endfor %}
-            </div>
-        </div>
-        {% endif %}
-        {% if popular_books %}
-        <div class="column is-narrow content">
-            <p class="help mb-0">
-                {% blocktrans %}Popular on {{ site_name }}{% endblocktrans %}
-            </p>
-            <div class="columns is-mobile">
-                {% for book in popular_books %}
-                {% include 'get_started/book_preview.html' %}
-                {% endfor %}
-            </div>
-        </div>
-        {% endif %}
-        {% if not book_results and not popular_books %}
-        <p><em>{% trans "No books found" %}</em></p>
-        {% endif %}
-    </fieldset>
+
+    <div class="block scroll-x">
+        <fieldset name="books" class="columns is-mobile">
+            {% if book_results %}
+                <div class="column is-narrow">
+                    <p class="help mb-0">Search results</p>
+
+                    <div class="columns is-mobile">
+                        {% for book in book_results %}
+                        {% include 'get_started/book_preview.html' %}
+                        {% endfor %}
+                    </div>
+                </div>
+            {% endif %}
+
+            {% if popular_books %}
+                <div class="column is-narrow">
+                    <p class="help mb-0">
+                        {% blocktrans %}Popular on {{ site_name }}{% endblocktrans %}
+                    </p>
+
+                    <div class="columns is-mobile">
+                        {% for book in popular_books %}
+                        {% include 'get_started/book_preview.html' %}
+                        {% endfor %}
+                    </div>
+                </div>
+            {% endif %}
+
+            {% if not book_results and not popular_books %}
+                <p><em>{% trans "No books found" %}</em></p>
+            {% endif %}
+        </fieldset>
+    </div>
+
     <button type="submit" class="button is-primary">{% trans "Save &amp; continue" %}</button>
 </form>
 {% endblock %}

From a5359d1f80d969b962abd775679daa9ac47bf2ca Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Tue, 27 Apr 2021 20:30:10 +0200
Subject: [PATCH 0978/1285] cover: Update author.

---
 bookwyrm/static/css/bookwyrm.css            | 30 +++++++++++++++++++++
 bookwyrm/templates/snippets/book_tiles.html | 13 +++++----
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 98801fa1..1c3cce93 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -315,6 +315,9 @@ body {
 .is-w-l {
     width: 200px !important;
 }
+.is-w-xxl {
+    width: 250px !important;
+}
 
 .is-w-xxl {
     width: 500px !important;
@@ -335,6 +338,9 @@ body {
 .is-h-l {
     height: 200px !important;
 }
+.is-h-xxl {
+    height: 250px !important;
+}
 
 .is-h-xxl {
     height: 500px !important;
@@ -361,6 +367,10 @@ body {
         width: 200px !important;
     }
 
+    .is-w-xl-mobile {
+        width: 250px !important;
+    }
+
     .is-w-xxl-mobile {
         width: 500px !important;
     }
@@ -381,6 +391,10 @@ body {
         height: 200px !important;
     }
 
+    .is-h-xl-mobile {
+        height: 250px !important;
+    }
+
     .is-h-xxl-mobile {
         height: 500px !important;
     }
@@ -407,6 +421,10 @@ body {
         width: 200px !important;
     }
 
+    .is-w-xl-tablet {
+        width: 250px !important;
+    }
+
     .is-w-xxl-tablet {
         width: 500px !important;
     }
@@ -427,6 +445,10 @@ body {
         height: 200px !important;
     }
 
+    .is-h-xl-tablet {
+        height: 250px !important;
+    }
+
     .is-h-xxl-tablet {
         height: 500px !important;
     }
@@ -453,6 +475,10 @@ body {
         width: 200px !important;
     }
 
+    .is-w-xl-desktop {
+        width: 250px !important;
+    }
+
     .is-w-xxl-desktop {
         width: 500px !important;
     }
@@ -473,6 +499,10 @@ body {
         height: 200px !important;
     }
 
+    .is-h-xl-desktop {
+        height: 250px !important;
+    }
+
     .is-h-xxl-desktop {
         height: 500px !important;
     }
diff --git a/bookwyrm/templates/snippets/book_tiles.html b/bookwyrm/templates/snippets/book_tiles.html
index 1867a8a8..32c9f90c 100644
--- a/bookwyrm/templates/snippets/book_tiles.html
+++ b/bookwyrm/templates/snippets/book_tiles.html
@@ -1,10 +1,13 @@
-<div class="columns is-multiline">
+<div class="columns is-mobile is-multiline">
     {% for book in books %}
     <div class="column is-narrow">
-        <div class="box">
-            <a href="/book/{{ book.id }}">
-                {% include 'snippets/book_cover.html' with book=book %}
-            </a>
+        <div class="box is-flex is-flex-direction-column is-align-items-center">
+            <div class="mb-3">
+                <a href="/book/{{ book.id }}">
+                    {% include 'snippets/book_cover.html' with book=book cover_class='is-w-l-mobile is-h-l-mobile is-w-l-tablet is-h-xl-tablet' %}
+                </a>
+            </div>
+
             {% include 'snippets/shelve_button/shelve_button.html' with book=book switch_mode=True %}
         </div>
     </div>

From d936417ddb399858b41fa7b22c4d0f9718c9f4b1 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Tue, 27 Apr 2021 20:44:06 +0200
Subject: [PATCH 0979/1285] cover: Update /book/ID/edit.

---
 bookwyrm/templates/book/edit_book.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html
index de9c9535..e57c39e2 100644
--- a/bookwyrm/templates/book/edit_book.html
+++ b/bookwyrm/templates/book/edit_book.html
@@ -169,10 +169,11 @@
         <div class="column is-half">
             <h2 class="title is-4">{% trans "Cover" %}</h2>
             <div class="columns">
-                <div class="column is-narrow">
-                    {% include 'snippets/book_cover.html' with book=book cover_class='is-h-s' %}
+                <div class="column is-3 is-cover">
+                    {% include 'snippets/book_cover.html' with book=book cover_class='is-w-auto' %}
                 </div>
-                <div class="column is-narrow">
+
+                <div class="column">
                     <div class="block">
                         <p>
                             <label class="label" for="id_cover">{% trans "Upload cover:" %}</label>

From 182c18fe542e50f707cf70f17b4ab7e086e879a7 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Tue, 27 Apr 2021 20:53:30 +0200
Subject: [PATCH 0980/1285] cover: Update /user/USERNAME.

---
 bookwyrm/templates/user/user.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index 444385fe..a97d26ab 100644
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -36,7 +36,7 @@
             {% for book in shelf.books %}
             <div class="control">
                 <a href="{{ book.local_path }}">
-                {% include 'snippets/book_cover.html' with book=book cover_class='is-h-m' %}
+                {% include 'snippets/book_cover.html' with book=book cover_class='is-h-m is-h-s-mobile' %}
                 </a>
             </div>
             {% endfor %}

From 8a1c8cb06125869ea9a71122d04fa9124292674e Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Tue, 27 Apr 2021 21:07:54 +0200
Subject: [PATCH 0981/1285] cover: Update goal:

- Remove `.content` from template when not dealing with markdown-generated markup.
- Fix some duplicated CSS selectors.
---
 bookwyrm/static/css/bookwyrm.css |  6 ++++--
 bookwyrm/templates/goal.html     | 15 ++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 1c3cce93..67555ae2 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -315,7 +315,8 @@ body {
 .is-w-l {
     width: 200px !important;
 }
-.is-w-xxl {
+
+.is-w-xl {
     width: 250px !important;
 }
 
@@ -338,7 +339,8 @@ body {
 .is-h-l {
     height: 200px !important;
 }
-.is-h-xxl {
+
+.is-h-xl {
     height: 250px !important;
 }
 
diff --git a/bookwyrm/templates/goal.html b/bookwyrm/templates/goal.html
index 035eccf8..32b5062d 100644
--- a/bookwyrm/templates/goal.html
+++ b/bookwyrm/templates/goal.html
@@ -45,21 +45,22 @@
 </section>
 
 {% if goal.books %}
-<section class="content">
-    <h2>
+<section>
+    <h2 class="title is-4">
         {% if goal.user == request.user %}
         {% blocktrans %}Your {{ year }} Books{% endblocktrans %}
         {% else %}
         {% blocktrans with username=goal.user.display_name %}{{ username }}'s {{ year }} Books{% endblocktrans %}
         {% endif %}
     </h2>
-    <div class="columns is-multiline">
+
+    <div class="columns is-mobile is-multiline">
         {% for book in goal.books %}
-        <div class="column is-one-fifth">
-            <div class="is-clipped">
-                <a href="{{ book.book.local_path }}">{% include 'snippets/book_cover.html' with book=book.book %}</a>
+            <div class="column is-cover">
+                <a href="{{ book.book.local_path }}">
+                    {% include 'snippets/book_cover.html' with book=book.book cover_class='is-h-xl is-h-l-mobile' %}
+                </a>
             </div>
-        </div>
         {% endfor %}
     </div>
 </section>

From 30b273f1936023296b77f8b97ae9183528857162 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Tue, 27 Apr 2021 21:35:05 +0200
Subject: [PATCH 0982/1285] cover: Update shelf (/user/arkhi/books/to-read,
 etc.)

---
 bookwyrm/templates/user/shelf.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/user/shelf.html b/bookwyrm/templates/user/shelf.html
index 947e9f70..33616258 100644
--- a/bookwyrm/templates/user/shelf.html
+++ b/bookwyrm/templates/user/shelf.html
@@ -88,7 +88,7 @@
                 {% spaceless %}
                 <tr class="book-preview">
                     <td class="book-preview-top-row">
-                        <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book size="small" %}</a>
+                        <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book cover_class='is-w-s-tablet is-h-s' %}</a>
                     </td>
                     <td data-title="{% trans "Title" %}">
                         <a href="{{ book.local_path }}">{{ book.title }}</a>

From 7c875b2ac20f8e2f80df4a729577cba2965c13d3 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Tue, 27 Apr 2021 21:52:28 +0200
Subject: [PATCH 0983/1285] cover: Update /post?status_type=TYPE&book=ID

---
 bookwyrm/templates/compose.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/compose.html b/bookwyrm/templates/compose.html
index 9b0549ed..0f609cf7 100644
--- a/bookwyrm/templates/compose.html
+++ b/bookwyrm/templates/compose.html
@@ -11,14 +11,15 @@
 {% with 0|uuid as uuid %}
 <div class="box columns">
     {% if book %}
-    <div class="column is-one-third">
+    <div class="column is-3 is-cover">
         <div class="block">
-            <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book  %}</a>
+            <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book cover_class='is-w-auto-tablet is-h-l-mobile' %}</a>
         </div>
+
         <h3 class="title is-6">{% include 'snippets/book_titleby.html' with book=book %}</h3>
     </div>
     {% endif %}
-    <div class="column is-two-thirds">
+    <div class="column">
         {% if draft.reply_parent %}
         {% include 'snippets/status/status.html' with status=draft.reply_parent no_interact=True %}
         {% endif %}

From baaaeef4c076f2208a8d8ab8f1209d022d89038d Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Wed, 28 Apr 2021 10:47:14 +0200
Subject: [PATCH 0984/1285] cover: Fix little details.

---
 bookwyrm/static/css/bookwyrm.css       | 12 ++++++++++++
 bookwyrm/templates/book/edit_book.html |  2 +-
 bookwyrm/templates/lists/list.html     |  8 ++++----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 67555ae2..801c3635 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -525,6 +525,10 @@ body {
     justify-content: center !important;
 }
 
+.align.to-t {
+    align-items: flex-start !important;
+}
+
 .align.to-r {
     justify-content: flex-end !important;
 }
@@ -542,6 +546,10 @@ body {
         justify-content: center !important;
     }
 
+    .align.to-t-mobile {
+        align-items: flex-start !important;
+    }
+
     .align.to-r-mobile {
         justify-content: flex-end !important;
     }
@@ -556,6 +564,10 @@ body {
         justify-content: center !important;
     }
 
+    .align.to-t-tablet {
+        align-items: flex-start !important;
+    }
+
     .align.to-r-tablet {
         justify-content: flex-end !important;
     }
diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html
index e57c39e2..8ebbeaae 100644
--- a/bookwyrm/templates/book/edit_book.html
+++ b/bookwyrm/templates/book/edit_book.html
@@ -170,7 +170,7 @@
             <h2 class="title is-4">{% trans "Cover" %}</h2>
             <div class="columns">
                 <div class="column is-3 is-cover">
-                    {% include 'snippets/book_cover.html' with book=book cover_class='is-w-auto' %}
+                    {% include 'snippets/book_cover.html' with book=book cover_class='is-h-xl-mobile is-w-auto-tablet' %}
                 </div>
 
                 <div class="column">
diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index b28c469d..4c8dfd13 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -37,9 +37,9 @@
                                 columns is-mobile is-gapless
                             "
                         >
-                            <div class="column is-2-mobile is-cover">
+                            <div class="column is-2-mobile is-cover align to-t">
                                 <a href="{{ item.book.local_path }}" aria-hidden="true">
-                                    {% include 'snippets/book_cover.html' with cover_class='is-w-auto is-h-m is-h-s-mobile' %}
+                                    {% include 'snippets/book_cover.html' with cover_class='is-w-auto is-h-m-tablet' %}
                                 </a>
                             </div>
 
@@ -134,11 +134,11 @@
             {% for book in suggested_books %}
                 <div class="columns is-mobile is-gapless">
                     <a
-                        class="column is-cover align to-c"
+                        class="column is-2-mobile is-3-tablet is-cover align to-c"
                         href="{{ book.local_path }}"
                         aria-hidden="true"
                     >
-                        {% include 'snippets/book_cover.html' with book=book cover_class='is-w-s-tablet is-h-xs is-h-s-mobile' %}
+                        {% include 'snippets/book_cover.html' with book=book cover_class='is-w-auto is-h-s-mobile align to-t' %}
                     </a>
 
                     <div class="column ml-3">

From bba60c99e98fc4821736f3d5de4a438d4bad5cb6 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Wed, 28 Apr 2021 14:48:25 +0200
Subject: [PATCH 0985/1285] cover: Rearrange some CSS rules.

---
 bookwyrm/static/css/bookwyrm.css | 116 +++++++++++++++++--------------
 1 file changed, 62 insertions(+), 54 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 801c3635..8f3f15c5 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -43,10 +43,6 @@ body {
         white-space: nowrap !important;
         width: 0.01em !important;
     }
-
-    .m-0-mobile {
-        margin: 0 !important;
-    }
 }
 
 .button.is-transparent {
@@ -282,6 +278,56 @@ body {
     cursor: not-allowed;
 }
 
+/* Book preview table
+ ******************************************************************************/
+
+.book-preview td {
+    vertical-align: middle;
+}
+
+@media only screen and (max-width: 768px) {
+    table.is-mobile,
+    table.is-mobile tbody {
+        display: block;
+    }
+
+    table.is-mobile tr {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: space-between;
+        border-top: 1px solid #dbdbdb;
+    }
+
+    table.is-mobile td {
+        display: block;
+        box-sizing: border-box;
+        flex: 1 0 100%;
+        order: 2;
+        border-bottom: 0;
+    }
+
+    table.is-mobile td.book-preview-top-row {
+        order: 1;
+        flex-basis: auto;
+    }
+
+    table.is-mobile td[data-title]:not(:empty)::before {
+        content: attr(data-title);
+        display: block;
+        font-size: 0.75em;
+        font-weight: bold;
+    }
+
+    table.is-mobile td:empty {
+        padding: 0;
+    }
+
+    table.is-mobile th,
+    table.is-mobile thead {
+        display: none;
+    }
+}
+
 /* Dimensions
  * @todo These could be in rem.
  ******************************************************************************/
@@ -554,6 +600,10 @@ body {
         justify-content: flex-end !important;
     }
 
+    .align.to-b-mobile {
+        align-items: flex-end !important;
+    }
+
     .align.to-l-mobile {
         justify-content: flex-start !important;
     }
@@ -572,6 +622,10 @@ body {
         justify-content: flex-end !important;
     }
 
+    .align.to-b-tablet {
+        align-items: flex-end !important;
+    }
+
     .align.to-l-tablet {
         justify-content: flex-start !important;
     }
@@ -589,6 +643,10 @@ body {
 }
 
 @media screen and (max-width: 768px) {
+    .m-0-mobile {
+        margin: 0 !important;
+    }
+
     .mr-auto-mobile {
         margin-right: auto !important;
     }
@@ -629,53 +687,3 @@ body {
         margin-left: 0.75rem !important;
     }
 }
-
-/* Book preview table
- ******************************************************************************/
-
-.book-preview td {
-    vertical-align: middle;
-}
-
-@media only screen and (max-width: 768px) {
-    table.is-mobile,
-    table.is-mobile tbody {
-        display: block;
-    }
-
-    table.is-mobile tr {
-        display: flex;
-        flex-wrap: wrap;
-        justify-content: space-between;
-        border-top: 1px solid #dbdbdb;
-    }
-
-    table.is-mobile td {
-        display: block;
-        box-sizing: border-box;
-        flex: 1 0 100%;
-        order: 2;
-        border-bottom: 0;
-    }
-
-    table.is-mobile td.book-preview-top-row {
-        order: 1;
-        flex-basis: auto;
-    }
-
-    table.is-mobile td[data-title]:not(:empty)::before {
-        content: attr(data-title);
-        display: block;
-        font-size: 0.75em;
-        font-weight: bold;
-    }
-
-    table.is-mobile td:empty {
-        padding: 0;
-    }
-
-    table.is-mobile th,
-    table.is-mobile thead {
-        display: none;
-    }
-}

From e37cbcd88dec2626de5b782e9453d9e246cc8020 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Wed, 28 Apr 2021 15:02:47 +0200
Subject: [PATCH 0986/1285] cover: Comment CSS rules a bit more and add rules
 for consistency.

---
 bookwyrm/static/css/bookwyrm.css | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 8f3f15c5..8e1aab25 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -155,14 +155,16 @@ body {
 
 /** Book covers
  *
- * - .is-cover gives the behaviour of the cover and its surrounding.
+ * - .is-cover gives the behaviour of the cover and its surrounding. (optional)
  * - .cover-container gives the dimensions and position (for borders, image and other elements).
  * - .book-cover is positioned and sized based on its container.
  *
- * To have the cover with specific dimensions, specify a width or height for
+ * To have the cover within specific dimensions, specify a width or height for
  * standard bulma’s named breapoints:
  *
- * is-[w|h]-[xs|s|m|l|xl]-[mobile|tablet|desktop]
+ * `is-(w|h)-(auto|xs|s|m|l|xl|xxl)[-(mobile|tablet|desktop)]`
+ *
+ * The cover will be centered horizontally and vertically within those dimensions.
  *
  * When using `.column.is-N`, add `.is-w-auto` to the container so that the flex
  * calculations are not biased by the default `max-content`.
@@ -557,6 +559,8 @@ body {
 }
 
 /* Alignments
+ *
+ * Use them with `.align.to-(c|t|r|b|l)[-(mobile|tablet)]`
  ******************************************************************************/
 
 /* Flex item position
@@ -632,6 +636,9 @@ body {
 }
 
 /* Spacings
+ *
+ * Those are supplementary rules to Bulma’s. They follow the same conventions.
+ * Add those you’ll need.
  ******************************************************************************/
 
 .mr-auto {
@@ -663,6 +670,11 @@ body {
         margin-left: 0.75rem !important;
     }
 
+    .mx-3-mobile {
+        margin-right: 0.75rem !important;
+        margin-left: 0.75rem !important;
+    }
+
     .my-3-mobile {
         margin-top: 0.75rem !important;
         margin-bottom: 0.75rem !important;
@@ -670,6 +682,10 @@ body {
 }
 
 @media screen and (min-width: 769px) {
+    .m-0-tablet {
+        margin: 0 !important;
+    }
+
     .mr-auto-tablet {
         margin-right: auto !important;
     }
@@ -678,6 +694,10 @@ body {
         margin-left: auto !important;
     }
 
+    .mt-3-tablet {
+        margin-top: 0.75rem !important;
+    }
+
     .ml-3-tablet {
         margin-left: 0.75rem !important;
     }
@@ -686,4 +706,9 @@ body {
         margin-right: 0.75rem !important;
         margin-left: 0.75rem !important;
     }
+
+    .my-3-tablet {
+        margin-top: 0.75rem !important;
+        margin-bottom: 0.75rem !important;
+    }
 }

From 5c8710c1c410679ab0647532345610e368fa7fd1 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Wed, 28 Apr 2021 15:08:58 +0200
Subject: [PATCH 0987/1285] cover: Add removed link on Editions.

---
 bookwyrm/templates/book/editions.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/book/editions.html b/bookwyrm/templates/book/editions.html
index dd580234..efbe1566 100644
--- a/bookwyrm/templates/book/editions.html
+++ b/bookwyrm/templates/book/editions.html
@@ -15,7 +15,9 @@
     {% for book in editions %}
     <div class="columns is-gapless mb-6">
         <div class="column is-cover">
-            {% include 'snippets/book_cover.html' with book=book cover_class='is-w-m is-h-m align to-l-mobile' %}
+            <a href="/book/{{ book.id }}">
+                {% include 'snippets/book_cover.html' with book=book cover_class='is-w-m is-h-m align to-l-mobile' %}
+            </a>
         </div>
 
         <div class="column my-3-mobile ml-3-tablet mr-auto">

From b0f414570b9a279abae25abd44de3bdf32a8acd0 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Wed, 28 Apr 2021 15:42:22 +0200
Subject: [PATCH 0988/1285] cover: Fix code that was reverted during a merge
 conflict.

---
 bookwyrm/templates/lists/list.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index 4c8dfd13..9243d3af 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -144,7 +144,12 @@
                     <div class="column ml-3">
                         <p>{% include 'snippets/book_titleby.html' with book=book %}</p>
 
-                        <form class="mt-1" name="add-book" method="post" action="{% url 'list-add-book' %}">
+                        <form
+                            class="mt-1"
+                            name="add-book"
+                            method="post"
+                            action="{% url 'list-add-book' %}{% if query %}?q={{ query }}{% endif %}"
+                        >
                             {% csrf_token %}
                             <input type="hidden" name="book" value="{{ book.id }}">
                             <input type="hidden" name="list" value="{{ list.id }}">

From cbb7b8b6e982b577ad2c765caa7618e1a70229f3 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Wed, 28 Apr 2021 16:04:40 +0200
Subject: [PATCH 0989/1285] Make the license markdown friendly.

---
 LICENSE | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/LICENSE b/LICENSE
index 96b7cd74..f111d3fe 100644
--- a/LICENSE
+++ b/LICENSE
@@ -9,10 +9,11 @@ Permission is hereby granted, free of charge, to any person or organization (the
 1. The above copyright notice and this permission notice shall be included in all copies or modified versions of the Software.
 
 2. The User is one of the following:
-a. An individual person, laboring for themselves
-b. A non-profit organization
-c. An educational institution
-d. An organization that seeks shared profit for all of its members, and allows non-members to set the cost of their labor
+
+    1. An individual person, laboring for themselves
+    2. A non-profit organization
+    3. An educational institution
+    4. An organization that seeks shared profit for all of its members, and allows non-members to set the cost of their labor
 
 3. If the User is an organization with owners, then all owners are workers and all workers are owners with equal equity and/or equal vote.
 

From eb9935039e132cca17af57adef8c47d9482aa7cd Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Wed, 28 Apr 2021 16:05:12 +0200
Subject: [PATCH 0990/1285] Rename License with a .md extension.

---
 LICENSE => LICENSE.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename LICENSE => LICENSE.md (100%)

diff --git a/LICENSE b/LICENSE.md
similarity index 100%
rename from LICENSE
rename to LICENSE.md

From e2b43bbd6d4730b574023b87474ffe163af3c76d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 28 Apr 2021 09:33:38 -0700
Subject: [PATCH 0991/1285] Fixes unit test

---
 bookwyrm/tests/views/test_helpers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py
index e2e041e9..6a435ff3 100644
--- a/bookwyrm/tests/views/test_helpers.py
+++ b/bookwyrm/tests/views/test_helpers.py
@@ -264,7 +264,7 @@ class ViewsHelpers(TestCase):
                 local=True,
                 localname=i,
             )
-            user.followers.add(user_1)
+            user.following.add(user_1)
             user.followers.add(self.local_user)
 
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):

From 91c42b497e1fcf7162425b92ea32f902e456234f Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Wed, 28 Apr 2021 20:54:35 +0200
Subject: [PATCH 0992/1285] cover: Tweak width and height of cover on feeds.

---
 bookwyrm/templates/snippets/status/content_status.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/status/content_status.html b/bookwyrm/templates/snippets/status/content_status.html
index 31ba33b5..0ba32fa1 100644
--- a/bookwyrm/templates/snippets/status/content_status.html
+++ b/bookwyrm/templates/snippets/status/content_status.html
@@ -17,7 +17,7 @@
                     <div class="column is-cover">
                         <div class="columns is-mobile is-gapless">
                             <div class="column is-cover">
-                                <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book cover_class='is-h-xs is-h-l-tablet' %}</a>
+                                <a href="{{ book.local_path }}">{% include 'snippets/book_cover.html' with book=book cover_class='is-w-s-mobile is-h-l-tablet' %}</a>
 
                                 {% include 'snippets/stars.html' with rating=book|rating:request.user %}
 

From 3faacffacaaa3fdd474f12c1768544393aa22970 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 28 Apr 2021 13:28:07 -0700
Subject: [PATCH 0993/1285] Associated expanded editions with correct work

---
 bookwyrm/connectors/abstract_connector.py | 27 +++++++++++++----------
 bookwyrm/connectors/inventaire.py         |  2 +-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index fd2b2707..48c05182 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -73,7 +73,7 @@ class AbstractMinimalConnector(ABC):
         return get_data(remote_id, **kwargs)
 
     @abstractmethod
-    def get_or_create_book(self, remote_id):
+    def get_or_create_book(self, remote_id, work=None):
         """pull up a book record by whatever means possible"""
 
     @abstractmethod
@@ -109,7 +109,7 @@ class AbstractConnector(AbstractMinimalConnector):
                 return False
         return True
 
-    def get_or_create_book(self, remote_id):
+    def get_or_create_book(self, remote_id, work=None):
         """translate arbitrary json into an Activitypub dataclass"""
         # first, check if we have the origin_id saved
         existing = models.Edition.find_existing_by_remote_id(
@@ -123,6 +123,7 @@ class AbstractConnector(AbstractMinimalConnector):
         # load the json
         data = self.get_book_data(remote_id)
         mapped_data = dict_from_mappings(data, self.book_mappings)
+        work_data = edition_data = None
         if self.is_work_data(data):
             try:
                 edition_data = self.get_edition_from_work_data(data)
@@ -132,21 +133,23 @@ class AbstractConnector(AbstractMinimalConnector):
                 edition_data = data
             work_data = mapped_data
         else:
-            try:
-                work_data = self.get_work_from_edition_data(data)
-                work_data = dict_from_mappings(work_data, self.book_mappings)
-            except (KeyError, ConnectorException):
-                work_data = mapped_data
             edition_data = data
+            if not work:
+                try:
+                    work_data = self.get_work_from_edition_data(data)
+                    work_data = dict_from_mappings(work_data, self.book_mappings)
+                except (KeyError, ConnectorException):
+                    work_data = mapped_data
 
-        if not work_data or not edition_data:
+        if (not work_data and not work) or not edition_data:
             raise ConnectorException("Unable to load book data: %s" % remote_id)
 
         with transaction.atomic():
-            # create activitypub object
-            work_activity = activitypub.Work(**work_data)
-            # this will dedupe automatically
-            work = work_activity.to_model(model=models.Work)
+            if not work:
+                # create activitypub object
+                work_activity = activitypub.Work(**work_data)
+                # this will dedupe automatically
+                work = work_activity.to_model(model=models.Work)
             for author in self.get_authors_from_data(data):
                 work.authors.add(author)
 
diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index ae6fb862..c91ac937 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -137,7 +137,7 @@ class Connector(AbstractConnector):
 
         for edition_uri in edition_options.get("uris"):
             remote_id = self.get_remote_id(edition_uri)
-            self.get_or_create_book(remote_id)
+            self.get_or_create_book(remote_id, work=work)
 
     def get_cover_url(self, cover_blob, *_):
         """format the relative cover url into an absolute one:

From ccf10e801279dbc8946c67337a0269758c06643d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 28 Apr 2021 13:50:47 -0700
Subject: [PATCH 0994/1285] Fixes cover load logic

---
 bookwyrm/connectors/inventaire.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index c91ac937..e8416c37 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -143,7 +143,9 @@ class Connector(AbstractConnector):
         """format the relative cover url into an absolute one:
         {"url": "/img/entities/e794783f01b9d4f897a1ea9820b96e00d346994f"}
         """
-        cover_id = cover_blob[0].get("url")
+        if isinstance(cover_blob, list) and len(cover_blob) > 0:
+            cover_blob = cover_blob[0]
+        cover_id = cover_blob.get("url")
         if not cover_id:
             return None
         return "%s%s" % (self.covers_url, cover_id)

From 6551c59c45d74b7920c58198d4a045b7afc0dfd3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 28 Apr 2021 15:19:24 -0700
Subject: [PATCH 0995/1285] Don't store default edition in the dataase

---
 bookwyrm/activitypub/book.py                  |  1 -
 bookwyrm/connectors/abstract_connector.py     |  8 ++---
 bookwyrm/connectors/bookwyrm_connector.py     |  8 ++---
 bookwyrm/connectors/self_connector.py         | 29 +++++++++++++++----
 .../0072_remove_work_default_edition.py       | 17 +++++++++++
 bookwyrm/models/book.py                       | 29 ++++---------------
 .../connectors/test_connector_manager.py      |  2 --
 .../tests/connectors/test_self_connector.py   |  6 ++--
 bookwyrm/tests/models/test_book_model.py      |  6 ----
 .../tests/models/test_readthrough_model.py    |  4 +--
 bookwyrm/tests/views/test_readthrough.py      |  2 --
 bookwyrm/views/author.py                      |  2 +-
 bookwyrm/views/books.py                       |  2 +-
 bookwyrm/views/helpers.py                     |  2 +-
 14 files changed, 56 insertions(+), 62 deletions(-)
 create mode 100644 bookwyrm/migrations/0072_remove_work_default_edition.py

diff --git a/bookwyrm/activitypub/book.py b/bookwyrm/activitypub/book.py
index 597d7a66..1599b408 100644
--- a/bookwyrm/activitypub/book.py
+++ b/bookwyrm/activitypub/book.py
@@ -62,7 +62,6 @@ class Work(Book):
     """work instance of a book object"""
 
     lccn: str = ""
-    defaultEdition: str = ""
     editions: List[str] = field(default_factory=lambda: [])
     type: str = "Work"
 
diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index 48c05182..08a0175a 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -116,8 +116,8 @@ class AbstractConnector(AbstractMinimalConnector):
             remote_id
         ) or models.Work.find_existing_by_remote_id(remote_id)
         if existing:
-            if hasattr(existing, "get_default_editon"):
-                return existing.get_default_editon()
+            if hasattr(existing, "default_edition"):
+                return existing.default_edition
             return existing
 
         # load the json
@@ -170,10 +170,6 @@ class AbstractConnector(AbstractMinimalConnector):
         edition.connector = self.connector
         edition.save()
 
-        if not work.default_edition:
-            work.default_edition = edition
-            work.save()
-
         for author in self.get_authors_from_data(edition_data):
             edition.authors.add(author)
         if not edition.authors.exists() and work.authors.exists():
diff --git a/bookwyrm/connectors/bookwyrm_connector.py b/bookwyrm/connectors/bookwyrm_connector.py
index 640a0bca..6b1d2f8c 100644
--- a/bookwyrm/connectors/bookwyrm_connector.py
+++ b/bookwyrm/connectors/bookwyrm_connector.py
@@ -6,12 +6,8 @@ from .abstract_connector import AbstractMinimalConnector, SearchResult
 class Connector(AbstractMinimalConnector):
     """this is basically just for search"""
 
-    def get_or_create_book(self, remote_id):
-        edition = activitypub.resolve_remote_id(remote_id, model=models.Edition)
-        work = edition.parent_work
-        work.default_edition = work.get_default_edition()
-        work.save()
-        return edition
+    def get_or_create_book(self, remote_id, work=None):
+        return activitypub.resolve_remote_id(remote_id, model=models.Edition)
 
     def parse_search_data(self, data):
         return data
diff --git a/bookwyrm/connectors/self_connector.py b/bookwyrm/connectors/self_connector.py
index 0dc922a5..6b1b349f 100644
--- a/bookwyrm/connectors/self_connector.py
+++ b/bookwyrm/connectors/self_connector.py
@@ -3,7 +3,7 @@ from functools import reduce
 import operator
 
 from django.contrib.postgres.search import SearchRank, SearchVector
-from django.db.models import Count, F, Q
+from django.db.models import Count, OuterRef, Subquery, F, Q
 
 from bookwyrm import models
 from .abstract_connector import AbstractConnector, SearchResult
@@ -47,7 +47,16 @@ class Connector(AbstractConnector):
 
         # when there are multiple editions of the same work, pick the default.
         # it would be odd for this to happen.
-        results = results.filter(parent_work__default_edition__id=F("id")) or results
+
+        default_editions = models.Edition.objects.filter(
+            parent_work=OuterRef("parent_work")
+        ).order_by("-edition_rank")
+        results = (
+            results.annotate(
+                default_id=Subquery(default_editions.values("id")[:1])
+            ).filter(default_id=F("id"))
+            or results
+        )
 
         search_results = []
         for result in results:
@@ -112,7 +121,15 @@ def search_identifiers(query, *filters):
 
     # when there are multiple editions of the same work, pick the default.
     # it would be odd for this to happen.
-    return results.filter(parent_work__default_edition__id=F("id")) or results
+    default_editions = models.Edition.objects.filter(
+        parent_work=OuterRef("parent_work")
+    ).order_by("-edition_rank")
+    return (
+        results.annotate(default_id=Subquery(default_editions.values("id")[:1])).filter(
+            default_id=F("id")
+        )
+        or results
+    )
 
 
 def search_title_author(query, min_confidence, *filters):
@@ -140,10 +157,10 @@ def search_title_author(query, min_confidence, *filters):
 
     for work_id in set(editions_of_work):
         editions = results.filter(parent_work=work_id)
-        default = editions.filter(parent_work__default_edition=F("id"))
-        default_rank = default.first().rank if default.exists() else 0
+        default = editions.order_by("-edition_rank").first()
+        default_rank = default.rank if default else 0
         # if mutliple books have the top rank, pick the default edition
         if default_rank == editions.first().rank:
-            yield default.first()
+            yield default
         else:
             yield editions.first()
diff --git a/bookwyrm/migrations/0072_remove_work_default_edition.py b/bookwyrm/migrations/0072_remove_work_default_edition.py
new file mode 100644
index 00000000..1c05c95e
--- /dev/null
+++ b/bookwyrm/migrations/0072_remove_work_default_edition.py
@@ -0,0 +1,17 @@
+# Generated by Django 3.2 on 2021-04-28 22:16
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0071_merge_0063_auto_20210407_0045_0070_auto_20210423_0121"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="work",
+            name="default_edition",
+        ),
+    ]
diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index 10ebb317..0bbae033 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -1,7 +1,7 @@
 """ database schema for books and shelves """
 import re
 
-from django.db import models, transaction
+from django.db import models
 from model_utils.managers import InheritanceManager
 
 from bookwyrm import activitypub
@@ -143,10 +143,6 @@ class Work(OrderedCollectionPageMixin, Book):
     lccn = fields.CharField(
         max_length=255, blank=True, null=True, deduplication_field=True
     )
-    # this has to be nullable but should never be null
-    default_edition = fields.ForeignKey(
-        "Edition", on_delete=models.PROTECT, null=True, load_remote=False
-    )
 
     def save(self, *args, **kwargs):
         """set some fields on the edition object"""
@@ -155,18 +151,10 @@ class Work(OrderedCollectionPageMixin, Book):
             edition.save()
         return super().save(*args, **kwargs)
 
-    def get_default_edition(self):
+    @property
+    def default_edition(self):
         """in case the default edition is not set"""
-        return self.default_edition or self.editions.order_by("-edition_rank").first()
-
-    @transaction.atomic()
-    def reset_default_edition(self):
-        """sets a new default edition based on computed rank"""
-        self.default_edition = None
-        # editions are re-ranked implicitly
-        self.save()
-        self.default_edition = self.get_default_edition()
-        self.save()
+        return self.editions.order_by("-edition_rank").first()
 
     def to_edition_list(self, **kwargs):
         """an ordered collection of editions"""
@@ -220,15 +208,8 @@ class Edition(Book):
     activity_serializer = activitypub.Edition
     name_field = "title"
 
-    def get_rank(self, ignore_default=False):
+    def get_rank(self):
         """calculate how complete the data is on this edition"""
-        if (
-            not ignore_default
-            and self.parent_work
-            and self.parent_work.default_edition == self
-        ):
-            # default edition has the highest rank
-            return 20
         rank = 0
         rank += int(bool(self.cover)) * 3
         rank += int(bool(self.isbn_13))
diff --git a/bookwyrm/tests/connectors/test_connector_manager.py b/bookwyrm/tests/connectors/test_connector_manager.py
index feded616..34abbeaf 100644
--- a/bookwyrm/tests/connectors/test_connector_manager.py
+++ b/bookwyrm/tests/connectors/test_connector_manager.py
@@ -17,8 +17,6 @@ class ConnectorManager(TestCase):
         self.edition = models.Edition.objects.create(
             title="Example Edition", parent_work=self.work, isbn_10="0000000000"
         )
-        self.work.default_edition = self.edition
-        self.work.save()
 
         self.connector = models.Connector.objects.create(
             identifier="test_connector",
diff --git a/bookwyrm/tests/connectors/test_self_connector.py b/bookwyrm/tests/connectors/test_self_connector.py
index eee7d00c..db97b65a 100644
--- a/bookwyrm/tests/connectors/test_self_connector.py
+++ b/bookwyrm/tests/connectors/test_self_connector.py
@@ -84,11 +84,11 @@ class SelfConnector(TestCase):
             title="Edition 1 Title", parent_work=work
         )
         edition_2 = models.Edition.objects.create(
-            title="Edition 2 Title", parent_work=work
+            title="Edition 2 Title",
+            parent_work=work,
+            edition_rank=20,  # that's default babey
         )
         edition_3 = models.Edition.objects.create(title="Fish", parent_work=work)
-        work.default_edition = edition_2
-        work.save()
 
         # pick the best edition
         results = self.connector.search("Edition 1 Title")
diff --git a/bookwyrm/tests/models/test_book_model.py b/bookwyrm/tests/models/test_book_model.py
index c80cc4a8..cad00d43 100644
--- a/bookwyrm/tests/models/test_book_model.py
+++ b/bookwyrm/tests/models/test_book_model.py
@@ -84,9 +84,3 @@ class Book(TestCase):
         self.first_edition.description = "hi"
         self.first_edition.save()
         self.assertEqual(self.first_edition.edition_rank, 1)
-
-        # default edition
-        self.work.default_edition = self.first_edition
-        self.work.save()
-        self.first_edition.refresh_from_db()
-        self.assertEqual(self.first_edition.edition_rank, 20)
diff --git a/bookwyrm/tests/models/test_readthrough_model.py b/bookwyrm/tests/models/test_readthrough_model.py
index 93e9e654..986b739b 100644
--- a/bookwyrm/tests/models/test_readthrough_model.py
+++ b/bookwyrm/tests/models/test_readthrough_model.py
@@ -2,7 +2,7 @@
 from django.test import TestCase
 from django.core.exceptions import ValidationError
 
-from bookwyrm import models, settings
+from bookwyrm import models
 
 
 class ReadThrough(TestCase):
@@ -19,8 +19,6 @@ class ReadThrough(TestCase):
         self.edition = models.Edition.objects.create(
             title="Example Edition", parent_work=self.work
         )
-        self.work.default_edition = self.edition
-        self.work.save()
 
         self.readthrough = models.ReadThrough.objects.create(
             user=self.user, book=self.edition
diff --git a/bookwyrm/tests/views/test_readthrough.py b/bookwyrm/tests/views/test_readthrough.py
index c9ebf216..882c7929 100644
--- a/bookwyrm/tests/views/test_readthrough.py
+++ b/bookwyrm/tests/views/test_readthrough.py
@@ -20,8 +20,6 @@ class ReadThrough(TestCase):
         self.edition = models.Edition.objects.create(
             title="Example Edition", parent_work=self.work
         )
-        self.work.default_edition = self.edition
-        self.work.save()
 
         self.user = models.User.objects.create_user(
             "cinco", "cinco@example.com", "seissiete", local=True, localname="cinco"
diff --git a/bookwyrm/views/author.py b/bookwyrm/views/author.py
index 0bd7b0e0..41298161 100644
--- a/bookwyrm/views/author.py
+++ b/bookwyrm/views/author.py
@@ -27,7 +27,7 @@ class Author(View):
         ).distinct()
         data = {
             "author": author,
-            "books": [b.get_default_edition() for b in books],
+            "books": [b.default_edition for b in books],
         }
         return TemplateResponse(request, "author.html", data)
 
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 448cf992..ee1a5e06 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -39,7 +39,7 @@ class Book(View):
             return ActivitypubResponse(book.to_activity())
 
         if isinstance(book, models.Work):
-            book = book.get_default_edition()
+            book = book.default_edition
         if not book or not book.parent_work:
             return HttpResponseNotFound()
 
diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index 8a60b54c..540b578f 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -123,7 +123,7 @@ def get_edition(book_id):
     """look up a book in the db and return an edition"""
     book = models.Book.objects.select_subclasses().get(id=book_id)
     if isinstance(book, models.Work):
-        book = book.get_default_edition()
+        book = book.default_edition
     return book
 
 

From 8eec3eca5ba6c748c7d98a488cebf30c1d5ae5cf Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 28 Apr 2021 16:33:40 -0700
Subject: [PATCH 0996/1285] Don't spin out infinite load data tasks

---
 bookwyrm/connectors/abstract_connector.py | 27 ++++++++++-------------
 bookwyrm/connectors/inventaire.py         |  7 +++++-
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index 08a0175a..76718823 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -73,7 +73,7 @@ class AbstractMinimalConnector(ABC):
         return get_data(remote_id, **kwargs)
 
     @abstractmethod
-    def get_or_create_book(self, remote_id, work=None):
+    def get_or_create_book(self, remote_id):
         """pull up a book record by whatever means possible"""
 
     @abstractmethod
@@ -109,7 +109,7 @@ class AbstractConnector(AbstractMinimalConnector):
                 return False
         return True
 
-    def get_or_create_book(self, remote_id, work=None):
+    def get_or_create_book(self, remote_id):
         """translate arbitrary json into an Activitypub dataclass"""
         # first, check if we have the origin_id saved
         existing = models.Edition.find_existing_by_remote_id(
@@ -123,7 +123,6 @@ class AbstractConnector(AbstractMinimalConnector):
         # load the json
         data = self.get_book_data(remote_id)
         mapped_data = dict_from_mappings(data, self.book_mappings)
-        work_data = edition_data = None
         if self.is_work_data(data):
             try:
                 edition_data = self.get_edition_from_work_data(data)
@@ -134,22 +133,20 @@ class AbstractConnector(AbstractMinimalConnector):
             work_data = mapped_data
         else:
             edition_data = data
-            if not work:
-                try:
-                    work_data = self.get_work_from_edition_data(data)
-                    work_data = dict_from_mappings(work_data, self.book_mappings)
-                except (KeyError, ConnectorException):
-                    work_data = mapped_data
+            try:
+                work_data = self.get_work_from_edition_data(data)
+                work_data = dict_from_mappings(work_data, self.book_mappings)
+            except (KeyError, ConnectorException):
+                work_data = mapped_data
 
-        if (not work_data and not work) or not edition_data:
+        if not work_data or not edition_data:
             raise ConnectorException("Unable to load book data: %s" % remote_id)
 
         with transaction.atomic():
-            if not work:
-                # create activitypub object
-                work_activity = activitypub.Work(**work_data)
-                # this will dedupe automatically
-                work = work_activity.to_model(model=models.Work)
+            # create activitypub object
+            work_activity = activitypub.Work(**work_data)
+            # this will dedupe automatically
+            work = work_activity.to_model(model=models.Work)
             for author in self.get_authors_from_data(data):
                 work.authors.add(author)
 
diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index e8416c37..cd14c253 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -137,7 +137,12 @@ class Connector(AbstractConnector):
 
         for edition_uri in edition_options.get("uris"):
             remote_id = self.get_remote_id(edition_uri)
-            self.get_or_create_book(remote_id, work=work)
+            try:
+                data = self.get_book_data(remote_id)
+            except ConnectorException:
+                # who, indeed, knows
+                continue
+            self.create_edition_from_data(work, data)
 
     def get_cover_url(self, cover_blob, *_):
         """format the relative cover url into an absolute one:

From 95fce963d1ae7555daec75afcaa794dd23784f6e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 28 Apr 2021 17:18:14 -0700
Subject: [PATCH 0997/1285] Images may already be absolute paths

---
 bookwyrm/connectors/inventaire.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index cd14c253..ebbe8d51 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -1,4 +1,6 @@
 """ inventaire data connector """
+import re
+
 from bookwyrm import models
 from .abstract_connector import AbstractConnector, SearchResult, Mapping
 from .abstract_connector import get_data
@@ -148,11 +150,15 @@ class Connector(AbstractConnector):
         """format the relative cover url into an absolute one:
         {"url": "/img/entities/e794783f01b9d4f897a1ea9820b96e00d346994f"}
         """
+        # covers may or may not be a list
         if isinstance(cover_blob, list) and len(cover_blob) > 0:
             cover_blob = cover_blob[0]
         cover_id = cover_blob.get("url")
         if not cover_id:
             return None
+        # cover may or may not be an absolute url already
+        if re.match(r"^http", cover_id):
+            return cover_id
         return "%s%s" % (self.covers_url, cover_id)
 
     def resolve_keys(self, keys):

From 5e5392c007ea746b7714aa2ef16e65085376cf87 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 28 Apr 2021 17:20:14 -0700
Subject: [PATCH 0998/1285] Adds test file

---
 .../connectors/test_inventaire_connector.py   | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 bookwyrm/tests/connectors/test_inventaire_connector.py

diff --git a/bookwyrm/tests/connectors/test_inventaire_connector.py b/bookwyrm/tests/connectors/test_inventaire_connector.py
new file mode 100644
index 00000000..a124f35b
--- /dev/null
+++ b/bookwyrm/tests/connectors/test_inventaire_connector.py
@@ -0,0 +1,47 @@
+""" testing book data connectors """
+from django.test import TestCase
+import responses
+
+from bookwyrm import models
+from bookwyrm.connectors.inventaire import Connector
+
+
+class Inventaire(TestCase):
+    """test loading data from inventaire.io"""
+
+    def setUp(self):
+        """creates the connector we'll use"""
+        models.Connector.objects.create(
+            identifier="inventaire.io",
+            name="Inventaire",
+            connector_file="inventaire",
+            base_url="https://inventaire.io",
+            books_url="https://inventaire.io",
+            covers_url="https://covers.inventaire.io",
+            search_url="https://inventaire.io/search?q=",
+            isbn_search_url="https://inventaire.io/isbn",
+        )
+        self.connector = Connector("inventaire.io")
+
+    @responses.activate
+    def test_get_book_data(self):
+        """flattens the default structure to make it easier to parse"""
+        responses.add(
+            responses.GET,
+            "https://test.url/ok",
+            json={
+                "entities": {
+                    "isbn:9780375757853": {
+                        "claims": {
+                            "wdt:P31": ["wd:Q3331189"],
+                        },
+                        "uri": "isbn:9780375757853",
+                    }
+                },
+                "redirects": {},
+            },
+        )
+
+        result = self.connector.get_book_data("https://test.url/ok")
+        self.assertEqual(result["wdt:P31"], ["wd:Q3331189"])
+        self.assertEqual(result["uri"], "isbn:9780375757853")

From fc095a087c5637d58cdd645ad9505cc60ecfcc22 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 29 Apr 2021 08:35:37 -0700
Subject: [PATCH 0999/1285] Adds search result test

---
 .../connectors/test_inventaire_connector.py   | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/bookwyrm/tests/connectors/test_inventaire_connector.py b/bookwyrm/tests/connectors/test_inventaire_connector.py
index a124f35b..2b1d9bdf 100644
--- a/bookwyrm/tests/connectors/test_inventaire_connector.py
+++ b/bookwyrm/tests/connectors/test_inventaire_connector.py
@@ -1,4 +1,6 @@
 """ testing book data connectors """
+import json
+import pathlib
 from django.test import TestCase
 import responses
 
@@ -45,3 +47,22 @@ class Inventaire(TestCase):
         result = self.connector.get_book_data("https://test.url/ok")
         self.assertEqual(result["wdt:P31"], ["wd:Q3331189"])
         self.assertEqual(result["uri"], "isbn:9780375757853")
+
+    def test_format_search_result(self):
+        """json to search result objs"""
+        search_file = pathlib.Path(__file__).parent.joinpath(
+            "../data/inventaire_search.json"
+        )
+        search_results = json.loads(search_file.read_bytes())
+
+        results = self.connector.parse_search_data(search_results)
+        formatted = self.connector.format_search_result(results[0])
+
+        self.assertEqual(formatted.title, "The Stories of Vladimir Nabokov")
+        self.assertEqual(
+            formatted.key, "https://inventaire.io?action=by-uris&uris=wd:Q7766679"
+        )
+        self.assertEqual(
+            formatted.cover,
+            "https://covers.inventaire.io/img/entities/ddb32e115a28dcc0465023869ba19f6868ec4042",
+        )

From 0a415035725a2bd5f9f7ec76f57e47b67ebaa062 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 29 Apr 2021 09:06:17 -0700
Subject: [PATCH 1000/1285] Adds a couple more tests and test data

---
 .../connectors/test_inventaire_connector.py   |  70 ++++++++
 bookwyrm/tests/data/inventaire_edition.json   |  45 +++++
 bookwyrm/tests/data/inventaire_search.json    | 111 +++++++++++++
 bookwyrm/tests/data/inventaire_work.json      | 155 ++++++++++++++++++
 4 files changed, 381 insertions(+)
 create mode 100644 bookwyrm/tests/data/inventaire_edition.json
 create mode 100644 bookwyrm/tests/data/inventaire_search.json
 create mode 100644 bookwyrm/tests/data/inventaire_work.json

diff --git a/bookwyrm/tests/connectors/test_inventaire_connector.py b/bookwyrm/tests/connectors/test_inventaire_connector.py
index 2b1d9bdf..a37382c5 100644
--- a/bookwyrm/tests/connectors/test_inventaire_connector.py
+++ b/bookwyrm/tests/connectors/test_inventaire_connector.py
@@ -66,3 +66,73 @@ class Inventaire(TestCase):
             formatted.cover,
             "https://covers.inventaire.io/img/entities/ddb32e115a28dcc0465023869ba19f6868ec4042",
         )
+
+    def test_get_cover_url(self):
+        """figure out where the cover image is"""
+        cover_blob = {"url": "/img/entities/d46a8"}
+        result = self.connector.get_cover_url(cover_blob)
+        self.assertEqual(result, "https://covers.inventaire.io/img/entities/d46a8")
+
+        cover_blob = {
+            "url": "https://commons.wikimedia.org/wiki/Special:FilePath/The%20Moonstone%201st%20ed.jpg?width=1000",
+            "file": "The Moonstone 1st ed.jpg",
+            "credits": {
+                "text": "Wikimedia Commons",
+                "url": "https://commons.wikimedia.org/wiki/File:The Moonstone 1st ed.jpg",
+            },
+        }
+
+        result = self.connector.get_cover_url(cover_blob)
+        self.assertEqual(
+            result,
+            "https://commons.wikimedia.org/wiki/Special:FilePath/The%20Moonstone%201st%20ed.jpg?width=1000",
+        )
+
+    @responses.activate
+    def test_resolve_keys(self):
+        """makes an http request"""
+        responses.add(
+            responses.GET,
+            "https://inventaire.io?action=by-uris&uris=wd:Q465821",
+            json={
+                "entities": {
+                    "wd:Q465821": {
+                        "type": "genre",
+                        "labels": {
+                            "nl": "briefroman",
+                            "en": "epistolary novel",
+                            "de-ch": "Briefroman",
+                            "en-ca": "Epistolary novel",
+                            "nb": "brev- og dagbokroman",
+                        },
+                        "descriptions": {
+                            "en": "novel written as a series of documents",
+                            "es": "novela escrita como una serie de documentos",
+                            "eo": "romano en la formo de serio de leteroj",
+                        },
+                    },
+                    "redirects": {},
+                }
+            },
+        )
+        responses.add(
+            responses.GET,
+            "https://inventaire.io?action=by-uris&uris=wd:Q208505",
+            json={
+                "entities": {
+                    "wd:Q208505": {
+                        "type": "genre",
+                        "labels": {
+                            "en": "crime novel",
+                        },
+                    },
+                }
+            },
+        )
+
+        keys = [
+            "wd:Q465821",
+            "wd:Q208505",
+        ]
+        result = self.connector.resolve_keys(keys)
+        self.assertEqual(result, ["epistolary novel", "crime novel"])
diff --git a/bookwyrm/tests/data/inventaire_edition.json b/bookwyrm/tests/data/inventaire_edition.json
new file mode 100644
index 00000000..1150bc9b
--- /dev/null
+++ b/bookwyrm/tests/data/inventaire_edition.json
@@ -0,0 +1,45 @@
+{
+    "entities": {
+        "isbn:9780375757853": {
+            "_id": "7beee121a8d9ac345cdf4e9128577723",
+            "_rev": "2-ac318b04b953ca3894deb77fee28211c",
+            "type": "edition",
+            "labels": {},
+            "claims": {
+                "wdt:P31": [
+                    "wd:Q3331189"
+                ],
+                "wdt:P212": [
+                    "978-0-375-75785-3"
+                ],
+                "wdt:P957": [
+                    "0-375-75785-6"
+                ],
+                "wdt:P407": [
+                    "wd:Q1860"
+                ],
+                "wdt:P1476": [
+                    "The Moonstone"
+                ],
+                "wdt:P577": [
+                    "2001"
+                ],
+                "wdt:P629": [
+                    "wd:Q2362563"
+                ],
+                "invp:P2": [
+                    "d46a8eac7555afa479b8bbb5149f35858e8e19c4"
+                ]
+            },
+            "created": 1495452670475,
+            "updated": 1541032981834,
+            "version": 3,
+            "uri": "isbn:9780375757853",
+            "originalLang": "en",
+            "image": {
+                "url": "/img/entities/d46a8eac7555afa479b8bbb5149f35858e8e19c4"
+            }
+        }
+    },
+    "redirects": {}
+}
diff --git a/bookwyrm/tests/data/inventaire_search.json b/bookwyrm/tests/data/inventaire_search.json
new file mode 100644
index 00000000..e80e593a
--- /dev/null
+++ b/bookwyrm/tests/data/inventaire_search.json
@@ -0,0 +1,111 @@
+{
+    "results": [
+        {
+            "id": "Q7766679",
+            "type": "works",
+            "uri": "wd:Q7766679",
+            "label": "The Stories of Vladimir Nabokov",
+            "description": "book by Vladimir Nabokov",
+            "image": [
+                "ddb32e115a28dcc0465023869ba19f6868ec4042"
+            ],
+            "_score": 25.180836,
+            "_popularity": 4
+        },
+        {
+            "id": "Q47407212",
+            "type": "works",
+            "uri": "wd:Q47407212",
+            "label": "Conversations with Vladimir Nabokov",
+            "description": "book edited by Robert Golla",
+            "image": [],
+            "_score": 24.41498,
+            "_popularity": 2
+        },
+        {
+            "id": "Q6956987",
+            "type": "works",
+            "uri": "wd:Q6956987",
+            "label": "Nabokov's Congeries",
+            "description": "book by Vladimir Nabokov",
+            "image": [],
+            "_score": 22.343866,
+            "_popularity": 2
+        },
+        {
+            "id": "Q6956986",
+            "type": "works",
+            "uri": "wd:Q6956986",
+            "label": "Nabokov's Butterflies",
+            "description": "book by Brian Boyd",
+            "image": [],
+            "_score": 22.343866,
+            "_popularity": 2
+        },
+        {
+            "id": "Q47472170",
+            "type": "works",
+            "uri": "wd:Q47472170",
+            "label": "A Reader's Guide to Nabokov's \"Lolita\"",
+            "description": "book by Julian W. Connolly",
+            "image": [],
+            "_score": 19.482553,
+            "_popularity": 2
+        },
+        {
+            "id": "Q7936323",
+            "type": "works",
+            "uri": "wd:Q7936323",
+            "label": "Visiting Mrs Nabokov: And Other Excursions",
+            "description": "book by Martin Amis",
+            "image": [],
+            "_score": 18.684965,
+            "_popularity": 2
+        },
+        {
+            "id": "1732d81bf7376e04da27568a778561a4",
+            "type": "works",
+            "uri": "inv:1732d81bf7376e04da27568a778561a4",
+            "label": "Nabokov's Dark Cinema",
+            "image": [
+                "7512805a53da569b11bf29cc3fb272c969619749"
+            ],
+            "_score": 16.56681,
+            "_popularity": 1
+        },
+        {
+            "id": "00f118336b02219e1bddc8fa93c56050",
+            "type": "works",
+            "uri": "inv:00f118336b02219e1bddc8fa93c56050",
+            "label": "The Cambridge Companion to Nabokov",
+            "image": [
+                "0683a059fb95430cfa73334f9eff2ef377f3ae3d"
+            ],
+            "_score": 15.502292,
+            "_popularity": 1
+        },
+        {
+            "id": "6e59f968a1cd00dbedeb1964dec47507",
+            "type": "works",
+            "uri": "inv:6e59f968a1cd00dbedeb1964dec47507",
+            "label": "Vladimir Nabokov : selected letters, 1940-1977",
+            "image": [
+                "e3ce8c0ee89d576adf2651a6e5ce55fc6d9f8cb3"
+            ],
+            "_score": 15.019735,
+            "_popularity": 1
+        },
+        {
+            "id": "Q127149",
+            "type": "works",
+            "uri": "wd:Q127149",
+            "label": "Lolita",
+            "description": "novel by Vladimir Nabokov",
+            "image": [
+                "51cbfdbf7257b1a6bb3ea3fbb167dbce1fb44a0e"
+            ],
+            "_score": 13.458428,
+            "_popularity": 32
+        }
+    ]
+}
diff --git a/bookwyrm/tests/data/inventaire_work.json b/bookwyrm/tests/data/inventaire_work.json
new file mode 100644
index 00000000..635c52f3
--- /dev/null
+++ b/bookwyrm/tests/data/inventaire_work.json
@@ -0,0 +1,155 @@
+{
+    "entities": {
+        "wd:Q2362563": {
+            "type": "work",
+            "labels": {
+                "zh-hans": "月亮�石",
+                "zh-hant": "月亮寶石",
+                "zh-hk": "月光石",
+                "zh-tw": "月光石",
+                "cy": "The Moonstone",
+                "ml": "ദ മൂൺസ�റ�റോൺ",
+                "ja": "月長石",
+                "te": "ది మూన� స�టోన�",
+                "ru": "Лунный камень",
+                "fr": "La Pierre de lune",
+                "en": "The Moonstone",
+                "es": "La piedra lunar",
+                "it": "La Pietra di Luna",
+                "zh": "月亮�石",
+                "pl": "Kamień Księżycowy",
+                "sr": "2 Јн",
+                "ta": "moon stone",
+                "ar": "حجر القمر",
+                "fa": "ماه‌الماس",
+                "uk": "Мі��чний камінь",
+                "nl": "The Moonstone",
+                "de": "Der Monddiamant",
+                "sl": "Diamant",
+                "sv": "MÃ¥nstenen",
+                "he": "�בן הירח",
+                "eu": "Ilargi-harriak",
+                "bg": "Лунни�т камък",
+                "ka": "მთვ�რის ქვ�",
+                "eo": "La Lun�tono",
+                "hy": "Ô¼Õ¸Ö‚Õ½Õ¶Õ¡Ö„Õ¡Ö€",
+                "ro": "Piatra Lunii",
+                "ca": "The Moonstone",
+                "is": "The Moonstone"
+            },
+            "descriptions": {
+                "it": "romanzo scritto da Wilkie Collins",
+                "en": "novel by Wilkie Collins",
+                "de": "Buch von Wilkie Collins",
+                "nl": "boek van Wilkie Collins",
+                "ru": "роман Уилки Коллинза",
+                "he": "רומן מ�ת וילקי קולינס",
+                "ar": "رواية من تألي� ويلكي كولينز",
+                "fr": "livre de Wilkie Collins",
+                "es": "libro de Wilkie Collins",
+                "bg": "роман на Уилки Колин�",
+                "ka": "უილკი კ�ლინსის რ�მ�ნი",
+                "eo": "angalingva romano far Wilkie Collins",
+                "ro": "roman de Wilkie Collins"
+            },
+            "aliases": {
+                "zh": [
+                    "月光石"
+                ],
+                "ml": [
+                    "The Moonstone"
+                ],
+                "fr": [
+                    "The Moonstone"
+                ],
+                "it": [
+                    "Il diamante indiano",
+                    "La pietra della luna",
+                    "La maledizione del diamante indiano"
+                ],
+                "ro": [
+                    "The Moonstone"
+                ]
+            },
+            "claims": {
+                "wdt:P18": [
+                    "The Moonstone 1st ed.jpg"
+                ],
+                "wdt:P31": [
+                    "wd:Q7725634"
+                ],
+                "wdt:P50": [
+                    "wd:Q210740"
+                ],
+                "wdt:P123": [
+                    "wd:Q4457856"
+                ],
+                "wdt:P136": [
+                    "wd:Q465821",
+                    "wd:Q208505",
+                    "wd:Q10992055"
+                ],
+                "wdt:P156": [
+                    "wd:Q7228798"
+                ],
+                "wdt:P268": [
+                    "12496407z"
+                ],
+                "wdt:P407": [
+                    "wd:Q7979"
+                ],
+                "wdt:P577": [
+                    "1868"
+                ],
+                "wdt:P1433": [
+                    "wd:Q21"
+                ],
+                "wdt:P1476": [
+                    "The Moonstone"
+                ],
+                "wdt:P1680": [
+                    "A Romance"
+                ],
+                "wdt:P2034": [
+                    "155"
+                ]
+            },
+            "sitelinks": {
+                "arwiki": "حجر القمر (رواية)",
+                "bgwiki": "Лунни�т камък (роман)",
+                "cywiki": "The Moonstone",
+                "dewiki": "Der Monddiamant",
+                "enwiki": "The Moonstone",
+                "enwikisource": "The Moonstone",
+                "eswiki": "La piedra lunar",
+                "euwiki": "Ilargi-harria",
+                "fawiki": "ماه‌الماس",
+                "frwiki": "La Pierre de lune (roman de Wilkie Collins)",
+                "hewiki": "�בן הירח",
+                "hywiki": "Ô¼Õ¸Ö‚Õ½Õ¶Õ¡Ö„Õ¡Ö€",
+                "iswiki": "The Moonstone",
+                "itwiki": "La pietra di Luna",
+                "jawiki": "月長石 (�説)",
+                "mlwiki": "ദ മൂൺസ�റ�റോൺ",
+                "plwiki": "Kamień Księżycowy (powieść)",
+                "ruwiki": "Лунный камень (роман)",
+                "slwiki": "Diamant (roman)",
+                "srwikisource": "�ови завјет (Караџић) / 2. Јованова",
+                "svwiki": "MÃ¥nstenen",
+                "tewiki": "ది మూన�‌స�టోన�",
+                "ukwiki": "Мі��чний камінь (роман)",
+                "zhwiki": "月亮�石"
+            },
+            "uri": "wd:Q2362563",
+            "image": {
+                "url": "https://commons.wikimedia.org/wiki/Special:FilePath/The%20Moonstone%201st%20ed.jpg?width=1000",
+                "file": "The Moonstone 1st ed.jpg",
+                "credits": {
+                    "text": "Wikimedia Commons",
+                    "url": "https://commons.wikimedia.org/wiki/File:The Moonstone 1st ed.jpg"
+                }
+            }
+        }
+    },
+    "redirects": {}
+}

From f4800307b44ac8f0c55b659dcc64e1aef4139b34 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 29 Apr 2021 09:54:42 -0700
Subject: [PATCH 1001/1285] Adds isbn search

---
 bookwyrm/connectors/inventaire.py             | 22 +++++++--
 .../connectors/test_inventaire_connector.py   | 19 ++++++++
 .../tests/data/inventaire_isbn_search.json    | 48 +++++++++++++++++++
 bookwyrm/views/books.py                       |  1 -
 4 files changed, 84 insertions(+), 6 deletions(-)
 create mode 100644 bookwyrm/tests/data/inventaire_isbn_search.json

diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index ebbe8d51..fe01ddda 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -81,19 +81,31 @@ class Connector(AbstractConnector):
         )
         return SearchResult(
             title=search_result.get("label"),
-            key="{:s}?action=by-uris&uris={:s}".format(
-                self.books_url, search_result.get("uri")
-            ),
+            key=self.get_remote_id(search_result.get("uri")),
             view_link="{:s}{:s}".format(self.base_url, search_result.get("uri")),
             cover=cover,
             connector=self,
         )
 
     def parse_isbn_search_data(self, data):
-        """boop doop"""
+        """got some daaaata"""
+        results = data.get('entities')
+        if not results:
+            return []
+        return list(results.values())
 
     def format_isbn_search_result(self, search_result):
-        """beep bloop"""
+        """totally different format than a regular search result"""
+        title = search_result.get("claims", {}).get("wdt:P1476", [])
+        if not title:
+            return None
+        return SearchResult(
+            title=title[0],
+            key=self.get_remote_id(search_result.get("uri")),
+            view_link="{:s}{:s}".format(self.base_url, search_result.get("uri")),
+            cover=self.get_cover_url(search_result.get("image")),
+            connector=self
+        )
 
     def is_work_data(self, data):
         return data.get("type") == "work"
diff --git a/bookwyrm/tests/connectors/test_inventaire_connector.py b/bookwyrm/tests/connectors/test_inventaire_connector.py
index a37382c5..90018534 100644
--- a/bookwyrm/tests/connectors/test_inventaire_connector.py
+++ b/bookwyrm/tests/connectors/test_inventaire_connector.py
@@ -136,3 +136,22 @@ class Inventaire(TestCase):
         ]
         result = self.connector.resolve_keys(keys)
         self.assertEqual(result, ["epistolary novel", "crime novel"])
+
+    def test_isbn_search(self):
+        """ another search type """
+        search_file = pathlib.Path(__file__).parent.joinpath(
+            "../data/inventaire_isbn_search.json"
+        )
+        search_results = json.loads(search_file.read_bytes())
+
+        results = self.connector.parse_isbn_search_data(search_results)
+        formatted = self.connector.format_isbn_search_result(results[0])
+
+        self.assertEqual(formatted.title, "L'homme aux cercles bleus")
+        self.assertEqual(
+            formatted.key, "https://inventaire.io?action=by-uris&uris=isbn:9782290349229"
+        )
+        self.assertEqual(
+            formatted.cover,
+            "https://covers.inventaire.io/img/entities/12345",
+        )
diff --git a/bookwyrm/tests/data/inventaire_isbn_search.json b/bookwyrm/tests/data/inventaire_isbn_search.json
new file mode 100644
index 00000000..7328a78f
--- /dev/null
+++ b/bookwyrm/tests/data/inventaire_isbn_search.json
@@ -0,0 +1,48 @@
+{
+    "entities": {
+        "isbn:9782290349229": {
+            "_id": "d59e3e64f92c6340fbb10c5dcf7c0abf",
+            "_rev": "3-079ed51158a001dc74caafb21cff1c22",
+            "type": "edition",
+            "labels": {},
+            "claims": {
+                "wdt:P31": [
+                    "wd:Q3331189"
+                ],
+                "wdt:P212": [
+                    "978-2-290-34922-9"
+                ],
+                "wdt:P957": [
+                    "2-290-34922-4"
+                ],
+                "wdt:P407": [
+                    "wd:Q150"
+                ],
+                "wdt:P1476": [
+                    "L'homme aux cercles bleus"
+                ],
+                "wdt:P629": [
+                    "wd:Q3203603"
+                ],
+                "wdt:P123": [
+                    "wd:Q3156592"
+                ],
+                "invp:P2": [
+                    "57883743aa7c6ad25885a63e6e94349ec4f71562"
+                ],
+                "wdt:P577": [
+                    "2005-05-01"
+                ]
+            },
+            "created": 1485023383338,
+            "updated": 1609171008418,
+            "version": 5,
+            "uri": "isbn:9782290349229",
+            "originalLang": "fr",
+            "image": {
+                "url": "/img/entities/12345"
+            }
+        }
+    },
+    "redirects": {}
+}
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index ee1a5e06..6005c9fd 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -156,7 +156,6 @@ class EditBook(View):
                         ),
                     }
                 )
-                print(data["author_matches"])
 
         # we're creating a new book
         if not book:

From 8d38d1c9d1bd51b7d4622845f6d3e242ba6e9c1d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 29 Apr 2021 09:56:35 -0700
Subject: [PATCH 1002/1285] Python formatting

---
 bookwyrm/connectors/inventaire.py                      | 4 ++--
 bookwyrm/tests/connectors/test_inventaire_connector.py | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index fe01ddda..e972950f 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -89,7 +89,7 @@ class Connector(AbstractConnector):
 
     def parse_isbn_search_data(self, data):
         """got some daaaata"""
-        results = data.get('entities')
+        results = data.get("entities")
         if not results:
             return []
         return list(results.values())
@@ -104,7 +104,7 @@ class Connector(AbstractConnector):
             key=self.get_remote_id(search_result.get("uri")),
             view_link="{:s}{:s}".format(self.base_url, search_result.get("uri")),
             cover=self.get_cover_url(search_result.get("image")),
-            connector=self
+            connector=self,
         )
 
     def is_work_data(self, data):
diff --git a/bookwyrm/tests/connectors/test_inventaire_connector.py b/bookwyrm/tests/connectors/test_inventaire_connector.py
index 90018534..4058b067 100644
--- a/bookwyrm/tests/connectors/test_inventaire_connector.py
+++ b/bookwyrm/tests/connectors/test_inventaire_connector.py
@@ -138,7 +138,7 @@ class Inventaire(TestCase):
         self.assertEqual(result, ["epistolary novel", "crime novel"])
 
     def test_isbn_search(self):
-        """ another search type """
+        """another search type"""
         search_file = pathlib.Path(__file__).parent.joinpath(
             "../data/inventaire_isbn_search.json"
         )
@@ -149,7 +149,8 @@ class Inventaire(TestCase):
 
         self.assertEqual(formatted.title, "L'homme aux cercles bleus")
         self.assertEqual(
-            formatted.key, "https://inventaire.io?action=by-uris&uris=isbn:9782290349229"
+            formatted.key,
+            "https://inventaire.io?action=by-uris&uris=isbn:9782290349229",
         )
         self.assertEqual(
             formatted.cover,

From cfd2c05ae2b5638cdc26ca7aadb0c613983b8fa9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 29 Apr 2021 10:12:56 -0700
Subject: [PATCH 1003/1285] Safely handle absent claims field

---
 bookwyrm/connectors/inventaire.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index e972950f..e6fb6826 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -65,7 +65,7 @@ class Connector(AbstractConnector):
             raise ConnectorException("Invalid book data")
         # flatten the data so that images, uri, and claims are on the same level
         return {
-            **data.get("claims"),
+            **data.get("claims", {}),
             **{k: data.get(k) for k in ["uri", "image", "labels"]},
         }
 

From ca86af22ce3a968212ce21e04ba619b406e4537c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 29 Apr 2021 10:30:38 -0700
Subject: [PATCH 1004/1285] Get inventaire entity descriptions

---
 bookwyrm/connectors/inventaire.py      | 20 ++++++++++++++++++--
 bookwyrm/management/commands/initdb.py |  2 +-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index e6fb6826..a50a2584 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -23,6 +23,7 @@ class Connector(AbstractConnector):
             Mapping("title", remote_field="wdt:P1476", formatter=get_first),
             Mapping("subtitle", remote_field="wdt:P1680", formatter=get_first),
             Mapping("inventaireId", remote_field="uri"),
+            Mapping("description", remote_field="sitelinks", formatter=self.get_description),
             Mapping("cover", remote_field="image", formatter=self.get_cover_url),
             Mapping("isbn13", remote_field="wdt:P212", formatter=get_first),
             Mapping("isbn10", remote_field="wdt:P957", formatter=get_first),
@@ -44,6 +45,7 @@ class Connector(AbstractConnector):
         self.author_mappings = [
             Mapping("id", remote_field="uri", formatter=self.get_remote_id),
             Mapping("name", remote_field="labels", formatter=get_language_code),
+            Mapping("bio", remote_field="sitelinks", formatter=self.get_description),
             Mapping("goodreadsKey", remote_field="wdt:P2963", formatter=get_first),
             Mapping("isni", remote_field="wdt:P213", formatter=get_first),
             Mapping("viafId", remote_field="wdt:P214", formatter=get_first),
@@ -82,7 +84,7 @@ class Connector(AbstractConnector):
         return SearchResult(
             title=search_result.get("label"),
             key=self.get_remote_id(search_result.get("uri")),
-            view_link="{:s}{:s}".format(self.base_url, search_result.get("uri")),
+            view_link="{:s}/entity/{:s}".format(self.base_url, search_result.get("uri")),
             cover=cover,
             connector=self,
         )
@@ -102,7 +104,7 @@ class Connector(AbstractConnector):
         return SearchResult(
             title=title[0],
             key=self.get_remote_id(search_result.get("uri")),
-            view_link="{:s}{:s}".format(self.base_url, search_result.get("uri")),
+            view_link="{:s}/entity/{:s}".format(self.base_url, search_result.get("uri")),
             cover=self.get_cover_url(search_result.get("image")),
             connector=self,
         )
@@ -184,6 +186,20 @@ class Connector(AbstractConnector):
             results.append(get_language_code(data.get("labels")))
         return results
 
+    def get_description(self, links):
+        """ grab an extracted except from wikipedia """
+        link = links.get("enwiki")
+        if not link:
+            return ""
+        url = "{:s}/api/data?action=wp-extract&lang=en&title={:s}".format(
+            self.base_url, link
+        )
+        try:
+            data = get_data(url)
+        except ConnectorException:
+            return ""
+        return data.get("extract")
+
 
 def get_language_code(options, code="en"):
     """when there are a bunch of translation but we need a single field"""
diff --git a/bookwyrm/management/commands/initdb.py b/bookwyrm/management/commands/initdb.py
index 07071a2e..9033249d 100644
--- a/bookwyrm/management/commands/initdb.py
+++ b/bookwyrm/management/commands/initdb.py
@@ -98,7 +98,7 @@ def init_connectors():
         identifier="inventaire.io",
         name="Inventaire",
         connector_file="inventaire",
-        base_url="https://inventaire.io/entity/",
+        base_url="https://inventaire.io",
         books_url="https://inventaire.io/api/entities",
         covers_url="https://inventaire.io",
         search_url="https://inventaire.io/api/search?types=works&types=works&search=",

From b1c38d291c432f196107a27af8dc26bc00179c10 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 29 Apr 2021 10:40:49 -0700
Subject: [PATCH 1005/1285] Set preferred language

---
 .env.dev.example                  |  3 +++
 .env.prod.example                 |  3 +++
 bookwyrm/connectors/inventaire.py | 14 ++++++++++----
 bookwyrm/models/book.py           | 10 +++++++++-
 bookwyrm/settings.py              |  1 +
 5 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/.env.dev.example b/.env.dev.example
index 5e605d74..538d1611 100644
--- a/.env.dev.example
+++ b/.env.dev.example
@@ -7,6 +7,9 @@ DEBUG=true
 DOMAIN=your.domain.here
 #EMAIL=your@email.here
 
+# Used for deciding which editions to prefer
+DEFAULT_LANGUAGE="English"
+
 ## Leave unset to allow all hosts
 # ALLOWED_HOSTS="localhost,127.0.0.1,[::1]"
 
diff --git a/.env.prod.example b/.env.prod.example
index 0013bf9d..ac9fe70f 100644
--- a/.env.prod.example
+++ b/.env.prod.example
@@ -7,6 +7,9 @@ DEBUG=false
 DOMAIN=your.domain.here
 EMAIL=your@email.here
 
+# Used for deciding which editions to prefer
+DEFAULT_LANGUAGE="English"
+
 ## Leave unset to allow all hosts
 # ALLOWED_HOSTS="localhost,127.0.0.1,[::1]"
 
diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index a50a2584..ca84338d 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -23,7 +23,9 @@ class Connector(AbstractConnector):
             Mapping("title", remote_field="wdt:P1476", formatter=get_first),
             Mapping("subtitle", remote_field="wdt:P1680", formatter=get_first),
             Mapping("inventaireId", remote_field="uri"),
-            Mapping("description", remote_field="sitelinks", formatter=self.get_description),
+            Mapping(
+                "description", remote_field="sitelinks", formatter=self.get_description
+            ),
             Mapping("cover", remote_field="image", formatter=self.get_cover_url),
             Mapping("isbn13", remote_field="wdt:P212", formatter=get_first),
             Mapping("isbn10", remote_field="wdt:P957", formatter=get_first),
@@ -84,7 +86,9 @@ class Connector(AbstractConnector):
         return SearchResult(
             title=search_result.get("label"),
             key=self.get_remote_id(search_result.get("uri")),
-            view_link="{:s}/entity/{:s}".format(self.base_url, search_result.get("uri")),
+            view_link="{:s}/entity/{:s}".format(
+                self.base_url, search_result.get("uri")
+            ),
             cover=cover,
             connector=self,
         )
@@ -104,7 +108,9 @@ class Connector(AbstractConnector):
         return SearchResult(
             title=title[0],
             key=self.get_remote_id(search_result.get("uri")),
-            view_link="{:s}/entity/{:s}".format(self.base_url, search_result.get("uri")),
+            view_link="{:s}/entity/{:s}".format(
+                self.base_url, search_result.get("uri")
+            ),
             cover=self.get_cover_url(search_result.get("image")),
             connector=self,
         )
@@ -187,7 +193,7 @@ class Connector(AbstractConnector):
         return results
 
     def get_description(self, links):
-        """ grab an extracted except from wikipedia """
+        """grab an extracted except from wikipedia"""
         link = links.get("enwiki")
         if not link:
             return ""
diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index 0bbae033..10af9b5b 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -5,7 +5,7 @@ from django.db import models
 from model_utils.managers import InheritanceManager
 
 from bookwyrm import activitypub
-from bookwyrm.settings import DOMAIN
+from bookwyrm.settings import DOMAIN, DEFAULT_LANGUAGE
 
 from .activitypub_mixin import OrderedCollectionPageMixin, ObjectMixin
 from .base_model import BookWyrmModel
@@ -211,7 +211,15 @@ class Edition(Book):
     def get_rank(self):
         """calculate how complete the data is on this edition"""
         rank = 0
+        # big ups for havinga  cover
         rank += int(bool(self.cover)) * 3
+        # is it in the instance's preferred language?
+        rank += int(bool(DEFAULT_LANGUAGE in self.languages))
+        print(DEFAULT_LANGUAGE)
+        # prefer print editions
+        rank += int(bool(self.physical_format.lower() in ['paperback', 'hardcover']))
+
+        # does it have metadata?
         rank += int(bool(self.isbn_13))
         rank += int(bool(self.isbn_10))
         rank += int(bool(self.oclc_number))
diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index b679e2d4..1bc3c587 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -11,6 +11,7 @@ DOMAIN = env("DOMAIN")
 VERSION = "0.0.1"
 
 PAGE_LENGTH = env("PAGE_LENGTH", 15)
+DEFAULT_LANGUAGE = env("DEFAULT_LANGUAGE", "English")
 
 # celery
 CELERY_BROKER = env("CELERY_BROKER")

From 7853610a205a5d6e8ed42d766df65f617972cf3a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 29 Apr 2021 10:54:36 -0700
Subject: [PATCH 1006/1285] Load descriptions correctly

---
 bookwyrm/connectors/inventaire.py | 4 ++--
 bookwyrm/models/book.py           | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index ca84338d..896f84af 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -70,7 +70,7 @@ class Connector(AbstractConnector):
         # flatten the data so that images, uri, and claims are on the same level
         return {
             **data.get("claims", {}),
-            **{k: data.get(k) for k in ["uri", "image", "labels"]},
+            **{k: data.get(k) for k in ["uri", "image", "labels", "sitelinks"]},
         }
 
     def parse_search_data(self, data):
@@ -193,7 +193,7 @@ class Connector(AbstractConnector):
         return results
 
     def get_description(self, links):
-        """grab an extracted except from wikipedia"""
+        """grab an extracted excerpt from wikipedia"""
         link = links.get("enwiki")
         if not link:
             return ""
diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index 10af9b5b..e7c95759 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -215,9 +215,8 @@ class Edition(Book):
         rank += int(bool(self.cover)) * 3
         # is it in the instance's preferred language?
         rank += int(bool(DEFAULT_LANGUAGE in self.languages))
-        print(DEFAULT_LANGUAGE)
         # prefer print editions
-        rank += int(bool(self.physical_format.lower() in ['paperback', 'hardcover']))
+        rank += int(bool(self.physical_format.lower() in ["paperback", "hardcover"]))
 
         # does it have metadata?
         rank += int(bool(self.isbn_13))

From d1b5f3b6f0d98fc0076da1f16a5fc465d4877433 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 29 Apr 2021 11:04:14 -0700
Subject: [PATCH 1007/1285] Fixes ranks and normalizes isbns

---
 bookwyrm/models/book.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index e7c95759..0539414a 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -216,7 +216,10 @@ class Edition(Book):
         # is it in the instance's preferred language?
         rank += int(bool(DEFAULT_LANGUAGE in self.languages))
         # prefer print editions
-        rank += int(bool(self.physical_format.lower() in ["paperback", "hardcover"]))
+        if self.physical_format:
+            rank += int(
+                bool(self.physical_format.lower() in ["paperback", "hardcover"])
+            )
 
         # does it have metadata?
         rank += int(bool(self.isbn_13))
@@ -236,6 +239,10 @@ class Edition(Book):
         if self.isbn_10 and not self.isbn_13:
             self.isbn_13 = isbn_10_to_13(self.isbn_10)
 
+        # normalize isbn format
+        self.isbn_10 = re.sub(r"[^0-9X]", "", self.isbn_10)
+        self.isbn_13 = re.sub(r"[^0-9X]", "", self.isbn_13)
+
         # set rank
         self.edition_rank = self.get_rank()
 

From d1b788b61fbfbaa129c7f8d19cea4eeaa154214b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 29 Apr 2021 11:14:20 -0700
Subject: [PATCH 1008/1285] Adds inventaire link to book page

---
 bookwyrm/templates/book/book.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index 97f105bf..abe50145 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -81,6 +81,9 @@
                 {% if book.openlibrary_key %}
                 <p><a href="https://openlibrary.org/books/{{ book.openlibrary_key }}" target="_blank" rel="noopener">{% trans "View on OpenLibrary" %}</a></p>
                 {% endif %}
+                {% if book.inventaire_id %}
+                <p><a href="https://inventaire.io/entity/{{ book.inventaire_id }}" target="_blank" rel="noopener">{% trans "View on Inventaire" %}</a></p>
+                {% endif %}
             </section>
         </div>
 

From 095b60bff107ab36370ce1743fb585a38598e904 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 29 Apr 2021 11:22:09 -0700
Subject: [PATCH 1009/1285] Show search result context for inventaire results

---
 bookwyrm/connectors/inventaire.py                   | 2 ++
 bookwyrm/templates/snippets/search_result_text.html | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index 896f84af..dc27f2c0 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -86,6 +86,7 @@ class Connector(AbstractConnector):
         return SearchResult(
             title=search_result.get("label"),
             key=self.get_remote_id(search_result.get("uri")),
+            author=search_result.get("description"),
             view_link="{:s}/entity/{:s}".format(
                 self.base_url, search_result.get("uri")
             ),
@@ -108,6 +109,7 @@ class Connector(AbstractConnector):
         return SearchResult(
             title=title[0],
             key=self.get_remote_id(search_result.get("uri")),
+            author=search_result.get("description"),
             view_link="{:s}/entity/{:s}".format(
                 self.base_url, search_result.get("uri")
             ),
diff --git a/bookwyrm/templates/snippets/search_result_text.html b/bookwyrm/templates/snippets/search_result_text.html
index 2f6ba503..26623c05 100644
--- a/bookwyrm/templates/snippets/search_result_text.html
+++ b/bookwyrm/templates/snippets/search_result_text.html
@@ -18,8 +18,13 @@
             <strong>
                 <a href="{{ result.view_link|default:result.key }}"{% if remote_result %} rel=�noopener� target="_blank"{% endif %}>{{ result.title }}</a>
             </strong>
+        </p>
+        <p>
             {% if result.author %}
-            {% blocktrans with author=result.author %}by {{ author }}{% endblocktrans %}{% endif %}{% if result.year %} ({{ result.year }})
+            {{ result.author }}
+            {% endif %}
+            {% if result.year %}
+            ({{ result.year }})
             {% endif %}
         </p>
 

From a31d05c6947d2469d4adc9a22975d6155082e8dd Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 29 Apr 2021 11:31:01 -0700
Subject: [PATCH 1010/1285] Don't crash on books with no isbn

---
 bookwyrm/models/book.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py
index 0539414a..869ff04d 100644
--- a/bookwyrm/models/book.py
+++ b/bookwyrm/models/book.py
@@ -240,8 +240,10 @@ class Edition(Book):
             self.isbn_13 = isbn_10_to_13(self.isbn_10)
 
         # normalize isbn format
-        self.isbn_10 = re.sub(r"[^0-9X]", "", self.isbn_10)
-        self.isbn_13 = re.sub(r"[^0-9X]", "", self.isbn_13)
+        if self.isbn_10:
+            self.isbn_10 = re.sub(r"[^0-9X]", "", self.isbn_10)
+        if self.isbn_13:
+            self.isbn_13 = re.sub(r"[^0-9X]", "", self.isbn_13)
 
         # set rank
         self.edition_rank = self.get_rank()

From 0dcd7853f7ad4e94dc70104c7f8484f05a4f1844 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 29 Apr 2021 11:38:51 -0700
Subject: [PATCH 1011/1285] Updates locales

---
 locale/de_DE/LC_MESSAGES/django.mo   | Bin 25779 -> 25234 bytes
 locale/de_DE/LC_MESSAGES/django.po   |  73 ++++++++++++++-------------
 locale/en_US/LC_MESSAGES/django.po   |  67 ++++++++++++------------
 locale/es/LC_MESSAGES/django.mo      | Bin 42362 -> 65330 bytes
 locale/es/LC_MESSAGES/django.po      |  73 ++++++++++++++-------------
 locale/fr_FR/LC_MESSAGES/django.mo   | Bin 42851 -> 41556 bytes
 locale/fr_FR/LC_MESSAGES/django.po   |  73 ++++++++++++++-------------
 locale/zh_Hans/LC_MESSAGES/django.mo | Bin 38418 -> 37261 bytes
 locale/zh_Hans/LC_MESSAGES/django.po |  73 ++++++++++++++-------------
 9 files changed, 189 insertions(+), 170 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo
index dca726855f8f9060958660f8ab5bae1e36db3fd9..3f41eda575696af9585b5df60f4b09c991259496 100644
GIT binary patch
delta 7645
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
P?qvmoyxhMQ?)UsZj4dN2

delta 8133
zcmZA62V9rc9>?*+kRgb;5D?+7Am9Mpnj`lHCpgd;%3mP_i=o%~*Bq%W(=<!lYNa;+
zWlJklubHE~-iFrIEK6-@w#4k#{e1t=v0FVaf4t8*&w0*%9<f&M^Yb3?^PH?7xYlq@
z^)n_8GsBEIMS5P8N{y*$YD^_w!KGLhZ%hRKfUVF!!I(yvhE1>^w#9s`i>t6PK8!SB
zUdC+v0F#aJnAR@m#%OHLjhnC;u0b{YBF5lB?1*2W8jPh<61K+~IL^8s%gJ}4u`##>
zd*d(I3A-m6(-LpS2J~+>kf=w&GZ=)sF$CYn06dDJ_&#bzr)>TrY9+2<ForN1Js*kT
z*ccmN5;7*!729Jjs{S1qME_<jiTbz^1MwMDM=v0|VfJDjd=CThBu3)rxD0<pO<-;d
zXAAB?4d6-CfOeqT+hxlSV=eM0(4z{UlF*3GS}&p+ylf3kc9yIOYM=v9&y7b7EFU${
zGE~R2QO_^4<?C(vCS=>qbEy7~CbRw;*>PL(JgUK;FbD%ujA@9qQ4J@c?zcgmfo>R$
zqfv*i6jkq5qzQ8ms{PlnD;~sP3`}*(!&6y*H5g|LTA^mr4YlV3ts||us1Ay-Hr{OW
z^H3eFu;uq*Ecs2Sj^99?l^WClf;oY*uE!=Cqbej|D5j&9uq(Q7DC&MGhTt638CZ;Z
zOYT9f*jCg)p2JYwje72&&7ZLOGpOf0KakLap}fp$I1+VgV^HO3SQ|T{R;m~BCYdbM
z{hO?_P%E<lRqr;`O5TT>$Y#{QUP8Uj`;q=U=Cr->6>3Dkpc;s5?TkDg)j%5RelOJ0
z<)B`x8!!busOKI>b@U=m#C<m3tc}xNI}D?|w=d8BXOgHz!9>)|3sHxz+Lo_G&2$y2
z<9ksJJcO#Z4a4zG)FC{KTJrPO8q~@Lr`Z)oy+twDQ15>m65-g#IvneepNM+jOHeCN
zj(Tt*s)IGiSJ*s?{4u+2{vxV=M7nbZT&R32)PQ@S2098oYM_inDBg~Ba2;wun@}@;
z&fb3oHIqHaA9IKwTDhyJf%;`QuVWBu#S&2MCZpPIiyFxFsFfa>!Tzga5d~_X6xH!f
zsE+1i1TMq6xEA>)na!wy9kd=p)&CgP!5LJ?Kcm{$-$;BUO)zTaZLls5Zp->>2IDDE
zgL(GGRMdcGq6Rb<HG}0gzYaC9$87$2)Tw?0Rqr^e<Fi;BFQEFlg8X%1en&l@=xOI9
z+M@>02X(lHpc=?Q4P=td7or|4Ms3|JtcUAR19$?};ajLBK8(EK<}~WLu=Y+rv8aAL
z%}JDzNXG=+h+4{>)_tgf9l=Qa0JXGdt(Q>WgR7{miSOXl?~nD#XQEalA5*XlTjN@!
zU60vKLL)nX+LMn^138C!Fr=f?U=-?pJZh%tsDTbft<)&gz{cD1$*Au|DQW_XQ0=Wi
zZRx!jLjPtHi3t=uWh(@Cat720^-E9^YN@(o8V<stSZ#e1^_NjtXXo`wM9sV_>Nl!k
z*cXfK{cWf%dJ}8Wzd1-kGdPOA6+o@XIn)d<TTK^d<e{kYC{#lUsF}60_q$>P@&hm#
zC)o0ZsFk<_)z4b=j3lv{L>~T(Y@^BHuPklBa%_Z8pdNS~HS;5=4q~ojRWJ>;q$Q{U
z&9p8;J%2mu^goIkz!R8-&tAv+4=3@PEy(KT3}6HLQ+@<Bv!kdEPN4?;jkPDek05_1
zvU}zvYGoSqaO%flHu;v;1vrNMF=P%Vr6=pJy(;MGjIa{bz--h=Z$WL%N?U%n^?qCa
z7{+jaD;D5h)N?JaciKtAfquqx#)Xv6@5KSc-%u;F+|%269UjDb6ug6R_zAM@<_hYy
zYum>;WPPv+`3X1?t5NljVmw|z?RgzeoL<L{sCIKP8mA+RWR{|~*t462DxSu97~GGK
z3NFF<_$%h&oc_*IA4djnS`IKK6-!WOVYPJ&Y6V|KorOK9x95nxe*!g-3&_AcCU~H;
z6fvknmVw&yUZ|O8p&rOX7tTUf*{nx3`~j-N&oCChMr}dRAm_OVRC_7d7(1c9s9EUy
z{eLuxRTNCchIkp1FnqA{U^~=@r59>ILr{k?7d69asDV`2@&z`38>+o~QG2}|+u&QM
zGj|a~JtX{xI7=9gS^<}}Ek=>=ZS&)-(@+DPg`v0+Rc{MwAiHe&0SqC340UEcL48+h
zP%9G5yX?`@HX@-@oQ}<LFsec+rr>PUA$kOPQ;iqZ@VBVF{~5I+wTC$?)EG6xR8)uE
zQ4<?#@8{b4rNh{NE$IRZ)WKb-C40nH+<{HW??+yF^98CwSEe(746IGQD~4h})bm-k
ze6r1#VKU{npa%9NYJxj6S%1yo9SZasox~u#YAg6>IUPl!1{j0E*c#PP2h{TeF&uMI
z1Db|9Y!#^bD^UYnjoPY>*c!ba66)|2hT)f}2ERu&7{upME7SmWh>}nP>4vJ8iR!Qb
z)nTc1F={0?pxS-b=69l=J8H{4Uyx`;!6i(`IKHQv*)UWCc{mj-Q5~GXTKGMxp&C^E
z@R80$5>U@2Tf3v`k3^lBvDSQK;2u*<LNlvGEzJtlRy>T6xC?dv2&&;TsHMDuI<x_!
zoadTi9r7JfGwzFZaX4y)^HBBOs6+3;DEc?+N$8Y6gBkcCw!q-gPQ^4-g9A}3Fxr;i
zh{@y^V;kIx5%?k2$1hP^cm;I^g2p%lk3el%H0t+HlSo2eq-@kuO+cOceAI*UQ8QkO
zT8X=`9&Sdx*Ds--KZaW3k5Dr{je7nZ>bdW%LD?K!@^R?<_y0%|dSD!Crg_*9Z$!<&
zW6N(xosspZ@5Fx8QhtT%I3UMa@^I8v#-Rq#0d>DSY9jqnD>XdFzW+B+puH<c7tTWs
z<N?$JPulxlRD-)wU%&&XExCZ|FlekZk*28fBvi*eQ0)vrt?&rc0CL8%{s|<CD2T!(
z=)w)C!?V+tA3~jt&rt(yFwW_y8EP+6u>w1wwr&e*0((*Q-$R{=lh#WZNj}gs-l@<C
zQz%G89jaldrLVwfRJ{hc9<}t_u{FMnn&DMcM}ZR@>!a$qP-mqdY6Wso?c}5Ww)9kz
z(B9vPYG^HL<PV~jdMifZ^S1l|s)6@W4WCCHzN=V(CfB)Nhz-eBqdHn?%Qqvx44GFj
zlm1N&iCz>8;MW-~-BQ%jKZeohwdIF!82PVI1L{1<8E6*z-Wt?I@=+a6#aNt+n)y1^
zRy~ZGz&5O-_x}xBa2VC_Y1HAUvH9Q|oKqi<YB&qk&}3A-G8}>Pum}%fI=182rbH~j
zcwB<Mi6Nf^<HacYH$nOA4>m>Zd7-r&wWo7Y9j`!b$%CjFZ$S>e*^Yd(jDG>2SIow)
zxD5mF3~Hd~Q0-qv7Tp9Evi^D?pM(l_U=OS}+39#VYUw5+gEdo;)i?W)K25VJ&VO26
zgc{&ms4e&qb(T(|27K1$FIsC*?fMn5{(2ycbxXwhSd5)fOZ*V3p{?kL8;D;BEw8R3
z3bkbebn|al75P+RIFVrQw<3L<&^3v&KtB(Mk3>gekgb$tRV9s5Z^P$AOUkucq4s_k
ze1iOT;sv5L`M2>I;vAu^(WRAnmCy<gCH4`Swhf&>-&JkB4RuI#y-A!Pw6}+ei^QL=
zJQ`_i8`5g+AbJ!3BK~|WCG!n&hVZlXBd{}h&lnO1N%SX{5W4iGTJ1|YKgLpLB=Hhi
z9jucoCf}ThBRN%ht{aJG2|fkBYY{)6Bsvjp>VEAjb$%>!@R+r>@O|t<q)<^;A@MlT
zo%o&5O1Zcfi)q*qlkrw;in{!XokTO@e&PeAx%V+XM(C^s5Kj}jYSijRCvC#0m}b*L
zABpQIi^s2sY~s(CzTdjisWZn(`u^o~nlzsP-~WWT3tzYQE@2RLClZ0AUsL(D{g0<m
zSDe+!IX^eq%uV<P@d+``)*Ffwh^@9xEn9w!{4GQj`3A&g(iaHc+&`{-Ql7hQwh=yL
z(<7{63J>?fJBVKieUSQ7b~6^@By<zmq}vnqh<nMeC(aWs$hX73guVq|67LYBDQ~U$
z7m(4FMGU6!fG_8Kslv$*C$3!qq-T)nf%(K1dt)NLLbRbQ1j~p_;#)#jW8x}NoBM6C
zK8_&%SpTz1+e@F;M~J#q*kj9v;a;K@Wx+%)F_8RzqA%&?sB0#1g(x9T5&qoUjKxF;
zVkGf1aRcSP%frtHhzwh>l5_&`9HA?Q_>5@6{cbAYT1+I8FTz;-6m|XE!A!&Nh-9KA
z(T~ve6w!zJ>+l~c;8Op->mz<n<)#-OC4M6Y6Vr)>L~ri(zz`fy=xXlZ`#G7i3{nph
zJ?;G#q$7wmL_MOjEq|A^{;Nn+_1}a{BQm@2D52{<!bRi}(e|O)q$`LNqCKJOKg5T=
zl=BbMRiuYef0TX3-tzH1KePT;-c{fKaolLgjeBq&F`v-&9?^#A#=R~$h4?S=7I7zW
z?fNH)e$;sx=i0(U_@hn#gpu6;0ml$MZTW88c5VF!ky%0HP_ZqcYdkT8s6+k;CK9@C
zcQEZJ|AKTXcDK*y))3N3*a;uR>oJB{pqpIJ6Vbku^J<z>GS?F?+QLfgzysH=(Kayv
z3%s40Mg;}BstTuh2PH1@i!QBHdYZe))x1S2sr2%~GIz_$=H9(Y9sR<mRF%vuta7`m
zE8P{|A6qO6{Y%N3n=|Hyl+Bpw_BD4tqf0<^Rbdr%D_zBfm9EKdce$&`J>6a9F7n2A
zSmPg;HhIR3$|_f-ua?OvPn%v+>b6<$)15vJs55!Ct3_&Ibye|<ik6k$<=2f03&>`u
zhx(uJOUf##`r9B~WrY=`CGHAF*muv)Da8zO^T3&YQNydN=C~`mm8ko|QszJ%ceyuq
za6wqZ|KF?l<KCKCV;0w<AD7#EY0PT@v3=boRTX<SO>?_uRaX=-i)rrZdv;V#DX#Kv
z8+Y74Bimgvozgkg74%wK?k+BKmz#lwGiOwkRQkI5>n-o%+%bU>GiQ|ld2a9L?F#rG
Di1DHT

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 7acc3f96..bbdd1327 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-26 09:56-0700\n"
+"POT-Creation-Date: 2021-04-29 11:36-0700\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"
@@ -100,23 +100,23 @@ msgstr "Username"
 msgid "A user with that username already exists."
 msgstr "Dieser Benutzename ist bereits vergeben."
 
-#: bookwyrm/settings.py:152
+#: bookwyrm/settings.py:155
 msgid "English"
 msgstr "Englisch"
 
-#: bookwyrm/settings.py:153
+#: bookwyrm/settings.py:156
 msgid "German"
 msgstr "Deutsch"
 
-#: bookwyrm/settings.py:154
+#: bookwyrm/settings.py:157
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: bookwyrm/settings.py:155
+#: bookwyrm/settings.py:158
 msgid "French"
 msgstr "Französisch"
 
-#: bookwyrm/settings.py:156
+#: bookwyrm/settings.py:159
 msgid "Simplified Chinese"
 msgstr "Vereinfachtes Chinesisch"
 
@@ -178,24 +178,30 @@ msgstr "Laden fehlgeschlagen"
 msgid "View on OpenLibrary"
 msgstr "In OpenLibrary ansehen"
 
-#: bookwyrm/templates/book/book.html:102
+#: bookwyrm/templates/book/book.html:85
+#, fuzzy
+#| msgid "View on OpenLibrary"
+msgid "View on Inventaire"
+msgstr "In OpenLibrary ansehen"
+
+#: bookwyrm/templates/book/book.html:105
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s Bewertung)"
 msgstr[1] "(%(review_count)s Bewertungen)"
 
-#: bookwyrm/templates/book/book.html:114
+#: bookwyrm/templates/book/book.html:117
 msgid "Add Description"
 msgstr "Beschreibung hinzufügen"
 
-#: bookwyrm/templates/book/book.html:121
+#: bookwyrm/templates/book/book.html:124
 #: bookwyrm/templates/book/edit_book.html:107
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: bookwyrm/templates/book/book.html:125
+#: bookwyrm/templates/book/book.html:128
 #: bookwyrm/templates/book/edit_book.html:240
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
@@ -210,7 +216,7 @@ msgstr "Beschreibung:"
 msgid "Save"
 msgstr "Speichern"
 
-#: bookwyrm/templates/book/book.html:126 bookwyrm/templates/book/book.html:175
+#: bookwyrm/templates/book/book.html:129 bookwyrm/templates/book/book.html:178
 #: bookwyrm/templates/book/cover_modal.html:32
 #: bookwyrm/templates/book/edit_book.html:241
 #: bookwyrm/templates/edit_author.html:79
@@ -226,19 +232,19 @@ msgstr "Speichern"
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: bookwyrm/templates/book/book.html:135
+#: bookwyrm/templates/book/book.html:138
 #, fuzzy, python-format
 #| msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s\">%(title)s</a> von"
 
-#: bookwyrm/templates/book/book.html:143
+#: bookwyrm/templates/book/book.html:146
 #, fuzzy, python-format
 #| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/book/book.html:149
+#: bookwyrm/templates/book/book.html:152
 #, fuzzy, python-format
 #| msgid ""
 #| " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
@@ -250,74 +256,74 @@ msgstr ""
 "hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> zu deiner Liste "
 "\"<a href=\"%(list_path)s\">%(list_name)s</a>\" Hinzugefügt"
 
-#: bookwyrm/templates/book/book.html:158
+#: bookwyrm/templates/book/book.html:161
 msgid "Your reading activity"
 msgstr "Deine Leseaktivität"
 
-#: bookwyrm/templates/book/book.html:160
+#: bookwyrm/templates/book/book.html:163
 msgid "Add read dates"
 msgstr "Lesedaten hinzufügen"
 
-#: bookwyrm/templates/book/book.html:165
+#: bookwyrm/templates/book/book.html:168
 msgid "You don't have any reading activity for this book."
 msgstr "Du hast keine Leseaktivität für dieses Buch."
 
-#: bookwyrm/templates/book/book.html:172
+#: bookwyrm/templates/book/book.html:175
 msgid "Create"
 msgstr "Erstellen"
 
-#: bookwyrm/templates/book/book.html:194
+#: bookwyrm/templates/book/book.html:197
 msgid "Subjects"
 msgstr "Themen"
 
-#: bookwyrm/templates/book/book.html:206
+#: bookwyrm/templates/book/book.html:209
 msgid "Places"
 msgstr "Orte"
 
-#: bookwyrm/templates/book/book.html:217 bookwyrm/templates/layout.html:65
+#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:65
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listen"
 
-#: bookwyrm/templates/book/book.html:228
+#: bookwyrm/templates/book/book.html:231
 #, fuzzy
 #| msgid "Go to list"
 msgid "Add to list"
 msgstr "Zur Liste"
 
-#: bookwyrm/templates/book/book.html:238
+#: bookwyrm/templates/book/book.html:241
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:133
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: bookwyrm/templates/book/book.html:254
+#: bookwyrm/templates/book/book.html:257
 #, fuzzy
 #| msgid "Review"
 msgid "Reviews"
 msgstr "Bewerten"
 
-#: bookwyrm/templates/book/book.html:259
+#: bookwyrm/templates/book/book.html:262
 #, fuzzy
 #| msgid "Your shelves"
 msgid "Your reviews"
 msgstr "Deine Regale"
 
-#: bookwyrm/templates/book/book.html:265
+#: bookwyrm/templates/book/book.html:268
 #, fuzzy
 #| msgid "Your Account"
 msgid "Your comments"
 msgstr "Dein Account"
 
-#: bookwyrm/templates/book/book.html:271
+#: bookwyrm/templates/book/book.html:274
 #, fuzzy
 #| msgid "Your books"
 msgid "Your quotes"
 msgstr "Deine Bücher"
 
-#: bookwyrm/templates/book/book.html:305
+#: bookwyrm/templates/book/book.html:308
 msgid "rated it"
 msgstr "bewertet"
 
@@ -2728,12 +2734,7 @@ msgstr "kommentierte"
 msgid "quoted"
 msgstr "zitierte"
 
-#: bookwyrm/templates/snippets/search_result_text.html:22
-#, python-format
-msgid "by %(author)s"
-msgstr "von %(author)s"
-
-#: bookwyrm/templates/snippets/search_result_text.html:30
+#: bookwyrm/templates/snippets/search_result_text.html:35
 msgid "Import book"
 msgstr "Buch importieren"
 
@@ -4495,6 +4496,10 @@ msgctxt "stick"
 msgid "club"
 msgstr ""
 
+#, python-format
+#~ msgid "by %(author)s"
+#~ msgstr "von %(author)s"
+
 #~ msgid "Deactivate user"
 #~ msgstr "Nutzer:in deaktivieren"
 
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index 6685605a..3637bb77 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-26 09:56-0700\n"
+"POT-Creation-Date: 2021-04-29 11:36-0700\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"
@@ -90,23 +90,23 @@ msgstr ""
 msgid "A user with that username already exists."
 msgstr ""
 
-#: bookwyrm/settings.py:152
+#: bookwyrm/settings.py:155
 msgid "English"
 msgstr ""
 
-#: bookwyrm/settings.py:153
+#: bookwyrm/settings.py:156
 msgid "German"
 msgstr ""
 
-#: bookwyrm/settings.py:154
+#: bookwyrm/settings.py:157
 msgid "Spanish"
 msgstr ""
 
-#: bookwyrm/settings.py:155
+#: bookwyrm/settings.py:158
 msgid "French"
 msgstr ""
 
-#: bookwyrm/settings.py:156
+#: bookwyrm/settings.py:159
 msgid "Simplified Chinese"
 msgstr ""
 
@@ -166,24 +166,28 @@ msgstr ""
 msgid "View on OpenLibrary"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:102
+#: bookwyrm/templates/book/book.html:85
+msgid "View on Inventaire"
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:105
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/book/book.html:114
+#: bookwyrm/templates/book/book.html:117
 msgid "Add Description"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:121
+#: bookwyrm/templates/book/book.html:124
 #: bookwyrm/templates/book/edit_book.html:107
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:125
+#: bookwyrm/templates/book/book.html:128
 #: bookwyrm/templates/book/edit_book.html:240
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
@@ -198,7 +202,7 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:126 bookwyrm/templates/book/book.html:175
+#: bookwyrm/templates/book/book.html:129 bookwyrm/templates/book/book.html:178
 #: bookwyrm/templates/book/cover_modal.html:32
 #: bookwyrm/templates/book/edit_book.html:241
 #: bookwyrm/templates/edit_author.html:79
@@ -214,81 +218,81 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:135
+#: bookwyrm/templates/book/book.html:138
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:143
+#: bookwyrm/templates/book/book.html:146
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:149
+#: bookwyrm/templates/book/book.html:152
 #, python-format
 msgid ""
 "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a "
 "href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:158
+#: bookwyrm/templates/book/book.html:161
 msgid "Your reading activity"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:160
+#: bookwyrm/templates/book/book.html:163
 msgid "Add read dates"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:165
+#: bookwyrm/templates/book/book.html:168
 msgid "You don't have any reading activity for this book."
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:172
+#: bookwyrm/templates/book/book.html:175
 msgid "Create"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:194
+#: bookwyrm/templates/book/book.html:197
 msgid "Subjects"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:206
+#: bookwyrm/templates/book/book.html:209
 msgid "Places"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:217 bookwyrm/templates/layout.html:65
+#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:65
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:228
+#: bookwyrm/templates/book/book.html:231
 msgid "Add to list"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:238
+#: bookwyrm/templates/book/book.html:241
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:133
 msgid "Add"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:254
+#: bookwyrm/templates/book/book.html:257
 msgid "Reviews"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:259
+#: bookwyrm/templates/book/book.html:262
 msgid "Your reviews"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:265
+#: bookwyrm/templates/book/book.html:268
 msgid "Your comments"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:271
+#: bookwyrm/templates/book/book.html:274
 msgid "Your quotes"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:305
+#: bookwyrm/templates/book/book.html:308
 msgid "rated it"
 msgstr ""
 
@@ -2481,12 +2485,7 @@ msgstr ""
 msgid "quoted"
 msgstr ""
 
-#: bookwyrm/templates/snippets/search_result_text.html:22
-#, python-format
-msgid "by %(author)s"
-msgstr ""
-
-#: bookwyrm/templates/snippets/search_result_text.html:30
+#: bookwyrm/templates/snippets/search_result_text.html:35
 msgid "Import book"
 msgstr ""
 
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index 64baee4f2fb999e55a052d3f2f25e231cbdc0e16..1fb1ae530173b3a63652ee8d1e2face2a044ffc5 100644
GIT binary patch
literal 65330
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
O_<{5<nwEu2?b3g+>vd27

delta 14241
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

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 7994ce69..8385f7f6 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-26 09:56-0700\n"
+"POT-Creation-Date: 2021-04-29 11:36-0700\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -90,23 +90,23 @@ msgstr "nombre de usuario"
 msgid "A user with that username already exists."
 msgstr "Ya existe un usuario con ese nombre."
 
-#: bookwyrm/settings.py:152
+#: bookwyrm/settings.py:155
 msgid "English"
 msgstr "Inglés"
 
-#: bookwyrm/settings.py:153
+#: bookwyrm/settings.py:156
 msgid "German"
 msgstr "Aléman"
 
-#: bookwyrm/settings.py:154
+#: bookwyrm/settings.py:157
 msgid "Spanish"
 msgstr "Español"
 
-#: bookwyrm/settings.py:155
+#: bookwyrm/settings.py:158
 msgid "French"
 msgstr "Francés"
 
-#: bookwyrm/settings.py:156
+#: bookwyrm/settings.py:159
 msgid "Simplified Chinese"
 msgstr "Chino simplificado"
 
@@ -166,24 +166,30 @@ msgstr "No se pudo cargar la portada"
 msgid "View on OpenLibrary"
 msgstr "Ver en OpenLibrary"
 
-#: bookwyrm/templates/book/book.html:102
+#: bookwyrm/templates/book/book.html:85
+#, fuzzy
+#| msgid "View on OpenLibrary"
+msgid "View on Inventaire"
+msgstr "Ver en OpenLibrary"
+
+#: bookwyrm/templates/book/book.html:105
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s reseña)"
 msgstr[1] "(%(review_count)s reseñas)"
 
-#: bookwyrm/templates/book/book.html:114
+#: bookwyrm/templates/book/book.html:117
 msgid "Add Description"
 msgstr "Agregar descripción"
 
-#: bookwyrm/templates/book/book.html:121
+#: bookwyrm/templates/book/book.html:124
 #: bookwyrm/templates/book/edit_book.html:107
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Descripción:"
 
-#: bookwyrm/templates/book/book.html:125
+#: bookwyrm/templates/book/book.html:128
 #: bookwyrm/templates/book/edit_book.html:240
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
@@ -198,7 +204,7 @@ msgstr "Descripción:"
 msgid "Save"
 msgstr "Guardar"
 
-#: bookwyrm/templates/book/book.html:126 bookwyrm/templates/book/book.html:175
+#: bookwyrm/templates/book/book.html:129 bookwyrm/templates/book/book.html:178
 #: bookwyrm/templates/book/cover_modal.html:32
 #: bookwyrm/templates/book/edit_book.html:241
 #: bookwyrm/templates/edit_author.html:79
@@ -214,18 +220,18 @@ msgstr "Guardar"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: bookwyrm/templates/book/book.html:135
+#: bookwyrm/templates/book/book.html:138
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s/editions\">%(count)s ediciones</a>"
 
-#: bookwyrm/templates/book/book.html:143
+#: bookwyrm/templates/book/book.html:146
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr ""
 "Esta edición está en tu <a href=\"%(path)s\">%(shelf_name)s</a> estante."
 
-#: bookwyrm/templates/book/book.html:149
+#: bookwyrm/templates/book/book.html:152
 #, python-format
 msgid ""
 "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a "
@@ -234,72 +240,72 @@ msgstr ""
 "Una <a href=\"%(book_path)s\">edición diferente</a> de este libro está en tu "
 "<a href=\"%(shelf_path)s\">%(shelf_name)s</a> estante."
 
-#: bookwyrm/templates/book/book.html:158
+#: bookwyrm/templates/book/book.html:161
 msgid "Your reading activity"
 msgstr "Tu actividad de lectura"
 
-#: bookwyrm/templates/book/book.html:160
+#: bookwyrm/templates/book/book.html:163
 msgid "Add read dates"
 msgstr "Agregar fechas de lectura"
 
-#: bookwyrm/templates/book/book.html:165
+#: bookwyrm/templates/book/book.html:168
 msgid "You don't have any reading activity for this book."
 msgstr "No tienes ninguna actividad de lectura para este libro."
 
-#: bookwyrm/templates/book/book.html:172
+#: bookwyrm/templates/book/book.html:175
 msgid "Create"
 msgstr "Crear"
 
-#: bookwyrm/templates/book/book.html:194
+#: bookwyrm/templates/book/book.html:197
 msgid "Subjects"
 msgstr "Sujetos"
 
-#: bookwyrm/templates/book/book.html:206
+#: bookwyrm/templates/book/book.html:209
 msgid "Places"
 msgstr "Lugares"
 
-#: bookwyrm/templates/book/book.html:217 bookwyrm/templates/layout.html:65
+#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:65
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listas"
 
-#: bookwyrm/templates/book/book.html:228
+#: bookwyrm/templates/book/book.html:231
 msgid "Add to list"
 msgstr "Agregar a lista"
 
-#: bookwyrm/templates/book/book.html:238
+#: bookwyrm/templates/book/book.html:241
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:133
 msgid "Add"
 msgstr "Agregar"
 
-#: bookwyrm/templates/book/book.html:254
+#: bookwyrm/templates/book/book.html:257
 #, fuzzy
 #| msgid "Review"
 msgid "Reviews"
 msgstr "Reseña"
 
-#: bookwyrm/templates/book/book.html:259
+#: bookwyrm/templates/book/book.html:262
 #, fuzzy
 #| msgid "Your shelves"
 msgid "Your reviews"
 msgstr "Tus estantes"
 
-#: bookwyrm/templates/book/book.html:265
+#: bookwyrm/templates/book/book.html:268
 #, fuzzy
 #| msgid "Your Account"
 msgid "Your comments"
 msgstr "Tu cuenta"
 
-#: bookwyrm/templates/book/book.html:271
+#: bookwyrm/templates/book/book.html:274
 #, fuzzy
 #| msgid "Your books"
 msgid "Your quotes"
 msgstr "Tus libros"
 
-#: bookwyrm/templates/book/book.html:305
+#: bookwyrm/templates/book/book.html:308
 msgid "rated it"
 msgstr "lo calificó con"
 
@@ -2571,12 +2577,7 @@ msgstr "comentó en"
 msgid "quoted"
 msgstr "citó"
 
-#: bookwyrm/templates/snippets/search_result_text.html:22
-#, python-format
-msgid "by %(author)s"
-msgstr "por %(author)s"
-
-#: bookwyrm/templates/snippets/search_result_text.html:30
+#: bookwyrm/templates/snippets/search_result_text.html:35
 msgid "Import book"
 msgstr "Importar libro"
 
@@ -4299,6 +4300,10 @@ msgctxt "stick"
 msgid "club"
 msgstr "garrote"
 
+#, python-format
+#~ msgid "by %(author)s"
+#~ msgstr "por %(author)s"
+
 #, python-format
 #~ msgid "%(rating)s star"
 #~ msgid_plural "%(rating)s stars"
diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index b91a542dbfb13e56f1baff5aeab3b9c4a3088116..b88e6e3e553d7ff3d88570f27eff191e6a57ad71 100644
GIT binary patch
delta 12040
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
V*}0L+zVgexxu&D%qCp=#{y(6%r858k

delta 12883
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
A*#H0l

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index ee2f7936..ee7a5534 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-26 09:56-0700\n"
+"POT-Creation-Date: 2021-04-29 11:36-0700\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"
@@ -96,23 +96,23 @@ msgstr "nom du compte :"
 msgid "A user with that username already exists."
 msgstr "Ce nom est déjà associé à un compte."
 
-#: bookwyrm/settings.py:152
+#: bookwyrm/settings.py:155
 msgid "English"
 msgstr "English"
 
-#: bookwyrm/settings.py:153
+#: bookwyrm/settings.py:156
 msgid "German"
 msgstr "Deutsch"
 
-#: bookwyrm/settings.py:154
+#: bookwyrm/settings.py:157
 msgid "Spanish"
 msgstr "Español"
 
-#: bookwyrm/settings.py:155
+#: bookwyrm/settings.py:158
 msgid "French"
 msgstr "Français"
 
-#: bookwyrm/settings.py:156
+#: bookwyrm/settings.py:159
 msgid "Simplified Chinese"
 msgstr "简化字"
 
@@ -172,24 +172,30 @@ msgstr "La couverture n’a pu être chargée"
 msgid "View on OpenLibrary"
 msgstr "Voir sur OpenLibrary"
 
-#: bookwyrm/templates/book/book.html:102
+#: bookwyrm/templates/book/book.html:85
+#, fuzzy
+#| msgid "View on OpenLibrary"
+msgid "View on Inventaire"
+msgstr "Voir sur OpenLibrary"
+
+#: bookwyrm/templates/book/book.html:105
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s critique)"
 msgstr[1] "(%(review_count)s critiques)"
 
-#: bookwyrm/templates/book/book.html:114
+#: bookwyrm/templates/book/book.html:117
 msgid "Add Description"
 msgstr "Ajouter une description"
 
-#: bookwyrm/templates/book/book.html:121
+#: bookwyrm/templates/book/book.html:124
 #: bookwyrm/templates/book/edit_book.html:107
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Description :"
 
-#: bookwyrm/templates/book/book.html:125
+#: bookwyrm/templates/book/book.html:128
 #: bookwyrm/templates/book/edit_book.html:240
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
@@ -204,7 +210,7 @@ msgstr "Description :"
 msgid "Save"
 msgstr "Enregistrer"
 
-#: bookwyrm/templates/book/book.html:126 bookwyrm/templates/book/book.html:175
+#: bookwyrm/templates/book/book.html:129 bookwyrm/templates/book/book.html:178
 #: bookwyrm/templates/book/cover_modal.html:32
 #: bookwyrm/templates/book/edit_book.html:241
 #: bookwyrm/templates/edit_author.html:79
@@ -220,18 +226,18 @@ msgstr "Enregistrer"
 msgid "Cancel"
 msgstr "Annuler"
 
-#: bookwyrm/templates/book/book.html:135
+#: bookwyrm/templates/book/book.html:138
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s/editions\">%(count)s éditions</a>"
 
-#: bookwyrm/templates/book/book.html:143
+#: bookwyrm/templates/book/book.html:146
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr ""
 "Cette édition est sur votre étagère <a href=\"%(path)s\">%(shelf_name)s</a>."
 
-#: bookwyrm/templates/book/book.html:149
+#: bookwyrm/templates/book/book.html:152
 #, python-format
 msgid ""
 "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a "
@@ -240,72 +246,72 @@ msgstr ""
 "Une <a href=\"%(book_path)s\">édition différente</a> de ce livre existe sur "
 "votre étagère <a href=\"%(shelf_path)s\">%(shelf_name)s</a>."
 
-#: bookwyrm/templates/book/book.html:158
+#: bookwyrm/templates/book/book.html:161
 msgid "Your reading activity"
 msgstr "Votre activité de lecture"
 
-#: bookwyrm/templates/book/book.html:160
+#: bookwyrm/templates/book/book.html:163
 msgid "Add read dates"
 msgstr "Ajouter des dates de lecture"
 
-#: bookwyrm/templates/book/book.html:165
+#: bookwyrm/templates/book/book.html:168
 msgid "You don't have any reading activity for this book."
 msgstr "Vous n’avez aucune activité de lecture pour ce livre"
 
-#: bookwyrm/templates/book/book.html:172
+#: bookwyrm/templates/book/book.html:175
 msgid "Create"
 msgstr "Créer"
 
-#: bookwyrm/templates/book/book.html:194
+#: bookwyrm/templates/book/book.html:197
 msgid "Subjects"
 msgstr "Sujets"
 
-#: bookwyrm/templates/book/book.html:206
+#: bookwyrm/templates/book/book.html:209
 msgid "Places"
 msgstr "Lieux"
 
-#: bookwyrm/templates/book/book.html:217 bookwyrm/templates/layout.html:65
+#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:65
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listes"
 
-#: bookwyrm/templates/book/book.html:228
+#: bookwyrm/templates/book/book.html:231
 msgid "Add to list"
 msgstr "Ajouter à la liste"
 
-#: bookwyrm/templates/book/book.html:238
+#: bookwyrm/templates/book/book.html:241
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:133
 msgid "Add"
 msgstr "Ajouter"
 
-#: bookwyrm/templates/book/book.html:254
+#: bookwyrm/templates/book/book.html:257
 #, fuzzy
 #| msgid "Review"
 msgid "Reviews"
 msgstr "Critique"
 
-#: bookwyrm/templates/book/book.html:259
+#: bookwyrm/templates/book/book.html:262
 #, fuzzy
 #| msgid "Your shelves"
 msgid "Your reviews"
 msgstr "Vos étagères"
 
-#: bookwyrm/templates/book/book.html:265
+#: bookwyrm/templates/book/book.html:268
 #, fuzzy
 #| msgid "Your Account"
 msgid "Your comments"
 msgstr "Votre compte"
 
-#: bookwyrm/templates/book/book.html:271
+#: bookwyrm/templates/book/book.html:274
 #, fuzzy
 #| msgid "Your books"
 msgid "Your quotes"
 msgstr "Vos livres"
 
-#: bookwyrm/templates/book/book.html:305
+#: bookwyrm/templates/book/book.html:308
 msgid "rated it"
 msgstr "l’a noté"
 
@@ -2605,12 +2611,7 @@ msgstr "a commenté"
 msgid "quoted"
 msgstr "a cité"
 
-#: bookwyrm/templates/snippets/search_result_text.html:22
-#, python-format
-msgid "by %(author)s"
-msgstr "par %(author)s"
-
-#: bookwyrm/templates/snippets/search_result_text.html:30
+#: bookwyrm/templates/snippets/search_result_text.html:35
 msgid "Import book"
 msgstr "Importer le livre"
 
@@ -4341,6 +4342,10 @@ msgctxt "stick"
 msgid "club"
 msgstr ""
 
+#, python-format
+#~ msgid "by %(author)s"
+#~ msgstr "par %(author)s"
+
 #~ msgid "Deactivate user"
 #~ msgstr "Désactiver le compte"
 
diff --git a/locale/zh_Hans/LC_MESSAGES/django.mo b/locale/zh_Hans/LC_MESSAGES/django.mo
index 07b8d63ca2e7a940d4feb0d0a94892b7a708e8b5..765ee77f337dbac59fdba575943504652b01f890 100644
GIT binary patch
delta 11940
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

delta 12587
zcmZA734Bji{{QhSi6lrYk=R2lNhBrK*fol(Jw?%qQ9&A81c{}#Z!>mUOKe@D456j=
z3|fTIO_g@g+FP{-RYglzQ@_{ydp~CK|KCTC=lOijxo5lg`%S8SZLLrCCLhm*5Wi&(
zSA8GHse(CW9OsVeHI;RoGjWcSfoE|hcB|(&CGjha#mg9m!Sx-dGS<X$n1F4t5Au(*
zf<H>(XILK3U{}ZSICrUplW5(*ah}5@jKXcG{Amou2Ur7(H*}opSQj;MB38r{Y>Xb%
z1pmZZcog}^xyK*rSgVoiQXIwnjvsgRq9Fq(;UR2;ZR6dYOh^84-sF!6JccoN54F(B
zO&q5vw#Bm85zAnI^v6*ch~qE-r&)fMV&->Vv&1q~#~k#<br^&jEWZnj5g$Mu<zb7@
znpaSd<~C}ghgbsrnmP`L=afb*s4Z&2ozSBR5~=9M{-_B?pe7iHYM+VaFdMbQ4XFP4
zsD&OyJ(6Rnqy7nlF|wJvkVdG9TVe>dMfLC9jPut@Cs;=h`Vr5@3iv8&A?r{R??km9
zM(ylN)K1Q!CcKDR*pH}w|H0De)7)`hz_K_C(@_2HH|P8{fNu-;nH595#g$PzZ;D!Z
zd(=X@pe9PP_F<^|$D{g9LG_!Cns^CngSn_jy9sr|J1u{}Lq#vkA@eNi<+_DBs<4*s
z1hr8U#Gw`tk2-;N=zWCfed#Pe%JP#?CpQ}z(s>Kx@Dx@<PtjKH3L{Yi)WzbMfEu_n
z>L~kKzCY^dQc*h{k6Oqq)WWh+3tf$&_zr5Eeb#;$%M+i*3i|xtp;DPdU~9KyE!2@U
zz$k2vnrI;MIGxd`Biw-MmuKyJQ42U?@mUNbzKL4kBh*4lJn7zF!7I<dh9&BtIy6C@
zKs$@OqZW{4`4L!&csy!Bi&5{u=cto8hI;njp%!@8{LOR{+<t)=%KT1wDtbBUpmr9I
zdK3w$cc2IA84f``iixO&PDLH{JdD7_s0Hjmjdu{Wkk3&kaURwG9%@6sp+^%1ws8}c
zPz#7f4b<4;b{2O-4b&gCv$3cFC!r?HLM?P2D*ra>B-f!H%{J7y`!O89Xv6c@gttg&
zM-Ncn@jg$vJB>u$7>k;qnfVmz$U9?4d=@p~8>p9SwZ-q72T<dGiW=`L)H`wMDUW;9
zw@K(o9$`f+)z+Ob#%zdcZ;3jAE~tT$Q9DXUo#ZrYUxezv9(7W?usZI?XuOE}bOd_Z
zxjPL<4Oj!U)B30Znqv}nLY>q))XKM7`(Er$d<3gurS|TETA&ux3DrLd{V)}^;E|{k
z^h~CrXO@Lp(K2h;i0ZfvHNXMX5g$SA=mctjbJl**;vZ1s{Dk}%Z~~rok3IqQG4F~R
zcc`n!nLtH5o@FjXz4fo726_*x;J;AM@LThH)QS9xMX^W+_XGpbk2nl<0+mqX)j>_1
zfK{<O*45AdG%8xaTh@?^y742_1Sc*2&b)^@5#MLr1(w2C;##O3CZZ-7fx3Sl2H;ZE
zBhEo>WTW!T@9d_cjt5W+IgD|50=+xy=<X;0E07ODeXb)h5SySsCZNXYfSTx8)J6uN
z9`R^YzZs};=A%bPl}kk{+F<TN9sNfbh-XkocM0`U-o;3CI=MTGGUHJFo1i96z+%_~
zHE|N^Q4GRbIIa`tuOoYtga+P)`oj1Wwe#bs8&9JKzJOZrb<D;etliVuUC1odLKmRM
zTZ!tw8MVP3sFOKh@fV#rf8B77gl@QL4Zowl2mHIZH$<3ms0FpcC~Sv1so_{0J*b7x
zL-kvPHE{*1-(IYT$51Eac)GeP4?*p)66)F1#As}V`obB4#c&d8!86Pys4tc^7=Rz6
z#yN^5@FZ#>mv8~zz&bdgo7>-$OGQVt3H6d}N8RuVYNDg4xA{D3#ebkqCaAj`N1=A!
z40V4y)Wm&J;||6c9Ev3|8@14XU=aIvHc-(GyD$wuM17OhPjq+ktoZ`!#zCmJe>gIL
zGZ}R<bIfe4L7annNe`IUQ1_R3)_n=fVz55{QB+FO&=_@e?N9@D#c1q<PvA5xjT=!X
zu@^Pq7pVJBVkx|e+Q5Ab#?T&azZ$6aSkwu(P@egnr>N*iJE0aZ*gA|vEhNM8Q&I22
zEY!p~s0ngW{dS-x*oQiqqp0!D;tO~g)xT9wcfp;}qu=XaprS`G8g;`IjK!H)7q=lF
z2<L(s)64yW%Eb2M*P?#x-ax(O`uDgH2t$2!*G7KeIZtCK&OyC1E1%>1^>KNZgpOnj
zYG*r93&}_A=u^}VPoa+bB9_HFsD8e^-S!|<Tn=?#HPlJevwSPm_)nuwqFZmyUn@zn
z#7n3fGEoy|p$439@lw=+-$pGs7xj|8hw69SJcnh7ub>wE0K?F)kGt?nsP;Gyl_)B0
zP!p%3R+x!;C#IloT#j1tCe*_Apmz8%@}4<gV?0Lo_5N$MlY|3^-^GR)@Vxs{w!lfm
z{ZQk2PEyf8w@^Fz6E$FU-WWaev8bcY$Ch{;wb0;x?#WfcvBZ&>gs)rvK5BwT7>i*v
z>g3v>HrN5X>GR*6N_P@DZo;{RT5<FK{2quSQ9DmZO*|E~z<K6*OeC)JH}~KFr=T9i
zc2xg8SQ`(aUh=!x1|Oo{Kc_Y4#CzmqBQLOX9h+gx7u~lw6SaWZ7=g=BJK2SrXdh}v
zpIH72)VuMO#ph7{E+Tt#ZX$>1JUx)d;Gwcg75oF$v3IgNzyPdBoPsnt9@In^QT=XU
z(<1ynkCTXF2J>?Pb5V~hW{CT<q%~@sKIUi)C7y?#Xez6yG{!@yoj%0MSUko3X%&T4
zi2ES_I2rsAiDywi-5y~%tof1~w?KUb4?w*GS>_7VIGeE+e*O~YuLay8(Fn_@x_{Z!
z#XMj(8tOixcW@&89%2HH8|LnCCpIPi604*CaQCIFjT*lf7RAY^ooAuGpq3Bk{QaqH
zAfb=dHdMUFJZOGq{@Xldev3M>tEiXlC-adRG{VhSG^0=xH?p{chl)Oay-+7G7>nZy
z)PmMvY21WbSUzf^k5L01xA-dRncqV#sOU)d{<5h1!m%#aLe0|?HLquuby#k$L`|5B
zI?A1vKaByz7c4Ho3dFZD2>sLCXI&Q6F9w6L0crsWs0llu7TU+ndz|6cFb4H0$ik`k
zjph4|at9cWdYQ(cUar}wi8osNZj1M$COTsAd27FcI?+3p{~f(Q|NYb52|`gTuWWHm
zGZuB!4KNtnV^!>l-UXp{INMx+TG%pkjk(p_XC9XN{GXztqr8H8iyvYfHXiMMOa`MS
zm}4$PEo8ZwYxx}(e}G!RA@gg?U$XcPYP^T&{rf-PG42he&2ZF$Vo^J7huY~N)Co;Q
z4e$!;dt$c5Yf%f|Xz^L|B5Fa`Q47CsvCmjO|K&-P8tZn5Ms;Xxaa%Ld?2jR|53_iR
z#dFOZ%Wp+3Y#%nqGpGfJWVqv3L@g*fgY(zh*qDSmbVThi(K__S5aJ=IuiOdf-MQsw
zV=3})q6XY(?Yk}BZ}Aa~p#6m9e>NRYraM3|YUkmo37$X=*bvKNg4ql87N=VK7;~CA
zAGP4uQ5$&=_2}|Y;~uv5W2kXGSEy*BUr`J28|VJU5`y}eRY$eANA0u+>S&Wu15UO4
z4AcoNHCLj(a@S*9+=S|X2la0K;>I4Q)Ofd{9BQI)GuCX1T3CCtCu)ZSQ74gs-i4s<
zpJDBbEzUK!oBL7Y9r4CI|FcvyKmkVKZLEu-6Wo(%i)!zII)Ud=6AeWj;W+Gqb5Tcr
z(%Qep(!}3mU;GmzvDZZR{+F?gKL4{U@j7avb*L3?vUm@M5+B5Jc*^p(Q46|{T9Dt%
z?)_!V3T8Fbcu}YYHb&jo3O%i<bfuyJ=AkB7VI8)Z`%y>!CF;m8S^gGQApR5eJrT-p
zAsVNV*~aXKnz$e8hua|3M$;zo`PaaiB;;)KP1MV`8EfM))WE-6-hZ;&KL(X=WpO97
zzva_W3!H+{xD53}Egv=hcau4P?Z{_}YY=K><tz@jINIVki<@C1`XyLC!}3$HGWi*(
zXTKV?!0o6L*l&J{-V^m$hfC&<s0I9qmC%PDg^I&b1J%MXY=D~J8Eb#u+FwLH>yfC1
zOtSXn*1po>ji`Q}?Nqd~1J-Z|^;Un0I{M3~fl5qsZ-_=c!+6xf+Mw=##!R$)UrZ!F
zz~U{a4eUhi{6jbPI47;cW$SPgwX$C<_Tv%hZPiCb15`&%9EVzHyv3bR{hqaWAVv|V
zqWUdB-M_}#w|eD|T@?Kmn~&;v3H4L#0cxeSUU4UEirVRuSROl|CK!MkcqZyy%C<Pi
z+<^LRcNePtym<}1KmYGg(T*NsNA%5d|Bj|BYQmRM?OCV=&apTLHSt>1Bid&1QPewf
z*5W(p9p7T#zq|L9Mvqn$PNgnJqmI5eYU07DBOPH*#-7CUu^L`LE#NQI1SO`saR}<<
zs-f<0X!*8gB5J|?r}O!5KxHBceKl@G4Rp*po;I(d2D)eMMP|4Q48&;irOjrj1r0RQ
zP@kensEsW{jk6XbFmDFWST}r4LSC{CKcW`$7wRO6&UAMajLJut(Wp;D9O@*Sqb6u)
z?Y&Ur_Otd>Yae6zEDse;umJnxa@0zHHjB)1CoY8=s0L~Q^{_rRL7hM<>fKq0PvaTX
zBdt2yjk}`WiEPw2;=8Cv;5lfCZ!v+yFQ|@9=D0iQivGm?F#rc!JOZ_#v8ZS5u{hh}
zRpt)Me}X!p6XrK=-s2Qlho4bL>CAN}EP*<S5HkWbVH|40mKJx%V#G<P`%_R09*tV?
z1dKwD#p_YyY{81Wf6iVi8t^1)=QmJ41^+@FRoFatfH>5Ry-^bk!f+ghx^FgWoRz44
z+fX0ZeC&nCu{lQ0=XVHv5!0F9d7p}&Rqa>Z3Hx9=ak|Cdp<b%ruqFn+=Kj@89ZVvg
zfLicZs7Lrc24U<1*QPj>xIOm9&6f9F$f;<>rK!l8sGT*zV%Qp=!)MGK^B%^N@36@2
zKLvFH(^2=mfjw|7>i!27cV6t?mxJneVln5hm3~7)1KdQ#kFX5}WxGe!&0KFjLLKGv
zOWfa#vavMrI~arSqc(Ecyos9duEl>?Tx2QduZ9v!UBggETFsnno;DjTb05V*)C8+g
zAEWiy5<f(Z_m>&Coc}OItgG4M3iWhKd&;{Wl3!cH^SFf4m(t&IbIg%+)>Vl(%7<@C
z^dpX@tflx`KdRop9Sfk(9?NYew_6QdT5KHUTiPN~@1L{VI@aSRU4Ie}q=ZqAr7W~|
zwVj}JA}()z^%!nb29di+savRT4*9<m@53i4|D^nl_!UY~%B3RA{}YvuDWQ}el-DSJ
zHu!Jcpf`6Exe&?$>bh1_-{DrB->B<~py&}yCBA^V{HX_HWyVXge#)Ps@IB|W)BaCV
z=|XvYjizHif>2vTJ>sgwmndb)EwzC{iTTCXDNX!0+;914`qZa>m)r-~3fEH_So?A6
zy7a=9@}55xf1B(%>-09cWmc!^y)w)M^9y{!`t+i{&hn2bVPifbF`RxWn2Y>O^Ilu1
z>%W|N|8lUv2C8d~Da2`3=Vf-%t$hLVarS<*?ZP59$v*NmC^yKpp@dMhxgF%vC_O3f
z5f7n^r(P0A+xzEyNJ3XfN*U^}Q~FRpi?84q{Dbl{^_$42>c3YaHT}<P#mTRyT%+ik
zj{4dExy5hdT;lVTT9%ujCH|d+t|&|DJ6+$;t0=yd)8q%@6^gF=*6$50=cb(2)Wa>`
z0iPrP7ru*Ua60}-=|*{*_&Y2?@z)W3NGW`Uv6}!oouCY+;Q~IsGN>0PxNEs{)Hhh;
zf5_di{Fje!z;2dPsy+3cg<{R`JVWU~=}N<kO4!wfc(Qdai&rUYDFbM~Nf|<&Z&L52
zFEU-eEIx?xGI4d{FDxHJZZdIGb^71M|NlY53OWt?U()*(`jFf=lr@wIl*d;q>R%JI
zpcLiaS;QMCBPor@>1Vz}{W#?SrSMg|a6tWz_Z6iQ$3S%`+w2DYey=N+vXxu}WiI6_
zN;7g#P^!>h*I$%P6d&SeXdggnM>(QKuC~;DD7PrO{zFNieowK^zc@G6!%mb{B=2M4
z>lcDW<Tc+X7=^`jbD=A#P<=1;ag?k=xta98OnemQQ_4}QQ9SykGloi0e2KE3GK_c+
z>Y7H;kK}RWbd_cmFIxQ_;yCKRP=2N4TmBFxQa+~rTiwJpmUx?6b>7EmZeNenn95<w
zYLZnklJY0@+4wKY&y?-NKVWavb)8a)g_Izt>nW^4sZO~_Jc81j`cO(u9UIp!>bg$h
z8`zk#ROf$>N^NUAhEs?OD0iqI#50sq3~~(jlH->j@2}Xi@Ezi=sB0qiS1Cs*4c(OY
zFS1o#PEJ=Qj=_IWKB64-kVvHzp=42Xy@a2r!lWapPgLEmRQ%NXDRqnTw8bw_Z%(~6
z_QG1+zmmGHjg$(MPbq%ZzcPAeSg_8Fp~Lr-@)lEdlBo~FXYn)q&e|$scS<t3f8tN5
zYbPay$$umljAe)`psvrzHKgcT@c8>bm_$z!CF!)CdPVE3PQO!X6IZ9aM!k-bcCEnA
zDQhf#9miVzI^&$DT%o*AsY(7#%3(?qVqLL5-tRyCkHG)CzM}dh9e%)bSdNJ=<6Fda
zsp~3(|0dUhlIf<L@pzh&L+%?KPT4{^NxT)au_dJ~^#{0#;{E)ur1Fq@N9>EWC=Do+
zDA|<9S5w;OQO=Tx#R`;36kRnazgt~#1Pg3}PhcJLgRSi;a`V)|F7N(p(CMfpzNBLq
zr5~j}xgZQwq0b@W`IJ2C`v9*|UZDLWN<Q@})+T0BdQc*{w+-!&uW0J=Zs2kLpt8A8
z<6`Soid-P|DY%$2$MRRPn$^XlLigrT|CL-g6Lv0?kEi}G^0%=&en9yL^^!&O6N9T7
zH+)ax-)`vip|0yKtV-K^_$qNDteKZzw@#o>a%$d{_{zQ&Mr1@}Ca0#R42h@_S({qi
zsN}Sin2Z{Ee>98qSyHKG)u6$d!^S6PrbLX(NEw^gxMk&%|4(K~mrf@G)6&PMXqde4
z&IgND$V|?pZ$`w><cx?xDJi2OhNO&4$xIoN_f2A|Z{(o#^o-1i3~wi=_o%wVQb(na
zO;K&+un{TNkk_eKRzUEemm?x;Cy&b<nm#rrBkyp(eBTm-)6>#YMrF3Dm;B_C_yIkN
zjTx7onesR)J~n0iu#^c3^Wq2eD(+vfdiM3r`}4Af#`{*GUXU~Q|J!AR_1HS1v`^6$
z>k4vKEy+)-5_Byq=larj`KMsc?z}T;4}ycPE!z6u%#x#%4+dR-XYb87a_#n4r@UA+
z<odi_1+QdX+r8t)n)j~FSxsx+_gOFb*13_t>Dt1@ZmV-`;qroAbFLl8zrJkU<6wDC
z!KO8CdtRTJCj!E*FWp{f;}HdOU%9b(MPBr4vweLFveqowzNmZg8(U}G*s{mF@y&~R
V7QeP{8O!@`c=dzzbg=N^{{de<T>=0A

diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
index 789960cc..af3bc59b 100644
--- a/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/locale/zh_Hans/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-26 09:56-0700\n"
+"POT-Creation-Date: 2021-04-29 11:36-0700\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"
@@ -96,23 +96,23 @@ msgstr "用户�"
 msgid "A user with that username already exists."
 msgstr "已�存在使用该用户�的用户。"
 
-#: bookwyrm/settings.py:152
+#: bookwyrm/settings.py:155
 msgid "English"
 msgstr "English（英语）"
 
-#: bookwyrm/settings.py:153
+#: bookwyrm/settings.py:156
 msgid "German"
 msgstr "Deutsch（德语）"
 
-#: bookwyrm/settings.py:154
+#: bookwyrm/settings.py:157
 msgid "Spanish"
 msgstr "Español（西�牙语）"
 
-#: bookwyrm/settings.py:155
+#: bookwyrm/settings.py:158
 msgid "French"
 msgstr "Français（法语）"
 
-#: bookwyrm/settings.py:156
+#: bookwyrm/settings.py:159
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
@@ -172,23 +172,29 @@ msgstr "加载��失败"
 msgid "View on OpenLibrary"
 msgstr "在 OpenLibrary 查看"
 
-#: bookwyrm/templates/book/book.html:102
+#: bookwyrm/templates/book/book.html:85
+#, fuzzy
+#| msgid "View on OpenLibrary"
+msgid "View on Inventaire"
+msgstr "在 OpenLibrary 查看"
+
+#: bookwyrm/templates/book/book.html:105
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s 则书评)"
 
-#: bookwyrm/templates/book/book.html:114
+#: bookwyrm/templates/book/book.html:117
 msgid "Add Description"
 msgstr "添加�述"
 
-#: bookwyrm/templates/book/book.html:121
+#: bookwyrm/templates/book/book.html:124
 #: bookwyrm/templates/book/edit_book.html:107
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "�述:"
 
-#: bookwyrm/templates/book/book.html:125
+#: bookwyrm/templates/book/book.html:128
 #: bookwyrm/templates/book/edit_book.html:240
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
@@ -203,7 +209,7 @@ msgstr "�述:"
 msgid "Save"
 msgstr "�存"
 
-#: bookwyrm/templates/book/book.html:126 bookwyrm/templates/book/book.html:175
+#: bookwyrm/templates/book/book.html:129 bookwyrm/templates/book/book.html:178
 #: bookwyrm/templates/book/cover_modal.html:32
 #: bookwyrm/templates/book/edit_book.html:241
 #: bookwyrm/templates/edit_author.html:79
@@ -219,17 +225,17 @@ msgstr "�存"
 msgid "Cancel"
 msgstr "�消"
 
-#: bookwyrm/templates/book/book.html:135
+#: bookwyrm/templates/book/book.html:138
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s/editions\">%(count)s 个版本</a>"
 
-#: bookwyrm/templates/book/book.html:143
+#: bookwyrm/templates/book/book.html:146
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "此版本在你的 <a href=\"%(path)s\">%(shelf_name)s</a> 书架上。"
 
-#: bookwyrm/templates/book/book.html:149
+#: bookwyrm/templates/book/book.html:152
 #, python-format
 msgid ""
 "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a "
@@ -238,72 +244,72 @@ msgstr ""
 "本书的 <a href=\"%(book_path)s\">�一个版本</a> 在你的 <a href="
 "\"%(shelf_path)s\">%(shelf_name)s</a> 书架上。"
 
-#: bookwyrm/templates/book/book.html:158
+#: bookwyrm/templates/book/book.html:161
 msgid "Your reading activity"
 msgstr "你的阅读活动"
 
-#: bookwyrm/templates/book/book.html:160
+#: bookwyrm/templates/book/book.html:163
 msgid "Add read dates"
 msgstr "添加阅读日期"
 
-#: bookwyrm/templates/book/book.html:165
+#: bookwyrm/templates/book/book.html:168
 msgid "You don't have any reading activity for this book."
 msgstr "你还没有任何这本书的阅读活动。"
 
-#: bookwyrm/templates/book/book.html:172
+#: bookwyrm/templates/book/book.html:175
 msgid "Create"
 msgstr "创建"
 
-#: bookwyrm/templates/book/book.html:194
+#: bookwyrm/templates/book/book.html:197
 msgid "Subjects"
 msgstr "主题"
 
-#: bookwyrm/templates/book/book.html:206
+#: bookwyrm/templates/book/book.html:209
 msgid "Places"
 msgstr "地点"
 
-#: bookwyrm/templates/book/book.html:217 bookwyrm/templates/layout.html:65
+#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:65
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search_results.html:91
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "列表"
 
-#: bookwyrm/templates/book/book.html:228
+#: bookwyrm/templates/book/book.html:231
 msgid "Add to list"
 msgstr "添加到列表"
 
-#: bookwyrm/templates/book/book.html:238
+#: bookwyrm/templates/book/book.html:241
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:133
 msgid "Add"
 msgstr "添加"
 
-#: bookwyrm/templates/book/book.html:254
+#: bookwyrm/templates/book/book.html:257
 #, fuzzy
 #| msgid "Review"
 msgid "Reviews"
 msgstr "书评"
 
-#: bookwyrm/templates/book/book.html:259
+#: bookwyrm/templates/book/book.html:262
 #, fuzzy
 #| msgid "Your shelves"
 msgid "Your reviews"
 msgstr "你的书架"
 
-#: bookwyrm/templates/book/book.html:265
+#: bookwyrm/templates/book/book.html:268
 #, fuzzy
 #| msgid "Your Account"
 msgid "Your comments"
 msgstr "你的��"
 
-#: bookwyrm/templates/book/book.html:271
+#: bookwyrm/templates/book/book.html:274
 #, fuzzy
 #| msgid "Your books"
 msgid "Your quotes"
 msgstr "你的书目"
 
-#: bookwyrm/templates/book/book.html:305
+#: bookwyrm/templates/book/book.html:308
 msgid "rated it"
 msgstr "评价了"
 
@@ -2570,12 +2576,7 @@ msgstr "评论了"
 msgid "quoted"
 msgstr "引用了"
 
-#: bookwyrm/templates/snippets/search_result_text.html:22
-#, python-format
-msgid "by %(author)s"
-msgstr "由 %(author)s 所著"
-
-#: bookwyrm/templates/snippets/search_result_text.html:30
+#: bookwyrm/templates/snippets/search_result_text.html:35
 msgid "Import book"
 msgstr "导入书目"
 
@@ -4292,6 +4293,10 @@ msgctxt "stick"
 msgid "club"
 msgstr ""
 
+#, python-format
+#~ msgid "by %(author)s"
+#~ msgstr "由 %(author)s 所著"
+
 #~ msgid "Deactivate user"
 #~ msgstr "�用用户"
 

From 9e2b4f61bb65d5ed2c506fc289fa92a17e2cfdc1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 29 Apr 2021 12:13:49 -0700
Subject: [PATCH 1012/1285] Make subheaders a lil smaller

---
 bookwyrm/templates/search_results.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/search_results.html b/bookwyrm/templates/search_results.html
index 4c9c23da..2dba79a2 100644
--- a/bookwyrm/templates/search_results.html
+++ b/bookwyrm/templates/search_results.html
@@ -11,7 +11,7 @@
 
 <div class="block columns">
     <div class="column">
-        <h2 class="title">{% trans "Matching Books" %}</h2>
+        <h2 class="title is-4">{% trans "Matching Books" %}</h2>
         <section class="block">
             {% if not local_results.results %}
             <p>{% blocktrans %}No books found for "{{ query }}"{% endblocktrans %}</p>
@@ -71,7 +71,7 @@
     </div>
     <div class="column">
         <section class="block">
-            <h2 class="title">{% trans "Matching Users" %}</h2>
+            <h2 class="title is-4">{% trans "Matching Users" %}</h2>
             {% if not user_results %}
             <p>{% blocktrans %}No users found for "{{ query }}"{% endblocktrans %}</p>
             {% endif %}
@@ -88,7 +88,7 @@
             </ul>
         </section>
         <section class="block">
-            <h2 class="title">{% trans "Lists" %}</h2>
+            <h2 class="title is-4">{% trans "Lists" %}</h2>
             {% if not list_results %}
             <p>{% blocktrans %}No lists found for "{{ query }}"{% endblocktrans %}</p>
             {% endif %}

From 9d89aaf9fcdbfb84187ae0ac9c991fc2a94e8ac7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 29 Apr 2021 12:18:55 -0700
Subject: [PATCH 1013/1285] Don't let logged out viwers search for users

---
 bookwyrm/templates/search_results.html |  6 +++--
 bookwyrm/views/search.py               | 37 +++++++++++++-------------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/bookwyrm/templates/search_results.html b/bookwyrm/templates/search_results.html
index 2dba79a2..9188c1f0 100644
--- a/bookwyrm/templates/search_results.html
+++ b/bookwyrm/templates/search_results.html
@@ -70,10 +70,11 @@
         {% endif %}
     </div>
     <div class="column">
+        {% if request.user.is_authenticated %}
         <section class="block">
             <h2 class="title is-4">{% trans "Matching Users" %}</h2>
             {% if not user_results %}
-            <p>{% blocktrans %}No users found for "{{ query }}"{% endblocktrans %}</p>
+            <p><em>{% blocktrans %}No users found for "{{ query }}"{% endblocktrans %}</em></p>
             {% endif %}
             <ul>
             {% for result in user_results %}
@@ -87,10 +88,11 @@
             {% endfor %}
             </ul>
         </section>
+        {% endif %}
         <section class="block">
             <h2 class="title is-4">{% trans "Lists" %}</h2>
             {% if not list_results %}
-            <p>{% blocktrans %}No lists found for "{{ query }}"{% endblocktrans %}</p>
+            <p><em>{% blocktrans %}No lists found for "{{ query }}"{% endblocktrans %}</em></p>
             {% endif %}
             {% for result in list_results %}
             <div class="block">
diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py
index 4543b55e..bd5ac3c7 100644
--- a/bookwyrm/views/search.py
+++ b/bookwyrm/views/search.py
@@ -30,27 +30,30 @@ class Search(View):
             )
             return JsonResponse([r.json() for r in book_results], safe=False)
 
+        data = {"query": query or ""}
+
         # use webfinger for mastodon style account@domain.com username
         if query and re.match(regex.full_username, query):
             handle_remote_webfinger(query)
 
         # do a user search
-        user_results = (
-            models.User.viewer_aware_objects(request.user)
-            .annotate(
-                similarity=Greatest(
-                    TrigramSimilarity("username", query),
-                    TrigramSimilarity("localname", query),
+        if request.user.is_authenticated:
+            data["user_results"] = (
+                models.User.viewer_aware_objects(request.user)
+                .annotate(
+                    similarity=Greatest(
+                        TrigramSimilarity("username", query),
+                        TrigramSimilarity("localname", query),
+                    )
                 )
+                .filter(
+                    similarity__gt=0.5,
+                )
+                .order_by("-similarity")[:10]
             )
-            .filter(
-                similarity__gt=0.5,
-            )
-            .order_by("-similarity")[:10]
-        )
 
         # any relevent lists?
-        list_results = (
+        data["list_results"] = (
             privacy_filter(
                 request.user,
                 models.List.objects,
@@ -68,11 +71,7 @@ class Search(View):
             .order_by("-similarity")[:10]
         )
 
-        book_results = connector_manager.search(query, min_confidence=min_confidence)
-        data = {
-            "book_results": book_results,
-            "user_results": user_results,
-            "list_results": list_results,
-            "query": query or "",
-        }
+        data["book_results"] = connector_manager.search(
+            query, min_confidence=min_confidence
+        )
         return TemplateResponse(request, "search_results.html", data)

From daa7746f47be7244379c3a731bfbddcaf3016639 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Thu, 29 Apr 2021 21:40:54 +0200
Subject: [PATCH 1014/1285] Stretch List card in list of lists

---
 bookwyrm/templates/lists/list_items.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/lists/list_items.html b/bookwyrm/templates/lists/list_items.html
index 3e3e8bf4..e1b9cd7a 100644
--- a/bookwyrm/templates/lists/list_items.html
+++ b/bookwyrm/templates/lists/list_items.html
@@ -2,7 +2,7 @@
 <div class="columns is-multiline">
     {% for list in lists %}
     <div class="column is-one-quarter">
-        <div class="card">
+        <div class="card is-stretchable">
             <header class="card-header">
                 <h4 class="card-header-title">
                     <a href="{{ list.local_path }}">{{ list.name }}</a> <span class="subtitle">{% include 'snippets/privacy-icons.html' with item=list %}</span>

From b59b3e294f28a7e36848af99051a619d69a31555 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Thu, 29 Apr 2021 21:41:31 +0200
Subject: [PATCH 1015/1285] Arrange Sort List form fields

---
 bookwyrm/templates/lists/list.html | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index 641038d0..e61caf9c 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -79,15 +79,19 @@
     <section class="column is-one-quarter content">
         <h2>{% trans "Sort List" %}</h2>
         <form name="sort" action="{% url 'list' list.id %}" method="GET" class="block">
-            <label class="label" for="id_sort_by">{% trans "Sort By" %}</label>
-            <div class="select is-fullwidth">
-                {{ sort_form.sort_by }}
+            <div class="field">
+                <label class="label" for="id_sort_by">{% trans "Sort By" %}</label>
+                <div class="select is-fullwidth">
+                    {{ sort_form.sort_by }}
+                </div>
             </div>
-            <label class="label" for="id_direction">{% trans "Direction" %}</label>
-            <div class="select is-fullwidth">
-                {{ sort_form.direction }}
+            <div class="field">
+                <label class="label" for="id_direction">{% trans "Direction" %}</label>
+                <div class="select is-fullwidth">
+                    {{ sort_form.direction }}
+                </div>
             </div>
-            <div>
+            <div class="field">
                 <button class="button is-primary is-fullwidth" type="submit">
                     {% trans "Sort List" %}
                 </button>

From 0a71fb094fb8fbf994103f800ee84b4cd3b8bda3 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Thu, 29 Apr 2021 21:41:43 +0200
Subject: [PATCH 1016/1285] Move counter in Ordered List

---
 bookwyrm/static/css/bookwyrm.css   | 34 ++++++++++++++++++++++++++++++
 bookwyrm/templates/lists/list.html |  8 ++++---
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 9e74d69f..0d9cbe3a 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -346,3 +346,37 @@ body {
         display: none;
     }
 }
+
+/* Book list
+ ******************************************************************************/
+
+ol.ordered-list {
+    list-style: none;
+    counter-reset: books;
+}
+
+ol.ordered-list li {
+  counter-increment: books
+}
+
+ol.ordered-list li::before {
+  content: counter(books);
+  position: absolute;
+  left: -20px;
+  width: 20px;
+  height: 24px;
+
+  border: 1px solid #dbdbdb;
+  border-right: 0;
+  border-top-left-radius: 2px;
+  border-top-right-radius: 2px;
+
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  align-items: center;
+
+  color: #888;
+  font-size: 0.8em;
+  font-weight: bold;
+}
diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index e61caf9c..cfecfd4b 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -26,7 +26,7 @@
         {% if not items.object_list.exists %}
         <p>{% trans "This list is currently empty" %}</p>
         {% else %}
-        <ol start="{{ items.start_index }}">
+        <ol start="{{ items.start_index }}" class="ordered-list">
         {% for item in items %}
             <li class="block pb-3">
                 <div class="card">
@@ -40,7 +40,7 @@
                             {% include 'snippets/shelve_button/shelve_button.html' with book=item.book %}
                         </div>
                     </div>
-                    <div class="card-footer has-background-white-bis is-align-items-baseline">
+                    <div class="card-footer has-background-white-bis">
                         <div class="card-footer-item">
                             <div>
                             <p>{% blocktrans with username=item.user.display_name user_path=user.local_path %}Added by <a href="{{ user_path }}">{{ username }}</a>{% endblocktrans %}</p>
@@ -50,6 +50,9 @@
                         <div class="card-footer-item">
                             <form name="set-position" method="post" action="{% url 'list-set-book-position' item.id %}">
                                 <div class="field has-addons mb-0">
+                                    <div class="control">
+                                        <label for="input-list-position" class="button is-transparent is-small">{% trans "List position" %}</label>
+                                    </div>
                                     {% csrf_token %}
                                     <div class="control">
                                         <input id="input-list-position" class="input is-small" type="number" min="1" name="position" value="{{ item.order }}">
@@ -58,7 +61,6 @@
                                         <button type="submit" class="button is-info is-small is-tablet">{% trans "Set" %}</button>
                                     </div>
                                 </div>
-                                <label for="input-list-position" class="help">{% trans "List position" %}</label>
                             </form>
                         </div>
                         <form name="add-book" method="post" action="{% url 'list-remove-book' list.id %}" class="card-footer-item">

From fa17386a6eb3553b09b92aba79b21df4f4002e2f Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Thu, 29 Apr 2021 21:45:48 +0200
Subject: [PATCH 1017/1285] Fix

---
 bookwyrm/static/css/bookwyrm.css | 34 ++++++++++++++++----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 0d9cbe3a..85b9e0c2 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -356,27 +356,27 @@ ol.ordered-list {
 }
 
 ol.ordered-list li {
-  counter-increment: books
+    counter-increment: books
 }
 
 ol.ordered-list li::before {
-  content: counter(books);
-  position: absolute;
-  left: -20px;
-  width: 20px;
-  height: 24px;
+    content: counter(books);
+    position: absolute;
+    left: -20px;
+    width: 20px;
+    height: 24px;
 
-  border: 1px solid #dbdbdb;
-  border-right: 0;
-  border-top-left-radius: 2px;
-  border-top-right-radius: 2px;
+    border: 1px solid #dbdbdb;
+    border-right: 0;
+    border-top-left-radius: 2px;
+    border-top-right-radius: 2px;
 
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  align-items: center;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    align-items: center;
 
-  color: #888;
-  font-size: 0.8em;
-  font-weight: bold;
+    color: #888;
+    font-size: 0.8em;
+    font-weight: bold;
 }

From d4dffe48a7d2bf786a0099ab8b5b2756b8b5c982 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Thu, 29 Apr 2021 21:48:35 +0200
Subject: [PATCH 1018/1285] Update bookwyrm.css

---
 bookwyrm/static/css/bookwyrm.css | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 85b9e0c2..c11a0797 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -356,7 +356,7 @@ ol.ordered-list {
 }
 
 ol.ordered-list li {
-    counter-increment: books
+    counter-increment: books;
 }
 
 ol.ordered-list li::before {
@@ -365,17 +365,14 @@ ol.ordered-list li::before {
     left: -20px;
     width: 20px;
     height: 24px;
-
     border: 1px solid #dbdbdb;
     border-right: 0;
     border-top-left-radius: 2px;
     border-top-right-radius: 2px;
-
     display: flex;
     align-items: center;
     justify-content: center;
     align-items: center;
-
     color: #888;
     font-size: 0.8em;
     font-weight: bold;

From bbac0ad7ab444f7eb5d3c069c699fe6b81687ca4 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Thu, 29 Apr 2021 21:51:42 +0200
Subject: [PATCH 1019/1285] Update bookwyrm.css

---
 bookwyrm/static/css/bookwyrm.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index c11a0797..f2c6a028 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -370,7 +370,6 @@ ol.ordered-list li::before {
     border-top-left-radius: 2px;
     border-top-right-radius: 2px;
     display: flex;
-    align-items: center;
     justify-content: center;
     align-items: center;
     color: #888;

From 6d7b3e9ae76bacd98bb43c35a3cd7338fd0dafb8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 29 Apr 2021 12:56:42 -0700
Subject: [PATCH 1020/1285] Show/hide individual search results

---
 bookwyrm/templates/search_results.html | 37 +++++++++++++++++++-------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/bookwyrm/templates/search_results.html b/bookwyrm/templates/search_results.html
index 9188c1f0..f911bec7 100644
--- a/bookwyrm/templates/search_results.html
+++ b/bookwyrm/templates/search_results.html
@@ -42,18 +42,35 @@
             {% if result_set.results %}
             <section class="block">
                 {% if not result_set.connector.local %}
-                <h3 class="title is-5">
-                    Results from <a href="{{ result_set.connector.base_url }}" target="_blank">{% if result_set.connector.name %}{{ result_set.connector.name }}{% else %}{{ result_set.connector.identifier }}{% endif %}</a>
-                </h3>
+                <header class="columns is-mobile">
+                    <div class="column">
+                        <h3 class="title is-5">
+                            Results from
+                            <a href="{{ result_set.connector.base_url }}" target="_blank">{{ result_set.connector.name|default:result_set.connector.identifier }}</a>
+                        </h3>
+                    </div>
+                    <div class="column is-narrow">
+                        {% trans "Show" as button_text %}
+                        {% include 'snippets/toggle/open_button.html' with text=button_text small=True controls_text="more-results-panel" controls_uid=result_set.connector.identifier class="is-small" icon="arrow-down" pressed=forloop.first %}
+                    </div>
+                </header>
                 {% endif %}
 
-                <ul>
-                {% for result in result_set.results %}
-                    <li class="pb-4">
-                        {% include 'snippets/search_result_text.html' with result=result remote_result=True %}
-                    </li>
-                {% endfor %}
-                </ul>
+                <div class="box has-background-white-ter{% if not forloop.first %} is-hidden{% endif %}" id="more-results-panel-{{ result_set.connector.identifier }}">
+                    <div class="is-flex is-flex-direction-row-reverse">
+                        <div>
+                            {% trans "Close" as button_text %}
+                            {% include 'snippets/toggle/toggle_button.html' with label=button_text class="delete" nonbutton=True controls_text="more-results-panel" controls_uid=result_set.connector.identifier pressed=forloop.first %}
+                        </div>
+                        <ul class="is-flex-grow-1">
+                        {% for result in result_set.results %}
+                            <li class="pb-4">
+                                {% include 'snippets/search_result_text.html' with result=result remote_result=True %}
+                            </li>
+                        {% endfor %}
+                        </ul>
+                    </div>
+                </div>
             </section>
             {% endif %}
             {% endfor %}

From 15790abc703619858ad019fe4ac288975ff61f8d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 29 Apr 2021 13:03:56 -0700
Subject: [PATCH 1021/1285] Don't show broken image previews when cover is
 absent

---
 bookwyrm/connectors/bookwyrm_connector.py | 2 +-
 bookwyrm/connectors/self_connector.py     | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/connectors/bookwyrm_connector.py b/bookwyrm/connectors/bookwyrm_connector.py
index 6b1d2f8c..10a633b2 100644
--- a/bookwyrm/connectors/bookwyrm_connector.py
+++ b/bookwyrm/connectors/bookwyrm_connector.py
@@ -6,7 +6,7 @@ from .abstract_connector import AbstractMinimalConnector, SearchResult
 class Connector(AbstractMinimalConnector):
     """this is basically just for search"""
 
-    def get_or_create_book(self, remote_id, work=None):
+    def get_or_create_book(self, remote_id):
         return activitypub.resolve_remote_id(remote_id, model=models.Edition)
 
     def parse_search_data(self, data):
diff --git a/bookwyrm/connectors/self_connector.py b/bookwyrm/connectors/self_connector.py
index 6b1b349f..a8f85834 100644
--- a/bookwyrm/connectors/self_connector.py
+++ b/bookwyrm/connectors/self_connector.py
@@ -69,6 +69,10 @@ class Connector(AbstractConnector):
         return search_results
 
     def format_search_result(self, search_result):
+        cover = None
+        if search_result.cover:
+            cover = "%s%s" % (self.covers_url, search_result.cover)
+
         return SearchResult(
             title=search_result.title,
             key=search_result.remote_id,
@@ -77,7 +81,7 @@ class Connector(AbstractConnector):
             if search_result.published_date
             else None,
             connector=self,
-            cover="%s%s" % (self.covers_url, search_result.cover),
+            cover=cover,
             confidence=search_result.rank if hasattr(search_result, "rank") else 1,
         )
 

From f4ebecfe75f598fa94be4d28f5048399e26e5708 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 29 Apr 2021 13:11:37 -0700
Subject: [PATCH 1022/1285] Add background to search result boxes

---
 bookwyrm/templates/search_results.html | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/templates/search_results.html b/bookwyrm/templates/search_results.html
index f911bec7..909b0a25 100644
--- a/bookwyrm/templates/search_results.html
+++ b/bookwyrm/templates/search_results.html
@@ -29,18 +29,23 @@
         {% if request.user.is_authenticated %}
         {% if book_results|slice:":1" and local_results.results %}
         <div class="block">
-            <p>
+            <h3 class="title is-6 mb-0">
                 {% trans "Didn't find what you were looking for?" %}
-            </p>
+            </h3>
             {% trans "Show results from other catalogues" as button_text %}
             {% include 'snippets/toggle/open_button.html' with text=button_text small=True controls_text="more-results" %}
+
+            {% if local_results.results %}
+            {% trans "Hide results from other catalogues" as button_text %}
+            {% include 'snippets/toggle/close_button.html' with text=button_text small=True controls_text="more-results" %}
+            {% endif %}
         </div>
         {% endif %}
 
         <div class="{% if local_results.results %}is-hidden{% endif %}" id="more-results">
             {% for result_set in book_results|slice:"1:" %}
             {% if result_set.results %}
-            <section class="block">
+            <section class="box has-background-white-bis">
                 {% if not result_set.connector.local %}
                 <header class="columns is-mobile">
                     <div class="column">
@@ -56,7 +61,7 @@
                 </header>
                 {% endif %}
 
-                <div class="box has-background-white-ter{% if not forloop.first %} is-hidden{% endif %}" id="more-results-panel-{{ result_set.connector.identifier }}">
+                <div class="box has-background-white is-shadowless{% if not forloop.first %} is-hidden{% endif %}" id="more-results-panel-{{ result_set.connector.identifier }}">
                     <div class="is-flex is-flex-direction-row-reverse">
                         <div>
                             {% trans "Close" as button_text %}
@@ -74,11 +79,6 @@
             </section>
             {% endif %}
             {% endfor %}
-
-            {% if local_results.results %}
-            {% trans "Hide results from other catalogues" as button_text %}
-            {% include 'snippets/toggle/close_button.html' with text=button_text small=True controls_text="more-results" %}
-            {% endif %}
         </div>
 
         <div class="block">

From 6f38ab167e6a8fa53358521352c4929c09c07811 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 29 Apr 2021 13:21:35 -0700
Subject: [PATCH 1023/1285] Show clarifying text for empty search when logged
 out

---
 bookwyrm/templates/search_results.html | 11 ++++++++---
 bookwyrm/urls.py                       |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/search_results.html b/bookwyrm/templates/search_results.html
index 909b0a25..337e88f8 100644
--- a/bookwyrm/templates/search_results.html
+++ b/bookwyrm/templates/search_results.html
@@ -14,7 +14,12 @@
         <h2 class="title is-4">{% trans "Matching Books" %}</h2>
         <section class="block">
             {% if not local_results.results %}
-            <p>{% blocktrans %}No books found for "{{ query }}"{% endblocktrans %}</p>
+                <p><em>{% blocktrans %}No books found for "{{ query }}"{% endblocktrans %}</em></p>
+                {% if not user.is_authenticated %}
+                <p>
+                <a href="{% url 'login' %}">{% trans "Log in to import or add books." %}</a>
+                </p>
+                {% endif %}
             {% else %}
             <ul>
             {% for result in local_results.results %}
@@ -88,7 +93,7 @@
     </div>
     <div class="column">
         {% if request.user.is_authenticated %}
-        <section class="block">
+        <section class="box">
             <h2 class="title is-4">{% trans "Matching Users" %}</h2>
             {% if not user_results %}
             <p><em>{% blocktrans %}No users found for "{{ query }}"{% endblocktrans %}</em></p>
@@ -106,7 +111,7 @@
             </ul>
         </section>
         {% endif %}
-        <section class="block">
+        <section class="box">
             <h2 class="title is-4">{% trans "Lists" %}</h2>
             {% if not list_results %}
             <p><em>{% blocktrans %}No lists found for "{{ query }}"{% endblocktrans %}</em></p>
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 53ceeaa8..24c80b04 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -43,7 +43,7 @@ urlpatterns = [
     re_path("^api/updates/notifications/?$", views.get_notification_count),
     re_path("^api/updates/stream/(?P<stream>[a-z]+)/?$", views.get_unread_status_count),
     # authentication
-    re_path(r"^login/?$", views.Login.as_view()),
+    re_path(r"^login/?$", views.Login.as_view(), name="login"),
     re_path(r"^register/?$", views.Register.as_view()),
     re_path(r"^logout/?$", views.Logout.as_view()),
     re_path(r"^password-reset/?$", views.PasswordResetRequest.as_view()),

From 533cba3ce0c000001911164106362b3621a25989 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 29 Apr 2021 13:25:44 -0700
Subject: [PATCH 1024/1285] Updates locales

---
 locale/de_DE/LC_MESSAGES/django.po   | 27 +++++++++++++++++++--------
 locale/en_US/LC_MESSAGES/django.po   | 25 +++++++++++++++++--------
 locale/es/LC_MESSAGES/django.po      | 27 +++++++++++++++++++--------
 locale/fr_FR/LC_MESSAGES/django.po   | 27 +++++++++++++++++++--------
 locale/zh_Hans/LC_MESSAGES/django.po | 27 +++++++++++++++++++--------
 5 files changed, 93 insertions(+), 40 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index bbdd1327..d7ad8724 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-29 11:36-0700\n"
+"POT-Creation-Date: 2021-04-29 13:24-0700\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"
@@ -282,7 +282,7 @@ msgstr "Orte"
 
 #: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:65
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
-#: bookwyrm/templates/search_results.html:91
+#: bookwyrm/templates/search_results.html:115
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listen"
@@ -581,6 +581,7 @@ msgstr "Veröffentlicht von %(publisher)s."
 #: bookwyrm/templates/feed/feed_layout.html:70
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
+#: bookwyrm/templates/search_results.html:72
 msgid "Close"
 msgstr "Schließen"
 
@@ -1129,7 +1130,7 @@ msgid "Search for a user"
 msgstr "Suche nach Buch oder Benutzer*in"
 
 #: bookwyrm/templates/get_started/users.html:13
-#: bookwyrm/templates/search_results.html:76
+#: bookwyrm/templates/search_results.html:99
 #, python-format
 msgid "No users found for \"%(query)s\""
 msgstr "Keine Nutzer*innen für \"%(query)s\" gefunden"
@@ -1908,23 +1909,33 @@ msgstr "Profil"
 msgid "Relationships"
 msgstr "Beziehungen"
 
-#: bookwyrm/templates/search_results.html:33
+#: bookwyrm/templates/search_results.html:20
+msgid "Log in to import or add books."
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:38
 msgid "Didn't find what you were looking for?"
 msgstr "Nicht gefunden, wonach du gesucht hast?"
 
-#: bookwyrm/templates/search_results.html:35
+#: bookwyrm/templates/search_results.html:40
 msgid "Show results from other catalogues"
 msgstr "Ergebnisse aus anderen Katalogen zeigen"
 
-#: bookwyrm/templates/search_results.html:62
+#: bookwyrm/templates/search_results.html:44
 msgid "Hide results from other catalogues"
 msgstr "Ergebnisse aus anderen Katalogen ausblenden"
 
-#: bookwyrm/templates/search_results.html:74
+#: bookwyrm/templates/search_results.html:63
+#, fuzzy
+#| msgid "Show more"
+msgid "Show"
+msgstr "Mehr anzeigen"
+
+#: bookwyrm/templates/search_results.html:97
 msgid "Matching Users"
 msgstr "Passende Nutzer*innen"
 
-#: bookwyrm/templates/search_results.html:93
+#: bookwyrm/templates/search_results.html:117
 #, python-format
 msgid "No lists found for \"%(query)s\""
 msgstr "Keine Liste für \"%(query)s\" gefunden"
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index 3637bb77..c3df47ae 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-29 11:36-0700\n"
+"POT-Creation-Date: 2021-04-29 13:24-0700\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"
@@ -261,7 +261,7 @@ msgstr ""
 
 #: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:65
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
-#: bookwyrm/templates/search_results.html:91
+#: bookwyrm/templates/search_results.html:115
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr ""
@@ -535,6 +535,7 @@ msgstr ""
 #: bookwyrm/templates/feed/feed_layout.html:70
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
+#: bookwyrm/templates/search_results.html:72
 msgid "Close"
 msgstr ""
 
@@ -1032,7 +1033,7 @@ msgid "Search for a user"
 msgstr ""
 
 #: bookwyrm/templates/get_started/users.html:13
-#: bookwyrm/templates/search_results.html:76
+#: bookwyrm/templates/search_results.html:99
 #, python-format
 msgid "No users found for \"%(query)s\""
 msgstr ""
@@ -1739,23 +1740,31 @@ msgstr ""
 msgid "Relationships"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:33
+#: bookwyrm/templates/search_results.html:20
+msgid "Log in to import or add books."
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:38
 msgid "Didn't find what you were looking for?"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:35
+#: bookwyrm/templates/search_results.html:40
 msgid "Show results from other catalogues"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:62
+#: bookwyrm/templates/search_results.html:44
 msgid "Hide results from other catalogues"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:74
+#: bookwyrm/templates/search_results.html:63
+msgid "Show"
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:97
 msgid "Matching Users"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:93
+#: bookwyrm/templates/search_results.html:117
 #, python-format
 msgid "No lists found for \"%(query)s\""
 msgstr ""
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 8385f7f6..dab4c486 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-29 11:36-0700\n"
+"POT-Creation-Date: 2021-04-29 13:24-0700\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -266,7 +266,7 @@ msgstr "Lugares"
 
 #: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:65
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
-#: bookwyrm/templates/search_results.html:91
+#: bookwyrm/templates/search_results.html:115
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listas"
@@ -548,6 +548,7 @@ msgstr "Publicado por %(publisher)s."
 #: bookwyrm/templates/feed/feed_layout.html:70
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
+#: bookwyrm/templates/search_results.html:72
 msgid "Close"
 msgstr "Cerrar"
 
@@ -1060,7 +1061,7 @@ msgid "Search for a user"
 msgstr "Buscar un usuario"
 
 #: bookwyrm/templates/get_started/users.html:13
-#: bookwyrm/templates/search_results.html:76
+#: bookwyrm/templates/search_results.html:99
 #, python-format
 msgid "No users found for \"%(query)s\""
 msgstr "No se encontró ningún usuario correspondiente a \"%(query)s\""
@@ -1811,23 +1812,33 @@ msgstr "Perfil"
 msgid "Relationships"
 msgstr "Relaciones"
 
-#: bookwyrm/templates/search_results.html:33
+#: bookwyrm/templates/search_results.html:20
+msgid "Log in to import or add books."
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:38
 msgid "Didn't find what you were looking for?"
 msgstr "¿No encontraste lo que buscabas?"
 
-#: bookwyrm/templates/search_results.html:35
+#: bookwyrm/templates/search_results.html:40
 msgid "Show results from other catalogues"
 msgstr "Mostrar resultados de otros catálogos"
 
-#: bookwyrm/templates/search_results.html:62
+#: bookwyrm/templates/search_results.html:44
 msgid "Hide results from other catalogues"
 msgstr "Ocultar resultados de otros catálogos"
 
-#: bookwyrm/templates/search_results.html:74
+#: bookwyrm/templates/search_results.html:63
+#, fuzzy
+#| msgid "Show more"
+msgid "Show"
+msgstr "Mostrar más"
+
+#: bookwyrm/templates/search_results.html:97
 msgid "Matching Users"
 msgstr "Usuarios correspondientes"
 
-#: bookwyrm/templates/search_results.html:93
+#: bookwyrm/templates/search_results.html:117
 #, python-format
 msgid "No lists found for \"%(query)s\""
 msgstr "No se encontró ningúna lista correspondiente a \"%(query)s\""
diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index ee7a5534..01963e46 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-29 11:36-0700\n"
+"POT-Creation-Date: 2021-04-29 13:24-0700\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"
@@ -272,7 +272,7 @@ msgstr "Lieux"
 
 #: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:65
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
-#: bookwyrm/templates/search_results.html:91
+#: bookwyrm/templates/search_results.html:115
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "Listes"
@@ -554,6 +554,7 @@ msgstr "Publié par %(publisher)s."
 #: bookwyrm/templates/feed/feed_layout.html:70
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
+#: bookwyrm/templates/search_results.html:72
 msgid "Close"
 msgstr "Fermer"
 
@@ -1072,7 +1073,7 @@ msgid "Search for a user"
 msgstr "Chercher un compte"
 
 #: bookwyrm/templates/get_started/users.html:13
-#: bookwyrm/templates/search_results.html:76
+#: bookwyrm/templates/search_results.html:99
 #, python-format
 msgid "No users found for \"%(query)s\""
 msgstr "Aucun compte trouvé pour « %(query)s »"
@@ -1836,23 +1837,33 @@ msgstr "Profil"
 msgid "Relationships"
 msgstr "Relations"
 
-#: bookwyrm/templates/search_results.html:33
+#: bookwyrm/templates/search_results.html:20
+msgid "Log in to import or add books."
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:38
 msgid "Didn't find what you were looking for?"
 msgstr "Vous n’avez pas trouvé ce que vous cherchiez ?"
 
-#: bookwyrm/templates/search_results.html:35
+#: bookwyrm/templates/search_results.html:40
 msgid "Show results from other catalogues"
 msgstr "Montrer les résultats d’autres catalogues"
 
-#: bookwyrm/templates/search_results.html:62
+#: bookwyrm/templates/search_results.html:44
 msgid "Hide results from other catalogues"
 msgstr "Masquer les résultats d’autres catalogues"
 
-#: bookwyrm/templates/search_results.html:74
+#: bookwyrm/templates/search_results.html:63
+#, fuzzy
+#| msgid "Show more"
+msgid "Show"
+msgstr "Déplier"
+
+#: bookwyrm/templates/search_results.html:97
 msgid "Matching Users"
 msgstr "Comptes correspondants"
 
-#: bookwyrm/templates/search_results.html:93
+#: bookwyrm/templates/search_results.html:117
 #, python-format
 msgid "No lists found for \"%(query)s\""
 msgstr "Aucune liste trouvée pour « %(query)s »"
diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
index af3bc59b..783fc70a 100644
--- a/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/locale/zh_Hans/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-29 11:36-0700\n"
+"POT-Creation-Date: 2021-04-29 13:24-0700\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"
@@ -270,7 +270,7 @@ msgstr "地点"
 
 #: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:65
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
-#: bookwyrm/templates/search_results.html:91
+#: bookwyrm/templates/search_results.html:115
 #: bookwyrm/templates/user/user_layout.html:62
 msgid "Lists"
 msgstr "列表"
@@ -552,6 +552,7 @@ msgstr "由 %(publisher)s 出版。"
 #: bookwyrm/templates/feed/feed_layout.html:70
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
+#: bookwyrm/templates/search_results.html:72
 msgid "Close"
 msgstr "关闭"
 
@@ -1052,7 +1053,7 @@ msgid "Search for a user"
 msgstr "�索用户"
 
 #: bookwyrm/templates/get_started/users.html:13
-#: bookwyrm/templates/search_results.html:76
+#: bookwyrm/templates/search_results.html:99
 #, python-format
 msgid "No users found for \"%(query)s\""
 msgstr "没有找到 \"%(query)s\" 的用户"
@@ -1801,23 +1802,33 @@ msgstr "个人资料"
 msgid "Relationships"
 msgstr "关系"
 
-#: bookwyrm/templates/search_results.html:33
+#: bookwyrm/templates/search_results.html:20
+msgid "Log in to import or add books."
+msgstr ""
+
+#: bookwyrm/templates/search_results.html:38
 msgid "Didn't find what you were looking for?"
 msgstr "没有找到你想找的？"
 
-#: bookwyrm/templates/search_results.html:35
+#: bookwyrm/templates/search_results.html:40
 msgid "Show results from other catalogues"
 msgstr "显示其它类别的结果"
 
-#: bookwyrm/templates/search_results.html:62
+#: bookwyrm/templates/search_results.html:44
 msgid "Hide results from other catalogues"
 msgstr "��其它类别的结果"
 
-#: bookwyrm/templates/search_results.html:74
+#: bookwyrm/templates/search_results.html:63
+#, fuzzy
+#| msgid "Show more"
+msgid "Show"
+msgstr "显示更多"
+
+#: bookwyrm/templates/search_results.html:97
 msgid "Matching Users"
 msgstr "匹�的用户"
 
-#: bookwyrm/templates/search_results.html:93
+#: bookwyrm/templates/search_results.html:117
 #, python-format
 msgid "No lists found for \"%(query)s\""
 msgstr "没有找到 \"%(query)s\" 的列表"

From 3feba60665a92a2fe71032a721a8d6279f761e02 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 29 Apr 2021 13:54:17 -0700
Subject: [PATCH 1025/1285] Fixes test

---
 bookwyrm/tests/views/test_helpers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py
index 6a435ff3..0dddd2a1 100644
--- a/bookwyrm/tests/views/test_helpers.py
+++ b/bookwyrm/tests/views/test_helpers.py
@@ -219,7 +219,7 @@ class ViewsHelpers(TestCase):
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             # 1 shared follow
             self.local_user.following.add(user_2)
-            user_1.following.add(user_2)
+            user_1.followers.add(user_2)
 
             # 1 shared book
             models.ShelfBook.objects.create(

From daf65e230de424ae8ae2bcea437570fd54cf3c7a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 29 Apr 2021 14:43:14 -0700
Subject: [PATCH 1026/1285] Test for failing rate federation

---
 .../tests/views/inbox/test_inbox_create.py    | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/bookwyrm/tests/views/inbox/test_inbox_create.py b/bookwyrm/tests/views/inbox/test_inbox_create.py
index e7a12024..b59a975f 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_create.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_create.py
@@ -127,6 +127,43 @@ class InboxCreate(TestCase):
         self.assertTrue(models.Notification.objects.filter(user=self.local_user))
         self.assertEqual(models.Notification.objects.get().notification_type, "REPLY")
 
+    def test_create_rating(self):
+        """a remote rating activity"""
+        models.Edition.objects.create(
+            title="Test Book", origin_id="https://example.com/book/1"
+        )
+        activity = self.create_json
+        activity["object"] = {
+            "id": "https://example.com/user/mouse/reviewrating/12",
+            "type": "Rating",
+            "published": "2021-04-29T21:27:30.014235+00:00",
+            "attributedTo": "https://example.com/user/mouse",
+            "to": ["https://www.w3.org/ns/activitystreams#Public"],
+            "cc": ["https://example.com/user/mouse/followers"],
+            "replies": {
+                "id": "https://example.com/user/mouse/reviewrating/12/replies",
+                "type": "OrderedCollection",
+                "totalItems": 0,
+                "first": "https://example.com/user/mouse/reviewrating/12/replies?page=1",
+                "last": "https://example.com/user/mouse/reviewrating/12/replies?page=1",
+                "@context": "https://www.w3.org/ns/activitystreams",
+            },
+            "inReplyTo": "",
+            "summary": "",
+            "tag": [],
+            "attachment": [],
+            "sensitive": False,
+            "inReplyToBook": "https://example.com/book/1",
+            "rating": 3,
+            "@context": "https://www.w3.org/ns/activitystreams",
+        }
+        with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
+            views.inbox.activity_task(activity)
+            self.assertTrue(redis_mock.called)
+        rating = models.Status.objects.select_subclasses().first()
+        self.assertEqual(rating.book, self.book)
+        self.assertEqual(rating.rating, 3.0)
+
     def test_create_list(self):
         """a new list"""
         activity = self.create_json

From d61ba2e474a8e58f2683387d797b77895f6e0ca2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 29 Apr 2021 15:16:51 -0700
Subject: [PATCH 1027/1285] Fixes review rating serialization

---
 bookwyrm/activitypub/note.py                    | 1 +
 bookwyrm/tests/views/inbox/test_inbox_create.py | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/activitypub/note.py b/bookwyrm/activitypub/note.py
index b501c3d6..ea2e92b6 100644
--- a/bookwyrm/activitypub/note.py
+++ b/bookwyrm/activitypub/note.py
@@ -83,4 +83,5 @@ class Rating(Comment):
 
     rating: int
     content: str = None
+    name: str = None  # not used, but the model inherits from Review
     type: str = "Rating"
diff --git a/bookwyrm/tests/views/inbox/test_inbox_create.py b/bookwyrm/tests/views/inbox/test_inbox_create.py
index b59a975f..958dfee8 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_create.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_create.py
@@ -129,8 +129,8 @@ class InboxCreate(TestCase):
 
     def test_create_rating(self):
         """a remote rating activity"""
-        models.Edition.objects.create(
-            title="Test Book", origin_id="https://example.com/book/1"
+        book = models.Edition.objects.create(
+            title="Test Book", remote_id="https://example.com/book/1"
         )
         activity = self.create_json
         activity["object"] = {
@@ -160,8 +160,8 @@ class InboxCreate(TestCase):
         with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock:
             views.inbox.activity_task(activity)
             self.assertTrue(redis_mock.called)
-        rating = models.Status.objects.select_subclasses().first()
-        self.assertEqual(rating.book, self.book)
+        rating = models.ReviewRating.objects.first()
+        self.assertEqual(rating.book, book)
         self.assertEqual(rating.rating, 3.0)
 
     def test_create_list(self):

From aa3cdee73119530cdba51beb052f260369f52484 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 06:43:43 -0700
Subject: [PATCH 1028/1285] Fixes invalid url breaking change password flow

---
 bookwyrm/templates/preferences/change_password.html | 2 +-
 bookwyrm/urls.py                                    | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/preferences/change_password.html b/bookwyrm/templates/preferences/change_password.html
index ab8be717..9f5b7e8b 100644
--- a/bookwyrm/templates/preferences/change_password.html
+++ b/bookwyrm/templates/preferences/change_password.html
@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block panel %}
-<form name="edit-profile" action="/change-password/" method="post" enctype="multipart/form-data">
+<form name="edit-profile" action="{% url 'prefs-password' %}" method="post" enctype="multipart/form-data">
     {% csrf_token %}
     <div class="block">
         <label class="label" for="id_password">{% trans "New password:" %}</label>
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 24c80b04..99e51ff3 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -224,7 +224,11 @@ urlpatterns = [
     re_path(r"^hide-goal/?$", views.hide_goal, name="hide-goal"),
     # preferences
     re_path(r"^preferences/profile/?$", views.EditUser.as_view(), name="prefs-profile"),
-    re_path(r"^preferences/password/?$", views.ChangePassword.as_view()),
+    re_path(
+        r"^preferences/password/?$",
+        views.ChangePassword.as_view(),
+        name="prefs-password",
+    ),
     re_path(r"^preferences/block/?$", views.Block.as_view()),
     re_path(r"^block/(?P<user_id>\d+)/?$", views.Block.as_view()),
     re_path(r"^unblock/(?P<user_id>\d+)/?$", views.unblock),

From 454dd25681af9de9e08ddc021eb29c25ec1ab2f8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 07:49:34 -0700
Subject: [PATCH 1029/1285] Only make notification count red for mentions

---
 bookwyrm/models/user.py        | 13 +++++++++++++
 bookwyrm/static/js/bookwyrm.js |  2 ++
 bookwyrm/templates/layout.html |  7 +++++--
 bookwyrm/views/updates.py      |  3 ++-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 3efbd6ac..25726468 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -150,6 +150,19 @@ class User(OrderedCollectionPageMixin, AbstractUser):
         """for consistent naming"""
         return not self.is_active
 
+    @property
+    def unread_notification_count(self):
+        """ count of notifications, for the templates """
+        return self.notification_set.filter(read=False).count()
+
+    @property
+    def has_unread_mentions(self):
+        """ whether any of the unread notifications are conversations """
+        return self.notification_set.filter(
+            read=False,
+            notification_type__in=["REPLY", "MENTION", "TAG"],
+        ).exists()
+
     activity_serializer = activitypub.Person
 
     @classmethod
diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index 485daf15..3659a20e 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -97,10 +97,12 @@ let BookWyrm = new class {
     updateCountElement(counter, data) {
         const currentCount = counter.innerText;
         const count = data.count;
+        const hasMentions = data.has_mentions;
 
         if (count != currentCount) {
             this.addRemoveClass(counter.closest('[data-poll-wrapper]'), 'is-hidden', count < 1);
             counter.innerText = count;
+            this.addRemoveClass(counter.closest('[data-poll-wrapper]'), 'is-danger', hasMentions);
         }
     }
 
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 84482cdf..770666e8 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -135,8 +135,11 @@
                                 <span class="is-sr-only">{% trans "Notifications" %}</span>
                             </span>
                         </span>
-                        <span class="{% if not request.user|notification_count %}is-hidden {% endif %}tag is-danger is-medium transition-x" data-poll-wrapper>
-                            <span data-poll="notifications">{{ request.user | notification_count }}</span>
+                        <span
+                            class="{% if not request.user.unread_notification_count %}is-hidden {% elif request.user.has_unread_mentions %}is-danger {% endif %}tag is-medium transition-x"
+                            data-poll-wrapper
+                        >
+                            <span data-poll="notifications">{{ request.user.unread_notification_count }}</span>
                         </span>
                     </a>
                 </div>
diff --git a/bookwyrm/views/updates.py b/bookwyrm/views/updates.py
index 34902272..72614562 100644
--- a/bookwyrm/views/updates.py
+++ b/bookwyrm/views/updates.py
@@ -10,7 +10,8 @@ def get_notification_count(request):
     """any notifications waiting?"""
     return JsonResponse(
         {
-            "count": request.user.notification_set.filter(read=False).count(),
+            "count": request.user.unread_notification_count,
+            "has_mentions": request.user.has_unread_mentions,
         }
     )
 

From 2867d703ccc32dada6f9e85c815e3c04354a9788 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 07:57:38 -0700
Subject: [PATCH 1030/1285] Fixes python formatting

---
 bookwyrm/models/user.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 25726468..2c5bef4a 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -152,12 +152,12 @@ class User(OrderedCollectionPageMixin, AbstractUser):
 
     @property
     def unread_notification_count(self):
-        """ count of notifications, for the templates """
+        """count of notifications, for the templates"""
         return self.notification_set.filter(read=False).count()
 
     @property
     def has_unread_mentions(self):
-        """ whether any of the unread notifications are conversations """
+        """whether any of the unread notifications are conversations"""
         return self.notification_set.filter(
             read=False,
             notification_type__in=["REPLY", "MENTION", "TAG"],

From d2355fef96e8ea517815a2163239fb70236164d4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 08:23:02 -0700
Subject: [PATCH 1031/1285] Consistent display on followers/following pages

---
 bookwyrm/templates/user/followers.html | 2 +-
 bookwyrm/templates/user/following.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/user/followers.html b/bookwyrm/templates/user/followers.html
index b294db90..2a7ccd1e 100644
--- a/bookwyrm/templates/user/followers.html
+++ b/bookwyrm/templates/user/followers.html
@@ -25,7 +25,7 @@
         </div>
     </div>
     {% endfor %}
-    {% if not followers.count %}
+    {% if not followers %}
     <div>{% blocktrans with username=user.display_name %}{{ username }} has no followers{% endblocktrans %}</div>
     {% endif %}
 </div>
diff --git a/bookwyrm/templates/user/following.html b/bookwyrm/templates/user/following.html
index 38c01ad2..b41d5126 100644
--- a/bookwyrm/templates/user/following.html
+++ b/bookwyrm/templates/user/following.html
@@ -20,12 +20,12 @@
             </a>
             ({{ follower.username }})
         </div>
-        <div class="column">
+        <div class="column is-narrow">
             {% include 'snippets/follow_button.html' with user=follower %}
         </div>
     </div>
     {% endfor %}
-    {% if not following.count %}
+    {% if not following %}
     <div>{% blocktrans with username=user|username %}{{ username }} isn't following any users{% endblocktrans %}</div>
     {% endif %}
 </div>

From 862ef835366bb716a47f8716c9713ed301e51b36 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 08:40:47 -0700
Subject: [PATCH 1032/1285] Move user templates into more subdirectories

---
 bookwyrm/templates/goal.html                           |  2 +-
 .../templates/user/{user_layout.html => layout.html}   |  0
 .../templates/user/{ => relationships}/followers.html  |  2 +-
 .../templates/user/{ => relationships}/following.html  |  2 +-
 bookwyrm/templates/user/{ => shelf}/books_header.html  |  0
 .../templates/user/{ => shelf}/create_shelf_form.html  |  0
 .../templates/user/{ => shelf}/edit_shelf_form.html    |  0
 bookwyrm/templates/user/{ => shelf}/shelf.html         | 10 +++++-----
 bookwyrm/templates/user/user.html                      |  8 ++++----
 bookwyrm/views/shelf.py                                |  2 +-
 bookwyrm/views/user.py                                 |  4 ++--
 11 files changed, 15 insertions(+), 15 deletions(-)
 rename bookwyrm/templates/user/{user_layout.html => layout.html} (100%)
 rename bookwyrm/templates/user/{ => relationships}/followers.html (96%)
 rename bookwyrm/templates/user/{ => relationships}/following.html (96%)
 rename bookwyrm/templates/user/{ => shelf}/books_header.html (100%)
 rename bookwyrm/templates/user/{ => shelf}/create_shelf_form.html (100%)
 rename bookwyrm/templates/user/{ => shelf}/edit_shelf_form.html (100%)
 rename bookwyrm/templates/user/{ => shelf}/shelf.html (94%)

diff --git a/bookwyrm/templates/goal.html b/bookwyrm/templates/goal.html
index 32b5062d..22aba08e 100644
--- a/bookwyrm/templates/goal.html
+++ b/bookwyrm/templates/goal.html
@@ -1,4 +1,4 @@
-{% extends 'user/user_layout.html' %}
+{% extends 'user/layout.html' %}
 {% load i18n %}
 
 {% block header %}
diff --git a/bookwyrm/templates/user/user_layout.html b/bookwyrm/templates/user/layout.html
similarity index 100%
rename from bookwyrm/templates/user/user_layout.html
rename to bookwyrm/templates/user/layout.html
diff --git a/bookwyrm/templates/user/followers.html b/bookwyrm/templates/user/relationships/followers.html
similarity index 96%
rename from bookwyrm/templates/user/followers.html
rename to bookwyrm/templates/user/relationships/followers.html
index 2a7ccd1e..c69416dc 100644
--- a/bookwyrm/templates/user/followers.html
+++ b/bookwyrm/templates/user/relationships/followers.html
@@ -1,4 +1,4 @@
-{% extends 'user/user_layout.html' %}
+{% extends 'user/layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
 
diff --git a/bookwyrm/templates/user/following.html b/bookwyrm/templates/user/relationships/following.html
similarity index 96%
rename from bookwyrm/templates/user/following.html
rename to bookwyrm/templates/user/relationships/following.html
index b41d5126..a1feeb76 100644
--- a/bookwyrm/templates/user/following.html
+++ b/bookwyrm/templates/user/relationships/following.html
@@ -1,4 +1,4 @@
-{% extends 'user/user_layout.html' %}
+{% extends 'user/layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
 
diff --git a/bookwyrm/templates/user/books_header.html b/bookwyrm/templates/user/shelf/books_header.html
similarity index 100%
rename from bookwyrm/templates/user/books_header.html
rename to bookwyrm/templates/user/shelf/books_header.html
diff --git a/bookwyrm/templates/user/create_shelf_form.html b/bookwyrm/templates/user/shelf/create_shelf_form.html
similarity index 100%
rename from bookwyrm/templates/user/create_shelf_form.html
rename to bookwyrm/templates/user/shelf/create_shelf_form.html
diff --git a/bookwyrm/templates/user/edit_shelf_form.html b/bookwyrm/templates/user/shelf/edit_shelf_form.html
similarity index 100%
rename from bookwyrm/templates/user/edit_shelf_form.html
rename to bookwyrm/templates/user/shelf/edit_shelf_form.html
diff --git a/bookwyrm/templates/user/shelf.html b/bookwyrm/templates/user/shelf/shelf.html
similarity index 94%
rename from bookwyrm/templates/user/shelf.html
rename to bookwyrm/templates/user/shelf/shelf.html
index 33616258..93f0c15f 100644
--- a/bookwyrm/templates/user/shelf.html
+++ b/bookwyrm/templates/user/shelf/shelf.html
@@ -1,16 +1,16 @@
-{% extends 'user/user_layout.html' %}
+{% extends 'user/layout.html' %}
 {% load bookwyrm_tags %}
 {% load humanize %}
 {% load i18n %}
 
 {% block title %}
-{% include 'user/books_header.html' %}
+{% include 'user/shelf/books_header.html' %}
 {% endblock %}
 
 {% block header %}
 <header class="columns">
     <h1 class="title">
-        {% include 'user/books_header.html' %}
+        {% include 'user/shelf/books_header.html' %}
     </h1>
 </header>
 {% endblock %}
@@ -41,7 +41,7 @@
 </div>
 
 <div class="block">
-    {% include 'user/create_shelf_form.html' with controls_text='create-shelf-form' %}
+    {% include 'user/shelf/create_shelf_form.html' with controls_text='create-shelf-form' %}
 </div>
 
 <div class="block columns is-mobile">
@@ -62,7 +62,7 @@
 </div>
 
 <div class="block">
-    {% include 'user/edit_shelf_form.html' with controls_text="edit-shelf-form" %}
+    {% include 'user/shelf/edit_shelf_form.html' with controls_text="edit-shelf-form" %}
 </div>
 
 <div class="block">
diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index a97d26ab..fead8fcf 100644
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -1,4 +1,4 @@
-{% extends 'user/user_layout.html' %}
+{% extends 'user/layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
 
@@ -11,7 +11,7 @@
     </div>
     {% if is_self %}
     <div class="column is-narrow">
-        <a href="/preferences/profile">
+        <a href="{% url 'prefs-profile' %}">
             <span class="icon icon-pencil" title="Edit profile">
                 <span class="is-sr-only">{% trans "Edit profile" %}</span>
             </span>
@@ -25,7 +25,7 @@
 {% if user.bookwyrm_user %}
 <div class="block">
     <h2 class="title">
-        {% include 'user/books_header.html' %}
+        {% include 'user/shelf/books_header.html' %}
     </h2>
     <div class="columns">
         {% for shelf in shelves %}
@@ -56,7 +56,7 @@
 {% elif user == request.user %}
 <div class="block">
     {% now 'Y' as year %}
-    <h2 class="title is-4"><a href="{{ user.local_path }}/goal/{{ year }}">{% blocktrans %}Set a reading goal for {{ year }}{% endblocktrans %}</a></h2>
+    <h2 class="title is-4"><a href="{% url 'user-goal' user.localname year %}">{% blocktrans %}Set a reading goal for {{ year }}{% endblocktrans %}</a></h2>
 </div>
 {% endif %}
 
diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index 9bcf0a4a..ca05ec1e 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -68,7 +68,7 @@ class Shelf(View):
             "books": paginated.get_page(request.GET.get("page")),
         }
 
-        return TemplateResponse(request, "user/shelf.html", data)
+        return TemplateResponse(request, "user/shelf/shelf.html", data)
 
     @method_decorator(login_required, name="dispatch")
     # pylint: disable=unused-argument
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index d394c1d7..af31fd47 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -112,7 +112,7 @@ class Followers(View):
             "is_self": request.user.id == user.id,
             "followers": paginated.page(request.GET.get("page", 1)),
         }
-        return TemplateResponse(request, "user/followers.html", data)
+        return TemplateResponse(request, "user/relationships/followers.html", data)
 
 
 class Following(View):
@@ -138,7 +138,7 @@ class Following(View):
             "is_self": request.user.id == user.id,
             "following": paginated.page(request.GET.get("page", 1)),
         }
-        return TemplateResponse(request, "user/following.html", data)
+        return TemplateResponse(request, "user/relationships/following.html", data)
 
 
 @method_decorator(login_required, name="dispatch")

From e4cecf2874103890be40f376cb399e2e21e7036c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 09:02:14 -0700
Subject: [PATCH 1033/1285] Coherent logic on which tabs show in the user page

---
 bookwyrm/templates/user/layout.html      | 4 ++--
 bookwyrm/templates/user/lists.html       | 2 +-
 bookwyrm/templates/user/shelf/shelf.html | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html
index 0c3e94e3..0f04f628 100644
--- a/bookwyrm/templates/user/layout.html
+++ b/bookwyrm/templates/user/layout.html
@@ -41,8 +41,8 @@
     </div>
     {% endif %}
 </div>
+{% block tabs %}
 {% with user|username as username %}
-{% if 'user/'|add:username|add:'/books' not in request.path and 'user/'|add:username|add:'/shelf' not in request.path %}
 <nav class="tabs">
     <ul>
         {% url 'user-feed' user|username as url %}
@@ -70,8 +70,8 @@
         {% endif %}
     </ul>
 </nav>
-{% endif %}
 {% endwith %}
+{% endblock %}
 
 {% block panel %}{% endblock %}
 
diff --git a/bookwyrm/templates/user/lists.html b/bookwyrm/templates/user/lists.html
index b2fd9eef..aa8ad7fb 100644
--- a/bookwyrm/templates/user/lists.html
+++ b/bookwyrm/templates/user/lists.html
@@ -1,4 +1,4 @@
-{% extends 'user/user_layout.html' %}
+{% extends 'user/layout.html' %}
 {% load i18n %}
 
 {% block header %}
diff --git a/bookwyrm/templates/user/shelf/shelf.html b/bookwyrm/templates/user/shelf/shelf.html
index 93f0c15f..639ab502 100644
--- a/bookwyrm/templates/user/shelf/shelf.html
+++ b/bookwyrm/templates/user/shelf/shelf.html
@@ -15,7 +15,7 @@
 </header>
 {% endblock %}
 
-{% block panel %}
+{% block tabs %}
 <div class="block columns">
     <div class="column">
         <div class="tabs">
@@ -39,7 +39,9 @@
     </div>
     {% endif %}
 </div>
+{% endblock %}
 
+{% block panel %}
 <div class="block">
     {% include 'user/shelf/create_shelf_form.html' with controls_text='create-shelf-form' %}
 </div>

From 418e656aea8d5faf1b84afe27337891324f22f0c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 09:17:46 -0700
Subject: [PATCH 1034/1285] Uses layout for followers/following page

---
 bookwyrm/templates/user/layout.html           |  6 +++-
 .../user/relationships/followers.html         | 30 ++++---------------
 .../user/relationships/following.html         | 30 ++++---------------
 .../templates/user/relationships/layout.html  | 29 ++++++++++++++++++
 bookwyrm/views/user.py                        |  6 ++--
 5 files changed, 47 insertions(+), 54 deletions(-)
 create mode 100644 bookwyrm/templates/user/relationships/layout.html

diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html
index 0f04f628..dcdf7ccf 100644
--- a/bookwyrm/templates/user/layout.html
+++ b/bookwyrm/templates/user/layout.html
@@ -7,7 +7,11 @@
 
 {% block content %}
 <header class="block">
-    {% block header %}{% endblock %}
+    {% block header %}
+    <h1 class="title">
+        {% trans "User Profile" %}
+    </h1>
+    {% endblock %}
 </header>
 
 {# user bio #}
diff --git a/bookwyrm/templates/user/relationships/followers.html b/bookwyrm/templates/user/relationships/followers.html
index c69416dc..223f38c7 100644
--- a/bookwyrm/templates/user/relationships/followers.html
+++ b/bookwyrm/templates/user/relationships/followers.html
@@ -1,34 +1,14 @@
-{% extends 'user/layout.html' %}
+{% extends 'user/relationships/layout.html' %}
 {% load i18n %}
-{% load bookwyrm_tags %}
 
 {% block header %}
 <h1 class="title">
-    {% trans "User Profile" %}
+    {% trans "Followers" %}
 </h1>
 {% endblock %}
 
-{% block panel %}
-<div class="block">
-    <h2 class="title">{% trans "Followers" %}</h2>
-    {% for follower in followers %}
-    <div class="block columns">
-        <div class="column">
-            <a href="{{ follower.local_path }}">
-                {% include 'snippets/avatar.html' with user=follower %}
-                {{ follower.display_name }}
-            </a>
-            ({{ follower.username }})
-        </div>
-        <div class="column is-narrow">
-            {% include 'snippets/follow_button.html' with user=follower %}
-        </div>
-    </div>
-    {% endfor %}
-    {% if not followers %}
-    <div>{% blocktrans with username=user.display_name %}{{ username }} has no followers{% endblocktrans %}</div>
-    {% endif %}
+{% block nullstate %}
+<div>
+    {% blocktrans with username=user.display_name %}{{ username }} has no followers{% endblocktrans %}
 </div>
-
-{% include 'snippets/pagination.html' with page=followers path=request.path %}
 {% endblock %}
diff --git a/bookwyrm/templates/user/relationships/following.html b/bookwyrm/templates/user/relationships/following.html
index a1feeb76..5689bc61 100644
--- a/bookwyrm/templates/user/relationships/following.html
+++ b/bookwyrm/templates/user/relationships/following.html
@@ -1,34 +1,14 @@
-{% extends 'user/layout.html' %}
+{% extends 'user/relationships/layout.html' %}
 {% load i18n %}
-{% load bookwyrm_tags %}
 
 {% block header %}
 <h1 class="title">
-    {% trans "User Profile" %}
+    {% trans "Following" %}
 </h1>
 {% endblock %}
 
-{% block panel %}
-<div class="block">
-    <h2 class="title">{% trans "Following" %}</h2>
-    {% for follower in user.following.all %}
-    <div class="block columns">
-        <div class="column">
-            <a href="{{ follower.local_path }}">
-                {% include 'snippets/avatar.html' with user=follower %}
-                {{ follower.display_name }}
-            </a>
-            ({{ follower.username }})
-        </div>
-        <div class="column is-narrow">
-            {% include 'snippets/follow_button.html' with user=follower %}
-        </div>
-    </div>
-    {% endfor %}
-    {% if not following %}
-    <div>{% blocktrans with username=user|username %}{{ username }} isn't following any users{% endblocktrans %}</div>
-    {% endif %}
+{% block nullstate %}
+<div>
+    {% blocktrans with username=user.display_name %}{{ username }} isn't following any users{% endblocktrans %}
 </div>
-
-{% include 'snippets/pagination.html' with page=following path=request.path %}
 {% endblock %}
diff --git a/bookwyrm/templates/user/relationships/layout.html b/bookwyrm/templates/user/relationships/layout.html
new file mode 100644
index 00000000..ab38e662
--- /dev/null
+++ b/bookwyrm/templates/user/relationships/layout.html
@@ -0,0 +1,29 @@
+{% extends 'user/layout.html' %}
+{% load i18n %}
+{% load bookwyrm_tags %}
+
+{% block panel %}
+<div class="block">
+    {% for follow in follow_list %}
+    <div class="block columns">
+        <div class="column">
+            <a href="{{ follower.local_path }}">
+                {% include 'snippets/avatar.html' with user=follow %}
+                {{ follow.display_name }}
+            </a>
+            ({{ follow.username }})
+        </div>
+        <div class="column is-narrow">
+            {% include 'snippets/follow_button.html' with user=follow %}
+        </div>
+    </div>
+    {% endfor %}
+
+    {% if not follow_list %}
+        {% block nullstate %}
+        {% endblock %}
+    {% endif %}
+</div>
+
+{% include 'snippets/pagination.html' with page=follow_list path=request.path %}
+{% endblock %}
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index af31fd47..5584ce99 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -110,7 +110,7 @@ class Followers(View):
         data = {
             "user": user,
             "is_self": request.user.id == user.id,
-            "followers": paginated.page(request.GET.get("page", 1)),
+            "follow_list": paginated.page(request.GET.get("page", 1)),
         }
         return TemplateResponse(request, "user/relationships/followers.html", data)
 
@@ -132,11 +132,11 @@ class Following(View):
         if is_api_request(request):
             return ActivitypubResponse(user.to_following_activity(**request.GET))
 
-        paginated = Paginator(user.followers.all(), PAGE_LENGTH)
+        paginated = Paginator(user.following.all(), PAGE_LENGTH)
         data = {
             "user": user,
             "is_self": request.user.id == user.id,
-            "following": paginated.page(request.GET.get("page", 1)),
+            "follow_list": paginated.page(request.GET.get("page", 1)),
         }
         return TemplateResponse(request, "user/relationships/following.html", data)
 

From b65d0d05c9f49c375f32f8252d33a091aac3f0aa Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 09:23:59 -0700
Subject: [PATCH 1035/1285] Tabs for relationship views

---
 bookwyrm/templates/user/layout.html             |  1 +
 .../templates/user/relationships/layout.html    | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html
index dcdf7ccf..661d8078 100644
--- a/bookwyrm/templates/user/layout.html
+++ b/bookwyrm/templates/user/layout.html
@@ -45,6 +45,7 @@
     </div>
     {% endif %}
 </div>
+
 {% block tabs %}
 {% with user|username as username %}
 <nav class="tabs">
diff --git a/bookwyrm/templates/user/relationships/layout.html b/bookwyrm/templates/user/relationships/layout.html
index ab38e662..e83e5347 100644
--- a/bookwyrm/templates/user/relationships/layout.html
+++ b/bookwyrm/templates/user/relationships/layout.html
@@ -2,6 +2,23 @@
 {% load i18n %}
 {% load bookwyrm_tags %}
 
+{% block tabs %}
+{% with user|username as username %}
+<nav class="tabs">
+    <ul>
+        {% url 'user-following' user|username as url %}
+        <li{% if url == request.path or url == request.path|add:'/' %} class="is-active"{% endif %}>
+            <a href="{{ url }}">{% trans "Following" %}</a>
+        </li>
+        {% url 'user-followers' user|username as url %}
+        <li{% if url == request.path or url == request.path|add:'/' %} class="is-active"{% endif %}>
+            <a href="{{ url }}">{% trans "Followers" %}</a>
+        </li>
+    </ul>
+</nav>
+{% endwith %}
+{% endblock %}
+
 {% block panel %}
 <div class="block">
     {% for follow in follow_list %}

From d810d1bb8c7a149488a60ab53f1621f24caab003 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 09:26:02 -0700
Subject: [PATCH 1036/1285] Remove duplicate check for user blocks

---
 bookwyrm/views/user.py | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index 5584ce99..1cf0b703 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -17,7 +17,7 @@ from bookwyrm import forms, models
 from bookwyrm.activitypub import ActivitypubResponse
 from bookwyrm.settings import PAGE_LENGTH
 from .helpers import get_user_from_username, is_api_request
-from .helpers import is_blocked, privacy_filter
+from .helpers import privacy_filter
 
 
 # pylint: disable= no-self-use
@@ -31,10 +31,6 @@ class User(View):
         except models.User.DoesNotExist:
             return HttpResponseNotFound()
 
-        # make sure we're not blocked
-        if is_blocked(request.user, user):
-            return HttpResponseNotFound()
-
         if is_api_request(request):
             # we have a json request
             return ActivitypubResponse(user.to_activity())
@@ -99,10 +95,6 @@ class Followers(View):
         except models.User.DoesNotExist:
             return HttpResponseNotFound()
 
-        # make sure we're not blocked
-        if is_blocked(request.user, user):
-            return HttpResponseNotFound()
-
         if is_api_request(request):
             return ActivitypubResponse(user.to_followers_activity(**request.GET))
 
@@ -125,10 +117,6 @@ class Following(View):
         except models.User.DoesNotExist:
             return HttpResponseNotFound()
 
-        # make sure we're not blocked
-        if is_blocked(request.user, user):
-            return HttpResponseNotFound()
-
         if is_api_request(request):
             return ActivitypubResponse(user.to_following_activity(**request.GET))
 

From 4dacf4df3a42f24b28a3a7649cd1fb4cdad97e3a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 09:33:36 -0700
Subject: [PATCH 1037/1285] Refactor get_user_from_username to raise 404
 directly

---
 bookwyrm/tests/views/test_helpers.py |  3 ++-
 bookwyrm/views/feed.py               |  6 +++---
 bookwyrm/views/follow.py             | 20 ++++----------------
 bookwyrm/views/helpers.py            |  9 ++++++++-
 bookwyrm/views/shelf.py              |  5 +----
 bookwyrm/views/user.py               | 16 +++-------------
 6 files changed, 21 insertions(+), 38 deletions(-)

diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py
index 0dddd2a1..ab5abed0 100644
--- a/bookwyrm/tests/views/test_helpers.py
+++ b/bookwyrm/tests/views/test_helpers.py
@@ -3,6 +3,7 @@ import json
 from unittest.mock import patch
 import pathlib
 from django.db.models import Q
+from django.http import Http404
 from django.test import TestCase
 from django.test.client import RequestFactory
 import responses
@@ -67,7 +68,7 @@ class ViewsHelpers(TestCase):
             views.helpers.get_user_from_username(self.local_user, "mouse@local.com"),
             self.local_user,
         )
-        with self.assertRaises(models.User.DoesNotExist):
+        with self.assertRaises(Http404):
             views.helpers.get_user_from_username(self.local_user, "mojfse@example.com")
 
     def test_is_api_request(self, _):
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index 98f365ea..a03d6b4c 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -2,7 +2,7 @@
 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
 from django.db.models import Q
-from django.http import HttpResponseNotFound
+from django.http import HttpResponseNotFound, Http404
 from django.template.response import TemplateResponse
 from django.utils import timezone
 from django.utils.decorators import method_decorator
@@ -62,7 +62,7 @@ class DirectMessage(View):
         if username:
             try:
                 user = get_user_from_username(request.user, username)
-            except models.User.DoesNotExist:
+            except Http404:
                 pass
         if user:
             queryset = queryset.filter(Q(user=user) | Q(mention_users=user))
@@ -94,7 +94,7 @@ class Status(View):
             status = models.Status.objects.select_subclasses().get(
                 id=status_id, deleted=False
             )
-        except (ValueError, models.Status.DoesNotExist, models.User.DoesNotExist):
+        except (ValueError, models.Status.DoesNotExist):
             return HttpResponseNotFound()
 
         # the url should have the poster's username in it
diff --git a/bookwyrm/views/follow.py b/bookwyrm/views/follow.py
index 09c2d53a..c3336a94 100644
--- a/bookwyrm/views/follow.py
+++ b/bookwyrm/views/follow.py
@@ -14,10 +14,7 @@ from .helpers import get_user_from_username
 def follow(request):
     """follow another user, here or abroad"""
     username = request.POST["user"]
-    try:
-        to_follow = get_user_from_username(request.user, username)
-    except models.User.DoesNotExist:
-        return HttpResponseBadRequest()
+    to_follow = get_user_from_username(request.user, username)
 
     try:
         models.UserFollowRequest.objects.create(
@@ -35,10 +32,7 @@ def follow(request):
 def unfollow(request):
     """unfollow a user"""
     username = request.POST["user"]
-    try:
-        to_unfollow = get_user_from_username(request.user, username)
-    except models.User.DoesNotExist:
-        return HttpResponseBadRequest()
+    to_unfollow = get_user_from_username(request.user, username)
 
     try:
         models.UserFollows.objects.get(
@@ -63,10 +57,7 @@ def unfollow(request):
 def accept_follow_request(request):
     """a user accepts a follow request"""
     username = request.POST["user"]
-    try:
-        requester = get_user_from_username(request.user, username)
-    except models.User.DoesNotExist:
-        return HttpResponseBadRequest()
+    requester = get_user_from_username(request.user, username)
 
     try:
         follow_request = models.UserFollowRequest.objects.get(
@@ -85,10 +76,7 @@ def accept_follow_request(request):
 def delete_follow_request(request):
     """a user rejects a follow request"""
     username = request.POST["user"]
-    try:
-        requester = get_user_from_username(request.user, username)
-    except models.User.DoesNotExist:
-        return HttpResponseBadRequest()
+    requester = get_user_from_username(request.user, username)
 
     try:
         follow_request = models.UserFollowRequest.objects.get(
diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index 5a8617fc..31e5f031 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -3,6 +3,7 @@ import re
 from requests import HTTPError
 from django.core.exceptions import FieldError
 from django.db.models import Count, Max, Q
+from django.http import Http404
 
 from bookwyrm import activitypub, models
 from bookwyrm.connectors import ConnectorException, get_data
@@ -12,11 +13,17 @@ from bookwyrm.utils import regex
 
 def get_user_from_username(viewer, username):
     """helper function to resolve a localname or a username to a user"""
-    # raises DoesNotExist if user is now found
+    # raises 404 if the user isn't found
     try:
         return models.User.viewer_aware_objects(viewer).get(localname=username)
     except models.User.DoesNotExist:
+        pass
+
+    # if the localname didn't match, try the username
+    try:
         return models.User.viewer_aware_objects(viewer).get(username=username)
+    except models.User.DoesNotExist:
+        raise Http404()
 
 
 def is_api_request(request):
diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index ca05ec1e..94507d46 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -25,10 +25,7 @@ class Shelf(View):
 
     def get(self, request, username, shelf_identifier=None):
         """display a shelf"""
-        try:
-            user = get_user_from_username(request.user, username)
-        except models.User.DoesNotExist:
-            return HttpResponseNotFound()
+        user = get_user_from_username(request.user, username)
 
         shelves = privacy_filter(request.user, user.shelf_set)
 
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index 1cf0b703..3f77e962 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -6,7 +6,6 @@ from PIL import Image
 from django.contrib.auth.decorators import login_required
 from django.core.files.base import ContentFile
 from django.core.paginator import Paginator
-from django.http import HttpResponseNotFound
 from django.shortcuts import redirect
 from django.template.response import TemplateResponse
 from django.utils import timezone
@@ -26,10 +25,7 @@ class User(View):
 
     def get(self, request, username):
         """profile page for a user"""
-        try:
-            user = get_user_from_username(request.user, username)
-        except models.User.DoesNotExist:
-            return HttpResponseNotFound()
+        user = get_user_from_username(request.user, username)
 
         if is_api_request(request):
             # we have a json request
@@ -90,10 +86,7 @@ class Followers(View):
 
     def get(self, request, username):
         """list of followers"""
-        try:
-            user = get_user_from_username(request.user, username)
-        except models.User.DoesNotExist:
-            return HttpResponseNotFound()
+        user = get_user_from_username(request.user, username)
 
         if is_api_request(request):
             return ActivitypubResponse(user.to_followers_activity(**request.GET))
@@ -112,10 +105,7 @@ class Following(View):
 
     def get(self, request, username):
         """list of followers"""
-        try:
-            user = get_user_from_username(request.user, username)
-        except models.User.DoesNotExist:
-            return HttpResponseNotFound()
+        user = get_user_from_username(request.user, username)
 
         if is_api_request(request):
             return ActivitypubResponse(user.to_following_activity(**request.GET))

From 62884c61115648d9f27222044291687f5223d579 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 09:48:10 -0700
Subject: [PATCH 1038/1285] Show mutual counts instead of totals for other
 users

---
 .../templates/user/relationships/layout.html     |  8 ++++----
 bookwyrm/templates/user/user_preview.html        | 16 ++++++++++++++--
 bookwyrm/templatetags/bookwyrm_tags.py           |  7 +++++++
 3 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/templates/user/relationships/layout.html b/bookwyrm/templates/user/relationships/layout.html
index e83e5347..5baaf1f9 100644
--- a/bookwyrm/templates/user/relationships/layout.html
+++ b/bookwyrm/templates/user/relationships/layout.html
@@ -6,14 +6,14 @@
 {% with user|username as username %}
 <nav class="tabs">
     <ul>
-        {% url 'user-following' user|username as url %}
-        <li{% if url == request.path or url == request.path|add:'/' %} class="is-active"{% endif %}>
-            <a href="{{ url }}">{% trans "Following" %}</a>
-        </li>
         {% url 'user-followers' user|username as url %}
         <li{% if url == request.path or url == request.path|add:'/' %} class="is-active"{% endif %}>
             <a href="{{ url }}">{% trans "Followers" %}</a>
         </li>
+        {% url 'user-following' user|username as url %}
+        <li{% if url == request.path or url == request.path|add:'/' %} class="is-active"{% endif %}>
+            <a href="{{ url }}">{% trans "Following" %}</a>
+        </li>
     </ul>
 </nav>
 {% endwith %}
diff --git a/bookwyrm/templates/user/user_preview.html b/bookwyrm/templates/user/user_preview.html
index c641c58f..89b545ce 100644
--- a/bookwyrm/templates/user/user_preview.html
+++ b/bookwyrm/templates/user/user_preview.html
@@ -1,5 +1,6 @@
 {% load i18n %}
 {% load humanize %}
+{% load bookwyrm_tags %}
 
 <div class="media block">
     <div class="media-left">
@@ -12,8 +13,19 @@
         <p><a href="{{ user.remote_id }}">{{ user.username }}</a></p>
         <p>{% blocktrans with date=user.created_date|naturaltime %}Joined {{ date }}{% endblocktrans %}</p>
         <p>
-        <a href="{{ user.local_path }}/followers">{% blocktrans count counter=user.followers.count %}{{ counter }} follower{% plural %}{{ counter }} followers{% endblocktrans %}</a>,
-        <a href="{{ user.local_path }}/following">{% blocktrans with counter=user.following.count %}{{ counter }} following{% endblocktrans %}</a>
+            {% if is_self %}
+
+            <a href="{% url 'user-followers' user|username %}">{% blocktrans count counter=user.followers.count %}{{ counter }} follower{% plural %}{{ counter }} followers{% endblocktrans %}</a>,
+            <a href="{% url 'user-following' user|username %}">{% blocktrans with counter=user.following.count %}{{ counter }} following{% endblocktrans %}</a>
+
+            {% else %}
+
+            {% mutuals_count user as mutuals %}
+            <a href="{% url 'user-followers' user|username %}">
+                {% blocktrans with mutuals_display=mutuals|intcomma count counter=mutuals %}{{ mutuals_display }} follower you follow{% plural %}{{ mutuals_display }} followers you follow{% endblocktrans %}
+            </a>
+
+            {% endif %}
         </p>
     </div>
 </div>
diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index 2ed0cbc2..2697d3ce 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -235,3 +235,10 @@ def get_lang():
     """get current language, strip to the first two letters"""
     language = utils.translation.get_language()
     return language[0 : language.find("-")]
+
+
+@register.simple_tag(takes_context=True)
+def mutuals_count(context, user):
+    """how many users that you follow, follow them"""
+    viewer = context["request"].user
+    return user.followers.filter(id__in=viewer.following.all()).count()

From ca12359beebea3f9882ad94094f4d0c6e0a8f008 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 10:16:24 -0700
Subject: [PATCH 1039/1285] Fixes unit tests

---
 bookwyrm/tests/views/test_user.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py
index 3b431de1..244acda6 100644
--- a/bookwyrm/tests/views/test_user.py
+++ b/bookwyrm/tests/views/test_user.py
@@ -6,6 +6,7 @@ from PIL import Image
 from django.contrib.auth.models import AnonymousUser
 from django.core.files.base import ContentFile
 from django.core.files.uploadedfile import SimpleUploadedFile
+from django.http.response import Http404
 from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
@@ -76,8 +77,8 @@ class UserViews(TestCase):
         self.rat.blocks.add(self.local_user)
         with patch("bookwyrm.views.user.is_api_request") as is_api:
             is_api.return_value = False
-            result = view(request, "rat")
-        self.assertEqual(result.status_code, 404)
+            with self.assertRaises(Http404):
+                view(request, "rat")
 
     def test_followers_page(self):
         """there are so many views, this just makes sure it LOADS"""
@@ -105,8 +106,8 @@ class UserViews(TestCase):
         self.rat.blocks.add(self.local_user)
         with patch("bookwyrm.views.user.is_api_request") as is_api:
             is_api.return_value = False
-            result = view(request, "rat")
-        self.assertEqual(result.status_code, 404)
+            with self.assertRaises(Http404):
+                view(request, "rat")
 
     def test_following_page(self):
         """there are so many views, this just makes sure it LOADS"""
@@ -166,7 +167,6 @@ class UserViews(TestCase):
         self.assertEqual(self.local_user.name, "New Name")
         self.assertEqual(self.local_user.email, "wow@email.com")
 
-    # idk how to mock the upload form, got tired of triyng to make it work
     def test_edit_user_avatar(self):
         """use a form to update a user"""
         view = views.EditUser.as_view()

From e15d6654e3ec0b461e8955a1f005e5b53dc05673 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 10:42:27 -0700
Subject: [PATCH 1040/1285] Free text field for the site footer

---
 bookwyrm/management/commands/initdb.py         | 12 ++++++++++--
 .../0073_sitesettings_footer_item.py           | 18 ++++++++++++++++++
 bookwyrm/models/site.py                        |  9 +++++++++
 bookwyrm/templates/layout.html                 |  5 +++++
 bookwyrm/templates/settings/site.html          | 12 ++++++++----
 5 files changed, 50 insertions(+), 6 deletions(-)
 create mode 100644 bookwyrm/migrations/0073_sitesettings_footer_item.py

diff --git a/bookwyrm/management/commands/initdb.py b/bookwyrm/management/commands/initdb.py
index 9033249d..da7dac00 100644
--- a/bookwyrm/management/commands/initdb.py
+++ b/bookwyrm/management/commands/initdb.py
@@ -1,4 +1,5 @@
-from django.core.management.base import BaseCommand, CommandError
+""" What you need in the database to make it work """
+from django.core.management.base import BaseCommand
 from django.contrib.auth.models import Group, Permission
 from django.contrib.contenttypes.models import ContentType
 
@@ -7,12 +8,14 @@ from bookwyrm.settings import DOMAIN
 
 
 def init_groups():
+    """permission levels"""
     groups = ["admin", "moderator", "editor"]
     for group in groups:
         Group.objects.create(name=group)
 
 
 def init_permissions():
+    """ permissin types """
     permissions = [
         {
             "codename": "edit_instance_settings",
@@ -69,6 +72,7 @@ def init_permissions():
 
 
 def init_connectors():
+    """access book data sources"""
     Connector.objects.create(
         identifier=DOMAIN,
         name="Local",
@@ -130,7 +134,11 @@ def init_federated_servers():
 
 
 def init_settings():
-    SiteSettings.objects.create()
+    """ info about the instance """
+    SiteSettings.objects.create(
+        support_link="https://www.patreon.com/bookwyrm",
+        support_title="Patreon",
+    )
 
 
 class Command(BaseCommand):
diff --git a/bookwyrm/migrations/0073_sitesettings_footer_item.py b/bookwyrm/migrations/0073_sitesettings_footer_item.py
new file mode 100644
index 00000000..4aa8384f
--- /dev/null
+++ b/bookwyrm/migrations/0073_sitesettings_footer_item.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2 on 2021-04-30 17:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0072_remove_work_default_edition"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="sitesettings",
+            name="footer_item",
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]
diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py
index 193cffb7..2c5a2164 100644
--- a/bookwyrm/models/site.py
+++ b/bookwyrm/models/site.py
@@ -19,19 +19,28 @@ class SiteSettings(models.Model):
         max_length=150, default="Social Reading and Reviewing"
     )
     instance_description = models.TextField(default="This instance has no description.")
+
+    # about page
     registration_closed_text = models.TextField(
         default="Contact an administrator to get an invite"
     )
     code_of_conduct = models.TextField(default="Add a code of conduct here.")
     privacy_policy = models.TextField(default="Add a privacy policy here.")
+
+    # registration
     allow_registration = models.BooleanField(default=True)
     allow_invite_requests = models.BooleanField(default=True)
+
+    # images
     logo = models.ImageField(upload_to="logos/", null=True, blank=True)
     logo_small = models.ImageField(upload_to="logos/", null=True, blank=True)
     favicon = models.ImageField(upload_to="logos/", null=True, blank=True)
+
+    # footer
     support_link = models.CharField(max_length=255, null=True, blank=True)
     support_title = models.CharField(max_length=100, null=True, blank=True)
     admin_email = models.EmailField(max_length=255, null=True, blank=True)
+    footer_item = models.TextField(null=True, blank=True)
 
     @classmethod
     def get(cls):
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 84482cdf..104b5a7e 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -200,6 +200,11 @@
                 </p>
                 {% endif %}
             </div>
+            {% if site.footer_item %}
+            <div class="column">
+                <p>{{ site.footer_item|safe }}</p>
+            </div>
+            {% endif %}
             {% if site.support_link %}
             <div class="column">
                 <span class="icon icon-heart"></span>
diff --git a/bookwyrm/templates/settings/site.html b/bookwyrm/templates/settings/site.html
index 28009e1a..1b942452 100644
--- a/bookwyrm/templates/settings/site.html
+++ b/bookwyrm/templates/settings/site.html
@@ -37,16 +37,16 @@
 
     <section class="block" id="images">
         <h2 class="title is-4">{% trans "Images" %}</h2>
-        <div class="field is-grouped">
-            <div class="control">
+        <div class="columns">
+            <div class="column">
                 <label class="label" for="id_logo">{% trans "Logo:" %}</label>
                 {{ site_form.logo }}
             </div>
-            <div class="control">
+            <div class="column">
                 <label class="label" for="id_logo_small">{% trans "Logo small:" %}</label>
                 {{ site_form.logo_small }}
             </div>
-            <div class="control">
+            <div class="column">
                 <label class="label" for="id_favicon">{% trans "Favicon:" %}</label>
                 {{ site_form.favicon }}
             </div>
@@ -69,6 +69,10 @@
             <label class="label" for="id_admin_email">{% trans "Admin email:" %}</label>
             {{ site_form.admin_email }}
         </div>
+        <div class="control">
+            <label class="label" for="id_footer_item">{% trans "Additional info:" %}</label>
+            {{ site_form.footer_item }}
+        </div>
     </section>
 
     <hr aria-hidden="true">

From f747babb4366948352a4b904e2c28bc1b3e47473 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 11:03:36 -0700
Subject: [PATCH 1041/1285] Changes column spacing

---
 bookwyrm/templates/layout.html | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 104b5a7e..d208989e 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -190,7 +190,7 @@
 <footer class="footer">
     <div class="container">
         <div class="columns">
-            <div class="column">
+            <div class="column is-one-fifth">
                 <p>
                     <a href="/about">{% trans "About this server" %}</a>
                 </p>
@@ -199,21 +199,26 @@
                     <a href="mailto:{{ site.admin_email }}">{% trans "Contact site admin" %}</a>
                 </p>
                 {% endif %}
+                <p>
+                    <a href="https://docs.joinbookwyrm.com/">{% trans "Documentation" %}</a>
+                </p>
+            </div>
+            <div class="column content is-two-fifth">
+                {% if site.support_link %}
+                <p>
+                    <span class="icon icon-heart"></span>
+                    {% blocktrans with site_name=site.name support_link=site.support_link support_title=site.support_title %}Support {{ site_name }} on <a href="{{ support_link }}" target="_blank">{{ support_title }}</a>{% endblocktrans %}
+                </p>
+                {% endif %}
+                <p>
+                    {% trans 'BookWyrm is open source software. You can contribute or report issues on <a href="https://github.com/mouse-reeve/bookwyrm">GitHub</a>.' %}
+                </p>
             </div>
             {% if site.footer_item %}
             <div class="column">
                 <p>{{ site.footer_item|safe }}</p>
             </div>
             {% endif %}
-            {% if site.support_link %}
-            <div class="column">
-                <span class="icon icon-heart"></span>
-                {% blocktrans with site_name=site.name support_link=site.support_link support_title=site.support_title %}Support {{ site_name }} on <a href="{{ support_link }}" target="_blank">{{ support_title }}</a>{% endblocktrans %}
-            </div>
-            {% endif %}
-            <div class="column">
-                {% trans 'BookWyrm is open source software. You can contribute or report issues on <a href="https://github.com/mouse-reeve/bookwyrm">GitHub</a>.' %}
-            </div>
         </div>
     </div>
 </footer>

From 00815b3105dd71bb1f3595c8538282bcf95dfc27 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 11:09:06 -0700
Subject: [PATCH 1042/1285] Python formatting

---
 bookwyrm/management/commands/initdb.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/management/commands/initdb.py b/bookwyrm/management/commands/initdb.py
index da7dac00..2e88ce5d 100644
--- a/bookwyrm/management/commands/initdb.py
+++ b/bookwyrm/management/commands/initdb.py
@@ -15,7 +15,7 @@ def init_groups():
 
 
 def init_permissions():
-    """ permissin types """
+    """permissin types"""
     permissions = [
         {
             "codename": "edit_instance_settings",
@@ -134,7 +134,7 @@ def init_federated_servers():
 
 
 def init_settings():
-    """ info about the instance """
+    """info about the instance"""
     SiteSettings.objects.create(
         support_link="https://www.patreon.com/bookwyrm",
         support_title="Patreon",

From b8fc4f99a3cdf911abe67731aac1defb1bfc9cdf Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 11:11:18 -0700
Subject: [PATCH 1043/1285] Don't calculate mutuals for logged out users

---
 bookwyrm/templates/user/user_preview.html | 2 +-
 bookwyrm/templatetags/bookwyrm_tags.py    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/user/user_preview.html b/bookwyrm/templates/user/user_preview.html
index 89b545ce..c450365b 100644
--- a/bookwyrm/templates/user/user_preview.html
+++ b/bookwyrm/templates/user/user_preview.html
@@ -18,7 +18,7 @@
             <a href="{% url 'user-followers' user|username %}">{% blocktrans count counter=user.followers.count %}{{ counter }} follower{% plural %}{{ counter }} followers{% endblocktrans %}</a>,
             <a href="{% url 'user-following' user|username %}">{% blocktrans with counter=user.following.count %}{{ counter }} following{% endblocktrans %}</a>
 
-            {% else %}
+            {% elif request.user.is_authenticated %}
 
             {% mutuals_count user as mutuals %}
             <a href="{% url 'user-followers' user|username %}">
diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index 2697d3ce..eda3d102 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -241,4 +241,6 @@ def get_lang():
 def mutuals_count(context, user):
     """how many users that you follow, follow them"""
     viewer = context["request"].user
+    if not viewer.is_authenticated:
+        return None
     return user.followers.filter(id__in=viewer.following.all()).count()

From 4b53342fd208382d2005d95f80a3496e1c328a78 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 11:26:02 -0700
Subject: [PATCH 1044/1285] Fixes mock in unit test

---
 bookwyrm/tests/views/test_user.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py
index 244acda6..3fa78e35 100644
--- a/bookwyrm/tests/views/test_user.py
+++ b/bookwyrm/tests/views/test_user.py
@@ -135,8 +135,8 @@ class UserViews(TestCase):
         self.rat.blocks.add(self.local_user)
         with patch("bookwyrm.views.user.is_api_request") as is_api:
             is_api.return_value = False
-            result = view(request, "rat")
-        self.assertEqual(result.status_code, 404)
+            with self.assertRaises(Http404):
+                view(request, "rat")
 
     def test_edit_user_page(self):
         """there are so many views, this just makes sure it LOADS"""

From 0d7ffbc1753c78633cd36133d9d68b9d0e28758b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 11:34:59 -0700
Subject: [PATCH 1045/1285] Hide user status tabs when there are none

---
 bookwyrm/templates/book/book.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index 98006184..889a031e 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -249,6 +249,7 @@
 
     <div class="block" id="reviews">
         {% if request.user.is_authenticated %}
+        {% if user_statuses.review_count or user_statuses.comment_count or user_stuatses.quotation_count %}
         <nav class="tabs">
             <ul>
                 {% url 'book' book.id as tab_url %}
@@ -276,6 +277,7 @@
             </ul>
         </nav>
         {% endif %}
+        {% endif %}
 
         {% for review in statuses %}
             <div

From 974de9e4c238ddd323e24e118f1ba59384027e2b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 11:47:28 -0700
Subject: [PATCH 1046/1285] Removes set goal link from user page

It's already in the tabs
---
 bookwyrm/templates/user/user.html | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index a97d26ab..8002a254 100644
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -53,11 +53,6 @@
     <h2 class="title">{% now 'Y' %} Reading Goal</h2>
     {% include 'snippets/goal_progress.html' with goal=goal %}
 </div>
-{% elif user == request.user %}
-<div class="block">
-    {% now 'Y' as year %}
-    <h2 class="title is-4"><a href="{{ user.local_path }}/goal/{{ year }}">{% blocktrans %}Set a reading goal for {{ year }}{% endblocktrans %}</a></h2>
-</div>
 {% endif %}
 
 <div>

From 57454afa4284c2ad805d41f0c5dc7d335dfca532 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 12:02:19 -0700
Subject: [PATCH 1047/1285] Creates visual separation between reading activity
 and reviews

---
 bookwyrm/templates/book/book.html            | 6 +++++-
 bookwyrm/templates/snippets/readthrough.html | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index 889a031e..20e4d812 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -155,9 +155,12 @@
             </div>
 
             {% if user_authenticated %}
+            <hr aria-hidden="true">
             <section class="block">
                 <header class="columns">
-                    <h2 class="column title is-5 mb-1">{% trans "Your reading activity" %}</h2>
+                    <div class="column">
+                    <h2 class="title is-5">{% trans "Your reading activity" %}</h2>
+                    </div>
                     <div class="column is-narrow">
                         {% trans "Add read dates" as button_text %}
                         {% include 'snippets/toggle/open_button.html' with text=button_text icon="plus" class="is-small" controls_text="add-readthrough" %}
@@ -184,6 +187,7 @@
                 {% include 'snippets/readthrough.html' with readthrough=readthrough %}
                 {% endfor %}
             </section>
+            <hr aria-hidden="true">
 
             <section class="box">
                 {% include 'snippets/create_status.html' with book=book hide_cover=True %}
diff --git a/bookwyrm/templates/snippets/readthrough.html b/bookwyrm/templates/snippets/readthrough.html
index a240a821..cebdc2cd 100644
--- a/bookwyrm/templates/snippets/readthrough.html
+++ b/bookwyrm/templates/snippets/readthrough.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 {% load humanize %}
 {% load tz %}
-<div class="content block">
+<div class="content box is-shadowless has-background-white-bis">
     <div id="hide-edit-readthrough-{{ readthrough.id }}">
         <div class="columns">
             <div class="column">

From 900e7feb1b0a72071349c4bc72af44955d368254 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 12:06:21 -0700
Subject: [PATCH 1048/1285] Moved reviews into center column on books page

---
 bookwyrm/templates/book/book.html | 152 +++++++++++++++---------------
 1 file changed, 76 insertions(+), 76 deletions(-)

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index 20e4d812..40da6486 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -193,6 +193,82 @@
                 {% include 'snippets/create_status.html' with book=book hide_cover=True %}
             </section>
             {% endif %}
+            <div class="block" id="reviews">
+                {% if request.user.is_authenticated %}
+                {% if user_statuses.review_count or user_statuses.comment_count or user_stuatses.quotation_count %}
+                <nav class="tabs">
+                    <ul>
+                        {% url 'book' book.id as tab_url %}
+                        <li {% if tab_url == request.path %}class="is-active"{% endif %}>
+                            <a href="{{ tab_url }}">{% trans "Reviews" %} ({{ review_count }})</a>
+                        </li>
+                        {% if user_statuses.review_count %}
+                        {% url 'book-user-statuses' book.id 'review' as tab_url %}
+                        <li {% if tab_url == request.path %}class="is-active"{% endif %}>
+                            <a href="{{ tab_url }}">{% trans "Your reviews" %} ({{ user_statuses.review_count }})</a>
+                        </li>
+                        {% endif %}
+                        {% if user_statuses.comment_count %}
+                        {% url 'book-user-statuses' book.id 'comment' as tab_url %}
+                        <li {% if tab_url == request.path %}class="is-active"{% endif %}>
+                            <a href="{{ tab_url }}">{% trans "Your comments" %} ({{ user_statuses.comment_count }})</a>
+                        </li>
+                        {% endif %}
+                        {% if user_statuses.quotation_count %}
+                        {% url 'book-user-statuses' book.id 'quote' as tab_url %}
+                        <li {% if tab_url == request.path %}class="is-active"{% endif %}>
+                            <a href="{{ tab_url }}">{% trans "Your quotes" %} ({{ user_statuses.quotation_count }})</a>
+                        </li>
+                        {% endif %}
+                    </ul>
+                </nav>
+                {% endif %}
+                {% endif %}
+
+                {% for review in statuses %}
+                    <div
+                        class="block"
+                        itemprop="review"
+                        itemscope
+                        itemtype="https://schema.org/Review"
+                    >
+                        {% with status=review hide_book=True depth=1 %}
+                            {% include 'snippets/status/status.html' %}
+                        {% endwith %}
+                    </div>
+                {% endfor %}
+
+                <div class="block is-flex is-flex-wrap-wrap">
+                    {% for rating in ratings %}
+                        {% with user=rating.user %}
+                            <div class="block mr-5">
+                                <div class="media">
+                                    <div class="media-left">
+                                        {% include 'snippets/avatar.html' %}
+                                    </div>
+
+                                    <div class="media-content">
+                                        <div>
+                                            <a href="{{ user.local_path }}">{{ user.display_name }}</a>
+                                        </div>
+                                        <div class="is-flex">
+                                            <p class="mr-1">{% trans "rated it" %}</p>
+
+                                            {% include 'snippets/stars.html' with rating=rating.rating %}
+                                        </div>
+                                        <div>
+                                            <a href="{{ rating.remote_id }}">{{ rating.published_date | naturaltime }}</a>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        {% endwith %}
+                    {% endfor %}
+                </div>
+                <div class="block">
+                    {% include 'snippets/pagination.html' with page=statuses path=request.path anchor="#reviews" %}
+                </div>
+            </div>
         </div>
         <div class="column is-one-fifth">
             {% if book.subjects %}
@@ -251,82 +327,6 @@
         </div>
     </div>
 
-    <div class="block" id="reviews">
-        {% if request.user.is_authenticated %}
-        {% if user_statuses.review_count or user_statuses.comment_count or user_stuatses.quotation_count %}
-        <nav class="tabs">
-            <ul>
-                {% url 'book' book.id as tab_url %}
-                <li {% if tab_url == request.path %}class="is-active"{% endif %}>
-                    <a href="{{ tab_url }}">{% trans "Reviews" %} ({{ review_count }})</a>
-                </li>
-                {% if user_statuses.review_count %}
-                {% url 'book-user-statuses' book.id 'review' as tab_url %}
-                <li {% if tab_url == request.path %}class="is-active"{% endif %}>
-                    <a href="{{ tab_url }}">{% trans "Your reviews" %} ({{ user_statuses.review_count }})</a>
-                </li>
-                {% endif %}
-                {% if user_statuses.comment_count %}
-                {% url 'book-user-statuses' book.id 'comment' as tab_url %}
-                <li {% if tab_url == request.path %}class="is-active"{% endif %}>
-                    <a href="{{ tab_url }}">{% trans "Your comments" %} ({{ user_statuses.comment_count }})</a>
-                </li>
-                {% endif %}
-                {% if user_statuses.quotation_count %}
-                {% url 'book-user-statuses' book.id 'quote' as tab_url %}
-                <li {% if tab_url == request.path %}class="is-active"{% endif %}>
-                    <a href="{{ tab_url }}">{% trans "Your quotes" %} ({{ user_statuses.quotation_count }})</a>
-                </li>
-                {% endif %}
-            </ul>
-        </nav>
-        {% endif %}
-        {% endif %}
-
-        {% for review in statuses %}
-            <div
-                class="block"
-                itemprop="review"
-                itemscope
-                itemtype="https://schema.org/Review"
-            >
-                {% with status=review hide_book=True depth=1 %}
-                    {% include 'snippets/status/status.html' %}
-                {% endwith %}
-            </div>
-        {% endfor %}
-
-        <div class="block is-flex is-flex-wrap-wrap">
-            {% for rating in ratings %}
-                {% with user=rating.user %}
-                    <div class="block mr-5">
-                        <div class="media">
-                            <div class="media-left">
-                                {% include 'snippets/avatar.html' %}
-                            </div>
-
-                            <div class="media-content">
-                                <div>
-                                    <a href="{{ user.local_path }}">{{ user.display_name }}</a>
-                                </div>
-                                <div class="is-flex">
-                                    <p class="mr-1">{% trans "rated it" %}</p>
-
-                                    {% include 'snippets/stars.html' with rating=rating.rating %}
-                                </div>
-                                <div>
-                                    <a href="{{ rating.remote_id }}">{{ rating.published_date | naturaltime }}</a>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                {% endwith %}
-            {% endfor %}
-        </div>
-        <div class="block">
-            {% include 'snippets/pagination.html' with page=statuses path=request.path anchor="#reviews" %}
-        </div>
-    </div>
 </div>
 {% endwith %}
 {% endblock %}

From b4ef800505de3305a428c8e455d9ce3be491d368 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 12:07:59 -0700
Subject: [PATCH 1049/1285] Hide start list item in readthrough if absent

---
 bookwyrm/templates/snippets/readthrough.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bookwyrm/templates/snippets/readthrough.html b/bookwyrm/templates/snippets/readthrough.html
index cebdc2cd..d5e79b86 100644
--- a/bookwyrm/templates/snippets/readthrough.html
+++ b/bookwyrm/templates/snippets/readthrough.html
@@ -48,7 +48,9 @@
                         {% endif %}
                     </li>
                     {% endif %}
+                    {% if readthrough.start_date %}
                     <li>{{ readthrough.start_date | localtime | naturalday }}: {% trans "started" %}</li>
+                    {% endif %}
                 </ul>
             </div>
             <div class="column is-narrow">

From 485d20696be089782b5c85f0e19c0d4b89d85ffd Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 12:50:35 -0700
Subject: [PATCH 1050/1285] Fixes loading inventaire data by language code

---
 bookwyrm/connectors/abstract_connector.py       |  4 ++++
 bookwyrm/connectors/inventaire.py               |  7 ++++++-
 .../connectors/test_inventaire_connector.py     | 17 ++++++++++++++++-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index 76718823..db80677f 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -217,6 +217,10 @@ def dict_from_mappings(data, mappings):
     the subclass"""
     result = {}
     for mapping in mappings:
+        # sometimes there are multiple mappings for one field, don't
+        # overwrite earlier writes in that case
+        if mapping.local_field in result and result[mapping.local_field]:
+            continue
         result[mapping.local_field] = mapping.get_value(data)
     return result
 
diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index dc27f2c0..c13ef7f8 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -21,6 +21,7 @@ class Connector(AbstractConnector):
         ]
         self.book_mappings = [
             Mapping("title", remote_field="wdt:P1476", formatter=get_first),
+            Mapping("title", remote_field="labels", formatter=get_language_code),
             Mapping("subtitle", remote_field="wdt:P1680", formatter=get_first),
             Mapping("inventaireId", remote_field="uri"),
             Mapping(
@@ -211,4 +212,8 @@ class Connector(AbstractConnector):
 
 def get_language_code(options, code="en"):
     """when there are a bunch of translation but we need a single field"""
-    return options.get(code)
+    result = options.get(code)
+    if result:
+        return result
+    values = list(options.values())
+    return values[0] if values else None
diff --git a/bookwyrm/tests/connectors/test_inventaire_connector.py b/bookwyrm/tests/connectors/test_inventaire_connector.py
index 4058b067..a32fa72b 100644
--- a/bookwyrm/tests/connectors/test_inventaire_connector.py
+++ b/bookwyrm/tests/connectors/test_inventaire_connector.py
@@ -5,7 +5,7 @@ from django.test import TestCase
 import responses
 
 from bookwyrm import models
-from bookwyrm.connectors.inventaire import Connector
+from bookwyrm.connectors.inventaire import Connector, get_language_code
 
 
 class Inventaire(TestCase):
@@ -156,3 +156,18 @@ class Inventaire(TestCase):
             formatted.cover,
             "https://covers.inventaire.io/img/entities/12345",
         )
+
+    def test_get_language_code(self):
+        """ get english or whatever is in reach """
+        options = {
+            "de": "bip",
+            "en": "hi",
+            "fr": "there",
+        }
+        self.assertEqual(get_language_code(options), "hi")
+
+        options = {
+            "fr": "there",
+        }
+        self.assertEqual(get_language_code(options), "there")
+        self.assertIsNone(get_language_code({}))

From 122e0cbd6d816cbb6f23c9d741a5d7d848b878a1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 12:52:20 -0700
Subject: [PATCH 1051/1285] Python formatting

---
 bookwyrm/tests/connectors/test_inventaire_connector.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/tests/connectors/test_inventaire_connector.py b/bookwyrm/tests/connectors/test_inventaire_connector.py
index a32fa72b..71e407e9 100644
--- a/bookwyrm/tests/connectors/test_inventaire_connector.py
+++ b/bookwyrm/tests/connectors/test_inventaire_connector.py
@@ -158,7 +158,7 @@ class Inventaire(TestCase):
         )
 
     def test_get_language_code(self):
-        """ get english or whatever is in reach """
+        """get english or whatever is in reach"""
         options = {
             "de": "bip",
             "en": "hi",

From 9fea07039889c9962eb0e842dad375ebdcd78f3e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 12:53:57 -0700
Subject: [PATCH 1052/1285] Update bookwyrm/management/commands/initdb.py

Co-authored-by: Joachim <joachim.robert@protonmail.com>
---
 bookwyrm/management/commands/initdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/management/commands/initdb.py b/bookwyrm/management/commands/initdb.py
index 2e88ce5d..71ac511a 100644
--- a/bookwyrm/management/commands/initdb.py
+++ b/bookwyrm/management/commands/initdb.py
@@ -15,7 +15,7 @@ def init_groups():
 
 
 def init_permissions():
-    """permissin types"""
+    """permission types"""
     permissions = [
         {
             "codename": "edit_instance_settings",

From 01f2d80cbd6a604bcb0a1b192ebc4c56c1b0e62e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 13:21:19 -0700
Subject: [PATCH 1053/1285] Show book descriptions in list items

---
 bookwyrm/templates/lists/list.html | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index 9243d3af..2902f793 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -44,8 +44,15 @@
                             </div>
 
                             <div class="column ml-3">
-                                <span>{% include 'snippets/book_titleby.html' %}</span>
-                                {% include 'snippets/stars.html' with rating=item.book|rating:request.user %}
+                                <p>
+                                    {% include 'snippets/book_titleby.html' %}
+                                </p>
+                                <p>
+                                    {% include 'snippets/stars.html' with rating=item.book|rating:request.user %}
+                                </p>
+                                <p>
+                                    {{ book|book_description|to_markdown|default:""|safe|truncatewords_html:20 }}
+                                </p>
                                 {% include 'snippets/shelve_button/shelve_button.html' %}
                             </div>
                         </div>

From c373a0b818dfea5ebe8a7aa1e9ce1c409c68bf3d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 13:38:03 -0700
Subject: [PATCH 1054/1285] Highlight report notifications

---
 bookwyrm/models/user.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 2c5bef4a..7c943bec 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -160,7 +160,7 @@ class User(OrderedCollectionPageMixin, AbstractUser):
         """whether any of the unread notifications are conversations"""
         return self.notification_set.filter(
             read=False,
-            notification_type__in=["REPLY", "MENTION", "TAG"],
+            notification_type__in=["REPLY", "MENTION", "TAG", "REPORT"],
         ).exists()
 
     activity_serializer = activitypub.Person

From 544e29fe76754bdaa1589bac7288cddc9d7b3d3c Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Fri, 30 Apr 2021 22:44:53 +0200
Subject: [PATCH 1055/1285] Fix lists layout for user.

---
 bookwyrm/templates/user/lists.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/user/lists.html b/bookwyrm/templates/user/lists.html
index b2fd9eef..8fe149d5 100644
--- a/bookwyrm/templates/user/lists.html
+++ b/bookwyrm/templates/user/lists.html
@@ -23,7 +23,7 @@
 
 
 {% block panel %}
-<section class="block content">
+<section class="block">
     <form name="create-list" method="post" action="{% url 'lists' %}" class="box is-hidden" id="create-list">
         <header class="columns">
             <h3 class="title column">{% trans "Create list" %}</h3>

From a2621bce1223292dbf0647c7c153e8ea578d5f5c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 15:48:52 -0700
Subject: [PATCH 1056/1285] Fixes getting authors from work data

---
 bookwyrm/connectors/abstract_connector.py | 15 ++++++++-------
 bookwyrm/connectors/inventaire.py         |  5 ++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index db80677f..18ccb942 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -122,7 +122,6 @@ class AbstractConnector(AbstractMinimalConnector):
 
         # load the json
         data = self.get_book_data(remote_id)
-        mapped_data = dict_from_mappings(data, self.book_mappings)
         if self.is_work_data(data):
             try:
                 edition_data = self.get_edition_from_work_data(data)
@@ -130,24 +129,26 @@ class AbstractConnector(AbstractMinimalConnector):
                 # hack: re-use the work data as the edition data
                 # this is why remote ids aren't necessarily unique
                 edition_data = data
-            work_data = mapped_data
+            work_data = data
         else:
             edition_data = data
             try:
                 work_data = self.get_work_from_edition_data(data)
-                work_data = dict_from_mappings(work_data, self.book_mappings)
-            except (KeyError, ConnectorException):
-                work_data = mapped_data
+            except (KeyError, ConnectorException) as e:
+                logger.exception(e)
+                work_data = data
 
         if not work_data or not edition_data:
             raise ConnectorException("Unable to load book data: %s" % remote_id)
 
         with transaction.atomic():
             # create activitypub object
-            work_activity = activitypub.Work(**work_data)
+            work_activity = activitypub.Work(
+                **dict_from_mappings(work_data, self.book_mappings)
+            )
             # this will dedupe automatically
             work = work_activity.to_model(model=models.Work)
-            for author in self.get_authors_from_data(data):
+            for author in self.get_authors_from_data(work_data):
                 work.authors.add(author)
 
             edition = self.create_edition_from_data(work, edition_data)
diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index c13ef7f8..60f490f3 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -137,9 +137,8 @@ class Connector(AbstractConnector):
         return self.get_book_data(self.get_remote_id(uri))
 
     def get_work_from_edition_data(self, data):
-        try:
-            uri = data["claims"]["wdt:P629"]
-        except KeyError:
+        uri = data.get("wdt:P629", [None])[0]
+        if not uri:
             raise ConnectorException("Invalid book data")
         return self.get_book_data(self.get_remote_id(uri))
 

From f2a6cfb4f3a9c0cc42cd1db46271ef5ca1fbcfea Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 16:04:27 -0700
Subject: [PATCH 1057/1285] Remove deduplication of external search results

---
 bookwyrm/connectors/connector_manager.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/bookwyrm/connectors/connector_manager.py b/bookwyrm/connectors/connector_manager.py
index 3a6bf13c..86cebe80 100644
--- a/bookwyrm/connectors/connector_manager.py
+++ b/bookwyrm/connectors/connector_manager.py
@@ -29,8 +29,6 @@ def search(query, min_confidence=0.1):
     isbn = re.sub(r"[\W_]", "", query)
     maybe_isbn = len(isbn) in [10, 13]  # ISBN10 or ISBN13
 
-    dedup_slug = lambda r: "%s/%s/%s" % (r.title, r.author, r.year)
-    result_index = set()
     for connector in get_connectors():
         result_set = None
         if maybe_isbn:
@@ -53,10 +51,6 @@ def search(query, min_confidence=0.1):
                 logger.exception(e)
                 continue
 
-        # if the search results look the same, ignore them
-        result_set = [r for r in result_set if dedup_slug(r) not in result_index]
-        # `|=` concats two sets. WE ARE GETTING FANCY HERE
-        result_index |= set(dedup_slug(r) for r in result_set)
         results.append(
             {
                 "connector": connector,

From f55ded092cb587693c1dc303a7383610e860515e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 16:44:14 -0700
Subject: [PATCH 1058/1285] Fixes link on follow pages

---
 bookwyrm/templates/user/relationships/layout.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/user/relationships/layout.html b/bookwyrm/templates/user/relationships/layout.html
index 5baaf1f9..f36b304c 100644
--- a/bookwyrm/templates/user/relationships/layout.html
+++ b/bookwyrm/templates/user/relationships/layout.html
@@ -24,7 +24,7 @@
     {% for follow in follow_list %}
     <div class="block columns">
         <div class="column">
-            <a href="{{ follower.local_path }}">
+            <a href="{{ follow.local_path }}">
                 {% include 'snippets/avatar.html' with user=follow %}
                 {{ follow.display_name }}
             </a>

From 4b73c37126fe052bbb4aaf7e80d6e4c679bd5d8b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 18:06:30 -0700
Subject: [PATCH 1059/1285] Separate out search types

---
 bookwyrm/views/search.py | 80 ++++++++++++++++++++++++++--------------
 1 file changed, 53 insertions(+), 27 deletions(-)

diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py
index bd5ac3c7..df80603c 100644
--- a/bookwyrm/views/search.py
+++ b/bookwyrm/views/search.py
@@ -18,7 +18,7 @@ from .helpers import handle_remote_webfinger
 class Search(View):
     """search users or books"""
 
-    def get(self, request):
+    def get(self, request, search_type=None):
         """that search bar up top"""
         query = request.GET.get("q")
         min_confidence = request.GET.get("min_confidence", 0.1)
@@ -30,32 +30,62 @@ class Search(View):
             )
             return JsonResponse([r.json() for r in book_results], safe=False)
 
-        data = {"query": query or ""}
+        data = {"query": query, "type": search_type}
+        # make a guess about what type of query this is for
+        if search_type == "user" or (not search_type and "@" in query):
+            results = user_search(query, request.user)
+        elif search_type == "list":
+            results = list_search(query, request.user)
+        else:
+            results = book_search(query, min_confidence)
+        return TemplateResponse(request, "search_results.html", {**data, **results})
 
-        # use webfinger for mastodon style account@domain.com username
-        if query and re.match(regex.full_username, query):
-            handle_remote_webfinger(query)
 
-        # do a user search
-        if request.user.is_authenticated:
-            data["user_results"] = (
-                models.User.viewer_aware_objects(request.user)
-                .annotate(
-                    similarity=Greatest(
-                        TrigramSimilarity("username", query),
-                        TrigramSimilarity("localname", query),
-                    )
+def book_search(query, min_confidence):
+    """that search bar up top"""
+
+    return {
+        "query": query or "",
+        "book_results": connector_manager.search(query, min_confidence=min_confidence),
+    }
+
+
+def user_search(query, viewer):
+    """that search bar up top"""
+    # logged out viewers can't search users
+    if not viewer.is_authenticated:
+        return None
+
+    # use webfinger for mastodon style account@domain.com username to load the user if
+    # they don't exist locally (handle_remote_webfinger will check the db)
+    if re.match(regex.full_username, query):
+        handle_remote_webfinger(query)
+
+    return {
+        "query": query,
+        "user_results": (
+            models.User.viewer_aware_objects(viewer)
+            .annotate(
+                similarity=Greatest(
+                    TrigramSimilarity("username", query),
+                    TrigramSimilarity("localname", query),
                 )
-                .filter(
-                    similarity__gt=0.5,
-                )
-                .order_by("-similarity")[:10]
             )
+            .filter(
+                similarity__gt=0.5,
+            )
+            .order_by("-similarity")[:10]
+        ),
+    }
 
-        # any relevent lists?
-        data["list_results"] = (
+
+def list_search(query, viewer):
+    """any relevent lists?"""
+    return {
+        "query": query,
+        "list_results": (
             privacy_filter(
-                request.user,
+                viewer,
                 models.List.objects,
                 privacy_levels=["public", "followers"],
             )
@@ -69,9 +99,5 @@ class Search(View):
                 similarity__gt=0.1,
             )
             .order_by("-similarity")[:10]
-        )
-
-        data["book_results"] = connector_manager.search(
-            query, min_confidence=min_confidence
-        )
-        return TemplateResponse(request, "search_results.html", data)
+        ),
+    }

From 5ca9d2a7b0bc233a67b7e210e7a4726a7cb08283 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 18:35:09 -0700
Subject: [PATCH 1060/1285] Adds search templates

---
 bookwyrm/templates/search/book.html    |   9 ++
 bookwyrm/templates/search/layout.html  |  59 +++++++++++
 bookwyrm/templates/search/list.html    |   9 ++
 bookwyrm/templates/search/user.html    |   9 ++
 bookwyrm/templates/search_results.html | 133 -------------------------
 bookwyrm/urls.py                       |   3 +-
 bookwyrm/views/search.py               |  31 +++---
 7 files changed, 107 insertions(+), 146 deletions(-)
 create mode 100644 bookwyrm/templates/search/book.html
 create mode 100644 bookwyrm/templates/search/layout.html
 create mode 100644 bookwyrm/templates/search/list.html
 create mode 100644 bookwyrm/templates/search/user.html
 delete mode 100644 bookwyrm/templates/search_results.html

diff --git a/bookwyrm/templates/search/book.html b/bookwyrm/templates/search/book.html
new file mode 100644
index 00000000..5d66ef90
--- /dev/null
+++ b/bookwyrm/templates/search/book.html
@@ -0,0 +1,9 @@
+{% extends 'search/layout.html' %}
+
+{% block panel %}
+
+{% for result in results %}
+hi
+{% endfor %}
+
+{% endblock %}
diff --git a/bookwyrm/templates/search/layout.html b/bookwyrm/templates/search/layout.html
new file mode 100644
index 00000000..005cda9d
--- /dev/null
+++ b/bookwyrm/templates/search/layout.html
@@ -0,0 +1,59 @@
+{% extends 'layout.html' %}
+{% load i18n %}
+
+{% block title %}{% trans "Search" %}{% endblock %}
+
+{% block content %}
+<div class="block">
+    <h1 class="title">
+        {% blocktrans %}Search{% endblocktrans %}
+    </h1>
+</div>
+
+<form class="block">
+    <div class="field has-addons">
+        <div class="control">
+            <input type="input" class="input" value="{{ query }}">
+        </div>
+        <div class="control">
+            <div class="select">
+                <select>
+                    <option value="book" {% if type == "book" %}selected{% endif %}>{% trans "Books" %}</option>
+                    <option value="user" {% if type == "user" %}selected{% endif %}>{% trans "Users" %}</option>
+                    <option value="list" {% if type == "list" %}selected{% endif %}>{% trans "Lists" %}</option>
+                </select>
+            </div>
+        </div>
+        <div class="control">
+            <button type="submit" class="button is-primary">
+                <span>Search</span>
+                <span class="icon icon-search" aria-hidden="true"></span>
+            </button>
+        </div>
+    </div>
+</form>
+
+<nav class="tabs">
+    <ul>
+        {% url 'search' "book" as url %}
+        <li{% if request.path in url %} class="is-active"{% endif %}>
+            <a href="{{ url }}">{% trans "Books" %}</a>
+        </li>
+        {% url 'search' "user" as url %}
+        <li{% if url in request.path %} class="is-active"{% endif %}>
+            <a href="{{ url }}">{% trans "Users" %}</a>
+        </li>
+        {% url 'search' "list" as url %}
+        <li{% if url in request.path %} class="is-active"{% endif %}>
+            <a href="{{ url }}">{% trans "Lists" %}</a>
+        </li>
+    </ul>
+</nav>
+
+<div class="block columns">
+    <section class="block">
+        {% block panel %}
+        {% endblock %}
+    </section>
+</div>
+{% endblock %}
diff --git a/bookwyrm/templates/search/list.html b/bookwyrm/templates/search/list.html
new file mode 100644
index 00000000..5d66ef90
--- /dev/null
+++ b/bookwyrm/templates/search/list.html
@@ -0,0 +1,9 @@
+{% extends 'search/layout.html' %}
+
+{% block panel %}
+
+{% for result in results %}
+hi
+{% endfor %}
+
+{% endblock %}
diff --git a/bookwyrm/templates/search/user.html b/bookwyrm/templates/search/user.html
new file mode 100644
index 00000000..5d66ef90
--- /dev/null
+++ b/bookwyrm/templates/search/user.html
@@ -0,0 +1,9 @@
+{% extends 'search/layout.html' %}
+
+{% block panel %}
+
+{% for result in results %}
+hi
+{% endfor %}
+
+{% endblock %}
diff --git a/bookwyrm/templates/search_results.html b/bookwyrm/templates/search_results.html
deleted file mode 100644
index fdb77f72..00000000
--- a/bookwyrm/templates/search_results.html
+++ /dev/null
@@ -1,133 +0,0 @@
-{% extends 'layout.html' %}
-{% load i18n %}
-
-{% block title %}{% trans "Search Results" %}{% endblock %}
-
-{% block content %}
-{% with book_results|first as local_results %}
-<div class="block">
-    <h1 class="title">{% blocktrans %}Search Results for "{{ query }}"{% endblocktrans %}</h1>
-</div>
-
-<div class="block columns">
-    <div class="column">
-        <h2 class="title is-4">{% trans "Matching Books" %}</h2>
-        <section class="block">
-            {% if not local_results.results %}
-                <p><em>{% blocktrans %}No books found for "{{ query }}"{% endblocktrans %}</em></p>
-                {% if not user.is_authenticated %}
-                <p>
-                <a href="{% url 'login' %}">{% trans "Log in to import or add books." %}</a>
-                </p>
-                {% endif %}
-            {% else %}
-            <ul>
-            {% for result in local_results.results %}
-                <li class="pd-4">
-                    {% include 'snippets/search_result_text.html' with result=result %}
-                </li>
-            {% endfor %}
-            </ul>
-            {% endif %}
-        </section>
-
-        {% if request.user.is_authenticated %}
-        {% if book_results|slice:":1" and local_results.results %}
-        <div class="block">
-            <h3 class="title is-6">
-                {% trans "Didn't find what you were looking for?" %}
-            </h3>
-            {% trans "Show results from other catalogues" as button_text %}
-            {% include 'snippets/toggle/open_button.html' with text=button_text small=True controls_text="more-results" %}
-
-            {% if local_results.results %}
-            {% trans "Hide results from other catalogues" as button_text %}
-            {% include 'snippets/toggle/close_button.html' with text=button_text small=True controls_text="more-results" %}
-            {% endif %}
-        </div>
-        {% endif %}
-
-        <div class="{% if local_results.results %}is-hidden{% endif %}" id="more-results">
-            {% for result_set in book_results|slice:"1:" %}
-            {% if result_set.results %}
-            <section class="box has-background-white-bis">
-                {% if not result_set.connector.local %}
-                <header class="columns is-mobile">
-                    <div class="column">
-                        <h3 class="title is-5">
-                            Results from
-                            <a href="{{ result_set.connector.base_url }}" target="_blank">{{ result_set.connector.name|default:result_set.connector.identifier }}</a>
-                        </h3>
-                    </div>
-                    <div class="column is-narrow">
-                        {% trans "Show" as button_text %}
-                        {% include 'snippets/toggle/open_button.html' with text=button_text small=True controls_text="more-results-panel" controls_uid=result_set.connector.identifier class="is-small" icon="arrow-down" pressed=forloop.first %}
-                    </div>
-                </header>
-                {% endif %}
-
-                <div class="box has-background-white is-shadowless{% if not forloop.first %} is-hidden{% endif %}" id="more-results-panel-{{ result_set.connector.identifier }}">
-                    <div class="is-flex is-flex-direction-row-reverse">
-                        <div>
-                            {% trans "Close" as button_text %}
-                            {% include 'snippets/toggle/toggle_button.html' with label=button_text class="delete" nonbutton=True controls_text="more-results-panel" controls_uid=result_set.connector.identifier pressed=forloop.first %}
-                        </div>
-
-                        <ul class="is-flex-grow-1">
-                            {% for result in result_set.results %}
-                                <li class="mb-5">
-                                    {% include 'snippets/search_result_text.html' with result=result remote_result=True %}
-                                </li>
-                            {% endfor %}
-                        </ul>
-                    </div>
-                </div>
-            </section>
-            {% endif %}
-            {% endfor %}
-        </div>
-
-        <div class="block">
-            <a href="/create-book">Manually add book</a>
-        </div>
-        {% endif %}
-    </div>
-    <div class="column">
-        {% if request.user.is_authenticated %}
-        <section class="box">
-            <h2 class="title is-4">{% trans "Matching Users" %}</h2>
-            {% if not user_results %}
-            <p><em>{% blocktrans %}No users found for "{{ query }}"{% endblocktrans %}</em></p>
-            {% endif %}
-            <ul>
-            {% for result in user_results %}
-                <li class="block">
-                    <a href="{{ result.local_path }}">
-                        {% include 'snippets/avatar.html' with user=result %}
-                        {{ result.display_name }}
-                    </a> ({{ result.username }})
-                    {% include 'snippets/follow_button.html' with user=result %}
-                </li>
-            {% endfor %}
-            </ul>
-        </section>
-        {% endif %}
-        <section class="box">
-            <h2 class="title is-4">{% trans "Lists" %}</h2>
-            {% if not list_results %}
-            <p><em>{% blocktrans %}No lists found for "{{ query }}"{% endblocktrans %}</em></p>
-            {% endif %}
-            {% for result in list_results %}
-            <div class="block">
-                <ul>
-                    <li>
-                        <a href="{% url 'list' result.id %}">{{ result.name }}</a>
-                    </li>
-                </ul>
-            </div>
-            {% endfor %}
-        </section>
-    </div>
-</div>
-{% endwith %}
-{% endblock %}
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 99e51ff3..a06e0bd4 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -163,7 +163,8 @@ urlpatterns = [
         name="direct-messages-user",
     ),
     # search
-    re_path(r"^search/?$", views.Search.as_view()),
+    re_path(r"^search/?$", views.Search.as_view(), name="search"),
+    re_path(r"^search/(?P<search_type>user|list|book)/?$", views.Search.as_view(), name="search"),
     # imports
     re_path(r"^import/?$", views.Import.as_view()),
     re_path(r"^import/(\d+)/?$", views.ImportStatus.as_view()),
diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py
index df80603c..aaca7377 100644
--- a/bookwyrm/views/search.py
+++ b/bookwyrm/views/search.py
@@ -30,15 +30,22 @@ class Search(View):
             )
             return JsonResponse([r.json() for r in book_results], safe=False)
 
-        data = {"query": query, "type": search_type}
-        # make a guess about what type of query this is for
-        if search_type == "user" or (not search_type and "@" in query):
-            results = user_search(query, request.user)
-        elif search_type == "list":
-            results = list_search(query, request.user)
-        else:
-            results = book_search(query, min_confidence)
-        return TemplateResponse(request, "search_results.html", {**data, **results})
+        data = {"query": query or "", "type": search_type}
+        results = {}
+        if query:
+            # make a guess about what type of query this is for
+            if search_type == "user" or (not search_type and "@" in query):
+                results = user_search(query, request.user)
+            elif search_type == "list":
+                results = list_search(query, request.user)
+            else:
+                results = book_search(query, min_confidence)
+
+        return TemplateResponse(
+            request,
+            "search/{:s}.html".format(search_type or "book"),
+            {**data, **results}
+        )
 
 
 def book_search(query, min_confidence):
@@ -46,7 +53,7 @@ def book_search(query, min_confidence):
 
     return {
         "query": query or "",
-        "book_results": connector_manager.search(query, min_confidence=min_confidence),
+        "results": connector_manager.search(query, min_confidence=min_confidence),
     }
 
 
@@ -63,7 +70,7 @@ def user_search(query, viewer):
 
     return {
         "query": query,
-        "user_results": (
+        "results": (
             models.User.viewer_aware_objects(viewer)
             .annotate(
                 similarity=Greatest(
@@ -83,7 +90,7 @@ def list_search(query, viewer):
     """any relevent lists?"""
     return {
         "query": query,
-        "list_results": (
+        "results": (
             privacy_filter(
                 viewer,
                 models.List.objects,

From 21a5147c3c523f57c945bc64efc2311dfda4472a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 18:59:02 -0700
Subject: [PATCH 1061/1285] Controls search type

---
 bookwyrm/templates/search/layout.html | 36 ++++++++++++------------
 bookwyrm/templates/search/list.html   |  4 +--
 bookwyrm/urls.py                      |  1 -
 bookwyrm/views/search.py              | 40 +++++++++++++--------------
 4 files changed, 39 insertions(+), 42 deletions(-)

diff --git a/bookwyrm/templates/search/layout.html b/bookwyrm/templates/search/layout.html
index 005cda9d..da0f651a 100644
--- a/bookwyrm/templates/search/layout.html
+++ b/bookwyrm/templates/search/layout.html
@@ -10,14 +10,14 @@
     </h1>
 </div>
 
-<form class="block">
+<form class="block" action="{% url 'search' %}" method="GET">
     <div class="field has-addons">
         <div class="control">
-            <input type="input" class="input" value="{{ query }}">
+            <input type="input" class="input" name="q" value="{{ query }}">
         </div>
         <div class="control">
             <div class="select">
-                <select>
+                <select name="type">
                     <option value="book" {% if type == "book" %}selected{% endif %}>{% trans "Books" %}</option>
                     <option value="user" {% if type == "user" %}selected{% endif %}>{% trans "Users" %}</option>
                     <option value="list" {% if type == "list" %}selected{% endif %}>{% trans "Lists" %}</option>
@@ -35,25 +35,25 @@
 
 <nav class="tabs">
     <ul>
-        {% url 'search' "book" as url %}
-        <li{% if request.path in url %} class="is-active"{% endif %}>
-            <a href="{{ url }}">{% trans "Books" %}</a>
+        <li{% if type == "book" %} class="is-active"{% endif %}>
+            <a href="{% url 'search' %}?q={{ query }}&type=book">{% trans "Books" %}</a>
         </li>
-        {% url 'search' "user" as url %}
-        <li{% if url in request.path %} class="is-active"{% endif %}>
-            <a href="{{ url }}">{% trans "Users" %}</a>
+        <li{% if type == "user" %} class="is-active"{% endif %}>
+            <a href="{% url 'search' %}?q={{ query }}&type=user">{% trans "Users" %}</a>
         </li>
-        {% url 'search' "list" as url %}
-        <li{% if url in request.path %} class="is-active"{% endif %}>
-            <a href="{{ url }}">{% trans "Lists" %}</a>
+        <li{% if type == "list" %} class="is-active"{% endif %}>
+            <a href="{% url 'search' %}?q={{ query }}&type=list">{% trans "Lists" %}</a>
         </li>
     </ul>
 </nav>
 
-<div class="block columns">
-    <section class="block">
-        {% block panel %}
-        {% endblock %}
-    </section>
-</div>
+<section class="block">
+    {% block panel %}
+    {% endblock %}
+    {% if not results %}
+    <p>
+        <em>{% blocktrans %}No results found for "{{ query }}"{% endblocktrans %}</em>
+    </p>
+    {% endif %}
+</section>
 {% endblock %}
diff --git a/bookwyrm/templates/search/list.html b/bookwyrm/templates/search/list.html
index 5d66ef90..d7e48f51 100644
--- a/bookwyrm/templates/search/list.html
+++ b/bookwyrm/templates/search/list.html
@@ -2,8 +2,6 @@
 
 {% block panel %}
 
-{% for result in results %}
-hi
-{% endfor %}
+{% include 'lists/list_items.html' with lists=results %}
 
 {% endblock %}
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index a06e0bd4..5412378e 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -164,7 +164,6 @@ urlpatterns = [
     ),
     # search
     re_path(r"^search/?$", views.Search.as_view(), name="search"),
-    re_path(r"^search/(?P<search_type>user|list|book)/?$", views.Search.as_view(), name="search"),
     # imports
     re_path(r"^import/?$", views.Import.as_view()),
     re_path(r"^import/(\d+)/?$", views.ImportStatus.as_view()),
diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py
index aaca7377..cfbc1f0b 100644
--- a/bookwyrm/views/search.py
+++ b/bookwyrm/views/search.py
@@ -18,10 +18,11 @@ from .helpers import handle_remote_webfinger
 class Search(View):
     """search users or books"""
 
-    def get(self, request, search_type=None):
+    def get(self, request):
         """that search bar up top"""
         query = request.GET.get("q")
         min_confidence = request.GET.get("min_confidence", 0.1)
+        search_type = request.GET.get("type")
 
         if is_api_request(request):
             # only return local book results via json so we don't cascade
@@ -30,38 +31,39 @@ class Search(View):
             )
             return JsonResponse([r.json() for r in book_results], safe=False)
 
+        if not search_type:
+            search_type = "user" if "@" in query else "book"
+
+        endpoints = {
+            "book": book_search,
+            "user": user_search,
+            "list": list_search,
+        }
+        if not search_type in endpoints:
+            search_type = "book"
+        endpoint = endpoints[search_type]
+
         data = {"query": query or "", "type": search_type}
-        results = {}
-        if query:
-            # make a guess about what type of query this is for
-            if search_type == "user" or (not search_type and "@" in query):
-                results = user_search(query, request.user)
-            elif search_type == "list":
-                results = list_search(query, request.user)
-            else:
-                results = book_search(query, min_confidence)
+        results = endpoint(query, request.user, min_confidence) if query else {}
 
         return TemplateResponse(
-            request,
-            "search/{:s}.html".format(search_type or "book"),
-            {**data, **results}
+            request, "search/{:s}.html".format(search_type), {**data, **results}
         )
 
 
-def book_search(query, min_confidence):
+def book_search(query, _, min_confidence):
     """that search bar up top"""
 
     return {
-        "query": query or "",
         "results": connector_manager.search(query, min_confidence=min_confidence),
     }
 
 
-def user_search(query, viewer):
+def user_search(query, viewer, _):
     """that search bar up top"""
     # logged out viewers can't search users
     if not viewer.is_authenticated:
-        return None
+        return {}
 
     # use webfinger for mastodon style account@domain.com username to load the user if
     # they don't exist locally (handle_remote_webfinger will check the db)
@@ -69,7 +71,6 @@ def user_search(query, viewer):
         handle_remote_webfinger(query)
 
     return {
-        "query": query,
         "results": (
             models.User.viewer_aware_objects(viewer)
             .annotate(
@@ -86,10 +87,9 @@ def user_search(query, viewer):
     }
 
 
-def list_search(query, viewer):
+def list_search(query, viewer, _):
     """any relevent lists?"""
     return {
-        "query": query,
         "results": (
             privacy_filter(
                 viewer,

From cb6c0035d7ee97ee531894e6227df22fffbb7700 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 19:19:10 -0700
Subject: [PATCH 1062/1285] List and user previews

---
 bookwyrm/templates/directory/directory.html | 56 +--------------
 bookwyrm/templates/directory/user_card.html | 57 +++++++++++++++
 bookwyrm/templates/search/layout.html       |  3 +
 bookwyrm/templates/search/user.html         |  9 ++-
 bookwyrm/views/search.py                    | 80 ++++++++++-----------
 5 files changed, 105 insertions(+), 100 deletions(-)
 create mode 100644 bookwyrm/templates/directory/user_card.html

diff --git a/bookwyrm/templates/directory/directory.html b/bookwyrm/templates/directory/directory.html
index 2fa8a5ae..f97a8481 100644
--- a/bookwyrm/templates/directory/directory.html
+++ b/bookwyrm/templates/directory/directory.html
@@ -1,7 +1,5 @@
 {% extends 'layout.html' %}
 {% load i18n %}
-{% load bookwyrm_tags %}
-{% load humanize %}
 
 {% block title %}{% trans "Directory" %}{% endblock %}
 
@@ -41,59 +39,7 @@
 <div class="columns is-multiline">
     {% for user in users %}
     <div class="column is-one-third">
-        <div class="card is-stretchable">
-            <div class="card-content">
-                <div class="media">
-                    <a href="{{ user.local_path }}" class="media-left">
-                        {% include 'snippets/avatar.html' with user=user large=True %}
-                    </a>
-                    <div class="media-content">
-                        <a href="{{ user.local_path }}" class="is-block mb-2">
-                            <span class="title is-4 is-block">{{ user.display_name }}</span>
-                            <span class="subtitle is-7 is-block">@{{ user|username }}</span>
-                        </a>
-                        {% include 'snippets/follow_button.html' with user=user %}
-                    </div>
-                </div>
-
-                <div>
-                {% if user.summary %}
-                    {{ user.summary | to_markdown | safe | truncatechars_html:40 }}
-                {% else %}&nbsp;{% endif %}
-                </div>
-            </div>
-            <footer class="card-footer">
-                {% if user != request.user %}
-                {% if user.mutuals %}
-                <div class="card-footer-item">
-                    <div class="has-text-centered">
-                        <p class="title is-6 mb-0">{{ user.mutuals }}</p>
-                        <p class="help">{% blocktrans count counter=user.mutuals %}follower you follow{% plural %}followers you follow{% endblocktrans %}</p>
-                    </div>
-                </div>
-                {% elif user.shared_books %}
-                <div class="card-footer-item">
-                    <div class="has-text-centered">
-                        <p class="title is-6 mb-0">{{ user.shared_books }}</p>
-                        <p class="help">{% blocktrans count counter=user.shared_books %}book on your shelves{% plural %}books on your shelves{% endblocktrans %}</p>
-                    </div>
-                </div>
-                {% endif %}
-                {% endif %}
-                <div class="card-footer-item">
-                    <div class="has-text-centered">
-                        <p class="title is-6 mb-0">{{ user.status_set.count|intword }}</p>
-                        <p class="help">{% trans "posts" %}</p>
-                    </div>
-                </div>
-                <div class="card-footer-item">
-                    <div class="has-text-centered">
-                        <p class="title is-6 mb-0">{{ user.last_active_date|naturalday }}</p>
-                        <p class="help">{% trans "last active" %}</p>
-                    </div>
-                </div>
-            </footer>
-        </div>
+        {% include 'directory/user_card.html' %}
     </div>
     {% endfor %}
 </div>
diff --git a/bookwyrm/templates/directory/user_card.html b/bookwyrm/templates/directory/user_card.html
new file mode 100644
index 00000000..8e7538c8
--- /dev/null
+++ b/bookwyrm/templates/directory/user_card.html
@@ -0,0 +1,57 @@
+{% load i18n %}
+{% load bookwyrm_tags %}
+{% load humanize %}
+
+<div class="card is-stretchable">
+    <div class="card-content">
+        <div class="media">
+            <a href="{{ user.local_path }}" class="media-left">
+                {% include 'snippets/avatar.html' with user=user large=True %}
+            </a>
+            <div class="media-content">
+                <a href="{{ user.local_path }}" class="is-block mb-2">
+                    <span class="title is-4 is-block">{{ user.display_name }}</span>
+                    <span class="subtitle is-7 is-block">@{{ user|username }}</span>
+                </a>
+                {% include 'snippets/follow_button.html' with user=user %}
+            </div>
+        </div>
+
+        <div>
+        {% if user.summary %}
+            {{ user.summary | to_markdown | safe | truncatechars_html:40 }}
+        {% else %}&nbsp;{% endif %}
+        </div>
+    </div>
+    <footer class="card-footer">
+        {% if user != request.user %}
+        {% if user.mutuals %}
+        <div class="card-footer-item">
+            <div class="has-text-centered">
+                <p class="title is-6 mb-0">{{ user.mutuals }}</p>
+                <p class="help">{% blocktrans count counter=user.mutuals %}follower you follow{% plural %}followers you follow{% endblocktrans %}</p>
+            </div>
+        </div>
+        {% elif user.shared_books %}
+        <div class="card-footer-item">
+            <div class="has-text-centered">
+                <p class="title is-6 mb-0">{{ user.shared_books }}</p>
+                <p class="help">{% blocktrans count counter=user.shared_books %}book on your shelves{% plural %}books on your shelves{% endblocktrans %}</p>
+            </div>
+        </div>
+        {% endif %}
+        {% endif %}
+        <div class="card-footer-item">
+            <div class="has-text-centered">
+                <p class="title is-6 mb-0">{{ user.status_set.count|intword }}</p>
+                <p class="help">{% trans "posts" %}</p>
+            </div>
+        </div>
+        <div class="card-footer-item">
+            <div class="has-text-centered">
+                <p class="title is-6 mb-0">{{ user.last_active_date|naturalday }}</p>
+                <p class="help">{% trans "last active" %}</p>
+            </div>
+        </div>
+    </footer>
+</div>
diff --git a/bookwyrm/templates/search/layout.html b/bookwyrm/templates/search/layout.html
index da0f651a..b122d7e2 100644
--- a/bookwyrm/templates/search/layout.html
+++ b/bookwyrm/templates/search/layout.html
@@ -33,6 +33,7 @@
     </div>
 </form>
 
+{% if query %}
 <nav class="tabs">
     <ul>
         <li{% if type == "book" %} class="is-active"{% endif %}>
@@ -56,4 +57,6 @@
     </p>
     {% endif %}
 </section>
+{% endif %}
+
 {% endblock %}
diff --git a/bookwyrm/templates/search/user.html b/bookwyrm/templates/search/user.html
index 5d66ef90..c6adc613 100644
--- a/bookwyrm/templates/search/user.html
+++ b/bookwyrm/templates/search/user.html
@@ -1,9 +1,14 @@
 {% extends 'search/layout.html' %}
+{% load bookwyrm_tags %}
 
 {% block panel %}
 
-{% for result in results %}
-hi
+<div class="columns is-multiline">
+{% for user in results %}
+    <div class="column is-one-third">
+        {% include 'directory/user_card.html' %}
+    </div>
 {% endfor %}
+</div>
 
 {% endblock %}
diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py
index cfbc1f0b..603ed211 100644
--- a/bookwyrm/views/search.py
+++ b/bookwyrm/views/search.py
@@ -43,24 +43,22 @@ class Search(View):
             search_type = "book"
         endpoint = endpoints[search_type]
 
-        data = {"query": query or "", "type": search_type}
-        results = endpoint(query, request.user, min_confidence) if query else {}
+        data = {
+            "query": query or "",
+            "type": search_type,
+            "results": endpoint(query, request.user, min_confidence) if query else {},
+        }
 
-        return TemplateResponse(
-            request, "search/{:s}.html".format(search_type), {**data, **results}
-        )
+        return TemplateResponse(request, "search/{:s}.html".format(search_type), data)
 
 
 def book_search(query, _, min_confidence):
-    """that search bar up top"""
-
-    return {
-        "results": connector_manager.search(query, min_confidence=min_confidence),
-    }
+    """the real business is elsewhere"""
+    return connector_manager.search(query, min_confidence=min_confidence)
 
 
 def user_search(query, viewer, _):
-    """that search bar up top"""
+    """cool kids members only user search"""
     # logged out viewers can't search users
     if not viewer.is_authenticated:
         return {}
@@ -70,41 +68,37 @@ def user_search(query, viewer, _):
     if re.match(regex.full_username, query):
         handle_remote_webfinger(query)
 
-    return {
-        "results": (
-            models.User.viewer_aware_objects(viewer)
-            .annotate(
-                similarity=Greatest(
-                    TrigramSimilarity("username", query),
-                    TrigramSimilarity("localname", query),
-                )
+    return (
+        models.User.viewer_aware_objects(viewer)
+        .annotate(
+            similarity=Greatest(
+                TrigramSimilarity("username", query),
+                TrigramSimilarity("localname", query),
             )
-            .filter(
-                similarity__gt=0.5,
-            )
-            .order_by("-similarity")[:10]
-        ),
-    }
+        )
+        .filter(
+            similarity__gt=0.5,
+        )
+        .order_by("-similarity")[:10]
+    )
 
 
 def list_search(query, viewer, _):
     """any relevent lists?"""
-    return {
-        "results": (
-            privacy_filter(
-                viewer,
-                models.List.objects,
-                privacy_levels=["public", "followers"],
+    return (
+        privacy_filter(
+            viewer,
+            models.List.objects,
+            privacy_levels=["public", "followers"],
+        )
+        .annotate(
+            similarity=Greatest(
+                TrigramSimilarity("name", query),
+                TrigramSimilarity("description", query),
             )
-            .annotate(
-                similarity=Greatest(
-                    TrigramSimilarity("name", query),
-                    TrigramSimilarity("description", query),
-                )
-            )
-            .filter(
-                similarity__gt=0.1,
-            )
-            .order_by("-similarity")[:10]
-        ),
-    }
+        )
+        .filter(
+            similarity__gt=0.1,
+        )
+        .order_by("-similarity")[:10]
+    )

From 499c4e3267d06f738be989dd0d42fea9027f37c9 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 19:56:29 -0700
Subject: [PATCH 1063/1285] Don't search remote sources by default

---
 bookwyrm/templates/search/book.html   | 69 ++++++++++++++++++++++++++-
 bookwyrm/templates/search/layout.html |  6 ++-
 bookwyrm/views/search.py              | 21 +++++---
 3 files changed, 86 insertions(+), 10 deletions(-)

diff --git a/bookwyrm/templates/search/book.html b/bookwyrm/templates/search/book.html
index 5d66ef90..9d42dd7f 100644
--- a/bookwyrm/templates/search/book.html
+++ b/bookwyrm/templates/search/book.html
@@ -1,9 +1,74 @@
 {% extends 'search/layout.html' %}
+{% load i18n %}
 
 {% block panel %}
 
-{% for result in results %}
-hi
+{% if results %}
+{% with results|first as local_results %}
+<ul class="block">
+{% for result in local_results.results %}
+    <li class="pd-4">
+	{% include 'snippets/search_result_text.html' with result=result %}
+    </li>
 {% endfor %}
+</ul>
+{% endwith %}
+
+<div class="block">
+{% for result_set in results|slice:"1:" %}
+    {% if result_set.results %}
+    <section class="box has-background-white-bis">
+	{% if not result_set.connector.local %}
+	<header class="columns is-mobile">
+	    <div class="column">
+		<h3 class="title is-5">
+		    Results from
+		    <a href="{{ result_set.connector.base_url }}" target="_blank">{{ result_set.connector.name|default:result_set.connector.identifier }}</a>
+		</h3>
+	    </div>
+	    <div class="column is-narrow">
+		{% trans "Show" as button_text %}
+		{% include 'snippets/toggle/open_button.html' with text=button_text small=True controls_text="more-results-panel" controls_uid=result_set.connector.identifier class="is-small" icon="arrow-down" pressed=forloop.first %}
+	    </div>
+	</header>
+	{% endif %}
+
+	<div class="box has-background-white is-shadowless{% if not forloop.first %} is-hidden{% endif %}" id="more-results-panel-{{ result_set.connector.identifier }}">
+	    <div class="is-flex is-flex-direction-row-reverse">
+		<div>
+		    {% trans "Close" as button_text %}
+		    {% include 'snippets/toggle/toggle_button.html' with label=button_text class="delete" nonbutton=True controls_text="more-results-panel" controls_uid=result_set.connector.identifier pressed=forloop.first %}
+		</div>
+
+		<ul class="is-flex-grow-1">
+		    {% for result in result_set.results %}
+			<li class="mb-5">
+			    {% include 'snippets/search_result_text.html' with result=result remote_result=True %}
+			</li>
+		    {% endfor %}
+		</ul>
+	    </div>
+	</div>
+    </section>
+    {% endif %}
+    {% endfor %}
+</div>
+
+
+{% endif %}
+
+{% if not remote %}
+<p class="block">
+    {% if request.user.is_authenticated %}
+    <a href="{{ request.path }}?q={{ query }}&type=book&remote=true">
+        {% trans "Load results from other catalogues" %}
+    </a>
+    {% else %}
+    <a href="{% url 'login' %}">
+        {% trans "Log in to import or add books." %}
+    </a>
+    {% endif %}
+</p>
+{% endif %}
 
 {% endblock %}
diff --git a/bookwyrm/templates/search/layout.html b/bookwyrm/templates/search/layout.html
index b122d7e2..17e14f0f 100644
--- a/bookwyrm/templates/search/layout.html
+++ b/bookwyrm/templates/search/layout.html
@@ -39,9 +39,11 @@
         <li{% if type == "book" %} class="is-active"{% endif %}>
             <a href="{% url 'search' %}?q={{ query }}&type=book">{% trans "Books" %}</a>
         </li>
+        {% if request.user.is_authenticated %}
         <li{% if type == "user" %} class="is-active"{% endif %}>
             <a href="{% url 'search' %}?q={{ query }}&type=user">{% trans "Users" %}</a>
         </li>
+        {% endif %}
         <li{% if type == "list" %} class="is-active"{% endif %}>
             <a href="{% url 'search' %}?q={{ query }}&type=list">{% trans "Lists" %}</a>
         </li>
@@ -49,13 +51,13 @@
 </nav>
 
 <section class="block">
-    {% block panel %}
-    {% endblock %}
     {% if not results %}
     <p>
         <em>{% blocktrans %}No results found for "{{ query }}"{% endblocktrans %}</em>
     </p>
     {% endif %}
+    {% block panel %}
+    {% endblock %}
 </section>
 {% endif %}
 
diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py
index 603ed211..9fa07e2e 100644
--- a/bookwyrm/views/search.py
+++ b/bookwyrm/views/search.py
@@ -23,6 +23,7 @@ class Search(View):
         query = request.GET.get("q")
         min_confidence = request.GET.get("min_confidence", 0.1)
         search_type = request.GET.get("type")
+        search_remote = request.GET.get("remote", False)
 
         if is_api_request(request):
             # only return local book results via json so we don't cascade
@@ -41,23 +42,31 @@ class Search(View):
         }
         if not search_type in endpoints:
             search_type = "book"
-        endpoint = endpoints[search_type]
 
         data = {
             "query": query or "",
             "type": search_type,
-            "results": endpoint(query, request.user, min_confidence) if query else {},
+            "remote": search_remote,
         }
+        if query:
+            data["results"] = endpoints[search_type](
+                query, request.user, min_confidence, search_remote
+            )
 
         return TemplateResponse(request, "search/{:s}.html".format(search_type), data)
 
 
-def book_search(query, _, min_confidence):
+def book_search(query, _, min_confidence, search_remote=False):
     """the real business is elsewhere"""
-    return connector_manager.search(query, min_confidence=min_confidence)
+    if search_remote:
+        return connector_manager.search(query, min_confidence=min_confidence)
+    results = connector_manager.local_search(query, min_confidence=min_confidence)
+    if not results:
+        return None
+    return [{"results": results}]
 
 
-def user_search(query, viewer, _):
+def user_search(query, viewer, *_):
     """cool kids members only user search"""
     # logged out viewers can't search users
     if not viewer.is_authenticated:
@@ -83,7 +92,7 @@ def user_search(query, viewer, _):
     )
 
 
-def list_search(query, viewer, _):
+def list_search(query, viewer, *_):
     """any relevent lists?"""
     return (
         privacy_filter(

From 9caad56ffcfc1d900163df1b3f50b4d5e0081bdc Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 20:08:05 -0700
Subject: [PATCH 1064/1285] Don't allow remote search results for logged out
 users

---
 bookwyrm/views/search.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py
index 9fa07e2e..c216170d 100644
--- a/bookwyrm/views/search.py
+++ b/bookwyrm/views/search.py
@@ -23,7 +23,9 @@ class Search(View):
         query = request.GET.get("q")
         min_confidence = request.GET.get("min_confidence", 0.1)
         search_type = request.GET.get("type")
-        search_remote = request.GET.get("remote", False)
+        search_remote = (
+            request.GET.get("remote", False) and request.user.is_authenticated
+        )
 
         if is_api_request(request):
             # only return local book results via json so we don't cascade

From 5f7191a976331fea2bc8cd16db17126bd0c175db Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 20:09:43 -0700
Subject: [PATCH 1065/1285] Safer logged out search

---
 bookwyrm/templates/search/layout.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bookwyrm/templates/search/layout.html b/bookwyrm/templates/search/layout.html
index 17e14f0f..8c81f5b7 100644
--- a/bookwyrm/templates/search/layout.html
+++ b/bookwyrm/templates/search/layout.html
@@ -19,7 +19,9 @@
             <div class="select">
                 <select name="type">
                     <option value="book" {% if type == "book" %}selected{% endif %}>{% trans "Books" %}</option>
+                    {% if request.user.is_authenticated %}
                     <option value="user" {% if type == "user" %}selected{% endif %}>{% trans "Users" %}</option>
+                    {% endif %}
                     <option value="list" {% if type == "list" %}selected{% endif %}>{% trans "Lists" %}</option>
                 </select>
             </div>

From f9c1ecfabed82ee1da0c116d3d8e31304e3174dc Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 30 Apr 2021 20:16:34 -0700
Subject: [PATCH 1066/1285] Fixes bad whitespace

---
 bookwyrm/templates/search/book.html | 60 ++++++++++++++---------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/bookwyrm/templates/search/book.html b/bookwyrm/templates/search/book.html
index 9d42dd7f..53aadb63 100644
--- a/bookwyrm/templates/search/book.html
+++ b/bookwyrm/templates/search/book.html
@@ -8,7 +8,7 @@
 <ul class="block">
 {% for result in local_results.results %}
     <li class="pd-4">
-	{% include 'snippets/search_result_text.html' with result=result %}
+        {% include 'snippets/search_result_text.html' with result=result %}
     </li>
 {% endfor %}
 </ul>
@@ -18,37 +18,37 @@
 {% for result_set in results|slice:"1:" %}
     {% if result_set.results %}
     <section class="box has-background-white-bis">
-	{% if not result_set.connector.local %}
-	<header class="columns is-mobile">
-	    <div class="column">
-		<h3 class="title is-5">
-		    Results from
-		    <a href="{{ result_set.connector.base_url }}" target="_blank">{{ result_set.connector.name|default:result_set.connector.identifier }}</a>
-		</h3>
-	    </div>
-	    <div class="column is-narrow">
-		{% trans "Show" as button_text %}
-		{% include 'snippets/toggle/open_button.html' with text=button_text small=True controls_text="more-results-panel" controls_uid=result_set.connector.identifier class="is-small" icon="arrow-down" pressed=forloop.first %}
-	    </div>
-	</header>
-	{% endif %}
+        {% if not result_set.connector.local %}
+        <header class="columns is-mobile">
+            <div class="column">
+                <h3 class="title is-5">
+                    Results from
+                    <a href="{{ result_set.connector.base_url }}" target="_blank">{{ result_set.connector.name|default:result_set.connector.identifier }}</a>
+                </h3>
+            </div>
+            <div class="column is-narrow">
+                {% trans "Show" as button_text %}
+                {% include 'snippets/toggle/open_button.html' with text=button_text small=True controls_text="more-results-panel" controls_uid=result_set.connector.identifier class="is-small" icon="arrow-down" pressed=forloop.first %}
+            </div>
+        </header>
+        {% endif %}
 
-	<div class="box has-background-white is-shadowless{% if not forloop.first %} is-hidden{% endif %}" id="more-results-panel-{{ result_set.connector.identifier }}">
-	    <div class="is-flex is-flex-direction-row-reverse">
-		<div>
-		    {% trans "Close" as button_text %}
-		    {% include 'snippets/toggle/toggle_button.html' with label=button_text class="delete" nonbutton=True controls_text="more-results-panel" controls_uid=result_set.connector.identifier pressed=forloop.first %}
-		</div>
+        <div class="box has-background-white is-shadowless{% if not forloop.first %} is-hidden{% endif %}" id="more-results-panel-{{ result_set.connector.identifier }}">
+            <div class="is-flex is-flex-direction-row-reverse">
+                <div>
+                    {% trans "Close" as button_text %}
+                    {% include 'snippets/toggle/toggle_button.html' with label=button_text class="delete" nonbutton=True controls_text="more-results-panel" controls_uid=result_set.connector.identifier pressed=forloop.first %}
+                </div>
 
-		<ul class="is-flex-grow-1">
-		    {% for result in result_set.results %}
-			<li class="mb-5">
-			    {% include 'snippets/search_result_text.html' with result=result remote_result=True %}
-			</li>
-		    {% endfor %}
-		</ul>
-	    </div>
-	</div>
+                <ul class="is-flex-grow-1">
+                    {% for result in result_set.results %}
+                        <li class="mb-5">
+                            {% include 'snippets/search_result_text.html' with result=result remote_result=True %}
+                        </li>
+                    {% endfor %}
+                </ul>
+            </div>
+        </div>
     </section>
     {% endif %}
     {% endfor %}

From ad8666ebeca4367620c812dc73236a51102d85f3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 1 May 2021 07:20:54 -0700
Subject: [PATCH 1067/1285] Removes extra "content" field in status editor that
 broke dms

---
 bookwyrm/templates/feed/direct_messages.html  |  2 +-
 .../snippets/create_status_form.html          | 20 ++++++++++++++-----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/templates/feed/direct_messages.html b/bookwyrm/templates/feed/direct_messages.html
index f097fd9f..1e361e61 100644
--- a/bookwyrm/templates/feed/direct_messages.html
+++ b/bookwyrm/templates/feed/direct_messages.html
@@ -14,7 +14,7 @@
 </header>
 
 <div class="box">
-    {% include 'snippets/create_status_form.html' with type="direct" uuid=1 mentions=partner %}
+    {% include 'snippets/create_status_form.html' with type="direct" uuid=1 mention=partner %}
 </div>
 
 <section class="block">
diff --git a/bookwyrm/templates/snippets/create_status_form.html b/bookwyrm/templates/snippets/create_status_form.html
index a74230ad..f6021622 100644
--- a/bookwyrm/templates/snippets/create_status_form.html
+++ b/bookwyrm/templates/snippets/create_status_form.html
@@ -36,13 +36,23 @@
 
         <div class="control">
             {% if type == 'quotation' %}
-            <textarea name="quote" class="textarea" id="id_quote_{{ book.id }}_{{ type }}" placeholder="{{ placeholder }}" required>{{ draft.quote|default:'' }}</textarea>
-            {% elif type == 'reply' %}
-            {% include 'snippets/content_warning_field.html' with parent_status=status %}
-            <textarea name="content" class="textarea" id="id_content_{{ type }}-{{ book.id }}{{reply_parent.id}}" placeholder="{{ placeholder }}" aria-label="{% trans 'Reply' %}" required>{% if reply_parent %}{{ reply_parent|mentions:request.user }}{% endif %}{% if mentions %}@{{ mentions|username }} {% endif %}{{ draft.content|default:'' }}</textarea>
+            <textarea
+                name="quote"
+                class="textarea"
+                id="id_quote_{{ book.id }}_{{ type }}"
+                placeholder="{{ placeholder }}"
+                required
+            >{{ draft.quote|default:'' }}</textarea>
             {% else %}
             {% include 'snippets/content_warning_field.html' with parent_status=status %}
-            <textarea name="content" class="textarea" id="id_content_{{ book.id }}_{{ type }}" placeholder="{{ placeholder }}" required>{{ draft.content|default:'' }}</textarea>
+            <textarea
+                name="content"
+                class="textarea"
+                id="id_content_{{ type }}-{{ book.id }}{{reply_parent.id}}"
+                placeholder="{{ placeholder }}"
+                aria-label="{% if reply_parent %}{% trans 'Reply' %}{% else %}{% trans "Content" %}{% endif %}"
+                required
+            >{% if reply_parent %}{{ reply_parent|mentions:request.user }}{% endif %}{% if mention %}@{{ mention|username }} {% endif %}{{ draft.content|default:'' }}</textarea>
             {% endif %}
         </div>
     </div>

From 64b54510d9270f78e2b267e87525937d7d269254 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 1 May 2021 10:39:05 -0700
Subject: [PATCH 1068/1285] Updates unit tests

---
 bookwyrm/tests/views/test_search.py | 47 +++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 12 deletions(-)

diff --git a/bookwyrm/tests/views/test_search.py b/bookwyrm/tests/views/test_search.py
index 77727522..7661d5a6 100644
--- a/bookwyrm/tests/views/test_search.py
+++ b/bookwyrm/tests/views/test_search.py
@@ -2,6 +2,7 @@
 import json
 from unittest.mock import patch
 
+from django.contrib.auth.models import AnonymousUser
 from django.http import JsonResponse
 from django.template.response import TemplateResponse
 from django.test import TestCase
@@ -52,7 +53,7 @@ class ShelfViews(TestCase):
         self.assertEqual(data[0]["title"], "Test Book")
         self.assertEqual(data[0]["key"], "https://%s/book/%d" % (DOMAIN, self.book.id))
 
-    def test_search_html_response(self):
+    def test_search_books(self):
         """searches remote connectors"""
         view = views.Search.as_view()
 
@@ -92,7 +93,7 @@ class ShelfViews(TestCase):
             connector=connector,
         )
 
-        request = self.factory.get("", {"q": "Test Book"})
+        request = self.factory.get("", {"q": "Test Book", "remote": True})
         request.user = self.local_user
         with patch("bookwyrm.views.search.is_api_request") as is_api:
             is_api.return_value = False
@@ -101,19 +102,41 @@ class ShelfViews(TestCase):
                 response = view(request)
         self.assertIsInstance(response, TemplateResponse)
         response.render()
-        self.assertEqual(
-            response.context_data["book_results"][0].title, "Gideon the Ninth"
-        )
+        self.assertEqual(response.context_data["results"][0].title, "Gideon the Ninth")
 
-    def test_search_html_response_users(self):
+    def test_search_users(self):
         """searches remote connectors"""
         view = views.Search.as_view()
-        request = self.factory.get("", {"q": "mouse"})
+        request = self.factory.get("", {"q": "mouse", "type": "user"})
         request.user = self.local_user
-        with patch("bookwyrm.views.search.is_api_request") as is_api:
-            is_api.return_value = False
-            with patch("bookwyrm.connectors.connector_manager.search"):
-                response = view(request)
+        response = view(request)
+
         self.assertIsInstance(response, TemplateResponse)
         response.render()
-        self.assertEqual(response.context_data["user_results"][0], self.local_user)
+        self.assertEqual(response.context_data["results"][0], self.local_user)
+
+    def test_search_users_logged_out(self):
+        """searches remote connectors"""
+        view = views.Search.as_view()
+        request = self.factory.get("", {"q": "mouse", "type": "user"})
+
+        anonymous_user = AnonymousUser
+        anonymous_user.is_authenticated = False
+        request.user = anonymous_user
+
+        response = view(request)
+
+        response.render()
+        self.assertEqual(response.context_data["results"], {})
+
+    def test_search_lists(self):
+        """searches remote connectors"""
+        booklist = models.List.objects.create(user=self.local_user, name="test list")
+        view = views.Search.as_view()
+        request = self.factory.get("", {"q": "test", "type": "list"})
+        request.user = self.local_user
+        response = view(request)
+
+        self.assertIsInstance(response, TemplateResponse)
+        response.render()
+        self.assertEqual(response.context_data["results"][0], booklist)

From c42be7a5892e4502355d707ec4c6b5b742cd331a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 1 May 2021 10:47:01 -0700
Subject: [PATCH 1069/1285] Adds pagination

---
 bookwyrm/templates/search/layout.html | 4 ++++
 bookwyrm/views/search.py              | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/search/layout.html b/bookwyrm/templates/search/layout.html
index 8c81f5b7..00b49b93 100644
--- a/bookwyrm/templates/search/layout.html
+++ b/bookwyrm/templates/search/layout.html
@@ -60,6 +60,10 @@
     {% endif %}
     {% block panel %}
     {% endblock %}
+
+    <div>
+        {% include 'snippets/pagination.html' with page=results path=request.path %}
+    </div>
 </section>
 {% endif %}
 
diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py
index c216170d..ebaa937c 100644
--- a/bookwyrm/views/search.py
+++ b/bookwyrm/views/search.py
@@ -2,6 +2,7 @@
 import re
 
 from django.contrib.postgres.search import TrigramSimilarity
+from django.core.paginator import Paginator
 from django.db.models.functions import Greatest
 from django.http import JsonResponse
 from django.template.response import TemplateResponse
@@ -9,6 +10,7 @@ from django.views import View
 
 from bookwyrm import models
 from bookwyrm.connectors import connector_manager
+from bookwyrm.settings import PAGE_LENGTH
 from bookwyrm.utils import regex
 from .helpers import is_api_request, privacy_filter
 from .helpers import handle_remote_webfinger
@@ -51,9 +53,11 @@ class Search(View):
             "remote": search_remote,
         }
         if query:
-            data["results"] = endpoints[search_type](
+            results = endpoints[search_type](
                 query, request.user, min_confidence, search_remote
             )
+            paginated = Paginator(results, PAGE_LENGTH).get_page(request.GET.get("page"))
+            data["results"] = paginated
 
         return TemplateResponse(request, "search/{:s}.html".format(search_type), data)
 

From bb50bd8121cd857f483b46134161da989eab1c57 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 1 May 2021 10:49:34 -0700
Subject: [PATCH 1070/1285] Python formatting

---
 bookwyrm/views/search.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py
index ebaa937c..b76f2392 100644
--- a/bookwyrm/views/search.py
+++ b/bookwyrm/views/search.py
@@ -56,7 +56,9 @@ class Search(View):
             results = endpoints[search_type](
                 query, request.user, min_confidence, search_remote
             )
-            paginated = Paginator(results, PAGE_LENGTH).get_page(request.GET.get("page"))
+            paginated = Paginator(results, PAGE_LENGTH).get_page(
+                request.GET.get("page")
+            )
             data["results"] = paginated
 
         return TemplateResponse(request, "search/{:s}.html".format(search_type), data)

From 037362e49fa13d6f66755bad51a49d5f6184697d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 1 May 2021 10:55:10 -0700
Subject: [PATCH 1071/1285] Adds labels for form elements

---
 bookwyrm/templates/search/layout.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/search/layout.html b/bookwyrm/templates/search/layout.html
index 00b49b93..239586ef 100644
--- a/bookwyrm/templates/search/layout.html
+++ b/bookwyrm/templates/search/layout.html
@@ -13,10 +13,10 @@
 <form class="block" action="{% url 'search' %}" method="GET">
     <div class="field has-addons">
         <div class="control">
-            <input type="input" class="input" name="q" value="{{ query }}">
+            <input type="input" class="input" name="q" value="{{ query }}" aria-label="{% trans 'Search query' %}">
         </div>
         <div class="control">
-            <div class="select">
+            <div class="select" aria-label="{% trans 'Search type' %}">
                 <select name="type">
                     <option value="book" {% if type == "book" %}selected{% endif %}>{% trans "Books" %}</option>
                     {% if request.user.is_authenticated %}

From f8ad1dfac467abfddb36ebd92fc39ba0c412f0e7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 1 May 2021 11:02:55 -0700
Subject: [PATCH 1072/1285] Updates locales

---
 locale/de_DE/LC_MESSAGES/django.po   | 555 ++++++++++++++-------------
 locale/en_US/LC_MESSAGES/django.po   | 506 ++++++++++++------------
 locale/es/LC_MESSAGES/django.po      | 538 ++++++++++++++------------
 locale/fr_FR/LC_MESSAGES/django.po   | 538 ++++++++++++++------------
 locale/zh_Hans/LC_MESSAGES/django.po | 533 +++++++++++++------------
 5 files changed, 1412 insertions(+), 1258 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index d7ad8724..4c5813d5 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-29 13:24-0700\n"
+"POT-Creation-Date: 2021-05-01 10:56-0700\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"
@@ -62,11 +62,12 @@ msgid "Book Title"
 msgstr "Titel"
 
 #: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:31
-#: bookwyrm/templates/user/shelf.html:80 bookwyrm/templates/user/shelf.html:110
+#: bookwyrm/templates/user/shelf/shelf.html:82
+#: bookwyrm/templates/user/shelf/shelf.html:112
 msgid "Rating"
 msgstr ""
 
-#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:82
+#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:100
 msgid "Sort By"
 msgstr ""
 
@@ -92,7 +93,7 @@ msgstr "%(value)s ist keine gültige remote_id"
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s ist kein gültiger Username"
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:153
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:156
 msgid "username"
 msgstr "Username"
 
@@ -154,8 +155,8 @@ msgid "Books by %(name)s"
 msgstr "Bücher von %(name)s"
 
 #: bookwyrm/templates/book/book.html:33
-#: bookwyrm/templates/discover/large-book.html:12
-#: bookwyrm/templates/discover/small-book.html:9
+#: bookwyrm/templates/discover/large-book.html:25
+#: bookwyrm/templates/discover/small-book.html:19
 msgid "by"
 msgstr "von"
 
@@ -163,52 +164,52 @@ msgstr "von"
 msgid "Edit Book"
 msgstr "Buch editieren"
 
-#: bookwyrm/templates/book/book.html:61
+#: bookwyrm/templates/book/book.html:60
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "Cover hinzufügen"
 
-#: bookwyrm/templates/book/book.html:65
+#: bookwyrm/templates/book/book.html:64
 #, fuzzy
 #| msgid "Failed to load"
 msgid "Failed to load cover"
 msgstr "Laden fehlgeschlagen"
 
-#: bookwyrm/templates/book/book.html:82
+#: bookwyrm/templates/book/book.html:81
 msgid "View on OpenLibrary"
 msgstr "In OpenLibrary ansehen"
 
-#: bookwyrm/templates/book/book.html:85
+#: bookwyrm/templates/book/book.html:84
 #, fuzzy
 #| msgid "View on OpenLibrary"
 msgid "View on Inventaire"
 msgstr "In OpenLibrary ansehen"
 
-#: bookwyrm/templates/book/book.html:105
+#: bookwyrm/templates/book/book.html:104
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s Bewertung)"
 msgstr[1] "(%(review_count)s Bewertungen)"
 
-#: bookwyrm/templates/book/book.html:117
+#: bookwyrm/templates/book/book.html:116
 msgid "Add Description"
 msgstr "Beschreibung hinzufügen"
 
-#: bookwyrm/templates/book/book.html:124
+#: bookwyrm/templates/book/book.html:123
 #: bookwyrm/templates/book/edit_book.html:107
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: bookwyrm/templates/book/book.html:128
-#: bookwyrm/templates/book/edit_book.html:240
+#: bookwyrm/templates/book/book.html:127
+#: bookwyrm/templates/book/edit_book.html:241
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:93
-#: bookwyrm/templates/settings/site.html:93
-#: bookwyrm/templates/snippets/readthrough.html:75
+#: bookwyrm/templates/settings/site.html:97
+#: bookwyrm/templates/snippets/readthrough.html:77
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
@@ -216,15 +217,15 @@ msgstr "Beschreibung:"
 msgid "Save"
 msgstr "Speichern"
 
-#: bookwyrm/templates/book/book.html:129 bookwyrm/templates/book/book.html:178
+#: bookwyrm/templates/book/book.html:128 bookwyrm/templates/book/book.html:180
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:241
+#: bookwyrm/templates/book/edit_book.html:242
 #: bookwyrm/templates/edit_author.html:79
 #: bookwyrm/templates/moderation/report_modal.html:34
 #: bookwyrm/templates/settings/federated_server.html:94
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/readthrough.html:76
+#: bookwyrm/templates/snippets/readthrough.html:78
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
@@ -232,19 +233,19 @@ msgstr "Speichern"
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: bookwyrm/templates/book/book.html:138
+#: bookwyrm/templates/book/book.html:137
 #, fuzzy, python-format
 #| msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s\">%(title)s</a> von"
 
-#: bookwyrm/templates/book/book.html:146
+#: bookwyrm/templates/book/book.html:145
 #, fuzzy, python-format
 #| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/book/book.html:152
+#: bookwyrm/templates/book/book.html:151
 #, fuzzy, python-format
 #| msgid ""
 #| " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
@@ -256,100 +257,101 @@ msgstr ""
 "hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> zu deiner Liste "
 "\"<a href=\"%(list_path)s\">%(list_name)s</a>\" Hinzugefügt"
 
-#: bookwyrm/templates/book/book.html:161
+#: bookwyrm/templates/book/book.html:162
 msgid "Your reading activity"
 msgstr "Deine Leseaktivität"
 
-#: bookwyrm/templates/book/book.html:163
+#: bookwyrm/templates/book/book.html:165
 msgid "Add read dates"
 msgstr "Lesedaten hinzufügen"
 
-#: bookwyrm/templates/book/book.html:168
+#: bookwyrm/templates/book/book.html:170
 msgid "You don't have any reading activity for this book."
 msgstr "Du hast keine Leseaktivität für dieses Buch."
 
-#: bookwyrm/templates/book/book.html:175
+#: bookwyrm/templates/book/book.html:177
 msgid "Create"
 msgstr "Erstellen"
 
-#: bookwyrm/templates/book/book.html:197
-msgid "Subjects"
-msgstr "Themen"
-
-#: bookwyrm/templates/book/book.html:209
-msgid "Places"
-msgstr "Orte"
-
-#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:65
-#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
-#: bookwyrm/templates/search_results.html:115
-#: bookwyrm/templates/user/user_layout.html:62
-msgid "Lists"
-msgstr "Listen"
-
-#: bookwyrm/templates/book/book.html:231
-#, fuzzy
-#| msgid "Go to list"
-msgid "Add to list"
-msgstr "Zur Liste"
-
-#: bookwyrm/templates/book/book.html:241
-#: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:133
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: bookwyrm/templates/book/book.html:257
+#: bookwyrm/templates/book/book.html:203
 #, fuzzy
 #| msgid "Review"
 msgid "Reviews"
 msgstr "Bewerten"
 
-#: bookwyrm/templates/book/book.html:262
+#: bookwyrm/templates/book/book.html:208
 #, fuzzy
 #| msgid "Your shelves"
 msgid "Your reviews"
 msgstr "Deine Regale"
 
-#: bookwyrm/templates/book/book.html:268
+#: bookwyrm/templates/book/book.html:214
 #, fuzzy
 #| msgid "Your Account"
 msgid "Your comments"
 msgstr "Dein Account"
 
-#: bookwyrm/templates/book/book.html:274
+#: bookwyrm/templates/book/book.html:220
 #, fuzzy
 #| msgid "Your books"
 msgid "Your quotes"
 msgstr "Deine Bücher"
 
-#: bookwyrm/templates/book/book.html:308
+#: bookwyrm/templates/book/book.html:255
 msgid "rated it"
 msgstr "bewertet"
 
+#: bookwyrm/templates/book/book.html:276
+msgid "Subjects"
+msgstr "Themen"
+
+#: bookwyrm/templates/book/book.html:288
+msgid "Places"
+msgstr "Orte"
+
+#: bookwyrm/templates/book/book.html:299 bookwyrm/templates/layout.html:65
+#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
+#: bookwyrm/templates/search/layout.html:25
+#: bookwyrm/templates/search/layout.html:50
+#: bookwyrm/templates/user/layout.html:67
+msgid "Lists"
+msgstr "Listen"
+
+#: bookwyrm/templates/book/book.html:310
+#, fuzzy
+#| msgid "Go to list"
+msgid "Add to list"
+msgstr "Zur Liste"
+
+#: bookwyrm/templates/book/book.html:320
+#: bookwyrm/templates/book/cover_modal.html:31
+#: bookwyrm/templates/lists/list.html:163
+msgid "Add"
+msgstr "Hinzufügen"
+
 #: bookwyrm/templates/book/book_identifiers.html:8
 msgid "ISBN:"
 msgstr ""
 
 #: bookwyrm/templates/book/book_identifiers.html:15
-#: bookwyrm/templates/book/edit_book.html:226
+#: bookwyrm/templates/book/edit_book.html:227
 msgid "OCLC Number:"
 msgstr "OCLC Nummer:"
 
 #: bookwyrm/templates/book/book_identifiers.html:22
-#: bookwyrm/templates/book/edit_book.html:230
+#: bookwyrm/templates/book/edit_book.html:231
 msgid "ASIN:"
 msgstr ""
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:179
 #, fuzzy
 #| msgid "Add cover"
 msgid "Upload cover:"
 msgstr "Cover hinzufügen"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:184
+#: bookwyrm/templates/book/edit_book.html:185
 msgid "Load cover from url:"
 msgstr "Cover von URL laden:"
 
@@ -486,36 +488,36 @@ msgid "John Doe, Jane Smith"
 msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:170
-#: bookwyrm/templates/user/shelf.html:74
+#: bookwyrm/templates/user/shelf/shelf.html:76
 msgid "Cover"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:197
+#: bookwyrm/templates/book/edit_book.html:198
 msgid "Physical Properties"
 msgstr "Physikalische Eigenschaften"
 
-#: bookwyrm/templates/book/edit_book.html:198
+#: bookwyrm/templates/book/edit_book.html:199
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:206
+#: bookwyrm/templates/book/edit_book.html:207
 msgid "Pages:"
 msgstr "Seiten:"
 
-#: bookwyrm/templates/book/edit_book.html:213
+#: bookwyrm/templates/book/edit_book.html:214
 msgid "Book Identifiers"
 msgstr "Buchidentifikatoren"
 
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:215
 msgid "ISBN 13:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:218
+#: bookwyrm/templates/book/edit_book.html:219
 msgid "ISBN 10:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:222
+#: bookwyrm/templates/book/edit_book.html:223
 #: bookwyrm/templates/edit_author.html:59
 msgid "Openlibrary key:"
 msgstr ""
@@ -581,7 +583,7 @@ msgstr "Veröffentlicht von %(publisher)s."
 #: bookwyrm/templates/feed/feed_layout.html:70
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
-#: bookwyrm/templates/search_results.html:72
+#: bookwyrm/templates/search/book.html:39
 msgid "Close"
 msgstr "Schließen"
 
@@ -609,17 +611,17 @@ msgstr "Maximale Benutzungen"
 msgid "Federated community"
 msgstr "Föderiert"
 
-#: bookwyrm/templates/directory/directory.html:6
-#: bookwyrm/templates/directory/directory.html:11
+#: bookwyrm/templates/directory/directory.html:4
+#: bookwyrm/templates/directory/directory.html:9
 #: bookwyrm/templates/layout.html:93
 msgid "Directory"
 msgstr ""
 
-#: bookwyrm/templates/directory/directory.html:19
+#: bookwyrm/templates/directory/directory.html:17
 msgid "Make your profile discoverable to other BookWyrm users."
 msgstr ""
 
-#: bookwyrm/templates/directory/directory.html:26
+#: bookwyrm/templates/directory/directory.html:24
 #, fuzzy, python-format
 #| msgid ""
 #| "You can set or change your reading goal any time from your <a href="
@@ -631,35 +633,11 @@ msgstr ""
 "Du kannst dein Leseziel jederzeit auf deiner <a href=\"%(path)s"
 "\">Profilseite</a> setzen oder ändern."
 
-#: bookwyrm/templates/directory/directory.html:31
+#: bookwyrm/templates/directory/directory.html:29
 #: bookwyrm/templates/snippets/goal_card.html:22
 msgid "Dismiss message"
 msgstr "Nachricht verwerfen"
 
-#: bookwyrm/templates/directory/directory.html:71
-#, fuzzy
-#| msgid "followed you"
-msgid "follower you follow"
-msgid_plural "followers you follow"
-msgstr[0] "folgt dir"
-msgstr[1] "folgt dir"
-
-#: bookwyrm/templates/directory/directory.html:78
-#, fuzzy
-#| msgid "Your shelves"
-msgid "book on your shelves"
-msgid_plural "books on your shelves"
-msgstr[0] "Deine Regale"
-msgstr[1] "Deine Regale"
-
-#: bookwyrm/templates/directory/directory.html:86
-msgid "posts"
-msgstr ""
-
-#: bookwyrm/templates/directory/directory.html:92
-msgid "last active"
-msgstr ""
-
 #: bookwyrm/templates/directory/sort_filter.html:5
 msgid "Order by"
 msgstr ""
@@ -674,6 +652,30 @@ msgstr "Vorschlagen"
 msgid "Recently active"
 msgstr ""
 
+#: bookwyrm/templates/directory/user_card.html:32
+#, fuzzy
+#| msgid "followed you"
+msgid "follower you follow"
+msgid_plural "followers you follow"
+msgstr[0] "folgt dir"
+msgstr[1] "folgt dir"
+
+#: bookwyrm/templates/directory/user_card.html:39
+#, fuzzy
+#| msgid "Your shelves"
+msgid "book on your shelves"
+msgid_plural "books on your shelves"
+msgstr[0] "Deine Regale"
+msgstr[1] "Deine Regale"
+
+#: bookwyrm/templates/directory/user_card.html:47
+msgid "posts"
+msgstr ""
+
+#: bookwyrm/templates/directory/user_card.html:53
+msgid "last active"
+msgstr ""
+
 #: bookwyrm/templates/directory/user_type_filter.html:5
 #, fuzzy
 #| msgid "User Activity"
@@ -765,8 +767,8 @@ msgid "Edit Author:"
 msgstr "Autor*in editieren"
 
 #: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
-#: bookwyrm/templates/user/create_shelf_form.html:13
-#: bookwyrm/templates/user/edit_shelf_form.html:14
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:13
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:14
 msgid "Name:"
 msgstr ""
 
@@ -939,7 +941,7 @@ msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:11
 #: bookwyrm/templates/layout.html:59
-#: bookwyrm/templates/user/books_header.html:3
+#: bookwyrm/templates/user/shelf/books_header.html:3
 msgid "Your books"
 msgstr "Deine Bücher"
 
@@ -950,14 +952,14 @@ msgstr ""
 "Hier sind noch keine Bücher! Versuche nach Büchern zu suchen um loszulegen"
 
 #: bookwyrm/templates/feed/feed_layout.html:24
-#: bookwyrm/templates/user/shelf.html:28
+#: bookwyrm/templates/user/shelf/shelf.html:28
 #, fuzzy
 #| msgid "Read"
 msgid "To Read"
 msgstr "Auf der Leseliste"
 
 #: bookwyrm/templates/feed/feed_layout.html:25
-#: bookwyrm/templates/user/shelf.html:28
+#: bookwyrm/templates/user/shelf/shelf.html:28
 #, fuzzy
 #| msgid "Start reading"
 msgid "Currently Reading"
@@ -965,7 +967,7 @@ msgstr "Gerade lesend"
 
 #: bookwyrm/templates/feed/feed_layout.html:26
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-#: bookwyrm/templates/user/shelf.html:28
+#: bookwyrm/templates/user/shelf/shelf.html:28
 msgid "Read"
 msgstr "Gelesen"
 
@@ -1002,13 +1004,12 @@ msgid "What are you reading?"
 msgstr "Zu lesen angefangen"
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:101
+#: bookwyrm/templates/lists/list.html:119
 msgid "Search for a book"
 msgstr "Nach einem Buch suchen"
 
 #: bookwyrm/templates/get_started/books.html:11
 #: bookwyrm/templates/isbn_search_results.html:17
-#: bookwyrm/templates/search_results.html:17
 #, python-format
 msgid "No books found for \"%(query)s\""
 msgstr "Keine Bücher für \"%(query)s\" gefunden"
@@ -1023,28 +1024,30 @@ msgstr ""
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
 #: bookwyrm/templates/layout.html:38 bookwyrm/templates/layout.html:39
-#: bookwyrm/templates/lists/list.html:105
+#: bookwyrm/templates/lists/list.html:123
+#: bookwyrm/templates/search/layout.html:4
+#: bookwyrm/templates/search/layout.html:9
 msgid "Search"
 msgstr "Suche"
 
-#: bookwyrm/templates/get_started/books.html:26
+#: bookwyrm/templates/get_started/books.html:27
 #, fuzzy
 #| msgid "Suggest Books"
 msgid "Suggested Books"
 msgstr "Bücher vorschlagen"
 
-#: bookwyrm/templates/get_started/books.html:41
+#: bookwyrm/templates/get_started/books.html:46
 #, fuzzy, python-format
 #| msgid "About %(site_name)s"
 msgid "Popular on %(site_name)s"
 msgstr "Ãœber %(site_name)s"
 
-#: bookwyrm/templates/get_started/books.html:51
-#: bookwyrm/templates/lists/list.html:118
+#: bookwyrm/templates/get_started/books.html:58
+#: bookwyrm/templates/lists/list.html:136
 msgid "No books found"
 msgstr "Keine Bücher gefunden"
 
-#: bookwyrm/templates/get_started/books.html:54
+#: bookwyrm/templates/get_started/books.html:63
 #: bookwyrm/templates/get_started/profile.html:54
 msgid "Save &amp; continue"
 msgstr ""
@@ -1130,7 +1133,6 @@ msgid "Search for a user"
 msgstr "Suche nach Buch oder Benutzer*in"
 
 #: bookwyrm/templates/get_started/users.html:13
-#: bookwyrm/templates/search_results.html:99
 #, python-format
 msgid "No users found for \"%(query)s\""
 msgstr "Keine Nutzer*innen für \"%(query)s\" gefunden"
@@ -1256,18 +1258,19 @@ msgid "Successfully imported"
 msgstr "Erfolgreich importiert"
 
 #: bookwyrm/templates/import_status.html:112
-#: bookwyrm/templates/lists/curate.html:14
 msgid "Book"
 msgstr "Buch"
 
 #: bookwyrm/templates/import_status.html:115
 #: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/user/shelf.html:75 bookwyrm/templates/user/shelf.html:93
+#: bookwyrm/templates/user/shelf/shelf.html:77
+#: bookwyrm/templates/user/shelf/shelf.html:95
 msgid "Title"
 msgstr "Titel"
 
 #: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/user/shelf.html:76 bookwyrm/templates/user/shelf.html:96
+#: bookwyrm/templates/user/shelf/shelf.html:78
+#: bookwyrm/templates/user/shelf/shelf.html:98
 msgid "Author"
 msgstr "Autor*in"
 
@@ -1289,18 +1292,15 @@ msgid "Sorry! This invite code is no longer valid."
 msgstr "Sorry! Dieser Einladecode ist mehr gültig."
 
 #: bookwyrm/templates/isbn_search_results.html:4
-#: bookwyrm/templates/search_results.html:4
 msgid "Search Results"
 msgstr "Suchergebnisse"
 
 #: bookwyrm/templates/isbn_search_results.html:9
-#: bookwyrm/templates/search_results.html:9
 #, python-format
 msgid "Search Results for \"%(query)s\""
 msgstr "Suchergebnisse für \"%(query)s\""
 
 #: bookwyrm/templates/isbn_search_results.html:14
-#: bookwyrm/templates/search_results.html:14
 msgid "Matching Books"
 msgstr "Passende Bücher"
 
@@ -1342,38 +1342,44 @@ msgstr "Abmelden"
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: bookwyrm/templates/layout.html:152 bookwyrm/templates/layout.html:156
+#: bookwyrm/templates/layout.html:155 bookwyrm/templates/layout.html:159
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:157
+#: bookwyrm/templates/layout.html:160
 msgid "password"
 msgstr "Passwort"
 
-#: bookwyrm/templates/layout.html:158 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:161 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: bookwyrm/templates/layout.html:161 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "Anmelden"
 
-#: bookwyrm/templates/layout.html:169
+#: bookwyrm/templates/layout.html:172
 msgid "Join"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:195
+#: bookwyrm/templates/layout.html:198
 msgid "About this server"
 msgstr "Ãœber diesen Server"
 
-#: bookwyrm/templates/layout.html:199
+#: bookwyrm/templates/layout.html:202
 msgid "Contact site admin"
 msgstr "Admin kontaktieren"
 
 #: bookwyrm/templates/layout.html:206
+#, fuzzy
+#| msgid "List curation:"
+msgid "Documentation"
+msgstr "Listenkuratierung:"
+
+#: bookwyrm/templates/layout.html:213
 #, python-format
 msgid ""
 "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">"
@@ -1382,7 +1388,7 @@ msgstr ""
 "%(site_name)s auf <a href=\"%(support_link)s\" target=\"_blank\">"
 "%(support_title)s</a> unterstützen"
 
-#: bookwyrm/templates/layout.html:210
+#: bookwyrm/templates/layout.html:217
 msgid ""
 "BookWyrm is open source software. You can contribute or report issues on <a "
 "href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
@@ -1407,27 +1413,27 @@ msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/lists/curate.html:6
+#: bookwyrm/templates/lists/curate.html:8
 msgid "Pending Books"
 msgstr "Unbestätigte Bücher"
 
-#: bookwyrm/templates/lists/curate.html:7
+#: bookwyrm/templates/lists/curate.html:11
 msgid "Go to list"
 msgstr "Zur Liste"
 
-#: bookwyrm/templates/lists/curate.html:9
+#: bookwyrm/templates/lists/curate.html:15
 msgid "You're all set!"
 msgstr "Du bist soweit!"
 
-#: bookwyrm/templates/lists/curate.html:15
+#: bookwyrm/templates/lists/curate.html:45
 msgid "Suggested by"
 msgstr "Vorgeschlagen von"
 
-#: bookwyrm/templates/lists/curate.html:35
+#: bookwyrm/templates/lists/curate.html:57
 msgid "Approve"
 msgstr "Bestätigen"
 
-#: bookwyrm/templates/lists/curate.html:41
+#: bookwyrm/templates/lists/curate.html:63
 msgid "Discard"
 msgstr "Ablehnen"
 
@@ -1479,63 +1485,63 @@ msgstr "Alle können Bücher hinzufügen"
 msgid "This list is currently empty"
 msgstr "Diese Liste ist momentan leer"
 
-#: bookwyrm/templates/lists/list.html:46
+#: bookwyrm/templates/lists/list.html:64
 #, fuzzy, python-format
 #| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/lists/list.html:58
+#: bookwyrm/templates/lists/list.html:76
 #, fuzzy
 #| msgid "Started"
 msgid "Set"
 msgstr "Gestartet"
 
-#: bookwyrm/templates/lists/list.html:61
+#: bookwyrm/templates/lists/list.html:79
 #, fuzzy
 #| msgid "List curation:"
 msgid "List position"
 msgstr "Listenkuratierung:"
 
-#: bookwyrm/templates/lists/list.html:67
+#: bookwyrm/templates/lists/list.html:85
 #: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr "Entfernen"
 
-#: bookwyrm/templates/lists/list.html:80 bookwyrm/templates/lists/list.html:92
+#: bookwyrm/templates/lists/list.html:98 bookwyrm/templates/lists/list.html:110
 #, fuzzy
 #| msgid "Your Lists"
 msgid "Sort List"
 msgstr "Deine Listen"
 
-#: bookwyrm/templates/lists/list.html:86
+#: bookwyrm/templates/lists/list.html:104
 #, fuzzy
 #| msgid "List curation:"
 msgid "Direction"
 msgstr "Listenkuratierung:"
 
-#: bookwyrm/templates/lists/list.html:97
+#: bookwyrm/templates/lists/list.html:115
 msgid "Add Books"
 msgstr "Bücher hinzufügen"
 
-#: bookwyrm/templates/lists/list.html:97
+#: bookwyrm/templates/lists/list.html:115
 msgid "Suggest Books"
 msgstr "Bücher vorschlagen"
 
-#: bookwyrm/templates/lists/list.html:106
+#: bookwyrm/templates/lists/list.html:124
 msgid "search"
 msgstr "suchen"
 
-#: bookwyrm/templates/lists/list.html:112
+#: bookwyrm/templates/lists/list.html:130
 msgid "Clear search"
 msgstr "Suche leeren"
 
-#: bookwyrm/templates/lists/list.html:117
+#: bookwyrm/templates/lists/list.html:135
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
 msgstr "Keine passenden Bücher zu \"%(query)s\" gefunden"
 
-#: bookwyrm/templates/lists/list.html:133
+#: bookwyrm/templates/lists/list.html:163
 msgid "Suggest"
 msgstr "Vorschlagen"
 
@@ -1909,35 +1915,54 @@ msgstr "Profil"
 msgid "Relationships"
 msgstr "Beziehungen"
 
-#: bookwyrm/templates/search_results.html:20
-msgid "Log in to import or add books."
-msgstr ""
-
-#: bookwyrm/templates/search_results.html:38
-msgid "Didn't find what you were looking for?"
-msgstr "Nicht gefunden, wonach du gesucht hast?"
-
-#: bookwyrm/templates/search_results.html:40
-msgid "Show results from other catalogues"
-msgstr "Ergebnisse aus anderen Katalogen zeigen"
-
-#: bookwyrm/templates/search_results.html:44
-msgid "Hide results from other catalogues"
-msgstr "Ergebnisse aus anderen Katalogen ausblenden"
-
-#: bookwyrm/templates/search_results.html:63
+#: bookwyrm/templates/search/book.html:30
 #, fuzzy
 #| msgid "Show more"
 msgid "Show"
 msgstr "Mehr anzeigen"
 
-#: bookwyrm/templates/search_results.html:97
-msgid "Matching Users"
-msgstr "Passende Nutzer*innen"
+#: bookwyrm/templates/search/book.html:64
+#, fuzzy
+#| msgid "Show results from other catalogues"
+msgid "Load results from other catalogues"
+msgstr "Ergebnisse aus anderen Katalogen zeigen"
 
-#: bookwyrm/templates/search_results.html:117
-#, python-format
-msgid "No lists found for \"%(query)s\""
+#: bookwyrm/templates/search/book.html:68
+msgid "Log in to import or add books."
+msgstr ""
+
+#: bookwyrm/templates/search/layout.html:16
+#, fuzzy
+#| msgid "Search for a book or user"
+msgid "Search query"
+msgstr "Suche nach Buch oder Benutzer*in"
+
+#: bookwyrm/templates/search/layout.html:19
+#, fuzzy
+#| msgid "Search"
+msgid "Search type"
+msgstr "Suche"
+
+#: bookwyrm/templates/search/layout.html:21
+#: bookwyrm/templates/search/layout.html:42
+#: bookwyrm/templates/user/layout.html:73
+#, fuzzy
+#| msgid "Book"
+msgid "Books"
+msgstr "Buch"
+
+#: bookwyrm/templates/search/layout.html:23
+#: bookwyrm/templates/search/layout.html:46
+#: bookwyrm/templates/settings/admin_layout.html:26
+#: bookwyrm/templates/user_admin/user_admin.html:3
+#: bookwyrm/templates/user_admin/user_admin.html:10
+msgid "Users"
+msgstr ""
+
+#: bookwyrm/templates/search/layout.html:58
+#, fuzzy, python-format
+#| msgid "No lists found for \"%(query)s\""
+msgid "No results found for \"%(query)s\""
 msgstr "Keine Liste für \"%(query)s\" gefunden"
 
 #: bookwyrm/templates/settings/admin_layout.html:4
@@ -1948,12 +1973,6 @@ msgstr ""
 msgid "Manage Users"
 msgstr "Nutzer*innen verwalten"
 
-#: bookwyrm/templates/settings/admin_layout.html:26
-#: bookwyrm/templates/user_admin/user_admin.html:3
-#: bookwyrm/templates/user_admin/user_admin.html:10
-msgid "Users"
-msgstr ""
-
 #: bookwyrm/templates/settings/admin_layout.html:39
 #: bookwyrm/templates/settings/federation.html:3
 #: bookwyrm/templates/settings/federation.html:5
@@ -1986,7 +2005,7 @@ msgid "Footer Content"
 msgstr "Inhalt des Footers"
 
 #: bookwyrm/templates/settings/admin_layout.html:54
-#: bookwyrm/templates/settings/site.html:77
+#: bookwyrm/templates/settings/site.html:81
 msgid "Registration"
 msgstr "Registrierung"
 
@@ -2061,7 +2080,7 @@ msgid "Details"
 msgstr ""
 
 #: bookwyrm/templates/settings/federated_server.html:36
-#: bookwyrm/templates/user/user_layout.html:50
+#: bookwyrm/templates/user/layout.html:55
 msgid "Activity"
 msgstr "Aktivität"
 
@@ -2341,22 +2360,25 @@ msgstr "Unterstützungstitel"
 msgid "Admin email:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:79
+#: bookwyrm/templates/settings/site.html:73
+msgid "Additional info:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:83
 msgid "Allow registration:"
 msgstr "Registrierungen erlauben"
 
-#: bookwyrm/templates/settings/site.html:83
+#: bookwyrm/templates/settings/site.html:87
 #, fuzzy
 #| msgid "Follow Requests"
 msgid "Allow invite requests:"
 msgstr "Folgeanfragen"
 
-#: bookwyrm/templates/settings/site.html:87
+#: bookwyrm/templates/settings/site.html:91
 msgid "Registration closed text:"
 msgstr "Registrierungen geschlossen text"
 
-#: bookwyrm/templates/snippets/book_cover.html:20
-#: bookwyrm/templates/snippets/search_result_text.html:10
+#: bookwyrm/templates/snippets/book_cover.html:36
 #, fuzzy
 #| msgid "Add cover"
 msgid "No cover"
@@ -2659,7 +2681,8 @@ msgid "Post privacy"
 msgstr ""
 
 #: bookwyrm/templates/snippets/privacy_select.html:16
-#: bookwyrm/templates/user/followers.html:13
+#: bookwyrm/templates/user/relationships/followers.html:6
+#: bookwyrm/templates/user/relationships/layout.html:11
 msgid "Followers"
 msgstr "Folgende"
 
@@ -2687,16 +2710,16 @@ msgstr "Zeige alle Updates"
 msgid "Delete this progress update"
 msgstr "Dieses Fortschrittsupdate löschen"
 
-#: bookwyrm/templates/snippets/readthrough.html:51
+#: bookwyrm/templates/snippets/readthrough.html:52
 msgid "started"
 msgstr "Angefangen"
 
-#: bookwyrm/templates/snippets/readthrough.html:57
-#: bookwyrm/templates/snippets/readthrough.html:71
+#: bookwyrm/templates/snippets/readthrough.html:59
+#: bookwyrm/templates/snippets/readthrough.html:73
 msgid "Edit read dates"
 msgstr "Lesedaten bearbeiten"
 
-#: bookwyrm/templates/snippets/readthrough.html:61
+#: bookwyrm/templates/snippets/readthrough.html:63
 msgid "Delete these read dates"
 msgstr "Diese Lesedaten löschen"
 
@@ -2745,7 +2768,7 @@ msgstr "kommentierte"
 msgid "quoted"
 msgstr "zitierte"
 
-#: bookwyrm/templates/snippets/search_result_text.html:35
+#: bookwyrm/templates/snippets/search_result_text.html:36
 msgid "Import book"
 msgstr "Buch importieren"
 
@@ -2800,17 +2823,17 @@ msgstr "\"<em>%(book_title)s</em>\" beginnen"
 msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgstr "\"<em>%(book_title)s</em>\" auf Leseliste setzen"
 
-#: bookwyrm/templates/snippets/status/content_status.html:67
+#: bookwyrm/templates/snippets/status/content_status.html:70
 #: bookwyrm/templates/snippets/trimmed_text.html:14
 msgid "Show more"
 msgstr "Mehr anzeigen"
 
-#: bookwyrm/templates/snippets/status/content_status.html:82
+#: bookwyrm/templates/snippets/status/content_status.html:85
 #: bookwyrm/templates/snippets/trimmed_text.html:29
 msgid "Show less"
 msgstr "Weniger anzeigen"
 
-#: bookwyrm/templates/snippets/status/content_status.html:112
+#: bookwyrm/templates/snippets/status/content_status.html:115
 msgid "Open image in new window"
 msgstr "Bild in neuem Fenster öffnen"
 
@@ -2878,44 +2901,17 @@ msgstr "Zu lesen angefangen"
 msgid "Sorted descending"
 msgstr "Zu lesen angefangen"
 
-#: bookwyrm/templates/user/books_header.html:5
-#, fuzzy, python-format
-#| msgid "%(username)s's %(year)s Books"
-msgid "%(username)s's books"
-msgstr "%(username)ss %(year)s Bücher"
-
-#: bookwyrm/templates/user/create_shelf_form.html:5
-#: bookwyrm/templates/user/create_shelf_form.html:22
-msgid "Create Shelf"
-msgstr "Regal erstellen"
-
-#: bookwyrm/templates/user/edit_shelf_form.html:5
-msgid "Edit Shelf"
-msgstr "Regal bearbeiten"
-
-#: bookwyrm/templates/user/edit_shelf_form.html:26
-msgid "Update shelf"
-msgstr "Regal aktualisieren"
-
-#: bookwyrm/templates/user/followers.html:7
-#: bookwyrm/templates/user/following.html:7
-#: bookwyrm/templates/user/user.html:10
+#: bookwyrm/templates/user/layout.html:12 bookwyrm/templates/user/user.html:10
 msgid "User Profile"
 msgstr "Benutzerprofil"
 
-#: bookwyrm/templates/user/followers.html:29
-#, python-format
-msgid "%(username)s has no followers"
-msgstr "niemand folgt %(username)s "
+#: bookwyrm/templates/user/layout.html:36
+msgid "Follow Requests"
+msgstr "Folgeanfragen"
 
-#: bookwyrm/templates/user/following.html:13
-msgid "Following"
-msgstr "Folgend"
-
-#: bookwyrm/templates/user/following.html:29
-#, python-format
-msgid "%(username)s isn't following any users"
-msgstr "%(username)s folgt niemandem"
+#: bookwyrm/templates/user/layout.html:61
+msgid "Reading Goal"
+msgstr "Leseziel"
 
 #: bookwyrm/templates/user/lists.html:11
 #, python-format
@@ -2926,37 +2922,74 @@ msgstr "Listen: %(username)s"
 msgid "Create list"
 msgstr "Liste Erstellen"
 
-#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:51
+#: bookwyrm/templates/user/relationships/followers.html:12
+#, python-format
+msgid "%(username)s has no followers"
+msgstr "niemand folgt %(username)s "
+
+#: bookwyrm/templates/user/relationships/following.html:6
+#: bookwyrm/templates/user/relationships/layout.html:15
+msgid "Following"
+msgstr "Folgend"
+
+#: bookwyrm/templates/user/relationships/following.html:12
+#, python-format
+msgid "%(username)s isn't following any users"
+msgstr "%(username)s folgt niemandem"
+
+#: bookwyrm/templates/user/shelf/books_header.html:5
+#, fuzzy, python-format
+#| msgid "%(username)s's %(year)s Books"
+msgid "%(username)s's books"
+msgstr "%(username)ss %(year)s Bücher"
+
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:5
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:22
+msgid "Create Shelf"
+msgstr "Regal erstellen"
+
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:5
+msgid "Edit Shelf"
+msgstr "Regal bearbeiten"
+
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:26
+msgid "Update shelf"
+msgstr "Regal aktualisieren"
+
+#: bookwyrm/templates/user/shelf/shelf.html:24 bookwyrm/views/shelf.py:48
 #, fuzzy
 #| msgid "books"
 msgid "All books"
 msgstr "Bücher"
 
-#: bookwyrm/templates/user/shelf.html:37
+#: bookwyrm/templates/user/shelf/shelf.html:37
 msgid "Create shelf"
 msgstr "Regal erstellen"
 
-#: bookwyrm/templates/user/shelf.html:58
+#: bookwyrm/templates/user/shelf/shelf.html:60
 msgid "Edit shelf"
 msgstr "Regal bearbeiten"
 
-#: bookwyrm/templates/user/shelf.html:77 bookwyrm/templates/user/shelf.html:99
+#: bookwyrm/templates/user/shelf/shelf.html:79
+#: bookwyrm/templates/user/shelf/shelf.html:101
 msgid "Shelved"
 msgstr "Ins Regal gestellt"
 
-#: bookwyrm/templates/user/shelf.html:78 bookwyrm/templates/user/shelf.html:103
+#: bookwyrm/templates/user/shelf/shelf.html:80
+#: bookwyrm/templates/user/shelf/shelf.html:105
 msgid "Started"
 msgstr "Gestartet"
 
-#: bookwyrm/templates/user/shelf.html:79 bookwyrm/templates/user/shelf.html:106
+#: bookwyrm/templates/user/shelf/shelf.html:81
+#: bookwyrm/templates/user/shelf/shelf.html:108
 msgid "Finished"
 msgstr "Abgeschlossen"
 
-#: bookwyrm/templates/user/shelf.html:132
+#: bookwyrm/templates/user/shelf/shelf.html:134
 msgid "This shelf is empty."
 msgstr "Dieses Regal ist leer."
 
-#: bookwyrm/templates/user/shelf.html:138
+#: bookwyrm/templates/user/shelf/shelf.html:140
 msgid "Delete shelf"
 msgstr "Regal löschen"
 
@@ -2974,54 +3007,43 @@ msgstr "Alle %(size)s anzeigen"
 msgid "View all books"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:59
-#, python-format
-msgid "Set a reading goal for %(year)s"
-msgstr "Leseziel für %(year)s setzen"
-
-#: bookwyrm/templates/user/user.html:65
+#: bookwyrm/templates/user/user.html:60
 msgid "User Activity"
 msgstr "Nutzer*innenaktivität"
 
-#: bookwyrm/templates/user/user.html:68
+#: bookwyrm/templates/user/user.html:63
 msgid "RSS feed"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:79
+#: bookwyrm/templates/user/user.html:74
 msgid "No activities yet!"
 msgstr "Noch keine Aktivitäten!"
 
-#: bookwyrm/templates/user/user_layout.html:32
-msgid "Follow Requests"
-msgstr "Folgeanfragen"
-
-#: bookwyrm/templates/user/user_layout.html:56
-msgid "Reading Goal"
-msgstr "Leseziel"
-
-#: bookwyrm/templates/user/user_layout.html:68
-#, fuzzy
-#| msgid "Book"
-msgid "Books"
-msgstr "Buch"
-
-#: bookwyrm/templates/user/user_preview.html:13
+#: bookwyrm/templates/user/user_preview.html:14
 #, python-format
 msgid "Joined %(date)s"
 msgstr "Beigetreten %(date)s"
 
-#: bookwyrm/templates/user/user_preview.html:15
+#: bookwyrm/templates/user/user_preview.html:18
 #, python-format
 msgid "%(counter)s follower"
 msgid_plural "%(counter)s followers"
 msgstr[0] "%(counter)s Folgende*r"
 msgstr[1] "%(counter)s Folgende"
 
-#: bookwyrm/templates/user/user_preview.html:16
+#: bookwyrm/templates/user/user_preview.html:19
 #, python-format
 msgid "%(counter)s following"
 msgstr "Folgt %(counter)s"
 
+#: bookwyrm/templates/user/user_preview.html:25
+#, fuzzy, python-format
+#| msgid "followed you"
+msgid "%(mutuals_display)s follower you follow"
+msgid_plural "%(mutuals_display)s followers you follow"
+msgstr[0] "folgt dir"
+msgstr[1] "folgt dir"
+
 #: bookwyrm/templates/user_admin/user.html:11
 #, fuzzy
 #| msgid "Back to reports"
@@ -4507,6 +4529,19 @@ msgctxt "stick"
 msgid "club"
 msgstr ""
 
+#~ msgid "Didn't find what you were looking for?"
+#~ msgstr "Nicht gefunden, wonach du gesucht hast?"
+
+#~ msgid "Hide results from other catalogues"
+#~ msgstr "Ergebnisse aus anderen Katalogen ausblenden"
+
+#~ msgid "Matching Users"
+#~ msgstr "Passende Nutzer*innen"
+
+#, python-format
+#~ msgid "Set a reading goal for %(year)s"
+#~ msgstr "Leseziel für %(year)s setzen"
+
 #, python-format
 #~ msgid "by %(author)s"
 #~ msgstr "von %(author)s"
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index c3df47ae..c886a742 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-29 13:24-0700\n"
+"POT-Creation-Date: 2021-05-01 10:56-0700\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"
@@ -56,11 +56,12 @@ msgid "Book Title"
 msgstr ""
 
 #: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:31
-#: bookwyrm/templates/user/shelf.html:80 bookwyrm/templates/user/shelf.html:110
+#: bookwyrm/templates/user/shelf/shelf.html:82
+#: bookwyrm/templates/user/shelf/shelf.html:112
 msgid "Rating"
 msgstr ""
 
-#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:82
+#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:100
 msgid "Sort By"
 msgstr ""
 
@@ -82,7 +83,7 @@ msgstr ""
 msgid "%(value)s is not a valid username"
 msgstr ""
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:153
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:156
 msgid "username"
 msgstr ""
 
@@ -144,8 +145,8 @@ msgid "Books by %(name)s"
 msgstr ""
 
 #: bookwyrm/templates/book/book.html:33
-#: bookwyrm/templates/discover/large-book.html:12
-#: bookwyrm/templates/discover/small-book.html:9
+#: bookwyrm/templates/discover/large-book.html:25
+#: bookwyrm/templates/discover/small-book.html:19
 msgid "by"
 msgstr ""
 
@@ -153,48 +154,48 @@ msgstr ""
 msgid "Edit Book"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:61
+#: bookwyrm/templates/book/book.html:60
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:65
+#: bookwyrm/templates/book/book.html:64
 msgid "Failed to load cover"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:82
+#: bookwyrm/templates/book/book.html:81
 msgid "View on OpenLibrary"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:85
+#: bookwyrm/templates/book/book.html:84
 msgid "View on Inventaire"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:105
+#: bookwyrm/templates/book/book.html:104
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/book/book.html:117
+#: bookwyrm/templates/book/book.html:116
 msgid "Add Description"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:124
+#: bookwyrm/templates/book/book.html:123
 #: bookwyrm/templates/book/edit_book.html:107
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:128
-#: bookwyrm/templates/book/edit_book.html:240
+#: bookwyrm/templates/book/book.html:127
+#: bookwyrm/templates/book/edit_book.html:241
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:93
-#: bookwyrm/templates/settings/site.html:93
-#: bookwyrm/templates/snippets/readthrough.html:75
+#: bookwyrm/templates/settings/site.html:97
+#: bookwyrm/templates/snippets/readthrough.html:77
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
@@ -202,15 +203,15 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:129 bookwyrm/templates/book/book.html:178
+#: bookwyrm/templates/book/book.html:128 bookwyrm/templates/book/book.html:180
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:241
+#: bookwyrm/templates/book/edit_book.html:242
 #: bookwyrm/templates/edit_author.html:79
 #: bookwyrm/templates/moderation/report_modal.html:34
 #: bookwyrm/templates/settings/federated_server.html:94
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/readthrough.html:76
+#: bookwyrm/templates/snippets/readthrough.html:78
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
@@ -218,105 +219,106 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:138
+#: bookwyrm/templates/book/book.html:137
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:146
+#: bookwyrm/templates/book/book.html:145
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:152
+#: bookwyrm/templates/book/book.html:151
 #, python-format
 msgid ""
 "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a "
 "href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:161
+#: bookwyrm/templates/book/book.html:162
 msgid "Your reading activity"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:163
+#: bookwyrm/templates/book/book.html:165
 msgid "Add read dates"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:168
+#: bookwyrm/templates/book/book.html:170
 msgid "You don't have any reading activity for this book."
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:175
+#: bookwyrm/templates/book/book.html:177
 msgid "Create"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:197
-msgid "Subjects"
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:209
-msgid "Places"
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:65
-#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
-#: bookwyrm/templates/search_results.html:115
-#: bookwyrm/templates/user/user_layout.html:62
-msgid "Lists"
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:231
-msgid "Add to list"
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:241
-#: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:133
-msgid "Add"
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:257
+#: bookwyrm/templates/book/book.html:203
 msgid "Reviews"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:262
+#: bookwyrm/templates/book/book.html:208
 msgid "Your reviews"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:268
+#: bookwyrm/templates/book/book.html:214
 msgid "Your comments"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:274
+#: bookwyrm/templates/book/book.html:220
 msgid "Your quotes"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:308
+#: bookwyrm/templates/book/book.html:255
 msgid "rated it"
 msgstr ""
 
+#: bookwyrm/templates/book/book.html:276
+msgid "Subjects"
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:288
+msgid "Places"
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:299 bookwyrm/templates/layout.html:65
+#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
+#: bookwyrm/templates/search/layout.html:25
+#: bookwyrm/templates/search/layout.html:50
+#: bookwyrm/templates/user/layout.html:67
+msgid "Lists"
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:310
+msgid "Add to list"
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:320
+#: bookwyrm/templates/book/cover_modal.html:31
+#: bookwyrm/templates/lists/list.html:163
+msgid "Add"
+msgstr ""
+
 #: bookwyrm/templates/book/book_identifiers.html:8
 msgid "ISBN:"
 msgstr ""
 
 #: bookwyrm/templates/book/book_identifiers.html:15
-#: bookwyrm/templates/book/edit_book.html:226
+#: bookwyrm/templates/book/edit_book.html:227
 msgid "OCLC Number:"
 msgstr ""
 
 #: bookwyrm/templates/book/book_identifiers.html:22
-#: bookwyrm/templates/book/edit_book.html:230
+#: bookwyrm/templates/book/edit_book.html:231
 msgid "ASIN:"
 msgstr ""
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:179
 msgid "Upload cover:"
 msgstr ""
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:184
+#: bookwyrm/templates/book/edit_book.html:185
 msgid "Load cover from url:"
 msgstr ""
 
@@ -442,36 +444,36 @@ msgid "John Doe, Jane Smith"
 msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:170
-#: bookwyrm/templates/user/shelf.html:74
+#: bookwyrm/templates/user/shelf/shelf.html:76
 msgid "Cover"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:197
+#: bookwyrm/templates/book/edit_book.html:198
 msgid "Physical Properties"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:198
+#: bookwyrm/templates/book/edit_book.html:199
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:206
+#: bookwyrm/templates/book/edit_book.html:207
 msgid "Pages:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:213
+#: bookwyrm/templates/book/edit_book.html:214
 msgid "Book Identifiers"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:215
 msgid "ISBN 13:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:218
+#: bookwyrm/templates/book/edit_book.html:219
 msgid "ISBN 10:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:222
+#: bookwyrm/templates/book/edit_book.html:223
 #: bookwyrm/templates/edit_author.html:59
 msgid "Openlibrary key:"
 msgstr ""
@@ -535,7 +537,7 @@ msgstr ""
 #: bookwyrm/templates/feed/feed_layout.html:70
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
-#: bookwyrm/templates/search_results.html:72
+#: bookwyrm/templates/search/book.html:39
 msgid "Close"
 msgstr ""
 
@@ -555,48 +557,28 @@ msgstr ""
 msgid "Federated community"
 msgstr ""
 
-#: bookwyrm/templates/directory/directory.html:6
-#: bookwyrm/templates/directory/directory.html:11
+#: bookwyrm/templates/directory/directory.html:4
+#: bookwyrm/templates/directory/directory.html:9
 #: bookwyrm/templates/layout.html:93
 msgid "Directory"
 msgstr ""
 
-#: bookwyrm/templates/directory/directory.html:19
+#: bookwyrm/templates/directory/directory.html:17
 msgid "Make your profile discoverable to other BookWyrm users."
 msgstr ""
 
-#: bookwyrm/templates/directory/directory.html:26
+#: bookwyrm/templates/directory/directory.html:24
 #, python-format
 msgid ""
 "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</"
 "a>"
 msgstr ""
 
-#: bookwyrm/templates/directory/directory.html:31
+#: bookwyrm/templates/directory/directory.html:29
 #: bookwyrm/templates/snippets/goal_card.html:22
 msgid "Dismiss message"
 msgstr ""
 
-#: bookwyrm/templates/directory/directory.html:71
-msgid "follower you follow"
-msgid_plural "followers you follow"
-msgstr[0] ""
-msgstr[1] ""
-
-#: bookwyrm/templates/directory/directory.html:78
-msgid "book on your shelves"
-msgid_plural "books on your shelves"
-msgstr[0] ""
-msgstr[1] ""
-
-#: bookwyrm/templates/directory/directory.html:86
-msgid "posts"
-msgstr ""
-
-#: bookwyrm/templates/directory/directory.html:92
-msgid "last active"
-msgstr ""
-
 #: bookwyrm/templates/directory/sort_filter.html:5
 msgid "Order by"
 msgstr ""
@@ -609,6 +591,26 @@ msgstr ""
 msgid "Recently active"
 msgstr ""
 
+#: bookwyrm/templates/directory/user_card.html:32
+msgid "follower you follow"
+msgid_plural "followers you follow"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/directory/user_card.html:39
+msgid "book on your shelves"
+msgid_plural "books on your shelves"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/directory/user_card.html:47
+msgid "posts"
+msgstr ""
+
+#: bookwyrm/templates/directory/user_card.html:53
+msgid "last active"
+msgstr ""
+
 #: bookwyrm/templates/directory/user_type_filter.html:5
 msgid "User type"
 msgstr ""
@@ -696,8 +698,8 @@ msgid "Edit Author:"
 msgstr ""
 
 #: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
-#: bookwyrm/templates/user/create_shelf_form.html:13
-#: bookwyrm/templates/user/edit_shelf_form.html:14
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:13
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:14
 msgid "Name:"
 msgstr ""
 
@@ -864,7 +866,7 @@ msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:11
 #: bookwyrm/templates/layout.html:59
-#: bookwyrm/templates/user/books_header.html:3
+#: bookwyrm/templates/user/shelf/books_header.html:3
 msgid "Your books"
 msgstr ""
 
@@ -874,18 +876,18 @@ msgid ""
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:24
-#: bookwyrm/templates/user/shelf.html:28
+#: bookwyrm/templates/user/shelf/shelf.html:28
 msgid "To Read"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:25
-#: bookwyrm/templates/user/shelf.html:28
+#: bookwyrm/templates/user/shelf/shelf.html:28
 msgid "Currently Reading"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:26
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-#: bookwyrm/templates/user/shelf.html:28
+#: bookwyrm/templates/user/shelf/shelf.html:28
 msgid "Read"
 msgstr ""
 
@@ -919,13 +921,12 @@ msgid "What are you reading?"
 msgstr ""
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:101
+#: bookwyrm/templates/lists/list.html:119
 msgid "Search for a book"
 msgstr ""
 
 #: bookwyrm/templates/get_started/books.html:11
 #: bookwyrm/templates/isbn_search_results.html:17
-#: bookwyrm/templates/search_results.html:17
 #, python-format
 msgid "No books found for \"%(query)s\""
 msgstr ""
@@ -940,25 +941,27 @@ msgstr ""
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
 #: bookwyrm/templates/layout.html:38 bookwyrm/templates/layout.html:39
-#: bookwyrm/templates/lists/list.html:105
+#: bookwyrm/templates/lists/list.html:123
+#: bookwyrm/templates/search/layout.html:4
+#: bookwyrm/templates/search/layout.html:9
 msgid "Search"
 msgstr ""
 
-#: bookwyrm/templates/get_started/books.html:26
+#: bookwyrm/templates/get_started/books.html:27
 msgid "Suggested Books"
 msgstr ""
 
-#: bookwyrm/templates/get_started/books.html:41
+#: bookwyrm/templates/get_started/books.html:46
 #, python-format
 msgid "Popular on %(site_name)s"
 msgstr ""
 
-#: bookwyrm/templates/get_started/books.html:51
-#: bookwyrm/templates/lists/list.html:118
+#: bookwyrm/templates/get_started/books.html:58
+#: bookwyrm/templates/lists/list.html:136
 msgid "No books found"
 msgstr ""
 
-#: bookwyrm/templates/get_started/books.html:54
+#: bookwyrm/templates/get_started/books.html:63
 #: bookwyrm/templates/get_started/profile.html:54
 msgid "Save &amp; continue"
 msgstr ""
@@ -1033,7 +1036,6 @@ msgid "Search for a user"
 msgstr ""
 
 #: bookwyrm/templates/get_started/users.html:13
-#: bookwyrm/templates/search_results.html:99
 #, python-format
 msgid "No users found for \"%(query)s\""
 msgstr ""
@@ -1153,18 +1155,19 @@ msgid "Successfully imported"
 msgstr ""
 
 #: bookwyrm/templates/import_status.html:112
-#: bookwyrm/templates/lists/curate.html:14
 msgid "Book"
 msgstr ""
 
 #: bookwyrm/templates/import_status.html:115
 #: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/user/shelf.html:75 bookwyrm/templates/user/shelf.html:93
+#: bookwyrm/templates/user/shelf/shelf.html:77
+#: bookwyrm/templates/user/shelf/shelf.html:95
 msgid "Title"
 msgstr ""
 
 #: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/user/shelf.html:76 bookwyrm/templates/user/shelf.html:96
+#: bookwyrm/templates/user/shelf/shelf.html:78
+#: bookwyrm/templates/user/shelf/shelf.html:98
 msgid "Author"
 msgstr ""
 
@@ -1186,18 +1189,15 @@ msgid "Sorry! This invite code is no longer valid."
 msgstr ""
 
 #: bookwyrm/templates/isbn_search_results.html:4
-#: bookwyrm/templates/search_results.html:4
 msgid "Search Results"
 msgstr ""
 
 #: bookwyrm/templates/isbn_search_results.html:9
-#: bookwyrm/templates/search_results.html:9
 #, python-format
 msgid "Search Results for \"%(query)s\""
 msgstr ""
 
 #: bookwyrm/templates/isbn_search_results.html:14
-#: bookwyrm/templates/search_results.html:14
 msgid "Matching Books"
 msgstr ""
 
@@ -1239,45 +1239,49 @@ msgstr ""
 msgid "Notifications"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:152 bookwyrm/templates/layout.html:156
+#: bookwyrm/templates/layout.html:155 bookwyrm/templates/layout.html:159
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:157
+#: bookwyrm/templates/layout.html:160
 msgid "password"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:158 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:161 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:161 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:169
+#: bookwyrm/templates/layout.html:172
 msgid "Join"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:195
+#: bookwyrm/templates/layout.html:198
 msgid "About this server"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:199
+#: bookwyrm/templates/layout.html:202
 msgid "Contact site admin"
 msgstr ""
 
 #: bookwyrm/templates/layout.html:206
+msgid "Documentation"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:213
 #, python-format
 msgid ""
 "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">"
 "%(support_title)s</a>"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:210
+#: bookwyrm/templates/layout.html:217
 msgid ""
 "BookWyrm is open source software. You can contribute or report issues on <a "
 "href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
@@ -1298,27 +1302,27 @@ msgstr ""
 msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
 msgstr ""
 
-#: bookwyrm/templates/lists/curate.html:6
+#: bookwyrm/templates/lists/curate.html:8
 msgid "Pending Books"
 msgstr ""
 
-#: bookwyrm/templates/lists/curate.html:7
+#: bookwyrm/templates/lists/curate.html:11
 msgid "Go to list"
 msgstr ""
 
-#: bookwyrm/templates/lists/curate.html:9
+#: bookwyrm/templates/lists/curate.html:15
 msgid "You're all set!"
 msgstr ""
 
-#: bookwyrm/templates/lists/curate.html:15
+#: bookwyrm/templates/lists/curate.html:45
 msgid "Suggested by"
 msgstr ""
 
-#: bookwyrm/templates/lists/curate.html:35
+#: bookwyrm/templates/lists/curate.html:57
 msgid "Approve"
 msgstr ""
 
-#: bookwyrm/templates/lists/curate.html:41
+#: bookwyrm/templates/lists/curate.html:63
 msgid "Discard"
 msgstr ""
 
@@ -1368,54 +1372,54 @@ msgstr ""
 msgid "This list is currently empty"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:46
+#: bookwyrm/templates/lists/list.html:64
 #, python-format
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:58
+#: bookwyrm/templates/lists/list.html:76
 msgid "Set"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:61
+#: bookwyrm/templates/lists/list.html:79
 msgid "List position"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:67
+#: bookwyrm/templates/lists/list.html:85
 #: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:80 bookwyrm/templates/lists/list.html:92
+#: bookwyrm/templates/lists/list.html:98 bookwyrm/templates/lists/list.html:110
 msgid "Sort List"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:86
+#: bookwyrm/templates/lists/list.html:104
 msgid "Direction"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:97
+#: bookwyrm/templates/lists/list.html:115
 msgid "Add Books"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:97
+#: bookwyrm/templates/lists/list.html:115
 msgid "Suggest Books"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:106
+#: bookwyrm/templates/lists/list.html:124
 msgid "search"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:112
+#: bookwyrm/templates/lists/list.html:130
 msgid "Clear search"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:117
+#: bookwyrm/templates/lists/list.html:135
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:133
+#: bookwyrm/templates/lists/list.html:163
 msgid "Suggest"
 msgstr ""
 
@@ -1740,33 +1744,43 @@ msgstr ""
 msgid "Relationships"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:20
-msgid "Log in to import or add books."
-msgstr ""
-
-#: bookwyrm/templates/search_results.html:38
-msgid "Didn't find what you were looking for?"
-msgstr ""
-
-#: bookwyrm/templates/search_results.html:40
-msgid "Show results from other catalogues"
-msgstr ""
-
-#: bookwyrm/templates/search_results.html:44
-msgid "Hide results from other catalogues"
-msgstr ""
-
-#: bookwyrm/templates/search_results.html:63
+#: bookwyrm/templates/search/book.html:30
 msgid "Show"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:97
-msgid "Matching Users"
+#: bookwyrm/templates/search/book.html:64
+msgid "Load results from other catalogues"
 msgstr ""
 
-#: bookwyrm/templates/search_results.html:117
+#: bookwyrm/templates/search/book.html:68
+msgid "Log in to import or add books."
+msgstr ""
+
+#: bookwyrm/templates/search/layout.html:16
+msgid "Search query"
+msgstr ""
+
+#: bookwyrm/templates/search/layout.html:19
+msgid "Search type"
+msgstr ""
+
+#: bookwyrm/templates/search/layout.html:21
+#: bookwyrm/templates/search/layout.html:42
+#: bookwyrm/templates/user/layout.html:73
+msgid "Books"
+msgstr ""
+
+#: bookwyrm/templates/search/layout.html:23
+#: bookwyrm/templates/search/layout.html:46
+#: bookwyrm/templates/settings/admin_layout.html:26
+#: bookwyrm/templates/user_admin/user_admin.html:3
+#: bookwyrm/templates/user_admin/user_admin.html:10
+msgid "Users"
+msgstr ""
+
+#: bookwyrm/templates/search/layout.html:58
 #, python-format
-msgid "No lists found for \"%(query)s\""
+msgid "No results found for \"%(query)s\""
 msgstr ""
 
 #: bookwyrm/templates/settings/admin_layout.html:4
@@ -1777,12 +1791,6 @@ msgstr ""
 msgid "Manage Users"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:26
-#: bookwyrm/templates/user_admin/user_admin.html:3
-#: bookwyrm/templates/user_admin/user_admin.html:10
-msgid "Users"
-msgstr ""
-
 #: bookwyrm/templates/settings/admin_layout.html:39
 #: bookwyrm/templates/settings/federation.html:3
 #: bookwyrm/templates/settings/federation.html:5
@@ -1815,7 +1823,7 @@ msgid "Footer Content"
 msgstr ""
 
 #: bookwyrm/templates/settings/admin_layout.html:54
-#: bookwyrm/templates/settings/site.html:77
+#: bookwyrm/templates/settings/site.html:81
 msgid "Registration"
 msgstr ""
 
@@ -1876,7 +1884,7 @@ msgid "Details"
 msgstr ""
 
 #: bookwyrm/templates/settings/federated_server.html:36
-#: bookwyrm/templates/user/user_layout.html:50
+#: bookwyrm/templates/user/layout.html:55
 msgid "Activity"
 msgstr ""
 
@@ -2124,20 +2132,23 @@ msgstr ""
 msgid "Admin email:"
 msgstr ""
 
-#: bookwyrm/templates/settings/site.html:79
-msgid "Allow registration:"
+#: bookwyrm/templates/settings/site.html:73
+msgid "Additional info:"
 msgstr ""
 
 #: bookwyrm/templates/settings/site.html:83
-msgid "Allow invite requests:"
+msgid "Allow registration:"
 msgstr ""
 
 #: bookwyrm/templates/settings/site.html:87
+msgid "Allow invite requests:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:91
 msgid "Registration closed text:"
 msgstr ""
 
-#: bookwyrm/templates/snippets/book_cover.html:20
-#: bookwyrm/templates/snippets/search_result_text.html:10
+#: bookwyrm/templates/snippets/book_cover.html:36
 msgid "No cover"
 msgstr ""
 
@@ -2410,7 +2421,8 @@ msgid "Post privacy"
 msgstr ""
 
 #: bookwyrm/templates/snippets/privacy_select.html:16
-#: bookwyrm/templates/user/followers.html:13
+#: bookwyrm/templates/user/relationships/followers.html:6
+#: bookwyrm/templates/user/relationships/layout.html:11
 msgid "Followers"
 msgstr ""
 
@@ -2438,16 +2450,16 @@ msgstr ""
 msgid "Delete this progress update"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:51
+#: bookwyrm/templates/snippets/readthrough.html:52
 msgid "started"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:57
-#: bookwyrm/templates/snippets/readthrough.html:71
+#: bookwyrm/templates/snippets/readthrough.html:59
+#: bookwyrm/templates/snippets/readthrough.html:73
 msgid "Edit read dates"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough.html:61
+#: bookwyrm/templates/snippets/readthrough.html:63
 msgid "Delete these read dates"
 msgstr ""
 
@@ -2494,7 +2506,7 @@ msgstr ""
 msgid "quoted"
 msgstr ""
 
-#: bookwyrm/templates/snippets/search_result_text.html:35
+#: bookwyrm/templates/snippets/search_result_text.html:36
 msgid "Import book"
 msgstr ""
 
@@ -2544,17 +2556,17 @@ msgstr ""
 msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/content_status.html:67
+#: bookwyrm/templates/snippets/status/content_status.html:70
 #: bookwyrm/templates/snippets/trimmed_text.html:14
 msgid "Show more"
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/content_status.html:82
+#: bookwyrm/templates/snippets/status/content_status.html:85
 #: bookwyrm/templates/snippets/trimmed_text.html:29
 msgid "Show less"
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/content_status.html:112
+#: bookwyrm/templates/snippets/status/content_status.html:115
 msgid "Open image in new window"
 msgstr ""
 
@@ -2611,42 +2623,16 @@ msgstr ""
 msgid "Sorted descending"
 msgstr ""
 
-#: bookwyrm/templates/user/books_header.html:5
-#, python-format
-msgid "%(username)s's books"
-msgstr ""
-
-#: bookwyrm/templates/user/create_shelf_form.html:5
-#: bookwyrm/templates/user/create_shelf_form.html:22
-msgid "Create Shelf"
-msgstr ""
-
-#: bookwyrm/templates/user/edit_shelf_form.html:5
-msgid "Edit Shelf"
-msgstr ""
-
-#: bookwyrm/templates/user/edit_shelf_form.html:26
-msgid "Update shelf"
-msgstr ""
-
-#: bookwyrm/templates/user/followers.html:7
-#: bookwyrm/templates/user/following.html:7
-#: bookwyrm/templates/user/user.html:10
+#: bookwyrm/templates/user/layout.html:12 bookwyrm/templates/user/user.html:10
 msgid "User Profile"
 msgstr ""
 
-#: bookwyrm/templates/user/followers.html:29
-#, python-format
-msgid "%(username)s has no followers"
+#: bookwyrm/templates/user/layout.html:36
+msgid "Follow Requests"
 msgstr ""
 
-#: bookwyrm/templates/user/following.html:13
-msgid "Following"
-msgstr ""
-
-#: bookwyrm/templates/user/following.html:29
-#, python-format
-msgid "%(username)s isn't following any users"
+#: bookwyrm/templates/user/layout.html:61
+msgid "Reading Goal"
 msgstr ""
 
 #: bookwyrm/templates/user/lists.html:11
@@ -2658,35 +2644,71 @@ msgstr ""
 msgid "Create list"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:51
+#: bookwyrm/templates/user/relationships/followers.html:12
+#, python-format
+msgid "%(username)s has no followers"
+msgstr ""
+
+#: bookwyrm/templates/user/relationships/following.html:6
+#: bookwyrm/templates/user/relationships/layout.html:15
+msgid "Following"
+msgstr ""
+
+#: bookwyrm/templates/user/relationships/following.html:12
+#, python-format
+msgid "%(username)s isn't following any users"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf/books_header.html:5
+#, python-format
+msgid "%(username)s's books"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:5
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:22
+msgid "Create Shelf"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:5
+msgid "Edit Shelf"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:26
+msgid "Update shelf"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf/shelf.html:24 bookwyrm/views/shelf.py:48
 msgid "All books"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:37
+#: bookwyrm/templates/user/shelf/shelf.html:37
 msgid "Create shelf"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:58
+#: bookwyrm/templates/user/shelf/shelf.html:60
 msgid "Edit shelf"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:77 bookwyrm/templates/user/shelf.html:99
+#: bookwyrm/templates/user/shelf/shelf.html:79
+#: bookwyrm/templates/user/shelf/shelf.html:101
 msgid "Shelved"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:78 bookwyrm/templates/user/shelf.html:103
+#: bookwyrm/templates/user/shelf/shelf.html:80
+#: bookwyrm/templates/user/shelf/shelf.html:105
 msgid "Started"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:79 bookwyrm/templates/user/shelf.html:106
+#: bookwyrm/templates/user/shelf/shelf.html:81
+#: bookwyrm/templates/user/shelf/shelf.html:108
 msgid "Finished"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:132
+#: bookwyrm/templates/user/shelf/shelf.html:134
 msgid "This shelf is empty."
 msgstr ""
 
-#: bookwyrm/templates/user/shelf.html:138
+#: bookwyrm/templates/user/shelf/shelf.html:140
 msgid "Delete shelf"
 msgstr ""
 
@@ -2703,52 +2725,42 @@ msgstr ""
 msgid "View all books"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:59
-#, python-format
-msgid "Set a reading goal for %(year)s"
-msgstr ""
-
-#: bookwyrm/templates/user/user.html:65
+#: bookwyrm/templates/user/user.html:60
 msgid "User Activity"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:68
+#: bookwyrm/templates/user/user.html:63
 msgid "RSS feed"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:79
+#: bookwyrm/templates/user/user.html:74
 msgid "No activities yet!"
 msgstr ""
 
-#: bookwyrm/templates/user/user_layout.html:32
-msgid "Follow Requests"
-msgstr ""
-
-#: bookwyrm/templates/user/user_layout.html:56
-msgid "Reading Goal"
-msgstr ""
-
-#: bookwyrm/templates/user/user_layout.html:68
-msgid "Books"
-msgstr ""
-
-#: bookwyrm/templates/user/user_preview.html:13
+#: bookwyrm/templates/user/user_preview.html:14
 #, python-format
 msgid "Joined %(date)s"
 msgstr ""
 
-#: bookwyrm/templates/user/user_preview.html:15
+#: bookwyrm/templates/user/user_preview.html:18
 #, python-format
 msgid "%(counter)s follower"
 msgid_plural "%(counter)s followers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/user/user_preview.html:16
+#: bookwyrm/templates/user/user_preview.html:19
 #, python-format
 msgid "%(counter)s following"
 msgstr ""
 
+#: bookwyrm/templates/user/user_preview.html:25
+#, python-format
+msgid "%(mutuals_display)s follower you follow"
+msgid_plural "%(mutuals_display)s followers you follow"
+msgstr[0] ""
+msgstr[1] ""
+
 #: bookwyrm/templates/user_admin/user.html:11
 msgid "Back to users"
 msgstr ""
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index dab4c486..a4290857 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-29 13:24-0700\n"
+"POT-Creation-Date: 2021-05-01 10:56-0700\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -56,11 +56,12 @@ msgid "Book Title"
 msgstr "Título"
 
 #: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:31
-#: bookwyrm/templates/user/shelf.html:80 bookwyrm/templates/user/shelf.html:110
+#: bookwyrm/templates/user/shelf/shelf.html:82
+#: bookwyrm/templates/user/shelf/shelf.html:112
 msgid "Rating"
 msgstr "Calificación"
 
-#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:82
+#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:100
 msgid "Sort By"
 msgstr "Ordenar por"
 
@@ -82,7 +83,7 @@ msgstr "%(value)s no es un remote_id válido"
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s no es un usuario válido"
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:153
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:156
 msgid "username"
 msgstr "nombre de usuario"
 
@@ -144,8 +145,8 @@ msgid "Books by %(name)s"
 msgstr "Libros de %(name)s"
 
 #: bookwyrm/templates/book/book.html:33
-#: bookwyrm/templates/discover/large-book.html:12
-#: bookwyrm/templates/discover/small-book.html:9
+#: bookwyrm/templates/discover/large-book.html:25
+#: bookwyrm/templates/discover/small-book.html:19
 msgid "by"
 msgstr "por"
 
@@ -153,50 +154,50 @@ msgstr "por"
 msgid "Edit Book"
 msgstr "Editar Libro"
 
-#: bookwyrm/templates/book/book.html:61
+#: bookwyrm/templates/book/book.html:60
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "Agregar portada"
 
-#: bookwyrm/templates/book/book.html:65
+#: bookwyrm/templates/book/book.html:64
 msgid "Failed to load cover"
 msgstr "No se pudo cargar la portada"
 
-#: bookwyrm/templates/book/book.html:82
+#: bookwyrm/templates/book/book.html:81
 msgid "View on OpenLibrary"
 msgstr "Ver en OpenLibrary"
 
-#: bookwyrm/templates/book/book.html:85
+#: bookwyrm/templates/book/book.html:84
 #, fuzzy
 #| msgid "View on OpenLibrary"
 msgid "View on Inventaire"
 msgstr "Ver en OpenLibrary"
 
-#: bookwyrm/templates/book/book.html:105
+#: bookwyrm/templates/book/book.html:104
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s reseña)"
 msgstr[1] "(%(review_count)s reseñas)"
 
-#: bookwyrm/templates/book/book.html:117
+#: bookwyrm/templates/book/book.html:116
 msgid "Add Description"
 msgstr "Agregar descripción"
 
-#: bookwyrm/templates/book/book.html:124
+#: bookwyrm/templates/book/book.html:123
 #: bookwyrm/templates/book/edit_book.html:107
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Descripción:"
 
-#: bookwyrm/templates/book/book.html:128
-#: bookwyrm/templates/book/edit_book.html:240
+#: bookwyrm/templates/book/book.html:127
+#: bookwyrm/templates/book/edit_book.html:241
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:93
-#: bookwyrm/templates/settings/site.html:93
-#: bookwyrm/templates/snippets/readthrough.html:75
+#: bookwyrm/templates/settings/site.html:97
+#: bookwyrm/templates/snippets/readthrough.html:77
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
@@ -204,15 +205,15 @@ msgstr "Descripción:"
 msgid "Save"
 msgstr "Guardar"
 
-#: bookwyrm/templates/book/book.html:129 bookwyrm/templates/book/book.html:178
+#: bookwyrm/templates/book/book.html:128 bookwyrm/templates/book/book.html:180
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:241
+#: bookwyrm/templates/book/edit_book.html:242
 #: bookwyrm/templates/edit_author.html:79
 #: bookwyrm/templates/moderation/report_modal.html:34
 #: bookwyrm/templates/settings/federated_server.html:94
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/readthrough.html:76
+#: bookwyrm/templates/snippets/readthrough.html:78
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
@@ -220,18 +221,18 @@ msgstr "Guardar"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: bookwyrm/templates/book/book.html:138
+#: bookwyrm/templates/book/book.html:137
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s/editions\">%(count)s ediciones</a>"
 
-#: bookwyrm/templates/book/book.html:146
+#: bookwyrm/templates/book/book.html:145
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr ""
 "Esta edición está en tu <a href=\"%(path)s\">%(shelf_name)s</a> estante."
 
-#: bookwyrm/templates/book/book.html:152
+#: bookwyrm/templates/book/book.html:151
 #, python-format
 msgid ""
 "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a "
@@ -240,96 +241,97 @@ msgstr ""
 "Una <a href=\"%(book_path)s\">edición diferente</a> de este libro está en tu "
 "<a href=\"%(shelf_path)s\">%(shelf_name)s</a> estante."
 
-#: bookwyrm/templates/book/book.html:161
+#: bookwyrm/templates/book/book.html:162
 msgid "Your reading activity"
 msgstr "Tu actividad de lectura"
 
-#: bookwyrm/templates/book/book.html:163
+#: bookwyrm/templates/book/book.html:165
 msgid "Add read dates"
 msgstr "Agregar fechas de lectura"
 
-#: bookwyrm/templates/book/book.html:168
+#: bookwyrm/templates/book/book.html:170
 msgid "You don't have any reading activity for this book."
 msgstr "No tienes ninguna actividad de lectura para este libro."
 
-#: bookwyrm/templates/book/book.html:175
+#: bookwyrm/templates/book/book.html:177
 msgid "Create"
 msgstr "Crear"
 
-#: bookwyrm/templates/book/book.html:197
-msgid "Subjects"
-msgstr "Sujetos"
-
-#: bookwyrm/templates/book/book.html:209
-msgid "Places"
-msgstr "Lugares"
-
-#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:65
-#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
-#: bookwyrm/templates/search_results.html:115
-#: bookwyrm/templates/user/user_layout.html:62
-msgid "Lists"
-msgstr "Listas"
-
-#: bookwyrm/templates/book/book.html:231
-msgid "Add to list"
-msgstr "Agregar a lista"
-
-#: bookwyrm/templates/book/book.html:241
-#: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:133
-msgid "Add"
-msgstr "Agregar"
-
-#: bookwyrm/templates/book/book.html:257
+#: bookwyrm/templates/book/book.html:203
 #, fuzzy
 #| msgid "Review"
 msgid "Reviews"
 msgstr "Reseña"
 
-#: bookwyrm/templates/book/book.html:262
+#: bookwyrm/templates/book/book.html:208
 #, fuzzy
 #| msgid "Your shelves"
 msgid "Your reviews"
 msgstr "Tus estantes"
 
-#: bookwyrm/templates/book/book.html:268
+#: bookwyrm/templates/book/book.html:214
 #, fuzzy
 #| msgid "Your Account"
 msgid "Your comments"
 msgstr "Tu cuenta"
 
-#: bookwyrm/templates/book/book.html:274
+#: bookwyrm/templates/book/book.html:220
 #, fuzzy
 #| msgid "Your books"
 msgid "Your quotes"
 msgstr "Tus libros"
 
-#: bookwyrm/templates/book/book.html:308
+#: bookwyrm/templates/book/book.html:255
 msgid "rated it"
 msgstr "lo calificó con"
 
+#: bookwyrm/templates/book/book.html:276
+msgid "Subjects"
+msgstr "Sujetos"
+
+#: bookwyrm/templates/book/book.html:288
+msgid "Places"
+msgstr "Lugares"
+
+#: bookwyrm/templates/book/book.html:299 bookwyrm/templates/layout.html:65
+#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
+#: bookwyrm/templates/search/layout.html:25
+#: bookwyrm/templates/search/layout.html:50
+#: bookwyrm/templates/user/layout.html:67
+msgid "Lists"
+msgstr "Listas"
+
+#: bookwyrm/templates/book/book.html:310
+msgid "Add to list"
+msgstr "Agregar a lista"
+
+#: bookwyrm/templates/book/book.html:320
+#: bookwyrm/templates/book/cover_modal.html:31
+#: bookwyrm/templates/lists/list.html:163
+msgid "Add"
+msgstr "Agregar"
+
 #: bookwyrm/templates/book/book_identifiers.html:8
 msgid "ISBN:"
 msgstr "ISBN:"
 
 #: bookwyrm/templates/book/book_identifiers.html:15
-#: bookwyrm/templates/book/edit_book.html:226
+#: bookwyrm/templates/book/edit_book.html:227
 msgid "OCLC Number:"
 msgstr "Número OCLC:"
 
 #: bookwyrm/templates/book/book_identifiers.html:22
-#: bookwyrm/templates/book/edit_book.html:230
+#: bookwyrm/templates/book/edit_book.html:231
 msgid "ASIN:"
 msgstr "ASIN:"
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:179
 msgid "Upload cover:"
 msgstr "Subir portada:"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:184
+#: bookwyrm/templates/book/edit_book.html:185
 msgid "Load cover from url:"
 msgstr "Agregar portada de url:"
 
@@ -455,36 +457,36 @@ msgid "John Doe, Jane Smith"
 msgstr "Juan Nadie, Natalia Natalia"
 
 #: bookwyrm/templates/book/edit_book.html:170
-#: bookwyrm/templates/user/shelf.html:74
+#: bookwyrm/templates/user/shelf/shelf.html:76
 msgid "Cover"
 msgstr "Portada:"
 
-#: bookwyrm/templates/book/edit_book.html:197
+#: bookwyrm/templates/book/edit_book.html:198
 msgid "Physical Properties"
 msgstr "Propiedades físicas:"
 
-#: bookwyrm/templates/book/edit_book.html:198
+#: bookwyrm/templates/book/edit_book.html:199
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "Formato:"
 
-#: bookwyrm/templates/book/edit_book.html:206
+#: bookwyrm/templates/book/edit_book.html:207
 msgid "Pages:"
 msgstr "Páginas:"
 
-#: bookwyrm/templates/book/edit_book.html:213
+#: bookwyrm/templates/book/edit_book.html:214
 msgid "Book Identifiers"
 msgstr "Identificadores de libro"
 
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:215
 msgid "ISBN 13:"
 msgstr "ISBN 13:"
 
-#: bookwyrm/templates/book/edit_book.html:218
+#: bookwyrm/templates/book/edit_book.html:219
 msgid "ISBN 10:"
 msgstr "ISBN 10:"
 
-#: bookwyrm/templates/book/edit_book.html:222
+#: bookwyrm/templates/book/edit_book.html:223
 #: bookwyrm/templates/edit_author.html:59
 msgid "Openlibrary key:"
 msgstr "Clave OpenLibrary:"
@@ -548,7 +550,7 @@ msgstr "Publicado por %(publisher)s."
 #: bookwyrm/templates/feed/feed_layout.html:70
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
-#: bookwyrm/templates/search_results.html:72
+#: bookwyrm/templates/search/book.html:39
 msgid "Close"
 msgstr "Cerrar"
 
@@ -568,17 +570,17 @@ msgstr "Usuarios locales"
 msgid "Federated community"
 msgstr "Comunidad federalizada"
 
-#: bookwyrm/templates/directory/directory.html:6
-#: bookwyrm/templates/directory/directory.html:11
+#: bookwyrm/templates/directory/directory.html:4
+#: bookwyrm/templates/directory/directory.html:9
 #: bookwyrm/templates/layout.html:93
 msgid "Directory"
 msgstr "Directorio"
 
-#: bookwyrm/templates/directory/directory.html:19
+#: bookwyrm/templates/directory/directory.html:17
 msgid "Make your profile discoverable to other BookWyrm users."
 msgstr "Haz que tu perfil sea reconocible a otros usarios de BookWyrm."
 
-#: bookwyrm/templates/directory/directory.html:26
+#: bookwyrm/templates/directory/directory.html:24
 #, python-format
 msgid ""
 "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</"
@@ -587,31 +589,11 @@ msgstr ""
 "Puedes optar por no en cualquier hora en tus <a href=\"%(path)s"
 "\">configuraciones de perfil.</a>"
 
-#: bookwyrm/templates/directory/directory.html:31
+#: bookwyrm/templates/directory/directory.html:29
 #: bookwyrm/templates/snippets/goal_card.html:22
 msgid "Dismiss message"
 msgstr "Desechar mensaje"
 
-#: bookwyrm/templates/directory/directory.html:71
-msgid "follower you follow"
-msgid_plural "followers you follow"
-msgstr[0] "seguidor que tu sigues"
-msgstr[1] "seguidores que tu sigues"
-
-#: bookwyrm/templates/directory/directory.html:78
-msgid "book on your shelves"
-msgid_plural "books on your shelves"
-msgstr[0] "libro en tus estantes"
-msgstr[1] "libro en tus estantes"
-
-#: bookwyrm/templates/directory/directory.html:86
-msgid "posts"
-msgstr "publicaciones"
-
-#: bookwyrm/templates/directory/directory.html:92
-msgid "last active"
-msgstr "actividad reciente"
-
 #: bookwyrm/templates/directory/sort_filter.html:5
 msgid "Order by"
 msgstr "Ordenar por"
@@ -624,6 +606,26 @@ msgstr "Sugerido"
 msgid "Recently active"
 msgstr "Activ@ recientemente"
 
+#: bookwyrm/templates/directory/user_card.html:32
+msgid "follower you follow"
+msgid_plural "followers you follow"
+msgstr[0] "seguidor que tu sigues"
+msgstr[1] "seguidores que tu sigues"
+
+#: bookwyrm/templates/directory/user_card.html:39
+msgid "book on your shelves"
+msgid_plural "books on your shelves"
+msgstr[0] "libro en tus estantes"
+msgstr[1] "libro en tus estantes"
+
+#: bookwyrm/templates/directory/user_card.html:47
+msgid "posts"
+msgstr "publicaciones"
+
+#: bookwyrm/templates/directory/user_card.html:53
+msgid "last active"
+msgstr "actividad reciente"
+
 #: bookwyrm/templates/directory/user_type_filter.html:5
 msgid "User type"
 msgstr "Tipo de usuario"
@@ -711,8 +713,8 @@ msgid "Edit Author:"
 msgstr "Editar Autor/Autora/Autore:"
 
 #: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
-#: bookwyrm/templates/user/create_shelf_form.html:13
-#: bookwyrm/templates/user/edit_shelf_form.html:14
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:13
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:14
 msgid "Name:"
 msgstr "Nombre:"
 
@@ -890,7 +892,7 @@ msgstr "Actualizaciones"
 
 #: bookwyrm/templates/feed/feed_layout.html:11
 #: bookwyrm/templates/layout.html:59
-#: bookwyrm/templates/user/books_header.html:3
+#: bookwyrm/templates/user/shelf/books_header.html:3
 msgid "Your books"
 msgstr "Tus libros"
 
@@ -900,18 +902,18 @@ msgid ""
 msgstr "¡No hay ningún libro aqui ahorita! Busca a un libro para empezar"
 
 #: bookwyrm/templates/feed/feed_layout.html:24
-#: bookwyrm/templates/user/shelf.html:28
+#: bookwyrm/templates/user/shelf/shelf.html:28
 msgid "To Read"
 msgstr "Para leer"
 
 #: bookwyrm/templates/feed/feed_layout.html:25
-#: bookwyrm/templates/user/shelf.html:28
+#: bookwyrm/templates/user/shelf/shelf.html:28
 msgid "Currently Reading"
 msgstr "Leyendo actualmente"
 
 #: bookwyrm/templates/feed/feed_layout.html:26
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-#: bookwyrm/templates/user/shelf.html:28
+#: bookwyrm/templates/user/shelf/shelf.html:28
 msgid "Read"
 msgstr "Leido"
 
@@ -945,13 +947,12 @@ msgid "What are you reading?"
 msgstr "¿Qué estás leyendo?"
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:101
+#: bookwyrm/templates/lists/list.html:119
 msgid "Search for a book"
 msgstr "Buscar libros"
 
 #: bookwyrm/templates/get_started/books.html:11
 #: bookwyrm/templates/isbn_search_results.html:17
-#: bookwyrm/templates/search_results.html:17
 #, python-format
 msgid "No books found for \"%(query)s\""
 msgstr "No se encontró ningún libro correspondiente a \"%(query)s\""
@@ -966,25 +967,27 @@ msgstr "Puedes agregar libros cuando comiences a usar %(site_name)s."
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
 #: bookwyrm/templates/layout.html:38 bookwyrm/templates/layout.html:39
-#: bookwyrm/templates/lists/list.html:105
+#: bookwyrm/templates/lists/list.html:123
+#: bookwyrm/templates/search/layout.html:4
+#: bookwyrm/templates/search/layout.html:9
 msgid "Search"
 msgstr "Buscar"
 
-#: bookwyrm/templates/get_started/books.html:26
+#: bookwyrm/templates/get_started/books.html:27
 msgid "Suggested Books"
 msgstr "Libros sugeridos"
 
-#: bookwyrm/templates/get_started/books.html:41
+#: bookwyrm/templates/get_started/books.html:46
 #, python-format
 msgid "Popular on %(site_name)s"
 msgstr "Popular en %(site_name)s"
 
-#: bookwyrm/templates/get_started/books.html:51
-#: bookwyrm/templates/lists/list.html:118
+#: bookwyrm/templates/get_started/books.html:58
+#: bookwyrm/templates/lists/list.html:136
 msgid "No books found"
 msgstr "No se encontró ningún libro"
 
-#: bookwyrm/templates/get_started/books.html:54
+#: bookwyrm/templates/get_started/books.html:63
 #: bookwyrm/templates/get_started/profile.html:54
 msgid "Save &amp; continue"
 msgstr "Guardar &amp; continuar"
@@ -1061,7 +1064,6 @@ msgid "Search for a user"
 msgstr "Buscar un usuario"
 
 #: bookwyrm/templates/get_started/users.html:13
-#: bookwyrm/templates/search_results.html:99
 #, python-format
 msgid "No users found for \"%(query)s\""
 msgstr "No se encontró ningún usuario correspondiente a \"%(query)s\""
@@ -1185,18 +1187,19 @@ msgid "Successfully imported"
 msgstr "Importado exitosamente"
 
 #: bookwyrm/templates/import_status.html:112
-#: bookwyrm/templates/lists/curate.html:14
 msgid "Book"
 msgstr "Libro"
 
 #: bookwyrm/templates/import_status.html:115
 #: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/user/shelf.html:75 bookwyrm/templates/user/shelf.html:93
+#: bookwyrm/templates/user/shelf/shelf.html:77
+#: bookwyrm/templates/user/shelf/shelf.html:95
 msgid "Title"
 msgstr "Título"
 
 #: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/user/shelf.html:76 bookwyrm/templates/user/shelf.html:96
+#: bookwyrm/templates/user/shelf/shelf.html:78
+#: bookwyrm/templates/user/shelf/shelf.html:98
 msgid "Author"
 msgstr "Autor/Autora"
 
@@ -1218,18 +1221,15 @@ msgid "Sorry! This invite code is no longer valid."
 msgstr "¡Disculpa! Este código de invitación no queda válido."
 
 #: bookwyrm/templates/isbn_search_results.html:4
-#: bookwyrm/templates/search_results.html:4
 msgid "Search Results"
 msgstr "Resultados de búsqueda"
 
 #: bookwyrm/templates/isbn_search_results.html:9
-#: bookwyrm/templates/search_results.html:9
 #, python-format
 msgid "Search Results for \"%(query)s\""
 msgstr "Resultados de búsqueda por \"%(query)s\""
 
 #: bookwyrm/templates/isbn_search_results.html:14
-#: bookwyrm/templates/search_results.html:14
 msgid "Matching Books"
 msgstr "Libros correspondientes"
 
@@ -1271,38 +1271,44 @@ msgstr "Cerrar sesión"
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: bookwyrm/templates/layout.html:152 bookwyrm/templates/layout.html:156
+#: bookwyrm/templates/layout.html:155 bookwyrm/templates/layout.html:159
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "Nombre de usuario:"
 
-#: bookwyrm/templates/layout.html:157
+#: bookwyrm/templates/layout.html:160
 msgid "password"
 msgstr "contraseña"
 
-#: bookwyrm/templates/layout.html:158 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:161 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr "¿Olvidaste tu contraseña?"
 
-#: bookwyrm/templates/layout.html:161 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "Iniciar sesión"
 
-#: bookwyrm/templates/layout.html:169
+#: bookwyrm/templates/layout.html:172
 msgid "Join"
 msgstr "Unirse"
 
-#: bookwyrm/templates/layout.html:195
+#: bookwyrm/templates/layout.html:198
 msgid "About this server"
 msgstr "Sobre este servidor"
 
-#: bookwyrm/templates/layout.html:199
+#: bookwyrm/templates/layout.html:202
 msgid "Contact site admin"
 msgstr "Contactarse con administradores del sitio"
 
 #: bookwyrm/templates/layout.html:206
+#, fuzzy
+#| msgid "Django Documentation"
+msgid "Documentation"
+msgstr "Documentación de Django"
+
+#: bookwyrm/templates/layout.html:213
 #, python-format
 msgid ""
 "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">"
@@ -1311,7 +1317,7 @@ msgstr ""
 "Apoyar %(site_name)s en <a href=\"%(support_link)s\" target=\"_blank\">"
 "%(support_title)s</a>"
 
-#: bookwyrm/templates/layout.html:210
+#: bookwyrm/templates/layout.html:217
 msgid ""
 "BookWyrm is open source software. You can contribute or report issues on <a "
 "href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
@@ -1334,27 +1340,27 @@ msgstr "Agregado y comisariado por <a href=\"%(path)s\">%(username)s</a>"
 msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Creado por <a href=\"%(path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/lists/curate.html:6
+#: bookwyrm/templates/lists/curate.html:8
 msgid "Pending Books"
 msgstr "Libros pendientes"
 
-#: bookwyrm/templates/lists/curate.html:7
+#: bookwyrm/templates/lists/curate.html:11
 msgid "Go to list"
 msgstr "Irse a lista"
 
-#: bookwyrm/templates/lists/curate.html:9
+#: bookwyrm/templates/lists/curate.html:15
 msgid "You're all set!"
 msgstr "!Está todo listo¡"
 
-#: bookwyrm/templates/lists/curate.html:15
+#: bookwyrm/templates/lists/curate.html:45
 msgid "Suggested by"
 msgstr "Sugerido por"
 
-#: bookwyrm/templates/lists/curate.html:35
+#: bookwyrm/templates/lists/curate.html:57
 msgid "Approve"
 msgstr "Aprobar"
 
-#: bookwyrm/templates/lists/curate.html:41
+#: bookwyrm/templates/lists/curate.html:63
 msgid "Discard"
 msgstr "Desechar"
 
@@ -1406,55 +1412,55 @@ msgstr "Cualquer usuario puede agregar libros a esta lista"
 msgid "This list is currently empty"
 msgstr "Esta lista está vacia"
 
-#: bookwyrm/templates/lists/list.html:46
+#: bookwyrm/templates/lists/list.html:64
 #, python-format
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "Agregado por <a href=\"%(user_path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/lists/list.html:58
+#: bookwyrm/templates/lists/list.html:76
 msgid "Set"
 msgstr "Establecido"
 
-#: bookwyrm/templates/lists/list.html:61
+#: bookwyrm/templates/lists/list.html:79
 msgid "List position"
 msgstr "Posición"
 
-#: bookwyrm/templates/lists/list.html:67
+#: bookwyrm/templates/lists/list.html:85
 #: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr "Quitar"
 
-#: bookwyrm/templates/lists/list.html:80 bookwyrm/templates/lists/list.html:92
+#: bookwyrm/templates/lists/list.html:98 bookwyrm/templates/lists/list.html:110
 msgid "Sort List"
 msgstr "Ordena la lista"
 
-#: bookwyrm/templates/lists/list.html:86
+#: bookwyrm/templates/lists/list.html:104
 msgid "Direction"
 msgstr "Dirección"
 
-#: bookwyrm/templates/lists/list.html:97
+#: bookwyrm/templates/lists/list.html:115
 msgid "Add Books"
 msgstr "Agregar libros"
 
-#: bookwyrm/templates/lists/list.html:97
+#: bookwyrm/templates/lists/list.html:115
 msgid "Suggest Books"
 msgstr "Sugerir libros"
 
-#: bookwyrm/templates/lists/list.html:106
+#: bookwyrm/templates/lists/list.html:124
 msgid "search"
 msgstr "buscar"
 
-#: bookwyrm/templates/lists/list.html:112
+#: bookwyrm/templates/lists/list.html:130
 msgid "Clear search"
 msgstr "Borrar búsqueda"
 
-#: bookwyrm/templates/lists/list.html:117
+#: bookwyrm/templates/lists/list.html:135
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
 msgstr ""
 "No se encontró ningún libro correspondiente a la búsqueda: \"%(query)s\""
 
-#: bookwyrm/templates/lists/list.html:133
+#: bookwyrm/templates/lists/list.html:163
 msgid "Suggest"
 msgstr "Sugerir"
 
@@ -1812,35 +1818,52 @@ msgstr "Perfil"
 msgid "Relationships"
 msgstr "Relaciones"
 
-#: bookwyrm/templates/search_results.html:20
-msgid "Log in to import or add books."
-msgstr ""
-
-#: bookwyrm/templates/search_results.html:38
-msgid "Didn't find what you were looking for?"
-msgstr "¿No encontraste lo que buscabas?"
-
-#: bookwyrm/templates/search_results.html:40
-msgid "Show results from other catalogues"
-msgstr "Mostrar resultados de otros catálogos"
-
-#: bookwyrm/templates/search_results.html:44
-msgid "Hide results from other catalogues"
-msgstr "Ocultar resultados de otros catálogos"
-
-#: bookwyrm/templates/search_results.html:63
+#: bookwyrm/templates/search/book.html:30
 #, fuzzy
 #| msgid "Show more"
 msgid "Show"
 msgstr "Mostrar más"
 
-#: bookwyrm/templates/search_results.html:97
-msgid "Matching Users"
-msgstr "Usuarios correspondientes"
+#: bookwyrm/templates/search/book.html:64
+#, fuzzy
+#| msgid "Show results from other catalogues"
+msgid "Load results from other catalogues"
+msgstr "Mostrar resultados de otros catálogos"
 
-#: bookwyrm/templates/search_results.html:117
-#, python-format
-msgid "No lists found for \"%(query)s\""
+#: bookwyrm/templates/search/book.html:68
+msgid "Log in to import or add books."
+msgstr ""
+
+#: bookwyrm/templates/search/layout.html:16
+#, fuzzy
+#| msgid "Search for a user"
+msgid "Search query"
+msgstr "Buscar un usuario"
+
+#: bookwyrm/templates/search/layout.html:19
+#, fuzzy
+#| msgid "Search"
+msgid "Search type"
+msgstr "Buscar"
+
+#: bookwyrm/templates/search/layout.html:21
+#: bookwyrm/templates/search/layout.html:42
+#: bookwyrm/templates/user/layout.html:73
+msgid "Books"
+msgstr "Libros"
+
+#: bookwyrm/templates/search/layout.html:23
+#: bookwyrm/templates/search/layout.html:46
+#: bookwyrm/templates/settings/admin_layout.html:26
+#: bookwyrm/templates/user_admin/user_admin.html:3
+#: bookwyrm/templates/user_admin/user_admin.html:10
+msgid "Users"
+msgstr "Usuarios"
+
+#: bookwyrm/templates/search/layout.html:58
+#, fuzzy, python-format
+#| msgid "No lists found for \"%(query)s\""
+msgid "No results found for \"%(query)s\""
 msgstr "No se encontró ningúna lista correspondiente a \"%(query)s\""
 
 #: bookwyrm/templates/settings/admin_layout.html:4
@@ -1851,12 +1874,6 @@ msgstr "Adminstración"
 msgid "Manage Users"
 msgstr "Administrar usuarios"
 
-#: bookwyrm/templates/settings/admin_layout.html:26
-#: bookwyrm/templates/user_admin/user_admin.html:3
-#: bookwyrm/templates/user_admin/user_admin.html:10
-msgid "Users"
-msgstr "Usuarios"
-
 #: bookwyrm/templates/settings/admin_layout.html:39
 #: bookwyrm/templates/settings/federation.html:3
 #: bookwyrm/templates/settings/federation.html:5
@@ -1889,7 +1906,7 @@ msgid "Footer Content"
 msgstr "Contenido del pie de página"
 
 #: bookwyrm/templates/settings/admin_layout.html:54
-#: bookwyrm/templates/settings/site.html:77
+#: bookwyrm/templates/settings/site.html:81
 msgid "Registration"
 msgstr "Registración"
 
@@ -1950,7 +1967,7 @@ msgid "Details"
 msgstr "Detalles"
 
 #: bookwyrm/templates/settings/federated_server.html:36
-#: bookwyrm/templates/user/user_layout.html:50
+#: bookwyrm/templates/user/layout.html:55
 msgid "Activity"
 msgstr "Actividad"
 
@@ -2198,20 +2215,23 @@ msgstr "Título de apoyo:"
 msgid "Admin email:"
 msgstr "Correo electrónico de administradorx:"
 
-#: bookwyrm/templates/settings/site.html:79
+#: bookwyrm/templates/settings/site.html:73
+msgid "Additional info:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:83
 msgid "Allow registration:"
 msgstr "Permitir registración:"
 
-#: bookwyrm/templates/settings/site.html:83
+#: bookwyrm/templates/settings/site.html:87
 msgid "Allow invite requests:"
 msgstr "Permitir solicitudes de invitación:"
 
-#: bookwyrm/templates/settings/site.html:87
+#: bookwyrm/templates/settings/site.html:91
 msgid "Registration closed text:"
 msgstr "Texto de registración cerrada:"
 
-#: bookwyrm/templates/snippets/book_cover.html:20
-#: bookwyrm/templates/snippets/search_result_text.html:10
+#: bookwyrm/templates/snippets/book_cover.html:36
 msgid "No cover"
 msgstr "Sin portada"
 
@@ -2504,7 +2524,8 @@ msgid "Post privacy"
 msgstr "Privacidad de publicación"
 
 #: bookwyrm/templates/snippets/privacy_select.html:16
-#: bookwyrm/templates/user/followers.html:13
+#: bookwyrm/templates/user/relationships/followers.html:6
+#: bookwyrm/templates/user/relationships/layout.html:11
 msgid "Followers"
 msgstr "Seguidores"
 
@@ -2532,16 +2553,16 @@ msgstr "Mostrar todas las actualizaciones"
 msgid "Delete this progress update"
 msgstr "Eliminar esta actualización de progreso"
 
-#: bookwyrm/templates/snippets/readthrough.html:51
+#: bookwyrm/templates/snippets/readthrough.html:52
 msgid "started"
 msgstr "empezado"
 
-#: bookwyrm/templates/snippets/readthrough.html:57
-#: bookwyrm/templates/snippets/readthrough.html:71
+#: bookwyrm/templates/snippets/readthrough.html:59
+#: bookwyrm/templates/snippets/readthrough.html:73
 msgid "Edit read dates"
 msgstr "Editar fechas de lectura"
 
-#: bookwyrm/templates/snippets/readthrough.html:61
+#: bookwyrm/templates/snippets/readthrough.html:63
 msgid "Delete these read dates"
 msgstr "Eliminar estas fechas de lectura"
 
@@ -2588,7 +2609,7 @@ msgstr "comentó en"
 msgid "quoted"
 msgstr "citó"
 
-#: bookwyrm/templates/snippets/search_result_text.html:35
+#: bookwyrm/templates/snippets/search_result_text.html:36
 msgid "Import book"
 msgstr "Importar libro"
 
@@ -2638,17 +2659,17 @@ msgstr "Empezar \"<em>%(book_title)s</em>\""
 msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgstr "Quiero leer \"<em>%(book_title)s</em>\""
 
-#: bookwyrm/templates/snippets/status/content_status.html:67
+#: bookwyrm/templates/snippets/status/content_status.html:70
 #: bookwyrm/templates/snippets/trimmed_text.html:14
 msgid "Show more"
 msgstr "Mostrar más"
 
-#: bookwyrm/templates/snippets/status/content_status.html:82
+#: bookwyrm/templates/snippets/status/content_status.html:85
 #: bookwyrm/templates/snippets/trimmed_text.html:29
 msgid "Show less"
 msgstr "Mostrar menos"
 
-#: bookwyrm/templates/snippets/status/content_status.html:112
+#: bookwyrm/templates/snippets/status/content_status.html:115
 msgid "Open image in new window"
 msgstr "Abrir imagen en una nueva ventana"
 
@@ -2707,43 +2728,17 @@ msgstr "En orden ascendente"
 msgid "Sorted descending"
 msgstr "En orden descendente"
 
-#: bookwyrm/templates/user/books_header.html:5
-#, python-format
-msgid "%(username)s's books"
-msgstr "Los libros de %(username)s"
-
-#: bookwyrm/templates/user/create_shelf_form.html:5
-#: bookwyrm/templates/user/create_shelf_form.html:22
-msgid "Create Shelf"
-msgstr "Crear estante"
-
-#: bookwyrm/templates/user/edit_shelf_form.html:5
-msgid "Edit Shelf"
-msgstr "Editar estante"
-
-#: bookwyrm/templates/user/edit_shelf_form.html:26
-msgid "Update shelf"
-msgstr "Actualizar estante"
-
-#: bookwyrm/templates/user/followers.html:7
-#: bookwyrm/templates/user/following.html:7
-#: bookwyrm/templates/user/user.html:10
+#: bookwyrm/templates/user/layout.html:12 bookwyrm/templates/user/user.html:10
 msgid "User Profile"
 msgstr "Perfil de usuario"
 
-#: bookwyrm/templates/user/followers.html:29
-#, python-format
-msgid "%(username)s has no followers"
-msgstr "%(username)s no tiene seguidores"
+#: bookwyrm/templates/user/layout.html:36
+msgid "Follow Requests"
+msgstr "Solicitudes de seguidor"
 
-#: bookwyrm/templates/user/following.html:13
-msgid "Following"
-msgstr "Siguiendo"
-
-#: bookwyrm/templates/user/following.html:29
-#, python-format
-msgid "%(username)s isn't following any users"
-msgstr "%(username)s no sigue a nadie"
+#: bookwyrm/templates/user/layout.html:61
+msgid "Reading Goal"
+msgstr "Meta de lectura"
 
 #: bookwyrm/templates/user/lists.html:11
 #, python-format
@@ -2754,35 +2749,71 @@ msgstr "Listas: %(username)s"
 msgid "Create list"
 msgstr "Crear lista"
 
-#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:51
+#: bookwyrm/templates/user/relationships/followers.html:12
+#, python-format
+msgid "%(username)s has no followers"
+msgstr "%(username)s no tiene seguidores"
+
+#: bookwyrm/templates/user/relationships/following.html:6
+#: bookwyrm/templates/user/relationships/layout.html:15
+msgid "Following"
+msgstr "Siguiendo"
+
+#: bookwyrm/templates/user/relationships/following.html:12
+#, python-format
+msgid "%(username)s isn't following any users"
+msgstr "%(username)s no sigue a nadie"
+
+#: bookwyrm/templates/user/shelf/books_header.html:5
+#, python-format
+msgid "%(username)s's books"
+msgstr "Los libros de %(username)s"
+
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:5
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:22
+msgid "Create Shelf"
+msgstr "Crear estante"
+
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:5
+msgid "Edit Shelf"
+msgstr "Editar estante"
+
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:26
+msgid "Update shelf"
+msgstr "Actualizar estante"
+
+#: bookwyrm/templates/user/shelf/shelf.html:24 bookwyrm/views/shelf.py:48
 msgid "All books"
 msgstr "Todos los libros"
 
-#: bookwyrm/templates/user/shelf.html:37
+#: bookwyrm/templates/user/shelf/shelf.html:37
 msgid "Create shelf"
 msgstr "Crear estante"
 
-#: bookwyrm/templates/user/shelf.html:58
+#: bookwyrm/templates/user/shelf/shelf.html:60
 msgid "Edit shelf"
 msgstr "Editar estante"
 
-#: bookwyrm/templates/user/shelf.html:77 bookwyrm/templates/user/shelf.html:99
+#: bookwyrm/templates/user/shelf/shelf.html:79
+#: bookwyrm/templates/user/shelf/shelf.html:101
 msgid "Shelved"
 msgstr "Archivado"
 
-#: bookwyrm/templates/user/shelf.html:78 bookwyrm/templates/user/shelf.html:103
+#: bookwyrm/templates/user/shelf/shelf.html:80
+#: bookwyrm/templates/user/shelf/shelf.html:105
 msgid "Started"
 msgstr "Empezado"
 
-#: bookwyrm/templates/user/shelf.html:79 bookwyrm/templates/user/shelf.html:106
+#: bookwyrm/templates/user/shelf/shelf.html:81
+#: bookwyrm/templates/user/shelf/shelf.html:108
 msgid "Finished"
 msgstr "Terminado"
 
-#: bookwyrm/templates/user/shelf.html:132
+#: bookwyrm/templates/user/shelf/shelf.html:134
 msgid "This shelf is empty."
 msgstr "Este estante está vacio."
 
-#: bookwyrm/templates/user/shelf.html:138
+#: bookwyrm/templates/user/shelf/shelf.html:140
 msgid "Delete shelf"
 msgstr "Eliminar estante"
 
@@ -2799,52 +2830,44 @@ msgstr "Ver todos los %(size)s"
 msgid "View all books"
 msgstr "Ver todos los libros"
 
-#: bookwyrm/templates/user/user.html:59
-#, python-format
-msgid "Set a reading goal for %(year)s"
-msgstr "Establecer una meta de lectura para %(year)s"
-
-#: bookwyrm/templates/user/user.html:65
+#: bookwyrm/templates/user/user.html:60
 msgid "User Activity"
 msgstr "Actividad de usuario"
 
-#: bookwyrm/templates/user/user.html:68
+#: bookwyrm/templates/user/user.html:63
 msgid "RSS feed"
 msgstr "Feed RSS"
 
-#: bookwyrm/templates/user/user.html:79
+#: bookwyrm/templates/user/user.html:74
 msgid "No activities yet!"
 msgstr "¡Aún no actividades!"
 
-#: bookwyrm/templates/user/user_layout.html:32
-msgid "Follow Requests"
-msgstr "Solicitudes de seguidor"
-
-#: bookwyrm/templates/user/user_layout.html:56
-msgid "Reading Goal"
-msgstr "Meta de lectura"
-
-#: bookwyrm/templates/user/user_layout.html:68
-msgid "Books"
-msgstr "Libros"
-
-#: bookwyrm/templates/user/user_preview.html:13
+#: bookwyrm/templates/user/user_preview.html:14
 #, python-format
 msgid "Joined %(date)s"
 msgstr "Unido %(date)s"
 
-#: bookwyrm/templates/user/user_preview.html:15
+#: bookwyrm/templates/user/user_preview.html:18
 #, python-format
 msgid "%(counter)s follower"
 msgid_plural "%(counter)s followers"
 msgstr[0] "%(counter)s seguidor"
 msgstr[1] "%(counter)s seguidores"
 
-#: bookwyrm/templates/user/user_preview.html:16
+#: bookwyrm/templates/user/user_preview.html:19
 #, python-format
 msgid "%(counter)s following"
 msgstr "%(counter)s siguiendo"
 
+#: bookwyrm/templates/user/user_preview.html:25
+#, fuzzy, python-format
+#| msgid "%(mutuals)s follower you follow"
+#| msgid_plural "%(mutuals)s followers you follow"
+msgid "%(mutuals_display)s follower you follow"
+msgid_plural "%(mutuals_display)s followers you follow"
+msgstr[0] "%(mutuals)s seguidor que sigues"
+msgstr[1] "%(mutuals)s seguidores que sigues"
+
 #: bookwyrm/templates/user_admin/user.html:11
 msgid "Back to users"
 msgstr "Volver a usuarios"
@@ -4311,6 +4334,19 @@ msgctxt "stick"
 msgid "club"
 msgstr "garrote"
 
+#~ msgid "Didn't find what you were looking for?"
+#~ msgstr "¿No encontraste lo que buscabas?"
+
+#~ msgid "Hide results from other catalogues"
+#~ msgstr "Ocultar resultados de otros catálogos"
+
+#~ msgid "Matching Users"
+#~ msgstr "Usuarios correspondientes"
+
+#, python-format
+#~ msgid "Set a reading goal for %(year)s"
+#~ msgstr "Establecer una meta de lectura para %(year)s"
+
 #, python-format
 #~ msgid "by %(author)s"
 #~ msgstr "por %(author)s"
diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 01963e46..7717fe48 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-29 13:24-0700\n"
+"POT-Creation-Date: 2021-05-01 10:56-0700\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"
@@ -58,11 +58,12 @@ msgid "Book Title"
 msgstr "Titre"
 
 #: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:31
-#: bookwyrm/templates/user/shelf.html:80 bookwyrm/templates/user/shelf.html:110
+#: bookwyrm/templates/user/shelf/shelf.html:82
+#: bookwyrm/templates/user/shelf/shelf.html:112
 msgid "Rating"
 msgstr "Note"
 
-#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:82
+#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:100
 msgid "Sort By"
 msgstr ""
 
@@ -88,7 +89,7 @@ msgstr "%(value)s n’est pas une remote_id valide."
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s n’est pas un nom de compte valide."
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:153
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:156
 msgid "username"
 msgstr "nom du compte :"
 
@@ -150,8 +151,8 @@ msgid "Books by %(name)s"
 msgstr "Livres par %(name)s"
 
 #: bookwyrm/templates/book/book.html:33
-#: bookwyrm/templates/discover/large-book.html:12
-#: bookwyrm/templates/discover/small-book.html:9
+#: bookwyrm/templates/discover/large-book.html:25
+#: bookwyrm/templates/discover/small-book.html:19
 msgid "by"
 msgstr "par"
 
@@ -159,50 +160,50 @@ msgstr "par"
 msgid "Edit Book"
 msgstr "Modifier le livre"
 
-#: bookwyrm/templates/book/book.html:61
+#: bookwyrm/templates/book/book.html:60
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "Ajouter une couverture"
 
-#: bookwyrm/templates/book/book.html:65
+#: bookwyrm/templates/book/book.html:64
 msgid "Failed to load cover"
 msgstr "La couverture n’a pu être chargée"
 
-#: bookwyrm/templates/book/book.html:82
+#: bookwyrm/templates/book/book.html:81
 msgid "View on OpenLibrary"
 msgstr "Voir sur OpenLibrary"
 
-#: bookwyrm/templates/book/book.html:85
+#: bookwyrm/templates/book/book.html:84
 #, fuzzy
 #| msgid "View on OpenLibrary"
 msgid "View on Inventaire"
 msgstr "Voir sur OpenLibrary"
 
-#: bookwyrm/templates/book/book.html:105
+#: bookwyrm/templates/book/book.html:104
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s critique)"
 msgstr[1] "(%(review_count)s critiques)"
 
-#: bookwyrm/templates/book/book.html:117
+#: bookwyrm/templates/book/book.html:116
 msgid "Add Description"
 msgstr "Ajouter une description"
 
-#: bookwyrm/templates/book/book.html:124
+#: bookwyrm/templates/book/book.html:123
 #: bookwyrm/templates/book/edit_book.html:107
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Description :"
 
-#: bookwyrm/templates/book/book.html:128
-#: bookwyrm/templates/book/edit_book.html:240
+#: bookwyrm/templates/book/book.html:127
+#: bookwyrm/templates/book/edit_book.html:241
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:93
-#: bookwyrm/templates/settings/site.html:93
-#: bookwyrm/templates/snippets/readthrough.html:75
+#: bookwyrm/templates/settings/site.html:97
+#: bookwyrm/templates/snippets/readthrough.html:77
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
@@ -210,15 +211,15 @@ msgstr "Description :"
 msgid "Save"
 msgstr "Enregistrer"
 
-#: bookwyrm/templates/book/book.html:129 bookwyrm/templates/book/book.html:178
+#: bookwyrm/templates/book/book.html:128 bookwyrm/templates/book/book.html:180
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:241
+#: bookwyrm/templates/book/edit_book.html:242
 #: bookwyrm/templates/edit_author.html:79
 #: bookwyrm/templates/moderation/report_modal.html:34
 #: bookwyrm/templates/settings/federated_server.html:94
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/readthrough.html:76
+#: bookwyrm/templates/snippets/readthrough.html:78
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
@@ -226,18 +227,18 @@ msgstr "Enregistrer"
 msgid "Cancel"
 msgstr "Annuler"
 
-#: bookwyrm/templates/book/book.html:138
+#: bookwyrm/templates/book/book.html:137
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s/editions\">%(count)s éditions</a>"
 
-#: bookwyrm/templates/book/book.html:146
+#: bookwyrm/templates/book/book.html:145
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr ""
 "Cette édition est sur votre étagère <a href=\"%(path)s\">%(shelf_name)s</a>."
 
-#: bookwyrm/templates/book/book.html:152
+#: bookwyrm/templates/book/book.html:151
 #, python-format
 msgid ""
 "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a "
@@ -246,96 +247,97 @@ msgstr ""
 "Une <a href=\"%(book_path)s\">édition différente</a> de ce livre existe sur "
 "votre étagère <a href=\"%(shelf_path)s\">%(shelf_name)s</a>."
 
-#: bookwyrm/templates/book/book.html:161
+#: bookwyrm/templates/book/book.html:162
 msgid "Your reading activity"
 msgstr "Votre activité de lecture"
 
-#: bookwyrm/templates/book/book.html:163
+#: bookwyrm/templates/book/book.html:165
 msgid "Add read dates"
 msgstr "Ajouter des dates de lecture"
 
-#: bookwyrm/templates/book/book.html:168
+#: bookwyrm/templates/book/book.html:170
 msgid "You don't have any reading activity for this book."
 msgstr "Vous n’avez aucune activité de lecture pour ce livre"
 
-#: bookwyrm/templates/book/book.html:175
+#: bookwyrm/templates/book/book.html:177
 msgid "Create"
 msgstr "Créer"
 
-#: bookwyrm/templates/book/book.html:197
-msgid "Subjects"
-msgstr "Sujets"
-
-#: bookwyrm/templates/book/book.html:209
-msgid "Places"
-msgstr "Lieux"
-
-#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:65
-#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
-#: bookwyrm/templates/search_results.html:115
-#: bookwyrm/templates/user/user_layout.html:62
-msgid "Lists"
-msgstr "Listes"
-
-#: bookwyrm/templates/book/book.html:231
-msgid "Add to list"
-msgstr "Ajouter à la liste"
-
-#: bookwyrm/templates/book/book.html:241
-#: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:133
-msgid "Add"
-msgstr "Ajouter"
-
-#: bookwyrm/templates/book/book.html:257
+#: bookwyrm/templates/book/book.html:203
 #, fuzzy
 #| msgid "Review"
 msgid "Reviews"
 msgstr "Critique"
 
-#: bookwyrm/templates/book/book.html:262
+#: bookwyrm/templates/book/book.html:208
 #, fuzzy
 #| msgid "Your shelves"
 msgid "Your reviews"
 msgstr "Vos étagères"
 
-#: bookwyrm/templates/book/book.html:268
+#: bookwyrm/templates/book/book.html:214
 #, fuzzy
 #| msgid "Your Account"
 msgid "Your comments"
 msgstr "Votre compte"
 
-#: bookwyrm/templates/book/book.html:274
+#: bookwyrm/templates/book/book.html:220
 #, fuzzy
 #| msgid "Your books"
 msgid "Your quotes"
 msgstr "Vos livres"
 
-#: bookwyrm/templates/book/book.html:308
+#: bookwyrm/templates/book/book.html:255
 msgid "rated it"
 msgstr "l’a noté"
 
+#: bookwyrm/templates/book/book.html:276
+msgid "Subjects"
+msgstr "Sujets"
+
+#: bookwyrm/templates/book/book.html:288
+msgid "Places"
+msgstr "Lieux"
+
+#: bookwyrm/templates/book/book.html:299 bookwyrm/templates/layout.html:65
+#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
+#: bookwyrm/templates/search/layout.html:25
+#: bookwyrm/templates/search/layout.html:50
+#: bookwyrm/templates/user/layout.html:67
+msgid "Lists"
+msgstr "Listes"
+
+#: bookwyrm/templates/book/book.html:310
+msgid "Add to list"
+msgstr "Ajouter à la liste"
+
+#: bookwyrm/templates/book/book.html:320
+#: bookwyrm/templates/book/cover_modal.html:31
+#: bookwyrm/templates/lists/list.html:163
+msgid "Add"
+msgstr "Ajouter"
+
 #: bookwyrm/templates/book/book_identifiers.html:8
 msgid "ISBN:"
 msgstr "ISBN :"
 
 #: bookwyrm/templates/book/book_identifiers.html:15
-#: bookwyrm/templates/book/edit_book.html:226
+#: bookwyrm/templates/book/edit_book.html:227
 msgid "OCLC Number:"
 msgstr "Numéro OCLC :"
 
 #: bookwyrm/templates/book/book_identifiers.html:22
-#: bookwyrm/templates/book/edit_book.html:230
+#: bookwyrm/templates/book/edit_book.html:231
 msgid "ASIN:"
 msgstr "ASIN :"
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:179
 msgid "Upload cover:"
 msgstr "Charger une couverture :"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:184
+#: bookwyrm/templates/book/edit_book.html:185
 msgid "Load cover from url:"
 msgstr "Charger la couverture depuis une URL :"
 
@@ -461,36 +463,36 @@ msgid "John Doe, Jane Smith"
 msgstr "Claude Dupont, Dominique Durand"
 
 #: bookwyrm/templates/book/edit_book.html:170
-#: bookwyrm/templates/user/shelf.html:74
+#: bookwyrm/templates/user/shelf/shelf.html:76
 msgid "Cover"
 msgstr "Couverture"
 
-#: bookwyrm/templates/book/edit_book.html:197
+#: bookwyrm/templates/book/edit_book.html:198
 msgid "Physical Properties"
 msgstr "Propriétés physiques"
 
-#: bookwyrm/templates/book/edit_book.html:198
+#: bookwyrm/templates/book/edit_book.html:199
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "Format :"
 
-#: bookwyrm/templates/book/edit_book.html:206
+#: bookwyrm/templates/book/edit_book.html:207
 msgid "Pages:"
 msgstr "Pages :"
 
-#: bookwyrm/templates/book/edit_book.html:213
+#: bookwyrm/templates/book/edit_book.html:214
 msgid "Book Identifiers"
 msgstr "Identifiants du livre"
 
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:215
 msgid "ISBN 13:"
 msgstr "ISBN 13 :"
 
-#: bookwyrm/templates/book/edit_book.html:218
+#: bookwyrm/templates/book/edit_book.html:219
 msgid "ISBN 10:"
 msgstr "ISBN 10 :"
 
-#: bookwyrm/templates/book/edit_book.html:222
+#: bookwyrm/templates/book/edit_book.html:223
 #: bookwyrm/templates/edit_author.html:59
 msgid "Openlibrary key:"
 msgstr "Clé Openlibrary :"
@@ -554,7 +556,7 @@ msgstr "Publié par %(publisher)s."
 #: bookwyrm/templates/feed/feed_layout.html:70
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
-#: bookwyrm/templates/search_results.html:72
+#: bookwyrm/templates/search/book.html:39
 msgid "Close"
 msgstr "Fermer"
 
@@ -574,19 +576,19 @@ msgstr "Comptes locaux"
 msgid "Federated community"
 msgstr "Communauté fédérée"
 
-#: bookwyrm/templates/directory/directory.html:6
-#: bookwyrm/templates/directory/directory.html:11
+#: bookwyrm/templates/directory/directory.html:4
+#: bookwyrm/templates/directory/directory.html:9
 #: bookwyrm/templates/layout.html:93
 msgid "Directory"
 msgstr "Répertoire"
 
-#: bookwyrm/templates/directory/directory.html:19
+#: bookwyrm/templates/directory/directory.html:17
 msgid "Make your profile discoverable to other BookWyrm users."
 msgstr ""
 "Autoriser d’autres utilisateurs ou utilisatrices de BookWyrm à découvrir "
 "votre profil."
 
-#: bookwyrm/templates/directory/directory.html:26
+#: bookwyrm/templates/directory/directory.html:24
 #, python-format
 msgid ""
 "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</"
@@ -595,31 +597,11 @@ msgstr ""
 "Vous pouvez décider de ne plus y figurer à n’importe quel moment depuis vos "
 "<a href=\"%(path)s\">paramètres de profil.</a>"
 
-#: bookwyrm/templates/directory/directory.html:31
+#: bookwyrm/templates/directory/directory.html:29
 #: bookwyrm/templates/snippets/goal_card.html:22
 msgid "Dismiss message"
 msgstr "Rejeter le message"
 
-#: bookwyrm/templates/directory/directory.html:71
-msgid "follower you follow"
-msgid_plural "followers you follow"
-msgstr[0] "compte auquel vous êtes abonné(e)"
-msgstr[1] "comptes auxquels vous êtes abonné(e)"
-
-#: bookwyrm/templates/directory/directory.html:78
-msgid "book on your shelves"
-msgid_plural "books on your shelves"
-msgstr[0] "livre sur vos étagères"
-msgstr[1] "livres sur vos étagères"
-
-#: bookwyrm/templates/directory/directory.html:86
-msgid "posts"
-msgstr "publications"
-
-#: bookwyrm/templates/directory/directory.html:92
-msgid "last active"
-msgstr "dernière activité"
-
 #: bookwyrm/templates/directory/sort_filter.html:5
 msgid "Order by"
 msgstr "Trier par"
@@ -632,6 +614,26 @@ msgstr "Suggéré"
 msgid "Recently active"
 msgstr "Actif récemment"
 
+#: bookwyrm/templates/directory/user_card.html:32
+msgid "follower you follow"
+msgid_plural "followers you follow"
+msgstr[0] "compte auquel vous êtes abonné(e)"
+msgstr[1] "comptes auxquels vous êtes abonné(e)"
+
+#: bookwyrm/templates/directory/user_card.html:39
+msgid "book on your shelves"
+msgid_plural "books on your shelves"
+msgstr[0] "livre sur vos étagères"
+msgstr[1] "livres sur vos étagères"
+
+#: bookwyrm/templates/directory/user_card.html:47
+msgid "posts"
+msgstr "publications"
+
+#: bookwyrm/templates/directory/user_card.html:53
+msgid "last active"
+msgstr "dernière activité"
+
 #: bookwyrm/templates/directory/user_type_filter.html:5
 msgid "User type"
 msgstr "Type de compte"
@@ -719,8 +721,8 @@ msgid "Edit Author:"
 msgstr "Modifier l’auteur ou l’autrice :"
 
 #: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
-#: bookwyrm/templates/user/create_shelf_form.html:13
-#: bookwyrm/templates/user/edit_shelf_form.html:14
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:13
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:14
 msgid "Name:"
 msgstr "Nom :"
 
@@ -900,7 +902,7 @@ msgstr "Mises à jour"
 
 #: bookwyrm/templates/feed/feed_layout.html:11
 #: bookwyrm/templates/layout.html:59
-#: bookwyrm/templates/user/books_header.html:3
+#: bookwyrm/templates/user/shelf/books_header.html:3
 msgid "Your books"
 msgstr "Vos livres"
 
@@ -910,18 +912,18 @@ msgid ""
 msgstr "Aucun livre ici pour l’instant ! Cherchez un livre pour commencer"
 
 #: bookwyrm/templates/feed/feed_layout.html:24
-#: bookwyrm/templates/user/shelf.html:28
+#: bookwyrm/templates/user/shelf/shelf.html:28
 msgid "To Read"
 msgstr "À lire"
 
 #: bookwyrm/templates/feed/feed_layout.html:25
-#: bookwyrm/templates/user/shelf.html:28
+#: bookwyrm/templates/user/shelf/shelf.html:28
 msgid "Currently Reading"
 msgstr "En train de lire"
 
 #: bookwyrm/templates/feed/feed_layout.html:26
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-#: bookwyrm/templates/user/shelf.html:28
+#: bookwyrm/templates/user/shelf/shelf.html:28
 msgid "Read"
 msgstr "Lu"
 
@@ -955,13 +957,12 @@ msgid "What are you reading?"
 msgstr "Que lisez‑vous ?"
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:101
+#: bookwyrm/templates/lists/list.html:119
 msgid "Search for a book"
 msgstr "Chercher un livre"
 
 #: bookwyrm/templates/get_started/books.html:11
 #: bookwyrm/templates/isbn_search_results.html:17
-#: bookwyrm/templates/search_results.html:17
 #, python-format
 msgid "No books found for \"%(query)s\""
 msgstr "Aucun livre trouvé pour « %(query)s »"
@@ -978,25 +979,27 @@ msgstr ""
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
 #: bookwyrm/templates/layout.html:38 bookwyrm/templates/layout.html:39
-#: bookwyrm/templates/lists/list.html:105
+#: bookwyrm/templates/lists/list.html:123
+#: bookwyrm/templates/search/layout.html:4
+#: bookwyrm/templates/search/layout.html:9
 msgid "Search"
 msgstr "Chercher"
 
-#: bookwyrm/templates/get_started/books.html:26
+#: bookwyrm/templates/get_started/books.html:27
 msgid "Suggested Books"
 msgstr "Suggérer des livres"
 
-#: bookwyrm/templates/get_started/books.html:41
+#: bookwyrm/templates/get_started/books.html:46
 #, python-format
 msgid "Popular on %(site_name)s"
 msgstr "Populaire sur %(site_name)s"
 
-#: bookwyrm/templates/get_started/books.html:51
-#: bookwyrm/templates/lists/list.html:118
+#: bookwyrm/templates/get_started/books.html:58
+#: bookwyrm/templates/lists/list.html:136
 msgid "No books found"
 msgstr "Aucun livre trouvé"
 
-#: bookwyrm/templates/get_started/books.html:54
+#: bookwyrm/templates/get_started/books.html:63
 #: bookwyrm/templates/get_started/profile.html:54
 msgid "Save &amp; continue"
 msgstr "Enregistrer &amp; continuer"
@@ -1073,7 +1076,6 @@ msgid "Search for a user"
 msgstr "Chercher un compte"
 
 #: bookwyrm/templates/get_started/users.html:13
-#: bookwyrm/templates/search_results.html:99
 #, python-format
 msgid "No users found for \"%(query)s\""
 msgstr "Aucun compte trouvé pour « %(query)s »"
@@ -1197,18 +1199,19 @@ msgid "Successfully imported"
 msgstr "Importation réussie"
 
 #: bookwyrm/templates/import_status.html:112
-#: bookwyrm/templates/lists/curate.html:14
 msgid "Book"
 msgstr "Livre"
 
 #: bookwyrm/templates/import_status.html:115
 #: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/user/shelf.html:75 bookwyrm/templates/user/shelf.html:93
+#: bookwyrm/templates/user/shelf/shelf.html:77
+#: bookwyrm/templates/user/shelf/shelf.html:95
 msgid "Title"
 msgstr "Titre"
 
 #: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/user/shelf.html:76 bookwyrm/templates/user/shelf.html:96
+#: bookwyrm/templates/user/shelf/shelf.html:78
+#: bookwyrm/templates/user/shelf/shelf.html:98
 msgid "Author"
 msgstr "Auteur ou autrice"
 
@@ -1230,18 +1233,15 @@ msgid "Sorry! This invite code is no longer valid."
 msgstr "Cette invitation n’est plus valide ; désolé !"
 
 #: bookwyrm/templates/isbn_search_results.html:4
-#: bookwyrm/templates/search_results.html:4
 msgid "Search Results"
 msgstr "Résultats de recherche"
 
 #: bookwyrm/templates/isbn_search_results.html:9
-#: bookwyrm/templates/search_results.html:9
 #, python-format
 msgid "Search Results for \"%(query)s\""
 msgstr "Résultats de recherche pour « %(query)s »"
 
 #: bookwyrm/templates/isbn_search_results.html:14
-#: bookwyrm/templates/search_results.html:14
 msgid "Matching Books"
 msgstr "Livres correspondants"
 
@@ -1283,38 +1283,44 @@ msgstr "Se déconnecter"
 msgid "Notifications"
 msgstr "Notifications"
 
-#: bookwyrm/templates/layout.html:152 bookwyrm/templates/layout.html:156
+#: bookwyrm/templates/layout.html:155 bookwyrm/templates/layout.html:159
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "Nom du compte :"
 
-#: bookwyrm/templates/layout.html:157
+#: bookwyrm/templates/layout.html:160
 msgid "password"
 msgstr "Mot de passe"
 
-#: bookwyrm/templates/layout.html:158 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:161 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr "Mot de passe oublié ?"
 
-#: bookwyrm/templates/layout.html:161 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "Se connecter"
 
-#: bookwyrm/templates/layout.html:169
+#: bookwyrm/templates/layout.html:172
 msgid "Join"
 msgstr "Rejoindre"
 
-#: bookwyrm/templates/layout.html:195
+#: bookwyrm/templates/layout.html:198
 msgid "About this server"
 msgstr "À propos de ce serveur"
 
-#: bookwyrm/templates/layout.html:199
+#: bookwyrm/templates/layout.html:202
 msgid "Contact site admin"
 msgstr "Contacter l’administrateur du site"
 
 #: bookwyrm/templates/layout.html:206
+#, fuzzy
+#| msgid "List curation:"
+msgid "Documentation"
+msgstr "Modération de la liste :"
+
+#: bookwyrm/templates/layout.html:213
 #, python-format
 msgid ""
 "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">"
@@ -1323,7 +1329,7 @@ msgstr ""
 "Soutenez %(site_name)s avec <a href=\"%(support_link)s\" target=\"_blank\">"
 "%(support_title)s</a>"
 
-#: bookwyrm/templates/layout.html:210
+#: bookwyrm/templates/layout.html:217
 msgid ""
 "BookWyrm is open source software. You can contribute or report issues on <a "
 "href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
@@ -1346,27 +1352,27 @@ msgstr "Créée et modérée par <a href=\"%(path)s\">%(username)s</a>"
 msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Créée par <a href=\"%(path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/lists/curate.html:6
+#: bookwyrm/templates/lists/curate.html:8
 msgid "Pending Books"
 msgstr "Livres en attente de modération"
 
-#: bookwyrm/templates/lists/curate.html:7
+#: bookwyrm/templates/lists/curate.html:11
 msgid "Go to list"
 msgstr "Aller à la liste"
 
-#: bookwyrm/templates/lists/curate.html:9
+#: bookwyrm/templates/lists/curate.html:15
 msgid "You're all set!"
 msgstr "Aucun livre en attente de validation !"
 
-#: bookwyrm/templates/lists/curate.html:15
+#: bookwyrm/templates/lists/curate.html:45
 msgid "Suggested by"
 msgstr "Suggéré par"
 
-#: bookwyrm/templates/lists/curate.html:35
+#: bookwyrm/templates/lists/curate.html:57
 msgid "Approve"
 msgstr "Approuver"
 
-#: bookwyrm/templates/lists/curate.html:41
+#: bookwyrm/templates/lists/curate.html:63
 msgid "Discard"
 msgstr "Rejeter"
 
@@ -1418,62 +1424,62 @@ msgstr "N’importe qui peut suggérer des livres"
 msgid "This list is currently empty"
 msgstr "Cette liste est vide actuellement"
 
-#: bookwyrm/templates/lists/list.html:46
+#: bookwyrm/templates/lists/list.html:64
 #, python-format
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "Ajoutée par <a href=\"%(user_path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/lists/list.html:58
+#: bookwyrm/templates/lists/list.html:76
 #, fuzzy
 #| msgid "Sent"
 msgid "Set"
 msgstr "Envoyé(e)s"
 
-#: bookwyrm/templates/lists/list.html:61
+#: bookwyrm/templates/lists/list.html:79
 #, fuzzy
 #| msgid "List curation:"
 msgid "List position"
 msgstr "Modération de la liste :"
 
-#: bookwyrm/templates/lists/list.html:67
+#: bookwyrm/templates/lists/list.html:85
 #: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr "Supprimer"
 
-#: bookwyrm/templates/lists/list.html:80 bookwyrm/templates/lists/list.html:92
+#: bookwyrm/templates/lists/list.html:98 bookwyrm/templates/lists/list.html:110
 #, fuzzy
 #| msgid "Your Lists"
 msgid "Sort List"
 msgstr "Vos listes"
 
-#: bookwyrm/templates/lists/list.html:86
+#: bookwyrm/templates/lists/list.html:104
 #, fuzzy
 #| msgid "Directory"
 msgid "Direction"
 msgstr "Répertoire"
 
-#: bookwyrm/templates/lists/list.html:97
+#: bookwyrm/templates/lists/list.html:115
 msgid "Add Books"
 msgstr "Ajouter des livres"
 
-#: bookwyrm/templates/lists/list.html:97
+#: bookwyrm/templates/lists/list.html:115
 msgid "Suggest Books"
 msgstr "Suggérer des livres"
 
-#: bookwyrm/templates/lists/list.html:106
+#: bookwyrm/templates/lists/list.html:124
 msgid "search"
 msgstr "Chercher"
 
-#: bookwyrm/templates/lists/list.html:112
+#: bookwyrm/templates/lists/list.html:130
 msgid "Clear search"
 msgstr "Vider la requête"
 
-#: bookwyrm/templates/lists/list.html:117
+#: bookwyrm/templates/lists/list.html:135
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
 msgstr "Aucun livre trouvé pour la requête « %(query)s »"
 
-#: bookwyrm/templates/lists/list.html:133
+#: bookwyrm/templates/lists/list.html:163
 msgid "Suggest"
 msgstr "Suggérer"
 
@@ -1837,35 +1843,52 @@ msgstr "Profil"
 msgid "Relationships"
 msgstr "Relations"
 
-#: bookwyrm/templates/search_results.html:20
-msgid "Log in to import or add books."
-msgstr ""
-
-#: bookwyrm/templates/search_results.html:38
-msgid "Didn't find what you were looking for?"
-msgstr "Vous n’avez pas trouvé ce que vous cherchiez ?"
-
-#: bookwyrm/templates/search_results.html:40
-msgid "Show results from other catalogues"
-msgstr "Montrer les résultats d’autres catalogues"
-
-#: bookwyrm/templates/search_results.html:44
-msgid "Hide results from other catalogues"
-msgstr "Masquer les résultats d’autres catalogues"
-
-#: bookwyrm/templates/search_results.html:63
+#: bookwyrm/templates/search/book.html:30
 #, fuzzy
 #| msgid "Show more"
 msgid "Show"
 msgstr "Déplier"
 
-#: bookwyrm/templates/search_results.html:97
-msgid "Matching Users"
-msgstr "Comptes correspondants"
+#: bookwyrm/templates/search/book.html:64
+#, fuzzy
+#| msgid "Show results from other catalogues"
+msgid "Load results from other catalogues"
+msgstr "Montrer les résultats d’autres catalogues"
 
-#: bookwyrm/templates/search_results.html:117
-#, python-format
-msgid "No lists found for \"%(query)s\""
+#: bookwyrm/templates/search/book.html:68
+msgid "Log in to import or add books."
+msgstr ""
+
+#: bookwyrm/templates/search/layout.html:16
+#, fuzzy
+#| msgid "Search for a user"
+msgid "Search query"
+msgstr "Chercher un compte"
+
+#: bookwyrm/templates/search/layout.html:19
+#, fuzzy
+#| msgid "Search"
+msgid "Search type"
+msgstr "Chercher"
+
+#: bookwyrm/templates/search/layout.html:21
+#: bookwyrm/templates/search/layout.html:42
+#: bookwyrm/templates/user/layout.html:73
+msgid "Books"
+msgstr "Livres"
+
+#: bookwyrm/templates/search/layout.html:23
+#: bookwyrm/templates/search/layout.html:46
+#: bookwyrm/templates/settings/admin_layout.html:26
+#: bookwyrm/templates/user_admin/user_admin.html:3
+#: bookwyrm/templates/user_admin/user_admin.html:10
+msgid "Users"
+msgstr "Comptes"
+
+#: bookwyrm/templates/search/layout.html:58
+#, fuzzy, python-format
+#| msgid "No lists found for \"%(query)s\""
+msgid "No results found for \"%(query)s\""
 msgstr "Aucune liste trouvée pour « %(query)s »"
 
 #: bookwyrm/templates/settings/admin_layout.html:4
@@ -1876,12 +1899,6 @@ msgstr "Administration"
 msgid "Manage Users"
 msgstr "Gérer les comptes"
 
-#: bookwyrm/templates/settings/admin_layout.html:26
-#: bookwyrm/templates/user_admin/user_admin.html:3
-#: bookwyrm/templates/user_admin/user_admin.html:10
-msgid "Users"
-msgstr "Comptes"
-
 #: bookwyrm/templates/settings/admin_layout.html:39
 #: bookwyrm/templates/settings/federation.html:3
 #: bookwyrm/templates/settings/federation.html:5
@@ -1914,7 +1931,7 @@ msgid "Footer Content"
 msgstr "Contenu du pied de page"
 
 #: bookwyrm/templates/settings/admin_layout.html:54
-#: bookwyrm/templates/settings/site.html:77
+#: bookwyrm/templates/settings/site.html:81
 msgid "Registration"
 msgstr "Enregistrement"
 
@@ -1983,7 +2000,7 @@ msgid "Details"
 msgstr "Détails"
 
 #: bookwyrm/templates/settings/federated_server.html:36
-#: bookwyrm/templates/user/user_layout.html:50
+#: bookwyrm/templates/user/layout.html:55
 msgid "Activity"
 msgstr "Activité"
 
@@ -2237,20 +2254,23 @@ msgstr "Titre pour soutenir l’instance :"
 msgid "Admin email:"
 msgstr "Email de l’administrateur :"
 
-#: bookwyrm/templates/settings/site.html:79
+#: bookwyrm/templates/settings/site.html:73
+msgid "Additional info:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:83
 msgid "Allow registration:"
 msgstr "Autoriser l’enregistrement :"
 
-#: bookwyrm/templates/settings/site.html:83
+#: bookwyrm/templates/settings/site.html:87
 msgid "Allow invite requests:"
 msgstr "Autoriser les demandes d’invitation :"
 
-#: bookwyrm/templates/settings/site.html:87
+#: bookwyrm/templates/settings/site.html:91
 msgid "Registration closed text:"
 msgstr "Texte affiché lorsque les enregistrements sont clos :"
 
-#: bookwyrm/templates/snippets/book_cover.html:20
-#: bookwyrm/templates/snippets/search_result_text.html:10
+#: bookwyrm/templates/snippets/book_cover.html:36
 msgid "No cover"
 msgstr "Aucune couverture"
 
@@ -2538,7 +2558,8 @@ msgid "Post privacy"
 msgstr "Confidentialité du statut"
 
 #: bookwyrm/templates/snippets/privacy_select.html:16
-#: bookwyrm/templates/user/followers.html:13
+#: bookwyrm/templates/user/relationships/followers.html:6
+#: bookwyrm/templates/user/relationships/layout.html:11
 msgid "Followers"
 msgstr "Abonnements"
 
@@ -2566,16 +2587,16 @@ msgstr "Montrer toutes les progressions"
 msgid "Delete this progress update"
 msgstr "Supprimer cette mise à jour"
 
-#: bookwyrm/templates/snippets/readthrough.html:51
+#: bookwyrm/templates/snippets/readthrough.html:52
 msgid "started"
 msgstr "commencé"
 
-#: bookwyrm/templates/snippets/readthrough.html:57
-#: bookwyrm/templates/snippets/readthrough.html:71
+#: bookwyrm/templates/snippets/readthrough.html:59
+#: bookwyrm/templates/snippets/readthrough.html:73
 msgid "Edit read dates"
 msgstr "Modifier les date de lecture"
 
-#: bookwyrm/templates/snippets/readthrough.html:61
+#: bookwyrm/templates/snippets/readthrough.html:63
 msgid "Delete these read dates"
 msgstr "Supprimer ces dates de lecture"
 
@@ -2622,7 +2643,7 @@ msgstr "a commenté"
 msgid "quoted"
 msgstr "a cité"
 
-#: bookwyrm/templates/snippets/search_result_text.html:35
+#: bookwyrm/templates/snippets/search_result_text.html:36
 msgid "Import book"
 msgstr "Importer le livre"
 
@@ -2672,17 +2693,17 @@ msgstr "Commencer « <em>%(book_title)s</em> »"
 msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgstr "A envie de lire « <em>%(book_title)s</em> »"
 
-#: bookwyrm/templates/snippets/status/content_status.html:67
+#: bookwyrm/templates/snippets/status/content_status.html:70
 #: bookwyrm/templates/snippets/trimmed_text.html:14
 msgid "Show more"
 msgstr "Déplier"
 
-#: bookwyrm/templates/snippets/status/content_status.html:82
+#: bookwyrm/templates/snippets/status/content_status.html:85
 #: bookwyrm/templates/snippets/trimmed_text.html:29
 msgid "Show less"
 msgstr "Replier"
 
-#: bookwyrm/templates/snippets/status/content_status.html:112
+#: bookwyrm/templates/snippets/status/content_status.html:115
 msgid "Open image in new window"
 msgstr "Ouvrir l’image dans une nouvelle fenêtre"
 
@@ -2741,43 +2762,17 @@ msgstr "Trié par ordre croissant"
 msgid "Sorted descending"
 msgstr "Trié par ordre décroissant"
 
-#: bookwyrm/templates/user/books_header.html:5
-#, python-format
-msgid "%(username)s's books"
-msgstr "Livres de %(username)s"
-
-#: bookwyrm/templates/user/create_shelf_form.html:5
-#: bookwyrm/templates/user/create_shelf_form.html:22
-msgid "Create Shelf"
-msgstr "Créer l’étagère"
-
-#: bookwyrm/templates/user/edit_shelf_form.html:5
-msgid "Edit Shelf"
-msgstr "Modifier l’étagère"
-
-#: bookwyrm/templates/user/edit_shelf_form.html:26
-msgid "Update shelf"
-msgstr "Mettre l’étagère à jour"
-
-#: bookwyrm/templates/user/followers.html:7
-#: bookwyrm/templates/user/following.html:7
-#: bookwyrm/templates/user/user.html:10
+#: bookwyrm/templates/user/layout.html:12 bookwyrm/templates/user/user.html:10
 msgid "User Profile"
 msgstr "Profil"
 
-#: bookwyrm/templates/user/followers.html:29
-#, python-format
-msgid "%(username)s has no followers"
-msgstr "%(username)s n’a pas d’abonné(e)"
+#: bookwyrm/templates/user/layout.html:36
+msgid "Follow Requests"
+msgstr "Demandes d’abonnement"
 
-#: bookwyrm/templates/user/following.html:13
-msgid "Following"
-msgstr "Abonné(e) à"
-
-#: bookwyrm/templates/user/following.html:29
-#, python-format
-msgid "%(username)s isn't following any users"
-msgstr "%(username)s n’est abonné(e) à personne"
+#: bookwyrm/templates/user/layout.html:61
+msgid "Reading Goal"
+msgstr "Défi lecture"
 
 #: bookwyrm/templates/user/lists.html:11
 #, python-format
@@ -2788,35 +2783,71 @@ msgstr "Listes : %(username)s"
 msgid "Create list"
 msgstr "Créer une liste"
 
-#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:51
+#: bookwyrm/templates/user/relationships/followers.html:12
+#, python-format
+msgid "%(username)s has no followers"
+msgstr "%(username)s n’a pas d’abonné(e)"
+
+#: bookwyrm/templates/user/relationships/following.html:6
+#: bookwyrm/templates/user/relationships/layout.html:15
+msgid "Following"
+msgstr "Abonné(e) à"
+
+#: bookwyrm/templates/user/relationships/following.html:12
+#, python-format
+msgid "%(username)s isn't following any users"
+msgstr "%(username)s n’est abonné(e) à personne"
+
+#: bookwyrm/templates/user/shelf/books_header.html:5
+#, python-format
+msgid "%(username)s's books"
+msgstr "Livres de %(username)s"
+
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:5
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:22
+msgid "Create Shelf"
+msgstr "Créer l’étagère"
+
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:5
+msgid "Edit Shelf"
+msgstr "Modifier l’étagère"
+
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:26
+msgid "Update shelf"
+msgstr "Mettre l’étagère à jour"
+
+#: bookwyrm/templates/user/shelf/shelf.html:24 bookwyrm/views/shelf.py:48
 msgid "All books"
 msgstr "Tous les livres"
 
-#: bookwyrm/templates/user/shelf.html:37
+#: bookwyrm/templates/user/shelf/shelf.html:37
 msgid "Create shelf"
 msgstr "Créer l’étagère"
 
-#: bookwyrm/templates/user/shelf.html:58
+#: bookwyrm/templates/user/shelf/shelf.html:60
 msgid "Edit shelf"
 msgstr "Modifier l’étagère"
 
-#: bookwyrm/templates/user/shelf.html:77 bookwyrm/templates/user/shelf.html:99
+#: bookwyrm/templates/user/shelf/shelf.html:79
+#: bookwyrm/templates/user/shelf/shelf.html:101
 msgid "Shelved"
 msgstr "Ajouté à une étagère"
 
-#: bookwyrm/templates/user/shelf.html:78 bookwyrm/templates/user/shelf.html:103
+#: bookwyrm/templates/user/shelf/shelf.html:80
+#: bookwyrm/templates/user/shelf/shelf.html:105
 msgid "Started"
 msgstr "Commencé"
 
-#: bookwyrm/templates/user/shelf.html:79 bookwyrm/templates/user/shelf.html:106
+#: bookwyrm/templates/user/shelf/shelf.html:81
+#: bookwyrm/templates/user/shelf/shelf.html:108
 msgid "Finished"
 msgstr "Terminé"
 
-#: bookwyrm/templates/user/shelf.html:132
+#: bookwyrm/templates/user/shelf/shelf.html:134
 msgid "This shelf is empty."
 msgstr "Cette étagère est vide"
 
-#: bookwyrm/templates/user/shelf.html:138
+#: bookwyrm/templates/user/shelf/shelf.html:140
 msgid "Delete shelf"
 msgstr "Supprimer l’étagère"
 
@@ -2833,52 +2864,44 @@ msgstr "Voir les %(size)s"
 msgid "View all books"
 msgstr "Voir tous les livres"
 
-#: bookwyrm/templates/user/user.html:59
-#, python-format
-msgid "Set a reading goal for %(year)s"
-msgstr "Définir un défi lecture pour %(year)s"
-
-#: bookwyrm/templates/user/user.html:65
+#: bookwyrm/templates/user/user.html:60
 msgid "User Activity"
 msgstr "Activité du compte"
 
-#: bookwyrm/templates/user/user.html:68
+#: bookwyrm/templates/user/user.html:63
 msgid "RSS feed"
 msgstr "Flux RSS"
 
-#: bookwyrm/templates/user/user.html:79
+#: bookwyrm/templates/user/user.html:74
 msgid "No activities yet!"
 msgstr "Aucune activité pour l’instant !"
 
-#: bookwyrm/templates/user/user_layout.html:32
-msgid "Follow Requests"
-msgstr "Demandes d’abonnement"
-
-#: bookwyrm/templates/user/user_layout.html:56
-msgid "Reading Goal"
-msgstr "Défi lecture"
-
-#: bookwyrm/templates/user/user_layout.html:68
-msgid "Books"
-msgstr "Livres"
-
-#: bookwyrm/templates/user/user_preview.html:13
+#: bookwyrm/templates/user/user_preview.html:14
 #, python-format
 msgid "Joined %(date)s"
 msgstr "Enregistré(e) %(date)s"
 
-#: bookwyrm/templates/user/user_preview.html:15
+#: bookwyrm/templates/user/user_preview.html:18
 #, python-format
 msgid "%(counter)s follower"
 msgid_plural "%(counter)s followers"
 msgstr[0] "%(counter)s abonnement"
 msgstr[1] "%(counter)s abonnements"
 
-#: bookwyrm/templates/user/user_preview.html:16
+#: bookwyrm/templates/user/user_preview.html:19
 #, python-format
 msgid "%(counter)s following"
 msgstr "%(counter)s abonnements"
 
+#: bookwyrm/templates/user/user_preview.html:25
+#, fuzzy, python-format
+#| msgid "%(mutuals)s follower you follow"
+#| msgid_plural "%(mutuals)s followers you follow"
+msgid "%(mutuals_display)s follower you follow"
+msgid_plural "%(mutuals_display)s followers you follow"
+msgstr[0] "%(mutuals)s abonnement auxquel vous êtes abonné(e)"
+msgstr[1] "%(mutuals)s abonnements auxquels vous êtes abonné(e)"
+
 #: bookwyrm/templates/user_admin/user.html:11
 #, fuzzy
 #| msgid "Back to reports"
@@ -4353,6 +4376,19 @@ msgctxt "stick"
 msgid "club"
 msgstr ""
 
+#~ msgid "Didn't find what you were looking for?"
+#~ msgstr "Vous n’avez pas trouvé ce que vous cherchiez ?"
+
+#~ msgid "Hide results from other catalogues"
+#~ msgstr "Masquer les résultats d’autres catalogues"
+
+#~ msgid "Matching Users"
+#~ msgstr "Comptes correspondants"
+
+#, python-format
+#~ msgid "Set a reading goal for %(year)s"
+#~ msgstr "Définir un défi lecture pour %(year)s"
+
 #, python-format
 #~ msgid "by %(author)s"
 #~ msgstr "par %(author)s"
diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
index 783fc70a..9c863e41 100644
--- a/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/locale/zh_Hans/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-29 13:24-0700\n"
+"POT-Creation-Date: 2021-05-01 10:56-0700\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"
@@ -58,11 +58,12 @@ msgid "Book Title"
 msgstr "标题"
 
 #: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:31
-#: bookwyrm/templates/user/shelf.html:80 bookwyrm/templates/user/shelf.html:110
+#: bookwyrm/templates/user/shelf/shelf.html:82
+#: bookwyrm/templates/user/shelf/shelf.html:112
 msgid "Rating"
 msgstr "评价"
 
-#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:82
+#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:100
 msgid "Sort By"
 msgstr ""
 
@@ -88,7 +89,7 @@ msgstr "%(value)s �是有效的 remote_id"
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s �是有效的用户�"
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:153
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:156
 msgid "username"
 msgstr "用户�"
 
@@ -150,8 +151,8 @@ msgid "Books by %(name)s"
 msgstr "%(name)s 所著的书"
 
 #: bookwyrm/templates/book/book.html:33
-#: bookwyrm/templates/discover/large-book.html:12
-#: bookwyrm/templates/discover/small-book.html:9
+#: bookwyrm/templates/discover/large-book.html:25
+#: bookwyrm/templates/discover/small-book.html:19
 msgid "by"
 msgstr "作者"
 
@@ -159,49 +160,49 @@ msgstr "作者"
 msgid "Edit Book"
 msgstr "编辑书目"
 
-#: bookwyrm/templates/book/book.html:61
+#: bookwyrm/templates/book/book.html:60
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "添加��"
 
-#: bookwyrm/templates/book/book.html:65
+#: bookwyrm/templates/book/book.html:64
 msgid "Failed to load cover"
 msgstr "加载��失败"
 
-#: bookwyrm/templates/book/book.html:82
+#: bookwyrm/templates/book/book.html:81
 msgid "View on OpenLibrary"
 msgstr "在 OpenLibrary 查看"
 
-#: bookwyrm/templates/book/book.html:85
+#: bookwyrm/templates/book/book.html:84
 #, fuzzy
 #| msgid "View on OpenLibrary"
 msgid "View on Inventaire"
 msgstr "在 OpenLibrary 查看"
 
-#: bookwyrm/templates/book/book.html:105
+#: bookwyrm/templates/book/book.html:104
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s 则书评)"
 
-#: bookwyrm/templates/book/book.html:117
+#: bookwyrm/templates/book/book.html:116
 msgid "Add Description"
 msgstr "添加�述"
 
-#: bookwyrm/templates/book/book.html:124
+#: bookwyrm/templates/book/book.html:123
 #: bookwyrm/templates/book/edit_book.html:107
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "�述:"
 
-#: bookwyrm/templates/book/book.html:128
-#: bookwyrm/templates/book/edit_book.html:240
+#: bookwyrm/templates/book/book.html:127
+#: bookwyrm/templates/book/edit_book.html:241
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:93
-#: bookwyrm/templates/settings/site.html:93
-#: bookwyrm/templates/snippets/readthrough.html:75
+#: bookwyrm/templates/settings/site.html:97
+#: bookwyrm/templates/snippets/readthrough.html:77
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
@@ -209,15 +210,15 @@ msgstr "�述:"
 msgid "Save"
 msgstr "�存"
 
-#: bookwyrm/templates/book/book.html:129 bookwyrm/templates/book/book.html:178
+#: bookwyrm/templates/book/book.html:128 bookwyrm/templates/book/book.html:180
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:241
+#: bookwyrm/templates/book/edit_book.html:242
 #: bookwyrm/templates/edit_author.html:79
 #: bookwyrm/templates/moderation/report_modal.html:34
 #: bookwyrm/templates/settings/federated_server.html:94
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/readthrough.html:76
+#: bookwyrm/templates/snippets/readthrough.html:78
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
@@ -225,17 +226,17 @@ msgstr "�存"
 msgid "Cancel"
 msgstr "�消"
 
-#: bookwyrm/templates/book/book.html:138
+#: bookwyrm/templates/book/book.html:137
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s/editions\">%(count)s 个版本</a>"
 
-#: bookwyrm/templates/book/book.html:146
+#: bookwyrm/templates/book/book.html:145
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "此版本在你的 <a href=\"%(path)s\">%(shelf_name)s</a> 书架上。"
 
-#: bookwyrm/templates/book/book.html:152
+#: bookwyrm/templates/book/book.html:151
 #, python-format
 msgid ""
 "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a "
@@ -244,96 +245,97 @@ msgstr ""
 "本书的 <a href=\"%(book_path)s\">�一个版本</a> 在你的 <a href="
 "\"%(shelf_path)s\">%(shelf_name)s</a> 书架上。"
 
-#: bookwyrm/templates/book/book.html:161
+#: bookwyrm/templates/book/book.html:162
 msgid "Your reading activity"
 msgstr "你的阅读活动"
 
-#: bookwyrm/templates/book/book.html:163
+#: bookwyrm/templates/book/book.html:165
 msgid "Add read dates"
 msgstr "添加阅读日期"
 
-#: bookwyrm/templates/book/book.html:168
+#: bookwyrm/templates/book/book.html:170
 msgid "You don't have any reading activity for this book."
 msgstr "你还没有任何这本书的阅读活动。"
 
-#: bookwyrm/templates/book/book.html:175
+#: bookwyrm/templates/book/book.html:177
 msgid "Create"
 msgstr "创建"
 
-#: bookwyrm/templates/book/book.html:197
-msgid "Subjects"
-msgstr "主题"
-
-#: bookwyrm/templates/book/book.html:209
-msgid "Places"
-msgstr "地点"
-
-#: bookwyrm/templates/book/book.html:220 bookwyrm/templates/layout.html:65
-#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
-#: bookwyrm/templates/search_results.html:115
-#: bookwyrm/templates/user/user_layout.html:62
-msgid "Lists"
-msgstr "列表"
-
-#: bookwyrm/templates/book/book.html:231
-msgid "Add to list"
-msgstr "添加到列表"
-
-#: bookwyrm/templates/book/book.html:241
-#: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:133
-msgid "Add"
-msgstr "添加"
-
-#: bookwyrm/templates/book/book.html:257
+#: bookwyrm/templates/book/book.html:203
 #, fuzzy
 #| msgid "Review"
 msgid "Reviews"
 msgstr "书评"
 
-#: bookwyrm/templates/book/book.html:262
+#: bookwyrm/templates/book/book.html:208
 #, fuzzy
 #| msgid "Your shelves"
 msgid "Your reviews"
 msgstr "你的书架"
 
-#: bookwyrm/templates/book/book.html:268
+#: bookwyrm/templates/book/book.html:214
 #, fuzzy
 #| msgid "Your Account"
 msgid "Your comments"
 msgstr "你的��"
 
-#: bookwyrm/templates/book/book.html:274
+#: bookwyrm/templates/book/book.html:220
 #, fuzzy
 #| msgid "Your books"
 msgid "Your quotes"
 msgstr "你的书目"
 
-#: bookwyrm/templates/book/book.html:308
+#: bookwyrm/templates/book/book.html:255
 msgid "rated it"
 msgstr "评价了"
 
+#: bookwyrm/templates/book/book.html:276
+msgid "Subjects"
+msgstr "主题"
+
+#: bookwyrm/templates/book/book.html:288
+msgid "Places"
+msgstr "地点"
+
+#: bookwyrm/templates/book/book.html:299 bookwyrm/templates/layout.html:65
+#: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
+#: bookwyrm/templates/search/layout.html:25
+#: bookwyrm/templates/search/layout.html:50
+#: bookwyrm/templates/user/layout.html:67
+msgid "Lists"
+msgstr "列表"
+
+#: bookwyrm/templates/book/book.html:310
+msgid "Add to list"
+msgstr "添加到列表"
+
+#: bookwyrm/templates/book/book.html:320
+#: bookwyrm/templates/book/cover_modal.html:31
+#: bookwyrm/templates/lists/list.html:163
+msgid "Add"
+msgstr "添加"
+
 #: bookwyrm/templates/book/book_identifiers.html:8
 msgid "ISBN:"
 msgstr "ISBN:"
 
 #: bookwyrm/templates/book/book_identifiers.html:15
-#: bookwyrm/templates/book/edit_book.html:226
+#: bookwyrm/templates/book/edit_book.html:227
 msgid "OCLC Number:"
 msgstr "OCLC �:"
 
 #: bookwyrm/templates/book/book_identifiers.html:22
-#: bookwyrm/templates/book/edit_book.html:230
+#: bookwyrm/templates/book/edit_book.html:231
 msgid "ASIN:"
 msgstr "ASIN:"
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/book/edit_book.html:179
 msgid "Upload cover:"
 msgstr "上传��:"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:184
+#: bookwyrm/templates/book/edit_book.html:185
 msgid "Load cover from url:"
 msgstr "从网�加载��:"
 
@@ -459,36 +461,36 @@ msgid "John Doe, Jane Smith"
 msgstr "张三, �四"
 
 #: bookwyrm/templates/book/edit_book.html:170
-#: bookwyrm/templates/user/shelf.html:74
+#: bookwyrm/templates/user/shelf/shelf.html:76
 msgid "Cover"
 msgstr "��"
 
-#: bookwyrm/templates/book/edit_book.html:197
+#: bookwyrm/templates/book/edit_book.html:198
 msgid "Physical Properties"
 msgstr "实体性质"
 
-#: bookwyrm/templates/book/edit_book.html:198
+#: bookwyrm/templates/book/edit_book.html:199
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "格�:"
 
-#: bookwyrm/templates/book/edit_book.html:206
+#: bookwyrm/templates/book/edit_book.html:207
 msgid "Pages:"
 msgstr "页数:"
 
-#: bookwyrm/templates/book/edit_book.html:213
+#: bookwyrm/templates/book/edit_book.html:214
 msgid "Book Identifiers"
 msgstr "书目标识�"
 
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:215
 msgid "ISBN 13:"
 msgstr "ISBN 13:"
 
-#: bookwyrm/templates/book/edit_book.html:218
+#: bookwyrm/templates/book/edit_book.html:219
 msgid "ISBN 10:"
 msgstr "ISBN 10:"
 
-#: bookwyrm/templates/book/edit_book.html:222
+#: bookwyrm/templates/book/edit_book.html:223
 #: bookwyrm/templates/edit_author.html:59
 msgid "Openlibrary key:"
 msgstr "Openlibrary key:"
@@ -552,7 +554,7 @@ msgstr "由 %(publisher)s 出版。"
 #: bookwyrm/templates/feed/feed_layout.html:70
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
-#: bookwyrm/templates/search_results.html:72
+#: bookwyrm/templates/search/book.html:39
 msgid "Close"
 msgstr "关闭"
 
@@ -574,46 +576,28 @@ msgstr "本地用户"
 msgid "Federated community"
 msgstr "跨站社区"
 
-#: bookwyrm/templates/directory/directory.html:6
-#: bookwyrm/templates/directory/directory.html:11
+#: bookwyrm/templates/directory/directory.html:4
+#: bookwyrm/templates/directory/directory.html:9
 #: bookwyrm/templates/layout.html:93
 msgid "Directory"
 msgstr "目录"
 
-#: bookwyrm/templates/directory/directory.html:19
+#: bookwyrm/templates/directory/directory.html:17
 msgid "Make your profile discoverable to other BookWyrm users."
 msgstr "使你的个人资料�以被其它 BookWyrm 用户�现。"
 
-#: bookwyrm/templates/directory/directory.html:26
+#: bookwyrm/templates/directory/directory.html:24
 #, python-format
 msgid ""
 "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</"
 "a>"
 msgstr "你�以在任何时候从你的 <a href=\"%(path)s\">个人资料设定</a> 中退出。"
 
-#: bookwyrm/templates/directory/directory.html:31
+#: bookwyrm/templates/directory/directory.html:29
 #: bookwyrm/templates/snippets/goal_card.html:22
 msgid "Dismiss message"
 msgstr "�散消�"
 
-#: bookwyrm/templates/directory/directory.html:71
-msgid "follower you follow"
-msgid_plural "followers you follow"
-msgstr[0] "你关注的关注者"
-
-#: bookwyrm/templates/directory/directory.html:78
-msgid "book on your shelves"
-msgid_plural "books on your shelves"
-msgstr[0] "你书架上的书"
-
-#: bookwyrm/templates/directory/directory.html:86
-msgid "posts"
-msgstr "�文"
-
-#: bookwyrm/templates/directory/directory.html:92
-msgid "last active"
-msgstr "最�活跃"
-
 #: bookwyrm/templates/directory/sort_filter.html:5
 msgid "Order by"
 msgstr "排列顺�"
@@ -626,6 +610,24 @@ msgstr "�推�"
 msgid "Recently active"
 msgstr "最近活跃"
 
+#: bookwyrm/templates/directory/user_card.html:32
+msgid "follower you follow"
+msgid_plural "followers you follow"
+msgstr[0] "你关注的关注者"
+
+#: bookwyrm/templates/directory/user_card.html:39
+msgid "book on your shelves"
+msgid_plural "books on your shelves"
+msgstr[0] "你书架上的书"
+
+#: bookwyrm/templates/directory/user_card.html:47
+msgid "posts"
+msgstr "�文"
+
+#: bookwyrm/templates/directory/user_card.html:53
+msgid "last active"
+msgstr "最�活跃"
+
 #: bookwyrm/templates/directory/user_type_filter.html:5
 msgid "User type"
 msgstr "用户类型"
@@ -713,8 +715,8 @@ msgid "Edit Author:"
 msgstr "编辑作者:"
 
 #: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
-#: bookwyrm/templates/user/create_shelf_form.html:13
-#: bookwyrm/templates/user/edit_shelf_form.html:14
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:13
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:14
 msgid "Name:"
 msgstr "�称:"
 
@@ -886,7 +888,7 @@ msgstr "æ›´æ–°"
 
 #: bookwyrm/templates/feed/feed_layout.html:11
 #: bookwyrm/templates/layout.html:59
-#: bookwyrm/templates/user/books_header.html:3
+#: bookwyrm/templates/user/shelf/books_header.html:3
 msgid "Your books"
 msgstr "你的书目"
 
@@ -896,18 +898,18 @@ msgid ""
 msgstr "现在这里还没有任何书目��试�从�索�本书开始�"
 
 #: bookwyrm/templates/feed/feed_layout.html:24
-#: bookwyrm/templates/user/shelf.html:28
+#: bookwyrm/templates/user/shelf/shelf.html:28
 msgid "To Read"
 msgstr "想读"
 
 #: bookwyrm/templates/feed/feed_layout.html:25
-#: bookwyrm/templates/user/shelf.html:28
+#: bookwyrm/templates/user/shelf/shelf.html:28
 msgid "Currently Reading"
 msgstr "在读"
 
 #: bookwyrm/templates/feed/feed_layout.html:26
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-#: bookwyrm/templates/user/shelf.html:28
+#: bookwyrm/templates/user/shelf/shelf.html:28
 msgid "Read"
 msgstr "读过"
 
@@ -939,13 +941,12 @@ msgid "What are you reading?"
 msgstr "你在阅读什么？"
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:101
+#: bookwyrm/templates/lists/list.html:119
 msgid "Search for a book"
 msgstr "�索书目"
 
 #: bookwyrm/templates/get_started/books.html:11
 #: bookwyrm/templates/isbn_search_results.html:17
-#: bookwyrm/templates/search_results.html:17
 #, python-format
 msgid "No books found for \"%(query)s\""
 msgstr "没有找到 \"%(query)s\" 的书目"
@@ -960,25 +961,27 @@ msgstr "你�以在开始使用 %(site_name)s �添加书目。"
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
 #: bookwyrm/templates/layout.html:38 bookwyrm/templates/layout.html:39
-#: bookwyrm/templates/lists/list.html:105
+#: bookwyrm/templates/lists/list.html:123
+#: bookwyrm/templates/search/layout.html:4
+#: bookwyrm/templates/search/layout.html:9
 msgid "Search"
 msgstr "�索"
 
-#: bookwyrm/templates/get_started/books.html:26
+#: bookwyrm/templates/get_started/books.html:27
 msgid "Suggested Books"
 msgstr "推�的书目"
 
-#: bookwyrm/templates/get_started/books.html:41
+#: bookwyrm/templates/get_started/books.html:46
 #, python-format
 msgid "Popular on %(site_name)s"
 msgstr "%(site_name)s 上的热门"
 
-#: bookwyrm/templates/get_started/books.html:51
-#: bookwyrm/templates/lists/list.html:118
+#: bookwyrm/templates/get_started/books.html:58
+#: bookwyrm/templates/lists/list.html:136
 msgid "No books found"
 msgstr "没有找到书目"
 
-#: bookwyrm/templates/get_started/books.html:54
+#: bookwyrm/templates/get_started/books.html:63
 #: bookwyrm/templates/get_started/profile.html:54
 msgid "Save &amp; continue"
 msgstr "�存 &amp; 继续"
@@ -1053,7 +1056,6 @@ msgid "Search for a user"
 msgstr "�索用户"
 
 #: bookwyrm/templates/get_started/users.html:13
-#: bookwyrm/templates/search_results.html:99
 #, python-format
 msgid "No users found for \"%(query)s\""
 msgstr "没有找到 \"%(query)s\" 的用户"
@@ -1173,18 +1175,19 @@ msgid "Successfully imported"
 msgstr "�功导入了"
 
 #: bookwyrm/templates/import_status.html:112
-#: bookwyrm/templates/lists/curate.html:14
 msgid "Book"
 msgstr "书目"
 
 #: bookwyrm/templates/import_status.html:115
 #: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/user/shelf.html:75 bookwyrm/templates/user/shelf.html:93
+#: bookwyrm/templates/user/shelf/shelf.html:77
+#: bookwyrm/templates/user/shelf/shelf.html:95
 msgid "Title"
 msgstr "标题"
 
 #: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/user/shelf.html:76 bookwyrm/templates/user/shelf.html:96
+#: bookwyrm/templates/user/shelf/shelf.html:78
+#: bookwyrm/templates/user/shelf/shelf.html:98
 msgid "Author"
 msgstr "作者"
 
@@ -1206,18 +1209,15 @@ msgid "Sorry! This invite code is no longer valid."
 msgstr "抱歉�此邀请�已��有效。"
 
 #: bookwyrm/templates/isbn_search_results.html:4
-#: bookwyrm/templates/search_results.html:4
 msgid "Search Results"
 msgstr "�索结果"
 
 #: bookwyrm/templates/isbn_search_results.html:9
-#: bookwyrm/templates/search_results.html:9
 #, python-format
 msgid "Search Results for \"%(query)s\""
 msgstr "\"%(query)s\" 的�索结果"
 
 #: bookwyrm/templates/isbn_search_results.html:14
-#: bookwyrm/templates/search_results.html:14
 msgid "Matching Books"
 msgstr "匹�的书目"
 
@@ -1259,38 +1259,44 @@ msgstr "登出"
 msgid "Notifications"
 msgstr "通知"
 
-#: bookwyrm/templates/layout.html:152 bookwyrm/templates/layout.html:156
+#: bookwyrm/templates/layout.html:155 bookwyrm/templates/layout.html:159
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "用户�:"
 
-#: bookwyrm/templates/layout.html:157
+#: bookwyrm/templates/layout.html:160
 msgid "password"
 msgstr "密�"
 
-#: bookwyrm/templates/layout.html:158 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:161 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr "忘记了密�？"
 
-#: bookwyrm/templates/layout.html:161 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "登录"
 
-#: bookwyrm/templates/layout.html:169
+#: bookwyrm/templates/layout.html:172
 msgid "Join"
 msgstr "加入"
 
-#: bookwyrm/templates/layout.html:195
+#: bookwyrm/templates/layout.html:198
 msgid "About this server"
 msgstr "关于本�务器"
 
-#: bookwyrm/templates/layout.html:199
+#: bookwyrm/templates/layout.html:202
 msgid "Contact site admin"
 msgstr "�系站点管�员"
 
 #: bookwyrm/templates/layout.html:206
+#, fuzzy
+#| msgid "List curation:"
+msgid "Documentation"
+msgstr "列表策展:"
+
+#: bookwyrm/templates/layout.html:213
 #, python-format
 msgid ""
 "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">"
@@ -1299,7 +1305,7 @@ msgstr ""
 "在 <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a> 上支"
 "� %(site_name)s"
 
-#: bookwyrm/templates/layout.html:210
+#: bookwyrm/templates/layout.html:217
 msgid ""
 "BookWyrm is open source software. You can contribute or report issues on <a "
 "href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
@@ -1322,27 +1328,27 @@ msgstr "由 <a href=\"%(path)s\">%(username)s</a> 创建并策展"
 msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
 msgstr "由 <a href=\"%(path)s\">%(username)s</a> 创建"
 
-#: bookwyrm/templates/lists/curate.html:6
+#: bookwyrm/templates/lists/curate.html:8
 msgid "Pending Books"
 msgstr "等候中的书目"
 
-#: bookwyrm/templates/lists/curate.html:7
+#: bookwyrm/templates/lists/curate.html:11
 msgid "Go to list"
 msgstr "�往列表"
 
-#: bookwyrm/templates/lists/curate.html:9
+#: bookwyrm/templates/lists/curate.html:15
 msgid "You're all set!"
 msgstr "都弄好了�"
 
-#: bookwyrm/templates/lists/curate.html:15
+#: bookwyrm/templates/lists/curate.html:45
 msgid "Suggested by"
 msgstr "推��自"
 
-#: bookwyrm/templates/lists/curate.html:35
+#: bookwyrm/templates/lists/curate.html:57
 msgid "Approve"
 msgstr "批准"
 
-#: bookwyrm/templates/lists/curate.html:41
+#: bookwyrm/templates/lists/curate.html:63
 msgid "Discard"
 msgstr "削除"
 
@@ -1394,62 +1400,62 @@ msgstr "任何人都�以�此列表中添加书目"
 msgid "This list is currently empty"
 msgstr "此列表当�是空的"
 
-#: bookwyrm/templates/lists/list.html:46
+#: bookwyrm/templates/lists/list.html:64
 #, python-format
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "由 <a href=\"%(user_path)s\">%(username)s</a> 添加"
 
-#: bookwyrm/templates/lists/list.html:58
+#: bookwyrm/templates/lists/list.html:76
 #, fuzzy
 #| msgid "Sent"
 msgid "Set"
 msgstr "已��"
 
-#: bookwyrm/templates/lists/list.html:61
+#: bookwyrm/templates/lists/list.html:79
 #, fuzzy
 #| msgid "List curation:"
 msgid "List position"
 msgstr "列表策展:"
 
-#: bookwyrm/templates/lists/list.html:67
+#: bookwyrm/templates/lists/list.html:85
 #: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr "移除"
 
-#: bookwyrm/templates/lists/list.html:80 bookwyrm/templates/lists/list.html:92
+#: bookwyrm/templates/lists/list.html:98 bookwyrm/templates/lists/list.html:110
 #, fuzzy
 #| msgid "Your Lists"
 msgid "Sort List"
 msgstr "你的列表"
 
-#: bookwyrm/templates/lists/list.html:86
+#: bookwyrm/templates/lists/list.html:104
 #, fuzzy
 #| msgid "Directory"
 msgid "Direction"
 msgstr "目录"
 
-#: bookwyrm/templates/lists/list.html:97
+#: bookwyrm/templates/lists/list.html:115
 msgid "Add Books"
 msgstr "添加书目"
 
-#: bookwyrm/templates/lists/list.html:97
+#: bookwyrm/templates/lists/list.html:115
 msgid "Suggest Books"
 msgstr "推�书目"
 
-#: bookwyrm/templates/lists/list.html:106
+#: bookwyrm/templates/lists/list.html:124
 msgid "search"
 msgstr "�索"
 
-#: bookwyrm/templates/lists/list.html:112
+#: bookwyrm/templates/lists/list.html:130
 msgid "Clear search"
 msgstr "清除�索"
 
-#: bookwyrm/templates/lists/list.html:117
+#: bookwyrm/templates/lists/list.html:135
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
 msgstr "没有符� \"%(query)s\" 请求的书目"
 
-#: bookwyrm/templates/lists/list.html:133
+#: bookwyrm/templates/lists/list.html:163
 msgid "Suggest"
 msgstr "推�"
 
@@ -1802,35 +1808,52 @@ msgstr "个人资料"
 msgid "Relationships"
 msgstr "关系"
 
-#: bookwyrm/templates/search_results.html:20
-msgid "Log in to import or add books."
-msgstr ""
-
-#: bookwyrm/templates/search_results.html:38
-msgid "Didn't find what you were looking for?"
-msgstr "没有找到你想找的？"
-
-#: bookwyrm/templates/search_results.html:40
-msgid "Show results from other catalogues"
-msgstr "显示其它类别的结果"
-
-#: bookwyrm/templates/search_results.html:44
-msgid "Hide results from other catalogues"
-msgstr "��其它类别的结果"
-
-#: bookwyrm/templates/search_results.html:63
+#: bookwyrm/templates/search/book.html:30
 #, fuzzy
 #| msgid "Show more"
 msgid "Show"
 msgstr "显示更多"
 
-#: bookwyrm/templates/search_results.html:97
-msgid "Matching Users"
-msgstr "匹�的用户"
+#: bookwyrm/templates/search/book.html:64
+#, fuzzy
+#| msgid "Show results from other catalogues"
+msgid "Load results from other catalogues"
+msgstr "显示其它类别的结果"
 
-#: bookwyrm/templates/search_results.html:117
-#, python-format
-msgid "No lists found for \"%(query)s\""
+#: bookwyrm/templates/search/book.html:68
+msgid "Log in to import or add books."
+msgstr ""
+
+#: bookwyrm/templates/search/layout.html:16
+#, fuzzy
+#| msgid "Search for a user"
+msgid "Search query"
+msgstr "�索用户"
+
+#: bookwyrm/templates/search/layout.html:19
+#, fuzzy
+#| msgid "Search"
+msgid "Search type"
+msgstr "�索"
+
+#: bookwyrm/templates/search/layout.html:21
+#: bookwyrm/templates/search/layout.html:42
+#: bookwyrm/templates/user/layout.html:73
+msgid "Books"
+msgstr "书目"
+
+#: bookwyrm/templates/search/layout.html:23
+#: bookwyrm/templates/search/layout.html:46
+#: bookwyrm/templates/settings/admin_layout.html:26
+#: bookwyrm/templates/user_admin/user_admin.html:3
+#: bookwyrm/templates/user_admin/user_admin.html:10
+msgid "Users"
+msgstr "用户"
+
+#: bookwyrm/templates/search/layout.html:58
+#, fuzzy, python-format
+#| msgid "No lists found for \"%(query)s\""
+msgid "No results found for \"%(query)s\""
 msgstr "没有找到 \"%(query)s\" 的列表"
 
 #: bookwyrm/templates/settings/admin_layout.html:4
@@ -1841,12 +1864,6 @@ msgstr "管�"
 msgid "Manage Users"
 msgstr "管�用户"
 
-#: bookwyrm/templates/settings/admin_layout.html:26
-#: bookwyrm/templates/user_admin/user_admin.html:3
-#: bookwyrm/templates/user_admin/user_admin.html:10
-msgid "Users"
-msgstr "用户"
-
 #: bookwyrm/templates/settings/admin_layout.html:39
 #: bookwyrm/templates/settings/federation.html:3
 #: bookwyrm/templates/settings/federation.html:5
@@ -1879,7 +1896,7 @@ msgid "Footer Content"
 msgstr "页脚内容"
 
 #: bookwyrm/templates/settings/admin_layout.html:54
-#: bookwyrm/templates/settings/site.html:77
+#: bookwyrm/templates/settings/site.html:81
 msgid "Registration"
 msgstr "注册"
 
@@ -1948,7 +1965,7 @@ msgid "Details"
 msgstr "详细"
 
 #: bookwyrm/templates/settings/federated_server.html:36
-#: bookwyrm/templates/user/user_layout.html:50
+#: bookwyrm/templates/user/layout.html:55
 msgid "Activity"
 msgstr "活动"
 
@@ -2206,20 +2223,23 @@ msgstr "支�标题:"
 msgid "Admin email:"
 msgstr "管�员邮件:"
 
-#: bookwyrm/templates/settings/site.html:79
+#: bookwyrm/templates/settings/site.html:73
+msgid "Additional info:"
+msgstr ""
+
+#: bookwyrm/templates/settings/site.html:83
 msgid "Allow registration:"
 msgstr "�许注册:"
 
-#: bookwyrm/templates/settings/site.html:83
+#: bookwyrm/templates/settings/site.html:87
 msgid "Allow invite requests:"
 msgstr "�许请求邀请:"
 
-#: bookwyrm/templates/settings/site.html:87
+#: bookwyrm/templates/settings/site.html:91
 msgid "Registration closed text:"
 msgstr "注册关闭文字:"
 
-#: bookwyrm/templates/snippets/book_cover.html:20
-#: bookwyrm/templates/snippets/search_result_text.html:10
+#: bookwyrm/templates/snippets/book_cover.html:36
 msgid "No cover"
 msgstr "没有��"
 
@@ -2503,7 +2523,8 @@ msgid "Post privacy"
 msgstr "�文��"
 
 #: bookwyrm/templates/snippets/privacy_select.html:16
-#: bookwyrm/templates/user/followers.html:13
+#: bookwyrm/templates/user/relationships/followers.html:6
+#: bookwyrm/templates/user/relationships/layout.html:11
 msgid "Followers"
 msgstr "关注者"
 
@@ -2531,16 +2552,16 @@ msgstr "显示所有更新"
 msgid "Delete this progress update"
 msgstr "删除此进度更新"
 
-#: bookwyrm/templates/snippets/readthrough.html:51
+#: bookwyrm/templates/snippets/readthrough.html:52
 msgid "started"
 msgstr "已开始"
 
-#: bookwyrm/templates/snippets/readthrough.html:57
-#: bookwyrm/templates/snippets/readthrough.html:71
+#: bookwyrm/templates/snippets/readthrough.html:59
+#: bookwyrm/templates/snippets/readthrough.html:73
 msgid "Edit read dates"
 msgstr "编辑阅读日期"
 
-#: bookwyrm/templates/snippets/readthrough.html:61
+#: bookwyrm/templates/snippets/readthrough.html:63
 msgid "Delete these read dates"
 msgstr "删除这些阅读日期"
 
@@ -2587,7 +2608,7 @@ msgstr "评论了"
 msgid "quoted"
 msgstr "引用了"
 
-#: bookwyrm/templates/snippets/search_result_text.html:35
+#: bookwyrm/templates/snippets/search_result_text.html:36
 msgid "Import book"
 msgstr "导入书目"
 
@@ -2637,17 +2658,17 @@ msgstr "开始 \"<em>%(book_title)s</em>\""
 msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgstr "想�阅读 \"<em>%(book_title)s</em>\""
 
-#: bookwyrm/templates/snippets/status/content_status.html:67
+#: bookwyrm/templates/snippets/status/content_status.html:70
 #: bookwyrm/templates/snippets/trimmed_text.html:14
 msgid "Show more"
 msgstr "显示更多"
 
-#: bookwyrm/templates/snippets/status/content_status.html:82
+#: bookwyrm/templates/snippets/status/content_status.html:85
 #: bookwyrm/templates/snippets/trimmed_text.html:29
 msgid "Show less"
 msgstr "显示更少"
 
-#: bookwyrm/templates/snippets/status/content_status.html:112
+#: bookwyrm/templates/snippets/status/content_status.html:115
 msgid "Open image in new window"
 msgstr "在新窗�中打开图�"
 
@@ -2708,43 +2729,17 @@ msgstr "��排�"
 msgid "Sorted descending"
 msgstr "��排�"
 
-#: bookwyrm/templates/user/books_header.html:5
-#, python-format
-msgid "%(username)s's books"
-msgstr "%(username)s 的书目"
-
-#: bookwyrm/templates/user/create_shelf_form.html:5
-#: bookwyrm/templates/user/create_shelf_form.html:22
-msgid "Create Shelf"
-msgstr "创建书架"
-
-#: bookwyrm/templates/user/edit_shelf_form.html:5
-msgid "Edit Shelf"
-msgstr "编辑书架"
-
-#: bookwyrm/templates/user/edit_shelf_form.html:26
-msgid "Update shelf"
-msgstr "更新书架"
-
-#: bookwyrm/templates/user/followers.html:7
-#: bookwyrm/templates/user/following.html:7
-#: bookwyrm/templates/user/user.html:10
+#: bookwyrm/templates/user/layout.html:12 bookwyrm/templates/user/user.html:10
 msgid "User Profile"
 msgstr "用户个人资料"
 
-#: bookwyrm/templates/user/followers.html:29
-#, python-format
-msgid "%(username)s has no followers"
-msgstr "%(username)s 没有关注者"
+#: bookwyrm/templates/user/layout.html:36
+msgid "Follow Requests"
+msgstr "关注请求"
 
-#: bookwyrm/templates/user/following.html:13
-msgid "Following"
-msgstr "正在关注"
-
-#: bookwyrm/templates/user/following.html:29
-#, python-format
-msgid "%(username)s isn't following any users"
-msgstr "%(username)s 没有关注任何用户"
+#: bookwyrm/templates/user/layout.html:61
+msgid "Reading Goal"
+msgstr "阅读目标"
 
 #: bookwyrm/templates/user/lists.html:11
 #, python-format
@@ -2755,35 +2750,71 @@ msgstr "列表: %(username)s"
 msgid "Create list"
 msgstr "创建列表"
 
-#: bookwyrm/templates/user/shelf.html:24 bookwyrm/views/shelf.py:51
+#: bookwyrm/templates/user/relationships/followers.html:12
+#, python-format
+msgid "%(username)s has no followers"
+msgstr "%(username)s 没有关注者"
+
+#: bookwyrm/templates/user/relationships/following.html:6
+#: bookwyrm/templates/user/relationships/layout.html:15
+msgid "Following"
+msgstr "正在关注"
+
+#: bookwyrm/templates/user/relationships/following.html:12
+#, python-format
+msgid "%(username)s isn't following any users"
+msgstr "%(username)s 没有关注任何用户"
+
+#: bookwyrm/templates/user/shelf/books_header.html:5
+#, python-format
+msgid "%(username)s's books"
+msgstr "%(username)s 的书目"
+
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:5
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:22
+msgid "Create Shelf"
+msgstr "创建书架"
+
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:5
+msgid "Edit Shelf"
+msgstr "编辑书架"
+
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:26
+msgid "Update shelf"
+msgstr "更新书架"
+
+#: bookwyrm/templates/user/shelf/shelf.html:24 bookwyrm/views/shelf.py:48
 msgid "All books"
 msgstr "所有书目"
 
-#: bookwyrm/templates/user/shelf.html:37
+#: bookwyrm/templates/user/shelf/shelf.html:37
 msgid "Create shelf"
 msgstr "创建书架"
 
-#: bookwyrm/templates/user/shelf.html:58
+#: bookwyrm/templates/user/shelf/shelf.html:60
 msgid "Edit shelf"
 msgstr "编辑书架"
 
-#: bookwyrm/templates/user/shelf.html:77 bookwyrm/templates/user/shelf.html:99
+#: bookwyrm/templates/user/shelf/shelf.html:79
+#: bookwyrm/templates/user/shelf/shelf.html:101
 msgid "Shelved"
 msgstr "上架时间"
 
-#: bookwyrm/templates/user/shelf.html:78 bookwyrm/templates/user/shelf.html:103
+#: bookwyrm/templates/user/shelf/shelf.html:80
+#: bookwyrm/templates/user/shelf/shelf.html:105
 msgid "Started"
 msgstr "开始时间"
 
-#: bookwyrm/templates/user/shelf.html:79 bookwyrm/templates/user/shelf.html:106
+#: bookwyrm/templates/user/shelf/shelf.html:81
+#: bookwyrm/templates/user/shelf/shelf.html:108
 msgid "Finished"
 msgstr "完�时间"
 
-#: bookwyrm/templates/user/shelf.html:132
+#: bookwyrm/templates/user/shelf/shelf.html:134
 msgid "This shelf is empty."
 msgstr "此书架是空的。"
 
-#: bookwyrm/templates/user/shelf.html:138
+#: bookwyrm/templates/user/shelf/shelf.html:140
 msgid "Delete shelf"
 msgstr "删除书架"
 
@@ -2800,51 +2831,42 @@ msgstr "查看所有 %(size)s 本"
 msgid "View all books"
 msgstr "查看所有书目"
 
-#: bookwyrm/templates/user/user.html:59
-#, python-format
-msgid "Set a reading goal for %(year)s"
-msgstr "设定 %(year)s 的阅读目标"
-
-#: bookwyrm/templates/user/user.html:65
+#: bookwyrm/templates/user/user.html:60
 msgid "User Activity"
 msgstr "用户活动"
 
-#: bookwyrm/templates/user/user.html:68
+#: bookwyrm/templates/user/user.html:63
 msgid "RSS feed"
 msgstr "RSS �"
 
-#: bookwyrm/templates/user/user.html:79
+#: bookwyrm/templates/user/user.html:74
 msgid "No activities yet!"
 msgstr "还没有活动�"
 
-#: bookwyrm/templates/user/user_layout.html:32
-msgid "Follow Requests"
-msgstr "关注请求"
-
-#: bookwyrm/templates/user/user_layout.html:56
-msgid "Reading Goal"
-msgstr "阅读目标"
-
-#: bookwyrm/templates/user/user_layout.html:68
-msgid "Books"
-msgstr "书目"
-
-#: bookwyrm/templates/user/user_preview.html:13
+#: bookwyrm/templates/user/user_preview.html:14
 #, python-format
 msgid "Joined %(date)s"
 msgstr "在 %(date)s 加入"
 
-#: bookwyrm/templates/user/user_preview.html:15
+#: bookwyrm/templates/user/user_preview.html:18
 #, python-format
 msgid "%(counter)s follower"
 msgid_plural "%(counter)s followers"
 msgstr[0] "%(counter)s 个关注者"
 
-#: bookwyrm/templates/user/user_preview.html:16
+#: bookwyrm/templates/user/user_preview.html:19
 #, python-format
 msgid "%(counter)s following"
 msgstr "关注� %(counter)s 人"
 
+#: bookwyrm/templates/user/user_preview.html:25
+#, fuzzy, python-format
+#| msgid "%(mutuals)s follower you follow"
+#| msgid_plural "%(mutuals)s followers you follow"
+msgid "%(mutuals_display)s follower you follow"
+msgid_plural "%(mutuals_display)s followers you follow"
+msgstr[0] "%(mutuals)s 个你也关注的关注者"
+
 #: bookwyrm/templates/user_admin/user.html:11
 #, fuzzy
 #| msgid "Back to reports"
@@ -4304,6 +4326,19 @@ msgctxt "stick"
 msgid "club"
 msgstr ""
 
+#~ msgid "Didn't find what you were looking for?"
+#~ msgstr "没有找到你想找的？"
+
+#~ msgid "Hide results from other catalogues"
+#~ msgstr "��其它类别的结果"
+
+#~ msgid "Matching Users"
+#~ msgstr "匹�的用户"
+
+#, python-format
+#~ msgid "Set a reading goal for %(year)s"
+#~ msgstr "设定 %(year)s 的阅读目标"
+
 #, python-format
 #~ msgid "by %(author)s"
 #~ msgstr "由 %(author)s 所著"

From e71a0dd7e8e1db86317173facc3c89e7797b2557 Mon Sep 17 00:00:00 2001
From: Pablo Barton <pablo.barton@gmail.com>
Date: Sat, 1 May 2021 19:30:43 -0400
Subject: [PATCH 1073/1285] pagination list navigation using a range of pages
 such as provided by get_elided_page_range

---
 bookwyrm/templates/snippets/pagination.html | 16 +++++++++++++++-
 bookwyrm/views/list.py                      |  6 +++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/snippets/pagination.html b/bookwyrm/templates/snippets/pagination.html
index 3b33ca62..db2396ae 100644
--- a/bookwyrm/templates/snippets/pagination.html
+++ b/bookwyrm/templates/snippets/pagination.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-<nav class="pagination" aria-label="pagination">
+<nav class="pagination is-centered" aria-label="pagination">
     <a
         class="pagination-previous {% if not page.has_previous %}is-disabled{% endif %}"
         {% if page.has_previous %}
@@ -23,4 +23,18 @@
         {% trans "Next" %}
         <span class="icon icon-arrow-right" aria-hidden="true"></span>
     </a>
+
+    {% if page.has_other_pages and page_range %}
+        <ul class="pagination-list">
+        {% for num in page_range %}
+            {% if num == page.number %}
+                <li><a class="pagination-link is-current" aria-label="Page {{ num }}" aria-current="page">{{ num }}</a></li>
+            {% elif num == '…' %}
+                <li><span class="pagination-ellipsis">&hellip;</span></li>
+            {% else %}
+                <li><a class="pagination-link" aria-label="Goto page {{ num }}" href="{{ path }}?{% for k, v in request.GET.items %}{% if k != 'page' %}{{ k }}={{ v }}&{% endif %}{% endfor %}page={{ num }}{{ anchor }}">{{ num }}</a></li>
+            {% endif %}
+        {% endfor %}
+        </ul>
+    {% endif %}
 </nav>
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index 89b936e9..eac0f657 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -156,9 +156,13 @@ class List(View):
                     ).order_by("-updated_date")
                 ][: 5 - len(suggestions)]
 
+        page = paginated.get_page(request.GET.get("page"))
         data = {
             "list": book_list,
-            "items": paginated.get_page(request.GET.get("page")),
+            "items": page,
+            "page_range": paginated.get_elided_page_range(
+                page.number, on_each_side=2, on_ends=1
+            ),
             "pending_count": book_list.listitem_set.filter(approved=False).count(),
             "suggested_books": suggestions,
             "list_form": forms.ListForm(instance=book_list),

From f94a3ec63b4b953887890cb6ad502cba6c057bc7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 1 May 2021 18:05:21 -0700
Subject: [PATCH 1074/1285] Mocks list create in test

---
 bookwyrm/tests/views/test_search.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/tests/views/test_search.py b/bookwyrm/tests/views/test_search.py
index 7661d5a6..f1de918d 100644
--- a/bookwyrm/tests/views/test_search.py
+++ b/bookwyrm/tests/views/test_search.py
@@ -131,7 +131,10 @@ class ShelfViews(TestCase):
 
     def test_search_lists(self):
         """searches remote connectors"""
-        booklist = models.List.objects.create(user=self.local_user, name="test list")
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            booklist = models.List.objects.create(
+                user=self.local_user, name="test list"
+            )
         view = views.Search.as_view()
         request = self.factory.get("", {"q": "test", "type": "list"})
         request.user = self.local_user

From 97aeaa9cd7e20ce2063f685f6cc7b206dd0a14bf Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 1 May 2021 19:05:46 -0700
Subject: [PATCH 1075/1285] Uses empty queryset for forced no results mode

---
 bookwyrm/tests/views/test_search.py | 4 ++--
 bookwyrm/views/search.py            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/tests/views/test_search.py b/bookwyrm/tests/views/test_search.py
index f1de918d..b2f3bbcc 100644
--- a/bookwyrm/tests/views/test_search.py
+++ b/bookwyrm/tests/views/test_search.py
@@ -13,7 +13,7 @@ from bookwyrm.connectors import abstract_connector
 from bookwyrm.settings import DOMAIN
 
 
-class ShelfViews(TestCase):
+class Views(TestCase):
     """tag views"""
 
     def setUp(self):
@@ -127,7 +127,7 @@ class ShelfViews(TestCase):
         response = view(request)
 
         response.render()
-        self.assertEqual(response.context_data["results"], {})
+        self.assertEqual(response.context_data["results"].object_list.count(), 0)
 
     def test_search_lists(self):
         """searches remote connectors"""
diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py
index b76f2392..4b9100fb 100644
--- a/bookwyrm/views/search.py
+++ b/bookwyrm/views/search.py
@@ -78,7 +78,7 @@ def user_search(query, viewer, *_):
     """cool kids members only user search"""
     # logged out viewers can't search users
     if not viewer.is_authenticated:
-        return {}
+        return models.User.objects.none()
 
     # use webfinger for mastodon style account@domain.com username to load the user if
     # they don't exist locally (handle_remote_webfinger will check the db)

From db6246e35977ba75a7ef8090b85a84bf474b8a00 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 1 May 2021 22:20:23 -0700
Subject: [PATCH 1076/1285] Fixes error on empty search results

---
 bookwyrm/views/search.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py
index 4b9100fb..558c2039 100644
--- a/bookwyrm/views/search.py
+++ b/bookwyrm/views/search.py
@@ -56,10 +56,11 @@ class Search(View):
             results = endpoints[search_type](
                 query, request.user, min_confidence, search_remote
             )
-            paginated = Paginator(results, PAGE_LENGTH).get_page(
-                request.GET.get("page")
-            )
-            data["results"] = paginated
+            if results:
+                paginated = Paginator(results, PAGE_LENGTH).get_page(
+                    request.GET.get("page")
+                )
+                data["results"] = paginated
 
         return TemplateResponse(request, "search/{:s}.html".format(search_type), data)
 

From c47f672238a8333d8058b107963b155fc49b4c36 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 2 May 2021 06:59:47 -0700
Subject: [PATCH 1077/1285] Removes aria-hidden from covers

---
 bookwyrm/templates/snippets/book_cover.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index 8967ff57..5f12858f 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -13,10 +13,6 @@
         {% endif %}
     "
 
-    {% if aria != "show" %}
-        aria-hidden="true"
-    {% endif %}
-
     {% if book.alt_text %}
         title="{{ book.alt_text }}"
     {% endif %}

From 4c021e63572dc8707ed44200419a87d952489d2d Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Sun, 2 May 2021 21:34:43 +0200
Subject: [PATCH 1078/1285] Add Mobile styles

---
 bookwyrm/static/css/bookwyrm.css   | 27 ++++++++++++++++++++++++---
 bookwyrm/templates/lists/list.html |  2 +-
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index f2c6a028..2fa90913 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -47,6 +47,14 @@ body {
     .m-0-mobile {
         margin: 0 !important;
     }
+
+    .card-footer.is-stacked-mobile {
+        flex-direction: column;
+    }
+    .card-footer.is-stacked-mobile .card-footer-item:not(:last-child) {
+        border-bottom: 1px solid #ededed;
+        border-right: 0;
+    }
 }
 
 .button.is-transparent {
@@ -352,19 +360,20 @@ body {
 
 ol.ordered-list {
     list-style: none;
-    counter-reset: books;
+    counter-reset: list-counter;
 }
 
 ol.ordered-list li {
-    counter-increment: books;
+    counter-increment: list-counter;
 }
 
 ol.ordered-list li::before {
-    content: counter(books);
+    content: counter(list-counter);
     position: absolute;
     left: -20px;
     width: 20px;
     height: 24px;
+    background-color: #fff;
     border: 1px solid #dbdbdb;
     border-right: 0;
     border-top-left-radius: 2px;
@@ -376,3 +385,15 @@ ol.ordered-list li::before {
     font-size: 0.8em;
     font-weight: bold;
 }
+
+@media only screen and (max-width: 768px) {
+    ol.ordered-list li::before {
+        left: 0;
+        z-index: 1;
+        border: 0;
+        border-right: 1px solid #dbdbdb;
+        border-bottom: 1px solid #dbdbdb;
+        border-radius: 0;
+        border-bottom-right-radius: 2px;
+    }
+}
diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index cfecfd4b..da092656 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -40,7 +40,7 @@
                             {% include 'snippets/shelve_button/shelve_button.html' with book=item.book %}
                         </div>
                     </div>
-                    <div class="card-footer has-background-white-bis">
+                    <div class="card-footer is-stacked-mobile has-background-white-bis">
                         <div class="card-footer-item">
                             <div>
                             <p>{% blocktrans with username=item.user.display_name user_path=user.local_path %}Added by <a href="{{ user_path }}">{{ username }}</a>{% endblocktrans %}</p>

From df1c324d2dcbdd845d4e8af46d9c19abe405057b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 3 May 2021 10:46:02 -0700
Subject: [PATCH 1079/1285] Updates test

---
 bookwyrm/tests/views/test_search.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/tests/views/test_search.py b/bookwyrm/tests/views/test_search.py
index b2f3bbcc..a6d7c36e 100644
--- a/bookwyrm/tests/views/test_search.py
+++ b/bookwyrm/tests/views/test_search.py
@@ -127,7 +127,7 @@ class Views(TestCase):
         response = view(request)
 
         response.render()
-        self.assertEqual(response.context_data["results"].object_list.count(), 0)
+        self.assertFalse("results" in response.context_data)
 
     def test_search_lists(self):
         """searches remote connectors"""

From a81901f9fe749e3a2b0d9a46e48374b928bed0fa Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 3 May 2021 11:20:43 -0700
Subject: [PATCH 1080/1285] Re-adds "manually add book" link

---
 bookwyrm/templates/search/book.html | 20 ++++++++++++--------
 bookwyrm/urls.py                    |  2 +-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/templates/search/book.html b/bookwyrm/templates/search/book.html
index 53aadb63..84c2fafe 100644
--- a/bookwyrm/templates/search/book.html
+++ b/bookwyrm/templates/search/book.html
@@ -57,18 +57,22 @@
 
 {% endif %}
 
-{% if not remote %}
 <p class="block">
     {% if request.user.is_authenticated %}
-    <a href="{{ request.path }}?q={{ query }}&type=book&remote=true">
-        {% trans "Load results from other catalogues" %}
-    </a>
+        {% if not remote %}
+        <a href="{{ request.path }}?q={{ query }}&type=book&remote=true">
+            {% trans "Load results from other catalogues" %}
+        </a>
+        {% else %}
+        <a href="{% url 'create-book' %}">
+            {% trans "Manually add book" %}
+        </a>
+        {% endif %}
     {% else %}
-    <a href="{% url 'login' %}">
-        {% trans "Log in to import or add books." %}
-    </a>
+        <a href="{% url 'login' %}">
+            {% trans "Log in to import or add books." %}
+        </a>
     {% endif %}
 </p>
-{% endif %}
 
 {% endblock %}
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 5412378e..14fe476d 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -272,7 +272,7 @@ urlpatterns = [
     ),
     re_path(r"%s/edit/?$" % book_path, views.EditBook.as_view()),
     re_path(r"%s/confirm/?$" % book_path, views.ConfirmEditBook.as_view()),
-    re_path(r"^create-book/?$", views.EditBook.as_view()),
+    re_path(r"^create-book/?$", views.EditBook.as_view(), name="create-book"),
     re_path(r"^create-book/confirm?$", views.ConfirmEditBook.as_view()),
     re_path(r"%s/editions(.json)?/?$" % book_path, views.Editions.as_view()),
     re_path(

From 5d7a3d6075bdf90f11b40f084284790df27617fb Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 3 May 2021 11:22:40 -0700
Subject: [PATCH 1081/1285] Updates locales

---
 locale/de_DE/LC_MESSAGES/django.po   | 1784 ++++------------------
 locale/en_US/LC_MESSAGES/django.po   | 1475 +-----------------
 locale/es/LC_MESSAGES/django.po      | 2123 +++++++++-----------------
 locale/fr_FR/LC_MESSAGES/django.po   | 1821 ++++------------------
 locale/zh_Hans/LC_MESSAGES/django.po | 1741 +++------------------
 5 files changed, 1608 insertions(+), 7336 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 4c5813d5..65677cd9 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-01 10:56-0700\n"
+"POT-Creation-Date: 2021-05-03 11:22-0700\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"
@@ -247,15 +247,9 @@ msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/book/book.html:151
 #, fuzzy, python-format
-#| msgid ""
-#| " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
-#| "\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
-msgid ""
-"A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a "
-"href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
-msgstr ""
-"hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> zu deiner Liste "
-"\"<a href=\"%(list_path)s\">%(list_name)s</a>\" Hinzugefügt"
+#| msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
+msgstr "hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> zu deiner Liste \"<a href=\"%(list_path)s\">%(list_name)s</a>\" Hinzugefügt"
 
 #: bookwyrm/templates/book/book.html:162
 msgid "Your reading activity"
@@ -623,15 +617,9 @@ msgstr ""
 
 #: bookwyrm/templates/directory/directory.html:24
 #, fuzzy, python-format
-#| msgid ""
-#| "You can set or change your reading goal any time from your <a href="
-#| "\"%(path)s\">profile page</a>"
-msgid ""
-"You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</"
-"a>"
-msgstr ""
-"Du kannst dein Leseziel jederzeit auf deiner <a href=\"%(path)s"
-"\">Profilseite</a> setzen oder ändern."
+#| msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
+msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
+msgstr "Du kannst dein Leseziel jederzeit auf deiner <a href=\"%(path)s\">Profilseite</a> setzen oder ändern."
 
 #: bookwyrm/templates/directory/directory.html:29
 #: bookwyrm/templates/snippets/goal_card.html:22
@@ -807,9 +795,7 @@ msgstr ""
 
 #: bookwyrm/templates/email/html_layout.html:21
 #, python-format
-msgid ""
-"BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">"
-"%(site_name)s</a>"
+msgid "BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a>"
 msgstr ""
 
 #: bookwyrm/templates/email/html_layout.html:23
@@ -829,16 +815,12 @@ msgstr ""
 
 #: bookwyrm/templates/email/invite/html_content.html:15
 #, python-format
-msgid ""
-"Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</"
-"a>."
+msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
 msgstr ""
 
 #: bookwyrm/templates/email/invite/text_content.html:4
 #, python-format
-msgid ""
-"You're invited to join %(site_name)s! Click the link below to create an "
-"account."
+msgid "You're invited to join %(site_name)s! Click the link below to create an account."
 msgstr ""
 
 #: bookwyrm/templates/email/invite/text_content.html:8
@@ -850,9 +832,7 @@ msgstr "Mehr über diese Seite"
 #: bookwyrm/templates/email/password_reset/html_content.html:6
 #: bookwyrm/templates/email/password_reset/text_content.html:4
 #, python-format
-msgid ""
-"You requested to reset your %(site_name)s password. Click the link below to "
-"set a new password and log in to your account."
+msgid "You requested to reset your %(site_name)s password. Click the link below to set a new password and log in to your account."
 msgstr ""
 
 #: bookwyrm/templates/email/password_reset/html_content.html:9
@@ -865,8 +845,7 @@ msgstr "Passwort zurücksetzen!"
 
 #: bookwyrm/templates/email/password_reset/html_content.html:13
 #: bookwyrm/templates/email/password_reset/text_content.html:8
-msgid ""
-"If you didn't request to reset your password, you can ignore this email."
+msgid "If you didn't request to reset your password, you can ignore this email."
 msgstr ""
 
 #: bookwyrm/templates/email/password_reset/subject.html:2
@@ -926,8 +905,7 @@ msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed.html:48
-msgid ""
-"There aren't any activities right now! Try following a user to get started"
+msgid "There aren't any activities right now! Try following a user to get started"
 msgstr "Hier sind noch keine Aktivitäten! Folge anderen, um loszulegen"
 
 #: bookwyrm/templates/feed/feed.html:56
@@ -946,10 +924,8 @@ msgid "Your books"
 msgstr "Deine Bücher"
 
 #: bookwyrm/templates/feed/feed_layout.html:13
-msgid ""
-"There are no books here right now! Try searching for a book to get started"
-msgstr ""
-"Hier sind noch keine Bücher! Versuche nach Büchern zu suchen um loszulegen"
+msgid "There are no books here right now! Try searching for a book to get started"
+msgstr "Hier sind noch keine Bücher! Versuche nach Büchern zu suchen um loszulegen"
 
 #: bookwyrm/templates/feed/feed_layout.html:24
 #: bookwyrm/templates/user/shelf/shelf.html:28
@@ -1121,9 +1097,7 @@ msgid "Show this account in suggested users:"
 msgstr ""
 
 #: bookwyrm/templates/get_started/profile.html:52
-msgid ""
-"Your account will show up in the directory, and may be recommended to other "
-"BookWyrm users."
+msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users."
 msgstr ""
 
 #: bookwyrm/templates/get_started/users.html:11
@@ -1149,12 +1123,8 @@ msgstr "Ziel bearbeiten"
 #: bookwyrm/templates/goal.html:30
 #: bookwyrm/templates/snippets/goal_card.html:13
 #, python-format
-msgid ""
-"Set a goal for how many books you'll finish reading in %(year)s, and track "
-"your progress throughout the year."
-msgstr ""
-"Setze dir ein Ziel, wie viele Bücher du %(year)s lesen wirst und behalte "
-"deinen Fortschritt über's Jahr im Auge."
+msgid "Set a goal for how many books you'll finish reading in %(year)s, and track your progress throughout the year."
+msgstr "Setze dir ein Ziel, wie viele Bücher du %(year)s lesen wirst und behalte deinen Fortschritt über's Jahr im Auge."
 
 #: bookwyrm/templates/goal.html:39
 #, python-format
@@ -1238,12 +1208,8 @@ msgstr "Laden fehlgeschlagen"
 
 #: bookwyrm/templates/import_status.html:44
 #, python-format
-msgid ""
-"Jump to the bottom of the list to select the %(failed_count)s items which "
-"failed to import."
-msgstr ""
-"Zum Ende der Liste springen, um die %(failed_count)s Einträge, deren Import "
-"fehlschlug, auszuwählen."
+msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
+msgstr "Zum Ende der Liste springen, um die %(failed_count)s Einträge, deren Import fehlschlug, auszuwählen."
 
 #: bookwyrm/templates/import_status.html:79
 msgid "Select all"
@@ -1381,20 +1347,12 @@ msgstr "Listenkuratierung:"
 
 #: bookwyrm/templates/layout.html:213
 #, python-format
-msgid ""
-"Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">"
-"%(support_title)s</a>"
-msgstr ""
-"%(site_name)s auf <a href=\"%(support_link)s\" target=\"_blank\">"
-"%(support_title)s</a> unterstützen"
+msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
+msgstr "%(site_name)s auf <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a> unterstützen"
 
 #: bookwyrm/templates/layout.html:217
-msgid ""
-"BookWyrm is open source software. You can contribute or report issues on <a "
-"href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
-msgstr ""
-"BookWyrm ist open source Software. Du kannst dich auf <a href=\"https://"
-"github.com/mouse-reeve/bookwyrm\">GitHub</a> beteiligen oder etwas melden."
+msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgstr "BookWyrm ist open source Software. Du kannst dich auf <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> beteiligen oder etwas melden."
 
 #: bookwyrm/templates/lists/create_form.html:5
 #: bookwyrm/templates/lists/lists.html:20
@@ -1583,7 +1541,7 @@ msgstr "Moderator:innenkommentare"
 
 #: bookwyrm/templates/moderation/report.html:41
 #: bookwyrm/templates/snippets/create_status.html:28
-#: bookwyrm/templates/snippets/create_status_form.html:53
+#: bookwyrm/templates/snippets/create_status_form.html:63
 msgid "Comment"
 msgstr "Kommentieren"
 
@@ -1612,8 +1570,7 @@ msgstr "Listen: %(username)s"
 #: bookwyrm/templates/moderation/report_modal.html:23
 #, python-format
 msgid "This report will be sent to %(site_name)s's moderators for review."
-msgstr ""
-"Diese Meldung wird an die Moderator:innen von %(site_name)s weitergeletiet."
+msgstr "Diese Meldung wird an die Moderator:innen von %(site_name)s weitergeletiet."
 
 #: bookwyrm/templates/moderation/report_modal.html:24
 #, fuzzy
@@ -1677,30 +1634,18 @@ msgstr "Benachrichtigungen löschen"
 
 #: bookwyrm/templates/notifications.html:53
 #, python-format
-msgid ""
-"favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</"
-"em></a>"
-msgstr ""
-"hat deine <a href=\"%(related_path)s\">Bewertung von <em>%(book_title)s</"
-"em></a> favorisiert"
+msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "hat deine <a href=\"%(related_path)s\">Bewertung von <em>%(book_title)s</em></a> favorisiert"
 
 #: bookwyrm/templates/notifications.html:55
 #, python-format
-msgid ""
-"favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</"
-"em></a>"
-msgstr ""
-"hat deinen <a href=\"%(related_path)s\">Kommentar zu <em>%(book_title)s</"
-"em></a> favorisiert"
+msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
+msgstr "hat deinen <a href=\"%(related_path)s\">Kommentar zu <em>%(book_title)s</em></a> favorisiert"
 
 #: bookwyrm/templates/notifications.html:57
 #, python-format
-msgid ""
-"favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
-"em></a>"
-msgstr ""
-" hat dein <a href=\"%(related_path)s\">Zitat aus <em>%(book_title)s</em></a> "
-"favorisiert"
+msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr " hat dein <a href=\"%(related_path)s\">Zitat aus <em>%(book_title)s</em></a> favorisiert"
 
 #: bookwyrm/templates/notifications.html:59
 #, python-format
@@ -1709,30 +1654,18 @@ msgstr "hat deinen <a href=\"%(related_path)s\">Status</a> favorisiert"
 
 #: bookwyrm/templates/notifications.html:64
 #, python-format
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">review of <em>"
-"%(book_title)s</em></a>"
-msgstr ""
-"hat dich in einer <a href=\"%(related_path)s\">Bewertung von <em>"
-"%(book_title)s</em></a> erwähnt"
+msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "hat dich in einer <a href=\"%(related_path)s\">Bewertung von <em>%(book_title)s</em></a> erwähnt"
 
 #: bookwyrm/templates/notifications.html:66
 #, python-format
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">comment on <em>"
-"%(book_title)s</em></a>"
-msgstr ""
-"hat dich in einem <a href=\"%(related_path)s\">Kommentar zu <em>"
-"%(book_title)s</em></a> erwähnt"
+msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
+msgstr "hat dich in einem <a href=\"%(related_path)s\">Kommentar zu <em>%(book_title)s</em></a> erwähnt"
 
 #: bookwyrm/templates/notifications.html:68
 #, python-format
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">quote from <em>"
-"%(book_title)s</em></a>"
-msgstr ""
-"hat dich in einem <a href=\"%(related_path)s\">Zitat von <em>%(book_title)s</"
-"em></a> erwähnt"
+msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr "hat dich in einem <a href=\"%(related_path)s\">Zitat von <em>%(book_title)s</em></a> erwähnt"
 
 #: bookwyrm/templates/notifications.html:70
 #, python-format
@@ -1741,39 +1674,23 @@ msgstr "hat dich in einem <a href=\"%(related_path)s\">Status</a> erwähnt"
 
 #: bookwyrm/templates/notifications.html:75
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">review of <em>%(book_title)s</em></a>"
-msgstr ""
-"hat auf deine <a href=\"%(parent_path)s\">Bewertung von <em>%(book_title)s</"
-"em></a> <a href=\"%(related_path)s\">geantwortet</a> "
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "hat auf deine <a href=\"%(parent_path)s\">Bewertung von <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a> "
 
 #: bookwyrm/templates/notifications.html:77
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">comment on <em>%(book_title)s</em></a>"
-msgstr ""
-"hat auf deinen <a href=\"%(parent_path)s\">Kommentar zu <em>%(book_title)s</"
-"em></a> <a href=\"%(related_path)s\">geantwortet</a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
+msgstr "hat auf deinen <a href=\"%(parent_path)s\">Kommentar zu <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a>"
 
 #: bookwyrm/templates/notifications.html:79
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">quote from <em>%(book_title)s</em></a>"
-msgstr ""
-"hat auf dein <a href=\"%(parent_path)s\">Zitat aus <em>%(book_title)s</em></"
-"a> <a href=\"%(related_path)s\">geantwortet</a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr "hat auf dein <a href=\"%(parent_path)s\">Zitat aus <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a>"
 
 #: bookwyrm/templates/notifications.html:81
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">status</a>"
-msgstr ""
-"hat auf deinen <a href=\"%(parent_path)s\">Status</a> <a href="
-"\"%(related_path)s\">geantwortet</a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
+msgstr "hat auf deinen <a href=\"%(parent_path)s\">Status</a> <a href=\"%(related_path)s\">geantwortet</a>"
 
 #: bookwyrm/templates/notifications.html:85
 msgid "followed you"
@@ -1785,30 +1702,18 @@ msgstr "hat dir eine Folgeanfrage geschickt"
 
 #: bookwyrm/templates/notifications.html:94
 #, python-format
-msgid ""
-"boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></"
-"a>"
-msgstr ""
-"hat deine <a href=\"%(related_path)s\">Bewertung von <em>%(book_title)s</"
-"em></a> geteilt"
+msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "hat deine <a href=\"%(related_path)s\">Bewertung von <em>%(book_title)s</em></a> geteilt"
 
 #: bookwyrm/templates/notifications.html:96
 #, python-format
-msgid ""
-"boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></"
-"a>"
-msgstr ""
-"hat deinen <a href=\"%(related_path)s\">Kommentar zu<em>%(book_title)s</em></"
-"a> geteilt"
+msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+msgstr "hat deinen <a href=\"%(related_path)s\">Kommentar zu<em>%(book_title)s</em></a> geteilt"
 
 #: bookwyrm/templates/notifications.html:98
 #, python-format
-msgid ""
-"boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
-"em></a>"
-msgstr ""
-"hat dein <a href=\"%(related_path)s\">Zitat aus <em>%(book_title)s</em></a> "
-"geteilt"
+msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr "hat dein <a href=\"%(related_path)s\">Zitat aus <em>%(book_title)s</em></a> geteilt"
 
 #: bookwyrm/templates/notifications.html:100
 #, python-format
@@ -1817,21 +1722,13 @@ msgstr "hat deinen <a href=\"%(related_path)s\">Status</a> geteilt"
 
 #: bookwyrm/templates/notifications.html:104
 #, python-format
-msgid ""
-" added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
-"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
-msgstr ""
-"hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> zu deiner Liste "
-"\"<a href=\"%(list_path)s\">%(list_name)s</a>\" Hinzugefügt"
+msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgstr "hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> zu deiner Liste \"<a href=\"%(list_path)s\">%(list_name)s</a>\" Hinzugefügt"
 
 #: bookwyrm/templates/notifications.html:106
 #, python-format
-msgid ""
-" suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to "
-"your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
-msgstr ""
-"hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> für deine Liste "
-"\"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\" vorgeschlagen"
+msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgstr "hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> für deine Liste \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\" vorgeschlagen"
 
 #: bookwyrm/templates/notifications.html:110
 #, python-format
@@ -1854,9 +1751,7 @@ msgstr "Passwort bestätigen:"
 
 #: bookwyrm/templates/password_reset_request.html:14
 msgid "A link to reset your password will be sent to your email address"
-msgstr ""
-"Ein Link zum Zurücksetzen deines Passworts wird an deine Mailadresse "
-"geschickt"
+msgstr "Ein Link zum Zurücksetzen deines Passworts wird an deine Mailadresse geschickt"
 
 #: bookwyrm/templates/password_reset_request.html:28
 msgid "Reset password"
@@ -1894,9 +1789,7 @@ msgstr "Angegebenes Leseziel im Feed anzeigen."
 
 #: bookwyrm/templates/preferences/edit_user.html:62
 #, python-format
-msgid ""
-"Your account will show up in the <a href=\"%(path)s\">directory</a>, and may "
-"be recommended to other BookWyrm users."
+msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
 msgstr ""
 
 #: bookwyrm/templates/preferences/edit_user.html:65
@@ -1928,6 +1821,10 @@ msgid "Load results from other catalogues"
 msgstr "Ergebnisse aus anderen Katalogen zeigen"
 
 #: bookwyrm/templates/search/book.html:68
+msgid "Manually add book"
+msgstr ""
+
+#: bookwyrm/templates/search/book.html:73
 msgid "Log in to import or add books."
 msgstr ""
 
@@ -2378,7 +2275,7 @@ msgstr "Folgeanfragen"
 msgid "Registration closed text:"
 msgstr "Registrierungen geschlossen text"
 
-#: bookwyrm/templates/snippets/book_cover.html:36
+#: bookwyrm/templates/snippets/book_cover.html:32
 #, fuzzy
 #| msgid "Add cover"
 msgid "No cover"
@@ -2437,48 +2334,54 @@ msgstr "Zitieren"
 msgid "Review:"
 msgstr "Bewerten"
 
-#: bookwyrm/templates/snippets/create_status_form.html:42
+#: bookwyrm/templates/snippets/create_status_form.html:53
 #: bookwyrm/templates/snippets/status/layout.html:30
 #: bookwyrm/templates/snippets/status/layout.html:48
 #: bookwyrm/templates/snippets/status/layout.html:49
 msgid "Reply"
 msgstr "Antwort"
 
-#: bookwyrm/templates/snippets/create_status_form.html:67
+#: bookwyrm/templates/snippets/create_status_form.html:53
+#, fuzzy
+#| msgid "Footer Content"
+msgid "Content"
+msgstr "Inhalt des Footers"
+
+#: bookwyrm/templates/snippets/create_status_form.html:77
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
 msgid "Progress:"
 msgstr "Fortschritt:"
 
-#: bookwyrm/templates/snippets/create_status_form.html:75
+#: bookwyrm/templates/snippets/create_status_form.html:85
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr "Seiten"
 
-#: bookwyrm/templates/snippets/create_status_form.html:76
+#: bookwyrm/templates/snippets/create_status_form.html:86
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr "Prozent"
 
-#: bookwyrm/templates/snippets/create_status_form.html:82
+#: bookwyrm/templates/snippets/create_status_form.html:92
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "von %(pages)s Seiten"
 
-#: bookwyrm/templates/snippets/create_status_form.html:97
+#: bookwyrm/templates/snippets/create_status_form.html:107
 msgid "Include spoiler alert"
 msgstr "Spoileralarm aktivieren"
 
-#: bookwyrm/templates/snippets/create_status_form.html:104
+#: bookwyrm/templates/snippets/create_status_form.html:114
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:19
 msgid "Private"
 msgstr "Privat"
 
-#: bookwyrm/templates/snippets/create_status_form.html:115
+#: bookwyrm/templates/snippets/create_status_form.html:125
 msgid "Post"
 msgstr "Absenden"
 
@@ -2488,15 +2391,11 @@ msgstr "Diese Lesedaten löschen?"
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
 #, python-format
-msgid ""
-"You are deleting this readthrough and its %(count)s associated progress "
-"updates."
-msgstr ""
-"Du löscht diesen Leseforschritt und %(count)s zugehörige Fortschrittsupdates."
+msgid "You are deleting this readthrough and its %(count)s associated progress updates."
+msgstr "Du löscht diesen Leseforschritt und %(count)s zugehörige Fortschrittsupdates."
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
 #: bookwyrm/templates/snippets/follow_request_buttons.html:13
-#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:391
 msgid "Delete"
 msgstr "Löschen"
 
@@ -2565,19 +2464,15 @@ msgstr[1] "Setze das Ziel, %(year)s %(counter)s Bücher zu lesen"
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
 #, fuzzy, python-format
 #| msgid "<a href=\"%(path)s\">%(title)s</a> by "
-msgid ""
-"Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
-msgid_plural ""
-"Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
+msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
+msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
 msgstr[0] "<a href=\"%(path)s\">%(title)s</a> von "
 msgstr[1] "<a href=\"%(path)s\">%(title)s</a> von "
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4
 #, python-format
-msgid ""
-"Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
-msgid_plural ""
-"Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
+msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
+msgid_plural "Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -2588,12 +2483,8 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/goal_card.html:23
 #, python-format
-msgid ""
-"You can set or change your reading goal any time from your <a href=\"%(path)s"
-"\">profile page</a>"
-msgstr ""
-"Du kannst dein Leseziel jederzeit auf deiner <a href=\"%(path)s"
-"\">Profilseite</a> setzen oder ändern."
+msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
+msgstr "Du kannst dein Leseziel jederzeit auf deiner <a href=\"%(path)s\">Profilseite</a> setzen oder ändern."
 
 #: bookwyrm/templates/snippets/goal_form.html:9
 msgid "Reading goal:"
@@ -2625,20 +2516,13 @@ msgstr "%(percent)s%% komplett!"
 
 #: bookwyrm/templates/snippets/goal_progress.html:10
 #, python-format
-msgid ""
-"You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
-msgstr ""
-"Du hast <a href=\"%(path)s\">%(read_count)s von %(goal_count)s Büchern</a> "
-"gelesen."
+msgid "You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgstr "Du hast <a href=\"%(path)s\">%(read_count)s von %(goal_count)s Büchern</a> gelesen."
 
 #: bookwyrm/templates/snippets/goal_progress.html:12
 #, python-format
-msgid ""
-"%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s "
-"books</a>."
-msgstr ""
-"%(username)s hat <a href=\"%(path)s\">%(read_count)s von %(goal_count)s "
-"Büchern</a> gelesen."
+msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgstr "%(username)s hat <a href=\"%(path)s\">%(read_count)s von %(goal_count)s Büchern</a> gelesen."
 
 #: bookwyrm/templates/snippets/page_text.html:4
 #, fuzzy, python-format
@@ -2858,15 +2742,9 @@ msgstr "teilt"
 
 #: bookwyrm/templates/snippets/status/status_header.html:44
 #, fuzzy, python-format
-#| msgid ""
-#| "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-#| "\">status</a>"
-msgid ""
-"replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
-"\"%(status_path)s\">status</a>"
-msgstr ""
-"hat auf deinen <a href=\"%(parent_path)s\">Status</a> <a href="
-"\"%(related_path)s\">geantwortet</a>"
+#| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
+msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
+msgstr "hat auf deinen <a href=\"%(parent_path)s\">Status</a> <a href=\"%(related_path)s\">geantwortet</a>"
 
 #: bookwyrm/templates/snippets/status/status_options.html:7
 #: bookwyrm/templates/snippets/user_options.html:7
@@ -3136,1398 +3014,279 @@ msgstr "Dieser Benutzename ist bereits vergeben."
 msgid "A password reset link sent to %s"
 msgstr ""
 
-#: venv3/lib/python3.8/site-packages/_pytest/config/argparsing.py:442
-#, python-format
-msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/contrib/messages/apps.py:7
 #, fuzzy
-#| msgid "All messages"
-msgid "Messages"
-msgstr "Alle Nachrichten"
+#~| msgid "All messages"
+#~ msgid "Messages"
+#~ msgstr "Alle Nachrichten"
 
-#: venv3/lib/python3.8/site-packages/django/contrib/sitemaps/apps.py:7
-msgid "Site Maps"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/contrib/staticfiles/apps.py:9
-msgid "Static Files"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/contrib/syndication/apps.py:7
-msgid "Syndication"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/paginator.py:45
-msgid "That page number is not an integer"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/paginator.py:47
-msgid "That page number is less than 1"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/paginator.py:52
-msgid "That page contains no results"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:32
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid value."
-msgstr "E-Mail Adresse"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid value."
+#~ msgstr "E-Mail Adresse"
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:103
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:659
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid URL."
-msgstr "E-Mail Adresse"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid URL."
+#~ msgstr "E-Mail Adresse"
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:155
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid integer."
-msgstr "E-Mail Adresse"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid integer."
+#~ msgstr "E-Mail Adresse"
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:166
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid email address."
-msgstr "E-Mail Adresse"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid email address."
+#~ msgstr "E-Mail Adresse"
 
-#. Translators: "letters" means latin letters: a-z and A-Z.
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:240
-msgid ""
-"Enter a valid “slug� consisting of letters, numbers, underscores or hyphens."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:247
-msgid ""
-"Enter a valid “slug� consisting of Unicode letters, numbers, underscores, or "
-"hyphens."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:256
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:276
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid IPv4 address."
-msgstr "E-Mail Adresse"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid IPv4 address."
+#~ msgstr "E-Mail Adresse"
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:261
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:277
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid IPv6 address."
-msgstr "E-Mail Adresse"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid IPv6 address."
+#~ msgstr "E-Mail Adresse"
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:271
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:275
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid IPv4 or IPv6 address."
-msgstr "E-Mail Adresse"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid IPv4 or IPv6 address."
+#~ msgstr "E-Mail Adresse"
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:305
-msgid "Enter only digits separated by commas."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:311
-#, python-format
-msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:343
-#, python-format
-msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:352
-#, python-format
-msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:362
-#, python-format
-msgid ""
-"Ensure this value has at least %(limit_value)d character (it has "
-"%(show_value)d)."
-msgid_plural ""
-"Ensure this value has at least %(limit_value)d characters (it has "
-"%(show_value)d)."
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:377
-#, python-format
-msgid ""
-"Ensure this value has at most %(limit_value)d character (it has "
-"%(show_value)d)."
-msgid_plural ""
-"Ensure this value has at most %(limit_value)d characters (it has "
-"%(show_value)d)."
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:396
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:291
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:326
 #, fuzzy
-#| msgid "Series number:"
-msgid "Enter a number."
-msgstr "Seriennummer:"
+#~| msgid "Series number:"
+#~ msgid "Enter a number."
+#~ msgstr "Seriennummer:"
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:398
-#, python-format
-msgid "Ensure that there are no more than %(max)s digit in total."
-msgid_plural "Ensure that there are no more than %(max)s digits in total."
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:403
-#, python-format
-msgid "Ensure that there are no more than %(max)s decimal place."
-msgid_plural "Ensure that there are no more than %(max)s decimal places."
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:408
-#, python-format
-msgid ""
-"Ensure that there are no more than %(max)s digit before the decimal point."
-msgid_plural ""
-"Ensure that there are no more than %(max)s digits before the decimal point."
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:470
-#, python-format
-msgid ""
-"File extension “%(extension)s� is not allowed. Allowed extensions are: "
-"%(allowed_extensions)s."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:522
-msgid "Null characters are not allowed."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/base.py:1181
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:759
-msgid "and"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/base.py:1183
 #, fuzzy, python-format
-#| msgid "A user with that username already exists."
-msgid "%(model_name)s with this %(field_labels)s already exists."
-msgstr "Dieser Benutzename ist bereits vergeben."
+#~| msgid "A user with that username already exists."
+#~ msgid "%(model_name)s with this %(field_labels)s already exists."
+#~ msgstr "Dieser Benutzename ist bereits vergeben."
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:104
 #, fuzzy, python-format
-#| msgid "%(value)s is not a valid remote_id"
-msgid "Value %(value)r is not a valid choice."
-msgstr "%(value)s ist keine gültige remote_id"
+#~| msgid "%(value)s is not a valid remote_id"
+#~ msgid "Value %(value)r is not a valid choice."
+#~ msgstr "%(value)s ist keine gültige remote_id"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:105
 #, fuzzy
-#| msgid "This shelf is empty."
-msgid "This field cannot be null."
-msgstr "Dieses Regal ist leer."
+#~| msgid "This shelf is empty."
+#~ msgid "This field cannot be null."
+#~ msgstr "Dieses Regal ist leer."
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:106
-msgid "This field cannot be blank."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:107
 #, fuzzy, python-format
-#| msgid "A user with that username already exists."
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "Dieser Benutzename ist bereits vergeben."
+#~| msgid "A user with that username already exists."
+#~ msgid "%(model_name)s with this %(field_label)s already exists."
+#~ msgstr "Dieser Benutzename ist bereits vergeben."
 
-#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
-#. Eg: "Title must be unique for pub_date year"
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:111
-#, python-format
-msgid ""
-"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:130
-#, python-format
-msgid "Field of type: %(field_type)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:937
-#, python-format
-msgid "“%(value)s� value must be either True or False."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:938
-#, python-format
-msgid "“%(value)s� value must be either True, False, or None."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:940
-msgid "Boolean (Either True or False)"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:981
-#, python-format
-msgid "String (up to %(max_length)s)"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1045
 #, fuzzy
-#| msgid "No active invites"
-msgid "Comma-separated integers"
-msgstr "Keine aktiven Einladungen"
+#~| msgid "No active invites"
+#~ msgid "Comma-separated integers"
+#~ msgstr "Keine aktiven Einladungen"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1094
-#, python-format
-msgid ""
-"“%(value)s� value has an invalid date format. It must be in YYYY-MM-DD "
-"format."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1096
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1239
-#, python-format
-msgid ""
-"“%(value)s� value has the correct format (YYYY-MM-DD) but it is an invalid "
-"date."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1099
-msgid "Date (without time)"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1237
-#, python-format
-msgid ""
-"“%(value)s� value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
-"uuuuuu]][TZ] format."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1241
-#, python-format
-msgid ""
-"“%(value)s� value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
-"[TZ]) but it is an invalid date/time."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1245
-msgid "Date (with time)"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1393
 #, fuzzy, python-format
-#| msgid "%(value)s is not a valid username"
-msgid "“%(value)s� value must be a decimal number."
-msgstr "%(value)s ist kein gültiger Username"
+#~| msgid "%(value)s is not a valid username"
+#~ msgid "“%(value)s� value must be a decimal number."
+#~ msgstr "%(value)s ist kein gültiger Username"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1395
 #, fuzzy
-#| msgid "Series number:"
-msgid "Decimal number"
-msgstr "Seriennummer:"
+#~| msgid "Series number:"
+#~ msgid "Decimal number"
+#~ msgstr "Seriennummer:"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1534
-#, python-format
-msgid ""
-"“%(value)s� value has an invalid format. It must be in [DD] [[HH:]MM:]ss[."
-"uuuuuu] format."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1537
 #, fuzzy
-#| msgid "List curation:"
-msgid "Duration"
-msgstr "Listenkuratierung:"
+#~| msgid "List curation:"
+#~ msgid "Duration"
+#~ msgstr "Listenkuratierung:"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1587
 #, fuzzy
-#| msgid "Email address:"
-msgid "Email address"
-msgstr "E-Mail Adresse"
+#~| msgid "Email address:"
+#~ msgid "Email address"
+#~ msgstr "E-Mail Adresse"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1610
-msgid "File path"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1676
 #, fuzzy, python-format
-#| msgid "%(value)s is not a valid username"
-msgid "“%(value)s� value must be a float."
-msgstr "%(value)s ist kein gültiger Username"
+#~| msgid "%(value)s is not a valid username"
+#~ msgid "“%(value)s� value must be a float."
+#~ msgstr "%(value)s ist kein gültiger Username"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1678
-msgid "Floating point number"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1716
-#, python-format
-msgid "“%(value)s� value must be an integer."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1718
-msgid "Integer"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1801
 #, fuzzy
-#| msgid "No active invites"
-msgid "Big (8 byte) integer"
-msgstr "Keine aktiven Einladungen"
+#~| msgid "No active invites"
+#~ msgid "Big (8 byte) integer"
+#~ msgstr "Keine aktiven Einladungen"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1817
 #, fuzzy
-#| msgid "Email address:"
-msgid "IPv4 address"
-msgstr "E-Mail Adresse"
+#~| msgid "Email address:"
+#~ msgid "IPv4 address"
+#~ msgstr "E-Mail Adresse"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1848
 #, fuzzy
-#| msgid "Email address:"
-msgid "IP address"
-msgstr "E-Mail Adresse"
+#~| msgid "Email address:"
+#~ msgid "IP address"
+#~ msgstr "E-Mail Adresse"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1928
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1929
-#, python-format
-msgid "“%(value)s� value must be either None, True or False."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1931
-msgid "Boolean (Either True, False or None)"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1966
 #, fuzzy
-#| msgid "No active invites"
-msgid "Positive integer"
-msgstr "Keine aktiven Einladungen"
+#~| msgid "No active invites"
+#~ msgid "Positive integer"
+#~ msgstr "Keine aktiven Einladungen"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1979
 #, fuzzy
-#| msgid "No active invites"
-msgid "Positive small integer"
-msgstr "Keine aktiven Einladungen"
+#~| msgid "No active invites"
+#~ msgid "Positive small integer"
+#~ msgstr "Keine aktiven Einladungen"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1993
-#, python-format
-msgid "Slug (up to %(max_length)s)"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2025
-msgid "Small integer"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2032
-msgid "Text"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2060
-#, python-format
-msgid ""
-"“%(value)s� value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
-"format."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2062
-#, python-format
-msgid ""
-"“%(value)s� value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
-"invalid time."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2065
-msgid "Time"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2191
-msgid "URL"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2213
-msgid "Raw binary data"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2278
 #, fuzzy, python-format
-#| msgid "%(value)s is not a valid username"
-msgid "“%(value)s� is not a valid UUID."
-msgstr "%(value)s ist kein gültiger Username"
+#~| msgid "%(value)s is not a valid username"
+#~ msgid "“%(value)s� is not a valid UUID."
+#~ msgstr "%(value)s ist kein gültiger Username"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2280
-msgid "Universally unique identifier"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/files.py:221
-msgid "File"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/files.py:360
 #, fuzzy
-#| msgid "Images"
-msgid "Image"
-msgstr "Bilder"
+#~| msgid "Images"
+#~ msgid "Image"
+#~ msgstr "Bilder"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:778
-#, python-format
-msgid "%(model)s instance with %(field)s %(value)r does not exist."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:780
-msgid "Foreign Key (type determined by related field)"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1012
 #, fuzzy
-#| msgid "Relationships"
-msgid "One-to-one relationship"
-msgstr "Beziehungen"
+#~| msgid "Relationships"
+#~ msgid "One-to-one relationship"
+#~ msgstr "Beziehungen"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1066
 #, fuzzy, python-format
-#| msgid "Relationships"
-msgid "%(from)s-%(to)s relationship"
-msgstr "Beziehungen"
+#~| msgid "Relationships"
+#~ msgid "%(from)s-%(to)s relationship"
+#~ msgstr "Beziehungen"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1067
 #, fuzzy, python-format
-#| msgid "Relationships"
-msgid "%(from)s-%(to)s relationships"
-msgstr "Beziehungen"
+#~| msgid "Relationships"
+#~ msgid "%(from)s-%(to)s relationships"
+#~ msgstr "Beziehungen"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1109
 #, fuzzy
-#| msgid "Relationships"
-msgid "Many-to-many relationship"
-msgstr "Beziehungen"
+#~| msgid "Relationships"
+#~ msgid "Many-to-many relationship"
+#~ msgstr "Beziehungen"
 
-#. Translators: If found as last label character, these punctuation
-#. characters will prevent the default label_suffix to be appended to the label
-#: venv3/lib/python3.8/site-packages/django/forms/boundfield.py:149
-msgid ":?.!"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:53
 #, fuzzy
-#| msgid "This shelf is empty."
-msgid "This field is required."
-msgstr "Dieses Regal ist leer."
+#~| msgid "This shelf is empty."
+#~ msgid "This field is required."
+#~ msgstr "Dieses Regal ist leer."
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:246
 #, fuzzy
-#| msgid "Series number:"
-msgid "Enter a whole number."
-msgstr "Seriennummer:"
+#~| msgid "Series number:"
+#~ msgid "Enter a whole number."
+#~ msgstr "Seriennummer:"
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:397
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:1127
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid date."
-msgstr "E-Mail Adresse"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid date."
+#~ msgstr "E-Mail Adresse"
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:421
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:1128
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid time."
-msgstr "E-Mail Adresse"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid time."
+#~ msgstr "E-Mail Adresse"
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:443
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid date/time."
-msgstr "E-Mail Adresse"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid date/time."
+#~ msgstr "E-Mail Adresse"
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:472
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid duration."
-msgstr "E-Mail Adresse"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid duration."
+#~ msgstr "E-Mail Adresse"
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:473
-#, python-brace-format
-msgid "The number of days must be between {min_days} and {max_days}."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:533
-msgid "No file was submitted. Check the encoding type on the form."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:534
-msgid "No file was submitted."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:535
 #, fuzzy
-#| msgid "This shelf is empty."
-msgid "The submitted file is empty."
-msgstr "Dieses Regal ist leer."
+#~| msgid "This shelf is empty."
+#~ msgid "The submitted file is empty."
+#~ msgstr "Dieses Regal ist leer."
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:537
-#, python-format
-msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
-msgid_plural ""
-"Ensure this filename has at most %(max)d characters (it has %(length)d)."
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:540
-msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:601
-msgid ""
-"Upload a valid image. The file you uploaded was either not an image or a "
-"corrupted image."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:763
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:853
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:1275
-#, python-format
-msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:854
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:969
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:1274
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a list of values."
-msgstr "E-Mail Adresse"
+#~| msgid "Email address:"
+#~ msgid "Enter a list of values."
+#~ msgstr "E-Mail Adresse"
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:970
-msgid "Enter a complete value."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:1186
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid UUID."
-msgstr "E-Mail Adresse"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid UUID."
+#~ msgstr "E-Mail Adresse"
 
-#. Translators: This is the default suffix added to form field labels
-#: venv3/lib/python3.8/site-packages/django/forms/forms.py:81
-msgid ":"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/forms.py:207
-#, python-format
-msgid "(Hidden field %(name)s) %(error)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:93
-msgid "ManagementForm data is missing or has been tampered with"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:345
-#, python-format
-msgid "Please submit %d or fewer forms."
-msgid_plural "Please submit %d or fewer forms."
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:352
-#, python-format
-msgid "Please submit %d or more forms."
-msgid_plural "Please submit %d or more forms."
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:379
-#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:386
-msgid "Order"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:754
-#, python-format
-msgid "Please correct the duplicate data for %(field)s."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:758
-#, python-format
-msgid "Please correct the duplicate data for %(field)s, which must be unique."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:764
-#, python-format
-msgid ""
-"Please correct the duplicate data for %(field_name)s which must be unique "
-"for the %(lookup)s in %(date_field)s."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:773
-msgid "Please correct the duplicate values below."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:1094
-msgid "The inline value did not match the parent instance."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:1161
-msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:1277
 #, fuzzy, python-format
-#| msgid "%(value)s is not a valid username"
-msgid "“%(pk)s� is not a valid value."
-msgstr "%(value)s ist kein gültiger Username"
+#~| msgid "%(value)s is not a valid username"
+#~ msgid "“%(pk)s� is not a valid value."
+#~ msgstr "%(value)s ist kein gültiger Username"
 
-#: venv3/lib/python3.8/site-packages/django/forms/utils.py:162
-#, python-format
-msgid ""
-"%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it "
-"may be ambiguous or it may not exist."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:395
-msgid "Clear"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:396
 #, fuzzy
-#| msgid "Start reading"
-msgid "Currently"
-msgstr "Gerade lesend"
+#~| msgid "Start reading"
+#~ msgid "Currently"
+#~ msgstr "Gerade lesend"
 
-#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:397
 #, fuzzy
-#| msgid "Change shelf"
-msgid "Change"
-msgstr "Regal wechseln"
+#~| msgid "Change shelf"
+#~ msgid "Change"
+#~ msgstr "Regal wechseln"
 
-#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:709
-msgid "Unknown"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:710
-msgid "Yes"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:711
-msgid "No"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:788
-msgid "yes,no,maybe"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:817
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:834
-#, python-format
-msgid "%(size)d byte"
-msgid_plural "%(size)d bytes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:836
-#, python-format
-msgid "%s KB"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:838
-#, python-format
-msgid "%s MB"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:840
-#, python-format
-msgid "%s GB"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:842
-#, python-format
-msgid "%s TB"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:844
-#, python-format
-msgid "%s PB"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:62
-msgid "p.m."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:63
-msgid "a.m."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:68
-msgid "PM"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:69
-msgid "AM"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:150
-msgid "midnight"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:152
-msgid "noon"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:295
-msgid "Monday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:296
-msgid "Tuesday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:297
-msgid "Wednesday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:298
-msgid "Thursday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:299
-msgid "Friday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:7
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:300
-msgid "Saturday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:7
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:301
-msgid "Sunday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
-msgid "Mon"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
-msgid "Tue"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
-msgid "Wed"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
-msgid "Thu"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
-msgid "Fri"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:11
 #, fuzzy
-#| msgid "Started"
-msgid "Sat"
-msgstr "Gestartet"
+#~| msgid "Started"
+#~ msgid "Sat"
+#~ msgstr "Gestartet"
 
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:11
-msgid "Sun"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:281
-msgid "January"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:282
-msgid "February"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:283
 #, fuzzy
-#| msgid "Search"
-msgid "March"
-msgstr "Suche"
+#~| msgid "Search"
+#~ msgid "March"
+#~ msgstr "Suche"
 
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:284
-msgid "April"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:285
-msgid "May"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:286
-msgid "June"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:287
-msgid "July"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:288
-msgid "August"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:289
 #, fuzzy
-#| msgid "Series number:"
-msgid "September"
-msgstr "Seriennummer:"
+#~| msgid "Series number:"
+#~ msgid "September"
+#~ msgstr "Seriennummer:"
 
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:290
-msgid "October"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:291
-msgid "November"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:16
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:292
 #, fuzzy
-#| msgid "Series number:"
-msgid "December"
-msgstr "Seriennummer:"
+#~| msgid "Series number:"
+#~ msgid "December"
+#~ msgstr "Seriennummer:"
 
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "jan"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "feb"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "mar"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "apr"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "may"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "jun"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "jul"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "aug"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "sep"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "oct"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "nov"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "dec"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:23
-msgctxt "abbrev. month"
-msgid "Jan."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:24
-msgctxt "abbrev. month"
-msgid "Feb."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:25
 #, fuzzy
-#| msgid "Search"
-msgctxt "abbrev. month"
-msgid "March"
-msgstr "Suche"
+#~| msgid "Search"
+#~ msgctxt "abbrev. month"
+#~ msgid "March"
+#~ msgstr "Suche"
 
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:26
-msgctxt "abbrev. month"
-msgid "April"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:27
-msgctxt "abbrev. month"
-msgid "May"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:28
-msgctxt "abbrev. month"
-msgid "June"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:29
-msgctxt "abbrev. month"
-msgid "July"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:30
-msgctxt "abbrev. month"
-msgid "Aug."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:31
-msgctxt "abbrev. month"
-msgid "Sept."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:32
-msgctxt "abbrev. month"
-msgid "Oct."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:33
-msgctxt "abbrev. month"
-msgid "Nov."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:34
-msgctxt "abbrev. month"
-msgid "Dec."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:37
-msgctxt "alt. month"
-msgid "January"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:38
-msgctxt "alt. month"
-msgid "February"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:39
 #, fuzzy
-#| msgid "Search"
-msgctxt "alt. month"
-msgid "March"
-msgstr "Suche"
+#~| msgid "Search"
+#~ msgctxt "alt. month"
+#~ msgid "March"
+#~ msgstr "Suche"
 
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:40
-msgctxt "alt. month"
-msgid "April"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:41
-msgctxt "alt. month"
-msgid "May"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:42
-msgctxt "alt. month"
-msgid "June"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:43
-msgctxt "alt. month"
-msgid "July"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:44
-msgctxt "alt. month"
-msgid "August"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:45
 #, fuzzy
-#| msgid "Series number:"
-msgctxt "alt. month"
-msgid "September"
-msgstr "Seriennummer:"
+#~| msgid "Series number:"
+#~ msgctxt "alt. month"
+#~ msgid "September"
+#~ msgstr "Seriennummer:"
 
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:46
-msgctxt "alt. month"
-msgid "October"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:47
-msgctxt "alt. month"
-msgid "November"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:48
 #, fuzzy
-#| msgid "Series number:"
-msgctxt "alt. month"
-msgid "December"
-msgstr "Seriennummer:"
+#~| msgid "Series number:"
+#~ msgctxt "alt. month"
+#~ msgid "December"
+#~ msgstr "Seriennummer:"
 
-#: venv3/lib/python3.8/site-packages/django/utils/ipv6.py:8
 #, fuzzy
-#| msgid "Email address:"
-msgid "This is not a valid IPv6 address."
-msgstr "E-Mail Adresse"
+#~| msgid "Email address:"
+#~ msgid "This is not a valid IPv6 address."
+#~ msgstr "E-Mail Adresse"
 
-#: venv3/lib/python3.8/site-packages/django/utils/text.py:69
-#, python-format
-msgctxt "String to return when truncating text"
-msgid "%(truncated_text)s…"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/text.py:235
-msgid "or"
-msgstr ""
-
-#. Translators: This string is used as a separator between list elements
-#: venv3/lib/python3.8/site-packages/django/utils/text.py:254
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:83
-msgid ", "
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:9
-#, python-format
-msgid "%d year"
-msgid_plural "%d years"
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:10
-#, python-format
-msgid "%d month"
-msgid_plural "%d months"
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:11
-#, python-format
-msgid "%d week"
-msgid_plural "%d weeks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:12
-#, python-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:13
-#, python-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:14
-#, python-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:72
-msgid "0 minutes"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:110
-msgid "Forbidden"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:111
-msgid "CSRF verification failed. Request aborted."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:115
-msgid ""
-"You are seeing this message because this HTTPS site requires a “Referer "
-"header� to be sent by your Web browser, but none was sent. This header is "
-"required for security reasons, to ensure that your browser is not being "
-"hijacked by third parties."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:120
-msgid ""
-"If you have configured your browser to disable “Referer� headers, please re-"
-"enable them, at least for this site, or for HTTPS connections, or for “same-"
-"origin� requests."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:124
-msgid ""
-"If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
-"including the “Referrer-Policy: no-referrer� header, please remove them. The "
-"CSRF protection requires the “Referer� header to do strict referer checking. "
-"If you’re concerned about privacy, use alternatives like <a rel=\"noreferrer"
-"\" …> for links to third-party sites."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:132
-msgid ""
-"You are seeing this message because this site requires a CSRF cookie when "
-"submitting forms. This cookie is required for security reasons, to ensure "
-"that your browser is not being hijacked by third parties."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:137
-msgid ""
-"If you have configured your browser to disable cookies, please re-enable "
-"them, at least for this site, or for “same-origin� requests."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:142
-msgid "More information is available with DEBUG=True."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:41
-msgid "No year specified"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:61
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:111
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:208
-msgid "Date out of range"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:90
-msgid "No month specified"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:142
-msgid "No day specified"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:188
-msgid "No week specified"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:338
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:367
-#, python-format
-msgid "No %(verbose_name_plural)s available"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:589
-#, python-format
-msgid ""
-"Future %(verbose_name_plural)s not available because %(class_name)s."
-"allow_future is False."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:623
-#, python-format
-msgid "Invalid date string “%(datestr)s� given format “%(format)s�"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/detail.py:54
 #, fuzzy, python-format
-#| msgid "No books found matching the query \"%(query)s\""
-msgid "No %(verbose_name)s found matching the query"
-msgstr "Keine passenden Bücher zu \"%(query)s\" gefunden"
+#~| msgid "No books found matching the query \"%(query)s\""
+#~ msgid "No %(verbose_name)s found matching the query"
+#~ msgstr "Keine passenden Bücher zu \"%(query)s\" gefunden"
 
-#: venv3/lib/python3.8/site-packages/django/views/generic/list.py:67
-msgid "Page is not “last�, nor can it be converted to an int."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/list.py:72
-#, python-format
-msgid "Invalid page (%(page_number)s): %(message)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/list.py:154
-#, python-format
-msgid "Empty list and “%(class_name)s.allow_empty� is False."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/static.py:40
-msgid "Directory indexes are not allowed here."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/static.py:42
 #, fuzzy, python-format
-#| msgid "%(value)s is not a valid username"
-msgid "“%(path)s� does not exist"
-msgstr "%(value)s ist kein gültiger Username"
+#~| msgid "%(value)s is not a valid username"
+#~ msgid "“%(path)s� does not exist"
+#~ msgstr "%(value)s ist kein gültiger Username"
 
-#: venv3/lib/python3.8/site-packages/django/views/static.py:80
-#, python-format
-msgid "Index of %(directory)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:7
-msgid "Django: the Web framework for perfectionists with deadlines."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:346
-#, python-format
-msgid ""
-"View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
-"target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:368
-msgid "The install worked successfully! Congratulations!"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:369
-#, python-format
-msgid ""
-"You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
-"%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
-"\">DEBUG=True</a> is in your settings file and you have not configured any "
-"URLs."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:384
-msgid "Django Documentation"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:385
-msgid "Topics, references, &amp; how-to’s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:396
-msgid "Tutorial: A Polling App"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:397
-msgid "Get started with Django"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:408
 #, fuzzy
-#| msgid "Comment"
-msgid "Django Community"
-msgstr "Kommentieren"
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:409
-msgid "Connect, get help, or contribute"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/kombu/transport/qpid.py:1301
-#, python-format
-msgid "Attempting to connect to qpid with SASL mechanism %s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/kombu/transport/qpid.py:1306
-#, python-format
-msgid "Connected to qpid with SASL mechanism %s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/kombu/transport/qpid.py:1324
-#, python-format
-msgid "Unable to connect to qpid with SASL mechanism %s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:371
-msgid "1 second ago"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:377
-msgid "1 minute ago"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:382
-msgid "1 hour ago"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:385
-#, python-format
-msgid "%(time)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:387
-msgid "yesterday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:387
-#, python-format
-msgid "yesterday at %(time)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:389
-#, python-format
-msgid "%(weekday)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:389
-#, python-format
-msgid "%(weekday)s at %(time)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:392
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:445
-#, python-format
-msgid "%(month_name)s %(day)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:394
-#, python-format
-msgid "%(month_name)s %(day)s at %(time)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:399
-#, python-format
-msgid "%(month_name)s %(day)s, %(year)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:401
-#, python-format
-msgid "%(month_name)s %(day)s, %(year)s at %(time)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:439
-#, python-format
-msgid "%(weekday)s, %(month_name)s %(day)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:462
-#, python-format
-msgid "%(commas)s and %(last)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:68
-msgctxt "law"
-msgid "right"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:69
-msgctxt "good"
-msgid "right"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:71
-#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:74
-msgctxt "organization"
-msgid "club"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:76
-#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:77
-msgctxt "stick"
-msgid "club"
-msgstr ""
+#~| msgid "Comment"
+#~ msgid "Django Community"
+#~ msgstr "Kommentieren"
 
 #~ msgid "Didn't find what you were looking for?"
 #~ msgstr "Nicht gefunden, wonach du gesucht hast?"
@@ -4554,31 +3313,18 @@ msgstr ""
 
 #, fuzzy, python-format
 #~| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
-#~ msgid ""
-#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
-#~ "\"%(status_path)s\">review</a>"
+#~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">review</a>"
 #~ msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
 #, fuzzy, python-format
-#~| msgid ""
-#~| "<a href=\"%(related_path)s\">replied</a> to your <a href="
-#~| "\"%(parent_path)s\">status</a>"
-#~ msgid ""
-#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
-#~ "\"%(status_path)s\">comment</a>"
-#~ msgstr ""
-#~ "hat auf deinen <a href=\"%(parent_path)s\">Status</a> geantwortet</a>"
+#~| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
+#~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">comment</a>"
+#~ msgstr "hat auf deinen <a href=\"%(parent_path)s\">Status</a> geantwortet</a>"
 
 #, fuzzy, python-format
-#~| msgid ""
-#~| "<a href=\"%(related_path)s\">replied</a> to your <a href="
-#~| "\"%(parent_path)s\">status</a>"
-#~ msgid ""
-#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
-#~ "\"%(status_path)s\">quote</a>"
-#~ msgstr ""
-#~ "hat auf deinen <a href=\"%(parent_path)s\">Status</a> <a href="
-#~ "\"%(related_path)s\">geantwortet</a>"
+#~| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
+#~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">quote</a>"
+#~ msgstr "hat auf deinen <a href=\"%(parent_path)s\">Status</a> <a href=\"%(related_path)s\">geantwortet</a>"
 
 #~ msgid "Remove tag"
 #~ msgstr "Tag entfernen"
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index c886a742..07930197 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-01 10:56-0700\n"
+"POT-Creation-Date: 2021-05-03 11:22-0700\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"
@@ -231,9 +231,7 @@ msgstr ""
 
 #: bookwyrm/templates/book/book.html:151
 #, python-format
-msgid ""
-"A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a "
-"href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
+msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr ""
 
 #: bookwyrm/templates/book/book.html:162
@@ -569,9 +567,7 @@ msgstr ""
 
 #: bookwyrm/templates/directory/directory.html:24
 #, python-format
-msgid ""
-"You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</"
-"a>"
+msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
 msgstr ""
 
 #: bookwyrm/templates/directory/directory.html:29
@@ -738,9 +734,7 @@ msgstr ""
 
 #: bookwyrm/templates/email/html_layout.html:21
 #, python-format
-msgid ""
-"BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">"
-"%(site_name)s</a>"
+msgid "BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a>"
 msgstr ""
 
 #: bookwyrm/templates/email/html_layout.html:23
@@ -759,16 +753,12 @@ msgstr ""
 
 #: bookwyrm/templates/email/invite/html_content.html:15
 #, python-format
-msgid ""
-"Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</"
-"a>."
+msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
 msgstr ""
 
 #: bookwyrm/templates/email/invite/text_content.html:4
 #, python-format
-msgid ""
-"You're invited to join %(site_name)s! Click the link below to create an "
-"account."
+msgid "You're invited to join %(site_name)s! Click the link below to create an account."
 msgstr ""
 
 #: bookwyrm/templates/email/invite/text_content.html:8
@@ -778,9 +768,7 @@ msgstr ""
 #: bookwyrm/templates/email/password_reset/html_content.html:6
 #: bookwyrm/templates/email/password_reset/text_content.html:4
 #, python-format
-msgid ""
-"You requested to reset your %(site_name)s password. Click the link below to "
-"set a new password and log in to your account."
+msgid "You requested to reset your %(site_name)s password. Click the link below to set a new password and log in to your account."
 msgstr ""
 
 #: bookwyrm/templates/email/password_reset/html_content.html:9
@@ -793,8 +781,7 @@ msgstr ""
 
 #: bookwyrm/templates/email/password_reset/html_content.html:13
 #: bookwyrm/templates/email/password_reset/text_content.html:8
-msgid ""
-"If you didn't request to reset your password, you can ignore this email."
+msgid "If you didn't request to reset your password, you can ignore this email."
 msgstr ""
 
 #: bookwyrm/templates/email/password_reset/subject.html:2
@@ -851,8 +838,7 @@ msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed.html:48
-msgid ""
-"There aren't any activities right now! Try following a user to get started"
+msgid "There aren't any activities right now! Try following a user to get started"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed.html:56
@@ -871,8 +857,7 @@ msgid "Your books"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:13
-msgid ""
-"There are no books here right now! Try searching for a book to get started"
+msgid "There are no books here right now! Try searching for a book to get started"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:24
@@ -1026,9 +1011,7 @@ msgid "Show this account in suggested users:"
 msgstr ""
 
 #: bookwyrm/templates/get_started/profile.html:52
-msgid ""
-"Your account will show up in the directory, and may be recommended to other "
-"BookWyrm users."
+msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users."
 msgstr ""
 
 #: bookwyrm/templates/get_started/users.html:11
@@ -1052,9 +1035,7 @@ msgstr ""
 #: bookwyrm/templates/goal.html:30
 #: bookwyrm/templates/snippets/goal_card.html:13
 #, python-format
-msgid ""
-"Set a goal for how many books you'll finish reading in %(year)s, and track "
-"your progress throughout the year."
+msgid "Set a goal for how many books you'll finish reading in %(year)s, and track your progress throughout the year."
 msgstr ""
 
 #: bookwyrm/templates/goal.html:39
@@ -1137,9 +1118,7 @@ msgstr ""
 
 #: bookwyrm/templates/import_status.html:44
 #, python-format
-msgid ""
-"Jump to the bottom of the list to select the %(failed_count)s items which "
-"failed to import."
+msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
 msgstr ""
 
 #: bookwyrm/templates/import_status.html:79
@@ -1276,15 +1255,11 @@ msgstr ""
 
 #: bookwyrm/templates/layout.html:213
 #, python-format
-msgid ""
-"Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">"
-"%(support_title)s</a>"
+msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr ""
 
 #: bookwyrm/templates/layout.html:217
-msgid ""
-"BookWyrm is open source software. You can contribute or report issues on <a "
-"href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr ""
 
 #: bookwyrm/templates/lists/create_form.html:5
@@ -1461,7 +1436,7 @@ msgstr ""
 
 #: bookwyrm/templates/moderation/report.html:41
 #: bookwyrm/templates/snippets/create_status.html:28
-#: bookwyrm/templates/snippets/create_status_form.html:53
+#: bookwyrm/templates/snippets/create_status_form.html:63
 msgid "Comment"
 msgstr ""
 
@@ -1538,23 +1513,17 @@ msgstr ""
 
 #: bookwyrm/templates/notifications.html:53
 #, python-format
-msgid ""
-"favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</"
-"em></a>"
+msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:55
 #, python-format
-msgid ""
-"favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</"
-"em></a>"
+msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:57
 #, python-format
-msgid ""
-"favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
-"em></a>"
+msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:59
@@ -1564,23 +1533,17 @@ msgstr ""
 
 #: bookwyrm/templates/notifications.html:64
 #, python-format
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">review of <em>"
-"%(book_title)s</em></a>"
+msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:66
 #, python-format
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">comment on <em>"
-"%(book_title)s</em></a>"
+msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:68
 #, python-format
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">quote from <em>"
-"%(book_title)s</em></a>"
+msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:70
@@ -1590,30 +1553,22 @@ msgstr ""
 
 #: bookwyrm/templates/notifications.html:75
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">review of <em>%(book_title)s</em></a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:77
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">comment on <em>%(book_title)s</em></a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:79
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">quote from <em>%(book_title)s</em></a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:81
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">status</a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:85
@@ -1626,23 +1581,17 @@ msgstr ""
 
 #: bookwyrm/templates/notifications.html:94
 #, python-format
-msgid ""
-"boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></"
-"a>"
+msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:96
 #, python-format
-msgid ""
-"boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></"
-"a>"
+msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:98
 #, python-format
-msgid ""
-"boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
-"em></a>"
+msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:100
@@ -1652,16 +1601,12 @@ msgstr ""
 
 #: bookwyrm/templates/notifications.html:104
 #, python-format
-msgid ""
-" added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
-"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:106
 #, python-format
-msgid ""
-" suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to "
-"your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:110
@@ -1723,9 +1668,7 @@ msgstr ""
 
 #: bookwyrm/templates/preferences/edit_user.html:62
 #, python-format
-msgid ""
-"Your account will show up in the <a href=\"%(path)s\">directory</a>, and may "
-"be recommended to other BookWyrm users."
+msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
 msgstr ""
 
 #: bookwyrm/templates/preferences/edit_user.html:65
@@ -1753,6 +1696,10 @@ msgid "Load results from other catalogues"
 msgstr ""
 
 #: bookwyrm/templates/search/book.html:68
+msgid "Manually add book"
+msgstr ""
+
+#: bookwyrm/templates/search/book.html:73
 msgid "Log in to import or add books."
 msgstr ""
 
@@ -2148,7 +2095,7 @@ msgstr ""
 msgid "Registration closed text:"
 msgstr ""
 
-#: bookwyrm/templates/snippets/book_cover.html:36
+#: bookwyrm/templates/snippets/book_cover.html:32
 msgid "No cover"
 msgstr ""
 
@@ -2195,48 +2142,52 @@ msgstr ""
 msgid "Review:"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:42
+#: bookwyrm/templates/snippets/create_status_form.html:53
 #: bookwyrm/templates/snippets/status/layout.html:30
 #: bookwyrm/templates/snippets/status/layout.html:48
 #: bookwyrm/templates/snippets/status/layout.html:49
 msgid "Reply"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:67
+#: bookwyrm/templates/snippets/create_status_form.html:53
+msgid "Content"
+msgstr ""
+
+#: bookwyrm/templates/snippets/create_status_form.html:77
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
 msgid "Progress:"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:75
+#: bookwyrm/templates/snippets/create_status_form.html:85
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:76
+#: bookwyrm/templates/snippets/create_status_form.html:86
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:82
+#: bookwyrm/templates/snippets/create_status_form.html:92
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:97
+#: bookwyrm/templates/snippets/create_status_form.html:107
 msgid "Include spoiler alert"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:104
+#: bookwyrm/templates/snippets/create_status_form.html:114
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:19
 msgid "Private"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:115
+#: bookwyrm/templates/snippets/create_status_form.html:125
 msgid "Post"
 msgstr ""
 
@@ -2246,14 +2197,11 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
 #, python-format
-msgid ""
-"You are deleting this readthrough and its %(count)s associated progress "
-"updates."
+msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr ""
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
 #: bookwyrm/templates/snippets/follow_request_buttons.html:13
-#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:391
 msgid "Delete"
 msgstr ""
 
@@ -2313,19 +2261,15 @@ msgstr[1] ""
 
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
 #, python-format
-msgid ""
-"Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
-msgid_plural ""
-"Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
+msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
+msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
 msgstr[0] ""
 msgstr[1] ""
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4
 #, python-format
-msgid ""
-"Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
-msgid_plural ""
-"Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
+msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
+msgid_plural "Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -2336,9 +2280,7 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/goal_card.html:23
 #, python-format
-msgid ""
-"You can set or change your reading goal any time from your <a href=\"%(path)s"
-"\">profile page</a>"
+msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
 msgstr ""
 
 #: bookwyrm/templates/snippets/goal_form.html:9
@@ -2371,15 +2313,12 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/goal_progress.html:10
 #, python-format
-msgid ""
-"You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgid "You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
 msgstr ""
 
 #: bookwyrm/templates/snippets/goal_progress.html:12
 #, python-format
-msgid ""
-"%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s "
-"books</a>."
+msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
 msgstr ""
 
 #: bookwyrm/templates/snippets/page_text.html:4
@@ -2591,9 +2530,7 @@ msgstr ""
 
 #: bookwyrm/templates/snippets/status/status_header.html:44
 #, python-format
-msgid ""
-"replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
-"\"%(status_path)s\">status</a>"
+msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
 msgstr ""
 
 #: bookwyrm/templates/snippets/status/status_options.html:7
@@ -2836,1299 +2773,3 @@ msgstr ""
 #, python-format
 msgid "A password reset link sent to %s"
 msgstr ""
-
-#: venv3/lib/python3.8/site-packages/_pytest/config/argparsing.py:442
-#, python-format
-msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/contrib/messages/apps.py:7
-msgid "Messages"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/contrib/sitemaps/apps.py:7
-msgid "Site Maps"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/contrib/staticfiles/apps.py:9
-msgid "Static Files"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/contrib/syndication/apps.py:7
-msgid "Syndication"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/paginator.py:45
-msgid "That page number is not an integer"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/paginator.py:47
-msgid "That page number is less than 1"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/paginator.py:52
-msgid "That page contains no results"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:32
-msgid "Enter a valid value."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:103
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:659
-msgid "Enter a valid URL."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:155
-msgid "Enter a valid integer."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:166
-msgid "Enter a valid email address."
-msgstr ""
-
-#. Translators: "letters" means latin letters: a-z and A-Z.
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:240
-msgid ""
-"Enter a valid “slug� consisting of letters, numbers, underscores or hyphens."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:247
-msgid ""
-"Enter a valid “slug� consisting of Unicode letters, numbers, underscores, or "
-"hyphens."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:256
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:276
-msgid "Enter a valid IPv4 address."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:261
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:277
-msgid "Enter a valid IPv6 address."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:271
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:275
-msgid "Enter a valid IPv4 or IPv6 address."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:305
-msgid "Enter only digits separated by commas."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:311
-#, python-format
-msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:343
-#, python-format
-msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:352
-#, python-format
-msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:362
-#, python-format
-msgid ""
-"Ensure this value has at least %(limit_value)d character (it has "
-"%(show_value)d)."
-msgid_plural ""
-"Ensure this value has at least %(limit_value)d characters (it has "
-"%(show_value)d)."
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:377
-#, python-format
-msgid ""
-"Ensure this value has at most %(limit_value)d character (it has "
-"%(show_value)d)."
-msgid_plural ""
-"Ensure this value has at most %(limit_value)d characters (it has "
-"%(show_value)d)."
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:396
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:291
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:326
-msgid "Enter a number."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:398
-#, python-format
-msgid "Ensure that there are no more than %(max)s digit in total."
-msgid_plural "Ensure that there are no more than %(max)s digits in total."
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:403
-#, python-format
-msgid "Ensure that there are no more than %(max)s decimal place."
-msgid_plural "Ensure that there are no more than %(max)s decimal places."
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:408
-#, python-format
-msgid ""
-"Ensure that there are no more than %(max)s digit before the decimal point."
-msgid_plural ""
-"Ensure that there are no more than %(max)s digits before the decimal point."
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:470
-#, python-format
-msgid ""
-"File extension “%(extension)s� is not allowed. Allowed extensions are: "
-"%(allowed_extensions)s."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:522
-msgid "Null characters are not allowed."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/base.py:1181
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:759
-msgid "and"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/base.py:1183
-#, python-format
-msgid "%(model_name)s with this %(field_labels)s already exists."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:104
-#, python-format
-msgid "Value %(value)r is not a valid choice."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:105
-msgid "This field cannot be null."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:106
-msgid "This field cannot be blank."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:107
-#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr ""
-
-#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
-#. Eg: "Title must be unique for pub_date year"
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:111
-#, python-format
-msgid ""
-"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:130
-#, python-format
-msgid "Field of type: %(field_type)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:937
-#, python-format
-msgid "“%(value)s� value must be either True or False."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:938
-#, python-format
-msgid "“%(value)s� value must be either True, False, or None."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:940
-msgid "Boolean (Either True or False)"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:981
-#, python-format
-msgid "String (up to %(max_length)s)"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1045
-msgid "Comma-separated integers"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1094
-#, python-format
-msgid ""
-"“%(value)s� value has an invalid date format. It must be in YYYY-MM-DD "
-"format."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1096
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1239
-#, python-format
-msgid ""
-"“%(value)s� value has the correct format (YYYY-MM-DD) but it is an invalid "
-"date."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1099
-msgid "Date (without time)"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1237
-#, python-format
-msgid ""
-"“%(value)s� value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
-"uuuuuu]][TZ] format."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1241
-#, python-format
-msgid ""
-"“%(value)s� value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
-"[TZ]) but it is an invalid date/time."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1245
-msgid "Date (with time)"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1393
-#, python-format
-msgid "“%(value)s� value must be a decimal number."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1395
-msgid "Decimal number"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1534
-#, python-format
-msgid ""
-"“%(value)s� value has an invalid format. It must be in [DD] [[HH:]MM:]ss[."
-"uuuuuu] format."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1537
-msgid "Duration"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1587
-msgid "Email address"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1610
-msgid "File path"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1676
-#, python-format
-msgid "“%(value)s� value must be a float."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1678
-msgid "Floating point number"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1716
-#, python-format
-msgid "“%(value)s� value must be an integer."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1718
-msgid "Integer"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1801
-msgid "Big (8 byte) integer"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1817
-msgid "IPv4 address"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1848
-msgid "IP address"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1928
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1929
-#, python-format
-msgid "“%(value)s� value must be either None, True or False."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1931
-msgid "Boolean (Either True, False or None)"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1966
-msgid "Positive integer"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1979
-msgid "Positive small integer"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1993
-#, python-format
-msgid "Slug (up to %(max_length)s)"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2025
-msgid "Small integer"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2032
-msgid "Text"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2060
-#, python-format
-msgid ""
-"“%(value)s� value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
-"format."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2062
-#, python-format
-msgid ""
-"“%(value)s� value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
-"invalid time."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2065
-msgid "Time"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2191
-msgid "URL"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2213
-msgid "Raw binary data"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2278
-#, python-format
-msgid "“%(value)s� is not a valid UUID."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2280
-msgid "Universally unique identifier"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/files.py:221
-msgid "File"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/files.py:360
-msgid "Image"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:778
-#, python-format
-msgid "%(model)s instance with %(field)s %(value)r does not exist."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:780
-msgid "Foreign Key (type determined by related field)"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1012
-msgid "One-to-one relationship"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1066
-#, python-format
-msgid "%(from)s-%(to)s relationship"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1067
-#, python-format
-msgid "%(from)s-%(to)s relationships"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1109
-msgid "Many-to-many relationship"
-msgstr ""
-
-#. Translators: If found as last label character, these punctuation
-#. characters will prevent the default label_suffix to be appended to the label
-#: venv3/lib/python3.8/site-packages/django/forms/boundfield.py:149
-msgid ":?.!"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:53
-msgid "This field is required."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:246
-msgid "Enter a whole number."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:397
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:1127
-msgid "Enter a valid date."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:421
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:1128
-msgid "Enter a valid time."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:443
-msgid "Enter a valid date/time."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:472
-msgid "Enter a valid duration."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:473
-#, python-brace-format
-msgid "The number of days must be between {min_days} and {max_days}."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:533
-msgid "No file was submitted. Check the encoding type on the form."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:534
-msgid "No file was submitted."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:535
-msgid "The submitted file is empty."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:537
-#, python-format
-msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
-msgid_plural ""
-"Ensure this filename has at most %(max)d characters (it has %(length)d)."
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:540
-msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:601
-msgid ""
-"Upload a valid image. The file you uploaded was either not an image or a "
-"corrupted image."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:763
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:853
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:1275
-#, python-format
-msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:854
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:969
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:1274
-msgid "Enter a list of values."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:970
-msgid "Enter a complete value."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:1186
-msgid "Enter a valid UUID."
-msgstr ""
-
-#. Translators: This is the default suffix added to form field labels
-#: venv3/lib/python3.8/site-packages/django/forms/forms.py:81
-msgid ":"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/forms.py:207
-#, python-format
-msgid "(Hidden field %(name)s) %(error)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:93
-msgid "ManagementForm data is missing or has been tampered with"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:345
-#, python-format
-msgid "Please submit %d or fewer forms."
-msgid_plural "Please submit %d or fewer forms."
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:352
-#, python-format
-msgid "Please submit %d or more forms."
-msgid_plural "Please submit %d or more forms."
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:379
-#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:386
-msgid "Order"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:754
-#, python-format
-msgid "Please correct the duplicate data for %(field)s."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:758
-#, python-format
-msgid "Please correct the duplicate data for %(field)s, which must be unique."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:764
-#, python-format
-msgid ""
-"Please correct the duplicate data for %(field_name)s which must be unique "
-"for the %(lookup)s in %(date_field)s."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:773
-msgid "Please correct the duplicate values below."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:1094
-msgid "The inline value did not match the parent instance."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:1161
-msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:1277
-#, python-format
-msgid "“%(pk)s� is not a valid value."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/utils.py:162
-#, python-format
-msgid ""
-"%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it "
-"may be ambiguous or it may not exist."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:395
-msgid "Clear"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:396
-msgid "Currently"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:397
-msgid "Change"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:709
-msgid "Unknown"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:710
-msgid "Yes"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:711
-msgid "No"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:788
-msgid "yes,no,maybe"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:817
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:834
-#, python-format
-msgid "%(size)d byte"
-msgid_plural "%(size)d bytes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:836
-#, python-format
-msgid "%s KB"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:838
-#, python-format
-msgid "%s MB"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:840
-#, python-format
-msgid "%s GB"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:842
-#, python-format
-msgid "%s TB"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:844
-#, python-format
-msgid "%s PB"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:62
-msgid "p.m."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:63
-msgid "a.m."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:68
-msgid "PM"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:69
-msgid "AM"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:150
-msgid "midnight"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:152
-msgid "noon"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:295
-msgid "Monday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:296
-msgid "Tuesday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:297
-msgid "Wednesday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:298
-msgid "Thursday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:299
-msgid "Friday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:7
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:300
-msgid "Saturday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:7
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:301
-msgid "Sunday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
-msgid "Mon"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
-msgid "Tue"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
-msgid "Wed"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
-msgid "Thu"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
-msgid "Fri"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:11
-msgid "Sat"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:11
-msgid "Sun"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:281
-msgid "January"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:282
-msgid "February"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:283
-msgid "March"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:284
-msgid "April"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:285
-msgid "May"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:286
-msgid "June"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:287
-msgid "July"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:288
-msgid "August"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:289
-msgid "September"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:290
-msgid "October"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:291
-msgid "November"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:16
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:292
-msgid "December"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "jan"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "feb"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "mar"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "apr"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "may"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "jun"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "jul"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "aug"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "sep"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "oct"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "nov"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "dec"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:23
-msgctxt "abbrev. month"
-msgid "Jan."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:24
-msgctxt "abbrev. month"
-msgid "Feb."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:25
-msgctxt "abbrev. month"
-msgid "March"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:26
-msgctxt "abbrev. month"
-msgid "April"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:27
-msgctxt "abbrev. month"
-msgid "May"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:28
-msgctxt "abbrev. month"
-msgid "June"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:29
-msgctxt "abbrev. month"
-msgid "July"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:30
-msgctxt "abbrev. month"
-msgid "Aug."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:31
-msgctxt "abbrev. month"
-msgid "Sept."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:32
-msgctxt "abbrev. month"
-msgid "Oct."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:33
-msgctxt "abbrev. month"
-msgid "Nov."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:34
-msgctxt "abbrev. month"
-msgid "Dec."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:37
-msgctxt "alt. month"
-msgid "January"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:38
-msgctxt "alt. month"
-msgid "February"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:39
-msgctxt "alt. month"
-msgid "March"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:40
-msgctxt "alt. month"
-msgid "April"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:41
-msgctxt "alt. month"
-msgid "May"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:42
-msgctxt "alt. month"
-msgid "June"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:43
-msgctxt "alt. month"
-msgid "July"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:44
-msgctxt "alt. month"
-msgid "August"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:45
-msgctxt "alt. month"
-msgid "September"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:46
-msgctxt "alt. month"
-msgid "October"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:47
-msgctxt "alt. month"
-msgid "November"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:48
-msgctxt "alt. month"
-msgid "December"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/ipv6.py:8
-msgid "This is not a valid IPv6 address."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/text.py:69
-#, python-format
-msgctxt "String to return when truncating text"
-msgid "%(truncated_text)s…"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/text.py:235
-msgid "or"
-msgstr ""
-
-#. Translators: This string is used as a separator between list elements
-#: venv3/lib/python3.8/site-packages/django/utils/text.py:254
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:83
-msgid ", "
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:9
-#, python-format
-msgid "%d year"
-msgid_plural "%d years"
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:10
-#, python-format
-msgid "%d month"
-msgid_plural "%d months"
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:11
-#, python-format
-msgid "%d week"
-msgid_plural "%d weeks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:12
-#, python-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:13
-#, python-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:14
-#, python-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:72
-msgid "0 minutes"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:110
-msgid "Forbidden"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:111
-msgid "CSRF verification failed. Request aborted."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:115
-msgid ""
-"You are seeing this message because this HTTPS site requires a “Referer "
-"header� to be sent by your Web browser, but none was sent. This header is "
-"required for security reasons, to ensure that your browser is not being "
-"hijacked by third parties."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:120
-msgid ""
-"If you have configured your browser to disable “Referer� headers, please re-"
-"enable them, at least for this site, or for HTTPS connections, or for “same-"
-"origin� requests."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:124
-msgid ""
-"If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
-"including the “Referrer-Policy: no-referrer� header, please remove them. The "
-"CSRF protection requires the “Referer� header to do strict referer checking. "
-"If you’re concerned about privacy, use alternatives like <a rel=\"noreferrer"
-"\" …> for links to third-party sites."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:132
-msgid ""
-"You are seeing this message because this site requires a CSRF cookie when "
-"submitting forms. This cookie is required for security reasons, to ensure "
-"that your browser is not being hijacked by third parties."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:137
-msgid ""
-"If you have configured your browser to disable cookies, please re-enable "
-"them, at least for this site, or for “same-origin� requests."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:142
-msgid "More information is available with DEBUG=True."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:41
-msgid "No year specified"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:61
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:111
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:208
-msgid "Date out of range"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:90
-msgid "No month specified"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:142
-msgid "No day specified"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:188
-msgid "No week specified"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:338
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:367
-#, python-format
-msgid "No %(verbose_name_plural)s available"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:589
-#, python-format
-msgid ""
-"Future %(verbose_name_plural)s not available because %(class_name)s."
-"allow_future is False."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:623
-#, python-format
-msgid "Invalid date string “%(datestr)s� given format “%(format)s�"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/detail.py:54
-#, python-format
-msgid "No %(verbose_name)s found matching the query"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/list.py:67
-msgid "Page is not “last�, nor can it be converted to an int."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/list.py:72
-#, python-format
-msgid "Invalid page (%(page_number)s): %(message)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/list.py:154
-#, python-format
-msgid "Empty list and “%(class_name)s.allow_empty� is False."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/static.py:40
-msgid "Directory indexes are not allowed here."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/static.py:42
-#, python-format
-msgid "“%(path)s� does not exist"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/static.py:80
-#, python-format
-msgid "Index of %(directory)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:7
-msgid "Django: the Web framework for perfectionists with deadlines."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:346
-#, python-format
-msgid ""
-"View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
-"target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:368
-msgid "The install worked successfully! Congratulations!"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:369
-#, python-format
-msgid ""
-"You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
-"%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
-"\">DEBUG=True</a> is in your settings file and you have not configured any "
-"URLs."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:384
-msgid "Django Documentation"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:385
-msgid "Topics, references, &amp; how-to’s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:396
-msgid "Tutorial: A Polling App"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:397
-msgid "Get started with Django"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:408
-msgid "Django Community"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:409
-msgid "Connect, get help, or contribute"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/kombu/transport/qpid.py:1301
-#, python-format
-msgid "Attempting to connect to qpid with SASL mechanism %s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/kombu/transport/qpid.py:1306
-#, python-format
-msgid "Connected to qpid with SASL mechanism %s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/kombu/transport/qpid.py:1324
-#, python-format
-msgid "Unable to connect to qpid with SASL mechanism %s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:371
-msgid "1 second ago"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:377
-msgid "1 minute ago"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:382
-msgid "1 hour ago"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:385
-#, python-format
-msgid "%(time)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:387
-msgid "yesterday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:387
-#, python-format
-msgid "yesterday at %(time)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:389
-#, python-format
-msgid "%(weekday)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:389
-#, python-format
-msgid "%(weekday)s at %(time)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:392
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:445
-#, python-format
-msgid "%(month_name)s %(day)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:394
-#, python-format
-msgid "%(month_name)s %(day)s at %(time)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:399
-#, python-format
-msgid "%(month_name)s %(day)s, %(year)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:401
-#, python-format
-msgid "%(month_name)s %(day)s, %(year)s at %(time)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:439
-#, python-format
-msgid "%(weekday)s, %(month_name)s %(day)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:462
-#, python-format
-msgid "%(commas)s and %(last)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:68
-msgctxt "law"
-msgid "right"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:69
-msgctxt "good"
-msgid "right"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:71
-#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:74
-msgctxt "organization"
-msgid "club"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:76
-#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:77
-msgctxt "stick"
-msgid "club"
-msgstr ""
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index a4290857..899ff19f 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-01 10:56-0700\n"
+"POT-Creation-Date: 2021-05-03 11:22-0700\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -229,17 +229,12 @@ msgstr "<a href=\"%(path)s/editions\">%(count)s ediciones</a>"
 #: bookwyrm/templates/book/book.html:145
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
-msgstr ""
-"Esta edición está en tu <a href=\"%(path)s\">%(shelf_name)s</a> estante."
+msgstr "Esta edición está en tu <a href=\"%(path)s\">%(shelf_name)s</a> estante."
 
 #: bookwyrm/templates/book/book.html:151
 #, python-format
-msgid ""
-"A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a "
-"href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
-msgstr ""
-"Una <a href=\"%(book_path)s\">edición diferente</a> de este libro está en tu "
-"<a href=\"%(shelf_path)s\">%(shelf_name)s</a> estante."
+msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
+msgstr "Una <a href=\"%(book_path)s\">edición diferente</a> de este libro está en tu <a href=\"%(shelf_path)s\">%(shelf_name)s</a> estante."
 
 #: bookwyrm/templates/book/book.html:162
 msgid "Your reading activity"
@@ -582,12 +577,8 @@ msgstr "Haz que tu perfil sea reconocible a otros usarios de BookWyrm."
 
 #: bookwyrm/templates/directory/directory.html:24
 #, python-format
-msgid ""
-"You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</"
-"a>"
-msgstr ""
-"Puedes optar por no en cualquier hora en tus <a href=\"%(path)s"
-"\">configuraciones de perfil.</a>"
+msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
+msgstr "Puedes optar por no en cualquier hora en tus <a href=\"%(path)s\">configuraciones de perfil.</a>"
 
 #: bookwyrm/templates/directory/directory.html:29
 #: bookwyrm/templates/snippets/goal_card.html:22
@@ -753,12 +744,8 @@ msgstr "Hola, "
 
 #: bookwyrm/templates/email/html_layout.html:21
 #, python-format
-msgid ""
-"BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">"
-"%(site_name)s</a>"
-msgstr ""
-"BookWyrm alojado en <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">"
-"%(site_name)s</a>"
+msgid "BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a>"
+msgstr "BookWyrm alojado en <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a>"
 
 #: bookwyrm/templates/email/html_layout.html:23
 msgid "Email preference"
@@ -776,21 +763,13 @@ msgstr "Únete ahora"
 
 #: bookwyrm/templates/email/invite/html_content.html:15
 #, python-format
-msgid ""
-"Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</"
-"a>."
-msgstr ""
-"Aprenda más <a href=\"https://%(domain)s%(about_path)s\">sobre esta "
-"instancia</a>."
+msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
+msgstr "Aprenda más <a href=\"https://%(domain)s%(about_path)s\">sobre esta instancia</a>."
 
 #: bookwyrm/templates/email/invite/text_content.html:4
 #, python-format
-msgid ""
-"You're invited to join %(site_name)s! Click the link below to create an "
-"account."
-msgstr ""
-"Estás invitado a unirte con %(site_name)s! Haz clic en el enlace a "
-"continuación para crear una cuenta."
+msgid "You're invited to join %(site_name)s! Click the link below to create an account."
+msgstr "Estás invitado a unirte con %(site_name)s! Haz clic en el enlace a continuación para crear una cuenta."
 
 #: bookwyrm/templates/email/invite/text_content.html:8
 msgid "Learn more about this instance:"
@@ -799,13 +778,8 @@ msgstr "Aprende más sobre esta intancia:"
 #: bookwyrm/templates/email/password_reset/html_content.html:6
 #: bookwyrm/templates/email/password_reset/text_content.html:4
 #, python-format
-msgid ""
-"You requested to reset your %(site_name)s password. Click the link below to "
-"set a new password and log in to your account."
-msgstr ""
-"Tú solicitaste reestablecer tu %(site_name)s contraseña. Haz clic en el "
-"enlace a continuación para establecer una nueva contraseña e ingresar a tu "
-"cuenta."
+msgid "You requested to reset your %(site_name)s password. Click the link below to set a new password and log in to your account."
+msgstr "Tú solicitaste reestablecer tu %(site_name)s contraseña. Haz clic en el enlace a continuación para establecer una nueva contraseña e ingresar a tu cuenta."
 
 #: bookwyrm/templates/email/password_reset/html_content.html:9
 #: bookwyrm/templates/password_reset.html:4
@@ -817,10 +791,8 @@ msgstr "Restablecer contraseña"
 
 #: bookwyrm/templates/email/password_reset/html_content.html:13
 #: bookwyrm/templates/email/password_reset/text_content.html:8
-msgid ""
-"If you didn't request to reset your password, you can ignore this email."
-msgstr ""
-"Si no solicitaste reestablecer tu contraseña, puedes ignorar este mensaje."
+msgid "If you didn't request to reset your password, you can ignore this email."
+msgstr "Si no solicitaste reestablecer tu contraseña, puedes ignorar este mensaje."
 
 #: bookwyrm/templates/email/password_reset/subject.html:2
 #, python-format
@@ -873,12 +845,10 @@ msgstr "Federalizado"
 #: bookwyrm/templates/feed/feed.html:33
 #, python-format
 msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
-msgstr ""
-"cargar <span data-poll=\"stream/%(tab)s\">0</span> status(es) no leídos"
+msgstr "cargar <span data-poll=\"stream/%(tab)s\">0</span> status(es) no leídos"
 
 #: bookwyrm/templates/feed/feed.html:48
-msgid ""
-"There aren't any activities right now! Try following a user to get started"
+msgid "There aren't any activities right now! Try following a user to get started"
 msgstr "¡No hay actividad ahora mismo! Sigue a otro usuario para empezar"
 
 #: bookwyrm/templates/feed/feed.html:56
@@ -897,8 +867,7 @@ msgid "Your books"
 msgstr "Tus libros"
 
 #: bookwyrm/templates/feed/feed_layout.html:13
-msgid ""
-"There are no books here right now! Try searching for a book to get started"
+msgid "There are no books here right now! Try searching for a book to get started"
 msgstr "¡No hay ningún libro aqui ahorita! Busca a un libro para empezar"
 
 #: bookwyrm/templates/feed/feed_layout.html:24
@@ -1052,12 +1021,8 @@ msgid "Show this account in suggested users:"
 msgstr "Mostrar esta cuenta en los usuarios sugeridos:"
 
 #: bookwyrm/templates/get_started/profile.html:52
-msgid ""
-"Your account will show up in the directory, and may be recommended to other "
-"BookWyrm users."
-msgstr ""
-"Tu cuenta se aparecerá en el directorio, y puede ser recomendado a otros "
-"usuarios de BookWyrm."
+msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users."
+msgstr "Tu cuenta se aparecerá en el directorio, y puede ser recomendado a otros usuarios de BookWyrm."
 
 #: bookwyrm/templates/get_started/users.html:11
 msgid "Search for a user"
@@ -1080,12 +1045,8 @@ msgstr "Editar meta"
 #: bookwyrm/templates/goal.html:30
 #: bookwyrm/templates/snippets/goal_card.html:13
 #, python-format
-msgid ""
-"Set a goal for how many books you'll finish reading in %(year)s, and track "
-"your progress throughout the year."
-msgstr ""
-"Establece una meta para cuantos libros leerás en %(year)s, y seguir tu "
-"progreso durante el año."
+msgid "Set a goal for how many books you'll finish reading in %(year)s, and track your progress throughout the year."
+msgstr "Establece una meta para cuantos libros leerás en %(year)s, y seguir tu progreso durante el año."
 
 #: bookwyrm/templates/goal.html:39
 #, python-format
@@ -1167,12 +1128,8 @@ msgstr "No se pudo cargar"
 
 #: bookwyrm/templates/import_status.html:44
 #, python-format
-msgid ""
-"Jump to the bottom of the list to select the %(failed_count)s items which "
-"failed to import."
-msgstr ""
-"Saltar al final de la lista para seleccionar los %(failed_count)s artículos "
-"que no se pudieron importar."
+msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
+msgstr "Saltar al final de la lista para seleccionar los %(failed_count)s artículos que no se pudieron importar."
 
 #: bookwyrm/templates/import_status.html:79
 msgid "Select all"
@@ -1310,20 +1267,12 @@ msgstr "Documentación de Django"
 
 #: bookwyrm/templates/layout.html:213
 #, python-format
-msgid ""
-"Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">"
-"%(support_title)s</a>"
-msgstr ""
-"Apoyar %(site_name)s en <a href=\"%(support_link)s\" target=\"_blank\">"
-"%(support_title)s</a>"
+msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
+msgstr "Apoyar %(site_name)s en <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 
 #: bookwyrm/templates/layout.html:217
-msgid ""
-"BookWyrm is open source software. You can contribute or report issues on <a "
-"href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
-msgstr ""
-"BookWyrm es software de código abierto. Puedes contribuir o reportar "
-"problemas en <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgstr "BookWyrm es software de código abierto. Puedes contribuir o reportar problemas en <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
 #: bookwyrm/templates/lists/create_form.html:5
 #: bookwyrm/templates/lists/lists.html:20
@@ -1457,8 +1406,7 @@ msgstr "Borrar búsqueda"
 #: bookwyrm/templates/lists/list.html:135
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
-msgstr ""
-"No se encontró ningún libro correspondiente a la búsqueda: \"%(query)s\""
+msgstr "No se encontró ningún libro correspondiente a la búsqueda: \"%(query)s\""
 
 #: bookwyrm/templates/lists/list.html:163
 msgid "Suggest"
@@ -1502,7 +1450,7 @@ msgstr "Comentarios de moderador"
 
 #: bookwyrm/templates/moderation/report.html:41
 #: bookwyrm/templates/snippets/create_status.html:28
-#: bookwyrm/templates/snippets/create_status_form.html:53
+#: bookwyrm/templates/snippets/create_status_form.html:63
 msgid "Comment"
 msgstr "Comentario"
 
@@ -1526,8 +1474,7 @@ msgstr "Reportar @%(username)s"
 #: bookwyrm/templates/moderation/report_modal.html:23
 #, python-format
 msgid "This report will be sent to %(site_name)s's moderators for review."
-msgstr ""
-"Este informe se enviará a los moderadores de %(site_name)s para la revisión."
+msgstr "Este informe se enviará a los moderadores de %(site_name)s para la revisión."
 
 #: bookwyrm/templates/moderation/report_modal.html:24
 msgid "More info about this report:"
@@ -1580,29 +1527,18 @@ msgstr "Borrar notificaciones"
 
 #: bookwyrm/templates/notifications.html:53
 #, python-format
-msgid ""
-"favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</"
-"em></a>"
-msgstr ""
-"le gustó tu <a href=\"%(related_path)s\">reseña de <em>%(book_title)s</em></"
-"a>"
+msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "le gustó tu <a href=\"%(related_path)s\">reseña de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:55
 #, python-format
-msgid ""
-"favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</"
-"em></a>"
-msgstr ""
-"le gustó tu <a href=\"%(related_path)s\">comentario en <em>%(book_title)s</"
-"em></a>"
+msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
+msgstr "le gustó tu <a href=\"%(related_path)s\">comentario en <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:57
 #, python-format
-msgid ""
-"favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
-"em></a>"
-msgstr ""
-"le gustó tu <a href=\"%(related_path)s\">cita de <em>%(book_title)s</em></a>"
+msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr "le gustó tu <a href=\"%(related_path)s\">cita de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:59
 #, python-format
@@ -1611,30 +1547,18 @@ msgstr "le gustó tu <a href=\"%(related_path)s\">status</a>"
 
 #: bookwyrm/templates/notifications.html:64
 #, python-format
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">review of <em>"
-"%(book_title)s</em></a>"
-msgstr ""
-"te mencionó en una <a href=\"%(related_path)s\">reseña de <em>"
-"%(book_title)s</em></a>"
+msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "te mencionó en una <a href=\"%(related_path)s\">reseña de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:66
 #, python-format
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">comment on <em>"
-"%(book_title)s</em></a>"
-msgstr ""
-"te mencionó en un <a href=\"%(related_path)s\">comentario de <em>"
-"%(book_title)s</em></a>"
+msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
+msgstr "te mencionó en un <a href=\"%(related_path)s\">comentario de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:68
 #, python-format
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">quote from <em>"
-"%(book_title)s</em></a>"
-msgstr ""
-"te mencionó en una <a href=\"%(related_path)s\">cita de <em>%(book_title)s</"
-"em></a>"
+msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr "te mencionó en una <a href=\"%(related_path)s\">cita de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:70
 #, python-format
@@ -1643,39 +1567,23 @@ msgstr "te mencionó en un <a href=\"%(related_path)s\">status</a>"
 
 #: bookwyrm/templates/notifications.html:75
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">review of <em>%(book_title)s</em></a>"
-msgstr ""
-"<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s"
-"\">reseña de <em>%(book_title)s</em></a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">reseña de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:77
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">comment on <em>%(book_title)s</em></a>"
-msgstr ""
-"<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s"
-"\">comentario en <em>%(book_title)s</em></a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
+msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">comentario en <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:79
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">quote from <em>%(book_title)s</em></a>"
-msgstr ""
-"<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s"
-"\">cita de <em>%(book_title)s</em></a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">cita de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:81
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">status</a>"
-msgstr ""
-"<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s"
-"\">status</a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
+msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">status</a>"
 
 #: bookwyrm/templates/notifications.html:85
 msgid "followed you"
@@ -1687,29 +1595,18 @@ msgstr "te quiere seguir"
 
 #: bookwyrm/templates/notifications.html:94
 #, python-format
-msgid ""
-"boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></"
-"a>"
-msgstr ""
-"respaldó tu <a href=\"%(related_path)s\">reseña de <em>%(book_title)s</em></"
-"a>"
+msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "respaldó tu <a href=\"%(related_path)s\">reseña de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:96
 #, python-format
-msgid ""
-"boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></"
-"a>"
-msgstr ""
-"respaldó tu <a href=\"%(related_path)s\">comentario en<em>%(book_title)s</"
-"em></a>"
+msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+msgstr "respaldó tu <a href=\"%(related_path)s\">comentario en<em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:98
 #, python-format
-msgid ""
-"boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
-"em></a>"
-msgstr ""
-"respaldó tu<a href=\"%(related_path)s\">cita de <em>%(book_title)s</em></a>"
+msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr "respaldó tu<a href=\"%(related_path)s\">cita de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:100
 #, python-format
@@ -1718,21 +1615,13 @@ msgstr "respaldó tu <a href=\"%(related_path)s\">status</a>"
 
 #: bookwyrm/templates/notifications.html:104
 #, python-format
-msgid ""
-" added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
-"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
-msgstr ""
-" agregó <em><a href=\"%(book_path)s\">%(book_title)s</a></em> a tu lista "
-"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgstr " agregó <em><a href=\"%(book_path)s\">%(book_title)s</a></em> a tu lista \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 
 #: bookwyrm/templates/notifications.html:106
 #, python-format
-msgid ""
-" suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to "
-"your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
-msgstr ""
-" sugirió agregar <em><a href=\"%(book_path)s\">%(book_title)s</a></em> a tu "
-"lista \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgstr " sugirió agregar <em><a href=\"%(book_path)s\">%(book_title)s</a></em> a tu lista \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 
 #: bookwyrm/templates/notifications.html:110
 #, python-format
@@ -1755,9 +1644,7 @@ msgstr "Confirmar contraseña:"
 
 #: bookwyrm/templates/password_reset_request.html:14
 msgid "A link to reset your password will be sent to your email address"
-msgstr ""
-"Un enlace para restablecer tu contraseña se enviará a tu dirección de correo "
-"electrónico"
+msgstr "Un enlace para restablecer tu contraseña se enviará a tu dirección de correo electrónico"
 
 #: bookwyrm/templates/password_reset_request.html:28
 msgid "Reset password"
@@ -1795,12 +1682,8 @@ msgstr "Mostrar meta de lectura en el feed:"
 
 #: bookwyrm/templates/preferences/edit_user.html:62
 #, python-format
-msgid ""
-"Your account will show up in the <a href=\"%(path)s\">directory</a>, and may "
-"be recommended to other BookWyrm users."
-msgstr ""
-"Tu cuenta se aparecerá en el <a href=\"%(path)s\">directorio</a>, y puede "
-"ser recomendado a otros usuarios de BookWyrm."
+msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
+msgstr "Tu cuenta se aparecerá en el <a href=\"%(path)s\">directorio</a>, y puede ser recomendado a otros usuarios de BookWyrm."
 
 #: bookwyrm/templates/preferences/edit_user.html:65
 msgid "Preferred Timezone: "
@@ -1831,6 +1714,10 @@ msgid "Load results from other catalogues"
 msgstr "Mostrar resultados de otros catálogos"
 
 #: bookwyrm/templates/search/book.html:68
+msgid "Manually add book"
+msgstr ""
+
+#: bookwyrm/templates/search/book.html:73
 msgid "Log in to import or add books."
 msgstr ""
 
@@ -2231,7 +2118,7 @@ msgstr "Permitir solicitudes de invitación:"
 msgid "Registration closed text:"
 msgstr "Texto de registración cerrada:"
 
-#: bookwyrm/templates/snippets/book_cover.html:36
+#: bookwyrm/templates/snippets/book_cover.html:32
 msgid "No cover"
 msgstr "Sin portada"
 
@@ -2282,48 +2169,54 @@ msgstr "Cita:"
 msgid "Review:"
 msgstr "Reseña:"
 
-#: bookwyrm/templates/snippets/create_status_form.html:42
+#: bookwyrm/templates/snippets/create_status_form.html:53
 #: bookwyrm/templates/snippets/status/layout.html:30
 #: bookwyrm/templates/snippets/status/layout.html:48
 #: bookwyrm/templates/snippets/status/layout.html:49
 msgid "Reply"
 msgstr "Respuesta"
 
-#: bookwyrm/templates/snippets/create_status_form.html:67
+#: bookwyrm/templates/snippets/create_status_form.html:53
+#, fuzzy
+#| msgid "Footer Content"
+msgid "Content"
+msgstr "Contenido del pie de página"
+
+#: bookwyrm/templates/snippets/create_status_form.html:77
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
 msgid "Progress:"
 msgstr "Progreso:"
 
-#: bookwyrm/templates/snippets/create_status_form.html:75
+#: bookwyrm/templates/snippets/create_status_form.html:85
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr "páginas"
 
-#: bookwyrm/templates/snippets/create_status_form.html:76
+#: bookwyrm/templates/snippets/create_status_form.html:86
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr "por ciento"
 
-#: bookwyrm/templates/snippets/create_status_form.html:82
+#: bookwyrm/templates/snippets/create_status_form.html:92
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "de %(pages)s páginas"
 
-#: bookwyrm/templates/snippets/create_status_form.html:97
+#: bookwyrm/templates/snippets/create_status_form.html:107
 msgid "Include spoiler alert"
 msgstr "Incluir alerta de spoiler"
 
-#: bookwyrm/templates/snippets/create_status_form.html:104
+#: bookwyrm/templates/snippets/create_status_form.html:114
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:19
 msgid "Private"
 msgstr "Privada"
 
-#: bookwyrm/templates/snippets/create_status_form.html:115
+#: bookwyrm/templates/snippets/create_status_form.html:125
 msgid "Post"
 msgstr "Compartir"
 
@@ -2333,16 +2226,11 @@ msgstr "¿Eliminar estas fechas de lectura?"
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
 #, python-format
-msgid ""
-"You are deleting this readthrough and its %(count)s associated progress "
-"updates."
-msgstr ""
-"Estás eliminando esta lectura y sus %(count)s actualizaciones de progreso "
-"asociados."
+msgid "You are deleting this readthrough and its %(count)s associated progress updates."
+msgstr "Estás eliminando esta lectura y sus %(count)s actualizaciones de progreso asociados."
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
 #: bookwyrm/templates/snippets/follow_request_buttons.html:13
-#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:391
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -2404,27 +2292,17 @@ msgstr[1] "estableció una meta de leer %(counter)s libros en %(year)s"
 
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
 #, python-format
-msgid ""
-"Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
-msgid_plural ""
-"Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
-msgstr[0] ""
-"Reseño <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s "
-"estrella"
-msgstr[1] ""
-"Reseño <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s "
-"estrellas"
+msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
+msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
+msgstr[0] "Reseño <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s estrella"
+msgstr[1] "Reseño <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s estrellas"
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4
 #, python-format
-msgid ""
-"Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
-msgid_plural ""
-"Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
-msgstr[0] ""
-"Reseña de \"%(book_title)s\" (%(display_rating)s estrella): %(review_title)s"
-msgstr[1] ""
-"Reseña de \"%(book_title)s\" (%(display_rating)s estrellas): %(review_title)s"
+msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
+msgid_plural "Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
+msgstr[0] "Reseña de \"%(book_title)s\" (%(display_rating)s estrella): %(review_title)s"
+msgstr[1] "Reseña de \"%(book_title)s\" (%(display_rating)s estrellas): %(review_title)s"
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:8
 #, python-format
@@ -2433,12 +2311,8 @@ msgstr "Reseña de \"%(book_title)s\": %(review_title)s"
 
 #: bookwyrm/templates/snippets/goal_card.html:23
 #, python-format
-msgid ""
-"You can set or change your reading goal any time from your <a href=\"%(path)s"
-"\">profile page</a>"
-msgstr ""
-"Puedes establecer o cambiar tu meta de lectura en cualquier momento que "
-"desees desde tu <a href=\"%(path)s\">perfil</a>"
+msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
+msgstr "Puedes establecer o cambiar tu meta de lectura en cualquier momento que desees desde tu <a href=\"%(path)s\">perfil</a>"
 
 #: bookwyrm/templates/snippets/goal_form.html:9
 msgid "Reading goal:"
@@ -2470,19 +2344,13 @@ msgstr "%(percent)s%% terminado!"
 
 #: bookwyrm/templates/snippets/goal_progress.html:10
 #, python-format
-msgid ""
-"You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
-msgstr ""
-"Has leído <a href=\"%(path)s\">%(read_count)s de %(goal_count)s libros</a>."
+msgid "You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgstr "Has leído <a href=\"%(path)s\">%(read_count)s de %(goal_count)s libros</a>."
 
 #: bookwyrm/templates/snippets/goal_progress.html:12
 #, python-format
-msgid ""
-"%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s "
-"books</a>."
-msgstr ""
-"%(username)s ha leído <a href=\"%(path)s\">%(read_count)s de %(goal_count)s "
-"libros</a>."
+msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgstr "%(username)s ha leído <a href=\"%(path)s\">%(read_count)s de %(goal_count)s libros</a>."
 
 #: bookwyrm/templates/snippets/page_text.html:4
 #, python-format
@@ -2694,12 +2562,8 @@ msgstr "respaldó"
 
 #: bookwyrm/templates/snippets/status/status_header.html:44
 #, python-format
-msgid ""
-"replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
-"\"%(status_path)s\">status</a>"
-msgstr ""
-"respondió al <a href=\"%(status_path)s\">status</a> de <a href="
-"\"%(user_path)s\">%(username)s</a> "
+msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
+msgstr "respondió al <a href=\"%(status_path)s\">status</a> de <a href=\"%(user_path)s\">%(username)s</a> "
 
 #: bookwyrm/templates/snippets/status/status_options.html:7
 #: bookwyrm/templates/snippets/user_options.html:7
@@ -2937,1402 +2801,949 @@ msgstr "Nivel de acceso:"
 
 #: bookwyrm/views/password.py:32
 msgid "No user with that email address was found."
-msgstr ""
-"No se pudo encontrar un usuario con esa dirección de correo electrónico."
+msgstr "No se pudo encontrar un usuario con esa dirección de correo electrónico."
 
 #: bookwyrm/views/password.py:41
 #, python-format
 msgid "A password reset link sent to %s"
 msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 
-#: venv3/lib/python3.8/site-packages/_pytest/config/argparsing.py:442
 #, python-format
-msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr "opción ambiguo: %(option)s pudiera coincidir con %(matches)s"
+#~ msgid "ambiguous option: %(option)s could match %(matches)s"
+#~ msgstr "opción ambiguo: %(option)s pudiera coincidir con %(matches)s"
 
-#: venv3/lib/python3.8/site-packages/django/contrib/messages/apps.py:7
-msgid "Messages"
-msgstr "Mensajes"
+#~ msgid "Messages"
+#~ msgstr "Mensajes"
 
-#: venv3/lib/python3.8/site-packages/django/contrib/sitemaps/apps.py:7
-msgid "Site Maps"
-msgstr "Mapas de sitio"
+#~ msgid "Site Maps"
+#~ msgstr "Mapas de sitio"
 
-#: venv3/lib/python3.8/site-packages/django/contrib/staticfiles/apps.py:9
-msgid "Static Files"
-msgstr "Archivos estáticos"
+#~ msgid "Static Files"
+#~ msgstr "Archivos estáticos"
 
-#: venv3/lib/python3.8/site-packages/django/contrib/syndication/apps.py:7
-msgid "Syndication"
-msgstr "Sindicación"
+#~ msgid "Syndication"
+#~ msgstr "Sindicación"
 
-#: venv3/lib/python3.8/site-packages/django/core/paginator.py:45
-msgid "That page number is not an integer"
-msgstr "Ese numero de pagina no es un entero"
+#~ msgid "That page number is not an integer"
+#~ msgstr "Ese numero de pagina no es un entero"
 
-#: venv3/lib/python3.8/site-packages/django/core/paginator.py:47
-msgid "That page number is less than 1"
-msgstr "Ese numero de pagina es menos que uno"
+#~ msgid "That page number is less than 1"
+#~ msgstr "Ese numero de pagina es menos que uno"
 
-#: venv3/lib/python3.8/site-packages/django/core/paginator.py:52
-msgid "That page contains no results"
-msgstr "Esa pagina no contiene resultados"
+#~ msgid "That page contains no results"
+#~ msgstr "Esa pagina no contiene resultados"
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:32
-msgid "Enter a valid value."
-msgstr "Ingrese un valor válido."
+#~ msgid "Enter a valid value."
+#~ msgstr "Ingrese un valor válido."
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:103
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:659
-msgid "Enter a valid URL."
-msgstr "Ingrese una URL válida."
+#~ msgid "Enter a valid URL."
+#~ msgstr "Ingrese una URL válida."
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:155
-msgid "Enter a valid integer."
-msgstr "Ingrese un entero válido."
+#~ msgid "Enter a valid integer."
+#~ msgstr "Ingrese un entero válido."
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:166
-msgid "Enter a valid email address."
-msgstr "Ingrese una dirección de correo electrónico válida."
+#~ msgid "Enter a valid email address."
+#~ msgstr "Ingrese una dirección de correo electrónico válida."
 
-#. Translators: "letters" means latin letters: a-z and A-Z.
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:240
-msgid ""
-"Enter a valid “slug� consisting of letters, numbers, underscores or hyphens."
-msgstr ""
-"Ingrese un “slug� válido que consiste de letras, numeros, guiones bajos, o "
-"guiones"
+#~ msgid "Enter a valid “slug� consisting of letters, numbers, underscores or hyphens."
+#~ msgstr "Ingrese un “slug� válido que consiste de letras, numeros, guiones bajos, o guiones"
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:247
-msgid ""
-"Enter a valid “slug� consisting of Unicode letters, numbers, underscores, or "
-"hyphens."
-msgstr ""
-"Ingrese un “slug� válido que consiste de letras Unicode, numeros, guiones "
-"bajos, o guiones"
+#~ msgid "Enter a valid “slug� consisting of Unicode letters, numbers, underscores, or hyphens."
+#~ msgstr "Ingrese un “slug� válido que consiste de letras Unicode, numeros, guiones bajos, o guiones"
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:256
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:276
-msgid "Enter a valid IPv4 address."
-msgstr "Ingrese una dirección IPv4 válida."
+#~ msgid "Enter a valid IPv4 address."
+#~ msgstr "Ingrese una dirección IPv4 válida."
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:261
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:277
-msgid "Enter a valid IPv6 address."
-msgstr "Ingrese una dirección IPv6 válida."
+#~ msgid "Enter a valid IPv6 address."
+#~ msgstr "Ingrese una dirección IPv6 válida."
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:271
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:275
-msgid "Enter a valid IPv4 or IPv6 address."
-msgstr "Ingrese una dirección IPv4 o IPv6 válida."
+#~ msgid "Enter a valid IPv4 or IPv6 address."
+#~ msgstr "Ingrese una dirección IPv4 o IPv6 válida."
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:305
-msgid "Enter only digits separated by commas."
-msgstr "Ingrese solo digitos separados por comas."
+#~ msgid "Enter only digits separated by commas."
+#~ msgstr "Ingrese solo digitos separados por comas."
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:311
 #, python-format
-msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
-msgstr "Asegura que este valor es %(limit_value)s (es %(show_value)s)."
+#~ msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
+#~ msgstr "Asegura que este valor es %(limit_value)s (es %(show_value)s)."
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:343
 #, python-format
-msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr "Asegura que este valor es menor que o iguala a %(limit_value)s."
+#~ msgid "Ensure this value is less than or equal to %(limit_value)s."
+#~ msgstr "Asegura que este valor es menor que o iguala a %(limit_value)s."
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:352
 #, python-format
-msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr "Asegura que este valor es más que o que iguala a %(limit_value)s."
+#~ msgid "Ensure this value is greater than or equal to %(limit_value)s."
+#~ msgstr "Asegura que este valor es más que o que iguala a %(limit_value)s."
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:362
 #, python-format
-msgid ""
-"Ensure this value has at least %(limit_value)d character (it has "
-"%(show_value)d)."
-msgid_plural ""
-"Ensure this value has at least %(limit_value)d characters (it has "
-"%(show_value)d)."
-msgstr[0] ""
-"Verifica que este valor tiene por lo menos %(limit_value)d carácter. (Tiene "
-"%(show_value)d).)"
-msgstr[1] ""
-"Verifica que este valor tiene por lo menos %(limit_value)d caracteres. "
-"(Tiene %(show_value)d).)"
+#~ msgid "Ensure this value has at least %(limit_value)d character (it has %(show_value)d)."
+#~ msgid_plural "Ensure this value has at least %(limit_value)d characters (it has %(show_value)d)."
+#~ msgstr[0] "Verifica que este valor tiene por lo menos %(limit_value)d carácter. (Tiene %(show_value)d).)"
+#~ msgstr[1] "Verifica que este valor tiene por lo menos %(limit_value)d caracteres. (Tiene %(show_value)d).)"
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:377
 #, python-format
-msgid ""
-"Ensure this value has at most %(limit_value)d character (it has "
-"%(show_value)d)."
-msgid_plural ""
-"Ensure this value has at most %(limit_value)d characters (it has "
-"%(show_value)d)."
-msgstr[0] ""
-"Verifica que este valor tiene a lo sumo %(limit_value)d carácter. (Tiene "
-"%(show_value)d).)"
-msgstr[1] ""
-"Verifica que este valor tiene a lo sumo %(limit_value)d caracteres. (Tiene "
-"%(show_value)d).)"
+#~ msgid "Ensure this value has at most %(limit_value)d character (it has %(show_value)d)."
+#~ msgid_plural "Ensure this value has at most %(limit_value)d characters (it has %(show_value)d)."
+#~ msgstr[0] "Verifica que este valor tiene a lo sumo %(limit_value)d carácter. (Tiene %(show_value)d).)"
+#~ msgstr[1] "Verifica que este valor tiene a lo sumo %(limit_value)d caracteres. (Tiene %(show_value)d).)"
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:396
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:291
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:326
-msgid "Enter a number."
-msgstr "Ingrese un número."
+#~ msgid "Enter a number."
+#~ msgstr "Ingrese un número."
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:398
 #, python-format
-msgid "Ensure that there are no more than %(max)s digit in total."
-msgid_plural "Ensure that there are no more than %(max)s digits in total."
-msgstr[0] "Verifica que no hay más que %(max)s digito en total."
-msgstr[1] "Verifica que no hay más que %(max)s digitos en total."
+#~ msgid "Ensure that there are no more than %(max)s digit in total."
+#~ msgid_plural "Ensure that there are no more than %(max)s digits in total."
+#~ msgstr[0] "Verifica que no hay más que %(max)s digito en total."
+#~ msgstr[1] "Verifica que no hay más que %(max)s digitos en total."
 
 #                         is 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:403
 #, python-format
-msgid "Ensure that there are no more than %(max)s decimal place."
-msgid_plural "Ensure that there are no more than %(max)s decimal places."
-msgstr[0] "Verifica que no hay más que %(max)s cifra decimal."
-msgstr[1] "Verifica que no hay más que %(max)s cifras decimales."
+#~ msgid "Ensure that there are no more than %(max)s decimal place."
+#~ msgid_plural "Ensure that there are no more than %(max)s decimal places."
+#~ msgstr[0] "Verifica que no hay más que %(max)s cifra decimal."
+#~ msgstr[1] "Verifica que no hay más que %(max)s cifras decimales."
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:408
 #, python-format
-msgid ""
-"Ensure that there are no more than %(max)s digit before the decimal point."
-msgid_plural ""
-"Ensure that there are no more than %(max)s digits before the decimal point."
-msgstr[0] ""
-"Verifica que no hay más que %(max)s digito antes de la coma decimal."
-msgstr[1] ""
-"Verifica que no hay más que %(max)s digitos antes de la coma decimal."
+#~ msgid "Ensure that there are no more than %(max)s digit before the decimal point."
+#~ msgid_plural "Ensure that there are no more than %(max)s digits before the decimal point."
+#~ msgstr[0] "Verifica que no hay más que %(max)s digito antes de la coma decimal."
+#~ msgstr[1] "Verifica que no hay más que %(max)s digitos antes de la coma decimal."
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:470
 #, python-format
-msgid ""
-"File extension “%(extension)s� is not allowed. Allowed extensions are: "
-"%(allowed_extensions)s."
-msgstr ""
-"No se permite la extensión de archivo “%(extension)s�. Extensiones "
-"permitidas son: %(allowed_extensions)s."
+#~ msgid "File extension “%(extension)s� is not allowed. Allowed extensions are: %(allowed_extensions)s."
+#~ msgstr "No se permite la extensión de archivo “%(extension)s�. Extensiones permitidas son: %(allowed_extensions)s."
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:522
-msgid "Null characters are not allowed."
-msgstr "No se permiten caracteres nulos"
+#~ msgid "Null characters are not allowed."
+#~ msgstr "No se permiten caracteres nulos"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/base.py:1181
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:759
-msgid "and"
-msgstr "y"
+#~ msgid "and"
+#~ msgstr "y"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/base.py:1183
 #, python-format
-msgid "%(model_name)s with this %(field_labels)s already exists."
-msgstr "Ya existe %(model_name)s con este %(field_labels)s."
+#~ msgid "%(model_name)s with this %(field_labels)s already exists."
+#~ msgstr "Ya existe %(model_name)s con este %(field_labels)s."
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:104
 #, python-format
-msgid "Value %(value)r is not a valid choice."
-msgstr "El valor %(value)s no es una opción válida."
+#~ msgid "Value %(value)r is not a valid choice."
+#~ msgstr "El valor %(value)s no es una opción válida."
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:105
-msgid "This field cannot be null."
-msgstr "Este campo no puede ser nulo."
+#~ msgid "This field cannot be null."
+#~ msgstr "Este campo no puede ser nulo."
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:106
-msgid "This field cannot be blank."
-msgstr "Este campo no puede ser vacio."
+#~ msgid "This field cannot be blank."
+#~ msgstr "Este campo no puede ser vacio."
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:107
 #, fuzzy, python-format
-#| msgid "%(model_name)s with this %(field_label)s already exists."
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "Ya existe %(model_name)s con este %(field_labels)s."
+#~| msgid "%(model_name)s with this %(field_label)s already exists."
+#~ msgid "%(model_name)s with this %(field_label)s already exists."
+#~ msgstr "Ya existe %(model_name)s con este %(field_labels)s."
 
-#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
-#. Eg: "Title must be unique for pub_date year"
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:111
 #, python-format
-msgid ""
-"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
-msgstr ""
-"%(field_label)s deben ser unicos por %(date_field_label)s %(lookup_type)s."
+#~ msgid "%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+#~ msgstr "%(field_label)s deben ser unicos por %(date_field_label)s %(lookup_type)s."
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:130
 #, python-format
-msgid "Field of type: %(field_type)s"
-msgstr "Campo de tipo: %(field_type)s"
+#~ msgid "Field of type: %(field_type)s"
+#~ msgstr "Campo de tipo: %(field_type)s"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:937
 #, python-format
-msgid "“%(value)s� value must be either True or False."
-msgstr "“%(value)s� valor debe ser o verdadero o falso."
+#~ msgid "“%(value)s� value must be either True or False."
+#~ msgstr "“%(value)s� valor debe ser o verdadero o falso."
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:938
 #, python-format
-msgid "“%(value)s� value must be either True, False, or None."
-msgstr "%(value)s� valor debe ser o True, False, o None."
+#~ msgid "“%(value)s� value must be either True, False, or None."
+#~ msgstr "%(value)s� valor debe ser o True, False, o None."
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:940
-msgid "Boolean (Either True or False)"
-msgstr "Booleano (O True O False)"
+#~ msgid "Boolean (Either True or False)"
+#~ msgstr "Booleano (O True O False)"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:981
 #, python-format
-msgid "String (up to %(max_length)s)"
-msgstr "Cadena (máximo de %(max_length)s caracteres)"
+#~ msgid "String (up to %(max_length)s)"
+#~ msgstr "Cadena (máximo de %(max_length)s caracteres)"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1045
-msgid "Comma-separated integers"
-msgstr "Enteros separados por comas"
+#~ msgid "Comma-separated integers"
+#~ msgstr "Enteros separados por comas"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1094
 #, python-format
-msgid ""
-"“%(value)s� value has an invalid date format. It must be in YYYY-MM-DD "
-"format."
-msgstr ""
-"“%(value)s� valor tiene un formato de fecha inválido. Hay que estar de "
-"formato YYYY-MM-DD."
+#~ msgid "“%(value)s� value has an invalid date format. It must be in YYYY-MM-DD format."
+#~ msgstr "“%(value)s� valor tiene un formato de fecha inválido. Hay que estar de formato YYYY-MM-DD."
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1096
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1239
 #, python-format
-msgid ""
-"“%(value)s� value has the correct format (YYYY-MM-DD) but it is an invalid "
-"date."
-msgstr ""
-"“%(value)s� valor tiene el formato correcto (YYYY-MM-DD) pero la fecha es "
-"invalida."
+#~ msgid "“%(value)s� value has the correct format (YYYY-MM-DD) but it is an invalid date."
+#~ msgstr "“%(value)s� valor tiene el formato correcto (YYYY-MM-DD) pero la fecha es invalida."
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1099
-msgid "Date (without time)"
-msgstr "Fecha (sin la hora)"
+#~ msgid "Date (without time)"
+#~ msgstr "Fecha (sin la hora)"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1237
 #, python-format
-msgid ""
-"“%(value)s� value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
-"uuuuuu]][TZ] format."
-msgstr ""
-"“%(value)s� valor tiene un formato invalido. Debe estar en formato YYYY-MM-"
-"DD HH:MM[:ss[.uuuuuu]][TZ]."
+#~ msgid "“%(value)s� value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ] format."
+#~ msgstr "“%(value)s� valor tiene un formato invalido. Debe estar en formato YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]."
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1241
 #, python-format
-msgid ""
-"“%(value)s� value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
-"[TZ]) but it is an invalid date/time."
-msgstr ""
-"“%(value)s� valor tiene el formato correcto (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
-"[TZ]) pero es una fecha/hora invalida."
+#~ msgid "“%(value)s� value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but it is an invalid date/time."
+#~ msgstr "“%(value)s� valor tiene el formato correcto (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) pero es una fecha/hora invalida."
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1245
-msgid "Date (with time)"
-msgstr "Fecha (con la hora)"
+#~ msgid "Date (with time)"
+#~ msgstr "Fecha (con la hora)"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1393
 #, python-format
-msgid "“%(value)s� value must be a decimal number."
-msgstr "El valor de “%(value)s� debe ser un número decimal."
+#~ msgid "“%(value)s� value must be a decimal number."
+#~ msgstr "El valor de “%(value)s� debe ser un número decimal."
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1395
-msgid "Decimal number"
-msgstr "Número decimal"
+#~ msgid "Decimal number"
+#~ msgstr "Número decimal"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1534
 #, python-format
-msgid ""
-"“%(value)s� value has an invalid format. It must be in [DD] [[HH:]MM:]ss[."
-"uuuuuu] format."
-msgstr ""
-"“%(value)s� valor tiene un formato invalido. Debe estar en formato [DD] "
-"[[HH:]MM:]ss[.uuuuuu]."
+#~ msgid "“%(value)s� value has an invalid format. It must be in [DD] [[HH:]MM:]ss[.uuuuuu] format."
+#~ msgstr "“%(value)s� valor tiene un formato invalido. Debe estar en formato [DD] [[HH:]MM:]ss[.uuuuuu]."
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1537
-msgid "Duration"
-msgstr "Duración"
+#~ msgid "Duration"
+#~ msgstr "Duración"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1587
-msgid "Email address"
-msgstr "Dirección de correo electrónico"
+#~ msgid "Email address"
+#~ msgstr "Dirección de correo electrónico"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1610
-msgid "File path"
-msgstr "Ruta de archivo"
+#~ msgid "File path"
+#~ msgstr "Ruta de archivo"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1676
 #, python-format
-msgid "“%(value)s� value must be a float."
-msgstr "%(value)s no es un usuario válido"
+#~ msgid "“%(value)s� value must be a float."
+#~ msgstr "%(value)s no es un usuario válido"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1678
-msgid "Floating point number"
-msgstr "Número de coma flotante"
+#~ msgid "Floating point number"
+#~ msgstr "Número de coma flotante"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1716
 #, python-format
-msgid "“%(value)s� value must be an integer."
-msgstr "“%(value)s� valor debe ser un entero."
+#~ msgid "“%(value)s� value must be an integer."
+#~ msgstr "“%(value)s� valor debe ser un entero."
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1718
-msgid "Integer"
-msgstr "Entero"
+#~ msgid "Integer"
+#~ msgstr "Entero"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1801
-msgid "Big (8 byte) integer"
-msgstr "Entero grande (8 byte)"
+#~ msgid "Big (8 byte) integer"
+#~ msgstr "Entero grande (8 byte)"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1817
-msgid "IPv4 address"
-msgstr "Dirección IPv4"
+#~ msgid "IPv4 address"
+#~ msgstr "Dirección IPv4"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1848
-msgid "IP address"
-msgstr "Dirección IP"
+#~ msgid "IP address"
+#~ msgstr "Dirección IP"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1928
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1929
 #, python-format
-msgid "“%(value)s� value must be either None, True or False."
-msgstr "Valor “%(value)s� debe ser o None, True, o False."
+#~ msgid "“%(value)s� value must be either None, True or False."
+#~ msgstr "Valor “%(value)s� debe ser o None, True, o False."
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1931
-msgid "Boolean (Either True, False or None)"
-msgstr "Booleano (O True, Falso, o None)"
+#~ msgid "Boolean (Either True, False or None)"
+#~ msgstr "Booleano (O True, Falso, o None)"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1966
-msgid "Positive integer"
-msgstr "Entero positivo"
+#~ msgid "Positive integer"
+#~ msgstr "Entero positivo"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1979
-msgid "Positive small integer"
-msgstr "Entero positivo pequeño "
+#~ msgid "Positive small integer"
+#~ msgstr "Entero positivo pequeño "
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1993
 #, python-format
-msgid "Slug (up to %(max_length)s)"
-msgstr "Slug (máximo de %(max_length)s)"
+#~ msgid "Slug (up to %(max_length)s)"
+#~ msgstr "Slug (máximo de %(max_length)s)"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2025
-msgid "Small integer"
-msgstr "Entero pequeño"
+#~ msgid "Small integer"
+#~ msgstr "Entero pequeño"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2032
-msgid "Text"
-msgstr "Texto"
+#~ msgid "Text"
+#~ msgstr "Texto"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2060
 #, python-format
-msgid ""
-"“%(value)s� value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
-"format."
-msgstr ""
-"“%(value)s� valor tiene un formato invalido. Debe estar en formato HH:MM[:"
-"ss[.uuuuuu]]."
+#~ msgid "“%(value)s� value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+#~ msgstr "“%(value)s� valor tiene un formato invalido. Debe estar en formato HH:MM[:ss[.uuuuuu]]."
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2062
 #, python-format
-msgid ""
-"“%(value)s� value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
-"invalid time."
-msgstr ""
-"“%(value)s� valor tiene el formato correcto (HH:MM[:ss[.uuuuuu]]) pero es "
-"una hora invalida."
+#~ msgid "“%(value)s� value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid time."
+#~ msgstr "“%(value)s� valor tiene el formato correcto (HH:MM[:ss[.uuuuuu]]) pero es una hora invalida."
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2065
-msgid "Time"
-msgstr "Tiempo"
+#~ msgid "Time"
+#~ msgstr "Tiempo"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2191
-msgid "URL"
-msgstr "URL"
+#~ msgid "URL"
+#~ msgstr "URL"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2213
-msgid "Raw binary data"
-msgstr "Datos binarios sin procesar"
+#~ msgid "Raw binary data"
+#~ msgstr "Datos binarios sin procesar"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2278
 #, python-format
-msgid "“%(value)s� is not a valid UUID."
-msgstr "%(value)s no es una UUID válida."
+#~ msgid "“%(value)s� is not a valid UUID."
+#~ msgstr "%(value)s no es una UUID válida."
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2280
-msgid "Universally unique identifier"
-msgstr "Identificador universalmente único"
+#~ msgid "Universally unique identifier"
+#~ msgstr "Identificador universalmente único"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/files.py:221
-msgid "File"
-msgstr "Archivo"
+#~ msgid "File"
+#~ msgstr "Archivo"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/files.py:360
-msgid "Image"
-msgstr "Imágen"
+#~ msgid "Image"
+#~ msgstr "Imágen"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:778
 #, python-format
-msgid "%(model)s instance with %(field)s %(value)r does not exist."
-msgstr "%(model)s instancia con %(field)s %(value)r no existe."
+#~ msgid "%(model)s instance with %(field)s %(value)r does not exist."
+#~ msgstr "%(model)s instancia con %(field)s %(value)r no existe."
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:780
-msgid "Foreign Key (type determined by related field)"
-msgstr "Clave externa (tipo determinado por campo relacionado)"
+#~ msgid "Foreign Key (type determined by related field)"
+#~ msgstr "Clave externa (tipo determinado por campo relacionado)"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1012
-msgid "One-to-one relationship"
-msgstr "Relación uno-a-uno"
+#~ msgid "One-to-one relationship"
+#~ msgstr "Relación uno-a-uno"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1066
 #, python-format
-msgid "%(from)s-%(to)s relationship"
-msgstr "relación %(from)s-%(to)s"
+#~ msgid "%(from)s-%(to)s relationship"
+#~ msgstr "relación %(from)s-%(to)s"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1067
 #, python-format
-msgid "%(from)s-%(to)s relationships"
-msgstr "relaciones %(from)s-%(to)s"
+#~ msgid "%(from)s-%(to)s relationships"
+#~ msgstr "relaciones %(from)s-%(to)s"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1109
-msgid "Many-to-many relationship"
-msgstr "Relaciones mucho-a-mucho"
+#~ msgid "Many-to-many relationship"
+#~ msgstr "Relaciones mucho-a-mucho"
 
-#. Translators: If found as last label character, these punctuation
-#. characters will prevent the default label_suffix to be appended to the label
-#: venv3/lib/python3.8/site-packages/django/forms/boundfield.py:149
-msgid ":?.!"
-msgstr ""
+#~ msgid "This field is required."
+#~ msgstr "Este campo es requerido."
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:53
-msgid "This field is required."
-msgstr "Este campo es requerido."
+#~ msgid "Enter a whole number."
+#~ msgstr "Ingrese un número entero."
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:246
-msgid "Enter a whole number."
-msgstr "Ingrese un número entero."
+#~ msgid "Enter a valid date."
+#~ msgstr "Ingrese una fecha válida."
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:397
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:1127
-msgid "Enter a valid date."
-msgstr "Ingrese una fecha válida."
+#~ msgid "Enter a valid time."
+#~ msgstr "Ingrese una hora válida."
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:421
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:1128
-msgid "Enter a valid time."
-msgstr "Ingrese una hora válida."
+#~ msgid "Enter a valid date/time."
+#~ msgstr "Ingrese una fecha/hora válida."
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:443
-msgid "Enter a valid date/time."
-msgstr "Ingrese una fecha/hora válida."
+#~ msgid "Enter a valid duration."
+#~ msgstr "Ingrese una duración válida."
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:472
-msgid "Enter a valid duration."
-msgstr "Ingrese una duración válida."
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:473
 #, python-brace-format
-msgid "The number of days must be between {min_days} and {max_days}."
-msgstr "El número de dias debe ser entre {min_days} y {max_days}."
+#~ msgid "The number of days must be between {min_days} and {max_days}."
+#~ msgstr "El número de dias debe ser entre {min_days} y {max_days}."
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:533
-msgid "No file was submitted. Check the encoding type on the form."
-msgstr ""
-"No se aceptó ningun archivo. Verfica el tipo de codificación en el "
-"formulario."
+#~ msgid "No file was submitted. Check the encoding type on the form."
+#~ msgstr "No se aceptó ningun archivo. Verfica el tipo de codificación en el formulario."
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:534
-msgid "No file was submitted."
-msgstr "No se aceptó ningun archivo."
+#~ msgid "No file was submitted."
+#~ msgstr "No se aceptó ningun archivo."
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:535
-msgid "The submitted file is empty."
-msgstr "El archivo enviado está vacio."
+#~ msgid "The submitted file is empty."
+#~ msgstr "El archivo enviado está vacio."
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:537
 #, python-format
-msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
-msgid_plural ""
-"Ensure this filename has at most %(max)d characters (it has %(length)d)."
-msgstr[0] ""
-"Verifica que este nombre de archivo no tiene más que %(max)d carácter. "
-"(Tiene %(length)d)."
-msgstr[1] ""
-"Verifica que este nombre de archivo no tiene más que %(max)d caracteres. "
-"(Tiene %(length)d)."
+#~ msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
+#~ msgid_plural "Ensure this filename has at most %(max)d characters (it has %(length)d)."
+#~ msgstr[0] "Verifica que este nombre de archivo no tiene más que %(max)d carácter. (Tiene %(length)d)."
+#~ msgstr[1] "Verifica que este nombre de archivo no tiene más que %(max)d caracteres. (Tiene %(length)d)."
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:540
-msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr "Por favor, o envia un archivo o marca la casilla vacia, no los dos."
+#~ msgid "Please either submit a file or check the clear checkbox, not both."
+#~ msgstr "Por favor, o envia un archivo o marca la casilla vacia, no los dos."
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:601
-msgid ""
-"Upload a valid image. The file you uploaded was either not an image or a "
-"corrupted image."
-msgstr ""
-"Subir una imagen válida. El archivo que subiste o no fue imagen o fue "
-"corrupto."
+#~ msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
+#~ msgstr "Subir una imagen válida. El archivo que subiste o no fue imagen o fue corrupto."
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:763
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:853
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:1275
 #, python-format
-msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr ""
-"Selecciona una opción válida. %(value)s no es una de las opciones "
-"disponibles."
+#~ msgid "Select a valid choice. %(value)s is not one of the available choices."
+#~ msgstr "Selecciona una opción válida. %(value)s no es una de las opciones disponibles."
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:854
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:969
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:1274
-msgid "Enter a list of values."
-msgstr "Ingrese una lista de valores."
+#~ msgid "Enter a list of values."
+#~ msgstr "Ingrese una lista de valores."
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:970
-msgid "Enter a complete value."
-msgstr "Ingresa un valor completo."
+#~ msgid "Enter a complete value."
+#~ msgstr "Ingresa un valor completo."
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:1186
-msgid "Enter a valid UUID."
-msgstr "Ingrese una UUID válida."
+#~ msgid "Enter a valid UUID."
+#~ msgstr "Ingrese una UUID válida."
 
-#. Translators: This is the default suffix added to form field labels
-#: venv3/lib/python3.8/site-packages/django/forms/forms.py:81
-msgid ":"
-msgstr ":"
+#~ msgid ":"
+#~ msgstr ":"
 
-#: venv3/lib/python3.8/site-packages/django/forms/forms.py:207
 #, python-format
-msgid "(Hidden field %(name)s) %(error)s"
-msgstr "(Campo oculto %(name)s) %(error)s"
+#~ msgid "(Hidden field %(name)s) %(error)s"
+#~ msgstr "(Campo oculto %(name)s) %(error)s"
 
-#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:93
-msgid "ManagementForm data is missing or has been tampered with"
-msgstr "Datos de ManagementForm está ausento o ha sido corrompido"
+#~ msgid "ManagementForm data is missing or has been tampered with"
+#~ msgstr "Datos de ManagementForm está ausento o ha sido corrompido"
 
-#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:345
 #, python-format
-msgid "Please submit %d or fewer forms."
-msgid_plural "Please submit %d or fewer forms."
-msgstr[0] "Por favor, enviar %d o menos formularios."
-msgstr[1] "Por favor, enviar %d o menos formularios."
+#~ msgid "Please submit %d or fewer forms."
+#~ msgid_plural "Please submit %d or fewer forms."
+#~ msgstr[0] "Por favor, enviar %d o menos formularios."
+#~ msgstr[1] "Por favor, enviar %d o menos formularios."
 
-#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:352
 #, python-format
-msgid "Please submit %d or more forms."
-msgid_plural "Please submit %d or more forms."
-msgstr[0] "Por favor, enviar %d o más formularios."
-msgstr[1] "Por favor, enviar %d o más formularios."
+#~ msgid "Please submit %d or more forms."
+#~ msgid_plural "Please submit %d or more forms."
+#~ msgstr[0] "Por favor, enviar %d o más formularios."
+#~ msgstr[1] "Por favor, enviar %d o más formularios."
 
 # TODO cc @mouse is this a verb or noun
-#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:379
-#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:386
 #, fuzzy
-msgid "Order"
-msgstr "Pedir"
+#~ msgid "Order"
+#~ msgstr "Pedir"
 
 # if verb 
 # msgstr "Pedido" # if noun
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:754
 #, python-format
-msgid "Please correct the duplicate data for %(field)s."
-msgstr "Por favor corrige los datos duplicados en %(field)s."
+#~ msgid "Please correct the duplicate data for %(field)s."
+#~ msgstr "Por favor corrige los datos duplicados en %(field)s."
 
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:758
 #, python-format
-msgid "Please correct the duplicate data for %(field)s, which must be unique."
-msgstr ""
-"Por favor corrige los datos duplicados en %(field)s, los cuales deben ser "
-"unicos."
+#~ msgid "Please correct the duplicate data for %(field)s, which must be unique."
+#~ msgstr "Por favor corrige los datos duplicados en %(field)s, los cuales deben ser unicos."
 
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:764
 #, python-format
-msgid ""
-"Please correct the duplicate data for %(field_name)s which must be unique "
-"for the %(lookup)s in %(date_field)s."
-msgstr ""
-"Por favor corrige los datos duplicados en %(field_name)s los cuales deben "
-"ser unicos por el %(lookup)s en %(date_field)s."
+#~ msgid "Please correct the duplicate data for %(field_name)s which must be unique for the %(lookup)s in %(date_field)s."
+#~ msgstr "Por favor corrige los datos duplicados en %(field_name)s los cuales deben ser unicos por el %(lookup)s en %(date_field)s."
 
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:773
-msgid "Please correct the duplicate values below."
-msgstr "Por favor corrige los valores duplicados a continuación."
+#~ msgid "Please correct the duplicate values below."
+#~ msgstr "Por favor corrige los valores duplicados a continuación."
 
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:1094
-msgid "The inline value did not match the parent instance."
-msgstr "El valor en línea no empareja la instancia progenitor."
+#~ msgid "The inline value did not match the parent instance."
+#~ msgstr "El valor en línea no empareja la instancia progenitor."
 
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:1161
-msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr ""
-"Selecciona una opción válida. Esa opción no es una de las opciones "
-"disponibles."
+#~ msgid "Select a valid choice. That choice is not one of the available choices."
+#~ msgstr "Selecciona una opción válida. Esa opción no es una de las opciones disponibles."
 
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:1277
 #, python-format
-msgid "“%(pk)s� is not a valid value."
-msgstr "“%(pk)s� no es un valor válido."
+#~ msgid "“%(pk)s� is not a valid value."
+#~ msgstr "“%(pk)s� no es un valor válido."
 
-#: venv3/lib/python3.8/site-packages/django/forms/utils.py:162
 #, python-format
-msgid ""
-"%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it "
-"may be ambiguous or it may not exist."
-msgstr ""
-"%(datetime)s no se pudo interpretar en la zona horaria %(current_timezone)s; "
-"puede ser ambiguo o puede que no exista."
+#~ msgid "%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it may be ambiguous or it may not exist."
+#~ msgstr "%(datetime)s no se pudo interpretar en la zona horaria %(current_timezone)s; puede ser ambiguo o puede que no exista."
 
-#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:395
-msgid "Clear"
-msgstr "Borrar"
+#~ msgid "Clear"
+#~ msgstr "Borrar"
 
-#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:396
-msgid "Currently"
-msgstr "Actualmente"
+#~ msgid "Currently"
+#~ msgstr "Actualmente"
 
-#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:397
-msgid "Change"
-msgstr "Cambiar"
+#~ msgid "Change"
+#~ msgstr "Cambiar"
 
-#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:709
-msgid "Unknown"
-msgstr "Desconocido"
+#~ msgid "Unknown"
+#~ msgstr "Desconocido"
 
-#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:710
-msgid "Yes"
-msgstr "Sí"
+#~ msgid "Yes"
+#~ msgstr "Sí"
 
-#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:711
-msgid "No"
-msgstr "No"
+#~ msgid "No"
+#~ msgstr "No"
 
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:788
-msgid "yes,no,maybe"
-msgstr "sí,no,quizás"
+#~ msgid "yes,no,maybe"
+#~ msgstr "sí,no,quizás"
 
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:817
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:834
 #, python-format
-msgid "%(size)d byte"
-msgid_plural "%(size)d bytes"
-msgstr[0] "%(size)d byte"
-msgstr[1] "%(size)d bytes"
+#~ msgid "%(size)d byte"
+#~ msgid_plural "%(size)d bytes"
+#~ msgstr[0] "%(size)d byte"
+#~ msgstr[1] "%(size)d bytes"
 
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:836
 #, python-format
-msgid "%s KB"
-msgstr "%s KB"
+#~ msgid "%s KB"
+#~ msgstr "%s KB"
 
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:838
 #, python-format
-msgid "%s MB"
-msgstr "%s MB"
+#~ msgid "%s MB"
+#~ msgstr "%s MB"
 
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:840
 #, python-format
-msgid "%s GB"
-msgstr "%s GB"
+#~ msgid "%s GB"
+#~ msgstr "%s GB"
 
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:842
 #, python-format
-msgid "%s TB"
-msgstr "%s TB"
+#~ msgid "%s TB"
+#~ msgstr "%s TB"
 
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:844
 #, python-format
-msgid "%s PB"
-msgstr "%s PB"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:62
-msgid "p.m."
-msgstr "p.m."
-
-#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:63
-msgid "a.m."
-msgstr "a.m."
-
-#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:68
-msgid "PM"
-msgstr "PM"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:69
-msgid "AM"
-msgstr "AM"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:150
-msgid "midnight"
-msgstr "medianoche"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:152
-msgid "noon"
-msgstr "mediodia"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:295
-msgid "Monday"
-msgstr "Lunes"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:296
-msgid "Tuesday"
-msgstr "Martes"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:297
-msgid "Wednesday"
-msgstr "Miercoles"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:298
-msgid "Thursday"
-msgstr "Jueves"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:299
-msgid "Friday"
-msgstr "Viernes"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:7
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:300
-msgid "Saturday"
-msgstr "Sábado"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:7
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:301
-msgid "Sunday"
-msgstr "Domino"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
-msgid "Mon"
-msgstr "Lun"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
-msgid "Tue"
-msgstr "Mar"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
-msgid "Wed"
-msgstr "Mie"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
-msgid "Thu"
-msgstr "Jue"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
-msgid "Fri"
-msgstr "Vie"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:11
-msgid "Sat"
-msgstr "Sáb"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:11
-msgid "Sun"
-msgstr "Dom"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:281
-msgid "January"
-msgstr "Enero"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:282
-msgid "February"
-msgstr "Febrero"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:283
-msgid "March"
-msgstr "Marzo"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:284
-msgid "April"
-msgstr "Abril"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:285
-msgid "May"
-msgstr "Mayo"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:286
-msgid "June"
-msgstr "Junio"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:287
-msgid "July"
-msgstr "Julio"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:288
-msgid "August"
-msgstr "Agosto"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:289
-msgid "September"
-msgstr "Septiembre"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:290
-msgid "October"
-msgstr "Octubre"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:291
-msgid "November"
-msgstr "Noviembre"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:16
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:292
-msgid "December"
-msgstr "Diciembre"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "jan"
-msgstr "ene"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "feb"
-msgstr "feb"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "mar"
-msgstr "mar"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "apr"
-msgstr "abr"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "may"
-msgstr "may"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "jun"
-msgstr "jun"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "jul"
-msgstr "jul"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "aug"
-msgstr "ago"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "sep"
-msgstr "sep"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "oct"
-msgstr "oct"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "nov"
-msgstr "nov"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "dec"
-msgstr "dic"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:23
-msgctxt "abbrev. month"
-msgid "Jan."
-msgstr "en."
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:24
-msgctxt "abbrev. month"
-msgid "Feb."
-msgstr "feb."
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:25
-msgctxt "abbrev. month"
-msgid "March"
-msgstr "mzo."
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:26
-msgctxt "abbrev. month"
-msgid "April"
-msgstr "abr."
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:27
-msgctxt "abbrev. month"
-msgid "May"
-msgstr "my."
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:28
-msgctxt "abbrev. month"
-msgid "June"
-msgstr "jun."
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:29
-msgctxt "abbrev. month"
-msgid "July"
-msgstr "jul."
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:30
-msgctxt "abbrev. month"
-msgid "Aug."
-msgstr "agto."
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:31
-msgctxt "abbrev. month"
-msgid "Sept."
-msgstr "set."
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:32
-msgctxt "abbrev. month"
-msgid "Oct."
-msgstr "oct."
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:33
-msgctxt "abbrev. month"
-msgid "Nov."
-msgstr "nov."
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:34
-msgctxt "abbrev. month"
-msgid "Dec."
-msgstr "dic."
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:37
-msgctxt "alt. month"
-msgid "January"
-msgstr "Enero"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:38
-msgctxt "alt. month"
-msgid "February"
-msgstr "Febrero"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:39
-msgctxt "alt. month"
-msgid "March"
-msgstr "Marzo"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:40
-msgctxt "alt. month"
-msgid "April"
-msgstr "Abril"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:41
-msgctxt "alt. month"
-msgid "May"
-msgstr "Mayo"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:42
-msgctxt "alt. month"
-msgid "June"
-msgstr "Junio"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:43
-msgctxt "alt. month"
-msgid "July"
-msgstr "Julio"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:44
-msgctxt "alt. month"
-msgid "August"
-msgstr "Agosto"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:45
-msgctxt "alt. month"
-msgid "September"
-msgstr "Septiembre"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:46
-msgctxt "alt. month"
-msgid "October"
-msgstr "Octubre"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:47
-msgctxt "alt. month"
-msgid "November"
-msgstr "Noviembre"
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:48
-msgctxt "alt. month"
-msgid "December"
-msgstr "Diciembre"
-
-#: venv3/lib/python3.8/site-packages/django/utils/ipv6.py:8
-msgid "This is not a valid IPv6 address."
-msgstr "Esta no es una dirección IPv6 válida."
-
-#: venv3/lib/python3.8/site-packages/django/utils/text.py:69
+#~ msgid "%s PB"
+#~ msgstr "%s PB"
+
+#~ msgid "p.m."
+#~ msgstr "p.m."
+
+#~ msgid "a.m."
+#~ msgstr "a.m."
+
+#~ msgid "PM"
+#~ msgstr "PM"
+
+#~ msgid "AM"
+#~ msgstr "AM"
+
+#~ msgid "midnight"
+#~ msgstr "medianoche"
+
+#~ msgid "noon"
+#~ msgstr "mediodia"
+
+#~ msgid "Monday"
+#~ msgstr "Lunes"
+
+#~ msgid "Tuesday"
+#~ msgstr "Martes"
+
+#~ msgid "Wednesday"
+#~ msgstr "Miercoles"
+
+#~ msgid "Thursday"
+#~ msgstr "Jueves"
+
+#~ msgid "Friday"
+#~ msgstr "Viernes"
+
+#~ msgid "Saturday"
+#~ msgstr "Sábado"
+
+#~ msgid "Sunday"
+#~ msgstr "Domino"
+
+#~ msgid "Mon"
+#~ msgstr "Lun"
+
+#~ msgid "Tue"
+#~ msgstr "Mar"
+
+#~ msgid "Wed"
+#~ msgstr "Mie"
+
+#~ msgid "Thu"
+#~ msgstr "Jue"
+
+#~ msgid "Fri"
+#~ msgstr "Vie"
+
+#~ msgid "Sat"
+#~ msgstr "Sáb"
+
+#~ msgid "Sun"
+#~ msgstr "Dom"
+
+#~ msgid "January"
+#~ msgstr "Enero"
+
+#~ msgid "February"
+#~ msgstr "Febrero"
+
+#~ msgid "March"
+#~ msgstr "Marzo"
+
+#~ msgid "April"
+#~ msgstr "Abril"
+
+#~ msgid "May"
+#~ msgstr "Mayo"
+
+#~ msgid "June"
+#~ msgstr "Junio"
+
+#~ msgid "July"
+#~ msgstr "Julio"
+
+#~ msgid "August"
+#~ msgstr "Agosto"
+
+#~ msgid "September"
+#~ msgstr "Septiembre"
+
+#~ msgid "October"
+#~ msgstr "Octubre"
+
+#~ msgid "November"
+#~ msgstr "Noviembre"
+
+#~ msgid "December"
+#~ msgstr "Diciembre"
+
+#~ msgid "jan"
+#~ msgstr "ene"
+
+#~ msgid "feb"
+#~ msgstr "feb"
+
+#~ msgid "mar"
+#~ msgstr "mar"
+
+#~ msgid "apr"
+#~ msgstr "abr"
+
+#~ msgid "may"
+#~ msgstr "may"
+
+#~ msgid "jun"
+#~ msgstr "jun"
+
+#~ msgid "jul"
+#~ msgstr "jul"
+
+#~ msgid "aug"
+#~ msgstr "ago"
+
+#~ msgid "sep"
+#~ msgstr "sep"
+
+#~ msgid "oct"
+#~ msgstr "oct"
+
+#~ msgid "nov"
+#~ msgstr "nov"
+
+#~ msgid "dec"
+#~ msgstr "dic"
+
+#~ msgctxt "abbrev. month"
+#~ msgid "Jan."
+#~ msgstr "en."
+
+#~ msgctxt "abbrev. month"
+#~ msgid "Feb."
+#~ msgstr "feb."
+
+#~ msgctxt "abbrev. month"
+#~ msgid "March"
+#~ msgstr "mzo."
+
+#~ msgctxt "abbrev. month"
+#~ msgid "April"
+#~ msgstr "abr."
+
+#~ msgctxt "abbrev. month"
+#~ msgid "May"
+#~ msgstr "my."
+
+#~ msgctxt "abbrev. month"
+#~ msgid "June"
+#~ msgstr "jun."
+
+#~ msgctxt "abbrev. month"
+#~ msgid "July"
+#~ msgstr "jul."
+
+#~ msgctxt "abbrev. month"
+#~ msgid "Aug."
+#~ msgstr "agto."
+
+#~ msgctxt "abbrev. month"
+#~ msgid "Sept."
+#~ msgstr "set."
+
+#~ msgctxt "abbrev. month"
+#~ msgid "Oct."
+#~ msgstr "oct."
+
+#~ msgctxt "abbrev. month"
+#~ msgid "Nov."
+#~ msgstr "nov."
+
+#~ msgctxt "abbrev. month"
+#~ msgid "Dec."
+#~ msgstr "dic."
+
+#~ msgctxt "alt. month"
+#~ msgid "January"
+#~ msgstr "Enero"
+
+#~ msgctxt "alt. month"
+#~ msgid "February"
+#~ msgstr "Febrero"
+
+#~ msgctxt "alt. month"
+#~ msgid "March"
+#~ msgstr "Marzo"
+
+#~ msgctxt "alt. month"
+#~ msgid "April"
+#~ msgstr "Abril"
+
+#~ msgctxt "alt. month"
+#~ msgid "May"
+#~ msgstr "Mayo"
+
+#~ msgctxt "alt. month"
+#~ msgid "June"
+#~ msgstr "Junio"
+
+#~ msgctxt "alt. month"
+#~ msgid "July"
+#~ msgstr "Julio"
+
+#~ msgctxt "alt. month"
+#~ msgid "August"
+#~ msgstr "Agosto"
+
+#~ msgctxt "alt. month"
+#~ msgid "September"
+#~ msgstr "Septiembre"
+
+#~ msgctxt "alt. month"
+#~ msgid "October"
+#~ msgstr "Octubre"
+
+#~ msgctxt "alt. month"
+#~ msgid "November"
+#~ msgstr "Noviembre"
+
+#~ msgctxt "alt. month"
+#~ msgid "December"
+#~ msgstr "Diciembre"
+
+#~ msgid "This is not a valid IPv6 address."
+#~ msgstr "Esta no es una dirección IPv6 válida."
+
 #, python-format
-msgctxt "String to return when truncating text"
-msgid "%(truncated_text)s…"
-msgstr "%(truncated_text)s…"
+#~ msgctxt "String to return when truncating text"
+#~ msgid "%(truncated_text)s…"
+#~ msgstr "%(truncated_text)s…"
 
-#: venv3/lib/python3.8/site-packages/django/utils/text.py:235
-msgid "or"
-msgstr "o"
+#~ msgid "or"
+#~ msgstr "o"
 
-#. Translators: This string is used as a separator between list elements
-#: venv3/lib/python3.8/site-packages/django/utils/text.py:254
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:83
-msgid ", "
-msgstr ", "
+#~ msgid ", "
+#~ msgstr ", "
 
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:9
 #, python-format
-msgid "%d year"
-msgid_plural "%d years"
-msgstr[0] "%d año"
-msgstr[1] "%d años"
+#~ msgid "%d year"
+#~ msgid_plural "%d years"
+#~ msgstr[0] "%d año"
+#~ msgstr[1] "%d años"
 
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:10
 #, python-format
-msgid "%d month"
-msgid_plural "%d months"
-msgstr[0] "%d mes"
-msgstr[1] "%d meses"
+#~ msgid "%d month"
+#~ msgid_plural "%d months"
+#~ msgstr[0] "%d mes"
+#~ msgstr[1] "%d meses"
 
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:11
 #, python-format
-msgid "%d week"
-msgid_plural "%d weeks"
-msgstr[0] "%d semana"
-msgstr[1] "%d semanas"
+#~ msgid "%d week"
+#~ msgid_plural "%d weeks"
+#~ msgstr[0] "%d semana"
+#~ msgstr[1] "%d semanas"
 
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:12
 #, python-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d día"
-msgstr[1] "%d días"
+#~ msgid "%d day"
+#~ msgid_plural "%d days"
+#~ msgstr[0] "%d día"
+#~ msgstr[1] "%d días"
 
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:13
 #, python-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d hora"
-msgstr[1] "%d horas"
+#~ msgid "%d hour"
+#~ msgid_plural "%d hours"
+#~ msgstr[0] "%d hora"
+#~ msgstr[1] "%d horas"
 
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:14
 #, python-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minuto"
-msgstr[1] "%d minutos"
+#~ msgid "%d minute"
+#~ msgid_plural "%d minutes"
+#~ msgstr[0] "%d minuto"
+#~ msgstr[1] "%d minutos"
 
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:72
 #, fuzzy
-#| msgid "%d minute"
-#| msgid_plural "%d minutes"
-msgid "0 minutes"
-msgstr "%d minuto"
+#~| msgid "%d minute"
+#~| msgid_plural "%d minutes"
+#~ msgid "0 minutes"
+#~ msgstr "%d minuto"
 
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:110
-msgid "Forbidden"
-msgstr "Prohibido"
+#~ msgid "Forbidden"
+#~ msgstr "Prohibido"
 
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:111
-msgid "CSRF verification failed. Request aborted."
-msgstr "Se falló la verificación CSRF. Se abortó la solicitud."
+#~ msgid "CSRF verification failed. Request aborted."
+#~ msgstr "Se falló la verificación CSRF. Se abortó la solicitud."
 
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:115
-msgid ""
-"You are seeing this message because this HTTPS site requires a “Referer "
-"header� to be sent by your Web browser, but none was sent. This header is "
-"required for security reasons, to ensure that your browser is not being "
-"hijacked by third parties."
-msgstr ""
-"Estás viendo este mensaje porque este sitio HTTPS requiere que tu navegador "
-"Web envie un “Referer header�, pero no se la envió. Esta cabecedera se "
-"requiere por razones de seguridad, para asegurar que tu navegador no sea "
-"secuestrado por terceros."
+#~ msgid "You are seeing this message because this HTTPS site requires a “Referer header� to be sent by your Web browser, but none was sent. This header is required for security reasons, to ensure that your browser is not being hijacked by third parties."
+#~ msgstr "Estás viendo este mensaje porque este sitio HTTPS requiere que tu navegador Web envie un “Referer header�, pero no se la envió. Esta cabecedera se requiere por razones de seguridad, para asegurar que tu navegador no sea secuestrado por terceros."
 
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:120
-msgid ""
-"If you have configured your browser to disable “Referer� headers, please re-"
-"enable them, at least for this site, or for HTTPS connections, or for “same-"
-"origin� requests."
-msgstr ""
-"Si has configurado su navegador para deshabilitar las cabecederas “Referer�, "
-"vuelva a habilitarlos, al menos para este sitio, o para conexiones HTTPS, o "
-"para solicitudes del “same-origin�. "
+#~ msgid "If you have configured your browser to disable “Referer� headers, please re-enable them, at least for this site, or for HTTPS connections, or for “same-origin� requests."
+#~ msgstr "Si has configurado su navegador para deshabilitar las cabecederas “Referer�, vuelva a habilitarlos, al menos para este sitio, o para conexiones HTTPS, o para solicitudes del “same-origin�. "
 
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:124
-msgid ""
-"If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
-"including the “Referrer-Policy: no-referrer� header, please remove them. The "
-"CSRF protection requires the “Referer� header to do strict referer checking. "
-"If you’re concerned about privacy, use alternatives like <a rel=\"noreferrer"
-"\" …> for links to third-party sites."
-msgstr ""
-"Si estás usando la eqtigueta <meta name=\"referrer\" content=\"no-referrer"
-"\"> o estás incluyendo la cabecedera “Referrer-Policy: no-referrer�, "
-"quitalas por favor. La protección CSRF require la cabecedera “Referer� para "
-"hacer verficación “strict referer“. Si te preocupa la privacidad, utiliza "
-"alternativas como <a rel=\"noreferrer\" …>  para sitios de terceros."
+#~ msgid "If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or including the “Referrer-Policy: no-referrer� header, please remove them. The CSRF protection requires the “Referer� header to do strict referer checking. If you’re concerned about privacy, use alternatives like <a rel=\"noreferrer\" …> for links to third-party sites."
+#~ msgstr "Si estás usando la eqtigueta <meta name=\"referrer\" content=\"no-referrer\"> o estás incluyendo la cabecedera “Referrer-Policy: no-referrer�, quitalas por favor. La protección CSRF require la cabecedera “Referer� para hacer verficación “strict referer“. Si te preocupa la privacidad, utiliza alternativas como <a rel=\"noreferrer\" …>  para sitios de terceros."
 
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:132
-msgid ""
-"You are seeing this message because this site requires a CSRF cookie when "
-"submitting forms. This cookie is required for security reasons, to ensure "
-"that your browser is not being hijacked by third parties."
-msgstr ""
-"Estás viendo este mensaje porque este sitio requiere un cookie CSRF cuando "
-"se envie formularios. Este cookie se requiere por razones de seguridad, para "
-"asegurar que tu navegador no sea secuestrado por terceros."
+#~ msgid "You are seeing this message because this site requires a CSRF cookie when submitting forms. This cookie is required for security reasons, to ensure that your browser is not being hijacked by third parties."
+#~ msgstr "Estás viendo este mensaje porque este sitio requiere un cookie CSRF cuando se envie formularios. Este cookie se requiere por razones de seguridad, para asegurar que tu navegador no sea secuestrado por terceros."
 
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:137
-msgid ""
-"If you have configured your browser to disable cookies, please re-enable "
-"them, at least for this site, or for “same-origin� requests."
-msgstr ""
-"Si has configurado su navegador para deshabilitar los cookies, vuelva a "
-"habilitarlos, al menos para este sitio, o para conexiones HTTPS, o para "
-"solicitudes del “same-origin�. "
+#~ msgid "If you have configured your browser to disable cookies, please re-enable them, at least for this site, or for “same-origin� requests."
+#~ msgstr "Si has configurado su navegador para deshabilitar los cookies, vuelva a habilitarlos, al menos para este sitio, o para conexiones HTTPS, o para solicitudes del “same-origin�. "
 
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:142
-msgid "More information is available with DEBUG=True."
-msgstr "Más información es disponible con DEBUG=True."
+#~ msgid "More information is available with DEBUG=True."
+#~ msgstr "Más información es disponible con DEBUG=True."
 
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:41
-msgid "No year specified"
-msgstr "Ningun año fue especificado"
+#~ msgid "No year specified"
+#~ msgstr "Ningun año fue especificado"
 
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:61
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:111
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:208
-msgid "Date out of range"
-msgstr "Fecha fuera de rango"
+#~ msgid "Date out of range"
+#~ msgstr "Fecha fuera de rango"
 
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:90
-msgid "No month specified"
-msgstr "Ningun mes fue especificado"
+#~ msgid "No month specified"
+#~ msgstr "Ningun mes fue especificado"
 
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:142
-msgid "No day specified"
-msgstr "Ningun día fue especificado"
+#~ msgid "No day specified"
+#~ msgstr "Ningun día fue especificado"
 
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:188
-msgid "No week specified"
-msgstr "Ninguna semana fue especificado"
+#~ msgid "No week specified"
+#~ msgstr "Ninguna semana fue especificado"
 
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:338
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:367
 #, python-format
-msgid "No %(verbose_name_plural)s available"
-msgstr "No %(verbose_name_plural)s disponible"
+#~ msgid "No %(verbose_name_plural)s available"
+#~ msgstr "No %(verbose_name_plural)s disponible"
 
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:589
 #, python-format
-msgid ""
-"Future %(verbose_name_plural)s not available because %(class_name)s."
-"allow_future is False."
-msgstr ""
-"%(verbose_name_plural)s del futuro no está disponible porque %(class_name)s."
-"allow_future es False."
+#~ msgid "Future %(verbose_name_plural)s not available because %(class_name)s.allow_future is False."
+#~ msgstr "%(verbose_name_plural)s del futuro no está disponible porque %(class_name)s.allow_future es False."
 
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:623
 #, python-format
-msgid "Invalid date string “%(datestr)s� given format “%(format)s�"
-msgstr "Cadena de fecha invalida “%(datestr)s� dado el formato “%(format)s�"
+#~ msgid "Invalid date string “%(datestr)s� given format “%(format)s�"
+#~ msgstr "Cadena de fecha invalida “%(datestr)s� dado el formato “%(format)s�"
 
-#: venv3/lib/python3.8/site-packages/django/views/generic/detail.py:54
 #, python-format
-msgid "No %(verbose_name)s found matching the query"
-msgstr "No se encontró ningún %(verbose_name)s correspondiente a la búsqueda"
+#~ msgid "No %(verbose_name)s found matching the query"
+#~ msgstr "No se encontró ningún %(verbose_name)s correspondiente a la búsqueda"
 
-#: venv3/lib/python3.8/site-packages/django/views/generic/list.py:67
-msgid "Page is not “last�, nor can it be converted to an int."
-msgstr "Página no es “last�, ni puede ser convertido en un int."
+#~ msgid "Page is not “last�, nor can it be converted to an int."
+#~ msgstr "Página no es “last�, ni puede ser convertido en un int."
 
-#: venv3/lib/python3.8/site-packages/django/views/generic/list.py:72
 #, python-format
-msgid "Invalid page (%(page_number)s): %(message)s"
-msgstr "Página invalida (%(page_number)s): %(message)s"
+#~ msgid "Invalid page (%(page_number)s): %(message)s"
+#~ msgstr "Página invalida (%(page_number)s): %(message)s"
 
-#: venv3/lib/python3.8/site-packages/django/views/generic/list.py:154
 #, python-format
-msgid "Empty list and “%(class_name)s.allow_empty� is False."
-msgstr "Lista vacia y “%(class_name)s.allow_empty� es False."
+#~ msgid "Empty list and “%(class_name)s.allow_empty� is False."
+#~ msgstr "Lista vacia y “%(class_name)s.allow_empty� es False."
 
-#: venv3/lib/python3.8/site-packages/django/views/static.py:40
-msgid "Directory indexes are not allowed here."
-msgstr "Indices directorios no se permiten aquí."
+#~ msgid "Directory indexes are not allowed here."
+#~ msgstr "Indices directorios no se permiten aquí."
 
-#: venv3/lib/python3.8/site-packages/django/views/static.py:42
 #, python-format
-msgid "“%(path)s� does not exist"
-msgstr "“%(path)s� no existe"
+#~ msgid "“%(path)s� does not exist"
+#~ msgstr "“%(path)s� no existe"
 
-#: venv3/lib/python3.8/site-packages/django/views/static.py:80
 #, python-format
-msgid "Index of %(directory)s"
-msgstr "Indice de %(directory)s"
+#~ msgid "Index of %(directory)s"
+#~ msgstr "Indice de %(directory)s"
 
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:7
-msgid "Django: the Web framework for perfectionists with deadlines."
-msgstr "Django: el estructura Web para perfeccionistas con fechas límites."
+#~ msgid "Django: the Web framework for perfectionists with deadlines."
+#~ msgstr "Django: el estructura Web para perfeccionistas con fechas límites."
 
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:346
 #, python-format
-msgid ""
-"View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
-"target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
-msgstr ""
-"Ver <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
-"target=\"_blank\" rel=\"noopener\">notas de lanzamiento</a> por Django "
-"%(version)s"
+#~ msgid "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
+#~ msgstr "Ver <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" target=\"_blank\" rel=\"noopener\">notas de lanzamiento</a> por Django %(version)s"
 
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:368
-msgid "The install worked successfully! Congratulations!"
-msgstr "¡La instalación fue exitoso! ¡Felicidades!"
+#~ msgid "The install worked successfully! Congratulations!"
+#~ msgstr "¡La instalación fue exitoso! ¡Felicidades!"
 
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:369
 #, python-format
-msgid ""
-"You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
-"%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
-"\">DEBUG=True</a> is in your settings file and you have not configured any "
-"URLs."
-msgstr ""
-"Estás viendo esta pagina porque <a href=\"https://docs.djangoproject.com/en/"
-"%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
-"\">DEBUG=True</a> está en tu archivo de configuración y no has configurado "
-"ningún URL."
+#~ msgid "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener\">DEBUG=True</a> is in your settings file and you have not configured any URLs."
+#~ msgstr "Estás viendo esta pagina porque <a href=\"https://docs.djangoproject.com/en/%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener\">DEBUG=True</a> está en tu archivo de configuración y no has configurado ningún URL."
 
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:384
-msgid "Django Documentation"
-msgstr "Documentación de Django"
+#~ msgid "Django Documentation"
+#~ msgstr "Documentación de Django"
 
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:385
-msgid "Topics, references, &amp; how-to’s"
-msgstr "Tópicos, referencias, &amp; instrucciones paso-a-paso"
+#~ msgid "Topics, references, &amp; how-to’s"
+#~ msgstr "Tópicos, referencias, &amp; instrucciones paso-a-paso"
 
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:396
-msgid "Tutorial: A Polling App"
-msgstr "Tutorial: Una aplicación polling"
+#~ msgid "Tutorial: A Polling App"
+#~ msgstr "Tutorial: Una aplicación polling"
 
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:397
-msgid "Get started with Django"
-msgstr "Empezar con Django"
+#~ msgid "Get started with Django"
+#~ msgstr "Empezar con Django"
 
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:408
-msgid "Django Community"
-msgstr "Comunidad Django"
+#~ msgid "Django Community"
+#~ msgstr "Comunidad Django"
 
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:409
-msgid "Connect, get help, or contribute"
-msgstr "Conectarse, encontrar ayuda, o contribuir"
+#~ msgid "Connect, get help, or contribute"
+#~ msgstr "Conectarse, encontrar ayuda, o contribuir"
 
-#: venv3/lib/python3.8/site-packages/kombu/transport/qpid.py:1301
 #, python-format
-msgid "Attempting to connect to qpid with SASL mechanism %s"
-msgstr "Intentando conectar con qpid con mecanismo SASL %s"
+#~ msgid "Attempting to connect to qpid with SASL mechanism %s"
+#~ msgstr "Intentando conectar con qpid con mecanismo SASL %s"
 
-#: venv3/lib/python3.8/site-packages/kombu/transport/qpid.py:1306
 #, python-format
-msgid "Connected to qpid with SASL mechanism %s"
-msgstr "Conectado con qpid con mecanismo SASL %s"
+#~ msgid "Connected to qpid with SASL mechanism %s"
+#~ msgstr "Conectado con qpid con mecanismo SASL %s"
 
-#: venv3/lib/python3.8/site-packages/kombu/transport/qpid.py:1324
 #, python-format
-msgid "Unable to connect to qpid with SASL mechanism %s"
-msgstr "No se pudo conectar con qpid con mecanismo SASL %s"
+#~ msgid "Unable to connect to qpid with SASL mechanism %s"
+#~ msgstr "No se pudo conectar con qpid con mecanismo SASL %s"
 
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:371
-msgid "1 second ago"
-msgstr "Hace 1 segundo"
+#~ msgid "1 second ago"
+#~ msgstr "Hace 1 segundo"
 
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:377
-msgid "1 minute ago"
-msgstr "Hace 1 minuto"
+#~ msgid "1 minute ago"
+#~ msgstr "Hace 1 minuto"
 
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:382
-msgid "1 hour ago"
-msgstr "Hace 1 hora"
+#~ msgid "1 hour ago"
+#~ msgstr "Hace 1 hora"
 
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:385
 #, python-format
-msgid "%(time)s"
-msgstr "%(time)s"
+#~ msgid "%(time)s"
+#~ msgstr "%(time)s"
 
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:387
-msgid "yesterday"
-msgstr "ayer"
+#~ msgid "yesterday"
+#~ msgstr "ayer"
 
 # TODO cc @mouse this could be grammatically incorrect if the time said 1 o'clock
 # a working clock is broken twice a day!
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:387
 #, python-format
-msgid "yesterday at %(time)s"
-msgstr "ayer a las %(time)s"
+#~ msgid "yesterday at %(time)s"
+#~ msgstr "ayer a las %(time)s"
 
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:389
 #, python-format
-msgid "%(weekday)s"
-msgstr "%(weekday)s"
+#~ msgid "%(weekday)s"
+#~ msgstr "%(weekday)s"
 
 # TODO cc @mouse this could be grammatically incorrect if the time said 1 o'clock
 # a working clock is broken twice a day!
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:389
 #, python-format
-msgid "%(weekday)s at %(time)s"
-msgstr "%(weekday)s a las %(time)s"
+#~ msgid "%(weekday)s at %(time)s"
+#~ msgstr "%(weekday)s a las %(time)s"
 
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:392
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:445
 #, python-format
-msgid "%(month_name)s %(day)s"
-msgstr "%(day)s %(month_name)s"
+#~ msgid "%(month_name)s %(day)s"
+#~ msgstr "%(day)s %(month_name)s"
 
 # TODO cc @mouse this could be grammatically incorrect if the time said 1 o'clock
 # a working clock is broken twice a day!
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:394
 #, python-format
-msgid "%(month_name)s %(day)s at %(time)s"
-msgstr "%(day)s %(month_name)s a las %(time)s"
+#~ msgid "%(month_name)s %(day)s at %(time)s"
+#~ msgstr "%(day)s %(month_name)s a las %(time)s"
 
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:399
 #, python-format
-msgid "%(month_name)s %(day)s, %(year)s"
-msgstr "%(day)s %(month_name)s, %(year)s"
+#~ msgid "%(month_name)s %(day)s, %(year)s"
+#~ msgstr "%(day)s %(month_name)s, %(year)s"
 
 # TODO cc @mouse this could be grammatically incorrect if the time said 1 o'clock
 # a working clock is broken twice a day!
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:401
 #, python-format
-msgid "%(month_name)s %(day)s, %(year)s at %(time)s"
-msgstr "%(day)s %(month_name)s, %(year)s a las %(time)s"
+#~ msgid "%(month_name)s %(day)s, %(year)s at %(time)s"
+#~ msgstr "%(day)s %(month_name)s, %(year)s a las %(time)s"
 
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:439
 #, python-format
-msgid "%(weekday)s, %(month_name)s %(day)s"
-msgstr "%(weekday)s, %(day)s %(month_name)s"
+#~ msgid "%(weekday)s, %(month_name)s %(day)s"
+#~ msgstr "%(weekday)s, %(day)s %(month_name)s"
 
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:462
 #, python-format
-msgid "%(commas)s and %(last)s"
-msgstr "%(commas)s y %(last)s"
+#~ msgid "%(commas)s and %(last)s"
+#~ msgstr "%(commas)s y %(last)s"
 
-#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:68
-msgctxt "law"
-msgid "right"
-msgstr "justo"
+#~ msgctxt "law"
+#~ msgid "right"
+#~ msgstr "justo"
 
-#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:69
-msgctxt "good"
-msgid "right"
-msgstr "correcto"
+#~ msgctxt "good"
+#~ msgid "right"
+#~ msgstr "correcto"
 
-#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:71
-#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:74
-msgctxt "organization"
-msgid "club"
-msgstr "club"
+#~ msgctxt "organization"
+#~ msgid "club"
+#~ msgstr "club"
 
-#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:76
-#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:77
-msgctxt "stick"
-msgid "club"
-msgstr "garrote"
+#~ msgctxt "stick"
+#~ msgid "club"
+#~ msgstr "garrote"
 
 #~ msgid "Didn't find what you were looking for?"
 #~ msgstr "¿No encontraste lo que buscabas?"
@@ -4358,28 +3769,16 @@ msgstr "garrote"
 #~ msgstr[1] "%(rating)s estrellas"
 
 #, python-format
-#~ msgid ""
-#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
-#~ "\"%(status_path)s\">review</a>"
-#~ msgstr ""
-#~ "respondió a la <a href=\"%(status_path)s\">reseña</a> de <a href="
-#~ "\"%(user_path)s\">%(username)s</a> "
+#~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">review</a>"
+#~ msgstr "respondió a la <a href=\"%(status_path)s\">reseña</a> de <a href=\"%(user_path)s\">%(username)s</a> "
 
 #, python-format
-#~ msgid ""
-#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
-#~ "\"%(status_path)s\">comment</a>"
-#~ msgstr ""
-#~ "respondió al <a href=\"%(status_path)s\">comentario</a> de <a href="
-#~ "\"%(user_path)s\">%(username)s</a> "
+#~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">comment</a>"
+#~ msgstr "respondió al <a href=\"%(status_path)s\">comentario</a> de <a href=\"%(user_path)s\">%(username)s</a> "
 
 #, python-format
-#~ msgid ""
-#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
-#~ "\"%(status_path)s\">quote</a>"
-#~ msgstr ""
-#~ "respondió a la <a href=\"%(status_path)s\">cita</a> de <a href="
-#~ "\"%(user_path)s\">%(username)s</a> "
+#~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">quote</a>"
+#~ msgstr "respondió a la <a href=\"%(status_path)s\">cita</a> de <a href=\"%(user_path)s\">%(username)s</a> "
 
 #~ msgid "Remove tag"
 #~ msgstr "Eliminar etiqueta"
diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 7717fe48..23d81e95 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-01 10:56-0700\n"
+"POT-Creation-Date: 2021-05-03 11:22-0700\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"
@@ -235,17 +235,12 @@ msgstr "<a href=\"%(path)s/editions\">%(count)s éditions</a>"
 #: bookwyrm/templates/book/book.html:145
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
-msgstr ""
-"Cette édition est sur votre étagère <a href=\"%(path)s\">%(shelf_name)s</a>."
+msgstr "Cette édition est sur votre étagère <a href=\"%(path)s\">%(shelf_name)s</a>."
 
 #: bookwyrm/templates/book/book.html:151
 #, python-format
-msgid ""
-"A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a "
-"href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
-msgstr ""
-"Une <a href=\"%(book_path)s\">édition différente</a> de ce livre existe sur "
-"votre étagère <a href=\"%(shelf_path)s\">%(shelf_name)s</a>."
+msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
+msgstr "Une <a href=\"%(book_path)s\">édition différente</a> de ce livre existe sur votre étagère <a href=\"%(shelf_path)s\">%(shelf_name)s</a>."
 
 #: bookwyrm/templates/book/book.html:162
 msgid "Your reading activity"
@@ -584,18 +579,12 @@ msgstr "Répertoire"
 
 #: bookwyrm/templates/directory/directory.html:17
 msgid "Make your profile discoverable to other BookWyrm users."
-msgstr ""
-"Autoriser d’autres utilisateurs ou utilisatrices de BookWyrm à découvrir "
-"votre profil."
+msgstr "Autoriser d’autres utilisateurs ou utilisatrices de BookWyrm à découvrir votre profil."
 
 #: bookwyrm/templates/directory/directory.html:24
 #, python-format
-msgid ""
-"You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</"
-"a>"
-msgstr ""
-"Vous pouvez décider de ne plus y figurer à n’importe quel moment depuis vos "
-"<a href=\"%(path)s\">paramètres de profil.</a>"
+msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
+msgstr "Vous pouvez décider de ne plus y figurer à n’importe quel moment depuis vos <a href=\"%(path)s\">paramètres de profil.</a>"
 
 #: bookwyrm/templates/directory/directory.html:29
 #: bookwyrm/templates/snippets/goal_card.html:22
@@ -761,12 +750,8 @@ msgstr "Bien le bonjour,"
 
 #: bookwyrm/templates/email/html_layout.html:21
 #, python-format
-msgid ""
-"BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">"
-"%(site_name)s</a>"
-msgstr ""
-"BookWyrm, hébergé par <a style=\"color: #3273dc;\" href=\"https://%(domain)s"
-"\">%(site_name)s</a>"
+msgid "BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a>"
+msgstr "BookWyrm, hébergé par <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a>"
 
 #: bookwyrm/templates/email/html_layout.html:23
 msgid "Email preference"
@@ -784,21 +769,13 @@ msgstr "S’enregistrer maintenant"
 
 #: bookwyrm/templates/email/invite/html_content.html:15
 #, python-format
-msgid ""
-"Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</"
-"a>."
-msgstr ""
-"En savoir plus sur <a href=\"https://%(domain)s%(about_path)s\">cette "
-"instance</a>."
+msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
+msgstr "En savoir plus sur <a href=\"https://%(domain)s%(about_path)s\">cette instance</a>."
 
 #: bookwyrm/templates/email/invite/text_content.html:4
 #, python-format
-msgid ""
-"You're invited to join %(site_name)s! Click the link below to create an "
-"account."
-msgstr ""
-"Vous avez reçu une invitation à rejoindre %(site_name)s ! Cliquez le lien "
-"suivant pour créer un compte."
+msgid "You're invited to join %(site_name)s! Click the link below to create an account."
+msgstr "Vous avez reçu une invitation à rejoindre %(site_name)s ! Cliquez le lien suivant pour créer un compte."
 
 #: bookwyrm/templates/email/invite/text_content.html:8
 msgid "Learn more about this instance:"
@@ -807,13 +784,8 @@ msgstr "En savoir plus sur cete instance :"
 #: bookwyrm/templates/email/password_reset/html_content.html:6
 #: bookwyrm/templates/email/password_reset/text_content.html:4
 #, python-format
-msgid ""
-"You requested to reset your %(site_name)s password. Click the link below to "
-"set a new password and log in to your account."
-msgstr ""
-"Une demande de réinitialisation de votre mot de passe sur <i>%(site_name)s</"
-"i> a été initialisée. Cliquez le lien suivant pour définir un nouveau mot de "
-"passe et vous connecter à votre compte."
+msgid "You requested to reset your %(site_name)s password. Click the link below to set a new password and log in to your account."
+msgstr "Une demande de réinitialisation de votre mot de passe sur <i>%(site_name)s</i> a été initialisée. Cliquez le lien suivant pour définir un nouveau mot de passe et vous connecter à votre compte."
 
 #: bookwyrm/templates/email/password_reset/html_content.html:9
 #: bookwyrm/templates/password_reset.html:4
@@ -825,11 +797,8 @@ msgstr "Changez le mot de passe"
 
 #: bookwyrm/templates/email/password_reset/html_content.html:13
 #: bookwyrm/templates/email/password_reset/text_content.html:8
-msgid ""
-"If you didn't request to reset your password, you can ignore this email."
-msgstr ""
-"Si vous n’avez pas demandé la réinitialisation de votre mot de passe, vous "
-"pouvez ignorer cet email."
+msgid "If you didn't request to reset your password, you can ignore this email."
+msgstr "Si vous n’avez pas demandé la réinitialisation de votre mot de passe, vous pouvez ignorer cet email."
 
 #: bookwyrm/templates/email/password_reset/subject.html:2
 #, python-format
@@ -882,14 +851,11 @@ msgstr "Fédéré"
 #: bookwyrm/templates/feed/feed.html:33
 #, python-format
 msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
-msgstr ""
-"charger le(s) <span data-poll=\"stream/%(tab)s\">0</span> statut(s) non lu(s)"
+msgstr "charger le(s) <span data-poll=\"stream/%(tab)s\">0</span> statut(s) non lu(s)"
 
 #: bookwyrm/templates/feed/feed.html:48
-msgid ""
-"There aren't any activities right now! Try following a user to get started"
-msgstr ""
-"Aucune activité pour l’instant ! Abonnez‑vous à quelqu’un pour commencer"
+msgid "There aren't any activities right now! Try following a user to get started"
+msgstr "Aucune activité pour l’instant ! Abonnez‑vous à quelqu’un pour commencer"
 
 #: bookwyrm/templates/feed/feed.html:56
 #: bookwyrm/templates/get_started/users.html:6
@@ -907,8 +873,7 @@ msgid "Your books"
 msgstr "Vos livres"
 
 #: bookwyrm/templates/feed/feed_layout.html:13
-msgid ""
-"There are no books here right now! Try searching for a book to get started"
+msgid "There are no books here right now! Try searching for a book to get started"
 msgstr "Aucun livre ici pour l’instant ! Cherchez un livre pour commencer"
 
 #: bookwyrm/templates/feed/feed_layout.html:24
@@ -970,9 +935,7 @@ msgstr "Aucun livre trouvé pour « %(query)s »"
 #: bookwyrm/templates/get_started/books.html:11
 #, python-format
 msgid "You can add books when you start using %(site_name)s."
-msgstr ""
-"Vous pourrez ajouter des livres lorsque vous commencerez à utiliser "
-"%(site_name)s."
+msgstr "Vous pourrez ajouter des livres lorsque vous commencerez à utiliser %(site_name)s."
 
 #: bookwyrm/templates/get_started/books.html:16
 #: bookwyrm/templates/get_started/books.html:17
@@ -1064,12 +1027,8 @@ msgid "Show this account in suggested users:"
 msgstr "Afficher ce compte dans ceux suggérés :"
 
 #: bookwyrm/templates/get_started/profile.html:52
-msgid ""
-"Your account will show up in the directory, and may be recommended to other "
-"BookWyrm users."
-msgstr ""
-"Votre compte sera listé dans le répertoire et pourra être recommandé à "
-"d’autres utilisateurs ou utilisatrices de BookWyrm."
+msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users."
+msgstr "Votre compte sera listé dans le répertoire et pourra être recommandé à d’autres utilisateurs ou utilisatrices de BookWyrm."
 
 #: bookwyrm/templates/get_started/users.html:11
 msgid "Search for a user"
@@ -1092,12 +1051,8 @@ msgstr "Modifier le défi"
 #: bookwyrm/templates/goal.html:30
 #: bookwyrm/templates/snippets/goal_card.html:13
 #, python-format
-msgid ""
-"Set a goal for how many books you'll finish reading in %(year)s, and track "
-"your progress throughout the year."
-msgstr ""
-"Définissez un nombre de livre à lire comme objectif pour %(year)s, et "
-"suivezvotre progression au fil de l’année."
+msgid "Set a goal for how many books you'll finish reading in %(year)s, and track your progress throughout the year."
+msgstr "Définissez un nombre de livre à lire comme objectif pour %(year)s, et suivezvotre progression au fil de l’année."
 
 #: bookwyrm/templates/goal.html:39
 #, python-format
@@ -1179,12 +1134,8 @@ msgstr "Items non importés"
 
 #: bookwyrm/templates/import_status.html:44
 #, python-format
-msgid ""
-"Jump to the bottom of the list to select the %(failed_count)s items which "
-"failed to import."
-msgstr ""
-"Sauter en bas de liste pour sélectionner les %(failed_count)s items n’ayant "
-"pu être importés."
+msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
+msgstr "Sauter en bas de liste pour sélectionner les %(failed_count)s items n’ayant pu être importés."
 
 #: bookwyrm/templates/import_status.html:79
 msgid "Select all"
@@ -1322,20 +1273,12 @@ msgstr "Modération de la liste :"
 
 #: bookwyrm/templates/layout.html:213
 #, python-format
-msgid ""
-"Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">"
-"%(support_title)s</a>"
-msgstr ""
-"Soutenez %(site_name)s avec <a href=\"%(support_link)s\" target=\"_blank\">"
-"%(support_title)s</a>"
+msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
+msgstr "Soutenez %(site_name)s avec <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 
 #: bookwyrm/templates/layout.html:217
-msgid ""
-"BookWyrm is open source software. You can contribute or report issues on <a "
-"href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
-msgstr ""
-"BookWyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports "
-"de bogues via <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgstr "BookWyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports de bogues via <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
 #: bookwyrm/templates/lists/create_form.html:5
 #: bookwyrm/templates/lists/lists.html:20
@@ -1521,7 +1464,7 @@ msgstr "Commentaires de l’équipe de modération"
 
 #: bookwyrm/templates/moderation/report.html:41
 #: bookwyrm/templates/snippets/create_status.html:28
-#: bookwyrm/templates/snippets/create_status_form.html:53
+#: bookwyrm/templates/snippets/create_status_form.html:63
 msgid "Comment"
 msgstr "Commentaire"
 
@@ -1547,9 +1490,7 @@ msgstr "Signaler @%(username)s"
 #: bookwyrm/templates/moderation/report_modal.html:23
 #, python-format
 msgid "This report will be sent to %(site_name)s's moderators for review."
-msgstr ""
-"Ce signalement sera envoyé à l’équipe de modération de %(site_name)s pour "
-"traitement."
+msgstr "Ce signalement sera envoyé à l’équipe de modération de %(site_name)s pour traitement."
 
 #: bookwyrm/templates/moderation/report_modal.html:24
 msgid "More info about this report:"
@@ -1602,30 +1543,18 @@ msgstr "Supprimer les notifications"
 
 #: bookwyrm/templates/notifications.html:53
 #, python-format
-msgid ""
-"favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</"
-"em></a>"
-msgstr ""
-"a ajouté votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</"
-"em></a> à ses favoris"
+msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "a ajouté votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:55
 #, python-format
-msgid ""
-"favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</"
-"em></a>"
-msgstr ""
-"a ajouté votre <a href=\"%(related_path)s\">commentaire sur <em>"
-"%(book_title)s</em></a> à ses favoris"
+msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
+msgstr "a ajouté votre <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:57
 #, python-format
-msgid ""
-"favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
-"em></a>"
-msgstr ""
-"a ajouté votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</"
-"em></a> à ses favoris"
+msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr "a ajouté votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:59
 #, python-format
@@ -1634,30 +1563,18 @@ msgstr "a ajouté votre <a href=\"%(related_path)s\">statut</a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:64
 #, python-format
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">review of <em>"
-"%(book_title)s</em></a>"
-msgstr ""
-"vous a mentionné dans sa <a href=\"%(related_path)s\">critique de <em>"
-"%(book_title)s</em></a>"
+msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "vous a mentionné dans sa <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:66
 #, python-format
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">comment on <em>"
-"%(book_title)s</em></a>"
-msgstr ""
-"vous a mentionné dans son <a href=\"%(related_path)s\">commentaire sur <em>"
-"%(book_title)s</em></a>"
+msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
+msgstr "vous a mentionné dans son <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:68
 #, python-format
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">quote from <em>"
-"%(book_title)s</em></a>"
-msgstr ""
-"vous a mentionné dans sa <a href=\"%(related_path)s\">citation de <em>"
-"%(book_title)s</em></a>"
+msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr "vous a mentionné dans sa <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:70
 #, python-format
@@ -1666,39 +1583,23 @@ msgstr "vous a mentionné dans son <a href=\"%(related_path)s\">statut</a>"
 
 #: bookwyrm/templates/notifications.html:75
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">review of <em>%(book_title)s</em></a>"
-msgstr ""
-"<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s"
-"\">critique de <em>%(book_title)s</em></a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">critique de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:77
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">comment on <em>%(book_title)s</em></a>"
-msgstr ""
-"<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s"
-"\">commentaire sur <em>%(book_title)s</em></a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
+msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">commentaire sur <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:79
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">quote from <em>%(book_title)s</em></a>"
-msgstr ""
-"<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s"
-"\">citation de <em>%(book_title)s</em></a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">citation de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:81
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">status</a>"
-msgstr ""
-"<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s"
-"\">statut</a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
+msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">statut</a>"
 
 #: bookwyrm/templates/notifications.html:85
 msgid "followed you"
@@ -1710,30 +1611,18 @@ msgstr "vous a envoyé une demande d’abonnement"
 
 #: bookwyrm/templates/notifications.html:94
 #, python-format
-msgid ""
-"boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></"
-"a>"
-msgstr ""
-"a partagé votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</"
-"em></a>"
+msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "a partagé votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:96
 #, python-format
-msgid ""
-"boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></"
-"a>"
-msgstr ""
-"a partagé votre <a href=\"%(related_path)s\">commentaire sur <em>"
-"%(book_title)s</em></a>"
+msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+msgstr "a partagé votre <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:98
 #, python-format
-msgid ""
-"boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
-"em></a>"
-msgstr ""
-"a partagé votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</"
-"em></a>"
+msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr "a partagé votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:100
 #, python-format
@@ -1742,21 +1631,13 @@ msgstr "a partagé votre <a href=\"%(related_path)s\">statut</a>"
 
 #: bookwyrm/templates/notifications.html:104
 #, python-format
-msgid ""
-" added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
-"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
-msgstr ""
-" a ajouté <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre "
-"liste « <a href=\"%(list_path)s\">%(list_name)s</a> »"
+msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgstr " a ajouté <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre liste « <a href=\"%(list_path)s\">%(list_name)s</a> »"
 
 #: bookwyrm/templates/notifications.html:106
 #, python-format
-msgid ""
-" suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to "
-"your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
-msgstr ""
-" a suggégré l’ajout de <em><a href=\"%(book_path)s\">%(book_title)s</a></em> "
-"à votre liste « <a href=\"%(list_path)s/curate\">%(list_name)s</a> »"
+msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgstr " a suggégré l’ajout de <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre liste « <a href=\"%(list_path)s/curate\">%(list_name)s</a> »"
 
 #: bookwyrm/templates/notifications.html:110
 #, python-format
@@ -1766,8 +1647,7 @@ msgstr "Votre <a href=\"/import/%(related_id)s\">importation</a> est terminée."
 #: bookwyrm/templates/notifications.html:113
 #, python-format
 msgid "A new <a href=\"%(path)s\">report</a> needs moderation."
-msgstr ""
-"Un nouveau <a href=\"%(path)s\">signalement</a> a besoin d’être traité."
+msgstr "Un nouveau <a href=\"%(path)s\">signalement</a> a besoin d’être traité."
 
 #: bookwyrm/templates/notifications.html:139
 msgid "You're all caught up!"
@@ -1780,8 +1660,7 @@ msgstr "Confirmez le mot de passe :"
 
 #: bookwyrm/templates/password_reset_request.html:14
 msgid "A link to reset your password will be sent to your email address"
-msgstr ""
-"Un lien pour changer votre mot de passe sera envoyé à votre addresse email"
+msgstr "Un lien pour changer votre mot de passe sera envoyé à votre addresse email"
 
 #: bookwyrm/templates/password_reset_request.html:28
 msgid "Reset password"
@@ -1815,17 +1694,12 @@ msgstr "Modifier le profil"
 
 #: bookwyrm/templates/preferences/edit_user.html:46
 msgid "Show set reading goal prompt in feed:"
-msgstr ""
-"Afficher le message pour définir un défi lecture dans le fil d’actualité :"
+msgstr "Afficher le message pour définir un défi lecture dans le fil d’actualité :"
 
 #: bookwyrm/templates/preferences/edit_user.html:62
 #, python-format
-msgid ""
-"Your account will show up in the <a href=\"%(path)s\">directory</a>, and may "
-"be recommended to other BookWyrm users."
-msgstr ""
-"Votre compte sera listé dans le <a href=\"%(path)s\">répertoire</a> et "
-"pourra être recommandé à d’autres utilisateurs ou utilisatrices de BookWyrm."
+msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
+msgstr "Votre compte sera listé dans le <a href=\"%(path)s\">répertoire</a> et pourra être recommandé à d’autres utilisateurs ou utilisatrices de BookWyrm."
 
 #: bookwyrm/templates/preferences/edit_user.html:65
 msgid "Preferred Timezone: "
@@ -1856,6 +1730,10 @@ msgid "Load results from other catalogues"
 msgstr "Montrer les résultats d’autres catalogues"
 
 #: bookwyrm/templates/search/book.html:68
+msgid "Manually add book"
+msgstr ""
+
+#: bookwyrm/templates/search/book.html:73
 msgid "Log in to import or add books."
 msgstr ""
 
@@ -2270,7 +2148,7 @@ msgstr "Autoriser les demandes d’invitation :"
 msgid "Registration closed text:"
 msgstr "Texte affiché lorsque les enregistrements sont clos :"
 
-#: bookwyrm/templates/snippets/book_cover.html:36
+#: bookwyrm/templates/snippets/book_cover.html:32
 msgid "No cover"
 msgstr "Aucune couverture"
 
@@ -2321,48 +2199,54 @@ msgstr "Citation :"
 msgid "Review:"
 msgstr "Critique :"
 
-#: bookwyrm/templates/snippets/create_status_form.html:42
+#: bookwyrm/templates/snippets/create_status_form.html:53
 #: bookwyrm/templates/snippets/status/layout.html:30
 #: bookwyrm/templates/snippets/status/layout.html:48
 #: bookwyrm/templates/snippets/status/layout.html:49
 msgid "Reply"
 msgstr "Répondre"
 
-#: bookwyrm/templates/snippets/create_status_form.html:67
+#: bookwyrm/templates/snippets/create_status_form.html:53
+#, fuzzy
+#| msgid "Footer Content"
+msgid "Content"
+msgstr "Contenu du pied de page"
+
+#: bookwyrm/templates/snippets/create_status_form.html:77
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
 msgid "Progress:"
 msgstr "Progression :"
 
-#: bookwyrm/templates/snippets/create_status_form.html:75
+#: bookwyrm/templates/snippets/create_status_form.html:85
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr "pages"
 
-#: bookwyrm/templates/snippets/create_status_form.html:76
+#: bookwyrm/templates/snippets/create_status_form.html:86
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr "pourcent"
 
-#: bookwyrm/templates/snippets/create_status_form.html:82
+#: bookwyrm/templates/snippets/create_status_form.html:92
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "sur %(pages)s pages"
 
-#: bookwyrm/templates/snippets/create_status_form.html:97
+#: bookwyrm/templates/snippets/create_status_form.html:107
 msgid "Include spoiler alert"
 msgstr "Afficher une alerte spoiler"
 
-#: bookwyrm/templates/snippets/create_status_form.html:104
+#: bookwyrm/templates/snippets/create_status_form.html:114
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:19
 msgid "Private"
 msgstr "Privé"
 
-#: bookwyrm/templates/snippets/create_status_form.html:115
+#: bookwyrm/templates/snippets/create_status_form.html:125
 msgid "Post"
 msgstr "Publier"
 
@@ -2372,14 +2256,11 @@ msgstr "Supprimer ces dates de lecture ?"
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
 #, python-format
-msgid ""
-"You are deleting this readthrough and its %(count)s associated progress "
-"updates."
+msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr "Vous avez supprimé ce résumé et ses %(count)s progressions associées."
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
 #: bookwyrm/templates/snippets/follow_request_buttons.html:13
-#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:391
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -2441,24 +2322,17 @@ msgstr[1] "souhaite lire %(counter)s livres en %(year)s"
 
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
 #, python-format
-msgid ""
-"Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
-msgid_plural ""
-"Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
+msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
+msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
 msgstr[0] "A noté <a href=\"%(path)s\">%(title)s</a> : %(display_rating)s star"
-msgstr[1] ""
-"A noté <a href=\"%(path)s\">%(title)s</a> : %(display_rating)s stars"
+msgstr[1] "A noté <a href=\"%(path)s\">%(title)s</a> : %(display_rating)s stars"
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4
 #, python-format
-msgid ""
-"Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
-msgid_plural ""
-"Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
-msgstr[0] ""
-"Critique de « %(book_title)s » (%(display_rating)s star): %(review_title)s"
-msgstr[1] ""
-"Critique de « %(book_title)s » (%(display_rating)s stars) : %(review_title)s"
+msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
+msgid_plural "Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
+msgstr[0] "Critique de « %(book_title)s » (%(display_rating)s star): %(review_title)s"
+msgstr[1] "Critique de « %(book_title)s » (%(display_rating)s stars) : %(review_title)s"
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:8
 #, python-format
@@ -2467,12 +2341,8 @@ msgstr "Critique de « %(book_title)s » : %(review_title)s"
 
 #: bookwyrm/templates/snippets/goal_card.html:23
 #, python-format
-msgid ""
-"You can set or change your reading goal any time from your <a href=\"%(path)s"
-"\">profile page</a>"
-msgstr ""
-"Vous pouvez définir ou changer votre défi lecture à n’importe quel moment "
-"depuis votre <a href=\"%(path)s\">profil</a>"
+msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
+msgstr "Vous pouvez définir ou changer votre défi lecture à n’importe quel moment depuis votre <a href=\"%(path)s\">profil</a>"
 
 #: bookwyrm/templates/snippets/goal_form.html:9
 msgid "Reading goal:"
@@ -2504,20 +2374,13 @@ msgstr "%(percent)s%% terminé !"
 
 #: bookwyrm/templates/snippets/goal_progress.html:10
 #, python-format
-msgid ""
-"You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
-msgstr ""
-"Vous avez lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s livres</"
-"a>."
+msgid "You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgstr "Vous avez lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s livres</a>."
 
 #: bookwyrm/templates/snippets/goal_progress.html:12
 #, python-format
-msgid ""
-"%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s "
-"books</a>."
-msgstr ""
-"%(username)s a lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s "
-"livres</a>."
+msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgstr "%(username)s a lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s livres</a>."
 
 #: bookwyrm/templates/snippets/page_text.html:4
 #, python-format
@@ -2728,12 +2591,8 @@ msgstr "partagé"
 
 #: bookwyrm/templates/snippets/status/status_header.html:44
 #, python-format
-msgid ""
-"replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
-"\"%(status_path)s\">status</a>"
-msgstr ""
-"a répondu au <a href=\"%(status_path)s\">statut</a> de <a href="
-"\"%(user_path)s\">%(username)s</a>"
+msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
+msgstr "a répondu au <a href=\"%(status_path)s\">statut</a> de <a href=\"%(user_path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/snippets/status/status_options.html:7
 #: bookwyrm/templates/snippets/user_options.html:7
@@ -2984,1397 +2843,269 @@ msgstr "Aucun compte avec cette adresse email n’a été trouvé."
 msgid "A password reset link sent to %s"
 msgstr "Un lien de réinitialisation a été envoyé à %s."
 
-#: venv3/lib/python3.8/site-packages/_pytest/config/argparsing.py:442
-#, python-format
-msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/contrib/messages/apps.py:7
 #, fuzzy
-#| msgid "All messages"
-msgid "Messages"
-msgstr "Tous les messages"
+#~| msgid "All messages"
+#~ msgid "Messages"
+#~ msgstr "Tous les messages"
 
-#: venv3/lib/python3.8/site-packages/django/contrib/sitemaps/apps.py:7
-msgid "Site Maps"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/contrib/staticfiles/apps.py:9
-msgid "Static Files"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/contrib/syndication/apps.py:7
-msgid "Syndication"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/paginator.py:45
-msgid "That page number is not an integer"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/paginator.py:47
-msgid "That page number is less than 1"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/paginator.py:52
-msgid "That page contains no results"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:32
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid value."
-msgstr "Adresse email :"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid value."
+#~ msgstr "Adresse email :"
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:103
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:659
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid URL."
-msgstr "Adresse email :"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid URL."
+#~ msgstr "Adresse email :"
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:155
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid integer."
-msgstr "Adresse email :"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid integer."
+#~ msgstr "Adresse email :"
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:166
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid email address."
-msgstr "Adresse email :"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid email address."
+#~ msgstr "Adresse email :"
 
-#. Translators: "letters" means latin letters: a-z and A-Z.
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:240
-msgid ""
-"Enter a valid “slug� consisting of letters, numbers, underscores or hyphens."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:247
-msgid ""
-"Enter a valid “slug� consisting of Unicode letters, numbers, underscores, or "
-"hyphens."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:256
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:276
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid IPv4 address."
-msgstr "Adresse email :"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid IPv4 address."
+#~ msgstr "Adresse email :"
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:261
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:277
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid IPv6 address."
-msgstr "Adresse email :"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid IPv6 address."
+#~ msgstr "Adresse email :"
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:271
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:275
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid IPv4 or IPv6 address."
-msgstr "Adresse email :"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid IPv4 or IPv6 address."
+#~ msgstr "Adresse email :"
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:305
-msgid "Enter only digits separated by commas."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:311
-#, python-format
-msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:343
-#, python-format
-msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:352
-#, python-format
-msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:362
-#, python-format
-msgid ""
-"Ensure this value has at least %(limit_value)d character (it has "
-"%(show_value)d)."
-msgid_plural ""
-"Ensure this value has at least %(limit_value)d characters (it has "
-"%(show_value)d)."
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:377
-#, python-format
-msgid ""
-"Ensure this value has at most %(limit_value)d character (it has "
-"%(show_value)d)."
-msgid_plural ""
-"Ensure this value has at most %(limit_value)d characters (it has "
-"%(show_value)d)."
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:396
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:291
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:326
 #, fuzzy
-#| msgid "Series number:"
-msgid "Enter a number."
-msgstr "Numéro dans la série :"
+#~| msgid "Series number:"
+#~ msgid "Enter a number."
+#~ msgstr "Numéro dans la série :"
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:398
-#, python-format
-msgid "Ensure that there are no more than %(max)s digit in total."
-msgid_plural "Ensure that there are no more than %(max)s digits in total."
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:403
-#, python-format
-msgid "Ensure that there are no more than %(max)s decimal place."
-msgid_plural "Ensure that there are no more than %(max)s decimal places."
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:408
-#, python-format
-msgid ""
-"Ensure that there are no more than %(max)s digit before the decimal point."
-msgid_plural ""
-"Ensure that there are no more than %(max)s digits before the decimal point."
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:470
-#, python-format
-msgid ""
-"File extension “%(extension)s� is not allowed. Allowed extensions are: "
-"%(allowed_extensions)s."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:522
-msgid "Null characters are not allowed."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/base.py:1181
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:759
-msgid "and"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/base.py:1183
 #, fuzzy, python-format
-#| msgid "A user with this email already exists."
-msgid "%(model_name)s with this %(field_labels)s already exists."
-msgstr "Cet email est déjà associé à un compte."
+#~| msgid "A user with this email already exists."
+#~ msgid "%(model_name)s with this %(field_labels)s already exists."
+#~ msgstr "Cet email est déjà associé à un compte."
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:104
 #, fuzzy, python-format
-#| msgid "%(value)s is not a valid remote_id"
-msgid "Value %(value)r is not a valid choice."
-msgstr "%(value)s n’est pas une remote_id valide."
+#~| msgid "%(value)s is not a valid remote_id"
+#~ msgid "Value %(value)r is not a valid choice."
+#~ msgstr "%(value)s n’est pas une remote_id valide."
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:105
 #, fuzzy
-#| msgid "This shelf is empty."
-msgid "This field cannot be null."
-msgstr "Cette étagère est vide"
+#~| msgid "This shelf is empty."
+#~ msgid "This field cannot be null."
+#~ msgstr "Cette étagère est vide"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:106
-msgid "This field cannot be blank."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:107
 #, fuzzy, python-format
-#| msgid "A user with this email already exists."
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "Cet email est déjà associé à un compte."
+#~| msgid "A user with this email already exists."
+#~ msgid "%(model_name)s with this %(field_label)s already exists."
+#~ msgstr "Cet email est déjà associé à un compte."
 
-#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
-#. Eg: "Title must be unique for pub_date year"
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:111
-#, python-format
-msgid ""
-"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:130
-#, python-format
-msgid "Field of type: %(field_type)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:937
-#, python-format
-msgid "“%(value)s� value must be either True or False."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:938
-#, python-format
-msgid "“%(value)s� value must be either True, False, or None."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:940
-msgid "Boolean (Either True or False)"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:981
-#, python-format
-msgid "String (up to %(max_length)s)"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1045
 #, fuzzy
-#| msgid "No active invites"
-msgid "Comma-separated integers"
-msgstr "Aucune invitation active"
+#~| msgid "No active invites"
+#~ msgid "Comma-separated integers"
+#~ msgstr "Aucune invitation active"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1094
-#, python-format
-msgid ""
-"“%(value)s� value has an invalid date format. It must be in YYYY-MM-DD "
-"format."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1096
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1239
-#, python-format
-msgid ""
-"“%(value)s� value has the correct format (YYYY-MM-DD) but it is an invalid "
-"date."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1099
-msgid "Date (without time)"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1237
-#, python-format
-msgid ""
-"“%(value)s� value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
-"uuuuuu]][TZ] format."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1241
-#, python-format
-msgid ""
-"“%(value)s� value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
-"[TZ]) but it is an invalid date/time."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1245
-msgid "Date (with time)"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1393
-#, python-format
-msgid "“%(value)s� value must be a decimal number."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1395
 #, fuzzy
-#| msgid "Series number:"
-msgid "Decimal number"
-msgstr "Numéro dans la série :"
+#~| msgid "Series number:"
+#~ msgid "Decimal number"
+#~ msgstr "Numéro dans la série :"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1534
-#, python-format
-msgid ""
-"“%(value)s� value has an invalid format. It must be in [DD] [[HH:]MM:]ss[."
-"uuuuuu] format."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1537
 #, fuzzy
-#| msgid "List curation:"
-msgid "Duration"
-msgstr "Modération de la liste :"
+#~| msgid "List curation:"
+#~ msgid "Duration"
+#~ msgstr "Modération de la liste :"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1587
 #, fuzzy
-#| msgid "Email address:"
-msgid "Email address"
-msgstr "Adresse email :"
+#~| msgid "Email address:"
+#~ msgid "Email address"
+#~ msgstr "Adresse email :"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1610
-msgid "File path"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1676
-#, python-format
-msgid "“%(value)s� value must be a float."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1678
-msgid "Floating point number"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1716
-#, python-format
-msgid "“%(value)s� value must be an integer."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1718
-msgid "Integer"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1801
 #, fuzzy
-#| msgid "No active invites"
-msgid "Big (8 byte) integer"
-msgstr "Aucune invitation active"
+#~| msgid "No active invites"
+#~ msgid "Big (8 byte) integer"
+#~ msgstr "Aucune invitation active"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1817
 #, fuzzy
-#| msgid "Email address:"
-msgid "IPv4 address"
-msgstr "Adresse email :"
+#~| msgid "Email address:"
+#~ msgid "IPv4 address"
+#~ msgstr "Adresse email :"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1848
 #, fuzzy
-#| msgid "Email address:"
-msgid "IP address"
-msgstr "Adresse email :"
+#~| msgid "Email address:"
+#~ msgid "IP address"
+#~ msgstr "Adresse email :"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1928
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1929
-#, python-format
-msgid "“%(value)s� value must be either None, True or False."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1931
-msgid "Boolean (Either True, False or None)"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1966
 #, fuzzy
-#| msgid "No active invites"
-msgid "Positive integer"
-msgstr "Aucune invitation active"
+#~| msgid "No active invites"
+#~ msgid "Positive integer"
+#~ msgstr "Aucune invitation active"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1979
 #, fuzzy
-#| msgid "No active invites"
-msgid "Positive small integer"
-msgstr "Aucune invitation active"
+#~| msgid "No active invites"
+#~ msgid "Positive small integer"
+#~ msgstr "Aucune invitation active"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1993
-#, python-format
-msgid "Slug (up to %(max_length)s)"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2025
-msgid "Small integer"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2032
-msgid "Text"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2060
-#, python-format
-msgid ""
-"“%(value)s� value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
-"format."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2062
-#, python-format
-msgid ""
-"“%(value)s� value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
-"invalid time."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2065
-msgid "Time"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2191
-msgid "URL"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2213
-msgid "Raw binary data"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2278
 #, fuzzy, python-format
-#| msgid "%(value)s is not a valid username"
-msgid "“%(value)s� is not a valid UUID."
-msgstr "%(value)s n’est pas un nom de compte valide."
+#~| msgid "%(value)s is not a valid username"
+#~ msgid "“%(value)s� is not a valid UUID."
+#~ msgstr "%(value)s n’est pas un nom de compte valide."
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2280
-msgid "Universally unique identifier"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/files.py:221
-msgid "File"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/files.py:360
 #, fuzzy
-#| msgid "Images"
-msgid "Image"
-msgstr "Images"
+#~| msgid "Images"
+#~ msgid "Image"
+#~ msgstr "Images"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:778
-#, python-format
-msgid "%(model)s instance with %(field)s %(value)r does not exist."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:780
-msgid "Foreign Key (type determined by related field)"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1012
 #, fuzzy
-#| msgid "Relationships"
-msgid "One-to-one relationship"
-msgstr "Relations"
+#~| msgid "Relationships"
+#~ msgid "One-to-one relationship"
+#~ msgstr "Relations"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1066
 #, fuzzy, python-format
-#| msgid "Relationships"
-msgid "%(from)s-%(to)s relationship"
-msgstr "Relations"
+#~| msgid "Relationships"
+#~ msgid "%(from)s-%(to)s relationship"
+#~ msgstr "Relations"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1067
 #, fuzzy, python-format
-#| msgid "Relationships"
-msgid "%(from)s-%(to)s relationships"
-msgstr "Relations"
+#~| msgid "Relationships"
+#~ msgid "%(from)s-%(to)s relationships"
+#~ msgstr "Relations"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1109
 #, fuzzy
-#| msgid "Relationships"
-msgid "Many-to-many relationship"
-msgstr "Relations"
+#~| msgid "Relationships"
+#~ msgid "Many-to-many relationship"
+#~ msgstr "Relations"
 
-#. Translators: If found as last label character, these punctuation
-#. characters will prevent the default label_suffix to be appended to the label
-#: venv3/lib/python3.8/site-packages/django/forms/boundfield.py:149
-msgid ":?.!"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:53
 #, fuzzy
-#| msgid "This shelf is empty."
-msgid "This field is required."
-msgstr "Cette étagère est vide"
+#~| msgid "This shelf is empty."
+#~ msgid "This field is required."
+#~ msgstr "Cette étagère est vide"
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:246
 #, fuzzy
-#| msgid "Series number:"
-msgid "Enter a whole number."
-msgstr "Numéro dans la série :"
+#~| msgid "Series number:"
+#~ msgid "Enter a whole number."
+#~ msgstr "Numéro dans la série :"
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:397
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:1127
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid date."
-msgstr "Adresse email :"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid date."
+#~ msgstr "Adresse email :"
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:421
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:1128
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid time."
-msgstr "Adresse email :"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid time."
+#~ msgstr "Adresse email :"
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:443
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid date/time."
-msgstr "Adresse email :"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid date/time."
+#~ msgstr "Adresse email :"
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:472
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid duration."
-msgstr "Adresse email :"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid duration."
+#~ msgstr "Adresse email :"
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:473
-#, python-brace-format
-msgid "The number of days must be between {min_days} and {max_days}."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:533
-msgid "No file was submitted. Check the encoding type on the form."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:534
-msgid "No file was submitted."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:535
 #, fuzzy
-#| msgid "This shelf is empty."
-msgid "The submitted file is empty."
-msgstr "Cette étagère est vide"
+#~| msgid "This shelf is empty."
+#~ msgid "The submitted file is empty."
+#~ msgstr "Cette étagère est vide"
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:537
-#, python-format
-msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
-msgid_plural ""
-"Ensure this filename has at most %(max)d characters (it has %(length)d)."
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:540
-msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:601
-msgid ""
-"Upload a valid image. The file you uploaded was either not an image or a "
-"corrupted image."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:763
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:853
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:1275
-#, python-format
-msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:854
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:969
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:1274
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a list of values."
-msgstr "Adresse email :"
+#~| msgid "Email address:"
+#~ msgid "Enter a list of values."
+#~ msgstr "Adresse email :"
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:970
-msgid "Enter a complete value."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:1186
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid UUID."
-msgstr "Adresse email :"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid UUID."
+#~ msgstr "Adresse email :"
 
-#. Translators: This is the default suffix added to form field labels
-#: venv3/lib/python3.8/site-packages/django/forms/forms.py:81
-msgid ":"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/forms.py:207
-#, python-format
-msgid "(Hidden field %(name)s) %(error)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:93
-msgid "ManagementForm data is missing or has been tampered with"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:345
-#, python-format
-msgid "Please submit %d or fewer forms."
-msgid_plural "Please submit %d or fewer forms."
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:352
-#, python-format
-msgid "Please submit %d or more forms."
-msgid_plural "Please submit %d or more forms."
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:379
-#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:386
 #, fuzzy
-#| msgid "Order by"
-msgid "Order"
-msgstr "Trier par"
+#~| msgid "Order by"
+#~ msgid "Order"
+#~ msgstr "Trier par"
 
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:754
-#, python-format
-msgid "Please correct the duplicate data for %(field)s."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:758
-#, python-format
-msgid "Please correct the duplicate data for %(field)s, which must be unique."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:764
-#, python-format
-msgid ""
-"Please correct the duplicate data for %(field_name)s which must be unique "
-"for the %(lookup)s in %(date_field)s."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:773
-msgid "Please correct the duplicate values below."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:1094
-msgid "The inline value did not match the parent instance."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:1161
-msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:1277
 #, fuzzy, python-format
-#| msgid "%(value)s is not a valid username"
-msgid "“%(pk)s� is not a valid value."
-msgstr "%(value)s n’est pas un nom de compte valide."
+#~| msgid "%(value)s is not a valid username"
+#~ msgid "“%(pk)s� is not a valid value."
+#~ msgstr "%(value)s n’est pas un nom de compte valide."
 
-#: venv3/lib/python3.8/site-packages/django/forms/utils.py:162
-#, python-format
-msgid ""
-"%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it "
-"may be ambiguous or it may not exist."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:395
-msgid "Clear"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:396
 #, fuzzy
-#| msgid "Started reading"
-msgid "Currently"
-msgstr "Commencer la lecture"
+#~| msgid "Started reading"
+#~ msgid "Currently"
+#~ msgstr "Commencer la lecture"
 
-#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:397
 #, fuzzy
-#| msgid "Change shelf"
-msgid "Change"
-msgstr "Changer d’étagère"
+#~| msgid "Change shelf"
+#~ msgid "Change"
+#~ msgstr "Changer d’étagère"
 
-#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:709
-msgid "Unknown"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:710
-msgid "Yes"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:711
-msgid "No"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:788
-msgid "yes,no,maybe"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:817
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:834
-#, python-format
-msgid "%(size)d byte"
-msgid_plural "%(size)d bytes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:836
-#, python-format
-msgid "%s KB"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:838
-#, python-format
-msgid "%s MB"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:840
-#, python-format
-msgid "%s GB"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:842
-#, python-format
-msgid "%s TB"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:844
-#, python-format
-msgid "%s PB"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:62
-msgid "p.m."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:63
-msgid "a.m."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:68
-msgid "PM"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:69
-msgid "AM"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:150
-msgid "midnight"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:152
-msgid "noon"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:295
-msgid "Monday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:296
-msgid "Tuesday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:297
-msgid "Wednesday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:298
-msgid "Thursday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:299
-msgid "Friday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:7
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:300
-msgid "Saturday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:7
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:301
-msgid "Sunday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
-msgid "Mon"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
-msgid "Tue"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
-msgid "Wed"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
-msgid "Thu"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
-msgid "Fri"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:11
 #, fuzzy
-#| msgid "Status"
-msgid "Sat"
-msgstr "Statut"
+#~| msgid "Status"
+#~ msgid "Sat"
+#~ msgstr "Statut"
 
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:11
-msgid "Sun"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:281
-msgid "January"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:282
-msgid "February"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:283
 #, fuzzy
-#| msgid "Search"
-msgid "March"
-msgstr "Chercher"
+#~| msgid "Search"
+#~ msgid "March"
+#~ msgstr "Chercher"
 
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:284
-msgid "April"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:285
-msgid "May"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:286
-msgid "June"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:287
-msgid "July"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:288
-msgid "August"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:289
 #, fuzzy
-#| msgid "Series number:"
-msgid "September"
-msgstr "Numéro dans la série :"
+#~| msgid "Series number:"
+#~ msgid "September"
+#~ msgstr "Numéro dans la série :"
 
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:290
-msgid "October"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:291
-msgid "November"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:16
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:292
 #, fuzzy
-#| msgid "Series number:"
-msgid "December"
-msgstr "Numéro dans la série :"
+#~| msgid "Series number:"
+#~ msgid "December"
+#~ msgstr "Numéro dans la série :"
 
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "jan"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "feb"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "mar"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "apr"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "may"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "jun"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "jul"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "aug"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "sep"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "oct"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "nov"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "dec"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:23
-msgctxt "abbrev. month"
-msgid "Jan."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:24
-msgctxt "abbrev. month"
-msgid "Feb."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:25
 #, fuzzy
-#| msgid "Search"
-msgctxt "abbrev. month"
-msgid "March"
-msgstr "Chercher"
+#~| msgid "Search"
+#~ msgctxt "abbrev. month"
+#~ msgid "March"
+#~ msgstr "Chercher"
 
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:26
-msgctxt "abbrev. month"
-msgid "April"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:27
-msgctxt "abbrev. month"
-msgid "May"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:28
-msgctxt "abbrev. month"
-msgid "June"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:29
-msgctxt "abbrev. month"
-msgid "July"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:30
-msgctxt "abbrev. month"
-msgid "Aug."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:31
-msgctxt "abbrev. month"
-msgid "Sept."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:32
-msgctxt "abbrev. month"
-msgid "Oct."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:33
-msgctxt "abbrev. month"
-msgid "Nov."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:34
-msgctxt "abbrev. month"
-msgid "Dec."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:37
-msgctxt "alt. month"
-msgid "January"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:38
-msgctxt "alt. month"
-msgid "February"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:39
 #, fuzzy
-#| msgid "Search"
-msgctxt "alt. month"
-msgid "March"
-msgstr "Chercher"
+#~| msgid "Search"
+#~ msgctxt "alt. month"
+#~ msgid "March"
+#~ msgstr "Chercher"
 
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:40
-msgctxt "alt. month"
-msgid "April"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:41
-msgctxt "alt. month"
-msgid "May"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:42
-msgctxt "alt. month"
-msgid "June"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:43
-msgctxt "alt. month"
-msgid "July"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:44
-msgctxt "alt. month"
-msgid "August"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:45
 #, fuzzy
-#| msgid "Series number:"
-msgctxt "alt. month"
-msgid "September"
-msgstr "Numéro dans la série :"
+#~| msgid "Series number:"
+#~ msgctxt "alt. month"
+#~ msgid "September"
+#~ msgstr "Numéro dans la série :"
 
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:46
-msgctxt "alt. month"
-msgid "October"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:47
-msgctxt "alt. month"
-msgid "November"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:48
 #, fuzzy
-#| msgid "Series number:"
-msgctxt "alt. month"
-msgid "December"
-msgstr "Numéro dans la série :"
+#~| msgid "Series number:"
+#~ msgctxt "alt. month"
+#~ msgid "December"
+#~ msgstr "Numéro dans la série :"
 
-#: venv3/lib/python3.8/site-packages/django/utils/ipv6.py:8
 #, fuzzy
-#| msgid "Email address:"
-msgid "This is not a valid IPv6 address."
-msgstr "Adresse email :"
+#~| msgid "Email address:"
+#~ msgid "This is not a valid IPv6 address."
+#~ msgstr "Adresse email :"
 
-#: venv3/lib/python3.8/site-packages/django/utils/text.py:69
-#, python-format
-msgctxt "String to return when truncating text"
-msgid "%(truncated_text)s…"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/text.py:235
-msgid "or"
-msgstr ""
-
-#. Translators: This string is used as a separator between list elements
-#: venv3/lib/python3.8/site-packages/django/utils/text.py:254
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:83
-msgid ", "
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:9
-#, python-format
-msgid "%d year"
-msgid_plural "%d years"
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:10
-#, python-format
-msgid "%d month"
-msgid_plural "%d months"
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:11
-#, python-format
-msgid "%d week"
-msgid_plural "%d weeks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:12
-#, python-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:13
-#, python-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:14
-#, python-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:72
-msgid "0 minutes"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:110
-msgid "Forbidden"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:111
-msgid "CSRF verification failed. Request aborted."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:115
-msgid ""
-"You are seeing this message because this HTTPS site requires a “Referer "
-"header� to be sent by your Web browser, but none was sent. This header is "
-"required for security reasons, to ensure that your browser is not being "
-"hijacked by third parties."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:120
-msgid ""
-"If you have configured your browser to disable “Referer� headers, please re-"
-"enable them, at least for this site, or for HTTPS connections, or for “same-"
-"origin� requests."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:124
-msgid ""
-"If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
-"including the “Referrer-Policy: no-referrer� header, please remove them. The "
-"CSRF protection requires the “Referer� header to do strict referer checking. "
-"If you’re concerned about privacy, use alternatives like <a rel=\"noreferrer"
-"\" …> for links to third-party sites."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:132
-msgid ""
-"You are seeing this message because this site requires a CSRF cookie when "
-"submitting forms. This cookie is required for security reasons, to ensure "
-"that your browser is not being hijacked by third parties."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:137
-msgid ""
-"If you have configured your browser to disable cookies, please re-enable "
-"them, at least for this site, or for “same-origin� requests."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:142
-msgid "More information is available with DEBUG=True."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:41
-msgid "No year specified"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:61
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:111
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:208
-msgid "Date out of range"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:90
-msgid "No month specified"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:142
-msgid "No day specified"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:188
-msgid "No week specified"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:338
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:367
-#, python-format
-msgid "No %(verbose_name_plural)s available"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:589
-#, python-format
-msgid ""
-"Future %(verbose_name_plural)s not available because %(class_name)s."
-"allow_future is False."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:623
-#, python-format
-msgid "Invalid date string “%(datestr)s� given format “%(format)s�"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/detail.py:54
 #, fuzzy, python-format
-#| msgid "No books found matching the query \"%(query)s\""
-msgid "No %(verbose_name)s found matching the query"
-msgstr "Aucun livre trouvé pour la requête « %(query)s »"
+#~| msgid "No books found matching the query \"%(query)s\""
+#~ msgid "No %(verbose_name)s found matching the query"
+#~ msgstr "Aucun livre trouvé pour la requête « %(query)s »"
 
-#: venv3/lib/python3.8/site-packages/django/views/generic/list.py:67
-msgid "Page is not “last�, nor can it be converted to an int."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/list.py:72
-#, python-format
-msgid "Invalid page (%(page_number)s): %(message)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/list.py:154
-#, python-format
-msgid "Empty list and “%(class_name)s.allow_empty� is False."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/static.py:40
-msgid "Directory indexes are not allowed here."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/static.py:42
-#, python-format
-msgid "“%(path)s� does not exist"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/static.py:80
-#, python-format
-msgid "Index of %(directory)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:7
-msgid "Django: the Web framework for perfectionists with deadlines."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:346
-#, python-format
-msgid ""
-"View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
-"target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:368
-msgid "The install worked successfully! Congratulations!"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:369
-#, python-format
-msgid ""
-"You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
-"%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
-"\">DEBUG=True</a> is in your settings file and you have not configured any "
-"URLs."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:384
-msgid "Django Documentation"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:385
-msgid "Topics, references, &amp; how-to’s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:396
-msgid "Tutorial: A Polling App"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:397
-msgid "Get started with Django"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:408
 #, fuzzy
-#| msgid "Community"
-msgid "Django Community"
-msgstr "Communauté"
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:409
-msgid "Connect, get help, or contribute"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/kombu/transport/qpid.py:1301
-#, python-format
-msgid "Attempting to connect to qpid with SASL mechanism %s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/kombu/transport/qpid.py:1306
-#, python-format
-msgid "Connected to qpid with SASL mechanism %s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/kombu/transport/qpid.py:1324
-#, python-format
-msgid "Unable to connect to qpid with SASL mechanism %s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:371
-msgid "1 second ago"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:377
-msgid "1 minute ago"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:382
-msgid "1 hour ago"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:385
-#, python-format
-msgid "%(time)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:387
-msgid "yesterday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:387
-#, python-format
-msgid "yesterday at %(time)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:389
-#, python-format
-msgid "%(weekday)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:389
-#, python-format
-msgid "%(weekday)s at %(time)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:392
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:445
-#, python-format
-msgid "%(month_name)s %(day)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:394
-#, python-format
-msgid "%(month_name)s %(day)s at %(time)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:399
-#, python-format
-msgid "%(month_name)s %(day)s, %(year)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:401
-#, python-format
-msgid "%(month_name)s %(day)s, %(year)s at %(time)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:439
-#, python-format
-msgid "%(weekday)s, %(month_name)s %(day)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:462
-#, python-format
-msgid "%(commas)s and %(last)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:68
-msgctxt "law"
-msgid "right"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:69
-msgctxt "good"
-msgid "right"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:71
-#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:74
-msgctxt "organization"
-msgid "club"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:76
-#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:77
-msgctxt "stick"
-msgid "club"
-msgstr ""
+#~| msgid "Community"
+#~ msgid "Django Community"
+#~ msgstr "Communauté"
 
 #~ msgid "Didn't find what you were looking for?"
 #~ msgstr "Vous n’avez pas trouvé ce que vous cherchiez ?"
@@ -4406,28 +3137,16 @@ msgstr ""
 #~ msgstr[1] "%(rating)s étoiles"
 
 #, python-format
-#~ msgid ""
-#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
-#~ "\"%(status_path)s\">review</a>"
-#~ msgstr ""
-#~ "a répondu à la <a href=\"%(status_path)s\">critique</a> de <a href="
-#~ "\"%(user_path)s\">%(username)s</a>"
+#~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">review</a>"
+#~ msgstr "a répondu à la <a href=\"%(status_path)s\">critique</a> de <a href=\"%(user_path)s\">%(username)s</a>"
 
 #, python-format
-#~ msgid ""
-#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
-#~ "\"%(status_path)s\">comment</a>"
-#~ msgstr ""
-#~ "a répondu au <a href=\"%(status_path)s\">commentaire</a> de <a href="
-#~ "\"%(user_path)s\">%(username)s</a>"
+#~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">comment</a>"
+#~ msgstr "a répondu au <a href=\"%(status_path)s\">commentaire</a> de <a href=\"%(user_path)s\">%(username)s</a>"
 
 #, python-format
-#~ msgid ""
-#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
-#~ "\"%(status_path)s\">quote</a>"
-#~ msgstr ""
-#~ "a répondu à la <a href=\"%(status_path)s\">citation</a> de <a href="
-#~ "\"%(user_path)s\">%(username)s</a>"
+#~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">quote</a>"
+#~ msgstr "a répondu à la <a href=\"%(status_path)s\">citation</a> de <a href=\"%(user_path)s\">%(username)s</a>"
 
 #~ msgid "Remove tag"
 #~ msgstr "Supprimer le tag"
diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
index 9c863e41..c3247438 100644
--- a/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/locale/zh_Hans/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-01 10:56-0700\n"
+"POT-Creation-Date: 2021-05-03 11:22-0700\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"
@@ -238,12 +238,8 @@ msgstr "此版本在你的 <a href=\"%(path)s\">%(shelf_name)s</a> 书架上。"
 
 #: bookwyrm/templates/book/book.html:151
 #, python-format
-msgid ""
-"A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a "
-"href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
-msgstr ""
-"本书的 <a href=\"%(book_path)s\">�一个版本</a> 在你的 <a href="
-"\"%(shelf_path)s\">%(shelf_name)s</a> 书架上。"
+msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
+msgstr "本书的 <a href=\"%(book_path)s\">�一个版本</a> 在你的 <a href=\"%(shelf_path)s\">%(shelf_name)s</a> 书架上。"
 
 #: bookwyrm/templates/book/book.html:162
 msgid "Your reading activity"
@@ -588,9 +584,7 @@ msgstr "使你的个人资料�以被其它 BookWyrm 用户�现。"
 
 #: bookwyrm/templates/directory/directory.html:24
 #, python-format
-msgid ""
-"You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</"
-"a>"
+msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
 msgstr "你�以在任何时候从你的 <a href=\"%(path)s\">个人资料设定</a> 中退出。"
 
 #: bookwyrm/templates/directory/directory.html:29
@@ -755,12 +749,8 @@ msgstr "你好呀，"
 
 #: bookwyrm/templates/email/html_layout.html:21
 #, python-format
-msgid ""
-"BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">"
-"%(site_name)s</a>"
-msgstr ""
-"�于 <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</"
-"a> çš„ BookWyrm"
+msgid "BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a>"
+msgstr "�于 <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a> 的 BookWyrm"
 
 #: bookwyrm/templates/email/html_layout.html:23
 msgid "Email preference"
@@ -778,17 +768,12 @@ msgstr "立�加入"
 
 #: bookwyrm/templates/email/invite/html_content.html:15
 #, python-format
-msgid ""
-"Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</"
-"a>."
-msgstr ""
-"了解更多 <a href=\"https://%(domain)s%(about_path)s\">有关本实例的信�</a>。"
+msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
+msgstr "了解更多 <a href=\"https://%(domain)s%(about_path)s\">有关本实例的信�</a>。"
 
 #: bookwyrm/templates/email/invite/text_content.html:4
 #, python-format
-msgid ""
-"You're invited to join %(site_name)s! Click the link below to create an "
-"account."
+msgid "You're invited to join %(site_name)s! Click the link below to create an account."
 msgstr "你�邀请加入 %(site_name)s�点击下�的连接�创建��。"
 
 #: bookwyrm/templates/email/invite/text_content.html:8
@@ -798,12 +783,8 @@ msgstr "了解更多有关本实例的信�:"
 #: bookwyrm/templates/email/password_reset/html_content.html:6
 #: bookwyrm/templates/email/password_reset/text_content.html:4
 #, python-format
-msgid ""
-"You requested to reset your %(site_name)s password. Click the link below to "
-"set a new password and log in to your account."
-msgstr ""
-"你请求�置你在 %(site_name)s 的密�。点击下�的链接�设置新密�并登录你的�"
-"�。"
+msgid "You requested to reset your %(site_name)s password. Click the link below to set a new password and log in to your account."
+msgstr "你请求�置你在 %(site_name)s 的密�。点击下�的链接�设置新密�并登录你的��。"
 
 #: bookwyrm/templates/email/password_reset/html_content.html:9
 #: bookwyrm/templates/password_reset.html:4
@@ -815,8 +796,7 @@ msgstr "�设密�"
 
 #: bookwyrm/templates/email/password_reset/html_content.html:13
 #: bookwyrm/templates/email/password_reset/text_content.html:8
-msgid ""
-"If you didn't request to reset your password, you can ignore this email."
+msgid "If you didn't request to reset your password, you can ignore this email."
 msgstr "如果你没有请求�设密�，你�以忽略这�邮件。"
 
 #: bookwyrm/templates/email/password_reset/subject.html:2
@@ -873,8 +853,7 @@ msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
 msgstr "加载 <span data-poll=\"stream/%(tab)s\">0</span> �未读状�"
 
 #: bookwyrm/templates/feed/feed.html:48
-msgid ""
-"There aren't any activities right now! Try following a user to get started"
+msgid "There aren't any activities right now! Try following a user to get started"
 msgstr "现在还没有任何活动��试�从关注一个用户开始�"
 
 #: bookwyrm/templates/feed/feed.html:56
@@ -893,8 +872,7 @@ msgid "Your books"
 msgstr "你的书目"
 
 #: bookwyrm/templates/feed/feed_layout.html:13
-msgid ""
-"There are no books here right now! Try searching for a book to get started"
+msgid "There are no books here right now! Try searching for a book to get started"
 msgstr "现在这里还没有任何书目��试�从�索�本书开始�"
 
 #: bookwyrm/templates/feed/feed_layout.html:24
@@ -1046,9 +1024,7 @@ msgid "Show this account in suggested users:"
 msgstr "在推�的用户中显示此��:"
 
 #: bookwyrm/templates/get_started/profile.html:52
-msgid ""
-"Your account will show up in the directory, and may be recommended to other "
-"BookWyrm users."
+msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users."
 msgstr "你的��会显示在目录中，并且�能会�其它 BookWyrm 用户推�。"
 
 #: bookwyrm/templates/get_started/users.html:11
@@ -1072,9 +1048,7 @@ msgstr "编辑目标"
 #: bookwyrm/templates/goal.html:30
 #: bookwyrm/templates/snippets/goal_card.html:13
 #, python-format
-msgid ""
-"Set a goal for how many books you'll finish reading in %(year)s, and track "
-"your progress throughout the year."
+msgid "Set a goal for how many books you'll finish reading in %(year)s, and track your progress throughout the year."
 msgstr "设定一个 %(year)s 内�读多少书的目标，并记录你全年的进度。"
 
 #: bookwyrm/templates/goal.html:39
@@ -1157,9 +1131,7 @@ msgstr "加载失败"
 
 #: bookwyrm/templates/import_status.html:44
 #, python-format
-msgid ""
-"Jump to the bottom of the list to select the %(failed_count)s items which "
-"failed to import."
+msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
 msgstr "跳转至列表底部�选� %(failed_count)s 个导入失败的项目。"
 
 #: bookwyrm/templates/import_status.html:79
@@ -1298,20 +1270,12 @@ msgstr "列表策展:"
 
 #: bookwyrm/templates/layout.html:213
 #, python-format
-msgid ""
-"Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">"
-"%(support_title)s</a>"
-msgstr ""
-"在 <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a> 上支"
-"� %(site_name)s"
+msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
+msgstr "在 <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a> 上支� %(site_name)s"
 
 #: bookwyrm/templates/layout.html:217
-msgid ""
-"BookWyrm is open source software. You can contribute or report issues on <a "
-"href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
-msgstr ""
-"BookWyrm 是开�软件。你�以在 <a href=\"https://github.com/mouse-reeve/"
-"bookwyrm\">GitHub</a> 贡献或报告问题。"
+msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgstr "BookWyrm 是开�软件。你�以在 <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> 贡献或报告问题。"
 
 #: bookwyrm/templates/lists/create_form.html:5
 #: bookwyrm/templates/lists/lists.html:20
@@ -1497,7 +1461,7 @@ msgstr "监察员评论"
 
 #: bookwyrm/templates/moderation/report.html:41
 #: bookwyrm/templates/snippets/create_status.html:28
-#: bookwyrm/templates/snippets/create_status_form.html:53
+#: bookwyrm/templates/snippets/create_status_form.html:63
 msgid "Comment"
 msgstr "评论"
 
@@ -1576,27 +1540,18 @@ msgstr "删除通知"
 
 #: bookwyrm/templates/notifications.html:53
 #, python-format
-msgid ""
-"favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</"
-"em></a>"
-msgstr ""
-"喜欢了你 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的书评</a>"
+msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "喜欢了你 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的书评</a>"
 
 #: bookwyrm/templates/notifications.html:55
 #, python-format
-msgid ""
-"favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</"
-"em></a>"
-msgstr ""
-"喜欢了你 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的评论</a>"
+msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
+msgstr "喜欢了你 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的评论</a>"
 
 #: bookwyrm/templates/notifications.html:57
 #, python-format
-msgid ""
-"favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
-"em></a>"
-msgstr ""
-"喜欢了你 <a href=\"%(related_path)s\">�自 <em>%(book_title)s</em> 的引用</a>"
+msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr "喜欢了你 <a href=\"%(related_path)s\">�自 <em>%(book_title)s</em> 的引用</a>"
 
 #: bookwyrm/templates/notifications.html:59
 #, python-format
@@ -1605,30 +1560,18 @@ msgstr "喜欢了你的 <a href=\"%(related_path)s\">状�</a>"
 
 #: bookwyrm/templates/notifications.html:64
 #, python-format
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">review of <em>"
-"%(book_title)s</em></a>"
-msgstr ""
-"在 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的书评</a> 里�到"
-"了你"
+msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "在 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的书评</a> 里�到了你"
 
 #: bookwyrm/templates/notifications.html:66
 #, python-format
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">comment on <em>"
-"%(book_title)s</em></a>"
-msgstr ""
-"在 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的评论</a> 里�到"
-"了你"
+msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
+msgstr "在 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的评论</a> 里�到了你"
 
 #: bookwyrm/templates/notifications.html:68
 #, python-format
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">quote from <em>"
-"%(book_title)s</em></a>"
-msgstr ""
-"在 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的引用</a> 中�到"
-"了你"
+msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr "在 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的引用</a> 中�到了你"
 
 #: bookwyrm/templates/notifications.html:70
 #, python-format
@@ -1637,39 +1580,23 @@ msgstr "在 <a href=\"%(related_path)s\">状�</a> 中�到了你"
 
 #: bookwyrm/templates/notifications.html:75
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">review of <em>%(book_title)s</em></a>"
-msgstr ""
-"<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">对 "
-"<em>%(book_title)s</em> 的书评</a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">对 <em>%(book_title)s</em> 的书评</a>"
 
 #: bookwyrm/templates/notifications.html:77
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">comment on <em>%(book_title)s</em></a>"
-msgstr ""
-"<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">对 "
-"<em>%(book_title)s</em> 的评论</a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
+msgstr "<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">对 <em>%(book_title)s</em> 的评论</a>"
 
 #: bookwyrm/templates/notifications.html:79
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">quote from <em>%(book_title)s</em></a>"
-msgstr ""
-"<a href=\"%(related_path)s\">回�</a> 了你 <a href=\"%(parent_path)s\">对 "
-"<em>%(book_title)s</em> 中的引用</a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr "<a href=\"%(related_path)s\">回�</a> 了你 <a href=\"%(parent_path)s\">对 <em>%(book_title)s</em> 中的引用</a>"
 
 #: bookwyrm/templates/notifications.html:81
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">status</a>"
-msgstr ""
-"<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">状�"
-"</a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
+msgstr "<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">状�</a>"
 
 #: bookwyrm/templates/notifications.html:85
 msgid "followed you"
@@ -1681,27 +1608,18 @@ msgstr "�你��了关注请求"
 
 #: bookwyrm/templates/notifications.html:94
 #, python-format
-msgid ""
-"boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></"
-"a>"
-msgstr ""
-"转�了你的 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的书评</a>"
+msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr "转�了你的 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的书评</a>"
 
 #: bookwyrm/templates/notifications.html:96
 #, python-format
-msgid ""
-"boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></"
-"a>"
-msgstr ""
-"转�了你的 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的评论</a>"
+msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+msgstr "转�了你的 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的评论</a>"
 
 #: bookwyrm/templates/notifications.html:98
 #, python-format
-msgid ""
-"boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
-"em></a>"
-msgstr ""
-"转�了你的 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的引用</a>"
+msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr "转�了你的 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的引用</a>"
 
 #: bookwyrm/templates/notifications.html:100
 #, python-format
@@ -1710,21 +1628,13 @@ msgstr "转�了你的 <a href=\"%(related_path)s\">状�</a>"
 
 #: bookwyrm/templates/notifications.html:104
 #, python-format
-msgid ""
-" added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
-"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
-msgstr ""
-" 添加了 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 "
-"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgstr " 添加了 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 
 #: bookwyrm/templates/notifications.html:106
 #, python-format
-msgid ""
-" suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to "
-"your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
-msgstr ""
-" 推�添加 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 "
-"\"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgstr " 推�添加 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 
 #: bookwyrm/templates/notifications.html:110
 #, python-format
@@ -1785,12 +1695,8 @@ msgstr "在消��中显示设置阅读目标的�示:"
 
 #: bookwyrm/templates/preferences/edit_user.html:62
 #, python-format
-msgid ""
-"Your account will show up in the <a href=\"%(path)s\">directory</a>, and may "
-"be recommended to other BookWyrm users."
-msgstr ""
-"你的��会显示在 <a href=\"%(path)s\">目录</a> 中，并�能�其它 BookWyrm 用户"
-"推�。"
+msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
+msgstr "你的��会显示在 <a href=\"%(path)s\">目录</a> 中，并�能�其它 BookWyrm 用户推�。"
 
 #: bookwyrm/templates/preferences/edit_user.html:65
 msgid "Preferred Timezone: "
@@ -1821,6 +1727,10 @@ msgid "Load results from other catalogues"
 msgstr "显示其它类别的结果"
 
 #: bookwyrm/templates/search/book.html:68
+msgid "Manually add book"
+msgstr ""
+
+#: bookwyrm/templates/search/book.html:73
 msgid "Log in to import or add books."
 msgstr ""
 
@@ -2239,7 +2149,7 @@ msgstr "�许请求邀请:"
 msgid "Registration closed text:"
 msgstr "注册关闭文字:"
 
-#: bookwyrm/templates/snippets/book_cover.html:36
+#: bookwyrm/templates/snippets/book_cover.html:32
 msgid "No cover"
 msgstr "没有��"
 
@@ -2290,48 +2200,54 @@ msgstr "引用:"
 msgid "Review:"
 msgstr "书评:"
 
-#: bookwyrm/templates/snippets/create_status_form.html:42
+#: bookwyrm/templates/snippets/create_status_form.html:53
 #: bookwyrm/templates/snippets/status/layout.html:30
 #: bookwyrm/templates/snippets/status/layout.html:48
 #: bookwyrm/templates/snippets/status/layout.html:49
 msgid "Reply"
 msgstr "回�"
 
-#: bookwyrm/templates/snippets/create_status_form.html:67
+#: bookwyrm/templates/snippets/create_status_form.html:53
+#, fuzzy
+#| msgid "Footer Content"
+msgid "Content"
+msgstr "页脚内容"
+
+#: bookwyrm/templates/snippets/create_status_form.html:77
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
 msgid "Progress:"
 msgstr "进度:"
 
-#: bookwyrm/templates/snippets/create_status_form.html:75
+#: bookwyrm/templates/snippets/create_status_form.html:85
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr "页数"
 
-#: bookwyrm/templates/snippets/create_status_form.html:76
+#: bookwyrm/templates/snippets/create_status_form.html:86
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr "百分比"
 
-#: bookwyrm/templates/snippets/create_status_form.html:82
+#: bookwyrm/templates/snippets/create_status_form.html:92
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "全书 %(pages)s 页"
 
-#: bookwyrm/templates/snippets/create_status_form.html:97
+#: bookwyrm/templates/snippets/create_status_form.html:107
 msgid "Include spoiler alert"
 msgstr "加入剧�警告"
 
-#: bookwyrm/templates/snippets/create_status_form.html:104
+#: bookwyrm/templates/snippets/create_status_form.html:114
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:19
 msgid "Private"
 msgstr "�密"
 
-#: bookwyrm/templates/snippets/create_status_form.html:115
+#: bookwyrm/templates/snippets/create_status_form.html:125
 msgid "Post"
 msgstr "�布"
 
@@ -2341,14 +2257,11 @@ msgstr "删除这些阅读日期�？"
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
 #, python-format
-msgid ""
-"You are deleting this readthrough and its %(count)s associated progress "
-"updates."
+msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr "你正�删除这篇阅读�过以�与之相关的 %(count)s 次进度更新。"
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
 #: bookwyrm/templates/snippets/follow_request_buttons.html:13
-#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:391
 msgid "Delete"
 msgstr "删除"
 
@@ -2409,21 +2322,15 @@ msgstr[0] "设定了在 %(year)s 内�读 %(counter)s 本书的目标"
 
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
 #, python-format
-msgid ""
-"Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
-msgid_plural ""
-"Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
-msgstr[0] ""
-"为 <em><a href=\"%(path)s\">%(title)s</a></em> 打了分: %(display_rating)s 星"
+msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
+msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
+msgstr[0] "为 <em><a href=\"%(path)s\">%(title)s</a></em> 打了分: %(display_rating)s 星"
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4
 #, python-format
-msgid ""
-"Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
-msgid_plural ""
-"Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
-msgstr[0] ""
-"\"%(book_title)s\" 的书评（%(display_rating)s 星）: %(review_title)s"
+msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
+msgid_plural "Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
+msgstr[0] "\"%(book_title)s\" 的书评（%(display_rating)s 星）: %(review_title)s"
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:8
 #, python-format
@@ -2432,12 +2339,8 @@ msgstr "\"%(book_title)s\" 的书评: %(review_title)s"
 
 #: bookwyrm/templates/snippets/goal_card.html:23
 #, python-format
-msgid ""
-"You can set or change your reading goal any time from your <a href=\"%(path)s"
-"\">profile page</a>"
-msgstr ""
-"你�以在任何时候从你的<a href=\"%(path)s\">个人资料页�</a> 中设置或改�你的"
-"阅读目标"
+msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
+msgstr "你�以在任何时候从你的<a href=\"%(path)s\">个人资料页�</a> 中设置或改�你的阅读目标"
 
 #: bookwyrm/templates/snippets/goal_form.html:9
 msgid "Reading goal:"
@@ -2469,20 +2372,13 @@ msgstr "完�了 %(percent)s%% �"
 
 #: bookwyrm/templates/snippets/goal_progress.html:10
 #, python-format
-msgid ""
-"You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
-msgstr ""
-"你已�阅读了 <a href=\"%(path)s\">%(goal_count)s 本书中的 %(read_count)s 本</"
-"a>。"
+msgid "You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgstr "你已�阅读了 <a href=\"%(path)s\">%(goal_count)s 本书中的 %(read_count)s 本</a>。"
 
 #: bookwyrm/templates/snippets/goal_progress.html:12
 #, python-format
-msgid ""
-"%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s "
-"books</a>."
-msgstr ""
-"%(username)s 已�阅读了 <a href=\"%(path)s\">%(goal_count)s 本书中的 "
-"%(read_count)s 本</a>。"
+msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgstr "%(username)s 已�阅读了 <a href=\"%(path)s\">%(goal_count)s 本书中的 %(read_count)s 本</a>。"
 
 #: bookwyrm/templates/snippets/page_text.html:4
 #, python-format
@@ -2693,12 +2589,8 @@ msgstr "转�了"
 
 #: bookwyrm/templates/snippets/status/status_header.html:44
 #, python-format
-msgid ""
-"replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
-"\"%(status_path)s\">status</a>"
-msgstr ""
-"回�了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href="
-"\"%(status_path)s\">状�</a>"
+msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
+msgstr "回�了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">状�</a>"
 
 #: bookwyrm/templates/snippets/status/status_options.html:7
 #: bookwyrm/templates/snippets/user_options.html:7
@@ -2949,1382 +2841,269 @@ msgstr "没有找到使用该邮箱的用户。"
 msgid "A password reset link sent to %s"
 msgstr "密��置连接已��给 %s"
 
-#: venv3/lib/python3.8/site-packages/_pytest/config/argparsing.py:442
-#, python-format
-msgid "ambiguous option: %(option)s could match %(matches)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/contrib/messages/apps.py:7
 #, fuzzy
-#| msgid "All messages"
-msgid "Messages"
-msgstr "所有消�"
+#~| msgid "All messages"
+#~ msgid "Messages"
+#~ msgstr "所有消�"
 
-#: venv3/lib/python3.8/site-packages/django/contrib/sitemaps/apps.py:7
-msgid "Site Maps"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/contrib/staticfiles/apps.py:9
-msgid "Static Files"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/contrib/syndication/apps.py:7
-msgid "Syndication"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/paginator.py:45
-msgid "That page number is not an integer"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/paginator.py:47
-msgid "That page number is less than 1"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/paginator.py:52
-msgid "That page contains no results"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:32
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid value."
-msgstr "邮箱地�:"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid value."
+#~ msgstr "邮箱地�:"
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:103
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:659
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid URL."
-msgstr "邮箱地�:"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid URL."
+#~ msgstr "邮箱地�:"
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:155
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid integer."
-msgstr "邮箱地�:"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid integer."
+#~ msgstr "邮箱地�:"
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:166
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid email address."
-msgstr "邮箱地�:"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid email address."
+#~ msgstr "邮箱地�:"
 
-#. Translators: "letters" means latin letters: a-z and A-Z.
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:240
-msgid ""
-"Enter a valid “slug� consisting of letters, numbers, underscores or hyphens."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:247
-msgid ""
-"Enter a valid “slug� consisting of Unicode letters, numbers, underscores, or "
-"hyphens."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:256
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:276
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid IPv4 address."
-msgstr "邮箱地�:"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid IPv4 address."
+#~ msgstr "邮箱地�:"
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:261
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:277
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid IPv6 address."
-msgstr "邮箱地�:"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid IPv6 address."
+#~ msgstr "邮箱地�:"
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:271
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:275
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid IPv4 or IPv6 address."
-msgstr "邮箱地�:"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid IPv4 or IPv6 address."
+#~ msgstr "邮箱地�:"
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:305
-msgid "Enter only digits separated by commas."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:311
-#, python-format
-msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:343
-#, python-format
-msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:352
-#, python-format
-msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:362
-#, python-format
-msgid ""
-"Ensure this value has at least %(limit_value)d character (it has "
-"%(show_value)d)."
-msgid_plural ""
-"Ensure this value has at least %(limit_value)d characters (it has "
-"%(show_value)d)."
-msgstr[0] ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:377
-#, python-format
-msgid ""
-"Ensure this value has at most %(limit_value)d character (it has "
-"%(show_value)d)."
-msgid_plural ""
-"Ensure this value has at most %(limit_value)d characters (it has "
-"%(show_value)d)."
-msgstr[0] ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:396
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:291
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:326
 #, fuzzy
-#| msgid "Series number:"
-msgid "Enter a number."
-msgstr "系列编�:"
+#~| msgid "Series number:"
+#~ msgid "Enter a number."
+#~ msgstr "系列编�:"
 
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:398
-#, python-format
-msgid "Ensure that there are no more than %(max)s digit in total."
-msgid_plural "Ensure that there are no more than %(max)s digits in total."
-msgstr[0] ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:403
-#, python-format
-msgid "Ensure that there are no more than %(max)s decimal place."
-msgid_plural "Ensure that there are no more than %(max)s decimal places."
-msgstr[0] ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:408
-#, python-format
-msgid ""
-"Ensure that there are no more than %(max)s digit before the decimal point."
-msgid_plural ""
-"Ensure that there are no more than %(max)s digits before the decimal point."
-msgstr[0] ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:470
-#, python-format
-msgid ""
-"File extension “%(extension)s� is not allowed. Allowed extensions are: "
-"%(allowed_extensions)s."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/core/validators.py:522
-msgid "Null characters are not allowed."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/base.py:1181
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:759
-msgid "and"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/base.py:1183
 #, fuzzy, python-format
-#| msgid "A user with this email already exists."
-msgid "%(model_name)s with this %(field_labels)s already exists."
-msgstr "已�存在使用该邮箱的用户。"
+#~| msgid "A user with this email already exists."
+#~ msgid "%(model_name)s with this %(field_labels)s already exists."
+#~ msgstr "已�存在使用该邮箱的用户。"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:104
 #, fuzzy, python-format
-#| msgid "%(value)s is not a valid remote_id"
-msgid "Value %(value)r is not a valid choice."
-msgstr "%(value)s �是有效的 remote_id"
+#~| msgid "%(value)s is not a valid remote_id"
+#~ msgid "Value %(value)r is not a valid choice."
+#~ msgstr "%(value)s �是有效的 remote_id"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:105
 #, fuzzy
-#| msgid "This shelf is empty."
-msgid "This field cannot be null."
-msgstr "此书架是空的。"
+#~| msgid "This shelf is empty."
+#~ msgid "This field cannot be null."
+#~ msgstr "此书架是空的。"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:106
-msgid "This field cannot be blank."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:107
 #, fuzzy, python-format
-#| msgid "A user with this email already exists."
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "已�存在使用该邮箱的用户。"
+#~| msgid "A user with this email already exists."
+#~ msgid "%(model_name)s with this %(field_label)s already exists."
+#~ msgstr "已�存在使用该邮箱的用户。"
 
-#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
-#. Eg: "Title must be unique for pub_date year"
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:111
-#, python-format
-msgid ""
-"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:130
-#, python-format
-msgid "Field of type: %(field_type)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:937
-#, python-format
-msgid "“%(value)s� value must be either True or False."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:938
-#, python-format
-msgid "“%(value)s� value must be either True, False, or None."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:940
-msgid "Boolean (Either True or False)"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:981
-#, python-format
-msgid "String (up to %(max_length)s)"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1045
 #, fuzzy
-#| msgid "No active invites"
-msgid "Comma-separated integers"
-msgstr "无有效的邀请"
+#~| msgid "No active invites"
+#~ msgid "Comma-separated integers"
+#~ msgstr "无有效的邀请"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1094
-#, python-format
-msgid ""
-"“%(value)s� value has an invalid date format. It must be in YYYY-MM-DD "
-"format."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1096
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1239
-#, python-format
-msgid ""
-"“%(value)s� value has the correct format (YYYY-MM-DD) but it is an invalid "
-"date."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1099
-msgid "Date (without time)"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1237
-#, python-format
-msgid ""
-"“%(value)s� value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
-"uuuuuu]][TZ] format."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1241
-#, python-format
-msgid ""
-"“%(value)s� value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
-"[TZ]) but it is an invalid date/time."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1245
-msgid "Date (with time)"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1393
-#, python-format
-msgid "“%(value)s� value must be a decimal number."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1395
 #, fuzzy
-#| msgid "Series number:"
-msgid "Decimal number"
-msgstr "系列编�:"
+#~| msgid "Series number:"
+#~ msgid "Decimal number"
+#~ msgstr "系列编�:"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1534
-#, python-format
-msgid ""
-"“%(value)s� value has an invalid format. It must be in [DD] [[HH:]MM:]ss[."
-"uuuuuu] format."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1537
 #, fuzzy
-#| msgid "List curation:"
-msgid "Duration"
-msgstr "列表策展:"
+#~| msgid "List curation:"
+#~ msgid "Duration"
+#~ msgstr "列表策展:"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1587
 #, fuzzy
-#| msgid "Email address:"
-msgid "Email address"
-msgstr "邮箱地�:"
+#~| msgid "Email address:"
+#~ msgid "Email address"
+#~ msgstr "邮箱地�:"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1610
-msgid "File path"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1676
-#, python-format
-msgid "“%(value)s� value must be a float."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1678
-msgid "Floating point number"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1716
-#, python-format
-msgid "“%(value)s� value must be an integer."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1718
-msgid "Integer"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1801
 #, fuzzy
-#| msgid "No active invites"
-msgid "Big (8 byte) integer"
-msgstr "无有效的邀请"
+#~| msgid "No active invites"
+#~ msgid "Big (8 byte) integer"
+#~ msgstr "无有效的邀请"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1817
 #, fuzzy
-#| msgid "Email address:"
-msgid "IPv4 address"
-msgstr "邮箱地�:"
+#~| msgid "Email address:"
+#~ msgid "IPv4 address"
+#~ msgstr "邮箱地�:"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1848
 #, fuzzy
-#| msgid "Email address:"
-msgid "IP address"
-msgstr "邮箱地�:"
+#~| msgid "Email address:"
+#~ msgid "IP address"
+#~ msgstr "邮箱地�:"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1928
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1929
-#, python-format
-msgid "“%(value)s� value must be either None, True or False."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1931
-msgid "Boolean (Either True, False or None)"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1966
 #, fuzzy
-#| msgid "No active invites"
-msgid "Positive integer"
-msgstr "无有效的邀请"
+#~| msgid "No active invites"
+#~ msgid "Positive integer"
+#~ msgstr "无有效的邀请"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1979
 #, fuzzy
-#| msgid "No active invites"
-msgid "Positive small integer"
-msgstr "无有效的邀请"
+#~| msgid "No active invites"
+#~ msgid "Positive small integer"
+#~ msgstr "无有效的邀请"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:1993
-#, python-format
-msgid "Slug (up to %(max_length)s)"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2025
-msgid "Small integer"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2032
-msgid "Text"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2060
-#, python-format
-msgid ""
-"“%(value)s� value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
-"format."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2062
-#, python-format
-msgid ""
-"“%(value)s� value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
-"invalid time."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2065
-msgid "Time"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2191
-msgid "URL"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2213
-msgid "Raw binary data"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2278
 #, fuzzy, python-format
-#| msgid "%(value)s is not a valid username"
-msgid "“%(value)s� is not a valid UUID."
-msgstr "%(value)s �是有效的用户�"
+#~| msgid "%(value)s is not a valid username"
+#~ msgid "“%(value)s� is not a valid UUID."
+#~ msgstr "%(value)s �是有效的用户�"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/__init__.py:2280
-msgid "Universally unique identifier"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/files.py:221
-msgid "File"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/files.py:360
 #, fuzzy
-#| msgid "Images"
-msgid "Image"
-msgstr "图�"
+#~| msgid "Images"
+#~ msgid "Image"
+#~ msgstr "图�"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:778
-#, python-format
-msgid "%(model)s instance with %(field)s %(value)r does not exist."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:780
-msgid "Foreign Key (type determined by related field)"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1012
 #, fuzzy
-#| msgid "Relationships"
-msgid "One-to-one relationship"
-msgstr "关系"
+#~| msgid "Relationships"
+#~ msgid "One-to-one relationship"
+#~ msgstr "关系"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1066
 #, fuzzy, python-format
-#| msgid "Relationships"
-msgid "%(from)s-%(to)s relationship"
-msgstr "关系"
+#~| msgid "Relationships"
+#~ msgid "%(from)s-%(to)s relationship"
+#~ msgstr "关系"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1067
 #, fuzzy, python-format
-#| msgid "Relationships"
-msgid "%(from)s-%(to)s relationships"
-msgstr "关系"
+#~| msgid "Relationships"
+#~ msgid "%(from)s-%(to)s relationships"
+#~ msgstr "关系"
 
-#: venv3/lib/python3.8/site-packages/django/db/models/fields/related.py:1109
 #, fuzzy
-#| msgid "Relationships"
-msgid "Many-to-many relationship"
-msgstr "关系"
+#~| msgid "Relationships"
+#~ msgid "Many-to-many relationship"
+#~ msgstr "关系"
 
-#. Translators: If found as last label character, these punctuation
-#. characters will prevent the default label_suffix to be appended to the label
-#: venv3/lib/python3.8/site-packages/django/forms/boundfield.py:149
-msgid ":?.!"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:53
 #, fuzzy
-#| msgid "This shelf is empty."
-msgid "This field is required."
-msgstr "此书架是空的。"
+#~| msgid "This shelf is empty."
+#~ msgid "This field is required."
+#~ msgstr "此书架是空的。"
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:246
 #, fuzzy
-#| msgid "Series number:"
-msgid "Enter a whole number."
-msgstr "系列编�:"
+#~| msgid "Series number:"
+#~ msgid "Enter a whole number."
+#~ msgstr "系列编�:"
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:397
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:1127
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid date."
-msgstr "邮箱地�:"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid date."
+#~ msgstr "邮箱地�:"
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:421
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:1128
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid time."
-msgstr "邮箱地�:"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid time."
+#~ msgstr "邮箱地�:"
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:443
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid date/time."
-msgstr "邮箱地�:"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid date/time."
+#~ msgstr "邮箱地�:"
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:472
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid duration."
-msgstr "邮箱地�:"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid duration."
+#~ msgstr "邮箱地�:"
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:473
-#, python-brace-format
-msgid "The number of days must be between {min_days} and {max_days}."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:533
-msgid "No file was submitted. Check the encoding type on the form."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:534
-msgid "No file was submitted."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:535
 #, fuzzy
-#| msgid "This shelf is empty."
-msgid "The submitted file is empty."
-msgstr "此书架是空的。"
+#~| msgid "This shelf is empty."
+#~ msgid "The submitted file is empty."
+#~ msgstr "此书架是空的。"
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:537
-#, python-format
-msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
-msgid_plural ""
-"Ensure this filename has at most %(max)d characters (it has %(length)d)."
-msgstr[0] ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:540
-msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:601
-msgid ""
-"Upload a valid image. The file you uploaded was either not an image or a "
-"corrupted image."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:763
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:853
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:1275
-#, python-format
-msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:854
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:969
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:1274
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a list of values."
-msgstr "邮箱地�:"
+#~| msgid "Email address:"
+#~ msgid "Enter a list of values."
+#~ msgstr "邮箱地�:"
 
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:970
-msgid "Enter a complete value."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/fields.py:1186
 #, fuzzy
-#| msgid "Email address:"
-msgid "Enter a valid UUID."
-msgstr "邮箱地�:"
+#~| msgid "Email address:"
+#~ msgid "Enter a valid UUID."
+#~ msgstr "邮箱地�:"
 
-#. Translators: This is the default suffix added to form field labels
-#: venv3/lib/python3.8/site-packages/django/forms/forms.py:81
-msgid ":"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/forms.py:207
-#, python-format
-msgid "(Hidden field %(name)s) %(error)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:93
-msgid "ManagementForm data is missing or has been tampered with"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:345
-#, python-format
-msgid "Please submit %d or fewer forms."
-msgid_plural "Please submit %d or fewer forms."
-msgstr[0] ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:352
-#, python-format
-msgid "Please submit %d or more forms."
-msgid_plural "Please submit %d or more forms."
-msgstr[0] ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:379
-#: venv3/lib/python3.8/site-packages/django/forms/formsets.py:386
 #, fuzzy
-#| msgid "Order by"
-msgid "Order"
-msgstr "排列顺�"
+#~| msgid "Order by"
+#~ msgid "Order"
+#~ msgstr "排列顺�"
 
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:754
-#, python-format
-msgid "Please correct the duplicate data for %(field)s."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:758
-#, python-format
-msgid "Please correct the duplicate data for %(field)s, which must be unique."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:764
-#, python-format
-msgid ""
-"Please correct the duplicate data for %(field_name)s which must be unique "
-"for the %(lookup)s in %(date_field)s."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:773
-msgid "Please correct the duplicate values below."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:1094
-msgid "The inline value did not match the parent instance."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:1161
-msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/models.py:1277
 #, fuzzy, python-format
-#| msgid "%(value)s is not a valid username"
-msgid "“%(pk)s� is not a valid value."
-msgstr "%(value)s �是有效的用户�"
+#~| msgid "%(value)s is not a valid username"
+#~ msgid "“%(pk)s� is not a valid value."
+#~ msgstr "%(value)s �是有效的用户�"
 
-#: venv3/lib/python3.8/site-packages/django/forms/utils.py:162
-#, python-format
-msgid ""
-"%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it "
-"may be ambiguous or it may not exist."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:395
-msgid "Clear"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:396
 #, fuzzy
-#| msgid "Start reading"
-msgid "Currently"
-msgstr "开始阅读"
+#~| msgid "Start reading"
+#~ msgid "Currently"
+#~ msgstr "开始阅读"
 
-#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:397
 #, fuzzy
-#| msgid "Change shelf"
-msgid "Change"
-msgstr "改�书架"
+#~| msgid "Change shelf"
+#~ msgid "Change"
+#~ msgstr "改�书架"
 
-#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:709
-msgid "Unknown"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:710
-msgid "Yes"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/forms/widgets.py:711
-msgid "No"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:788
-msgid "yes,no,maybe"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:817
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:834
-#, python-format
-msgid "%(size)d byte"
-msgid_plural "%(size)d bytes"
-msgstr[0] ""
-
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:836
-#, python-format
-msgid "%s KB"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:838
-#, python-format
-msgid "%s MB"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:840
-#, python-format
-msgid "%s GB"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:842
-#, python-format
-msgid "%s TB"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/template/defaultfilters.py:844
-#, python-format
-msgid "%s PB"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:62
-msgid "p.m."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:63
-msgid "a.m."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:68
-msgid "PM"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:69
-msgid "AM"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:150
-msgid "midnight"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dateformat.py:152
-msgid "noon"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:295
-msgid "Monday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:296
-msgid "Tuesday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:297
-msgid "Wednesday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:298
-msgid "Thursday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:6
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:299
-msgid "Friday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:7
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:300
-msgid "Saturday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:7
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:301
-msgid "Sunday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
-msgid "Mon"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
-msgid "Tue"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
-msgid "Wed"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
-msgid "Thu"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:10
-msgid "Fri"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:11
 #, fuzzy
-#| msgid "Status"
-msgid "Sat"
-msgstr "状�"
+#~| msgid "Status"
+#~ msgid "Sat"
+#~ msgstr "状�"
 
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:11
-msgid "Sun"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:281
-msgid "January"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:282
-msgid "February"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:283
 #, fuzzy
-#| msgid "Search"
-msgid "March"
-msgstr "�索"
+#~| msgid "Search"
+#~ msgid "March"
+#~ msgstr "�索"
 
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:284
-msgid "April"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:285
-msgid "May"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:14
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:286
-msgid "June"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:287
-msgid "July"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:288
-msgid "August"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:289
 #, fuzzy
-#| msgid "Series number:"
-msgid "September"
-msgstr "系列编�:"
+#~| msgid "Series number:"
+#~ msgid "September"
+#~ msgstr "系列编�:"
 
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:290
-msgid "October"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:15
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:291
-msgid "November"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:16
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:292
 #, fuzzy
-#| msgid "Series number:"
-msgid "December"
-msgstr "系列编�:"
+#~| msgid "Series number:"
+#~ msgid "December"
+#~ msgstr "系列编�:"
 
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "jan"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "feb"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "mar"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "apr"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "may"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:19
-msgid "jun"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "jul"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "aug"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "sep"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "oct"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "nov"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:20
-msgid "dec"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:23
-msgctxt "abbrev. month"
-msgid "Jan."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:24
-msgctxt "abbrev. month"
-msgid "Feb."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:25
 #, fuzzy
-#| msgid "Search"
-msgctxt "abbrev. month"
-msgid "March"
-msgstr "�索"
+#~| msgid "Search"
+#~ msgctxt "abbrev. month"
+#~ msgid "March"
+#~ msgstr "�索"
 
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:26
-msgctxt "abbrev. month"
-msgid "April"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:27
-msgctxt "abbrev. month"
-msgid "May"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:28
-msgctxt "abbrev. month"
-msgid "June"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:29
-msgctxt "abbrev. month"
-msgid "July"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:30
-msgctxt "abbrev. month"
-msgid "Aug."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:31
-msgctxt "abbrev. month"
-msgid "Sept."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:32
-msgctxt "abbrev. month"
-msgid "Oct."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:33
-msgctxt "abbrev. month"
-msgid "Nov."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:34
-msgctxt "abbrev. month"
-msgid "Dec."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:37
-msgctxt "alt. month"
-msgid "January"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:38
-msgctxt "alt. month"
-msgid "February"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:39
 #, fuzzy
-#| msgid "Search"
-msgctxt "alt. month"
-msgid "March"
-msgstr "�索"
+#~| msgid "Search"
+#~ msgctxt "alt. month"
+#~ msgid "March"
+#~ msgstr "�索"
 
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:40
-msgctxt "alt. month"
-msgid "April"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:41
-msgctxt "alt. month"
-msgid "May"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:42
-msgctxt "alt. month"
-msgid "June"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:43
-msgctxt "alt. month"
-msgid "July"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:44
-msgctxt "alt. month"
-msgid "August"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:45
 #, fuzzy
-#| msgid "Series number:"
-msgctxt "alt. month"
-msgid "September"
-msgstr "系列编�:"
+#~| msgid "Series number:"
+#~ msgctxt "alt. month"
+#~ msgid "September"
+#~ msgstr "系列编�:"
 
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:46
-msgctxt "alt. month"
-msgid "October"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:47
-msgctxt "alt. month"
-msgid "November"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/dates.py:48
 #, fuzzy
-#| msgid "Series number:"
-msgctxt "alt. month"
-msgid "December"
-msgstr "系列编�:"
+#~| msgid "Series number:"
+#~ msgctxt "alt. month"
+#~ msgid "December"
+#~ msgstr "系列编�:"
 
-#: venv3/lib/python3.8/site-packages/django/utils/ipv6.py:8
 #, fuzzy
-#| msgid "Email address:"
-msgid "This is not a valid IPv6 address."
-msgstr "邮箱地�:"
+#~| msgid "Email address:"
+#~ msgid "This is not a valid IPv6 address."
+#~ msgstr "邮箱地�:"
 
-#: venv3/lib/python3.8/site-packages/django/utils/text.py:69
-#, python-format
-msgctxt "String to return when truncating text"
-msgid "%(truncated_text)s…"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/text.py:235
-msgid "or"
-msgstr ""
-
-#. Translators: This string is used as a separator between list elements
-#: venv3/lib/python3.8/site-packages/django/utils/text.py:254
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:83
-msgid ", "
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:9
-#, python-format
-msgid "%d year"
-msgid_plural "%d years"
-msgstr[0] ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:10
-#, python-format
-msgid "%d month"
-msgid_plural "%d months"
-msgstr[0] ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:11
-#, python-format
-msgid "%d week"
-msgid_plural "%d weeks"
-msgstr[0] ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:12
-#, python-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:13
-#, python-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:14
-#, python-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] ""
-
-#: venv3/lib/python3.8/site-packages/django/utils/timesince.py:72
-msgid "0 minutes"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:110
-msgid "Forbidden"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:111
-msgid "CSRF verification failed. Request aborted."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:115
-msgid ""
-"You are seeing this message because this HTTPS site requires a “Referer "
-"header� to be sent by your Web browser, but none was sent. This header is "
-"required for security reasons, to ensure that your browser is not being "
-"hijacked by third parties."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:120
-msgid ""
-"If you have configured your browser to disable “Referer� headers, please re-"
-"enable them, at least for this site, or for HTTPS connections, or for “same-"
-"origin� requests."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:124
-msgid ""
-"If you are using the <meta name=\"referrer\" content=\"no-referrer\"> tag or "
-"including the “Referrer-Policy: no-referrer� header, please remove them. The "
-"CSRF protection requires the “Referer� header to do strict referer checking. "
-"If you’re concerned about privacy, use alternatives like <a rel=\"noreferrer"
-"\" …> for links to third-party sites."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:132
-msgid ""
-"You are seeing this message because this site requires a CSRF cookie when "
-"submitting forms. This cookie is required for security reasons, to ensure "
-"that your browser is not being hijacked by third parties."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:137
-msgid ""
-"If you have configured your browser to disable cookies, please re-enable "
-"them, at least for this site, or for “same-origin� requests."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/csrf.py:142
-msgid "More information is available with DEBUG=True."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:41
-msgid "No year specified"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:61
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:111
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:208
-msgid "Date out of range"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:90
-msgid "No month specified"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:142
-msgid "No day specified"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:188
-msgid "No week specified"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:338
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:367
-#, python-format
-msgid "No %(verbose_name_plural)s available"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:589
-#, python-format
-msgid ""
-"Future %(verbose_name_plural)s not available because %(class_name)s."
-"allow_future is False."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/dates.py:623
-#, python-format
-msgid "Invalid date string “%(datestr)s� given format “%(format)s�"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/detail.py:54
 #, fuzzy, python-format
-#| msgid "No books found matching the query \"%(query)s\""
-msgid "No %(verbose_name)s found matching the query"
-msgstr "没有符� \"%(query)s\" 请求的书目"
+#~| msgid "No books found matching the query \"%(query)s\""
+#~ msgid "No %(verbose_name)s found matching the query"
+#~ msgstr "没有符� \"%(query)s\" 请求的书目"
 
-#: venv3/lib/python3.8/site-packages/django/views/generic/list.py:67
-msgid "Page is not “last�, nor can it be converted to an int."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/list.py:72
-#, python-format
-msgid "Invalid page (%(page_number)s): %(message)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/generic/list.py:154
-#, python-format
-msgid "Empty list and “%(class_name)s.allow_empty� is False."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/static.py:40
-msgid "Directory indexes are not allowed here."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/static.py:42
-#, python-format
-msgid "“%(path)s� does not exist"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/static.py:80
-#, python-format
-msgid "Index of %(directory)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:7
-msgid "Django: the Web framework for perfectionists with deadlines."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:346
-#, python-format
-msgid ""
-"View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
-"target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:368
-msgid "The install worked successfully! Congratulations!"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:369
-#, python-format
-msgid ""
-"You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
-"%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener"
-"\">DEBUG=True</a> is in your settings file and you have not configured any "
-"URLs."
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:384
-msgid "Django Documentation"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:385
-msgid "Topics, references, &amp; how-to’s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:396
-msgid "Tutorial: A Polling App"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:397
-msgid "Get started with Django"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:408
 #, fuzzy
-#| msgid "Community"
-msgid "Django Community"
-msgstr "社区"
-
-#: venv3/lib/python3.8/site-packages/django/views/templates/default_urlconf.html:409
-msgid "Connect, get help, or contribute"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/kombu/transport/qpid.py:1301
-#, python-format
-msgid "Attempting to connect to qpid with SASL mechanism %s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/kombu/transport/qpid.py:1306
-#, python-format
-msgid "Connected to qpid with SASL mechanism %s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/kombu/transport/qpid.py:1324
-#, python-format
-msgid "Unable to connect to qpid with SASL mechanism %s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:371
-msgid "1 second ago"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:377
-msgid "1 minute ago"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:382
-msgid "1 hour ago"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:385
-#, python-format
-msgid "%(time)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:387
-msgid "yesterday"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:387
-#, python-format
-msgid "yesterday at %(time)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:389
-#, python-format
-msgid "%(weekday)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:389
-#, python-format
-msgid "%(weekday)s at %(time)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:392
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:445
-#, python-format
-msgid "%(month_name)s %(day)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:394
-#, python-format
-msgid "%(month_name)s %(day)s at %(time)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:399
-#, python-format
-msgid "%(month_name)s %(day)s, %(year)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:401
-#, python-format
-msgid "%(month_name)s %(day)s, %(year)s at %(time)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:439
-#, python-format
-msgid "%(weekday)s, %(month_name)s %(day)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/locale.py:462
-#, python-format
-msgid "%(commas)s and %(last)s"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:68
-msgctxt "law"
-msgid "right"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:69
-msgctxt "good"
-msgid "right"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:71
-#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:74
-msgctxt "organization"
-msgid "club"
-msgstr ""
-
-#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:76
-#: venv3/lib/python3.8/site-packages/tornado/test/locale_test.py:77
-msgctxt "stick"
-msgid "club"
-msgstr ""
+#~| msgid "Community"
+#~ msgid "Django Community"
+#~ msgstr "社区"
 
 #~ msgid "Didn't find what you were looking for?"
 #~ msgstr "没有找到你想找的？"
@@ -4353,28 +3132,16 @@ msgstr ""
 #~ msgstr "日期"
 
 #, python-format
-#~ msgid ""
-#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
-#~ "\"%(status_path)s\">review</a>"
-#~ msgstr ""
-#~ "回�了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href="
-#~ "\"%(status_path)s\">书评</a>"
+#~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">review</a>"
+#~ msgstr "回�了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">书评</a>"
 
 #, python-format
-#~ msgid ""
-#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
-#~ "\"%(status_path)s\">comment</a>"
-#~ msgstr ""
-#~ "��了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href="
-#~ "\"%(status_path)s\">评论</a>"
+#~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">comment</a>"
+#~ msgstr "��了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">评论</a>"
 
 #, python-format
-#~ msgid ""
-#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
-#~ "\"%(status_path)s\">quote</a>"
-#~ msgstr ""
-#~ "回�了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href="
-#~ "\"%(status_path)s\">引用</a>"
+#~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">quote</a>"
+#~ msgstr "回�了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">引用</a>"
 
 #~ msgid "Remove tag"
 #~ msgstr "移除标签"

From 77faceef8067e201c5325c59f275444050a71250 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 3 May 2021 11:44:02 -0700
Subject: [PATCH 1082/1285] Why is black unhappy

---
 .github/workflows/black.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml
index afa9cf2b..25af1e08 100644
--- a/.github/workflows/black.yml
+++ b/.github/workflows/black.yml
@@ -8,6 +8,4 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
-      - uses: psf/black@stable
-        with:
-          args: ". --check -l 80 -S"
+      - uses: psf/black@21.4b2

From 7dfc991468a09f26e9f0d6e9ac44ef33ac9b568b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 3 May 2021 14:47:27 -0700
Subject: [PATCH 1083/1285] Adds elided page range to shelf pagination

---
 bookwyrm/views/list.py  | 3 ++-
 bookwyrm/views/shelf.py | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index eac0f657..bfd61790 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -18,6 +18,7 @@ from django.views.decorators.http import require_POST
 from bookwyrm import forms, models
 from bookwyrm.activitypub import ActivitypubResponse
 from bookwyrm.connectors import connector_manager
+from bookwyrm.settings import PAGE_LENGTH
 from .helpers import is_api_request, privacy_filter
 from .helpers import get_user_from_username
 
@@ -133,7 +134,7 @@ class List(View):
                 .order_by(directional_sort_by)
             )
 
-        paginated = Paginator(items, 12)
+        paginated = Paginator(items, PAGE_LENGTH)
 
         if query and request.user.is_authenticated:
             # search for books
diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index 94507d46..99ec5ef1 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -57,12 +57,17 @@ class Shelf(View):
             PAGE_LENGTH,
         )
 
+        page = paginated.get_page(request.GET.get("page"))
         data = {
             "user": user,
             "is_self": is_self,
             "shelves": shelves.all(),
             "shelf": shelf,
-            "books": paginated.get_page(request.GET.get("page")),
+            "books": page,
+            "page_range": paginated.get_elided_page_range(
+                page.number, on_each_side=2, on_ends=1
+            )
+
         }
 
         return TemplateResponse(request, "user/shelf/shelf.html", data)

From bc80c017aa0a564be2327df2ebd4122a1bcd5b3f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 3 May 2021 14:52:24 -0700
Subject: [PATCH 1084/1285] Python formatting

---
 bookwyrm/views/shelf.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index 99ec5ef1..5312ac21 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -66,8 +66,7 @@ class Shelf(View):
             "books": page,
             "page_range": paginated.get_elided_page_range(
                 page.number, on_each_side=2, on_ends=1
-            )
-
+            ),
         }
 
         return TemplateResponse(request, "user/shelf/shelf.html", data)

From 33ca7b4b763c118cf84ee85205e64ccd1355b220 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 4 May 2021 08:54:53 -0700
Subject: [PATCH 1085/1285] Adds datepicker script dependencies to templates

---
 bookwyrm/templates/author.html            | 3 +++
 bookwyrm/templates/book/book.html         | 1 +
 bookwyrm/templates/book/edit_book.html    | 8 ++++++--
 bookwyrm/templates/book/editions.html     | 4 ++++
 bookwyrm/templates/edit_author.html       | 4 ++++
 bookwyrm/templates/feed/feed_layout.html  | 1 +
 bookwyrm/templates/get_started/books.html | 4 ++++
 bookwyrm/templates/user/layout.html       | 5 +++++
 8 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/author.html b/bookwyrm/templates/author.html
index bc1034a8..0ef876fd 100644
--- a/bookwyrm/templates/author.html
+++ b/bookwyrm/templates/author.html
@@ -39,3 +39,6 @@
 </div>
 {% endblock %}
 
+{% block scripts %}
+{% include 'snippets/datepicker_js.html' %}
+{% endblock %}
diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index 40da6486..53be123d 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -333,4 +333,5 @@
 
 {% block scripts %}
 <script src="/static/js/vendor/tabs.js"></script>
+{% include 'snippets/datepicker_js.html' %}
 {% endblock %}
diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html
index 8ebbeaae..095439d1 100644
--- a/bookwyrm/templates/book/edit_book.html
+++ b/bookwyrm/templates/book/edit_book.html
@@ -133,7 +133,7 @@
 
                 <p class="mb-2">
                     <label class="label" for="id_first_published_date">{% trans "First published date:" %}</label>
-                    <input type="date" name="first_published_date" class="input" id="id_first_published_date"{% if form.first_published_date.value %} value="{{ form.first_published_date.value|date:'Y-m-d' }}"{% endif %}>
+                    <duet-date-picker identifier="id_first_published_date" name="first_published_date"{% if form.first_published_date.value %} value="{{ form.first_published_date.value|date:'Y-m-d' }}"{% endif %}></duet-date-picker>
                 </p>
                 {% for error in form.first_published_date.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
@@ -141,7 +141,7 @@
 
                 <p class="mb-2">
                     <label class="label" for="id_published_date">{% trans "Published date:" %}</label>
-                    <input type="date" name="published_date" class="input" id="id_published_date"{% if form.published_date.value %} value="{{ form.published_date.value|date:'Y-m-d'}}"{% endif %}>
+                    <duet-date-picker identifier="id_published_date" name="published_date"{% if form.published_date.value %} value="{{ form.published_date.value|date:'Y-m-d' }}"{% endif %}></duet-date-picker>
                 </p>
                 {% for error in form.published_date.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
@@ -245,3 +245,7 @@
 </form>
 
 {% endblock %}
+
+{% block scripts %}
+{% include 'snippets/datepicker_js.html' %}
+{% endblock %}
diff --git a/bookwyrm/templates/book/editions.html b/bookwyrm/templates/book/editions.html
index efbe1566..8af85ace 100644
--- a/bookwyrm/templates/book/editions.html
+++ b/bookwyrm/templates/book/editions.html
@@ -51,3 +51,7 @@
     {% include 'snippets/pagination.html' with page=editions path=request.path %}
 </div>
 {% endblock %}
+
+{% block scripts %}
+{% include 'snippets/datepicker_js.html' %}
+{% endblock %}
diff --git a/bookwyrm/templates/edit_author.html b/bookwyrm/templates/edit_author.html
index 542b57f9..ded8c494 100644
--- a/bookwyrm/templates/edit_author.html
+++ b/bookwyrm/templates/edit_author.html
@@ -81,3 +81,7 @@
 </form>
 
 {% endblock %}
+
+{% block scripts %}
+{% include 'snippets/datepicker_js.html' %}
+{% endblock %}
diff --git a/bookwyrm/templates/feed/feed_layout.html b/bookwyrm/templates/feed/feed_layout.html
index 75fc1951..431cf6dd 100644
--- a/bookwyrm/templates/feed/feed_layout.html
+++ b/bookwyrm/templates/feed/feed_layout.html
@@ -105,4 +105,5 @@
 
 {% block scripts %}
 <script src="/static/js/vendor/tabs.js"></script>
+{% include 'snippets/datepicker_js.html' %}
 {% endblock %}
diff --git a/bookwyrm/templates/get_started/books.html b/bookwyrm/templates/get_started/books.html
index 9613508b..e3fd87bb 100644
--- a/bookwyrm/templates/get_started/books.html
+++ b/bookwyrm/templates/get_started/books.html
@@ -64,3 +64,7 @@
 </form>
 {% endblock %}
 
+
+{% block scripts %}
+{% include 'snippets/datepicker_js.html' %}
+{% endblock %}
diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html
index 661d8078..1aa76202 100644
--- a/bookwyrm/templates/user/layout.html
+++ b/bookwyrm/templates/user/layout.html
@@ -81,3 +81,8 @@
 {% block panel %}{% endblock %}
 
 {% endblock %}
+
+
+{% block scripts %}
+{% include 'snippets/datepicker_js.html' %}
+{% endblock %}

From 869cfa6d341f25ee25d8576adcdc2e3b8d239b9c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 4 May 2021 09:04:21 -0700
Subject: [PATCH 1086/1285] Replaces date elements with datepicker

---
 bookwyrm/templates/book/edit_book.html               | 12 ++++++++++--
 bookwyrm/templates/snippets/datepicker_js.html       |  3 +++
 bookwyrm/templates/snippets/readthrough_form.html    | 12 ++++++++++--
 .../snippets/shelve_button/finish_reading_modal.html | 12 ++++++++++--
 .../snippets/shelve_button/start_reading_modal.html  |  6 +++++-
 5 files changed, 38 insertions(+), 7 deletions(-)
 create mode 100644 bookwyrm/templates/snippets/datepicker_js.html

diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html
index 095439d1..644e90c6 100644
--- a/bookwyrm/templates/book/edit_book.html
+++ b/bookwyrm/templates/book/edit_book.html
@@ -133,7 +133,11 @@
 
                 <p class="mb-2">
                     <label class="label" for="id_first_published_date">{% trans "First published date:" %}</label>
-                    <duet-date-picker identifier="id_first_published_date" name="first_published_date"{% if form.first_published_date.value %} value="{{ form.first_published_date.value|date:'Y-m-d' }}"{% endif %}></duet-date-picker>
+                    <duet-date-picker
+                        identifier="id_first_published_date"
+                        name="first_published_date"
+                        {% if form.first_published_date.value %}value="{{ form.first_published_date.value|date:'Y-m-d' }}"{% endif %}
+                    ></duet-date-picker>
                 </p>
                 {% for error in form.first_published_date.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
@@ -141,7 +145,11 @@
 
                 <p class="mb-2">
                     <label class="label" for="id_published_date">{% trans "Published date:" %}</label>
-                    <duet-date-picker identifier="id_published_date" name="published_date"{% if form.published_date.value %} value="{{ form.published_date.value|date:'Y-m-d' }}"{% endif %}></duet-date-picker>
+                    <duet-date-picker
+                        identifier="id_published_date"
+                        name="published_date"
+                        {% if form.published_date.value %}value="{{ form.published_date.value|date:'Y-m-d' }}"{% endif %}
+                    ></duet-date-picker>
                 </p>
                 {% for error in form.published_date.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
diff --git a/bookwyrm/templates/snippets/datepicker_js.html b/bookwyrm/templates/snippets/datepicker_js.html
new file mode 100644
index 00000000..abfadaaf
--- /dev/null
+++ b/bookwyrm/templates/snippets/datepicker_js.html
@@ -0,0 +1,3 @@
+<script type="module" src="https://cdn.jsdelivr.net/npm/@duetds/date-picker@1.3.0/dist/duet/duet.esm.js"></script>
+<script nomodule src="https://cdn.jsdelivr.net/npm/@duetds/date-picker@1.3.0/dist/duet/duet.js"></script>
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@duetds/date-picker@1.3.0/dist/duet/themes/default.css" />
diff --git a/bookwyrm/templates/snippets/readthrough_form.html b/bookwyrm/templates/snippets/readthrough_form.html
index c5be295e..256fcea5 100644
--- a/bookwyrm/templates/snippets/readthrough_form.html
+++ b/bookwyrm/templates/snippets/readthrough_form.html
@@ -5,7 +5,11 @@
 <div class="field">
     <label class="label">
         {% trans "Started reading" %}
-        <input type="date" name="start_date" class="input" id="id_start_date-{{ readthrough.id }}" value="{{ readthrough.start_date | date:"Y-m-d" }}">
+        <duet-date-picker
+            identifier="id_start_date-{{ readthrough.id }}"
+            name="start_date"
+            value="{{ readthrough.start_date | date:'Y-m-d' }}">
+        </duet-date-picker>
     </label>
 </div>
 {# Only show progress for editing existing readthroughs #}
@@ -28,6 +32,10 @@
 <div class="field">
     <label class="label">
         {% trans "Finished reading" %}
-        <input type="date" name="finish_date" class="input" id="id_finish_date-{{ readthrough.id }}" value="{{ readthrough.finish_date | date:"Y-m-d" }}">
+        <duet-date-picker
+            identifier="id_finish_date-{{ readthrough.id }}"
+            name="finish_date"
+            value="{{ readthrough.finish_date | date:'Y-m-d' }}">
+        </duet-date-picker>
     </label>
 </div>
diff --git a/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html b/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
index ca65bf06..6d4ea5ea 100644
--- a/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
+++ b/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
@@ -17,13 +17,21 @@
     <div class="field">
         <label class="label">
             {% trans "Started reading" %}
-            <input type="date" name="start_date" class="input" id="finish_id_start_date-{{ uuid }}" value="{{ readthrough.start_date | date:"Y-m-d" }}">
+            <duet-date-picker
+                identifier="id_start_date-{{ uuid }}"
+                name="start_date"
+                value="{{ readthrough.start_date | date:'Y-m-d' }}"
+            ></duet-date-picker>
         </label>
     </div>
     <div class="field">
         <label class="label">
             {% trans "Finished reading" %}
-            <input type="date" name="finish_date" class="input" id="id_finish_date-{{ uuid }}" value="{% now "Y-m-d" %}">
+            <duet-date-picker
+                identifier="id_finish_date-{{ uuid }}"
+                name="finish_date"
+                value="{{ readthrough.finish_date | date:'Y-m-d' }}"
+            ></duet-date-picker>
         </label>
     </div>
 </section>
diff --git a/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html b/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html
index 21341683..47d620e0 100644
--- a/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html
+++ b/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html
@@ -15,7 +15,11 @@
     <div class="field">
         <label class="label">
             {% trans "Started reading" %}
-            <input type="date" name="start_date" class="input" id="start_id_start_date-{{ uuid }}" value="{% now "Y-m-d" %}">
+            <duet-date-picker
+                identifier="start_id_start_date-{{ uuid }}"
+                name="start_date"
+                value="{% now "Y-m-d" %}"
+            ></duet-date-picker>
         </label>
     </div>
 </section>

From 748810cd419915b34849d8255fd9b4dfb71bc5fc Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 4 May 2021 09:34:16 -0700
Subject: [PATCH 1087/1285] Use reverse lookups for urls

---
 bookwyrm/templates/book/edit_book.html           |  2 +-
 bookwyrm/templates/book/editions.html            |  4 ++--
 bookwyrm/templates/discover/large-book.html      |  2 +-
 bookwyrm/templates/discover/small-book.html      |  2 +-
 bookwyrm/templates/edit_author.html              |  2 +-
 bookwyrm/templates/feed/direct_messages.html     |  2 +-
 bookwyrm/templates/import.html                   |  2 +-
 bookwyrm/templates/import_status.html            |  2 +-
 bookwyrm/templates/layout.html                   | 12 ++++++------
 bookwyrm/templates/login.html                    |  4 ++--
 bookwyrm/templates/notifications.html            |  2 +-
 .../preferences/preferences_layout.html          |  9 ++++++---
 bookwyrm/templates/snippets/authors.html         |  2 +-
 bookwyrm/templates/snippets/book_tiles.html      |  2 +-
 bookwyrm/templates/snippets/status/layout.html   |  2 +-
 .../templates/snippets/status/status_header.html |  8 ++++----
 bookwyrm/templates/snippets/user_options.html    |  2 +-
 bookwyrm/urls.py                                 | 16 ++++++++++------
 18 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html
index 8ebbeaae..bcf11126 100644
--- a/bookwyrm/templates/book/edit_book.html
+++ b/bookwyrm/templates/book/edit_book.html
@@ -239,7 +239,7 @@
     {% if not confirm_mode %}
     <div class="block">
         <button class="button is-primary" type="submit">{% trans "Save" %}</button>
-        <a class="button" href="/book/{{ book.id }}">{% trans "Cancel" %}</a>
+        <a class="button" href="{{ book.local_path}}">{% trans "Cancel" %}</a>
     </div>
     {% endif %}
 </form>
diff --git a/bookwyrm/templates/book/editions.html b/bookwyrm/templates/book/editions.html
index efbe1566..775b05c8 100644
--- a/bookwyrm/templates/book/editions.html
+++ b/bookwyrm/templates/book/editions.html
@@ -15,14 +15,14 @@
     {% for book in editions %}
     <div class="columns is-gapless mb-6">
         <div class="column is-cover">
-            <a href="/book/{{ book.id }}">
+            <a href="{{ book.local_path }}">
                 {% include 'snippets/book_cover.html' with book=book cover_class='is-w-m is-h-m align to-l-mobile' %}
             </a>
         </div>
 
         <div class="column my-3-mobile ml-3-tablet mr-auto">
             <h2 class="title is-5 mb-1">
-                <a href="/book/{{ book.id }}" class="has-text-black">
+                <a href="{{ book.local_path }}" class="has-text-black">
                     {{ book.title }}
                 </a>
             </h2>
diff --git a/bookwyrm/templates/discover/large-book.html b/bookwyrm/templates/discover/large-book.html
index 1808a0f9..7def6e13 100644
--- a/bookwyrm/templates/discover/large-book.html
+++ b/bookwyrm/templates/discover/large-book.html
@@ -17,7 +17,7 @@
 
             <div class="column mt-3-mobile ml-3-tablet">
                 <h3 class="title is-5">
-                    <a href="/book/{{ book.id }}">{{ book.title }}</a>
+                    <a href="{{ book.local_path }}">{{ book.title }}</a>
                 </h3>
 
                 {% if book.authors %}
diff --git a/bookwyrm/templates/discover/small-book.html b/bookwyrm/templates/discover/small-book.html
index ad7e00fb..73133de4 100644
--- a/bookwyrm/templates/discover/small-book.html
+++ b/bookwyrm/templates/discover/small-book.html
@@ -11,7 +11,7 @@
         {% include 'snippets/stars.html' with rating=book|rating:request.user %}
 
         <h3 class="title is-6">
-            <a href="/book/{{ book.id }}">{{ book.title }}</a>
+            <a href="{{ book.local_path }}">{{ book.title }}</a>
         </h3>
 
         {% if book.authors %}
diff --git a/bookwyrm/templates/edit_author.html b/bookwyrm/templates/edit_author.html
index 542b57f9..b575bbb2 100644
--- a/bookwyrm/templates/edit_author.html
+++ b/bookwyrm/templates/edit_author.html
@@ -76,7 +76,7 @@
 
     <div class="block">
         <button class="button is-primary" type="submit">{% trans "Save" %}</button>
-        <a class="button" href="/author/{{ author.id }}">{% trans "Cancel" %}</a>
+        <a class="button" href="{{ author.local_path }}">{% trans "Cancel" %}</a>
     </div>
 </form>
 
diff --git a/bookwyrm/templates/feed/direct_messages.html b/bookwyrm/templates/feed/direct_messages.html
index 1e361e61..0b7dcd79 100644
--- a/bookwyrm/templates/feed/direct_messages.html
+++ b/bookwyrm/templates/feed/direct_messages.html
@@ -10,7 +10,7 @@
         {% trans "Direct Messages" %}
         {% endif %}
     </h1>
-    {% if partner %}<p class="subtitle"><a href="/direct-messages"><span class="icon icon-arrow-left" aria-hidden="true"></span> {% trans "All messages" %}</a></p>{% endif %}
+    {% if partner %}<p class="subtitle"><a href="{% url 'direct-messages' %}"><span class="icon icon-arrow-left" aria-hidden="true"></span> {% trans "All messages" %}</a></p>{% endif %}
 </header>
 
 <div class="box">
diff --git a/bookwyrm/templates/import.html b/bookwyrm/templates/import.html
index 239b6914..c4f0dfae 100644
--- a/bookwyrm/templates/import.html
+++ b/bookwyrm/templates/import.html
@@ -56,7 +56,7 @@
     {% endif %}
     <ul>
         {% for job in jobs %}
-            <li><a href="/import/{{ job.id }}">{{ job.created_date | naturaltime }}</a></li>
+        <li><a href="{% url 'import-status' job.id %}">{{ job.created_date | naturaltime }}</a></li>
         {% endfor %}
     </ul>
 </div>
diff --git a/bookwyrm/templates/import_status.html b/bookwyrm/templates/import_status.html
index 3ce929e6..e06392a8 100644
--- a/bookwyrm/templates/import_status.html
+++ b/bookwyrm/templates/import_status.html
@@ -124,7 +124,7 @@
         <tr>
             <td>
                 {% if item.book %}
-                <a href="/book/{{ item.book.id }}">
+                <a href="{{ item.book.local_path }}">
                 {% include 'snippets/book_cover.html' with book=item.book cover_class='is-h-s' %}
                 </a>
                 {% endif %}
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index c45f2380..bc654401 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -94,12 +94,12 @@
                             </a>
                         </li>
                         <li>
-                            <a href="/import" class="navbar-item">
+                            <a href="{% url 'import' %}" class="navbar-item">
                                 {% trans 'Import Books' %}
                             </a>
                         </li>
                         <li>
-                            <a href="/preferences/profile" class="navbar-item">
+                            <a href="{% url 'prefs-profile' %}" class="navbar-item">
                                 {% trans 'Settings' %}
                             </a>
                         </li>
@@ -122,14 +122,14 @@
                         {% endif %}
                         <li class="navbar-divider" role="presentation"></li>
                         <li>
-                            <a href="/logout" class="navbar-item">
+                            <a href="{% url 'logout' %}" class="navbar-item">
                                 {% trans 'Log out' %}
                             </a>
                         </li>
                     </ul>
                 </div>
                 <div class="navbar-item">
-                    <a href="/notifications" class="tags has-addons">
+                    <a href="{% url 'notifications' %}" class="tags has-addons">
                         <span class="tag is-medium">
                             <span class="icon icon-bell" title="{% trans 'Notifications' %}">
                                 <span class="is-sr-only">{% trans "Notifications" %}</span>
@@ -158,7 +158,7 @@
                                     <div class="column">
                                         <label class="is-sr-only" for="id_password">{% trans "Username:" %}</label>
                                         <input type="password" name="password" maxlength="128" class="input" required="" id="id_password" placeholder="{% trans 'password' %}">
-                                        <p class="help"><a href="/password-reset">{% trans "Forgot your password?" %}</a></p>
+                                        <p class="help"><a href="{% url 'password-reset' %}">{% trans "Forgot your password?" %}</a></p>
                                     </div>
                                     <div class="column is-narrow">
                                         <button class="button is-primary" type="submit">{% trans "Log in" %}</button>
@@ -195,7 +195,7 @@
         <div class="columns">
             <div class="column is-one-fifth">
                 <p>
-                    <a href="/about">{% trans "About this server" %}</a>
+                <a href="{% url 'about' %}">{% trans "About this server" %}</a>
                 </p>
                 {% if site.admin_email %}
                 <p>
diff --git a/bookwyrm/templates/login.html b/bookwyrm/templates/login.html
index 063b4b6d..8ed5d044 100644
--- a/bookwyrm/templates/login.html
+++ b/bookwyrm/templates/login.html
@@ -33,7 +33,7 @@
                         <button class="button is-primary" type="submit">{% trans "Log in" %}</button>
                     </div>
                     <div class="control">
-                        <small><a href="/password-reset">{% trans "Forgot your password?" %}</a></small>
+                        <small><a href="{% url 'password-reset' %}">{% trans "Forgot your password?" %}</a></small>
                     </div>
                 </div>
             </form>
@@ -56,7 +56,7 @@
             {% include 'snippets/about.html' %}
 
             <p class="block">
-                <a href="/about/">{% trans "More about this site" %}</a>
+            <a href="{% url 'about' %}">{% trans "More about this site" %}</a>
             </p>
         </div>
     </div>
diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html
index ba0a25cd..73ad23b8 100644
--- a/bookwyrm/templates/notifications.html
+++ b/bookwyrm/templates/notifications.html
@@ -107,7 +107,7 @@
                                 {% endif %}
                             {% endif %}
                         {% elif notification.related_import %}
-                            {% blocktrans with related_id=notification.related_import.id %}Your <a href="/import/{{ related_id }}">import</a> completed.{% endblocktrans %}
+                        {% blocktrans with related_id=notification.related_import.id %}Your <a href="{% url 'import-status' related_id %}">import</a> completed.{% endblocktrans %}
                         {% elif notification.related_report %}
                             {% url 'settings-report' notification.related_report.id as path %}
                             {% blocktrans with related_id=path %}A new <a href="{{ path }}">report</a> needs moderation.{% endblocktrans %}
diff --git a/bookwyrm/templates/preferences/preferences_layout.html b/bookwyrm/templates/preferences/preferences_layout.html
index d463d9cb..baf87e47 100644
--- a/bookwyrm/templates/preferences/preferences_layout.html
+++ b/bookwyrm/templates/preferences/preferences_layout.html
@@ -11,16 +11,19 @@
         <h2 class="menu-label">{% trans "Account" %}</h2>
         <ul class="menu-list">
             <li>
-                <a href="/preferences/profile"{% if '/preferences/profile' in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Profile" %}</a>
+                {% url 'prefs-profile' as url %}
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Profile" %}</a>
             </li>
             <li>
-                <a href="/preferences/password"{% if '/preferences/password' in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Change Password" %}</a>
+                {% url 'prefs-password' as url %}
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Change Password" %}</a>
             </li>
         </ul>
         <h2 class="menu-label">{% trans "Relationships" %}</h2>
         <ul class="menu-list">
             <li>
-                <a href="/preferences/block"{% if '/preferences/block' in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Blocked Users" %}</a>
+                {% url 'prefs-block' as url %}
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Blocked Users" %}</a>
             </li>
         </ul>
     </nav>
diff --git a/bookwyrm/templates/snippets/authors.html b/bookwyrm/templates/snippets/authors.html
index 9459b0fe..476956b6 100644
--- a/bookwyrm/templates/snippets/authors.html
+++ b/bookwyrm/templates/snippets/authors.html
@@ -5,7 +5,7 @@
 {% endcomment %}
 {% for author in book.authors.all %}
     <a
-        href="/author/{{ author.id }}"
+        href="{{ author.local_path }}"
         class="author"
         itemprop="author"
         itemscope
diff --git a/bookwyrm/templates/snippets/book_tiles.html b/bookwyrm/templates/snippets/book_tiles.html
index 32c9f90c..25249c96 100644
--- a/bookwyrm/templates/snippets/book_tiles.html
+++ b/bookwyrm/templates/snippets/book_tiles.html
@@ -3,7 +3,7 @@
     <div class="column is-narrow">
         <div class="box is-flex is-flex-direction-column is-align-items-center">
             <div class="mb-3">
-                <a href="/book/{{ book.id }}">
+                <a href="{{ book.local_path }}">
                     {% include 'snippets/book_cover.html' with book=book cover_class='is-w-l-mobile is-h-l-mobile is-w-l-tablet is-h-xl-tablet' %}
                 </a>
             </div>
diff --git a/bookwyrm/templates/snippets/status/layout.html b/bookwyrm/templates/snippets/status/layout.html
index 6014158f..ddbd6f20 100644
--- a/bookwyrm/templates/snippets/status/layout.html
+++ b/bookwyrm/templates/snippets/status/layout.html
@@ -44,7 +44,7 @@
 
 {% else %}
 <div class="card-footer-item">
-    <a href="/login">
+    <a href="{% url 'login' %}">
         <span class="icon icon-comment is-small" title="{% trans 'Reply' %}">
             <span class="is-sr-only">{% trans "Reply" %}</span>
         </span>
diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html
index b9faf64e..605b46cc 100644
--- a/bookwyrm/templates/snippets/status/status_header.html
+++ b/bookwyrm/templates/snippets/status/status_header.html
@@ -47,7 +47,7 @@
 
             {% if status.book %}
                 {% if status.status_type == 'GeneratedNote' or status.status_type == 'Rating' %}
-                    <a href="/book/{{ status.book.id }}">{{ status.book|title }}</a>{% if status.status_type == 'Rating' %}: {% include 'snippets/stars.html' with rating=status.rating %}
+                    <a href="{{ status.book.local_path }}">{{ status.book|title }}</a>{% if status.status_type == 'Rating' %}: {% include 'snippets/stars.html' with rating=status.rating %}
                     <span
                         itemprop="reviewRating"
                         itemscope
@@ -58,7 +58,7 @@
 
                         {% if status.book %}
                             {% if status.status_type == 'GeneratedNote' or status.status_type == 'Rating' %}
-                                <a href="/book/{{ status.book.id }}">{{ status.book|title }}</a>{% if status.status_type == 'Rating' %}:
+                                <a href="{{ status.book.local_path }}">{{ status.book|title }}</a>{% if status.status_type == 'Rating' %}:
                                 <span
                                     itemprop="reviewRating"
                                     itemscope
@@ -76,7 +76,7 @@
                                 {% include 'snippets/book_titleby.html' with book=status.book %}
                             {% endif %}
                         {% elif status.mention_books %}
-                            <a href="/book/{{ status.mention_books.first.id }}">
+                            <a href="{{ status.mention_books.first.local_path }}">
                                 {{ status.mention_books.first.title }}
                             </a>
                         {% endif %}
@@ -86,7 +86,7 @@
                     {% include 'snippets/book_titleby.html' with book=status.book %}
                 {% endif %}
             {% elif status.mention_books %}
-                <a href="/book/{{ status.mention_books.first.id }}">{{ status.mention_books.first|title }}</a>
+                <a href="{{ status.mention_books.first.local_path }}">{{ status.mention_books.first|title }}</a>
             {% endif %}
 
         </h3>
diff --git a/bookwyrm/templates/snippets/user_options.html b/bookwyrm/templates/snippets/user_options.html
index ec772e54..32e83ed2 100644
--- a/bookwyrm/templates/snippets/user_options.html
+++ b/bookwyrm/templates/snippets/user_options.html
@@ -10,7 +10,7 @@
 
 {% block dropdown-list %}
 <li role="menuitem">
-    <a href="/direct-messages/{{ user|username }}" class="button is-fullwidth is-small">{% trans "Send direct message" %}</a>
+    <a href="{% url 'direct-messages-user' user|username %}" class="button is-fullwidth is-small">{% trans "Send direct message" %}</a>
 </li>
 <li role="menuitem">
     {% include 'snippets/report_button.html' with user=user class="is-fullwidth" %}
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 14fe476d..3e7dea58 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -45,8 +45,12 @@ urlpatterns = [
     # authentication
     re_path(r"^login/?$", views.Login.as_view(), name="login"),
     re_path(r"^register/?$", views.Register.as_view()),
-    re_path(r"^logout/?$", views.Logout.as_view()),
-    re_path(r"^password-reset/?$", views.PasswordResetRequest.as_view()),
+    re_path(r"^logout/?$", views.Logout.as_view(), name="logout"),
+    re_path(
+        r"^password-reset/?$",
+        views.PasswordResetRequest.as_view(),
+        name="password-reset",
+    ),
     re_path(
         r"^password-reset/(?P<code>[A-Za-z0-9]+)/?$", views.PasswordReset.as_view()
     ),
@@ -134,7 +138,7 @@ urlpatterns = [
     re_path(r"^about/?$", views.About.as_view(), name="about"),
     path("", views.Home.as_view(), name="landing"),
     re_path(r"^discover/?$", views.Discover.as_view()),
-    re_path(r"^notifications/?$", views.Notifications.as_view()),
+    re_path(r"^notifications/?$", views.Notifications.as_view(), name="notifications"),
     re_path(r"^directory/?", views.Directory.as_view(), name="directory"),
     # Get started
     re_path(
@@ -165,8 +169,8 @@ urlpatterns = [
     # search
     re_path(r"^search/?$", views.Search.as_view(), name="search"),
     # imports
-    re_path(r"^import/?$", views.Import.as_view()),
-    re_path(r"^import/(\d+)/?$", views.ImportStatus.as_view()),
+    re_path(r"^import/?$", views.Import.as_view(), name="import"),
+    re_path(r"^import/(\d+)/?$", views.ImportStatus.as_view(), name="import-status"),
     # users
     re_path(r"%s/?$" % user_path, views.User.as_view(), name="user-feed"),
     re_path(r"%s\.json$" % user_path, views.User.as_view()),
@@ -229,7 +233,7 @@ urlpatterns = [
         views.ChangePassword.as_view(),
         name="prefs-password",
     ),
-    re_path(r"^preferences/block/?$", views.Block.as_view()),
+    re_path(r"^preferences/block/?$", views.Block.as_view(), name="prefs-block"),
     re_path(r"^block/(?P<user_id>\d+)/?$", views.Block.as_view()),
     re_path(r"^unblock/(?P<user_id>\d+)/?$", views.unblock),
     # statuses

From 7bbef1d193ab0344d70ec7b75930d2ab6fa8d947 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 4 May 2021 09:42:00 -0700
Subject: [PATCH 1088/1285] Removes outdated test

---
 bookwyrm/tests/views/test_book.py | 33 -------------------------------
 1 file changed, 33 deletions(-)

diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index dce50868..2acdb369 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -47,39 +47,6 @@ class BookViews(TestCase):
         )
         models.SiteSettings.objects.create()
 
-    def test_date_regression(self):
-        """ensure that creating a new book actually saves the published date fields
-
-        this was initially a regression due to using a custom date picker tag
-        """
-        first_published_date = "2021-04-20"
-        published_date = "2022-04-20"
-        self.local_user.groups.add(self.group)
-        view = views.EditBook.as_view()
-        form = forms.EditionForm(
-            {
-                "title": "New Title",
-                "last_edited_by": self.local_user.id,
-                "first_published_date": first_published_date,
-                "published_date": published_date,
-            }
-        )
-        request = self.factory.post("", form.data)
-        request.user = self.local_user
-
-        with patch("bookwyrm.connectors.connector_manager.local_search"):
-            result = view(request)
-        result.render()
-
-        self.assertContains(
-            result,
-            f'<input type="date" name="first_published_date" class="input" id="id_first_published_date" value="{first_published_date}">',
-        )
-        self.assertContains(
-            result,
-            f'<input type="date" name="published_date" class="input" id="id_published_date" value="{published_date}">',
-        )
-
     def test_book_page(self):
         """there are so many views, this just makes sure it LOADS"""
         view = views.Book.as_view()

From 906201fa2ad617fd0072617b6d3475eb8a2aa56a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 4 May 2021 09:45:13 -0700
Subject: [PATCH 1089/1285] Fixes notification import link

---
 bookwyrm/templates/notifications.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html
index 73ad23b8..8f8fede2 100644
--- a/bookwyrm/templates/notifications.html
+++ b/bookwyrm/templates/notifications.html
@@ -107,7 +107,8 @@
                                 {% endif %}
                             {% endif %}
                         {% elif notification.related_import %}
-                        {% blocktrans with related_id=notification.related_import.id %}Your <a href="{% url 'import-status' related_id %}">import</a> completed.{% endblocktrans %}
+                        {% url 'import-status' notification.related_import.id as url %}
+                        {% blocktrans %}Your <a href="{{ url }}">import</a> completed.{% endblocktrans %}
                         {% elif notification.related_report %}
                             {% url 'settings-report' notification.related_report.id as path %}
                             {% blocktrans with related_id=path %}A new <a href="{{ path }}">report</a> needs moderation.{% endblocktrans %}

From c9ed069121eaef14e2af1d8e9b25d689debd846f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 4 May 2021 09:47:00 -0700
Subject: [PATCH 1090/1285] Use example url in test

---
 bookwyrm/tests/views/inbox/test_inbox_add.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/bookwyrm/tests/views/inbox/test_inbox_add.py b/bookwyrm/tests/views/inbox/test_inbox_add.py
index 9f237b6d..8d1c493f 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_add.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_add.py
@@ -35,7 +35,7 @@ class InboxAdd(TestCase):
         work = models.Work.objects.create(title="work title")
         self.book = models.Edition.objects.create(
             title="Test",
-            remote_id="https://bookwyrm.social/book/37292",
+            remote_id="https://example.com/book/37292",
             parent_work=work,
         )
 
@@ -44,20 +44,20 @@ class InboxAdd(TestCase):
     def test_handle_add_book_to_shelf(self):
         """shelving a book"""
         shelf = models.Shelf.objects.create(user=self.remote_user, name="Test Shelf")
-        shelf.remote_id = "https://bookwyrm.social/user/mouse/shelf/to-read"
+        shelf.remote_id = "https://example.com/user/mouse/shelf/to-read"
         shelf.save()
 
         activity = {
-            "id": "https://bookwyrm.social/shelfbook/6189#add",
+            "id": "https://bookwyrm.l/shelfbook/6189#add",
             "type": "Add",
             "actor": "https://example.com/users/rat",
             "object": {
                 "actor": self.remote_user.remote_id,
                 "type": "ShelfItem",
                 "book": self.book.remote_id,
-                "id": "https://bookwyrm.social/shelfbook/6189",
+                "id": "https://example.com/shelfbook/6189",
             },
-            "target": "https://bookwyrm.social/user/mouse/shelf/to-read",
+            "target": "https://example.com/user/mouse/shelf/to-read",
             "@context": "https://www.w3.org/ns/activitystreams",
         }
         views.inbox.activity_task(activity)
@@ -68,7 +68,7 @@ class InboxAdd(TestCase):
         """listing a book"""
         responses.add(
             responses.GET,
-            "https://bookwyrm.social/user/mouse/list/to-read",
+            "https://example.com/user/mouse/list/to-read",
             json={
                 "id": "https://example.com/list/22",
                 "type": "BookList",
@@ -86,17 +86,17 @@ class InboxAdd(TestCase):
         )
 
         activity = {
-            "id": "https://bookwyrm.social/listbook/6189#add",
+            "id": "https://example.com/listbook/6189#add",
             "type": "Add",
             "actor": "https://example.com/users/rat",
             "object": {
                 "actor": self.remote_user.remote_id,
                 "type": "ListItem",
                 "book": self.book.remote_id,
-                "id": "https://bookwyrm.social/listbook/6189",
+                "id": "https://example.com/listbook/6189",
                 "order": 1,
             },
-            "target": "https://bookwyrm.social/user/mouse/list/to-read",
+            "target": "https://example.com/user/mouse/list/to-read",
             "@context": "https://www.w3.org/ns/activitystreams",
         }
         views.inbox.activity_task(activity)
@@ -105,4 +105,4 @@ class InboxAdd(TestCase):
         listitem = models.ListItem.objects.get()
         self.assertEqual(booklist.name, "Test List")
         self.assertEqual(booklist.books.first(), self.book)
-        self.assertEqual(listitem.remote_id, "https://bookwyrm.social/listbook/6189")
+        self.assertEqual(listitem.remote_id, "https://example.com/listbook/6189")

From b10f0b19c4ed6e5f34df60431318dcabba35ce5a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 4 May 2021 09:49:24 -0700
Subject: [PATCH 1091/1285] Removes outdated test

---
 bookwyrm/tests/views/test_book.py | 33 -------------------------------
 1 file changed, 33 deletions(-)

diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index dce50868..2acdb369 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -47,39 +47,6 @@ class BookViews(TestCase):
         )
         models.SiteSettings.objects.create()
 
-    def test_date_regression(self):
-        """ensure that creating a new book actually saves the published date fields
-
-        this was initially a regression due to using a custom date picker tag
-        """
-        first_published_date = "2021-04-20"
-        published_date = "2022-04-20"
-        self.local_user.groups.add(self.group)
-        view = views.EditBook.as_view()
-        form = forms.EditionForm(
-            {
-                "title": "New Title",
-                "last_edited_by": self.local_user.id,
-                "first_published_date": first_published_date,
-                "published_date": published_date,
-            }
-        )
-        request = self.factory.post("", form.data)
-        request.user = self.local_user
-
-        with patch("bookwyrm.connectors.connector_manager.local_search"):
-            result = view(request)
-        result.render()
-
-        self.assertContains(
-            result,
-            f'<input type="date" name="first_published_date" class="input" id="id_first_published_date" value="{first_published_date}">',
-        )
-        self.assertContains(
-            result,
-            f'<input type="date" name="published_date" class="input" id="id_published_date" value="{published_date}">',
-        )
-
     def test_book_page(self):
         """there are so many views, this just makes sure it LOADS"""
         view = views.Book.as_view()

From 5906588c860796ee2f000bb364697f8a2ce29fec Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 4 May 2021 10:33:16 -0700
Subject: [PATCH 1092/1285] Fixes shelf add test

---
 bookwyrm/tests/views/inbox/test_inbox_add.py | 26 +++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/tests/views/inbox/test_inbox_add.py b/bookwyrm/tests/views/inbox/test_inbox_add.py
index 8d1c493f..5f86b121 100644
--- a/bookwyrm/tests/views/inbox/test_inbox_add.py
+++ b/bookwyrm/tests/views/inbox/test_inbox_add.py
@@ -41,14 +41,34 @@ class InboxAdd(TestCase):
 
         models.SiteSettings.objects.create()
 
+    @responses.activate
     def test_handle_add_book_to_shelf(self):
         """shelving a book"""
         shelf = models.Shelf.objects.create(user=self.remote_user, name="Test Shelf")
-        shelf.remote_id = "https://example.com/user/mouse/shelf/to-read"
+        shelf.remote_id = "https://example.com/user/rat/shelf/to-read"
         shelf.save()
 
+        responses.add(
+            responses.GET,
+            "https://example.com/user/rat/shelf/to-read",
+            json={
+                "id": shelf.remote_id,
+                "type": "Shelf",
+                "totalItems": 1,
+                "first": "https://example.com/shelf/22?page=1",
+                "last": "https://example.com/shelf/22?page=1",
+                "name": "Test Shelf",
+                "owner": self.remote_user.remote_id,
+                "to": ["https://www.w3.org/ns/activitystreams#Public"],
+                "cc": ["https://example.com/user/rat/followers"],
+                "summary": "summary text",
+                "curation": "curated",
+                "@context": "https://www.w3.org/ns/activitystreams",
+            },
+        )
+
         activity = {
-            "id": "https://bookwyrm.l/shelfbook/6189#add",
+            "id": "https://example.com/shelfbook/6189#add",
             "type": "Add",
             "actor": "https://example.com/users/rat",
             "object": {
@@ -57,7 +77,7 @@ class InboxAdd(TestCase):
                 "book": self.book.remote_id,
                 "id": "https://example.com/shelfbook/6189",
             },
-            "target": "https://example.com/user/mouse/shelf/to-read",
+            "target": "https://example.com/user/rat/shelf/to-read",
             "@context": "https://www.w3.org/ns/activitystreams",
         }
         views.inbox.activity_task(activity)

From 558c9c4d675ff2675c2b88171294d52b989105d4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 5 May 2021 07:52:57 -0700
Subject: [PATCH 1093/1285] Sort edition list for better import results from
 inventaire

---
 bookwyrm/connectors/inventaire.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index 60f490f3..3f26da68 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -123,7 +123,7 @@ class Connector(AbstractConnector):
 
     def load_edition_data(self, work_uri):
         """get a list of editions for a work"""
-        url = "{:s}?action=reverse-claims&property=wdt:P629&value={:s}".format(
+        url = "{:s}?action=reverse-claims&property=wdt:P629&value={:s}&sort=true".format(
             self.books_url, work_uri
         )
         return get_data(url)

From c15358d715566e883149ac0332037b86ebce0df2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 5 May 2021 07:58:09 -0700
Subject: [PATCH 1094/1285] Python formatting

---
 bookwyrm/connectors/inventaire.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index 3f26da68..0c573265 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -123,8 +123,10 @@ class Connector(AbstractConnector):
 
     def load_edition_data(self, work_uri):
         """get a list of editions for a work"""
-        url = "{:s}?action=reverse-claims&property=wdt:P629&value={:s}&sort=true".format(
-            self.books_url, work_uri
+        url = (
+            "{:s}?action=reverse-claims&property=wdt:P629&value={:s}&sort=true".format(
+                self.books_url, work_uri
+            )
         )
         return get_data(url)
 

From a137bd21ff97cb187eeb65f57915d556cdf6e964 Mon Sep 17 00:00:00 2001
From: Fabien Basmaison <contact@arkhi.org>
Date: Thu, 6 May 2021 17:24:05 +0200
Subject: [PATCH 1095/1285] Display author biography with style. :sunglasses:

---
 bookwyrm/templates/author.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/author.html b/bookwyrm/templates/author.html
index 0ef876fd..ec952d4c 100644
--- a/bookwyrm/templates/author.html
+++ b/bookwyrm/templates/author.html
@@ -22,12 +22,11 @@
     </div>
 </div>
 
-<div class="block">
+<div class="block content">
     {% if author.bio %}
-    <p>
         {{ author.bio | to_markdown | safe }}
-    </p>
     {% endif %}
+
     {% if author.wikipedia_link %}
     <p><a href="{{ author.wikipedia_link }}" rel=�noopener� target="_blank">{% trans "Wikipedia" %}</a></p>
     {% endif %}

From 1cc63c6d456f867791867787d6ee6377abec3128 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 7 May 2021 13:55:41 -0700
Subject: [PATCH 1096/1285] Adds filtered view for notifications

---
 bookwyrm/urls.py                | 5 +++++
 bookwyrm/views/notifications.py | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 3e7dea58..3fdced38 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -139,6 +139,11 @@ urlpatterns = [
     path("", views.Home.as_view(), name="landing"),
     re_path(r"^discover/?$", views.Discover.as_view()),
     re_path(r"^notifications/?$", views.Notifications.as_view(), name="notifications"),
+    re_path(
+        r"^notifications/(?P<notification_type>mentions)/?$",
+        views.Notifications.as_view(),
+        name="notifications",
+    ),
     re_path(r"^directory/?", views.Directory.as_view(), name="directory"),
     # Get started
     re_path(
diff --git a/bookwyrm/views/notifications.py b/bookwyrm/views/notifications.py
index 3d08cade..b96bc925 100644
--- a/bookwyrm/views/notifications.py
+++ b/bookwyrm/views/notifications.py
@@ -11,10 +11,14 @@ from django.views import View
 class Notifications(View):
     """notifications view"""
 
-    def get(self, request):
+    def get(self, request, notification_type=None):
         """people are interacting with you, get hyped"""
         notifications = request.user.notification_set.all().order_by("-created_date")
-        unread = [n.id for n in notifications.filter(read=False)]
+        if notification_type == "mentions":
+            notifications = notifications.filter(
+                notification_type__in=["REPLY", "MENTION", "TAG"]
+            )
+        unread = [n.id for n in notifications.filter(read=False)[:50]]
         data = {
             "notifications": notifications[:50],
             "unread": unread,

From 852f8da62e4fa3b5a65c200109d7f0455feae881 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 7 May 2021 14:00:55 -0700
Subject: [PATCH 1097/1285] Adds tabs to notifications

---
 bookwyrm/templates/notifications.html | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html
index 8f8fede2..ed623b12 100644
--- a/bookwyrm/templates/notifications.html
+++ b/bookwyrm/templates/notifications.html
@@ -6,13 +6,30 @@
 {% block title %}{% trans "Notifications" %}{% endblock %}
 
 {% block content %}
-<div class="block">
-    <h1 class="title">{% trans "Notifications" %}</h1>
+<header class="columns">
+    <div class="column">
+        <h1 class="title">{% trans "Notifications" %}</h1>
+    </div>
 
-    <form name="clear" action="/notifications" method="POST">
+    <form name="clear" action="/notifications" method="POST" class="column is-narrow">
         {% csrf_token %}
         <button class="button is-danger is-light" type="submit" class="secondary">{% trans "Delete notifications" %}</button>
     </form>
+</header>
+
+<div class="block">
+    <nav class="tabs">
+        <ul>
+            {% url 'notifications' as tab_url %}
+            <li {% if tab_url == request.path %}class="is-active"{% endif %}>
+                <a href="{{ tab_url }}">{% trans "All" %}</a>
+            </li>
+            {% url 'notifications' 'mentions' as tab_url %}
+            <li {% if tab_url == request.path %}class="is-active"{% endif %}>
+                <a href="{{ tab_url }}">{% trans "Mentions" %}</a>
+            </li>
+        </ul>
+    </nav>
 </div>
 
 <div class="block">

From f2d985e58323b3d3e7595103b2c9edd4184fcf3c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 10 May 2021 09:57:53 -0700
Subject: [PATCH 1098/1285] Uses one set of search logic for all results or
 just first

---
 bookwyrm/connectors/connector_manager.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/connectors/connector_manager.py b/bookwyrm/connectors/connector_manager.py
index 86cebe80..cac8eb7c 100644
--- a/bookwyrm/connectors/connector_manager.py
+++ b/bookwyrm/connectors/connector_manager.py
@@ -19,7 +19,7 @@ class ConnectorException(HTTPError):
     """when the connector can't do what was asked"""
 
 
-def search(query, min_confidence=0.1):
+def search(query, min_confidence=0.1, return_first=False):
     """find books based on arbitary keywords"""
     if not query:
         return []
@@ -51,6 +51,9 @@ def search(query, min_confidence=0.1):
                 logger.exception(e)
                 continue
 
+        if return_first and result_set:
+            return result_set[0]
+
         results.append(
             {
                 "connector": connector,
@@ -58,6 +61,9 @@ def search(query, min_confidence=0.1):
             }
         )
 
+    if return_first:
+        return None
+
     return results
 
 
@@ -77,12 +83,7 @@ def isbn_local_search(query, raw=False):
 
 def first_search_result(query, min_confidence=0.1):
     """search until you find a result that fits"""
-    for connector in get_connectors():
-        result = connector.search(query, min_confidence=min_confidence)
-        if result:
-            return result[0]
-    return None
-
+    return search(query, min_confidence=min_confidence, return_first=True)
 
 def get_connectors():
     """load all connectors"""

From 36439506b646c245f5b68135021c922f501d48ed Mon Sep 17 00:00:00 2001
From: Allie Signet <allie@cat-girl.gay>
Date: Mon, 10 May 2021 14:00:51 -0300
Subject: [PATCH 1099/1285] add storygraph import

---
 bookwyrm/importers/__init__.py          |  1 +
 bookwyrm/importers/storygraph_import.py | 32 +++++++++++++++++++++++++
 bookwyrm/templates/import.html          |  3 +++
 bookwyrm/views/import_data.py           |  4 +++-
 4 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 bookwyrm/importers/storygraph_import.py

diff --git a/bookwyrm/importers/__init__.py b/bookwyrm/importers/__init__.py
index f13672e0..d4890070 100644
--- a/bookwyrm/importers/__init__.py
+++ b/bookwyrm/importers/__init__.py
@@ -3,3 +3,4 @@
 from .importer import Importer
 from .goodreads_import import GoodreadsImporter
 from .librarything_import import LibrarythingImporter
+from .storygraph_import import StorygraphImporter
diff --git a/bookwyrm/importers/storygraph_import.py b/bookwyrm/importers/storygraph_import.py
new file mode 100644
index 00000000..020adf3e
--- /dev/null
+++ b/bookwyrm/importers/storygraph_import.py
@@ -0,0 +1,32 @@
+""" handle reading a csv from librarything """
+import re
+import math
+
+from . import Importer
+
+
+class StorygraphImporter(Importer):
+    """csv downloads from librarything"""
+
+    service = "Storygraph"
+    # mandatory_fields : fields matching the book title and author
+    mandatory_fields = ["Title", "Author"]
+
+    def parse_fields(self, entry):
+        """custom parsing for storygraph"""
+        data = {}
+        data["import_source"] = self.service
+        data["Title"] = entry["Title"]
+        data["Author"] = entry["Author"]
+        data["ISBN13"] = entry["ISBN"]
+        data["My Review"] = entry["Review"]
+        if entry["Star Rating"]:
+            data["My Rating"] = math.ceil(float(entry["Star Rating"]))
+        else:
+            data["My Rating"] = ""
+
+        data["Date Added"] = re.sub(r"[/]", "-", entry["Date Added"])
+        data["Date Read"] = re.sub(r"[/]", "-", entry["Last Date Read"])
+
+        data["Exclusive Shelf"] = ({"read": "read", "currently-reading": "reading", "to-read": "to-read"}).get(entry["Read Status"],None)
+        return data
diff --git a/bookwyrm/templates/import.html b/bookwyrm/templates/import.html
index c4f0dfae..2b7d69e1 100644
--- a/bookwyrm/templates/import.html
+++ b/bookwyrm/templates/import.html
@@ -20,6 +20,9 @@
                     <option value="GoodReads" {% if current == 'GoodReads' %}selected{% endif %}>
                         GoodReads (CSV)
                     </option>
+                    <option value="Storygraph" {% if current == 'Storygraph' %}selected{% endif %}>
+                        Storygraph (CSV)
+                    </option>
                     <option value="LibraryThing" {% if current == 'LibraryThing' %}selected{% endif %}>
                         LibraryThing (TSV)
                     </option>
diff --git a/bookwyrm/views/import_data.py b/bookwyrm/views/import_data.py
index a2abbc69..ccf4ec6d 100644
--- a/bookwyrm/views/import_data.py
+++ b/bookwyrm/views/import_data.py
@@ -10,7 +10,7 @@ from django.utils.decorators import method_decorator
 from django.views import View
 
 from bookwyrm import forms, models
-from bookwyrm.importers import Importer, LibrarythingImporter, GoodreadsImporter
+from bookwyrm.importers import Importer, LibrarythingImporter, GoodreadsImporter, StorygraphImporter
 from bookwyrm.tasks import app
 
 # pylint: disable= no-self-use
@@ -42,6 +42,8 @@ class Import(View):
             importer = None
             if source == "LibraryThing":
                 importer = LibrarythingImporter()
+            elif source == "Storygraph":
+                importer = StorygraphImporter()
             else:
                 # Default : GoodReads
                 importer = GoodreadsImporter()

From 5cd974b78d3b0475b87c6b40d228301f0eca3864 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 10 May 2021 10:03:05 -0700
Subject: [PATCH 1100/1285] Python formatting

---
 bookwyrm/connectors/connector_manager.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bookwyrm/connectors/connector_manager.py b/bookwyrm/connectors/connector_manager.py
index cac8eb7c..6fe458ca 100644
--- a/bookwyrm/connectors/connector_manager.py
+++ b/bookwyrm/connectors/connector_manager.py
@@ -85,6 +85,7 @@ def first_search_result(query, min_confidence=0.1):
     """search until you find a result that fits"""
     return search(query, min_confidence=min_confidence, return_first=True)
 
+
 def get_connectors():
     """load all connectors"""
     for info in models.Connector.objects.order_by("priority").all():

From 623bb181e42a91a931339ebe8f7894e45dbf4769 Mon Sep 17 00:00:00 2001
From: Allie Signet <allie@cat-girl.gay>
Date: Mon, 10 May 2021 15:56:35 -0300
Subject: [PATCH 1101/1285] fix formatting

---
 bookwyrm/importers/storygraph_import.py | 4 +++-
 bookwyrm/views/import_data.py           | 7 ++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/importers/storygraph_import.py b/bookwyrm/importers/storygraph_import.py
index 020adf3e..8e43cabc 100644
--- a/bookwyrm/importers/storygraph_import.py
+++ b/bookwyrm/importers/storygraph_import.py
@@ -28,5 +28,7 @@ class StorygraphImporter(Importer):
         data["Date Added"] = re.sub(r"[/]", "-", entry["Date Added"])
         data["Date Read"] = re.sub(r"[/]", "-", entry["Last Date Read"])
 
-        data["Exclusive Shelf"] = ({"read": "read", "currently-reading": "reading", "to-read": "to-read"}).get(entry["Read Status"],None)
+        data["Exclusive Shelf"] = (
+            {"read": "read", "currently-reading": "reading", "to-read": "to-read"}
+        ).get(entry["Read Status"], None)
         return data
diff --git a/bookwyrm/views/import_data.py b/bookwyrm/views/import_data.py
index ccf4ec6d..2bbb5947 100644
--- a/bookwyrm/views/import_data.py
+++ b/bookwyrm/views/import_data.py
@@ -10,7 +10,12 @@ from django.utils.decorators import method_decorator
 from django.views import View
 
 from bookwyrm import forms, models
-from bookwyrm.importers import Importer, LibrarythingImporter, GoodreadsImporter, StorygraphImporter
+from bookwyrm.importers import (
+    Importer,
+    LibrarythingImporter,
+    GoodreadsImporter,
+    StorygraphImporter,
+)
 from bookwyrm.tasks import app
 
 # pylint: disable= no-self-use

From 13dc5efe712cc11df4aab0f6125a19b10d645ad1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 10 May 2021 12:53:36 -0700
Subject: [PATCH 1102/1285] More comprehensive tests for connector search

---
 bookwyrm/connectors/connector_manager.py      | 20 ++++---
 .../connectors/test_connector_manager.py      | 53 +++++++++++++++++--
 2 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/bookwyrm/connectors/connector_manager.py b/bookwyrm/connectors/connector_manager.py
index 6fe458ca..1c938b4b 100644
--- a/bookwyrm/connectors/connector_manager.py
+++ b/bookwyrm/connectors/connector_manager.py
@@ -31,18 +31,15 @@ def search(query, min_confidence=0.1, return_first=False):
 
     for connector in get_connectors():
         result_set = None
-        if maybe_isbn:
+        if maybe_isbn and connector.isbn_search_url and connector.isbn_search_url == "":
             # Search on ISBN
-            if not connector.isbn_search_url or connector.isbn_search_url == "":
-                result_set = []
-            else:
-                try:
-                    result_set = connector.isbn_search(isbn)
-                except Exception as e:  # pylint: disable=broad-except
-                    logger.exception(e)
-                    continue
+            try:
+                result_set = connector.isbn_search(isbn)
+            except Exception as e:  # pylint: disable=broad-except
+                logger.exception(e)
+                # if this fails, we can still try regular search
 
-        # if no isbn search or results, we fallback to generic search
+        # if no isbn search results, we fallback to generic search
         if result_set in (None, []):
             try:
                 result_set = connector.search(query, min_confidence=min_confidence)
@@ -52,6 +49,7 @@ def search(query, min_confidence=0.1, return_first=False):
                 continue
 
         if return_first and result_set:
+            # if we found anything, return it
             return result_set[0]
 
         results.append(
@@ -83,7 +81,7 @@ def isbn_local_search(query, raw=False):
 
 def first_search_result(query, min_confidence=0.1):
     """search until you find a result that fits"""
-    return search(query, min_confidence=min_confidence, return_first=True)
+    return search(query, min_confidence=min_confidence, return_first=True) or None
 
 
 def get_connectors():
diff --git a/bookwyrm/tests/connectors/test_connector_manager.py b/bookwyrm/tests/connectors/test_connector_manager.py
index 34abbeaf..67b108dd 100644
--- a/bookwyrm/tests/connectors/test_connector_manager.py
+++ b/bookwyrm/tests/connectors/test_connector_manager.py
@@ -1,5 +1,6 @@
 """ interface between the app and various connectors """
 from django.test import TestCase
+import responses
 
 from bookwyrm import models
 from bookwyrm.connectors import connector_manager
@@ -17,6 +18,9 @@ class ConnectorManager(TestCase):
         self.edition = models.Edition.objects.create(
             title="Example Edition", parent_work=self.work, isbn_10="0000000000"
         )
+        self.edition = models.Edition.objects.create(
+            title="Another Edition", parent_work=self.work, isbn_10="1111111111"
+        )
 
         self.connector = models.Connector.objects.create(
             identifier="test_connector",
@@ -29,6 +33,18 @@ class ConnectorManager(TestCase):
             isbn_search_url="http://test.com/isbn/",
         )
 
+        self.remote_connector = models.Connector.objects.create(
+            identifier="test_connector_remote",
+            priority=1,
+            local=False,
+            connector_file="bookwyrm_connector",
+            base_url="http://fake.ciom/",
+            books_url="http://fake.ciom/",
+            search_url="http://fake.ciom/search/",
+            covers_url="http://covers.fake.ciom/",
+            isbn_search_url="http://fake.ciom/isbn/",
+        )
+
     def test_get_or_create_connector(self):
         """loads a connector if the data source is known or creates one"""
         remote_id = "https://example.com/object/1"
@@ -42,23 +58,38 @@ class ConnectorManager(TestCase):
 
     def test_get_connectors(self):
         """load all connectors"""
-        remote_id = "https://example.com/object/1"
-        connector_manager.get_or_create_connector(remote_id)
         connectors = list(connector_manager.get_connectors())
         self.assertEqual(len(connectors), 2)
         self.assertIsInstance(connectors[0], SelfConnector)
         self.assertIsInstance(connectors[1], BookWyrmConnector)
 
+    @responses.activate
     def test_search(self):
         """search all connectors"""
+        responses.add(
+            responses.GET,
+            "http://fake.ciom/search/Example?min_confidence=0.1",
+            json={},
+        )
         results = connector_manager.search("Example")
         self.assertEqual(len(results), 1)
         self.assertIsInstance(results[0]["connector"], SelfConnector)
         self.assertEqual(len(results[0]["results"]), 1)
         self.assertEqual(results[0]["results"][0].title, "Example Edition")
 
+    def test_search_empty_query(self):
+        """don't panic on empty queries"""
+        results = connector_manager.search("")
+        self.assertEqual(results, [])
+
+    @responses.activate
     def test_search_isbn(self):
         """special handling if a query resembles an isbn"""
+        responses.add(
+            responses.GET,
+            "http://fake.ciom/isbn/0000000000",
+            json={},
+        )
         results = connector_manager.search("0000000000")
         self.assertEqual(len(results), 1)
         self.assertIsInstance(results[0]["connector"], SelfConnector)
@@ -75,8 +106,22 @@ class ConnectorManager(TestCase):
         """only get one search result"""
         result = connector_manager.first_search_result("Example")
         self.assertEqual(result.title, "Example Edition")
-        no_result = connector_manager.first_search_result("dkjfhg")
-        self.assertIsNone(no_result)
+
+    def test_first_search_result_empty_query(self):
+        """only get one search result"""
+        result = connector_manager.first_search_result("")
+        self.assertIsNone(result)
+
+    @responses.activate
+    def test_first_search_result_no_results(self):
+        """only get one search result"""
+        responses.add(
+            responses.GET,
+            "http://fake.ciom/search/dkjfhg?min_confidence=0.1",
+            json={},
+        )
+        result = connector_manager.first_search_result("dkjfhg")
+        self.assertIsNone(result)
 
     def test_load_connector(self):
         """load a connector object from the database entry"""

From 1844dd6b205b75e50a16b55202c10eeb4147beb3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 10 May 2021 13:01:11 -0700
Subject: [PATCH 1103/1285] Only include result blobs with results in search
 results

---
 bookwyrm/connectors/connector_manager.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/connectors/connector_manager.py b/bookwyrm/connectors/connector_manager.py
index 86cebe80..1fb375c9 100644
--- a/bookwyrm/connectors/connector_manager.py
+++ b/bookwyrm/connectors/connector_manager.py
@@ -43,7 +43,7 @@ def search(query, min_confidence=0.1):
                     continue
 
         # if no isbn search or results, we fallback to generic search
-        if result_set in (None, []):
+        if not result_set:
             try:
                 result_set = connector.search(query, min_confidence=min_confidence)
             except Exception as e:  # pylint: disable=broad-except
@@ -51,12 +51,13 @@ def search(query, min_confidence=0.1):
                 logger.exception(e)
                 continue
 
-        results.append(
-            {
-                "connector": connector,
-                "results": result_set,
-            }
-        )
+        if result_set or connector.local:
+            results.append(
+                {
+                    "connector": connector,
+                    "results": result_set,
+                }
+            )
 
     return results
 

From b0055f398d2286096964ead303b6fd72bdf2291c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 10 May 2021 13:24:00 -0700
Subject: [PATCH 1104/1285] Makes the show/hide buttons easier to find in book
 search

---
 bookwyrm/templates/search/book.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/search/book.html b/bookwyrm/templates/search/book.html
index 84c2fafe..9af8a394 100644
--- a/bookwyrm/templates/search/book.html
+++ b/bookwyrm/templates/search/book.html
@@ -27,8 +27,10 @@
                 </h3>
             </div>
             <div class="column is-narrow">
-                {% trans "Show" as button_text %}
-                {% include 'snippets/toggle/open_button.html' with text=button_text small=True controls_text="more-results-panel" controls_uid=result_set.connector.identifier class="is-small" icon="arrow-down" pressed=forloop.first %}
+                {% trans "Open" as button_text %}
+                {% include 'snippets/toggle/open_button.html' with text=button_text small=True controls_text="more-results-panel" controls_uid=result_set.connector.identifier class="is-small" icon_with_text="arrow-down" pressed=forloop.first %}
+                {% trans "Close" as button_text %}
+                {% include 'snippets/toggle/close_button.html' with text=button_text small=True controls_text="more-results-panel" controls_uid=result_set.connector.identifier class="is-small" icon_with_text="arrow-up" pressed=forloop.first %}
             </div>
         </header>
         {% endif %}
@@ -36,8 +38,6 @@
         <div class="box has-background-white is-shadowless{% if not forloop.first %} is-hidden{% endif %}" id="more-results-panel-{{ result_set.connector.identifier }}">
             <div class="is-flex is-flex-direction-row-reverse">
                 <div>
-                    {% trans "Close" as button_text %}
-                    {% include 'snippets/toggle/toggle_button.html' with label=button_text class="delete" nonbutton=True controls_text="more-results-panel" controls_uid=result_set.connector.identifier pressed=forloop.first %}
                 </div>
 
                 <ul class="is-flex-grow-1">

From c869129323e9907aecc41bfc53cb9537232f1409 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 10 May 2021 13:26:10 -0700
Subject: [PATCH 1105/1285] Updates locales

---
 locale/de_DE/LC_MESSAGES/django.mo   | Bin 25234 -> 24553 bytes
 locale/de_DE/LC_MESSAGES/django.po   | 153 ++++++++++---------
 locale/en_US/LC_MESSAGES/django.po   | 211 ++++++++++++++-------------
 locale/es/LC_MESSAGES/django.mo      | Bin 65330 -> 40709 bytes
 locale/es/LC_MESSAGES/django.po      | 153 ++++++++++---------
 locale/fr_FR/LC_MESSAGES/django.mo   | Bin 41556 -> 40827 bytes
 locale/fr_FR/LC_MESSAGES/django.po   | 153 ++++++++++---------
 locale/zh_Hans/LC_MESSAGES/django.mo | Bin 37261 -> 36647 bytes
 locale/zh_Hans/LC_MESSAGES/django.po | 153 ++++++++++---------
 9 files changed, 436 insertions(+), 387 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo
index 3f41eda575696af9585b5df60f4b09c991259496..90bc281759ba7efcf8aafd19283ddea45364b730 100644
GIT binary patch
delta 7462
zcmXxp3w+P@9>?+TW_QLmvy0o-unXImxz257Y%X)j=DMLMt%gLLa`|T&UF0@G<zBf|
zPWqE_ghUc2sk2pbLdwZKjwqUXz5l=Oevijz&+qN`z5Tww-=>xx^186k%k@K;&vL^x
z#LJk5cr3`6Bcx~6Q>iiQD4c@pu?*`qGNv}Zip_B=s%Zr_z)RQ){Tmxo2RmRS<|0*Q
z4Cdo(j5o$*zP1&2Fpi3-7-R0kPN<HHFdC;|8+-}X;Q?%lCvg(~Wt|jj%tZ31aWM9$
zvrOE8ZSfo?VKjr)Wqi|vL?{JA(GQC;03XL1_!I`>EYynT+x!aDPOL}W_b%4LU04?n
zq89Qkw#GZ?k10)@_H8kY@l9tEJ~#k1Kt9&QaTtt`+xpoULjGBths#hCZ@@Na;1twE
zGEn_=x8;M-m;5MOKMpmK$Izw36cXxahV>=X7OllFJc8=@6ly}}P!qh48n_B|e^4{0
zydkPQ5qT=6Eoz(sTVI6gr??sWua2iv5RS7^H<sH5>rl^n8%E)$s6%!d)$T58r2+9A
zG>k$GGze8b96bZs{B+dB=c68Jc|7~C#A;ix3Dxm-<V7%hZT<+V!%ACz9_y38jvBaD
zf^!ynq9%}UEwqk9os|;Qcr#EtR^}oROJap>@B!-Z9Y#ItFHvv7S@gr(sEOP|byPdi
z={O3NPq6tk)P0$#`-Wfu7NHL3!?xV@GzqPA4r;3w*os%I>rp$h+1BqwZQ&=V6&y!R
z=q&0ry^aA`Gs!6rM@^(Ds{ahsPUIr@yUbAApcwtBaG_qC`N$&87SxR=Py?ODk$BDK
z`|=f1ha*uFd(`Hqp)dI|)QVq3ow2pHd<XjJ{ohSO1AmO_;0UT=1#0CNQHSm}YM{C;
zoE64dTcF;OHmLh@Q1=yDi%|=hhCVnKwR6v-=ly?`ggV}ad<4x$n1ZKJ4TF-MXWI~!
zk4FvE0X4Ba)P2Pmh|i%0T#B`D9cqE^pz3#`9??E@rIPrJgtqE7YKB#)*Ug(*=<qZ^
z-57`JI2kpO4Aj>4L$w=&x_>;@!V=U#PoWlAih6`gkT=(?PhtNxv%?g~<ER_HK@D&Q
zHSi780DmIi8dHN=YvqZk4zp1U$Vc@v0yU8bQ4<-D!8q0COR+ZjMX5Z0HCRJ|PVZZ&
zhKEoCevRt*B=WU2XRtQ<v~;YC8ZZuPVsq4e?NAfwV)I$3`+B1u)iBfor@KgK;O8+2
zH=?$58z$ia)Qy)>1KmXpRD<8K6R-|y$7WgQq1r9N5L|)U!Ohn9P+PwT)z0-J37y`H
zsFhb?0@h43hVy6AQ4L3<CNduD;55{?eIDw*H&N|&*!n%Fi5)}jNCj#lr)>Fo<h$T9
z*GT9_Uw%ibqhQn{X@Ke=5r<=%t$z_UkyRLhn^8Nm4^!|c_Q5}_+3C*jkVUAsW)p_t
z9&D)h|2T;(3NG6QE!#McA{+JW2cT9^fSORD^&!+mC))fB)FYgWTF4?>zZ&b3--_|L
z*Ovc`{)}&KkkFRi!GRdmmfzJl5?O@VjoRufSPz5SIqjRER+^3)U^Z$(OHmV9Yu$>v
zZzpO&M^QU|0$q6|z9Z2e6Wa4J!D*<05282TMs<7#H9>!V<;h_<0Jk7>H-DgZD7B;0
zzCGrX&$h0@!Q`(ZO-)t?`>$s)Bg2{5LR1IKP%~VO+WI$a`P<f=wtO!}Q-27@;Azx-
znVp<|a<P{ee-Gd@l&|c}n}*R{oE_QNh5gql|B!-E{2BFE@NHyMOn6u4HR_9z<O@+B
zo~bwz7o*x=#>N=f&3VR&sMl-&s^2Fu3g;tpG3zh}Pq|2_;h#7Y<1+au;98u8k=>oM
zupG73H<6|$n-iOeb5YO!9qY%a9jri|fgezB#|2ye8)_nfJ)DWT;z;Olv_YNPJ{W?-
zPz{SQ7E6&$F&j}Go<$9G1?%H2)YgY)JNHGS`fH8axlHuIVW<fg;bOi2lSzbA;N8=?
zArkeWXoi|dOVr`ZM6D<fHGyHae4NcsM)flbwV<V#jGIwstOC{VFQ^IJz&d*W{dzgC
zQv^m(5pVNdta;d!@*-3RrKkxku=$m!o!Edn8*iaLP=`@FP>I^fpHPRj3ga*`hkC|0
z86<Q_a*;Q~j6ij`3^mi$s2$jj+L67e6&*(n^dsu~aoyH?<vR6YsP@fJ{kKEyP_8X6
zLRTXSCX(RIF$>T$a||F~iQ4khsFhztb#T*`2ljUI;TTVO5^7=tQ7a#dTEJw~TT+I8
zxWU$M>COHJP_T;v&2T^Z<5#GTPNF)vg4zMEKF)+{qYhOxs(l&;Vn@^??136+1nN;e
zfa+%gs-HQiomtq2{nuexOMxb^(>6SeLFB(j4Rqdm548gkeVvY5pz`fe1N5`yW3V~-
z5=_Mvs0DqBYX2QRj8|PGG(bT==L<Li)zK8x4f9bec?EUjdh7e>Oa3To2Txc}Vi5Ur
zsD)ic?TAmF^9UNCR^9>CpQ|?sZQUr;>3jrrLn#L1Dy)f{P>0Non$Rbx_MfBYbffO8
z!UPQO&#Q}_QS~LLe#%e_UgDIy%oY;y6db^0ynwYag3q0Hpc&S}4yb3{6E)#H)Jlh9
zD|`@rupG5BD^Z7g4eGu<sQV70cIFEV)%*Vw3B9+sP#uH~bhb1SwbEEr2MMSfTUvW!
zI{A^Pc8jbpqgJ{awZ&Ud3)pMRk76qMZ!k{pzuzEdi;_^!G7IZqU(~=OZTVQ#3QABr
zGz~+r41@7yjK$Yc6F7uwe*)Fd_oxrqIn*NvxS!{*XBJCBD`=0Z=!%-i5L5@FQCnJ!
z8h8@M;B3_WYcLjfq9$Hx%g<v=@>Qq_rVMt*>4bW8S%caCCrIQ`pc(H+H9Ur4c+z?W
zwNm{xq54qNnTbJdZ7<Xz8;o_a1oer123z1p)Pjzq?*G<$KA-(p!<!U@Vq}4{;v`f@
z>8PE_L3Pj{HPNA{Egg&6fyZolDeAt3sQxyf&eRSZgCE-Z`a_(vk?JC$U!OftH;zL7
zmM~9XKirPp@E+<kcOB|%aUptMD^z(I_Qj1Df!9zI^&93qx-is2qEL@C2K5MBNhCCI
z8`Re1+WZhyM~|YO`5c>Hj5@uWFdQpU9bH1TyM??+#&<aX0SgOI?RR4nyny;kDR_iu
zAuf|lg7aZIqXt}rdZuq$-KdG}M-BJ|YU|IT4&^0eSIu?gV4EENE@QLID(ry2Vhv0x
zboxy}nwkt8qW6EfEx3%GsmLjE2Aqr9s--vzUqkvbcX2chr7#nBp(ge_YKw!Z)L98f
zO|+5CH?yXq`fZPXE)v~IXlruu5iCJ%X$7jIGw6lC5?>Q~hwrCAkL^jK`f5d@4dvVL
zdE%(8=uO#S(rxi$Teb=d$h&Ob^dK>i_;+;y>T&4wdM+C4y5!*bqcw)IC}N^5YlL0N
zPsgVSU(&zfS)%&-XLSN2HGZ@$h^BELn{H0}KGF{pM~FJ)n-bdI!T2UtUoj-=QI>)K
zAYLMPn?3)K0kfG{LGVJDy0ojlZg>)`f0`|+Pv!qfFDG6jYLl<RXNW(E#|SUV^kM2}
zJ9>`v8KMJu9XfseGKo?`R}}FtPs;fhl9GdH`w1>3vRq^~keEVrBNB+}>ja56i0!sO
zr&yOi_oNWIjuCOByV(2-<eQQ1Y4bU1WG|hm+r+yz{}sC0({R5n=!owVw+MYabm?U4
zP$m(pi8X|-KO8(ick#15@dI(uQ{w!16w++I0psi-{T&f$Cr8p{GRW{onP6Ot`X3SJ
zG0iq=jC;uI()%7u{ulg=&<94B4`nTgQ%=_Nb0<IFB9aMxkdmlhhkAuO6N$u!)#ra8
zl^ZFjAaq?ILJ4o;QzC)-e4-{XgS;+%?W(VI65iCcBJL;s0Wp<$kT^s%q5MZ2PrOdN
zO*AAt<JY26S2rB(Bt1V{@Ut<oglIr~Pb?#J>B}~V2q6{{UlO|Z5~=i)>d86(te-==
zEwPd~NL(iJX!AdGZRN*Yq6Y=Xu{rS`v4GGON_iPZp#CX+*Hh~JI0=4~>H3}6<Vkt{
zUFZ35b)xQZ%Cc>Fx^0_6ezH^MGT9XNvJJvX*C4Ku|CacO7;ftlDIZ4qs?Ar^h;nyz
z29wFRB-)X#Bsvi<6R!{fly}E@gmdx!>*_;AUj^yio)Z2^jk9f9{6xeOU5Kv4d?JW@
zzQGYhXVSVB5&eivo3BMWj)*7UpXf>Y9O1b%{sT5GJ|_Zcr1BEtAz~Dv>uCqi&wKoA
zZS(aoml$jF)!ea(?)0Z?5;1`EO?;N<sB!#B^d<_3>g&HG?z1<IA^o$h$fc|a>A#3}
zqziG2tt+;M*!yhO!z_NzB<d6Ui0ec-@rAz1{~_@Np)1GUyq@$GBA5syvWR%1B{6|`
zkvL7Xru|?H!vpv#(a_U}yIrG_K=+aO#oq3jNiTSp*Gs<OZj>_Br+j-_raQcKrLQ}_
r!}bvOU%6p5++F%z^LA$qNb+(o8Q9;qysBWdd+v}0e(wCDuD*W*a>oi_

delta 8055
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
A*Z=?k

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 65677cd9..7f274af9 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-03 11:22-0700\n"
+"POT-Creation-Date: 2021-05-10 13:23-0700\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"
@@ -145,11 +145,11 @@ msgstr "Etwas lief schief. Entschuldigung!"
 msgid "Edit Author"
 msgstr "Autor*in editieren"
 
-#: bookwyrm/templates/author.html:32
+#: bookwyrm/templates/author.html:31
 msgid "Wikipedia"
 msgstr ""
 
-#: bookwyrm/templates/author.html:37
+#: bookwyrm/templates/author.html:36
 #, python-format
 msgid "Books by %(name)s"
 msgstr "Bücher von %(name)s"
@@ -203,32 +203,32 @@ msgid "Description:"
 msgstr "Beschreibung:"
 
 #: bookwyrm/templates/book/book.html:127
-#: bookwyrm/templates/book/edit_book.html:241
+#: bookwyrm/templates/book/edit_book.html:249
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:93
 #: bookwyrm/templates/settings/site.html:97
 #: bookwyrm/templates/snippets/readthrough.html:77
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:50
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:38
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:38
 msgid "Save"
 msgstr "Speichern"
 
 #: bookwyrm/templates/book/book.html:128 bookwyrm/templates/book/book.html:180
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:242
+#: bookwyrm/templates/book/edit_book.html:250
 #: bookwyrm/templates/edit_author.html:79
 #: bookwyrm/templates/moderation/report_modal.html:34
 #: bookwyrm/templates/settings/federated_server.html:94
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
 #: bookwyrm/templates/snippets/readthrough.html:78
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:51
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:39
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -328,24 +328,24 @@ msgid "ISBN:"
 msgstr ""
 
 #: bookwyrm/templates/book/book_identifiers.html:15
-#: bookwyrm/templates/book/edit_book.html:227
+#: bookwyrm/templates/book/edit_book.html:235
 msgid "OCLC Number:"
 msgstr "OCLC Nummer:"
 
 #: bookwyrm/templates/book/book_identifiers.html:22
-#: bookwyrm/templates/book/edit_book.html:231
+#: bookwyrm/templates/book/edit_book.html:239
 msgid "ASIN:"
 msgstr ""
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:179
+#: bookwyrm/templates/book/edit_book.html:187
 #, fuzzy
 #| msgid "Add cover"
 msgid "Upload cover:"
 msgstr "Cover hinzufügen"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:185
+#: bookwyrm/templates/book/edit_book.html:193
 msgid "Load cover from url:"
 msgstr "Cover von URL laden:"
 
@@ -455,63 +455,63 @@ msgstr "Mehrere Herausgeber:innen durch Kommata trennen"
 msgid "First published date:"
 msgstr "Erstveröffentlichungsdatum:"
 
-#: bookwyrm/templates/book/edit_book.html:143
+#: bookwyrm/templates/book/edit_book.html:147
 msgid "Published date:"
 msgstr "Veröffentlichungsdatum:"
 
-#: bookwyrm/templates/book/edit_book.html:152
+#: bookwyrm/templates/book/edit_book.html:160
 #, fuzzy
 #| msgid "Author"
 msgid "Authors"
 msgstr "Autor*in"
 
-#: bookwyrm/templates/book/edit_book.html:158
+#: bookwyrm/templates/book/edit_book.html:166
 #, fuzzy, python-format
 #| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
 msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/book/edit_book.html:163
+#: bookwyrm/templates/book/edit_book.html:171
 #, fuzzy
 #| msgid "Edit Author"
 msgid "Add Authors:"
 msgstr "Autor*in editieren"
 
-#: bookwyrm/templates/book/edit_book.html:164
+#: bookwyrm/templates/book/edit_book.html:172
 msgid "John Doe, Jane Smith"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:170
+#: bookwyrm/templates/book/edit_book.html:178
 #: bookwyrm/templates/user/shelf/shelf.html:76
 msgid "Cover"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:198
+#: bookwyrm/templates/book/edit_book.html:206
 msgid "Physical Properties"
 msgstr "Physikalische Eigenschaften"
 
-#: bookwyrm/templates/book/edit_book.html:199
+#: bookwyrm/templates/book/edit_book.html:207
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:207
+#: bookwyrm/templates/book/edit_book.html:215
 msgid "Pages:"
 msgstr "Seiten:"
 
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:222
 msgid "Book Identifiers"
 msgstr "Buchidentifikatoren"
 
-#: bookwyrm/templates/book/edit_book.html:215
+#: bookwyrm/templates/book/edit_book.html:223
 msgid "ISBN 13:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:219
+#: bookwyrm/templates/book/edit_book.html:227
 msgid "ISBN 10:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:223
+#: bookwyrm/templates/book/edit_book.html:231
 #: bookwyrm/templates/edit_author.html:59
 msgid "Openlibrary key:"
 msgstr ""
@@ -577,7 +577,7 @@ msgstr "Veröffentlicht von %(publisher)s."
 #: bookwyrm/templates/feed/feed_layout.html:70
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
-#: bookwyrm/templates/search/book.html:39
+#: bookwyrm/templates/search/book.html:32
 msgid "Close"
 msgstr "Schließen"
 
@@ -1304,7 +1304,7 @@ msgstr "Abmelden"
 
 #: bookwyrm/templates/layout.html:134 bookwyrm/templates/layout.html:135
 #: bookwyrm/templates/notifications.html:6
-#: bookwyrm/templates/notifications.html:10
+#: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
@@ -1422,6 +1422,7 @@ msgstr "Alle können Bücher vorschlagen, du kannst diese bestätigen"
 
 #: bookwyrm/templates/lists/form.html:31
 #: bookwyrm/templates/moderation/reports.html:25
+#: bookwyrm/templates/search/book.html:30
 msgid "Open"
 msgstr "Offen"
 
@@ -1628,119 +1629,130 @@ msgstr "Ins Regal gestellt"
 msgid "No reports found."
 msgstr "Keine Bücher gefunden"
 
-#: bookwyrm/templates/notifications.html:14
+#: bookwyrm/templates/notifications.html:16
 msgid "Delete notifications"
 msgstr "Benachrichtigungen löschen"
 
-#: bookwyrm/templates/notifications.html:53
+#: bookwyrm/templates/notifications.html:25
+msgid "All"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:29
+#, fuzzy
+#| msgid "More options"
+msgid "Mentions"
+msgstr "Mehr Optionen"
+
+#: bookwyrm/templates/notifications.html:70
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "hat deine <a href=\"%(related_path)s\">Bewertung von <em>%(book_title)s</em></a> favorisiert"
 
-#: bookwyrm/templates/notifications.html:55
+#: bookwyrm/templates/notifications.html:72
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "hat deinen <a href=\"%(related_path)s\">Kommentar zu <em>%(book_title)s</em></a> favorisiert"
 
-#: bookwyrm/templates/notifications.html:57
+#: bookwyrm/templates/notifications.html:74
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr " hat dein <a href=\"%(related_path)s\">Zitat aus <em>%(book_title)s</em></a> favorisiert"
 
-#: bookwyrm/templates/notifications.html:59
+#: bookwyrm/templates/notifications.html:76
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">status</a>"
 msgstr "hat deinen <a href=\"%(related_path)s\">Status</a> favorisiert"
 
-#: bookwyrm/templates/notifications.html:64
+#: bookwyrm/templates/notifications.html:81
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "hat dich in einer <a href=\"%(related_path)s\">Bewertung von <em>%(book_title)s</em></a> erwähnt"
 
-#: bookwyrm/templates/notifications.html:66
+#: bookwyrm/templates/notifications.html:83
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "hat dich in einem <a href=\"%(related_path)s\">Kommentar zu <em>%(book_title)s</em></a> erwähnt"
 
-#: bookwyrm/templates/notifications.html:68
+#: bookwyrm/templates/notifications.html:85
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "hat dich in einem <a href=\"%(related_path)s\">Zitat von <em>%(book_title)s</em></a> erwähnt"
 
-#: bookwyrm/templates/notifications.html:70
+#: bookwyrm/templates/notifications.html:87
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">status</a>"
 msgstr "hat dich in einem <a href=\"%(related_path)s\">Status</a> erwähnt"
 
-#: bookwyrm/templates/notifications.html:75
+#: bookwyrm/templates/notifications.html:92
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "hat auf deine <a href=\"%(parent_path)s\">Bewertung von <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a> "
 
-#: bookwyrm/templates/notifications.html:77
+#: bookwyrm/templates/notifications.html:94
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "hat auf deinen <a href=\"%(parent_path)s\">Kommentar zu <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a>"
 
-#: bookwyrm/templates/notifications.html:79
+#: bookwyrm/templates/notifications.html:96
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "hat auf dein <a href=\"%(parent_path)s\">Zitat aus <em>%(book_title)s</em></a> <a href=\"%(related_path)s\">geantwortet</a>"
 
-#: bookwyrm/templates/notifications.html:81
+#: bookwyrm/templates/notifications.html:98
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgstr "hat auf deinen <a href=\"%(parent_path)s\">Status</a> <a href=\"%(related_path)s\">geantwortet</a>"
 
-#: bookwyrm/templates/notifications.html:85
+#: bookwyrm/templates/notifications.html:102
 msgid "followed you"
 msgstr "folgt dir"
 
-#: bookwyrm/templates/notifications.html:88
+#: bookwyrm/templates/notifications.html:105
 msgid "sent you a follow request"
 msgstr "hat dir eine Folgeanfrage geschickt"
 
-#: bookwyrm/templates/notifications.html:94
+#: bookwyrm/templates/notifications.html:111
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "hat deine <a href=\"%(related_path)s\">Bewertung von <em>%(book_title)s</em></a> geteilt"
 
-#: bookwyrm/templates/notifications.html:96
+#: bookwyrm/templates/notifications.html:113
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
 msgstr "hat deinen <a href=\"%(related_path)s\">Kommentar zu<em>%(book_title)s</em></a> geteilt"
 
-#: bookwyrm/templates/notifications.html:98
+#: bookwyrm/templates/notifications.html:115
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "hat dein <a href=\"%(related_path)s\">Zitat aus <em>%(book_title)s</em></a> geteilt"
 
-#: bookwyrm/templates/notifications.html:100
+#: bookwyrm/templates/notifications.html:117
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">status</a>"
 msgstr "hat deinen <a href=\"%(related_path)s\">Status</a> geteilt"
 
-#: bookwyrm/templates/notifications.html:104
+#: bookwyrm/templates/notifications.html:121
 #, python-format
 msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 msgstr "hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> zu deiner Liste \"<a href=\"%(list_path)s\">%(list_name)s</a>\" Hinzugefügt"
 
-#: bookwyrm/templates/notifications.html:106
+#: bookwyrm/templates/notifications.html:123
 #, python-format
 msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 msgstr "hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> für deine Liste \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\" vorgeschlagen"
 
-#: bookwyrm/templates/notifications.html:110
-#, python-format
-msgid "Your <a href=\"/import/%(related_id)s\">import</a> completed."
+#: bookwyrm/templates/notifications.html:128
+#, fuzzy, python-format
+#| msgid "Your <a href=\"/import/%(related_id)s\">import</a> completed."
+msgid "Your <a href=\"%(url)s\">import</a> completed."
 msgstr "Dein <a href=\"/import/%(related_id)s\">Import</a> ist abgeschlossen."
 
-#: bookwyrm/templates/notifications.html:113
+#: bookwyrm/templates/notifications.html:131
 #, python-format
 msgid "A new <a href=\"%(path)s\">report</a> needs moderation."
 msgstr "Eine neue <a href=\"%(path)s\">Meldung</a> muss moderiert werden."
 
-#: bookwyrm/templates/notifications.html:139
+#: bookwyrm/templates/notifications.html:157
 msgid "You're all caught up!"
 msgstr "Du bist auf dem neusten Stand!"
 
@@ -1759,7 +1771,7 @@ msgstr "Passwort zurücksetzen"
 
 #: bookwyrm/templates/preferences/blocks.html:4
 #: bookwyrm/templates/preferences/blocks.html:7
-#: bookwyrm/templates/preferences/preferences_layout.html:23
+#: bookwyrm/templates/preferences/preferences_layout.html:26
 msgid "Blocked Users"
 msgstr "Blockierte Nutzer*innen"
 
@@ -1770,7 +1782,7 @@ msgstr "Momentan keine Nutzer*innen blockiert."
 #: bookwyrm/templates/preferences/change_password.html:4
 #: bookwyrm/templates/preferences/change_password.html:7
 #: bookwyrm/templates/preferences/change_password.html:21
-#: bookwyrm/templates/preferences/preferences_layout.html:17
+#: bookwyrm/templates/preferences/preferences_layout.html:19
 msgid "Change Password"
 msgstr "Passwort ändern"
 
@@ -1800,20 +1812,14 @@ msgstr ""
 msgid "Account"
 msgstr ""
 
-#: bookwyrm/templates/preferences/preferences_layout.html:14
+#: bookwyrm/templates/preferences/preferences_layout.html:15
 msgid "Profile"
 msgstr "Profil"
 
-#: bookwyrm/templates/preferences/preferences_layout.html:20
+#: bookwyrm/templates/preferences/preferences_layout.html:22
 msgid "Relationships"
 msgstr "Beziehungen"
 
-#: bookwyrm/templates/search/book.html:30
-#, fuzzy
-#| msgid "Show more"
-msgid "Show"
-msgstr "Mehr anzeigen"
-
 #: bookwyrm/templates/search/book.html:64
 #, fuzzy
 #| msgid "Show results from other catalogues"
@@ -2353,13 +2359,13 @@ msgid "Progress:"
 msgstr "Fortschritt:"
 
 #: bookwyrm/templates/snippets/create_status_form.html:85
-#: bookwyrm/templates/snippets/readthrough_form.html:22
+#: bookwyrm/templates/snippets/readthrough_form.html:26
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr "Seiten"
 
 #: bookwyrm/templates/snippets/create_status_form.html:86
-#: bookwyrm/templates/snippets/readthrough_form.html:23
+#: bookwyrm/templates/snippets/readthrough_form.html:27
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr "Prozent"
@@ -2499,8 +2505,8 @@ msgid "Goal privacy:"
 msgstr "Sichtbarkeit des Ziels"
 
 #: bookwyrm/templates/snippets/goal_form.html:26
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:29
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:45
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:33
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20
 msgid "Post to feed"
 msgstr "Posten"
@@ -2613,12 +2619,12 @@ msgstr "Diese Lesedaten löschen"
 msgid "Started reading"
 msgstr "Zu lesen angefangen"
 
-#: bookwyrm/templates/snippets/readthrough_form.html:14
+#: bookwyrm/templates/snippets/readthrough_form.html:18
 msgid "Progress"
 msgstr "Fortschritt"
 
-#: bookwyrm/templates/snippets/readthrough_form.html:30
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25
+#: bookwyrm/templates/snippets/readthrough_form.html:34
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:29
 msgid "Finished reading"
 msgstr "Lesen abgeschlossen"
 
@@ -3014,6 +3020,11 @@ msgstr "Dieser Benutzename ist bereits vergeben."
 msgid "A password reset link sent to %s"
 msgstr ""
 
+#, fuzzy
+#~| msgid "Show more"
+#~ msgid "Show"
+#~ msgstr "Mehr anzeigen"
+
 #, fuzzy
 #~| msgid "All messages"
 #~ msgid "Messages"
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index 07930197..dac6e253 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-03 11:22-0700\n"
+"POT-Creation-Date: 2021-05-10 13:23-0700\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"
@@ -135,11 +135,11 @@ msgstr ""
 msgid "Edit Author"
 msgstr ""
 
-#: bookwyrm/templates/author.html:32
+#: bookwyrm/templates/author.html:31
 msgid "Wikipedia"
 msgstr ""
 
-#: bookwyrm/templates/author.html:37
+#: bookwyrm/templates/author.html:36
 #, python-format
 msgid "Books by %(name)s"
 msgstr ""
@@ -189,32 +189,32 @@ msgid "Description:"
 msgstr ""
 
 #: bookwyrm/templates/book/book.html:127
-#: bookwyrm/templates/book/edit_book.html:241
+#: bookwyrm/templates/book/edit_book.html:249
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:93
 #: bookwyrm/templates/settings/site.html:97
 #: bookwyrm/templates/snippets/readthrough.html:77
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:50
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:38
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:38
 msgid "Save"
 msgstr ""
 
 #: bookwyrm/templates/book/book.html:128 bookwyrm/templates/book/book.html:180
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:242
+#: bookwyrm/templates/book/edit_book.html:250
 #: bookwyrm/templates/edit_author.html:79
 #: bookwyrm/templates/moderation/report_modal.html:34
 #: bookwyrm/templates/settings/federated_server.html:94
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
 #: bookwyrm/templates/snippets/readthrough.html:78
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:51
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:39
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
 msgid "Cancel"
 msgstr ""
@@ -301,22 +301,22 @@ msgid "ISBN:"
 msgstr ""
 
 #: bookwyrm/templates/book/book_identifiers.html:15
-#: bookwyrm/templates/book/edit_book.html:227
+#: bookwyrm/templates/book/edit_book.html:235
 msgid "OCLC Number:"
 msgstr ""
 
 #: bookwyrm/templates/book/book_identifiers.html:22
-#: bookwyrm/templates/book/edit_book.html:231
+#: bookwyrm/templates/book/edit_book.html:239
 msgid "ASIN:"
 msgstr ""
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:179
+#: bookwyrm/templates/book/edit_book.html:187
 msgid "Upload cover:"
 msgstr ""
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:185
+#: bookwyrm/templates/book/edit_book.html:193
 msgid "Load cover from url:"
 msgstr ""
 
@@ -420,58 +420,58 @@ msgstr ""
 msgid "First published date:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:143
+#: bookwyrm/templates/book/edit_book.html:147
 msgid "Published date:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:152
+#: bookwyrm/templates/book/edit_book.html:160
 msgid "Authors"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:158
+#: bookwyrm/templates/book/edit_book.html:166
 #, python-format
 msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:163
+#: bookwyrm/templates/book/edit_book.html:171
 msgid "Add Authors:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:164
+#: bookwyrm/templates/book/edit_book.html:172
 msgid "John Doe, Jane Smith"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:170
+#: bookwyrm/templates/book/edit_book.html:178
 #: bookwyrm/templates/user/shelf/shelf.html:76
 msgid "Cover"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:198
+#: bookwyrm/templates/book/edit_book.html:206
 msgid "Physical Properties"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:199
+#: bookwyrm/templates/book/edit_book.html:207
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:207
+#: bookwyrm/templates/book/edit_book.html:215
 msgid "Pages:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:222
 msgid "Book Identifiers"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:215
+#: bookwyrm/templates/book/edit_book.html:223
 msgid "ISBN 13:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:219
+#: bookwyrm/templates/book/edit_book.html:227
 msgid "ISBN 10:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:223
+#: bookwyrm/templates/book/edit_book.html:231
 #: bookwyrm/templates/edit_author.html:59
 msgid "Openlibrary key:"
 msgstr ""
@@ -535,7 +535,7 @@ msgstr ""
 #: bookwyrm/templates/feed/feed_layout.html:70
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
-#: bookwyrm/templates/search/book.html:39
+#: bookwyrm/templates/search/book.html:32
 msgid "Close"
 msgstr ""
 
@@ -1214,7 +1214,7 @@ msgstr ""
 
 #: bookwyrm/templates/layout.html:134 bookwyrm/templates/layout.html:135
 #: bookwyrm/templates/notifications.html:6
-#: bookwyrm/templates/notifications.html:10
+#: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr ""
 
@@ -1328,6 +1328,7 @@ msgstr ""
 
 #: bookwyrm/templates/lists/form.html:31
 #: bookwyrm/templates/moderation/reports.html:25
+#: bookwyrm/templates/search/book.html:30
 msgid "Open"
 msgstr ""
 
@@ -1507,119 +1508,127 @@ msgstr ""
 msgid "No reports found."
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:14
+#: bookwyrm/templates/notifications.html:16
 msgid "Delete notifications"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:53
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+#: bookwyrm/templates/notifications.html:25
+msgid "All"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:55
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
-msgstr ""
-
-#: bookwyrm/templates/notifications.html:57
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr ""
-
-#: bookwyrm/templates/notifications.html:59
-#, python-format
-msgid "favorited your <a href=\"%(related_path)s\">status</a>"
-msgstr ""
-
-#: bookwyrm/templates/notifications.html:64
-#, python-format
-msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr ""
-
-#: bookwyrm/templates/notifications.html:66
-#, python-format
-msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
-msgstr ""
-
-#: bookwyrm/templates/notifications.html:68
-#, python-format
-msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+#: bookwyrm/templates/notifications.html:29
+msgid "Mentions"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:70
 #, python-format
-msgid "mentioned you in a <a href=\"%(related_path)s\">status</a>"
+msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:75
+#: bookwyrm/templates/notifications.html:72
 #, python-format
-msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
+msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:77
+#: bookwyrm/templates/notifications.html:74
 #, python-format
-msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
+msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:79
+#: bookwyrm/templates/notifications.html:76
 #, python-format
-msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
+msgid "favorited your <a href=\"%(related_path)s\">status</a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:81
 #, python-format
-msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
+msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:83
+#, python-format
+msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:85
-msgid "followed you"
+#, python-format
+msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:88
-msgid "sent you a follow request"
+#: bookwyrm/templates/notifications.html:87
+#, python-format
+msgid "mentioned you in a <a href=\"%(related_path)s\">status</a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:92
+#, python-format
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:94
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:96
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:98
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:100
-#, python-format
-msgid "boosted your <a href=\"%(related_path)s\">status</a>"
+#: bookwyrm/templates/notifications.html:102
+msgid "followed you"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:104
-#, python-format
-msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+#: bookwyrm/templates/notifications.html:105
+msgid "sent you a follow request"
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:106
+#: bookwyrm/templates/notifications.html:111
 #, python-format
-msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
-msgstr ""
-
-#: bookwyrm/templates/notifications.html:110
-#, python-format
-msgid "Your <a href=\"/import/%(related_id)s\">import</a> completed."
+msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr ""
 
 #: bookwyrm/templates/notifications.html:113
 #, python-format
+msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:115
+#, python-format
+msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:117
+#, python-format
+msgid "boosted your <a href=\"%(related_path)s\">status</a>"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:121
+#, python-format
+msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:123
+#, python-format
+msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:128
+#, python-format
+msgid "Your <a href=\"%(url)s\">import</a> completed."
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:131
+#, python-format
 msgid "A new <a href=\"%(path)s\">report</a> needs moderation."
 msgstr ""
 
-#: bookwyrm/templates/notifications.html:139
+#: bookwyrm/templates/notifications.html:157
 msgid "You're all caught up!"
 msgstr ""
 
@@ -1638,7 +1647,7 @@ msgstr ""
 
 #: bookwyrm/templates/preferences/blocks.html:4
 #: bookwyrm/templates/preferences/blocks.html:7
-#: bookwyrm/templates/preferences/preferences_layout.html:23
+#: bookwyrm/templates/preferences/preferences_layout.html:26
 msgid "Blocked Users"
 msgstr ""
 
@@ -1649,7 +1658,7 @@ msgstr ""
 #: bookwyrm/templates/preferences/change_password.html:4
 #: bookwyrm/templates/preferences/change_password.html:7
 #: bookwyrm/templates/preferences/change_password.html:21
-#: bookwyrm/templates/preferences/preferences_layout.html:17
+#: bookwyrm/templates/preferences/preferences_layout.html:19
 msgid "Change Password"
 msgstr ""
 
@@ -1679,18 +1688,14 @@ msgstr ""
 msgid "Account"
 msgstr ""
 
-#: bookwyrm/templates/preferences/preferences_layout.html:14
+#: bookwyrm/templates/preferences/preferences_layout.html:15
 msgid "Profile"
 msgstr ""
 
-#: bookwyrm/templates/preferences/preferences_layout.html:20
+#: bookwyrm/templates/preferences/preferences_layout.html:22
 msgid "Relationships"
 msgstr ""
 
-#: bookwyrm/templates/search/book.html:30
-msgid "Show"
-msgstr ""
-
 #: bookwyrm/templates/search/book.html:64
 msgid "Load results from other catalogues"
 msgstr ""
@@ -2159,13 +2164,13 @@ msgid "Progress:"
 msgstr ""
 
 #: bookwyrm/templates/snippets/create_status_form.html:85
-#: bookwyrm/templates/snippets/readthrough_form.html:22
+#: bookwyrm/templates/snippets/readthrough_form.html:26
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr ""
 
 #: bookwyrm/templates/snippets/create_status_form.html:86
-#: bookwyrm/templates/snippets/readthrough_form.html:23
+#: bookwyrm/templates/snippets/readthrough_form.html:27
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr ""
@@ -2296,8 +2301,8 @@ msgid "Goal privacy:"
 msgstr ""
 
 #: bookwyrm/templates/snippets/goal_form.html:26
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:29
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:45
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:33
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20
 msgid "Post to feed"
 msgstr ""
@@ -2408,12 +2413,12 @@ msgstr ""
 msgid "Started reading"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough_form.html:14
+#: bookwyrm/templates/snippets/readthrough_form.html:18
 msgid "Progress"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough_form.html:30
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25
+#: bookwyrm/templates/snippets/readthrough_form.html:34
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:29
 msgid "Finished reading"
 msgstr ""
 
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index 1fb1ae530173b3a63652ee8d1e2face2a044ffc5..a814aa0f567a3f3018e2f7eda9ea4d8cc7b331f6 100644
GIT binary patch
delta 13595
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
NO0lmvt0=e7`9Fjq$yWdX

literal 65330
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
O_<{5<nwEu2?b3g+>vd27

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 899ff19f..864c9dbb 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-03 11:22-0700\n"
+"POT-Creation-Date: 2021-05-10 13:23-0700\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -135,11 +135,11 @@ msgstr "¡Algo salió mal! Disculpa."
 msgid "Edit Author"
 msgstr "Editar Autor/Autora"
 
-#: bookwyrm/templates/author.html:32
+#: bookwyrm/templates/author.html:31
 msgid "Wikipedia"
 msgstr "Wikipedia"
 
-#: bookwyrm/templates/author.html:37
+#: bookwyrm/templates/author.html:36
 #, python-format
 msgid "Books by %(name)s"
 msgstr "Libros de %(name)s"
@@ -191,32 +191,32 @@ msgid "Description:"
 msgstr "Descripción:"
 
 #: bookwyrm/templates/book/book.html:127
-#: bookwyrm/templates/book/edit_book.html:241
+#: bookwyrm/templates/book/edit_book.html:249
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:93
 #: bookwyrm/templates/settings/site.html:97
 #: bookwyrm/templates/snippets/readthrough.html:77
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:50
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:38
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:38
 msgid "Save"
 msgstr "Guardar"
 
 #: bookwyrm/templates/book/book.html:128 bookwyrm/templates/book/book.html:180
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:242
+#: bookwyrm/templates/book/edit_book.html:250
 #: bookwyrm/templates/edit_author.html:79
 #: bookwyrm/templates/moderation/report_modal.html:34
 #: bookwyrm/templates/settings/federated_server.html:94
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
 #: bookwyrm/templates/snippets/readthrough.html:78
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:51
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:39
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
 msgid "Cancel"
 msgstr "Cancelar"
@@ -311,22 +311,22 @@ msgid "ISBN:"
 msgstr "ISBN:"
 
 #: bookwyrm/templates/book/book_identifiers.html:15
-#: bookwyrm/templates/book/edit_book.html:227
+#: bookwyrm/templates/book/edit_book.html:235
 msgid "OCLC Number:"
 msgstr "Número OCLC:"
 
 #: bookwyrm/templates/book/book_identifiers.html:22
-#: bookwyrm/templates/book/edit_book.html:231
+#: bookwyrm/templates/book/edit_book.html:239
 msgid "ASIN:"
 msgstr "ASIN:"
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:179
+#: bookwyrm/templates/book/edit_book.html:187
 msgid "Upload cover:"
 msgstr "Subir portada:"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:185
+#: bookwyrm/templates/book/edit_book.html:193
 msgid "Load cover from url:"
 msgstr "Agregar portada de url:"
 
@@ -430,58 +430,58 @@ msgstr "Separar varios editores con comas."
 msgid "First published date:"
 msgstr "Fecha de primera publicación:"
 
-#: bookwyrm/templates/book/edit_book.html:143
+#: bookwyrm/templates/book/edit_book.html:147
 msgid "Published date:"
 msgstr "Fecha de publicación:"
 
-#: bookwyrm/templates/book/edit_book.html:152
+#: bookwyrm/templates/book/edit_book.html:160
 msgid "Authors"
 msgstr "Autores"
 
-#: bookwyrm/templates/book/edit_book.html:158
+#: bookwyrm/templates/book/edit_book.html:166
 #, python-format
 msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
 msgstr "Eliminar <a href=\"%(path)s\">%(name)s</a>"
 
-#: bookwyrm/templates/book/edit_book.html:163
+#: bookwyrm/templates/book/edit_book.html:171
 msgid "Add Authors:"
 msgstr "Agregar Autores:"
 
-#: bookwyrm/templates/book/edit_book.html:164
+#: bookwyrm/templates/book/edit_book.html:172
 msgid "John Doe, Jane Smith"
 msgstr "Juan Nadie, Natalia Natalia"
 
-#: bookwyrm/templates/book/edit_book.html:170
+#: bookwyrm/templates/book/edit_book.html:178
 #: bookwyrm/templates/user/shelf/shelf.html:76
 msgid "Cover"
 msgstr "Portada:"
 
-#: bookwyrm/templates/book/edit_book.html:198
+#: bookwyrm/templates/book/edit_book.html:206
 msgid "Physical Properties"
 msgstr "Propiedades físicas:"
 
-#: bookwyrm/templates/book/edit_book.html:199
+#: bookwyrm/templates/book/edit_book.html:207
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "Formato:"
 
-#: bookwyrm/templates/book/edit_book.html:207
+#: bookwyrm/templates/book/edit_book.html:215
 msgid "Pages:"
 msgstr "Páginas:"
 
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:222
 msgid "Book Identifiers"
 msgstr "Identificadores de libro"
 
-#: bookwyrm/templates/book/edit_book.html:215
+#: bookwyrm/templates/book/edit_book.html:223
 msgid "ISBN 13:"
 msgstr "ISBN 13:"
 
-#: bookwyrm/templates/book/edit_book.html:219
+#: bookwyrm/templates/book/edit_book.html:227
 msgid "ISBN 10:"
 msgstr "ISBN 10:"
 
-#: bookwyrm/templates/book/edit_book.html:223
+#: bookwyrm/templates/book/edit_book.html:231
 #: bookwyrm/templates/edit_author.html:59
 msgid "Openlibrary key:"
 msgstr "Clave OpenLibrary:"
@@ -545,7 +545,7 @@ msgstr "Publicado por %(publisher)s."
 #: bookwyrm/templates/feed/feed_layout.html:70
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
-#: bookwyrm/templates/search/book.html:39
+#: bookwyrm/templates/search/book.html:32
 msgid "Close"
 msgstr "Cerrar"
 
@@ -1224,7 +1224,7 @@ msgstr "Cerrar sesión"
 
 #: bookwyrm/templates/layout.html:134 bookwyrm/templates/layout.html:135
 #: bookwyrm/templates/notifications.html:6
-#: bookwyrm/templates/notifications.html:10
+#: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr "Notificaciones"
 
@@ -1340,6 +1340,7 @@ msgstr "Cualquier usuario puede sugerir libros, en cuanto lo hayas aprobado"
 
 #: bookwyrm/templates/lists/form.html:31
 #: bookwyrm/templates/moderation/reports.html:25
+#: bookwyrm/templates/search/book.html:30
 msgid "Open"
 msgstr "Abierto"
 
@@ -1521,119 +1522,130 @@ msgstr "Resuelto"
 msgid "No reports found."
 msgstr "No se encontró ningún informe."
 
-#: bookwyrm/templates/notifications.html:14
+#: bookwyrm/templates/notifications.html:16
 msgid "Delete notifications"
 msgstr "Borrar notificaciones"
 
-#: bookwyrm/templates/notifications.html:53
+#: bookwyrm/templates/notifications.html:25
+msgid "All"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:29
+#, fuzzy
+#| msgid "More options"
+msgid "Mentions"
+msgstr "Más opciones"
+
+#: bookwyrm/templates/notifications.html:70
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "le gustó tu <a href=\"%(related_path)s\">reseña de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:55
+#: bookwyrm/templates/notifications.html:72
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "le gustó tu <a href=\"%(related_path)s\">comentario en <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:57
+#: bookwyrm/templates/notifications.html:74
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "le gustó tu <a href=\"%(related_path)s\">cita de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:59
+#: bookwyrm/templates/notifications.html:76
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">status</a>"
 msgstr "le gustó tu <a href=\"%(related_path)s\">status</a>"
 
-#: bookwyrm/templates/notifications.html:64
+#: bookwyrm/templates/notifications.html:81
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "te mencionó en una <a href=\"%(related_path)s\">reseña de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:66
+#: bookwyrm/templates/notifications.html:83
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "te mencionó en un <a href=\"%(related_path)s\">comentario de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:68
+#: bookwyrm/templates/notifications.html:85
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "te mencionó en una <a href=\"%(related_path)s\">cita de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:70
+#: bookwyrm/templates/notifications.html:87
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">status</a>"
 msgstr "te mencionó en un <a href=\"%(related_path)s\">status</a>"
 
-#: bookwyrm/templates/notifications.html:75
+#: bookwyrm/templates/notifications.html:92
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">reseña de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:77
+#: bookwyrm/templates/notifications.html:94
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">comentario en <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:79
+#: bookwyrm/templates/notifications.html:96
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">cita de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:81
+#: bookwyrm/templates/notifications.html:98
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">status</a>"
 
-#: bookwyrm/templates/notifications.html:85
+#: bookwyrm/templates/notifications.html:102
 msgid "followed you"
 msgstr "te siguió"
 
-#: bookwyrm/templates/notifications.html:88
+#: bookwyrm/templates/notifications.html:105
 msgid "sent you a follow request"
 msgstr "te quiere seguir"
 
-#: bookwyrm/templates/notifications.html:94
+#: bookwyrm/templates/notifications.html:111
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "respaldó tu <a href=\"%(related_path)s\">reseña de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:96
+#: bookwyrm/templates/notifications.html:113
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
 msgstr "respaldó tu <a href=\"%(related_path)s\">comentario en<em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:98
+#: bookwyrm/templates/notifications.html:115
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "respaldó tu<a href=\"%(related_path)s\">cita de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:100
+#: bookwyrm/templates/notifications.html:117
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">status</a>"
 msgstr "respaldó tu <a href=\"%(related_path)s\">status</a>"
 
-#: bookwyrm/templates/notifications.html:104
+#: bookwyrm/templates/notifications.html:121
 #, python-format
 msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 msgstr " agregó <em><a href=\"%(book_path)s\">%(book_title)s</a></em> a tu lista \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 
-#: bookwyrm/templates/notifications.html:106
+#: bookwyrm/templates/notifications.html:123
 #, python-format
 msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 msgstr " sugirió agregar <em><a href=\"%(book_path)s\">%(book_title)s</a></em> a tu lista \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 
-#: bookwyrm/templates/notifications.html:110
-#, python-format
-msgid "Your <a href=\"/import/%(related_id)s\">import</a> completed."
+#: bookwyrm/templates/notifications.html:128
+#, fuzzy, python-format
+#| msgid "Your <a href=\"/import/%(related_id)s\">import</a> completed."
+msgid "Your <a href=\"%(url)s\">import</a> completed."
 msgstr "Tu <a href=\"/import/%(related_id)s\">importación</a> ha terminado."
 
-#: bookwyrm/templates/notifications.html:113
+#: bookwyrm/templates/notifications.html:131
 #, python-format
 msgid "A new <a href=\"%(path)s\">report</a> needs moderation."
 msgstr "Un <a href=\"%(path)s\">informe</a> nuevo se requiere moderación."
 
-#: bookwyrm/templates/notifications.html:139
+#: bookwyrm/templates/notifications.html:157
 msgid "You're all caught up!"
 msgstr "¡Estás al día!"
 
@@ -1652,7 +1664,7 @@ msgstr "Restablecer contraseña"
 
 #: bookwyrm/templates/preferences/blocks.html:4
 #: bookwyrm/templates/preferences/blocks.html:7
-#: bookwyrm/templates/preferences/preferences_layout.html:23
+#: bookwyrm/templates/preferences/preferences_layout.html:26
 msgid "Blocked Users"
 msgstr "Usuarios bloqueados"
 
@@ -1663,7 +1675,7 @@ msgstr "No hay ningún usuario bloqueado actualmente."
 #: bookwyrm/templates/preferences/change_password.html:4
 #: bookwyrm/templates/preferences/change_password.html:7
 #: bookwyrm/templates/preferences/change_password.html:21
-#: bookwyrm/templates/preferences/preferences_layout.html:17
+#: bookwyrm/templates/preferences/preferences_layout.html:19
 msgid "Change Password"
 msgstr "Cambiar contraseña"
 
@@ -1693,20 +1705,14 @@ msgstr "Huso horario preferido"
 msgid "Account"
 msgstr "Cuenta"
 
-#: bookwyrm/templates/preferences/preferences_layout.html:14
+#: bookwyrm/templates/preferences/preferences_layout.html:15
 msgid "Profile"
 msgstr "Perfil"
 
-#: bookwyrm/templates/preferences/preferences_layout.html:20
+#: bookwyrm/templates/preferences/preferences_layout.html:22
 msgid "Relationships"
 msgstr "Relaciones"
 
-#: bookwyrm/templates/search/book.html:30
-#, fuzzy
-#| msgid "Show more"
-msgid "Show"
-msgstr "Mostrar más"
-
 #: bookwyrm/templates/search/book.html:64
 #, fuzzy
 #| msgid "Show results from other catalogues"
@@ -2188,13 +2194,13 @@ msgid "Progress:"
 msgstr "Progreso:"
 
 #: bookwyrm/templates/snippets/create_status_form.html:85
-#: bookwyrm/templates/snippets/readthrough_form.html:22
+#: bookwyrm/templates/snippets/readthrough_form.html:26
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr "páginas"
 
 #: bookwyrm/templates/snippets/create_status_form.html:86
-#: bookwyrm/templates/snippets/readthrough_form.html:23
+#: bookwyrm/templates/snippets/readthrough_form.html:27
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr "por ciento"
@@ -2327,8 +2333,8 @@ msgid "Goal privacy:"
 msgstr "Privacidad de meta:"
 
 #: bookwyrm/templates/snippets/goal_form.html:26
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:29
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:45
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:33
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20
 msgid "Post to feed"
 msgstr "Compartir con tu feed"
@@ -2440,12 +2446,12 @@ msgstr "Eliminar estas fechas de lectura"
 msgid "Started reading"
 msgstr "Lectura se empezó"
 
-#: bookwyrm/templates/snippets/readthrough_form.html:14
+#: bookwyrm/templates/snippets/readthrough_form.html:18
 msgid "Progress"
 msgstr "Progreso"
 
-#: bookwyrm/templates/snippets/readthrough_form.html:30
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25
+#: bookwyrm/templates/snippets/readthrough_form.html:34
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:29
 msgid "Finished reading"
 msgstr "Lectura se terminó"
 
@@ -2808,6 +2814,11 @@ msgstr "No se pudo encontrar un usuario con esa dirección de correo electrónic
 msgid "A password reset link sent to %s"
 msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 
+#, fuzzy
+#~| msgid "Show more"
+#~ msgid "Show"
+#~ msgstr "Mostrar más"
+
 #, python-format
 #~ msgid "ambiguous option: %(option)s could match %(matches)s"
 #~ msgstr "opción ambiguo: %(option)s pudiera coincidir con %(matches)s"
diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index b88e6e3e553d7ff3d88570f27eff191e6a57ad71..a822eea4aef7397e08897d9ac41908c8d5b8d58d 100644
GIT binary patch
delta 11811
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

delta 12399
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

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 23d81e95..cb6c74d1 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-03 11:22-0700\n"
+"POT-Creation-Date: 2021-05-10 13:23-0700\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"
@@ -141,11 +141,11 @@ msgstr "Une erreur s’est produite ; désolé !"
 msgid "Edit Author"
 msgstr "Modifier l’auteur ou autrice"
 
-#: bookwyrm/templates/author.html:32
+#: bookwyrm/templates/author.html:31
 msgid "Wikipedia"
 msgstr "Wikipedia"
 
-#: bookwyrm/templates/author.html:37
+#: bookwyrm/templates/author.html:36
 #, python-format
 msgid "Books by %(name)s"
 msgstr "Livres par %(name)s"
@@ -197,32 +197,32 @@ msgid "Description:"
 msgstr "Description :"
 
 #: bookwyrm/templates/book/book.html:127
-#: bookwyrm/templates/book/edit_book.html:241
+#: bookwyrm/templates/book/edit_book.html:249
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:93
 #: bookwyrm/templates/settings/site.html:97
 #: bookwyrm/templates/snippets/readthrough.html:77
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:50
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:38
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:38
 msgid "Save"
 msgstr "Enregistrer"
 
 #: bookwyrm/templates/book/book.html:128 bookwyrm/templates/book/book.html:180
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:242
+#: bookwyrm/templates/book/edit_book.html:250
 #: bookwyrm/templates/edit_author.html:79
 #: bookwyrm/templates/moderation/report_modal.html:34
 #: bookwyrm/templates/settings/federated_server.html:94
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
 #: bookwyrm/templates/snippets/readthrough.html:78
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:51
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:39
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
 msgid "Cancel"
 msgstr "Annuler"
@@ -317,22 +317,22 @@ msgid "ISBN:"
 msgstr "ISBN :"
 
 #: bookwyrm/templates/book/book_identifiers.html:15
-#: bookwyrm/templates/book/edit_book.html:227
+#: bookwyrm/templates/book/edit_book.html:235
 msgid "OCLC Number:"
 msgstr "Numéro OCLC :"
 
 #: bookwyrm/templates/book/book_identifiers.html:22
-#: bookwyrm/templates/book/edit_book.html:231
+#: bookwyrm/templates/book/edit_book.html:239
 msgid "ASIN:"
 msgstr "ASIN :"
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:179
+#: bookwyrm/templates/book/edit_book.html:187
 msgid "Upload cover:"
 msgstr "Charger une couverture :"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:185
+#: bookwyrm/templates/book/edit_book.html:193
 msgid "Load cover from url:"
 msgstr "Charger la couverture depuis une URL :"
 
@@ -436,58 +436,58 @@ msgstr "Séparez plusieurs éditeurs par une virgule."
 msgid "First published date:"
 msgstr "Première date de publication :"
 
-#: bookwyrm/templates/book/edit_book.html:143
+#: bookwyrm/templates/book/edit_book.html:147
 msgid "Published date:"
 msgstr "Date de publication :"
 
-#: bookwyrm/templates/book/edit_book.html:152
+#: bookwyrm/templates/book/edit_book.html:160
 msgid "Authors"
 msgstr "Auteurs ou autrices"
 
-#: bookwyrm/templates/book/edit_book.html:158
+#: bookwyrm/templates/book/edit_book.html:166
 #, python-format
 msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
 msgstr "Supprimer <a href=\"%(path)s\">%(name)s</a>"
 
-#: bookwyrm/templates/book/edit_book.html:163
+#: bookwyrm/templates/book/edit_book.html:171
 msgid "Add Authors:"
 msgstr "Ajouter des auteurs ou autrices :"
 
-#: bookwyrm/templates/book/edit_book.html:164
+#: bookwyrm/templates/book/edit_book.html:172
 msgid "John Doe, Jane Smith"
 msgstr "Claude Dupont, Dominique Durand"
 
-#: bookwyrm/templates/book/edit_book.html:170
+#: bookwyrm/templates/book/edit_book.html:178
 #: bookwyrm/templates/user/shelf/shelf.html:76
 msgid "Cover"
 msgstr "Couverture"
 
-#: bookwyrm/templates/book/edit_book.html:198
+#: bookwyrm/templates/book/edit_book.html:206
 msgid "Physical Properties"
 msgstr "Propriétés physiques"
 
-#: bookwyrm/templates/book/edit_book.html:199
+#: bookwyrm/templates/book/edit_book.html:207
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "Format :"
 
-#: bookwyrm/templates/book/edit_book.html:207
+#: bookwyrm/templates/book/edit_book.html:215
 msgid "Pages:"
 msgstr "Pages :"
 
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:222
 msgid "Book Identifiers"
 msgstr "Identifiants du livre"
 
-#: bookwyrm/templates/book/edit_book.html:215
+#: bookwyrm/templates/book/edit_book.html:223
 msgid "ISBN 13:"
 msgstr "ISBN 13 :"
 
-#: bookwyrm/templates/book/edit_book.html:219
+#: bookwyrm/templates/book/edit_book.html:227
 msgid "ISBN 10:"
 msgstr "ISBN 10 :"
 
-#: bookwyrm/templates/book/edit_book.html:223
+#: bookwyrm/templates/book/edit_book.html:231
 #: bookwyrm/templates/edit_author.html:59
 msgid "Openlibrary key:"
 msgstr "Clé Openlibrary :"
@@ -551,7 +551,7 @@ msgstr "Publié par %(publisher)s."
 #: bookwyrm/templates/feed/feed_layout.html:70
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
-#: bookwyrm/templates/search/book.html:39
+#: bookwyrm/templates/search/book.html:32
 msgid "Close"
 msgstr "Fermer"
 
@@ -1230,7 +1230,7 @@ msgstr "Se déconnecter"
 
 #: bookwyrm/templates/layout.html:134 bookwyrm/templates/layout.html:135
 #: bookwyrm/templates/notifications.html:6
-#: bookwyrm/templates/notifications.html:10
+#: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr "Notifications"
 
@@ -1346,6 +1346,7 @@ msgstr "N’importe qui peut suggérer des livres, soumis à votre approbation"
 
 #: bookwyrm/templates/lists/form.html:31
 #: bookwyrm/templates/moderation/reports.html:25
+#: bookwyrm/templates/search/book.html:30
 msgid "Open"
 msgstr "Ouverte"
 
@@ -1537,119 +1538,130 @@ msgstr "Résolus"
 msgid "No reports found."
 msgstr "Aucun signalement trouvé."
 
-#: bookwyrm/templates/notifications.html:14
+#: bookwyrm/templates/notifications.html:16
 msgid "Delete notifications"
 msgstr "Supprimer les notifications"
 
-#: bookwyrm/templates/notifications.html:53
+#: bookwyrm/templates/notifications.html:25
+msgid "All"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:29
+#, fuzzy
+#| msgid "More options"
+msgid "Mentions"
+msgstr "Plus d’options"
+
+#: bookwyrm/templates/notifications.html:70
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a> à ses favoris"
 
-#: bookwyrm/templates/notifications.html:55
+#: bookwyrm/templates/notifications.html:72
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a> à ses favoris"
 
-#: bookwyrm/templates/notifications.html:57
+#: bookwyrm/templates/notifications.html:74
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a> à ses favoris"
 
-#: bookwyrm/templates/notifications.html:59
+#: bookwyrm/templates/notifications.html:76
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">status</a>"
 msgstr "a ajouté votre <a href=\"%(related_path)s\">statut</a> à ses favoris"
 
-#: bookwyrm/templates/notifications.html:64
+#: bookwyrm/templates/notifications.html:81
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "vous a mentionné dans sa <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:66
+#: bookwyrm/templates/notifications.html:83
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "vous a mentionné dans son <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:68
+#: bookwyrm/templates/notifications.html:85
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "vous a mentionné dans sa <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:70
+#: bookwyrm/templates/notifications.html:87
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">status</a>"
 msgstr "vous a mentionné dans son <a href=\"%(related_path)s\">statut</a>"
 
-#: bookwyrm/templates/notifications.html:75
+#: bookwyrm/templates/notifications.html:92
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">critique de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:77
+#: bookwyrm/templates/notifications.html:94
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">commentaire sur <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:79
+#: bookwyrm/templates/notifications.html:96
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">citation de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:81
+#: bookwyrm/templates/notifications.html:98
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">statut</a>"
 
-#: bookwyrm/templates/notifications.html:85
+#: bookwyrm/templates/notifications.html:102
 msgid "followed you"
 msgstr "s’est abonné(e)"
 
-#: bookwyrm/templates/notifications.html:88
+#: bookwyrm/templates/notifications.html:105
 msgid "sent you a follow request"
 msgstr "vous a envoyé une demande d’abonnement"
 
-#: bookwyrm/templates/notifications.html:94
+#: bookwyrm/templates/notifications.html:111
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "a partagé votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:96
+#: bookwyrm/templates/notifications.html:113
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
 msgstr "a partagé votre <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:98
+#: bookwyrm/templates/notifications.html:115
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "a partagé votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a>"
 
-#: bookwyrm/templates/notifications.html:100
+#: bookwyrm/templates/notifications.html:117
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">status</a>"
 msgstr "a partagé votre <a href=\"%(related_path)s\">statut</a>"
 
-#: bookwyrm/templates/notifications.html:104
+#: bookwyrm/templates/notifications.html:121
 #, python-format
 msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 msgstr " a ajouté <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre liste « <a href=\"%(list_path)s\">%(list_name)s</a> »"
 
-#: bookwyrm/templates/notifications.html:106
+#: bookwyrm/templates/notifications.html:123
 #, python-format
 msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 msgstr " a suggégré l’ajout de <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre liste « <a href=\"%(list_path)s/curate\">%(list_name)s</a> »"
 
-#: bookwyrm/templates/notifications.html:110
-#, python-format
-msgid "Your <a href=\"/import/%(related_id)s\">import</a> completed."
+#: bookwyrm/templates/notifications.html:128
+#, fuzzy, python-format
+#| msgid "Your <a href=\"/import/%(related_id)s\">import</a> completed."
+msgid "Your <a href=\"%(url)s\">import</a> completed."
 msgstr "Votre <a href=\"/import/%(related_id)s\">importation</a> est terminée."
 
-#: bookwyrm/templates/notifications.html:113
+#: bookwyrm/templates/notifications.html:131
 #, python-format
 msgid "A new <a href=\"%(path)s\">report</a> needs moderation."
 msgstr "Un nouveau <a href=\"%(path)s\">signalement</a> a besoin d’être traité."
 
-#: bookwyrm/templates/notifications.html:139
+#: bookwyrm/templates/notifications.html:157
 msgid "You're all caught up!"
 msgstr "Aucune nouvelle notification !"
 
@@ -1668,7 +1680,7 @@ msgstr "Changer de mot de passe"
 
 #: bookwyrm/templates/preferences/blocks.html:4
 #: bookwyrm/templates/preferences/blocks.html:7
-#: bookwyrm/templates/preferences/preferences_layout.html:23
+#: bookwyrm/templates/preferences/preferences_layout.html:26
 msgid "Blocked Users"
 msgstr "Comptes bloqués"
 
@@ -1679,7 +1691,7 @@ msgstr "Aucun compte bloqué actuellement"
 #: bookwyrm/templates/preferences/change_password.html:4
 #: bookwyrm/templates/preferences/change_password.html:7
 #: bookwyrm/templates/preferences/change_password.html:21
-#: bookwyrm/templates/preferences/preferences_layout.html:17
+#: bookwyrm/templates/preferences/preferences_layout.html:19
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
@@ -1709,20 +1721,14 @@ msgstr "Fuseau horaire préféré"
 msgid "Account"
 msgstr "Compte"
 
-#: bookwyrm/templates/preferences/preferences_layout.html:14
+#: bookwyrm/templates/preferences/preferences_layout.html:15
 msgid "Profile"
 msgstr "Profil"
 
-#: bookwyrm/templates/preferences/preferences_layout.html:20
+#: bookwyrm/templates/preferences/preferences_layout.html:22
 msgid "Relationships"
 msgstr "Relations"
 
-#: bookwyrm/templates/search/book.html:30
-#, fuzzy
-#| msgid "Show more"
-msgid "Show"
-msgstr "Déplier"
-
 #: bookwyrm/templates/search/book.html:64
 #, fuzzy
 #| msgid "Show results from other catalogues"
@@ -2218,13 +2224,13 @@ msgid "Progress:"
 msgstr "Progression :"
 
 #: bookwyrm/templates/snippets/create_status_form.html:85
-#: bookwyrm/templates/snippets/readthrough_form.html:22
+#: bookwyrm/templates/snippets/readthrough_form.html:26
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr "pages"
 
 #: bookwyrm/templates/snippets/create_status_form.html:86
-#: bookwyrm/templates/snippets/readthrough_form.html:23
+#: bookwyrm/templates/snippets/readthrough_form.html:27
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr "pourcent"
@@ -2357,8 +2363,8 @@ msgid "Goal privacy:"
 msgstr "Confidentialité du défi :"
 
 #: bookwyrm/templates/snippets/goal_form.html:26
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:29
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:45
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:33
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20
 msgid "Post to feed"
 msgstr "Publier sur le fil d’actualité"
@@ -2469,12 +2475,12 @@ msgstr "Supprimer ces dates de lecture"
 msgid "Started reading"
 msgstr "Lecture commencée le"
 
-#: bookwyrm/templates/snippets/readthrough_form.html:14
+#: bookwyrm/templates/snippets/readthrough_form.html:18
 msgid "Progress"
 msgstr "Progression"
 
-#: bookwyrm/templates/snippets/readthrough_form.html:30
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25
+#: bookwyrm/templates/snippets/readthrough_form.html:34
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:29
 msgid "Finished reading"
 msgstr "Lecture terminée le"
 
@@ -2843,6 +2849,11 @@ msgstr "Aucun compte avec cette adresse email n’a été trouvé."
 msgid "A password reset link sent to %s"
 msgstr "Un lien de réinitialisation a été envoyé à %s."
 
+#, fuzzy
+#~| msgid "Show more"
+#~ msgid "Show"
+#~ msgstr "Déplier"
+
 #, fuzzy
 #~| msgid "All messages"
 #~ msgid "Messages"
diff --git a/locale/zh_Hans/LC_MESSAGES/django.mo b/locale/zh_Hans/LC_MESSAGES/django.mo
index 765ee77f337dbac59fdba575943504652b01f890..fa845263a2bff33a706da53f66617e5933d7f0bd 100644
GIT binary patch
delta 11745
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

delta 12232
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
Mot`r$dryh~0Nqg&C;$Ke

diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
index c3247438..a6fdfa75 100644
--- a/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/locale/zh_Hans/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-03 11:22-0700\n"
+"POT-Creation-Date: 2021-05-10 13:23-0700\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"
@@ -141,11 +141,11 @@ msgstr "�些东西出错了�对�起啦。"
 msgid "Edit Author"
 msgstr "编辑作者"
 
-#: bookwyrm/templates/author.html:32
+#: bookwyrm/templates/author.html:31
 msgid "Wikipedia"
 msgstr "维基百科"
 
-#: bookwyrm/templates/author.html:37
+#: bookwyrm/templates/author.html:36
 #, python-format
 msgid "Books by %(name)s"
 msgstr "%(name)s 所著的书"
@@ -196,32 +196,32 @@ msgid "Description:"
 msgstr "�述:"
 
 #: bookwyrm/templates/book/book.html:127
-#: bookwyrm/templates/book/edit_book.html:241
+#: bookwyrm/templates/book/edit_book.html:249
 #: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:93
 #: bookwyrm/templates/settings/site.html:97
 #: bookwyrm/templates/snippets/readthrough.html:77
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:50
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:38
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:38
 msgid "Save"
 msgstr "�存"
 
 #: bookwyrm/templates/book/book.html:128 bookwyrm/templates/book/book.html:180
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:242
+#: bookwyrm/templates/book/edit_book.html:250
 #: bookwyrm/templates/edit_author.html:79
 #: bookwyrm/templates/moderation/report_modal.html:34
 #: bookwyrm/templates/settings/federated_server.html:94
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
 #: bookwyrm/templates/snippets/readthrough.html:78
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:51
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:39
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
 msgid "Cancel"
 msgstr "�消"
@@ -316,22 +316,22 @@ msgid "ISBN:"
 msgstr "ISBN:"
 
 #: bookwyrm/templates/book/book_identifiers.html:15
-#: bookwyrm/templates/book/edit_book.html:227
+#: bookwyrm/templates/book/edit_book.html:235
 msgid "OCLC Number:"
 msgstr "OCLC �:"
 
 #: bookwyrm/templates/book/book_identifiers.html:22
-#: bookwyrm/templates/book/edit_book.html:231
+#: bookwyrm/templates/book/edit_book.html:239
 msgid "ASIN:"
 msgstr "ASIN:"
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:179
+#: bookwyrm/templates/book/edit_book.html:187
 msgid "Upload cover:"
 msgstr "上传��:"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:185
+#: bookwyrm/templates/book/edit_book.html:193
 msgid "Load cover from url:"
 msgstr "从网�加载��:"
 
@@ -435,58 +435,58 @@ msgstr "请用英文逗�(,)分开多个出版社。"
 msgid "First published date:"
 msgstr "�版时间:"
 
-#: bookwyrm/templates/book/edit_book.html:143
+#: bookwyrm/templates/book/edit_book.html:147
 msgid "Published date:"
 msgstr "出版时间:"
 
-#: bookwyrm/templates/book/edit_book.html:152
+#: bookwyrm/templates/book/edit_book.html:160
 msgid "Authors"
 msgstr "作者"
 
-#: bookwyrm/templates/book/edit_book.html:158
+#: bookwyrm/templates/book/edit_book.html:166
 #, python-format
 msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
 msgstr "移除 <a href=\"%(path)s\">%(name)s</a>"
 
-#: bookwyrm/templates/book/edit_book.html:163
+#: bookwyrm/templates/book/edit_book.html:171
 msgid "Add Authors:"
 msgstr "添加作者:"
 
-#: bookwyrm/templates/book/edit_book.html:164
+#: bookwyrm/templates/book/edit_book.html:172
 msgid "John Doe, Jane Smith"
 msgstr "张三, �四"
 
-#: bookwyrm/templates/book/edit_book.html:170
+#: bookwyrm/templates/book/edit_book.html:178
 #: bookwyrm/templates/user/shelf/shelf.html:76
 msgid "Cover"
 msgstr "��"
 
-#: bookwyrm/templates/book/edit_book.html:198
+#: bookwyrm/templates/book/edit_book.html:206
 msgid "Physical Properties"
 msgstr "实体性质"
 
-#: bookwyrm/templates/book/edit_book.html:199
+#: bookwyrm/templates/book/edit_book.html:207
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "格�:"
 
-#: bookwyrm/templates/book/edit_book.html:207
+#: bookwyrm/templates/book/edit_book.html:215
 msgid "Pages:"
 msgstr "页数:"
 
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:222
 msgid "Book Identifiers"
 msgstr "书目标识�"
 
-#: bookwyrm/templates/book/edit_book.html:215
+#: bookwyrm/templates/book/edit_book.html:223
 msgid "ISBN 13:"
 msgstr "ISBN 13:"
 
-#: bookwyrm/templates/book/edit_book.html:219
+#: bookwyrm/templates/book/edit_book.html:227
 msgid "ISBN 10:"
 msgstr "ISBN 10:"
 
-#: bookwyrm/templates/book/edit_book.html:223
+#: bookwyrm/templates/book/edit_book.html:231
 #: bookwyrm/templates/edit_author.html:59
 msgid "Openlibrary key:"
 msgstr "Openlibrary key:"
@@ -550,7 +550,7 @@ msgstr "由 %(publisher)s 出版。"
 #: bookwyrm/templates/feed/feed_layout.html:70
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
-#: bookwyrm/templates/search/book.html:39
+#: bookwyrm/templates/search/book.html:32
 msgid "Close"
 msgstr "关闭"
 
@@ -1227,7 +1227,7 @@ msgstr "登出"
 
 #: bookwyrm/templates/layout.html:134 bookwyrm/templates/layout.html:135
 #: bookwyrm/templates/notifications.html:6
-#: bookwyrm/templates/notifications.html:10
+#: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr "通知"
 
@@ -1343,6 +1343,7 @@ msgstr "任何人都�以推�书目�主题让你批准"
 
 #: bookwyrm/templates/lists/form.html:31
 #: bookwyrm/templates/moderation/reports.html:25
+#: bookwyrm/templates/search/book.html:30
 msgid "Open"
 msgstr "开放"
 
@@ -1534,119 +1535,130 @@ msgstr "已解决"
 msgid "No reports found."
 msgstr "没有找到报告"
 
-#: bookwyrm/templates/notifications.html:14
+#: bookwyrm/templates/notifications.html:16
 msgid "Delete notifications"
 msgstr "删除通知"
 
-#: bookwyrm/templates/notifications.html:53
+#: bookwyrm/templates/notifications.html:25
+msgid "All"
+msgstr ""
+
+#: bookwyrm/templates/notifications.html:29
+#, fuzzy
+#| msgid "More options"
+msgid "Mentions"
+msgstr "更多选项"
+
+#: bookwyrm/templates/notifications.html:70
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "喜欢了你 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的书评</a>"
 
-#: bookwyrm/templates/notifications.html:55
+#: bookwyrm/templates/notifications.html:72
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "喜欢了你 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的评论</a>"
 
-#: bookwyrm/templates/notifications.html:57
+#: bookwyrm/templates/notifications.html:74
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "喜欢了你 <a href=\"%(related_path)s\">�自 <em>%(book_title)s</em> 的引用</a>"
 
-#: bookwyrm/templates/notifications.html:59
+#: bookwyrm/templates/notifications.html:76
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">status</a>"
 msgstr "喜欢了你的 <a href=\"%(related_path)s\">状�</a>"
 
-#: bookwyrm/templates/notifications.html:64
+#: bookwyrm/templates/notifications.html:81
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "在 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的书评</a> 里�到了你"
 
-#: bookwyrm/templates/notifications.html:66
+#: bookwyrm/templates/notifications.html:83
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "在 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的评论</a> 里�到了你"
 
-#: bookwyrm/templates/notifications.html:68
+#: bookwyrm/templates/notifications.html:85
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "在 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的引用</a> 中�到了你"
 
-#: bookwyrm/templates/notifications.html:70
+#: bookwyrm/templates/notifications.html:87
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">status</a>"
 msgstr "在 <a href=\"%(related_path)s\">状�</a> 中�到了你"
 
-#: bookwyrm/templates/notifications.html:75
+#: bookwyrm/templates/notifications.html:92
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">对 <em>%(book_title)s</em> 的书评</a>"
 
-#: bookwyrm/templates/notifications.html:77
+#: bookwyrm/templates/notifications.html:94
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">对 <em>%(book_title)s</em> 的评论</a>"
 
-#: bookwyrm/templates/notifications.html:79
+#: bookwyrm/templates/notifications.html:96
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "<a href=\"%(related_path)s\">回�</a> 了你 <a href=\"%(parent_path)s\">对 <em>%(book_title)s</em> 中的引用</a>"
 
-#: bookwyrm/templates/notifications.html:81
+#: bookwyrm/templates/notifications.html:98
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgstr "<a href=\"%(related_path)s\">回�</a> 了你的 <a href=\"%(parent_path)s\">状�</a>"
 
-#: bookwyrm/templates/notifications.html:85
+#: bookwyrm/templates/notifications.html:102
 msgid "followed you"
 msgstr "关注了你"
 
-#: bookwyrm/templates/notifications.html:88
+#: bookwyrm/templates/notifications.html:105
 msgid "sent you a follow request"
 msgstr "�你��了关注请求"
 
-#: bookwyrm/templates/notifications.html:94
+#: bookwyrm/templates/notifications.html:111
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr "转�了你的 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的书评</a>"
 
-#: bookwyrm/templates/notifications.html:96
+#: bookwyrm/templates/notifications.html:113
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
 msgstr "转�了你的 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的评论</a>"
 
-#: bookwyrm/templates/notifications.html:98
+#: bookwyrm/templates/notifications.html:115
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr "转�了你的 <a href=\"%(related_path)s\">对 <em>%(book_title)s</em> 的引用</a>"
 
-#: bookwyrm/templates/notifications.html:100
+#: bookwyrm/templates/notifications.html:117
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">status</a>"
 msgstr "转�了你的 <a href=\"%(related_path)s\">状�</a>"
 
-#: bookwyrm/templates/notifications.html:104
+#: bookwyrm/templates/notifications.html:121
 #, python-format
 msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 msgstr " 添加了 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 
-#: bookwyrm/templates/notifications.html:106
+#: bookwyrm/templates/notifications.html:123
 #, python-format
 msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 msgstr " 推�添加 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 
-#: bookwyrm/templates/notifications.html:110
-#, python-format
-msgid "Your <a href=\"/import/%(related_id)s\">import</a> completed."
+#: bookwyrm/templates/notifications.html:128
+#, fuzzy, python-format
+#| msgid "Your <a href=\"/import/%(related_id)s\">import</a> completed."
+msgid "Your <a href=\"%(url)s\">import</a> completed."
 msgstr "你的 <a href=\"/import/%(related_id)s\">导入</a> 已完�。"
 
-#: bookwyrm/templates/notifications.html:113
+#: bookwyrm/templates/notifications.html:131
 #, python-format
 msgid "A new <a href=\"%(path)s\">report</a> needs moderation."
 msgstr "有新的 <a href=\"%(path)s\">报告</a> 需�仲�。"
 
-#: bookwyrm/templates/notifications.html:139
+#: bookwyrm/templates/notifications.html:157
 msgid "You're all caught up!"
 msgstr "你什么也没错过�"
 
@@ -1665,7 +1677,7 @@ msgstr "�设密�"
 
 #: bookwyrm/templates/preferences/blocks.html:4
 #: bookwyrm/templates/preferences/blocks.html:7
-#: bookwyrm/templates/preferences/preferences_layout.html:23
+#: bookwyrm/templates/preferences/preferences_layout.html:26
 msgid "Blocked Users"
 msgstr "�蔽的用户"
 
@@ -1676,7 +1688,7 @@ msgstr "当�没有被�蔽的用户。"
 #: bookwyrm/templates/preferences/change_password.html:4
 #: bookwyrm/templates/preferences/change_password.html:7
 #: bookwyrm/templates/preferences/change_password.html:21
-#: bookwyrm/templates/preferences/preferences_layout.html:17
+#: bookwyrm/templates/preferences/preferences_layout.html:19
 msgid "Change Password"
 msgstr "更改密�"
 
@@ -1706,20 +1718,14 @@ msgstr "�好的时区:"
 msgid "Account"
 msgstr "��"
 
-#: bookwyrm/templates/preferences/preferences_layout.html:14
+#: bookwyrm/templates/preferences/preferences_layout.html:15
 msgid "Profile"
 msgstr "个人资料"
 
-#: bookwyrm/templates/preferences/preferences_layout.html:20
+#: bookwyrm/templates/preferences/preferences_layout.html:22
 msgid "Relationships"
 msgstr "关系"
 
-#: bookwyrm/templates/search/book.html:30
-#, fuzzy
-#| msgid "Show more"
-msgid "Show"
-msgstr "显示更多"
-
 #: bookwyrm/templates/search/book.html:64
 #, fuzzy
 #| msgid "Show results from other catalogues"
@@ -2219,13 +2225,13 @@ msgid "Progress:"
 msgstr "进度:"
 
 #: bookwyrm/templates/snippets/create_status_form.html:85
-#: bookwyrm/templates/snippets/readthrough_form.html:22
+#: bookwyrm/templates/snippets/readthrough_form.html:26
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr "页数"
 
 #: bookwyrm/templates/snippets/create_status_form.html:86
-#: bookwyrm/templates/snippets/readthrough_form.html:23
+#: bookwyrm/templates/snippets/readthrough_form.html:27
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr "百分比"
@@ -2355,8 +2361,8 @@ msgid "Goal privacy:"
 msgstr "目标��:"
 
 #: bookwyrm/templates/snippets/goal_form.html:26
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:29
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:45
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:33
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20
 msgid "Post to feed"
 msgstr "�布到消��中"
@@ -2467,12 +2473,12 @@ msgstr "删除这些阅读日期"
 msgid "Started reading"
 msgstr "已开始阅读"
 
-#: bookwyrm/templates/snippets/readthrough_form.html:14
+#: bookwyrm/templates/snippets/readthrough_form.html:18
 msgid "Progress"
 msgstr "进度"
 
-#: bookwyrm/templates/snippets/readthrough_form.html:30
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25
+#: bookwyrm/templates/snippets/readthrough_form.html:34
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:29
 msgid "Finished reading"
 msgstr "已完�阅读"
 
@@ -2841,6 +2847,11 @@ msgstr "没有找到使用该邮箱的用户。"
 msgid "A password reset link sent to %s"
 msgstr "密��置连接已��给 %s"
 
+#, fuzzy
+#~| msgid "Show more"
+#~ msgid "Show"
+#~ msgstr "显示更多"
+
 #, fuzzy
 #~| msgid "All messages"
 #~ msgid "Messages"

From 85a8210f5e2d1b5cda5b2f42b97909faa75562c6 Mon Sep 17 00:00:00 2001
From: Allie Signet <allie@cat-girl.gay>
Date: Mon, 10 May 2021 18:11:28 -0300
Subject: [PATCH 1106/1285] fix rating property on ImportItem

---
 bookwyrm/models/import_job.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/models/import_job.py b/bookwyrm/models/import_job.py
index 1b1152ab..c8130af2 100644
--- a/bookwyrm/models/import_job.py
+++ b/bookwyrm/models/import_job.py
@@ -128,7 +128,9 @@ class ImportItem(models.Model):
     @property
     def rating(self):
         """x/5 star rating for a book"""
-        return int(self.data["My Rating"])
+        if self.data.get("My Rating", None):
+            return int(self.data["My Rating"])
+        return None
 
     @property
     def date_added(self):

From b4ae639dabffcee63b4810648383be38fe27ebbf Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 10 May 2021 14:19:50 -0700
Subject: [PATCH 1107/1285] Imports bookwyrm settings into celery settings

It was redundant and super bug-prone!
---
 bookwyrm/settings.py   |  10 +--
 celerywyrm/settings.py | 148 +----------------------------------------
 2 files changed, 8 insertions(+), 150 deletions(-)

diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 1bc3c587..45d8cb9d 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -38,7 +38,7 @@ LOCALE_PATHS = [
 DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
 
 # Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/2.0/howto/deployment/checklist/
+# See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = env("SECRET_KEY")
@@ -107,7 +107,7 @@ MAX_STREAM_LENGTH = int(env("MAX_STREAM_LENGTH", 200))
 STREAMS = ["home", "local", "federated"]
 
 # Database
-# https://docs.djangoproject.com/en/2.0/ref/settings/#databases
+# https://docs.djangoproject.com/en/3.2/ref/settings/#databases
 
 BOOKWYRM_DATABASE_BACKEND = env("BOOKWYRM_DATABASE_BACKEND", "postgres")
 
@@ -129,7 +129,7 @@ LOGIN_URL = "/login/"
 AUTH_USER_MODEL = "bookwyrm.User"
 
 # Password validation
-# https://docs.djangoproject.com/en/2.0/ref/settings/#auth-password-validators
+# https://docs.djangoproject.com/en/3.2/ref/settings/#auth-password-validators
 
 AUTH_PASSWORD_VALIDATORS = [
     {
@@ -148,7 +148,7 @@ AUTH_PASSWORD_VALIDATORS = [
 
 
 # Internationalization
-# https://docs.djangoproject.com/en/2.0/topics/i18n/
+# https://docs.djangoproject.com/en/3.2/topics/i18n/
 
 LANGUAGE_CODE = "en-us"
 LANGUAGES = [
@@ -170,7 +170,7 @@ USE_TZ = True
 
 
 # Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/3.1/howto/static-files/
+# https://docs.djangoproject.com/en/3.2/howto/static-files/
 
 PROJECT_DIR = os.path.dirname(os.path.abspath(__file__))
 STATIC_URL = "/static/"
diff --git a/celerywyrm/settings.py b/celerywyrm/settings.py
index cd5b00ba..e4fa73ca 100644
--- a/celerywyrm/settings.py
+++ b/celerywyrm/settings.py
@@ -1,157 +1,15 @@
-"""
-Django settings for celerywyrm project.
+""" bookwyrm settings and configuration """
+from bookwyrm.settings import *
 
-Generated by 'django-admin startproject' using Django 3.0.3.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/3.0/topics/settings/
-
-For the full list of settings and their values, see
-https://docs.djangoproject.com/en/3.0/ref/settings/
-"""
-
-import os
-from environs import Env
-
-env = Env()
-
-# emailing
-EMAIL_HOST = env("EMAIL_HOST")
-EMAIL_PORT = env("EMAIL_PORT")
-EMAIL_HOST_USER = env("EMAIL_HOST_USER")
-EMAIL_HOST_PASSWORD = env("EMAIL_HOST_PASSWORD")
-EMAIL_USE_TLS = env.bool("EMAIL_USE_TLS")
-EMAIL_USE_SSL = env.bool("EMAIL_USE_SSL", False)
-
-
-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-
-# celery/rebbitmq
 CELERY_BROKER_URL = env("CELERY_BROKER")
 CELERY_ACCEPT_CONTENT = ["json"]
 CELERY_TASK_SERIALIZER = "json"
 CELERY_RESULT_BACKEND = "redis"
 
-
-# Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/
-
-# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = "0a^0gpwjc1ap+lb$dinin=efc@e&_0%102$o3(&gt9e7lndiaw"
-
-# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = env.bool("DEBUG", True)
-
-
-ALLOWED_HOSTS = []
-
-
-# Application definition
-
-INSTALLED_APPS = [
-    "django.contrib.admin",
-    "django.contrib.auth",
-    "django.contrib.contenttypes",
-    "django.contrib.sessions",
-    "django.contrib.messages",
-    "django.contrib.staticfiles",
+INSTALLED_APPS = INSTALLED_APPS + [
     "celerywyrm",
-    "bookwyrm",
-    "celery",
-]
-
-MIDDLEWARE = [
-    "django.middleware.security.SecurityMiddleware",
-    "django.contrib.sessions.middleware.SessionMiddleware",
-    "django.middleware.common.CommonMiddleware",
-    "django.middleware.csrf.CsrfViewMiddleware",
-    "django.contrib.auth.middleware.AuthenticationMiddleware",
-    "django.contrib.messages.middleware.MessageMiddleware",
-    "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]
 
 ROOT_URLCONF = "celerywyrm.urls"
 
-TEMPLATES = [
-    {
-        "BACKEND": "django.template.backends.django.DjangoTemplates",
-        "DIRS": [],
-        "APP_DIRS": True,
-        "OPTIONS": {
-            "context_processors": [
-                "django.template.context_processors.debug",
-                "django.template.context_processors.request",
-                "django.contrib.auth.context_processors.auth",
-                "django.contrib.messages.context_processors.messages",
-            ],
-        },
-    },
-]
-
 WSGI_APPLICATION = "celerywyrm.wsgi.application"
-
-
-# Database
-# https://docs.djangoproject.com/en/3.0/ref/settings/#databases
-
-BOOKWYRM_DATABASE_BACKEND = env("BOOKWYRM_DATABASE_BACKEND", "postgres")
-
-BOOKWYRM_DBS = {
-    "postgres": {
-        "ENGINE": "django.db.backends.postgresql_psycopg2",
-        "NAME": env("POSTGRES_DB", "fedireads"),
-        "USER": env("POSTGRES_USER", "fedireads"),
-        "PASSWORD": env("POSTGRES_PASSWORD", "fedireads"),
-        "HOST": env("POSTGRES_HOST", ""),
-        "PORT": 5432,
-    },
-    "sqlite": {
-        "ENGINE": "django.db.backends.sqlite3",
-        "NAME": os.path.join(BASE_DIR, "fedireads.db"),
-    },
-}
-
-DATABASES = {"default": BOOKWYRM_DBS[BOOKWYRM_DATABASE_BACKEND]}
-
-
-# Password validation
-# https://docs.djangoproject.com/en/3.0/ref/settings/#auth-password-validators
-
-AUTH_PASSWORD_VALIDATORS = [
-    {
-        "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
-    },
-    {
-        "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
-    },
-    {
-        "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",
-    },
-    {
-        "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",
-    },
-]
-
-
-# Internationalization
-# https://docs.djangoproject.com/en/3.0/topics/i18n/
-
-LANGUAGE_CODE = "en-us"
-
-TIME_ZONE = "UTC"
-
-USE_I18N = False
-
-USE_L10N = False
-
-USE_TZ = True
-
-
-# Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/3.1/howto/static-files/
-
-STATIC_URL = "/static/"
-STATIC_ROOT = os.path.join(BASE_DIR, env("STATIC_ROOT", "static"))
-MEDIA_URL = "/images/"
-MEDIA_ROOT = os.path.join(BASE_DIR, env("MEDIA_ROOT", "images"))

From e34ae18e98ce3aea26b0e3c9a3ffd05d72a7dec6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 10 May 2021 14:38:57 -0700
Subject: [PATCH 1108/1285] Don't show following years' books in a year's goal

---
 bookwyrm/models/user.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 7c943bec..5f0e64e3 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -372,7 +372,10 @@ class AnnualGoal(BookWyrmModel):
     def books(self):
         """the books you've read this year"""
         return (
-            self.user.readthrough_set.filter(finish_date__year__gte=self.year)
+            self.user.readthrough_set.filter(
+                finish_date__year__gte=self.year,
+                finish_date__year__lt=self.year + 1,
+            )
             .order_by("-finish_date")
             .all()
         )
@@ -396,7 +399,8 @@ class AnnualGoal(BookWyrmModel):
     def book_count(self):
         """how many books you've read this year"""
         return self.user.readthrough_set.filter(
-            finish_date__year__gte=self.year
+            finish_date__year__gte=self.year,
+            finish_date__year__lt=self.year + 1,
         ).count()
 
 

From 485f4b7eba1e819b64fe01139de02fe5d7ca70c6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 10 May 2021 14:56:33 -0700
Subject: [PATCH 1109/1285] Revert "Replaces date elements with datepicker"

This reverts commit 869cfa6d341f25ee25d8576adcdc2e3b8d239b9c.
---
 bookwyrm/templates/book/edit_book.html               | 12 ++----------
 bookwyrm/templates/snippets/datepicker_js.html       |  3 ---
 bookwyrm/templates/snippets/readthrough_form.html    | 12 ++----------
 .../snippets/shelve_button/finish_reading_modal.html | 12 ++----------
 .../snippets/shelve_button/start_reading_modal.html  |  6 +-----
 5 files changed, 7 insertions(+), 38 deletions(-)
 delete mode 100644 bookwyrm/templates/snippets/datepicker_js.html

diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html
index e75bd96e..5fe63595 100644
--- a/bookwyrm/templates/book/edit_book.html
+++ b/bookwyrm/templates/book/edit_book.html
@@ -133,11 +133,7 @@
 
                 <p class="mb-2">
                     <label class="label" for="id_first_published_date">{% trans "First published date:" %}</label>
-                    <duet-date-picker
-                        identifier="id_first_published_date"
-                        name="first_published_date"
-                        {% if form.first_published_date.value %}value="{{ form.first_published_date.value|date:'Y-m-d' }}"{% endif %}
-                    ></duet-date-picker>
+                    <duet-date-picker identifier="id_first_published_date" name="first_published_date"{% if form.first_published_date.value %} value="{{ form.first_published_date.value|date:'Y-m-d' }}"{% endif %}></duet-date-picker>
                 </p>
                 {% for error in form.first_published_date.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
@@ -145,11 +141,7 @@
 
                 <p class="mb-2">
                     <label class="label" for="id_published_date">{% trans "Published date:" %}</label>
-                    <duet-date-picker
-                        identifier="id_published_date"
-                        name="published_date"
-                        {% if form.published_date.value %}value="{{ form.published_date.value|date:'Y-m-d' }}"{% endif %}
-                    ></duet-date-picker>
+                    <duet-date-picker identifier="id_published_date" name="published_date"{% if form.published_date.value %} value="{{ form.published_date.value|date:'Y-m-d' }}"{% endif %}></duet-date-picker>
                 </p>
                 {% for error in form.published_date.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
diff --git a/bookwyrm/templates/snippets/datepicker_js.html b/bookwyrm/templates/snippets/datepicker_js.html
deleted file mode 100644
index abfadaaf..00000000
--- a/bookwyrm/templates/snippets/datepicker_js.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<script type="module" src="https://cdn.jsdelivr.net/npm/@duetds/date-picker@1.3.0/dist/duet/duet.esm.js"></script>
-<script nomodule src="https://cdn.jsdelivr.net/npm/@duetds/date-picker@1.3.0/dist/duet/duet.js"></script>
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@duetds/date-picker@1.3.0/dist/duet/themes/default.css" />
diff --git a/bookwyrm/templates/snippets/readthrough_form.html b/bookwyrm/templates/snippets/readthrough_form.html
index 256fcea5..c5be295e 100644
--- a/bookwyrm/templates/snippets/readthrough_form.html
+++ b/bookwyrm/templates/snippets/readthrough_form.html
@@ -5,11 +5,7 @@
 <div class="field">
     <label class="label">
         {% trans "Started reading" %}
-        <duet-date-picker
-            identifier="id_start_date-{{ readthrough.id }}"
-            name="start_date"
-            value="{{ readthrough.start_date | date:'Y-m-d' }}">
-        </duet-date-picker>
+        <input type="date" name="start_date" class="input" id="id_start_date-{{ readthrough.id }}" value="{{ readthrough.start_date | date:"Y-m-d" }}">
     </label>
 </div>
 {# Only show progress for editing existing readthroughs #}
@@ -32,10 +28,6 @@
 <div class="field">
     <label class="label">
         {% trans "Finished reading" %}
-        <duet-date-picker
-            identifier="id_finish_date-{{ readthrough.id }}"
-            name="finish_date"
-            value="{{ readthrough.finish_date | date:'Y-m-d' }}">
-        </duet-date-picker>
+        <input type="date" name="finish_date" class="input" id="id_finish_date-{{ readthrough.id }}" value="{{ readthrough.finish_date | date:"Y-m-d" }}">
     </label>
 </div>
diff --git a/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html b/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
index 6d4ea5ea..ca65bf06 100644
--- a/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
+++ b/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
@@ -17,21 +17,13 @@
     <div class="field">
         <label class="label">
             {% trans "Started reading" %}
-            <duet-date-picker
-                identifier="id_start_date-{{ uuid }}"
-                name="start_date"
-                value="{{ readthrough.start_date | date:'Y-m-d' }}"
-            ></duet-date-picker>
+            <input type="date" name="start_date" class="input" id="finish_id_start_date-{{ uuid }}" value="{{ readthrough.start_date | date:"Y-m-d" }}">
         </label>
     </div>
     <div class="field">
         <label class="label">
             {% trans "Finished reading" %}
-            <duet-date-picker
-                identifier="id_finish_date-{{ uuid }}"
-                name="finish_date"
-                value="{{ readthrough.finish_date | date:'Y-m-d' }}"
-            ></duet-date-picker>
+            <input type="date" name="finish_date" class="input" id="id_finish_date-{{ uuid }}" value="{% now "Y-m-d" %}">
         </label>
     </div>
 </section>
diff --git a/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html b/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html
index 47d620e0..21341683 100644
--- a/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html
+++ b/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html
@@ -15,11 +15,7 @@
     <div class="field">
         <label class="label">
             {% trans "Started reading" %}
-            <duet-date-picker
-                identifier="start_id_start_date-{{ uuid }}"
-                name="start_date"
-                value="{% now "Y-m-d" %}"
-            ></duet-date-picker>
+            <input type="date" name="start_date" class="input" id="start_id_start_date-{{ uuid }}" value="{% now "Y-m-d" %}">
         </label>
     </div>
 </section>

From 3f4807a3451ff6b3271c9d9f4161f0928181e885 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 10 May 2021 14:56:43 -0700
Subject: [PATCH 1110/1285] Revert "Adds datepicker script dependencies to
 templates"

This reverts commit 33ca7b4b763c118cf84ee85205e64ccd1355b220.
---
 bookwyrm/templates/author.html            | 3 ---
 bookwyrm/templates/book/book.html         | 1 -
 bookwyrm/templates/book/edit_book.html    | 8 ++------
 bookwyrm/templates/book/editions.html     | 4 ----
 bookwyrm/templates/edit_author.html       | 4 ----
 bookwyrm/templates/feed/feed_layout.html  | 1 -
 bookwyrm/templates/get_started/books.html | 4 ----
 bookwyrm/templates/user/layout.html       | 5 -----
 8 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/bookwyrm/templates/author.html b/bookwyrm/templates/author.html
index ec952d4c..a7ea9db5 100644
--- a/bookwyrm/templates/author.html
+++ b/bookwyrm/templates/author.html
@@ -38,6 +38,3 @@
 </div>
 {% endblock %}
 
-{% block scripts %}
-{% include 'snippets/datepicker_js.html' %}
-{% endblock %}
diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index 53be123d..40da6486 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -333,5 +333,4 @@
 
 {% block scripts %}
 <script src="/static/js/vendor/tabs.js"></script>
-{% include 'snippets/datepicker_js.html' %}
 {% endblock %}
diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html
index 5fe63595..bcf11126 100644
--- a/bookwyrm/templates/book/edit_book.html
+++ b/bookwyrm/templates/book/edit_book.html
@@ -133,7 +133,7 @@
 
                 <p class="mb-2">
                     <label class="label" for="id_first_published_date">{% trans "First published date:" %}</label>
-                    <duet-date-picker identifier="id_first_published_date" name="first_published_date"{% if form.first_published_date.value %} value="{{ form.first_published_date.value|date:'Y-m-d' }}"{% endif %}></duet-date-picker>
+                    <input type="date" name="first_published_date" class="input" id="id_first_published_date"{% if form.first_published_date.value %} value="{{ form.first_published_date.value|date:'Y-m-d' }}"{% endif %}>
                 </p>
                 {% for error in form.first_published_date.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
@@ -141,7 +141,7 @@
 
                 <p class="mb-2">
                     <label class="label" for="id_published_date">{% trans "Published date:" %}</label>
-                    <duet-date-picker identifier="id_published_date" name="published_date"{% if form.published_date.value %} value="{{ form.published_date.value|date:'Y-m-d' }}"{% endif %}></duet-date-picker>
+                    <input type="date" name="published_date" class="input" id="id_published_date"{% if form.published_date.value %} value="{{ form.published_date.value|date:'Y-m-d'}}"{% endif %}>
                 </p>
                 {% for error in form.published_date.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
@@ -245,7 +245,3 @@
 </form>
 
 {% endblock %}
-
-{% block scripts %}
-{% include 'snippets/datepicker_js.html' %}
-{% endblock %}
diff --git a/bookwyrm/templates/book/editions.html b/bookwyrm/templates/book/editions.html
index 64dd2775..775b05c8 100644
--- a/bookwyrm/templates/book/editions.html
+++ b/bookwyrm/templates/book/editions.html
@@ -51,7 +51,3 @@
     {% include 'snippets/pagination.html' with page=editions path=request.path %}
 </div>
 {% endblock %}
-
-{% block scripts %}
-{% include 'snippets/datepicker_js.html' %}
-{% endblock %}
diff --git a/bookwyrm/templates/edit_author.html b/bookwyrm/templates/edit_author.html
index ecf32358..b575bbb2 100644
--- a/bookwyrm/templates/edit_author.html
+++ b/bookwyrm/templates/edit_author.html
@@ -81,7 +81,3 @@
 </form>
 
 {% endblock %}
-
-{% block scripts %}
-{% include 'snippets/datepicker_js.html' %}
-{% endblock %}
diff --git a/bookwyrm/templates/feed/feed_layout.html b/bookwyrm/templates/feed/feed_layout.html
index 431cf6dd..75fc1951 100644
--- a/bookwyrm/templates/feed/feed_layout.html
+++ b/bookwyrm/templates/feed/feed_layout.html
@@ -105,5 +105,4 @@
 
 {% block scripts %}
 <script src="/static/js/vendor/tabs.js"></script>
-{% include 'snippets/datepicker_js.html' %}
 {% endblock %}
diff --git a/bookwyrm/templates/get_started/books.html b/bookwyrm/templates/get_started/books.html
index e3fd87bb..9613508b 100644
--- a/bookwyrm/templates/get_started/books.html
+++ b/bookwyrm/templates/get_started/books.html
@@ -64,7 +64,3 @@
 </form>
 {% endblock %}
 
-
-{% block scripts %}
-{% include 'snippets/datepicker_js.html' %}
-{% endblock %}
diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html
index 1aa76202..661d8078 100644
--- a/bookwyrm/templates/user/layout.html
+++ b/bookwyrm/templates/user/layout.html
@@ -81,8 +81,3 @@
 {% block panel %}{% endblock %}
 
 {% endblock %}
-
-
-{% block scripts %}
-{% include 'snippets/datepicker_js.html' %}
-{% endblock %}

From 07c84a6e1a1e82f455f096ae55c80559da9f7473 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 10 May 2021 15:35:46 -0700
Subject: [PATCH 1111/1285] Adds confidence ratings to inventaire results

Fixes bad matches in csv imports
---
 bookwyrm/connectors/inventaire.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py
index 0c573265..102c9d72 100644
--- a/bookwyrm/connectors/inventaire.py
+++ b/bookwyrm/connectors/inventaire.py
@@ -74,6 +74,14 @@ class Connector(AbstractConnector):
             **{k: data.get(k) for k in ["uri", "image", "labels", "sitelinks"]},
         }
 
+    def search(self, query, min_confidence=None):
+        """overrides default search function with confidence ranking"""
+        results = super().search(query)
+        if min_confidence:
+            # filter the search results after the fact
+            return [r for r in results if r.confidence >= min_confidence]
+        return results
+
     def parse_search_data(self, data):
         return data.get("results")
 
@@ -84,6 +92,9 @@ class Connector(AbstractConnector):
             if images
             else None
         )
+        # a deeply messy translation of inventaire's scores
+        confidence = float(search_result.get("_score", 0.1))
+        confidence = 0.1 if confidence < 150 else 0.999
         return SearchResult(
             title=search_result.get("label"),
             key=self.get_remote_id(search_result.get("uri")),
@@ -92,6 +103,7 @@ class Connector(AbstractConnector):
                 self.base_url, search_result.get("uri")
             ),
             cover=cover,
+            confidence=confidence,
             connector=self,
         )
 

From 6abe9274c0af2615ccbd75fcda3b101b6f02face Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 10 May 2021 15:55:42 -0700
Subject: [PATCH 1112/1285] Switches out links in the top bar and dropdown

---
 bookwyrm/templates/layout.html | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index bc654401..1cf6d4db 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -55,15 +55,15 @@
         <div class="navbar-menu" id="main-nav">
             <div class="navbar-start">
                 {% if request.user.is_authenticated %}
-                <a href="{% url 'user-shelves' request.user.localname %}" class="navbar-item">
-                    {% trans "Your books" %}
-                </a>
                 <a href="/#feed" class="navbar-item">
                     {% trans "Feed" %}
                 </a>
                 <a href="{% url 'lists' %}" class="navbar-item">
                     {% trans "Lists" %}
                 </a>
+                <a href="{% url 'directory' %}" class="navbar-item">
+                    {% trans "Directory" %}
+                </a>
                 {% endif %}
             </div>
 
@@ -83,21 +83,16 @@
                         <span class="ml-2">{{ request.user.display_name }}</span>
                     </a>
                     <ul class="navbar-dropdown" id="navbar-dropdown">
+                        <li>
+                            <a href="{% url 'user-shelves' request.user.localname %}" class="navbar-item">
+                                {% trans 'Your Books' %}
+                            </a>
+                        </li>
                         <li>
                             <a href="{% url 'direct-messages' %}" class="navbar-item">
                                 {% trans "Direct Messages" %}
                             </a>
                         </li>
-                        <li>
-                            <a href="{% url 'directory' %}" class="navbar-item">
-                                {% trans 'Directory' %}
-                            </a>
-                        </li>
-                        <li>
-                            <a href="{% url 'import' %}" class="navbar-item">
-                                {% trans 'Import Books' %}
-                            </a>
-                        </li>
                         <li>
                             <a href="{% url 'prefs-profile' %}" class="navbar-item">
                                 {% trans 'Settings' %}

From 8c2552f73909fd6a746a27f0cf550f5f6f21de12 Mon Sep 17 00:00:00 2001
From: Allie Signet <allie@cat-girl.gay>
Date: Mon, 10 May 2021 20:09:16 -0300
Subject: [PATCH 1113/1285] storygraph renamed the author field

---
 bookwyrm/importers/storygraph_import.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/importers/storygraph_import.py b/bookwyrm/importers/storygraph_import.py
index 8e43cabc..c312e4ba 100644
--- a/bookwyrm/importers/storygraph_import.py
+++ b/bookwyrm/importers/storygraph_import.py
@@ -17,7 +17,7 @@ class StorygraphImporter(Importer):
         data = {}
         data["import_source"] = self.service
         data["Title"] = entry["Title"]
-        data["Author"] = entry["Author"]
+        data["Author"] = entry["Authors"]
         data["ISBN13"] = entry["ISBN"]
         data["My Review"] = entry["Review"]
         if entry["Star Rating"]:

From d40ff5c75118e6ae593087ca0026fbdb52e7e7e1 Mon Sep 17 00:00:00 2001
From: Allie Signet <allie@cat-girl.gay>
Date: Mon, 10 May 2021 20:11:44 -0300
Subject: [PATCH 1114/1285] support both author field names

---
 bookwyrm/importers/storygraph_import.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/importers/storygraph_import.py b/bookwyrm/importers/storygraph_import.py
index c312e4ba..25498432 100644
--- a/bookwyrm/importers/storygraph_import.py
+++ b/bookwyrm/importers/storygraph_import.py
@@ -10,14 +10,14 @@ class StorygraphImporter(Importer):
 
     service = "Storygraph"
     # mandatory_fields : fields matching the book title and author
-    mandatory_fields = ["Title", "Author"]
+    mandatory_fields = ["Title"]
 
     def parse_fields(self, entry):
         """custom parsing for storygraph"""
         data = {}
         data["import_source"] = self.service
         data["Title"] = entry["Title"]
-        data["Author"] = entry["Authors"]
+        data["Author"] = entry["Authors"] if "Authors" in entry else entry["Author"]
         data["ISBN13"] = entry["ISBN"]
         data["My Review"] = entry["Review"]
         if entry["Star Rating"]:

From 202c43f610c9ed08383dd61104830c5cc4198c68 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 10 May 2021 16:13:17 -0700
Subject: [PATCH 1115/1285] Adds import option to books page

---
 bookwyrm/templates/user/shelf/shelf.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/user/shelf/shelf.html b/bookwyrm/templates/user/shelf/shelf.html
index 639ab502..48feb873 100644
--- a/bookwyrm/templates/user/shelf/shelf.html
+++ b/bookwyrm/templates/user/shelf/shelf.html
@@ -35,7 +35,9 @@
     {% if is_self %}
     <div class="column is-narrow">
         {% trans "Create shelf" as button_text %}
-        {% include 'snippets/toggle/open_button.html' with text=button_text icon="plus" controls_text="create-shelf-form" focus="create-shelf-form-header" %}
+        {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="plus" controls_text="create-shelf-form" focus="create-shelf-form-header" %}
+
+        <a class="button" href="{% url 'import' %}">{% trans "Import Books" %}</a>
     </div>
     {% endif %}
 </div>

From 867a33de5731bb79a43d0824c7c7967fbf192c47 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 10 May 2021 16:32:24 -0700
Subject: [PATCH 1116/1285] Creates author template dir

---
 bookwyrm/templates/{ => author}/author.html      | 0
 bookwyrm/templates/{ => author}/edit_author.html | 0
 bookwyrm/views/author.py                         | 6 +++---
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename bookwyrm/templates/{ => author}/author.html (100%)
 rename bookwyrm/templates/{ => author}/edit_author.html (100%)

diff --git a/bookwyrm/templates/author.html b/bookwyrm/templates/author/author.html
similarity index 100%
rename from bookwyrm/templates/author.html
rename to bookwyrm/templates/author/author.html
diff --git a/bookwyrm/templates/edit_author.html b/bookwyrm/templates/author/edit_author.html
similarity index 100%
rename from bookwyrm/templates/edit_author.html
rename to bookwyrm/templates/author/edit_author.html
diff --git a/bookwyrm/views/author.py b/bookwyrm/views/author.py
index 41298161..e51dc7d8 100644
--- a/bookwyrm/views/author.py
+++ b/bookwyrm/views/author.py
@@ -29,7 +29,7 @@ class Author(View):
             "author": author,
             "books": [b.default_edition for b in books],
         }
-        return TemplateResponse(request, "author.html", data)
+        return TemplateResponse(request, "author/author.html", data)
 
 
 @method_decorator(login_required, name="dispatch")
@@ -43,7 +43,7 @@ class EditAuthor(View):
         """info about a book"""
         author = get_object_or_404(models.Author, id=author_id)
         data = {"author": author, "form": forms.AuthorForm(instance=author)}
-        return TemplateResponse(request, "edit_author.html", data)
+        return TemplateResponse(request, "author/edit_author.html", data)
 
     def post(self, request, author_id):
         """edit a author cool"""
@@ -52,7 +52,7 @@ class EditAuthor(View):
         form = forms.AuthorForm(request.POST, request.FILES, instance=author)
         if not form.is_valid():
             data = {"author": author, "form": form}
-            return TemplateResponse(request, "edit_author.html", data)
+            return TemplateResponse(request, "author/edit_author.html", data)
         author = form.save()
 
         return redirect("/author/%s" % author.id)

From 9bfe4f4e91f3c34858eb887b1df78dd3afc4c036 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 10 May 2021 16:43:40 -0700
Subject: [PATCH 1117/1285] Uses a different snippet for previewing books on
 author page

---
 bookwyrm/templates/author/author.html       |  9 +++++++--
 bookwyrm/templates/snippets/book_tiles.html | 16 ----------------
 2 files changed, 7 insertions(+), 18 deletions(-)
 delete mode 100644 bookwyrm/templates/snippets/book_tiles.html

diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html
index a7ea9db5..c7fdea0e 100644
--- a/bookwyrm/templates/author/author.html
+++ b/bookwyrm/templates/author/author.html
@@ -34,7 +34,12 @@
 
 <div class="block">
     <h3 class="title is-4">{% blocktrans with name=author.name %}Books by {{ name }}{% endblocktrans %}</h3>
-    {% include 'snippets/book_tiles.html' with books=books %}
+    <div class="columns is-multiline is-mobile">
+    {% for book in books %}
+        <div class="column is-one-fifth">
+            {% include 'discover/small-book.html' with book=book %}
+        </div>
+    {% endfor %}
+    </div>
 </div>
 {% endblock %}
-
diff --git a/bookwyrm/templates/snippets/book_tiles.html b/bookwyrm/templates/snippets/book_tiles.html
deleted file mode 100644
index 25249c96..00000000
--- a/bookwyrm/templates/snippets/book_tiles.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="columns is-mobile is-multiline">
-    {% for book in books %}
-    <div class="column is-narrow">
-        <div class="box is-flex is-flex-direction-column is-align-items-center">
-            <div class="mb-3">
-                <a href="{{ book.local_path }}">
-                    {% include 'snippets/book_cover.html' with book=book cover_class='is-w-l-mobile is-h-l-mobile is-w-l-tablet is-h-xl-tablet' %}
-                </a>
-            </div>
-
-            {% include 'snippets/shelve_button/shelve_button.html' with book=book switch_mode=True %}
-        </div>
-    </div>
-    {% endfor %}
-</div>
-

From 443109bac3d072cf0626f98fe3ca719c390d4271 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 10 May 2021 17:06:22 -0700
Subject: [PATCH 1118/1285] Adds aliases and inventaire id to edit author form

Plus consolidates some wording
---
 bookwyrm/templates/author/edit_author.html | 36 +++++++++++++++++-----
 bookwyrm/templates/book/edit_book.html     |  4 +--
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/bookwyrm/templates/author/edit_author.html b/bookwyrm/templates/author/edit_author.html
index b575bbb2..010d36ef 100644
--- a/bookwyrm/templates/author/edit_author.html
+++ b/bookwyrm/templates/author/edit_author.html
@@ -29,44 +29,64 @@
     <div class="columns">
         <div class="column">
             <h2 class="title is-4">{% trans "Metadata" %}</h2>
-            <p><label class="label" for="id_name">{% trans "Name:" %}</label> {{ form.name }}</p>
+            <p class="mb-2"><label class="label" for="id_name">{% trans "Name:" %}</label> {{ form.name }}</p>
             {% for error in form.name.errors %}
             <p class="help is-danger">{{ error | escape }}</p>
             {% endfor %}
 
-            <p><label class="label" for="id_bio">{% trans "Bio:" %}</label> {{ form.bio }}</p>
+            <p class="mb-2">
+                <label class="label" for="id_aliases">{% trans "Aliases:" %}</label>
+                {{ form.aliases }}
+                <span class="help">{% trans "Separate multiple values with commas." %}</span>
+            </p>
+            {% for error in form.aliases.errors %}
+            <p class="help is-danger">{{ error | escape }}</p>
+            {% endfor %}
+
+            <p class="mb-2"><label class="label" for="id_bio">{% trans "Bio:" %}</label> {{ form.bio }}</p>
             {% for error in form.bio.errors %}
             <p class="help is-danger">{{ error | escape }}</p>
             {% endfor %}
 
-            <p><label class="label" for="id_wikipedia_link">{% trans "Wikipedia link:" %}</label> {{ form.wikipedia_link }}</p>
+            <p class="mb-2"><label class="label" for="id_wikipedia_link">{% trans "Wikipedia link:" %}</label> {{ form.wikipedia_link }}</p>
             {% for error in form.wikipedia_link.errors %}
             <p class="help is-danger">{{ error | escape }}</p>
             {% endfor %}
 
-            <p><label class="label" for="id_born">{% trans "Birth date:" %}</label> {{ form.born }}</p>
+            <p class="mb-2">
+                <label class="label" for="id_born">{% trans "Birth date:" %}</label>
+                <input type="date" name="born" value="{{ form.born.value|date:'Y-m-d' }}" class="input" id="id_born">
+            </p>
             {% for error in form.born.errors %}
             <p class="help is-danger">{{ error | escape }}</p>
             {% endfor %}
 
-            <p><label class="label" for="id_died">{% trans "Death date:" %}</label> {{ form.died }}</p>
+            <p class="mb-2">
+                <label class="label" for="id_died">{% trans "Death date:" %}</label>
+                <input type="date" name="died" value="{{ form.died.value|date:'Y-m-d' }}" class="input" id="id_died">
+            </p>
             {% for error in form.died.errors %}
             <p class="help is-danger">{{ error | escape }}</p>
             {% endfor %}
         </div>
         <div class="column">
             <h2 class="title is-4">{% trans "Author Identifiers" %}</h2>
-            <p><label class="label" for="id_openlibrary_key">{% trans "Openlibrary key:" %}</label> {{ form.openlibrary_key }}</p>
+            <p class="mb-2"><label class="label" for="id_openlibrary_key">{% trans "Openlibrary key:" %}</label> {{ form.openlibrary_key }}</p>
             {% for error in form.openlibrary_key.errors %}
             <p class="help is-danger">{{ error | escape }}</p>
             {% endfor %}
 
-            <p><label class="label" for="id_librarything_key">{% trans "Librarything key:" %}</label> {{ form.librarything_key }}</p>
+            <p class="mb-2"><label class="label" for="id_inventaire_id">{% trans "Inventaire ID:" %}</label> {{ form.inventaire_id }}</p>
+            {% for error in form.inventaire_id.errors %}
+            <p class="help is-danger">{{ error | escape }}</p>
+            {% endfor %}
+
+            <p class="mb-2"><label class="label" for="id_librarything_key">{% trans "Librarything key:" %}</label> {{ form.librarything_key }}</p>
             {% for error in form.librarything_key.errors %}
             <p class="help is-danger">{{ error | escape }}</p>
             {% endfor %}
 
-            <p><label class="label" for="id_goodreads_key">{% trans "Goodreads key:" %}</label> {{ form.goodreads_key }}</p>
+            <p class="mb-2"><label class="label" for="id_goodreads_key">{% trans "Goodreads key:" %}</label> {{ form.goodreads_key }}</p>
             {% for error in form.goodreads_key.errors %}
             <p class="help is-danger">{{ error | escape }}</p>
             {% endfor %}
diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html
index bcf11126..a230e290 100644
--- a/bookwyrm/templates/book/edit_book.html
+++ b/bookwyrm/templates/book/edit_book.html
@@ -125,7 +125,7 @@
                 <p class="mb-2">
                     <label class="label" for="id_publishers">{% trans "Publisher:" %}</label>
                     {{ form.publishers }}
-                    <span class="help">{% trans "Separate multiple publishers with commas." %}</span>
+                    <span class="help">{% trans "Separate multiple values with commas." %}</span>
                 </p>
                 {% for error in form.publishers.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
@@ -162,7 +162,7 @@
                 {% endif %}
                 <label class="label" for="id_add_author">{% trans "Add Authors:" %}</label>
                 <input class="input" type="text" name="add_author" id="id_add_author" placeholder="{% trans 'John Doe, Jane Smith' %}" value="{{ add_author }}" {% if confirm_mode %}readonly{% endif %}>
-                <p class="help">Separate multiple author names with commas.</p>
+                <span class="help">{% trans "Separate multiple values with commas." %}</span>
             </section>
         </div>
 

From 4c99fd7f12beb61e476786ce9f414038c678e8f6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 10 May 2021 17:24:10 -0700
Subject: [PATCH 1119/1285] Adds metadata to author view

---
 bookwyrm/templates/author/author.html | 51 +++++++++++++++++++++++----
 1 file changed, 45 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html
index c7fdea0e..d342da47 100644
--- a/bookwyrm/templates/author/author.html
+++ b/bookwyrm/templates/author/author.html
@@ -1,6 +1,7 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
+{% load humanize %}
 
 {% block title %}{{ author.name }}{% endblock %}
 
@@ -22,14 +23,52 @@
     </div>
 </div>
 
-<div class="block content">
-    {% if author.bio %}
-        {{ author.bio | to_markdown | safe }}
-    {% endif %}
+<div class="block content columns">
+    {% if author.aliases or author.born or author.died or author.wikipedia_link %}
+    <div class="column is-narrow">
+        <div class="box">
+            <dl>
+                {% if author.aliases %}
+                <div class="is-flex">
+                    <dt class="mr-1">{% trans "Aliases:" %}</dt>
+                    <dd itemprop="aliases">{{ author.aliases|join:', ' }}</dd>
+                </div>
+                {% endif %}
+                {% if author.born %}
+                <div class="is-flex">
+                    <dt class="mr-1">{% trans "Born:" %}</dt>
+                    <dd itemprop="aliases">{{ author.born|naturalday }}</dd>
+                </div>
+                {% endif %}
+                {% if author.aliases %}
+                <div class="is-flex">
+                    <dt class="mr-1">{% trans "Died:" %}</dt>
+                    <dd itemprop="aliases">{{ author.died|naturalday }}</dd>
+                </div>
+                {% endif %}
+            </dl>
 
-    {% if author.wikipedia_link %}
-    <p><a href="{{ author.wikipedia_link }}" rel=�noopener� target="_blank">{% trans "Wikipedia" %}</a></p>
+            {% if author.wikipedia_link %}
+            <p><a href="{{ author.wikipedia_link }}" rel=�noopener� target="_blank">{% trans "Wikipedia" %}</a></p>
+            {% endif %}
+            {% if author.openlibrary_key %}
+            <p class="mb-0">
+                <a href="https://openlibrary.org/authors/{{ author.openlibrary_key }}" target="_blank" rel="noopener">{% trans "View on OpenLibrary" %}</a>
+            </p>
+            {% endif %}
+            {% if author.inventaire_id %}
+            <p class="mb-0">
+                <a href="https://inventaire.io/entity/{{ author.inventaire_id }}" target="_blank" rel="noopener">{% trans "View on Inventaire" %}</a>
+            </p>
+            {% endif %}
+        </div>
+    </div>
     {% endif %}
+    <div class="column">
+        {% if author.bio %}
+            {{ author.bio | to_markdown | safe }}
+        {% endif %}
+    </div>
 </div>
 
 <div class="block">

From 6dae4ebd6f9fc2289af21d19f614fd2f72d7b4c8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 10 May 2021 17:44:19 -0700
Subject: [PATCH 1120/1285] Splits list tests into two files and adds user list
 page tests

---
 bookwyrm/tests/views/test_list.py         | 532 ++++------------------
 bookwyrm/tests/views/test_list_actions.py | 529 +++++++++++++++++++++
 2 files changed, 606 insertions(+), 455 deletions(-)
 create mode 100644 bookwyrm/tests/views/test_list_actions.py

diff --git a/bookwyrm/tests/views/test_list.py b/bookwyrm/tests/views/test_list.py
index 3de35b1e..d767e2b9 100644
--- a/bookwyrm/tests/views/test_list.py
+++ b/bookwyrm/tests/views/test_list.py
@@ -122,6 +122,14 @@ class ListViews(TestCase):
         view = views.List.as_view()
         request = self.factory.get("")
         request.user = self.local_user
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            models.ListItem.objects.create(
+                book_list=self.list,
+                user=self.local_user,
+                book=self.book,
+                approved=True,
+                order=1,
+            )
 
         with patch("bookwyrm.views.list.is_api_request") as is_api:
             is_api.return_value = False
@@ -130,6 +138,32 @@ class ListViews(TestCase):
         result.render()
         self.assertEqual(result.status_code, 200)
 
+    def test_list_page_empty(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.List.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+
+        with patch("bookwyrm.views.list.is_api_request") as is_api:
+            is_api.return_value = False
+            result = view(request, self.list.id)
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+
+    def test_list_page_logged_out(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.List.as_view()
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            models.ListItem.objects.create(
+                book_list=self.list,
+                user=self.local_user,
+                book=self.book,
+                approved=True,
+                order=1,
+            )
+
+        request = self.factory.get("")
         request.user = self.anonymous_user
         with patch("bookwyrm.views.list.is_api_request") as is_api:
             is_api.return_value = False
@@ -138,12 +172,32 @@ class ListViews(TestCase):
         result.render()
         self.assertEqual(result.status_code, 200)
 
+    def test_list_page_json_view(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.List.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            models.ListItem.objects.create(
+                book_list=self.list,
+                user=self.local_user,
+                book=self.book,
+                approved=True,
+                order=1,
+            )
+
         with patch("bookwyrm.views.list.is_api_request") as is_api:
             is_api.return_value = True
             result = view(request, self.list.id)
         self.assertIsInstance(result, ActivitypubResponse)
         self.assertEqual(result.status_code, 200)
 
+    def test_list_page_json_view_page(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.List.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+
         request = self.factory.get("/?page=1")
         request.user = self.local_user
         with patch("bookwyrm.views.list.is_api_request") as is_api:
@@ -204,466 +258,34 @@ class ListViews(TestCase):
         result = view(request, self.list.id)
         self.assertEqual(result.status_code, 302)
 
-    def test_curate_approve(self):
-        """approve a pending item"""
-        view = views.Curate.as_view()
+    def test_user_lists_page(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.UserLists.as_view()
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            pending = models.ListItem.objects.create(
-                book_list=self.list,
-                user=self.local_user,
-                book=self.book,
-                approved=False,
-                order=1,
+            models.List.objects.create(name="Public list", user=self.local_user)
+            models.List.objects.create(
+                name="Private list", privacy="direct", user=self.local_user
             )
-
-        request = self.factory.post(
-            "",
-            {
-                "item": pending.id,
-                "approved": "true",
-            },
-        )
+        request = self.factory.get("")
         request.user = self.local_user
 
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
-            view(request, self.list.id)
+        result = view(request, self.local_user.localname)
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
 
-        self.assertEqual(mock.call_count, 2)
-        activity = json.loads(mock.call_args[0][1])
-        self.assertEqual(activity["type"], "Add")
-        self.assertEqual(activity["actor"], self.local_user.remote_id)
-        self.assertEqual(activity["target"], self.list.remote_id)
-
-        pending.refresh_from_db()
-        self.assertEqual(self.list.books.count(), 1)
-        self.assertEqual(self.list.listitem_set.first(), pending)
-        self.assertTrue(pending.approved)
-
-    def test_curate_reject(self):
-        """approve a pending item"""
-        view = views.Curate.as_view()
+    def test_user_lists_page_logged_out(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.UserLists.as_view()
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            pending = models.ListItem.objects.create(
-                book_list=self.list,
-                user=self.local_user,
-                book=self.book,
-                approved=False,
-                order=1,
+            models.List.objects.create(name="Public list", user=self.local_user)
+            models.List.objects.create(
+                name="Private list", privacy="direct", user=self.local_user
             )
+        request = self.factory.get("")
+        request.user = self.anonymous_user
 
-        request = self.factory.post(
-            "",
-            {
-                "item": pending.id,
-                "approved": "false",
-            },
-        )
-        request.user = self.local_user
-
-        view(request, self.list.id)
-
-        self.assertFalse(self.list.books.exists())
-        self.assertFalse(models.ListItem.objects.exists())
-
-    def test_add_book(self):
-        """put a book on a list"""
-        request = self.factory.post(
-            "",
-            {
-                "book": self.book.id,
-                "list": self.list.id,
-            },
-        )
-        request.user = self.local_user
-
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
-            views.list.add_book(request)
-            self.assertEqual(mock.call_count, 1)
-            activity = json.loads(mock.call_args[0][1])
-            self.assertEqual(activity["type"], "Add")
-            self.assertEqual(activity["actor"], self.local_user.remote_id)
-            self.assertEqual(activity["target"], self.list.remote_id)
-
-        item = self.list.listitem_set.get()
-        self.assertEqual(item.book, self.book)
-        self.assertEqual(item.user, self.local_user)
-        self.assertTrue(item.approved)
-
-    def test_add_two_books(self):
-        """
-        Putting two books on the list. The first should have an order value of
-        1 and the second should have an order value of 2.
-        """
-        request_one = self.factory.post(
-            "",
-            {
-                "book": self.book.id,
-                "list": self.list.id,
-            },
-        )
-        request_one.user = self.local_user
-
-        request_two = self.factory.post(
-            "",
-            {
-                "book": self.book_two.id,
-                "list": self.list.id,
-            },
-        )
-        request_two.user = self.local_user
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            views.list.add_book(request_one)
-            views.list.add_book(request_two)
-
-        items = self.list.listitem_set.order_by("order").all()
-        self.assertEqual(items[0].book, self.book)
-        self.assertEqual(items[1].book, self.book_two)
-        self.assertEqual(items[0].order, 1)
-        self.assertEqual(items[1].order, 2)
-
-    def test_add_three_books_and_remove_second(self):
-        """
-        Put three books on a list and then remove the one in the middle. The
-        ordering of the list should adjust to not have a gap.
-        """
-        request_one = self.factory.post(
-            "",
-            {
-                "book": self.book.id,
-                "list": self.list.id,
-            },
-        )
-        request_one.user = self.local_user
-
-        request_two = self.factory.post(
-            "",
-            {
-                "book": self.book_two.id,
-                "list": self.list.id,
-            },
-        )
-        request_two.user = self.local_user
-
-        request_three = self.factory.post(
-            "",
-            {
-                "book": self.book_three.id,
-                "list": self.list.id,
-            },
-        )
-        request_three.user = self.local_user
-
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            views.list.add_book(request_one)
-            views.list.add_book(request_two)
-            views.list.add_book(request_three)
-
-        items = self.list.listitem_set.order_by("order").all()
-        self.assertEqual(items[0].book, self.book)
-        self.assertEqual(items[1].book, self.book_two)
-        self.assertEqual(items[2].book, self.book_three)
-        self.assertEqual(items[0].order, 1)
-        self.assertEqual(items[1].order, 2)
-        self.assertEqual(items[2].order, 3)
-
-        remove_request = self.factory.post("", {"item": items[1].id})
-        remove_request.user = self.local_user
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            views.list.remove_book(remove_request, self.list.id)
-        items = self.list.listitem_set.order_by("order").all()
-        self.assertEqual(items[0].book, self.book)
-        self.assertEqual(items[1].book, self.book_three)
-        self.assertEqual(items[0].order, 1)
-        self.assertEqual(items[1].order, 2)
-
-    def test_adding_book_with_a_pending_book(self):
-        """
-        When a list contains any pending books, the pending books should have
-        be at the end of the list by order. If a book is added while a book is
-        pending, its order should precede the pending books.
-        """
-        request = self.factory.post(
-            "",
-            {
-                "book": self.book_three.id,
-                "list": self.list.id,
-            },
-        )
-        request.user = self.local_user
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            models.ListItem.objects.create(
-                book_list=self.list,
-                user=self.local_user,
-                book=self.book,
-                approved=True,
-                order=1,
-            )
-            models.ListItem.objects.create(
-                book_list=self.list,
-                user=self.rat,
-                book=self.book_two,
-                approved=False,
-                order=2,
-            )
-            views.list.add_book(request)
-
-        items = self.list.listitem_set.order_by("order").all()
-        self.assertEqual(items[0].book, self.book)
-        self.assertEqual(items[0].order, 1)
-        self.assertTrue(items[0].approved)
-
-        self.assertEqual(items[1].book, self.book_three)
-        self.assertEqual(items[1].order, 2)
-        self.assertTrue(items[1].approved)
-
-        self.assertEqual(items[2].book, self.book_two)
-        self.assertEqual(items[2].order, 3)
-        self.assertFalse(items[2].approved)
-
-    def test_approving_one_pending_book_from_multiple(self):
-        """
-        When a list contains any pending books, the pending books should have
-        be at the end of the list by order. If a pending book is approved, then
-        its order should be at the end of the approved books and before the
-        remaining pending books.
-        """
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            models.ListItem.objects.create(
-                book_list=self.list,
-                user=self.local_user,
-                book=self.book,
-                approved=True,
-                order=1,
-            )
-            models.ListItem.objects.create(
-                book_list=self.list,
-                user=self.local_user,
-                book=self.book_two,
-                approved=True,
-                order=2,
-            )
-            models.ListItem.objects.create(
-                book_list=self.list,
-                user=self.rat,
-                book=self.book_three,
-                approved=False,
-                order=3,
-            )
-            to_be_approved = models.ListItem.objects.create(
-                book_list=self.list,
-                user=self.rat,
-                book=self.book_four,
-                approved=False,
-                order=4,
-            )
-
-        view = views.Curate.as_view()
-        request = self.factory.post(
-            "",
-            {
-                "item": to_be_approved.id,
-                "approved": "true",
-            },
-        )
-        request.user = self.local_user
-
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            view(request, self.list.id)
-
-        items = self.list.listitem_set.order_by("order").all()
-        self.assertEqual(items[0].book, self.book)
-        self.assertEqual(items[0].order, 1)
-        self.assertTrue(items[0].approved)
-
-        self.assertEqual(items[1].book, self.book_two)
-        self.assertEqual(items[1].order, 2)
-        self.assertTrue(items[1].approved)
-
-        self.assertEqual(items[2].book, self.book_four)
-        self.assertEqual(items[2].order, 3)
-        self.assertTrue(items[2].approved)
-
-        self.assertEqual(items[3].book, self.book_three)
-        self.assertEqual(items[3].order, 4)
-        self.assertFalse(items[3].approved)
-
-    def test_add_three_books_and_move_last_to_first(self):
-        """
-        Put three books on the list and move the last book to the first
-        position.
-        """
-        request_one = self.factory.post(
-            "",
-            {
-                "book": self.book.id,
-                "list": self.list.id,
-            },
-        )
-        request_one.user = self.local_user
-
-        request_two = self.factory.post(
-            "",
-            {
-                "book": self.book_two.id,
-                "list": self.list.id,
-            },
-        )
-        request_two.user = self.local_user
-
-        request_three = self.factory.post(
-            "",
-            {
-                "book": self.book_three.id,
-                "list": self.list.id,
-            },
-        )
-        request_three.user = self.local_user
-
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            views.list.add_book(request_one)
-            views.list.add_book(request_two)
-            views.list.add_book(request_three)
-
-        items = self.list.listitem_set.order_by("order").all()
-        self.assertEqual(items[0].book, self.book)
-        self.assertEqual(items[1].book, self.book_two)
-        self.assertEqual(items[2].book, self.book_three)
-        self.assertEqual(items[0].order, 1)
-        self.assertEqual(items[1].order, 2)
-        self.assertEqual(items[2].order, 3)
-
-        set_position_request = self.factory.post("", {"position": 1})
-        set_position_request.user = self.local_user
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            views.list.set_book_position(set_position_request, items[2].id)
-        items = self.list.listitem_set.order_by("order").all()
-        self.assertEqual(items[0].book, self.book_three)
-        self.assertEqual(items[1].book, self.book)
-        self.assertEqual(items[2].book, self.book_two)
-        self.assertEqual(items[0].order, 1)
-        self.assertEqual(items[1].order, 2)
-        self.assertEqual(items[2].order, 3)
-
-    def test_add_book_outsider(self):
-        """put a book on a list"""
-        self.list.curation = "open"
-        self.list.save(broadcast=False)
-        request = self.factory.post(
-            "",
-            {
-                "book": self.book.id,
-                "list": self.list.id,
-            },
-        )
-        request.user = self.rat
-
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
-            views.list.add_book(request)
-            self.assertEqual(mock.call_count, 1)
-            activity = json.loads(mock.call_args[0][1])
-            self.assertEqual(activity["type"], "Add")
-            self.assertEqual(activity["actor"], self.rat.remote_id)
-            self.assertEqual(activity["target"], self.list.remote_id)
-
-        item = self.list.listitem_set.get()
-        self.assertEqual(item.book, self.book)
-        self.assertEqual(item.user, self.rat)
-        self.assertTrue(item.approved)
-
-    def test_add_book_pending(self):
-        """put a book on a list awaiting approval"""
-        self.list.curation = "curated"
-        self.list.save(broadcast=False)
-        request = self.factory.post(
-            "",
-            {
-                "book": self.book.id,
-                "list": self.list.id,
-            },
-        )
-        request.user = self.rat
-
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
-            views.list.add_book(request)
-
-        self.assertEqual(mock.call_count, 1)
-        activity = json.loads(mock.call_args[0][1])
-
-        self.assertEqual(activity["type"], "Add")
-        self.assertEqual(activity["actor"], self.rat.remote_id)
-        self.assertEqual(activity["target"], self.list.remote_id)
-
-        item = self.list.listitem_set.get()
-        self.assertEqual(activity["object"]["id"], item.remote_id)
-
-        self.assertEqual(item.book, self.book)
-        self.assertEqual(item.user, self.rat)
-        self.assertFalse(item.approved)
-
-    def test_add_book_self_curated(self):
-        """put a book on a list automatically approved"""
-        self.list.curation = "curated"
-        self.list.save(broadcast=False)
-        request = self.factory.post(
-            "",
-            {
-                "book": self.book.id,
-                "list": self.list.id,
-            },
-        )
-        request.user = self.local_user
-
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
-            views.list.add_book(request)
-            self.assertEqual(mock.call_count, 1)
-            activity = json.loads(mock.call_args[0][1])
-            self.assertEqual(activity["type"], "Add")
-            self.assertEqual(activity["actor"], self.local_user.remote_id)
-            self.assertEqual(activity["target"], self.list.remote_id)
-
-        item = self.list.listitem_set.get()
-        self.assertEqual(item.book, self.book)
-        self.assertEqual(item.user, self.local_user)
-        self.assertTrue(item.approved)
-
-    def test_remove_book(self):
-        """take an item off a list"""
-
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            item = models.ListItem.objects.create(
-                book_list=self.list,
-                user=self.local_user,
-                book=self.book,
-                order=1,
-            )
-        self.assertTrue(self.list.listitem_set.exists())
-
-        request = self.factory.post(
-            "",
-            {
-                "item": item.id,
-            },
-        )
-        request.user = self.local_user
-
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            views.list.remove_book(request, self.list.id)
-        self.assertFalse(self.list.listitem_set.exists())
-
-    def test_remove_book_unauthorized(self):
-        """take an item off a list"""
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            item = models.ListItem.objects.create(
-                book_list=self.list, user=self.local_user, book=self.book, order=1
-            )
-        self.assertTrue(self.list.listitem_set.exists())
-        request = self.factory.post(
-            "",
-            {
-                "item": item.id,
-            },
-        )
-        request.user = self.rat
-
-        views.list.remove_book(request, self.list.id)
-        self.assertTrue(self.list.listitem_set.exists())
+        result = view(request, self.local_user.username)
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
diff --git a/bookwyrm/tests/views/test_list_actions.py b/bookwyrm/tests/views/test_list_actions.py
new file mode 100644
index 00000000..30c44a2c
--- /dev/null
+++ b/bookwyrm/tests/views/test_list_actions.py
@@ -0,0 +1,529 @@
+""" test for app action functionality """
+import json
+from unittest.mock import patch
+
+from django.contrib.auth.models import AnonymousUser
+from django.test import TestCase
+from django.test.client import RequestFactory
+
+from bookwyrm import models, views
+
+# pylint: disable=unused-argument
+class ListActionViews(TestCase):
+    """tag views"""
+
+    def setUp(self):
+        """we need basic test data and mocks"""
+        self.factory = RequestFactory()
+        self.local_user = models.User.objects.create_user(
+            "mouse@local.com",
+            "mouse@mouse.com",
+            "mouseword",
+            local=True,
+            localname="mouse",
+            remote_id="https://example.com/users/mouse",
+        )
+        self.rat = models.User.objects.create_user(
+            "rat@local.com",
+            "rat@rat.com",
+            "ratword",
+            local=True,
+            localname="rat",
+            remote_id="https://example.com/users/rat",
+        )
+        work = models.Work.objects.create(title="Work")
+        self.book = models.Edition.objects.create(
+            title="Example Edition",
+            remote_id="https://example.com/book/1",
+            parent_work=work,
+        )
+        work_two = models.Work.objects.create(title="Labori")
+        self.book_two = models.Edition.objects.create(
+            title="Example Edition 2",
+            remote_id="https://example.com/book/2",
+            parent_work=work_two,
+        )
+        work_three = models.Work.objects.create(title="Trabajar")
+        self.book_three = models.Edition.objects.create(
+            title="Example Edition 3",
+            remote_id="https://example.com/book/3",
+            parent_work=work_three,
+        )
+        work_four = models.Work.objects.create(title="Travailler")
+        self.book_four = models.Edition.objects.create(
+            title="Example Edition 4",
+            remote_id="https://example.com/book/4",
+            parent_work=work_four,
+        )
+
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            self.list = models.List.objects.create(
+                name="Test List", user=self.local_user
+            )
+        self.anonymous_user = AnonymousUser
+        self.anonymous_user.is_authenticated = False
+        models.SiteSettings.objects.create()
+
+    def test_curate_approve(self):
+        """approve a pending item"""
+        view = views.Curate.as_view()
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            pending = models.ListItem.objects.create(
+                book_list=self.list,
+                user=self.local_user,
+                book=self.book,
+                approved=False,
+                order=1,
+            )
+
+        request = self.factory.post(
+            "",
+            {
+                "item": pending.id,
+                "approved": "true",
+            },
+        )
+        request.user = self.local_user
+
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
+            view(request, self.list.id)
+
+        self.assertEqual(mock.call_count, 2)
+        activity = json.loads(mock.call_args[0][1])
+        self.assertEqual(activity["type"], "Add")
+        self.assertEqual(activity["actor"], self.local_user.remote_id)
+        self.assertEqual(activity["target"], self.list.remote_id)
+
+        pending.refresh_from_db()
+        self.assertEqual(self.list.books.count(), 1)
+        self.assertEqual(self.list.listitem_set.first(), pending)
+        self.assertTrue(pending.approved)
+
+    def test_curate_reject(self):
+        """approve a pending item"""
+        view = views.Curate.as_view()
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            pending = models.ListItem.objects.create(
+                book_list=self.list,
+                user=self.local_user,
+                book=self.book,
+                approved=False,
+                order=1,
+            )
+
+        request = self.factory.post(
+            "",
+            {
+                "item": pending.id,
+                "approved": "false",
+            },
+        )
+        request.user = self.local_user
+
+        view(request, self.list.id)
+
+        self.assertFalse(self.list.books.exists())
+        self.assertFalse(models.ListItem.objects.exists())
+
+    def test_add_book(self):
+        """put a book on a list"""
+        request = self.factory.post(
+            "",
+            {
+                "book": self.book.id,
+                "list": self.list.id,
+            },
+        )
+        request.user = self.local_user
+
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
+            views.list.add_book(request)
+            self.assertEqual(mock.call_count, 1)
+            activity = json.loads(mock.call_args[0][1])
+            self.assertEqual(activity["type"], "Add")
+            self.assertEqual(activity["actor"], self.local_user.remote_id)
+            self.assertEqual(activity["target"], self.list.remote_id)
+
+        item = self.list.listitem_set.get()
+        self.assertEqual(item.book, self.book)
+        self.assertEqual(item.user, self.local_user)
+        self.assertTrue(item.approved)
+
+    def test_add_two_books(self):
+        """
+        Putting two books on the list. The first should have an order value of
+        1 and the second should have an order value of 2.
+        """
+        request_one = self.factory.post(
+            "",
+            {
+                "book": self.book.id,
+                "list": self.list.id,
+            },
+        )
+        request_one.user = self.local_user
+
+        request_two = self.factory.post(
+            "",
+            {
+                "book": self.book_two.id,
+                "list": self.list.id,
+            },
+        )
+        request_two.user = self.local_user
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            views.list.add_book(request_one)
+            views.list.add_book(request_two)
+
+        items = self.list.listitem_set.order_by("order").all()
+        self.assertEqual(items[0].book, self.book)
+        self.assertEqual(items[1].book, self.book_two)
+        self.assertEqual(items[0].order, 1)
+        self.assertEqual(items[1].order, 2)
+
+    def test_add_three_books_and_remove_second(self):
+        """
+        Put three books on a list and then remove the one in the middle. The
+        ordering of the list should adjust to not have a gap.
+        """
+        request_one = self.factory.post(
+            "",
+            {
+                "book": self.book.id,
+                "list": self.list.id,
+            },
+        )
+        request_one.user = self.local_user
+
+        request_two = self.factory.post(
+            "",
+            {
+                "book": self.book_two.id,
+                "list": self.list.id,
+            },
+        )
+        request_two.user = self.local_user
+
+        request_three = self.factory.post(
+            "",
+            {
+                "book": self.book_three.id,
+                "list": self.list.id,
+            },
+        )
+        request_three.user = self.local_user
+
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            views.list.add_book(request_one)
+            views.list.add_book(request_two)
+            views.list.add_book(request_three)
+
+        items = self.list.listitem_set.order_by("order").all()
+        self.assertEqual(items[0].book, self.book)
+        self.assertEqual(items[1].book, self.book_two)
+        self.assertEqual(items[2].book, self.book_three)
+        self.assertEqual(items[0].order, 1)
+        self.assertEqual(items[1].order, 2)
+        self.assertEqual(items[2].order, 3)
+
+        remove_request = self.factory.post("", {"item": items[1].id})
+        remove_request.user = self.local_user
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            views.list.remove_book(remove_request, self.list.id)
+        items = self.list.listitem_set.order_by("order").all()
+        self.assertEqual(items[0].book, self.book)
+        self.assertEqual(items[1].book, self.book_three)
+        self.assertEqual(items[0].order, 1)
+        self.assertEqual(items[1].order, 2)
+
+    def test_adding_book_with_a_pending_book(self):
+        """
+        When a list contains any pending books, the pending books should have
+        be at the end of the list by order. If a book is added while a book is
+        pending, its order should precede the pending books.
+        """
+        request = self.factory.post(
+            "",
+            {
+                "book": self.book_three.id,
+                "list": self.list.id,
+            },
+        )
+        request.user = self.local_user
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            models.ListItem.objects.create(
+                book_list=self.list,
+                user=self.local_user,
+                book=self.book,
+                approved=True,
+                order=1,
+            )
+            models.ListItem.objects.create(
+                book_list=self.list,
+                user=self.rat,
+                book=self.book_two,
+                approved=False,
+                order=2,
+            )
+            views.list.add_book(request)
+
+        items = self.list.listitem_set.order_by("order").all()
+        self.assertEqual(items[0].book, self.book)
+        self.assertEqual(items[0].order, 1)
+        self.assertTrue(items[0].approved)
+
+        self.assertEqual(items[1].book, self.book_three)
+        self.assertEqual(items[1].order, 2)
+        self.assertTrue(items[1].approved)
+
+        self.assertEqual(items[2].book, self.book_two)
+        self.assertEqual(items[2].order, 3)
+        self.assertFalse(items[2].approved)
+
+    def test_approving_one_pending_book_from_multiple(self):
+        """
+        When a list contains any pending books, the pending books should have
+        be at the end of the list by order. If a pending book is approved, then
+        its order should be at the end of the approved books and before the
+        remaining pending books.
+        """
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            models.ListItem.objects.create(
+                book_list=self.list,
+                user=self.local_user,
+                book=self.book,
+                approved=True,
+                order=1,
+            )
+            models.ListItem.objects.create(
+                book_list=self.list,
+                user=self.local_user,
+                book=self.book_two,
+                approved=True,
+                order=2,
+            )
+            models.ListItem.objects.create(
+                book_list=self.list,
+                user=self.rat,
+                book=self.book_three,
+                approved=False,
+                order=3,
+            )
+            to_be_approved = models.ListItem.objects.create(
+                book_list=self.list,
+                user=self.rat,
+                book=self.book_four,
+                approved=False,
+                order=4,
+            )
+
+        view = views.Curate.as_view()
+        request = self.factory.post(
+            "",
+            {
+                "item": to_be_approved.id,
+                "approved": "true",
+            },
+        )
+        request.user = self.local_user
+
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            view(request, self.list.id)
+
+        items = self.list.listitem_set.order_by("order").all()
+        self.assertEqual(items[0].book, self.book)
+        self.assertEqual(items[0].order, 1)
+        self.assertTrue(items[0].approved)
+
+        self.assertEqual(items[1].book, self.book_two)
+        self.assertEqual(items[1].order, 2)
+        self.assertTrue(items[1].approved)
+
+        self.assertEqual(items[2].book, self.book_four)
+        self.assertEqual(items[2].order, 3)
+        self.assertTrue(items[2].approved)
+
+        self.assertEqual(items[3].book, self.book_three)
+        self.assertEqual(items[3].order, 4)
+        self.assertFalse(items[3].approved)
+
+    def test_add_three_books_and_move_last_to_first(self):
+        """
+        Put three books on the list and move the last book to the first
+        position.
+        """
+        request_one = self.factory.post(
+            "",
+            {
+                "book": self.book.id,
+                "list": self.list.id,
+            },
+        )
+        request_one.user = self.local_user
+
+        request_two = self.factory.post(
+            "",
+            {
+                "book": self.book_two.id,
+                "list": self.list.id,
+            },
+        )
+        request_two.user = self.local_user
+
+        request_three = self.factory.post(
+            "",
+            {
+                "book": self.book_three.id,
+                "list": self.list.id,
+            },
+        )
+        request_three.user = self.local_user
+
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            views.list.add_book(request_one)
+            views.list.add_book(request_two)
+            views.list.add_book(request_three)
+
+        items = self.list.listitem_set.order_by("order").all()
+        self.assertEqual(items[0].book, self.book)
+        self.assertEqual(items[1].book, self.book_two)
+        self.assertEqual(items[2].book, self.book_three)
+        self.assertEqual(items[0].order, 1)
+        self.assertEqual(items[1].order, 2)
+        self.assertEqual(items[2].order, 3)
+
+        set_position_request = self.factory.post("", {"position": 1})
+        set_position_request.user = self.local_user
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            views.list.set_book_position(set_position_request, items[2].id)
+        items = self.list.listitem_set.order_by("order").all()
+        self.assertEqual(items[0].book, self.book_three)
+        self.assertEqual(items[1].book, self.book)
+        self.assertEqual(items[2].book, self.book_two)
+        self.assertEqual(items[0].order, 1)
+        self.assertEqual(items[1].order, 2)
+        self.assertEqual(items[2].order, 3)
+
+    def test_add_book_outsider(self):
+        """put a book on a list"""
+        self.list.curation = "open"
+        self.list.save(broadcast=False)
+        request = self.factory.post(
+            "",
+            {
+                "book": self.book.id,
+                "list": self.list.id,
+            },
+        )
+        request.user = self.rat
+
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
+            views.list.add_book(request)
+            self.assertEqual(mock.call_count, 1)
+            activity = json.loads(mock.call_args[0][1])
+            self.assertEqual(activity["type"], "Add")
+            self.assertEqual(activity["actor"], self.rat.remote_id)
+            self.assertEqual(activity["target"], self.list.remote_id)
+
+        item = self.list.listitem_set.get()
+        self.assertEqual(item.book, self.book)
+        self.assertEqual(item.user, self.rat)
+        self.assertTrue(item.approved)
+
+    def test_add_book_pending(self):
+        """put a book on a list awaiting approval"""
+        self.list.curation = "curated"
+        self.list.save(broadcast=False)
+        request = self.factory.post(
+            "",
+            {
+                "book": self.book.id,
+                "list": self.list.id,
+            },
+        )
+        request.user = self.rat
+
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
+            views.list.add_book(request)
+
+        self.assertEqual(mock.call_count, 1)
+        activity = json.loads(mock.call_args[0][1])
+
+        self.assertEqual(activity["type"], "Add")
+        self.assertEqual(activity["actor"], self.rat.remote_id)
+        self.assertEqual(activity["target"], self.list.remote_id)
+
+        item = self.list.listitem_set.get()
+        self.assertEqual(activity["object"]["id"], item.remote_id)
+
+        self.assertEqual(item.book, self.book)
+        self.assertEqual(item.user, self.rat)
+        self.assertFalse(item.approved)
+
+    def test_add_book_self_curated(self):
+        """put a book on a list automatically approved"""
+        self.list.curation = "curated"
+        self.list.save(broadcast=False)
+        request = self.factory.post(
+            "",
+            {
+                "book": self.book.id,
+                "list": self.list.id,
+            },
+        )
+        request.user = self.local_user
+
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay") as mock:
+            views.list.add_book(request)
+            self.assertEqual(mock.call_count, 1)
+            activity = json.loads(mock.call_args[0][1])
+            self.assertEqual(activity["type"], "Add")
+            self.assertEqual(activity["actor"], self.local_user.remote_id)
+            self.assertEqual(activity["target"], self.list.remote_id)
+
+        item = self.list.listitem_set.get()
+        self.assertEqual(item.book, self.book)
+        self.assertEqual(item.user, self.local_user)
+        self.assertTrue(item.approved)
+
+    def test_remove_book(self):
+        """take an item off a list"""
+
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            item = models.ListItem.objects.create(
+                book_list=self.list,
+                user=self.local_user,
+                book=self.book,
+                order=1,
+            )
+        self.assertTrue(self.list.listitem_set.exists())
+
+        request = self.factory.post(
+            "",
+            {
+                "item": item.id,
+            },
+        )
+        request.user = self.local_user
+
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            views.list.remove_book(request, self.list.id)
+        self.assertFalse(self.list.listitem_set.exists())
+
+    def test_remove_book_unauthorized(self):
+        """take an item off a list"""
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            item = models.ListItem.objects.create(
+                book_list=self.list, user=self.local_user, book=self.book, order=1
+            )
+        self.assertTrue(self.list.listitem_set.exists())
+        request = self.factory.post(
+            "",
+            {
+                "item": item.id,
+            },
+        )
+        request.user = self.rat
+
+        views.list.remove_book(request, self.list.id)
+        self.assertTrue(self.list.listitem_set.exists())

From 92e2c70baf331e8e8bd214dccfaa9785a3fb20ba Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 10 May 2021 18:28:31 -0700
Subject: [PATCH 1121/1285] Fixes list sorting by rating

---
 bookwyrm/tests/views/test_list.py | 49 +++++++++++++++++++++++++++++++
 bookwyrm/views/list.py            | 28 +++++++-----------
 2 files changed, 59 insertions(+), 18 deletions(-)

diff --git a/bookwyrm/tests/views/test_list.py b/bookwyrm/tests/views/test_list.py
index d767e2b9..d6ad0e86 100644
--- a/bookwyrm/tests/views/test_list.py
+++ b/bookwyrm/tests/views/test_list.py
@@ -138,6 +138,55 @@ class ListViews(TestCase):
         result.render()
         self.assertEqual(result.status_code, 200)
 
+    def test_list_page_sorted(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.List.as_view()
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            for (i, book) in enumerate([self.book, self.book_two, self.book_three]):
+                models.ListItem.objects.create(
+                    book_list=self.list,
+                    user=self.local_user,
+                    book=book,
+                    approved=True,
+                    order=i + 1,
+                )
+
+        request = self.factory.get("/?sort_by=order")
+        request.user = self.local_user
+        with patch("bookwyrm.views.list.is_api_request") as is_api:
+            is_api.return_value = False
+            result = view(request, self.list.id)
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+
+        request = self.factory.get("/?sort_by=title")
+        request.user = self.local_user
+        with patch("bookwyrm.views.list.is_api_request") as is_api:
+            is_api.return_value = False
+            result = view(request, self.list.id)
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+
+        request = self.factory.get("/?sort_by=rating")
+        request.user = self.local_user
+        with patch("bookwyrm.views.list.is_api_request") as is_api:
+            is_api.return_value = False
+            result = view(request, self.list.id)
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+
+        request = self.factory.get("/?sort_by=sdkfh")
+        request.user = self.local_user
+        with patch("bookwyrm.views.list.is_api_request") as is_api:
+            is_api.return_value = False
+            result = view(request, self.list.id)
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+
     def test_list_page_empty(self):
         """there are so many views, this just makes sure it LOADS"""
         view = views.List.as_view()
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py
index bfd61790..75bb5d48 100644
--- a/bookwyrm/views/list.py
+++ b/bookwyrm/views/list.py
@@ -5,7 +5,7 @@ from urllib.parse import urlencode
 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
 from django.db import IntegrityError, transaction
-from django.db.models import Avg, Count, Q, Max
+from django.db.models import Avg, Count, DecimalField, Q, Max
 from django.db.models.functions import Coalesce
 from django.http import HttpResponseNotFound, HttpResponseBadRequest, HttpResponse
 from django.shortcuts import get_object_or_404, redirect
@@ -108,31 +108,23 @@ class List(View):
         if direction not in ("ascending", "descending"):
             direction = "ascending"
 
-        internal_sort_by = {
+        directional_sort_by = {
             "order": "order",
             "title": "book__title",
             "rating": "average_rating",
-        }
-        directional_sort_by = internal_sort_by[sort_by]
+        }[sort_by]
         if direction == "descending":
             directional_sort_by = "-" + directional_sort_by
 
-        if sort_by == "order":
-            items = book_list.listitem_set.filter(approved=True).order_by(
-                directional_sort_by
-            )
-        elif sort_by == "title":
-            items = book_list.listitem_set.filter(approved=True).order_by(
-                directional_sort_by
-            )
-        elif sort_by == "rating":
-            items = (
-                book_list.listitem_set.annotate(
-                    average_rating=Avg(Coalesce("book__review__rating", 0))
+        items = book_list.listitem_set
+        if sort_by == "rating":
+            items = items.annotate(
+                average_rating=Avg(
+                    Coalesce("book__review__rating", 0.0),
+                    output_field=DecimalField(),
                 )
-                .filter(approved=True)
-                .order_by(directional_sort_by)
             )
+        items = items.filter(approved=True).order_by(directional_sort_by)
 
         paginated = Paginator(items, PAGE_LENGTH)
 

From 680f300e7c100e3923c109f0bc0cc778a1ce4694 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 11 May 2021 08:15:02 -0700
Subject: [PATCH 1122/1285] Preserve width when cover images fail to load

---
 bookwyrm/templates/snippets/book_cover.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index 5f12858f..3c6f212d 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -6,6 +6,7 @@
 <figure
     class="
         cover-container
+        is-w-m
         {{ cover_class }}
 
         {% if not book.cover %}

From e7c5b77b4c2bdceb68e6a675c0f72b223f72e6c6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 11 May 2021 09:54:04 -0700
Subject: [PATCH 1123/1285] Removes unused connector fields and adds active
 boolean

---
 bookwyrm/connectors/abstract_connector.py     |  7 ----
 .../migrations/0074_auto_20210511_1651.py     | 34 +++++++++++++++++++
 bookwyrm/models/connector.py                  |  8 +----
 .../connectors/test_abstract_connector.py     |  7 ----
 4 files changed, 35 insertions(+), 21 deletions(-)
 create mode 100644 bookwyrm/migrations/0074_auto_20210511_1651.py

diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index 18ccb942..f9496aa0 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -102,13 +102,6 @@ class AbstractConnector(AbstractMinimalConnector):
         # title we handle separately.
         self.book_mappings = []
 
-    def is_available(self):
-        """check if you're allowed to use this connector"""
-        if self.max_query_count is not None:
-            if self.connector.query_count >= self.max_query_count:
-                return False
-        return True
-
     def get_or_create_book(self, remote_id):
         """translate arbitrary json into an Activitypub dataclass"""
         # first, check if we have the origin_id saved
diff --git a/bookwyrm/migrations/0074_auto_20210511_1651.py b/bookwyrm/migrations/0074_auto_20210511_1651.py
new file mode 100644
index 00000000..51e9e09c
--- /dev/null
+++ b/bookwyrm/migrations/0074_auto_20210511_1651.py
@@ -0,0 +1,34 @@
+# Generated by Django 3.2 on 2021-05-11 16:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0073_sitesettings_footer_item"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="connector",
+            name="max_query_count",
+        ),
+        migrations.RemoveField(
+            model_name="connector",
+            name="politeness_delay",
+        ),
+        migrations.RemoveField(
+            model_name="connector",
+            name="query_count",
+        ),
+        migrations.RemoveField(
+            model_name="connector",
+            name="query_count_expiry",
+        ),
+        migrations.AddField(
+            model_name="connector",
+            name="active",
+            field=models.BooleanField(default=True),
+        ),
+    ]
diff --git a/bookwyrm/models/connector.py b/bookwyrm/models/connector.py
index 625cdbed..4debcc3d 100644
--- a/bookwyrm/models/connector.py
+++ b/bookwyrm/models/connector.py
@@ -17,6 +17,7 @@ class Connector(BookWyrmModel):
     local = models.BooleanField(default=False)
     connector_file = models.CharField(max_length=255, choices=ConnectorFiles.choices)
     api_key = models.CharField(max_length=255, null=True, blank=True)
+    active = models.BooleanField(default=True)
 
     base_url = models.CharField(max_length=255)
     books_url = models.CharField(max_length=255)
@@ -24,13 +25,6 @@ class Connector(BookWyrmModel):
     search_url = models.CharField(max_length=255, null=True, blank=True)
     isbn_search_url = models.CharField(max_length=255, null=True, blank=True)
 
-    politeness_delay = models.IntegerField(null=True, blank=True)  # seconds
-    max_query_count = models.IntegerField(null=True, blank=True)
-    # how many queries executed in a unit of time, like a day
-    query_count = models.IntegerField(default=0)
-    # when to reset the query count back to 0 (ie, after 1 day)
-    query_count_expiry = models.DateTimeField(auto_now_add=True, blank=True)
-
     def __str__(self):
         return "{} ({})".format(
             self.identifier,
diff --git a/bookwyrm/tests/connectors/test_abstract_connector.py b/bookwyrm/tests/connectors/test_abstract_connector.py
index 4497b4e5..5c50e4b7 100644
--- a/bookwyrm/tests/connectors/test_abstract_connector.py
+++ b/bookwyrm/tests/connectors/test_abstract_connector.py
@@ -84,13 +84,6 @@ class AbstractConnector(TestCase):
         """barebones connector for search with defaults"""
         self.assertIsInstance(self.connector.book_mappings, list)
 
-    def test_is_available(self):
-        """this isn't used...."""
-        self.assertTrue(self.connector.is_available())
-        self.connector.max_query_count = 1
-        self.connector.connector.query_count = 2
-        self.assertFalse(self.connector.is_available())
-
     def test_get_or_create_book_existing(self):
         """find an existing book by remote/origin id"""
         self.assertEqual(models.Book.objects.count(), 1)

From 19f788b9aa36004e872aac3dd3adbb7b620241e5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 11 May 2021 11:31:02 -0700
Subject: [PATCH 1124/1285] Deactivate connectors related to blocked federated
 servers

---
 ...10511_1651.py => 0074_auto_20210511_1829.py} | 16 +++++++++++++++-
 bookwyrm/models/base_model.py                   | 10 ++++++++++
 bookwyrm/models/connector.py                    |  5 ++++-
 bookwyrm/models/federated_server.py             | 17 +++++++++++++++++
 bookwyrm/models/user.py                         | 12 +-----------
 5 files changed, 47 insertions(+), 13 deletions(-)
 rename bookwyrm/migrations/{0074_auto_20210511_1651.py => 0074_auto_20210511_1829.py} (60%)

diff --git a/bookwyrm/migrations/0074_auto_20210511_1651.py b/bookwyrm/migrations/0074_auto_20210511_1829.py
similarity index 60%
rename from bookwyrm/migrations/0074_auto_20210511_1651.py
rename to bookwyrm/migrations/0074_auto_20210511_1829.py
index 51e9e09c..287a51ad 100644
--- a/bookwyrm/migrations/0074_auto_20210511_1651.py
+++ b/bookwyrm/migrations/0074_auto_20210511_1829.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.2 on 2021-05-11 16:51
+# Generated by Django 3.2 on 2021-05-11 18:29
 
 from django.db import migrations, models
 
@@ -31,4 +31,18 @@ class Migration(migrations.Migration):
             name="active",
             field=models.BooleanField(default=True),
         ),
+        migrations.AddField(
+            model_name="connector",
+            name="deactivation_reason",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("self_deletion", "Self Deletion"),
+                    ("moderator_deletion", "Moderator Deletion"),
+                    ("domain_block", "Domain Block"),
+                ],
+                max_length=255,
+                null=True,
+            ),
+        ),
     ]
diff --git a/bookwyrm/models/base_model.py b/bookwyrm/models/base_model.py
index e85ff733..2cb7c036 100644
--- a/bookwyrm/models/base_model.py
+++ b/bookwyrm/models/base_model.py
@@ -6,6 +6,16 @@ from bookwyrm.settings import DOMAIN
 from .fields import RemoteIdField
 
 
+DeactivationReason = models.TextChoices(
+    "DeactivationReason",
+    [
+        "self_deletion",
+        "moderator_deletion",
+        "domain_block",
+    ],
+)
+
+
 class BookWyrmModel(models.Model):
     """shared fields"""
 
diff --git a/bookwyrm/models/connector.py b/bookwyrm/models/connector.py
index 4debcc3d..2d671790 100644
--- a/bookwyrm/models/connector.py
+++ b/bookwyrm/models/connector.py
@@ -2,7 +2,7 @@
 from django.db import models
 from bookwyrm.connectors.settings import CONNECTORS
 
-from .base_model import BookWyrmModel
+from .base_model import BookWyrmModel, DeactivationReason
 
 
 ConnectorFiles = models.TextChoices("ConnectorFiles", CONNECTORS)
@@ -18,6 +18,9 @@ class Connector(BookWyrmModel):
     connector_file = models.CharField(max_length=255, choices=ConnectorFiles.choices)
     api_key = models.CharField(max_length=255, null=True, blank=True)
     active = models.BooleanField(default=True)
+    deactivation_reason = models.CharField(
+        max_length=255, choices=DeactivationReason.choices, null=True, blank=True
+    )
 
     base_url = models.CharField(max_length=255)
     books_url = models.CharField(max_length=255)
diff --git a/bookwyrm/models/federated_server.py b/bookwyrm/models/federated_server.py
index 7d446ca0..86635ab0 100644
--- a/bookwyrm/models/federated_server.py
+++ b/bookwyrm/models/federated_server.py
@@ -1,5 +1,6 @@
 """ connections to external ActivityPub servers """
 from urllib.parse import urlparse
+from django.apps import apps
 from django.db import models
 from .base_model import BookWyrmModel
 
@@ -34,6 +35,13 @@ class FederatedServer(BookWyrmModel):
             is_active=False, deactivation_reason="domain_block"
         )
 
+        # check for related connectors
+        if self.application_type == "bookwyrm":
+            connector_model = apps.get_model("bookwyrm.Connector", require_read=True)
+            connector_model.objects.filter(
+                identifier=self.server_name, active=True
+            ).update(active=False, deactivation_reason="domain_block")
+
     def unblock(self):
         """unblock a server"""
         self.status = "federated"
@@ -43,6 +51,15 @@ class FederatedServer(BookWyrmModel):
             is_active=True, deactivation_reason=None
         )
 
+        # check for related connectors
+        if self.application_type == "bookwyrm":
+            connector_model = apps.get_model("bookwyrm.Connector", require_read=True)
+            connector_model.objects.filter(
+                identifier=self.server_name,
+                active=False,
+                deactivation_reason="domain_block",
+            ).update(active=True, deactivation_reason=None)
+
     @classmethod
     def is_blocked(cls, url):
         """look up if a domain is blocked"""
diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 5f0e64e3..7d821c5b 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -19,21 +19,11 @@ from bookwyrm.signatures import create_key_pair
 from bookwyrm.tasks import app
 from bookwyrm.utils import regex
 from .activitypub_mixin import OrderedCollectionPageMixin, ActivitypubMixin
-from .base_model import BookWyrmModel
+from .base_model import BookWyrmModel, DeactivationReason
 from .federated_server import FederatedServer
 from . import fields, Review
 
 
-DeactivationReason = models.TextChoices(
-    "DeactivationReason",
-    [
-        "self_deletion",
-        "moderator_deletion",
-        "domain_block",
-    ],
-)
-
-
 class User(OrderedCollectionPageMixin, AbstractUser):
     """a user who wants to read books"""
 

From 9b42bba236d6ce1db6b6598084eb3a15cf8dc71b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 11 May 2021 11:34:58 -0700
Subject: [PATCH 1125/1285] Filter out inactive connectors

---
 bookwyrm/connectors/connector_manager.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/connectors/connector_manager.py b/bookwyrm/connectors/connector_manager.py
index 43489669..95c5959d 100644
--- a/bookwyrm/connectors/connector_manager.py
+++ b/bookwyrm/connectors/connector_manager.py
@@ -87,7 +87,7 @@ def first_search_result(query, min_confidence=0.1):
 
 def get_connectors():
     """load all connectors"""
-    for info in models.Connector.objects.order_by("priority").all():
+    for info in models.Connector.objects.filter(active=True).order_by("priority").all():
         yield load_connector(info)
 
 

From d7a8dd5e197f2570fd231af48eef6bd4c7b2aaf8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 11 May 2021 13:20:17 -0700
Subject: [PATCH 1126/1285] Removes outdated field form abstract connector

---
 bookwyrm/connectors/abstract_connector.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py
index f9496aa0..60667815 100644
--- a/bookwyrm/connectors/abstract_connector.py
+++ b/bookwyrm/connectors/abstract_connector.py
@@ -30,7 +30,6 @@ class AbstractMinimalConnector(ABC):
             "covers_url",
             "search_url",
             "isbn_search_url",
-            "max_query_count",
             "name",
             "identifier",
             "local",

From 1fbd6537b7ed4ed01da0a9d3f4fd605f4eb30524 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 11 May 2021 13:28:52 -0700
Subject: [PATCH 1127/1285] Remove unnecessary tags from import page

---
 bookwyrm/templates/import_status.html | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/templates/import_status.html b/bookwyrm/templates/import_status.html
index e06392a8..b1145611 100644
--- a/bookwyrm/templates/import_status.html
+++ b/bookwyrm/templates/import_status.html
@@ -1,6 +1,5 @@
 {% extends 'layout.html' %}
 {% load i18n %}
-{% load bookwyrm_tags %}
 {% load humanize %}
 
 {% block title %}{% trans "Import Status" %}{% endblock %}
@@ -54,8 +53,8 @@
                     <input class="checkbox" type="checkbox" name="import_item" value="{{ item.id }}" id="import-item-{{ item.id }}">
                     <label for="import-item-{{ item.id }}">
                         Line {{ item.index }}:
-                        <strong>{{ item.data|dict_key:'Title' }}</strong> by
-                        {{ item.data|dict_key:'Author' }}
+                        <strong>{{ item.data.Title }}</strong> by
+                        {{ item.data.Author }}
                     </label>
                     <p>
                         {{ item.fail_reason }}.
@@ -90,8 +89,8 @@
             <li class="pb-1">
                 <p>
                     Line {{ item.index }}:
-                    <strong>{{ item.data|dict_key:'Title' }}</strong> by
-                    {{ item.data|dict_key:'Author' }}
+                    <strong>{{ item.data.Title }}</strong> by
+                    {{ item.data.Author }}
                 </p>
                 <p>
                     {{ item.fail_reason }}.
@@ -130,10 +129,10 @@
                 {% endif %}
             </td>
             <td>
-                {{ item.data|dict_key:'Title' }}
+                {{ item.data.Title }}
             </td>
             <td>
-                {{ item.data|dict_key:'Author' }}
+                {{ item.data.Author }}
             </td>
             <td>
                 {% if item.book %}

From 63172ecf0015ee0f8c9aef395fd3793d1af6e9ed Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 11 May 2021 13:54:38 -0700
Subject: [PATCH 1128/1285] Fixes ratings on shelf pages

---
 bookwyrm/templates/user/shelf/shelf.html |  8 +++++---
 bookwyrm/views/shelf.py                  | 20 ++++++++++++++++----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/templates/user/shelf/shelf.html b/bookwyrm/templates/user/shelf/shelf.html
index 639ab502..86610629 100644
--- a/bookwyrm/templates/user/shelf/shelf.html
+++ b/bookwyrm/templates/user/shelf/shelf.html
@@ -79,7 +79,9 @@
                     <th>{% trans "Shelved" %}</th>
                     <th>{% trans "Started" %}</th>
                     <th>{% trans "Finished" %}</th>
-                    {% if ratings %}<th>{% trans "Rating" %}</th>{% endif %}
+                    {% if request.user.is_authenticated %}
+                    <th>{% trans "Rating" %}</th>
+                    {% endif %}
                     {% if shelf.user == request.user %}
                     <th aria-hidden="true"></th>
                     {% endif %}
@@ -108,9 +110,9 @@
                     <td data-title="{% trans "Finished" %}">
                         {{ read_through.finish_date | naturalday |default_if_none:""}}
                     </td>
-                    {% if ratings %}
+                    {% if request.user.is_authenticated %}
                     <td data-title="{% trans "Rating" %}">
-                        {% include 'snippets/stars.html' with rating=ratings|dict_key:book.id %}
+                        {% include 'snippets/stars.html' with rating=book.rating %}
                     </td>
                     {% endif %}
                     {% if shelf.user == request.user %}
diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index 5312ac21..758e290e 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -2,6 +2,7 @@
 from collections import namedtuple
 
 from django.db import IntegrityError
+from django.db.models import Count, OuterRef, Subquery, F, Q
 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
 from django.http import HttpResponseBadRequest, HttpResponseNotFound
@@ -37,30 +38,41 @@ class Shelf(View):
                 return HttpResponseNotFound()
             if not shelf.visible_to_user(request.user):
                 return HttpResponseNotFound()
+            books = shelf.books
         # this is a constructed "all books" view, with a fake "shelf" obj
         else:
             FakeShelf = namedtuple(
                 "Shelf", ("identifier", "name", "user", "books", "privacy")
             )
             books = models.Edition.objects.filter(
+                # privacy is ensured because the shelves are already filtered above
                 shelfbook__shelf__in=shelves.all()
             ).distinct()
             shelf = FakeShelf("all", _("All books"), user, books, "public")
 
-        is_self = request.user == user
-
         if is_api_request(request):
             return ActivitypubResponse(shelf.to_activity(**request.GET))
 
+        reviews = privacy_filter(
+            request.user,
+            models.Review.objects.filter(
+                user=user,
+                rating__isnull=False,
+                book__id=OuterRef("id"),
+            ),
+        ).order_by("-published_date")
+
+        books = books.annotate(rating=Subquery(reviews.values("rating")[:1]))
+
         paginated = Paginator(
-            shelf.books.order_by("-updated_date"),
+            books.order_by("-updated_date"),
             PAGE_LENGTH,
         )
 
         page = paginated.get_page(request.GET.get("page"))
         data = {
             "user": user,
-            "is_self": is_self,
+            "is_self": request.user == user,
             "shelves": shelves.all(),
             "shelf": shelf,
             "books": page,

From 04cc2fb3f31ae557328dfaf660fc41a722ad746d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 11 May 2021 13:55:46 -0700
Subject: [PATCH 1129/1285] Removes unused dict_key filter

---
 bookwyrm/templatetags/bookwyrm_tags.py | 6 ------
 bookwyrm/tests/test_templatetags.py    | 7 -------
 2 files changed, 13 deletions(-)

diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index eda3d102..caab30a8 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -11,12 +11,6 @@ from bookwyrm.views.status import to_markdown
 register = template.Library()
 
 
-@register.filter(name="dict_key")
-def dict_key(d, k):
-    """Returns the given key from a dictionary."""
-    return d.get(k) or 0
-
-
 @register.filter(name="rating")
 def get_rating(book, user):
     """get the overall rating of a book"""
diff --git a/bookwyrm/tests/test_templatetags.py b/bookwyrm/tests/test_templatetags.py
index a92e887a..1c05e992 100644
--- a/bookwyrm/tests/test_templatetags.py
+++ b/bookwyrm/tests/test_templatetags.py
@@ -2,7 +2,6 @@
 import re
 from unittest.mock import patch
 
-from dateutil.relativedelta import relativedelta
 from django.test import TestCase
 from django.utils import timezone
 
@@ -33,12 +32,6 @@ class TemplateTags(TestCase):
             )
         self.book = models.Edition.objects.create(title="Test Book")
 
-    def test_dict_key(self, _):
-        """just getting a value out of a dict"""
-        test_dict = {"a": 1, "b": 3}
-        self.assertEqual(bookwyrm_tags.dict_key(test_dict, "a"), 1)
-        self.assertEqual(bookwyrm_tags.dict_key(test_dict, "c"), 0)
-
     def test_get_user_rating(self, _):
         """get a user's most recent rating of a book"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):

From 3de8ae00aed608c656e888875a570ef0b6cea4ab Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 11 May 2021 14:00:23 -0700
Subject: [PATCH 1130/1285] Removes unused templatetag

---
 bookwyrm/templatetags/bookwyrm_tags.py |  6 ------
 bookwyrm/tests/test_templatetags.py    | 13 -------------
 2 files changed, 19 deletions(-)

diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index caab30a8..fa2998e6 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -43,12 +43,6 @@ def get_user_identifier(user):
     return user.localname if user.localname else user.username
 
 
-@register.filter(name="notification_count")
-def get_notification_count(user):
-    """how many UNREAD notifications are there"""
-    return user.notification_set.filter(read=False).count()
-
-
 @register.filter(name="replies")
 def get_replies(status):
     """get all direct replies to a status"""
diff --git a/bookwyrm/tests/test_templatetags.py b/bookwyrm/tests/test_templatetags.py
index 1c05e992..df4df671 100644
--- a/bookwyrm/tests/test_templatetags.py
+++ b/bookwyrm/tests/test_templatetags.py
@@ -53,19 +53,6 @@ class TemplateTags(TestCase):
             bookwyrm_tags.get_user_identifier(self.remote_user), "rat@example.com"
         )
 
-    def test_get_notification_count(self, _):
-        """just countin'"""
-        self.assertEqual(bookwyrm_tags.get_notification_count(self.user), 0)
-
-        models.Notification.objects.create(user=self.user, notification_type="FAVORITE")
-        models.Notification.objects.create(user=self.user, notification_type="MENTION")
-
-        models.Notification.objects.create(
-            user=self.remote_user, notification_type="FOLLOW"
-        )
-
-        self.assertEqual(bookwyrm_tags.get_notification_count(self.user), 2)
-
     def test_get_replies(self, _):
         """direct replies to a status"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):

From f5eb5f982ab1d32c5388cf5651876a36d181f8d2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 11 May 2021 14:04:45 -0700
Subject: [PATCH 1131/1285] Removes filter for checking for follow requests

---
 .../snippets/follow_request_buttons.html       |  3 +--
 bookwyrm/templatetags/bookwyrm_tags.py         | 13 -------------
 bookwyrm/tests/test_templatetags.py            | 18 ------------------
 3 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/bookwyrm/templates/snippets/follow_request_buttons.html b/bookwyrm/templates/snippets/follow_request_buttons.html
index 42e69153..d9101802 100644
--- a/bookwyrm/templates/snippets/follow_request_buttons.html
+++ b/bookwyrm/templates/snippets/follow_request_buttons.html
@@ -1,6 +1,5 @@
 {% load i18n %}
-{% load bookwyrm_tags %}
-{% if request.user|follow_request_exists:user %}
+{% if request.user in user.follow_requests.all %}
 <div class="field is-grouped">
     <form action="/accept-follow-request/" method="POST">
         {% csrf_token %}
diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index fa2998e6..81019fe5 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -79,19 +79,6 @@ def get_user_boosted(user, status):
     return user.id in status.boosters.all().values_list("user", flat=True)
 
 
-@register.filter(name="follow_request_exists")
-def follow_request_exists(user, requester):
-    """see if there is a pending follow request for a user"""
-    try:
-        models.UserFollowRequest.objects.filter(
-            user_subject=requester,
-            user_object=user,
-        ).get()
-        return True
-    except models.UserFollowRequest.DoesNotExist:
-        return False
-
-
 @register.filter(name="boosted_status")
 def get_boosted(boost):
     """load a boosted status. have to do this or it wont get foregin keys"""
diff --git a/bookwyrm/tests/test_templatetags.py b/bookwyrm/tests/test_templatetags.py
index df4df671..3e2ecf37 100644
--- a/bookwyrm/tests/test_templatetags.py
+++ b/bookwyrm/tests/test_templatetags.py
@@ -113,24 +113,6 @@ class TemplateTags(TestCase):
             models.Boost.objects.create(user=self.user, boosted_status=status)
         self.assertTrue(bookwyrm_tags.get_user_boosted(self.user, status))
 
-    def test_follow_request_exists(self, _):
-        """does a user want to follow"""
-        self.assertFalse(
-            bookwyrm_tags.follow_request_exists(self.user, self.remote_user)
-        )
-
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            models.UserFollowRequest.objects.create(
-                user_subject=self.user, user_object=self.remote_user
-            )
-
-        self.assertFalse(
-            bookwyrm_tags.follow_request_exists(self.user, self.remote_user)
-        )
-        self.assertTrue(
-            bookwyrm_tags.follow_request_exists(self.remote_user, self.user)
-        )
-
     def test_get_boosted(self, _):
         """load a boosted status"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):

From acd26012bea564850bda7cf9c1b1a67b7be592f1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 11 May 2021 14:12:28 -0700
Subject: [PATCH 1132/1285] Removes more unused filters

---
 bookwyrm/templatetags/bookwyrm_tags.py | 31 ++------------------------
 bookwyrm/tests/test_templatetags.py    | 25 ---------------------
 2 files changed, 2 insertions(+), 54 deletions(-)

diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index 81019fe5..c992b9e5 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -81,11 +81,9 @@ def get_user_boosted(user, status):
 
 @register.filter(name="boosted_status")
 def get_boosted(boost):
-    """load a boosted status. have to do this or it wont get foregin keys"""
+    """load a boosted status. have to do this or it won't get foreign keys"""
     return (
-        models.Status.objects.select_subclasses()
-        .filter(id=boost.boosted_status.id)
-        .get()
+        models.Status.objects.select_subclasses().get(id=boost.boosted_status.id)
     )
 
 
@@ -118,19 +116,6 @@ def get_mentions(status, user):
     )
 
 
-@register.filter(name="status_preview_name")
-def get_status_preview_name(obj):
-    """text snippet with book context for a status"""
-    name = obj.__class__.__name__.lower()
-    if name == "review":
-        return "%s of <em>%s</em>" % (name, obj.book.title)
-    if name == "comment":
-        return "%s on <em>%s</em>" % (name, obj.book.title)
-    if name == "quotation":
-        return "%s from <em>%s</em>" % (name, obj.book.title)
-    return name
-
-
 @register.filter(name="next_shelf")
 def get_next_shelf(current_shelf):
     """shelf you'd use to update reading progress"""
@@ -187,18 +172,6 @@ def latest_read_through(book, user):
     )
 
 
-@register.simple_tag(takes_context=False)
-def active_read_through(book, user):
-    """the most recent read activity"""
-    return (
-        models.ReadThrough.objects.filter(
-            user=user, book=book, finish_date__isnull=True
-        )
-        .order_by("-start_date")
-        .first()
-    )
-
-
 @register.simple_tag(takes_context=False)
 def comparison_bool(str1, str2):
     """idk why I need to write a tag for this, it reutrns a bool"""
diff --git a/bookwyrm/tests/test_templatetags.py b/bookwyrm/tests/test_templatetags.py
index 3e2ecf37..3b782fd5 100644
--- a/bookwyrm/tests/test_templatetags.py
+++ b/bookwyrm/tests/test_templatetags.py
@@ -157,31 +157,6 @@ class TemplateTags(TestCase):
         result = bookwyrm_tags.get_mentions(status, self.user)
         self.assertEqual(result, "@rat@example.com ")
 
-    def test_get_status_preview_name(self, _):
-        """status context string"""
-        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            status = models.Status.objects.create(content="hi", user=self.user)
-            result = bookwyrm_tags.get_status_preview_name(status)
-            self.assertEqual(result, "status")
-
-            status = models.Review.objects.create(
-                content="hi", user=self.user, book=self.book
-            )
-            result = bookwyrm_tags.get_status_preview_name(status)
-            self.assertEqual(result, "review of <em>Test Book</em>")
-
-            status = models.Comment.objects.create(
-                content="hi", user=self.user, book=self.book
-            )
-            result = bookwyrm_tags.get_status_preview_name(status)
-            self.assertEqual(result, "comment on <em>Test Book</em>")
-
-            status = models.Quotation.objects.create(
-                content="hi", user=self.user, book=self.book
-            )
-        result = bookwyrm_tags.get_status_preview_name(status)
-        self.assertEqual(result, "quotation from <em>Test Book</em>")
-
     def test_related_status(self, _):
         """gets the subclass model for a notification status"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):

From eba6159f6868b5a1e19e6eb72758d9d54b9ce420 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 11 May 2021 14:14:22 -0700
Subject: [PATCH 1133/1285] Moves status interaction filters into their own
 module

---
 bookwyrm/templatetags/bookwyrm_tags.py | 16 ----------------
 bookwyrm/templatetags/interaction.py   | 22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+), 16 deletions(-)
 create mode 100644 bookwyrm/templatetags/interaction.py

diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index c992b9e5..719dc9ad 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -63,22 +63,6 @@ def get_parent(status):
     )
 
 
-@register.filter(name="liked")
-def get_user_liked(user, status):
-    """did the given user fav a status?"""
-    try:
-        models.Favorite.objects.get(user=user, status=status)
-        return True
-    except models.Favorite.DoesNotExist:
-        return False
-
-
-@register.filter(name="boosted")
-def get_user_boosted(user, status):
-    """did the given user fav a status?"""
-    return user.id in status.boosters.all().values_list("user", flat=True)
-
-
 @register.filter(name="boosted_status")
 def get_boosted(boost):
     """load a boosted status. have to do this or it won't get foreign keys"""
diff --git a/bookwyrm/templatetags/interaction.py b/bookwyrm/templatetags/interaction.py
new file mode 100644
index 00000000..6e8d0549
--- /dev/null
+++ b/bookwyrm/templatetags/interaction.py
@@ -0,0 +1,22 @@
+""" template filters for status interaction buttons """
+from django import template
+from bookwyrm import models
+
+
+register = template.Library()
+
+
+@register.filter(name="liked")
+def get_user_liked(user, status):
+    """did the given user fav a status?"""
+    try:
+        models.Favorite.objects.get(user=user, status=status)
+        return True
+    except models.Favorite.DoesNotExist:
+        return False
+
+
+@register.filter(name="boosted")
+def get_user_boosted(user, status):
+    """did the given user fav a status?"""
+    return user.id in status.boosters.all().values_list("user", flat=True)

From 58da17d69411806249446bd4aff734920fb746ac Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 11 May 2021 14:41:28 -0700
Subject: [PATCH 1134/1285] Use smaller templatetag modules

---
 bookwyrm/templates/components/dropdown.html   |  2 +-
 bookwyrm/templates/feed/suggested_users.html  |  2 +-
 bookwyrm/templates/layout.html                |  2 +-
 bookwyrm/templates/snippets/boost_button.html |  3 +-
 .../templates/snippets/create_status.html     |  2 +-
 .../snippets/create_status_form.html          |  2 +
 bookwyrm/templates/snippets/fav_button.html   |  4 +-
 .../templates/snippets/privacy_select.html    |  2 +-
 .../templates/snippets/report_button.html     |  3 +-
 .../snippets/shelve_button/shelve_button.html |  1 +
 .../shelve_button/shelve_button_options.html  |  2 +
 .../templates/snippets/status/layout.html     |  3 +-
 .../snippets/status/status_options.html       |  2 +-
 bookwyrm/templates/snippets/trimmed_text.html |  1 +
 bookwyrm/templatetags/bookwyrm_tags.py        | 41 +------------------
 bookwyrm/templatetags/layout.py               | 12 ++++++
 bookwyrm/templatetags/utilities.py            | 35 ++++++++++++++++
 17 files changed, 69 insertions(+), 50 deletions(-)
 create mode 100644 bookwyrm/templatetags/layout.py
 create mode 100644 bookwyrm/templatetags/utilities.py

diff --git a/bookwyrm/templates/components/dropdown.html b/bookwyrm/templates/components/dropdown.html
index 96dce823..35caa55b 100644
--- a/bookwyrm/templates/components/dropdown.html
+++ b/bookwyrm/templates/components/dropdown.html
@@ -1,5 +1,5 @@
 {% spaceless %}
-{% load bookwyrm_tags %}
+{% load utilities %}
 
 {% with 0|uuid as uuid %}
 <div
diff --git a/bookwyrm/templates/feed/suggested_users.html b/bookwyrm/templates/feed/suggested_users.html
index 721ba3d9..eb146f7e 100644
--- a/bookwyrm/templates/feed/suggested_users.html
+++ b/bookwyrm/templates/feed/suggested_users.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-{% load bookwyrm_tags %}
+{% load utilities %}
 {% load humanize %}
 <div class="columns is-mobile scroll-x mb-0">
     {% for user in suggested_users %}
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index bc654401..becf7781 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -1,4 +1,4 @@
-{% load bookwyrm_tags %}
+{% load layout %}
 {% load i18n %}
 <!DOCTYPE html>
 <html lang="{% get_lang %}">
diff --git a/bookwyrm/templates/snippets/boost_button.html b/bookwyrm/templates/snippets/boost_button.html
index 3a01fc82..5b84ea44 100644
--- a/bookwyrm/templates/snippets/boost_button.html
+++ b/bookwyrm/templates/snippets/boost_button.html
@@ -1,4 +1,5 @@
-{% load bookwyrm_tags %}
+{% load interaction %}
+{% load utilities %}
 {% load i18n %}
 
 {% with status.id|uuid as uuid %}
diff --git a/bookwyrm/templates/snippets/create_status.html b/bookwyrm/templates/snippets/create_status.html
index 7dee4b70..b1a8e846 100644
--- a/bookwyrm/templates/snippets/create_status.html
+++ b/bookwyrm/templates/snippets/create_status.html
@@ -1,6 +1,6 @@
 {% load humanize %}
 {% load i18n %}
-{% load bookwyrm_tags %}
+{% load utilities %}
 
 {% with status_type=request.GET.status_type %}
 <div class="tab-group">
diff --git a/bookwyrm/templates/snippets/create_status_form.html b/bookwyrm/templates/snippets/create_status_form.html
index f6021622..ca9cb5b4 100644
--- a/bookwyrm/templates/snippets/create_status_form.html
+++ b/bookwyrm/templates/snippets/create_status_form.html
@@ -1,4 +1,6 @@
 {% load bookwyrm_tags %}
+{% load utilities %}
+
 {% load i18n %}
 <form class="is-flex-grow-1" name="{{ type }}" action="/post/{% if type == 'direct' %}status{% else %}{{ type }}{% endif %}" method="post" id="tab-{{ type }}-{{ book.id }}{{ reply_parent.id }}">
     {% csrf_token %}
diff --git a/bookwyrm/templates/snippets/fav_button.html b/bookwyrm/templates/snippets/fav_button.html
index cd22822a..40fa2d25 100644
--- a/bookwyrm/templates/snippets/fav_button.html
+++ b/bookwyrm/templates/snippets/fav_button.html
@@ -1,5 +1,7 @@
-{% load bookwyrm_tags %}
+{% load interaction %}
+{% load utilities %}
 {% load i18n %}
+
 {% with status.id|uuid as uuid %}
 <form name="favorite" action="/favorite/{{ status.id }}" method="POST" class="interaction fav-{{ status.id }}-{{ uuid }} {% if request.user|liked:status %}is-hidden{% endif %}" data-id="fav-{{ status.id }}-{{ uuid }}">
     {% csrf_token %}
diff --git a/bookwyrm/templates/snippets/privacy_select.html b/bookwyrm/templates/snippets/privacy_select.html
index e8008509..f6959de5 100644
--- a/bookwyrm/templates/snippets/privacy_select.html
+++ b/bookwyrm/templates/snippets/privacy_select.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-{% load bookwyrm_tags %}
+{% load utilities %}
 <div class="select {{ class }}">
     {% with 0|uuid as uuid %}
     {% if not no_label %}
diff --git a/bookwyrm/templates/snippets/report_button.html b/bookwyrm/templates/snippets/report_button.html
index 2fa0a3f3..19414c16 100644
--- a/bookwyrm/templates/snippets/report_button.html
+++ b/bookwyrm/templates/snippets/report_button.html
@@ -1,5 +1,6 @@
 {% load i18n %}
-{% load bookwyrm_tags %}
+{% load utilities %}
+
 {% with 0|uuid as report_uuid %}
 
 {% trans "Report" as button_text %}
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button.html b/bookwyrm/templates/snippets/shelve_button/shelve_button.html
index dc07fb64..754907c2 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button.html
@@ -1,4 +1,5 @@
 {% load bookwyrm_tags %}
+{% load utilities %}
 {% if request.user.is_authenticated %}
 
 {% with book.id|uuid as uuid %}
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
index 1eaa2463..1ce10e7c 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
@@ -1,5 +1,7 @@
 {% load bookwyrm_tags %}
+{% load utilities %}
 {% load i18n %}
+
 {% for shelf in shelves %}
 {% comparison_bool shelf.identifier active_shelf.shelf.identifier as is_current %}
 {% if dropdown %}<li role="menuitem" class="dropdown-item p-0">{% endif %}
diff --git a/bookwyrm/templates/snippets/status/layout.html b/bookwyrm/templates/snippets/status/layout.html
index ddbd6f20..6fd7ebde 100644
--- a/bookwyrm/templates/snippets/status/layout.html
+++ b/bookwyrm/templates/snippets/status/layout.html
@@ -1,7 +1,6 @@
 {% extends 'components/card.html' %}
 {% load i18n %}
-{% load bookwyrm_tags %}
-{% load humanize %}
+{% load utilities %}
 
 {% block card-header %}
 <div class="card-header-title has-background-white-ter is-block">
diff --git a/bookwyrm/templates/snippets/status/status_options.html b/bookwyrm/templates/snippets/status/status_options.html
index 549039b7..1b2c5695 100644
--- a/bookwyrm/templates/snippets/status/status_options.html
+++ b/bookwyrm/templates/snippets/status/status_options.html
@@ -1,6 +1,6 @@
 {% extends 'components/dropdown.html' %}
 {% load i18n %}
-{% load bookwyrm_tags %}
+{% load utilities %}
 
 {% block dropdown-trigger %}
 <span class="icon icon-dots-three m-0-mobile"></span>
diff --git a/bookwyrm/templates/snippets/trimmed_text.html b/bookwyrm/templates/snippets/trimmed_text.html
index 0dd19e6e..6e222e97 100644
--- a/bookwyrm/templates/snippets/trimmed_text.html
+++ b/bookwyrm/templates/snippets/trimmed_text.html
@@ -1,4 +1,5 @@
 {% load bookwyrm_tags %}
+{% load utilities %}
 {% load i18n %}
 
 {% with 0|uuid as uuid %}
diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index 719dc9ad..db9335e8 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -1,11 +1,10 @@
 """ template filters """
-from uuid import uuid4
-
-from django import template, utils
+from django import template
 from django.db.models import Avg
 
 from bookwyrm import models, views
 from bookwyrm.views.status import to_markdown
+from bookwyrm.templatetags.utilities import get_user_identifier
 
 
 register = template.Library()
@@ -37,12 +36,6 @@ def get_user_rating(book, user):
     return 0
 
 
-@register.filter(name="username")
-def get_user_identifier(user):
-    """use localname for local users, username for remote"""
-    return user.localname if user.localname else user.username
-
-
 @register.filter(name="replies")
 def get_replies(status):
     """get all direct replies to a status"""
@@ -77,12 +70,6 @@ def get_book_description(book):
     return book.description or book.parent_work.description
 
 
-@register.filter(name="uuid")
-def get_uuid(identifier):
-    """for avoiding clashing ids when there are many forms"""
-    return "%s%s" % (identifier, uuid4())
-
-
 @register.filter(name="to_markdown")
 def get_markdown(content):
     """convert markdown to html"""
@@ -112,17 +99,6 @@ def get_next_shelf(current_shelf):
     return "to-read"
 
 
-@register.filter(name="title")
-def get_title(book):
-    """display the subtitle if the title is short"""
-    if not book:
-        return ""
-    title = book.title
-    if len(title) < 6 and book.subtitle:
-        title = "{:s}: {:s}".format(title, book.subtitle)
-    return title
-
-
 @register.simple_tag(takes_context=False)
 def related_status(notification):
     """for notifications"""
@@ -156,19 +132,6 @@ def latest_read_through(book, user):
     )
 
 
-@register.simple_tag(takes_context=False)
-def comparison_bool(str1, str2):
-    """idk why I need to write a tag for this, it reutrns a bool"""
-    return str1 == str2
-
-
-@register.simple_tag(takes_context=False)
-def get_lang():
-    """get current language, strip to the first two letters"""
-    language = utils.translation.get_language()
-    return language[0 : language.find("-")]
-
-
 @register.simple_tag(takes_context=True)
 def mutuals_count(context, user):
     """how many users that you follow, follow them"""
diff --git a/bookwyrm/templatetags/layout.py b/bookwyrm/templatetags/layout.py
new file mode 100644
index 00000000..e0f1d8ba
--- /dev/null
+++ b/bookwyrm/templatetags/layout.py
@@ -0,0 +1,12 @@
+""" template filters used for creating the layout"""
+from django import template, utils
+
+
+register = template.Library()
+
+
+@register.simple_tag(takes_context=False)
+def get_lang():
+    """get current language, strip to the first two letters"""
+    language = utils.translation.get_language()
+    return language[0 : language.find("-")]
diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py
new file mode 100644
index 00000000..f828397e
--- /dev/null
+++ b/bookwyrm/templatetags/utilities.py
@@ -0,0 +1,35 @@
+""" template filters for really common utilities """
+from uuid import uuid4
+from django import template
+
+
+register = template.Library()
+
+
+@register.filter(name="uuid")
+def get_uuid(identifier):
+    """for avoiding clashing ids when there are many forms"""
+    return "%s%s" % (identifier, uuid4())
+
+
+@register.filter(name="username")
+def get_user_identifier(user):
+    """use localname for local users, username for remote"""
+    return user.localname if user.localname else user.username
+
+
+@register.filter(name="title")
+def get_title(book):
+    """display the subtitle if the title is short"""
+    if not book:
+        return ""
+    title = book.title
+    if len(title) < 6 and book.subtitle:
+        title = "{:s}: {:s}".format(title, book.subtitle)
+    return title
+
+
+@register.simple_tag(takes_context=False)
+def comparison_bool(str1, str2):
+    """idk why I need to write a tag for this, it reutrns a bool"""
+    return str1 == str2

From ac2b63d0cd35ae3faedf764b1fa4d074b7ce192f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 11 May 2021 15:14:42 -0700
Subject: [PATCH 1135/1285] More templatetag files

---
 bookwyrm/templates/author/author.html         |  4 +-
 bookwyrm/templates/book/book.html             |  2 +-
 bookwyrm/templates/book/editions.html         |  1 -
 bookwyrm/templates/compose.html               |  2 +-
 bookwyrm/templates/directory/user_card.html   |  5 +-
 .../templates/discover/landing_layout.html    |  8 ++--
 bookwyrm/templates/discover/large-book.html   |  2 +-
 bookwyrm/templates/feed/feed.html             |  3 +-
 bookwyrm/templates/feed/feed_layout.html      |  1 -
 bookwyrm/templates/feed/thread.html           |  2 +-
 bookwyrm/templates/lists/list.html            |  3 +-
 bookwyrm/templates/lists/list_items.html      |  2 +-
 bookwyrm/templates/lists/list_layout.html     |  1 -
 bookwyrm/templates/lists/lists.html           |  2 +-
 bookwyrm/templates/moderation/report.html     |  3 +-
 bookwyrm/templates/notifications.html         |  2 +-
 bookwyrm/templates/search/user.html           |  1 -
 .../templates/settings/federated_server.html  |  5 +-
 bookwyrm/templates/snippets/avatar.html       |  1 -
 bookwyrm/templates/snippets/book_cover.html   |  1 -
 bookwyrm/templates/snippets/book_titleby.html |  2 +-
 .../snippets/create_status_form.html          |  1 +
 .../templates/snippets/form_rate_stars.html   |  1 -
 .../snippets/shelve_button/shelve_button.html |  1 +
 .../snippets/status/content_status.html       |  1 +
 .../snippets/status/generated_status.html     |  1 +
 .../templates/snippets/status/status.html     |  3 +-
 .../snippets/status/status_header.html        |  5 +-
 bookwyrm/templates/snippets/trimmed_text.html |  2 +-
 bookwyrm/templates/snippets/user_options.html |  2 +-
 bookwyrm/templates/user/layout.html           |  5 +-
 .../templates/user/relationships/layout.html  |  2 +-
 bookwyrm/templates/user/shelf/shelf.html      |  8 ++--
 bookwyrm/templates/user/user.html             |  2 +-
 bookwyrm/templates/user/user_preview.html     |  1 +
 bookwyrm/templates/user_admin/user.html       |  2 -
 bookwyrm/templates/user_admin/user_info.html  |  4 +-
 bookwyrm/templatetags/bookwyrm_tags.py        | 45 ------------------
 bookwyrm/templatetags/markdown.py             | 14 ++++++
 bookwyrm/templatetags/status_display.py       | 46 +++++++++++++++++++
 40 files changed, 107 insertions(+), 92 deletions(-)
 create mode 100644 bookwyrm/templatetags/markdown.py
 create mode 100644 bookwyrm/templatetags/status_display.py

diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html
index d342da47..56e9ce54 100644
--- a/bookwyrm/templates/author/author.html
+++ b/bookwyrm/templates/author/author.html
@@ -1,6 +1,6 @@
 {% extends 'layout.html' %}
 {% load i18n %}
-{% load bookwyrm_tags %}
+{% load markdown %}
 {% load humanize %}
 
 {% block title %}{{ author.name }}{% endblock %}
@@ -66,7 +66,7 @@
     {% endif %}
     <div class="column">
         {% if author.bio %}
-            {{ author.bio | to_markdown | safe }}
+            {{ author.bio|to_markdown|safe }}
         {% endif %}
     </div>
 </div>
diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index 40da6486..8f167528 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -257,7 +257,7 @@
                                             {% include 'snippets/stars.html' with rating=rating.rating %}
                                         </div>
                                         <div>
-                                            <a href="{{ rating.remote_id }}">{{ rating.published_date | naturaltime }}</a>
+                                            <a href="{{ rating.remote_id }}">{{ rating.published_date|naturaltime }}</a>
                                         </div>
                                     </div>
                                 </div>
diff --git a/bookwyrm/templates/book/editions.html b/bookwyrm/templates/book/editions.html
index 775b05c8..17d5474c 100644
--- a/bookwyrm/templates/book/editions.html
+++ b/bookwyrm/templates/book/editions.html
@@ -1,6 +1,5 @@
 {% extends 'layout.html' %}
 {% load i18n %}
-{% load bookwyrm_tags %}
 
 {% block title %}{% blocktrans with book_title=work.title %}Editions of {{ book_title }}{% endblocktrans %}{% endblock %}
 
diff --git a/bookwyrm/templates/compose.html b/bookwyrm/templates/compose.html
index 0f609cf7..1b6aa735 100644
--- a/bookwyrm/templates/compose.html
+++ b/bookwyrm/templates/compose.html
@@ -1,6 +1,6 @@
 {% extends 'layout.html' %}
 {% load i18n %}
-{% load bookwyrm_tags %}
+{% load utilities %}
 
 {% block title %}{% trans "Compose status" %}{% endblock %}
 {% block content %}
diff --git a/bookwyrm/templates/directory/user_card.html b/bookwyrm/templates/directory/user_card.html
index 8e7538c8..c52c1f7a 100644
--- a/bookwyrm/templates/directory/user_card.html
+++ b/bookwyrm/templates/directory/user_card.html
@@ -1,5 +1,6 @@
 {% load i18n %}
-{% load bookwyrm_tags %}
+{% load utilities %}
+{% load markdown %}
 {% load humanize %}
 
 <div class="card is-stretchable">
@@ -19,7 +20,7 @@
 
         <div>
         {% if user.summary %}
-            {{ user.summary | to_markdown | safe | truncatechars_html:40 }}
+            {{ user.summary|to_markdown|safe|truncatechars_html:40 }}
         {% else %}&nbsp;{% endif %}
         </div>
     </div>
diff --git a/bookwyrm/templates/discover/landing_layout.html b/bookwyrm/templates/discover/landing_layout.html
index 8e507531..946482cb 100644
--- a/bookwyrm/templates/discover/landing_layout.html
+++ b/bookwyrm/templates/discover/landing_layout.html
@@ -1,6 +1,6 @@
 {% extends 'layout.html' %}
 {% load i18n %}
-{% load bookwyrm_tags %}
+{% load markdown %}
 
 {% block title %}{% trans "Welcome" %}{% endblock %}
 
@@ -49,7 +49,7 @@
             {% else %}
 
             <h2 class="title">{% trans "This instance is closed" %}</h2>
-            <p>{{ site.registration_closed_text | safe}}</p>
+            <p>{{ site.registration_closed_text|safe}}</p>
 
             {% if site.allow_invite_requests %}
             {% if request_received %}
@@ -64,7 +64,7 @@
                     <label for="id_request_email" class="label">{% trans "Email address:" %}</label>
                     <input type="email" name="email" maxlength="255" class="input" required="" id="id_request_email">
                     {% for error in request_form.email.errors %}
-                    <p class="help is-danger">{{ error | escape }}</p>
+                    <p class="help is-danger">{{ error|escape }}</p>
                     {% endfor %}
                 </div>
                 <button type="submit" class="button is-link">{% trans "Submit" %}</button>
@@ -80,7 +80,7 @@
             {% include 'user/user_preview.html' with user=request.user %}
             {% if request.user.summary %}
             <div class="box content">
-                {{ request.user.summary | to_markdown | safe }}
+                {{ request.user.summary|to_markdown|safe }}
             </div>
             {% endif %}
         </div>
diff --git a/bookwyrm/templates/discover/large-book.html b/bookwyrm/templates/discover/large-book.html
index 7def6e13..93026991 100644
--- a/bookwyrm/templates/discover/large-book.html
+++ b/bookwyrm/templates/discover/large-book.html
@@ -1,5 +1,5 @@
-
 {% load bookwyrm_tags %}
+{% load markdown %}
 {% load i18n %}
 
 {% if book %}
diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html
index f106b4ce..21e71ae1 100644
--- a/bookwyrm/templates/feed/feed.html
+++ b/bookwyrm/templates/feed/feed.html
@@ -1,7 +1,6 @@
 {% extends 'feed/feed_layout.html' %}
 {% load i18n %}
-{% load bookwyrm_tags %}
-{% load humanize %}
+
 {% block panel %}
 
 <h1 class="title">
diff --git a/bookwyrm/templates/feed/feed_layout.html b/bookwyrm/templates/feed/feed_layout.html
index 75fc1951..3c6b65a1 100644
--- a/bookwyrm/templates/feed/feed_layout.html
+++ b/bookwyrm/templates/feed/feed_layout.html
@@ -1,6 +1,5 @@
 {% extends 'layout.html' %}
 {% load i18n %}
-{% load bookwyrm_tags %}
 
 {% block title %}{% trans "Updates" %}{% endblock %}
 
diff --git a/bookwyrm/templates/feed/thread.html b/bookwyrm/templates/feed/thread.html
index 18ab6ea3..793cddfc 100644
--- a/bookwyrm/templates/feed/thread.html
+++ b/bookwyrm/templates/feed/thread.html
@@ -1,4 +1,4 @@
-{% load bookwyrm_tags %}
+{% load status_display %}
 <div class="block">
 
 {% with depth=depth|add:1 %}
diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index 2902f793..55dc68aa 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -1,12 +1,13 @@
 {% extends 'lists/list_layout.html' %}
 {% load i18n %}
 {% load bookwyrm_tags %}
+{% load markdown %}
 
 {% block panel %}
 {% if request.user == list.user and pending_count %}
 <div class="block content">
     <p>
-        <a href="{% url 'list-curate' list.id %}">{{ pending_count }} book{{ pending_count | pluralize }} awaiting your approval</a>
+        <a href="{% url 'list-curate' list.id %}">{{ pending_count }} book{{ pending_count|pluralize }} awaiting your approval</a>
     </p>
 </div>
 {% endif %}
diff --git a/bookwyrm/templates/lists/list_items.html b/bookwyrm/templates/lists/list_items.html
index b59e2a96..1fdaaca9 100644
--- a/bookwyrm/templates/lists/list_items.html
+++ b/bookwyrm/templates/lists/list_items.html
@@ -1,4 +1,4 @@
-{% load bookwyrm_tags %}
+{% load markdown %}
 <div class="columns is-multiline">
     {% for list in lists %}
     <div class="column is-one-quarter">
diff --git a/bookwyrm/templates/lists/list_layout.html b/bookwyrm/templates/lists/list_layout.html
index c0899c84..de7665e8 100644
--- a/bookwyrm/templates/lists/list_layout.html
+++ b/bookwyrm/templates/lists/list_layout.html
@@ -1,6 +1,5 @@
 {% extends 'layout.html' %}
 {% load i18n %}
-{% load bookwyrm_tags %}
 
 {% block title %}{{ list.name }}{% endblock %}
 
diff --git a/bookwyrm/templates/lists/lists.html b/bookwyrm/templates/lists/lists.html
index a7a54811..d4b0a7c2 100644
--- a/bookwyrm/templates/lists/lists.html
+++ b/bookwyrm/templates/lists/lists.html
@@ -1,5 +1,5 @@
 {% extends 'layout.html' %}
-{% load bookwyrm_tags %}
+{% load utilities %}
 {% load i18n %}
 
 {% block title %}{% trans "Lists" %}{% endblock %}
diff --git a/bookwyrm/templates/moderation/report.html b/bookwyrm/templates/moderation/report.html
index 934799e3..db03850f 100644
--- a/bookwyrm/templates/moderation/report.html
+++ b/bookwyrm/templates/moderation/report.html
@@ -1,6 +1,5 @@
 {% extends 'settings/admin_layout.html' %}
 {% load i18n %}
-{% load bookwyrm_tags %}
 {% load humanize %}
 
 {% block title %}{% blocktrans with report_id=report.id username=report.user.username %}Report #{{ report_id }}: {{ username }}{% endblocktrans %}{% endblock %}
@@ -29,7 +28,7 @@
                 <a href="{{ comment.user.local_path }}">{{ comment.user.display_name }}</a>
             </div>
             <div class="card-footer-item">
-                {{ comment.created_date | naturaltime }}
+                {{ comment.created_date|naturaltime }}
             </div>
         </div>
     </div>
diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html
index ed623b12..a51b2fdb 100644
--- a/bookwyrm/templates/notifications.html
+++ b/bookwyrm/templates/notifications.html
@@ -1,7 +1,7 @@
 {% extends 'layout.html' %}
 {% load i18n %}
-{% load humanize %}
 {% load bookwyrm_tags %}
+{% load humanize %}
 
 {% block title %}{% trans "Notifications" %}{% endblock %}
 
diff --git a/bookwyrm/templates/search/user.html b/bookwyrm/templates/search/user.html
index c6adc613..56bb1bfa 100644
--- a/bookwyrm/templates/search/user.html
+++ b/bookwyrm/templates/search/user.html
@@ -1,5 +1,4 @@
 {% extends 'search/layout.html' %}
-{% load bookwyrm_tags %}
 
 {% block panel %}
 
diff --git a/bookwyrm/templates/settings/federated_server.html b/bookwyrm/templates/settings/federated_server.html
index 386433f3..b300a92d 100644
--- a/bookwyrm/templates/settings/federated_server.html
+++ b/bookwyrm/templates/settings/federated_server.html
@@ -1,7 +1,8 @@
 {% extends 'settings/admin_layout.html' %}
-{% block title %}{{ server.server_name }}{% endblock %}
 {% load i18n %}
-{% load bookwyrm_tags %}
+{% load markdown %}
+
+{% block title %}{{ server.server_name }}{% endblock %}
 
 {% block header %}
 {{ server.server_name }}
diff --git a/bookwyrm/templates/snippets/avatar.html b/bookwyrm/templates/snippets/avatar.html
index d53acf2b..bb37c46d 100644
--- a/bookwyrm/templates/snippets/avatar.html
+++ b/bookwyrm/templates/snippets/avatar.html
@@ -1,3 +1,2 @@
-{% load bookwyrm_tags %}
 <img class="avatar image {% if large %}is-96x96{% elif medium %}is-48x48{% else %}is-32x32{% endif %}" src="{% if user.avatar %}/images/{{ user.avatar }}{% else %}/static/images/default_avi.jpg{% endif %}" {% if ariaHide %}aria-hidden="true"{% endif %} alt="{{ user.alt_text }}">
 
diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index 3c6f212d..f64ec3e4 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -1,6 +1,5 @@
 {% spaceless %}
 
-{% load bookwyrm_tags %}
 {% load i18n %}
 
 <figure
diff --git a/bookwyrm/templates/snippets/book_titleby.html b/bookwyrm/templates/snippets/book_titleby.html
index 80127fb7..76f5f7d6 100644
--- a/bookwyrm/templates/snippets/book_titleby.html
+++ b/bookwyrm/templates/snippets/book_titleby.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-{% load bookwyrm_tags %}
+{% load utilities %}
 {% if book.authors %}
 {% blocktrans with path=book.local_path title=book|title %}<a href="{{ path }}">{{ title }}</a> by {% endblocktrans %}{% include 'snippets/authors.html' with book=book %}
 {% else %}
diff --git a/bookwyrm/templates/snippets/create_status_form.html b/bookwyrm/templates/snippets/create_status_form.html
index ca9cb5b4..5fd91898 100644
--- a/bookwyrm/templates/snippets/create_status_form.html
+++ b/bookwyrm/templates/snippets/create_status_form.html
@@ -1,5 +1,6 @@
 {% load bookwyrm_tags %}
 {% load utilities %}
+{% load status_display %}
 
 {% load i18n %}
 <form class="is-flex-grow-1" name="{{ type }}" action="/post/{% if type == 'direct' %}status{% else %}{{ type }}{% endif %}" method="post" id="tab-{{ type }}-{{ book.id }}{{ reply_parent.id }}">
diff --git a/bookwyrm/templates/snippets/form_rate_stars.html b/bookwyrm/templates/snippets/form_rate_stars.html
index 3abebac0..a53733df 100644
--- a/bookwyrm/templates/snippets/form_rate_stars.html
+++ b/bookwyrm/templates/snippets/form_rate_stars.html
@@ -1,6 +1,5 @@
 {% spaceless %}
 {% load i18n %}
-{% load bookwyrm_tags %}
 
 <div class="
     field is-grouped
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button.html b/bookwyrm/templates/snippets/shelve_button/shelve_button.html
index 754907c2..76ed32a9 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button.html
@@ -1,5 +1,6 @@
 {% load bookwyrm_tags %}
 {% load utilities %}
+
 {% if request.user.is_authenticated %}
 
 {% with book.id|uuid as uuid %}
diff --git a/bookwyrm/templates/snippets/status/content_status.html b/bookwyrm/templates/snippets/status/content_status.html
index 0ba32fa1..39ef9173 100644
--- a/bookwyrm/templates/snippets/status/content_status.html
+++ b/bookwyrm/templates/snippets/status/content_status.html
@@ -1,4 +1,5 @@
 {% load bookwyrm_tags %}
+{% load markdown %}
 {% load i18n %}
 
 {% with status_type=status.status_type %}
diff --git a/bookwyrm/templates/snippets/status/generated_status.html b/bookwyrm/templates/snippets/status/generated_status.html
index 919763f7..71ce2d99 100644
--- a/bookwyrm/templates/snippets/status/generated_status.html
+++ b/bookwyrm/templates/snippets/status/generated_status.html
@@ -1,6 +1,7 @@
 {% spaceless %}
 
 {% load bookwyrm_tags %}
+{% load markdown %}
 {% load i18n %}
 
 {% if not hide_book %}
diff --git a/bookwyrm/templates/snippets/status/status.html b/bookwyrm/templates/snippets/status/status.html
index 10492c48..b0de886c 100644
--- a/bookwyrm/templates/snippets/status/status.html
+++ b/bookwyrm/templates/snippets/status/status.html
@@ -1,5 +1,6 @@
-{% load bookwyrm_tags %}
+{% load status_display %}
 {% load i18n %}
+
 {% if not status.deleted %}
     {% if status.status_type == 'Announce' %}
         <a href="{{ status.user.local_path }}">
diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html
index 605b46cc..b06c6bfc 100644
--- a/bookwyrm/templates/snippets/status/status_header.html
+++ b/bookwyrm/templates/snippets/status/status_header.html
@@ -1,4 +1,5 @@
-{% load bookwyrm_tags %}
+{% load utilities %}
+{% load status_display %}
 {% load i18n %}
 {% load humanize %}
 
@@ -29,7 +30,7 @@
             </span>
 
             {% if status.status_type == 'GeneratedNote' %}
-                {{ status.content | safe }}
+                {{ status.content|safe }}
             {% elif status.status_type == 'Rating' %}
                 {% trans "rated" %}
             {% elif status.status_type == 'Review' %}
diff --git a/bookwyrm/templates/snippets/trimmed_text.html b/bookwyrm/templates/snippets/trimmed_text.html
index 6e222e97..cfffe055 100644
--- a/bookwyrm/templates/snippets/trimmed_text.html
+++ b/bookwyrm/templates/snippets/trimmed_text.html
@@ -1,4 +1,4 @@
-{% load bookwyrm_tags %}
+{% load markdown %}
 {% load utilities %}
 {% load i18n %}
 
diff --git a/bookwyrm/templates/snippets/user_options.html b/bookwyrm/templates/snippets/user_options.html
index 32e83ed2..01cc09bf 100644
--- a/bookwyrm/templates/snippets/user_options.html
+++ b/bookwyrm/templates/snippets/user_options.html
@@ -1,6 +1,6 @@
 {% extends 'components/dropdown.html' %}
 {% load i18n %}
-{% load bookwyrm_tags %}
+{% load utilities %}
 
 {% block dropdown-trigger %}
 <span class="icon icon-dots-three">
diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html
index 661d8078..0830a406 100644
--- a/bookwyrm/templates/user/layout.html
+++ b/bookwyrm/templates/user/layout.html
@@ -1,7 +1,8 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load humanize %}
-{% load bookwyrm_tags %}
+{% load utilities %}
+{% load markdown %}
 
 {% block title %}{{ user.display_name }}{% endblock %}
 
@@ -23,7 +24,7 @@
 
         {% if user.summary %}
         <div class="column box has-background-white-bis content">
-            {{ user.summary | to_markdown | safe }}
+            {{ user.summary|to_markdown|safe }}
         </div>
         {% endif %}
     </div>
diff --git a/bookwyrm/templates/user/relationships/layout.html b/bookwyrm/templates/user/relationships/layout.html
index f36b304c..0348d82f 100644
--- a/bookwyrm/templates/user/relationships/layout.html
+++ b/bookwyrm/templates/user/relationships/layout.html
@@ -1,6 +1,6 @@
 {% extends 'user/layout.html' %}
 {% load i18n %}
-{% load bookwyrm_tags %}
+{% load utilities %}
 
 {% block tabs %}
 {% with user|username as username %}
diff --git a/bookwyrm/templates/user/shelf/shelf.html b/bookwyrm/templates/user/shelf/shelf.html
index 86610629..0f386385 100644
--- a/bookwyrm/templates/user/shelf/shelf.html
+++ b/bookwyrm/templates/user/shelf/shelf.html
@@ -1,5 +1,5 @@
 {% extends 'user/layout.html' %}
-{% load bookwyrm_tags %}
+{% load utilities %}
 {% load humanize %}
 {% load i18n %}
 
@@ -101,14 +101,14 @@
                         {% include 'snippets/authors.html' %}
                     </td>
                     <td data-title="{% trans "Shelved" %}">
-                        {{ book.created_date | naturalday }}
+                        {{ book.created_date|naturalday }}
                     </td>
                     {% latest_read_through book user as read_through %}
                     <td data-title="{% trans "Started" %}">
-                        {{ read_through.start_date | naturalday |default_if_none:""}}
+                        {{ read_through.start_date|naturalday|default_if_none:""}}
                     </td>
                     <td data-title="{% trans "Finished" %}">
-                        {{ read_through.finish_date | naturalday |default_if_none:""}}
+                        {{ read_through.finish_date|naturalday|default_if_none:""}}
                     </td>
                     {% if request.user.is_authenticated %}
                     <td data-title="{% trans "Rating" %}">
diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index 99698575..5afe168a 100644
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -1,6 +1,6 @@
 {% extends 'user/layout.html' %}
 {% load i18n %}
-{% load bookwyrm_tags %}
+{% load utilities %}
 
 {% block title %}{{ user.display_name }}{% endblock %}
 
diff --git a/bookwyrm/templates/user/user_preview.html b/bookwyrm/templates/user/user_preview.html
index c450365b..22d44c87 100644
--- a/bookwyrm/templates/user/user_preview.html
+++ b/bookwyrm/templates/user/user_preview.html
@@ -1,5 +1,6 @@
 {% load i18n %}
 {% load humanize %}
+{% load utilities %}
 {% load bookwyrm_tags %}
 
 <div class="media block">
diff --git a/bookwyrm/templates/user_admin/user.html b/bookwyrm/templates/user_admin/user.html
index 46390650..c79c6971 100644
--- a/bookwyrm/templates/user_admin/user.html
+++ b/bookwyrm/templates/user_admin/user.html
@@ -1,7 +1,5 @@
 {% extends 'settings/admin_layout.html' %}
 {% load i18n %}
-{% load bookwyrm_tags %}
-{% load humanize %}
 
 {% block title %}{{ user.username }}{% endblock %}
 {% block header %}{{ user.username }}{% endblock %}
diff --git a/bookwyrm/templates/user_admin/user_info.html b/bookwyrm/templates/user_admin/user_info.html
index e5f5d580..579b3af7 100644
--- a/bookwyrm/templates/user_admin/user_info.html
+++ b/bookwyrm/templates/user_admin/user_info.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-{% load bookwyrm_tags %}
+{% load markdown %}
 <div class="block columns">
     <div class="column is-flex is-flex-direction-column">
         <h4 class="title is-4">{% trans "User details" %}</h4>
@@ -7,7 +7,7 @@
             {% include 'user/user_preview.html' with user=user %}
             {% if user.summary %}
             <div class="box content has-background-white-ter is-shadowless">
-                {{ user.summary | to_markdown | safe }}
+                {{ user.summary|to_markdown|safe }}
             </div>
             {% endif %}
 
diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index db9335e8..70228799 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -36,57 +36,12 @@ def get_user_rating(book, user):
     return 0
 
 
-@register.filter(name="replies")
-def get_replies(status):
-    """get all direct replies to a status"""
-    # TODO: this limit could cause problems
-    return models.Status.objects.filter(
-        reply_parent=status,
-        deleted=False,
-    ).select_subclasses()[:10]
-
-
-@register.filter(name="parent")
-def get_parent(status):
-    """get the reply parent for a status"""
-    return (
-        models.Status.objects.filter(id=status.reply_parent_id)
-        .select_subclasses()
-        .get()
-    )
-
-
-@register.filter(name="boosted_status")
-def get_boosted(boost):
-    """load a boosted status. have to do this or it won't get foreign keys"""
-    return (
-        models.Status.objects.select_subclasses().get(id=boost.boosted_status.id)
-    )
-
-
 @register.filter(name="book_description")
 def get_book_description(book):
     """use the work's text if the book doesn't have it"""
     return book.description or book.parent_work.description
 
 
-@register.filter(name="to_markdown")
-def get_markdown(content):
-    """convert markdown to html"""
-    if content:
-        return to_markdown(content)
-    return None
-
-
-@register.filter(name="mentions")
-def get_mentions(status, user):
-    """people to @ in a reply: the parent and all mentions"""
-    mentions = set([status.user] + list(status.mention_users.all()))
-    return (
-        " ".join("@" + get_user_identifier(m) for m in mentions if not m == user) + " "
-    )
-
-
 @register.filter(name="next_shelf")
 def get_next_shelf(current_shelf):
     """shelf you'd use to update reading progress"""
diff --git a/bookwyrm/templatetags/markdown.py b/bookwyrm/templatetags/markdown.py
new file mode 100644
index 00000000..370d60a1
--- /dev/null
+++ b/bookwyrm/templatetags/markdown.py
@@ -0,0 +1,14 @@
+""" template filters """
+from django import template
+from bookwyrm.views.status import to_markdown
+
+
+register = template.Library()
+
+
+@register.filter(name="to_markdown")
+def get_markdown(content):
+    """convert markdown to html"""
+    if content:
+        return to_markdown(content)
+    return None
diff --git a/bookwyrm/templatetags/status_display.py b/bookwyrm/templatetags/status_display.py
new file mode 100644
index 00000000..589881bf
--- /dev/null
+++ b/bookwyrm/templatetags/status_display.py
@@ -0,0 +1,46 @@
+""" template filters """
+from django import template
+
+from bookwyrm import models
+from bookwyrm.templatetags.utilities import get_user_identifier
+
+
+register = template.Library()
+
+
+@register.filter(name="mentions")
+def get_mentions(status, user):
+    """people to @ in a reply: the parent and all mentions"""
+    mentions = set([status.user] + list(status.mention_users.all()))
+    return (
+        " ".join("@" + get_user_identifier(m) for m in mentions if not m == user) + " "
+    )
+
+
+
+@register.filter(name="replies")
+def get_replies(status):
+    """get all direct replies to a status"""
+    # TODO: this limit could cause problems
+    return models.Status.objects.filter(
+        reply_parent=status,
+        deleted=False,
+    ).select_subclasses()[:10]
+
+
+@register.filter(name="parent")
+def get_parent(status):
+    """get the reply parent for a status"""
+    return (
+        models.Status.objects.filter(id=status.reply_parent_id)
+        .select_subclasses()
+        .get()
+    )
+
+
+@register.filter(name="boosted_status")
+def get_boosted(boost):
+    """load a boosted status. have to do this or it won't get foreign keys"""
+    return (
+        models.Status.objects.select_subclasses().get(id=boost.boosted_status.id)
+    )

From dbf795be5d785f1464b902850ab9bd2d0c6b4f0b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 11 May 2021 15:16:27 -0700
Subject: [PATCH 1136/1285] Python formatting

---
 bookwyrm/templatetags/status_display.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/bookwyrm/templatetags/status_display.py b/bookwyrm/templatetags/status_display.py
index 589881bf..f39de9e3 100644
--- a/bookwyrm/templatetags/status_display.py
+++ b/bookwyrm/templatetags/status_display.py
@@ -17,7 +17,6 @@ def get_mentions(status, user):
     )
 
 
-
 @register.filter(name="replies")
 def get_replies(status):
     """get all direct replies to a status"""
@@ -41,6 +40,4 @@ def get_parent(status):
 @register.filter(name="boosted_status")
 def get_boosted(boost):
     """load a boosted status. have to do this or it won't get foreign keys"""
-    return (
-        models.Status.objects.select_subclasses().get(id=boost.boosted_status.id)
-    )
+    return models.Status.objects.select_subclasses().get(id=boost.boosted_status.id)

From 87bf863ac656c7326d8d90d145f04f7efbcaba67 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 11 May 2021 15:29:18 -0700
Subject: [PATCH 1137/1285] Revert "Preserve width when cover images fail to
 load"

---
 bookwyrm/templates/snippets/book_cover.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/book_cover.html b/bookwyrm/templates/snippets/book_cover.html
index 3c6f212d..5f12858f 100644
--- a/bookwyrm/templates/snippets/book_cover.html
+++ b/bookwyrm/templates/snippets/book_cover.html
@@ -6,7 +6,6 @@
 <figure
     class="
         cover-container
-        is-w-m
         {{ cover_class }}
 
         {% if not book.cover %}

From 865faf671497c947e3ba6e7dca2d416e5aee3f61 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 11 May 2021 15:52:41 -0700
Subject: [PATCH 1138/1285] Fixes tests

---
 bookwyrm/templates/user/shelf/shelf.html |  1 +
 bookwyrm/tests/test_templatetags.py      | 34 ++++++++++++++----------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/bookwyrm/templates/user/shelf/shelf.html b/bookwyrm/templates/user/shelf/shelf.html
index 0f386385..9e7ae4f7 100644
--- a/bookwyrm/templates/user/shelf/shelf.html
+++ b/bookwyrm/templates/user/shelf/shelf.html
@@ -1,4 +1,5 @@
 {% extends 'user/layout.html' %}
+{% load bookwyrm_tags %}
 {% load utilities %}
 {% load humanize %}
 {% load i18n %}
diff --git a/bookwyrm/tests/test_templatetags.py b/bookwyrm/tests/test_templatetags.py
index 3b782fd5..4b1aa594 100644
--- a/bookwyrm/tests/test_templatetags.py
+++ b/bookwyrm/tests/test_templatetags.py
@@ -6,7 +6,13 @@ from django.test import TestCase
 from django.utils import timezone
 
 from bookwyrm import models
-from bookwyrm.templatetags import bookwyrm_tags
+from bookwyrm.templatetags import (
+    bookwyrm_tags,
+    interaction,
+    markdown,
+    status_display,
+    utilities,
+)
 
 
 @patch("bookwyrm.activitystreams.ActivityStream.add_status")
@@ -45,12 +51,12 @@ class TemplateTags(TestCase):
     def test_get_user_identifer_local(self, _):
         """fall back to the simplest uid available"""
         self.assertNotEqual(self.user.username, self.user.localname)
-        self.assertEqual(bookwyrm_tags.get_user_identifier(self.user), "mouse")
+        self.assertEqual(utilities.get_user_identifier(self.user), "mouse")
 
     def test_get_user_identifer_remote(self, _):
         """for a remote user, should be their full username"""
         self.assertEqual(
-            bookwyrm_tags.get_user_identifier(self.remote_user), "rat@example.com"
+            utilities.get_user_identifier(self.remote_user), "rat@example.com"
         )
 
     def test_get_replies(self, _):
@@ -75,7 +81,7 @@ class TemplateTags(TestCase):
                     deleted_date=timezone.now(),
                 )
 
-        replies = bookwyrm_tags.get_replies(parent)
+        replies = status_display.get_replies(parent)
         self.assertEqual(len(replies), 2)
         self.assertTrue(first_child in replies)
         self.assertTrue(second_child in replies)
@@ -91,7 +97,7 @@ class TemplateTags(TestCase):
                 reply_parent=parent, user=self.user, content="hi"
             )
 
-        result = bookwyrm_tags.get_parent(child)
+        result = status_display.get_parent(child)
         self.assertEqual(result, parent)
         self.assertIsInstance(result, models.Review)
 
@@ -99,26 +105,26 @@ class TemplateTags(TestCase):
         """did a user like a status"""
         status = models.Review.objects.create(user=self.remote_user, book=self.book)
 
-        self.assertFalse(bookwyrm_tags.get_user_liked(self.user, status))
+        self.assertFalse(interaction.get_user_liked(self.user, status))
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             models.Favorite.objects.create(user=self.user, status=status)
-        self.assertTrue(bookwyrm_tags.get_user_liked(self.user, status))
+        self.assertTrue(interaction.get_user_liked(self.user, status))
 
     def test_get_user_boosted(self, _):
         """did a user boost a status"""
         status = models.Review.objects.create(user=self.remote_user, book=self.book)
 
-        self.assertFalse(bookwyrm_tags.get_user_boosted(self.user, status))
+        self.assertFalse(interaction.get_user_boosted(self.user, status))
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             models.Boost.objects.create(user=self.user, boosted_status=status)
-        self.assertTrue(bookwyrm_tags.get_user_boosted(self.user, status))
+        self.assertTrue(interaction.get_user_boosted(self.user, status))
 
     def test_get_boosted(self, _):
         """load a boosted status"""
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
             status = models.Review.objects.create(user=self.remote_user, book=self.book)
             boost = models.Boost.objects.create(user=self.user, boosted_status=status)
-        boosted = bookwyrm_tags.get_boosted(boost)
+        boosted = status_display.get_boosted(boost)
         self.assertIsInstance(boosted, models.Review)
         self.assertEqual(boosted, status)
 
@@ -140,21 +146,21 @@ class TemplateTags(TestCase):
 
     def test_get_uuid(self, _):
         """uuid functionality"""
-        uuid = bookwyrm_tags.get_uuid("hi")
+        uuid = utilities.get_uuid("hi")
         self.assertTrue(re.match(r"hi[A-Za-z0-9\-]", uuid))
 
     def test_get_markdown(self, _):
         """mardown format data"""
-        result = bookwyrm_tags.get_markdown("_hi_")
+        result = markdown.get_markdown("_hi_")
         self.assertEqual(result, "<p><em>hi</em></p>")
 
-        result = bookwyrm_tags.get_markdown("<marquee>_hi_</marquee>")
+        result = markdown.get_markdown("<marquee>_hi_</marquee>")
         self.assertEqual(result, "<p><em>hi</em></p>")
 
     def test_get_mentions(self, _):
         """list of people mentioned"""
         status = models.Status.objects.create(content="hi", user=self.remote_user)
-        result = bookwyrm_tags.get_mentions(status, self.user)
+        result = status_display.get_mentions(status, self.user)
         self.assertEqual(result, "@rat@example.com ")
 
     def test_related_status(self, _):

From 3b9fed1b31882374938a83097da2dacd35d2cd0f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 11 May 2021 18:59:31 -0700
Subject: [PATCH 1139/1285] Filter for concise status timestamps

---
 .../snippets/status/status_header.html         |  2 +-
 bookwyrm/templatetags/status_display.py        | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html
index b06c6bfc..9ff7f9ff 100644
--- a/bookwyrm/templates/snippets/status/status_header.html
+++ b/bookwyrm/templates/snippets/status/status_header.html
@@ -92,7 +92,7 @@
 
         </h3>
         <p class="is-size-7 is-flex is-align-items-center">
-            <a href="{{ status.remote_id }}">{{ status.published_date|timesince }}</a>
+            <a href="{{ status.remote_id }}">{{ status.published_date|published_date }}</a>
             {% if status.progress %}
             <span class="ml-1">
             {% if status.progress_mode == 'PG' %}
diff --git a/bookwyrm/templatetags/status_display.py b/bookwyrm/templatetags/status_display.py
index f39de9e3..4d9984c8 100644
--- a/bookwyrm/templatetags/status_display.py
+++ b/bookwyrm/templatetags/status_display.py
@@ -1,6 +1,8 @@
 """ template filters """
+from dateutil.relativedelta import relativedelta
 from django import template
-
+from django.contrib.humanize.templatetags.humanize import naturaltime, naturalday
+from django.utils import timezone
 from bookwyrm import models
 from bookwyrm.templatetags.utilities import get_user_identifier
 
@@ -41,3 +43,17 @@ def get_parent(status):
 def get_boosted(boost):
     """load a boosted status. have to do this or it won't get foreign keys"""
     return models.Status.objects.select_subclasses().get(id=boost.boosted_status.id)
+
+
+@register.filter(name="published_date")
+def get_published_date(date):
+    """less verbose combo of humanize filters"""
+    if not date:
+        return ""
+    now = timezone.now()
+    delta = relativedelta(now, date)
+    if delta.years:
+        return naturalday(date)
+    if delta.days:
+        return naturalday(date, "M j")
+    return naturaltime(date)

From 2b4ac71d7acf86f9fbcbe351cf84c6ae8ee55be4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 14 May 2021 15:21:26 -0700
Subject: [PATCH 1140/1285] Updates footer language around github link

---
 bookwyrm/templates/layout.html       |   2 +-
 locale/de_DE/LC_MESSAGES/django.po   | 660 ++++++++++++++-------------
 locale/en_US/LC_MESSAGES/django.po   | 644 +++++++++++++-------------
 locale/es/LC_MESSAGES/django.po      | 656 +++++++++++++-------------
 locale/fr_FR/LC_MESSAGES/django.po   | 656 +++++++++++++-------------
 locale/zh_Hans/LC_MESSAGES/django.po | 656 +++++++++++++-------------
 6 files changed, 1717 insertions(+), 1557 deletions(-)

diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index becf7781..3a4fd6c8 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -214,7 +214,7 @@
                 </p>
                 {% endif %}
                 <p>
-                    {% trans 'BookWyrm is open source software. You can contribute or report issues on <a href="https://github.com/mouse-reeve/bookwyrm">GitHub</a>.' %}
+                {% blocktrans %}BookWyrm's source code is freely available. You can contribute or report issues on <a href="https://github.com/mouse-reeve/bookwyrm">GitHub</a>.{% endblocktrans %}
                 </p>
             </div>
             {% if site.footer_item %}
diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 7f274af9..7b9a929d 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-10 13:23-0700\n"
+"POT-Creation-Date: 2021-05-14 15:12-0700\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"
@@ -61,13 +61,13 @@ msgstr ""
 msgid "Book Title"
 msgstr "Titel"
 
-#: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:31
-#: bookwyrm/templates/user/shelf/shelf.html:82
-#: bookwyrm/templates/user/shelf/shelf.html:112
+#: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:34
+#: bookwyrm/templates/user/shelf/shelf.html:84
+#: bookwyrm/templates/user/shelf/shelf.html:115
 msgid "Rating"
 msgstr ""
 
-#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:100
+#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:101
 msgid "Sort By"
 msgstr ""
 
@@ -141,19 +141,157 @@ msgstr ""
 msgid "Something went wrong! Sorry about that."
 msgstr "Etwas lief schief. Entschuldigung!"
 
-#: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
+#: bookwyrm/templates/author/author.html:17
+#: bookwyrm/templates/author/author.html:18
 msgid "Edit Author"
 msgstr "Autor*in editieren"
 
-#: bookwyrm/templates/author.html:31
+#: bookwyrm/templates/author/author.html:33
+#: bookwyrm/templates/author/edit_author.html:38
+msgid "Aliases:"
+msgstr ""
+
+#: bookwyrm/templates/author/author.html:39
+msgid "Born:"
+msgstr ""
+
+#: bookwyrm/templates/author/author.html:45
+msgid "Died:"
+msgstr ""
+
+#: bookwyrm/templates/author/author.html:52
 msgid "Wikipedia"
 msgstr ""
 
-#: bookwyrm/templates/author.html:36
+#: bookwyrm/templates/author/author.html:56
+#: bookwyrm/templates/book/book.html:81
+msgid "View on OpenLibrary"
+msgstr "In OpenLibrary ansehen"
+
+#: bookwyrm/templates/author/author.html:61
+#: bookwyrm/templates/book/book.html:84
+#, fuzzy
+#| msgid "View on OpenLibrary"
+msgid "View on Inventaire"
+msgstr "In OpenLibrary ansehen"
+
+#: bookwyrm/templates/author/author.html:75
 #, python-format
 msgid "Books by %(name)s"
 msgstr "Bücher von %(name)s"
 
+#: bookwyrm/templates/author/edit_author.html:5
+#, fuzzy
+#| msgid "Edit Author"
+msgid "Edit Author:"
+msgstr "Autor*in editieren"
+
+#: bookwyrm/templates/author/edit_author.html:13
+#: bookwyrm/templates/book/edit_book.html:18
+msgid "Added:"
+msgstr "Hinzugefügt:"
+
+#: bookwyrm/templates/author/edit_author.html:14
+#: bookwyrm/templates/book/edit_book.html:19
+msgid "Updated:"
+msgstr "Aktualisiert:"
+
+#: bookwyrm/templates/author/edit_author.html:15
+#: bookwyrm/templates/book/edit_book.html:20
+msgid "Last edited by:"
+msgstr "Zuletzt bearbeitet von:"
+
+#: bookwyrm/templates/author/edit_author.html:31
+#: bookwyrm/templates/book/edit_book.html:90
+msgid "Metadata"
+msgstr "Metadaten"
+
+#: bookwyrm/templates/author/edit_author.html:32
+#: bookwyrm/templates/lists/form.html:8
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:13
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:14
+msgid "Name:"
+msgstr ""
+
+#: bookwyrm/templates/author/edit_author.html:40
+#: bookwyrm/templates/book/edit_book.html:128
+#: bookwyrm/templates/book/edit_book.html:165
+#, fuzzy
+#| msgid "Separate multiple publishers with commas."
+msgid "Separate multiple values with commas."
+msgstr "Mehrere Herausgeber:innen durch Kommata trennen"
+
+#: bookwyrm/templates/author/edit_author.html:46
+msgid "Bio:"
+msgstr ""
+
+#: bookwyrm/templates/author/edit_author.html:51
+msgid "Wikipedia link:"
+msgstr "Wikipedialink:"
+
+#: bookwyrm/templates/author/edit_author.html:57
+msgid "Birth date:"
+msgstr "Geburtsdatum:"
+
+#: bookwyrm/templates/author/edit_author.html:65
+msgid "Death date:"
+msgstr "Todesdatum:"
+
+#: bookwyrm/templates/author/edit_author.html:73
+msgid "Author Identifiers"
+msgstr "Autor*innenidentifikatoren"
+
+#: bookwyrm/templates/author/edit_author.html:74
+#: bookwyrm/templates/book/edit_book.html:223
+msgid "Openlibrary key:"
+msgstr ""
+
+#: bookwyrm/templates/author/edit_author.html:79
+#, fuzzy
+#| msgid "View on OpenLibrary"
+msgid "Inventaire ID:"
+msgstr "In OpenLibrary ansehen"
+
+#: bookwyrm/templates/author/edit_author.html:84
+msgid "Librarything key:"
+msgstr ""
+
+#: bookwyrm/templates/author/edit_author.html:89
+msgid "Goodreads key:"
+msgstr ""
+
+#: bookwyrm/templates/author/edit_author.html:98
+#: bookwyrm/templates/book/book.html:127
+#: bookwyrm/templates/book/edit_book.html:241
+#: bookwyrm/templates/lists/form.html:42
+#: bookwyrm/templates/preferences/edit_user.html:70
+#: bookwyrm/templates/settings/edit_server.html:68
+#: bookwyrm/templates/settings/federated_server.html:94
+#: bookwyrm/templates/settings/site.html:97
+#: bookwyrm/templates/snippets/readthrough.html:77
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:38
+msgid "Save"
+msgstr "Speichern"
+
+#: bookwyrm/templates/author/edit_author.html:99
+#: bookwyrm/templates/book/book.html:128 bookwyrm/templates/book/book.html:180
+#: bookwyrm/templates/book/cover_modal.html:32
+#: bookwyrm/templates/book/edit_book.html:242
+#: bookwyrm/templates/moderation/report_modal.html:34
+#: bookwyrm/templates/settings/federated_server.html:95
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
+#: bookwyrm/templates/snippets/goal_form.html:32
+#: bookwyrm/templates/snippets/readthrough.html:78
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
+msgid "Cancel"
+msgstr "Abbrechen"
+
 #: bookwyrm/templates/book/book.html:33
 #: bookwyrm/templates/discover/large-book.html:25
 #: bookwyrm/templates/discover/small-book.html:19
@@ -175,16 +313,6 @@ msgstr "Cover hinzufügen"
 msgid "Failed to load cover"
 msgstr "Laden fehlgeschlagen"
 
-#: bookwyrm/templates/book/book.html:81
-msgid "View on OpenLibrary"
-msgstr "In OpenLibrary ansehen"
-
-#: bookwyrm/templates/book/book.html:84
-#, fuzzy
-#| msgid "View on OpenLibrary"
-msgid "View on Inventaire"
-msgstr "In OpenLibrary ansehen"
-
 #: bookwyrm/templates/book/book.html:104
 #, python-format
 msgid "(%(review_count)s review)"
@@ -202,37 +330,6 @@ msgstr "Beschreibung hinzufügen"
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: bookwyrm/templates/book/book.html:127
-#: bookwyrm/templates/book/edit_book.html:249
-#: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:70
-#: bookwyrm/templates/settings/edit_server.html:68
-#: bookwyrm/templates/settings/federated_server.html:93
-#: bookwyrm/templates/settings/site.html:97
-#: bookwyrm/templates/snippets/readthrough.html:77
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:50
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:38
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:38
-msgid "Save"
-msgstr "Speichern"
-
-#: bookwyrm/templates/book/book.html:128 bookwyrm/templates/book/book.html:180
-#: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:250
-#: bookwyrm/templates/edit_author.html:79
-#: bookwyrm/templates/moderation/report_modal.html:34
-#: bookwyrm/templates/settings/federated_server.html:94
-#: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
-#: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/readthrough.html:78
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:51
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:39
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
-msgid "Cancel"
-msgstr "Abbrechen"
-
 #: bookwyrm/templates/book/book.html:137
 #, fuzzy, python-format
 #| msgid "<a href=\"%(path)s\">%(title)s</a> by "
@@ -307,7 +404,7 @@ msgstr "Orte"
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
-#: bookwyrm/templates/user/layout.html:67
+#: bookwyrm/templates/user/layout.html:68
 msgid "Lists"
 msgstr "Listen"
 
@@ -319,7 +416,7 @@ msgstr "Zur Liste"
 
 #: bookwyrm/templates/book/book.html:320
 #: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:163
+#: bookwyrm/templates/lists/list.html:164
 msgid "Add"
 msgstr "Hinzufügen"
 
@@ -328,24 +425,24 @@ msgid "ISBN:"
 msgstr ""
 
 #: bookwyrm/templates/book/book_identifiers.html:15
-#: bookwyrm/templates/book/edit_book.html:235
+#: bookwyrm/templates/book/edit_book.html:227
 msgid "OCLC Number:"
 msgstr "OCLC Nummer:"
 
 #: bookwyrm/templates/book/book_identifiers.html:22
-#: bookwyrm/templates/book/edit_book.html:239
+#: bookwyrm/templates/book/edit_book.html:231
 msgid "ASIN:"
 msgstr ""
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:187
+#: bookwyrm/templates/book/edit_book.html:179
 #, fuzzy
 #| msgid "Add cover"
 msgid "Upload cover:"
 msgstr "Cover hinzufügen"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:193
+#: bookwyrm/templates/book/edit_book.html:185
 msgid "Load cover from url:"
 msgstr "Cover von URL laden:"
 
@@ -363,21 +460,6 @@ msgstr "Editionen von  %(book_title)s"
 msgid "Add Book"
 msgstr "Bücher hinzufügen"
 
-#: bookwyrm/templates/book/edit_book.html:18
-#: bookwyrm/templates/edit_author.html:13
-msgid "Added:"
-msgstr "Hinzugefügt:"
-
-#: bookwyrm/templates/book/edit_book.html:19
-#: bookwyrm/templates/edit_author.html:14
-msgid "Updated:"
-msgstr "Aktualisiert:"
-
-#: bookwyrm/templates/book/edit_book.html:20
-#: bookwyrm/templates/edit_author.html:15
-msgid "Last edited by:"
-msgstr "Zuletzt bearbeitet von:"
-
 #: bookwyrm/templates/book/edit_book.html:40
 msgid "Confirm Book Info"
 msgstr "Buchinfo bestätigen"
@@ -420,11 +502,6 @@ msgstr "Bestätigen"
 msgid "Back"
 msgstr "Zurück"
 
-#: bookwyrm/templates/book/edit_book.html:90
-#: bookwyrm/templates/edit_author.html:31
-msgid "Metadata"
-msgstr "Metadaten"
-
 #: bookwyrm/templates/book/edit_book.html:92
 msgid "Title:"
 msgstr "Titel:"
@@ -447,81 +524,72 @@ msgstr "Seriennummer:"
 msgid "Publisher:"
 msgstr "Veröffentlicht"
 
-#: bookwyrm/templates/book/edit_book.html:128
-msgid "Separate multiple publishers with commas."
-msgstr "Mehrere Herausgeber:innen durch Kommata trennen"
-
 #: bookwyrm/templates/book/edit_book.html:135
 msgid "First published date:"
 msgstr "Erstveröffentlichungsdatum:"
 
-#: bookwyrm/templates/book/edit_book.html:147
+#: bookwyrm/templates/book/edit_book.html:143
 msgid "Published date:"
 msgstr "Veröffentlichungsdatum:"
 
-#: bookwyrm/templates/book/edit_book.html:160
+#: bookwyrm/templates/book/edit_book.html:152
 #, fuzzy
 #| msgid "Author"
 msgid "Authors"
 msgstr "Autor*in"
 
-#: bookwyrm/templates/book/edit_book.html:166
+#: bookwyrm/templates/book/edit_book.html:158
 #, fuzzy, python-format
 #| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
 msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/book/edit_book.html:171
+#: bookwyrm/templates/book/edit_book.html:163
 #, fuzzy
 #| msgid "Edit Author"
 msgid "Add Authors:"
 msgstr "Autor*in editieren"
 
-#: bookwyrm/templates/book/edit_book.html:172
+#: bookwyrm/templates/book/edit_book.html:164
 msgid "John Doe, Jane Smith"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:178
-#: bookwyrm/templates/user/shelf/shelf.html:76
+#: bookwyrm/templates/book/edit_book.html:170
+#: bookwyrm/templates/user/shelf/shelf.html:77
 msgid "Cover"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:206
+#: bookwyrm/templates/book/edit_book.html:198
 msgid "Physical Properties"
 msgstr "Physikalische Eigenschaften"
 
-#: bookwyrm/templates/book/edit_book.html:207
+#: bookwyrm/templates/book/edit_book.html:199
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:215
+#: bookwyrm/templates/book/edit_book.html:207
 msgid "Pages:"
 msgstr "Seiten:"
 
-#: bookwyrm/templates/book/edit_book.html:222
+#: bookwyrm/templates/book/edit_book.html:214
 msgid "Book Identifiers"
 msgstr "Buchidentifikatoren"
 
-#: bookwyrm/templates/book/edit_book.html:223
+#: bookwyrm/templates/book/edit_book.html:215
 msgid "ISBN 13:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:227
+#: bookwyrm/templates/book/edit_book.html:219
 msgid "ISBN 10:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:231
-#: bookwyrm/templates/edit_author.html:59
-msgid "Openlibrary key:"
-msgstr ""
-
-#: bookwyrm/templates/book/editions.html:5
+#: bookwyrm/templates/book/editions.html:4
 #, python-format
 msgid "Editions of %(book_title)s"
 msgstr "Editionen von  %(book_title)s"
 
-#: bookwyrm/templates/book/editions.html:9
+#: bookwyrm/templates/book/editions.html:8
 #, python-format
 msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 msgstr "Editionen von <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
@@ -574,7 +642,7 @@ msgstr "Veröffentlicht von %(publisher)s."
 
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
-#: bookwyrm/templates/feed/feed_layout.html:70
+#: bookwyrm/templates/feed/feed_layout.html:69
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
 #: bookwyrm/templates/search/book.html:32
@@ -640,7 +708,7 @@ msgstr "Vorschlagen"
 msgid "Recently active"
 msgstr ""
 
-#: bookwyrm/templates/directory/user_card.html:32
+#: bookwyrm/templates/directory/user_card.html:33
 #, fuzzy
 #| msgid "followed you"
 msgid "follower you follow"
@@ -648,7 +716,7 @@ msgid_plural "followers you follow"
 msgstr[0] "folgt dir"
 msgstr[1] "folgt dir"
 
-#: bookwyrm/templates/directory/user_card.html:39
+#: bookwyrm/templates/directory/user_card.html:40
 #, fuzzy
 #| msgid "Your shelves"
 msgid "book on your shelves"
@@ -656,11 +724,11 @@ msgid_plural "books on your shelves"
 msgstr[0] "Deine Regale"
 msgstr[1] "Deine Regale"
 
-#: bookwyrm/templates/directory/user_card.html:47
+#: bookwyrm/templates/directory/user_card.html:48
 msgid "posts"
 msgstr ""
 
-#: bookwyrm/templates/directory/user_card.html:53
+#: bookwyrm/templates/directory/user_card.html:54
 msgid "last active"
 msgstr ""
 
@@ -748,46 +816,6 @@ msgstr "Absenden"
 msgid "Your Account"
 msgstr "Dein Account"
 
-#: bookwyrm/templates/edit_author.html:5
-#, fuzzy
-#| msgid "Edit Author"
-msgid "Edit Author:"
-msgstr "Autor*in editieren"
-
-#: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
-#: bookwyrm/templates/user/shelf/create_shelf_form.html:13
-#: bookwyrm/templates/user/shelf/edit_shelf_form.html:14
-msgid "Name:"
-msgstr ""
-
-#: bookwyrm/templates/edit_author.html:37
-msgid "Bio:"
-msgstr ""
-
-#: bookwyrm/templates/edit_author.html:42
-msgid "Wikipedia link:"
-msgstr "Wikipedialink:"
-
-#: bookwyrm/templates/edit_author.html:47
-msgid "Birth date:"
-msgstr "Geburtsdatum:"
-
-#: bookwyrm/templates/edit_author.html:52
-msgid "Death date:"
-msgstr "Todesdatum:"
-
-#: bookwyrm/templates/edit_author.html:58
-msgid "Author Identifiers"
-msgstr "Autor*innenidentifikatoren"
-
-#: bookwyrm/templates/edit_author.html:64
-msgid "Librarything key:"
-msgstr ""
-
-#: bookwyrm/templates/edit_author.html:69
-msgid "Goodreads key:"
-msgstr ""
-
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
@@ -872,82 +900,82 @@ msgstr "Alle Nachrichten"
 msgid "You have no messages right now."
 msgstr "Du hast momentan keine Nachrichten."
 
-#: bookwyrm/templates/feed/feed.html:9
+#: bookwyrm/templates/feed/feed.html:8
 msgid "Home Timeline"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:11
+#: bookwyrm/templates/feed/feed.html:10
 msgid "Local Timeline"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:13
+#: bookwyrm/templates/feed/feed.html:12
 #, fuzzy
 #| msgid "Federated Servers"
 msgid "Federated Timeline"
 msgstr "Föderierende Server"
 
-#: bookwyrm/templates/feed/feed.html:19
+#: bookwyrm/templates/feed/feed.html:18
 msgid "Home"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:22
+#: bookwyrm/templates/feed/feed.html:21
 msgid "Local"
 msgstr "Lokal"
 
-#: bookwyrm/templates/feed/feed.html:25
+#: bookwyrm/templates/feed/feed.html:24
 #: bookwyrm/templates/settings/edit_server.html:40
 msgid "Federated"
 msgstr "Föderiert"
 
-#: bookwyrm/templates/feed/feed.html:33
+#: bookwyrm/templates/feed/feed.html:32
 #, python-format
 msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:48
+#: bookwyrm/templates/feed/feed.html:47
 msgid "There aren't any activities right now! Try following a user to get started"
 msgstr "Hier sind noch keine Aktivitäten! Folge anderen, um loszulegen"
 
-#: bookwyrm/templates/feed/feed.html:56
+#: bookwyrm/templates/feed/feed.html:55
 #: bookwyrm/templates/get_started/users.html:6
 msgid "Who to follow"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed_layout.html:5
+#: bookwyrm/templates/feed/feed_layout.html:4
 msgid "Updates"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed_layout.html:11
+#: bookwyrm/templates/feed/feed_layout.html:10
 #: bookwyrm/templates/layout.html:59
 #: bookwyrm/templates/user/shelf/books_header.html:3
 msgid "Your books"
 msgstr "Deine Bücher"
 
-#: bookwyrm/templates/feed/feed_layout.html:13
+#: bookwyrm/templates/feed/feed_layout.html:12
 msgid "There are no books here right now! Try searching for a book to get started"
 msgstr "Hier sind noch keine Bücher! Versuche nach Büchern zu suchen um loszulegen"
 
-#: bookwyrm/templates/feed/feed_layout.html:24
-#: bookwyrm/templates/user/shelf/shelf.html:28
+#: bookwyrm/templates/feed/feed_layout.html:23
+#: bookwyrm/templates/user/shelf/shelf.html:29
 #, fuzzy
 #| msgid "Read"
 msgid "To Read"
 msgstr "Auf der Leseliste"
 
-#: bookwyrm/templates/feed/feed_layout.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:28
+#: bookwyrm/templates/feed/feed_layout.html:24
+#: bookwyrm/templates/user/shelf/shelf.html:29
 #, fuzzy
 #| msgid "Start reading"
 msgid "Currently Reading"
 msgstr "Gerade lesend"
 
-#: bookwyrm/templates/feed/feed_layout.html:26
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-#: bookwyrm/templates/user/shelf/shelf.html:28
+#: bookwyrm/templates/feed/feed_layout.html:25
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
+#: bookwyrm/templates/user/shelf/shelf.html:29
 msgid "Read"
 msgstr "Gelesen"
 
-#: bookwyrm/templates/feed/feed_layout.html:88 bookwyrm/templates/goal.html:26
+#: bookwyrm/templates/feed/feed_layout.html:87 bookwyrm/templates/goal.html:26
 #: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
 msgid "%(year)s Reading Goal"
@@ -980,7 +1008,7 @@ msgid "What are you reading?"
 msgstr "Zu lesen angefangen"
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:119
+#: bookwyrm/templates/lists/list.html:120
 msgid "Search for a book"
 msgstr "Nach einem Buch suchen"
 
@@ -1000,7 +1028,7 @@ msgstr ""
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
 #: bookwyrm/templates/layout.html:38 bookwyrm/templates/layout.html:39
-#: bookwyrm/templates/lists/list.html:123
+#: bookwyrm/templates/lists/list.html:124
 #: bookwyrm/templates/search/layout.html:4
 #: bookwyrm/templates/search/layout.html:9
 msgid "Search"
@@ -1019,7 +1047,7 @@ msgid "Popular on %(site_name)s"
 msgstr "Ãœber %(site_name)s"
 
 #: bookwyrm/templates/get_started/books.html:58
-#: bookwyrm/templates/lists/list.html:136
+#: bookwyrm/templates/lists/list.html:137
 msgid "No books found"
 msgstr "Keine Bücher gefunden"
 
@@ -1152,95 +1180,95 @@ msgstr "Bücher importieren"
 msgid "Data source:"
 msgstr "Datenquelle"
 
-#: bookwyrm/templates/import.html:29
+#: bookwyrm/templates/import.html:32
 msgid "Data file:"
 msgstr ""
 
-#: bookwyrm/templates/import.html:37
+#: bookwyrm/templates/import.html:40
 msgid "Include reviews"
 msgstr "Bewertungen importieren"
 
-#: bookwyrm/templates/import.html:42
+#: bookwyrm/templates/import.html:45
 msgid "Privacy setting for imported reviews:"
 msgstr "Datenschutzeinstellung für importierte Bewertungen"
 
-#: bookwyrm/templates/import.html:48
+#: bookwyrm/templates/import.html:51
 #: bookwyrm/templates/settings/server_blocklist.html:64
 msgid "Import"
 msgstr "Importieren"
 
-#: bookwyrm/templates/import.html:53
+#: bookwyrm/templates/import.html:56
 msgid "Recent Imports"
 msgstr "Aktuelle Importe"
 
-#: bookwyrm/templates/import.html:55
+#: bookwyrm/templates/import.html:58
 msgid "No recent imports"
 msgstr "Keine aktuellen Importe"
 
-#: bookwyrm/templates/import_status.html:6
-#: bookwyrm/templates/import_status.html:10
+#: bookwyrm/templates/import_status.html:5
+#: bookwyrm/templates/import_status.html:9
 msgid "Import Status"
 msgstr "Importstatus"
 
-#: bookwyrm/templates/import_status.html:13
+#: bookwyrm/templates/import_status.html:12
 msgid "Import started:"
 msgstr "Import gestartet:"
 
-#: bookwyrm/templates/import_status.html:17
+#: bookwyrm/templates/import_status.html:16
 msgid "Import completed:"
 msgstr "Import abgeschlossen:"
 
-#: bookwyrm/templates/import_status.html:20
+#: bookwyrm/templates/import_status.html:19
 msgid "TASK FAILED"
 msgstr "AUFGABE GESCHEITERT"
 
-#: bookwyrm/templates/import_status.html:26
+#: bookwyrm/templates/import_status.html:25
 msgid "Import still in progress."
 msgstr "Import läuft noch."
 
-#: bookwyrm/templates/import_status.html:28
+#: bookwyrm/templates/import_status.html:27
 msgid "(Hit reload to update!)"
 msgstr "(Aktualisiere für ein Update!)"
 
-#: bookwyrm/templates/import_status.html:35
+#: bookwyrm/templates/import_status.html:34
 msgid "Failed to load"
 msgstr "Laden fehlgeschlagen"
 
-#: bookwyrm/templates/import_status.html:44
+#: bookwyrm/templates/import_status.html:43
 #, python-format
 msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
 msgstr "Zum Ende der Liste springen, um die %(failed_count)s Einträge, deren Import fehlschlug, auszuwählen."
 
-#: bookwyrm/templates/import_status.html:79
+#: bookwyrm/templates/import_status.html:78
 msgid "Select all"
 msgstr "Alle auswählen"
 
-#: bookwyrm/templates/import_status.html:82
+#: bookwyrm/templates/import_status.html:81
 msgid "Retry items"
 msgstr "Punkte erneut versuchen"
 
-#: bookwyrm/templates/import_status.html:108
+#: bookwyrm/templates/import_status.html:107
 msgid "Successfully imported"
 msgstr "Erfolgreich importiert"
 
-#: bookwyrm/templates/import_status.html:112
+#: bookwyrm/templates/import_status.html:111
 msgid "Book"
 msgstr "Buch"
 
-#: bookwyrm/templates/import_status.html:115
-#: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/user/shelf/shelf.html:77
-#: bookwyrm/templates/user/shelf/shelf.html:95
+#: bookwyrm/templates/import_status.html:114
+#: bookwyrm/templates/snippets/create_status_form.html:13
+#: bookwyrm/templates/user/shelf/shelf.html:78
+#: bookwyrm/templates/user/shelf/shelf.html:98
 msgid "Title"
 msgstr "Titel"
 
-#: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/user/shelf/shelf.html:78
-#: bookwyrm/templates/user/shelf/shelf.html:98
+#: bookwyrm/templates/import_status.html:117
+#: bookwyrm/templates/user/shelf/shelf.html:79
+#: bookwyrm/templates/user/shelf/shelf.html:101
 msgid "Author"
 msgstr "Autor*in"
 
-#: bookwyrm/templates/import_status.html:141
+#: bookwyrm/templates/import_status.html:140
 msgid "Imported"
 msgstr "Importiert"
 
@@ -1351,7 +1379,8 @@ msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%
 msgstr "%(site_name)s auf <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a> unterstützen"
 
 #: bookwyrm/templates/layout.html:217
-msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+#| msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm ist open source Software. Du kannst dich auf <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> beteiligen oder etwas melden."
 
 #: bookwyrm/templates/lists/create_form.html:5
@@ -1396,7 +1425,7 @@ msgid "Discard"
 msgstr "Ablehnen"
 
 #: bookwyrm/templates/lists/edit_form.html:5
-#: bookwyrm/templates/lists/list_layout.html:18
+#: bookwyrm/templates/lists/list_layout.html:17
 msgid "Edit List"
 msgstr "Liste bearbeiten"
 
@@ -1430,77 +1459,77 @@ msgstr "Offen"
 msgid "Anyone can add books to this list"
 msgstr "Alle können Bücher hinzufügen"
 
-#: bookwyrm/templates/lists/list.html:19
+#: bookwyrm/templates/lists/list.html:20
 msgid "You successfully suggested a book for this list!"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:21
+#: bookwyrm/templates/lists/list.html:22
 #, fuzzy
 #| msgid "Anyone can add books to this list"
 msgid "You successfully added a book to this list!"
 msgstr "Alle können Bücher hinzufügen"
 
-#: bookwyrm/templates/lists/list.html:27
+#: bookwyrm/templates/lists/list.html:28
 msgid "This list is currently empty"
 msgstr "Diese Liste ist momentan leer"
 
-#: bookwyrm/templates/lists/list.html:64
+#: bookwyrm/templates/lists/list.html:65
 #, fuzzy, python-format
 #| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/lists/list.html:76
+#: bookwyrm/templates/lists/list.html:77
 #, fuzzy
 #| msgid "Started"
 msgid "Set"
 msgstr "Gestartet"
 
-#: bookwyrm/templates/lists/list.html:79
+#: bookwyrm/templates/lists/list.html:80
 #, fuzzy
 #| msgid "List curation:"
 msgid "List position"
 msgstr "Listenkuratierung:"
 
-#: bookwyrm/templates/lists/list.html:85
+#: bookwyrm/templates/lists/list.html:86
 #: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr "Entfernen"
 
-#: bookwyrm/templates/lists/list.html:98 bookwyrm/templates/lists/list.html:110
+#: bookwyrm/templates/lists/list.html:99 bookwyrm/templates/lists/list.html:111
 #, fuzzy
 #| msgid "Your Lists"
 msgid "Sort List"
 msgstr "Deine Listen"
 
-#: bookwyrm/templates/lists/list.html:104
+#: bookwyrm/templates/lists/list.html:105
 #, fuzzy
 #| msgid "List curation:"
 msgid "Direction"
 msgstr "Listenkuratierung:"
 
-#: bookwyrm/templates/lists/list.html:115
+#: bookwyrm/templates/lists/list.html:116
 msgid "Add Books"
 msgstr "Bücher hinzufügen"
 
-#: bookwyrm/templates/lists/list.html:115
+#: bookwyrm/templates/lists/list.html:116
 msgid "Suggest Books"
 msgstr "Bücher vorschlagen"
 
-#: bookwyrm/templates/lists/list.html:124
+#: bookwyrm/templates/lists/list.html:125
 msgid "search"
 msgstr "suchen"
 
-#: bookwyrm/templates/lists/list.html:130
+#: bookwyrm/templates/lists/list.html:131
 msgid "Clear search"
 msgstr "Suche leeren"
 
-#: bookwyrm/templates/lists/list.html:135
+#: bookwyrm/templates/lists/list.html:136
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
 msgstr "Keine passenden Bücher zu \"%(query)s\" gefunden"
 
-#: bookwyrm/templates/lists/list.html:163
+#: bookwyrm/templates/lists/list.html:164
 msgid "Suggest"
 msgstr "Vorschlagen"
 
@@ -1525,38 +1554,38 @@ msgstr "Kontaktiere für eine Einladung eine*n Admin"
 msgid "More about this site"
 msgstr "Mehr über diese Seite"
 
+#: bookwyrm/templates/moderation/report.html:5
 #: bookwyrm/templates/moderation/report.html:6
-#: bookwyrm/templates/moderation/report.html:7
 #: bookwyrm/templates/moderation/report_preview.html:6
 #, python-format
 msgid "Report #%(report_id)s: %(username)s"
 msgstr "Meldung #%(report_id)s: %(username)s"
 
-#: bookwyrm/templates/moderation/report.html:11
+#: bookwyrm/templates/moderation/report.html:10
 msgid "Back to reports"
 msgstr "Zurück zu den Meldungen"
 
-#: bookwyrm/templates/moderation/report.html:23
+#: bookwyrm/templates/moderation/report.html:22
 msgid "Moderator Comments"
 msgstr "Moderator:innenkommentare"
 
-#: bookwyrm/templates/moderation/report.html:41
+#: bookwyrm/templates/moderation/report.html:40
 #: bookwyrm/templates/snippets/create_status.html:28
-#: bookwyrm/templates/snippets/create_status_form.html:63
+#: bookwyrm/templates/snippets/create_status_form.html:66
 msgid "Comment"
 msgstr "Kommentieren"
 
-#: bookwyrm/templates/moderation/report.html:46
+#: bookwyrm/templates/moderation/report.html:45
 #, fuzzy
 #| msgid "Delete status"
 msgid "Reported statuses"
 msgstr "Post löschen"
 
-#: bookwyrm/templates/moderation/report.html:48
+#: bookwyrm/templates/moderation/report.html:47
 msgid "No statuses reported"
 msgstr "Keine Beiträge gemeldet"
 
-#: bookwyrm/templates/moderation/report.html:54
+#: bookwyrm/templates/moderation/report.html:53
 #, fuzzy
 #| msgid "Statuses has been deleted"
 msgid "Status has been deleted"
@@ -1848,7 +1877,7 @@ msgstr "Suche"
 
 #: bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
-#: bookwyrm/templates/user/layout.html:73
+#: bookwyrm/templates/user/layout.html:74
 #, fuzzy
 #| msgid "Book"
 msgid "Books"
@@ -1925,7 +1954,7 @@ msgid "Add server"
 msgstr "Cover hinzufügen"
 
 #: bookwyrm/templates/settings/edit_server.html:7
-#: bookwyrm/templates/settings/federated_server.html:12
+#: bookwyrm/templates/settings/federated_server.html:13
 #: bookwyrm/templates/settings/server_blocklist.html:7
 #, fuzzy
 #| msgid "Back to reports"
@@ -1946,7 +1975,7 @@ msgid "Instance:"
 msgstr "Instanzname"
 
 #: bookwyrm/templates/settings/edit_server.html:37
-#: bookwyrm/templates/settings/federated_server.html:29
+#: bookwyrm/templates/settings/federated_server.html:30
 #: bookwyrm/templates/user_admin/user_info.html:34
 #, fuzzy
 #| msgid "Import Status"
@@ -1954,20 +1983,20 @@ msgid "Status:"
 msgstr "Importstatus"
 
 #: bookwyrm/templates/settings/edit_server.html:41
-#: bookwyrm/templates/settings/federated_server.html:9
+#: bookwyrm/templates/settings/federated_server.html:10
 #, fuzzy
 #| msgid "Blocked Users"
 msgid "Blocked"
 msgstr "Blockierte Nutzer*innen"
 
 #: bookwyrm/templates/settings/edit_server.html:48
-#: bookwyrm/templates/settings/federated_server.html:21
+#: bookwyrm/templates/settings/federated_server.html:22
 #: bookwyrm/templates/user_admin/user_info.html:26
 msgid "Software:"
 msgstr ""
 
 #: bookwyrm/templates/settings/edit_server.html:55
-#: bookwyrm/templates/settings/federated_server.html:25
+#: bookwyrm/templates/settings/federated_server.html:26
 #: bookwyrm/templates/user_admin/user_info.html:30
 #, fuzzy
 #| msgid "Description:"
@@ -1978,81 +2007,81 @@ msgstr "Beschreibung:"
 msgid "Notes:"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:18
+#: bookwyrm/templates/settings/federated_server.html:19
 msgid "Details"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:36
-#: bookwyrm/templates/user/layout.html:55
+#: bookwyrm/templates/settings/federated_server.html:37
+#: bookwyrm/templates/user/layout.html:56
 msgid "Activity"
 msgstr "Aktivität"
 
-#: bookwyrm/templates/settings/federated_server.html:39
+#: bookwyrm/templates/settings/federated_server.html:40
 msgid "Users:"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:42
-#: bookwyrm/templates/settings/federated_server.html:49
+#: bookwyrm/templates/settings/federated_server.html:43
+#: bookwyrm/templates/settings/federated_server.html:50
 msgid "View all"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:46
+#: bookwyrm/templates/settings/federated_server.html:47
 #, fuzzy
 #| msgid "Recent Imports"
 msgid "Reports:"
 msgstr "Aktuelle Importe"
 
-#: bookwyrm/templates/settings/federated_server.html:53
+#: bookwyrm/templates/settings/federated_server.html:54
 #, fuzzy
 #| msgid "followed you"
 msgid "Followed by us:"
 msgstr "folgt dir"
 
-#: bookwyrm/templates/settings/federated_server.html:59
+#: bookwyrm/templates/settings/federated_server.html:60
 #, fuzzy
 #| msgid "followed you"
 msgid "Followed by them:"
 msgstr "folgt dir"
 
-#: bookwyrm/templates/settings/federated_server.html:65
+#: bookwyrm/templates/settings/federated_server.html:66
 #, fuzzy
 #| msgid "Blocked Users"
 msgid "Blocked by us:"
 msgstr "Blockierte Nutzer*innen"
 
-#: bookwyrm/templates/settings/federated_server.html:77
+#: bookwyrm/templates/settings/federated_server.html:78
 #: bookwyrm/templates/user_admin/user_info.html:39
 msgid "Notes"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:80
+#: bookwyrm/templates/settings/federated_server.html:81
 #, fuzzy
 #| msgid "Edit Book"
 msgid "Edit"
 msgstr "Buch editieren"
 
-#: bookwyrm/templates/settings/federated_server.html:100
+#: bookwyrm/templates/settings/federated_server.html:101
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:3
 #, fuzzy
 #| msgid "Notifications"
 msgid "Actions"
 msgstr "Benachrichtigungen"
 
-#: bookwyrm/templates/settings/federated_server.html:104
+#: bookwyrm/templates/settings/federated_server.html:105
 #: bookwyrm/templates/snippets/block_button.html:5
 msgid "Block"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:105
+#: bookwyrm/templates/settings/federated_server.html:106
 msgid "All users from this instance will be deactivated."
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:110
+#: bookwyrm/templates/settings/federated_server.html:111
 #: bookwyrm/templates/snippets/block_button.html:10
 msgid "Un-block"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:111
+#: bookwyrm/templates/settings/federated_server.html:112
 msgid "All users from this instance will be re-activated."
 msgstr ""
 
@@ -2281,7 +2310,7 @@ msgstr "Folgeanfragen"
 msgid "Registration closed text:"
 msgstr "Registrierungen geschlossen text"
 
-#: bookwyrm/templates/snippets/book_cover.html:32
+#: bookwyrm/templates/snippets/book_cover.html:31
 #, fuzzy
 #| msgid "Add cover"
 msgid "No cover"
@@ -2292,15 +2321,15 @@ msgstr "Cover hinzufügen"
 msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgstr "<a href=\"%(path)s\">%(title)s</a> von "
 
-#: bookwyrm/templates/snippets/boost_button.html:8
 #: bookwyrm/templates/snippets/boost_button.html:9
+#: bookwyrm/templates/snippets/boost_button.html:10
 #, fuzzy
 #| msgid "boosted"
 msgid "Boost"
 msgstr "teilt"
 
-#: bookwyrm/templates/snippets/boost_button.html:15
 #: bookwyrm/templates/snippets/boost_button.html:16
+#: bookwyrm/templates/snippets/boost_button.html:17
 #, fuzzy
 #| msgid "Un-boost status"
 msgid "Un-boost"
@@ -2322,72 +2351,72 @@ msgstr "Bewerten"
 msgid "Quote"
 msgstr "Zitieren"
 
-#: bookwyrm/templates/snippets/create_status_form.html:20
+#: bookwyrm/templates/snippets/create_status_form.html:23
 #, fuzzy
 #| msgid "Comment"
 msgid "Comment:"
 msgstr "Kommentieren"
 
-#: bookwyrm/templates/snippets/create_status_form.html:22
+#: bookwyrm/templates/snippets/create_status_form.html:25
 #, fuzzy
 #| msgid "Quote"
 msgid "Quote:"
 msgstr "Zitieren"
 
-#: bookwyrm/templates/snippets/create_status_form.html:24
+#: bookwyrm/templates/snippets/create_status_form.html:27
 #, fuzzy
 #| msgid "Review"
 msgid "Review:"
 msgstr "Bewerten"
 
-#: bookwyrm/templates/snippets/create_status_form.html:53
-#: bookwyrm/templates/snippets/status/layout.html:30
+#: bookwyrm/templates/snippets/create_status_form.html:56
+#: bookwyrm/templates/snippets/status/layout.html:29
+#: bookwyrm/templates/snippets/status/layout.html:47
 #: bookwyrm/templates/snippets/status/layout.html:48
-#: bookwyrm/templates/snippets/status/layout.html:49
 msgid "Reply"
 msgstr "Antwort"
 
-#: bookwyrm/templates/snippets/create_status_form.html:53
+#: bookwyrm/templates/snippets/create_status_form.html:56
 #, fuzzy
 #| msgid "Footer Content"
 msgid "Content"
 msgstr "Inhalt des Footers"
 
-#: bookwyrm/templates/snippets/create_status_form.html:77
+#: bookwyrm/templates/snippets/create_status_form.html:80
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
 msgid "Progress:"
 msgstr "Fortschritt:"
 
-#: bookwyrm/templates/snippets/create_status_form.html:85
-#: bookwyrm/templates/snippets/readthrough_form.html:26
+#: bookwyrm/templates/snippets/create_status_form.html:88
+#: bookwyrm/templates/snippets/readthrough_form.html:22
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr "Seiten"
 
-#: bookwyrm/templates/snippets/create_status_form.html:86
-#: bookwyrm/templates/snippets/readthrough_form.html:27
+#: bookwyrm/templates/snippets/create_status_form.html:89
+#: bookwyrm/templates/snippets/readthrough_form.html:23
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr "Prozent"
 
-#: bookwyrm/templates/snippets/create_status_form.html:92
+#: bookwyrm/templates/snippets/create_status_form.html:95
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "von %(pages)s Seiten"
 
-#: bookwyrm/templates/snippets/create_status_form.html:107
+#: bookwyrm/templates/snippets/create_status_form.html:110
 msgid "Include spoiler alert"
 msgstr "Spoileralarm aktivieren"
 
-#: bookwyrm/templates/snippets/create_status_form.html:114
+#: bookwyrm/templates/snippets/create_status_form.html:117
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:19
 msgid "Private"
 msgstr "Privat"
 
-#: bookwyrm/templates/snippets/create_status_form.html:125
+#: bookwyrm/templates/snippets/create_status_form.html:128
 msgid "Post"
 msgstr "Absenden"
 
@@ -2401,17 +2430,17 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u
 msgstr "Du löscht diesen Leseforschritt und %(count)s zugehörige Fortschrittsupdates."
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
-#: bookwyrm/templates/snippets/follow_request_buttons.html:13
+#: bookwyrm/templates/snippets/follow_request_buttons.html:12
 msgid "Delete"
 msgstr "Löschen"
 
-#: bookwyrm/templates/snippets/fav_button.html:7
 #: bookwyrm/templates/snippets/fav_button.html:9
+#: bookwyrm/templates/snippets/fav_button.html:11
 msgid "Like"
 msgstr ""
 
-#: bookwyrm/templates/snippets/fav_button.html:15
-#: bookwyrm/templates/snippets/fav_button.html:16
+#: bookwyrm/templates/snippets/fav_button.html:17
+#: bookwyrm/templates/snippets/fav_button.html:18
 #, fuzzy
 #| msgid "Un-like status"
 msgid "Un-like"
@@ -2451,11 +2480,11 @@ msgstr "Folgeanfrage senden"
 msgid "Unfollow"
 msgstr "Entfolgen"
 
-#: bookwyrm/templates/snippets/follow_request_buttons.html:8
+#: bookwyrm/templates/snippets/follow_request_buttons.html:7
 msgid "Accept"
 msgstr "Annehmen"
 
-#: bookwyrm/templates/snippets/form_rate_stars.html:20
+#: bookwyrm/templates/snippets/form_rate_stars.html:19
 #: bookwyrm/templates/snippets/stars.html:13
 msgid "No rating"
 msgstr "Kein Rating"
@@ -2505,8 +2534,8 @@ msgid "Goal privacy:"
 msgstr "Sichtbarkeit des Ziels"
 
 #: bookwyrm/templates/snippets/goal_form.html:26
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:45
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:33
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:29
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20
 msgid "Post to feed"
 msgstr "Posten"
@@ -2619,12 +2648,12 @@ msgstr "Diese Lesedaten löschen"
 msgid "Started reading"
 msgstr "Zu lesen angefangen"
 
-#: bookwyrm/templates/snippets/readthrough_form.html:18
+#: bookwyrm/templates/snippets/readthrough_form.html:14
 msgid "Progress"
 msgstr "Fortschritt"
 
-#: bookwyrm/templates/snippets/readthrough_form.html:34
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:29
+#: bookwyrm/templates/snippets/readthrough_form.html:30
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25
 msgid "Finished reading"
 msgstr "Lesen abgeschlossen"
 
@@ -2632,29 +2661,29 @@ msgstr "Lesen abgeschlossen"
 msgid "Sign Up"
 msgstr "Registrieren"
 
-#: bookwyrm/templates/snippets/report_button.html:5
+#: bookwyrm/templates/snippets/report_button.html:6
 #, fuzzy
 #| msgid "Import"
 msgid "Report"
 msgstr "Importieren"
 
 #: bookwyrm/templates/snippets/rss_title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:34
+#: bookwyrm/templates/snippets/status/status_header.html:35
 msgid "rated"
 msgstr ""
 
 #: bookwyrm/templates/snippets/rss_title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:36
+#: bookwyrm/templates/snippets/status/status_header.html:37
 msgid "reviewed"
 msgstr "bewertete"
 
 #: bookwyrm/templates/snippets/rss_title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:38
+#: bookwyrm/templates/snippets/status/status_header.html:39
 msgid "commented on"
 msgstr "kommentierte"
 
 #: bookwyrm/templates/snippets/rss_title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:40
+#: bookwyrm/templates/snippets/status/status_header.html:41
 msgid "quoted"
 msgstr "zitierte"
 
@@ -2674,7 +2703,7 @@ msgid "Finish \"<em>%(book_title)s</em>\""
 msgstr "\"<em>%(book_title)s</em>\" abschließen"
 
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:34
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:36
 #, fuzzy
 #| msgid "Progress"
 msgid "Update progress"
@@ -2684,20 +2713,20 @@ msgstr "Fortschritt"
 msgid "More shelves"
 msgstr "Mehr Regale"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:8
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:10
 msgid "Start reading"
 msgstr "Zu lesen beginnen"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:15
 msgid "Finish reading"
 msgstr "Lesen abschließen"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:18
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26
 msgid "Want to read"
 msgstr "Auf Leseliste setzen"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:47
 #, fuzzy, python-format
 #| msgid "Lists: %(username)s"
 msgid "Remove from %(name)s"
@@ -2713,40 +2742,40 @@ msgstr "\"<em>%(book_title)s</em>\" beginnen"
 msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgstr "\"<em>%(book_title)s</em>\" auf Leseliste setzen"
 
-#: bookwyrm/templates/snippets/status/content_status.html:70
-#: bookwyrm/templates/snippets/trimmed_text.html:14
+#: bookwyrm/templates/snippets/status/content_status.html:71
+#: bookwyrm/templates/snippets/trimmed_text.html:15
 msgid "Show more"
 msgstr "Mehr anzeigen"
 
-#: bookwyrm/templates/snippets/status/content_status.html:85
-#: bookwyrm/templates/snippets/trimmed_text.html:29
+#: bookwyrm/templates/snippets/status/content_status.html:86
+#: bookwyrm/templates/snippets/trimmed_text.html:30
 msgid "Show less"
 msgstr "Weniger anzeigen"
 
-#: bookwyrm/templates/snippets/status/content_status.html:115
+#: bookwyrm/templates/snippets/status/content_status.html:116
 msgid "Open image in new window"
 msgstr "Bild in neuem Fenster öffnen"
 
-#: bookwyrm/templates/snippets/status/layout.html:22
+#: bookwyrm/templates/snippets/status/layout.html:21
 #: bookwyrm/templates/snippets/status/status_options.html:17
 msgid "Delete status"
 msgstr "Post löschen"
 
+#: bookwyrm/templates/snippets/status/layout.html:51
 #: bookwyrm/templates/snippets/status/layout.html:52
-#: bookwyrm/templates/snippets/status/layout.html:53
 msgid "Boost status"
 msgstr "Status teilen"
 
+#: bookwyrm/templates/snippets/status/layout.html:55
 #: bookwyrm/templates/snippets/status/layout.html:56
-#: bookwyrm/templates/snippets/status/layout.html:57
 msgid "Like status"
 msgstr "Status favorisieren"
 
-#: bookwyrm/templates/snippets/status/status.html:9
+#: bookwyrm/templates/snippets/status/status.html:10
 msgid "boosted"
 msgstr "teilt"
 
-#: bookwyrm/templates/snippets/status/status_header.html:44
+#: bookwyrm/templates/snippets/status/status_header.html:45
 #, fuzzy, python-format
 #| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
@@ -2785,15 +2814,15 @@ msgstr "Zu lesen angefangen"
 msgid "Sorted descending"
 msgstr "Zu lesen angefangen"
 
-#: bookwyrm/templates/user/layout.html:12 bookwyrm/templates/user/user.html:10
+#: bookwyrm/templates/user/layout.html:13 bookwyrm/templates/user/user.html:10
 msgid "User Profile"
 msgstr "Benutzerprofil"
 
-#: bookwyrm/templates/user/layout.html:36
+#: bookwyrm/templates/user/layout.html:37
 msgid "Follow Requests"
 msgstr "Folgeanfragen"
 
-#: bookwyrm/templates/user/layout.html:61
+#: bookwyrm/templates/user/layout.html:62
 msgid "Reading Goal"
 msgstr "Leseziel"
 
@@ -2840,40 +2869,40 @@ msgstr "Regal bearbeiten"
 msgid "Update shelf"
 msgstr "Regal aktualisieren"
 
-#: bookwyrm/templates/user/shelf/shelf.html:24 bookwyrm/views/shelf.py:48
+#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:51
 #, fuzzy
 #| msgid "books"
 msgid "All books"
 msgstr "Bücher"
 
-#: bookwyrm/templates/user/shelf/shelf.html:37
+#: bookwyrm/templates/user/shelf/shelf.html:38
 msgid "Create shelf"
 msgstr "Regal erstellen"
 
-#: bookwyrm/templates/user/shelf/shelf.html:60
+#: bookwyrm/templates/user/shelf/shelf.html:61
 msgid "Edit shelf"
 msgstr "Regal bearbeiten"
 
-#: bookwyrm/templates/user/shelf/shelf.html:79
-#: bookwyrm/templates/user/shelf/shelf.html:101
+#: bookwyrm/templates/user/shelf/shelf.html:80
+#: bookwyrm/templates/user/shelf/shelf.html:104
 msgid "Shelved"
 msgstr "Ins Regal gestellt"
 
-#: bookwyrm/templates/user/shelf/shelf.html:80
-#: bookwyrm/templates/user/shelf/shelf.html:105
+#: bookwyrm/templates/user/shelf/shelf.html:81
+#: bookwyrm/templates/user/shelf/shelf.html:108
 msgid "Started"
 msgstr "Gestartet"
 
-#: bookwyrm/templates/user/shelf/shelf.html:81
-#: bookwyrm/templates/user/shelf/shelf.html:108
+#: bookwyrm/templates/user/shelf/shelf.html:82
+#: bookwyrm/templates/user/shelf/shelf.html:111
 msgid "Finished"
 msgstr "Abgeschlossen"
 
-#: bookwyrm/templates/user/shelf/shelf.html:134
+#: bookwyrm/templates/user/shelf/shelf.html:137
 msgid "This shelf is empty."
 msgstr "Dieses Regal ist leer."
 
-#: bookwyrm/templates/user/shelf/shelf.html:140
+#: bookwyrm/templates/user/shelf/shelf.html:143
 msgid "Delete shelf"
 msgstr "Regal löschen"
 
@@ -2903,24 +2932,24 @@ msgstr ""
 msgid "No activities yet!"
 msgstr "Noch keine Aktivitäten!"
 
-#: bookwyrm/templates/user/user_preview.html:14
+#: bookwyrm/templates/user/user_preview.html:15
 #, python-format
 msgid "Joined %(date)s"
 msgstr "Beigetreten %(date)s"
 
-#: bookwyrm/templates/user/user_preview.html:18
+#: bookwyrm/templates/user/user_preview.html:19
 #, python-format
 msgid "%(counter)s follower"
 msgid_plural "%(counter)s followers"
 msgstr[0] "%(counter)s Folgende*r"
 msgstr[1] "%(counter)s Folgende"
 
-#: bookwyrm/templates/user/user_preview.html:19
+#: bookwyrm/templates/user/user_preview.html:20
 #, python-format
 msgid "%(counter)s following"
 msgstr "Folgt %(counter)s"
 
-#: bookwyrm/templates/user/user_preview.html:25
+#: bookwyrm/templates/user/user_preview.html:26
 #, fuzzy, python-format
 #| msgid "followed you"
 msgid "%(mutuals_display)s follower you follow"
@@ -2928,7 +2957,7 @@ msgid_plural "%(mutuals_display)s followers you follow"
 msgstr[0] "folgt dir"
 msgstr[1] "folgt dir"
 
-#: bookwyrm/templates/user_admin/user.html:11
+#: bookwyrm/templates/user_admin/user.html:9
 #, fuzzy
 #| msgid "Back to reports"
 msgid "Back to users"
@@ -3009,17 +3038,22 @@ msgstr ""
 msgid "Access level:"
 msgstr ""
 
-#: bookwyrm/views/password.py:32
+#: bookwyrm/views/password.py:30 bookwyrm/views/password.py:35
 #, fuzzy
 #| msgid "A user with that username already exists."
 msgid "No user with that email address was found."
 msgstr "Dieser Benutzename ist bereits vergeben."
 
-#: bookwyrm/views/password.py:41
+#: bookwyrm/views/password.py:44
 #, python-format
 msgid "A password reset link sent to %s"
 msgstr ""
 
+#, fuzzy
+#~| msgid "Book"
+#~ msgid "BookWyrm\\"
+#~ msgstr "Buch"
+
 #, fuzzy
 #~| msgid "Show more"
 #~ msgid "Show"
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index dac6e253..a27ae380 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-10 13:23-0700\n"
+"POT-Creation-Date: 2021-05-14 15:12-0700\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"
@@ -55,13 +55,13 @@ msgstr ""
 msgid "Book Title"
 msgstr ""
 
-#: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:31
-#: bookwyrm/templates/user/shelf/shelf.html:82
-#: bookwyrm/templates/user/shelf/shelf.html:112
+#: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:34
+#: bookwyrm/templates/user/shelf/shelf.html:84
+#: bookwyrm/templates/user/shelf/shelf.html:115
 msgid "Rating"
 msgstr ""
 
-#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:100
+#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:101
 msgid "Sort By"
 msgstr ""
 
@@ -131,19 +131,149 @@ msgstr ""
 msgid "Something went wrong! Sorry about that."
 msgstr ""
 
-#: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
+#: bookwyrm/templates/author/author.html:17
+#: bookwyrm/templates/author/author.html:18
 msgid "Edit Author"
 msgstr ""
 
-#: bookwyrm/templates/author.html:31
+#: bookwyrm/templates/author/author.html:33
+#: bookwyrm/templates/author/edit_author.html:38
+msgid "Aliases:"
+msgstr ""
+
+#: bookwyrm/templates/author/author.html:39
+msgid "Born:"
+msgstr ""
+
+#: bookwyrm/templates/author/author.html:45
+msgid "Died:"
+msgstr ""
+
+#: bookwyrm/templates/author/author.html:52
 msgid "Wikipedia"
 msgstr ""
 
-#: bookwyrm/templates/author.html:36
+#: bookwyrm/templates/author/author.html:56
+#: bookwyrm/templates/book/book.html:81
+msgid "View on OpenLibrary"
+msgstr ""
+
+#: bookwyrm/templates/author/author.html:61
+#: bookwyrm/templates/book/book.html:84
+msgid "View on Inventaire"
+msgstr ""
+
+#: bookwyrm/templates/author/author.html:75
 #, python-format
 msgid "Books by %(name)s"
 msgstr ""
 
+#: bookwyrm/templates/author/edit_author.html:5
+msgid "Edit Author:"
+msgstr ""
+
+#: bookwyrm/templates/author/edit_author.html:13
+#: bookwyrm/templates/book/edit_book.html:18
+msgid "Added:"
+msgstr ""
+
+#: bookwyrm/templates/author/edit_author.html:14
+#: bookwyrm/templates/book/edit_book.html:19
+msgid "Updated:"
+msgstr ""
+
+#: bookwyrm/templates/author/edit_author.html:15
+#: bookwyrm/templates/book/edit_book.html:20
+msgid "Last edited by:"
+msgstr ""
+
+#: bookwyrm/templates/author/edit_author.html:31
+#: bookwyrm/templates/book/edit_book.html:90
+msgid "Metadata"
+msgstr ""
+
+#: bookwyrm/templates/author/edit_author.html:32
+#: bookwyrm/templates/lists/form.html:8
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:13
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:14
+msgid "Name:"
+msgstr ""
+
+#: bookwyrm/templates/author/edit_author.html:40
+#: bookwyrm/templates/book/edit_book.html:128
+#: bookwyrm/templates/book/edit_book.html:165
+msgid "Separate multiple values with commas."
+msgstr ""
+
+#: bookwyrm/templates/author/edit_author.html:46
+msgid "Bio:"
+msgstr ""
+
+#: bookwyrm/templates/author/edit_author.html:51
+msgid "Wikipedia link:"
+msgstr ""
+
+#: bookwyrm/templates/author/edit_author.html:57
+msgid "Birth date:"
+msgstr ""
+
+#: bookwyrm/templates/author/edit_author.html:65
+msgid "Death date:"
+msgstr ""
+
+#: bookwyrm/templates/author/edit_author.html:73
+msgid "Author Identifiers"
+msgstr ""
+
+#: bookwyrm/templates/author/edit_author.html:74
+#: bookwyrm/templates/book/edit_book.html:223
+msgid "Openlibrary key:"
+msgstr ""
+
+#: bookwyrm/templates/author/edit_author.html:79
+msgid "Inventaire ID:"
+msgstr ""
+
+#: bookwyrm/templates/author/edit_author.html:84
+msgid "Librarything key:"
+msgstr ""
+
+#: bookwyrm/templates/author/edit_author.html:89
+msgid "Goodreads key:"
+msgstr ""
+
+#: bookwyrm/templates/author/edit_author.html:98
+#: bookwyrm/templates/book/book.html:127
+#: bookwyrm/templates/book/edit_book.html:241
+#: bookwyrm/templates/lists/form.html:42
+#: bookwyrm/templates/preferences/edit_user.html:70
+#: bookwyrm/templates/settings/edit_server.html:68
+#: bookwyrm/templates/settings/federated_server.html:94
+#: bookwyrm/templates/settings/site.html:97
+#: bookwyrm/templates/snippets/readthrough.html:77
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:38
+msgid "Save"
+msgstr ""
+
+#: bookwyrm/templates/author/edit_author.html:99
+#: bookwyrm/templates/book/book.html:128 bookwyrm/templates/book/book.html:180
+#: bookwyrm/templates/book/cover_modal.html:32
+#: bookwyrm/templates/book/edit_book.html:242
+#: bookwyrm/templates/moderation/report_modal.html:34
+#: bookwyrm/templates/settings/federated_server.html:95
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
+#: bookwyrm/templates/snippets/goal_form.html:32
+#: bookwyrm/templates/snippets/readthrough.html:78
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
+msgid "Cancel"
+msgstr ""
+
 #: bookwyrm/templates/book/book.html:33
 #: bookwyrm/templates/discover/large-book.html:25
 #: bookwyrm/templates/discover/small-book.html:19
@@ -163,14 +293,6 @@ msgstr ""
 msgid "Failed to load cover"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:81
-msgid "View on OpenLibrary"
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:84
-msgid "View on Inventaire"
-msgstr ""
-
 #: bookwyrm/templates/book/book.html:104
 #, python-format
 msgid "(%(review_count)s review)"
@@ -188,37 +310,6 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:127
-#: bookwyrm/templates/book/edit_book.html:249
-#: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:70
-#: bookwyrm/templates/settings/edit_server.html:68
-#: bookwyrm/templates/settings/federated_server.html:93
-#: bookwyrm/templates/settings/site.html:97
-#: bookwyrm/templates/snippets/readthrough.html:77
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:50
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:38
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:38
-msgid "Save"
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:128 bookwyrm/templates/book/book.html:180
-#: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:250
-#: bookwyrm/templates/edit_author.html:79
-#: bookwyrm/templates/moderation/report_modal.html:34
-#: bookwyrm/templates/settings/federated_server.html:94
-#: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
-#: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/readthrough.html:78
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:51
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:39
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
-msgid "Cancel"
-msgstr ""
-
 #: bookwyrm/templates/book/book.html:137
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
@@ -282,7 +373,7 @@ msgstr ""
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
-#: bookwyrm/templates/user/layout.html:67
+#: bookwyrm/templates/user/layout.html:68
 msgid "Lists"
 msgstr ""
 
@@ -292,7 +383,7 @@ msgstr ""
 
 #: bookwyrm/templates/book/book.html:320
 #: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:163
+#: bookwyrm/templates/lists/list.html:164
 msgid "Add"
 msgstr ""
 
@@ -301,22 +392,22 @@ msgid "ISBN:"
 msgstr ""
 
 #: bookwyrm/templates/book/book_identifiers.html:15
-#: bookwyrm/templates/book/edit_book.html:235
+#: bookwyrm/templates/book/edit_book.html:227
 msgid "OCLC Number:"
 msgstr ""
 
 #: bookwyrm/templates/book/book_identifiers.html:22
-#: bookwyrm/templates/book/edit_book.html:239
+#: bookwyrm/templates/book/edit_book.html:231
 msgid "ASIN:"
 msgstr ""
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:187
+#: bookwyrm/templates/book/edit_book.html:179
 msgid "Upload cover:"
 msgstr ""
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:193
+#: bookwyrm/templates/book/edit_book.html:185
 msgid "Load cover from url:"
 msgstr ""
 
@@ -331,21 +422,6 @@ msgstr ""
 msgid "Add Book"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:18
-#: bookwyrm/templates/edit_author.html:13
-msgid "Added:"
-msgstr ""
-
-#: bookwyrm/templates/book/edit_book.html:19
-#: bookwyrm/templates/edit_author.html:14
-msgid "Updated:"
-msgstr ""
-
-#: bookwyrm/templates/book/edit_book.html:20
-#: bookwyrm/templates/edit_author.html:15
-msgid "Last edited by:"
-msgstr ""
-
 #: bookwyrm/templates/book/edit_book.html:40
 msgid "Confirm Book Info"
 msgstr ""
@@ -387,11 +463,6 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:90
-#: bookwyrm/templates/edit_author.html:31
-msgid "Metadata"
-msgstr ""
-
 #: bookwyrm/templates/book/edit_book.html:92
 msgid "Title:"
 msgstr ""
@@ -412,76 +483,67 @@ msgstr ""
 msgid "Publisher:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:128
-msgid "Separate multiple publishers with commas."
-msgstr ""
-
 #: bookwyrm/templates/book/edit_book.html:135
 msgid "First published date:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:147
+#: bookwyrm/templates/book/edit_book.html:143
 msgid "Published date:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:160
+#: bookwyrm/templates/book/edit_book.html:152
 msgid "Authors"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:166
+#: bookwyrm/templates/book/edit_book.html:158
 #, python-format
 msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:171
+#: bookwyrm/templates/book/edit_book.html:163
 msgid "Add Authors:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:172
+#: bookwyrm/templates/book/edit_book.html:164
 msgid "John Doe, Jane Smith"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:178
-#: bookwyrm/templates/user/shelf/shelf.html:76
+#: bookwyrm/templates/book/edit_book.html:170
+#: bookwyrm/templates/user/shelf/shelf.html:77
 msgid "Cover"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:206
+#: bookwyrm/templates/book/edit_book.html:198
 msgid "Physical Properties"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:207
+#: bookwyrm/templates/book/edit_book.html:199
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:215
+#: bookwyrm/templates/book/edit_book.html:207
 msgid "Pages:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:222
+#: bookwyrm/templates/book/edit_book.html:214
 msgid "Book Identifiers"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:223
+#: bookwyrm/templates/book/edit_book.html:215
 msgid "ISBN 13:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:227
+#: bookwyrm/templates/book/edit_book.html:219
 msgid "ISBN 10:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:231
-#: bookwyrm/templates/edit_author.html:59
-msgid "Openlibrary key:"
-msgstr ""
-
-#: bookwyrm/templates/book/editions.html:5
+#: bookwyrm/templates/book/editions.html:4
 #, python-format
 msgid "Editions of %(book_title)s"
 msgstr ""
 
-#: bookwyrm/templates/book/editions.html:9
+#: bookwyrm/templates/book/editions.html:8
 #, python-format
 msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 msgstr ""
@@ -532,7 +594,7 @@ msgstr ""
 
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
-#: bookwyrm/templates/feed/feed_layout.html:70
+#: bookwyrm/templates/feed/feed_layout.html:69
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
 #: bookwyrm/templates/search/book.html:32
@@ -587,23 +649,23 @@ msgstr ""
 msgid "Recently active"
 msgstr ""
 
-#: bookwyrm/templates/directory/user_card.html:32
+#: bookwyrm/templates/directory/user_card.html:33
 msgid "follower you follow"
 msgid_plural "followers you follow"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/directory/user_card.html:39
+#: bookwyrm/templates/directory/user_card.html:40
 msgid "book on your shelves"
 msgid_plural "books on your shelves"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/directory/user_card.html:47
+#: bookwyrm/templates/directory/user_card.html:48
 msgid "posts"
 msgstr ""
 
-#: bookwyrm/templates/directory/user_card.html:53
+#: bookwyrm/templates/directory/user_card.html:54
 msgid "last active"
 msgstr ""
 
@@ -689,44 +751,6 @@ msgstr ""
 msgid "Your Account"
 msgstr ""
 
-#: bookwyrm/templates/edit_author.html:5
-msgid "Edit Author:"
-msgstr ""
-
-#: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
-#: bookwyrm/templates/user/shelf/create_shelf_form.html:13
-#: bookwyrm/templates/user/shelf/edit_shelf_form.html:14
-msgid "Name:"
-msgstr ""
-
-#: bookwyrm/templates/edit_author.html:37
-msgid "Bio:"
-msgstr ""
-
-#: bookwyrm/templates/edit_author.html:42
-msgid "Wikipedia link:"
-msgstr ""
-
-#: bookwyrm/templates/edit_author.html:47
-msgid "Birth date:"
-msgstr ""
-
-#: bookwyrm/templates/edit_author.html:52
-msgid "Death date:"
-msgstr ""
-
-#: bookwyrm/templates/edit_author.html:58
-msgid "Author Identifiers"
-msgstr ""
-
-#: bookwyrm/templates/edit_author.html:64
-msgid "Librarything key:"
-msgstr ""
-
-#: bookwyrm/templates/edit_author.html:69
-msgid "Goodreads key:"
-msgstr ""
-
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
@@ -807,76 +831,76 @@ msgstr ""
 msgid "You have no messages right now."
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:9
+#: bookwyrm/templates/feed/feed.html:8
 msgid "Home Timeline"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:11
+#: bookwyrm/templates/feed/feed.html:10
 msgid "Local Timeline"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:13
+#: bookwyrm/templates/feed/feed.html:12
 msgid "Federated Timeline"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:19
+#: bookwyrm/templates/feed/feed.html:18
 msgid "Home"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:22
+#: bookwyrm/templates/feed/feed.html:21
 msgid "Local"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:25
+#: bookwyrm/templates/feed/feed.html:24
 #: bookwyrm/templates/settings/edit_server.html:40
 msgid "Federated"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:33
+#: bookwyrm/templates/feed/feed.html:32
 #, python-format
 msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:48
+#: bookwyrm/templates/feed/feed.html:47
 msgid "There aren't any activities right now! Try following a user to get started"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed.html:56
+#: bookwyrm/templates/feed/feed.html:55
 #: bookwyrm/templates/get_started/users.html:6
 msgid "Who to follow"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed_layout.html:5
+#: bookwyrm/templates/feed/feed_layout.html:4
 msgid "Updates"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed_layout.html:11
+#: bookwyrm/templates/feed/feed_layout.html:10
 #: bookwyrm/templates/layout.html:59
 #: bookwyrm/templates/user/shelf/books_header.html:3
 msgid "Your books"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed_layout.html:13
+#: bookwyrm/templates/feed/feed_layout.html:12
 msgid "There are no books here right now! Try searching for a book to get started"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed_layout.html:24
-#: bookwyrm/templates/user/shelf/shelf.html:28
+#: bookwyrm/templates/feed/feed_layout.html:23
+#: bookwyrm/templates/user/shelf/shelf.html:29
 msgid "To Read"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed_layout.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:28
+#: bookwyrm/templates/feed/feed_layout.html:24
+#: bookwyrm/templates/user/shelf/shelf.html:29
 msgid "Currently Reading"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed_layout.html:26
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-#: bookwyrm/templates/user/shelf/shelf.html:28
+#: bookwyrm/templates/feed/feed_layout.html:25
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
+#: bookwyrm/templates/user/shelf/shelf.html:29
 msgid "Read"
 msgstr ""
 
-#: bookwyrm/templates/feed/feed_layout.html:88 bookwyrm/templates/goal.html:26
+#: bookwyrm/templates/feed/feed_layout.html:87 bookwyrm/templates/goal.html:26
 #: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
 msgid "%(year)s Reading Goal"
@@ -906,7 +930,7 @@ msgid "What are you reading?"
 msgstr ""
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:119
+#: bookwyrm/templates/lists/list.html:120
 msgid "Search for a book"
 msgstr ""
 
@@ -926,7 +950,7 @@ msgstr ""
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
 #: bookwyrm/templates/layout.html:38 bookwyrm/templates/layout.html:39
-#: bookwyrm/templates/lists/list.html:123
+#: bookwyrm/templates/lists/list.html:124
 #: bookwyrm/templates/search/layout.html:4
 #: bookwyrm/templates/search/layout.html:9
 msgid "Search"
@@ -942,7 +966,7 @@ msgid "Popular on %(site_name)s"
 msgstr ""
 
 #: bookwyrm/templates/get_started/books.html:58
-#: bookwyrm/templates/lists/list.html:136
+#: bookwyrm/templates/lists/list.html:137
 msgid "No books found"
 msgstr ""
 
@@ -1062,95 +1086,95 @@ msgstr ""
 msgid "Data source:"
 msgstr ""
 
-#: bookwyrm/templates/import.html:29
+#: bookwyrm/templates/import.html:32
 msgid "Data file:"
 msgstr ""
 
-#: bookwyrm/templates/import.html:37
+#: bookwyrm/templates/import.html:40
 msgid "Include reviews"
 msgstr ""
 
-#: bookwyrm/templates/import.html:42
+#: bookwyrm/templates/import.html:45
 msgid "Privacy setting for imported reviews:"
 msgstr ""
 
-#: bookwyrm/templates/import.html:48
+#: bookwyrm/templates/import.html:51
 #: bookwyrm/templates/settings/server_blocklist.html:64
 msgid "Import"
 msgstr ""
 
-#: bookwyrm/templates/import.html:53
+#: bookwyrm/templates/import.html:56
 msgid "Recent Imports"
 msgstr ""
 
-#: bookwyrm/templates/import.html:55
+#: bookwyrm/templates/import.html:58
 msgid "No recent imports"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:6
-#: bookwyrm/templates/import_status.html:10
+#: bookwyrm/templates/import_status.html:5
+#: bookwyrm/templates/import_status.html:9
 msgid "Import Status"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:13
+#: bookwyrm/templates/import_status.html:12
 msgid "Import started:"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:17
+#: bookwyrm/templates/import_status.html:16
 msgid "Import completed:"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:20
+#: bookwyrm/templates/import_status.html:19
 msgid "TASK FAILED"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:26
+#: bookwyrm/templates/import_status.html:25
 msgid "Import still in progress."
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:28
+#: bookwyrm/templates/import_status.html:27
 msgid "(Hit reload to update!)"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:35
+#: bookwyrm/templates/import_status.html:34
 msgid "Failed to load"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:44
+#: bookwyrm/templates/import_status.html:43
 #, python-format
 msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:79
+#: bookwyrm/templates/import_status.html:78
 msgid "Select all"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:82
+#: bookwyrm/templates/import_status.html:81
 msgid "Retry items"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:108
+#: bookwyrm/templates/import_status.html:107
 msgid "Successfully imported"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:112
+#: bookwyrm/templates/import_status.html:111
 msgid "Book"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:115
-#: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/user/shelf/shelf.html:77
-#: bookwyrm/templates/user/shelf/shelf.html:95
+#: bookwyrm/templates/import_status.html:114
+#: bookwyrm/templates/snippets/create_status_form.html:13
+#: bookwyrm/templates/user/shelf/shelf.html:78
+#: bookwyrm/templates/user/shelf/shelf.html:98
 msgid "Title"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/user/shelf/shelf.html:78
-#: bookwyrm/templates/user/shelf/shelf.html:98
+#: bookwyrm/templates/import_status.html:117
+#: bookwyrm/templates/user/shelf/shelf.html:79
+#: bookwyrm/templates/user/shelf/shelf.html:101
 msgid "Author"
 msgstr ""
 
-#: bookwyrm/templates/import_status.html:141
+#: bookwyrm/templates/import_status.html:140
 msgid "Imported"
 msgstr ""
 
@@ -1259,7 +1283,7 @@ msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%
 msgstr ""
 
 #: bookwyrm/templates/layout.html:217
-msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr ""
 
 #: bookwyrm/templates/lists/create_form.html:5
@@ -1302,7 +1326,7 @@ msgid "Discard"
 msgstr ""
 
 #: bookwyrm/templates/lists/edit_form.html:5
-#: bookwyrm/templates/lists/list_layout.html:18
+#: bookwyrm/templates/lists/list_layout.html:17
 msgid "Edit List"
 msgstr ""
 
@@ -1336,66 +1360,66 @@ msgstr ""
 msgid "Anyone can add books to this list"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:19
+#: bookwyrm/templates/lists/list.html:20
 msgid "You successfully suggested a book for this list!"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:21
+#: bookwyrm/templates/lists/list.html:22
 msgid "You successfully added a book to this list!"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:27
+#: bookwyrm/templates/lists/list.html:28
 msgid "This list is currently empty"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:64
+#: bookwyrm/templates/lists/list.html:65
 #, python-format
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:76
+#: bookwyrm/templates/lists/list.html:77
 msgid "Set"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:79
+#: bookwyrm/templates/lists/list.html:80
 msgid "List position"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:85
+#: bookwyrm/templates/lists/list.html:86
 #: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:98 bookwyrm/templates/lists/list.html:110
+#: bookwyrm/templates/lists/list.html:99 bookwyrm/templates/lists/list.html:111
 msgid "Sort List"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:104
+#: bookwyrm/templates/lists/list.html:105
 msgid "Direction"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:115
+#: bookwyrm/templates/lists/list.html:116
 msgid "Add Books"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:115
+#: bookwyrm/templates/lists/list.html:116
 msgid "Suggest Books"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:124
+#: bookwyrm/templates/lists/list.html:125
 msgid "search"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:130
+#: bookwyrm/templates/lists/list.html:131
 msgid "Clear search"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:135
+#: bookwyrm/templates/lists/list.html:136
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:163
+#: bookwyrm/templates/lists/list.html:164
 msgid "Suggest"
 msgstr ""
 
@@ -1420,36 +1444,36 @@ msgstr ""
 msgid "More about this site"
 msgstr ""
 
+#: bookwyrm/templates/moderation/report.html:5
 #: bookwyrm/templates/moderation/report.html:6
-#: bookwyrm/templates/moderation/report.html:7
 #: bookwyrm/templates/moderation/report_preview.html:6
 #, python-format
 msgid "Report #%(report_id)s: %(username)s"
 msgstr ""
 
-#: bookwyrm/templates/moderation/report.html:11
+#: bookwyrm/templates/moderation/report.html:10
 msgid "Back to reports"
 msgstr ""
 
-#: bookwyrm/templates/moderation/report.html:23
+#: bookwyrm/templates/moderation/report.html:22
 msgid "Moderator Comments"
 msgstr ""
 
-#: bookwyrm/templates/moderation/report.html:41
+#: bookwyrm/templates/moderation/report.html:40
 #: bookwyrm/templates/snippets/create_status.html:28
-#: bookwyrm/templates/snippets/create_status_form.html:63
+#: bookwyrm/templates/snippets/create_status_form.html:66
 msgid "Comment"
 msgstr ""
 
-#: bookwyrm/templates/moderation/report.html:46
+#: bookwyrm/templates/moderation/report.html:45
 msgid "Reported statuses"
 msgstr ""
 
-#: bookwyrm/templates/moderation/report.html:48
+#: bookwyrm/templates/moderation/report.html:47
 msgid "No statuses reported"
 msgstr ""
 
-#: bookwyrm/templates/moderation/report.html:54
+#: bookwyrm/templates/moderation/report.html:53
 msgid "Status has been deleted"
 msgstr ""
 
@@ -1718,7 +1742,7 @@ msgstr ""
 
 #: bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
-#: bookwyrm/templates/user/layout.html:73
+#: bookwyrm/templates/user/layout.html:74
 msgid "Books"
 msgstr ""
 
@@ -1790,7 +1814,7 @@ msgid "Add server"
 msgstr ""
 
 #: bookwyrm/templates/settings/edit_server.html:7
-#: bookwyrm/templates/settings/federated_server.html:12
+#: bookwyrm/templates/settings/federated_server.html:13
 #: bookwyrm/templates/settings/server_blocklist.html:7
 msgid "Back to server list"
 msgstr ""
@@ -1805,24 +1829,24 @@ msgid "Instance:"
 msgstr ""
 
 #: bookwyrm/templates/settings/edit_server.html:37
-#: bookwyrm/templates/settings/federated_server.html:29
+#: bookwyrm/templates/settings/federated_server.html:30
 #: bookwyrm/templates/user_admin/user_info.html:34
 msgid "Status:"
 msgstr ""
 
 #: bookwyrm/templates/settings/edit_server.html:41
-#: bookwyrm/templates/settings/federated_server.html:9
+#: bookwyrm/templates/settings/federated_server.html:10
 msgid "Blocked"
 msgstr ""
 
 #: bookwyrm/templates/settings/edit_server.html:48
-#: bookwyrm/templates/settings/federated_server.html:21
+#: bookwyrm/templates/settings/federated_server.html:22
 #: bookwyrm/templates/user_admin/user_info.html:26
 msgid "Software:"
 msgstr ""
 
 #: bookwyrm/templates/settings/edit_server.html:55
-#: bookwyrm/templates/settings/federated_server.html:25
+#: bookwyrm/templates/settings/federated_server.html:26
 #: bookwyrm/templates/user_admin/user_info.html:30
 msgid "Version:"
 msgstr ""
@@ -1831,69 +1855,69 @@ msgstr ""
 msgid "Notes:"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:18
+#: bookwyrm/templates/settings/federated_server.html:19
 msgid "Details"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:36
-#: bookwyrm/templates/user/layout.html:55
+#: bookwyrm/templates/settings/federated_server.html:37
+#: bookwyrm/templates/user/layout.html:56
 msgid "Activity"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:39
+#: bookwyrm/templates/settings/federated_server.html:40
 msgid "Users:"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:42
-#: bookwyrm/templates/settings/federated_server.html:49
+#: bookwyrm/templates/settings/federated_server.html:43
+#: bookwyrm/templates/settings/federated_server.html:50
 msgid "View all"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:46
+#: bookwyrm/templates/settings/federated_server.html:47
 msgid "Reports:"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:53
+#: bookwyrm/templates/settings/federated_server.html:54
 msgid "Followed by us:"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:59
+#: bookwyrm/templates/settings/federated_server.html:60
 msgid "Followed by them:"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:65
+#: bookwyrm/templates/settings/federated_server.html:66
 msgid "Blocked by us:"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:77
+#: bookwyrm/templates/settings/federated_server.html:78
 #: bookwyrm/templates/user_admin/user_info.html:39
 msgid "Notes"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:80
+#: bookwyrm/templates/settings/federated_server.html:81
 msgid "Edit"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:100
+#: bookwyrm/templates/settings/federated_server.html:101
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:3
 msgid "Actions"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:104
+#: bookwyrm/templates/settings/federated_server.html:105
 #: bookwyrm/templates/snippets/block_button.html:5
 msgid "Block"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:105
+#: bookwyrm/templates/settings/federated_server.html:106
 msgid "All users from this instance will be deactivated."
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:110
+#: bookwyrm/templates/settings/federated_server.html:111
 #: bookwyrm/templates/snippets/block_button.html:10
 msgid "Un-block"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:111
+#: bookwyrm/templates/settings/federated_server.html:112
 msgid "All users from this instance will be re-activated."
 msgstr ""
 
@@ -2100,7 +2124,7 @@ msgstr ""
 msgid "Registration closed text:"
 msgstr ""
 
-#: bookwyrm/templates/snippets/book_cover.html:32
+#: bookwyrm/templates/snippets/book_cover.html:31
 msgid "No cover"
 msgstr ""
 
@@ -2109,13 +2133,13 @@ msgstr ""
 msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgstr ""
 
-#: bookwyrm/templates/snippets/boost_button.html:8
 #: bookwyrm/templates/snippets/boost_button.html:9
+#: bookwyrm/templates/snippets/boost_button.html:10
 msgid "Boost"
 msgstr ""
 
-#: bookwyrm/templates/snippets/boost_button.html:15
 #: bookwyrm/templates/snippets/boost_button.html:16
+#: bookwyrm/templates/snippets/boost_button.html:17
 msgid "Un-boost"
 msgstr ""
 
@@ -2135,64 +2159,64 @@ msgstr ""
 msgid "Quote"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:20
+#: bookwyrm/templates/snippets/create_status_form.html:23
 msgid "Comment:"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:22
+#: bookwyrm/templates/snippets/create_status_form.html:25
 msgid "Quote:"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:24
+#: bookwyrm/templates/snippets/create_status_form.html:27
 msgid "Review:"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:53
-#: bookwyrm/templates/snippets/status/layout.html:30
+#: bookwyrm/templates/snippets/create_status_form.html:56
+#: bookwyrm/templates/snippets/status/layout.html:29
+#: bookwyrm/templates/snippets/status/layout.html:47
 #: bookwyrm/templates/snippets/status/layout.html:48
-#: bookwyrm/templates/snippets/status/layout.html:49
 msgid "Reply"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:53
+#: bookwyrm/templates/snippets/create_status_form.html:56
 msgid "Content"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:77
+#: bookwyrm/templates/snippets/create_status_form.html:80
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
 msgid "Progress:"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:85
-#: bookwyrm/templates/snippets/readthrough_form.html:26
+#: bookwyrm/templates/snippets/create_status_form.html:88
+#: bookwyrm/templates/snippets/readthrough_form.html:22
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:86
-#: bookwyrm/templates/snippets/readthrough_form.html:27
+#: bookwyrm/templates/snippets/create_status_form.html:89
+#: bookwyrm/templates/snippets/readthrough_form.html:23
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:92
+#: bookwyrm/templates/snippets/create_status_form.html:95
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:107
+#: bookwyrm/templates/snippets/create_status_form.html:110
 msgid "Include spoiler alert"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:114
+#: bookwyrm/templates/snippets/create_status_form.html:117
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:19
 msgid "Private"
 msgstr ""
 
-#: bookwyrm/templates/snippets/create_status_form.html:125
+#: bookwyrm/templates/snippets/create_status_form.html:128
 msgid "Post"
 msgstr ""
 
@@ -2206,17 +2230,17 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u
 msgstr ""
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
-#: bookwyrm/templates/snippets/follow_request_buttons.html:13
+#: bookwyrm/templates/snippets/follow_request_buttons.html:12
 msgid "Delete"
 msgstr ""
 
-#: bookwyrm/templates/snippets/fav_button.html:7
 #: bookwyrm/templates/snippets/fav_button.html:9
+#: bookwyrm/templates/snippets/fav_button.html:11
 msgid "Like"
 msgstr ""
 
-#: bookwyrm/templates/snippets/fav_button.html:15
-#: bookwyrm/templates/snippets/fav_button.html:16
+#: bookwyrm/templates/snippets/fav_button.html:17
+#: bookwyrm/templates/snippets/fav_button.html:18
 msgid "Un-like"
 msgstr ""
 
@@ -2248,11 +2272,11 @@ msgstr ""
 msgid "Unfollow"
 msgstr ""
 
-#: bookwyrm/templates/snippets/follow_request_buttons.html:8
+#: bookwyrm/templates/snippets/follow_request_buttons.html:7
 msgid "Accept"
 msgstr ""
 
-#: bookwyrm/templates/snippets/form_rate_stars.html:20
+#: bookwyrm/templates/snippets/form_rate_stars.html:19
 #: bookwyrm/templates/snippets/stars.html:13
 msgid "No rating"
 msgstr ""
@@ -2301,8 +2325,8 @@ msgid "Goal privacy:"
 msgstr ""
 
 #: bookwyrm/templates/snippets/goal_form.html:26
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:45
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:33
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:29
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20
 msgid "Post to feed"
 msgstr ""
@@ -2413,12 +2437,12 @@ msgstr ""
 msgid "Started reading"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough_form.html:18
+#: bookwyrm/templates/snippets/readthrough_form.html:14
 msgid "Progress"
 msgstr ""
 
-#: bookwyrm/templates/snippets/readthrough_form.html:34
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:29
+#: bookwyrm/templates/snippets/readthrough_form.html:30
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25
 msgid "Finished reading"
 msgstr ""
 
@@ -2426,27 +2450,27 @@ msgstr ""
 msgid "Sign Up"
 msgstr ""
 
-#: bookwyrm/templates/snippets/report_button.html:5
+#: bookwyrm/templates/snippets/report_button.html:6
 msgid "Report"
 msgstr ""
 
 #: bookwyrm/templates/snippets/rss_title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:34
+#: bookwyrm/templates/snippets/status/status_header.html:35
 msgid "rated"
 msgstr ""
 
 #: bookwyrm/templates/snippets/rss_title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:36
+#: bookwyrm/templates/snippets/status/status_header.html:37
 msgid "reviewed"
 msgstr ""
 
 #: bookwyrm/templates/snippets/rss_title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:38
+#: bookwyrm/templates/snippets/status/status_header.html:39
 msgid "commented on"
 msgstr ""
 
 #: bookwyrm/templates/snippets/rss_title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:40
+#: bookwyrm/templates/snippets/status/status_header.html:41
 msgid "quoted"
 msgstr ""
 
@@ -2464,7 +2488,7 @@ msgid "Finish \"<em>%(book_title)s</em>\""
 msgstr ""
 
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:34
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:36
 msgid "Update progress"
 msgstr ""
 
@@ -2472,20 +2496,20 @@ msgstr ""
 msgid "More shelves"
 msgstr ""
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:8
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:10
 msgid "Start reading"
 msgstr ""
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:15
 msgid "Finish reading"
 msgstr ""
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:18
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26
 msgid "Want to read"
 msgstr ""
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:47
 #, python-format
 msgid "Remove from %(name)s"
 msgstr ""
@@ -2500,40 +2524,40 @@ msgstr ""
 msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/content_status.html:70
-#: bookwyrm/templates/snippets/trimmed_text.html:14
+#: bookwyrm/templates/snippets/status/content_status.html:71
+#: bookwyrm/templates/snippets/trimmed_text.html:15
 msgid "Show more"
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/content_status.html:85
-#: bookwyrm/templates/snippets/trimmed_text.html:29
+#: bookwyrm/templates/snippets/status/content_status.html:86
+#: bookwyrm/templates/snippets/trimmed_text.html:30
 msgid "Show less"
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/content_status.html:115
+#: bookwyrm/templates/snippets/status/content_status.html:116
 msgid "Open image in new window"
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/layout.html:22
+#: bookwyrm/templates/snippets/status/layout.html:21
 #: bookwyrm/templates/snippets/status/status_options.html:17
 msgid "Delete status"
 msgstr ""
 
+#: bookwyrm/templates/snippets/status/layout.html:51
 #: bookwyrm/templates/snippets/status/layout.html:52
-#: bookwyrm/templates/snippets/status/layout.html:53
 msgid "Boost status"
 msgstr ""
 
+#: bookwyrm/templates/snippets/status/layout.html:55
 #: bookwyrm/templates/snippets/status/layout.html:56
-#: bookwyrm/templates/snippets/status/layout.html:57
 msgid "Like status"
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/status.html:9
+#: bookwyrm/templates/snippets/status/status.html:10
 msgid "boosted"
 msgstr ""
 
-#: bookwyrm/templates/snippets/status/status_header.html:44
+#: bookwyrm/templates/snippets/status/status_header.html:45
 #, python-format
 msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
 msgstr ""
@@ -2565,15 +2589,15 @@ msgstr ""
 msgid "Sorted descending"
 msgstr ""
 
-#: bookwyrm/templates/user/layout.html:12 bookwyrm/templates/user/user.html:10
+#: bookwyrm/templates/user/layout.html:13 bookwyrm/templates/user/user.html:10
 msgid "User Profile"
 msgstr ""
 
-#: bookwyrm/templates/user/layout.html:36
+#: bookwyrm/templates/user/layout.html:37
 msgid "Follow Requests"
 msgstr ""
 
-#: bookwyrm/templates/user/layout.html:61
+#: bookwyrm/templates/user/layout.html:62
 msgid "Reading Goal"
 msgstr ""
 
@@ -2619,38 +2643,38 @@ msgstr ""
 msgid "Update shelf"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:24 bookwyrm/views/shelf.py:48
+#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:51
 msgid "All books"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:37
+#: bookwyrm/templates/user/shelf/shelf.html:38
 msgid "Create shelf"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:60
+#: bookwyrm/templates/user/shelf/shelf.html:61
 msgid "Edit shelf"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:79
-#: bookwyrm/templates/user/shelf/shelf.html:101
-msgid "Shelved"
-msgstr ""
-
 #: bookwyrm/templates/user/shelf/shelf.html:80
-#: bookwyrm/templates/user/shelf/shelf.html:105
-msgid "Started"
+#: bookwyrm/templates/user/shelf/shelf.html:104
+msgid "Shelved"
 msgstr ""
 
 #: bookwyrm/templates/user/shelf/shelf.html:81
 #: bookwyrm/templates/user/shelf/shelf.html:108
+msgid "Started"
+msgstr ""
+
+#: bookwyrm/templates/user/shelf/shelf.html:82
+#: bookwyrm/templates/user/shelf/shelf.html:111
 msgid "Finished"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:134
+#: bookwyrm/templates/user/shelf/shelf.html:137
 msgid "This shelf is empty."
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:140
+#: bookwyrm/templates/user/shelf/shelf.html:143
 msgid "Delete shelf"
 msgstr ""
 
@@ -2679,31 +2703,31 @@ msgstr ""
 msgid "No activities yet!"
 msgstr ""
 
-#: bookwyrm/templates/user/user_preview.html:14
+#: bookwyrm/templates/user/user_preview.html:15
 #, python-format
 msgid "Joined %(date)s"
 msgstr ""
 
-#: bookwyrm/templates/user/user_preview.html:18
+#: bookwyrm/templates/user/user_preview.html:19
 #, python-format
 msgid "%(counter)s follower"
 msgid_plural "%(counter)s followers"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/user/user_preview.html:19
+#: bookwyrm/templates/user/user_preview.html:20
 #, python-format
 msgid "%(counter)s following"
 msgstr ""
 
-#: bookwyrm/templates/user/user_preview.html:25
+#: bookwyrm/templates/user/user_preview.html:26
 #, python-format
 msgid "%(mutuals_display)s follower you follow"
 msgid_plural "%(mutuals_display)s followers you follow"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/user_admin/user.html:11
+#: bookwyrm/templates/user_admin/user.html:9
 msgid "Back to users"
 msgstr ""
 
@@ -2770,11 +2794,11 @@ msgstr ""
 msgid "Access level:"
 msgstr ""
 
-#: bookwyrm/views/password.py:32
+#: bookwyrm/views/password.py:30 bookwyrm/views/password.py:35
 msgid "No user with that email address was found."
 msgstr ""
 
-#: bookwyrm/views/password.py:41
+#: bookwyrm/views/password.py:44
 #, python-format
 msgid "A password reset link sent to %s"
 msgstr ""
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 864c9dbb..d426b029 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-10 13:23-0700\n"
+"POT-Creation-Date: 2021-05-14 15:12-0700\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,13 +55,13 @@ msgstr "Orden de la lista"
 msgid "Book Title"
 msgstr "Título"
 
-#: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:31
-#: bookwyrm/templates/user/shelf/shelf.html:82
-#: bookwyrm/templates/user/shelf/shelf.html:112
+#: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:34
+#: bookwyrm/templates/user/shelf/shelf.html:84
+#: bookwyrm/templates/user/shelf/shelf.html:115
 msgid "Rating"
 msgstr "Calificación"
 
-#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:100
+#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:101
 msgid "Sort By"
 msgstr "Ordenar por"
 
@@ -131,19 +131,155 @@ msgstr "Error de servidor"
 msgid "Something went wrong! Sorry about that."
 msgstr "¡Algo salió mal! Disculpa."
 
-#: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
+#: bookwyrm/templates/author/author.html:17
+#: bookwyrm/templates/author/author.html:18
 msgid "Edit Author"
 msgstr "Editar Autor/Autora"
 
-#: bookwyrm/templates/author.html:31
+#: bookwyrm/templates/author/author.html:33
+#: bookwyrm/templates/author/edit_author.html:38
+msgid "Aliases:"
+msgstr ""
+
+#: bookwyrm/templates/author/author.html:39
+msgid "Born:"
+msgstr ""
+
+#: bookwyrm/templates/author/author.html:45
+msgid "Died:"
+msgstr ""
+
+#: bookwyrm/templates/author/author.html:52
 msgid "Wikipedia"
 msgstr "Wikipedia"
 
-#: bookwyrm/templates/author.html:36
+#: bookwyrm/templates/author/author.html:56
+#: bookwyrm/templates/book/book.html:81
+msgid "View on OpenLibrary"
+msgstr "Ver en OpenLibrary"
+
+#: bookwyrm/templates/author/author.html:61
+#: bookwyrm/templates/book/book.html:84
+#, fuzzy
+#| msgid "View on OpenLibrary"
+msgid "View on Inventaire"
+msgstr "Ver en OpenLibrary"
+
+#: bookwyrm/templates/author/author.html:75
 #, python-format
 msgid "Books by %(name)s"
 msgstr "Libros de %(name)s"
 
+#: bookwyrm/templates/author/edit_author.html:5
+msgid "Edit Author:"
+msgstr "Editar Autor/Autora/Autore:"
+
+#: bookwyrm/templates/author/edit_author.html:13
+#: bookwyrm/templates/book/edit_book.html:18
+msgid "Added:"
+msgstr "Agregado:"
+
+#: bookwyrm/templates/author/edit_author.html:14
+#: bookwyrm/templates/book/edit_book.html:19
+msgid "Updated:"
+msgstr "Actualizado:"
+
+#: bookwyrm/templates/author/edit_author.html:15
+#: bookwyrm/templates/book/edit_book.html:20
+msgid "Last edited by:"
+msgstr "Editado más recientemente por:"
+
+#: bookwyrm/templates/author/edit_author.html:31
+#: bookwyrm/templates/book/edit_book.html:90
+msgid "Metadata"
+msgstr "Metadatos"
+
+#: bookwyrm/templates/author/edit_author.html:32
+#: bookwyrm/templates/lists/form.html:8
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:13
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:14
+msgid "Name:"
+msgstr "Nombre:"
+
+#: bookwyrm/templates/author/edit_author.html:40
+#: bookwyrm/templates/book/edit_book.html:128
+#: bookwyrm/templates/book/edit_book.html:165
+#, fuzzy
+#| msgid "Separate multiple publishers with commas."
+msgid "Separate multiple values with commas."
+msgstr "Separar varios editores con comas."
+
+#: bookwyrm/templates/author/edit_author.html:46
+msgid "Bio:"
+msgstr "Bio:"
+
+#: bookwyrm/templates/author/edit_author.html:51
+msgid "Wikipedia link:"
+msgstr "Enlace de Wikipedia:"
+
+#: bookwyrm/templates/author/edit_author.html:57
+msgid "Birth date:"
+msgstr "Fecha de nacimiento:"
+
+#: bookwyrm/templates/author/edit_author.html:65
+msgid "Death date:"
+msgstr "Fecha de muerte:"
+
+#: bookwyrm/templates/author/edit_author.html:73
+msgid "Author Identifiers"
+msgstr "Identificadores de autor/autora"
+
+#: bookwyrm/templates/author/edit_author.html:74
+#: bookwyrm/templates/book/edit_book.html:223
+msgid "Openlibrary key:"
+msgstr "Clave OpenLibrary:"
+
+#: bookwyrm/templates/author/edit_author.html:79
+#, fuzzy
+#| msgid "View on OpenLibrary"
+msgid "Inventaire ID:"
+msgstr "Ver en OpenLibrary"
+
+#: bookwyrm/templates/author/edit_author.html:84
+msgid "Librarything key:"
+msgstr "Clave Librarything:"
+
+#: bookwyrm/templates/author/edit_author.html:89
+msgid "Goodreads key:"
+msgstr "Clave Goodreads:"
+
+#: bookwyrm/templates/author/edit_author.html:98
+#: bookwyrm/templates/book/book.html:127
+#: bookwyrm/templates/book/edit_book.html:241
+#: bookwyrm/templates/lists/form.html:42
+#: bookwyrm/templates/preferences/edit_user.html:70
+#: bookwyrm/templates/settings/edit_server.html:68
+#: bookwyrm/templates/settings/federated_server.html:94
+#: bookwyrm/templates/settings/site.html:97
+#: bookwyrm/templates/snippets/readthrough.html:77
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:38
+msgid "Save"
+msgstr "Guardar"
+
+#: bookwyrm/templates/author/edit_author.html:99
+#: bookwyrm/templates/book/book.html:128 bookwyrm/templates/book/book.html:180
+#: bookwyrm/templates/book/cover_modal.html:32
+#: bookwyrm/templates/book/edit_book.html:242
+#: bookwyrm/templates/moderation/report_modal.html:34
+#: bookwyrm/templates/settings/federated_server.html:95
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
+#: bookwyrm/templates/snippets/goal_form.html:32
+#: bookwyrm/templates/snippets/readthrough.html:78
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
+msgid "Cancel"
+msgstr "Cancelar"
+
 #: bookwyrm/templates/book/book.html:33
 #: bookwyrm/templates/discover/large-book.html:25
 #: bookwyrm/templates/discover/small-book.html:19
@@ -163,16 +299,6 @@ msgstr "Agregar portada"
 msgid "Failed to load cover"
 msgstr "No se pudo cargar la portada"
 
-#: bookwyrm/templates/book/book.html:81
-msgid "View on OpenLibrary"
-msgstr "Ver en OpenLibrary"
-
-#: bookwyrm/templates/book/book.html:84
-#, fuzzy
-#| msgid "View on OpenLibrary"
-msgid "View on Inventaire"
-msgstr "Ver en OpenLibrary"
-
 #: bookwyrm/templates/book/book.html:104
 #, python-format
 msgid "(%(review_count)s review)"
@@ -190,37 +316,6 @@ msgstr "Agregar descripción"
 msgid "Description:"
 msgstr "Descripción:"
 
-#: bookwyrm/templates/book/book.html:127
-#: bookwyrm/templates/book/edit_book.html:249
-#: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:70
-#: bookwyrm/templates/settings/edit_server.html:68
-#: bookwyrm/templates/settings/federated_server.html:93
-#: bookwyrm/templates/settings/site.html:97
-#: bookwyrm/templates/snippets/readthrough.html:77
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:50
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:38
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:38
-msgid "Save"
-msgstr "Guardar"
-
-#: bookwyrm/templates/book/book.html:128 bookwyrm/templates/book/book.html:180
-#: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:250
-#: bookwyrm/templates/edit_author.html:79
-#: bookwyrm/templates/moderation/report_modal.html:34
-#: bookwyrm/templates/settings/federated_server.html:94
-#: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
-#: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/readthrough.html:78
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:51
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:39
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
-msgid "Cancel"
-msgstr "Cancelar"
-
 #: bookwyrm/templates/book/book.html:137
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
@@ -292,7 +387,7 @@ msgstr "Lugares"
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
-#: bookwyrm/templates/user/layout.html:67
+#: bookwyrm/templates/user/layout.html:68
 msgid "Lists"
 msgstr "Listas"
 
@@ -302,7 +397,7 @@ msgstr "Agregar a lista"
 
 #: bookwyrm/templates/book/book.html:320
 #: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:163
+#: bookwyrm/templates/lists/list.html:164
 msgid "Add"
 msgstr "Agregar"
 
@@ -311,22 +406,22 @@ msgid "ISBN:"
 msgstr "ISBN:"
 
 #: bookwyrm/templates/book/book_identifiers.html:15
-#: bookwyrm/templates/book/edit_book.html:235
+#: bookwyrm/templates/book/edit_book.html:227
 msgid "OCLC Number:"
 msgstr "Número OCLC:"
 
 #: bookwyrm/templates/book/book_identifiers.html:22
-#: bookwyrm/templates/book/edit_book.html:239
+#: bookwyrm/templates/book/edit_book.html:231
 msgid "ASIN:"
 msgstr "ASIN:"
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:187
+#: bookwyrm/templates/book/edit_book.html:179
 msgid "Upload cover:"
 msgstr "Subir portada:"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:193
+#: bookwyrm/templates/book/edit_book.html:185
 msgid "Load cover from url:"
 msgstr "Agregar portada de url:"
 
@@ -341,21 +436,6 @@ msgstr "Editar \"%(book_title)s\""
 msgid "Add Book"
 msgstr "Agregar libro"
 
-#: bookwyrm/templates/book/edit_book.html:18
-#: bookwyrm/templates/edit_author.html:13
-msgid "Added:"
-msgstr "Agregado:"
-
-#: bookwyrm/templates/book/edit_book.html:19
-#: bookwyrm/templates/edit_author.html:14
-msgid "Updated:"
-msgstr "Actualizado:"
-
-#: bookwyrm/templates/book/edit_book.html:20
-#: bookwyrm/templates/edit_author.html:15
-msgid "Last edited by:"
-msgstr "Editado más recientemente por:"
-
 #: bookwyrm/templates/book/edit_book.html:40
 msgid "Confirm Book Info"
 msgstr "Confirmar información de libro"
@@ -397,11 +477,6 @@ msgstr "Confirmar"
 msgid "Back"
 msgstr "Volver"
 
-#: bookwyrm/templates/book/edit_book.html:90
-#: bookwyrm/templates/edit_author.html:31
-msgid "Metadata"
-msgstr "Metadatos"
-
 #: bookwyrm/templates/book/edit_book.html:92
 msgid "Title:"
 msgstr "Título:"
@@ -422,76 +497,67 @@ msgstr "Número de serie:"
 msgid "Publisher:"
 msgstr "Editorial:"
 
-#: bookwyrm/templates/book/edit_book.html:128
-msgid "Separate multiple publishers with commas."
-msgstr "Separar varios editores con comas."
-
 #: bookwyrm/templates/book/edit_book.html:135
 msgid "First published date:"
 msgstr "Fecha de primera publicación:"
 
-#: bookwyrm/templates/book/edit_book.html:147
+#: bookwyrm/templates/book/edit_book.html:143
 msgid "Published date:"
 msgstr "Fecha de publicación:"
 
-#: bookwyrm/templates/book/edit_book.html:160
+#: bookwyrm/templates/book/edit_book.html:152
 msgid "Authors"
 msgstr "Autores"
 
-#: bookwyrm/templates/book/edit_book.html:166
+#: bookwyrm/templates/book/edit_book.html:158
 #, python-format
 msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
 msgstr "Eliminar <a href=\"%(path)s\">%(name)s</a>"
 
-#: bookwyrm/templates/book/edit_book.html:171
+#: bookwyrm/templates/book/edit_book.html:163
 msgid "Add Authors:"
 msgstr "Agregar Autores:"
 
-#: bookwyrm/templates/book/edit_book.html:172
+#: bookwyrm/templates/book/edit_book.html:164
 msgid "John Doe, Jane Smith"
 msgstr "Juan Nadie, Natalia Natalia"
 
-#: bookwyrm/templates/book/edit_book.html:178
-#: bookwyrm/templates/user/shelf/shelf.html:76
+#: bookwyrm/templates/book/edit_book.html:170
+#: bookwyrm/templates/user/shelf/shelf.html:77
 msgid "Cover"
 msgstr "Portada:"
 
-#: bookwyrm/templates/book/edit_book.html:206
+#: bookwyrm/templates/book/edit_book.html:198
 msgid "Physical Properties"
 msgstr "Propiedades físicas:"
 
-#: bookwyrm/templates/book/edit_book.html:207
+#: bookwyrm/templates/book/edit_book.html:199
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "Formato:"
 
-#: bookwyrm/templates/book/edit_book.html:215
+#: bookwyrm/templates/book/edit_book.html:207
 msgid "Pages:"
 msgstr "Páginas:"
 
-#: bookwyrm/templates/book/edit_book.html:222
+#: bookwyrm/templates/book/edit_book.html:214
 msgid "Book Identifiers"
 msgstr "Identificadores de libro"
 
-#: bookwyrm/templates/book/edit_book.html:223
+#: bookwyrm/templates/book/edit_book.html:215
 msgid "ISBN 13:"
 msgstr "ISBN 13:"
 
-#: bookwyrm/templates/book/edit_book.html:227
+#: bookwyrm/templates/book/edit_book.html:219
 msgid "ISBN 10:"
 msgstr "ISBN 10:"
 
-#: bookwyrm/templates/book/edit_book.html:231
-#: bookwyrm/templates/edit_author.html:59
-msgid "Openlibrary key:"
-msgstr "Clave OpenLibrary:"
-
-#: bookwyrm/templates/book/editions.html:5
+#: bookwyrm/templates/book/editions.html:4
 #, python-format
 msgid "Editions of %(book_title)s"
 msgstr "Ediciones de %(book_title)s"
 
-#: bookwyrm/templates/book/editions.html:9
+#: bookwyrm/templates/book/editions.html:8
 #, python-format
 msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 msgstr "Ediciones de <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
@@ -542,7 +608,7 @@ msgstr "Publicado por %(publisher)s."
 
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
-#: bookwyrm/templates/feed/feed_layout.html:70
+#: bookwyrm/templates/feed/feed_layout.html:69
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
 #: bookwyrm/templates/search/book.html:32
@@ -597,23 +663,23 @@ msgstr "Sugerido"
 msgid "Recently active"
 msgstr "Activ@ recientemente"
 
-#: bookwyrm/templates/directory/user_card.html:32
+#: bookwyrm/templates/directory/user_card.html:33
 msgid "follower you follow"
 msgid_plural "followers you follow"
 msgstr[0] "seguidor que tu sigues"
 msgstr[1] "seguidores que tu sigues"
 
-#: bookwyrm/templates/directory/user_card.html:39
+#: bookwyrm/templates/directory/user_card.html:40
 msgid "book on your shelves"
 msgid_plural "books on your shelves"
 msgstr[0] "libro en tus estantes"
 msgstr[1] "libro en tus estantes"
 
-#: bookwyrm/templates/directory/user_card.html:47
+#: bookwyrm/templates/directory/user_card.html:48
 msgid "posts"
 msgstr "publicaciones"
 
-#: bookwyrm/templates/directory/user_card.html:53
+#: bookwyrm/templates/directory/user_card.html:54
 msgid "last active"
 msgstr "actividad reciente"
 
@@ -699,44 +765,6 @@ msgstr "Enviar"
 msgid "Your Account"
 msgstr "Tu cuenta"
 
-#: bookwyrm/templates/edit_author.html:5
-msgid "Edit Author:"
-msgstr "Editar Autor/Autora/Autore:"
-
-#: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
-#: bookwyrm/templates/user/shelf/create_shelf_form.html:13
-#: bookwyrm/templates/user/shelf/edit_shelf_form.html:14
-msgid "Name:"
-msgstr "Nombre:"
-
-#: bookwyrm/templates/edit_author.html:37
-msgid "Bio:"
-msgstr "Bio:"
-
-#: bookwyrm/templates/edit_author.html:42
-msgid "Wikipedia link:"
-msgstr "Enlace de Wikipedia:"
-
-#: bookwyrm/templates/edit_author.html:47
-msgid "Birth date:"
-msgstr "Fecha de nacimiento:"
-
-#: bookwyrm/templates/edit_author.html:52
-msgid "Death date:"
-msgstr "Fecha de muerte:"
-
-#: bookwyrm/templates/edit_author.html:58
-msgid "Author Identifiers"
-msgstr "Identificadores de autor/autora"
-
-#: bookwyrm/templates/edit_author.html:64
-msgid "Librarything key:"
-msgstr "Clave Librarything:"
-
-#: bookwyrm/templates/edit_author.html:69
-msgid "Goodreads key:"
-msgstr "Clave Goodreads:"
-
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
@@ -817,76 +845,76 @@ msgstr "Todos los mensajes"
 msgid "You have no messages right now."
 msgstr "No tienes ningún mensaje en este momento."
 
-#: bookwyrm/templates/feed/feed.html:9
+#: bookwyrm/templates/feed/feed.html:8
 msgid "Home Timeline"
 msgstr "Línea temporal de hogar"
 
-#: bookwyrm/templates/feed/feed.html:11
+#: bookwyrm/templates/feed/feed.html:10
 msgid "Local Timeline"
 msgstr "Línea temporal local"
 
-#: bookwyrm/templates/feed/feed.html:13
+#: bookwyrm/templates/feed/feed.html:12
 msgid "Federated Timeline"
 msgstr "Línea temporal federalizado"
 
-#: bookwyrm/templates/feed/feed.html:19
+#: bookwyrm/templates/feed/feed.html:18
 msgid "Home"
 msgstr "Hogar"
 
-#: bookwyrm/templates/feed/feed.html:22
+#: bookwyrm/templates/feed/feed.html:21
 msgid "Local"
 msgstr "Local"
 
-#: bookwyrm/templates/feed/feed.html:25
+#: bookwyrm/templates/feed/feed.html:24
 #: bookwyrm/templates/settings/edit_server.html:40
 msgid "Federated"
 msgstr "Federalizado"
 
-#: bookwyrm/templates/feed/feed.html:33
+#: bookwyrm/templates/feed/feed.html:32
 #, python-format
 msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
 msgstr "cargar <span data-poll=\"stream/%(tab)s\">0</span> status(es) no leídos"
 
-#: bookwyrm/templates/feed/feed.html:48
+#: bookwyrm/templates/feed/feed.html:47
 msgid "There aren't any activities right now! Try following a user to get started"
 msgstr "¡No hay actividad ahora mismo! Sigue a otro usuario para empezar"
 
-#: bookwyrm/templates/feed/feed.html:56
+#: bookwyrm/templates/feed/feed.html:55
 #: bookwyrm/templates/get_started/users.html:6
 msgid "Who to follow"
 msgstr "A quién seguir"
 
-#: bookwyrm/templates/feed/feed_layout.html:5
+#: bookwyrm/templates/feed/feed_layout.html:4
 msgid "Updates"
 msgstr "Actualizaciones"
 
-#: bookwyrm/templates/feed/feed_layout.html:11
+#: bookwyrm/templates/feed/feed_layout.html:10
 #: bookwyrm/templates/layout.html:59
 #: bookwyrm/templates/user/shelf/books_header.html:3
 msgid "Your books"
 msgstr "Tus libros"
 
-#: bookwyrm/templates/feed/feed_layout.html:13
+#: bookwyrm/templates/feed/feed_layout.html:12
 msgid "There are no books here right now! Try searching for a book to get started"
 msgstr "¡No hay ningún libro aqui ahorita! Busca a un libro para empezar"
 
-#: bookwyrm/templates/feed/feed_layout.html:24
-#: bookwyrm/templates/user/shelf/shelf.html:28
+#: bookwyrm/templates/feed/feed_layout.html:23
+#: bookwyrm/templates/user/shelf/shelf.html:29
 msgid "To Read"
 msgstr "Para leer"
 
-#: bookwyrm/templates/feed/feed_layout.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:28
+#: bookwyrm/templates/feed/feed_layout.html:24
+#: bookwyrm/templates/user/shelf/shelf.html:29
 msgid "Currently Reading"
 msgstr "Leyendo actualmente"
 
-#: bookwyrm/templates/feed/feed_layout.html:26
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-#: bookwyrm/templates/user/shelf/shelf.html:28
+#: bookwyrm/templates/feed/feed_layout.html:25
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
+#: bookwyrm/templates/user/shelf/shelf.html:29
 msgid "Read"
 msgstr "Leido"
 
-#: bookwyrm/templates/feed/feed_layout.html:88 bookwyrm/templates/goal.html:26
+#: bookwyrm/templates/feed/feed_layout.html:87 bookwyrm/templates/goal.html:26
 #: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
 msgid "%(year)s Reading Goal"
@@ -916,7 +944,7 @@ msgid "What are you reading?"
 msgstr "¿Qué estás leyendo?"
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:119
+#: bookwyrm/templates/lists/list.html:120
 msgid "Search for a book"
 msgstr "Buscar libros"
 
@@ -936,7 +964,7 @@ msgstr "Puedes agregar libros cuando comiences a usar %(site_name)s."
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
 #: bookwyrm/templates/layout.html:38 bookwyrm/templates/layout.html:39
-#: bookwyrm/templates/lists/list.html:123
+#: bookwyrm/templates/lists/list.html:124
 #: bookwyrm/templates/search/layout.html:4
 #: bookwyrm/templates/search/layout.html:9
 msgid "Search"
@@ -952,7 +980,7 @@ msgid "Popular on %(site_name)s"
 msgstr "Popular en %(site_name)s"
 
 #: bookwyrm/templates/get_started/books.html:58
-#: bookwyrm/templates/lists/list.html:136
+#: bookwyrm/templates/lists/list.html:137
 msgid "No books found"
 msgstr "No se encontró ningún libro"
 
@@ -1072,95 +1100,95 @@ msgstr "Importar libros"
 msgid "Data source:"
 msgstr "Fuente de datos:"
 
-#: bookwyrm/templates/import.html:29
+#: bookwyrm/templates/import.html:32
 msgid "Data file:"
 msgstr "Archivo de datos:"
 
-#: bookwyrm/templates/import.html:37
+#: bookwyrm/templates/import.html:40
 msgid "Include reviews"
 msgstr "Incluir reseñas"
 
-#: bookwyrm/templates/import.html:42
+#: bookwyrm/templates/import.html:45
 msgid "Privacy setting for imported reviews:"
 msgstr "Configuración de privacidad para las reseñas importadas:"
 
-#: bookwyrm/templates/import.html:48
+#: bookwyrm/templates/import.html:51
 #: bookwyrm/templates/settings/server_blocklist.html:64
 msgid "Import"
 msgstr "Importar"
 
-#: bookwyrm/templates/import.html:53
+#: bookwyrm/templates/import.html:56
 msgid "Recent Imports"
 msgstr "Importaciones recientes"
 
-#: bookwyrm/templates/import.html:55
+#: bookwyrm/templates/import.html:58
 msgid "No recent imports"
 msgstr "No hay ninguna importación reciente"
 
-#: bookwyrm/templates/import_status.html:6
-#: bookwyrm/templates/import_status.html:10
+#: bookwyrm/templates/import_status.html:5
+#: bookwyrm/templates/import_status.html:9
 msgid "Import Status"
 msgstr "Status de importación"
 
-#: bookwyrm/templates/import_status.html:13
+#: bookwyrm/templates/import_status.html:12
 msgid "Import started:"
 msgstr "Importación ha empezado:"
 
-#: bookwyrm/templates/import_status.html:17
+#: bookwyrm/templates/import_status.html:16
 msgid "Import completed:"
 msgstr "Importación ha terminado:"
 
-#: bookwyrm/templates/import_status.html:20
+#: bookwyrm/templates/import_status.html:19
 msgid "TASK FAILED"
 msgstr "TAREA FALLÓ"
 
-#: bookwyrm/templates/import_status.html:26
+#: bookwyrm/templates/import_status.html:25
 msgid "Import still in progress."
 msgstr "Importación todavia en progreso"
 
-#: bookwyrm/templates/import_status.html:28
+#: bookwyrm/templates/import_status.html:27
 msgid "(Hit reload to update!)"
 msgstr "(¡Refresca para actualizar!)"
 
-#: bookwyrm/templates/import_status.html:35
+#: bookwyrm/templates/import_status.html:34
 msgid "Failed to load"
 msgstr "No se pudo cargar"
 
-#: bookwyrm/templates/import_status.html:44
+#: bookwyrm/templates/import_status.html:43
 #, python-format
 msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
 msgstr "Saltar al final de la lista para seleccionar los %(failed_count)s artículos que no se pudieron importar."
 
-#: bookwyrm/templates/import_status.html:79
+#: bookwyrm/templates/import_status.html:78
 msgid "Select all"
 msgstr "Seleccionar todo"
 
-#: bookwyrm/templates/import_status.html:82
+#: bookwyrm/templates/import_status.html:81
 msgid "Retry items"
 msgstr "Reintentar ítems"
 
-#: bookwyrm/templates/import_status.html:108
+#: bookwyrm/templates/import_status.html:107
 msgid "Successfully imported"
 msgstr "Importado exitosamente"
 
-#: bookwyrm/templates/import_status.html:112
+#: bookwyrm/templates/import_status.html:111
 msgid "Book"
 msgstr "Libro"
 
-#: bookwyrm/templates/import_status.html:115
-#: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/user/shelf/shelf.html:77
-#: bookwyrm/templates/user/shelf/shelf.html:95
+#: bookwyrm/templates/import_status.html:114
+#: bookwyrm/templates/snippets/create_status_form.html:13
+#: bookwyrm/templates/user/shelf/shelf.html:78
+#: bookwyrm/templates/user/shelf/shelf.html:98
 msgid "Title"
 msgstr "Título"
 
-#: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/user/shelf/shelf.html:78
-#: bookwyrm/templates/user/shelf/shelf.html:98
+#: bookwyrm/templates/import_status.html:117
+#: bookwyrm/templates/user/shelf/shelf.html:79
+#: bookwyrm/templates/user/shelf/shelf.html:101
 msgid "Author"
 msgstr "Autor/Autora"
 
-#: bookwyrm/templates/import_status.html:141
+#: bookwyrm/templates/import_status.html:140
 msgid "Imported"
 msgstr "Importado"
 
@@ -1271,7 +1299,8 @@ msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%
 msgstr "Apoyar %(site_name)s en <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 
 #: bookwyrm/templates/layout.html:217
-msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+#| msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm es software de código abierto. Puedes contribuir o reportar problemas en <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
 #: bookwyrm/templates/lists/create_form.html:5
@@ -1314,7 +1343,7 @@ msgid "Discard"
 msgstr "Desechar"
 
 #: bookwyrm/templates/lists/edit_form.html:5
-#: bookwyrm/templates/lists/list_layout.html:18
+#: bookwyrm/templates/lists/list_layout.html:17
 msgid "Edit List"
 msgstr "Editar lista"
 
@@ -1348,68 +1377,68 @@ msgstr "Abierto"
 msgid "Anyone can add books to this list"
 msgstr "Cualquer usuario puede agregar libros a esta lista"
 
-#: bookwyrm/templates/lists/list.html:19
+#: bookwyrm/templates/lists/list.html:20
 msgid "You successfully suggested a book for this list!"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:21
+#: bookwyrm/templates/lists/list.html:22
 #, fuzzy
 #| msgid "Anyone can add books to this list"
 msgid "You successfully added a book to this list!"
 msgstr "Cualquer usuario puede agregar libros a esta lista"
 
-#: bookwyrm/templates/lists/list.html:27
+#: bookwyrm/templates/lists/list.html:28
 msgid "This list is currently empty"
 msgstr "Esta lista está vacia"
 
-#: bookwyrm/templates/lists/list.html:64
+#: bookwyrm/templates/lists/list.html:65
 #, python-format
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "Agregado por <a href=\"%(user_path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/lists/list.html:76
+#: bookwyrm/templates/lists/list.html:77
 msgid "Set"
 msgstr "Establecido"
 
-#: bookwyrm/templates/lists/list.html:79
+#: bookwyrm/templates/lists/list.html:80
 msgid "List position"
 msgstr "Posición"
 
-#: bookwyrm/templates/lists/list.html:85
+#: bookwyrm/templates/lists/list.html:86
 #: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr "Quitar"
 
-#: bookwyrm/templates/lists/list.html:98 bookwyrm/templates/lists/list.html:110
+#: bookwyrm/templates/lists/list.html:99 bookwyrm/templates/lists/list.html:111
 msgid "Sort List"
 msgstr "Ordena la lista"
 
-#: bookwyrm/templates/lists/list.html:104
+#: bookwyrm/templates/lists/list.html:105
 msgid "Direction"
 msgstr "Dirección"
 
-#: bookwyrm/templates/lists/list.html:115
+#: bookwyrm/templates/lists/list.html:116
 msgid "Add Books"
 msgstr "Agregar libros"
 
-#: bookwyrm/templates/lists/list.html:115
+#: bookwyrm/templates/lists/list.html:116
 msgid "Suggest Books"
 msgstr "Sugerir libros"
 
-#: bookwyrm/templates/lists/list.html:124
+#: bookwyrm/templates/lists/list.html:125
 msgid "search"
 msgstr "buscar"
 
-#: bookwyrm/templates/lists/list.html:130
+#: bookwyrm/templates/lists/list.html:131
 msgid "Clear search"
 msgstr "Borrar búsqueda"
 
-#: bookwyrm/templates/lists/list.html:135
+#: bookwyrm/templates/lists/list.html:136
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
 msgstr "No se encontró ningún libro correspondiente a la búsqueda: \"%(query)s\""
 
-#: bookwyrm/templates/lists/list.html:163
+#: bookwyrm/templates/lists/list.html:164
 msgid "Suggest"
 msgstr "Sugerir"
 
@@ -1434,36 +1463,36 @@ msgstr "Contactar a unx administradorx para recibir una invitación"
 msgid "More about this site"
 msgstr "Más sobre este sitio"
 
+#: bookwyrm/templates/moderation/report.html:5
 #: bookwyrm/templates/moderation/report.html:6
-#: bookwyrm/templates/moderation/report.html:7
 #: bookwyrm/templates/moderation/report_preview.html:6
 #, python-format
 msgid "Report #%(report_id)s: %(username)s"
 msgstr "Reportar #%(report_id)s: %(username)s"
 
-#: bookwyrm/templates/moderation/report.html:11
+#: bookwyrm/templates/moderation/report.html:10
 msgid "Back to reports"
 msgstr "Volver a los informes"
 
-#: bookwyrm/templates/moderation/report.html:23
+#: bookwyrm/templates/moderation/report.html:22
 msgid "Moderator Comments"
 msgstr "Comentarios de moderador"
 
-#: bookwyrm/templates/moderation/report.html:41
+#: bookwyrm/templates/moderation/report.html:40
 #: bookwyrm/templates/snippets/create_status.html:28
-#: bookwyrm/templates/snippets/create_status_form.html:63
+#: bookwyrm/templates/snippets/create_status_form.html:66
 msgid "Comment"
 msgstr "Comentario"
 
-#: bookwyrm/templates/moderation/report.html:46
+#: bookwyrm/templates/moderation/report.html:45
 msgid "Reported statuses"
 msgstr "Statuses reportados"
 
-#: bookwyrm/templates/moderation/report.html:48
+#: bookwyrm/templates/moderation/report.html:47
 msgid "No statuses reported"
 msgstr "Ningún estatus reportado"
 
-#: bookwyrm/templates/moderation/report.html:54
+#: bookwyrm/templates/moderation/report.html:53
 msgid "Status has been deleted"
 msgstr "Status ha sido eliminado"
 
@@ -1741,7 +1770,7 @@ msgstr "Buscar"
 
 #: bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
-#: bookwyrm/templates/user/layout.html:73
+#: bookwyrm/templates/user/layout.html:74
 msgid "Books"
 msgstr "Libros"
 
@@ -1814,7 +1843,7 @@ msgid "Add server"
 msgstr "Agregar servidor"
 
 #: bookwyrm/templates/settings/edit_server.html:7
-#: bookwyrm/templates/settings/federated_server.html:12
+#: bookwyrm/templates/settings/federated_server.html:13
 #: bookwyrm/templates/settings/server_blocklist.html:7
 msgid "Back to server list"
 msgstr "Volver a la lista de servidores"
@@ -1829,24 +1858,24 @@ msgid "Instance:"
 msgstr "Instancia:"
 
 #: bookwyrm/templates/settings/edit_server.html:37
-#: bookwyrm/templates/settings/federated_server.html:29
+#: bookwyrm/templates/settings/federated_server.html:30
 #: bookwyrm/templates/user_admin/user_info.html:34
 msgid "Status:"
 msgstr "Status:"
 
 #: bookwyrm/templates/settings/edit_server.html:41
-#: bookwyrm/templates/settings/federated_server.html:9
+#: bookwyrm/templates/settings/federated_server.html:10
 msgid "Blocked"
 msgstr "Bloqueado"
 
 #: bookwyrm/templates/settings/edit_server.html:48
-#: bookwyrm/templates/settings/federated_server.html:21
+#: bookwyrm/templates/settings/federated_server.html:22
 #: bookwyrm/templates/user_admin/user_info.html:26
 msgid "Software:"
 msgstr "Software:"
 
 #: bookwyrm/templates/settings/edit_server.html:55
-#: bookwyrm/templates/settings/federated_server.html:25
+#: bookwyrm/templates/settings/federated_server.html:26
 #: bookwyrm/templates/user_admin/user_info.html:30
 msgid "Version:"
 msgstr "Versión:"
@@ -1855,69 +1884,69 @@ msgstr "Versión:"
 msgid "Notes:"
 msgstr "Notas:"
 
-#: bookwyrm/templates/settings/federated_server.html:18
+#: bookwyrm/templates/settings/federated_server.html:19
 msgid "Details"
 msgstr "Detalles"
 
-#: bookwyrm/templates/settings/federated_server.html:36
-#: bookwyrm/templates/user/layout.html:55
+#: bookwyrm/templates/settings/federated_server.html:37
+#: bookwyrm/templates/user/layout.html:56
 msgid "Activity"
 msgstr "Actividad"
 
-#: bookwyrm/templates/settings/federated_server.html:39
+#: bookwyrm/templates/settings/federated_server.html:40
 msgid "Users:"
 msgstr "Usuarios:"
 
-#: bookwyrm/templates/settings/federated_server.html:42
-#: bookwyrm/templates/settings/federated_server.html:49
+#: bookwyrm/templates/settings/federated_server.html:43
+#: bookwyrm/templates/settings/federated_server.html:50
 msgid "View all"
 msgstr "Ver todos"
 
-#: bookwyrm/templates/settings/federated_server.html:46
+#: bookwyrm/templates/settings/federated_server.html:47
 msgid "Reports:"
 msgstr "Informes:"
 
-#: bookwyrm/templates/settings/federated_server.html:53
+#: bookwyrm/templates/settings/federated_server.html:54
 msgid "Followed by us:"
 msgstr "Seguido por nosotros:"
 
-#: bookwyrm/templates/settings/federated_server.html:59
+#: bookwyrm/templates/settings/federated_server.html:60
 msgid "Followed by them:"
 msgstr "Seguido por ellos:"
 
-#: bookwyrm/templates/settings/federated_server.html:65
+#: bookwyrm/templates/settings/federated_server.html:66
 msgid "Blocked by us:"
 msgstr "Bloqueado por nosotros:"
 
-#: bookwyrm/templates/settings/federated_server.html:77
+#: bookwyrm/templates/settings/federated_server.html:78
 #: bookwyrm/templates/user_admin/user_info.html:39
 msgid "Notes"
 msgstr "Notas"
 
-#: bookwyrm/templates/settings/federated_server.html:80
+#: bookwyrm/templates/settings/federated_server.html:81
 msgid "Edit"
 msgstr "Editar"
 
-#: bookwyrm/templates/settings/federated_server.html:100
+#: bookwyrm/templates/settings/federated_server.html:101
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:3
 msgid "Actions"
 msgstr "Acciones"
 
-#: bookwyrm/templates/settings/federated_server.html:104
+#: bookwyrm/templates/settings/federated_server.html:105
 #: bookwyrm/templates/snippets/block_button.html:5
 msgid "Block"
 msgstr "Bloquear"
 
-#: bookwyrm/templates/settings/federated_server.html:105
+#: bookwyrm/templates/settings/federated_server.html:106
 msgid "All users from this instance will be deactivated."
 msgstr "Todos los usuarios en esta instancia serán desactivados."
 
-#: bookwyrm/templates/settings/federated_server.html:110
+#: bookwyrm/templates/settings/federated_server.html:111
 #: bookwyrm/templates/snippets/block_button.html:10
 msgid "Un-block"
 msgstr "Desbloquear"
 
-#: bookwyrm/templates/settings/federated_server.html:111
+#: bookwyrm/templates/settings/federated_server.html:112
 msgid "All users from this instance will be re-activated."
 msgstr "Todos los usuarios en esta instancia serán re-activados."
 
@@ -2124,7 +2153,7 @@ msgstr "Permitir solicitudes de invitación:"
 msgid "Registration closed text:"
 msgstr "Texto de registración cerrada:"
 
-#: bookwyrm/templates/snippets/book_cover.html:32
+#: bookwyrm/templates/snippets/book_cover.html:31
 msgid "No cover"
 msgstr "Sin portada"
 
@@ -2133,15 +2162,15 @@ msgstr "Sin portada"
 msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgstr "<a href=\"%(path)s\">%(title)s</a> por "
 
-#: bookwyrm/templates/snippets/boost_button.html:8
 #: bookwyrm/templates/snippets/boost_button.html:9
+#: bookwyrm/templates/snippets/boost_button.html:10
 #, fuzzy
 #| msgid "boosted"
 msgid "Boost"
 msgstr "respaldó"
 
-#: bookwyrm/templates/snippets/boost_button.html:15
 #: bookwyrm/templates/snippets/boost_button.html:16
+#: bookwyrm/templates/snippets/boost_button.html:17
 #, fuzzy
 #| msgid "Un-boost status"
 msgid "Un-boost"
@@ -2163,66 +2192,66 @@ msgstr "Reseña"
 msgid "Quote"
 msgstr "Cita"
 
-#: bookwyrm/templates/snippets/create_status_form.html:20
+#: bookwyrm/templates/snippets/create_status_form.html:23
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: bookwyrm/templates/snippets/create_status_form.html:22
+#: bookwyrm/templates/snippets/create_status_form.html:25
 msgid "Quote:"
 msgstr "Cita:"
 
-#: bookwyrm/templates/snippets/create_status_form.html:24
+#: bookwyrm/templates/snippets/create_status_form.html:27
 msgid "Review:"
 msgstr "Reseña:"
 
-#: bookwyrm/templates/snippets/create_status_form.html:53
-#: bookwyrm/templates/snippets/status/layout.html:30
+#: bookwyrm/templates/snippets/create_status_form.html:56
+#: bookwyrm/templates/snippets/status/layout.html:29
+#: bookwyrm/templates/snippets/status/layout.html:47
 #: bookwyrm/templates/snippets/status/layout.html:48
-#: bookwyrm/templates/snippets/status/layout.html:49
 msgid "Reply"
 msgstr "Respuesta"
 
-#: bookwyrm/templates/snippets/create_status_form.html:53
+#: bookwyrm/templates/snippets/create_status_form.html:56
 #, fuzzy
 #| msgid "Footer Content"
 msgid "Content"
 msgstr "Contenido del pie de página"
 
-#: bookwyrm/templates/snippets/create_status_form.html:77
+#: bookwyrm/templates/snippets/create_status_form.html:80
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
 msgid "Progress:"
 msgstr "Progreso:"
 
-#: bookwyrm/templates/snippets/create_status_form.html:85
-#: bookwyrm/templates/snippets/readthrough_form.html:26
+#: bookwyrm/templates/snippets/create_status_form.html:88
+#: bookwyrm/templates/snippets/readthrough_form.html:22
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr "páginas"
 
-#: bookwyrm/templates/snippets/create_status_form.html:86
-#: bookwyrm/templates/snippets/readthrough_form.html:27
+#: bookwyrm/templates/snippets/create_status_form.html:89
+#: bookwyrm/templates/snippets/readthrough_form.html:23
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr "por ciento"
 
-#: bookwyrm/templates/snippets/create_status_form.html:92
+#: bookwyrm/templates/snippets/create_status_form.html:95
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "de %(pages)s páginas"
 
-#: bookwyrm/templates/snippets/create_status_form.html:107
+#: bookwyrm/templates/snippets/create_status_form.html:110
 msgid "Include spoiler alert"
 msgstr "Incluir alerta de spoiler"
 
-#: bookwyrm/templates/snippets/create_status_form.html:114
+#: bookwyrm/templates/snippets/create_status_form.html:117
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:19
 msgid "Private"
 msgstr "Privada"
 
-#: bookwyrm/templates/snippets/create_status_form.html:125
+#: bookwyrm/templates/snippets/create_status_form.html:128
 msgid "Post"
 msgstr "Compartir"
 
@@ -2236,17 +2265,17 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u
 msgstr "Estás eliminando esta lectura y sus %(count)s actualizaciones de progreso asociados."
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
-#: bookwyrm/templates/snippets/follow_request_buttons.html:13
+#: bookwyrm/templates/snippets/follow_request_buttons.html:12
 msgid "Delete"
 msgstr "Eliminar"
 
-#: bookwyrm/templates/snippets/fav_button.html:7
 #: bookwyrm/templates/snippets/fav_button.html:9
+#: bookwyrm/templates/snippets/fav_button.html:11
 msgid "Like"
 msgstr ""
 
-#: bookwyrm/templates/snippets/fav_button.html:15
-#: bookwyrm/templates/snippets/fav_button.html:16
+#: bookwyrm/templates/snippets/fav_button.html:17
+#: bookwyrm/templates/snippets/fav_button.html:18
 #, fuzzy
 #| msgid "Un-like status"
 msgid "Un-like"
@@ -2280,11 +2309,11 @@ msgstr "Des-enviar solicitud de seguidor"
 msgid "Unfollow"
 msgstr "Dejar de seguir"
 
-#: bookwyrm/templates/snippets/follow_request_buttons.html:8
+#: bookwyrm/templates/snippets/follow_request_buttons.html:7
 msgid "Accept"
 msgstr "Aceptar"
 
-#: bookwyrm/templates/snippets/form_rate_stars.html:20
+#: bookwyrm/templates/snippets/form_rate_stars.html:19
 #: bookwyrm/templates/snippets/stars.html:13
 msgid "No rating"
 msgstr "No calificación"
@@ -2333,8 +2362,8 @@ msgid "Goal privacy:"
 msgstr "Privacidad de meta:"
 
 #: bookwyrm/templates/snippets/goal_form.html:26
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:45
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:33
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:29
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20
 msgid "Post to feed"
 msgstr "Compartir con tu feed"
@@ -2446,12 +2475,12 @@ msgstr "Eliminar estas fechas de lectura"
 msgid "Started reading"
 msgstr "Lectura se empezó"
 
-#: bookwyrm/templates/snippets/readthrough_form.html:18
+#: bookwyrm/templates/snippets/readthrough_form.html:14
 msgid "Progress"
 msgstr "Progreso"
 
-#: bookwyrm/templates/snippets/readthrough_form.html:34
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:29
+#: bookwyrm/templates/snippets/readthrough_form.html:30
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25
 msgid "Finished reading"
 msgstr "Lectura se terminó"
 
@@ -2459,27 +2488,27 @@ msgstr "Lectura se terminó"
 msgid "Sign Up"
 msgstr "Inscribirse"
 
-#: bookwyrm/templates/snippets/report_button.html:5
+#: bookwyrm/templates/snippets/report_button.html:6
 msgid "Report"
 msgstr "Reportar"
 
 #: bookwyrm/templates/snippets/rss_title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:34
+#: bookwyrm/templates/snippets/status/status_header.html:35
 msgid "rated"
 msgstr "calificó"
 
 #: bookwyrm/templates/snippets/rss_title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:36
+#: bookwyrm/templates/snippets/status/status_header.html:37
 msgid "reviewed"
 msgstr "reseñó"
 
 #: bookwyrm/templates/snippets/rss_title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:38
+#: bookwyrm/templates/snippets/status/status_header.html:39
 msgid "commented on"
 msgstr "comentó en"
 
 #: bookwyrm/templates/snippets/rss_title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:40
+#: bookwyrm/templates/snippets/status/status_header.html:41
 msgid "quoted"
 msgstr "citó"
 
@@ -2497,7 +2526,7 @@ msgid "Finish \"<em>%(book_title)s</em>\""
 msgstr "Terminar \"<em>%(book_title)s</em>\""
 
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:34
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:36
 msgid "Update progress"
 msgstr "Progreso de actualización"
 
@@ -2505,20 +2534,20 @@ msgstr "Progreso de actualización"
 msgid "More shelves"
 msgstr "Más estantes"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:8
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:10
 msgid "Start reading"
 msgstr "Empezar leer"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:15
 msgid "Finish reading"
 msgstr "Terminar de leer"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:18
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26
 msgid "Want to read"
 msgstr "Quiero leer"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:47
 #, python-format
 msgid "Remove from %(name)s"
 msgstr "Quitar de %(name)s"
@@ -2533,40 +2562,40 @@ msgstr "Empezar \"<em>%(book_title)s</em>\""
 msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgstr "Quiero leer \"<em>%(book_title)s</em>\""
 
-#: bookwyrm/templates/snippets/status/content_status.html:70
-#: bookwyrm/templates/snippets/trimmed_text.html:14
+#: bookwyrm/templates/snippets/status/content_status.html:71
+#: bookwyrm/templates/snippets/trimmed_text.html:15
 msgid "Show more"
 msgstr "Mostrar más"
 
-#: bookwyrm/templates/snippets/status/content_status.html:85
-#: bookwyrm/templates/snippets/trimmed_text.html:29
+#: bookwyrm/templates/snippets/status/content_status.html:86
+#: bookwyrm/templates/snippets/trimmed_text.html:30
 msgid "Show less"
 msgstr "Mostrar menos"
 
-#: bookwyrm/templates/snippets/status/content_status.html:115
+#: bookwyrm/templates/snippets/status/content_status.html:116
 msgid "Open image in new window"
 msgstr "Abrir imagen en una nueva ventana"
 
-#: bookwyrm/templates/snippets/status/layout.html:22
+#: bookwyrm/templates/snippets/status/layout.html:21
 #: bookwyrm/templates/snippets/status/status_options.html:17
 msgid "Delete status"
 msgstr "Eliminar status"
 
+#: bookwyrm/templates/snippets/status/layout.html:51
 #: bookwyrm/templates/snippets/status/layout.html:52
-#: bookwyrm/templates/snippets/status/layout.html:53
 msgid "Boost status"
 msgstr "Status de respaldo"
 
+#: bookwyrm/templates/snippets/status/layout.html:55
 #: bookwyrm/templates/snippets/status/layout.html:56
-#: bookwyrm/templates/snippets/status/layout.html:57
 msgid "Like status"
 msgstr "Me gusta status"
 
-#: bookwyrm/templates/snippets/status/status.html:9
+#: bookwyrm/templates/snippets/status/status.html:10
 msgid "boosted"
 msgstr "respaldó"
 
-#: bookwyrm/templates/snippets/status/status_header.html:44
+#: bookwyrm/templates/snippets/status/status_header.html:45
 #, python-format
 msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
 msgstr "respondió al <a href=\"%(status_path)s\">status</a> de <a href=\"%(user_path)s\">%(username)s</a> "
@@ -2598,15 +2627,15 @@ msgstr "En orden ascendente"
 msgid "Sorted descending"
 msgstr "En orden descendente"
 
-#: bookwyrm/templates/user/layout.html:12 bookwyrm/templates/user/user.html:10
+#: bookwyrm/templates/user/layout.html:13 bookwyrm/templates/user/user.html:10
 msgid "User Profile"
 msgstr "Perfil de usuario"
 
-#: bookwyrm/templates/user/layout.html:36
+#: bookwyrm/templates/user/layout.html:37
 msgid "Follow Requests"
 msgstr "Solicitudes de seguidor"
 
-#: bookwyrm/templates/user/layout.html:61
+#: bookwyrm/templates/user/layout.html:62
 msgid "Reading Goal"
 msgstr "Meta de lectura"
 
@@ -2652,38 +2681,38 @@ msgstr "Editar estante"
 msgid "Update shelf"
 msgstr "Actualizar estante"
 
-#: bookwyrm/templates/user/shelf/shelf.html:24 bookwyrm/views/shelf.py:48
+#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:51
 msgid "All books"
 msgstr "Todos los libros"
 
-#: bookwyrm/templates/user/shelf/shelf.html:37
+#: bookwyrm/templates/user/shelf/shelf.html:38
 msgid "Create shelf"
 msgstr "Crear estante"
 
-#: bookwyrm/templates/user/shelf/shelf.html:60
+#: bookwyrm/templates/user/shelf/shelf.html:61
 msgid "Edit shelf"
 msgstr "Editar estante"
 
-#: bookwyrm/templates/user/shelf/shelf.html:79
-#: bookwyrm/templates/user/shelf/shelf.html:101
+#: bookwyrm/templates/user/shelf/shelf.html:80
+#: bookwyrm/templates/user/shelf/shelf.html:104
 msgid "Shelved"
 msgstr "Archivado"
 
-#: bookwyrm/templates/user/shelf/shelf.html:80
-#: bookwyrm/templates/user/shelf/shelf.html:105
+#: bookwyrm/templates/user/shelf/shelf.html:81
+#: bookwyrm/templates/user/shelf/shelf.html:108
 msgid "Started"
 msgstr "Empezado"
 
-#: bookwyrm/templates/user/shelf/shelf.html:81
-#: bookwyrm/templates/user/shelf/shelf.html:108
+#: bookwyrm/templates/user/shelf/shelf.html:82
+#: bookwyrm/templates/user/shelf/shelf.html:111
 msgid "Finished"
 msgstr "Terminado"
 
-#: bookwyrm/templates/user/shelf/shelf.html:134
+#: bookwyrm/templates/user/shelf/shelf.html:137
 msgid "This shelf is empty."
 msgstr "Este estante está vacio."
 
-#: bookwyrm/templates/user/shelf/shelf.html:140
+#: bookwyrm/templates/user/shelf/shelf.html:143
 msgid "Delete shelf"
 msgstr "Eliminar estante"
 
@@ -2712,24 +2741,24 @@ msgstr "Feed RSS"
 msgid "No activities yet!"
 msgstr "¡Aún no actividades!"
 
-#: bookwyrm/templates/user/user_preview.html:14
+#: bookwyrm/templates/user/user_preview.html:15
 #, python-format
 msgid "Joined %(date)s"
 msgstr "Unido %(date)s"
 
-#: bookwyrm/templates/user/user_preview.html:18
+#: bookwyrm/templates/user/user_preview.html:19
 #, python-format
 msgid "%(counter)s follower"
 msgid_plural "%(counter)s followers"
 msgstr[0] "%(counter)s seguidor"
 msgstr[1] "%(counter)s seguidores"
 
-#: bookwyrm/templates/user/user_preview.html:19
+#: bookwyrm/templates/user/user_preview.html:20
 #, python-format
 msgid "%(counter)s following"
 msgstr "%(counter)s siguiendo"
 
-#: bookwyrm/templates/user/user_preview.html:25
+#: bookwyrm/templates/user/user_preview.html:26
 #, fuzzy, python-format
 #| msgid "%(mutuals)s follower you follow"
 #| msgid_plural "%(mutuals)s followers you follow"
@@ -2738,7 +2767,7 @@ msgid_plural "%(mutuals_display)s followers you follow"
 msgstr[0] "%(mutuals)s seguidor que sigues"
 msgstr[1] "%(mutuals)s seguidores que sigues"
 
-#: bookwyrm/templates/user_admin/user.html:11
+#: bookwyrm/templates/user_admin/user.html:9
 msgid "Back to users"
 msgstr "Volver a usuarios"
 
@@ -2805,15 +2834,20 @@ msgstr "Des-suspender usuario"
 msgid "Access level:"
 msgstr "Nivel de acceso:"
 
-#: bookwyrm/views/password.py:32
+#: bookwyrm/views/password.py:30 bookwyrm/views/password.py:35
 msgid "No user with that email address was found."
 msgstr "No se pudo encontrar un usuario con esa dirección de correo electrónico."
 
-#: bookwyrm/views/password.py:41
+#: bookwyrm/views/password.py:44
 #, python-format
 msgid "A password reset link sent to %s"
 msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 
+#, fuzzy
+#~| msgid "BookWyrm users"
+#~ msgid "BookWyrm\\"
+#~ msgstr "Usuarios de BookWyrm"
+
 #, fuzzy
 #~| msgid "Show more"
 #~ msgid "Show"
diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index cb6c74d1..6362adcc 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-10 13:23-0700\n"
+"POT-Creation-Date: 2021-05-14 15:12-0700\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"
@@ -57,13 +57,13 @@ msgstr ""
 msgid "Book Title"
 msgstr "Titre"
 
-#: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:31
-#: bookwyrm/templates/user/shelf/shelf.html:82
-#: bookwyrm/templates/user/shelf/shelf.html:112
+#: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:34
+#: bookwyrm/templates/user/shelf/shelf.html:84
+#: bookwyrm/templates/user/shelf/shelf.html:115
 msgid "Rating"
 msgstr "Note"
 
-#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:100
+#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:101
 msgid "Sort By"
 msgstr ""
 
@@ -137,19 +137,155 @@ msgstr "Erreur côté serveur"
 msgid "Something went wrong! Sorry about that."
 msgstr "Une erreur s’est produite ; désolé !"
 
-#: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
+#: bookwyrm/templates/author/author.html:17
+#: bookwyrm/templates/author/author.html:18
 msgid "Edit Author"
 msgstr "Modifier l’auteur ou autrice"
 
-#: bookwyrm/templates/author.html:31
+#: bookwyrm/templates/author/author.html:33
+#: bookwyrm/templates/author/edit_author.html:38
+msgid "Aliases:"
+msgstr ""
+
+#: bookwyrm/templates/author/author.html:39
+msgid "Born:"
+msgstr ""
+
+#: bookwyrm/templates/author/author.html:45
+msgid "Died:"
+msgstr ""
+
+#: bookwyrm/templates/author/author.html:52
 msgid "Wikipedia"
 msgstr "Wikipedia"
 
-#: bookwyrm/templates/author.html:36
+#: bookwyrm/templates/author/author.html:56
+#: bookwyrm/templates/book/book.html:81
+msgid "View on OpenLibrary"
+msgstr "Voir sur OpenLibrary"
+
+#: bookwyrm/templates/author/author.html:61
+#: bookwyrm/templates/book/book.html:84
+#, fuzzy
+#| msgid "View on OpenLibrary"
+msgid "View on Inventaire"
+msgstr "Voir sur OpenLibrary"
+
+#: bookwyrm/templates/author/author.html:75
 #, python-format
 msgid "Books by %(name)s"
 msgstr "Livres par %(name)s"
 
+#: bookwyrm/templates/author/edit_author.html:5
+msgid "Edit Author:"
+msgstr "Modifier l’auteur ou l’autrice :"
+
+#: bookwyrm/templates/author/edit_author.html:13
+#: bookwyrm/templates/book/edit_book.html:18
+msgid "Added:"
+msgstr "AJouté :"
+
+#: bookwyrm/templates/author/edit_author.html:14
+#: bookwyrm/templates/book/edit_book.html:19
+msgid "Updated:"
+msgstr "Mis à jour :"
+
+#: bookwyrm/templates/author/edit_author.html:15
+#: bookwyrm/templates/book/edit_book.html:20
+msgid "Last edited by:"
+msgstr "Dernière modification par :"
+
+#: bookwyrm/templates/author/edit_author.html:31
+#: bookwyrm/templates/book/edit_book.html:90
+msgid "Metadata"
+msgstr "Métadonnées"
+
+#: bookwyrm/templates/author/edit_author.html:32
+#: bookwyrm/templates/lists/form.html:8
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:13
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:14
+msgid "Name:"
+msgstr "Nom :"
+
+#: bookwyrm/templates/author/edit_author.html:40
+#: bookwyrm/templates/book/edit_book.html:128
+#: bookwyrm/templates/book/edit_book.html:165
+#, fuzzy
+#| msgid "Separate multiple publishers with commas."
+msgid "Separate multiple values with commas."
+msgstr "Séparez plusieurs éditeurs par une virgule."
+
+#: bookwyrm/templates/author/edit_author.html:46
+msgid "Bio:"
+msgstr "Bio :"
+
+#: bookwyrm/templates/author/edit_author.html:51
+msgid "Wikipedia link:"
+msgstr "Wikipedia :"
+
+#: bookwyrm/templates/author/edit_author.html:57
+msgid "Birth date:"
+msgstr "Date de naissance :"
+
+#: bookwyrm/templates/author/edit_author.html:65
+msgid "Death date:"
+msgstr "Date de décès :"
+
+#: bookwyrm/templates/author/edit_author.html:73
+msgid "Author Identifiers"
+msgstr "Identifiants de l’auteur ou autrice"
+
+#: bookwyrm/templates/author/edit_author.html:74
+#: bookwyrm/templates/book/edit_book.html:223
+msgid "Openlibrary key:"
+msgstr "Clé Openlibrary :"
+
+#: bookwyrm/templates/author/edit_author.html:79
+#, fuzzy
+#| msgid "View on OpenLibrary"
+msgid "Inventaire ID:"
+msgstr "Voir sur OpenLibrary"
+
+#: bookwyrm/templates/author/edit_author.html:84
+msgid "Librarything key:"
+msgstr "Clé Librarything :"
+
+#: bookwyrm/templates/author/edit_author.html:89
+msgid "Goodreads key:"
+msgstr "Clé Goodreads :"
+
+#: bookwyrm/templates/author/edit_author.html:98
+#: bookwyrm/templates/book/book.html:127
+#: bookwyrm/templates/book/edit_book.html:241
+#: bookwyrm/templates/lists/form.html:42
+#: bookwyrm/templates/preferences/edit_user.html:70
+#: bookwyrm/templates/settings/edit_server.html:68
+#: bookwyrm/templates/settings/federated_server.html:94
+#: bookwyrm/templates/settings/site.html:97
+#: bookwyrm/templates/snippets/readthrough.html:77
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:38
+msgid "Save"
+msgstr "Enregistrer"
+
+#: bookwyrm/templates/author/edit_author.html:99
+#: bookwyrm/templates/book/book.html:128 bookwyrm/templates/book/book.html:180
+#: bookwyrm/templates/book/cover_modal.html:32
+#: bookwyrm/templates/book/edit_book.html:242
+#: bookwyrm/templates/moderation/report_modal.html:34
+#: bookwyrm/templates/settings/federated_server.html:95
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
+#: bookwyrm/templates/snippets/goal_form.html:32
+#: bookwyrm/templates/snippets/readthrough.html:78
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
+msgid "Cancel"
+msgstr "Annuler"
+
 #: bookwyrm/templates/book/book.html:33
 #: bookwyrm/templates/discover/large-book.html:25
 #: bookwyrm/templates/discover/small-book.html:19
@@ -169,16 +305,6 @@ msgstr "Ajouter une couverture"
 msgid "Failed to load cover"
 msgstr "La couverture n’a pu être chargée"
 
-#: bookwyrm/templates/book/book.html:81
-msgid "View on OpenLibrary"
-msgstr "Voir sur OpenLibrary"
-
-#: bookwyrm/templates/book/book.html:84
-#, fuzzy
-#| msgid "View on OpenLibrary"
-msgid "View on Inventaire"
-msgstr "Voir sur OpenLibrary"
-
 #: bookwyrm/templates/book/book.html:104
 #, python-format
 msgid "(%(review_count)s review)"
@@ -196,37 +322,6 @@ msgstr "Ajouter une description"
 msgid "Description:"
 msgstr "Description :"
 
-#: bookwyrm/templates/book/book.html:127
-#: bookwyrm/templates/book/edit_book.html:249
-#: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:70
-#: bookwyrm/templates/settings/edit_server.html:68
-#: bookwyrm/templates/settings/federated_server.html:93
-#: bookwyrm/templates/settings/site.html:97
-#: bookwyrm/templates/snippets/readthrough.html:77
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:50
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:38
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:38
-msgid "Save"
-msgstr "Enregistrer"
-
-#: bookwyrm/templates/book/book.html:128 bookwyrm/templates/book/book.html:180
-#: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:250
-#: bookwyrm/templates/edit_author.html:79
-#: bookwyrm/templates/moderation/report_modal.html:34
-#: bookwyrm/templates/settings/federated_server.html:94
-#: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
-#: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/readthrough.html:78
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:51
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:39
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
-msgid "Cancel"
-msgstr "Annuler"
-
 #: bookwyrm/templates/book/book.html:137
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
@@ -298,7 +393,7 @@ msgstr "Lieux"
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
-#: bookwyrm/templates/user/layout.html:67
+#: bookwyrm/templates/user/layout.html:68
 msgid "Lists"
 msgstr "Listes"
 
@@ -308,7 +403,7 @@ msgstr "Ajouter à la liste"
 
 #: bookwyrm/templates/book/book.html:320
 #: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:163
+#: bookwyrm/templates/lists/list.html:164
 msgid "Add"
 msgstr "Ajouter"
 
@@ -317,22 +412,22 @@ msgid "ISBN:"
 msgstr "ISBN :"
 
 #: bookwyrm/templates/book/book_identifiers.html:15
-#: bookwyrm/templates/book/edit_book.html:235
+#: bookwyrm/templates/book/edit_book.html:227
 msgid "OCLC Number:"
 msgstr "Numéro OCLC :"
 
 #: bookwyrm/templates/book/book_identifiers.html:22
-#: bookwyrm/templates/book/edit_book.html:239
+#: bookwyrm/templates/book/edit_book.html:231
 msgid "ASIN:"
 msgstr "ASIN :"
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:187
+#: bookwyrm/templates/book/edit_book.html:179
 msgid "Upload cover:"
 msgstr "Charger une couverture :"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:193
+#: bookwyrm/templates/book/edit_book.html:185
 msgid "Load cover from url:"
 msgstr "Charger la couverture depuis une URL :"
 
@@ -347,21 +442,6 @@ msgstr "Modifier « %(book_title)s »"
 msgid "Add Book"
 msgstr "Ajouter un livre"
 
-#: bookwyrm/templates/book/edit_book.html:18
-#: bookwyrm/templates/edit_author.html:13
-msgid "Added:"
-msgstr "AJouté :"
-
-#: bookwyrm/templates/book/edit_book.html:19
-#: bookwyrm/templates/edit_author.html:14
-msgid "Updated:"
-msgstr "Mis à jour :"
-
-#: bookwyrm/templates/book/edit_book.html:20
-#: bookwyrm/templates/edit_author.html:15
-msgid "Last edited by:"
-msgstr "Dernière modification par :"
-
 #: bookwyrm/templates/book/edit_book.html:40
 msgid "Confirm Book Info"
 msgstr "Confirmer les informations de ce livre"
@@ -403,11 +483,6 @@ msgstr "Confirmer"
 msgid "Back"
 msgstr "Retour"
 
-#: bookwyrm/templates/book/edit_book.html:90
-#: bookwyrm/templates/edit_author.html:31
-msgid "Metadata"
-msgstr "Métadonnées"
-
 #: bookwyrm/templates/book/edit_book.html:92
 msgid "Title:"
 msgstr "Titre :"
@@ -428,76 +503,67 @@ msgstr "Numéro dans la série :"
 msgid "Publisher:"
 msgstr "Éditeur :"
 
-#: bookwyrm/templates/book/edit_book.html:128
-msgid "Separate multiple publishers with commas."
-msgstr "Séparez plusieurs éditeurs par une virgule."
-
 #: bookwyrm/templates/book/edit_book.html:135
 msgid "First published date:"
 msgstr "Première date de publication :"
 
-#: bookwyrm/templates/book/edit_book.html:147
+#: bookwyrm/templates/book/edit_book.html:143
 msgid "Published date:"
 msgstr "Date de publication :"
 
-#: bookwyrm/templates/book/edit_book.html:160
+#: bookwyrm/templates/book/edit_book.html:152
 msgid "Authors"
 msgstr "Auteurs ou autrices"
 
-#: bookwyrm/templates/book/edit_book.html:166
+#: bookwyrm/templates/book/edit_book.html:158
 #, python-format
 msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
 msgstr "Supprimer <a href=\"%(path)s\">%(name)s</a>"
 
-#: bookwyrm/templates/book/edit_book.html:171
+#: bookwyrm/templates/book/edit_book.html:163
 msgid "Add Authors:"
 msgstr "Ajouter des auteurs ou autrices :"
 
-#: bookwyrm/templates/book/edit_book.html:172
+#: bookwyrm/templates/book/edit_book.html:164
 msgid "John Doe, Jane Smith"
 msgstr "Claude Dupont, Dominique Durand"
 
-#: bookwyrm/templates/book/edit_book.html:178
-#: bookwyrm/templates/user/shelf/shelf.html:76
+#: bookwyrm/templates/book/edit_book.html:170
+#: bookwyrm/templates/user/shelf/shelf.html:77
 msgid "Cover"
 msgstr "Couverture"
 
-#: bookwyrm/templates/book/edit_book.html:206
+#: bookwyrm/templates/book/edit_book.html:198
 msgid "Physical Properties"
 msgstr "Propriétés physiques"
 
-#: bookwyrm/templates/book/edit_book.html:207
+#: bookwyrm/templates/book/edit_book.html:199
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "Format :"
 
-#: bookwyrm/templates/book/edit_book.html:215
+#: bookwyrm/templates/book/edit_book.html:207
 msgid "Pages:"
 msgstr "Pages :"
 
-#: bookwyrm/templates/book/edit_book.html:222
+#: bookwyrm/templates/book/edit_book.html:214
 msgid "Book Identifiers"
 msgstr "Identifiants du livre"
 
-#: bookwyrm/templates/book/edit_book.html:223
+#: bookwyrm/templates/book/edit_book.html:215
 msgid "ISBN 13:"
 msgstr "ISBN 13 :"
 
-#: bookwyrm/templates/book/edit_book.html:227
+#: bookwyrm/templates/book/edit_book.html:219
 msgid "ISBN 10:"
 msgstr "ISBN 10 :"
 
-#: bookwyrm/templates/book/edit_book.html:231
-#: bookwyrm/templates/edit_author.html:59
-msgid "Openlibrary key:"
-msgstr "Clé Openlibrary :"
-
-#: bookwyrm/templates/book/editions.html:5
+#: bookwyrm/templates/book/editions.html:4
 #, python-format
 msgid "Editions of %(book_title)s"
 msgstr "Éditions de %(book_title)s"
 
-#: bookwyrm/templates/book/editions.html:9
+#: bookwyrm/templates/book/editions.html:8
 #, python-format
 msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 msgstr "Éditions de <a href=\"%(work_path)s\">« %(work_title)s »</a>"
@@ -548,7 +614,7 @@ msgstr "Publié par %(publisher)s."
 
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
-#: bookwyrm/templates/feed/feed_layout.html:70
+#: bookwyrm/templates/feed/feed_layout.html:69
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
 #: bookwyrm/templates/search/book.html:32
@@ -603,23 +669,23 @@ msgstr "Suggéré"
 msgid "Recently active"
 msgstr "Actif récemment"
 
-#: bookwyrm/templates/directory/user_card.html:32
+#: bookwyrm/templates/directory/user_card.html:33
 msgid "follower you follow"
 msgid_plural "followers you follow"
 msgstr[0] "compte auquel vous êtes abonné(e)"
 msgstr[1] "comptes auxquels vous êtes abonné(e)"
 
-#: bookwyrm/templates/directory/user_card.html:39
+#: bookwyrm/templates/directory/user_card.html:40
 msgid "book on your shelves"
 msgid_plural "books on your shelves"
 msgstr[0] "livre sur vos étagères"
 msgstr[1] "livres sur vos étagères"
 
-#: bookwyrm/templates/directory/user_card.html:47
+#: bookwyrm/templates/directory/user_card.html:48
 msgid "posts"
 msgstr "publications"
 
-#: bookwyrm/templates/directory/user_card.html:53
+#: bookwyrm/templates/directory/user_card.html:54
 msgid "last active"
 msgstr "dernière activité"
 
@@ -705,44 +771,6 @@ msgstr "Valider"
 msgid "Your Account"
 msgstr "Votre compte"
 
-#: bookwyrm/templates/edit_author.html:5
-msgid "Edit Author:"
-msgstr "Modifier l’auteur ou l’autrice :"
-
-#: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
-#: bookwyrm/templates/user/shelf/create_shelf_form.html:13
-#: bookwyrm/templates/user/shelf/edit_shelf_form.html:14
-msgid "Name:"
-msgstr "Nom :"
-
-#: bookwyrm/templates/edit_author.html:37
-msgid "Bio:"
-msgstr "Bio :"
-
-#: bookwyrm/templates/edit_author.html:42
-msgid "Wikipedia link:"
-msgstr "Wikipedia :"
-
-#: bookwyrm/templates/edit_author.html:47
-msgid "Birth date:"
-msgstr "Date de naissance :"
-
-#: bookwyrm/templates/edit_author.html:52
-msgid "Death date:"
-msgstr "Date de décès :"
-
-#: bookwyrm/templates/edit_author.html:58
-msgid "Author Identifiers"
-msgstr "Identifiants de l’auteur ou autrice"
-
-#: bookwyrm/templates/edit_author.html:64
-msgid "Librarything key:"
-msgstr "Clé Librarything :"
-
-#: bookwyrm/templates/edit_author.html:69
-msgid "Goodreads key:"
-msgstr "Clé Goodreads :"
-
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
@@ -823,76 +851,76 @@ msgstr "Tous les messages"
 msgid "You have no messages right now."
 msgstr "Vous n’avez aucun message pour l’instant."
 
-#: bookwyrm/templates/feed/feed.html:9
+#: bookwyrm/templates/feed/feed.html:8
 msgid "Home Timeline"
 msgstr "Mon fil d’actualité"
 
-#: bookwyrm/templates/feed/feed.html:11
+#: bookwyrm/templates/feed/feed.html:10
 msgid "Local Timeline"
 msgstr "Fil d’actualité local"
 
-#: bookwyrm/templates/feed/feed.html:13
+#: bookwyrm/templates/feed/feed.html:12
 msgid "Federated Timeline"
 msgstr "Fil d’actualité des instances fédérées"
 
-#: bookwyrm/templates/feed/feed.html:19
+#: bookwyrm/templates/feed/feed.html:18
 msgid "Home"
 msgstr "Accueil"
 
-#: bookwyrm/templates/feed/feed.html:22
+#: bookwyrm/templates/feed/feed.html:21
 msgid "Local"
 msgstr "Local"
 
-#: bookwyrm/templates/feed/feed.html:25
+#: bookwyrm/templates/feed/feed.html:24
 #: bookwyrm/templates/settings/edit_server.html:40
 msgid "Federated"
 msgstr "Fédéré"
 
-#: bookwyrm/templates/feed/feed.html:33
+#: bookwyrm/templates/feed/feed.html:32
 #, python-format
 msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
 msgstr "charger le(s) <span data-poll=\"stream/%(tab)s\">0</span> statut(s) non lu(s)"
 
-#: bookwyrm/templates/feed/feed.html:48
+#: bookwyrm/templates/feed/feed.html:47
 msgid "There aren't any activities right now! Try following a user to get started"
 msgstr "Aucune activité pour l’instant ! Abonnez‑vous à quelqu’un pour commencer"
 
-#: bookwyrm/templates/feed/feed.html:56
+#: bookwyrm/templates/feed/feed.html:55
 #: bookwyrm/templates/get_started/users.html:6
 msgid "Who to follow"
 msgstr "À qui s’abonner"
 
-#: bookwyrm/templates/feed/feed_layout.html:5
+#: bookwyrm/templates/feed/feed_layout.html:4
 msgid "Updates"
 msgstr "Mises à jour"
 
-#: bookwyrm/templates/feed/feed_layout.html:11
+#: bookwyrm/templates/feed/feed_layout.html:10
 #: bookwyrm/templates/layout.html:59
 #: bookwyrm/templates/user/shelf/books_header.html:3
 msgid "Your books"
 msgstr "Vos livres"
 
-#: bookwyrm/templates/feed/feed_layout.html:13
+#: bookwyrm/templates/feed/feed_layout.html:12
 msgid "There are no books here right now! Try searching for a book to get started"
 msgstr "Aucun livre ici pour l’instant ! Cherchez un livre pour commencer"
 
-#: bookwyrm/templates/feed/feed_layout.html:24
-#: bookwyrm/templates/user/shelf/shelf.html:28
+#: bookwyrm/templates/feed/feed_layout.html:23
+#: bookwyrm/templates/user/shelf/shelf.html:29
 msgid "To Read"
 msgstr "À lire"
 
-#: bookwyrm/templates/feed/feed_layout.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:28
+#: bookwyrm/templates/feed/feed_layout.html:24
+#: bookwyrm/templates/user/shelf/shelf.html:29
 msgid "Currently Reading"
 msgstr "En train de lire"
 
-#: bookwyrm/templates/feed/feed_layout.html:26
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-#: bookwyrm/templates/user/shelf/shelf.html:28
+#: bookwyrm/templates/feed/feed_layout.html:25
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
+#: bookwyrm/templates/user/shelf/shelf.html:29
 msgid "Read"
 msgstr "Lu"
 
-#: bookwyrm/templates/feed/feed_layout.html:88 bookwyrm/templates/goal.html:26
+#: bookwyrm/templates/feed/feed_layout.html:87 bookwyrm/templates/goal.html:26
 #: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
 msgid "%(year)s Reading Goal"
@@ -922,7 +950,7 @@ msgid "What are you reading?"
 msgstr "Que lisez‑vous ?"
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:119
+#: bookwyrm/templates/lists/list.html:120
 msgid "Search for a book"
 msgstr "Chercher un livre"
 
@@ -942,7 +970,7 @@ msgstr "Vous pourrez ajouter des livres lorsque vous commencerez à utiliser %(s
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
 #: bookwyrm/templates/layout.html:38 bookwyrm/templates/layout.html:39
-#: bookwyrm/templates/lists/list.html:123
+#: bookwyrm/templates/lists/list.html:124
 #: bookwyrm/templates/search/layout.html:4
 #: bookwyrm/templates/search/layout.html:9
 msgid "Search"
@@ -958,7 +986,7 @@ msgid "Popular on %(site_name)s"
 msgstr "Populaire sur %(site_name)s"
 
 #: bookwyrm/templates/get_started/books.html:58
-#: bookwyrm/templates/lists/list.html:136
+#: bookwyrm/templates/lists/list.html:137
 msgid "No books found"
 msgstr "Aucun livre trouvé"
 
@@ -1078,95 +1106,95 @@ msgstr "Importer des livres"
 msgid "Data source:"
 msgstr "Source de données :"
 
-#: bookwyrm/templates/import.html:29
+#: bookwyrm/templates/import.html:32
 msgid "Data file:"
 msgstr "Fichier de données :"
 
-#: bookwyrm/templates/import.html:37
+#: bookwyrm/templates/import.html:40
 msgid "Include reviews"
 msgstr "Importer les critiques"
 
-#: bookwyrm/templates/import.html:42
+#: bookwyrm/templates/import.html:45
 msgid "Privacy setting for imported reviews:"
 msgstr "Confidentialité des critiques importées :"
 
-#: bookwyrm/templates/import.html:48
+#: bookwyrm/templates/import.html:51
 #: bookwyrm/templates/settings/server_blocklist.html:64
 msgid "Import"
 msgstr "Importer"
 
-#: bookwyrm/templates/import.html:53
+#: bookwyrm/templates/import.html:56
 msgid "Recent Imports"
 msgstr "Importations récentes"
 
-#: bookwyrm/templates/import.html:55
+#: bookwyrm/templates/import.html:58
 msgid "No recent imports"
 msgstr "Aucune importation récente"
 
-#: bookwyrm/templates/import_status.html:6
-#: bookwyrm/templates/import_status.html:10
+#: bookwyrm/templates/import_status.html:5
+#: bookwyrm/templates/import_status.html:9
 msgid "Import Status"
 msgstr "Statut de l’importation"
 
-#: bookwyrm/templates/import_status.html:13
+#: bookwyrm/templates/import_status.html:12
 msgid "Import started:"
 msgstr "Importation en cours :"
 
-#: bookwyrm/templates/import_status.html:17
+#: bookwyrm/templates/import_status.html:16
 msgid "Import completed:"
 msgstr "Importation terminé :"
 
-#: bookwyrm/templates/import_status.html:20
+#: bookwyrm/templates/import_status.html:19
 msgid "TASK FAILED"
 msgstr "la tâche a échoué"
 
-#: bookwyrm/templates/import_status.html:26
+#: bookwyrm/templates/import_status.html:25
 msgid "Import still in progress."
 msgstr "L’importation est toujours en cours"
 
-#: bookwyrm/templates/import_status.html:28
+#: bookwyrm/templates/import_status.html:27
 msgid "(Hit reload to update!)"
 msgstr "(Rechargez la page pour mettre à jour !"
 
-#: bookwyrm/templates/import_status.html:35
+#: bookwyrm/templates/import_status.html:34
 msgid "Failed to load"
 msgstr "Items non importés"
 
-#: bookwyrm/templates/import_status.html:44
+#: bookwyrm/templates/import_status.html:43
 #, python-format
 msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
 msgstr "Sauter en bas de liste pour sélectionner les %(failed_count)s items n’ayant pu être importés."
 
-#: bookwyrm/templates/import_status.html:79
+#: bookwyrm/templates/import_status.html:78
 msgid "Select all"
 msgstr "Tout sélectionner"
 
-#: bookwyrm/templates/import_status.html:82
+#: bookwyrm/templates/import_status.html:81
 msgid "Retry items"
 msgstr "Essayer d’importer les items sélectionnés de nouveau"
 
-#: bookwyrm/templates/import_status.html:108
+#: bookwyrm/templates/import_status.html:107
 msgid "Successfully imported"
 msgstr "Importation réussie"
 
-#: bookwyrm/templates/import_status.html:112
+#: bookwyrm/templates/import_status.html:111
 msgid "Book"
 msgstr "Livre"
 
-#: bookwyrm/templates/import_status.html:115
-#: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/user/shelf/shelf.html:77
-#: bookwyrm/templates/user/shelf/shelf.html:95
+#: bookwyrm/templates/import_status.html:114
+#: bookwyrm/templates/snippets/create_status_form.html:13
+#: bookwyrm/templates/user/shelf/shelf.html:78
+#: bookwyrm/templates/user/shelf/shelf.html:98
 msgid "Title"
 msgstr "Titre"
 
-#: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/user/shelf/shelf.html:78
-#: bookwyrm/templates/user/shelf/shelf.html:98
+#: bookwyrm/templates/import_status.html:117
+#: bookwyrm/templates/user/shelf/shelf.html:79
+#: bookwyrm/templates/user/shelf/shelf.html:101
 msgid "Author"
 msgstr "Auteur ou autrice"
 
-#: bookwyrm/templates/import_status.html:141
+#: bookwyrm/templates/import_status.html:140
 msgid "Imported"
 msgstr "Importé"
 
@@ -1277,7 +1305,8 @@ msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%
 msgstr "Soutenez %(site_name)s avec <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 
 #: bookwyrm/templates/layout.html:217
-msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+#| msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports de bogues via <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
 #: bookwyrm/templates/lists/create_form.html:5
@@ -1320,7 +1349,7 @@ msgid "Discard"
 msgstr "Rejeter"
 
 #: bookwyrm/templates/lists/edit_form.html:5
-#: bookwyrm/templates/lists/list_layout.html:18
+#: bookwyrm/templates/lists/list_layout.html:17
 msgid "Edit List"
 msgstr "Modifier la liste"
 
@@ -1354,76 +1383,76 @@ msgstr "Ouverte"
 msgid "Anyone can add books to this list"
 msgstr "N’importe qui peut suggérer des livres"
 
-#: bookwyrm/templates/lists/list.html:19
+#: bookwyrm/templates/lists/list.html:20
 msgid "You successfully suggested a book for this list!"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:21
+#: bookwyrm/templates/lists/list.html:22
 #, fuzzy
 #| msgid "Anyone can add books to this list"
 msgid "You successfully added a book to this list!"
 msgstr "N’importe qui peut suggérer des livres"
 
-#: bookwyrm/templates/lists/list.html:27
+#: bookwyrm/templates/lists/list.html:28
 msgid "This list is currently empty"
 msgstr "Cette liste est vide actuellement"
 
-#: bookwyrm/templates/lists/list.html:64
+#: bookwyrm/templates/lists/list.html:65
 #, python-format
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "Ajoutée par <a href=\"%(user_path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/lists/list.html:76
+#: bookwyrm/templates/lists/list.html:77
 #, fuzzy
 #| msgid "Sent"
 msgid "Set"
 msgstr "Envoyé(e)s"
 
-#: bookwyrm/templates/lists/list.html:79
+#: bookwyrm/templates/lists/list.html:80
 #, fuzzy
 #| msgid "List curation:"
 msgid "List position"
 msgstr "Modération de la liste :"
 
-#: bookwyrm/templates/lists/list.html:85
+#: bookwyrm/templates/lists/list.html:86
 #: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr "Supprimer"
 
-#: bookwyrm/templates/lists/list.html:98 bookwyrm/templates/lists/list.html:110
+#: bookwyrm/templates/lists/list.html:99 bookwyrm/templates/lists/list.html:111
 #, fuzzy
 #| msgid "Your Lists"
 msgid "Sort List"
 msgstr "Vos listes"
 
-#: bookwyrm/templates/lists/list.html:104
+#: bookwyrm/templates/lists/list.html:105
 #, fuzzy
 #| msgid "Directory"
 msgid "Direction"
 msgstr "Répertoire"
 
-#: bookwyrm/templates/lists/list.html:115
+#: bookwyrm/templates/lists/list.html:116
 msgid "Add Books"
 msgstr "Ajouter des livres"
 
-#: bookwyrm/templates/lists/list.html:115
+#: bookwyrm/templates/lists/list.html:116
 msgid "Suggest Books"
 msgstr "Suggérer des livres"
 
-#: bookwyrm/templates/lists/list.html:124
+#: bookwyrm/templates/lists/list.html:125
 msgid "search"
 msgstr "Chercher"
 
-#: bookwyrm/templates/lists/list.html:130
+#: bookwyrm/templates/lists/list.html:131
 msgid "Clear search"
 msgstr "Vider la requête"
 
-#: bookwyrm/templates/lists/list.html:135
+#: bookwyrm/templates/lists/list.html:136
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
 msgstr "Aucun livre trouvé pour la requête « %(query)s »"
 
-#: bookwyrm/templates/lists/list.html:163
+#: bookwyrm/templates/lists/list.html:164
 msgid "Suggest"
 msgstr "Suggérer"
 
@@ -1448,36 +1477,36 @@ msgstr "Contacter un administrateur pour obtenir une invitation"
 msgid "More about this site"
 msgstr "En savoir plus sur ce site"
 
+#: bookwyrm/templates/moderation/report.html:5
 #: bookwyrm/templates/moderation/report.html:6
-#: bookwyrm/templates/moderation/report.html:7
 #: bookwyrm/templates/moderation/report_preview.html:6
 #, python-format
 msgid "Report #%(report_id)s: %(username)s"
 msgstr "Signalement #%(report_id)s : %(username)s"
 
-#: bookwyrm/templates/moderation/report.html:11
+#: bookwyrm/templates/moderation/report.html:10
 msgid "Back to reports"
 msgstr "Retour aux signalements"
 
-#: bookwyrm/templates/moderation/report.html:23
+#: bookwyrm/templates/moderation/report.html:22
 msgid "Moderator Comments"
 msgstr "Commentaires de l’équipe de modération"
 
-#: bookwyrm/templates/moderation/report.html:41
+#: bookwyrm/templates/moderation/report.html:40
 #: bookwyrm/templates/snippets/create_status.html:28
-#: bookwyrm/templates/snippets/create_status_form.html:63
+#: bookwyrm/templates/snippets/create_status_form.html:66
 msgid "Comment"
 msgstr "Commentaire"
 
-#: bookwyrm/templates/moderation/report.html:46
+#: bookwyrm/templates/moderation/report.html:45
 msgid "Reported statuses"
 msgstr "Statuts signalés"
 
-#: bookwyrm/templates/moderation/report.html:48
+#: bookwyrm/templates/moderation/report.html:47
 msgid "No statuses reported"
 msgstr "Aucun statut signalé"
 
-#: bookwyrm/templates/moderation/report.html:54
+#: bookwyrm/templates/moderation/report.html:53
 #, fuzzy
 #| msgid "Statuses has been deleted"
 msgid "Status has been deleted"
@@ -1757,7 +1786,7 @@ msgstr "Chercher"
 
 #: bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
-#: bookwyrm/templates/user/layout.html:73
+#: bookwyrm/templates/user/layout.html:74
 msgid "Books"
 msgstr "Livres"
 
@@ -1832,7 +1861,7 @@ msgid "Add server"
 msgstr "Ajouter une couverture"
 
 #: bookwyrm/templates/settings/edit_server.html:7
-#: bookwyrm/templates/settings/federated_server.html:12
+#: bookwyrm/templates/settings/federated_server.html:13
 #: bookwyrm/templates/settings/server_blocklist.html:7
 msgid "Back to server list"
 msgstr "Retour à la liste des serveurs"
@@ -1851,26 +1880,26 @@ msgid "Instance:"
 msgstr "Nom de l’instance :"
 
 #: bookwyrm/templates/settings/edit_server.html:37
-#: bookwyrm/templates/settings/federated_server.html:29
+#: bookwyrm/templates/settings/federated_server.html:30
 #: bookwyrm/templates/user_admin/user_info.html:34
 msgid "Status:"
 msgstr "Statut :"
 
 #: bookwyrm/templates/settings/edit_server.html:41
-#: bookwyrm/templates/settings/federated_server.html:9
+#: bookwyrm/templates/settings/federated_server.html:10
 #, fuzzy
 #| msgid "Block"
 msgid "Blocked"
 msgstr "Bloquer"
 
 #: bookwyrm/templates/settings/edit_server.html:48
-#: bookwyrm/templates/settings/federated_server.html:21
+#: bookwyrm/templates/settings/federated_server.html:22
 #: bookwyrm/templates/user_admin/user_info.html:26
 msgid "Software:"
 msgstr "Logiciel :"
 
 #: bookwyrm/templates/settings/edit_server.html:55
-#: bookwyrm/templates/settings/federated_server.html:25
+#: bookwyrm/templates/settings/federated_server.html:26
 #: bookwyrm/templates/user_admin/user_info.html:30
 msgid "Version:"
 msgstr "Description :"
@@ -1879,71 +1908,71 @@ msgstr "Description :"
 msgid "Notes:"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:18
+#: bookwyrm/templates/settings/federated_server.html:19
 msgid "Details"
 msgstr "Détails"
 
-#: bookwyrm/templates/settings/federated_server.html:36
-#: bookwyrm/templates/user/layout.html:55
+#: bookwyrm/templates/settings/federated_server.html:37
+#: bookwyrm/templates/user/layout.html:56
 msgid "Activity"
 msgstr "Activité"
 
-#: bookwyrm/templates/settings/federated_server.html:39
+#: bookwyrm/templates/settings/federated_server.html:40
 msgid "Users:"
 msgstr "Comptes :"
 
-#: bookwyrm/templates/settings/federated_server.html:42
-#: bookwyrm/templates/settings/federated_server.html:49
+#: bookwyrm/templates/settings/federated_server.html:43
+#: bookwyrm/templates/settings/federated_server.html:50
 msgid "View all"
 msgstr "Voir tous"
 
-#: bookwyrm/templates/settings/federated_server.html:46
+#: bookwyrm/templates/settings/federated_server.html:47
 msgid "Reports:"
 msgstr "Signalements :"
 
-#: bookwyrm/templates/settings/federated_server.html:53
+#: bookwyrm/templates/settings/federated_server.html:54
 msgid "Followed by us:"
 msgstr "Suivi par nous :"
 
-#: bookwyrm/templates/settings/federated_server.html:59
+#: bookwyrm/templates/settings/federated_server.html:60
 msgid "Followed by them:"
 msgstr "Suivi par eux :"
 
-#: bookwyrm/templates/settings/federated_server.html:65
+#: bookwyrm/templates/settings/federated_server.html:66
 msgid "Blocked by us:"
 msgstr "Bloqués par nous :"
 
-#: bookwyrm/templates/settings/federated_server.html:77
+#: bookwyrm/templates/settings/federated_server.html:78
 #: bookwyrm/templates/user_admin/user_info.html:39
 msgid "Notes"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:80
+#: bookwyrm/templates/settings/federated_server.html:81
 #, fuzzy
 #| msgid "Edit Book"
 msgid "Edit"
 msgstr "Modifier le livre"
 
-#: bookwyrm/templates/settings/federated_server.html:100
+#: bookwyrm/templates/settings/federated_server.html:101
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:3
 msgid "Actions"
 msgstr "Actions"
 
-#: bookwyrm/templates/settings/federated_server.html:104
+#: bookwyrm/templates/settings/federated_server.html:105
 #: bookwyrm/templates/snippets/block_button.html:5
 msgid "Block"
 msgstr "Bloquer"
 
-#: bookwyrm/templates/settings/federated_server.html:105
+#: bookwyrm/templates/settings/federated_server.html:106
 msgid "All users from this instance will be deactivated."
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:110
+#: bookwyrm/templates/settings/federated_server.html:111
 #: bookwyrm/templates/snippets/block_button.html:10
 msgid "Un-block"
 msgstr "Débloquer"
 
-#: bookwyrm/templates/settings/federated_server.html:111
+#: bookwyrm/templates/settings/federated_server.html:112
 msgid "All users from this instance will be re-activated."
 msgstr ""
 
@@ -2154,7 +2183,7 @@ msgstr "Autoriser les demandes d’invitation :"
 msgid "Registration closed text:"
 msgstr "Texte affiché lorsque les enregistrements sont clos :"
 
-#: bookwyrm/templates/snippets/book_cover.html:32
+#: bookwyrm/templates/snippets/book_cover.html:31
 msgid "No cover"
 msgstr "Aucune couverture"
 
@@ -2163,15 +2192,15 @@ msgstr "Aucune couverture"
 msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgstr "<a href=\"%(path)s\">%(title)s</a> par "
 
-#: bookwyrm/templates/snippets/boost_button.html:8
 #: bookwyrm/templates/snippets/boost_button.html:9
+#: bookwyrm/templates/snippets/boost_button.html:10
 #, fuzzy
 #| msgid "boosted"
 msgid "Boost"
 msgstr "partagé"
 
-#: bookwyrm/templates/snippets/boost_button.html:15
 #: bookwyrm/templates/snippets/boost_button.html:16
+#: bookwyrm/templates/snippets/boost_button.html:17
 #, fuzzy
 #| msgid "Un-boost status"
 msgid "Un-boost"
@@ -2193,66 +2222,66 @@ msgstr "Critique"
 msgid "Quote"
 msgstr "Citation"
 
-#: bookwyrm/templates/snippets/create_status_form.html:20
+#: bookwyrm/templates/snippets/create_status_form.html:23
 msgid "Comment:"
 msgstr "Commentaire :"
 
-#: bookwyrm/templates/snippets/create_status_form.html:22
+#: bookwyrm/templates/snippets/create_status_form.html:25
 msgid "Quote:"
 msgstr "Citation :"
 
-#: bookwyrm/templates/snippets/create_status_form.html:24
+#: bookwyrm/templates/snippets/create_status_form.html:27
 msgid "Review:"
 msgstr "Critique :"
 
-#: bookwyrm/templates/snippets/create_status_form.html:53
-#: bookwyrm/templates/snippets/status/layout.html:30
+#: bookwyrm/templates/snippets/create_status_form.html:56
+#: bookwyrm/templates/snippets/status/layout.html:29
+#: bookwyrm/templates/snippets/status/layout.html:47
 #: bookwyrm/templates/snippets/status/layout.html:48
-#: bookwyrm/templates/snippets/status/layout.html:49
 msgid "Reply"
 msgstr "Répondre"
 
-#: bookwyrm/templates/snippets/create_status_form.html:53
+#: bookwyrm/templates/snippets/create_status_form.html:56
 #, fuzzy
 #| msgid "Footer Content"
 msgid "Content"
 msgstr "Contenu du pied de page"
 
-#: bookwyrm/templates/snippets/create_status_form.html:77
+#: bookwyrm/templates/snippets/create_status_form.html:80
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
 msgid "Progress:"
 msgstr "Progression :"
 
-#: bookwyrm/templates/snippets/create_status_form.html:85
-#: bookwyrm/templates/snippets/readthrough_form.html:26
+#: bookwyrm/templates/snippets/create_status_form.html:88
+#: bookwyrm/templates/snippets/readthrough_form.html:22
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr "pages"
 
-#: bookwyrm/templates/snippets/create_status_form.html:86
-#: bookwyrm/templates/snippets/readthrough_form.html:27
+#: bookwyrm/templates/snippets/create_status_form.html:89
+#: bookwyrm/templates/snippets/readthrough_form.html:23
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr "pourcent"
 
-#: bookwyrm/templates/snippets/create_status_form.html:92
+#: bookwyrm/templates/snippets/create_status_form.html:95
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "sur %(pages)s pages"
 
-#: bookwyrm/templates/snippets/create_status_form.html:107
+#: bookwyrm/templates/snippets/create_status_form.html:110
 msgid "Include spoiler alert"
 msgstr "Afficher une alerte spoiler"
 
-#: bookwyrm/templates/snippets/create_status_form.html:114
+#: bookwyrm/templates/snippets/create_status_form.html:117
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:19
 msgid "Private"
 msgstr "Privé"
 
-#: bookwyrm/templates/snippets/create_status_form.html:125
+#: bookwyrm/templates/snippets/create_status_form.html:128
 msgid "Post"
 msgstr "Publier"
 
@@ -2266,17 +2295,17 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u
 msgstr "Vous avez supprimé ce résumé et ses %(count)s progressions associées."
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
-#: bookwyrm/templates/snippets/follow_request_buttons.html:13
+#: bookwyrm/templates/snippets/follow_request_buttons.html:12
 msgid "Delete"
 msgstr "Supprimer"
 
-#: bookwyrm/templates/snippets/fav_button.html:7
 #: bookwyrm/templates/snippets/fav_button.html:9
+#: bookwyrm/templates/snippets/fav_button.html:11
 msgid "Like"
 msgstr ""
 
-#: bookwyrm/templates/snippets/fav_button.html:15
-#: bookwyrm/templates/snippets/fav_button.html:16
+#: bookwyrm/templates/snippets/fav_button.html:17
+#: bookwyrm/templates/snippets/fav_button.html:18
 #, fuzzy
 #| msgid "Un-like status"
 msgid "Un-like"
@@ -2310,11 +2339,11 @@ msgstr "Annuler la demande d’abonnement"
 msgid "Unfollow"
 msgstr "Se désabonner"
 
-#: bookwyrm/templates/snippets/follow_request_buttons.html:8
+#: bookwyrm/templates/snippets/follow_request_buttons.html:7
 msgid "Accept"
 msgstr "Accepter"
 
-#: bookwyrm/templates/snippets/form_rate_stars.html:20
+#: bookwyrm/templates/snippets/form_rate_stars.html:19
 #: bookwyrm/templates/snippets/stars.html:13
 msgid "No rating"
 msgstr "Aucune note"
@@ -2363,8 +2392,8 @@ msgid "Goal privacy:"
 msgstr "Confidentialité du défi :"
 
 #: bookwyrm/templates/snippets/goal_form.html:26
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:45
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:33
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:29
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20
 msgid "Post to feed"
 msgstr "Publier sur le fil d’actualité"
@@ -2475,12 +2504,12 @@ msgstr "Supprimer ces dates de lecture"
 msgid "Started reading"
 msgstr "Lecture commencée le"
 
-#: bookwyrm/templates/snippets/readthrough_form.html:18
+#: bookwyrm/templates/snippets/readthrough_form.html:14
 msgid "Progress"
 msgstr "Progression"
 
-#: bookwyrm/templates/snippets/readthrough_form.html:34
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:29
+#: bookwyrm/templates/snippets/readthrough_form.html:30
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25
 msgid "Finished reading"
 msgstr "Lecture terminée le"
 
@@ -2488,27 +2517,27 @@ msgstr "Lecture terminée le"
 msgid "Sign Up"
 msgstr "S’enregistrer"
 
-#: bookwyrm/templates/snippets/report_button.html:5
+#: bookwyrm/templates/snippets/report_button.html:6
 msgid "Report"
 msgstr "Signaler"
 
 #: bookwyrm/templates/snippets/rss_title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:34
+#: bookwyrm/templates/snippets/status/status_header.html:35
 msgid "rated"
 msgstr "a noté"
 
 #: bookwyrm/templates/snippets/rss_title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:36
+#: bookwyrm/templates/snippets/status/status_header.html:37
 msgid "reviewed"
 msgstr "a écrit une critique de"
 
 #: bookwyrm/templates/snippets/rss_title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:38
+#: bookwyrm/templates/snippets/status/status_header.html:39
 msgid "commented on"
 msgstr "a commenté"
 
 #: bookwyrm/templates/snippets/rss_title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:40
+#: bookwyrm/templates/snippets/status/status_header.html:41
 msgid "quoted"
 msgstr "a cité"
 
@@ -2526,7 +2555,7 @@ msgid "Finish \"<em>%(book_title)s</em>\""
 msgstr "Terminer « <em>%(book_title)s</em> »"
 
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:34
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:36
 msgid "Update progress"
 msgstr "Progression de la mise à jour"
 
@@ -2534,20 +2563,20 @@ msgstr "Progression de la mise à jour"
 msgid "More shelves"
 msgstr "Plus d’étagères"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:8
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:10
 msgid "Start reading"
 msgstr "Commencer la lecture"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:15
 msgid "Finish reading"
 msgstr "Terminer la lecture"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:18
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26
 msgid "Want to read"
 msgstr "Je veux le lire"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:47
 #, python-format
 msgid "Remove from %(name)s"
 msgstr "Retirer de %(name)s"
@@ -2562,40 +2591,40 @@ msgstr "Commencer « <em>%(book_title)s</em> »"
 msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgstr "A envie de lire « <em>%(book_title)s</em> »"
 
-#: bookwyrm/templates/snippets/status/content_status.html:70
-#: bookwyrm/templates/snippets/trimmed_text.html:14
+#: bookwyrm/templates/snippets/status/content_status.html:71
+#: bookwyrm/templates/snippets/trimmed_text.html:15
 msgid "Show more"
 msgstr "Déplier"
 
-#: bookwyrm/templates/snippets/status/content_status.html:85
-#: bookwyrm/templates/snippets/trimmed_text.html:29
+#: bookwyrm/templates/snippets/status/content_status.html:86
+#: bookwyrm/templates/snippets/trimmed_text.html:30
 msgid "Show less"
 msgstr "Replier"
 
-#: bookwyrm/templates/snippets/status/content_status.html:115
+#: bookwyrm/templates/snippets/status/content_status.html:116
 msgid "Open image in new window"
 msgstr "Ouvrir l’image dans une nouvelle fenêtre"
 
-#: bookwyrm/templates/snippets/status/layout.html:22
+#: bookwyrm/templates/snippets/status/layout.html:21
 #: bookwyrm/templates/snippets/status/status_options.html:17
 msgid "Delete status"
 msgstr "Supprimer le statut"
 
+#: bookwyrm/templates/snippets/status/layout.html:51
 #: bookwyrm/templates/snippets/status/layout.html:52
-#: bookwyrm/templates/snippets/status/layout.html:53
 msgid "Boost status"
 msgstr "Partager le statut"
 
+#: bookwyrm/templates/snippets/status/layout.html:55
 #: bookwyrm/templates/snippets/status/layout.html:56
-#: bookwyrm/templates/snippets/status/layout.html:57
 msgid "Like status"
 msgstr "Ajouter le statut aux favoris"
 
-#: bookwyrm/templates/snippets/status/status.html:9
+#: bookwyrm/templates/snippets/status/status.html:10
 msgid "boosted"
 msgstr "partagé"
 
-#: bookwyrm/templates/snippets/status/status_header.html:44
+#: bookwyrm/templates/snippets/status/status_header.html:45
 #, python-format
 msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
 msgstr "a répondu au <a href=\"%(status_path)s\">statut</a> de <a href=\"%(user_path)s\">%(username)s</a>"
@@ -2627,15 +2656,15 @@ msgstr "Trié par ordre croissant"
 msgid "Sorted descending"
 msgstr "Trié par ordre décroissant"
 
-#: bookwyrm/templates/user/layout.html:12 bookwyrm/templates/user/user.html:10
+#: bookwyrm/templates/user/layout.html:13 bookwyrm/templates/user/user.html:10
 msgid "User Profile"
 msgstr "Profil"
 
-#: bookwyrm/templates/user/layout.html:36
+#: bookwyrm/templates/user/layout.html:37
 msgid "Follow Requests"
 msgstr "Demandes d’abonnement"
 
-#: bookwyrm/templates/user/layout.html:61
+#: bookwyrm/templates/user/layout.html:62
 msgid "Reading Goal"
 msgstr "Défi lecture"
 
@@ -2681,38 +2710,38 @@ msgstr "Modifier l’étagère"
 msgid "Update shelf"
 msgstr "Mettre l’étagère à jour"
 
-#: bookwyrm/templates/user/shelf/shelf.html:24 bookwyrm/views/shelf.py:48
+#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:51
 msgid "All books"
 msgstr "Tous les livres"
 
-#: bookwyrm/templates/user/shelf/shelf.html:37
+#: bookwyrm/templates/user/shelf/shelf.html:38
 msgid "Create shelf"
 msgstr "Créer l’étagère"
 
-#: bookwyrm/templates/user/shelf/shelf.html:60
+#: bookwyrm/templates/user/shelf/shelf.html:61
 msgid "Edit shelf"
 msgstr "Modifier l’étagère"
 
-#: bookwyrm/templates/user/shelf/shelf.html:79
-#: bookwyrm/templates/user/shelf/shelf.html:101
+#: bookwyrm/templates/user/shelf/shelf.html:80
+#: bookwyrm/templates/user/shelf/shelf.html:104
 msgid "Shelved"
 msgstr "Ajouté à une étagère"
 
-#: bookwyrm/templates/user/shelf/shelf.html:80
-#: bookwyrm/templates/user/shelf/shelf.html:105
+#: bookwyrm/templates/user/shelf/shelf.html:81
+#: bookwyrm/templates/user/shelf/shelf.html:108
 msgid "Started"
 msgstr "Commencé"
 
-#: bookwyrm/templates/user/shelf/shelf.html:81
-#: bookwyrm/templates/user/shelf/shelf.html:108
+#: bookwyrm/templates/user/shelf/shelf.html:82
+#: bookwyrm/templates/user/shelf/shelf.html:111
 msgid "Finished"
 msgstr "Terminé"
 
-#: bookwyrm/templates/user/shelf/shelf.html:134
+#: bookwyrm/templates/user/shelf/shelf.html:137
 msgid "This shelf is empty."
 msgstr "Cette étagère est vide"
 
-#: bookwyrm/templates/user/shelf/shelf.html:140
+#: bookwyrm/templates/user/shelf/shelf.html:143
 msgid "Delete shelf"
 msgstr "Supprimer l’étagère"
 
@@ -2741,24 +2770,24 @@ msgstr "Flux RSS"
 msgid "No activities yet!"
 msgstr "Aucune activité pour l’instant !"
 
-#: bookwyrm/templates/user/user_preview.html:14
+#: bookwyrm/templates/user/user_preview.html:15
 #, python-format
 msgid "Joined %(date)s"
 msgstr "Enregistré(e) %(date)s"
 
-#: bookwyrm/templates/user/user_preview.html:18
+#: bookwyrm/templates/user/user_preview.html:19
 #, python-format
 msgid "%(counter)s follower"
 msgid_plural "%(counter)s followers"
 msgstr[0] "%(counter)s abonnement"
 msgstr[1] "%(counter)s abonnements"
 
-#: bookwyrm/templates/user/user_preview.html:19
+#: bookwyrm/templates/user/user_preview.html:20
 #, python-format
 msgid "%(counter)s following"
 msgstr "%(counter)s abonnements"
 
-#: bookwyrm/templates/user/user_preview.html:25
+#: bookwyrm/templates/user/user_preview.html:26
 #, fuzzy, python-format
 #| msgid "%(mutuals)s follower you follow"
 #| msgid_plural "%(mutuals)s followers you follow"
@@ -2767,7 +2796,7 @@ msgid_plural "%(mutuals_display)s followers you follow"
 msgstr[0] "%(mutuals)s abonnement auxquel vous êtes abonné(e)"
 msgstr[1] "%(mutuals)s abonnements auxquels vous êtes abonné(e)"
 
-#: bookwyrm/templates/user_admin/user.html:11
+#: bookwyrm/templates/user_admin/user.html:9
 #, fuzzy
 #| msgid "Back to reports"
 msgid "Back to users"
@@ -2840,15 +2869,20 @@ msgstr ""
 msgid "Access level:"
 msgstr ""
 
-#: bookwyrm/views/password.py:32
+#: bookwyrm/views/password.py:30 bookwyrm/views/password.py:35
 msgid "No user with that email address was found."
 msgstr "Aucun compte avec cette adresse email n’a été trouvé."
 
-#: bookwyrm/views/password.py:41
+#: bookwyrm/views/password.py:44
 #, python-format
 msgid "A password reset link sent to %s"
 msgstr "Un lien de réinitialisation a été envoyé à %s."
 
+#, fuzzy
+#~| msgid "BookWyrm users"
+#~ msgid "BookWyrm\\"
+#~ msgstr "Comptes BookWyrm"
+
 #, fuzzy
 #~| msgid "Show more"
 #~ msgid "Show"
diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
index a6fdfa75..0f399924 100644
--- a/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/locale/zh_Hans/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-10 13:23-0700\n"
+"POT-Creation-Date: 2021-05-14 15:12-0700\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"
@@ -57,13 +57,13 @@ msgstr ""
 msgid "Book Title"
 msgstr "标题"
 
-#: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:31
-#: bookwyrm/templates/user/shelf/shelf.html:82
-#: bookwyrm/templates/user/shelf/shelf.html:112
+#: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:34
+#: bookwyrm/templates/user/shelf/shelf.html:84
+#: bookwyrm/templates/user/shelf/shelf.html:115
 msgid "Rating"
 msgstr "评价"
 
-#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:100
+#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:101
 msgid "Sort By"
 msgstr ""
 
@@ -137,19 +137,155 @@ msgstr "�务器错误"
 msgid "Something went wrong! Sorry about that."
 msgstr "�些东西出错了�对�起啦。"
 
-#: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
+#: bookwyrm/templates/author/author.html:17
+#: bookwyrm/templates/author/author.html:18
 msgid "Edit Author"
 msgstr "编辑作者"
 
-#: bookwyrm/templates/author.html:31
+#: bookwyrm/templates/author/author.html:33
+#: bookwyrm/templates/author/edit_author.html:38
+msgid "Aliases:"
+msgstr ""
+
+#: bookwyrm/templates/author/author.html:39
+msgid "Born:"
+msgstr ""
+
+#: bookwyrm/templates/author/author.html:45
+msgid "Died:"
+msgstr ""
+
+#: bookwyrm/templates/author/author.html:52
 msgid "Wikipedia"
 msgstr "维基百科"
 
-#: bookwyrm/templates/author.html:36
+#: bookwyrm/templates/author/author.html:56
+#: bookwyrm/templates/book/book.html:81
+msgid "View on OpenLibrary"
+msgstr "在 OpenLibrary 查看"
+
+#: bookwyrm/templates/author/author.html:61
+#: bookwyrm/templates/book/book.html:84
+#, fuzzy
+#| msgid "View on OpenLibrary"
+msgid "View on Inventaire"
+msgstr "在 OpenLibrary 查看"
+
+#: bookwyrm/templates/author/author.html:75
 #, python-format
 msgid "Books by %(name)s"
 msgstr "%(name)s 所著的书"
 
+#: bookwyrm/templates/author/edit_author.html:5
+msgid "Edit Author:"
+msgstr "编辑作者:"
+
+#: bookwyrm/templates/author/edit_author.html:13
+#: bookwyrm/templates/book/edit_book.html:18
+msgid "Added:"
+msgstr "添加了:"
+
+#: bookwyrm/templates/author/edit_author.html:14
+#: bookwyrm/templates/book/edit_book.html:19
+msgid "Updated:"
+msgstr "更新了:"
+
+#: bookwyrm/templates/author/edit_author.html:15
+#: bookwyrm/templates/book/edit_book.html:20
+msgid "Last edited by:"
+msgstr "最�编辑人:"
+
+#: bookwyrm/templates/author/edit_author.html:31
+#: bookwyrm/templates/book/edit_book.html:90
+msgid "Metadata"
+msgstr "元数�"
+
+#: bookwyrm/templates/author/edit_author.html:32
+#: bookwyrm/templates/lists/form.html:8
+#: bookwyrm/templates/user/shelf/create_shelf_form.html:13
+#: bookwyrm/templates/user/shelf/edit_shelf_form.html:14
+msgid "Name:"
+msgstr "�称:"
+
+#: bookwyrm/templates/author/edit_author.html:40
+#: bookwyrm/templates/book/edit_book.html:128
+#: bookwyrm/templates/book/edit_book.html:165
+#, fuzzy
+#| msgid "Separate multiple publishers with commas."
+msgid "Separate multiple values with commas."
+msgstr "请用英文逗�(,)分开多个出版社。"
+
+#: bookwyrm/templates/author/edit_author.html:46
+msgid "Bio:"
+msgstr "简介:"
+
+#: bookwyrm/templates/author/edit_author.html:51
+msgid "Wikipedia link:"
+msgstr "维基百科链接:"
+
+#: bookwyrm/templates/author/edit_author.html:57
+msgid "Birth date:"
+msgstr "出生日期:"
+
+#: bookwyrm/templates/author/edit_author.html:65
+msgid "Death date:"
+msgstr "死亡日期:"
+
+#: bookwyrm/templates/author/edit_author.html:73
+msgid "Author Identifiers"
+msgstr "作者标识�:"
+
+#: bookwyrm/templates/author/edit_author.html:74
+#: bookwyrm/templates/book/edit_book.html:223
+msgid "Openlibrary key:"
+msgstr "Openlibrary key:"
+
+#: bookwyrm/templates/author/edit_author.html:79
+#, fuzzy
+#| msgid "View on OpenLibrary"
+msgid "Inventaire ID:"
+msgstr "在 OpenLibrary 查看"
+
+#: bookwyrm/templates/author/edit_author.html:84
+msgid "Librarything key:"
+msgstr "Librarything key:"
+
+#: bookwyrm/templates/author/edit_author.html:89
+msgid "Goodreads key:"
+msgstr "Goodreads key:"
+
+#: bookwyrm/templates/author/edit_author.html:98
+#: bookwyrm/templates/book/book.html:127
+#: bookwyrm/templates/book/edit_book.html:241
+#: bookwyrm/templates/lists/form.html:42
+#: bookwyrm/templates/preferences/edit_user.html:70
+#: bookwyrm/templates/settings/edit_server.html:68
+#: bookwyrm/templates/settings/federated_server.html:94
+#: bookwyrm/templates/settings/site.html:97
+#: bookwyrm/templates/snippets/readthrough.html:77
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
+#: bookwyrm/templates/user_admin/user_moderation_actions.html:38
+msgid "Save"
+msgstr "�存"
+
+#: bookwyrm/templates/author/edit_author.html:99
+#: bookwyrm/templates/book/book.html:128 bookwyrm/templates/book/book.html:180
+#: bookwyrm/templates/book/cover_modal.html:32
+#: bookwyrm/templates/book/edit_book.html:242
+#: bookwyrm/templates/moderation/report_modal.html:34
+#: bookwyrm/templates/settings/federated_server.html:95
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
+#: bookwyrm/templates/snippets/goal_form.html:32
+#: bookwyrm/templates/snippets/readthrough.html:78
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43
+#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
+#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
+msgid "Cancel"
+msgstr "�消"
+
 #: bookwyrm/templates/book/book.html:33
 #: bookwyrm/templates/discover/large-book.html:25
 #: bookwyrm/templates/discover/small-book.html:19
@@ -169,16 +305,6 @@ msgstr "添加��"
 msgid "Failed to load cover"
 msgstr "加载��失败"
 
-#: bookwyrm/templates/book/book.html:81
-msgid "View on OpenLibrary"
-msgstr "在 OpenLibrary 查看"
-
-#: bookwyrm/templates/book/book.html:84
-#, fuzzy
-#| msgid "View on OpenLibrary"
-msgid "View on Inventaire"
-msgstr "在 OpenLibrary 查看"
-
 #: bookwyrm/templates/book/book.html:104
 #, python-format
 msgid "(%(review_count)s review)"
@@ -195,37 +321,6 @@ msgstr "添加�述"
 msgid "Description:"
 msgstr "�述:"
 
-#: bookwyrm/templates/book/book.html:127
-#: bookwyrm/templates/book/edit_book.html:249
-#: bookwyrm/templates/edit_author.html:78 bookwyrm/templates/lists/form.html:42
-#: bookwyrm/templates/preferences/edit_user.html:70
-#: bookwyrm/templates/settings/edit_server.html:68
-#: bookwyrm/templates/settings/federated_server.html:93
-#: bookwyrm/templates/settings/site.html:97
-#: bookwyrm/templates/snippets/readthrough.html:77
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:50
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:38
-#: bookwyrm/templates/user_admin/user_moderation_actions.html:38
-msgid "Save"
-msgstr "�存"
-
-#: bookwyrm/templates/book/book.html:128 bookwyrm/templates/book/book.html:180
-#: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:250
-#: bookwyrm/templates/edit_author.html:79
-#: bookwyrm/templates/moderation/report_modal.html:34
-#: bookwyrm/templates/settings/federated_server.html:94
-#: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
-#: bookwyrm/templates/snippets/goal_form.html:32
-#: bookwyrm/templates/snippets/readthrough.html:78
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:51
-#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:39
-#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
-msgid "Cancel"
-msgstr "�消"
-
 #: bookwyrm/templates/book/book.html:137
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
@@ -297,7 +392,7 @@ msgstr "地点"
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
-#: bookwyrm/templates/user/layout.html:67
+#: bookwyrm/templates/user/layout.html:68
 msgid "Lists"
 msgstr "列表"
 
@@ -307,7 +402,7 @@ msgstr "添加到列表"
 
 #: bookwyrm/templates/book/book.html:320
 #: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:163
+#: bookwyrm/templates/lists/list.html:164
 msgid "Add"
 msgstr "添加"
 
@@ -316,22 +411,22 @@ msgid "ISBN:"
 msgstr "ISBN:"
 
 #: bookwyrm/templates/book/book_identifiers.html:15
-#: bookwyrm/templates/book/edit_book.html:235
+#: bookwyrm/templates/book/edit_book.html:227
 msgid "OCLC Number:"
 msgstr "OCLC �:"
 
 #: bookwyrm/templates/book/book_identifiers.html:22
-#: bookwyrm/templates/book/edit_book.html:239
+#: bookwyrm/templates/book/edit_book.html:231
 msgid "ASIN:"
 msgstr "ASIN:"
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:187
+#: bookwyrm/templates/book/edit_book.html:179
 msgid "Upload cover:"
 msgstr "上传��:"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:193
+#: bookwyrm/templates/book/edit_book.html:185
 msgid "Load cover from url:"
 msgstr "从网�加载��:"
 
@@ -346,21 +441,6 @@ msgstr "编辑 \"%(book_title)s\""
 msgid "Add Book"
 msgstr "添加书目"
 
-#: bookwyrm/templates/book/edit_book.html:18
-#: bookwyrm/templates/edit_author.html:13
-msgid "Added:"
-msgstr "添加了:"
-
-#: bookwyrm/templates/book/edit_book.html:19
-#: bookwyrm/templates/edit_author.html:14
-msgid "Updated:"
-msgstr "更新了:"
-
-#: bookwyrm/templates/book/edit_book.html:20
-#: bookwyrm/templates/edit_author.html:15
-msgid "Last edited by:"
-msgstr "最�编辑人:"
-
 #: bookwyrm/templates/book/edit_book.html:40
 msgid "Confirm Book Info"
 msgstr "确认书目信�"
@@ -402,11 +482,6 @@ msgstr "确认"
 msgid "Back"
 msgstr "返回"
 
-#: bookwyrm/templates/book/edit_book.html:90
-#: bookwyrm/templates/edit_author.html:31
-msgid "Metadata"
-msgstr "元数�"
-
 #: bookwyrm/templates/book/edit_book.html:92
 msgid "Title:"
 msgstr "标题:"
@@ -427,76 +502,67 @@ msgstr "系列编�:"
 msgid "Publisher:"
 msgstr "出版社:"
 
-#: bookwyrm/templates/book/edit_book.html:128
-msgid "Separate multiple publishers with commas."
-msgstr "请用英文逗�(,)分开多个出版社。"
-
 #: bookwyrm/templates/book/edit_book.html:135
 msgid "First published date:"
 msgstr "�版时间:"
 
-#: bookwyrm/templates/book/edit_book.html:147
+#: bookwyrm/templates/book/edit_book.html:143
 msgid "Published date:"
 msgstr "出版时间:"
 
-#: bookwyrm/templates/book/edit_book.html:160
+#: bookwyrm/templates/book/edit_book.html:152
 msgid "Authors"
 msgstr "作者"
 
-#: bookwyrm/templates/book/edit_book.html:166
+#: bookwyrm/templates/book/edit_book.html:158
 #, python-format
 msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
 msgstr "移除 <a href=\"%(path)s\">%(name)s</a>"
 
-#: bookwyrm/templates/book/edit_book.html:171
+#: bookwyrm/templates/book/edit_book.html:163
 msgid "Add Authors:"
 msgstr "添加作者:"
 
-#: bookwyrm/templates/book/edit_book.html:172
+#: bookwyrm/templates/book/edit_book.html:164
 msgid "John Doe, Jane Smith"
 msgstr "张三, �四"
 
-#: bookwyrm/templates/book/edit_book.html:178
-#: bookwyrm/templates/user/shelf/shelf.html:76
+#: bookwyrm/templates/book/edit_book.html:170
+#: bookwyrm/templates/user/shelf/shelf.html:77
 msgid "Cover"
 msgstr "��"
 
-#: bookwyrm/templates/book/edit_book.html:206
+#: bookwyrm/templates/book/edit_book.html:198
 msgid "Physical Properties"
 msgstr "实体性质"
 
-#: bookwyrm/templates/book/edit_book.html:207
+#: bookwyrm/templates/book/edit_book.html:199
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "格�:"
 
-#: bookwyrm/templates/book/edit_book.html:215
+#: bookwyrm/templates/book/edit_book.html:207
 msgid "Pages:"
 msgstr "页数:"
 
-#: bookwyrm/templates/book/edit_book.html:222
+#: bookwyrm/templates/book/edit_book.html:214
 msgid "Book Identifiers"
 msgstr "书目标识�"
 
-#: bookwyrm/templates/book/edit_book.html:223
+#: bookwyrm/templates/book/edit_book.html:215
 msgid "ISBN 13:"
 msgstr "ISBN 13:"
 
-#: bookwyrm/templates/book/edit_book.html:227
+#: bookwyrm/templates/book/edit_book.html:219
 msgid "ISBN 10:"
 msgstr "ISBN 10:"
 
-#: bookwyrm/templates/book/edit_book.html:231
-#: bookwyrm/templates/edit_author.html:59
-msgid "Openlibrary key:"
-msgstr "Openlibrary key:"
-
-#: bookwyrm/templates/book/editions.html:5
+#: bookwyrm/templates/book/editions.html:4
 #, python-format
 msgid "Editions of %(book_title)s"
 msgstr "%(book_title)s 的�版本"
 
-#: bookwyrm/templates/book/editions.html:9
+#: bookwyrm/templates/book/editions.html:8
 #, python-format
 msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
 msgstr "<a href=\"%(work_path)s\">\"%(work_title)s\"</a> 的�版本"
@@ -547,7 +613,7 @@ msgstr "由 %(publisher)s 出版。"
 
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
-#: bookwyrm/templates/feed/feed_layout.html:70
+#: bookwyrm/templates/feed/feed_layout.html:69
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
 #: bookwyrm/templates/search/book.html:32
@@ -604,21 +670,21 @@ msgstr "�推�"
 msgid "Recently active"
 msgstr "最近活跃"
 
-#: bookwyrm/templates/directory/user_card.html:32
+#: bookwyrm/templates/directory/user_card.html:33
 msgid "follower you follow"
 msgid_plural "followers you follow"
 msgstr[0] "你关注的关注者"
 
-#: bookwyrm/templates/directory/user_card.html:39
+#: bookwyrm/templates/directory/user_card.html:40
 msgid "book on your shelves"
 msgid_plural "books on your shelves"
 msgstr[0] "你书架上的书"
 
-#: bookwyrm/templates/directory/user_card.html:47
+#: bookwyrm/templates/directory/user_card.html:48
 msgid "posts"
 msgstr "�文"
 
-#: bookwyrm/templates/directory/user_card.html:53
+#: bookwyrm/templates/directory/user_card.html:54
 msgid "last active"
 msgstr "最�活跃"
 
@@ -704,44 +770,6 @@ msgstr "�交"
 msgid "Your Account"
 msgstr "你的��"
 
-#: bookwyrm/templates/edit_author.html:5
-msgid "Edit Author:"
-msgstr "编辑作者:"
-
-#: bookwyrm/templates/edit_author.html:32 bookwyrm/templates/lists/form.html:8
-#: bookwyrm/templates/user/shelf/create_shelf_form.html:13
-#: bookwyrm/templates/user/shelf/edit_shelf_form.html:14
-msgid "Name:"
-msgstr "�称:"
-
-#: bookwyrm/templates/edit_author.html:37
-msgid "Bio:"
-msgstr "简介:"
-
-#: bookwyrm/templates/edit_author.html:42
-msgid "Wikipedia link:"
-msgstr "维基百科链接:"
-
-#: bookwyrm/templates/edit_author.html:47
-msgid "Birth date:"
-msgstr "出生日期:"
-
-#: bookwyrm/templates/edit_author.html:52
-msgid "Death date:"
-msgstr "死亡日期:"
-
-#: bookwyrm/templates/edit_author.html:58
-msgid "Author Identifiers"
-msgstr "作者标识�:"
-
-#: bookwyrm/templates/edit_author.html:64
-msgid "Librarything key:"
-msgstr "Librarything key:"
-
-#: bookwyrm/templates/edit_author.html:69
-msgid "Goodreads key:"
-msgstr "Goodreads key:"
-
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
@@ -822,76 +850,76 @@ msgstr "所有消�"
 msgid "You have no messages right now."
 msgstr "你现在没有消�。"
 
-#: bookwyrm/templates/feed/feed.html:9
+#: bookwyrm/templates/feed/feed.html:8
 msgid "Home Timeline"
 msgstr "主页时间线"
 
-#: bookwyrm/templates/feed/feed.html:11
+#: bookwyrm/templates/feed/feed.html:10
 msgid "Local Timeline"
 msgstr "本地时间线"
 
-#: bookwyrm/templates/feed/feed.html:13
+#: bookwyrm/templates/feed/feed.html:12
 msgid "Federated Timeline"
 msgstr "跨站时间线"
 
-#: bookwyrm/templates/feed/feed.html:19
+#: bookwyrm/templates/feed/feed.html:18
 msgid "Home"
 msgstr "主页"
 
-#: bookwyrm/templates/feed/feed.html:22
+#: bookwyrm/templates/feed/feed.html:21
 msgid "Local"
 msgstr "本站"
 
-#: bookwyrm/templates/feed/feed.html:25
+#: bookwyrm/templates/feed/feed.html:24
 #: bookwyrm/templates/settings/edit_server.html:40
 msgid "Federated"
 msgstr "跨站"
 
-#: bookwyrm/templates/feed/feed.html:33
+#: bookwyrm/templates/feed/feed.html:32
 #, python-format
 msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
 msgstr "加载 <span data-poll=\"stream/%(tab)s\">0</span> �未读状�"
 
-#: bookwyrm/templates/feed/feed.html:48
+#: bookwyrm/templates/feed/feed.html:47
 msgid "There aren't any activities right now! Try following a user to get started"
 msgstr "现在还没有任何活动��试�从关注一个用户开始�"
 
-#: bookwyrm/templates/feed/feed.html:56
+#: bookwyrm/templates/feed/feed.html:55
 #: bookwyrm/templates/get_started/users.html:6
 msgid "Who to follow"
 msgstr "�以关注的人"
 
-#: bookwyrm/templates/feed/feed_layout.html:5
+#: bookwyrm/templates/feed/feed_layout.html:4
 msgid "Updates"
 msgstr "æ›´æ–°"
 
-#: bookwyrm/templates/feed/feed_layout.html:11
+#: bookwyrm/templates/feed/feed_layout.html:10
 #: bookwyrm/templates/layout.html:59
 #: bookwyrm/templates/user/shelf/books_header.html:3
 msgid "Your books"
 msgstr "你的书目"
 
-#: bookwyrm/templates/feed/feed_layout.html:13
+#: bookwyrm/templates/feed/feed_layout.html:12
 msgid "There are no books here right now! Try searching for a book to get started"
 msgstr "现在这里还没有任何书目��试�从�索�本书开始�"
 
-#: bookwyrm/templates/feed/feed_layout.html:24
-#: bookwyrm/templates/user/shelf/shelf.html:28
+#: bookwyrm/templates/feed/feed_layout.html:23
+#: bookwyrm/templates/user/shelf/shelf.html:29
 msgid "To Read"
 msgstr "想读"
 
-#: bookwyrm/templates/feed/feed_layout.html:25
-#: bookwyrm/templates/user/shelf/shelf.html:28
+#: bookwyrm/templates/feed/feed_layout.html:24
+#: bookwyrm/templates/user/shelf/shelf.html:29
 msgid "Currently Reading"
 msgstr "在读"
 
-#: bookwyrm/templates/feed/feed_layout.html:26
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-#: bookwyrm/templates/user/shelf/shelf.html:28
+#: bookwyrm/templates/feed/feed_layout.html:25
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
+#: bookwyrm/templates/user/shelf/shelf.html:29
 msgid "Read"
 msgstr "读过"
 
-#: bookwyrm/templates/feed/feed_layout.html:88 bookwyrm/templates/goal.html:26
+#: bookwyrm/templates/feed/feed_layout.html:87 bookwyrm/templates/goal.html:26
 #: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
 msgid "%(year)s Reading Goal"
@@ -919,7 +947,7 @@ msgid "What are you reading?"
 msgstr "你在阅读什么？"
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:119
+#: bookwyrm/templates/lists/list.html:120
 msgid "Search for a book"
 msgstr "�索书目"
 
@@ -939,7 +967,7 @@ msgstr "你�以在开始使用 %(site_name)s �添加书目。"
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
 #: bookwyrm/templates/layout.html:38 bookwyrm/templates/layout.html:39
-#: bookwyrm/templates/lists/list.html:123
+#: bookwyrm/templates/lists/list.html:124
 #: bookwyrm/templates/search/layout.html:4
 #: bookwyrm/templates/search/layout.html:9
 msgid "Search"
@@ -955,7 +983,7 @@ msgid "Popular on %(site_name)s"
 msgstr "%(site_name)s 上的热门"
 
 #: bookwyrm/templates/get_started/books.html:58
-#: bookwyrm/templates/lists/list.html:136
+#: bookwyrm/templates/lists/list.html:137
 msgid "No books found"
 msgstr "没有找到书目"
 
@@ -1075,95 +1103,95 @@ msgstr "导入书目"
 msgid "Data source:"
 msgstr "数���:"
 
-#: bookwyrm/templates/import.html:29
+#: bookwyrm/templates/import.html:32
 msgid "Data file:"
 msgstr "数�文件:"
 
-#: bookwyrm/templates/import.html:37
+#: bookwyrm/templates/import.html:40
 msgid "Include reviews"
 msgstr "纳入书评"
 
-#: bookwyrm/templates/import.html:42
+#: bookwyrm/templates/import.html:45
 msgid "Privacy setting for imported reviews:"
 msgstr "导入书评的��设定"
 
-#: bookwyrm/templates/import.html:48
+#: bookwyrm/templates/import.html:51
 #: bookwyrm/templates/settings/server_blocklist.html:64
 msgid "Import"
 msgstr "导入"
 
-#: bookwyrm/templates/import.html:53
+#: bookwyrm/templates/import.html:56
 msgid "Recent Imports"
 msgstr "最近的导入"
 
-#: bookwyrm/templates/import.html:55
+#: bookwyrm/templates/import.html:58
 msgid "No recent imports"
 msgstr "无最近的导入"
 
-#: bookwyrm/templates/import_status.html:6
-#: bookwyrm/templates/import_status.html:10
+#: bookwyrm/templates/import_status.html:5
+#: bookwyrm/templates/import_status.html:9
 msgid "Import Status"
 msgstr "导入状�"
 
-#: bookwyrm/templates/import_status.html:13
+#: bookwyrm/templates/import_status.html:12
 msgid "Import started:"
 msgstr "导入开始:"
 
-#: bookwyrm/templates/import_status.html:17
+#: bookwyrm/templates/import_status.html:16
 msgid "Import completed:"
 msgstr "导入完�:"
 
-#: bookwyrm/templates/import_status.html:20
+#: bookwyrm/templates/import_status.html:19
 msgid "TASK FAILED"
 msgstr "任务失败"
 
-#: bookwyrm/templates/import_status.html:26
+#: bookwyrm/templates/import_status.html:25
 msgid "Import still in progress."
 msgstr "还在导入中。"
 
-#: bookwyrm/templates/import_status.html:28
+#: bookwyrm/templates/import_status.html:27
 msgid "(Hit reload to update!)"
 msgstr "（按下�新加载�更新�）"
 
-#: bookwyrm/templates/import_status.html:35
+#: bookwyrm/templates/import_status.html:34
 msgid "Failed to load"
 msgstr "加载失败"
 
-#: bookwyrm/templates/import_status.html:44
+#: bookwyrm/templates/import_status.html:43
 #, python-format
 msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
 msgstr "跳转至列表底部�选� %(failed_count)s 个导入失败的项目。"
 
-#: bookwyrm/templates/import_status.html:79
+#: bookwyrm/templates/import_status.html:78
 msgid "Select all"
 msgstr "全选"
 
-#: bookwyrm/templates/import_status.html:82
+#: bookwyrm/templates/import_status.html:81
 msgid "Retry items"
 msgstr "�试项目"
 
-#: bookwyrm/templates/import_status.html:108
+#: bookwyrm/templates/import_status.html:107
 msgid "Successfully imported"
 msgstr "�功导入了"
 
-#: bookwyrm/templates/import_status.html:112
+#: bookwyrm/templates/import_status.html:111
 msgid "Book"
 msgstr "书目"
 
-#: bookwyrm/templates/import_status.html:115
-#: bookwyrm/templates/snippets/create_status_form.html:10
-#: bookwyrm/templates/user/shelf/shelf.html:77
-#: bookwyrm/templates/user/shelf/shelf.html:95
+#: bookwyrm/templates/import_status.html:114
+#: bookwyrm/templates/snippets/create_status_form.html:13
+#: bookwyrm/templates/user/shelf/shelf.html:78
+#: bookwyrm/templates/user/shelf/shelf.html:98
 msgid "Title"
 msgstr "标题"
 
-#: bookwyrm/templates/import_status.html:118
-#: bookwyrm/templates/user/shelf/shelf.html:78
-#: bookwyrm/templates/user/shelf/shelf.html:98
+#: bookwyrm/templates/import_status.html:117
+#: bookwyrm/templates/user/shelf/shelf.html:79
+#: bookwyrm/templates/user/shelf/shelf.html:101
 msgid "Author"
 msgstr "作者"
 
-#: bookwyrm/templates/import_status.html:141
+#: bookwyrm/templates/import_status.html:140
 msgid "Imported"
 msgstr "已导入"
 
@@ -1274,7 +1302,8 @@ msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%
 msgstr "在 <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a> 上支� %(site_name)s"
 
 #: bookwyrm/templates/layout.html:217
-msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+#| msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm 是开�软件。你�以在 <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> 贡献或报告问题。"
 
 #: bookwyrm/templates/lists/create_form.html:5
@@ -1317,7 +1346,7 @@ msgid "Discard"
 msgstr "削除"
 
 #: bookwyrm/templates/lists/edit_form.html:5
-#: bookwyrm/templates/lists/list_layout.html:18
+#: bookwyrm/templates/lists/list_layout.html:17
 msgid "Edit List"
 msgstr "编辑列表"
 
@@ -1351,76 +1380,76 @@ msgstr "开放"
 msgid "Anyone can add books to this list"
 msgstr "任何人都�以�此列表中添加书目"
 
-#: bookwyrm/templates/lists/list.html:19
+#: bookwyrm/templates/lists/list.html:20
 msgid "You successfully suggested a book for this list!"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:21
+#: bookwyrm/templates/lists/list.html:22
 #, fuzzy
 #| msgid "Anyone can add books to this list"
 msgid "You successfully added a book to this list!"
 msgstr "任何人都�以�此列表中添加书目"
 
-#: bookwyrm/templates/lists/list.html:27
+#: bookwyrm/templates/lists/list.html:28
 msgid "This list is currently empty"
 msgstr "此列表当�是空的"
 
-#: bookwyrm/templates/lists/list.html:64
+#: bookwyrm/templates/lists/list.html:65
 #, python-format
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "由 <a href=\"%(user_path)s\">%(username)s</a> 添加"
 
-#: bookwyrm/templates/lists/list.html:76
+#: bookwyrm/templates/lists/list.html:77
 #, fuzzy
 #| msgid "Sent"
 msgid "Set"
 msgstr "已��"
 
-#: bookwyrm/templates/lists/list.html:79
+#: bookwyrm/templates/lists/list.html:80
 #, fuzzy
 #| msgid "List curation:"
 msgid "List position"
 msgstr "列表策展:"
 
-#: bookwyrm/templates/lists/list.html:85
+#: bookwyrm/templates/lists/list.html:86
 #: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr "移除"
 
-#: bookwyrm/templates/lists/list.html:98 bookwyrm/templates/lists/list.html:110
+#: bookwyrm/templates/lists/list.html:99 bookwyrm/templates/lists/list.html:111
 #, fuzzy
 #| msgid "Your Lists"
 msgid "Sort List"
 msgstr "你的列表"
 
-#: bookwyrm/templates/lists/list.html:104
+#: bookwyrm/templates/lists/list.html:105
 #, fuzzy
 #| msgid "Directory"
 msgid "Direction"
 msgstr "目录"
 
-#: bookwyrm/templates/lists/list.html:115
+#: bookwyrm/templates/lists/list.html:116
 msgid "Add Books"
 msgstr "添加书目"
 
-#: bookwyrm/templates/lists/list.html:115
+#: bookwyrm/templates/lists/list.html:116
 msgid "Suggest Books"
 msgstr "推�书目"
 
-#: bookwyrm/templates/lists/list.html:124
+#: bookwyrm/templates/lists/list.html:125
 msgid "search"
 msgstr "�索"
 
-#: bookwyrm/templates/lists/list.html:130
+#: bookwyrm/templates/lists/list.html:131
 msgid "Clear search"
 msgstr "清除�索"
 
-#: bookwyrm/templates/lists/list.html:135
+#: bookwyrm/templates/lists/list.html:136
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
 msgstr "没有符� \"%(query)s\" 请求的书目"
 
-#: bookwyrm/templates/lists/list.html:163
+#: bookwyrm/templates/lists/list.html:164
 msgid "Suggest"
 msgstr "推�"
 
@@ -1445,36 +1474,36 @@ msgstr "�系管�员以�得邀请"
 msgid "More about this site"
 msgstr "关于本站点的更多"
 
+#: bookwyrm/templates/moderation/report.html:5
 #: bookwyrm/templates/moderation/report.html:6
-#: bookwyrm/templates/moderation/report.html:7
 #: bookwyrm/templates/moderation/report_preview.html:6
 #, python-format
 msgid "Report #%(report_id)s: %(username)s"
 msgstr "报告 #%(report_id)s: %(username)s"
 
-#: bookwyrm/templates/moderation/report.html:11
+#: bookwyrm/templates/moderation/report.html:10
 msgid "Back to reports"
 msgstr "回到报告"
 
-#: bookwyrm/templates/moderation/report.html:23
+#: bookwyrm/templates/moderation/report.html:22
 msgid "Moderator Comments"
 msgstr "监察员评论"
 
-#: bookwyrm/templates/moderation/report.html:41
+#: bookwyrm/templates/moderation/report.html:40
 #: bookwyrm/templates/snippets/create_status.html:28
-#: bookwyrm/templates/snippets/create_status_form.html:63
+#: bookwyrm/templates/snippets/create_status_form.html:66
 msgid "Comment"
 msgstr "评论"
 
-#: bookwyrm/templates/moderation/report.html:46
+#: bookwyrm/templates/moderation/report.html:45
 msgid "Reported statuses"
 msgstr "被报告的状�"
 
-#: bookwyrm/templates/moderation/report.html:48
+#: bookwyrm/templates/moderation/report.html:47
 msgid "No statuses reported"
 msgstr "没有被报告的状�"
 
-#: bookwyrm/templates/moderation/report.html:54
+#: bookwyrm/templates/moderation/report.html:53
 #, fuzzy
 #| msgid "Statuses has been deleted"
 msgid "Status has been deleted"
@@ -1754,7 +1783,7 @@ msgstr "�索"
 
 #: bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
-#: bookwyrm/templates/user/layout.html:73
+#: bookwyrm/templates/user/layout.html:74
 msgid "Books"
 msgstr "书目"
 
@@ -1829,7 +1858,7 @@ msgid "Add server"
 msgstr "添加��"
 
 #: bookwyrm/templates/settings/edit_server.html:7
-#: bookwyrm/templates/settings/federated_server.html:12
+#: bookwyrm/templates/settings/federated_server.html:13
 #: bookwyrm/templates/settings/server_blocklist.html:7
 msgid "Back to server list"
 msgstr "回到�务器列表"
@@ -1848,26 +1877,26 @@ msgid "Instance:"
 msgstr "实例�称"
 
 #: bookwyrm/templates/settings/edit_server.html:37
-#: bookwyrm/templates/settings/federated_server.html:29
+#: bookwyrm/templates/settings/federated_server.html:30
 #: bookwyrm/templates/user_admin/user_info.html:34
 msgid "Status:"
 msgstr "状�:"
 
 #: bookwyrm/templates/settings/edit_server.html:41
-#: bookwyrm/templates/settings/federated_server.html:9
+#: bookwyrm/templates/settings/federated_server.html:10
 #, fuzzy
 #| msgid "Block"
 msgid "Blocked"
 msgstr "�蔽"
 
 #: bookwyrm/templates/settings/edit_server.html:48
-#: bookwyrm/templates/settings/federated_server.html:21
+#: bookwyrm/templates/settings/federated_server.html:22
 #: bookwyrm/templates/user_admin/user_info.html:26
 msgid "Software:"
 msgstr "软件:"
 
 #: bookwyrm/templates/settings/edit_server.html:55
-#: bookwyrm/templates/settings/federated_server.html:25
+#: bookwyrm/templates/settings/federated_server.html:26
 #: bookwyrm/templates/user_admin/user_info.html:30
 msgid "Version:"
 msgstr "版本:"
@@ -1876,71 +1905,71 @@ msgstr "版本:"
 msgid "Notes:"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:18
+#: bookwyrm/templates/settings/federated_server.html:19
 msgid "Details"
 msgstr "详细"
 
-#: bookwyrm/templates/settings/federated_server.html:36
-#: bookwyrm/templates/user/layout.html:55
+#: bookwyrm/templates/settings/federated_server.html:37
+#: bookwyrm/templates/user/layout.html:56
 msgid "Activity"
 msgstr "活动"
 
-#: bookwyrm/templates/settings/federated_server.html:39
+#: bookwyrm/templates/settings/federated_server.html:40
 msgid "Users:"
 msgstr "用户:"
 
-#: bookwyrm/templates/settings/federated_server.html:42
-#: bookwyrm/templates/settings/federated_server.html:49
+#: bookwyrm/templates/settings/federated_server.html:43
+#: bookwyrm/templates/settings/federated_server.html:50
 msgid "View all"
 msgstr "查看全部"
 
-#: bookwyrm/templates/settings/federated_server.html:46
+#: bookwyrm/templates/settings/federated_server.html:47
 msgid "Reports:"
 msgstr "报告:"
 
-#: bookwyrm/templates/settings/federated_server.html:53
+#: bookwyrm/templates/settings/federated_server.html:54
 msgid "Followed by us:"
 msgstr "我们关注了的:"
 
-#: bookwyrm/templates/settings/federated_server.html:59
+#: bookwyrm/templates/settings/federated_server.html:60
 msgid "Followed by them:"
 msgstr "TA 们关注了的:"
 
-#: bookwyrm/templates/settings/federated_server.html:65
+#: bookwyrm/templates/settings/federated_server.html:66
 msgid "Blocked by us:"
 msgstr "我们所�蔽的:"
 
-#: bookwyrm/templates/settings/federated_server.html:77
+#: bookwyrm/templates/settings/federated_server.html:78
 #: bookwyrm/templates/user_admin/user_info.html:39
 msgid "Notes"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:80
+#: bookwyrm/templates/settings/federated_server.html:81
 #, fuzzy
 #| msgid "Edit Book"
 msgid "Edit"
 msgstr "编辑书目"
 
-#: bookwyrm/templates/settings/federated_server.html:100
+#: bookwyrm/templates/settings/federated_server.html:101
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:3
 msgid "Actions"
 msgstr "动作"
 
-#: bookwyrm/templates/settings/federated_server.html:104
+#: bookwyrm/templates/settings/federated_server.html:105
 #: bookwyrm/templates/snippets/block_button.html:5
 msgid "Block"
 msgstr "�蔽"
 
-#: bookwyrm/templates/settings/federated_server.html:105
+#: bookwyrm/templates/settings/federated_server.html:106
 msgid "All users from this instance will be deactivated."
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:110
+#: bookwyrm/templates/settings/federated_server.html:111
 #: bookwyrm/templates/snippets/block_button.html:10
 msgid "Un-block"
 msgstr "�消�蔽"
 
-#: bookwyrm/templates/settings/federated_server.html:111
+#: bookwyrm/templates/settings/federated_server.html:112
 msgid "All users from this instance will be re-activated."
 msgstr ""
 
@@ -2155,7 +2184,7 @@ msgstr "�许请求邀请:"
 msgid "Registration closed text:"
 msgstr "注册关闭文字:"
 
-#: bookwyrm/templates/snippets/book_cover.html:32
+#: bookwyrm/templates/snippets/book_cover.html:31
 msgid "No cover"
 msgstr "没有��"
 
@@ -2164,15 +2193,15 @@ msgstr "没有��"
 msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgstr "<a href=\"%(path)s\">%(title)s</a> �自"
 
-#: bookwyrm/templates/snippets/boost_button.html:8
 #: bookwyrm/templates/snippets/boost_button.html:9
+#: bookwyrm/templates/snippets/boost_button.html:10
 #, fuzzy
 #| msgid "boosted"
 msgid "Boost"
 msgstr "转�了"
 
-#: bookwyrm/templates/snippets/boost_button.html:15
 #: bookwyrm/templates/snippets/boost_button.html:16
+#: bookwyrm/templates/snippets/boost_button.html:17
 #, fuzzy
 #| msgid "Un-boost status"
 msgid "Un-boost"
@@ -2194,66 +2223,66 @@ msgstr "书评"
 msgid "Quote"
 msgstr "引用"
 
-#: bookwyrm/templates/snippets/create_status_form.html:20
+#: bookwyrm/templates/snippets/create_status_form.html:23
 msgid "Comment:"
 msgstr "评论:"
 
-#: bookwyrm/templates/snippets/create_status_form.html:22
+#: bookwyrm/templates/snippets/create_status_form.html:25
 msgid "Quote:"
 msgstr "引用:"
 
-#: bookwyrm/templates/snippets/create_status_form.html:24
+#: bookwyrm/templates/snippets/create_status_form.html:27
 msgid "Review:"
 msgstr "书评:"
 
-#: bookwyrm/templates/snippets/create_status_form.html:53
-#: bookwyrm/templates/snippets/status/layout.html:30
+#: bookwyrm/templates/snippets/create_status_form.html:56
+#: bookwyrm/templates/snippets/status/layout.html:29
+#: bookwyrm/templates/snippets/status/layout.html:47
 #: bookwyrm/templates/snippets/status/layout.html:48
-#: bookwyrm/templates/snippets/status/layout.html:49
 msgid "Reply"
 msgstr "回�"
 
-#: bookwyrm/templates/snippets/create_status_form.html:53
+#: bookwyrm/templates/snippets/create_status_form.html:56
 #, fuzzy
 #| msgid "Footer Content"
 msgid "Content"
 msgstr "页脚内容"
 
-#: bookwyrm/templates/snippets/create_status_form.html:77
+#: bookwyrm/templates/snippets/create_status_form.html:80
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
 msgid "Progress:"
 msgstr "进度:"
 
-#: bookwyrm/templates/snippets/create_status_form.html:85
-#: bookwyrm/templates/snippets/readthrough_form.html:26
+#: bookwyrm/templates/snippets/create_status_form.html:88
+#: bookwyrm/templates/snippets/readthrough_form.html:22
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
 msgstr "页数"
 
-#: bookwyrm/templates/snippets/create_status_form.html:86
-#: bookwyrm/templates/snippets/readthrough_form.html:27
+#: bookwyrm/templates/snippets/create_status_form.html:89
+#: bookwyrm/templates/snippets/readthrough_form.html:23
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
 msgstr "百分比"
 
-#: bookwyrm/templates/snippets/create_status_form.html:92
+#: bookwyrm/templates/snippets/create_status_form.html:95
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
 msgstr "全书 %(pages)s 页"
 
-#: bookwyrm/templates/snippets/create_status_form.html:107
+#: bookwyrm/templates/snippets/create_status_form.html:110
 msgid "Include spoiler alert"
 msgstr "加入剧�警告"
 
-#: bookwyrm/templates/snippets/create_status_form.html:114
+#: bookwyrm/templates/snippets/create_status_form.html:117
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:19
 msgid "Private"
 msgstr "�密"
 
-#: bookwyrm/templates/snippets/create_status_form.html:125
+#: bookwyrm/templates/snippets/create_status_form.html:128
 msgid "Post"
 msgstr "�布"
 
@@ -2267,17 +2296,17 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u
 msgstr "你正�删除这篇阅读�过以�与之相关的 %(count)s 次进度更新。"
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
-#: bookwyrm/templates/snippets/follow_request_buttons.html:13
+#: bookwyrm/templates/snippets/follow_request_buttons.html:12
 msgid "Delete"
 msgstr "删除"
 
-#: bookwyrm/templates/snippets/fav_button.html:7
 #: bookwyrm/templates/snippets/fav_button.html:9
+#: bookwyrm/templates/snippets/fav_button.html:11
 msgid "Like"
 msgstr ""
 
-#: bookwyrm/templates/snippets/fav_button.html:15
-#: bookwyrm/templates/snippets/fav_button.html:16
+#: bookwyrm/templates/snippets/fav_button.html:17
+#: bookwyrm/templates/snippets/fav_button.html:18
 #, fuzzy
 #| msgid "Un-like status"
 msgid "Un-like"
@@ -2311,11 +2340,11 @@ msgstr "撤回关注请求"
 msgid "Unfollow"
 msgstr "�消关注"
 
-#: bookwyrm/templates/snippets/follow_request_buttons.html:8
+#: bookwyrm/templates/snippets/follow_request_buttons.html:7
 msgid "Accept"
 msgstr "接�"
 
-#: bookwyrm/templates/snippets/form_rate_stars.html:20
+#: bookwyrm/templates/snippets/form_rate_stars.html:19
 #: bookwyrm/templates/snippets/stars.html:13
 msgid "No rating"
 msgstr "没有评价"
@@ -2361,8 +2390,8 @@ msgid "Goal privacy:"
 msgstr "目标��:"
 
 #: bookwyrm/templates/snippets/goal_form.html:26
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:45
-#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:33
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37
+#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:29
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20
 msgid "Post to feed"
 msgstr "�布到消��中"
@@ -2473,12 +2502,12 @@ msgstr "删除这些阅读日期"
 msgid "Started reading"
 msgstr "已开始阅读"
 
-#: bookwyrm/templates/snippets/readthrough_form.html:18
+#: bookwyrm/templates/snippets/readthrough_form.html:14
 msgid "Progress"
 msgstr "进度"
 
-#: bookwyrm/templates/snippets/readthrough_form.html:34
-#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:29
+#: bookwyrm/templates/snippets/readthrough_form.html:30
+#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25
 msgid "Finished reading"
 msgstr "已完�阅读"
 
@@ -2486,27 +2515,27 @@ msgstr "已完�阅读"
 msgid "Sign Up"
 msgstr "注册"
 
-#: bookwyrm/templates/snippets/report_button.html:5
+#: bookwyrm/templates/snippets/report_button.html:6
 msgid "Report"
 msgstr "报告"
 
 #: bookwyrm/templates/snippets/rss_title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:34
+#: bookwyrm/templates/snippets/status/status_header.html:35
 msgid "rated"
 msgstr "评价了"
 
 #: bookwyrm/templates/snippets/rss_title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:36
+#: bookwyrm/templates/snippets/status/status_header.html:37
 msgid "reviewed"
 msgstr "写了书评给"
 
 #: bookwyrm/templates/snippets/rss_title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:38
+#: bookwyrm/templates/snippets/status/status_header.html:39
 msgid "commented on"
 msgstr "评论了"
 
 #: bookwyrm/templates/snippets/rss_title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:40
+#: bookwyrm/templates/snippets/status/status_header.html:41
 msgid "quoted"
 msgstr "引用了"
 
@@ -2524,7 +2553,7 @@ msgid "Finish \"<em>%(book_title)s</em>\""
 msgstr "完� \"<em>%(book_title)s</em>\""
 
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:34
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:36
 msgid "Update progress"
 msgstr "更新进度"
 
@@ -2532,20 +2561,20 @@ msgstr "更新进度"
 msgid "More shelves"
 msgstr "更多书架"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:8
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:10
 msgid "Start reading"
 msgstr "开始阅读"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:15
 msgid "Finish reading"
 msgstr "完�阅读"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:16
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:18
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26
 msgid "Want to read"
 msgstr "想�阅读"
 
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:47
 #, python-format
 msgid "Remove from %(name)s"
 msgstr "从 %(name)s 移除"
@@ -2560,40 +2589,40 @@ msgstr "开始 \"<em>%(book_title)s</em>\""
 msgid "Want to Read \"<em>%(book_title)s</em>\""
 msgstr "想�阅读 \"<em>%(book_title)s</em>\""
 
-#: bookwyrm/templates/snippets/status/content_status.html:70
-#: bookwyrm/templates/snippets/trimmed_text.html:14
+#: bookwyrm/templates/snippets/status/content_status.html:71
+#: bookwyrm/templates/snippets/trimmed_text.html:15
 msgid "Show more"
 msgstr "显示更多"
 
-#: bookwyrm/templates/snippets/status/content_status.html:85
-#: bookwyrm/templates/snippets/trimmed_text.html:29
+#: bookwyrm/templates/snippets/status/content_status.html:86
+#: bookwyrm/templates/snippets/trimmed_text.html:30
 msgid "Show less"
 msgstr "显示更少"
 
-#: bookwyrm/templates/snippets/status/content_status.html:115
+#: bookwyrm/templates/snippets/status/content_status.html:116
 msgid "Open image in new window"
 msgstr "在新窗�中打开图�"
 
-#: bookwyrm/templates/snippets/status/layout.html:22
+#: bookwyrm/templates/snippets/status/layout.html:21
 #: bookwyrm/templates/snippets/status/status_options.html:17
 msgid "Delete status"
 msgstr "删除�文"
 
+#: bookwyrm/templates/snippets/status/layout.html:51
 #: bookwyrm/templates/snippets/status/layout.html:52
-#: bookwyrm/templates/snippets/status/layout.html:53
 msgid "Boost status"
 msgstr "转�状�"
 
+#: bookwyrm/templates/snippets/status/layout.html:55
 #: bookwyrm/templates/snippets/status/layout.html:56
-#: bookwyrm/templates/snippets/status/layout.html:57
 msgid "Like status"
 msgstr "喜欢状�"
 
-#: bookwyrm/templates/snippets/status/status.html:9
+#: bookwyrm/templates/snippets/status/status.html:10
 msgid "boosted"
 msgstr "转�了"
 
-#: bookwyrm/templates/snippets/status/status_header.html:44
+#: bookwyrm/templates/snippets/status/status_header.html:45
 #, python-format
 msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
 msgstr "回�了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">状�</a>"
@@ -2627,15 +2656,15 @@ msgstr "��排�"
 msgid "Sorted descending"
 msgstr "��排�"
 
-#: bookwyrm/templates/user/layout.html:12 bookwyrm/templates/user/user.html:10
+#: bookwyrm/templates/user/layout.html:13 bookwyrm/templates/user/user.html:10
 msgid "User Profile"
 msgstr "用户个人资料"
 
-#: bookwyrm/templates/user/layout.html:36
+#: bookwyrm/templates/user/layout.html:37
 msgid "Follow Requests"
 msgstr "关注请求"
 
-#: bookwyrm/templates/user/layout.html:61
+#: bookwyrm/templates/user/layout.html:62
 msgid "Reading Goal"
 msgstr "阅读目标"
 
@@ -2681,38 +2710,38 @@ msgstr "编辑书架"
 msgid "Update shelf"
 msgstr "更新书架"
 
-#: bookwyrm/templates/user/shelf/shelf.html:24 bookwyrm/views/shelf.py:48
+#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:51
 msgid "All books"
 msgstr "所有书目"
 
-#: bookwyrm/templates/user/shelf/shelf.html:37
+#: bookwyrm/templates/user/shelf/shelf.html:38
 msgid "Create shelf"
 msgstr "创建书架"
 
-#: bookwyrm/templates/user/shelf/shelf.html:60
+#: bookwyrm/templates/user/shelf/shelf.html:61
 msgid "Edit shelf"
 msgstr "编辑书架"
 
-#: bookwyrm/templates/user/shelf/shelf.html:79
-#: bookwyrm/templates/user/shelf/shelf.html:101
+#: bookwyrm/templates/user/shelf/shelf.html:80
+#: bookwyrm/templates/user/shelf/shelf.html:104
 msgid "Shelved"
 msgstr "上架时间"
 
-#: bookwyrm/templates/user/shelf/shelf.html:80
-#: bookwyrm/templates/user/shelf/shelf.html:105
+#: bookwyrm/templates/user/shelf/shelf.html:81
+#: bookwyrm/templates/user/shelf/shelf.html:108
 msgid "Started"
 msgstr "开始时间"
 
-#: bookwyrm/templates/user/shelf/shelf.html:81
-#: bookwyrm/templates/user/shelf/shelf.html:108
+#: bookwyrm/templates/user/shelf/shelf.html:82
+#: bookwyrm/templates/user/shelf/shelf.html:111
 msgid "Finished"
 msgstr "完�时间"
 
-#: bookwyrm/templates/user/shelf/shelf.html:134
+#: bookwyrm/templates/user/shelf/shelf.html:137
 msgid "This shelf is empty."
 msgstr "此书架是空的。"
 
-#: bookwyrm/templates/user/shelf/shelf.html:140
+#: bookwyrm/templates/user/shelf/shelf.html:143
 msgid "Delete shelf"
 msgstr "删除书架"
 
@@ -2741,23 +2770,23 @@ msgstr "RSS �"
 msgid "No activities yet!"
 msgstr "还没有活动�"
 
-#: bookwyrm/templates/user/user_preview.html:14
+#: bookwyrm/templates/user/user_preview.html:15
 #, python-format
 msgid "Joined %(date)s"
 msgstr "在 %(date)s 加入"
 
-#: bookwyrm/templates/user/user_preview.html:18
+#: bookwyrm/templates/user/user_preview.html:19
 #, python-format
 msgid "%(counter)s follower"
 msgid_plural "%(counter)s followers"
 msgstr[0] "%(counter)s 个关注者"
 
-#: bookwyrm/templates/user/user_preview.html:19
+#: bookwyrm/templates/user/user_preview.html:20
 #, python-format
 msgid "%(counter)s following"
 msgstr "关注� %(counter)s 人"
 
-#: bookwyrm/templates/user/user_preview.html:25
+#: bookwyrm/templates/user/user_preview.html:26
 #, fuzzy, python-format
 #| msgid "%(mutuals)s follower you follow"
 #| msgid_plural "%(mutuals)s followers you follow"
@@ -2765,7 +2794,7 @@ msgid "%(mutuals_display)s follower you follow"
 msgid_plural "%(mutuals_display)s followers you follow"
 msgstr[0] "%(mutuals)s 个你也关注的关注者"
 
-#: bookwyrm/templates/user_admin/user.html:11
+#: bookwyrm/templates/user_admin/user.html:9
 #, fuzzy
 #| msgid "Back to reports"
 msgid "Back to users"
@@ -2838,15 +2867,20 @@ msgstr ""
 msgid "Access level:"
 msgstr ""
 
-#: bookwyrm/views/password.py:32
+#: bookwyrm/views/password.py:30 bookwyrm/views/password.py:35
 msgid "No user with that email address was found."
 msgstr "没有找到使用该邮箱的用户。"
 
-#: bookwyrm/views/password.py:41
+#: bookwyrm/views/password.py:44
 #, python-format
 msgid "A password reset link sent to %s"
 msgstr "密��置连接已��给 %s"
 
+#, fuzzy
+#~| msgid "BookWyrm users"
+#~ msgid "BookWyrm\\"
+#~ msgstr "BookWyrm 用户"
+
 #, fuzzy
 #~| msgid "Show more"
 #~ msgid "Show"

From 3c7882b055e71448add7eadcdb4b4727d7f7956d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 14 May 2021 16:13:32 -0700
Subject: [PATCH 1141/1285] Fixes abstract minimal connector test

---
 bookwyrm/tests/connectors/test_abstract_minimal_connector.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bookwyrm/tests/connectors/test_abstract_minimal_connector.py b/bookwyrm/tests/connectors/test_abstract_minimal_connector.py
index bc5625c9..84629139 100644
--- a/bookwyrm/tests/connectors/test_abstract_minimal_connector.py
+++ b/bookwyrm/tests/connectors/test_abstract_minimal_connector.py
@@ -53,7 +53,6 @@ class AbstractConnector(TestCase):
         self.assertEqual(connector.isbn_search_url, "https://example.com/isbn?q=")
         self.assertIsNone(connector.name)
         self.assertEqual(connector.identifier, "example.com")
-        self.assertIsNone(connector.max_query_count)
         self.assertFalse(connector.local)
 
     @responses.activate

From 7dccce6b1fb3186d785e4ce15b489b92a13266e6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 18 May 2021 09:59:40 -0700
Subject: [PATCH 1142/1285] Adds keyboard focus to add readthrough form

---
 bookwyrm/templates/book/book.html                 | 8 ++++----
 bookwyrm/templates/snippets/readthrough_form.html | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index 8f167528..0aa64836 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -163,12 +163,9 @@
                     </div>
                     <div class="column is-narrow">
                         {% trans "Add read dates" as button_text %}
-                        {% include 'snippets/toggle/open_button.html' with text=button_text icon="plus" class="is-small" controls_text="add-readthrough" %}
+                        {% include 'snippets/toggle/open_button.html' with text=button_text icon="plus" class="is-small" controls_text="add-readthrough" focus="add-readthrough-focus" %}
                     </div>
                 </header>
-                {% if not readthroughs.exists %}
-                <p>{% trans "You don't have any reading activity for this book." %}</p>
-                {% endif %}
                 <section class="is-hidden box" id="add-readthrough">
                     <form name="add-readthrough" action="/create-readthrough" method="post">
                         {% include 'snippets/readthrough_form.html' with readthrough=None %}
@@ -183,6 +180,9 @@
                         </div>
                     </form>
                 </section>
+                {% if not readthroughs.exists %}
+                <p>{% trans "You don't have any reading activity for this book." %}</p>
+                {% endif %}
                 {% for readthrough in readthroughs %}
                 {% include 'snippets/readthrough.html' with readthrough=readthrough %}
                 {% endfor %}
diff --git a/bookwyrm/templates/snippets/readthrough_form.html b/bookwyrm/templates/snippets/readthrough_form.html
index c5be295e..891e9071 100644
--- a/bookwyrm/templates/snippets/readthrough_form.html
+++ b/bookwyrm/templates/snippets/readthrough_form.html
@@ -3,7 +3,7 @@
 <input type="hidden" name="id" value="{{ readthrough.id }}">
 <input type="hidden" name="book" value="{{ book.id }}">
 <div class="field">
-    <label class="label">
+    <label class="label" tabindex="0" id="add-readthrough-focus">
         {% trans "Started reading" %}
         <input type="date" name="start_date" class="input" id="id_start_date-{{ readthrough.id }}" value="{{ readthrough.start_date | date:"Y-m-d" }}">
     </label>

From 5cd5a6107fa8df5c52823180db5fac3aadadfc2b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 18 May 2021 10:45:51 -0700
Subject: [PATCH 1143/1285] Show text with buttons in most places

---
 bookwyrm/templates/author/author.html         |   5 +-
 bookwyrm/templates/book/book.html             |   7 +-
 bookwyrm/templates/goal.html                  |   2 +-
 bookwyrm/templates/lists/list_layout.html     |   2 +-
 bookwyrm/templates/lists/lists.html           |   2 +-
 .../templates/settings/federated_server.html  | 108 +++++++++---------
 bookwyrm/templates/settings/federation.html   |   5 +-
 .../snippets/create_status_form.html          |   2 +-
 .../snippets/filters_panel/filters_panel.html |   4 +-
 bookwyrm/templates/user/lists.html            |   2 +-
 bookwyrm/templates/user/shelf/shelf.html      |   4 +-
 bookwyrm/templates/user/user.html             |  10 +-
 12 files changed, 77 insertions(+), 76 deletions(-)

diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html
index 56e9ce54..67f8792c 100644
--- a/bookwyrm/templates/author/author.html
+++ b/bookwyrm/templates/author/author.html
@@ -14,9 +14,8 @@
         {% if request.user.is_authenticated and perms.bookwyrm.edit_book %}
         <div class="column is-narrow">
             <a href="{{ author.local_path }}/edit">
-                <span class="icon icon-pencil" title="{% trans 'Edit Author' %}">
-                    <span class="is-sr-only">{% trans "Edit Author" %}</span>
-                </span>
+                <span class="icon icon-pencil" title="{% trans 'Edit Author' %}" aria-hidden="True"></span>
+                <span>{% trans "Edit Author" %}</span>
             </a>
         </div>
         {% endif %}
diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index 0aa64836..a82c00f6 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -38,9 +38,8 @@
         {% if user_authenticated and can_edit_book %}
         <div class="column is-narrow">
             <a href="{{ book.id }}/edit">
-                <span class="icon icon-pencil" title="{% trans "Edit Book" %}">
-                    <span class="is-sr-only">{% trans "Edit Book" %}</span>
-                </span>
+                <span class="icon icon-pencil" title="{% trans "Edit Book" %}" aria-hidden=True></span>
+                <span>{% trans "Edit Book" %}</span>
             </a>
         </div>
         {% endif %}
@@ -163,7 +162,7 @@
                     </div>
                     <div class="column is-narrow">
                         {% trans "Add read dates" as button_text %}
-                        {% include 'snippets/toggle/open_button.html' with text=button_text icon="plus" class="is-small" controls_text="add-readthrough" focus="add-readthrough-focus" %}
+                        {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="plus" class="is-small" controls_text="add-readthrough" focus="add-readthrough-focus" %}
                     </div>
                 </header>
                 <section class="is-hidden box" id="add-readthrough">
diff --git a/bookwyrm/templates/goal.html b/bookwyrm/templates/goal.html
index 22aba08e..134f419f 100644
--- a/bookwyrm/templates/goal.html
+++ b/bookwyrm/templates/goal.html
@@ -9,7 +9,7 @@
     {% if is_self and goal %}
     <div class="column is-narrow">
         {% trans "Edit Goal" as button_text %}
-        {% include 'snippets/toggle/open_button.html' with text=button_text icon="pencil" controls_text="show-edit-goal" focus="edit-form-header" %}
+        {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="pencil" controls_text="show-edit-goal" focus="edit-form-header" %}
     </div>
     {% endif %}
 </div>
diff --git a/bookwyrm/templates/lists/list_layout.html b/bookwyrm/templates/lists/list_layout.html
index de7665e8..993587ca 100644
--- a/bookwyrm/templates/lists/list_layout.html
+++ b/bookwyrm/templates/lists/list_layout.html
@@ -15,7 +15,7 @@
     {% if request.user == list.user %}
     <div class="column is-narrow">
         {% trans "Edit List" as button_text %}
-        {% include 'snippets/toggle/open_button.html' with text=button_text icon="pencil" controls_text="edit-list" focus="edit-list-header" %}
+        {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="pencil" controls_text="edit-list" focus="edit-list-header" %}
     </div>
     {% endif %}
 </header>
diff --git a/bookwyrm/templates/lists/lists.html b/bookwyrm/templates/lists/lists.html
index d4b0a7c2..e39d5fde 100644
--- a/bookwyrm/templates/lists/lists.html
+++ b/bookwyrm/templates/lists/lists.html
@@ -18,7 +18,7 @@
     {% if request.user.is_authenticated %}
     <div class="column is-narrow">
         {% trans "Create List" as button_text %}
-        {% include 'snippets/toggle/open_button.html' with controls_text="create-list" icon="plus" text=button_text focus="create-list-header" %}
+        {% include 'snippets/toggle/open_button.html' with controls_text="create-list" icon_with_text="plus" text=button_text focus="create-list-header" %}
     </div>
     {% endif %}
 </header>
diff --git a/bookwyrm/templates/settings/federated_server.html b/bookwyrm/templates/settings/federated_server.html
index b300a92d..9e00f92b 100644
--- a/bookwyrm/templates/settings/federated_server.html
+++ b/bookwyrm/templates/settings/federated_server.html
@@ -15,60 +15,64 @@
 
 {% block panel %}
 <div class="columns">
-    <section class="column is-half content">
+    <section class="column is-half is-flex is-flex-direction-column">
         <h2 class="title is-4">{% trans "Details" %}</h2>
-        <dl>
-            <div class="is-flex">
-                <dt>{% trans "Software:" %}</dt>
-                <dd>{{ server.application_type }}</dd>
-            </div>
-            <div class="is-flex">
-                <dt>{% trans "Version:" %}</dt>
-                <dd>{{ server.application_version }}</dd>
-            </div>
-            <div class="is-flex">
-                <dt>{% trans "Status:" %}</dt>
-                <dd>{{ server.status }}</dd>
-            </div>
-        </dl>
+        <div class="box is-flex-grow-1 content">
+            <dl>
+                <div class="is-flex">
+                    <dt>{% trans "Software:" %}</dt>
+                    <dd>{{ server.application_type }}</dd>
+                </div>
+                <div class="is-flex">
+                    <dt>{% trans "Version:" %}</dt>
+                    <dd>{{ server.application_version }}</dd>
+                </div>
+                <div class="is-flex">
+                    <dt>{% trans "Status:" %}</dt>
+                    <dd>{{ server.status }}</dd>
+                </div>
+            </dl>
+        </div>
     </section>
 
-    <section class="column is-half content">
+    <section class="column is-half is-flex is-flex-direction-column">
         <h2 class="title is-4">{% trans "Activity" %}</h2>
-        <dl>
-            <div class="is-flex">
-                <dt>{% trans "Users:" %}</dt>
-                <dd>
-                    {{ users.count }}
-                    {% if server.user_set.count %}(<a href="{% url 'settings-users' %}?server={{ server.server_name }}">{% trans "View all" %}</a>){% endif %}
-                </dd>
-            </div>
-            <div class="is-flex">
-                <dt>{% trans "Reports:" %}</dt>
-                <dd>
-                    {{ reports.count }}
-                    {% if reports.count %}(<a href="{% url 'settings-reports' %}?server={{ server.server_name }}">{% trans "View all" %}</a>){% endif %}
-                </dd>
-            </div>
-            <div class="is-flex">
-                <dt>{% trans "Followed by us:" %}</dt>
-                <dd>
-                    {{ followed_by_us.count }}
-                </dd>
-            </div>
-            <div class="is-flex">
-                <dt>{% trans "Followed by them:" %}</dt>
-                <dd>
-                    {{ followed_by_them.count }}
-                </dd>
-            </div>
-            <div class="is-flex">
-                <dt>{% trans "Blocked by us:" %}</dt>
-                <dd>
-                    {{ blocked_by_us.count }}
-                </dd>
-            </div>
-        </dl>
+        <div class="box is-flex-grow-1 content">
+            <dl>
+                <div class="is-flex">
+                    <dt>{% trans "Users:" %}</dt>
+                    <dd>
+                        {{ users.count }}
+                        {% if server.user_set.count %}(<a href="{% url 'settings-users' %}?server={{ server.server_name }}">{% trans "View all" %}</a>){% endif %}
+                    </dd>
+                </div>
+                <div class="is-flex">
+                    <dt>{% trans "Reports:" %}</dt>
+                    <dd>
+                        {{ reports.count }}
+                        {% if reports.count %}(<a href="{% url 'settings-reports' %}?server={{ server.server_name }}">{% trans "View all" %}</a>){% endif %}
+                    </dd>
+                </div>
+                <div class="is-flex">
+                    <dt>{% trans "Followed by us:" %}</dt>
+                    <dd>
+                        {{ followed_by_us.count }}
+                    </dd>
+                </div>
+                <div class="is-flex">
+                    <dt>{% trans "Followed by them:" %}</dt>
+                    <dd>
+                        {{ followed_by_them.count }}
+                    </dd>
+                </div>
+                <div class="is-flex">
+                    <dt>{% trans "Blocked by us:" %}</dt>
+                    <dd>
+                        {{ blocked_by_us.count }}
+                    </dd>
+                </div>
+            </dl>
+        </div>
     </section>
 </div>
 
@@ -79,11 +83,11 @@
         </div>
         <div class="column is-narrow">
             {% trans "Edit" as button_text %}
-            {% include 'snippets/toggle/open_button.html' with text=button_text icon="pencil" controls_text="edit-notes" %}
+            {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="pencil" controls_text="edit-notes" %}
         </div>
     </header>
     {% if server.notes %}
-    <p id="hide-edit-notes">{{ server.notes|to_markdown|safe }}</p>
+    <div class="box" id="hide-edit-notes">{{ server.notes|to_markdown|safe }}</div>
     {% endif %}
     <form class="box is-hidden" method="POST" action="{% url 'settings-federated-server' server.id %}" id="edit-notes">
         {% csrf_token %}
diff --git a/bookwyrm/templates/settings/federation.html b/bookwyrm/templates/settings/federation.html
index 9eb0f8b1..bf198672 100644
--- a/bookwyrm/templates/settings/federation.html
+++ b/bookwyrm/templates/settings/federation.html
@@ -6,9 +6,8 @@
 
 {% block edit-button %}
 <a href="{% url 'settings-import-blocklist' %}">
-    <span class="icon icon-plus" title="{% trans 'Add server' %}">
-        <span class="is-sr-only">{% trans "Add server" %}</span>
-    </span>
+    <span class="icon icon-plus" title="{% trans 'Add server' %}" aria-hidden="True"></span>
+    <span>{% trans "Add server" %}</span>
 </a>
 {% endblock %}
 
diff --git a/bookwyrm/templates/snippets/create_status_form.html b/bookwyrm/templates/snippets/create_status_form.html
index 5fd91898..c4e5045e 100644
--- a/bookwyrm/templates/snippets/create_status_form.html
+++ b/bookwyrm/templates/snippets/create_status_form.html
@@ -103,7 +103,7 @@
 
     {# bottom bar #}
     <input type="checkbox" class="is-hidden" name="sensitive" id="id_show_spoilers-{{ uuid }}" {% if draft.content_warning or status.content_warning %}checked{% endif %} aria-hidden="true">
-    
+
     <div class="columns mt-1">
         <div class="field has-addons column">
             <div class="control">
diff --git a/bookwyrm/templates/snippets/filters_panel/filters_panel.html b/bookwyrm/templates/snippets/filters_panel/filters_panel.html
index d9cf2852..bc600ba2 100644
--- a/bookwyrm/templates/snippets/filters_panel/filters_panel.html
+++ b/bookwyrm/templates/snippets/filters_panel/filters_panel.html
@@ -5,9 +5,9 @@
 
         <span class="column is-narrow pb-0">
             {% trans "Show filters" as text %}
-            {% include 'snippets/toggle/open_button.html' with text=text controls_text="filters" icon="arrow-down" class="is-small" focus="filters" %}
+            {% include 'snippets/toggle/open_button.html' with text=text controls_text="filters" icon_with_text="arrow-down" class="is-small" focus="filters" %}
             {% trans "Hide filters" as text %}
-            {% include 'snippets/toggle/close_button.html' with text=text controls_text="filters" icon="x" class="is-small" %}
+            {% include 'snippets/toggle/close_button.html' with text=text controls_text="filters" icon_with_text="arrow-up" class="is-small" %}
         </span>
     </h2>
 
diff --git a/bookwyrm/templates/user/lists.html b/bookwyrm/templates/user/lists.html
index 398c6455..b2dcb8bb 100644
--- a/bookwyrm/templates/user/lists.html
+++ b/bookwyrm/templates/user/lists.html
@@ -15,7 +15,7 @@
     {% if is_self %}
     <div class="column is-narrow">
         {% trans "Create list" as button_text %}
-        {% include 'snippets/toggle/open_button.html' with controls_text="create-list" icon="plus" text=button_text %}
+        {% include 'snippets/toggle/open_button.html' with controls_text="create-list" icon_with_text="plus" text=button_text %}
     </div>
     {% endif %}
 </div>
diff --git a/bookwyrm/templates/user/shelf/shelf.html b/bookwyrm/templates/user/shelf/shelf.html
index 9e7ae4f7..79a27529 100644
--- a/bookwyrm/templates/user/shelf/shelf.html
+++ b/bookwyrm/templates/user/shelf/shelf.html
@@ -36,7 +36,7 @@
     {% if is_self %}
     <div class="column is-narrow">
         {% trans "Create shelf" as button_text %}
-        {% include 'snippets/toggle/open_button.html' with text=button_text icon="plus" controls_text="create-shelf-form" focus="create-shelf-form-header" %}
+        {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="plus" controls_text="create-shelf-form" focus="create-shelf-form-header" %}
     </div>
     {% endif %}
 </div>
@@ -59,7 +59,7 @@
     {% if is_self and shelf.id %}
     <div class="column is-narrow">
         {% trans "Edit shelf" as button_text %}
-        {% include 'snippets/toggle/open_button.html' with text=button_text icon="pencil" controls_text="edit-shelf-form" focus="edit-shelf-form-header" %}
+        {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="pencil" controls_text="edit-shelf-form" focus="edit-shelf-form-header" %}
     </div>
     {% endif %}
 </div>
diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index 5afe168a..d2e9be3e 100644
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -12,9 +12,8 @@
     {% if is_self %}
     <div class="column is-narrow">
         <a href="{% url 'prefs-profile' %}">
-            <span class="icon icon-pencil" title="Edit profile">
-                <span class="is-sr-only">{% trans "Edit profile" %}</span>
-            </span>
+            <span class="icon icon-pencil" title="Edit profile" aria-hidden="true"></span>
+            <span>{% trans "Edit profile" %}</span>
         </a>
     </div>
     {% endif %}
@@ -59,8 +58,9 @@
     <div class="columns is-mobile">
         <h2 class="title column">{% trans "User Activity" %}</h2>
         <div class="column is-narrow">
-            <a class="icon icon-rss" target="_blank" href="{{ user.local_path }}/rss">
-                <span class="is-sr-only">{% trans "RSS feed" %}</span>
+            <a target="_blank" href="{{ user.local_path }}/rss">
+                <span class="icon icon-rss" aria-hidden="true"></span>
+                <span>{% trans "RSS feed" %}</span>
             </a>
         </div>
     </div>

From 8b14f8585e05972790be23c96532960fdc589b04 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 18 May 2021 10:55:05 -0700
Subject: [PATCH 1144/1285] Small fixes for list display

---
 bookwyrm/templates/lists/list.html       | 4 ++--
 bookwyrm/templates/lists/list_items.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index 55dc68aa..d740ee80 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -51,9 +51,9 @@
                                 <p>
                                     {% include 'snippets/stars.html' with rating=item.book|rating:request.user %}
                                 </p>
-                                <p>
+                                <div>
                                     {{ book|book_description|to_markdown|default:""|safe|truncatewords_html:20 }}
-                                </p>
+                                </div>
                                 {% include 'snippets/shelve_button/shelve_button.html' %}
                             </div>
                         </div>
diff --git a/bookwyrm/templates/lists/list_items.html b/bookwyrm/templates/lists/list_items.html
index 1fdaaca9..8cbf6ee5 100644
--- a/bookwyrm/templates/lists/list_items.html
+++ b/bookwyrm/templates/lists/list_items.html
@@ -22,7 +22,7 @@
             {% endwith %}
 
             <div class="card-content is-flex-grow-0">
-                <div {% if list.description %}title="{{ list.description }}"{% endif %}>
+                <div class="is-clipped" {% if list.description %}title="{{ list.description }}"{% endif %}>
                 {% if list.description %}
                     {{ list.description|to_markdown|safe|truncatechars_html:30 }}
                 {% else %}

From ab69abb8f082eff68a72453f7f3f5e3e5ecb7762 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 18 May 2021 10:57:54 -0700
Subject: [PATCH 1145/1285] Gap between book search results

---
 bookwyrm/templates/search/book.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/search/book.html b/bookwyrm/templates/search/book.html
index 9af8a394..08e1dad2 100644
--- a/bookwyrm/templates/search/book.html
+++ b/bookwyrm/templates/search/book.html
@@ -7,7 +7,7 @@
 {% with results|first as local_results %}
 <ul class="block">
 {% for result in local_results.results %}
-    <li class="pd-4">
+    <li class="pd-4 mb-5">
         {% include 'snippets/search_result_text.html' with result=result %}
     </li>
 {% endfor %}

From 07d59c8c097f003d5b332471e0104057ea722356 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 18 May 2021 11:09:19 -0700
Subject: [PATCH 1146/1285] Don't show ratings below user statuses

---
 bookwyrm/templates/book/book.html | 4 +++-
 bookwyrm/views/books.py           | 7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index 0aa64836..53c9c067 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -195,7 +195,7 @@
             {% endif %}
             <div class="block" id="reviews">
                 {% if request.user.is_authenticated %}
-                {% if user_statuses.review_count or user_statuses.comment_count or user_stuatses.quotation_count %}
+                {% if user_statuses.review_count or user_statuses.comment_count or user_statuses.quotation_count %}
                 <nav class="tabs">
                     <ul>
                         {% url 'book' book.id as tab_url %}
@@ -238,6 +238,7 @@
                     </div>
                 {% endfor %}
 
+                {% if ratings %}
                 <div class="block is-flex is-flex-wrap-wrap">
                     {% for rating in ratings %}
                         {% with user=rating.user %}
@@ -265,6 +266,7 @@
                         {% endwith %}
                     {% endfor %}
                 </div>
+                {% endif %}
                 <div class="block">
                     {% include 'snippets/pagination.html' with page=statuses path=request.path anchor="#reviews" %}
                 </div>
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 6005c9fd..27bdddb1 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -30,6 +30,7 @@ class Book(View):
 
     def get(self, request, book_id, user_statuses=False):
         """info about a book"""
+        user_statuses = user_statuses if request.user.is_authenticated else False
         try:
             book = models.Book.objects.select_subclasses().get(id=book_id)
         except models.Book.DoesNotExist:
@@ -51,7 +52,7 @@ class Book(View):
         )
 
         # the reviews to show
-        if user_statuses and request.user.is_authenticated:
+        if user_statuses:
             if user_statuses == "review":
                 queryset = book.review_set
             elif user_statuses == "comment":
@@ -67,7 +68,9 @@ class Book(View):
             "book": book,
             "statuses": paginated.get_page(request.GET.get("page")),
             "review_count": reviews.count(),
-            "ratings": reviews.filter(Q(content__isnull=True) | Q(content="")),
+            "ratings": reviews.filter(Q(content__isnull=True) | Q(content=""))
+            if not user_statuses
+            else None,
             "rating": reviews.aggregate(Avg("rating"))["rating__avg"],
             "lists": privacy_filter(
                 request.user, book.list_set.filter(listitem__approved=True)

From 58a059c85f2ed4026266b46fa9cfbc99b220b518 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 18 May 2021 11:17:59 -0700
Subject: [PATCH 1147/1285] Fixes display of user ratings

---
 bookwyrm/templates/book/book.html   | 32 +++++------------------------
 bookwyrm/templates/book/rating.html | 22 ++++++++++++++++++++
 bookwyrm/views/books.py             |  2 +-
 3 files changed, 28 insertions(+), 28 deletions(-)
 create mode 100644 bookwyrm/templates/book/rating.html

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index 53c9c067..2e83d479 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -225,45 +225,23 @@
                 {% endif %}
                 {% endif %}
 
-                {% for review in statuses %}
+                {% for status in statuses %}
                     <div
                         class="block"
+                        {% if status.status_type == 'Review' or status.status_type == 'Rating' %}
                         itemprop="review"
                         itemscope
                         itemtype="https://schema.org/Review"
+                        {% endif %}
                     >
-                        {% with status=review hide_book=True depth=1 %}
-                            {% include 'snippets/status/status.html' %}
-                        {% endwith %}
+                        {% include 'snippets/status/status.html' with status=status hide_book=True depth=1 %}
                     </div>
                 {% endfor %}
 
                 {% if ratings %}
                 <div class="block is-flex is-flex-wrap-wrap">
                     {% for rating in ratings %}
-                        {% with user=rating.user %}
-                            <div class="block mr-5">
-                                <div class="media">
-                                    <div class="media-left">
-                                        {% include 'snippets/avatar.html' %}
-                                    </div>
-
-                                    <div class="media-content">
-                                        <div>
-                                            <a href="{{ user.local_path }}">{{ user.display_name }}</a>
-                                        </div>
-                                        <div class="is-flex">
-                                            <p class="mr-1">{% trans "rated it" %}</p>
-
-                                            {% include 'snippets/stars.html' with rating=rating.rating %}
-                                        </div>
-                                        <div>
-                                            <a href="{{ rating.remote_id }}">{{ rating.published_date|naturaltime }}</a>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        {% endwith %}
+                        {% include 'book/rating.html' with user=rating.user rating=rating %}
                     {% endfor %}
                 </div>
                 {% endif %}
diff --git a/bookwyrm/templates/book/rating.html b/bookwyrm/templates/book/rating.html
new file mode 100644
index 00000000..c0af67fa
--- /dev/null
+++ b/bookwyrm/templates/book/rating.html
@@ -0,0 +1,22 @@
+{% load i18n %}{% load status_display %}
+<div class="block mr-5">
+    <div class="media">
+        <div class="media-left">
+            {% include 'snippets/avatar.html' with user=user %}
+        </div>
+
+        <div class="media-content">
+            <div>
+                <a href="{{ user.local_path }}">{{ user.display_name }}</a>
+            </div>
+            <div class="is-flex">
+                <p class="mr-1">{% trans "rated it" %}</p>
+
+                {% include 'snippets/stars.html' with rating=rating.rating %}
+            </div>
+            <div>
+                <a href="{{ rating.remote_id }}">{{ rating.published_date|published_date }}</a>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 27bdddb1..fee22e89 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -54,7 +54,7 @@ class Book(View):
         # the reviews to show
         if user_statuses:
             if user_statuses == "review":
-                queryset = book.review_set
+                queryset = book.review_set.select_subclasses()
             elif user_statuses == "comment":
                 queryset = book.comment_set
             else:

From 04c165113f1a101970b3fad87c0e0b0b13627db4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 18 May 2021 11:22:45 -0700
Subject: [PATCH 1148/1285] Cleans up login page

---
 bookwyrm/templates/login.html | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/templates/login.html b/bookwyrm/templates/login.html
index 8ed5d044..e3d0133c 100644
--- a/bookwyrm/templates/login.html
+++ b/bookwyrm/templates/login.html
@@ -38,6 +38,9 @@
                 </div>
             </form>
         </div>
+    </div>
+
+    <div class="column">
         <div class="box has-background-primary-light">
             {% if site.allow_registration %}
             <h2 class="title">{% trans "Create an Account" %}</h2>
@@ -50,15 +53,15 @@
             {% endif %}
         </div>
     </div>
+</div>
 
-    <div class="column">
-        <div class="block">
-            {% include 'snippets/about.html' %}
+<div class="block">
+    <div class="box">
+        {% include 'snippets/about.html' %}
 
-            <p class="block">
-            <a href="{% url 'about' %}">{% trans "More about this site" %}</a>
-            </p>
-        </div>
+        <p class="block">
+        <a href="{% url 'about' %}">{% trans "More about this site" %}</a>
+        </p>
     </div>
 </div>
 {% endblock %}

From 3d7f3f34c127db3d0b25cc5f2263b30a9f1e6d45 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 18 May 2021 11:36:50 -0700
Subject: [PATCH 1149/1285] Fixes book view test

---
 bookwyrm/tests/views/test_book.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py
index 2acdb369..909718ec 100644
--- a/bookwyrm/tests/views/test_book.py
+++ b/bookwyrm/tests/views/test_book.py
@@ -59,7 +59,6 @@ class BookViews(TestCase):
         result.render()
         self.assertEqual(result.status_code, 200)
 
-        request = self.factory.get("")
         with patch("bookwyrm.views.books.is_api_request") as is_api:
             is_api.return_value = True
             result = view(request, self.book.id)

From 82117a7d28b593b03a8a29ccbf3c3d13b2aebfad Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 18 May 2021 12:23:36 -0700
Subject: [PATCH 1150/1285] Tests deactivating connectors

---
 bookwyrm/models/federated_server.py     |  4 ++--
 bookwyrm/tests/views/test_federation.py | 31 +++++++++++++++++++++++--
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/models/federated_server.py b/bookwyrm/models/federated_server.py
index 86635ab0..e297c46c 100644
--- a/bookwyrm/models/federated_server.py
+++ b/bookwyrm/models/federated_server.py
@@ -37,7 +37,7 @@ class FederatedServer(BookWyrmModel):
 
         # check for related connectors
         if self.application_type == "bookwyrm":
-            connector_model = apps.get_model("bookwyrm.Connector", require_read=True)
+            connector_model = apps.get_model("bookwyrm.Connector", require_ready=True)
             connector_model.objects.filter(
                 identifier=self.server_name, active=True
             ).update(active=False, deactivation_reason="domain_block")
@@ -53,7 +53,7 @@ class FederatedServer(BookWyrmModel):
 
         # check for related connectors
         if self.application_type == "bookwyrm":
-            connector_model = apps.get_model("bookwyrm.Connector", require_read=True)
+            connector_model = apps.get_model("bookwyrm.Connector", require_ready=True)
             connector_model.objects.filter(
                 identifier=self.server_name,
                 active=False,
diff --git a/bookwyrm/tests/views/test_federation.py b/bookwyrm/tests/views/test_federation.py
index f17f7624..4469040e 100644
--- a/bookwyrm/tests/views/test_federation.py
+++ b/bookwyrm/tests/views/test_federation.py
@@ -60,7 +60,12 @@ class FederationViews(TestCase):
 
     def test_server_page_block(self):
         """block a server"""
-        server = models.FederatedServer.objects.create(server_name="hi.there.com")
+        server = models.FederatedServer.objects.create(
+            server_name="hi.there.com", application_type="bookwyrm"
+        )
+        connector = models.Connector.objects.get(
+            identifier="hi.there.com",
+        )
         self.remote_user.federated_server = server
         self.remote_user.save()
 
@@ -72,17 +77,32 @@ class FederationViews(TestCase):
         request.user.is_superuser = True
 
         view(request, server.id)
+
         server.refresh_from_db()
         self.remote_user.refresh_from_db()
         self.assertEqual(server.status, "blocked")
+
         # and the user was deactivated
         self.assertFalse(self.remote_user.is_active)
+        self.assertEqual(self.remote_user.deactivation_reason, "domain_block")
+
+        # and the connector was disabled
+        connector.refresh_from_db()
+        self.assertFalse(connector.active)
+        self.assertEqual(connector.deactivation_reason, "domain_block")
 
     def test_server_page_unblock(self):
         """unblock a server"""
         server = models.FederatedServer.objects.create(
-            server_name="hi.there.com", status="blocked"
+            server_name="hi.there.com", status="blocked", application_type="bookwyrm"
         )
+        connector = models.Connector.objects.get(
+            identifier="hi.there.com",
+        )
+        connector.active = False
+        connector.deactivation_reason = "domain_block"
+        connector.save()
+
         self.remote_user.federated_server = server
         self.remote_user.is_active = False
         self.remote_user.deactivation_reason = "domain_block"
@@ -96,8 +116,15 @@ class FederationViews(TestCase):
         server.refresh_from_db()
         self.remote_user.refresh_from_db()
         self.assertEqual(server.status, "federated")
+
         # and the user was re-activated
         self.assertTrue(self.remote_user.is_active)
+        self.assertIsNone(self.remote_user.deactivation_reason)
+
+        # and the connector was re-enabled
+        connector.refresh_from_db()
+        self.assertTrue(connector.active)
+        self.assertIsNone(connector.deactivation_reason)
 
     def test_add_view_get(self):
         """there are so many views, this just makes sure it LOADS"""

From 0c0dcc57d64fa41a994461857970b0cecc82231c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 18 May 2021 12:51:57 -0700
Subject: [PATCH 1151/1285] Adjusts line length

---
 bookwyrm/tests/connectors/test_inventaire_connector.py | 8 ++++----
 bookwyrm/tests/data/inventaire_search.json             | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/tests/connectors/test_inventaire_connector.py b/bookwyrm/tests/connectors/test_inventaire_connector.py
index 71e407e9..c66f0400 100644
--- a/bookwyrm/tests/connectors/test_inventaire_connector.py
+++ b/bookwyrm/tests/connectors/test_inventaire_connector.py
@@ -64,7 +64,7 @@ class Inventaire(TestCase):
         )
         self.assertEqual(
             formatted.cover,
-            "https://covers.inventaire.io/img/entities/ddb32e115a28dcc0465023869ba19f6868ec4042",
+            "https://covers.inventaire.io/img/entities/ddb32",
         )
 
     def test_get_cover_url(self):
@@ -74,18 +74,18 @@ class Inventaire(TestCase):
         self.assertEqual(result, "https://covers.inventaire.io/img/entities/d46a8")
 
         cover_blob = {
-            "url": "https://commons.wikimedia.org/wiki/Special:FilePath/The%20Moonstone%201st%20ed.jpg?width=1000",
+            "url": "https://commons.wikimedia.org/wiki/d.jpg?width=1000",
             "file": "The Moonstone 1st ed.jpg",
             "credits": {
                 "text": "Wikimedia Commons",
-                "url": "https://commons.wikimedia.org/wiki/File:The Moonstone 1st ed.jpg",
+                "url": "https://commons.wikimedia.org/wiki/File:The Moonstone.jpg",
             },
         }
 
         result = self.connector.get_cover_url(cover_blob)
         self.assertEqual(
             result,
-            "https://commons.wikimedia.org/wiki/Special:FilePath/The%20Moonstone%201st%20ed.jpg?width=1000",
+            "https://commons.wikimedia.org/wiki/d.jpg?width=1000",
         )
 
     @responses.activate
diff --git a/bookwyrm/tests/data/inventaire_search.json b/bookwyrm/tests/data/inventaire_search.json
index e80e593a..cbdb1415 100644
--- a/bookwyrm/tests/data/inventaire_search.json
+++ b/bookwyrm/tests/data/inventaire_search.json
@@ -7,7 +7,7 @@
             "label": "The Stories of Vladimir Nabokov",
             "description": "book by Vladimir Nabokov",
             "image": [
-                "ddb32e115a28dcc0465023869ba19f6868ec4042"
+                "ddb32"
             ],
             "_score": 25.180836,
             "_popularity": 4

From 6fff45d36c6363b88cf9aa720bbaf73705020faa Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 18 May 2021 13:04:28 -0700
Subject: [PATCH 1152/1285] Adds language field to edit book form

---
 bookwyrm/templates/book/edit_book.html | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html
index a230e290..4511d36f 100644
--- a/bookwyrm/templates/book/edit_book.html
+++ b/bookwyrm/templates/book/edit_book.html
@@ -117,11 +117,23 @@
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
 
-                <p class="mb-2"><label class="label" for="id_series_number">{% trans "Series number:" %}</label> {{ form.series_number }} </p>
+                <p class="mb-2">
+                    <label class="label" for="id_series_number">{% trans "Series number:" %}</label>
+                    {{ form.series_number }}
+                </p>
                 {% for error in form.series_number.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
 
+                <p class="mb-2">
+                    <label class="label" for="id_languages">{% trans "Languages:" %}</label>
+                    {{ form.languages }}
+                    <span class="help">{% trans "Separate multiple values with commas." %}</span>
+                </p>
+                {% for error in form.languages.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+
                 <p class="mb-2">
                     <label class="label" for="id_publishers">{% trans "Publisher:" %}</label>
                     {{ form.publishers }}

From 8fc0da8dc22b323eab15fe48268a18b15e877d13 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 18 May 2021 16:10:43 -0700
Subject: [PATCH 1153/1285] Adds inventaire ID field to edit book form

---
 bookwyrm/templates/book/edit_book.html | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html
index 4511d36f..8dae1d04 100644
--- a/bookwyrm/templates/book/edit_book.html
+++ b/bookwyrm/templates/book/edit_book.html
@@ -88,6 +88,7 @@
         <div class="column is-half">
             <section class="block">
                 <h2 class="title is-4">{% trans "Metadata" %}</h2>
+
                 <p class="mb-2">
                     <label class="label" for="id_title">{% trans "Title:" %}</label>
                     <input type="text" name="title" value="{{ form.title.value|default:'' }}" maxlength="255" class="input" required="" id="id_title">
@@ -228,18 +229,27 @@
                 {% for error in form.isbn_13.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
+
                 <p class="mb-2"><label class="label" for="id_isbn_10">{% trans "ISBN 10:" %}</label> {{ form.isbn_10 }} </p>
                 {% for error in form.isbn_10.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
-                <p class="mb-2"><label class="label" for="id_openlibrary_key">{% trans "Openlibrary key:" %}</label> {{ form.openlibrary_key }} </p>
+
+                <p class="mb-2"><label class="label" for="id_openlibrary_key">{% trans "Openlibrary ID:" %}</label> {{ form.openlibrary_key }} </p>
                 {% for error in form.openlibrary_key.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
+
+                <p class="mb-2"><label class="label" for="id_inventaire_id">{% trans "Inventaire ID:" %}</label> {{ form.inventaire_id }} </p>
+                {% for error in form.inventaire_id.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+
                 <p class="mb-2"><label class="label" for="id_oclc_number">{% trans "OCLC Number:" %}</label> {{ form.oclc_number }} </p>
                 {% for error in form.oclc_number.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
+
                 <p class="mb-2"><label class="label" for="id_asin">{% trans "ASIN:" %}</label> {{ form.asin }} </p>
                 {% for error in form.ASIN.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>

From 213a9508d81b11bad8483e8e6e3e4facbfcad5d5 Mon Sep 17 00:00:00 2001
From: bcj <brendan@bcjbcj.ca>
Date: Mon, 17 May 2021 00:03:11 -0500
Subject: [PATCH 1154/1285] Don't hardcode postres port in bookwyrm.settings

Have bookwyrm.settings check for an alternative postgres port.
---
 .env.prod.example    | 1 +
 bookwyrm/settings.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.env.prod.example b/.env.prod.example
index ac9fe70f..a82499a3 100644
--- a/.env.prod.example
+++ b/.env.prod.example
@@ -21,6 +21,7 @@ BOOKWYRM_DATABASE_BACKEND=postgres
 
 MEDIA_ROOT=images/
 
+POSTGRES_PORT=5432
 POSTGRES_PASSWORD=securedbpassword123
 POSTGRES_USER=fedireads
 POSTGRES_DB=fedireads
diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 45d8cb9d..d694e33f 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -118,7 +118,7 @@ BOOKWYRM_DBS = {
         "USER": env("POSTGRES_USER", "fedireads"),
         "PASSWORD": env("POSTGRES_PASSWORD", "fedireads"),
         "HOST": env("POSTGRES_HOST", ""),
-        "PORT": 5432,
+        "PORT": env("POSTGRES_PORT", 5432),
     },
 }
 

From 24152c01291902a7f73de9112722d34cf0095ee5 Mon Sep 17 00:00:00 2001
From: bcj <brendan@bcjbcj.ca>
Date: Mon, 17 May 2021 00:03:51 -0500
Subject: [PATCH 1155/1285] Read flower port from .env

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 9324b224..80a85bcc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -76,7 +76,7 @@ services:
     restart: on-failure
   flower:
     build: .
-    command: flower --port=8888
+    command: flower --port=${FLOWER_PORT}
     env_file: .env
     environment:
       - CELERY_BROKER_URL=${CELERY_BROKER}

From 76ba116d2f2e0cb80af003afa431fee0d866020c Mon Sep 17 00:00:00 2001
From: bcj <brendan@bcjbcj.ca>
Date: Mon, 17 May 2021 00:07:59 -0500
Subject: [PATCH 1156/1285] Remove the redis_activity ports listing

It is misleading, it isn't binding to that port
---
 docker-compose.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 80a85bcc..18f83650 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -42,8 +42,6 @@ services:
     image: redis
     command: ["redis-server", "--appendonly", "yes"]
     env_file: .env
-    ports:
-      - 6378:6378
     networks:
       - main
     restart: on-failure

From 1b8e1f8a907e7187dcb26001f98950991c4f56ce Mon Sep 17 00:00:00 2001
From: bcj <brendan@bcjbcj.ca>
Date: Tue, 18 May 2021 13:21:19 -0500
Subject: [PATCH 1157/1285] Add POSTGRES_PORT to .env.dev

---
 .env.dev.example | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.env.dev.example b/.env.dev.example
index 538d1611..2f24378c 100644
--- a/.env.dev.example
+++ b/.env.dev.example
@@ -21,6 +21,7 @@ BOOKWYRM_DATABASE_BACKEND=postgres
 
 MEDIA_ROOT=images/
 
+POSTGRES_PORT=5432
 POSTGRES_PASSWORD=fedireads
 POSTGRES_USER=fedireads
 POSTGRES_DB=fedireads

From d1f2d9812f766a79f874fa3fbf5c6d71d481dda8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 19 May 2021 13:56:00 -0700
Subject: [PATCH 1158/1285] Adds model for instance admin announcements

---
 bookwyrm/admin.py                        |  1 -
 bookwyrm/context_processors.py           |  5 ++-
 bookwyrm/migrations/0075_announcement.py | 57 ++++++++++++++++++++++++
 bookwyrm/models/__init__.py              |  1 +
 bookwyrm/models/announcement.py          | 24 ++++++++++
 5 files changed, 86 insertions(+), 2 deletions(-)
 create mode 100644 bookwyrm/migrations/0075_announcement.py
 create mode 100644 bookwyrm/models/announcement.py

diff --git a/bookwyrm/admin.py b/bookwyrm/admin.py
index efe5e9d7..f028dea0 100644
--- a/bookwyrm/admin.py
+++ b/bookwyrm/admin.py
@@ -2,7 +2,6 @@
 from django.contrib import admin
 from bookwyrm import models
 
-admin.site.register(models.SiteSettings)
 admin.site.register(models.User)
 admin.site.register(models.FederatedServer)
 admin.site.register(models.Connector)
diff --git a/bookwyrm/context_processors.py b/bookwyrm/context_processors.py
index f5f25186..0dd32c7f 100644
--- a/bookwyrm/context_processors.py
+++ b/bookwyrm/context_processors.py
@@ -4,4 +4,7 @@ from bookwyrm import models
 
 def site_settings(request):  # pylint: disable=unused-argument
     """include the custom info about the site"""
-    return {"site": models.SiteSettings.objects.get()}
+    return {
+        "site": models.SiteSettings.objects.get(),
+        "announcements": models.Announcement.active_announcements(),
+    }
diff --git a/bookwyrm/migrations/0075_announcement.py b/bookwyrm/migrations/0075_announcement.py
new file mode 100644
index 00000000..ec51b6ca
--- /dev/null
+++ b/bookwyrm/migrations/0075_announcement.py
@@ -0,0 +1,57 @@
+# Generated by Django 3.2 on 2021-05-19 20:58
+
+import bookwyrm.models.fields
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0074_auto_20210511_1829"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Announcement",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("created_date", models.DateTimeField(auto_now_add=True)),
+                ("updated_date", models.DateTimeField(auto_now=True)),
+                (
+                    "remote_id",
+                    bookwyrm.models.fields.RemoteIdField(
+                        max_length=255,
+                        null=True,
+                        validators=[bookwyrm.models.fields.validate_remote_id],
+                    ),
+                ),
+                ("name", models.CharField(max_length=255)),
+                ("preview", models.CharField(max_length=255)),
+                ("content", models.TextField()),
+                ("event_date", models.DateTimeField(blank=True, null=True)),
+                ("start_date", models.DateTimeField(blank=True, null=True)),
+                ("end_date", models.DateTimeField(blank=True, null=True)),
+                ("active", models.BooleanField(default=True)),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+            options={
+                "abstract": False,
+            },
+        ),
+    ]
diff --git a/bookwyrm/models/__init__.py b/bookwyrm/models/__init__.py
index 2a25a525..6f378e83 100644
--- a/bookwyrm/models/__init__.py
+++ b/bookwyrm/models/__init__.py
@@ -25,6 +25,7 @@ from .federated_server import FederatedServer
 from .import_job import ImportJob, ImportItem
 
 from .site import SiteSettings, SiteInvite, PasswordReset, InviteRequest
+from .announcement import Announcement
 
 cls_members = inspect.getmembers(sys.modules[__name__], inspect.isclass)
 activity_models = {
diff --git a/bookwyrm/models/announcement.py b/bookwyrm/models/announcement.py
new file mode 100644
index 00000000..63f104c3
--- /dev/null
+++ b/bookwyrm/models/announcement.py
@@ -0,0 +1,24 @@
+""" admin announcements """
+from django.db import models
+from django.utils import timezone
+
+from .base_model import BookWyrmModel
+
+
+class Announcement(BookWyrmModel):
+    """The admin has something to say"""
+
+    user = models.ForeignKey("User", on_delete=models.PROTECT)
+    name = models.CharField(max_length=255)
+    preview = models.CharField(max_length=255)
+    content = models.TextField()
+    event_date = models.DateTimeField(blank=True, null=True)
+    start_date = models.DateTimeField(blank=True, null=True)
+    end_date = models.DateTimeField(blank=True, null=True)
+    active = models.BooleanField(default=True)
+
+    @classmethod
+    def active_announcements(cls):
+        """announcements that should be displayed"""
+        now = timezone.now()
+        return cls.objects.filter(active=True, start_date__lte=now, end_date__gte=now)

From 515d5bb237b428c08a4fbc4800a3c13aff8bb7ec Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 19 May 2021 14:55:01 -0700
Subject: [PATCH 1159/1285] Create announcements admin view

---
 bookwyrm/forms.py                             |  6 ++
 bookwyrm/templates/settings/admin_layout.html |  4 +
 .../templates/settings/announcement_form.html | 80 +++++++++++++++++++
 .../templates/settings/announcements.html     | 49 ++++++++++++
 bookwyrm/urls.py                              | 10 +++
 bookwyrm/views/__init__.py                    |  1 +
 bookwyrm/views/announcements.py               | 36 +++++++++
 7 files changed, 186 insertions(+)
 create mode 100644 bookwyrm/templates/settings/announcement_form.html
 create mode 100644 bookwyrm/templates/settings/announcements.html
 create mode 100644 bookwyrm/views/announcements.py

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index b6197f33..25b72a11 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -269,6 +269,12 @@ class SiteForm(CustomForm):
         exclude = []
 
 
+class AnnouncementForm(CustomForm):
+    class Meta:
+        model = models.Announcement
+        exclude = ["remote_id"]
+
+
 class ListForm(CustomForm):
     class Meta:
         model = models.List
diff --git a/bookwyrm/templates/settings/admin_layout.html b/bookwyrm/templates/settings/admin_layout.html
index 4f71a228..635e8607 100644
--- a/bookwyrm/templates/settings/admin_layout.html
+++ b/bookwyrm/templates/settings/admin_layout.html
@@ -43,6 +43,10 @@
         {% if perms.bookwyrm.edit_instance_settings %}
         <h2 class="menu-label">{% trans "Instance Settings" %}</h2>
         <ul class="menu-list">
+            <li>
+                {% url 'settings-announcements' as url %}
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Announcements" %}</a>
+            </li>
             <li>
                 {% url 'settings-site' as url %}
                 <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Site Settings" %}</a>
diff --git a/bookwyrm/templates/settings/announcement_form.html b/bookwyrm/templates/settings/announcement_form.html
new file mode 100644
index 00000000..f8d6e846
--- /dev/null
+++ b/bookwyrm/templates/settings/announcement_form.html
@@ -0,0 +1,80 @@
+{% extends 'components/inline_form.html' %}
+{% load i18n %}
+
+{% block header %}
+{% trans "Create Announcement" %}
+{% endblock %}
+
+{% block form %}
+<form name="create-announcement" method="post" action="{% url 'settings-announcements' %}">
+<form name="create-announcement" method="post" action="/settings/announcements">
+    {% csrf_token %}
+    <input type="hidden" name="user" value="{{ request.user.id }}">
+
+    <p>
+        <label class="label" for="id_name">Name:</label>
+        {{ form.name }}
+        {% for error in form.name.errors %}
+        <p class="help is-danger">{{ error | escape }}</p>
+        {% endfor %}
+    </p>
+    <div class="columns">
+        <div class="column">
+            <p>
+                <label class="label" for="id_start_date">Start date:</label>
+                <input type="date" name="start_date" class="input" id="id_start_date">
+                {% for error in form.start_date.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+            </p>
+        </div>
+        <div class="column">
+            <p>
+                <label class="label" for="id_end_date">End date:</label>
+                <input type="date" name="end_date" class="input" id="id_end_date">
+                {% for error in form.end_date.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+            </p>
+        </div>
+        <div class="column is-narrow">
+            <p>
+                <label class="label" for="id_active">Active:</label>
+                {{ form.active }}
+                {% for error in form.active.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+            </p>
+        </div>
+    </div>
+    <hr aria-hidden="true">
+    <p>
+        <label class="label" for="id_preview">Preview:</label>
+        {{ form.preview }}
+        {% for error in form.preview.errors %}
+        <p class="help is-danger">{{ error | escape }}</p>
+        {% endfor %}
+    </p>
+    <p>
+        <label class="label" for="id_content">Content:</label>
+        {{ form.content }}
+        {% for error in form.content.errors %}
+        <p class="help is-danger">{{ error | escape }}</p>
+        {% endfor %}
+    </p>
+    <p>
+        <label class="label" for="id_event_date">Event date:</label>
+        <input type="date" name="event_date" value="{{ form.event_date.value }}" class="input" id="id_event_date">
+        {% for error in form.event_date.errors %}
+        <p class="help is-danger">{{ error | escape }}</p>
+        {% endfor %}
+    </p>
+
+    <div class="field has-addons">
+        <div class="control">
+            <button type="submit" class="button is-primary">{% trans "Save" %}</button>
+        </div>
+    </div>
+</form>
+{% endblock %}
+
diff --git a/bookwyrm/templates/settings/announcements.html b/bookwyrm/templates/settings/announcements.html
new file mode 100644
index 00000000..009dcee0
--- /dev/null
+++ b/bookwyrm/templates/settings/announcements.html
@@ -0,0 +1,49 @@
+{% extends 'settings/admin_layout.html' %}
+{% load i18n %}{% load humanize %}
+{% block title %}{% trans "Announcements" %}{% endblock %}
+
+{% block header %}{% trans "Announcements" %}{% endblock %}
+
+{% block edit-button %}
+{% trans "Create Announcement" as button_text %}
+{% include 'snippets/toggle/open_button.html' with controls_text="create-announcement" icon_with_text="plus" text=button_text focus="create-announcement-header" %}
+</a>
+{% endblock %}
+
+{% block panel %}
+<div class="block">
+    {% include 'settings/announcement_form.html' with controls_text="create-announcement" %}
+</div>
+
+<table class="table is-striped">
+    <tr>
+        {% url 'settings-announcements' as url %}
+        <th>
+            {% trans "Name" as text %}
+            {% include 'snippets/table-sort-header.html' with field="name" 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><a href="{% url 'settings-announcements' announcement.id %}">{{ announcement.name }}</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>
+
+{% include 'snippets/pagination.html' with page=servers path=request.path %}
+{% endblock %}
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 3fdced38..92f2c498 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -56,6 +56,16 @@ urlpatterns = [
     ),
     # admin
     re_path(r"^settings/site-settings/?$", views.Site.as_view(), name="settings-site"),
+    re_path(
+        r"^settings/announcements/?$",
+        views.Announcements.as_view(),
+        name="settings-announcements",
+    ),
+    re_path(
+        r"^settings/announcements/(?P<announcement_id>\d+)/??$",
+        views.Announcements.as_view(),
+        name="settings-announcements",
+    ),
     re_path(
         r"^settings/email-preview/?$",
         views.site.email_preview,
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index bcd914e1..99fedf36 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -1,4 +1,5 @@
 """ make sure all our nice views are available """
+from .announcements import Announcements
 from .authentication import Login, Register, Logout
 from .author import Author, EditAuthor
 from .block import Block, unblock
diff --git a/bookwyrm/views/announcements.py b/bookwyrm/views/announcements.py
new file mode 100644
index 00000000..318cf856
--- /dev/null
+++ b/bookwyrm/views/announcements.py
@@ -0,0 +1,36 @@
+""" make announcements """
+from django.contrib.auth.decorators import login_required, permission_required
+from django.template.response import TemplateResponse
+from django.utils.decorators import method_decorator
+from django.views import View
+
+from bookwyrm import forms, models
+
+
+# pylint: disable= no-self-use
+@method_decorator(login_required, name="dispatch")
+@method_decorator(
+    permission_required("bookwyrm.edit_instance_settings", raise_exception=True),
+    name="dispatch",
+)
+class Announcements(View):
+    """tell everyone"""
+
+    def get(self, request):
+        """view and create announcements"""
+        data = {
+            "announcements": models.Announcement.objects.all(),
+            "form": forms.AnnouncementForm(),
+        }
+        return TemplateResponse(request, "settings/announcements.html", data)
+
+    def post(self, request):
+        """edit the site settings"""
+        form = forms.AnnouncementForm(request.POST)
+        if form.is_valid():
+            form.save()
+        data = {
+            "announcements": models.Announcement.objects.all(),
+            "form": forms.AnnouncementForm(),
+        }
+        return TemplateResponse(request, "settings/announcements.html", data)

From 346d718265976c6a71777cf35592e146404cb303 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 19 May 2021 15:17:32 -0700
Subject: [PATCH 1160/1285] Don't need both name and preview

---
 bookwyrm/context_processors.py                |  2 +-
 bookwyrm/migrations/0075_announcement.py      |  3 +-
 bookwyrm/models/announcement.py               |  8 +++-
 .../templates/settings/announcement_form.html | 44 ++++++++-----------
 .../templates/settings/announcements.html     |  6 +--
 5 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/bookwyrm/context_processors.py b/bookwyrm/context_processors.py
index 0dd32c7f..b77c62b0 100644
--- a/bookwyrm/context_processors.py
+++ b/bookwyrm/context_processors.py
@@ -6,5 +6,5 @@ def site_settings(request):  # pylint: disable=unused-argument
     """include the custom info about the site"""
     return {
         "site": models.SiteSettings.objects.get(),
-        "announcements": models.Announcement.active_announcements(),
+        "active_announcements": models.Announcement.active_announcements(),
     }
diff --git a/bookwyrm/migrations/0075_announcement.py b/bookwyrm/migrations/0075_announcement.py
index ec51b6ca..7808eea1 100644
--- a/bookwyrm/migrations/0075_announcement.py
+++ b/bookwyrm/migrations/0075_announcement.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.2 on 2021-05-19 20:58
+# Generated by Django 3.2 on 2021-05-19 22:16
 
 import bookwyrm.models.fields
 from django.conf import settings
@@ -35,7 +35,6 @@ class Migration(migrations.Migration):
                         validators=[bookwyrm.models.fields.validate_remote_id],
                     ),
                 ),
-                ("name", models.CharField(max_length=255)),
                 ("preview", models.CharField(max_length=255)),
                 ("content", models.TextField()),
                 ("event_date", models.DateTimeField(blank=True, null=True)),
diff --git a/bookwyrm/models/announcement.py b/bookwyrm/models/announcement.py
index 63f104c3..987b06c2 100644
--- a/bookwyrm/models/announcement.py
+++ b/bookwyrm/models/announcement.py
@@ -1,5 +1,6 @@
 """ admin announcements """
 from django.db import models
+from django.db.models import Q
 from django.utils import timezone
 
 from .base_model import BookWyrmModel
@@ -9,7 +10,6 @@ class Announcement(BookWyrmModel):
     """The admin has something to say"""
 
     user = models.ForeignKey("User", on_delete=models.PROTECT)
-    name = models.CharField(max_length=255)
     preview = models.CharField(max_length=255)
     content = models.TextField()
     event_date = models.DateTimeField(blank=True, null=True)
@@ -21,4 +21,8 @@ class Announcement(BookWyrmModel):
     def active_announcements(cls):
         """announcements that should be displayed"""
         now = timezone.now()
-        return cls.objects.filter(active=True, start_date__lte=now, end_date__gte=now)
+        return cls.objects.filter(
+            Q(start_date__isnull=True) | Q(start_date__lte=now),
+            Q(end_date__isnull=True) | Q(end_date__gte=now),
+            active=True,
+        )
diff --git a/bookwyrm/templates/settings/announcement_form.html b/bookwyrm/templates/settings/announcement_form.html
index f8d6e846..5c05b995 100644
--- a/bookwyrm/templates/settings/announcement_form.html
+++ b/bookwyrm/templates/settings/announcement_form.html
@@ -10,14 +10,28 @@
 <form name="create-announcement" method="post" action="/settings/announcements">
     {% csrf_token %}
     <input type="hidden" name="user" value="{{ request.user.id }}">
-
     <p>
-        <label class="label" for="id_name">Name:</label>
-        {{ form.name }}
-        {% for error in form.name.errors %}
+        <label class="label" for="id_preview">Preview:</label>
+        {{ form.preview }}
+        {% for error in form.preview.errors %}
         <p class="help is-danger">{{ error | escape }}</p>
         {% endfor %}
     </p>
+    <p>
+        <label class="label" for="id_content">Content:</label>
+        {{ form.content }}
+        {% for error in form.content.errors %}
+        <p class="help is-danger">{{ error | escape }}</p>
+        {% endfor %}
+    </p>
+    <p>
+        <label class="label" for="id_event_date">Event date:</label>
+        <input type="date" name="event_date" value="{{ form.event_date.value }}" class="input" id="id_event_date">
+        {% for error in form.event_date.errors %}
+        <p class="help is-danger">{{ error | escape }}</p>
+        {% endfor %}
+    </p>
+    <hr aria-hidden="true">
     <div class="columns">
         <div class="column">
             <p>
@@ -47,28 +61,6 @@
             </p>
         </div>
     </div>
-    <hr aria-hidden="true">
-    <p>
-        <label class="label" for="id_preview">Preview:</label>
-        {{ form.preview }}
-        {% for error in form.preview.errors %}
-        <p class="help is-danger">{{ error | escape }}</p>
-        {% endfor %}
-    </p>
-    <p>
-        <label class="label" for="id_content">Content:</label>
-        {{ form.content }}
-        {% for error in form.content.errors %}
-        <p class="help is-danger">{{ error | escape }}</p>
-        {% endfor %}
-    </p>
-    <p>
-        <label class="label" for="id_event_date">Event date:</label>
-        <input type="date" name="event_date" value="{{ form.event_date.value }}" class="input" id="id_event_date">
-        {% for error in form.event_date.errors %}
-        <p class="help is-danger">{{ error | escape }}</p>
-        {% endfor %}
-    </p>
 
     <div class="field has-addons">
         <div class="control">
diff --git a/bookwyrm/templates/settings/announcements.html b/bookwyrm/templates/settings/announcements.html
index 009dcee0..eba228c0 100644
--- a/bookwyrm/templates/settings/announcements.html
+++ b/bookwyrm/templates/settings/announcements.html
@@ -19,8 +19,8 @@
     <tr>
         {% url 'settings-announcements' as url %}
         <th>
-            {% trans "Name" as text %}
-            {% include 'snippets/table-sort-header.html' with field="name" sort=sort text=text %}
+            {% trans "Preview" as text %}
+            {% include 'snippets/table-sort-header.html' with field="preview" sort=sort text=text %}
         </th>
         <th>
             {% trans "Start date" as text %}
@@ -37,7 +37,7 @@
     </tr>
     {% for announcement in announcements %}
     <tr>
-        <td><a href="{% url 'settings-announcements' announcement.id %}">{{ announcement.name }}</a></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>

From c73c063949f8a1f086a30e5b5866e13127ff7c94 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 19 May 2021 15:35:14 -0700
Subject: [PATCH 1161/1285] Show announcements on all pages

---
 bookwyrm/templates/layout.html      | 30 +++++++++++++++++++++++++++--
 bookwyrm/templates/search/book.html |  4 ++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 3a4fd6c8..6adab96a 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -1,5 +1,4 @@
-{% load layout %}
-{% load i18n %}
+{% load layout %}{% load i18n %}{% load humanize %}
 <!DOCTYPE html>
 <html lang="{% get_lang %}">
 <head>
@@ -182,6 +181,33 @@
     </div>
 </nav>
 
+{% if active_announcements.exists %}
+<div class="block is-flex-grow-1">
+    <div class="container">
+        {% for announcement in active_announcements %}
+        <div class="notification p-3">
+            <div class="columns mb-0">
+                <div class="column">
+                    {% if announcement.event_date %}
+                    <strong>{{ announcement.event_date|naturalday|title }}:</strong>
+                    {% endif %}
+                    {{ announcement.preview }}
+                </div>
+                <div class="column is-narrow">
+                    {% trans "Open" as button_text %}
+                    {% include 'snippets/toggle/open_button.html' with text=button_text controls_text="announcement" class="is-small" controls_uid=announcement.id icon_with_text="arrow-down" %}
+                    {% trans "Close" as button_text %}
+                    {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="announcement" class="is-small" controls_uid=announcement.id icon_with_text="arrow-up" %}
+                </div>
+            </div>
+            <div class="box is-shadowless m-0 is-hidden" id="announcement-{{ announcement.id }}">
+                {{ announcement.content|safe }}
+            </div>
+        </div>
+        {% endfor %}
+    </div>
+</div>
+{% endif %}
 
 <div class="section is-flex-grow-1">
     <div class="container">
diff --git a/bookwyrm/templates/search/book.html b/bookwyrm/templates/search/book.html
index 08e1dad2..ce907219 100644
--- a/bookwyrm/templates/search/book.html
+++ b/bookwyrm/templates/search/book.html
@@ -28,9 +28,9 @@
             </div>
             <div class="column is-narrow">
                 {% trans "Open" as button_text %}
-                {% include 'snippets/toggle/open_button.html' with text=button_text small=True controls_text="more-results-panel" controls_uid=result_set.connector.identifier class="is-small" icon_with_text="arrow-down" pressed=forloop.first %}
+                {% include 'snippets/toggle/open_button.html' with text=button_text controls_text="more-results-panel" controls_uid=result_set.connector.identifier class="is-small" icon_with_text="arrow-down" pressed=forloop.first %}
                 {% trans "Close" as button_text %}
-                {% include 'snippets/toggle/close_button.html' with text=button_text small=True controls_text="more-results-panel" controls_uid=result_set.connector.identifier class="is-small" icon_with_text="arrow-up" pressed=forloop.first %}
+                {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="more-results-panel" controls_uid=result_set.connector.identifier class="is-small" icon_with_text="arrow-up" pressed=forloop.first %}
             </div>
         </header>
         {% endif %}

From d64e0c4aa88532040b59a8fc6a737e1fc6a54bbd Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 May 2021 08:09:35 -0700
Subject: [PATCH 1162/1285] Adds admin view for individual announcement

---
 bookwyrm/templates/book/format_filter.html    |  2 +-
 bookwyrm/templates/layout.html                | 22 ++----------
 bookwyrm/templates/settings/announcement.html | 23 ++++++++++++
 .../templates/settings/announcements.html     |  2 +-
 bookwyrm/templates/snippets/announcement.html | 22 ++++++++++++
 bookwyrm/templates/snippets/book_titleby.html |  4 +--
 .../snippets/status/status_header.html        |  8 ++---
 bookwyrm/templatetags/utilities.py            |  2 +-
 bookwyrm/urls.py                              |  2 +-
 bookwyrm/views/__init__.py                    |  2 +-
 bookwyrm/views/announcements.py               | 35 ++++++++++++++++++-
 11 files changed, 92 insertions(+), 32 deletions(-)
 create mode 100644 bookwyrm/templates/settings/announcement.html
 create mode 100644 bookwyrm/templates/snippets/announcement.html

diff --git a/bookwyrm/templates/book/format_filter.html b/bookwyrm/templates/book/format_filter.html
index c722b24f..4280ebac 100644
--- a/bookwyrm/templates/book/format_filter.html
+++ b/bookwyrm/templates/book/format_filter.html
@@ -8,7 +8,7 @@
         <option value="">{% trans "Any" %}</option>
         {% for format in formats %}{% if format %}
         <option value="{{ format }}" {% if request.GET.format == format %}selected{% endif %}>
-            {{ format|title }}
+            {{ format|book_title }}
         </option>
         {% endif %}{% endfor %}
     </select>
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 6adab96a..112640fb 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -1,4 +1,4 @@
-{% load layout %}{% load i18n %}{% load humanize %}
+{% load layout %}{% load i18n %}
 <!DOCTYPE html>
 <html lang="{% get_lang %}">
 <head>
@@ -185,25 +185,7 @@
 <div class="block is-flex-grow-1">
     <div class="container">
         {% for announcement in active_announcements %}
-        <div class="notification p-3">
-            <div class="columns mb-0">
-                <div class="column">
-                    {% if announcement.event_date %}
-                    <strong>{{ announcement.event_date|naturalday|title }}:</strong>
-                    {% endif %}
-                    {{ announcement.preview }}
-                </div>
-                <div class="column is-narrow">
-                    {% trans "Open" as button_text %}
-                    {% include 'snippets/toggle/open_button.html' with text=button_text controls_text="announcement" class="is-small" controls_uid=announcement.id icon_with_text="arrow-down" %}
-                    {% trans "Close" as button_text %}
-                    {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="announcement" class="is-small" controls_uid=announcement.id icon_with_text="arrow-up" %}
-                </div>
-            </div>
-            <div class="box is-shadowless m-0 is-hidden" id="announcement-{{ announcement.id }}">
-                {{ announcement.content|safe }}
-            </div>
-        </div>
+        {% include 'snippets/announcement.html' with announcement=announcement %}
         {% endfor %}
     </div>
 </div>
diff --git a/bookwyrm/templates/settings/announcement.html b/bookwyrm/templates/settings/announcement.html
new file mode 100644
index 00000000..57b4d167
--- /dev/null
+++ b/bookwyrm/templates/settings/announcement.html
@@ -0,0 +1,23 @@
+{% extends 'settings/admin_layout.html' %}
+{% load i18n %}
+{% block title %}{% trans "Announcement" %} - {{ announcement.preview }}{% endblock %}
+
+{% block header %}{% trans "Announcement" %}{% endblock %}
+
+{% block edit-button %}
+{% trans "Edit Announcement" as button_text %}
+{% include 'snippets/toggle/open_button.html' with controls_text="create-announcement" icon_with_text="plus" text=button_text focus="create-announcement-header" %}
+</a>
+{% endblock %}
+
+{% block panel %}
+
+<div class="block">
+    {% include 'settings/announcement_form.html' with controls_text="create-announcement" %}
+</div>
+
+<div class="block content">
+    {% include 'snippets/announcement.html' with announcement=announcement pressed=True %}
+</div>
+
+{% endblock %}
diff --git a/bookwyrm/templates/settings/announcements.html b/bookwyrm/templates/settings/announcements.html
index eba228c0..f5117f2f 100644
--- a/bookwyrm/templates/settings/announcements.html
+++ b/bookwyrm/templates/settings/announcements.html
@@ -45,5 +45,5 @@
     {% endfor %}
 </table>
 
-{% include 'snippets/pagination.html' with page=servers path=request.path %}
+{% include 'snippets/pagination.html' with page=announcements path=request.path %}
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/announcement.html b/bookwyrm/templates/snippets/announcement.html
new file mode 100644
index 00000000..1d82c07c
--- /dev/null
+++ b/bookwyrm/templates/snippets/announcement.html
@@ -0,0 +1,22 @@
+{% load humanize %}{% load i18n %}{% load utilities %}
+{% with announcement.id|uuid as uuid %}
+<aside class="notification p-3">
+    <div class="columns mb-0">
+        <div class="column">
+            {% if announcement.event_date %}
+            <strong>{{ announcement.event_date|naturalday|title }}:</strong>
+            {% endif %}
+            {{ announcement.preview }}
+        </div>
+        <div class="column is-narrow">
+            {% trans "Open" as button_text %}
+            {% include 'snippets/toggle/open_button.html' with text=button_text controls_text="announcement" class="is-small" controls_uid=uuid icon_with_text="arrow-down" %}
+            {% trans "Close" as button_text %}
+            {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="announcement" class="is-small" controls_uid=uuid icon_with_text="arrow-up" %}
+        </div>
+    </div>
+    <div class="box is-shadowless m-0{% if not pressed %} is-hidden{% endif %}" id="announcement-{{ uuid }}">
+        {{ announcement.content|safe }}
+    </div>
+</aside>
+{% endwith %}
diff --git a/bookwyrm/templates/snippets/book_titleby.html b/bookwyrm/templates/snippets/book_titleby.html
index 76f5f7d6..353f9d12 100644
--- a/bookwyrm/templates/snippets/book_titleby.html
+++ b/bookwyrm/templates/snippets/book_titleby.html
@@ -1,8 +1,8 @@
 {% load i18n %}
 {% load utilities %}
 {% if book.authors %}
-{% blocktrans with path=book.local_path title=book|title %}<a href="{{ path }}">{{ title }}</a> by {% endblocktrans %}{% include 'snippets/authors.html' with book=book %}
+{% blocktrans with path=book.local_path title=book|book_title %}<a href="{{ path }}">{{ title }}</a> by {% endblocktrans %}{% include 'snippets/authors.html' with book=book %}
 {% else %}
-<a href="{{ book.local_path }}">{{ book|title }}</a>
+<a href="{{ book.local_path }}">{{ book|book_title }}</a>
 {% endif %}
 
diff --git a/bookwyrm/templates/snippets/status/status_header.html b/bookwyrm/templates/snippets/status/status_header.html
index 9ff7f9ff..9abdf8ca 100644
--- a/bookwyrm/templates/snippets/status/status_header.html
+++ b/bookwyrm/templates/snippets/status/status_header.html
@@ -48,7 +48,7 @@
 
             {% if status.book %}
                 {% if status.status_type == 'GeneratedNote' or status.status_type == 'Rating' %}
-                    <a href="{{ status.book.local_path }}">{{ status.book|title }}</a>{% if status.status_type == 'Rating' %}: {% include 'snippets/stars.html' with rating=status.rating %}
+                    <a href="{{ status.book.local_path }}">{{ status.book|book_title }}</a>{% if status.status_type == 'Rating' %}: {% include 'snippets/stars.html' with rating=status.rating %}
                     <span
                         itemprop="reviewRating"
                         itemscope
@@ -59,7 +59,7 @@
 
                         {% if status.book %}
                             {% if status.status_type == 'GeneratedNote' or status.status_type == 'Rating' %}
-                                <a href="{{ status.book.local_path }}">{{ status.book|title }}</a>{% if status.status_type == 'Rating' %}:
+                                <a href="{{ status.book.local_path }}">{{ status.book|book_title }}</a>{% if status.status_type == 'Rating' %}:
                                 <span
                                     itemprop="reviewRating"
                                     itemscope
@@ -78,7 +78,7 @@
                             {% endif %}
                         {% elif status.mention_books %}
                             <a href="{{ status.mention_books.first.local_path }}">
-                                {{ status.mention_books.first.title }}
+                                {{ status.mention_books.first|book_title }}
                             </a>
                         {% endif %}
                     {% include 'snippets/stars.html' with rating=status.rating %}
@@ -87,7 +87,7 @@
                     {% include 'snippets/book_titleby.html' with book=status.book %}
                 {% endif %}
             {% elif status.mention_books %}
-                <a href="{{ status.mention_books.first.local_path }}">{{ status.mention_books.first|title }}</a>
+                <a href="{{ status.mention_books.first.local_path }}">{{ status.mention_books.first|book_title }}</a>
             {% endif %}
 
         </h3>
diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py
index f828397e..68befa54 100644
--- a/bookwyrm/templatetags/utilities.py
+++ b/bookwyrm/templatetags/utilities.py
@@ -18,7 +18,7 @@ def get_user_identifier(user):
     return user.localname if user.localname else user.username
 
 
-@register.filter(name="title")
+@register.filter(name="book_title")
 def get_title(book):
     """display the subtitle if the title is short"""
     if not book:
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 92f2c498..ff835631 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -63,7 +63,7 @@ urlpatterns = [
     ),
     re_path(
         r"^settings/announcements/(?P<announcement_id>\d+)/??$",
-        views.Announcements.as_view(),
+        views.Announcement.as_view(),
         name="settings-announcements",
     ),
     re_path(
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 99fedf36..cd0162b8 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -1,5 +1,5 @@
 """ make sure all our nice views are available """
-from .announcements import Announcements
+from .announcements import Announcements, Announcement
 from .authentication import Login, Register, Logout
 from .author import Author, EditAuthor
 from .block import Block, unblock
diff --git a/bookwyrm/views/announcements.py b/bookwyrm/views/announcements.py
index 318cf856..79e50da9 100644
--- a/bookwyrm/views/announcements.py
+++ b/bookwyrm/views/announcements.py
@@ -1,5 +1,6 @@
 """ make announcements """
 from django.contrib.auth.decorators import login_required, permission_required
+from django.shortcuts import get_object_or_404
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
@@ -29,8 +30,40 @@ class Announcements(View):
         form = forms.AnnouncementForm(request.POST)
         if form.is_valid():
             form.save()
+            # reset the create form
+            form = forms.AnnouncementForm()
         data = {
             "announcements": models.Announcement.objects.all(),
-            "form": forms.AnnouncementForm(),
+            "form": form,
         }
         return TemplateResponse(request, "settings/announcements.html", data)
+
+
+@method_decorator(login_required, name="dispatch")
+@method_decorator(
+    permission_required("bookwyrm.edit_instance_settings", raise_exception=True),
+    name="dispatch",
+)
+class Announcement(View):
+    """delete or edit an announcement"""
+
+    def get(self, request, announcement_id):
+        """view announcement"""
+        announcement = get_object_or_404(models.Announcement, id=announcement_id)
+        data = {
+            "announcement": announcement,
+            "form": forms.AnnouncementForm(instance=announcement),
+        }
+        return TemplateResponse(request, "settings/announcement.html", data)
+
+    def post(self, request, announcement_id):
+        """edit the site settings"""
+        announcement = get_object_or_404(models.Announcement, id=announcement_id)
+        form = forms.AnnouncementForm(request.POST, instance=announcement)
+        if form.is_valid():
+            form.save()
+        data = {
+            "announcements": models.Announcement.objects.all(),
+            "form": form,
+        }
+        return TemplateResponse(request, "settings/announcement.html", data)

From 3d70a36d86f6f114c9e3ee8204bf26e449024db5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 May 2021 08:56:17 -0700
Subject: [PATCH 1163/1285] Editable announcement

---
 bookwyrm/templates/book/book_identifiers.html |   1 -
 bookwyrm/templates/settings/announcement.html |  49 +++++++-
 .../templates/settings/announcement_form.html | 116 +++++++++---------
 .../templates/settings/announcements.html     |   4 +-
 .../templates/settings/federated_server.html  |   2 +-
 bookwyrm/views/announcements.py               |   4 +-
 6 files changed, 104 insertions(+), 72 deletions(-)

diff --git a/bookwyrm/templates/book/book_identifiers.html b/bookwyrm/templates/book/book_identifiers.html
index d71ea409..6021d243 100644
--- a/bookwyrm/templates/book/book_identifiers.html
+++ b/bookwyrm/templates/book/book_identifiers.html
@@ -1,5 +1,4 @@
 {% spaceless %}
-
 {% load i18n %}
 
 <dl>
diff --git a/bookwyrm/templates/settings/announcement.html b/bookwyrm/templates/settings/announcement.html
index 57b4d167..9c367fa6 100644
--- a/bookwyrm/templates/settings/announcement.html
+++ b/bookwyrm/templates/settings/announcement.html
@@ -1,22 +1,59 @@
 {% extends 'settings/admin_layout.html' %}
-{% load i18n %}
+{% load i18n %}{% load humanize %}
 {% block title %}{% trans "Announcement" %} - {{ announcement.preview }}{% endblock %}
 
-{% block header %}{% trans "Announcement" %}{% endblock %}
+{% block header %}
+{% trans "Announcement" %}
+<a href="{% url 'settings-announcements' %}" class="has-text-weight-normal help">{% trans "Back to list" %}</a>
+{% endblock %}
 
 {% block edit-button %}
 {% trans "Edit Announcement" as button_text %}
-{% include 'snippets/toggle/open_button.html' with controls_text="create-announcement" icon_with_text="plus" text=button_text focus="create-announcement-header" %}
+{% include 'snippets/toggle/open_button.html' with controls_text="edit-announcement" icon_with_text="plus" text=button_text focus="edit-announcement-header" %}
 </a>
 {% endblock %}
 
 {% block panel %}
 
-<div class="block">
-    {% include 'settings/announcement_form.html' with controls_text="create-announcement" %}
-</div>
+<form name="edit-announcement" method="post" action="{% url 'settings-announcements' announcement.id %}" class="block">
+    {% include 'settings/announcement_form.html' with controls_text="edit-announcement" %}
+</form>
 
 <div class="block content">
+    <dl>
+        <div class="is-flex notification pt-1 pb-1 mb-0 {% if announcement in active_announcements %}is-success{% else %}is-danger{% endif %}">
+            <dt class="mr-1 has-text-weight-bold">{% trans "Visible:" %}</dt>
+            <dd>
+                {% if announcement in active_announcements %}
+                {% trans "True" %}
+                {% else %}
+                {% trans "False" %}
+                {% endif %}
+            </dd>
+        </div>
+
+        {% if announcement.start_date %}
+        <div class="is-flex notificationi pt-1 pb-1 mb-0 has-background-white">
+            <dt class="mr-1 has-text-weight-bold">{% trans "Start date:" %}</dt>
+            <dd>{{ announcement.start_date|naturalday }}</dd>
+        </div>
+        {% endif %}
+
+        {% if announcement.end_date %}
+        <div class="is-flex notification pt-1 pb-1 mb-0 has-background-white">
+            <dt class="mr-1 has-text-weight-bold">{% trans "End date:" %}</dt>
+            <dd>{{ announcement.end_date|naturalday }}</dd>
+        </div>
+        {% endif %}
+
+        <div class="is-flex notification pt-1 pb-1 has-background-white">
+            <dt class="mr-1 has-text-weight-bold">{% trans "Active:" %}</dt>
+            <dd>{{ announcement.active }}</dd>
+        </div>
+    </dl>
+
+    <hr aria-hidden="true">
+
     {% include 'snippets/announcement.html' with announcement=announcement pressed=True %}
 </div>
 
diff --git a/bookwyrm/templates/settings/announcement_form.html b/bookwyrm/templates/settings/announcement_form.html
index 5c05b995..4e2e8f32 100644
--- a/bookwyrm/templates/settings/announcement_form.html
+++ b/bookwyrm/templates/settings/announcement_form.html
@@ -6,67 +6,63 @@
 {% endblock %}
 
 {% block form %}
-<form name="create-announcement" method="post" action="{% url 'settings-announcements' %}">
-<form name="create-announcement" method="post" action="/settings/announcements">
-    {% csrf_token %}
-    <input type="hidden" name="user" value="{{ request.user.id }}">
-    <p>
-        <label class="label" for="id_preview">Preview:</label>
-        {{ form.preview }}
-        {% for error in form.preview.errors %}
-        <p class="help is-danger">{{ error | escape }}</p>
-        {% endfor %}
-    </p>
-    <p>
-        <label class="label" for="id_content">Content:</label>
-        {{ form.content }}
-        {% for error in form.content.errors %}
-        <p class="help is-danger">{{ error | escape }}</p>
-        {% endfor %}
-    </p>
-    <p>
-        <label class="label" for="id_event_date">Event date:</label>
-        <input type="date" name="event_date" value="{{ form.event_date.value }}" class="input" id="id_event_date">
-        {% for error in form.event_date.errors %}
-        <p class="help is-danger">{{ error | escape }}</p>
-        {% endfor %}
-    </p>
-    <hr aria-hidden="true">
-    <div class="columns">
-        <div class="column">
-            <p>
-                <label class="label" for="id_start_date">Start date:</label>
-                <input type="date" name="start_date" class="input" id="id_start_date">
-                {% for error in form.start_date.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
-            </p>
-        </div>
-        <div class="column">
-            <p>
-                <label class="label" for="id_end_date">End date:</label>
-                <input type="date" name="end_date" class="input" id="id_end_date">
-                {% for error in form.end_date.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
-            </p>
-        </div>
-        <div class="column is-narrow">
-            <p>
-                <label class="label" for="id_active">Active:</label>
-                {{ form.active }}
-                {% for error in form.active.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
-            </p>
-        </div>
+{% csrf_token %}
+<input type="hidden" name="user" value="{{ request.user.id }}">
+<p>
+    <label class="label" for="id_preview">Preview:</label>
+    {{ form.preview }}
+    {% for error in form.preview.errors %}
+    <p class="help is-danger">{{ error | escape }}</p>
+    {% endfor %}
+</p>
+<p>
+    <label class="label" for="id_content">Content:</label>
+    {{ form.content }}
+    {% for error in form.content.errors %}
+    <p class="help is-danger">{{ error | escape }}</p>
+    {% endfor %}
+</p>
+<p>
+    <label class="label" for="id_event_date">Event date:</label>
+    <input type="date" name="event_date" value="{{ form.event_date.value }}" class="input" id="id_event_date">
+    {% for error in form.event_date.errors %}
+    <p class="help is-danger">{{ error | escape }}</p>
+    {% endfor %}
+</p>
+<hr aria-hidden="true">
+<div class="columns">
+    <div class="column">
+        <p>
+            <label class="label" for="id_start_date">Start date:</label>
+            <input type="date" name="start_date" class="input" id="id_start_date">
+            {% for error in form.start_date.errors %}
+            <p class="help is-danger">{{ error | escape }}</p>
+            {% endfor %}
+        </p>
     </div>
+    <div class="column">
+        <p>
+            <label class="label" for="id_end_date">End date:</label>
+            <input type="date" name="end_date" class="input" id="id_end_date">
+            {% for error in form.end_date.errors %}
+            <p class="help is-danger">{{ error | escape }}</p>
+            {% endfor %}
+        </p>
+    </div>
+    <div class="column is-narrow">
+        <p>
+            <label class="label" for="id_active">Active:</label>
+            {{ form.active }}
+            {% for error in form.active.errors %}
+            <p class="help is-danger">{{ error | escape }}</p>
+            {% endfor %}
+        </p>
+    </div>
+</div>
 
-    <div class="field has-addons">
-        <div class="control">
-            <button type="submit" class="button is-primary">{% trans "Save" %}</button>
-        </div>
+<div class="field has-addons">
+    <div class="control">
+        <button type="submit" class="button is-primary">{% trans "Save" %}</button>
     </div>
-</form>
+</div>
 {% endblock %}
-
diff --git a/bookwyrm/templates/settings/announcements.html b/bookwyrm/templates/settings/announcements.html
index f5117f2f..d1396179 100644
--- a/bookwyrm/templates/settings/announcements.html
+++ b/bookwyrm/templates/settings/announcements.html
@@ -11,9 +11,9 @@
 {% endblock %}
 
 {% block panel %}
-<div class="block">
+<form name="create-announcement" method="post" action="{% url 'settings-announcements' %}" class="block">
     {% include 'settings/announcement_form.html' with controls_text="create-announcement" %}
-</div>
+</form>
 
 <table class="table is-striped">
     <tr>
diff --git a/bookwyrm/templates/settings/federated_server.html b/bookwyrm/templates/settings/federated_server.html
index 9e00f92b..b10f8501 100644
--- a/bookwyrm/templates/settings/federated_server.html
+++ b/bookwyrm/templates/settings/federated_server.html
@@ -10,7 +10,7 @@
 {% if server.status == "blocked" %}<span class="icon icon-x has-text-danger is-size-5" title="{% trans 'Blocked' %}"><span class="is-sr-only">{% trans "Blocked" %}</span></span>
 {% endif %}
 
-<a href="{% url 'settings-federation' %}" class="has-text-weight-normal help">{% trans "Back to server list" %}</a>
+<a href="{% url 'settings-federation' %}" class="has-text-weight-normal help">{% trans "Back to list" %}</a>
 {% endblock %}
 
 {% block panel %}
diff --git a/bookwyrm/views/announcements.py b/bookwyrm/views/announcements.py
index 79e50da9..8ea5952c 100644
--- a/bookwyrm/views/announcements.py
+++ b/bookwyrm/views/announcements.py
@@ -61,9 +61,9 @@ class Announcement(View):
         announcement = get_object_or_404(models.Announcement, id=announcement_id)
         form = forms.AnnouncementForm(request.POST, instance=announcement)
         if form.is_valid():
-            form.save()
+            announcement = form.save()
         data = {
-            "announcements": models.Announcement.objects.all(),
+            "announcement": announcement,
             "form": form,
         }
         return TemplateResponse(request, "settings/announcement.html", data)

From 49916a7498d4182734b50970edee0aa8b7231af7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 May 2021 09:43:29 -0700
Subject: [PATCH 1164/1285] Sorting for announcement headers and pagination

---
 bookwyrm/templates/book/book.html             |  4 +--
 .../templates/settings/announcements.html     |  7 +++++-
 bookwyrm/views/announcements.py               | 25 ++++++++++++++++---
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index ff027a3d..fb0a4510 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -1,7 +1,5 @@
 {% extends 'layout.html' %}
-{% load i18n %}
-{% load bookwyrm_tags %}
-{% load humanize %}
+{% load i18n %}{% load bookwyrm_tags %}{% load humanize %}{% load utilities %}
 
 {% block title %}{{ book.title }}{% endblock %}
 
diff --git a/bookwyrm/templates/settings/announcements.html b/bookwyrm/templates/settings/announcements.html
index d1396179..52ede3da 100644
--- a/bookwyrm/templates/settings/announcements.html
+++ b/bookwyrm/templates/settings/announcements.html
@@ -17,7 +17,11 @@
 
 <table class="table is-striped">
     <tr>
-        {% url 'settings-announcements' as url %}
+        <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 %}
@@ -37,6 +41,7 @@
     </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>
diff --git a/bookwyrm/views/announcements.py b/bookwyrm/views/announcements.py
index 8ea5952c..95ba5ed5 100644
--- a/bookwyrm/views/announcements.py
+++ b/bookwyrm/views/announcements.py
@@ -1,14 +1,16 @@
 """ make announcements """
 from django.contrib.auth.decorators import login_required, permission_required
+from django.core.paginator import Paginator
 from django.shortcuts import get_object_or_404
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
 
 from bookwyrm import forms, models
+from bookwyrm.settings import PAGE_LENGTH
 
 
-# pylint: disable= no-self-use
+# pylint: disable=no-self-use
 @method_decorator(login_required, name="dispatch")
 @method_decorator(
     permission_required("bookwyrm.edit_instance_settings", raise_exception=True),
@@ -19,9 +21,24 @@ class Announcements(View):
 
     def get(self, request):
         """view and create announcements"""
+        announcements = models.Announcement.objects
+
+        sort = request.GET.get("sort", "-created_date")
+        sort_fields = [
+            "created_date",
+            "preview",
+            "start_date",
+            "end_date",
+            "active",
+        ]
+        if sort in sort_fields + ["-{:s}".format(f) for f in sort_fields]:
+            announcements = announcements.order_by(sort)
         data = {
-            "announcements": models.Announcement.objects.all(),
+            "announcements": Paginator(announcements, PAGE_LENGTH).get_page(
+                request.GET.get("page")
+            ),
             "form": forms.AnnouncementForm(),
+            "sort": sort,
         }
         return TemplateResponse(request, "settings/announcements.html", data)
 
@@ -33,7 +50,9 @@ class Announcements(View):
             # reset the create form
             form = forms.AnnouncementForm()
         data = {
-            "announcements": models.Announcement.objects.all(),
+            "announcements": Paginator(
+                models.Announcement.objects, PAGE_LENGTH
+            ).get_page(request.GET.get("page")),
             "form": form,
         }
         return TemplateResponse(request, "settings/announcements.html", data)

From b8e9b9f57eeca42c36dac204694fc0f8897bb1cc Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 May 2021 11:46:24 -0700
Subject: [PATCH 1165/1285] Cleans up show/hide behavior

---
 bookwyrm/static/css/bookwyrm.css              |  9 +++++----
 bookwyrm/templates/directory/directory.html   |  4 ----
 bookwyrm/templates/layout.html                |  1 +
 bookwyrm/templates/settings/announcement.html |  2 +-
 bookwyrm/templates/snippets/announcement.html | 19 ++++++++++++++-----
 5 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 8e1aab25..fcb32e21 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -88,10 +88,11 @@ body {
 .transition-y.is-hidden {
     display: block !important;
     visibility: hidden !important;
-    height: 0;
-    width: 0;
-    margin: 0;
-    padding: 0;
+    height: 0 !important;
+    width: 0 !important;
+    margin: 0 !important;
+    padding: 0 !important;
+    overflow: auto;
 }
 
 .transition-x,
diff --git a/bookwyrm/templates/directory/directory.html b/bookwyrm/templates/directory/directory.html
index f97a8481..88a7b15c 100644
--- a/bookwyrm/templates/directory/directory.html
+++ b/bookwyrm/templates/directory/directory.html
@@ -49,7 +49,3 @@
 </div>
 
 {% endblock %}
-
-{% block scripts %}
-<script src="/static/js/localstorage.js"></script>
-{% endblock %}
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 112640fb..2f8001dd 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -238,6 +238,7 @@
     var csrf_token = '{{ csrf_token }}';
 </script>
 <script src="/static/js/bookwyrm.js"></script>
+<script src="/static/js/localstorage.js"></script>
 {% block scripts %}{% endblock %}
 </body>
 </html>
diff --git a/bookwyrm/templates/settings/announcement.html b/bookwyrm/templates/settings/announcement.html
index 9c367fa6..d6a26b75 100644
--- a/bookwyrm/templates/settings/announcement.html
+++ b/bookwyrm/templates/settings/announcement.html
@@ -54,7 +54,7 @@
 
     <hr aria-hidden="true">
 
-    {% include 'snippets/announcement.html' with announcement=announcement pressed=True %}
+    {% include 'snippets/announcement.html' with announcement=announcement pressed=True admin_mode=True %}
 </div>
 
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/announcement.html b/bookwyrm/templates/snippets/announcement.html
index 1d82c07c..f9b48384 100644
--- a/bookwyrm/templates/snippets/announcement.html
+++ b/bookwyrm/templates/snippets/announcement.html
@@ -1,22 +1,31 @@
 {% load humanize %}{% load i18n %}{% load utilities %}
 {% with announcement.id|uuid as uuid %}
-<aside class="notification p-3">
+<aside class="notification mb-1 p-3 is-hidden transition-y"{% if not admin_mode %} data-hide="hide-announcement-{{ announcement.id }}"{% endif %}>
     <div class="columns mb-0">
-        <div class="column">
+        <div class="column pb-0">
             {% if announcement.event_date %}
             <strong>{{ announcement.event_date|naturalday|title }}:</strong>
             {% endif %}
             {{ announcement.preview }}
         </div>
-        <div class="column is-narrow">
+        <div class="column is-narrow pb-0">
             {% trans "Open" as button_text %}
             {% include 'snippets/toggle/open_button.html' with text=button_text controls_text="announcement" class="is-small" controls_uid=uuid icon_with_text="arrow-down" %}
             {% trans "Close" as button_text %}
             {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="announcement" class="is-small" controls_uid=uuid icon_with_text="arrow-up" %}
         </div>
     </div>
-    <div class="box is-shadowless m-0{% if not pressed %} is-hidden{% endif %}" id="announcement-{{ uuid }}">
-        {{ announcement.content|safe }}
+    <div class="mb-2 mt-2 {% if not pressed %}is-hidden{% endif %}" id="announcement-{{ uuid }}">
+        <div class="box is-shadowless mb-0">
+            {{ announcement.content|safe }}
+        </div>
+    </div>
+    <div class="is-flex mt-0 help">
+        <p>{% blocktrans with user_path=announcement.user.local_path username=announcement.user.display_name %}Posted by <a href="{{ user_path }}">{{ username }}</a>{% endblocktrans %}</p>
+        {% if not admin_mode %}
+        <span class="mr-2 ml-2" aria-hidden="true">&middot;</span>
+        <a class="set-display" data-id="hide-announcement-{{ announcement.id }}" data-value="true">{% trans "Dismiss message" %}</a>
+        {% endif %}
     </div>
 </aside>
 {% endwith %}

From a415991e96e058d9816b1c5d236864be644ebb31 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 May 2021 11:56:26 -0700
Subject: [PATCH 1166/1285] Fixes clashing filter names in templates

---
 bookwyrm/templates/book/editions.html      | 8 ++++----
 bookwyrm/templates/book/format_filter.html | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/templates/book/editions.html b/bookwyrm/templates/book/editions.html
index 17d5474c..0d5c1044 100644
--- a/bookwyrm/templates/book/editions.html
+++ b/bookwyrm/templates/book/editions.html
@@ -1,11 +1,11 @@
 {% extends 'layout.html' %}
-{% load i18n %}
+{% load i18n %}{% load utilities %}
 
-{% block title %}{% blocktrans with book_title=work.title %}Editions of {{ book_title }}{% endblocktrans %}{% endblock %}
+{% block title %}{% blocktrans with book_title=work|book_title %}Editions of {{ book_title }}{% endblocktrans %}{% endblock %}
 
 {% block content %}
 <div class="block">
-    <h1 class="title">{% blocktrans with work_path=work.local_path work_title=work.title %}Editions of <a href="{{ work_path }}">"{{ work_title }}"</a>{% endblocktrans %}</h1>
+    <h1 class="title">{% blocktrans with work_path=work.local_path work_title=work|book_title %}Editions of <a href="{{ work_path }}">"{{ work_title }}"</a>{% endblocktrans %}</h1>
 </div>
 
 {% include 'book/edition_filters.html' %}
@@ -22,7 +22,7 @@
         <div class="column my-3-mobile ml-3-tablet mr-auto">
             <h2 class="title is-5 mb-1">
                 <a href="{{ book.local_path }}" class="has-text-black">
-                    {{ book.title }}
+                    {{ book|book_title }}
                 </a>
             </h2>
 
diff --git a/bookwyrm/templates/book/format_filter.html b/bookwyrm/templates/book/format_filter.html
index 4280ebac..f8636522 100644
--- a/bookwyrm/templates/book/format_filter.html
+++ b/bookwyrm/templates/book/format_filter.html
@@ -1,5 +1,5 @@
 {% extends 'snippets/filters_panel/filter_field.html' %}
-{% load i18n %}
+{% load i18n %}{% load utilities %}
 
 {% block filter %}
 <label class="label is-block" for="id_format">{% trans "Format:" %}</label>

From 2e193aa3c6b008cb927e6f32097aad130a4f8414 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 May 2021 12:08:12 -0700
Subject: [PATCH 1167/1285] Delete announcements

---
 bookwyrm/templates/settings/announcement.html | 14 ++++++++++++--
 bookwyrm/templates/snippets/announcement.html |  5 ++++-
 bookwyrm/urls.py                              |  7 ++++++-
 bookwyrm/views/__init__.py                    |  2 +-
 bookwyrm/views/announcements.py               | 15 ++++++++++++---
 5 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/bookwyrm/templates/settings/announcement.html b/bookwyrm/templates/settings/announcement.html
index d6a26b75..d276d17c 100644
--- a/bookwyrm/templates/settings/announcement.html
+++ b/bookwyrm/templates/settings/announcement.html
@@ -9,8 +9,18 @@
 
 {% block edit-button %}
 {% trans "Edit Announcement" as button_text %}
-{% include 'snippets/toggle/open_button.html' with controls_text="edit-announcement" icon_with_text="plus" text=button_text focus="edit-announcement-header" %}
-</a>
+<div class="field has-addons">
+    <div class="control">
+        {% include 'snippets/toggle/open_button.html' with controls_text="edit-announcement" icon_with_text="pencil" text=button_text focus="edit-announcement-header" %}
+    </div>
+    <form class="control" action="{% url 'settings-announcements-delete' announcement.id %}" method="post">
+        {% csrf_token %}
+        <button type="submit" class="button is-danger">
+            <span class="icon icon-x" aria-hidden="true"></span>
+            <span>{% trans "Delete" %}</span>
+        </button>
+    </form>
+</div>
 {% endblock %}
 
 {% block panel %}
diff --git a/bookwyrm/templates/snippets/announcement.html b/bookwyrm/templates/snippets/announcement.html
index f9b48384..ee00cfd7 100644
--- a/bookwyrm/templates/snippets/announcement.html
+++ b/bookwyrm/templates/snippets/announcement.html
@@ -1,6 +1,9 @@
 {% load humanize %}{% load i18n %}{% load utilities %}
 {% with announcement.id|uuid as uuid %}
-<aside class="notification mb-1 p-3 is-hidden transition-y"{% if not admin_mode %} data-hide="hide-announcement-{{ announcement.id }}"{% endif %}>
+<aside
+    class="notification mb-1 p-3{% if not admin_mode %} is-hidden{% endif %} transition-y"
+    {% if not admin_mode %}data-hide="hide-announcement-{{ announcement.id }}"{% endif %}
+>
     <div class="columns mb-0">
         <div class="column pb-0">
             {% if announcement.event_date %}
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index ff835631..cca9396f 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -62,10 +62,15 @@ urlpatterns = [
         name="settings-announcements",
     ),
     re_path(
-        r"^settings/announcements/(?P<announcement_id>\d+)/??$",
+        r"^settings/announcements/(?P<announcement_id>\d+)/?$",
         views.Announcement.as_view(),
         name="settings-announcements",
     ),
+    re_path(
+        r"^settings/announcements/(?P<announcement_id>\d+)/delete/?$",
+        views.delete_announcement,
+        name="settings-announcements-delete",
+    ),
     re_path(
         r"^settings/email-preview/?$",
         views.site.email_preview,
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index cd0162b8..8bfaa7da 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -1,5 +1,5 @@
 """ make sure all our nice views are available """
-from .announcements import Announcements, Announcement
+from .announcements import Announcements, Announcement, delete_announcement
 from .authentication import Login, Register, Logout
 from .author import Author, EditAuthor
 from .block import Block, unblock
diff --git a/bookwyrm/views/announcements.py b/bookwyrm/views/announcements.py
index 95ba5ed5..3f38f7af 100644
--- a/bookwyrm/views/announcements.py
+++ b/bookwyrm/views/announcements.py
@@ -1,7 +1,7 @@
 """ make announcements """
 from django.contrib.auth.decorators import login_required, permission_required
 from django.core.paginator import Paginator
-from django.shortcuts import get_object_or_404
+from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
@@ -64,7 +64,7 @@ class Announcements(View):
     name="dispatch",
 )
 class Announcement(View):
-    """delete or edit an announcement"""
+    """edit an announcement"""
 
     def get(self, request, announcement_id):
         """view announcement"""
@@ -76,7 +76,7 @@ class Announcement(View):
         return TemplateResponse(request, "settings/announcement.html", data)
 
     def post(self, request, announcement_id):
-        """edit the site settings"""
+        """edit announcement"""
         announcement = get_object_or_404(models.Announcement, id=announcement_id)
         form = forms.AnnouncementForm(request.POST, instance=announcement)
         if form.is_valid():
@@ -86,3 +86,12 @@ class Announcement(View):
             "form": form,
         }
         return TemplateResponse(request, "settings/announcement.html", data)
+
+
+@login_required
+@permission_required("bookwyrm.edit_instance_settings", raise_exception=True)
+def delete_announcement(_, announcement_id):
+    """delete announcement"""
+    announcement = get_object_or_404(models.Announcement, id=announcement_id)
+    announcement.delete()
+    return redirect("settings-announcements")

From 44e8db3f336495518b23966584f2975ece60fcef Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 May 2021 12:12:11 -0700
Subject: [PATCH 1168/1285] Adds view test for announcements admin page

---
 bookwyrm/tests/views/test_announcements.py | 50 ++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 bookwyrm/tests/views/test_announcements.py

diff --git a/bookwyrm/tests/views/test_announcements.py b/bookwyrm/tests/views/test_announcements.py
new file mode 100644
index 00000000..88dd7eca
--- /dev/null
+++ b/bookwyrm/tests/views/test_announcements.py
@@ -0,0 +1,50 @@
+""" test for app action functionality """
+from django.template.response import TemplateResponse
+from django.test import TestCase
+from django.test.client import RequestFactory
+
+from bookwyrm import forms, models, views
+
+
+class AnnouncementViews(TestCase):
+    """every response to a get request, html or json"""
+
+    def setUp(self):
+        """we need basic test data and mocks"""
+        self.factory = RequestFactory()
+        self.local_user = models.User.objects.create_user(
+            "mouse@local.com",
+            "mouse@mouse.mouse",
+            "password",
+            local=True,
+            localname="mouse",
+        )
+        models.SiteSettings.objects.create()
+
+    def test_announcements_page(self):
+        """there are so many views, this just makes sure it LOADS"""
+        models.Announcement.objects.create(preview="hi", user=self.local_user)
+
+        view = views.Announcements.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+        request.user.is_superuser = True
+
+        result = view(request)
+
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+
+    def test_announcements_page_empty(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.Announcements.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+        request.user.is_superuser = True
+
+        result = view(request)
+
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)

From fdb315d2acb8b89bd15ae696dfb2f33a59ddb39b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 May 2021 12:14:57 -0700
Subject: [PATCH 1169/1285] Adds individual announcement page test

---
 bookwyrm/tests/views/test_announcements.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/bookwyrm/tests/views/test_announcements.py b/bookwyrm/tests/views/test_announcements.py
index 88dd7eca..d9999d5a 100644
--- a/bookwyrm/tests/views/test_announcements.py
+++ b/bookwyrm/tests/views/test_announcements.py
@@ -48,3 +48,18 @@ class AnnouncementViews(TestCase):
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
+
+    def test_announcement_page(self):
+        """there are so many views, this just makes sure it LOADS"""
+        announcement = models.Announcement.objects.create(preview="hi", user=self.local_user)
+
+        view = views.Announcements.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+        request.user.is_superuser = True
+
+        result = view(request, announcement.id)
+
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)

From 952eceb2432e9cde0bc41d83220cef340583ab2d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 May 2021 12:15:10 -0700
Subject: [PATCH 1170/1285] Updates locales

---
 locale/de_DE/LC_MESSAGES/django.mo   | Bin 24553 -> 24502 bytes
 locale/de_DE/LC_MESSAGES/django.po   | 429 ++++++++++++++++----------
 locale/en_US/LC_MESSAGES/django.po   | 396 ++++++++++++++----------
 locale/es/LC_MESSAGES/django.mo      | Bin 40709 -> 40665 bytes
 locale/es/LC_MESSAGES/django.po      | 431 +++++++++++++++++----------
 locale/fr_FR/LC_MESSAGES/django.mo   | Bin 40827 -> 40772 bytes
 locale/fr_FR/LC_MESSAGES/django.po   | 431 +++++++++++++++++----------
 locale/zh_Hans/LC_MESSAGES/django.mo | Bin 36647 -> 36590 bytes
 locale/zh_Hans/LC_MESSAGES/django.po | 431 +++++++++++++++++----------
 9 files changed, 1342 insertions(+), 776 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo
index 90bc281759ba7efcf8aafd19283ddea45364b730..089ac656a8b3cf4cdb6fdbabd8127cd33bb6afab 100644
GIT binary patch
delta 6885
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
H?g{!o=}-I$

delta 6938
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
I;&7e+0ryi21^@s6

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 7b9a929d..2503b80b 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-14 15:12-0700\n"
+"POT-Creation-Date: 2021-05-20 12:12-0700\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"
@@ -51,33 +51,33 @@ msgstr "%(count)d Benutzungen"
 msgid "Unlimited"
 msgstr "Ungelistet"
 
-#: bookwyrm/forms.py:293
+#: bookwyrm/forms.py:299
 msgid "List Order"
 msgstr ""
 
-#: bookwyrm/forms.py:294
+#: bookwyrm/forms.py:300
 #, fuzzy
 #| msgid "Title"
 msgid "Book Title"
 msgstr "Titel"
 
-#: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:34
+#: bookwyrm/forms.py:301 bookwyrm/templates/snippets/create_status_form.html:34
 #: bookwyrm/templates/user/shelf/shelf.html:84
 #: bookwyrm/templates/user/shelf/shelf.html:115
 msgid "Rating"
 msgstr ""
 
-#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:101
+#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:101
 msgid "Sort By"
 msgstr ""
 
-#: bookwyrm/forms.py:301
+#: bookwyrm/forms.py:307
 #, fuzzy
 #| msgid "Started reading"
 msgid "Ascending"
 msgstr "Zu lesen angefangen"
 
-#: bookwyrm/forms.py:302
+#: bookwyrm/forms.py:308
 #, fuzzy
 #| msgid "Started reading"
 msgid "Descending"
@@ -93,7 +93,7 @@ msgstr "%(value)s ist keine gültige remote_id"
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s ist kein gültiger Username"
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:156
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:155
 msgid "username"
 msgstr "Username"
 
@@ -146,36 +146,36 @@ msgstr "Etwas lief schief. Entschuldigung!"
 msgid "Edit Author"
 msgstr "Autor*in editieren"
 
-#: bookwyrm/templates/author/author.html:33
+#: bookwyrm/templates/author/author.html:32
 #: bookwyrm/templates/author/edit_author.html:38
 msgid "Aliases:"
 msgstr ""
 
-#: bookwyrm/templates/author/author.html:39
+#: bookwyrm/templates/author/author.html:38
 msgid "Born:"
 msgstr ""
 
-#: bookwyrm/templates/author/author.html:45
+#: bookwyrm/templates/author/author.html:44
 msgid "Died:"
 msgstr ""
 
-#: bookwyrm/templates/author/author.html:52
+#: bookwyrm/templates/author/author.html:51
 msgid "Wikipedia"
 msgstr ""
 
-#: bookwyrm/templates/author/author.html:56
-#: bookwyrm/templates/book/book.html:81
+#: bookwyrm/templates/author/author.html:55
+#: bookwyrm/templates/book/book.html:78
 msgid "View on OpenLibrary"
 msgstr "In OpenLibrary ansehen"
 
-#: bookwyrm/templates/author/author.html:61
-#: bookwyrm/templates/book/book.html:84
+#: bookwyrm/templates/author/author.html:60
+#: bookwyrm/templates/book/book.html:81
 #, fuzzy
 #| msgid "View on OpenLibrary"
 msgid "View on Inventaire"
 msgstr "In OpenLibrary ansehen"
 
-#: bookwyrm/templates/author/author.html:75
+#: bookwyrm/templates/author/author.html:74
 #, python-format
 msgid "Books by %(name)s"
 msgstr "Bücher von %(name)s"
@@ -214,8 +214,9 @@ msgid "Name:"
 msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:40
-#: bookwyrm/templates/book/edit_book.html:128
-#: bookwyrm/templates/book/edit_book.html:165
+#: bookwyrm/templates/book/edit_book.html:132
+#: bookwyrm/templates/book/edit_book.html:141
+#: bookwyrm/templates/book/edit_book.html:178
 #, fuzzy
 #| msgid "Separate multiple publishers with commas."
 msgid "Separate multiple values with commas."
@@ -242,11 +243,11 @@ msgid "Author Identifiers"
 msgstr "Autor*innenidentifikatoren"
 
 #: bookwyrm/templates/author/edit_author.html:74
-#: bookwyrm/templates/book/edit_book.html:223
 msgid "Openlibrary key:"
 msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:79
+#: bookwyrm/templates/book/edit_book.html:243
 #, fuzzy
 #| msgid "View on OpenLibrary"
 msgid "Inventaire ID:"
@@ -261,12 +262,13 @@ msgid "Goodreads key:"
 msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:98
-#: bookwyrm/templates/book/book.html:127
-#: bookwyrm/templates/book/edit_book.html:241
+#: bookwyrm/templates/book/book.html:124
+#: bookwyrm/templates/book/edit_book.html:263
 #: bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
+#: bookwyrm/templates/settings/announcement_form.html:65
 #: bookwyrm/templates/settings/edit_server.html:68
-#: bookwyrm/templates/settings/federated_server.html:94
+#: bookwyrm/templates/settings/federated_server.html:98
 #: bookwyrm/templates/settings/site.html:97
 #: bookwyrm/templates/snippets/readthrough.html:77
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
@@ -277,11 +279,11 @@ msgid "Save"
 msgstr "Speichern"
 
 #: bookwyrm/templates/author/edit_author.html:99
-#: bookwyrm/templates/book/book.html:128 bookwyrm/templates/book/book.html:180
+#: bookwyrm/templates/book/book.html:125 bookwyrm/templates/book/book.html:174
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:242
+#: bookwyrm/templates/book/edit_book.html:264
 #: bookwyrm/templates/moderation/report_modal.html:34
-#: bookwyrm/templates/settings/federated_server.html:95
+#: bookwyrm/templates/settings/federated_server.html:99
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
 #: bookwyrm/templates/snippets/readthrough.html:78
@@ -292,115 +294,111 @@ msgstr "Speichern"
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: bookwyrm/templates/book/book.html:33
+#: bookwyrm/templates/book/book.html:31
 #: bookwyrm/templates/discover/large-book.html:25
 #: bookwyrm/templates/discover/small-book.html:19
 msgid "by"
 msgstr "von"
 
-#: bookwyrm/templates/book/book.html:41 bookwyrm/templates/book/book.html:42
+#: bookwyrm/templates/book/book.html:39 bookwyrm/templates/book/book.html:40
 msgid "Edit Book"
 msgstr "Buch editieren"
 
-#: bookwyrm/templates/book/book.html:60
+#: bookwyrm/templates/book/book.html:57
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "Cover hinzufügen"
 
-#: bookwyrm/templates/book/book.html:64
+#: bookwyrm/templates/book/book.html:61
 #, fuzzy
 #| msgid "Failed to load"
 msgid "Failed to load cover"
 msgstr "Laden fehlgeschlagen"
 
-#: bookwyrm/templates/book/book.html:104
+#: bookwyrm/templates/book/book.html:101
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s Bewertung)"
 msgstr[1] "(%(review_count)s Bewertungen)"
 
-#: bookwyrm/templates/book/book.html:116
+#: bookwyrm/templates/book/book.html:113
 msgid "Add Description"
 msgstr "Beschreibung hinzufügen"
 
-#: bookwyrm/templates/book/book.html:123
-#: bookwyrm/templates/book/edit_book.html:107
+#: bookwyrm/templates/book/book.html:120
+#: bookwyrm/templates/book/edit_book.html:108
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: bookwyrm/templates/book/book.html:137
+#: bookwyrm/templates/book/book.html:134
 #, fuzzy, python-format
 #| msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s\">%(title)s</a> von"
 
-#: bookwyrm/templates/book/book.html:145
+#: bookwyrm/templates/book/book.html:142
 #, fuzzy, python-format
 #| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/book/book.html:151
+#: bookwyrm/templates/book/book.html:148
 #, fuzzy, python-format
 #| msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr "hat <em><a href=\"%(book_path)s\">%(book_title)s</a></em> zu deiner Liste \"<a href=\"%(list_path)s\">%(list_name)s</a>\" Hinzugefügt"
 
-#: bookwyrm/templates/book/book.html:162
+#: bookwyrm/templates/book/book.html:159
 msgid "Your reading activity"
 msgstr "Deine Leseaktivität"
 
-#: bookwyrm/templates/book/book.html:165
+#: bookwyrm/templates/book/book.html:162
 msgid "Add read dates"
 msgstr "Lesedaten hinzufügen"
 
-#: bookwyrm/templates/book/book.html:170
-msgid "You don't have any reading activity for this book."
-msgstr "Du hast keine Leseaktivität für dieses Buch."
-
-#: bookwyrm/templates/book/book.html:177
+#: bookwyrm/templates/book/book.html:171
 msgid "Create"
 msgstr "Erstellen"
 
-#: bookwyrm/templates/book/book.html:203
+#: bookwyrm/templates/book/book.html:181
+msgid "You don't have any reading activity for this book."
+msgstr "Du hast keine Leseaktivität für dieses Buch."
+
+#: bookwyrm/templates/book/book.html:200
 #, fuzzy
 #| msgid "Review"
 msgid "Reviews"
 msgstr "Bewerten"
 
-#: bookwyrm/templates/book/book.html:208
+#: bookwyrm/templates/book/book.html:205
 #, fuzzy
 #| msgid "Your shelves"
 msgid "Your reviews"
 msgstr "Deine Regale"
 
-#: bookwyrm/templates/book/book.html:214
+#: bookwyrm/templates/book/book.html:211
 #, fuzzy
 #| msgid "Your Account"
 msgid "Your comments"
 msgstr "Dein Account"
 
-#: bookwyrm/templates/book/book.html:220
+#: bookwyrm/templates/book/book.html:217
 #, fuzzy
 #| msgid "Your books"
 msgid "Your quotes"
 msgstr "Deine Bücher"
 
-#: bookwyrm/templates/book/book.html:255
-msgid "rated it"
-msgstr "bewertet"
-
-#: bookwyrm/templates/book/book.html:276
+#: bookwyrm/templates/book/book.html:253
 msgid "Subjects"
 msgstr "Themen"
 
-#: bookwyrm/templates/book/book.html:288
+#: bookwyrm/templates/book/book.html:265
 msgid "Places"
 msgstr "Orte"
 
-#: bookwyrm/templates/book/book.html:299 bookwyrm/templates/layout.html:65
+#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
@@ -408,41 +406,41 @@ msgstr "Orte"
 msgid "Lists"
 msgstr "Listen"
 
-#: bookwyrm/templates/book/book.html:310
+#: bookwyrm/templates/book/book.html:287
 #, fuzzy
 #| msgid "Go to list"
 msgid "Add to list"
 msgstr "Zur Liste"
 
-#: bookwyrm/templates/book/book.html:320
+#: bookwyrm/templates/book/book.html:297
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:164
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: bookwyrm/templates/book/book_identifiers.html:8
+#: bookwyrm/templates/book/book_identifiers.html:7
 msgid "ISBN:"
 msgstr ""
 
-#: bookwyrm/templates/book/book_identifiers.html:15
-#: bookwyrm/templates/book/edit_book.html:227
+#: bookwyrm/templates/book/book_identifiers.html:14
+#: bookwyrm/templates/book/edit_book.html:248
 msgid "OCLC Number:"
 msgstr "OCLC Nummer:"
 
-#: bookwyrm/templates/book/book_identifiers.html:22
-#: bookwyrm/templates/book/edit_book.html:231
+#: bookwyrm/templates/book/book_identifiers.html:21
+#: bookwyrm/templates/book/edit_book.html:253
 msgid "ASIN:"
 msgstr ""
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:179
+#: bookwyrm/templates/book/edit_book.html:192
 #, fuzzy
 #| msgid "Add cover"
 msgid "Upload cover:"
 msgstr "Cover hinzufügen"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:185
+#: bookwyrm/templates/book/edit_book.html:198
 msgid "Load cover from url:"
 msgstr "Cover von URL laden:"
 
@@ -502,88 +500,98 @@ msgstr "Bestätigen"
 msgid "Back"
 msgstr "Zurück"
 
-#: bookwyrm/templates/book/edit_book.html:92
+#: bookwyrm/templates/book/edit_book.html:93
 msgid "Title:"
 msgstr "Titel:"
 
-#: bookwyrm/templates/book/edit_book.html:100
+#: bookwyrm/templates/book/edit_book.html:101
 msgid "Subtitle:"
 msgstr "Untertitel:"
 
-#: bookwyrm/templates/book/edit_book.html:113
+#: bookwyrm/templates/book/edit_book.html:114
 msgid "Series:"
 msgstr "Serie:"
 
-#: bookwyrm/templates/book/edit_book.html:120
+#: bookwyrm/templates/book/edit_book.html:122
 msgid "Series number:"
 msgstr "Seriennummer:"
 
-#: bookwyrm/templates/book/edit_book.html:126
+#: bookwyrm/templates/book/edit_book.html:130
+#, fuzzy
+#| msgid "Pages:"
+msgid "Languages:"
+msgstr "Seiten:"
+
+#: bookwyrm/templates/book/edit_book.html:139
 #, fuzzy
 #| msgid "Published"
 msgid "Publisher:"
 msgstr "Veröffentlicht"
 
-#: bookwyrm/templates/book/edit_book.html:135
+#: bookwyrm/templates/book/edit_book.html:148
 msgid "First published date:"
 msgstr "Erstveröffentlichungsdatum:"
 
-#: bookwyrm/templates/book/edit_book.html:143
+#: bookwyrm/templates/book/edit_book.html:156
 msgid "Published date:"
 msgstr "Veröffentlichungsdatum:"
 
-#: bookwyrm/templates/book/edit_book.html:152
+#: bookwyrm/templates/book/edit_book.html:165
 #, fuzzy
 #| msgid "Author"
 msgid "Authors"
 msgstr "Autor*in"
 
-#: bookwyrm/templates/book/edit_book.html:158
+#: bookwyrm/templates/book/edit_book.html:171
 #, fuzzy, python-format
 #| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
 msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/book/edit_book.html:163
+#: bookwyrm/templates/book/edit_book.html:176
 #, fuzzy
 #| msgid "Edit Author"
 msgid "Add Authors:"
 msgstr "Autor*in editieren"
 
-#: bookwyrm/templates/book/edit_book.html:164
+#: bookwyrm/templates/book/edit_book.html:177
 msgid "John Doe, Jane Smith"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:170
+#: bookwyrm/templates/book/edit_book.html:183
 #: bookwyrm/templates/user/shelf/shelf.html:77
 msgid "Cover"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:198
+#: bookwyrm/templates/book/edit_book.html:211
 msgid "Physical Properties"
 msgstr "Physikalische Eigenschaften"
 
-#: bookwyrm/templates/book/edit_book.html:199
+#: bookwyrm/templates/book/edit_book.html:212
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:207
+#: bookwyrm/templates/book/edit_book.html:220
 msgid "Pages:"
 msgstr "Seiten:"
 
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:227
 msgid "Book Identifiers"
 msgstr "Buchidentifikatoren"
 
-#: bookwyrm/templates/book/edit_book.html:215
+#: bookwyrm/templates/book/edit_book.html:228
 msgid "ISBN 13:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:219
+#: bookwyrm/templates/book/edit_book.html:233
 msgid "ISBN 10:"
 msgstr ""
 
+#: bookwyrm/templates/book/edit_book.html:238
+msgid "Openlibrary ID:"
+msgstr ""
+
 #: bookwyrm/templates/book/editions.html:4
 #, python-format
 msgid "Editions of %(book_title)s"
@@ -640,12 +648,17 @@ msgstr "Veröffentlichungsdatum:"
 msgid "Published by %(publisher)s."
 msgstr "Veröffentlicht von %(publisher)s."
 
+#: bookwyrm/templates/book/rating.html:13
+msgid "rated it"
+msgstr "bewertet"
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
 #: bookwyrm/templates/feed/feed_layout.html:69
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
 #: bookwyrm/templates/search/book.html:32
+#: bookwyrm/templates/snippets/announcement.html:17
 msgid "Close"
 msgstr "Schließen"
 
@@ -675,7 +688,7 @@ msgstr "Föderiert"
 
 #: bookwyrm/templates/directory/directory.html:4
 #: bookwyrm/templates/directory/directory.html:9
-#: bookwyrm/templates/layout.html:93
+#: bookwyrm/templates/layout.html:92
 msgid "Directory"
 msgstr ""
 
@@ -690,6 +703,7 @@ msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings
 msgstr "Du kannst dein Leseziel jederzeit auf deiner <a href=\"%(path)s\">Profilseite</a> setzen oder ändern."
 
 #: bookwyrm/templates/directory/directory.html:29
+#: bookwyrm/templates/snippets/announcement.html:30
 #: bookwyrm/templates/snippets/goal_card.html:22
 msgid "Dismiss message"
 msgstr "Nachricht verwerfen"
@@ -788,7 +802,7 @@ msgid "Join %(name)s"
 msgstr "Tritt %(name)s bei"
 
 #: bookwyrm/templates/discover/landing_layout.html:51
-#: bookwyrm/templates/login.html:48
+#: bookwyrm/templates/login.html:51
 msgid "This instance is closed"
 msgstr "Diese Instanz ist geschlossen"
 
@@ -888,7 +902,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:88
+#: bookwyrm/templates/layout.html:87
 msgid "Direct Messages"
 msgstr "Direktnachrichten"
 
@@ -946,7 +960,7 @@ msgid "Updates"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:10
-#: bookwyrm/templates/layout.html:59
+#: bookwyrm/templates/layout.html:58
 #: bookwyrm/templates/user/shelf/books_header.html:3
 msgid "Your books"
 msgstr "Deine Bücher"
@@ -1027,7 +1041,7 @@ msgstr ""
 #: bookwyrm/templates/get_started/books.html:17
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
-#: bookwyrm/templates/layout.html:38 bookwyrm/templates/layout.html:39
+#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
 #: bookwyrm/templates/lists/list.html:124
 #: bookwyrm/templates/search/layout.html:4
 #: bookwyrm/templates/search/layout.html:9
@@ -1170,7 +1184,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "%(username)ss %(year)s Bücher"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/layout.html:98
+#: bookwyrm/templates/layout.html:97
 msgid "Import Books"
 msgstr "Bücher importieren"
 
@@ -1273,7 +1287,7 @@ msgid "Imported"
 msgstr "Importiert"
 
 #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12
-#: bookwyrm/templates/login.html:43
+#: bookwyrm/templates/login.html:46
 msgid "Create an Account"
 msgstr "Erstelle einen Account"
 
@@ -1298,23 +1312,23 @@ msgstr "Suchergebnisse für \"%(query)s\""
 msgid "Matching Books"
 msgstr "Passende Bücher"
 
-#: bookwyrm/templates/layout.html:34
+#: bookwyrm/templates/layout.html:33
 msgid "Search for a book or user"
 msgstr "Suche nach Buch oder Benutzer*in"
 
-#: bookwyrm/templates/layout.html:48 bookwyrm/templates/layout.html:49
+#: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48
 msgid "Main navigation menu"
 msgstr "Navigationshauptmenü"
 
-#: bookwyrm/templates/layout.html:62
+#: bookwyrm/templates/layout.html:61
 msgid "Feed"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:103
+#: bookwyrm/templates/layout.html:102
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: bookwyrm/templates/layout.html:112
+#: bookwyrm/templates/layout.html:111
 #: bookwyrm/templates/settings/admin_layout.html:31
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
@@ -1322,64 +1336,63 @@ msgstr "Einstellungen"
 msgid "Invites"
 msgstr "Einladungen"
 
-#: bookwyrm/templates/layout.html:119
+#: bookwyrm/templates/layout.html:118
 msgid "Admin"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:126
+#: bookwyrm/templates/layout.html:125
 msgid "Log out"
 msgstr "Abmelden"
 
-#: bookwyrm/templates/layout.html:134 bookwyrm/templates/layout.html:135
+#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: bookwyrm/templates/layout.html:155 bookwyrm/templates/layout.html:159
+#: bookwyrm/templates/layout.html:154 bookwyrm/templates/layout.html:158
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:160
+#: bookwyrm/templates/layout.html:159
 msgid "password"
 msgstr "Passwort"
 
-#: bookwyrm/templates/layout.html:161 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:163 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "Anmelden"
 
-#: bookwyrm/templates/layout.html:172
+#: bookwyrm/templates/layout.html:171
 msgid "Join"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:198
+#: bookwyrm/templates/layout.html:206
 msgid "About this server"
 msgstr "Ãœber diesen Server"
 
-#: bookwyrm/templates/layout.html:202
+#: bookwyrm/templates/layout.html:210
 msgid "Contact site admin"
 msgstr "Admin kontaktieren"
 
-#: bookwyrm/templates/layout.html:206
+#: bookwyrm/templates/layout.html:214
 #, fuzzy
 #| msgid "List curation:"
 msgid "Documentation"
 msgstr "Listenkuratierung:"
 
-#: bookwyrm/templates/layout.html:213
+#: bookwyrm/templates/layout.html:221
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr "%(site_name)s auf <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a> unterstützen"
 
-#: bookwyrm/templates/layout.html:217
-#| msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+#: bookwyrm/templates/layout.html:225
 msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm ist open source Software. Du kannst dich auf <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> beteiligen oder etwas melden."
 
@@ -1452,6 +1465,7 @@ msgstr "Alle können Bücher vorschlagen, du kannst diese bestätigen"
 #: bookwyrm/templates/lists/form.html:31
 #: bookwyrm/templates/moderation/reports.html:25
 #: bookwyrm/templates/search/book.html:30
+#: bookwyrm/templates/snippets/announcement.html:15
 msgid "Open"
 msgstr "Offen"
 
@@ -1546,11 +1560,11 @@ msgstr ""
 msgid "Password:"
 msgstr "Passwort:"
 
-#: bookwyrm/templates/login.html:49
+#: bookwyrm/templates/login.html:52
 msgid "Contact an administrator to get an invite"
 msgstr "Kontaktiere für eine Einladung eine*n Admin"
 
-#: bookwyrm/templates/login.html:59
+#: bookwyrm/templates/login.html:63
 msgid "More about this site"
 msgstr "Mehr über diese Seite"
 
@@ -1916,31 +1930,144 @@ msgid "Instance Settings"
 msgstr "Instanzeinstellungen"
 
 #: bookwyrm/templates/settings/admin_layout.html:48
+#: bookwyrm/templates/settings/announcements.html:3
+#: bookwyrm/templates/settings/announcements.html:5
+msgid "Announcements"
+msgstr "Ankündigungen"
+
+#: bookwyrm/templates/settings/admin_layout.html:52
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr "Seiteneinstellungen"
 
-#: bookwyrm/templates/settings/admin_layout.html:51
+#: bookwyrm/templates/settings/admin_layout.html:55
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr "Instanzinformationen"
 
-#: bookwyrm/templates/settings/admin_layout.html:52
+#: bookwyrm/templates/settings/admin_layout.html:56
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr "Bilder"
 
-#: bookwyrm/templates/settings/admin_layout.html:53
+#: bookwyrm/templates/settings/admin_layout.html:57
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr "Inhalt des Footers"
 
-#: bookwyrm/templates/settings/admin_layout.html:54
+#: bookwyrm/templates/settings/admin_layout.html:58
 #: bookwyrm/templates/settings/site.html:81
 msgid "Registration"
 msgstr "Registrierung"
 
+#: bookwyrm/templates/settings/announcement.html:3
+#: bookwyrm/templates/settings/announcement.html:6
+#, fuzzy
+#| msgid "Announcements"
+msgid "Announcement"
+msgstr "Ankündigungen"
+
+#: bookwyrm/templates/settings/announcement.html:7
+#: bookwyrm/templates/settings/federated_server.html:13
+#, fuzzy
+#| msgid "Back to reports"
+msgid "Back to list"
+msgstr "Zurück zu den Meldungen"
+
+#: bookwyrm/templates/settings/announcement.html:11
+#, fuzzy
+#| msgid "Announcements"
+msgid "Edit Announcement"
+msgstr "Ankündigungen"
+
+#: bookwyrm/templates/settings/announcement.html:20
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
+#: bookwyrm/templates/snippets/follow_request_buttons.html:12
+msgid "Delete"
+msgstr "Löschen"
+
+#: bookwyrm/templates/settings/announcement.html:35
+msgid "Visible:"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcement.html:38
+msgid "True"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcement.html:40
+msgid "False"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcement.html:47
+#, fuzzy
+#| msgid "Birth date:"
+msgid "Start date:"
+msgstr "Geburtsdatum:"
+
+#: bookwyrm/templates/settings/announcement.html:54
+#, fuzzy
+#| msgid "Birth date:"
+msgid "End date:"
+msgstr "Geburtsdatum:"
+
+#: bookwyrm/templates/settings/announcement.html:60
+#, fuzzy
+#| msgid "Activity"
+msgid "Active:"
+msgstr "Aktivität"
+
+#: bookwyrm/templates/settings/announcement_form.html:5
+#: bookwyrm/templates/settings/announcements.html:8
+#, fuzzy
+#| msgid "Announcements"
+msgid "Create Announcement"
+msgstr "Ankündigungen"
+
+#: bookwyrm/templates/settings/announcements.html:22
+#, fuzzy
+#| msgid "Added:"
+msgid "Date added"
+msgstr "Hinzugefügt:"
+
+#: bookwyrm/templates/settings/announcements.html:26
+#, fuzzy
+#| msgid "reviewed"
+msgid "Preview"
+msgstr "bewertete"
+
+#: bookwyrm/templates/settings/announcements.html:30
+#, fuzzy
+#| msgid "Started"
+msgid "Start date"
+msgstr "Gestartet"
+
+#: bookwyrm/templates/settings/announcements.html:34
+#, fuzzy
+#| msgid "Edit read dates"
+msgid "End date"
+msgstr "Lesedaten bearbeiten"
+
+#: bookwyrm/templates/settings/announcements.html:38
+#: bookwyrm/templates/settings/federation.html:30
+#: bookwyrm/templates/settings/manage_invite_requests.html:44
+#: bookwyrm/templates/settings/status_filter.html:5
+#: bookwyrm/templates/user_admin/user_admin.html:34
+msgid "Status"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcements.html:48
+#, fuzzy
+#| msgid "Activity"
+msgid "active"
+msgstr "Aktivität"
+
+#: bookwyrm/templates/settings/announcements.html:48
+#, fuzzy
+#| msgid "Activity"
+msgid "inactive"
+msgstr "Aktivität"
+
 #: bookwyrm/templates/settings/edit_server.html:3
 #: bookwyrm/templates/settings/edit_server.html:6
 #: bookwyrm/templates/settings/edit_server.html:20
@@ -1954,7 +2081,6 @@ msgid "Add server"
 msgstr "Cover hinzufügen"
 
 #: bookwyrm/templates/settings/edit_server.html:7
-#: bookwyrm/templates/settings/federated_server.html:13
 #: bookwyrm/templates/settings/server_blocklist.html:7
 #, fuzzy
 #| msgid "Back to reports"
@@ -1975,7 +2101,7 @@ msgid "Instance:"
 msgstr "Instanzname"
 
 #: bookwyrm/templates/settings/edit_server.html:37
-#: bookwyrm/templates/settings/federated_server.html:30
+#: bookwyrm/templates/settings/federated_server.html:31
 #: bookwyrm/templates/user_admin/user_info.html:34
 #, fuzzy
 #| msgid "Import Status"
@@ -1990,13 +2116,13 @@ msgid "Blocked"
 msgstr "Blockierte Nutzer*innen"
 
 #: bookwyrm/templates/settings/edit_server.html:48
-#: bookwyrm/templates/settings/federated_server.html:22
+#: bookwyrm/templates/settings/federated_server.html:23
 #: bookwyrm/templates/user_admin/user_info.html:26
 msgid "Software:"
 msgstr ""
 
 #: bookwyrm/templates/settings/edit_server.html:55
-#: bookwyrm/templates/settings/federated_server.html:26
+#: bookwyrm/templates/settings/federated_server.html:27
 #: bookwyrm/templates/user_admin/user_info.html:30
 #, fuzzy
 #| msgid "Description:"
@@ -2011,102 +2137,95 @@ msgstr ""
 msgid "Details"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:37
+#: bookwyrm/templates/settings/federated_server.html:39
 #: bookwyrm/templates/user/layout.html:56
 msgid "Activity"
 msgstr "Aktivität"
 
-#: bookwyrm/templates/settings/federated_server.html:40
+#: bookwyrm/templates/settings/federated_server.html:43
 msgid "Users:"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:43
-#: bookwyrm/templates/settings/federated_server.html:50
+#: bookwyrm/templates/settings/federated_server.html:46
+#: bookwyrm/templates/settings/federated_server.html:53
 msgid "View all"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:47
+#: bookwyrm/templates/settings/federated_server.html:50
 #, fuzzy
 #| msgid "Recent Imports"
 msgid "Reports:"
 msgstr "Aktuelle Importe"
 
-#: bookwyrm/templates/settings/federated_server.html:54
+#: bookwyrm/templates/settings/federated_server.html:57
 #, fuzzy
 #| msgid "followed you"
 msgid "Followed by us:"
 msgstr "folgt dir"
 
-#: bookwyrm/templates/settings/federated_server.html:60
+#: bookwyrm/templates/settings/federated_server.html:63
 #, fuzzy
 #| msgid "followed you"
 msgid "Followed by them:"
 msgstr "folgt dir"
 
-#: bookwyrm/templates/settings/federated_server.html:66
+#: bookwyrm/templates/settings/federated_server.html:69
 #, fuzzy
 #| msgid "Blocked Users"
 msgid "Blocked by us:"
 msgstr "Blockierte Nutzer*innen"
 
-#: bookwyrm/templates/settings/federated_server.html:78
+#: bookwyrm/templates/settings/federated_server.html:82
 #: bookwyrm/templates/user_admin/user_info.html:39
 msgid "Notes"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:81
+#: bookwyrm/templates/settings/federated_server.html:85
 #, fuzzy
 #| msgid "Edit Book"
 msgid "Edit"
 msgstr "Buch editieren"
 
-#: bookwyrm/templates/settings/federated_server.html:101
+#: bookwyrm/templates/settings/federated_server.html:105
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:3
 #, fuzzy
 #| msgid "Notifications"
 msgid "Actions"
 msgstr "Benachrichtigungen"
 
-#: bookwyrm/templates/settings/federated_server.html:105
+#: bookwyrm/templates/settings/federated_server.html:109
 #: bookwyrm/templates/snippets/block_button.html:5
 msgid "Block"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:106
+#: bookwyrm/templates/settings/federated_server.html:110
 msgid "All users from this instance will be deactivated."
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:111
+#: bookwyrm/templates/settings/federated_server.html:115
 #: bookwyrm/templates/snippets/block_button.html:10
 msgid "Un-block"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:112
+#: bookwyrm/templates/settings/federated_server.html:116
 msgid "All users from this instance will be re-activated."
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:20
+#: bookwyrm/templates/settings/federation.html:19
 #: bookwyrm/templates/user_admin/server_filter.html:5
 msgid "Server name"
 msgstr "Servername"
 
-#: bookwyrm/templates/settings/federation.html:24
+#: bookwyrm/templates/settings/federation.html:23
 #, fuzzy
 #| msgid "Federated"
 msgid "Date federated"
 msgstr "Föderiert"
 
-#: bookwyrm/templates/settings/federation.html:28
+#: bookwyrm/templates/settings/federation.html:27
 msgid "Software"
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:31
-#: bookwyrm/templates/settings/manage_invite_requests.html:44
-#: bookwyrm/templates/settings/status_filter.html:5
-#: bookwyrm/templates/user_admin/user_admin.html:34
-msgid "Status"
-msgstr ""
-
 #: bookwyrm/templates/settings/manage_invite_requests.html:4
 #: bookwyrm/templates/settings/manage_invite_requests.html:11
 #: bookwyrm/templates/settings/manage_invite_requests.html:25
@@ -2310,6 +2429,12 @@ msgstr "Folgeanfragen"
 msgid "Registration closed text:"
 msgstr "Registrierungen geschlossen text"
 
+#: bookwyrm/templates/snippets/announcement.html:27
+#, fuzzy, python-format
+#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
+msgid "Posted by <a href=\"%(user_path)s\">%(username)s</a>"
+msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
+
 #: bookwyrm/templates/snippets/book_cover.html:31
 #, fuzzy
 #| msgid "Add cover"
@@ -2429,11 +2554,6 @@ msgstr "Diese Lesedaten löschen?"
 msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr "Du löscht diesen Leseforschritt und %(count)s zugehörige Fortschrittsupdates."
 
-#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
-#: bookwyrm/templates/snippets/follow_request_buttons.html:12
-msgid "Delete"
-msgstr "Löschen"
-
 #: bookwyrm/templates/snippets/fav_button.html:9
 #: bookwyrm/templates/snippets/fav_button.html:11
 msgid "Like"
@@ -2910,17 +3030,17 @@ msgstr "Regal löschen"
 msgid "Edit profile"
 msgstr "Profil bearbeiten"
 
-#: bookwyrm/templates/user/user.html:34
+#: bookwyrm/templates/user/user.html:33
 #, fuzzy, python-format
 #| msgid "See all %(size)s"
 msgid "View all %(size)s"
 msgstr "Alle %(size)s anzeigen"
 
-#: bookwyrm/templates/user/user.html:47
+#: bookwyrm/templates/user/user.html:46
 msgid "View all books"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:60
+#: bookwyrm/templates/user/user.html:59
 msgid "User Activity"
 msgstr "Nutzer*innenaktivität"
 
@@ -3038,13 +3158,13 @@ msgstr ""
 msgid "Access level:"
 msgstr ""
 
-#: bookwyrm/views/password.py:30 bookwyrm/views/password.py:35
+#: bookwyrm/views/password.py:32
 #, fuzzy
 #| msgid "A user with that username already exists."
 msgid "No user with that email address was found."
 msgstr "Dieser Benutzename ist bereits vergeben."
 
-#: bookwyrm/views/password.py:44
+#: bookwyrm/views/password.py:41
 #, python-format
 msgid "A password reset link sent to %s"
 msgstr ""
@@ -3431,9 +3551,6 @@ msgstr ""
 #~ msgid "Send follow request"
 #~ msgstr "Folgeanfrage senden"
 
-#~ msgid "Announcements"
-#~ msgstr "Ankündigungen"
-
 #~ msgid "Site Configuration"
 #~ msgstr "Seiteneinstellungen"
 
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index a27ae380..f7c80455 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-14 15:12-0700\n"
+"POT-Creation-Date: 2021-05-20 12:12-0700\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"
@@ -47,29 +47,29 @@ msgstr ""
 msgid "Unlimited"
 msgstr ""
 
-#: bookwyrm/forms.py:293
+#: bookwyrm/forms.py:299
 msgid "List Order"
 msgstr ""
 
-#: bookwyrm/forms.py:294
+#: bookwyrm/forms.py:300
 msgid "Book Title"
 msgstr ""
 
-#: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:34
+#: bookwyrm/forms.py:301 bookwyrm/templates/snippets/create_status_form.html:34
 #: bookwyrm/templates/user/shelf/shelf.html:84
 #: bookwyrm/templates/user/shelf/shelf.html:115
 msgid "Rating"
 msgstr ""
 
-#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:101
+#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:101
 msgid "Sort By"
 msgstr ""
 
-#: bookwyrm/forms.py:301
+#: bookwyrm/forms.py:307
 msgid "Ascending"
 msgstr ""
 
-#: bookwyrm/forms.py:302
+#: bookwyrm/forms.py:308
 msgid "Descending"
 msgstr ""
 
@@ -83,7 +83,7 @@ msgstr ""
 msgid "%(value)s is not a valid username"
 msgstr ""
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:156
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:155
 msgid "username"
 msgstr ""
 
@@ -136,34 +136,34 @@ msgstr ""
 msgid "Edit Author"
 msgstr ""
 
-#: bookwyrm/templates/author/author.html:33
+#: bookwyrm/templates/author/author.html:32
 #: bookwyrm/templates/author/edit_author.html:38
 msgid "Aliases:"
 msgstr ""
 
-#: bookwyrm/templates/author/author.html:39
+#: bookwyrm/templates/author/author.html:38
 msgid "Born:"
 msgstr ""
 
-#: bookwyrm/templates/author/author.html:45
+#: bookwyrm/templates/author/author.html:44
 msgid "Died:"
 msgstr ""
 
-#: bookwyrm/templates/author/author.html:52
+#: bookwyrm/templates/author/author.html:51
 msgid "Wikipedia"
 msgstr ""
 
-#: bookwyrm/templates/author/author.html:56
-#: bookwyrm/templates/book/book.html:81
+#: bookwyrm/templates/author/author.html:55
+#: bookwyrm/templates/book/book.html:78
 msgid "View on OpenLibrary"
 msgstr ""
 
-#: bookwyrm/templates/author/author.html:61
-#: bookwyrm/templates/book/book.html:84
+#: bookwyrm/templates/author/author.html:60
+#: bookwyrm/templates/book/book.html:81
 msgid "View on Inventaire"
 msgstr ""
 
-#: bookwyrm/templates/author/author.html:75
+#: bookwyrm/templates/author/author.html:74
 #, python-format
 msgid "Books by %(name)s"
 msgstr ""
@@ -200,8 +200,9 @@ msgid "Name:"
 msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:40
-#: bookwyrm/templates/book/edit_book.html:128
-#: bookwyrm/templates/book/edit_book.html:165
+#: bookwyrm/templates/book/edit_book.html:132
+#: bookwyrm/templates/book/edit_book.html:141
+#: bookwyrm/templates/book/edit_book.html:178
 msgid "Separate multiple values with commas."
 msgstr ""
 
@@ -226,11 +227,11 @@ msgid "Author Identifiers"
 msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:74
-#: bookwyrm/templates/book/edit_book.html:223
 msgid "Openlibrary key:"
 msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:79
+#: bookwyrm/templates/book/edit_book.html:243
 msgid "Inventaire ID:"
 msgstr ""
 
@@ -243,12 +244,13 @@ msgid "Goodreads key:"
 msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:98
-#: bookwyrm/templates/book/book.html:127
-#: bookwyrm/templates/book/edit_book.html:241
+#: bookwyrm/templates/book/book.html:124
+#: bookwyrm/templates/book/edit_book.html:263
 #: bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
+#: bookwyrm/templates/settings/announcement_form.html:65
 #: bookwyrm/templates/settings/edit_server.html:68
-#: bookwyrm/templates/settings/federated_server.html:94
+#: bookwyrm/templates/settings/federated_server.html:98
 #: bookwyrm/templates/settings/site.html:97
 #: bookwyrm/templates/snippets/readthrough.html:77
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
@@ -259,11 +261,11 @@ msgid "Save"
 msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:99
-#: bookwyrm/templates/book/book.html:128 bookwyrm/templates/book/book.html:180
+#: bookwyrm/templates/book/book.html:125 bookwyrm/templates/book/book.html:174
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:242
+#: bookwyrm/templates/book/edit_book.html:264
 #: bookwyrm/templates/moderation/report_modal.html:34
-#: bookwyrm/templates/settings/federated_server.html:95
+#: bookwyrm/templates/settings/federated_server.html:99
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
 #: bookwyrm/templates/snippets/readthrough.html:78
@@ -274,102 +276,98 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:33
+#: bookwyrm/templates/book/book.html:31
 #: bookwyrm/templates/discover/large-book.html:25
 #: bookwyrm/templates/discover/small-book.html:19
 msgid "by"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:41 bookwyrm/templates/book/book.html:42
+#: bookwyrm/templates/book/book.html:39 bookwyrm/templates/book/book.html:40
 msgid "Edit Book"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:60
+#: bookwyrm/templates/book/book.html:57
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:64
+#: bookwyrm/templates/book/book.html:61
 msgid "Failed to load cover"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:104
+#: bookwyrm/templates/book/book.html:101
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bookwyrm/templates/book/book.html:116
+#: bookwyrm/templates/book/book.html:113
 msgid "Add Description"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:123
-#: bookwyrm/templates/book/edit_book.html:107
+#: bookwyrm/templates/book/book.html:120
+#: bookwyrm/templates/book/edit_book.html:108
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:137
+#: bookwyrm/templates/book/book.html:134
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:145
+#: bookwyrm/templates/book/book.html:142
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:151
+#: bookwyrm/templates/book/book.html:148
 #, python-format
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:162
+#: bookwyrm/templates/book/book.html:159
 msgid "Your reading activity"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:165
+#: bookwyrm/templates/book/book.html:162
 msgid "Add read dates"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:170
-msgid "You don't have any reading activity for this book."
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:177
+#: bookwyrm/templates/book/book.html:171
 msgid "Create"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:203
+#: bookwyrm/templates/book/book.html:181
+msgid "You don't have any reading activity for this book."
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:200
 msgid "Reviews"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:208
+#: bookwyrm/templates/book/book.html:205
 msgid "Your reviews"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:214
+#: bookwyrm/templates/book/book.html:211
 msgid "Your comments"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:220
+#: bookwyrm/templates/book/book.html:217
 msgid "Your quotes"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:255
-msgid "rated it"
-msgstr ""
-
-#: bookwyrm/templates/book/book.html:276
+#: bookwyrm/templates/book/book.html:253
 msgid "Subjects"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:288
+#: bookwyrm/templates/book/book.html:265
 msgid "Places"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:299 bookwyrm/templates/layout.html:65
+#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
@@ -377,37 +375,37 @@ msgstr ""
 msgid "Lists"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:310
+#: bookwyrm/templates/book/book.html:287
 msgid "Add to list"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:320
+#: bookwyrm/templates/book/book.html:297
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:164
 msgid "Add"
 msgstr ""
 
-#: bookwyrm/templates/book/book_identifiers.html:8
+#: bookwyrm/templates/book/book_identifiers.html:7
 msgid "ISBN:"
 msgstr ""
 
-#: bookwyrm/templates/book/book_identifiers.html:15
-#: bookwyrm/templates/book/edit_book.html:227
+#: bookwyrm/templates/book/book_identifiers.html:14
+#: bookwyrm/templates/book/edit_book.html:248
 msgid "OCLC Number:"
 msgstr ""
 
-#: bookwyrm/templates/book/book_identifiers.html:22
-#: bookwyrm/templates/book/edit_book.html:231
+#: bookwyrm/templates/book/book_identifiers.html:21
+#: bookwyrm/templates/book/edit_book.html:253
 msgid "ASIN:"
 msgstr ""
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:179
+#: bookwyrm/templates/book/edit_book.html:192
 msgid "Upload cover:"
 msgstr ""
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:185
+#: bookwyrm/templates/book/edit_book.html:198
 msgid "Load cover from url:"
 msgstr ""
 
@@ -463,81 +461,89 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:92
+#: bookwyrm/templates/book/edit_book.html:93
 msgid "Title:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:100
+#: bookwyrm/templates/book/edit_book.html:101
 msgid "Subtitle:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:113
+#: bookwyrm/templates/book/edit_book.html:114
 msgid "Series:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:120
+#: bookwyrm/templates/book/edit_book.html:122
 msgid "Series number:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:126
+#: bookwyrm/templates/book/edit_book.html:130
+msgid "Languages:"
+msgstr ""
+
+#: bookwyrm/templates/book/edit_book.html:139
 msgid "Publisher:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:135
+#: bookwyrm/templates/book/edit_book.html:148
 msgid "First published date:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:143
+#: bookwyrm/templates/book/edit_book.html:156
 msgid "Published date:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:152
+#: bookwyrm/templates/book/edit_book.html:165
 msgid "Authors"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:158
+#: bookwyrm/templates/book/edit_book.html:171
 #, python-format
 msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:163
+#: bookwyrm/templates/book/edit_book.html:176
 msgid "Add Authors:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:164
+#: bookwyrm/templates/book/edit_book.html:177
 msgid "John Doe, Jane Smith"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:170
+#: bookwyrm/templates/book/edit_book.html:183
 #: bookwyrm/templates/user/shelf/shelf.html:77
 msgid "Cover"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:198
+#: bookwyrm/templates/book/edit_book.html:211
 msgid "Physical Properties"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:199
+#: bookwyrm/templates/book/edit_book.html:212
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:207
+#: bookwyrm/templates/book/edit_book.html:220
 msgid "Pages:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:227
 msgid "Book Identifiers"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:215
+#: bookwyrm/templates/book/edit_book.html:228
 msgid "ISBN 13:"
 msgstr ""
 
-#: bookwyrm/templates/book/edit_book.html:219
+#: bookwyrm/templates/book/edit_book.html:233
 msgid "ISBN 10:"
 msgstr ""
 
+#: bookwyrm/templates/book/edit_book.html:238
+msgid "Openlibrary ID:"
+msgstr ""
+
 #: bookwyrm/templates/book/editions.html:4
 #, python-format
 msgid "Editions of %(book_title)s"
@@ -592,12 +598,17 @@ msgstr ""
 msgid "Published by %(publisher)s."
 msgstr ""
 
+#: bookwyrm/templates/book/rating.html:13
+msgid "rated it"
+msgstr ""
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
 #: bookwyrm/templates/feed/feed_layout.html:69
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
 #: bookwyrm/templates/search/book.html:32
+#: bookwyrm/templates/snippets/announcement.html:17
 msgid "Close"
 msgstr ""
 
@@ -619,7 +630,7 @@ msgstr ""
 
 #: bookwyrm/templates/directory/directory.html:4
 #: bookwyrm/templates/directory/directory.html:9
-#: bookwyrm/templates/layout.html:93
+#: bookwyrm/templates/layout.html:92
 msgid "Directory"
 msgstr ""
 
@@ -633,6 +644,7 @@ msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings
 msgstr ""
 
 #: bookwyrm/templates/directory/directory.html:29
+#: bookwyrm/templates/snippets/announcement.html:30
 #: bookwyrm/templates/snippets/goal_card.html:22
 msgid "Dismiss message"
 msgstr ""
@@ -723,7 +735,7 @@ msgid "Join %(name)s"
 msgstr ""
 
 #: bookwyrm/templates/discover/landing_layout.html:51
-#: bookwyrm/templates/login.html:48
+#: bookwyrm/templates/login.html:51
 msgid "This instance is closed"
 msgstr ""
 
@@ -819,7 +831,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr ""
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:88
+#: bookwyrm/templates/layout.html:87
 msgid "Direct Messages"
 msgstr ""
 
@@ -875,7 +887,7 @@ msgid "Updates"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:10
-#: bookwyrm/templates/layout.html:59
+#: bookwyrm/templates/layout.html:58
 #: bookwyrm/templates/user/shelf/books_header.html:3
 msgid "Your books"
 msgstr ""
@@ -949,7 +961,7 @@ msgstr ""
 #: bookwyrm/templates/get_started/books.html:17
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
-#: bookwyrm/templates/layout.html:38 bookwyrm/templates/layout.html:39
+#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
 #: bookwyrm/templates/lists/list.html:124
 #: bookwyrm/templates/search/layout.html:4
 #: bookwyrm/templates/search/layout.html:9
@@ -1078,7 +1090,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr ""
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/layout.html:98
+#: bookwyrm/templates/layout.html:97
 msgid "Import Books"
 msgstr ""
 
@@ -1179,7 +1191,7 @@ msgid "Imported"
 msgstr ""
 
 #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12
-#: bookwyrm/templates/login.html:43
+#: bookwyrm/templates/login.html:46
 msgid "Create an Account"
 msgstr ""
 
@@ -1204,23 +1216,23 @@ msgstr ""
 msgid "Matching Books"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:34
+#: bookwyrm/templates/layout.html:33
 msgid "Search for a book or user"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:48 bookwyrm/templates/layout.html:49
+#: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48
 msgid "Main navigation menu"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:62
+#: bookwyrm/templates/layout.html:61
 msgid "Feed"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:103
+#: bookwyrm/templates/layout.html:102
 msgid "Settings"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:112
+#: bookwyrm/templates/layout.html:111
 #: bookwyrm/templates/settings/admin_layout.html:31
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
@@ -1228,61 +1240,61 @@ msgstr ""
 msgid "Invites"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:119
+#: bookwyrm/templates/layout.html:118
 msgid "Admin"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:126
+#: bookwyrm/templates/layout.html:125
 msgid "Log out"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:134 bookwyrm/templates/layout.html:135
+#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:155 bookwyrm/templates/layout.html:159
+#: bookwyrm/templates/layout.html:154 bookwyrm/templates/layout.html:158
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:160
+#: bookwyrm/templates/layout.html:159
 msgid "password"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:161 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:163 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:172
+#: bookwyrm/templates/layout.html:171
 msgid "Join"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:198
+#: bookwyrm/templates/layout.html:206
 msgid "About this server"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:202
+#: bookwyrm/templates/layout.html:210
 msgid "Contact site admin"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:206
+#: bookwyrm/templates/layout.html:214
 msgid "Documentation"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:213
+#: bookwyrm/templates/layout.html:221
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:217
+#: bookwyrm/templates/layout.html:225
 msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr ""
 
@@ -1353,6 +1365,7 @@ msgstr ""
 #: bookwyrm/templates/lists/form.html:31
 #: bookwyrm/templates/moderation/reports.html:25
 #: bookwyrm/templates/search/book.html:30
+#: bookwyrm/templates/snippets/announcement.html:15
 msgid "Open"
 msgstr ""
 
@@ -1436,11 +1449,11 @@ msgstr ""
 msgid "Password:"
 msgstr ""
 
-#: bookwyrm/templates/login.html:49
+#: bookwyrm/templates/login.html:52
 msgid "Contact an administrator to get an invite"
 msgstr ""
 
-#: bookwyrm/templates/login.html:59
+#: bookwyrm/templates/login.html:63
 msgid "More about this site"
 msgstr ""
 
@@ -1778,31 +1791,118 @@ msgid "Instance Settings"
 msgstr ""
 
 #: bookwyrm/templates/settings/admin_layout.html:48
+#: bookwyrm/templates/settings/announcements.html:3
+#: bookwyrm/templates/settings/announcements.html:5
+msgid "Announcements"
+msgstr ""
+
+#: bookwyrm/templates/settings/admin_layout.html:52
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:51
+#: bookwyrm/templates/settings/admin_layout.html:55
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:52
+#: bookwyrm/templates/settings/admin_layout.html:56
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:53
+#: bookwyrm/templates/settings/admin_layout.html:57
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr ""
 
-#: bookwyrm/templates/settings/admin_layout.html:54
+#: bookwyrm/templates/settings/admin_layout.html:58
 #: bookwyrm/templates/settings/site.html:81
 msgid "Registration"
 msgstr ""
 
+#: bookwyrm/templates/settings/announcement.html:3
+#: bookwyrm/templates/settings/announcement.html:6
+msgid "Announcement"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcement.html:7
+#: bookwyrm/templates/settings/federated_server.html:13
+msgid "Back to list"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcement.html:11
+msgid "Edit Announcement"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcement.html:20
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
+#: bookwyrm/templates/snippets/follow_request_buttons.html:12
+msgid "Delete"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcement.html:35
+msgid "Visible:"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcement.html:38
+msgid "True"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcement.html:40
+msgid "False"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcement.html:47
+msgid "Start date:"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcement.html:54
+msgid "End date:"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcement.html:60
+msgid "Active:"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcement_form.html:5
+#: bookwyrm/templates/settings/announcements.html:8
+msgid "Create Announcement"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcements.html:22
+msgid "Date added"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcements.html:26
+msgid "Preview"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcements.html:30
+msgid "Start date"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcements.html:34
+msgid "End date"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcements.html:38
+#: bookwyrm/templates/settings/federation.html:30
+#: bookwyrm/templates/settings/manage_invite_requests.html:44
+#: bookwyrm/templates/settings/status_filter.html:5
+#: bookwyrm/templates/user_admin/user_admin.html:34
+msgid "Status"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcements.html:48
+msgid "active"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcements.html:48
+msgid "inactive"
+msgstr ""
+
 #: bookwyrm/templates/settings/edit_server.html:3
 #: bookwyrm/templates/settings/edit_server.html:6
 #: bookwyrm/templates/settings/edit_server.html:20
@@ -1814,7 +1914,6 @@ msgid "Add server"
 msgstr ""
 
 #: bookwyrm/templates/settings/edit_server.html:7
-#: bookwyrm/templates/settings/federated_server.html:13
 #: bookwyrm/templates/settings/server_blocklist.html:7
 msgid "Back to server list"
 msgstr ""
@@ -1829,7 +1928,7 @@ msgid "Instance:"
 msgstr ""
 
 #: bookwyrm/templates/settings/edit_server.html:37
-#: bookwyrm/templates/settings/federated_server.html:30
+#: bookwyrm/templates/settings/federated_server.html:31
 #: bookwyrm/templates/user_admin/user_info.html:34
 msgid "Status:"
 msgstr ""
@@ -1840,13 +1939,13 @@ msgid "Blocked"
 msgstr ""
 
 #: bookwyrm/templates/settings/edit_server.html:48
-#: bookwyrm/templates/settings/federated_server.html:22
+#: bookwyrm/templates/settings/federated_server.html:23
 #: bookwyrm/templates/user_admin/user_info.html:26
 msgid "Software:"
 msgstr ""
 
 #: bookwyrm/templates/settings/edit_server.html:55
-#: bookwyrm/templates/settings/federated_server.html:26
+#: bookwyrm/templates/settings/federated_server.html:27
 #: bookwyrm/templates/user_admin/user_info.html:30
 msgid "Version:"
 msgstr ""
@@ -1859,88 +1958,81 @@ msgstr ""
 msgid "Details"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:37
+#: bookwyrm/templates/settings/federated_server.html:39
 #: bookwyrm/templates/user/layout.html:56
 msgid "Activity"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:40
+#: bookwyrm/templates/settings/federated_server.html:43
 msgid "Users:"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:43
-#: bookwyrm/templates/settings/federated_server.html:50
+#: bookwyrm/templates/settings/federated_server.html:46
+#: bookwyrm/templates/settings/federated_server.html:53
 msgid "View all"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:47
+#: bookwyrm/templates/settings/federated_server.html:50
 msgid "Reports:"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:54
+#: bookwyrm/templates/settings/federated_server.html:57
 msgid "Followed by us:"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:60
+#: bookwyrm/templates/settings/federated_server.html:63
 msgid "Followed by them:"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:66
+#: bookwyrm/templates/settings/federated_server.html:69
 msgid "Blocked by us:"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:78
+#: bookwyrm/templates/settings/federated_server.html:82
 #: bookwyrm/templates/user_admin/user_info.html:39
 msgid "Notes"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:81
+#: bookwyrm/templates/settings/federated_server.html:85
 msgid "Edit"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:101
+#: bookwyrm/templates/settings/federated_server.html:105
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:3
 msgid "Actions"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:105
+#: bookwyrm/templates/settings/federated_server.html:109
 #: bookwyrm/templates/snippets/block_button.html:5
 msgid "Block"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:106
+#: bookwyrm/templates/settings/federated_server.html:110
 msgid "All users from this instance will be deactivated."
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:111
+#: bookwyrm/templates/settings/federated_server.html:115
 #: bookwyrm/templates/snippets/block_button.html:10
 msgid "Un-block"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:112
+#: bookwyrm/templates/settings/federated_server.html:116
 msgid "All users from this instance will be re-activated."
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:20
+#: bookwyrm/templates/settings/federation.html:19
 #: bookwyrm/templates/user_admin/server_filter.html:5
 msgid "Server name"
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:24
+#: bookwyrm/templates/settings/federation.html:23
 msgid "Date federated"
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:28
+#: bookwyrm/templates/settings/federation.html:27
 msgid "Software"
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:31
-#: bookwyrm/templates/settings/manage_invite_requests.html:44
-#: bookwyrm/templates/settings/status_filter.html:5
-#: bookwyrm/templates/user_admin/user_admin.html:34
-msgid "Status"
-msgstr ""
-
 #: bookwyrm/templates/settings/manage_invite_requests.html:4
 #: bookwyrm/templates/settings/manage_invite_requests.html:11
 #: bookwyrm/templates/settings/manage_invite_requests.html:25
@@ -2124,6 +2216,11 @@ msgstr ""
 msgid "Registration closed text:"
 msgstr ""
 
+#: bookwyrm/templates/snippets/announcement.html:27
+#, python-format
+msgid "Posted by <a href=\"%(user_path)s\">%(username)s</a>"
+msgstr ""
+
 #: bookwyrm/templates/snippets/book_cover.html:31
 msgid "No cover"
 msgstr ""
@@ -2229,11 +2326,6 @@ msgstr ""
 msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr ""
 
-#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
-#: bookwyrm/templates/snippets/follow_request_buttons.html:12
-msgid "Delete"
-msgstr ""
-
 #: bookwyrm/templates/snippets/fav_button.html:9
 #: bookwyrm/templates/snippets/fav_button.html:11
 msgid "Like"
@@ -2682,16 +2774,16 @@ msgstr ""
 msgid "Edit profile"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:34
+#: bookwyrm/templates/user/user.html:33
 #, python-format
 msgid "View all %(size)s"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:47
+#: bookwyrm/templates/user/user.html:46
 msgid "View all books"
 msgstr ""
 
-#: bookwyrm/templates/user/user.html:60
+#: bookwyrm/templates/user/user.html:59
 msgid "User Activity"
 msgstr ""
 
@@ -2794,11 +2886,11 @@ msgstr ""
 msgid "Access level:"
 msgstr ""
 
-#: bookwyrm/views/password.py:30 bookwyrm/views/password.py:35
+#: bookwyrm/views/password.py:32
 msgid "No user with that email address was found."
 msgstr ""
 
-#: bookwyrm/views/password.py:44
+#: bookwyrm/views/password.py:41
 #, python-format
 msgid "A password reset link sent to %s"
 msgstr ""
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index a814aa0f567a3f3018e2f7eda9ea4d8cc7b331f6..1377b50921ff631bb3fced41caf49a3579a7d17f 100644
GIT binary patch
delta 11452
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
CYLnLh

delta 11501
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%0D*~_Kc%lmBdvOHuuG(;|H0EP*yU6KgI0Y`E
z7P%19NEKs<j^rzu0b=lhD!8f>^~g6R>eHq_v5x3O?4oWUkwEk%ni0>gDkMgkOj-92
z0W$5mX&=6fx`K%Bhz81-tD31BWqgWjh#J&?OC*}|X_!eqfQf~fvQW~`u7i|SAwLDb
zbMj9hnR@sd@g=d3SV-%07)Q(}y@EJJ`WUVzqDbrVB;F-T(#L4Z9uf_RJ(M*yZAe<5
z>L0EHHr8?KdK0ec38gxgA#vAKh(6^1Hu(h@O8(j9YZALDiy`I`r6_yLlxMguCxkoa
zkULI1qIMziJn0qqgwS=Jc%O6~T#M&$7E#vJpCNs~q)A#OSYB6?Z-}#q&6NK_gb?#g
z-Aqi@&*;}Fyg}Td;6=Pm=nA7FUH-%;?i6kCo=Gn<#?tOZ*Up;ZSrh1?8Bvp(_lcJY
z2hoPIruc+tMCe*ZnHTD*dYh4UlAb}FCZ1hUBz`1cg!6F#@gwO$u9k@r&y6RiYY7f^
zr+DQ^7c=E53MRaXzbSJNb6g7(!<%-b<Za>#@h7EqnL~flx;`Uba;G?HMsb0-NZa^L
zR}yo5Hw|y}lSi41T*sK~w9$^-F?l&d(_r}6{L~y*eo|)1-s5w!9C^8EIk}rIB&CPN
zWT)n&j!ko9<z<e|$j(f2WakaZ%*air-jSa%Hr+9FOjcHEZp}@tx_nV_llSOB#azvk
zd|lJCXL<B=wOk&$$?v6o<tleiQ#Uz|aj7{OV{#p7!!pK>$w|xQ=F#dv_aB=R5cXf6
CDxtdo

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index d426b029..d83877fb 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-14 15:12-0700\n"
+"POT-Creation-Date: 2021-05-20 12:12-0700\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -47,29 +47,29 @@ msgstr "%(count)d usos"
 msgid "Unlimited"
 msgstr "Sin límite"
 
-#: bookwyrm/forms.py:293
+#: bookwyrm/forms.py:299
 msgid "List Order"
 msgstr "Orden de la lista"
 
-#: bookwyrm/forms.py:294
+#: bookwyrm/forms.py:300
 msgid "Book Title"
 msgstr "Título"
 
-#: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:34
+#: bookwyrm/forms.py:301 bookwyrm/templates/snippets/create_status_form.html:34
 #: bookwyrm/templates/user/shelf/shelf.html:84
 #: bookwyrm/templates/user/shelf/shelf.html:115
 msgid "Rating"
 msgstr "Calificación"
 
-#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:101
+#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:101
 msgid "Sort By"
 msgstr "Ordenar por"
 
-#: bookwyrm/forms.py:301
+#: bookwyrm/forms.py:307
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: bookwyrm/forms.py:302
+#: bookwyrm/forms.py:308
 msgid "Descending"
 msgstr "Descendente"
 
@@ -83,7 +83,7 @@ msgstr "%(value)s no es un remote_id válido"
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s no es un usuario válido"
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:156
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:155
 msgid "username"
 msgstr "nombre de usuario"
 
@@ -136,36 +136,36 @@ msgstr "¡Algo salió mal! Disculpa."
 msgid "Edit Author"
 msgstr "Editar Autor/Autora"
 
-#: bookwyrm/templates/author/author.html:33
+#: bookwyrm/templates/author/author.html:32
 #: bookwyrm/templates/author/edit_author.html:38
 msgid "Aliases:"
 msgstr ""
 
-#: bookwyrm/templates/author/author.html:39
+#: bookwyrm/templates/author/author.html:38
 msgid "Born:"
 msgstr ""
 
-#: bookwyrm/templates/author/author.html:45
+#: bookwyrm/templates/author/author.html:44
 msgid "Died:"
 msgstr ""
 
-#: bookwyrm/templates/author/author.html:52
+#: bookwyrm/templates/author/author.html:51
 msgid "Wikipedia"
 msgstr "Wikipedia"
 
-#: bookwyrm/templates/author/author.html:56
-#: bookwyrm/templates/book/book.html:81
+#: bookwyrm/templates/author/author.html:55
+#: bookwyrm/templates/book/book.html:78
 msgid "View on OpenLibrary"
 msgstr "Ver en OpenLibrary"
 
-#: bookwyrm/templates/author/author.html:61
-#: bookwyrm/templates/book/book.html:84
+#: bookwyrm/templates/author/author.html:60
+#: bookwyrm/templates/book/book.html:81
 #, fuzzy
 #| msgid "View on OpenLibrary"
 msgid "View on Inventaire"
 msgstr "Ver en OpenLibrary"
 
-#: bookwyrm/templates/author/author.html:75
+#: bookwyrm/templates/author/author.html:74
 #, python-format
 msgid "Books by %(name)s"
 msgstr "Libros de %(name)s"
@@ -202,8 +202,9 @@ msgid "Name:"
 msgstr "Nombre:"
 
 #: bookwyrm/templates/author/edit_author.html:40
-#: bookwyrm/templates/book/edit_book.html:128
-#: bookwyrm/templates/book/edit_book.html:165
+#: bookwyrm/templates/book/edit_book.html:132
+#: bookwyrm/templates/book/edit_book.html:141
+#: bookwyrm/templates/book/edit_book.html:178
 #, fuzzy
 #| msgid "Separate multiple publishers with commas."
 msgid "Separate multiple values with commas."
@@ -230,11 +231,11 @@ msgid "Author Identifiers"
 msgstr "Identificadores de autor/autora"
 
 #: bookwyrm/templates/author/edit_author.html:74
-#: bookwyrm/templates/book/edit_book.html:223
 msgid "Openlibrary key:"
 msgstr "Clave OpenLibrary:"
 
 #: bookwyrm/templates/author/edit_author.html:79
+#: bookwyrm/templates/book/edit_book.html:243
 #, fuzzy
 #| msgid "View on OpenLibrary"
 msgid "Inventaire ID:"
@@ -249,12 +250,13 @@ msgid "Goodreads key:"
 msgstr "Clave Goodreads:"
 
 #: bookwyrm/templates/author/edit_author.html:98
-#: bookwyrm/templates/book/book.html:127
-#: bookwyrm/templates/book/edit_book.html:241
+#: bookwyrm/templates/book/book.html:124
+#: bookwyrm/templates/book/edit_book.html:263
 #: bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
+#: bookwyrm/templates/settings/announcement_form.html:65
 #: bookwyrm/templates/settings/edit_server.html:68
-#: bookwyrm/templates/settings/federated_server.html:94
+#: bookwyrm/templates/settings/federated_server.html:98
 #: bookwyrm/templates/settings/site.html:97
 #: bookwyrm/templates/snippets/readthrough.html:77
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
@@ -265,11 +267,11 @@ msgid "Save"
 msgstr "Guardar"
 
 #: bookwyrm/templates/author/edit_author.html:99
-#: bookwyrm/templates/book/book.html:128 bookwyrm/templates/book/book.html:180
+#: bookwyrm/templates/book/book.html:125 bookwyrm/templates/book/book.html:174
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:242
+#: bookwyrm/templates/book/edit_book.html:264
 #: bookwyrm/templates/moderation/report_modal.html:34
-#: bookwyrm/templates/settings/federated_server.html:95
+#: bookwyrm/templates/settings/federated_server.html:99
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
 #: bookwyrm/templates/snippets/readthrough.html:78
@@ -280,110 +282,106 @@ msgstr "Guardar"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: bookwyrm/templates/book/book.html:33
+#: bookwyrm/templates/book/book.html:31
 #: bookwyrm/templates/discover/large-book.html:25
 #: bookwyrm/templates/discover/small-book.html:19
 msgid "by"
 msgstr "por"
 
-#: bookwyrm/templates/book/book.html:41 bookwyrm/templates/book/book.html:42
+#: bookwyrm/templates/book/book.html:39 bookwyrm/templates/book/book.html:40
 msgid "Edit Book"
 msgstr "Editar Libro"
 
-#: bookwyrm/templates/book/book.html:60
+#: bookwyrm/templates/book/book.html:57
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "Agregar portada"
 
-#: bookwyrm/templates/book/book.html:64
+#: bookwyrm/templates/book/book.html:61
 msgid "Failed to load cover"
 msgstr "No se pudo cargar la portada"
 
-#: bookwyrm/templates/book/book.html:104
+#: bookwyrm/templates/book/book.html:101
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s reseña)"
 msgstr[1] "(%(review_count)s reseñas)"
 
-#: bookwyrm/templates/book/book.html:116
+#: bookwyrm/templates/book/book.html:113
 msgid "Add Description"
 msgstr "Agregar descripción"
 
-#: bookwyrm/templates/book/book.html:123
-#: bookwyrm/templates/book/edit_book.html:107
+#: bookwyrm/templates/book/book.html:120
+#: bookwyrm/templates/book/edit_book.html:108
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Descripción:"
 
-#: bookwyrm/templates/book/book.html:137
+#: bookwyrm/templates/book/book.html:134
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s/editions\">%(count)s ediciones</a>"
 
-#: bookwyrm/templates/book/book.html:145
+#: bookwyrm/templates/book/book.html:142
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "Esta edición está en tu <a href=\"%(path)s\">%(shelf_name)s</a> estante."
 
-#: bookwyrm/templates/book/book.html:151
+#: bookwyrm/templates/book/book.html:148
 #, python-format
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr "Una <a href=\"%(book_path)s\">edición diferente</a> de este libro está en tu <a href=\"%(shelf_path)s\">%(shelf_name)s</a> estante."
 
-#: bookwyrm/templates/book/book.html:162
+#: bookwyrm/templates/book/book.html:159
 msgid "Your reading activity"
 msgstr "Tu actividad de lectura"
 
-#: bookwyrm/templates/book/book.html:165
+#: bookwyrm/templates/book/book.html:162
 msgid "Add read dates"
 msgstr "Agregar fechas de lectura"
 
-#: bookwyrm/templates/book/book.html:170
-msgid "You don't have any reading activity for this book."
-msgstr "No tienes ninguna actividad de lectura para este libro."
-
-#: bookwyrm/templates/book/book.html:177
+#: bookwyrm/templates/book/book.html:171
 msgid "Create"
 msgstr "Crear"
 
-#: bookwyrm/templates/book/book.html:203
+#: bookwyrm/templates/book/book.html:181
+msgid "You don't have any reading activity for this book."
+msgstr "No tienes ninguna actividad de lectura para este libro."
+
+#: bookwyrm/templates/book/book.html:200
 #, fuzzy
 #| msgid "Review"
 msgid "Reviews"
 msgstr "Reseña"
 
-#: bookwyrm/templates/book/book.html:208
+#: bookwyrm/templates/book/book.html:205
 #, fuzzy
 #| msgid "Your shelves"
 msgid "Your reviews"
 msgstr "Tus estantes"
 
-#: bookwyrm/templates/book/book.html:214
+#: bookwyrm/templates/book/book.html:211
 #, fuzzy
 #| msgid "Your Account"
 msgid "Your comments"
 msgstr "Tu cuenta"
 
-#: bookwyrm/templates/book/book.html:220
+#: bookwyrm/templates/book/book.html:217
 #, fuzzy
 #| msgid "Your books"
 msgid "Your quotes"
 msgstr "Tus libros"
 
-#: bookwyrm/templates/book/book.html:255
-msgid "rated it"
-msgstr "lo calificó con"
-
-#: bookwyrm/templates/book/book.html:276
+#: bookwyrm/templates/book/book.html:253
 msgid "Subjects"
 msgstr "Sujetos"
 
-#: bookwyrm/templates/book/book.html:288
+#: bookwyrm/templates/book/book.html:265
 msgid "Places"
 msgstr "Lugares"
 
-#: bookwyrm/templates/book/book.html:299 bookwyrm/templates/layout.html:65
+#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
@@ -391,37 +389,37 @@ msgstr "Lugares"
 msgid "Lists"
 msgstr "Listas"
 
-#: bookwyrm/templates/book/book.html:310
+#: bookwyrm/templates/book/book.html:287
 msgid "Add to list"
 msgstr "Agregar a lista"
 
-#: bookwyrm/templates/book/book.html:320
+#: bookwyrm/templates/book/book.html:297
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:164
 msgid "Add"
 msgstr "Agregar"
 
-#: bookwyrm/templates/book/book_identifiers.html:8
+#: bookwyrm/templates/book/book_identifiers.html:7
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: bookwyrm/templates/book/book_identifiers.html:15
-#: bookwyrm/templates/book/edit_book.html:227
+#: bookwyrm/templates/book/book_identifiers.html:14
+#: bookwyrm/templates/book/edit_book.html:248
 msgid "OCLC Number:"
 msgstr "Número OCLC:"
 
-#: bookwyrm/templates/book/book_identifiers.html:22
-#: bookwyrm/templates/book/edit_book.html:231
+#: bookwyrm/templates/book/book_identifiers.html:21
+#: bookwyrm/templates/book/edit_book.html:253
 msgid "ASIN:"
 msgstr "ASIN:"
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:179
+#: bookwyrm/templates/book/edit_book.html:192
 msgid "Upload cover:"
 msgstr "Subir portada:"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:185
+#: bookwyrm/templates/book/edit_book.html:198
 msgid "Load cover from url:"
 msgstr "Agregar portada de url:"
 
@@ -477,81 +475,93 @@ msgstr "Confirmar"
 msgid "Back"
 msgstr "Volver"
 
-#: bookwyrm/templates/book/edit_book.html:92
+#: bookwyrm/templates/book/edit_book.html:93
 msgid "Title:"
 msgstr "Título:"
 
-#: bookwyrm/templates/book/edit_book.html:100
+#: bookwyrm/templates/book/edit_book.html:101
 msgid "Subtitle:"
 msgstr "Subtítulo:"
 
-#: bookwyrm/templates/book/edit_book.html:113
+#: bookwyrm/templates/book/edit_book.html:114
 msgid "Series:"
 msgstr "Serie:"
 
-#: bookwyrm/templates/book/edit_book.html:120
+#: bookwyrm/templates/book/edit_book.html:122
 msgid "Series number:"
 msgstr "Número de serie:"
 
-#: bookwyrm/templates/book/edit_book.html:126
+#: bookwyrm/templates/book/edit_book.html:130
+#, fuzzy
+#| msgid "Language:"
+msgid "Languages:"
+msgstr "Idioma:"
+
+#: bookwyrm/templates/book/edit_book.html:139
 msgid "Publisher:"
 msgstr "Editorial:"
 
-#: bookwyrm/templates/book/edit_book.html:135
+#: bookwyrm/templates/book/edit_book.html:148
 msgid "First published date:"
 msgstr "Fecha de primera publicación:"
 
-#: bookwyrm/templates/book/edit_book.html:143
+#: bookwyrm/templates/book/edit_book.html:156
 msgid "Published date:"
 msgstr "Fecha de publicación:"
 
-#: bookwyrm/templates/book/edit_book.html:152
+#: bookwyrm/templates/book/edit_book.html:165
 msgid "Authors"
 msgstr "Autores"
 
-#: bookwyrm/templates/book/edit_book.html:158
+#: bookwyrm/templates/book/edit_book.html:171
 #, python-format
 msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
 msgstr "Eliminar <a href=\"%(path)s\">%(name)s</a>"
 
-#: bookwyrm/templates/book/edit_book.html:163
+#: bookwyrm/templates/book/edit_book.html:176
 msgid "Add Authors:"
 msgstr "Agregar Autores:"
 
-#: bookwyrm/templates/book/edit_book.html:164
+#: bookwyrm/templates/book/edit_book.html:177
 msgid "John Doe, Jane Smith"
 msgstr "Juan Nadie, Natalia Natalia"
 
-#: bookwyrm/templates/book/edit_book.html:170
+#: bookwyrm/templates/book/edit_book.html:183
 #: bookwyrm/templates/user/shelf/shelf.html:77
 msgid "Cover"
 msgstr "Portada:"
 
-#: bookwyrm/templates/book/edit_book.html:198
+#: bookwyrm/templates/book/edit_book.html:211
 msgid "Physical Properties"
 msgstr "Propiedades físicas:"
 
-#: bookwyrm/templates/book/edit_book.html:199
+#: bookwyrm/templates/book/edit_book.html:212
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "Formato:"
 
-#: bookwyrm/templates/book/edit_book.html:207
+#: bookwyrm/templates/book/edit_book.html:220
 msgid "Pages:"
 msgstr "Páginas:"
 
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:227
 msgid "Book Identifiers"
 msgstr "Identificadores de libro"
 
-#: bookwyrm/templates/book/edit_book.html:215
+#: bookwyrm/templates/book/edit_book.html:228
 msgid "ISBN 13:"
 msgstr "ISBN 13:"
 
-#: bookwyrm/templates/book/edit_book.html:219
+#: bookwyrm/templates/book/edit_book.html:233
 msgid "ISBN 10:"
 msgstr "ISBN 10:"
 
+#: bookwyrm/templates/book/edit_book.html:238
+#, fuzzy
+#| msgid "Openlibrary key:"
+msgid "Openlibrary ID:"
+msgstr "Clave OpenLibrary:"
+
 #: bookwyrm/templates/book/editions.html:4
 #, python-format
 msgid "Editions of %(book_title)s"
@@ -606,12 +616,17 @@ msgstr "Publicado %(date)s"
 msgid "Published by %(publisher)s."
 msgstr "Publicado por %(publisher)s."
 
+#: bookwyrm/templates/book/rating.html:13
+msgid "rated it"
+msgstr "lo calificó con"
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
 #: bookwyrm/templates/feed/feed_layout.html:69
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
 #: bookwyrm/templates/search/book.html:32
+#: bookwyrm/templates/snippets/announcement.html:17
 msgid "Close"
 msgstr "Cerrar"
 
@@ -633,7 +648,7 @@ msgstr "Comunidad federalizada"
 
 #: bookwyrm/templates/directory/directory.html:4
 #: bookwyrm/templates/directory/directory.html:9
-#: bookwyrm/templates/layout.html:93
+#: bookwyrm/templates/layout.html:92
 msgid "Directory"
 msgstr "Directorio"
 
@@ -647,6 +662,7 @@ msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings
 msgstr "Puedes optar por no en cualquier hora en tus <a href=\"%(path)s\">configuraciones de perfil.</a>"
 
 #: bookwyrm/templates/directory/directory.html:29
+#: bookwyrm/templates/snippets/announcement.html:30
 #: bookwyrm/templates/snippets/goal_card.html:22
 msgid "Dismiss message"
 msgstr "Desechar mensaje"
@@ -737,7 +753,7 @@ msgid "Join %(name)s"
 msgstr "Unirse con %(name)s"
 
 #: bookwyrm/templates/discover/landing_layout.html:51
-#: bookwyrm/templates/login.html:48
+#: bookwyrm/templates/login.html:51
 msgid "This instance is closed"
 msgstr "Esta instancia está cerrada."
 
@@ -833,7 +849,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Mensajes directos con <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:88
+#: bookwyrm/templates/layout.html:87
 msgid "Direct Messages"
 msgstr "Mensajes directos"
 
@@ -889,7 +905,7 @@ msgid "Updates"
 msgstr "Actualizaciones"
 
 #: bookwyrm/templates/feed/feed_layout.html:10
-#: bookwyrm/templates/layout.html:59
+#: bookwyrm/templates/layout.html:58
 #: bookwyrm/templates/user/shelf/books_header.html:3
 msgid "Your books"
 msgstr "Tus libros"
@@ -963,7 +979,7 @@ msgstr "Puedes agregar libros cuando comiences a usar %(site_name)s."
 #: bookwyrm/templates/get_started/books.html:17
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
-#: bookwyrm/templates/layout.html:38 bookwyrm/templates/layout.html:39
+#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
 #: bookwyrm/templates/lists/list.html:124
 #: bookwyrm/templates/search/layout.html:4
 #: bookwyrm/templates/search/layout.html:9
@@ -1092,7 +1108,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "Los libros de %(username)s para %(year)s"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/layout.html:98
+#: bookwyrm/templates/layout.html:97
 msgid "Import Books"
 msgstr "Importar libros"
 
@@ -1193,7 +1209,7 @@ msgid "Imported"
 msgstr "Importado"
 
 #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12
-#: bookwyrm/templates/login.html:43
+#: bookwyrm/templates/login.html:46
 msgid "Create an Account"
 msgstr "Crear una cuenta"
 
@@ -1218,23 +1234,23 @@ msgstr "Resultados de búsqueda por \"%(query)s\""
 msgid "Matching Books"
 msgstr "Libros correspondientes"
 
-#: bookwyrm/templates/layout.html:34
+#: bookwyrm/templates/layout.html:33
 msgid "Search for a book or user"
 msgstr "Buscar un libro o un usuario"
 
-#: bookwyrm/templates/layout.html:48 bookwyrm/templates/layout.html:49
+#: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48
 msgid "Main navigation menu"
 msgstr "Menú de navigación central"
 
-#: bookwyrm/templates/layout.html:62
+#: bookwyrm/templates/layout.html:61
 msgid "Feed"
 msgstr "Actividad"
 
-#: bookwyrm/templates/layout.html:103
+#: bookwyrm/templates/layout.html:102
 msgid "Settings"
 msgstr "Configuración"
 
-#: bookwyrm/templates/layout.html:112
+#: bookwyrm/templates/layout.html:111
 #: bookwyrm/templates/settings/admin_layout.html:31
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
@@ -1242,64 +1258,63 @@ msgstr "Configuración"
 msgid "Invites"
 msgstr "Invitaciones"
 
-#: bookwyrm/templates/layout.html:119
+#: bookwyrm/templates/layout.html:118
 msgid "Admin"
 msgstr "Admin"
 
-#: bookwyrm/templates/layout.html:126
+#: bookwyrm/templates/layout.html:125
 msgid "Log out"
 msgstr "Cerrar sesión"
 
-#: bookwyrm/templates/layout.html:134 bookwyrm/templates/layout.html:135
+#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: bookwyrm/templates/layout.html:155 bookwyrm/templates/layout.html:159
+#: bookwyrm/templates/layout.html:154 bookwyrm/templates/layout.html:158
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "Nombre de usuario:"
 
-#: bookwyrm/templates/layout.html:160
+#: bookwyrm/templates/layout.html:159
 msgid "password"
 msgstr "contraseña"
 
-#: bookwyrm/templates/layout.html:161 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr "¿Olvidaste tu contraseña?"
 
-#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:163 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "Iniciar sesión"
 
-#: bookwyrm/templates/layout.html:172
+#: bookwyrm/templates/layout.html:171
 msgid "Join"
 msgstr "Unirse"
 
-#: bookwyrm/templates/layout.html:198
+#: bookwyrm/templates/layout.html:206
 msgid "About this server"
 msgstr "Sobre este servidor"
 
-#: bookwyrm/templates/layout.html:202
+#: bookwyrm/templates/layout.html:210
 msgid "Contact site admin"
 msgstr "Contactarse con administradores del sitio"
 
-#: bookwyrm/templates/layout.html:206
+#: bookwyrm/templates/layout.html:214
 #, fuzzy
 #| msgid "Django Documentation"
 msgid "Documentation"
 msgstr "Documentación de Django"
 
-#: bookwyrm/templates/layout.html:213
+#: bookwyrm/templates/layout.html:221
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr "Apoyar %(site_name)s en <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 
-#: bookwyrm/templates/layout.html:217
-#| msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+#: bookwyrm/templates/layout.html:225
 msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm es software de código abierto. Puedes contribuir o reportar problemas en <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
@@ -1370,6 +1385,7 @@ msgstr "Cualquier usuario puede sugerir libros, en cuanto lo hayas aprobado"
 #: bookwyrm/templates/lists/form.html:31
 #: bookwyrm/templates/moderation/reports.html:25
 #: bookwyrm/templates/search/book.html:30
+#: bookwyrm/templates/snippets/announcement.html:15
 msgid "Open"
 msgstr "Abierto"
 
@@ -1455,11 +1471,11 @@ msgstr "Iniciar sesión"
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: bookwyrm/templates/login.html:49
+#: bookwyrm/templates/login.html:52
 msgid "Contact an administrator to get an invite"
 msgstr "Contactar a unx administradorx para recibir una invitación"
 
-#: bookwyrm/templates/login.html:59
+#: bookwyrm/templates/login.html:63
 msgid "More about this site"
 msgstr "Más sobre este sitio"
 
@@ -1807,31 +1823,144 @@ msgid "Instance Settings"
 msgstr "Configuración de instancia"
 
 #: bookwyrm/templates/settings/admin_layout.html:48
+#: bookwyrm/templates/settings/announcements.html:3
+#: bookwyrm/templates/settings/announcements.html:5
+msgid "Announcements"
+msgstr "Anuncios"
+
+#: bookwyrm/templates/settings/admin_layout.html:52
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr "Configuración de sitio"
 
-#: bookwyrm/templates/settings/admin_layout.html:51
+#: bookwyrm/templates/settings/admin_layout.html:55
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr "Información de instancia"
 
-#: bookwyrm/templates/settings/admin_layout.html:52
+#: bookwyrm/templates/settings/admin_layout.html:56
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr "Imagenes"
 
-#: bookwyrm/templates/settings/admin_layout.html:53
+#: bookwyrm/templates/settings/admin_layout.html:57
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr "Contenido del pie de página"
 
-#: bookwyrm/templates/settings/admin_layout.html:54
+#: bookwyrm/templates/settings/admin_layout.html:58
 #: bookwyrm/templates/settings/site.html:81
 msgid "Registration"
 msgstr "Registración"
 
+#: bookwyrm/templates/settings/announcement.html:3
+#: bookwyrm/templates/settings/announcement.html:6
+#, fuzzy
+#| msgid "Announcements"
+msgid "Announcement"
+msgstr "Anuncios"
+
+#: bookwyrm/templates/settings/announcement.html:7
+#: bookwyrm/templates/settings/federated_server.html:13
+#, fuzzy
+#| msgid "Back to server list"
+msgid "Back to list"
+msgstr "Volver a la lista de servidores"
+
+#: bookwyrm/templates/settings/announcement.html:11
+#, fuzzy
+#| msgid "Announcements"
+msgid "Edit Announcement"
+msgstr "Anuncios"
+
+#: bookwyrm/templates/settings/announcement.html:20
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
+#: bookwyrm/templates/snippets/follow_request_buttons.html:12
+msgid "Delete"
+msgstr "Eliminar"
+
+#: bookwyrm/templates/settings/announcement.html:35
+msgid "Visible:"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcement.html:38
+msgid "True"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcement.html:40
+msgid "False"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcement.html:47
+#, fuzzy
+#| msgid "Birth date:"
+msgid "Start date:"
+msgstr "Fecha de nacimiento:"
+
+#: bookwyrm/templates/settings/announcement.html:54
+#, fuzzy
+#| msgid "Birth date:"
+msgid "End date:"
+msgstr "Fecha de nacimiento:"
+
+#: bookwyrm/templates/settings/announcement.html:60
+#, fuzzy
+#| msgid "Active"
+msgid "Active:"
+msgstr "Activ@"
+
+#: bookwyrm/templates/settings/announcement_form.html:5
+#: bookwyrm/templates/settings/announcements.html:8
+#, fuzzy
+#| msgid "Announcements"
+msgid "Create Announcement"
+msgstr "Anuncios"
+
+#: bookwyrm/templates/settings/announcements.html:22
+#, fuzzy
+#| msgid "Date Added"
+msgid "Date added"
+msgstr "Fecha agregada"
+
+#: bookwyrm/templates/settings/announcements.html:26
+#, fuzzy
+#| msgid "reviewed"
+msgid "Preview"
+msgstr "reseñó"
+
+#: bookwyrm/templates/settings/announcements.html:30
+#, fuzzy
+#| msgid "Started"
+msgid "Start date"
+msgstr "Empezado"
+
+#: bookwyrm/templates/settings/announcements.html:34
+#, fuzzy
+#| msgid "Edit read dates"
+msgid "End date"
+msgstr "Editar fechas de lectura"
+
+#: bookwyrm/templates/settings/announcements.html:38
+#: bookwyrm/templates/settings/federation.html:30
+#: bookwyrm/templates/settings/manage_invite_requests.html:44
+#: bookwyrm/templates/settings/status_filter.html:5
+#: bookwyrm/templates/user_admin/user_admin.html:34
+msgid "Status"
+msgstr "Status"
+
+#: bookwyrm/templates/settings/announcements.html:48
+#, fuzzy
+#| msgid "Inactive"
+msgid "active"
+msgstr "Inactiv@"
+
+#: bookwyrm/templates/settings/announcements.html:48
+#, fuzzy
+#| msgid "Inactive"
+msgid "inactive"
+msgstr "Inactiv@"
+
 #: bookwyrm/templates/settings/edit_server.html:3
 #: bookwyrm/templates/settings/edit_server.html:6
 #: bookwyrm/templates/settings/edit_server.html:20
@@ -1843,7 +1972,6 @@ msgid "Add server"
 msgstr "Agregar servidor"
 
 #: bookwyrm/templates/settings/edit_server.html:7
-#: bookwyrm/templates/settings/federated_server.html:13
 #: bookwyrm/templates/settings/server_blocklist.html:7
 msgid "Back to server list"
 msgstr "Volver a la lista de servidores"
@@ -1858,7 +1986,7 @@ msgid "Instance:"
 msgstr "Instancia:"
 
 #: bookwyrm/templates/settings/edit_server.html:37
-#: bookwyrm/templates/settings/federated_server.html:30
+#: bookwyrm/templates/settings/federated_server.html:31
 #: bookwyrm/templates/user_admin/user_info.html:34
 msgid "Status:"
 msgstr "Status:"
@@ -1869,13 +1997,13 @@ msgid "Blocked"
 msgstr "Bloqueado"
 
 #: bookwyrm/templates/settings/edit_server.html:48
-#: bookwyrm/templates/settings/federated_server.html:22
+#: bookwyrm/templates/settings/federated_server.html:23
 #: bookwyrm/templates/user_admin/user_info.html:26
 msgid "Software:"
 msgstr "Software:"
 
 #: bookwyrm/templates/settings/edit_server.html:55
-#: bookwyrm/templates/settings/federated_server.html:26
+#: bookwyrm/templates/settings/federated_server.html:27
 #: bookwyrm/templates/user_admin/user_info.html:30
 msgid "Version:"
 msgstr "Versión:"
@@ -1888,88 +2016,81 @@ msgstr "Notas:"
 msgid "Details"
 msgstr "Detalles"
 
-#: bookwyrm/templates/settings/federated_server.html:37
+#: bookwyrm/templates/settings/federated_server.html:39
 #: bookwyrm/templates/user/layout.html:56
 msgid "Activity"
 msgstr "Actividad"
 
-#: bookwyrm/templates/settings/federated_server.html:40
+#: bookwyrm/templates/settings/federated_server.html:43
 msgid "Users:"
 msgstr "Usuarios:"
 
-#: bookwyrm/templates/settings/federated_server.html:43
-#: bookwyrm/templates/settings/federated_server.html:50
+#: bookwyrm/templates/settings/federated_server.html:46
+#: bookwyrm/templates/settings/federated_server.html:53
 msgid "View all"
 msgstr "Ver todos"
 
-#: bookwyrm/templates/settings/federated_server.html:47
+#: bookwyrm/templates/settings/federated_server.html:50
 msgid "Reports:"
 msgstr "Informes:"
 
-#: bookwyrm/templates/settings/federated_server.html:54
+#: bookwyrm/templates/settings/federated_server.html:57
 msgid "Followed by us:"
 msgstr "Seguido por nosotros:"
 
-#: bookwyrm/templates/settings/federated_server.html:60
+#: bookwyrm/templates/settings/federated_server.html:63
 msgid "Followed by them:"
 msgstr "Seguido por ellos:"
 
-#: bookwyrm/templates/settings/federated_server.html:66
+#: bookwyrm/templates/settings/federated_server.html:69
 msgid "Blocked by us:"
 msgstr "Bloqueado por nosotros:"
 
-#: bookwyrm/templates/settings/federated_server.html:78
+#: bookwyrm/templates/settings/federated_server.html:82
 #: bookwyrm/templates/user_admin/user_info.html:39
 msgid "Notes"
 msgstr "Notas"
 
-#: bookwyrm/templates/settings/federated_server.html:81
+#: bookwyrm/templates/settings/federated_server.html:85
 msgid "Edit"
 msgstr "Editar"
 
-#: bookwyrm/templates/settings/federated_server.html:101
+#: bookwyrm/templates/settings/federated_server.html:105
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:3
 msgid "Actions"
 msgstr "Acciones"
 
-#: bookwyrm/templates/settings/federated_server.html:105
+#: bookwyrm/templates/settings/federated_server.html:109
 #: bookwyrm/templates/snippets/block_button.html:5
 msgid "Block"
 msgstr "Bloquear"
 
-#: bookwyrm/templates/settings/federated_server.html:106
+#: bookwyrm/templates/settings/federated_server.html:110
 msgid "All users from this instance will be deactivated."
 msgstr "Todos los usuarios en esta instancia serán desactivados."
 
-#: bookwyrm/templates/settings/federated_server.html:111
+#: bookwyrm/templates/settings/federated_server.html:115
 #: bookwyrm/templates/snippets/block_button.html:10
 msgid "Un-block"
 msgstr "Desbloquear"
 
-#: bookwyrm/templates/settings/federated_server.html:112
+#: bookwyrm/templates/settings/federated_server.html:116
 msgid "All users from this instance will be re-activated."
 msgstr "Todos los usuarios en esta instancia serán re-activados."
 
-#: bookwyrm/templates/settings/federation.html:20
+#: bookwyrm/templates/settings/federation.html:19
 #: bookwyrm/templates/user_admin/server_filter.html:5
 msgid "Server name"
 msgstr "Nombre de servidor"
 
-#: bookwyrm/templates/settings/federation.html:24
+#: bookwyrm/templates/settings/federation.html:23
 msgid "Date federated"
 msgstr "Fecha de federalización"
 
-#: bookwyrm/templates/settings/federation.html:28
+#: bookwyrm/templates/settings/federation.html:27
 msgid "Software"
 msgstr "Software"
 
-#: bookwyrm/templates/settings/federation.html:31
-#: bookwyrm/templates/settings/manage_invite_requests.html:44
-#: bookwyrm/templates/settings/status_filter.html:5
-#: bookwyrm/templates/user_admin/user_admin.html:34
-msgid "Status"
-msgstr "Status"
-
 #: bookwyrm/templates/settings/manage_invite_requests.html:4
 #: bookwyrm/templates/settings/manage_invite_requests.html:11
 #: bookwyrm/templates/settings/manage_invite_requests.html:25
@@ -2153,6 +2274,12 @@ msgstr "Permitir solicitudes de invitación:"
 msgid "Registration closed text:"
 msgstr "Texto de registración cerrada:"
 
+#: bookwyrm/templates/snippets/announcement.html:27
+#, fuzzy, python-format
+#| msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
+msgid "Posted by <a href=\"%(user_path)s\">%(username)s</a>"
+msgstr "Agregado por <a href=\"%(user_path)s\">%(username)s</a>"
+
 #: bookwyrm/templates/snippets/book_cover.html:31
 msgid "No cover"
 msgstr "Sin portada"
@@ -2264,11 +2391,6 @@ msgstr "¿Eliminar estas fechas de lectura?"
 msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr "Estás eliminando esta lectura y sus %(count)s actualizaciones de progreso asociados."
 
-#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
-#: bookwyrm/templates/snippets/follow_request_buttons.html:12
-msgid "Delete"
-msgstr "Eliminar"
-
 #: bookwyrm/templates/snippets/fav_button.html:9
 #: bookwyrm/templates/snippets/fav_button.html:11
 msgid "Like"
@@ -2720,16 +2842,16 @@ msgstr "Eliminar estante"
 msgid "Edit profile"
 msgstr "Editar perfil"
 
-#: bookwyrm/templates/user/user.html:34
+#: bookwyrm/templates/user/user.html:33
 #, python-format
 msgid "View all %(size)s"
 msgstr "Ver todos los %(size)s"
 
-#: bookwyrm/templates/user/user.html:47
+#: bookwyrm/templates/user/user.html:46
 msgid "View all books"
 msgstr "Ver todos los libros"
 
-#: bookwyrm/templates/user/user.html:60
+#: bookwyrm/templates/user/user.html:59
 msgid "User Activity"
 msgstr "Actividad de usuario"
 
@@ -2834,11 +2956,11 @@ msgstr "Des-suspender usuario"
 msgid "Access level:"
 msgstr "Nivel de acceso:"
 
-#: bookwyrm/views/password.py:30 bookwyrm/views/password.py:35
+#: bookwyrm/views/password.py:32
 msgid "No user with that email address was found."
 msgstr "No se pudo encontrar un usuario con esa dirección de correo electrónico."
 
-#: bookwyrm/views/password.py:44
+#: bookwyrm/views/password.py:41
 #, python-format
 msgid "A password reset link sent to %s"
 msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
@@ -3904,9 +4026,6 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid "Send follow request"
 #~ msgstr "Envia solicitud de seguidor"
 
-#~ msgid "Announcements"
-#~ msgstr "Anuncios"
-
 #~ msgid "Site Configuration"
 #~ msgstr "Configuracion de sitio"
 
diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index a822eea4aef7397e08897d9ac41908c8d5b8d58d..8d377f42069c249539b29f61221b14d4910a80a7 100644
GIT binary patch
delta 10989
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
M3NL&#cUrms0xGylTL1t6

delta 11046
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
Rvhqh1WoN_{ADCkY{~t@pXs-YO

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 6362adcc..ed622640 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-14 15:12-0700\n"
+"POT-Creation-Date: 2021-05-20 12:12-0700\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"
@@ -47,33 +47,33 @@ msgstr "%(count)d utilisations"
 msgid "Unlimited"
 msgstr "Sans limite"
 
-#: bookwyrm/forms.py:293
+#: bookwyrm/forms.py:299
 msgid "List Order"
 msgstr ""
 
-#: bookwyrm/forms.py:294
+#: bookwyrm/forms.py:300
 #, fuzzy
 #| msgid "Title"
 msgid "Book Title"
 msgstr "Titre"
 
-#: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:34
+#: bookwyrm/forms.py:301 bookwyrm/templates/snippets/create_status_form.html:34
 #: bookwyrm/templates/user/shelf/shelf.html:84
 #: bookwyrm/templates/user/shelf/shelf.html:115
 msgid "Rating"
 msgstr "Note"
 
-#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:101
+#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:101
 msgid "Sort By"
 msgstr ""
 
-#: bookwyrm/forms.py:301
+#: bookwyrm/forms.py:307
 #, fuzzy
 #| msgid "Sorted ascending"
 msgid "Ascending"
 msgstr "Trié par ordre croissant"
 
-#: bookwyrm/forms.py:302
+#: bookwyrm/forms.py:308
 #, fuzzy
 #| msgid "Sorted ascending"
 msgid "Descending"
@@ -89,7 +89,7 @@ msgstr "%(value)s n’est pas une remote_id valide."
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s n’est pas un nom de compte valide."
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:156
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:155
 msgid "username"
 msgstr "nom du compte :"
 
@@ -142,36 +142,36 @@ msgstr "Une erreur s’est produite ; désolé !"
 msgid "Edit Author"
 msgstr "Modifier l’auteur ou autrice"
 
-#: bookwyrm/templates/author/author.html:33
+#: bookwyrm/templates/author/author.html:32
 #: bookwyrm/templates/author/edit_author.html:38
 msgid "Aliases:"
 msgstr ""
 
-#: bookwyrm/templates/author/author.html:39
+#: bookwyrm/templates/author/author.html:38
 msgid "Born:"
 msgstr ""
 
-#: bookwyrm/templates/author/author.html:45
+#: bookwyrm/templates/author/author.html:44
 msgid "Died:"
 msgstr ""
 
-#: bookwyrm/templates/author/author.html:52
+#: bookwyrm/templates/author/author.html:51
 msgid "Wikipedia"
 msgstr "Wikipedia"
 
-#: bookwyrm/templates/author/author.html:56
-#: bookwyrm/templates/book/book.html:81
+#: bookwyrm/templates/author/author.html:55
+#: bookwyrm/templates/book/book.html:78
 msgid "View on OpenLibrary"
 msgstr "Voir sur OpenLibrary"
 
-#: bookwyrm/templates/author/author.html:61
-#: bookwyrm/templates/book/book.html:84
+#: bookwyrm/templates/author/author.html:60
+#: bookwyrm/templates/book/book.html:81
 #, fuzzy
 #| msgid "View on OpenLibrary"
 msgid "View on Inventaire"
 msgstr "Voir sur OpenLibrary"
 
-#: bookwyrm/templates/author/author.html:75
+#: bookwyrm/templates/author/author.html:74
 #, python-format
 msgid "Books by %(name)s"
 msgstr "Livres par %(name)s"
@@ -208,8 +208,9 @@ msgid "Name:"
 msgstr "Nom :"
 
 #: bookwyrm/templates/author/edit_author.html:40
-#: bookwyrm/templates/book/edit_book.html:128
-#: bookwyrm/templates/book/edit_book.html:165
+#: bookwyrm/templates/book/edit_book.html:132
+#: bookwyrm/templates/book/edit_book.html:141
+#: bookwyrm/templates/book/edit_book.html:178
 #, fuzzy
 #| msgid "Separate multiple publishers with commas."
 msgid "Separate multiple values with commas."
@@ -236,11 +237,11 @@ msgid "Author Identifiers"
 msgstr "Identifiants de l’auteur ou autrice"
 
 #: bookwyrm/templates/author/edit_author.html:74
-#: bookwyrm/templates/book/edit_book.html:223
 msgid "Openlibrary key:"
 msgstr "Clé Openlibrary :"
 
 #: bookwyrm/templates/author/edit_author.html:79
+#: bookwyrm/templates/book/edit_book.html:243
 #, fuzzy
 #| msgid "View on OpenLibrary"
 msgid "Inventaire ID:"
@@ -255,12 +256,13 @@ msgid "Goodreads key:"
 msgstr "Clé Goodreads :"
 
 #: bookwyrm/templates/author/edit_author.html:98
-#: bookwyrm/templates/book/book.html:127
-#: bookwyrm/templates/book/edit_book.html:241
+#: bookwyrm/templates/book/book.html:124
+#: bookwyrm/templates/book/edit_book.html:263
 #: bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
+#: bookwyrm/templates/settings/announcement_form.html:65
 #: bookwyrm/templates/settings/edit_server.html:68
-#: bookwyrm/templates/settings/federated_server.html:94
+#: bookwyrm/templates/settings/federated_server.html:98
 #: bookwyrm/templates/settings/site.html:97
 #: bookwyrm/templates/snippets/readthrough.html:77
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
@@ -271,11 +273,11 @@ msgid "Save"
 msgstr "Enregistrer"
 
 #: bookwyrm/templates/author/edit_author.html:99
-#: bookwyrm/templates/book/book.html:128 bookwyrm/templates/book/book.html:180
+#: bookwyrm/templates/book/book.html:125 bookwyrm/templates/book/book.html:174
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:242
+#: bookwyrm/templates/book/edit_book.html:264
 #: bookwyrm/templates/moderation/report_modal.html:34
-#: bookwyrm/templates/settings/federated_server.html:95
+#: bookwyrm/templates/settings/federated_server.html:99
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
 #: bookwyrm/templates/snippets/readthrough.html:78
@@ -286,110 +288,106 @@ msgstr "Enregistrer"
 msgid "Cancel"
 msgstr "Annuler"
 
-#: bookwyrm/templates/book/book.html:33
+#: bookwyrm/templates/book/book.html:31
 #: bookwyrm/templates/discover/large-book.html:25
 #: bookwyrm/templates/discover/small-book.html:19
 msgid "by"
 msgstr "par"
 
-#: bookwyrm/templates/book/book.html:41 bookwyrm/templates/book/book.html:42
+#: bookwyrm/templates/book/book.html:39 bookwyrm/templates/book/book.html:40
 msgid "Edit Book"
 msgstr "Modifier le livre"
 
-#: bookwyrm/templates/book/book.html:60
+#: bookwyrm/templates/book/book.html:57
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "Ajouter une couverture"
 
-#: bookwyrm/templates/book/book.html:64
+#: bookwyrm/templates/book/book.html:61
 msgid "Failed to load cover"
 msgstr "La couverture n’a pu être chargée"
 
-#: bookwyrm/templates/book/book.html:104
+#: bookwyrm/templates/book/book.html:101
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s critique)"
 msgstr[1] "(%(review_count)s critiques)"
 
-#: bookwyrm/templates/book/book.html:116
+#: bookwyrm/templates/book/book.html:113
 msgid "Add Description"
 msgstr "Ajouter une description"
 
-#: bookwyrm/templates/book/book.html:123
-#: bookwyrm/templates/book/edit_book.html:107
+#: bookwyrm/templates/book/book.html:120
+#: bookwyrm/templates/book/edit_book.html:108
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Description :"
 
-#: bookwyrm/templates/book/book.html:137
+#: bookwyrm/templates/book/book.html:134
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s/editions\">%(count)s éditions</a>"
 
-#: bookwyrm/templates/book/book.html:145
+#: bookwyrm/templates/book/book.html:142
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "Cette édition est sur votre étagère <a href=\"%(path)s\">%(shelf_name)s</a>."
 
-#: bookwyrm/templates/book/book.html:151
+#: bookwyrm/templates/book/book.html:148
 #, python-format
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr "Une <a href=\"%(book_path)s\">édition différente</a> de ce livre existe sur votre étagère <a href=\"%(shelf_path)s\">%(shelf_name)s</a>."
 
-#: bookwyrm/templates/book/book.html:162
+#: bookwyrm/templates/book/book.html:159
 msgid "Your reading activity"
 msgstr "Votre activité de lecture"
 
-#: bookwyrm/templates/book/book.html:165
+#: bookwyrm/templates/book/book.html:162
 msgid "Add read dates"
 msgstr "Ajouter des dates de lecture"
 
-#: bookwyrm/templates/book/book.html:170
-msgid "You don't have any reading activity for this book."
-msgstr "Vous n’avez aucune activité de lecture pour ce livre"
-
-#: bookwyrm/templates/book/book.html:177
+#: bookwyrm/templates/book/book.html:171
 msgid "Create"
 msgstr "Créer"
 
-#: bookwyrm/templates/book/book.html:203
+#: bookwyrm/templates/book/book.html:181
+msgid "You don't have any reading activity for this book."
+msgstr "Vous n’avez aucune activité de lecture pour ce livre"
+
+#: bookwyrm/templates/book/book.html:200
 #, fuzzy
 #| msgid "Review"
 msgid "Reviews"
 msgstr "Critique"
 
-#: bookwyrm/templates/book/book.html:208
+#: bookwyrm/templates/book/book.html:205
 #, fuzzy
 #| msgid "Your shelves"
 msgid "Your reviews"
 msgstr "Vos étagères"
 
-#: bookwyrm/templates/book/book.html:214
+#: bookwyrm/templates/book/book.html:211
 #, fuzzy
 #| msgid "Your Account"
 msgid "Your comments"
 msgstr "Votre compte"
 
-#: bookwyrm/templates/book/book.html:220
+#: bookwyrm/templates/book/book.html:217
 #, fuzzy
 #| msgid "Your books"
 msgid "Your quotes"
 msgstr "Vos livres"
 
-#: bookwyrm/templates/book/book.html:255
-msgid "rated it"
-msgstr "l’a noté"
-
-#: bookwyrm/templates/book/book.html:276
+#: bookwyrm/templates/book/book.html:253
 msgid "Subjects"
 msgstr "Sujets"
 
-#: bookwyrm/templates/book/book.html:288
+#: bookwyrm/templates/book/book.html:265
 msgid "Places"
 msgstr "Lieux"
 
-#: bookwyrm/templates/book/book.html:299 bookwyrm/templates/layout.html:65
+#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
@@ -397,37 +395,37 @@ msgstr "Lieux"
 msgid "Lists"
 msgstr "Listes"
 
-#: bookwyrm/templates/book/book.html:310
+#: bookwyrm/templates/book/book.html:287
 msgid "Add to list"
 msgstr "Ajouter à la liste"
 
-#: bookwyrm/templates/book/book.html:320
+#: bookwyrm/templates/book/book.html:297
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:164
 msgid "Add"
 msgstr "Ajouter"
 
-#: bookwyrm/templates/book/book_identifiers.html:8
+#: bookwyrm/templates/book/book_identifiers.html:7
 msgid "ISBN:"
 msgstr "ISBN :"
 
-#: bookwyrm/templates/book/book_identifiers.html:15
-#: bookwyrm/templates/book/edit_book.html:227
+#: bookwyrm/templates/book/book_identifiers.html:14
+#: bookwyrm/templates/book/edit_book.html:248
 msgid "OCLC Number:"
 msgstr "Numéro OCLC :"
 
-#: bookwyrm/templates/book/book_identifiers.html:22
-#: bookwyrm/templates/book/edit_book.html:231
+#: bookwyrm/templates/book/book_identifiers.html:21
+#: bookwyrm/templates/book/edit_book.html:253
 msgid "ASIN:"
 msgstr "ASIN :"
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:179
+#: bookwyrm/templates/book/edit_book.html:192
 msgid "Upload cover:"
 msgstr "Charger une couverture :"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:185
+#: bookwyrm/templates/book/edit_book.html:198
 msgid "Load cover from url:"
 msgstr "Charger la couverture depuis une URL :"
 
@@ -483,81 +481,93 @@ msgstr "Confirmer"
 msgid "Back"
 msgstr "Retour"
 
-#: bookwyrm/templates/book/edit_book.html:92
+#: bookwyrm/templates/book/edit_book.html:93
 msgid "Title:"
 msgstr "Titre :"
 
-#: bookwyrm/templates/book/edit_book.html:100
+#: bookwyrm/templates/book/edit_book.html:101
 msgid "Subtitle:"
 msgstr "Sous‑titre :"
 
-#: bookwyrm/templates/book/edit_book.html:113
+#: bookwyrm/templates/book/edit_book.html:114
 msgid "Series:"
 msgstr "Série :"
 
-#: bookwyrm/templates/book/edit_book.html:120
+#: bookwyrm/templates/book/edit_book.html:122
 msgid "Series number:"
 msgstr "Numéro dans la série :"
 
-#: bookwyrm/templates/book/edit_book.html:126
+#: bookwyrm/templates/book/edit_book.html:130
+#, fuzzy
+#| msgid "Language:"
+msgid "Languages:"
+msgstr "Langue :"
+
+#: bookwyrm/templates/book/edit_book.html:139
 msgid "Publisher:"
 msgstr "Éditeur :"
 
-#: bookwyrm/templates/book/edit_book.html:135
+#: bookwyrm/templates/book/edit_book.html:148
 msgid "First published date:"
 msgstr "Première date de publication :"
 
-#: bookwyrm/templates/book/edit_book.html:143
+#: bookwyrm/templates/book/edit_book.html:156
 msgid "Published date:"
 msgstr "Date de publication :"
 
-#: bookwyrm/templates/book/edit_book.html:152
+#: bookwyrm/templates/book/edit_book.html:165
 msgid "Authors"
 msgstr "Auteurs ou autrices"
 
-#: bookwyrm/templates/book/edit_book.html:158
+#: bookwyrm/templates/book/edit_book.html:171
 #, python-format
 msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
 msgstr "Supprimer <a href=\"%(path)s\">%(name)s</a>"
 
-#: bookwyrm/templates/book/edit_book.html:163
+#: bookwyrm/templates/book/edit_book.html:176
 msgid "Add Authors:"
 msgstr "Ajouter des auteurs ou autrices :"
 
-#: bookwyrm/templates/book/edit_book.html:164
+#: bookwyrm/templates/book/edit_book.html:177
 msgid "John Doe, Jane Smith"
 msgstr "Claude Dupont, Dominique Durand"
 
-#: bookwyrm/templates/book/edit_book.html:170
+#: bookwyrm/templates/book/edit_book.html:183
 #: bookwyrm/templates/user/shelf/shelf.html:77
 msgid "Cover"
 msgstr "Couverture"
 
-#: bookwyrm/templates/book/edit_book.html:198
+#: bookwyrm/templates/book/edit_book.html:211
 msgid "Physical Properties"
 msgstr "Propriétés physiques"
 
-#: bookwyrm/templates/book/edit_book.html:199
+#: bookwyrm/templates/book/edit_book.html:212
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "Format :"
 
-#: bookwyrm/templates/book/edit_book.html:207
+#: bookwyrm/templates/book/edit_book.html:220
 msgid "Pages:"
 msgstr "Pages :"
 
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:227
 msgid "Book Identifiers"
 msgstr "Identifiants du livre"
 
-#: bookwyrm/templates/book/edit_book.html:215
+#: bookwyrm/templates/book/edit_book.html:228
 msgid "ISBN 13:"
 msgstr "ISBN 13 :"
 
-#: bookwyrm/templates/book/edit_book.html:219
+#: bookwyrm/templates/book/edit_book.html:233
 msgid "ISBN 10:"
 msgstr "ISBN 10 :"
 
+#: bookwyrm/templates/book/edit_book.html:238
+#, fuzzy
+#| msgid "Openlibrary key:"
+msgid "Openlibrary ID:"
+msgstr "Clé Openlibrary :"
+
 #: bookwyrm/templates/book/editions.html:4
 #, python-format
 msgid "Editions of %(book_title)s"
@@ -612,12 +622,17 @@ msgstr "Publié %(date)s"
 msgid "Published by %(publisher)s."
 msgstr "Publié par %(publisher)s."
 
+#: bookwyrm/templates/book/rating.html:13
+msgid "rated it"
+msgstr "l’a noté"
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
 #: bookwyrm/templates/feed/feed_layout.html:69
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
 #: bookwyrm/templates/search/book.html:32
+#: bookwyrm/templates/snippets/announcement.html:17
 msgid "Close"
 msgstr "Fermer"
 
@@ -639,7 +654,7 @@ msgstr "Communauté fédérée"
 
 #: bookwyrm/templates/directory/directory.html:4
 #: bookwyrm/templates/directory/directory.html:9
-#: bookwyrm/templates/layout.html:93
+#: bookwyrm/templates/layout.html:92
 msgid "Directory"
 msgstr "Répertoire"
 
@@ -653,6 +668,7 @@ msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings
 msgstr "Vous pouvez décider de ne plus y figurer à n’importe quel moment depuis vos <a href=\"%(path)s\">paramètres de profil.</a>"
 
 #: bookwyrm/templates/directory/directory.html:29
+#: bookwyrm/templates/snippets/announcement.html:30
 #: bookwyrm/templates/snippets/goal_card.html:22
 msgid "Dismiss message"
 msgstr "Rejeter le message"
@@ -743,7 +759,7 @@ msgid "Join %(name)s"
 msgstr "Rejoignez %(name)s"
 
 #: bookwyrm/templates/discover/landing_layout.html:51
-#: bookwyrm/templates/login.html:48
+#: bookwyrm/templates/login.html:51
 msgid "This instance is closed"
 msgstr "Cette instance est fermée"
 
@@ -839,7 +855,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:88
+#: bookwyrm/templates/layout.html:87
 msgid "Direct Messages"
 msgstr "Messages directs"
 
@@ -895,7 +911,7 @@ msgid "Updates"
 msgstr "Mises à jour"
 
 #: bookwyrm/templates/feed/feed_layout.html:10
-#: bookwyrm/templates/layout.html:59
+#: bookwyrm/templates/layout.html:58
 #: bookwyrm/templates/user/shelf/books_header.html:3
 msgid "Your books"
 msgstr "Vos livres"
@@ -969,7 +985,7 @@ msgstr "Vous pourrez ajouter des livres lorsque vous commencerez à utiliser %(s
 #: bookwyrm/templates/get_started/books.html:17
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
-#: bookwyrm/templates/layout.html:38 bookwyrm/templates/layout.html:39
+#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
 #: bookwyrm/templates/lists/list.html:124
 #: bookwyrm/templates/search/layout.html:4
 #: bookwyrm/templates/search/layout.html:9
@@ -1098,7 +1114,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "Livres de %(username)s en %(year)s"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/layout.html:98
+#: bookwyrm/templates/layout.html:97
 msgid "Import Books"
 msgstr "Importer des livres"
 
@@ -1199,7 +1215,7 @@ msgid "Imported"
 msgstr "Importé"
 
 #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12
-#: bookwyrm/templates/login.html:43
+#: bookwyrm/templates/login.html:46
 msgid "Create an Account"
 msgstr "Créer un compte"
 
@@ -1224,23 +1240,23 @@ msgstr "Résultats de recherche pour « %(query)s »"
 msgid "Matching Books"
 msgstr "Livres correspondants"
 
-#: bookwyrm/templates/layout.html:34
+#: bookwyrm/templates/layout.html:33
 msgid "Search for a book or user"
 msgstr "Chercher un livre ou un compte"
 
-#: bookwyrm/templates/layout.html:48 bookwyrm/templates/layout.html:49
+#: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48
 msgid "Main navigation menu"
 msgstr "Menu de navigation principal "
 
-#: bookwyrm/templates/layout.html:62
+#: bookwyrm/templates/layout.html:61
 msgid "Feed"
 msgstr "Fil d’actualité"
 
-#: bookwyrm/templates/layout.html:103
+#: bookwyrm/templates/layout.html:102
 msgid "Settings"
 msgstr "Paramètres"
 
-#: bookwyrm/templates/layout.html:112
+#: bookwyrm/templates/layout.html:111
 #: bookwyrm/templates/settings/admin_layout.html:31
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
@@ -1248,64 +1264,63 @@ msgstr "Paramètres"
 msgid "Invites"
 msgstr "Invitations"
 
-#: bookwyrm/templates/layout.html:119
+#: bookwyrm/templates/layout.html:118
 msgid "Admin"
 msgstr "Admin"
 
-#: bookwyrm/templates/layout.html:126
+#: bookwyrm/templates/layout.html:125
 msgid "Log out"
 msgstr "Se déconnecter"
 
-#: bookwyrm/templates/layout.html:134 bookwyrm/templates/layout.html:135
+#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr "Notifications"
 
-#: bookwyrm/templates/layout.html:155 bookwyrm/templates/layout.html:159
+#: bookwyrm/templates/layout.html:154 bookwyrm/templates/layout.html:158
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "Nom du compte :"
 
-#: bookwyrm/templates/layout.html:160
+#: bookwyrm/templates/layout.html:159
 msgid "password"
 msgstr "Mot de passe"
 
-#: bookwyrm/templates/layout.html:161 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr "Mot de passe oublié ?"
 
-#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:163 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "Se connecter"
 
-#: bookwyrm/templates/layout.html:172
+#: bookwyrm/templates/layout.html:171
 msgid "Join"
 msgstr "Rejoindre"
 
-#: bookwyrm/templates/layout.html:198
+#: bookwyrm/templates/layout.html:206
 msgid "About this server"
 msgstr "À propos de ce serveur"
 
-#: bookwyrm/templates/layout.html:202
+#: bookwyrm/templates/layout.html:210
 msgid "Contact site admin"
 msgstr "Contacter l’administrateur du site"
 
-#: bookwyrm/templates/layout.html:206
+#: bookwyrm/templates/layout.html:214
 #, fuzzy
 #| msgid "List curation:"
 msgid "Documentation"
 msgstr "Modération de la liste :"
 
-#: bookwyrm/templates/layout.html:213
+#: bookwyrm/templates/layout.html:221
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr "Soutenez %(site_name)s avec <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 
-#: bookwyrm/templates/layout.html:217
-#| msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+#: bookwyrm/templates/layout.html:225
 msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports de bogues via <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
@@ -1376,6 +1391,7 @@ msgstr "N’importe qui peut suggérer des livres, soumis à votre approbation"
 #: bookwyrm/templates/lists/form.html:31
 #: bookwyrm/templates/moderation/reports.html:25
 #: bookwyrm/templates/search/book.html:30
+#: bookwyrm/templates/snippets/announcement.html:15
 msgid "Open"
 msgstr "Ouverte"
 
@@ -1469,11 +1485,11 @@ msgstr "Connexion"
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: bookwyrm/templates/login.html:49
+#: bookwyrm/templates/login.html:52
 msgid "Contact an administrator to get an invite"
 msgstr "Contacter un administrateur pour obtenir une invitation"
 
-#: bookwyrm/templates/login.html:59
+#: bookwyrm/templates/login.html:63
 msgid "More about this site"
 msgstr "En savoir plus sur ce site"
 
@@ -1823,31 +1839,144 @@ msgid "Instance Settings"
 msgstr "Paramètres de l’instance"
 
 #: bookwyrm/templates/settings/admin_layout.html:48
+#: bookwyrm/templates/settings/announcements.html:3
+#: bookwyrm/templates/settings/announcements.html:5
+msgid "Announcements"
+msgstr "Annonces"
+
+#: bookwyrm/templates/settings/admin_layout.html:52
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr "Paramètres du site"
 
-#: bookwyrm/templates/settings/admin_layout.html:51
+#: bookwyrm/templates/settings/admin_layout.html:55
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr "Information sur l’instance"
 
-#: bookwyrm/templates/settings/admin_layout.html:52
+#: bookwyrm/templates/settings/admin_layout.html:56
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr "Images"
 
-#: bookwyrm/templates/settings/admin_layout.html:53
+#: bookwyrm/templates/settings/admin_layout.html:57
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr "Contenu du pied de page"
 
-#: bookwyrm/templates/settings/admin_layout.html:54
+#: bookwyrm/templates/settings/admin_layout.html:58
 #: bookwyrm/templates/settings/site.html:81
 msgid "Registration"
 msgstr "Enregistrement"
 
+#: bookwyrm/templates/settings/announcement.html:3
+#: bookwyrm/templates/settings/announcement.html:6
+#, fuzzy
+#| msgid "Announcements"
+msgid "Announcement"
+msgstr "Annonces"
+
+#: bookwyrm/templates/settings/announcement.html:7
+#: bookwyrm/templates/settings/federated_server.html:13
+#, fuzzy
+#| msgid "Back to server list"
+msgid "Back to list"
+msgstr "Retour à la liste des serveurs"
+
+#: bookwyrm/templates/settings/announcement.html:11
+#, fuzzy
+#| msgid "Announcements"
+msgid "Edit Announcement"
+msgstr "Annonces"
+
+#: bookwyrm/templates/settings/announcement.html:20
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
+#: bookwyrm/templates/snippets/follow_request_buttons.html:12
+msgid "Delete"
+msgstr "Supprimer"
+
+#: bookwyrm/templates/settings/announcement.html:35
+msgid "Visible:"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcement.html:38
+msgid "True"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcement.html:40
+msgid "False"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcement.html:47
+#, fuzzy
+#| msgid "Birth date:"
+msgid "Start date:"
+msgstr "Date de naissance :"
+
+#: bookwyrm/templates/settings/announcement.html:54
+#, fuzzy
+#| msgid "Birth date:"
+msgid "End date:"
+msgstr "Date de naissance :"
+
+#: bookwyrm/templates/settings/announcement.html:60
+#, fuzzy
+#| msgid "Active"
+msgid "Active:"
+msgstr "Actif"
+
+#: bookwyrm/templates/settings/announcement_form.html:5
+#: bookwyrm/templates/settings/announcements.html:8
+#, fuzzy
+#| msgid "Announcements"
+msgid "Create Announcement"
+msgstr "Annonces"
+
+#: bookwyrm/templates/settings/announcements.html:22
+#, fuzzy
+#| msgid "Date Added"
+msgid "Date added"
+msgstr "Date d’ajout"
+
+#: bookwyrm/templates/settings/announcements.html:26
+#, fuzzy
+#| msgid "reviewed"
+msgid "Preview"
+msgstr "a écrit une critique de"
+
+#: bookwyrm/templates/settings/announcements.html:30
+#, fuzzy
+#| msgid "Started"
+msgid "Start date"
+msgstr "Commencé"
+
+#: bookwyrm/templates/settings/announcements.html:34
+#, fuzzy
+#| msgid "Edit read dates"
+msgid "End date"
+msgstr "Modifier les date de lecture"
+
+#: bookwyrm/templates/settings/announcements.html:38
+#: bookwyrm/templates/settings/federation.html:30
+#: bookwyrm/templates/settings/manage_invite_requests.html:44
+#: bookwyrm/templates/settings/status_filter.html:5
+#: bookwyrm/templates/user_admin/user_admin.html:34
+msgid "Status"
+msgstr "Statut"
+
+#: bookwyrm/templates/settings/announcements.html:48
+#, fuzzy
+#| msgid "Inactive"
+msgid "active"
+msgstr "Inactif"
+
+#: bookwyrm/templates/settings/announcements.html:48
+#, fuzzy
+#| msgid "Inactive"
+msgid "inactive"
+msgstr "Inactif"
+
 #: bookwyrm/templates/settings/edit_server.html:3
 #: bookwyrm/templates/settings/edit_server.html:6
 #: bookwyrm/templates/settings/edit_server.html:20
@@ -1861,7 +1990,6 @@ msgid "Add server"
 msgstr "Ajouter une couverture"
 
 #: bookwyrm/templates/settings/edit_server.html:7
-#: bookwyrm/templates/settings/federated_server.html:13
 #: bookwyrm/templates/settings/server_blocklist.html:7
 msgid "Back to server list"
 msgstr "Retour à la liste des serveurs"
@@ -1880,7 +2008,7 @@ msgid "Instance:"
 msgstr "Nom de l’instance :"
 
 #: bookwyrm/templates/settings/edit_server.html:37
-#: bookwyrm/templates/settings/federated_server.html:30
+#: bookwyrm/templates/settings/federated_server.html:31
 #: bookwyrm/templates/user_admin/user_info.html:34
 msgid "Status:"
 msgstr "Statut :"
@@ -1893,13 +2021,13 @@ msgid "Blocked"
 msgstr "Bloquer"
 
 #: bookwyrm/templates/settings/edit_server.html:48
-#: bookwyrm/templates/settings/federated_server.html:22
+#: bookwyrm/templates/settings/federated_server.html:23
 #: bookwyrm/templates/user_admin/user_info.html:26
 msgid "Software:"
 msgstr "Logiciel :"
 
 #: bookwyrm/templates/settings/edit_server.html:55
-#: bookwyrm/templates/settings/federated_server.html:26
+#: bookwyrm/templates/settings/federated_server.html:27
 #: bookwyrm/templates/user_admin/user_info.html:30
 msgid "Version:"
 msgstr "Description :"
@@ -1912,90 +2040,83 @@ msgstr ""
 msgid "Details"
 msgstr "Détails"
 
-#: bookwyrm/templates/settings/federated_server.html:37
+#: bookwyrm/templates/settings/federated_server.html:39
 #: bookwyrm/templates/user/layout.html:56
 msgid "Activity"
 msgstr "Activité"
 
-#: bookwyrm/templates/settings/federated_server.html:40
+#: bookwyrm/templates/settings/federated_server.html:43
 msgid "Users:"
 msgstr "Comptes :"
 
-#: bookwyrm/templates/settings/federated_server.html:43
-#: bookwyrm/templates/settings/federated_server.html:50
+#: bookwyrm/templates/settings/federated_server.html:46
+#: bookwyrm/templates/settings/federated_server.html:53
 msgid "View all"
 msgstr "Voir tous"
 
-#: bookwyrm/templates/settings/federated_server.html:47
+#: bookwyrm/templates/settings/federated_server.html:50
 msgid "Reports:"
 msgstr "Signalements :"
 
-#: bookwyrm/templates/settings/federated_server.html:54
+#: bookwyrm/templates/settings/federated_server.html:57
 msgid "Followed by us:"
 msgstr "Suivi par nous :"
 
-#: bookwyrm/templates/settings/federated_server.html:60
+#: bookwyrm/templates/settings/federated_server.html:63
 msgid "Followed by them:"
 msgstr "Suivi par eux :"
 
-#: bookwyrm/templates/settings/federated_server.html:66
+#: bookwyrm/templates/settings/federated_server.html:69
 msgid "Blocked by us:"
 msgstr "Bloqués par nous :"
 
-#: bookwyrm/templates/settings/federated_server.html:78
+#: bookwyrm/templates/settings/federated_server.html:82
 #: bookwyrm/templates/user_admin/user_info.html:39
 msgid "Notes"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:81
+#: bookwyrm/templates/settings/federated_server.html:85
 #, fuzzy
 #| msgid "Edit Book"
 msgid "Edit"
 msgstr "Modifier le livre"
 
-#: bookwyrm/templates/settings/federated_server.html:101
+#: bookwyrm/templates/settings/federated_server.html:105
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:3
 msgid "Actions"
 msgstr "Actions"
 
-#: bookwyrm/templates/settings/federated_server.html:105
+#: bookwyrm/templates/settings/federated_server.html:109
 #: bookwyrm/templates/snippets/block_button.html:5
 msgid "Block"
 msgstr "Bloquer"
 
-#: bookwyrm/templates/settings/federated_server.html:106
+#: bookwyrm/templates/settings/federated_server.html:110
 msgid "All users from this instance will be deactivated."
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:111
+#: bookwyrm/templates/settings/federated_server.html:115
 #: bookwyrm/templates/snippets/block_button.html:10
 msgid "Un-block"
 msgstr "Débloquer"
 
-#: bookwyrm/templates/settings/federated_server.html:112
+#: bookwyrm/templates/settings/federated_server.html:116
 msgid "All users from this instance will be re-activated."
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:20
+#: bookwyrm/templates/settings/federation.html:19
 #: bookwyrm/templates/user_admin/server_filter.html:5
 msgid "Server name"
 msgstr "Nom du serveur"
 
-#: bookwyrm/templates/settings/federation.html:24
+#: bookwyrm/templates/settings/federation.html:23
 msgid "Date federated"
 msgstr "Date de fédération"
 
-#: bookwyrm/templates/settings/federation.html:28
+#: bookwyrm/templates/settings/federation.html:27
 msgid "Software"
 msgstr "Logiciel"
 
-#: bookwyrm/templates/settings/federation.html:31
-#: bookwyrm/templates/settings/manage_invite_requests.html:44
-#: bookwyrm/templates/settings/status_filter.html:5
-#: bookwyrm/templates/user_admin/user_admin.html:34
-msgid "Status"
-msgstr "Statut"
-
 #: bookwyrm/templates/settings/manage_invite_requests.html:4
 #: bookwyrm/templates/settings/manage_invite_requests.html:11
 #: bookwyrm/templates/settings/manage_invite_requests.html:25
@@ -2183,6 +2304,12 @@ msgstr "Autoriser les demandes d’invitation :"
 msgid "Registration closed text:"
 msgstr "Texte affiché lorsque les enregistrements sont clos :"
 
+#: bookwyrm/templates/snippets/announcement.html:27
+#, fuzzy, python-format
+#| msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
+msgid "Posted by <a href=\"%(user_path)s\">%(username)s</a>"
+msgstr "Ajoutée par <a href=\"%(user_path)s\">%(username)s</a>"
+
 #: bookwyrm/templates/snippets/book_cover.html:31
 msgid "No cover"
 msgstr "Aucune couverture"
@@ -2294,11 +2421,6 @@ msgstr "Supprimer ces dates de lecture ?"
 msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr "Vous avez supprimé ce résumé et ses %(count)s progressions associées."
 
-#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
-#: bookwyrm/templates/snippets/follow_request_buttons.html:12
-msgid "Delete"
-msgstr "Supprimer"
-
 #: bookwyrm/templates/snippets/fav_button.html:9
 #: bookwyrm/templates/snippets/fav_button.html:11
 msgid "Like"
@@ -2749,16 +2871,16 @@ msgstr "Supprimer l’étagère"
 msgid "Edit profile"
 msgstr "Modifier le profil"
 
-#: bookwyrm/templates/user/user.html:34
+#: bookwyrm/templates/user/user.html:33
 #, python-format
 msgid "View all %(size)s"
 msgstr "Voir les %(size)s"
 
-#: bookwyrm/templates/user/user.html:47
+#: bookwyrm/templates/user/user.html:46
 msgid "View all books"
 msgstr "Voir tous les livres"
 
-#: bookwyrm/templates/user/user.html:60
+#: bookwyrm/templates/user/user.html:59
 msgid "User Activity"
 msgstr "Activité du compte"
 
@@ -2869,11 +2991,11 @@ msgstr ""
 msgid "Access level:"
 msgstr ""
 
-#: bookwyrm/views/password.py:30 bookwyrm/views/password.py:35
+#: bookwyrm/views/password.py:32
 msgid "No user with that email address was found."
 msgstr "Aucun compte avec cette adresse email n’a été trouvé."
 
-#: bookwyrm/views/password.py:44
+#: bookwyrm/views/password.py:41
 #, python-format
 msgid "A password reset link sent to %s"
 msgstr "Un lien de réinitialisation a été envoyé à %s."
@@ -3257,9 +3379,6 @@ msgstr "Un lien de réinitialisation a été envoyé à %s."
 #~ msgid "Send follow request"
 #~ msgstr "Envoyer une demande d’abonnement"
 
-#~ msgid "Announcements"
-#~ msgstr "Annonces"
-
 #~ msgid "Site Configuration"
 #~ msgstr "Configuration du site"
 
diff --git a/locale/zh_Hans/LC_MESSAGES/django.mo b/locale/zh_Hans/LC_MESSAGES/django.mo
index fa845263a2bff33a706da53f66617e5933d7f0bd..17b3df6956342292739f79d1aa1f47e4e6dd7793 100644
GIT binary patch
delta 10901
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

delta 10964
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
BM+g7_

diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
index 0f399924..b6bd5b4e 100644
--- a/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/locale/zh_Hans/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-14 15:12-0700\n"
+"POT-Creation-Date: 2021-05-20 12:12-0700\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"
@@ -47,33 +47,33 @@ msgstr "%(count)d 次使用"
 msgid "Unlimited"
 msgstr "���"
 
-#: bookwyrm/forms.py:293
+#: bookwyrm/forms.py:299
 msgid "List Order"
 msgstr ""
 
-#: bookwyrm/forms.py:294
+#: bookwyrm/forms.py:300
 #, fuzzy
 #| msgid "Title"
 msgid "Book Title"
 msgstr "标题"
 
-#: bookwyrm/forms.py:295 bookwyrm/templates/snippets/create_status_form.html:34
+#: bookwyrm/forms.py:301 bookwyrm/templates/snippets/create_status_form.html:34
 #: bookwyrm/templates/user/shelf/shelf.html:84
 #: bookwyrm/templates/user/shelf/shelf.html:115
 msgid "Rating"
 msgstr "评价"
 
-#: bookwyrm/forms.py:297 bookwyrm/templates/lists/list.html:101
+#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:101
 msgid "Sort By"
 msgstr ""
 
-#: bookwyrm/forms.py:301
+#: bookwyrm/forms.py:307
 #, fuzzy
 #| msgid "Sorted ascending"
 msgid "Ascending"
 msgstr "��排�"
 
-#: bookwyrm/forms.py:302
+#: bookwyrm/forms.py:308
 #, fuzzy
 #| msgid "Sorted ascending"
 msgid "Descending"
@@ -89,7 +89,7 @@ msgstr "%(value)s �是有效的 remote_id"
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s �是有效的用户�"
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:156
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:155
 msgid "username"
 msgstr "用户�"
 
@@ -142,36 +142,36 @@ msgstr "�些东西出错了�对�起啦。"
 msgid "Edit Author"
 msgstr "编辑作者"
 
-#: bookwyrm/templates/author/author.html:33
+#: bookwyrm/templates/author/author.html:32
 #: bookwyrm/templates/author/edit_author.html:38
 msgid "Aliases:"
 msgstr ""
 
-#: bookwyrm/templates/author/author.html:39
+#: bookwyrm/templates/author/author.html:38
 msgid "Born:"
 msgstr ""
 
-#: bookwyrm/templates/author/author.html:45
+#: bookwyrm/templates/author/author.html:44
 msgid "Died:"
 msgstr ""
 
-#: bookwyrm/templates/author/author.html:52
+#: bookwyrm/templates/author/author.html:51
 msgid "Wikipedia"
 msgstr "维基百科"
 
-#: bookwyrm/templates/author/author.html:56
-#: bookwyrm/templates/book/book.html:81
+#: bookwyrm/templates/author/author.html:55
+#: bookwyrm/templates/book/book.html:78
 msgid "View on OpenLibrary"
 msgstr "在 OpenLibrary 查看"
 
-#: bookwyrm/templates/author/author.html:61
-#: bookwyrm/templates/book/book.html:84
+#: bookwyrm/templates/author/author.html:60
+#: bookwyrm/templates/book/book.html:81
 #, fuzzy
 #| msgid "View on OpenLibrary"
 msgid "View on Inventaire"
 msgstr "在 OpenLibrary 查看"
 
-#: bookwyrm/templates/author/author.html:75
+#: bookwyrm/templates/author/author.html:74
 #, python-format
 msgid "Books by %(name)s"
 msgstr "%(name)s 所著的书"
@@ -208,8 +208,9 @@ msgid "Name:"
 msgstr "�称:"
 
 #: bookwyrm/templates/author/edit_author.html:40
-#: bookwyrm/templates/book/edit_book.html:128
-#: bookwyrm/templates/book/edit_book.html:165
+#: bookwyrm/templates/book/edit_book.html:132
+#: bookwyrm/templates/book/edit_book.html:141
+#: bookwyrm/templates/book/edit_book.html:178
 #, fuzzy
 #| msgid "Separate multiple publishers with commas."
 msgid "Separate multiple values with commas."
@@ -236,11 +237,11 @@ msgid "Author Identifiers"
 msgstr "作者标识�:"
 
 #: bookwyrm/templates/author/edit_author.html:74
-#: bookwyrm/templates/book/edit_book.html:223
 msgid "Openlibrary key:"
 msgstr "Openlibrary key:"
 
 #: bookwyrm/templates/author/edit_author.html:79
+#: bookwyrm/templates/book/edit_book.html:243
 #, fuzzy
 #| msgid "View on OpenLibrary"
 msgid "Inventaire ID:"
@@ -255,12 +256,13 @@ msgid "Goodreads key:"
 msgstr "Goodreads key:"
 
 #: bookwyrm/templates/author/edit_author.html:98
-#: bookwyrm/templates/book/book.html:127
-#: bookwyrm/templates/book/edit_book.html:241
+#: bookwyrm/templates/book/book.html:124
+#: bookwyrm/templates/book/edit_book.html:263
 #: bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
+#: bookwyrm/templates/settings/announcement_form.html:65
 #: bookwyrm/templates/settings/edit_server.html:68
-#: bookwyrm/templates/settings/federated_server.html:94
+#: bookwyrm/templates/settings/federated_server.html:98
 #: bookwyrm/templates/settings/site.html:97
 #: bookwyrm/templates/snippets/readthrough.html:77
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
@@ -271,11 +273,11 @@ msgid "Save"
 msgstr "�存"
 
 #: bookwyrm/templates/author/edit_author.html:99
-#: bookwyrm/templates/book/book.html:128 bookwyrm/templates/book/book.html:180
+#: bookwyrm/templates/book/book.html:125 bookwyrm/templates/book/book.html:174
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:242
+#: bookwyrm/templates/book/edit_book.html:264
 #: bookwyrm/templates/moderation/report_modal.html:34
-#: bookwyrm/templates/settings/federated_server.html:95
+#: bookwyrm/templates/settings/federated_server.html:99
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
 #: bookwyrm/templates/snippets/goal_form.html:32
 #: bookwyrm/templates/snippets/readthrough.html:78
@@ -286,109 +288,105 @@ msgstr "�存"
 msgid "Cancel"
 msgstr "�消"
 
-#: bookwyrm/templates/book/book.html:33
+#: bookwyrm/templates/book/book.html:31
 #: bookwyrm/templates/discover/large-book.html:25
 #: bookwyrm/templates/discover/small-book.html:19
 msgid "by"
 msgstr "作者"
 
-#: bookwyrm/templates/book/book.html:41 bookwyrm/templates/book/book.html:42
+#: bookwyrm/templates/book/book.html:39 bookwyrm/templates/book/book.html:40
 msgid "Edit Book"
 msgstr "编辑书目"
 
-#: bookwyrm/templates/book/book.html:60
+#: bookwyrm/templates/book/book.html:57
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
 msgstr "添加��"
 
-#: bookwyrm/templates/book/book.html:64
+#: bookwyrm/templates/book/book.html:61
 msgid "Failed to load cover"
 msgstr "加载��失败"
 
-#: bookwyrm/templates/book/book.html:104
+#: bookwyrm/templates/book/book.html:101
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
 msgstr[0] "(%(review_count)s 则书评)"
 
-#: bookwyrm/templates/book/book.html:116
+#: bookwyrm/templates/book/book.html:113
 msgid "Add Description"
 msgstr "添加�述"
 
-#: bookwyrm/templates/book/book.html:123
-#: bookwyrm/templates/book/edit_book.html:107
+#: bookwyrm/templates/book/book.html:120
+#: bookwyrm/templates/book/edit_book.html:108
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "�述:"
 
-#: bookwyrm/templates/book/book.html:137
+#: bookwyrm/templates/book/book.html:134
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
 msgstr "<a href=\"%(path)s/editions\">%(count)s 个版本</a>"
 
-#: bookwyrm/templates/book/book.html:145
+#: bookwyrm/templates/book/book.html:142
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr "此版本在你的 <a href=\"%(path)s\">%(shelf_name)s</a> 书架上。"
 
-#: bookwyrm/templates/book/book.html:151
+#: bookwyrm/templates/book/book.html:148
 #, python-format
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr "本书的 <a href=\"%(book_path)s\">�一个版本</a> 在你的 <a href=\"%(shelf_path)s\">%(shelf_name)s</a> 书架上。"
 
-#: bookwyrm/templates/book/book.html:162
+#: bookwyrm/templates/book/book.html:159
 msgid "Your reading activity"
 msgstr "你的阅读活动"
 
-#: bookwyrm/templates/book/book.html:165
+#: bookwyrm/templates/book/book.html:162
 msgid "Add read dates"
 msgstr "添加阅读日期"
 
-#: bookwyrm/templates/book/book.html:170
-msgid "You don't have any reading activity for this book."
-msgstr "你还没有任何这本书的阅读活动。"
-
-#: bookwyrm/templates/book/book.html:177
+#: bookwyrm/templates/book/book.html:171
 msgid "Create"
 msgstr "创建"
 
-#: bookwyrm/templates/book/book.html:203
+#: bookwyrm/templates/book/book.html:181
+msgid "You don't have any reading activity for this book."
+msgstr "你还没有任何这本书的阅读活动。"
+
+#: bookwyrm/templates/book/book.html:200
 #, fuzzy
 #| msgid "Review"
 msgid "Reviews"
 msgstr "书评"
 
-#: bookwyrm/templates/book/book.html:208
+#: bookwyrm/templates/book/book.html:205
 #, fuzzy
 #| msgid "Your shelves"
 msgid "Your reviews"
 msgstr "你的书架"
 
-#: bookwyrm/templates/book/book.html:214
+#: bookwyrm/templates/book/book.html:211
 #, fuzzy
 #| msgid "Your Account"
 msgid "Your comments"
 msgstr "你的��"
 
-#: bookwyrm/templates/book/book.html:220
+#: bookwyrm/templates/book/book.html:217
 #, fuzzy
 #| msgid "Your books"
 msgid "Your quotes"
 msgstr "你的书目"
 
-#: bookwyrm/templates/book/book.html:255
-msgid "rated it"
-msgstr "评价了"
-
-#: bookwyrm/templates/book/book.html:276
+#: bookwyrm/templates/book/book.html:253
 msgid "Subjects"
 msgstr "主题"
 
-#: bookwyrm/templates/book/book.html:288
+#: bookwyrm/templates/book/book.html:265
 msgid "Places"
 msgstr "地点"
 
-#: bookwyrm/templates/book/book.html:299 bookwyrm/templates/layout.html:65
+#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:64
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
@@ -396,37 +394,37 @@ msgstr "地点"
 msgid "Lists"
 msgstr "列表"
 
-#: bookwyrm/templates/book/book.html:310
+#: bookwyrm/templates/book/book.html:287
 msgid "Add to list"
 msgstr "添加到列表"
 
-#: bookwyrm/templates/book/book.html:320
+#: bookwyrm/templates/book/book.html:297
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:164
 msgid "Add"
 msgstr "添加"
 
-#: bookwyrm/templates/book/book_identifiers.html:8
+#: bookwyrm/templates/book/book_identifiers.html:7
 msgid "ISBN:"
 msgstr "ISBN:"
 
-#: bookwyrm/templates/book/book_identifiers.html:15
-#: bookwyrm/templates/book/edit_book.html:227
+#: bookwyrm/templates/book/book_identifiers.html:14
+#: bookwyrm/templates/book/edit_book.html:248
 msgid "OCLC Number:"
 msgstr "OCLC �:"
 
-#: bookwyrm/templates/book/book_identifiers.html:22
-#: bookwyrm/templates/book/edit_book.html:231
+#: bookwyrm/templates/book/book_identifiers.html:21
+#: bookwyrm/templates/book/edit_book.html:253
 msgid "ASIN:"
 msgstr "ASIN:"
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:179
+#: bookwyrm/templates/book/edit_book.html:192
 msgid "Upload cover:"
 msgstr "上传��:"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:185
+#: bookwyrm/templates/book/edit_book.html:198
 msgid "Load cover from url:"
 msgstr "从网�加载��:"
 
@@ -482,81 +480,93 @@ msgstr "确认"
 msgid "Back"
 msgstr "返回"
 
-#: bookwyrm/templates/book/edit_book.html:92
+#: bookwyrm/templates/book/edit_book.html:93
 msgid "Title:"
 msgstr "标题:"
 
-#: bookwyrm/templates/book/edit_book.html:100
+#: bookwyrm/templates/book/edit_book.html:101
 msgid "Subtitle:"
 msgstr "副标题:"
 
-#: bookwyrm/templates/book/edit_book.html:113
+#: bookwyrm/templates/book/edit_book.html:114
 msgid "Series:"
 msgstr "系列:"
 
-#: bookwyrm/templates/book/edit_book.html:120
+#: bookwyrm/templates/book/edit_book.html:122
 msgid "Series number:"
 msgstr "系列编�:"
 
-#: bookwyrm/templates/book/edit_book.html:126
+#: bookwyrm/templates/book/edit_book.html:130
+#, fuzzy
+#| msgid "Language:"
+msgid "Languages:"
+msgstr "语言:"
+
+#: bookwyrm/templates/book/edit_book.html:139
 msgid "Publisher:"
 msgstr "出版社:"
 
-#: bookwyrm/templates/book/edit_book.html:135
+#: bookwyrm/templates/book/edit_book.html:148
 msgid "First published date:"
 msgstr "�版时间:"
 
-#: bookwyrm/templates/book/edit_book.html:143
+#: bookwyrm/templates/book/edit_book.html:156
 msgid "Published date:"
 msgstr "出版时间:"
 
-#: bookwyrm/templates/book/edit_book.html:152
+#: bookwyrm/templates/book/edit_book.html:165
 msgid "Authors"
 msgstr "作者"
 
-#: bookwyrm/templates/book/edit_book.html:158
+#: bookwyrm/templates/book/edit_book.html:171
 #, python-format
 msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
 msgstr "移除 <a href=\"%(path)s\">%(name)s</a>"
 
-#: bookwyrm/templates/book/edit_book.html:163
+#: bookwyrm/templates/book/edit_book.html:176
 msgid "Add Authors:"
 msgstr "添加作者:"
 
-#: bookwyrm/templates/book/edit_book.html:164
+#: bookwyrm/templates/book/edit_book.html:177
 msgid "John Doe, Jane Smith"
 msgstr "张三, �四"
 
-#: bookwyrm/templates/book/edit_book.html:170
+#: bookwyrm/templates/book/edit_book.html:183
 #: bookwyrm/templates/user/shelf/shelf.html:77
 msgid "Cover"
 msgstr "��"
 
-#: bookwyrm/templates/book/edit_book.html:198
+#: bookwyrm/templates/book/edit_book.html:211
 msgid "Physical Properties"
 msgstr "实体性质"
 
-#: bookwyrm/templates/book/edit_book.html:199
+#: bookwyrm/templates/book/edit_book.html:212
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "格�:"
 
-#: bookwyrm/templates/book/edit_book.html:207
+#: bookwyrm/templates/book/edit_book.html:220
 msgid "Pages:"
 msgstr "页数:"
 
-#: bookwyrm/templates/book/edit_book.html:214
+#: bookwyrm/templates/book/edit_book.html:227
 msgid "Book Identifiers"
 msgstr "书目标识�"
 
-#: bookwyrm/templates/book/edit_book.html:215
+#: bookwyrm/templates/book/edit_book.html:228
 msgid "ISBN 13:"
 msgstr "ISBN 13:"
 
-#: bookwyrm/templates/book/edit_book.html:219
+#: bookwyrm/templates/book/edit_book.html:233
 msgid "ISBN 10:"
 msgstr "ISBN 10:"
 
+#: bookwyrm/templates/book/edit_book.html:238
+#, fuzzy
+#| msgid "Openlibrary key:"
+msgid "Openlibrary ID:"
+msgstr "Openlibrary key:"
+
 #: bookwyrm/templates/book/editions.html:4
 #, python-format
 msgid "Editions of %(book_title)s"
@@ -611,12 +621,17 @@ msgstr "于 %(date)s 出版"
 msgid "Published by %(publisher)s."
 msgstr "由 %(publisher)s 出版。"
 
+#: bookwyrm/templates/book/rating.html:13
+msgid "rated it"
+msgstr "评价了"
+
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
 #: bookwyrm/templates/feed/feed_layout.html:69
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
 #: bookwyrm/templates/search/book.html:32
+#: bookwyrm/templates/snippets/announcement.html:17
 msgid "Close"
 msgstr "关闭"
 
@@ -640,7 +655,7 @@ msgstr "跨站社区"
 
 #: bookwyrm/templates/directory/directory.html:4
 #: bookwyrm/templates/directory/directory.html:9
-#: bookwyrm/templates/layout.html:93
+#: bookwyrm/templates/layout.html:92
 msgid "Directory"
 msgstr "目录"
 
@@ -654,6 +669,7 @@ msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings
 msgstr "你�以在任何时候从你的 <a href=\"%(path)s\">个人资料设定</a> 中退出。"
 
 #: bookwyrm/templates/directory/directory.html:29
+#: bookwyrm/templates/snippets/announcement.html:30
 #: bookwyrm/templates/snippets/goal_card.html:22
 msgid "Dismiss message"
 msgstr "�散消�"
@@ -742,7 +758,7 @@ msgid "Join %(name)s"
 msgstr "加入 %(name)s"
 
 #: bookwyrm/templates/discover/landing_layout.html:51
-#: bookwyrm/templates/login.html:48
+#: bookwyrm/templates/login.html:51
 msgid "This instance is closed"
 msgstr "本实例�开放。"
 
@@ -838,7 +854,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr "与 <a href=\"%(path)s\">%(username)s</a> �信"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:88
+#: bookwyrm/templates/layout.html:87
 msgid "Direct Messages"
 msgstr "�信"
 
@@ -894,7 +910,7 @@ msgid "Updates"
 msgstr "æ›´æ–°"
 
 #: bookwyrm/templates/feed/feed_layout.html:10
-#: bookwyrm/templates/layout.html:59
+#: bookwyrm/templates/layout.html:58
 #: bookwyrm/templates/user/shelf/books_header.html:3
 msgid "Your books"
 msgstr "你的书目"
@@ -966,7 +982,7 @@ msgstr "你�以在开始使用 %(site_name)s �添加书目。"
 #: bookwyrm/templates/get_started/books.html:17
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
-#: bookwyrm/templates/layout.html:38 bookwyrm/templates/layout.html:39
+#: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
 #: bookwyrm/templates/lists/list.html:124
 #: bookwyrm/templates/search/layout.html:4
 #: bookwyrm/templates/search/layout.html:9
@@ -1095,7 +1111,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "%(username)s 在 %(year)s 的书目"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/layout.html:98
+#: bookwyrm/templates/layout.html:97
 msgid "Import Books"
 msgstr "导入书目"
 
@@ -1196,7 +1212,7 @@ msgid "Imported"
 msgstr "已导入"
 
 #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12
-#: bookwyrm/templates/login.html:43
+#: bookwyrm/templates/login.html:46
 msgid "Create an Account"
 msgstr "创建��"
 
@@ -1221,23 +1237,23 @@ msgstr "\"%(query)s\" 的�索结果"
 msgid "Matching Books"
 msgstr "匹�的书目"
 
-#: bookwyrm/templates/layout.html:34
+#: bookwyrm/templates/layout.html:33
 msgid "Search for a book or user"
 msgstr "�索书目或用户"
 
-#: bookwyrm/templates/layout.html:48 bookwyrm/templates/layout.html:49
+#: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48
 msgid "Main navigation menu"
 msgstr "主导航��"
 
-#: bookwyrm/templates/layout.html:62
+#: bookwyrm/templates/layout.html:61
 msgid "Feed"
 msgstr "动�"
 
-#: bookwyrm/templates/layout.html:103
+#: bookwyrm/templates/layout.html:102
 msgid "Settings"
 msgstr "设置"
 
-#: bookwyrm/templates/layout.html:112
+#: bookwyrm/templates/layout.html:111
 #: bookwyrm/templates/settings/admin_layout.html:31
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
@@ -1245,64 +1261,63 @@ msgstr "设置"
 msgid "Invites"
 msgstr "邀请"
 
-#: bookwyrm/templates/layout.html:119
+#: bookwyrm/templates/layout.html:118
 msgid "Admin"
 msgstr "管�员"
 
-#: bookwyrm/templates/layout.html:126
+#: bookwyrm/templates/layout.html:125
 msgid "Log out"
 msgstr "登出"
 
-#: bookwyrm/templates/layout.html:134 bookwyrm/templates/layout.html:135
+#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr "通知"
 
-#: bookwyrm/templates/layout.html:155 bookwyrm/templates/layout.html:159
+#: bookwyrm/templates/layout.html:154 bookwyrm/templates/layout.html:158
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "用户�:"
 
-#: bookwyrm/templates/layout.html:160
+#: bookwyrm/templates/layout.html:159
 msgid "password"
 msgstr "密�"
 
-#: bookwyrm/templates/layout.html:161 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr "忘记了密�？"
 
-#: bookwyrm/templates/layout.html:164 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:163 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "登录"
 
-#: bookwyrm/templates/layout.html:172
+#: bookwyrm/templates/layout.html:171
 msgid "Join"
 msgstr "加入"
 
-#: bookwyrm/templates/layout.html:198
+#: bookwyrm/templates/layout.html:206
 msgid "About this server"
 msgstr "关于本�务器"
 
-#: bookwyrm/templates/layout.html:202
+#: bookwyrm/templates/layout.html:210
 msgid "Contact site admin"
 msgstr "�系站点管�员"
 
-#: bookwyrm/templates/layout.html:206
+#: bookwyrm/templates/layout.html:214
 #, fuzzy
 #| msgid "List curation:"
 msgid "Documentation"
 msgstr "列表策展:"
 
-#: bookwyrm/templates/layout.html:213
+#: bookwyrm/templates/layout.html:221
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr "在 <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a> 上支� %(site_name)s"
 
-#: bookwyrm/templates/layout.html:217
-#| msgid "BookWyrm is open source software. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+#: bookwyrm/templates/layout.html:225
 msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm 是开�软件。你�以在 <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a> 贡献或报告问题。"
 
@@ -1373,6 +1388,7 @@ msgstr "任何人都�以推�书目�主题让你批准"
 #: bookwyrm/templates/lists/form.html:31
 #: bookwyrm/templates/moderation/reports.html:25
 #: bookwyrm/templates/search/book.html:30
+#: bookwyrm/templates/snippets/announcement.html:15
 msgid "Open"
 msgstr "开放"
 
@@ -1466,11 +1482,11 @@ msgstr "登录"
 msgid "Password:"
 msgstr "密�:"
 
-#: bookwyrm/templates/login.html:49
+#: bookwyrm/templates/login.html:52
 msgid "Contact an administrator to get an invite"
 msgstr "�系管�员以�得邀请"
 
-#: bookwyrm/templates/login.html:59
+#: bookwyrm/templates/login.html:63
 msgid "More about this site"
 msgstr "关于本站点的更多"
 
@@ -1820,31 +1836,144 @@ msgid "Instance Settings"
 msgstr "实例设置"
 
 #: bookwyrm/templates/settings/admin_layout.html:48
+#: bookwyrm/templates/settings/announcements.html:3
+#: bookwyrm/templates/settings/announcements.html:5
+msgid "Announcements"
+msgstr "公告"
+
+#: bookwyrm/templates/settings/admin_layout.html:52
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
 msgstr "站点设置"
 
-#: bookwyrm/templates/settings/admin_layout.html:51
+#: bookwyrm/templates/settings/admin_layout.html:55
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
 msgstr "实例信�"
 
-#: bookwyrm/templates/settings/admin_layout.html:52
+#: bookwyrm/templates/settings/admin_layout.html:56
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
 msgstr "图�"
 
-#: bookwyrm/templates/settings/admin_layout.html:53
+#: bookwyrm/templates/settings/admin_layout.html:57
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
 msgstr "页脚内容"
 
-#: bookwyrm/templates/settings/admin_layout.html:54
+#: bookwyrm/templates/settings/admin_layout.html:58
 #: bookwyrm/templates/settings/site.html:81
 msgid "Registration"
 msgstr "注册"
 
+#: bookwyrm/templates/settings/announcement.html:3
+#: bookwyrm/templates/settings/announcement.html:6
+#, fuzzy
+#| msgid "Announcements"
+msgid "Announcement"
+msgstr "公告"
+
+#: bookwyrm/templates/settings/announcement.html:7
+#: bookwyrm/templates/settings/federated_server.html:13
+#, fuzzy
+#| msgid "Back to server list"
+msgid "Back to list"
+msgstr "回到�务器列表"
+
+#: bookwyrm/templates/settings/announcement.html:11
+#, fuzzy
+#| msgid "Announcements"
+msgid "Edit Announcement"
+msgstr "公告"
+
+#: bookwyrm/templates/settings/announcement.html:20
+#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
+#: bookwyrm/templates/snippets/follow_request_buttons.html:12
+msgid "Delete"
+msgstr "删除"
+
+#: bookwyrm/templates/settings/announcement.html:35
+msgid "Visible:"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcement.html:38
+msgid "True"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcement.html:40
+msgid "False"
+msgstr ""
+
+#: bookwyrm/templates/settings/announcement.html:47
+#, fuzzy
+#| msgid "Birth date:"
+msgid "Start date:"
+msgstr "出生日期:"
+
+#: bookwyrm/templates/settings/announcement.html:54
+#, fuzzy
+#| msgid "Birth date:"
+msgid "End date:"
+msgstr "出生日期:"
+
+#: bookwyrm/templates/settings/announcement.html:60
+#, fuzzy
+#| msgid "Active"
+msgid "Active:"
+msgstr "活跃"
+
+#: bookwyrm/templates/settings/announcement_form.html:5
+#: bookwyrm/templates/settings/announcements.html:8
+#, fuzzy
+#| msgid "Announcements"
+msgid "Create Announcement"
+msgstr "公告"
+
+#: bookwyrm/templates/settings/announcements.html:22
+#, fuzzy
+#| msgid "Date Added"
+msgid "Date added"
+msgstr "添加日期:"
+
+#: bookwyrm/templates/settings/announcements.html:26
+#, fuzzy
+#| msgid "reviewed"
+msgid "Preview"
+msgstr "写了书评给"
+
+#: bookwyrm/templates/settings/announcements.html:30
+#, fuzzy
+#| msgid "Started"
+msgid "Start date"
+msgstr "开始时间"
+
+#: bookwyrm/templates/settings/announcements.html:34
+#, fuzzy
+#| msgid "Edit read dates"
+msgid "End date"
+msgstr "编辑阅读日期"
+
+#: bookwyrm/templates/settings/announcements.html:38
+#: bookwyrm/templates/settings/federation.html:30
+#: bookwyrm/templates/settings/manage_invite_requests.html:44
+#: bookwyrm/templates/settings/status_filter.html:5
+#: bookwyrm/templates/user_admin/user_admin.html:34
+msgid "Status"
+msgstr "状�"
+
+#: bookwyrm/templates/settings/announcements.html:48
+#, fuzzy
+#| msgid "Inactive"
+msgid "active"
+msgstr "�用"
+
+#: bookwyrm/templates/settings/announcements.html:48
+#, fuzzy
+#| msgid "Inactive"
+msgid "inactive"
+msgstr "�用"
+
 #: bookwyrm/templates/settings/edit_server.html:3
 #: bookwyrm/templates/settings/edit_server.html:6
 #: bookwyrm/templates/settings/edit_server.html:20
@@ -1858,7 +1987,6 @@ msgid "Add server"
 msgstr "添加��"
 
 #: bookwyrm/templates/settings/edit_server.html:7
-#: bookwyrm/templates/settings/federated_server.html:13
 #: bookwyrm/templates/settings/server_blocklist.html:7
 msgid "Back to server list"
 msgstr "回到�务器列表"
@@ -1877,7 +2005,7 @@ msgid "Instance:"
 msgstr "实例�称"
 
 #: bookwyrm/templates/settings/edit_server.html:37
-#: bookwyrm/templates/settings/federated_server.html:30
+#: bookwyrm/templates/settings/federated_server.html:31
 #: bookwyrm/templates/user_admin/user_info.html:34
 msgid "Status:"
 msgstr "状�:"
@@ -1890,13 +2018,13 @@ msgid "Blocked"
 msgstr "�蔽"
 
 #: bookwyrm/templates/settings/edit_server.html:48
-#: bookwyrm/templates/settings/federated_server.html:22
+#: bookwyrm/templates/settings/federated_server.html:23
 #: bookwyrm/templates/user_admin/user_info.html:26
 msgid "Software:"
 msgstr "软件:"
 
 #: bookwyrm/templates/settings/edit_server.html:55
-#: bookwyrm/templates/settings/federated_server.html:26
+#: bookwyrm/templates/settings/federated_server.html:27
 #: bookwyrm/templates/user_admin/user_info.html:30
 msgid "Version:"
 msgstr "版本:"
@@ -1909,90 +2037,83 @@ msgstr ""
 msgid "Details"
 msgstr "详细"
 
-#: bookwyrm/templates/settings/federated_server.html:37
+#: bookwyrm/templates/settings/federated_server.html:39
 #: bookwyrm/templates/user/layout.html:56
 msgid "Activity"
 msgstr "活动"
 
-#: bookwyrm/templates/settings/federated_server.html:40
+#: bookwyrm/templates/settings/federated_server.html:43
 msgid "Users:"
 msgstr "用户:"
 
-#: bookwyrm/templates/settings/federated_server.html:43
-#: bookwyrm/templates/settings/federated_server.html:50
+#: bookwyrm/templates/settings/federated_server.html:46
+#: bookwyrm/templates/settings/federated_server.html:53
 msgid "View all"
 msgstr "查看全部"
 
-#: bookwyrm/templates/settings/federated_server.html:47
+#: bookwyrm/templates/settings/federated_server.html:50
 msgid "Reports:"
 msgstr "报告:"
 
-#: bookwyrm/templates/settings/federated_server.html:54
+#: bookwyrm/templates/settings/federated_server.html:57
 msgid "Followed by us:"
 msgstr "我们关注了的:"
 
-#: bookwyrm/templates/settings/federated_server.html:60
+#: bookwyrm/templates/settings/federated_server.html:63
 msgid "Followed by them:"
 msgstr "TA 们关注了的:"
 
-#: bookwyrm/templates/settings/federated_server.html:66
+#: bookwyrm/templates/settings/federated_server.html:69
 msgid "Blocked by us:"
 msgstr "我们所�蔽的:"
 
-#: bookwyrm/templates/settings/federated_server.html:78
+#: bookwyrm/templates/settings/federated_server.html:82
 #: bookwyrm/templates/user_admin/user_info.html:39
 msgid "Notes"
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:81
+#: bookwyrm/templates/settings/federated_server.html:85
 #, fuzzy
 #| msgid "Edit Book"
 msgid "Edit"
 msgstr "编辑书目"
 
-#: bookwyrm/templates/settings/federated_server.html:101
+#: bookwyrm/templates/settings/federated_server.html:105
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:3
 msgid "Actions"
 msgstr "动作"
 
-#: bookwyrm/templates/settings/federated_server.html:105
+#: bookwyrm/templates/settings/federated_server.html:109
 #: bookwyrm/templates/snippets/block_button.html:5
 msgid "Block"
 msgstr "�蔽"
 
-#: bookwyrm/templates/settings/federated_server.html:106
+#: bookwyrm/templates/settings/federated_server.html:110
 msgid "All users from this instance will be deactivated."
 msgstr ""
 
-#: bookwyrm/templates/settings/federated_server.html:111
+#: bookwyrm/templates/settings/federated_server.html:115
 #: bookwyrm/templates/snippets/block_button.html:10
 msgid "Un-block"
 msgstr "�消�蔽"
 
-#: bookwyrm/templates/settings/federated_server.html:112
+#: bookwyrm/templates/settings/federated_server.html:116
 msgid "All users from this instance will be re-activated."
 msgstr ""
 
-#: bookwyrm/templates/settings/federation.html:20
+#: bookwyrm/templates/settings/federation.html:19
 #: bookwyrm/templates/user_admin/server_filter.html:5
 msgid "Server name"
 msgstr "�务器�称"
 
-#: bookwyrm/templates/settings/federation.html:24
+#: bookwyrm/templates/settings/federation.html:23
 msgid "Date federated"
 msgstr "跨站日期"
 
-#: bookwyrm/templates/settings/federation.html:28
+#: bookwyrm/templates/settings/federation.html:27
 msgid "Software"
 msgstr "软件"
 
-#: bookwyrm/templates/settings/federation.html:31
-#: bookwyrm/templates/settings/manage_invite_requests.html:44
-#: bookwyrm/templates/settings/status_filter.html:5
-#: bookwyrm/templates/user_admin/user_admin.html:34
-msgid "Status"
-msgstr "状�"
-
 #: bookwyrm/templates/settings/manage_invite_requests.html:4
 #: bookwyrm/templates/settings/manage_invite_requests.html:11
 #: bookwyrm/templates/settings/manage_invite_requests.html:25
@@ -2184,6 +2305,12 @@ msgstr "�许请求邀请:"
 msgid "Registration closed text:"
 msgstr "注册关闭文字:"
 
+#: bookwyrm/templates/snippets/announcement.html:27
+#, fuzzy, python-format
+#| msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
+msgid "Posted by <a href=\"%(user_path)s\">%(username)s</a>"
+msgstr "由 <a href=\"%(user_path)s\">%(username)s</a> 添加"
+
 #: bookwyrm/templates/snippets/book_cover.html:31
 msgid "No cover"
 msgstr "没有��"
@@ -2295,11 +2422,6 @@ msgstr "删除这些阅读日期�？"
 msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr "你正�删除这篇阅读�过以�与之相关的 %(count)s 次进度更新。"
 
-#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
-#: bookwyrm/templates/snippets/follow_request_buttons.html:12
-msgid "Delete"
-msgstr "删除"
-
 #: bookwyrm/templates/snippets/fav_button.html:9
 #: bookwyrm/templates/snippets/fav_button.html:11
 msgid "Like"
@@ -2749,16 +2871,16 @@ msgstr "删除书架"
 msgid "Edit profile"
 msgstr "编辑个人资料"
 
-#: bookwyrm/templates/user/user.html:34
+#: bookwyrm/templates/user/user.html:33
 #, python-format
 msgid "View all %(size)s"
 msgstr "查看所有 %(size)s 本"
 
-#: bookwyrm/templates/user/user.html:47
+#: bookwyrm/templates/user/user.html:46
 msgid "View all books"
 msgstr "查看所有书目"
 
-#: bookwyrm/templates/user/user.html:60
+#: bookwyrm/templates/user/user.html:59
 msgid "User Activity"
 msgstr "用户活动"
 
@@ -2867,11 +2989,11 @@ msgstr ""
 msgid "Access level:"
 msgstr ""
 
-#: bookwyrm/views/password.py:30 bookwyrm/views/password.py:35
+#: bookwyrm/views/password.py:32
 msgid "No user with that email address was found."
 msgstr "没有找到使用该邮箱的用户。"
 
-#: bookwyrm/views/password.py:44
+#: bookwyrm/views/password.py:41
 #, python-format
 msgid "A password reset link sent to %s"
 msgstr "密��置连接已��给 %s"
@@ -3250,9 +3372,6 @@ msgstr "密��置连接已��给 %s"
 #~ msgid "Send follow request"
 #~ msgstr "��关注请求"
 
-#~ msgid "Announcements"
-#~ msgstr "公告"
-
 #~ msgid "Site Configuration"
 #~ msgstr "站点�置"
 

From cefc5994a60c90d47999abcd23e646aa04e65c5e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 May 2021 12:36:42 -0700
Subject: [PATCH 1171/1285] Makes extra content optional

---
 bookwyrm/migrations/0075_announcement.py      |  4 +-
 bookwyrm/models/announcement.py               |  2 +-
 bookwyrm/templates/snippets/announcement.html |  4 +
 bookwyrm/tests/views/test_announcements.py    | 75 ++++++++++++++++++-
 bookwyrm/views/announcements.py               |  2 +-
 5 files changed, 81 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/migrations/0075_announcement.py b/bookwyrm/migrations/0075_announcement.py
index 7808eea1..b667c262 100644
--- a/bookwyrm/migrations/0075_announcement.py
+++ b/bookwyrm/migrations/0075_announcement.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.2 on 2021-05-19 22:16
+# Generated by Django 3.2 on 2021-05-20 19:34
 
 import bookwyrm.models.fields
 from django.conf import settings
@@ -36,7 +36,7 @@ class Migration(migrations.Migration):
                     ),
                 ),
                 ("preview", models.CharField(max_length=255)),
-                ("content", models.TextField()),
+                ("content", models.TextField(blank=True, null=True)),
                 ("event_date", models.DateTimeField(blank=True, null=True)),
                 ("start_date", models.DateTimeField(blank=True, null=True)),
                 ("end_date", models.DateTimeField(blank=True, null=True)),
diff --git a/bookwyrm/models/announcement.py b/bookwyrm/models/announcement.py
index 987b06c2..498d5041 100644
--- a/bookwyrm/models/announcement.py
+++ b/bookwyrm/models/announcement.py
@@ -11,7 +11,7 @@ class Announcement(BookWyrmModel):
 
     user = models.ForeignKey("User", on_delete=models.PROTECT)
     preview = models.CharField(max_length=255)
-    content = models.TextField()
+    content = models.TextField(null=True, blank=True)
     event_date = models.DateTimeField(blank=True, null=True)
     start_date = models.DateTimeField(blank=True, null=True)
     end_date = models.DateTimeField(blank=True, null=True)
diff --git a/bookwyrm/templates/snippets/announcement.html b/bookwyrm/templates/snippets/announcement.html
index ee00cfd7..a6a7c65b 100644
--- a/bookwyrm/templates/snippets/announcement.html
+++ b/bookwyrm/templates/snippets/announcement.html
@@ -11,18 +11,22 @@
             {% endif %}
             {{ announcement.preview }}
         </div>
+        {% if announcement.content %}
         <div class="column is-narrow pb-0">
             {% trans "Open" as button_text %}
             {% include 'snippets/toggle/open_button.html' with text=button_text controls_text="announcement" class="is-small" controls_uid=uuid icon_with_text="arrow-down" %}
             {% trans "Close" as button_text %}
             {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="announcement" class="is-small" controls_uid=uuid icon_with_text="arrow-up" %}
         </div>
+        {% endif %}
     </div>
+    {% if announcement.content %}
     <div class="mb-2 mt-2 {% if not pressed %}is-hidden{% endif %}" id="announcement-{{ uuid }}">
         <div class="box is-shadowless mb-0">
             {{ announcement.content|safe }}
         </div>
     </div>
+    {% endif %}
     <div class="is-flex mt-0 help">
         <p>{% blocktrans with user_path=announcement.user.local_path username=announcement.user.display_name %}Posted by <a href="{{ user_path }}">{{ username }}</a>{% endblocktrans %}</p>
         {% if not admin_mode %}
diff --git a/bookwyrm/tests/views/test_announcements.py b/bookwyrm/tests/views/test_announcements.py
index d9999d5a..a9a9423d 100644
--- a/bookwyrm/tests/views/test_announcements.py
+++ b/bookwyrm/tests/views/test_announcements.py
@@ -51,9 +51,11 @@ class AnnouncementViews(TestCase):
 
     def test_announcement_page(self):
         """there are so many views, this just makes sure it LOADS"""
-        announcement = models.Announcement.objects.create(preview="hi", user=self.local_user)
+        announcement = models.Announcement.objects.create(
+            preview="hi", user=self.local_user
+        )
 
-        view = views.Announcements.as_view()
+        view = views.Announcement.as_view()
         request = self.factory.get("")
         request.user = self.local_user
         request.user.is_superuser = True
@@ -63,3 +65,72 @@ class AnnouncementViews(TestCase):
         self.assertIsInstance(result, TemplateResponse)
         result.render()
         self.assertEqual(result.status_code, 200)
+
+    def test_create_announcement(self):
+        """create a new announcement"""
+        view = views.Announcements.as_view()
+        form = forms.AnnouncementForm()
+        form.data["preview"] = "hi hi"
+        form.data["start_date"] = "2021-05-20"
+        form.data["user"] = self.local_user.id
+
+        request = self.factory.post("", form.data)
+        request.user = self.local_user
+        request.user.is_superuser = True
+
+        view(request)
+
+        announcement = models.Announcement.objects.get()
+        self.assertEqual(announcement.preview, "hi hi")
+        self.assertEqual(announcement.start_date.year, 2021)
+        self.assertEqual(announcement.start_date.month, 5)
+        self.assertEqual(announcement.start_date.day, 20)
+
+    def test_edit_announcement(self):
+        """edit an announcement"""
+        announcement = models.Announcement.objects.create(
+            preview="hi", user=self.local_user
+        )
+        view = views.Announcement.as_view()
+        form = forms.AnnouncementForm(instance=announcement)
+        form.data["preview"] = "hi hi"
+        form.data["start_date"] = "2021-05-20"
+        form.data["user"] = self.local_user.id
+
+        request = self.factory.post("", form.data)
+        request.user = self.local_user
+        request.user.is_superuser = True
+
+        view(request, announcement.id)
+
+        announcement.refresh_from_db()
+        self.assertEqual(announcement.preview, "hi hi")
+        self.assertEqual(announcement.start_date.year, 2021)
+        self.assertEqual(announcement.start_date.month, 5)
+        self.assertEqual(announcement.start_date.day, 20)
+
+    def test_delete_announcement(self):
+        """delete an announcement"""
+        announcement = models.Announcement.objects.create(
+            preview="hi", user=self.local_user
+        )
+        view = views.delete_announcement.as_view()
+
+        request = self.factory.post("")
+        request.user = self.local_user
+        request.user.is_superuser = True
+
+        view(request, announcement.id)
+
+        self.assertFalse(models.Announcement.objects.exists())
+
+    def test_view_announcement(self):
+        """display announcement on other pages"""
+        view = views.User.as_view()
+        request = self.factory.get("")
+
+        result = view(request)
+
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
diff --git a/bookwyrm/views/announcements.py b/bookwyrm/views/announcements.py
index 3f38f7af..6cd6ecd8 100644
--- a/bookwyrm/views/announcements.py
+++ b/bookwyrm/views/announcements.py
@@ -51,7 +51,7 @@ class Announcements(View):
             form = forms.AnnouncementForm()
         data = {
             "announcements": Paginator(
-                models.Announcement.objects, PAGE_LENGTH
+                models.Announcement.objects.all(), PAGE_LENGTH
             ).get_page(request.GET.get("page")),
             "form": form,
         }

From ff3c4b8e73577c1fb3d4f58d3171aef6830d6ce7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 May 2021 13:42:30 -0700
Subject: [PATCH 1172/1285] Fixes announcement view test

---
 bookwyrm/tests/views/test_announcements.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/tests/views/test_announcements.py b/bookwyrm/tests/views/test_announcements.py
index a9a9423d..0f17d3b9 100644
--- a/bookwyrm/tests/views/test_announcements.py
+++ b/bookwyrm/tests/views/test_announcements.py
@@ -114,7 +114,7 @@ class AnnouncementViews(TestCase):
         announcement = models.Announcement.objects.create(
             preview="hi", user=self.local_user
         )
-        view = views.delete_announcement.as_view()
+        view = views.delete_announcement
 
         request = self.factory.post("")
         request.user = self.local_user
@@ -128,8 +128,9 @@ class AnnouncementViews(TestCase):
         """display announcement on other pages"""
         view = views.User.as_view()
         request = self.factory.get("")
+        request.user = self.local_user
 
-        result = view(request)
+        result = view(request, self.local_user.localname)
 
         self.assertIsInstance(result, TemplateResponse)
         result.render()

From 62dc8270b66b8af40c4405d217d6559bdeb0e666 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 May 2021 14:39:33 -0700
Subject: [PATCH 1173/1285] Catch unexpectedly missing columns in csv imports

I kept the 500 error here so that things don't silently fail in
unexepcted ways
---
 bookwyrm/views/import_data.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/views/import_data.py b/bookwyrm/views/import_data.py
index 2bbb5947..910283c4 100644
--- a/bookwyrm/views/import_data.py
+++ b/bookwyrm/views/import_data.py
@@ -7,6 +7,7 @@ from django.http import HttpResponseBadRequest
 from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
+from django.utils.translation import gettext_lazy as _
 from django.views import View
 
 from bookwyrm import forms, models
@@ -62,8 +63,8 @@ class Import(View):
                     include_reviews,
                     privacy,
                 )
-            except (UnicodeDecodeError, ValueError):
-                return HttpResponseBadRequest("Not a valid csv file")
+            except (UnicodeDecodeError, ValueError, KeyError):
+                return HttpResponseBadRequest(_("Not a valid csv file"))
 
             importer.start_import(job)
 

From 1a2f6c586df4924eaf21e79f0cfa6a314d089a97 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 May 2021 14:41:00 -0700
Subject: [PATCH 1174/1285] Adds locales for error text

---
 locale/de_DE/LC_MESSAGES/django.po   | 21 +++++++++++----------
 locale/en_US/LC_MESSAGES/django.po   | 14 +++++++++-----
 locale/es/LC_MESSAGES/django.po      | 19 +++++++++++--------
 locale/fr_FR/LC_MESSAGES/django.po   | 21 +++++++++++----------
 locale/zh_Hans/LC_MESSAGES/django.po | 21 +++++++++++----------
 5 files changed, 53 insertions(+), 43 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 2503b80b..40f770b5 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 12:12-0700\n"
+"POT-Creation-Date: 2021-05-20 14:40-0700\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"
@@ -658,7 +658,7 @@ msgstr "bewertet"
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
 #: bookwyrm/templates/search/book.html:32
-#: bookwyrm/templates/snippets/announcement.html:17
+#: bookwyrm/templates/snippets/announcement.html:18
 msgid "Close"
 msgstr "Schließen"
 
@@ -703,7 +703,7 @@ msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings
 msgstr "Du kannst dein Leseziel jederzeit auf deiner <a href=\"%(path)s\">Profilseite</a> setzen oder ändern."
 
 #: bookwyrm/templates/directory/directory.html:29
-#: bookwyrm/templates/snippets/announcement.html:30
+#: bookwyrm/templates/snippets/announcement.html:34
 #: bookwyrm/templates/snippets/goal_card.html:22
 msgid "Dismiss message"
 msgstr "Nachricht verwerfen"
@@ -1465,7 +1465,7 @@ msgstr "Alle können Bücher vorschlagen, du kannst diese bestätigen"
 #: bookwyrm/templates/lists/form.html:31
 #: bookwyrm/templates/moderation/reports.html:25
 #: bookwyrm/templates/search/book.html:30
-#: bookwyrm/templates/snippets/announcement.html:15
+#: bookwyrm/templates/snippets/announcement.html:16
 msgid "Open"
 msgstr "Offen"
 
@@ -2429,7 +2429,7 @@ msgstr "Folgeanfragen"
 msgid "Registration closed text:"
 msgstr "Registrierungen geschlossen text"
 
-#: bookwyrm/templates/snippets/announcement.html:27
+#: bookwyrm/templates/snippets/announcement.html:31
 #, fuzzy, python-format
 #| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgid "Posted by <a href=\"%(user_path)s\">%(username)s</a>"
@@ -3158,6 +3158,12 @@ msgstr ""
 msgid "Access level:"
 msgstr ""
 
+#: bookwyrm/views/import_data.py:67
+#, fuzzy
+#| msgid "Email address:"
+msgid "Not a valid csv file"
+msgstr "E-Mail Adresse"
+
 #: bookwyrm/views/password.py:32
 #, fuzzy
 #| msgid "A user with that username already exists."
@@ -3184,11 +3190,6 @@ msgstr ""
 #~ msgid "Messages"
 #~ msgstr "Alle Nachrichten"
 
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "Enter a valid value."
-#~ msgstr "E-Mail Adresse"
-
 #, fuzzy
 #~| msgid "Email address:"
 #~ msgid "Enter a valid URL."
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index f7c80455..1fa5eb30 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 12:12-0700\n"
+"POT-Creation-Date: 2021-05-20 14:40-0700\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"
@@ -608,7 +608,7 @@ msgstr ""
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
 #: bookwyrm/templates/search/book.html:32
-#: bookwyrm/templates/snippets/announcement.html:17
+#: bookwyrm/templates/snippets/announcement.html:18
 msgid "Close"
 msgstr ""
 
@@ -644,7 +644,7 @@ msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings
 msgstr ""
 
 #: bookwyrm/templates/directory/directory.html:29
-#: bookwyrm/templates/snippets/announcement.html:30
+#: bookwyrm/templates/snippets/announcement.html:34
 #: bookwyrm/templates/snippets/goal_card.html:22
 msgid "Dismiss message"
 msgstr ""
@@ -1365,7 +1365,7 @@ msgstr ""
 #: bookwyrm/templates/lists/form.html:31
 #: bookwyrm/templates/moderation/reports.html:25
 #: bookwyrm/templates/search/book.html:30
-#: bookwyrm/templates/snippets/announcement.html:15
+#: bookwyrm/templates/snippets/announcement.html:16
 msgid "Open"
 msgstr ""
 
@@ -2216,7 +2216,7 @@ msgstr ""
 msgid "Registration closed text:"
 msgstr ""
 
-#: bookwyrm/templates/snippets/announcement.html:27
+#: bookwyrm/templates/snippets/announcement.html:31
 #, python-format
 msgid "Posted by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr ""
@@ -2886,6 +2886,10 @@ msgstr ""
 msgid "Access level:"
 msgstr ""
 
+#: bookwyrm/views/import_data.py:67
+msgid "Not a valid csv file"
+msgstr ""
+
 #: bookwyrm/views/password.py:32
 msgid "No user with that email address was found."
 msgstr ""
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index d83877fb..4f60dfb8 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 12:12-0700\n"
+"POT-Creation-Date: 2021-05-20 14:40-0700\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -626,7 +626,7 @@ msgstr "lo calificó con"
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
 #: bookwyrm/templates/search/book.html:32
-#: bookwyrm/templates/snippets/announcement.html:17
+#: bookwyrm/templates/snippets/announcement.html:18
 msgid "Close"
 msgstr "Cerrar"
 
@@ -662,7 +662,7 @@ msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings
 msgstr "Puedes optar por no en cualquier hora en tus <a href=\"%(path)s\">configuraciones de perfil.</a>"
 
 #: bookwyrm/templates/directory/directory.html:29
-#: bookwyrm/templates/snippets/announcement.html:30
+#: bookwyrm/templates/snippets/announcement.html:34
 #: bookwyrm/templates/snippets/goal_card.html:22
 msgid "Dismiss message"
 msgstr "Desechar mensaje"
@@ -1385,7 +1385,7 @@ msgstr "Cualquier usuario puede sugerir libros, en cuanto lo hayas aprobado"
 #: bookwyrm/templates/lists/form.html:31
 #: bookwyrm/templates/moderation/reports.html:25
 #: bookwyrm/templates/search/book.html:30
-#: bookwyrm/templates/snippets/announcement.html:15
+#: bookwyrm/templates/snippets/announcement.html:16
 msgid "Open"
 msgstr "Abierto"
 
@@ -2274,7 +2274,7 @@ msgstr "Permitir solicitudes de invitación:"
 msgid "Registration closed text:"
 msgstr "Texto de registración cerrada:"
 
-#: bookwyrm/templates/snippets/announcement.html:27
+#: bookwyrm/templates/snippets/announcement.html:31
 #, fuzzy, python-format
 #| msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgid "Posted by <a href=\"%(user_path)s\">%(username)s</a>"
@@ -2956,6 +2956,12 @@ msgstr "Des-suspender usuario"
 msgid "Access level:"
 msgstr "Nivel de acceso:"
 
+#: bookwyrm/views/import_data.py:67
+#, fuzzy
+#| msgid "Enter a valid value."
+msgid "Not a valid csv file"
+msgstr "Ingrese un valor válido."
+
 #: bookwyrm/views/password.py:32
 msgid "No user with that email address was found."
 msgstr "No se pudo encontrar un usuario con esa dirección de correo electrónico."
@@ -3000,9 +3006,6 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid "That page contains no results"
 #~ msgstr "Esa pagina no contiene resultados"
 
-#~ msgid "Enter a valid value."
-#~ msgstr "Ingrese un valor válido."
-
 #~ msgid "Enter a valid URL."
 #~ msgstr "Ingrese una URL válida."
 
diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index ed622640..57761454 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 12:12-0700\n"
+"POT-Creation-Date: 2021-05-20 14:40-0700\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"
@@ -632,7 +632,7 @@ msgstr "l’a noté"
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
 #: bookwyrm/templates/search/book.html:32
-#: bookwyrm/templates/snippets/announcement.html:17
+#: bookwyrm/templates/snippets/announcement.html:18
 msgid "Close"
 msgstr "Fermer"
 
@@ -668,7 +668,7 @@ msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings
 msgstr "Vous pouvez décider de ne plus y figurer à n’importe quel moment depuis vos <a href=\"%(path)s\">paramètres de profil.</a>"
 
 #: bookwyrm/templates/directory/directory.html:29
-#: bookwyrm/templates/snippets/announcement.html:30
+#: bookwyrm/templates/snippets/announcement.html:34
 #: bookwyrm/templates/snippets/goal_card.html:22
 msgid "Dismiss message"
 msgstr "Rejeter le message"
@@ -1391,7 +1391,7 @@ msgstr "N’importe qui peut suggérer des livres, soumis à votre approbation"
 #: bookwyrm/templates/lists/form.html:31
 #: bookwyrm/templates/moderation/reports.html:25
 #: bookwyrm/templates/search/book.html:30
-#: bookwyrm/templates/snippets/announcement.html:15
+#: bookwyrm/templates/snippets/announcement.html:16
 msgid "Open"
 msgstr "Ouverte"
 
@@ -2304,7 +2304,7 @@ msgstr "Autoriser les demandes d’invitation :"
 msgid "Registration closed text:"
 msgstr "Texte affiché lorsque les enregistrements sont clos :"
 
-#: bookwyrm/templates/snippets/announcement.html:27
+#: bookwyrm/templates/snippets/announcement.html:31
 #, fuzzy, python-format
 #| msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgid "Posted by <a href=\"%(user_path)s\">%(username)s</a>"
@@ -2991,6 +2991,12 @@ msgstr ""
 msgid "Access level:"
 msgstr ""
 
+#: bookwyrm/views/import_data.py:67
+#, fuzzy
+#| msgid "Email address:"
+msgid "Not a valid csv file"
+msgstr "Adresse email :"
+
 #: bookwyrm/views/password.py:32
 msgid "No user with that email address was found."
 msgstr "Aucun compte avec cette adresse email n’a été trouvé."
@@ -3015,11 +3021,6 @@ msgstr "Un lien de réinitialisation a été envoyé à %s."
 #~ msgid "Messages"
 #~ msgstr "Tous les messages"
 
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "Enter a valid value."
-#~ msgstr "Adresse email :"
-
 #, fuzzy
 #~| msgid "Email address:"
 #~ msgid "Enter a valid URL."
diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
index b6bd5b4e..0ec8b1d8 100644
--- a/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/locale/zh_Hans/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 12:12-0700\n"
+"POT-Creation-Date: 2021-05-20 14:40-0700\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"
@@ -631,7 +631,7 @@ msgstr "评价了"
 #: bookwyrm/templates/get_started/layout.html:19
 #: bookwyrm/templates/get_started/layout.html:52
 #: bookwyrm/templates/search/book.html:32
-#: bookwyrm/templates/snippets/announcement.html:17
+#: bookwyrm/templates/snippets/announcement.html:18
 msgid "Close"
 msgstr "关闭"
 
@@ -669,7 +669,7 @@ msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings
 msgstr "你�以在任何时候从你的 <a href=\"%(path)s\">个人资料设定</a> 中退出。"
 
 #: bookwyrm/templates/directory/directory.html:29
-#: bookwyrm/templates/snippets/announcement.html:30
+#: bookwyrm/templates/snippets/announcement.html:34
 #: bookwyrm/templates/snippets/goal_card.html:22
 msgid "Dismiss message"
 msgstr "�散消�"
@@ -1388,7 +1388,7 @@ msgstr "任何人都�以推�书目�主题让你批准"
 #: bookwyrm/templates/lists/form.html:31
 #: bookwyrm/templates/moderation/reports.html:25
 #: bookwyrm/templates/search/book.html:30
-#: bookwyrm/templates/snippets/announcement.html:15
+#: bookwyrm/templates/snippets/announcement.html:16
 msgid "Open"
 msgstr "开放"
 
@@ -2305,7 +2305,7 @@ msgstr "�许请求邀请:"
 msgid "Registration closed text:"
 msgstr "注册关闭文字:"
 
-#: bookwyrm/templates/snippets/announcement.html:27
+#: bookwyrm/templates/snippets/announcement.html:31
 #, fuzzy, python-format
 #| msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgid "Posted by <a href=\"%(user_path)s\">%(username)s</a>"
@@ -2989,6 +2989,12 @@ msgstr ""
 msgid "Access level:"
 msgstr ""
 
+#: bookwyrm/views/import_data.py:67
+#, fuzzy
+#| msgid "Email address:"
+msgid "Not a valid csv file"
+msgstr "邮箱地�:"
+
 #: bookwyrm/views/password.py:32
 msgid "No user with that email address was found."
 msgstr "没有找到使用该邮箱的用户。"
@@ -3013,11 +3019,6 @@ msgstr "密��置连接已��给 %s"
 #~ msgid "Messages"
 #~ msgstr "所有消�"
 
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "Enter a valid value."
-#~ msgstr "邮箱地�:"
-
 #, fuzzy
 #~| msgid "Email address:"
 #~ msgid "Enter a valid URL."

From 3f1d670911cde609330c60a2d7a25c7f4445b87d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 May 2021 14:47:23 -0700
Subject: [PATCH 1175/1285] Uses safe method for pagination on follows pages

---
 bookwyrm/views/user.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index 3f77e962..ffc352d8 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -95,7 +95,7 @@ class Followers(View):
         data = {
             "user": user,
             "is_self": request.user.id == user.id,
-            "follow_list": paginated.page(request.GET.get("page", 1)),
+            "follow_list": paginated.get_page(request.GET.get("page")),
         }
         return TemplateResponse(request, "user/relationships/followers.html", data)
 
@@ -114,7 +114,7 @@ class Following(View):
         data = {
             "user": user,
             "is_self": request.user.id == user.id,
-            "follow_list": paginated.page(request.GET.get("page", 1)),
+            "follow_list": paginated.get_page(request.GET.get("page")),
         }
         return TemplateResponse(request, "user/relationships/following.html", data)
 

From 1df600d1cbd106cc5298c41b265ba576e9576a70 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 May 2021 14:52:36 -0700
Subject: [PATCH 1176/1285] Package update for security

---
 yarn.lock | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index c1a1c181..c6fa3d42 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -499,7 +499,7 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-colorette@^1.2.1:
+colorette@^1.2.1, colorette@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
   integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
@@ -1427,6 +1427,11 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
+nanoid@^3.1.23:
+  version "3.1.23"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81"
+  integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -1643,7 +1648,7 @@ postcss-value-parser@^4.1.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
   integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
 
-postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.31, postcss@^7.0.32, postcss@^7.0.35, postcss@^7.0.6:
+postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.31, postcss@^7.0.35, postcss@^7.0.6:
   version "7.0.35"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24"
   integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==
@@ -1652,6 +1657,15 @@ postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
+postcss@^8.2.10:
+  version "8.2.15"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.15.tgz#9e66ccf07292817d226fc315cbbf9bc148fbca65"
+  integrity sha512-2zO3b26eJD/8rb106Qu2o7Qgg52ND5HPjcyQiK2B98O388h43A448LCslC0dI2P97wCAQRJsFvwTRcXxTKds+Q==
+  dependencies:
+    colorette "^1.2.2"
+    nanoid "^3.1.23"
+    source-map "^0.6.1"
+
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"

From 67c40fe4f8250146b2c2b4ca208c90652b880958 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 May 2021 14:57:13 -0700
Subject: [PATCH 1177/1285] Updates merge

---
 yarn.lock | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index c6fa3d42..c1a1c181 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -499,7 +499,7 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-colorette@^1.2.1, colorette@^1.2.2:
+colorette@^1.2.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
   integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
@@ -1427,11 +1427,6 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-nanoid@^3.1.23:
-  version "3.1.23"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81"
-  integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==
-
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -1648,7 +1643,7 @@ postcss-value-parser@^4.1.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
   integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
 
-postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.31, postcss@^7.0.35, postcss@^7.0.6:
+postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.31, postcss@^7.0.32, postcss@^7.0.35, postcss@^7.0.6:
   version "7.0.35"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24"
   integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==
@@ -1657,15 +1652,6 @@ postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
-postcss@^8.2.10:
-  version "8.2.15"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.15.tgz#9e66ccf07292817d226fc315cbbf9bc148fbca65"
-  integrity sha512-2zO3b26eJD/8rb106Qu2o7Qgg52ND5HPjcyQiK2B98O388h43A448LCslC0dI2P97wCAQRJsFvwTRcXxTKds+Q==
-  dependencies:
-    colorette "^1.2.2"
-    nanoid "^3.1.23"
-    source-map "^0.6.1"
-
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"

From 9c13bf34a8173db07420ff795014719c590b605d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 May 2021 15:11:47 -0700
Subject: [PATCH 1178/1285] Only show banner to authenticated users

---
 bookwyrm/templates/layout.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 2f8001dd..bad1cb6e 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -181,7 +181,7 @@
     </div>
 </nav>
 
-{% if active_announcements.exists %}
+{% if request.user.is_authenticated and active_announcements.exists %}
 <div class="block is-flex-grow-1">
     <div class="container">
         {% for announcement in active_announcements %}

From 82f74a4049a78d68d3f5108835e2092470c3f66e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 May 2021 15:17:05 -0700
Subject: [PATCH 1179/1285] Fixes logic error in get started user view

---
 bookwyrm/views/get_started.py | 4 ++--
 bookwyrm/views/password.py    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/views/get_started.py b/bookwyrm/views/get_started.py
index 5573bf19..7eae9483 100644
--- a/bookwyrm/views/get_started.py
+++ b/bookwyrm/views/get_started.py
@@ -120,9 +120,9 @@ class GetStartedUsers(View):
         )
 
         if user_results.count() < 5:
-            suggested_users = get_suggested_users(request.user)
+            user_results = list(user_results) + list(get_suggested_users(request.user))
 
         data = {
-            "suggested_users": list(user_results) + list(suggested_users),
+            "suggested_users": user_results,
         }
         return TemplateResponse(request, "get_started/users.html", data)
diff --git a/bookwyrm/views/password.py b/bookwyrm/views/password.py
index 933817a8..91a379f3 100644
--- a/bookwyrm/views/password.py
+++ b/bookwyrm/views/password.py
@@ -27,7 +27,7 @@ class PasswordResetRequest(View):
         """create a password reset token"""
         email = request.POST.get("email")
         try:
-            user = models.User.objects.get(email=email)
+            user = models.User.objects.get(email=email, email__isnull=False)
         except models.User.DoesNotExist:
             data = {"error": _("No user with that email address was found.")}
             return TemplateResponse(request, "password_reset_request.html", data)

From 5bc69bc808c666c2d4cb61db0c078d86b64670d6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 May 2021 15:21:24 -0700
Subject: [PATCH 1180/1285] Bumps up merge and postcss versions

---
 package.json |   4 +
 yarn.lock    | 418 +++++++++++++++++++++++----------------------------
 2 files changed, 195 insertions(+), 227 deletions(-)

diff --git a/package.json b/package.json
index b7abe434..119bb512 100644
--- a/package.json
+++ b/package.json
@@ -8,5 +8,9 @@
     "stylelint-config-standard": "^21.0.0",
     "stylelint-order": "^4.1.0",
     "watch": "^1.0.2"
+  },
+  "dependencies": {
+    "merge": "2.1.1",
+    "postcss": "8.2.10"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index c1a1c181..21730a68 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16,25 +16,25 @@
   dependencies:
     "@babel/highlight" "^7.12.13"
 
-"@babel/compat-data@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.12.tgz#a8a5ccac19c200f9dd49624cac6e19d7be1236a1"
-  integrity sha512-3eJJ841uKxeV8dcN/2yGEUy+RfgQspPEgQat85umsE1rotuquQ2AbIub4S6j7c50a2d+4myc+zSlnXeIHrOnhQ==
+"@babel/compat-data@^7.13.15":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.0.tgz#a901128bce2ad02565df95e6ecbf195cf9465919"
+  integrity sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q==
 
 "@babel/core@>=7.9.0":
-  version "7.13.14"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.14.tgz#8e46ebbaca460a63497c797e574038ab04ae6d06"
-  integrity sha512-wZso/vyF4ki0l0znlgM4inxbdrUvCb+cVz8grxDq+6C9k6qbqoIJteQOKicaKjCipU3ISV+XedCqpL2RJJVehA==
+  version "7.14.3"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.3.tgz#5395e30405f0776067fbd9cf0884f15bfb770a38"
+  integrity sha512-jB5AmTKOCSJIZ72sd78ECEhuPiDMKlQdDI/4QRI6lzYATx5SSogS1oQA2AoPecRCknm30gHi2l+QVvNUu3wZAg==
   dependencies:
     "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.13.9"
-    "@babel/helper-compilation-targets" "^7.13.13"
-    "@babel/helper-module-transforms" "^7.13.14"
-    "@babel/helpers" "^7.13.10"
-    "@babel/parser" "^7.13.13"
+    "@babel/generator" "^7.14.3"
+    "@babel/helper-compilation-targets" "^7.13.16"
+    "@babel/helper-module-transforms" "^7.14.2"
+    "@babel/helpers" "^7.14.0"
+    "@babel/parser" "^7.14.3"
     "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.13"
-    "@babel/types" "^7.13.14"
+    "@babel/traverse" "^7.14.2"
+    "@babel/types" "^7.14.2"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
@@ -42,33 +42,33 @@
     semver "^6.3.0"
     source-map "^0.5.0"
 
-"@babel/generator@^7.13.9":
-  version "7.13.9"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.9.tgz#3a7aa96f9efb8e2be42d38d80e2ceb4c64d8de39"
-  integrity sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==
+"@babel/generator@^7.14.2", "@babel/generator@^7.14.3":
+  version "7.14.3"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.3.tgz#0c2652d91f7bddab7cccc6ba8157e4f40dcedb91"
+  integrity sha512-bn0S6flG/j0xtQdz3hsjJ624h3W0r3llttBMfyHX3YrZ/KtLYr15bjA0FXkgW7FpvrDuTuElXeVjiKlYRpnOFA==
   dependencies:
-    "@babel/types" "^7.13.0"
+    "@babel/types" "^7.14.2"
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
-"@babel/helper-compilation-targets@^7.13.13":
-  version "7.13.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.13.tgz#2b2972a0926474853f41e4adbc69338f520600e5"
-  integrity sha512-q1kcdHNZehBwD9jYPh3WyXcsFERi39X4I59I3NadciWtNDyZ6x+GboOxncFK0kXlKIv6BJm5acncehXWUjWQMQ==
+"@babel/helper-compilation-targets@^7.13.16":
+  version "7.13.16"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz#6e91dccf15e3f43e5556dffe32d860109887563c"
+  integrity sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA==
   dependencies:
-    "@babel/compat-data" "^7.13.12"
+    "@babel/compat-data" "^7.13.15"
     "@babel/helper-validator-option" "^7.12.17"
     browserslist "^4.14.5"
     semver "^6.3.0"
 
-"@babel/helper-function-name@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"
-  integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==
+"@babel/helper-function-name@^7.14.2":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.2.tgz#397688b590760b6ef7725b5f0860c82427ebaac2"
+  integrity sha512-NYZlkZRydxw+YT56IlhIcS8PAhb+FEUiOzuhFTfqDyPmzAhRge6ua0dQYT/Uh0t/EDHq05/i+e5M2d4XvjgarQ==
   dependencies:
     "@babel/helper-get-function-arity" "^7.12.13"
     "@babel/template" "^7.12.13"
-    "@babel/types" "^7.12.13"
+    "@babel/types" "^7.14.2"
 
 "@babel/helper-get-function-arity@^7.12.13":
   version "7.12.13"
@@ -91,19 +91,19 @@
   dependencies:
     "@babel/types" "^7.13.12"
 
-"@babel/helper-module-transforms@^7.13.14":
-  version "7.13.14"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.14.tgz#e600652ba48ccb1641775413cb32cfa4e8b495ef"
-  integrity sha512-QuU/OJ0iAOSIatyVZmfqB0lbkVP0kDRiKj34xy+QNsnVZi/PA6BoSoreeqnxxa9EHFAIL0R9XOaAR/G9WlIy5g==
+"@babel/helper-module-transforms@^7.14.2":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.2.tgz#ac1cc30ee47b945e3e0c4db12fa0c5389509dfe5"
+  integrity sha512-OznJUda/soKXv0XhpvzGWDnml4Qnwp16GN+D/kZIdLsWoHj05kyu8Rm5kXmMef+rVJZ0+4pSGLkeixdqNUATDA==
   dependencies:
     "@babel/helper-module-imports" "^7.13.12"
     "@babel/helper-replace-supers" "^7.13.12"
     "@babel/helper-simple-access" "^7.13.12"
     "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/helper-validator-identifier" "^7.12.11"
+    "@babel/helper-validator-identifier" "^7.14.0"
     "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.13"
-    "@babel/types" "^7.13.14"
+    "@babel/traverse" "^7.14.2"
+    "@babel/types" "^7.14.2"
 
 "@babel/helper-optimise-call-expression@^7.12.13":
   version "7.12.13"
@@ -113,14 +113,14 @@
     "@babel/types" "^7.12.13"
 
 "@babel/helper-replace-supers@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz#6442f4c1ad912502481a564a7386de0c77ff3804"
-  integrity sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==
+  version "7.14.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.3.tgz#ca17b318b859d107f0e9b722d58cf12d94436600"
+  integrity sha512-Rlh8qEWZSTfdz+tgNV/N4gz1a0TMNwCUcENhMjHTHKp3LseYH5Jha0NSlyTQWMnjbYcwFt+bqAMqSLHVXkQ6UA==
   dependencies:
     "@babel/helper-member-expression-to-functions" "^7.13.12"
     "@babel/helper-optimise-call-expression" "^7.12.13"
-    "@babel/traverse" "^7.13.0"
-    "@babel/types" "^7.13.12"
+    "@babel/traverse" "^7.14.2"
+    "@babel/types" "^7.14.2"
 
 "@babel/helper-simple-access@^7.13.12":
   version "7.13.12"
@@ -136,38 +136,38 @@
   dependencies:
     "@babel/types" "^7.12.13"
 
-"@babel/helper-validator-identifier@^7.12.11":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
-  integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
+"@babel/helper-validator-identifier@^7.14.0":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288"
+  integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==
 
 "@babel/helper-validator-option@^7.12.17":
   version "7.12.17"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"
   integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==
 
-"@babel/helpers@^7.13.10":
-  version "7.13.10"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.10.tgz#fd8e2ba7488533cdeac45cc158e9ebca5e3c7df8"
-  integrity sha512-4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ==
+"@babel/helpers@^7.14.0":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.0.tgz#ea9b6be9478a13d6f961dbb5f36bf75e2f3b8f62"
+  integrity sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg==
   dependencies:
     "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.0"
-    "@babel/types" "^7.13.0"
+    "@babel/traverse" "^7.14.0"
+    "@babel/types" "^7.14.0"
 
 "@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13":
-  version "7.13.10"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.10.tgz#a8b2a66148f5b27d666b15d81774347a731d52d1"
-  integrity sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz#3197e375711ef6bf834e67d0daec88e4f46113cf"
+  integrity sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.12.11"
+    "@babel/helper-validator-identifier" "^7.14.0"
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.12.13", "@babel/parser@^7.13.13":
-  version "7.13.13"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.13.tgz#42f03862f4aed50461e543270916b47dd501f0df"
-  integrity sha512-OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw==
+"@babel/parser@^7.12.13", "@babel/parser@^7.14.2", "@babel/parser@^7.14.3":
+  version "7.14.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.3.tgz#9b530eecb071fd0c93519df25c5ff9f14759f298"
+  integrity sha512-7MpZDIfI7sUC5zWo2+foJ50CSI5lcqDehZ0lVgIhSi4bFEk94fLAKlF3Q0nzSQQ+ca0lm+O6G9ztKVBeu8PMRQ==
 
 "@babel/template@^7.12.13":
   version "7.12.13"
@@ -178,33 +178,32 @@
     "@babel/parser" "^7.12.13"
     "@babel/types" "^7.12.13"
 
-"@babel/traverse@^7.13.0", "@babel/traverse@^7.13.13":
-  version "7.13.13"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.13.tgz#39aa9c21aab69f74d948a486dd28a2dbdbf5114d"
-  integrity sha512-CblEcwmXKR6eP43oQGG++0QMTtCjAsa3frUuzHoiIJWpaIIi8dwMyEFUJoXRLxagGqCK+jALRwIO+o3R9p/uUg==
+"@babel/traverse@^7.14.0", "@babel/traverse@^7.14.2":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.2.tgz#9201a8d912723a831c2679c7ebbf2fe1416d765b"
+  integrity sha512-TsdRgvBFHMyHOOzcP9S6QU0QQtjxlRpEYOy3mcCO5RgmC305ki42aSAmfZEMSSYBla2oZ9BMqYlncBaKmD/7iA==
   dependencies:
     "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.13.9"
-    "@babel/helper-function-name" "^7.12.13"
+    "@babel/generator" "^7.14.2"
+    "@babel/helper-function-name" "^7.14.2"
     "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/parser" "^7.13.13"
-    "@babel/types" "^7.13.13"
+    "@babel/parser" "^7.14.2"
+    "@babel/types" "^7.14.2"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.13", "@babel/types@^7.13.14":
-  version "7.13.14"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.14.tgz#c35a4abb15c7cd45a2746d78ab328e362cbace0d"
-  integrity sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ==
+"@babel/types@^7.12.13", "@babel/types@^7.13.12", "@babel/types@^7.14.0", "@babel/types@^7.14.2":
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.2.tgz#4208ae003107ef8a057ea8333e56eb64d2f6a2c3"
+  integrity sha512-SdjAG/3DikRHpUOjxZgnkbR11xUlyDMUFJdvnIgZEE16mqmY0BINMmc4//JMJglEmn6i7sq6p+mGrFWyZ98EEw==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.12.11"
-    lodash "^4.17.19"
+    "@babel/helper-validator-identifier" "^7.14.0"
     to-fast-properties "^2.0.0"
 
-"@eslint/eslintrc@^0.4.0":
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547"
-  integrity sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog==
+"@eslint/eslintrc@^0.4.1":
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.1.tgz#442763b88cecbe3ee0ec7ca6d6dd6168550cbf14"
+  integrity sha512-5v7TDE9plVhvxQeWLXDTvFvJBdH6pEsdnl2g/dAptmuFEPedQ4Erq5rsDsX+mvAM610IhNaO2W5V1dOOnDKxkQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.1.1"
@@ -300,9 +299,9 @@ ajv@^6.10.0, ajv@^6.12.4:
     uri-js "^4.2.2"
 
 ajv@^8.0.1:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.0.2.tgz#1396e27f208ed56dd5638ab5a251edeb1c91d402"
-  integrity sha512-V0HGxJd0PiDF0ecHYIesTOqfd1gJguwQUOYfMfAWnRsWQEXfc5ifbUFhD3Wjc+O+y7VAqL+g07prq9gHQ/JOZQ==
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.5.0.tgz#695528274bcb5afc865446aa275484049a18ae4b"
+  integrity sha512-Y2l399Tt1AguU3BPRP9Fn4eN+Or+StUGWCUpbnFyXSo8NZ9S4uj+AG2pjs5apK+ZMOwYOz1+a+VKvKH7CudXgQ==
   dependencies:
     fast-deep-equal "^3.1.1"
     json-schema-traverse "^1.0.0"
@@ -374,9 +373,14 @@ bail@^1.0.0:
   integrity sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==
 
 balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+
+balanced-match@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-2.0.0.tgz#dc70f920d78db8b858535795867bf48f820633d9"
+  integrity sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==
 
 brace-expansion@^1.1.7:
   version "1.1.11"
@@ -394,23 +398,15 @@ braces@^3.0.1:
     fill-range "^7.0.1"
 
 browserslist@^4.12.0, browserslist@^4.14.5:
-  version "4.16.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz#340aa46940d7db878748567c5dea24a48ddf3717"
-  integrity sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==
+  version "4.16.6"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
+  integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
   dependencies:
-    caniuse-lite "^1.0.30001181"
-    colorette "^1.2.1"
-    electron-to-chromium "^1.3.649"
+    caniuse-lite "^1.0.30001219"
+    colorette "^1.2.2"
+    electron-to-chromium "^1.3.723"
     escalade "^3.1.1"
-    node-releases "^1.1.70"
-
-call-bind@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
-  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
-  dependencies:
-    function-bind "^1.1.1"
-    get-intrinsic "^1.0.2"
+    node-releases "^1.1.71"
 
 callsites@^3.0.0:
   version "3.1.0"
@@ -431,10 +427,10 @@ camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001181:
-  version "1.0.30001205"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001205.tgz#d79bf6a6fb13196b4bb46e5143a22ca0242e0ef8"
-  integrity sha512-TL1GrS5V6LElbitPazidkBMD9sa448bQDDLrumDqaggmKFcuU2JW1wTOHJPukAcOMtEmLcmDJEzfRrf+GjM0Og==
+caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001219:
+  version "1.0.30001228"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa"
+  integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==
 
 chalk@^2.0.0, chalk@^2.4.2:
   version "2.4.2"
@@ -445,10 +441,10 @@ chalk@^2.0.0, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.0.0, chalk@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
-  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
+chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad"
+  integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==
   dependencies:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
@@ -499,7 +495,7 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-colorette@^1.2.1:
+colorette@^1.2.1, colorette@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
   integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
@@ -594,9 +590,9 @@ domelementtype@1, domelementtype@^1.3.1:
   integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
 
 domelementtype@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.1.0.tgz#a851c080a6d1c3d94344aed151d99f669edf585e"
-  integrity sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"
+  integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==
 
 domhandler@^2.3.0:
   version "2.4.2"
@@ -613,10 +609,10 @@ domutils@^1.5.1:
     dom-serializer "0"
     domelementtype "1"
 
-electron-to-chromium@^1.3.649:
-  version "1.3.703"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.703.tgz#6d9b9a75c42a40775f5930329e642b22b227317f"
-  integrity sha512-SVBVhNB+4zPL+rvtWLw7PZQkw/Eqj1HQZs22xtcqW36+xoifzEOEEDEpkxSMfB6RFeSIOcG00w6z5mSqLr1Y6w==
+electron-to-chromium@^1.3.723:
+  version "1.3.735"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.735.tgz#fa1a8660f2790662291cb2136f0e446a444cdfdc"
+  integrity sha512-cp7MWzC3NseUJV2FJFgaiesdrS+A8ZUjX5fLAxdRlcaPDkaPGFplX930S5vf84yqDp4LjuLdKouWuVOTwUfqHQ==
 
 emoji-regex@^8.0.0:
   version "8.0.0"
@@ -678,17 +674,17 @@ eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
   integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
 
 eslint-visitor-keys@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
-  integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
+  integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
 eslint@^7.23.0:
-  version "7.23.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.23.0.tgz#8d029d252f6e8cf45894b4bee08f5493f8e94325"
-  integrity sha512-kqvNVbdkjzpFy0XOszNwjkKzZ+6TcwCQ/h+ozlcIWwaimBBuhlQ4nN6kbiM2L+OjDcznkTJxzYfRFH92sx4a0Q==
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.26.0.tgz#d416fdcdcb3236cd8f282065312813f8c13982f6"
+  integrity sha512-4R1ieRf52/izcZE7AlLy56uIHHDLT74Yzz2Iv2l6kDaYvEu9x+wMB5dZArVL8SYGXSYV2YAg70FcW5Y5nGGNIg==
   dependencies:
     "@babel/code-frame" "7.12.11"
-    "@eslint/eslintrc" "^0.4.0"
+    "@eslint/eslintrc" "^0.4.1"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
@@ -881,15 +877,6 @@ gensync@^1.0.0-beta.2:
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-get-intrinsic@^1.0.2:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
-  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
-  dependencies:
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-
 get-stdin@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"
@@ -903,9 +890,9 @@ glob-parent@^5.0.0, glob-parent@^5.1.0:
     is-glob "^4.0.1"
 
 glob@^7.1.3:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
-  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+  version "7.1.7"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
+  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -943,13 +930,13 @@ globals@^12.1.0:
     type-fest "^0.8.1"
 
 globals@^13.6.0:
-  version "13.7.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.7.0.tgz#aed3bcefd80ad3ec0f0be2cf0c895110c0591795"
-  integrity sha512-Aipsz6ZKRxa/xQkZhNg0qIWXT6x6rD46f6x/PCnBomlttdIyAPak4YD9jTmKpZ72uROSMU87qJtcgpgHaVchiA==
+  version "13.8.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz#3e20f504810ce87a8d72e55aecf8435b50f4c1b3"
+  integrity sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q==
   dependencies:
     type-fest "^0.20.2"
 
-globby@^11.0.2:
+globby@^11.0.3:
   version "11.0.3"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb"
   integrity sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==
@@ -988,11 +975,6 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-symbols@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
-  integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
-
 has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
@@ -1001,9 +983,9 @@ has@^1.0.3:
     function-bind "^1.1.1"
 
 hosted-git-info@^2.1.4:
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
-  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
 hosted-git-info@^4.0.1:
   version "4.0.2"
@@ -1062,11 +1044,6 @@ indent-string@^4.0.0:
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
   integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
-indexes-of@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
-  integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
-
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -1103,22 +1080,15 @@ is-arrayish@^0.2.1:
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
   integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
-is-boolean-object@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz#e2aaad3a3a8fca34c28f6eee135b156ed2587ff0"
-  integrity sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==
-  dependencies:
-    call-bind "^1.0.0"
-
 is-buffer@^2.0.0:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
   integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
 
 is-core-module@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
-  integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz#8e9fc8e15027b011418026e98f0e6f4d86305cc1"
+  integrity sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==
   dependencies:
     has "^1.0.3"
 
@@ -1149,11 +1119,6 @@ is-hexadecimal@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7"
   integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==
 
-is-number-object@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197"
-  integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==
-
 is-number@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
@@ -1174,11 +1139,6 @@ is-regexp@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-2.1.0.tgz#cd734a56864e23b956bf4e7c66c396a4c0b22c2d"
   integrity sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==
 
-is-string@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
-  integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==
-
 is-typedarray@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -1274,22 +1234,17 @@ lodash.clonedeep@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
   integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
 
-lodash.flatten@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
-  integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=
-
 lodash.truncate@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
   integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
 
-lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21:
+lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-log-symbols@^4.0.0:
+log-symbols@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
   integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
@@ -1315,9 +1270,9 @@ map-obj@^1.0.0:
   integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
 
 map-obj@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.2.0.tgz#0e8bc823e2aaca8a0942567d12ed14f389eec153"
-  integrity sha512-NAq0fCmZYGz9UFEQyndp7sisrow4GroyGeKluyKC/chuITZsPyOyC1UJZPJlVFImhXdROIP5xqouRLThT3BbpQ==
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.2.1.tgz#e4ea399dbc979ae735c83c863dd31bdf364277b7"
+  integrity sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==
 
 mathml-tag-names@^2.1.3:
   version "2.1.3"
@@ -1375,6 +1330,11 @@ merge2@^1.3.0:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
+merge@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/merge/-/merge-2.1.1.tgz#59ef4bf7e0b3e879186436e8481c06a6c162ca98"
+  integrity sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w==
+
 merge@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
@@ -1388,13 +1348,13 @@ micromark@~2.11.0:
     debug "^4.0.0"
     parse-entities "^2.0.0"
 
-micromatch@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
-  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+micromatch@^4.0.2, micromatch@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
+  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
   dependencies:
     braces "^3.0.1"
-    picomatch "^2.0.5"
+    picomatch "^2.2.3"
 
 min-indent@^1.0.0:
   version "1.0.1"
@@ -1427,15 +1387,20 @@ ms@2.1.2:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
+nanoid@^3.1.22:
+  version "3.1.23"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81"
+  integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw==
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
-node-releases@^1.1.70:
-  version "1.1.71"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"
-  integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==
+node-releases@^1.1.71:
+  version "1.1.72"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz#14802ab6b1039a79a0c7d662b610a5bbd76eacbe"
+  integrity sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==
 
 normalize-package-data@^2.5.0:
   version "2.5.0"
@@ -1564,10 +1529,10 @@ path-type@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
-picomatch@^2.0.5, picomatch@^2.2.1:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
-  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
+picomatch@^2.2.1, picomatch@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d"
+  integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==
 
 postcss-html@^0.36.0:
   version "0.36.0"
@@ -1615,14 +1580,12 @@ postcss-scss@^2.1.1:
   dependencies:
     postcss "^7.0.6"
 
-postcss-selector-parser@^6.0.4:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz#56075a1380a04604c38b063ea7767a129af5c2b3"
-  integrity sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==
+postcss-selector-parser@^6.0.5:
+  version "6.0.6"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea"
+  integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==
   dependencies:
     cssesc "^3.0.0"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
     util-deprecate "^1.0.2"
 
 postcss-sorting@^5.0.1:
@@ -1643,6 +1606,15 @@ postcss-value-parser@^4.1.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
   integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
 
+postcss@8.2.10:
+  version "8.2.10"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.10.tgz#ca7a042aa8aff494b334d0ff3e9e77079f6f702b"
+  integrity sha512-b/h7CPV7QEdrqIxtAf2j31U5ef05uBDuvoXv6L51Q4rcS1jdlXAVKJv+atCFdUXYl9dyTHGyoMzIepwowRJjFw==
+  dependencies:
+    colorette "^1.2.2"
+    nanoid "^3.1.22"
+    source-map "^0.6.1"
+
 postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.31, postcss@^7.0.32, postcss@^7.0.35, postcss@^7.0.6:
   version "7.0.35"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24"
@@ -1878,9 +1850,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
-  integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.8.tgz#eb1e97ad99b11bf3f82a3b71a0472dd9a00f2ecf"
+  integrity sha512-NDgA96EnaLSvtbM7trJj+t1LUR3pirkDCcz9nOUlPb5DMBGsH7oES6C3hs3j7R9oHEa1EMvReS/BUAIT5Tcr0g==
 
 specificity@^0.4.1:
   version "0.4.1"
@@ -1954,15 +1926,15 @@ stylelint-order@^4.1.0:
     postcss-sorting "^5.0.1"
 
 stylelint@^13.12.0:
-  version "13.12.0"
-  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-13.12.0.tgz#cceb922be0d0c7b7b6926271eea2b90cb924733e"
-  integrity sha512-P8O1xDy41B7O7iXaSlW+UuFbE5+ZWQDb61ndGDxKIt36fMH50DtlQTbwLpFLf8DikceTAb3r6nPrRv30wBlzXw==
+  version "13.13.1"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-13.13.1.tgz#fca9c9f5de7990ab26a00f167b8978f083a18f3c"
+  integrity sha512-Mv+BQr5XTUrKqAXmpqm6Ddli6Ief+AiPZkRsIrAoUKFuq/ElkUh9ZMYxXD0iQNZ5ADghZKLOWz1h7hTClB7zgQ==
   dependencies:
     "@stylelint/postcss-css-in-js" "^0.37.2"
     "@stylelint/postcss-markdown" "^0.36.2"
     autoprefixer "^9.8.6"
-    balanced-match "^1.0.0"
-    chalk "^4.1.0"
+    balanced-match "^2.0.0"
+    chalk "^4.1.1"
     cosmiconfig "^7.0.0"
     debug "^4.3.1"
     execall "^2.0.0"
@@ -1971,7 +1943,7 @@ stylelint@^13.12.0:
     file-entry-cache "^6.0.1"
     get-stdin "^8.0.0"
     global-modules "^2.0.0"
-    globby "^11.0.2"
+    globby "^11.0.3"
     globjoin "^0.1.4"
     html-tags "^3.1.0"
     ignore "^5.1.8"
@@ -1979,10 +1951,10 @@ stylelint@^13.12.0:
     imurmurhash "^0.1.4"
     known-css-properties "^0.21.0"
     lodash "^4.17.21"
-    log-symbols "^4.0.0"
+    log-symbols "^4.1.0"
     mathml-tag-names "^2.1.3"
     meow "^9.0.0"
-    micromatch "^4.0.2"
+    micromatch "^4.0.4"
     normalize-selector "^0.2.0"
     postcss "^7.0.35"
     postcss-html "^0.36.0"
@@ -1992,7 +1964,7 @@ stylelint@^13.12.0:
     postcss-safe-parser "^4.0.2"
     postcss-sass "^0.4.4"
     postcss-scss "^2.1.1"
-    postcss-selector-parser "^6.0.4"
+    postcss-selector-parser "^6.0.5"
     postcss-syntax "^0.36.2"
     postcss-value-parser "^4.1.0"
     resolve-from "^5.0.0"
@@ -2003,8 +1975,8 @@ stylelint@^13.12.0:
     style-search "^0.1.0"
     sugarss "^2.0.0"
     svg-tags "^1.0.0"
-    table "^6.0.7"
-    v8-compile-cache "^2.2.0"
+    table "^6.6.0"
+    v8-compile-cache "^2.3.0"
     write-file-atomic "^3.0.3"
 
 sugarss@^2.0.0:
@@ -2040,20 +2012,17 @@ svg-tags@^1.0.0:
   resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
   integrity sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=
 
-table@^6.0.4, table@^6.0.7:
-  version "6.0.9"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.0.9.tgz#790a12bf1e09b87b30e60419bafd6a1fd85536fb"
-  integrity sha512-F3cLs9a3hL1Z7N4+EkSscsel3z55XT950AvB05bwayrNg5T1/gykXtigioTAjbltvbMSJvvhFCbnf6mX+ntnJQ==
+table@^6.0.4, table@^6.6.0:
+  version "6.7.1"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2"
+  integrity sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==
   dependencies:
     ajv "^8.0.1"
-    is-boolean-object "^1.1.0"
-    is-number-object "^1.0.4"
-    is-string "^1.0.5"
     lodash.clonedeep "^4.5.0"
-    lodash.flatten "^4.4.0"
     lodash.truncate "^4.4.2"
     slice-ansi "^4.0.0"
     string-width "^4.2.0"
+    strip-ansi "^6.0.0"
 
 text-table@^0.2.0:
   version "0.2.0"
@@ -2128,11 +2097,6 @@ unified@^9.1.0:
     trough "^1.0.0"
     vfile "^4.0.0"
 
-uniq@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
-  integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
-
 unist-util-find-all-after@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz#fdfecd14c5b7aea5e9ef38d5e0d5f774eeb561f6"
@@ -2164,7 +2128,7 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2:
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
-v8-compile-cache@^2.0.3, v8-compile-cache@^2.2.0:
+v8-compile-cache@^2.0.3, v8-compile-cache@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==

From f6440aa17352d69b6010867bc1620d4c1b475ecb Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 May 2021 15:37:26 -0700
Subject: [PATCH 1181/1285] Correctly handles openlibrary works with no
 editions

---
 bookwyrm/connectors/openlibrary.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/connectors/openlibrary.py b/bookwyrm/connectors/openlibrary.py
index 69d498b8..c4d784ab 100644
--- a/bookwyrm/connectors/openlibrary.py
+++ b/bookwyrm/connectors/openlibrary.py
@@ -76,7 +76,10 @@ class Connector(AbstractConnector):
             raise ConnectorException("Invalid book data")
         url = "%s%s/editions" % (self.books_url, key)
         data = get_data(url)
-        return pick_default_edition(data["entries"])
+        edition = pick_default_edition(data["entries"])
+        if not edition:
+            raise ConnectorException("No editions for work")
+        return edition
 
     def get_work_from_edition_data(self, data):
         try:

From 1e9211018d0b6cf3f5dfed5b9462277249513e10 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 May 2021 15:55:50 -0700
Subject: [PATCH 1182/1285] Handle openlibrary redirects

---
 bookwyrm/connectors/openlibrary.py | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/connectors/openlibrary.py b/bookwyrm/connectors/openlibrary.py
index 69d498b8..e58749c1 100644
--- a/bookwyrm/connectors/openlibrary.py
+++ b/bookwyrm/connectors/openlibrary.py
@@ -58,6 +58,13 @@ class Connector(AbstractConnector):
             Mapping("bio", formatter=get_description),
         ]
 
+    def get_book_data(self, remote_id):
+        data = get_data(remote_id)
+        if data.get("type", {}).get("key") == "/type/redirect":
+            remote_id = self.base_url + data.get("location")
+            return get_data(remote_id)
+        return data
+
     def get_remote_id_from_data(self, data):
         """format a url from an openlibrary id field"""
         try:
@@ -75,8 +82,11 @@ class Connector(AbstractConnector):
         except KeyError:
             raise ConnectorException("Invalid book data")
         url = "%s%s/editions" % (self.books_url, key)
-        data = get_data(url)
-        return pick_default_edition(data["entries"])
+        data = self.get_book_data(url)
+        edition = pick_default_edition(data["entries"])
+        if not edition:
+            raise ConnectorException("No editions for work")
+        return edition
 
     def get_work_from_edition_data(self, data):
         try:
@@ -84,7 +94,7 @@ class Connector(AbstractConnector):
         except (IndexError, KeyError):
             raise ConnectorException("No work found for edition")
         url = "%s%s" % (self.books_url, key)
-        return get_data(url)
+        return self.get_book_data(url)
 
     def get_authors_from_data(self, data):
         """parse author json and load or create authors"""
@@ -143,7 +153,7 @@ class Connector(AbstractConnector):
     def load_edition_data(self, olkey):
         """query openlibrary for editions of a work"""
         url = "%s/works/%s/editions" % (self.books_url, olkey)
-        return get_data(url)
+        return self.get_book_data(url)
 
     def expand_book_data(self, book):
         work = book

From f1d4f092f20f31f9da230e05411932502dbc53f2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 May 2021 16:03:14 -0700
Subject: [PATCH 1183/1285] Handle all kinds of invalid image urls

---
 bookwyrm/views/books.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index fee22e89..ef3a6e28 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -319,7 +319,10 @@ def upload_cover(request, book_id):
 
 def set_cover_from_url(url):
     """load it from a url"""
-    image_file = get_image(url)
+    try:
+        image_file = get_image(url)
+    except:  # pylint: disable=bare-except
+        return None
     if not image_file:
         return None
     image_name = str(uuid4()) + "." + url.split(".")[-1]

From 5401d7390943e72d713a0ca9679b0a92434f9ccd Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 May 2021 16:06:23 -0700
Subject: [PATCH 1184/1285] 404 instead of error for invalid post link

---
 bookwyrm/views/status.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py
index 2295c8cc..27aeab07 100644
--- a/bookwyrm/views/status.py
+++ b/bookwyrm/views/status.py
@@ -21,7 +21,7 @@ from .reading import edit_readthrough
 class CreateStatus(View):
     """the view for *posting*"""
 
-    def get(self, request):
+    def get(self, request, status_type):  # pylint: disable=unused-argument
         """compose view (used for delete-and-redraft"""
         book = get_object_or_404(models.Edition, id=request.GET.get("book"))
         data = {"book": book}

From c52b26f4049f306576a0241754a0d68489100668 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 May 2021 16:12:24 -0700
Subject: [PATCH 1185/1285] Moves rss templates to base level directory

---
 .../templates/{snippets/rss_content.html => rss/content.html} | 0
 .../templates/{snippets/rss_title.html => rss/title.html}     | 0
 bookwyrm/views/rss_feed.py                                    | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename bookwyrm/templates/{snippets/rss_content.html => rss/content.html} (100%)
 rename bookwyrm/templates/{snippets/rss_title.html => rss/title.html} (100%)

diff --git a/bookwyrm/templates/snippets/rss_content.html b/bookwyrm/templates/rss/content.html
similarity index 100%
rename from bookwyrm/templates/snippets/rss_content.html
rename to bookwyrm/templates/rss/content.html
diff --git a/bookwyrm/templates/snippets/rss_title.html b/bookwyrm/templates/rss/title.html
similarity index 100%
rename from bookwyrm/templates/snippets/rss_title.html
rename to bookwyrm/templates/rss/title.html
diff --git a/bookwyrm/views/rss_feed.py b/bookwyrm/views/rss_feed.py
index f1678b7f..f3613a09 100644
--- a/bookwyrm/views/rss_feed.py
+++ b/bookwyrm/views/rss_feed.py
@@ -7,8 +7,8 @@ from .helpers import get_user_from_username, privacy_filter
 class RssFeed(Feed):
     """serialize user's posts in rss feed"""
 
-    description_template = "snippets/rss_content.html"
-    title_template = "snippets/rss_title.html"
+    description_template = "rss/content.html"
+    title_template = "rss/title.html"
 
     def get_object(self, request, username):
         """the user who's posts get serialized"""

From ab3fb4d5550b86ecad7ea1561ac41efdada2873c Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 May 2021 16:32:44 -0700
Subject: [PATCH 1186/1285] Adds test for search with no query

---
 bookwyrm/tests/views/test_search.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/bookwyrm/tests/views/test_search.py b/bookwyrm/tests/views/test_search.py
index a6d7c36e..5a5639d8 100644
--- a/bookwyrm/tests/views/test_search.py
+++ b/bookwyrm/tests/views/test_search.py
@@ -53,6 +53,18 @@ class Views(TestCase):
         self.assertEqual(data[0]["title"], "Test Book")
         self.assertEqual(data[0]["key"], "https://%s/book/%d" % (DOMAIN, self.book.id))
 
+    def test_search_no_query(self):
+        """just the search page"""
+        view = views.Search.as_view()
+        # we need a connector for this, sorry
+        request = self.factory.get("")
+        with patch("bookwyrm.views.search.is_api_request") as is_api:
+            is_api.return_value = False
+            response = view(request)
+        self.assertIsInstance(response, TemplateResponse)
+        response.render()
+
+
     def test_search_books(self):
         """searches remote connectors"""
         view = views.Search.as_view()

From a8a8398cf8988cea8716dece7b2ebb47edb47a76 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 May 2021 16:34:32 -0700
Subject: [PATCH 1187/1285] Fixes search null state view

---
 bookwyrm/views/search.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py
index 558c2039..e7b538e4 100644
--- a/bookwyrm/views/search.py
+++ b/bookwyrm/views/search.py
@@ -36,7 +36,7 @@ class Search(View):
             )
             return JsonResponse([r.json() for r in book_results], safe=False)
 
-        if not search_type:
+        if query and not search_type:
             search_type = "user" if "@" in query else "book"
 
         endpoints = {

From 6cadba78fee2d0640cf749b6bb459d82a316bdfd Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 May 2021 16:38:12 -0700
Subject: [PATCH 1188/1285] Python formatting

---
 bookwyrm/tests/views/test_search.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bookwyrm/tests/views/test_search.py b/bookwyrm/tests/views/test_search.py
index 5a5639d8..ab2c910d 100644
--- a/bookwyrm/tests/views/test_search.py
+++ b/bookwyrm/tests/views/test_search.py
@@ -64,7 +64,6 @@ class Views(TestCase):
         self.assertIsInstance(response, TemplateResponse)
         response.render()
 
-
     def test_search_books(self):
         """searches remote connectors"""
         view = views.Search.as_view()

From d39374f13cff466baea0adeb0c3a2e9c9e0ae185 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 May 2021 18:41:36 -0700
Subject: [PATCH 1189/1285] Fixes editions page

---
 bookwyrm/templates/book/format_filter.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/book/format_filter.html b/bookwyrm/templates/book/format_filter.html
index f8636522..c722b24f 100644
--- a/bookwyrm/templates/book/format_filter.html
+++ b/bookwyrm/templates/book/format_filter.html
@@ -1,5 +1,5 @@
 {% extends 'snippets/filters_panel/filter_field.html' %}
-{% load i18n %}{% load utilities %}
+{% load i18n %}
 
 {% block filter %}
 <label class="label is-block" for="id_format">{% trans "Format:" %}</label>
@@ -8,7 +8,7 @@
         <option value="">{% trans "Any" %}</option>
         {% for format in formats %}{% if format %}
         <option value="{{ format }}" {% if request.GET.format == format %}selected{% endif %}>
-            {{ format|book_title }}
+            {{ format|title }}
         </option>
         {% endif %}{% endfor %}
     </select>

From a70c713c29ffcc3b8e877237f28b608edbd7e822 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 May 2021 20:21:04 -0700
Subject: [PATCH 1190/1285] Fixes default values in edit announcement form

---
 bookwyrm/templates/settings/announcement_form.html | 10 +++++++---
 bookwyrm/views/announcements.py                    |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/settings/announcement_form.html b/bookwyrm/templates/settings/announcement_form.html
index 4e2e8f32..8eb6acd5 100644
--- a/bookwyrm/templates/settings/announcement_form.html
+++ b/bookwyrm/templates/settings/announcement_form.html
@@ -2,7 +2,11 @@
 {% load i18n %}
 
 {% block header %}
+{% if announcement %}
+{% trans "Edit Announcement" %}
+{% else %}
 {% trans "Create Announcement" %}
+{% endif %}
 {% endblock %}
 
 {% block form %}
@@ -24,7 +28,7 @@
 </p>
 <p>
     <label class="label" for="id_event_date">Event date:</label>
-    <input type="date" name="event_date" value="{{ form.event_date.value }}" class="input" id="id_event_date">
+    <input type="date" name="event_date" value="{{ form.event_date.value|date:'Y-m-d' }}" class="input" id="id_event_date">
     {% for error in form.event_date.errors %}
     <p class="help is-danger">{{ error | escape }}</p>
     {% endfor %}
@@ -34,7 +38,7 @@
     <div class="column">
         <p>
             <label class="label" for="id_start_date">Start date:</label>
-            <input type="date" name="start_date" class="input" id="id_start_date">
+            <input type="date" name="start_date" class="input" value="{{ form.start_date.value|date:'Y-m-d' }}" id="id_start_date">
             {% for error in form.start_date.errors %}
             <p class="help is-danger">{{ error | escape }}</p>
             {% endfor %}
@@ -43,7 +47,7 @@
     <div class="column">
         <p>
             <label class="label" for="id_end_date">End date:</label>
-            <input type="date" name="end_date" class="input" id="id_end_date">
+            <input type="date" name="end_date" class="input" id="id_end_date" value="{{ form.end_date.value|date:'Y-m-d' }}">
             {% for error in form.end_date.errors %}
             <p class="help is-danger">{{ error | escape }}</p>
             {% endfor %}
diff --git a/bookwyrm/views/announcements.py b/bookwyrm/views/announcements.py
index 6cd6ecd8..e522fc7f 100644
--- a/bookwyrm/views/announcements.py
+++ b/bookwyrm/views/announcements.py
@@ -81,6 +81,7 @@ class Announcement(View):
         form = forms.AnnouncementForm(request.POST, instance=announcement)
         if form.is_valid():
             announcement = form.save()
+            form = forms.AnnouncementForm(instance=announcement)
         data = {
             "announcement": announcement,
             "form": form,

From 8772f26b911cbc605aa598587ee90b05b23f95b2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Thu, 20 May 2021 20:35:12 -0700
Subject: [PATCH 1191/1285] Don't error when task for import no longer exists

---
 bookwyrm/views/import_data.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/views/import_data.py b/bookwyrm/views/import_data.py
index 910283c4..62dcce73 100644
--- a/bookwyrm/views/import_data.py
+++ b/bookwyrm/views/import_data.py
@@ -81,7 +81,10 @@ class ImportStatus(View):
         job = models.ImportJob.objects.get(id=job_id)
         if job.user != request.user:
             raise PermissionDenied
-        task = app.AsyncResult(job.task_id)
+        try:
+            task = app.AsyncResult(job.task_id)
+        except ValueError:
+            task = None
         items = job.items.order_by("index").all()
         failed_items = [i for i in items if i.fail_reason]
         items = [i for i in items if not i.fail_reason]

From 00eba98e9f6f6c5847b1cff71560543ac9aaf026 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 21 May 2021 09:50:23 -0700
Subject: [PATCH 1192/1285] Fixes display of announcement show/hide button on
 mobile

---
 bookwyrm/templates/snippets/announcement.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/snippets/announcement.html b/bookwyrm/templates/snippets/announcement.html
index a6a7c65b..74dfdb54 100644
--- a/bookwyrm/templates/snippets/announcement.html
+++ b/bookwyrm/templates/snippets/announcement.html
@@ -4,7 +4,7 @@
     class="notification mb-1 p-3{% if not admin_mode %} is-hidden{% endif %} transition-y"
     {% if not admin_mode %}data-hide="hide-announcement-{{ announcement.id }}"{% endif %}
 >
-    <div class="columns mb-0">
+    <div class="columns mb-0 is-mobile">
         <div class="column pb-0">
             {% if announcement.event_date %}
             <strong>{{ announcement.event_date|naturalday|title }}:</strong>

From d33b55e0250f8adebfc74aeb7759f2939d34cca4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Fri, 21 May 2021 09:52:40 -0700
Subject: [PATCH 1193/1285] Hide delete button text on mobile

---
 bookwyrm/templates/settings/announcement.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/settings/announcement.html b/bookwyrm/templates/settings/announcement.html
index d276d17c..627c360c 100644
--- a/bookwyrm/templates/settings/announcement.html
+++ b/bookwyrm/templates/settings/announcement.html
@@ -16,8 +16,8 @@
     <form class="control" action="{% url 'settings-announcements-delete' announcement.id %}" method="post">
         {% csrf_token %}
         <button type="submit" class="button is-danger">
-            <span class="icon icon-x" aria-hidden="true"></span>
-            <span>{% trans "Delete" %}</span>
+            <span class="icon icon-x m-0-mobile" aria-hidden="true"></span>
+            <span class="is-sr-only-mobile">{% trans "Delete" %}</span>
         </button>
     </form>
 </div>

From 368d2cd71614cc471432b5bfeae13a2de06d34b6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 22 May 2021 17:33:10 -0700
Subject: [PATCH 1194/1285] Reduces feed page queries for goals

9 fewer queries
---
 bookwyrm/models/user.py                        | 13 ++++++-------
 bookwyrm/templates/snippets/goal_progress.html | 15 +++++++++------
 bookwyrm/views/feed.py                         |  9 +++++----
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py
index 7d821c5b..d9f3eba9 100644
--- a/bookwyrm/models/user.py
+++ b/bookwyrm/models/user.py
@@ -381,17 +381,16 @@ class AnnualGoal(BookWyrmModel):
         return {r.book.id: r.rating for r in reviews}
 
     @property
-    def progress_percent(self):
-        """how close to your goal, in percent form"""
-        return int(float(self.book_count / self.goal) * 100)
-
-    @property
-    def book_count(self):
+    def progress(self):
         """how many books you've read this year"""
-        return self.user.readthrough_set.filter(
+        count = self.user.readthrough_set.filter(
             finish_date__year__gte=self.year,
             finish_date__year__lt=self.year + 1,
         ).count()
+        return {
+            "count": count,
+            "percent": int(float(count / self.goal) * 100),
+        }
 
 
 @app.task
diff --git a/bookwyrm/templates/snippets/goal_progress.html b/bookwyrm/templates/snippets/goal_progress.html
index 2d46181e..d0229b68 100644
--- a/bookwyrm/templates/snippets/goal_progress.html
+++ b/bookwyrm/templates/snippets/goal_progress.html
@@ -1,16 +1,19 @@
 {% load i18n %}
 {% load humanize %}
+
+{% with goal.progress as progress %}
 <p>
-    {% if goal.progress_percent >= 100 %}
+    {% if progress.percent >= 100 %}
         {% trans "Success!" %}
-    {% elif goal.progress_percent %}
-        {% blocktrans with percent=goal.progress_percent %}{{ percent }}% complete!{% endblocktrans %}
+    {% elif progress.percent %}
+        {% blocktrans with percent=progress.percent %}{{ percent }}% complete!{% endblocktrans %}
     {% endif %}
     {% if goal.user == request.user %}
-    {% blocktrans with read_count=goal.book_count|intcomma goal_count=goal.goal|intcomma path=goal.local_path %}You've read <a href="{{ path }}">{{ read_count }} of {{ goal_count}} books</a>.{% endblocktrans %}
+    {% blocktrans with read_count=progress.count|intcomma goal_count=goal.goal|intcomma path=goal.local_path %}You've read <a href="{{ path }}">{{ read_count }} of {{ goal_count}} books</a>.{% endblocktrans %}
     {% else %}
-    {% blocktrans with username=goal.user.display_name read_count=goal.book_count|intcomma goal_count=goal.goal|intcomma path=goal.local_path %}{{ username }} has read <a href="{{ path }}">{{ read_count }} of {{ goal_count}} books</a>.{% endblocktrans %}
+    {% blocktrans with username=goal.user.display_name read_count=progress.count|intcomma goal_count=goal.goal|intcomma path=goal.local_path %}{{ username }} has read <a href="{{ path }}">{{ read_count }} of {{ goal_count}} books</a>.{% endblocktrans %}
     {% endif %}
 </p>
-<progress class="progress is-large" value="{{ goal.book_count }}" max="{{ goal.goal }}" aria-hidden="true">{{ goal.progress_percent }}%</progress>
+<progress class="progress is-large" value="{{ progress.count }}" max="{{ goal.goal }}" aria-hidden="true">{{ progress.percent }}%</progress>
 
+{% endwith %}
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index a03d6b4c..9a85dbb1 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -162,14 +162,15 @@ def get_suggested_books(user, max_books=5):
             else max_books - book_count
         )
         shelf = user.shelf_set.get(identifier=preset)
-
-        shelf_books = shelf.shelfbook_set.order_by("-updated_date")[:limit]
-        if not shelf_books:
+        if not shelf.books.exists():
             continue
+
         shelf_preview = {
             "name": shelf.name,
             "identifier": shelf.identifier,
-            "books": [s.book for s in shelf_books],
+            "books": shelf.books.order_by("shelfbook").prefetch_related("authors")[
+                :limit
+            ],
         }
         suggested_books.append(shelf_preview)
         book_count += len(shelf_preview["books"])

From 3d3ab6433e9fca5edd0ddc019b87af1076e1de16 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 22 May 2021 17:58:08 -0700
Subject: [PATCH 1195/1285] Improves query efficiency for shelve buttons

About 50 fewer queries (yikes)
---
 bookwyrm/templates/get_started/book_preview.html              | 2 +-
 bookwyrm/templates/layout.html                                | 3 +++
 bookwyrm/templates/snippets/shelf_selector.html               | 2 +-
 bookwyrm/templates/snippets/shelve_button/shelve_button.html  | 4 ++--
 .../snippets/shelve_button/shelve_button_dropdown.html        | 2 +-
 bookwyrm/templatetags/bookwyrm_tags.py                        | 4 +---
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/bookwyrm/templates/get_started/book_preview.html b/bookwyrm/templates/get_started/book_preview.html
index 578fef70..d8941ad5 100644
--- a/bookwyrm/templates/get_started/book_preview.html
+++ b/bookwyrm/templates/get_started/book_preview.html
@@ -5,7 +5,7 @@
     <div class="select is-small mt-1 mb-3">
         <select name="{{ book.id }}" aria-label="{% blocktrans with book_title=book.title %}Have you read {{ book_title }}?{% endblocktrans %}">
             <option disabled selected value>Add to your books</option>
-            {% for shelf in request.user.shelf_set.all %}
+            {% for shelf in user_shelves %}
             <option value="{{ shelf.id }}">{{ shelf.name }}</option>
             {% endfor %}
         </select>
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index bad1cb6e..d5a2087e 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -193,8 +193,11 @@
 
 <div class="section is-flex-grow-1">
     <div class="container">
+        {# almost every view needs to know the user shelves #}
+        {% with request.user.shelf_set.all as user_shelves %}
         {% block content %}
         {% endblock %}
+        {% endwith %}
     </div>
 </div>
 
diff --git a/bookwyrm/templates/snippets/shelf_selector.html b/bookwyrm/templates/snippets/shelf_selector.html
index 0036a4e9..ca5a39f6 100644
--- a/bookwyrm/templates/snippets/shelf_selector.html
+++ b/bookwyrm/templates/snippets/shelf_selector.html
@@ -6,7 +6,7 @@
 {% endblock %}
 
 {% block dropdown-list %}
-{% for shelf in request.user.shelf_set.all %}
+{% for shelf in user_shelves %}
 <li role="menuitem" class="dropdown-item p-0">
     <form name="shelve" action="/shelve/" method="post">
         {% csrf_token %}
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button.html b/bookwyrm/templates/snippets/shelve_button/shelve_button.html
index 76ed32a9..f7077b26 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button.html
@@ -13,7 +13,7 @@
     </div>
     {% else %}
     <div class="control">
-        {% include 'snippets/shelve_button/shelve_button_options.html' with class="shelf-option is-small" shelves=request.user.shelf_set.all active_shelf=active_shelf button_uuid=uuid %}
+        {% include 'snippets/shelve_button/shelve_button_options.html' with class="shelf-option is-small" shelves=user_shelves active_shelf=active_shelf button_uuid=uuid %}
     </div>
     {% include 'snippets/shelve_button/shelve_button_dropdown.html' with class="is-small" button_uuid=uuid%}
     {% endif %}
@@ -25,7 +25,7 @@
 
 {% include 'snippets/shelve_button/finish_reading_modal.html' with book=active_shelf.book controls_text="finish-reading" controls_uid=uuid readthrough=readthrough %}
 
-{% include 'snippets/shelve_button/progress_update_modal.html' with book=shelf_book.book controls_text="progress-update" controls_uid=uuid readthrough=readthrough %}
+{% include 'snippets/shelve_button/progress_update_modal.html' with book=active_shelf_book.book controls_text="progress-update" controls_uid=uuid readthrough=readthrough %}
 
 {% endwith %}
 {% endif %}
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html
index 4439bfc2..353a37a1 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html
@@ -7,5 +7,5 @@
 {% endblock %}
 
 {% block dropdown-list %}
-{% include 'snippets/shelve_button/shelve_button_options.html' with active_shelf=active_shelf shelves=request.user.shelf_set.all dropdown=True class="shelf-option is-fullwidth is-small is-radiusless is-white" %}
+{% include 'snippets/shelve_button/shelve_button_options.html' with active_shelf=active_shelf shelves=user_shelves dropdown=True class="shelf-option is-fullwidth is-small is-radiusless is-white" %}
 {% endblock %}
diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index 70228799..072ff663 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -3,8 +3,6 @@ from django import template
 from django.db.models import Avg
 
 from bookwyrm import models, views
-from bookwyrm.views.status import to_markdown
-from bookwyrm.templatetags.utilities import get_user_identifier
 
 
 register = template.Library()
@@ -73,7 +71,7 @@ def active_shelf(context, book):
     """check what shelf a user has a book on, if any"""
     shelf = models.ShelfBook.objects.filter(
         shelf__user=context["request"].user, book__in=book.parent_work.editions.all()
-    ).first()
+    ).select_related("book", "shelf").first()
     return shelf if shelf else {"book": book}
 
 

From e5ff4ac36d314b0f9047ea7cdbc790383bb197ff Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 22 May 2021 18:02:14 -0700
Subject: [PATCH 1196/1285] Python formatting

---
 bookwyrm/templatetags/bookwyrm_tags.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index 072ff663..3f33643b 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -69,9 +69,14 @@ def related_status(notification):
 @register.simple_tag(takes_context=True)
 def active_shelf(context, book):
     """check what shelf a user has a book on, if any"""
-    shelf = models.ShelfBook.objects.filter(
-        shelf__user=context["request"].user, book__in=book.parent_work.editions.all()
-    ).select_related("book", "shelf").first()
+    shelf = (
+        models.ShelfBook.objects.filter(
+            shelf__user=context["request"].user,
+            book__in=book.parent_work.editions.all(),
+        )
+        .select_related("book", "shelf")
+        .first()
+    )
     return shelf if shelf else {"book": book}
 
 

From 7a4c4248df14e703a21477492b9612ca1a84d892 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 22 May 2021 18:34:34 -0700
Subject: [PATCH 1197/1285] Improves status template performance

Reduces queries about about 65
---
 bookwyrm/activitystreams.py                   |  2 ++
 bookwyrm/templates/layout.html                |  6 +++--
 bookwyrm/templates/snippets/boost_button.html | 24 ++++++++++++++++---
 bookwyrm/templates/snippets/fav_button.html   |  6 +++--
 .../templates/snippets/status/layout.html     |  2 +-
 .../snippets/status/status_options.html       |  4 ++--
 bookwyrm/templatetags/interaction.py          |  8 ++-----
 bookwyrm/templatetags/status_display.py       |  7 +++++-
 8 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py
index 86321cd8..ff3c55fb 100644
--- a/bookwyrm/activitystreams.py
+++ b/bookwyrm/activitystreams.py
@@ -55,6 +55,8 @@ class ActivityStream(RedisStore):
         return (
             models.Status.objects.select_subclasses()
             .filter(id__in=statuses)
+            .select_related("user", "reply_parent")
+            .prefetch_related("mention_books", "mention_users")
             .order_by("-published_date")
         )
 
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index d5a2087e..1158d82d 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -134,12 +134,14 @@
                                 <span class="is-sr-only">{% trans "Notifications" %}</span>
                             </span>
                         </span>
+                        {% with request.user.unread_notification_count as notification_count %}
                         <span
-                            class="{% if not request.user.unread_notification_count %}is-hidden {% elif request.user.has_unread_mentions %}is-danger {% endif %}tag is-medium transition-x"
+                            class="{% if not notification_count %}is-hidden {% elif request.user.has_unread_mentions %}is-danger {% endif %}tag is-medium transition-x"
                             data-poll-wrapper
                         >
-                            <span data-poll="notifications">{{ request.user.unread_notification_count }}</span>
+                            <span data-poll="notifications">{{ notification_count }}</span>
                         </span>
+                        {% endwith %}
                     </a>
                 </div>
                 {% else %}
diff --git a/bookwyrm/templates/snippets/boost_button.html b/bookwyrm/templates/snippets/boost_button.html
index 5b84ea44..0f927406 100644
--- a/bookwyrm/templates/snippets/boost_button.html
+++ b/bookwyrm/templates/snippets/boost_button.html
@@ -3,14 +3,31 @@
 {% load i18n %}
 
 {% with status.id|uuid as uuid %}
-<form name="boost" action="/boost/{{ status.id }}" method="post" class="interaction boost-{{ status.id }}-{{ uuid }} {% if request.user|boosted:status  %}is-hidden{% endif %}" data-id="boost-{{ status.id }}-{{ uuid }}">
+{% with request.user|boosted:status as boosted %}
+<form
+    name="boost"
+    action="/boost/{{ status.id }}"
+    method="post"
+    class="interaction boost-{{ status.id }}-{{ uuid }} {% if boosted %}is-hidden{% endif %}"
+    data-id="boost-{{ status.id }}-{{ uuid }}"
+>
     {% csrf_token %}
-    <button class="button is-small is-light is-transparent" type="submit" {% if not status.boostable %}disabled{% endif %}>
+    <button
+        class="button is-small is-light is-transparent"
+        type="submit"
+        {% if not status.boostable %}disabled{% endif %}
+    >
         <span class="icon icon-boost m-0-mobile" title="{% trans 'Boost' %}"></span>
         <span class="is-sr-only-mobile">{% trans "Boost" %}</span>
     </button>
 </form>
-<form name="unboost" action="/unboost/{{ status.id }}" method="post" class="interaction boost-{{ status.id }}-{{ uuid }} active {% if not request.user|boosted:status %}is-hidden{% endif %}" data-id="boost-{{ status.id }}-{{ uuid }}">
+<form
+    name="unboost"
+    action="/unboost/{{ status.id }}"
+    method="post"
+    class="interaction boost-{{ status.id }}-{{ uuid }} active {% if not boosted %}is-hidden{% endif %}"
+    data-id="boost-{{ status.id }}-{{ uuid }}"
+>
     {% csrf_token %}
     <button class="button is-small is-light is-transparent" type="submit">
         <span class="icon icon-boost has-text-primary m-0-mobile" title="{% trans 'Un-boost' %}"></span>
@@ -18,3 +35,4 @@
     </button>
 </form>
 {% endwith %}
+{% endwith %}
diff --git a/bookwyrm/templates/snippets/fav_button.html b/bookwyrm/templates/snippets/fav_button.html
index 40fa2d25..6c4cfe9a 100644
--- a/bookwyrm/templates/snippets/fav_button.html
+++ b/bookwyrm/templates/snippets/fav_button.html
@@ -3,7 +3,8 @@
 {% load i18n %}
 
 {% with status.id|uuid as uuid %}
-<form name="favorite" action="/favorite/{{ status.id }}" method="POST" class="interaction fav-{{ status.id }}-{{ uuid }} {% if request.user|liked:status %}is-hidden{% endif %}" data-id="fav-{{ status.id }}-{{ uuid }}">
+{% with request.user|liked:status as liked %}
+<form name="favorite" action="/favorite/{{ status.id }}" method="POST" class="interaction fav-{{ status.id }}-{{ uuid }} {% if liked %}is-hidden{% endif %}" data-id="fav-{{ status.id }}-{{ uuid }}">
     {% csrf_token %}
     <button class="button is-small is-light is-transparent" type="submit">
         <span class="icon icon-heart m-0-mobile" title="{% trans 'Like' %}">
@@ -11,7 +12,7 @@
         <span class="is-sr-only-mobile">{% trans "Like" %}</span>
     </button>
 </form>
-<form name="unfavorite" action="/unfavorite/{{ status.id }}" method="POST" class="interaction fav-{{ status.id }}-{{ uuid }} active {% if not request.user|liked:status %}is-hidden{% endif %}" data-id="fav-{{ status.id }}-{{ uuid }}">
+<form name="unfavorite" action="/unfavorite/{{ status.id }}" method="POST" class="interaction fav-{{ status.id }}-{{ uuid }} active {% if not liked %}is-hidden{% endif %}" data-id="fav-{{ status.id }}-{{ uuid }}">
     {% csrf_token %}
     <button class="button is-light is-transparent is-small" type="submit">
         <span class="icon icon-heart has-text-primary m-0-mobile" title="{% trans 'Un-like' %}"></span>
@@ -19,3 +20,4 @@
     </button>
 </form>
 {% endwith %}
+{% endwith %}
diff --git a/bookwyrm/templates/snippets/status/layout.html b/bookwyrm/templates/snippets/status/layout.html
index 6fd7ebde..b1d361fe 100644
--- a/bookwyrm/templates/snippets/status/layout.html
+++ b/bookwyrm/templates/snippets/status/layout.html
@@ -15,7 +15,7 @@
 <div class="card-footer-item">
 
     {# moderation options #}
-    <form name="delete-{{status.id}}" action="/delete-status/{{ status.id }}" method="post">
+    <form name="delete-{{ status.id }}" action="/delete-status/{{ status.id }}" method="post">
         {% csrf_token %}
         <button class="button is-danger is-light" type="submit">
             {% trans "Delete status" %}
diff --git a/bookwyrm/templates/snippets/status/status_options.html b/bookwyrm/templates/snippets/status/status_options.html
index 1b2c5695..c33aeda2 100644
--- a/bookwyrm/templates/snippets/status/status_options.html
+++ b/bookwyrm/templates/snippets/status/status_options.html
@@ -11,7 +11,7 @@
 {% if status.user == request.user %}
 {# things you can do to your own statuses #}
 <li role="menuitem" class="dropdown-item p-0">
-    <form name="delete-{{status.id}}" action="/delete-status/{{ status.id }}" method="post">
+    <form name="delete-{{ status.id }}" action="/delete-status/{{ status.id }}" method="post">
         {% csrf_token %}
         <button class="button is-radiusless is-danger is-light is-fullwidth is-small" type="submit">
             {% trans "Delete status" %}
@@ -20,7 +20,7 @@
 </li>
 {% if status.status_type != 'GeneratedNote' and status.status_type != 'Rating' %}
 <li role="menuitem" class="dropdown-item p-0">
-    <form class="" name="delete-{{status.id}}" action="{% url 'redraft' status.id %}" method="post">
+    <form class="" name="delete-{{ status.id }}" action="{% url 'redraft' status.id %}" method="post">
         {% csrf_token %}
         <button class="button is-radiusless is-danger is-light is-fullwidth is-small" type="submit">
             {% trans "Delete & re-draft" %}
diff --git a/bookwyrm/templatetags/interaction.py b/bookwyrm/templatetags/interaction.py
index 6e8d0549..bbe74600 100644
--- a/bookwyrm/templatetags/interaction.py
+++ b/bookwyrm/templatetags/interaction.py
@@ -9,14 +9,10 @@ register = template.Library()
 @register.filter(name="liked")
 def get_user_liked(user, status):
     """did the given user fav a status?"""
-    try:
-        models.Favorite.objects.get(user=user, status=status)
-        return True
-    except models.Favorite.DoesNotExist:
-        return False
+    return models.Favorite.objects.filter(user=user, status=status).exists()
 
 
 @register.filter(name="boosted")
 def get_user_boosted(user, status):
     """did the given user fav a status?"""
-    return user.id in status.boosters.all().values_list("user", flat=True)
+    return status.boosters.filter(user=user).exists()
diff --git a/bookwyrm/templatetags/status_display.py b/bookwyrm/templatetags/status_display.py
index 4d9984c8..69c0c2a5 100644
--- a/bookwyrm/templatetags/status_display.py
+++ b/bookwyrm/templatetags/status_display.py
@@ -42,7 +42,12 @@ def get_parent(status):
 @register.filter(name="boosted_status")
 def get_boosted(boost):
     """load a boosted status. have to do this or it won't get foreign keys"""
-    return models.Status.objects.select_subclasses().get(id=boost.boosted_status.id)
+    return (
+        models.Status.objects.select_subclasses()
+        .select_related("user", "reply_parent")
+        .prefetch_related("mention_books", "mention_users")
+        .get(id=boost.boosted_status.id)
+    )
 
 
 @register.filter(name="published_date")

From 2d4cec4422fba603bde6a0222a599cadedaf346a Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 22 May 2021 19:54:50 -0700
Subject: [PATCH 1198/1285] Improves shelf page query efficiency a little

---
 bookwyrm/views/helpers.py |  4 ++++
 bookwyrm/views/shelf.py   | 31 +++++++++++++++++++------------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index 31e5f031..3dc02e0d 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -13,6 +13,10 @@ from bookwyrm.utils import regex
 
 def get_user_from_username(viewer, username):
     """helper function to resolve a localname or a username to a user"""
+    if viewer.localname == username:
+        # that's yourself, fool
+        return viewer
+
     # raises 404 if the user isn't found
     try:
         return models.User.viewer_aware_objects(viewer).get(localname=username)
diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index 758e290e..99e22fa9 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -2,7 +2,7 @@
 from collections import namedtuple
 
 from django.db import IntegrityError
-from django.db.models import Count, OuterRef, Subquery, F, Q
+from django.db.models import OuterRef, Subquery
 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator
 from django.http import HttpResponseBadRequest, HttpResponseNotFound
@@ -28,7 +28,12 @@ class Shelf(View):
         """display a shelf"""
         user = get_user_from_username(request.user, username)
 
-        shelves = privacy_filter(request.user, user.shelf_set)
+        is_self = user == request.user
+
+        if is_self:
+            shelves = user.shelf_set
+        else:
+            shelves = privacy_filter(request.user, user.shelf_set)
 
         # get the shelf and make sure the logged in user should be able to see it
         if shelf_identifier:
@@ -53,26 +58,28 @@ class Shelf(View):
         if is_api_request(request):
             return ActivitypubResponse(shelf.to_activity(**request.GET))
 
-        reviews = privacy_filter(
-            request.user,
-            models.Review.objects.filter(
-                user=user,
-                rating__isnull=False,
-                book__id=OuterRef("id"),
-            ),
+        reviews = models.Review.objects.filter(
+            user=user,
+            rating__isnull=False,
+            book__id=OuterRef("id"),
         ).order_by("-published_date")
 
-        books = books.annotate(rating=Subquery(reviews.values("rating")[:1]))
+        if not is_self:
+            reviews = privacy_filter(request.user, reviews)
+
+        books = books.annotate(
+            rating=Subquery(reviews.values("rating")[:1])
+        ).prefetch_related("authors")
 
         paginated = Paginator(
-            books.order_by("-updated_date"),
+            books.order_by("-shelfbook__updated_date"),
             PAGE_LENGTH,
         )
 
         page = paginated.get_page(request.GET.get("page"))
         data = {
             "user": user,
-            "is_self": request.user == user,
+            "is_self": is_self,
             "shelves": shelves.all(),
             "shelf": shelf,
             "books": page,

From 9285f483c2566cdae7541298e8acee8cafa4fb21 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 22 May 2021 20:14:57 -0700
Subject: [PATCH 1199/1285] Query tweaks for book page

---
 bookwyrm/templates/book/book.html |  4 ++--
 bookwyrm/views/books.py           | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index fb0a4510..df76d8e1 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -1,7 +1,7 @@
 {% extends 'layout.html' %}
 {% load i18n %}{% load bookwyrm_tags %}{% load humanize %}{% load utilities %}
 
-{% block title %}{{ book.title }}{% endblock %}
+{% block title %}{{ book|title }}{% endblock %}
 
 {% block content %}
 {% with user_authenticated=request.user.is_authenticated can_edit_book=perms.bookwyrm.edit_book %}
@@ -137,7 +137,7 @@
 
             {# user's relationship to the book #}
             <div class="block">
-                {% for shelf in user_shelves %}
+                {% for shelf in user_shelfbooks %}
                 <p>
                     {% blocktrans with path=shelf.shelf.local_path shelf_name=shelf.shelf.name %}This edition is on your <a href="{{ path }}">{{ shelf_name }}</a> shelf.{% endblocktrans %}
                     {% include 'snippets/shelf_selector.html' with current=shelf.shelf %}
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index ef3a6e28..a4b9f312 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -62,13 +62,16 @@ class Book(View):
             queryset = queryset.filter(user=request.user)
         else:
             queryset = reviews.exclude(Q(content__isnull=True) | Q(content=""))
+        queryset = queryset.select_related("user")
         paginated = Paginator(queryset, PAGE_LENGTH)
 
         data = {
             "book": book,
             "statuses": paginated.get_page(request.GET.get("page")),
             "review_count": reviews.count(),
-            "ratings": reviews.filter(Q(content__isnull=True) | Q(content=""))
+            "ratings": reviews.filter(
+                Q(content__isnull=True) | Q(content="")
+            ).select_related("user")
             if not user_statuses
             else None,
             "rating": reviews.aggregate(Avg("rating"))["rating__avg"],
@@ -89,15 +92,15 @@ class Book(View):
                 )
             data["readthroughs"] = readthroughs
 
-            data["user_shelves"] = models.ShelfBook.objects.filter(
+            data["user_shelfbooks"] = models.ShelfBook.objects.filter(
                 user=request.user, book=book
-            )
+            ).select_related("shelf")
 
             data["other_edition_shelves"] = models.ShelfBook.objects.filter(
                 ~Q(book=book),
                 user=request.user,
                 book__parent_work=book.parent_work,
-            )
+            ).select_related("shelf", "book")
 
             data["user_statuses"] = {
                 "review_count": book.review_set.filter(user=request.user).count(),

From bdf267dea5fa21755a274a51b3056460de61fdd7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 22 May 2021 20:36:30 -0700
Subject: [PATCH 1200/1285] Refactors block button for query efficiency

---
 bookwyrm/templates/preferences/blocks.html            |  2 +-
 bookwyrm/templates/snippets/block_button.html         |  2 +-
 bookwyrm/templates/snippets/follow_button.html        |  2 +-
 .../templates/snippets/status/status_options.html     |  2 +-
 bookwyrm/templates/snippets/user_options.html         |  2 +-
 bookwyrm/views/user.py                                | 11 ++++++++---
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/bookwyrm/templates/preferences/blocks.html b/bookwyrm/templates/preferences/blocks.html
index 72d4abd4..24866fa3 100644
--- a/bookwyrm/templates/preferences/blocks.html
+++ b/bookwyrm/templates/preferences/blocks.html
@@ -18,7 +18,7 @@
             <a href="{{ user.local_path }}">{% include 'snippets/avatar.html' with user=user %} {{ user.display_name }}</a>
         </p>
         <p class="mr-2">
-            {% include 'snippets/block_button.html' with user=user %}
+            {% include 'snippets/block_button.html' with user=user blocks=True %}
         </p>
     </li>
 {% endfor %}
diff --git a/bookwyrm/templates/snippets/block_button.html b/bookwyrm/templates/snippets/block_button.html
index 7e9fcaea..3cad78f6 100644
--- a/bookwyrm/templates/snippets/block_button.html
+++ b/bookwyrm/templates/snippets/block_button.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-{% if not user in request.user.blocks.all %}
+{% if not blocks %}
 <form name="blocks" method="post" action="/block/{{ user.id }}">
     {% csrf_token %}
     <button class="button is-danger is-light is-small {{ class }}" type="submit">{% trans "Block" %}</button>
diff --git a/bookwyrm/templates/snippets/follow_button.html b/bookwyrm/templates/snippets/follow_button.html
index 495bc3e9..0cbe6b8c 100644
--- a/bookwyrm/templates/snippets/follow_button.html
+++ b/bookwyrm/templates/snippets/follow_button.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 {% if request.user == user or not request.user.is_authenticated %}
 {% elif user in request.user.blocks.all %}
-{% include 'snippets/block_button.html' %}
+{% include 'snippets/block_button.html' with blocks=True %}
 {% else %}
 
 <div class="field{% if not minimal %} has-addons{% else %} mb-0{% endif %}">
diff --git a/bookwyrm/templates/snippets/status/status_options.html b/bookwyrm/templates/snippets/status/status_options.html
index c33aeda2..7eb613d3 100644
--- a/bookwyrm/templates/snippets/status/status_options.html
+++ b/bookwyrm/templates/snippets/status/status_options.html
@@ -39,7 +39,7 @@
     {% include 'snippets/report_button.html' with user=status.user status=status %}
 </li>
 <li role="menuitem" class="dropdown-item p-0">
-    {% include 'snippets/block_button.html' with user=status.user class="is-fullwidth" %}
+    {% include 'snippets/block_button.html' with user=status.user class="is-fullwidth" blocks=False %}
 </li>
 {% endif %}
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/user_options.html b/bookwyrm/templates/snippets/user_options.html
index 01cc09bf..3db3c2b1 100644
--- a/bookwyrm/templates/snippets/user_options.html
+++ b/bookwyrm/templates/snippets/user_options.html
@@ -16,6 +16,6 @@
     {% include 'snippets/report_button.html' with user=user class="is-fullwidth" %}
 </li>
 <li role="menuitem">
-    {% include 'snippets/block_button.html' with user=user class="is-fullwidth" %}
+    {% include 'snippets/block_button.html' with user=user class="is-fullwidth" blocks=False %}
 </li>
 {% endblock %}
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index ffc352d8..d186fe97 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -59,10 +59,15 @@ class User(View):
                 break
 
         # user's posts
-        activities = privacy_filter(
-            request.user,
-            user.status_set.select_subclasses(),
+        activities = (
+            privacy_filter(
+                request.user,
+                user.status_set.select_subclasses(),
+            )
+            .select_related("reply_parent")
+            .prefetch_related("mention_books", "mention_users")
         )
+
         paginated = Paginator(activities, PAGE_LENGTH)
         goal = models.AnnualGoal.objects.filter(
             user=user, year=timezone.now().year

From f987a352c6f6bbf0831aacbc0937dcba0b82ec69 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sat, 22 May 2021 21:33:56 -0700
Subject: [PATCH 1201/1285] Fixes username helper

---
 bookwyrm/views/helpers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py
index 3dc02e0d..95a1cbbe 100644
--- a/bookwyrm/views/helpers.py
+++ b/bookwyrm/views/helpers.py
@@ -13,7 +13,7 @@ from bookwyrm.utils import regex
 
 def get_user_from_username(viewer, username):
     """helper function to resolve a localname or a username to a user"""
-    if viewer.localname == username:
+    if viewer.is_authenticated and viewer.localname == username:
         # that's yourself, fool
         return viewer
 

From e138a585d18f31a9673bad5f30d6168edbde7892 Mon Sep 17 00:00:00 2001
From: Jason Kelly <jason.kelly@lingumi.com>
Date: Sun, 23 May 2021 14:07:45 +0800
Subject: [PATCH 1202/1285] Setting `client_max_body_size` to 10m.

- Removed commented-out nginx config for clarity.
---
 nginx/development   |  2 ++
 nginx/production    | 59 +--------------------------------------------
 nginx/server_config |  1 +
 3 files changed, 4 insertions(+), 58 deletions(-)
 create mode 100644 nginx/server_config

diff --git a/nginx/development b/nginx/development
index d3898287..cdc90df1 100644
--- a/nginx/development
+++ b/nginx/development
@@ -5,6 +5,8 @@ upstream web {
 server {
     listen 80;
 
+    include /etc/nginx/conf.d/server_config;
+
     location / {
         proxy_pass http://web;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
diff --git a/nginx/production b/nginx/production
index c5d83cbf..95225c26 100644
--- a/nginx/production
+++ b/nginx/production
@@ -6,67 +6,10 @@ server {
     listen [::]:80;
     listen 80;
 
-    server_name your-domain.com www.your-domain.com;
+    include /etc/nginx/conf.d/server_config;
 
     location ~ /.well-known/acme-challenge {
         allow all;
         root /var/www/certbot;
     }
-
-#     # redirect http to https
-#     return 301 https://your-domain.com$request_uri;
-# }
-#
-# server {
-#     listen [::]:443 ssl http2;
-#     listen 443 ssl http2;
-#
-#     server_name your-domain.com;
-#
-#     # SSL code
-#     ssl_certificate /etc/nginx/ssl/live/your-domain.com/fullchain.pem;
-#     ssl_certificate_key /etc/nginx/ssl/live/your-domain.com/privkey.pem;
-#
-#     location ~ /.well-known/acme-challenge {
-#         allow all;
-#         root /var/www/certbot;
-#     }
-#
-#     location / {
-#         proxy_pass http://web;
-#         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-#         proxy_set_header Host $host;
-#         proxy_redirect off;
-#     }
-#
-#     location /images/ {
-#         alias /app/images/;
-#     }
-#
-#     location /static/ {
-#         alias /app/static/;
-#     }
 }
-
-# Reverse-Proxy server
-# server {
-#     listen [::]:8001;
-#     listen 8001;
-
-#     server_name your-domain.com www.your-domain.com;
-
-#     location / {
-#         proxy_pass http://web;
-#         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-#         proxy_set_header Host $host;
-#         proxy_redirect off;
-#     }
-
-#     location /images/ {
-#         alias /app/images/;
-#     }
-
-#     location /static/ {
-#         alias /app/static/;
-#     }
-# }
diff --git a/nginx/server_config b/nginx/server_config
new file mode 100644
index 00000000..c9aad8e4
--- /dev/null
+++ b/nginx/server_config
@@ -0,0 +1 @@
+client_max_body_size 10m;

From c9617c4bd372c26f4ed8b015ae70e64673752bdb Mon Sep 17 00:00:00 2001
From: Jason Kelly <jason.kelly@lingumi.com>
Date: Sun, 23 May 2021 14:09:13 +0800
Subject: [PATCH 1203/1285] Added `EMAIL_BACKEND` to env settings to be able to
 use console backend in local dev.

---
 bookwyrm/settings.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index d694e33f..b689a6a2 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -21,6 +21,7 @@ CELERY_TASK_SERIALIZER = "json"
 CELERY_RESULT_SERIALIZER = "json"
 
 # email
+EMAIL_BACKEND = env("EMAIL_BACKEND", "django.core.mail.backends.smtp.EmailBackend")
 EMAIL_HOST = env("EMAIL_HOST")
 EMAIL_PORT = env("EMAIL_PORT", 587)
 EMAIL_HOST_USER = env("EMAIL_HOST_USER")

From 6e655cb0e0fdf0d52681d12ee96e14d11d21fcc8 Mon Sep 17 00:00:00 2001
From: Jason Kelly <jason.kelly@lingumi.com>
Date: Sun, 23 May 2021 14:12:00 +0800
Subject: [PATCH 1204/1285] Added new widget to alert if a file is set at
 larger than 10 MB.

- Updated default widget to use template that adds a notification box.
- Added JS to add onchange & load events to look at the value in the input and trigger the notification & disable the form submits.
---
 bookwyrm/models/fields.py                     | 15 ++++++++
 bookwyrm/static/js/bookwyrm.js                | 35 +++++++++++++++++++
 .../clearable_file_input_with_warning.html    |  3 ++
 3 files changed, 53 insertions(+)
 create mode 100644 bookwyrm/templates/widgets/clearable_file_input_with_warning.html

diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py
index 123b3efa..d4d94aa2 100644
--- a/bookwyrm/models/fields.py
+++ b/bookwyrm/models/fields.py
@@ -9,6 +9,7 @@ from django.contrib.postgres.fields import ArrayField as DjangoArrayField
 from django.core.exceptions import ValidationError
 from django.core.files.base import ContentFile
 from django.db import models
+from django.forms import ClearableFileInput, ImageField
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from bookwyrm import activitypub
@@ -332,6 +333,14 @@ class TagField(ManyToManyField):
         return items
 
 
+class ClearableFileInputWithWarning(ClearableFileInput):
+    template_name = 'widgets/clearable_file_input_with_warning.html'
+
+
+class CustomImageField(ImageField):
+    widget = ClearableFileInputWithWarning
+
+
 def image_serializer(value, alt):
     """helper for serializing images"""
     if value and hasattr(value, "url"):
@@ -395,6 +404,12 @@ class ImageField(ActivitypubFieldMixin, models.ImageField):
         image_content = ContentFile(response.content)
         return [image_name, image_content]
 
+    def formfield(self, **kwargs):
+        return super().formfield(**{
+            'form_class': CustomImageField,
+            **kwargs,
+        })
+
 
 class DateTimeField(ActivitypubFieldMixin, models.DateTimeField):
     """activitypub-aware datetime field"""
diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index 3659a20e..2c43d738 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -3,6 +3,7 @@
 
 let BookWyrm = new class {
     constructor() {
+        this.MAX_FILE_SIZE = 10000000
         this.initOnDOMLoaded();
         this.initReccuringTasks();
         this.initEventListeners();
@@ -32,15 +33,26 @@ let BookWyrm = new class {
                 'click',
                 this.back)
             );
+
+        document.querySelectorAll('input[type="file"]')
+            .forEach(node => node.addEventListener(
+                'change',
+                this.disableIfTooLarge.bind(this)
+            ));
     }
 
     /**
      * Execute code once the DOM is loaded.
      */
     initOnDOMLoaded() {
+        const bookwyrm = this
+
         window.addEventListener('DOMContentLoaded', function() {
             document.querySelectorAll('.tab-group')
                 .forEach(tabs => new TabGroup(tabs));
+            document.querySelectorAll('input[type="file"]').forEach(
+                bookwyrm.disableIfTooLarge.bind(bookwyrm)
+            )
         });
     }
 
@@ -284,4 +296,27 @@ let BookWyrm = new class {
             node.classList.remove(classname);
         }
     }
+
+    disableIfTooLarge(eventOrElement) {
+        const { addRemoveClass, MAX_FILE_SIZE } = this
+        const element = eventOrElement.currentTarget || eventOrElement
+
+        const submits = element.form.querySelectorAll('[type="submit"]')
+        const warns = element.parentElement.querySelectorAll('.file-too-big')
+        const isTooBig = element.files &&
+            element.files[0] &&
+            element.files[0].size > MAX_FILE_SIZE
+
+        if (isTooBig) {
+            submits.forEach(submitter => submitter.disabled = true)
+            warns.forEach(
+                sib => addRemoveClass(sib, 'is-hidden', false)
+            )
+        } else {
+            submits.forEach(submitter => submitter.disabled = false)
+            warns.forEach(
+                sib => addRemoveClass(sib, 'is-hidden', true)
+            )
+        }
+    }
 }
diff --git a/bookwyrm/templates/widgets/clearable_file_input_with_warning.html b/bookwyrm/templates/widgets/clearable_file_input_with_warning.html
new file mode 100644
index 00000000..700e22f9
--- /dev/null
+++ b/bookwyrm/templates/widgets/clearable_file_input_with_warning.html
@@ -0,0 +1,3 @@
+{% load i18n %}
+{% include "django/forms/widgets/clearable_file_input.html" %}
+<span class="help file-cta is-hidden file-too-big">{% trans "File exceeds maximum size: 10MB" %}</span>

From 318e0bf508ac9ccc2c0076763d6eb28bc0a5ab0b Mon Sep 17 00:00:00 2001
From: Jason Kelly <jason.kelly@lingumi.com>
Date: Sun, 23 May 2021 14:27:02 +0800
Subject: [PATCH 1205/1285] Fixing nginx-config misunderstanding.

---
 nginx/development |  4 ++--
 nginx/production  | 61 ++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/nginx/development b/nginx/development
index cdc90df1..05b27c2b 100644
--- a/nginx/development
+++ b/nginx/development
@@ -1,3 +1,5 @@
+include /etc/nginx/conf.d/server_config;
+
 upstream web {
     server web:8000;
 }
@@ -5,8 +7,6 @@ upstream web {
 server {
     listen 80;
 
-    include /etc/nginx/conf.d/server_config;
-
     location / {
         proxy_pass http://web;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
diff --git a/nginx/production b/nginx/production
index 95225c26..54c84af4 100644
--- a/nginx/production
+++ b/nginx/production
@@ -1,3 +1,5 @@
+include /etc/nginx/conf.d/server_config;
+
 upstream web {
     server web:8000;
 }
@@ -6,10 +8,67 @@ server {
     listen [::]:80;
     listen 80;
 
-    include /etc/nginx/conf.d/server_config;
+    server_name your-domain.com www.your-domain.com;
 
     location ~ /.well-known/acme-challenge {
         allow all;
         root /var/www/certbot;
     }
+
+#     # redirect http to https
+#     return 301 https://your-domain.com$request_uri;
+# }
+#
+# server {
+#     listen [::]:443 ssl http2;
+#     listen 443 ssl http2;
+#
+#     server_name your-domain.com;
+#
+#     # SSL code
+#     ssl_certificate /etc/nginx/ssl/live/your-domain.com/fullchain.pem;
+#     ssl_certificate_key /etc/nginx/ssl/live/your-domain.com/privkey.pem;
+#
+#     location ~ /.well-known/acme-challenge {
+#         allow all;
+#         root /var/www/certbot;
+#     }
+#
+#     location / {
+#         proxy_pass http://web;
+#         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+#         proxy_set_header Host $host;
+#         proxy_redirect off;
+#     }
+#
+#     location /images/ {
+#         alias /app/images/;
+#     }
+#
+#     location /static/ {
+#         alias /app/static/;
+#     }
 }
+
+# Reverse-Proxy server
+# server {
+#     listen [::]:8001;
+#     listen 8001;
+
+#     server_name your-domain.com www.your-domain.com;
+
+#     location / {
+#         proxy_pass http://web;
+#         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+#         proxy_set_header Host $host;
+#         proxy_redirect off;
+#     }
+
+#     location /images/ {
+#         alias /app/images/;
+#     }
+
+#     location /static/ {
+#         alias /app/static/;
+#     }
+# }

From 7eb5f3b026cd11e2a981db294ae31770a36cc192 Mon Sep 17 00:00:00 2001
From: Jason Kelly <jason.kelly@lingumi.com>
Date: Sun, 23 May 2021 14:31:22 +0800
Subject: [PATCH 1206/1285] Making magic number more readable

---
 bookwyrm/static/js/bookwyrm.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index 2c43d738..598dd93a 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -3,7 +3,7 @@
 
 let BookWyrm = new class {
     constructor() {
-        this.MAX_FILE_SIZE = 10000000
+        this.MAX_FILE_SIZE_BYTES = 10 * 1000000
         this.initOnDOMLoaded();
         this.initReccuringTasks();
         this.initEventListeners();
@@ -298,14 +298,14 @@ let BookWyrm = new class {
     }
 
     disableIfTooLarge(eventOrElement) {
-        const { addRemoveClass, MAX_FILE_SIZE } = this
+        const { addRemoveClass, MAX_FILE_SIZE_BYTES } = this
         const element = eventOrElement.currentTarget || eventOrElement
 
         const submits = element.form.querySelectorAll('[type="submit"]')
         const warns = element.parentElement.querySelectorAll('.file-too-big')
         const isTooBig = element.files &&
             element.files[0] &&
-            element.files[0].size > MAX_FILE_SIZE
+            element.files[0].size > MAX_FILE_SIZE_BYTES
 
         if (isTooBig) {
             submits.forEach(submitter => submitter.disabled = true)

From 0708d64bf1965d68a343f3bc1b097ea7b65a65fa Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Sun, 23 May 2021 12:10:57 +0200
Subject: [PATCH 1207/1285] Update bookwyrm.css

---
 bookwyrm/static/css/bookwyrm.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css
index 6ff745d3..a695c18b 100644
--- a/bookwyrm/static/css/bookwyrm.css
+++ b/bookwyrm/static/css/bookwyrm.css
@@ -51,6 +51,7 @@ body {
     .card-footer.is-stacked-mobile {
         flex-direction: column;
     }
+
     .card-footer.is-stacked-mobile .card-footer-item:not(:last-child) {
         border-bottom: 1px solid #ededed;
         border-right: 0;
@@ -384,7 +385,7 @@ ol.ordered-list li::before {
         border-bottom-right-radius: 2px;
     }
 }
-     
+
 /* Dimensions
  * @todo These could be in rem.
  ******************************************************************************/

From 179560a009b94ab6873062e82735e866d2121e10 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Sun, 23 May 2021 14:56:47 +0200
Subject: [PATCH 1208/1285] French translation update

This PR replaces #935
---
 locale/fr_FR/LC_MESSAGES/django.mo | Bin 40772 -> 45420 bytes
 locale/fr_FR/LC_MESSAGES/django.po | 438 +++++++++++------------------
 2 files changed, 164 insertions(+), 274 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index 8d377f42069c249539b29f61221b14d4910a80a7..5297cd7c71b91d2b03dd89fbba6c605cee474c7d 100644
GIT binary patch
delta 17007
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
VXsxrqGv3~HI5DBfx%n@5{~vQXm=OQ~

delta 12840
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

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 57761454..325d7fbf 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 14:40-0700\n"
+"POT-Creation-Date: 2021-05-23 10:45+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"
@@ -49,13 +49,11 @@ msgstr "Sans limite"
 
 #: bookwyrm/forms.py:299
 msgid "List Order"
-msgstr ""
+msgstr "Ordre de la liste"
 
 #: bookwyrm/forms.py:300
-#, fuzzy
-#| msgid "Title"
 msgid "Book Title"
-msgstr "Titre"
+msgstr "Titre du livre"
 
 #: bookwyrm/forms.py:301 bookwyrm/templates/snippets/create_status_form.html:34
 #: bookwyrm/templates/user/shelf/shelf.html:84
@@ -65,19 +63,15 @@ msgstr "Note"
 
 #: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:101
 msgid "Sort By"
-msgstr ""
+msgstr "Trier par"
 
 #: bookwyrm/forms.py:307
-#, fuzzy
-#| msgid "Sorted ascending"
 msgid "Ascending"
-msgstr "Trié par ordre croissant"
+msgstr "Ordre croissant"
 
 #: bookwyrm/forms.py:308
-#, fuzzy
-#| msgid "Sorted ascending"
 msgid "Descending"
-msgstr "Trié par ordre croissant"
+msgstr "Ordre décroissant"
 
 #: bookwyrm/models/fields.py:24
 #, python-format
@@ -89,7 +83,7 @@ msgstr "%(value)s n’est pas une remote_id valide."
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s n’est pas un nom de compte valide."
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:155
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:157
 msgid "username"
 msgstr "nom du compte :"
 
@@ -145,15 +139,15 @@ msgstr "Modifier l’auteur ou autrice"
 #: bookwyrm/templates/author/author.html:32
 #: bookwyrm/templates/author/edit_author.html:38
 msgid "Aliases:"
-msgstr ""
+msgstr "Pseudonymes :"
 
 #: bookwyrm/templates/author/author.html:38
 msgid "Born:"
-msgstr ""
+msgstr "Naissance :"
 
 #: bookwyrm/templates/author/author.html:44
 msgid "Died:"
-msgstr ""
+msgstr "Décès :"
 
 #: bookwyrm/templates/author/author.html:51
 msgid "Wikipedia"
@@ -166,10 +160,8 @@ msgstr "Voir sur OpenLibrary"
 
 #: bookwyrm/templates/author/author.html:60
 #: bookwyrm/templates/book/book.html:81
-#, fuzzy
-#| msgid "View on OpenLibrary"
 msgid "View on Inventaire"
-msgstr "Voir sur OpenLibrary"
+msgstr "Voir sur Inventaire"
 
 #: bookwyrm/templates/author/author.html:74
 #, python-format
@@ -211,10 +203,8 @@ msgstr "Nom :"
 #: bookwyrm/templates/book/edit_book.html:132
 #: bookwyrm/templates/book/edit_book.html:141
 #: bookwyrm/templates/book/edit_book.html:178
-#, fuzzy
-#| msgid "Separate multiple publishers with commas."
 msgid "Separate multiple values with commas."
-msgstr "Séparez plusieurs éditeurs par une virgule."
+msgstr "Séparez plusieurs valeurs par une virgule."
 
 #: bookwyrm/templates/author/edit_author.html:46
 msgid "Bio:"
@@ -242,10 +232,8 @@ msgstr "Clé Openlibrary :"
 
 #: bookwyrm/templates/author/edit_author.html:79
 #: bookwyrm/templates/book/edit_book.html:243
-#, fuzzy
-#| msgid "View on OpenLibrary"
 msgid "Inventaire ID:"
-msgstr "Voir sur OpenLibrary"
+msgstr "Identifiant Inventaire :"
 
 #: bookwyrm/templates/author/edit_author.html:84
 msgid "Librarything key:"
@@ -260,7 +248,7 @@ msgstr "Clé Goodreads :"
 #: bookwyrm/templates/book/edit_book.html:263
 #: bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
-#: bookwyrm/templates/settings/announcement_form.html:65
+#: bookwyrm/templates/settings/announcement_form.html:69
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:98
 #: bookwyrm/templates/settings/site.html:97
@@ -356,28 +344,20 @@ msgid "You don't have any reading activity for this book."
 msgstr "Vous n’avez aucune activité de lecture pour ce livre"
 
 #: bookwyrm/templates/book/book.html:200
-#, fuzzy
-#| msgid "Review"
 msgid "Reviews"
-msgstr "Critique"
+msgstr "Critiques"
 
 #: bookwyrm/templates/book/book.html:205
-#, fuzzy
-#| msgid "Your shelves"
 msgid "Your reviews"
-msgstr "Vos étagères"
+msgstr "Vos critiques"
 
 #: bookwyrm/templates/book/book.html:211
-#, fuzzy
-#| msgid "Your Account"
 msgid "Your comments"
-msgstr "Votre compte"
+msgstr "Vos commentaires"
 
 #: bookwyrm/templates/book/book.html:217
-#, fuzzy
-#| msgid "Your books"
 msgid "Your quotes"
-msgstr "Vos livres"
+msgstr "Vos citations"
 
 #: bookwyrm/templates/book/book.html:253
 msgid "Subjects"
@@ -498,10 +478,8 @@ msgid "Series number:"
 msgstr "Numéro dans la série :"
 
 #: bookwyrm/templates/book/edit_book.html:130
-#, fuzzy
-#| msgid "Language:"
 msgid "Languages:"
-msgstr "Langue :"
+msgstr "Langues :"
 
 #: bookwyrm/templates/book/edit_book.html:139
 msgid "Publisher:"
@@ -563,10 +541,8 @@ msgid "ISBN 10:"
 msgstr "ISBN 10 :"
 
 #: bookwyrm/templates/book/edit_book.html:238
-#, fuzzy
-#| msgid "Openlibrary key:"
 msgid "Openlibrary ID:"
-msgstr "Clé Openlibrary :"
+msgstr "Identifiant Openlibrary :"
 
 #: bookwyrm/templates/book/editions.html:4
 #, python-format
@@ -605,7 +581,7 @@ msgstr "%(pages)s pages"
 #: bookwyrm/templates/book/publisher_info.html:38
 #, python-format
 msgid "%(languages)s language"
-msgstr "%(languages)s langues"
+msgstr "Langue : %(languages)s"
 
 #: bookwyrm/templates/book/publisher_info.html:64
 #, python-format
@@ -688,8 +664,8 @@ msgstr "Actif récemment"
 #: bookwyrm/templates/directory/user_card.html:33
 msgid "follower you follow"
 msgid_plural "followers you follow"
-msgstr[0] "compte auquel vous êtes abonné(e)"
-msgstr[1] "comptes auxquels vous êtes abonné(e)"
+msgstr[0] "compte que vous suivez"
+msgstr[1] "comptes que vous suivez"
 
 #: bookwyrm/templates/directory/user_card.html:40
 msgid "book on your shelves"
@@ -946,8 +922,8 @@ msgstr "Défi lecture pour %(year)s"
 #, python-format
 msgid "%(mutuals)s follower you follow"
 msgid_plural "%(mutuals)s followers you follow"
-msgstr[0] "%(mutuals)s abonnement auxquel vous êtes abonné(e)"
-msgstr[1] "%(mutuals)s abonnements auxquels vous êtes abonné(e)"
+msgstr[0] "%(mutuals)s abonné(e) que vous suivez"
+msgstr[1] "%(mutuals)s abonné(e)s que vous suivez"
 
 #: bookwyrm/templates/feed/suggested_users.html:19
 #, python-format
@@ -1014,7 +990,7 @@ msgstr "Enregistrer &amp; continuer"
 #: bookwyrm/templates/get_started/layout.html:14
 #, python-format
 msgid "Welcome to %(site_name)s!"
-msgstr "Bienvenu(e) sur %(site_name)s !"
+msgstr "Bienvenue sur %(site_name)s !"
 
 #: bookwyrm/templates/get_started/layout.html:16
 msgid "These are some first steps to get you started."
@@ -1278,49 +1254,47 @@ msgstr "Se déconnecter"
 msgid "Notifications"
 msgstr "Notifications"
 
-#: bookwyrm/templates/layout.html:154 bookwyrm/templates/layout.html:158
+#: bookwyrm/templates/layout.html:156 bookwyrm/templates/layout.html:160
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "Nom du compte :"
 
-#: bookwyrm/templates/layout.html:159
+#: bookwyrm/templates/layout.html:161
 msgid "password"
 msgstr "Mot de passe"
 
-#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:162 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr "Mot de passe oublié ?"
 
-#: bookwyrm/templates/layout.html:163 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:165 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "Se connecter"
 
-#: bookwyrm/templates/layout.html:171
+#: bookwyrm/templates/layout.html:173
 msgid "Join"
 msgstr "Rejoindre"
 
-#: bookwyrm/templates/layout.html:206
+#: bookwyrm/templates/layout.html:211
 msgid "About this server"
 msgstr "À propos de ce serveur"
 
-#: bookwyrm/templates/layout.html:210
+#: bookwyrm/templates/layout.html:215
 msgid "Contact site admin"
 msgstr "Contacter l’administrateur du site"
 
-#: bookwyrm/templates/layout.html:214
-#, fuzzy
-#| msgid "List curation:"
+#: bookwyrm/templates/layout.html:219
 msgid "Documentation"
-msgstr "Modération de la liste :"
+msgstr "Documentation"
 
-#: bookwyrm/templates/layout.html:221
+#: bookwyrm/templates/layout.html:226
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr "Soutenez %(site_name)s avec <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 
-#: bookwyrm/templates/layout.html:225
+#: bookwyrm/templates/layout.html:230
 msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports de bogues via <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
@@ -1378,7 +1352,7 @@ msgstr "Fermée"
 
 #: bookwyrm/templates/lists/form.html:22
 msgid "Only you can add and remove books to this list"
-msgstr "Vous seul(e) pouvez ajouter ou retirer des livres dans cette liste"
+msgstr "Vous seulement pouvez ajouter ou retirer des livres dans cette liste"
 
 #: bookwyrm/templates/lists/form.html:26
 msgid "Curated"
@@ -1401,34 +1375,28 @@ msgstr "N’importe qui peut suggérer des livres"
 
 #: bookwyrm/templates/lists/list.html:20
 msgid "You successfully suggested a book for this list!"
-msgstr ""
+msgstr "Vous avez suggéré un livre à cette liste !"
 
 #: bookwyrm/templates/lists/list.html:22
-#, fuzzy
-#| msgid "Anyone can add books to this list"
 msgid "You successfully added a book to this list!"
-msgstr "N’importe qui peut suggérer des livres"
+msgstr "Vous avez ajouté un livre à cette liste !"
 
 #: bookwyrm/templates/lists/list.html:28
 msgid "This list is currently empty"
-msgstr "Cette liste est vide actuellement"
+msgstr "Cette liste est actuellement vide"
 
 #: bookwyrm/templates/lists/list.html:65
 #, python-format
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
-msgstr "Ajoutée par <a href=\"%(user_path)s\">%(username)s</a>"
+msgstr "Ajouté par <a href=\"%(user_path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/lists/list.html:77
-#, fuzzy
-#| msgid "Sent"
 msgid "Set"
-msgstr "Envoyé(e)s"
+msgstr "Régler"
 
 #: bookwyrm/templates/lists/list.html:80
-#, fuzzy
-#| msgid "List curation:"
 msgid "List position"
-msgstr "Modération de la liste :"
+msgstr "Position"
 
 #: bookwyrm/templates/lists/list.html:86
 #: bookwyrm/templates/snippets/shelf_selector.html:26
@@ -1436,16 +1404,12 @@ msgid "Remove"
 msgstr "Supprimer"
 
 #: bookwyrm/templates/lists/list.html:99 bookwyrm/templates/lists/list.html:111
-#, fuzzy
-#| msgid "Your Lists"
 msgid "Sort List"
-msgstr "Vos listes"
+msgstr "Ordonner de la liste"
 
 #: bookwyrm/templates/lists/list.html:105
-#, fuzzy
-#| msgid "Directory"
 msgid "Direction"
-msgstr "Répertoire"
+msgstr "Direction"
 
 #: bookwyrm/templates/lists/list.html:116
 msgid "Add Books"
@@ -1457,7 +1421,7 @@ msgstr "Suggérer des livres"
 
 #: bookwyrm/templates/lists/list.html:125
 msgid "search"
-msgstr "Chercher"
+msgstr "chercher"
 
 #: bookwyrm/templates/lists/list.html:131
 msgid "Clear search"
@@ -1523,10 +1487,8 @@ msgid "No statuses reported"
 msgstr "Aucun statut signalé"
 
 #: bookwyrm/templates/moderation/report.html:53
-#, fuzzy
-#| msgid "Statuses has been deleted"
 msgid "Status has been deleted"
-msgstr "Les statuts ont été supprimés"
+msgstr "Le statut a été supprimé"
 
 #: bookwyrm/templates/moderation/report_modal.html:6
 #, python-format
@@ -1589,13 +1551,11 @@ msgstr "Supprimer les notifications"
 
 #: bookwyrm/templates/notifications.html:25
 msgid "All"
-msgstr ""
+msgstr "Tout"
 
 #: bookwyrm/templates/notifications.html:29
-#, fuzzy
-#| msgid "More options"
 msgid "Mentions"
-msgstr "Plus d’options"
+msgstr "Mentions"
 
 #: bookwyrm/templates/notifications.html:70
 #, python-format
@@ -1659,7 +1619,7 @@ msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_
 
 #: bookwyrm/templates/notifications.html:102
 msgid "followed you"
-msgstr "s’est abonné(e)"
+msgstr "vous suit"
 
 #: bookwyrm/templates/notifications.html:105
 msgid "sent you a follow request"
@@ -1696,10 +1656,9 @@ msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> t
 msgstr " a suggégré l’ajout de <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre liste « <a href=\"%(list_path)s/curate\">%(list_name)s</a> »"
 
 #: bookwyrm/templates/notifications.html:128
-#, fuzzy, python-format
-#| msgid "Your <a href=\"/import/%(related_id)s\">import</a> completed."
+#, python-format
 msgid "Your <a href=\"%(url)s\">import</a> completed."
-msgstr "Votre <a href=\"/import/%(related_id)s\">importation</a> est terminée."
+msgstr "Votre <a href=\"%(url)s\">importation</a> est terminée."
 
 #: bookwyrm/templates/notifications.html:131
 #, python-format
@@ -1774,31 +1733,45 @@ msgstr "Profil"
 msgid "Relationships"
 msgstr "Relations"
 
+#: bookwyrm/templates/rss/title.html:5
+#: bookwyrm/templates/snippets/status/status_header.html:35
+msgid "rated"
+msgstr "a noté"
+
+#: bookwyrm/templates/rss/title.html:7
+#: bookwyrm/templates/snippets/status/status_header.html:37
+msgid "reviewed"
+msgstr "a écrit une critique de"
+
+#: bookwyrm/templates/rss/title.html:9
+#: bookwyrm/templates/snippets/status/status_header.html:39
+msgid "commented on"
+msgstr "a commenté"
+
+#: bookwyrm/templates/rss/title.html:11
+#: bookwyrm/templates/snippets/status/status_header.html:41
+msgid "quoted"
+msgstr "a cité"
+
 #: bookwyrm/templates/search/book.html:64
-#, fuzzy
-#| msgid "Show results from other catalogues"
 msgid "Load results from other catalogues"
-msgstr "Montrer les résultats d’autres catalogues"
+msgstr "Charger les résultats d’autres catalogues"
 
 #: bookwyrm/templates/search/book.html:68
 msgid "Manually add book"
-msgstr ""
+msgstr "Ajouter un livre manuellement"
 
 #: bookwyrm/templates/search/book.html:73
 msgid "Log in to import or add books."
-msgstr ""
+msgstr "Authentifiez-vous pour importer ou ajouter des livres."
 
 #: bookwyrm/templates/search/layout.html:16
-#, fuzzy
-#| msgid "Search for a user"
 msgid "Search query"
-msgstr "Chercher un compte"
+msgstr "Requête"
 
 #: bookwyrm/templates/search/layout.html:19
-#, fuzzy
-#| msgid "Search"
 msgid "Search type"
-msgstr "Chercher"
+msgstr "Type de recherche"
 
 #: bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
@@ -1815,10 +1788,9 @@ msgid "Users"
 msgstr "Comptes"
 
 #: bookwyrm/templates/search/layout.html:58
-#, fuzzy, python-format
-#| msgid "No lists found for \"%(query)s\""
+#, python-format
 msgid "No results found for \"%(query)s\""
-msgstr "Aucune liste trouvée pour « %(query)s »"
+msgstr "Aucun résultat pour « %(query)s »"
 
 #: bookwyrm/templates/settings/admin_layout.html:4
 msgid "Administration"
@@ -1872,23 +1844,18 @@ msgstr "Enregistrement"
 
 #: bookwyrm/templates/settings/announcement.html:3
 #: bookwyrm/templates/settings/announcement.html:6
-#, fuzzy
-#| msgid "Announcements"
 msgid "Announcement"
-msgstr "Annonces"
+msgstr "Annonce"
 
 #: bookwyrm/templates/settings/announcement.html:7
 #: bookwyrm/templates/settings/federated_server.html:13
-#, fuzzy
-#| msgid "Back to server list"
 msgid "Back to list"
-msgstr "Retour à la liste des serveurs"
+msgstr "Retour à la liste"
 
 #: bookwyrm/templates/settings/announcement.html:11
-#, fuzzy
-#| msgid "Announcements"
+#: bookwyrm/templates/settings/announcement_form.html:6
 msgid "Edit Announcement"
-msgstr "Annonces"
+msgstr "Modifier l’annonce"
 
 #: bookwyrm/templates/settings/announcement.html:20
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
@@ -1898,64 +1865,48 @@ msgstr "Supprimer"
 
 #: bookwyrm/templates/settings/announcement.html:35
 msgid "Visible:"
-msgstr ""
+msgstr "Visible :"
 
 #: bookwyrm/templates/settings/announcement.html:38
 msgid "True"
-msgstr ""
+msgstr "Vrai"
 
 #: bookwyrm/templates/settings/announcement.html:40
 msgid "False"
-msgstr ""
+msgstr "Faux"
 
 #: bookwyrm/templates/settings/announcement.html:47
-#, fuzzy
-#| msgid "Birth date:"
 msgid "Start date:"
-msgstr "Date de naissance :"
+msgstr "Date de début :"
 
 #: bookwyrm/templates/settings/announcement.html:54
-#, fuzzy
-#| msgid "Birth date:"
 msgid "End date:"
-msgstr "Date de naissance :"
+msgstr "Date de fin :"
 
 #: bookwyrm/templates/settings/announcement.html:60
-#, fuzzy
-#| msgid "Active"
 msgid "Active:"
-msgstr "Actif"
+msgstr "Actif :"
 
-#: bookwyrm/templates/settings/announcement_form.html:5
+#: bookwyrm/templates/settings/announcement_form.html:8
 #: bookwyrm/templates/settings/announcements.html:8
-#, fuzzy
-#| msgid "Announcements"
 msgid "Create Announcement"
-msgstr "Annonces"
+msgstr "Créer une annonce"
 
 #: bookwyrm/templates/settings/announcements.html:22
-#, fuzzy
-#| msgid "Date Added"
 msgid "Date added"
 msgstr "Date d’ajout"
 
 #: bookwyrm/templates/settings/announcements.html:26
-#, fuzzy
-#| msgid "reviewed"
 msgid "Preview"
-msgstr "a écrit une critique de"
+msgstr "Prévisualisation"
 
 #: bookwyrm/templates/settings/announcements.html:30
-#, fuzzy
-#| msgid "Started"
 msgid "Start date"
-msgstr "Commencé"
+msgstr "Date de début"
 
 #: bookwyrm/templates/settings/announcements.html:34
-#, fuzzy
-#| msgid "Edit read dates"
 msgid "End date"
-msgstr "Modifier les date de lecture"
+msgstr "Date de fin"
 
 #: bookwyrm/templates/settings/announcements.html:38
 #: bookwyrm/templates/settings/federation.html:30
@@ -1966,16 +1917,12 @@ msgid "Status"
 msgstr "Statut"
 
 #: bookwyrm/templates/settings/announcements.html:48
-#, fuzzy
-#| msgid "Inactive"
 msgid "active"
-msgstr "Inactif"
+msgstr "active"
 
 #: bookwyrm/templates/settings/announcements.html:48
-#, fuzzy
-#| msgid "Inactive"
 msgid "inactive"
-msgstr "Inactif"
+msgstr "inactive"
 
 #: bookwyrm/templates/settings/edit_server.html:3
 #: bookwyrm/templates/settings/edit_server.html:6
@@ -1984,10 +1931,8 @@ msgstr "Inactif"
 #: bookwyrm/templates/settings/federation.html:10
 #: bookwyrm/templates/settings/server_blocklist.html:3
 #: bookwyrm/templates/settings/server_blocklist.html:20
-#, fuzzy
-#| msgid "Add cover"
 msgid "Add server"
-msgstr "Ajouter une couverture"
+msgstr "Ajouter un serveur"
 
 #: bookwyrm/templates/settings/edit_server.html:7
 #: bookwyrm/templates/settings/server_blocklist.html:7
@@ -1996,16 +1941,12 @@ msgstr "Retour à la liste des serveurs"
 
 #: bookwyrm/templates/settings/edit_server.html:16
 #: bookwyrm/templates/settings/server_blocklist.html:16
-#, fuzzy
-#| msgid "Import book"
 msgid "Import block list"
-msgstr "Importer le livre"
+msgstr "Importer une liste de blocage"
 
 #: bookwyrm/templates/settings/edit_server.html:30
-#, fuzzy
-#| msgid "Instance Name:"
 msgid "Instance:"
-msgstr "Nom de l’instance :"
+msgstr "Instance :"
 
 #: bookwyrm/templates/settings/edit_server.html:37
 #: bookwyrm/templates/settings/federated_server.html:31
@@ -2015,10 +1956,8 @@ msgstr "Statut :"
 
 #: bookwyrm/templates/settings/edit_server.html:41
 #: bookwyrm/templates/settings/federated_server.html:10
-#, fuzzy
-#| msgid "Block"
 msgid "Blocked"
-msgstr "Bloquer"
+msgstr "Bloqué"
 
 #: bookwyrm/templates/settings/edit_server.html:48
 #: bookwyrm/templates/settings/federated_server.html:23
@@ -2034,7 +1973,7 @@ msgstr "Description :"
 
 #: bookwyrm/templates/settings/edit_server.html:64
 msgid "Notes:"
-msgstr ""
+msgstr "Remarques :"
 
 #: bookwyrm/templates/settings/federated_server.html:19
 msgid "Details"
@@ -2073,13 +2012,11 @@ msgstr "Bloqués par nous :"
 #: bookwyrm/templates/settings/federated_server.html:82
 #: bookwyrm/templates/user_admin/user_info.html:39
 msgid "Notes"
-msgstr ""
+msgstr "Remarques"
 
 #: bookwyrm/templates/settings/federated_server.html:85
-#, fuzzy
-#| msgid "Edit Book"
 msgid "Edit"
-msgstr "Modifier le livre"
+msgstr "Modifier"
 
 #: bookwyrm/templates/settings/federated_server.html:105
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:3
@@ -2093,7 +2030,7 @@ msgstr "Bloquer"
 
 #: bookwyrm/templates/settings/federated_server.html:110
 msgid "All users from this instance will be deactivated."
-msgstr ""
+msgstr "Tous les comptes de cette instance seront désactivés."
 
 #: bookwyrm/templates/settings/federated_server.html:115
 #: bookwyrm/templates/snippets/block_button.html:10
@@ -2102,7 +2039,7 @@ msgstr "Débloquer"
 
 #: bookwyrm/templates/settings/federated_server.html:116
 msgid "All users from this instance will be re-activated."
-msgstr ""
+msgstr "Tous les comptes de cette instance seront réactivés."
 
 #: bookwyrm/templates/settings/federation.html:19
 #: bookwyrm/templates/user_admin/server_filter.html:5
@@ -2224,25 +2161,21 @@ msgid "No active invites"
 msgstr "Aucune invitation active"
 
 #: bookwyrm/templates/settings/server_blocklist.html:6
-#, fuzzy
-#| msgid "Import Books"
 msgid "Import Blocklist"
-msgstr "Importer des livres"
+msgstr "Importer une liste de blocage"
 
 #: bookwyrm/templates/settings/server_blocklist.html:26
-#: bookwyrm/templates/snippets/goal_progress.html:5
+#: bookwyrm/templates/snippets/goal_progress.html:7
 msgid "Success!"
 msgstr "Bravo !"
 
 #: bookwyrm/templates/settings/server_blocklist.html:30
-#, fuzzy
-#| msgid "Successfully imported"
 msgid "Successfully blocked:"
-msgstr "Importation réussie"
+msgstr "Blocage réussi :"
 
 #: bookwyrm/templates/settings/server_blocklist.html:32
 msgid "Failed:"
-msgstr ""
+msgstr "Échec :"
 
 #: bookwyrm/templates/settings/site.html:15
 msgid "Instance Name:"
@@ -2290,7 +2223,7 @@ msgstr "Email de l’administrateur :"
 
 #: bookwyrm/templates/settings/site.html:73
 msgid "Additional info:"
-msgstr ""
+msgstr "Infos supplémentaires :"
 
 #: bookwyrm/templates/settings/site.html:83
 msgid "Allow registration:"
@@ -2305,33 +2238,28 @@ msgid "Registration closed text:"
 msgstr "Texte affiché lorsque les enregistrements sont clos :"
 
 #: bookwyrm/templates/snippets/announcement.html:31
-#, fuzzy, python-format
-#| msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
+#, python-format
 msgid "Posted by <a href=\"%(user_path)s\">%(username)s</a>"
-msgstr "Ajoutée par <a href=\"%(user_path)s\">%(username)s</a>"
+msgstr "Publié par <a href=\"%(user_path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/snippets/book_cover.html:31
 msgid "No cover"
-msgstr "Aucune couverture"
+msgstr "Pas de couverture"
 
 #: bookwyrm/templates/snippets/book_titleby.html:4
 #, python-format
 msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgstr "<a href=\"%(path)s\">%(title)s</a> par "
 
-#: bookwyrm/templates/snippets/boost_button.html:9
-#: bookwyrm/templates/snippets/boost_button.html:10
-#, fuzzy
-#| msgid "boosted"
+#: bookwyrm/templates/snippets/boost_button.html:20
+#: bookwyrm/templates/snippets/boost_button.html:21
 msgid "Boost"
-msgstr "partagé"
+msgstr "Partager"
 
-#: bookwyrm/templates/snippets/boost_button.html:16
-#: bookwyrm/templates/snippets/boost_button.html:17
-#, fuzzy
-#| msgid "Un-boost status"
+#: bookwyrm/templates/snippets/boost_button.html:33
+#: bookwyrm/templates/snippets/boost_button.html:34
 msgid "Un-boost"
-msgstr "Annuler le partage du statut"
+msgstr "Annuler le partage"
 
 #: bookwyrm/templates/snippets/content_warning_field.html:3
 msgid "Spoiler alert:"
@@ -2369,10 +2297,8 @@ msgid "Reply"
 msgstr "Répondre"
 
 #: bookwyrm/templates/snippets/create_status_form.html:56
-#, fuzzy
-#| msgid "Footer Content"
 msgid "Content"
-msgstr "Contenu du pied de page"
+msgstr "Contenu"
 
 #: bookwyrm/templates/snippets/create_status_form.html:80
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
@@ -2421,17 +2347,15 @@ msgstr "Supprimer ces dates de lecture ?"
 msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr "Vous avez supprimé ce résumé et ses %(count)s progressions associées."
 
-#: bookwyrm/templates/snippets/fav_button.html:9
-#: bookwyrm/templates/snippets/fav_button.html:11
+#: bookwyrm/templates/snippets/fav_button.html:10
+#: bookwyrm/templates/snippets/fav_button.html:12
 msgid "Like"
-msgstr ""
+msgstr "Ajouter aux favoris"
 
-#: bookwyrm/templates/snippets/fav_button.html:17
 #: bookwyrm/templates/snippets/fav_button.html:18
-#, fuzzy
-#| msgid "Un-like status"
+#: bookwyrm/templates/snippets/fav_button.html:19
 msgid "Un-like"
-msgstr "Retirer le statut des favoris"
+msgstr "Retirer des favoris"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:7
 msgid "Show filters"
@@ -2470,6 +2394,14 @@ msgstr "Accepter"
 msgid "No rating"
 msgstr "Aucune note"
 
+#: bookwyrm/templates/snippets/form_rate_stars.html:44
+#: bookwyrm/templates/snippets/stars.html:7
+#, python-format
+msgid "%(rating)s star"
+msgid_plural "%(rating)s stars"
+msgstr[0] "%(rating)s étoile"
+msgstr[1] "%(rating)s étoiles"
+
 #: bookwyrm/templates/snippets/generated_status/goal.html:1
 #, python-format
 msgid "set a goal to read %(counter)s book in %(year)s"
@@ -2524,17 +2456,17 @@ msgstr "Publier sur le fil d’actualité"
 msgid "Set goal"
 msgstr "Valider ce défi"
 
-#: bookwyrm/templates/snippets/goal_progress.html:7
+#: bookwyrm/templates/snippets/goal_progress.html:9
 #, python-format
 msgid "%(percent)s%% complete!"
 msgstr "%(percent)s%% terminé !"
 
-#: bookwyrm/templates/snippets/goal_progress.html:10
+#: bookwyrm/templates/snippets/goal_progress.html:12
 #, python-format
 msgid "You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
 msgstr "Vous avez lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s livres</a>."
 
-#: bookwyrm/templates/snippets/goal_progress.html:12
+#: bookwyrm/templates/snippets/goal_progress.html:14
 #, python-format
 msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
 msgstr "%(username)s a lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s livres</a>."
@@ -2581,7 +2513,7 @@ msgstr "Confidentialité du statut"
 #: bookwyrm/templates/user/relationships/followers.html:6
 #: bookwyrm/templates/user/relationships/layout.html:11
 msgid "Followers"
-msgstr "Abonnements"
+msgstr "Abonné(e)s"
 
 #: bookwyrm/templates/snippets/rate_action.html:4
 msgid "Leave a rating"
@@ -2643,26 +2575,6 @@ msgstr "S’enregistrer"
 msgid "Report"
 msgstr "Signaler"
 
-#: bookwyrm/templates/snippets/rss_title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:35
-msgid "rated"
-msgstr "a noté"
-
-#: bookwyrm/templates/snippets/rss_title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:37
-msgid "reviewed"
-msgstr "a écrit une critique de"
-
-#: bookwyrm/templates/snippets/rss_title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:39
-msgid "commented on"
-msgstr "a commenté"
-
-#: bookwyrm/templates/snippets/rss_title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:41
-msgid "quoted"
-msgstr "a cité"
-
 #: bookwyrm/templates/snippets/search_result_text.html:36
 msgid "Import book"
 msgstr "Importer le livre"
@@ -2744,7 +2656,7 @@ msgstr "Ajouter le statut aux favoris"
 
 #: bookwyrm/templates/snippets/status/status.html:10
 msgid "boosted"
-msgstr "partagé"
+msgstr "a partagé"
 
 #: bookwyrm/templates/snippets/status/status_header.html:45
 #, python-format
@@ -2807,12 +2719,12 @@ msgstr "%(username)s n’a pas d’abonné(e)"
 #: bookwyrm/templates/user/relationships/following.html:6
 #: bookwyrm/templates/user/relationships/layout.html:15
 msgid "Following"
-msgstr "Abonné(e) à"
+msgstr "Comptes suivis"
 
 #: bookwyrm/templates/user/relationships/following.html:12
 #, python-format
 msgid "%(username)s isn't following any users"
-msgstr "%(username)s n’est abonné(e) à personne"
+msgstr "%(username)s ne suit personne"
 
 #: bookwyrm/templates/user/shelf/books_header.html:5
 #, python-format
@@ -2832,7 +2744,7 @@ msgstr "Modifier l’étagère"
 msgid "Update shelf"
 msgstr "Mettre l’étagère à jour"
 
-#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:51
+#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:56
 msgid "All books"
 msgstr "Tous les livres"
 
@@ -2895,14 +2807,14 @@ msgstr "Aucune activité pour l’instant !"
 #: bookwyrm/templates/user/user_preview.html:15
 #, python-format
 msgid "Joined %(date)s"
-msgstr "Enregistré(e) %(date)s"
+msgstr "A rejoint ce serveur %(date)s"
 
 #: bookwyrm/templates/user/user_preview.html:19
 #, python-format
 msgid "%(counter)s follower"
 msgid_plural "%(counter)s followers"
-msgstr[0] "%(counter)s abonnement"
-msgstr[1] "%(counter)s abonnements"
+msgstr[0] "%(counter)s abonné(e)"
+msgstr[1] "%(counter)s abonné(e)s"
 
 #: bookwyrm/templates/user/user_preview.html:20
 #, python-format
@@ -2910,19 +2822,15 @@ msgid "%(counter)s following"
 msgstr "%(counter)s abonnements"
 
 #: bookwyrm/templates/user/user_preview.html:26
-#, fuzzy, python-format
-#| msgid "%(mutuals)s follower you follow"
-#| msgid_plural "%(mutuals)s followers you follow"
+#, python-format
 msgid "%(mutuals_display)s follower you follow"
 msgid_plural "%(mutuals_display)s followers you follow"
-msgstr[0] "%(mutuals)s abonnement auxquel vous êtes abonné(e)"
-msgstr[1] "%(mutuals)s abonnements auxquels vous êtes abonné(e)"
+msgstr[0] "%(mutuals_display)s abonné(e) que vous suivez"
+msgstr[1] "%(mutuals_display)s abonné(e)s que vous suivez"
 
 #: bookwyrm/templates/user_admin/user.html:9
-#, fuzzy
-#| msgid "Back to reports"
 msgid "Back to users"
-msgstr "Retour aux signalements"
+msgstr "Retour aux comptes"
 
 #: bookwyrm/templates/user_admin/user_admin.html:7
 #, python-format
@@ -2960,42 +2868,36 @@ msgid "Not set"
 msgstr "Non défini"
 
 #: bookwyrm/templates/user_admin/user_info.html:5
-#, fuzzy
-#| msgid "Details"
 msgid "User details"
-msgstr "Détails"
+msgstr "Détails du compte"
 
 #: bookwyrm/templates/user_admin/user_info.html:14
 msgid "View user profile"
 msgstr "Voir le profil"
 
 #: bookwyrm/templates/user_admin/user_info.html:20
-#, fuzzy
-#| msgid "Instance Settings"
 msgid "Instance details"
-msgstr "Paramètres de l’instance"
+msgstr "Détails de l’instance"
 
 #: bookwyrm/templates/user_admin/user_info.html:46
 msgid "View instance"
-msgstr ""
+msgstr "Voir l’instance"
 
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:11
 msgid "Suspend user"
-msgstr ""
+msgstr "Suspendre le compte"
 
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:13
 msgid "Un-suspend user"
-msgstr ""
+msgstr "Rétablir le compte"
 
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:21
 msgid "Access level:"
-msgstr ""
+msgstr "Niveau d’accès :"
 
 #: bookwyrm/views/import_data.py:67
-#, fuzzy
-#| msgid "Email address:"
 msgid "Not a valid csv file"
-msgstr "Adresse email :"
+msgstr "Fichier CSV invalide"
 
 #: bookwyrm/views/password.py:32
 msgid "No user with that email address was found."
@@ -3056,12 +2958,12 @@ msgstr "Un lien de réinitialisation a été envoyé à %s."
 #~ msgid "Enter a number."
 #~ msgstr "Numéro dans la série :"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "A user with this email already exists."
 #~ msgid "%(model_name)s with this %(field_labels)s already exists."
 #~ msgstr "Cet email est déjà associé à un compte."
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "%(value)s is not a valid remote_id"
 #~ msgid "Value %(value)r is not a valid choice."
 #~ msgstr "%(value)s n’est pas une remote_id valide."
@@ -3071,7 +2973,7 @@ msgstr "Un lien de réinitialisation a été envoyé à %s."
 #~ msgid "This field cannot be null."
 #~ msgstr "Cette étagère est vide"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "A user with this email already exists."
 #~ msgid "%(model_name)s with this %(field_label)s already exists."
 #~ msgstr "Cet email est déjà associé à un compte."
@@ -3121,7 +3023,7 @@ msgstr "Un lien de réinitialisation a été envoyé à %s."
 #~ msgid "Positive small integer"
 #~ msgstr "Aucune invitation active"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "%(value)s is not a valid username"
 #~ msgid "“%(value)s� is not a valid UUID."
 #~ msgstr "%(value)s n’est pas un nom de compte valide."
@@ -3136,12 +3038,12 @@ msgstr "Un lien de réinitialisation a été envoyé à %s."
 #~ msgid "One-to-one relationship"
 #~ msgstr "Relations"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "Relationships"
 #~ msgid "%(from)s-%(to)s relationship"
 #~ msgstr "Relations"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "Relationships"
 #~ msgid "%(from)s-%(to)s relationships"
 #~ msgstr "Relations"
@@ -3201,7 +3103,7 @@ msgstr "Un lien de réinitialisation a été envoyé à %s."
 #~ msgid "Order"
 #~ msgstr "Trier par"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "%(value)s is not a valid username"
 #~ msgid "“%(pk)s� is not a valid value."
 #~ msgstr "%(value)s n’est pas un nom de compte valide."
@@ -3265,7 +3167,7 @@ msgstr "Un lien de réinitialisation a été envoyé à %s."
 #~ msgid "This is not a valid IPv6 address."
 #~ msgstr "Adresse email :"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "No books found matching the query \"%(query)s\""
 #~ msgid "No %(verbose_name)s found matching the query"
 #~ msgstr "Aucun livre trouvé pour la requête « %(query)s »"
@@ -3284,11 +3186,9 @@ msgstr "Un lien de réinitialisation a été envoyé à %s."
 #~ msgid "Matching Users"
 #~ msgstr "Comptes correspondants"
 
-#, python-format
 #~ msgid "Set a reading goal for %(year)s"
 #~ msgstr "Définir un défi lecture pour %(year)s"
 
-#, python-format
 #~ msgid "by %(author)s"
 #~ msgstr "par %(author)s"
 
@@ -3298,21 +3198,12 @@ msgstr "Un lien de réinitialisation a été envoyé à %s."
 #~ msgid "Reactivate user"
 #~ msgstr "Réactiver le compte"
 
-#, python-format
-#~ msgid "%(rating)s star"
-#~ msgid_plural "%(rating)s stars"
-#~ msgstr[0] "%(rating)s étoile"
-#~ msgstr[1] "%(rating)s étoiles"
-
-#, python-format
 #~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">review</a>"
 #~ msgstr "a répondu à la <a href=\"%(status_path)s\">critique</a> de <a href=\"%(user_path)s\">%(username)s</a>"
 
-#, python-format
 #~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">comment</a>"
 #~ msgstr "a répondu au <a href=\"%(status_path)s\">commentaire</a> de <a href=\"%(user_path)s\">%(username)s</a>"
 
-#, python-format
 #~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">quote</a>"
 #~ msgstr "a répondu à la <a href=\"%(status_path)s\">citation</a> de <a href=\"%(user_path)s\">%(username)s</a>"
 
@@ -3322,7 +3213,6 @@ msgstr "Un lien de réinitialisation a été envoyé à %s."
 #~ msgid "Add tag"
 #~ msgstr "Ajouter un tag"
 
-#, python-format
 #~ msgid "Books tagged \"%(tag.name)s\""
 #~ msgstr "Livres tagués « %(tag.name)s »"
 

From a31bbfd95ed8590230bf087687ecae1216d38f21 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Sun, 23 May 2021 15:13:17 +0200
Subject: [PATCH 1209/1285] Update translations

---
 locale/fr_FR/LC_MESSAGES/django.mo | Bin 45420 -> 45420 bytes
 locale/fr_FR/LC_MESSAGES/django.po |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index 5297cd7c71b91d2b03dd89fbba6c605cee474c7d..6c9e3eb5f2bd1eb69a76ddcf0fed5656fb3aeac9 100644
GIT binary patch
delta 355
zcmXZWKTASk6vy$y)zFL3AOCcTq(QoKI0}O3V2v#ff(;=qiUpBNsLv2it!};ox8M#!
zb4~@mfE?mFxZEvYK;MJU^f~7|&vSlH6gpApynlNpBO=YANDljWjIWr*sqN?14?F)t
zefNuH+~E}#M<UmFk1ozp_XX(TC!XRO5Akm#M$#0{ct6OY24C8~gc@{X`xffr9{M=I
zbDW_DEKu*S@B%kjK*xyW(MQdz;Sn}WMI=elVUWTH)E~cK3Exlym-c*x3Hl#A!A;<v
Z-L?;^-N(Uma5tR9;`Po`KiHZ{@gK&YJWc=r

delta 355
zcmXZWKTCp96vy$SDJepV`3FfFtY&jl5JVhYBU(ZT!CXX_a0%24f=g?guRu5P0m0cO
z5nq4~!LzhD*&FbC@J^q5&bgf5Ik?_~>z!?qCMqJYJ&`!JF@i&k;kT_P)}`&Q@tXNB
z7V#gm_}CYzVjY7xLESgUB(5-ld%VJ9UySGhp24{hLk+&ObsjaSYU>*6;ubz&7jJNk
z8n8h9zr|a0F@qi>lE!<~yfTLI#gs$>Jl<)9u!DN>Cl>GvHSovIw|GgtLtW%L!PHa3
WSNT{?owwfT!vEZCHM`EA8Rbs1Ej+dW

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 325d7fbf..5514b43e 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -647,7 +647,7 @@ msgstr "Vous pouvez décider de ne plus y figurer à n’importe quel moment dep
 #: bookwyrm/templates/snippets/announcement.html:34
 #: bookwyrm/templates/snippets/goal_card.html:22
 msgid "Dismiss message"
-msgstr "Rejeter le message"
+msgstr "Fermer le message"
 
 #: bookwyrm/templates/directory/sort_filter.html:5
 msgid "Order by"
@@ -1890,7 +1890,7 @@ msgstr "Actif :"
 #: bookwyrm/templates/settings/announcement_form.html:8
 #: bookwyrm/templates/settings/announcements.html:8
 msgid "Create Announcement"
-msgstr "Créer une annonce"
+msgstr "Ajouter une annonce"
 
 #: bookwyrm/templates/settings/announcements.html:22
 msgid "Date added"

From 6024fae766d8906049f9cbaeef3e0e4a5ef35fe0 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Sun, 23 May 2021 15:23:35 +0200
Subject: [PATCH 1210/1285] Update translation

---
 locale/fr_FR/LC_MESSAGES/django.mo | Bin 45420 -> 45418 bytes
 locale/fr_FR/LC_MESSAGES/django.po |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index 6c9e3eb5f2bd1eb69a76ddcf0fed5656fb3aeac9..00b7885c9bfe359515daf9c787ddc9d9fdf6f3ab 100644
GIT binary patch
delta 1829
zcmXZcc}&l79LMnwsZ{cl9Q`UO%q>@bGUrfkCagBrw29^1Opc77`<l&Ihby5R$x)hP
z3v+K6{xNH=4cQFCOlIbKzWRLrdVJoW&+qeje?ITe_w)Portyb2jVoj0{lUhVi}}WM
z!)q9c?=b{_V^a(&Fs283FbW4_ADoU6xEY&a5w^fGjK>Su6Q5#R3@Eg}i$TR*3yr^_
zF@lc%bY!3s??fdo#AGaSaV;JrevN~0Ymr^>25R0T48vNC!8+7BX0J^cg4%cjYU62p
z{l>)6m_tWP+=vZ{-49A!e-(Nezm0A16)I6ZsxpoC8551YFcimPYn+D7F$Y!Ym6(g`
zP?h@Or=f*{_uJA&VteAA*a|12CT5{FmV;AqDJt=8^x#)i1<V0^g`v(k)VzMED;kWt
zlCd}d{kb$Wu>zIw0($X2#$p|6fkp>yg+fskXouQB66%Dr-S`sJIvY^y7NII}1cUGr
z#^5!iQhxKy4ZK60^b@Ky-%$$$7TXhfPz!fN^(VV{q>IyCoQ2_xFGrnt6VAfj*a1Id
zCyY3xb-8~Z4ee+=D#2XT9j-=|Y736WYD~eOn1;hj>_@vBClTMlXpB5;%uq~3C0vLJ
zxC>`u6-HtB5hTCqOd}A7qfVBBs>Bp*g6XIY%|d;o^H6u5hkC9%oQE)h_&n-Lo}j+1
zx2XAFFb;oVEP9Vpe=X#rp^~MdPB0y{z!Fq~wWzz>gWAA8H+~v5uLkv;?x8mR92*j2
zcj7OoJkh20fZb8QPb#JUDtRg$x`LT*U<E4icGP$=YD4Ey3*W%L_z<=5KUC#BW%l)W
zQS%0&Har<Mo`u@*0vv~{%BcS|8n@_JgKhbDS%n2S5Ix6v(>Mn2Vy=saoG_+0@qCQO
z{n!<2P<LO43$epV`)%w(y_%Qk!|$k%vxmRj-c2&{Ut&h#dVJyfGf&yqkb~NJ9_os=
zxwsUAh^w$4UUu<E3?=@C>G%hA&>0oha@0ore`o~INIGpxn~d4SqcIClIh&oauV67Y
zrN0_O@Cqj4UDscay1KtO0b8E6>tv#y;dN)bbH<F&`_H4H2{jmwkFg8BM7@f@N?WQh
zRN^QXCtxsfqSJ?A#KSNX$D^KEIcnZb?1m381M4wFGbUHruQ8+A+ogC>U|ROFoTb%Q
I^UuZp2bXpxb^rhX

delta 1831
zcmXZccWll<9LMp~;_2o=(e}|{#HLnNg&_8dSzFK$Qk4>7wRsSmNE)TB)~MPw^B6%Y
zVw42IKO&74q7p$6Q4zuW)4RW3_q}`Wdw1Xa-ShEn(5JUS=Y5I(P-D#Hd}G?<O>B%G
zQT=~01Vi>1(-FPc9Q$E1rlS|PU<4LnLp+9wcm+G*b8Lq7_S)aIK*b&Q8h>qL5FI_}
zn2uU_7i!@`OvO?cSK(3Oci0EF71)HgQS+W)I96dCR-^I+71{;EQ5$cC+W4eGzcKMN
z7SPcMH(~9<?gyo=KY%feS7K9qgIcHtRhi%-V`8x@hT%wz#>p6kndreaxB@qzD)q}x
zLy1E7+0sU10&y2?f@4t=Gf*4L#PPTswQwai!0)IE1QpvWjBqBR=JiBfQ9sm`jKp5(
zUr9p~&!85(f-(3IeOQf35L{v_6oINh0%`*(s1wd}<4aL_Hlp$tp(;^^_3<jk;Z3Ac
ze)GZ&d_bM_3#v3fQ3*Wz?TNgo#BEUhX)Ye@;%P3<z(~edp-#LRXX0*biC?ibHa?)d
z+<z(!?PxS=frY3$%te)ID-Om>I0S#=1RQYCezd!B4DmgT#ppwn8Iw^9F2N+s!x<RB
z=GdSVS>LpyQ4a^APBsixiSbw$r=d198}*ScLfv@|>bdT89>OHzi>NDkhWfVNqvn6Z
zc>IGtj5|#Il_-^lN;VvIf^<}ZrKkngq3$jpwSi(ceik*a0`;68pf>&zYZt~2#NSZs
z_{!`7JE4A`Qbzq%^5Jyo3TC;1)u@GcpvDiPHgpk{_%?RK$Ed`0j@ZOrOdyU!&FhQW
z@HjV~f!c5uj=;4?sQ*M7cj?H*82(*WV*&O??=fRK;|Q$8l`igooVQNA7!$Ds+hGOj
z?yGSzwmxCMjXcz=d5tOf6ZLU+_MfzOlZO14m?5|xU%CD{r|fIUMD08Wbw%4<d=%>w
z2e3O{bMa>kBmRL?@E_`+Q_8L7sEzpl(FmrIa@v+Q4d)XN#kqLe8Fj|Kf@}<-{}P7c
z4eWyVU4ISg>daYVMnMx)o;j#zc*~h^ju)i&pF=|vDlihCVq1KTdKI4Ywp5X*g=1aZ
z3O&Th&QuI19)PoPH0qg^qvqYg_V@^=Vhx6B#<&aiYn&d4X}dqmGjT<B_OeA;f$RC_
GeE$IwvnL_|

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 5514b43e..1970a5e1 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -1401,7 +1401,7 @@ msgstr "Position"
 #: bookwyrm/templates/lists/list.html:86
 #: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
-msgstr "Supprimer"
+msgstr "Retirer"
 
 #: bookwyrm/templates/lists/list.html:99 bookwyrm/templates/lists/list.html:111
 msgid "Sort List"

From c7b59f8653e93b23d1e5c13aba03a2644308e6d2 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Sun, 23 May 2021 16:01:01 +0200
Subject: [PATCH 1211/1285] Update shelf translations

---
 locale/fr_FR/LC_MESSAGES/django.mo | Bin 45418 -> 45409 bytes
 locale/fr_FR/LC_MESSAGES/django.po |   8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index 00b7885c9bfe359515daf9c787ddc9d9fdf6f3ab..349ef43a8322a5be7b4efa8c969d8185f70d36b7 100644
GIT binary patch
delta 3927
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
Pc|uxdMoHZAZngdg@3>le

delta 3936
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
VOi%F?7i1)lD&ES|$hDnA{s#u1V%Pux

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 1970a5e1..6b4fe8f0 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -904,7 +904,7 @@ msgstr "À lire"
 #: bookwyrm/templates/feed/feed_layout.html:24
 #: bookwyrm/templates/user/shelf/shelf.html:29
 msgid "Currently Reading"
-msgstr "En train de lire"
+msgstr "Lectures en cours"
 
 #: bookwyrm/templates/feed/feed_layout.html:25
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
@@ -2734,7 +2734,7 @@ msgstr "Livres de %(username)s"
 #: bookwyrm/templates/user/shelf/create_shelf_form.html:5
 #: bookwyrm/templates/user/shelf/create_shelf_form.html:22
 msgid "Create Shelf"
-msgstr "Créer l’étagère"
+msgstr "Créer une étagère"
 
 #: bookwyrm/templates/user/shelf/edit_shelf_form.html:5
 msgid "Edit Shelf"
@@ -2750,7 +2750,7 @@ msgstr "Tous les livres"
 
 #: bookwyrm/templates/user/shelf/shelf.html:38
 msgid "Create shelf"
-msgstr "Créer l’étagère"
+msgstr "Créer une étagère"
 
 #: bookwyrm/templates/user/shelf/shelf.html:61
 msgid "Edit shelf"
@@ -2759,7 +2759,7 @@ msgstr "Modifier l’étagère"
 #: bookwyrm/templates/user/shelf/shelf.html:80
 #: bookwyrm/templates/user/shelf/shelf.html:104
 msgid "Shelved"
-msgstr "Ajouté à une étagère"
+msgstr "Date d’ajout"
 
 #: bookwyrm/templates/user/shelf/shelf.html:81
 #: bookwyrm/templates/user/shelf/shelf.html:108

From 9eb719106f62de77cb328e1348aad84724e611a1 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Sun, 23 May 2021 17:17:02 +0200
Subject: [PATCH 1212/1285] Fix display bug

---
 bookwyrm/templates/lists/list.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index 83df6521..72f3210b 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -57,7 +57,6 @@
                                 {% include 'snippets/shelve_button/shelve_button.html' %}
                             </div>
                         </div>
-                    </div>
                     {% endwith %}
 
                     <div class="card-footer is-stacked-mobile has-background-white-bis is-align-items-baseline">

From cf7cbfdf8f61f502b8dc6c8f32e7d10c1fba8941 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Sun, 23 May 2021 17:17:30 +0200
Subject: [PATCH 1213/1285] Fix title styles

---
 bookwyrm/templates/lists/list.html | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index 72f3210b..84c6edb0 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -98,7 +98,9 @@
     </section>
 
     <section class="column is-one-quarter">
-        <h2>{% trans "Sort List" %}</h2>
+        <h2 class="title is-5">
+            {% trans "Sort List" %}
+        </h2>
         <form name="sort" action="{% url 'list' list.id %}" method="GET" class="block">
             <div class="field">
                 <label class="label" for="id_sort_by">{% trans "Sort By" %}</label>
@@ -119,7 +121,13 @@
             </div>
         </form>
     {% if request.user.is_authenticated and not list.curation == 'closed' or request.user == list.user %}
-        <h2>{% if list.curation == 'open' or request.user == list.user %}{% trans "Add Books" %}{% else %}{% trans "Suggest Books" %}{% endif %}</h2>
+        <h2 class="title is-5 mt-6">
+            {% if list.curation == 'open' or request.user == list.user %}
+                {% trans "Add Books" %}
+            {% else %}
+                {% trans "Suggest Books" %}
+            {% endif %}
+        </h2>
         <form name="search" action="{% url 'list' list.id %}" method="GET" class="block">
             <div class="field has-addons">
                 <div class="control">

From 1aa319d6eeec6d49cb373b2754fa28a0c2b055d7 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Sun, 23 May 2021 17:17:46 +0200
Subject: [PATCH 1214/1285] Move description text below header

---
 bookwyrm/templates/lists/list_layout.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/lists/list_layout.html b/bookwyrm/templates/lists/list_layout.html
index 993587ca..1bbc98b4 100644
--- a/bookwyrm/templates/lists/list_layout.html
+++ b/bookwyrm/templates/lists/list_layout.html
@@ -10,7 +10,6 @@
         <p class="subtitle help">
             {% include 'lists/created_text.html' with list=list %}
         </p>
-        {% include 'snippets/trimmed_text.html' with full=list.description %}
     </div>
     {% if request.user == list.user %}
     <div class="column is-narrow">
@@ -20,6 +19,10 @@
     {% endif %}
 </header>
 
+<div class="block content">
+    {% include 'snippets/trimmed_text.html' with full=list.description %}    
+</div>
+
 <div class="block">
     {% include 'lists/edit_form.html' with controls_text="edit-list" %}
 </div>

From 354b5110893177f69476e9290885aa4bc46e9f1c Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Sun, 23 May 2021 17:18:16 +0200
Subject: [PATCH 1215/1285] Fix flex styles

---
 bookwyrm/templates/lists/list.html | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index 84c6edb0..4dc9660a 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -35,16 +35,17 @@
                         <div
                             class="
                                 card-content p-0 mb-0
-                                columns is-mobile is-gapless
+                                columns is-gapless
+                                is-mobile
                             "
                         >
-                            <div class="column is-2-mobile is-cover align to-t">
+                            <div class="column is-3-mobile is-2-tablet is-cover align to-t">
                                 <a href="{{ item.book.local_path }}" aria-hidden="true">
-                                    {% include 'snippets/book_cover.html' with cover_class='is-w-auto is-h-m-tablet' %}
+                                    {% include 'snippets/book_cover.html' with cover_class='is-w-auto is-h-m-tablet is-align-items-flex-start' %}
                                 </a>
                             </div>
 
-                            <div class="column ml-3">
+                            <div class="column mx-3 my-2">
                                 <p>
                                     {% include 'snippets/book_titleby.html' %}
                                 </p>
@@ -59,7 +60,7 @@
                         </div>
                     {% endwith %}
 
-                    <div class="card-footer is-stacked-mobile has-background-white-bis is-align-items-baseline">
+                    <div class="card-footer is-stacked-mobile has-background-white-bis is-align-items-stretch">
                         <div class="card-footer-item">
                             <div>
                             <p>{% blocktrans with username=item.user.display_name user_path=user.local_path %}Added by <a href="{{ user_path }}">{{ username }}</a>{% endblocktrans %}</p>

From ca8067769c76a030e779e72817525b80bf4fa338 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 23 May 2021 08:48:00 -0700
Subject: [PATCH 1216/1285] Don't show deleted ratings in stars

---
 bookwyrm/templatetags/bookwyrm_tags.py | 1 +
 bookwyrm/views/shelf.py                | 1 +
 2 files changed, 2 insertions(+)

diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py
index 3f33643b..5cba5455 100644
--- a/bookwyrm/templatetags/bookwyrm_tags.py
+++ b/bookwyrm/templatetags/bookwyrm_tags.py
@@ -25,6 +25,7 @@ def get_user_rating(book, user):
             user=user,
             book=book,
             rating__isnull=False,
+            deleted=False,
         )
         .order_by("-published_date")
         .first()
diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index 99e22fa9..538a8e34 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -62,6 +62,7 @@ class Shelf(View):
             user=user,
             rating__isnull=False,
             book__id=OuterRef("id"),
+            deleted=False,
         ).order_by("-published_date")
 
         if not is_self:

From 6e9c9e839c04549f261f7c1524ee788070019564 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Sun, 23 May 2021 20:25:42 +0200
Subject: [PATCH 1217/1285] Fix date of death display

---
 bookwyrm/templates/author/author.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html
index 67f8792c..aa99cbe2 100644
--- a/bookwyrm/templates/author/author.html
+++ b/bookwyrm/templates/author/author.html
@@ -39,7 +39,7 @@
                     <dd itemprop="aliases">{{ author.born|naturalday }}</dd>
                 </div>
                 {% endif %}
-                {% if author.aliases %}
+                {% if author.died %}
                 <div class="is-flex">
                     <dt class="mr-1">{% trans "Died:" %}</dt>
                     <dd itemprop="aliases">{{ author.died|naturalday }}</dd>

From 55a3a28d49f187d3de0391ea3beaba0e75620dac Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Sun, 23 May 2021 21:17:14 +0200
Subject: [PATCH 1218/1285] Add microformats to author page

---
 bookwyrm/templates/author/author.html | 33 ++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html
index aa99cbe2..496012a8 100644
--- a/bookwyrm/templates/author/author.html
+++ b/bookwyrm/templates/author/author.html
@@ -22,42 +22,59 @@
     </div>
 </div>
 
-<div class="block content columns">
-    {% if author.aliases or author.born or author.died or author.wikipedia_link %}
+<div class="block content columns" itemscope itemtype="https://schema.org/Person">
+    <meta itemprop="name" content="{{ author.name }}">
+
+    {% if author.aliases or author.born or author.died or author.wikipedia_link or author.openlibrary_key or author.inventaire_id %}
     <div class="column is-narrow">
         <div class="box">
             <dl>
                 {% if author.aliases %}
                 <div class="is-flex">
                     <dt class="mr-1">{% trans "Aliases:" %}</dt>
-                    <dd itemprop="aliases">{{ author.aliases|join:', ' }}</dd>
+                    <dd>
+                        {% for alias in author.aliases %}
+                        <span itemprop="alternateName">{{alias}}</span>{% if not forloop.last %},{% endif %}
+                        {% endfor %}
+                    </dd>
                 </div>
                 {% endif %}
                 {% if author.born %}
                 <div class="is-flex">
                     <dt class="mr-1">{% trans "Born:" %}</dt>
-                    <dd itemprop="aliases">{{ author.born|naturalday }}</dd>
+                    <dd itemprop="birthDate">{{ author.born|naturalday }}</dd>
                 </div>
                 {% endif %}
                 {% if author.died %}
                 <div class="is-flex">
                     <dt class="mr-1">{% trans "Died:" %}</dt>
-                    <dd itemprop="aliases">{{ author.died|naturalday }}</dd>
+                    <dd itemprop="deathDate">{{ author.died|naturalday }}</dd>
                 </div>
                 {% endif %}
             </dl>
 
             {% if author.wikipedia_link %}
-            <p><a href="{{ author.wikipedia_link }}" rel=�noopener� target="_blank">{% trans "Wikipedia" %}</a></p>
+            <p>
+                <link itemprop="sameAs" href="{{ author.wikipedia_link }}" />
+                <a href="{{ author.wikipedia_link }}" rel=�noopener� target="_blank">
+                    {% trans "Wikipedia" %}
+                </a>
+            </p>
             {% endif %}
             {% if author.openlibrary_key %}
             <p class="mb-0">
-                <a href="https://openlibrary.org/authors/{{ author.openlibrary_key }}" target="_blank" rel="noopener">{% trans "View on OpenLibrary" %}</a>
+                <link itemprop="sameAs" href="https://openlibrary.org/authors/{{ author.openlibrary_key }}" />
+                <a href="https://openlibrary.org/authors/{{ author.openlibrary_key }}" target="_blank" rel="noopener">
+                    {% trans "View on OpenLibrary" %}
+                </a>
             </p>
             {% endif %}
             {% if author.inventaire_id %}
             <p class="mb-0">
-                <a href="https://inventaire.io/entity/{{ author.inventaire_id }}" target="_blank" rel="noopener">{% trans "View on Inventaire" %}</a>
+                <link itemprop="sameAs" href="https://inventaire.io/entity/{{ author.inventaire_id }}" />
+                <a href="https://inventaire.io/entity/{{ author.inventaire_id }}" target="_blank" rel="noopener">
+                    {% trans "View on Inventaire" %}
+                </a>
             </p>
             {% endif %}
         </div>

From b362b72c57531d3d85e272f9892758e57a89edf2 Mon Sep 17 00:00:00 2001
From: Jason Kelly <jason@eatsleepdeploy.com>
Date: Mon, 24 May 2021 09:35:21 +0800
Subject: [PATCH 1219/1285] Python linting

---
 bookwyrm/models/fields.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py
index d4d94aa2..caa22fcd 100644
--- a/bookwyrm/models/fields.py
+++ b/bookwyrm/models/fields.py
@@ -334,7 +334,7 @@ class TagField(ManyToManyField):
 
 
 class ClearableFileInputWithWarning(ClearableFileInput):
-    template_name = 'widgets/clearable_file_input_with_warning.html'
+    template_name = "widgets/clearable_file_input_with_warning.html"
 
 
 class CustomImageField(ImageField):
@@ -405,10 +405,12 @@ class ImageField(ActivitypubFieldMixin, models.ImageField):
         return [image_name, image_content]
 
     def formfield(self, **kwargs):
-        return super().formfield(**{
-            'form_class': CustomImageField,
-            **kwargs,
-        })
+        return super().formfield(
+            **{
+                "form_class": CustomImageField,
+                **kwargs,
+            }
+        )
 
 
 class DateTimeField(ActivitypubFieldMixin, models.DateTimeField):

From 31deb36c853536c4ddd9537304d63476ff534fb5 Mon Sep 17 00:00:00 2001
From: bcj <brendan@bcjbcj.ca>
Date: Sun, 23 May 2021 23:49:12 -0500
Subject: [PATCH 1220/1285] URL-Encode password in broker_url

Needed to prevent connection errors if the password contains non-urlsafe characters.

Dockerfile change because all the services using it are mirroring ./ in /app now anyway.
Flower needs because it needs bookwyrm in order to read the celerywyrm config (because flower only allows overwriting broker_url from the command line and we want to do it in Python so we have access to a urlencode function).
---
 .env.dev.example       | 4 +---
 .env.prod.example      | 2 --
 Dockerfile             | 2 --
 bookwyrm/settings.py   | 8 ++++++--
 celerywyrm/settings.py | 4 ++--
 docker-compose.yml     | 6 +++---
 6 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/.env.dev.example b/.env.dev.example
index 2f24378c..03e6ef25 100644
--- a/.env.dev.example
+++ b/.env.dev.example
@@ -34,10 +34,8 @@ REDIS_ACTIVITY_PORT=6379
 #REDIS_ACTIVITY_PASSWORD=redispassword345
 
 # Redis as celery broker
-#REDIS_BROKER_PORT=6379
+REDIS_BROKER_PORT=6379
 #REDIS_BROKER_PASSWORD=redispassword123
-CELERY_BROKER=redis://redis_broker:6379/0
-CELERY_RESULT_BACKEND=redis://redis_broker:6379/0
 
 FLOWER_PORT=8888
 #FLOWER_USER=mouse
diff --git a/.env.prod.example b/.env.prod.example
index a82499a3..dd15fbb7 100644
--- a/.env.prod.example
+++ b/.env.prod.example
@@ -36,8 +36,6 @@ REDIS_ACTIVITY_PASSWORD=redispassword345
 # Redis as celery broker
 REDIS_BROKER_PORT=6379
 REDIS_BROKER_PASSWORD=redispassword123
-CELERY_BROKER=redis://:${REDIS_BROKER_PASSWORD}@redis_broker:${REDIS_BROKER_PORT}/0
-CELERY_RESULT_BACKEND=redis://:${REDIS_BROKER_PASSWORD}@redis_broker:${REDIS_BROKER_PORT}/0
 
 FLOWER_PORT=8888
 FLOWER_USER=mouse
diff --git a/Dockerfile b/Dockerfile
index 0f10015c..1892ae23 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,5 +9,3 @@ WORKDIR /app
 COPY requirements.txt /app/
 RUN pip install -r requirements.txt --no-cache-dir
 RUN apt-get update && apt-get install -y gettext libgettextpo-dev && apt-get clean
-
-COPY ./bookwyrm ./celerywyrm /app/
diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index d694e33f..19d84c7f 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -14,8 +14,12 @@ PAGE_LENGTH = env("PAGE_LENGTH", 15)
 DEFAULT_LANGUAGE = env("DEFAULT_LANGUAGE", "English")
 
 # celery
-CELERY_BROKER = env("CELERY_BROKER")
-CELERY_RESULT_BACKEND = env("CELERY_RESULT_BACKEND")
+CELERY_BROKER = "redis://:{}@redis_broker:{}/0".format(
+    requests.utils.quote(env("REDIS_BROKER_PASSWORD", "")), env("REDIS_BROKER_PORT")
+)
+CELERY_RESULT_BACKEND = "redis://:{}@redis_broker:{}/0".format(
+    requests.utils.quote(env("REDIS_BROKER_PASSWORD", "")), env("REDIS_BROKER_PORT")
+)
 CELERY_ACCEPT_CONTENT = ["application/json"]
 CELERY_TASK_SERIALIZER = "json"
 CELERY_RESULT_SERIALIZER = "json"
diff --git a/celerywyrm/settings.py b/celerywyrm/settings.py
index e4fa73ca..63a6e940 100644
--- a/celerywyrm/settings.py
+++ b/celerywyrm/settings.py
@@ -1,10 +1,10 @@
 """ bookwyrm settings and configuration """
 from bookwyrm.settings import *
 
-CELERY_BROKER_URL = env("CELERY_BROKER")
+CELERY_BROKER_URL =  CELERY_BROKER
 CELERY_ACCEPT_CONTENT = ["json"]
 CELERY_TASK_SERIALIZER = "json"
-CELERY_RESULT_BACKEND = "redis"
+FLOWER_PORT = env("FLOWER_PORT")
 
 INSTALLED_APPS = INSTALLED_APPS + [
     "celerywyrm",
diff --git a/docker-compose.yml b/docker-compose.yml
index 18f83650..49d02e70 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -74,10 +74,10 @@ services:
     restart: on-failure
   flower:
     build: .
-    command: flower --port=${FLOWER_PORT}
+    command: flower -A celerywyrm
     env_file: .env
-    environment:
-      - CELERY_BROKER_URL=${CELERY_BROKER}
+    volumes:
+      - .:/app
     networks:
       - main
     depends_on:

From 58c07d16779d3d1f7a5f8c43518c41efad6e891b Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 24 May 2021 12:36:48 +0200
Subject: [PATCH 1221/1285] Apply review suggestions

---
 bookwyrm/templates/author/author.html | 29 +++++++++++++--------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html
index 496012a8..de7d230f 100644
--- a/bookwyrm/templates/author/author.html
+++ b/bookwyrm/templates/author/author.html
@@ -22,7 +22,7 @@
     </div>
 </div>
 
-<div class="block content columns" itemscope itemtype="https://schema.org/Person">
+<div class="block columns" itemscope itemtype="https://schema.org/Person">
     <meta itemprop="name" content="{{ author.name }}">
 
     {% if author.aliases or author.born or author.died or author.wikipedia_link or author.openlibrary_key or author.inventaire_id %}
@@ -32,11 +32,11 @@
                 {% if author.aliases %}
                 <div class="is-flex">
                     <dt class="mr-1">{% trans "Aliases:" %}</dt>
-                    <dd>
-                        {% for alias in author.aliases %}
-                        <span itemprop="alternateName">{{alias}}</span>{% if not forloop.last %},{% endif %}
-                        {% endfor %}
-                    </dd>
+                    {% for alias in author.aliases %}
+                        <dd itemprop="alternateName" content="{{alias}}">
+                            {{alias}}{% if not forloop.last %},{% endif %}
+                        </dd>
+                    {% endfor %}
                 </div>
                 {% endif %}
                 {% if author.born %}
@@ -54,25 +54,24 @@
             </dl>
 
             {% if author.wikipedia_link %}
-            <p>
-                <link itemprop="sameAs" href="{{ author.wikipedia_link }}" />
-                <a href="{{ author.wikipedia_link }}" rel=�noopener� target="_blank">
+            <p class="mt-1">
+                <a itemprop="sameAs" href="{{ author.wikipedia_link }}" rel=�noopener� target="_blank">
                     {% trans "Wikipedia" %}
                 </a>
             </p>
             {% endif %}
+            
             {% if author.openlibrary_key %}
-            <p class="mb-0">
-                <link itemprop="sameAs" href="https://openlibrary.org/authors/{{ author.openlibrary_key }}" />
-                <a href="https://openlibrary.org/authors/{{ author.openlibrary_key }}" target="_blank" rel="noopener">
+            <p class="mt-1">
+                <a itemprop="sameAs" href="https://openlibrary.org/authors/{{ author.openlibrary_key }}" target="_blank" rel="noopener">
                     {% trans "View on OpenLibrary" %}
                 </a>
             </p>
             {% endif %}
+            
             {% if author.inventaire_id %}
-            <p class="mb-0">
-                <link itemprop="sameAs" href="https://inventaire.io/entity/{{ author.inventaire_id }}" />
-                <a href="https://inventaire.io/entity/{{ author.inventaire_id }}" target="_blank" rel="noopener">
+            <p class="mt-1">
+                <a itemprop="sameAs" href="https://inventaire.io/entity/{{ author.inventaire_id }}" target="_blank" rel="noopener">
                     {% trans "View on Inventaire" %}
                 </a>
             </p>

From 594f7b370875e6f469c2c84fc075c0ee8ff87347 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 24 May 2021 12:51:18 +0200
Subject: [PATCH 1222/1285] Style fixes

---
 bookwyrm/templates/author/author.html | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html
index de7d230f..1d317492 100644
--- a/bookwyrm/templates/author/author.html
+++ b/bookwyrm/templates/author/author.html
@@ -26,43 +26,43 @@
     <meta itemprop="name" content="{{ author.name }}">
 
     {% if author.aliases or author.born or author.died or author.wikipedia_link or author.openlibrary_key or author.inventaire_id %}
-    <div class="column is-narrow">
+    <div class="column is-two-fifths">
         <div class="box">
             <dl>
                 {% if author.aliases %}
-                <div class="is-flex">
-                    <dt class="mr-1">{% trans "Aliases:" %}</dt>
+                <div class="is-flex is-flex-wrap-wrap mb-2">
+                    <dt class="has-text-weight-bold mr-1">{% trans "Aliases:" %}</dt>
                     {% for alias in author.aliases %}
                         <dd itemprop="alternateName" content="{{alias}}">
-                            {{alias}}{% if not forloop.last %},{% endif %}
+                            {{alias}}{% if not forloop.last %},&nbsp;{% endif %}
                         </dd>
                     {% endfor %}
                 </div>
                 {% endif %}
                 {% if author.born %}
-                <div class="is-flex">
-                    <dt class="mr-1">{% trans "Born:" %}</dt>
+                <div class="is-flex mb-2">
+                    <dt class="has-text-weight-bold mr-1">{% trans "Born:" %}</dt>
                     <dd itemprop="birthDate">{{ author.born|naturalday }}</dd>
                 </div>
                 {% endif %}
                 {% if author.died %}
-                <div class="is-flex">
-                    <dt class="mr-1">{% trans "Died:" %}</dt>
+                <div class="is-flex mb-2">
+                    <dt class="has-text-weight-bold mr-1">{% trans "Died:" %}</dt>
                     <dd itemprop="deathDate">{{ author.died|naturalday }}</dd>
                 </div>
                 {% endif %}
             </dl>
 
             {% if author.wikipedia_link %}
-            <p class="mt-1">
+            <p class="mb-1">
                 <a itemprop="sameAs" href="{{ author.wikipedia_link }}" rel=�noopener� target="_blank">
                     {% trans "Wikipedia" %}
                 </a>
             </p>
             {% endif %}
-            
+
             {% if author.openlibrary_key %}
-            <p class="mt-1">
+            <p class="mb-1">
                 <a itemprop="sameAs" href="https://openlibrary.org/authors/{{ author.openlibrary_key }}" target="_blank" rel="noopener">
                     {% trans "View on OpenLibrary" %}
                 </a>
@@ -70,7 +70,7 @@
             {% endif %}
             
             {% if author.inventaire_id %}
-            <p class="mt-1">
+            <p class="mb-1">
                 <a itemprop="sameAs" href="https://inventaire.io/entity/{{ author.inventaire_id }}" target="_blank" rel="noopener">
                     {% trans "View on Inventaire" %}
                 </a>

From 25858ed3aa5da7e9f41281d9590faff31fe8e29a Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 24 May 2021 12:51:41 +0200
Subject: [PATCH 1223/1285] Added LibraryThing and Goodreads links

---
 bookwyrm/templates/author/author.html | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html
index 1d317492..9b3c637e 100644
--- a/bookwyrm/templates/author/author.html
+++ b/bookwyrm/templates/author/author.html
@@ -76,6 +76,22 @@
                 </a>
             </p>
             {% endif %}
+
+            {% if author.librarything_key %}
+            <p class="mb-1">
+                <a itemprop="sameAs" href="https://www.librarything.com/author/{{ author.librarything_key }}" target="_blank" rel="noopener">
+                    {% trans "View on LibraryThing" %}
+                </a>
+            </p>
+            {% endif %}
+            
+            {% if author.goodreads_key %}
+            <p class="mb-1">
+                <a itemprop="sameAs" href="https://www.goodreads.com/author/show/{{ author.goodreads_key }}" target="_blank" rel="noopener">
+                    {% trans "View on Goodreads" %}
+                </a>
+            </p>
+            {% endif %}
         </div>
     </div>
     {% endif %}

From f058aa8f1d4ca28b86d08d539232ab609770ed4f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 24 May 2021 06:54:43 -0700
Subject: [PATCH 1224/1285] Uses correct filter for book title

---
 bookwyrm/templates/book/book.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index df76d8e1..af223020 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -1,7 +1,7 @@
 {% extends 'layout.html' %}
 {% load i18n %}{% load bookwyrm_tags %}{% load humanize %}{% load utilities %}
 
-{% block title %}{{ book|title }}{% endblock %}
+{% block title %}{{ book|book_title }}{% endblock %}
 
 {% block content %}
 {% with user_authenticated=request.user.is_authenticated can_edit_book=perms.bookwyrm.edit_book %}

From b72580daf61ff0dd22dd05ad8ecbabe92301b3b4 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 24 May 2021 17:17:12 +0200
Subject: [PATCH 1225/1285] Update author.html

---
 bookwyrm/templates/author/author.html | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html
index 9b3c637e..f4f308f2 100644
--- a/bookwyrm/templates/author/author.html
+++ b/bookwyrm/templates/author/author.html
@@ -27,10 +27,10 @@
 
     {% if author.aliases or author.born or author.died or author.wikipedia_link or author.openlibrary_key or author.inventaire_id %}
     <div class="column is-two-fifths">
-        <div class="box">
+        <div class="box py-2">
             <dl>
                 {% if author.aliases %}
-                <div class="is-flex is-flex-wrap-wrap mb-2">
+                <div class="is-flex is-flex-wrap-wrap my-1">
                     <dt class="has-text-weight-bold mr-1">{% trans "Aliases:" %}</dt>
                     {% for alias in author.aliases %}
                         <dd itemprop="alternateName" content="{{alias}}">
@@ -39,14 +39,16 @@
                     {% endfor %}
                 </div>
                 {% endif %}
+
                 {% if author.born %}
-                <div class="is-flex mb-2">
+                <div class="is-flex my-1">
                     <dt class="has-text-weight-bold mr-1">{% trans "Born:" %}</dt>
                     <dd itemprop="birthDate">{{ author.born|naturalday }}</dd>
                 </div>
                 {% endif %}
+
                 {% if author.died %}
-                <div class="is-flex mb-2">
+                <div class="is-flex my-1">
                     <dt class="has-text-weight-bold mr-1">{% trans "Died:" %}</dt>
                     <dd itemprop="deathDate">{{ author.died|naturalday }}</dd>
                 </div>
@@ -54,7 +56,7 @@
             </dl>
 
             {% if author.wikipedia_link %}
-            <p class="mb-1">
+            <p class="my-1">
                 <a itemprop="sameAs" href="{{ author.wikipedia_link }}" rel=�noopener� target="_blank">
                     {% trans "Wikipedia" %}
                 </a>
@@ -62,7 +64,7 @@
             {% endif %}
 
             {% if author.openlibrary_key %}
-            <p class="mb-1">
+            <p class="my-1">
                 <a itemprop="sameAs" href="https://openlibrary.org/authors/{{ author.openlibrary_key }}" target="_blank" rel="noopener">
                     {% trans "View on OpenLibrary" %}
                 </a>
@@ -70,7 +72,7 @@
             {% endif %}
             
             {% if author.inventaire_id %}
-            <p class="mb-1">
+            <p class="my-1">
                 <a itemprop="sameAs" href="https://inventaire.io/entity/{{ author.inventaire_id }}" target="_blank" rel="noopener">
                     {% trans "View on Inventaire" %}
                 </a>
@@ -78,7 +80,7 @@
             {% endif %}
 
             {% if author.librarything_key %}
-            <p class="mb-1">
+            <p class="my-1">
                 <a itemprop="sameAs" href="https://www.librarything.com/author/{{ author.librarything_key }}" target="_blank" rel="noopener">
                     {% trans "View on LibraryThing" %}
                 </a>
@@ -86,7 +88,7 @@
             {% endif %}
             
             {% if author.goodreads_key %}
-            <p class="mb-1">
+            <p class="my-1">
                 <a itemprop="sameAs" href="https://www.goodreads.com/author/show/{{ author.goodreads_key }}" target="_blank" rel="noopener">
                     {% trans "View on Goodreads" %}
                 </a>

From da63606c0ea471d571a847553ed39aa6fe2b6c8b Mon Sep 17 00:00:00 2001
From: reese <reesedporter@gmail.com>
Date: Mon, 24 May 2021 21:00:58 -0500
Subject: [PATCH 1226/1285] translated new translations

---
 locale/es/LC_MESSAGES/django.mo | Bin 40665 -> 43765 bytes
 locale/es/LC_MESSAGES/django.po | 457 +++++++++++---------------------
 2 files changed, 151 insertions(+), 306 deletions(-)

diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index 1377b50921ff631bb3fced41caf49a3579a7d17f..0e5df226ff94914032c35b735f32bebe7ae3630e 100644
GIT binary patch
delta 15520
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
Fe*gqXKI#Af

delta 12870
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

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 4f60dfb8..cbf07ea5 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 14:40-0700\n"
+"POT-Creation-Date: 2021-05-25 01:44+0000\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -56,12 +56,12 @@ msgid "Book Title"
 msgstr "Título"
 
 #: bookwyrm/forms.py:301 bookwyrm/templates/snippets/create_status_form.html:34
-#: bookwyrm/templates/user/shelf/shelf.html:84
-#: bookwyrm/templates/user/shelf/shelf.html:115
+#: bookwyrm/templates/user/shelf/shelf.html:85
+#: bookwyrm/templates/user/shelf/shelf.html:116
 msgid "Rating"
 msgstr "Calificación"
 
-#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:101
+#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:107
 msgid "Sort By"
 msgstr "Ordenar por"
 
@@ -83,7 +83,7 @@ msgstr "%(value)s no es un remote_id válido"
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s no es un usuario válido"
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:155
+#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:152
 msgid "username"
 msgstr "nombre de usuario"
 
@@ -139,15 +139,15 @@ msgstr "Editar Autor/Autora"
 #: bookwyrm/templates/author/author.html:32
 #: bookwyrm/templates/author/edit_author.html:38
 msgid "Aliases:"
-msgstr ""
+msgstr "Aliases:"
 
 #: bookwyrm/templates/author/author.html:38
 msgid "Born:"
-msgstr ""
+msgstr "Nacido:"
 
 #: bookwyrm/templates/author/author.html:44
 msgid "Died:"
-msgstr ""
+msgstr "Muerto:"
 
 #: bookwyrm/templates/author/author.html:51
 msgid "Wikipedia"
@@ -160,10 +160,8 @@ msgstr "Ver en OpenLibrary"
 
 #: bookwyrm/templates/author/author.html:60
 #: bookwyrm/templates/book/book.html:81
-#, fuzzy
-#| msgid "View on OpenLibrary"
 msgid "View on Inventaire"
-msgstr "Ver en OpenLibrary"
+msgstr "Ver en Inventaire"
 
 #: bookwyrm/templates/author/author.html:74
 #, python-format
@@ -205,10 +203,8 @@ msgstr "Nombre:"
 #: bookwyrm/templates/book/edit_book.html:132
 #: bookwyrm/templates/book/edit_book.html:141
 #: bookwyrm/templates/book/edit_book.html:178
-#, fuzzy
-#| msgid "Separate multiple publishers with commas."
 msgid "Separate multiple values with commas."
-msgstr "Separar varios editores con comas."
+msgstr "Separar varios valores con comas."
 
 #: bookwyrm/templates/author/edit_author.html:46
 msgid "Bio:"
@@ -236,10 +232,8 @@ msgstr "Clave OpenLibrary:"
 
 #: bookwyrm/templates/author/edit_author.html:79
 #: bookwyrm/templates/book/edit_book.html:243
-#, fuzzy
-#| msgid "View on OpenLibrary"
 msgid "Inventaire ID:"
-msgstr "Ver en OpenLibrary"
+msgstr "ID Inventaire:"
 
 #: bookwyrm/templates/author/edit_author.html:84
 msgid "Librarything key:"
@@ -254,7 +248,7 @@ msgstr "Clave Goodreads:"
 #: bookwyrm/templates/book/edit_book.html:263
 #: bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
-#: bookwyrm/templates/settings/announcement_form.html:65
+#: bookwyrm/templates/settings/announcement_form.html:69
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:98
 #: bookwyrm/templates/settings/site.html:97
@@ -350,28 +344,20 @@ msgid "You don't have any reading activity for this book."
 msgstr "No tienes ninguna actividad de lectura para este libro."
 
 #: bookwyrm/templates/book/book.html:200
-#, fuzzy
-#| msgid "Review"
 msgid "Reviews"
-msgstr "Reseña"
+msgstr "Reseñas"
 
 #: bookwyrm/templates/book/book.html:205
-#, fuzzy
-#| msgid "Your shelves"
 msgid "Your reviews"
-msgstr "Tus estantes"
+msgstr "Tus reseñas"
 
 #: bookwyrm/templates/book/book.html:211
-#, fuzzy
-#| msgid "Your Account"
 msgid "Your comments"
-msgstr "Tu cuenta"
+msgstr "Tus comentarios"
 
 #: bookwyrm/templates/book/book.html:217
-#, fuzzy
-#| msgid "Your books"
 msgid "Your quotes"
-msgstr "Tus libros"
+msgstr "Tus citas"
 
 #: bookwyrm/templates/book/book.html:253
 msgid "Subjects"
@@ -381,7 +367,7 @@ msgstr "Sujetos"
 msgid "Places"
 msgstr "Lugares"
 
-#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:61
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
@@ -395,7 +381,7 @@ msgstr "Agregar a lista"
 
 #: bookwyrm/templates/book/book.html:297
 #: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:164
+#: bookwyrm/templates/lists/list.html:179
 msgid "Add"
 msgstr "Agregar"
 
@@ -492,10 +478,8 @@ msgid "Series number:"
 msgstr "Número de serie:"
 
 #: bookwyrm/templates/book/edit_book.html:130
-#, fuzzy
-#| msgid "Language:"
 msgid "Languages:"
-msgstr "Idioma:"
+msgstr "Idiomas:"
 
 #: bookwyrm/templates/book/edit_book.html:139
 msgid "Publisher:"
@@ -527,7 +511,7 @@ msgid "John Doe, Jane Smith"
 msgstr "Juan Nadie, Natalia Natalia"
 
 #: bookwyrm/templates/book/edit_book.html:183
-#: bookwyrm/templates/user/shelf/shelf.html:77
+#: bookwyrm/templates/user/shelf/shelf.html:78
 msgid "Cover"
 msgstr "Portada:"
 
@@ -557,10 +541,8 @@ msgid "ISBN 10:"
 msgstr "ISBN 10:"
 
 #: bookwyrm/templates/book/edit_book.html:238
-#, fuzzy
-#| msgid "Openlibrary key:"
 msgid "Openlibrary ID:"
-msgstr "Clave OpenLibrary:"
+msgstr "ID OpenLibrary:"
 
 #: bookwyrm/templates/book/editions.html:4
 #, python-format
@@ -648,7 +630,7 @@ msgstr "Comunidad federalizada"
 
 #: bookwyrm/templates/directory/directory.html:4
 #: bookwyrm/templates/directory/directory.html:9
-#: bookwyrm/templates/layout.html:92
+#: bookwyrm/templates/layout.html:64
 msgid "Directory"
 msgstr "Directorio"
 
@@ -849,7 +831,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Mensajes directos con <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:87
+#: bookwyrm/templates/layout.html:92
 msgid "Direct Messages"
 msgstr "Mensajes directos"
 
@@ -905,7 +887,6 @@ msgid "Updates"
 msgstr "Actualizaciones"
 
 #: bookwyrm/templates/feed/feed_layout.html:10
-#: bookwyrm/templates/layout.html:58
 #: bookwyrm/templates/user/shelf/books_header.html:3
 msgid "Your books"
 msgstr "Tus libros"
@@ -960,7 +941,7 @@ msgid "What are you reading?"
 msgstr "¿Qué estás leyendo?"
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:120
+#: bookwyrm/templates/lists/list.html:135
 msgid "Search for a book"
 msgstr "Buscar libros"
 
@@ -980,7 +961,7 @@ msgstr "Puedes agregar libros cuando comiences a usar %(site_name)s."
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
 #: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
-#: bookwyrm/templates/lists/list.html:124
+#: bookwyrm/templates/lists/list.html:139
 #: bookwyrm/templates/search/layout.html:4
 #: bookwyrm/templates/search/layout.html:9
 msgid "Search"
@@ -996,7 +977,7 @@ msgid "Popular on %(site_name)s"
 msgstr "Popular en %(site_name)s"
 
 #: bookwyrm/templates/get_started/books.html:58
-#: bookwyrm/templates/lists/list.html:137
+#: bookwyrm/templates/lists/list.html:152
 msgid "No books found"
 msgstr "No se encontró ningún libro"
 
@@ -1108,7 +1089,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "Los libros de %(username)s para %(year)s"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/layout.html:97
+#: bookwyrm/templates/user/shelf/shelf.html:40
 msgid "Import Books"
 msgstr "Importar libros"
 
@@ -1193,14 +1174,14 @@ msgstr "Libro"
 
 #: bookwyrm/templates/import_status.html:114
 #: bookwyrm/templates/snippets/create_status_form.html:13
-#: bookwyrm/templates/user/shelf/shelf.html:78
-#: bookwyrm/templates/user/shelf/shelf.html:98
+#: bookwyrm/templates/user/shelf/shelf.html:79
+#: bookwyrm/templates/user/shelf/shelf.html:99
 msgid "Title"
 msgstr "Título"
 
 #: bookwyrm/templates/import_status.html:117
-#: bookwyrm/templates/user/shelf/shelf.html:79
-#: bookwyrm/templates/user/shelf/shelf.html:101
+#: bookwyrm/templates/user/shelf/shelf.html:80
+#: bookwyrm/templates/user/shelf/shelf.html:102
 msgid "Author"
 msgstr "Autor/Autora"
 
@@ -1242,15 +1223,19 @@ msgstr "Buscar un libro o un usuario"
 msgid "Main navigation menu"
 msgstr "Menú de navigación central"
 
-#: bookwyrm/templates/layout.html:61
+#: bookwyrm/templates/layout.html:58
 msgid "Feed"
 msgstr "Actividad"
 
-#: bookwyrm/templates/layout.html:102
+#: bookwyrm/templates/layout.html:87
+msgid "Your Books"
+msgstr "Tus libros"
+
+#: bookwyrm/templates/layout.html:97
 msgid "Settings"
 msgstr "Configuración"
 
-#: bookwyrm/templates/layout.html:111
+#: bookwyrm/templates/layout.html:106
 #: bookwyrm/templates/settings/admin_layout.html:31
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
@@ -1258,40 +1243,40 @@ msgstr "Configuración"
 msgid "Invites"
 msgstr "Invitaciones"
 
-#: bookwyrm/templates/layout.html:118
+#: bookwyrm/templates/layout.html:113
 msgid "Admin"
 msgstr "Admin"
 
-#: bookwyrm/templates/layout.html:125
+#: bookwyrm/templates/layout.html:120
 msgid "Log out"
 msgstr "Cerrar sesión"
 
-#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
+#: bookwyrm/templates/layout.html:128 bookwyrm/templates/layout.html:129
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: bookwyrm/templates/layout.html:154 bookwyrm/templates/layout.html:158
+#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "Nombre de usuario:"
 
-#: bookwyrm/templates/layout.html:159
+#: bookwyrm/templates/layout.html:156
 msgid "password"
 msgstr "contraseña"
 
-#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr "¿Olvidaste tu contraseña?"
 
-#: bookwyrm/templates/layout.html:163 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "Iniciar sesión"
 
-#: bookwyrm/templates/layout.html:171
+#: bookwyrm/templates/layout.html:168
 msgid "Join"
 msgstr "Unirse"
 
@@ -1304,8 +1289,6 @@ msgid "Contact site admin"
 msgstr "Contactarse con administradores del sitio"
 
 #: bookwyrm/templates/layout.html:214
-#, fuzzy
-#| msgid "Django Documentation"
 msgid "Documentation"
 msgstr "Documentación de Django"
 
@@ -1358,7 +1341,7 @@ msgid "Discard"
 msgstr "Desechar"
 
 #: bookwyrm/templates/lists/edit_form.html:5
-#: bookwyrm/templates/lists/list_layout.html:17
+#: bookwyrm/templates/lists/list_layout.html:16
 msgid "Edit List"
 msgstr "Editar lista"
 
@@ -1395,66 +1378,65 @@ msgstr "Cualquer usuario puede agregar libros a esta lista"
 
 #: bookwyrm/templates/lists/list.html:20
 msgid "You successfully suggested a book for this list!"
-msgstr ""
+msgstr "¡Has sugerido un libro para esta lista exitosamente!"
 
 #: bookwyrm/templates/lists/list.html:22
-#, fuzzy
-#| msgid "Anyone can add books to this list"
 msgid "You successfully added a book to this list!"
-msgstr "Cualquer usuario puede agregar libros a esta lista"
+msgstr "¡Has agregado un libro a esta lista exitosamente!"
 
 #: bookwyrm/templates/lists/list.html:28
 msgid "This list is currently empty"
 msgstr "Esta lista está vacia"
 
-#: bookwyrm/templates/lists/list.html:65
+#: bookwyrm/templates/lists/list.html:66
 #, python-format
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "Agregado por <a href=\"%(user_path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/lists/list.html:77
-msgid "Set"
-msgstr "Establecido"
-
-#: bookwyrm/templates/lists/list.html:80
+#: bookwyrm/templates/lists/list.html:74
 msgid "List position"
 msgstr "Posición"
 
-#: bookwyrm/templates/lists/list.html:86
+#: bookwyrm/templates/lists/list.html:81
+msgid "Set"
+msgstr "Establecido"
+
+#: bookwyrm/templates/lists/list.html:89
 #: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr "Quitar"
 
-#: bookwyrm/templates/lists/list.html:99 bookwyrm/templates/lists/list.html:111
+#: bookwyrm/templates/lists/list.html:103
+#: bookwyrm/templates/lists/list.html:120
 msgid "Sort List"
 msgstr "Ordena la lista"
 
-#: bookwyrm/templates/lists/list.html:105
+#: bookwyrm/templates/lists/list.html:113
 msgid "Direction"
 msgstr "Dirección"
 
-#: bookwyrm/templates/lists/list.html:116
+#: bookwyrm/templates/lists/list.html:127
 msgid "Add Books"
 msgstr "Agregar libros"
 
-#: bookwyrm/templates/lists/list.html:116
+#: bookwyrm/templates/lists/list.html:129
 msgid "Suggest Books"
 msgstr "Sugerir libros"
 
-#: bookwyrm/templates/lists/list.html:125
+#: bookwyrm/templates/lists/list.html:140
 msgid "search"
 msgstr "buscar"
 
-#: bookwyrm/templates/lists/list.html:131
+#: bookwyrm/templates/lists/list.html:146
 msgid "Clear search"
 msgstr "Borrar búsqueda"
 
-#: bookwyrm/templates/lists/list.html:136
+#: bookwyrm/templates/lists/list.html:151
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
 msgstr "No se encontró ningún libro correspondiente a la búsqueda: \"%(query)s\""
 
-#: bookwyrm/templates/lists/list.html:164
+#: bookwyrm/templates/lists/list.html:179
 msgid "Suggest"
 msgstr "Sugerir"
 
@@ -1573,13 +1555,11 @@ msgstr "Borrar notificaciones"
 
 #: bookwyrm/templates/notifications.html:25
 msgid "All"
-msgstr ""
+msgstr "Todas"
 
 #: bookwyrm/templates/notifications.html:29
-#, fuzzy
-#| msgid "More options"
 msgid "Mentions"
-msgstr "Más opciones"
+msgstr "Menciones"
 
 #: bookwyrm/templates/notifications.html:70
 #, python-format
@@ -1680,10 +1660,8 @@ msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> t
 msgstr " sugirió agregar <em><a href=\"%(book_path)s\">%(book_title)s</a></em> a tu lista \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 
 #: bookwyrm/templates/notifications.html:128
-#, fuzzy, python-format
-#| msgid "Your <a href=\"/import/%(related_id)s\">import</a> completed."
 msgid "Your <a href=\"%(url)s\">import</a> completed."
-msgstr "Tu <a href=\"/import/%(related_id)s\">importación</a> ha terminado."
+msgstr "Tu <a href=\"%(url)s\">importación</a> ha terminado."
 
 #: bookwyrm/templates/notifications.html:131
 #, python-format
@@ -1758,31 +1736,45 @@ msgstr "Perfil"
 msgid "Relationships"
 msgstr "Relaciones"
 
+#: bookwyrm/templates/rss/title.html:5
+#: bookwyrm/templates/snippets/status/status_header.html:35
+msgid "rated"
+msgstr "calificó"
+
+#: bookwyrm/templates/rss/title.html:7
+#: bookwyrm/templates/snippets/status/status_header.html:37
+msgid "reviewed"
+msgstr "reseñó"
+
+#: bookwyrm/templates/rss/title.html:9
+#: bookwyrm/templates/snippets/status/status_header.html:39
+msgid "commented on"
+msgstr "comentó en"
+
+#: bookwyrm/templates/rss/title.html:11
+#: bookwyrm/templates/snippets/status/status_header.html:41
+msgid "quoted"
+msgstr "citó"
+
 #: bookwyrm/templates/search/book.html:64
-#, fuzzy
-#| msgid "Show results from other catalogues"
 msgid "Load results from other catalogues"
-msgstr "Mostrar resultados de otros catálogos"
+msgstr "Cargar resultados de otros catálogos"
 
 #: bookwyrm/templates/search/book.html:68
 msgid "Manually add book"
-msgstr ""
+msgstr "Agregar libro a mano"
 
 #: bookwyrm/templates/search/book.html:73
 msgid "Log in to import or add books."
-msgstr ""
+msgstr "Iniciar una sesión para importar o agregar libros"
 
 #: bookwyrm/templates/search/layout.html:16
-#, fuzzy
-#| msgid "Search for a user"
 msgid "Search query"
-msgstr "Buscar un usuario"
+msgstr "Búsqueda"
 
 #: bookwyrm/templates/search/layout.html:19
-#, fuzzy
-#| msgid "Search"
 msgid "Search type"
-msgstr "Buscar"
+msgstr "Tipo de búsqueda"
 
 #: bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
@@ -1799,10 +1791,8 @@ msgid "Users"
 msgstr "Usuarios"
 
 #: bookwyrm/templates/search/layout.html:58
-#, fuzzy, python-format
-#| msgid "No lists found for \"%(query)s\""
 msgid "No results found for \"%(query)s\""
-msgstr "No se encontró ningúna lista correspondiente a \"%(query)s\""
+msgstr "No se encontró ningún resultado correspondiente a \"%(query)s\""
 
 #: bookwyrm/templates/settings/admin_layout.html:4
 msgid "Administration"
@@ -1856,23 +1846,18 @@ msgstr "Registración"
 
 #: bookwyrm/templates/settings/announcement.html:3
 #: bookwyrm/templates/settings/announcement.html:6
-#, fuzzy
-#| msgid "Announcements"
 msgid "Announcement"
-msgstr "Anuncios"
+msgstr "Anuncio"
 
 #: bookwyrm/templates/settings/announcement.html:7
 #: bookwyrm/templates/settings/federated_server.html:13
-#, fuzzy
-#| msgid "Back to server list"
 msgid "Back to list"
 msgstr "Volver a la lista de servidores"
 
 #: bookwyrm/templates/settings/announcement.html:11
-#, fuzzy
-#| msgid "Announcements"
+#: bookwyrm/templates/settings/announcement_form.html:6
 msgid "Edit Announcement"
-msgstr "Anuncios"
+msgstr "Editar anuncio"
 
 #: bookwyrm/templates/settings/announcement.html:20
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
@@ -1882,64 +1867,48 @@ msgstr "Eliminar"
 
 #: bookwyrm/templates/settings/announcement.html:35
 msgid "Visible:"
-msgstr ""
+msgstr "Visible:"
 
 #: bookwyrm/templates/settings/announcement.html:38
 msgid "True"
-msgstr ""
+msgstr "Verdadero"
 
 #: bookwyrm/templates/settings/announcement.html:40
 msgid "False"
-msgstr ""
+msgstr "Falso"
 
 #: bookwyrm/templates/settings/announcement.html:47
-#, fuzzy
-#| msgid "Birth date:"
 msgid "Start date:"
-msgstr "Fecha de nacimiento:"
+msgstr "Fecha de inicio:"
 
 #: bookwyrm/templates/settings/announcement.html:54
-#, fuzzy
-#| msgid "Birth date:"
 msgid "End date:"
-msgstr "Fecha de nacimiento:"
+msgstr "Fecha final:"
 
 #: bookwyrm/templates/settings/announcement.html:60
-#, fuzzy
-#| msgid "Active"
 msgid "Active:"
-msgstr "Activ@"
+msgstr "Activ@:"
 
-#: bookwyrm/templates/settings/announcement_form.html:5
+#: bookwyrm/templates/settings/announcement_form.html:8
 #: bookwyrm/templates/settings/announcements.html:8
-#, fuzzy
-#| msgid "Announcements"
 msgid "Create Announcement"
-msgstr "Anuncios"
+msgstr "Crear anuncio"
 
 #: bookwyrm/templates/settings/announcements.html:22
-#, fuzzy
-#| msgid "Date Added"
 msgid "Date added"
 msgstr "Fecha agregada"
 
 #: bookwyrm/templates/settings/announcements.html:26
-#, fuzzy
-#| msgid "reviewed"
 msgid "Preview"
-msgstr "reseñó"
+msgstr "Vista preliminar"
 
 #: bookwyrm/templates/settings/announcements.html:30
-#, fuzzy
-#| msgid "Started"
 msgid "Start date"
-msgstr "Empezado"
+msgstr "Fecha de inicio"
 
 #: bookwyrm/templates/settings/announcements.html:34
-#, fuzzy
-#| msgid "Edit read dates"
 msgid "End date"
-msgstr "Editar fechas de lectura"
+msgstr "Fecha final"
 
 #: bookwyrm/templates/settings/announcements.html:38
 #: bookwyrm/templates/settings/federation.html:30
@@ -1950,16 +1919,12 @@ msgid "Status"
 msgstr "Status"
 
 #: bookwyrm/templates/settings/announcements.html:48
-#, fuzzy
-#| msgid "Inactive"
 msgid "active"
-msgstr "Inactiv@"
+msgstr "activo"
 
 #: bookwyrm/templates/settings/announcements.html:48
-#, fuzzy
-#| msgid "Inactive"
 msgid "inactive"
-msgstr "Inactiv@"
+msgstr "inactivo"
 
 #: bookwyrm/templates/settings/edit_server.html:3
 #: bookwyrm/templates/settings/edit_server.html:6
@@ -2202,7 +2167,7 @@ msgid "Import Blocklist"
 msgstr "Importar lista de bloqueo"
 
 #: bookwyrm/templates/settings/server_blocklist.html:26
-#: bookwyrm/templates/snippets/goal_progress.html:5
+#: bookwyrm/templates/snippets/goal_progress.html:7
 msgid "Success!"
 msgstr "¡Meta logrado!"
 
@@ -2260,7 +2225,7 @@ msgstr "Correo electrónico de administradorx:"
 
 #: bookwyrm/templates/settings/site.html:73
 msgid "Additional info:"
-msgstr ""
+msgstr "Más informacion:"
 
 #: bookwyrm/templates/settings/site.html:83
 msgid "Allow registration:"
@@ -2275,10 +2240,8 @@ msgid "Registration closed text:"
 msgstr "Texto de registración cerrada:"
 
 #: bookwyrm/templates/snippets/announcement.html:31
-#, fuzzy, python-format
-#| msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgid "Posted by <a href=\"%(user_path)s\">%(username)s</a>"
-msgstr "Agregado por <a href=\"%(user_path)s\">%(username)s</a>"
+msgstr "Publicado por <a href=\"%(user_path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/snippets/book_cover.html:31
 msgid "No cover"
@@ -2289,19 +2252,15 @@ msgstr "Sin portada"
 msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgstr "<a href=\"%(path)s\">%(title)s</a> por "
 
-#: bookwyrm/templates/snippets/boost_button.html:9
-#: bookwyrm/templates/snippets/boost_button.html:10
-#, fuzzy
-#| msgid "boosted"
+#: bookwyrm/templates/snippets/boost_button.html:20
+#: bookwyrm/templates/snippets/boost_button.html:21
 msgid "Boost"
-msgstr "respaldó"
+msgstr "Respaldar"
 
-#: bookwyrm/templates/snippets/boost_button.html:16
-#: bookwyrm/templates/snippets/boost_button.html:17
-#, fuzzy
-#| msgid "Un-boost status"
+#: bookwyrm/templates/snippets/boost_button.html:33
+#: bookwyrm/templates/snippets/boost_button.html:34
 msgid "Un-boost"
-msgstr "Status de des-respaldo"
+msgstr "Des-respaldar"
 
 #: bookwyrm/templates/snippets/content_warning_field.html:3
 msgid "Spoiler alert:"
@@ -2339,10 +2298,8 @@ msgid "Reply"
 msgstr "Respuesta"
 
 #: bookwyrm/templates/snippets/create_status_form.html:56
-#, fuzzy
-#| msgid "Footer Content"
 msgid "Content"
-msgstr "Contenido del pie de página"
+msgstr "Contenido"
 
 #: bookwyrm/templates/snippets/create_status_form.html:80
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
@@ -2391,17 +2348,15 @@ msgstr "¿Eliminar estas fechas de lectura?"
 msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr "Estás eliminando esta lectura y sus %(count)s actualizaciones de progreso asociados."
 
-#: bookwyrm/templates/snippets/fav_button.html:9
-#: bookwyrm/templates/snippets/fav_button.html:11
+#: bookwyrm/templates/snippets/fav_button.html:10
+#: bookwyrm/templates/snippets/fav_button.html:12
 msgid "Like"
-msgstr ""
+msgstr "Me gusta"
 
-#: bookwyrm/templates/snippets/fav_button.html:17
 #: bookwyrm/templates/snippets/fav_button.html:18
-#, fuzzy
-#| msgid "Un-like status"
+#: bookwyrm/templates/snippets/fav_button.html:19
 msgid "Un-like"
-msgstr "Quitar me gusta de status"
+msgstr "Quitar me gusta"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:7
 msgid "Show filters"
@@ -2440,6 +2395,14 @@ msgstr "Aceptar"
 msgid "No rating"
 msgstr "No calificación"
 
+#: bookwyrm/templates/snippets/form_rate_stars.html:44
+#: bookwyrm/templates/snippets/stars.html:7
+#, python-format
+msgid "%(rating)s star"
+msgid_plural "%(rating)s stars"
+msgstr[0] "%(rating)s estrella"
+msgstr[1] "%(rating)s estrellas"
+
 #: bookwyrm/templates/snippets/generated_status/goal.html:1
 #, python-format
 msgid "set a goal to read %(counter)s book in %(year)s"
@@ -2494,17 +2457,17 @@ msgstr "Compartir con tu feed"
 msgid "Set goal"
 msgstr "Establecer meta"
 
-#: bookwyrm/templates/snippets/goal_progress.html:7
+#: bookwyrm/templates/snippets/goal_progress.html:9
 #, python-format
 msgid "%(percent)s%% complete!"
 msgstr "%(percent)s%% terminado!"
 
-#: bookwyrm/templates/snippets/goal_progress.html:10
+#: bookwyrm/templates/snippets/goal_progress.html:12
 #, python-format
 msgid "You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
 msgstr "Has leído <a href=\"%(path)s\">%(read_count)s de %(goal_count)s libros</a>."
 
-#: bookwyrm/templates/snippets/goal_progress.html:12
+#: bookwyrm/templates/snippets/goal_progress.html:14
 #, python-format
 msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
 msgstr "%(username)s ha leído <a href=\"%(path)s\">%(read_count)s de %(goal_count)s libros</a>."
@@ -2515,8 +2478,6 @@ msgid "page %(page)s of %(total_pages)s"
 msgstr "página %(page)s de %(total_pages)s"
 
 #: bookwyrm/templates/snippets/page_text.html:6
-#, fuzzy, python-format
-#| msgid "page %(page)s"
 msgid "page %(page)s"
 msgstr "página %(pages)s"
 
@@ -2614,26 +2575,6 @@ msgstr "Inscribirse"
 msgid "Report"
 msgstr "Reportar"
 
-#: bookwyrm/templates/snippets/rss_title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:35
-msgid "rated"
-msgstr "calificó"
-
-#: bookwyrm/templates/snippets/rss_title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:37
-msgid "reviewed"
-msgstr "reseñó"
-
-#: bookwyrm/templates/snippets/rss_title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:39
-msgid "commented on"
-msgstr "comentó en"
-
-#: bookwyrm/templates/snippets/rss_title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:41
-msgid "quoted"
-msgstr "citó"
-
 #: bookwyrm/templates/snippets/search_result_text.html:36
 msgid "Import book"
 msgstr "Importar libro"
@@ -2706,7 +2647,7 @@ msgstr "Eliminar status"
 #: bookwyrm/templates/snippets/status/layout.html:51
 #: bookwyrm/templates/snippets/status/layout.html:52
 msgid "Boost status"
-msgstr "Status de respaldo"
+msgstr "Respaldar status"
 
 #: bookwyrm/templates/snippets/status/layout.html:55
 #: bookwyrm/templates/snippets/status/layout.html:56
@@ -2803,7 +2744,7 @@ msgstr "Editar estante"
 msgid "Update shelf"
 msgstr "Actualizar estante"
 
-#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:51
+#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:56
 msgid "All books"
 msgstr "Todos los libros"
 
@@ -2811,30 +2752,30 @@ msgstr "Todos los libros"
 msgid "Create shelf"
 msgstr "Crear estante"
 
-#: bookwyrm/templates/user/shelf/shelf.html:61
+#: bookwyrm/templates/user/shelf/shelf.html:62
 msgid "Edit shelf"
 msgstr "Editar estante"
 
-#: bookwyrm/templates/user/shelf/shelf.html:80
-#: bookwyrm/templates/user/shelf/shelf.html:104
+#: bookwyrm/templates/user/shelf/shelf.html:81
+#: bookwyrm/templates/user/shelf/shelf.html:105
 msgid "Shelved"
 msgstr "Archivado"
 
-#: bookwyrm/templates/user/shelf/shelf.html:81
-#: bookwyrm/templates/user/shelf/shelf.html:108
+#: bookwyrm/templates/user/shelf/shelf.html:82
+#: bookwyrm/templates/user/shelf/shelf.html:109
 msgid "Started"
 msgstr "Empezado"
 
-#: bookwyrm/templates/user/shelf/shelf.html:82
-#: bookwyrm/templates/user/shelf/shelf.html:111
+#: bookwyrm/templates/user/shelf/shelf.html:83
+#: bookwyrm/templates/user/shelf/shelf.html:112
 msgid "Finished"
 msgstr "Terminado"
 
-#: bookwyrm/templates/user/shelf/shelf.html:137
+#: bookwyrm/templates/user/shelf/shelf.html:138
 msgid "This shelf is empty."
 msgstr "Este estante está vacio."
 
-#: bookwyrm/templates/user/shelf/shelf.html:143
+#: bookwyrm/templates/user/shelf/shelf.html:144
 msgid "Delete shelf"
 msgstr "Eliminar estante"
 
@@ -2881,13 +2822,10 @@ msgid "%(counter)s following"
 msgstr "%(counter)s siguiendo"
 
 #: bookwyrm/templates/user/user_preview.html:26
-#, fuzzy, python-format
-#| msgid "%(mutuals)s follower you follow"
-#| msgid_plural "%(mutuals)s followers you follow"
 msgid "%(mutuals_display)s follower you follow"
 msgid_plural "%(mutuals_display)s followers you follow"
-msgstr[0] "%(mutuals)s seguidor que sigues"
-msgstr[1] "%(mutuals)s seguidores que sigues"
+msgstr[0] "%(mutuals_display)s seguidor que sigues"
+msgstr[1] "%(mutuals_display)s seguidores que sigues"
 
 #: bookwyrm/templates/user_admin/user.html:9
 msgid "Back to users"
@@ -2957,10 +2895,8 @@ msgid "Access level:"
 msgstr "Nivel de acceso:"
 
 #: bookwyrm/views/import_data.py:67
-#, fuzzy
-#| msgid "Enter a valid value."
 msgid "Not a valid csv file"
-msgstr "Ingrese un valor válido."
+msgstr "No un archivo csv válido"
 
 #: bookwyrm/views/password.py:32
 msgid "No user with that email address was found."
@@ -2981,7 +2917,6 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid "Show"
 #~ msgstr "Mostrar más"
 
-#, python-format
 #~ msgid "ambiguous option: %(option)s could match %(matches)s"
 #~ msgstr "opción ambiguo: %(option)s pudiera coincidir con %(matches)s"
 
@@ -3033,25 +2968,20 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid "Enter only digits separated by commas."
 #~ msgstr "Ingrese solo digitos separados por comas."
 
-#, python-format
 #~ msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 #~ msgstr "Asegura que este valor es %(limit_value)s (es %(show_value)s)."
 
-#, python-format
 #~ msgid "Ensure this value is less than or equal to %(limit_value)s."
 #~ msgstr "Asegura que este valor es menor que o iguala a %(limit_value)s."
 
-#, python-format
 #~ msgid "Ensure this value is greater than or equal to %(limit_value)s."
 #~ msgstr "Asegura que este valor es más que o que iguala a %(limit_value)s."
 
-#, python-format
 #~ msgid "Ensure this value has at least %(limit_value)d character (it has %(show_value)d)."
 #~ msgid_plural "Ensure this value has at least %(limit_value)d characters (it has %(show_value)d)."
 #~ msgstr[0] "Verifica que este valor tiene por lo menos %(limit_value)d carácter. (Tiene %(show_value)d).)"
 #~ msgstr[1] "Verifica que este valor tiene por lo menos %(limit_value)d caracteres. (Tiene %(show_value)d).)"
 
-#, python-format
 #~ msgid "Ensure this value has at most %(limit_value)d character (it has %(show_value)d)."
 #~ msgid_plural "Ensure this value has at most %(limit_value)d characters (it has %(show_value)d)."
 #~ msgstr[0] "Verifica que este valor tiene a lo sumo %(limit_value)d carácter. (Tiene %(show_value)d).)"
@@ -3060,26 +2990,22 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid "Enter a number."
 #~ msgstr "Ingrese un número."
 
-#, python-format
 #~ msgid "Ensure that there are no more than %(max)s digit in total."
 #~ msgid_plural "Ensure that there are no more than %(max)s digits in total."
 #~ msgstr[0] "Verifica que no hay más que %(max)s digito en total."
 #~ msgstr[1] "Verifica que no hay más que %(max)s digitos en total."
 
 #                         is 
-#, python-format
 #~ msgid "Ensure that there are no more than %(max)s decimal place."
 #~ msgid_plural "Ensure that there are no more than %(max)s decimal places."
 #~ msgstr[0] "Verifica que no hay más que %(max)s cifra decimal."
 #~ msgstr[1] "Verifica que no hay más que %(max)s cifras decimales."
 
-#, python-format
 #~ msgid "Ensure that there are no more than %(max)s digit before the decimal point."
 #~ msgid_plural "Ensure that there are no more than %(max)s digits before the decimal point."
 #~ msgstr[0] "Verifica que no hay más que %(max)s digito antes de la coma decimal."
 #~ msgstr[1] "Verifica que no hay más que %(max)s digitos antes de la coma decimal."
 
-#, python-format
 #~ msgid "File extension “%(extension)s� is not allowed. Allowed extensions are: %(allowed_extensions)s."
 #~ msgstr "No se permite la extensión de archivo “%(extension)s�. Extensiones permitidas son: %(allowed_extensions)s."
 
@@ -3089,11 +3015,9 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid "and"
 #~ msgstr "y"
 
-#, python-format
 #~ msgid "%(model_name)s with this %(field_labels)s already exists."
 #~ msgstr "Ya existe %(model_name)s con este %(field_labels)s."
 
-#, python-format
 #~ msgid "Value %(value)r is not a valid choice."
 #~ msgstr "El valor %(value)s no es una opción válida."
 
@@ -3103,67 +3027,56 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid "This field cannot be blank."
 #~ msgstr "Este campo no puede ser vacio."
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "%(model_name)s with this %(field_label)s already exists."
 #~ msgid "%(model_name)s with this %(field_label)s already exists."
 #~ msgstr "Ya existe %(model_name)s con este %(field_labels)s."
 
-#, python-format
 #~ msgid "%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
 #~ msgstr "%(field_label)s deben ser unicos por %(date_field_label)s %(lookup_type)s."
 
-#, python-format
 #~ msgid "Field of type: %(field_type)s"
 #~ msgstr "Campo de tipo: %(field_type)s"
 
-#, python-format
 #~ msgid "“%(value)s� value must be either True or False."
 #~ msgstr "“%(value)s� valor debe ser o verdadero o falso."
 
-#, python-format
 #~ msgid "“%(value)s� value must be either True, False, or None."
 #~ msgstr "%(value)s� valor debe ser o True, False, o None."
 
 #~ msgid "Boolean (Either True or False)"
 #~ msgstr "Booleano (O True O False)"
 
-#, python-format
 #~ msgid "String (up to %(max_length)s)"
 #~ msgstr "Cadena (máximo de %(max_length)s caracteres)"
 
 #~ msgid "Comma-separated integers"
 #~ msgstr "Enteros separados por comas"
 
-#, python-format
 #~ msgid "“%(value)s� value has an invalid date format. It must be in YYYY-MM-DD format."
 #~ msgstr "“%(value)s� valor tiene un formato de fecha inválido. Hay que estar de formato YYYY-MM-DD."
 
-#, python-format
 #~ msgid "“%(value)s� value has the correct format (YYYY-MM-DD) but it is an invalid date."
 #~ msgstr "“%(value)s� valor tiene el formato correcto (YYYY-MM-DD) pero la fecha es invalida."
 
 #~ msgid "Date (without time)"
 #~ msgstr "Fecha (sin la hora)"
 
-#, python-format
 #~ msgid "“%(value)s� value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ] format."
 #~ msgstr "“%(value)s� valor tiene un formato invalido. Debe estar en formato YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]."
 
-#, python-format
 #~ msgid "“%(value)s� value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but it is an invalid date/time."
 #~ msgstr "“%(value)s� valor tiene el formato correcto (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) pero es una fecha/hora invalida."
 
 #~ msgid "Date (with time)"
 #~ msgstr "Fecha (con la hora)"
 
-#, python-format
 #~ msgid "“%(value)s� value must be a decimal number."
 #~ msgstr "El valor de “%(value)s� debe ser un número decimal."
 
 #~ msgid "Decimal number"
 #~ msgstr "Número decimal"
 
-#, python-format
 #~ msgid "“%(value)s� value has an invalid format. It must be in [DD] [[HH:]MM:]ss[.uuuuuu] format."
 #~ msgstr "“%(value)s� valor tiene un formato invalido. Debe estar en formato [DD] [[HH:]MM:]ss[.uuuuuu]."
 
@@ -3176,14 +3089,12 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid "File path"
 #~ msgstr "Ruta de archivo"
 
-#, python-format
 #~ msgid "“%(value)s� value must be a float."
 #~ msgstr "%(value)s no es un usuario válido"
 
 #~ msgid "Floating point number"
 #~ msgstr "Número de coma flotante"
 
-#, python-format
 #~ msgid "“%(value)s� value must be an integer."
 #~ msgstr "“%(value)s� valor debe ser un entero."
 
@@ -3199,7 +3110,6 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid "IP address"
 #~ msgstr "Dirección IP"
 
-#, python-format
 #~ msgid "“%(value)s� value must be either None, True or False."
 #~ msgstr "Valor “%(value)s� debe ser o None, True, o False."
 
@@ -3212,7 +3122,6 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid "Positive small integer"
 #~ msgstr "Entero positivo pequeño "
 
-#, python-format
 #~ msgid "Slug (up to %(max_length)s)"
 #~ msgstr "Slug (máximo de %(max_length)s)"
 
@@ -3222,11 +3131,9 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid "Text"
 #~ msgstr "Texto"
 
-#, python-format
 #~ msgid "“%(value)s� value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
 #~ msgstr "“%(value)s� valor tiene un formato invalido. Debe estar en formato HH:MM[:ss[.uuuuuu]]."
 
-#, python-format
 #~ msgid "“%(value)s� value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid time."
 #~ msgstr "“%(value)s� valor tiene el formato correcto (HH:MM[:ss[.uuuuuu]]) pero es una hora invalida."
 
@@ -3239,7 +3146,6 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid "Raw binary data"
 #~ msgstr "Datos binarios sin procesar"
 
-#, python-format
 #~ msgid "“%(value)s� is not a valid UUID."
 #~ msgstr "%(value)s no es una UUID válida."
 
@@ -3252,7 +3158,6 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid "Image"
 #~ msgstr "Imágen"
 
-#, python-format
 #~ msgid "%(model)s instance with %(field)s %(value)r does not exist."
 #~ msgstr "%(model)s instancia con %(field)s %(value)r no existe."
 
@@ -3262,11 +3167,9 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid "One-to-one relationship"
 #~ msgstr "Relación uno-a-uno"
 
-#, python-format
 #~ msgid "%(from)s-%(to)s relationship"
 #~ msgstr "relación %(from)s-%(to)s"
 
-#, python-format
 #~ msgid "%(from)s-%(to)s relationships"
 #~ msgstr "relaciones %(from)s-%(to)s"
 
@@ -3291,7 +3194,6 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid "Enter a valid duration."
 #~ msgstr "Ingrese una duración válida."
 
-#, python-brace-format
 #~ msgid "The number of days must be between {min_days} and {max_days}."
 #~ msgstr "El número de dias debe ser entre {min_days} y {max_days}."
 
@@ -3304,7 +3206,6 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid "The submitted file is empty."
 #~ msgstr "El archivo enviado está vacio."
 
-#, python-format
 #~ msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
 #~ msgid_plural "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 #~ msgstr[0] "Verifica que este nombre de archivo no tiene más que %(max)d carácter. (Tiene %(length)d)."
@@ -3316,7 +3217,6 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
 #~ msgstr "Subir una imagen válida. El archivo que subiste o no fue imagen o fue corrupto."
 
-#, python-format
 #~ msgid "Select a valid choice. %(value)s is not one of the available choices."
 #~ msgstr "Selecciona una opción válida. %(value)s no es una de las opciones disponibles."
 
@@ -3332,20 +3232,17 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid ":"
 #~ msgstr ":"
 
-#, python-format
 #~ msgid "(Hidden field %(name)s) %(error)s"
 #~ msgstr "(Campo oculto %(name)s) %(error)s"
 
 #~ msgid "ManagementForm data is missing or has been tampered with"
 #~ msgstr "Datos de ManagementForm está ausento o ha sido corrompido"
 
-#, python-format
 #~ msgid "Please submit %d or fewer forms."
 #~ msgid_plural "Please submit %d or fewer forms."
 #~ msgstr[0] "Por favor, enviar %d o menos formularios."
 #~ msgstr[1] "Por favor, enviar %d o menos formularios."
 
-#, python-format
 #~ msgid "Please submit %d or more forms."
 #~ msgid_plural "Please submit %d or more forms."
 #~ msgstr[0] "Por favor, enviar %d o más formularios."
@@ -3358,15 +3255,12 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 
 # if verb 
 # msgstr "Pedido" # if noun
-#, python-format
 #~ msgid "Please correct the duplicate data for %(field)s."
 #~ msgstr "Por favor corrige los datos duplicados en %(field)s."
 
-#, python-format
 #~ msgid "Please correct the duplicate data for %(field)s, which must be unique."
 #~ msgstr "Por favor corrige los datos duplicados en %(field)s, los cuales deben ser unicos."
 
-#, python-format
 #~ msgid "Please correct the duplicate data for %(field_name)s which must be unique for the %(lookup)s in %(date_field)s."
 #~ msgstr "Por favor corrige los datos duplicados en %(field_name)s los cuales deben ser unicos por el %(lookup)s en %(date_field)s."
 
@@ -3379,11 +3273,9 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid "Select a valid choice. That choice is not one of the available choices."
 #~ msgstr "Selecciona una opción válida. Esa opción no es una de las opciones disponibles."
 
-#, python-format
 #~ msgid "“%(pk)s� is not a valid value."
 #~ msgstr "“%(pk)s� no es un valor válido."
 
-#, python-format
 #~ msgid "%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it may be ambiguous or it may not exist."
 #~ msgstr "%(datetime)s no se pudo interpretar en la zona horaria %(current_timezone)s; puede ser ambiguo o puede que no exista."
 
@@ -3408,29 +3300,23 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid "yes,no,maybe"
 #~ msgstr "sí,no,quizás"
 
-#, python-format
 #~ msgid "%(size)d byte"
 #~ msgid_plural "%(size)d bytes"
 #~ msgstr[0] "%(size)d byte"
 #~ msgstr[1] "%(size)d bytes"
 
-#, python-format
 #~ msgid "%s KB"
 #~ msgstr "%s KB"
 
-#, python-format
 #~ msgid "%s MB"
 #~ msgstr "%s MB"
 
-#, python-format
 #~ msgid "%s GB"
 #~ msgstr "%s GB"
 
-#, python-format
 #~ msgid "%s TB"
 #~ msgstr "%s TB"
 
-#, python-format
 #~ msgid "%s PB"
 #~ msgstr "%s PB"
 
@@ -3665,7 +3551,6 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid "This is not a valid IPv6 address."
 #~ msgstr "Esta no es una dirección IPv6 válida."
 
-#, python-format
 #~ msgctxt "String to return when truncating text"
 #~ msgid "%(truncated_text)s…"
 #~ msgstr "%(truncated_text)s…"
@@ -3676,37 +3561,31 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid ", "
 #~ msgstr ", "
 
-#, python-format
 #~ msgid "%d year"
 #~ msgid_plural "%d years"
 #~ msgstr[0] "%d año"
 #~ msgstr[1] "%d años"
 
-#, python-format
 #~ msgid "%d month"
 #~ msgid_plural "%d months"
 #~ msgstr[0] "%d mes"
 #~ msgstr[1] "%d meses"
 
-#, python-format
 #~ msgid "%d week"
 #~ msgid_plural "%d weeks"
 #~ msgstr[0] "%d semana"
 #~ msgstr[1] "%d semanas"
 
-#, python-format
 #~ msgid "%d day"
 #~ msgid_plural "%d days"
 #~ msgstr[0] "%d día"
 #~ msgstr[1] "%d días"
 
-#, python-format
 #~ msgid "%d hour"
 #~ msgid_plural "%d hours"
 #~ msgstr[0] "%d hora"
 #~ msgstr[1] "%d horas"
 
-#, python-format
 #~ msgid "%d minute"
 #~ msgid_plural "%d minutes"
 #~ msgstr[0] "%d minuto"
@@ -3757,55 +3636,45 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid "No week specified"
 #~ msgstr "Ninguna semana fue especificado"
 
-#, python-format
 #~ msgid "No %(verbose_name_plural)s available"
 #~ msgstr "No %(verbose_name_plural)s disponible"
 
-#, python-format
 #~ msgid "Future %(verbose_name_plural)s not available because %(class_name)s.allow_future is False."
 #~ msgstr "%(verbose_name_plural)s del futuro no está disponible porque %(class_name)s.allow_future es False."
 
-#, python-format
 #~ msgid "Invalid date string “%(datestr)s� given format “%(format)s�"
 #~ msgstr "Cadena de fecha invalida “%(datestr)s� dado el formato “%(format)s�"
 
-#, python-format
 #~ msgid "No %(verbose_name)s found matching the query"
 #~ msgstr "No se encontró ningún %(verbose_name)s correspondiente a la búsqueda"
 
 #~ msgid "Page is not “last�, nor can it be converted to an int."
 #~ msgstr "Página no es “last�, ni puede ser convertido en un int."
 
-#, python-format
 #~ msgid "Invalid page (%(page_number)s): %(message)s"
 #~ msgstr "Página invalida (%(page_number)s): %(message)s"
 
-#, python-format
 #~ msgid "Empty list and “%(class_name)s.allow_empty� is False."
 #~ msgstr "Lista vacia y “%(class_name)s.allow_empty� es False."
 
 #~ msgid "Directory indexes are not allowed here."
 #~ msgstr "Indices directorios no se permiten aquí."
 
-#, python-format
 #~ msgid "“%(path)s� does not exist"
 #~ msgstr "“%(path)s� no existe"
 
-#, python-format
 #~ msgid "Index of %(directory)s"
 #~ msgstr "Indice de %(directory)s"
 
 #~ msgid "Django: the Web framework for perfectionists with deadlines."
 #~ msgstr "Django: el estructura Web para perfeccionistas con fechas límites."
 
-#, python-format
 #~ msgid "View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
 #~ msgstr "Ver <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" target=\"_blank\" rel=\"noopener\">notas de lanzamiento</a> por Django %(version)s"
 
 #~ msgid "The install worked successfully! Congratulations!"
 #~ msgstr "¡La instalación fue exitoso! ¡Felicidades!"
 
-#, python-format
 #~ msgid "You are seeing this page because <a href=\"https://docs.djangoproject.com/en/%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener\">DEBUG=True</a> is in your settings file and you have not configured any URLs."
 #~ msgstr "Estás viendo esta pagina porque <a href=\"https://docs.djangoproject.com/en/%(version)s/ref/settings/#debug\" target=\"_blank\" rel=\"noopener\">DEBUG=True</a> está en tu archivo de configuración y no has configurado ningún URL."
 
@@ -3827,15 +3696,12 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid "Connect, get help, or contribute"
 #~ msgstr "Conectarse, encontrar ayuda, o contribuir"
 
-#, python-format
 #~ msgid "Attempting to connect to qpid with SASL mechanism %s"
 #~ msgstr "Intentando conectar con qpid con mecanismo SASL %s"
 
-#, python-format
 #~ msgid "Connected to qpid with SASL mechanism %s"
 #~ msgstr "Conectado con qpid con mecanismo SASL %s"
 
-#, python-format
 #~ msgid "Unable to connect to qpid with SASL mechanism %s"
 #~ msgstr "No se pudo conectar con qpid con mecanismo SASL %s"
 
@@ -3848,7 +3714,6 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid "1 hour ago"
 #~ msgstr "Hace 1 hora"
 
-#, python-format
 #~ msgid "%(time)s"
 #~ msgstr "%(time)s"
 
@@ -3857,45 +3722,36 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 
 # TODO cc @mouse this could be grammatically incorrect if the time said 1 o'clock
 # a working clock is broken twice a day!
-#, python-format
 #~ msgid "yesterday at %(time)s"
 #~ msgstr "ayer a las %(time)s"
 
-#, python-format
 #~ msgid "%(weekday)s"
 #~ msgstr "%(weekday)s"
 
 # TODO cc @mouse this could be grammatically incorrect if the time said 1 o'clock
 # a working clock is broken twice a day!
-#, python-format
 #~ msgid "%(weekday)s at %(time)s"
 #~ msgstr "%(weekday)s a las %(time)s"
 
-#, python-format
 #~ msgid "%(month_name)s %(day)s"
 #~ msgstr "%(day)s %(month_name)s"
 
 # TODO cc @mouse this could be grammatically incorrect if the time said 1 o'clock
 # a working clock is broken twice a day!
-#, python-format
 #~ msgid "%(month_name)s %(day)s at %(time)s"
 #~ msgstr "%(day)s %(month_name)s a las %(time)s"
 
-#, python-format
 #~ msgid "%(month_name)s %(day)s, %(year)s"
 #~ msgstr "%(day)s %(month_name)s, %(year)s"
 
 # TODO cc @mouse this could be grammatically incorrect if the time said 1 o'clock
 # a working clock is broken twice a day!
-#, python-format
 #~ msgid "%(month_name)s %(day)s, %(year)s at %(time)s"
 #~ msgstr "%(day)s %(month_name)s, %(year)s a las %(time)s"
 
-#, python-format
 #~ msgid "%(weekday)s, %(month_name)s %(day)s"
 #~ msgstr "%(weekday)s, %(day)s %(month_name)s"
 
-#, python-format
 #~ msgid "%(commas)s and %(last)s"
 #~ msgstr "%(commas)s y %(last)s"
 
@@ -3924,29 +3780,18 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid "Matching Users"
 #~ msgstr "Usuarios correspondientes"
 
-#, python-format
 #~ msgid "Set a reading goal for %(year)s"
 #~ msgstr "Establecer una meta de lectura para %(year)s"
 
-#, python-format
 #~ msgid "by %(author)s"
 #~ msgstr "por %(author)s"
 
-#, python-format
-#~ msgid "%(rating)s star"
-#~ msgid_plural "%(rating)s stars"
-#~ msgstr[0] "%(rating)s estrella"
-#~ msgstr[1] "%(rating)s estrellas"
-
-#, python-format
 #~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">review</a>"
 #~ msgstr "respondió a la <a href=\"%(status_path)s\">reseña</a> de <a href=\"%(user_path)s\">%(username)s</a> "
 
-#, python-format
 #~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">comment</a>"
 #~ msgstr "respondió al <a href=\"%(status_path)s\">comentario</a> de <a href=\"%(user_path)s\">%(username)s</a> "
 
-#, python-format
 #~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">quote</a>"
 #~ msgstr "respondió a la <a href=\"%(status_path)s\">cita</a> de <a href=\"%(user_path)s\">%(username)s</a> "
 

From 97d1830952ec5d3f0f95f5e90b786661ab1e9607 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 26 May 2021 16:06:51 +0200
Subject: [PATCH 1227/1285] Apply review suggestions

---
 locale/fr_FR/LC_MESSAGES/django.mo | Bin 45409 -> 45401 bytes
 locale/fr_FR/LC_MESSAGES/django.po |  14 +++++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index 349ef43a8322a5be7b4efa8c969d8185f70d36b7..b893b1287e9b958ea2c5cc78708ab547f378d4b4 100644
GIT binary patch
delta 4717
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
G2>Cw+R?m$9

delta 4715
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
KKCo?H#Qy<(&C9m{

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 6b4fe8f0..a96f9d76 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -1392,7 +1392,7 @@ msgstr "Ajouté par <a href=\"%(user_path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/lists/list.html:77
 msgid "Set"
-msgstr "Régler"
+msgstr "Appliquer"
 
 #: bookwyrm/templates/lists/list.html:80
 msgid "List position"
@@ -1405,7 +1405,7 @@ msgstr "Retirer"
 
 #: bookwyrm/templates/lists/list.html:99 bookwyrm/templates/lists/list.html:111
 msgid "Sort List"
-msgstr "Ordonner de la liste"
+msgstr "Trier la liste"
 
 #: bookwyrm/templates/lists/list.html:105
 msgid "Direction"
@@ -1551,7 +1551,7 @@ msgstr "Supprimer les notifications"
 
 #: bookwyrm/templates/notifications.html:25
 msgid "All"
-msgstr "Tout"
+msgstr "Toutes"
 
 #: bookwyrm/templates/notifications.html:29
 msgid "Mentions"
@@ -1885,7 +1885,7 @@ msgstr "Date de fin :"
 
 #: bookwyrm/templates/settings/announcement.html:60
 msgid "Active:"
-msgstr "Actif :"
+msgstr "Active :"
 
 #: bookwyrm/templates/settings/announcement_form.html:8
 #: bookwyrm/templates/settings/announcements.html:8
@@ -1898,7 +1898,7 @@ msgstr "Date d’ajout"
 
 #: bookwyrm/templates/settings/announcements.html:26
 msgid "Preview"
-msgstr "Prévisualisation"
+msgstr "Aperçu"
 
 #: bookwyrm/templates/settings/announcements.html:30
 msgid "Start date"
@@ -2240,7 +2240,7 @@ msgstr "Texte affiché lorsque les enregistrements sont clos :"
 #: bookwyrm/templates/snippets/announcement.html:31
 #, python-format
 msgid "Posted by <a href=\"%(user_path)s\">%(username)s</a>"
-msgstr "Publié par <a href=\"%(user_path)s\">%(username)s</a>"
+msgstr "Publiée par <a href=\"%(user_path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/snippets/book_cover.html:31
 msgid "No cover"
@@ -2897,7 +2897,7 @@ msgstr "Niveau d’accès :"
 
 #: bookwyrm/views/import_data.py:67
 msgid "Not a valid csv file"
-msgstr "Fichier CSV invalide"
+msgstr "Fichier CSV non valide"
 
 #: bookwyrm/views/password.py:32
 msgid "No user with that email address was found."

From 2816d7cc88a5f671bb4a66cdec59ac22bfed4b89 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 1 Jun 2021 14:28:53 -0700
Subject: [PATCH 1228/1285] Use "instance" consistently

---
 bookwyrm/templates/layout.html                |   2 +-
 bookwyrm/templates/moderation/reports.html    |   4 +-
 bookwyrm/templates/settings/admin_layout.html |   2 +-
 bookwyrm/templates/settings/edit_server.html  |   8 +-
 bookwyrm/templates/settings/federation.html   |  10 +-
 .../templates/settings/server_blocklist.html  |   8 +-
 .../templates/user_admin/server_filter.html   |   2 +-
 bookwyrm/templates/user_admin/user_admin.html |   4 +-
 locale/de_DE/LC_MESSAGES/django.po            | 269 +++++++++--------
 locale/en_US/LC_MESSAGES/django.po            | 221 +++++++-------
 locale/es/LC_MESSAGES/django.po               | 107 ++++---
 locale/fr_FR/LC_MESSAGES/django.po            | 223 ++++++++------
 locale/zh_Hans/LC_MESSAGES/django.po          | 274 ++++++++++--------
 13 files changed, 651 insertions(+), 483 deletions(-)

diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index d899d62c..56530a84 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -203,7 +203,7 @@
         <div class="columns">
             <div class="column is-one-fifth">
                 <p>
-                <a href="{% url 'about' %}">{% trans "About this server" %}</a>
+                <a href="{% url 'about' %}">{% trans "About this instance" %}</a>
                 </p>
                 {% if site.admin_email %}
                 <p>
diff --git a/bookwyrm/templates/moderation/reports.html b/bookwyrm/templates/moderation/reports.html
index f9d9d99b..95a276af 100644
--- a/bookwyrm/templates/moderation/reports.html
+++ b/bookwyrm/templates/moderation/reports.html
@@ -3,7 +3,7 @@
 
 {% block title %}
 {% if server %}
-{% blocktrans with server_name=server.server_name %}Reports: {{ server_name }}{% endblocktrans %}
+{% blocktrans with instance_name=server.server_name %}Reports: {{ instance_name }}{% endblocktrans %}
 {% else %}
 {% trans "Reports" %}
 {% endif %}
@@ -11,7 +11,7 @@
 
 {% block header %}
 {% if server %}
-{% blocktrans with server_name=server.server_name %}Reports: <small>{{ server_name }}</small>{% endblocktrans %}
+{% blocktrans with instance_name=server.server_name %}Reports: <small>{{ instance_name }}</small>{% endblocktrans %}
 <a href="{% url 'settings-reports' %}" class="help has-text-weight-normal">Clear filters</a>
 {% else %}
 {% trans "Reports" %}
diff --git a/bookwyrm/templates/settings/admin_layout.html b/bookwyrm/templates/settings/admin_layout.html
index 635e8607..9e57076b 100644
--- a/bookwyrm/templates/settings/admin_layout.html
+++ b/bookwyrm/templates/settings/admin_layout.html
@@ -36,7 +36,7 @@
             </li>
             <li>
                 {% url 'settings-federation' as url %}
-                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Federated Servers" %}</a>
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Federated Instances" %}</a>
             </li>
         </ul>
         {% endif %}
diff --git a/bookwyrm/templates/settings/edit_server.html b/bookwyrm/templates/settings/edit_server.html
index c5702c84..d7ca3a78 100644
--- a/bookwyrm/templates/settings/edit_server.html
+++ b/bookwyrm/templates/settings/edit_server.html
@@ -1,10 +1,10 @@
 {% extends 'settings/admin_layout.html' %}
 {% load i18n %}
-{% block title %}{% trans "Add server" %}{% endblock %}
+{% block title %}{% trans "Add instance" %}{% endblock %}
 
 {% block header %}
-{% trans "Add server" %}
-<a href="{% url 'settings-federation' %}" class="has-text-weight-normal help">{% trans "Back to server list" %}</a>
+{% trans "Add instance" %}
+<a href="{% url 'settings-federation' %}" class="has-text-weight-normal help">{% trans "Back to instance list" %}</a>
 {% endblock %}
 
 {% block panel %}
@@ -17,7 +17,7 @@
         </li>
         {% url 'settings-add-federated-server' as url %}
         <li {% if url in request.path %}class="is-active" aria-current="page"{% endif %}>
-            <a href="{{ url }}">{% trans "Add server" %}</a>
+            <a href="{{ url }}">{% trans "Add instance" %}</a>
         </li>
     </ul>
 </div>
diff --git a/bookwyrm/templates/settings/federation.html b/bookwyrm/templates/settings/federation.html
index bf198672..208ecf8d 100644
--- a/bookwyrm/templates/settings/federation.html
+++ b/bookwyrm/templates/settings/federation.html
@@ -1,13 +1,13 @@
 {% extends 'settings/admin_layout.html' %}
 {% load i18n %}
-{% block title %}{% trans "Federated Servers" %}{% endblock %}
+{% block title %}{% trans "Federated Instances" %}{% endblock %}
 
-{% block header %}{% trans "Federated Servers" %}{% endblock %}
+{% block header %}{% trans "Federated Instances" %}{% endblock %}
 
 {% block edit-button %}
 <a href="{% url 'settings-import-blocklist' %}">
-    <span class="icon icon-plus" title="{% trans 'Add server' %}" aria-hidden="True"></span>
-    <span>{% trans "Add server" %}</span>
+    <span class="icon icon-plus" title="{% trans 'Add instance' %}" aria-hidden="True"></span>
+    <span>{% trans "Add instance" %}</span>
 </a>
 {% endblock %}
 
@@ -16,7 +16,7 @@
     <tr>
         {% url 'settings-federation' as url %}
         <th>
-            {% trans "Server name" as text %}
+            {% trans "Instance name" as text %}
             {% include 'snippets/table-sort-header.html' with field="server_name" sort=sort text=text %}
         </th>
         <th>
diff --git a/bookwyrm/templates/settings/server_blocklist.html b/bookwyrm/templates/settings/server_blocklist.html
index 0de49acd..171cf133 100644
--- a/bookwyrm/templates/settings/server_blocklist.html
+++ b/bookwyrm/templates/settings/server_blocklist.html
@@ -1,10 +1,10 @@
 {% extends 'settings/admin_layout.html' %}
 {% load i18n %}
-{% block title %}{% trans "Add server" %}{% endblock %}
+{% block title %}{% trans "Add instance" %}{% endblock %}
 
 {% block header %}
 {% trans "Import Blocklist" %}
-<a href="{% url 'settings-federation' %}" class="has-text-weight-normal help">{% trans "Back to server list" %}</a>
+<a href="{% url 'settings-federation' %}" class="has-text-weight-normal help">{% trans "Back to instance list" %}</a>
 {% endblock %}
 
 {% block panel %}
@@ -17,7 +17,7 @@
         </li>
         {% url 'settings-add-federated-server' as url %}
         <li {% if url in request.path %}class="is-active" aria-current="page"{% endif %}>
-            <a href="{{ url }}">{% trans "Add server" %}</a>
+            <a href="{{ url }}">{% trans "Add instance" %}</a>
         </li>
     </ul>
 </div>
@@ -51,7 +51,7 @@
             <pre>
 [
     {
-        "instance": "example.server.com",
+        "instance": "example.instance.com",
         "url": "https://link.to.more/info"
     },
     ...
diff --git a/bookwyrm/templates/user_admin/server_filter.html b/bookwyrm/templates/user_admin/server_filter.html
index fd8760cc..2a4b89fd 100644
--- a/bookwyrm/templates/user_admin/server_filter.html
+++ b/bookwyrm/templates/user_admin/server_filter.html
@@ -2,6 +2,6 @@
 {% load i18n %}
 
 {% block filter %}
-<label class="label" for="id_server">{% trans "Server name" %}</label>
+<label class="label" for="id_server">{% trans "Instance name" %}</label>
 <input type="text" class="input" name="server" value="{{ request.GET.server|default:'' }}" id="id_server" placeholder="example.server.com">
 {% endblock %}
diff --git a/bookwyrm/templates/user_admin/user_admin.html b/bookwyrm/templates/user_admin/user_admin.html
index 2ab526a9..4b4c7979 100644
--- a/bookwyrm/templates/user_admin/user_admin.html
+++ b/bookwyrm/templates/user_admin/user_admin.html
@@ -4,7 +4,7 @@
 
 {% block header %}
 {% if server %}
-{% blocktrans with server_name=server.server_name %}Users: <small>{{ server_name }}</small>{% endblocktrans %}
+{% blocktrans with instance_name=server.server_name %}Users: <small>{{ instance_name }}</small>{% endblocktrans %}
 <a href="{% url 'settings-users' %}" class="help has-text-weight-normal">Clear filters</a>
 {% else %}
 {% trans "Users" %}
@@ -35,7 +35,7 @@
             {% include 'snippets/table-sort-header.html' with field="is_active" sort=sort text=text %}
         </th>
         <th>
-            {% trans "Remote server" as text %}
+            {% trans "Remote instance" as text %}
             {% include 'snippets/table-sort-header.html' with field="federated_server__server_name" sort=sort text=text %}
         </th>
     </tr>
diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 40f770b5..9649dc14 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 14:40-0700\n"
+"POT-Creation-Date: 2021-06-01 14:49-0700\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"
@@ -62,12 +62,12 @@ msgid "Book Title"
 msgstr "Titel"
 
 #: bookwyrm/forms.py:301 bookwyrm/templates/snippets/create_status_form.html:34
-#: bookwyrm/templates/user/shelf/shelf.html:84
-#: bookwyrm/templates/user/shelf/shelf.html:115
+#: bookwyrm/templates/user/shelf/shelf.html:85
+#: bookwyrm/templates/user/shelf/shelf.html:116
 msgid "Rating"
 msgstr ""
 
-#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:101
+#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:107
 msgid "Sort By"
 msgstr ""
 
@@ -83,41 +83,41 @@ msgstr "Zu lesen angefangen"
 msgid "Descending"
 msgstr "Zu lesen angefangen"
 
-#: bookwyrm/models/fields.py:24
+#: bookwyrm/models/fields.py:25
 #, python-format
 msgid "%(value)s is not a valid remote_id"
 msgstr "%(value)s ist keine gültige remote_id"
 
-#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
+#: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:43
 #, python-format
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s ist kein gültiger Username"
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:155
+#: bookwyrm/models/fields.py:166 bookwyrm/templates/layout.html:152
 msgid "username"
 msgstr "Username"
 
-#: bookwyrm/models/fields.py:170
+#: bookwyrm/models/fields.py:171
 msgid "A user with that username already exists."
 msgstr "Dieser Benutzename ist bereits vergeben."
 
-#: bookwyrm/settings.py:155
+#: bookwyrm/settings.py:156
 msgid "English"
 msgstr "Englisch"
 
-#: bookwyrm/settings.py:156
+#: bookwyrm/settings.py:157
 msgid "German"
 msgstr "Deutsch"
 
-#: bookwyrm/settings.py:157
+#: bookwyrm/settings.py:158
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: bookwyrm/settings.py:158
+#: bookwyrm/settings.py:159
 msgid "French"
 msgstr "Französisch"
 
-#: bookwyrm/settings.py:159
+#: bookwyrm/settings.py:160
 msgid "Simplified Chinese"
 msgstr "Vereinfachtes Chinesisch"
 
@@ -266,7 +266,7 @@ msgstr ""
 #: bookwyrm/templates/book/edit_book.html:263
 #: bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
-#: bookwyrm/templates/settings/announcement_form.html:65
+#: bookwyrm/templates/settings/announcement_form.html:69
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:98
 #: bookwyrm/templates/settings/site.html:97
@@ -398,7 +398,7 @@ msgstr "Themen"
 msgid "Places"
 msgstr "Orte"
 
-#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:61
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
@@ -414,7 +414,7 @@ msgstr "Zur Liste"
 
 #: bookwyrm/templates/book/book.html:297
 #: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:164
+#: bookwyrm/templates/lists/list.html:179
 msgid "Add"
 msgstr "Hinzufügen"
 
@@ -559,7 +559,7 @@ msgid "John Doe, Jane Smith"
 msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:183
-#: bookwyrm/templates/user/shelf/shelf.html:77
+#: bookwyrm/templates/user/shelf/shelf.html:78
 msgid "Cover"
 msgstr ""
 
@@ -688,7 +688,7 @@ msgstr "Föderiert"
 
 #: bookwyrm/templates/directory/directory.html:4
 #: bookwyrm/templates/directory/directory.html:9
-#: bookwyrm/templates/layout.html:92
+#: bookwyrm/templates/layout.html:64
 msgid "Directory"
 msgstr ""
 
@@ -902,7 +902,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:87
+#: bookwyrm/templates/layout.html:92
 msgid "Direct Messages"
 msgstr "Direktnachrichten"
 
@@ -960,7 +960,6 @@ msgid "Updates"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:10
-#: bookwyrm/templates/layout.html:58
 #: bookwyrm/templates/user/shelf/books_header.html:3
 msgid "Your books"
 msgstr "Deine Bücher"
@@ -1022,7 +1021,7 @@ msgid "What are you reading?"
 msgstr "Zu lesen angefangen"
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:120
+#: bookwyrm/templates/lists/list.html:135
 msgid "Search for a book"
 msgstr "Nach einem Buch suchen"
 
@@ -1042,7 +1041,7 @@ msgstr ""
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
 #: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
-#: bookwyrm/templates/lists/list.html:124
+#: bookwyrm/templates/lists/list.html:139
 #: bookwyrm/templates/search/layout.html:4
 #: bookwyrm/templates/search/layout.html:9
 msgid "Search"
@@ -1061,7 +1060,7 @@ msgid "Popular on %(site_name)s"
 msgstr "Ãœber %(site_name)s"
 
 #: bookwyrm/templates/get_started/books.html:58
-#: bookwyrm/templates/lists/list.html:137
+#: bookwyrm/templates/lists/list.html:152
 msgid "No books found"
 msgstr "Keine Bücher gefunden"
 
@@ -1184,7 +1183,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "%(username)ss %(year)s Bücher"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/layout.html:97
+#: bookwyrm/templates/user/shelf/shelf.html:40
 msgid "Import Books"
 msgstr "Bücher importieren"
 
@@ -1271,14 +1270,14 @@ msgstr "Buch"
 
 #: bookwyrm/templates/import_status.html:114
 #: bookwyrm/templates/snippets/create_status_form.html:13
-#: bookwyrm/templates/user/shelf/shelf.html:78
-#: bookwyrm/templates/user/shelf/shelf.html:98
+#: bookwyrm/templates/user/shelf/shelf.html:79
+#: bookwyrm/templates/user/shelf/shelf.html:99
 msgid "Title"
 msgstr "Titel"
 
 #: bookwyrm/templates/import_status.html:117
-#: bookwyrm/templates/user/shelf/shelf.html:79
-#: bookwyrm/templates/user/shelf/shelf.html:101
+#: bookwyrm/templates/user/shelf/shelf.html:80
+#: bookwyrm/templates/user/shelf/shelf.html:102
 msgid "Author"
 msgstr "Autor*in"
 
@@ -1320,15 +1319,21 @@ msgstr "Suche nach Buch oder Benutzer*in"
 msgid "Main navigation menu"
 msgstr "Navigationshauptmenü"
 
-#: bookwyrm/templates/layout.html:61
+#: bookwyrm/templates/layout.html:58
 msgid "Feed"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:102
+#: bookwyrm/templates/layout.html:87
+#, fuzzy
+#| msgid "Your books"
+msgid "Your Books"
+msgstr "Deine Bücher"
+
+#: bookwyrm/templates/layout.html:97
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: bookwyrm/templates/layout.html:111
+#: bookwyrm/templates/layout.html:106
 #: bookwyrm/templates/settings/admin_layout.html:31
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
@@ -1336,45 +1341,47 @@ msgstr "Einstellungen"
 msgid "Invites"
 msgstr "Einladungen"
 
-#: bookwyrm/templates/layout.html:118
+#: bookwyrm/templates/layout.html:113
 msgid "Admin"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:125
+#: bookwyrm/templates/layout.html:120
 msgid "Log out"
 msgstr "Abmelden"
 
-#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
+#: bookwyrm/templates/layout.html:128 bookwyrm/templates/layout.html:129
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: bookwyrm/templates/layout.html:154 bookwyrm/templates/layout.html:158
+#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:159
+#: bookwyrm/templates/layout.html:156
 msgid "password"
 msgstr "Passwort"
 
-#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: bookwyrm/templates/layout.html:163 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "Anmelden"
 
-#: bookwyrm/templates/layout.html:171
+#: bookwyrm/templates/layout.html:168
 msgid "Join"
 msgstr ""
 
 #: bookwyrm/templates/layout.html:206
-msgid "About this server"
+#, fuzzy
+#| msgid "About this server"
+msgid "About this instance"
 msgstr "Ãœber diesen Server"
 
 #: bookwyrm/templates/layout.html:210
@@ -1438,7 +1445,7 @@ msgid "Discard"
 msgstr "Ablehnen"
 
 #: bookwyrm/templates/lists/edit_form.html:5
-#: bookwyrm/templates/lists/list_layout.html:17
+#: bookwyrm/templates/lists/list_layout.html:16
 msgid "Edit List"
 msgstr "Liste bearbeiten"
 
@@ -1487,63 +1494,64 @@ msgstr "Alle können Bücher hinzufügen"
 msgid "This list is currently empty"
 msgstr "Diese Liste ist momentan leer"
 
-#: bookwyrm/templates/lists/list.html:65
+#: bookwyrm/templates/lists/list.html:66
 #, fuzzy, python-format
 #| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/lists/list.html:77
-#, fuzzy
-#| msgid "Started"
-msgid "Set"
-msgstr "Gestartet"
-
-#: bookwyrm/templates/lists/list.html:80
+#: bookwyrm/templates/lists/list.html:74
 #, fuzzy
 #| msgid "List curation:"
 msgid "List position"
 msgstr "Listenkuratierung:"
 
-#: bookwyrm/templates/lists/list.html:86
+#: bookwyrm/templates/lists/list.html:81
+#, fuzzy
+#| msgid "Started"
+msgid "Set"
+msgstr "Gestartet"
+
+#: bookwyrm/templates/lists/list.html:89
 #: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr "Entfernen"
 
-#: bookwyrm/templates/lists/list.html:99 bookwyrm/templates/lists/list.html:111
+#: bookwyrm/templates/lists/list.html:103
+#: bookwyrm/templates/lists/list.html:120
 #, fuzzy
 #| msgid "Your Lists"
 msgid "Sort List"
 msgstr "Deine Listen"
 
-#: bookwyrm/templates/lists/list.html:105
+#: bookwyrm/templates/lists/list.html:113
 #, fuzzy
 #| msgid "List curation:"
 msgid "Direction"
 msgstr "Listenkuratierung:"
 
-#: bookwyrm/templates/lists/list.html:116
+#: bookwyrm/templates/lists/list.html:127
 msgid "Add Books"
 msgstr "Bücher hinzufügen"
 
-#: bookwyrm/templates/lists/list.html:116
+#: bookwyrm/templates/lists/list.html:129
 msgid "Suggest Books"
 msgstr "Bücher vorschlagen"
 
-#: bookwyrm/templates/lists/list.html:125
+#: bookwyrm/templates/lists/list.html:140
 msgid "search"
 msgstr "suchen"
 
-#: bookwyrm/templates/lists/list.html:131
+#: bookwyrm/templates/lists/list.html:146
 msgid "Clear search"
 msgstr "Suche leeren"
 
-#: bookwyrm/templates/lists/list.html:136
+#: bookwyrm/templates/lists/list.html:151
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
 msgstr "Keine passenden Bücher zu \"%(query)s\" gefunden"
 
-#: bookwyrm/templates/lists/list.html:164
+#: bookwyrm/templates/lists/list.html:179
 msgid "Suggest"
 msgstr "Vorschlagen"
 
@@ -1643,7 +1651,7 @@ msgstr "Lösen"
 #: bookwyrm/templates/moderation/reports.html:6
 #, fuzzy, python-format
 #| msgid "Lists: %(username)s"
-msgid "Reports: %(server_name)s"
+msgid "Reports: %(instance_name)s"
 msgstr "Listen: %(username)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
@@ -1657,7 +1665,7 @@ msgstr "Aktuelle Importe"
 #: bookwyrm/templates/moderation/reports.html:14
 #, fuzzy, python-format
 #| msgid "Lists: %(username)s"
-msgid "Reports: <small>%(server_name)s</small>"
+msgid "Reports: <small>%(instance_name)s</small>"
 msgstr "Listen: %(username)s"
 
 #: bookwyrm/templates/moderation/reports.html:28
@@ -1863,6 +1871,26 @@ msgstr "Profil"
 msgid "Relationships"
 msgstr "Beziehungen"
 
+#: bookwyrm/templates/rss/title.html:5
+#: bookwyrm/templates/snippets/status/status_header.html:35
+msgid "rated"
+msgstr ""
+
+#: bookwyrm/templates/rss/title.html:7
+#: bookwyrm/templates/snippets/status/status_header.html:37
+msgid "reviewed"
+msgstr "bewertete"
+
+#: bookwyrm/templates/rss/title.html:9
+#: bookwyrm/templates/snippets/status/status_header.html:39
+msgid "commented on"
+msgstr "kommentierte"
+
+#: bookwyrm/templates/rss/title.html:11
+#: bookwyrm/templates/snippets/status/status_header.html:41
+msgid "quoted"
+msgstr "zitierte"
+
 #: bookwyrm/templates/search/book.html:64
 #, fuzzy
 #| msgid "Show results from other catalogues"
@@ -1922,7 +1950,9 @@ msgstr "Nutzer*innen verwalten"
 #: bookwyrm/templates/settings/admin_layout.html:39
 #: bookwyrm/templates/settings/federation.html:3
 #: bookwyrm/templates/settings/federation.html:5
-msgid "Federated Servers"
+#, fuzzy
+#| msgid "Federated Servers"
+msgid "Federated Instances"
 msgstr "Föderierende Server"
 
 #: bookwyrm/templates/settings/admin_layout.html:44
@@ -1976,6 +2006,7 @@ msgid "Back to list"
 msgstr "Zurück zu den Meldungen"
 
 #: bookwyrm/templates/settings/announcement.html:11
+#: bookwyrm/templates/settings/announcement_form.html:6
 #, fuzzy
 #| msgid "Announcements"
 msgid "Edit Announcement"
@@ -2017,7 +2048,7 @@ msgstr "Geburtsdatum:"
 msgid "Active:"
 msgstr "Aktivität"
 
-#: bookwyrm/templates/settings/announcement_form.html:5
+#: bookwyrm/templates/settings/announcement_form.html:8
 #: bookwyrm/templates/settings/announcements.html:8
 #, fuzzy
 #| msgid "Announcements"
@@ -2076,15 +2107,15 @@ msgstr "Aktivität"
 #: bookwyrm/templates/settings/server_blocklist.html:3
 #: bookwyrm/templates/settings/server_blocklist.html:20
 #, fuzzy
-#| msgid "Add cover"
-msgid "Add server"
-msgstr "Cover hinzufügen"
+#| msgid "Instance Name:"
+msgid "Add instance"
+msgstr "Instanzname"
 
 #: bookwyrm/templates/settings/edit_server.html:7
 #: bookwyrm/templates/settings/server_blocklist.html:7
 #, fuzzy
 #| msgid "Back to reports"
-msgid "Back to server list"
+msgid "Back to instance list"
 msgstr "Zurück zu den Meldungen"
 
 #: bookwyrm/templates/settings/edit_server.html:16
@@ -2213,8 +2244,10 @@ msgstr ""
 
 #: bookwyrm/templates/settings/federation.html:19
 #: bookwyrm/templates/user_admin/server_filter.html:5
-msgid "Server name"
-msgstr "Servername"
+#, fuzzy
+#| msgid "Instance Name:"
+msgid "Instance name"
+msgstr "Instanzname"
 
 #: bookwyrm/templates/settings/federation.html:23
 #, fuzzy
@@ -2353,7 +2386,7 @@ msgid "Import Blocklist"
 msgstr "Bücher importieren"
 
 #: bookwyrm/templates/settings/server_blocklist.html:26
-#: bookwyrm/templates/snippets/goal_progress.html:5
+#: bookwyrm/templates/snippets/goal_progress.html:7
 msgid "Success!"
 msgstr "Erfolg!"
 
@@ -2446,15 +2479,15 @@ msgstr "Cover hinzufügen"
 msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgstr "<a href=\"%(path)s\">%(title)s</a> von "
 
-#: bookwyrm/templates/snippets/boost_button.html:9
-#: bookwyrm/templates/snippets/boost_button.html:10
+#: bookwyrm/templates/snippets/boost_button.html:20
+#: bookwyrm/templates/snippets/boost_button.html:21
 #, fuzzy
 #| msgid "boosted"
 msgid "Boost"
 msgstr "teilt"
 
-#: bookwyrm/templates/snippets/boost_button.html:16
-#: bookwyrm/templates/snippets/boost_button.html:17
+#: bookwyrm/templates/snippets/boost_button.html:33
+#: bookwyrm/templates/snippets/boost_button.html:34
 #, fuzzy
 #| msgid "Un-boost status"
 msgid "Un-boost"
@@ -2554,13 +2587,13 @@ msgstr "Diese Lesedaten löschen?"
 msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr "Du löscht diesen Leseforschritt und %(count)s zugehörige Fortschrittsupdates."
 
-#: bookwyrm/templates/snippets/fav_button.html:9
-#: bookwyrm/templates/snippets/fav_button.html:11
+#: bookwyrm/templates/snippets/fav_button.html:10
+#: bookwyrm/templates/snippets/fav_button.html:12
 msgid "Like"
 msgstr ""
 
-#: bookwyrm/templates/snippets/fav_button.html:17
 #: bookwyrm/templates/snippets/fav_button.html:18
+#: bookwyrm/templates/snippets/fav_button.html:19
 #, fuzzy
 #| msgid "Un-like status"
 msgid "Un-like"
@@ -2664,17 +2697,17 @@ msgstr "Posten"
 msgid "Set goal"
 msgstr "Ziel setzen"
 
-#: bookwyrm/templates/snippets/goal_progress.html:7
+#: bookwyrm/templates/snippets/goal_progress.html:9
 #, python-format
 msgid "%(percent)s%% complete!"
 msgstr "%(percent)s%% komplett!"
 
-#: bookwyrm/templates/snippets/goal_progress.html:10
+#: bookwyrm/templates/snippets/goal_progress.html:12
 #, python-format
 msgid "You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
 msgstr "Du hast <a href=\"%(path)s\">%(read_count)s von %(goal_count)s Büchern</a> gelesen."
 
-#: bookwyrm/templates/snippets/goal_progress.html:12
+#: bookwyrm/templates/snippets/goal_progress.html:14
 #, python-format
 msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
 msgstr "%(username)s hat <a href=\"%(path)s\">%(read_count)s von %(goal_count)s Büchern</a> gelesen."
@@ -2787,26 +2820,6 @@ msgstr "Registrieren"
 msgid "Report"
 msgstr "Importieren"
 
-#: bookwyrm/templates/snippets/rss_title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:35
-msgid "rated"
-msgstr ""
-
-#: bookwyrm/templates/snippets/rss_title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:37
-msgid "reviewed"
-msgstr "bewertete"
-
-#: bookwyrm/templates/snippets/rss_title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:39
-msgid "commented on"
-msgstr "kommentierte"
-
-#: bookwyrm/templates/snippets/rss_title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:41
-msgid "quoted"
-msgstr "zitierte"
-
 #: bookwyrm/templates/snippets/search_result_text.html:36
 msgid "Import book"
 msgstr "Buch importieren"
@@ -2989,7 +3002,7 @@ msgstr "Regal bearbeiten"
 msgid "Update shelf"
 msgstr "Regal aktualisieren"
 
-#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:51
+#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:56
 #, fuzzy
 #| msgid "books"
 msgid "All books"
@@ -2999,30 +3012,30 @@ msgstr "Bücher"
 msgid "Create shelf"
 msgstr "Regal erstellen"
 
-#: bookwyrm/templates/user/shelf/shelf.html:61
+#: bookwyrm/templates/user/shelf/shelf.html:62
 msgid "Edit shelf"
 msgstr "Regal bearbeiten"
 
-#: bookwyrm/templates/user/shelf/shelf.html:80
-#: bookwyrm/templates/user/shelf/shelf.html:104
+#: bookwyrm/templates/user/shelf/shelf.html:81
+#: bookwyrm/templates/user/shelf/shelf.html:105
 msgid "Shelved"
 msgstr "Ins Regal gestellt"
 
-#: bookwyrm/templates/user/shelf/shelf.html:81
-#: bookwyrm/templates/user/shelf/shelf.html:108
+#: bookwyrm/templates/user/shelf/shelf.html:82
+#: bookwyrm/templates/user/shelf/shelf.html:109
 msgid "Started"
 msgstr "Gestartet"
 
-#: bookwyrm/templates/user/shelf/shelf.html:82
-#: bookwyrm/templates/user/shelf/shelf.html:111
+#: bookwyrm/templates/user/shelf/shelf.html:83
+#: bookwyrm/templates/user/shelf/shelf.html:112
 msgid "Finished"
 msgstr "Abgeschlossen"
 
-#: bookwyrm/templates/user/shelf/shelf.html:137
+#: bookwyrm/templates/user/shelf/shelf.html:138
 msgid "This shelf is empty."
 msgstr "Dieses Regal ist leer."
 
-#: bookwyrm/templates/user/shelf/shelf.html:143
+#: bookwyrm/templates/user/shelf/shelf.html:144
 msgid "Delete shelf"
 msgstr "Regal löschen"
 
@@ -3084,9 +3097,10 @@ msgid "Back to users"
 msgstr "Zurück zu den Meldungen"
 
 #: bookwyrm/templates/user_admin/user_admin.html:7
-#, python-format
-msgid "Users: <small>%(server_name)s</small>"
-msgstr ""
+#, fuzzy, python-format
+#| msgid "Lists: %(username)s"
+msgid "Users: <small>%(instance_name)s</small>"
+msgstr "Listen: %(username)s"
 
 #: bookwyrm/templates/user_admin/user_admin.html:22
 #: bookwyrm/templates/user_admin/username_filter.html:5
@@ -3107,9 +3121,9 @@ msgstr ""
 
 #: bookwyrm/templates/user_admin/user_admin.html:38
 #, fuzzy
-#| msgid "Remove"
-msgid "Remote server"
-msgstr "Entfernen"
+#| msgid "Instance Name:"
+msgid "Remote instance"
+msgstr "Instanzname"
 
 #: bookwyrm/templates/user_admin/user_admin.html:47
 #, fuzzy
@@ -3158,6 +3172,10 @@ msgstr ""
 msgid "Access level:"
 msgstr ""
 
+#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:3
+msgid "File exceeds maximum size: 10MB"
+msgstr ""
+
 #: bookwyrm/views/import_data.py:67
 #, fuzzy
 #| msgid "Email address:"
@@ -3175,6 +3193,27 @@ msgstr "Dieser Benutzename ist bereits vergeben."
 msgid "A password reset link sent to %s"
 msgstr ""
 
+#, fuzzy, python-format
+#~| msgid "Lists: %(username)s"
+#~ msgid "Reports: <small>%(server_name)s</small>"
+#~ msgstr "Listen: %(username)s"
+
+#~ msgid "Federated Servers"
+#~ msgstr "Föderierende Server"
+
+#~ msgid "Server name"
+#~ msgstr "Servername"
+
+#, fuzzy
+#~| msgid "Add cover"
+#~ msgid "Add server"
+#~ msgstr "Cover hinzufügen"
+
+#, fuzzy
+#~| msgid "Remove"
+#~ msgid "Remote server"
+#~ msgstr "Entfernen"
+
 #, fuzzy
 #~| msgid "Book"
 #~ msgid "BookWyrm\\"
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index 1fa5eb30..7d1044b2 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 14:40-0700\n"
+"POT-Creation-Date: 2021-06-01 14:49-0700\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"
@@ -56,12 +56,12 @@ msgid "Book Title"
 msgstr ""
 
 #: bookwyrm/forms.py:301 bookwyrm/templates/snippets/create_status_form.html:34
-#: bookwyrm/templates/user/shelf/shelf.html:84
-#: bookwyrm/templates/user/shelf/shelf.html:115
+#: bookwyrm/templates/user/shelf/shelf.html:85
+#: bookwyrm/templates/user/shelf/shelf.html:116
 msgid "Rating"
 msgstr ""
 
-#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:101
+#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:107
 msgid "Sort By"
 msgstr ""
 
@@ -73,41 +73,41 @@ msgstr ""
 msgid "Descending"
 msgstr ""
 
-#: bookwyrm/models/fields.py:24
+#: bookwyrm/models/fields.py:25
 #, python-format
 msgid "%(value)s is not a valid remote_id"
 msgstr ""
 
-#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
+#: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:43
 #, python-format
 msgid "%(value)s is not a valid username"
 msgstr ""
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:155
+#: bookwyrm/models/fields.py:166 bookwyrm/templates/layout.html:152
 msgid "username"
 msgstr ""
 
-#: bookwyrm/models/fields.py:170
+#: bookwyrm/models/fields.py:171
 msgid "A user with that username already exists."
 msgstr ""
 
-#: bookwyrm/settings.py:155
+#: bookwyrm/settings.py:156
 msgid "English"
 msgstr ""
 
-#: bookwyrm/settings.py:156
+#: bookwyrm/settings.py:157
 msgid "German"
 msgstr ""
 
-#: bookwyrm/settings.py:157
+#: bookwyrm/settings.py:158
 msgid "Spanish"
 msgstr ""
 
-#: bookwyrm/settings.py:158
+#: bookwyrm/settings.py:159
 msgid "French"
 msgstr ""
 
-#: bookwyrm/settings.py:159
+#: bookwyrm/settings.py:160
 msgid "Simplified Chinese"
 msgstr ""
 
@@ -248,7 +248,7 @@ msgstr ""
 #: bookwyrm/templates/book/edit_book.html:263
 #: bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
-#: bookwyrm/templates/settings/announcement_form.html:65
+#: bookwyrm/templates/settings/announcement_form.html:69
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:98
 #: bookwyrm/templates/settings/site.html:97
@@ -367,7 +367,7 @@ msgstr ""
 msgid "Places"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:61
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
@@ -381,7 +381,7 @@ msgstr ""
 
 #: bookwyrm/templates/book/book.html:297
 #: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:164
+#: bookwyrm/templates/lists/list.html:179
 msgid "Add"
 msgstr ""
 
@@ -511,7 +511,7 @@ msgid "John Doe, Jane Smith"
 msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:183
-#: bookwyrm/templates/user/shelf/shelf.html:77
+#: bookwyrm/templates/user/shelf/shelf.html:78
 msgid "Cover"
 msgstr ""
 
@@ -630,7 +630,7 @@ msgstr ""
 
 #: bookwyrm/templates/directory/directory.html:4
 #: bookwyrm/templates/directory/directory.html:9
-#: bookwyrm/templates/layout.html:92
+#: bookwyrm/templates/layout.html:64
 msgid "Directory"
 msgstr ""
 
@@ -831,7 +831,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr ""
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:87
+#: bookwyrm/templates/layout.html:92
 msgid "Direct Messages"
 msgstr ""
 
@@ -887,7 +887,6 @@ msgid "Updates"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:10
-#: bookwyrm/templates/layout.html:58
 #: bookwyrm/templates/user/shelf/books_header.html:3
 msgid "Your books"
 msgstr ""
@@ -942,7 +941,7 @@ msgid "What are you reading?"
 msgstr ""
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:120
+#: bookwyrm/templates/lists/list.html:135
 msgid "Search for a book"
 msgstr ""
 
@@ -962,7 +961,7 @@ msgstr ""
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
 #: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
-#: bookwyrm/templates/lists/list.html:124
+#: bookwyrm/templates/lists/list.html:139
 #: bookwyrm/templates/search/layout.html:4
 #: bookwyrm/templates/search/layout.html:9
 msgid "Search"
@@ -978,7 +977,7 @@ msgid "Popular on %(site_name)s"
 msgstr ""
 
 #: bookwyrm/templates/get_started/books.html:58
-#: bookwyrm/templates/lists/list.html:137
+#: bookwyrm/templates/lists/list.html:152
 msgid "No books found"
 msgstr ""
 
@@ -1090,7 +1089,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr ""
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/layout.html:97
+#: bookwyrm/templates/user/shelf/shelf.html:40
 msgid "Import Books"
 msgstr ""
 
@@ -1175,14 +1174,14 @@ msgstr ""
 
 #: bookwyrm/templates/import_status.html:114
 #: bookwyrm/templates/snippets/create_status_form.html:13
-#: bookwyrm/templates/user/shelf/shelf.html:78
-#: bookwyrm/templates/user/shelf/shelf.html:98
+#: bookwyrm/templates/user/shelf/shelf.html:79
+#: bookwyrm/templates/user/shelf/shelf.html:99
 msgid "Title"
 msgstr ""
 
 #: bookwyrm/templates/import_status.html:117
-#: bookwyrm/templates/user/shelf/shelf.html:79
-#: bookwyrm/templates/user/shelf/shelf.html:101
+#: bookwyrm/templates/user/shelf/shelf.html:80
+#: bookwyrm/templates/user/shelf/shelf.html:102
 msgid "Author"
 msgstr ""
 
@@ -1224,15 +1223,19 @@ msgstr ""
 msgid "Main navigation menu"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:61
+#: bookwyrm/templates/layout.html:58
 msgid "Feed"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:102
+#: bookwyrm/templates/layout.html:87
+msgid "Your Books"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:97
 msgid "Settings"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:111
+#: bookwyrm/templates/layout.html:106
 #: bookwyrm/templates/settings/admin_layout.html:31
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
@@ -1240,45 +1243,45 @@ msgstr ""
 msgid "Invites"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:118
+#: bookwyrm/templates/layout.html:113
 msgid "Admin"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:125
+#: bookwyrm/templates/layout.html:120
 msgid "Log out"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
+#: bookwyrm/templates/layout.html:128 bookwyrm/templates/layout.html:129
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:154 bookwyrm/templates/layout.html:158
+#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:159
+#: bookwyrm/templates/layout.html:156
 msgid "password"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:163 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:171
+#: bookwyrm/templates/layout.html:168
 msgid "Join"
 msgstr ""
 
 #: bookwyrm/templates/layout.html:206
-msgid "About this server"
+msgid "About this instance"
 msgstr ""
 
 #: bookwyrm/templates/layout.html:210
@@ -1338,7 +1341,7 @@ msgid "Discard"
 msgstr ""
 
 #: bookwyrm/templates/lists/edit_form.html:5
-#: bookwyrm/templates/lists/list_layout.html:17
+#: bookwyrm/templates/lists/list_layout.html:16
 msgid "Edit List"
 msgstr ""
 
@@ -1385,54 +1388,55 @@ msgstr ""
 msgid "This list is currently empty"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:65
+#: bookwyrm/templates/lists/list.html:66
 #, python-format
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:77
-msgid "Set"
-msgstr ""
-
-#: bookwyrm/templates/lists/list.html:80
+#: bookwyrm/templates/lists/list.html:74
 msgid "List position"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:86
+#: bookwyrm/templates/lists/list.html:81
+msgid "Set"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:89
 #: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:99 bookwyrm/templates/lists/list.html:111
+#: bookwyrm/templates/lists/list.html:103
+#: bookwyrm/templates/lists/list.html:120
 msgid "Sort List"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:105
+#: bookwyrm/templates/lists/list.html:113
 msgid "Direction"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:116
+#: bookwyrm/templates/lists/list.html:127
 msgid "Add Books"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:116
+#: bookwyrm/templates/lists/list.html:129
 msgid "Suggest Books"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:125
+#: bookwyrm/templates/lists/list.html:140
 msgid "search"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:131
+#: bookwyrm/templates/lists/list.html:146
 msgid "Clear search"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:136
+#: bookwyrm/templates/lists/list.html:151
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:164
+#: bookwyrm/templates/lists/list.html:179
 msgid "Suggest"
 msgstr ""
 
@@ -1523,7 +1527,7 @@ msgstr ""
 
 #: bookwyrm/templates/moderation/reports.html:6
 #, python-format
-msgid "Reports: %(server_name)s"
+msgid "Reports: %(instance_name)s"
 msgstr ""
 
 #: bookwyrm/templates/moderation/reports.html:8
@@ -1534,7 +1538,7 @@ msgstr ""
 
 #: bookwyrm/templates/moderation/reports.html:14
 #, python-format
-msgid "Reports: <small>%(server_name)s</small>"
+msgid "Reports: <small>%(instance_name)s</small>"
 msgstr ""
 
 #: bookwyrm/templates/moderation/reports.html:28
@@ -1733,6 +1737,26 @@ msgstr ""
 msgid "Relationships"
 msgstr ""
 
+#: bookwyrm/templates/rss/title.html:5
+#: bookwyrm/templates/snippets/status/status_header.html:35
+msgid "rated"
+msgstr ""
+
+#: bookwyrm/templates/rss/title.html:7
+#: bookwyrm/templates/snippets/status/status_header.html:37
+msgid "reviewed"
+msgstr ""
+
+#: bookwyrm/templates/rss/title.html:9
+#: bookwyrm/templates/snippets/status/status_header.html:39
+msgid "commented on"
+msgstr ""
+
+#: bookwyrm/templates/rss/title.html:11
+#: bookwyrm/templates/snippets/status/status_header.html:41
+msgid "quoted"
+msgstr ""
+
 #: bookwyrm/templates/search/book.html:64
 msgid "Load results from other catalogues"
 msgstr ""
@@ -1783,7 +1807,7 @@ msgstr ""
 #: bookwyrm/templates/settings/admin_layout.html:39
 #: bookwyrm/templates/settings/federation.html:3
 #: bookwyrm/templates/settings/federation.html:5
-msgid "Federated Servers"
+msgid "Federated Instances"
 msgstr ""
 
 #: bookwyrm/templates/settings/admin_layout.html:44
@@ -1833,6 +1857,7 @@ msgid "Back to list"
 msgstr ""
 
 #: bookwyrm/templates/settings/announcement.html:11
+#: bookwyrm/templates/settings/announcement_form.html:6
 msgid "Edit Announcement"
 msgstr ""
 
@@ -1866,7 +1891,7 @@ msgstr ""
 msgid "Active:"
 msgstr ""
 
-#: bookwyrm/templates/settings/announcement_form.html:5
+#: bookwyrm/templates/settings/announcement_form.html:8
 #: bookwyrm/templates/settings/announcements.html:8
 msgid "Create Announcement"
 msgstr ""
@@ -1910,12 +1935,12 @@ msgstr ""
 #: bookwyrm/templates/settings/federation.html:10
 #: bookwyrm/templates/settings/server_blocklist.html:3
 #: bookwyrm/templates/settings/server_blocklist.html:20
-msgid "Add server"
+msgid "Add instance"
 msgstr ""
 
 #: bookwyrm/templates/settings/edit_server.html:7
 #: bookwyrm/templates/settings/server_blocklist.html:7
-msgid "Back to server list"
+msgid "Back to instance list"
 msgstr ""
 
 #: bookwyrm/templates/settings/edit_server.html:16
@@ -2022,7 +2047,7 @@ msgstr ""
 
 #: bookwyrm/templates/settings/federation.html:19
 #: bookwyrm/templates/user_admin/server_filter.html:5
-msgid "Server name"
+msgid "Instance name"
 msgstr ""
 
 #: bookwyrm/templates/settings/federation.html:23
@@ -2144,7 +2169,7 @@ msgid "Import Blocklist"
 msgstr ""
 
 #: bookwyrm/templates/settings/server_blocklist.html:26
-#: bookwyrm/templates/snippets/goal_progress.html:5
+#: bookwyrm/templates/snippets/goal_progress.html:7
 msgid "Success!"
 msgstr ""
 
@@ -2230,13 +2255,13 @@ msgstr ""
 msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgstr ""
 
-#: bookwyrm/templates/snippets/boost_button.html:9
-#: bookwyrm/templates/snippets/boost_button.html:10
+#: bookwyrm/templates/snippets/boost_button.html:20
+#: bookwyrm/templates/snippets/boost_button.html:21
 msgid "Boost"
 msgstr ""
 
-#: bookwyrm/templates/snippets/boost_button.html:16
-#: bookwyrm/templates/snippets/boost_button.html:17
+#: bookwyrm/templates/snippets/boost_button.html:33
+#: bookwyrm/templates/snippets/boost_button.html:34
 msgid "Un-boost"
 msgstr ""
 
@@ -2326,13 +2351,13 @@ msgstr ""
 msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr ""
 
-#: bookwyrm/templates/snippets/fav_button.html:9
-#: bookwyrm/templates/snippets/fav_button.html:11
+#: bookwyrm/templates/snippets/fav_button.html:10
+#: bookwyrm/templates/snippets/fav_button.html:12
 msgid "Like"
 msgstr ""
 
-#: bookwyrm/templates/snippets/fav_button.html:17
 #: bookwyrm/templates/snippets/fav_button.html:18
+#: bookwyrm/templates/snippets/fav_button.html:19
 msgid "Un-like"
 msgstr ""
 
@@ -2427,17 +2452,17 @@ msgstr ""
 msgid "Set goal"
 msgstr ""
 
-#: bookwyrm/templates/snippets/goal_progress.html:7
+#: bookwyrm/templates/snippets/goal_progress.html:9
 #, python-format
 msgid "%(percent)s%% complete!"
 msgstr ""
 
-#: bookwyrm/templates/snippets/goal_progress.html:10
+#: bookwyrm/templates/snippets/goal_progress.html:12
 #, python-format
 msgid "You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
 msgstr ""
 
-#: bookwyrm/templates/snippets/goal_progress.html:12
+#: bookwyrm/templates/snippets/goal_progress.html:14
 #, python-format
 msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
 msgstr ""
@@ -2546,26 +2571,6 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: bookwyrm/templates/snippets/rss_title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:35
-msgid "rated"
-msgstr ""
-
-#: bookwyrm/templates/snippets/rss_title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:37
-msgid "reviewed"
-msgstr ""
-
-#: bookwyrm/templates/snippets/rss_title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:39
-msgid "commented on"
-msgstr ""
-
-#: bookwyrm/templates/snippets/rss_title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:41
-msgid "quoted"
-msgstr ""
-
 #: bookwyrm/templates/snippets/search_result_text.html:36
 msgid "Import book"
 msgstr ""
@@ -2735,7 +2740,7 @@ msgstr ""
 msgid "Update shelf"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:51
+#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:56
 msgid "All books"
 msgstr ""
 
@@ -2743,30 +2748,30 @@ msgstr ""
 msgid "Create shelf"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:61
+#: bookwyrm/templates/user/shelf/shelf.html:62
 msgid "Edit shelf"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:80
-#: bookwyrm/templates/user/shelf/shelf.html:104
+#: bookwyrm/templates/user/shelf/shelf.html:81
+#: bookwyrm/templates/user/shelf/shelf.html:105
 msgid "Shelved"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:81
-#: bookwyrm/templates/user/shelf/shelf.html:108
+#: bookwyrm/templates/user/shelf/shelf.html:82
+#: bookwyrm/templates/user/shelf/shelf.html:109
 msgid "Started"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:82
-#: bookwyrm/templates/user/shelf/shelf.html:111
+#: bookwyrm/templates/user/shelf/shelf.html:83
+#: bookwyrm/templates/user/shelf/shelf.html:112
 msgid "Finished"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:137
+#: bookwyrm/templates/user/shelf/shelf.html:138
 msgid "This shelf is empty."
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:143
+#: bookwyrm/templates/user/shelf/shelf.html:144
 msgid "Delete shelf"
 msgstr ""
 
@@ -2825,7 +2830,7 @@ msgstr ""
 
 #: bookwyrm/templates/user_admin/user_admin.html:7
 #, python-format
-msgid "Users: <small>%(server_name)s</small>"
+msgid "Users: <small>%(instance_name)s</small>"
 msgstr ""
 
 #: bookwyrm/templates/user_admin/user_admin.html:22
@@ -2842,7 +2847,7 @@ msgid "Last Active"
 msgstr ""
 
 #: bookwyrm/templates/user_admin/user_admin.html:38
-msgid "Remote server"
+msgid "Remote instance"
 msgstr ""
 
 #: bookwyrm/templates/user_admin/user_admin.html:47
@@ -2886,6 +2891,10 @@ msgstr ""
 msgid "Access level:"
 msgstr ""
 
+#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:3
+msgid "File exceeds maximum size: 10MB"
+msgstr ""
+
 #: bookwyrm/views/import_data.py:67
 msgid "Not a valid csv file"
 msgstr ""
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index cbf07ea5..012d1e13 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-25 01:44+0000\n"
+"POT-Creation-Date: 2021-06-01 14:49-0700\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -73,41 +73,41 @@ msgstr "Ascendente"
 msgid "Descending"
 msgstr "Descendente"
 
-#: bookwyrm/models/fields.py:24
+#: bookwyrm/models/fields.py:25
 #, python-format
 msgid "%(value)s is not a valid remote_id"
 msgstr "%(value)s no es un remote_id válido"
 
-#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
+#: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:43
 #, python-format
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s no es un usuario válido"
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:152
+#: bookwyrm/models/fields.py:166 bookwyrm/templates/layout.html:152
 msgid "username"
 msgstr "nombre de usuario"
 
-#: bookwyrm/models/fields.py:170
+#: bookwyrm/models/fields.py:171
 msgid "A user with that username already exists."
 msgstr "Ya existe un usuario con ese nombre."
 
-#: bookwyrm/settings.py:155
+#: bookwyrm/settings.py:156
 msgid "English"
 msgstr "Inglés"
 
-#: bookwyrm/settings.py:156
+#: bookwyrm/settings.py:157
 msgid "German"
 msgstr "Aléman"
 
-#: bookwyrm/settings.py:157
+#: bookwyrm/settings.py:158
 msgid "Spanish"
 msgstr "Español"
 
-#: bookwyrm/settings.py:158
+#: bookwyrm/settings.py:159
 msgid "French"
 msgstr "Francés"
 
-#: bookwyrm/settings.py:159
+#: bookwyrm/settings.py:160
 msgid "Simplified Chinese"
 msgstr "Chino simplificado"
 
@@ -1281,7 +1281,9 @@ msgid "Join"
 msgstr "Unirse"
 
 #: bookwyrm/templates/layout.html:206
-msgid "About this server"
+#, fuzzy
+#| msgid "About this server"
+msgid "About this instance"
 msgstr "Sobre este servidor"
 
 #: bookwyrm/templates/layout.html:210
@@ -1526,8 +1528,9 @@ msgid "Resolve"
 msgstr "Resolver"
 
 #: bookwyrm/templates/moderation/reports.html:6
-#, python-format
-msgid "Reports: %(server_name)s"
+#, fuzzy, python-format
+#| msgid "Reports: %(server_name)s"
+msgid "Reports: %(instance_name)s"
 msgstr "Informes: %(server_name)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
@@ -1537,9 +1540,10 @@ msgid "Reports"
 msgstr "Informes"
 
 #: bookwyrm/templates/moderation/reports.html:14
-#, python-format
-msgid "Reports: <small>%(server_name)s</small>"
-msgstr "Informes: <small>%(server_name)s</small>"
+#, fuzzy, python-format
+#| msgid "Users: <small>%(server_name)s</small>"
+msgid "Reports: <small>%(instance_name)s</small>"
+msgstr "Usuarios <small>%(server_name)s</small>"
 
 #: bookwyrm/templates/moderation/reports.html:28
 msgid "Resolved"
@@ -1660,6 +1664,7 @@ msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> t
 msgstr " sugirió agregar <em><a href=\"%(book_path)s\">%(book_title)s</a></em> a tu lista \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 
 #: bookwyrm/templates/notifications.html:128
+#, python-format
 msgid "Your <a href=\"%(url)s\">import</a> completed."
 msgstr "Tu <a href=\"%(url)s\">importación</a> ha terminado."
 
@@ -1791,6 +1796,7 @@ msgid "Users"
 msgstr "Usuarios"
 
 #: bookwyrm/templates/search/layout.html:58
+#, python-format
 msgid "No results found for \"%(query)s\""
 msgstr "No se encontró ningún resultado correspondiente a \"%(query)s\""
 
@@ -1805,7 +1811,9 @@ msgstr "Administrar usuarios"
 #: bookwyrm/templates/settings/admin_layout.html:39
 #: bookwyrm/templates/settings/federation.html:3
 #: bookwyrm/templates/settings/federation.html:5
-msgid "Federated Servers"
+#, fuzzy
+#| msgid "Federated Servers"
+msgid "Federated Instances"
 msgstr "Servidores federalizados"
 
 #: bookwyrm/templates/settings/admin_layout.html:44
@@ -1933,12 +1941,16 @@ msgstr "inactivo"
 #: bookwyrm/templates/settings/federation.html:10
 #: bookwyrm/templates/settings/server_blocklist.html:3
 #: bookwyrm/templates/settings/server_blocklist.html:20
-msgid "Add server"
-msgstr "Agregar servidor"
+#, fuzzy
+#| msgid "View instance"
+msgid "Add instance"
+msgstr "Ver instancia"
 
 #: bookwyrm/templates/settings/edit_server.html:7
 #: bookwyrm/templates/settings/server_blocklist.html:7
-msgid "Back to server list"
+#, fuzzy
+#| msgid "Back to server list"
+msgid "Back to instance list"
 msgstr "Volver a la lista de servidores"
 
 #: bookwyrm/templates/settings/edit_server.html:16
@@ -2045,8 +2057,10 @@ msgstr "Todos los usuarios en esta instancia serán re-activados."
 
 #: bookwyrm/templates/settings/federation.html:19
 #: bookwyrm/templates/user_admin/server_filter.html:5
-msgid "Server name"
-msgstr "Nombre de servidor"
+#, fuzzy
+#| msgid "Instance Name:"
+msgid "Instance name"
+msgstr "Nombre de instancia:"
 
 #: bookwyrm/templates/settings/federation.html:23
 msgid "Date federated"
@@ -2240,6 +2254,7 @@ msgid "Registration closed text:"
 msgstr "Texto de registración cerrada:"
 
 #: bookwyrm/templates/snippets/announcement.html:31
+#, python-format
 msgid "Posted by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "Publicado por <a href=\"%(user_path)s\">%(username)s</a>"
 
@@ -2395,14 +2410,6 @@ msgstr "Aceptar"
 msgid "No rating"
 msgstr "No calificación"
 
-#: bookwyrm/templates/snippets/form_rate_stars.html:44
-#: bookwyrm/templates/snippets/stars.html:7
-#, python-format
-msgid "%(rating)s star"
-msgid_plural "%(rating)s stars"
-msgstr[0] "%(rating)s estrella"
-msgstr[1] "%(rating)s estrellas"
-
 #: bookwyrm/templates/snippets/generated_status/goal.html:1
 #, python-format
 msgid "set a goal to read %(counter)s book in %(year)s"
@@ -2478,6 +2485,8 @@ msgid "page %(page)s of %(total_pages)s"
 msgstr "página %(page)s de %(total_pages)s"
 
 #: bookwyrm/templates/snippets/page_text.html:6
+#, fuzzy, python-format
+#| msgid "page %(page)s"
 msgid "page %(page)s"
 msgstr "página %(pages)s"
 
@@ -2822,6 +2831,7 @@ msgid "%(counter)s following"
 msgstr "%(counter)s siguiendo"
 
 #: bookwyrm/templates/user/user_preview.html:26
+#, python-format
 msgid "%(mutuals_display)s follower you follow"
 msgid_plural "%(mutuals_display)s followers you follow"
 msgstr[0] "%(mutuals_display)s seguidor que sigues"
@@ -2832,8 +2842,9 @@ msgid "Back to users"
 msgstr "Volver a usuarios"
 
 #: bookwyrm/templates/user_admin/user_admin.html:7
-#, python-format
-msgid "Users: <small>%(server_name)s</small>"
+#, fuzzy, python-format
+#| msgid "Users: <small>%(server_name)s</small>"
+msgid "Users: <small>%(instance_name)s</small>"
 msgstr "Usuarios <small>%(server_name)s</small>"
 
 #: bookwyrm/templates/user_admin/user_admin.html:22
@@ -2850,8 +2861,10 @@ msgid "Last Active"
 msgstr "Actividad reciente"
 
 #: bookwyrm/templates/user_admin/user_admin.html:38
-msgid "Remote server"
-msgstr "Quitar servidor"
+#, fuzzy
+#| msgid "View instance"
+msgid "Remote instance"
+msgstr "Ver instancia"
 
 #: bookwyrm/templates/user_admin/user_admin.html:47
 msgid "Active"
@@ -2894,6 +2907,10 @@ msgstr "Des-suspender usuario"
 msgid "Access level:"
 msgstr "Nivel de acceso:"
 
+#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:3
+msgid "File exceeds maximum size: 10MB"
+msgstr ""
+
 #: bookwyrm/views/import_data.py:67
 msgid "Not a valid csv file"
 msgstr "No un archivo csv válido"
@@ -2907,6 +2924,28 @@ msgstr "No se pudo encontrar un usuario con esa dirección de correo electrónic
 msgid "A password reset link sent to %s"
 msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 
+#, python-format
+#~ msgid "Reports: <small>%(server_name)s</small>"
+#~ msgstr "Informes: <small>%(server_name)s</small>"
+
+#~ msgid "Federated Servers"
+#~ msgstr "Servidores federalizados"
+
+#~ msgid "Server name"
+#~ msgstr "Nombre de servidor"
+
+#~ msgid "Add server"
+#~ msgstr "Agregar servidor"
+
+#~ msgid "Remote server"
+#~ msgstr "Quitar servidor"
+
+#, python-format
+#~ msgid "%(rating)s star"
+#~ msgid_plural "%(rating)s stars"
+#~ msgstr[0] "%(rating)s estrella"
+#~ msgstr[1] "%(rating)s estrellas"
+
 #, fuzzy
 #~| msgid "BookWyrm users"
 #~ msgid "BookWyrm\\"
diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index a96f9d76..71b154ba 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-23 10:45+0000\n"
+"POT-Creation-Date: 2021-06-01 14:49-0700\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"
@@ -56,12 +56,12 @@ msgid "Book Title"
 msgstr "Titre du livre"
 
 #: bookwyrm/forms.py:301 bookwyrm/templates/snippets/create_status_form.html:34
-#: bookwyrm/templates/user/shelf/shelf.html:84
-#: bookwyrm/templates/user/shelf/shelf.html:115
+#: bookwyrm/templates/user/shelf/shelf.html:85
+#: bookwyrm/templates/user/shelf/shelf.html:116
 msgid "Rating"
 msgstr "Note"
 
-#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:101
+#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:107
 msgid "Sort By"
 msgstr "Trier par"
 
@@ -73,41 +73,41 @@ msgstr "Ordre croissant"
 msgid "Descending"
 msgstr "Ordre décroissant"
 
-#: bookwyrm/models/fields.py:24
+#: bookwyrm/models/fields.py:25
 #, python-format
 msgid "%(value)s is not a valid remote_id"
 msgstr "%(value)s n’est pas une remote_id valide."
 
-#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
+#: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:43
 #, python-format
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s n’est pas un nom de compte valide."
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:157
+#: bookwyrm/models/fields.py:166 bookwyrm/templates/layout.html:152
 msgid "username"
 msgstr "nom du compte :"
 
-#: bookwyrm/models/fields.py:170
+#: bookwyrm/models/fields.py:171
 msgid "A user with that username already exists."
 msgstr "Ce nom est déjà associé à un compte."
 
-#: bookwyrm/settings.py:155
+#: bookwyrm/settings.py:156
 msgid "English"
 msgstr "English"
 
-#: bookwyrm/settings.py:156
+#: bookwyrm/settings.py:157
 msgid "German"
 msgstr "Deutsch"
 
-#: bookwyrm/settings.py:157
+#: bookwyrm/settings.py:158
 msgid "Spanish"
 msgstr "Español"
 
-#: bookwyrm/settings.py:158
+#: bookwyrm/settings.py:159
 msgid "French"
 msgstr "Français"
 
-#: bookwyrm/settings.py:159
+#: bookwyrm/settings.py:160
 msgid "Simplified Chinese"
 msgstr "简化字"
 
@@ -367,7 +367,7 @@ msgstr "Sujets"
 msgid "Places"
 msgstr "Lieux"
 
-#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:61
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
@@ -381,7 +381,7 @@ msgstr "Ajouter à la liste"
 
 #: bookwyrm/templates/book/book.html:297
 #: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:164
+#: bookwyrm/templates/lists/list.html:179
 msgid "Add"
 msgstr "Ajouter"
 
@@ -511,7 +511,7 @@ msgid "John Doe, Jane Smith"
 msgstr "Claude Dupont, Dominique Durand"
 
 #: bookwyrm/templates/book/edit_book.html:183
-#: bookwyrm/templates/user/shelf/shelf.html:77
+#: bookwyrm/templates/user/shelf/shelf.html:78
 msgid "Cover"
 msgstr "Couverture"
 
@@ -630,7 +630,7 @@ msgstr "Communauté fédérée"
 
 #: bookwyrm/templates/directory/directory.html:4
 #: bookwyrm/templates/directory/directory.html:9
-#: bookwyrm/templates/layout.html:92
+#: bookwyrm/templates/layout.html:64
 msgid "Directory"
 msgstr "Répertoire"
 
@@ -831,7 +831,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:87
+#: bookwyrm/templates/layout.html:92
 msgid "Direct Messages"
 msgstr "Messages directs"
 
@@ -887,7 +887,6 @@ msgid "Updates"
 msgstr "Mises à jour"
 
 #: bookwyrm/templates/feed/feed_layout.html:10
-#: bookwyrm/templates/layout.html:58
 #: bookwyrm/templates/user/shelf/books_header.html:3
 msgid "Your books"
 msgstr "Vos livres"
@@ -942,7 +941,7 @@ msgid "What are you reading?"
 msgstr "Que lisez‑vous ?"
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:120
+#: bookwyrm/templates/lists/list.html:135
 msgid "Search for a book"
 msgstr "Chercher un livre"
 
@@ -962,7 +961,7 @@ msgstr "Vous pourrez ajouter des livres lorsque vous commencerez à utiliser %(s
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
 #: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
-#: bookwyrm/templates/lists/list.html:124
+#: bookwyrm/templates/lists/list.html:139
 #: bookwyrm/templates/search/layout.html:4
 #: bookwyrm/templates/search/layout.html:9
 msgid "Search"
@@ -978,7 +977,7 @@ msgid "Popular on %(site_name)s"
 msgstr "Populaire sur %(site_name)s"
 
 #: bookwyrm/templates/get_started/books.html:58
-#: bookwyrm/templates/lists/list.html:137
+#: bookwyrm/templates/lists/list.html:152
 msgid "No books found"
 msgstr "Aucun livre trouvé"
 
@@ -1090,7 +1089,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "Livres de %(username)s en %(year)s"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/layout.html:97
+#: bookwyrm/templates/user/shelf/shelf.html:40
 msgid "Import Books"
 msgstr "Importer des livres"
 
@@ -1175,14 +1174,14 @@ msgstr "Livre"
 
 #: bookwyrm/templates/import_status.html:114
 #: bookwyrm/templates/snippets/create_status_form.html:13
-#: bookwyrm/templates/user/shelf/shelf.html:78
-#: bookwyrm/templates/user/shelf/shelf.html:98
+#: bookwyrm/templates/user/shelf/shelf.html:79
+#: bookwyrm/templates/user/shelf/shelf.html:99
 msgid "Title"
 msgstr "Titre"
 
 #: bookwyrm/templates/import_status.html:117
-#: bookwyrm/templates/user/shelf/shelf.html:79
-#: bookwyrm/templates/user/shelf/shelf.html:101
+#: bookwyrm/templates/user/shelf/shelf.html:80
+#: bookwyrm/templates/user/shelf/shelf.html:102
 msgid "Author"
 msgstr "Auteur ou autrice"
 
@@ -1224,15 +1223,21 @@ msgstr "Chercher un livre ou un compte"
 msgid "Main navigation menu"
 msgstr "Menu de navigation principal "
 
-#: bookwyrm/templates/layout.html:61
+#: bookwyrm/templates/layout.html:58
 msgid "Feed"
 msgstr "Fil d’actualité"
 
-#: bookwyrm/templates/layout.html:102
+#: bookwyrm/templates/layout.html:87
+#, fuzzy
+#| msgid "Your books"
+msgid "Your Books"
+msgstr "Vos livres"
+
+#: bookwyrm/templates/layout.html:97
 msgid "Settings"
 msgstr "Paramètres"
 
-#: bookwyrm/templates/layout.html:111
+#: bookwyrm/templates/layout.html:106
 #: bookwyrm/templates/settings/admin_layout.html:31
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
@@ -1240,61 +1245,63 @@ msgstr "Paramètres"
 msgid "Invites"
 msgstr "Invitations"
 
-#: bookwyrm/templates/layout.html:118
+#: bookwyrm/templates/layout.html:113
 msgid "Admin"
 msgstr "Admin"
 
-#: bookwyrm/templates/layout.html:125
+#: bookwyrm/templates/layout.html:120
 msgid "Log out"
 msgstr "Se déconnecter"
 
-#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
+#: bookwyrm/templates/layout.html:128 bookwyrm/templates/layout.html:129
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr "Notifications"
 
-#: bookwyrm/templates/layout.html:156 bookwyrm/templates/layout.html:160
+#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "Nom du compte :"
 
-#: bookwyrm/templates/layout.html:161
+#: bookwyrm/templates/layout.html:156
 msgid "password"
 msgstr "Mot de passe"
 
-#: bookwyrm/templates/layout.html:162 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr "Mot de passe oublié ?"
 
-#: bookwyrm/templates/layout.html:165 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "Se connecter"
 
-#: bookwyrm/templates/layout.html:173
+#: bookwyrm/templates/layout.html:168
 msgid "Join"
 msgstr "Rejoindre"
 
-#: bookwyrm/templates/layout.html:211
-msgid "About this server"
+#: bookwyrm/templates/layout.html:206
+#, fuzzy
+#| msgid "About this server"
+msgid "About this instance"
 msgstr "À propos de ce serveur"
 
-#: bookwyrm/templates/layout.html:215
+#: bookwyrm/templates/layout.html:210
 msgid "Contact site admin"
 msgstr "Contacter l’administrateur du site"
 
-#: bookwyrm/templates/layout.html:219
+#: bookwyrm/templates/layout.html:214
 msgid "Documentation"
 msgstr "Documentation"
 
-#: bookwyrm/templates/layout.html:226
+#: bookwyrm/templates/layout.html:221
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr "Soutenez %(site_name)s avec <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 
-#: bookwyrm/templates/layout.html:230
+#: bookwyrm/templates/layout.html:225
 msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr "BookWyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports de bogues via <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
@@ -1338,7 +1345,7 @@ msgid "Discard"
 msgstr "Rejeter"
 
 #: bookwyrm/templates/lists/edit_form.html:5
-#: bookwyrm/templates/lists/list_layout.html:17
+#: bookwyrm/templates/lists/list_layout.html:16
 msgid "Edit List"
 msgstr "Modifier la liste"
 
@@ -1385,54 +1392,55 @@ msgstr "Vous avez ajouté un livre à cette liste !"
 msgid "This list is currently empty"
 msgstr "Cette liste est actuellement vide"
 
-#: bookwyrm/templates/lists/list.html:65
+#: bookwyrm/templates/lists/list.html:66
 #, python-format
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "Ajouté par <a href=\"%(user_path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/lists/list.html:77
-msgid "Set"
-msgstr "Appliquer"
-
-#: bookwyrm/templates/lists/list.html:80
+#: bookwyrm/templates/lists/list.html:74
 msgid "List position"
 msgstr "Position"
 
-#: bookwyrm/templates/lists/list.html:86
+#: bookwyrm/templates/lists/list.html:81
+msgid "Set"
+msgstr "Appliquer"
+
+#: bookwyrm/templates/lists/list.html:89
 #: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr "Retirer"
 
-#: bookwyrm/templates/lists/list.html:99 bookwyrm/templates/lists/list.html:111
+#: bookwyrm/templates/lists/list.html:103
+#: bookwyrm/templates/lists/list.html:120
 msgid "Sort List"
 msgstr "Trier la liste"
 
-#: bookwyrm/templates/lists/list.html:105
+#: bookwyrm/templates/lists/list.html:113
 msgid "Direction"
 msgstr "Direction"
 
-#: bookwyrm/templates/lists/list.html:116
+#: bookwyrm/templates/lists/list.html:127
 msgid "Add Books"
 msgstr "Ajouter des livres"
 
-#: bookwyrm/templates/lists/list.html:116
+#: bookwyrm/templates/lists/list.html:129
 msgid "Suggest Books"
 msgstr "Suggérer des livres"
 
-#: bookwyrm/templates/lists/list.html:125
+#: bookwyrm/templates/lists/list.html:140
 msgid "search"
 msgstr "chercher"
 
-#: bookwyrm/templates/lists/list.html:131
+#: bookwyrm/templates/lists/list.html:146
 msgid "Clear search"
 msgstr "Vider la requête"
 
-#: bookwyrm/templates/lists/list.html:136
+#: bookwyrm/templates/lists/list.html:151
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
 msgstr "Aucun livre trouvé pour la requête « %(query)s »"
 
-#: bookwyrm/templates/lists/list.html:164
+#: bookwyrm/templates/lists/list.html:179
 msgid "Suggest"
 msgstr "Suggérer"
 
@@ -1522,8 +1530,9 @@ msgid "Resolve"
 msgstr "Résoudre"
 
 #: bookwyrm/templates/moderation/reports.html:6
-#, python-format
-msgid "Reports: %(server_name)s"
+#, fuzzy, python-format
+#| msgid "Reports: %(server_name)s"
+msgid "Reports: %(instance_name)s"
 msgstr "Signalements : %(server_name)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
@@ -1533,9 +1542,10 @@ msgid "Reports"
 msgstr "Signalements"
 
 #: bookwyrm/templates/moderation/reports.html:14
-#, python-format
-msgid "Reports: <small>%(server_name)s</small>"
-msgstr "Signalements: <small>%(server_name)s</small>"
+#, fuzzy, python-format
+#| msgid "Users: <small>%(server_name)s</small>"
+msgid "Reports: <small>%(instance_name)s</small>"
+msgstr "Comptes : <small>%(server_name)s</small>"
 
 #: bookwyrm/templates/moderation/reports.html:28
 msgid "Resolved"
@@ -1803,7 +1813,9 @@ msgstr "Gérer les comptes"
 #: bookwyrm/templates/settings/admin_layout.html:39
 #: bookwyrm/templates/settings/federation.html:3
 #: bookwyrm/templates/settings/federation.html:5
-msgid "Federated Servers"
+#, fuzzy
+#| msgid "Federated Servers"
+msgid "Federated Instances"
 msgstr "Serveurs fédérés"
 
 #: bookwyrm/templates/settings/admin_layout.html:44
@@ -1931,12 +1943,16 @@ msgstr "inactive"
 #: bookwyrm/templates/settings/federation.html:10
 #: bookwyrm/templates/settings/server_blocklist.html:3
 #: bookwyrm/templates/settings/server_blocklist.html:20
-msgid "Add server"
-msgstr "Ajouter un serveur"
+#, fuzzy
+#| msgid "View instance"
+msgid "Add instance"
+msgstr "Voir l’instance"
 
 #: bookwyrm/templates/settings/edit_server.html:7
 #: bookwyrm/templates/settings/server_blocklist.html:7
-msgid "Back to server list"
+#, fuzzy
+#| msgid "Back to server list"
+msgid "Back to instance list"
 msgstr "Retour à la liste des serveurs"
 
 #: bookwyrm/templates/settings/edit_server.html:16
@@ -2043,8 +2059,10 @@ msgstr "Tous les comptes de cette instance seront réactivés."
 
 #: bookwyrm/templates/settings/federation.html:19
 #: bookwyrm/templates/user_admin/server_filter.html:5
-msgid "Server name"
-msgstr "Nom du serveur"
+#, fuzzy
+#| msgid "Instance Name:"
+msgid "Instance name"
+msgstr "Nom de l’instance :"
 
 #: bookwyrm/templates/settings/federation.html:23
 msgid "Date federated"
@@ -2394,14 +2412,6 @@ msgstr "Accepter"
 msgid "No rating"
 msgstr "Aucune note"
 
-#: bookwyrm/templates/snippets/form_rate_stars.html:44
-#: bookwyrm/templates/snippets/stars.html:7
-#, python-format
-msgid "%(rating)s star"
-msgid_plural "%(rating)s stars"
-msgstr[0] "%(rating)s étoile"
-msgstr[1] "%(rating)s étoiles"
-
 #: bookwyrm/templates/snippets/generated_status/goal.html:1
 #, python-format
 msgid "set a goal to read %(counter)s book in %(year)s"
@@ -2752,30 +2762,30 @@ msgstr "Tous les livres"
 msgid "Create shelf"
 msgstr "Créer une étagère"
 
-#: bookwyrm/templates/user/shelf/shelf.html:61
+#: bookwyrm/templates/user/shelf/shelf.html:62
 msgid "Edit shelf"
 msgstr "Modifier l’étagère"
 
-#: bookwyrm/templates/user/shelf/shelf.html:80
-#: bookwyrm/templates/user/shelf/shelf.html:104
+#: bookwyrm/templates/user/shelf/shelf.html:81
+#: bookwyrm/templates/user/shelf/shelf.html:105
 msgid "Shelved"
 msgstr "Date d’ajout"
 
-#: bookwyrm/templates/user/shelf/shelf.html:81
-#: bookwyrm/templates/user/shelf/shelf.html:108
+#: bookwyrm/templates/user/shelf/shelf.html:82
+#: bookwyrm/templates/user/shelf/shelf.html:109
 msgid "Started"
 msgstr "Commencé"
 
-#: bookwyrm/templates/user/shelf/shelf.html:82
-#: bookwyrm/templates/user/shelf/shelf.html:111
+#: bookwyrm/templates/user/shelf/shelf.html:83
+#: bookwyrm/templates/user/shelf/shelf.html:112
 msgid "Finished"
 msgstr "Terminé"
 
-#: bookwyrm/templates/user/shelf/shelf.html:137
+#: bookwyrm/templates/user/shelf/shelf.html:138
 msgid "This shelf is empty."
 msgstr "Cette étagère est vide"
 
-#: bookwyrm/templates/user/shelf/shelf.html:143
+#: bookwyrm/templates/user/shelf/shelf.html:144
 msgid "Delete shelf"
 msgstr "Supprimer l’étagère"
 
@@ -2833,8 +2843,9 @@ msgid "Back to users"
 msgstr "Retour aux comptes"
 
 #: bookwyrm/templates/user_admin/user_admin.html:7
-#, python-format
-msgid "Users: <small>%(server_name)s</small>"
+#, fuzzy, python-format
+#| msgid "Users: <small>%(server_name)s</small>"
+msgid "Users: <small>%(instance_name)s</small>"
 msgstr "Comptes : <small>%(server_name)s</small>"
 
 #: bookwyrm/templates/user_admin/user_admin.html:22
@@ -2851,8 +2862,10 @@ msgid "Last Active"
 msgstr "Dernière activité"
 
 #: bookwyrm/templates/user_admin/user_admin.html:38
-msgid "Remote server"
-msgstr "Serveur distant"
+#, fuzzy
+#| msgid "View instance"
+msgid "Remote instance"
+msgstr "Voir l’instance"
 
 #: bookwyrm/templates/user_admin/user_admin.html:47
 msgid "Active"
@@ -2895,6 +2908,10 @@ msgstr "Rétablir le compte"
 msgid "Access level:"
 msgstr "Niveau d’accès :"
 
+#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:3
+msgid "File exceeds maximum size: 10MB"
+msgstr ""
+
 #: bookwyrm/views/import_data.py:67
 msgid "Not a valid csv file"
 msgstr "Fichier CSV non valide"
@@ -2908,6 +2925,28 @@ msgstr "Aucun compte avec cette adresse email n’a été trouvé."
 msgid "A password reset link sent to %s"
 msgstr "Un lien de réinitialisation a été envoyé à %s."
 
+#, python-format
+#~ msgid "Reports: <small>%(server_name)s</small>"
+#~ msgstr "Signalements: <small>%(server_name)s</small>"
+
+#~ msgid "Federated Servers"
+#~ msgstr "Serveurs fédérés"
+
+#~ msgid "Server name"
+#~ msgstr "Nom du serveur"
+
+#~ msgid "Add server"
+#~ msgstr "Ajouter un serveur"
+
+#~ msgid "Remote server"
+#~ msgstr "Serveur distant"
+
+#, python-format
+#~ msgid "%(rating)s star"
+#~ msgid_plural "%(rating)s stars"
+#~ msgstr[0] "%(rating)s étoile"
+#~ msgstr[1] "%(rating)s étoiles"
+
 #, fuzzy
 #~| msgid "BookWyrm users"
 #~ msgid "BookWyrm\\"
diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
index 0ec8b1d8..56b424a4 100644
--- a/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/locale/zh_Hans/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 14:40-0700\n"
+"POT-Creation-Date: 2021-06-01 14:49-0700\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"
@@ -58,12 +58,12 @@ msgid "Book Title"
 msgstr "标题"
 
 #: bookwyrm/forms.py:301 bookwyrm/templates/snippets/create_status_form.html:34
-#: bookwyrm/templates/user/shelf/shelf.html:84
-#: bookwyrm/templates/user/shelf/shelf.html:115
+#: bookwyrm/templates/user/shelf/shelf.html:85
+#: bookwyrm/templates/user/shelf/shelf.html:116
 msgid "Rating"
 msgstr "评价"
 
-#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:101
+#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:107
 msgid "Sort By"
 msgstr ""
 
@@ -79,41 +79,41 @@ msgstr "��排�"
 msgid "Descending"
 msgstr "��排�"
 
-#: bookwyrm/models/fields.py:24
+#: bookwyrm/models/fields.py:25
 #, python-format
 msgid "%(value)s is not a valid remote_id"
 msgstr "%(value)s �是有效的 remote_id"
 
-#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
+#: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:43
 #, python-format
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s �是有效的用户�"
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:155
+#: bookwyrm/models/fields.py:166 bookwyrm/templates/layout.html:152
 msgid "username"
 msgstr "用户�"
 
-#: bookwyrm/models/fields.py:170
+#: bookwyrm/models/fields.py:171
 msgid "A user with that username already exists."
 msgstr "已�存在使用该用户�的用户。"
 
-#: bookwyrm/settings.py:155
+#: bookwyrm/settings.py:156
 msgid "English"
 msgstr "English（英语）"
 
-#: bookwyrm/settings.py:156
+#: bookwyrm/settings.py:157
 msgid "German"
 msgstr "Deutsch（德语）"
 
-#: bookwyrm/settings.py:157
+#: bookwyrm/settings.py:158
 msgid "Spanish"
 msgstr "Español（西�牙语）"
 
-#: bookwyrm/settings.py:158
+#: bookwyrm/settings.py:159
 msgid "French"
 msgstr "Français（法语）"
 
-#: bookwyrm/settings.py:159
+#: bookwyrm/settings.py:160
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
@@ -260,7 +260,7 @@ msgstr "Goodreads key:"
 #: bookwyrm/templates/book/edit_book.html:263
 #: bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
-#: bookwyrm/templates/settings/announcement_form.html:65
+#: bookwyrm/templates/settings/announcement_form.html:69
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:98
 #: bookwyrm/templates/settings/site.html:97
@@ -386,7 +386,7 @@ msgstr "主题"
 msgid "Places"
 msgstr "地点"
 
-#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:61
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
@@ -400,7 +400,7 @@ msgstr "添加到列表"
 
 #: bookwyrm/templates/book/book.html:297
 #: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:164
+#: bookwyrm/templates/lists/list.html:179
 msgid "Add"
 msgstr "添加"
 
@@ -532,7 +532,7 @@ msgid "John Doe, Jane Smith"
 msgstr "张三, �四"
 
 #: bookwyrm/templates/book/edit_book.html:183
-#: bookwyrm/templates/user/shelf/shelf.html:77
+#: bookwyrm/templates/user/shelf/shelf.html:78
 msgid "Cover"
 msgstr "��"
 
@@ -655,7 +655,7 @@ msgstr "跨站社区"
 
 #: bookwyrm/templates/directory/directory.html:4
 #: bookwyrm/templates/directory/directory.html:9
-#: bookwyrm/templates/layout.html:92
+#: bookwyrm/templates/layout.html:64
 msgid "Directory"
 msgstr "目录"
 
@@ -854,7 +854,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr "与 <a href=\"%(path)s\">%(username)s</a> �信"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:87
+#: bookwyrm/templates/layout.html:92
 msgid "Direct Messages"
 msgstr "�信"
 
@@ -910,7 +910,6 @@ msgid "Updates"
 msgstr "æ›´æ–°"
 
 #: bookwyrm/templates/feed/feed_layout.html:10
-#: bookwyrm/templates/layout.html:58
 #: bookwyrm/templates/user/shelf/books_header.html:3
 msgid "Your books"
 msgstr "你的书目"
@@ -963,7 +962,7 @@ msgid "What are you reading?"
 msgstr "你在阅读什么？"
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:120
+#: bookwyrm/templates/lists/list.html:135
 msgid "Search for a book"
 msgstr "�索书目"
 
@@ -983,7 +982,7 @@ msgstr "你�以在开始使用 %(site_name)s �添加书目。"
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
 #: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
-#: bookwyrm/templates/lists/list.html:124
+#: bookwyrm/templates/lists/list.html:139
 #: bookwyrm/templates/search/layout.html:4
 #: bookwyrm/templates/search/layout.html:9
 msgid "Search"
@@ -999,7 +998,7 @@ msgid "Popular on %(site_name)s"
 msgstr "%(site_name)s 上的热门"
 
 #: bookwyrm/templates/get_started/books.html:58
-#: bookwyrm/templates/lists/list.html:137
+#: bookwyrm/templates/lists/list.html:152
 msgid "No books found"
 msgstr "没有找到书目"
 
@@ -1111,7 +1110,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "%(username)s 在 %(year)s 的书目"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/layout.html:97
+#: bookwyrm/templates/user/shelf/shelf.html:40
 msgid "Import Books"
 msgstr "导入书目"
 
@@ -1196,14 +1195,14 @@ msgstr "书目"
 
 #: bookwyrm/templates/import_status.html:114
 #: bookwyrm/templates/snippets/create_status_form.html:13
-#: bookwyrm/templates/user/shelf/shelf.html:78
-#: bookwyrm/templates/user/shelf/shelf.html:98
+#: bookwyrm/templates/user/shelf/shelf.html:79
+#: bookwyrm/templates/user/shelf/shelf.html:99
 msgid "Title"
 msgstr "标题"
 
 #: bookwyrm/templates/import_status.html:117
-#: bookwyrm/templates/user/shelf/shelf.html:79
-#: bookwyrm/templates/user/shelf/shelf.html:101
+#: bookwyrm/templates/user/shelf/shelf.html:80
+#: bookwyrm/templates/user/shelf/shelf.html:102
 msgid "Author"
 msgstr "作者"
 
@@ -1245,15 +1244,21 @@ msgstr "�索书目或用户"
 msgid "Main navigation menu"
 msgstr "主导航��"
 
-#: bookwyrm/templates/layout.html:61
+#: bookwyrm/templates/layout.html:58
 msgid "Feed"
 msgstr "动�"
 
-#: bookwyrm/templates/layout.html:102
+#: bookwyrm/templates/layout.html:87
+#, fuzzy
+#| msgid "Your books"
+msgid "Your Books"
+msgstr "你的书目"
+
+#: bookwyrm/templates/layout.html:97
 msgid "Settings"
 msgstr "设置"
 
-#: bookwyrm/templates/layout.html:111
+#: bookwyrm/templates/layout.html:106
 #: bookwyrm/templates/settings/admin_layout.html:31
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
@@ -1261,45 +1266,47 @@ msgstr "设置"
 msgid "Invites"
 msgstr "邀请"
 
-#: bookwyrm/templates/layout.html:118
+#: bookwyrm/templates/layout.html:113
 msgid "Admin"
 msgstr "管�员"
 
-#: bookwyrm/templates/layout.html:125
+#: bookwyrm/templates/layout.html:120
 msgid "Log out"
 msgstr "登出"
 
-#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
+#: bookwyrm/templates/layout.html:128 bookwyrm/templates/layout.html:129
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr "通知"
 
-#: bookwyrm/templates/layout.html:154 bookwyrm/templates/layout.html:158
+#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "用户�:"
 
-#: bookwyrm/templates/layout.html:159
+#: bookwyrm/templates/layout.html:156
 msgid "password"
 msgstr "密�"
 
-#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr "忘记了密�？"
 
-#: bookwyrm/templates/layout.html:163 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "登录"
 
-#: bookwyrm/templates/layout.html:171
+#: bookwyrm/templates/layout.html:168
 msgid "Join"
 msgstr "加入"
 
 #: bookwyrm/templates/layout.html:206
-msgid "About this server"
+#, fuzzy
+#| msgid "About this server"
+msgid "About this instance"
 msgstr "关于本�务器"
 
 #: bookwyrm/templates/layout.html:210
@@ -1361,7 +1368,7 @@ msgid "Discard"
 msgstr "削除"
 
 #: bookwyrm/templates/lists/edit_form.html:5
-#: bookwyrm/templates/lists/list_layout.html:17
+#: bookwyrm/templates/lists/list_layout.html:16
 msgid "Edit List"
 msgstr "编辑列表"
 
@@ -1410,62 +1417,63 @@ msgstr "任何人都�以�此列表中添加书目"
 msgid "This list is currently empty"
 msgstr "此列表当�是空的"
 
-#: bookwyrm/templates/lists/list.html:65
+#: bookwyrm/templates/lists/list.html:66
 #, python-format
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "由 <a href=\"%(user_path)s\">%(username)s</a> 添加"
 
-#: bookwyrm/templates/lists/list.html:77
-#, fuzzy
-#| msgid "Sent"
-msgid "Set"
-msgstr "已��"
-
-#: bookwyrm/templates/lists/list.html:80
+#: bookwyrm/templates/lists/list.html:74
 #, fuzzy
 #| msgid "List curation:"
 msgid "List position"
 msgstr "列表策展:"
 
-#: bookwyrm/templates/lists/list.html:86
+#: bookwyrm/templates/lists/list.html:81
+#, fuzzy
+#| msgid "Sent"
+msgid "Set"
+msgstr "已��"
+
+#: bookwyrm/templates/lists/list.html:89
 #: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr "移除"
 
-#: bookwyrm/templates/lists/list.html:99 bookwyrm/templates/lists/list.html:111
+#: bookwyrm/templates/lists/list.html:103
+#: bookwyrm/templates/lists/list.html:120
 #, fuzzy
 #| msgid "Your Lists"
 msgid "Sort List"
 msgstr "你的列表"
 
-#: bookwyrm/templates/lists/list.html:105
+#: bookwyrm/templates/lists/list.html:113
 #, fuzzy
 #| msgid "Directory"
 msgid "Direction"
 msgstr "目录"
 
-#: bookwyrm/templates/lists/list.html:116
+#: bookwyrm/templates/lists/list.html:127
 msgid "Add Books"
 msgstr "添加书目"
 
-#: bookwyrm/templates/lists/list.html:116
+#: bookwyrm/templates/lists/list.html:129
 msgid "Suggest Books"
 msgstr "推�书目"
 
-#: bookwyrm/templates/lists/list.html:125
+#: bookwyrm/templates/lists/list.html:140
 msgid "search"
 msgstr "�索"
 
-#: bookwyrm/templates/lists/list.html:131
+#: bookwyrm/templates/lists/list.html:146
 msgid "Clear search"
 msgstr "清除�索"
 
-#: bookwyrm/templates/lists/list.html:136
+#: bookwyrm/templates/lists/list.html:151
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
 msgstr "没有符� \"%(query)s\" 请求的书目"
 
-#: bookwyrm/templates/lists/list.html:164
+#: bookwyrm/templates/lists/list.html:179
 msgid "Suggest"
 msgstr "推�"
 
@@ -1557,8 +1565,9 @@ msgid "Resolve"
 msgstr "已解决"
 
 #: bookwyrm/templates/moderation/reports.html:6
-#, python-format
-msgid "Reports: %(server_name)s"
+#, fuzzy, python-format
+#| msgid "Reports: %(server_name)s"
+msgid "Reports: %(instance_name)s"
 msgstr "报告: %(server_name)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
@@ -1568,9 +1577,10 @@ msgid "Reports"
 msgstr "报告"
 
 #: bookwyrm/templates/moderation/reports.html:14
-#, python-format
-msgid "Reports: <small>%(server_name)s</small>"
-msgstr "报告: <small>%(server_name)s</small>"
+#, fuzzy, python-format
+#| msgid "Users: <small>%(server_name)s</small>"
+msgid "Reports: <small>%(instance_name)s</small>"
+msgstr "用户: <small>%(server_name)s</small>"
 
 #: bookwyrm/templates/moderation/reports.html:28
 msgid "Resolved"
@@ -1771,6 +1781,26 @@ msgstr "个人资料"
 msgid "Relationships"
 msgstr "关系"
 
+#: bookwyrm/templates/rss/title.html:5
+#: bookwyrm/templates/snippets/status/status_header.html:35
+msgid "rated"
+msgstr "评价了"
+
+#: bookwyrm/templates/rss/title.html:7
+#: bookwyrm/templates/snippets/status/status_header.html:37
+msgid "reviewed"
+msgstr "写了书评给"
+
+#: bookwyrm/templates/rss/title.html:9
+#: bookwyrm/templates/snippets/status/status_header.html:39
+msgid "commented on"
+msgstr "评论了"
+
+#: bookwyrm/templates/rss/title.html:11
+#: bookwyrm/templates/snippets/status/status_header.html:41
+msgid "quoted"
+msgstr "引用了"
+
 #: bookwyrm/templates/search/book.html:64
 #, fuzzy
 #| msgid "Show results from other catalogues"
@@ -1828,7 +1858,9 @@ msgstr "管�用户"
 #: bookwyrm/templates/settings/admin_layout.html:39
 #: bookwyrm/templates/settings/federation.html:3
 #: bookwyrm/templates/settings/federation.html:5
-msgid "Federated Servers"
+#, fuzzy
+#| msgid "Federated Servers"
+msgid "Federated Instances"
 msgstr "互�的�务器"
 
 #: bookwyrm/templates/settings/admin_layout.html:44
@@ -1882,6 +1914,7 @@ msgid "Back to list"
 msgstr "回到�务器列表"
 
 #: bookwyrm/templates/settings/announcement.html:11
+#: bookwyrm/templates/settings/announcement_form.html:6
 #, fuzzy
 #| msgid "Announcements"
 msgid "Edit Announcement"
@@ -1923,7 +1956,7 @@ msgstr "出生日期:"
 msgid "Active:"
 msgstr "活跃"
 
-#: bookwyrm/templates/settings/announcement_form.html:5
+#: bookwyrm/templates/settings/announcement_form.html:8
 #: bookwyrm/templates/settings/announcements.html:8
 #, fuzzy
 #| msgid "Announcements"
@@ -1982,13 +2015,15 @@ msgstr "�用"
 #: bookwyrm/templates/settings/server_blocklist.html:3
 #: bookwyrm/templates/settings/server_blocklist.html:20
 #, fuzzy
-#| msgid "Add cover"
-msgid "Add server"
-msgstr "添加��"
+#| msgid "Instance Name:"
+msgid "Add instance"
+msgstr "实例�称"
 
 #: bookwyrm/templates/settings/edit_server.html:7
 #: bookwyrm/templates/settings/server_blocklist.html:7
-msgid "Back to server list"
+#, fuzzy
+#| msgid "Back to server list"
+msgid "Back to instance list"
 msgstr "回到�务器列表"
 
 #: bookwyrm/templates/settings/edit_server.html:16
@@ -2103,8 +2138,10 @@ msgstr ""
 
 #: bookwyrm/templates/settings/federation.html:19
 #: bookwyrm/templates/user_admin/server_filter.html:5
-msgid "Server name"
-msgstr "�务器�称"
+#, fuzzy
+#| msgid "Instance Name:"
+msgid "Instance name"
+msgstr "实例�称"
 
 #: bookwyrm/templates/settings/federation.html:23
 msgid "Date federated"
@@ -2231,7 +2268,7 @@ msgid "Import Blocklist"
 msgstr "导入书目"
 
 #: bookwyrm/templates/settings/server_blocklist.html:26
-#: bookwyrm/templates/snippets/goal_progress.html:5
+#: bookwyrm/templates/snippets/goal_progress.html:7
 msgid "Success!"
 msgstr "�功�"
 
@@ -2320,15 +2357,15 @@ msgstr "没有��"
 msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgstr "<a href=\"%(path)s\">%(title)s</a> �自"
 
-#: bookwyrm/templates/snippets/boost_button.html:9
-#: bookwyrm/templates/snippets/boost_button.html:10
+#: bookwyrm/templates/snippets/boost_button.html:20
+#: bookwyrm/templates/snippets/boost_button.html:21
 #, fuzzy
 #| msgid "boosted"
 msgid "Boost"
 msgstr "转�了"
 
-#: bookwyrm/templates/snippets/boost_button.html:16
-#: bookwyrm/templates/snippets/boost_button.html:17
+#: bookwyrm/templates/snippets/boost_button.html:33
+#: bookwyrm/templates/snippets/boost_button.html:34
 #, fuzzy
 #| msgid "Un-boost status"
 msgid "Un-boost"
@@ -2422,13 +2459,13 @@ msgstr "删除这些阅读日期�？"
 msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr "你正�删除这篇阅读�过以�与之相关的 %(count)s 次进度更新。"
 
-#: bookwyrm/templates/snippets/fav_button.html:9
-#: bookwyrm/templates/snippets/fav_button.html:11
+#: bookwyrm/templates/snippets/fav_button.html:10
+#: bookwyrm/templates/snippets/fav_button.html:12
 msgid "Like"
 msgstr ""
 
-#: bookwyrm/templates/snippets/fav_button.html:17
 #: bookwyrm/templates/snippets/fav_button.html:18
+#: bookwyrm/templates/snippets/fav_button.html:19
 #, fuzzy
 #| msgid "Un-like status"
 msgid "Un-like"
@@ -2522,17 +2559,17 @@ msgstr "�布到消��中"
 msgid "Set goal"
 msgstr "设置目标"
 
-#: bookwyrm/templates/snippets/goal_progress.html:7
+#: bookwyrm/templates/snippets/goal_progress.html:9
 #, python-format
 msgid "%(percent)s%% complete!"
 msgstr "完�了 %(percent)s%% �"
 
-#: bookwyrm/templates/snippets/goal_progress.html:10
+#: bookwyrm/templates/snippets/goal_progress.html:12
 #, python-format
 msgid "You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
 msgstr "你已�阅读了 <a href=\"%(path)s\">%(goal_count)s 本书中的 %(read_count)s 本</a>。"
 
-#: bookwyrm/templates/snippets/goal_progress.html:12
+#: bookwyrm/templates/snippets/goal_progress.html:14
 #, python-format
 msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
 msgstr "%(username)s 已�阅读了 <a href=\"%(path)s\">%(goal_count)s 本书中的 %(read_count)s 本</a>。"
@@ -2641,26 +2678,6 @@ msgstr "注册"
 msgid "Report"
 msgstr "报告"
 
-#: bookwyrm/templates/snippets/rss_title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:35
-msgid "rated"
-msgstr "评价了"
-
-#: bookwyrm/templates/snippets/rss_title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:37
-msgid "reviewed"
-msgstr "写了书评给"
-
-#: bookwyrm/templates/snippets/rss_title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:39
-msgid "commented on"
-msgstr "评论了"
-
-#: bookwyrm/templates/snippets/rss_title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:41
-msgid "quoted"
-msgstr "引用了"
-
 #: bookwyrm/templates/snippets/search_result_text.html:36
 msgid "Import book"
 msgstr "导入书目"
@@ -2832,7 +2849,7 @@ msgstr "编辑书架"
 msgid "Update shelf"
 msgstr "更新书架"
 
-#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:51
+#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:56
 msgid "All books"
 msgstr "所有书目"
 
@@ -2840,30 +2857,30 @@ msgstr "所有书目"
 msgid "Create shelf"
 msgstr "创建书架"
 
-#: bookwyrm/templates/user/shelf/shelf.html:61
+#: bookwyrm/templates/user/shelf/shelf.html:62
 msgid "Edit shelf"
 msgstr "编辑书架"
 
-#: bookwyrm/templates/user/shelf/shelf.html:80
-#: bookwyrm/templates/user/shelf/shelf.html:104
+#: bookwyrm/templates/user/shelf/shelf.html:81
+#: bookwyrm/templates/user/shelf/shelf.html:105
 msgid "Shelved"
 msgstr "上架时间"
 
-#: bookwyrm/templates/user/shelf/shelf.html:81
-#: bookwyrm/templates/user/shelf/shelf.html:108
+#: bookwyrm/templates/user/shelf/shelf.html:82
+#: bookwyrm/templates/user/shelf/shelf.html:109
 msgid "Started"
 msgstr "开始时间"
 
-#: bookwyrm/templates/user/shelf/shelf.html:82
-#: bookwyrm/templates/user/shelf/shelf.html:111
+#: bookwyrm/templates/user/shelf/shelf.html:83
+#: bookwyrm/templates/user/shelf/shelf.html:112
 msgid "Finished"
 msgstr "完�时间"
 
-#: bookwyrm/templates/user/shelf/shelf.html:137
+#: bookwyrm/templates/user/shelf/shelf.html:138
 msgid "This shelf is empty."
 msgstr "此书架是空的。"
 
-#: bookwyrm/templates/user/shelf/shelf.html:143
+#: bookwyrm/templates/user/shelf/shelf.html:144
 msgid "Delete shelf"
 msgstr "删除书架"
 
@@ -2923,8 +2940,9 @@ msgid "Back to users"
 msgstr "回到报告"
 
 #: bookwyrm/templates/user_admin/user_admin.html:7
-#, python-format
-msgid "Users: <small>%(server_name)s</small>"
+#, fuzzy, python-format
+#| msgid "Users: <small>%(server_name)s</small>"
+msgid "Users: <small>%(instance_name)s</small>"
 msgstr "用户: <small>%(server_name)s</small>"
 
 #: bookwyrm/templates/user_admin/user_admin.html:22
@@ -2941,8 +2959,10 @@ msgid "Last Active"
 msgstr "最�或缺"
 
 #: bookwyrm/templates/user_admin/user_admin.html:38
-msgid "Remote server"
-msgstr "移除�务器"
+#, fuzzy
+#| msgid "Instance Name:"
+msgid "Remote instance"
+msgstr "实例�称"
 
 #: bookwyrm/templates/user_admin/user_admin.html:47
 msgid "Active"
@@ -2989,6 +3009,10 @@ msgstr ""
 msgid "Access level:"
 msgstr ""
 
+#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:3
+msgid "File exceeds maximum size: 10MB"
+msgstr ""
+
 #: bookwyrm/views/import_data.py:67
 #, fuzzy
 #| msgid "Email address:"
@@ -3004,6 +3028,24 @@ msgstr "没有找到使用该邮箱的用户。"
 msgid "A password reset link sent to %s"
 msgstr "密��置连接已��给 %s"
 
+#, python-format
+#~ msgid "Reports: <small>%(server_name)s</small>"
+#~ msgstr "报告: <small>%(server_name)s</small>"
+
+#~ msgid "Federated Servers"
+#~ msgstr "互�的�务器"
+
+#~ msgid "Server name"
+#~ msgstr "�务器�称"
+
+#, fuzzy
+#~| msgid "Add cover"
+#~ msgid "Add server"
+#~ msgstr "添加��"
+
+#~ msgid "Remote server"
+#~ msgstr "移除�务器"
+
 #, fuzzy
 #~| msgid "BookWyrm users"
 #~ msgid "BookWyrm\\"

From 5d2f01d7ffef9bccda2ea75500ba3aa4f18b18cc Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 1 Jun 2021 14:51:57 -0700
Subject: [PATCH 1229/1285] Updates locales

---
 locale/de_DE/LC_MESSAGES/django.mo   | Bin 24502 -> 24354 bytes
 locale/de_DE/LC_MESSAGES/django.po   |   2 +-
 locale/en_US/LC_MESSAGES/django.po   |   2 +-
 locale/es/LC_MESSAGES/django.mo      | Bin 43765 -> 42979 bytes
 locale/es/LC_MESSAGES/django.po      |   2 +-
 locale/fr_FR/LC_MESSAGES/django.mo   | Bin 45401 -> 44654 bytes
 locale/fr_FR/LC_MESSAGES/django.po   |   2 +-
 locale/zh_Hans/LC_MESSAGES/django.mo | Bin 36590 -> 36011 bytes
 locale/zh_Hans/LC_MESSAGES/django.po |   2 +-
 9 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo
index 089ac656a8b3cf4cdb6fdbabd8127cd33bb6afab..dde00be621032b841673a440278b1fb305361245 100644
GIT binary patch
delta 7362
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
RVXbQN2OSHkNvL={{C|FM-#q{T

delta 7503
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

diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 9649dc14..6c54bb8b 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-01 14:49-0700\n"
+"POT-Creation-Date: 2021-06-01 14:50-0700\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"
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index 7d1044b2..b88dad08 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-01 14:49-0700\n"
+"POT-Creation-Date: 2021-06-01 14:50-0700\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"
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index 0e5df226ff94914032c35b735f32bebe7ae3630e..ea8dada7bc1a39ae38e7c218be0b586dae3ac452 100644
GIT binary patch
delta 13312
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

delta 13996
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

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 012d1e13..eee94c1f 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-01 14:49-0700\n"
+"POT-Creation-Date: 2021-06-01 14:50-0700\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index b893b1287e9b958ea2c5cc78708ab547f378d4b4..29020216d94cec7b210cab035fcb6aecfbf08b73 100644
GIT binary patch
delta 13288
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
IN_N2i1I$B2_y7O^

delta 14009
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

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 71b154ba..6fc145d1 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-01 14:49-0700\n"
+"POT-Creation-Date: 2021-06-01 14:50-0700\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"
diff --git a/locale/zh_Hans/LC_MESSAGES/django.mo b/locale/zh_Hans/LC_MESSAGES/django.mo
index 17b3df6956342292739f79d1aa1f47e4e6dd7793..496caabcf282089a8988b0acb1f577dc27ddbe8a 100644
GIT binary patch
delta 11507
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

delta 12082
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
WQAz$$^ETW_+4HZP+mMtl^Zx;wXZ9=r

diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
index 56b424a4..ef5cd2da 100644
--- a/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/locale/zh_Hans/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-01 14:49-0700\n"
+"POT-Creation-Date: 2021-06-01 14:50-0700\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"

From 3301de5e5453845a9977372a4ae64eee4df25787 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 2 Jun 2021 07:21:18 -0700
Subject: [PATCH 1230/1285] Update locale/fr_FR/LC_MESSAGES/django.po

Co-authored-by: Joachim <joachim.robert@protonmail.com>
---
 locale/fr_FR/LC_MESSAGES/django.po | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 6fc145d1..562d2ffe 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -1530,10 +1530,8 @@ msgid "Resolve"
 msgstr "Résoudre"
 
 #: bookwyrm/templates/moderation/reports.html:6
-#, fuzzy, python-format
-#| msgid "Reports: %(server_name)s"
 msgid "Reports: %(instance_name)s"
-msgstr "Signalements : %(server_name)s"
+msgstr "Signalements : %(instance_name)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
 #: bookwyrm/templates/moderation/reports.html:17

From 34b93679f0b952723d696563ad0cab9d3224fa4b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 2 Jun 2021 07:21:32 -0700
Subject: [PATCH 1231/1285] Update locale/fr_FR/LC_MESSAGES/django.po

Co-authored-by: Joachim <joachim.robert@protonmail.com>
---
 locale/fr_FR/LC_MESSAGES/django.po | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 562d2ffe..23308c8b 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -1283,10 +1283,8 @@ msgid "Join"
 msgstr "Rejoindre"
 
 #: bookwyrm/templates/layout.html:206
-#, fuzzy
-#| msgid "About this server"
 msgid "About this instance"
-msgstr "À propos de ce serveur"
+msgstr "À propos de cette instance"
 
 #: bookwyrm/templates/layout.html:210
 msgid "Contact site admin"

From 7d1e4aebbc03346a15a5078f879d3c4dbfc48373 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 2 Jun 2021 18:17:53 +0200
Subject: [PATCH 1232/1285] Better forms

---
 bookwyrm/templates/author/edit_author.html    |  98 ++++---
 bookwyrm/templates/book/edit_book.html        | 266 +++++++++++-------
 bookwyrm/templates/import.html                |   4 +-
 bookwyrm/templates/import_status.html         |  36 +--
 bookwyrm/templates/settings/edit_server.html  |  12 +-
 bookwyrm/templates/settings/site.html         |  36 +--
 .../templates/snippets/readthrough_form.html  |   8 +-
 .../shelve_button/finish_reading_modal.html   |   8 +-
 .../shelve_button/start_reading_modal.html    |   6 +-
 .../clearable_file_input_with_warning.html    |  25 +-
 bookwyrm/templatetags/utilities.py            |  13 +
 11 files changed, 314 insertions(+), 198 deletions(-)

diff --git a/bookwyrm/templates/author/edit_author.html b/bookwyrm/templates/author/edit_author.html
index 010d36ef..103341bf 100644
--- a/bookwyrm/templates/author/edit_author.html
+++ b/bookwyrm/templates/author/edit_author.html
@@ -29,67 +29,85 @@
     <div class="columns">
         <div class="column">
             <h2 class="title is-4">{% trans "Metadata" %}</h2>
-            <p class="mb-2"><label class="label" for="id_name">{% trans "Name:" %}</label> {{ form.name }}</p>
-            {% for error in form.name.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
+            <div class="field">
+                <label class="label" for="id_name">{% trans "Name:" %}</label>
+                {{ form.name }}
+                {% for error in form.name.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+            </div>
 
-            <p class="mb-2">
+            <div class="field">
                 <label class="label" for="id_aliases">{% trans "Aliases:" %}</label>
                 {{ form.aliases }}
                 <span class="help">{% trans "Separate multiple values with commas." %}</span>
-            </p>
-            {% for error in form.aliases.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
+                {% for error in form.aliases.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+            </div>
 
-            <p class="mb-2"><label class="label" for="id_bio">{% trans "Bio:" %}</label> {{ form.bio }}</p>
-            {% for error in form.bio.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
+            <div class="field">
+                <label class="label" for="id_bio">{% trans "Bio:" %}</label>
+                {{ form.bio }}
+                {% for error in form.bio.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+            </div>
 
-            <p class="mb-2"><label class="label" for="id_wikipedia_link">{% trans "Wikipedia link:" %}</label> {{ form.wikipedia_link }}</p>
+            <p class="field"><label class="label" for="id_wikipedia_link">{% trans "Wikipedia link:" %}</label> {{ form.wikipedia_link }}</p>
             {% for error in form.wikipedia_link.errors %}
             <p class="help is-danger">{{ error | escape }}</p>
             {% endfor %}
 
-            <p class="mb-2">
+            <div class="field">
                 <label class="label" for="id_born">{% trans "Birth date:" %}</label>
                 <input type="date" name="born" value="{{ form.born.value|date:'Y-m-d' }}" class="input" id="id_born">
-            </p>
-            {% for error in form.born.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
+                {% for error in form.born.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+            </div>
 
-            <p class="mb-2">
+            <div class="field">
                 <label class="label" for="id_died">{% trans "Death date:" %}</label>
                 <input type="date" name="died" value="{{ form.died.value|date:'Y-m-d' }}" class="input" id="id_died">
-            </p>
-            {% for error in form.died.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
+                {% for error in form.died.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+            </div>
         </div>
         <div class="column">
             <h2 class="title is-4">{% trans "Author Identifiers" %}</h2>
-            <p class="mb-2"><label class="label" for="id_openlibrary_key">{% trans "Openlibrary key:" %}</label> {{ form.openlibrary_key }}</p>
-            {% for error in form.openlibrary_key.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
+            <div class="field">
+                <label class="label" for="id_openlibrary_key">{% trans "Openlibrary key:" %}</label>
+                {{ form.openlibrary_key }}
+                {% for error in form.openlibrary_key.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+            </div>
 
-            <p class="mb-2"><label class="label" for="id_inventaire_id">{% trans "Inventaire ID:" %}</label> {{ form.inventaire_id }}</p>
-            {% for error in form.inventaire_id.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
+            <div class="field">
+                <label class="label" for="id_inventaire_id">{% trans "Inventaire ID:" %}</label>
+                {{ form.inventaire_id }}
+                {% for error in form.inventaire_id.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+            </div>
 
-            <p class="mb-2"><label class="label" for="id_librarything_key">{% trans "Librarything key:" %}</label> {{ form.librarything_key }}</p>
-            {% for error in form.librarything_key.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
+            <div class="field">
+                <label class="label" for="id_librarything_key">{% trans "Librarything key:" %}</label>
+                {{ form.librarything_key }}
+                {% for error in form.librarything_key.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+            </div>
 
-            <p class="mb-2"><label class="label" for="id_goodreads_key">{% trans "Goodreads key:" %}</label> {{ form.goodreads_key }}</p>
-            {% for error in form.goodreads_key.errors %}
-            <p class="help is-danger">{{ error | escape }}</p>
-            {% endfor %}
+            <div class="field">
+                <label class="label" for="id_goodreads_key">{% trans "Goodreads key:" %}</label>
+                {{ form.goodreads_key }}
+                {% for error in form.goodreads_key.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
+            </div>
 
         </div>
     </div>
diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html
index 8dae1d04..32018a25 100644
--- a/bookwyrm/templates/book/edit_book.html
+++ b/bookwyrm/templates/book/edit_book.html
@@ -14,11 +14,25 @@
         {% endif %}
     </h1>
     {% if book %}
-    <div>
-        <p>{% trans "Added:" %} {{ book.created_date | naturaltime }}</p>
-        <p>{% trans "Updated:" %} {{ book.updated_date | naturaltime }}</p>
-        <p>{% trans "Last edited by:" %} <a href="{{ book.last_edited_by.remote_id }}">{{ book.last_edited_by.display_name }}</a></p>
-    </div>
+    <dl>
+        <div class="is-flex">
+            <dt class="has-text-weight-semibold">{% trans "Added:" %}</dt>
+            <dd class="ml-2">{{ book.created_date | naturaltime }}</dd>
+        </div>
+
+        <div class="is-flex">
+            <dt class="has-text-weight-semibold">{% trans "Updated:" %}</dt>
+            <dd class="ml-2">{{ book.updated_date | naturaltime }}</dd>
+        </div>
+
+        {% if book.last_edited_by %}
+        <div class="is-flex">
+            <dt class="has-text-weight-semibold">{% trans "Last edited by:" %}</dt>
+            <dd class="ml-2"><a href="{{ book.last_edited_by.remote_id }}">{{ book.last_edited_by.display_name }}</a></dd>
+        </div>
+        {% endif %}
+
+    </dl>
     {% endif %}
 </header>
 
@@ -38,21 +52,28 @@
     {% if confirm_mode %}
     <div class="box">
         <h2 class="title is-4">{% trans "Confirm Book Info" %}</h2>
-        <div class="columns">
+        <div class="columns mb-4">
             {% if author_matches %}
             <input type="hidden" name="author-match-count" value="{{ author_matches|length }}">
             <div class="column is-half">
                 {% for author in author_matches %}
-                <fieldset class="mb-4">
-                    <legend class="title is-5 mb-1">{% blocktrans with name=author.name %}Is "{{ name }}" an existing author?{% endblocktrans %}</legend>
+                <fieldset>
+                    <legend class="title is-5 mb-1">
+                        {% blocktrans with name=author.name %}Is "{{ name }}" an existing author?{% endblocktrans %}
+                    </legend>
                     {% with forloop.counter0 as counter %}
                     {% for match in author.matches %}
-                    <label><input type="radio" name="author_match-{{ counter }}" value="{{ match.id }}" required> {{ match.name }}</label>
+                    <label class="label mb-2">
+                        <input type="radio" name="author_match-{{ counter }}" value="{{ match.id }}" required>
+                        {{ match.name }}
+                    </label>
                     <p class="help">
                         <a href="{{ match.local_path }}" target="_blank">{% blocktrans with book_title=match.book_set.first.title %}Author of <em>{{ book_title }}</em>{% endblocktrans %}</a>
                     </p>
                     {% endfor %}
-                    <label><input type="radio" name="author_match-{{ counter }}" value="{{ author.name }}" required> {% trans "This is a new author" %}</label>
+                    <label class="label">
+                        <input type="radio" name="author_match-{{ counter }}" value="{{ author.name }}" required> {% trans "This is a new author" %}
+                    </label>
                     {% endwith %}
                 </fieldset>
                 {% endfor %}
@@ -64,11 +85,17 @@
             {% if not book %}
             <div class="column is-half">
                 <fieldset>
-                    <legend class="title is-5 mb-1">{% trans "Is this an edition of an existing work?" %}</legend>
+                    <legend class="title is-5 mb-1">
+                        {% trans "Is this an edition of an existing work?" %}
+                    </legend>
                     {% for match in book_matches %}
-                    <label class="label"><input type="radio" name="parent_work" value="{{ match.parent_work.id }}"> {{ match.parent_work.title }}</label>
+                    <label class="label">
+                        <input type="radio" name="parent_work" value="{{ match.parent_work.id }}"> {{ match.parent_work.title }}
+                    </label>
                     {% endfor %}
-                    <label><input type="radio" name="parent_work" value="0" required> {% trans "This is a new work" %}</label>
+                    <label>
+                        <input type="radio" name="parent_work" value="0" required> {% trans "This is a new work" %}
+                    </label>
                 </fieldset>
             </div>
             {% endif %}
@@ -89,76 +116,79 @@
             <section class="block">
                 <h2 class="title is-4">{% trans "Metadata" %}</h2>
 
-                <p class="mb-2">
+                <div class="field">
                     <label class="label" for="id_title">{% trans "Title:" %}</label>
                     <input type="text" name="title" value="{{ form.title.value|default:'' }}" maxlength="255" class="input" required="" id="id_title">
-                </p>
-                {% for error in form.title.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
+                    {% for error in form.title.errors %}
+                    <p class="help is-danger">{{ error | escape }}</p>
+                    {% endfor %}
+                </div>
 
-                <p class="mb-2">
+                <div class="field">
                     <label class="label" for="id_subtitle">{% trans "Subtitle:" %}</label>
                     <input type="text" name="subtitle" value="{{ form.subtitle.value|default:'' }}" maxlength="255" class="input" id="id_subtitle">
-                </p>
-                {% for error in form.subtitle.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
+                    {% for error in form.subtitle.errors %}
+                    <p class="help is-danger">{{ error | escape }}</p>
+                    {% endfor %}
+                </div>
 
-                <p class="mb-2"><label class="label" for="id_description">{% trans "Description:" %}</label> {{ form.description }} </p>
-                {% for error in form.description.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
+                <div class="field">
+                    <label class="label" for="id_description">{% trans "Description:" %}</label>
+                    {{ form.description }}
+                    {% for error in form.description.errors %}
+                    <p class="help is-danger">{{ error | escape }}</p>
+                    {% endfor %}
+                </div>
 
-                <p class="mb-2">
+                <div class="field">
                     <label class="label" for="id_series">{% trans "Series:" %}</label>
                     <input type="text" class="input" name="series" id="id_series" value="{{ form.series.value|default:'' }}">
-                </p>
-                {% for error in form.series.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
+                    {% for error in form.series.errors %}
+                    <p class="help is-danger">{{ error | escape }}</p>
+                    {% endfor %}
+                </div>
 
-                <p class="mb-2">
+                <div class="field">
                     <label class="label" for="id_series_number">{% trans "Series number:" %}</label>
                     {{ form.series_number }}
-                </p>
-                {% for error in form.series_number.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
+                    {% for error in form.series_number.errors %}
+                    <p class="help is-danger">{{ error | escape }}</p>
+                    {% endfor %}
+                </div>
 
-                <p class="mb-2">
+                <div class="field">
                     <label class="label" for="id_languages">{% trans "Languages:" %}</label>
                     {{ form.languages }}
                     <span class="help">{% trans "Separate multiple values with commas." %}</span>
-                </p>
-                {% for error in form.languages.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
+                    {% for error in form.languages.errors %}
+                    <p class="help is-danger">{{ error | escape }}</p>
+                    {% endfor %}
+                </div>
 
-                <p class="mb-2">
+                <div class="field">
                     <label class="label" for="id_publishers">{% trans "Publisher:" %}</label>
                     {{ form.publishers }}
                     <span class="help">{% trans "Separate multiple values with commas." %}</span>
-                </p>
-                {% for error in form.publishers.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
+                    {% for error in form.publishers.errors %}
+                    <p class="help is-danger">{{ error | escape }}</p>
+                    {% endfor %}
+                </div>
 
-                <p class="mb-2">
+                <div class="field">
                     <label class="label" for="id_first_published_date">{% trans "First published date:" %}</label>
                     <input type="date" name="first_published_date" class="input" id="id_first_published_date"{% if form.first_published_date.value %} value="{{ form.first_published_date.value|date:'Y-m-d' }}"{% endif %}>
-                </p>
-                {% for error in form.first_published_date.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
+                    {% for error in form.first_published_date.errors %}
+                    <p class="help is-danger">{{ error | escape }}</p>
+                    {% endfor %}
+                </div>
 
-                <p class="mb-2">
+                <div class="field">
                     <label class="label" for="id_published_date">{% trans "Published date:" %}</label>
                     <input type="date" name="published_date" class="input" id="id_published_date"{% if form.published_date.value %} value="{{ form.published_date.value|date:'Y-m-d'}}"{% endif %}>
-                </p>
-                {% for error in form.published_date.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
+                    {% for error in form.published_date.errors %}
+                    <p class="help is-danger">{{ error | escape }}</p>
+                    {% endfor %}
+                </div>
             </section>
 
             <section class="block">
@@ -166,16 +196,23 @@
                 {% if book.authors.exists %}
                 <fieldset>
                     {% for author in book.authors.all %}
-                    <label class="label mb-2">
-                        <input type="checkbox" name="remove_authors" value="{{ author.id }}" {% if author.id|stringformat:"i" in remove_authors %}checked{% endif %}>
-                        {% blocktrans with name=author.name path=author.local_path %}Remove <a href="{{ path }}">{{ name }}</a>{% endblocktrans %}
-                    </label>
+                    <div class="is-flex is-justify-content-space-between">
+                        <label class="label mb-2">
+                            <input type="checkbox" name="remove_authors" value="{{ author.id }}" {% if author.id|stringformat:"i" in remove_authors %}checked{% endif %}>
+                            {% blocktrans with name=author.name %}Remove {{ name }}{% endblocktrans %}
+                        </label>
+                        <p class="help">
+                            <a href="{{ author.local_path }}">{% blocktrans with name=author.name %}Author page for {{ name }}{% endblocktrans %}</a>
+                        </p>
+                    </div>
                     {% endfor %}
                 </fieldset>
                 {% endif %}
-                <label class="label" for="id_add_author">{% trans "Add Authors:" %}</label>
-                <input class="input" type="text" name="add_author" id="id_add_author" placeholder="{% trans 'John Doe, Jane Smith' %}" value="{{ add_author }}" {% if confirm_mode %}readonly{% endif %}>
-                <span class="help">{% trans "Separate multiple values with commas." %}</span>
+                <div class="field">
+                    <label class="label" for="id_add_author">{% trans "Add Authors:" %}</label>
+                    <input class="input" type="text" name="add_author" id="id_add_author" placeholder="{% trans 'John Doe, Jane Smith' %}" value="{{ add_author }}" {% if confirm_mode %}readonly{% endif %}>
+                    <span class="help">{% trans "Separate multiple values with commas." %}</span>
+                </div>
             </section>
         </div>
 
@@ -188,17 +225,17 @@
 
                 <div class="column">
                     <div class="block">
-                        <p>
+                        <div class="field">
                             <label class="label" for="id_cover">{% trans "Upload cover:" %}</label>
                             {{ form.cover }}
-                        </p>
+                        </div>
                         {% if book %}
-                        <p>
+                        <div class="field">
                             <label class="label" for="id_cover_url">
                                 {% trans "Load cover from url:" %}
                             </label>
                             <input class="input" name="cover-url" id="id_cover_url">
-                        </p>
+                        </div>
                         {% endif %}
                         {% for error in form.cover.errors %}
                         <p class="help is-danger">{{ error | escape }}</p>
@@ -209,51 +246,72 @@
 
             <div class="block">
                 <h2 class="title is-4">{% trans "Physical Properties" %}</h2>
-                <p class="mb-2"><label class="label" for="id_physical_format">{% trans "Format:" %}</label> {{ form.physical_format }} </p>
-                {% for error in form.physical_format.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
-                {% for error in form.physical_format.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
+                <div class="field">
+                    <label class="label" for="id_physical_format">{% trans "Format:" %}</label>
+                    {{ form.physical_format }}
+                    {% for error in form.physical_format.errors %}
+                    <p class="help is-danger">{{ error | escape }}</p>
+                    {% endfor %}
+                </div>
 
-                <p class="mb-2"><label class="label" for="id_pages">{% trans "Pages:" %}</label> {{ form.pages }} </p>
-                {% for error in form.pages.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
+                <div class="field">
+                    <label class="label" for="id_pages">{% trans "Pages:" %}</label>
+                    {{ form.pages }}
+                    {% for error in form.pages.errors %}
+                    <p class="help is-danger">{{ error | escape }}</p>
+                    {% endfor %}
+                </div>
             </div>
 
             <div class="block">
                 <h2 class="title is-4">{% trans "Book Identifiers" %}</h2>
-                <p class="mb-2"><label class="label" for="id_isbn_13">{% trans "ISBN 13:" %}</label> {{ form.isbn_13 }} </p>
-                {% for error in form.isbn_13.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
+                <div class="field">
+                    <label class="label" for="id_isbn_13">{% trans "ISBN 13:" %}</label>
+                    {{ form.isbn_13 }}
+                    {% for error in form.isbn_13.errors %}
+                    <p class="help is-danger">{{ error | escape }}</p>
+                    {% endfor %}
+                </div>
 
-                <p class="mb-2"><label class="label" for="id_isbn_10">{% trans "ISBN 10:" %}</label> {{ form.isbn_10 }} </p>
-                {% for error in form.isbn_10.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
+                <div class="field">
+                    <label class="label" for="id_isbn_10">{% trans "ISBN 10:" %}</label>
+                    {{ form.isbn_10 }}
+                    {% for error in form.isbn_10.errors %}
+                    <p class="help is-danger">{{ error | escape }}</p>
+                    {% endfor %}
+                </div>
 
-                <p class="mb-2"><label class="label" for="id_openlibrary_key">{% trans "Openlibrary ID:" %}</label> {{ form.openlibrary_key }} </p>
-                {% for error in form.openlibrary_key.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
+                <div class="field">
+                    <label class="label" for="id_openlibrary_key">{% trans "Openlibrary ID:" %}</label>
+                    {{ form.openlibrary_key }}
+                    {% for error in form.openlibrary_key.errors %}
+                    <p class="help is-danger">{{ error | escape }}</p>
+                    {% endfor %}
+                </div>
 
-                <p class="mb-2"><label class="label" for="id_inventaire_id">{% trans "Inventaire ID:" %}</label> {{ form.inventaire_id }} </p>
-                {% for error in form.inventaire_id.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
+                <div class="field">
+                    <label class="label" for="id_inventaire_id">{% trans "Inventaire ID:" %}</label>
+                    {{ form.inventaire_id }}
+                    {% for error in form.inventaire_id.errors %}
+                    <p class="help is-danger">{{ error | escape }}</p>
+                    {% endfor %}
+                </div>
 
-                <p class="mb-2"><label class="label" for="id_oclc_number">{% trans "OCLC Number:" %}</label> {{ form.oclc_number }} </p>
-                {% for error in form.oclc_number.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
+                <div class="field">
+                    <label class="label" for="id_oclc_number">{% trans "OCLC Number:" %}</label>
+                    {{ form.oclc_number }}
+                    {% for error in form.oclc_number.errors %}
+                    <p class="help is-danger">{{ error | escape }}</p>
+                    {% endfor %}
+                </div>
 
-                <p class="mb-2"><label class="label" for="id_asin">{% trans "ASIN:" %}</label> {{ form.asin }} </p>
-                {% for error in form.ASIN.errors %}
-                <p class="help is-danger">{{ error | escape }}</p>
-                {% endfor %}
+                <div class="field">
+                    <label class="label" for="id_asin">{% trans "ASIN:" %}</label>
+                    {{ form.asin }}
+                    {% for error in form.ASIN.errors %}
+                    <p class="help is-danger">{{ error | escape }}</p>
+                    {% endfor %}
+                </div>
             </div>
         </div>
     </div>
@@ -261,7 +319,7 @@
     {% if not confirm_mode %}
     <div class="block">
         <button class="button is-primary" type="submit">{% trans "Save" %}</button>
-        <a class="button" href="{{ book.local_path}}">{% trans "Cancel" %}</a>
+        <a class="button" href="{{ book.local_path }}">{% trans "Cancel" %}</a>
     </div>
     {% endif %}
 </form>
diff --git a/bookwyrm/templates/import.html b/bookwyrm/templates/import.html
index 2b7d69e1..d2e40748 100644
--- a/bookwyrm/templates/import.html
+++ b/bookwyrm/templates/import.html
@@ -41,8 +41,8 @@
                 </label>
             </div>
             <div class="field">
-                <label class="label">
-                    <p>{% trans "Privacy setting for imported reviews:" %}</p>
+                <label>
+                    <span class="label">{% trans "Privacy setting for imported reviews:" %}</span>
                     {% include 'snippets/privacy_select.html' with no_label=True %}
                 </label>
             </div>
diff --git a/bookwyrm/templates/import_status.html b/bookwyrm/templates/import_status.html
index b1145611..ff80ad71 100644
--- a/bookwyrm/templates/import_status.html
+++ b/bookwyrm/templates/import_status.html
@@ -8,13 +8,17 @@
 <div class="block">
     <h1 class="title">{% trans "Import Status" %}</h1>
 
-    <p>
-        {% trans "Import started:" %} {{ job.created_date | naturaltime }}
-    </p>
-    {% if job.complete %}
-    <p>
-        {% trans "Import completed:" %} {{ task.date_done | naturaltime }}
-    </p>
+    <dl>
+        <div class="is-flex">
+            <dt class="has-text-weight-medium">{% trans "Import started:" %}</dt>
+            <dd class="ml-2">{{ job.created_date | naturaltime }}</dd>
+        </div>
+        {% if job.complete %}
+        <div class="is-flex">
+            <dt class="has-text-weight-medium">{% trans "Import completed:" %}</dt>
+            <dd class="ml-2">{{ task.date_done | naturaltime }}</dd>
+        </div>
+    </dl>
     {% elif task.failed %}
     <div class="notification is-danger">{% trans "TASK FAILED" %}</div>
     {% endif %}
@@ -22,8 +26,9 @@
 
 <div class="block">
     {% if not job.complete %}
-    {% trans "Import still in progress." %}
     <p>
+        {% trans "Import still in progress." %}
+        <br/>
         {% trans "(Hit reload to update!)" %}
     </p>
     {% endif %}
@@ -49,16 +54,13 @@
         <fieldset id="failed-imports">
             <ul>
             {% for item in failed_items %}
-                <li class="pb-1">
-                    <input class="checkbox" type="checkbox" name="import_item" value="{{ item.id }}" id="import-item-{{ item.id }}">
-                    <label for="import-item-{{ item.id }}">
-                        Line {{ item.index }}:
-                        <strong>{{ item.data.Title }}</strong> by
-                        {{ item.data.Author }}
-                    </label>
-                    <p>
+                <li class="mb-2 is-flex is-align-items-start">
+                    <input class="checkbox mt-1" type="checkbox" name="import_item" value="{{ item.id }}" id="import-item-{{ item.id }}">
+                    <label class="ml-1" for="import-item-{{ item.id }}">
+                        {% blocktrans with index=item.index title=item.data.Title author=item.data.Author %}Line {{ index }}: <strong>{{ title }}</strong> by {{ author }}{% endblocktrans %}
+                        <br/>
                         {{ item.fail_reason }}.
-                    </p>
+                    </label>
                 </li>
             {% endfor %}
             </ul>
diff --git a/bookwyrm/templates/settings/edit_server.html b/bookwyrm/templates/settings/edit_server.html
index c5702c84..04585fe5 100644
--- a/bookwyrm/templates/settings/edit_server.html
+++ b/bookwyrm/templates/settings/edit_server.html
@@ -26,14 +26,14 @@
     {% csrf_token %}
     <div class="columns">
         <div class="column is-half">
-            <div>
+            <div class="field">
                 <label class="label" for="id_server_name">{% trans "Instance:" %}</label>
                 <input type="text" name="server_name" maxlength="255" class="input" required id="id_server_name" value="{{ form.server_name.value|default:'' }}" placeholder="domain.com">
                 {% for error in form.server_name.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
             </div>
-            <div>
+            <div class="field">
                 <label class="label" for="id_status">{% trans "Status:" %}</label>
                 <div class="select">
                     <select name="status" class="" id="id_status">
@@ -44,14 +44,14 @@
             </div>
         </div>
         <div class="column is-half">
-            <div>
+            <div class="field">
                 <label class="label" for="id_application_type">{% trans "Software:" %}</label>
                 <input type="text" name="application_type" maxlength="255" class="input" id="id_application_type" value="{{ form.application_type.value|default:'' }}">
                 {% for error in form.application_type.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
                 {% endfor %}
             </div>
-            <div>
+            <div class="field">
                 <label class="label" for="id_application_version">{% trans "Version:" %}</label>
                 <input type="text" name="application_version" maxlength="255" class="input" id="id_application_version" value="{{ form.application_version.value|default:'' }}">
                 {% for error in form.application_version.errors %}
@@ -60,10 +60,10 @@
             </div>
         </div>
     </div>
-    <p>
+    <div class="field">
         <label class="label" for="id_notes">{% trans "Notes:" %}</label>
         <textarea name="notes" cols="None" rows="None" class="textarea" id="id_notes">{{ form.notes.value|default:'' }}</textarea>
-    </p>
+    </div>
 
     <button type="submit" class="button is-primary">{% trans "Save" %}</button>
 </form>
diff --git a/bookwyrm/templates/settings/site.html b/bookwyrm/templates/settings/site.html
index 1b942452..d36371a4 100644
--- a/bookwyrm/templates/settings/site.html
+++ b/bookwyrm/templates/settings/site.html
@@ -11,23 +11,23 @@
     {% csrf_token %}
     <section class="block" id="instance-info">
         <h2 class="title is-4">{% trans "Instance Info" %}</h2>
-        <div class="control">
+        <div class="field">
             <label class="label" for="id_name">{% trans "Instance Name:" %}</label>
             {{ site_form.name }}
         </div>
-        <div class="control">
+        <div class="field">
             <label class="label" for="id_instance_tagline">{% trans "Tagline:" %}</label>
             {{ site_form.instance_tagline }}
         </div>
-        <div class="control">
+        <div class="field">
             <label class="label" for="id_instance_description">{% trans "Instance description:" %}</label>
             {{ site_form.instance_description }}
         </div>
-        <div class="control">
+        <div class="field">
             <label class="label" for="id_code_of_conduct">{% trans "Code of conduct:" %}</label>
             {{ site_form.code_of_conduct }}
         </div>
-        <div class="control">
+        <div class="field">
             <label class="label" for="id_privacy_policy">{% trans "Privacy Policy:" %}</label>
             {{ site_form.privacy_policy }}
         </div>
@@ -57,19 +57,19 @@
 
     <section class="block" id="footer">
         <h2 class="title is-4">{% trans "Footer Content" %}</h2>
-        <div class="control">
+        <div class="field">
             <label class="label" for="id_support_link">{% trans "Support link:" %}</label>
             <input type="text" name="support_link" maxlength="255" class="input" id="id_support_link" placeholder="https://www.patreon.com/bookwyrm"{% if site.support_link %} value="{{ site.support_link  }}"{% endif %}>
         </div>
-        <div class="control">
+        <div class="field">
             <label class="label" for="id_support_title">{% trans "Support title:" %}</label>
             <input type="text" name="support_title" maxlength="100" class="input" id="id_support_title" placeholder="Patreon"{% if site.support_title %} value="{{ site.support_title }}"{% endif %}>
         </div>
-        <div class="control">
+        <div class="field">
             <label class="label" for="id_admin_email">{% trans "Admin email:" %}</label>
             {{ site_form.admin_email }}
         </div>
-        <div class="control">
+        <div class="field">
             <label class="label" for="id_footer_item">{% trans "Additional info:" %}</label>
             {{ site_form.footer_item }}
         </div>
@@ -79,15 +79,19 @@
 
     <section class="block" id="registration">
         <h2 class="title is-4">{% trans "Registration" %}</h2>
-        <div class="control">
-            <label class="label" for="id_allow_registration">{% trans "Allow registration:" %}
-            {{ site_form.allow_registration }}
+        <div class="field">
+            <label class="label" for="id_allow_registration">
+                {{ site_form.allow_registration }}
+                {% trans "Allow registration" %}
+            </label>
         </div>
-        <div class="control">
-            <label class="label" for="id_allow_invite_requests">{% trans "Allow invite requests:" %}
-            {{ site_form.allow_invite_requests }}
+        <div class="field">
+            <label class="label" for="id_allow_invite_requests">
+                {{ site_form.allow_invite_requests }}
+                {% trans "Allow invite requests" %}
+            </label>
         </div>
-        <div class="control">
+        <div class="field">
             <label class="label" for="id_registration_closed_text">{% trans "Registration closed text:" %}</label>
             {{ site_form.registration_closed_text }}
         </div>
diff --git a/bookwyrm/templates/snippets/readthrough_form.html b/bookwyrm/templates/snippets/readthrough_form.html
index 891e9071..df602cf7 100644
--- a/bookwyrm/templates/snippets/readthrough_form.html
+++ b/bookwyrm/templates/snippets/readthrough_form.html
@@ -3,10 +3,10 @@
 <input type="hidden" name="id" value="{{ readthrough.id }}">
 <input type="hidden" name="book" value="{{ book.id }}">
 <div class="field">
-    <label class="label" tabindex="0" id="add-readthrough-focus">
+    <label class="label" tabindex="0" id="add-readthrough-focus" for="id_start_date-{{ readthrough.id }}">
         {% trans "Started reading" %}
-        <input type="date" name="start_date" class="input" id="id_start_date-{{ readthrough.id }}" value="{{ readthrough.start_date | date:"Y-m-d" }}">
     </label>
+    <input type="date" name="start_date" class="input" id="id_start_date-{{ readthrough.id }}" value="{{ readthrough.start_date | date:"Y-m-d" }}">
 </div>
 {# Only show progress for editing existing readthroughs #}
 {% if readthrough.id and not readthrough.finish_date %}
@@ -26,8 +26,8 @@
 </div>
 {% endif %}
 <div class="field">
-    <label class="label">
+    <label class="label" for="id_finish_date-{{ readthrough.id }}">
         {% trans "Finished reading" %}
-        <input type="date" name="finish_date" class="input" id="id_finish_date-{{ readthrough.id }}" value="{{ readthrough.finish_date | date:"Y-m-d" }}">
     </label>
+    <input type="date" name="finish_date" class="input" id="id_finish_date-{{ readthrough.id }}" value="{{ readthrough.finish_date | date:"Y-m-d" }}">
 </div>
diff --git a/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html b/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
index ca65bf06..f5a38c98 100644
--- a/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
+++ b/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
@@ -15,16 +15,16 @@
     {% csrf_token %}
     <input type="hidden" name="id" value="{{ readthrough.id }}">
     <div class="field">
-        <label class="label">
+        <label class="label" for="finish_id_start_date-{{ uuid }}">
             {% trans "Started reading" %}
-            <input type="date" name="start_date" class="input" id="finish_id_start_date-{{ uuid }}" value="{{ readthrough.start_date | date:"Y-m-d" }}">
         </label>
+        <input type="date" name="start_date" class="input" id="finish_id_start_date-{{ uuid }}" value="{{ readthrough.start_date | date:"Y-m-d" }}">
     </div>
     <div class="field">
-        <label class="label">
+        <label class="label" for="id_finish_date-{{ uuid }}">
             {% trans "Finished reading" %}
-            <input type="date" name="finish_date" class="input" id="id_finish_date-{{ uuid }}" value="{% now "Y-m-d" %}">
         </label>
+        <input type="date" name="finish_date" class="input" id="id_finish_date-{{ uuid }}" value="{% now "Y-m-d" %}">
     </div>
 </section>
 {% endblock %}
diff --git a/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html b/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html
index 21341683..a3aea2d5 100644
--- a/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html
+++ b/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html
@@ -13,10 +13,10 @@
 <section class="modal-card-body">
     {% csrf_token %}
     <div class="field">
-        <label class="label">
+        <label class="label" for="start_id_start_date-{{ uuid }}">
             {% trans "Started reading" %}
-            <input type="date" name="start_date" class="input" id="start_id_start_date-{{ uuid }}" value="{% now "Y-m-d" %}">
         </label>
+        <input type="date" name="start_date" class="input" id="start_id_start_date-{{ uuid }}" value="{% now "Y-m-d" %}">
     </div>
 </section>
 {% endblock %}
@@ -30,7 +30,7 @@
         </label>
         {% include 'snippets/privacy_select.html' %}
     </div>
-    <div class="column">
+    <div class="column has-text-right">
         <button class="button is-success" type="submit">{% trans "Save" %}</button>
         {% trans "Cancel" as button_text %}
         {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="start-reading" controls_uid=uuid %}
diff --git a/bookwyrm/templates/widgets/clearable_file_input_with_warning.html b/bookwyrm/templates/widgets/clearable_file_input_with_warning.html
index 700e22f9..467d832d 100644
--- a/bookwyrm/templates/widgets/clearable_file_input_with_warning.html
+++ b/bookwyrm/templates/widgets/clearable_file_input_with_warning.html
@@ -1,3 +1,24 @@
 {% load i18n %}
-{% include "django/forms/widgets/clearable_file_input.html" %}
-<span class="help file-cta is-hidden file-too-big">{% trans "File exceeds maximum size: 10MB" %}</span>
+{% load utilities %}
+
+{% if widget.is_initial %}
+<p class="mb-1">
+  {{ widget.initial_text }}:
+  <a href="{{ widget.value.url }}">{{ widget.value|truncatepath:10 }}</a>
+</p>
+{% if not widget.required %}
+<p class="mb-1">
+  <label class="has-text-weight-normal">
+      <input type="checkbox" name="{{ widget.checkbox_name }}" id="{{ widget.checkbox_id }}"{% if widget.attrs.disabled %} disabled{% endif %}>
+      {{ widget.clear_checkbox_label }}
+  </label>{% endif %}
+</p>
+<p class="mb-1">
+{{ widget.input_text }}:
+{% else %}
+<p class="mb-1">
+{% endif %}
+    <input type="{{ widget.type }}" name="{{ widget.name }}"{% include "django/forms/widgets/attrs.html" %}>
+    <span class="help file-cta is-hidden file-too-big">{% trans "File exceeds maximum size: 10MB" %}</span>
+</p>
+
diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py
index 68befa54..febcc39d 100644
--- a/bookwyrm/templatetags/utilities.py
+++ b/bookwyrm/templatetags/utilities.py
@@ -1,4 +1,5 @@
 """ template filters for really common utilities """
+import os
 from uuid import uuid4
 from django import template
 
@@ -33,3 +34,15 @@ def get_title(book):
 def comparison_bool(str1, str2):
     """idk why I need to write a tag for this, it reutrns a bool"""
     return str1 == str2
+
+
+@register.filter(is_safe=True)
+def truncatepath(value, arg):
+    """Truncate a path by removing all directories except the first and truncating ."""
+    path = os.path.normpath(value.name)
+    path_list = path.split(os.sep)
+    try:
+        length = int(arg)
+    except ValueError:  # invalid literal for int()
+        return path_list[-1]  # Fail silently.
+    return "%s/…%s" % (path_list[0], path_list[-1][-length:])

From 49c057625a7646a3117b050a784303587b6ef293 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 2 Jun 2021 18:30:36 +0200
Subject: [PATCH 1233/1285] Smol fixes

---
 .../shelve_button/finish_reading_modal.html      |  2 +-
 .../clearable_file_input_with_warning.html       | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html b/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
index f5a38c98..f32d28b7 100644
--- a/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
+++ b/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
@@ -38,7 +38,7 @@
         </label>
         {% include 'snippets/privacy_select.html' %}
     </div>
-    <div class="column">
+    <div class="column has-text-right">
         <button type="submit" class="button is-success">{% trans "Save" %}</button>
         {% trans "Cancel" as button_text %}
         {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="finish-reading" controls_uid=uuid %}
diff --git a/bookwyrm/templates/widgets/clearable_file_input_with_warning.html b/bookwyrm/templates/widgets/clearable_file_input_with_warning.html
index 467d832d..e4906cb9 100644
--- a/bookwyrm/templates/widgets/clearable_file_input_with_warning.html
+++ b/bookwyrm/templates/widgets/clearable_file_input_with_warning.html
@@ -3,22 +3,22 @@
 
 {% if widget.is_initial %}
 <p class="mb-1">
-  {{ widget.initial_text }}:
-  <a href="{{ widget.value.url }}">{{ widget.value|truncatepath:10 }}</a>
+    {{ widget.initial_text }}:
+    <a href="{{ widget.value.url }}">{{ widget.value|truncatepath:10 }}</a>
 </p>
 {% if not widget.required %}
 <p class="mb-1">
-  <label class="has-text-weight-normal">
-      <input type="checkbox" name="{{ widget.checkbox_name }}" id="{{ widget.checkbox_id }}"{% if widget.attrs.disabled %} disabled{% endif %}>
-      {{ widget.clear_checkbox_label }}
-  </label>{% endif %}
+    <label class="has-text-weight-normal">
+            <input type="checkbox" name="{{ widget.checkbox_name }}" id="{{ widget.checkbox_id }}"{% if widget.attrs.disabled %} disabled{% endif %}>
+            {{ widget.clear_checkbox_label }}
+    </label>{% endif %}
 </p>
 <p class="mb-1">
 {{ widget.input_text }}:
 {% else %}
 <p class="mb-1">
 {% endif %}
-    <input type="{{ widget.type }}" name="{{ widget.name }}"{% include "django/forms/widgets/attrs.html" %}>
-    <span class="help file-cta is-hidden file-too-big">{% trans "File exceeds maximum size: 10MB" %}</span>
+        <input type="{{ widget.type }}" name="{{ widget.name }}"{% include "django/forms/widgets/attrs.html" %}>
+        <span class="help file-cta is-hidden file-too-big">{% trans "File exceeds maximum size: 10MB" %}</span>
 </p>
 

From 6f105fcdcce0ca1aada06fea0940457d3cf30a8d Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Wed, 2 Jun 2021 18:56:24 +0200
Subject: [PATCH 1234/1285] Front: Modal title fit

---
 bookwyrm/templates/components/modal.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/components/modal.html b/bookwyrm/templates/components/modal.html
index 0a05f951..74dcadac 100644
--- a/bookwyrm/templates/components/modal.html
+++ b/bookwyrm/templates/components/modal.html
@@ -11,7 +11,7 @@
     {% trans "Close" as label %}
     <div class="modal-card">
         <header class="modal-card-head" tabindex="0" id="modal-title-{{ controls_text }}-{{ controls_uid }}">
-            <h2 class="modal-card-title" id="modal-card-title-{{ controls_text }}-{{ controls_uid }}">
+            <h2 class="modal-card-title is-flex-shrink-1" id="modal-card-title-{{ controls_text }}-{{ controls_uid }}">
                 {% block modal-title %}{% endblock %}
             </h2>
             {% include 'snippets/toggle/toggle_button.html' with label=label class="delete" nonbutton=True %}

From 08b7c48f2b2ec676a1ef140920c9a801d44930b3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 2 Jun 2021 15:17:04 -0700
Subject: [PATCH 1235/1285] Update locale/fr_FR/LC_MESSAGES/django.po

Co-authored-by: Joachim <joachim.robert@protonmail.com>
---
 locale/fr_FR/LC_MESSAGES/django.po | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 23308c8b..099a3d9e 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -1538,10 +1538,8 @@ msgid "Reports"
 msgstr "Signalements"
 
 #: bookwyrm/templates/moderation/reports.html:14
-#, fuzzy, python-format
-#| msgid "Users: <small>%(server_name)s</small>"
 msgid "Reports: <small>%(instance_name)s</small>"
-msgstr "Comptes : <small>%(server_name)s</small>"
+msgstr "Signalements : <small>%(instance_name)s</small>"
 
 #: bookwyrm/templates/moderation/reports.html:28
 msgid "Resolved"

From 88312dcdce4b8236bd9bc03474b201d7bfbe4cfa Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 2 Jun 2021 15:17:17 -0700
Subject: [PATCH 1236/1285] Update locale/fr_FR/LC_MESSAGES/django.po

Co-authored-by: Joachim <joachim.robert@protonmail.com>
---
 locale/fr_FR/LC_MESSAGES/django.po | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 099a3d9e..fdf1b0cc 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -1807,10 +1807,8 @@ msgstr "Gérer les comptes"
 #: bookwyrm/templates/settings/admin_layout.html:39
 #: bookwyrm/templates/settings/federation.html:3
 #: bookwyrm/templates/settings/federation.html:5
-#, fuzzy
-#| msgid "Federated Servers"
 msgid "Federated Instances"
-msgstr "Serveurs fédérés"
+msgstr "Instances fédérées"
 
 #: bookwyrm/templates/settings/admin_layout.html:44
 msgid "Instance Settings"

From 97b2a59b708efc89526bb01945df5d28b61097cd Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 2 Jun 2021 15:17:24 -0700
Subject: [PATCH 1237/1285] Update locale/fr_FR/LC_MESSAGES/django.po

Co-authored-by: Joachim <joachim.robert@protonmail.com>
---
 locale/fr_FR/LC_MESSAGES/django.po | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index fdf1b0cc..0e695514 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -1942,10 +1942,8 @@ msgstr "Voir l’instance"
 
 #: bookwyrm/templates/settings/edit_server.html:7
 #: bookwyrm/templates/settings/server_blocklist.html:7
-#, fuzzy
-#| msgid "Back to server list"
 msgid "Back to instance list"
-msgstr "Retour à la liste des serveurs"
+msgstr "Retour à la liste des instances"
 
 #: bookwyrm/templates/settings/edit_server.html:16
 #: bookwyrm/templates/settings/server_blocklist.html:16

From 54e6162935cba9a5fc928bf7f93048cbf16cc508 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 2 Jun 2021 15:17:34 -0700
Subject: [PATCH 1238/1285] Update locale/fr_FR/LC_MESSAGES/django.po

Co-authored-by: Joachim <joachim.robert@protonmail.com>
---
 locale/fr_FR/LC_MESSAGES/django.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 0e695514..29e0d433 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -2900,7 +2900,7 @@ msgstr "Niveau d’accès :"
 
 #: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:3
 msgid "File exceeds maximum size: 10MB"
-msgstr ""
+msgstr "Ce fichier dépasse la taille limite : 10 Mo"
 
 #: bookwyrm/views/import_data.py:67
 msgid "Not a valid csv file"

From 76457ce1f4e178862c346aea8cd693bb896c3a98 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 2 Jun 2021 15:17:42 -0700
Subject: [PATCH 1239/1285] Update locale/fr_FR/LC_MESSAGES/django.po

Co-authored-by: Joachim <joachim.robert@protonmail.com>
---
 locale/fr_FR/LC_MESSAGES/django.po | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 29e0d433..259ab23c 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -2852,10 +2852,8 @@ msgid "Last Active"
 msgstr "Dernière activité"
 
 #: bookwyrm/templates/user_admin/user_admin.html:38
-#, fuzzy
-#| msgid "View instance"
 msgid "Remote instance"
-msgstr "Voir l’instance"
+msgstr "Instance distante"
 
 #: bookwyrm/templates/user_admin/user_admin.html:47
 msgid "Active"

From f9d1acff54d1ff3416320f33e2b15aa07b17000d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 2 Jun 2021 15:17:54 -0700
Subject: [PATCH 1240/1285] Update locale/fr_FR/LC_MESSAGES/django.po

Co-authored-by: Joachim <joachim.robert@protonmail.com>
---
 locale/fr_FR/LC_MESSAGES/django.po | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 259ab23c..dc62de85 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -2833,10 +2833,8 @@ msgid "Back to users"
 msgstr "Retour aux comptes"
 
 #: bookwyrm/templates/user_admin/user_admin.html:7
-#, fuzzy, python-format
-#| msgid "Users: <small>%(server_name)s</small>"
 msgid "Users: <small>%(instance_name)s</small>"
-msgstr "Comptes : <small>%(server_name)s</small>"
+msgstr "Comptes : <small>%(instance_name)s</small>"
 
 #: bookwyrm/templates/user_admin/user_admin.html:22
 #: bookwyrm/templates/user_admin/username_filter.html:5

From 582f163cfd94ab3e0e561f70ac72c2ecfb278b21 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 2 Jun 2021 15:18:05 -0700
Subject: [PATCH 1241/1285] Update locale/fr_FR/LC_MESSAGES/django.po

Co-authored-by: Joachim <joachim.robert@protonmail.com>
---
 locale/fr_FR/LC_MESSAGES/django.po | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index dc62de85..b60c8e8b 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -2049,10 +2049,8 @@ msgstr "Tous les comptes de cette instance seront réactivés."
 
 #: bookwyrm/templates/settings/federation.html:19
 #: bookwyrm/templates/user_admin/server_filter.html:5
-#, fuzzy
-#| msgid "Instance Name:"
 msgid "Instance name"
-msgstr "Nom de l’instance :"
+msgstr "Nom de l’instance"
 
 #: bookwyrm/templates/settings/federation.html:23
 msgid "Date federated"

From ba3ce62697a0ddc241accfa26f88f1dd72849f9d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 2 Jun 2021 15:18:10 -0700
Subject: [PATCH 1242/1285] Update locale/fr_FR/LC_MESSAGES/django.po

Co-authored-by: Joachim <joachim.robert@protonmail.com>
---
 locale/fr_FR/LC_MESSAGES/django.po | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index b60c8e8b..8501f285 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -1935,10 +1935,8 @@ msgstr "inactive"
 #: bookwyrm/templates/settings/federation.html:10
 #: bookwyrm/templates/settings/server_blocklist.html:3
 #: bookwyrm/templates/settings/server_blocklist.html:20
-#, fuzzy
-#| msgid "View instance"
 msgid "Add instance"
-msgstr "Voir l’instance"
+msgstr "Ajouter une instance"
 
 #: bookwyrm/templates/settings/edit_server.html:7
 #: bookwyrm/templates/settings/server_blocklist.html:7

From 17f9682aabed377a2906b29d4045577844506aac Mon Sep 17 00:00:00 2001
From: bcj <brendan@bcjbcj.ca>
Date: Thu, 3 Jun 2021 08:46:32 -0500
Subject: [PATCH 1243/1285] Testfixes: Remove extra space + hopefully fix env

---
 .github/workflows/django-tests.yml | 3 ++-
 celerywyrm/settings.py             | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/django-tests.yml b/.github/workflows/django-tests.yml
index 3ce368ec..75c1c4b4 100644
--- a/.github/workflows/django-tests.yml
+++ b/.github/workflows/django-tests.yml
@@ -58,7 +58,8 @@ jobs:
         POSTGRES_DB: github_actions
         POSTGRES_HOST: 127.0.0.1
         CELERY_BROKER: ""
-        CELERY_RESULT_BACKEND: ""
+        REDIS_BROKER_PORT: 6379
+        FLOWER_PORT: 8888
         EMAIL_HOST: "smtp.mailgun.org"
         EMAIL_PORT: 587
         EMAIL_HOST_USER: ""
diff --git a/celerywyrm/settings.py b/celerywyrm/settings.py
index 63a6e940..107a3957 100644
--- a/celerywyrm/settings.py
+++ b/celerywyrm/settings.py
@@ -1,7 +1,7 @@
 """ bookwyrm settings and configuration """
 from bookwyrm.settings import *
 
-CELERY_BROKER_URL =  CELERY_BROKER
+CELERY_BROKER_URL = CELERY_BROKER
 CELERY_ACCEPT_CONTENT = ["json"]
 CELERY_TASK_SERIALIZER = "json"
 FLOWER_PORT = env("FLOWER_PORT")

From 5572d2bc33b4db4eccf31afa6b55166084993010 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 4 Jun 2021 21:47:19 +0000
Subject: [PATCH 1244/1285] Bump django from 3.2.0 to 3.2.1

Bumps [django](https://github.com/django/django) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2...3.2.1)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 289d6fe6..3e50a034 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 celery==4.4.2
-Django==3.2.0
+Django==3.2.1
 django-model-utils==4.0.0
 environs==7.2.0
 flower==0.9.4

From 3db8a0916996537d34b1bdee54adcb6d32f4aebe Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Sat, 5 Jun 2021 22:29:06 +0200
Subject: [PATCH 1245/1285] Locales: French update

---
 locale/fr_FR/LC_MESSAGES/django.mo | Bin 45401 -> 45654 bytes
 locale/fr_FR/LC_MESSAGES/django.po | 685 ++++++++++++++++++-----------
 2 files changed, 434 insertions(+), 251 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index b893b1287e9b958ea2c5cc78708ab547f378d4b4..9ee6ba4e5ee57843822b31b5e65908a877ab021d 100644
GIT binary patch
delta 14041
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

delta 13750
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

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index a96f9d76..1e90d80a 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-23 10:45+0000\n"
+"POT-Creation-Date: 2021-06-02 16:08+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"
@@ -56,12 +56,12 @@ msgid "Book Title"
 msgstr "Titre du livre"
 
 #: bookwyrm/forms.py:301 bookwyrm/templates/snippets/create_status_form.html:34
-#: bookwyrm/templates/user/shelf/shelf.html:84
-#: bookwyrm/templates/user/shelf/shelf.html:115
+#: bookwyrm/templates/user/shelf/shelf.html:85
+#: bookwyrm/templates/user/shelf/shelf.html:116
 msgid "Rating"
 msgstr "Note"
 
-#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:101
+#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:107
 msgid "Sort By"
 msgstr "Trier par"
 
@@ -73,41 +73,41 @@ msgstr "Ordre croissant"
 msgid "Descending"
 msgstr "Ordre décroissant"
 
-#: bookwyrm/models/fields.py:24
+#: bookwyrm/models/fields.py:25
 #, python-format
 msgid "%(value)s is not a valid remote_id"
 msgstr "%(value)s n’est pas une remote_id valide."
 
-#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
+#: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:43
 #, python-format
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s n’est pas un nom de compte valide."
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:157
+#: bookwyrm/models/fields.py:166 bookwyrm/templates/layout.html:152
 msgid "username"
 msgstr "nom du compte :"
 
-#: bookwyrm/models/fields.py:170
+#: bookwyrm/models/fields.py:171
 msgid "A user with that username already exists."
 msgstr "Ce nom est déjà associé à un compte."
 
-#: bookwyrm/settings.py:155
+#: bookwyrm/settings.py:156
 msgid "English"
 msgstr "English"
 
-#: bookwyrm/settings.py:156
+#: bookwyrm/settings.py:157
 msgid "German"
 msgstr "Deutsch"
 
-#: bookwyrm/settings.py:157
+#: bookwyrm/settings.py:158
 msgid "Spanish"
 msgstr "Español"
 
-#: bookwyrm/settings.py:158
+#: bookwyrm/settings.py:159
 msgid "French"
 msgstr "Français"
 
-#: bookwyrm/settings.py:159
+#: bookwyrm/settings.py:160
 msgid "Simplified Chinese"
 msgstr "简化字"
 
@@ -137,7 +137,7 @@ msgid "Edit Author"
 msgstr "Modifier l’auteur ou autrice"
 
 #: bookwyrm/templates/author/author.html:32
-#: bookwyrm/templates/author/edit_author.html:38
+#: bookwyrm/templates/author/edit_author.html:41
 msgid "Aliases:"
 msgstr "Pseudonymes :"
 
@@ -173,85 +173,85 @@ msgid "Edit Author:"
 msgstr "Modifier l’auteur ou l’autrice :"
 
 #: bookwyrm/templates/author/edit_author.html:13
-#: bookwyrm/templates/book/edit_book.html:18
+#: bookwyrm/templates/book/edit_book.html:19
 msgid "Added:"
-msgstr "AJouté :"
+msgstr "Ajouté :"
 
 #: bookwyrm/templates/author/edit_author.html:14
-#: bookwyrm/templates/book/edit_book.html:19
+#: bookwyrm/templates/book/edit_book.html:24
 msgid "Updated:"
 msgstr "Mis à jour :"
 
 #: bookwyrm/templates/author/edit_author.html:15
-#: bookwyrm/templates/book/edit_book.html:20
+#: bookwyrm/templates/book/edit_book.html:30
 msgid "Last edited by:"
 msgstr "Dernière modification par :"
 
 #: bookwyrm/templates/author/edit_author.html:31
-#: bookwyrm/templates/book/edit_book.html:90
+#: bookwyrm/templates/book/edit_book.html:117
 msgid "Metadata"
 msgstr "Métadonnées"
 
-#: bookwyrm/templates/author/edit_author.html:32
+#: bookwyrm/templates/author/edit_author.html:33
 #: bookwyrm/templates/lists/form.html:8
 #: bookwyrm/templates/user/shelf/create_shelf_form.html:13
 #: bookwyrm/templates/user/shelf/edit_shelf_form.html:14
 msgid "Name:"
 msgstr "Nom :"
 
-#: bookwyrm/templates/author/edit_author.html:40
-#: bookwyrm/templates/book/edit_book.html:132
-#: bookwyrm/templates/book/edit_book.html:141
-#: bookwyrm/templates/book/edit_book.html:178
+#: bookwyrm/templates/author/edit_author.html:43
+#: bookwyrm/templates/book/edit_book.html:162
+#: bookwyrm/templates/book/edit_book.html:171
+#: bookwyrm/templates/book/edit_book.html:214
 msgid "Separate multiple values with commas."
 msgstr "Séparez plusieurs valeurs par une virgule."
 
-#: bookwyrm/templates/author/edit_author.html:46
+#: bookwyrm/templates/author/edit_author.html:50
 msgid "Bio:"
 msgstr "Bio :"
 
-#: bookwyrm/templates/author/edit_author.html:51
+#: bookwyrm/templates/author/edit_author.html:57
 msgid "Wikipedia link:"
 msgstr "Wikipedia :"
 
-#: bookwyrm/templates/author/edit_author.html:57
+#: bookwyrm/templates/author/edit_author.html:63
 msgid "Birth date:"
 msgstr "Date de naissance :"
 
-#: bookwyrm/templates/author/edit_author.html:65
+#: bookwyrm/templates/author/edit_author.html:71
 msgid "Death date:"
 msgstr "Date de décès :"
 
-#: bookwyrm/templates/author/edit_author.html:73
+#: bookwyrm/templates/author/edit_author.html:79
 msgid "Author Identifiers"
 msgstr "Identifiants de l’auteur ou autrice"
 
-#: bookwyrm/templates/author/edit_author.html:74
+#: bookwyrm/templates/author/edit_author.html:81
 msgid "Openlibrary key:"
 msgstr "Clé Openlibrary :"
 
-#: bookwyrm/templates/author/edit_author.html:79
-#: bookwyrm/templates/book/edit_book.html:243
+#: bookwyrm/templates/author/edit_author.html:89
+#: bookwyrm/templates/book/edit_book.html:293
 msgid "Inventaire ID:"
 msgstr "Identifiant Inventaire :"
 
-#: bookwyrm/templates/author/edit_author.html:84
+#: bookwyrm/templates/author/edit_author.html:97
 msgid "Librarything key:"
 msgstr "Clé Librarything :"
 
-#: bookwyrm/templates/author/edit_author.html:89
+#: bookwyrm/templates/author/edit_author.html:105
 msgid "Goodreads key:"
 msgstr "Clé Goodreads :"
 
-#: bookwyrm/templates/author/edit_author.html:98
+#: bookwyrm/templates/author/edit_author.html:116
 #: bookwyrm/templates/book/book.html:124
-#: bookwyrm/templates/book/edit_book.html:263
+#: bookwyrm/templates/book/edit_book.html:321
 #: bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
 #: bookwyrm/templates/settings/announcement_form.html:69
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:98
-#: bookwyrm/templates/settings/site.html:97
+#: bookwyrm/templates/settings/site.html:101
 #: bookwyrm/templates/snippets/readthrough.html:77
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42
@@ -260,10 +260,10 @@ msgstr "Clé Goodreads :"
 msgid "Save"
 msgstr "Enregistrer"
 
-#: bookwyrm/templates/author/edit_author.html:99
+#: bookwyrm/templates/author/edit_author.html:117
 #: bookwyrm/templates/book/book.html:125 bookwyrm/templates/book/book.html:174
 #: bookwyrm/templates/book/cover_modal.html:32
-#: bookwyrm/templates/book/edit_book.html:264
+#: bookwyrm/templates/book/edit_book.html:322
 #: bookwyrm/templates/moderation/report_modal.html:34
 #: bookwyrm/templates/settings/federated_server.html:99
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
@@ -307,7 +307,7 @@ msgid "Add Description"
 msgstr "Ajouter une description"
 
 #: bookwyrm/templates/book/book.html:120
-#: bookwyrm/templates/book/edit_book.html:108
+#: bookwyrm/templates/book/edit_book.html:136
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
 msgstr "Description :"
@@ -320,12 +320,17 @@ msgstr "<a href=\"%(path)s/editions\">%(count)s éditions</a>"
 #: bookwyrm/templates/book/book.html:142
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
-msgstr "Cette édition est sur votre étagère <a href=\"%(path)s\">%(shelf_name)s</a>."
+msgstr ""
+"Cette édition est sur votre étagère <a href=\"%(path)s\">%(shelf_name)s</a>."
 
 #: bookwyrm/templates/book/book.html:148
 #, python-format
-msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
-msgstr "Une <a href=\"%(book_path)s\">édition différente</a> de ce livre existe sur votre étagère <a href=\"%(shelf_path)s\">%(shelf_name)s</a>."
+msgid ""
+"A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a "
+"href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
+msgstr ""
+"Une <a href=\"%(book_path)s\">édition différente</a> de ce livre existe sur "
+"votre étagère <a href=\"%(shelf_path)s\">%(shelf_name)s</a>."
 
 #: bookwyrm/templates/book/book.html:159
 msgid "Your reading activity"
@@ -367,7 +372,7 @@ msgstr "Sujets"
 msgid "Places"
 msgstr "Lieux"
 
-#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:61
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
@@ -381,7 +386,7 @@ msgstr "Ajouter à la liste"
 
 #: bookwyrm/templates/book/book.html:297
 #: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:164
+#: bookwyrm/templates/lists/list.html:179
 msgid "Add"
 msgstr "Ajouter"
 
@@ -390,22 +395,22 @@ msgid "ISBN:"
 msgstr "ISBN :"
 
 #: bookwyrm/templates/book/book_identifiers.html:14
-#: bookwyrm/templates/book/edit_book.html:248
+#: bookwyrm/templates/book/edit_book.html:301
 msgid "OCLC Number:"
 msgstr "Numéro OCLC :"
 
 #: bookwyrm/templates/book/book_identifiers.html:21
-#: bookwyrm/templates/book/edit_book.html:253
+#: bookwyrm/templates/book/edit_book.html:309
 msgid "ASIN:"
 msgstr "ASIN :"
 
 #: bookwyrm/templates/book/cover_modal.html:17
-#: bookwyrm/templates/book/edit_book.html:192
+#: bookwyrm/templates/book/edit_book.html:229
 msgid "Upload cover:"
 msgstr "Charger une couverture :"
 
 #: bookwyrm/templates/book/cover_modal.html:23
-#: bookwyrm/templates/book/edit_book.html:198
+#: bookwyrm/templates/book/edit_book.html:235
 msgid "Load cover from url:"
 msgstr "Charger la couverture depuis une URL :"
 
@@ -420,127 +425,132 @@ msgstr "Modifier « %(book_title)s »"
 msgid "Add Book"
 msgstr "Ajouter un livre"
 
-#: bookwyrm/templates/book/edit_book.html:40
+#: bookwyrm/templates/book/edit_book.html:54
 msgid "Confirm Book Info"
 msgstr "Confirmer les informations de ce livre"
 
-#: bookwyrm/templates/book/edit_book.html:47
+#: bookwyrm/templates/book/edit_book.html:62
 #, python-format
 msgid "Is \"%(name)s\" an existing author?"
-msgstr "Est‑ce que l’auteur ou l’autrice « %(name)s » existe déjà ?"
+msgstr "Est‑ce que l’auteur/autrice « %(name)s » existe déjà ?"
 
-#: bookwyrm/templates/book/edit_book.html:52
+#: bookwyrm/templates/book/edit_book.html:71
 #, python-format
 msgid "Author of <em>%(book_title)s</em>"
-msgstr "Commencer « <em>%(book_title)s</em> »"
+msgstr "Auteur/autrice de <em>%(book_title)s</em>"
 
-#: bookwyrm/templates/book/edit_book.html:55
+#: bookwyrm/templates/book/edit_book.html:75
 msgid "This is a new author"
 msgstr "Il s’agit d’un nouvel auteur ou d’une nouvelle autrice."
 
-#: bookwyrm/templates/book/edit_book.html:61
+#: bookwyrm/templates/book/edit_book.html:82
 #, python-format
 msgid "Creating a new author: %(name)s"
-msgstr "Création d’un nouvel auteur ou d’une nouvelle autrice : %(name)s"
+msgstr "Création d’un nouvel auteur/autrice : %(name)s"
 
-#: bookwyrm/templates/book/edit_book.html:67
+#: bookwyrm/templates/book/edit_book.html:89
 msgid "Is this an edition of an existing work?"
 msgstr "Est‑ce l’édition d’un ouvrage existant ?"
 
-#: bookwyrm/templates/book/edit_book.html:71
+#: bookwyrm/templates/book/edit_book.html:97
 msgid "This is a new work"
 msgstr "Il s’agit d’un nouvel ouvrage."
 
-#: bookwyrm/templates/book/edit_book.html:77
+#: bookwyrm/templates/book/edit_book.html:104
 #: bookwyrm/templates/password_reset.html:30
 msgid "Confirm"
 msgstr "Confirmer"
 
-#: bookwyrm/templates/book/edit_book.html:79
+#: bookwyrm/templates/book/edit_book.html:106
 #: bookwyrm/templates/feed/status.html:8
 msgid "Back"
 msgstr "Retour"
 
-#: bookwyrm/templates/book/edit_book.html:93
+#: bookwyrm/templates/book/edit_book.html:120
 msgid "Title:"
 msgstr "Titre :"
 
-#: bookwyrm/templates/book/edit_book.html:101
+#: bookwyrm/templates/book/edit_book.html:128
 msgid "Subtitle:"
 msgstr "Sous‑titre :"
 
-#: bookwyrm/templates/book/edit_book.html:114
+#: bookwyrm/templates/book/edit_book.html:144
 msgid "Series:"
 msgstr "Série :"
 
-#: bookwyrm/templates/book/edit_book.html:122
+#: bookwyrm/templates/book/edit_book.html:152
 msgid "Series number:"
 msgstr "Numéro dans la série :"
 
-#: bookwyrm/templates/book/edit_book.html:130
+#: bookwyrm/templates/book/edit_book.html:160
 msgid "Languages:"
 msgstr "Langues :"
 
-#: bookwyrm/templates/book/edit_book.html:139
+#: bookwyrm/templates/book/edit_book.html:169
 msgid "Publisher:"
 msgstr "Éditeur :"
 
-#: bookwyrm/templates/book/edit_book.html:148
+#: bookwyrm/templates/book/edit_book.html:178
 msgid "First published date:"
 msgstr "Première date de publication :"
 
-#: bookwyrm/templates/book/edit_book.html:156
+#: bookwyrm/templates/book/edit_book.html:186
 msgid "Published date:"
 msgstr "Date de publication :"
 
-#: bookwyrm/templates/book/edit_book.html:165
+#: bookwyrm/templates/book/edit_book.html:195
 msgid "Authors"
 msgstr "Auteurs ou autrices"
 
-#: bookwyrm/templates/book/edit_book.html:171
+#: bookwyrm/templates/book/edit_book.html:202
 #, python-format
-msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
-msgstr "Supprimer <a href=\"%(path)s\">%(name)s</a>"
+msgid "Remove %(name)s"
+msgstr "Retirer %(name)s"
 
-#: bookwyrm/templates/book/edit_book.html:176
+#: bookwyrm/templates/book/edit_book.html:205
+#, python-format
+msgid "Author page for %(name)s"
+msgstr "Page de %(name)s"
+
+#: bookwyrm/templates/book/edit_book.html:212
 msgid "Add Authors:"
 msgstr "Ajouter des auteurs ou autrices :"
 
-#: bookwyrm/templates/book/edit_book.html:177
+#: bookwyrm/templates/book/edit_book.html:213
 msgid "John Doe, Jane Smith"
 msgstr "Claude Dupont, Dominique Durand"
 
-#: bookwyrm/templates/book/edit_book.html:183
-#: bookwyrm/templates/user/shelf/shelf.html:77
+#: bookwyrm/templates/book/edit_book.html:220
+#: bookwyrm/templates/user/shelf/shelf.html:78
 msgid "Cover"
 msgstr "Couverture"
 
-#: bookwyrm/templates/book/edit_book.html:211
+#: bookwyrm/templates/book/edit_book.html:248
 msgid "Physical Properties"
 msgstr "Propriétés physiques"
 
-#: bookwyrm/templates/book/edit_book.html:212
+#: bookwyrm/templates/book/edit_book.html:250
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
 msgstr "Format :"
 
-#: bookwyrm/templates/book/edit_book.html:220
+#: bookwyrm/templates/book/edit_book.html:258
 msgid "Pages:"
 msgstr "Pages :"
 
-#: bookwyrm/templates/book/edit_book.html:227
+#: bookwyrm/templates/book/edit_book.html:267
 msgid "Book Identifiers"
 msgstr "Identifiants du livre"
 
-#: bookwyrm/templates/book/edit_book.html:228
+#: bookwyrm/templates/book/edit_book.html:269
 msgid "ISBN 13:"
 msgstr "ISBN 13 :"
 
-#: bookwyrm/templates/book/edit_book.html:233
+#: bookwyrm/templates/book/edit_book.html:277
 msgid "ISBN 10:"
 msgstr "ISBN 10 :"
 
-#: bookwyrm/templates/book/edit_book.html:238
+#: bookwyrm/templates/book/edit_book.html:285
 msgid "Openlibrary ID:"
 msgstr "Identifiant Openlibrary :"
 
@@ -630,18 +640,24 @@ msgstr "Communauté fédérée"
 
 #: bookwyrm/templates/directory/directory.html:4
 #: bookwyrm/templates/directory/directory.html:9
-#: bookwyrm/templates/layout.html:92
+#: bookwyrm/templates/layout.html:64
 msgid "Directory"
 msgstr "Répertoire"
 
 #: bookwyrm/templates/directory/directory.html:17
 msgid "Make your profile discoverable to other BookWyrm users."
-msgstr "Autoriser d’autres utilisateurs ou utilisatrices de BookWyrm à découvrir votre profil."
+msgstr ""
+"Autoriser d’autres utilisateurs ou utilisatrices de BookWyrm à découvrir "
+"votre profil."
 
 #: bookwyrm/templates/directory/directory.html:24
 #, python-format
-msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
-msgstr "Vous pouvez décider de ne plus y figurer à n’importe quel moment depuis vos <a href=\"%(path)s\">paramètres de profil.</a>"
+msgid ""
+"You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</"
+"a>"
+msgstr ""
+"Vous pouvez décider de ne plus y figurer à n’importe quel moment depuis vos "
+"<a href=\"%(path)s\">paramètres de profil.</a>"
 
 #: bookwyrm/templates/directory/directory.html:29
 #: bookwyrm/templates/snippets/announcement.html:34
@@ -770,8 +786,12 @@ msgstr "Bien le bonjour,"
 
 #: bookwyrm/templates/email/html_layout.html:21
 #, python-format
-msgid "BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a>"
-msgstr "BookWyrm, hébergé par <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a>"
+msgid ""
+"BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">"
+"%(site_name)s</a>"
+msgstr ""
+"BookWyrm, hébergé par <a style=\"color: #3273dc;\" href=\"https://%(domain)s"
+"\">%(site_name)s</a>"
 
 #: bookwyrm/templates/email/html_layout.html:23
 msgid "Email preference"
@@ -789,13 +809,21 @@ msgstr "S’enregistrer maintenant"
 
 #: bookwyrm/templates/email/invite/html_content.html:15
 #, python-format
-msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
-msgstr "En savoir plus sur <a href=\"https://%(domain)s%(about_path)s\">cette instance</a>."
+msgid ""
+"Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</"
+"a>."
+msgstr ""
+"En savoir plus sur <a href=\"https://%(domain)s%(about_path)s\">cette "
+"instance</a>."
 
 #: bookwyrm/templates/email/invite/text_content.html:4
 #, python-format
-msgid "You're invited to join %(site_name)s! Click the link below to create an account."
-msgstr "Vous avez reçu une invitation à rejoindre %(site_name)s ! Cliquez le lien suivant pour créer un compte."
+msgid ""
+"You're invited to join %(site_name)s! Click the link below to create an "
+"account."
+msgstr ""
+"Vous avez reçu une invitation à rejoindre %(site_name)s ! Cliquez le lien "
+"suivant pour créer un compte."
 
 #: bookwyrm/templates/email/invite/text_content.html:8
 msgid "Learn more about this instance:"
@@ -804,8 +832,13 @@ msgstr "En savoir plus sur cete instance :"
 #: bookwyrm/templates/email/password_reset/html_content.html:6
 #: bookwyrm/templates/email/password_reset/text_content.html:4
 #, python-format
-msgid "You requested to reset your %(site_name)s password. Click the link below to set a new password and log in to your account."
-msgstr "Une demande de réinitialisation de votre mot de passe sur <i>%(site_name)s</i> a été initialisée. Cliquez le lien suivant pour définir un nouveau mot de passe et vous connecter à votre compte."
+msgid ""
+"You requested to reset your %(site_name)s password. Click the link below to "
+"set a new password and log in to your account."
+msgstr ""
+"Une demande de réinitialisation de votre mot de passe sur <i>%(site_name)s</"
+"i> a été initialisée. Cliquez le lien suivant pour définir un nouveau mot de "
+"passe et vous connecter à votre compte."
 
 #: bookwyrm/templates/email/password_reset/html_content.html:9
 #: bookwyrm/templates/password_reset.html:4
@@ -817,8 +850,11 @@ msgstr "Changez le mot de passe"
 
 #: bookwyrm/templates/email/password_reset/html_content.html:13
 #: bookwyrm/templates/email/password_reset/text_content.html:8
-msgid "If you didn't request to reset your password, you can ignore this email."
-msgstr "Si vous n’avez pas demandé la réinitialisation de votre mot de passe, vous pouvez ignorer cet email."
+msgid ""
+"If you didn't request to reset your password, you can ignore this email."
+msgstr ""
+"Si vous n’avez pas demandé la réinitialisation de votre mot de passe, vous "
+"pouvez ignorer cet email."
 
 #: bookwyrm/templates/email/password_reset/subject.html:2
 #, python-format
@@ -831,7 +867,7 @@ msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:87
+#: bookwyrm/templates/layout.html:92
 msgid "Direct Messages"
 msgstr "Messages directs"
 
@@ -871,11 +907,14 @@ msgstr "Fédéré"
 #: bookwyrm/templates/feed/feed.html:32
 #, python-format
 msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
-msgstr "charger le(s) <span data-poll=\"stream/%(tab)s\">0</span> statut(s) non lu(s)"
+msgstr ""
+"charger le(s) <span data-poll=\"stream/%(tab)s\">0</span> statut(s) non lu(s)"
 
 #: bookwyrm/templates/feed/feed.html:47
-msgid "There aren't any activities right now! Try following a user to get started"
-msgstr "Aucune activité pour l’instant ! Abonnez‑vous à quelqu’un pour commencer"
+msgid ""
+"There aren't any activities right now! Try following a user to get started"
+msgstr ""
+"Aucune activité pour l’instant ! Abonnez‑vous à quelqu’un pour commencer"
 
 #: bookwyrm/templates/feed/feed.html:55
 #: bookwyrm/templates/get_started/users.html:6
@@ -887,13 +926,13 @@ msgid "Updates"
 msgstr "Mises à jour"
 
 #: bookwyrm/templates/feed/feed_layout.html:10
-#: bookwyrm/templates/layout.html:58
 #: bookwyrm/templates/user/shelf/books_header.html:3
 msgid "Your books"
 msgstr "Vos livres"
 
 #: bookwyrm/templates/feed/feed_layout.html:12
-msgid "There are no books here right now! Try searching for a book to get started"
+msgid ""
+"There are no books here right now! Try searching for a book to get started"
 msgstr "Aucun livre ici pour l’instant ! Cherchez un livre pour commencer"
 
 #: bookwyrm/templates/feed/feed_layout.html:23
@@ -942,7 +981,7 @@ msgid "What are you reading?"
 msgstr "Que lisez‑vous ?"
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:120
+#: bookwyrm/templates/lists/list.html:135
 msgid "Search for a book"
 msgstr "Chercher un livre"
 
@@ -955,14 +994,16 @@ msgstr "Aucun livre trouvé pour « %(query)s »"
 #: bookwyrm/templates/get_started/books.html:11
 #, python-format
 msgid "You can add books when you start using %(site_name)s."
-msgstr "Vous pourrez ajouter des livres lorsque vous commencerez à utiliser %(site_name)s."
+msgstr ""
+"Vous pourrez ajouter des livres lorsque vous commencerez à utiliser "
+"%(site_name)s."
 
 #: bookwyrm/templates/get_started/books.html:16
 #: bookwyrm/templates/get_started/books.html:17
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
 #: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
-#: bookwyrm/templates/lists/list.html:124
+#: bookwyrm/templates/lists/list.html:139
 #: bookwyrm/templates/search/layout.html:4
 #: bookwyrm/templates/search/layout.html:9
 msgid "Search"
@@ -978,7 +1019,7 @@ msgid "Popular on %(site_name)s"
 msgstr "Populaire sur %(site_name)s"
 
 #: bookwyrm/templates/get_started/books.html:58
-#: bookwyrm/templates/lists/list.html:137
+#: bookwyrm/templates/lists/list.html:152
 msgid "No books found"
 msgstr "Aucun livre trouvé"
 
@@ -1047,8 +1088,12 @@ msgid "Show this account in suggested users:"
 msgstr "Afficher ce compte dans ceux suggérés :"
 
 #: bookwyrm/templates/get_started/profile.html:52
-msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users."
-msgstr "Votre compte sera listé dans le répertoire et pourra être recommandé à d’autres utilisateurs ou utilisatrices de BookWyrm."
+msgid ""
+"Your account will show up in the directory, and may be recommended to other "
+"BookWyrm users."
+msgstr ""
+"Votre compte sera listé dans le répertoire et pourra être recommandé à "
+"d’autres utilisateurs ou utilisatrices de BookWyrm."
 
 #: bookwyrm/templates/get_started/users.html:11
 msgid "Search for a user"
@@ -1071,8 +1116,12 @@ msgstr "Modifier le défi"
 #: bookwyrm/templates/goal.html:30
 #: bookwyrm/templates/snippets/goal_card.html:13
 #, python-format
-msgid "Set a goal for how many books you'll finish reading in %(year)s, and track your progress throughout the year."
-msgstr "Définissez un nombre de livre à lire comme objectif pour %(year)s, et suivezvotre progression au fil de l’année."
+msgid ""
+"Set a goal for how many books you'll finish reading in %(year)s, and track "
+"your progress throughout the year."
+msgstr ""
+"Définissez un nombre de livre à lire comme objectif pour %(year)s, et "
+"suivezvotre progression au fil de l’année."
 
 #: bookwyrm/templates/goal.html:39
 #, python-format
@@ -1090,7 +1139,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "Livres de %(username)s en %(year)s"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/layout.html:97
+#: bookwyrm/templates/user/shelf/shelf.html:40
 msgid "Import Books"
 msgstr "Importer des livres"
 
@@ -1128,65 +1177,74 @@ msgstr "Aucune importation récente"
 msgid "Import Status"
 msgstr "Statut de l’importation"
 
-#: bookwyrm/templates/import_status.html:12
+#: bookwyrm/templates/import_status.html:13
 msgid "Import started:"
-msgstr "Importation en cours :"
+msgstr "Début de l’importation :"
 
-#: bookwyrm/templates/import_status.html:16
+#: bookwyrm/templates/import_status.html:18
 msgid "Import completed:"
-msgstr "Importation terminé :"
+msgstr "Fin de l’importation :"
 
-#: bookwyrm/templates/import_status.html:19
+#: bookwyrm/templates/import_status.html:23
 msgid "TASK FAILED"
 msgstr "la tâche a échoué"
 
-#: bookwyrm/templates/import_status.html:25
+#: bookwyrm/templates/import_status.html:30
 msgid "Import still in progress."
 msgstr "L’importation est toujours en cours"
 
-#: bookwyrm/templates/import_status.html:27
+#: bookwyrm/templates/import_status.html:32
 msgid "(Hit reload to update!)"
-msgstr "(Rechargez la page pour mettre à jour !"
+msgstr "(Rechargez la page pour la mettre à jour !)"
 
-#: bookwyrm/templates/import_status.html:34
+#: bookwyrm/templates/import_status.html:39
 msgid "Failed to load"
-msgstr "Items non importés"
+msgstr "Éléments non importés"
 
-#: bookwyrm/templates/import_status.html:43
+#: bookwyrm/templates/import_status.html:48
 #, python-format
-msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
-msgstr "Sauter en bas de liste pour sélectionner les %(failed_count)s items n’ayant pu être importés."
+msgid ""
+"Jump to the bottom of the list to select the %(failed_count)s items which "
+"failed to import."
+msgstr ""
+"Sauter en bas de liste pour sélectionner les %(failed_count)s items n’ayant "
+"pu être importés."
 
-#: bookwyrm/templates/import_status.html:78
+#: bookwyrm/templates/import_status.html:60
+#, python-format
+msgid "Line %(index)s: <strong>%(title)s</strong> by %(author)s"
+msgstr "Ligne %(index)s : <strong>%(title)s</strong> par %(author)s"
+
+#: bookwyrm/templates/import_status.html:80
 msgid "Select all"
 msgstr "Tout sélectionner"
 
-#: bookwyrm/templates/import_status.html:81
+#: bookwyrm/templates/import_status.html:83
 msgid "Retry items"
-msgstr "Essayer d’importer les items sélectionnés de nouveau"
+msgstr "Réessayer l’importation de ces éléments"
 
-#: bookwyrm/templates/import_status.html:107
+#: bookwyrm/templates/import_status.html:109
 msgid "Successfully imported"
 msgstr "Importation réussie"
 
-#: bookwyrm/templates/import_status.html:111
+#: bookwyrm/templates/import_status.html:113
 msgid "Book"
 msgstr "Livre"
 
-#: bookwyrm/templates/import_status.html:114
+#: bookwyrm/templates/import_status.html:116
 #: bookwyrm/templates/snippets/create_status_form.html:13
-#: bookwyrm/templates/user/shelf/shelf.html:78
-#: bookwyrm/templates/user/shelf/shelf.html:98
+#: bookwyrm/templates/user/shelf/shelf.html:79
+#: bookwyrm/templates/user/shelf/shelf.html:99
 msgid "Title"
 msgstr "Titre"
 
-#: bookwyrm/templates/import_status.html:117
-#: bookwyrm/templates/user/shelf/shelf.html:79
-#: bookwyrm/templates/user/shelf/shelf.html:101
+#: bookwyrm/templates/import_status.html:119
+#: bookwyrm/templates/user/shelf/shelf.html:80
+#: bookwyrm/templates/user/shelf/shelf.html:102
 msgid "Author"
-msgstr "Auteur ou autrice"
+msgstr "Auteur/autrice"
 
-#: bookwyrm/templates/import_status.html:140
+#: bookwyrm/templates/import_status.html:142
 msgid "Imported"
 msgstr "Importé"
 
@@ -1224,15 +1282,19 @@ msgstr "Chercher un livre ou un compte"
 msgid "Main navigation menu"
 msgstr "Menu de navigation principal "
 
-#: bookwyrm/templates/layout.html:61
+#: bookwyrm/templates/layout.html:58
 msgid "Feed"
 msgstr "Fil d’actualité"
 
-#: bookwyrm/templates/layout.html:102
+#: bookwyrm/templates/layout.html:87
+msgid "Your Books"
+msgstr "Vos Livres"
+
+#: bookwyrm/templates/layout.html:97
 msgid "Settings"
 msgstr "Paramètres"
 
-#: bookwyrm/templates/layout.html:111
+#: bookwyrm/templates/layout.html:106
 #: bookwyrm/templates/settings/admin_layout.html:31
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
@@ -1240,63 +1302,71 @@ msgstr "Paramètres"
 msgid "Invites"
 msgstr "Invitations"
 
-#: bookwyrm/templates/layout.html:118
+#: bookwyrm/templates/layout.html:113
 msgid "Admin"
 msgstr "Admin"
 
-#: bookwyrm/templates/layout.html:125
+#: bookwyrm/templates/layout.html:120
 msgid "Log out"
 msgstr "Se déconnecter"
 
-#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
+#: bookwyrm/templates/layout.html:128 bookwyrm/templates/layout.html:129
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr "Notifications"
 
-#: bookwyrm/templates/layout.html:156 bookwyrm/templates/layout.html:160
+#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "Nom du compte :"
 
-#: bookwyrm/templates/layout.html:161
+#: bookwyrm/templates/layout.html:156
 msgid "password"
 msgstr "Mot de passe"
 
-#: bookwyrm/templates/layout.html:162 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr "Mot de passe oublié ?"
 
-#: bookwyrm/templates/layout.html:165 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "Se connecter"
 
-#: bookwyrm/templates/layout.html:173
+#: bookwyrm/templates/layout.html:168
 msgid "Join"
 msgstr "Rejoindre"
 
-#: bookwyrm/templates/layout.html:211
+#: bookwyrm/templates/layout.html:206
 msgid "About this server"
 msgstr "À propos de ce serveur"
 
-#: bookwyrm/templates/layout.html:215
+#: bookwyrm/templates/layout.html:210
 msgid "Contact site admin"
 msgstr "Contacter l’administrateur du site"
 
-#: bookwyrm/templates/layout.html:219
+#: bookwyrm/templates/layout.html:214
 msgid "Documentation"
 msgstr "Documentation"
 
-#: bookwyrm/templates/layout.html:226
+#: bookwyrm/templates/layout.html:221
 #, python-format
-msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
-msgstr "Soutenez %(site_name)s avec <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
+msgid ""
+"Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">"
+"%(support_title)s</a>"
+msgstr ""
+"Soutenez %(site_name)s avec <a href=\"%(support_link)s\" target=\"_blank\">"
+"%(support_title)s</a>"
 
-#: bookwyrm/templates/layout.html:230
-msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
-msgstr "BookWyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports de bogues via <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+#: bookwyrm/templates/layout.html:225
+msgid ""
+"BookWyrm's source code is freely available. You can contribute or report "
+"issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgstr ""
+"BookWyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports "
+"de bogues via <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
 #: bookwyrm/templates/lists/create_form.html:5
 #: bookwyrm/templates/lists/lists.html:20
@@ -1338,7 +1408,7 @@ msgid "Discard"
 msgstr "Rejeter"
 
 #: bookwyrm/templates/lists/edit_form.html:5
-#: bookwyrm/templates/lists/list_layout.html:17
+#: bookwyrm/templates/lists/list_layout.html:16
 msgid "Edit List"
 msgstr "Modifier la liste"
 
@@ -1385,54 +1455,55 @@ msgstr "Vous avez ajouté un livre à cette liste !"
 msgid "This list is currently empty"
 msgstr "Cette liste est actuellement vide"
 
-#: bookwyrm/templates/lists/list.html:65
+#: bookwyrm/templates/lists/list.html:66
 #, python-format
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
 msgstr "Ajouté par <a href=\"%(user_path)s\">%(username)s</a>"
 
-#: bookwyrm/templates/lists/list.html:77
-msgid "Set"
-msgstr "Appliquer"
-
-#: bookwyrm/templates/lists/list.html:80
+#: bookwyrm/templates/lists/list.html:74
 msgid "List position"
 msgstr "Position"
 
-#: bookwyrm/templates/lists/list.html:86
+#: bookwyrm/templates/lists/list.html:81
+msgid "Set"
+msgstr "Appliquer"
+
+#: bookwyrm/templates/lists/list.html:89
 #: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr "Retirer"
 
-#: bookwyrm/templates/lists/list.html:99 bookwyrm/templates/lists/list.html:111
+#: bookwyrm/templates/lists/list.html:103
+#: bookwyrm/templates/lists/list.html:120
 msgid "Sort List"
 msgstr "Trier la liste"
 
-#: bookwyrm/templates/lists/list.html:105
+#: bookwyrm/templates/lists/list.html:113
 msgid "Direction"
 msgstr "Direction"
 
-#: bookwyrm/templates/lists/list.html:116
+#: bookwyrm/templates/lists/list.html:127
 msgid "Add Books"
 msgstr "Ajouter des livres"
 
-#: bookwyrm/templates/lists/list.html:116
+#: bookwyrm/templates/lists/list.html:129
 msgid "Suggest Books"
 msgstr "Suggérer des livres"
 
-#: bookwyrm/templates/lists/list.html:125
+#: bookwyrm/templates/lists/list.html:140
 msgid "search"
 msgstr "chercher"
 
-#: bookwyrm/templates/lists/list.html:131
+#: bookwyrm/templates/lists/list.html:146
 msgid "Clear search"
 msgstr "Vider la requête"
 
-#: bookwyrm/templates/lists/list.html:136
+#: bookwyrm/templates/lists/list.html:151
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
 msgstr "Aucun livre trouvé pour la requête « %(query)s »"
 
-#: bookwyrm/templates/lists/list.html:164
+#: bookwyrm/templates/lists/list.html:179
 msgid "Suggest"
 msgstr "Suggérer"
 
@@ -1498,7 +1569,9 @@ msgstr "Signaler @%(username)s"
 #: bookwyrm/templates/moderation/report_modal.html:23
 #, python-format
 msgid "This report will be sent to %(site_name)s's moderators for review."
-msgstr "Ce signalement sera envoyé à l’équipe de modération de %(site_name)s pour traitement."
+msgstr ""
+"Ce signalement sera envoyé à l’équipe de modération de %(site_name)s pour "
+"traitement."
 
 #: bookwyrm/templates/moderation/report_modal.html:24
 msgid "More info about this report:"
@@ -1559,18 +1632,30 @@ msgstr "Mentions"
 
 #: bookwyrm/templates/notifications.html:70
 #, python-format
-msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr "a ajouté votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a> à ses favoris"
+msgid ""
+"favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+"a ajouté votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</"
+"em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:72
 #, python-format
-msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
-msgstr "a ajouté votre <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a> à ses favoris"
+msgid ""
+"favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+"a ajouté votre <a href=\"%(related_path)s\">commentaire sur <em>"
+"%(book_title)s</em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:74
 #, python-format
-msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr "a ajouté votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a> à ses favoris"
+msgid ""
+"favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+"a ajouté votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</"
+"em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:76
 #, python-format
@@ -1579,18 +1664,30 @@ msgstr "a ajouté votre <a href=\"%(related_path)s\">statut</a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:81
 #, python-format
-msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr "vous a mentionné dans sa <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a>"
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">review of <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+"vous a mentionné dans sa <a href=\"%(related_path)s\">critique de <em>"
+"%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:83
 #, python-format
-msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
-msgstr "vous a mentionné dans son <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a>"
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">comment on <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+"vous a mentionné dans son <a href=\"%(related_path)s\">commentaire sur <em>"
+"%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:85
 #, python-format
-msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr "vous a mentionné dans sa <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a>"
+msgid ""
+"mentioned you in a <a href=\"%(related_path)s\">quote from <em>"
+"%(book_title)s</em></a>"
+msgstr ""
+"vous a mentionné dans sa <a href=\"%(related_path)s\">citation de <em>"
+"%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:87
 #, python-format
@@ -1599,23 +1696,39 @@ msgstr "vous a mentionné dans son <a href=\"%(related_path)s\">statut</a>"
 
 #: bookwyrm/templates/notifications.html:92
 #, python-format
-msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">critique de <em>%(book_title)s</em></a>"
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">review of <em>%(book_title)s</em></a>"
+msgstr ""
+"<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s"
+"\">critique de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:94
 #, python-format
-msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
-msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">commentaire sur <em>%(book_title)s</em></a>"
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">comment on <em>%(book_title)s</em></a>"
+msgstr ""
+"<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s"
+"\">commentaire sur <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:96
 #, python-format
-msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">citation de <em>%(book_title)s</em></a>"
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">quote from <em>%(book_title)s</em></a>"
+msgstr ""
+"<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s"
+"\">citation de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:98
 #, python-format
-msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
-msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">statut</a>"
+msgid ""
+"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
+"\">status</a>"
+msgstr ""
+"<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s"
+"\">statut</a>"
 
 #: bookwyrm/templates/notifications.html:102
 msgid "followed you"
@@ -1627,18 +1740,30 @@ msgstr "vous a envoyé une demande d’abonnement"
 
 #: bookwyrm/templates/notifications.html:111
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr "a partagé votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a>"
+msgid ""
+"boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></"
+"a>"
+msgstr ""
+"a partagé votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</"
+"em></a>"
 
 #: bookwyrm/templates/notifications.html:113
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
-msgstr "a partagé votre <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a>"
+msgid ""
+"boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></"
+"a>"
+msgstr ""
+"a partagé votre <a href=\"%(related_path)s\">commentaire sur <em>"
+"%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:115
 #, python-format
-msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr "a partagé votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a>"
+msgid ""
+"boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
+"em></a>"
+msgstr ""
+"a partagé votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</"
+"em></a>"
 
 #: bookwyrm/templates/notifications.html:117
 #, python-format
@@ -1647,13 +1772,21 @@ msgstr "a partagé votre <a href=\"%(related_path)s\">statut</a>"
 
 #: bookwyrm/templates/notifications.html:121
 #, python-format
-msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
-msgstr " a ajouté <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre liste « <a href=\"%(list_path)s\">%(list_name)s</a> »"
+msgid ""
+" added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
+"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgstr ""
+" a ajouté <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre "
+"liste « <a href=\"%(list_path)s\">%(list_name)s</a> »"
 
 #: bookwyrm/templates/notifications.html:123
 #, python-format
-msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
-msgstr " a suggégré l’ajout de <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre liste « <a href=\"%(list_path)s/curate\">%(list_name)s</a> »"
+msgid ""
+" suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to "
+"your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgstr ""
+" a suggégré l’ajout de <em><a href=\"%(book_path)s\">%(book_title)s</a></em> "
+"à votre liste « <a href=\"%(list_path)s/curate\">%(list_name)s</a> »"
 
 #: bookwyrm/templates/notifications.html:128
 #, python-format
@@ -1663,7 +1796,8 @@ msgstr "Votre <a href=\"%(url)s\">importation</a> est terminée."
 #: bookwyrm/templates/notifications.html:131
 #, python-format
 msgid "A new <a href=\"%(path)s\">report</a> needs moderation."
-msgstr "Un nouveau <a href=\"%(path)s\">signalement</a> a besoin d’être traité."
+msgstr ""
+"Un nouveau <a href=\"%(path)s\">signalement</a> a besoin d’être traité."
 
 #: bookwyrm/templates/notifications.html:157
 msgid "You're all caught up!"
@@ -1676,7 +1810,8 @@ msgstr "Confirmez le mot de passe :"
 
 #: bookwyrm/templates/password_reset_request.html:14
 msgid "A link to reset your password will be sent to your email address"
-msgstr "Un lien pour changer votre mot de passe sera envoyé à votre addresse email"
+msgstr ""
+"Un lien pour changer votre mot de passe sera envoyé à votre addresse email"
 
 #: bookwyrm/templates/password_reset_request.html:28
 msgid "Reset password"
@@ -1710,12 +1845,17 @@ msgstr "Modifier le profil"
 
 #: bookwyrm/templates/preferences/edit_user.html:46
 msgid "Show set reading goal prompt in feed:"
-msgstr "Afficher le message pour définir un défi lecture dans le fil d’actualité :"
+msgstr ""
+"Afficher le message pour définir un défi lecture dans le fil d’actualité :"
 
 #: bookwyrm/templates/preferences/edit_user.html:62
 #, python-format
-msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
-msgstr "Votre compte sera listé dans le <a href=\"%(path)s\">répertoire</a> et pourra être recommandé à d’autres utilisateurs ou utilisatrices de BookWyrm."
+msgid ""
+"Your account will show up in the <a href=\"%(path)s\">directory</a>, and may "
+"be recommended to other BookWyrm users."
+msgstr ""
+"Votre compte sera listé dans le <a href=\"%(path)s\">répertoire</a> et "
+"pourra être recommandé à d’autres utilisateurs ou utilisatrices de BookWyrm."
 
 #: bookwyrm/templates/preferences/edit_user.html:65
 msgid "Preferred Timezone: "
@@ -2059,7 +2199,7 @@ msgstr "Logiciel"
 #: bookwyrm/templates/settings/manage_invite_requests.html:25
 #: bookwyrm/templates/settings/manage_invites.html:11
 msgid "Invite Requests"
-msgstr "Invitations"
+msgstr "Demandes d’invitations"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:23
 msgid "Ignored Invite Requests"
@@ -2225,15 +2365,15 @@ msgstr "Email de l’administrateur :"
 msgid "Additional info:"
 msgstr "Infos supplémentaires :"
 
-#: bookwyrm/templates/settings/site.html:83
-msgid "Allow registration:"
-msgstr "Autoriser l’enregistrement :"
-
-#: bookwyrm/templates/settings/site.html:87
-msgid "Allow invite requests:"
-msgstr "Autoriser les demandes d’invitation :"
+#: bookwyrm/templates/settings/site.html:85
+msgid "Allow registration"
+msgstr "Autoriser les inscriptions"
 
 #: bookwyrm/templates/settings/site.html:91
+msgid "Allow invite requests"
+msgstr "Autoriser les demandes d’invitation"
+
+#: bookwyrm/templates/settings/site.html:95
 msgid "Registration closed text:"
 msgstr "Texte affiché lorsque les enregistrements sont clos :"
 
@@ -2344,7 +2484,9 @@ msgstr "Supprimer ces dates de lecture ?"
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
 #, python-format
-msgid "You are deleting this readthrough and its %(count)s associated progress updates."
+msgid ""
+"You are deleting this readthrough and its %(count)s associated progress "
+"updates."
 msgstr "Vous avez supprimé ce résumé et ses %(count)s progressions associées."
 
 #: bookwyrm/templates/snippets/fav_button.html:10
@@ -2411,17 +2553,24 @@ msgstr[1] "souhaite lire %(counter)s livres en %(year)s"
 
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
 #, python-format
-msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
-msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
+msgid ""
+"Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
+msgid_plural ""
+"Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
 msgstr[0] "A noté <a href=\"%(path)s\">%(title)s</a> : %(display_rating)s star"
-msgstr[1] "A noté <a href=\"%(path)s\">%(title)s</a> : %(display_rating)s stars"
+msgstr[1] ""
+"A noté <a href=\"%(path)s\">%(title)s</a> : %(display_rating)s stars"
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4
 #, python-format
-msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
-msgid_plural "Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
-msgstr[0] "Critique de « %(book_title)s » (%(display_rating)s star): %(review_title)s"
-msgstr[1] "Critique de « %(book_title)s » (%(display_rating)s stars) : %(review_title)s"
+msgid ""
+"Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
+msgid_plural ""
+"Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
+msgstr[0] ""
+"Critique de « %(book_title)s » (%(display_rating)s star): %(review_title)s"
+msgstr[1] ""
+"Critique de « %(book_title)s » (%(display_rating)s stars) : %(review_title)s"
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:8
 #, python-format
@@ -2430,8 +2579,12 @@ msgstr "Critique de « %(book_title)s » : %(review_title)s"
 
 #: bookwyrm/templates/snippets/goal_card.html:23
 #, python-format
-msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
-msgstr "Vous pouvez définir ou changer votre défi lecture à n’importe quel moment depuis votre <a href=\"%(path)s\">profil</a>"
+msgid ""
+"You can set or change your reading goal any time from your <a href=\"%(path)s"
+"\">profile page</a>"
+msgstr ""
+"Vous pouvez définir ou changer votre défi lecture à n’importe quel moment "
+"depuis votre <a href=\"%(path)s\">profil</a>"
 
 #: bookwyrm/templates/snippets/goal_form.html:9
 msgid "Reading goal:"
@@ -2463,13 +2616,20 @@ msgstr "%(percent)s%% terminé !"
 
 #: bookwyrm/templates/snippets/goal_progress.html:12
 #, python-format
-msgid "You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
-msgstr "Vous avez lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s livres</a>."
+msgid ""
+"You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgstr ""
+"Vous avez lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s livres</"
+"a>."
 
 #: bookwyrm/templates/snippets/goal_progress.html:14
 #, python-format
-msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
-msgstr "%(username)s a lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s livres</a>."
+msgid ""
+"%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s "
+"books</a>."
+msgstr ""
+"%(username)s a lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s "
+"livres</a>."
 
 #: bookwyrm/templates/snippets/page_text.html:4
 #, python-format
@@ -2623,7 +2783,7 @@ msgstr "Commencer « <em>%(book_title)s</em> »"
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:5
 #, python-format
 msgid "Want to Read \"<em>%(book_title)s</em>\""
-msgstr "A envie de lire « <em>%(book_title)s</em> »"
+msgstr "Ajouter « <em>%(book_title)s</em> » aux envies de lecture"
 
 #: bookwyrm/templates/snippets/status/content_status.html:71
 #: bookwyrm/templates/snippets/trimmed_text.html:15
@@ -2660,8 +2820,12 @@ msgstr "a partagé"
 
 #: bookwyrm/templates/snippets/status/status_header.html:45
 #, python-format
-msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
-msgstr "a répondu au <a href=\"%(status_path)s\">statut</a> de <a href=\"%(user_path)s\">%(username)s</a>"
+msgid ""
+"replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
+"\"%(status_path)s\">status</a>"
+msgstr ""
+"a répondu au <a href=\"%(status_path)s\">statut</a> de <a href="
+"\"%(user_path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/snippets/status/status_options.html:7
 #: bookwyrm/templates/snippets/user_options.html:7
@@ -2752,30 +2916,30 @@ msgstr "Tous les livres"
 msgid "Create shelf"
 msgstr "Créer une étagère"
 
-#: bookwyrm/templates/user/shelf/shelf.html:61
+#: bookwyrm/templates/user/shelf/shelf.html:62
 msgid "Edit shelf"
 msgstr "Modifier l’étagère"
 
-#: bookwyrm/templates/user/shelf/shelf.html:80
-#: bookwyrm/templates/user/shelf/shelf.html:104
+#: bookwyrm/templates/user/shelf/shelf.html:81
+#: bookwyrm/templates/user/shelf/shelf.html:105
 msgid "Shelved"
 msgstr "Date d’ajout"
 
-#: bookwyrm/templates/user/shelf/shelf.html:81
-#: bookwyrm/templates/user/shelf/shelf.html:108
+#: bookwyrm/templates/user/shelf/shelf.html:82
+#: bookwyrm/templates/user/shelf/shelf.html:109
 msgid "Started"
 msgstr "Commencé"
 
-#: bookwyrm/templates/user/shelf/shelf.html:82
-#: bookwyrm/templates/user/shelf/shelf.html:111
+#: bookwyrm/templates/user/shelf/shelf.html:83
+#: bookwyrm/templates/user/shelf/shelf.html:112
 msgid "Finished"
 msgstr "Terminé"
 
-#: bookwyrm/templates/user/shelf/shelf.html:137
+#: bookwyrm/templates/user/shelf/shelf.html:138
 msgid "This shelf is empty."
 msgstr "Cette étagère est vide"
 
-#: bookwyrm/templates/user/shelf/shelf.html:143
+#: bookwyrm/templates/user/shelf/shelf.html:144
 msgid "Delete shelf"
 msgstr "Supprimer l’étagère"
 
@@ -2895,6 +3059,10 @@ msgstr "Rétablir le compte"
 msgid "Access level:"
 msgstr "Niveau d’accès :"
 
+#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:22
+msgid "File exceeds maximum size: 10MB"
+msgstr "Ce fichier dépasse la taille limite : 10 Mo"
+
 #: bookwyrm/views/import_data.py:67
 msgid "Not a valid csv file"
 msgstr "Fichier CSV non valide"
@@ -2908,6 +3076,9 @@ msgstr "Aucun compte avec cette adresse email n’a été trouvé."
 msgid "A password reset link sent to %s"
 msgstr "Un lien de réinitialisation a été envoyé à %s."
 
+#~ msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
+#~ msgstr "Supprimer <a href=\"%(path)s\">%(name)s</a>"
+
 #, fuzzy
 #~| msgid "BookWyrm users"
 #~ msgid "BookWyrm\\"
@@ -3198,14 +3369,26 @@ msgstr "Un lien de réinitialisation a été envoyé à %s."
 #~ msgid "Reactivate user"
 #~ msgstr "Réactiver le compte"
 
-#~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">review</a>"
-#~ msgstr "a répondu à la <a href=\"%(status_path)s\">critique</a> de <a href=\"%(user_path)s\">%(username)s</a>"
+#~ msgid ""
+#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
+#~ "\"%(status_path)s\">review</a>"
+#~ msgstr ""
+#~ "a répondu à la <a href=\"%(status_path)s\">critique</a> de <a href="
+#~ "\"%(user_path)s\">%(username)s</a>"
 
-#~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">comment</a>"
-#~ msgstr "a répondu au <a href=\"%(status_path)s\">commentaire</a> de <a href=\"%(user_path)s\">%(username)s</a>"
+#~ msgid ""
+#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
+#~ "\"%(status_path)s\">comment</a>"
+#~ msgstr ""
+#~ "a répondu au <a href=\"%(status_path)s\">commentaire</a> de <a href="
+#~ "\"%(user_path)s\">%(username)s</a>"
 
-#~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">quote</a>"
-#~ msgstr "a répondu à la <a href=\"%(status_path)s\">citation</a> de <a href=\"%(user_path)s\">%(username)s</a>"
+#~ msgid ""
+#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
+#~ "\"%(status_path)s\">quote</a>"
+#~ msgstr ""
+#~ "a répondu à la <a href=\"%(status_path)s\">citation</a> de <a href="
+#~ "\"%(user_path)s\">%(username)s</a>"
 
 #~ msgid "Remove tag"
 #~ msgstr "Supprimer le tag"

From 4accf3953b6aae47ab1a4ee8a98f9d4267121287 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Sat, 5 Jun 2021 22:38:59 +0200
Subject: [PATCH 1246/1285] Update

---
 locale/fr_FR/LC_MESSAGES/django.mo | Bin 45654 -> 45836 bytes
 locale/fr_FR/LC_MESSAGES/django.po |  34 ++++++++++++++++++-----------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index 9ee6ba4e5ee57843822b31b5e65908a877ab021d..28db351430e417fb71bf8d17ff0eee5e1d4bce63 100644
GIT binary patch
delta 13702
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
I-Iy%@1%IrN0RR91

delta 13583
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
E9}M$%iU0rr

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 1e90d80a..4d5278ad 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-02 16:08+0000\n"
+"POT-Creation-Date: 2021-06-05 20:35+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"
@@ -91,23 +91,23 @@ msgstr "nom du compte :"
 msgid "A user with that username already exists."
 msgstr "Ce nom est déjà associé à un compte."
 
-#: bookwyrm/settings.py:156
+#: bookwyrm/settings.py:160
 msgid "English"
 msgstr "English"
 
-#: bookwyrm/settings.py:157
+#: bookwyrm/settings.py:161
 msgid "German"
 msgstr "Deutsch"
 
-#: bookwyrm/settings.py:158
+#: bookwyrm/settings.py:162
 msgid "Spanish"
 msgstr "Español"
 
-#: bookwyrm/settings.py:159
+#: bookwyrm/settings.py:163
 msgid "French"
 msgstr "Français"
 
-#: bookwyrm/settings.py:160
+#: bookwyrm/settings.py:164
 msgid "Simplified Chinese"
 msgstr "简化字"
 
@@ -136,34 +136,42 @@ msgstr "Une erreur s’est produite ; désolé !"
 msgid "Edit Author"
 msgstr "Modifier l’auteur ou autrice"
 
-#: bookwyrm/templates/author/author.html:32
+#: bookwyrm/templates/author/author.html:34
 #: bookwyrm/templates/author/edit_author.html:41
 msgid "Aliases:"
 msgstr "Pseudonymes :"
 
-#: bookwyrm/templates/author/author.html:38
+#: bookwyrm/templates/author/author.html:45
 msgid "Born:"
 msgstr "Naissance :"
 
-#: bookwyrm/templates/author/author.html:44
+#: bookwyrm/templates/author/author.html:52
 msgid "Died:"
 msgstr "Décès :"
 
-#: bookwyrm/templates/author/author.html:51
+#: bookwyrm/templates/author/author.html:61
 msgid "Wikipedia"
 msgstr "Wikipedia"
 
-#: bookwyrm/templates/author/author.html:55
+#: bookwyrm/templates/author/author.html:69
 #: bookwyrm/templates/book/book.html:78
 msgid "View on OpenLibrary"
 msgstr "Voir sur OpenLibrary"
 
-#: bookwyrm/templates/author/author.html:60
+#: bookwyrm/templates/author/author.html:77
 #: bookwyrm/templates/book/book.html:81
 msgid "View on Inventaire"
 msgstr "Voir sur Inventaire"
 
-#: bookwyrm/templates/author/author.html:74
+#: bookwyrm/templates/author/author.html:85
+msgid "View on LibraryThing"
+msgstr "Voir sur LibraryThing"
+
+#: bookwyrm/templates/author/author.html:93
+msgid "View on Goodreads"
+msgstr "Voir sur Goodreads"
+
+#: bookwyrm/templates/author/author.html:108
 #, python-format
 msgid "Books by %(name)s"
 msgstr "Livres par %(name)s"

From b7924f234575fca67a7289687d76c73e0ab21c32 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Sun, 6 Jun 2021 18:42:07 +0200
Subject: [PATCH 1247/1285] Update django.po

---
 locale/fr_FR/LC_MESSAGES/django.po | 1849 ++++++++++------------------
 1 file changed, 635 insertions(+), 1214 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 4d5278ad..aefdbdd6 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -1,255 +1,235 @@
-# French language text for the bookwyrm UI
-# Copyright (C) 2021 Mouse Reeve
-# This file is distributed under the same license as the bookwyrm package.
-# Mouse Reeve <mousereeve@riseup.net>, 2021
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: 0.1.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-05 20:35+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"
-"Language: fr_FR\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
 #: bookwyrm/forms.py:224
 msgid "A user with this email already exists."
-msgstr "Cet email est déjà associé à un compte."
+msgstr ""
 
 #: bookwyrm/forms.py:238
 msgid "One Day"
-msgstr "Un jour"
+msgstr ""
 
 #: bookwyrm/forms.py:239
 msgid "One Week"
-msgstr "Une semaine"
+msgstr ""
 
 #: bookwyrm/forms.py:240
 msgid "One Month"
-msgstr "Un mois"
+msgstr ""
 
 #: bookwyrm/forms.py:241
 msgid "Does Not Expire"
-msgstr "Sans expiration"
+msgstr ""
 
 #: bookwyrm/forms.py:246
 #, python-format
 msgid "%(count)d uses"
-msgstr "%(count)d utilisations"
+msgstr ""
 
 #: bookwyrm/forms.py:249
 msgid "Unlimited"
-msgstr "Sans limite"
+msgstr ""
 
 #: bookwyrm/forms.py:299
 msgid "List Order"
-msgstr "Ordre de la liste"
+msgstr ""
 
 #: bookwyrm/forms.py:300
 msgid "Book Title"
-msgstr "Titre du livre"
+msgstr ""
 
 #: bookwyrm/forms.py:301 bookwyrm/templates/snippets/create_status_form.html:34
 #: bookwyrm/templates/user/shelf/shelf.html:85
 #: bookwyrm/templates/user/shelf/shelf.html:116
 msgid "Rating"
-msgstr "Note"
+msgstr ""
 
 #: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:107
 msgid "Sort By"
-msgstr "Trier par"
+msgstr ""
 
 #: bookwyrm/forms.py:307
 msgid "Ascending"
-msgstr "Ordre croissant"
+msgstr ""
 
 #: bookwyrm/forms.py:308
 msgid "Descending"
-msgstr "Ordre décroissant"
+msgstr ""
 
 #: bookwyrm/models/fields.py:25
 #, python-format
 msgid "%(value)s is not a valid remote_id"
-msgstr "%(value)s n’est pas une remote_id valide."
+msgstr ""
 
 #: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:43
 #, python-format
 msgid "%(value)s is not a valid username"
-msgstr "%(value)s n’est pas un nom de compte valide."
+msgstr ""
 
 #: bookwyrm/models/fields.py:166 bookwyrm/templates/layout.html:152
 msgid "username"
-msgstr "nom du compte :"
+msgstr ""
 
 #: bookwyrm/models/fields.py:171
 msgid "A user with that username already exists."
-msgstr "Ce nom est déjà associé à un compte."
+msgstr ""
 
 #: bookwyrm/settings.py:160
 msgid "English"
-msgstr "English"
+msgstr ""
 
 #: bookwyrm/settings.py:161
 msgid "German"
-msgstr "Deutsch"
+msgstr ""
 
 #: bookwyrm/settings.py:162
 msgid "Spanish"
-msgstr "Español"
+msgstr ""
 
 #: bookwyrm/settings.py:163
 msgid "French"
-msgstr "Français"
+msgstr ""
 
 #: bookwyrm/settings.py:164
 msgid "Simplified Chinese"
-msgstr "简化字"
+msgstr ""
 
 #: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8
 msgid "Not Found"
-msgstr "Introuvable"
+msgstr ""
 
 #: bookwyrm/templates/404.html:9
 msgid "The page you requested doesn't seem to exist!"
-msgstr "Il semblerait que la page que vous avez demandée n’existe pas !"
+msgstr ""
 
 #: bookwyrm/templates/500.html:4
 msgid "Oops!"
-msgstr "Oups !"
+msgstr ""
 
 #: bookwyrm/templates/500.html:8
 msgid "Server Error"
-msgstr "Erreur côté serveur"
+msgstr ""
 
 #: bookwyrm/templates/500.html:9
 msgid "Something went wrong! Sorry about that."
-msgstr "Une erreur s’est produite ; désolé !"
+msgstr ""
 
 #: bookwyrm/templates/author/author.html:17
 #: bookwyrm/templates/author/author.html:18
 msgid "Edit Author"
-msgstr "Modifier l’auteur ou autrice"
+msgstr ""
 
 #: bookwyrm/templates/author/author.html:34
 #: bookwyrm/templates/author/edit_author.html:41
 msgid "Aliases:"
-msgstr "Pseudonymes :"
+msgstr ""
 
 #: bookwyrm/templates/author/author.html:45
 msgid "Born:"
-msgstr "Naissance :"
+msgstr ""
 
 #: bookwyrm/templates/author/author.html:52
 msgid "Died:"
-msgstr "Décès :"
+msgstr ""
 
 #: bookwyrm/templates/author/author.html:61
 msgid "Wikipedia"
-msgstr "Wikipedia"
+msgstr ""
 
 #: bookwyrm/templates/author/author.html:69
 #: bookwyrm/templates/book/book.html:78
 msgid "View on OpenLibrary"
-msgstr "Voir sur OpenLibrary"
+msgstr ""
 
 #: bookwyrm/templates/author/author.html:77
 #: bookwyrm/templates/book/book.html:81
 msgid "View on Inventaire"
-msgstr "Voir sur Inventaire"
+msgstr ""
 
 #: bookwyrm/templates/author/author.html:85
 msgid "View on LibraryThing"
-msgstr "Voir sur LibraryThing"
+msgstr ""
 
 #: bookwyrm/templates/author/author.html:93
 msgid "View on Goodreads"
-msgstr "Voir sur Goodreads"
+msgstr ""
 
 #: bookwyrm/templates/author/author.html:108
 #, python-format
 msgid "Books by %(name)s"
-msgstr "Livres par %(name)s"
+msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:5
 msgid "Edit Author:"
-msgstr "Modifier l’auteur ou l’autrice :"
+msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:13
 #: bookwyrm/templates/book/edit_book.html:19
 msgid "Added:"
-msgstr "Ajouté :"
+msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:14
 #: bookwyrm/templates/book/edit_book.html:24
 msgid "Updated:"
-msgstr "Mis à jour :"
+msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:15
 #: bookwyrm/templates/book/edit_book.html:30
 msgid "Last edited by:"
-msgstr "Dernière modification par :"
+msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:31
 #: bookwyrm/templates/book/edit_book.html:117
 msgid "Metadata"
-msgstr "Métadonnées"
+msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:33
 #: bookwyrm/templates/lists/form.html:8
 #: bookwyrm/templates/user/shelf/create_shelf_form.html:13
 #: bookwyrm/templates/user/shelf/edit_shelf_form.html:14
 msgid "Name:"
-msgstr "Nom :"
+msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:43
 #: bookwyrm/templates/book/edit_book.html:162
 #: bookwyrm/templates/book/edit_book.html:171
 #: bookwyrm/templates/book/edit_book.html:214
 msgid "Separate multiple values with commas."
-msgstr "Séparez plusieurs valeurs par une virgule."
+msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:50
 msgid "Bio:"
-msgstr "Bio :"
+msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:57
 msgid "Wikipedia link:"
-msgstr "Wikipedia :"
+msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:63
 msgid "Birth date:"
-msgstr "Date de naissance :"
+msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:71
 msgid "Death date:"
-msgstr "Date de décès :"
+msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:79
 msgid "Author Identifiers"
-msgstr "Identifiants de l’auteur ou autrice"
+msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:81
 msgid "Openlibrary key:"
-msgstr "Clé Openlibrary :"
+msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:89
 #: bookwyrm/templates/book/edit_book.html:293
 msgid "Inventaire ID:"
-msgstr "Identifiant Inventaire :"
+msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:97
 msgid "Librarything key:"
-msgstr "Clé Librarything :"
+msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:105
 msgid "Goodreads key:"
-msgstr "Clé Goodreads :"
+msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:116
 #: bookwyrm/templates/book/book.html:124
@@ -266,7 +246,7 @@ msgstr "Clé Goodreads :"
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:38
 msgid "Save"
-msgstr "Enregistrer"
+msgstr ""
 
 #: bookwyrm/templates/author/edit_author.html:117
 #: bookwyrm/templates/book/book.html:125 bookwyrm/templates/book/book.html:174
@@ -282,103 +262,98 @@ msgstr "Enregistrer"
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
 msgid "Cancel"
-msgstr "Annuler"
+msgstr ""
 
 #: bookwyrm/templates/book/book.html:31
 #: bookwyrm/templates/discover/large-book.html:25
 #: bookwyrm/templates/discover/small-book.html:19
 msgid "by"
-msgstr "par"
+msgstr ""
 
 #: bookwyrm/templates/book/book.html:39 bookwyrm/templates/book/book.html:40
 msgid "Edit Book"
-msgstr "Modifier le livre"
+msgstr ""
 
 #: bookwyrm/templates/book/book.html:57
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
-msgstr "Ajouter une couverture"
+msgstr ""
 
 #: bookwyrm/templates/book/book.html:61
 msgid "Failed to load cover"
-msgstr "La couverture n’a pu être chargée"
+msgstr ""
 
 #: bookwyrm/templates/book/book.html:101
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
-msgstr[0] "(%(review_count)s critique)"
-msgstr[1] "(%(review_count)s critiques)"
+msgstr[0] ""
+msgstr[1] ""
 
 #: bookwyrm/templates/book/book.html:113
 msgid "Add Description"
-msgstr "Ajouter une description"
+msgstr ""
 
 #: bookwyrm/templates/book/book.html:120
 #: bookwyrm/templates/book/edit_book.html:136
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
-msgstr "Description :"
+msgstr ""
 
 #: bookwyrm/templates/book/book.html:134
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
-msgstr "<a href=\"%(path)s/editions\">%(count)s éditions</a>"
+msgstr ""
 
 #: bookwyrm/templates/book/book.html:142
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
 msgstr ""
-"Cette édition est sur votre étagère <a href=\"%(path)s\">%(shelf_name)s</a>."
 
 #: bookwyrm/templates/book/book.html:148
 #, python-format
-msgid ""
-"A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a "
-"href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
+msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
 msgstr ""
-"Une <a href=\"%(book_path)s\">édition différente</a> de ce livre existe sur "
-"votre étagère <a href=\"%(shelf_path)s\">%(shelf_name)s</a>."
 
 #: bookwyrm/templates/book/book.html:159
 msgid "Your reading activity"
-msgstr "Votre activité de lecture"
+msgstr ""
 
 #: bookwyrm/templates/book/book.html:162
 msgid "Add read dates"
-msgstr "Ajouter des dates de lecture"
+msgstr ""
 
 #: bookwyrm/templates/book/book.html:171
 msgid "Create"
-msgstr "Créer"
+msgstr ""
 
 #: bookwyrm/templates/book/book.html:181
 msgid "You don't have any reading activity for this book."
-msgstr "Vous n’avez aucune activité de lecture pour ce livre"
+msgstr ""
 
 #: bookwyrm/templates/book/book.html:200
 msgid "Reviews"
-msgstr "Critiques"
+msgstr ""
 
 #: bookwyrm/templates/book/book.html:205
 msgid "Your reviews"
-msgstr "Vos critiques"
+msgstr ""
 
 #: bookwyrm/templates/book/book.html:211
 msgid "Your comments"
-msgstr "Vos commentaires"
+msgstr ""
 
 #: bookwyrm/templates/book/book.html:217
 msgid "Your quotes"
-msgstr "Vos citations"
+msgstr ""
 
 #: bookwyrm/templates/book/book.html:253
 msgid "Subjects"
-msgstr "Sujets"
+msgstr ""
 
 #: bookwyrm/templates/book/book.html:265
 msgid "Places"
-msgstr "Lieux"
+msgstr ""
 
 #: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:61
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
@@ -386,239 +361,239 @@ msgstr "Lieux"
 #: bookwyrm/templates/search/layout.html:50
 #: bookwyrm/templates/user/layout.html:68
 msgid "Lists"
-msgstr "Listes"
+msgstr ""
 
 #: bookwyrm/templates/book/book.html:287
 msgid "Add to list"
-msgstr "Ajouter à la liste"
+msgstr ""
 
 #: bookwyrm/templates/book/book.html:297
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:179
 msgid "Add"
-msgstr "Ajouter"
+msgstr ""
 
 #: bookwyrm/templates/book/book_identifiers.html:7
 msgid "ISBN:"
-msgstr "ISBN :"
+msgstr ""
 
 #: bookwyrm/templates/book/book_identifiers.html:14
 #: bookwyrm/templates/book/edit_book.html:301
 msgid "OCLC Number:"
-msgstr "Numéro OCLC :"
+msgstr ""
 
 #: bookwyrm/templates/book/book_identifiers.html:21
 #: bookwyrm/templates/book/edit_book.html:309
 msgid "ASIN:"
-msgstr "ASIN :"
+msgstr ""
 
 #: bookwyrm/templates/book/cover_modal.html:17
 #: bookwyrm/templates/book/edit_book.html:229
 msgid "Upload cover:"
-msgstr "Charger une couverture :"
+msgstr ""
 
 #: bookwyrm/templates/book/cover_modal.html:23
 #: bookwyrm/templates/book/edit_book.html:235
 msgid "Load cover from url:"
-msgstr "Charger la couverture depuis une URL :"
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:5
 #: bookwyrm/templates/book/edit_book.html:11
 #, python-format
 msgid "Edit \"%(book_title)s\""
-msgstr "Modifier « %(book_title)s »"
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:5
 #: bookwyrm/templates/book/edit_book.html:13
 msgid "Add Book"
-msgstr "Ajouter un livre"
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:54
 msgid "Confirm Book Info"
-msgstr "Confirmer les informations de ce livre"
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:62
 #, python-format
 msgid "Is \"%(name)s\" an existing author?"
-msgstr "Est‑ce que l’auteur/autrice « %(name)s » existe déjà ?"
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:71
 #, python-format
 msgid "Author of <em>%(book_title)s</em>"
-msgstr "Auteur/autrice de <em>%(book_title)s</em>"
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:75
 msgid "This is a new author"
-msgstr "Il s’agit d’un nouvel auteur ou d’une nouvelle autrice."
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:82
 #, python-format
 msgid "Creating a new author: %(name)s"
-msgstr "Création d’un nouvel auteur/autrice : %(name)s"
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:89
 msgid "Is this an edition of an existing work?"
-msgstr "Est‑ce l’édition d’un ouvrage existant ?"
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:97
 msgid "This is a new work"
-msgstr "Il s’agit d’un nouvel ouvrage."
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:104
 #: bookwyrm/templates/password_reset.html:30
 msgid "Confirm"
-msgstr "Confirmer"
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:106
 #: bookwyrm/templates/feed/status.html:8
 msgid "Back"
-msgstr "Retour"
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:120
 msgid "Title:"
-msgstr "Titre :"
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:128
 msgid "Subtitle:"
-msgstr "Sous‑titre :"
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:144
 msgid "Series:"
-msgstr "Série :"
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:152
 msgid "Series number:"
-msgstr "Numéro dans la série :"
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:160
 msgid "Languages:"
-msgstr "Langues :"
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:169
 msgid "Publisher:"
-msgstr "Éditeur :"
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:178
 msgid "First published date:"
-msgstr "Première date de publication :"
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:186
 msgid "Published date:"
-msgstr "Date de publication :"
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:195
 msgid "Authors"
-msgstr "Auteurs ou autrices"
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:202
 #, python-format
 msgid "Remove %(name)s"
-msgstr "Retirer %(name)s"
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:205
 #, python-format
 msgid "Author page for %(name)s"
-msgstr "Page de %(name)s"
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:212
 msgid "Add Authors:"
-msgstr "Ajouter des auteurs ou autrices :"
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:213
 msgid "John Doe, Jane Smith"
-msgstr "Claude Dupont, Dominique Durand"
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:220
 #: bookwyrm/templates/user/shelf/shelf.html:78
 msgid "Cover"
-msgstr "Couverture"
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:248
 msgid "Physical Properties"
-msgstr "Propriétés physiques"
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:250
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
-msgstr "Format :"
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:258
 msgid "Pages:"
-msgstr "Pages :"
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:267
 msgid "Book Identifiers"
-msgstr "Identifiants du livre"
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:269
 msgid "ISBN 13:"
-msgstr "ISBN 13 :"
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:277
 msgid "ISBN 10:"
-msgstr "ISBN 10 :"
+msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:285
 msgid "Openlibrary ID:"
-msgstr "Identifiant Openlibrary :"
+msgstr ""
 
 #: bookwyrm/templates/book/editions.html:4
 #, python-format
 msgid "Editions of %(book_title)s"
-msgstr "Éditions de %(book_title)s"
+msgstr ""
 
 #: bookwyrm/templates/book/editions.html:8
 #, python-format
 msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
-msgstr "Éditions de <a href=\"%(work_path)s\">« %(work_title)s »</a>"
+msgstr ""
 
 #: bookwyrm/templates/book/format_filter.html:8
 #: bookwyrm/templates/book/language_filter.html:8
 msgid "Any"
-msgstr "Tou(te)s"
+msgstr ""
 
 #: bookwyrm/templates/book/language_filter.html:5
 msgid "Language:"
-msgstr "Langue :"
+msgstr ""
 
 #: bookwyrm/templates/book/publisher_info.html:22
 #, python-format
 msgid "%(format)s"
-msgstr "%(format)s"
+msgstr ""
 
 #: bookwyrm/templates/book/publisher_info.html:24
 #, python-format
 msgid "%(format)s, %(pages)s pages"
-msgstr "%(format)s, %(pages)s pages"
+msgstr ""
 
 #: bookwyrm/templates/book/publisher_info.html:26
 #, python-format
 msgid "%(pages)s pages"
-msgstr "%(pages)s pages"
+msgstr ""
 
 #: bookwyrm/templates/book/publisher_info.html:38
 #, python-format
 msgid "%(languages)s language"
-msgstr "Langue : %(languages)s"
+msgstr ""
 
 #: bookwyrm/templates/book/publisher_info.html:64
 #, python-format
 msgid "Published %(date)s by %(publisher)s."
-msgstr "Publié %(date)s par %(publisher)s."
+msgstr ""
 
 #: bookwyrm/templates/book/publisher_info.html:66
 #, python-format
 msgid "Published %(date)s"
-msgstr "Publié %(date)s"
+msgstr ""
 
 #: bookwyrm/templates/book/publisher_info.html:68
 #, python-format
 msgid "Published by %(publisher)s."
-msgstr "Publié par %(publisher)s."
+msgstr ""
 
 #: bookwyrm/templates/book/rating.html:13
 msgid "rated it"
-msgstr "l’a noté"
+msgstr ""
 
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
@@ -628,225 +603,202 @@ msgstr "l’a noté"
 #: bookwyrm/templates/search/book.html:32
 #: bookwyrm/templates/snippets/announcement.html:18
 msgid "Close"
-msgstr "Fermer"
+msgstr ""
 
 #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8
 msgid "Compose status"
-msgstr "Rédiger un statut"
+msgstr ""
 
 #: bookwyrm/templates/directory/community_filter.html:5
 msgid "Community"
-msgstr "Communauté"
+msgstr ""
 
 #: bookwyrm/templates/directory/community_filter.html:8
 msgid "Local users"
-msgstr "Comptes locaux"
+msgstr ""
 
 #: bookwyrm/templates/directory/community_filter.html:12
 msgid "Federated community"
-msgstr "Communauté fédérée"
+msgstr ""
 
 #: bookwyrm/templates/directory/directory.html:4
 #: bookwyrm/templates/directory/directory.html:9
 #: bookwyrm/templates/layout.html:64
 msgid "Directory"
-msgstr "Répertoire"
+msgstr ""
 
 #: bookwyrm/templates/directory/directory.html:17
 msgid "Make your profile discoverable to other BookWyrm users."
 msgstr ""
-"Autoriser d’autres utilisateurs ou utilisatrices de BookWyrm à découvrir "
-"votre profil."
 
 #: bookwyrm/templates/directory/directory.html:24
 #, python-format
-msgid ""
-"You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</"
-"a>"
+msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
 msgstr ""
-"Vous pouvez décider de ne plus y figurer à n’importe quel moment depuis vos "
-"<a href=\"%(path)s\">paramètres de profil.</a>"
 
 #: bookwyrm/templates/directory/directory.html:29
 #: bookwyrm/templates/snippets/announcement.html:34
 #: bookwyrm/templates/snippets/goal_card.html:22
 msgid "Dismiss message"
-msgstr "Fermer le message"
+msgstr ""
 
 #: bookwyrm/templates/directory/sort_filter.html:5
 msgid "Order by"
-msgstr "Trier par"
+msgstr ""
 
 #: bookwyrm/templates/directory/sort_filter.html:8
 msgid "Suggested"
-msgstr "Suggéré"
+msgstr ""
 
 #: bookwyrm/templates/directory/sort_filter.html:9
 msgid "Recently active"
-msgstr "Actif récemment"
+msgstr ""
 
 #: bookwyrm/templates/directory/user_card.html:33
 msgid "follower you follow"
 msgid_plural "followers you follow"
-msgstr[0] "compte que vous suivez"
-msgstr[1] "comptes que vous suivez"
+msgstr[0] ""
+msgstr[1] ""
 
 #: bookwyrm/templates/directory/user_card.html:40
 msgid "book on your shelves"
 msgid_plural "books on your shelves"
-msgstr[0] "livre sur vos étagères"
-msgstr[1] "livres sur vos étagères"
+msgstr[0] ""
+msgstr[1] ""
 
 #: bookwyrm/templates/directory/user_card.html:48
 msgid "posts"
-msgstr "publications"
+msgstr ""
 
 #: bookwyrm/templates/directory/user_card.html:54
 msgid "last active"
-msgstr "dernière activité"
+msgstr ""
 
 #: bookwyrm/templates/directory/user_type_filter.html:5
 msgid "User type"
-msgstr "Type de compte"
+msgstr ""
 
 #: bookwyrm/templates/directory/user_type_filter.html:8
 msgid "BookWyrm users"
-msgstr "Comptes BookWyrm"
+msgstr ""
 
 #: bookwyrm/templates/directory/user_type_filter.html:12
 msgid "All known users"
-msgstr "Tous les comptes connus"
+msgstr ""
 
 #: bookwyrm/templates/discover/about.html:7
 #, python-format
 msgid "About %(site_name)s"
-msgstr "À propos de %(site_name)s"
+msgstr ""
 
 #: bookwyrm/templates/discover/about.html:10
 #: bookwyrm/templates/discover/about.html:20
 msgid "Code of Conduct"
-msgstr "Code de conduite"
+msgstr ""
 
 #: bookwyrm/templates/discover/about.html:13
 #: bookwyrm/templates/discover/about.html:29
 msgid "Privacy Policy"
-msgstr "Politique de vie privée"
+msgstr ""
 
 #: bookwyrm/templates/discover/discover.html:6
 msgid "Recent Books"
-msgstr "Livres récents"
+msgstr ""
 
 #: bookwyrm/templates/discover/landing_layout.html:5
 #: bookwyrm/templates/get_started/layout.html:4
 msgid "Welcome"
-msgstr "Bienvenue"
+msgstr ""
 
 #: bookwyrm/templates/discover/landing_layout.html:17
 msgid "Decentralized"
-msgstr "Décentralisé"
+msgstr ""
 
 #: bookwyrm/templates/discover/landing_layout.html:23
 msgid "Friendly"
-msgstr "Sympa"
+msgstr ""
 
 #: bookwyrm/templates/discover/landing_layout.html:29
 msgid "Anti-Corporate"
-msgstr "Anti‑commercial"
+msgstr ""
 
 #: bookwyrm/templates/discover/landing_layout.html:44
 #, python-format
 msgid "Join %(name)s"
-msgstr "Rejoignez %(name)s"
+msgstr ""
 
 #: bookwyrm/templates/discover/landing_layout.html:51
 #: bookwyrm/templates/login.html:51
 msgid "This instance is closed"
-msgstr "Cette instance est fermée"
+msgstr ""
 
 #: bookwyrm/templates/discover/landing_layout.html:57
 msgid "Thank you! Your request has been received."
-msgstr "Merci ! Votre demande a bien été reçue."
+msgstr ""
 
 #: bookwyrm/templates/discover/landing_layout.html:60
 msgid "Request an Invitation"
-msgstr "Demander une invitation"
+msgstr ""
 
 #: bookwyrm/templates/discover/landing_layout.html:64
 #: bookwyrm/templates/password_reset_request.html:18
 #: bookwyrm/templates/preferences/edit_user.html:38
 #: bookwyrm/templates/snippets/register_form.html:13
 msgid "Email address:"
-msgstr "Adresse email :"
+msgstr ""
 
 #: bookwyrm/templates/discover/landing_layout.html:70
 #: bookwyrm/templates/moderation/report_modal.html:33
 msgid "Submit"
-msgstr "Valider"
+msgstr ""
 
 #: bookwyrm/templates/discover/landing_layout.html:79
 msgid "Your Account"
-msgstr "Votre compte"
+msgstr ""
 
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
-msgstr "Bien le bonjour,"
+msgstr ""
 
 #: bookwyrm/templates/email/html_layout.html:21
 #, python-format
-msgid ""
-"BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">"
-"%(site_name)s</a>"
+msgid "BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a>"
 msgstr ""
-"BookWyrm, hébergé par <a style=\"color: #3273dc;\" href=\"https://%(domain)s"
-"\">%(site_name)s</a>"
 
 #: bookwyrm/templates/email/html_layout.html:23
 msgid "Email preference"
-msgstr "Paramètres d’email"
+msgstr ""
 
 #: bookwyrm/templates/email/invite/html_content.html:6
 #: bookwyrm/templates/email/invite/subject.html:2
 #, python-format
 msgid "You're invited to join %(site_name)s!"
-msgstr "Vous avez reçu une invitation à rejoindre %(site_name)s !"
+msgstr ""
 
 #: bookwyrm/templates/email/invite/html_content.html:9
 msgid "Join Now"
-msgstr "S’enregistrer maintenant"
+msgstr ""
 
 #: bookwyrm/templates/email/invite/html_content.html:15
 #, python-format
-msgid ""
-"Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</"
-"a>."
+msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
 msgstr ""
-"En savoir plus sur <a href=\"https://%(domain)s%(about_path)s\">cette "
-"instance</a>."
 
 #: bookwyrm/templates/email/invite/text_content.html:4
 #, python-format
-msgid ""
-"You're invited to join %(site_name)s! Click the link below to create an "
-"account."
+msgid "You're invited to join %(site_name)s! Click the link below to create an account."
 msgstr ""
-"Vous avez reçu une invitation à rejoindre %(site_name)s ! Cliquez le lien "
-"suivant pour créer un compte."
 
 #: bookwyrm/templates/email/invite/text_content.html:8
 msgid "Learn more about this instance:"
-msgstr "En savoir plus sur cete instance :"
+msgstr ""
 
 #: bookwyrm/templates/email/password_reset/html_content.html:6
 #: bookwyrm/templates/email/password_reset/text_content.html:4
 #, python-format
-msgid ""
-"You requested to reset your %(site_name)s password. Click the link below to "
-"set a new password and log in to your account."
+msgid "You requested to reset your %(site_name)s password. Click the link below to set a new password and log in to your account."
 msgstr ""
-"Une demande de réinitialisation de votre mot de passe sur <i>%(site_name)s</"
-"i> a été initialisée. Cliquez le lien suivant pour définir un nouveau mot de "
-"passe et vous connecter à votre compte."
 
 #: bookwyrm/templates/email/password_reset/html_content.html:9
 #: bookwyrm/templates/password_reset.html:4
@@ -854,157 +806,148 @@ msgstr ""
 #: bookwyrm/templates/password_reset_request.html:4
 #: bookwyrm/templates/password_reset_request.html:10
 msgid "Reset Password"
-msgstr "Changez le mot de passe"
+msgstr ""
 
 #: bookwyrm/templates/email/password_reset/html_content.html:13
 #: bookwyrm/templates/email/password_reset/text_content.html:8
-msgid ""
-"If you didn't request to reset your password, you can ignore this email."
+msgid "If you didn't request to reset your password, you can ignore this email."
 msgstr ""
-"Si vous n’avez pas demandé la réinitialisation de votre mot de passe, vous "
-"pouvez ignorer cet email."
 
 #: bookwyrm/templates/email/password_reset/subject.html:2
 #, python-format
 msgid "Reset your %(site_name)s password"
-msgstr "Réinitialiser votre mot de passe sur %(site_name)s"
+msgstr ""
 
 #: bookwyrm/templates/feed/direct_messages.html:8
 #, python-format
 msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
-msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
+msgstr ""
 
 #: bookwyrm/templates/feed/direct_messages.html:10
 #: bookwyrm/templates/layout.html:92
 msgid "Direct Messages"
-msgstr "Messages directs"
+msgstr ""
 
 #: bookwyrm/templates/feed/direct_messages.html:13
 msgid "All messages"
-msgstr "Tous les messages"
+msgstr ""
 
 #: bookwyrm/templates/feed/direct_messages.html:22
 msgid "You have no messages right now."
-msgstr "Vous n’avez aucun message pour l’instant."
+msgstr ""
 
 #: bookwyrm/templates/feed/feed.html:8
 msgid "Home Timeline"
-msgstr "Mon fil d’actualité"
+msgstr ""
 
 #: bookwyrm/templates/feed/feed.html:10
 msgid "Local Timeline"
-msgstr "Fil d’actualité local"
+msgstr ""
 
 #: bookwyrm/templates/feed/feed.html:12
 msgid "Federated Timeline"
-msgstr "Fil d’actualité des instances fédérées"
+msgstr ""
 
 #: bookwyrm/templates/feed/feed.html:18
 msgid "Home"
-msgstr "Accueil"
+msgstr ""
 
 #: bookwyrm/templates/feed/feed.html:21
 msgid "Local"
-msgstr "Local"
+msgstr ""
 
 #: bookwyrm/templates/feed/feed.html:24
 #: bookwyrm/templates/settings/edit_server.html:40
 msgid "Federated"
-msgstr "Fédéré"
+msgstr ""
 
 #: bookwyrm/templates/feed/feed.html:32
 #, python-format
 msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
 msgstr ""
-"charger le(s) <span data-poll=\"stream/%(tab)s\">0</span> statut(s) non lu(s)"
 
 #: bookwyrm/templates/feed/feed.html:47
-msgid ""
-"There aren't any activities right now! Try following a user to get started"
+msgid "There aren't any activities right now! Try following a user to get started"
 msgstr ""
-"Aucune activité pour l’instant ! Abonnez‑vous à quelqu’un pour commencer"
 
 #: bookwyrm/templates/feed/feed.html:55
 #: bookwyrm/templates/get_started/users.html:6
 msgid "Who to follow"
-msgstr "À qui s’abonner"
+msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:4
 msgid "Updates"
-msgstr "Mises à jour"
+msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:10
 #: bookwyrm/templates/user/shelf/books_header.html:3
 msgid "Your books"
-msgstr "Vos livres"
+msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:12
-msgid ""
-"There are no books here right now! Try searching for a book to get started"
-msgstr "Aucun livre ici pour l’instant ! Cherchez un livre pour commencer"
+msgid "There are no books here right now! Try searching for a book to get started"
+msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:23
 #: bookwyrm/templates/user/shelf/shelf.html:29
 msgid "To Read"
-msgstr "À lire"
+msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:24
 #: bookwyrm/templates/user/shelf/shelf.html:29
 msgid "Currently Reading"
-msgstr "Lectures en cours"
+msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:25
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
 #: bookwyrm/templates/user/shelf/shelf.html:29
 msgid "Read"
-msgstr "Lu"
+msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:87 bookwyrm/templates/goal.html:26
 #: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
 msgid "%(year)s Reading Goal"
-msgstr "Défi lecture pour %(year)s"
+msgstr ""
 
 #: bookwyrm/templates/feed/suggested_users.html:16
 #, python-format
 msgid "%(mutuals)s follower you follow"
 msgid_plural "%(mutuals)s followers you follow"
-msgstr[0] "%(mutuals)s abonné(e) que vous suivez"
-msgstr[1] "%(mutuals)s abonné(e)s que vous suivez"
+msgstr[0] ""
+msgstr[1] ""
 
 #: bookwyrm/templates/feed/suggested_users.html:19
 #, python-format
 msgid "%(shared_books)s book on your shelves"
 msgid_plural "%(shared_books)s books on your shelves"
-msgstr[0] "%(shared_books)s livre sur vos étagères"
-msgstr[1] "%(shared_books)s livres sur vos étagères"
+msgstr[0] ""
+msgstr[1] ""
 
 #: bookwyrm/templates/get_started/book_preview.html:6
 #, python-format
 msgid "Have you read %(book_title)s?"
-msgstr "Avez‑vous lu « <em>%(book_title)s</em> » ?"
+msgstr ""
 
 #: bookwyrm/templates/get_started/books.html:6
 msgid "What are you reading?"
-msgstr "Que lisez‑vous ?"
+msgstr ""
 
 #: bookwyrm/templates/get_started/books.html:9
 #: bookwyrm/templates/lists/list.html:135
 msgid "Search for a book"
-msgstr "Chercher un livre"
+msgstr ""
 
 #: bookwyrm/templates/get_started/books.html:11
 #: bookwyrm/templates/isbn_search_results.html:17
 #, python-format
 msgid "No books found for \"%(query)s\""
-msgstr "Aucun livre trouvé pour « %(query)s »"
+msgstr ""
 
 #: bookwyrm/templates/get_started/books.html:11
 #, python-format
 msgid "You can add books when you start using %(site_name)s."
 msgstr ""
-"Vous pourrez ajouter des livres lorsque vous commencerez à utiliser "
-"%(site_name)s."
 
 #: bookwyrm/templates/get_started/books.html:16
 #: bookwyrm/templates/get_started/books.html:17
@@ -1015,292 +958,280 @@ msgstr ""
 #: bookwyrm/templates/search/layout.html:4
 #: bookwyrm/templates/search/layout.html:9
 msgid "Search"
-msgstr "Chercher"
+msgstr ""
 
 #: bookwyrm/templates/get_started/books.html:27
 msgid "Suggested Books"
-msgstr "Suggérer des livres"
+msgstr ""
 
 #: bookwyrm/templates/get_started/books.html:46
 #, python-format
 msgid "Popular on %(site_name)s"
-msgstr "Populaire sur %(site_name)s"
+msgstr ""
 
 #: bookwyrm/templates/get_started/books.html:58
 #: bookwyrm/templates/lists/list.html:152
 msgid "No books found"
-msgstr "Aucun livre trouvé"
+msgstr ""
 
 #: bookwyrm/templates/get_started/books.html:63
 #: bookwyrm/templates/get_started/profile.html:54
 msgid "Save &amp; continue"
-msgstr "Enregistrer &amp; continuer"
+msgstr ""
 
 #: bookwyrm/templates/get_started/layout.html:14
 #, python-format
 msgid "Welcome to %(site_name)s!"
-msgstr "Bienvenue sur %(site_name)s !"
+msgstr ""
 
 #: bookwyrm/templates/get_started/layout.html:16
 msgid "These are some first steps to get you started."
-msgstr "Voici quelques étapes pour commencer votre profil."
+msgstr ""
 
 #: bookwyrm/templates/get_started/layout.html:30
 #: bookwyrm/templates/get_started/profile.html:6
 msgid "Create your profile"
-msgstr "Créez votre profil"
+msgstr ""
 
 #: bookwyrm/templates/get_started/layout.html:34
 msgid "Add books"
-msgstr "Ajoutez des livres"
+msgstr ""
 
 #: bookwyrm/templates/get_started/layout.html:38
 msgid "Find friends"
-msgstr "Établissez des contacts"
+msgstr ""
 
 #: bookwyrm/templates/get_started/layout.html:44
 msgid "Skip this step"
-msgstr "Passer cette étape"
+msgstr ""
 
 #: bookwyrm/templates/get_started/layout.html:48
 msgid "Finish"
-msgstr "Terminer"
+msgstr ""
 
 #: bookwyrm/templates/get_started/profile.html:15
 #: bookwyrm/templates/preferences/edit_user.html:24
 msgid "Display name:"
-msgstr "Nom affiché :"
+msgstr ""
 
 #: bookwyrm/templates/get_started/profile.html:22
 #: bookwyrm/templates/preferences/edit_user.html:31
 msgid "Summary:"
-msgstr "Résumé :"
+msgstr ""
 
 #: bookwyrm/templates/get_started/profile.html:23
 msgid "A little bit about you"
-msgstr "Parlez‑nous de vous"
+msgstr ""
 
 #: bookwyrm/templates/get_started/profile.html:32
 #: bookwyrm/templates/preferences/edit_user.html:17
 msgid "Avatar:"
-msgstr "Avatar :"
+msgstr ""
 
 #: bookwyrm/templates/get_started/profile.html:42
 #: bookwyrm/templates/preferences/edit_user.html:52
 msgid "Manually approve followers:"
-msgstr "Autoriser les abonnements manuellement :"
+msgstr ""
 
 #: bookwyrm/templates/get_started/profile.html:48
 #: bookwyrm/templates/preferences/edit_user.html:58
 msgid "Show this account in suggested users:"
-msgstr "Afficher ce compte dans ceux suggérés :"
+msgstr ""
 
 #: bookwyrm/templates/get_started/profile.html:52
-msgid ""
-"Your account will show up in the directory, and may be recommended to other "
-"BookWyrm users."
+msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users."
 msgstr ""
-"Votre compte sera listé dans le répertoire et pourra être recommandé à "
-"d’autres utilisateurs ou utilisatrices de BookWyrm."
 
 #: bookwyrm/templates/get_started/users.html:11
 msgid "Search for a user"
-msgstr "Chercher un compte"
+msgstr ""
 
 #: bookwyrm/templates/get_started/users.html:13
 #, python-format
 msgid "No users found for \"%(query)s\""
-msgstr "Aucun compte trouvé pour « %(query)s »"
+msgstr ""
 
 #: bookwyrm/templates/goal.html:7
 #, python-format
 msgid "%(year)s Reading Progress"
-msgstr "Progression de lecture pour %(year)s"
+msgstr ""
 
 #: bookwyrm/templates/goal.html:11
 msgid "Edit Goal"
-msgstr "Modifier le défi"
+msgstr ""
 
 #: bookwyrm/templates/goal.html:30
 #: bookwyrm/templates/snippets/goal_card.html:13
 #, python-format
-msgid ""
-"Set a goal for how many books you'll finish reading in %(year)s, and track "
-"your progress throughout the year."
+msgid "Set a goal for how many books you'll finish reading in %(year)s, and track your progress throughout the year."
 msgstr ""
-"Définissez un nombre de livre à lire comme objectif pour %(year)s, et "
-"suivezvotre progression au fil de l’année."
 
 #: bookwyrm/templates/goal.html:39
 #, python-format
 msgid "%(name)s hasn't set a reading goal for %(year)s."
-msgstr "%(name)s n’a aucun défi lecture pour %(year)s."
+msgstr ""
 
 #: bookwyrm/templates/goal.html:51
 #, python-format
 msgid "Your %(year)s Books"
-msgstr "Vos livres en %(year)s"
+msgstr ""
 
 #: bookwyrm/templates/goal.html:53
 #, python-format
 msgid "%(username)s's %(year)s Books"
-msgstr "Livres de %(username)s en %(year)s"
+msgstr ""
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
 #: bookwyrm/templates/user/shelf/shelf.html:40
 msgid "Import Books"
-msgstr "Importer des livres"
+msgstr ""
 
 #: bookwyrm/templates/import.html:16
 msgid "Data source:"
-msgstr "Source de données :"
+msgstr ""
 
 #: bookwyrm/templates/import.html:32
 msgid "Data file:"
-msgstr "Fichier de données :"
+msgstr ""
 
 #: bookwyrm/templates/import.html:40
 msgid "Include reviews"
-msgstr "Importer les critiques"
+msgstr ""
 
 #: bookwyrm/templates/import.html:45
 msgid "Privacy setting for imported reviews:"
-msgstr "Confidentialité des critiques importées :"
+msgstr ""
 
 #: bookwyrm/templates/import.html:51
 #: bookwyrm/templates/settings/server_blocklist.html:64
 msgid "Import"
-msgstr "Importer"
+msgstr ""
 
 #: bookwyrm/templates/import.html:56
 msgid "Recent Imports"
-msgstr "Importations récentes"
+msgstr ""
 
 #: bookwyrm/templates/import.html:58
 msgid "No recent imports"
-msgstr "Aucune importation récente"
+msgstr ""
 
 #: bookwyrm/templates/import_status.html:5
 #: bookwyrm/templates/import_status.html:9
 msgid "Import Status"
-msgstr "Statut de l’importation"
+msgstr ""
 
 #: bookwyrm/templates/import_status.html:13
 msgid "Import started:"
-msgstr "Début de l’importation :"
+msgstr ""
 
 #: bookwyrm/templates/import_status.html:18
 msgid "Import completed:"
-msgstr "Fin de l’importation :"
+msgstr ""
 
 #: bookwyrm/templates/import_status.html:23
 msgid "TASK FAILED"
-msgstr "la tâche a échoué"
+msgstr ""
 
 #: bookwyrm/templates/import_status.html:30
 msgid "Import still in progress."
-msgstr "L’importation est toujours en cours"
+msgstr ""
 
 #: bookwyrm/templates/import_status.html:32
 msgid "(Hit reload to update!)"
-msgstr "(Rechargez la page pour la mettre à jour !)"
+msgstr ""
 
 #: bookwyrm/templates/import_status.html:39
 msgid "Failed to load"
-msgstr "Éléments non importés"
+msgstr ""
 
 #: bookwyrm/templates/import_status.html:48
 #, python-format
-msgid ""
-"Jump to the bottom of the list to select the %(failed_count)s items which "
-"failed to import."
+msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
 msgstr ""
-"Sauter en bas de liste pour sélectionner les %(failed_count)s items n’ayant "
-"pu être importés."
 
 #: bookwyrm/templates/import_status.html:60
 #, python-format
 msgid "Line %(index)s: <strong>%(title)s</strong> by %(author)s"
-msgstr "Ligne %(index)s : <strong>%(title)s</strong> par %(author)s"
+msgstr ""
 
 #: bookwyrm/templates/import_status.html:80
 msgid "Select all"
-msgstr "Tout sélectionner"
+msgstr ""
 
 #: bookwyrm/templates/import_status.html:83
 msgid "Retry items"
-msgstr "Réessayer l’importation de ces éléments"
+msgstr ""
 
 #: bookwyrm/templates/import_status.html:109
 msgid "Successfully imported"
-msgstr "Importation réussie"
+msgstr ""
 
 #: bookwyrm/templates/import_status.html:113
 msgid "Book"
-msgstr "Livre"
+msgstr ""
 
 #: bookwyrm/templates/import_status.html:116
 #: bookwyrm/templates/snippets/create_status_form.html:13
 #: bookwyrm/templates/user/shelf/shelf.html:79
 #: bookwyrm/templates/user/shelf/shelf.html:99
 msgid "Title"
-msgstr "Titre"
+msgstr ""
 
 #: bookwyrm/templates/import_status.html:119
 #: bookwyrm/templates/user/shelf/shelf.html:80
 #: bookwyrm/templates/user/shelf/shelf.html:102
 msgid "Author"
-msgstr "Auteur/autrice"
+msgstr ""
 
 #: bookwyrm/templates/import_status.html:142
 msgid "Imported"
-msgstr "Importé"
+msgstr ""
 
 #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12
 #: bookwyrm/templates/login.html:46
 msgid "Create an Account"
-msgstr "Créer un compte"
+msgstr ""
 
 #: bookwyrm/templates/invite.html:21
 msgid "Permission Denied"
-msgstr "Autorisation refusée"
+msgstr ""
 
 #: bookwyrm/templates/invite.html:22
 msgid "Sorry! This invite code is no longer valid."
-msgstr "Cette invitation n’est plus valide ; désolé !"
+msgstr ""
 
 #: bookwyrm/templates/isbn_search_results.html:4
 msgid "Search Results"
-msgstr "Résultats de recherche"
+msgstr ""
 
 #: bookwyrm/templates/isbn_search_results.html:9
 #, python-format
 msgid "Search Results for \"%(query)s\""
-msgstr "Résultats de recherche pour « %(query)s »"
+msgstr ""
 
 #: bookwyrm/templates/isbn_search_results.html:14
 msgid "Matching Books"
-msgstr "Livres correspondants"
+msgstr ""
 
 #: bookwyrm/templates/layout.html:33
 msgid "Search for a book or user"
-msgstr "Chercher un livre ou un compte"
+msgstr ""
 
 #: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48
 msgid "Main navigation menu"
-msgstr "Menu de navigation principal "
+msgstr ""
 
 #: bookwyrm/templates/layout.html:58
 msgid "Feed"
-msgstr "Fil d’actualité"
+msgstr ""
 
 #: bookwyrm/templates/layout.html:87
 msgid "Your Books"
-msgstr "Vos Livres"
+msgstr ""
 
 #: bookwyrm/templates/layout.html:97
 msgid "Settings"
-msgstr "Paramètres"
+msgstr ""
 
 #: bookwyrm/templates/layout.html:106
 #: bookwyrm/templates/settings/admin_layout.html:31
@@ -1308,624 +1239,547 @@ msgstr "Paramètres"
 #: bookwyrm/templates/settings/manage_invites.html:3
 #: bookwyrm/templates/settings/manage_invites.html:15
 msgid "Invites"
-msgstr "Invitations"
+msgstr ""
 
 #: bookwyrm/templates/layout.html:113
 msgid "Admin"
-msgstr "Admin"
+msgstr ""
 
 #: bookwyrm/templates/layout.html:120
 msgid "Log out"
-msgstr "Se déconnecter"
+msgstr ""
 
 #: bookwyrm/templates/layout.html:128 bookwyrm/templates/layout.html:129
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
-msgstr "Notifications"
+msgstr ""
 
 #: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
-msgstr "Nom du compte :"
+msgstr ""
 
 #: bookwyrm/templates/layout.html:156
 msgid "password"
-msgstr "Mot de passe"
+msgstr ""
 
 #: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
-msgstr "Mot de passe oublié ?"
+msgstr ""
 
 #: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
-msgstr "Se connecter"
+msgstr ""
 
 #: bookwyrm/templates/layout.html:168
 msgid "Join"
-msgstr "Rejoindre"
+msgstr ""
 
 #: bookwyrm/templates/layout.html:206
 msgid "About this server"
-msgstr "À propos de ce serveur"
+msgstr ""
 
 #: bookwyrm/templates/layout.html:210
 msgid "Contact site admin"
-msgstr "Contacter l’administrateur du site"
+msgstr ""
 
 #: bookwyrm/templates/layout.html:214
 msgid "Documentation"
-msgstr "Documentation"
+msgstr ""
 
 #: bookwyrm/templates/layout.html:221
 #, python-format
-msgid ""
-"Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">"
-"%(support_title)s</a>"
+msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 msgstr ""
-"Soutenez %(site_name)s avec <a href=\"%(support_link)s\" target=\"_blank\">"
-"%(support_title)s</a>"
 
 #: bookwyrm/templates/layout.html:225
-msgid ""
-"BookWyrm's source code is freely available. You can contribute or report "
-"issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
+msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 msgstr ""
-"BookWyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports "
-"de bogues via <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
 #: bookwyrm/templates/lists/create_form.html:5
 #: bookwyrm/templates/lists/lists.html:20
 msgid "Create List"
-msgstr "Créer une liste"
+msgstr ""
 
 #: bookwyrm/templates/lists/created_text.html:5
 #, python-format
 msgid "Created and curated by <a href=\"%(path)s\">%(username)s</a>"
-msgstr "Créée et modérée par <a href=\"%(path)s\">%(username)s</a>"
+msgstr ""
 
 #: bookwyrm/templates/lists/created_text.html:7
 #, python-format
 msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
-msgstr "Créée par <a href=\"%(path)s\">%(username)s</a>"
+msgstr ""
 
 #: bookwyrm/templates/lists/curate.html:8
 msgid "Pending Books"
-msgstr "Livres en attente de modération"
+msgstr ""
 
 #: bookwyrm/templates/lists/curate.html:11
 msgid "Go to list"
-msgstr "Aller à la liste"
+msgstr ""
 
 #: bookwyrm/templates/lists/curate.html:15
 msgid "You're all set!"
-msgstr "Aucun livre en attente de validation !"
+msgstr ""
 
 #: bookwyrm/templates/lists/curate.html:45
 msgid "Suggested by"
-msgstr "Suggéré par"
+msgstr ""
 
 #: bookwyrm/templates/lists/curate.html:57
 msgid "Approve"
-msgstr "Approuver"
+msgstr ""
 
 #: bookwyrm/templates/lists/curate.html:63
 msgid "Discard"
-msgstr "Rejeter"
+msgstr ""
 
 #: bookwyrm/templates/lists/edit_form.html:5
 #: bookwyrm/templates/lists/list_layout.html:16
 msgid "Edit List"
-msgstr "Modifier la liste"
+msgstr ""
 
 #: bookwyrm/templates/lists/form.html:18
 msgid "List curation:"
-msgstr "Modération de la liste :"
+msgstr ""
 
 #: bookwyrm/templates/lists/form.html:21
 msgid "Closed"
-msgstr "Fermée"
+msgstr ""
 
 #: bookwyrm/templates/lists/form.html:22
 msgid "Only you can add and remove books to this list"
-msgstr "Vous seulement pouvez ajouter ou retirer des livres dans cette liste"
+msgstr ""
 
 #: bookwyrm/templates/lists/form.html:26
 msgid "Curated"
-msgstr "Modérée"
+msgstr ""
 
 #: bookwyrm/templates/lists/form.html:27
 msgid "Anyone can suggest books, subject to your approval"
-msgstr "N’importe qui peut suggérer des livres, soumis à votre approbation"
+msgstr ""
 
 #: bookwyrm/templates/lists/form.html:31
 #: bookwyrm/templates/moderation/reports.html:25
 #: bookwyrm/templates/search/book.html:30
 #: bookwyrm/templates/snippets/announcement.html:16
 msgid "Open"
-msgstr "Ouverte"
+msgstr ""
 
 #: bookwyrm/templates/lists/form.html:32
 msgid "Anyone can add books to this list"
-msgstr "N’importe qui peut suggérer des livres"
+msgstr ""
 
 #: bookwyrm/templates/lists/list.html:20
 msgid "You successfully suggested a book for this list!"
-msgstr "Vous avez suggéré un livre à cette liste !"
+msgstr ""
 
 #: bookwyrm/templates/lists/list.html:22
 msgid "You successfully added a book to this list!"
-msgstr "Vous avez ajouté un livre à cette liste !"
+msgstr ""
 
 #: bookwyrm/templates/lists/list.html:28
 msgid "This list is currently empty"
-msgstr "Cette liste est actuellement vide"
+msgstr ""
 
 #: bookwyrm/templates/lists/list.html:66
 #, python-format
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
-msgstr "Ajouté par <a href=\"%(user_path)s\">%(username)s</a>"
+msgstr ""
 
 #: bookwyrm/templates/lists/list.html:74
 msgid "List position"
-msgstr "Position"
+msgstr ""
 
 #: bookwyrm/templates/lists/list.html:81
 msgid "Set"
-msgstr "Appliquer"
+msgstr ""
 
 #: bookwyrm/templates/lists/list.html:89
 #: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
-msgstr "Retirer"
+msgstr ""
 
 #: bookwyrm/templates/lists/list.html:103
 #: bookwyrm/templates/lists/list.html:120
 msgid "Sort List"
-msgstr "Trier la liste"
+msgstr ""
 
 #: bookwyrm/templates/lists/list.html:113
 msgid "Direction"
-msgstr "Direction"
+msgstr ""
 
 #: bookwyrm/templates/lists/list.html:127
 msgid "Add Books"
-msgstr "Ajouter des livres"
+msgstr ""
 
 #: bookwyrm/templates/lists/list.html:129
 msgid "Suggest Books"
-msgstr "Suggérer des livres"
+msgstr ""
 
 #: bookwyrm/templates/lists/list.html:140
 msgid "search"
-msgstr "chercher"
+msgstr ""
 
 #: bookwyrm/templates/lists/list.html:146
 msgid "Clear search"
-msgstr "Vider la requête"
+msgstr ""
 
 #: bookwyrm/templates/lists/list.html:151
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
-msgstr "Aucun livre trouvé pour la requête « %(query)s »"
+msgstr ""
 
 #: bookwyrm/templates/lists/list.html:179
 msgid "Suggest"
-msgstr "Suggérer"
+msgstr ""
 
 #: bookwyrm/templates/lists/lists.html:14 bookwyrm/templates/user/lists.html:9
 msgid "Your Lists"
-msgstr "Vos listes"
+msgstr ""
 
 #: bookwyrm/templates/login.html:4
 msgid "Login"
-msgstr "Connexion"
+msgstr ""
 
 #: bookwyrm/templates/login.html:23 bookwyrm/templates/password_reset.html:17
 #: bookwyrm/templates/snippets/register_form.html:22
 msgid "Password:"
-msgstr "Mot de passe :"
+msgstr ""
 
 #: bookwyrm/templates/login.html:52
 msgid "Contact an administrator to get an invite"
-msgstr "Contacter un administrateur pour obtenir une invitation"
+msgstr ""
 
 #: bookwyrm/templates/login.html:63
 msgid "More about this site"
-msgstr "En savoir plus sur ce site"
+msgstr ""
 
 #: bookwyrm/templates/moderation/report.html:5
 #: bookwyrm/templates/moderation/report.html:6
 #: bookwyrm/templates/moderation/report_preview.html:6
 #, python-format
 msgid "Report #%(report_id)s: %(username)s"
-msgstr "Signalement #%(report_id)s : %(username)s"
+msgstr ""
 
 #: bookwyrm/templates/moderation/report.html:10
 msgid "Back to reports"
-msgstr "Retour aux signalements"
+msgstr ""
 
 #: bookwyrm/templates/moderation/report.html:22
 msgid "Moderator Comments"
-msgstr "Commentaires de l’équipe de modération"
+msgstr ""
 
 #: bookwyrm/templates/moderation/report.html:40
 #: bookwyrm/templates/snippets/create_status.html:28
 #: bookwyrm/templates/snippets/create_status_form.html:66
 msgid "Comment"
-msgstr "Commentaire"
+msgstr ""
 
 #: bookwyrm/templates/moderation/report.html:45
 msgid "Reported statuses"
-msgstr "Statuts signalés"
+msgstr ""
 
 #: bookwyrm/templates/moderation/report.html:47
 msgid "No statuses reported"
-msgstr "Aucun statut signalé"
+msgstr ""
 
 #: bookwyrm/templates/moderation/report.html:53
 msgid "Status has been deleted"
-msgstr "Le statut a été supprimé"
+msgstr ""
 
 #: bookwyrm/templates/moderation/report_modal.html:6
 #, python-format
 msgid "Report @%(username)s"
-msgstr "Signaler @%(username)s"
+msgstr ""
 
 #: bookwyrm/templates/moderation/report_modal.html:23
 #, python-format
 msgid "This report will be sent to %(site_name)s's moderators for review."
 msgstr ""
-"Ce signalement sera envoyé à l’équipe de modération de %(site_name)s pour "
-"traitement."
 
 #: bookwyrm/templates/moderation/report_modal.html:24
 msgid "More info about this report:"
-msgstr "En savoir plus sur ce signalement :"
+msgstr ""
 
 #: bookwyrm/templates/moderation/report_preview.html:13
 msgid "No notes provided"
-msgstr "Aucune note fournie"
+msgstr ""
 
 #: bookwyrm/templates/moderation/report_preview.html:20
 #, python-format
 msgid "Reported by <a href=\"%(path)s\">%(username)s</a>"
-msgstr "Signalé par <a href=\"%(path)s\">%(username)s</a>"
+msgstr ""
 
 #: bookwyrm/templates/moderation/report_preview.html:30
 msgid "Re-open"
-msgstr "Réouvrir"
+msgstr ""
 
 #: bookwyrm/templates/moderation/report_preview.html:32
 msgid "Resolve"
-msgstr "Résoudre"
+msgstr ""
 
 #: bookwyrm/templates/moderation/reports.html:6
 #, python-format
 msgid "Reports: %(server_name)s"
-msgstr "Signalements : %(server_name)s"
+msgstr ""
 
 #: bookwyrm/templates/moderation/reports.html:8
 #: bookwyrm/templates/moderation/reports.html:17
 #: bookwyrm/templates/settings/admin_layout.html:35
 msgid "Reports"
-msgstr "Signalements"
+msgstr ""
 
 #: bookwyrm/templates/moderation/reports.html:14
 #, python-format
 msgid "Reports: <small>%(server_name)s</small>"
-msgstr "Signalements: <small>%(server_name)s</small>"
+msgstr ""
 
 #: bookwyrm/templates/moderation/reports.html:28
 msgid "Resolved"
-msgstr "Résolus"
+msgstr ""
 
 #: bookwyrm/templates/moderation/reports.html:37
 msgid "No reports found."
-msgstr "Aucun signalement trouvé."
+msgstr ""
 
 #: bookwyrm/templates/notifications.html:16
 msgid "Delete notifications"
-msgstr "Supprimer les notifications"
+msgstr ""
 
 #: bookwyrm/templates/notifications.html:25
 msgid "All"
-msgstr "Toutes"
+msgstr ""
 
 #: bookwyrm/templates/notifications.html:29
 msgid "Mentions"
-msgstr "Mentions"
+msgstr ""
 
 #: bookwyrm/templates/notifications.html:70
 #, python-format
-msgid ""
-"favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</"
-"em></a>"
+msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr ""
-"a ajouté votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</"
-"em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:72
 #, python-format
-msgid ""
-"favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</"
-"em></a>"
+msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr ""
-"a ajouté votre <a href=\"%(related_path)s\">commentaire sur <em>"
-"%(book_title)s</em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:74
 #, python-format
-msgid ""
-"favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
-"em></a>"
+msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr ""
-"a ajouté votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</"
-"em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:76
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">status</a>"
-msgstr "a ajouté votre <a href=\"%(related_path)s\">statut</a> à ses favoris"
+msgstr ""
 
 #: bookwyrm/templates/notifications.html:81
 #, python-format
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">review of <em>"
-"%(book_title)s</em></a>"
+msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr ""
-"vous a mentionné dans sa <a href=\"%(related_path)s\">critique de <em>"
-"%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:83
 #, python-format
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">comment on <em>"
-"%(book_title)s</em></a>"
+msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr ""
-"vous a mentionné dans son <a href=\"%(related_path)s\">commentaire sur <em>"
-"%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:85
 #, python-format
-msgid ""
-"mentioned you in a <a href=\"%(related_path)s\">quote from <em>"
-"%(book_title)s</em></a>"
+msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr ""
-"vous a mentionné dans sa <a href=\"%(related_path)s\">citation de <em>"
-"%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:87
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">status</a>"
-msgstr "vous a mentionné dans son <a href=\"%(related_path)s\">statut</a>"
+msgstr ""
 
 #: bookwyrm/templates/notifications.html:92
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">review of <em>%(book_title)s</em></a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr ""
-"<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s"
-"\">critique de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:94
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">comment on <em>%(book_title)s</em></a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
 msgstr ""
-"<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s"
-"\">commentaire sur <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:96
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">quote from <em>%(book_title)s</em></a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr ""
-"<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s"
-"\">citation de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:98
 #, python-format
-msgid ""
-"<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
-"\">status</a>"
+msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 msgstr ""
-"<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s"
-"\">statut</a>"
 
 #: bookwyrm/templates/notifications.html:102
 msgid "followed you"
-msgstr "vous suit"
+msgstr ""
 
 #: bookwyrm/templates/notifications.html:105
 msgid "sent you a follow request"
-msgstr "vous a envoyé une demande d’abonnement"
+msgstr ""
 
 #: bookwyrm/templates/notifications.html:111
 #, python-format
-msgid ""
-"boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></"
-"a>"
+msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
 msgstr ""
-"a partagé votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</"
-"em></a>"
 
 #: bookwyrm/templates/notifications.html:113
 #, python-format
-msgid ""
-"boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></"
-"a>"
+msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
 msgstr ""
-"a partagé votre <a href=\"%(related_path)s\">commentaire sur <em>"
-"%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:115
 #, python-format
-msgid ""
-"boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</"
-"em></a>"
+msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
 msgstr ""
-"a partagé votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</"
-"em></a>"
 
 #: bookwyrm/templates/notifications.html:117
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">status</a>"
-msgstr "a partagé votre <a href=\"%(related_path)s\">statut</a>"
+msgstr ""
 
 #: bookwyrm/templates/notifications.html:121
 #, python-format
-msgid ""
-" added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
-"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 msgstr ""
-" a ajouté <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre "
-"liste « <a href=\"%(list_path)s\">%(list_name)s</a> »"
 
 #: bookwyrm/templates/notifications.html:123
 #, python-format
-msgid ""
-" suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to "
-"your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
+msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
 msgstr ""
-" a suggégré l’ajout de <em><a href=\"%(book_path)s\">%(book_title)s</a></em> "
-"à votre liste « <a href=\"%(list_path)s/curate\">%(list_name)s</a> »"
 
 #: bookwyrm/templates/notifications.html:128
 #, python-format
 msgid "Your <a href=\"%(url)s\">import</a> completed."
-msgstr "Votre <a href=\"%(url)s\">importation</a> est terminée."
+msgstr ""
 
 #: bookwyrm/templates/notifications.html:131
 #, python-format
 msgid "A new <a href=\"%(path)s\">report</a> needs moderation."
 msgstr ""
-"Un nouveau <a href=\"%(path)s\">signalement</a> a besoin d’être traité."
 
 #: bookwyrm/templates/notifications.html:157
 msgid "You're all caught up!"
-msgstr "Aucune nouvelle notification !"
+msgstr ""
 
 #: bookwyrm/templates/password_reset.html:23
 #: bookwyrm/templates/preferences/change_password.html:18
 msgid "Confirm password:"
-msgstr "Confirmez le mot de passe :"
+msgstr ""
 
 #: bookwyrm/templates/password_reset_request.html:14
 msgid "A link to reset your password will be sent to your email address"
 msgstr ""
-"Un lien pour changer votre mot de passe sera envoyé à votre addresse email"
 
 #: bookwyrm/templates/password_reset_request.html:28
 msgid "Reset password"
-msgstr "Changer de mot de passe"
+msgstr ""
 
 #: bookwyrm/templates/preferences/blocks.html:4
 #: bookwyrm/templates/preferences/blocks.html:7
 #: bookwyrm/templates/preferences/preferences_layout.html:26
 msgid "Blocked Users"
-msgstr "Comptes bloqués"
+msgstr ""
 
 #: bookwyrm/templates/preferences/blocks.html:12
 msgid "No users currently blocked."
-msgstr "Aucun compte bloqué actuellement"
+msgstr ""
 
 #: bookwyrm/templates/preferences/change_password.html:4
 #: bookwyrm/templates/preferences/change_password.html:7
 #: bookwyrm/templates/preferences/change_password.html:21
 #: bookwyrm/templates/preferences/preferences_layout.html:19
 msgid "Change Password"
-msgstr "Changer le mot de passe"
+msgstr ""
 
 #: bookwyrm/templates/preferences/change_password.html:14
 msgid "New password:"
-msgstr "Nouveau mot de passe :"
+msgstr ""
 
 #: bookwyrm/templates/preferences/edit_user.html:4
 #: bookwyrm/templates/preferences/edit_user.html:7
 msgid "Edit Profile"
-msgstr "Modifier le profil"
+msgstr ""
 
 #: bookwyrm/templates/preferences/edit_user.html:46
 msgid "Show set reading goal prompt in feed:"
 msgstr ""
-"Afficher le message pour définir un défi lecture dans le fil d’actualité :"
 
 #: bookwyrm/templates/preferences/edit_user.html:62
 #, python-format
-msgid ""
-"Your account will show up in the <a href=\"%(path)s\">directory</a>, and may "
-"be recommended to other BookWyrm users."
+msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
 msgstr ""
-"Votre compte sera listé dans le <a href=\"%(path)s\">répertoire</a> et "
-"pourra être recommandé à d’autres utilisateurs ou utilisatrices de BookWyrm."
 
 #: bookwyrm/templates/preferences/edit_user.html:65
 msgid "Preferred Timezone: "
-msgstr "Fuseau horaire préféré"
+msgstr ""
 
 #: bookwyrm/templates/preferences/preferences_layout.html:11
 msgid "Account"
-msgstr "Compte"
+msgstr ""
 
 #: bookwyrm/templates/preferences/preferences_layout.html:15
 msgid "Profile"
-msgstr "Profil"
+msgstr ""
 
 #: bookwyrm/templates/preferences/preferences_layout.html:22
 msgid "Relationships"
-msgstr "Relations"
+msgstr ""
 
 #: bookwyrm/templates/rss/title.html:5
 #: bookwyrm/templates/snippets/status/status_header.html:35
 msgid "rated"
-msgstr "a noté"
+msgstr ""
 
 #: bookwyrm/templates/rss/title.html:7
 #: bookwyrm/templates/snippets/status/status_header.html:37
 msgid "reviewed"
-msgstr "a écrit une critique de"
+msgstr ""
 
 #: bookwyrm/templates/rss/title.html:9
 #: bookwyrm/templates/snippets/status/status_header.html:39
 msgid "commented on"
-msgstr "a commenté"
+msgstr ""
 
 #: bookwyrm/templates/rss/title.html:11
 #: bookwyrm/templates/snippets/status/status_header.html:41
 msgid "quoted"
-msgstr "a cité"
+msgstr ""
 
 #: bookwyrm/templates/search/book.html:64
 msgid "Load results from other catalogues"
-msgstr "Charger les résultats d’autres catalogues"
+msgstr ""
 
 #: bookwyrm/templates/search/book.html:68
 msgid "Manually add book"
-msgstr "Ajouter un livre manuellement"
+msgstr ""
 
 #: bookwyrm/templates/search/book.html:73
 msgid "Log in to import or add books."
-msgstr "Authentifiez-vous pour importer ou ajouter des livres."
+msgstr ""
 
 #: bookwyrm/templates/search/layout.html:16
 msgid "Search query"
-msgstr "Requête"
+msgstr ""
 
 #: bookwyrm/templates/search/layout.html:19
 msgid "Search type"
-msgstr "Type de recherche"
+msgstr ""
 
 #: bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
 #: bookwyrm/templates/user/layout.html:74
 msgid "Books"
-msgstr "Livres"
+msgstr ""
 
 #: bookwyrm/templates/search/layout.html:23
 #: bookwyrm/templates/search/layout.html:46
@@ -1933,128 +1787,128 @@ msgstr "Livres"
 #: bookwyrm/templates/user_admin/user_admin.html:3
 #: bookwyrm/templates/user_admin/user_admin.html:10
 msgid "Users"
-msgstr "Comptes"
+msgstr ""
 
 #: bookwyrm/templates/search/layout.html:58
 #, python-format
 msgid "No results found for \"%(query)s\""
-msgstr "Aucun résultat pour « %(query)s »"
+msgstr ""
 
 #: bookwyrm/templates/settings/admin_layout.html:4
 msgid "Administration"
-msgstr "Administration"
+msgstr ""
 
 #: bookwyrm/templates/settings/admin_layout.html:22
 msgid "Manage Users"
-msgstr "Gérer les comptes"
+msgstr ""
 
 #: bookwyrm/templates/settings/admin_layout.html:39
 #: bookwyrm/templates/settings/federation.html:3
 #: bookwyrm/templates/settings/federation.html:5
 msgid "Federated Servers"
-msgstr "Serveurs fédérés"
+msgstr ""
 
 #: bookwyrm/templates/settings/admin_layout.html:44
 msgid "Instance Settings"
-msgstr "Paramètres de l’instance"
+msgstr ""
 
 #: bookwyrm/templates/settings/admin_layout.html:48
 #: bookwyrm/templates/settings/announcements.html:3
 #: bookwyrm/templates/settings/announcements.html:5
 msgid "Announcements"
-msgstr "Annonces"
+msgstr ""
 
 #: bookwyrm/templates/settings/admin_layout.html:52
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
-msgstr "Paramètres du site"
+msgstr ""
 
 #: bookwyrm/templates/settings/admin_layout.html:55
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
-msgstr "Information sur l’instance"
+msgstr ""
 
 #: bookwyrm/templates/settings/admin_layout.html:56
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
-msgstr "Images"
+msgstr ""
 
 #: bookwyrm/templates/settings/admin_layout.html:57
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
-msgstr "Contenu du pied de page"
+msgstr ""
 
 #: bookwyrm/templates/settings/admin_layout.html:58
 #: bookwyrm/templates/settings/site.html:81
 msgid "Registration"
-msgstr "Enregistrement"
+msgstr ""
 
 #: bookwyrm/templates/settings/announcement.html:3
 #: bookwyrm/templates/settings/announcement.html:6
 msgid "Announcement"
-msgstr "Annonce"
+msgstr ""
 
 #: bookwyrm/templates/settings/announcement.html:7
 #: bookwyrm/templates/settings/federated_server.html:13
 msgid "Back to list"
-msgstr "Retour à la liste"
+msgstr ""
 
 #: bookwyrm/templates/settings/announcement.html:11
 #: bookwyrm/templates/settings/announcement_form.html:6
 msgid "Edit Announcement"
-msgstr "Modifier l’annonce"
+msgstr ""
 
 #: bookwyrm/templates/settings/announcement.html:20
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
 #: bookwyrm/templates/snippets/follow_request_buttons.html:12
 msgid "Delete"
-msgstr "Supprimer"
+msgstr ""
 
 #: bookwyrm/templates/settings/announcement.html:35
 msgid "Visible:"
-msgstr "Visible :"
+msgstr ""
 
 #: bookwyrm/templates/settings/announcement.html:38
 msgid "True"
-msgstr "Vrai"
+msgstr ""
 
 #: bookwyrm/templates/settings/announcement.html:40
 msgid "False"
-msgstr "Faux"
+msgstr ""
 
 #: bookwyrm/templates/settings/announcement.html:47
 msgid "Start date:"
-msgstr "Date de début :"
+msgstr ""
 
 #: bookwyrm/templates/settings/announcement.html:54
 msgid "End date:"
-msgstr "Date de fin :"
+msgstr ""
 
 #: bookwyrm/templates/settings/announcement.html:60
 msgid "Active:"
-msgstr "Active :"
+msgstr ""
 
 #: bookwyrm/templates/settings/announcement_form.html:8
 #: bookwyrm/templates/settings/announcements.html:8
 msgid "Create Announcement"
-msgstr "Ajouter une annonce"
+msgstr ""
 
 #: bookwyrm/templates/settings/announcements.html:22
 msgid "Date added"
-msgstr "Date d’ajout"
+msgstr ""
 
 #: bookwyrm/templates/settings/announcements.html:26
 msgid "Preview"
-msgstr "Aperçu"
+msgstr ""
 
 #: bookwyrm/templates/settings/announcements.html:30
 msgid "Start date"
-msgstr "Date de début"
+msgstr ""
 
 #: bookwyrm/templates/settings/announcements.html:34
 msgid "End date"
-msgstr "Date de fin"
+msgstr ""
 
 #: bookwyrm/templates/settings/announcements.html:38
 #: bookwyrm/templates/settings/federation.html:30
@@ -2062,15 +1916,15 @@ msgstr "Date de fin"
 #: bookwyrm/templates/settings/status_filter.html:5
 #: bookwyrm/templates/user_admin/user_admin.html:34
 msgid "Status"
-msgstr "Statut"
+msgstr ""
 
 #: bookwyrm/templates/settings/announcements.html:48
 msgid "active"
-msgstr "active"
+msgstr ""
 
 #: bookwyrm/templates/settings/announcements.html:48
 msgid "inactive"
-msgstr "inactive"
+msgstr ""
 
 #: bookwyrm/templates/settings/edit_server.html:3
 #: bookwyrm/templates/settings/edit_server.html:6
@@ -2080,1415 +1934,982 @@ msgstr "inactive"
 #: bookwyrm/templates/settings/server_blocklist.html:3
 #: bookwyrm/templates/settings/server_blocklist.html:20
 msgid "Add server"
-msgstr "Ajouter un serveur"
+msgstr ""
 
 #: bookwyrm/templates/settings/edit_server.html:7
 #: bookwyrm/templates/settings/server_blocklist.html:7
 msgid "Back to server list"
-msgstr "Retour à la liste des serveurs"
+msgstr ""
 
 #: bookwyrm/templates/settings/edit_server.html:16
 #: bookwyrm/templates/settings/server_blocklist.html:16
 msgid "Import block list"
-msgstr "Importer une liste de blocage"
+msgstr ""
 
 #: bookwyrm/templates/settings/edit_server.html:30
 msgid "Instance:"
-msgstr "Instance :"
+msgstr ""
 
 #: bookwyrm/templates/settings/edit_server.html:37
 #: bookwyrm/templates/settings/federated_server.html:31
 #: bookwyrm/templates/user_admin/user_info.html:34
 msgid "Status:"
-msgstr "Statut :"
+msgstr ""
 
 #: bookwyrm/templates/settings/edit_server.html:41
 #: bookwyrm/templates/settings/federated_server.html:10
 msgid "Blocked"
-msgstr "Bloqué"
+msgstr ""
 
 #: bookwyrm/templates/settings/edit_server.html:48
 #: bookwyrm/templates/settings/federated_server.html:23
 #: bookwyrm/templates/user_admin/user_info.html:26
 msgid "Software:"
-msgstr "Logiciel :"
+msgstr ""
 
 #: bookwyrm/templates/settings/edit_server.html:55
 #: bookwyrm/templates/settings/federated_server.html:27
 #: bookwyrm/templates/user_admin/user_info.html:30
 msgid "Version:"
-msgstr "Description :"
+msgstr ""
 
 #: bookwyrm/templates/settings/edit_server.html:64
 msgid "Notes:"
-msgstr "Remarques :"
+msgstr ""
 
 #: bookwyrm/templates/settings/federated_server.html:19
 msgid "Details"
-msgstr "Détails"
+msgstr ""
 
 #: bookwyrm/templates/settings/federated_server.html:39
 #: bookwyrm/templates/user/layout.html:56
 msgid "Activity"
-msgstr "Activité"
+msgstr ""
 
 #: bookwyrm/templates/settings/federated_server.html:43
 msgid "Users:"
-msgstr "Comptes :"
+msgstr ""
 
 #: bookwyrm/templates/settings/federated_server.html:46
 #: bookwyrm/templates/settings/federated_server.html:53
 msgid "View all"
-msgstr "Voir tous"
+msgstr ""
 
 #: bookwyrm/templates/settings/federated_server.html:50
 msgid "Reports:"
-msgstr "Signalements :"
+msgstr ""
 
 #: bookwyrm/templates/settings/federated_server.html:57
 msgid "Followed by us:"
-msgstr "Suivi par nous :"
+msgstr ""
 
 #: bookwyrm/templates/settings/federated_server.html:63
 msgid "Followed by them:"
-msgstr "Suivi par eux :"
+msgstr ""
 
 #: bookwyrm/templates/settings/federated_server.html:69
 msgid "Blocked by us:"
-msgstr "Bloqués par nous :"
+msgstr ""
 
 #: bookwyrm/templates/settings/federated_server.html:82
 #: bookwyrm/templates/user_admin/user_info.html:39
 msgid "Notes"
-msgstr "Remarques"
+msgstr ""
 
 #: bookwyrm/templates/settings/federated_server.html:85
 msgid "Edit"
-msgstr "Modifier"
+msgstr ""
 
 #: bookwyrm/templates/settings/federated_server.html:105
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:3
 msgid "Actions"
-msgstr "Actions"
+msgstr ""
 
 #: bookwyrm/templates/settings/federated_server.html:109
 #: bookwyrm/templates/snippets/block_button.html:5
 msgid "Block"
-msgstr "Bloquer"
+msgstr ""
 
 #: bookwyrm/templates/settings/federated_server.html:110
 msgid "All users from this instance will be deactivated."
-msgstr "Tous les comptes de cette instance seront désactivés."
+msgstr ""
 
 #: bookwyrm/templates/settings/federated_server.html:115
 #: bookwyrm/templates/snippets/block_button.html:10
 msgid "Un-block"
-msgstr "Débloquer"
+msgstr ""
 
 #: bookwyrm/templates/settings/federated_server.html:116
 msgid "All users from this instance will be re-activated."
-msgstr "Tous les comptes de cette instance seront réactivés."
+msgstr ""
 
 #: bookwyrm/templates/settings/federation.html:19
 #: bookwyrm/templates/user_admin/server_filter.html:5
 msgid "Server name"
-msgstr "Nom du serveur"
+msgstr ""
 
 #: bookwyrm/templates/settings/federation.html:23
 msgid "Date federated"
-msgstr "Date de fédération"
+msgstr ""
 
 #: bookwyrm/templates/settings/federation.html:27
 msgid "Software"
-msgstr "Logiciel"
+msgstr ""
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:4
 #: bookwyrm/templates/settings/manage_invite_requests.html:11
 #: bookwyrm/templates/settings/manage_invite_requests.html:25
 #: bookwyrm/templates/settings/manage_invites.html:11
 msgid "Invite Requests"
-msgstr "Demandes d’invitations"
+msgstr ""
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:23
 msgid "Ignored Invite Requests"
-msgstr "Invitations ignorées"
+msgstr ""
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:35
 msgid "Date requested"
-msgstr "Date d’envoi"
+msgstr ""
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:39
 msgid "Date accepted"
-msgstr "Date de validation"
+msgstr ""
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:42
 msgid "Email"
-msgstr "Email"
+msgstr ""
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:47
 msgid "Action"
-msgstr "Action"
+msgstr ""
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:50
 msgid "No requests"
-msgstr "Aucune demande"
+msgstr ""
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:59
 #: bookwyrm/templates/settings/status_filter.html:16
 msgid "Accepted"
-msgstr "Accepté(e)s"
+msgstr ""
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:61
 #: bookwyrm/templates/settings/status_filter.html:12
 msgid "Sent"
-msgstr "Envoyé(e)s"
+msgstr ""
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:63
 #: bookwyrm/templates/settings/status_filter.html:8
 msgid "Requested"
-msgstr "Demandé(e)s"
+msgstr ""
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:73
 msgid "Send invite"
-msgstr "Envoyer l’invitation"
+msgstr ""
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:75
 msgid "Re-send invite"
-msgstr "Envoyer l’invitation de nouveau"
+msgstr ""
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:95
 msgid "Ignore"
-msgstr "Ignorer"
+msgstr ""
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:97
 msgid "Un-ignore"
-msgstr "Ne plus ignorer"
+msgstr ""
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:108
 msgid "Back to pending requests"
-msgstr "Retour aux demandes en attente"
+msgstr ""
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:110
 msgid "View ignored requests"
-msgstr "Voir les demandes ignorées"
+msgstr ""
 
 #: bookwyrm/templates/settings/manage_invites.html:21
 msgid "Generate New Invite"
-msgstr "Générer une nouvelle invitation"
+msgstr ""
 
 #: bookwyrm/templates/settings/manage_invites.html:27
 msgid "Expiry:"
-msgstr "Expiration :"
+msgstr ""
 
 #: bookwyrm/templates/settings/manage_invites.html:33
 msgid "Use limit:"
-msgstr "Limiter à :"
+msgstr ""
 
 #: bookwyrm/templates/settings/manage_invites.html:40
 msgid "Create Invite"
-msgstr "Créer une invitation"
+msgstr ""
 
 #: bookwyrm/templates/settings/manage_invites.html:47
 msgid "Link"
-msgstr "Lien"
+msgstr ""
 
 #: bookwyrm/templates/settings/manage_invites.html:48
 msgid "Expires"
-msgstr "Expiration"
+msgstr ""
 
 #: bookwyrm/templates/settings/manage_invites.html:49
 msgid "Max uses"
-msgstr "Nombre maximum d’utilisations"
+msgstr ""
 
 #: bookwyrm/templates/settings/manage_invites.html:50
 msgid "Times used"
-msgstr "Nombre de fois utilisée"
+msgstr ""
 
 #: bookwyrm/templates/settings/manage_invites.html:53
 msgid "No active invites"
-msgstr "Aucune invitation active"
+msgstr ""
 
 #: bookwyrm/templates/settings/server_blocklist.html:6
 msgid "Import Blocklist"
-msgstr "Importer une liste de blocage"
+msgstr ""
 
 #: bookwyrm/templates/settings/server_blocklist.html:26
 #: bookwyrm/templates/snippets/goal_progress.html:7
 msgid "Success!"
-msgstr "Bravo !"
+msgstr ""
 
 #: bookwyrm/templates/settings/server_blocklist.html:30
 msgid "Successfully blocked:"
-msgstr "Blocage réussi :"
+msgstr ""
 
 #: bookwyrm/templates/settings/server_blocklist.html:32
 msgid "Failed:"
-msgstr "Échec :"
+msgstr ""
 
 #: bookwyrm/templates/settings/site.html:15
 msgid "Instance Name:"
-msgstr "Nom de l’instance :"
+msgstr ""
 
 #: bookwyrm/templates/settings/site.html:19
 msgid "Tagline:"
-msgstr "Slogan :"
+msgstr ""
 
 #: bookwyrm/templates/settings/site.html:23
 msgid "Instance description:"
-msgstr "Description de l’instance :"
+msgstr ""
 
 #: bookwyrm/templates/settings/site.html:27
 msgid "Code of conduct:"
-msgstr "Code de conduite :"
+msgstr ""
 
 #: bookwyrm/templates/settings/site.html:31
 msgid "Privacy Policy:"
-msgstr "Politique de vie privée :"
+msgstr ""
 
 #: bookwyrm/templates/settings/site.html:42
 msgid "Logo:"
-msgstr "Logo :"
+msgstr ""
 
 #: bookwyrm/templates/settings/site.html:46
 msgid "Logo small:"
-msgstr "Logo réduit :"
+msgstr ""
 
 #: bookwyrm/templates/settings/site.html:50
 msgid "Favicon:"
-msgstr "Favicon :"
+msgstr ""
 
 #: bookwyrm/templates/settings/site.html:61
 msgid "Support link:"
-msgstr "URL pour soutenir l’instance :"
+msgstr ""
 
 #: bookwyrm/templates/settings/site.html:65
 msgid "Support title:"
-msgstr "Titre pour soutenir l’instance :"
+msgstr ""
 
 #: bookwyrm/templates/settings/site.html:69
 msgid "Admin email:"
-msgstr "Email de l’administrateur :"
+msgstr ""
 
 #: bookwyrm/templates/settings/site.html:73
 msgid "Additional info:"
-msgstr "Infos supplémentaires :"
+msgstr ""
 
 #: bookwyrm/templates/settings/site.html:85
 msgid "Allow registration"
-msgstr "Autoriser les inscriptions"
+msgstr ""
 
 #: bookwyrm/templates/settings/site.html:91
 msgid "Allow invite requests"
-msgstr "Autoriser les demandes d’invitation"
+msgstr ""
 
 #: bookwyrm/templates/settings/site.html:95
 msgid "Registration closed text:"
-msgstr "Texte affiché lorsque les enregistrements sont clos :"
+msgstr ""
 
 #: bookwyrm/templates/snippets/announcement.html:31
 #, python-format
 msgid "Posted by <a href=\"%(user_path)s\">%(username)s</a>"
-msgstr "Publiée par <a href=\"%(user_path)s\">%(username)s</a>"
+msgstr ""
 
 #: bookwyrm/templates/snippets/book_cover.html:31
 msgid "No cover"
-msgstr "Pas de couverture"
+msgstr ""
 
 #: bookwyrm/templates/snippets/book_titleby.html:4
 #, python-format
 msgid "<a href=\"%(path)s\">%(title)s</a> by "
-msgstr "<a href=\"%(path)s\">%(title)s</a> par "
+msgstr ""
 
 #: bookwyrm/templates/snippets/boost_button.html:20
 #: bookwyrm/templates/snippets/boost_button.html:21
 msgid "Boost"
-msgstr "Partager"
+msgstr ""
 
 #: bookwyrm/templates/snippets/boost_button.html:33
 #: bookwyrm/templates/snippets/boost_button.html:34
 msgid "Un-boost"
-msgstr "Annuler le partage"
+msgstr ""
 
 #: bookwyrm/templates/snippets/content_warning_field.html:3
 msgid "Spoiler alert:"
-msgstr "Alerte Spoiler :"
+msgstr ""
 
 #: bookwyrm/templates/snippets/content_warning_field.html:10
 msgid "Spoilers ahead!"
-msgstr "Attention spoilers !"
+msgstr ""
 
 #: bookwyrm/templates/snippets/create_status.html:17
 msgid "Review"
-msgstr "Critique"
+msgstr ""
 
 #: bookwyrm/templates/snippets/create_status.html:39
 msgid "Quote"
-msgstr "Citation"
+msgstr ""
 
 #: bookwyrm/templates/snippets/create_status_form.html:23
 msgid "Comment:"
-msgstr "Commentaire :"
+msgstr ""
 
 #: bookwyrm/templates/snippets/create_status_form.html:25
 msgid "Quote:"
-msgstr "Citation :"
+msgstr ""
 
 #: bookwyrm/templates/snippets/create_status_form.html:27
 msgid "Review:"
-msgstr "Critique :"
+msgstr ""
 
 #: bookwyrm/templates/snippets/create_status_form.html:56
 #: bookwyrm/templates/snippets/status/layout.html:29
 #: bookwyrm/templates/snippets/status/layout.html:47
 #: bookwyrm/templates/snippets/status/layout.html:48
 msgid "Reply"
-msgstr "Répondre"
+msgstr ""
 
 #: bookwyrm/templates/snippets/create_status_form.html:56
 msgid "Content"
-msgstr "Contenu"
+msgstr ""
 
 #: bookwyrm/templates/snippets/create_status_form.html:80
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
 msgid "Progress:"
-msgstr "Progression :"
+msgstr ""
 
 #: bookwyrm/templates/snippets/create_status_form.html:88
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
-msgstr "pages"
+msgstr ""
 
 #: bookwyrm/templates/snippets/create_status_form.html:89
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
-msgstr "pourcent"
+msgstr ""
 
 #: bookwyrm/templates/snippets/create_status_form.html:95
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
-msgstr "sur %(pages)s pages"
+msgstr ""
 
 #: bookwyrm/templates/snippets/create_status_form.html:110
 msgid "Include spoiler alert"
-msgstr "Afficher une alerte spoiler"
+msgstr ""
 
 #: bookwyrm/templates/snippets/create_status_form.html:117
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:19
 msgid "Private"
-msgstr "Privé"
+msgstr ""
 
 #: bookwyrm/templates/snippets/create_status_form.html:128
 msgid "Post"
-msgstr "Publier"
+msgstr ""
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:4
 msgid "Delete these read dates?"
-msgstr "Supprimer ces dates de lecture ?"
+msgstr ""
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
 #, python-format
-msgid ""
-"You are deleting this readthrough and its %(count)s associated progress "
-"updates."
-msgstr "Vous avez supprimé ce résumé et ses %(count)s progressions associées."
+msgid "You are deleting this readthrough and its %(count)s associated progress updates."
+msgstr ""
 
 #: bookwyrm/templates/snippets/fav_button.html:10
 #: bookwyrm/templates/snippets/fav_button.html:12
 msgid "Like"
-msgstr "Ajouter aux favoris"
+msgstr ""
 
 #: bookwyrm/templates/snippets/fav_button.html:18
 #: bookwyrm/templates/snippets/fav_button.html:19
 msgid "Un-like"
-msgstr "Retirer des favoris"
+msgstr ""
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:7
 msgid "Show filters"
-msgstr "Afficher les filtres"
+msgstr ""
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:9
 msgid "Hide filters"
-msgstr "Masquer les filtres"
+msgstr ""
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:22
 msgid "Apply filters"
-msgstr "Appliquer les filtres"
+msgstr ""
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:26
 msgid "Clear filters"
-msgstr "Annuler les filtres"
+msgstr ""
 
 #: bookwyrm/templates/snippets/follow_button.html:12
 msgid "Follow"
-msgstr "S’abonner"
+msgstr ""
 
 #: bookwyrm/templates/snippets/follow_button.html:18
 msgid "Undo follow request"
-msgstr "Annuler la demande d’abonnement"
+msgstr ""
 
 #: bookwyrm/templates/snippets/follow_button.html:20
 msgid "Unfollow"
-msgstr "Se désabonner"
+msgstr ""
 
 #: bookwyrm/templates/snippets/follow_request_buttons.html:7
 msgid "Accept"
-msgstr "Accepter"
+msgstr ""
 
 #: bookwyrm/templates/snippets/form_rate_stars.html:19
 #: bookwyrm/templates/snippets/stars.html:13
 msgid "No rating"
-msgstr "Aucune note"
+msgstr ""
 
 #: bookwyrm/templates/snippets/form_rate_stars.html:44
 #: bookwyrm/templates/snippets/stars.html:7
 #, python-format
 msgid "%(rating)s star"
 msgid_plural "%(rating)s stars"
-msgstr[0] "%(rating)s étoile"
-msgstr[1] "%(rating)s étoiles"
+msgstr[0] ""
+msgstr[1] ""
 
 #: bookwyrm/templates/snippets/generated_status/goal.html:1
 #, python-format
 msgid "set a goal to read %(counter)s book in %(year)s"
 msgid_plural "set a goal to read %(counter)s books in %(year)s"
-msgstr[0] "souhaite lire %(counter)s livre en %(year)s"
-msgstr[1] "souhaite lire %(counter)s livres en %(year)s"
+msgstr[0] ""
+msgstr[1] ""
 
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
 #, python-format
-msgid ""
-"Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
-msgid_plural ""
-"Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
-msgstr[0] "A noté <a href=\"%(path)s\">%(title)s</a> : %(display_rating)s star"
+msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
+msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
+msgstr[0] ""
 msgstr[1] ""
-"A noté <a href=\"%(path)s\">%(title)s</a> : %(display_rating)s stars"
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4
 #, python-format
-msgid ""
-"Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
-msgid_plural ""
-"Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
+msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
+msgid_plural "Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
 msgstr[0] ""
-"Critique de « %(book_title)s » (%(display_rating)s star): %(review_title)s"
 msgstr[1] ""
-"Critique de « %(book_title)s » (%(display_rating)s stars) : %(review_title)s"
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:8
 #, python-format
 msgid "Review of \"%(book_title)s\": %(review_title)s"
-msgstr "Critique de « %(book_title)s » : %(review_title)s"
+msgstr ""
 
 #: bookwyrm/templates/snippets/goal_card.html:23
 #, python-format
-msgid ""
-"You can set or change your reading goal any time from your <a href=\"%(path)s"
-"\">profile page</a>"
+msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
 msgstr ""
-"Vous pouvez définir ou changer votre défi lecture à n’importe quel moment "
-"depuis votre <a href=\"%(path)s\">profil</a>"
 
 #: bookwyrm/templates/snippets/goal_form.html:9
 msgid "Reading goal:"
-msgstr "Défi lecture :"
+msgstr ""
 
 #: bookwyrm/templates/snippets/goal_form.html:14
 msgid "books"
-msgstr "livres"
+msgstr ""
 
 #: bookwyrm/templates/snippets/goal_form.html:19
 msgid "Goal privacy:"
-msgstr "Confidentialité du défi :"
+msgstr ""
 
 #: bookwyrm/templates/snippets/goal_form.html:26
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:29
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20
 msgid "Post to feed"
-msgstr "Publier sur le fil d’actualité"
+msgstr ""
 
 #: bookwyrm/templates/snippets/goal_form.html:30
 msgid "Set goal"
-msgstr "Valider ce défi"
+msgstr ""
 
 #: bookwyrm/templates/snippets/goal_progress.html:9
 #, python-format
 msgid "%(percent)s%% complete!"
-msgstr "%(percent)s%% terminé !"
+msgstr ""
 
 #: bookwyrm/templates/snippets/goal_progress.html:12
 #, python-format
-msgid ""
-"You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
+msgid "You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
 msgstr ""
-"Vous avez lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s livres</"
-"a>."
 
 #: bookwyrm/templates/snippets/goal_progress.html:14
 #, python-format
-msgid ""
-"%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s "
-"books</a>."
+msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
 msgstr ""
-"%(username)s a lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s "
-"livres</a>."
 
 #: bookwyrm/templates/snippets/page_text.html:4
 #, python-format
 msgid "page %(page)s of %(total_pages)s"
-msgstr "page %(page)s sur %(total_pages)s pages"
+msgstr ""
 
 #: bookwyrm/templates/snippets/page_text.html:6
 #, python-format
 msgid "page %(page)s"
-msgstr "page %(page)s"
+msgstr ""
 
 #: bookwyrm/templates/snippets/pagination.html:12
 msgid "Previous"
-msgstr "Précédente"
+msgstr ""
 
 #: bookwyrm/templates/snippets/pagination.html:23
 msgid "Next"
-msgstr "Suivante"
+msgstr ""
 
 #: bookwyrm/templates/snippets/privacy-icons.html:3
 #: bookwyrm/templates/snippets/privacy-icons.html:4
 #: bookwyrm/templates/snippets/privacy_select.html:10
 msgid "Public"
-msgstr "Public"
+msgstr ""
 
 #: bookwyrm/templates/snippets/privacy-icons.html:7
 #: bookwyrm/templates/snippets/privacy-icons.html:8
 #: bookwyrm/templates/snippets/privacy_select.html:13
 msgid "Unlisted"
-msgstr "Non listé"
+msgstr ""
 
 #: bookwyrm/templates/snippets/privacy-icons.html:12
 msgid "Followers-only"
-msgstr "Abonnemé(e)s uniquement"
+msgstr ""
 
 #: bookwyrm/templates/snippets/privacy_select.html:6
 msgid "Post privacy"
-msgstr "Confidentialité du statut"
+msgstr ""
 
 #: bookwyrm/templates/snippets/privacy_select.html:16
 #: bookwyrm/templates/user/relationships/followers.html:6
 #: bookwyrm/templates/user/relationships/layout.html:11
 msgid "Followers"
-msgstr "Abonné(e)s"
+msgstr ""
 
 #: bookwyrm/templates/snippets/rate_action.html:4
 msgid "Leave a rating"
-msgstr "Laisser une note"
+msgstr ""
 
 #: bookwyrm/templates/snippets/rate_action.html:19
 msgid "Rate"
-msgstr "Noter"
+msgstr ""
 
 #: bookwyrm/templates/snippets/readthrough.html:8
 msgid "Progress Updates:"
-msgstr "Progression :"
+msgstr ""
 
 #: bookwyrm/templates/snippets/readthrough.html:14
 msgid "finished"
-msgstr "terminé"
+msgstr ""
 
 #: bookwyrm/templates/snippets/readthrough.html:25
 msgid "Show all updates"
-msgstr "Montrer toutes les progressions"
+msgstr ""
 
 #: bookwyrm/templates/snippets/readthrough.html:41
 msgid "Delete this progress update"
-msgstr "Supprimer cette mise à jour"
+msgstr ""
 
 #: bookwyrm/templates/snippets/readthrough.html:52
 msgid "started"
-msgstr "commencé"
+msgstr ""
 
 #: bookwyrm/templates/snippets/readthrough.html:59
 #: bookwyrm/templates/snippets/readthrough.html:73
 msgid "Edit read dates"
-msgstr "Modifier les date de lecture"
+msgstr ""
 
 #: bookwyrm/templates/snippets/readthrough.html:63
 msgid "Delete these read dates"
-msgstr "Supprimer ces dates de lecture"
+msgstr ""
 
 #: bookwyrm/templates/snippets/readthrough_form.html:7
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:19
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:17
 msgid "Started reading"
-msgstr "Lecture commencée le"
+msgstr ""
 
 #: bookwyrm/templates/snippets/readthrough_form.html:14
 msgid "Progress"
-msgstr "Progression"
+msgstr ""
 
 #: bookwyrm/templates/snippets/readthrough_form.html:30
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25
 msgid "Finished reading"
-msgstr "Lecture terminée le"
+msgstr ""
 
 #: bookwyrm/templates/snippets/register_form.html:32
 msgid "Sign Up"
-msgstr "S’enregistrer"
+msgstr ""
 
 #: bookwyrm/templates/snippets/report_button.html:6
 msgid "Report"
-msgstr "Signaler"
+msgstr ""
 
 #: bookwyrm/templates/snippets/search_result_text.html:36
 msgid "Import book"
-msgstr "Importer le livre"
+msgstr ""
 
 #: bookwyrm/templates/snippets/shelf_selector.html:4
 msgid "Move book"
-msgstr "Déplacer le livre"
+msgstr ""
 
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
 #, python-format
 msgid "Finish \"<em>%(book_title)s</em>\""
-msgstr "Terminer « <em>%(book_title)s</em> »"
+msgstr ""
 
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:36
 msgid "Update progress"
-msgstr "Progression de la mise à jour"
+msgstr ""
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5
 msgid "More shelves"
-msgstr "Plus d’étagères"
+msgstr ""
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:10
 msgid "Start reading"
-msgstr "Commencer la lecture"
+msgstr ""
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:15
 msgid "Finish reading"
-msgstr "Terminer la lecture"
+msgstr ""
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:18
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26
 msgid "Want to read"
-msgstr "Je veux le lire"
+msgstr ""
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:47
 #, python-format
 msgid "Remove from %(name)s"
-msgstr "Retirer de %(name)s"
+msgstr ""
 
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
 #, python-format
 msgid "Start \"<em>%(book_title)s</em>\""
-msgstr "Commencer « <em>%(book_title)s</em> »"
+msgstr ""
 
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:5
 #, python-format
 msgid "Want to Read \"<em>%(book_title)s</em>\""
-msgstr "Ajouter « <em>%(book_title)s</em> » aux envies de lecture"
+msgstr ""
 
 #: bookwyrm/templates/snippets/status/content_status.html:71
 #: bookwyrm/templates/snippets/trimmed_text.html:15
 msgid "Show more"
-msgstr "Déplier"
+msgstr ""
 
 #: bookwyrm/templates/snippets/status/content_status.html:86
 #: bookwyrm/templates/snippets/trimmed_text.html:30
 msgid "Show less"
-msgstr "Replier"
+msgstr ""
 
 #: bookwyrm/templates/snippets/status/content_status.html:116
 msgid "Open image in new window"
-msgstr "Ouvrir l’image dans une nouvelle fenêtre"
+msgstr ""
 
 #: bookwyrm/templates/snippets/status/layout.html:21
 #: bookwyrm/templates/snippets/status/status_options.html:17
 msgid "Delete status"
-msgstr "Supprimer le statut"
+msgstr ""
 
 #: bookwyrm/templates/snippets/status/layout.html:51
 #: bookwyrm/templates/snippets/status/layout.html:52
 msgid "Boost status"
-msgstr "Partager le statut"
+msgstr ""
 
 #: bookwyrm/templates/snippets/status/layout.html:55
 #: bookwyrm/templates/snippets/status/layout.html:56
 msgid "Like status"
-msgstr "Ajouter le statut aux favoris"
+msgstr ""
 
 #: bookwyrm/templates/snippets/status/status.html:10
 msgid "boosted"
-msgstr "a partagé"
+msgstr ""
 
 #: bookwyrm/templates/snippets/status/status_header.html:45
 #, python-format
-msgid ""
-"replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
-"\"%(status_path)s\">status</a>"
+msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
 msgstr ""
-"a répondu au <a href=\"%(status_path)s\">statut</a> de <a href="
-"\"%(user_path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/snippets/status/status_options.html:7
 #: bookwyrm/templates/snippets/user_options.html:7
 msgid "More options"
-msgstr "Plus d’options"
+msgstr ""
 
 #: bookwyrm/templates/snippets/status/status_options.html:26
 msgid "Delete & re-draft"
-msgstr "Supprimer & recommencer la rédaction"
+msgstr ""
 
 #: bookwyrm/templates/snippets/status/status_options.html:35
 #: bookwyrm/templates/snippets/user_options.html:13
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:6
 msgid "Send direct message"
-msgstr "Envoyer un message direct"
+msgstr ""
 
 #: bookwyrm/templates/snippets/switch_edition_button.html:5
 msgid "Switch to this edition"
-msgstr "Changer vers cette édition"
+msgstr ""
 
 #: bookwyrm/templates/snippets/table-sort-header.html:6
 msgid "Sorted ascending"
-msgstr "Trié par ordre croissant"
+msgstr ""
 
 #: bookwyrm/templates/snippets/table-sort-header.html:10
 msgid "Sorted descending"
-msgstr "Trié par ordre décroissant"
+msgstr ""
 
 #: bookwyrm/templates/user/layout.html:13 bookwyrm/templates/user/user.html:10
 msgid "User Profile"
-msgstr "Profil"
+msgstr ""
 
 #: bookwyrm/templates/user/layout.html:37
 msgid "Follow Requests"
-msgstr "Demandes d’abonnement"
+msgstr ""
 
 #: bookwyrm/templates/user/layout.html:62
 msgid "Reading Goal"
-msgstr "Défi lecture"
+msgstr ""
 
 #: bookwyrm/templates/user/lists.html:11
 #, python-format
 msgid "Lists: %(username)s"
-msgstr "Listes : %(username)s"
+msgstr ""
 
 #: bookwyrm/templates/user/lists.html:17 bookwyrm/templates/user/lists.html:29
 msgid "Create list"
-msgstr "Créer une liste"
+msgstr ""
 
 #: bookwyrm/templates/user/relationships/followers.html:12
 #, python-format
 msgid "%(username)s has no followers"
-msgstr "%(username)s n’a pas d’abonné(e)"
+msgstr ""
 
 #: bookwyrm/templates/user/relationships/following.html:6
 #: bookwyrm/templates/user/relationships/layout.html:15
 msgid "Following"
-msgstr "Comptes suivis"
+msgstr ""
 
 #: bookwyrm/templates/user/relationships/following.html:12
 #, python-format
 msgid "%(username)s isn't following any users"
-msgstr "%(username)s ne suit personne"
+msgstr ""
 
 #: bookwyrm/templates/user/shelf/books_header.html:5
 #, python-format
 msgid "%(username)s's books"
-msgstr "Livres de %(username)s"
+msgstr ""
 
 #: bookwyrm/templates/user/shelf/create_shelf_form.html:5
 #: bookwyrm/templates/user/shelf/create_shelf_form.html:22
 msgid "Create Shelf"
-msgstr "Créer une étagère"
+msgstr ""
 
 #: bookwyrm/templates/user/shelf/edit_shelf_form.html:5
 msgid "Edit Shelf"
-msgstr "Modifier l’étagère"
+msgstr ""
 
 #: bookwyrm/templates/user/shelf/edit_shelf_form.html:26
 msgid "Update shelf"
-msgstr "Mettre l’étagère à jour"
+msgstr ""
 
 #: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:56
 msgid "All books"
-msgstr "Tous les livres"
+msgstr ""
 
 #: bookwyrm/templates/user/shelf/shelf.html:38
 msgid "Create shelf"
-msgstr "Créer une étagère"
+msgstr ""
 
 #: bookwyrm/templates/user/shelf/shelf.html:62
 msgid "Edit shelf"
-msgstr "Modifier l’étagère"
+msgstr ""
 
 #: bookwyrm/templates/user/shelf/shelf.html:81
 #: bookwyrm/templates/user/shelf/shelf.html:105
 msgid "Shelved"
-msgstr "Date d’ajout"
+msgstr ""
 
 #: bookwyrm/templates/user/shelf/shelf.html:82
 #: bookwyrm/templates/user/shelf/shelf.html:109
 msgid "Started"
-msgstr "Commencé"
+msgstr ""
 
 #: bookwyrm/templates/user/shelf/shelf.html:83
 #: bookwyrm/templates/user/shelf/shelf.html:112
 msgid "Finished"
-msgstr "Terminé"
+msgstr ""
 
 #: bookwyrm/templates/user/shelf/shelf.html:138
 msgid "This shelf is empty."
-msgstr "Cette étagère est vide"
+msgstr ""
 
 #: bookwyrm/templates/user/shelf/shelf.html:144
 msgid "Delete shelf"
-msgstr "Supprimer l’étagère"
+msgstr ""
 
 #: bookwyrm/templates/user/user.html:16
 msgid "Edit profile"
-msgstr "Modifier le profil"
+msgstr ""
 
 #: bookwyrm/templates/user/user.html:33
 #, python-format
 msgid "View all %(size)s"
-msgstr "Voir les %(size)s"
+msgstr ""
 
 #: bookwyrm/templates/user/user.html:46
 msgid "View all books"
-msgstr "Voir tous les livres"
+msgstr ""
 
 #: bookwyrm/templates/user/user.html:59
 msgid "User Activity"
-msgstr "Activité du compte"
+msgstr ""
 
 #: bookwyrm/templates/user/user.html:63
 msgid "RSS feed"
-msgstr "Flux RSS"
+msgstr ""
 
 #: bookwyrm/templates/user/user.html:74
 msgid "No activities yet!"
-msgstr "Aucune activité pour l’instant !"
+msgstr ""
 
 #: bookwyrm/templates/user/user_preview.html:15
 #, python-format
 msgid "Joined %(date)s"
-msgstr "A rejoint ce serveur %(date)s"
+msgstr ""
 
 #: bookwyrm/templates/user/user_preview.html:19
 #, python-format
 msgid "%(counter)s follower"
 msgid_plural "%(counter)s followers"
-msgstr[0] "%(counter)s abonné(e)"
-msgstr[1] "%(counter)s abonné(e)s"
+msgstr[0] ""
+msgstr[1] ""
 
 #: bookwyrm/templates/user/user_preview.html:20
 #, python-format
 msgid "%(counter)s following"
-msgstr "%(counter)s abonnements"
+msgstr ""
 
 #: bookwyrm/templates/user/user_preview.html:26
 #, python-format
 msgid "%(mutuals_display)s follower you follow"
 msgid_plural "%(mutuals_display)s followers you follow"
-msgstr[0] "%(mutuals_display)s abonné(e) que vous suivez"
-msgstr[1] "%(mutuals_display)s abonné(e)s que vous suivez"
+msgstr[0] ""
+msgstr[1] ""
 
 #: bookwyrm/templates/user_admin/user.html:9
 msgid "Back to users"
-msgstr "Retour aux comptes"
+msgstr ""
 
 #: bookwyrm/templates/user_admin/user_admin.html:7
 #, python-format
 msgid "Users: <small>%(server_name)s</small>"
-msgstr "Comptes : <small>%(server_name)s</small>"
+msgstr ""
 
 #: bookwyrm/templates/user_admin/user_admin.html:22
 #: bookwyrm/templates/user_admin/username_filter.html:5
 msgid "Username"
-msgstr "Nom du compte"
+msgstr ""
 
 #: bookwyrm/templates/user_admin/user_admin.html:26
 msgid "Date Added"
-msgstr "Date d’ajout"
+msgstr ""
 
 #: bookwyrm/templates/user_admin/user_admin.html:30
 msgid "Last Active"
-msgstr "Dernière activité"
+msgstr ""
 
 #: bookwyrm/templates/user_admin/user_admin.html:38
 msgid "Remote server"
-msgstr "Serveur distant"
+msgstr ""
 
 #: bookwyrm/templates/user_admin/user_admin.html:47
 msgid "Active"
-msgstr "Actif"
+msgstr ""
 
 #: bookwyrm/templates/user_admin/user_admin.html:47
 msgid "Inactive"
-msgstr "Inactif"
+msgstr ""
 
 #: bookwyrm/templates/user_admin/user_admin.html:52
 #: bookwyrm/templates/user_admin/user_info.html:49
 msgid "Not set"
-msgstr "Non défini"
+msgstr ""
 
 #: bookwyrm/templates/user_admin/user_info.html:5
 msgid "User details"
-msgstr "Détails du compte"
+msgstr ""
 
 #: bookwyrm/templates/user_admin/user_info.html:14
 msgid "View user profile"
-msgstr "Voir le profil"
+msgstr ""
 
 #: bookwyrm/templates/user_admin/user_info.html:20
 msgid "Instance details"
-msgstr "Détails de l’instance"
+msgstr ""
 
 #: bookwyrm/templates/user_admin/user_info.html:46
 msgid "View instance"
-msgstr "Voir l’instance"
+msgstr ""
 
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:11
 msgid "Suspend user"
-msgstr "Suspendre le compte"
+msgstr ""
 
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:13
 msgid "Un-suspend user"
-msgstr "Rétablir le compte"
+msgstr ""
 
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:21
 msgid "Access level:"
-msgstr "Niveau d’accès :"
+msgstr ""
 
 #: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:22
 msgid "File exceeds maximum size: 10MB"
-msgstr "Ce fichier dépasse la taille limite : 10 Mo"
+msgstr ""
 
 #: bookwyrm/views/import_data.py:67
 msgid "Not a valid csv file"
-msgstr "Fichier CSV non valide"
+msgstr ""
 
 #: bookwyrm/views/password.py:32
 msgid "No user with that email address was found."
-msgstr "Aucun compte avec cette adresse email n’a été trouvé."
+msgstr ""
 
 #: bookwyrm/views/password.py:41
 #, python-format
 msgid "A password reset link sent to %s"
-msgstr "Un lien de réinitialisation a été envoyé à %s."
-
-#~ msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
-#~ msgstr "Supprimer <a href=\"%(path)s\">%(name)s</a>"
-
-#, fuzzy
-#~| msgid "BookWyrm users"
-#~ msgid "BookWyrm\\"
-#~ msgstr "Comptes BookWyrm"
-
-#, fuzzy
-#~| msgid "Show more"
-#~ msgid "Show"
-#~ msgstr "Déplier"
-
-#, fuzzy
-#~| msgid "All messages"
-#~ msgid "Messages"
-#~ msgstr "Tous les messages"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "Enter a valid URL."
-#~ msgstr "Adresse email :"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "Enter a valid integer."
-#~ msgstr "Adresse email :"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "Enter a valid email address."
-#~ msgstr "Adresse email :"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "Enter a valid IPv4 address."
-#~ msgstr "Adresse email :"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "Enter a valid IPv6 address."
-#~ msgstr "Adresse email :"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "Enter a valid IPv4 or IPv6 address."
-#~ msgstr "Adresse email :"
-
-#, fuzzy
-#~| msgid "Series number:"
-#~ msgid "Enter a number."
-#~ msgstr "Numéro dans la série :"
-
-#, fuzzy
-#~| msgid "A user with this email already exists."
-#~ msgid "%(model_name)s with this %(field_labels)s already exists."
-#~ msgstr "Cet email est déjà associé à un compte."
-
-#, fuzzy
-#~| msgid "%(value)s is not a valid remote_id"
-#~ msgid "Value %(value)r is not a valid choice."
-#~ msgstr "%(value)s n’est pas une remote_id valide."
-
-#, fuzzy
-#~| msgid "This shelf is empty."
-#~ msgid "This field cannot be null."
-#~ msgstr "Cette étagère est vide"
-
-#, fuzzy
-#~| msgid "A user with this email already exists."
-#~ msgid "%(model_name)s with this %(field_label)s already exists."
-#~ msgstr "Cet email est déjà associé à un compte."
-
-#, fuzzy
-#~| msgid "No active invites"
-#~ msgid "Comma-separated integers"
-#~ msgstr "Aucune invitation active"
-
-#, fuzzy
-#~| msgid "Series number:"
-#~ msgid "Decimal number"
-#~ msgstr "Numéro dans la série :"
-
-#, fuzzy
-#~| msgid "List curation:"
-#~ msgid "Duration"
-#~ msgstr "Modération de la liste :"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "Email address"
-#~ msgstr "Adresse email :"
-
-#, fuzzy
-#~| msgid "No active invites"
-#~ msgid "Big (8 byte) integer"
-#~ msgstr "Aucune invitation active"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "IPv4 address"
-#~ msgstr "Adresse email :"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "IP address"
-#~ msgstr "Adresse email :"
-
-#, fuzzy
-#~| msgid "No active invites"
-#~ msgid "Positive integer"
-#~ msgstr "Aucune invitation active"
-
-#, fuzzy
-#~| msgid "No active invites"
-#~ msgid "Positive small integer"
-#~ msgstr "Aucune invitation active"
-
-#, fuzzy
-#~| msgid "%(value)s is not a valid username"
-#~ msgid "“%(value)s� is not a valid UUID."
-#~ msgstr "%(value)s n’est pas un nom de compte valide."
-
-#, fuzzy
-#~| msgid "Images"
-#~ msgid "Image"
-#~ msgstr "Images"
-
-#, fuzzy
-#~| msgid "Relationships"
-#~ msgid "One-to-one relationship"
-#~ msgstr "Relations"
-
-#, fuzzy
-#~| msgid "Relationships"
-#~ msgid "%(from)s-%(to)s relationship"
-#~ msgstr "Relations"
-
-#, fuzzy
-#~| msgid "Relationships"
-#~ msgid "%(from)s-%(to)s relationships"
-#~ msgstr "Relations"
-
-#, fuzzy
-#~| msgid "Relationships"
-#~ msgid "Many-to-many relationship"
-#~ msgstr "Relations"
-
-#, fuzzy
-#~| msgid "This shelf is empty."
-#~ msgid "This field is required."
-#~ msgstr "Cette étagère est vide"
-
-#, fuzzy
-#~| msgid "Series number:"
-#~ msgid "Enter a whole number."
-#~ msgstr "Numéro dans la série :"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "Enter a valid date."
-#~ msgstr "Adresse email :"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "Enter a valid time."
-#~ msgstr "Adresse email :"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "Enter a valid date/time."
-#~ msgstr "Adresse email :"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "Enter a valid duration."
-#~ msgstr "Adresse email :"
-
-#, fuzzy
-#~| msgid "This shelf is empty."
-#~ msgid "The submitted file is empty."
-#~ msgstr "Cette étagère est vide"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "Enter a list of values."
-#~ msgstr "Adresse email :"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "Enter a valid UUID."
-#~ msgstr "Adresse email :"
-
-#, fuzzy
-#~| msgid "Order by"
-#~ msgid "Order"
-#~ msgstr "Trier par"
-
-#, fuzzy
-#~| msgid "%(value)s is not a valid username"
-#~ msgid "“%(pk)s� is not a valid value."
-#~ msgstr "%(value)s n’est pas un nom de compte valide."
-
-#, fuzzy
-#~| msgid "Started reading"
-#~ msgid "Currently"
-#~ msgstr "Commencer la lecture"
-
-#, fuzzy
-#~| msgid "Change shelf"
-#~ msgid "Change"
-#~ msgstr "Changer d’étagère"
-
-#, fuzzy
-#~| msgid "Status"
-#~ msgid "Sat"
-#~ msgstr "Statut"
-
-#, fuzzy
-#~| msgid "Search"
-#~ msgid "March"
-#~ msgstr "Chercher"
-
-#, fuzzy
-#~| msgid "Series number:"
-#~ msgid "September"
-#~ msgstr "Numéro dans la série :"
-
-#, fuzzy
-#~| msgid "Series number:"
-#~ msgid "December"
-#~ msgstr "Numéro dans la série :"
-
-#, fuzzy
-#~| msgid "Search"
-#~ msgctxt "abbrev. month"
-#~ msgid "March"
-#~ msgstr "Chercher"
-
-#, fuzzy
-#~| msgid "Search"
-#~ msgctxt "alt. month"
-#~ msgid "March"
-#~ msgstr "Chercher"
-
-#, fuzzy
-#~| msgid "Series number:"
-#~ msgctxt "alt. month"
-#~ msgid "September"
-#~ msgstr "Numéro dans la série :"
-
-#, fuzzy
-#~| msgid "Series number:"
-#~ msgctxt "alt. month"
-#~ msgid "December"
-#~ msgstr "Numéro dans la série :"
-
-#, fuzzy
-#~| msgid "Email address:"
-#~ msgid "This is not a valid IPv6 address."
-#~ msgstr "Adresse email :"
-
-#, fuzzy
-#~| msgid "No books found matching the query \"%(query)s\""
-#~ msgid "No %(verbose_name)s found matching the query"
-#~ msgstr "Aucun livre trouvé pour la requête « %(query)s »"
-
-#, fuzzy
-#~| msgid "Community"
-#~ msgid "Django Community"
-#~ msgstr "Communauté"
-
-#~ msgid "Didn't find what you were looking for?"
-#~ msgstr "Vous n’avez pas trouvé ce que vous cherchiez ?"
-
-#~ msgid "Hide results from other catalogues"
-#~ msgstr "Masquer les résultats d’autres catalogues"
-
-#~ msgid "Matching Users"
-#~ msgstr "Comptes correspondants"
-
-#~ msgid "Set a reading goal for %(year)s"
-#~ msgstr "Définir un défi lecture pour %(year)s"
-
-#~ msgid "by %(author)s"
-#~ msgstr "par %(author)s"
-
-#~ msgid "Deactivate user"
-#~ msgstr "Désactiver le compte"
-
-#~ msgid "Reactivate user"
-#~ msgstr "Réactiver le compte"
-
-#~ msgid ""
-#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
-#~ "\"%(status_path)s\">review</a>"
-#~ msgstr ""
-#~ "a répondu à la <a href=\"%(status_path)s\">critique</a> de <a href="
-#~ "\"%(user_path)s\">%(username)s</a>"
-
-#~ msgid ""
-#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
-#~ "\"%(status_path)s\">comment</a>"
-#~ msgstr ""
-#~ "a répondu au <a href=\"%(status_path)s\">commentaire</a> de <a href="
-#~ "\"%(user_path)s\">%(username)s</a>"
-
-#~ msgid ""
-#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
-#~ "\"%(status_path)s\">quote</a>"
-#~ msgstr ""
-#~ "a répondu à la <a href=\"%(status_path)s\">citation</a> de <a href="
-#~ "\"%(user_path)s\">%(username)s</a>"
-
-#~ msgid "Remove tag"
-#~ msgstr "Supprimer le tag"
-
-#~ msgid "Add tag"
-#~ msgstr "Ajouter un tag"
-
-#~ msgid "Books tagged \"%(tag.name)s\""
-#~ msgstr "Livres tagués « %(tag.name)s »"
-
-#, fuzzy
-#~| msgid "Started"
-#~ msgid "Getting Started"
-#~ msgstr "Commencé"
-
-#, fuzzy
-#~| msgid "No users found for \"%(query)s\""
-#~ msgid "No users were found for \"%(query)s\""
-#~ msgstr "Aucun compte trouvé pour « %(query)s »"
-
-#~ msgid "Tags"
-#~ msgstr "Tags"
-
-#~ msgid "Your lists"
-#~ msgstr "Vos listes"
-
-#, fuzzy
-#~| msgid "See all %(size)s"
-#~ msgid "See all %(size)s lists"
-#~ msgstr "Voir les %(size)s"
-
-#~ msgid "Recent Lists"
-#~ msgstr "Listes récentes"
-
-#~ msgid "Published"
-#~ msgstr "Publié"
-
-#~ msgid "External links"
-#~ msgstr "Liens externes"
-
-#~ msgid "OpenLibrary"
-#~ msgstr "OpenLibrary"
-
-#~ msgid "Change shelf"
-#~ msgstr "Changer d’étagère"
-
-#~ msgid "Unshelve"
-#~ msgstr "Enlever de l’étagère"
-
-#~ msgid "Your Shelves"
-#~ msgstr "Vos étagères"
-
-#~ msgid "%(username)s: Shelves"
-#~ msgstr "%(username)s : Étagères"
-
-#~ msgid "Shelves"
-#~ msgstr "Étagères"
-
-#~ msgid "See all %(shelf_count)s shelves"
-#~ msgstr "Voir les %(shelf_count)s étagères"
-
-#~ msgid "Send follow request"
-#~ msgstr "Envoyer une demande d’abonnement"
-
-#~ msgid "Site Configuration"
-#~ msgstr "Configuration du site"
-
-#~ msgid "Follow request already sent."
-#~ msgstr "Demande d’abonnement déjà envoyée"
-
-#~ msgid "Created and curated by"
-#~ msgstr "Créée et modérée par"
-
-#~ msgid "Created by"
-#~ msgstr "Créée par"
-
-#~ msgid "Create New Shelf"
-#~ msgstr "Créer une nouvelle étagère"
-
-#, fuzzy
-#~| msgid "Create list"
-#~ msgid "Create new list"
-#~ msgstr "Créer une nouvelle liste"
-
-#~ msgid "Added by"
-#~ msgstr "Ajouté par"
-
-#~ msgid "suggested adding"
-#~ msgstr "a suggéré l’ajout de"
-
-#~ msgid "Change password"
-#~ msgstr "Changer le mot de passe"
-
-#~ msgid "%(year)s reading goal"
-#~ msgstr "Défi lecture pour %(year)s"
+msgstr ""

From 34ef6d57ce07c6a4f59ad6c42600e166ff10194f Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Sun, 6 Jun 2021 18:48:15 +0200
Subject: [PATCH 1248/1285] Update django.po

---
 locale/fr_FR/LC_MESSAGES/django.po | 1709 +++++++++++++++++-----------
 1 file changed, 1069 insertions(+), 640 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index aefdbdd6..5bacc9aa 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -1,235 +1,255 @@
+# French language text for the bookwyrm UI
+# Copyright (C) 2021 Mouse Reeve
+# This file is distributed under the same license as the bookwyrm package.
+# Mouse Reeve <mousereeve@riseup.net>, 2021
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: 0.1.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-06-05 20:35+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"
+"Language: fr_FR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
 #: bookwyrm/forms.py:224
 msgid "A user with this email already exists."
-msgstr ""
+msgstr "Cet email est déjà associé à un compte."
 
 #: bookwyrm/forms.py:238
 msgid "One Day"
-msgstr ""
+msgstr "Un jour"
 
 #: bookwyrm/forms.py:239
 msgid "One Week"
-msgstr ""
+msgstr "Une semaine"
 
 #: bookwyrm/forms.py:240
 msgid "One Month"
-msgstr ""
+msgstr "Un mois"
 
 #: bookwyrm/forms.py:241
 msgid "Does Not Expire"
-msgstr ""
+msgstr "Sans expiration"
 
 #: bookwyrm/forms.py:246
 #, python-format
 msgid "%(count)d uses"
-msgstr ""
+msgstr "%(count)d utilisations"
 
 #: bookwyrm/forms.py:249
 msgid "Unlimited"
-msgstr ""
+msgstr "Sans limite"
 
 #: bookwyrm/forms.py:299
 msgid "List Order"
-msgstr ""
+msgstr "Ordre de la liste"
 
 #: bookwyrm/forms.py:300
 msgid "Book Title"
-msgstr ""
+msgstr "Titre du livre"
 
 #: bookwyrm/forms.py:301 bookwyrm/templates/snippets/create_status_form.html:34
 #: bookwyrm/templates/user/shelf/shelf.html:85
 #: bookwyrm/templates/user/shelf/shelf.html:116
 msgid "Rating"
-msgstr ""
+msgstr "Note"
 
 #: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:107
 msgid "Sort By"
-msgstr ""
+msgstr "Trier par"
 
 #: bookwyrm/forms.py:307
 msgid "Ascending"
-msgstr ""
+msgstr "Ordre croissant"
 
 #: bookwyrm/forms.py:308
 msgid "Descending"
-msgstr ""
+msgstr "Ordre décroissant"
 
 #: bookwyrm/models/fields.py:25
 #, python-format
 msgid "%(value)s is not a valid remote_id"
-msgstr ""
+msgstr "%(value)s n’est pas une remote_id valide."
 
 #: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:43
 #, python-format
 msgid "%(value)s is not a valid username"
-msgstr ""
+msgstr "%(value)s n’est pas un nom de compte valide."
 
 #: bookwyrm/models/fields.py:166 bookwyrm/templates/layout.html:152
 msgid "username"
-msgstr ""
+msgstr "nom du compte :"
 
 #: bookwyrm/models/fields.py:171
 msgid "A user with that username already exists."
-msgstr ""
+msgstr "Ce nom est déjà associé à un compte."
 
 #: bookwyrm/settings.py:160
 msgid "English"
-msgstr ""
+msgstr "English"
 
 #: bookwyrm/settings.py:161
 msgid "German"
-msgstr ""
+msgstr "Deutsch"
 
 #: bookwyrm/settings.py:162
 msgid "Spanish"
-msgstr ""
+msgstr "Español"
 
 #: bookwyrm/settings.py:163
 msgid "French"
-msgstr ""
+msgstr "Français"
 
 #: bookwyrm/settings.py:164
 msgid "Simplified Chinese"
-msgstr ""
+msgstr "简化字"
 
 #: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8
 msgid "Not Found"
-msgstr ""
+msgstr "Introuvable"
 
 #: bookwyrm/templates/404.html:9
 msgid "The page you requested doesn't seem to exist!"
-msgstr ""
+msgstr "Il semblerait que la page que vous avez demandée n’existe pas !"
 
 #: bookwyrm/templates/500.html:4
 msgid "Oops!"
-msgstr ""
+msgstr "Oups !"
 
 #: bookwyrm/templates/500.html:8
 msgid "Server Error"
-msgstr ""
+msgstr "Erreur côté serveur"
 
 #: bookwyrm/templates/500.html:9
 msgid "Something went wrong! Sorry about that."
-msgstr ""
+msgstr "Une erreur s’est produite ; désolé !"
 
 #: bookwyrm/templates/author/author.html:17
 #: bookwyrm/templates/author/author.html:18
 msgid "Edit Author"
-msgstr ""
+msgstr "Modifier l’auteur ou autrice"
 
 #: bookwyrm/templates/author/author.html:34
 #: bookwyrm/templates/author/edit_author.html:41
 msgid "Aliases:"
-msgstr ""
+msgstr "Pseudonymes :"
 
 #: bookwyrm/templates/author/author.html:45
 msgid "Born:"
-msgstr ""
+msgstr "Naissance :"
 
 #: bookwyrm/templates/author/author.html:52
 msgid "Died:"
-msgstr ""
+msgstr "Décès :"
 
 #: bookwyrm/templates/author/author.html:61
 msgid "Wikipedia"
-msgstr ""
+msgstr "Wikipedia"
 
 #: bookwyrm/templates/author/author.html:69
 #: bookwyrm/templates/book/book.html:78
 msgid "View on OpenLibrary"
-msgstr ""
+msgstr "Voir sur OpenLibrary"
 
 #: bookwyrm/templates/author/author.html:77
 #: bookwyrm/templates/book/book.html:81
 msgid "View on Inventaire"
-msgstr ""
+msgstr "Voir sur Inventaire"
 
 #: bookwyrm/templates/author/author.html:85
 msgid "View on LibraryThing"
-msgstr ""
+msgstr "Voir sur LibraryThing"
 
 #: bookwyrm/templates/author/author.html:93
 msgid "View on Goodreads"
-msgstr ""
+msgstr "Voir sur Goodreads"
 
 #: bookwyrm/templates/author/author.html:108
 #, python-format
 msgid "Books by %(name)s"
-msgstr ""
+msgstr "Livres par %(name)s"
 
 #: bookwyrm/templates/author/edit_author.html:5
 msgid "Edit Author:"
-msgstr ""
+msgstr "Modifier l’auteur ou l’autrice :"
 
 #: bookwyrm/templates/author/edit_author.html:13
 #: bookwyrm/templates/book/edit_book.html:19
 msgid "Added:"
-msgstr ""
+msgstr "Ajouté :"
 
 #: bookwyrm/templates/author/edit_author.html:14
 #: bookwyrm/templates/book/edit_book.html:24
 msgid "Updated:"
-msgstr ""
+msgstr "Mis à jour :"
 
 #: bookwyrm/templates/author/edit_author.html:15
 #: bookwyrm/templates/book/edit_book.html:30
 msgid "Last edited by:"
-msgstr ""
+msgstr "Dernière modification par :"
 
 #: bookwyrm/templates/author/edit_author.html:31
 #: bookwyrm/templates/book/edit_book.html:117
 msgid "Metadata"
-msgstr ""
+msgstr "Métadonnées"
 
 #: bookwyrm/templates/author/edit_author.html:33
 #: bookwyrm/templates/lists/form.html:8
 #: bookwyrm/templates/user/shelf/create_shelf_form.html:13
 #: bookwyrm/templates/user/shelf/edit_shelf_form.html:14
 msgid "Name:"
-msgstr ""
+msgstr "Nom :"
 
 #: bookwyrm/templates/author/edit_author.html:43
 #: bookwyrm/templates/book/edit_book.html:162
 #: bookwyrm/templates/book/edit_book.html:171
 #: bookwyrm/templates/book/edit_book.html:214
 msgid "Separate multiple values with commas."
-msgstr ""
+msgstr "Séparez plusieurs valeurs par une virgule."
 
 #: bookwyrm/templates/author/edit_author.html:50
 msgid "Bio:"
-msgstr ""
+msgstr "Bio :"
 
 #: bookwyrm/templates/author/edit_author.html:57
 msgid "Wikipedia link:"
-msgstr ""
+msgstr "Wikipedia :"
 
 #: bookwyrm/templates/author/edit_author.html:63
 msgid "Birth date:"
-msgstr ""
+msgstr "Date de naissance :"
 
 #: bookwyrm/templates/author/edit_author.html:71
 msgid "Death date:"
-msgstr ""
+msgstr "Date de décès :"
 
 #: bookwyrm/templates/author/edit_author.html:79
 msgid "Author Identifiers"
-msgstr ""
+msgstr "Identifiants de l’auteur ou autrice"
 
 #: bookwyrm/templates/author/edit_author.html:81
 msgid "Openlibrary key:"
-msgstr ""
+msgstr "Clé Openlibrary :"
 
 #: bookwyrm/templates/author/edit_author.html:89
 #: bookwyrm/templates/book/edit_book.html:293
 msgid "Inventaire ID:"
-msgstr ""
+msgstr "Identifiant Inventaire :"
 
 #: bookwyrm/templates/author/edit_author.html:97
 msgid "Librarything key:"
-msgstr ""
+msgstr "Clé Librarything :"
 
 #: bookwyrm/templates/author/edit_author.html:105
 msgid "Goodreads key:"
-msgstr ""
+msgstr "Clé Goodreads :"
 
 #: bookwyrm/templates/author/edit_author.html:116
 #: bookwyrm/templates/book/book.html:124
@@ -246,7 +266,7 @@ msgstr ""
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:34
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:38
 msgid "Save"
-msgstr ""
+msgstr "Enregistrer"
 
 #: bookwyrm/templates/author/edit_author.html:117
 #: bookwyrm/templates/book/book.html:125 bookwyrm/templates/book/book.html:174
@@ -262,98 +282,98 @@ msgstr ""
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:35
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28
 msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
 
 #: bookwyrm/templates/book/book.html:31
 #: bookwyrm/templates/discover/large-book.html:25
 #: bookwyrm/templates/discover/small-book.html:19
 msgid "by"
-msgstr ""
+msgstr "par"
 
 #: bookwyrm/templates/book/book.html:39 bookwyrm/templates/book/book.html:40
 msgid "Edit Book"
-msgstr ""
+msgstr "Modifier le livre"
 
 #: bookwyrm/templates/book/book.html:57
 #: bookwyrm/templates/book/cover_modal.html:5
 msgid "Add cover"
-msgstr ""
+msgstr "Ajouter une couverture"
 
 #: bookwyrm/templates/book/book.html:61
 msgid "Failed to load cover"
-msgstr ""
+msgstr "La couverture n’a pu être chargée"
 
 #: bookwyrm/templates/book/book.html:101
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "(%(review_count)s critique)"
+msgstr[1] "(%(review_count)s critiques)"
 
 #: bookwyrm/templates/book/book.html:113
 msgid "Add Description"
-msgstr ""
+msgstr "Ajouter une description"
 
 #: bookwyrm/templates/book/book.html:120
 #: bookwyrm/templates/book/edit_book.html:136
 #: bookwyrm/templates/lists/form.html:12
 msgid "Description:"
-msgstr ""
+msgstr "Description :"
 
 #: bookwyrm/templates/book/book.html:134
 #, python-format
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
-msgstr ""
+msgstr "<a href=\"%(path)s/editions\">%(count)s éditions</a>"
 
 #: bookwyrm/templates/book/book.html:142
 #, python-format
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
-msgstr ""
+msgstr "Cette édition est sur votre étagère <a href=\"%(path)s\">%(shelf_name)s</a>."
 
 #: bookwyrm/templates/book/book.html:148
 #, python-format
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
-msgstr ""
+msgstr "Une <a href=\"%(book_path)s\">édition différente</a> de ce livre existe sur votre étagère <a href=\"%(shelf_path)s\">%(shelf_name)s</a>."
 
 #: bookwyrm/templates/book/book.html:159
 msgid "Your reading activity"
-msgstr ""
+msgstr "Votre activité de lecture"
 
 #: bookwyrm/templates/book/book.html:162
 msgid "Add read dates"
-msgstr ""
+msgstr "Ajouter des dates de lecture"
 
 #: bookwyrm/templates/book/book.html:171
 msgid "Create"
-msgstr ""
+msgstr "Créer"
 
 #: bookwyrm/templates/book/book.html:181
 msgid "You don't have any reading activity for this book."
-msgstr ""
+msgstr "Vous n’avez aucune activité de lecture pour ce livre"
 
 #: bookwyrm/templates/book/book.html:200
 msgid "Reviews"
-msgstr ""
+msgstr "Critiques"
 
 #: bookwyrm/templates/book/book.html:205
 msgid "Your reviews"
-msgstr ""
+msgstr "Vos critiques"
 
 #: bookwyrm/templates/book/book.html:211
 msgid "Your comments"
-msgstr ""
+msgstr "Vos commentaires"
 
 #: bookwyrm/templates/book/book.html:217
 msgid "Your quotes"
-msgstr ""
+msgstr "Vos citations"
 
 #: bookwyrm/templates/book/book.html:253
 msgid "Subjects"
-msgstr ""
+msgstr "Sujets"
 
 #: bookwyrm/templates/book/book.html:265
 msgid "Places"
-msgstr ""
+msgstr "Lieux"
 
 #: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:61
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
@@ -361,239 +381,239 @@ msgstr ""
 #: bookwyrm/templates/search/layout.html:50
 #: bookwyrm/templates/user/layout.html:68
 msgid "Lists"
-msgstr ""
+msgstr "Listes"
 
 #: bookwyrm/templates/book/book.html:287
 msgid "Add to list"
-msgstr ""
+msgstr "Ajouter à la liste"
 
 #: bookwyrm/templates/book/book.html:297
 #: bookwyrm/templates/book/cover_modal.html:31
 #: bookwyrm/templates/lists/list.html:179
 msgid "Add"
-msgstr ""
+msgstr "Ajouter"
 
 #: bookwyrm/templates/book/book_identifiers.html:7
 msgid "ISBN:"
-msgstr ""
+msgstr "ISBN :"
 
 #: bookwyrm/templates/book/book_identifiers.html:14
 #: bookwyrm/templates/book/edit_book.html:301
 msgid "OCLC Number:"
-msgstr ""
+msgstr "Numéro OCLC :"
 
 #: bookwyrm/templates/book/book_identifiers.html:21
 #: bookwyrm/templates/book/edit_book.html:309
 msgid "ASIN:"
-msgstr ""
+msgstr "ASIN :"
 
 #: bookwyrm/templates/book/cover_modal.html:17
 #: bookwyrm/templates/book/edit_book.html:229
 msgid "Upload cover:"
-msgstr ""
+msgstr "Charger une couverture :"
 
 #: bookwyrm/templates/book/cover_modal.html:23
 #: bookwyrm/templates/book/edit_book.html:235
 msgid "Load cover from url:"
-msgstr ""
+msgstr "Charger la couverture depuis une URL :"
 
 #: bookwyrm/templates/book/edit_book.html:5
 #: bookwyrm/templates/book/edit_book.html:11
 #, python-format
 msgid "Edit \"%(book_title)s\""
-msgstr ""
+msgstr "Modifier « %(book_title)s »"
 
 #: bookwyrm/templates/book/edit_book.html:5
 #: bookwyrm/templates/book/edit_book.html:13
 msgid "Add Book"
-msgstr ""
+msgstr "Ajouter un livre"
 
 #: bookwyrm/templates/book/edit_book.html:54
 msgid "Confirm Book Info"
-msgstr ""
+msgstr "Confirmer les informations de ce livre"
 
 #: bookwyrm/templates/book/edit_book.html:62
 #, python-format
 msgid "Is \"%(name)s\" an existing author?"
-msgstr ""
+msgstr "Est‑ce que l’auteur/autrice « %(name)s » existe déjà ?"
 
 #: bookwyrm/templates/book/edit_book.html:71
 #, python-format
 msgid "Author of <em>%(book_title)s</em>"
-msgstr ""
+msgstr "Auteur/autrice de <em>%(book_title)s</em>"
 
 #: bookwyrm/templates/book/edit_book.html:75
 msgid "This is a new author"
-msgstr ""
+msgstr "Il s’agit d’un nouvel auteur ou d’une nouvelle autrice."
 
 #: bookwyrm/templates/book/edit_book.html:82
 #, python-format
 msgid "Creating a new author: %(name)s"
-msgstr ""
+msgstr "Création d’un nouvel auteur/autrice : %(name)s"
 
 #: bookwyrm/templates/book/edit_book.html:89
 msgid "Is this an edition of an existing work?"
-msgstr ""
+msgstr "Est‑ce l’édition d’un ouvrage existant ?"
 
 #: bookwyrm/templates/book/edit_book.html:97
 msgid "This is a new work"
-msgstr ""
+msgstr "Il s’agit d’un nouvel ouvrage."
 
 #: bookwyrm/templates/book/edit_book.html:104
 #: bookwyrm/templates/password_reset.html:30
 msgid "Confirm"
-msgstr ""
+msgstr "Confirmer"
 
 #: bookwyrm/templates/book/edit_book.html:106
 #: bookwyrm/templates/feed/status.html:8
 msgid "Back"
-msgstr ""
+msgstr "Retour"
 
 #: bookwyrm/templates/book/edit_book.html:120
 msgid "Title:"
-msgstr ""
+msgstr "Titre :"
 
 #: bookwyrm/templates/book/edit_book.html:128
 msgid "Subtitle:"
-msgstr ""
+msgstr "Sous‑titre :"
 
 #: bookwyrm/templates/book/edit_book.html:144
 msgid "Series:"
-msgstr ""
+msgstr "Série :"
 
 #: bookwyrm/templates/book/edit_book.html:152
 msgid "Series number:"
-msgstr ""
+msgstr "Numéro dans la série :"
 
 #: bookwyrm/templates/book/edit_book.html:160
 msgid "Languages:"
-msgstr ""
+msgstr "Langues :"
 
 #: bookwyrm/templates/book/edit_book.html:169
 msgid "Publisher:"
-msgstr ""
+msgstr "Éditeur :"
 
 #: bookwyrm/templates/book/edit_book.html:178
 msgid "First published date:"
-msgstr ""
+msgstr "Première date de publication :"
 
 #: bookwyrm/templates/book/edit_book.html:186
 msgid "Published date:"
-msgstr ""
+msgstr "Date de publication :"
 
 #: bookwyrm/templates/book/edit_book.html:195
 msgid "Authors"
-msgstr ""
+msgstr "Auteurs ou autrices"
 
 #: bookwyrm/templates/book/edit_book.html:202
 #, python-format
 msgid "Remove %(name)s"
-msgstr ""
+msgstr "Retirer %(name)s"
 
 #: bookwyrm/templates/book/edit_book.html:205
 #, python-format
 msgid "Author page for %(name)s"
-msgstr ""
+msgstr "Page de %(name)s"
 
 #: bookwyrm/templates/book/edit_book.html:212
 msgid "Add Authors:"
-msgstr ""
+msgstr "Ajouter des auteurs ou autrices :"
 
 #: bookwyrm/templates/book/edit_book.html:213
 msgid "John Doe, Jane Smith"
-msgstr ""
+msgstr "Claude Dupont, Dominique Durand"
 
 #: bookwyrm/templates/book/edit_book.html:220
 #: bookwyrm/templates/user/shelf/shelf.html:78
 msgid "Cover"
-msgstr ""
+msgstr "Couverture"
 
 #: bookwyrm/templates/book/edit_book.html:248
 msgid "Physical Properties"
-msgstr ""
+msgstr "Propriétés physiques"
 
 #: bookwyrm/templates/book/edit_book.html:250
 #: bookwyrm/templates/book/format_filter.html:5
 msgid "Format:"
-msgstr ""
+msgstr "Format :"
 
 #: bookwyrm/templates/book/edit_book.html:258
 msgid "Pages:"
-msgstr ""
+msgstr "Pages :"
 
 #: bookwyrm/templates/book/edit_book.html:267
 msgid "Book Identifiers"
-msgstr ""
+msgstr "Identifiants du livre"
 
 #: bookwyrm/templates/book/edit_book.html:269
 msgid "ISBN 13:"
-msgstr ""
+msgstr "ISBN 13 :"
 
 #: bookwyrm/templates/book/edit_book.html:277
 msgid "ISBN 10:"
-msgstr ""
+msgstr "ISBN 10 :"
 
 #: bookwyrm/templates/book/edit_book.html:285
 msgid "Openlibrary ID:"
-msgstr ""
+msgstr "Identifiant Openlibrary :"
 
 #: bookwyrm/templates/book/editions.html:4
 #, python-format
 msgid "Editions of %(book_title)s"
-msgstr ""
+msgstr "Éditions de %(book_title)s"
 
 #: bookwyrm/templates/book/editions.html:8
 #, python-format
 msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
-msgstr ""
+msgstr "Éditions de <a href=\"%(work_path)s\">« %(work_title)s »</a>"
 
 #: bookwyrm/templates/book/format_filter.html:8
 #: bookwyrm/templates/book/language_filter.html:8
 msgid "Any"
-msgstr ""
+msgstr "Tou(te)s"
 
 #: bookwyrm/templates/book/language_filter.html:5
 msgid "Language:"
-msgstr ""
+msgstr "Langue :"
 
 #: bookwyrm/templates/book/publisher_info.html:22
 #, python-format
 msgid "%(format)s"
-msgstr ""
+msgstr "%(format)s"
 
 #: bookwyrm/templates/book/publisher_info.html:24
 #, python-format
 msgid "%(format)s, %(pages)s pages"
-msgstr ""
+msgstr "%(format)s, %(pages)s pages"
 
 #: bookwyrm/templates/book/publisher_info.html:26
 #, python-format
 msgid "%(pages)s pages"
-msgstr ""
+msgstr "%(pages)s pages"
 
 #: bookwyrm/templates/book/publisher_info.html:38
 #, python-format
 msgid "%(languages)s language"
-msgstr ""
+msgstr "Langue : %(languages)s"
 
 #: bookwyrm/templates/book/publisher_info.html:64
 #, python-format
 msgid "Published %(date)s by %(publisher)s."
-msgstr ""
+msgstr "Publié %(date)s par %(publisher)s."
 
 #: bookwyrm/templates/book/publisher_info.html:66
 #, python-format
 msgid "Published %(date)s"
-msgstr ""
+msgstr "Publié %(date)s"
 
 #: bookwyrm/templates/book/publisher_info.html:68
 #, python-format
 msgid "Published by %(publisher)s."
-msgstr ""
+msgstr "Publié par %(publisher)s."
 
 #: bookwyrm/templates/book/rating.html:13
 msgid "rated it"
-msgstr ""
+msgstr "l’a noté"
 
 #: bookwyrm/templates/components/inline_form.html:8
 #: bookwyrm/templates/components/modal.html:11
@@ -603,202 +623,202 @@ msgstr ""
 #: bookwyrm/templates/search/book.html:32
 #: bookwyrm/templates/snippets/announcement.html:18
 msgid "Close"
-msgstr ""
+msgstr "Fermer"
 
 #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8
 msgid "Compose status"
-msgstr ""
+msgstr "Rédiger un statut"
 
 #: bookwyrm/templates/directory/community_filter.html:5
 msgid "Community"
-msgstr ""
+msgstr "Communauté"
 
 #: bookwyrm/templates/directory/community_filter.html:8
 msgid "Local users"
-msgstr ""
+msgstr "Comptes locaux"
 
 #: bookwyrm/templates/directory/community_filter.html:12
 msgid "Federated community"
-msgstr ""
+msgstr "Communauté fédérée"
 
 #: bookwyrm/templates/directory/directory.html:4
 #: bookwyrm/templates/directory/directory.html:9
 #: bookwyrm/templates/layout.html:64
 msgid "Directory"
-msgstr ""
+msgstr "Répertoire"
 
 #: bookwyrm/templates/directory/directory.html:17
 msgid "Make your profile discoverable to other BookWyrm users."
-msgstr ""
+msgstr "Autoriser d’autres utilisateurs ou utilisatrices de BookWyrm à découvrir votre profil."
 
 #: bookwyrm/templates/directory/directory.html:24
 #, python-format
 msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
-msgstr ""
+msgstr "Vous pouvez décider de ne plus y figurer à n’importe quel moment depuis vos <a href=\"%(path)s\">paramètres de profil.</a>"
 
 #: bookwyrm/templates/directory/directory.html:29
 #: bookwyrm/templates/snippets/announcement.html:34
 #: bookwyrm/templates/snippets/goal_card.html:22
 msgid "Dismiss message"
-msgstr ""
+msgstr "Fermer le message"
 
 #: bookwyrm/templates/directory/sort_filter.html:5
 msgid "Order by"
-msgstr ""
+msgstr "Trier par"
 
 #: bookwyrm/templates/directory/sort_filter.html:8
 msgid "Suggested"
-msgstr ""
+msgstr "Suggéré"
 
 #: bookwyrm/templates/directory/sort_filter.html:9
 msgid "Recently active"
-msgstr ""
+msgstr "Actif récemment"
 
 #: bookwyrm/templates/directory/user_card.html:33
 msgid "follower you follow"
 msgid_plural "followers you follow"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "compte que vous suivez"
+msgstr[1] "comptes que vous suivez"
 
 #: bookwyrm/templates/directory/user_card.html:40
 msgid "book on your shelves"
 msgid_plural "books on your shelves"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "livre sur vos étagères"
+msgstr[1] "livres sur vos étagères"
 
 #: bookwyrm/templates/directory/user_card.html:48
 msgid "posts"
-msgstr ""
+msgstr "publications"
 
 #: bookwyrm/templates/directory/user_card.html:54
 msgid "last active"
-msgstr ""
+msgstr "dernière activité"
 
 #: bookwyrm/templates/directory/user_type_filter.html:5
 msgid "User type"
-msgstr ""
+msgstr "Type de compte"
 
 #: bookwyrm/templates/directory/user_type_filter.html:8
 msgid "BookWyrm users"
-msgstr ""
+msgstr "Comptes BookWyrm"
 
 #: bookwyrm/templates/directory/user_type_filter.html:12
 msgid "All known users"
-msgstr ""
+msgstr "Tous les comptes connus"
 
 #: bookwyrm/templates/discover/about.html:7
 #, python-format
 msgid "About %(site_name)s"
-msgstr ""
+msgstr "À propos de %(site_name)s"
 
 #: bookwyrm/templates/discover/about.html:10
 #: bookwyrm/templates/discover/about.html:20
 msgid "Code of Conduct"
-msgstr ""
+msgstr "Code de conduite"
 
 #: bookwyrm/templates/discover/about.html:13
 #: bookwyrm/templates/discover/about.html:29
 msgid "Privacy Policy"
-msgstr ""
+msgstr "Politique de vie privée"
 
 #: bookwyrm/templates/discover/discover.html:6
 msgid "Recent Books"
-msgstr ""
+msgstr "Livres récents"
 
 #: bookwyrm/templates/discover/landing_layout.html:5
 #: bookwyrm/templates/get_started/layout.html:4
 msgid "Welcome"
-msgstr ""
+msgstr "Bienvenue"
 
 #: bookwyrm/templates/discover/landing_layout.html:17
 msgid "Decentralized"
-msgstr ""
+msgstr "Décentralisé"
 
 #: bookwyrm/templates/discover/landing_layout.html:23
 msgid "Friendly"
-msgstr ""
+msgstr "Sympa"
 
 #: bookwyrm/templates/discover/landing_layout.html:29
 msgid "Anti-Corporate"
-msgstr ""
+msgstr "Anti‑commercial"
 
 #: bookwyrm/templates/discover/landing_layout.html:44
 #, python-format
 msgid "Join %(name)s"
-msgstr ""
+msgstr "Rejoignez %(name)s"
 
 #: bookwyrm/templates/discover/landing_layout.html:51
 #: bookwyrm/templates/login.html:51
 msgid "This instance is closed"
-msgstr ""
+msgstr "Cette instance est fermée"
 
 #: bookwyrm/templates/discover/landing_layout.html:57
 msgid "Thank you! Your request has been received."
-msgstr ""
+msgstr "Merci ! Votre demande a bien été reçue."
 
 #: bookwyrm/templates/discover/landing_layout.html:60
 msgid "Request an Invitation"
-msgstr ""
+msgstr "Demander une invitation"
 
 #: bookwyrm/templates/discover/landing_layout.html:64
 #: bookwyrm/templates/password_reset_request.html:18
 #: bookwyrm/templates/preferences/edit_user.html:38
 #: bookwyrm/templates/snippets/register_form.html:13
 msgid "Email address:"
-msgstr ""
+msgstr "Adresse email :"
 
 #: bookwyrm/templates/discover/landing_layout.html:70
 #: bookwyrm/templates/moderation/report_modal.html:33
 msgid "Submit"
-msgstr ""
+msgstr "Valider"
 
 #: bookwyrm/templates/discover/landing_layout.html:79
 msgid "Your Account"
-msgstr ""
+msgstr "Votre compte"
 
 #: bookwyrm/templates/email/html_layout.html:15
 #: bookwyrm/templates/email/text_layout.html:2
 msgid "Hi there,"
-msgstr ""
+msgstr "Bien le bonjour,"
 
 #: bookwyrm/templates/email/html_layout.html:21
 #, python-format
 msgid "BookWyrm hosted on <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a>"
-msgstr ""
+msgstr "BookWyrm, hébergé par <a style=\"color: #3273dc;\" href=\"https://%(domain)s\">%(site_name)s</a>"
 
 #: bookwyrm/templates/email/html_layout.html:23
 msgid "Email preference"
-msgstr ""
+msgstr "Paramètres d’email"
 
 #: bookwyrm/templates/email/invite/html_content.html:6
 #: bookwyrm/templates/email/invite/subject.html:2
 #, python-format
 msgid "You're invited to join %(site_name)s!"
-msgstr ""
+msgstr "Vous avez reçu une invitation à rejoindre %(site_name)s !"
 
 #: bookwyrm/templates/email/invite/html_content.html:9
 msgid "Join Now"
-msgstr ""
+msgstr "S’enregistrer maintenant"
 
 #: bookwyrm/templates/email/invite/html_content.html:15
 #, python-format
 msgid "Learn more <a href=\"https://%(domain)s%(about_path)s\">about this instance</a>."
-msgstr ""
+msgstr "En savoir plus sur <a href=\"https://%(domain)s%(about_path)s\">cette instance</a>."
 
 #: bookwyrm/templates/email/invite/text_content.html:4
 #, python-format
 msgid "You're invited to join %(site_name)s! Click the link below to create an account."
-msgstr ""
+msgstr "Vous avez reçu une invitation à rejoindre %(site_name)s ! Cliquez le lien suivant pour créer un compte."
 
 #: bookwyrm/templates/email/invite/text_content.html:8
 msgid "Learn more about this instance:"
-msgstr ""
+msgstr "En savoir plus sur cete instance :"
 
 #: bookwyrm/templates/email/password_reset/html_content.html:6
 #: bookwyrm/templates/email/password_reset/text_content.html:4
 #, python-format
 msgid "You requested to reset your %(site_name)s password. Click the link below to set a new password and log in to your account."
-msgstr ""
+msgstr "Une demande de réinitialisation de votre mot de passe sur <i>%(site_name)s</i> a été initialisée. Cliquez le lien suivant pour définir un nouveau mot de passe et vous connecter à votre compte."
 
 #: bookwyrm/templates/email/password_reset/html_content.html:9
 #: bookwyrm/templates/password_reset.html:4
@@ -806,148 +826,148 @@ msgstr ""
 #: bookwyrm/templates/password_reset_request.html:4
 #: bookwyrm/templates/password_reset_request.html:10
 msgid "Reset Password"
-msgstr ""
+msgstr "Changez le mot de passe"
 
 #: bookwyrm/templates/email/password_reset/html_content.html:13
 #: bookwyrm/templates/email/password_reset/text_content.html:8
 msgid "If you didn't request to reset your password, you can ignore this email."
-msgstr ""
+msgstr "Si vous n’avez pas demandé la réinitialisation de votre mot de passe, vous pouvez ignorer cet email."
 
 #: bookwyrm/templates/email/password_reset/subject.html:2
 #, python-format
 msgid "Reset your %(site_name)s password"
-msgstr ""
+msgstr "Réinitialiser votre mot de passe sur %(site_name)s"
 
 #: bookwyrm/templates/feed/direct_messages.html:8
 #, python-format
 msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
-msgstr ""
+msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
 #: bookwyrm/templates/layout.html:92
 msgid "Direct Messages"
-msgstr ""
+msgstr "Messages directs"
 
 #: bookwyrm/templates/feed/direct_messages.html:13
 msgid "All messages"
-msgstr ""
+msgstr "Tous les messages"
 
 #: bookwyrm/templates/feed/direct_messages.html:22
 msgid "You have no messages right now."
-msgstr ""
+msgstr "Vous n’avez aucun message pour l’instant."
 
 #: bookwyrm/templates/feed/feed.html:8
 msgid "Home Timeline"
-msgstr ""
+msgstr "Mon fil d’actualité"
 
 #: bookwyrm/templates/feed/feed.html:10
 msgid "Local Timeline"
-msgstr ""
+msgstr "Fil d’actualité local"
 
 #: bookwyrm/templates/feed/feed.html:12
 msgid "Federated Timeline"
-msgstr ""
+msgstr "Fil d’actualité des instances fédérées"
 
 #: bookwyrm/templates/feed/feed.html:18
 msgid "Home"
-msgstr ""
+msgstr "Accueil"
 
 #: bookwyrm/templates/feed/feed.html:21
 msgid "Local"
-msgstr ""
+msgstr "Local"
 
 #: bookwyrm/templates/feed/feed.html:24
 #: bookwyrm/templates/settings/edit_server.html:40
 msgid "Federated"
-msgstr ""
+msgstr "Fédéré"
 
 #: bookwyrm/templates/feed/feed.html:32
 #, python-format
 msgid "load <span data-poll=\"stream/%(tab)s\">0</span> unread status(es)"
-msgstr ""
+msgstr "charger le(s) <span data-poll=\"stream/%(tab)s\">0</span> statut(s) non lu(s)"
 
 #: bookwyrm/templates/feed/feed.html:47
 msgid "There aren't any activities right now! Try following a user to get started"
-msgstr ""
+msgstr "Aucune activité pour l’instant ! Abonnez‑vous à quelqu’un pour commencer"
 
 #: bookwyrm/templates/feed/feed.html:55
 #: bookwyrm/templates/get_started/users.html:6
 msgid "Who to follow"
-msgstr ""
+msgstr "À qui s’abonner"
 
 #: bookwyrm/templates/feed/feed_layout.html:4
 msgid "Updates"
-msgstr ""
+msgstr "Mises à jour"
 
 #: bookwyrm/templates/feed/feed_layout.html:10
 #: bookwyrm/templates/user/shelf/books_header.html:3
 msgid "Your books"
-msgstr ""
+msgstr "Vos livres"
 
 #: bookwyrm/templates/feed/feed_layout.html:12
 msgid "There are no books here right now! Try searching for a book to get started"
-msgstr ""
+msgstr "Aucun livre ici pour l’instant ! Cherchez un livre pour commencer"
 
 #: bookwyrm/templates/feed/feed_layout.html:23
 #: bookwyrm/templates/user/shelf/shelf.html:29
 msgid "To Read"
-msgstr ""
+msgstr "À lire"
 
 #: bookwyrm/templates/feed/feed_layout.html:24
 #: bookwyrm/templates/user/shelf/shelf.html:29
 msgid "Currently Reading"
-msgstr ""
+msgstr "Lectures en cours"
 
 #: bookwyrm/templates/feed/feed_layout.html:25
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
 #: bookwyrm/templates/user/shelf/shelf.html:29
 msgid "Read"
-msgstr ""
+msgstr "Lu"
 
 #: bookwyrm/templates/feed/feed_layout.html:87 bookwyrm/templates/goal.html:26
 #: bookwyrm/templates/snippets/goal_card.html:6
 #, python-format
 msgid "%(year)s Reading Goal"
-msgstr ""
+msgstr "Défi lecture pour %(year)s"
 
 #: bookwyrm/templates/feed/suggested_users.html:16
 #, python-format
 msgid "%(mutuals)s follower you follow"
 msgid_plural "%(mutuals)s followers you follow"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(mutuals)s abonné(e) que vous suivez"
+msgstr[1] "%(mutuals)s abonné(e)s que vous suivez"
 
 #: bookwyrm/templates/feed/suggested_users.html:19
 #, python-format
 msgid "%(shared_books)s book on your shelves"
 msgid_plural "%(shared_books)s books on your shelves"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(shared_books)s livre sur vos étagères"
+msgstr[1] "%(shared_books)s livres sur vos étagères"
 
 #: bookwyrm/templates/get_started/book_preview.html:6
 #, python-format
 msgid "Have you read %(book_title)s?"
-msgstr ""
+msgstr "Avez‑vous lu « <em>%(book_title)s</em> » ?"
 
 #: bookwyrm/templates/get_started/books.html:6
 msgid "What are you reading?"
-msgstr ""
+msgstr "Que lisez‑vous ?"
 
 #: bookwyrm/templates/get_started/books.html:9
 #: bookwyrm/templates/lists/list.html:135
 msgid "Search for a book"
-msgstr ""
+msgstr "Chercher un livre"
 
 #: bookwyrm/templates/get_started/books.html:11
 #: bookwyrm/templates/isbn_search_results.html:17
 #, python-format
 msgid "No books found for \"%(query)s\""
-msgstr ""
+msgstr "Aucun livre trouvé pour « %(query)s »"
 
 #: bookwyrm/templates/get_started/books.html:11
 #, python-format
 msgid "You can add books when you start using %(site_name)s."
-msgstr ""
+msgstr "Vous pourrez ajouter des livres lorsque vous commencerez à utiliser %(site_name)s."
 
 #: bookwyrm/templates/get_started/books.html:16
 #: bookwyrm/templates/get_started/books.html:17
@@ -958,280 +978,280 @@ msgstr ""
 #: bookwyrm/templates/search/layout.html:4
 #: bookwyrm/templates/search/layout.html:9
 msgid "Search"
-msgstr ""
+msgstr "Chercher"
 
 #: bookwyrm/templates/get_started/books.html:27
 msgid "Suggested Books"
-msgstr ""
+msgstr "Suggérer des livres"
 
 #: bookwyrm/templates/get_started/books.html:46
 #, python-format
 msgid "Popular on %(site_name)s"
-msgstr ""
+msgstr "Populaire sur %(site_name)s"
 
 #: bookwyrm/templates/get_started/books.html:58
 #: bookwyrm/templates/lists/list.html:152
 msgid "No books found"
-msgstr ""
+msgstr "Aucun livre trouvé"
 
 #: bookwyrm/templates/get_started/books.html:63
 #: bookwyrm/templates/get_started/profile.html:54
 msgid "Save &amp; continue"
-msgstr ""
+msgstr "Enregistrer &amp; continuer"
 
 #: bookwyrm/templates/get_started/layout.html:14
 #, python-format
 msgid "Welcome to %(site_name)s!"
-msgstr ""
+msgstr "Bienvenue sur %(site_name)s !"
 
 #: bookwyrm/templates/get_started/layout.html:16
 msgid "These are some first steps to get you started."
-msgstr ""
+msgstr "Voici quelques étapes pour commencer votre profil."
 
 #: bookwyrm/templates/get_started/layout.html:30
 #: bookwyrm/templates/get_started/profile.html:6
 msgid "Create your profile"
-msgstr ""
+msgstr "Créez votre profil"
 
 #: bookwyrm/templates/get_started/layout.html:34
 msgid "Add books"
-msgstr ""
+msgstr "Ajoutez des livres"
 
 #: bookwyrm/templates/get_started/layout.html:38
 msgid "Find friends"
-msgstr ""
+msgstr "Établissez des contacts"
 
 #: bookwyrm/templates/get_started/layout.html:44
 msgid "Skip this step"
-msgstr ""
+msgstr "Passer cette étape"
 
 #: bookwyrm/templates/get_started/layout.html:48
 msgid "Finish"
-msgstr ""
+msgstr "Terminer"
 
 #: bookwyrm/templates/get_started/profile.html:15
 #: bookwyrm/templates/preferences/edit_user.html:24
 msgid "Display name:"
-msgstr ""
+msgstr "Nom affiché :"
 
 #: bookwyrm/templates/get_started/profile.html:22
 #: bookwyrm/templates/preferences/edit_user.html:31
 msgid "Summary:"
-msgstr ""
+msgstr "Résumé :"
 
 #: bookwyrm/templates/get_started/profile.html:23
 msgid "A little bit about you"
-msgstr ""
+msgstr "Parlez‑nous de vous"
 
 #: bookwyrm/templates/get_started/profile.html:32
 #: bookwyrm/templates/preferences/edit_user.html:17
 msgid "Avatar:"
-msgstr ""
+msgstr "Avatar :"
 
 #: bookwyrm/templates/get_started/profile.html:42
 #: bookwyrm/templates/preferences/edit_user.html:52
 msgid "Manually approve followers:"
-msgstr ""
+msgstr "Autoriser les abonnements manuellement :"
 
 #: bookwyrm/templates/get_started/profile.html:48
 #: bookwyrm/templates/preferences/edit_user.html:58
 msgid "Show this account in suggested users:"
-msgstr ""
+msgstr "Afficher ce compte dans ceux suggérés :"
 
 #: bookwyrm/templates/get_started/profile.html:52
 msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users."
-msgstr ""
+msgstr "Votre compte sera listé dans le répertoire et pourra être recommandé à d’autres utilisateurs ou utilisatrices de BookWyrm."
 
 #: bookwyrm/templates/get_started/users.html:11
 msgid "Search for a user"
-msgstr ""
+msgstr "Chercher un compte"
 
 #: bookwyrm/templates/get_started/users.html:13
 #, python-format
 msgid "No users found for \"%(query)s\""
-msgstr ""
+msgstr "Aucun compte trouvé pour « %(query)s »"
 
 #: bookwyrm/templates/goal.html:7
 #, python-format
 msgid "%(year)s Reading Progress"
-msgstr ""
+msgstr "Progression de lecture pour %(year)s"
 
 #: bookwyrm/templates/goal.html:11
 msgid "Edit Goal"
-msgstr ""
+msgstr "Modifier le défi"
 
 #: bookwyrm/templates/goal.html:30
 #: bookwyrm/templates/snippets/goal_card.html:13
 #, python-format
 msgid "Set a goal for how many books you'll finish reading in %(year)s, and track your progress throughout the year."
-msgstr ""
+msgstr "Définissez un nombre de livre à lire comme objectif pour %(year)s, et suivezvotre progression au fil de l’année."
 
 #: bookwyrm/templates/goal.html:39
 #, python-format
 msgid "%(name)s hasn't set a reading goal for %(year)s."
-msgstr ""
+msgstr "%(name)s n’a aucun défi lecture pour %(year)s."
 
 #: bookwyrm/templates/goal.html:51
 #, python-format
 msgid "Your %(year)s Books"
-msgstr ""
+msgstr "Vos livres en %(year)s"
 
 #: bookwyrm/templates/goal.html:53
 #, python-format
 msgid "%(username)s's %(year)s Books"
-msgstr ""
+msgstr "Livres de %(username)s en %(year)s"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
 #: bookwyrm/templates/user/shelf/shelf.html:40
 msgid "Import Books"
-msgstr ""
+msgstr "Importer des livres"
 
 #: bookwyrm/templates/import.html:16
 msgid "Data source:"
-msgstr ""
+msgstr "Source de données :"
 
 #: bookwyrm/templates/import.html:32
 msgid "Data file:"
-msgstr ""
+msgstr "Fichier de données :"
 
 #: bookwyrm/templates/import.html:40
 msgid "Include reviews"
-msgstr ""
+msgstr "Importer les critiques"
 
 #: bookwyrm/templates/import.html:45
 msgid "Privacy setting for imported reviews:"
-msgstr ""
+msgstr "Confidentialité des critiques importées :"
 
 #: bookwyrm/templates/import.html:51
 #: bookwyrm/templates/settings/server_blocklist.html:64
 msgid "Import"
-msgstr ""
+msgstr "Importer"
 
 #: bookwyrm/templates/import.html:56
 msgid "Recent Imports"
-msgstr ""
+msgstr "Importations récentes"
 
 #: bookwyrm/templates/import.html:58
 msgid "No recent imports"
-msgstr ""
+msgstr "Aucune importation récente"
 
 #: bookwyrm/templates/import_status.html:5
 #: bookwyrm/templates/import_status.html:9
 msgid "Import Status"
-msgstr ""
+msgstr "Statut de l’importation"
 
 #: bookwyrm/templates/import_status.html:13
 msgid "Import started:"
-msgstr ""
+msgstr "Début de l’importation :"
 
 #: bookwyrm/templates/import_status.html:18
 msgid "Import completed:"
-msgstr ""
+msgstr "Fin de l’importation :"
 
 #: bookwyrm/templates/import_status.html:23
 msgid "TASK FAILED"
-msgstr ""
+msgstr "la tâche a échoué"
 
 #: bookwyrm/templates/import_status.html:30
 msgid "Import still in progress."
-msgstr ""
+msgstr "L’importation est toujours en cours"
 
 #: bookwyrm/templates/import_status.html:32
 msgid "(Hit reload to update!)"
-msgstr ""
+msgstr "(Rechargez la page pour la mettre à jour !)"
 
 #: bookwyrm/templates/import_status.html:39
 msgid "Failed to load"
-msgstr ""
+msgstr "Éléments non importés"
 
 #: bookwyrm/templates/import_status.html:48
 #, python-format
 msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import."
-msgstr ""
+msgstr "Sauter en bas de liste pour sélectionner les %(failed_count)s items n’ayant pu être importés."
 
 #: bookwyrm/templates/import_status.html:60
 #, python-format
 msgid "Line %(index)s: <strong>%(title)s</strong> by %(author)s"
-msgstr ""
+msgstr "Ligne %(index)s : <strong>%(title)s</strong> par %(author)s"
 
 #: bookwyrm/templates/import_status.html:80
 msgid "Select all"
-msgstr ""
+msgstr "Tout sélectionner"
 
 #: bookwyrm/templates/import_status.html:83
 msgid "Retry items"
-msgstr ""
+msgstr "Réessayer l’importation de ces éléments"
 
 #: bookwyrm/templates/import_status.html:109
 msgid "Successfully imported"
-msgstr ""
+msgstr "Importation réussie"
 
 #: bookwyrm/templates/import_status.html:113
 msgid "Book"
-msgstr ""
+msgstr "Livre"
 
 #: bookwyrm/templates/import_status.html:116
 #: bookwyrm/templates/snippets/create_status_form.html:13
 #: bookwyrm/templates/user/shelf/shelf.html:79
 #: bookwyrm/templates/user/shelf/shelf.html:99
 msgid "Title"
-msgstr ""
+msgstr "Titre"
 
 #: bookwyrm/templates/import_status.html:119
 #: bookwyrm/templates/user/shelf/shelf.html:80
 #: bookwyrm/templates/user/shelf/shelf.html:102
 msgid "Author"
-msgstr ""
+msgstr "Auteur/autrice"
 
 #: bookwyrm/templates/import_status.html:142
 msgid "Imported"
-msgstr ""
+msgstr "Importé"
 
 #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12
 #: bookwyrm/templates/login.html:46
 msgid "Create an Account"
-msgstr ""
+msgstr "Créer un compte"
 
 #: bookwyrm/templates/invite.html:21
 msgid "Permission Denied"
-msgstr ""
+msgstr "Autorisation refusée"
 
 #: bookwyrm/templates/invite.html:22
 msgid "Sorry! This invite code is no longer valid."
-msgstr ""
+msgstr "Cette invitation n’est plus valide ; désolé !"
 
 #: bookwyrm/templates/isbn_search_results.html:4
 msgid "Search Results"
-msgstr ""
+msgstr "Résultats de recherche"
 
 #: bookwyrm/templates/isbn_search_results.html:9
 #, python-format
 msgid "Search Results for \"%(query)s\""
-msgstr ""
+msgstr "Résultats de recherche pour « %(query)s »"
 
 #: bookwyrm/templates/isbn_search_results.html:14
 msgid "Matching Books"
-msgstr ""
+msgstr "Livres correspondants"
 
 #: bookwyrm/templates/layout.html:33
 msgid "Search for a book or user"
-msgstr ""
+msgstr "Chercher un livre ou un compte"
 
 #: bookwyrm/templates/layout.html:47 bookwyrm/templates/layout.html:48
 msgid "Main navigation menu"
-msgstr ""
+msgstr "Menu de navigation principal "
 
 #: bookwyrm/templates/layout.html:58
 msgid "Feed"
-msgstr ""
+msgstr "Fil d’actualité"
 
 #: bookwyrm/templates/layout.html:87
 msgid "Your Books"
-msgstr ""
+msgstr "Vos Livres"
 
 #: bookwyrm/templates/layout.html:97
 msgid "Settings"
-msgstr ""
+msgstr "Paramètres"
 
 #: bookwyrm/templates/layout.html:106
 #: bookwyrm/templates/settings/admin_layout.html:31
@@ -1239,547 +1259,547 @@ msgstr ""
 #: bookwyrm/templates/settings/manage_invites.html:3
 #: bookwyrm/templates/settings/manage_invites.html:15
 msgid "Invites"
-msgstr ""
+msgstr "Invitations"
 
 #: bookwyrm/templates/layout.html:113
 msgid "Admin"
-msgstr ""
+msgstr "Admin"
 
 #: bookwyrm/templates/layout.html:120
 msgid "Log out"
-msgstr ""
+msgstr "Se déconnecter"
 
 #: bookwyrm/templates/layout.html:128 bookwyrm/templates/layout.html:129
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
-msgstr ""
+msgstr "Notifications"
 
 #: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
-msgstr ""
+msgstr "Nom du compte :"
 
 #: bookwyrm/templates/layout.html:156
 msgid "password"
-msgstr ""
+msgstr "Mot de passe"
 
 #: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
-msgstr ""
+msgstr "Mot de passe oublié ?"
 
 #: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
-msgstr ""
+msgstr "Se connecter"
 
 #: bookwyrm/templates/layout.html:168
 msgid "Join"
-msgstr ""
+msgstr "Rejoindre"
 
 #: bookwyrm/templates/layout.html:206
 msgid "About this server"
-msgstr ""
+msgstr "À propos de ce serveur"
 
 #: bookwyrm/templates/layout.html:210
 msgid "Contact site admin"
-msgstr ""
+msgstr "Contacter l’administrateur du site"
 
 #: bookwyrm/templates/layout.html:214
 msgid "Documentation"
-msgstr ""
+msgstr "Documentation"
 
 #: bookwyrm/templates/layout.html:221
 #, python-format
 msgid "Support %(site_name)s on <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
-msgstr ""
+msgstr "Soutenez %(site_name)s avec <a href=\"%(support_link)s\" target=\"_blank\">%(support_title)s</a>"
 
 #: bookwyrm/templates/layout.html:225
 msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
-msgstr ""
+msgstr "BookWyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports de bogues via <a href=\"https://github.com/mouse-reeve/bookwyrm\">GitHub</a>."
 
 #: bookwyrm/templates/lists/create_form.html:5
 #: bookwyrm/templates/lists/lists.html:20
 msgid "Create List"
-msgstr ""
+msgstr "Créer une liste"
 
 #: bookwyrm/templates/lists/created_text.html:5
 #, python-format
 msgid "Created and curated by <a href=\"%(path)s\">%(username)s</a>"
-msgstr ""
+msgstr "Créée et modérée par <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/lists/created_text.html:7
 #, python-format
 msgid "Created by <a href=\"%(path)s\">%(username)s</a>"
-msgstr ""
+msgstr "Créée par <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/lists/curate.html:8
 msgid "Pending Books"
-msgstr ""
+msgstr "Livres en attente de modération"
 
 #: bookwyrm/templates/lists/curate.html:11
 msgid "Go to list"
-msgstr ""
+msgstr "Aller à la liste"
 
 #: bookwyrm/templates/lists/curate.html:15
 msgid "You're all set!"
-msgstr ""
+msgstr "Aucun livre en attente de validation !"
 
 #: bookwyrm/templates/lists/curate.html:45
 msgid "Suggested by"
-msgstr ""
+msgstr "Suggéré par"
 
 #: bookwyrm/templates/lists/curate.html:57
 msgid "Approve"
-msgstr ""
+msgstr "Approuver"
 
 #: bookwyrm/templates/lists/curate.html:63
 msgid "Discard"
-msgstr ""
+msgstr "Rejeter"
 
 #: bookwyrm/templates/lists/edit_form.html:5
 #: bookwyrm/templates/lists/list_layout.html:16
 msgid "Edit List"
-msgstr ""
+msgstr "Modifier la liste"
 
 #: bookwyrm/templates/lists/form.html:18
 msgid "List curation:"
-msgstr ""
+msgstr "Modération de la liste :"
 
 #: bookwyrm/templates/lists/form.html:21
 msgid "Closed"
-msgstr ""
+msgstr "Fermée"
 
 #: bookwyrm/templates/lists/form.html:22
 msgid "Only you can add and remove books to this list"
-msgstr ""
+msgstr "Vous seulement pouvez ajouter ou retirer des livres dans cette liste"
 
 #: bookwyrm/templates/lists/form.html:26
 msgid "Curated"
-msgstr ""
+msgstr "Modérée"
 
 #: bookwyrm/templates/lists/form.html:27
 msgid "Anyone can suggest books, subject to your approval"
-msgstr ""
+msgstr "N’importe qui peut suggérer des livres, soumis à votre approbation"
 
 #: bookwyrm/templates/lists/form.html:31
 #: bookwyrm/templates/moderation/reports.html:25
 #: bookwyrm/templates/search/book.html:30
 #: bookwyrm/templates/snippets/announcement.html:16
 msgid "Open"
-msgstr ""
+msgstr "Ouverte"
 
 #: bookwyrm/templates/lists/form.html:32
 msgid "Anyone can add books to this list"
-msgstr ""
+msgstr "N’importe qui peut suggérer des livres"
 
 #: bookwyrm/templates/lists/list.html:20
 msgid "You successfully suggested a book for this list!"
-msgstr ""
+msgstr "Vous avez suggéré un livre à cette liste !"
 
 #: bookwyrm/templates/lists/list.html:22
 msgid "You successfully added a book to this list!"
-msgstr ""
+msgstr "Vous avez ajouté un livre à cette liste !"
 
 #: bookwyrm/templates/lists/list.html:28
 msgid "This list is currently empty"
-msgstr ""
+msgstr "Cette liste est actuellement vide"
 
 #: bookwyrm/templates/lists/list.html:66
 #, python-format
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
-msgstr ""
+msgstr "Ajouté par <a href=\"%(user_path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/lists/list.html:74
 msgid "List position"
-msgstr ""
+msgstr "Position"
 
 #: bookwyrm/templates/lists/list.html:81
 msgid "Set"
-msgstr ""
+msgstr "Appliquer"
 
 #: bookwyrm/templates/lists/list.html:89
 #: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
-msgstr ""
+msgstr "Retirer"
 
 #: bookwyrm/templates/lists/list.html:103
 #: bookwyrm/templates/lists/list.html:120
 msgid "Sort List"
-msgstr ""
+msgstr "Trier la liste"
 
 #: bookwyrm/templates/lists/list.html:113
 msgid "Direction"
-msgstr ""
+msgstr "Direction"
 
 #: bookwyrm/templates/lists/list.html:127
 msgid "Add Books"
-msgstr ""
+msgstr "Ajouter des livres"
 
 #: bookwyrm/templates/lists/list.html:129
 msgid "Suggest Books"
-msgstr ""
+msgstr "Suggérer des livres"
 
 #: bookwyrm/templates/lists/list.html:140
 msgid "search"
-msgstr ""
+msgstr "chercher"
 
 #: bookwyrm/templates/lists/list.html:146
 msgid "Clear search"
-msgstr ""
+msgstr "Vider la requête"
 
 #: bookwyrm/templates/lists/list.html:151
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
-msgstr ""
+msgstr "Aucun livre trouvé pour la requête « %(query)s »"
 
 #: bookwyrm/templates/lists/list.html:179
 msgid "Suggest"
-msgstr ""
+msgstr "Suggérer"
 
 #: bookwyrm/templates/lists/lists.html:14 bookwyrm/templates/user/lists.html:9
 msgid "Your Lists"
-msgstr ""
+msgstr "Vos listes"
 
 #: bookwyrm/templates/login.html:4
 msgid "Login"
-msgstr ""
+msgstr "Connexion"
 
 #: bookwyrm/templates/login.html:23 bookwyrm/templates/password_reset.html:17
 #: bookwyrm/templates/snippets/register_form.html:22
 msgid "Password:"
-msgstr ""
+msgstr "Mot de passe :"
 
 #: bookwyrm/templates/login.html:52
 msgid "Contact an administrator to get an invite"
-msgstr ""
+msgstr "Contacter un administrateur pour obtenir une invitation"
 
 #: bookwyrm/templates/login.html:63
 msgid "More about this site"
-msgstr ""
+msgstr "En savoir plus sur ce site"
 
 #: bookwyrm/templates/moderation/report.html:5
 #: bookwyrm/templates/moderation/report.html:6
 #: bookwyrm/templates/moderation/report_preview.html:6
 #, python-format
 msgid "Report #%(report_id)s: %(username)s"
-msgstr ""
+msgstr "Signalement #%(report_id)s : %(username)s"
 
 #: bookwyrm/templates/moderation/report.html:10
 msgid "Back to reports"
-msgstr ""
+msgstr "Retour aux signalements"
 
 #: bookwyrm/templates/moderation/report.html:22
 msgid "Moderator Comments"
-msgstr ""
+msgstr "Commentaires de l’équipe de modération"
 
 #: bookwyrm/templates/moderation/report.html:40
 #: bookwyrm/templates/snippets/create_status.html:28
 #: bookwyrm/templates/snippets/create_status_form.html:66
 msgid "Comment"
-msgstr ""
+msgstr "Commentaire"
 
 #: bookwyrm/templates/moderation/report.html:45
 msgid "Reported statuses"
-msgstr ""
+msgstr "Statuts signalés"
 
 #: bookwyrm/templates/moderation/report.html:47
 msgid "No statuses reported"
-msgstr ""
+msgstr "Aucun statut signalé"
 
 #: bookwyrm/templates/moderation/report.html:53
 msgid "Status has been deleted"
-msgstr ""
+msgstr "Le statut a été supprimé"
 
 #: bookwyrm/templates/moderation/report_modal.html:6
 #, python-format
 msgid "Report @%(username)s"
-msgstr ""
+msgstr "Signaler @%(username)s"
 
 #: bookwyrm/templates/moderation/report_modal.html:23
 #, python-format
 msgid "This report will be sent to %(site_name)s's moderators for review."
-msgstr ""
+msgstr "Ce signalement sera envoyé à l’équipe de modération de %(site_name)s pour traitement."
 
 #: bookwyrm/templates/moderation/report_modal.html:24
 msgid "More info about this report:"
-msgstr ""
+msgstr "En savoir plus sur ce signalement :"
 
 #: bookwyrm/templates/moderation/report_preview.html:13
 msgid "No notes provided"
-msgstr ""
+msgstr "Aucune note fournie"
 
 #: bookwyrm/templates/moderation/report_preview.html:20
 #, python-format
 msgid "Reported by <a href=\"%(path)s\">%(username)s</a>"
-msgstr ""
+msgstr "Signalé par <a href=\"%(path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/moderation/report_preview.html:30
 msgid "Re-open"
-msgstr ""
+msgstr "Réouvrir"
 
 #: bookwyrm/templates/moderation/report_preview.html:32
 msgid "Resolve"
-msgstr ""
+msgstr "Résoudre"
 
 #: bookwyrm/templates/moderation/reports.html:6
 #, python-format
 msgid "Reports: %(server_name)s"
-msgstr ""
+msgstr "Signalements : %(server_name)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
 #: bookwyrm/templates/moderation/reports.html:17
 #: bookwyrm/templates/settings/admin_layout.html:35
 msgid "Reports"
-msgstr ""
+msgstr "Signalements"
 
 #: bookwyrm/templates/moderation/reports.html:14
 #, python-format
 msgid "Reports: <small>%(server_name)s</small>"
-msgstr ""
+msgstr "Signalements: <small>%(server_name)s</small>"
 
 #: bookwyrm/templates/moderation/reports.html:28
 msgid "Resolved"
-msgstr ""
+msgstr "Résolus"
 
 #: bookwyrm/templates/moderation/reports.html:37
 msgid "No reports found."
-msgstr ""
+msgstr "Aucun signalement trouvé."
 
 #: bookwyrm/templates/notifications.html:16
 msgid "Delete notifications"
-msgstr ""
+msgstr "Supprimer les notifications"
 
 #: bookwyrm/templates/notifications.html:25
 msgid "All"
-msgstr ""
+msgstr "Toutes"
 
 #: bookwyrm/templates/notifications.html:29
 msgid "Mentions"
-msgstr ""
+msgstr "Mentions"
 
 #: bookwyrm/templates/notifications.html:70
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr ""
+msgstr "a ajouté votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:72
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
-msgstr ""
+msgstr "a ajouté votre <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:74
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr ""
+msgstr "a ajouté votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:76
 #, python-format
 msgid "favorited your <a href=\"%(related_path)s\">status</a>"
-msgstr ""
+msgstr "a ajouté votre <a href=\"%(related_path)s\">statut</a> à ses favoris"
 
 #: bookwyrm/templates/notifications.html:81
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr ""
+msgstr "vous a mentionné dans sa <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:83
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">comment on <em>%(book_title)s</em></a>"
-msgstr ""
+msgstr "vous a mentionné dans son <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:85
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr ""
+msgstr "vous a mentionné dans sa <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:87
 #, python-format
 msgid "mentioned you in a <a href=\"%(related_path)s\">status</a>"
-msgstr ""
+msgstr "vous a mentionné dans son <a href=\"%(related_path)s\">statut</a>"
 
 #: bookwyrm/templates/notifications.html:92
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr ""
+msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">critique de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:94
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
-msgstr ""
+msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">commentaire sur <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:96
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr ""
+msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">citation de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:98
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
-msgstr ""
+msgstr "<a href=\"%(related_path)s\">a répondu</a> à votre <a href=\"%(parent_path)s\">statut</a>"
 
 #: bookwyrm/templates/notifications.html:102
 msgid "followed you"
-msgstr ""
+msgstr "vous suit"
 
 #: bookwyrm/templates/notifications.html:105
 msgid "sent you a follow request"
-msgstr ""
+msgstr "vous a envoyé une demande d’abonnement"
 
 #: bookwyrm/templates/notifications.html:111
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr ""
+msgstr "a partagé votre <a href=\"%(related_path)s\">critique de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:113
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">comment on<em>%(book_title)s</em></a>"
-msgstr ""
+msgstr "a partagé votre <a href=\"%(related_path)s\">commentaire sur <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:115
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr ""
+msgstr "a partagé votre <a href=\"%(related_path)s\">citation de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:117
 #, python-format
 msgid "boosted your <a href=\"%(related_path)s\">status</a>"
-msgstr ""
+msgstr "a partagé votre <a href=\"%(related_path)s\">statut</a>"
 
 #: bookwyrm/templates/notifications.html:121
 #, python-format
 msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
-msgstr ""
+msgstr " a ajouté <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre liste « <a href=\"%(list_path)s\">%(list_name)s</a> »"
 
 #: bookwyrm/templates/notifications.html:123
 #, python-format
 msgid " suggested adding <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s/curate\">%(list_name)s</a>\""
-msgstr ""
+msgstr " a suggégré l’ajout de <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre liste « <a href=\"%(list_path)s/curate\">%(list_name)s</a> »"
 
 #: bookwyrm/templates/notifications.html:128
 #, python-format
 msgid "Your <a href=\"%(url)s\">import</a> completed."
-msgstr ""
+msgstr "Votre <a href=\"%(url)s\">importation</a> est terminée."
 
 #: bookwyrm/templates/notifications.html:131
 #, python-format
 msgid "A new <a href=\"%(path)s\">report</a> needs moderation."
-msgstr ""
+msgstr "Un nouveau <a href=\"%(path)s\">signalement</a> a besoin d’être traité."
 
 #: bookwyrm/templates/notifications.html:157
 msgid "You're all caught up!"
-msgstr ""
+msgstr "Aucune nouvelle notification !"
 
 #: bookwyrm/templates/password_reset.html:23
 #: bookwyrm/templates/preferences/change_password.html:18
 msgid "Confirm password:"
-msgstr ""
+msgstr "Confirmez le mot de passe :"
 
 #: bookwyrm/templates/password_reset_request.html:14
 msgid "A link to reset your password will be sent to your email address"
-msgstr ""
+msgstr "Un lien pour changer votre mot de passe sera envoyé à votre addresse email"
 
 #: bookwyrm/templates/password_reset_request.html:28
 msgid "Reset password"
-msgstr ""
+msgstr "Changer de mot de passe"
 
 #: bookwyrm/templates/preferences/blocks.html:4
 #: bookwyrm/templates/preferences/blocks.html:7
 #: bookwyrm/templates/preferences/preferences_layout.html:26
 msgid "Blocked Users"
-msgstr ""
+msgstr "Comptes bloqués"
 
 #: bookwyrm/templates/preferences/blocks.html:12
 msgid "No users currently blocked."
-msgstr ""
+msgstr "Aucun compte bloqué actuellement"
 
 #: bookwyrm/templates/preferences/change_password.html:4
 #: bookwyrm/templates/preferences/change_password.html:7
 #: bookwyrm/templates/preferences/change_password.html:21
 #: bookwyrm/templates/preferences/preferences_layout.html:19
 msgid "Change Password"
-msgstr ""
+msgstr "Changer le mot de passe"
 
 #: bookwyrm/templates/preferences/change_password.html:14
 msgid "New password:"
-msgstr ""
+msgstr "Nouveau mot de passe :"
 
 #: bookwyrm/templates/preferences/edit_user.html:4
 #: bookwyrm/templates/preferences/edit_user.html:7
 msgid "Edit Profile"
-msgstr ""
+msgstr "Modifier le profil"
 
 #: bookwyrm/templates/preferences/edit_user.html:46
 msgid "Show set reading goal prompt in feed:"
-msgstr ""
+msgstr "Afficher le message pour définir un défi lecture dans le fil d’actualité :"
 
 #: bookwyrm/templates/preferences/edit_user.html:62
 #, python-format
 msgid "Your account will show up in the <a href=\"%(path)s\">directory</a>, and may be recommended to other BookWyrm users."
-msgstr ""
+msgstr "Votre compte sera listé dans le <a href=\"%(path)s\">répertoire</a> et pourra être recommandé à d’autres utilisateurs ou utilisatrices de BookWyrm."
 
 #: bookwyrm/templates/preferences/edit_user.html:65
 msgid "Preferred Timezone: "
-msgstr ""
+msgstr "Fuseau horaire préféré"
 
 #: bookwyrm/templates/preferences/preferences_layout.html:11
 msgid "Account"
-msgstr ""
+msgstr "Compte"
 
 #: bookwyrm/templates/preferences/preferences_layout.html:15
 msgid "Profile"
-msgstr ""
+msgstr "Profil"
 
 #: bookwyrm/templates/preferences/preferences_layout.html:22
 msgid "Relationships"
-msgstr ""
+msgstr "Relations"
 
 #: bookwyrm/templates/rss/title.html:5
 #: bookwyrm/templates/snippets/status/status_header.html:35
 msgid "rated"
-msgstr ""
+msgstr "a noté"
 
 #: bookwyrm/templates/rss/title.html:7
 #: bookwyrm/templates/snippets/status/status_header.html:37
 msgid "reviewed"
-msgstr ""
+msgstr "a écrit une critique de"
 
 #: bookwyrm/templates/rss/title.html:9
 #: bookwyrm/templates/snippets/status/status_header.html:39
 msgid "commented on"
-msgstr ""
+msgstr "a commenté"
 
 #: bookwyrm/templates/rss/title.html:11
 #: bookwyrm/templates/snippets/status/status_header.html:41
 msgid "quoted"
-msgstr ""
+msgstr "a cité"
 
 #: bookwyrm/templates/search/book.html:64
 msgid "Load results from other catalogues"
-msgstr ""
+msgstr "Charger les résultats d’autres catalogues"
 
 #: bookwyrm/templates/search/book.html:68
 msgid "Manually add book"
-msgstr ""
+msgstr "Ajouter un livre manuellement"
 
 #: bookwyrm/templates/search/book.html:73
 msgid "Log in to import or add books."
-msgstr ""
+msgstr "Authentifiez-vous pour importer ou ajouter des livres."
 
 #: bookwyrm/templates/search/layout.html:16
 msgid "Search query"
-msgstr ""
+msgstr "Requête"
 
 #: bookwyrm/templates/search/layout.html:19
 msgid "Search type"
-msgstr ""
+msgstr "Type de recherche"
 
 #: bookwyrm/templates/search/layout.html:21
 #: bookwyrm/templates/search/layout.html:42
 #: bookwyrm/templates/user/layout.html:74
 msgid "Books"
-msgstr ""
+msgstr "Livres"
 
 #: bookwyrm/templates/search/layout.html:23
 #: bookwyrm/templates/search/layout.html:46
@@ -1787,128 +1807,128 @@ msgstr ""
 #: bookwyrm/templates/user_admin/user_admin.html:3
 #: bookwyrm/templates/user_admin/user_admin.html:10
 msgid "Users"
-msgstr ""
+msgstr "Comptes"
 
 #: bookwyrm/templates/search/layout.html:58
 #, python-format
 msgid "No results found for \"%(query)s\""
-msgstr ""
+msgstr "Aucun résultat pour « %(query)s »"
 
 #: bookwyrm/templates/settings/admin_layout.html:4
 msgid "Administration"
-msgstr ""
+msgstr "Administration"
 
 #: bookwyrm/templates/settings/admin_layout.html:22
 msgid "Manage Users"
-msgstr ""
+msgstr "Gérer les comptes"
 
 #: bookwyrm/templates/settings/admin_layout.html:39
 #: bookwyrm/templates/settings/federation.html:3
 #: bookwyrm/templates/settings/federation.html:5
 msgid "Federated Servers"
-msgstr ""
+msgstr "Serveurs fédérés"
 
 #: bookwyrm/templates/settings/admin_layout.html:44
 msgid "Instance Settings"
-msgstr ""
+msgstr "Paramètres de l’instance"
 
 #: bookwyrm/templates/settings/admin_layout.html:48
 #: bookwyrm/templates/settings/announcements.html:3
 #: bookwyrm/templates/settings/announcements.html:5
 msgid "Announcements"
-msgstr ""
+msgstr "Annonces"
 
 #: bookwyrm/templates/settings/admin_layout.html:52
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
-msgstr ""
+msgstr "Paramètres du site"
 
 #: bookwyrm/templates/settings/admin_layout.html:55
 #: bookwyrm/templates/settings/site.html:13
 msgid "Instance Info"
-msgstr ""
+msgstr "Information sur l’instance"
 
 #: bookwyrm/templates/settings/admin_layout.html:56
 #: bookwyrm/templates/settings/site.html:39
 msgid "Images"
-msgstr ""
+msgstr "Images"
 
 #: bookwyrm/templates/settings/admin_layout.html:57
 #: bookwyrm/templates/settings/site.html:59
 msgid "Footer Content"
-msgstr ""
+msgstr "Contenu du pied de page"
 
 #: bookwyrm/templates/settings/admin_layout.html:58
 #: bookwyrm/templates/settings/site.html:81
 msgid "Registration"
-msgstr ""
+msgstr "Enregistrement"
 
 #: bookwyrm/templates/settings/announcement.html:3
 #: bookwyrm/templates/settings/announcement.html:6
 msgid "Announcement"
-msgstr ""
+msgstr "Annonce"
 
 #: bookwyrm/templates/settings/announcement.html:7
 #: bookwyrm/templates/settings/federated_server.html:13
 msgid "Back to list"
-msgstr ""
+msgstr "Retour à la liste"
 
 #: bookwyrm/templates/settings/announcement.html:11
 #: bookwyrm/templates/settings/announcement_form.html:6
 msgid "Edit Announcement"
-msgstr ""
+msgstr "Modifier l’annonce"
 
 #: bookwyrm/templates/settings/announcement.html:20
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
 #: bookwyrm/templates/snippets/follow_request_buttons.html:12
 msgid "Delete"
-msgstr ""
+msgstr "Supprimer"
 
 #: bookwyrm/templates/settings/announcement.html:35
 msgid "Visible:"
-msgstr ""
+msgstr "Visible :"
 
 #: bookwyrm/templates/settings/announcement.html:38
 msgid "True"
-msgstr ""
+msgstr "Vrai"
 
 #: bookwyrm/templates/settings/announcement.html:40
 msgid "False"
-msgstr ""
+msgstr "Faux"
 
 #: bookwyrm/templates/settings/announcement.html:47
 msgid "Start date:"
-msgstr ""
+msgstr "Date de début :"
 
 #: bookwyrm/templates/settings/announcement.html:54
 msgid "End date:"
-msgstr ""
+msgstr "Date de fin :"
 
 #: bookwyrm/templates/settings/announcement.html:60
 msgid "Active:"
-msgstr ""
+msgstr "Active :"
 
 #: bookwyrm/templates/settings/announcement_form.html:8
 #: bookwyrm/templates/settings/announcements.html:8
 msgid "Create Announcement"
-msgstr ""
+msgstr "Ajouter une annonce"
 
 #: bookwyrm/templates/settings/announcements.html:22
 msgid "Date added"
-msgstr ""
+msgstr "Date d’ajout"
 
 #: bookwyrm/templates/settings/announcements.html:26
 msgid "Preview"
-msgstr ""
+msgstr "Aperçu"
 
 #: bookwyrm/templates/settings/announcements.html:30
 msgid "Start date"
-msgstr ""
+msgstr "Date de début"
 
 #: bookwyrm/templates/settings/announcements.html:34
 msgid "End date"
-msgstr ""
+msgstr "Date de fin"
 
 #: bookwyrm/templates/settings/announcements.html:38
 #: bookwyrm/templates/settings/federation.html:30
@@ -1916,15 +1936,15 @@ msgstr ""
 #: bookwyrm/templates/settings/status_filter.html:5
 #: bookwyrm/templates/user_admin/user_admin.html:34
 msgid "Status"
-msgstr ""
+msgstr "Statut"
 
 #: bookwyrm/templates/settings/announcements.html:48
 msgid "active"
-msgstr ""
+msgstr "active"
 
 #: bookwyrm/templates/settings/announcements.html:48
 msgid "inactive"
-msgstr ""
+msgstr "inactive"
 
 #: bookwyrm/templates/settings/edit_server.html:3
 #: bookwyrm/templates/settings/edit_server.html:6
@@ -1934,982 +1954,1391 @@ msgstr ""
 #: bookwyrm/templates/settings/server_blocklist.html:3
 #: bookwyrm/templates/settings/server_blocklist.html:20
 msgid "Add server"
-msgstr ""
+msgstr "Ajouter un serveur"
 
 #: bookwyrm/templates/settings/edit_server.html:7
 #: bookwyrm/templates/settings/server_blocklist.html:7
 msgid "Back to server list"
-msgstr ""
+msgstr "Retour à la liste des serveurs"
 
 #: bookwyrm/templates/settings/edit_server.html:16
 #: bookwyrm/templates/settings/server_blocklist.html:16
 msgid "Import block list"
-msgstr ""
+msgstr "Importer une liste de blocage"
 
 #: bookwyrm/templates/settings/edit_server.html:30
 msgid "Instance:"
-msgstr ""
+msgstr "Instance :"
 
 #: bookwyrm/templates/settings/edit_server.html:37
 #: bookwyrm/templates/settings/federated_server.html:31
 #: bookwyrm/templates/user_admin/user_info.html:34
 msgid "Status:"
-msgstr ""
+msgstr "Statut :"
 
 #: bookwyrm/templates/settings/edit_server.html:41
 #: bookwyrm/templates/settings/federated_server.html:10
 msgid "Blocked"
-msgstr ""
+msgstr "Bloqué"
 
 #: bookwyrm/templates/settings/edit_server.html:48
 #: bookwyrm/templates/settings/federated_server.html:23
 #: bookwyrm/templates/user_admin/user_info.html:26
 msgid "Software:"
-msgstr ""
+msgstr "Logiciel :"
 
 #: bookwyrm/templates/settings/edit_server.html:55
 #: bookwyrm/templates/settings/federated_server.html:27
 #: bookwyrm/templates/user_admin/user_info.html:30
 msgid "Version:"
-msgstr ""
+msgstr "Description :"
 
 #: bookwyrm/templates/settings/edit_server.html:64
 msgid "Notes:"
-msgstr ""
+msgstr "Remarques :"
 
 #: bookwyrm/templates/settings/federated_server.html:19
 msgid "Details"
-msgstr ""
+msgstr "Détails"
 
 #: bookwyrm/templates/settings/federated_server.html:39
 #: bookwyrm/templates/user/layout.html:56
 msgid "Activity"
-msgstr ""
+msgstr "Activité"
 
 #: bookwyrm/templates/settings/federated_server.html:43
 msgid "Users:"
-msgstr ""
+msgstr "Comptes :"
 
 #: bookwyrm/templates/settings/federated_server.html:46
 #: bookwyrm/templates/settings/federated_server.html:53
 msgid "View all"
-msgstr ""
+msgstr "Voir tous"
 
 #: bookwyrm/templates/settings/federated_server.html:50
 msgid "Reports:"
-msgstr ""
+msgstr "Signalements :"
 
 #: bookwyrm/templates/settings/federated_server.html:57
 msgid "Followed by us:"
-msgstr ""
+msgstr "Suivi par nous :"
 
 #: bookwyrm/templates/settings/federated_server.html:63
 msgid "Followed by them:"
-msgstr ""
+msgstr "Suivi par eux :"
 
 #: bookwyrm/templates/settings/federated_server.html:69
 msgid "Blocked by us:"
-msgstr ""
+msgstr "Bloqués par nous :"
 
 #: bookwyrm/templates/settings/federated_server.html:82
 #: bookwyrm/templates/user_admin/user_info.html:39
 msgid "Notes"
-msgstr ""
+msgstr "Remarques"
 
 #: bookwyrm/templates/settings/federated_server.html:85
 msgid "Edit"
-msgstr ""
+msgstr "Modifier"
 
 #: bookwyrm/templates/settings/federated_server.html:105
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:3
 msgid "Actions"
-msgstr ""
+msgstr "Actions"
 
 #: bookwyrm/templates/settings/federated_server.html:109
 #: bookwyrm/templates/snippets/block_button.html:5
 msgid "Block"
-msgstr ""
+msgstr "Bloquer"
 
 #: bookwyrm/templates/settings/federated_server.html:110
 msgid "All users from this instance will be deactivated."
-msgstr ""
+msgstr "Tous les comptes de cette instance seront désactivés."
 
 #: bookwyrm/templates/settings/federated_server.html:115
 #: bookwyrm/templates/snippets/block_button.html:10
 msgid "Un-block"
-msgstr ""
+msgstr "Débloquer"
 
 #: bookwyrm/templates/settings/federated_server.html:116
 msgid "All users from this instance will be re-activated."
-msgstr ""
+msgstr "Tous les comptes de cette instance seront réactivés."
 
 #: bookwyrm/templates/settings/federation.html:19
 #: bookwyrm/templates/user_admin/server_filter.html:5
 msgid "Server name"
-msgstr ""
+msgstr "Nom du serveur"
 
 #: bookwyrm/templates/settings/federation.html:23
 msgid "Date federated"
-msgstr ""
+msgstr "Date de fédération"
 
 #: bookwyrm/templates/settings/federation.html:27
 msgid "Software"
-msgstr ""
+msgstr "Logiciel"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:4
 #: bookwyrm/templates/settings/manage_invite_requests.html:11
 #: bookwyrm/templates/settings/manage_invite_requests.html:25
 #: bookwyrm/templates/settings/manage_invites.html:11
 msgid "Invite Requests"
-msgstr ""
+msgstr "Demandes d’invitations"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:23
 msgid "Ignored Invite Requests"
-msgstr ""
+msgstr "Invitations ignorées"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:35
 msgid "Date requested"
-msgstr ""
+msgstr "Date d’envoi"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:39
 msgid "Date accepted"
-msgstr ""
+msgstr "Date de validation"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:42
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:47
 msgid "Action"
-msgstr ""
+msgstr "Action"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:50
 msgid "No requests"
-msgstr ""
+msgstr "Aucune demande"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:59
 #: bookwyrm/templates/settings/status_filter.html:16
 msgid "Accepted"
-msgstr ""
+msgstr "Accepté(e)s"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:61
 #: bookwyrm/templates/settings/status_filter.html:12
 msgid "Sent"
-msgstr ""
+msgstr "Envoyé(e)s"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:63
 #: bookwyrm/templates/settings/status_filter.html:8
 msgid "Requested"
-msgstr ""
+msgstr "Demandé(e)s"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:73
 msgid "Send invite"
-msgstr ""
+msgstr "Envoyer l’invitation"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:75
 msgid "Re-send invite"
-msgstr ""
+msgstr "Envoyer l’invitation de nouveau"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:95
 msgid "Ignore"
-msgstr ""
+msgstr "Ignorer"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:97
 msgid "Un-ignore"
-msgstr ""
+msgstr "Ne plus ignorer"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:108
 msgid "Back to pending requests"
-msgstr ""
+msgstr "Retour aux demandes en attente"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:110
 msgid "View ignored requests"
-msgstr ""
+msgstr "Voir les demandes ignorées"
 
 #: bookwyrm/templates/settings/manage_invites.html:21
 msgid "Generate New Invite"
-msgstr ""
+msgstr "Générer une nouvelle invitation"
 
 #: bookwyrm/templates/settings/manage_invites.html:27
 msgid "Expiry:"
-msgstr ""
+msgstr "Expiration :"
 
 #: bookwyrm/templates/settings/manage_invites.html:33
 msgid "Use limit:"
-msgstr ""
+msgstr "Limiter à :"
 
 #: bookwyrm/templates/settings/manage_invites.html:40
 msgid "Create Invite"
-msgstr ""
+msgstr "Créer une invitation"
 
 #: bookwyrm/templates/settings/manage_invites.html:47
 msgid "Link"
-msgstr ""
+msgstr "Lien"
 
 #: bookwyrm/templates/settings/manage_invites.html:48
 msgid "Expires"
-msgstr ""
+msgstr "Expiration"
 
 #: bookwyrm/templates/settings/manage_invites.html:49
 msgid "Max uses"
-msgstr ""
+msgstr "Nombre maximum d’utilisations"
 
 #: bookwyrm/templates/settings/manage_invites.html:50
 msgid "Times used"
-msgstr ""
+msgstr "Nombre de fois utilisée"
 
 #: bookwyrm/templates/settings/manage_invites.html:53
 msgid "No active invites"
-msgstr ""
+msgstr "Aucune invitation active"
 
 #: bookwyrm/templates/settings/server_blocklist.html:6
 msgid "Import Blocklist"
-msgstr ""
+msgstr "Importer une liste de blocage"
 
 #: bookwyrm/templates/settings/server_blocklist.html:26
 #: bookwyrm/templates/snippets/goal_progress.html:7
 msgid "Success!"
-msgstr ""
+msgstr "Bravo !"
 
 #: bookwyrm/templates/settings/server_blocklist.html:30
 msgid "Successfully blocked:"
-msgstr ""
+msgstr "Blocage réussi :"
 
 #: bookwyrm/templates/settings/server_blocklist.html:32
 msgid "Failed:"
-msgstr ""
+msgstr "Échec :"
 
 #: bookwyrm/templates/settings/site.html:15
 msgid "Instance Name:"
-msgstr ""
+msgstr "Nom de l’instance :"
 
 #: bookwyrm/templates/settings/site.html:19
 msgid "Tagline:"
-msgstr ""
+msgstr "Slogan :"
 
 #: bookwyrm/templates/settings/site.html:23
 msgid "Instance description:"
-msgstr ""
+msgstr "Description de l’instance :"
 
 #: bookwyrm/templates/settings/site.html:27
 msgid "Code of conduct:"
-msgstr ""
+msgstr "Code de conduite :"
 
 #: bookwyrm/templates/settings/site.html:31
 msgid "Privacy Policy:"
-msgstr ""
+msgstr "Politique de vie privée :"
 
 #: bookwyrm/templates/settings/site.html:42
 msgid "Logo:"
-msgstr ""
+msgstr "Logo :"
 
 #: bookwyrm/templates/settings/site.html:46
 msgid "Logo small:"
-msgstr ""
+msgstr "Logo réduit :"
 
 #: bookwyrm/templates/settings/site.html:50
 msgid "Favicon:"
-msgstr ""
+msgstr "Favicon :"
 
 #: bookwyrm/templates/settings/site.html:61
 msgid "Support link:"
-msgstr ""
+msgstr "URL pour soutenir l’instance :"
 
 #: bookwyrm/templates/settings/site.html:65
 msgid "Support title:"
-msgstr ""
+msgstr "Titre pour soutenir l’instance :"
 
 #: bookwyrm/templates/settings/site.html:69
 msgid "Admin email:"
-msgstr ""
+msgstr "Email de l’administrateur :"
 
 #: bookwyrm/templates/settings/site.html:73
 msgid "Additional info:"
-msgstr ""
+msgstr "Infos supplémentaires :"
 
 #: bookwyrm/templates/settings/site.html:85
 msgid "Allow registration"
-msgstr ""
+msgstr "Autoriser les inscriptions"
 
 #: bookwyrm/templates/settings/site.html:91
 msgid "Allow invite requests"
-msgstr ""
+msgstr "Autoriser les demandes d’invitation"
 
 #: bookwyrm/templates/settings/site.html:95
 msgid "Registration closed text:"
-msgstr ""
+msgstr "Texte affiché lorsque les enregistrements sont clos :"
 
 #: bookwyrm/templates/snippets/announcement.html:31
 #, python-format
 msgid "Posted by <a href=\"%(user_path)s\">%(username)s</a>"
-msgstr ""
+msgstr "Publiée par <a href=\"%(user_path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/snippets/book_cover.html:31
 msgid "No cover"
-msgstr ""
+msgstr "Pas de couverture"
 
 #: bookwyrm/templates/snippets/book_titleby.html:4
 #, python-format
 msgid "<a href=\"%(path)s\">%(title)s</a> by "
-msgstr ""
+msgstr "<a href=\"%(path)s\">%(title)s</a> par "
 
 #: bookwyrm/templates/snippets/boost_button.html:20
 #: bookwyrm/templates/snippets/boost_button.html:21
 msgid "Boost"
-msgstr ""
+msgstr "Partager"
 
 #: bookwyrm/templates/snippets/boost_button.html:33
 #: bookwyrm/templates/snippets/boost_button.html:34
 msgid "Un-boost"
-msgstr ""
+msgstr "Annuler le partage"
 
 #: bookwyrm/templates/snippets/content_warning_field.html:3
 msgid "Spoiler alert:"
-msgstr ""
+msgstr "Alerte Spoiler :"
 
 #: bookwyrm/templates/snippets/content_warning_field.html:10
 msgid "Spoilers ahead!"
-msgstr ""
+msgstr "Attention spoilers !"
 
 #: bookwyrm/templates/snippets/create_status.html:17
 msgid "Review"
-msgstr ""
+msgstr "Critique"
 
 #: bookwyrm/templates/snippets/create_status.html:39
 msgid "Quote"
-msgstr ""
+msgstr "Citation"
 
 #: bookwyrm/templates/snippets/create_status_form.html:23
 msgid "Comment:"
-msgstr ""
+msgstr "Commentaire :"
 
 #: bookwyrm/templates/snippets/create_status_form.html:25
 msgid "Quote:"
-msgstr ""
+msgstr "Citation :"
 
 #: bookwyrm/templates/snippets/create_status_form.html:27
 msgid "Review:"
-msgstr ""
+msgstr "Critique :"
 
 #: bookwyrm/templates/snippets/create_status_form.html:56
 #: bookwyrm/templates/snippets/status/layout.html:29
 #: bookwyrm/templates/snippets/status/layout.html:47
 #: bookwyrm/templates/snippets/status/layout.html:48
 msgid "Reply"
-msgstr ""
+msgstr "Répondre"
 
 #: bookwyrm/templates/snippets/create_status_form.html:56
 msgid "Content"
-msgstr ""
+msgstr "Contenu"
 
 #: bookwyrm/templates/snippets/create_status_form.html:80
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16
 msgid "Progress:"
-msgstr ""
+msgstr "Progression :"
 
 #: bookwyrm/templates/snippets/create_status_form.html:88
 #: bookwyrm/templates/snippets/readthrough_form.html:22
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30
 msgid "pages"
-msgstr ""
+msgstr "pages"
 
 #: bookwyrm/templates/snippets/create_status_form.html:89
 #: bookwyrm/templates/snippets/readthrough_form.html:23
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31
 msgid "percent"
-msgstr ""
+msgstr "pourcent"
 
 #: bookwyrm/templates/snippets/create_status_form.html:95
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36
 #, python-format
 msgid "of %(pages)s pages"
-msgstr ""
+msgstr "sur %(pages)s pages"
 
 #: bookwyrm/templates/snippets/create_status_form.html:110
 msgid "Include spoiler alert"
-msgstr ""
+msgstr "Afficher une alerte spoiler"
 
 #: bookwyrm/templates/snippets/create_status_form.html:117
 #: bookwyrm/templates/snippets/privacy-icons.html:15
 #: bookwyrm/templates/snippets/privacy-icons.html:16
 #: bookwyrm/templates/snippets/privacy_select.html:19
 msgid "Private"
-msgstr ""
+msgstr "Privé"
 
 #: bookwyrm/templates/snippets/create_status_form.html:128
 msgid "Post"
-msgstr ""
+msgstr "Publier"
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:4
 msgid "Delete these read dates?"
-msgstr ""
+msgstr "Supprimer ces dates de lecture ?"
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
 #, python-format
 msgid "You are deleting this readthrough and its %(count)s associated progress updates."
-msgstr ""
+msgstr "Vous avez supprimé ce résumé et ses %(count)s progressions associées."
 
 #: bookwyrm/templates/snippets/fav_button.html:10
 #: bookwyrm/templates/snippets/fav_button.html:12
 msgid "Like"
-msgstr ""
+msgstr "Ajouter aux favoris"
 
 #: bookwyrm/templates/snippets/fav_button.html:18
 #: bookwyrm/templates/snippets/fav_button.html:19
 msgid "Un-like"
-msgstr ""
+msgstr "Retirer des favoris"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:7
 msgid "Show filters"
-msgstr ""
+msgstr "Afficher les filtres"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:9
 msgid "Hide filters"
-msgstr ""
+msgstr "Masquer les filtres"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:22
 msgid "Apply filters"
-msgstr ""
+msgstr "Appliquer les filtres"
 
 #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:26
 msgid "Clear filters"
-msgstr ""
+msgstr "Annuler les filtres"
 
 #: bookwyrm/templates/snippets/follow_button.html:12
 msgid "Follow"
-msgstr ""
+msgstr "S’abonner"
 
 #: bookwyrm/templates/snippets/follow_button.html:18
 msgid "Undo follow request"
-msgstr ""
+msgstr "Annuler la demande d’abonnement"
 
 #: bookwyrm/templates/snippets/follow_button.html:20
 msgid "Unfollow"
-msgstr ""
+msgstr "Se désabonner"
 
 #: bookwyrm/templates/snippets/follow_request_buttons.html:7
 msgid "Accept"
-msgstr ""
+msgstr "Accepter"
 
 #: bookwyrm/templates/snippets/form_rate_stars.html:19
 #: bookwyrm/templates/snippets/stars.html:13
 msgid "No rating"
-msgstr ""
+msgstr "Aucune note"
 
 #: bookwyrm/templates/snippets/form_rate_stars.html:44
 #: bookwyrm/templates/snippets/stars.html:7
 #, python-format
 msgid "%(rating)s star"
 msgid_plural "%(rating)s stars"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(rating)s étoile"
+msgstr[1] "%(rating)s étoiles"
 
 #: bookwyrm/templates/snippets/generated_status/goal.html:1
 #, python-format
 msgid "set a goal to read %(counter)s book in %(year)s"
 msgid_plural "set a goal to read %(counter)s books in %(year)s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "souhaite lire %(counter)s livre en %(year)s"
+msgstr[1] "souhaite lire %(counter)s livres en %(year)s"
 
 #: bookwyrm/templates/snippets/generated_status/rating.html:3
 #, python-format
 msgid "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s star"
 msgid_plural "Rated <em><a href=\"%(path)s\">%(title)s</a></em>: %(display_rating)s stars"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "A noté <a href=\"%(path)s\">%(title)s</a> : %(display_rating)s star"
+msgstr[1] "A noté <a href=\"%(path)s\">%(title)s</a> : %(display_rating)s stars"
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4
 #, python-format
 msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s"
 msgid_plural "Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Critique de « %(book_title)s » (%(display_rating)s star): %(review_title)s"
+msgstr[1] "Critique de « %(book_title)s » (%(display_rating)s stars) : %(review_title)s"
 
 #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:8
 #, python-format
 msgid "Review of \"%(book_title)s\": %(review_title)s"
-msgstr ""
+msgstr "Critique de « %(book_title)s » : %(review_title)s"
 
 #: bookwyrm/templates/snippets/goal_card.html:23
 #, python-format
 msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
-msgstr ""
+msgstr "Vous pouvez définir ou changer votre défi lecture à n’importe quel moment depuis votre <a href=\"%(path)s\">profil</a>"
 
 #: bookwyrm/templates/snippets/goal_form.html:9
 msgid "Reading goal:"
-msgstr ""
+msgstr "Défi lecture :"
 
 #: bookwyrm/templates/snippets/goal_form.html:14
 msgid "books"
-msgstr ""
+msgstr "livres"
 
 #: bookwyrm/templates/snippets/goal_form.html:19
 msgid "Goal privacy:"
-msgstr ""
+msgstr "Confidentialité du défi :"
 
 #: bookwyrm/templates/snippets/goal_form.html:26
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:29
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20
 msgid "Post to feed"
-msgstr ""
+msgstr "Publier sur le fil d’actualité"
 
 #: bookwyrm/templates/snippets/goal_form.html:30
 msgid "Set goal"
-msgstr ""
+msgstr "Valider ce défi"
 
 #: bookwyrm/templates/snippets/goal_progress.html:9
 #, python-format
 msgid "%(percent)s%% complete!"
-msgstr ""
+msgstr "%(percent)s%% terminé !"
 
 #: bookwyrm/templates/snippets/goal_progress.html:12
 #, python-format
 msgid "You've read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
-msgstr ""
+msgstr "Vous avez lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s livres</a>."
 
 #: bookwyrm/templates/snippets/goal_progress.html:14
 #, python-format
 msgid "%(username)s has read <a href=\"%(path)s\">%(read_count)s of %(goal_count)s books</a>."
-msgstr ""
+msgstr "%(username)s a lu <a href=\"%(path)s\">%(read_count)s sur %(goal_count)s livres</a>."
 
 #: bookwyrm/templates/snippets/page_text.html:4
 #, python-format
 msgid "page %(page)s of %(total_pages)s"
-msgstr ""
+msgstr "page %(page)s sur %(total_pages)s pages"
 
 #: bookwyrm/templates/snippets/page_text.html:6
 #, python-format
 msgid "page %(page)s"
-msgstr ""
+msgstr "page %(page)s"
 
 #: bookwyrm/templates/snippets/pagination.html:12
 msgid "Previous"
-msgstr ""
+msgstr "Précédente"
 
 #: bookwyrm/templates/snippets/pagination.html:23
 msgid "Next"
-msgstr ""
+msgstr "Suivante"
 
 #: bookwyrm/templates/snippets/privacy-icons.html:3
 #: bookwyrm/templates/snippets/privacy-icons.html:4
 #: bookwyrm/templates/snippets/privacy_select.html:10
 msgid "Public"
-msgstr ""
+msgstr "Public"
 
 #: bookwyrm/templates/snippets/privacy-icons.html:7
 #: bookwyrm/templates/snippets/privacy-icons.html:8
 #: bookwyrm/templates/snippets/privacy_select.html:13
 msgid "Unlisted"
-msgstr ""
+msgstr "Non listé"
 
 #: bookwyrm/templates/snippets/privacy-icons.html:12
 msgid "Followers-only"
-msgstr ""
+msgstr "Abonnemé(e)s uniquement"
 
 #: bookwyrm/templates/snippets/privacy_select.html:6
 msgid "Post privacy"
-msgstr ""
+msgstr "Confidentialité du statut"
 
 #: bookwyrm/templates/snippets/privacy_select.html:16
 #: bookwyrm/templates/user/relationships/followers.html:6
 #: bookwyrm/templates/user/relationships/layout.html:11
 msgid "Followers"
-msgstr ""
+msgstr "Abonné(e)s"
 
 #: bookwyrm/templates/snippets/rate_action.html:4
 msgid "Leave a rating"
-msgstr ""
+msgstr "Laisser une note"
 
 #: bookwyrm/templates/snippets/rate_action.html:19
 msgid "Rate"
-msgstr ""
+msgstr "Noter"
 
 #: bookwyrm/templates/snippets/readthrough.html:8
 msgid "Progress Updates:"
-msgstr ""
+msgstr "Progression :"
 
 #: bookwyrm/templates/snippets/readthrough.html:14
 msgid "finished"
-msgstr ""
+msgstr "terminé"
 
 #: bookwyrm/templates/snippets/readthrough.html:25
 msgid "Show all updates"
-msgstr ""
+msgstr "Montrer toutes les progressions"
 
 #: bookwyrm/templates/snippets/readthrough.html:41
 msgid "Delete this progress update"
-msgstr ""
+msgstr "Supprimer cette mise à jour"
 
 #: bookwyrm/templates/snippets/readthrough.html:52
 msgid "started"
-msgstr ""
+msgstr "commencé"
 
 #: bookwyrm/templates/snippets/readthrough.html:59
 #: bookwyrm/templates/snippets/readthrough.html:73
 msgid "Edit read dates"
-msgstr ""
+msgstr "Modifier les date de lecture"
 
 #: bookwyrm/templates/snippets/readthrough.html:63
 msgid "Delete these read dates"
-msgstr ""
+msgstr "Supprimer ces dates de lecture"
 
 #: bookwyrm/templates/snippets/readthrough_form.html:7
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:19
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:17
 msgid "Started reading"
-msgstr ""
+msgstr "Lecture commencée le"
 
 #: bookwyrm/templates/snippets/readthrough_form.html:14
 msgid "Progress"
-msgstr ""
+msgstr "Progression"
 
 #: bookwyrm/templates/snippets/readthrough_form.html:30
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25
 msgid "Finished reading"
-msgstr ""
+msgstr "Lecture terminée le"
 
 #: bookwyrm/templates/snippets/register_form.html:32
 msgid "Sign Up"
-msgstr ""
+msgstr "S’enregistrer"
 
 #: bookwyrm/templates/snippets/report_button.html:6
 msgid "Report"
-msgstr ""
+msgstr "Signaler"
 
 #: bookwyrm/templates/snippets/search_result_text.html:36
 msgid "Import book"
-msgstr ""
+msgstr "Importer le livre"
 
 #: bookwyrm/templates/snippets/shelf_selector.html:4
 msgid "Move book"
-msgstr ""
+msgstr "Déplacer le livre"
 
 #: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5
 #, python-format
 msgid "Finish \"<em>%(book_title)s</em>\""
-msgstr ""
+msgstr "Terminer « <em>%(book_title)s</em> »"
 
 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:36
 msgid "Update progress"
-msgstr ""
+msgstr "Progression de la mise à jour"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5
 msgid "More shelves"
-msgstr ""
+msgstr "Plus d’étagères"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:10
 msgid "Start reading"
-msgstr ""
+msgstr "Commencer la lecture"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:15
 msgid "Finish reading"
-msgstr ""
+msgstr "Terminer la lecture"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:18
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26
 msgid "Want to read"
-msgstr ""
+msgstr "Je veux le lire"
 
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:47
 #, python-format
 msgid "Remove from %(name)s"
-msgstr ""
+msgstr "Retirer de %(name)s"
 
 #: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5
 #, python-format
 msgid "Start \"<em>%(book_title)s</em>\""
-msgstr ""
+msgstr "Commencer « <em>%(book_title)s</em> »"
 
 #: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:5
 #, python-format
 msgid "Want to Read \"<em>%(book_title)s</em>\""
-msgstr ""
+msgstr "Ajouter « <em>%(book_title)s</em> » aux envies de lecture"
 
 #: bookwyrm/templates/snippets/status/content_status.html:71
 #: bookwyrm/templates/snippets/trimmed_text.html:15
 msgid "Show more"
-msgstr ""
+msgstr "Déplier"
 
 #: bookwyrm/templates/snippets/status/content_status.html:86
 #: bookwyrm/templates/snippets/trimmed_text.html:30
 msgid "Show less"
-msgstr ""
+msgstr "Replier"
 
 #: bookwyrm/templates/snippets/status/content_status.html:116
 msgid "Open image in new window"
-msgstr ""
+msgstr "Ouvrir l’image dans une nouvelle fenêtre"
 
 #: bookwyrm/templates/snippets/status/layout.html:21
 #: bookwyrm/templates/snippets/status/status_options.html:17
 msgid "Delete status"
-msgstr ""
+msgstr "Supprimer le statut"
 
 #: bookwyrm/templates/snippets/status/layout.html:51
 #: bookwyrm/templates/snippets/status/layout.html:52
 msgid "Boost status"
-msgstr ""
+msgstr "Partager le statut"
 
 #: bookwyrm/templates/snippets/status/layout.html:55
 #: bookwyrm/templates/snippets/status/layout.html:56
 msgid "Like status"
-msgstr ""
+msgstr "Ajouter le statut aux favoris"
 
 #: bookwyrm/templates/snippets/status/status.html:10
 msgid "boosted"
-msgstr ""
+msgstr "a partagé"
 
 #: bookwyrm/templates/snippets/status/status_header.html:45
 #, python-format
 msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">status</a>"
-msgstr ""
+msgstr "a répondu au <a href=\"%(status_path)s\">statut</a> de <a href=\"%(user_path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/snippets/status/status_options.html:7
 #: bookwyrm/templates/snippets/user_options.html:7
 msgid "More options"
-msgstr ""
+msgstr "Plus d’options"
 
 #: bookwyrm/templates/snippets/status/status_options.html:26
 msgid "Delete & re-draft"
-msgstr ""
+msgstr "Supprimer & recommencer la rédaction"
 
 #: bookwyrm/templates/snippets/status/status_options.html:35
 #: bookwyrm/templates/snippets/user_options.html:13
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:6
 msgid "Send direct message"
-msgstr ""
+msgstr "Envoyer un message direct"
 
 #: bookwyrm/templates/snippets/switch_edition_button.html:5
 msgid "Switch to this edition"
-msgstr ""
+msgstr "Changer vers cette édition"
 
 #: bookwyrm/templates/snippets/table-sort-header.html:6
 msgid "Sorted ascending"
-msgstr ""
+msgstr "Trié par ordre croissant"
 
 #: bookwyrm/templates/snippets/table-sort-header.html:10
 msgid "Sorted descending"
-msgstr ""
+msgstr "Trié par ordre décroissant"
 
 #: bookwyrm/templates/user/layout.html:13 bookwyrm/templates/user/user.html:10
 msgid "User Profile"
-msgstr ""
+msgstr "Profil"
 
 #: bookwyrm/templates/user/layout.html:37
 msgid "Follow Requests"
-msgstr ""
+msgstr "Demandes d’abonnement"
 
 #: bookwyrm/templates/user/layout.html:62
 msgid "Reading Goal"
-msgstr ""
+msgstr "Défi lecture"
 
 #: bookwyrm/templates/user/lists.html:11
 #, python-format
 msgid "Lists: %(username)s"
-msgstr ""
+msgstr "Listes : %(username)s"
 
 #: bookwyrm/templates/user/lists.html:17 bookwyrm/templates/user/lists.html:29
 msgid "Create list"
-msgstr ""
+msgstr "Créer une liste"
 
 #: bookwyrm/templates/user/relationships/followers.html:12
 #, python-format
 msgid "%(username)s has no followers"
-msgstr ""
+msgstr "%(username)s n’a pas d’abonné(e)"
 
 #: bookwyrm/templates/user/relationships/following.html:6
 #: bookwyrm/templates/user/relationships/layout.html:15
 msgid "Following"
-msgstr ""
+msgstr "Comptes suivis"
 
 #: bookwyrm/templates/user/relationships/following.html:12
 #, python-format
 msgid "%(username)s isn't following any users"
-msgstr ""
+msgstr "%(username)s ne suit personne"
 
 #: bookwyrm/templates/user/shelf/books_header.html:5
 #, python-format
 msgid "%(username)s's books"
-msgstr ""
+msgstr "Livres de %(username)s"
 
 #: bookwyrm/templates/user/shelf/create_shelf_form.html:5
 #: bookwyrm/templates/user/shelf/create_shelf_form.html:22
 msgid "Create Shelf"
-msgstr ""
+msgstr "Créer une étagère"
 
 #: bookwyrm/templates/user/shelf/edit_shelf_form.html:5
 msgid "Edit Shelf"
-msgstr ""
+msgstr "Modifier l’étagère"
 
 #: bookwyrm/templates/user/shelf/edit_shelf_form.html:26
 msgid "Update shelf"
-msgstr ""
+msgstr "Mettre l’étagère à jour"
 
 #: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:56
 msgid "All books"
-msgstr ""
+msgstr "Tous les livres"
 
 #: bookwyrm/templates/user/shelf/shelf.html:38
 msgid "Create shelf"
-msgstr ""
+msgstr "Créer une étagère"
 
 #: bookwyrm/templates/user/shelf/shelf.html:62
 msgid "Edit shelf"
-msgstr ""
+msgstr "Modifier l’étagère"
 
 #: bookwyrm/templates/user/shelf/shelf.html:81
 #: bookwyrm/templates/user/shelf/shelf.html:105
 msgid "Shelved"
-msgstr ""
+msgstr "Date d’ajout"
 
 #: bookwyrm/templates/user/shelf/shelf.html:82
 #: bookwyrm/templates/user/shelf/shelf.html:109
 msgid "Started"
-msgstr ""
+msgstr "Commencé"
 
 #: bookwyrm/templates/user/shelf/shelf.html:83
 #: bookwyrm/templates/user/shelf/shelf.html:112
 msgid "Finished"
-msgstr ""
+msgstr "Terminé"
 
 #: bookwyrm/templates/user/shelf/shelf.html:138
 msgid "This shelf is empty."
-msgstr ""
+msgstr "Cette étagère est vide"
 
 #: bookwyrm/templates/user/shelf/shelf.html:144
 msgid "Delete shelf"
-msgstr ""
+msgstr "Supprimer l’étagère"
 
 #: bookwyrm/templates/user/user.html:16
 msgid "Edit profile"
-msgstr ""
+msgstr "Modifier le profil"
 
 #: bookwyrm/templates/user/user.html:33
 #, python-format
 msgid "View all %(size)s"
-msgstr ""
+msgstr "Voir les %(size)s"
 
 #: bookwyrm/templates/user/user.html:46
 msgid "View all books"
-msgstr ""
+msgstr "Voir tous les livres"
 
 #: bookwyrm/templates/user/user.html:59
 msgid "User Activity"
-msgstr ""
+msgstr "Activité du compte"
 
 #: bookwyrm/templates/user/user.html:63
 msgid "RSS feed"
-msgstr ""
+msgstr "Flux RSS"
 
 #: bookwyrm/templates/user/user.html:74
 msgid "No activities yet!"
-msgstr ""
+msgstr "Aucune activité pour l’instant !"
 
 #: bookwyrm/templates/user/user_preview.html:15
 #, python-format
 msgid "Joined %(date)s"
-msgstr ""
+msgstr "A rejoint ce serveur %(date)s"
 
 #: bookwyrm/templates/user/user_preview.html:19
 #, python-format
 msgid "%(counter)s follower"
 msgid_plural "%(counter)s followers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(counter)s abonné(e)"
+msgstr[1] "%(counter)s abonné(e)s"
 
 #: bookwyrm/templates/user/user_preview.html:20
 #, python-format
 msgid "%(counter)s following"
-msgstr ""
+msgstr "%(counter)s abonnements"
 
 #: bookwyrm/templates/user/user_preview.html:26
 #, python-format
 msgid "%(mutuals_display)s follower you follow"
 msgid_plural "%(mutuals_display)s followers you follow"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(mutuals_display)s abonné(e) que vous suivez"
+msgstr[1] "%(mutuals_display)s abonné(e)s que vous suivez"
 
 #: bookwyrm/templates/user_admin/user.html:9
 msgid "Back to users"
-msgstr ""
+msgstr "Retour aux comptes"
 
 #: bookwyrm/templates/user_admin/user_admin.html:7
 #, python-format
 msgid "Users: <small>%(server_name)s</small>"
-msgstr ""
+msgstr "Comptes : <small>%(server_name)s</small>"
 
 #: bookwyrm/templates/user_admin/user_admin.html:22
 #: bookwyrm/templates/user_admin/username_filter.html:5
 msgid "Username"
-msgstr ""
+msgstr "Nom du compte"
 
 #: bookwyrm/templates/user_admin/user_admin.html:26
 msgid "Date Added"
-msgstr ""
+msgstr "Date d’ajout"
 
 #: bookwyrm/templates/user_admin/user_admin.html:30
 msgid "Last Active"
-msgstr ""
+msgstr "Dernière activité"
 
 #: bookwyrm/templates/user_admin/user_admin.html:38
 msgid "Remote server"
-msgstr ""
+msgstr "Serveur distant"
 
 #: bookwyrm/templates/user_admin/user_admin.html:47
 msgid "Active"
-msgstr ""
+msgstr "Actif"
 
 #: bookwyrm/templates/user_admin/user_admin.html:47
 msgid "Inactive"
-msgstr ""
+msgstr "Inactif"
 
 #: bookwyrm/templates/user_admin/user_admin.html:52
 #: bookwyrm/templates/user_admin/user_info.html:49
 msgid "Not set"
-msgstr ""
+msgstr "Non défini"
 
 #: bookwyrm/templates/user_admin/user_info.html:5
 msgid "User details"
-msgstr ""
+msgstr "Détails du compte"
 
 #: bookwyrm/templates/user_admin/user_info.html:14
 msgid "View user profile"
-msgstr ""
+msgstr "Voir le profil"
 
 #: bookwyrm/templates/user_admin/user_info.html:20
 msgid "Instance details"
-msgstr ""
+msgstr "Détails de l’instance"
 
 #: bookwyrm/templates/user_admin/user_info.html:46
 msgid "View instance"
-msgstr ""
+msgstr "Voir l’instance"
 
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:11
 msgid "Suspend user"
-msgstr ""
+msgstr "Suspendre le compte"
 
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:13
 msgid "Un-suspend user"
-msgstr ""
+msgstr "Rétablir le compte"
 
 #: bookwyrm/templates/user_admin/user_moderation_actions.html:21
 msgid "Access level:"
-msgstr ""
+msgstr "Niveau d’accès :"
 
 #: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:22
 msgid "File exceeds maximum size: 10MB"
-msgstr ""
+msgstr "Ce fichier dépasse la taille limite : 10 Mo"
 
 #: bookwyrm/views/import_data.py:67
 msgid "Not a valid csv file"
-msgstr ""
+msgstr "Fichier CSV non valide"
 
 #: bookwyrm/views/password.py:32
 msgid "No user with that email address was found."
-msgstr ""
+msgstr "Aucun compte avec cette adresse email n’a été trouvé."
 
 #: bookwyrm/views/password.py:41
 #, python-format
 msgid "A password reset link sent to %s"
-msgstr ""
+msgstr "Un lien de réinitialisation a été envoyé à %s."
+
+#~ msgid "Remove <a href=\"%(path)s\">%(name)s</a>"
+#~ msgstr "Supprimer <a href=\"%(path)s\">%(name)s</a>"
+
+#, fuzzy
+#~| msgid "BookWyrm users"
+#~ msgid "BookWyrm\\"
+#~ msgstr "Comptes BookWyrm"
+
+#, fuzzy
+#~| msgid "Show more"
+#~ msgid "Show"
+#~ msgstr "Déplier"
+
+#, fuzzy
+#~| msgid "All messages"
+#~ msgid "Messages"
+#~ msgstr "Tous les messages"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "Enter a valid URL."
+#~ msgstr "Adresse email :"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "Enter a valid integer."
+#~ msgstr "Adresse email :"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "Enter a valid email address."
+#~ msgstr "Adresse email :"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "Enter a valid IPv4 address."
+#~ msgstr "Adresse email :"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "Enter a valid IPv6 address."
+#~ msgstr "Adresse email :"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "Enter a valid IPv4 or IPv6 address."
+#~ msgstr "Adresse email :"
+
+#, fuzzy
+#~| msgid "Series number:"
+#~ msgid "Enter a number."
+#~ msgstr "Numéro dans la série :"
+
+#, fuzzy
+#~| msgid "A user with this email already exists."
+#~ msgid "%(model_name)s with this %(field_labels)s already exists."
+#~ msgstr "Cet email est déjà associé à un compte."
+
+#, fuzzy
+#~| msgid "%(value)s is not a valid remote_id"
+#~ msgid "Value %(value)r is not a valid choice."
+#~ msgstr "%(value)s n’est pas une remote_id valide."
+
+#, fuzzy
+#~| msgid "This shelf is empty."
+#~ msgid "This field cannot be null."
+#~ msgstr "Cette étagère est vide"
+
+#, fuzzy
+#~| msgid "A user with this email already exists."
+#~ msgid "%(model_name)s with this %(field_label)s already exists."
+#~ msgstr "Cet email est déjà associé à un compte."
+
+#, fuzzy
+#~| msgid "No active invites"
+#~ msgid "Comma-separated integers"
+#~ msgstr "Aucune invitation active"
+
+#, fuzzy
+#~| msgid "Series number:"
+#~ msgid "Decimal number"
+#~ msgstr "Numéro dans la série :"
+
+#, fuzzy
+#~| msgid "List curation:"
+#~ msgid "Duration"
+#~ msgstr "Modération de la liste :"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "Email address"
+#~ msgstr "Adresse email :"
+
+#, fuzzy
+#~| msgid "No active invites"
+#~ msgid "Big (8 byte) integer"
+#~ msgstr "Aucune invitation active"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "IPv4 address"
+#~ msgstr "Adresse email :"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "IP address"
+#~ msgstr "Adresse email :"
+
+#, fuzzy
+#~| msgid "No active invites"
+#~ msgid "Positive integer"
+#~ msgstr "Aucune invitation active"
+
+#, fuzzy
+#~| msgid "No active invites"
+#~ msgid "Positive small integer"
+#~ msgstr "Aucune invitation active"
+
+#, fuzzy
+#~| msgid "%(value)s is not a valid username"
+#~ msgid "“%(value)s� is not a valid UUID."
+#~ msgstr "%(value)s n’est pas un nom de compte valide."
+
+#, fuzzy
+#~| msgid "Images"
+#~ msgid "Image"
+#~ msgstr "Images"
+
+#, fuzzy
+#~| msgid "Relationships"
+#~ msgid "One-to-one relationship"
+#~ msgstr "Relations"
+
+#, fuzzy
+#~| msgid "Relationships"
+#~ msgid "%(from)s-%(to)s relationship"
+#~ msgstr "Relations"
+
+#, fuzzy
+#~| msgid "Relationships"
+#~ msgid "%(from)s-%(to)s relationships"
+#~ msgstr "Relations"
+
+#, fuzzy
+#~| msgid "Relationships"
+#~ msgid "Many-to-many relationship"
+#~ msgstr "Relations"
+
+#, fuzzy
+#~| msgid "This shelf is empty."
+#~ msgid "This field is required."
+#~ msgstr "Cette étagère est vide"
+
+#, fuzzy
+#~| msgid "Series number:"
+#~ msgid "Enter a whole number."
+#~ msgstr "Numéro dans la série :"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "Enter a valid date."
+#~ msgstr "Adresse email :"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "Enter a valid time."
+#~ msgstr "Adresse email :"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "Enter a valid date/time."
+#~ msgstr "Adresse email :"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "Enter a valid duration."
+#~ msgstr "Adresse email :"
+
+#, fuzzy
+#~| msgid "This shelf is empty."
+#~ msgid "The submitted file is empty."
+#~ msgstr "Cette étagère est vide"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "Enter a list of values."
+#~ msgstr "Adresse email :"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "Enter a valid UUID."
+#~ msgstr "Adresse email :"
+
+#, fuzzy
+#~| msgid "Order by"
+#~ msgid "Order"
+#~ msgstr "Trier par"
+
+#, fuzzy
+#~| msgid "%(value)s is not a valid username"
+#~ msgid "“%(pk)s� is not a valid value."
+#~ msgstr "%(value)s n’est pas un nom de compte valide."
+
+#, fuzzy
+#~| msgid "Started reading"
+#~ msgid "Currently"
+#~ msgstr "Commencer la lecture"
+
+#, fuzzy
+#~| msgid "Change shelf"
+#~ msgid "Change"
+#~ msgstr "Changer d’étagère"
+
+#, fuzzy
+#~| msgid "Status"
+#~ msgid "Sat"
+#~ msgstr "Statut"
+
+#, fuzzy
+#~| msgid "Search"
+#~ msgid "March"
+#~ msgstr "Chercher"
+
+#, fuzzy
+#~| msgid "Series number:"
+#~ msgid "September"
+#~ msgstr "Numéro dans la série :"
+
+#, fuzzy
+#~| msgid "Series number:"
+#~ msgid "December"
+#~ msgstr "Numéro dans la série :"
+
+#, fuzzy
+#~| msgid "Search"
+#~ msgctxt "abbrev. month"
+#~ msgid "March"
+#~ msgstr "Chercher"
+
+#, fuzzy
+#~| msgid "Search"
+#~ msgctxt "alt. month"
+#~ msgid "March"
+#~ msgstr "Chercher"
+
+#, fuzzy
+#~| msgid "Series number:"
+#~ msgctxt "alt. month"
+#~ msgid "September"
+#~ msgstr "Numéro dans la série :"
+
+#, fuzzy
+#~| msgid "Series number:"
+#~ msgctxt "alt. month"
+#~ msgid "December"
+#~ msgstr "Numéro dans la série :"
+
+#, fuzzy
+#~| msgid "Email address:"
+#~ msgid "This is not a valid IPv6 address."
+#~ msgstr "Adresse email :"
+
+#, fuzzy
+#~| msgid "No books found matching the query \"%(query)s\""
+#~ msgid "No %(verbose_name)s found matching the query"
+#~ msgstr "Aucun livre trouvé pour la requête « %(query)s »"
+
+#, fuzzy
+#~| msgid "Community"
+#~ msgid "Django Community"
+#~ msgstr "Communauté"
+
+#~ msgid "Didn't find what you were looking for?"
+#~ msgstr "Vous n’avez pas trouvé ce que vous cherchiez ?"
+
+#~ msgid "Hide results from other catalogues"
+#~ msgstr "Masquer les résultats d’autres catalogues"
+
+#~ msgid "Matching Users"
+#~ msgstr "Comptes correspondants"
+
+#~ msgid "Set a reading goal for %(year)s"
+#~ msgstr "Définir un défi lecture pour %(year)s"
+
+#~ msgid "by %(author)s"
+#~ msgstr "par %(author)s"
+
+#~ msgid "Deactivate user"
+#~ msgstr "Désactiver le compte"
+
+#~ msgid "Reactivate user"
+#~ msgstr "Réactiver le compte"
+
+#~ msgid ""
+#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
+#~ "\"%(status_path)s\">review</a>"
+#~ msgstr ""
+#~ "a répondu à la <a href=\"%(status_path)s\">critique</a> de <a href="
+#~ "\"%(user_path)s\">%(username)s</a>"
+
+#~ msgid ""
+#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
+#~ "\"%(status_path)s\">comment</a>"
+#~ msgstr ""
+#~ "a répondu au <a href=\"%(status_path)s\">commentaire</a> de <a href="
+#~ "\"%(user_path)s\">%(username)s</a>"
+
+#~ msgid ""
+#~ "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href="
+#~ "\"%(status_path)s\">quote</a>"
+#~ msgstr ""
+#~ "a répondu à la <a href=\"%(status_path)s\">citation</a> de <a href="
+#~ "\"%(user_path)s\">%(username)s</a>"
+
+#~ msgid "Remove tag"
+#~ msgstr "Supprimer le tag"
+
+#~ msgid "Add tag"
+#~ msgstr "Ajouter un tag"
+
+#~ msgid "Books tagged \"%(tag.name)s\""
+#~ msgstr "Livres tagués « %(tag.name)s »"
+
+#, fuzzy
+#~| msgid "Started"
+#~ msgid "Getting Started"
+#~ msgstr "Commencé"
+
+#, fuzzy
+#~| msgid "No users found for \"%(query)s\""
+#~ msgid "No users were found for \"%(query)s\""
+#~ msgstr "Aucun compte trouvé pour « %(query)s »"
+
+#~ msgid "Tags"
+#~ msgstr "Tags"
+
+#~ msgid "Your lists"
+#~ msgstr "Vos listes"
+
+#, fuzzy
+#~| msgid "See all %(size)s"
+#~ msgid "See all %(size)s lists"
+#~ msgstr "Voir les %(size)s"
+
+#~ msgid "Recent Lists"
+#~ msgstr "Listes récentes"
+
+#~ msgid "Published"
+#~ msgstr "Publié"
+
+#~ msgid "External links"
+#~ msgstr "Liens externes"
+
+#~ msgid "OpenLibrary"
+#~ msgstr "OpenLibrary"
+
+#~ msgid "Change shelf"
+#~ msgstr "Changer d’étagère"
+
+#~ msgid "Unshelve"
+#~ msgstr "Enlever de l’étagère"
+
+#~ msgid "Your Shelves"
+#~ msgstr "Vos étagères"
+
+#~ msgid "%(username)s: Shelves"
+#~ msgstr "%(username)s : Étagères"
+
+#~ msgid "Shelves"
+#~ msgstr "Étagères"
+
+#~ msgid "See all %(shelf_count)s shelves"
+#~ msgstr "Voir les %(shelf_count)s étagères"
+
+#~ msgid "Send follow request"
+#~ msgstr "Envoyer une demande d’abonnement"
+
+#~ msgid "Site Configuration"
+#~ msgstr "Configuration du site"
+
+#~ msgid "Follow request already sent."
+#~ msgstr "Demande d’abonnement déjà envoyée"
+
+#~ msgid "Created and curated by"
+#~ msgstr "Créée et modérée par"
+
+#~ msgid "Created by"
+#~ msgstr "Créée par"
+
+#~ msgid "Create New Shelf"
+#~ msgstr "Créer une nouvelle étagère"
+
+#, fuzzy
+#~| msgid "Create list"
+#~ msgid "Create new list"
+#~ msgstr "Créer une nouvelle liste"
+
+#~ msgid "Added by"
+#~ msgstr "Ajouté par"
+
+#~ msgid "suggested adding"
+#~ msgstr "a suggéré l’ajout de"
+
+#~ msgid "Change password"
+#~ msgstr "Changer le mot de passe"
+
+#~ msgid "%(year)s reading goal"
+#~ msgstr "Défi lecture pour %(year)s"

From 7c2dc8150114144b36f5885c835371a7b0fc4eb5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 6 Jun 2021 13:58:41 -0700
Subject: [PATCH 1249/1285] Corrects variable name in locales

---
 bw-dev                               |   2 +-
 locale/de_DE/LC_MESSAGES/django.po   |  49 +++++++++++++------------
 locale/en_US/LC_MESSAGES/django.po   |  10 +++++-
 locale/es/LC_MESSAGES/django.mo      | Bin 42979 -> 43363 bytes
 locale/es/LC_MESSAGES/django.po      |  35 ++++++++----------
 locale/fr_FR/LC_MESSAGES/django.mo   | Bin 44654 -> 45541 bytes
 locale/fr_FR/LC_MESSAGES/django.po   |  20 ++++++-----
 locale/zh_Hans/LC_MESSAGES/django.mo | Bin 36011 -> 36364 bytes
 locale/zh_Hans/LC_MESSAGES/django.po |  51 ++++++++++++---------------
 9 files changed, 86 insertions(+), 81 deletions(-)

diff --git a/bw-dev b/bw-dev
index c2b63bc1..fb2af0e7 100755
--- a/bw-dev
+++ b/bw-dev
@@ -90,7 +90,7 @@ case "$CMD" in
         runweb python manage.py collectstatic --no-input
         ;;
     makemessages)
-        runweb django-admin makemessages --no-wrap --ignore=venv $@
+        runweb django-admin makemessages --no-wrap --ignore=venv --all $@
         ;;
     compilemessages)
         runweb django-admin compilemessages --ignore venv $@
diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 6c54bb8b..3125d147 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-01 14:50-0700\n"
+"POT-Creation-Date: 2021-06-06 20:52+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"
@@ -2642,6 +2642,14 @@ msgstr "Annehmen"
 msgid "No rating"
 msgstr "Kein Rating"
 
+#: bookwyrm/templates/snippets/form_rate_stars.html:44
+#: bookwyrm/templates/snippets/stars.html:7
+#, python-format
+msgid "%(rating)s star"
+msgid_plural "%(rating)s stars"
+msgstr[0] ""
+msgstr[1] ""
+
 #: bookwyrm/templates/snippets/generated_status/goal.html:1
 #, python-format
 msgid "set a goal to read %(counter)s book in %(year)s"
@@ -3193,7 +3201,7 @@ msgstr "Dieser Benutzename ist bereits vergeben."
 msgid "A password reset link sent to %s"
 msgstr ""
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "Lists: %(username)s"
 #~ msgid "Reports: <small>%(server_name)s</small>"
 #~ msgstr "Listen: %(username)s"
@@ -3264,12 +3272,12 @@ msgstr ""
 #~ msgid "Enter a number."
 #~ msgstr "Seriennummer:"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "A user with that username already exists."
 #~ msgid "%(model_name)s with this %(field_labels)s already exists."
 #~ msgstr "Dieser Benutzename ist bereits vergeben."
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "%(value)s is not a valid remote_id"
 #~ msgid "Value %(value)r is not a valid choice."
 #~ msgstr "%(value)s ist keine gültige remote_id"
@@ -3279,7 +3287,7 @@ msgstr ""
 #~ msgid "This field cannot be null."
 #~ msgstr "Dieses Regal ist leer."
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "A user with that username already exists."
 #~ msgid "%(model_name)s with this %(field_label)s already exists."
 #~ msgstr "Dieser Benutzename ist bereits vergeben."
@@ -3289,7 +3297,7 @@ msgstr ""
 #~ msgid "Comma-separated integers"
 #~ msgstr "Keine aktiven Einladungen"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "%(value)s is not a valid username"
 #~ msgid "“%(value)s� value must be a decimal number."
 #~ msgstr "%(value)s ist kein gültiger Username"
@@ -3309,7 +3317,7 @@ msgstr ""
 #~ msgid "Email address"
 #~ msgstr "E-Mail Adresse"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "%(value)s is not a valid username"
 #~ msgid "“%(value)s� value must be a float."
 #~ msgstr "%(value)s ist kein gültiger Username"
@@ -3339,7 +3347,7 @@ msgstr ""
 #~ msgid "Positive small integer"
 #~ msgstr "Keine aktiven Einladungen"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "%(value)s is not a valid username"
 #~ msgid "“%(value)s� is not a valid UUID."
 #~ msgstr "%(value)s ist kein gültiger Username"
@@ -3354,12 +3362,12 @@ msgstr ""
 #~ msgid "One-to-one relationship"
 #~ msgstr "Beziehungen"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "Relationships"
 #~ msgid "%(from)s-%(to)s relationship"
 #~ msgstr "Beziehungen"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "Relationships"
 #~ msgid "%(from)s-%(to)s relationships"
 #~ msgstr "Beziehungen"
@@ -3414,7 +3422,7 @@ msgstr ""
 #~ msgid "Enter a valid UUID."
 #~ msgstr "E-Mail Adresse"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "%(value)s is not a valid username"
 #~ msgid "“%(pk)s� is not a valid value."
 #~ msgstr "%(value)s ist kein gültiger Username"
@@ -3478,12 +3486,12 @@ msgstr ""
 #~ msgid "This is not a valid IPv6 address."
 #~ msgstr "E-Mail Adresse"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "No books found matching the query \"%(query)s\""
 #~ msgid "No %(verbose_name)s found matching the query"
 #~ msgstr "Keine passenden Bücher zu \"%(query)s\" gefunden"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "%(value)s is not a valid username"
 #~ msgid "“%(path)s� does not exist"
 #~ msgstr "%(value)s ist kein gültiger Username"
@@ -3502,11 +3510,9 @@ msgstr ""
 #~ msgid "Matching Users"
 #~ msgstr "Passende Nutzer*innen"
 
-#, python-format
 #~ msgid "Set a reading goal for %(year)s"
 #~ msgstr "Leseziel für %(year)s setzen"
 
-#, python-format
 #~ msgid "by %(author)s"
 #~ msgstr "von %(author)s"
 
@@ -3516,17 +3522,17 @@ msgstr ""
 #~ msgid "Reactivate user"
 #~ msgstr "Nutzer:in reaktivieren"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 #~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">review</a>"
 #~ msgstr "Direktnachrichten mit <a href=\"%(path)s\">%(username)s</a>"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 #~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">comment</a>"
 #~ msgstr "hat auf deinen <a href=\"%(parent_path)s\">Status</a> geantwortet</a>"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
 #~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">quote</a>"
 #~ msgstr "hat auf deinen <a href=\"%(parent_path)s\">Status</a> <a href=\"%(related_path)s\">geantwortet</a>"
@@ -3537,7 +3543,6 @@ msgstr ""
 #~ msgid "Add tag"
 #~ msgstr "Tag hinzufügen"
 
-#, python-format
 #~ msgid "Books tagged \"%(tag.name)s\""
 #~ msgstr "Mit \"%(tag.name)s\" markierte Bücher"
 
@@ -3546,7 +3551,7 @@ msgstr ""
 #~ msgid "Getting Started"
 #~ msgstr "Gestartet"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "No users found for \"%(query)s\""
 #~ msgid "No users were found for \"%(query)s\""
 #~ msgstr "Keine Nutzer*innen für \"%(query)s\" gefunden"
@@ -3554,7 +3559,7 @@ msgstr ""
 #~ msgid "Your lists"
 #~ msgstr "Deine Listen"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "See all %(size)s"
 #~ msgid "See all %(size)s lists"
 #~ msgstr "Alle %(size)s anzeigen"
@@ -3577,14 +3582,12 @@ msgstr ""
 #~ msgid "Your Shelves"
 #~ msgstr "Deine Regale"
 
-#, python-format
 #~ msgid "%(username)s: Shelves"
 #~ msgstr "%(username)s: Regale"
 
 #~ msgid "Shelves"
 #~ msgstr "Regale"
 
-#, python-format
 #~ msgid "See all %(shelf_count)s shelves"
 #~ msgstr "Alle %(shelf_count)s Regale anzeigen"
 
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index b88dad08..8c36a2cb 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-01 14:50-0700\n"
+"POT-Creation-Date: 2021-06-06 20:52+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"
@@ -2398,6 +2398,14 @@ msgstr ""
 msgid "No rating"
 msgstr ""
 
+#: bookwyrm/templates/snippets/form_rate_stars.html:44
+#: bookwyrm/templates/snippets/stars.html:7
+#, python-format
+msgid "%(rating)s star"
+msgid_plural "%(rating)s stars"
+msgstr[0] ""
+msgstr[1] ""
+
 #: bookwyrm/templates/snippets/generated_status/goal.html:1
 #, python-format
 msgid "set a goal to read %(counter)s book in %(year)s"
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index ea8dada7bc1a39ae38e7c218be0b586dae3ac452..54adfb570bf979ce2771021fbb76473b6fc47584 100644
GIT binary patch
delta 13624
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

delta 13246
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

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index eee94c1f..c9a19a4d 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-01 14:50-0700\n"
+"POT-Creation-Date: 2021-06-06 20:52+0000\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1528,10 +1528,9 @@ msgid "Resolve"
 msgstr "Resolver"
 
 #: bookwyrm/templates/moderation/reports.html:6
-#, fuzzy, python-format
-#| msgid "Reports: %(server_name)s"
+#, python-format
 msgid "Reports: %(instance_name)s"
-msgstr "Informes: %(server_name)s"
+msgstr "Informes: %(instance_name)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
 #: bookwyrm/templates/moderation/reports.html:17
@@ -1540,10 +1539,9 @@ msgid "Reports"
 msgstr "Informes"
 
 #: bookwyrm/templates/moderation/reports.html:14
-#, fuzzy, python-format
-#| msgid "Users: <small>%(server_name)s</small>"
+#, python-format
 msgid "Reports: <small>%(instance_name)s</small>"
-msgstr "Usuarios <small>%(server_name)s</small>"
+msgstr "Informes: <small>%(instance_name)s</small>"
 
 #: bookwyrm/templates/moderation/reports.html:28
 msgid "Resolved"
@@ -2410,6 +2408,14 @@ msgstr "Aceptar"
 msgid "No rating"
 msgstr "No calificación"
 
+#: bookwyrm/templates/snippets/form_rate_stars.html:44
+#: bookwyrm/templates/snippets/stars.html:7
+#, python-format
+msgid "%(rating)s star"
+msgid_plural "%(rating)s stars"
+msgstr[0] "%(rating)s estrella"
+msgstr[1] "%(rating)s estrellas"
+
 #: bookwyrm/templates/snippets/generated_status/goal.html:1
 #, python-format
 msgid "set a goal to read %(counter)s book in %(year)s"
@@ -2842,10 +2848,9 @@ msgid "Back to users"
 msgstr "Volver a usuarios"
 
 #: bookwyrm/templates/user_admin/user_admin.html:7
-#, fuzzy, python-format
-#| msgid "Users: <small>%(server_name)s</small>"
+#, python-format
 msgid "Users: <small>%(instance_name)s</small>"
-msgstr "Usuarios <small>%(server_name)s</small>"
+msgstr "Usuarios <small>%(instance_name)s</small>"
 
 #: bookwyrm/templates/user_admin/user_admin.html:22
 #: bookwyrm/templates/user_admin/username_filter.html:5
@@ -2924,10 +2929,6 @@ msgstr "No se pudo encontrar un usuario con esa dirección de correo electrónic
 msgid "A password reset link sent to %s"
 msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 
-#, python-format
-#~ msgid "Reports: <small>%(server_name)s</small>"
-#~ msgstr "Informes: <small>%(server_name)s</small>"
-
 #~ msgid "Federated Servers"
 #~ msgstr "Servidores federalizados"
 
@@ -2940,12 +2941,6 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 #~ msgid "Remote server"
 #~ msgstr "Quitar servidor"
 
-#, python-format
-#~ msgid "%(rating)s star"
-#~ msgid_plural "%(rating)s stars"
-#~ msgstr[0] "%(rating)s estrella"
-#~ msgstr[1] "%(rating)s estrellas"
-
 #, fuzzy
 #~| msgid "BookWyrm users"
 #~ msgid "BookWyrm\\"
diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index 29020216d94cec7b210cab035fcb6aecfbf08b73..67be885b694e3f176b18948d4185f089a082e43d 100644
GIT binary patch
delta 14115
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

delta 13300
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
R`=zT_9`!3-@lsB}{{jCROhEtu

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 8501f285..2502cee1 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-01 14:50-0700\n"
+"POT-Creation-Date: 2021-06-06 20:52+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"
@@ -1528,6 +1528,7 @@ msgid "Resolve"
 msgstr "Résoudre"
 
 #: bookwyrm/templates/moderation/reports.html:6
+#, python-format
 msgid "Reports: %(instance_name)s"
 msgstr "Signalements : %(instance_name)s"
 
@@ -1538,6 +1539,7 @@ msgid "Reports"
 msgstr "Signalements"
 
 #: bookwyrm/templates/moderation/reports.html:14
+#, python-format
 msgid "Reports: <small>%(instance_name)s</small>"
 msgstr "Signalements : <small>%(instance_name)s</small>"
 
@@ -2398,6 +2400,14 @@ msgstr "Accepter"
 msgid "No rating"
 msgstr "Aucune note"
 
+#: bookwyrm/templates/snippets/form_rate_stars.html:44
+#: bookwyrm/templates/snippets/stars.html:7
+#, python-format
+msgid "%(rating)s star"
+msgid_plural "%(rating)s stars"
+msgstr[0] "%(rating)s étoile"
+msgstr[1] "%(rating)s étoiles"
+
 #: bookwyrm/templates/snippets/generated_status/goal.html:1
 #, python-format
 msgid "set a goal to read %(counter)s book in %(year)s"
@@ -2829,6 +2839,7 @@ msgid "Back to users"
 msgstr "Retour aux comptes"
 
 #: bookwyrm/templates/user_admin/user_admin.html:7
+#, python-format
 msgid "Users: <small>%(instance_name)s</small>"
 msgstr "Comptes : <small>%(instance_name)s</small>"
 
@@ -2907,7 +2918,6 @@ msgstr "Aucun compte avec cette adresse email n’a été trouvé."
 msgid "A password reset link sent to %s"
 msgstr "Un lien de réinitialisation a été envoyé à %s."
 
-#, python-format
 #~ msgid "Reports: <small>%(server_name)s</small>"
 #~ msgstr "Signalements: <small>%(server_name)s</small>"
 
@@ -2923,12 +2933,6 @@ msgstr "Un lien de réinitialisation a été envoyé à %s."
 #~ msgid "Remote server"
 #~ msgstr "Serveur distant"
 
-#, python-format
-#~ msgid "%(rating)s star"
-#~ msgid_plural "%(rating)s stars"
-#~ msgstr[0] "%(rating)s étoile"
-#~ msgstr[1] "%(rating)s étoiles"
-
 #, fuzzy
 #~| msgid "BookWyrm users"
 #~ msgid "BookWyrm\\"
diff --git a/locale/zh_Hans/LC_MESSAGES/django.mo b/locale/zh_Hans/LC_MESSAGES/django.mo
index 496caabcf282089a8988b0acb1f577dc27ddbe8a..5e5b36dcbb3ce03b5a8820506b1f0609d7ca1df9 100644
GIT binary patch
delta 11828
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
J>n7$e_&;@?lN|s6

delta 11483
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
Yq}7XC_~Q5z*-Iy+1ZEd_!LPu704Cfl{Qv*}

diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
index ef5cd2da..4106db43 100644
--- a/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/locale/zh_Hans/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-01 14:50-0700\n"
+"POT-Creation-Date: 2021-06-06 20:52+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"
@@ -1565,10 +1565,9 @@ msgid "Resolve"
 msgstr "已解决"
 
 #: bookwyrm/templates/moderation/reports.html:6
-#, fuzzy, python-format
-#| msgid "Reports: %(server_name)s"
+#, python-format
 msgid "Reports: %(instance_name)s"
-msgstr "报告: %(server_name)s"
+msgstr "报告: %(instance_name)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
 #: bookwyrm/templates/moderation/reports.html:17
@@ -1577,10 +1576,9 @@ msgid "Reports"
 msgstr "报告"
 
 #: bookwyrm/templates/moderation/reports.html:14
-#, fuzzy, python-format
-#| msgid "Users: <small>%(server_name)s</small>"
+#, python-format
 msgid "Reports: <small>%(instance_name)s</small>"
-msgstr "用户: <small>%(server_name)s</small>"
+msgstr "报告: <small>%(instance_name)s</small>"
 
 #: bookwyrm/templates/moderation/reports.html:28
 msgid "Resolved"
@@ -2508,6 +2506,13 @@ msgstr "接�"
 msgid "No rating"
 msgstr "没有评价"
 
+#: bookwyrm/templates/snippets/form_rate_stars.html:44
+#: bookwyrm/templates/snippets/stars.html:7
+#, python-format
+msgid "%(rating)s star"
+msgid_plural "%(rating)s stars"
+msgstr[0] ""
+
 #: bookwyrm/templates/snippets/generated_status/goal.html:1
 #, python-format
 msgid "set a goal to read %(counter)s book in %(year)s"
@@ -2940,10 +2945,9 @@ msgid "Back to users"
 msgstr "回到报告"
 
 #: bookwyrm/templates/user_admin/user_admin.html:7
-#, fuzzy, python-format
-#| msgid "Users: <small>%(server_name)s</small>"
+#, python-format
 msgid "Users: <small>%(instance_name)s</small>"
-msgstr "用户: <small>%(server_name)s</small>"
+msgstr "用户: <small>%(instance_name)s</small>"
 
 #: bookwyrm/templates/user_admin/user_admin.html:22
 #: bookwyrm/templates/user_admin/username_filter.html:5
@@ -2959,10 +2963,8 @@ msgid "Last Active"
 msgstr "最�或缺"
 
 #: bookwyrm/templates/user_admin/user_admin.html:38
-#, fuzzy
-#| msgid "Instance Name:"
 msgid "Remote instance"
-msgstr "实例�称"
+msgstr "移除�务器"
 
 #: bookwyrm/templates/user_admin/user_admin.html:47
 msgid "Active"
@@ -3028,7 +3030,6 @@ msgstr "没有找到使用该邮箱的用户。"
 msgid "A password reset link sent to %s"
 msgstr "密��置连接已��给 %s"
 
-#, python-format
 #~ msgid "Reports: <small>%(server_name)s</small>"
 #~ msgstr "报告: <small>%(server_name)s</small>"
 
@@ -3096,12 +3097,12 @@ msgstr "密��置连接已��给 %s"
 #~ msgid "Enter a number."
 #~ msgstr "系列编�:"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "A user with this email already exists."
 #~ msgid "%(model_name)s with this %(field_labels)s already exists."
 #~ msgstr "已�存在使用该邮箱的用户。"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "%(value)s is not a valid remote_id"
 #~ msgid "Value %(value)r is not a valid choice."
 #~ msgstr "%(value)s �是有效的 remote_id"
@@ -3111,7 +3112,7 @@ msgstr "密��置连接已��给 %s"
 #~ msgid "This field cannot be null."
 #~ msgstr "此书架是空的。"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "A user with this email already exists."
 #~ msgid "%(model_name)s with this %(field_label)s already exists."
 #~ msgstr "已�存在使用该邮箱的用户。"
@@ -3161,7 +3162,7 @@ msgstr "密��置连接已��给 %s"
 #~ msgid "Positive small integer"
 #~ msgstr "无有效的邀请"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "%(value)s is not a valid username"
 #~ msgid "“%(value)s� is not a valid UUID."
 #~ msgstr "%(value)s �是有效的用户�"
@@ -3176,12 +3177,12 @@ msgstr "密��置连接已��给 %s"
 #~ msgid "One-to-one relationship"
 #~ msgstr "关系"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "Relationships"
 #~ msgid "%(from)s-%(to)s relationship"
 #~ msgstr "关系"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "Relationships"
 #~ msgid "%(from)s-%(to)s relationships"
 #~ msgstr "关系"
@@ -3241,7 +3242,7 @@ msgstr "密��置连接已��给 %s"
 #~ msgid "Order"
 #~ msgstr "排列顺�"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "%(value)s is not a valid username"
 #~ msgid "“%(pk)s� is not a valid value."
 #~ msgstr "%(value)s �是有效的用户�"
@@ -3305,7 +3306,7 @@ msgstr "密��置连接已��给 %s"
 #~ msgid "This is not a valid IPv6 address."
 #~ msgstr "邮箱地�:"
 
-#, fuzzy, python-format
+#, fuzzy
 #~| msgid "No books found matching the query \"%(query)s\""
 #~ msgid "No %(verbose_name)s found matching the query"
 #~ msgstr "没有符� \"%(query)s\" 请求的书目"
@@ -3324,11 +3325,9 @@ msgstr "密��置连接已��给 %s"
 #~ msgid "Matching Users"
 #~ msgstr "匹�的用户"
 
-#, python-format
 #~ msgid "Set a reading goal for %(year)s"
 #~ msgstr "设定 %(year)s 的阅读目标"
 
-#, python-format
 #~ msgid "by %(author)s"
 #~ msgstr "由 %(author)s 所著"
 
@@ -3341,15 +3340,12 @@ msgstr "密��置连接已��给 %s"
 #~ msgid "Date"
 #~ msgstr "日期"
 
-#, python-format
 #~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">review</a>"
 #~ msgstr "回�了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">书评</a>"
 
-#, python-format
 #~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">comment</a>"
 #~ msgstr "��了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">评论</a>"
 
-#, python-format
 #~ msgid "replied to <a href=\"%(user_path)s\">%(username)s's</a> <a href=\"%(status_path)s\">quote</a>"
 #~ msgstr "回�了 <a href=\"%(user_path)s\">%(username)s</a> 的 <a href=\"%(status_path)s\">引用</a>"
 
@@ -3359,7 +3355,6 @@ msgstr "密��置连接已��给 %s"
 #~ msgid "Add tag"
 #~ msgstr "添加标签"
 
-#, python-format
 #~ msgid "Books tagged \"%(tag.name)s\""
 #~ msgstr "标有 \"%(tag.name)s\" 标签的书"
 

From 37f92140ad8c5991491559051a32d333b8476fef Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 7 Jun 2021 16:10:00 +0200
Subject: [PATCH 1250/1285] Update django.po

---
 locale/fr_FR/LC_MESSAGES/django.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 804728e3..cef6a7bc 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-06 20:52+0000\n"
+"POT-Creation-Date: 2021-06-07 14:09+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"
@@ -2917,7 +2917,7 @@ msgstr "Rétablir le compte"
 msgid "Access level:"
 msgstr "Niveau d’accès :"
 
-#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:3
+#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:22
 msgid "File exceeds maximum size: 10MB"
 msgstr "Ce fichier dépasse la taille limite : 10 Mo"
 

From ac90cf7420f1418129da76dd5b31429828569981 Mon Sep 17 00:00:00 2001
From: Joachim <joachim.robert@protonmail.com>
Date: Mon, 7 Jun 2021 16:16:07 +0200
Subject: [PATCH 1251/1285] Apply suggestions from feedback

---
 locale/fr_FR/LC_MESSAGES/django.mo | Bin 45541 -> 45874 bytes
 locale/fr_FR/LC_MESSAGES/django.po |   6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index 67be885b694e3f176b18948d4185f089a082e43d..fa138f7853a2b9fa56548ad14535f214aeb7ec5c 100644
GIT binary patch
delta 14265
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
BZH@o{

delta 13911
zcmY+~2V7Ux|HtvGf`Ahd1VQDi;s6nG;L3p;+ynPS`KlO00eAA%G`DHuEX|QxR_37G
zX^yng$}(-3R+gnUH2;oY)Bo%JJ;(pw-+lZJ&+|F=+%rD+-Y;M5x97*A*S;_6xf0~F
z(&3m;)Nv}|mhz6%shH!$)>5nEBsFrJTujDi@NF!E?GhX(276-&&cG5_fD!m2R=|Up
zh@W6j3~KB+@i+?0I*!L#K_!%iE$G6-*cC5hWsGU!I4PKfHE}(v{UiqCRjh^&uquW(
zH4AEi6^VNzYj!d)6gOcM9>507?_8mhO+&e6##xv}{5$r+5zQTE8or5%Snmn5v+>BL
zoO$TNw=o*8pcd-i!f|}D9+Ffi!J3T4iHD*;^E+u&N@FJa;dI+!wv89sc)5+&qCfpM
zA$Q7o6-(h8w*3$W5T8U+?0jV7E7t3%{&&!$d-;$`Ni5USaq43@YK2`f5c{BZl7_l)
z9O}BssD;c$Eo3Qb;sVsf>rwr8pvFCj4e%GNfRU}pzf#k<mFd_Sm5KhS3EZfG^HBG8
z3TlAoQT;wdW$Y4a;_p!l{}qGqF6uhJ)}~*ywLbdL-mEqG524bE2CXy&!!Q-KgK4OV
z7NRa#gUZx;R7SR=7O)f5Zy##m@1pvDhRWcVsJG)L4#az?emy*ij<bx)Fw}szupHjA
zv0odru+pgW;iw(DPz$Vunz#vS107KPdZYRcK=m7rT1Yl(!81{}&NH8iQuiEcMK9P6
zuc8*R$9fW@i7%p3>$Eikl}Ak&fts)?>Xz0<EvyA9W1Ue8?1vh6lxg=k6YYsvs0*J(
z-ZW=3#^Gg*#8U0dgt4dr8lh6!5jAix8xKQGoNnXEsEs{seGavtjaXXm|Lat=@`I>>
zkD)$T&Z7ptjvDYD>I0-$d-IG$U<7d^)Ixfq`VU5>cq}S2<59O@67o^w%tdAVsAPWU
zeJZ-(JgVa*)Pz4<|FG?T9n3=&ih5`(p%&Z#wWIc^1@uHsFw{E6I>DZwj#}`1^yq>D
zDw=qsJ+TYJi4UPxd=Y)IY)6yI5Y)pIg?fk*P!qO7Z6wLs(>efk3r3(an{C_YbR_>8
zcrgtcXgO-27f{c_R@B3Gz{Y3Mhxl96GjR>I0pCvM76ze<xFTx8=BRO#Q48*k%G@X{
zj#E34f9-rG4NB!QRJ<9rkUgk@4%_&QjW3`E`T_m$Pt<@#lgxwxs0{?6+H0axUKe$1
zo1(_;=%G@XN?+83xu_k@K<#uP>Vl={kL#`5P?_6_{LgudADZZ2)I;i<Y~sq+C{zaO
zpvG^38rPFdMLX}0dWh0(JQ0<Nc~}uwqd)Gp9<=9ApfYhDHQ)`@&K{t~E#BFj4?`^=
z4%M$U1~9+VjfyVlkD72aDy5UKD&}J?+=zO3-a}>PGHRf!sD<4|UH=CT#(*v+qi!rg
zoQ>MxG*rL2*j?}cDk|QG3AGU4u4d)IsEKM~NvvbzCa3{hp!#=0Eu<gnmZYKX{W#Qu
z^RXHh*z<c)*B!=^%<r6`qI>r_R>3Q%4E%!{(6^geKuJ^_iW;~wHo*p13df;RJ{k4F
zv;Z~HR#b-Gw7zXUg&w_LA5+nQSFsX4Kn)n&-B=a5S56#i0Zp+qwnAm7D{A6isPRT&
z8JvXL&@)&Ux1bjCDXRY^<zEB;Y8xI{1A3SpN1%)IwNML8!WbNi+TncE1Y1z!oIv&a
z5S78Js0H6dW%xE~;SW$7^zBLh)iJ2286X_B!YGWxx~Kt$pmsVE_5ENBmc^MEh|5sd
zZ9+}-Dr!NyQ4=0Q?f8AvvvCR4@0N#(2E31&plmOjdTUi|Kzkf&XQ`+KPeM(Yk7aNk
zYC)^825v+3J8S(6)&FZOhu2UG^gN)Vl@#f1?wvnI5l5g>oQN8D2<oZNKxJey>be=I
zf#;w$umqRma@6@6eau2)Q44K^>emjr1s*4fic-|qG&rMB9mk_4_Sp8Ns1KrbsQ!EH
z`ID%LKEs-L36-g$DQ2OesPmPvI!0kICSg6j|3j%LB}-5#+ko29%c$RiyD%Ehpg!sD
zp;A|}uUTk_H462C)etpKU(`55QJ){9Q47hzXK^aV>izfcXD&#vwnU|<1D40ms0)Xo
zGUG-)^?9g;7oak;)y79rPxmLNiLan;-A&YZ_iTGWf3mBILa6AW2}ezkh}uC9)Ij~Q
z7^Yz+jz#V4qV*e8|LYitw^7#>8DKJ1#u|p2r<yfs0QuL2Su_OUB-FiKfLh3E)I{4*
zDc^~;@Br4q?@-s5<~y~{hoBY^iONho>U>+&c%4zt)If~H^nv7GsaZgSQndoLfQ_gN
z-#}fk7j+9xVJLoR&tF3=@K<~OK58NV*ml1`=9vk!)<lil0yR&24;5X|8@;a?Ds>sC
zfu|y4IZvZ5_!_m7o2Y(&U<EABuRLv_GU~c$)F)*FtcydjGcK}T#5iJ4)gi2cN>9|z
zR$?&jK;4q#SP3s6-^86esPhR!P3AhIJ`eh$GBg;q!;z?GYaD7p+14qj4bMXQd7MR5
zwDSVg)A<tWf_<ot@7VYQRKN46oquoJZ=)vs1C^m7!_30UqT+B=|Jv3B)VOWYU+;fc
z+t3%ali{eHxUm*ypcb^kx*qj#ZA0CP{TPC$Q4?N9W$tIxhW<tM4;pU9iNc!1b+Hul
zJ1JDOgH)`D>8Jr`qXt}yTJg)M4D3dJT{y=u0fR=Ee=$iy=5khI1H6loSS!{114bv*
zTXP)a@i+8nqR5eE-~`nB*#R}dlc<O0Flr}$qxi(a2vkawP;XCP%)t@JbLE`3?e)^k
z2AZQD&Lq@)DX8nmrICN7dNK`qTJur2U^^-!JFy$?!|v$oHgO7Shnuk|UO)}_1#02f
ztc^$WAx1n88{y}uTUlz1=^rx2!-GLXH5zoH3u>h)n1~~gk9%j6^*;6??lRW=WwZfx
zufIUus-Mw?f1odhr<-wI=tmrlYOjylcoUCpXodbXv`1cPr<;vmL3P}XdN%gs2>cW^
zV8e0dx+kzp5w6Esv@d&-f2_cu4D<Q$8tQ#Nj(W|1#}eoX$TYv_gE5STcvPyBQ4iA^
ztd9>+4_|ba`K{OtYZ9lRGBh1);5qD#_pvf2XPa-oV^AMd3sDc@CXCbj{~?tK8ve#8
z3>$A!+Y)1lC!q%3gbndDPQkx05A!A%Z(x7oVLXZRaW8ho*16`PTa3xXn^EKZg0-37
zaWRTkl#IFs6EPg~Q43pZ+uy=c#79t1@fp;u`ObPBbxUrc?(qXuivPg?^q*+X2Vr&M
za13OArxg`FL_JXVW~7a$p;ER4gK-P$qxb-p$BWnqZ=xRB$Vq15bx;fFh<g9KVj0Z9
zvN#>J@I~lR!*VK`cr%v6gV+SmVq^4~Y`y_Kfi7Y<YNvBi8G9CW-D(?e$7td`*b%?R
z5UkF9Qzn|B=505H{OiI#H0U0?QMY0dYKQw!DLjK(@kMmuWmLxg#VS~Cs@Xt1syzv{
zz`>}AN7;C)bruHFzF;c(SBK|mP|9|p;=QPpokhI`mrxfppJraGE~o|lfLiF!s7yRW
zEx>=e`8<d~EhHL4u|BGQGHT;PJybMMHmc(!)I|BHd%hHPZ?~XQw#&xvpe8ztO6fOP
z6K|kiyTGT+EsR6GRijbkFG6Ls05z}YMJig+R@BZ9pce2kY60Kc_@1@+4AUNpx-J%5
zU?SGT8Q2MTpcZxywbO^F43x_^4|Oz>VULqYMLX$X8k~`+i6_{2E^4BcHr|dJct7fy
zIgSx{9W{Xuw^aQrVHJ$WYS;rSVGe4(rC3()|7MEr-5yk`51}$}8k^x4s0o8+n)8)V
zsjQ9KSv;zLTP%%zP`4@-HSPqgiqlXVTZdZMZmh}J&N(U?=z%qW4{*g1sFl{m3Yci)
z{-~Xdv+eUx8F&%f;6c>G{5NWxqEDM!8;sgu3~GUm(W9Moq@stSJL;()h)UsDREnRn
z=QpDd@eb5Ldr+A<f_iq|!&tn6T5!qPW&_nQo;U%+a5O42p4sF-hRS>zG-07VaT=AX
zb66Fxp(ga3WA1Tz)XwUlGSm`vz9(veA*hW^L_HI8Z2LOYM&Cj${GB=EU#a?l22FGh
zm61EB3I4>&Sn3%wQ4BUBZi%|*IjDutMqRfWwet<A1?{ySNA36{9E+c$`X_qkn$#ts
z-p666j&9V%S*QsXV@2F(+Yh1^_yuamH?76ynOjx~HBMX9L|sq|>w|h$#-W}e&s-`>
z(M$HkA&eyc95wI*)B*zMo8Nv>7*1RtwZpE~0oa8&4eR4B)HqjBsV=&}WUv(K`bcDh
z9;Z2#ku(fI-J3(Gflr|({uK4P{D{5KccJ-2>yNqxPoW;ZC8+){p)$7*eeeP*Q(vKW
z{tNn}{~~3a`(KWVG7yHfF&_044@6&_i^{}e)I+ru^*!KCY>dZHuhV}p0R0!6g$1D|
zs*YMvEDplXsE2l|+L_<kPbCH~qIObbiAh~3YJeuF50*q!zwW3MPQ@Cy0+oq_s0^Gz
zP4Er+;T_Zl{zQ#e{#g@OLXQSWprQ*0V=QK4Q(T8i-35F8CoD<)7b=y0OU**6V;SOB
zs0?;PZDbNQ$Hl0(>onHI8>n$Ymyv%xmDQJ-hUTagcEr-y(>e?Ti8D|;nqhqgHP8}l
zk84poykgJ)gms8-p%xtRocUa7f|{r6bL3x@el!H)2z22D)DD)T7WfM4SvZOs=v~x8
zzC+!L8>k)nEH{6W)kM9nLs0!DVJXZ<-HJu1*Kdo5ic)e6i{mZpebmnW!Lk@oV62Gh
z7mZqQJXXgxsD-#u5A#gaglkY4*=plAY<vi{A<s!Fyb;a^sMn?M3X_pRs2!zYQJjmq
zB@3_|u0}0vJ1Rp5PzySTdKSJzJwvxq8IE3Qu4{<ONC%A8``?X9c^W38Ixa%3cqQuI
zy@*QL2N;jvqZSan%IvTvYT|}i4clXV9D~ZlT2v->+xUp}A~w|f{~HxeTy3?PI2N_?
z1RH1JR^rL1?*o<Bm;w8vu1iDRsw~vAF%7kWRTzpJPz&FOTKIL;2il()r1!t#T01eS
zLjne2C#;Bruma|xCR&8b%xcs<KY=Ci3Wnef)WRO(L=1S|WXOZMei`Z(twT>FmDi{Q
z;~CVw`4+W<>(~o_M@`u71#{1{Q4@Gjw{C%TJ?gsMsFWYXSUimhco%hD%sR7xM(fCb
zMH<@Cpx0q2YJh2|49rIDd=+W|J5VeC(w@JLTKHe6fdki@41}ZJl6Z{3Ca4VcvF*c9
z8+ETI|9W^bY0v=qs2$Bm4ZO~_@3!$F8=tfBSE#q*7HY@;;1DeFqW!BEqlg!x#@&fp
z&<WJ|-*~8KWp`1jdWiZYi`~F0f)lVe?!$&yVx##NkX9H@yck>J%c!US8tS$6-(>zN
zCI-WZ=UO+Q-uwNi4SSAIQ7Ya;z5nM>3%Y>11>d6H^Z!BZpx9<(C{`t|gSsW%P!HD-
z)b(Sr3g%)ZT#g!NCn{q{kqz+oKNSsd9W}uN)V(YDl373y>U<5<g^f^eNn6yyQ_wpx
zDuZKD6Rkw;a4V|+PE^W|p>DxNZ#(z@4i!!8v&D1>Lrqv0HE;{8k4dP3r=bR3h>^Gg
zHSn9LjJ<Eqe~nu3kC=>iu@AQ5!(;|7NB#Zj1a32bt1ZO3#K-Xz-nQ|+m(8D6*U&|K
z$Sda8Y-7~DAC4Kg9=l<Q?dGi+fQ^Z>Q4i-f)U7E*K6{)a=$S>O|EuQ2m#DYl2h_^%
zp&qhgubH?C7AKCy2H4QXqp<{WCicfEsGXj(M!jwpG6jp#z7tDg;p^OgH<hC_q+*R7
z#(CJD_y+o8+#4q4O)!qQ4XS-S>efxgF1Q3W&X=gy@QIzqHJC_z57oc%F0-M|yU2en
z8V1my*J37?!nvpk3T(U%^{{QX?ndq401m@<QLkClZgX8rj3(}g18_VB;QLq(&tnnP
z?;r0`&sw^utvtq;^c+k)o^xX<;gn3`^0Yso#8T(hdyi0i{U=2CIrkgZM@_0@I`!u$
z36%d3w|SaMJIYPUlin`ohgPkl4Ff788z=)Q(ZtuW5$5B%g4BAUk9OgVrnN2QN6vgf
z>CUJ+dQq~dhj}ADO{@|0)zOYJz}73!?;2%=_l$YuH&VY!=}4K(x&D-ID0!5<%3?<@
zZpz71H0bDM2OCFyAay;SI&}A2(C2|S;x~$Q5%NC%-!XtbuTtKo<qm~6!D(#A{?)3^
zX^h?P(On#7PmIARPUz+1^V|ubK9;uQ6g@RM_S?P_aX95G+A_Rn%#X^n<x%zHS{*kj
zpLuJ1ZRK2TijIpE{ZofC$Tp}knR-!sVSySr_R{tX#@lwaRkrmw&gmnmH>D44ZsI4@
zf#Wvyd8X?98Z(esM|Xqw|GnmEYa8!br*g72<rU&43>arSi>}0xw%;}^XBY7f=Z+Dd
zP$!NllyRJ^Lt6}`GI0*27xh}SFQI;c@}+*!<Wl*K6TuW6NtABXn@~o3AJId!=oN3u
zrOhd;IkV9AevS68sO!T`M=|OfDRU_;>D!s2;{#$Hbq!8c;%U^~_WYand@~!XTLyKX
zqC6tSImzdevl#;@hbd<%4JlV>Uxxb3cnZtd0Sc*)rA^1*6uyFbk0Z3}6L=g>!Vf8*
zQ`gaqQpsMQMg4iow|Yc>r$Z-#N5=%>>5l^ZfKr3vLwgja+CeT5|3G<k{6Hm!bG_~P
z&cq+v^EWV%_$Nwp+g6c&|9S{=DSuL`adIS<ru;(TQ`xD6>Z4z1zfuNK9zXu#+ycsC
z%A+HcdLK$}$~D{gGWGg)VX@RZQ*?MfqB6$Rotkv$OL>>J_b7>!%bfG41W}&k+(;aX
z`mZV<Q!hdN1ocP9`_%QzEZnyB#M8t(ZJbH}p2Xh~pD9BAgK6kbX+&cPjcJt4)OF~W
zT_fUIln#`7^xK2a(7p?GWLvA4(0L25($;{!j}AALAhp@PYF|Npyzc)Rg4YPLQGXZc
z2se0t#_-dZ^HnstZQn#(g7Oh@J-kHGG1L2#FTBM1BS*(RN=f2&T)zQdpbVj2o%V|Q
zh<b~LKpOT_&!9es@($%6VjX>{x1p3aq4!&pszF>+g!1S}rhbs%E`1*zepHIl-k!FD
zw!JoOV`#gDo=h5psobRmQm;rE!O7vo5!9ch+@tQ`FxuZ&oudcwY*TfXQrD3}Ip(eX
z|Bq6f`;>5+?UThA-6@|D|BvqfADr|fc$+eT`fW-#%6ZCqN)yVvl;xC1$KUk*=23tt
z446&PQPtpV!a0=fl!x?x*|w+S7RoBx*gv1*-U{EU6x*XZgMDq=%UJ8s7Ek>weGXG<
zQT7r4jPvm%<#p=MV0-$u#3Gcs)Ysw=ijEohp{?K7{VyP>K&R%^KcVhV$)VIFPNH2$
zDy1oH^KmF;B<(YaJK)pAttc-@;xnkDufh8>k)OBduVb{q;meuhxnmo<5>(~lzwmq7
zv@rb(M;IlIYO3w$B5py^@sM(z_D;l4d0Whn8ut93go|zaQTm;v{*xVN6!jN%|EtkC
zn#T8Nh@kvTeI=!??bwj>g|zF~LR(opfJ-Q?Y#+^6pAu;&?q^+Y&!4xhq|a{ZYba$Y
z&5E$iPpPC+UZUs-;o=Ua>Rh4C*ACW)w%N8%N!mJ6uZ`s?QPhj$Df)Q7VN=)PL#aU7
z&iNgbhSZ0mj)jzJ`fRUG`QF=P{+m%g@xR2KY{$zug1DTG&)L35a2BN~?Frb^PTCls
zr0sXwKBpwv>kd%&=Uf|ng0{Bkd6OSHTHA{U<0az3bf`k9L3wn{rLvwljy~y>QPgAc
zxb1M7cocCz9A?{UQh)pyL43}(t+J1q_wUL&^a`L1XMo3#Z3Gi&>u(zqs83;li<B<Z
zU!wh6)gQme)+gDC{=mt!?WVN0ZR@;!xc|@7u$JHp{L!BDp5w<M;%;_9&k;{0E=ybs
zdk{xbmQuD752F1jbsY;R&w6Y8yA<a_sHb2eeO|{mC}EURdgWYH{zLiNUhp0EpnW`T
zJo_It`Yj-&xzi>iBYUzd$2}%JH!mkOFFiY}dBMl6ek}Z`b;;6&LET>QE9jjcQX(rg
z(;c1LqF!pN!s97-N)((LUcT_R;VC|a-O?JB4$5@r<>k0tCpNmqWlzkxI&){$g2ZOk
z3J**e=3At5Vc6u>MQYH<Tod!MbJBC&Ij)SWGuOJa?5yrgcUGP{6y!|#%*T~I(N)lC
zYMfuY>`YFKDwwr3s&MDj5Z{7NH&rS;n?K9PCppiZS=euOzE9oc%<<VddERBa^4vL@
z=~*YXd#8H*ggeVMigo1{`p-`&QZhMfQo6Y!w;*LfRKa_*$`;OC(5+};$;Bl~l<Dwa
ziz;xfsucF$>&$iKW@qKOMrC9d^jQ_--)G|Z@j2<4?t-5Ap^s;2$*QA8ns&&|O`Xba
z)7Wjgcct38JJ*%Y1{mnX_6+wZrJPmgy3*XPtn7)C+^G`_r>xmns-Vu+;DWweYnO4k
cS+QHEGtzV11;^G`FFd@prEj6nYjOVn3%$t$D*ylh

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index cef6a7bc..53b4a54a 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -1862,7 +1862,7 @@ msgstr "Contenu du pied de page"
 #: bookwyrm/templates/settings/admin_layout.html:58
 #: bookwyrm/templates/settings/site.html:81
 msgid "Registration"
-msgstr "Enregistrement"
+msgstr "Inscription"
 
 #: bookwyrm/templates/settings/announcement.html:3
 #: bookwyrm/templates/settings/announcement.html:6
@@ -2081,7 +2081,7 @@ msgstr "Logiciel"
 #: bookwyrm/templates/settings/manage_invite_requests.html:25
 #: bookwyrm/templates/settings/manage_invites.html:11
 msgid "Invite Requests"
-msgstr "Demandes d’invitations"
+msgstr "Demandes d’invitation"
 
 #: bookwyrm/templates/settings/manage_invite_requests.html:23
 msgid "Ignored Invite Requests"
@@ -2257,7 +2257,7 @@ msgstr "Autoriser les demandes d’invitation"
 
 #: bookwyrm/templates/settings/site.html:95
 msgid "Registration closed text:"
-msgstr "Texte affiché lorsque les enregistrements sont clos :"
+msgstr "Texte affiché lorsque les inscriptions sont closes :"
 
 #: bookwyrm/templates/snippets/announcement.html:31
 #, python-format

From 948a5dea105cc8ee3625099af1c9a032e14a11e2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 7 Jun 2021 12:53:57 -0700
Subject: [PATCH 1252/1285] Cleans up .env and settings files

Some outdated stuff doesn't need to be in there
---
 .env.dev.example                   | 11 +----------
 .env.prod.example                  | 11 +----------
 .github/workflows/django-tests.yml |  1 -
 bookwyrm/settings.py               | 10 +++-------
 4 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/.env.dev.example b/.env.dev.example
index 03e6ef25..926a0e41 100644
--- a/.env.dev.example
+++ b/.env.dev.example
@@ -13,16 +13,10 @@ DEFAULT_LANGUAGE="English"
 ## Leave unset to allow all hosts
 # ALLOWED_HOSTS="localhost,127.0.0.1,[::1]"
 
-OL_URL=https://openlibrary.org
-
-## Database backend to use.
-## Default is postgres, sqlite is for dev quickstart only (NOT production!!!)
-BOOKWYRM_DATABASE_BACKEND=postgres
-
 MEDIA_ROOT=images/
 
 POSTGRES_PORT=5432
-POSTGRES_PASSWORD=fedireads
+POSTGRES_PASSWORD=securedbypassword123
 POSTGRES_USER=fedireads
 POSTGRES_DB=fedireads
 POSTGRES_HOST=db
@@ -47,6 +41,3 @@ EMAIL_HOST_USER=mail@your.domain.here
 EMAIL_HOST_PASSWORD=emailpassword123
 EMAIL_USE_TLS=true
 EMAIL_USE_SSL=false
-
-# Set this to true when initializing certbot for domain, false when not
-CERTBOT_INIT=false
diff --git a/.env.prod.example b/.env.prod.example
index dd15fbb7..4a7c87b6 100644
--- a/.env.prod.example
+++ b/.env.prod.example
@@ -13,16 +13,10 @@ DEFAULT_LANGUAGE="English"
 ## Leave unset to allow all hosts
 # ALLOWED_HOSTS="localhost,127.0.0.1,[::1]"
 
-OL_URL=https://openlibrary.org
-
-## Database backend to use.
-## Default is postgres, sqlite is for dev quickstart only (NOT production!!!)
-BOOKWYRM_DATABASE_BACKEND=postgres
-
 MEDIA_ROOT=images/
 
 POSTGRES_PORT=5432
-POSTGRES_PASSWORD=securedbpassword123
+POSTGRES_PASSWORD=securedbypassword123
 POSTGRES_USER=fedireads
 POSTGRES_DB=fedireads
 POSTGRES_HOST=db
@@ -47,6 +41,3 @@ EMAIL_HOST_USER=mail@your.domain.here
 EMAIL_HOST_PASSWORD=emailpassword123
 EMAIL_USE_TLS=true
 EMAIL_USE_SSL=false
-
-# Set this to true when initializing certbot for domain, false when not
-CERTBOT_INIT=false
diff --git a/.github/workflows/django-tests.yml b/.github/workflows/django-tests.yml
index 75c1c4b4..f9159efe 100644
--- a/.github/workflows/django-tests.yml
+++ b/.github/workflows/django-tests.yml
@@ -50,7 +50,6 @@ jobs:
         SECRET_KEY: beepbeep
         DEBUG: true
         DOMAIN: your.domain.here
-        OL_URL: https://openlibrary.org
         BOOKWYRM_DATABASE_BACKEND: postgres
         MEDIA_ROOT: images/
         POSTGRES_PASSWORD: hunter2
diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 48e02b67..00c3d023 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -52,7 +52,6 @@ SECRET_KEY = env("SECRET_KEY")
 DEBUG = env.bool("DEBUG", True)
 
 ALLOWED_HOSTS = env.list("ALLOWED_HOSTS", ["*"])
-OL_URL = env("OL_URL")
 
 # Application definition
 
@@ -114,10 +113,8 @@ STREAMS = ["home", "local", "federated"]
 # Database
 # https://docs.djangoproject.com/en/3.2/ref/settings/#databases
 
-BOOKWYRM_DATABASE_BACKEND = env("BOOKWYRM_DATABASE_BACKEND", "postgres")
-
-BOOKWYRM_DBS = {
-    "postgres": {
+DATABASES = {
+    "default": {
         "ENGINE": "django.db.backends.postgresql_psycopg2",
         "NAME": env("POSTGRES_DB", "fedireads"),
         "USER": env("POSTGRES_USER", "fedireads"),
@@ -127,8 +124,6 @@ BOOKWYRM_DBS = {
     },
 }
 
-DATABASES = {"default": BOOKWYRM_DBS[BOOKWYRM_DATABASE_BACKEND]}
-
 
 LOGIN_URL = "/login/"
 AUTH_USER_MODEL = "bookwyrm.User"
@@ -136,6 +131,7 @@ AUTH_USER_MODEL = "bookwyrm.User"
 # Password validation
 # https://docs.djangoproject.com/en/3.2/ref/settings/#auth-password-validators
 
+# pylint: disable=line-too-long
 AUTH_PASSWORD_VALIDATORS = [
     {
         "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",

From 45146b49992a6b1380262dee43868a4edde158f7 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 8 Jun 2021 11:10:39 -0700
Subject: [PATCH 1253/1285] Convert start and finish reading into view classes

---
 bookwyrm/views/__init__.py |   2 +-
 bookwyrm/views/reading.py  | 155 ++++++++++++++++++++-----------------
 bookwyrm/views/shelf.py    |   2 +-
 3 files changed, 84 insertions(+), 75 deletions(-)

diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 8bfaa7da..9ed4e4bd 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -25,7 +25,7 @@ from .list import Lists, List, Curate, UserLists
 from .notifications import Notifications
 from .outbox import Outbox
 from .reading import edit_readthrough, create_readthrough, delete_readthrough
-from .reading import start_reading, finish_reading, delete_progressupdate
+from .reading import StartReading, FinishReading, delete_progressupdate
 from .reports import Report, Reports, make_report, resolve_report, suspend_user
 from .rss_feed import RssFeed
 from .password import PasswordResetRequest, PasswordReset, ChangePassword
diff --git a/bookwyrm/views/reading.py b/bookwyrm/views/reading.py
index 65ca717d..067336cd 100644
--- a/bookwyrm/views/reading.py
+++ b/bookwyrm/views/reading.py
@@ -7,6 +7,8 @@ from dateutil.parser import ParserError
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponseBadRequest, HttpResponseNotFound
 from django.shortcuts import get_object_or_404, redirect
+from django.utils.decorators import method_decorator
+from django.views import View
 from django.views.decorators.http import require_POST
 
 from bookwyrm import models
@@ -14,88 +16,95 @@ from .helpers import get_edition, handle_reading_status
 from .shelf import handle_unshelve
 
 
-# pylint: disable= no-self-use
-@login_required
-@require_POST
-def start_reading(request, book_id):
-    """begin reading a book"""
-    book = get_edition(book_id)
-    reading_shelf = models.Shelf.objects.filter(
-        identifier=models.Shelf.READING, user=request.user
-    ).first()
+@method_decorator(login_required, name="dispatch")
+# pylint: disable=no-self-use
+class StartReading(View):
+    """begin a book"""
 
-    # create a readthrough
-    readthrough = update_readthrough(request, book=book)
-    if readthrough:
-        readthrough.save()
+    def post(self, request, book_id):
+        """begin reading a book"""
+        book = get_edition(book_id)
+        reading_shelf = models.Shelf.objects.filter(
+            identifier=models.Shelf.READING, user=request.user
+        ).first()
 
-        # create a progress update if we have a page
-        readthrough.create_update()
+        # create a readthrough
+        readthrough = update_readthrough(request, book=book)
+        if readthrough:
+            readthrough.save()
 
-    current_status_shelfbook = (
-        models.ShelfBook.objects.select_related("shelf")
-        .filter(
-            shelf__identifier__in=models.Shelf.READ_STATUS_IDENTIFIERS,
-            user=request.user,
-            book=book,
+            # create a progress update if we have a page
+            readthrough.create_update()
+
+        current_status_shelfbook = (
+            models.ShelfBook.objects.select_related("shelf")
+            .filter(
+                shelf__identifier__in=models.Shelf.READ_STATUS_IDENTIFIERS,
+                user=request.user,
+                book=book,
+            )
+            .first()
         )
-        .first()
-    )
-    if current_status_shelfbook is not None:
-        if current_status_shelfbook.shelf.identifier != models.Shelf.READING:
-            handle_unshelve(book, current_status_shelfbook.shelf)
-        else:  # It already was on the shelf
-            return redirect(request.headers.get("Referer", "/"))
+        if current_status_shelfbook is not None:
+            if current_status_shelfbook.shelf.identifier != models.Shelf.READING:
+                handle_unshelve(book, current_status_shelfbook.shelf)
+            else:  # It already was on the shelf
+                return redirect(request.headers.get("Referer", "/"))
 
-    models.ShelfBook.objects.create(book=book, shelf=reading_shelf, user=request.user)
-
-    # post about it (if you want)
-    if request.POST.get("post-status"):
-        privacy = request.POST.get("privacy")
-        handle_reading_status(request.user, reading_shelf, book, privacy)
-
-    return redirect(request.headers.get("Referer", "/"))
-
-
-@login_required
-@require_POST
-def finish_reading(request, book_id):
-    """a user completed a book, yay"""
-    book = get_edition(book_id)
-    finished_read_shelf = models.Shelf.objects.filter(
-        identifier=models.Shelf.READ_FINISHED, user=request.user
-    ).first()
-
-    # update or create a readthrough
-    readthrough = update_readthrough(request, book=book)
-    if readthrough:
-        readthrough.save()
-
-    current_status_shelfbook = (
-        models.ShelfBook.objects.select_related("shelf")
-        .filter(
-            shelf__identifier__in=models.Shelf.READ_STATUS_IDENTIFIERS,
-            user=request.user,
-            book=book,
+        models.ShelfBook.objects.create(
+            book=book, shelf=reading_shelf, user=request.user
         )
-        .first()
-    )
-    if current_status_shelfbook is not None:
-        if current_status_shelfbook.shelf.identifier != models.Shelf.READ_FINISHED:
-            handle_unshelve(book, current_status_shelfbook.shelf)
-        else:  # It already was on the shelf
-            return redirect(request.headers.get("Referer", "/"))
 
-    models.ShelfBook.objects.create(
-        book=book, shelf=finished_read_shelf, user=request.user
-    )
+        # post about it (if you want)
+        if request.POST.get("post-status"):
+            privacy = request.POST.get("privacy")
+            handle_reading_status(request.user, reading_shelf, book, privacy)
 
-    # post about it (if you want)
-    if request.POST.get("post-status"):
-        privacy = request.POST.get("privacy")
-        handle_reading_status(request.user, finished_read_shelf, book, privacy)
+        return redirect(request.headers.get("Referer", "/"))
 
-    return redirect(request.headers.get("Referer", "/"))
+
+@method_decorator(login_required, name="dispatch")
+# pylint: disable=no-self-use
+class FinishReading(View):
+    """finish a book"""
+
+    def post(self, request, book_id):
+        """a user completed a book, yay"""
+        book = get_edition(book_id)
+        finished_read_shelf = models.Shelf.objects.filter(
+            identifier=models.Shelf.READ_FINISHED, user=request.user
+        ).first()
+
+        # update or create a readthrough
+        readthrough = update_readthrough(request, book=book)
+        if readthrough:
+            readthrough.save()
+
+        current_status_shelfbook = (
+            models.ShelfBook.objects.select_related("shelf")
+            .filter(
+                shelf__identifier__in=models.Shelf.READ_STATUS_IDENTIFIERS,
+                user=request.user,
+                book=book,
+            )
+            .first()
+        )
+        if current_status_shelfbook is not None:
+            if current_status_shelfbook.shelf.identifier != models.Shelf.READ_FINISHED:
+                handle_unshelve(book, current_status_shelfbook.shelf)
+            else:  # It already was on the shelf
+                return redirect(request.headers.get("Referer", "/"))
+
+        models.ShelfBook.objects.create(
+            book=book, shelf=finished_read_shelf, user=request.user
+        )
+
+        # post about it (if you want)
+        if request.POST.get("post-status"):
+            privacy = request.POST.get("privacy")
+            handle_reading_status(request.user, finished_read_shelf, book, privacy)
+
+        return redirect(request.headers.get("Referer", "/"))
 
 
 @login_required
diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index 538a8e34..4c6f94a2 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -20,7 +20,7 @@ from .helpers import is_api_request, get_edition, get_user_from_username
 from .helpers import handle_reading_status, privacy_filter
 
 
-# pylint: disable= no-self-use
+# pylint: disable=no-self-use
 class Shelf(View):
     """shelf page"""
 

From 1231d40e80f6351885615d8a8d28b590fa4ab1f1 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 8 Jun 2021 11:23:53 -0700
Subject: [PATCH 1254/1285] Want to read view

---
 bookwyrm/templates/components/modal.html      |  2 +-
 .../templates/reading_progress/start.html     | 14 +++++
 .../shelve_button/finish_reading_modal.html   |  2 +-
 .../shelve_button/start_reading_modal.html    |  6 ++-
 .../shelve_button/want_to_read_modal.html     |  2 +-
 bookwyrm/urls.py                              |  8 +--
 bookwyrm/views/__init__.py                    |  2 +-
 bookwyrm/views/reading.py                     | 51 ++++++++++++++++---
 bookwyrm/views/shelf.py                       |  5 --
 9 files changed, 72 insertions(+), 20 deletions(-)
 create mode 100644 bookwyrm/templates/reading_progress/start.html

diff --git a/bookwyrm/templates/components/modal.html b/bookwyrm/templates/components/modal.html
index 74dcadac..b29ff8d9 100644
--- a/bookwyrm/templates/components/modal.html
+++ b/bookwyrm/templates/components/modal.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 <div
     role="dialog"
-    class="modal is-hidden"
+    class="modal {% if active %}is-active{% else %}is-hidden{% endif %}"
     id="{{ controls_text }}-{{ controls_uid }}"
     aria-labelledby="modal-card-title-{{ controls_text }}-{{ controls_uid }}"
     aria-modal="true"
diff --git a/bookwyrm/templates/reading_progress/start.html b/bookwyrm/templates/reading_progress/start.html
new file mode 100644
index 00000000..c5d3f91b
--- /dev/null
+++ b/bookwyrm/templates/reading_progress/start.html
@@ -0,0 +1,14 @@
+{% extends 'layout.html' %}
+{% load i18n %}
+
+{% block title %}
+{% blocktrans trimmed with book_title=book.title %}
+Start "{{ book_title }}"
+{% endblocktrans %}
+{% endblock %}
+
+{% block content %}
+
+{% include "snippets/shelve_button/start_reading_modal.html" active=True %}
+
+{% endblock %}
diff --git a/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html b/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
index f32d28b7..0ed13ec7 100644
--- a/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
+++ b/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
@@ -7,7 +7,7 @@
 
 
 {% block modal-form-open %}
-<form name="finish-reading" action="/finish-reading/{{ book.id }}" method="post">
+<form name="finish-reading" action="{% url 'finish-reading' book.id %}" method="post">
 {% endblock %}
 
 {% block modal-body %}
diff --git a/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html b/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html
index a3aea2d5..628841cc 100644
--- a/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html
+++ b/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html
@@ -2,11 +2,13 @@
 {% load i18n %}
 
 {% block modal-title %}
-{% blocktrans with book_title=book.title %}Start "<em>{{ book_title }}</em>"{% endblocktrans %}
+{% blocktrans trimmed with book_title=book.title %}
+Start "<em>{{ book_title }}</em>"
+{% endblocktrans %}
 {% endblock %}
 
 {% block modal-form-open %}
-<form name="start-reading" action="/start-reading/{{ book.id }}" method="post">
+<form name="start-reading" action="{% url 'start-reading' book.id %}" method="post">
 {% endblock %}
 
 {% block modal-body %}
diff --git a/bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html b/bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html
index d7c37897..21209e0a 100644
--- a/bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html
+++ b/bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html
@@ -6,7 +6,7 @@
 {% endblock %}
 
 {% block modal-form-open %}
-<form name="shelve" action="/shelve/" method="post">
+<form name="shelve" action="{% url 'to-read' book.id %}" method="post">
     {% csrf_token %}
     <input type="hidden" name="book" value="{{ active_shelf.book.id }}">
     <input type="hidden" name="shelf" value="to-read">
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index cca9396f..3b7fc3c1 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -223,7 +223,7 @@ urlpatterns = [
     re_path(
         r"^list/(?P<list_id>\d+)/curate/?$", views.Curate.as_view(), name="list-curate"
     ),
-    # Uyser books
+    # User books
     re_path(r"%s/books/?$" % user_path, views.Shelf.as_view(), name="user-shelves"),
     re_path(
         r"^%s/(helf|books)/(?P<shelf_identifier>[\w-]+)(.json)?/?$" % user_path,
@@ -315,8 +315,10 @@ urlpatterns = [
     re_path(r"^delete-readthrough/?$", views.delete_readthrough),
     re_path(r"^create-readthrough/?$", views.create_readthrough),
     re_path(r"^delete-progressupdate/?$", views.delete_progressupdate),
-    re_path(r"^start-reading/(?P<book_id>\d+)/?$", views.start_reading),
-    re_path(r"^finish-reading/(?P<book_id>\d+)/?$", views.finish_reading),
+    # shelve actions
+    re_path(r"^to-read/(?P<book_id>\d+)/?$", views.WantToRead.as_view(), name="to-read"),
+    re_path(r"^start-reading/(?P<book_id>\d+)/?$", views.StartReading.as_view(), name="start-reading"),
+    re_path(r"^finish-reading/(?P<book_id>\d+)/?$", views.FinishReading.as_view(), name="finish-reading"),
     # following
     re_path(r"^follow/?$", views.follow, name="follow"),
     re_path(r"^unfollow/?$", views.unfollow, name="unfollow"),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 9ed4e4bd..43743b1c 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -25,7 +25,7 @@ from .list import Lists, List, Curate, UserLists
 from .notifications import Notifications
 from .outbox import Outbox
 from .reading import edit_readthrough, create_readthrough, delete_readthrough
-from .reading import StartReading, FinishReading, delete_progressupdate
+from .reading import WantToRead, StartReading, FinishReading, delete_progressupdate
 from .reports import Report, Reports, make_report, resolve_report, suspend_user
 from .rss_feed import RssFeed
 from .password import PasswordResetRequest, PasswordReset, ChangePassword
diff --git a/bookwyrm/views/reading.py b/bookwyrm/views/reading.py
index 067336cd..7c7fd4b0 100644
--- a/bookwyrm/views/reading.py
+++ b/bookwyrm/views/reading.py
@@ -16,6 +16,45 @@ from .helpers import get_edition, handle_reading_status
 from .shelf import handle_unshelve
 
 
+@method_decorator(login_required, name="dispatch")
+# pylint: disable=no-self-use
+class WantToRead(View):
+    """consider reading a book"""
+
+    def post(self, request, book_id):
+        """desire a book"""
+        book = get_edition(book_id)
+        desired_shelf = models.Shelf.objects.filter(
+            identifier=models.Shelf.TO_READ, user=request.user
+        ).first()
+
+        current_status_shelfbook = (
+            models.ShelfBook.objects.select_related("shelf")
+            .filter(
+                shelf__identifier__in=models.Shelf.READ_STATUS_IDENTIFIERS,
+                user=request.user,
+                book=book,
+            )
+            .first()
+        )
+        if current_status_shelfbook is not None:
+            if current_status_shelfbook.shelf.identifier != models.Shelf.READING:
+                handle_unshelve(book, current_status_shelfbook.shelf)
+            else:  # It already was on the shelf
+                return redirect(request.headers.get("Referer", "/"))
+
+        models.ShelfBook.objects.create(
+            book=book, shelf=desired_shelf, user=request.user
+        )
+
+        # post about it (if you want)
+        if request.POST.get("post-status"):
+            privacy = request.POST.get("privacy")
+            handle_reading_status(request.user, desired_shelf, book, privacy)
+
+        return redirect(request.headers.get("Referer", "/"))
+
+
 @method_decorator(login_required, name="dispatch")
 # pylint: disable=no-self-use
 class StartReading(View):
@@ -24,7 +63,7 @@ class StartReading(View):
     def post(self, request, book_id):
         """begin reading a book"""
         book = get_edition(book_id)
-        reading_shelf = models.Shelf.objects.filter(
+        desired_shelf = models.Shelf.objects.filter(
             identifier=models.Shelf.READING, user=request.user
         ).first()
 
@@ -52,13 +91,13 @@ class StartReading(View):
                 return redirect(request.headers.get("Referer", "/"))
 
         models.ShelfBook.objects.create(
-            book=book, shelf=reading_shelf, user=request.user
+            book=book, shelf=desired_shelf, user=request.user
         )
 
         # post about it (if you want)
         if request.POST.get("post-status"):
             privacy = request.POST.get("privacy")
-            handle_reading_status(request.user, reading_shelf, book, privacy)
+            handle_reading_status(request.user, desired_shelf, book, privacy)
 
         return redirect(request.headers.get("Referer", "/"))
 
@@ -71,7 +110,7 @@ class FinishReading(View):
     def post(self, request, book_id):
         """a user completed a book, yay"""
         book = get_edition(book_id)
-        finished_read_shelf = models.Shelf.objects.filter(
+        desired_shelf = models.Shelf.objects.filter(
             identifier=models.Shelf.READ_FINISHED, user=request.user
         ).first()
 
@@ -96,13 +135,13 @@ class FinishReading(View):
                 return redirect(request.headers.get("Referer", "/"))
 
         models.ShelfBook.objects.create(
-            book=book, shelf=finished_read_shelf, user=request.user
+            book=book, shelf=desired_shelf, user=request.user
         )
 
         # post about it (if you want)
         if request.POST.get("post-status"):
             privacy = request.POST.get("privacy")
-            handle_reading_status(request.user, finished_read_shelf, book, privacy)
+            handle_reading_status(request.user, desired_shelf, book, privacy)
 
         return redirect(request.headers.get("Referer", "/"))
 
diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index 4c6f94a2..b16f3741 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -178,11 +178,6 @@ def shelve(request):
         models.ShelfBook.objects.create(
             book=book, shelf=desired_shelf, user=request.user
         )
-        if desired_shelf.identifier == models.Shelf.TO_READ and request.POST.get(
-            "post-status"
-        ):
-            privacy = request.POST.get("privacy") or desired_shelf.privacy
-            handle_reading_status(request.user, desired_shelf, book, privacy=privacy)
     else:
         try:
             models.ShelfBook.objects.create(

From b5d0a9e0b41e2160c72ac6c36b3a776326c17e47 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 8 Jun 2021 11:43:30 -0700
Subject: [PATCH 1255/1285] Removes deplicate progress code form reading views

---
 bookwyrm/urls.py          |  16 ++++-
 bookwyrm/views/reading.py | 122 +++++++++++---------------------------
 bookwyrm/views/shelf.py   |   1 -
 3 files changed, 48 insertions(+), 91 deletions(-)

diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 3b7fc3c1..da6919cf 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -316,9 +316,19 @@ urlpatterns = [
     re_path(r"^create-readthrough/?$", views.create_readthrough),
     re_path(r"^delete-progressupdate/?$", views.delete_progressupdate),
     # shelve actions
-    re_path(r"^to-read/(?P<book_id>\d+)/?$", views.WantToRead.as_view(), name="to-read"),
-    re_path(r"^start-reading/(?P<book_id>\d+)/?$", views.StartReading.as_view(), name="start-reading"),
-    re_path(r"^finish-reading/(?P<book_id>\d+)/?$", views.FinishReading.as_view(), name="finish-reading"),
+    re_path(
+        r"^to-read/(?P<book_id>\d+)/?$", views.WantToRead.as_view(), name="to-read"
+    ),
+    re_path(
+        r"^start-reading/(?P<book_id>\d+)/?$",
+        views.StartReading.as_view(),
+        name="start-reading",
+    ),
+    re_path(
+        r"^finish-reading/(?P<book_id>\d+)/?$",
+        views.FinishReading.as_view(),
+        name="finish-reading",
+    ),
     # following
     re_path(r"^follow/?$", views.follow, name="follow"),
     re_path(r"^unfollow/?$", views.unfollow, name="unfollow"),
diff --git a/bookwyrm/views/reading.py b/bookwyrm/views/reading.py
index 7c7fd4b0..cb382330 100644
--- a/bookwyrm/views/reading.py
+++ b/bookwyrm/views/reading.py
@@ -13,7 +13,6 @@ from django.views.decorators.http import require_POST
 
 from bookwyrm import models
 from .helpers import get_edition, handle_reading_status
-from .shelf import handle_unshelve
 
 
 @method_decorator(login_required, name="dispatch")
@@ -23,36 +22,10 @@ class WantToRead(View):
 
     def post(self, request, book_id):
         """desire a book"""
-        book = get_edition(book_id)
         desired_shelf = models.Shelf.objects.filter(
             identifier=models.Shelf.TO_READ, user=request.user
         ).first()
-
-        current_status_shelfbook = (
-            models.ShelfBook.objects.select_related("shelf")
-            .filter(
-                shelf__identifier__in=models.Shelf.READ_STATUS_IDENTIFIERS,
-                user=request.user,
-                book=book,
-            )
-            .first()
-        )
-        if current_status_shelfbook is not None:
-            if current_status_shelfbook.shelf.identifier != models.Shelf.READING:
-                handle_unshelve(book, current_status_shelfbook.shelf)
-            else:  # It already was on the shelf
-                return redirect(request.headers.get("Referer", "/"))
-
-        models.ShelfBook.objects.create(
-            book=book, shelf=desired_shelf, user=request.user
-        )
-
-        # post about it (if you want)
-        if request.POST.get("post-status"):
-            privacy = request.POST.get("privacy")
-            handle_reading_status(request.user, desired_shelf, book, privacy)
-
-        return redirect(request.headers.get("Referer", "/"))
+        return handle_shelve(request, book_id, desired_shelf)
 
 
 @method_decorator(login_required, name="dispatch")
@@ -62,44 +35,10 @@ class StartReading(View):
 
     def post(self, request, book_id):
         """begin reading a book"""
-        book = get_edition(book_id)
         desired_shelf = models.Shelf.objects.filter(
             identifier=models.Shelf.READING, user=request.user
         ).first()
-
-        # create a readthrough
-        readthrough = update_readthrough(request, book=book)
-        if readthrough:
-            readthrough.save()
-
-            # create a progress update if we have a page
-            readthrough.create_update()
-
-        current_status_shelfbook = (
-            models.ShelfBook.objects.select_related("shelf")
-            .filter(
-                shelf__identifier__in=models.Shelf.READ_STATUS_IDENTIFIERS,
-                user=request.user,
-                book=book,
-            )
-            .first()
-        )
-        if current_status_shelfbook is not None:
-            if current_status_shelfbook.shelf.identifier != models.Shelf.READING:
-                handle_unshelve(book, current_status_shelfbook.shelf)
-            else:  # It already was on the shelf
-                return redirect(request.headers.get("Referer", "/"))
-
-        models.ShelfBook.objects.create(
-            book=book, shelf=desired_shelf, user=request.user
-        )
-
-        # post about it (if you want)
-        if request.POST.get("post-status"):
-            privacy = request.POST.get("privacy")
-            handle_reading_status(request.user, desired_shelf, book, privacy)
-
-        return redirect(request.headers.get("Referer", "/"))
+        return handle_shelve(request, book_id, desired_shelf)
 
 
 @method_decorator(login_required, name="dispatch")
@@ -109,41 +48,50 @@ class FinishReading(View):
 
     def post(self, request, book_id):
         """a user completed a book, yay"""
-        book = get_edition(book_id)
         desired_shelf = models.Shelf.objects.filter(
             identifier=models.Shelf.READ_FINISHED, user=request.user
         ).first()
+        return handle_shelve(request, book_id, desired_shelf)
 
+
+def handle_shelve(request, book_id, desired_shelf):
+    """these are all basically the same"""
+    book = get_edition(book_id)
+
+    reshelve_book(request.user, book, desired_shelf)
+
+    if desired_shelf.identifier != models.Shelf.TO_READ:
         # update or create a readthrough
         readthrough = update_readthrough(request, book=book)
         if readthrough:
             readthrough.save()
 
-        current_status_shelfbook = (
-            models.ShelfBook.objects.select_related("shelf")
-            .filter(
-                shelf__identifier__in=models.Shelf.READ_STATUS_IDENTIFIERS,
-                user=request.user,
-                book=book,
-            )
-            .first()
+    # post about it (if you want)
+    if request.POST.get("post-status"):
+        privacy = request.POST.get("privacy")
+        handle_reading_status(request.user, desired_shelf, book, privacy)
+
+    return redirect(request.headers.get("Referer", "/"))
+
+
+def reshelve_book(user, book, desired_shelf):
+    """move a book to a new shelf"""
+    current_status_shelfbook = (
+        models.ShelfBook.objects.select_related("shelf")
+        .filter(
+            shelf__identifier__in=models.Shelf.READ_STATUS_IDENTIFIERS,
+            user=user,
+            book=book,
         )
-        if current_status_shelfbook is not None:
-            if current_status_shelfbook.shelf.identifier != models.Shelf.READ_FINISHED:
-                handle_unshelve(book, current_status_shelfbook.shelf)
-            else:  # It already was on the shelf
-                return redirect(request.headers.get("Referer", "/"))
+        .first()
+    )
+    if current_status_shelfbook is not None:
+        if current_status_shelfbook.shelf.identifier != desired_shelf.identifier:
+            current_status_shelfbook.delete()
+        else:  # It already was on the shelf
+            return
 
-        models.ShelfBook.objects.create(
-            book=book, shelf=desired_shelf, user=request.user
-        )
-
-        # post about it (if you want)
-        if request.POST.get("post-status"):
-            privacy = request.POST.get("privacy")
-            handle_reading_status(request.user, desired_shelf, book, privacy)
-
-        return redirect(request.headers.get("Referer", "/"))
+    models.ShelfBook.objects.create(book=book, shelf=desired_shelf, user=user)
 
 
 @login_required
diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index b16f3741..17efec68 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -201,7 +201,6 @@ def unshelve(request):
     return redirect(request.headers.get("Referer", "/"))
 
 
-# pylint: disable=unused-argument
 def handle_unshelve(book, shelf):
     """unshelve a book"""
     row = models.ShelfBook.objects.get(book=book, shelf=shelf)

From 3356c652eecef652dc0f1c37665c665c678d23c3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 8 Jun 2021 11:55:18 -0700
Subject: [PATCH 1256/1285] Adds standalone modal views for reading steps

---
 bookwyrm/templates/reading_progress/finish.html | 14 ++++++++++++++
 bookwyrm/templates/reading_progress/start.html  |  2 +-
 bookwyrm/templates/reading_progress/want.html   | 14 ++++++++++++++
 bookwyrm/views/reading.py                       | 16 ++++++++++++++++
 4 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 bookwyrm/templates/reading_progress/finish.html
 create mode 100644 bookwyrm/templates/reading_progress/want.html

diff --git a/bookwyrm/templates/reading_progress/finish.html b/bookwyrm/templates/reading_progress/finish.html
new file mode 100644
index 00000000..a9f60f04
--- /dev/null
+++ b/bookwyrm/templates/reading_progress/finish.html
@@ -0,0 +1,14 @@
+{% extends 'layout.html' %}
+{% load i18n %}
+
+{% block title %}
+{% blocktrans trimmed with book_title=book.title %}
+Finish "{{ book_title }}"
+{% endblocktrans %}
+{% endblock %}
+
+{% block content %}
+
+{% include "snippets/shelve_button/finish_reading_modal.html" with book=book active=True %}
+
+{% endblock %}
diff --git a/bookwyrm/templates/reading_progress/start.html b/bookwyrm/templates/reading_progress/start.html
index c5d3f91b..9c457947 100644
--- a/bookwyrm/templates/reading_progress/start.html
+++ b/bookwyrm/templates/reading_progress/start.html
@@ -9,6 +9,6 @@ Start "{{ book_title }}"
 
 {% block content %}
 
-{% include "snippets/shelve_button/start_reading_modal.html" active=True %}
+{% include "snippets/shelve_button/start_reading_modal.html" with book=book active=True %}
 
 {% endblock %}
diff --git a/bookwyrm/templates/reading_progress/want.html b/bookwyrm/templates/reading_progress/want.html
new file mode 100644
index 00000000..8e75d470
--- /dev/null
+++ b/bookwyrm/templates/reading_progress/want.html
@@ -0,0 +1,14 @@
+{% extends 'layout.html' %}
+{% load i18n %}
+
+{% block title %}
+{% blocktrans trimmed with book_title=book.title %}
+Want to Read "{{ book_title }}"
+{% endblocktrans %}
+{% endblock %}
+
+{% block content %}
+
+{% include "snippets/shelve_button/want_to_read_modal.html" with book=book active=True no_body=True %}
+
+{% endblock %}
diff --git a/bookwyrm/views/reading.py b/bookwyrm/views/reading.py
index cb382330..28809383 100644
--- a/bookwyrm/views/reading.py
+++ b/bookwyrm/views/reading.py
@@ -7,6 +7,7 @@ from dateutil.parser import ParserError
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponseBadRequest, HttpResponseNotFound
 from django.shortcuts import get_object_or_404, redirect
+from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
 from django.views.decorators.http import require_POST
@@ -20,6 +21,11 @@ from .helpers import get_edition, handle_reading_status
 class WantToRead(View):
     """consider reading a book"""
 
+    def get(self, request, book_id):
+        """modal page"""
+        book = get_edition(book_id)
+        return TemplateResponse(request, "reading_progress/want.html", {"book": book})
+
     def post(self, request, book_id):
         """desire a book"""
         desired_shelf = models.Shelf.objects.filter(
@@ -33,6 +39,11 @@ class WantToRead(View):
 class StartReading(View):
     """begin a book"""
 
+    def get(self, request, book_id):
+        """modal page"""
+        book = get_edition(book_id)
+        return TemplateResponse(request, "reading_progress/start.html", {"book": book})
+
     def post(self, request, book_id):
         """begin reading a book"""
         desired_shelf = models.Shelf.objects.filter(
@@ -46,6 +57,11 @@ class StartReading(View):
 class FinishReading(View):
     """finish a book"""
 
+    def get(self, request, book_id):
+        """modal page"""
+        book = get_edition(book_id)
+        return TemplateResponse(request, "reading_progress/finish.html", {"book": book})
+
     def post(self, request, book_id):
         """a user completed a book, yay"""
         desired_shelf = models.Shelf.objects.filter(

From eb12506985744a8fa68237df64a5b8f10b46908e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 8 Jun 2021 12:40:01 -0700
Subject: [PATCH 1257/1285] No script fallback mode

---
 bookwyrm/static/js/bookwyrm.js                | 28 ++++++++++---------
 .../shelve_button/shelve_button_options.html  | 19 ++++++++++---
 .../snippets/toggle/toggle_button.html        | 12 +++++++-
 3 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index 598dd93a..00dda1ab 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -3,7 +3,7 @@
 
 let BookWyrm = new class {
     constructor() {
-        this.MAX_FILE_SIZE_BYTES = 10 * 1000000
+        this.MAX_FILE_SIZE_BYTES = 10 * 1000000;
         this.initOnDOMLoaded();
         this.initReccuringTasks();
         this.initEventListeners();
@@ -45,14 +45,14 @@ let BookWyrm = new class {
      * Execute code once the DOM is loaded.
      */
     initOnDOMLoaded() {
-        const bookwyrm = this
+        const bookwyrm = this;
 
         window.addEventListener('DOMContentLoaded', function() {
             document.querySelectorAll('.tab-group')
                 .forEach(tabs => new TabGroup(tabs));
             document.querySelectorAll('input[type="file"]').forEach(
                 bookwyrm.disableIfTooLarge.bind(bookwyrm)
-            )
+            );
         });
     }
 
@@ -138,6 +138,7 @@ let BookWyrm = new class {
      * @return {undefined}
      */
     toggleAction(event) {
+        event.preventDefault();
         let trigger = event.currentTarget;
         let pressed = trigger.getAttribute('aria-pressed') === 'false';
         let targetId = trigger.dataset.controls;
@@ -182,6 +183,7 @@ let BookWyrm = new class {
         if (focus) {
             this.toggleFocus(focus);
         }
+        return false;
     }
 
     /**
@@ -298,25 +300,25 @@ let BookWyrm = new class {
     }
 
     disableIfTooLarge(eventOrElement) {
-        const { addRemoveClass, MAX_FILE_SIZE_BYTES } = this
-        const element = eventOrElement.currentTarget || eventOrElement
+        const { addRemoveClass, MAX_FILE_SIZE_BYTES } = this;
+        const element = eventOrElement.currentTarget || eventOrElement;
 
-        const submits = element.form.querySelectorAll('[type="submit"]')
-        const warns = element.parentElement.querySelectorAll('.file-too-big')
+        const submits = element.form.querySelectorAll('[type="submit"]');
+        const warns = element.parentElement.querySelectorAll('.file-too-big');
         const isTooBig = element.files &&
             element.files[0] &&
-            element.files[0].size > MAX_FILE_SIZE_BYTES
+            element.files[0].size > MAX_FILE_SIZE_BYTES;
 
         if (isTooBig) {
-            submits.forEach(submitter => submitter.disabled = true)
+            submits.forEach(submitter => submitter.disabled = true);
             warns.forEach(
                 sib => addRemoveClass(sib, 'is-hidden', false)
-            )
+            );
         } else {
-            submits.forEach(submitter => submitter.disabled = false)
+            submits.forEach(submitter => submitter.disabled = false);
             warns.forEach(
                 sib => addRemoveClass(sib, 'is-hidden', true)
-            )
+            );
         }
     }
-}
+}();
diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
index 1ce10e7c..12c8a637 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
@@ -7,16 +7,25 @@
 {% if dropdown %}<li role="menuitem" class="dropdown-item p-0">{% endif %}
     <div class="{% if not dropdown and active_shelf.shelf.identifier|next_shelf != shelf.identifier %}is-hidden{% endif %}">
     {% if shelf.identifier == 'reading' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
+
         {% trans "Start reading" as button_text %}
-        {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="start-reading" controls_uid=button_uuid focus="modal-title-start-reading" disabled=is_current %}
+        {% url 'start-reading' book.id as fallback_url %}
+        {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="start-reading" controls_uid=button_uuid focus="modal-title-start-reading" disabled=is_current fallback_url=fallback_url %}
+
     {% endif %}{% elif shelf.identifier == 'read' and active_shelf.shelf.identifier == 'read' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
     <button type="button" class="button {{ class }}" disabled><span>{% trans "Read" %}</span>
     {% endif %}{% elif shelf.identifier == 'read' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
+
         {% trans "Finish reading" as button_text %}
-        {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="finish-reading" controls_uid=button_uuid focus="modal-title-finish-reading" disabled=is_current %}
+        {% url 'finish-reading' book.id as fallback_url %}
+        {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="finish-reading" controls_uid=button_uuid focus="modal-title-finish-reading" disabled=is_current fallback_url=fallback_url %}
+
     {% endif %}{% elif shelf.identifier == 'to-read' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
+
         {% trans "Want to read" as button_text %}
-        {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="want-to-read" controls_uid=button_uuid focus="modal-title-want-to-read" disabled=is_current %}
+        {% url 'to-read' book.id as fallback_url %}
+        {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="want-to-read" controls_uid=button_uuid focus="modal-title-want-to-read" disabled=is_current fallback_url=fallback_url %}
+
     {% endif %}{% elif shelf.editable %}
         <form name="shelve" action="/shelve/" method="post">
             {% csrf_token %}
@@ -44,7 +53,9 @@
         {% csrf_token %}
         <input type="hidden" name="book" value="{{ active_shelf.book.id }}">
         <input type="hidden" name="shelf" value="{{ active_shelf.shelf.id }}">
-        <button class="button is-fullwidth is-small{% if dropdown %} is-radiusless{% endif %} is-danger is-light" type="submit">{% blocktrans with name=active_shelf.shelf.name %}Remove from {{ name }}{% endblocktrans %}</button>
+        <button class="button is-fullwidth is-small{% if dropdown %} is-radiusless{% endif %} is-danger is-light" type="submit">
+            {% blocktrans with name=active_shelf.shelf.name %}Remove from {{ name }}{% endblocktrans %}
+        </button>
     </form>
 </li>
 {% endif %}
diff --git a/bookwyrm/templates/snippets/toggle/toggle_button.html b/bookwyrm/templates/snippets/toggle/toggle_button.html
index 410f823b..7a80f342 100644
--- a/bookwyrm/templates/snippets/toggle/toggle_button.html
+++ b/bookwyrm/templates/snippets/toggle/toggle_button.html
@@ -1,5 +1,12 @@
+{% if fallback_url %}
+<form name="fallback-form-{{ controls_uuid}}" method="GET" action="{{ fallback_url }}">
+{% endif %}
 <button
-    type="button"
+    {% if not fallback_url %}
+        type="button"
+    {% else %}
+        type="submit"
+    {% endif %}
     class="{% if not nonbutton %}button {% endif %}{{ class }}{% if button_type %} {{ button_type }}{% endif %}"
     data-controls="{{ controls_text }}{% if controls_uid %}-{{ controls_uid }}{% endif %}"
     {% if focus %}data-focus-target="{{ focus }}{% if controls_uid %}-{{ controls_uid }}{% endif %}"{% endif %}
@@ -20,3 +27,6 @@
     <span>{{ text }}</span>
     {% endif %}
 </button>
+{% if fallback_url %}
+</form>
+{% endif %}

From e65bc09e7a840ef3ada1c4b6725bbeb551e61ebc Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 8 Jun 2021 12:42:45 -0700
Subject: [PATCH 1258/1285] Linter fixes

---
 bookwyrm/static/js/bookwyrm.js     | 1 +
 bookwyrm/static/js/localstorage.js | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index 00dda1ab..e43ed134 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -183,6 +183,7 @@ let BookWyrm = new class {
         if (focus) {
             this.toggleFocus(focus);
         }
+
         return false;
     }
 
diff --git a/bookwyrm/static/js/localstorage.js b/bookwyrm/static/js/localstorage.js
index 05955779..b485ed7e 100644
--- a/bookwyrm/static/js/localstorage.js
+++ b/bookwyrm/static/js/localstorage.js
@@ -17,7 +17,7 @@ let LocalStorageTools = new class {
      * @return {undefined}
      */
     updateDisplay(event) {
-        // used in set reading goal
+        // Used in set reading goal
         let key = event.target.dataset.id;
         let value = event.target.dataset.value;
 
@@ -34,10 +34,10 @@ let LocalStorageTools = new class {
      * @return {undefined}
      */
     setDisplay(node) {
-        // used in set reading goal
+        // Used in set reading goal
         let key = node.dataset.hide;
         let value = window.localStorage.getItem(key);
 
         BookWyrm.addRemoveClass(node, 'is-hidden', value);
     }
-}
+}();

From a00fdc68644baea5f77b8c5f0b00143af15c976d Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 8 Jun 2021 14:42:55 -0700
Subject: [PATCH 1259/1285] Updates tests for reading views

---
 bookwyrm/tests/views/test_reading.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/tests/views/test_reading.py b/bookwyrm/tests/views/test_reading.py
index c591aa60..e14575e0 100644
--- a/bookwyrm/tests/views/test_reading.py
+++ b/bookwyrm/tests/views/test_reading.py
@@ -56,7 +56,7 @@ class ReadingViews(TestCase):
         )
         request.user = self.local_user
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            views.start_reading(request, self.book.id)
+            views.StartReading.as_view()(request, self.book.id)
 
         self.assertEqual(shelf.books.get(), self.book)
 
@@ -86,7 +86,7 @@ class ReadingViews(TestCase):
         request = self.factory.post("")
         request.user = self.local_user
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            views.start_reading(request, self.book.id)
+            views.StartReading.as_view()(request, self.book.id)
 
         self.assertFalse(to_read_shelf.books.exists())
         self.assertEqual(shelf.books.get(), self.book)
@@ -112,7 +112,7 @@ class ReadingViews(TestCase):
         request.user = self.local_user
 
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            views.finish_reading(request, self.book.id)
+            views.FinishReading.as_view()(request, self.book.id)
 
         self.assertEqual(shelf.books.get(), self.book)
 

From 625ab46059099d5f6f3182242233fc9edc8bfe47 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Tue, 8 Jun 2021 15:03:50 -0700
Subject: [PATCH 1260/1285] Removes start reading with progress test

There's no way to do this from the ui???? I don't tihnk there ever
was???
---
 bookwyrm/tests/views/test_readthrough.py | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/bookwyrm/tests/views/test_readthrough.py b/bookwyrm/tests/views/test_readthrough.py
index 882c7929..a686cb7c 100644
--- a/bookwyrm/tests/views/test_readthrough.py
+++ b/bookwyrm/tests/views/test_readthrough.py
@@ -57,7 +57,6 @@ class ReadThrough(TestCase):
             "/start-reading/{}".format(self.edition.id),
             {
                 "start_date": "2020-11-27",
-                "progress": 50,
             },
         )
 
@@ -66,15 +65,8 @@ class ReadThrough(TestCase):
         self.assertEqual(
             readthroughs[0].start_date, datetime(2020, 11, 27, tzinfo=timezone.utc)
         )
-        self.assertEqual(readthroughs[0].progress, 50)
         self.assertEqual(readthroughs[0].finish_date, None)
 
-        progress_updates = readthroughs[0].progressupdate_set.all()
-        self.assertEqual(len(progress_updates), 1)
-        self.assertEqual(progress_updates[0].mode, models.ProgressMode.PAGE)
-        self.assertEqual(progress_updates[0].progress, 50)
-        self.assertEqual(delay_mock.call_count, 1)
-
         # Update progress
         self.client.post(
             "/edit-readthrough",
@@ -87,9 +79,9 @@ class ReadThrough(TestCase):
         progress_updates = (
             readthroughs[0].progressupdate_set.order_by("updated_date").all()
         )
-        self.assertEqual(len(progress_updates), 2)
-        self.assertEqual(progress_updates[1].mode, models.ProgressMode.PAGE)
-        self.assertEqual(progress_updates[1].progress, 100)
+        self.assertEqual(len(progress_updates), 1)
+        self.assertEqual(progress_updates[0].mode, models.ProgressMode.PAGE)
+        self.assertEqual(progress_updates[0].progress, 100)
 
         # Edit doesn't publish anything
         self.assertEqual(delay_mock.call_count, 1)

From eb087e131ea69fd7ceb5a2f1a14dd8987b7bc0ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jun 2021 17:22:45 +0000
Subject: [PATCH 1261/1285] Bump trim-newlines from 3.0.0 to 3.0.1

Bumps [trim-newlines](https://github.com/sindresorhus/trim-newlines) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/sindresorhus/trim-newlines/releases)
- [Commits](https://github.com/sindresorhus/trim-newlines/commits)

---
updated-dependencies:
- dependency-name: trim-newlines
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 21730a68..7686fd11 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2042,9 +2042,9 @@ to-regex-range@^5.0.1:
     is-number "^7.0.0"
 
 trim-newlines@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.0.tgz#79726304a6a898aa8373427298d54c2ee8b1cb30"
-  integrity sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
+  integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
 
 trough@^1.0.0:
   version "1.0.5"

From a8eb21f9925dd2a71180b40c9a41e8de39492f55 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jun 2021 17:22:46 +0000
Subject: [PATCH 1262/1285] Bump django from 3.2.1 to 3.2.2

Bumps [django](https://github.com/django/django) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.1...3.2.2)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 3e50a034..7b06245f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 celery==4.4.2
-Django==3.2.1
+Django==3.2.2
 django-model-utils==4.0.0
 environs==7.2.0
 flower==0.9.4

From 113ced290084ab8238226ce88dd0413e6ad021c3 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 9 Jun 2021 10:36:52 -0700
Subject: [PATCH 1263/1285] Merge reading status views into one view

---
 .../shelve_button/finish_reading_modal.html   |   2 +-
 .../shelve_button/start_reading_modal.html    |   2 +-
 .../shelve_button/want_to_read_modal.html     |   2 +-
 bookwyrm/tests/views/test_reading.py          |   4 +-
 bookwyrm/urls.py                              |  14 +-
 bookwyrm/views/__init__.py                    |   5 +-
 bookwyrm/views/reading.py                     | 126 +++++++-----------
 7 files changed, 60 insertions(+), 95 deletions(-)

diff --git a/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html b/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
index 0ed13ec7..36addc7b 100644
--- a/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
+++ b/bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html
@@ -7,7 +7,7 @@
 
 
 {% block modal-form-open %}
-<form name="finish-reading" action="{% url 'finish-reading' book.id %}" method="post">
+<form name="finish-reading" action="{% url 'reading-status' 'finish' book.id %}" method="post">
 {% endblock %}
 
 {% block modal-body %}
diff --git a/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html b/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html
index 628841cc..1858313b 100644
--- a/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html
+++ b/bookwyrm/templates/snippets/shelve_button/start_reading_modal.html
@@ -8,7 +8,7 @@ Start "<em>{{ book_title }}</em>"
 {% endblock %}
 
 {% block modal-form-open %}
-<form name="start-reading" action="{% url 'start-reading' book.id %}" method="post">
+<form name="start-reading" action="{% url 'reading-status' 'start' book.id %}" method="post">
 {% endblock %}
 
 {% block modal-body %}
diff --git a/bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html b/bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html
index 21209e0a..643e4a20 100644
--- a/bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html
+++ b/bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html
@@ -6,7 +6,7 @@
 {% endblock %}
 
 {% block modal-form-open %}
-<form name="shelve" action="{% url 'to-read' book.id %}" method="post">
+<form name="shelve" action="{% url 'reading-status' 'want' book.id %}" method="post">
     {% csrf_token %}
     <input type="hidden" name="book" value="{{ active_shelf.book.id }}">
     <input type="hidden" name="shelf" value="to-read">
diff --git a/bookwyrm/tests/views/test_reading.py b/bookwyrm/tests/views/test_reading.py
index e14575e0..fc0d56cf 100644
--- a/bookwyrm/tests/views/test_reading.py
+++ b/bookwyrm/tests/views/test_reading.py
@@ -56,7 +56,7 @@ class ReadingViews(TestCase):
         )
         request.user = self.local_user
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            views.StartReading.as_view()(request, self.book.id)
+            views.ReadingStatus.as_view()(request, "start", self.book.id)
 
         self.assertEqual(shelf.books.get(), self.book)
 
@@ -112,7 +112,7 @@ class ReadingViews(TestCase):
         request.user = self.local_user
 
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            views.FinishReading.as_view()(request, self.book.id)
+            views.ReadingStatus.as_view()(request, "finish", self.book.id)
 
         self.assertEqual(shelf.books.get(), self.book)
 
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index da6919cf..6d70ee1e 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -317,17 +317,9 @@ urlpatterns = [
     re_path(r"^delete-progressupdate/?$", views.delete_progressupdate),
     # shelve actions
     re_path(
-        r"^to-read/(?P<book_id>\d+)/?$", views.WantToRead.as_view(), name="to-read"
-    ),
-    re_path(
-        r"^start-reading/(?P<book_id>\d+)/?$",
-        views.StartReading.as_view(),
-        name="start-reading",
-    ),
-    re_path(
-        r"^finish-reading/(?P<book_id>\d+)/?$",
-        views.FinishReading.as_view(),
-        name="finish-reading",
+        r"^reading-status/(?P<status>want|start|finish)/(?P<book_id>\d+)/?$",
+        views.ReadingStatus.as_view(),
+        name="reading-status",
     ),
     # following
     re_path(r"^follow/?$", views.follow, name="follow"),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 43743b1c..486b99ed 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -24,8 +24,9 @@ from .landing import About, Home, Discover
 from .list import Lists, List, Curate, UserLists
 from .notifications import Notifications
 from .outbox import Outbox
-from .reading import edit_readthrough, create_readthrough, delete_readthrough
-from .reading import WantToRead, StartReading, FinishReading, delete_progressupdate
+from .reading import edit_readthrough, create_readthrough
+from .reading import delete_readthrough, delete_progressupdate
+from .reading import ReadingStatus
 from .reports import Report, Reports, make_report, resolve_report, suspend_user
 from .rss_feed import RssFeed
 from .password import PasswordResetRequest, PasswordReset, ChangePassword
diff --git a/bookwyrm/views/reading.py b/bookwyrm/views/reading.py
index 28809383..14e02ae6 100644
--- a/bookwyrm/views/reading.py
+++ b/bookwyrm/views/reading.py
@@ -18,96 +18,68 @@ from .helpers import get_edition, handle_reading_status
 
 @method_decorator(login_required, name="dispatch")
 # pylint: disable=no-self-use
-class WantToRead(View):
+class ReadingStatus(View):
     """consider reading a book"""
 
-    def get(self, request, book_id):
+    def get(self, request, status, book_id):
         """modal page"""
         book = get_edition(book_id)
-        return TemplateResponse(request, "reading_progress/want.html", {"book": book})
+        template = {
+            "want": "want.html",
+            "finish": "start.html",
+            "start": "finish.html",
+        }.get(status)
+        if not template:
+            return HttpResponseNotFound()
+        return TemplateResponse(request, f"reading_progress/{template}", {"book": book})
 
-    def post(self, request, book_id):
+    def post(self, request, status, book_id):
         """desire a book"""
+        identifier = {
+            "want": models.Shelf.TO_READ,
+            "start": models.Shelf.READING,
+            "finish": models.Shelf.READ_FINISHED,
+        }.get(status)
+        if not identifier:
+            return HttpResponseBadRequest()
+
         desired_shelf = models.Shelf.objects.filter(
-            identifier=models.Shelf.TO_READ, user=request.user
+            identifier=identifier, user=request.user
         ).first()
-        return handle_shelve(request, book_id, desired_shelf)
 
-
-@method_decorator(login_required, name="dispatch")
-# pylint: disable=no-self-use
-class StartReading(View):
-    """begin a book"""
-
-    def get(self, request, book_id):
-        """modal page"""
         book = get_edition(book_id)
-        return TemplateResponse(request, "reading_progress/start.html", {"book": book})
 
-    def post(self, request, book_id):
-        """begin reading a book"""
-        desired_shelf = models.Shelf.objects.filter(
-            identifier=models.Shelf.READING, user=request.user
-        ).first()
-        return handle_shelve(request, book_id, desired_shelf)
-
-
-@method_decorator(login_required, name="dispatch")
-# pylint: disable=no-self-use
-class FinishReading(View):
-    """finish a book"""
-
-    def get(self, request, book_id):
-        """modal page"""
-        book = get_edition(book_id)
-        return TemplateResponse(request, "reading_progress/finish.html", {"book": book})
-
-    def post(self, request, book_id):
-        """a user completed a book, yay"""
-        desired_shelf = models.Shelf.objects.filter(
-            identifier=models.Shelf.READ_FINISHED, user=request.user
-        ).first()
-        return handle_shelve(request, book_id, desired_shelf)
-
-
-def handle_shelve(request, book_id, desired_shelf):
-    """these are all basically the same"""
-    book = get_edition(book_id)
-
-    reshelve_book(request.user, book, desired_shelf)
-
-    if desired_shelf.identifier != models.Shelf.TO_READ:
-        # update or create a readthrough
-        readthrough = update_readthrough(request, book=book)
-        if readthrough:
-            readthrough.save()
-
-    # post about it (if you want)
-    if request.POST.get("post-status"):
-        privacy = request.POST.get("privacy")
-        handle_reading_status(request.user, desired_shelf, book, privacy)
-
-    return redirect(request.headers.get("Referer", "/"))
-
-
-def reshelve_book(user, book, desired_shelf):
-    """move a book to a new shelf"""
-    current_status_shelfbook = (
-        models.ShelfBook.objects.select_related("shelf")
-        .filter(
-            shelf__identifier__in=models.Shelf.READ_STATUS_IDENTIFIERS,
-            user=user,
-            book=book,
+        current_status_shelfbook = (
+            models.ShelfBook.objects.select_related("shelf")
+            .filter(
+                shelf__identifier__in=models.Shelf.READ_STATUS_IDENTIFIERS,
+                user=request.user,
+                book=book,
+            )
+            .first()
         )
-        .first()
-    )
-    if current_status_shelfbook is not None:
-        if current_status_shelfbook.shelf.identifier != desired_shelf.identifier:
-            current_status_shelfbook.delete()
-        else:  # It already was on the shelf
-            return
+        if current_status_shelfbook is not None:
+            if current_status_shelfbook.shelf.identifier != desired_shelf.identifier:
+                current_status_shelfbook.delete()
+            else:  # It already was on the shelf
+                return redirect(request.headers.get("Referer", "/"))
 
-    models.ShelfBook.objects.create(book=book, shelf=desired_shelf, user=user)
+        models.ShelfBook.objects.create(
+            book=book, shelf=desired_shelf, user=request.user
+        )
+
+        if desired_shelf.identifier != models.Shelf.TO_READ:
+            # update or create a readthrough
+            readthrough = update_readthrough(request, book=book)
+            if readthrough:
+                readthrough.save()
+
+        # post about it (if you want)
+        if request.POST.get("post-status"):
+            privacy = request.POST.get("privacy")
+            handle_reading_status(request.user, desired_shelf, book, privacy)
+
+        return redirect(request.headers.get("Referer", "/"))
 
 
 @login_required

From 3c7c8a179798039bcf5ba681b150e3ca79cff0b2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 9 Jun 2021 11:05:05 -0700
Subject: [PATCH 1264/1285] Fixes urls in fallback mode

---
 .../snippets/shelve_button/shelve_button_options.html       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
index 12c8a637..d57ad520 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
@@ -9,7 +9,7 @@
     {% if shelf.identifier == 'reading' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
 
         {% trans "Start reading" as button_text %}
-        {% url 'start-reading' book.id as fallback_url %}
+        {% url 'reading-progress' 'start' book.id as fallback_url %}
         {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="start-reading" controls_uid=button_uuid focus="modal-title-start-reading" disabled=is_current fallback_url=fallback_url %}
 
     {% endif %}{% elif shelf.identifier == 'read' and active_shelf.shelf.identifier == 'read' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
@@ -17,13 +17,13 @@
     {% endif %}{% elif shelf.identifier == 'read' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
 
         {% trans "Finish reading" as button_text %}
-        {% url 'finish-reading' book.id as fallback_url %}
+        {% url 'reading-progress' 'finish' book.id as fallback_url %}
         {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="finish-reading" controls_uid=button_uuid focus="modal-title-finish-reading" disabled=is_current fallback_url=fallback_url %}
 
     {% endif %}{% elif shelf.identifier == 'to-read' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
 
         {% trans "Want to read" as button_text %}
-        {% url 'to-read' book.id as fallback_url %}
+        {% url 'reading-progress' 'want' book.id as fallback_url %}
         {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="want-to-read" controls_uid=button_uuid focus="modal-title-want-to-read" disabled=is_current fallback_url=fallback_url %}
 
     {% endif %}{% elif shelf.editable %}

From 4107f7ddf1c999dff904a403371fc3543120dcf5 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 9 Jun 2021 11:05:15 -0700
Subject: [PATCH 1265/1285] Updates readthrough tests

---
 bookwyrm/tests/views/test_readthrough.py | 4 ++--
 bookwyrm/views/reading.py                | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bookwyrm/tests/views/test_readthrough.py b/bookwyrm/tests/views/test_readthrough.py
index a686cb7c..f51e89af 100644
--- a/bookwyrm/tests/views/test_readthrough.py
+++ b/bookwyrm/tests/views/test_readthrough.py
@@ -33,7 +33,7 @@ class ReadThrough(TestCase):
         self.assertEqual(self.edition.readthrough_set.count(), 0)
 
         self.client.post(
-            "/start-reading/{}".format(self.edition.id),
+            "/reading-progress/start/{}".format(self.edition.id),
             {
                 "start_date": "2020-11-27",
             },
@@ -54,7 +54,7 @@ class ReadThrough(TestCase):
         self.assertEqual(self.edition.readthrough_set.count(), 0)
 
         self.client.post(
-            "/start-reading/{}".format(self.edition.id),
+            "/reading-progress/start/{}".format(self.edition.id),
             {
                 "start_date": "2020-11-27",
             },
diff --git a/bookwyrm/views/reading.py b/bookwyrm/views/reading.py
index 14e02ae6..1c897ab3 100644
--- a/bookwyrm/views/reading.py
+++ b/bookwyrm/views/reading.py
@@ -26,8 +26,8 @@ class ReadingStatus(View):
         book = get_edition(book_id)
         template = {
             "want": "want.html",
-            "finish": "start.html",
-            "start": "finish.html",
+            "start": "start.html",
+            "finish": "finish.html",
         }.get(status)
         if not template:
             return HttpResponseNotFound()

From ce4a57e5c9d50c71852e37245dbfd8a5805ede79 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 9 Jun 2021 11:16:52 -0700
Subject: [PATCH 1266/1285] Reading status view name

---
 .../snippets/shelve_button/shelve_button_options.html       | 6 +++---
 bookwyrm/tests/views/test_readthrough.py                    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
index d57ad520..69665a82 100644
--- a/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
+++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_options.html
@@ -9,7 +9,7 @@
     {% if shelf.identifier == 'reading' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
 
         {% trans "Start reading" as button_text %}
-        {% url 'reading-progress' 'start' book.id as fallback_url %}
+        {% url 'reading-status' 'start' book.id as fallback_url %}
         {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="start-reading" controls_uid=button_uuid focus="modal-title-start-reading" disabled=is_current fallback_url=fallback_url %}
 
     {% endif %}{% elif shelf.identifier == 'read' and active_shelf.shelf.identifier == 'read' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
@@ -17,13 +17,13 @@
     {% endif %}{% elif shelf.identifier == 'read' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
 
         {% trans "Finish reading" as button_text %}
-        {% url 'reading-progress' 'finish' book.id as fallback_url %}
+        {% url 'reading-status' 'finish' book.id as fallback_url %}
         {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="finish-reading" controls_uid=button_uuid focus="modal-title-finish-reading" disabled=is_current fallback_url=fallback_url %}
 
     {% endif %}{% elif shelf.identifier == 'to-read' %}{% if not dropdown or active_shelf.shelf.identifier|next_shelf != shelf.identifier %}
 
         {% trans "Want to read" as button_text %}
-        {% url 'reading-progress' 'want' book.id as fallback_url %}
+        {% url 'reading-status' 'want' book.id as fallback_url %}
         {% include 'snippets/toggle/toggle_button.html' with class=class text=button_text controls_text="want-to-read" controls_uid=button_uuid focus="modal-title-want-to-read" disabled=is_current fallback_url=fallback_url %}
 
     {% endif %}{% elif shelf.editable %}
diff --git a/bookwyrm/tests/views/test_readthrough.py b/bookwyrm/tests/views/test_readthrough.py
index f51e89af..764490d8 100644
--- a/bookwyrm/tests/views/test_readthrough.py
+++ b/bookwyrm/tests/views/test_readthrough.py
@@ -33,7 +33,7 @@ class ReadThrough(TestCase):
         self.assertEqual(self.edition.readthrough_set.count(), 0)
 
         self.client.post(
-            "/reading-progress/start/{}".format(self.edition.id),
+            "/reading-status/start/{}".format(self.edition.id),
             {
                 "start_date": "2020-11-27",
             },
@@ -54,7 +54,7 @@ class ReadThrough(TestCase):
         self.assertEqual(self.edition.readthrough_set.count(), 0)
 
         self.client.post(
-            "/reading-progress/start/{}".format(self.edition.id),
+            "/reading-status/start/{}".format(self.edition.id),
             {
                 "start_date": "2020-11-27",
             },

From a4afbccb3a00e4d6bcc702495dd142b5216d33af Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Wed, 9 Jun 2021 11:27:14 -0700
Subject: [PATCH 1267/1285] Fixes straggling reading view test name

---
 bookwyrm/tests/views/test_reading.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/tests/views/test_reading.py b/bookwyrm/tests/views/test_reading.py
index fc0d56cf..a1d0417f 100644
--- a/bookwyrm/tests/views/test_reading.py
+++ b/bookwyrm/tests/views/test_reading.py
@@ -86,7 +86,7 @@ class ReadingViews(TestCase):
         request = self.factory.post("")
         request.user = self.local_user
         with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
-            views.StartReading.as_view()(request, self.book.id)
+            views.ReadingStatus.as_view()(request, "start", self.book.id)
 
         self.assertFalse(to_read_shelf.books.exists())
         self.assertEqual(shelf.books.get(), self.book)

From c415860373eebe5b48ccb63a2136f5ab16462475 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Jun 2021 17:42:49 +0000
Subject: [PATCH 1268/1285] Bump django from 3.2.2 to 3.2.4

Bumps [django](https://github.com/django/django) from 3.2.2 to 3.2.4.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.2...3.2.4)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 7b06245f..a0100f98 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 celery==4.4.2
-Django==3.2.2
+Django==3.2.4
 django-model-utils==4.0.0
 environs==7.2.0
 flower==0.9.4

From 7ae64c2a68ebfdb545bf4730605fe651f9e27647 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 14 Jun 2021 09:57:51 -0700
Subject: [PATCH 1269/1285] Splits user view out and adds template

---
 bookwyrm/templates/preferences/blocks.html    |   2 +-
 .../preferences/change_password.html          |   2 +-
 .../templates/preferences/delete_account.html |  27 +++++
 bookwyrm/templates/preferences/edit_user.html |   3 +-
 .../{preferences_layout.html => layout.html}  |   4 +
 bookwyrm/tests/views/test_edit_user.py        | 110 ++++++++++++++++++
 bookwyrm/tests/views/test_user.py             |  74 +-----------
 bookwyrm/urls.py                              |   1 +
 bookwyrm/views/__init__.py                    |   3 +-
 bookwyrm/views/edit_user.py                   |  82 +++++++++++++
 bookwyrm/views/get_started.py                 |   2 +-
 bookwyrm/views/user.py                        |  80 +------------
 12 files changed, 233 insertions(+), 157 deletions(-)
 create mode 100644 bookwyrm/templates/preferences/delete_account.html
 rename bookwyrm/templates/preferences/{preferences_layout.html => layout.html} (84%)
 create mode 100644 bookwyrm/tests/views/test_edit_user.py
 create mode 100644 bookwyrm/views/edit_user.py

diff --git a/bookwyrm/templates/preferences/blocks.html b/bookwyrm/templates/preferences/blocks.html
index 24866fa3..699bfb7e 100644
--- a/bookwyrm/templates/preferences/blocks.html
+++ b/bookwyrm/templates/preferences/blocks.html
@@ -1,4 +1,4 @@
-{% extends 'preferences/preferences_layout.html' %}
+{% extends 'preferences/layout.html' %}
 {% load i18n %}
 
 {% block title %}{% trans "Blocked Users" %}{{ author.name }}{% endblock %}
diff --git a/bookwyrm/templates/preferences/change_password.html b/bookwyrm/templates/preferences/change_password.html
index 9f5b7e8b..f6f1be09 100644
--- a/bookwyrm/templates/preferences/change_password.html
+++ b/bookwyrm/templates/preferences/change_password.html
@@ -1,4 +1,4 @@
-{% extends 'preferences/preferences_layout.html' %}
+{% extends 'preferences/layout.html' %}
 {% load i18n %}
 
 {% block title %}{% trans "Change Password" %}{% endblock %}
diff --git a/bookwyrm/templates/preferences/delete_account.html b/bookwyrm/templates/preferences/delete_account.html
new file mode 100644
index 00000000..fe917547
--- /dev/null
+++ b/bookwyrm/templates/preferences/delete_account.html
@@ -0,0 +1,27 @@
+{% extends 'preferences/layout.html' %}
+{% load i18n %}
+
+{% block title %}{% trans "Delete Account" %}{% endblock %}
+
+{% block header %}
+{% trans "Delete Account" %}
+{% endblock %}
+
+{% block panel %}
+{% if form.non_field_errors %}
+<p class="notification is-danger">{{ form.non_field_errors }}</p>
+{% endif %}
+<div class="block">
+    <h2 class="title is-4">{% trans "Permanently delete account" %}</h2>
+    <p class="help">{% trans "Deleting your account cannot be undone. The username will not be available to register in the future." %}</p>
+
+    <form name="delete-account" action="/delete-account" method="post">
+        <div class="field">
+            <label class="label" for="id_password">{% trans "Confirm password" %}</label>
+            <input class="input" type="password" name="password" id="id_password">
+        </div>
+        <button type="submit" class="is-danger">Delete</button>
+    </form>
+</div>
+{% endblock %}
+
diff --git a/bookwyrm/templates/preferences/edit_user.html b/bookwyrm/templates/preferences/edit_user.html
index 597a8ef0..33ca0704 100644
--- a/bookwyrm/templates/preferences/edit_user.html
+++ b/bookwyrm/templates/preferences/edit_user.html
@@ -1,4 +1,4 @@
-{% extends 'preferences/preferences_layout.html' %}
+{% extends 'preferences/layout.html' %}
 {% load i18n %}
 
 {% block title %}{% trans "Edit Profile" %}{% endblock %}
@@ -69,4 +69,3 @@
     </div>
     <div class="block"><button class="button is-primary" type="submit">{% trans "Save" %}</button></div>
 </form>
-{% endblock %}
diff --git a/bookwyrm/templates/preferences/preferences_layout.html b/bookwyrm/templates/preferences/layout.html
similarity index 84%
rename from bookwyrm/templates/preferences/preferences_layout.html
rename to bookwyrm/templates/preferences/layout.html
index baf87e47..758be9e5 100644
--- a/bookwyrm/templates/preferences/preferences_layout.html
+++ b/bookwyrm/templates/preferences/layout.html
@@ -18,6 +18,10 @@
                 {% url 'prefs-password' as url %}
                 <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Change Password" %}</a>
             </li>
+            <li>
+                {% url 'prefs-delete' as url %}
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Delete Account" %}</a>
+            </li>
         </ul>
         <h2 class="menu-label">{% trans "Relationships" %}</h2>
         <ul class="menu-list">
diff --git a/bookwyrm/tests/views/test_edit_user.py b/bookwyrm/tests/views/test_edit_user.py
new file mode 100644
index 00000000..64aa139d
--- /dev/null
+++ b/bookwyrm/tests/views/test_edit_user.py
@@ -0,0 +1,110 @@
+""" test for app action functionality """
+import pathlib
+from unittest.mock import patch
+from PIL import Image
+
+from django.contrib.auth.models import AnonymousUser
+from django.core.files.base import ContentFile
+from django.core.files.uploadedfile import SimpleUploadedFile
+from django.template.response import TemplateResponse
+from django.test import TestCase
+from django.test.client import RequestFactory
+
+from bookwyrm import forms, models, views
+
+
+class EditUserViews(TestCase):
+    """view user and edit profile"""
+
+    def setUp(self):
+        """we need basic test data and mocks"""
+        self.factory = RequestFactory()
+        self.local_user = models.User.objects.create_user(
+            "mouse@local.com",
+            "mouse@mouse.mouse",
+            "password",
+            local=True,
+            localname="mouse",
+        )
+        self.rat = models.User.objects.create_user(
+            "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat"
+        )
+        self.book = models.Edition.objects.create(title="test")
+        with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"):
+            models.ShelfBook.objects.create(
+                book=self.book,
+                user=self.local_user,
+                shelf=self.local_user.shelf_set.first(),
+            )
+
+        models.SiteSettings.objects.create()
+        self.anonymous_user = AnonymousUser
+        self.anonymous_user.is_authenticated = False
+
+    def test_edit_user_page(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.EditUser.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+        result = view(request)
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+
+    def test_edit_user(self):
+        """use a form to update a user"""
+        view = views.EditUser.as_view()
+        form = forms.EditUserForm(instance=self.local_user)
+        form.data["name"] = "New Name"
+        form.data["email"] = "wow@email.com"
+        form.data["preferred_timezone"] = "UTC"
+        request = self.factory.post("", form.data)
+        request.user = self.local_user
+
+        self.assertIsNone(self.local_user.name)
+        with patch(
+            "bookwyrm.models.activitypub_mixin.broadcast_task.delay"
+        ) as delay_mock:
+            view(request)
+            self.assertEqual(delay_mock.call_count, 1)
+        self.assertEqual(self.local_user.name, "New Name")
+        self.assertEqual(self.local_user.email, "wow@email.com")
+
+    def test_edit_user_avatar(self):
+        """use a form to update a user"""
+        view = views.EditUser.as_view()
+        form = forms.EditUserForm(instance=self.local_user)
+        form.data["name"] = "New Name"
+        form.data["email"] = "wow@email.com"
+        form.data["preferred_timezone"] = "UTC"
+        image_file = pathlib.Path(__file__).parent.joinpath(
+            "../../static/images/no_cover.jpg"
+        )
+        form.data["avatar"] = SimpleUploadedFile(
+            image_file, open(image_file, "rb").read(), content_type="image/jpeg"
+        )
+        request = self.factory.post("", form.data)
+        request.user = self.local_user
+
+        with patch(
+            "bookwyrm.models.activitypub_mixin.broadcast_task.delay"
+        ) as delay_mock:
+            view(request)
+            self.assertEqual(delay_mock.call_count, 1)
+        self.assertEqual(self.local_user.name, "New Name")
+        self.assertEqual(self.local_user.email, "wow@email.com")
+        self.assertIsNotNone(self.local_user.avatar)
+        self.assertEqual(self.local_user.avatar.width, 120)
+        self.assertEqual(self.local_user.avatar.height, 120)
+
+    def test_crop_avatar(self):
+        """reduce that image size"""
+        image_file = pathlib.Path(__file__).parent.joinpath(
+            "../../static/images/no_cover.jpg"
+        )
+        image = Image.open(image_file)
+
+        result = views.user.crop_avatar(image)
+        self.assertIsInstance(result, ContentFile)
+        image_result = Image.open(result)
+        self.assertEqual(image_result.size, (120, 120))
diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py
index 3fa78e35..478d2e8f 100644
--- a/bookwyrm/tests/views/test_user.py
+++ b/bookwyrm/tests/views/test_user.py
@@ -1,17 +1,13 @@
 """ test for app action functionality """
-import pathlib
 from unittest.mock import patch
-from PIL import Image
 
 from django.contrib.auth.models import AnonymousUser
-from django.core.files.base import ContentFile
-from django.core.files.uploadedfile import SimpleUploadedFile
 from django.http.response import Http404
 from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
 
-from bookwyrm import forms, models, views
+from bookwyrm import models, views
 from bookwyrm.activitypub import ActivitypubResponse
 
 
@@ -137,71 +133,3 @@ class UserViews(TestCase):
             is_api.return_value = False
             with self.assertRaises(Http404):
                 view(request, "rat")
-
-    def test_edit_user_page(self):
-        """there are so many views, this just makes sure it LOADS"""
-        view = views.EditUser.as_view()
-        request = self.factory.get("")
-        request.user = self.local_user
-        result = view(request)
-        self.assertIsInstance(result, TemplateResponse)
-        result.render()
-        self.assertEqual(result.status_code, 200)
-
-    def test_edit_user(self):
-        """use a form to update a user"""
-        view = views.EditUser.as_view()
-        form = forms.EditUserForm(instance=self.local_user)
-        form.data["name"] = "New Name"
-        form.data["email"] = "wow@email.com"
-        form.data["preferred_timezone"] = "UTC"
-        request = self.factory.post("", form.data)
-        request.user = self.local_user
-
-        self.assertIsNone(self.local_user.name)
-        with patch(
-            "bookwyrm.models.activitypub_mixin.broadcast_task.delay"
-        ) as delay_mock:
-            view(request)
-            self.assertEqual(delay_mock.call_count, 1)
-        self.assertEqual(self.local_user.name, "New Name")
-        self.assertEqual(self.local_user.email, "wow@email.com")
-
-    def test_edit_user_avatar(self):
-        """use a form to update a user"""
-        view = views.EditUser.as_view()
-        form = forms.EditUserForm(instance=self.local_user)
-        form.data["name"] = "New Name"
-        form.data["email"] = "wow@email.com"
-        form.data["preferred_timezone"] = "UTC"
-        image_file = pathlib.Path(__file__).parent.joinpath(
-            "../../static/images/no_cover.jpg"
-        )
-        form.data["avatar"] = SimpleUploadedFile(
-            image_file, open(image_file, "rb").read(), content_type="image/jpeg"
-        )
-        request = self.factory.post("", form.data)
-        request.user = self.local_user
-
-        with patch(
-            "bookwyrm.models.activitypub_mixin.broadcast_task.delay"
-        ) as delay_mock:
-            view(request)
-            self.assertEqual(delay_mock.call_count, 1)
-        self.assertEqual(self.local_user.name, "New Name")
-        self.assertEqual(self.local_user.email, "wow@email.com")
-        self.assertIsNotNone(self.local_user.avatar)
-        self.assertEqual(self.local_user.avatar.width, 120)
-        self.assertEqual(self.local_user.avatar.height, 120)
-
-    def test_crop_avatar(self):
-        """reduce that image size"""
-        image_file = pathlib.Path(__file__).parent.joinpath(
-            "../../static/images/no_cover.jpg"
-        )
-        image = Image.open(image_file)
-
-        result = views.user.crop_avatar(image)
-        self.assertIsInstance(result, ContentFile)
-        image_result = Image.open(result)
-        self.assertEqual(image_result.size, (120, 120))
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 6d70ee1e..a027ed5f 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -253,6 +253,7 @@ urlpatterns = [
         views.ChangePassword.as_view(),
         name="prefs-password",
     ),
+    re_path(r"^preferences/delete/?$", views.DeleteAccount.as_view(), name="prefs-delete"),
     re_path(r"^preferences/block/?$", views.Block.as_view(), name="prefs-block"),
     re_path(r"^block/(?P<user_id>\d+)/?$", views.Block.as_view()),
     re_path(r"^unblock/(?P<user_id>\d+)/?$", views.unblock),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 486b99ed..7beff831 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -6,6 +6,7 @@ from .block import Block, unblock
 from .books import Book, EditBook, ConfirmEditBook, Editions
 from .books import upload_cover, add_description, switch_edition, resolve_book
 from .directory import Directory
+from .edit_user import EditUser
 from .federation import Federation, FederatedServer
 from .federation import AddFederatedServer, ImportServerBlocklist
 from .federation import block_server, unblock_server
@@ -37,6 +38,6 @@ from .shelf import shelve, unshelve
 from .site import Site
 from .status import CreateStatus, DeleteStatus, DeleteAndRedraft
 from .updates import get_notification_count, get_unread_status_count
-from .user import User, EditUser, Followers, Following
+from .user import User, Followers, Following
 from .user_admin import UserAdmin, UserAdminList
 from .wellknown import *
diff --git a/bookwyrm/views/edit_user.py b/bookwyrm/views/edit_user.py
new file mode 100644
index 00000000..43b7018c
--- /dev/null
+++ b/bookwyrm/views/edit_user.py
@@ -0,0 +1,82 @@
+""" edit or delete ones own account"""
+from io import BytesIO
+from uuid import uuid4
+from PIL import Image
+
+from django.contrib.auth.decorators import login_required
+from django.core.files.base import ContentFile
+from django.shortcuts import redirect
+from django.template.response import TemplateResponse
+from django.utils.decorators import method_decorator
+from django.views import View
+
+from bookwyrm import forms
+
+
+# pylint: disable=no-self-use
+@method_decorator(login_required, name="dispatch")
+class EditUser(View):
+    """edit user view"""
+
+    def get(self, request):
+        """edit profile page for a user"""
+        data = {
+            "form": forms.EditUserForm(instance=request.user),
+            "user": request.user,
+        }
+        return TemplateResponse(request, "preferences/edit_user.html", data)
+
+    def post(self, request):
+        """les get fancy with images"""
+        form = forms.EditUserForm(request.POST, request.FILES, instance=request.user)
+        if not form.is_valid():
+            data = {"form": form, "user": request.user}
+            return TemplateResponse(request, "preferences/edit_user.html", data)
+
+        user = save_user_form(form)
+
+        return redirect(user.local_path)
+
+
+def save_user_form(form):
+    """special handling for the user form"""
+    user = form.save(commit=False)
+
+    if "avatar" in form.files:
+        # crop and resize avatar upload
+        image = Image.open(form.files["avatar"])
+        image = crop_avatar(image)
+
+        # set the name to a hash
+        extension = form.files["avatar"].name.split(".")[-1]
+        filename = "%s.%s" % (uuid4(), extension)
+        user.avatar.save(filename, image, save=False)
+    user.save()
+    return user
+
+
+def crop_avatar(image):
+    """reduce the size and make an avatar square"""
+    target_size = 120
+    width, height = image.size
+    thumbnail_scale = (
+        height / (width / target_size)
+        if height > width
+        else width / (height / target_size)
+    )
+    image.thumbnail([thumbnail_scale, thumbnail_scale])
+    width, height = image.size
+
+    width_diff = width - target_size
+    height_diff = height - target_size
+    cropped = image.crop(
+        (
+            int(width_diff / 2),
+            int(height_diff / 2),
+            int(width - (width_diff / 2)),
+            int(height - (height_diff / 2)),
+        )
+    )
+    output = BytesIO()
+    cropped.save(output, format=image.format)
+    return ContentFile(output.getvalue())
diff --git a/bookwyrm/views/get_started.py b/bookwyrm/views/get_started.py
index 7eae9483..7f615172 100644
--- a/bookwyrm/views/get_started.py
+++ b/bookwyrm/views/get_started.py
@@ -14,7 +14,7 @@ from django.views import View
 from bookwyrm import forms, models
 from bookwyrm.connectors import connector_manager
 from .helpers import get_suggested_users
-from .user import save_user_form
+from .edit_user import save_user_form
 
 
 # pylint: disable= no-self-use
diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py
index d186fe97..f62913a9 100644
--- a/bookwyrm/views/user.py
+++ b/bookwyrm/views/user.py
@@ -1,25 +1,17 @@
 """ non-interactive pages """
-from io import BytesIO
-from uuid import uuid4
-from PIL import Image
-
-from django.contrib.auth.decorators import login_required
-from django.core.files.base import ContentFile
 from django.core.paginator import Paginator
-from django.shortcuts import redirect
 from django.template.response import TemplateResponse
 from django.utils import timezone
-from django.utils.decorators import method_decorator
 from django.views import View
 
-from bookwyrm import forms, models
+from bookwyrm import models
 from bookwyrm.activitypub import ActivitypubResponse
 from bookwyrm.settings import PAGE_LENGTH
 from .helpers import get_user_from_username, is_api_request
 from .helpers import privacy_filter
 
 
-# pylint: disable= no-self-use
+# pylint: disable=no-self-use
 class User(View):
     """user profile page"""
 
@@ -122,71 +114,3 @@ class Following(View):
             "follow_list": paginated.get_page(request.GET.get("page")),
         }
         return TemplateResponse(request, "user/relationships/following.html", data)
-
-
-@method_decorator(login_required, name="dispatch")
-class EditUser(View):
-    """edit user view"""
-
-    def get(self, request):
-        """edit profile page for a user"""
-        data = {
-            "form": forms.EditUserForm(instance=request.user),
-            "user": request.user,
-        }
-        return TemplateResponse(request, "preferences/edit_user.html", data)
-
-    def post(self, request):
-        """les get fancy with images"""
-        form = forms.EditUserForm(request.POST, request.FILES, instance=request.user)
-        if not form.is_valid():
-            data = {"form": form, "user": request.user}
-            return TemplateResponse(request, "preferences/edit_user.html", data)
-
-        user = save_user_form(form)
-
-        return redirect(user.local_path)
-
-
-def save_user_form(form):
-    """special handling for the user form"""
-    user = form.save(commit=False)
-
-    if "avatar" in form.files:
-        # crop and resize avatar upload
-        image = Image.open(form.files["avatar"])
-        image = crop_avatar(image)
-
-        # set the name to a hash
-        extension = form.files["avatar"].name.split(".")[-1]
-        filename = "%s.%s" % (uuid4(), extension)
-        user.avatar.save(filename, image, save=False)
-    user.save()
-    return user
-
-
-def crop_avatar(image):
-    """reduce the size and make an avatar square"""
-    target_size = 120
-    width, height = image.size
-    thumbnail_scale = (
-        height / (width / target_size)
-        if height > width
-        else width / (height / target_size)
-    )
-    image.thumbnail([thumbnail_scale, thumbnail_scale])
-    width, height = image.size
-
-    width_diff = width - target_size
-    height_diff = height - target_size
-    cropped = image.crop(
-        (
-            int(width_diff / 2),
-            int(height_diff / 2),
-            int(width - (width_diff / 2)),
-            int(height - (height_diff / 2)),
-        )
-    )
-    output = BytesIO()
-    cropped.save(output, format=image.format)
-    return ContentFile(output.getvalue())

From 8cd6712db3742cddd818de464f3776d5886d7659 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 14 Jun 2021 10:44:25 -0700
Subject: [PATCH 1270/1285] Let users delete their accounts

---
 bookwyrm/forms.py                             |  6 ++++
 .../templates/preferences/delete_account.html | 27 ---------------
 .../templates/preferences/delete_user.html    | 30 +++++++++++++++++
 bookwyrm/templates/preferences/edit_user.html |  1 +
 bookwyrm/urls.py                              |  2 +-
 bookwyrm/views/__init__.py                    |  2 +-
 bookwyrm/views/edit_user.py                   | 33 ++++++++++++++++++-
 7 files changed, 71 insertions(+), 30 deletions(-)
 delete mode 100644 bookwyrm/templates/preferences/delete_account.html
 create mode 100644 bookwyrm/templates/preferences/delete_user.html

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 25b72a11..4931805f 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -150,6 +150,12 @@ class LimitedEditUserForm(CustomForm):
         help_texts = {f: None for f in fields}
 
 
+class DeleteUserForm(CustomForm):
+    class Meta:
+        model = models.User
+        fields = ["password"]
+
+
 class UserGroupForm(CustomForm):
     class Meta:
         model = models.User
diff --git a/bookwyrm/templates/preferences/delete_account.html b/bookwyrm/templates/preferences/delete_account.html
deleted file mode 100644
index fe917547..00000000
--- a/bookwyrm/templates/preferences/delete_account.html
+++ /dev/null
@@ -1,27 +0,0 @@
-{% extends 'preferences/layout.html' %}
-{% load i18n %}
-
-{% block title %}{% trans "Delete Account" %}{% endblock %}
-
-{% block header %}
-{% trans "Delete Account" %}
-{% endblock %}
-
-{% block panel %}
-{% if form.non_field_errors %}
-<p class="notification is-danger">{{ form.non_field_errors }}</p>
-{% endif %}
-<div class="block">
-    <h2 class="title is-4">{% trans "Permanently delete account" %}</h2>
-    <p class="help">{% trans "Deleting your account cannot be undone. The username will not be available to register in the future." %}</p>
-
-    <form name="delete-account" action="/delete-account" method="post">
-        <div class="field">
-            <label class="label" for="id_password">{% trans "Confirm password" %}</label>
-            <input class="input" type="password" name="password" id="id_password">
-        </div>
-        <button type="submit" class="is-danger">Delete</button>
-    </form>
-</div>
-{% endblock %}
-
diff --git a/bookwyrm/templates/preferences/delete_user.html b/bookwyrm/templates/preferences/delete_user.html
new file mode 100644
index 00000000..63bd2f86
--- /dev/null
+++ b/bookwyrm/templates/preferences/delete_user.html
@@ -0,0 +1,30 @@
+{% extends 'preferences/layout.html' %}
+{% load i18n %}
+
+{% block title %}{% trans "Delete Account" %}{% endblock %}
+
+{% block header %}
+{% trans "Delete Account" %}
+{% endblock %}
+
+{% block panel %}
+<div class="block">
+    <h2 class="title is-4">{% trans "Permanently delete account" %}</h2>
+    <p class="notification is-danger is-light">
+        {% trans "Deleting your account cannot be undone. The username will not be available to register in the future." %}
+    </p>
+
+    <form name="delete-user" action="{% url 'prefs-delete' %}" method="post">
+        {% csrf_token %}
+        <div class="field">
+            <label class="label" for="id_password">{% trans "Confirm password:" %}</label>
+            <input class="input {% if form.password.errors %}is-danger{% endif %}" type="password" name="password" id="id_password" required>
+            {% for error in form.password.errors %}
+            <p class="help is-danger">{{ error | escape }}</p>
+            {% endfor %}
+        </div>
+        <button type="submit" class="button is-danger">{% trans "Delete Account" %}</button>
+    </form>
+</div>
+{% endblock %}
+
diff --git a/bookwyrm/templates/preferences/edit_user.html b/bookwyrm/templates/preferences/edit_user.html
index 33ca0704..9e2af7be 100644
--- a/bookwyrm/templates/preferences/edit_user.html
+++ b/bookwyrm/templates/preferences/edit_user.html
@@ -69,3 +69,4 @@
     </div>
     <div class="block"><button class="button is-primary" type="submit">{% trans "Save" %}</button></div>
 </form>
+{% endblock %}
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index a027ed5f..bfdcd9fc 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -253,7 +253,7 @@ urlpatterns = [
         views.ChangePassword.as_view(),
         name="prefs-password",
     ),
-    re_path(r"^preferences/delete/?$", views.DeleteAccount.as_view(), name="prefs-delete"),
+    re_path(r"^preferences/delete/?$", views.DeleteUser.as_view(), name="prefs-delete"),
     re_path(r"^preferences/block/?$", views.Block.as_view(), name="prefs-block"),
     re_path(r"^block/(?P<user_id>\d+)/?$", views.Block.as_view()),
     re_path(r"^unblock/(?P<user_id>\d+)/?$", views.unblock),
diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py
index 7beff831..41bb64e5 100644
--- a/bookwyrm/views/__init__.py
+++ b/bookwyrm/views/__init__.py
@@ -6,7 +6,7 @@ from .block import Block, unblock
 from .books import Book, EditBook, ConfirmEditBook, Editions
 from .books import upload_cover, add_description, switch_edition, resolve_book
 from .directory import Directory
-from .edit_user import EditUser
+from .edit_user import EditUser, DeleteUser
 from .federation import Federation, FederatedServer
 from .federation import AddFederatedServer, ImportServerBlocklist
 from .federation import block_server, unblock_server
diff --git a/bookwyrm/views/edit_user.py b/bookwyrm/views/edit_user.py
index 43b7018c..e00f62fd 100644
--- a/bookwyrm/views/edit_user.py
+++ b/bookwyrm/views/edit_user.py
@@ -3,6 +3,7 @@ from io import BytesIO
 from uuid import uuid4
 from PIL import Image
 
+from django.contrib.auth import logout
 from django.contrib.auth.decorators import login_required
 from django.core.files.base import ContentFile
 from django.shortcuts import redirect
@@ -10,7 +11,7 @@ from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
 
-from bookwyrm import forms
+from bookwyrm import forms, models
 
 
 # pylint: disable=no-self-use
@@ -38,6 +39,36 @@ class EditUser(View):
         return redirect(user.local_path)
 
 
+# pylint: disable=no-self-use
+@method_decorator(login_required, name="dispatch")
+class DeleteUser(View):
+    """delete user view"""
+
+    def get(self, request):
+        """delete page for a user"""
+        data = {
+            "form": forms.DeleteUserForm(),
+            "user": request.user,
+        }
+        return TemplateResponse(request, "preferences/delete_user.html", data)
+
+    def post(self, request):
+        """les get fancy with images"""
+        form = forms.DeleteUserForm(request.POST, instance=request.user)
+        form.is_valid()
+        # idk why but I couldn't get check_password to work on request.user
+        user = models.User.objects.get(id=request.user.id)
+        if form.is_valid() and user.check_password(form.cleaned_data["password"]):
+            request.user.delete()
+            logout(request)
+            return redirect("/")
+
+        form.errors["password"] = ["Invalid password"]
+        data = {"form": form, "user": request.user}
+        return TemplateResponse(request, "preferences/delete_user.html", data)
+
+
+
 def save_user_form(form):
     """special handling for the user form"""
     user = form.save(commit=False)

From 557aa2005b1e5249a3f862e7311ebbf146464828 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 14 Jun 2021 11:15:00 -0700
Subject: [PATCH 1271/1285] Adds test for delete view

---
 bookwyrm/tests/views/test_edit_user.py | 39 ++++++++++++++++++++++++++
 bookwyrm/views/edit_user.py            |  1 -
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/tests/views/test_edit_user.py b/bookwyrm/tests/views/test_edit_user.py
index 64aa139d..0ea66eb7 100644
--- a/bookwyrm/tests/views/test_edit_user.py
+++ b/bookwyrm/tests/views/test_edit_user.py
@@ -1,9 +1,11 @@
 """ test for app action functionality """
+import json
 import pathlib
 from unittest.mock import patch
 from PIL import Image
 
 from django.contrib.auth.models import AnonymousUser
+from django.contrib.sessions.middleware import SessionMiddleware
 from django.core.files.base import ContentFile
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.template.response import TemplateResponse
@@ -108,3 +110,40 @@ class EditUserViews(TestCase):
         self.assertIsInstance(result, ContentFile)
         image_result = Image.open(result)
         self.assertEqual(image_result.size, (120, 120))
+
+    def test_delete_user_page(self):
+        """there are so many views, this just makes sure it LOADS"""
+        view = views.DeleteUser.as_view()
+        request = self.factory.get("")
+        request.user = self.local_user
+        result = view(request)
+        self.assertIsInstance(result, TemplateResponse)
+        result.render()
+        self.assertEqual(result.status_code, 200)
+
+    def test_delete_user(self):
+        """use a form to update a user"""
+        view = views.DeleteUser.as_view()
+        form = forms.DeleteUserForm()
+        form.data["password"] = "password"
+        request = self.factory.post("", form.data)
+        request.user = self.local_user
+        middleware = SessionMiddleware()
+        middleware.process_request(request)
+        request.session.save()
+
+
+        self.assertIsNone(self.local_user.name)
+        with patch(
+            "bookwyrm.models.activitypub_mixin.broadcast_task.delay"
+        ) as delay_mock:
+            view(request)
+        self.assertEqual(delay_mock.call_count, 1)
+        activity = json.loads(delay_mock.call_args[0][1])
+        self.assertEqual(activity["type"], "Delete")
+        self.assertEqual(activity["actor"], self.local_user.remote_id)
+        self.assertEqual(
+            activity["cc"][0], "https://www.w3.org/ns/activitystreams#Public"
+        )
+
+        self.assertFalse(self.local_user.is_active)
diff --git a/bookwyrm/views/edit_user.py b/bookwyrm/views/edit_user.py
index e00f62fd..3b255c68 100644
--- a/bookwyrm/views/edit_user.py
+++ b/bookwyrm/views/edit_user.py
@@ -68,7 +68,6 @@ class DeleteUser(View):
         return TemplateResponse(request, "preferences/delete_user.html", data)
 
 
-
 def save_user_form(form):
     """special handling for the user form"""
     user = form.save(commit=False)

From 607bfa9160e05ce638e0be05eb9b6788b3aa231b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 14 Jun 2021 11:16:41 -0700
Subject: [PATCH 1272/1285] Python formatting

---
 bookwyrm/tests/views/test_edit_user.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bookwyrm/tests/views/test_edit_user.py b/bookwyrm/tests/views/test_edit_user.py
index 0ea66eb7..4796610f 100644
--- a/bookwyrm/tests/views/test_edit_user.py
+++ b/bookwyrm/tests/views/test_edit_user.py
@@ -132,7 +132,6 @@ class EditUserViews(TestCase):
         middleware.process_request(request)
         request.session.save()
 
-
         self.assertIsNone(self.local_user.name)
         with patch(
             "bookwyrm.models.activitypub_mixin.broadcast_task.delay"

From e98138e84fdc1572566b07e76587dda26b14442b Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 14 Jun 2021 11:35:06 -0700
Subject: [PATCH 1273/1285] Show users as deleted in admin view

---
 .../templates/user_admin/user_moderation_actions.html    | 9 +++++++++
 bookwyrm/tests/views/test_edit_user.py                   | 4 +++-
 bookwyrm/views/edit_user.py                              | 3 ++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/user_admin/user_moderation_actions.html b/bookwyrm/templates/user_admin/user_moderation_actions.html
index 816e787a..e4460a68 100644
--- a/bookwyrm/templates/user_admin/user_moderation_actions.html
+++ b/bookwyrm/templates/user_admin/user_moderation_actions.html
@@ -1,6 +1,12 @@
 {% load i18n %}
 <div class="block content">
+    {% if not user.is_active and user.deactivation_reason == "self_deletion" %}
+    <div class="notification is-danger">
+        {% trans "Permanently deleted" %}
+    </div>
+    {% else %}
     <h3>{% trans "Actions" %}</h3>
+
     <div class="is-flex">
         <p class="mr-1">
             <a class="button" href="{% url 'direct-messages-user' user.username %}">{% trans "Send direct message" %}</a>
@@ -14,6 +20,7 @@
             {% endif %}
         </form>
     </div>
+
     {% if user.local %}
     <div>
         <form name="permission" method="post" action="{% url 'settings-user' user.id %}">
@@ -39,4 +46,6 @@
         </form>
     </div>
     {% endif %}
+
+    {% endif %}
 </div>
diff --git a/bookwyrm/tests/views/test_edit_user.py b/bookwyrm/tests/views/test_edit_user.py
index 4796610f..e3b9d463 100644
--- a/bookwyrm/tests/views/test_edit_user.py
+++ b/bookwyrm/tests/views/test_edit_user.py
@@ -106,7 +106,7 @@ class EditUserViews(TestCase):
         )
         image = Image.open(image_file)
 
-        result = views.user.crop_avatar(image)
+        result = views.edit_user.crop_avatar(image)
         self.assertIsInstance(result, ContentFile)
         image_result = Image.open(result)
         self.assertEqual(image_result.size, (120, 120))
@@ -145,4 +145,6 @@ class EditUserViews(TestCase):
             activity["cc"][0], "https://www.w3.org/ns/activitystreams#Public"
         )
 
+        self.local_user.refresh_from_db()
         self.assertFalse(self.local_user.is_active)
+        self.assertEqual(self.local_user.deactivation_reason, "self_deletion")
diff --git a/bookwyrm/views/edit_user.py b/bookwyrm/views/edit_user.py
index 3b255c68..c74b00c9 100644
--- a/bookwyrm/views/edit_user.py
+++ b/bookwyrm/views/edit_user.py
@@ -59,7 +59,8 @@ class DeleteUser(View):
         # idk why but I couldn't get check_password to work on request.user
         user = models.User.objects.get(id=request.user.id)
         if form.is_valid() and user.check_password(form.cleaned_data["password"]):
-            request.user.delete()
+            user.deactivation_reason = "self_deletion"
+            user.delete()
             logout(request)
             return redirect("/")
 

From 9a67c61487a2294db2d22d1f8a910fd5a4426e12 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 14 Jun 2021 11:59:44 -0700
Subject: [PATCH 1274/1285] Clarifies wording on pending imports

Fixes #1118
---
 bookwyrm/templates/import_status.html | 5 +++++
 bookwyrm/views/import_data.py         | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/templates/import_status.html b/bookwyrm/templates/import_status.html
index ff80ad71..11ff47f1 100644
--- a/bookwyrm/templates/import_status.html
+++ b/bookwyrm/templates/import_status.html
@@ -7,6 +7,7 @@
 {% block content %}{% spaceless %}
 <div class="block">
     <h1 class="title">{% trans "Import Status" %}</h1>
+    <a href="{% url 'import' %}" class="has-text-weight-normal help subtitle is-link">{% trans "Back to imports" %}</a>
 
     <dl>
         <div class="is-flex">
@@ -106,7 +107,11 @@
 {% endif %}
 
 <div class="block">
+    {% if job.complete %}
     <h2 class="title is-4">{% trans "Successfully imported" %}</h2>
+    {% else %}
+    <h2 class="title is-4">{% trans "Import Progress" %}</h2>
+    {% endif %}
     <table class="table">
         <tr>
             <th>
diff --git a/bookwyrm/views/import_data.py b/bookwyrm/views/import_data.py
index 62dcce73..b2b88a2e 100644
--- a/bookwyrm/views/import_data.py
+++ b/bookwyrm/views/import_data.py
@@ -78,13 +78,15 @@ class ImportStatus(View):
 
     def get(self, request, job_id):
         """status of an import job"""
-        job = models.ImportJob.objects.get(id=job_id)
+        job = get_object_or_404(models.ImportJob, id=job_id)
         if job.user != request.user:
             raise PermissionDenied
+
         try:
             task = app.AsyncResult(job.task_id)
         except ValueError:
             task = None
+
         items = job.items.order_by("index").all()
         failed_items = [i for i in items if i.fail_reason]
         items = [i for i in items if not i.fail_reason]

From 46be7292fde320df25ab65b5aa5a929bacce3a4f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 14 Jun 2021 12:30:43 -0700
Subject: [PATCH 1275/1285] Don't try title/author search when isbn search
 fails

---
 bookwyrm/models/import_job.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/models/import_job.py b/bookwyrm/models/import_job.py
index c8130af2..f2993846 100644
--- a/bookwyrm/models/import_job.py
+++ b/bookwyrm/models/import_job.py
@@ -75,7 +75,12 @@ class ImportItem(models.Model):
 
     def resolve(self):
         """try various ways to lookup a book"""
-        self.book = self.get_book_from_isbn() or self.get_book_from_title_author()
+        if self.isbn:
+            self.book = self.get_book_from_isbn()
+        else:
+            # don't fall back on title/author search is isbn is present.
+            # you're too likely to mismatch
+            self.get_book_from_title_author()
 
     def get_book_from_isbn(self):
         """search by isbn"""

From 6e6354bcce08602c64c0e21ef23d2fdb62c331b2 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 14 Jun 2021 12:34:11 -0700
Subject: [PATCH 1276/1285] Fixes trailing space in series text

Fixes #1145
---
 bookwyrm/templates/book/book.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index af223020..a48120e9 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -20,8 +20,7 @@
                     <meta itemprop="volumeNumber" content="{{ book.series_number }}">
 
                     <small class="has-text-grey-dark">
-                        ({{ book.series }}
-                        {% if book.series_number %} #{{ book.series_number }}{% endif %})
+                        ({{ book.series }}{% if book.series_number %} #{{ book.series_number }}{% endif %})
                     </small>
                     <br>
                 {% endif %}

From 290a99bf176a441261ba0d755c1e2d014c7db240 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 14 Jun 2021 15:19:54 -0700
Subject: [PATCH 1277/1285] Fixes renaming images on save

---
 bookwyrm/models/fields.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py
index caa22fcd..70ba4a5b 100644
--- a/bookwyrm/models/fields.py
+++ b/bookwyrm/models/fields.py
@@ -1,5 +1,6 @@
 """ activitypub-aware django model fields """
 from dataclasses import MISSING
+import imghdr
 import re
 from uuid import uuid4
 
@@ -9,7 +10,7 @@ from django.contrib.postgres.fields import ArrayField as DjangoArrayField
 from django.core.exceptions import ValidationError
 from django.core.files.base import ContentFile
 from django.db import models
-from django.forms import ClearableFileInput, ImageField
+from django.forms import ClearableFileInput, ImageField as DjangoImageField
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from bookwyrm import activitypub
@@ -334,10 +335,12 @@ class TagField(ManyToManyField):
 
 
 class ClearableFileInputWithWarning(ClearableFileInput):
+    """max file size warning"""
     template_name = "widgets/clearable_file_input_with_warning.html"
 
 
-class CustomImageField(ImageField):
+class CustomImageField(DjangoImageField):
+    """overwrites image field for form"""
     widget = ClearableFileInputWithWarning
 
 
@@ -400,11 +403,12 @@ class ImageField(ActivitypubFieldMixin, models.ImageField):
         if not response:
             return None
 
-        image_name = str(uuid4()) + "." + url.split(".")[-1]
         image_content = ContentFile(response.content)
+        image_name = str(uuid4()) + "." + imghdr.what(None, image_content.read())
         return [image_name, image_content]
 
     def formfield(self, **kwargs):
+        """ special case for forms """
         return super().formfield(
             **{
                 "form_class": CustomImageField,

From 2a606eec3e6307be33a5af0ed91c210838c830b8 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 14 Jun 2021 15:27:37 -0700
Subject: [PATCH 1278/1285] scroll horizontally on user page shelf preview

---
 bookwyrm/templates/user/user.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index d2e9be3e..c86eb631 100644
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -26,7 +26,7 @@
     <h2 class="title">
         {% include 'user/shelf/books_header.html' %}
     </h2>
-    <div class="columns">
+    <div class="columns is-mobile scroll-x">
         {% for shelf in shelves %}
         <div class="column is-narrow">
             <h3>{{ shelf.name }}

From cd014e43ad7cb4b223fac7e00f52c13fd97b71d4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 14 Jun 2021 15:29:07 -0700
Subject: [PATCH 1279/1285] Python formatting

---
 bookwyrm/models/fields.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py
index 70ba4a5b..379323b9 100644
--- a/bookwyrm/models/fields.py
+++ b/bookwyrm/models/fields.py
@@ -336,11 +336,13 @@ class TagField(ManyToManyField):
 
 class ClearableFileInputWithWarning(ClearableFileInput):
     """max file size warning"""
+
     template_name = "widgets/clearable_file_input_with_warning.html"
 
 
 class CustomImageField(DjangoImageField):
     """overwrites image field for form"""
+
     widget = ClearableFileInputWithWarning
 
 
@@ -408,7 +410,7 @@ class ImageField(ActivitypubFieldMixin, models.ImageField):
         return [image_name, image_content]
 
     def formfield(self, **kwargs):
-        """ special case for forms """
+        """special case for forms"""
         return super().formfield(
             **{
                 "form_class": CustomImageField,

From 5a236e333f6b13e058b61d31690d2f7b5db70af6 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 14 Jun 2021 15:33:03 -0700
Subject: [PATCH 1280/1285] Fixes directory profile link

---
 bookwyrm/templates/directory/directory.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/directory/directory.html b/bookwyrm/templates/directory/directory.html
index 88a7b15c..b900cb18 100644
--- a/bookwyrm/templates/directory/directory.html
+++ b/bookwyrm/templates/directory/directory.html
@@ -20,8 +20,8 @@
         {% csrf_token %}
         <button class="button is-primary" type="submit">Join Directory</button>
         <p class="help">
-            {% url 'settings-profile' as path %}
-            {% blocktrans %}You can opt-out at any time in your <a href="{{ path }}">profile settings.</a>{% endblocktrans %}
+            {% url 'prefs-profile' as path %}
+            {% blocktrans with path=path %}You can opt-out at any time in your <a href="{{ path }}">profile settings.</a>{% endblocktrans %}
         </p>
     </form>
     </div>

From f307edf73236b82bb4b6fe09fa94cbb456b06472 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 14 Jun 2021 15:39:54 -0700
Subject: [PATCH 1281/1285] Use elided page range for invites

---
 bookwyrm/views/invite.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/invite.py
index 92f930f4..3b9fd17c 100644
--- a/bookwyrm/views/invite.py
+++ b/bookwyrm/views/invite.py
@@ -37,8 +37,12 @@ class ManageInvites(View):
             PAGE_LENGTH,
         )
 
+        page = paginated.get_page(request.GET.get("page"))
         data = {
-            "invites": paginated.get_page(request.GET.get("page")),
+            "invites": page,
+            "page_range": paginated.get_elided_page_range(
+                page.number, on_each_side=2, on_ends=1
+            ),
             "form": forms.CreateInviteForm(),
         }
         return TemplateResponse(request, "settings/manage_invites.html", data)
@@ -118,15 +122,16 @@ class ManageInviteRequests(View):
                 reduce(operator.or_, (Q(**f) for f in filters))
             ).distinct()
 
-        paginated = Paginator(
-            requests,
-            PAGE_LENGTH,
-        )
+        paginated = Paginator(requests, PAGE_LENGTH)
 
+        page = paginated.get_page(request.GET.get("page"))
         data = {
             "ignored": ignored,
             "count": paginated.count,
-            "requests": paginated.get_page(request.GET.get("page")),
+            "requests": page,
+            "page_range": paginated.get_elided_page_range(
+                page.number, on_each_side=2, on_ends=1
+            ),
             "sort": sort,
         }
         return TemplateResponse(request, "settings/manage_invite_requests.html", data)

From fe2309f0bc64c446c972bac4490e59b3a51d15ae Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 14 Jun 2021 15:45:39 -0700
Subject: [PATCH 1282/1285] Fixes orientation of edition want to read menu

---
 bookwyrm/templates/book/editions.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookwyrm/templates/book/editions.html b/bookwyrm/templates/book/editions.html
index 0d5c1044..e2a0bdda 100644
--- a/bookwyrm/templates/book/editions.html
+++ b/bookwyrm/templates/book/editions.html
@@ -40,7 +40,7 @@
         </div>
 
         <div class="column is-narrow">
-            {% include 'snippets/shelve_button/shelve_button.html' with book=book switch_mode=True %}
+            {% include 'snippets/shelve_button/shelve_button.html' with book=book switch_mode=True right=True %}
         </div>
     </div>
     {% endfor %}

From a82bf99bd602e3aa7679ad3ce66279112e3621a4 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 14 Jun 2021 15:55:26 -0700
Subject: [PATCH 1283/1285] Icon-only link display on mobile for text links

---
 bookwyrm/templates/author/author.html       | 2 +-
 bookwyrm/templates/book/book.html           | 2 +-
 bookwyrm/templates/settings/federation.html | 2 +-
 bookwyrm/templates/user/user.html           | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html
index f4f308f2..0bc42775 100644
--- a/bookwyrm/templates/author/author.html
+++ b/bookwyrm/templates/author/author.html
@@ -15,7 +15,7 @@
         <div class="column is-narrow">
             <a href="{{ author.local_path }}/edit">
                 <span class="icon icon-pencil" title="{% trans 'Edit Author' %}" aria-hidden="True"></span>
-                <span>{% trans "Edit Author" %}</span>
+                <span class="is-hidden-mobile">{% trans "Edit Author" %}</span>
             </a>
         </div>
         {% endif %}
diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index a48120e9..ea5ec09a 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -36,7 +36,7 @@
         <div class="column is-narrow">
             <a href="{{ book.id }}/edit">
                 <span class="icon icon-pencil" title="{% trans "Edit Book" %}" aria-hidden=True></span>
-                <span>{% trans "Edit Book" %}</span>
+                <span class="is-hidden-mobile">{% trans "Edit Book" %}</span>
             </a>
         </div>
         {% endif %}
diff --git a/bookwyrm/templates/settings/federation.html b/bookwyrm/templates/settings/federation.html
index 208ecf8d..e0a9ba73 100644
--- a/bookwyrm/templates/settings/federation.html
+++ b/bookwyrm/templates/settings/federation.html
@@ -7,7 +7,7 @@
 {% block edit-button %}
 <a href="{% url 'settings-import-blocklist' %}">
     <span class="icon icon-plus" title="{% trans 'Add instance' %}" aria-hidden="True"></span>
-    <span>{% trans "Add instance" %}</span>
+    <span class="is-hidden-mobile">{% trans "Add instance" %}</span>
 </a>
 {% endblock %}
 
diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html
index c86eb631..2c9d7277 100644
--- a/bookwyrm/templates/user/user.html
+++ b/bookwyrm/templates/user/user.html
@@ -13,7 +13,7 @@
     <div class="column is-narrow">
         <a href="{% url 'prefs-profile' %}">
             <span class="icon icon-pencil" title="Edit profile" aria-hidden="true"></span>
-            <span>{% trans "Edit profile" %}</span>
+            <span class="is-hidden-mobile">{% trans "Edit profile" %}</span>
         </a>
     </div>
     {% endif %}
@@ -60,7 +60,7 @@
         <div class="column is-narrow">
             <a target="_blank" href="{{ user.local_path }}/rss">
                 <span class="icon icon-rss" aria-hidden="true"></span>
-                <span>{% trans "RSS feed" %}</span>
+                <span class="is-hidden-mobile">{% trans "RSS feed" %}</span>
             </a>
         </div>
     </div>

From 3600f6ca3c8363cb7c64bcf669fbba00dc95e23f Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 14 Jun 2021 16:00:17 -0700
Subject: [PATCH 1284/1285] Handle overflow text in notifications

---
 bookwyrm/templates/notifications.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bookwyrm/templates/notifications.html b/bookwyrm/templates/notifications.html
index a51b2fdb..ae5cd67b 100644
--- a/bookwyrm/templates/notifications.html
+++ b/bookwyrm/templates/notifications.html
@@ -56,7 +56,7 @@
                 <span class="icon icon-warning"></span>
                 {% endif %}
             </div>
-            <div class="column">
+            <div class="column is-clipped">
                 <div class="block">
                     <p>
                         {# DESCRIPTION #}
@@ -137,7 +137,7 @@
                     {# PREVIEW #}
                     <div class="notification py-2 {% if notification.id in unread %}is-primary is-light{% else %}has-background-white{% if notification.notification_type == 'REPLY' or notification.notification_type == 'MENTION' %} has-text-black{% else %}-bis has-text-grey-dark{% endif %}{% endif %}">
                         <div class="columns">
-                            <div class="column">
+                            <div class="column is-clipped">
                                 {% include 'snippets/status_preview.html' with status=related_status %}
                             </div>
                             <div class="column is-narrow {% if notification.notification_type == 'REPLY' or notification.notification_type == 'MENTION' %}has-text-black{% else %}has-text-grey-dark{% endif %}">

From c4f7f34ad40a93950c2a3889528c136b1669b46e Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 14 Jun 2021 16:04:58 -0700
Subject: [PATCH 1285/1285] Fixes edit readthrough toggle display

---
 bookwyrm/templates/book/book.html                      | 2 +-
 bookwyrm/templates/{snippets => book}/readthrough.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename bookwyrm/templates/{snippets => book}/readthrough.html (97%)

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html
index ea5ec09a..dd5a4ff3 100644
--- a/bookwyrm/templates/book/book.html
+++ b/bookwyrm/templates/book/book.html
@@ -180,7 +180,7 @@
                 <p>{% trans "You don't have any reading activity for this book." %}</p>
                 {% endif %}
                 {% for readthrough in readthroughs %}
-                {% include 'snippets/readthrough.html' with readthrough=readthrough %}
+                {% include 'book/readthrough.html' with readthrough=readthrough %}
                 {% endfor %}
             </section>
             <hr aria-hidden="true">
diff --git a/bookwyrm/templates/snippets/readthrough.html b/bookwyrm/templates/book/readthrough.html
similarity index 97%
rename from bookwyrm/templates/snippets/readthrough.html
rename to bookwyrm/templates/book/readthrough.html
index d5e79b86..75140746 100644
--- a/bookwyrm/templates/snippets/readthrough.html
+++ b/bookwyrm/templates/book/readthrough.html
@@ -1,8 +1,8 @@
 {% load i18n %}
 {% load humanize %}
 {% load tz %}
-<div class="content box is-shadowless has-background-white-bis">
-    <div id="hide-edit-readthrough-{{ readthrough.id }}">
+<div class="content">
+    <div id="hide-edit-readthrough-{{ readthrough.id }}" class="box is-shadowless has-background-white-bis">
         <div class="columns">
             <div class="column">
                 {% trans "Progress Updates:" %}